Fix RDEPEND's for bug #67815 again

5 files changed, 33 insertions, 39 deletions

diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index fe94a64f867d..f7c0ee1f7788 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,10 @@
 # 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.89 2004/11/24 04:34:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.90 2004/11/25 15:37:31 solar Exp $
+
+  25 Nov 2004; <solar@gentoo.org> shadow-4.0.5-r2.ebuild,
+  shadow-4.0.5-r3.ebuild, shadow-4.0.6.ebuild:
+  Fix RDEPEND's for bug #67815 again
 
   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:
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 16d8a585ce08..c598c825004d 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -1,45 +1,35 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 496f043239d29ebd5de117e39f6fea9a shadow-4.0.6.ebuild 5125
+MD5 f51a14bf24b80a22cffde108b8926bfa shadow-4.0.4.1-r4.ebuild 5946
+MD5 393e1da7ab3da007c86abe93867fd151 shadow-4.0.5-r3.ebuild 5509
 MD5 f11ee5d23f891d39adcce5864f8d7007 ChangeLog 16457
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 f51a14bf24b80a22cffde108b8926bfa shadow-4.0.4.1-r4.ebuild 5946
-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 7693f20802c5fd3d79fa3beae0857028 shadow-4.0.5-r2.ebuild 5423
+MD5 c5e9081ed43837797e2f1617b7ce1c24 files/shadow-4.0.5-fix-adding-of-pam_env-set-env-vars.patch 285
+MD5 b8efca60a25e256eebe54c3d0db0760f files/shadow-4.0.4.1-gcc34-xmalloc.patch 361
 MD5 2d2faa6b9a837f9319de52a780485743 files/securetty 243
-MD5 058f760e522ab65e270293003805fe61 files/shadow-4.0.4.1-userdel-missing-brackets.patch 380
-MD5 a99f871c88548d503bad935d2aa6f412 files/shadow-4.0.4.1-nls-manpages.patch 355
-MD5 e9ac6a566b65499773437ce98911a046 files/digest-shadow-4.0.6 66
-MD5 c31db5c71b0cdfca75346abc2887aa02 files/shadow-4.0.5-nls-manpages.patch 362
-MD5 90e2ab53494f677dc23b5137d6e39110 files/shadow-4.0.6-fix-configure.patch 3047
-MD5 636f233fa173a998195016c3808173d4 files/shadow-4.0.5-skey.patch 395
+MD5 020e030c2d09b206e88cf9051ced6244 files/shadow-4.0.4.1-nonis.patch 1504
 MD5 aaf16ddabef285df169e37254b13561c files/shadow-4.0.4.1-selinux.diff 4296
+MD5 fda41657b856ffaeec5a2734b312409b files/shadow-4.0.5-fix-mail-configure.patch 5452
 MD5 201f1321262da41ccd1a0283216ae9a7 files/shadow-4.0.4.1-su-pam_open_session.patch 4886
-MD5 bb55107c3a9354ef2d1977547fdb5a83 files/shadow-4.0.4.1-useradd-manpage-update.patch 958
-MD5 7becc41b4f7264483ee3ff0ca8277084 files/shadow-4.0.4.1-passwd-typo.patch 438
-MD5 b8efca60a25e256eebe54c3d0db0760f files/shadow-4.0.4.1-gcc34-xmalloc.patch 361
-MD5 391991f50203bd8b7738474051befdee files/shadow-4.0.5-remove-else.patch 531
-MD5 020e030c2d09b206e88cf9051ced6244 files/shadow-4.0.4.1-nonis.patch 1504
+MD5 636f233fa173a998195016c3808173d4 files/shadow-4.0.5-skey.patch 395
 MD5 20fd2dc35b8671b91e120b90281b4cf3 files/shadow-4.0.5-hack-X-envvars.patch 521
+MD5 bb55107c3a9354ef2d1977547fdb5a83 files/shadow-4.0.4.1-useradd-manpage-update.patch 958
 MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5-r2 66
-MD5 7aa1ebe82ada7f6de9b855a2226a49e4 files/shadow-4.0.5-login.defs.patch 752
 MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5-r3 66
