version bump, compatibility improvements on gx86-multilib port, dropped old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

3 files changed, 40 insertions, 33 deletions

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index 89311bb56055..20562a5a3b0a 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/nss
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.365 2014/06/19 03:17:50 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.366 2014/07/03 19:43:09 axs Exp $
+
+*nss-3.16.1 (03 Jul 2014)
+
+  03 Jul 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org> +nss-3.16.1.ebuild,
+  -nss-3.16-r1.ebuild:
+  version bump, compatibility improvements on gx86-multilib port, dropped old
 
   19 Jun 2014; Alexandre Rostovtsev <tetromino@gentoo.org> nss-3.16-r1.ebuild:
   Update emul-linux-x86-baselibs blocker revision.
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 73072bf1142e..f9f8ce7101fb 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -10,22 +10,19 @@ DIST nss-3.14.1-add_spi+cacerts_ca_certs.patch 25018 SHA256 82ca25982828fd7153ad
 DIST nss-3.15.4-pem-support-20140109.patch.xz 28400 SHA256 bcdd3decd9a7e33e240af899ead32fb92c9bf623bc99fc4b60ca4e08bcf92b82 SHA512 59066b73357ae96d3f18749b8f3bd07548d8f5e6a7b8b1f2bf227ac95ee6d3ad8ccfa60471de41f7b73f37db8e80e948c34109c69e96e958be094140e026504e WHIRLPOOL b08f463a6f699957737f3d7dda8e25e15658097d8a538c2596b94c55777afdf6526ab041e617c54ae709bdce4f1acc2aa19da619eb98e128a1d0cd0dc1de230d
 DIST nss-3.15.4.tar.gz 6366271 SHA256 14d69a0735c5af6b3cc12591f7ebf272203e889f09104182148091d0af682d7c SHA512 21ca81b636f7e230715556bc874d5c1c4f370c6fe57a39cb12fa349d0414a88e13aa931060613a793f7267868e026eaf167cbab5f2a5e8759e7a4b176d97fc6a WHIRLPOOL 7ebf8a60e7db5ee8e90137430f1b97d591fc11d02771aac027a1ff702f17ff74a8c78f4f77fb92aab1d10d6e0ff63d2e72e4bbf3d489ba60d778cb02868c2ec6
 DIST nss-3.15.5.tar.gz 6367893 SHA256 1442c85624b7de74c7745132a65aa0de47d280c4f01f293d111bc0b6d8271f43 SHA512 4db27ea98f17f1a5bc6f513455497945fc35957f573b3ac7e730b166fbe0e8fd741c188187c578faf361d969db63d83ff8ccf15ac2b8ca72a367f33a018695ca WHIRLPOOL c3c687ac53dca571d1c45bdf4a80e192ca58da07e06ef56de7ac9736480c97689dd12d14351860764b70a1d823092a1ddbc471328c4bae4a899edd0e331c8aee
+DIST nss-3.16.1.tar.gz 6409506 SHA256 fab750f7d34c09cf34df25da1924a9a8f4c7f1768e2d456f8be767ecbbe84a6e SHA512 ea70dd417d6491e2a2a43ce2576e16511c3c78b4683af61ee80458c08768045eeb2b5bc410e536e3c7ab3200b3e80008abb5c5b40f0eb93418b8f2813cba3b46 WHIRLPOOL 46c37623655a426a328e47197b15d945717ad24828008d65fee0027c7ae48fdfd1aef7e1a7e3adbe2f6e851fe462496a854092b4d7809d40b9474c66156f159b
 DIST nss-3.16.tar.gz 6378110 SHA256 2bb4faa200962caacf0454f1e870e74aa9a543809e5c440f7978bcce58e0bfe8 SHA512 e3dcde8213f7f131fe2f714ff2f45c6d7b9b2167e51dbf0e1a750cc4f83d9fa35e69408850de6600f55fbc9e26b29dc344548cb64849d6e3252476eadd7ee57f WHIRLPOOL d30b53ec36cacff9756b43780d904e32760cd5d0b75f1888b6fb80e0a87ce828f4e6189de63880ddce90bdf5d90123ff7e9fdf600f4df02ce59702898f08c11e
 DIST nss-pem-3ade37c5c4ca5a6094e3f4b2e4591405db1867dd.tar.bz2 28849 SHA256 0388cb01d6158fad92b6ee13241531c7dba66a4be64e85160ded212c3febadc4 SHA512 6994bd7435ad0cff9f5aed509c5f7ea438a6829188bea94d57020e8df6d75631b289363b6f68c3c96da67c958af967c624147d3604b734d8f0b57688f74e7c95 WHIRLPOOL a168e137981f4bc4cc6735bcc234b3fe14ea0cc91768926cdaae3f124ba1dfcd06be029c3805ded20df600c8655bb2d97beb69a0c6b7f2441e7ee4c651cd7868
 EBUILD nss-3.15.4.ebuild 7497 SHA256 9e9f714c0dad52e14b147d272ceff71376d8b45725e7563b1af84afb49768209 SHA512 0b95499c659774c86ea9ad66ead30d942b8c656339b0cc4cb52aae12f6826b3996d33b9424b0a5e7bc54c08af776151dfb5f8e5ddcb4be934eb8245cb679b7dc WHIRLPOOL df8a3c6f7fd45f92e5430ec27ed2ff240e59113d52ea1125689f9eee9d75b7fbdbb50a41f3e65ad0cd6c459aea109764a5465a0aa5612ca3be08bd6ddf1b1c65
 EBUILD nss-3.15.5.ebuild 7822 SHA256 d8714ec8b486583c7aae0c5605cc6e89f96a1e014343668ae2fcd2a2374695a3 SHA512 1aa2aecacf610920fbb0315ea307d6cb2e907949e6771922d5ddc04857a3e7fca9c5c052d74283b83a13f077d5f640c0527801ac0a704d107a8386f4ab31af02 WHIRLPOOL 9c36b00cf81e4994984e55a21f686848d8808ddbfa3fc2f7d8c766c185472895525b83eed63a1337169398b88dc8ec8e074420872649a96de27923ea1175ba0b
