Fix nssbits handling when cross-compiling.

Package-Manager: portage-2.2.0_alpha164/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 25 insertions, 21 deletions

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index 134f479313b6..92aadaac515f 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/nss
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.294 2013/02/26 10:17:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.295 2013/03/14 19:48:16 vapier Exp $
+
+  14 Mar 2013; Mike Frysinger <vapier@gentoo.org> nss-3.14.3.ebuild:
+  Fix nssbits handling when cross-compiling.
 
   26 Feb 2013; Agostino Sarubbo <ago@gentoo.org> nss-3.14.3.ebuild:
   Stable for alpha, wrt bug #455558
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index ad211cca47a7..9657b6cc0ac1 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX nss-3.12.11-CVE-2011-3640.patch 4608 SHA256 d48b2117c52a30c8ef659fc7222f501cce175ead29891ed8dceadd6f7d8bada4 SHA512 2aa77d5d6c33456ef4e57cc42eff490f9689e8a1f2a580228e0dac3530d60b30c989e3b36ec2621da30688dce31e86cb10644596bb0458ca69c1d97ae28e128d WHIRLPOOL 8b600cea13a4a5d8efbf99b6df6dc3d333344012c3783a0d858d4b95f908ca19f57902a355d02913a680709bb81fb7d6bec22cd9dfc37f60843a90e5844990a6
 AUX nss-3.12.4-solaris-gcc.patch 842 SHA256 cf2695f4d73ad9de267ffd2e47b2f8940bf56d94b51e66d1e36907b5d6368865 SHA512 ef07fd443bb1bcbf23dc7041c085ae028a7e30720610f266c1b941d1ab7fd0e5591355682e42de415650e8890629a26de25522a98177d4782ba565ea1bd98c1d WHIRLPOOL d1ab130cb39c18b5e87b8c7b40c4cea29c8a259ea4bcfa5c7a511cc7bba32a6b76fcb877f5bc56de0a27962154f7b9000f8646024260b823965f53997d5cf721
@@ -40,24 +40,24 @@ EBUILD nss-3.13.5.ebuild 6840 SHA256 3b183c22aba6a227f376fd0c96794caaf419eaf5198
 EBUILD nss-3.13.6.ebuild 6932 SHA256 48eadcec8edd1fd4adcaefd3cfa37b32d8432ccc8e6da2fb68f15b273816d2a4 SHA512 3488876c17ce6be98f574a4fbebfb00ab56894528b5a113eb038a474861333dcdffc47989dfa8442c42e2066516b5365973e4ff6041581411d36d99074100091 WHIRLPOOL 14837b1e890d150f3c541f08e63951d34715d671a71647f12b9fa62cfe4d4e05f7894bc4068c4a39bedb899cb56d688cbec73659571eed86a82ac2dea5eb089b
 EBUILD nss-3.14.1.ebuild 8038 SHA256 17ffe26dc530fad85720ef400cb10a0c1d08248ca9ae3d7689cd05f968ebf4cd SHA512 564c282018d228c9ea0408a8e8e43bbbd79bc7cc77dd02db9cf2b59b1b36ba501ba6f8242c8c5a25a78714cfe7ffc20ed639cde08ae99f428be7a6c81fd41b00 WHIRLPOOL 578cbe379ebe5cf9f163c858144a4ccf2dd1bd36c390a9b128a61eaab8bd609536fe522d098cb76b6fb54c94124d22053694e1d5e0a7f608e51e981d27cf3457
 EBUILD nss-3.14.2.ebuild 8103 SHA256 684afb3156cdd95218408e5c75798a10c0308bd07bd4ae6c7e34562b15854e33 SHA512 5c9e8a2a57e75f6ad74476427ece3297b37102fb60164729a7f741a9e6ef381b66d6a4e1270a054dfe6dd0507ac36a09f9561fb1a60a3daf2c3f56223d3339cc WHIRLPOOL 09e3dc2099be0f8b2510d930471be432b9dff988d2e61f1d4c80329a73b9783557a2cc53c1a7ae05be6426449507834df4ebafb65d8216f0268bf20986594141
