allow openpam for krb5

Package-Manager: portage-2.2.0_alpha185/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

6 files changed, 26 insertions, 25 deletions

diff --git a/sys-auth/pambase/ChangeLog b/sys-auth/pambase/ChangeLog
index 395091e84162..c1466bf28dbb 100644
--- a/sys-auth/pambase/ChangeLog
+++ b/sys-auth/pambase/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-auth/pambase
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/ChangeLog,v 1.113 2013/06/15 21:08:49 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/ChangeLog,v 1.114 2013/06/28 12:04:39 aballier Exp $
+
+  28 Jun 2013; Alexis Ballier <aballier@gentoo.org> pambase-20101024-r2.ebuild,
+  pambase-20120417.ebuild, pambase-20120417-r1.ebuild,
+  pambase-20120417-r2.ebuild:
+  allow openpam for krb5
 
 *pambase-20120417-r2 (15 Jun 2013)
 
diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index 27cb09171b89..ed8bfef18007 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -4,21 +4,17 @@ Hash: SHA256
 AUX pambase-20120417-lastlog-silent.patch 694 SHA256 9bce9de7831fcafaee0c5f56b28ed91d4e1974bef806f50b38cca82189f81782 SHA512 3bcef6d9e97cf38df079675ffdffaf233a185bbb09bf79930c81b8b7b802247de0f0bfb9e69d935bce7a7297f544f1c7abc199224e7a536cdfe606f2c0217500 WHIRLPOOL a4db8e5ab534cfc80d9452165dc492853f6fa717025dc49daab4c51847ea03a584ad6a44317804f56361e8916cab0d897bd8d8f065c31afd0ae22df5d8eaf367
 AUX pambase-20120417-systemd.patch 608 SHA256 888f05068801f11cb49988a3da64f658782f0056410fdb7d68d240a7d1f619ff SHA512 c06d4e35cae11b1156ba32051a4f25a4551857081e9a723f5c0b48758859d7794de94889eb91b19424b49bd4fd5509d34cba943d7a7bbc89f4339a771f29f754 WHIRLPOOL 0336ca519f528e3a0ac840d9da84cc7f28b420ee2864090dac459fd163962e251aa83e11bfd8d02bc7a8a313bac92598df19fb1278dd98a167942cbbca692de2
 DIST pambase-20101024.tar.bz2 3201 SHA256 89d60dd598d3da0ce1d1bcd7dc325f6c55002a1d4a7d27f9bb024f6732e9fba4
