Merge pull request #315 from mischief/dev-libs-nspr

bump(dev-libs/nspr): sync with upstream

sdk_container/src/third_party/portage-stable/dev-libs/nspr/ChangeLog

@@ -1,6 +1,84 @@
 # ChangeLog for dev-libs/nspr
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.275 2014/07/05 12:57:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.298 2015/07/25 15:52:54 maekke Exp $
+
+  25 Jul 2015; Markus Meier <maekke@gentoo.org> nspr-4.10.8.ebuild:
+  arm stable, bug #550288
+
+  23 Jul 2015; Agostino Sarubbo <ago@gentoo.org> nspr-4.10.8.ebuild:
+  Stable for sparc, wrt bug #550288
+
+  20 Jul 2015; Agostino Sarubbo <ago@gentoo.org> nspr-4.10.8.ebuild:
+  Stable for ppc, wrt bug #550288
+
+  20 Jul 2015; Mike Frysinger <vapier@gentoo.org> nspr-4.10.8.ebuild:
+  Mark arm64/ia64/m68k/s390/sh stable #550288.
+
+  14 Jul 2015; Tobias Klausmann <klausman@gentoo.org> nspr-4.10.8.ebuild:
+  Stable on alpha, bug 550288
+
+  09 Jul 2015; Jeroen Roovers <jer@gentoo.org> nspr-4.10.8.ebuild:
+  Stable for PPC64 (bug #550288).
+
+  08 Jul 2015; Jeroen Roovers <jer@gentoo.org> nspr-4.10.8.ebuild:
+  Stable for HPPA (bug #550288).
+
+  26 Mar 2015; Agostino Sarubbo <ago@gentoo.org> nspr-4.10.8.ebuild:
+  Stable for x86, wrt bug #544056
+
+  26 Mar 2015; Agostino Sarubbo <ago@gentoo.org> nspr-4.10.8.ebuild:
+  Stable for amd64, wrt bug #544056
+
+*nspr-4.10.8 (23 Jan 2015)
+
+  23 Jan 2015; Lars Wendler <polynomial-c@gentoo.org> -nspr-4.10.6.ebuild,
+  -nspr-4.10.7.ebuild, +nspr-4.10.8.ebuild:
+  Version bump. Removed old.
+
+  10 Dec 2014; Agostino Sarubbo <ago@gentoo.org> nspr-4.10.7-r1.ebuild:
+  Stable for x86, wrt bug #531408
+
+  10 Dec 2014; Agostino Sarubbo <ago@gentoo.org> nspr-4.10.7-r1.ebuild:
+  Stable for amd64, wrt bug #531408
+
+  04 Nov 2014; Markus Meier <maekke@gentoo.org> nspr-4.10.6-r1.ebuild:
+  arm stable, bug #523652
+
+  18 Oct 2014; Agostino Sarubbo <ago@gentoo.org> nspr-4.10.6-r1.ebuild:
+  Stable for sparc, wrt bug #523652
+
+  18 Oct 2014; Agostino Sarubbo <ago@gentoo.org> nspr-4.10.6-r1.ebuild:
+  Stable for ia64, wrt bug #523652
+
+*nspr-4.10.7-r1 (16 Oct 2014)
+
+  16 Oct 2014; Mike Frysinger <vapier@gentoo.org> +nspr-4.10.7-r1.ebuild:
+  Stop installing the compile-et.pl script as no one uses it, and it requires
+  perl.
+
+  15 Oct 2014; Tobias Klausmann <klausman@gentoo.org> nspr-4.10.6-r1.ebuild:
+  Stable on alpha, bug 523652
+
+*nspr-4.10.7 (03 Sep 2014)
+
+  03 Sep 2014; Lars Wendler <polynomial-c@gentoo.org> -nspr-4.10.ebuild,
+  -nspr-4.10.4.ebuild, +nspr-4.10.7.ebuild, -files/nspr-4.8.3-aix-gcc.patch:
+  Version bump (bug #522044). Removed old.
+
+  10 Aug 2014; Agostino Sarubbo <ago@gentoo.org> nspr-4.10.6-r1.ebuild:
+  Stable for ppc64, wrt bug #517876
+
+  09 Aug 2014; Agostino Sarubbo <ago@gentoo.org> nspr-4.10.6-r1.ebuild:
+  Stable for ppc, wrt bug #517876
+
+  08 Aug 2014; Jeroen Roovers <jer@gentoo.org> nspr-4.10.6-r1.ebuild:
+  Stable for HPPA (bug #517876).
+
+  04 Aug 2014; Agostino Sarubbo <ago@gentoo.org> nspr-4.10.6-r1.ebuild:
+  Stable for x86, wrt bug #517876
+
+  01 Aug 2014; Mikle Kolyada <zlogene@gentoo.org> nspr-4.10.6-r1.ebuild:
+  amd64 stable wrt bug #517876
 
   05 Jul 2014; Agostino Sarubbo <ago@gentoo.org> nspr-4.10.6.ebuild:
   Stable for sparc, wrt bug #512896

sdk_container/src/third_party/portage-stable/dev-libs/nspr/Manifest

@@ -1,40 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX nspr-4.10.6-solaris.patch 1023 SHA256 c9baea43015c0f8fe436b2fef044b542d5ea05ad795accd022a21dd6953298bf SHA512 f6bd055f0945cf21e333489c9ddb230cb568ad24dc11173a6aa5c09883ca83a2e40aa70ff48e846fc5f36e8b5dabda91d32bcc04495b4d6d78ff95223d2803fc WHIRLPOOL 7525fd90818bc98247e5afed56ad62eca9b4860f821cce97b50d7e97ef4a8a1a1ed320652aaa85fe191cb50d29399c96e72300a549590ec8ae192ead990c0657
 AUX nspr-4.6.1-lang.patch 1718 SHA256 326f5f9d020e73a6ed8e949124eb075f21d856d0b099b8d04035ecc937cd35fb SHA512 ee23a7fffb36e8ea10fe029dcd2fa374eb397fb038c628d9140f20c9a6267dd2ee4f76fb02ec79698fae4a1493fe58b7b4f28795afd54cb868ef6fce276cf291 WHIRLPOOL 56ad48b4d75cc624382a60d783e36dfaf2c6fc5195f300710a35fa7a058ea4b0f5904e7d6de361e5f340116531c824cd86175dc80e52efbc04f5ded92e592ce9
 AUX nspr-4.7.0-prtime.patch 964 SHA256 3fd4f3c68257dced021c0bfa00245d0da2d6c64205135b1cc89f96a3375dffc7 SHA512 f8e09dda87e1d4a226fcf48ebc2cdfb20e67c351ffd227603b150636b19df49471ca0c617005e515ccee715df248363ed2e2162563ea6bce978e8607b6aba001 WHIRLPOOL 0090d17ebc287a39d18dbe531dc31522601ce4fc32ddd9a45bd9024987c328aa9fab7c7606673a1220c9b8602ee76c7f58bd7c4d3d639e8edb356d4d0efbd32e
 AUX nspr-4.7.1-solaris.patch 516 SHA256 e47a0abb5b106af38fdfab2ca8661b4a1596d48ff7ca988280728dc6b8a49447 SHA512 864b842e77353b29f7d0b44cdd64d1a0f613fafa2d074f10adc30a1f1c2b69c5270646c25faa64a7b072e3f7d0f68134fe23eeaafd7bdf46d12f889074a8ef78 WHIRLPOOL b2caa24d39bb372a184a60f1a775d6787b6d6aec65db5d32772de5c70953b4a53ab6244b569bd5c1da63f5a6e00a7a50da6bd7e807085e3f3483aa90810ffe64
 AUX nspr-4.7.4-solaris.patch 2011 SHA256 9e72078c941229e7112b4bc184e195821c9243bfb9411e9eeefcdb889866ff9f SHA512 ff8b6403470e9eec401eafb33b109a850ca72e3b6e05e31514e68e9b0ca77aaf7dc0e8062f45406f5abd96671d3c352d9690b8da09454555929422a86d9c4fd4 WHIRLPOOL ea7a6543f474ccd45cfd6448d75ebf17057d9952fdb6d7610ad33603e94bcce0fe1c60b07d80570e49d35c0828748f239aacdce588514aeae472927fecaa8490
-AUX nspr-4.8.3-aix-gcc.patch 3673 SHA256 b801bc5e93c57e54a076f1b1ed85fc6c4d5d6f344e830929e0a2c4046930a17f SHA512 08a1625bb4ca7263e9f98289355e6def516e4b31a4bc856e75686a808575f2603056490b6b5dd6f33e616923c6e035cafec89ff86bcc4b9ceb0b9a5c10334f48 WHIRLPOOL f42200ebdd0ac5b6739c61a2673345a63a33eb1b9d0c471d6700c5b9f7a305a3a518d0d0715041e3aedb80a923e6ff183d035da151c0c51457a2e628317887ea
 AUX nspr-4.8.4-darwin-install_name.patch 1102 SHA256 ca17efc9a60f4372b5da9c29ddf1143726381b9825907f8e3162974224636fab SHA512 1c62eaea00c4eebe6885bfffca41131cfd5cd1c848d7564ccae32a39f012834684b2d3113dcb1a3d4607629dbec9909d6754491dc7caa977203e6010623fef4d WHIRLPOOL 1f5674fe691d75dbf7b9549d58700fef973a8fd6f805a389727843ffb336392587833bbb19af9c22b1388b3d3dcd2c760978676c9a55d894b646e029f8ba7280
 AUX nspr-4.8.9-link-flags.patch 995 SHA256 f986c69ff6250f54eb291339ab5503e73cc5cc68af4c3c3ed5a25812bf47b610 SHA512 3c20019b5a378bc0cec1925c2324fc1b72bd1427e9262065952632c406bc6a8f9303fc55aabad472713f5e8656973db5c503dd9072ea01283a6f671dcd26b049 WHIRLPOOL 695310cfd54140b2c333f0b6556d8c049441b246a006cc885d2149a6d73d8d6223964d47d5af87c949ab2693fd320c4ecf67fd120b09862972a39df0cc00c7ca
 AUX nspr-4.9.5_nspr_config.patch 445 SHA256 7414eaac7630ba3aa9f3c44b439471abb195c96796f78cf5ddfd4e10c68389e8 SHA512 3d3dc60b4bb4a6b469e992239ca7e5702949880bbe3e603691bf7cab199a80e6b9fd89aa3184c26d99185b43785f6f2f7a9a16e061080e13ca02146dd2f172bf WHIRLPOOL d807bc98ca6f47d943f0b6f9a4d33dee387eddf9ae4a9d6a8863697d96c82ae1560d871b76c866b6a85b4eb1d31e9e9f1ce59caa4f66c02bd68a913f822d5a16
-DIST nspr-4.10.2.tar.gz 1103130 SHA256 4d09ee67a6fb57d3c646098b0ac7fd1e31be1c2c2ca57cd2ad28b42e6d3cf400 SHA512 bb45c7a23c1bc38433520bfa71309085c25e65d004a3012c60e66c4f31fb6fdc45406cbd6228a5fdd89dfb02cd9badb5a3961186c32898aa456b04f0b6f53698 WHIRLPOOL 0cf2916c4cb595ee3ccd88da636a6599e2c3b5c51193608bbd2acfa9b3bcad89a7135af1f4cf42644495e17fc03c67a8b22719c0efb4faf8aacf1dcd0d0d9511
+DIST nspr-4.10.8.tar.gz 1131130 SHA256 507ea57c525c0c524dae4857a642b4ef5c9d795518754c7f83422d22fe544a15 SHA512 f14e3bd46cd1dee9d7163adbf3b09a450ea8c6c65499c5b6696eba7e85b6b12d3f90561a1dfe0dc0dc5fe1b14758b4191e546d9f0e29a66f33c69dd6ed6f50d9 WHIRLPOOL 67be897d54e2446d563cfe505047b23880025bd3f1ea5492964f8d286f56776e41a8e63bd9d197d3115efae0d63bd0c7005fb9fc56abdfce0702c27e6a9e872c
-DIST nspr-4.10.4.tar.gz 1107127 SHA256 eb3fcc5e4cbd90f244c19ea05c2dfb4d22df4acc777d34ec6946dbfae560d838 SHA512 9aadd94473e840246b08b4377ac68ec8a1474997b7a08484993186843afdaca65157cf8797d8922f137d881a4df6fda66edc188ba579fdc6bba429571a701222 WHIRLPOOL b52435751f7cb131523d8aef27cc0b1400fe281a018f9f7370cb8d894920d71df49d37450ba057c381590998a81796221858d2f2f06597fd71c93082854717a9
+DIST nspr-4.10.9.tar.gz 1134015 SHA256 4112ff6ad91d32696ca0c6c3d4abef6367b5dc0127fa172fcb3c3ab81bb2d881 SHA512 2a4d6126a6c6d44cd77d55b543939fdac8d43841f32213e44400b57bfee02d1b3beaa10159d13adb140cdad6788aa01adccebf8f8dab9ab391961cf499b7a207 WHIRLPOOL 207a1d90e0b056d022aa659a79fe0ec193ba7d1964646d1970445ff9eb4afd4904c1f80d40b1c22cd00867a92adfa52e48254e1a9e9105f04a36db208c5eaa7e
-DIST nspr-4.10.6.tar.gz 1131328 SHA256 df69ac8b0126f11907792384468adf42712b1d6db9772f4aa20c6d471594644a SHA512 a527a7123b4291903ac69899a82ea7e82a1945550b37f59199140a80d917540fb280172adeabf0fa09420debfd0d39c89c417166cd0a50e1eb6f1929a2a7460d WHIRLPOOL 6f7f422f50343f177896d9243a9ae89878823e92ffd3511131546a32b3cf481c9af34f5fef43c8a7c1d5974fc0959e1fa06ddd67133034563e06128e50a6f1f2
+EBUILD nspr-4.10.8.ebuild 4051 SHA256 739ac74fe11ab35e441bbceba58a82d813481848f0c86cbd458a6e5f7ec01147 SHA512 8b8eaf903facdc02b6bf0f778d1f82f356565c4a3099a74651c1691d8d3061a13e6330f4220f42c7a0f2966d97df8caebd25afea246e45b1d0f0b18e0d4c3bb3 WHIRLPOOL f905b4baf4bafd7274aee9f4e6e262fab6f8a0940508c522ba4ebbc63e2b9adf1902a322399b18b0bfbdebf6fb042b8f12fa350ff494f9434515a26af359b20a
-DIST nspr-4.10.tar.gz 1103862 SHA256 0cfbe561676b92e5af3ddc7ac77452014e3da8885da66baec811e7354138cc16 SHA512 80d511e3bdce9a1efc577acc1671f507bef3d6ca933705f67a7aba567ff7b981e9cde70c2da6fbde82852938b779baa0058c82f937d4ac3e672f6d8e7bdefe8b WHIRLPOOL 404af25a7856df10376a90d7618edd10297c5a1843d6db3e2e754b4066475ffcf4af024804b119e1a8479bbd748a6c142aa77fe27c02e5d3cd751bf449ab1182
+EBUILD nspr-4.10.9.ebuild 4064 SHA256 046f420c268b2f1a5a4b76457aaf8d13562ec211e4c66053e1a62febdeee5615 SHA512 f3b5b5fbc2c44730239cc74bc66002dcfc8ff3ace15a2e1f3a867ff7a6cd5eed860da9b9e959acfee59760a4fd811e7ef6e6aaf76771bf42a2c161e97b3844f7 WHIRLPOOL e1e2f08f17a1ea78b89fbe5e302076b05624529ab91170d310d81e022a43090c447d8ca9e373044e6b2ccbd5b4dba541c8f8bbdce7e66c21d9953bf0873850ca
-EBUILD nspr-4.10.2.ebuild 3157 SHA256 0422f1898967d2953e644c05ea60ba9e34cff049acc40d2114112699ca4c887b SHA512 8a584eba2b1ba41808ceb083166fe621ac2eef262ba81608ce1fd004e779b3de03b9d0c8949ac65d55b4e7e4203550094f792af96842cb5abd29c197458a91e7 WHIRLPOOL e17e2c58675f276f5a64e0cc926e24db5cb758ab86b84ec8d1636766fa83ad1eee5c4a42324d727cdb087a75e471b8d196355f280782a9cc45904885f8685761
+MISC ChangeLog 37574 SHA256 9aa5e372370aebb7663d3378348d8d6af2744c1dad1a69f5f8930c4b6e48481b SHA512 0b72ea173a15aafc646dddddc3b485aab165623c4065f773fa3e84839e6f05dc8df55ec3e7d62d1c5a4239e394658ba5ccad0841cad8f700a82a14765eb0f1b2 WHIRLPOOL f76c6f1248d1560495e96b6e356e65639f88dab6eede0b2077859d54025c5f5da8d7752376b347ab3de6408facbd3e0d2443d4ac000b8074e44b06916a09d5b7
-EBUILD nspr-4.10.4.ebuild 3050 SHA256 ad294a33407122ca1cfe1c693fb30c94b74751beaa808646c4400dbb90922f39 SHA512 e3662861d0d44e36cebf3a68c43ec52082e0dee17b2295b76c5a44265b8b4ed57f6725373518e6fedc318d8ace868107a8823924d92c3852727b4f55c1eb7649 WHIRLPOOL dcc6132e109298600f1daf0a450f56881755dcc0416ed5c7e0b0bf6b5585769d81bbb90227836fc32bf1a886a5bda144d10d12d952f6bdeefcb54cbced3bcb04
-EBUILD nspr-4.10.6-r1.ebuild 3765 SHA256 aaea513f6a558aa34838dba1152ad207eb700d19078c7ad962dafab984273271 SHA512 ec3c282976c6182c7517654148f417a1fe37c8618ed02db6eec021f110b87c34a4eafe5448591f30a4d1f2bfe208d40a9468848fa2ad1abf38f277f5ad7b9ca8 WHIRLPOOL da4b7d7f8cf67b5e297310cb07e79315ffd235086f07ccd87f4c6a9156bba772ab15ecf2684af2c0932031a6149c17e081b2a420ca7f4313e4a0ac56515812fb
-EBUILD nspr-4.10.6.ebuild 3060 SHA256 f85c35674b68fb515a42c04ef750a03fa02daf05f1547c2d28d612d2d79b6a53 SHA512 cefadf5b44dbb6a1777d9ca90cd563fb21f0013202341598a31d751c1111c3735b3c5a8b05aa7573e1ebe7e9a2484dc0b39903163ac8e83c4cbdd2e0dbd9e9e3 WHIRLPOOL d102274922bcddd6a20d5e7daeb5ab3f9348445f470f4a31aea675228428e026bf250658fb452544592745c6bf43a3133d6ad2805e1f82c87beb0fc3abcea51b
-EBUILD nspr-4.10.ebuild 3134 SHA256 0d3aa89630a9b3f23768822b90a7e41ad4516bad5bfe368130f8b0e26ffd2c34 SHA512 39a4330dbc011313c35d5734e1b62e52bab02529f5988e7362593110095119c359c3a8db9d073ce57baa121d2351ba6faf63cb2a7200027cfbf42ef70db7a10e WHIRLPOOL 0d51bc99b0561874e758c6c5040abb92b17dc8f6b2e6a7831af05868f3c21aa57bae111e3053c2a3918aff6dc843da581655999190d493f33b0b1041051d90b1
-MISC ChangeLog 34868 SHA256 af94c30d0aeac881a889f52d8a4c9f7f953904d13190605588a7418a48b49baf SHA512 d8531e2784bd02253a6501a6e714ac2ab105178495309f7648ab0105022971cf17c744bc621353a944770cfec90e6e25697c9b25b318c8b6af31b2226e6070bf WHIRLPOOL 2a8a76ee84c94a1dce4584e0dbd9bf397653b4004ad254cc26b2ac8b67455d1afcf4689af66f550e52167a980fe4c44eb73781906f810f30f1037437a742bc1c
 MISC metadata.xml 160 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b SHA512 ed6f709d55351c1b69f2b43ada124fcc2f8969f8c3867073bb0c68aa502f16247cbcd78734a891e4d1a509d334f6805e5267d2088cd03f3408a636ad9aedc2bb WHIRLPOOL e6bf1791838158287debcc3160dd075dcdf88bc1b33060aefe4687b4451108e55b6f8021fc36f07ab85c4e37a4225444cc2804cf40bd61ba49726bbf12fa4e38
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJTt/ZMAAoJELp701BxlEWfWVwP/R1u8wck4l2z/gM4aFkeiVQp
-Hd2xO00+tNFD40fV54VXfWeSDAYuMjR6JuMPAK+43l/MyzTA5dDsVrIc9zDMuTdC
-KwPssMIOS75NJRmU2/khOvlvmOZZ11HAJmu0pj7UwB6qLLAH0EiBvGLhYP9GxLN8
-YGw475tOyXY9xw3/KqIBTSmTPPVc9vR3nQLmUPhBiK2zpGAkAFOk/me2br197leQ
-GqYOJSMbt75081+usMR6UMGexfGtYwqLgEtSxXwszBQyMev43LIdN3Tg0KnFiSjf
-zfyERmbGx4FvmT96daNBIbBZ6fubOco7Zvc334QBR1lF2wXi8SHonxavQOO0Gg95
-pDqGNGbulycyFQHYby7iJPxyz9I+/i7tS5gI7aK0CIP6RV9t6NGAau+4TOYiiiL7
-LtzlyKvQU0MgHCAhiDt6yVVUAFxxpPThI3KRryWQiasMRs9PCvZCK75toM49ltF4
-KQZbZhq8JInMdWrDtm3MGHcLBviLWwIHIzFdUnsOxB7xKsuXqM4rfTBwjXW/8p+T
-khNEk9Qoe/Skcr4cnoIfYTa71l3ROOpQzIk2qZHSX65mZ56mvP35a6OEIIjH/X2K
-wwmrTSziVlT89QpDF7NZn+qznommg9C1bW6xU9SKQ79YHEwzgWdjFWodnJnojSzp
-Sp9c8Re/+ninFaV2YaQB
-=0Odn
------END PGP SIGNATURE-----

sdk_container/src/third_party/portage-stable/dev-libs/nspr/files/nspr-4.8.3-aix-gcc.patch

@@ -1,145 +0,0 @@
-NSPR does not know that gcc does work on AIX:
-https://bugzilla.mozilla.org/show_bug.cgi?id=547991
-
---- ./mozilla/nsprpub/configure.in.orig	2010-02-23 14:36:55 +0100
-+++ ./mozilla/nsprpub/configure.in	2010-02-23 14:37:08 +0100
-@@ -871,8 +871,13 @@
-         AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
-         USE_IPV6=1
-         AIX_LINK_OPTS='-brtl -bnso -berok'
-+        if test -n "$GNU_CC"; then
-+            LD='$(CC)'
-+            DSO_LDOPTS='-shared -Wl,-G,-bernotok,-bexpall,-blibpath:/usr/lib:/lib'
-+        fi
-         ;;
-     esac
-+    test -z "$GNU_CC" &&
-     CFLAGS="$CFLAGS -qro -qroconst"
-     AIX_WRAP='$(DIST)/lib/aixwrap.o'
-     AIX_TMP='./_aix_tmp.o'
---- ./mozilla/nsprpub/configure.orig	2010-02-23 14:36:58 +0100
-+++ ./mozilla/nsprpub/configure	2010-02-23 14:37:08 +0100
-@@ -3099,8 +3099,13 @@
- 
-         USE_IPV6=1
-         AIX_LINK_OPTS='-brtl -bnso -berok'
-+        if test -n "$GNU_CC"; then
-+            LD='$(CC)'
-+            DSO_LDOPTS='-shared -Wl,-G,-bernotok,-bexpall,-blibpath:/usr/lib:/lib'
-+        fi
-         ;;
-     esac
-+    test -z "$GNU_CC" &&
-     CFLAGS="$CFLAGS -qro -qroconst"
-     AIX_WRAP='$(DIST)/lib/aixwrap.o'
-     AIX_TMP='./_aix_tmp.o'
---- ./mozilla/nsprpub/lib/ds/Makefile.in.orig	2010-02-23 14:40:10 +0100
-+++ ./mozilla/nsprpub/lib/ds/Makefile.in	2010-02-23 14:40:58 +0100
-@@ -68,11 +68,19 @@
- endif # WINNT
- 
- ifeq ($(OS_ARCH), AIX)
-+ifndef NS_USE_GCC
- ifeq ($(CLASSIC_NSPR),1)
- OS_LIBS = -lc
- else
- OS_LIBS = -lc_r
- endif
-+else
-+ifeq ($(CLASSIC_NSPR),1)
-+OS_LIBS =
-+else
-+OS_LIBS = -pthread
-+endif
-+endif
- endif
- 
- ifeq ($(OS_ARCH),IRIX)
---- ./mozilla/nsprpub/lib/libc/src/Makefile.in.orig	2010-02-23 14:45:41 +0100
-+++ ./mozilla/nsprpub/lib/libc/src/Makefile.in	2010-02-23 14:47:58 +0100
-@@ -77,11 +77,19 @@
- endif # WINNT
- 
- ifeq ($(OS_ARCH), AIX)
-+ifndef NS_USE_GCC
- ifeq ($(CLASSIC_NSPR),1)
- OS_LIBS = -lc
- else
- OS_LIBS = -lc_r
- endif
-+else
-+ifeq ($(CLASSIC_NSPR),1)
-+OS_LIBS =
-+else
-+OS_LIBS = -pthread
-+endif
-+endif
- endif
- 
- ifeq ($(OS_ARCH),IRIX)
---- ./mozilla/nsprpub/pr/src/Makefile.in.orig	2010-02-23 14:37:04 +0100
-+++ ./mozilla/nsprpub/pr/src/Makefile.in	2010-02-23 14:52:16 +0100
-@@ -110,19 +110,29 @@
- endif
- 
- ifeq ($(OS_ARCH),AIX)
-+ifndef NS_USE_GCC
- DSO_LDOPTS	+= -binitfini::_PR_Fini
-+endif
- OS_LIBS		= -lodm -lcfg
- ifeq ($(CLASSIC_NSPR),1)
- ifeq ($(OS_RELEASE),4.1)
- OS_LIBS		+= -lsvld -lc
- else
-+ifndef NS_USE_GCC
- OS_LIBS		+= -ldl -lc
-+else
-+OS_LIBS		+= -ldl
-+endif
- endif
- else
- ifeq ($(OS_RELEASE),4.1)
- OS_LIBS		+= -lpthreads -lsvld -lC_r -lC -lc_r -lm /usr/lib/libc.a
- else
-+ifndef NS_USE_GCC
- OS_LIBS		+= -lpthreads -ldl -lC_r -lC -lc_r -lm /usr/lib/libc.a
-+else
-+OS_LIBS		+= -pthread -ldl -lm
-+endif
- endif
- endif
- endif
---- mozilla/nsprpub/pr/tests/Makefile.in.orig	2010-02-23 15:14:03 +0100
-+++ mozilla/nsprpub/pr/tests/Makefile.in	2010-02-23 15:17:58 +0100
-@@ -341,9 +341,17 @@
- 
- # AIX
- ifeq ($(OS_ARCH),AIX)
-+  ifndef NS_USE_GCC
-     LDOPTS += -blibpath:$(ABSOLUTE_LIB_DIR):/usr/lib:/lib
-+  else
-+    LDOPTS += -Wl,-blibpath:$(ABSOLUTE_LIB_DIR):/usr/lib:/lib
-+  endif
-     ifneq ($(OS_ARCH)$(OS_RELEASE),AIX4.1)
-+      ifndef NS_USE_GCC
-         LDOPTS += -brtl
-+      else
-+        LDOPTS += -Wl,-brtl
-+      endif
-         EXTRA_LIBS = -ldl
-     endif
- endif
---- mozilla/nsprpub/lib/tests/Makefile.in.orig	2010-02-23 15:35:37 +0100
-+++ mozilla/nsprpub/lib/tests/Makefile.in	2010-02-23 15:35:37 +0100
-@@ -127,7 +127,11 @@
- 
- # AIX
- ifeq ($(OS_ARCH),AIX)
-+ifndef NS_USE_GCC
- LDOPTS += -blibpath:$(PWD)/$(dist_libdir):/usr/lib:/lib
-+else
-+LDOPTS += -Wl,-blibpath:$(PWD)/$(dist_libdir):/usr/lib:/lib
-+endif
- LIBPR = -lnspr$(MOD_MAJOR_VERSION)_shr
- LIBPLC = -lplc$(MOD_MAJOR_VERSION)_shr
- endif

sdk_container/src/third_party/portage-stable/dev-libs/nspr/nspr-4.10.2.ebuild

@@ -1,95 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.2.ebuild,v 1.11 2014/03/20 13:49:05 polynomial-c Exp $
-
-EAPI=3
-WANT_AUTOCONF="2.1"
-
-inherit autotools eutils multilib toolchain-funcs versionator
-
-MIN_PV="$(get_version_component_range 2)"
-
-DESCRIPTION="Netscape Portable Runtime"
-HOMEPAGE="http://www.mozilla.org/projects/nspr/"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug"
-
-src_prepare() {
-	mkdir build inst
-	cd "${S}"/nspr/
-	epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
-	epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
-	epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch
-	epatch "${FILESDIR}"/${PN}-4.7.4-solaris.patch
-	# epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch
-	epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
-	epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
-	# We do not need to pass -L$libdir via nspr-config --libs
-	epatch "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
-
-	# We must run eautoconf to regenerate configure
-	eautoconf
-
-	# make sure it won't find Perl out of Prefix
-	sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
-		"${S}"/nspr/config/rules.mk || die
-}
-
-src_configure() {
-	cd "${S}"/build
-
-	# We use the standard BUILD_xxx but nspr uses HOST_xxx
-	tc-export_build_env BUILD_CC
-	export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
-	tc-export AR CC CXX RANLIB
-	[[ ${CBUILD} != ${CHOST} ]] \
-		&& export CROSS_COMPILE=1 \
-		|| unset CROSS_COMPILE
-
-	local myconf
-	echo > "${T}"/test.c
-	${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
-	case $(file "${T}"/test.o) in
-		*32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) myconf+=" --enable-64bit";;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-
-	# Ancient autoconf needs help finding the right tools.
-	LC_ALL="C" ECONF_SOURCE="../nspr" \
-	ac_cv_path_AR="${AR}" \
-	econf \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		$(use_enable debug) \
-		$(use_enable !debug optimize) \
-		${myconf}
-}
-
-src_compile() {
-	cd "${S}"/build
-	emake || die "failed to build"
-}
-
-src_install() {
-	# Their build system is royally confusing, as usual
-	MINOR_VERSION=${MIN_PV} # Used for .so version
-	cd "${S}"/build
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	cd "${ED}"/usr/$(get_libdir)
-	einfo "removing static libraries as upstream has requested!"
-	rm -f *.a || die "failed to remove static libraries."
-
-	# install nspr-config
-	dobin "${S}"/build/config/nspr-config || die "failed to install nspr-config"
-
-	# Remove stupid files in /usr/bin
-	rm -f "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files"
-}

sdk_container/src/third_party/portage-stable/dev-libs/nspr/nspr-4.10.4.ebuild

@@ -1,95 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.4.ebuild,v 1.8 2014/03/24 14:33:51 ago Exp $
-
-EAPI=5
-WANT_AUTOCONF="2.1"
-
-inherit autotools eutils multilib toolchain-funcs versionator
-
-MIN_PV="$(get_version_component_range 2)"
-
-DESCRIPTION="Netscape Portable Runtime"
-HOMEPAGE="http://www.mozilla.org/projects/nspr/"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug"
-
-src_prepare() {
-	mkdir build inst
-	cd "${S}"/nspr/
-	epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
-	epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
-	epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch
-	epatch "${FILESDIR}"/${PN}-4.7.4-solaris.patch
-	# epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch
-	epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
-	epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
-	# We do not need to pass -L$libdir via nspr-config --libs
-	epatch "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
-
-	# We must run eautoconf to regenerate configure
-	eautoconf
-
-	# make sure it won't find Perl out of Prefix
-	sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
-		"${S}"/nspr/config/rules.mk || die
-}
-
-src_configure() {
-	cd "${S}"/build
-
-	# We use the standard BUILD_xxx but nspr uses HOST_xxx
-	tc-export_build_env BUILD_CC
-	export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
-	tc-export AR CC CXX RANLIB
-	[[ ${CBUILD} != ${CHOST} ]] \
-		&& export CROSS_COMPILE=1 \
-		|| unset CROSS_COMPILE
-
-	local myconf
-	echo > "${T}"/test.c
-	${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
-	case $(file "${T}"/test.o) in
-		*32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) myconf+=" --enable-64bit";;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-
-	# Ancient autoconf needs help finding the right tools.
-	LC_ALL="C" ECONF_SOURCE="../nspr" \
-	ac_cv_path_AR="${AR}" \
-	econf \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		$(use_enable debug) \
-		$(use_enable !debug optimize) \
-		${myconf}
-}
-
-src_compile() {
-	cd "${S}"/build
-	emake
-}
-
-src_install() {
-	# Their build system is royally confusing, as usual
-	MINOR_VERSION=${MIN_PV} # Used for .so version
-	cd "${S}"/build
-	emake DESTDIR="${D}" install
-
-	cd "${ED}"/usr/$(get_libdir)
-	einfo "removing static libraries as upstream has requested!"
-	rm *.a || die "failed to remove static libraries."
-
-	# install nspr-config
-	dobin "${S}"/build/config/nspr-config
-
-	# Remove stupid files in /usr/bin
-	rm "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files"
-}

sdk_container/src/third_party/portage-stable/dev-libs/nspr/nspr-4.10.6.ebuild

@@ -1,95 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.6.ebuild,v 1.10 2014/07/05 12:57:47 ago Exp $
-
-EAPI=5
-WANT_AUTOCONF="2.5"
-
-inherit autotools eutils multilib toolchain-funcs versionator
-
-MIN_PV="$(get_version_component_range 2)"
-
-DESCRIPTION="Netscape Portable Runtime"
-HOMEPAGE="http://www.mozilla.org/projects/nspr/"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug"
-
-src_prepare() {
-	mkdir build inst
-
-	cd "${S}"/nspr
-	epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
-	epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch
-	epatch "${FILESDIR}"/${PN}-4.10.6-solaris.patch
-	# epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch
-	epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
-	epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
-	# We do not need to pass -L$libdir via nspr-config --libs
-	epatch "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
-
-	# We must run eautoconf to regenerate configure
-	eautoconf
-
-	# make sure it won't find Perl out of Prefix
-	sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
-		"${S}"/nspr/config/rules.mk || die
-}
-
-src_configure() {
-	cd "${S}"/build
-
-	# We use the standard BUILD_xxx but nspr uses HOST_xxx
-	tc-export_build_env BUILD_CC
-	export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
-	tc-export AR CC CXX RANLIB
-	[[ ${CBUILD} != ${CHOST} ]] \
-		&& export CROSS_COMPILE=1 \
-		|| unset CROSS_COMPILE
-
-	local myconf
-	einfo "Running a short build test to determine 64bit'ness"
-	echo > "${T}"/test.c
-	${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
-	case $(file "${T}"/test.o) in
-		*32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) myconf+=" --enable-64bit";;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-
-	# Ancient autoconf needs help finding the right tools.
-	LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
-	ac_cv_path_AR="${AR}" \
-	econf \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		$(use_enable debug) \
-		$(use_enable !debug optimize) \
-		${myconf}
-}
-
-src_compile() {
-	cd "${S}"/build || die
-	emake
-}
-
-src_install() {
-	cd "${S}"/build
-	# Their build system is royally confusing, as usual
-	MINOR_VERSION=${MIN_PV} # Used for .so version
-	emake DESTDIR="${D}" install
-
-	einfo "removing static libraries as upstream has requested!"
-	rm -f "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries."
-
-	# install nspr-config
-	dobin config/nspr-config
-
-	# Remove stupid files in /usr/bin
-	rm "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files"
-}

sdk_container/src/third_party/portage-stable/dev-libs/nspr/nspr-4.10.8.ebuild

@@ -0,0 +1,120 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WANT_AUTOCONF="2.5"
+
+inherit autotools eutils multilib toolchain-funcs versionator multilib-minimal
+
+MIN_PV="$(get_version_component_range 2)"
+
+DESCRIPTION="Netscape Portable Runtime"
+HOMEPAGE="http://www.mozilla.org/projects/nspr/"
+SRC_URI="http://archive.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug"
+
+RDEPEND="
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r12
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nspr-config
+)
+
+src_prepare() {
+	cd "${S}"/nspr || die
+	epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
+	epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch
+	epatch "${FILESDIR}"/${PN}-4.10.6-solaris.patch
+	epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
+	epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
+	# We do not need to pass -L$libdir via nspr-config --libs
+	epatch "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
+
+	# rename configure.in to configure.ac for new autotools compatibility
+	if [[ -e "${S}"/nspr/configure.in ]] ; then
+		einfo "Renaming configure.in to configure.ac"
+		mv "${S}"/nspr/configure.{in,ac} || die
+	fi
+	# We must run eautoconf to regenerate configure
+	eautoconf
+
+	# make sure it won't find Perl out of Prefix
+	sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
+		"${S}"/nspr/config/rules.mk || die
+}
+
+multilib_src_configure() {
+	# We use the standard BUILD_xxx but nspr uses HOST_xxx
+	tc-export_build_env BUILD_CC
+	export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
+	tc-export AR CC CXX RANLIB
+	[[ ${CBUILD} != ${CHOST} ]] \
+		&& export CROSS_COMPILE=1 \
+		|| unset CROSS_COMPILE
+
+	local myconf=()
+
+	# The configure has some fancy --enable-{{n,x}32,64bit} switches
+	# that trigger some code conditional to platform & arch. This really
+	# matters for the few common arches (x86, ppc) but we pass a little
+	# more of them to be future-proof.
+
+	# use ABI first, this will work for most cases
+	case "${ABI}" in
+		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
+		n32) myconf+=( --enable-n32 );;
+		x32) myconf+=( --enable-x32 );;
+		s390x|*64) myconf+=( --enable-64bit );;
+		default) # no abi actually set, fall back to old check
+			einfo "Running a short build test to determine 64bit'ness"
+			echo > "${T}"/test.c || die
+			${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
+			case $(file "${T}"/test.o) in
+				*32-bit*x86-64*) myconf+=( --enable-x32 );;
+				*64-bit*|*ppc64*|*x86_64*) myconf+=( --enable-64bit );;
+				*32-bit*|*ppc*|*i386*) ;;
+				*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
+			esac ;;
+		*) ;;
+	esac
+
+	# Ancient autoconf needs help finding the right tools.
+	LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
+	ac_cv_path_AR="${AR}" \
+	econf \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_enable debug) \
+		$(use_enable !debug optimize) \
+		"${myconf[@]}"
+}
+
+multilib_src_install() {
+	# Their build system is royally confusing, as usual
+	MINOR_VERSION=${MIN_PV} # Used for .so version
+	emake DESTDIR="${D}" install
+
+	einfo "removing static libraries as upstream has requested!"
+	rm -f "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries."
+
+	# install nspr-config
+	dobin config/nspr-config
+
+	# Remove stupid files in /usr/bin
+	rm "${ED}"/usr/bin/prerr.properties || die
+
+	# This is used only to generate prerr.c and prerr.h at build time.
+	# No other projects use it, and we don't want to depend on perl.
+	# Talked to upstream and they agreed w/punting.
+	rm "${ED}"/usr/bin/compile-et.pl || die
+}