-MD5 c5e9081ed43837797e2f1617b7ce1c24 files/shadow-4.0.5-fix-adding-of-pam_env-set-env-vars.patch 285
-MD5 fda41657b856ffaeec5a2734b312409b files/shadow-4.0.5-fix-mail-configure.patch 5452
+MD5 058f760e522ab65e270293003805fe61 files/shadow-4.0.4.1-userdel-missing-brackets.patch 380
+MD5 391991f50203bd8b7738474051befdee files/shadow-4.0.5-remove-else.patch 531
+MD5 e9ac6a566b65499773437ce98911a046 files/digest-shadow-4.0.6 66
+MD5 cef6788bc7c8c5468c1b1f68df77ed9e files/digest-shadow-4.0.4.1-r4 67
+MD5 7aa1ebe82ada7f6de9b855a2226a49e4 files/shadow-4.0.5-login.defs.patch 752
+MD5 a99f871c88548d503bad935d2aa6f412 files/shadow-4.0.4.1-nls-manpages.patch 355
+MD5 7becc41b4f7264483ee3ff0ca8277084 files/shadow-4.0.4.1-passwd-typo.patch 438
+MD5 90e2ab53494f677dc23b5137d6e39110 files/shadow-4.0.6-fix-configure.patch 3047
+MD5 c31db5c71b0cdfca75346abc2887aa02 files/shadow-4.0.5-nls-manpages.patch 362
 MD5 6e0bc0211949c624da0ea08d994a7038 files/default/useradd 96
-MD5 51b0337bd261f6ed5e53af5dc196431a files/pam.d/system-auth 499
+MD5 942190363cb06bd4cf1b3acdcca6c513 files/pam.d/su 1296
 MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/pam.d/login 431
 MD5 344d17a865edc40adebe07797853c839 files/pam.d/other 198
+MD5 1baa646400c4a596290e9d4b9e1c09b2 files/pam.d/system-auth-1.1 491
 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-----
+MD5 51b0337bd261f6ed5e53af5dc196431a files/pam.d/system-auth 499
diff --git a/sys-apps/shadow/shadow-4.0.5-r2.ebuild b/sys-apps/shadow/shadow-4.0.5-r2.ebuild
index a09cfec9ae75..0e01d549f7b5 100644
--- 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.4 2004/11/24 04:34:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.5-r2.ebuild,v 1.5 2004/11/25 15:37:31 solar Exp $
 
 inherit eutils libtool gnuconfig flag-o-matic
 
@@ -18,7 +18,7 @@ IUSE="pam selinux nls skey"
 
 RDEPEND=">=sys-libs/cracklib-2.7-r3
 	pam? ( >=sys-libs/pam-0.75-r4 sys-apps/pam-login )
-	!pam? ( sys-apps/pam-login )
+	!pam? ( !sys-apps/pam-login )
 	skey? ( app-admin/skey )
 	selinux? ( sys-libs/libselinux )"
 DEPEND="${DEPEND}
diff --git a/sys-apps/shadow/shadow-4.0.5-r3.ebuild b/sys-apps/shadow/shadow-4.0.5-r3.ebuild
index 934a5bc027aa..7cf22a84afb2 100644
--- 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.3 2004/11/24 04:34:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.5-r3.ebuild,v 1.4 2004/11/25 15:37:31 solar Exp $
 
 inherit eutils libtool gnuconfig flag-o-matic
 
@@ -18,7 +18,7 @@ IUSE="pam selinux nls skey"
 
 RDEPEND=">=sys-libs/cracklib-2.7-r3
 	pam? ( >=sys-libs/pam-0.75-r4 sys-apps/pam-login )
-	!pam? ( sys-apps/pam-login )
+	!pam? ( !sys-apps/pam-login )
 	skey? ( app-admin/skey )
 	selinux? ( sys-libs/libselinux )"
 DEPEND="${DEPEND}
diff --git a/sys-apps/shadow/shadow-4.0.6.ebuild b/sys-apps/shadow/shadow-4.0.6.ebuild
index 003504ef92af..88534f478b94 100644
--- 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.3 2004/11/24 04:34:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.6.ebuild,v 1.4 2004/11/25 15:37:31 solar Exp $
 
 inherit eutils libtool gnuconfig flag-o-matic
 
@@ -18,7 +18,7 @@ IUSE="pam selinux nls skey"
 
 RDEPEND=">=sys-libs/cracklib-2.7-r3
 	pam? ( >=sys-libs/pam-0.75-r4 sys-apps/pam-login )
-	!pam? ( sys-apps/pam-login )
+	!pam? ( !sys-apps/pam-login )
 	skey? ( app-admin/skey )
 	selinux? ( sys-libs/libselinux )"
 DEPEND="${DEPEND}