version bump, remove old; security bug 512896. Also added a multilib-minimal version for testing and eventual unmasking

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

5 files changed, 162 insertions, 32 deletions

diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog
index a2c57304cef8..949d9d560178 100644
--- a/dev-libs/nspr/ChangeLog
+++ b/dev-libs/nspr/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/nspr
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.262 2014/03/24 14:33:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.263 2014/06/13 14:19:49 axs Exp $
+
+*nspr-4.10.6 (13 Jun 2014)
+*nspr-4.10.6-r1 (13 Jun 2014)
+
+  13 Jun 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  +files/nspr-4.10.6-solaris.patch, +nspr-4.10.6-r1.ebuild, +nspr-4.10.6.ebuild,
+  -nspr-4.10.3.ebuild:
+  version bump, remove old; security bug 512896.  Also added a multilib-minimal
+  version for testing and eventual unmasking
 
   24 Mar 2014; Agostino Sarubbo <ago@gentoo.org> nspr-4.10.4.ebuild:
   Stable for ppc64, wrt bug #505072
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 2a721370c6df..e6f53890f4c9 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1,6 +1,7 @@
 -----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
@@ -10,29 +11,20 @@ AUX nspr-4.8.4-darwin-install_name.patch 1102 SHA256 ca17efc9a60f4372b5da9c29ddf
 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.3.tar.gz 1104478 SHA256 f25779b1a665dab0090b9c977dc6c29a63320f442956ed78629b66b405cb01e5 SHA512 f8f940e5536f29d9a686b023f3c418b40e24a785b6e4130f9d1f373fb7f1bb5879f52e8c2f1338ac742ff9225fea1a29a394b96cedc9f05b3bd4600885c63dec WHIRLPOOL 7fdc8d357e0b45e46d4a9b365bd38691144554a641827fa1ae4fb714f504ec16ad7fcabc27297019d020d3fe8d5207a18d053fb027c91603633c905b8516d50f
 DIST nspr-4.10.4.tar.gz 1107127 SHA256 eb3fcc5e4cbd90f244c19ea05c2dfb4d22df4acc777d34ec6946dbfae560d838 SHA512 9aadd94473e840246b08b4377ac68ec8a1474997b7a08484993186843afdaca65157cf8797d8922f137d881a4df6fda66edc188ba579fdc6bba429571a701222 WHIRLPOOL b52435751f7cb131523d8aef27cc0b1400fe281a018f9f7370cb8d894920d71df49d37450ba057c381590998a81796221858d2f2f06597fd71c93082854717a9
+DIST nspr-4.10.6.tar.gz 1131328 SHA256 df69ac8b0126f11907792384468adf42712b1d6db9772f4aa20c6d471594644a SHA512 a527a7123b4291903ac69899a82ea7e82a1945550b37f59199140a80d917540fb280172adeabf0fa09420debfd0d39c89c417166cd0a50e1eb6f1929a2a7460d WHIRLPOOL 6f7f422f50343f177896d9243a9ae89878823e92ffd3511131546a32b3cf481c9af34f5fef43c8a7c1d5974fc0959e1fa06ddd67133034563e06128e50a6f1f2
 DIST nspr-4.10.tar.gz 1103862 SHA256 0cfbe561676b92e5af3ddc7ac77452014e3da8885da66baec811e7354138cc16 SHA512 80d511e3bdce9a1efc577acc1671f507bef3d6ca933705f67a7aba567ff7b981e9cde70c2da6fbde82852938b779baa0058c82f937d4ac3e672f6d8e7bdefe8b WHIRLPOOL 404af25a7856df10376a90d7618edd10297c5a1843d6db3e2e754b4066475ffcf4af024804b119e1a8479bbd748a6c142aa77fe27c02e5d3cd751bf449ab1182
 EBUILD nspr-4.10.2.ebuild 3157 SHA256 0422f1898967d2953e644c05ea60ba9e34cff049acc40d2114112699ca4c887b SHA512 8a584eba2b1ba41808ceb083166fe621ac2eef262ba81608ce1fd004e779b3de03b9d0c8949ac65d55b4e7e4203550094f792af96842cb5abd29c197458a91e7 WHIRLPOOL e17e2c58675f276f5a64e0cc926e24db5cb758ab86b84ec8d1636766fa83ad1eee5c4a42324d727cdb087a75e471b8d196355f280782a9cc45904885f8685761
