Misc bug fixes, http://tinyurl.com/mj9ntpy

Package-Manager: portage-2.1.12.6/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4D088B4

6 files changed, 591 insertions, 16 deletions

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index 9f3c8432f3b7..15d62ac3ab1a 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,14 @@
 # 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.299 2013/06/09 22:57:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.300 2013/06/19 01:18:35 anarchy Exp $
+
+*nss-3.15 (19 Jun 2013)
+
+  19 Jun 2013; Jory A. Pratt <anarchy@gentoo.org>
+  +files/nss-3.15-gentoo-fixup-warnings.patch,
+  +files/nss-3.15-gentoo-fixups.patch, +files/nss-3.15-x32.patch,
+  +nss-3.15.ebuild:
+  Misc bug fixes, http://tinyurl.com/mj9ntpy
 
   09 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
   Add upstream CPE tag (security info) from ChromiumOS.
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 775bdacf9331..390139561a41 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -14,6 +14,9 @@ AUX nss-3.14.2-solaris-gcc.patch 659 SHA256 d6ac2638602fcf5d73020efb616c2c16d577
 AUX nss-3.14.2-sqlite.patch 638 SHA256 3549a58a40bf6b023d205e918ee006a320cb90811582994d4d16c7bdb80e9c3b SHA512 2a8c11208f861722b44129471758b9e2518a877ce093fdc333f009abe5385384cbdbe77aa5a9457e74874c00090d2c2480cb6df7bb9989830b0165659dc66321 WHIRLPOOL 832d31fba571bcb6b8c003f64041e5ee268aa4c0396cc43f4cddcd1b7ff7afee0f27bb06105bacfba087cf7e19110881771f7203eeebcd2dbbd843d4207cc3f6
 AUX nss-3.14.2-x32.patch 1941 SHA256 396e2609aafc24d2a51382f74e2124f3eac615d9ae33a848b1a1cffa2789e1e9 SHA512 2b056701ee0d3af16d93ed965d60a55e46cce2a60c946b922f75461c91284242d32746358637292b0e7cf0013ce906b69c04545e23ca26500ef4028f00b49fe8 WHIRLPOOL 03f49c9547e47068e1ff894fec74163b7fadf6ff7e8c2a3ca0ed5b2a18c40cdb9e7f9dfb9666fd748d595925568606e138a27f2674f9f197d59b932a8777d86c
 AUX nss-3.14.3_sync_with_upstream_softokn_changes.patch 12364 SHA256 34519ce93a62de743caca2904c47df16d94993a0c5f84626a88ababc3ae65156 SHA512 f41e167bcdab7850280b93b433b2cfd10d38657b52de26b6bfd63019b2b542c8a8a9fa0e99b12917239cea2eb686649da595520cf54bd34b64b53add8d7fa03d WHIRLPOOL e8fa84826d5374cae03a59d0ebc02aa405fa4034cf3c7b5f339d6bf2b4716639e212d010dd73629c9dbb9add6da38b27aa2f12b55994f9ed88dcbbd8f65dadc3
