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

to >=sys-auth/pam_krb5-4.3

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

7 files changed, 37 insertions, 31 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/Manifest b/sys-auth/pambase/Manifest
index 2457d0bf7396..4d9d66746852 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -2,9 +2,9 @@ DIST pambase-20090620.1.tar.bz2 2593 RMD160 9cd6717ad162f8f4f031d53c4a2cf827d91a
 DIST pambase-20100310.tar.bz2 2623 RMD160 2ac4982d96eb49396946373e17e2adea06358328 SHA1 7e6fe7b80f4b0ec8da4bdcda9a0392983646b151 SHA256 11dbda24c2534ac6230455561c395a42f71d6aed96242cdb7368f99a56999ca9
 DIST pambase-20100925.tar.bz2 3168 RMD160 d89da91895e5ac3555498fae034e582bdf4c3b44 SHA1 1e50215bb695e787e481f3c585a1881d6422a326 SHA256 1c92658617c3bee1b9921da4076ceb7ac074e17619a21871ffb3228d4ace83f0
 DIST pambase-20101024.tar.bz2 3201 RMD160 3b0c5950a7e2cafd3fe93a5663b35e851d5975bf SHA1 89bca8e926290518192f5728aab8794f028931f5 SHA256 89d60dd598d3da0ce1d1bcd7dc325f6c55002a1d4a7d27f9bb024f6732e9fba4
-EBUILD pambase-20090620.1-r1.ebuild 2824 RMD160 5b78c4cce2996d7b397d61ad7860e2cfda211c06 SHA1 ffb0298fe45b2920b9814c80f21d1161a5ce5161 SHA256 29e466ecbd9a53179be07c6120007b473348476f494ec58c747d0473fa8741eb
-EBUILD pambase-20100310.ebuild 2870 RMD160 780880166c718fd2f97725f7347388d34aa1b761 SHA1 1dbf263b999ef2d36bc0b7d568238e4ff1f893f2 SHA256 d0b12a2ebfc44289378ae4dc7a177f52e940ababe28030ab8bc47da4019afcad
-EBUILD pambase-20100925.ebuild 2994 RMD160 0a9e199249a9b3a3f9d6a79b97116b8cd9d43af3 SHA1 096bbcf7150b248265bb401a5bdcdc2f062a2fc8 SHA256 ded9913c02f65a91698c2ee4f3e816c55271566ba9c13b813b76dda13c4fd557
-EBUILD pambase-20101024.ebuild 2993 RMD160 6b2337ea4576e0afa0faf1f106740f60077aa5de SHA1 6933289c50a456bd12200d27bcaa1bf2b4304c6f SHA256 7b772ec74ae7aa604fd53608e44a475cc70ed60695ca9958f9d22a331f46cebb
-MISC ChangeLog 14731 RMD160 3a9c0c610db17d400cfd97ebaeea9bc363ea3d2e SHA1 fe2742d6768f785d6d419483190a567b906c043d SHA256 5ea42405c6fbfb7e1747633a0a11264470adb63d42e45f3a56e9e7e5ea0fa27c
-MISC metadata.xml 3651 RMD160 640dcd3d73b46c815e4deda9fb2b1cb027336c66 SHA1 17bcf0b4e4ed6828a11081e926cadd2855232a4f SHA256 8f32ed192614646a013ac188c7e742d39e34f6f2e4dad0c17bbb85d25dd63884
+EBUILD pambase-20090620.1-r1.ebuild 2837 RMD160 ae0ff64bd310677c93b41d7018246a44ed543bd2 SHA1 55c9ddb1ac14b08b38e496bf42d19e808219b907 SHA256 34930bd56120d49786197beb441e93a3f4e0568f1734ba7ace36dd635023562e
+EBUILD pambase-20100310.ebuild 2882 RMD160 83d58c5136eb6900fd52e1da50071cb9c2bad2da SHA1 3b3b4665da47b273fa533e18a8639753ad824647 SHA256 729321339f97a9e803c559308e097e89e903af6886bbc06adfb409d2cb92769f
+EBUILD pambase-20100925.ebuild 3018 RMD160 eaa540e7bd48ba627e64464511cecafe3fc7b740 SHA1 d27b5126f066038c9f694dbdfade5997bed1ee9e SHA256 c5ce3243fd56460319727bb42a3e2f8b1ee9e4873a72f889eb03029969a5f37d
+EBUILD pambase-20101024.ebuild 3013 RMD160 cf45250af5bed6f1d9e0efe8389616956daea52f SHA1 b8613eed82a3b59080d16be1496626e58d110d2f SHA256 5936b0822652bab1e681c2a8e403f9d54368cee95a76ec189399a866c1779c2d
+MISC ChangeLog 15019 RMD160 d8635009de7edf8131db3067c4f58bb5ea810b6a SHA1 15b202e56def0a5720c39087e72568f90f6649b7 SHA256 fc24b10e1f02759af1ce1e7726cc8b82eab5691192062ef6c0c79239c79f1546
+MISC metadata.xml 3655 RMD160 349ef157cfa70dafe98ae09c444ac0fbcfbee30d SHA1 f8f65df1878659b8e241be06b9af12f12a339e77 SHA256 cb0bb4f50809bcb1f71011b7af43b18d909d0acdaf98c5585adaf31025ba370e
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} \