Version bump. Removed old

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

6 files changed, 35 insertions, 193 deletions

diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog
index 64e39036e825..7ef55237d02e 100644
--- a/dev-libs/nspr/ChangeLog
+++ b/dev-libs/nspr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/nspr
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.243 2013/10/09 17:10:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.244 2013/11/18 09:11:48 polynomial-c Exp $
+
+*nspr-4.10.2 (18 Nov 2013)
+
+  18 Nov 2013; Lars Wendler <polynomial-c@gentoo.org> -nspr-4.9.5.ebuild,
+  +nspr-4.10.2.ebuild, -files/nspr-4.6.1-config-1.patch,
+  -files/nspr-4.8-config.patch, -files/nspr-4.9-pkgconfig-gentoo.patch:
+  Version bump. Removed old.
 
   09 Oct 2013; Agostino Sarubbo <ago@gentoo.org> nspr-4.10.ebuild:
   Stable for sparc, wrt bug #486114
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 934564fc5867..7cc7176592c2 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1,39 +1,36 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX nspr-4.6.1-config-1.patch 565 SHA256 9ed8fd15102ef3de6d837d40ec5d73aef0ea45bf9059b4cf5ff1f47b6a519ed6 SHA512 3556cff96d3e773d6e1762d94b9c325207578e4e910d33464c26b2084f42f2162c5fbb12d8f2206dbe4c5a7ecb1c8c63a699f08bd1b31c5b71eb73d257c46be6 WHIRLPOOL 7c249f1465f65da765b37b256d9cd8c8cef7d5fc7cb8a57f40f29a98cb2247cc3e1ec002f106d50bc531cfc6a8c9de5a85d6f522ad5b8f6e956fc0790d5993b4
 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-config.patch 1429 SHA256 7cb63ea677ad9c92dde4513b16258f092b463738cb145edd95dd671bcfaa2150 SHA512 0180b026a89080c557ff39496f015195127343319d054904274fa118c4394b567b1e79bf72ddffe4d6ce821b831a72926fc40a55897976a6cdaee0cea52d070b WHIRLPOOL 1f31f98e552a771a77acd731b4e071386aad4a94c71d638f6074224f0f79eb8f4f49763ded4282d910f2a7fea8c05000c1428b7d895c8204a2982775022b42d3
 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-pkgconfig-gentoo.patch 3710 SHA256 1483506296818ffffbb292d28d336d37147154e5e3db35e7e07d37bb728e2253 SHA512 d92629c8108fd406f6e071491be30bd82955beda362ce6765c2bcc092db8c63d86b027cc978b0551aedc475a187e044db9c82c01b6043c753e9e8bfaf8aefbe4 WHIRLPOOL b76e9220fc8d4112921866a289862fd49e922525c2196ae24a66f716bd28f79193ff4c26f5c4c3d8743ada4ccaba7309d32d768b3878d53ca026d52b84db028c
 AUX nspr-4.9.5_nspr_config.patch 445 SHA256 7414eaac7630ba3aa9f3c44b439471abb195c96796f78cf5ddfd4e10c68389e8 SHA512 3d3dc60b4bb4a6b469e992239ca7e5702949880bbe3e603691bf7cab199a80e6b9fd89aa3184c26d99185b43785f6f2f7a9a16e061080e13ca02146dd2f172bf WHIRLPOOL d807bc98ca6f47d943f0b6f9a4d33dee387eddf9ae4a9d6a8863697d96c82ae1560d871b76c866b6a85b4eb1d31e9e9f1ce59caa4f66c02bd68a913f822d5a16
 DIST nspr-4.10.1.tar.gz 1102858 SHA256 0c2f8dc265f1e9b2600fd519430a1f960799888857bbb1538343a1b16ba41b20 SHA512 80b8895a104317dd18d19e813ecf91f081d85b36320b3e3898802f653b5e29320667729208178b3ca556a4066906774d446193cba76caafef002b1d7b240e249 WHIRLPOOL 58fedf84b0f0688cf5d1f6da306c3bcfb5c612cf0017142e3f7eb481e0208c6e7d37528ff7be7b8493a4ff7276e7b6366181187b081ccaa8236535558f3685c6
