gentoo resync : 21.01.2018

12 files changed, 585 insertions, 23 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index ea95ef618d40..e764a1cf005b 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/cssparser/Manifest b/dev-java/cssparser/Manifest
index 798bab13cdd0..00011c99be43 100644
--- a/dev-java/cssparser/Manifest
+++ b/dev-java/cssparser/Manifest
@@ -1,5 +1,7 @@
 DIST cssparser-0.9.22.jar 245363 BLAKE2B ffe6838f3499d4c44097cbaabc79e2526f2c3052c9bbae4de63668ba3f01a7cffee71dbc230d416d5cd818f679b59205013eddfe79d97c9177276abf4b08f527 SHA512 33dd8906d967bdafeefb6cea9d03fc746cf350102e8e53360284638cdc3d55f254c616d2d3ab5d1849fd92e6924c9751ebff72942f0855b6fdd4ab309a509485
 DIST cssparser-0.9.23.jar 245655 BLAKE2B dfe78fde6fc706f0bfcb710c6b9dae599156dc819a1c4bf46b22bd2f9affc8da8b2e9ebecbc8e30249a48ff26da7f4c754f9bb869e3e6b7b7c1a5c311a094400 SHA512 a6799156eaa6cbd41b2969ea64fb4bc5105a866a2cdade73bef5e4a3f5b585f7f9cf0cf7f34329ef17f1b258d2d35e675f107bb81b793fdb2edf0c7c9d49da1d
+DIST cssparser-0.9.24.jar 250147 BLAKE2B bf4948bbfd58863b9bcdb3cb71192f323764f56a14e2384cc0b5d526ef6bf2bf4fce330880aa1bee7ffe45ae576999a98165fcba84e75ef402e3edfd5341e28f SHA512 bf86710473ae256fe8b24a6bf3babbe815fb1373de6acafe2695e09bb2ff11e63ec182d608861d7c7a39574bd00fc8627b48536644cd545ed45ae57e130e4bd3
 EBUILD cssparser-0.9.22.ebuild 524 BLAKE2B 90c629c61ce45c71e16da88675fa7bf4fd5611e631289fefa8846d9cfb2d325719991cf24b9dd02221a809d2ef25e6d4edc0d33aadf8877cfd796ab523f536fd SHA512 408f4f13d1988968f46a0a52cb4e0f7e43b4b191bfda52485004c8848755bfcdf505f647cb7608a18fcd2d77d4e27e8a7cafbb3ec4f2950fdd763fd81bbb38f0
 EBUILD cssparser-0.9.23.ebuild 526 BLAKE2B e268f81599b182a7cc7f92479071ae6ede794388609d48780202924cc4530f163c65db99b247373637efcbd940aed59306fb4736e1b352f597ae9cfd5ff08515 SHA512 0b8c83103cdc4ff926fff22b48eb8425dc4dc65aa7093a05b53e23ceea2792a50869aa607481b64f29b17a6031d5fe6cb788e71031726091d5005dbe3cb176d4
+EBUILD cssparser-0.9.24.ebuild 526 BLAKE2B e268f81599b182a7cc7f92479071ae6ede794388609d48780202924cc4530f163c65db99b247373637efcbd940aed59306fb4736e1b352f597ae9cfd5ff08515 SHA512 0b8c83103cdc4ff926fff22b48eb8425dc4dc65aa7093a05b53e23ceea2792a50869aa607481b64f29b17a6031d5fe6cb788e71031726091d5005dbe3cb176d4
 MISC metadata.xml 396 BLAKE2B 01cf3f00bcb1fa2f26aeb6813157821b5f6b4dd0316b8261f16a90e1cd3a66dda3a736921dd78e16ef500cc09dfecc9a045276e18c7c9e269715c1911fcd8a7e SHA512 d95036978f0c8b18cc4722df3e9f1be9fbc80df058255c4903746f00217c8e284ba7a87dbd0498b38e3f8185a95dace21a908e02304a2aaa49c32c53e02b0700
diff --git a/dev-java/cssparser/cssparser-0.9.24.ebuild b/dev-java/cssparser/cssparser-0.9.24.ebuild
new file mode 100644
index 000000000000..4e2aa29ee99f
--- /dev/null
+++ b/dev-java/cssparser/cssparser-0.9.24.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="API for parsing CSS 2 in Java"
+HOMEPAGE="http://cssparser.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar -> ${P}.jar"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/sac:0"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+JAVA_GENTOO_CLASSPATH="sac"
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index 9458247ab270..6fbde8398194 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -1,5 +1,5 @@
-DIST jdk-8u152-docs-all.zip 93495668 BLAKE2B 9bb791ef4ace0fd180953e12501900a21583cf9cd8c256246c0d8b1fe139aa7c21fffd073cf6cfc27c206f00eb9d77fd510f8ced752f7c690a4762a9f52f3e8d SHA512 5aa49103685fc466bf2c5ff32aeee9ccf5b51359bb8e558bc8f23dc399fb108cba7fd282b669ce3b8062865fc4507afc809f8fb0ca844587eb168ad44c69ad77
-DIST jdk-9.0.1_doc-all.zip 70497837 BLAKE2B 437aeae172d5a2133eb34f305925898aa80b52f15ae9860d148e3eda7de34b635c4defa0683009c4232658414c81d1f01fbea4201ea179347508caf63d13cd82 SHA512 c031497e5644abe9e9d72f9b2af6c11cf9842ee2f1001184704d994ec62b46a3620930e63944253c777d8ec9248418369579e439cf5c13c66805364669e54063
-EBUILD java-sdk-docs-1.8.0.152.ebuild 1425 BLAKE2B 4253cf3ce285b6e578ea22283601b397803ff00e483d4eed2281a0ed64aab3cec390ebc0849fd6e13a5fe630660f95c008fc7e8044bf79f6b1bab2d2fb73284f SHA512 940af01d8aad45e3bb0de48414d0efe104432459074590d975c599fca4f9f036a0a256a08e8d2dc94cd1c0d45a3902515c894377ed10a145bcdb470d990fda90
-EBUILD java-sdk-docs-9.0.1.ebuild 1262 BLAKE2B 54e63b3bb06bc674183f6cdfa1b123b187736521975b3c5758ff56c5c1c698ce73e185b851cd5437053d9613b19b5396ef762028afb9f430ab94663522bf2a2a SHA512 0f9c868a0da7f2f7ee482f1b2b606cd95ae382431779038b4376813ae6f1561bc62406d2ea9506c271cf0c12326ddbf92aacbff6c4fcac0b845a61bc3d362ba2
+DIST jdk-8u162-docs-all.zip 93476221 BLAKE2B bf871623cbf3bebd123edf73844d574cb9b88b4117a1c3a976654693e923c1a34249b5ef0c6c7812be29ed8581a1699b53536550583e666f844239ba554a1225 SHA512 944b93db6a2b471c2507786c45c50715222ad904c0f537c0e3cdf47a4b05ce560f8543377fe1c2217a79e064453aefdd70fafd32534131da2f246f6e39e60ebb
+DIST jdk-9.0.4_doc-all.zip 70500089 BLAKE2B 549da2c6baf1b39082f05d42d0fd02f7682a765c1d43a605063b155b3b3e2e20053b4044a238afb41c758700efa5de9ec53c29e2e8be1d682c2e9e7b221c0875 SHA512 7d8b40499a0ea91ac922c6916b19a061b39e73e54e123a943fcaa75fcfe66672ad445dbd789c2c9448c8cee0e7f72974ca6ad53bcaa5667547feca5791dab92b
+EBUILD java-sdk-docs-1.8.0.162.ebuild 1429 BLAKE2B 5ab8d1f6cc59a75b23c2c80a46161f1cf5c0b2c631f59e5d33d3717ec02f76818a6f8bb0d48c60430ee4187d10c581c1dd8b9661a431ab88ed87b62804713001 SHA512 bfc0d55bba0e3789b2e77258de3c9be899e8a043aa1e247f53e6bc853cfef0a2aca589504c70656d44f9f1d29f314772b41d409322a8d5ac9092d9a2e30f895f
+EBUILD java-sdk-docs-9.0.4.ebuild 1262 BLAKE2B 54e63b3bb06bc674183f6cdfa1b123b187736521975b3c5758ff56c5c1c698ce73e185b851cd5437053d9613b19b5396ef762028afb9f430ab94663522bf2a2a SHA512 0f9c868a0da7f2f7ee482f1b2b606cd95ae382431779038b4376813ae6f1561bc62406d2ea9506c271cf0c12326ddbf92aacbff6c4fcac0b845a61bc3d362ba2
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.152.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.162.ebuild
index 823be122dc21..49c3f8aaeb78 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.152.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.162.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
 inherit versionator
 
