Testing layman 1.0.99

svn path=/stable/; revision=794

6 files changed, 28 insertions, 114 deletions

diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index f8a92f8..9e0501e 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -1,16 +1,8 @@
-DIST layman-1.0.10.tar.gz 34384 RMD160 67442e123d468f4cc8284d34e49ded75178e4a52 SHA1 25c0302562c7ef8d5b7acef031154a3c93e61bc0 SHA256 c0b3bb5b6609ebbecaf4270d2ef7deb33e1ec61f72755a31d3dd7ca49d1acf03
-DIST layman-1.0.9.tar.gz 33929 RMD160 6222296e6ade8d4e805e6bca673ec7f1f94969de SHA1 9308988189a3b237307094e00b9ab92fa452bfb9 SHA256 bf7eea4d187c308de0f48223a9f306524aea4f34aa12be5a55bd9f1567199212
-EBUILD layman-1.0.10.ebuild 2069 RMD160 a1f5ac54135344aacd4c45df3b7ce277a5a3f74b SHA1 8063895597921e1fd281395c95740228ca31a7a0 SHA256 ac08daa2f59995eb2cdf6eb96e59b99f3bfe7a5c2c73a4bdbbd45e436a5e05c8
-MD5 3dba986570b9475b35c0e94801172640 layman-1.0.10.ebuild 2069
-RMD160 a1f5ac54135344aacd4c45df3b7ce277a5a3f74b layman-1.0.10.ebuild 2069
-SHA256 ac08daa2f59995eb2cdf6eb96e59b99f3bfe7a5c2c73a4bdbbd45e436a5e05c8 layman-1.0.10.ebuild 2069
-EBUILD layman-1.0.9.ebuild 2069 RMD160 a1f5ac54135344aacd4c45df3b7ce277a5a3f74b SHA1 8063895597921e1fd281395c95740228ca31a7a0 SHA256 ac08daa2f59995eb2cdf6eb96e59b99f3bfe7a5c2c73a4bdbbd45e436a5e05c8
-MD5 3dba986570b9475b35c0e94801172640 layman-1.0.9.ebuild 2069
-RMD160 a1f5ac54135344aacd4c45df3b7ce277a5a3f74b layman-1.0.9.ebuild 2069
-SHA256 ac08daa2f59995eb2cdf6eb96e59b99f3bfe7a5c2c73a4bdbbd45e436a5e05c8 layman-1.0.9.ebuild 2069
-MD5 013dbb71501506ca79ba3c289229ab9e files/digest-layman-1.0.10 238
-RMD160 2beb2dfefea88a89368a550edb8f284ca33d7238 files/digest-layman-1.0.10 238
-SHA256 ba349166be5bf1460464ce3ee6e95781742d08cfd2332120bf6cf83e35b4766c files/digest-layman-1.0.10 238
-MD5 0d8c4b19b4a15480a48868f0babfea24 files/digest-layman-1.0.9 235
-RMD160 887af4d36083cfe29c0d17372294f2999634156e files/digest-layman-1.0.9 235
-SHA256 4e98127dd5cf5e505dc98da77a41e6507c49baad479b1d62feebd9f1df395df4 files/digest-layman-1.0.9 235
+DIST layman-1.0.99.tar.gz 34515 RMD160 944dfc1755d2d688ae33cc2c5588be77f25963fa SHA1 5c8bc4081842acb8b95d29a0f06d18cde2e4f9ff SHA256 d308b7e06ce027c2daa77adab7a8d265ed6a7c528a271410681848edf27a2e6b
+EBUILD layman-1.0.99.ebuild 2095 RMD160 cec143536a4f4efdbec36e0dcffe46e00308110e SHA1 fa88b83654878b99f8fd509b644afaa5c601a7fa SHA256 37aa08c8b9846018aafa13054ad5cda7e2e1b283b7373ae422c7dfbecd9ec754
+MD5 f7aac38a06bf73ff8c9f3cbb2ce7c9ad layman-1.0.99.ebuild 2095
+RMD160 cec143536a4f4efdbec36e0dcffe46e00308110e layman-1.0.99.ebuild 2095
+SHA256 37aa08c8b9846018aafa13054ad5cda7e2e1b283b7373ae422c7dfbecd9ec754 layman-1.0.99.ebuild 2095
+MD5 5ed70bce43cd36a60a609aa1d5709fac files/digest-layman-1.0.99 238
+RMD160 81d8fdf50c8f5ee3d5f8c678b16e0b265f7652f7 files/digest-layman-1.0.99 238
+SHA256 491a8cc79f32b0649ae20eb95625ee1c620f9be26129891d7fd0af000df61429 files/digest-layman-1.0.99 238
diff --git a/app-portage/layman/files/digest-layman-1.0.10 b/app-portage/layman/files/digest-layman-1.0.10
deleted file mode 100644
index aa6cb1c..0000000
--- a/app-portage/layman/files/digest-layman-1.0.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 24a76ba254431e48856b7965658c03ef layman-1.0.10.tar.gz 34384
-RMD160 67442e123d468f4cc8284d34e49ded75178e4a52 layman-1.0.10.tar.gz 34384
-SHA256 c0b3bb5b6609ebbecaf4270d2ef7deb33e1ec61f72755a31d3dd7ca49d1acf03 layman-1.0.10.tar.gz 34384
diff --git a/app-portage/layman/files/digest-layman-1.0.9 b/app-portage/layman/files/digest-layman-1.0.9
deleted file mode 100644
index cd854b0..0000000
--- a/app-portage/layman/files/digest-layman-1.0.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 75e1120ea8828e343a8c3e9f80294b01 layman-1.0.9.tar.gz 33929
-RMD160 6222296e6ade8d4e805e6bca673ec7f1f94969de layman-1.0.9.tar.gz 33929
-SHA256 bf7eea4d187c308de0f48223a9f306524aea4f34aa12be5a55bd9f1567199212 layman-1.0.9.tar.gz 33929
diff --git a/app-portage/layman/files/digest-layman-1.0.99 b/app-portage/layman/files/digest-layman-1.0.99
new file mode 100644
index 0000000..7e5eef1
--- /dev/null
+++ b/app-portage/layman/files/digest-layman-1.0.99
@@ -0,0 +1,3 @@
+MD5 02a7f7c13fba10d614eaca6098ca3d89 layman-1.0.99.tar.gz 34515
+RMD160 944dfc1755d2d688ae33cc2c5588be77f25963fa layman-1.0.99.tar.gz 34515
+SHA256 d308b7e06ce027c2daa77adab7a8d265ed6a7c528a271410681848edf27a2e6b layman-1.0.99.tar.gz 34515
diff --git a/app-portage/layman/layman-1.0.9.ebuild b/app-portage/layman/layman-1.0.9.ebuild
deleted file mode 100644
index c7553a3..0000000
--- a/app-portage/layman/layman-1.0.9.ebuild
+++ /dev/null
@@ -1,76 +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-1.0.8.ebuild,v 1.3 2006/12/29 17:26:03 cardoe Exp $
-
-inherit eutils distutils
-
-DESCRIPTION="A python script for retrieving gentoo overlays."
-HOMEPAGE="http://projects.gunnarwrobel.de/scripts"
-SRC_URI="http://build.pardus.de/downloads/${PF}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-S=${WORKDIR}/${PF}
-
-DEPEND="dev-util/subversion"
-
-pkg_setup() {
-	if built_with_use dev-util/subversion nowebdav; then
-		eerror "You must rebuild your subversion without the nowebdav USE flag"
-		die "You must rebuild your subversion without the nowebdav USE flag"
-	fi
-}
-
-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..."
-	echo
-	if ! PYTHONPATH="." ${python} layman/tests/dtest.py; then
-		eerror "DocTests failed - please submit a bug report"
-		die "DocTesting failed!"
-	fi
-}
-
-pkg_postinst() {
-	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
-	ewarn "Use the -k switch to also list overlays that are"
-	ewarn "considered less secure."
-	einfo
-	einfo "Select an overlay and add it using"
-	einfo
-	einfo "layman -a overlay-name"
-	einfo
-	einfo "If this is the very first overlay you add with layman,"
-	einfo "you need to append the following statement to your"
-	einfo "/etc/make.conf file:"
-	einfo
-	einfo "source /usr/portage/local/layman/make.conf"
-	einfo
-	einfo "If you modify the 'storage' parameter in the layman"
-	einfo "configuration file (/etc/layman/layman.cfg) you will"
-	einfo "need to adapt the path given above to the new storage"
-	einfo "directory."
-	einfo
-	ewarn "Please add the 'source' statement to make.conf only AFTER "
-	ewarn "you added your first overlay. Otherwise portage will fail."
-	epause 5
-}
diff --git a/app-portage/layman/layman-1.0.10.ebuild b/app-portage/layman/layman-1.0.99.ebuild
index c7553a3..f246993 100644
--- a/app-portage/layman/layman-1.0.10.ebuild
+++ b/app-portage/layman/layman-1.0.99.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.0.8.ebuild,v 1.3 2006/12/29 17:26:03 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.0.10.ebuild,v 1.1 2007/01/09 18:01:15 wrobel Exp $
 
 inherit eutils distutils
 