-EBUILD nss-3.14.3.ebuild 8165 SHA256 2b7cc31915a6f1ca2530f8f34c5f0167cee5b0bb6d483663cbfc7b19606e86ab SHA512 5c86315705893d5ebd53f02cc95c1f79c4b2f4c044b687843323f0510c078582e63b9f91b695480d4d85d1b424bebc640285df3c00851f1430c128136ac42ec8 WHIRLPOOL fdf46e8095d88d368b53eccc8bb5aa1d0a04c643bbe29dc3f06ae6ee9f6b111941bc3da9a4b46f56c72b57b43731f891f674d3336531c33ee0c15741be2f3eeb
+EBUILD nss-3.14.3.ebuild 8229 SHA256 0b516e6c8b362ba66c955d29b5110171e055a282d1a21b86c4c06efc9e63fda1 SHA512 32b24927d3d9eb168f0cdfd2d2cf9961a226f837e4837cc4a78356eb1142cae76d1a270463e83c9f7f0fc18e52e1e2babcd97c59aaf242031271be96111aa632 WHIRLPOOL 4d154e5d7221c85ffb5a49daf800b4b40e83a76635bc7c3117f6d3e9a63f0279d49c22d8b64419945517e392b8721752766a8c56fa8098df2df9d5471cd96c60
 EBUILD nss-3.14.ebuild 6924 SHA256 49852b0d512544ecb4e81101ffc72fb26bd450659baa1e76de296aa882c2f42e SHA512 01617e0045ce500ee093b3bbcba2c9599fef3a97aff19667ad1f6ee824d479f953f23717ebb542d22a759a533c0319abe88442d4fa2fd51f31f6cfb931e504e9 WHIRLPOOL bc9b93765b5f4c2398b656fef5c57a96e11cae0ff394b4c0c115b9e57b08c61c89b7ba93d77a94121a4077eac67dc048b5503f0cc9e18e2ca0662b873f2e237a
