Update DEPENDs so that we either require pam-login or block it depending on USE=pam...

diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index 5ab6e8a3905d3b6a91ffbd47ec6336ace1e99bd0..fe94a64f867d03f89262d8bc07f9eb3b8a79443c 100644 (file)
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/shadow
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.88 2004/11/12 00:34:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.89 2004/11/24 04:34:46 vapier Exp $
+
+  23 Nov 2004; Mike Frysinger <vapier@gentoo.org> shadow-4.0.5-r2.ebuild,
+  shadow-4.0.5-r3.ebuild, shadow-4.0.6.ebuild:
+  Update DEPENDs so that we either require pam-login or block it depending on
+  USE=pam #67815.
 
 *shadow-4.0.6 (11 Nov 2004)
 

diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 0d169756013523b26f27a76c2846fad2597829ac..16d8a585ce085c181bdccb18ca49f3c9ac6acaf8 100644 (file)
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -1,9 +1,12 @@
-MD5 96e547c3a25e62e332ded4d4aca2a192 ChangeLog 16239
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f11ee5d23f891d39adcce5864f8d7007 ChangeLog 16457
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 f51a14bf24b80a22cffde108b8926bfa shadow-4.0.4.1-r4.ebuild 5946
-MD5 0dbc06b403abc107cfb0dc2dba4f7e30 shadow-4.0.6.ebuild 5180
-MD5 a3be28dc8fecfa1184809d472e2c4162 shadow-4.0.5-r2.ebuild 5478
-MD5 86b7aefe6cfbefebb41432ddce094a4b shadow-4.0.5-r3.ebuild 5564
+MD5 62431b0cd4e4d223f49a11bb1ddaf2af shadow-4.0.6.ebuild 5124
+MD5 fd3f0c5c8a7428ff6fd87a4c1a07e1fd shadow-4.0.5-r2.ebuild 5422
+MD5 69189ef653b3ccde380e4caf0bdb7e70 shadow-4.0.5-r3.ebuild 5508
 MD5 cef6788bc7c8c5468c1b1f68df77ed9e files/digest-shadow-4.0.4.1-r4 67
 MD5 2d2faa6b9a837f9319de52a780485743 files/securetty 243
 MD5 058f760e522ab65e270293003805fe61 files/shadow-4.0.4.1-userdel-missing-brackets.patch 380
@@ -33,3 +36,10 @@ MD5 a1c7fb84c2dc309db86ba7b8d3dfae76 files/pam.d/passwd 214
 MD5 60d44a6f43aafcb9ca35858ab2534a49 files/pam.d/shadow 227
 MD5 942190363cb06bd4cf1b3acdcca6c513 files/pam.d/su 1296
 MD5 1baa646400c4a596290e9d4b9e1c09b2 files/pam.d/system-auth-1.1 491
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBpA+lHTu7gpaalycRAh0hAKDNMDQk2dk4l15ZpTqL/13xH8vuCwCfTyLU
+jAFqzyGcMlU6hZbtHUIt11g=
+=UaW+
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/shadow/shadow-4.0.5-r2.ebuild b/sys-apps/shadow/shadow-4.0.5-r2.ebuild
index 3d1e05e3ee5f0e65ae0344e7968157efe85557d5..a09cfec9ae758146d89d3e7dc3f18801f36019d4 100644 (file)
--- a/sys-apps/shadow/shadow-4.0.5-r2.ebuild
+++ b/sys-apps/shadow/shadow-4.0.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.5-r2.ebuild,v 1.3 2004/11/12 21:02:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.5-r2.ebuild,v 1.4 2004/11/24 04:34:46 vapier Exp $
 
 inherit eutils libtool gnuconfig flag-o-matic
 
@@ -17,15 +17,13 @@ KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 IUSE="pam selinux nls skey"
 
 RDEPEND=">=sys-libs/cracklib-2.7-r3
-       pam? ( >=sys-libs/pam-0.75-r4 )
-       !pam? ( !virtual/login )
+       pam? ( >=sys-libs/pam-0.75-r4 sys-apps/pam-login )
+       !pam? ( sys-apps/pam-login )
        skey? ( app-admin/skey )
        selinux? ( sys-libs/libselinux )"
 DEPEND="${DEPEND}
        >=sys-apps/portage-2.0.51-r2
        nls? ( sys-devel/gettext )"
-#this requires a newer portage (>2.0.51-r2)
-#PROVIDE="!pam? ( virtual/login )"
 
 pkg_preinst() {
        rm -f ${ROOT}/etc/pam.d/system-auth.new

diff --git a/sys-apps/shadow/shadow-4.0.5-r3.ebuild b/sys-apps/shadow/shadow-4.0.5-r3.ebuild
index 437f663abf00638af77cc7ed3b0eb217cb6ae1a8..934a5bc027aae9920dcb30bfe1f20e6e05d92794 100644 (file)
--- a/sys-apps/shadow/shadow-4.0.5-r3.ebuild
+++ b/sys-apps/shadow/shadow-4.0.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.5-r3.ebuild,v 1.2 2004/11/12 21:02:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.5-r3.ebuild,v 1.3 2004/11/24 04:34:46 vapier Exp $
 
 inherit eutils libtool gnuconfig flag-o-matic
 
@@ -17,15 +17,13 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="pam selinux nls skey"
 
 RDEPEND=">=sys-libs/cracklib-2.7-r3
-       pam? ( >=sys-libs/pam-0.75-r4 )
-       !pam? ( !virtual/login )
+       pam? ( >=sys-libs/pam-0.75-r4 sys-apps/pam-login )
+       !pam? ( sys-apps/pam-login )
        skey? ( app-admin/skey )
        selinux? ( sys-libs/libselinux )"
 DEPEND="${DEPEND}
        >=sys-apps/portage-2.0.51-r2
        nls? ( sys-devel/gettext )"
-#this requires a newer portage (>2.0.51-r2)
-#PROVIDE="!pam? ( virtual/login )"
 
 pkg_preinst() {
        rm -f ${ROOT}/etc/pam.d/system-auth.new

diff --git a/sys-apps/shadow/shadow-4.0.6.ebuild b/sys-apps/shadow/shadow-4.0.6.ebuild
index 37a1891b8d91c413c2c86f45580b9790c1b11ba5..003504ef92afbd8123193d4b8e77d3a1f50f7700 100644 (file)
--- a/sys-apps/shadow/shadow-4.0.6.ebuild
+++ b/sys-apps/shadow/shadow-4.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.6.ebuild,v 1.2 2004/11/12 21:02:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.6.ebuild,v 1.3 2004/11/24 04:34:46 vapier Exp $
 
 inherit eutils libtool gnuconfig flag-o-matic
 
@@ -17,15 +17,13 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="pam selinux nls skey"
 
 RDEPEND=">=sys-libs/cracklib-2.7-r3
-       pam? ( >=sys-libs/pam-0.75-r4 )
-       !pam? ( !virtual/login )
+       pam? ( >=sys-libs/pam-0.75-r4 sys-apps/pam-login )
+       !pam? ( sys-apps/pam-login )
        skey? ( app-admin/skey )
        selinux? ( sys-libs/libselinux )"
 DEPEND="${DEPEND}
        >=sys-apps/portage-2.0.51-r2
        nls? ( sys-devel/gettext )"
-#this requires a newer portage (>2.0.51-r2)
-#PROVIDE="!pam? ( virtual/login )"
 
 pkg_preinst() {
        rm -f ${ROOT}/etc/pam.d/system-auth.new