Put cacert.org root certs behind USE=cacert, and rework the nss-pem support and put that behind USE=nss-pem.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

1 files changed, 19 insertions, 16 deletions

diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 3933d37d5bdd..a282fc56f43b 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -4,27 +4,30 @@ Hash: SHA256
 AUX nss-3.14.2-solaris-gcc.patch 659 SHA256 d6ac2638602fcf5d73020efb616c2c16d5775d3a75122cc1681c944ddcd0a07f SHA512 5703fa0d6cd793f9622c331983499ce35f696b71589cac347e2a72d4d377ab53d97f79d9b1396bf1f255a933067ebe2f0e4fb6fca9cc5f3c179275d42a6be9f8 WHIRLPOOL b5f49f0a860598cf508ce7ea97165840ab5c068a00f213591d41101c12ec1e5afbffdbad7c3a1d69ef52c34f4d00da0d1aef4a80829f21209c60908e21a2663a
 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
+AUX nss-3.15-x32.patch 1361 SHA256 0f0298383a4a3c8f1085b2e139afed182e6f314b771eb2442ba1d50563d88357 SHA512 278b65edbefdaf11ecd1bef58a1350202b84317c25b111707b1322f692d48330ececd020e5f60059ded7f6d81f079df17921a22f6d89d4d39df2a01dd473dbd2 WHIRLPOOL c78b05d85890e34f2eb3654202cf630c3c35ba3c0f78ac55b93719b5e25280684c58a457162b1a107a9d850e10fa730ba14fd3c51cdeec30b5c871070bfb00a0
+AUX nss-3.15.4-enable-pem.patch 243 SHA256 eec796bbc845b123f97bcf1f351495ec1645a2d015e6f6bcdb1e088d02f5d1e6 SHA512 b8f942ced3ff6cea1d54934e0e68ad589585f3fd42934046d0b57563fd4e24b50ad550db391346768abdd9848c3457a532fe3b7495862454f9a52a4603e92f9c WHIRLPOOL 0cd2428516e8a63d64c20b94153f079c4cefd96c05155fa27ecb4cba68419e5efebd32d6ab4820b072fea173e66b5816d8cc238f2a328616f5b7752c60e3998e
 DIST nss-3.14.1-add_spi+cacerts_ca_certs.patch 25018 SHA256 82ca25982828fd7153ad15fc6e81408c115476eeeb4045d3a71469380b56824b SHA512 2aafbd972b073061bfd66a66a4b50060691957f2910f716f7a69d22d655c499f186f05db2101bea5248a00949f339327ba8bfffec024c61c8ee908766201ae00 WHIRLPOOL c9fe397e316dac7983b187acf7227078ebd8f8da5df53f77f2564489e85f123c4d2afb88d56e8dc14b9ebfffe8a71ade4724b3c1ea683c5c4c487cb3a64eda43
 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-pem-3ade37c5c4ca5a6094e3f4b2e4591405db1867dd.tar.bz2 28849 SHA256 0388cb01d6158fad92b6ee13241531c7dba66a4be64e85160ded212c3febadc4 SHA512 6994bd7435ad0cff9f5aed509c5f7ea438a6829188bea94d57020e8df6d75631b289363b6f68c3c96da67c958af967c624147d3604b734d8f0b57688f74e7c95 WHIRLPOOL a168e137981f4bc4cc6735bcc234b3fe14ea0cc91768926cdaae3f124ba1dfcd06be029c3805ded20df600c8655bb2d97beb69a0c6b7f2441e7ee4c651cd7868
+EBUILD nss-3.15.4-r1.ebuild 7819 SHA256 93421afc8dcdf858d8421c3e4538d5aec5365da9c76c0ad17ddfb21e8d06c476 SHA512 e5a5835b9ca1d67aa3573d5c163ecb2a192696c1bd084227bbd5adcc7b840a4848f53dc884e9f05abe052c914928fe924d96182f2563f131d3c5e0992cb0cf57 WHIRLPOOL 8193741659dca67401dadbda8b64b4701009b538fd98a614781e56c15183c8e6589c31917cbd4eb468e2a0eb173a69ba11582af66442cf6aae19a91943ca0da4
 EBUILD nss-3.15.4.ebuild 7497 SHA256 9e9f714c0dad52e14b147d272ceff71376d8b45725e7563b1af84afb49768209 SHA512 0b95499c659774c86ea9ad66ead30d942b8c656339b0cc4cb52aae12f6826b3996d33b9424b0a5e7bc54c08af776151dfb5f8e5ddcb4be934eb8245cb679b7dc WHIRLPOOL df8a3c6f7fd45f92e5430ec27ed2ff240e59113d52ea1125689f9eee9d75b7fbdbb50a41f3e65ad0cd6c459aea109764a5465a0aa5612ca3be08bd6ddf1b1c65
