Fix make.globals/preserve-libs code to work correctly.

Package-Manager: portage-2.2.0_alpha131/cvs/Linux i686

4 files changed, 19 insertions, 13 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index a5f7d25f4c13..f89c0ee92690 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1102 2012/09/21 22:45:54 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1103 2012/09/21 22:49:15 zmedico Exp $
+
+  21 Sep 2012; Zac Medico <zmedico@gentoo.org> portage-2.2.0_alpha131.ebuild,
+  portage-9999.ebuild:
+  Fix make.globals/preserve-libs code to work correctly.
 
 *portage-2.2.0_alpha131 (21 Sep 2012)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index aba713064bd1..102e46e61a6d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -20,14 +20,14 @@ EBUILD portage-2.1.11.9.ebuild 9833 SHA256 4b4e3df3e35a4cfba3fd3134d1dc16514e382
 EBUILD portage-2.1.6.7_p1.ebuild 8392 SHA256 75dfa3bdb1100ca28ba46eb83e34ffc196cb3e57204e7b4f451cfb19a1644e62 SHA512 ac70b4ba9d658c4d79953088b2fdaeed8d0e31986ff7c649272c39a743ddfdf112e44d3f0f8078941c47a06b373002cfcd454100585d5bbaa807a2079b19eb8c WHIRLPOOL 57c26b40de86f3d6969fe66d5b1fd6df55f5478e03c855813ff83b1e485f99d1b34cbf30422b5b60986263cae4d4ee066daaa01c0166a04f53c7bb829fd214e1
 EBUILD portage-2.2.0_alpha120.ebuild 11951 SHA256 9530b793174de796ecf951a2808cb163005b605630b0455c57194e97f2a36dd2 SHA512 f6af265d8d9b1cbf884787105abb32335727c179d904fbdecba598878083f7384088a5db063aee4282afd4daa4d20f02466911d6c5625bf538c7cdb437026866 WHIRLPOOL 93daa1caa5b31023b1fbb11e8baabf1abced715c879acdc1bb578f75dc58d3737e23bba2c9fa3bd69702810640e47a1debbf3464d16db7a6f68a3d37799b3b76
 EBUILD portage-2.2.0_alpha130.ebuild 11774 SHA256 390e874bfefaa47766ce2b225df5c107e164a27ab937d609418eb3bb11b08f5f SHA512 507019f8090f1325a72c81a1f4949d117fad7794c99ec8460ad417fa5e35212628d4cc24785431638b336ad952b6a1649e2803759fa22f23f066e565634fa80d WHIRLPOOL 866cef9d32bd0056905a0351a89dd5d45a901741815969e0c7e36620ddaf1b49a1539b83f4f05dc0a62c5e59ff84340373523b92390a4fa7a0da2018b1654940
