Block the split modules to avoid collisions.

Package-Manager: portage-2.1.3_rc7

3 files changed, 20 insertions, 14 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index ecd671c9beb5..03c58e910611 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/pam
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.163 2007/07/12 09:22:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.164 2007/07/12 09:28:30 flameeyes Exp $
+
+  12 Jul 2007; Diego Pettenò <flameeyes@gentoo.org> pam-0.78-r5.ebuild:
+  Block the split modules to avoid collisions.
 
   12 Jul 2007; Diego Pettenò <flameeyes@gentoo.org>
   -files/Linux-PAM-0.99.6.3-berkdb.patch, -files/system-auth.pamd.0.99,
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 968cc035b0d3..22c5ed72e85b 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -27,18 +27,18 @@ DIST Linux-PAM-0.99.8.0.tar.bz2 903366 RMD160 9e2c9bc00318ef711a2af4561a1c763c2c
 DIST db-4.3.27.tar.gz 5921872 RMD160 711129871c7edd840184bd5a87fb7bf93c8bb953 SHA1 8fddfe98d5ff7fcdb3fe9e23bb361d8f20a35941 SHA256 6f09e04c5811ad72a2a5c99459340cb2c635e6553520af76fc9e717dd6207244
 DIST glib-2.6.5.tar.bz2 2357089 RMD160 6ccdfed7ea5621b7c69c436c3b8b5fbba44dc62e SHA1 82818f9173b0bdc2b26af018e8393eb76318552e SHA256 ca061bbd41c6484b4b0eabbee08f99e51ebf5f3a0c63e8b0787b8d37546cc2ca
 DIST pam-0.78-patches-1.6.tar.bz2 91527 RMD160 af880422f7e0f6440debf6885a4e3ca048dc67a9 SHA1 47683aee7734495707e619c111b93e07bcac5d1f SHA256 54241417a9e19b02457b3d9997e6ca24c14da86e22d447873440853a7525c9bb
-EBUILD pam-0.78-r5.ebuild 11384 RMD160 1c925c7ddbdd14d31745b24f71f497f03827d2fc SHA1 f6200cb0be288d9132f4d3f295cdb79b96f06f72 SHA256 10b3c08b86442cfd742383040b72fe44fbd927bf77d001d08971b47ec39704e5
-MD5 d53943e195dac9c8de5426327142ada0 pam-0.78-r5.ebuild 11384
-RMD160 1c925c7ddbdd14d31745b24f71f497f03827d2fc pam-0.78-r5.ebuild 11384
-SHA256 10b3c08b86442cfd742383040b72fe44fbd927bf77d001d08971b47ec39704e5 pam-0.78-r5.ebuild 11384
+EBUILD pam-0.78-r5.ebuild 11451 RMD160 f84bd53ec0ec785daa1fcb30e75bd74f34756bc6 SHA1 fb3046a62c2fcd028553f03d851beb8db0294dfa SHA256 5f787f710e23bed236bfa8a03b2b0c4804ea61904069e6edd804e6e898be9899
+MD5 cd735d06cb79a845230d9ea583f1db81 pam-0.78-r5.ebuild 11451
+RMD160 f84bd53ec0ec785daa1fcb30e75bd74f34756bc6 pam-0.78-r5.ebuild 11451
+SHA256 5f787f710e23bed236bfa8a03b2b0c4804ea61904069e6edd804e6e898be9899 pam-0.78-r5.ebuild 11451
 EBUILD pam-0.99.8.0-r1.ebuild 4990 RMD160 4297297100857eaad3fad07402d62eeaea7dd337 SHA1 911b66a996ec74744078dc2611abb3ef942960b5 SHA256 d7fccae56b000a1c9f4eb87f08c4e9749bf0c94b21c1cd252617d3e792951984
 MD5 a86bbc0fc931e48e3901c55d8d16113c pam-0.99.8.0-r1.ebuild 4990
 RMD160 4297297100857eaad3fad07402d62eeaea7dd337 pam-0.99.8.0-r1.ebuild 4990
 SHA256 d7fccae56b000a1c9f4eb87f08c4e9749bf0c94b21c1cd252617d3e792951984 pam-0.99.8.0-r1.ebuild 4990
