nspr: Version bump, bmo #807883,782214,812085 includes aarch64 support

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4D088B4

3 files changed, 111 insertions, 15 deletions

diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog
index 10d4e3202f3c..102023e31238 100644
--- a/dev-libs/nspr/ChangeLog
+++ b/dev-libs/nspr/ChangeLog
@@ -1,6 +1,11 @@
 # 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.228 2013/03/12 15:16:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.229 2013/03/29 01:24:59 anarchy Exp $
+
+*nspr-4.9.6 (29 Mar 2013)
+
+  29 Mar 2013; Jory A. Pratt <anarchy@gentoo.org> +nspr-4.9.6.ebuild:
+  Version bump, bmo #807883,782214,812085 includes aarch64 support
 
 *nspr-4.9.5-r2 (12 Mar 2013)
 
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index fc3e1d29d82c..6c1821e7834f 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -23,6 +23,7 @@ DIST nspr-4.9.1.tar.gz 1172951 SHA256 5b696b80a3254aa0e5c7f0614b6bb9b14c483df46a
 DIST nspr-4.9.2.tar.gz 1172193 SHA256 570206f125fc31b8589b31d3837c190ee2a75d4f3b8faec2cbedbeacc016e82c SHA512 1f1f35fc2b9ead7e3b4ef93a02f13c0bcccc314bf9cfad67e6ddb755aaf6ab411499b0b57b94b032e2c7ee21fc7c114ca447e24825b79611f720f88eb37bd348 WHIRLPOOL b50c87f8ba77601ea79282659b4781fe674925bc87bc130dd5acc056021b135769a0d5ed1b76e759c1dfbb0c7df9d6fb0d97d292f42c5d7c5db43233c2498f07
 DIST nspr-4.9.4.tar.gz 1160641 SHA256 749046c75be17f2f8b3874d288873d3355cedcb37abe7b6eb7b3bc374440d4a4 SHA512 5c1caf290bbe6cec7fddd40ae1eefbe54608a0f6fce908b1680513c50661dde40f4c1638ddca56b8a7125b20be6945aa2b4507fa0dde09e3e9eb0b08e90cfe2b WHIRLPOOL a9fd7a0c4b17240c746312cdab1495a5d5ebcabcc945a7c2f1a3df435db2d4e5e80e3086d20bd658a94c573abb916611327ad877430c9cd0282e8d192217d707
 DIST nspr-4.9.5.tar.gz 1156396 SHA256 616ab65c849155c9ed0e5f502530a241cc9108e278275aa448b417ae632c7604 SHA512 cbe60e4c5265863fa3250d7c16a2727d3a4a8762d17bc63d044ec88d11758fe9f54f54c08e198db6278ee68c55edd88f7c4bc5db9bdc46bdea4e4cf9eb277f27 WHIRLPOOL d2792148805a99d1f2de919b57e48cfd03290b1f8faaec55d4374004574a578ed3fef110956fbb767a2f7f6d00cb9d594aa3a534e29df5790f3284c4fcea8b7b
+DIST nspr-4.9.6.tar.gz 1163033 SHA256 7693fddd3c5cc15d53a50df53ab5dcdaa2eb58f5003302690559471744d6c6f9 SHA512 635abfbf982d073803a76dc413097b7ac38d415c395e4a018d024f4620903e494b08f6e659ce0dfab06dc73eb7979c92824701bb613f8519b151e686811d3300 WHIRLPOOL 989fe3602f28e5ec1e0b3e897006c94640963cef71f7ff922941d518f16d4d2fcf3cb490aa0be9b993b98e9d3543bab5e43e9f6303cd4e11790976ffcd1ee5de
 DIST nspr-4.9.tar.gz 1218528 SHA256 ecc632bc578c125650999776673eeff952096afa6d151f6d91f6c3a93e1e716a SHA512 c0c18d06919a20f779b683d3ec24a82bcd48693e00f6aff4f66038c55e16305d050b83e1e6b7a4b3d0da5d1f1db699eb11ae111280989c60f5ea5c42420884d9 WHIRLPOOL 3d0be6f316368041b5cae7f00a273c33467f4b8ccc6e14d3a3728d5130a1cb625f44fda89cf9f80c092b70ea26a0958a7238f959e8d06263c5393edd835c7a31
 EBUILD nspr-4.8.8.ebuild 3553 SHA256 c178bf852a1fa2150716ff08ade3c6fb2755986bed4fbf44227f068d5e38b86c SHA512 52b0cdc89fd349dbec6ece260e3a1282ba91dd3ec8a60da370d073d1c7f0054092b99d2bdee6f56562d1e9654f8b02c7b1893393119d87b1196267cc0b2660b6 WHIRLPOOL c70fefc921e562db5277f230c2849230405f2c8f449deeb647e6192b9bfca47507dd023e05a53e8cdeee211af8fe580d3b4428c473f4dd7e5b30eac7f11f907f
 EBUILD nspr-4.8.9.ebuild 3784 SHA256 888de34db739f48ca4368827b97f91932efb81de781f686995016f346fb0607c SHA512 7d04936f51b9e22c5ed1c6042b8305d1cb886b09aa240e7588f3dfd7059b25d2e0537c79dfd2e3520bc79e7698fe1f6a2bfa1211151c3e1c7259dafab8ae50b7 WHIRLPOOL 32526437e464b825b33dd5c65e89ee5a9deaeda52886b7530f02f3492313e24dc774e5779db8104f4dc56f4547372bc02d374e1ec923baa76f777103fc34f5bf