-EBUILD nss-3.16-r1.ebuild 8924 SHA256 1f7be18bc1fc693910f001651a861d611708eee0051059f139ff3c05f0feac66 SHA512 82ff515f6092c8d4eefb678f785b474b16f2e9d2dd05c70ae6b0f4b6ba2d957b4d25eb227be2b83e64db8463920b97b08f77dd628e5d272032f6c09417b4480b WHIRLPOOL e0d574f7ae10c13b97cda0139812e4c8db6822c3ea1e86b077f983f3f8e9e471bd9b8abd3e6f401e9b0af872cf17fcebfa7c706696f15e850995e78790b81abd
+EBUILD nss-3.16.1.ebuild 8904 SHA256 4aeefb5b3c254f02a5f3d5ff1ca9957894c49e0b322a1fce56a1efefd8e0104a SHA512 fc0d0a487338889f76578e70d2d3f6bbf5c7bea025a6534a21c27ac72fb0e92c57869d446ec7445a8019eb03bfb65c4e694f955b1f18aa5691e5067e03b9f8db WHIRLPOOL c426be50b6786f0a190782769a98aedd50e99a5fbf0c7fc0aec3fb235c49d6ca0de12e8dba4d7115a0032649269cc453c116e7da0a87348a1e4830aae78b73cb
 EBUILD nss-3.16.ebuild 7724 SHA256 2fa141917343fc9732c6c4e4bfb2d90be9dad5aefa5440cb2b40ac65277b1eeb SHA512 74aedaace555127952715669d110428b07da9d8deafe14982196b9e25554c9141da1e750124e3c682c36134ac6a4f9437f91335c851bd8523c38b58bd80823b7 WHIRLPOOL 1a8a12598682c55b5b9b3a3e5667c17b9333b1ab3820e8934c1736f56cc8a9a2607ffcce5ec58dcd2b88335ffc5afe601161628af42ad788ef5d33324520ea33
-MISC ChangeLog 46447 SHA256 c1b14280a90609487c1e0b37e9868d3dc322d019eeba589349ad87a16016c824 SHA512 976b1d4ef7eb257725e481a32611b3a69594bdcae74dafa0c62c311264ae1c217329c727dd0ce83d70268f474ace1a0d9d670fc553219bcb01c3ed6e08c3c2cf WHIRLPOOL 972d999abcbad46ee261aab3a5763421837ee20b1d127241885fbdb9eb6964c90fc88a44c90d0c05fa04fad94f8bbb168c656c8c2d21c8fe6871b1f92e58f373
+MISC ChangeLog 46647 SHA256 e756402012787cb342ac3677dadf0e44c7f49d4e2b1fc53bcb2845872a70a059 SHA512 7cbaecf4c7b1b202c6738d228dbe36139977eced7a8433891725bf33a0f01164e588a6a2296cfb80a73b7ac7f79742fae059ceae236cc873d50efd8f8367b9c6 WHIRLPOOL 9683ba8424302d3f8a5db6c54aabdcec9beff16bde2a35caa30d85665e4b9ff5c4af069c3dbdfc36d5c71e632cea18b8c3257b5af1555c8a75510040d631a334
 MISC metadata.xml 545 SHA256 d3a7dfb4b9f063b343b42b3002d3722ee44aea8a47154fa2158533aa94a5a258 SHA512 4da88948d5b637093646300bab0105c642968b2c9693939be6b75b5d24f02bd9b2cc5f13ae18594b9b00fa8dfe02e5d6959c13021124cd027007649787aec750 WHIRLPOOL 0879625ef92b2db563e5a1b434176bab08846e815fbf0c963a23b3ca228b3525dc80f6e7940a303fc1dd47403416c67811ed09d00f29a431abc4979865b67ff9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTolYcAAoJEJ0WA1zPCt1h9BkIAKO1PN7b94ByPC3bepYqdxp7