-DIST pambase-20120417.tar.bz2 3361 SHA256 3fde3ff7714b3722b45545da36fdde6ca95a55d1b0a8cfb23666ec0de3ec5871
-EBUILD pambase-20101024-r2.ebuild 2991 SHA256 6dc6d63bef5780e88319ef24a7ffce565591b78bb83ec3a8adf12d37be318093 SHA512 eb72bde119bb78667c0c86da29bd51b851931dae3e06f21fc31347a000072b043a69d2562ddf6df6791760e54f4e5b47df8fe71bde6e0f177fffa9884d8ec30f WHIRLPOOL 3a41155eb9c7338efbfba9a69cc1ef8d95af61def05641cf3b7af1bf8db8b349e211576763bc7a5969c139a5756d4e126fe88c5eb3921c27fb6efea286ba8667
-EBUILD pambase-20120417-r1.ebuild 3244 SHA256 e17c7d2110ec15b0d44bbdd287fddf556dfc381714bb0c265b3c9b7b60ec5818 SHA512 b53c35806b86d5e458d5257a05a49014b98aba8436597e7aab4c4fb3129719fe43cd2e9cd2a69ccaa1c6e27d145850fb2e2d3b2d8d6dea2b08145de6cc0687f6 WHIRLPOOL 8fc1951b412c47c57bc8c05933dbacd827d21fd6100dbe8e5b12d80dcfbfcd9bb07581b3919520a22f74a8312f99b079275dbb88bb41ef261f8db7398da316d4
-EBUILD pambase-20120417-r2.ebuild 3287 SHA256 67085cd65ac6d1d7aef1b7ed1e985ef05a218b1262b924c57eaf253815469494 SHA512 9419da5d58d65acc25b4316d386053a85a4188e2770644597d39de35b469a44b70a927596dd3757995a12f7820405d80822523fb36ac247b980eb366684df2a9 WHIRLPOOL d5edd902dd1f0b8a6502134207276ba8c059cf224d6f0112f28a33c2195f8f2042e2bef5fb33a600b97952b9e8faae3560badb119933444e10b06a647acb487e
-EBUILD pambase-20120417.ebuild 3070 SHA256 9e5f2943848324fab271b9b907d127feb3ea3caa6b5d9dc9b7cc666c63e08d57 SHA512 32662979b5aa3149aafb6d8cfe710606f023c375a815d510fae56416bf7c06a96058699c1c77694af8e218297f6b1edd04f7ac8e5559960b8e873bdebb900905 WHIRLPOOL 0e82f1fcc35586942a7745161b5445f5ba9210e8b08b74f8e13718a754c5461e78051e8754ff13302c20562bb24eb1207d4385d6fff410323d59a87d7a63e9e2
-MISC ChangeLog 17061 SHA256 2f2af2ba945075dd11edb58c2ba481aca7acec2a1fbb8bdd830026d30b8b6798 SHA512 4f04069e87b3afb070de51d9fb2497758ec9b32a6f61e66da698379aeeaa6ea7cd0879bcdde0c5af09add4af6b8f8ab3f030b321b7f4d446f3293df39f8ca171 WHIRLPOOL 65419b82b3c85ecaed82e02ea5e287099947e722ace68bd5924e7a24ea68974ed34d668efddb19070c80cc7ce5324d01a6af987e9e6a7b4228c6d1581eccceca
+DIST pambase-20120417.tar.bz2 3361 SHA256 3fde3ff7714b3722b45545da36fdde6ca95a55d1b0a8cfb23666ec0de3ec5871 SHA512 7a666eb67f6484e536ecb070402036bcfdd137aced27df3f08b136d06eee5c13a6dc14aa93ea09e94c7f31e5a98db97dbaccd0c46af24b57028247de3a7cd9fe WHIRLPOOL 323edb9ef488a0ba562ef279d4acfb682540bf87838be9a3319ad2029ba1465d015fdf94c3192e24517ae9f0ed264e38d17aba65934211bd7b39bf309ee12540
+EBUILD pambase-20101024-r2.ebuild 3014 SHA256 b272693995d3a8f7b3df911e2088fa9a0db29d3836f09f4f461994ac5408e8e6 SHA512 e9b7bec4d03cec178783704b7907e3b0988be7c698e976e87f5df5386d0661da8bc3cfd647941c33aac4c6859cad00366fccc5b1f3d6885032df8338806375d6 WHIRLPOOL a9959b69c34541ac54b8a6e33e5e9981bfc22923577d6bfc35cdd008ea513d08d17fa43e3f97c02b96a6597dc0e1f7ebd40d4301328e5e88ae5b066598eb8173
+EBUILD pambase-20120417-r1.ebuild 3267 SHA256 d7ba577cd5563b4190ce480ac2ee946f1097e343808c6e7a333c9bcbef66a8c1 SHA512 664ee47272c7932a7a9bac1b33d87f9e216c8a073ab8c28bccaf01c5b9106faa2444f53111a85844d81cbb414b7c3ce9d712236b81682d3e52f99432d9ded577 WHIRLPOOL 82cfcb01f2600d0dc6690f2f5047730eb401dabeda59ed3b112e7fbee0b00674c1041f22dbd641223a3d5fc28e933d6a187a28c7485171de47d453505e561ace
+EBUILD pambase-20120417-r2.ebuild 3315 SHA256 4aac453d8dae184dfabd9e87fe8eb7502d3c047b5aefb0e9b2fe4d7fa2556589 SHA512 645356fe777b967283dacd3889e2911b2a68002725e2456e567f596ac7506dac01476012eb2eb3673dfaef5228a005e5640044d29363fa72277453c925473ce3 WHIRLPOOL c9f8d977fefc9f9376ee30e250e92b582409094dc5f1aa653c913409006f3bff6323e4490917bbfbadf24f1b72df7d9cd5c56d5a0ac3bbfde6102c5e76c20d07
+EBUILD pambase-20120417.ebuild 3093 SHA256 be915f2c62408414b53f8018188dc11439d229b59c9a2febf4559f7a2192d8b5 SHA512 73360eaa582c6e074077366d3abc102489569084b3173a5b0e8408d421abc7989f9f2e8beb23c1da7b3986d2a2eee033c5f2ab265c354e642e11d24e32de243c WHIRLPOOL adfa37d25886dbee005b15dd7ee8beba052c26675ad3afc76e169264d75c75a89bbeb1ce65e254812ba69a2f78f5c216ba7254aae91982cd3b10ad0329275d62
+MISC ChangeLog 17256 SHA256 f51dd5290e5d264fb757ee39a48ed51d4e5f556bf5412dcb9bda941a66550650 SHA512 1f9bc940414c2154011411e892dd3846fb1c50deccc27b02a246954761eb5f0f800743f97d9b731d51210c59e55962e4e6cfe2f809d55d553af8752b26464b35 WHIRLPOOL 1e28afd695b07cd63ca0dd4ed4b8fbe759b57ace9f3b1c11e7b06f48d1f3d38c26a7bb0f530a3747dc3b5a2add02073c58b55933bca492104dba1ba5c585f044
 MISC metadata.xml 3794 SHA256 fbddb3cd938b849feff7cc84fdad0d0b67b905a3ae97526047287208b098392c SHA512 ea6d2c31478a6394fb635dfaf100306a9429a645163a8859aa85056cf7805aa2fb57e7f20529b5ad3e0e4a45655cf45c6265786a640617d68a0438fabf43f784 WHIRLPOOL 534af71fe9c1ef2757d39e447d18730fdd5d4ffc762e9bde9ce09c2a507abd65c34c483abc20822a5e57ebdb8bb0b86e837337b46c3d14615aca7eabd776ffc7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRvNfsAAoJEO+t9ga+3I3acmMH/RahiURIKIWD9b5wGh4FQj+z
