Remove old versions and replace gnome USE fag with gnome-keyring. Closes bug #218856.

Package-Manager: portage-2.1.5_rc5

6 files changed, 26 insertions, 180 deletions

diff --git a/sys-auth/pambase/ChangeLog b/sys-auth/pambase/ChangeLog
index 4d25fa16e6a7..4d70413ab5b9 100644
--- a/sys-auth/pambase/ChangeLog
+++ b/sys-auth/pambase/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/pambase
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/ChangeLog,v 1.27 2008/04/12 17:27:54 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/ChangeLog,v 1.28 2008/04/22 11:31:52 flameeyes Exp $
+
+  22 Apr 2008; Diego Pettenò <flameeyes@gentoo.org> metadata.xml,
+  -pambase-20080306.1.ebuild, -pambase-20080306.2.ebuild,
+  pambase-20080318.ebuild:
+  Remove old versions and replace gnome USE fag with gnome-keyring. Closes
+  bug #218856.
 
   12 Apr 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   pambase-20080318.ebuild:
diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index 5a5c93cd3bce..970a9eed4e07 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -1,10 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST pambase-20080305.tar.bz2 2263 RMD160 767d091d28f6edcb923f9e1f9a86c098f41987f0 SHA1 553b2278b412131c82c73c497288d9c39a7f5fd6 SHA256 00f0102d97ccedfffed404dd2735f50bcee2c552da3ad84498f848cd5ec48036
-DIST pambase-20080306.1.tar.bz2 2375 RMD160 50e9340b19a2f51ce2f1478eef8374cd9588cd2c SHA1 9434e68fe12763f41ba6dea65984e4070baede6b SHA256 ac6c00d8538fba1b2c4179e7d4a03f45b90bb312ed695e5be466805474c381a9
-DIST pambase-20080306.2.tar.bz2 2405 RMD160 81e6a267485dfbfd5a86ee5d3da288155b3e20ab SHA1 f0ff1f14a7c157daf0e64d12f9f27ea76f38d312 SHA256 d40bd559fed55a22e601083a073253098b480c6e8d4b21d598cbe15314d22126
 DIST pambase-20080318.tar.bz2 2368 RMD160 9cbbe6571aea574ce4129b554a5dc5eecdac5a76 SHA1 c7117fab51214ca98ed8bee3e1dda458af9cfab0 SHA256 4134b7b63468d217382905551b72b63d6661d6f2f88a989a5a79e878dbfae3a3
 EBUILD pambase-20080305.ebuild 2509 RMD160 41b01eedfb3e623f674c23fe55ee923ee2b4db61 SHA1 8a59eacdfabe529d69368bc0961fdf36a9300607 SHA256 924672c657687fa646c04b5f69ce6ff418cb28af438cdbffca850cbcee8f02a2