+AUX nss-3.15-gentoo-fixup-warnings.patch 177 SHA256 3bb300d8448f769beb97b110a0fe764160c866368f630e790c8599c1d75d70bb SHA512 2d79c0203c46ec52195983d4378bb0f13348cc32b5c6b83140b6ac91d644073f5d42785a23476b07cd1f058309d8616aef9faae7c59b2f3e1b843abbaacacdc4 WHIRLPOOL 96565a7ba9f40b010f1825722aa2a5990daf7cfee09cbad1e4cb022c8aaf664ba26cfbb923b7bbe41b99bc3fcc6d03f8b265f8fd922c02dc3bbc450d3fadfcba
+AUX nss-3.15-gentoo-fixups.patch 5255 SHA256 eba46da3424640a0f16c7b07e526c373f3739dbfe6fb1e5a2af4d7b7fb83e4e2 SHA512 a1968a1e77a34a9ec4718b48435190c698cb960fb138a23a2f136b08ca50e221b2d5a729d69210eafcc7aafe12f3e02b329c7a878c1e9e308c3e737c2e7a1b71 WHIRLPOOL 54ff1716c8b016d38b83aa82c8473bea468710ed72d237ca0ea1d6201c39e141b7f32938c8a9f870c4693421f42751ce6f6c4bafd1d80a53e3bd17170ccf5f7a
+AUX nss-3.15-x32.patch 1308 SHA256 485686744485824c95823d593864695f5b417c7ba2e67ec07785bd2bcae3a0c2 SHA512 417215d257cc1b588a2b310b351ece2ac89f359fc91ecee48d7a2d616443734d2c077aa0d3ac922f4b342ed520700b7beb0e43e7d5e6b17440dc959ddf5e18ec WHIRLPOOL 71510984835ba1a38825482f1043204ba3502b2c78ed87ff2be884551658a8c42125e69fe90f5b090ea26139bfcf36910b4db7cc92eaf8d6d9a58c0356e89a98
 DIST nss-3.12.11.tar.gz 5944840 SHA256 d043f8d44212bc9418b6a954ca88e05b8ab2a71f8c59e6829a9a36d8a28e9f16 SHA512 3ed1134c972cee9ac23a77adc4c38eeb0597d0734b13b561ec74480560eb77b259ebc9708e4ecd8cc1565bfb6ae9e471c7131dd26ca48e6b427284c3c005ec6a WHIRLPOOL e4cc92496e62c49dd89e2263848154aeadcaea22b51d227e4f8dc41c1e8f9e7922f8e0ff7b99dffde845780a6277696b83339c49eff903885e0cf0ba5f283443
 DIST nss-3.13.2-add_cacert_ca_certs-ported.patch 70938 SHA256 bd3e14436695c903279c2cf8982c8df0f20ab34cbe1a7f955aaf861f19a3bf25 SHA512 0b68f54fd5b7239cd05dd217b9fe0d64cb5942c2058f86990ddb65d4ea0c141bd750b79ebaa735c44bdea2798ce014228b6c9cc797d9c2cfd768c09ebe62e3e8 WHIRLPOOL 10b8756c211e6411a6483466518fe994c5732ae331d8b4f1bf0f4612496ee3072dcbb6c3b9f98d9744b01ed1ee681415eb3a8f83cb364926d6353a20fdb36e3f
 DIST nss-3.13.2.tar.gz 6082528 SHA256 92eafdbb62e3071afe71beeaca94c9f33b0b8d11654cbf1797c84aa9f7c1c8e5 SHA512 017bb994257452304e6c42ecb7320221a41b2c83fe183e3172b4df93f65289c90083d361f417d9167981e9f6553a5fd59144a24b9cd72370747e371363243f49 WHIRLPOOL 84c0487f1fa99709db8991a7d24c78f1eaf2820909e789c24546b552a76dd665e9d5123e28b857e56bc5cf57d005dd0f8afbeda9aaede37cb25850259b13d9c6
@@ -30,6 +33,8 @@ DIST nss-3.14.1.tar.gz 5814063 SHA256 80a5d4872da13d0272636ad04e1beddcf8d4572bcc
 DIST nss-3.14.2.tar.gz 6178419 SHA256 a22691209f4c4989812939c7e38c48a1df09f4b80e7ce4c66b66c9a59235ae95 SHA512 65303f09ef09900512da8d19f7f35f50ef07926256bc5b548a665b5f2ea82bf02548bc8464e0f3723014f3f0f3d2e908faf9ef82b564be21adb7da7f5295e137 WHIRLPOOL 71063478b5083e7cad64e06e84fc8a713c45b85ce9d6f0ad1af16c38b5cbb89779fd35c93813644a8d0c0c1e729805b957c44b6b0f7acf60c8032ed0eb98b4a9
 DIST nss-3.14.3.tar.gz 6189790 SHA256 d9d366be94d33395597ebf82363fcdedfa693a6d627cf7f6bec025f609d54cc0 SHA512 4e8d8517ffb6d03da274afe9a7c50e2f0a15ffdd83e63f29a445e7aee829a8b7e2fbc772695322bd6acee81c052811735b542978044996156cb52dd7e4c001ec WHIRLPOOL 1c1c341303c8c1a13a10b732ac27d5ac8f3245b220436848bdf3877fb1487dba71654908f58810d49869e5af2a86842c4638415b283114bae0f4fbfaee3c4b29
 DIST nss-3.14.tar.gz 6068755 SHA256 b01868959d50263265aacc5a09f9a9eefbbde5f35604c2977f9714696f1d3e2b SHA512 c5aba091fddcdd57a8cda879a90cf05eeacedf5d734be8eaaec9051aaa6c468b0c8b9816db3cb864859702f90f49fd37971eca98754763b778dcd5fb3d1f7358 WHIRLPOOL b795c55c4dcb7878c4e887b6dc52213d1c31e09ea969df0d8b642b1010b5900c8734de70287141be2ca93a77631b312e68e9e781689f158bb104c501882046ae