@@ -14,10 +14,11 @@ KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 S=${WORKDIR}/${PF}
 
-DEPEND="dev-util/subversion"
+DEPEND=""
+RDEPEND=""
 
 pkg_setup() {
-	if built_with_use dev-util/subversion nowebdav; then
+	if has_version dev-util/subversion && built_with_use dev-util/subversion nowebdav; then
 		eerror "You must rebuild your subversion without the nowebdav USE flag"
 		die "You must rebuild your subversion without the nowebdav USE flag"
 	fi
@@ -55,20 +56,20 @@ pkg_postinst() {
 	ewarn "Use the -k switch to also list overlays that are"
 	ewarn "considered less secure."
 	einfo
-	einfo "Select an overlay and add it using"
+	elog  "Select an overlay and add it using"
 	einfo
-	einfo "layman -a overlay-name"
+	elog  "layman -a overlay-name"
 	einfo
-	einfo "If this is the very first overlay you add with layman,"
-	einfo "you need to append the following statement to your"
-	einfo "/etc/make.conf file:"
-	einfo
-	einfo "source /usr/portage/local/layman/make.conf"
-	einfo
-	einfo "If you modify the 'storage' parameter in the layman"
-	einfo "configuration file (/etc/layman/layman.cfg) you will"
-	einfo "need to adapt the path given above to the new storage"
-	einfo "directory."
+	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 /usr/portage/local/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."
 	einfo
 	ewarn "Please add the 'source' statement to make.conf only AFTER "
 	ewarn "you added your first overlay. Otherwise portage will fail."