-EBUILD pambase-20080306.1.ebuild 2624 RMD160 a90360118fec6fde92b65867c2b78f9aec1e4d98 SHA1 63f9cac73cfc406a78f312fe0d75d78e101e5ecb SHA256 6ea309a2c43f56f28ef620014cecfa7b316193cd3edf0019b58c0737fc07ac0f
-EBUILD pambase-20080306.2.ebuild 2707 RMD160 f39f38b301fe03ea15e31663b2749d9a2f4da481 SHA1 b6880b3170f357a1add80c17da02368389677f93 SHA256 1d247d9559b582870e5cd1b8ffb638823d8e2810caeca9c2f484d15d481daa41
-EBUILD pambase-20080318.ebuild 2745 RMD160 61da1b2b2326eff2e203b17df06ac45f27ce6bec SHA1 f134e224d3531f7f347818e3b420b36a12f30bee SHA256 470d37ead18ed2c310536d55178e0a9e2bb44b9c713738de5fa1257374993538
-MISC ChangeLog 4374 RMD160 c5e476acb52278ea5cae0c37750965520610537f SHA1 3dbc3a5ea9f55eb2752d192bbbdf026bd30e34a2 SHA256 946e112bc6b72d764b2e9577875d874a4a6050c8a6e121504a1d770f15e5b823
-MISC metadata.xml 1768 RMD160 c14faea683c884164ec39b1aae39a478a9462830 SHA1 fc40e589411dea68e129280c26577d4faa0da019 SHA256 4178a592c44e1b63bc329f5f44d44944f01c002e1e2fa5f41cbaa01d702b8e8f
+EBUILD pambase-20080318.ebuild 2776 RMD160 ebbf4ca3cffe8bfc458917dc870b044eff7fe1ec SHA1 83562b3cc09e2091f5680cece897c92e455f4ded SHA256 4437384fd076ef20c6d16a41fc06fe89ebb3f488b9d4271d7b0b8aab76d7c7a8
+MISC ChangeLog 4616 RMD160 a32231ec0980efd9d6ff57a5a323ad16f6816ba2 SHA1 30ee8e7a876c2d6b5d64d78a5df285f4248df630 SHA256 397583e2e6335f7aed24e8465f7752808c7d7e1e5a77f26553aec49c482cef08
+MISC metadata.xml 1776 RMD160 4d482c1c48ed665ae0aabecf8ed6069025533617 SHA1 67806a566babe65995d171890a646b16e62060ce SHA256 47a5a8cc94c0b461ddd622fb9d80664f52bb22084eeac203ab10421af157ce28
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgNzK4ACgkQAiZjviIA2Xh7LQCbB3OEV1m/jCw+OtxyQkM2lC+N
+h44AoNsZNNjCv1XMAYT58sImSWIUmM1h
+=/4Fy
+-----END PGP SIGNATURE-----
diff --git a/sys-auth/pambase/metadata.xml b/sys-auth/pambase/metadata.xml
index 56c39c699341..d0622efecd0f 100644
--- a/sys-auth/pambase/metadata.xml
+++ b/sys-auth/pambase/metadata.xml
@@ -17,7 +17,7 @@
       allows for console logins to make use of ConsoleKit
       authorization.
     </flag>
-    <flag name="gnome">
+    <flag name="gnome-keyring">
       Enable pam_gnome_keyring module on system login stack. This
       enables proper Gnome Keyring access to logins, whether they are
       done with the login shell, a Desktop Manager or a remote login
