Renamed useflags ssh/kerberos to pam_ssh/pam_krb5 and changed kerberos dep

to >=sys-auth/pam_krb5-4.3

(Portage version: 2.1.9.24/cvs/Linux x86_64)

6 files changed, 31 insertions, 25 deletions

diff --git a/sys-auth/pambase/ChangeLog b/sys-auth/pambase/ChangeLog
index 2403ba6c6179..b8224ccf6a98 100644
--- a/sys-auth/pambase/ChangeLog
+++ b/sys-auth/pambase/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/pambase
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/ChangeLog,v 1.101 2010/11/27 12:35:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/ChangeLog,v 1.102 2010/11/28 16:04:45 constanze Exp $
+
+  28 Nov 2010; Constanze Hausner <constanze@gentoo.org>
+  pambase-20090620.1-r1.ebuild, pambase-20100310.ebuild,
+  pambase-20100925.ebuild, pambase-20101024.ebuild, metadata.xml:
+  Renamed useflags ssh/kerberos to pam_ssh/pam_krb5 and changed kerberos dep
+  to >=sys-auth/pam_krb5-4.3
 
   27 Nov 2010; Raúl Porcel <armin76@gentoo.org> pambase-20101024.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable
diff --git a/sys-auth/pambase/metadata.xml b/sys-auth/pambase/metadata.xml
index 38b7597267fb..533769a0a0cf 100644
--- a/sys-auth/pambase/metadata.xml
+++ b/sys-auth/pambase/metadata.xml
@@ -40,7 +40,7 @@
       handling. This module creates a private temporary directory for
       the user, and sets TMP and TMPDIR accordingly.
     </flag>
