allow openpam for krb5

(Portage version: 2.2.0_alpha185/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

5 files changed, 17 insertions, 12 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/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