-EBUILD nspr-4.10.3.ebuild 3166 SHA256 ae186a0af0c89d4f3c587e4130d4bbf344715cabc06f75f1f909ec692b5f624a SHA512 f3a2efcbace9285e42db951499f6a1ab80595564352d0a01c87aa9b82491b5fbe1523317a3de7bb452641a7be696a917c67e3e83a972ac2c66e9525cf8e03d23 WHIRLPOOL 17d4c4de813d3c9eebb8dcc1b62727bacbca5b266d484ab20f15a8094218d807b964eb173e886d154f8dd3983a499814c4fa51ee803977b77e48be39b15359ef
 EBUILD nspr-4.10.4.ebuild 3050 SHA256 ad294a33407122ca1cfe1c693fb30c94b74751beaa808646c4400dbb90922f39 SHA512 e3662861d0d44e36cebf3a68c43ec52082e0dee17b2295b76c5a44265b8b4ed57f6725373518e6fedc318d8ace868107a8823924d92c3852727b4f55c1eb7649 WHIRLPOOL dcc6132e109298600f1daf0a450f56881755dcc0416ed5c7e0b0bf6b5585769d81bbb90227836fc32bf1a886a5bda144d10d12d952f6bdeefcb54cbced3bcb04
+EBUILD nspr-4.10.6-r1.ebuild 3341 SHA256 810bdbff10471c1f692c008b220e45c5f05b670b214c4ed6ab18127b3465d662 SHA512 8ffc4d0dca49a78732a02b3232e6fe97b5f995667c1e4bbd61bc758d7a8be93268b3c46cc36ad467bc1150eaad85eaf2d84f2890cecb015540f4b272c8fd5865 WHIRLPOOL e15bacacc950329ae42b7f03dcd88c4690568a3bacceeed6c040516ac1dc63f3890fe595774b72f14c0eb3b054147904cc5e5b13f7c9ceb9cf9b0f662b1effc1
+EBUILD nspr-4.10.6.ebuild 3068 SHA256 674c89495178b124f187bd9de5051b5418094119204bb5f6d7bb9413497efa4b SHA512 c148e72151407ebc3140cd39f321eb128ab92ec25637c52b93d4987220e837ab32595e60403d2df57b94a49f4d280e20132460472d46592703a2ab41f54cbc56 WHIRLPOOL 4cb9e8f9873af061bc1aef025388553f6b4f3bf62b1565c2b3ef614936e64d8bb78603935c13ff3e7820a3c985f7ed18950652a836ce6971cb1fdb5e6153cfeb
 EBUILD nspr-4.10.ebuild 3134 SHA256 0d3aa89630a9b3f23768822b90a7e41ad4516bad5bfe368130f8b0e26ffd2c34 SHA512 39a4330dbc011313c35d5734e1b62e52bab02529f5988e7362593110095119c359c3a8db9d073ce57baa121d2351ba6faf63cb2a7200027cfbf42ef70db7a10e WHIRLPOOL 0d51bc99b0561874e758c6c5040abb92b17dc8f6b2e6a7831af05868f3c21aa57bae111e3053c2a3918aff6dc843da581655999190d493f33b0b1041051d90b1
