Stop installing the compile-et.pl script as no one uses it, and it requires perl.

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 138 insertions, 8 deletions

diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog
index 08a04524910b..7060faa5f962 100644
--- a/dev-libs/nspr/ChangeLog
+++ b/dev-libs/nspr/ChangeLog
@@ -1,6 +1,12 @@
 # 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.282 2014/10/15 13:18:42 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.283 2014/10/16 17:44:25 vapier Exp $
+
+*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
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 0726c6dcd0ff..d907ec8eb727 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -15,15 +15,24 @@ DIST nspr-4.10.7.tar.gz 1131171 SHA256 389af5cfa863ea9bc6de7b30c15f8a4f9bddd8002
 EBUILD nspr-4.10.2.ebuild 3157 SHA256 0422f1898967d2953e644c05ea60ba9e34cff049acc40d2114112699ca4c887b SHA512 8a584eba2b1ba41808ceb083166fe621ac2eef262ba81608ce1fd004e779b3de03b9d0c8949ac65d55b4e7e4203550094f792af96842cb5abd29c197458a91e7 WHIRLPOOL e17e2c58675f276f5a64e0cc926e24db5cb758ab86b84ec8d1636766fa83ad1eee5c4a42324d727cdb087a75e471b8d196355f280782a9cc45904885f8685761
 EBUILD nspr-4.10.6-r1.ebuild 3759 SHA256 4de228a6d2c4004edcc840f882a71fad01e2a51c4692da93fb3edb8ed0bb6039 SHA512 b40042283d1a559081ab5e985eab78f1127b9078c81e4d8be6dd7e499e6d30cf1f4ef1af34e88392cd0d2dbb5e028b340824cfa9b5dd5769b50c19248600a9c3 WHIRLPOOL 803e80e1ddd6d7b606b1cfc6f3ed43e58626eede4415e97b3dcc103e94b5d6271292079abb43f26b665b2b6ab8ef667b3fd44a83fbbbfeb570b8b53737b6cc68
 EBUILD nspr-4.10.6.ebuild 3060 SHA256 f85c35674b68fb515a42c04ef750a03fa02daf05f1547c2d28d612d2d79b6a53 SHA512 cefadf5b44dbb6a1777d9ca90cd563fb21f0013202341598a31d751c1111c3735b3c5a8b05aa7573e1ebe7e9a2484dc0b39903163ac8e83c4cbdd2e0dbd9e9e3 WHIRLPOOL d102274922bcddd6a20d5e7daeb5ab3f9348445f470f4a31aea675228428e026bf250658fb452544592745c6bf43a3133d6ad2805e1f82c87beb0fc3abcea51b
+EBUILD nspr-4.10.7-r1.ebuild 3952 SHA256 9e483e235579ea6b51447dfd220031d4a6cee701e2d64acbb39d29fca776047c SHA512 5164ba4a9d9b2f933dc44ec7367949fc20a802eeefe0a3651022bb091b51c859d35e6fd8be3bc974a4717adf4af850dc8ccd1b0e5c87d724285b97ec3e9c3121 WHIRLPOOL 7bc52063e6f1b86f9a9055d821de174c64378f3ccaf34c8cb1bd578f71beafa0e07ffb8e0e7348d35d69b4685f74f395a6e52ae3aff88319ea99ff2cf563cf4b
 EBUILD nspr-4.10.7.ebuild 3765 SHA256 8f3f5b6813fd582ec1ae36610895ebc7d103730ca82d1224c60c30bed0247394 SHA512 8878c0c5341458f05d0e444c4782d37a5e02096b4236523a22b2298058d3c1bb828742e82117323af259396fecdb923b0f3a09b89e70690edd33525759d13e87 WHIRLPOOL 53366ae81dd522681f7e1ff7eb8848a34278c155514c3e1e161a2c10553f583555a6e54841547489bf068f35f5381f8e6dc841354a06ec4b6763a2b2ebb4570b