+DIST nspr-4.10.2.tar.gz 1103130 SHA256 4d09ee67a6fb57d3c646098b0ac7fd1e31be1c2c2ca57cd2ad28b42e6d3cf400 SHA512 bb45c7a23c1bc38433520bfa71309085c25e65d004a3012c60e66c4f31fb6fdc45406cbd6228a5fdd89dfb02cd9badb5a3961186c32898aa456b04f0b6f53698 WHIRLPOOL 0cf2916c4cb595ee3ccd88da636a6599e2c3b5c51193608bbd2acfa9b3bcad89a7135af1f4cf42644495e17fc03c67a8b22719c0efb4faf8aacf1dcd0d0d9511
 DIST nspr-4.10.tar.gz 1103862 SHA256 0cfbe561676b92e5af3ddc7ac77452014e3da8885da66baec811e7354138cc16 SHA512 80d511e3bdce9a1efc577acc1671f507bef3d6ca933705f67a7aba567ff7b981e9cde70c2da6fbde82852938b779baa0058c82f937d4ac3e672f6d8e7bdefe8b WHIRLPOOL 404af25a7856df10376a90d7618edd10297c5a1843d6db3e2e754b4066475ffcf4af024804b119e1a8479bbd748a6c142aa77fe27c02e5d3cd751bf449ab1182
-DIST nspr-4.9.5.tar.gz 1156396 SHA256 616ab65c849155c9ed0e5f502530a241cc9108e278275aa448b417ae632c7604 SHA512 cbe60e4c5265863fa3250d7c16a2727d3a4a8762d17bc63d044ec88d11758fe9f54f54c08e198db6278ee68c55edd88f7c4bc5db9bdc46bdea4e4cf9eb277f27 WHIRLPOOL d2792148805a99d1f2de919b57e48cfd03290b1f8faaec55d4374004574a578ed3fef110956fbb767a2f7f6d00cb9d594aa3a534e29df5790f3284c4fcea8b7b
 EBUILD nspr-4.10.1.ebuild 3148 SHA256 416273fbbf161eba202f0fe31b75243cc27563e457a047434ce0307a75bc556f SHA512 bc3189ce660e961a48a7eb24e709d8fac6caea7c79432012524531980b9b8c3db4916c3e734a3c1db0753f233293e3b8f41f1098a0546783ed233058e80bce5c WHIRLPOOL b4c12f1fe6bb6629caa8ab2aa288dca850cc66cd22d5ae74c9688b5d238975e878887ef0f66387aa0286389aaa3fa2817642b4218a3ef43631710b5baaeb7f20
+EBUILD nspr-4.10.2.ebuild 3153 SHA256 16b75e9010e17084cdd0b08361976945340ced64e96ff28f7ec6fae5874f188a SHA512 5d3d22b1e1949bc65a3e56d3c7cee4b3b76239592af372d903d8b5678c0271a7344e12bf73b55accce269aa3f715571681c01c01d06d5be19706fe7b1511e8bc WHIRLPOOL b0c4713aa139a4caff88c419e58a6a0cc025b066930d0a2c2cc21d7a54e28d741622ca287501b4398d08d88128180ff90b0c13b6bcc06eab6bc996f96c99b72e
 EBUILD nspr-4.10.ebuild 3134 SHA256 0d3aa89630a9b3f23768822b90a7e41ad4516bad5bfe368130f8b0e26ffd2c34 SHA512 39a4330dbc011313c35d5734e1b62e52bab02529f5988e7362593110095119c359c3a8db9d073ce57baa121d2351ba6faf63cb2a7200027cfbf42ef70db7a10e WHIRLPOOL 0d51bc99b0561874e758c6c5040abb92b17dc8f6b2e6a7831af05868f3c21aa57bae111e3053c2a3918aff6dc843da581655999190d493f33b0b1041051d90b1