-EBUILD portage-2.2.0_alpha131.ebuild 11892 SHA256 a0ff5e1d8cfcfc23d237444b2871de857f29eb8efe49dea4eada28099b6dae75 SHA512 4fd7db87aa10cdc749491b22cfde35b1b11f0fff4de78ec6031629fe39fca9e6d2fba3c8ab1da79c5184d7e58c3b5767f4f4924f6914215cbba00e9a89a7e728 WHIRLPOOL 1f8d8c8702db268538c540855bbd1c25bbcbcd0cd6d5506f0a2469548a1d3aee34e928f9c92e7d069293d109e2c49d325094c2dec3ffc91e8fe0ca7efad99f3c
-EBUILD portage-9999.ebuild 11142 SHA256 d31ffe6471e1b7daa12670c2fe5a4f73634ed27155da0090e1753a8fc8c2a840 SHA512 b83dfc8e7215c4e28b85d7d6c750a15c8382bf8bd7da08177591b9e25da5787a67b8a6d62e3902f121b87030e99ace73c9cc97025e545ea088f501effa2e8f6c WHIRLPOOL f62dc38917c412e3815dbd5119e17f1cd0a53d4d8e6c150812ce25eb58a7e940485dc680cdb27e2754d53f2674b247f13b646ddddad2aee07f28512f5935c540
-MISC ChangeLog 118265 SHA256 15c3d22f2b957944548b93a8e05fd03ed1d79c482be221eb62bc570604bcb6a8 SHA512 48928c08304e072ed3b90c796d4eba1abbb049f931f48f05b2dd7f874a6cf1dd7bb6ecffc4bea9f50f553fbb06d2dbd23a64ac5bf6b56f39cf6971e474b246bb WHIRLPOOL 854123f4102f775c508b0fe99459980409cc1397126be3c977f55452e2b786f07b3b817c0d1fd947b4dec5ef11559b11526d99f522ae136985298fb728fa80c2
+EBUILD portage-2.2.0_alpha131.ebuild 11891 SHA256 616bbcca9e764e6e014a515998c1f73fd2db10ac286507e61ab4bf0c10cde796 SHA512 169368cc48e3de0bbcb9319b9bae91988f5be6aa4884b9fe569f357130a983865a36beed9f58efe8d6d7d7e9b99e9fa5fc00db92c29625196b18e4151ccd3a8f WHIRLPOOL 29bb5cbdcf853673ae7a98b110df729a6b1aecc4b3e939233f9477e04851e4e7c8d989e7dc8b27bece1f879fec7afcea7018fc92db55bfb5f8365acc72c6b740
+EBUILD portage-9999.ebuild 11141 SHA256 405b865834a9b488c82559f9ad1f6f2440d66ee51ae6d1ed94309c1ccae46b5e SHA512 35b09d2d32e4c42c787ad85f155f74e47f0cd39e736f7b8998f4c4fef6e899d93b19903df97ba0ec357365ae9616f55047896d168a2cdfafd2355cc1f529328e WHIRLPOOL 3d437abd7bf8e21cdf519ec17dd5e6133f51ad09b495af6694bf58e524c44c489ff817f4615982d65e72e0ca4869d824f5fa17609d7b375f1b8518bcc88e4177
+MISC ChangeLog 118424 SHA256 30bcbafa7ac88e88e966bdba53ca98559a2c3a3d99c1e30ad4bb644cf29a767b SHA512 9905b65c2cbe5411fb516018394d9888f05885aebcca9aab43d8fcf493c392f1ab84268915a16136e612ccd8fd02463852b7bf44ffb7116339b1ff9f5613aaa4 WHIRLPOOL 3caf761e64ec356579a3435d2179ed085520d5af13fd77f2ba0187bd1507484b22e484a921f8897dee8eebd8c178d77099c03d507d9fe29af97394d72647d82e
 MISC metadata.xml 926 SHA256 23463fa1d9a37979e2dffb502fffdd4dcd5dc932f4b5b3053999609012e4fc65 SHA512 41478467f90c58d8044471ed85ad6365e976b8cdb43556f024345861d08f1e9ae2f2fc728d114521adece630793248f2598fa330233eb98ae7b42950cf056d08 WHIRLPOOL 1aff07692c1fbca18cd3498f1cac2e64749b784a3135d881fc4cb95040bdfb93af079df1e053a547cfe08ea4384268e36ec98fc25160ad94e6ef65c6d04e5452
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBc7igACgkQ/ejvha5XGaNt2QCg1UbWhywB9UoUP5djEOoMZkJm
-X14AoM/ozMnpMP3+7sRkwld24456JUsC
-=HHJw
+iEYEAREIAAYFAlBc7vEACgkQ/ejvha5XGaPbzwCg4cUZP7fq2aEEqS68Cz08mnnb
+iBsAnR3I7lvhq6FgsDGjDtiEt6WsT6Ai
+=tf2A
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.2.0_alpha131.ebuild b/sys-apps/portage/portage-2.2.0_alpha131.ebuild
index 82bddb768a1d..c398c2be810b 100644
--- a/sys-apps/portage/portage-2.2.0_alpha131.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha131.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha131.ebuild,v 1.1 2012/09/21 22:45:54 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha131.ebuild,v 1.2 2012/09/21 22:49:15 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -206,14 +206,15 @@ src_prepare() {
 			-e "s|^\(PORTDIR=\)\(/usr/portage\)|\\1\"${EPREFIX}\\2\"|" \
 			-e "s|^\(PORTAGE_TMPDIR=\)\(/var/tmp\)|\\1\"${EPREFIX}\\2\"|" \
 			-i cnf/make.globals || die "sed failed"
-		echo -e '\nFEATURES="${FEATURES} preserve-libs"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
 
 		einfo "Adding FEATURES=force-prefix to make.globals ..."
 		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
 			|| die "failed to append to make.globals"
 	fi
 
+	echo -e '\nFEATURES="${FEATURES} preserve-libs"' >> cnf/make.globals \
+		|| die "failed to append to make.globals"
+
 	cd "${S}/cnf" || die
 	if [ -f "make.conf.${ARCH}".diff ]; then
 		patch make.conf "make.conf.${ARCH}".diff || \
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 2f7a979d8fa5..d12eca914065 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.58 2012/09/21 18:56:49 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.59 2012/09/21 22:49:15 zmedico Exp $
 
 EAPI=3
 inherit git-2 eutils python
@@ -192,14 +192,15 @@ src_prepare() {
 			-e "s|^\(PORTDIR=\)\(/usr/portage\)|\\1\"${EPREFIX}\\2\"|" \
 			-e "s|^\(PORTAGE_TMPDIR=\)\(/var/tmp\)|\\1\"${EPREFIX}\\2\"|" \
 			-i cnf/make.globals || die "sed failed"
-		echo -e '\nFEATURES="${FEATURES} preserve-libs"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
 
 		einfo "Adding FEATURES=force-prefix to make.globals ..."
 		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
 			|| die "failed to append to make.globals"
 	fi
 
+	echo -e '\nFEATURES="${FEATURES} preserve-libs"' >> cnf/make.globals \
+		|| die "failed to append to make.globals"
+
 	cd "${S}/cnf" || die
 	if [ -f "make.conf.${ARCH}".diff ]; then
 		patch make.conf "make.conf.${ARCH}".diff || \