-MISC ChangeLog 33163 SHA256 7c38eabfdc145f6a04f9d402c6ab0b5c88f829d10ee12cacfdd0d44d619ef420 SHA512 78e980f7644de5f724397ec2c59667746ed273716e33edfc9092a53da5a75b4970b887736b748573b01aa41581ae01240a4f5eac0bccaa5064b455e25477dcac WHIRLPOOL b798edd4463dd9b3561b82bfcdbe5b34d4201cbb7525b5cdaa9b4ebb45e74e2030e289485788a9349522d77c5fa1351e0bb0abd90c9c140f1442e4269032cb92
+MISC ChangeLog 33508 SHA256 5e8bce4488f48f3ad66a347d21b1b150ac4b6bb5e52a4ad3b2d7486641fbd1c3 SHA512 a3690c8055aa28b9f0059bb535eff79bacc4818e712875ee92aa81956e22bb63c875c79ce608c71f8a0366ec675af84b3dbbd382f79c26ab3fd46bdc6f27c27e WHIRLPOOL 4a7e1a1e438af67a4f2c1832ab327031750f3d75f31c5d17c572ce1aa7276b41ab2ea81fd7af602b2447382591936261247509fc536c54101abd13adcb2d6b4f
 MISC metadata.xml 160 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b SHA512 ed6f709d55351c1b69f2b43ada124fcc2f8969f8c3867073bb0c68aa502f16247cbcd78734a891e4d1a509d334f6805e5267d2088cd03f3408a636ad9aedc2bb WHIRLPOOL e6bf1791838158287debcc3160dd075dcdf88bc1b33060aefe4687b4451108e55b6f8021fc36f07ab85c4e37a4225444cc2804cf40bd61ba49726bbf12fa4e38
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTMEJQAAoJELp701BxlEWfg/UP/A3/rEQqLwLvs+VPwJmDBzWc
-ros+13Q59hxkmoI9YYZ3vaaQPzdBNBGeBuKVp6PlYyxteo53FUQ93YgQZW37Z8en
-64HrnqrYGPPQaSElBO+JV+kyuxxRbv2yIswHsN3wJ6vTrOoVB1JYVzOwmMj8T4h+
-H0qHjs60a05xhvJuSdQeux4MIz6Kj/xinFsQanUihgy9wor7TLrkYTSURhGmORM1
-H2uaOoY1vlgtm6lzR5C71N80lSi/DE7kNyoBO+XF6+2+JxvJvV3j9aVkhrj2C8nh
-AwaS9wYq2tyIYpxUVhU8+5dsF3t9uax6q42786EtkcmRUp2zbwVjqGp/1QYNEw02
-gDlKyeakyJseivQvdx8M7HJox1ql1n963Ios12mRK4AwZm/rmHzoW8A37Z2IQKe6
-w2n3OnIngdoIrl7VtJ93laSgBR9t7QYnDr1DK5hQX7WsUWdj/hXTWFGi2OOkP5f5
-3e8w74OnL/UW0PMMcgV20pB0GK72mvS0NyqUHI7T7KBP/XqhOSzE9vM2B8WNpafQ
-+llpbKqEzBJtDJa9Y4GcowH/JQr6iAEH3RGlh83Yv2psgNgff/C2mTgcm4HsWcCs
-mAZobSJ+BguC3Ek/0R5NrjEl5mLJkm+2BiUl4CYW+V5AA/ac9BwcWlqzSo863kVa
-65VNApIAG7otvk03rOy7
-=WsJU
+iF4EAREIAAYFAlObCIIACgkQ2ugaI38ACPDEyQEAil0NixPhck2ahIoxuKo5Sn8i
+TJspwfT6vn8vKNILiqcA/13seKuwvtg7pKSgvPOVPJ2HRqghG8sR9GVcWxs9PH5q
+=I1ch
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/nspr/files/nspr-4.10.6-solaris.patch b/dev-libs/nspr/files/nspr-4.10.6-solaris.patch
new file mode 100644
index 000000000000..3ae8052ec485
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.10.6-solaris.patch
@@ -0,0 +1,32 @@
+* drop Solaris linker stuff
+
+--- nspr-4.7.4/mozilla/nsprpub/configure.in
++++ nspr-4.7.4/mozilla/nsprpub/configure.in
+@@ -1988,26 +1988,14 @@
+     CPU_ARCH=`uname -p`
+     MDCPUCFG_H=_solaris.cfg
+     PR_MD_CSRCS=solaris.c
+-    LD=/usr/ccs/bin/ld
+     MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+     RESOLVE_LINK_SYMBOLS=1
+-    case "${OS_RELEASE}" in
+-    5.8|5.9)
+-        ;;
+-    *)
+-        # It is safe to use the -Bdirect linker flag on Solaris 10 or later.
+-        USE_B_DIRECT=1
+-        ;;
+-    esac
+     if test -n "$GNU_CC"; then
+         DSO_CFLAGS=-fPIC
+         if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then
+             GCC_USE_GNU_LD=1
+         fi
+-        DSO_LDOPTS='-shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs,-z,ignore' 
+-        if test -n "$USE_B_DIRECT"; then
+-            DSO_LDOPTS="$DSO_LDOPTS,-Bdirect"
+-        fi
++		DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
+     else
+         DSO_CFLAGS=-KPIC
+         DSO_LDOPTS='-G -h $(notdir $@) -z combreloc -z defs -z ignore'
diff --git a/dev-libs/nspr/nspr-4.10.6-r1.ebuild b/dev-libs/nspr/nspr-4.10.6-r1.ebuild
new file mode 100644
index 000000000000..74ecfe086530
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.10.6-r1.ebuild
@@ -0,0 +1,97 @@
+# 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-r1.ebuild,v 1.1 2014/06/13 14:19:49 axs Exp $
+
+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="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"
+
+RDEPEND="abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r9
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+src_prepare() {
+	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.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
+}
+
+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
+	# use ABI first, this will work for most cases
+	case "${ABI}" in
+		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
+			${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 ;;
+		*) ;;
+	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
+	is_final_abi && \
+	dobin config/nspr-config
+
+	# Remove stupid files in /usr/bin
+	rm "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files"
+}
diff --git a/dev-libs/nspr/nspr-4.10.3.ebuild b/dev-libs/nspr/nspr-4.10.6.ebuild
index 93f225edd4a4..2f740cb3d5f1 100644
--- a/dev-libs/nspr/nspr-4.10.3.ebuild
+++ b/dev-libs/nspr/nspr-4.10.6.ebuild
@@ -1,9 +1,9 @@
 # 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.3.ebuild,v 1.1 2014/02/05 07:43:05 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.6.ebuild,v 1.1 2014/06/13 14:19:49 axs Exp $
 