-MISC ChangeLog 36823 SHA256 6a13898d967bd64593df1a7bac2f232a288c09289254a6be4a0d96bc5bb5ceca SHA512 58fe66f7ec96cd8f3acde96484490e480a5e4263544e216cf0cc86286548994d0d237905db16c5701b38a7d886f75cfcb1361cbee5778252a7298ddbdc3b29c6 WHIRLPOOL 282047bb648e8395e52b35b85f2fefee90fd1e4696feb27b33ec6d1c73c45e0bcda2b294c64c473b21291788f5c477f073aee95703c5926915fe4790ae73dabc
+MISC ChangeLog 36941 SHA256 3c68205597a58684f4a044d52bf0ab563fba69408f36f5857b1135c15963b341 SHA512 49fd62fa6cf43fc0d27c7aa927c441a7d0a3e81ff939f2d9daf456915494991d67ae52775a08c25e80731f9219ecea2e4212faba2d8111641260eb1a5f526704 WHIRLPOOL 1be61d7582bd28874384601401286dc83e8d9d2cbafcc1b97c341260e7eba9e10a22a74c9f9e2c41c0ddda106be6fd0451c3b14e5a3dfd0e825408e4a11ed174
 MISC metadata.xml 245 SHA256 58443b11f9dff75b5d4391f03dbafd90305a0ec8f046f8f0068fb95777c01bd4 SHA512 3564c5476cd817e6ee8276a450cf646c8df81bfb90455345b8cd6f2cdd6c62b07cbf19f3c1abbcf1a02f9f91a034807303b5e6765df24404375b79fe13a646bd WHIRLPOOL 64c44be7cbb44e7707ef243d989222f3e498b4d23f6e1a875ac481d6577f54444c9dd575e92330d6d018c8f1084858a417eed59e650b7119842c7624a01d7462
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRLIskAAoJELp701BxlEWf42kQAIKx0Pu8LX+JIlo5AZBXTcrP
-t2YB75TArwl1llrLmhLBJrPJVdNSZJlBkRHgSjXC6ARaR1mpX6cEmE0nlgiXcM/t
-A2bhq93g4644wNfb8ctD1SxYdSiYYFMfalmbwjP4fg0JGJxFgYLNakd5zrP5BunL
-5Wkg7q/FHTHcgiE6zNgcKx85VId1WeihcQ/GYD3DY+d7NJHB/NG6PpMdyGL6Mw0J
-TZ2jAhB1IdfTZNDVgzLNgc7eLHtFI1WhGw+t3zRjFUC+KKwP7VaHqddA1/eGUEng
-pGUXRm+rewpSDvZMYX5Ma0xvN/8Jj4A6t2tiRL16vq8GkcWbKlpieEIY7nlGyUGn
-aJ2KbYPYaPdtUW1IB82HHLz6gZl08WfQLDwy8K0vTgeciNkXwJworR3fHISaWO5R
-LBugfXr1moZ3TcDa5Dd65Q8ztl/3US69qcUET2svcbRMACIT6REdlSWw18NGeP3G
-bBofoKnbBcxM1B7ZmIxubAJimjvHl0H/wEEw3H5XMkLyL95KR4MKLy989beMDbAy
-DwQmcZbr0yUdTj7EtKqPKCqjbx/g4EmTlFNTSY4v+1OqIX7Dd9PIPq37HT0EqPmh
-FaRYBYcJ6f5zhRKUcNgQ5Lx1ULpyq5kFfm8HATgYkBmj34gmxx/ccOaw4ucttx3o
-kzHUj9NLq3a8Qrf/Swez
-=yEwg
+iQIcBAEBCAAGBQJRQio3AAoJELEHsLL7fEFWYiMP/RI8HXj2IEfkEuTLxH42z7du
+JyW0STAXl/puxOytnT2RgMb1Bnc4pppzFSItxweDvWu8nC46b09jhrky2mGRYDTo
+7RgfdzNTnhapL7ESdAsECnOJMILVaDJ5lgMWsBViM8zhiM4zLp6j1UImx5IsC9vh
+NPKO8+lF3y4mnSPT3PRtwjLaXobiUqP6XVcxxTx4qbr4k+njQEEqhWRWhDdLwXbf
+IFRKexVtH8pI76JU7sHcscG5jFKqz3TdhWMQcEtkuP+XFiGZH/7IojXyJ9ODvXRG
+YPTdJngE5ofYiVYI3l8CMJEXJ4UssD2sZ3o87aEdQc59LjZmoYxhJMetRuhqEEbi
+wxD48tZyNgrazENWQDm5N6pqx/1idSUzrftXhGi6738x8Sj1d4U+L3h0+jUspRTs
+rkENqkPcw0ShlZpvz9wugU5At3ixuB3PqU61NW9PfxAta5sKUxv7WR9fltNmvZZP
+G4RUa1UvdKy60hSF9O19tn5VBTcZgL84bm0qnEGWyHr0yOC/xuVIgXW209Jsiz4b
+JmJi8y5K1cJENfkYaQ1rEYe28nZ07j0s4ZPLTS7J1wVhkLshQ+7W+RxvIEBn7ut8
+8Q4T7Mr1UNKUeQTTzojNvWp/dzRhb8L85PqQwwaIeec7ypmxO2A51N5LoNuVqZ7z
+ux6w6qNMl6T239yVRNHN
+=bDyU
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/nss/nss-3.14.3.ebuild b/dev-libs/nss/nss-3.14.3.ebuild
index 84471e4d0a87..36f77500248d 100644
--- a/dev-libs/nss/nss-3.14.3.ebuild
+++ b/dev-libs/nss/nss-3.14.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.14.3.ebuild,v 1.10 2013/02/26 10:17:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.14.3.ebuild,v 1.11 2013/03/14 19:48:16 vapier Exp $
 
 EAPI=3
 inherit eutils flag-o-matic multilib toolchain-funcs
@@ -88,8 +88,9 @@ nssarch() {
 }
 
 nssbits() {
+	local cc="${1}CC" cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
 	echo > "${T}"/test.c || die
-	${!1} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
+	${!cc} ${!cppflags} ${!cflags} -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;;
@@ -107,7 +108,7 @@ src_compile() {
 		AR="${AR} rc \$@"
 		RANLIB="${RANLIB}"
 		OPTIMIZER=
-		$(nssbits CC)
+		$(nssbits)
 	)
 
 	# Take care of nspr settings #436216
@@ -140,7 +141,7 @@ src_compile() {
 	XCFLAGS="${BUILD_CFLAGS}" \
 	emake -j1 -C mozilla/security/coreconf \
 		CC="${BUILD_CC}" \
-		$(nssbits BUILD_CC) \
+		$(nssbits BUILD_) \
 		|| die
 	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )