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

(Portage version: 2.1.5_rc5)

5 files changed, 13 insertions, 173 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/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} \