-EBUILD nspr-4.9.5.ebuild 3638 SHA256 78d6799695d7d1bd7623619a3b694c08ef54eb70ef13b86e4a79c7c2e5561a67 SHA512 ed45b7a736157b6eb8debebed3d677da43b6b6a589477a17c66df2993cb05c5a6215fa1d3ba405d88cd281840af0802ee07b3d1b54985618f87f39b650ef560d WHIRLPOOL e42f69c96b81dc22c5990c0d7975357e694fdb6a818c671f6723939f81b31054d5afcad3d3a7ca85b141151f84a622de2ee16d54d7ba4dfd348973c8d518e23a
-MISC ChangeLog 30952 SHA256 e2ec30177643fd9c9187ecaa4483e20e6772060e8f5d49814d7c3fd670eb074e SHA512 a11baba500d62cce7d2560431a9097849ffbe9384e3d40a1d4798d1251f1ec903a15af2af46714f1845b3fbba74114a1ff8898eee4cd9fb78cf591fd2678a15c WHIRLPOOL cab84e48e8afc02ca002a68a79ca961b4a3694aade084fd00f71b8bbc803a8adbf6609fd0bfea1f6b8c40d4fd5ae19c8225e5a6b6b82c1cb27943103437da098
+MISC ChangeLog 31222 SHA256 9aaf7c358a52039546548d4de791ac531b8982a9ecb23fe27c93e0b957a9d515 SHA512 d47abe63b730f1a6f9ca5bc77f9ff726cc1b9f52f9bcfc6d5bff111e5bdff2eb75ae3b238eb156df03a8f903c7df1e416ca077a72f15110956e12602eb175c2d WHIRLPOOL c22b4f673a8d98c56f89a21f279595a75cc19529f24d9200c9149195faae88433207046266b120e0b7ae06035d7685d174ee01c89a4d4bdb78a76a467e98c9e1
 MISC metadata.xml 160 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b SHA512 ed6f709d55351c1b69f2b43ada124fcc2f8969f8c3867073bb0c68aa502f16247cbcd78734a891e4d1a509d334f6805e5267d2088cd03f3408a636ad9aedc2bb WHIRLPOOL e6bf1791838158287debcc3160dd075dcdf88bc1b33060aefe4687b4451108e55b6f8021fc36f07ab85c4e37a4225444cc2804cf40bd61ba49726bbf12fa4e38
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSVY0fAAoJELp701BxlEWfR7YP/0MJa6ZCGzLFCTsrmLqhWqJ1
-yMfbeJm+FabkXV/DwVTJkrUZX4Rw4bpeVLHnmW7SwvfBnxm/8Wtfmsvt6E6HXhsJ
-P4G1aLvodCSlKYXjJ+SXA3CLiSCyAEpYvgFFKaoPSXQcCw28wPZK3HpoFB7zLFbm
-7oEg6JsVzz7UqNnhWhPomlUZaAx0RElgOnU/G6VNei30erewyf60/TU5gF6Jx9y/
-kXoz8AgKNo6ebCRCLgWreH1sWcAFacm4giOdQHzrKGUyOucrpdIE611pYQ3PrazA
-GAm5sT7xHtTLlGKHteMyLbDwLjtmmEUjDyNx5Lm4ihRsqTtPqAePdT+leQLsX9V8
-EfMudMY/psotuMHqPznquOgxVI3hO9JWOm+en2rSEg8KQKxBNO68A4z+dz1MseBd
-vkHKasPMzfabkLr95ZID8j6LG+P3BQBofRebMqqw3V0cRk8Xnf+SnQZ4cQyzWETC
-rd6cC220E8+CGKn5E9je2nH1FwUZ3YQzxwayJRSnEu6zaioqa56nCmWGJslzpPih
-DulBR8HuVEa7+Hv2bk0WmN4MFj876VpiJfL81cX1gnfRZ3Wmr4NFVhXrbQ4hTL4D
-T18z+QNMVIMx2I5fukFn9bu3Ohu3lJRqj/4wkyKDuyi2k421boltW+hqPhm/r+VG
-+E+HRyDQadYVhxT64xCQ
-=OXG2
+iQIcBAEBCAAGBQJSidnWAAoJEPiazRVxLXTFldYQAI8rRvPaiAI1YyR1BybVnZUV
+d4wgtq9yeFB4ShjTp2+5X5n7JBG9LQTt2nRwtsugwdHyQymkqnwTUIpQNUzfccLG
+cKe9cwtca/ThAue4QuYYJfjkDfyla52ysCWcb4b82yORK6xsuWYrykFHEMrShIlM
+8KUknQmxzJnWelw8oLsneAP8VA0PHVTOtR2S/WwPphnxkQB0bGkS/tNKqTRXwRvy
+76y90Hq0D0ifE39+ntYRMNWykGt868uylprhaXJm5MmRtJy4TlHKND2LCj7lIsO+
+wKa0B4kIP5BwnfsR5Pn/oMN9b4E6LTaUutE6UZYSqy9maKBwyOHs1/fGNukxucyV
+u9nDooF02nUlWb60z0EpGJp0sqA8wm+o7buzCwi100s+o9qV+KJXYSjWTkNA28wG
+FYqSEWH4Nk2DblJY2M0NkWSjzTMbkVHqnhS0EIGWhxEcPEMz7E3VRZi/fr46mhdI
+tXIc0DCKi2owWtamiGwYD5gKsY8JTuOmZ3f2wdO0PoX8V4BIzyo4wmrSMg/y3tAB
+ErUhbBWXhcFs1eY9wnj3EYFmgJIOjnb5/jKAtFaLKzUB2vEzG4YXlGRlpKFWaQaw
+zqInzDNIv649nIHVpi1FpE+3lje6i8C2rke8Mf+gNjLWr314VsI/mDXwt4DIArfJ
+HR0TyzZRfKxHbjcjMj8D
+=u04A
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/nspr/files/nspr-4.6.1-config-1.patch b/dev-libs/nspr/files/nspr-4.6.1-config-1.patch
deleted file mode 100644
index a7d536152520..000000000000
--- a/dev-libs/nspr/files/nspr-4.6.1-config-1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/nsprpub/configure.orig	2006-01-14 22:41:37.000000000 +0000
-+++ mozilla/nsprpub/configure	2006-01-14 22:49:14.000000000 +0000
-@@ -3893,7 +3893,7 @@
-     PR_MD_CSRCS=linux.c
-     MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-     DSO_CFLAGS=-fPIC
--    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
-+    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@).$(MOD_MINOR_VERSION)'
-     _OPTIMIZE_FLAGS=-O2
-     _DEBUG_FLAGS="-g -fno-inline"  # most people on linux use gcc/gdb, and that
-                                    # combo is not yet good at debugging inlined
diff --git a/dev-libs/nspr/files/nspr-4.8-config.patch b/dev-libs/nspr/files/nspr-4.8-config.patch
deleted file mode 100644
index e8fc6c112bf8..000000000000
--- a/dev-libs/nspr/files/nspr-4.8-config.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- mozilla/nsprpub/lib/libc/src/Makefile.in.orig	2005-06-01 14:28:26.000000000 +0000
-+++ mozilla/nsprpub/lib/libc/src/Makefile.in	2006-01-15 02:50:39.000000000 +0000
-@@ -112,6 +112,10 @@
- MKSHLIB += -R '$$ORIGIN'
- endif
- 
-+ifeq ($(OS_ARCH), Linux)
-+DSO_LDOPTS +=-Wl,-R,'$$ORIGIN'
-+endif
-+
- ifeq ($(OS_ARCH),OS2)
- MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def
- GARBAGE += $(MAPFILE)
---- mozilla/nsprpub/lib/ds/Makefile.in.orig	2005-06-01 14:28:25.000000000 +0000
-+++ mozilla/nsprpub/lib/ds/Makefile.in	2006-01-15 02:52:30.000000000 +0000
-@@ -102,6 +102,10 @@
- MKSHLIB += -R '$$ORIGIN'
- endif
- 
-+ifeq ($(OS_ARCH), Linux)
-+DSO_LDOPTS += -Wl,-R,'$$ORIGIN'
-+endif
-+
- ifeq ($(OS_ARCH),OS2)
- MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def
- GARBAGE += $(MAPFILE)
---- mozilla/nsprpub/pr/src/Makefile.in.orig	2005-06-01 14:28:27.000000000 +0000
-+++ mozilla/nsprpub/pr/src/Makefile.in	2006-01-15 03:29:36.000000000 +0000
-@@ -168,6 +168,7 @@
- else
- OS_LIBS		= -ldl
- endif
-+DSO_LDOPTS +=-Wl,-R,'$$ORIGIN'
- endif
- 
- ifeq ($(OS_ARCH),HP-UX)
---- mozilla/nsprpub/config/nspr-config.in.orig	2005-05-11 00:53:41.000000000 +0000
-+++ mozilla/nsprpub/config/nspr-config.in	2006-01-15 06:37:58.000000000 +0000
-@@ -122,7 +122,7 @@
- fi
- 
- if test "$echo_libs" = "yes"; then
--      libdirs=-L$libdir
-+      libdirs="-Wl,-R$libdir -L$libdir"
-       if test -n "$lib_plds"; then
- 	libdirs="$libdirs -lplds${major_version}"
-       fi
diff --git a/dev-libs/nspr/files/nspr-4.9-pkgconfig-gentoo.patch b/dev-libs/nspr/files/nspr-4.9-pkgconfig-gentoo.patch
deleted file mode 100644
index 56d7bb870fdc..000000000000
--- a/dev-libs/nspr/files/nspr-4.9-pkgconfig-gentoo.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -urN a/mozilla/nsprpub/config/config.mk b/mozilla/nsprpub/config/config.mk
---- a/mozilla/nsprpub/config/config.mk	2011-10-13 09:00:06.000000000 -0500
-+++ b/mozilla/nsprpub/config/config.mk	2012-02-20 17:52:11.364823693 -0600
-@@ -183,6 +183,7 @@
- RELEASE_INCLUDE_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/include
- RELEASE_BIN_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/bin
- RELEASE_LIB_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/lib
-+RELEASE_PC_DIR = $(RELEASE_LIB_DIR)/pkgconfig
- 
- # autoconf.mk sets OBJ_SUFFIX to an error to avoid use before including
- # this file
-diff -urN a/mozilla/nsprpub/config/Makefile.in b/mozilla/nsprpub/config/Makefile.in
---- a/mozilla/nsprpub/config/Makefile.in	2009-03-03 16:04:23.000000000 -0600
-+++ b/mozilla/nsprpub/config/Makefile.in	2012-02-20 17:53:06.490819923 -0600
-@@ -52,9 +52,10 @@
- 
- # autoconf.mk must be deleted last (from the top-level directory)
- # because it is included by every makefile.
--DIST_GARBAGE	= nsprincl.mk nsprincl.sh nspr-config
-+DIST_GARBAGE	= nsprincl.mk nsprincl.sh nspr-config nspr.pc
- 
- RELEASE_BINS	= nspr-config
-+RELEASE_PC	= nspr.pc
- 
- include $(topsrcdir)/config/config.mk
- 
-diff -urN a/mozilla/nsprpub/config/nspr-config.in b/mozilla/nsprpub/config/nspr-config.in
---- a/mozilla/nsprpub/config/nspr-config.in	2005-05-10 19:53:41.000000000 -0500
-+++ b/mozilla/nsprpub/config/nspr-config.in	2012-02-20 17:55:10.947811413 -0600
-@@ -92,13 +92,13 @@
- 
- # Set variables that may be dependent upon other variables
- if test -z "$exec_prefix"; then
--    exec_prefix=@exec_prefix@
-+    exec_prefix=`pkg-config --variable=exec_prefix nspr`
- fi
- if test -z "$includedir"; then
--    includedir=@includedir@
-+    includedir=`pkg-config --variable=includedir nspr`
- fi
- if test -z "$libdir"; then
--    libdir=@libdir@
-+    libdir=`pkg-config --variable=libdir nspr`
- fi
- 
- if test "$echo_prefix" = "yes"; then
-diff -urN a/mozilla/nsprpub/config/nspr.pc.in b/mozilla/nsprpub/config/nspr.pc.in
---- a/mozilla/nsprpub/config/nspr.pc.in	1969-12-31 18:00:00.000000000 -0600
-+++ b/mozilla/nsprpub/config/nspr.pc.in	2012-02-20 18:00:14.609790649 -0600
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: NSPR
-+Description: The Netscape Portable Runtime
-+Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@
-+Libs: -L@libdir@ -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@ @OS_LIBS@
-+Cflags: -I@includedir@
-diff -urN a/mozilla/nsprpub/config/rules.mk b/mozilla/nsprpub/config/rules.mk
---- a/mozilla/nsprpub/config/rules.mk	2011-08-29 12:02:51.000000000 -0500
-+++ b/mozilla/nsprpub/config/rules.mk	2012-02-20 18:11:56.112742680 -0600
-@@ -207,10 +207,14 @@
- 	rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH) $(DIST_GARBAGE)
- 	+$(LOOP_OVER_DIRS)
- 
--install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS)
-+install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) $(RELEASE_PC)
- ifdef RELEASE_BINS
- 	$(NSINSTALL) -t -m 0755 $(RELEASE_BINS) $(DESTDIR)$(bindir)
- endif
-+ifdef RELEASE_PC
-+	$(NSINSTALL) -D $(DESTDIR)$(libdir)/pkgconfig	
-+	$(NSINSTALL) -t -m 0644 $(RELEASE_PC) $(DESTDIR)$(libdir)/pkgconfig/
-+endif
- ifdef RELEASE_HEADERS
- 	$(NSINSTALL) -t -m 0644 $(RELEASE_HEADERS) $(DESTDIR)$(includedir)/$(include_subdir)
- endif
-diff -urN a/mozilla/nsprpub/configure.in b/mozilla/nsprpub/configure.in
---- a/mozilla/nsprpub/configure.in	2012-02-14 13:06:00.000000000 -0600
-+++ b/mozilla/nsprpub/configure.in	2012-02-20 18:09:55.776750908 -0600
-@@ -3357,6 +3357,7 @@
-     config/nsprincl.mk
-     config/nsprincl.sh
-     config/nspr-config
-+    config/nspr.pc
-     lib/Makefile
-     lib/ds/Makefile
-     lib/libc/Makefile
diff --git a/dev-libs/nspr/nspr-4.9.5.ebuild b/dev-libs/nspr/nspr-4.10.2.ebuild
index 6e76cdbaf82c..63fd5b052cec 100644
--- a/dev-libs/nspr/nspr-4.9.5.ebuild
+++ b/dev-libs/nspr/nspr-4.10.2.ebuild
@@ -1,6 +1,6 @@
 # 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.9.5.ebuild,v 1.11 2013/06/20 02:15:18 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.2.ebuild,v 1.1 2013/11/18 09:11:48 polynomial-c Exp $
 
 EAPI=3
 WANT_AUTOCONF="2.1"