diff --git a/sys-auth/pambase/pambase-20080306.1.ebuild b/sys-auth/pambase/pambase-20080306.1.ebuild
deleted file mode 100644
index d093d35d8aea..000000000000
--- a/sys-auth/pambase/pambase-20080306.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20080306.1.ebuild,v 1.2 2008/03/06 11:09:27 armin76 Exp $
-
-inherit eutils
-
-DESCRIPTION="PAM base configuration files"
-SRC_URI="http://www.flameeyes.eu/gentoo-distfiles/${P}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org/proj/en/base/pam/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~hppa ~ia64 ~sparc ~x86"
-IUSE="debug cracklib passwdqc consolekit gnome selinux"
-
-RDEPEND="
-	|| (
-		>=sys-libs/pam-0.99.9.0-r1
-		( sys-auth/openpam
-		  || ( sys-freebsd/freebsd-pam-modules sys-netbsd/netbsd-pam-modules )
-		)
-	)
-	cracklib? ( >=sys-libs/pam-0.99 )
-	consolekit? ( sys-auth/consolekit )
-	gnome? ( >=gnome-base/gnome-keyring-2.20 )
-	selinux? ( >=sys-libs/pam-0.99 )
-	passwdqc? ( >=sys-auth/pam_passwdqc-1.0.4 )
-	!<sys-freebsd/freebsd-pam-modules-6.2-r1
-	!<sys-libs/pam-0.99.9.0-r1"
-DEPEND=""
-
-RESTRICT="binchecks"
-
-pkg_setup() {
-	if use cracklib && ! built_with_use sys-libs/pam cracklib; then
-		eerror "To enable cracklib support in the main PAM configuration"
-		eerror "you need to enable cracklib USE flag on sys-libs/pam"
-		eerror "first."
-		die "Missing pam_cracklib"
-	fi
-
-	if use selinux && ! built_with_use sys-libs/pam selinux; then
-		eerror "To enable selinux support in the main PAM configuration"
-		eerror "you need to enable selinux USE flag on sys-libs/pam"
-		eerror "first."
-		die "Missing pam_selinux"
-	fi
-
-	if use consolekit && ! built_with_use sys-auth/consolekit pam; then
-		eerror "To enable ConsoleKit support in the main PAM configuration"
-		eerror "you need to enable pam USE flag on sys-auth/consolekit"
-		eerror "first."
-		die "Missing pam_ck_connector"
-	fi
-
-	if use gnome && ! built_with_use gnome-base/gnome-keyring pam; then
-		eerror "To enable GNOME Keyring support in the main PAM configuration"
-		eerror "you need to enable pam USE flag on gnome-base/gnome-keyring"
-		eerror "first."
-		die "Missing pam_gnome_keyring"
-	fi
-}
-
-src_compile() {
-	has_version sys-libs/pam && implementation="linux-pam"
-	has_version sys-auth/openpam && implementation="openpam"
-
-	emake \
-		GIT=true \
-		DEBUG=$(use debug && echo yes || echo no) \
-		CRACKLIB=$(use cracklib && echo yes || echo no) \
-		PASSWDQC=$(use passwdqc && echo yes || echo no) \
-		CONSOLEKIT=$(use consolekit && echo yes || echo no) \
-		GNOME_KEYRING=$(use gnome && echo yes || echo no) \
-		SELINUX=$(use selinux && echo yes || echo no) \
-		IMPLEMENTATION=${implementation} \
-		|| die "emake failed"
-}
-
-src_install() {
-	emake GIT=true DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/sys-auth/pambase/pambase-20080306.2.ebuild b/sys-auth/pambase/pambase-20080306.2.ebuild
deleted file mode 100644
index 18013146bb68..000000000000
--- a/sys-auth/pambase/pambase-20080306.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20080306.2.ebuild,v 1.4 2008/03/17 14:13:52 coldwind Exp $
-
-inherit eutils
-
-DESCRIPTION="PAM base configuration files"
-SRC_URI="http://www.flameeyes.eu/gentoo-distfiles/${P}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org/proj/en/base/pam/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~x86"
-IUSE="debug cracklib passwdqc consolekit gnome selinux mktemp"
-
-RDEPEND="
-	|| (
-		>=sys-libs/pam-0.99.9.0-r1
-		( sys-auth/openpam
-		  || ( sys-freebsd/freebsd-pam-modules sys-netbsd/netbsd-pam-modules )
-		)
-	)
-	cracklib? ( >=sys-libs/pam-0.99 )
-	consolekit? ( sys-auth/consolekit )
-	gnome? ( >=gnome-base/gnome-keyring-2.20 )
-	selinux? ( >=sys-libs/pam-0.99 )
-	passwdqc? ( >=sys-auth/pam_passwdqc-1.0.4 )
-	mktemp? ( sys-auth/pam_mktemp )
-	!<sys-freebsd/freebsd-pam-modules-6.2-r1
-	!<sys-libs/pam-0.99.9.0-r1"
-DEPEND=""
-
-RESTRICT="binchecks"
-
-pkg_setup() {
-	if use cracklib && ! built_with_use sys-libs/pam cracklib; then
-		eerror "To enable cracklib support in the main PAM configuration"
-		eerror "you need to enable cracklib USE flag on sys-libs/pam"
-		eerror "first."
-		die "Missing pam_cracklib"
-	fi
-
-	if use selinux && ! built_with_use sys-libs/pam selinux; then
-		eerror "To enable selinux support in the main PAM configuration"
-		eerror "you need to enable selinux USE flag on sys-libs/pam"
-		eerror "first."
-		die "Missing pam_selinux"
-	fi
-
-	if use consolekit && ! built_with_use sys-auth/consolekit pam; then
-		eerror "To enable ConsoleKit support in the main PAM configuration"
-		eerror "you need to enable pam USE flag on sys-auth/consolekit"
-		eerror "first."
-		die "Missing pam_ck_connector"
-	fi
-
-	if use gnome && ! built_with_use gnome-base/gnome-keyring pam; then
-		eerror "To enable GNOME Keyring support in the main PAM configuration"
-		eerror "you need to enable pam USE flag on gnome-base/gnome-keyring"
-		eerror "first."
-		die "Missing pam_gnome_keyring"
-	fi
-}
-
-src_compile() {
-	has_version sys-libs/pam && implementation="linux-pam"
-	has_version sys-auth/openpam && implementation="openpam"
-
-	emake \
-		GIT=true \
-		DEBUG=$(use debug && echo yes || echo no) \
-		CRACKLIB=$(use cracklib && echo yes || echo no) \
-		PASSWDQC=$(use passwdqc && echo yes || echo no) \
-		CONSOLEKIT=$(use consolekit && echo yes || echo no) \
-		GNOME_KEYRING=$(use gnome && echo yes || echo no) \
-		SELINUX=$(use selinux && echo yes || echo no) \
-		MKTEMP=$(use mktemp && echo yes || echo no) \
-		IMPLEMENTATION=${implementation} \
-		|| die "emake failed"
-}
-
-src_install() {
-	emake GIT=true DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/sys-auth/pambase/pambase-20080318.ebuild b/sys-auth/pambase/pambase-20080318.ebuild
index a9ac3a257cdd..7f880099b221 100644
--- a/sys-auth/pambase/pambase-20080318.ebuild
+++ b/sys-auth/pambase/pambase-20080318.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20080318.ebuild,v 1.4 2008/04/12 17:27:54 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20080318.ebuild,v 1.5 2008/04/22 11:31:52 flameeyes Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.flameeyes.eu/gentoo-distfiles/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE="debug cracklib passwdqc consolekit gnome selinux mktemp"
+IUSE="debug cracklib passwdqc consolekit gnome-keyring selinux mktemp"
 RESTRICT="binchecks"
 
 RDEPEND="
@@ -23,7 +23,7 @@ RDEPEND="
 	)
 	cracklib? ( >=sys-libs/pam-0.99 )
 	consolekit? ( sys-auth/consolekit )
-	gnome? ( >=gnome-base/gnome-keyring-2.20 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20 )
 	selinux? ( >=sys-libs/pam-0.99 )
 	passwdqc? ( >=sys-auth/pam_passwdqc-1.0.4 )
 	mktemp? ( sys-auth/pam_mktemp )
@@ -53,7 +53,7 @@ pkg_setup() {
 		die "Missing pam_ck_connector"
 	fi
 
-	if use gnome && ! built_with_use gnome-base/gnome-keyring pam; then
+	if use gnome-keyring && ! built_with_use gnome-base/gnome-keyring pam; then
 		eerror "To enable GNOME Keyring support in the main PAM configuration"
 		eerror "you need to enable pam USE flag on gnome-base/gnome-keyring"
 		eerror "first."
@@ -71,7 +71,7 @@ src_compile() {
 		CRACKLIB=$(use cracklib && echo yes || echo no) \
 		PASSWDQC=$(use passwdqc && echo yes || echo no) \
 		CONSOLEKIT=$(use consolekit && echo yes || echo no) \
-		GNOME_KEYRING=$(use gnome && echo yes || echo no) \
+		GNOME_KEYRING=$(use gnome-keyring && echo yes || echo no) \
 		SELINUX=$(use selinux && echo yes || echo no) \
 		MKTEMP=$(use mktemp && echo yes || echo no) \
 		IMPLEMENTATION=${implementation} \