+DIST nss-3.15-pem-support-20130617.patch.xz 27800 SHA256 01885877f12b0460798760617c9b0a1f8ed05ad0130e924211bd73fc344535cc SHA512 ebf0633e1683b3b9efe340d1117e02f1ced7e8381c7e867fff77efc3c41df1a32f017b18816ae6a04b35b5006c83e557c47a13ae576f50a84f9770c321dfa34b WHIRLPOOL 88f5edc621ca7862dc2e433836e11caa60752dc8f95bc7f49bcf07cdd0b3d8f2d7642ee02b018b8429a3e358e252ecdf3de40a1b12fab1f0fa13ca360e02a53c
+DIST nss-3.15.tar.gz 6276213 SHA256 c139f331ddcff4d5485590ee1b4489d3731aa520d4f5d942e2e40bba1e23a3cd SHA512 a703bb6fb466bfdde84f112eabe44f2db0b938b9e34ff32143ad913cd7a8891748579eca8cdd10b2a6e5eaa062a0522af8f767ec4de706178efd172d3c5875a9 WHIRLPOOL 80e76f6e36b814f7338d695220250aa68bd5757a5f3294609d3812708c30f2a77c9bdfcd6eeace34473afe22e0b0bd75eb848c168ea4e3a6327203dd323b66bf
 EBUILD nss-3.12.11-r1.ebuild 7124 SHA256 650fc306d859a25e3529b6f8f16db1bfb2ff2791e9115a0548a1998e420e86ed SHA512 bc970d65ac1ea6645ba981f9c55c3a6432397008707d21c8fa98453b9f1ebef571ad4c8ac80e98e7da1f7226120c3545f3ed7a16c23ed0557702d24098bf2460 WHIRLPOOL 83661814ec7dfb79a886e68039b05650c23f64ad22cddc9c3bf8fb438c08fb471571b7ec1665b8226e44e81fed2ce456a636c6e84f1842278d7e798bb9e0d8f0
 EBUILD nss-3.13.2.ebuild 6662 SHA256 c2c7cffb8b1f5d7a6911190fbe4a09ca1edf046cec9038257119985ab26d05b3 SHA512 6c6d6ded9af3c3b2fbf6042b2baeea4c63abe86ef18fed6b36a8167bc876e43630baf3bc469356c05eddd8f06c97f56e659511abff7208f22efdb180d9aefb50 WHIRLPOOL 35e1e311b9fa5f8045a741b0c8b74fcd4ea54b18821c485bbf13d0a01e38447f9ce88075678d93a3673a7cea9bfec36dcbc5894cd02d8c850d20782cd0334ade
 EBUILD nss-3.13.3.ebuild 6702 SHA256 d15d7529e473eadc3de09e3e8fb760583f019240eaaa551a832de0c6d75dfd3a SHA512 23a7ad80bfe5fae45f9528912ecdf52a4772d0ea0852053b1d76caf043c561ea03940f2bebe039efe0bc06d7927fd87f1d38f0d3b5243d9801686f4410e05928 WHIRLPOOL d27b1b984ddf7c2ed0c2fc8e28996b4943a50af8eae4ff6549eb80eff2275a06b85165cda0f047a7ecdd8e157197807764cc76c33b42f071b962623ff6d0409b