@@ -11,11 +11,10 @@ DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/jdk8-d
 	|| MY_PV_EXT="u$(get_version_component_range 4)"
 
 MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
-ORIG_NAME="jdk-${MY_PV}-docs-all.zip"
 
 DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
 HOMEPAGE="http://download.oracle.com/javase/8/docs/"
-SRC_URI="${ORIG_NAME}"
+SRC_URI="jdk-${MY_PV}-docs-all.zip"
 LICENSE="oracle-java-documentation-8"
 SLOT="1.8"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
@@ -26,19 +25,20 @@ DEPEND="app-arch/unzip"
 S="${WORKDIR}/docs"
 
 pkg_nofetch() {
-	einfo "Please download ${ORIG_NAME} from "
+	einfo "Please download ${SRC_URI} from"
 	einfo "${DOWNLOAD_URL}"
-	einfo "(agree to the license) and place it in ${DISTDIR}"
-
+	einfo "by agreeing to the license and place it in ${DISTDIR}"
+	einfo ""
 	einfo "If you find the file on the download page replaced with a higher"
-	einfo "version, please report to the bug 67266 (link below)."
-	einfo "If emerge fails because of a checksum error it is possible that"
+	einfo "version, please report it in bug #67266 (link below)."
+	einfo ""
+	einfo "If emerge fails because of a checksum error, it is possible that"
 	einfo "the upstream release changed without renaming. Try downloading the file"
 	einfo "again (or a newer revision if available). Otherwise report this to"
 	einfo "https://bugs.gentoo.org/67266 and we will make a new revision."
 }
 
