Update layman to 0.9.2. Bugfix release that fixes testing and the

postinstall instructions.
(Portage version: 2203-svn)

7 files changed, 32 insertions, 69 deletions

diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog
index ec4fc9ce84eb..3c06fa612f89 100644
--- a/app-portage/layman/ChangeLog
+++ b/app-portage/layman/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/layman
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.4 2006/04/14 07:23:03 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.5 2006/05/01 19:48:59 wrobel Exp $
+
+*layman-0.9.2 (01 May 2006)
+
+  01 May 2006; <wrobel@gentoo.org> -layman-0.9.ebuild, -layman-0.9.1.ebuild,
+  +layman-0.9.2.ebuild:
+  Update layman to 0.9.2. Bugfix release that fixes testing and the
+  postinstall instructions.
 
 *layman-0.9.1 (14 Apr 2006)
 
diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index 970b62e6f0fc..6b6be97576ac 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -1,6 +1,4 @@
 MD5 eac24e9e2c3774883a13912fa9c3e6f1 ChangeLog 699
-MD5 cc37cb90e3d84ac9354c474af626ca29 files/digest-layman-0.9 61
-MD5 18b20a6eb8c012fce1e11ed53dd27efc files/digest-layman-0.9.1 63
-MD5 601361d6bf55f4678304bcfec5fdce76 layman-0.9.1.ebuild 1172
-MD5 684edcc6229d9751cc3ec0af38938f36 layman-0.9.ebuild 1172
+MD5 d6c5a3640dbe3eccc47a5268b87297eb files/digest-layman-0.9.2 63
+MD5 250c1c4bb2635701f0b44e6ce4e4e81b layman-0.9.2.ebuild 1479
 MD5 5568eb8481535148d54846ecf2301ea9 metadata.xml 278
diff --git a/app-portage/layman/files/digest-layman-0.9 b/app-portage/layman/files/digest-layman-0.9
deleted file mode 100644
index a11bef746743..000000000000
--- a/app-portage/layman/files/digest-layman-0.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7bc4d09e3826e7d529e8679ab1cbeb33 layman-0.9.tar.gz 26441
diff --git a/app-portage/layman/files/digest-layman-0.9.1 b/app-portage/layman/files/digest-layman-0.9.1
deleted file mode 100644
index 9fbb420aafa0..000000000000
--- a/app-portage/layman/files/digest-layman-0.9.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7798ab9367b7a823ba85a3513527ef16 layman-0.9.1.tar.gz 26545
diff --git a/app-portage/layman/files/digest-layman-0.9.2 b/app-portage/layman/files/digest-layman-0.9.2
new file mode 100644
index 000000000000..d4b368cda8e9
--- /dev/null
+++ b/app-portage/layman/files/digest-layman-0.9.2
@@ -0,0 +1 @@
+MD5 a2ec27ea4443eb7a9f9dac0aaedd71a3 layman-0.9.2.tar.gz 26537
diff --git a/app-portage/layman/layman-0.9.1.ebuild b/app-portage/layman/layman-0.9.2.ebuild
index 97b4ff474bc8..51a6f15642ae 100644
--- a/app-portage/layman/layman-0.9.1.ebuild
+++ b/app-portage/layman/layman-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-0.9.1.ebuild,v 1.1 2006/04/14 07:23:03 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-0.9.2.ebuild,v 1.1 2006/05/01 19:48:59 wrobel Exp $
 
 inherit eutils distutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://dev.gentoo.org/~wrobel/layman/${PF}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~ia64 ~x86"
+KEYWORDS="~x86"
 IUSE=""
 S=${WORKDIR}/${PF}
 
@@ -25,11 +25,13 @@ src_install() {
 
 	doman doc/layman.8
 	dohtml doc/layman.8.html
+
 }
 
 src_test() {
 	cd ${S}
-	einfo "Running layman doctests..."
+	einfo "Running layman doctests... [Testing requires an internet connection!]"
+	echo
 	if ! PYTHONPATH="." ${python} layman/tests/dtest.py; then
 		eerror "DocTests failed - please submit a bug report"
 		die "DocTesting failed!"
@@ -37,17 +39,27 @@ src_test() {
 }
 
 pkg_postinst() {
+	einfo "If you emerged layman for the first time, you should update your local list"
+	einfo "of available overlays first. Run "
 	echo
-	einfo "Now that you have emerged layman, you need to append the following"
-	einfo "statement to your /etc/make.conf file:"
+	einfo "layman -f"
 	echo
-	einfo "source /usr/portage/local/layman/make.conf"
+	einfo "in order to do that."
 	echo
-	einfo "Run "
+	einfo "You are then ready to add overlays into your system."
 	echo
-	einfo "layman -f"
+	einfo "layman -L"
 	echo
-	einfo "after that."
+	einfo "will display a list of available overlays."
+	echo
+	einfo "Select one and add it using"
+	echo
+	einfo "layman -a overlay-name"
+	echo
+	einfo "If this is the very first overlay you add with layman, you need to append"
+	einfo "the following statement to your /etc/make.conf file:"
+	echo
+	einfo "source /usr/portage/local/layman/make.conf"
 	echo
 	epause 5
 }
diff --git a/app-portage/layman/layman-0.9.ebuild b/app-portage/layman/layman-0.9.ebuild
deleted file mode 100644
index f4accb33ff04..000000000000
--- a/app-portage/layman/layman-0.9.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-0.9.ebuild,v 1.3 2006/03/23 22:43:23 agriffis Exp $
-
-inherit eutils distutils
-
-DESCRIPTION="A python script for retrieving gentoo overlays "
-HOMEPAGE="http://projects.gunnarwrobel.de/scripts"
-SRC_URI="http://dev.gentoo.org/~wrobel/layman/${PF}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~ia64 ~x86"
-IUSE=""
-S=${WORKDIR}/${PF}
-
-DEPEND="dev-util/subversion"
-
-src_install() {
-
-	distutils_src_install
-
-	dodir /etc/layman
-	cp etc/* ${D}/etc/layman/
-
-	doman doc/layman.8
-	dohtml doc/layman.8.html
-}
-
-src_test() {
-	cd ${S}
-	einfo "Running layman doctests..."
-	if ! PYTHONPATH="." ${python} layman/tests/dtest.py; then
-		eerror "DocTests failed - please submit a bug report"
-		die "DocTesting failed!"
-	fi
-}
-
-pkg_postinst() {
-	echo
-	einfo "Now that you have emerged layman, you need to append the following"
-	einfo "statement to your /etc/make.conf file:"
-	echo
-	einfo "source /usr/portage/local/layman/make.conf"
-	echo
-	einfo "Run "
-	echo
-	einfo "layman -f"
-	echo
-	einfo "after that."
-	echo
-	epause 5
-}