[gentoo-commits] proj/mozilla:master commit in: dev-libs/nspr/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     9bb904f5cd09aa27e08f8643e2a63d702001d793
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 20 10:05:35 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jan 20 10:05:35 2018 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=9bb904f5

dev-libs/nspr: Bump to version 4.18

Package-Manager: Portage-2.3.19, Repoman-2.3.6
Manifest-Sign-Key: 0x981CA6FC

 dev-libs/nspr/Manifest                             | 21 ++++++++++++++++-
 .../nspr/{nspr-4.17.ebuild => nspr-4.18.ebuild}    | 27 ++++++++--------------
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index ab5402e..cd71012 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1 +1,20 @@
-DIST nspr-4.17.tar.gz 1141300 SHA256 590a0aea29412ae22d7728038c21ef2ab42646e48172a47d2e4bb782846d1095 SHA512 3589f533b88d7dbbdee078c2a836bf7f7cb48466cb8861b6a42b05f12a5c6ce49426aa8fb3b153d548acd1c9ccf0376feea5649b48e3d72f3da1af5df3bed882 WHIRLPOOL c1187402ccba614d1c25a9ef6cb76d1edc8d2e1b4a51f636304b351b6eef0208b26e69f42f4fd20213f3d5ce507b4c7aae37687ab767a2b309432012fcc96e58
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+DIST nspr-4.18.tar.gz 1139663 SHA256 b89657c09bf88707d06ac238b8930d3ae08de68cb3edccfdc2e3dc97f9c8fb34 SHA512 4ee9eb561f9c09f78681f8d262ffc3b3ec3395e181ce7b7c5d6c565885283180e5989b142d64799f9392ddf28bdc6a38d3ed6ca079fa107691fd5c758d4f7078 WHIRLPOOL 1d962efe2d7b7d051e03fc3ca7fa68eee4c52fa1ba8736750cbfe0c36708575cd7eaf784011819f0ac7cebfeeb886bea8b1bad231317ac77eba8486ba42d9878
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCgAdFiEEWCOBmo8i7LhvVmNAVx3S0DQ8YDkFAlpjFG8ACgkQVx3S0DQ8
+YDlppxAAj7iVNTZ+TJX15QS7NnFoWmtgjqc/2ygghMsE0FIlxFw5KB9N3BFFAKW5
+8b+OzWvK3qJDoZtGH6g5OXNVW0xw+Bc8kxobdnFqoUT91tvoeG5n+bZbKpBd1SAt
+k+EaeJ+gMkxwSUpg3opxYcLeqIlgLSpDdqqef84WPG4uJYIClAQPQNT91z6zVqau
+lKwR3FyX84YfRrgOMCONZndzB+VJnSGYD+fM2r1YX4dGs6jVWP8H98C8zSDRtoLP
+edSJsMR/Kel00xOf9TSoZpoGGqQ4Ps+RWosvtyVuOpplSRfeu+crqQEhcgUUSDsl
+JsWjqyncCsbhgNs1OWiN8q/U/+UyYyjBxqMXtanGIMVQ6xqigm2d9LteRceZw32E
+0FXEvgxcxFnoF1cGSdgq5vtGLFrbGvR2tdlz0KmjQpvMPl3ndOYp2yPvlGK0WdFQ
+l+tEGh2MB/8DdCqZcOfnXdVwghNeErcmmNzRgV2a1zI4xgtbc2ZotCZL7B6VoZNg
+VddvgNpyfBRKWkI8qrBq7oxZeR3cSACxVU7i8xhUTu7w6TiJT9vukHga1lnxvGuS
+jDHqmRgnvysP8IW44f9TtH5YDLf1JHZ1oiu2LmEOpEEGxSYfdxkKZfhvptwR12q6
+CSzQk4zRbEECFD3d1kCJNn08GfUYhpKBn6EWSS9CfOVLmqCEhic=
+=zKak
+-----END PGP SIGNATURE-----

diff --git a/dev-libs/nspr/nspr-4.17.ebuild b/dev-libs/nspr/nspr-4.18.ebuild
similarity index 87%
rename from dev-libs/nspr/nspr-4.17.ebuild
rename to dev-libs/nspr/nspr-4.18.ebuild
index 56daac7..44af9aa 100644
--- a/dev-libs/nspr/nspr-4.17.ebuild
+++ b/dev-libs/nspr/nspr-4.18.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-WANT_AUTOCONF="2.5"
 
 inherit autotools eutils multilib toolchain-funcs versionator multilib-minimal
 
@@ -17,12 +16,6 @@ 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
 )
@@ -68,7 +61,11 @@ multilib_src_configure() {
 		&& export CROSS_COMPILE=1 \
 		|| unset CROSS_COMPILE
 
-	local myconf=()
+	local myconf=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		$(use_enable debug)
+		$(use_enable !debug optimize)
+	)
 
 	# The configure has some fancy --enable-{{n,x}32,64bit} switches
 	# that trigger some code conditional to platform & arch. This really
@@ -97,11 +94,7 @@ multilib_src_configure() {
 	# 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[@]}"
+	econf "${myconf[@]}"
 }
 
 multilib_src_install() {
@@ -110,16 +103,16 @@ multilib_src_install() {
 	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."
+	rm "${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
+	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
+	rm "${ED%/}"/usr/bin/compile-et.pl || die
 }