sync and fix build of 1.0.6-r7

(Portage version: HEAD/hg/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)

8 files changed, 105 insertions, 107 deletions

diff --git a/app-arch/bzip2/ChangeLog b/app-arch/bzip2/ChangeLog
index b39785ff2a..f7f933ca01 100644
--- a/app-arch/bzip2/ChangeLog
+++ b/app-arch/bzip2/ChangeLog
@@ -1,6 +1,83 @@
 # ChangeLog for app-arch/bzip2
-# 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 $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.124 2014/04/28 17:18:31 mgorny Exp $
+
+  28 Apr 2014; Michał Górny <mgorny@gentoo.org> bzip2-1.0.6-r6.ebuild,
+  bzip2-1.0.6-r7.ebuild:
+  Replace multilib_build_binaries with multilib_is_native_abi. The two are
+  equivalent now, and the team has decided to use the old name as being less
+  confusing.
+
+  31 Mar 2014; Mike Frysinger <vapier@gentoo.org> bzip2-1.0.6-r6.ebuild:
+  Mark ppc64 stable #504004.
+
+  26 Mar 2014; Markus Meier <maekke@gentoo.org> bzip2-1.0.6-r6.ebuild:
+  arm stable, bug #504004
+
+  24 Mar 2014; Agostino Sarubbo <ago@gentoo.org> bzip2-1.0.6-r6.ebuild:
+  Stable for ppc, wrt bug #504004
+
+  23 Mar 2014; Agostino Sarubbo <ago@gentoo.org> bzip2-1.0.6-r6.ebuild:
+  Stable for sparc, wrt bug #504004
+
+  20 Mar 2014; Mike Frysinger <vapier@gentoo.org> bzip2-1.0.6-r6.ebuild:
+  Mark arm64/m68k/s390/sh stable.
+
+  18 Mar 2014; Agostino Sarubbo <ago@gentoo.org> bzip2-1.0.6-r6.ebuild:
+  Stable for ia64, wrt bug #504004
+
+*bzip2-1.0.6-r7 (18 Mar 2014)
+
+  18 Mar 2014; Mike Frysinger <vapier@gentoo.org> +bzip2-1.0.6-r7.ebuild:
+  Link bzip2 against the shared lib #504648 by Nikoli.
+
+  14 Mar 2014; Johannes Huber <johu@gentoo.org> bzip2-1.0.6-r6.ebuild:
+  x86 stable, bug #504004
+
+  14 Mar 2014; Matt Turner <mattst88@gentoo.org> bzip2-1.0.6-r6.ebuild:
+  alpha stable, bug 504004.
+
+  14 Mar 2014; Chema Alonso <nimiux@gentoo.org> bzip2-1.0.6-r6.ebuild:
+  Stable for amd64 wrt bug #504004
+
+  10 Mar 2014; Jeroen Roovers <jer@gentoo.org> bzip2-1.0.6-r6.ebuild:
+  Stable for HPPA (bug #504004).
+
+  18 Jan 2014; Mike Frysinger <vapier@gentoo.org> bzip2-1.0.6-r3.ebuild,
+  bzip2-1.0.6-r4.ebuild, bzip2-1.0.6-r6.ebuild:
+  Add arm64 love.
+
+*bzip2-1.0.6-r6 (16 Jan 2014)
+
+  16 Jan 2014; Mike Frysinger <vapier@gentoo.org> +bzip2-1.0.6-r6.ebuild,
+  -bzip2-1.0.6-r5.ebuild:
+  Fix USE=static-libs to actually install the static lib #498188 by Dirk Best.
+
+*bzip2-1.0.6-r5 (05 Jan 2014)
+
+  05 Jan 2014; Mike Frysinger <vapier@gentoo.org> +bzip2-1.0.6-r5.ebuild,
+  +files/bzip2-1.0.6-out-of-tree-build.patch, bzip2-1.0.6-r4.ebuild:
+  Add minimal out-of-tree build support to speed up the build a bit.
+
+  05 Jan 2014; Mike Frysinger <vapier@gentoo.org> bzip2-1.0.6-r4.ebuild:
+  Only set -static in LDFLAGS for prog building #485690 by Greg Turner.
+
+  28 Jul 2013; Alexis Ballier <aballier@gentoo.org> bzip2-1.0.6-r4.ebuild:
+  Fix blocker on emul-libs
+
+  02 Jul 2013; Mike Frysinger <vapier@gentoo.org> bzip2-1.0.6-r4.ebuild,
+  files/bzip2-1.0.4-man-links.patch:
+  Move `ln` update to the patch rather than sed-ing it after the fact #475334 by
+  Yuta SATOH.
+
+*bzip2-1.0.6-r4 (23 Jun 2013)
+
+  23 Jun 2013; Pacho Ramos <pacho@gentoo.org> +bzip2-1.0.6-r4.ebuild:
+  Add ebuild supporting native multilib (#457134, thanks to mgorny and vapier
+  for their help)
+
+  05 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
+  Add upstream CPE tag (security info) from ChromiumOS.
 
   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
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index eaae70ba28..d4f53b04ed 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -5,14 +5,13 @@ AUX bzip2-1.0.2-progress.patch 6141 SHA256 a76f6d082a1a1fef2eff111177d7c7568e1d4
 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-man-links.patch 422 SHA256 03e6ba8a87a8abcf6bb02c0e44186e4b20b8dc871ac2d4921cfc3c9ea616e971 SHA512 7c650620dc11522c4d8bd17a55da18ab3f8556cf83452459e86bceecf33a5de39b8e05e23eb11c4c8dffa79cc8d23d54741ccc8bc715dea2e108f5f3c8dde20c WHIRLPOOL 33a67aec4d7f668f401e920a9c97d9715535bbe774d0fb4b0baa12f023215081904995a22dc8eaa5708c7e1b736738164055c9e77d188650ad61fe99abcaf8d1
 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-Makefile-libbz2_dylib-out-of-tree 1335 SHA256 a67f858abe62451faf2a73508b72bb1f12447a5505b6aca520ecaadf8d9b1b90 SHA512 9066d88ac12a45bd4096b99209a2c86e594aeab31fb0becf23a98ba5e0e9db3f5cdfb34434d5992017ec211b2349b6a9c4164fbbf1dcf3346a3ecb57691dd9b1 WHIRLPOOL 628c06637eb55d1dd55361c4ab1dd23b165fed1ec34507dfe3823b58fd7a8a73e4066ef4920472e42c0187ab8abcf7e8a52974ee5ab87fa804ea0e0ffa097fb5
+AUX bzip2-1.0.6-Makefile-libbz2_dylib 1257 SHA256 9fab9ad85ec58564c80238ee2792e3ed20c73e445313cb8f139b5f37517a06d3 SHA512 d5818677c8d393b04a8337122c780d34162db33f8e09b41a73d8a251ff06271076fd85de60b73ea5be5bfdce17c6e1ad3a5d597dedfc8991123413472ba9b379 WHIRLPOOL fa9efd894784267352e5feb29f130d6b4ccda9e4141ff49a558913fd1af9c5a48160548613abb8a3d207050abd8f28a7abbfcd0da4a222a033dc292eb295e658
 AUX bzip2-1.0.6-mingw.patch 556 SHA256 8da568f1d7daac4ac6b9d7946dd3b807e062b5a1710a2548029cc4f158e8d717 SHA512 e28442acc456c996eb6bc1866cd3814a9aea9c8a4ac2767a59bd03273ee95e34efdb4d00a17c64242a3395056b38c7083ec6f4c986e91d02f5348af1af2a35c8 WHIRLPOOL 66cbedef7eef3b4890a56dd0aad28529960c2e205fc7809ded96dd7ece17cdd3f18d92eeca25e009f2ca3689f9ad2d2bf81238562078d4147d87124107ac41af
 AUX bzip2-1.0.6-out-of-tree-build.patch 2121 SHA256 2dd4db48de0a3b1a927725640ad4f56e90d68c33ea3cea9ff0dab7bdb8f7ccc1 SHA512 f4a85c8b9ba0fe0ffadcb058550bb948e84c51f4c213957ffeb1072258efb1caa957c496ce0a0fb4d4b5f7dfdf062995a819487b9475389cfb25583fa061143e WHIRLPOOL 18491f4d99ef866154379112d4c0b840bf6960a116cb03c338aa132cb5440f8cfec8a0933460794902e11b2c0cc13edd99aefc424d3d0f91e4b30d221230ff56
 AUX bzip2-1.0.6-progress.patch 5756 SHA256 f93e6b50082a8e880ee8436c7ec6a65a8f01e9282436af77f95bb259b1c7f7f7 SHA512 c3f5959027346a471182fbcac72fe3b755d9327557ac31fd8d36746c643afd418f5a59bf434493109af4536b90e69220e985a25eb3ce7e3d05029583a9d0bcdc WHIRLPOOL 830dab52ec0efd50a0266863dec0180e40db7ef519cd5c02991bc12fb978bb5df5d0329ede896aff02fc2abbfa09c4380949c8f5eb48a9ccbb562675fa5d2003
@@ -20,24 +19,14 @@ AUX bzip2-1.0.6-r7-checkenv.patch 811 SHA256 d5928027625148a0fc395adc2d8a9353b26
 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
-EBUILD bzip2-1.0.6-r7.ebuild 4817 SHA256 826c29014a968cfc08d789d2c66a325c4006bdaa01f0f3798e174f57187f7352 SHA512 459ad9e5da212243af6f676f729b4c244e811e43a1322a98aa1e0ed629574874a9e1c4073c60531aee731977d79e24d7b84ad55d6a265c466ef6c9e96d002c20 WHIRLPOOL 0f4873fbb1bf1cc8d480ee88b47225afb5d050188e4583289cf008b8894c26c1e3cfe5e45218ba251dd94341e87b9725ca0ec02932cd9f3c319ced4f2ccc830f
-MISC ChangeLog 16032 SHA256 87645b94a2b0aff5394ae2853049b844d822aff9d5e6203463ffe74695f0da1b SHA512 2a4079fd2ebd677e1a6226a629714f21d19762751d43d4a5b40afc93b0dcdb7bfd00bbef4729324cf95b0018079c192f0e21afc61be92e3b6bd7a60264b3fed0 WHIRLPOOL 9e3fdd96d0abed7a04747ad7cd4f699f640957b25b1027153d438329e692f7f80da0ff25869b00d0685849bfefb2d952f40e36089aed3ee09960f6f146d18f0a
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+EBUILD bzip2-1.0.6-r3.ebuild 4041 SHA256 02fb40f3cdee1eb4fc1a247525bc31309ea2042fbb4acea6a1b18daea2a6a8d4 SHA512 f8da084ccac8a2d210db6ee7e85557cdd50dff71ed95b8abade8a3933265f31f578911d409aac31585724621766312da4bc0ae472a90a9a3449d5f185093c0a7 WHIRLPOOL 5958af2f67061d0b280fcaf513e91cc5eb7d66da54684ee320150a1389c058fe95ffecdef47909141950789053e8e4959a8cc3e5dcaa73c1aaed279a20de8e7d
+EBUILD bzip2-1.0.6-r7.ebuild 4402 SHA256 a0179f773979a4aa84ffd2f6a4fdfd60c01f820239a827e6537bd8f22312a3fb SHA512 bdc1f5e8b8064581356c8bc2687a2ccdfb05d7def45df21736bd4900cf5a2660f19fcd589760a03ea16a2e0d53bfc3e0c3bace8b653c9cb51f13f69fb3526ad0 WHIRLPOOL 4cfa3d71484778fad3eece47f829942b9621a6286ee7e68a2d1ed4de202b09b34bd293866d9cfee5bea3cc27bcb0a3d5399f7d01b089b9636926089889210c9c
+MISC ChangeLog 18869 SHA256 23c7af796c486a978e826b65a5ceae6b7129c85f28d4864d0d89af563eb7e5ae SHA512 c34ae675b32085e6b53150e774562a571b409c556421606a1cb4dd55c6500209da60f89714f5260064e0043245a6fc7ab7d938226ff5af7cd3ce261941398c50 WHIRLPOOL 3526a497450e8772b28357a7ad489b852bdb5b52baa06b2e93b7878aeb593871967346ea42aa80724126b351cb142aef37d0c1f425616bb5db36c566ab570a5f
+MISC metadata.xml 241 SHA256 c9ef9f8a652ceb4655983472cec571c6762f53934447a83b38b311cf9e50254d SHA512 23ed7f7371d00caf97235d7a4f905286637cd286f9e8fc7c0413865dbab0772ff00dd9ecf65b5f199d694b42f032dc14ad9d3ac447cf1bb95124abf9203c0f1d WHIRLPOOL d687e040f4378e573d241a08b46ba7bd0f4c9d5ef4c9cf836a479102e5f8902e67244308747adf34b6bc605511244d37873b796f8089dc3e181a627302843d02
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0.22 (SunOS)
 
-iQIcBAEBCAAGBQJTrPduAAoJEMcu9QQQ+wFr6W0QAKlJEwRzCLPKYUgDlbiZUAU7
-NMlr2HRoJ90l5wPvcnxDksoKJRZQyAhHsRcJ2Nn6ueCOkQ/7fFYOuZPYrM9KB+5p
-meL3xkylRSRYM8xWzC1xUaPly+pSXcPhIVktrBbiUGq8vvWf58wZtphWqR5YlOjF
-WsLEjgi5nn/HQa9rNvCs72NAcYz/u4lhbJsViaXA3wU5oSLamIclhoBZ7JBRpWoF
-qZ6bgvISI09AnKi+4/A+9DixutMeBGa1JRJzQVXlSWxRklfpEP8praxFu/VI33Oc
-v1arXUGcvbjHQ0ukz7APZyhiWoZhakZr8kUJEAy4nW08a931Hu1ydYHvHM0UusQJ
-3llKgkU5bOQl6kw0xGvlZWINd1ZgHEOojpMT/6EanSf0ka7onPXQ7gkgpk1fojmn
-hfU/Qm+ltLAqz6tew+aNP21GTN/ZoDC/E+hvvAQumS5PMOgbCY5ydzQFmtpXUesV
-PHME/b10o1tmdl82bTrOeirS9qi9Nno/s4zaclwHqizY5y5hOaegFZOTjdw2+jM0
-Iw4x/vcH94pzXTGPUXNYvZZwPC8Y7ASArOSo6C+f+i74WbDG2HkvIdjMubtwrwMd
-Wn2zg0a8q0trbLbc6vRh5P5zuFpJqjzkktxbKxJuka56hmth+QVGTzOVFh361qpl
-YzfaHYow65sMWGc7IzBI
-=//W5
+iEYEAREIAAYFAlO3+1kACgkQX3X2B8XHTolakwCfRBiEizsL2MSjSmc0LBnP3scP
+x6gAn0pRPtkilxVKSVYcv0Vq5MqTqfo1
+=DIWa
 -----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 6f5f1cd7cc..a04515c7ca 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r3.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.6-r3.ebuild,v 1.12 2014/01/18 01:43:22 vapier Exp $
 
 # XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
 #      (since we're building shared libs) ...
diff --git a/app-arch/bzip2/bzip2-1.0.6-r7.ebuild b/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
index c3d09996b5..d07ed3dfa2 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
@@ -37,7 +37,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.0.4-prefix.patch
 	eprefixify bz{diff,grep,more}
 	# this a makefile for Darwin, which already "includes" saneso
-	cp "${FILESDIR}"/${P}-Makefile-libbz2_dylib-out-of-tree Makefile-libbz2_dylib || die
+	cp "${FILESDIR}"/${P}-Makefile-libbz2_dylib Makefile-libbz2_dylib || die
 
 	# - Use right man path
 	# - Generate symlinks instead of hardlinks
@@ -54,9 +54,6 @@ src_prepare() {
 			sed -i -e '/^SOEXT/s,so,sl,' Makefile-libbz2_so || die "cannot replace so with sl"
 			sed -i -e '/^SONAME/s,=,=${EPREFIX}/lib/,' Makefile-libbz2_so || die "cannt set soname"
 		fi
-	elif [[ ${CHOST} == *-interix* ]] ; then
-		sed -i -e 's,-soname,-h,' Makefile-libbz2_so || die "cannot replace -soname with -h"
-		sed -i -e 's,-fpic,,' -e 's,-fPIC,,' Makefile-libbz2_so || die "cannot replace pic options"
 	fi
 }
 
@@ -73,18 +70,20 @@ multilib_src_compile() {
 	local checkopts=
 	case "${CHOST}" in
 		*-darwin*)
-			bemake PREFIX="${EPREFIX}"/usr -f "${S}"/Makefile-libbz2_dylib || die
+			bemake PREFIX="${EPREFIX}"/usr -f "${S}"/Makefile-libbz2_dylib all
+			# FWIW, #504648 like for .so below
+			ln -sf libbz2.${PV}.dylib libbz2.dylib
 		;;
 		*-mint*)
 			# do nothing, no shared libraries
 			:
 		;;
 		*)
