gentoo resync : 09.12.2017

4 files changed, 13 insertions, 228 deletions

diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 93d6f0850adb..22b588c91ffb 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -1,24 +1,17 @@
-AUX icedtea-bin.env.sh 1140 BLAKE2B c9f1f746598e40d08e02519da65bc28f11ac824b33fc5148cffd2355cac6e2714b6cf0c797818eb2023cc9042cef92a2e9c60061603d5391b5d2d20d54cf6f57 SHA512 b29d3f0f7729708bfe1e66097b21ddc7780529d62f4b3162d7bbb6952e4f964b31c378ff207308324faedd59783d74470145947181834914de4a8d4b6aaeacba
+AUX icedtea-bin.env.sh 1062 BLAKE2B fd3b099ba1cd2d4f817852ad6d5f6ee5690f4c4edf481ecb0e3b6a7ce7893d983405801ac997e7df53048a64c5c8c48b5370710a897aa68a086ec79d316d0026 SHA512 7d85767b6bc1d5761d2dfcdd560199f735bd2514bd1fe78d0a11af4f491c87b89cedb063d72e3170ced9cb01ebb5c40004f23e7b97b0c7e77a4d68c051a62b12
 DIST icedtea-bin-core-3.6.0-amd64.tar.xz 61911044 BLAKE2B a9efef5d7e482d9a158fe0023252e95225e411237b227338386b9e9ead712b525afb8ecec9c7c382168b8160a66c7417113d53aa8553ded5d548a87371141f9a SHA512 630cba001ad511133ec7997c931891523e05062b6e5460aa392af551e71198481b7f13eee478f234ab9eb33efa059f7b54edf451cc9f5ed26a7f4d023f8a9cc6
-DIST icedtea-bin-core-3.6.0-arm.tar.xz 57965524 SHA256 09a4022a25b31df111475fafea10dbe3a05e69a7b0aeff0224d86903c3c6c9e6 SHA512 731a154fcbcaaf6cdc638b91b72bc65007798de2c31125279a362d3f521bf88a130e6d51ab185f3880687f5f2b07aaab01cf2665e28715ea83191ae6979fbdde WHIRLPOOL 1dbe765023aed33cbe655505b5c1723f6d9e1eed24d021c924b0f2f3ed4ea32164cc46ec9db23a205869692e6ac79320d8169c79ebdf509a7bd49bdb6b140735
-DIST icedtea-bin-core-3.6.0-arm64.tar.xz 58962420 SHA256 5fecb710513230971b4d5c640c9fd91ed333264d14808ff1d32a447b6a9ed05c SHA512 83c65e73fdbf1852a8eefac0ad077fbe988a46ea95a6e709a975df8d7ad812b8ae21c62ba8cd1fb51647836f83d707d6c423c06043cd9be399c5f8a15373e9ac WHIRLPOOL ffc6b09c27623bb7a366bb842bb6c61a6858d5d1e4cce9fda49ddee9293513410a2b1e65ffb847c20c6894a0b7358c594a90184078b6f8451510330d4d61c04a
+DIST icedtea-bin-core-3.6.0-arm.tar.xz 57965524 BLAKE2B 82a3f0d766afbeb4114a8887ac10823b9694edd93b0619e5ee62e80bb706f60e72df2e7168c11c7914dd210ceee49b0317dccf2184716e927c6da63edbeac095 SHA512 731a154fcbcaaf6cdc638b91b72bc65007798de2c31125279a362d3f521bf88a130e6d51ab185f3880687f5f2b07aaab01cf2665e28715ea83191ae6979fbdde
+DIST icedtea-bin-core-3.6.0-arm64.tar.xz 58962420 BLAKE2B e0ab8f8cee1c7284d78aba202a8b65a045be8037e64f9bc32d08eec39706737e5bad087111def8b94acd962c0c34e4ea2da153726677164747b433f9cc9f85af SHA512 83c65e73fdbf1852a8eefac0ad077fbe988a46ea95a6e709a975df8d7ad812b8ae21c62ba8cd1fb51647836f83d707d6c423c06043cd9be399c5f8a15373e9ac
 DIST icedtea-bin-core-3.6.0-ppc64.tar.xz 54236316 SHA256 e3f65f96247cfd9d5c8cb472d6335511b143b52a20e07cda7d7d11fd101f11ab SHA512 88187dddbf0acb26b141dc2b04000c710837f02a127bbf90b2225277e1eee7b04ac30a15a2f68ee0d3fc55a3175501131266ba2cd7aaf4231e0f2a67b4106e92 WHIRLPOOL ff33e4a15b3ea0773553819bb29bdae9531a4ea4f0ac421a29e03841bda2981cf0121d675c37dee9687751b937949da12220f6c10bee6453ba96d30d273a331e
 DIST icedtea-bin-core-3.6.0-ppc64le.tar.xz 54269552 SHA256 cd07172e19d4e914ef4157fb455e891059ec6b1d6923cc352d5e36e74befa851 SHA512 49842bd5e2a620b4bd1256085c88fb8f374f255086fc0329cb74f0be8cad4d6a4d2385a7e8b5b3e49bda3e1861fb8128fe12392fb5ac17c2ad00de9975950894 WHIRLPOOL 4b302c8b0980326376d10bda3583f1e5a2ed9f89051d3d6ad8cfe2ba917f1041d89f04316591f7bd3a10db3f1a1375f8a5d44e7f769fca1335be889fd9f5cc6a
