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

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

commit:     b5f82677c013117097c55961c6deb38f95ff3121
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 20 10:06:33 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jan 20 10:06:33 2018 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=b5f82677

dev-libs/nss: Bump to version 3.35

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

 dev-libs/nss/Manifest                             | 21 ++++++++++++++++++++-
 dev-libs/nss/{nss-3.33.ebuild => nss-3.35.ebuild} | 19 ++++++++-----------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index d279c70..de11c45 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,3 +1,22 @@
-DIST nss-3.33.tar.gz 9578033 SHA256 98f0dabd36408e83dd3a11727336cc3cdfee4cbdd9aede2b2831eb2389c284e4 SHA512 82adc0b73805ba5e73b9bf350fffa383a8b4396c05f49edb360a53319b4ad26d928a135bee245f9da009d162129db4441a96ef05346dadac20922b21284468b0 WHIRLPOOL c11129bce97990a41a3118e62d79481fbd38cad51356a6b6c1b0af7efe2f27b3d5d51a8e987287c1cdff77ccee14a3e96d5bbb76e92f9a81b2f50988de250dea
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+DIST nss-3.35.tar.gz 9620041 SHA256 f4127de09bede39f5fd0f789d33c3504c5d261e69ea03022d46b319b3e32f6fa SHA512 8d466f4602427d278b6aa28af0e6bdb99326fc40c94ac6d517d1cbe7ce6b9332dadba52ea092762fac2fd6e72f17cb880cf81e1cf86bf6b4f7913a755419626d WHIRLPOOL 8781160e78d2e479c8d7bc0c3249159dc850849dc16171c5966845729bac0a2cf041cc61dfba0a7c59d04fcac6cbe42e423c0555ab1ef1fd6a55e6ce7286fcaf
 DIST nss-cacert-class1-class3.patch 22950 SHA256 6bba29cee34276e2ca6436dabedfeba2b61fb46668c5d5ceabf0c871574649bf SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0 WHIRLPOOL 1246223b01292604e5609bb9c580f092dc5937bf8c98f6891b099e8bab960e03612b6617e30a55d6ff8817d88f190e03812fe8f89f84f25c20970493dc2f7700
 DIST nss-pem-20160329.tar.xz 27732 SHA256 6c13c342e7a9fe34b585556099beca33c3078b3df3e11b72827fb70232ac1443 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2 WHIRLPOOL 16fb714fab29e44f7a15fa1928a0f4c1a770f0847b8da97816e29a3b124dee782cffe2357648c445f4d29081f349571b6fffe48c5bc725c7c2dde491f3e0e836
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCgAdFiEEWCOBmo8i7LhvVmNAVx3S0DQ8YDkFAlpjFKkACgkQVx3S0DQ8
+YDkkshAAlYnFPR4/oco+A2lZEWGhZKgmSkPF24+zriukRJ3+bMKvu27A5VpuITjB
+gRNYH9C6Nn5TBC4iaCepi+krCmpFUk8RnCwxGdtT/44Onn9jpLhMsyFr12agi64d
+KRZoDSsHtfo4spVFmCcu3R2Hi4I7HCbeSiLkMS/7ywZdmRkA7H4Gv/84eOSrSQiV
+hKQY1Quk6HFHvY0QWO/N5OqfZV737FvZyzNi49fnW0T3zm3IKp5Y1DevunNo0YKW
+zn6Hi0TcE6ceSoSvO7PkOjW7eYJhFBg1rkE+XfMYPEVT2joM6V87ikC/6+UZDRkL
+xu3NWP9gvMh04jNIs+R5P3BygiccIycWpBJwH/BNVuiYbjIjzJXEbNSnb228Wx/d
+A7t5DmiN7QdZ0wfJ2iimxtQ42KWgP+jp/LGAUZVscv80zlVOCe8JjTICdOs5yrkO
+ICRN7r2LeBFOQeYCH0+cAaBEfTDJ7fpg1YUnd958u1Gt2rdmRls7KBRYXRYIrbD/
+/64yjPcJQUZC8/wfXWh/USzy9slcssfoqPy3cGvcwJPZ1qKnAwskngGMVSdxh19F
+pzM1+1rQ6K/58Fi1BjpyRNrQMJnCoCxP0t3XcYJ4P9cdFuIRxvIvVc9jLYLBjMMO
+JUAEN98IrXCoEfd5nfJ9/AhIIWfwDS65SOEDKpu4CL79NDT4ctw=
+=QmXB
+-----END PGP SIGNATURE-----

diff --git a/dev-libs/nss/nss-3.33.ebuild b/dev-libs/nss/nss-3.35.ebuild
similarity index 93%
rename from dev-libs/nss/nss-3.33.ebuild
rename to dev-libs/nss/nss-3.35.ebuild
index 2932e76..d21c818 100644
--- a/dev-libs/nss/nss-3.33.ebuild
+++ b/dev-libs/nss/nss-3.35.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,10 +28,7 @@ DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
 	${CDEPEND}"
 RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
 	${CDEPEND}
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r12
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+"
 
 RESTRICT="test"
 
@@ -255,23 +252,23 @@ multilib_src_install() {
 	pushd dist >/dev/null || die
 
 	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	cp -L */lib/*$(get_libname) "${ED%/}"/usr/$(get_libdir) || die "copying shared libs failed"
 	local i
 	for i in crmf freebl nssb nssckfw ; do
-		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+		cp -L */lib/lib${i}.a "${ED%/}"/usr/$(get_libdir) || die "copying libs failed"
 	done
 
 	# Install nss-config and pkgconfig file
 	dodir /usr/bin
-	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	cp -L */bin/nss-config "${ED%/}"/usr/bin || die
 	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+	cp -L */lib/pkgconfig/nss.pc "${ED%/}"/usr/$(get_libdir)/pkgconfig || die
 
 	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
 	# bug 517266
 	sed 	-e 's#Libs:#Libs: -lfreebl#' \
 		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		*/lib/pkgconfig/nss.pc >"${ED%/}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
 		|| die "could not create nss-softokn.pc"
 
 	# all the include files
@@ -313,7 +310,7 @@ multilib_src_install() {
 	# shlibsign after prelink.
 	dodir /etc/prelink.conf.d
 	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
-		> "${ED}"/etc/prelink.conf.d/nss.conf
+		> "${ED%/}"/etc/prelink.conf.d/nss.conf
 }
 
 pkg_postinst() {