-			bemake -f "${S}"/Makefile-libbz2_so all || die
+			bemake -f "${S}"/Makefile-libbz2_so all
+			# Make sure we link against the shared lib #504648
+			ln -sf libbz2.so.${PV} libbz2.so
 		;;
 	esac
-	# Make sure we link against the shared lib #504648
-	ln -sf libbz2.so.${PV} libbz2.so
 	bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')"
 }
 
@@ -98,12 +97,11 @@ multilib_src_install() {
 	#  .x.x   - SONAME some distros use #338321
 	#  .x     - SONAME Gentoo uses
 	dolib.so libbz2$(get_libname ${PV})
-	local s
+	local v
 	for v in libbz2$(get_libname) libbz2$(get_libname ${PV%%.*}) libbz2$(get_libname ${PV%.*}) ; do
 		dosym libbz2$(get_libname ${PV}) /usr/$(get_libdir)/${v}
 	done
 
-	[[ ${CHOST} == *-winnt* ]] && dolib.so libbz2$(get_libname ${PV}).dll
 	fi
 
 	use static-libs && dolib.a libbz2.a
@@ -147,8 +145,4 @@ multilib_src_install_all() {
 	# move "important" bzip2 binaries to /bin and use the shared libbz2.so
 	dosym bzip2 /bin/bzcat
 	dosym bzip2 /bin/bunzip2
-
-	# on windows, we want to continue using bzip2 from interix.
-	# building bzip2 on windows gives the libraries only!
-	[[ ${CHOST} == *-winnt* ]] && rm -rf "${ED}"/bin "${ED}"/usr/bin
 }
diff --git a/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch b/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch
index 2427d6a7fb..308f5f9b3e 100644
--- a/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch
+++ b/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch
@@ -5,8 +5,8 @@ http://bugs.gentoo.org/172986
 @@ -85,4 +85,7 @@
  	cp -f bzip2.1 $(PREFIX)/share/man/man1
  	chmod a+r $(PREFIX)/share/man/man1/bzip2.1
-+	ln -s bzip2.1 $(PREFIX)/share/man/man1/bunzip2.1
-+	ln -s bzip2.1 $(PREFIX)/share/man/man1/bzcat.1
-+	ln -s bzip2.1 $(PREFIX)/share/man/man1/bzip2recover.1
++	ln -s -f bzip2.1 $(PREFIX)/share/man/man1/bunzip2.1
++	ln -s -f bzip2.1 $(PREFIX)/share/man/man1/bzcat.1
++	ln -s -f bzip2.1 $(PREFIX)/share/man/man1/bzip2recover.1
  	cp -f bzlib.h $(PREFIX)/include
  	chmod a+r $(PREFIX)/include/bzlib.h
diff --git a/app-arch/bzip2/files/bzip2-1.0.6-Makefile-libbz2_dylib b/app-arch/bzip2/files/bzip2-1.0.6-Makefile-libbz2_dylib
index 85f1bd0122..bc638c805a 100644
--- a/app-arch/bzip2/files/bzip2-1.0.6-Makefile-libbz2_dylib
+++ b/app-arch/bzip2/files/bzip2-1.0.6-Makefile-libbz2_dylib
@@ -37,24 +37,6 @@ OBJS= blocksort.o  \
 
 all: $(OBJS)
 	$(CC) $(LDFLAGS) $(SOLDFLAGS) -o libbz2.1.0.6.dylib $(OBJS)
-	$(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.1.0.6.dylib
-	rm -f libbz2.1.0.dylib
-	ln -s libbz2.1.0.6.dylib libbz2.1.0.dylib
 
 clean: 
 	rm -f $(OBJS) bzip2.o libbz2.1.0.6.dylib libbz2.1.0.dylib bzip2-shared
-
-blocksort.o: blocksort.c
-	$(CC) $(CFLAGS) -c blocksort.c
-huffman.o: huffman.c
-	$(CC) $(CFLAGS) -c huffman.c
-crctable.o: crctable.c
-	$(CC) $(CFLAGS) -c crctable.c
-randtable.o: randtable.c
-	$(CC) $(CFLAGS) -c randtable.c
-compress.o: compress.c
-	$(CC) $(CFLAGS) -c compress.c
-decompress.o: decompress.c
-	$(CC) $(CFLAGS) -c decompress.c
-bzlib.o: bzlib.c
-	$(CC) $(CFLAGS) -c bzlib.c
diff --git a/app-arch/bzip2/files/bzip2-1.0.6-Makefile-libbz2_dylib-out-of-tree b/app-arch/bzip2/files/bzip2-1.0.6-Makefile-libbz2_dylib-out-of-tree
deleted file mode 100644
index 1f0100460a..0000000000
--- a/app-arch/bzip2/files/bzip2-1.0.6-Makefile-libbz2_dylib-out-of-tree
+++ /dev/null
@@ -1,47 +0,0 @@
-
-# This Makefile builds a shared version of the library, 
-# libbz2.1.0.6.dylib, with install_name libbz2.1.dylib on Darwin
-#
-# Makefile created and used by Gentoo
-
-# ------------------------------------------------------------------
-# This file is part of bzip2/libbzip2, a program and library for
-# lossless, block-sorting data compression.
-#
-# bzip2/libbzip2 version 1.0.6 of 6 September 2010
-# Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
-#
-# Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-# README file.
-#
-# This program is released under the terms of the license contained
-# in the file LICENSE.
-# ------------------------------------------------------------------
-
-
-SHELL=/bin/sh
-CC=gcc
-BIGFILES=-D_FILE_OFFSET_BITS=64
-CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES) $(CPPFLAGS)
-PREFIX=/usr
-LIBDIR=lib
-SOLDFLAGS=-dynamiclib -install_name $(PREFIX)/$(LIBDIR)/libbz2.1.dylib -compatibility_version 1.0.0 -current_version 1.0.6
-
-OBJS= blocksort.o  \
-      huffman.o    \
-      crctable.o   \
-      randtable.o  \
-      compress.o   \
-      decompress.o \
-      bzlib.o
-
-all: $(OBJS)
-	$(CC) $(LDFLAGS) $(SOLDFLAGS) -o libbz2.1.0.6.dylib $(OBJS)
-	ln -sf libbz2.1.0.6.dylib libbz2.1.0.dylib
-
-
-clean: 
-	rm -f $(OBJS) bzip2.o libbz2.1.0.6.dylib libbz2.1.0.dylib bzip2-shared
-
-%.o: %.c
-	$(CC) $(CFLAGS) -c $<
diff --git a/app-arch/bzip2/metadata.xml b/app-arch/bzip2/metadata.xml
index 96a2d58636..80408f4743 100644
--- a/app-arch/bzip2/metadata.xml
+++ b/app-arch/bzip2/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
+<upstream>
+  <remote-id type="cpe">cpe:/a:bzip:bzip2</remote-id>
+</upstream>
 </pkgmetadata>