-DIST icedtea-bin-core-3.6.0-x86.tar.xz 61382796 SHA256 79b1339a8563c3ff1c775ae313c43f5265befbe7a2bbd4ccdd69f1e61fb223be SHA512 0d2dc8d6a080cc0f85ae85fbea842b0ede86df4a1ee4d1db1ef48977039230b4060a753ed67670f154d8733fd74540485290b343ca755cd71f54bf92ad86270b WHIRLPOOL c77de0732e08df5ad2fa8f90fd0637920d5f781d5599945534f5dd2efdec4f71d058354d30b6308f9b36323570e093c18e8995c7d898a0c297abc528f1b78033
-DIST icedtea-bin-core-7.2.6.11-amd64.tar.xz 53452816 BLAKE2B 5565b23c2443d8067be4d2d7dd5552ff0a2ee0ed76935d8f2cf411f18eeb2d9670b4164efb42dfb4acd66d55d84c5df03ebaf1b8ad4b5ebc450857d210318088 SHA512 2801c07230c8fe041ff7b945afc67da582dc820c02ab4c948919ada7e728613a20afb86cf0f552102047c2e10738f0e16d388eebc5b3a44cb245e1eb2829ec4a
-DIST icedtea-bin-core-7.2.6.11-x86.tar.xz 55369568 SHA256 90143af039d56edebf073c38f199dd9c2f7a0f8f22ee28cdd25d5ce5f77c094e SHA512 90b2bd9b79bf287a6a76850e7d60f26de309b07180b8ca42709784c9ecef04e150a35760398b47967a87fb6391aea430ec22d6e7d1e7b8068e8069b27d26646c WHIRLPOOL bad37af054535d964e696d43ae99acde61228d84110350c852fff5ff97cd6fc6a70d053c4962aeb52b99c24a4b7c87625696e3c4fcb7f01c6363ae0ff5c86963
-DIST icedtea-bin-doc-3.6.0.tar.xz 11681684 SHA256 2b9c5898c645072b72a1810881626756d2afbfcda6d4f5633e86e084095d026b SHA512 a04d927cef6026833c7ba8d1127a4f0c2334969bade3ce6f2b6c03f174e8781de899e11467899721a9f450f6e87b64960b3583accede3269386251c1a8d6f1ed WHIRLPOOL 94008767054d0e3a66fb500fa1515c2606818204bda0c0ae87618e481017b34248d6a97cfe5702920dcb589d19a1365dbd5e99d78c7823f9b9c288a1f89265a4
-DIST icedtea-bin-doc-7.2.6.11.tar.xz 10611016 SHA256 b1d785364491a62420f8fded47a936c292e962e5b208b852c7235e1a80f69667 SHA512 6a1d43f469b98288b138b0a0e520185d89e487c61afaadfa82afffd7b0c5c5377c2fb03ce6abfb12da22ce54eb989371d82dca5b49d561e63bd2230961c2fa17 WHIRLPOOL b7482657675223cbe924e75cb428191e7dd23ab203a56ccd466c522fa0d52299aca2b12f811d27b44a4a8e2b038216184c311344d44a0499530d0c7214f518d4
-DIST icedtea-bin-examples-3.6.0-amd64.tar.xz 1855840 SHA256 4c199d5dfc9397f551a6d53021ebfd13a435b3a9f55af927247e3802038741ac SHA512 17e6b323d4f957aa2241b305a1ba9a0e3426593be7f35cc926d4819cf059e1022a837dace23d8aa37af713912c5ac15291b9b0cabbd9022edce86cc2294d5293 WHIRLPOOL 0c38cab1eaf1c1a0dfe58f780268903ab7132b8084a2b428c286b368034d3c0b0171a84f6175a86f7bab77325c0c8e59e7c064cb90bb6d06afc9cb13a439f29d
-DIST icedtea-bin-examples-3.6.0-arm.tar.xz 1840000 SHA256 459b10682419d23dd5373c42add1a8634881cd0885ed23c52ae4164cb641f839 SHA512 4a583857597c9d036f20b74ff620894499dc9b0463d517151f3683d092050bbc10f7eb5f84b98b6ec33e80d5ea4f250466a7c34f8a3106dc36b359865396cac3 WHIRLPOOL 672a0679d37cfa0c81e280b527686747d1b5cc5d80f2b8da00b10ed213070c5a4f944fbb79485d2d7b38dbfc06f2f754e62e86127d3ae8c8b92f50d601eaabf8
-DIST icedtea-bin-examples-3.6.0-arm64.tar.xz 1835852 SHA256 9dd8c0d4e4f17dad9b6a03b654ab9b4a6c0ebd8a275cbd40c6ea344b7d157beb SHA512 c0e779acb241caf84b9639a2714edcd4d8fc329917003a05386cabf8f2e9e2277d35da5925c6550980a90baf0138710fec7db19a1ee0caacfcbf876e7651c31a WHIRLPOOL 9fd2f5e3f21304f784db560c75497930c23cb86af59bfc34990118ba7b818fa06b65e4cbf4454d006ec008437f12595ec51e829561e17dadf09d6c5268a04eaa
+DIST icedtea-bin-core-3.6.0-x86.tar.xz 61382796 BLAKE2B c0e61aaed35e8533c82ad62f663e00a67a4d1a0614ae6e263d4cb1fb81c8e8706a29acefaa1185b1d4dfa32769ce2c05225521018ace9d6ee999153f3fbd178e SHA512 0d2dc8d6a080cc0f85ae85fbea842b0ede86df4a1ee4d1db1ef48977039230b4060a753ed67670f154d8733fd74540485290b343ca755cd71f54bf92ad86270b
+DIST icedtea-bin-doc-3.6.0.tar.xz 11681684 BLAKE2B 4124d3e3daad141a2d1d08b2744e98aaf2c2bb05c3471b4bf983d6aac70b3b6f3a36d5b1886b535b004f613e5a787f215507e64178bf4e2eee9bb5e75f28e615 SHA512 a04d927cef6026833c7ba8d1127a4f0c2334969bade3ce6f2b6c03f174e8781de899e11467899721a9f450f6e87b64960b3583accede3269386251c1a8d6f1ed
+DIST icedtea-bin-examples-3.6.0-amd64.tar.xz 1855840 BLAKE2B ef629ca83136160445e89123267dc60375974d8b0559e51404a165ca2110f72e693ada9e02a91166531a17672a6ce526962a4f2e12ecabbee0800d047a01b7d0 SHA512 17e6b323d4f957aa2241b305a1ba9a0e3426593be7f35cc926d4819cf059e1022a837dace23d8aa37af713912c5ac15291b9b0cabbd9022edce86cc2294d5293
+DIST icedtea-bin-examples-3.6.0-arm.tar.xz 1840000 BLAKE2B df8fa8c32672cdc6f45f9092478b63e5ca6acb8d20d368d6d7175ca8ee17f282bd67108a014b5469b56ed76c83ba73db9161aed0e9e6157294952da78c2115d9 SHA512 4a583857597c9d036f20b74ff620894499dc9b0463d517151f3683d092050bbc10f7eb5f84b98b6ec33e80d5ea4f250466a7c34f8a3106dc36b359865396cac3
+DIST icedtea-bin-examples-3.6.0-arm64.tar.xz 1835852 BLAKE2B e3e181205cd4240214a9cafa74162ba85c9949af5b2625445b36ea7a97c335d26f388e459ef349115b3a6245d7c1df13c002a6699f65c1fd9f2cc2a3f38eab6c SHA512 c0e779acb241caf84b9639a2714edcd4d8fc329917003a05386cabf8f2e9e2277d35da5925c6550980a90baf0138710fec7db19a1ee0caacfcbf876e7651c31a
 DIST icedtea-bin-examples-3.6.0-ppc64.tar.xz 1848136 SHA256 561ee38b6de933e03acb37064963f6c7bc49e97b135a13a28033b1d2aa012649 SHA512 62a1d1f518838635bddabd813af96033ce1d48edb0b38555987956f6df23dae8fff10baa8abb4e68e7eecd811403c8598fab1b0110757756b20d4c923434b65d WHIRLPOOL 5b59034bf0dedf1429fc859e0f04bbb0d649113118c3df24595325b55400f007aaa771073f6d2bca88e78687ad3e9445f14db0dbf6d6c9e31d4d8f2c97b48988
 DIST icedtea-bin-examples-3.6.0-ppc64le.tar.xz 1845232 SHA256 417df741a95d24399225c239abbd5d71ae9453a3650b888c4c0afbf36a98cc5d SHA512 c0b9f554d0b72ee1b7998c58081dca63d56b58ac3019216faf081752e3133d0c79b14abd61ae7a9ebef33ae8ddccac4b162fba97b742b5823c72401f2e85bc19 WHIRLPOOL 95fec3c03e2c99e785db0ccb03e49ab446a3a25af5940ec689a95c8f06d928a23c9509ce53d23bac3991b7a85ccba1f1dc5d2ec6db1283fcd8ce42998cf7a331