@@ -41,22 +46,17 @@ EBUILD nss-3.14.1.ebuild 8042 SHA256 8d10101c1de0ba134145ed6a5a67160df6b16fb3cca
 EBUILD nss-3.14.2.ebuild 8098 SHA256 eded08efe981e2b895687ca7f7239113a6142397476143cb9f4f15cd726bdac5 SHA512 6dc10de79e357e9560eb412776badd9082cf0159898c399703c8d053aa96362605e6028720900fda47047ca35b95cd6df1f9f3005d40d0e8aef926fba0596420 WHIRLPOOL 9b2843b20a6e31199f76d56f2627ba9dc93021a39ab089b3af45856a96245b14435ecee5a75b96e1ac40987431999c4e02eca60e0e1aab18dcaa3ba8876078a3
 EBUILD nss-3.14.3.ebuild 8182 SHA256 29e1e6b150072cde0aa534c6e42957d7c466d144636a388190588bbbc2c9e826 SHA512 c5184d77bf0130ae34ef118d309b953ce137eeeb5764a09430c2c68610b81409ddbf5c6c5d2d04f527f975e44e4b06b20a63c8a9fee6025ccf3cdda5622ed606 WHIRLPOOL 5f203eaf4481fb9e794345bff8b48b0d93ed803a143aefd4d2faa27fb76c42ad4487bff530741d7344d65312012aaedcac18839e72bac9c8557ce9582cfdb17f
 EBUILD nss-3.14.ebuild 6919 SHA256 29b7f44f7652850a8b808111b9a6457bb4bddec0147424a7ddfe04880564a7a8 SHA512 fbc275e8aa0a1a3f992a055b2de93daf015f0de4283ff8bbb0ae345078b3de206817544e073fefe7e7e43664f013921613da23a207acc62842757db4c3d7b33b WHIRLPOOL 7baf9e73a12b64dbb6bbee1a8585c0a0e7fd29bdce348b5b6626cd4357112242da6ed961836e3c3d193327b3c9c0dbf3e5c1ae3c7f76f5119c3dcc2fceb802c7
-MISC ChangeLog 37639 SHA256 cc432731d609661b3deaa8b53deeb768ba65b95a2c5dac256f8d91cb8059b39c SHA512 c11ff04a76e585b60e7cc49aa5d09464b74aaa146d8461091e0e9ed542dfb3bbcd5aae9056dd46640f98cdfa2975d0406c769961bf247ca921328b2ad92fdaeb WHIRLPOOL dd4a2f37e789d6871f6709fc3d29e14f04a4d952b7dfd04c93482067be8c29557cd6101dacb5f2183a822c77c57256554162e171166b2be02ec37e37aa4582de
+EBUILD nss-3.15.ebuild 7797 SHA256 046c3c70db64e46d7248a2dd716e4fa7e3540a29eeb878d831bc373dc45f50a1 SHA512 0c5d210d33d9243812ac72e2fd75dfd341bfd2d99d187915fc105136480981a2a59b828262f38477f35ff7c2e8d2a9051d9a233294b22e05aca7f5b844eae6c3 WHIRLPOOL bb14467d02aa9958a75b18b41a33703ed6c9837d55266f174172f20316af9b4559b5fbff29d7c1d4b2770357db10d8cfa1f29161e4d5f6038602edbe8d2c9031
+MISC ChangeLog 37894 SHA256 214784bd13258309045678e6f5ec284ac868cb42a12192d783b1c82443ce512f SHA512 8c63b323cf8b13865e5ce832dd8c8d9b906e4b73b3f606c9b51f9f8ecc84409bf78bbe484c8dd4a0b8a72dcc179a3874c6c81707f52349f660a6f546248b425d WHIRLPOOL 0ef746e53e0bdd4948e6b4fb57951bb4d5dcd99aa3e735b3f9321eed8cf4a11ed865b52b72e6354f77ccfb4f92a1c4ad368f8552700c83e6cb4936cc3a845e7e
 MISC metadata.xml 323 SHA256 e6fef8af50b09ae8cd84d42ca66b3716d47046ca2c643cb842a0cbc75196c1c5 SHA512 d4631c5de361b5b04d5ec36061fcb4762d47efd93b977c63e26d921109d0b2c2639f803442600b363c91937f2e5b2acd7ef0dde8b85abf801d814f8f70c20dfb WHIRLPOOL 38c7d7ccfbaf04fa026fe377b5810c187cf4da4c9c9f77ee0f80fc0d68bffd398a65eb37ec3457a351ec80405d0bd71ae09612efc6cff16e047ba01ec87ccac5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRtQhtAAoJELEHsLL7fEFWNmYQALGKywfLPaPsQEwuR2f3w0zY