-MISC ChangeLog 26743 RMD160 c07e1d0ff0f293dee40467545a7adcabf591bed6 SHA1 cc7bda758618ccec1dc650e3f2b4abac880c65bc SHA256 15d8a5503e8368caaa161e7bc50fbdf78d8bbb5ff2bf89b1ba79d9694794b6bd
-MD5 a9525e3b36f45271a66eb8d117682e9d ChangeLog 26743
-RMD160 c07e1d0ff0f293dee40467545a7adcabf591bed6 ChangeLog 26743
-SHA256 15d8a5503e8368caaa161e7bc50fbdf78d8bbb5ff2bf89b1ba79d9694794b6bd ChangeLog 26743
+MISC ChangeLog 26864 RMD160 a66bc97960bc78be0085f5dd3f1ac1cc82e41e7a SHA1 61c5d7a5ff141eb389794823c503c98a15edeaf5 SHA256 16ab87cbcc37d9947a9b73124aff84acd7db745954eaa135c1b8c9936e660688
+MD5 43065f1c5b2fcd2f1feb0275f546710d ChangeLog 26864
+RMD160 a66bc97960bc78be0085f5dd3f1ac1cc82e41e7a ChangeLog 26864
+SHA256 16ab87cbcc37d9947a9b73124aff84acd7db745954eaa135c1b8c9936e660688 ChangeLog 26864
 MISC metadata.xml 218 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c SHA1 02dacc356a39905402083cb54ae4f6dd0ac59fad SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c
 MD5 393d06cf4b76671f8e6ce72ac71bdad8 metadata.xml 218
 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c metadata.xml 218
@@ -52,7 +52,7 @@ SHA256 ab8db2c0eae109c483b93689c682916ae8161cfcd4917a8b68a53f870d018240 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGlfM6AiZjviIA2XgRAgCIAJ0UNHq95GJ5rIyWy9vSAeqekG5QTwCeP6DN
-zFhzKX9+q08/EDh4xR8+Tlo=
-=4N5X
+iD8DBQFGlfR8AiZjviIA2XgRAi8xAJ9PkKLIZPIVBEmHkr1JTdR5UMxvvQCbBbuq
+eR0AuA1MiPyUTd4ln1qzCE0=
+=HU/k
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/pam/pam-0.78-r5.ebuild b/sys-libs/pam/pam-0.78-r5.ebuild
index 4927fe6f4a63..dda9d25047b3 100644
--- a/sys-libs/pam/pam-0.78-r5.ebuild
+++ b/sys-libs/pam/pam-0.78-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.78-r5.ebuild,v 1.18 2007/07/10 14:18:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.78-r5.ebuild,v 1.19 2007/07/12 09:28:30 flameeyes Exp $
 
 FORCE_SYSTEMAUTH_UPDATE="no"
 
@@ -34,7 +34,10 @@ IUSE="berkdb pwdb selinux pam_chroot pam_console pam_timestamp nis"
 RDEPEND=">=sys-libs/cracklib-2.8.3
 	selinux? ( >=sys-libs/libselinux-1.28 )
 	berkdb? ( >=sys-libs/db-${BDB_VER2} )
-	pwdb? ( >=sys-libs/pwdb-0.62 )"
+	pwdb? ( >=sys-libs/pwdb-0.62 )
+	!sys-auth/pam_console
+	!sys-auth/pam_userdb
+	!sys-auth/pam_chroot"
 
 # Note that we link to static versions of glib (pam_console.so)
 # and pwdb (pam_pwdb.so), so we need glib-2.6.2-r1 or later ...