-Mu/qEmdP4vlKV2D9NzY1X+c4gq+7Mo58e9/N6IlWhHoQHyJn4Yaiakyslh+8uAa4
-FJAjA18y9ZP4i1pJOxOb3CWtR8v+ppRH0tY/6EO+SnuAMv10wqOBeFYG7Z01tetK
-rZeytEEYAFCtZkp786hj+zgOC2uk2/mxYjzEJ9iV/kgkc9chwtJT28x7xF4Xv7cR
-piGNjI6yPhUlhTUgqZxMbwYNHsBUZRLBJVczyss0I+9ZVzQAZuwfu8J64upBgsmH
-VWofsPoPYes3JsNQSPvgQpUuITDHViLU2iGpk0s4N4aAnWnTZVIobG2tX8Nn980=
-=nAoX
+iEYEAREIAAYFAlHNe9kACgkQvFcC4BYPU0rBaACfQP/TA69bpnQuy7Ov+T+m9H20
+BoEAn3fVkMjtsvPRpg5SNWfOCDwGbDQ3
+=pwsz
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/pambase/pambase-20101024-r2.ebuild b/sys-auth/pambase/pambase-20101024-r2.ebuild
index d400bdd09c75..ad732d4079f7 100644
--- a/sys-auth/pambase/pambase-20101024-r2.ebuild
+++ b/sys-auth/pambase/pambase-20101024-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20101024-r2.ebuild,v 1.4 2012/05/19 21:34:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20101024-r2.ebuild,v 1.5 2013/06/28 12:04:39 aballier Exp $
 
 EAPI=4
 