-MISC ChangeLog 35735 SHA256 575ce3b0e56daf4f1a5291a8e3329112c0990e5418f2c086f2e8ceb6ece11c8b SHA512 05494f0a433315fa07bb998e4c0e691b95316f4a2fed178edf2978015098e250a822d61edb2821b19f3937a8a6e1dd7ecab01c7e62c4edff390a7bd92757fc27 WHIRLPOOL d638b566af0824d2fc22611d332e2b0035cc4b3a76db6f3b8f9b8d7bc2bfe55a4167893b0097e39ec8756af75e777960dc6a3a12f9c5be54d8c93ddddd433156
+MISC ChangeLog 35925 SHA256 157bad1e0f45e1bb5feff3b95d33e3d3d3fa202cb2231236cba9a55349fe3077 SHA512 40d5257d8d1f8ff21ddfab4c5b7bb51b62cbf7563ae7250c6668c395e64ca213fe1d7a6aa0cf03cf3d179aec6123d90eaadd34893987a8c2802998ae8785497c WHIRLPOOL 11ff8d7c0594c4f8164291288c32900a35234e481474a97c732084a141298cfab30cb1348f573ecd224e0bedc4c2cd89249526b311034f31f9528705ea445913
 MISC metadata.xml 160 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b SHA512 ed6f709d55351c1b69f2b43ada124fcc2f8969f8c3867073bb0c68aa502f16247cbcd78734a891e4d1a509d334f6805e5267d2088cd03f3408a636ad9aedc2bb WHIRLPOOL e6bf1791838158287debcc3160dd075dcdf88bc1b33060aefe4687b4451108e55b6f8021fc36f07ab85c4e37a4225444cc2804cf40bd61ba49726bbf12fa4e38
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iKYEAREIAGYFAlQ+dDNfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDFGNDg1MzU4NjMzRTAyNzA3RkY0ODA1QzAz
-RUUwM0ExQ0U1RDU0RTgACgkQA+4Doc5dVOi/9wCfRQoByLp7iMrx3ry7K1cAO2RB
-e3AAn2C0VtyBBjqAGkwJN0WaIeUE/WT8
-=9MhU
+iQIcBAEBCAAGBQJUQAP7AAoJEPGu1DbS6WIAlcsP/25z2IL+7tRwYaa/RwsIX7tO
+iLrOm5JPUmDV2M/pCSIuv9s3swltQsJnId9Ex1Ubeib7u551uAlhh1GNsDvBFopU
+jAECpRS5TFjLpQVGZrI6pF5yeVzlMAf3ZvOkkFdeTp00g00xoYce7ZW4rG+h+0qj
+JettzFiRbi44VjRt1pvWhDw+xLhTtjRrc1mKQbtbaLbHOUAGNJZfTBft5QIsKdcM
+YfF036IM3NqnQYpc3p+RutXGqpJqjgaX35kg7AbUzmYCiQxB0RJcjmSWhtXomWX1
+lEnWOD1dBcmcra9450QQewNC7nrpatw/P2aVOw0crmj4J2KcYVug3yR/NU0QXwRB
+pImV2mEv5KhqRuOWtgOQWY/KVW+JFvLZeHHBGpUGZMzJ4+AQn/jF5yOzad4Ln+t+
+x0aMDp6jtBeniNL3+LgYQtOA78VEMrJs+epdpqe/PUgsgetJvwlMTaxgtWuXGS6X
+0yB0wNteJ1Mi2vJcv1XRWP/AQznlhCxx0RJdVxrWVqtTCcYLu7CAFnikPlNZ+RoS
+f+mpOlEfgNn6yNvUw03wo9RS7bCpUirLkpXwDW8UOtjXmjN9UVZUvyuEvp8rBBNi
+BlJBS87LaOzkcFexdzqUBJO1waURAcFfX4HinGyBCxAkzJ0G+yF/p9wGQtaqh0DY
+qUKomwsZ6pzjrdZNI4cO
+=HbDq
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/nspr/nspr-4.10.7-r1.ebuild b/dev-libs/nspr/nspr-4.10.7-r1.ebuild
new file mode 100644
index 000000000000..1fcd3ef5667d
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.10.7-r1.ebuild
@@ -0,0 +1,115 @@
+# 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.7-r1.ebuild,v 1.1 2014/10/16 17:44:25 vapier 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-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
+
+	# 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
+}