-MISC ChangeLog 44280 SHA256 ed822755375ea3d37cb2357163161eb28bfe607f1ba1b0f4d0d6272989deaadc SHA512 8ea17788f2a6f9d294d073f615dd5aee830baa751113c25394aceb8e9537ff0889cd48e4569b1f0a342bbe327d24b226e434b57577d17b3a51c2abd0558c8753 WHIRLPOOL c181e23bf557b6a5101fddc20cc174917ee0e41308f1dab5b65b7fc02d930305530eeda22c04c1b2f26c4e41296ad15f7a562d6f32ab8d4b99ebabf7a63eb793
-MISC metadata.xml 323 SHA256 e6fef8af50b09ae8cd84d42ca66b3716d47046ca2c643cb842a0cbc75196c1c5 SHA512 d4631c5de361b5b04d5ec36061fcb4762d47efd93b977c63e26d921109d0b2c2639f803442600b363c91937f2e5b2acd7ef0dde8b85abf801d814f8f70c20dfb WHIRLPOOL 38c7d7ccfbaf04fa026fe377b5810c187cf4da4c9c9f77ee0f80fc0d68bffd398a65eb37ec3457a351ec80405d0bd71ae09612efc6cff16e047ba01ec87ccac5
+MISC ChangeLog 44549 SHA256 262853dc6fd868ddc054bf1ec929e0fd2e55bc301d938462da336e4058ec6447 SHA512 0e9a7a789518329f7e36fdaa4e4079a2e017d569982dfd5eb720eed133978750af7f22909c4ac625d807c2a268736e6117853c985bc5886209ede58e5e243738 WHIRLPOOL 236dff72dcf0dcc8a2d7f3099991056bbb07fce2b937a40eb44794d144c60f89608a078ba86c1bb8a207a377f2eef413042e42de6c4d6f2964cb951df7553942
+MISC metadata.xml 473 SHA256 b96722b89273524c0b25e1b8e301e489a80954f3e9e125b11393b35ca06c6834 SHA512 a3f72f40e9f8906c8ebcfcd59f142afa0542f6bd40b64f264cf48e2859ec72495fdce40d6c7da04ef7b7cd7dbb15fbf610b69baf1579a785b1f414965c92d7d1 WHIRLPOOL 313c23d9988a9aaebc1e2dc2a1ea83cdc21681983e0f38a69a558e6236d801a74836df0bfa329eec30cd78325f44818ca7374f4c64d9077f7e7556124317e4ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS7GznAAoJEPGu1DbS6WIAGO4P/AjoUL7qfAK0PiW7m/YqvZZP
-eKzTVqdtd0+Yx/+4URSZrx/s9iqQgujeRRBHaRWl+OetHdZUvSTHqGGvbk0r8GQK
-llkWsUnyjqA7ocO031jwH1XP2qykiJfLAsy58ubmaTgFl6qtifnAGURLRq70TgXd
-xBRPOxykmkDuaaqAmKvRfV17tmW1e1AnlSMSO/hfBHpBDHSBnTV+uuNTSPli4FOu
-ey9ZWuOG4X72eieGchH4QqBrCV2c3g2Y4tmAnwv6u7MWiBBEZVgUEpAGE++pbArh
-ysj30A2oPmwL0BBVs8q28A2TPi33wgrlGjR+M+hJen/C0IiAphvCDiEcgVAd5+PS
-FppwS7G+57wk1lWwTb+NW4I1XgHp05NlQnFgbkSVQYPRyQokbubltK7G4reuNthF
-L+8bmN8/XXKVPQ0at1YtJWijzbwaBWEKV8Yw2xz8Elk9aS7ntba9E9pn5rcACvKG
-1Zkl+6UG3OiqkOLABlvpDh+NAzSGGYCYmgzgKPtcR10Oslx62EDe/HdG5hhopJjU
-UgtWvLFbWPAWIdUWBpgKdkHm4ScDGiYlYGbWVuD9MWEub/DKtHmle2GS2PT9jIbe
-Fz4XgjsGz+8AfBwLPOsuDEpTt7KbHPtBX6l5UVUHvXbrQ9HTgufSRFOLydGMIGAU
-+j2Rql8y+T/VT97AHgD3
-=gKkU
+iQIcBAEBCAAGBQJS7H6pAAoJEPGu1DbS6WIAQQ8P/32Ts6GOeVAOwBJL5Fm1SKfl
+nzv+1yj6dLfXZXXwI0m8JXqbRmsfmBEGVo9FqhQMuj96vXGqWDYRUD9Yv9Jh4tXb
+WqZ0zHTwV0jzuINQYfAtb+aWwbMjO8hIHy1MX1sFYH+/OjbsQnXGfIR4W/R/PHVu
+0JCTr/cwYPfwR8vSJw+4JussNA5Y+hUnFyY/AxRNkBIyvSRudPNsDJvTmjdQXPm1
+fyPjKlVczH0eWQsp2W/gF/Ej+f1XDz0EhKyilfh6vOIVfVZ9MXiaTXF0JmGUBc1h
+f7Xj6zeN+OY1j4bAMt2jXT3Cb+GDUAOf9e8TDfQfSOMyaUKsckGW9h9ZKKKPirAk
+Ta7OYmQKt4mDx5Z/IWDNQZuvCVR6Y4hI0lKW9YIucK0yjeVMiSINauEPTwGDMTbO
+HtTesWlP2PrrFh1OC0tDlihHOT2YRX6iMt8LHrL8krtUFyTEQrF8tfDoD0OTVZoj
+EvOywN9dCp/kUw3mf+xrRL2I5cl93MtB5W9DXjvkyzU6Ezf/adcMlhU8FB59Dc2T
+wd3UA4VPbeNA23uKHIcQ4Q3aCRuu8iYH+vwZf5YmT1lMgE7We2bEKRFewAT9sZmx
+ARKix8lEmWtcxb8ALRAaOZJvHVGbbzR2Oke01M0n7EGjqWXXR8lvvOnjNHZhR+jg
+ap2eIztJz7GuXgJP2WBc
+=Ni+d
 -----END PGP SIGNATURE-----