remove old version, rc4 is in the tree. update 9999 ebuild.

3 files changed, 8 insertions, 134 deletions

diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index 2df9dfc..9f728af 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -1,4 +1,2 @@
-DIST layman-2.0.0_rc3.tar.gz 74440 SHA256 fcbf59924f2fa62ef16ace2b4d66f9677c57396209b9c41a3548486f8d7453ab SHA512 5e18565f208ca18fbf14a9e3c255f26bf6b806fd809108ca05e2f2ebf46b1bd2557f3bacdef78df802832a5868e5533feb24103e7fb2d997302a961b01582a0d WHIRLPOOL 1a52406fad2fc42f8b8fba8545b33898696e8a05f4166815cd0c143328ffdd0b22eff04115d6541e038d605ff2a896521773709a41d1dc610929701831d9e62f
-EBUILD layman-2.0.0_rc3.ebuild 2801 SHA256 0a483b5dd78b60130fba8378cb118f0ba686e9889e6d01449452db8f540027ae SHA512 0f4dd8447c6581398d7931242961be0a9335c64de82cdf29fe1322522646745883a09fe2309d97fb2fa919a94051dc1604508a4df2d852c6212746732f954d04 WHIRLPOOL bf2e1e53c21e56b9cb2dece0fd7425220ff9a2819f6086657b4ebb937d6d08051302b0d6f566161539977ed220df27305bf04abf4fed1395f278185fb25bbe95
-EBUILD layman-9999.ebuild 2768 SHA256 486fb708405dab9660f4630ecf5a79cb6f672b6ce82213db4e38f608fd88a98b SHA512 ba510b2750a484fa24847bcbb9068230e9da7c1e55793cf14bc00f07148899177fff0fe6ae6de20253129903db8f6fc89eba331d3930809f965b16285ef36929 WHIRLPOOL 401f66d945edc1e817131cd2f5bde7025981e5a4e3df2f40e20fa4378f1672bc3c4997c4204ba637200ce97bfac148d50a6f5d4bb98b023aa898bf14a33fb59b
+EBUILD layman-9999.ebuild 1754 SHA256 86c7ea7250fdf61d312a1b16a2f9e328e72ad66bdfb688c97f5719b65458ef54 SHA512 589606a4bcc24599feff477fff0d4a34ead4c61327178d5dfd6324f9c5dd40e210bd0a131b9036e47003c96a92faffc366fcd7ecfc96d46d18c8cd0315b4071e WHIRLPOOL b8dcd32a85fa23cd868009d92d790a259dba7c305e9865934477f5d086421f6b5ee6e4ca1b8b4f40a35204dbd72462901f5ed813151b4568fa555e618ed43755
 MISC metadata.xml 912 SHA256 67a4974996e495ff3f49e3874d9e1d6f4fe251e9e49d92385ef14d4f23550b10 SHA512 1316c41eb9d6c1b5d57ed69bd2b50a2ce100af9d94a6aa16d8a56978d1ddd57fc58b5cd8cd101e9ec54ce1248e43868277d3d0b9f03e87587155e455d3e50783 WHIRLPOOL 438e1a0603c20401b0b64104591a3de92bda266bf127c51fd986420fb6f415d0fa9d67c01f2b3d802a2bcc9095d233d18cddaac05696262df28e6ae1efaa17ab
diff --git a/app-portage/layman/layman-2.0.0_rc3.ebuild b/app-portage/layman/layman-2.0.0_rc3.ebuild
deleted file mode 100644
index b1f9365..0000000
--- a/app-portage/layman/layman-2.0.0_rc3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2011 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_rc3.ebuild,v 1.1 2011/09/17 21:15:08 idl0r 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 ~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
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-
-	ewarn "The installed db file '%(storage)/overlays.xml'"
-	ewarn "has been renamed to '%(storage)/installed.xml'"
-
-	if "${EROOT}/var/lib/layman/overlays.xml"; then
-		mv "${EROOT}/var/lib/layman/overlays.xml" "${EROOT}/var/lib/layman/installed.xml"
-		einfo "${EROOT}/var/lib/layman/overlays.xml has been moved to ${EROOT}/var/lib/layman/installed.xml"
-	fi
-
-	einfo "You are now ready to add overlays into your system."
-	einfo
-	einfo "  layman -L"
-	einfo
-	einfo "will display a list of available overlays."
-	einfo
-	elog  "Select an overlay and add it using"
-	elog
-	elog  "  layman -a overlay-name"
-	elog
-	elog  "If this is the very first overlay you add with layman,"
-	elog  "you need to append the following statement to your"
-	elog  "/etc/make.conf file:"
-	elog
-	elog  "  source /var/lib/layman/make.conf"
-	elog
-	elog  "If you modify the 'storage' parameter in the layman"
-	elog  "configuration file (/etc/layman/layman.cfg) you will"
-	elog  "need to adapt the path given above to the new storage"
-	elog  "directory."
-	elog
-	ewarn "Please add the 'source' statement to make.conf only AFTER "
-	ewarn "you added your first overlay. Otherwise portage will fail."
-}
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild
index 937613c..700a5d2 100644
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.22 2011/09/17 21:15:08 idl0r 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"
@@ -18,7 +18,7 @@ EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/layman.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="bazaar cvs darcs git mercurial subversion test"
+IUSE="bazaar cvs darcs +git mercurial subversion test"
 
 COMMON_DEPS="dev-lang/python"
 DEPEND="${COMMON_DEPS}
@@ -67,40 +67,14 @@ src_install() {
 	dohtml doc/layman.8.html
 
 	keepdir /var/lib/layman
+	keepdir /etc/layman/overlays
 }
 
 pkg_postinst() {
 	distutils_pkg_postinst
 
-	ewarn "The installed db file '%(storage)/overlays.xml'"
-	ewarn "has been renamed to '%(storage)/installed.xml'"
-
-	if "${EROOT}/var/lib/layman/overlays.xml"; then
-		mv "${EROOT}/var/lib/layman/overlays.xml" "${EROOT}/var/lib/layman/installed.xml"
-		einfo "${EROOT}/var/lib/layman/overlays.xml has been moved to ${EROOT}/var/lib/layman/installed.xml"
-	fi
-
-	einfo "You are now ready to add overlays into your system."
-	einfo
-	einfo "  layman -L"
-	einfo
-	einfo "will display a list of available overlays."
+	# now run layman's update utility
+	einfo "Running layman-updater..."
+	"${EROOT}"/usr/bin/layman-updater
 	einfo
-	elog  "Select an overlay and add it using"
-	elog
-	elog  "  layman -a overlay-name"
-	elog
-	elog  "If this is the very first overlay you add with layman,"
-	elog  "you need to append the following statement to your"
-	elog  "/etc/make.conf file:"
-	elog
-	elog  "  source /var/lib/layman/make.conf"
-	elog
-	elog  "If you modify the 'storage' parameter in the layman"
-	elog  "configuration file (/etc/layman/layman.cfg) you will"
-	elog  "need to adapt the path given above to the new storage"
-	elog  "directory."
-	elog
-	ewarn "Please add the 'source' statement to make.conf only AFTER "
-	ewarn "you added your first overlay. Otherwise portage will fail."
 }