version bump and updates

(Portage version: 2.2.0_alpha120_p4/cvs/Linux x86_64)

4 files changed, 118 insertions, 37 deletions

diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog
index 895cd21db06f..26bab3d87a55 100644
--- a/app-portage/layman/ChangeLog
+++ b/app-portage/layman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-portage/layman
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.160 2012/10/15 02:47:07 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.161 2012/10/21 03:00:31 dolsen Exp $
+
+*layman-2.0.0_rc4 (21 Oct 2012)
+
+  21 Oct 2012; Brian Dolbec <dolsen@gentoo.org> +layman-2.0.0_rc4.ebuild,
+  layman-9999.ebuild, metadata.xml:
+  Version bump. Update 9999's ebuild and metadata
 
   15 Oct 2012; Brian Dolbec <dolsen@gentoo.org> layman-9999.ebuild:
   Update for the new layman-updater utility.
diff --git a/app-portage/layman/layman-2.0.0_rc4.ebuild b/app-portage/layman/layman-2.0.0_rc4.ebuild
new file mode 100644
index 000000000000..237b5f80f478
--- /dev/null
+++ b/app-portage/layman/layman-2.0.0_rc4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-2.0.0_rc4.ebuild,v 1.1 2012/10/21 03:00:31 dolsen Exp $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="2:2.6"
+RESTRICT_PYTHON_ABIS="2.4 3.*"
+PYTHON_USE_WITH="xml"
+
+inherit eutils distutils prefix
+
+DESCRIPTION="Tool to manage Gentoo overlays"
+HOMEPAGE="http://layman.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bazaar cvs darcs +git mercurial subversion test"
+
+COMMON_DEPS="dev-lang/python"
+DEPEND="${COMMON_DEPS}
+	test? ( dev-vcs/subversion )"
+RDEPEND="${COMMON_DEPS}
+	bazaar? ( dev-vcs/bzr )
+	cvs? ( dev-vcs/cvs )
+	darcs? ( dev-vcs/darcs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	subversion? (
+		|| (
+			>=dev-vcs/subversion-1.5.4[webdav-neon]
+			>=dev-vcs/subversion-1.5.4[webdav-serf]
+		)
+	)"
+
+src_prepare() {
+	eprefixify etc/layman.cfg layman/config.py
+}
+
+src_test() {
+	testing() {
+		for suite in layman/tests/{dtest,external}.py ; do
+			PYTHONPATH="." "$(PYTHON)" ${suite} \
+					|| die "test suite '${suite}' failed"
+		done
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+
+	insinto /etc/layman
+	doins etc/layman.cfg || die
+
+	doman doc/layman.8
+	dohtml doc/layman.8.html
+
+	keepdir /var/lib/layman
+	keepdir /etc/layman/overlays
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+
+	# now run layman's update utility
+	einfo "Running layman-updater..."
+	"${EROOT}"/usr/bin/layman-updater
+	einfo
+}
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild
index 367aac02256a..700a5d28b03c 100644
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-9999.ebuild,v 1.24 2012/10/15 02:47:07 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-9999.ebuild,v 1.25 2012/10/21 03:00:31 dolsen Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -22,58 +22,59 @@ IUSE="bazaar cvs darcs +git mercurial subversion test"
 
 COMMON_DEPS="dev-lang/python"
 DEPEND="${COMMON_DEPS}
-    test? ( dev-vcs/subversion )
-    app-text/asciidoc"
+	test? ( dev-vcs/subversion )
+	app-text/asciidoc"
 RDEPEND="${COMMON_DEPS}
-    bazaar? ( dev-vcs/bzr )
-    cvs? ( dev-vcs/cvs )
-    darcs? ( dev-vcs/darcs )
-    git? ( dev-vcs/git )
-    mercurial? ( dev-vcs/mercurial )
-    subversion? (
-        || (
-            >=dev-vcs/subversion-1.5.4[webdav-neon]
-            >=dev-vcs/subversion-1.5.4[webdav-serf]
-        )
-    )"
+	bazaar? ( dev-vcs/bzr )
+	cvs? ( dev-vcs/cvs )
+	darcs? ( dev-vcs/darcs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	subversion? (
+		|| (
+			>=dev-vcs/subversion-1.5.4[webdav-neon]
+			>=dev-vcs/subversion-1.5.4[webdav-serf]
+		)
+	)"
 
 src_prepare() {
-    eprefixify etc/layman.cfg layman/config.py
+	eprefixify etc/layman.cfg layman/config.py
 }
 
 src_test() {
-    testing() {
-        for suite in layman/tests/{dtest,external}.py ; do
-            PYTHONPATH="." "$(PYTHON)" ${suite} \
-                    || die "test suite '${suite}' failed"
-        done
-    }
-    python_execute_function testing
+	testing() {
+		for suite in layman/tests/{dtest,external}.py ; do
+			PYTHONPATH="." "$(PYTHON)" ${suite} \
+					|| die "test suite '${suite}' failed"
+		done
+	}
+	python_execute_function testing
 }
 
 src_compile() {
-    distutils_src_compile
-    # override MAKEOPTS to prevent build failure
-    emake -j1 -C doc || die "emake -C doc failed"
+	distutils_src_compile
+	# override MAKEOPTS to prevent build failure
+	emake -j1 -C doc || die "emake -C doc failed"
 }
 
 src_install() {
-    distutils_src_install
+	distutils_src_install
 
-    insinto /etc/layman
-    doins etc/layman.cfg || die
+	insinto /etc/layman
+	doins etc/layman.cfg || die
 
-    doman doc/layman.8
-    dohtml doc/layman.8.html
+	doman doc/layman.8
+	dohtml doc/layman.8.html
 
-    keepdir /var/lib/layman
+	keepdir /var/lib/layman
+	keepdir /etc/layman/overlays
 }
 
 pkg_postinst() {
-    distutils_pkg_postinst
+	distutils_pkg_postinst
 
-    # now run layman's update utility
-    einfo "Running layman-updater..."
-    "${EROOT}"/usr/bin/layman-updater
-    einfo
+	# now run layman's update utility
+	einfo "Running layman-updater..."
+	"${EROOT}"/usr/bin/layman-updater
+	einfo
 }
diff --git a/app-portage/layman/metadata.xml b/app-portage/layman/metadata.xml
index 576dc44448c4..956db9956fdb 100644
--- a/app-portage/layman/metadata.xml
+++ b/app-portage/layman/metadata.xml
@@ -8,8 +8,10 @@
 	</maintainer>
 	<use>
 		<flag name="bazaar">Support <pkg>dev-vcs/bzr</pkg> based overlays</flag>
+		<flag name="cvs">Support <pkg>dev-vcs/cvs</pkg> based overlays</flag>
 		<flag name="darcs">Support <pkg>dev-vcs/darcs</pkg> based overlays</flag>
 		<flag name="git">Support <pkg>dev-vcs/git</pkg> based overlays</flag>
 		<flag name="mercurial">Support <pkg>dev-vcs/mercurial</pkg> based overlays</flag>
+		<flag name="subversion">Support <pkg>dev-vcs/subversion</pkg> based overlays</flag>
 	</use>
 </pkgmetadata>