Change ordering of moving such that on Darwin gen_usr_ldscript fixes the install_names of all bins and libraries

(Portage version: 2.2.01.21580-prefix/svn/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)

3 files changed, 42 insertions, 38 deletions

diff --git a/app-arch/bzip2/ChangeLog b/app-arch/bzip2/ChangeLog
index 00ebab5ae0..b39785ff2a 100644
--- a/app-arch/bzip2/ChangeLog
+++ b/app-arch/bzip2/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for app-arch/bzip2
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.104 2012/05/17 04:36:15 vapier Exp $
 
+  10 Feb 2013; Fabian Groffen <grobian@gentoo.org> bzip2-1.0.6-r3.ebuild:
+  Change ordering of moving such that on Darwin gen_usr_ldscript fixes the
+  install_names of all bins and libraries
+
   17 May 2012; Mike Frysinger <vapier@gentoo.org>
   +files/bzip2-1.0.6-mingw.patch, bzip2-1.0.6-r3.ebuild:
   Make it build for mingw targets #393573 by jingtaozf.
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 9b671fe86d..9a2ddf157d 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -1,29 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX bzip2-1.0.2-progress.patch 6141 RMD160 213842d0d7742dce4c1d938b79134b9e910bc8ec SHA1 90a0032645886b633c9b730d0a1abb88c88a9873 SHA256 a76f6d082a1a1fef2eff111177d7c7568e1d457fb2b98cde71bbbe6ea1c7c787
-AUX bzip2-1.0.3-no-test.patch 161 RMD160 8611ae7d6fe578e7fd24585e158c10468caca2f1 SHA1 6a8a9495e71f291aaf5bd89b134e83ccd0b5e006 SHA256 806dcb0f9f46a2b0b3ef04212405708198a25e281617e27a44c565948c159a49
-AUX bzip2-1.0.4-POSIX-shell.patch 672 RMD160 1863eb33a8fd89cb25d3a907e67e4e8c989bf88f SHA1 43ccd410482c2d51240afed34db59fee90344fa5 SHA256 34bc42c1d6c980e0970a517c9602b904efb2f676ec191e80fcbcd185ccb6b1fe
-AUX bzip2-1.0.4-makefile-CFLAGS.patch 569 RMD160 1fd187ef6c49bca32807a83842af3d76bbe1dddf SHA1 59f2d6172d0d8ced74f44258954e6760a6184987 SHA256 853621ae207f0115210e06f738d4e79861110712823419707875116cb45b105e
-AUX bzip2-1.0.4-man-links.patch 413 RMD160 ce3b8ae5b5c87024c959b95ace2868930a4ebcac SHA1 9f34a13a9c0e8c3f4808bf053f73a5e73158aaff SHA256 1fc9d91f3f7bd3eecd86149b9c95b3162d9d7956f7de543aa8bc41cbcd04f88b
-AUX bzip2-1.0.4-prefix.patch 1708 RMD160 a1f9ae9ce73bf6e07f49952514f173a77706c23d SHA1 77cca68acaf650a8858b4e15d36c9369f820b9e5 SHA256 a5a90036dc6df99338cfa1d47ed58bf83b46fcbde8e8a01a26a99a82c83839b5
-AUX bzip2-1.0.4-saneso.patch 439 RMD160 3ac613223c1cd57023cae7b60d236452be87161f SHA1 20dd82b41420b42f612b8a8c419df1463b353e69 SHA256 a3c343536f0292017d11f453f19f2afc4118de20b9200fcca83d1c641821b8e9
-AUX bzip2-1.0.5-Makefile-libbz2_dylib 1762 RMD160 840cc10b7288f58e600294dcc4838f6b5677fd5d SHA1 e7537bdd9e5ec4a2c76ace37196a735c7b0d96b0 SHA256 2faed340d874e8fda2d6d00158501f7beb6fb47968c0514fe78ade4f8bca17aa
-AUX bzip2-1.0.5-checkenv.patch 823 RMD160 1d5580a49a167b8c266631ce5f27d43835f47b29 SHA1 2b636bf6c5ad2e1562b0d95ca54e2d51d8c6ddf0 SHA256 13d4f7c38523416d124ba8c6519f31d4f9bd633dca7325e3b78f8bfbc29ecc1e
-AUX bzip2-1.0.5-soldflags.patch 1055 RMD160 15ba6d1d1d00393eca7b26d1de83f9dec9b2d5d1 SHA1 c67807ae713ae6e574f3ca60f59e06cd0f52c732 SHA256 76060539c08dea7e7276b1651f5a034caf672ce517c574076b17131d41ce0845
-AUX bzip2-1.0.6-Makefile-libbz2_dylib 1774 RMD160 8de904dd2ab3ae06a57c356f0fb7cd4249d818b1 SHA1 1ce7d8eafaa2cc45e7682e232dab319b2177a3a3 SHA256 b4163f07fc554a9a380cb64b6d648ab158c998a045e08ccd4dacc818a1c835c9
-AUX bzip2-1.0.6-mingw.patch 556 RMD160 abf077f91975f7785e847bad57458332718e273c SHA1 f7ff32d808d4dfc0c9388ce4430918ac56d3093f SHA256 8da568f1d7daac4ac6b9d7946dd3b807e062b5a1710a2548029cc4f158e8d717
-AUX bzip2-1.0.6-progress.patch 5756 RMD160 c288ba9362f429b279173b353abd4b4b40b68604 SHA1 353b74786f3f8fcddb73691780280a72ef77b85d SHA256 f93e6b50082a8e880ee8436c7ec6a65a8f01e9282436af77f95bb259b1c7f7f7
-AUX bzip2-1.0.6-saneso.patch 439 RMD160 9738dcd8bd4c482ea3bec4409a9e5bce49ef82eb SHA1 605b3ad94084a4f6a905827e180336df95b20769 SHA256 8345a9fcfce28a459a12126748ac27480a384e80974c31d9fae752d818ea05d9
-DIST bzip2-1.0.6.tar.gz 782025 RMD160 cc31bbae95e8eec259cef7627eae0c667654a339 SHA1 3f89f861209ce81a6bab1fd1998c0ef311712002 SHA256 a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd
-EBUILD bzip2-1.0.6-r1.ebuild 3796 RMD160 3b11292b556df508957a1eae88723358aa1f7717 SHA1 24c9a981f072a20ad6519f04985307713bbc6cab SHA256 e06ecf3470052e3e3842673f6b70fe775349e2b1d61b7954b9ae31c85ceef97a
-EBUILD bzip2-1.0.6-r3.ebuild 4041 RMD160 5d837dc5bdfd1df6fa9ebb8bd0309754411ec2af SHA1 65605f893a1e752a43dd55f959cca6859a182b87 SHA256 8f2a74f4bc38f9096daac8725b0d792f0d3bee628904c0b53d5af74e1cb99053
-MISC ChangeLog 15840 RMD160 116c11a3a602142d3cbc31e4ac3272e86593f71a SHA1 66b6cd556601422398b54dbd6e8830bfd2aab0a3 SHA256 2dcc99095b58b21cc0b06137633105a0846e82a12a33a833d1ef184d73dab96b
-MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+AUX bzip2-1.0.2-progress.patch 6141 SHA256 a76f6d082a1a1fef2eff111177d7c7568e1d457fb2b98cde71bbbe6ea1c7c787 SHA512 b6810c73428f17245e0d7c2decd00c88986cd8ad1cfe4982defe34bdab808d53870ed92cb513b2d00c15301747ceb6ca958fb0e0458d0663b7d8f7c524f7ba4e WHIRLPOOL 06d940b0c1e389ffd97477c3b0f36dd39e017fba9332fbc6df80987498e15bdce700d0a8b0962e1d88e3a321ed50551e5eb048721be9a3af5f00ffcd63d3d899
+AUX bzip2-1.0.3-no-test.patch 161 SHA256 806dcb0f9f46a2b0b3ef04212405708198a25e281617e27a44c565948c159a49 SHA512 a07f04189bce8a53980f324769cc8eb79eed9e42cbed223b74f566802e61eacb45e677c122266689a654d4fc946cba4a2171c72be87f98e4996c6cde5cb0c462 WHIRLPOOL bf32302ea76029ca01c07e70024460ab8cde0c4db84ebad1b0fe66717f465f515b96c70fe67fb7d0f48233e3bd883f77dc83c489e8a0418c982ff416e66c1c11
+AUX bzip2-1.0.4-POSIX-shell.patch 672 SHA256 34bc42c1d6c980e0970a517c9602b904efb2f676ec191e80fcbcd185ccb6b1fe SHA512 7fc5e34ac2fccb7e096bafa6dd934fb72375c17e0cfa3e0549648ecc82ec44521eb8f8ac3ce49a4064ee67fa9319da9e52db86a971443956f71d11c056289d19 WHIRLPOOL 42d9a3b0ac26fc59ee74fa5fb1b7f74a6c4cebab13100ed1165e6d8d40bddfc58425b0a3018f6e6216789fad498e25419199c020df24197a8ca5730ccb2d8e36
+AUX bzip2-1.0.4-makefile-CFLAGS.patch 569 SHA256 853621ae207f0115210e06f738d4e79861110712823419707875116cb45b105e SHA512 5ad3ecad8b577737386f0e5fc6f9adfd72334598b6dc76755cab6e38611b048c5c6b97462cbca48237a95802e1e2ac0de34b03d579d737edda8eea3e6a31346e WHIRLPOOL f4906ca56ce15b6ea18fccbc745c18858458ac2ecf6d2f1cb57de710ce5888d567dfed1dc34048cf1909d3d9f66a7c3b356bec0ee02674924669e7d717e2e6e2
+AUX bzip2-1.0.4-man-links.patch 413 SHA256 1fc9d91f3f7bd3eecd86149b9c95b3162d9d7956f7de543aa8bc41cbcd04f88b SHA512 2d9a306bc0f552a58916ebc702d32350a225103c487e070d2082121a54e07f1813d3228f43293cc80a4bee62053fd597294c99a1751b1685cd678f4e5c6a2fe7 WHIRLPOOL 20b6ddb25628bcd24d96998bb7a9e81e2e69dce0305133b546936b558a1d93f72dec7f1e9637d6b1a539b25326112403e878c049d280914cd08cea1b66f523b9
+AUX bzip2-1.0.4-prefix.patch 1708 SHA256 a5a90036dc6df99338cfa1d47ed58bf83b46fcbde8e8a01a26a99a82c83839b5 SHA512 9373be7ac0410f8c54528067ba17402f2e08383231f705123f886a6146caab3d050b801aceb0cb305f6c86f745f3029e3bc0493c90a6df92b7dfdc51d02a37e5 WHIRLPOOL bae0fdb0842acbf06aae1306ba96eb2ee49be5982d34783170eb8aabe148e5aee1cab22e95371d07527abc18713331a7ed645a55642839cb6a89d0d88cd61179
+AUX bzip2-1.0.4-saneso.patch 439 SHA256 a3c343536f0292017d11f453f19f2afc4118de20b9200fcca83d1c641821b8e9 SHA512 96988e916eaa13b96b282d86d5878ba562ecf0aa70d03f1d65d6a1b9d3dcde7b5673444a0d345310780c374ecf5e2439fc450f558487f4f780b2a92806ce8971 WHIRLPOOL 240701abf1a3e6c9a503725dacce4a884d82afd85eae37515180a5dedda8676b3e75985aa7ad2254a94cecc6c910e638fec5ca6720159faecda89455a061bc5b
+AUX bzip2-1.0.5-Makefile-libbz2_dylib 1762 SHA256 2faed340d874e8fda2d6d00158501f7beb6fb47968c0514fe78ade4f8bca17aa SHA512 e22e97766f8044df11e6649622b5be44c53018ca4264bdeaf840660b6a9828a711e2be271e92aa92d529e70b5f470e3bae91e4a5c2ee7d6e25181c6c45a0f534 WHIRLPOOL 6da5eab68bff45c0fbf2608caa7327181d502a3f85487c28c56eb17b401edacdcf67c55ec4e2d30025d2a9eb6f642f827411dfd083e366a607ce59e8f90ed1e9
+AUX bzip2-1.0.5-checkenv.patch 823 SHA256 13d4f7c38523416d124ba8c6519f31d4f9bd633dca7325e3b78f8bfbc29ecc1e SHA512 332bf4e7fee4f5797183e60c634236f56712b7e8f9f38f1ba8fe342dc4c324876bf69422f3eb0148b406e49b19fb31278f88d27090376206689782b1d9a3294c WHIRLPOOL c24266ac1331415cbd5cba1730d622cb6a2c6590d6ed26fabe241f5c27cea9967368a6fba899de972c6fe2585cdc7a6d91d4010584201c4e6cd7576113076cfd
+AUX bzip2-1.0.5-soldflags.patch 1055 SHA256 76060539c08dea7e7276b1651f5a034caf672ce517c574076b17131d41ce0845 SHA512 4064f9eff3241aca617209f46f5981ea4dd0e19bf04a87e787927bcec64784aadf4fdce43d581de52ef7ada38e89ed7fb9f5acf35f8aefa4d4b7b2577a86bf73 WHIRLPOOL 8dd8215a1a63ece487ac59ebc7989720de611bcbd782a595066abb7ae894601a58de09203f7ef0d009b2da1010457ca74197557bc1c35c85c41ddb2a7caeca37
+AUX bzip2-1.0.6-Makefile-libbz2_dylib 1774 SHA256 b4163f07fc554a9a380cb64b6d648ab158c998a045e08ccd4dacc818a1c835c9 SHA512 1ed4f41e32ba0b407b53a9184dabf241f8cd6c31c6ef065a47581749389b1bbb6fd86c2ffbdb1287627aba0c23a7e81801616dde9200fc64b56cbcd9f5bbb35e WHIRLPOOL 6a6388ecbebd349245e5c2619aa701ab3b3961449cbe9b0ac638c001703486f6c1e2d86502b60fe21b4552a35b5e99c5a13cf1edc2f12f31bd6e798e48f08404
+AUX bzip2-1.0.6-mingw.patch 556 SHA256 8da568f1d7daac4ac6b9d7946dd3b807e062b5a1710a2548029cc4f158e8d717 SHA512 e28442acc456c996eb6bc1866cd3814a9aea9c8a4ac2767a59bd03273ee95e34efdb4d00a17c64242a3395056b38c7083ec6f4c986e91d02f5348af1af2a35c8 WHIRLPOOL 66cbedef7eef3b4890a56dd0aad28529960c2e205fc7809ded96dd7ece17cdd3f18d92eeca25e009f2ca3689f9ad2d2bf81238562078d4147d87124107ac41af
+AUX bzip2-1.0.6-progress.patch 5756 SHA256 f93e6b50082a8e880ee8436c7ec6a65a8f01e9282436af77f95bb259b1c7f7f7 SHA512 c3f5959027346a471182fbcac72fe3b755d9327557ac31fd8d36746c643afd418f5a59bf434493109af4536b90e69220e985a25eb3ce7e3d05029583a9d0bcdc WHIRLPOOL 830dab52ec0efd50a0266863dec0180e40db7ef519cd5c02991bc12fb978bb5df5d0329ede896aff02fc2abbfa09c4380949c8f5eb48a9ccbb562675fa5d2003
+AUX bzip2-1.0.6-saneso.patch 439 SHA256 8345a9fcfce28a459a12126748ac27480a384e80974c31d9fae752d818ea05d9 SHA512 4f5d499227e3381e87c43b4afa48b5cd1f796142805dee19bf7f9f3a8547ca5baaf0b1d1f42079a61b63e3c279650292cca119e7d177ad04425c93e23f1bbd88 WHIRLPOOL 35d83bd455116a1121c87675bf0ceda0e37ac48a76a1379d0455e39026b1445c3d90493923ee1c4c49f3cc388c8344b8a4379d6c44e01564d658ebd22c3a5a10
+DIST bzip2-1.0.6.tar.gz 782025 SHA256 a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12 WHIRLPOOL 8e92c24f77c3711f5103a26d6fefbe61fe49a7d1e46879d259d46347c606ca956b7228ab011aa88007db771f86a500d4954057c7f9c70bd8380ca6c9430bd81e
+EBUILD bzip2-1.0.6-r1.ebuild 3796 SHA256 e06ecf3470052e3e3842673f6b70fe775349e2b1d61b7954b9ae31c85ceef97a SHA512 65cb52d4f614ec0b2b8d0a31deee460ad5befd8f51937041f9ef31810fc5b64878b7d98460ebcc1975faaad1c473843c77ed15e6d6d8ffaab9feac7ac5a991df WHIRLPOOL 30c5dd687fce9362f5c21cbe10241d9506395eab577c82d0e434b8df702e20543f65ecfc0f0497dcf750165872d25e0fff374d8a2d42e278500904f2ee78dfbc
+EBUILD bzip2-1.0.6-r3.ebuild 4041 SHA256 3857a5568a10021f90eb68c5f628c57a6cfaf5c924edc9b206a7bd1b9c879e77 SHA512 342cea6ebd73dcfdd795ee447e6ff277115a30f9b40a9bafe2f856f493f65bded5811a62a644cbd4b7f5ef278e24163061ef0a971d8cf2562f3a1a2ef44b5abb WHIRLPOOL 1c44d5b2e7747af81aac8635dd381a6e782552893429a025b7b378fc6a8898bf2bcafcec32b3e5bdfe3ea5aeba43713f037d5b2f0fd010d8f31e066ccc743e2a
+MISC ChangeLog 16032 SHA256 87645b94a2b0aff5394ae2853049b844d822aff9d5e6203463ffe74695f0da1b SHA512 2a4079fd2ebd677e1a6226a629714f21d19762751d43d4a5b40afc93b0dcdb7bfd00bbef4729324cf95b0018079c192f0e21afc61be92e3b6bd7a60264b3fed0 WHIRLPOOL 9e3fdd96d0abed7a04747ad7cd4f699f640957b25b1027153d438329e692f7f80da0ff25869b00d0685849bfefb2d952f40e36089aed3ee09960f6f146d18f0a
+MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (SunOS)
 