-EAPI=3
-WANT_AUTOCONF="2.1"
+EAPI=5
+WANT_AUTOCONF="2.5"
 
 inherit autotools eutils multilib toolchain-funcs versionator
 
@@ -20,11 +20,11 @@ IUSE="debug"
 
 src_prepare() {
 	mkdir build inst
-	cd "${S}"/nspr/
-	epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
+
+	cd "${S}"/nspr
 	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.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
@@ -54,6 +54,7 @@ src_configure() {
 		|| 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
@@ -63,7 +64,7 @@ src_configure() {
 	esac
 
 	# Ancient autoconf needs help finding the right tools.
-	LC_ALL="C" ECONF_SOURCE="../nspr" \
+	LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
 	ac_cv_path_AR="${AR}" \
 	econf \
 		--libdir="${EPREFIX}/usr/$(get_libdir)" \
@@ -73,23 +74,22 @@ src_configure() {
 }
 
 src_compile() {
-	cd "${S}"/build
-	emake || die "failed to build"
+	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
-	cd "${S}"/build
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install
 
-	cd "${ED}"/usr/$(get_libdir)
 	einfo "removing static libraries as upstream has requested!"
-	rm -f *.a || die "failed to remove static libraries."
+	rm -f "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries."
 
 	# install nspr-config
-	dobin "${S}"/build/config/nspr-config || die "failed to install nspr-config"
+	dobin config/nspr-config
 
 	# Remove stupid files in /usr/bin
-	rm -f "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files"
+	rm "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files"
 }