sdk_container/src/third_party/portage-stable/dev-libs/nspr/nspr-4.10.9.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.6-r1.ebuild,v 1.4 2014/06/19 03:15:41 tetromino Exp $
+# $Id$
 
 EAPI=5
 WANT_AUTOCONF="2.5"
@@ -11,7 +11,7 @@ MIN_PV="$(get_version_component_range 2)"
 
 DESCRIPTION="Netscape Portable Runtime"
 HOMEPAGE="http://www.mozilla.org/projects/nspr/"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
+SRC_URI="http://archive.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
@@ -38,6 +38,11 @@ src_prepare() {
 	# We do not need to pass -L$libdir via nspr-config --libs
 	epatch "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
 
+	# rename configure.in to configure.ac for new autotools compatibility
+	if [[ -e "${S}"/nspr/configure.in ]] ; then
+		einfo "Renaming configure.in to configure.ac"
+		mv "${S}"/nspr/configure.{in,ac} || die
+	fi
 	# We must run eautoconf to regenerate configure
 	eautoconf
 
@@ -106,5 +111,10 @@ multilib_src_install() {
 	dobin config/nspr-config
 
 	# Remove stupid files in /usr/bin
-	rm "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files"
+	rm "${ED}"/usr/bin/prerr.properties || die
+
+	# This is used only to generate prerr.c and prerr.h at build time.
+	# No other projects use it, and we don't want to depend on perl.
+	# Talked to upstream and they agreed w/punting.
+	rm "${ED}"/usr/bin/compile-et.pl || die
 }

sdk_container/src/third_party/portage-stable/dev-libs/nspr/nspr-4.10.ebuild

@@ -1,95 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.ebuild,v 1.10 2013/10/09 17:10:14 ago Exp $
-
-EAPI=3
-WANT_AUTOCONF="2.1"
-
-inherit autotools eutils multilib toolchain-funcs versionator
-
-MIN_PV="$(get_version_component_range 2)"
-
-DESCRIPTION="Netscape Portable Runtime"
-HOMEPAGE="http://www.mozilla.org/projects/nspr/"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug"
-
-src_prepare() {
-	mkdir build inst
-	cd "${S}"/nspr/
-	epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
-	epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
-	epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch
-	epatch "${FILESDIR}"/${PN}-4.7.4-solaris.patch
-	# epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch
-	epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
-	epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
-	# We do not need to pass -L$libdir via nspr-config --libs
-	epatch "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
-
-	# We must run eautoconf to regenerate configure
-	eautoconf
-
-	# make sure it won't find Perl out of Prefix
-	sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
-		"${S}"/nspr/config/rules.mk || die
-}
-
-src_configure() {
-	cd "${S}"/build
-
-	# We use the standard BUILD_xxx but nspr uses HOST_xxx
-	tc-export_build_env BUILD_CC
-	export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
-	tc-export AR CC CXX RANLIB
-	[[ ${CBUILD} != ${CHOST} ]] \
-		&& export CROSS_COMPILE=1 \
-		|| unset CROSS_COMPILE
-
-	local myconf
-	echo > "${T}"/test.c
-	${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
-	case $(file "${T}"/test.o) in
-		*32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) myconf+=" --enable-64bit";;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-
-	# Ancient autoconf needs help finding the right tools.
-	LC_ALL="C" ECONF_SOURCE="../nspr" \
-	ac_cv_path_AR="${AR}" \
-	econf \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		$(use_enable debug) \
-		$(use_enable !debug optimize) \
-		${myconf}
-}
-
-src_compile() {
-	cd "${S}"/build
-	emake || die "failed to build"
-}
-
-src_install() {
-	# Their build system is royally confusing, as usual
-	MINOR_VERSION=${MIN_PV} # Used for .so version
-	cd "${S}"/build
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	cd "${ED}"/usr/$(get_libdir)
-	einfo "removing static libraries as upstream has requested!"
-	rm -f *.a || die "failed to remove static libraries."
-
-	# install nspr-config
-	dobin "${S}"/build/config/nspr-config || die "failed to install nspr-config"
-
-	# Remove stupid files in /usr/bin
-	rm -f "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files"
-}

sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/nspr-4.10

@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) =sys-devel/autoconf-2.1* >=sys-devel/libtool-2.4
-DESCRIPTION=Netscape Portable Runtime
-EAPI=3
-HOMEPAGE=http://www.mozilla.org/projects/nspr/
-IUSE=debug
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
-SLOT=0
-SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.10/src/nspr-4.10.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=22f98215c8b7681b558bcd4230827506

sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/nspr-4.10.2

@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) =sys-devel/autoconf-2.1* >=sys-devel/libtool-2.4
-DESCRIPTION=Netscape Portable Runtime
-EAPI=3
-HOMEPAGE=http://www.mozilla.org/projects/nspr/
-IUSE=debug
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
-SLOT=0
-SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.10.2/src/nspr-4.10.2.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c8654621ac04022b53ddd27727207c04

sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/nspr-4.10.4

@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) =sys-devel/autoconf-2.1* >=sys-devel/libtool-2.4
-DESCRIPTION=Netscape Portable Runtime
-EAPI=5
-HOMEPAGE=http://www.mozilla.org/projects/nspr/
-IUSE=debug
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
-SLOT=0
-SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.10.4/src/nspr-4.10.4.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=165c8ee2c947b7d7205a4b7b5971c482

sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/nspr-4.10.6

@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Netscape Portable Runtime
-EAPI=5
-HOMEPAGE=http://www.mozilla.org/projects/nspr/
-IUSE=debug
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
-SLOT=0
-SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.10.6/src/nspr-4.10.6.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6c0e0c4464e3107a0c687be111659aa1

sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/nspr-4.10.8

@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Netscape Portable Runtime
+EAPI=5
+HOMEPAGE=http://www.mozilla.org/projects/nspr/
+IUSE=debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
+RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+SLOT=0
+SRC_URI=http://archive.mozilla.org/pub/mozilla.org/nspr/releases/v4.10.8/src/nspr-4.10.8.tar.gz
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=64f4eee986a58bbd79c9c08f4f38eee3

sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/nspr-4.10.9

@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
-SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.10.6/src/nspr-4.10.6.tar.gz
+SRC_URI=http://archive.mozilla.org/pub/mozilla.org/nspr/releases/v4.10.9/src/nspr-4.10.9.tar.gz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1d54bd0d5c3eeafe705351df9e89347d
+_md5_=078dcdb41f867b5a11540f61a51895a7