@@ -33,23 +34,18 @@ EBUILD nspr-4.9.4.ebuild 3636 SHA256 93762a1b9d8b9cbc4a3a4fd441f2cbb750a0e4c92ae
 EBUILD nspr-4.9.5-r1.ebuild 3667 SHA256 ad102daf5540111460c8e1dcad6416dff0a5b2b3db7815edbeb76747e5a7f3c9 SHA512 b5e489e3337769f54d6c8e5236c0b33dba3db871bc5f87d81d6c5155a78e944a1966d5149138d739fb9cbc07815486b53653bc81dadfd7a2145ea29e826ee57d WHIRLPOOL 1f33794ae35ddf41f66fb056ce7061f4624d8261eed81135b1bd6a6d06847351c1d9d9f6a50e2bc4b896a5b5d0700bffbe4bfbbd29ef6e762ce4ee9aa731c655
 EBUILD nspr-4.9.5-r2.ebuild 3190 SHA256 476027fdc4d6bae0670a74586f9a65c37c0617d5f73a0cd97741dc285d6400af SHA512 63a84cf02f91af2a4b867a092e0fe53cd6cd26d936adfedb372af22828c4ae30b87d83a9dd9c6904f7772fa8713712aa4d689f98999c271da35642870839a38d WHIRLPOOL fc531c7e1cce566cfeba76e9673cbdb23c759003ea20b81a8976fcfd83d754e90003caef4754b8cb542db9cdaf38d95e74026c4fab22167ed547d6e7c08e68e4
 EBUILD nspr-4.9.5.ebuild 3635 SHA256 ad14ccd5616ba02ed052129d9ce8d17fa9cff18ed5ff9a63211baaf7696c3d6f SHA512 8eb4b7a330de5ec19303a67c3a4cde21e4a593321d729d4470f1705049081f0e2ef9df49a782fb73497c1539ebc0fff6e3fb4e9b28ce505d1e0cd9fcac6c627a WHIRLPOOL 470d01b08bff691328034b8a6e51d5e84686b03dddeb6b3d11b24a5543a4d843509653dacf889a3bcdd3ea3477f6bc4b52098964cdfe154f53568b67f0a5ff28
+EBUILD nspr-4.9.6.ebuild 3188 SHA256 c941b6cf5bf38c53ba6310444c360f8b399bda2be7a4390fb0a65463074851f0 SHA512 89cc10292858691d5bca7dafeaa915017d137323b6d39c57147f97275a5077071735e3db014f4cf35cd6fb473d5df7c5d7a00ade77192af0f55e66d999a2ec95 WHIRLPOOL af8b924b8fded2007b300f3c646edad7f2b2b53e620ed933b9ab25cadd9b5cd79afe0bac7725329eedf2c4d53c14df8bc503faef744e45617deb2799eebf98c4
 EBUILD nspr-4.9.ebuild 3702 SHA256 70d3843e5d588eab366a77e35d5205f94decf60493f9670c0fe7ff3940b0c204 SHA512 f3a8b66281183b57278a44f8841dbc68fb3ef7ea45a56dfb46c142219d016641c1accd805b0d790136a96b51223c1a00a08738e77b291893ec050e0e1c18d99e WHIRLPOOL 8762e5b0cf414b64daa81c472daf4841e6209c946f2a1d3dadd1a8150449563b0293e9ba9613fb2d2878fcfdac3e3b7b04a0e9defb0db40f4b27257e1c79fc4f