-src_install(){
-	insinto /usr/share/doc/${P}/html
+src_install() {
+	insinto /usr/share/doc/${PN}-${SLOT}/html
 	doins -r index.html */
 }
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-9.0.1.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-9.0.4.ebuild
index 865ee06d1665..865ee06d1665 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-9.0.1.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-9.0.4.ebuild
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 39ed9eb8e831..af149c64165c 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -15,9 +15,24 @@ DIST jdk-8u152-solaris-sparcv9-demos.tar.gz 9769313 BLAKE2B a811ceae2a7ee8d6081b
 DIST jdk-8u152-solaris-sparcv9.tar.gz 104117809 BLAKE2B 1dc8e1297594bdd84186d4422dfc8fff94a78e0316f8873920c79342e7d0ab504794296622f0357acf137a3170f263acd0b2c1dd7179e50ff538b5648abf5a4b SHA512 9b87d11325e22bfb5f8e852ef4dcd182f091dcedfe71e5b19cc5a7d82f9f7ccb060b53512bc938d0e617648a8aa766bb722690751521b9a2cc3820507342548d
 DIST jdk-8u152-solaris-x64-demos.tar.gz 9756596 BLAKE2B 4a5ca101e20d1693eaca23120bc3244412276d51dcf7700dd5142b9d23b90a7ff0d3599dce7862e38a183ea9e1ea67afbc075bdfe84908811bec700a928f46f6 SHA512 1aeaf732ad3956ede4baa005f34024750e03919ef81b608229a3df556b47db1255ce027e4278891644433db0c360225a3e81e9a547d298a4b958beb8691f8ff2
 DIST jdk-8u152-solaris-x64.tar.gz 101758540 BLAKE2B 18b04a0eebc618148bdb215d4ca286fce141fb91dc9c0f05de2520eb073a819161af7a1533b3ecdab9961080ad52acd523b771c23a8a3da8797f0adaf974164e SHA512 4dd9606be347a61a03c0f670915c4e790d4f5eef80a67922342b539dcae7132b3157df04cd33e5f72fdc7e6fcb43e21b3b387e2da159cdfea0feb01183c68aa0
-DIST jdk-9.0.1_linux-x64_bin.tar.gz 354531775 BLAKE2B c8b81f2286a0c3c4aa8f617f4638fb0dfd70a318acb31ff6a650f566aaa0752a8bc0023ec2e4af99e2a0b6f63f30b21ac1e46d920beec486966f498a37e49cea SHA512 c62ae164553830ef2ab8fbeb6d8674ac0db3e845cabe969f33acf79beb66a16ca5096f4c3d5712d87a55b1a791ac0908b4909e8276661ee24900ad8e0a983a55
-DIST jdk-9.0.1_osx-x64_bin.dmg 400669840 BLAKE2B 1fbdbc46c2771a8d7c0d38074e4d145ad3ed32bc1f9ad6bbadecb232e5d96f8bb607839309a7fffcf9fa6731c9f43586033ab96ff1a2761c44a1d19618fc0999 SHA512 f84ea7be92b3cb219fb3b2c642e0ea088cacd252a7a795f9b65483eba7cc15bfa2ff139112d18c3eae1e7618b6aa457aca3aaaec8218581a54c81f263ab02a22
-DIST jdk-9.0.1_solaris-sparcv9_bin.tar.gz 216899843 BLAKE2B 54d5f6d903722f805d9d471aec40b8ac5bb74fa316caf81cd7e1b32f20263f2417b7edcfd6415708b9abee04cba5ad350417af3649f6c5a2c7f71fc5dd5f2639 SHA512 76ed079f2adb7b922dbfb56feb2c6aa3e30e745328b5beab4f67966b42dde509cc0e92c80bf7e5e43b1415d24350e49e3f229d15ddac3ecaa8f8a500b2f6bb79
+DIST jdk-8u162-linux-arm32-vfp-hflt-demos.tar.gz 10432598 BLAKE2B 49e8ac44c52b41851ccc96d41f77eddc92304e0ebb7b62da6bf393d73aadbd94e67d92b87bd13f7a2ccdedfbc0fc7c6ef7dd5cd2595860ee8d1776dad308e341 SHA512 00576347ec158f4f996db1aface6067b7df99a9e125bb2c22980b11ab84660cd2a3997d9519db3302fa31cbaaf98c01c5b3967b51daa5469926ca48037ef60e0
+DIST jdk-8u162-linux-arm32-vfp-hflt.tar.gz 81719419 BLAKE2B be6bd2ec7114e313e6abbd040aa9b29fe415cc15ce93b5c6fa350b0964faa7a1a3c0882c303596156065f9ea79a08bf8542757c5a8a16170d31f9cee5d7dd426 SHA512 86b835c388010f2bafd05114813ab84b4cd13334244891e9a65ae140fb65c9ad4436380043255fab36d44a91df9210ffe0858d89e48fc4efe2e460ae62928134
+DIST jdk-8u162-linux-arm64-vfp-hflt-demos.tar.gz 10434399 BLAKE2B 528476df75ec63acbe66dc58aad87e21633f34407e147352d048e76cc48c34afccf3d407229dd95ebd51bf2b5864d5b2626ddbd4a6b0d07142ce290fad58e786 SHA512 4ac7f4485c7290321221874fcac695cc47199e7ef76a0270a2d4b381bf42311a2d3dc0d325c1a50cbc0e79a82f9b876f5481a717425a7919d53e97b11d3f0a29
+DIST jdk-8u162-linux-arm64-vfp-hflt.tar.gz 78519170 BLAKE2B f8c083aba14ed5a7d70ab5c7eaaba7854a55c467608f38eec389489cbfae0a3abca3a2c9297a100eef7328c5e1d78f751dbbb11947a191fde94a428ca9e7737b SHA512 f713b174193abcf5a7cdbef2ff75a77c953f3369cdd9dd80a3633e9024c1386bed10d3889bb1ea0617ae5764fee7e70cf487c6a1a4c8c46dc92c2e27704b0d9d
+DIST jdk-8u162-linux-i586-demos.tar.gz 55100252 BLAKE2B 437dcb25306fedfda9fbda12533790d4df6b3be999ee5dafc2012e5277abc2736856f0ca028827420ff4b9aba920d8bc3f6933ead0e80e03c055e43fb7f1db71 SHA512 a867c08716874646e8073a1850f40d46f2d7b8bb1fa37ced7e95c11852ae169011fa8364055d07437cc1750974a984150eed8171b13d3bff03460cdea4b1567f
+DIST jdk-8u162-linux-i586.tar.gz 192733880 BLAKE2B e4e00ff4ca48c9de65ba7493fbd9f9ba04304d03dfb67f0130db977d2a3f244b22b6092115345e701ed60fa56e3cfc3787a6292ba29d46a082ff8205809793ad SHA512 f6b84e3fbfe741851e109908b394dd65e68e1214a049f47754dc88f4c223d217e597f7c6a6f34c94fb8fa9d78be59861475612289269b34789223519badb0a2f
+DIST jdk-8u162-linux-x64-demos.tar.gz 55164558 BLAKE2B a442bb0b9e75a61952ac8f588eef3d66f5bfe987cef982a621e12dc65e487cd49c95b9a92a5595d2d03337a07fb9d2cc4e0afbd0a041614a15a87751be525966 SHA512 a24668b4e2acb493e73ab4e0e1c8c2b60650675fe424c113514771e7ab6464bb40e839ff5b37c8e0019624160d7d3aacfc30c0049b851f34be816e13ea861db9
+DIST jdk-8u162-linux-x64.tar.gz 189815615 BLAKE2B ae4f9cac86aab3dfd528f9e8930bfecdb42fbeea8a6394c9589303766d47127083cff13567927125756c4ea174d7ee338da115266d01a3613380333022a65101 SHA512 55349e0400f2fa77144af1977b7487f38631a404b23411a294f3ab55c2190fd3db1447fe788490834a03c2093421e06ed3e2db8434f8c4f417f58763881402f6
+DIST jdk-8u162-macosx-x64.dmg 259123815 BLAKE2B 6c41876e7b9e54bbb7c14563f98825d6f41ea0cf30fbd914b4e75622f772c554a62d97b5e13f441de92428d945e985d3c32cbb285a85d5ae2ca15ff3883c97d9 SHA512 2c03129c5334ae7471a15722e70b872a3d8450d400b56333e42a663de71409b30161cd86764c8b9af7f0d49ef613ceac7d1507d821a84fb8544e53695ae6ea29
+DIST jdk-8u162-macosx-x86_64-demos.zip 55705634 BLAKE2B 088884279396ff53b69721ba8f3870a67b6d846c94d7a21e713e270f31a6366d5b1b00f371d334da264824c33ad33a1b146890888074e09af31060e8e3cac011 SHA512 939da23bc935a7c089dce9f7fcf87f4df8be911282a4a7fca6cb8b9325cdbc85632721ee596dc2f4014c81ab5d9e18a56369b46bf7ed2547dfac553a6962c1fd
+DIST jdk-8u162-solaris-sparcv9-demos.tar.gz 9799694 BLAKE2B e6812e0771cfde50ccb2623e645a114d668812656d4dc151a14f952a93f70dcbd7325c691637979eda95f2cc7892dd0e4ad75605eb72b2bdda4e1ea2bb2f9011 SHA512 b4d1a410b68b48eab66cab179274cf03f8dda1c49f155eb31bf6a91640f5ae4a9f750591d3d7327221c47d27e9fc6adc793414d1b63e404d5eb08cad2fac424b
+DIST jdk-8u162-solaris-sparcv9.tar.gz 104118900 BLAKE2B 8aa9e54e1cc189517caab4b799d2a0cb2ad8f5a5796058cb18bcdca0dd03b1dbfe927a88cb7bc257c79412a0a2594762e083e1979ee4fd21662f152c79b6b445 SHA512 10249be011c526ee707dfc1f293351d60892b64f1b9160b70583d94b17989e6705a69d6502b477a960b7826cadbb214e52aae3ce36aa4bcb3b6ddf8d06fb90eb
+DIST jdk-8u162-solaris-x64-demos.tar.gz 9752263 BLAKE2B 50e28f56df39b355587fc5894edb065eca115ef6f71c9afcef0c2640b9cd2dc8df9bb315a85219dbce96a59ab24304b429f0c756548b7a9fe26155f50916a11a SHA512 173c887650fa92f5c515fe5f7973c488301253344161ede7b1003a7fae0b5404c81fe450235c485846cb262ae82684500e249ac134f248889bea9ad05048cc1c
+DIST jdk-8u162-solaris-x64.tar.gz 101741152 BLAKE2B 9e01659aa83b11b20e47842b7ef5c23b3e376540023d92a1e2350083037d45872cb15138fcd37ad62ea05ed5d47a716b0c8dc792f415ecd18ada6ed9b075aea4 SHA512 9755a4b9af4b5aa7e904748e5d627ebffb2ff290748d28aac9b494b372815a6ca3ee219c140ed43698a341f495ccffe5f9cae3bea0ad94e1e14fefa84d287783
+DIST jdk-9.0.4_linux-x64_bin.tar.gz 354635831 BLAKE2B 6d102ca812c7fcf03b611d95880af51916dde52f09f3a5b972abd6575c73e8cca1855fb50ac00aac3f4643a1e422b5fdb97a746608b5a4235d8664926a061730 SHA512 787addfcf3d4736507ad8fa54b22894a33d39bde01d9d187d5c9f3433b43c9e8b14404a8366d0bc8510faa8936274bbfa304109d3927aa323b3f8a285efaffd6
+DIST jdk-9.0.4_osx-x64_bin.dmg 400672048 BLAKE2B 0bcc3643ccbc72cd98aca71823e06fd60068a7e1d72c7ce59f8e4c26bb9461a207f57ef239b244ec05c8f843666f2854b07a5f05841819cfe79ed8fefafb3650 SHA512 34191b5802c2d369f890cb1b563f77ee040b9af6ee4fc8ae81974f46afea675401e2a02803fc4345e11bab1103397dd8b583d68bb81edcdd02902cb3e595cc52
+DIST jdk-9.0.4_solaris-sparcv9_bin.tar.gz 217025485 BLAKE2B 6b3d4f4701ff3349f8acce727fcfcb06ce420e54dd32d2e6b91b71aa898a8d6a293375ec2cb0c66f14a5df77a6f5b7016160572b995ad84a593e9d5c6c928184 SHA512 9418a725a33dfbedf7f692abfb92550f23fca594fa8c1b85934d601284261339f177a32af7440e0b09233b2e99b2fd7cef835c54252cec6a645ea322a389de14
 EBUILD oracle-jdk-bin-1.8.0.152-r1.ebuild 10432 BLAKE2B 723f8be3fdaf73d1cabdc1d0004d6de431263755d712935686b41da08f9f5a7d3954428e4bf78ce371d12500bd0b5017c0dde2182e2778377643a0d0deeaf771 SHA512 9530367083792aceb6a0264a9b1df4268b3221f5061624be9d343fe193def4c56b57d503d29543127f64474f3a03c4f1ce4ecdfd20a468ba6c193feaadcda8e6
-EBUILD oracle-jdk-bin-9.0.1.ebuild 6710 BLAKE2B 1a01ddad717d764e8459f0bbf5665da82a224f5b3c6319bc7852da1d0a78c4ce0597ecef068176837b6deeeb439d65b42828229ff84cb925773b5333436004dc SHA512 d2fc8e409bcc5f3b261fad7f9404a257eba2273336c2c811b02454e24865276ffdb25302d89660235ddde82c8790eabe5421bd73a2c00b895e779090e13620be
+EBUILD oracle-jdk-bin-1.8.0.162.ebuild 8425 BLAKE2B d0d47b2e42f4161ebe6e7876686113106915739b22a1f933cec1583308f62aff65cb0d990d5209660ca317753ecc3ebe3bc09abe63fbd40bd348ef7f22927ed9 SHA512 3e0dcbe0825ebe73d6993fdfbccab52010e795ddaf4d0cfe4cfcc768ff50d97863d0d78f977186f1c212f960958aae4a7ea47a976b98e55eebd3c13cfa9502cc
+EBUILD oracle-jdk-bin-9.0.4.ebuild 6710 BLAKE2B 1a01ddad717d764e8459f0bbf5665da82a224f5b3c6319bc7852da1d0a78c4ce0597ecef068176837b6deeeb439d65b42828229ff84cb925773b5333436004dc SHA512 d2fc8e409bcc5f3b261fad7f9404a257eba2273336c2c811b02454e24865276ffdb25302d89660235ddde82c8790eabe5421bd73a2c00b895e779090e13620be
 MISC metadata.xml 1200 BLAKE2B 3ed6f9dd71a1c26a5292a56f89f8ce8ed72475b0c5139cb03afb47559ae464e0ed64ae4ed5a023bc2a2d316c77805a8820762a4dbfa091f612fd2729fe2f17f5 SHA512 1c104de4d08e61cb3cb14755536e7ed74df233325a673fcd83ca930335d35e77408653a4e2f962de792e186dd7ad9457e3898be159af61842610801ea00b9d9f
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162.ebuild
new file mode 100644
index 000000000000..77a16f6c75a2
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162.ebuild
@@ -0,0 +1,295 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils java-vm-2 prefix versionator
+
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
+
+if [[ "$(get_version_component_range 4)" == 0 ]] ; then
+	S_PV="$(get_version_component_range 1-3)"
+else
+	MY_PV_EXT="u$(get_version_component_range 4)"
+	S_PV="$(get_version_component_range 1-4)"
+fi
+
+MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
+
+declare -A ARCH_FILES
+ARCH_FILES[amd64]="jdk-${MY_PV}-linux-x64.tar.gz"
+ARCH_FILES[arm]="jdk-${MY_PV}-linux-arm32-vfp-hflt.tar.gz"
+ARCH_FILES[arm64]="jdk-${MY_PV}-linux-arm64-vfp-hflt.tar.gz"
+ARCH_FILES[x86]="jdk-${MY_PV}-linux-i586.tar.gz"
+ARCH_FILES[x64-macos]="jdk-${MY_PV}-macosx-x64.dmg"
+ARCH_FILES[sparc64-solaris]="jdk-${MY_PV}-solaris-sparcv9.tar.gz"
+ARCH_FILES[x64-solaris]="jdk-${MY_PV}-solaris-x64.tar.gz"
+
+for keyword in ${KEYWORDS//-\*} ; do
+	case "${keyword#\~}" in
+		*-linux) continue ;;
+		x64-macos) demo="jdk-${MY_PV}-macosx-x86_64-demos.zip" ;;
+		*) demo=${ARCH_FILES[${keyword#\~}]/./-demos.} ;;
+	esac
+
+	SRC_URI+="
+		${keyword#\~}? (
+			${ARCH_FILES[${keyword#\~}]}
+			examples? ( ${demo} )
+		)"
+done
+
+DESCRIPTION="Oracle's Java SE Development Kit"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
+SLOT="1.8"
+IUSE="alsa commercial cups derby doc examples +fontconfig headless-awt javafx jce nsplugin selinux source visualvm"
+REQUIRED_USE="javafx? ( alsa fontconfig )"
+RESTRICT="fetch preserve-libs strip"
+QA_PREBUILT="*"
+
+# NOTES:
+#
+# * cups is dlopened.
+#
+# * libpng is also dlopened but only by libsplashscreen, which isn't
+#   important, so we can exclude that.
+#
+# * We still need to work out the exact AWT and JavaFX dependencies
+#   under MacOS. It doesn't appear to use many, if any, of the
+#   dependencies below.
+#
+RDEPEND="!x64-macos? (
+		!headless-awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			x11-libs/libXtst
+		)
+		javafx? (
+			dev-libs/glib:2
+			dev-libs/libxml2:2
+			dev-libs/libxslt
+			media-libs/freetype:2
+			x11-libs/cairo
+			x11-libs/gtk+:2
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-libs/libXxf86vm
+			x11-libs/pango
+			virtual/opengl
+		)
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	doc? ( dev-java/java-sdk-docs:${SLOT} )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	!prefix? ( sys-libs/glibc:* )
+	selinux? ( sec-policy/selinux-java )"
+
+DEPEND="app-arch/zip
+	examples? ( x64-macos? ( app-arch/unzip ) )"
+
+S="${WORKDIR}/jdk$(replace_version_separator 3 _  ${S_PV})"
+
+pkg_nofetch() {
+	local a
+	einfo "Please download these files and move them to ${DISTDIR}:"
+	einfo
+	for a in ${A} ; do
+		[[ ! -f ${DISTDIR}/${a} ]] && einfo "  ${a}"
+	done
+	einfo
+	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
+	einfo
+	einfo "If the above mentioned URL does not point to the correct version anymore,"
+	einfo "please download the file from Oracle's Java download archive:"
+	einfo
+	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html"
+	einfo
+}
+
+src_unpack() {
+	if use x64-macos ; then
+		mkdir -p "${T}"/dmgmount || die
+		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg -mountpoint "${T}"/dmgmount || die
+		xar -Oxf "${T}"/dmgmount/JDK\ $(get_version_component_range 2)\ Update\ ${update}.pkg jdk${PV//.}.pkg/Payload | zcat | cpio -idv || die
+		hdiutil detach "${T}"/dmgmount || die
+		mv Contents/Home "${S}" || die
+	fi
+
+	default
+}
+
+src_prepare() {
+	default
+
+	if [[ -n ${JAVA_PKG_STRICT} ]] ; then
+		# Mark this binary early to run it now.
+		pax-mark m ./bin/javap
+
+		eqawarn "Ensure that this only calls trackJavaUsage(). If not, see bug #559936."
+		eqawarn
+		eqawarn "$(./bin/javap -J-Duser.home=${T} -c sun.misc.PostVMInitHook || die)"
+	fi
+
+	# Remove the hook that calls Oracle's evil usage tracker. Not just
+	# because it's evil but because it breaks the sandbox during builds
+	# and we can't find any other feasible way to disable it or make it
+	# write somewhere else. See bug #559936 for details.
+	zip -d jre/lib/rt.jar sun/misc/PostVMInitHook.class || die
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Create files used as storage for system preferences.
+	mkdir jre/.systemPrefs || die
+	touch jre/.systemPrefs/.system.lock || die
+	touch jre/.systemPrefs/.systemRootModFile || die
+
+	if ! use alsa ; then
+		rm -vf jre/lib/*/libjsoundalsa.* || die
+	fi
+
+	if ! use commercial ; then
+		rm -vfr lib/missioncontrol jre/lib/jfr* || die
+	fi
+
+	if use headless-awt ; then
+		rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
+		   {,jre/}bin/{javaws,policytool} \
+		   bin/appletviewer || die
+	fi
+
+	if ! use javafx ; then
+		rm -vf jre/lib/*/lib*{decora,fx,glass,prism}* \
+		   jre/lib/*/libgstreamer-lite.* {,jre/}lib/{,ext/}*fx* \
+		   bin/*javafx* bin/javapackager || die
+	fi
+
+	if ! use nsplugin ; then
+		rm -vf jre/lib/*/libnpjp2.* || die
+	else
+		local nsplugin=$(echo jre/lib/*/libnpjp2.*)
+		local nsplugin_link=${nsplugin##*/}
+		nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
+		dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
+	fi
+
+	# Even though plugins linked against multiple ffmpeg versions are
+	# provided, they generally lag behind what Gentoo has available.
+	rm -vf jre/lib/*/libavplugin* || die
+
+	# Prune all fontconfig files so that libfontconfig will be used.
+	rm -v jre/lib/fontconfig.* || die
+
+	# Packaged as dev-util/visualvm but some users prefer this version.
+	use visualvm || find -name "*visualvm*" -exec rm -vfr {} + || die
+
+	# Install desktop file for the Java Control Panel. Using
+	# ${PN}-${SLOT} to prevent file collision with JRE and other slots.
+	if [[ -d jre/lib/desktop/icons ]] ; then
+		local icon
+		pushd jre/lib/desktop/icons >/dev/null || die
+		for icon in */*/apps/sun-jcontrol.png ; do
+			insinto /usr/share/icons/"${icon%/*}"
+			newins "${icon}" sun-jcontrol-${PN}-${SLOT}.png
+		done
+		popd >/dev/null || die
+		make_desktop_entry \
+			"${dest}"/bin/jcontrol \
+			"Java Control Panel for Oracle JDK ${SLOT}" \
+			sun-jcontrol-${PN}-${SLOT} \
+			"Settings;Java;"
+	fi
+
+	dodoc COPYRIGHT
+	dodir "${dest}"
+	cp -pPR bin include jre lib man "${ddest}" || die
+
+	if use derby ; then
+		cp -pPR	db "${ddest}" || die
+	fi
+
+	if use examples && [[ ${A} = *-demos.* ]] ; then
+		cp -pPR demo sample "${ddest}" || die
+	fi
+
+	ln -s policy/$(usex jce unlimited limited)/{US_export,local}_policy.jar \
+		"${ddest}"/jre/lib/security/ || die
+
+	if use source ; then
+		cp -v src.zip "${ddest}" || die
+
+		if use javafx ; then
+			cp -v javafx-src.zip "${ddest}" || die
+		fi
+	fi
+
+	# Only install Gentoo-specific fontconfig if flag is disabled.
+	# https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
+	if ! use fontconfig ; then
+		insinto "${dest}"/jre/lib/
+		doins "$(prefixify_ro "${FILESDIR}"/fontconfig.Gentoo.properties)"
+	fi
+
+	# Needs to be done before CDS, bug #215225.
+	java-vm_set-pax-markings "${ddest}"
+
+	# See bug #207282.
+	einfo "Creating the Class Data Sharing archives"
+	case ${ARCH} in
+		arm|ia64)
+			${ddest}/bin/java -client -Xshare:dump || die
+			;;
+		x86)
+			${ddest}/bin/java -client -Xshare:dump || die
+			# limit heap size for large memory on x86 #467518
+			# this is a workaround and shouldn't be needed.
+			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
+			;;
+		*)
+			${ddest}/bin/java -server -Xshare:dump || die
+			;;
+	esac
+
+	# Remove empty dirs we might have copied.
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	if use x64-macos ; then
+		local lib
+		for lib in lib{decora_sse,glass,prism_{common,es2,sw}}.dylib ; do
+			ebegin "Fixing self-reference of ${lib}"
+			install_name_tool \
+				-id "${EPREFIX}${dest}"/jre/lib/${lib} \
+				"${ddest}"/jre/lib/${lib} || die
+			eend $?
+		done
+	fi
+
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postinst
+
+	if ! use headless-awt && ! use javafx ; then
+		ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
+		ewarn "require this and they may fail with a confusing error message."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postrm
+}
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.1.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4.ebuild
index f86453303c61..f86453303c61 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.1.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4.ebuild
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index 9b82f7cb2eb0..8abd8730eee0 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -3,9 +3,12 @@ AUX oracle-jre-bin-9.env.sh 493 BLAKE2B 938985505c591afe17468af2314fd3e15c79205d
 AUX oracle-jre-bin.env.sh 749 BLAKE2B b8c1f54712f4d41fd78bae4e7ad9e351516487b3c4573593674c1f340c4f9bafe9a283c35f8c3f136e1f93a6b0c8f6cf85837b4532db62059c7e66f05d7e0610 SHA512 273fafcafabd64946932eb42552476aeea2a9fc1c803cbcaa4f86b4fc8c80d109abdad068bf2063d7ea7e7c2d2794d7dc96dca6aae5ef8787b98ad57f467fa69
 DIST jre-8u152-linux-i586.tar.gz 83131659 BLAKE2B 5f0619eb8c0f5937d2c5da573f40daaf46d1fad27fd57fab7b422017dadc2ae51399c3a99ba6044443d535f12b2a891a7b767d7da06f8567ef19eb74f7c92b33 SHA512 8bd655ae97c333ed57991ed6d13d2c2647f85e5a1c853dd76031b8e7689db9a1b183bc665acc5b9f989139b34300ac65ab65c80e18234d6d1b06a4512fc4e542
 DIST jre-8u152-linux-x64.tar.gz 80061016 BLAKE2B 5aa25c152aae5e106bd9cb3b1b14125437531991f082548faf0b12f7e52a77e9dd01f178806d48d71d99c718358798b214a64acdfd1afa55e3791c6d78aabf95 SHA512 7c58ff2c3ac9af423ffab0ebfbfa7b4842072f6554569d76a99f8c82fa6935e36dbcf811f9c5510d71fc87db9520e684d877d99cae95f4874578ba42157ce85d
-DIST jre-9.0.1_linux-x64_bin.tar.gz 86986075 BLAKE2B cf9bc51097d3e22a8adc2296cd2e6f3680db228ba549b66b7c2a01b002ed8f376daa97d07552e52b24b6de0c751303e3f52fe179aa986d6a1a0a3140e466fcb7 SHA512 6d0cb54fa2500936bf3e9d37c9f86c5c259afc88df04aa5e8b151fdaf90ac0665eeaa5f7f50281fe8c73a5697075e139ff7b3dd9f3af60eb84635d4dac4696cb
-DIST jre-9.0.1_osx-x64_bin.tar.gz 74606780 BLAKE2B 825189d9da379defc472e98f9953e1c2c1cb908b578883e71a95e78bc6c338ac862f4493a79aad55cc90f520a8d6a27fafd30ccc300940dfada6ac29811595c1 SHA512 2751ac8b1f9098990047624aba6e764fe783170c95a99755244c233c331ffc52606c334151a1aced504dd12a84cffe0ba1050ed8482df24fc4a6fffc72b18b20
-DIST jre-9.0.1_solaris-sparcv9_bin.tar.gz 54821972 BLAKE2B 979296c5ed8917acc70655da72a00c0b771f40c18da4ca2b403cf4a2c5361f0a09821aa487e5f3c9d2cd057e6d8cbd7efdd48ac22fa2fc36352e8a6cc051f84f SHA512 c3ab0837acda00cdc532a528ee648c8e5334ee263fabaf7b2e86488f84615779431ccaf8d421e10cc00aa46fafebb0d52ed6358541de21c42cc801e7bac17bf4
+DIST jre-8u162-linux-i586.tar.gz 83185844 BLAKE2B 0739e0e272e19560554976d993d229e0bfd6df11389f6dc8e8292717620fdb8e2786128890667375b5399f96d696ec7fb2ac2369d1edea82753d8c6e659c0aeb SHA512 154af4397163c68266e963280bdc4794ca088e207f9426213035e06bbfc4f024ec5c20c89d8d58323e56ace6af4e89d2f08a80fd436c70fc712ed0401772d213
+DIST jre-8u162-linux-x64.tar.gz 80107578 BLAKE2B 28b86729414cfd58290b01990a57b7a87cba1b4ff6361df45988433b90b6c29878abe120c6b90e6c31cbd306960bb75139ea054544f109d863cdad723fd4f0fb SHA512 dbda4346d76925f47ffd288fe9ad21cb2235f55da380945d6cfed8d94322ba97cf8832d3d328f0622c6175620f1682b93e9e380403db3f2d4804062fb7832e66
+DIST jre-9.0.4_linux-x64_bin.tar.gz 87045353 BLAKE2B ccf3c0d725ca1431261a0b38cc06851fc10651415982fa2d97f512972c088c2c158ee51710b59e04f89326dd4cbb4c1ef8ecf514af190fbdc2be07cd222fd5d8 SHA512 20310fe68c89d26a89523eb1fe583eb5706fe2458342f5be0dfb4badd1d9df6ba25b00463f080fceb7c22781ff1555a61b29d187d8b02e1f9e165120b8140c3b
+DIST jre-9.0.4_osx-x64_bin.tar.gz 74599903 BLAKE2B a1bd4d51ee645347fcb735e46ee3311d34933bb0dbb20b9a668ed7b817be1d0432f4152f53f57a9fc16d6b6b7f38ea4118f5cae86a8b71143db0091c9baf62de SHA512 fc4bc4a062313a7e33943ace27287ba6e551727f0cf81d9a18f9f8c2f57b0ae00bd0d8619a65f596d75d4869fea757fedae3efdd8ba3ced58fa28b7cf93b3a85
+DIST jre-9.0.4_solaris-sparcv9_bin.tar.gz 54879298 BLAKE2B fb3ce1eefdb12378b28f5af0f0bbc1d9f3252eee5646be237b2ddc0ead37ed253fb73900475777c3f67d39b47112e0c2db2a18f6a05da7c5c19cd965e5513827 SHA512 709219f51d7455c127a38953babad39b344dee1275ad0fe65a0116e8fb15a10482589ba881ccae7910acff8f00aa7856c726c03daa8f3947d742bbbc09a276dd
 EBUILD oracle-jre-bin-1.8.0.152-r1.ebuild 6433 BLAKE2B b8d6d8af36e186c06aa9df958b316aeb6974b5e90b29b72c7a2c2c06ecf461fafa517eedb50f131a9d18850f325e949c9c6e702f0028115d7fbdb45a39796488 SHA512 2b26c0a9250fa719b1da5370b8cb632a6bcf6f2336cabe21d086ed73030757776d94de13e3be8a64b1002dfcf3af61501f6a08eb6e903b79888df0e9b96c9908
-EBUILD oracle-jre-bin-9.0.1.ebuild 6271 BLAKE2B 6921bb42d99f25b55c06be1b1e8b86ce748c1d610f5a70e9cbb9376f221cb40eb0150cad55b857be5f27fb60bbbceb669bb81b97faf67a9f82378f2687efd19a SHA512 5237fab65b48a29b5229955ffce011b293bcffe2eef0a9e2f8627a06f0b6df0db16161f70ac03a039e30b9921442162a803da1a8ce541bd28896a0362811cf28
+EBUILD oracle-jre-bin-1.8.0.162.ebuild 6049 BLAKE2B f85d4babe337421eaa8e9436e17e9fee4bb0f8776b018474c7ec73c15473d5163a4a9cf34317a9effb4e386bde94a1dc41dc8ad34c3dbe15d886446809194eec SHA512 ea297e0274c5644c4756ca79c1b230298bdd9af175bc540df354da74f6e61b3a9a04ce92ae5b814b830be8659850874697eb35e1339bee0a6d5d899794f0604f
+EBUILD oracle-jre-bin-9.0.4.ebuild 6271 BLAKE2B 6921bb42d99f25b55c06be1b1e8b86ce748c1d610f5a70e9cbb9376f221cb40eb0150cad55b857be5f27fb60bbbceb669bb81b97faf67a9f82378f2687efd19a SHA512 5237fab65b48a29b5229955ffce011b293bcffe2eef0a9e2f8627a06f0b6df0db16161f70ac03a039e30b9921442162a803da1a8ce541bd28896a0362811cf28
 MISC metadata.xml 996 BLAKE2B 0ceaf014bbef2817e869d5364997a44f77be90717bd01a09114b18e9318f58b61e3f4048f3b22a7ee8430a1042695f313066e996c15db71ee0775cf73aa7f1ef SHA512 043f1e701ac085678dbbb662994f6b67c78634990d721c65de97b392555e3a2fe5bfaccbe00f48c5dbd7c4e48837c6662d70306bf7cb3485ee3b2efa440b7afe
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.162.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.162.ebuild
new file mode 100644
index 000000000000..ae1df986f57c
--- /dev/null
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.162.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils java-vm-2 prefix versionator
+
+KEYWORDS="-* ~amd64 ~x86"
+
+if [[ "$(get_version_component_range 4)" == 0 ]] ; then
+	S_PV="$(get_version_component_range 1-3)"
+else
+	MY_PV_EXT="u$(get_version_component_range 4)"
+	S_PV="$(get_version_component_range 1-4)"
+fi
+
+MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
+
+declare -A ARCH_FILES
+ARCH_FILES[amd64]="jre-${MY_PV}-linux-x64.tar.gz"
+ARCH_FILES[x86]="jre-${MY_PV}-linux-i586.tar.gz"
+
+for keyword in ${KEYWORDS//-\*} ; do
+	SRC_URI+=" ${keyword#\~}? ( ${ARCH_FILES[${keyword#\~}]} )"
+done
+
+DESCRIPTION="Oracle's Java SE Runtime Environment"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="1.8"
+IUSE="alsa commercial cups +fontconfig headless-awt javafx jce nsplugin selinux"
+RESTRICT="fetch preserve-libs strip"
+QA_PREBUILT="*"
+
+# NOTES:
+#
+# * cups is dlopened.
+#
+# * libpng is also dlopened but only by libsplashscreen, which isn't
+#   important, so we can exclude that.
+#
+# * We still need to work out the exact AWT and JavaFX dependencies
+#   under MacOS. It doesn't appear to use many, if any, of the
+#   dependencies below.
+#
+RDEPEND="!x64-macos? (
+		!headless-awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			x11-libs/libXtst
+		)
+		javafx? (
+			dev-libs/glib:2
+			dev-libs/libxml2:2
+			dev-libs/libxslt
+			media-libs/freetype:2
+			x11-libs/cairo
+			x11-libs/gtk+:2
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-libs/libXxf86vm
+			x11-libs/pango
+			virtual/opengl
+		)
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	!prefix? ( sys-libs/glibc:* )
+	selinux? ( sec-policy/selinux-java )"
+
+DEPEND="app-arch/zip"
+
+S="${WORKDIR}/jre$(replace_version_separator 3 _  ${S_PV})"
+
+pkg_nofetch() {
+	einfo "Please download ${ARCH_FILES[${ARCH}]} and move it to"
+	einfo "${DISTDIR}:"
+	einfo
+	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"
+	einfo
+	einfo "If the above mentioned URL does not point to the correct version anymore,"
+	einfo "please download the file from Oracle's Java download archive:"
+	einfo
+	einfo "  http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html"
+	einfo
+}
+
+src_prepare() {
+	default
+
+	# Remove the hook that calls Oracle's evil usage tracker. Not just
+	# because it's evil but because it breaks the sandbox during builds
+	# and we can't find any other feasible way to disable it or make it
+	# write somewhere else. See bug #559936 for details.
+	zip -d lib/rt.jar sun/misc/PostVMInitHook.class || die
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Create files used as storage for system preferences.
+	mkdir .systemPrefs || die
+	touch .systemPrefs/.system.lock || die
+	touch .systemPrefs/.systemRootModFile || die
+
+	if ! use alsa ; then
+		rm -vf lib/*/libjsoundalsa.* || die
+	fi
+
+	if ! use commercial ; then
+		rm -vfr lib/jfr* || die
+	fi
+
+	if use headless-awt ; then
+		rm -vf lib/*/lib*{[jx]awt,splashscreen}* \
+		   bin/{javaws,policytool} || die
+	fi
+
+	if ! use javafx ; then
+		rm -vf lib/*/lib*{decora,fx,glass,prism}* \
+		   lib/*/libgstreamer-lite.* lib/{,ext/}*fx* || die
+	fi
+
+	if ! use nsplugin ; then
+		rm -vf lib/*/libnpjp2.* || die
+	else
+		local nsplugin=$(echo lib/*/libnpjp2.*)
+		local nsplugin_link=${nsplugin##*/}
+		nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
+		dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
+	fi
+
+	# Even though plugins linked against multiple ffmpeg versions are
+	# provided, they generally lag behind what Gentoo has available.
+	rm -vf lib/*/libavplugin* || die
+
+	# Prune all fontconfig files so that libfontconfig will be used.
+	rm -v lib/fontconfig.* || die
+
+	# Install desktop file for the Java Control Panel. Using
+	# ${PN}-${SLOT} to prevent file collision with JDK and other slots.
+	if [[ -d lib/desktop/icons ]] ; then
+		local icon
+		pushd lib/desktop/icons >/dev/null || die
+		for icon in */*/apps/sun-jcontrol.png ; do
+			insinto /usr/share/icons/"${icon%/*}"
+			newins "${icon}" sun-jcontrol-${PN}-${SLOT}.png
+		done
+		popd >/dev/null || die
+		make_desktop_entry \
+			"${dest}"/bin/jcontrol \
+			"Java Control Panel for Oracle JRE ${SLOT}" \
+			sun-jcontrol-${PN}-${SLOT} \
+			"Settings;Java;"
+	fi
+
+	dodoc COPYRIGHT
+	dodir "${dest}"
+	cp -pPR	bin lib man "${ddest}" || die
+
+	ln -s policy/$(usex jce unlimited limited)/{US_export,local}_policy.jar \
+		"${ddest}"/lib/security/ || die
+
+	# Only install Gentoo-specific fontconfig if flag is disabled.
+	# https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
+	if ! use fontconfig ; then
+		insinto "${dest}"/lib/
+		doins "$(prefixify_ro "${FILESDIR}"/fontconfig.Gentoo.properties)"
+	fi
+
+	# Needs to be done before CDS, bug #215225.
+	java-vm_set-pax-markings "${ddest}"
+
+	# See bug #207282.
+	einfo "Creating the Class Data Sharing archives"
+	case ${ARCH} in
+		arm|ia64)
+			${ddest}/bin/java -client -Xshare:dump || die
+			;;
+		x86)
+			${ddest}/bin/java -client -Xshare:dump || die
+			# limit heap size for large memory on x86 #467518
+			# this is a workaround and shouldn't be needed.
+			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
+			;;
+		*)
+			${ddest}/bin/java -server -Xshare:dump || die
+			;;
+	esac
+
+	# Remove empty dirs we might have copied.
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postinst
+
+	if ! use headless-awt && ! use javafx ; then
+		ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
+		ewarn "require this and they may fail with a confusing error message."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postrm
+}
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-9.0.1.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-9.0.4.ebuild
index 81ca64dc5cc8..81ca64dc5cc8 100644
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-9.0.1.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-9.0.4.ebuild