-DIST icedtea-bin-examples-3.6.0-x86.tar.xz 1862508 SHA256 d5fb362b8336e01f38bd990b7639c6d2ed346f27d2e56696b53804dc9dbc1b68 SHA512 d0f39687cedd4c8282816ef923163a5506eda07bfd0850bb3dde78daa4b2e21749ea273be9a1deb9e3d3f32e3dd9d1e587132229840b057558a5cdaa11f18668 WHIRLPOOL e822ee196b9609b06388a897b8aaa62cffe6d6e6d8db058d1a5df303218d2359070672666b223bb2eeb9e8dcd40c222d95400d4576fe5f84f2a81c96b80fe780
-DIST icedtea-bin-examples-7.2.6.11-amd64.tar.xz 1796180 SHA256 18757fb3b88ff425340a389109487931906c9237158ce75597be8d3e125e111b SHA512 c2f714674956cac81b24d1a929638a38fa972dd9aed1e05ae17397b58ea334053d2e5fd2800c8242c25c1f9ccddc814f4e42aa49cb82b00dca7e18b31a6f3670 WHIRLPOOL 72874ed26a3e0b363edc29187e94e6c9b2121c2946323639556c02050e3539ce92c10593ec797593c85224b3b9692313676741e030c068c4438b7897dad8508c
-DIST icedtea-bin-examples-7.2.6.11-x86.tar.xz 1797116 SHA256 f2dd2bef16173d55c0865f471637475ff1a39d027cf7044f2c4dd5c251745abe SHA512 2b91c01e2495914d0c70a6c9885246ebf7b48a9edfdb8fc0f9904db65eb3aa65ce97cec50062e39e91fc55217abccc408a4893137379e88689873907f74fd4dc WHIRLPOOL 018f9b102f06f2304b66f006b3f6a17fad00daf9815140ce5dd383ab69ef2055ebb9d92ad25c3d4a5043eea0f512f25c83bc0ad6163b621c8e421698664dcba6
-DIST icedtea-bin-src-3.6.0.tar.xz 45737964 SHA256 c7723117082376d4376e1c6d3cd563727fc05727162726075d102354d6687465 SHA512 7747beb612bb693650ff00b61524daf092890f70eed9d31321b5a347b15ed4655e3337bc887ac8cb72938f4c67b6625e216ace8e4c428277c5a4518869ca9ecd WHIRLPOOL 915770d8b3e411da3617af1cad1e19e1e1e4ed0024a57ec3f591915ddc832b741253cec54238747729f47837cb4d03bcfa7a15e0dd96915c91e5c92d0acf7be0
-DIST icedtea-bin-src-7.2.6.11.tar.xz 40213908 SHA256 f5bcfa36dcf9e4320b27ea66bda2e44396600a6e2ee1b4ab57483e0603b48177 SHA512 2a1c699ea3e781d2ff81ebbb803cd06ecf1438195a6d40f04eeb8dfb03cbc4eb4934a9563f6328a7ae4ce67f6bc14aa5cd72c84948e45632d0ab92cc14f6ecc5 WHIRLPOOL 71d1f05099e6b1f2633624b33f34d38471a13ddca187437cdc10f08cd4abb861715903b9cc856ee1dbacdef3b54eb8bb83df36f3ca2e27cea9b0a88dee2e691e
+DIST icedtea-bin-examples-3.6.0-x86.tar.xz 1862508 BLAKE2B 0a763600ed95e2efd5fab01d0d9c68f89f6f12165d1eaa33512de5e8b3f46da97b8d8129d7b388292a09b115b2c1484263eaa4b03a71dcaea50ed69d5613b07f SHA512 d0f39687cedd4c8282816ef923163a5506eda07bfd0850bb3dde78daa4b2e21749ea273be9a1deb9e3d3f32e3dd9d1e587132229840b057558a5cdaa11f18668
+DIST icedtea-bin-src-3.6.0.tar.xz 45737964 BLAKE2B 0a5b05e8e8b7da14094e1dff28d0c1ac312255369bc5df53dbad3c69771da9e6af837aaae27a60db4b50c3833043067b040db25bf8ec2bb3ee24aa9ea8b5943c SHA512 7747beb612bb693650ff00b61524daf092890f70eed9d31321b5a347b15ed4655e3337bc887ac8cb72938f4c67b6625e216ace8e4c428277c5a4518869ca9ecd
 EBUILD icedtea-bin-3.6.0.ebuild 4356 BLAKE2B 5bb21063b41dff4d2fdb6f45a11473064f18b8dc716117550a08ac06824ddf984c34212d9910e5d75329975959008bbe835b17b066cef4efb73e4f88d942f10e SHA512 c63568a6f98b082ebdd5d2ee8f68e967f3c388f7049bdecdca3c8b5261f95279d3b9500c08aca3c748b31c62038745203fb8d112158675a8c1f2f369b3a12561