@@ -32,7 +32,7 @@ RDEPEND="
 	pam_ssh? ( sys-auth/pam_ssh )
 	sha512? ( >=sys-libs/pam-1.0.1 )
 	pam_krb5? (
-		>=sys-libs/pam-1.1.0
+		|| ( >=sys-libs/pam-1.1.0 sys-auth/openpam )
 		>=sys-auth/pam_krb5-4.3
 	)
 	!<sys-freebsd/freebsd-pam-modules-6.2-r1
diff --git a/sys-auth/pambase/pambase-20120417-r1.ebuild b/sys-auth/pambase/pambase-20120417-r1.ebuild
index d195f121e813..0407fe85bb34 100644
--- a/sys-auth/pambase/pambase-20120417-r1.ebuild
+++ b/sys-auth/pambase/pambase-20120417-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20120417-r1.ebuild,v 1.1 2012/06/19 07:55:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20120417-r1.ebuild,v 1.2 2013/06/28 12:04:39 aballier Exp $
 
 EAPI=4
 inherit eutils
@@ -29,7 +29,7 @@ RDEPEND="
 	gnome-keyring? ( >=gnome-base/gnome-keyring-2.32[pam] )
 	mktemp? ( sys-auth/pam_mktemp )
 	pam_krb5? (
-		>=sys-libs/pam-${MIN_PAM_REQ}
+		|| ( >=sys-libs/pam-${MIN_PAM_REQ} sys-auth/openpam )
 		>=sys-auth/pam_krb5-4.3
 		)
 	pam_ssh? ( sys-auth/pam_ssh )
diff --git a/sys-auth/pambase/pambase-20120417-r2.ebuild b/sys-auth/pambase/pambase-20120417-r2.ebuild
index 2034c8988c06..0a4730699f66 100644
--- a/sys-auth/pambase/pambase-20120417-r2.ebuild
+++ b/sys-auth/pambase/pambase-20120417-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20120417-r2.ebuild,v 1.1 2013/06/15 21:08:49 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20120417-r2.ebuild,v 1.2 2013/06/28 12:04:39 aballier Exp $
 
 EAPI=5
 inherit eutils
@@ -29,7 +29,7 @@ RDEPEND="
 	gnome-keyring? ( >=gnome-base/gnome-keyring-2.32[pam] )
 	mktemp? ( sys-auth/pam_mktemp )
 	pam_krb5? (
-		>=sys-libs/pam-${MIN_PAM_REQ}
+		|| ( >=sys-libs/pam-${MIN_PAM_REQ} sys-auth/openpam )
 		>=sys-auth/pam_krb5-4.3
 		)
 	pam_ssh? ( sys-auth/pam_ssh )
diff --git a/sys-auth/pambase/pambase-20120417.ebuild b/sys-auth/pambase/pambase-20120417.ebuild
index 85d23277194d..1303fc29d2e0 100644
--- a/sys-auth/pambase/pambase-20120417.ebuild
+++ b/sys-auth/pambase/pambase-20120417.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20120417.ebuild,v 1.4 2012/05/19 21:34:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20120417.ebuild,v 1.5 2013/06/28 12:04:39 aballier Exp $
 
 EAPI=4
 
@@ -33,7 +33,7 @@ RDEPEND="
 	pam_ssh? ( sys-auth/pam_ssh )
 	sha512? ( >=sys-libs/pam-1.0.1 )
 	pam_krb5? (
-		>=sys-libs/pam-1.1.0
+		|| ( >=sys-libs/pam-1.1.0 sys-auth/openpam )
 		>=sys-auth/pam_krb5-4.3
 	)
 	!<sys-apps/shadow-4.1.5-r1