Move removing unneeded modules before dependency check.

Package-Manager: portage-2.1.1_pre2-r4

3 files changed, 20 insertions, 16 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index 8704e8ae6045..d4d71477ca6b 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/pam
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.114 2006/07/04 08:02:28 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.115 2006/07/07 11:16:45 azarah Exp $
+
+  07 Jul 2006; Martin Schlemmer <azarah@gentoo.org> pam-0.99.5.0-r1.ebuild:
+  Move removing unneeded modules before dependency check.
 
   04 Jul 2006; Martin Schlemmer <azarah@gentoo.org> pam-0.99.5.0-r1.ebuild:
   Fix ghostscript depend.
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index dabf328de0f3..501dc63398b6 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -49,18 +49,18 @@ EBUILD pam-0.78-r5.ebuild 11466 RMD160 d2808dc44990ce04bdecaa014144a27988d071c8
 MD5 469eacce2c60308379a6f62bfbe3b440 pam-0.78-r5.ebuild 11466
 RMD160 d2808dc44990ce04bdecaa014144a27988d071c8 pam-0.78-r5.ebuild 11466
 SHA256 d25eaf1d0d138a3361aac3c9fe2558b8059fe28dbda2cc774c779c39db93d22f pam-0.78-r5.ebuild 11466
-EBUILD pam-0.99.5.0-r1.ebuild 5969 RMD160 44761f25ce179e5169aacd361f4ca51ae79404c0 SHA1 6701856a06e6d1a6adaa0ab8cc9c68b7271aa2b6 SHA256 05794b1543fce9dd65f6d1ce52fdf9685c613647dd193925a4f9db0e3cdd6a33
-MD5 be2ebfa7dcd67422f4b30bcd7926f016 pam-0.99.5.0-r1.ebuild 5969
-RMD160 44761f25ce179e5169aacd361f4ca51ae79404c0 pam-0.99.5.0-r1.ebuild 5969
-SHA256 05794b1543fce9dd65f6d1ce52fdf9685c613647dd193925a4f9db0e3cdd6a33 pam-0.99.5.0-r1.ebuild 5969
+EBUILD pam-0.99.5.0-r1.ebuild 6025 RMD160 2bec6f86ac3176e757de1705d43fce18b0d43bfe SHA1 9000a7620c8f51a8882deb333052f22b156bcee3 SHA256 40d23385456c08eef3b36f9d979e3060a937d090976bca96974651b6545d7fc8
+MD5 0d7e3f5eea498bb60dc7802b503663aa pam-0.99.5.0-r1.ebuild 6025
+RMD160 2bec6f86ac3176e757de1705d43fce18b0d43bfe pam-0.99.5.0-r1.ebuild 6025
+SHA256 40d23385456c08eef3b36f9d979e3060a937d090976bca96974651b6545d7fc8 pam-0.99.5.0-r1.ebuild 6025
 EBUILD pam-0.99.5.0.ebuild 2319 RMD160 b25666813a7c0a805c86068471b7e0faf564e9d1 SHA1 5920391bcbbddc7c99abb07ad572a80aaac249dc SHA256 d80f2b6b2140168f676a24a3517b71309233c692b5a25bccd0b814f9760357c4
 MD5 97d5f46b78531725c9bbe540c74a7e30 pam-0.99.5.0.ebuild 2319
 RMD160 b25666813a7c0a805c86068471b7e0faf564e9d1 pam-0.99.5.0.ebuild 2319
 SHA256 d80f2b6b2140168f676a24a3517b71309233c692b5a25bccd0b814f9760357c4 pam-0.99.5.0.ebuild 2319
-MISC ChangeLog 18706 RMD160 8e5b71666d7c88afe23132cd3f305fa30c57efb4 SHA1 fca71aa38188cb539322e6ce2e40552573169e8b SHA256 9fa74e21c7ccc112cf40b839ad3f26cc7955078f3e3ee1b0a5a11e28621b370e
-MD5 f4af19d15c83171c35714eaa18d7eb66 ChangeLog 18706
-RMD160 8e5b71666d7c88afe23132cd3f305fa30c57efb4 ChangeLog 18706
-SHA256 9fa74e21c7ccc112cf40b839ad3f26cc7955078f3e3ee1b0a5a11e28621b370e ChangeLog 18706
+MISC ChangeLog 18841 RMD160 c6a003d6948171c09d251b5f79098b1f0c451125 SHA1 9b456510c23a3c13faa2f54688142c028755814e SHA256 439bd72d2a079ed12123a31bd2f50ccf831a3e7f33621041353f33827c1e7c13
+MD5 61db44e320696cf8aa8063bc2c325e03 ChangeLog 18841
+RMD160 c6a003d6948171c09d251b5f79098b1f0c451125 ChangeLog 18841
+SHA256 439bd72d2a079ed12123a31bd2f50ccf831a3e7f33621041353f33827c1e7c13 ChangeLog 18841
 MISC metadata.xml 218 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c SHA1 02dacc356a39905402083cb54ae4f6dd0ac59fad SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c
 MD5 393d06cf4b76671f8e6ce72ac71bdad8 metadata.xml 218
 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c metadata.xml 218
@@ -80,7 +80,7 @@ SHA256 a414bdc39ad517bcdeb467e9459a4450804f14239990915ed596514f126b1166 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEqiDq1ZcsMnZjRyIRAm2RAJwJfrhWAD0xQ9XtB2pk08Ifi+ggTQCgpcqL
-CWgyzvz8LCZ4/7xGN9tgywM=
-=Z1aD
+iD8DBQFErkMA1ZcsMnZjRyIRAqlsAJ9k56JfOujj9fqnRsZkqTjjGqa0JQCgoDux
+f8vkBdd/54rGFDOhOZtCPaw=
+=5Rck
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/pam/pam-0.99.5.0-r1.ebuild b/sys-libs/pam/pam-0.99.5.0-r1.ebuild
index 5723bb1461f1..a080af1bd992 100644
--- a/sys-libs/pam/pam-0.99.5.0-r1.ebuild
+++ b/sys-libs/pam/pam-0.99.5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.99.5.0-r1.ebuild,v 1.4 2006/07/04 08:02:28 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.99.5.0-r1.ebuild,v 1.5 2006/07/07 11:16:45 azarah Exp $
 
 inherit libtool multilib eutils autotools pam toolchain-funcs gnuconfig
 
@@ -154,6 +154,10 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 
+	# Remove unwanted modules before checking dependencies
+	use berkdb || rm -f "${D}/$(get_libdir)/security/pam_userdb"*
+	use selinux || rm -f "${D}/$(get_libdir)/security/pam_selinux"*
+
 	# Make sure every module built.
 	# Do not remove this, as some module can fail to build
 	# and effectively lock the user out of his system.
@@ -184,9 +188,6 @@ src_install() {
 	# No, we don't really need .la files for PAM modules.
 	rm -f "${D}/$(get_libdir)/security/"*.la
 
-	use berkdb || rm -f "${D}/$(get_libdir)/security/pam_userdb*"
-	use selinux || rm -f "${D}/$(get_libdir)/security/pam_selinux*"
-
 	dodoc CHANGELOG ChangeLog README AUTHORS Copyright
 	docinto modules ; dodoc doc/txts/README.*