-EBUILD icedtea-bin-7.2.6.11.ebuild 5767 BLAKE2B 37181d02ee3e474b1bcea4b851c08f95c99310bedae94e5dde8b00fba61d1d5e438cef5dcd614a97946a6ca36ed996844952031a4d323f0b68d87d9ea4a70010 SHA512 a0ea5d4799081f2662c3546bd2b3a46dfe54ca66eade17917583955f34a38338b33b220765ad3727a629cea5daf6107d10b57d10ab5cf55c269eb166f66751d7
-MISC metadata.xml 511 BLAKE2B 992fec67e067f1e2e365c82641790c29814af25508e434d4040499e6592e00f5091a76970c300e709622f0e2c022c046cab72903c19c02e49dfd6889a7458b29 SHA512 9396c518f5d421b54a11b2e4d1b2d25a1d76fab7e7dd7b85e5dd09d0b226cc854ac9bb1c2cfd834af21612ffc9fd34ac96fcef34b5b81c296c25a3f9bd3fd686
+MISC metadata.xml 448 BLAKE2B 5bc2cad0b1033c4e9eabfa2f651599c869f5c37f65b391885258063c7f2edcb0dbf6789e60de11302f87765fabf29a7453eb8ee61223c5d9a07a8e5efbd9a9e0 SHA512 4b2db8049d7a61cb4abeab6f602c585ca0841f0943411e14a991ed9d130e3a99997ee0c1c0383f9dc6a5c989292f8be659c70b6162271bc7cf9f6fa5a114d4ba
diff --git a/dev-java/icedtea-bin/files/icedtea-bin.env.sh b/dev-java/icedtea-bin/files/icedtea-bin.env.sh
index f85be43183f3..9734e8a604c0 100644
--- a/dev-java/icedtea-bin/files/icedtea-bin.env.sh
+++ b/dev-java/icedtea-bin/files/icedtea-bin.env.sh
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 VERSION="IcedTea JDK ${PV}$(multilib_is_native_abi || printf ' ('${ABI}')')"
@@ -7,7 +7,7 @@ JDK_HOME="${EPREFIX}/opt/icedtea-bin-${PV}$(multilib_is_native_abi || printf --
 JAVAC="\${JAVA_HOME}/bin/javac"
 PATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
 ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
-LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/$([[ ${SLOT} = 7 ]] && printf :\${JAVA_HOME}/jre/lib/$(get_system_arch)/xawt/)"
+LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/"
 MANPATH="${EPREFIX}/opt/icedtea-bin-${PV}/man"
 PROVIDES_TYPE="JDK JRE"
 PROVIDES_VERSION="1.${SLOT}"
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.6.11.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.6.11.ebuild
deleted file mode 100644
index d7ab5d7d3961..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.6.11.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-KEYWORDS="-* amd64 x86"
-
-inherit java-vm-2 multilib-build prefix toolchain-funcs
-
-abi_uri() {
-	echo "${2-$1}? (
-			${BASE_URI}/${PN}-core-${PV}-${1}.tar.xz
-			examples? ( ${BASE_URI}/${PN}-examples-${PV}-${1}.tar.xz )
-		)"
-}
-
-BASE_URI="https://dev.gentoo.org/~chewi/distfiles"
-SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
-	source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
-	multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-x86.tar.xz ) ) )
-	$(abi_uri amd64)
-	$(abi_uri x86)"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-LICENSE="GPL-2-with-classpath-exception"
-SLOT="7"
-
-IUSE="+alsa cjk +cups doc examples +gtk headless-awt multilib nsplugin nss pulseaudio selinux source +webstart"
-REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="opt/.*"
-
-RDEPEND=">=dev-libs/glib-2.42:2%
-	>=media-libs/fontconfig-2.11:1.0%
-	>=media-libs/freetype-2.5.5:2%
-	>=media-libs/lcms-2.6:2%
-	>=sys-libs/zlib-1.2.8-r1%
-	virtual/jpeg:62%
-	alsa? ( >=media-libs/alsa-lib-1.0% )
-	cups? ( >=net-print/cups-2.0% )
-	gtk? (
-		>=dev-libs/atk-2.16.0%
-		>=x11-libs/cairo-1.14.2%
-		x11-libs/gdk-pixbuf:2%
-		>=x11-libs/gtk+-2.24:2%
-		>=x11-libs/pango-1.36%
-	)
-	!headless-awt? (
-		media-libs/giflib:0/7%
-		=media-libs/libpng-1.6*%
-		>=x11-libs/libX11-1.6%
-		>=x11-libs/libXcomposite-0.4%
-		>=x11-libs/libXext-1.3%
-		>=x11-libs/libXi-1.7%
-		>=x11-libs/libXrender-0.9.8%
-		>=x11-libs/libXtst-1.2%
-	)
-	nss? (
-		>=dev-libs/nss-3.16.1-r1%
-		>=dev-libs/nspr-4.10%
-	)"
-
-# gsettings-desktop-schemas is needed for native proxy support. #431972
-RDEPEND=">=gnome-base/gsettings-desktop-schemas-3.12.2
-	media-fonts/dejavu
-	>=sys-devel/gcc-5.4.0[multilib?]
-	>=sys-libs/glibc-2.23[multilib?]
-	cjk? (
-		media-fonts/arphicfonts
-		media-fonts/baekmuk-fonts
-		media-fonts/lklug
-		media-fonts/lohit-fonts
-		media-fonts/sazanami
-	)
-	selinux? ( sec-policy/selinux-java )
-	multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
-	!multilib? ( ${RDEPEND//%/} )"
-
-DEPEND="!arm? ( dev-util/patchelf )"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-	pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"
-
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]]; then
-		die "These binaries require a hardfloat system."
-	fi
-}
-
-src_prepare() {
-	default
-
-	if ! use alsa; then
-		rm -v */jre/lib/*/libjsoundalsa.* || die
-	fi
-
-	if use headless-awt; then
-		rm -vr */jre/lib/*/{xawt,libsplashscreen.*} \
-		   */{,jre/}bin/policytool */bin/appletviewer || die
-	fi
-
-	if ! use gtk; then
-		rm -v */jre/lib/*/libjavagtk.* || die
-	fi
-
-	local lib=${P}-${ABI}/jre/lib
-
-	# The nss flag in the icedtea package just (un)comments this line.
-	sed -i "/=sun\.security\.pkcs11\.SunPKCS11/s/^#*$(usex nss '/' '/#')/" \
-		${lib}/security/java.security || die
-
-	if [[ -n "${EPREFIX}" ]]; then
-		# The binaries are built on a non-prefixed system so the
-		# fontconfig needs to have prefixes inserted.
-		rm ${lib}/fontconfig.Gentoo.bfc || die
-		hprefixify ${lib}/fontconfig.Gentoo.properties.src
-		mv ${lib}/fontconfig.Gentoo.properties{.src,} || die
-	fi
-
-	# Fix the RPATHs, except on arm.
-	# https://bugs.gentoo.org/show_bug.cgi?id=543658#c3
-	# https://github.com/NixOS/patchelf/issues/8
-	if use arm; then
-		ewarn "The RPATHs on these binaries are normally modified to avoid"
-		ewarn "conflicts with an icedtea installation built from source. This"
-		ewarn "is currently not possible on ARM so please refrain from"
-		ewarn "installing dev-java/icedtea on the same system."
-	else
-		local old="/usr/$(get_libdir)/icedtea${SLOT}"
-		local new="${EPREFIX}/opt/${P}"
-		local elf rpath
-
-		for elf in $(find -type f -executable ! -name "*.cgi" || die); do
-			rpath=$(patchelf --print-rpath "${elf}" || die "patchelf ${elf}")
-
-			if [[ -n "${rpath}" ]]; then
-				patchelf --set-rpath "${rpath//${old}/${new}}" "${elf}" || die "patchelf ${elf}"
-			fi
-		done
-	fi
-}
-
-multilib_src_install() {
-	local dest="/opt/${P}-${ABI}"
-	dest="${dest/%-${DEFAULT_ABI}/}"
-	local ddest="${ED}${dest#/}"
-	dodir "${dest}"
-
-	if multilib_is_native_abi; then
-		dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
-		use doc && dodoc -r ${P}/doc/html
-
-		# doins doesn't preserve executable bits.
-		cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
-
-		if use examples; then
-			cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
-		fi
-
-		if use source; then
-			cp ${P}/src.zip "${ddest}" || die
-		fi
-
-		# Use default VMHANDLE.
-		java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
-	else
-		local x native=$(get_system_arch ${DEFAULT_ABI})
-
-		for x in {,/jre}/{bin,lib/$(get_system_arch)} /jre/lib/rt.jar; do
-			dodir "${dest}"${x%/*}
-			cp -pRP ${P}-${ABI}${x} "${ddest}"${x} || die
-		done
-
-		for x in ${P}-${DEFAULT_ABI}{,/jre}/lib/*; do
-			[[ ${x##*/} = ${native} ]] && continue
-			[[ -e "${ddest}"/${x#*/} ]] && continue
-			dosym "${EPREFIX}"/opt/${P}/${x#*/} "${dest}"/${x#*/}
-		done
-
-		# Use ABI-suffixed VMHANDLE.
-		VMHANDLE+="-${ABI}" java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
-	fi
-
-	# Both icedtea itself and the icedtea ebuild set PAX markings but we
-	# disable them for the icedtea-bin build because the line below will
-	# respect end-user settings when icedtea-bin is actually installed.
-	java-vm_set-pax-markings "${ddest}"
-
-	# Each invocation appends to the config.
-	java-vm_revdep-mask "${EPREFIX}${dest}"
-}
-
-src_install() {
-	if use multilib; then
-		multilib_foreach_abi multilib_src_install
-	else
-		multilib_src_install
-	fi
-
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
diff --git a/dev-java/icedtea-bin/metadata.xml b/dev-java/icedtea-bin/metadata.xml
index 33843e4df12b..b7ed2bccdce7 100644
--- a/dev-java/icedtea-bin/metadata.xml
+++ b/dev-java/icedtea-bin/metadata.xml
@@ -7,7 +7,6 @@
   </maintainer>
 <use>
   <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
-  <flag name="nss">Enable NSS security provider support</flag>
   <flag name="webstart">Provide javaws command through symlink to icedtea-web</flag>
 </use>
 </pkgmetadata>