gentoo resync : 21.01.2018

2 files changed, 11 insertions, 17 deletions

diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index dc51dc1f530f..745568ada6fa 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -5,9 +5,9 @@ AUX nspr-4.8.4-darwin-install_name.patch 1046 BLAKE2B 1182149b03bd2c03fc4051bf98
 AUX nspr-4.8.9-link-flags.patch 931 BLAKE2B 6aa6aa1cf3b856a95b7baa20f58e9ed83b8b29ccce37bab39e10e0e76c433ae5c79839b5f7f9bdaf8b2475c8e3692ff4a57c246dfa4e1fed6866ab284826ee0d SHA512 0bb61dc09d287f1324749c983404e1f03fdf7014fbbd32cc5abe452fc2f32b90b759d8f18d964a61da044b5a7221f5ba274d94c93c07c8a7359e3c937e44b975
 AUX nspr-4.9.5_nspr_config.patch 251 BLAKE2B 65ae8b981e758e2955b7a3358f24b7b17dc1ef59f0e78f9fd9ddee740a4da3825bafea34f3900200b3f6edefed7d0797c194cb0339d4e36551615d599156108d SHA512 3f118b7142a19dcc7e26b348cec6029c78d585a57cc2bfc2ab7ca13d2ef953e576dab0ac044316e3165d0201bf27253afa732109f914da6f7a39f19facff8310
 DIST nspr-4.13.1.tar.gz 1136646 BLAKE2B 68a756f16f3bed7b75e26ce67b8216b06a61c71f669f29970ff6caec624d39a98496f22e643478b20d1bf2b3e753dd4a98aa5fc685929cbece365dda7302a6d0 SHA512 4755dce1a0fddbf4991f46328bdd15b6b07162792370953e16481be56952d4c02d11a83001b3600c80a919b1c45e99d6150ef2c24d407c86f430f9376fe6a694
-DIST nspr-4.16.tar.gz 1140681 BLAKE2B 68088ddcf14ad71e9f35cea024f754cc507444910a7cb55878e51f0fac086217c6703d1c96e48287b98a035a3b8f2a5309a036e58c4e98029804ee1fc978c933 SHA512 38cb8b26c2ee44063357a9484f1f6b24bab00a0d28a8f1644f64356205e7a407a1858d7a4d5cd2d6b62a39d3c0aea0cf2bddaa95fe61df272a633fe5fdee41b6
 DIST nspr-4.17.tar.gz 1141300 BLAKE2B 6c038836017c4b09b820f53ee209a8cc49dcd3c31de43bea33011ed26065cdebf506a310e40fb682c2f057a636e5bc623f6cd21cd3c903500d6a850ca8604c74 SHA512 3589f533b88d7dbbdee078c2a836bf7f7cb48466cb8861b6a42b05f12a5c6ce49426aa8fb3b153d548acd1c9ccf0376feea5649b48e3d72f3da1af5df3bed882
+DIST nspr-4.18.tar.gz 1139663 BLAKE2B 96c74e0b04f26ddb20e807912804c5be6f0fb19fef18da6e1827ef09a28142a1db747332ac3574c3759b34912d0ead26993c0208651d0e4d7800e23fd30ded39 SHA512 4ee9eb561f9c09f78681f8d262ffc3b3ec3395e181ce7b7c5d6c565885283180e5989b142d64799f9392ddf28bdc6a38d3ed6ca079fa107691fd5c758d4f7078
 EBUILD nspr-4.13.1.ebuild 3997 BLAKE2B 64e90ec2a3201d29a26356ec7b7de8ec672672675ccf45fd75128c8031c4614e9c9965d03b9e8eed6f89b4cd103f7b331db67609d9d713f24053a4ccd0ca52f6 SHA512 da816f07ad8fc9dd48c0bfd7708021e5185871207a0c6f9451fc20380719ff64ef9d61790f0714d63149ad730666530b2856fef35073a23d3c2a5109e0adbccc
-EBUILD nspr-4.16.ebuild 4008 BLAKE2B babc74c157ea600ccaac6b0d4cb67bf3c1116e461151d4dbbb4d321dbc1a22521e7d6a793aa007ef5df25ca5286583c1bc5357562f3541196f1b39bde669b87d SHA512 6188974b1a79e7fffebf9a46f777ad6713dca640514b57f6bd9e50ace2f93a53584339f89009c76a2363c7291e5cca589b5c2dac530b1a1c7ab611023985bf8f
 EBUILD nspr-4.17.ebuild 4008 BLAKE2B babc74c157ea600ccaac6b0d4cb67bf3c1116e461151d4dbbb4d321dbc1a22521e7d6a793aa007ef5df25ca5286583c1bc5357562f3541196f1b39bde669b87d SHA512 6188974b1a79e7fffebf9a46f777ad6713dca640514b57f6bd9e50ace2f93a53584339f89009c76a2363c7291e5cca589b5c2dac530b1a1c7ab611023985bf8f
+EBUILD nspr-4.18.ebuild 3860 BLAKE2B 279aef46f5bf56118ecec03f67b435d5e753520a52a2896ed4cfccc40bd8a39e14d316e8d4a17c0ed50099e1655fe945904eea1686f9d74b1976ad31b19d6fcf SHA512 02a36869d23567de14750cfe8348a68804218e94ec678719f631385aa7210469e91eb69514adec04cd7ec2905cf6f204726b52fa7d529c3b19d4931b1fd30ce1
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/dev-libs/nspr/nspr-4.16.ebuild b/dev-libs/nspr/nspr-4.18.ebuild
index 75a05840da0c..44af9aaaf0cc 100644
--- a/dev-libs/nspr/nspr-4.16.ebuild
+++ b/dev-libs/nspr/nspr-4.18.ebuild
@@ -16,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
 )
@@ -67,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
@@ -96,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() {
@@ -109,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
 }