@@ -15,33 +15,31 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar
 
 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"
+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
-	epatch "${FILESDIR}"/${PN}-4.8-config.patch
-	epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch
+	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
-	# Patch needs updating
-	#epatch "${FILESDIR}"/${PN}-4.8.3-aix-soname.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
-	cd "${S}"/mozilla/nsprpub
 	eautoconf
 
 	# make sure it won't find Perl out of Prefix
-	sed -i -e "s/perl5//g" "${S}"/mozilla/nsprpub/configure || die
+	sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
 
 	# Respect LDFLAGS
 	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
-		"${S}"/mozilla/nsprpub/config/rules.mk || die
+		"${S}"/nspr/config/rules.mk || die
 }
 
 src_configure() {
@@ -65,7 +63,7 @@ src_configure() {
 	esac
 
 	# Ancient autoconf needs help finding the right tools.
-	LC_ALL="C" ECONF_SOURCE="../mozilla/nsprpub" \
+	LC_ALL="C" ECONF_SOURCE="../nspr" \
 	ac_cv_path_AR="${AR}" \
 	econf \
 		--libdir="${EPREFIX}/usr/$(get_libdir)" \
@@ -89,18 +87,6 @@ src_install() {
 	einfo "removing static libraries as upstream has requested!"
 	rm -f *.a || die "failed to remove static libraries."
 
-	local n=
-	# aix-soname.patch does this already
-	[[ ${CHOST} == *-aix* ]] ||
-	for file in *$(get_libname); do
-		n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION})
-		mv ${file} ${n} || die "failed to mv files around"
-		ln -s ${n} ${file} || die "failed to symlink files."
-		if [[ ${CHOST} == *-darwin* ]]; then
-			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die
-		fi
-	done
-
 	# install nspr-config
 	dobin "${S}"/build/config/nspr-config || die "failed to install nspr-config"