-GI/SEaWkRPoMD/wt2lfz9QRDdNV7ZDn7JRWXaOhXLocLOlqdE0ftZsEfbX8sGRqo
-txsdgwlMgWuy7GOKiEsJcl6VltdyxLf3W0Fl884Aa5V9J42n8IE35D0Sa+2Mb4E7
-tY0TrRL4cjlMn8LDeEm2RiXFDxJXAKWLV3nTlNcde+ytc5Q9HfsT53EDawvOUWYv
-RaxTE8lyEgcYUSLwm+D7vn1o1D7jwg/HNC4xzN/JFsjG0T5HE7tRV7yMcfFJg3x6
-cIfIEUH2TQk2l11rgbKJpc1ktwlcuOWgj3nfNsJJFa7hcUYrdnvgmzWThfY6zX8=
-=iMef
+iF4EAREIAAYFAlO1skwACgkQ2ugaI38ACPAtcQD9FHzdBTtqgOC+CKfWsMC7PpUc
+G4/Bh6vhTVeU+QQVWfYA/RtapAcbollYOH0cS+5Kn9ElIeST6QAfyLU3yBd2pIQS
+=wL32
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/nss/nss-3.16-r1.ebuild b/dev-libs/nss/nss-3.16.1.ebuild
index 0817cd9df29e..2a8822d057d5 100644
--- a/dev-libs/nss/nss-3.16-r1.ebuild
+++ b/dev-libs/nss/nss-3.16.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.16-r1.ebuild,v 1.4 2014/06/19 03:17:50 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.16.1.ebuild,v 1.1 2014/07/03 19:43:09 axs Exp $
 
 EAPI=5
 inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
@@ -108,41 +108,45 @@ nssarch() {
 }
 
 nssbits() {
-	# use ABI first, this will work for most cases
-	case "${ABI}" in
-		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
-		n32) echo USE_N32=1;;
-		x32) echo USE_X32=1;;
-		s390x|*64) echo USE_64=1;;
-		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*) echo USE_X32=1;;
-				*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
-				*32-bit*|*ppc*|*i386*) ;;
-				*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
-			esac ;;
-		*) ;;
+	local cc="${1}CC" cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	echo > "${T}"/test.c || die
+	${!cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}"/${cc}-test.o || die
+	case $(file "${T}"/${cc}-test.o) in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} is 64bits or 32bits, disable distcc if you're using it, please";;
 	esac
 }
 
 multilib_src_compile() {
 	tc-export AR RANLIB {BUILD_,}{CC,PKG_CONFIG}
+
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		default) mybits=$(nssbits);;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
 	local makeargs=(
 		CC="${CC}"
 		AR="${AR} rc \$@"
 		RANLIB="${RANLIB}"
 		OPTIMIZER=
-		$(nssbits)
+		${mybits}
 	)
 
 	# Take care of nspr settings #436216
 	local myCPPFLAGS="${CPPFLAGS} $(${PKG_CONFIG} nspr --cflags)"
 	local myLDFLAGS="${LDFLAGS} $(${PKG_CONFIG} nspr --libs-only-L)"
 	unset NSPR_INCLUDE_DIR
-	#export NSPR_LIB_DIR=${T}/fake-dir-${ABI} - do this further down now
 
 	# Do not let `uname` be used.
 	if use kernel_linux ; then
@@ -165,10 +169,10 @@ multilib_src_compile() {
 	# Build the host tools first.
 	LDFLAGS="${BUILD_LDFLAGS}" \
 	XCFLAGS="${BUILD_CFLAGS}" \
-	NSPR_LIB_DIR="${T}/${ABI}-fake-dir" \
+	NSPR_LIB_DIR="${T}/fake-dir" \
 	emake -j1 -C coreconf \
 		CC="${BUILD_CC}" \
-		$(nssbits BUILD_)
+		${buildbits:-${mybits}}
 	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
 
 	# Then build the target tools.