-MISC ChangeLog 28827 SHA256 8bc36237c0597272ba68ae3c3058db7d943df0505a41679142ef679660156487 SHA512 1577e3b26c9433609ef41cab39c912eaff103936d9f6cdde2a549d6f652d57cbda560b05234d3e2cbe93a87e2aa056fc87606ac38d4d4323ee2bd2e3a52eb426 WHIRLPOOL 9ab5e8f2a2f7c349e51d7b757285b525bfa3c878738e439d828be62543dabec11ea9f467e67549724b101a656c547e941d8e7fcaf95ac293a895601a3d8aabcc
+MISC ChangeLog 28993 SHA256 794b1c2ef06af0cb48aa22a327ba5b4244ca73247edb43e9c9040cfefa2c90f9 SHA512 89928506293eb70ca4372c42acf7544f2099d6f626996ac8523e0cd46316ce3f346fbe9486427264d1bb6c08860097c0a20102561ad4ce9d25725a55a43ec73e WHIRLPOOL 547af369bf6b31e6184a9e6736b5e1c6d7c95cc8c5d17547c90c6e4c3c413d7335d222dbe78abd7f5f200f8451ae2f57afbbd4bcd482c4e56fa7ecbabc3a65fc
 MISC metadata.xml 160 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b SHA512 ed6f709d55351c1b69f2b43ada124fcc2f8969f8c3867073bb0c68aa502f16247cbcd78734a891e4d1a509d334f6805e5267d2088cd03f3408a636ad9aedc2bb WHIRLPOOL e6bf1791838158287debcc3160dd075dcdf88bc1b33060aefe4687b4451108e55b6f8021fc36f07ab85c4e37a4225444cc2804cf40bd61ba49726bbf12fa4e38
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRP0duAAoJELEHsLL7fEFW99MQAJ30kjp4gXoCsY5MZy/63Ys0
-50Y9JO41RdY8ofhiNlh1u7EvIEYxWa/oPVx7NVQSAy6inxKmddWBKkOzkhrk5wEG
-qOgvCtySUlPBLTgo7qdh6vzZTMYKsGg/5GjVTjzkETFRDpWxoaSUztgkGKqF7ObK
-ozz2qDdSimuthLgzPc57wUw+ypVCq1+Lcim9/hn+1hNok0fO/jcsmEpTLhcDWzNC
-6sPE/cYHqfxSqG0G1AuGJvWhE6Bb6Mt4sm/+BYNrAoIrFj0uC9CxsE2fweagXcPo
-0pTwFtyQBUAxI5lsIb5vEr3GtIct3aijbBcr2696hxU0YmgoROTFcSRjsODZ2uQa
-jB6xlBV1s+NAsGais4vY9QuCV5ciwzmNiC11JGmfBGDSfb2MDcbu8ehd9nX2kFHp
-IhhfPxZmhs+wv5X6Dys1OQTc2lhqJJiYBNMyZSxyk+SSOlladm3yaGG3tF/p64do
-Y9BIfK4+FCgxMajeh/yQtovW+PaQmKK3FU7uKqTIJkIkIO1BK/sRBBtn4q7a95uQ
-rtyMXug8P68KgZUjN9miu1sjpswUfB5sMp3TCNrCjc0SdNUV2577R/VRuA8/obXE
-JjlPfjOxdXALD4LjqDnXetsyjL0i5L61Mvr+K3v/PzP5jECB1FRyFfCFAXUM49/N
-s2laVDqyONEz+OLB9iw6
-=hPjN
+iQEcBAEBCAAGBQJRVO1xAAoJEKDMw7q00Ii0ADcIAJA9YSxPDjP++BprmQGMICic
+WYVAdU1R+RHJPMZh+vYLFIPcjR0BH80OcOvgV3Kn+xRbreISJe4ip0eEAF3AEJip
+gIeN/9IRtIq04xlw53H+aI9UdeR8UpK9xt+Ra9yYnQNVTSbLZ21FXCfhjcj0VdAX
+5t5HHcmzDFrgTmmM+YnjEzjPOT0U7OvlQtCf5T36cA2PyUe42O7ZB8gBNjlB30NK
+kkCzsGxZAh/FwKv+yZWY/MnB2P6b9QL/414UNRcWI7Xc4sOOeKbm76+d333zbTw8
+BYanctqiM2xjXTNGPzV7g1JY9LmuCLGI6fzaPDFd8+I6j0DtyoOqm6yWw3jbj9Y=
+=36/G
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/nspr/nspr-4.9.6.ebuild b/dev-libs/nspr/nspr-4.9.6.ebuild
new file mode 100644
index 000000000000..c57fc4a3ee2d
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.9.6.ebuild
@@ -0,0 +1,95 @@
+# 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.6.ebuild,v 1.1 2013/03/29 01:24:59 anarchy 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
+	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
+	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
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
+		"${S}"/mozilla/nsprpub/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="../mozilla/nsprpub" \
+	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"
+}