-iEYEARECAAYFAk/CBOYACgkQX3X2B8XHTonFrgCfR05OETqNROPQONt3ZERK5ddU
-moUAn2cXG0PMVECvsizq2IQLEAn71ihN
-=2DGs
+iEYEAREIAAYFAlEX8HAACgkQX3X2B8XHTombKwCdHkUDSoMj4yfDOJ4c4hW6mfXY
+iZ8AnRpGJ8JeB6GCwWlCS8WVbJjq9OnN
+=e2Ju
 -----END PGP SIGNATURE-----
diff --git a/app-arch/bzip2/bzip2-1.0.6-r3.ebuild b/app-arch/bzip2/bzip2-1.0.6-r3.ebuild
index d997ec8ac7..6f5f1cd7cc 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r3.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.6-r3.ebuild,v 1.11 2012/05/17 04:36:15 vapier Exp $
 
@@ -85,17 +85,6 @@ src_install() {
 
 	if [[ $(get_libname) != ".irrelevant" ]] ; then
 
-	# Install the shared lib manually.  We install:
-	#  .x.x.x - standard shared lib behavior
-	#  .x.x   - SONAME some distros use #338321
-	#  .x     - SONAME Gentoo uses
-	dolib.so libbz2$(get_libname ${PV}) || die
-	local s
-	for v in libbz2$(get_libname) libbz2$(get_libname ${PV%%.*}) libbz2$(get_libname ${PV%.*}) ; do
-		dosym libbz2$(get_libname ${PV}) /usr/$(get_libdir)/${v} || die
-	done
-	gen_usr_ldscript -a bz2
-
 	if ! use static ; then
 		newbin bzip2-shared bzip2 || die
 	fi
@@ -103,14 +92,25 @@ src_install() {
 		rm -f "${ED}"/usr/lib*/libbz2.a || die
 	fi
 
-	fi
-
 	# move "important" bzip2 binaries to /bin and use the shared libbz2.so
 	dodir /bin
 	mv "${ED}"/usr/bin/b{zip2,zcat,unzip2} "${ED}"/bin/ || die
 	dosym bzip2 /bin/bzcat || die
 	dosym bzip2 /bin/bunzip2 || die
 
+	# Install the shared lib manually.  We install:
+	#  .x.x.x - standard shared lib behavior
+	#  .x.x   - SONAME some distros use #338321
+	#  .x     - SONAME Gentoo uses
+	dolib.so libbz2$(get_libname ${PV}) || die
+	local s
+	for v in libbz2$(get_libname) libbz2$(get_libname ${PV%%.*}) libbz2$(get_libname ${PV%.*}) ; do
+		dosym libbz2$(get_libname ${PV}) /usr/$(get_libdir)/${v} || die
+	done
+	gen_usr_ldscript -a bz2
+
+	fi
+
 	if [[ ${CHOST} == *-winnt* ]]; then
 		dolib.so libbz2$(get_libname ${PV}).dll || die "dolib shared"