-F066KSb71rdaMR1MSQ8mhR+RxDu2V3r/TSnBz1Ulp8v8ETZscLFhY79M+UnKw7WR
-tbxXNxqvsOXTO0pFuy8/kCpRMjqXZ5ihO7vR1yc2pCvxnHKo62DD9FjM8vNygED9
-cO4ParOd5H4VphXvhyfBa1cz+vzO81KL4fU0ww+wPwrvNcaP9guGiEd0kd3y2LzA
-v1Xkz7gxaH/vsYJihVrOZsG+NbXbYmQbVNCWmlLMgEYlBbuQmsuF53WkeEkpz+bj
-e16s3z7QpRNT+6qISxTcc29P73IrLu4jUHIaqu4Pg2gHyCxteDmchR4b0Yr178YM
-2kwGxnCUgDSt/XJayjlGUF4X5zgq1s5p2cUx5o+Y8L9hpGF5R5ccSKd2HGslyoaF
-gf/25K4Dnw78mUxpoleDeMaAiFe0mZEdAdQnc41Tco7AXm83dKBX7qsOtc3olhrA
-Hhkx6OaDbWjUpZmkh+8YI+XCWUvmRyiz7MiZLU3pFPbzwdPm1hMJxxcX03qG9Kk6
-IKeXw3IiP/eDzOalJj5yOUs5BvTI6xNUFHnxQSOkDxLgvQ5GHZG5YdSmMJSGFskK
-FEIRXr1QbBRtDfNRs8IVUf1Oa8zOBMWqx5t7OCEYEGyMth77seCKOD49vTG8MWzE
-2VBRiQQ5kpq+T7IXIRPZ
-=a+6Q
+iQEcBAEBCAAGBQJRwQbmAAoJEKDMw7q00Ii0c+0H/R3vEii5L/sioh1xS5pm0Eq2
+SEAcub5lRxzvo52RkxDzKGvpZu1Z+8nyY60t+2VTvZ6bgn/Gudt17FT8BWGAS7GV
+QZEYVZj/PW5GhNO0mG6RGNOaKTLXEaP2N0cfAlFsK6fQzfV1FqqC/Fq0xm21jiGG
+fmcXH8gQGK+tmKvy7eZFpFdpPUiFCtA1nHP66u+sUiWX1nglPVjsb0iE7Hpqd6Zg
+zEkJ0YIuoKUNDBtCL5rggsmLX9pGRX4LxM8It1O7nRg2I8Tq9XvqXvzE/7wDapnn
+EqIW2xSSEwLTaZtRT6rR+9xfwxJ10AFapdcOLQA0RmCyc8JzvpdhCngZsU9KJR0=
+=JMyH
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/nss/files/nss-3.15-gentoo-fixup-warnings.patch b/dev-libs/nss/files/nss-3.15-gentoo-fixup-warnings.patch
new file mode 100644
index 000000000000..3ce2c0e49769
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.15-gentoo-fixup-warnings.patch
@@ -0,0 +1,10 @@
+--- nss-3.15/nss/coreconf/Linux.mk
++++ nss-3.15/nss/coreconf/Linux.mk
+@@ -116,6 +116,7 @@
+ 		OPTIMIZER += -gdwarf-2
+ 	endif
+ endif
++OPTIMIZER += -fno-strict-aliasing
+ endif
+ 
+ 
diff --git a/dev-libs/nss/files/nss-3.15-gentoo-fixups.patch b/dev-libs/nss/files/nss-3.15-gentoo-fixups.patch
new file mode 100644
index 000000000000..9314d5f25852
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.15-gentoo-fixups.patch
@@ -0,0 +1,238 @@
+--- nss/config/Makefile
++++ nss/config/Makefile
+@@ -0,0 +1,40 @@
++CORE_DEPTH = ..
++DEPTH      = ..
++
++include $(CORE_DEPTH)/coreconf/config.mk
++
++NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
++NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
++NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
++PREFIX = /usr
++
++all: export libs
++
++export:
++	# Create the nss.pc file
++	mkdir -p $(DIST)/lib/pkgconfig
++	sed -e "s,@prefix@,$(PREFIX)," \
++	    -e "s,@exec_prefix@,\$${prefix}," \
++	    -e "s,@libdir@,\$${prefix}/lib64," \
++	    -e "s,@includedir@,\$${prefix}/include/nss," \
++	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
++	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
++	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
++	    nss.pc.in > nss.pc
++	chmod 0644 nss.pc
++	ln -sf ../../../../config/nss.pc $(DIST)/lib/pkgconfig
++
++	# Create the nss-config script
++	mkdir -p $(DIST)/bin
++	sed -e "s,@prefix@,$(PREFIX)," \
++	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
++	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
++	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
++	    nss-config.in > nss-config
++	chmod 0755 nss-config
++	ln -sf ../../../config/nss-config $(DIST)/bin
++
++libs:
++
++dummy: all export libs
++
+--- nss/config/nss-config.in
++++ nss/config/nss-config.in
+@@ -0,0 +1,145 @@
++#!/bin/sh
++
++prefix=@prefix@
++
++major_version=@NSS_MAJOR_VERSION@
++minor_version=@NSS_MINOR_VERSION@
++patch_version=@NSS_PATCH_VERSION@
++
++usage()
++{
++	cat <<EOF
++Usage: nss-config [OPTIONS] [LIBRARIES]
++Options:
++	[--prefix[=DIR]]
++	[--exec-prefix[=DIR]]
++	[--includedir[=DIR]]
++	[--libdir[=DIR]]
++	[--version]
++	[--libs]
++	[--cflags]
++Dynamic Libraries:
++	nss
++	ssl
++	smime
++	nssutil
++EOF
++	exit $1
++}
++
++if test $# -eq 0; then
++	usage 1 1>&2
++fi
++
++lib_ssl=yes
++lib_smime=yes
++lib_nss=yes
++lib_nssutil=yes
++
++while test $# -gt 0; do
++  case "$1" in
++  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
++  *) optarg= ;;
++  esac
++
++  case $1 in
++    --prefix=*)
++      prefix=$optarg
++      ;;
++    --prefix)
++      echo_prefix=yes
++      ;;
++    --exec-prefix=*)
++      exec_prefix=$optarg
++      ;;
++    --exec-prefix)
++      echo_exec_prefix=yes
++      ;;
++    --includedir=*)
++      includedir=$optarg
++      ;;
++    --includedir)
++      echo_includedir=yes
++      ;;
++    --libdir=*)
++      libdir=$optarg
++      ;;
++    --libdir)
++      echo_libdir=yes
++      ;;
++    --version)
++      echo ${major_version}.${minor_version}.${patch_version}
++      ;;
++    --cflags)
++      echo_cflags=yes
++      ;;
++    --libs)
++      echo_libs=yes
++      ;;
++    ssl)
++      lib_ssl=yes
++      ;;
++    smime)
++      lib_smime=yes
++      ;;
++    nss)
++      lib_nss=yes
++      ;;
++    nssutil)                                                      
++      lib_nssutil=yes                                             
++      ;;
++    *)
++      usage 1 1>&2
++      ;;
++  esac
++  shift
++done
++
++# Set variables that may be dependent upon other variables
++if test -z "$exec_prefix"; then
++    exec_prefix=`pkg-config --variable=exec_prefix nss`
++fi
++if test -z "$includedir"; then
++    includedir=`pkg-config --variable=includedir nss`
++fi
++if test -z "$libdir"; then
++    libdir=`pkg-config --variable=libdir nss`
++fi
++
++if test "$echo_prefix" = "yes"; then
++    echo $prefix
++fi
++
++if test "$echo_exec_prefix" = "yes"; then
++    echo $exec_prefix
++fi
++
++if test "$echo_includedir" = "yes"; then
++    echo $includedir
++fi
++
++if test "$echo_libdir" = "yes"; then
++    echo $libdir
++fi
++
++if test "$echo_cflags" = "yes"; then
++    echo -I$includedir
++fi
++
++if test "$echo_libs" = "yes"; then
++      libdirs=""
++      if test -n "$lib_ssl"; then
++	libdirs="$libdirs -lssl${major_version}"
++      fi
++      if test -n "$lib_smime"; then
++	libdirs="$libdirs -lsmime${major_version}"
++      fi
++      if test -n "$lib_nss"; then
++	libdirs="$libdirs -lnss${major_version}"
++      fi
++      if test -n "$lib_nssutil"; then
++       libdirs="$libdirs -lnssutil${major_version}"
++      fi
++      echo $libdirs
++fi      
++
+--- nss/config/nss.pc.in
++++ nss/config/nss.pc.in
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: NSS
++Description: Network Security Services
++Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
++Requires: nspr >= 4.8
++Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
++Cflags: -I${includedir}
++
+--- nss/Makefile
++++ nss/Makefile
+@@ -44,7 +44,7 @@
+ # (7) Execute "local" rules. (OPTIONAL).                              #
+ #######################################################################
+ 
+-nss_build_all: build_nspr all
++nss_build_all: all
+ 
+ nss_clean_all: clobber_nspr clobber
+ 
+@@ -103,12 +103,6 @@
+ 	--with-dist-prefix='$(NSPR_PREFIX)' \
+ 	--with-dist-includedir='$(NSPR_PREFIX)/include'
+ 
+-build_nspr: $(NSPR_CONFIG_STATUS)
+-	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
+-
+-clobber_nspr: $(NSPR_CONFIG_STATUS)
+-	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber
+-
+ build_docs:
+ 	$(MAKE) -C $(CORE_DEPTH)/doc
+ 
+--- nss/manifest.mn
++++ nss/manifest.mn
+@@ -10,4 +10,4 @@
+ 
+ RELEASE = nss
+ 
+-DIRS = coreconf lib cmd
++DIRS = coreconf lib cmd config
diff --git a/dev-libs/nss/files/nss-3.15-x32.patch b/dev-libs/nss/files/nss-3.15-x32.patch
new file mode 100644
index 000000000000..bb7449289a75
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.15-x32.patch
@@ -0,0 +1,46 @@
+--- nss-3.15/nss/coreconf/Linux.mk
++++ nss-3.15/nss/coreconf/Linux.mk
+@@ -55,11 +55,18 @@
+ ifeq ($(OS_TEST),x86_64)
+ ifeq ($(USE_64),1)
+ 	CPU_ARCH	= x86_64
++	ARCHFLAG	= -m64
++else
++ifeq ($(USE_x32),1)
++	OS_REL_CFLAGS	= -Di386
++	CPU_ARCH	= x86
++	ARCHFLAG	= -mx32
+ else
+ 	OS_REL_CFLAGS	= -Di386
+ 	CPU_ARCH	= x86
+ 	ARCHFLAG	= -m32
+ endif
++endif
+ else
+ ifeq ($(OS_TEST),sparc64)
+ 	CPU_ARCH        = sparc
+--- nss-3.15/nss/lib/freebl/Makefile
++++ nss-3.15/nss/lib/freebl/Makefile
+@@ -193,12 +193,16 @@
+     MPI_SRCS += mpi_amd64.c mp_comba.c
+ endif
+ ifeq ($(CPU_ARCH),x86)
+-    ASFILES  = mpi_x86.s
+-    DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE 
+-    DEFINES += -DMP_ASSEMBLY_DIV_2DX1D
+-    DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
+-    # The floating point ECC code doesn't work on Linux x86 (bug 311432).
+-    #ECL_USE_FP = 1
++    ifeq ($(USE_x32),1)
++	DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
++    else
++	ASFILES  = mpi_x86.s
++	DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE 
++	DEFINES += -DMP_ASSEMBLY_DIV_2DX1D
++	DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
++	# The floating point ECC code doesn't work on Linux x86 (bug 311432).
++	#ECL_USE_FP = 1
++    endif
+ endif
+ ifeq ($(CPU_ARCH),arm)
+     DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE 
diff --git a/dev-libs/nss/nss-3.15.ebuild b/dev-libs/nss/nss-3.15.ebuild
new file mode 100644
index 000000000000..16d6f7f70e52
--- /dev/null
+++ b/dev-libs/nss/nss-3.15.ebuild
@@ -0,0 +1,273 @@
+# 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.15.ebuild,v 1.1 2013/06/19 01:18:35 anarchy Exp $
+
+EAPI=5
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+NSPR_VER="4.10"
+RTM_NAME="NSS_${PV//./_}_RTM"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	http://dev.gentoo.org/~anarchy/patches/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch
+	http://dev.gentoo.org/~anarchy/patches/${PN}-3.15-pem-support-20130617.patch.xz"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="utils"
+
+DEPEND="virtual/pkgconfig
+	>=dev-libs/nspr-${NSPR_VER}"
+
+RDEPEND=">=dev-libs/nspr-${NSPR_VER}
+	>=dev-db/sqlite-3.5
+	sys-libs/zlib"
+
+S="${WORKDIR}/${P}/${PN}"
+
+src_setup() {
+	export LC_ALL="C"
+}
+
+src_prepare() {
+	# Custom changes for gentoo
+	epatch "${FILESDIR}/${PN}-3.15-gentoo-fixups.patch"
+	epatch "${FILESDIR}/${PN}-3.15-gentoo-fixup-warnings.patch"
+	epatch "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch"
+	epatch "${DISTDIR}/${PN}-3.15-pem-support-20130617.patch.xz"
+	epatch "${FILESDIR}/${PN}-3.15-x32.patch"
+	cd coreconf
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+
+	# Ensure we stay multilib aware
+	sed -i -e "s:gentoo\/nss:$(get_libdir):" "${S}"/config/Makefile
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		"${S}"/config/Makefile
+
+	epatch "${FILESDIR}/nss-3.14.2-solaris-gcc.patch"
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			"${S}"/cmd/shlibsign/sign.sh
+	fi
+
+	# dirty hack
+	cd "${S}"
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+	hppa*)   echo "parisc";;
+	i?86*)   echo "i686";;
+	x86_64*) echo "x86_64";;
+	*)       tc-arch ${t};;
+	esac
+}
+
+nssbits() {
+	local cc="${1}CC" cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	echo > "${T}"/test.c || 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;;
+	*32-bit*|*ppc*|*i386*) ;;
+	*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+src_compile() {
+	strip-flags
+
+	tc-export AR RANLIB {BUILD_,}{CC,PKG_CONFIG}
+	local makeargs=(
+		CC="${CC}"
+		AR="${AR} rc \$@"
+		RANLIB="${RANLIB}"
+		OPTIMIZER=
+		$(nssbits)
+	)
+
+	# Take care of nspr settings #436216
+	append-cppflags $(${PKG_CONFIG} nspr --cflags)
+	append-ldflags $(${PKG_CONFIG} nspr --libs-only-L)
+	unset NSPR_INCLUDE_DIR
+	export NSPR_LIB_DIR=${T}/fake-dir
+
+	# Do not let `uname` be used.
+	if use kernel_linux ; then
+		makeargs+=(
+			OS_TARGET=Linux
+			OS_RELEASE=2.6
+			OS_TEST="$(nssarch)"
+		)
+	fi
+
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export NSS_ENABLE_ECC=1
+	export XCFLAGS="${CFLAGS} ${CPPFLAGS}"
+	export FREEBL_NO_DEPEND=1
+	export ASFLAGS=""
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	emake -j1 -C coreconf \
+		CC="${BUILD_CC}" \
+		$(nssbits BUILD_) \
+		|| die
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		emake -j1 "${makeargs[@]}" -C ${d} || die "${d} make failed"
+	done
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+src_install() {
+	MINOR_VERSION=12
+	cd "${S}"/dist
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	# We generate these after stripping the libraries, else they don't match.
+	#cp -L */lib/*.chk "${ED}"/usr/$(get_libdir) || die "copying chk files failed"
+	cp -L */lib/libcrmf.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.h
+	cd "${ED}"/usr/$(get_libdir)
+	local n file
+	for file in *$(get_libname); do
+		n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION})
+		mv ${file} ${n}
+		ln -s ${n} ${file}
+		if [[ ${CHOST} == *-darwin* ]]; then
+			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die
+		fi
+	done
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils="shlibsign"
+	if use utils; then
+		# The tests we do not need to install.
+		#nssutils_test="bltest crmftest dbtest dertimetest
+		#fipstest remtest sdrtest"
+		nssutils="addbuiltin atob baddbdir btoa certcgi certutil checkcert
+		cmsutil conflict crlutil derdump digest makepqg mangle modutil multinit
+		nonspr10 ocspclnt oidcalc p7content p7env p7sign p7verify pk11mode
+		pk12util pp rsaperf selfserv shlibsign signtool signver ssltap strsclnt
+		symkeyutil tstclnt vfychain vfyserv"
+	fi
+	cd "${S}"/dist/*/bin/
+	for f in ${nssutils}; do
+		dobin ${f}
+	done
+
+	# Prelink breaks the CHK files. We don't have any reliable way to run
+	# shlibsign after prelink.
+	local l libs=()
+	for l in ${NSS_CHK_SIGN_LIBS} ; do
+		libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so")
+	done
+	OLD_IFS="${IFS}" IFS=":" ; liblist="${libs[*]}" ; IFS="${OLD_IFS}"
+	echo -e "PRELINK_PATH_MASK=${liblist}" >"${T}/90nss"
+	unset libs liblist
+	doenvd "${T}/90nss"
+}
+
+pkg_postinst() {
+	# We must re-sign the libraries AFTER they are stripped.
+	local shlibsign="${EROOT}/usr/bin/shlibsign"
+	# See if we can execute it (cross-compiling & such). #436216
+	"${shlibsign}" -h >&/dev/null
+	if [[ $? -gt 1 ]] ; then
+		shlibsign="shlibsign"
+	fi
+	generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+}
+
+pkg_postrm() {
+	cleanup_chk "${EROOT}"/usr/$(get_libdir)
+}