-    <flag name="ssh">
+    <flag name="pam_ssh">
       Enable pam_ssh module on system auth stack for authentication
       and session handling. This module will accept as password the
       passphrase of a private SSH key (one of ~/.ssh/id_rsa,
@@ -61,7 +61,7 @@
       will not be compatible with systems using an earlier glibc
       version.
     </flag>
-    <flag name="kerberos">
+    <flag name="pam_krb5">
       Enable pam_krb5 module on system auth stack, as an alternative
       to pam_unix. If Kerberos authentication succeed, only pam_unix
       will be ignore, and all the other modules will proceed as usual,
diff --git a/sys-auth/pambase/pambase-20090620.1-r1.ebuild b/sys-auth/pambase/pambase-20090620.1-r1.ebuild
index 467c15604475..667d3fd0cec2 100644
--- a/sys-auth/pambase/pambase-20090620.1-r1.ebuild
+++ b/sys-auth/pambase/pambase-20090620.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20090620.1-r1.ebuild,v 1.9 2010/09/03 14:12:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20090620.1-r1.ebuild,v 1.10 2010/11/28 16:04:45 constanze Exp $
 
 EAPI=2
 
@@ -13,7 +13,7 @@ SRC_URI="http://dev.gentoo.org/~flameeyes/pambase/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="debug cracklib passwdqc consolekit gnome-keyring selinux mktemp ssh +sha512"
+IUSE="debug cracklib passwdqc consolekit gnome-keyring selinux mktemp pam_ssh +sha512"
 RESTRICT="binchecks"
 
 RDEPEND="
@@ -29,7 +29,7 @@ RDEPEND="
 	selinux? ( >=sys-libs/pam-0.99[selinux] )
 	passwdqc? ( >=sys-auth/pam_passwdqc-1.0.4 )
 	mktemp? ( sys-auth/pam_mktemp )
-	ssh? ( sys-auth/pam_ssh )
+	pam_ssh? ( sys-auth/pam_ssh )
 	sha512? ( >=sys-libs/pam-1.0.1 )
 	!<sys-freebsd/freebsd-pam-modules-6.2-r1
 	!<sys-libs/pam-0.99.9.0-r1"
@@ -64,7 +64,7 @@ src_compile() {
 		$(use_var GNOME_KEYRING gnome-keyring) \
 		$(use_var selinux) \
 		$(use_var mktemp) \
-		$(use_var PAM_SSH ssh) \
+		$(use_var PAM_SSH pam_ssh) \
 		$(use_var sha512) \
 		IMPLEMENTATION=${implementation} \
 		LINUX_PAM_VERSION=${linux_pam_version} \
diff --git a/sys-auth/pambase/pambase-20100310.ebuild b/sys-auth/pambase/pambase-20100310.ebuild
index 6838fab96a50..a9d8635d6185 100644
--- a/sys-auth/pambase/pambase-20100310.ebuild
+++ b/sys-auth/pambase/pambase-20100310.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20100310.ebuild,v 1.8 2010/09/03 14:12:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20100310.ebuild,v 1.9 2010/11/28 16:04:45 constanze Exp $
 
 EAPI=3
 
@@ -13,7 +13,7 @@ SRC_URI="http://dev.gentoo.org/~flameeyes/pambase/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="debug cracklib passwdqc consolekit gnome-keyring selinux mktemp ssh +sha512"
+IUSE="debug cracklib passwdqc consolekit gnome-keyring selinux mktemp pam_ssh +sha512"
 RESTRICT="binchecks"
 
 RDEPEND="
@@ -29,7 +29,7 @@ RDEPEND="
 	selinux? ( >=sys-libs/pam-0.99[selinux] )
 	passwdqc? ( >=sys-auth/pam_passwdqc-1.0.4 )
 	mktemp? ( sys-auth/pam_mktemp )
-	ssh? ( sys-auth/pam_ssh )
+	pam_ssh? ( sys-auth/pam_ssh )
 	sha512? ( >=sys-libs/pam-1.0.1 )
 	!<sys-freebsd/freebsd-pam-modules-6.2-r1
 	!<sys-libs/pam-0.99.9.0-r1"
@@ -64,7 +64,7 @@ src_compile() {
 		$(use_var GNOME_KEYRING gnome-keyring) \
 		$(use_var selinux) \
 		$(use_var mktemp) \
-		$(use_var PAM_SSH ssh) \
+		$(use_var PAM_SSH pam_ssh) \
 		$(use_var sha512) \
 		IMPLEMENTATION=${implementation} \
 		LINUX_PAM_VERSION=${linux_pam_version} \
diff --git a/sys-auth/pambase/pambase-20100925.ebuild b/sys-auth/pambase/pambase-20100925.ebuild
index fe3656ddff5e..42e82d28a27f 100644
--- a/sys-auth/pambase/pambase-20100925.ebuild
+++ b/sys-auth/pambase/pambase-20100925.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20100925.ebuild,v 1.2 2010/10/22 03:58:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20100925.ebuild,v 1.3 2010/11/28 16:04:45 constanze Exp $
 
 EAPI=3
 
@@ -13,7 +13,7 @@ SRC_URI="http://dev.gentoo.org/~flameeyes/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="debug cracklib passwdqc consolekit gnome-keyring selinux mktemp ssh +sha512 kerberos minimal"
+IUSE="debug cracklib passwdqc consolekit gnome-keyring selinux mktemp pam_ssh +sha512 pam_krb5 minimal"
 RESTRICT="binchecks"
 
 RDEPEND="
@@ -29,11 +29,11 @@ RDEPEND="
 	selinux? ( >=sys-libs/pam-0.99[selinux] )
 	passwdqc? ( >=sys-auth/pam_passwdqc-1.0.4 )
 	mktemp? ( sys-auth/pam_mktemp )
-	ssh? ( sys-auth/pam_ssh )
+	pam_ssh? ( sys-auth/pam_ssh )
 	sha512? ( >=sys-libs/pam-1.0.1 )
-	kerberos? (
+	pam_krb5? (
 		>=sys-libs/pam-1.1.0
-		sys-auth/pam_krb5
+		>=sys-auth/pam_krb5-4.3
 	)
 	!<sys-freebsd/freebsd-pam-modules-6.2-r1
 	!<sys-libs/pam-0.99.9.0-r1"
@@ -68,9 +68,9 @@ src_compile() {
 		$(use_var GNOME_KEYRING gnome-keyring) \
 		$(use_var selinux) \
 		$(use_var mktemp) \
-		$(use_var PAM_SSH ssh) \
+		$(use_var PAM_SSH pam_ssh) \
 		$(use_var sha512) \
-		$(use_var KRB5 kerberos) \
+		$(use_var KRB5 pam_krb5) \
 		$(use_var minimal) \
 		IMPLEMENTATION=${implementation} \
 		LINUX_PAM_VERSION=${linux_pam_version} \
diff --git a/sys-auth/pambase/pambase-20101024.ebuild b/sys-auth/pambase/pambase-20101024.ebuild
index 6d51f3a0bea7..e2d45d717e8e 100644
--- a/sys-auth/pambase/pambase-20101024.ebuild
+++ b/sys-auth/pambase/pambase-20101024.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20101024.ebuild,v 1.7 2010/11/27 12:35:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20101024.ebuild,v 1.8 2010/11/28 16:04:45 constanze Exp $
 
 EAPI=3
 
@@ -13,7 +13,7 @@ SRC_URI="http://dev.gentoo.org/~flameeyes/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="debug cracklib passwdqc consolekit gnome-keyring selinux mktemp ssh +sha512 kerberos minimal"
+IUSE="debug cracklib passwdqc consolekit gnome-keyring selinux mktemp pam_ssh +sha512 pam_krb5 minimal"
 RESTRICT="binchecks"
 
 RDEPEND="
@@ -29,11 +29,11 @@ RDEPEND="
 	selinux? ( >=sys-libs/pam-0.99[selinux] )
 	passwdqc? ( >=sys-auth/pam_passwdqc-1.0.4 )
 	mktemp? ( sys-auth/pam_mktemp )
-	ssh? ( sys-auth/pam_ssh )
+	pam_ssh? ( sys-auth/pam_ssh )
 	sha512? ( >=sys-libs/pam-1.0.1 )
-	kerberos? (
+	pam_krb5? (
 		>=sys-libs/pam-1.1.0
-		sys-auth/pam_krb5
+		>=sys-auth/pam_krb5-4.3
 	)
 	!<sys-freebsd/freebsd-pam-modules-6.2-r1
 	!<sys-libs/pam-0.99.9.0-r1"
@@ -68,9 +68,9 @@ src_compile() {
 		$(use_var GNOME_KEYRING gnome-keyring) \
 		$(use_var selinux) \
 		$(use_var mktemp) \
-		$(use_var PAM_SSH ssh) \
+		$(use_var PAM_SSH pam_ssh) \
 		$(use_var sha512) \
-		$(use_var KRB5 kerberos) \
+		$(use_var KRB5 pam_krb5) \
 		$(use_var minimal) \
 		IMPLEMENTATION=${implementation} \
 		LINUX_PAM_VERSION=${linux_pam_version} \