13 files changed, 228 insertions, 549 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 172ee0e8b514..cc8dcdd6f564 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 1149c2ecf585..6f8654e4bf72 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -27,6 +27,6 @@ DIST icedtea-bin-examples-3.9.0-ppc64le.tar.xz 1845088 BLAKE2B 95f98bf4d76241eba
 DIST icedtea-bin-examples-3.9.0-r1-x86.tar.xz 1862632 BLAKE2B ac63c7f38ec35dd63b01e5f9472a1f226fd3eac7f5e5f8a55e5d211b20344b86ad2d55cbe8f67acfe80a30bbddc72f8de091ae6d3b7df454bbe43c42ec957726 SHA512 d5b377e015550f14996deb040ce753fa4f88eb1fc0ed76babee6e187feff61c8947c54c4f876d25e5fc6344b1411c4c93b75d362206f966e69b205a14d18380c
 DIST icedtea-bin-src-3.10.0.tar.xz 45755380 BLAKE2B ba6fd20de7d21e728108ff1d30599112ddf7ac24135e30891ae0d033bf77d52238c81c5c7fc7375e062ad4e8bb9492098cc0a20d3ab8486a4a02f20efa1f06a5 SHA512 0693cfe83a80d5e9e86be394b142b23097b0cfc1193f68f0fd07045ad4792b38bffcce47ea764f934d3dbfc568bdfbf5017725e7f35fbe1175b48498d53b0c5e
 DIST icedtea-bin-src-3.9.0.tar.xz 45749212 BLAKE2B 2b66ddd1639e84c637775321648d24e6161c292f54af40d6ce1dbd07e9bbcbb177d5895548ea82a6168b35811d48807e58292533846091f13745f13408ee055e SHA512 05b4df389d84f7be144bc99c10cf544183db77b4a7c141826079edb445b5af333440a5bf0ac627133043e276334993969be22caca2db9edd6249560a4db031e2
-EBUILD icedtea-bin-3.10.0.ebuild 4386 BLAKE2B 720659af370151591be9a945ba7d3f030e0d63b2e27d957e1f4600f614f0b4c5cdf667f8b8854f8fe4550d178ac19183ae77f1aa6815cd8c18850f4d658f7d86 SHA512 b74d9c57e899871377d8f5edec1307320169b7ab2007af5aa4bd3a1b2688a222935427585a8fcfebc0963c7b8e51e1a981a1d3d48562ec8206b1485d5c784932
+EBUILD icedtea-bin-3.10.0.ebuild 4384 BLAKE2B bf9894c86c08252a65668b6c1d59439de1f52203817bb63040435f43a21b9464cb1c02bdfe12a55a3b3de6f35bb3c78580abb4d8f8b7d3b9f27f0805a5f87971 SHA512 36f2db8aad218054f8f2996944c943fa79ce61a1a244eb74a4c1f255ee517bdf09c2cbb2bc334d94983bf6b5cda4822897f2b69c2e8836eac28999d42b985536
 EBUILD icedtea-bin-3.9.0-r1.ebuild 4384 BLAKE2B 332158ae2f0276eba921a2ea3d7ad3db1b137adddab2979d5e0f19d2c70bce6ccca27f0598663dc7f96f9b5f536f8d6cfec1bfe4250f1cd8f60451eb9a3be2f1 SHA512 02c98cb023c4cf21735796ddfd3a46528ea3bfd250bd58208a5ac0e11a916e29608ae2fbf42fc6c4c4f2e923b88d561ca9e5be636a742a0c365bcaa98ea73bc8
 MISC metadata.xml 448 BLAKE2B 5bc2cad0b1033c4e9eabfa2f651599c869f5c37f65b391885258063c7f2edcb0dbf6789e60de11302f87765fabf29a7453eb8ee61223c5d9a07a8e5efbd9a9e0 SHA512 4b2db8049d7a61cb4abeab6f602c585ca0841f0943411e14a991ed9d130e3a99997ee0c1c0383f9dc6a5c989292f8be659c70b6162271bc7cf9f6fa5a114d4ba
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.10.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.10.0.ebuild
index 56e4f9b412b2..a214c68cb503 100644
--- a/dev-java/icedtea-bin/icedtea-bin-3.10.0.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-3.10.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 # Don't block arm. See bug #600134.
 #MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="-* amd64 ~arm ~arm64 ppc64 ~x86"
 
 inherit java-vm-2 multilib-build toolchain-funcs
 
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 2891cefb70e2..58210bca367e 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,10 +1,10 @@
 AUX openjdk-bin-11.env.sh 496 BLAKE2B 6a99de9730f8e84f6082a08fc925126a2fa1579f040b7f083af371218c4523956d5a86777e1bfbca7a63a717992d1a170d539d04f26f5317c3fbb9a14972c191 SHA512 94ec17c26c7305c57fb53356a4477711fd987c4d48af114f481579f316c20ed487ec40124361bd0cf2c947f59eaf93ca629975f9e999d47f5025269187db82ad
-DIST OpenJDK11-jdk_aarch64_linux_hotspot_11_28.tar.gz 193328951 BLAKE2B f7586ed6b5e5562f6b1b4ed155abadbe31cb85459c982b0011e75d85046261c0a78dcaab343fb5c5c7a382c3fd1ac52caefc8194262e35c3601b9aae5a9b94e3 SHA512 b2e5bd25fd62425e25a9a60cd2ca4b080748a352c04c29f206ab121245226c61fa5a8573d342d8bf88efd83a9a7890fd85cf90d700dae28f632878a60d79ea75
-DIST OpenJDK11-jdk_ppc64le_linux_hotspot_11_28.tar.gz 176285783 BLAKE2B a64f86a4f69302efe0eb2645d39c44ce89bcf58c765c12c109735fb2ede5959b0659d4b9f85cf8e79102fc6f00443b99a78fc5745086b1b5e16bd41958db1ed7 SHA512 84eb35634a985647d4fc90c6c4a1855c1c059e5fde8cf3ef7665fa754a7549cb3905a1c35710c6c936426efd6e0bc1ac773fbef11550dbadbff622fd2c201d74
-DIST OpenJDK11-jdk_x64_linux_hotspot_11_28.tar.gz 195689094 BLAKE2B 4d65b7993fddd113964103a1066faa6e7e83ab7807f6403c1f5bc5a72ca82dc51287d4911e264ba5754b7c1184aa1f1d1c94d19ae242ab02bf238f6c359c0de3 SHA512 f7a427bc33b2e8a2f68c7955b23d14f2eacf7b526f2990b29e55bdb1ae96d3e14f3d7c169c76ba4b18fd8195cef81d7199a37a81ce73d6b21a72f07388e70793
 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.1_13.tar.gz 193388219 BLAKE2B 21ff9bcd5288a17ff7f660fb9b1bbb6c38589fea72850729227a985dce1966c6d0b0d6c64ad6885c17612d215e58a50cec5f70205877bb26c70924b15f92886b SHA512 200ebd5882e2ebd315a2d0fdd800d70b52d468022ae565756ccd56e1fdd2464b459753cfad6c5f46a61cdda8a003cdfe031c2a6a12e047bbe7ee2133dd048546
+DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.2_7.tar.gz 194181157 BLAKE2B 7883e6846670c87f4ed8338804671bff19ba2910e1e96eacd9729f2ba64e9c6b460d300080e3cd3a4f94722ff9942832681bf23f64e9401e07d824028614874f SHA512 d982d4ba8c1b99b8685b36b9c0b6bb6ff8f8ec04de74945876915e01827fb389ad72d868c387f0ef4d5dd1a21cb09170b0d14ca33a2c2ec0c1f95c09fc1a475a
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.1_13.tar.gz 179520284 BLAKE2B 32acf913aa1b176ca98af0c6111e7f14bba22b84547e24dac279205bb0c81fc3845239e9e34c897c18452ebbb4c71b8185fc4d7d3a2856f3cc767ed4c268d61c SHA512 3bf9fa8eb4cdad03dbbb648b6ab1d8ed5ed34584abe2bec254626952aeba2fc5d492075ba0308ab8e28824959df5f11bb46ec1638c2588b352dd58a5097c030a
+DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.2_7.tar.gz 180394013 BLAKE2B b5b82b6cd4121e2fbf66c948435bc84d549a11a793310bf0624898562005d5fc01a2f2de84a18517a75ccb2ed7d9f5173dc0a087500eb897e8d7461838991af1 SHA512 5f1a54e7d2456b42e23488b3699b09d82c57f3cb7056684a15f5aa19b992f4b1638acac716d6ed15c0a409ff1953022892ea55f7ed0542d210f5fd43f33fd8e0
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.1_13.tar.gz 195710782 BLAKE2B a374afea8de4333488294dcb200e235f7cc42309a56e693a9b5434dc74d0189b57c26adc93ef22454a4ed05f44b90afa8fdfc016feb022c1eaeb706044581f24 SHA512 b5e55cd32daa3b30fb84b8f4fed0ef70e4f8e3e153974c0c9fa0fcdf22cade99613da93f2289798b625adde24d9a1c4c4808a139e9f2feb2543b05f273f3bdd8
+DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_7.tar.gz 195593592 BLAKE2B 038c88dd4475842ffd27afc9249925baea0230cd993a963e13c2e090a0f6332fbeaebefae5b5e98026a12a7d94696633507a9d08af469b0227372088b5cd4869 SHA512 f9f4d168105e499b0da4923c6fe18c31ea6f6a24a48fc9d47b643460316d75de273f8f6dcbd43c9df6efcfb77127182dab8125c55f63200c5ff53cc9eb0ddcdc
 EBUILD openjdk-bin-11.0.1_p13.ebuild 2784 BLAKE2B 95876cd57127d335f3d994730512546d1e3ee5a46aeeaa0bf50ec10d9914bc176dae841b1865ddde5b5b0e3fb71b6f830465fbe13d1ef5f21cd084293f7b5d23 SHA512 ce814dc3dbf3b3a6e2272c496d4b29dcb614e7eaceaf7245050fdc1c797678b187b49b876bdcc313e83050d7c21bbf965f9e735e495064ea0b5bb9bb3039b188
-EBUILD openjdk-bin-11_p28.ebuild 2775 BLAKE2B 20fabb82d8101b07553d846723eba61a7fbb2190778219380d0d765d8bb37a90bc7d283c362c9ead2a8bb976658ed106aa2403dca13c021a9d8cfb8edb0bbc8e SHA512 bdcd5bd21dd5f2bad6de0d49ea2a27994abf1cb005bfd0f84c385a6636ad9f76ba01b130a48540da2ba0cc2cb3496b0dde4d9fdc186798a0f9bf218a919d00b6
+EBUILD openjdk-bin-11.0.2_p7.ebuild 2785 BLAKE2B 77c144ad87f6024f82b3ea81a0dfb9f79e6adaa2e172c061215e047f3e812ae025d0d73f05801cbd3775c36d70bf8045e8f3f9d3b2cd25d4e4fa5fab4559a186 SHA512 9b26a81ca3401bc24c54c5f1c26df6da1749adf905f1d8476ab2696bf6810deb587619ee4d57c8b05498d46f2fc1753484e2cd29929ee618ba989ab14970a34c
 MISC metadata.xml 921 BLAKE2B 9441e4d8e4ab3fd0c0523e7d96a60b6e1fd77e863fe6a2a9ab709d50864d72467304543c6771acea567440f9b02ab7b9c63053fe73c2780e655a12976964a4e3 SHA512 5ffc9ebc2ed1ecd969c0ce65032b174ecdc74614bc7f751d069d4cd2e2a17019bf24f6c1c3f27a0ba4f7ca2e78fb6ff420b51f4997fc8ec206e88af6ee8a0106
diff --git a/dev-java/openjdk-bin/openjdk-bin-11_p28.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.2_p7.ebuild
index bb324e59cec0..ad6e3e5d68c6 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11_p28.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.2_p7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit java-vm-2
 
 abi_uri() {
 	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}-jdk_${1}_linux_hotspot_${MY_PV//[.+]/_}.tar.gz
+			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
 		)"
 }
 
@@ -25,8 +25,6 @@ HOMEPAGE="https://adoptopenjdk.net"
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="~amd64 ~arm64 ~ppc64"
 IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
-RESTRICT="preserve-libs"
-QA_PREBUILT="*"
 
 RDEPEND="
 	media-libs/fontconfig:1.0
@@ -48,6 +46,9 @@ RDEPEND="
 PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
 	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
 
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
 S="${WORKDIR}/jdk-${MY_PV}"
 
 src_install() {
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 99b498ed9a65..2ee6d0d48cf5 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,4 +1,6 @@
 AUX openjdk-11.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e
 DIST jdk-11.0.1+13.tar.bz2 90134818 BLAKE2B c79f32dc5b531a06317afb87ef15495267e914b9b292a1d434514a90298d8234e7e0ba92659416b15d9392c7513d976a0c81411953cb6706a27ee57c965e36fb SHA512 c534c2fa8dcd4fdebef6f00473d5ceaae4a33bd1e1a417846508e25f154b1ded649a73468c8c71ac0c1e27bab5f641a3b480a264b532a0c30be2869c3d11a15d
+DIST jdk-11.0.2+7.tar.bz2 90189455 BLAKE2B 37473a8db4c6ad6789ea67b44f4dda94b9f59143c681a206aa0931b3a2a376fbc480c0c5a6b617072cf9ce1faca34a6c5c5e56cfec9fbf5482b82520fb2463c4 SHA512 03214d9fc920c04f3057594efa78ff588a630e6c594e5bbcc24b4c327fa08273ce060063d98720cdc04bc6978a3d04e172f38ba7a3bcabf02dd5dad397fd9952
 EBUILD openjdk-11.0.1_p13.ebuild 6401 BLAKE2B 86381bd59fe75ed46ea61be83ab4472d159ebc3fc8e4e8c0002d3ea466ec00698f596c42e00ae7be917f99d3fb3ae29f1cfdc210bcfd6c8356190b43c94e54b9 SHA512 14e99b33160524651ae00cf05d99fc15ae256cdd58c9819b5989cdda26ac69b867bb65446b800d400def2651f191b3d06682f5ab9cbed8f50cb68bab6e1019a0
+EBUILD openjdk-11.0.2_p7.ebuild 5815 BLAKE2B 654c041720ff2ca3fac23832b8f848cad3819d09c15b0d6da1d46afb9d1b75c6005e1931b77971a4e806a1fb4dfd919605a886090800063a37eb2ea5aafcecc9 SHA512 65d119936667ae3bf2ae9106b99180fc0fc6be30e905bd2f5bcf96c430374412fdf831dc7a698543abec23c3acc8ae1ea3790d7efb8b010d776c49d033742b28
 MISC metadata.xml 955 BLAKE2B 5fcc3e2073db70e6c79ad69c8d3cdc516393d4f0bb18e89a5801ce45afc55a90584d6f65389cbb75b1b81e1bccbfddfa2edc54aef2dbfa8c65ec54087e3a11c2 SHA512 07e908b635f563d116e8dcb8ad9f550f679168c6d548732dca0090424f6caef5c849fcf64036e8732884e190cbbe125097eb3f5ef8ec65b54ad86ed1f1893331
diff --git a/dev-java/openjdk/openjdk-11.0.2_p7.ebuild b/dev-java/openjdk/openjdk-11.0.2_p7.ebuild
new file mode 100644
index 000000000000..1a48fa81cb9c
--- /dev/null
+++ b/dev-java/openjdk/openjdk-11.0.2_p7.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+
+DESCRIPTION="Open source implementation of the Java programming language"
+HOMEPAGE="https://openjdk.java.net"
+SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+IUSE="alsa cups debug doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source systemtap +webstart"
+
+CDEPEND="
+	media-libs/freetype:2=
+	sys-libs/zlib
+	systemtap? ( dev-util/systemtap )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXt
+		x11-libs/libXtst
+	)
+"
+
+# cups and alsa required to build, but not to run, make is possible to remove
+RDEPEND="
+	${CDEPEND}
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/zip
+	media-libs/alsa-lib
+	net-print/cups
+	!headless-awt? (
+		x11-base/xorg-proto
+	)
+	|| (
+		dev-java/openjdk-bin:${SLOT}
+		dev-java/openjdk:${SLOT}
+	)
+"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
+
+S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
+
+# The space required to build varies wildly depending on USE flags,
+# ranging from 2GB to 16GB. This function is certainly not exact but
+# should be close enough to be useful.
+openjdk_check_requirements() {
+	local M
+	M=2048
+	M=$(( $(usex jbootstrap 2 1) * $M ))
+	M=$(( $(usex debug 3 1) * $M ))
+	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
+
+	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	openjdk_check_requirements
+}
+
+pkg_setup() {
+	openjdk_check_requirements
+	java-vm-2_pkg_setup
+
+	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
+	JAVA_PKG_WANT_SOURCE="${SLOT}"
+	JAVA_PKG_WANT_TARGET="${SLOT}"
+
+	# The nastiness below is necessary while the gentoo-vm USE flag is
+	# masked. First we call java-pkg-2_pkg_setup if it looks like the
+	# flag was unmasked against one of the possible build VMs. If not,
+	# we try finding one of them in their expected locations. This would
+	# have been slightly less messy if openjdk-bin had been installed to
+	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
+	# file but disable it so that it would not normally be selectable.
+
+	local vm
+	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
+		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
+			java-pkg-2_pkg_setup
+			return
+		fi
+	done
+
+	if has_version --host-root dev-java/openjdk:${SLOT}; then
+		export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
+	else
+		JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
+		[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
+		JDK_HOME=${JDK_HOME#*/}
+		JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
+		export JDK_HOME
+	fi
+}
+
+src_prepare() {
+	default
+	chmod +x configure || die
+}
+
+src_configure() {
+	# Work around stack alignment issue, bug #647954. in case we ever have x86
+	use x86 && append-flags -mincoming-stack-boundary=2
+
+	# Enabling full docs appears to break doc building. If not
+	# explicitly disabled, the flag will get auto-enabled if pandoc and
+	# graphviz are detected. pandoc has loads of dependencies anyway.
+	# currently it still bundles lcms libpng giflib and libjpeg.
+
+	local myconf=(
+		--disable-ccache
+		--enable-full-docs=no
+		--with-boot-jdk="${JDK_HOME}"
+		--with-extra-cflags="${CFLAGS}"
+		--with-extra-cxxflags="${CXXFLAGS}"
+		--with-extra-ldflags="${LDFLAGS}"
+		--with-native-debug-symbols=$(usex debug internal none)
+		--with-version-pre=gentoo
+		--with-version-string=${MY_PV%+*}
+		--with-version-build=${MY_PV#*+}
+		--with-zlib=system
+		--enable-dtrace=$(usex systemtap yes no)
+		--enable-headless-only=$(usex headless-awt yes no)
+	)
+
+	# PaX breaks pch, bug #601016
+	if use pch && ! host-is-pax; then
+		myconf+=( --enable-precompiled-headers )
+	else
+		myconf+=( --disable-precompiled-headers )
+	fi
+
+	(
+		unset JAVA JAVAC XARGS
+		CFLAGS= CXXFLAGS= LDFLAGS= \
+		CONFIG_SITE=/dev/null \
+		econf "${myconf[@]}"
+	)
+}
+
+src_compile() {
+	emake -j1 \
+		$(usex jbootstrap bootcycle-images product-images) $(usex doc docs '') \
+		JOBS=$(makeopts_jobs) LOG=debug CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
+	local ddest="${ED}${dest#/}"
+
+	cd "${S}"/build/*-release/images/jdk || die
+
+	# Oracle and IcedTea have libjsoundalsa.so depending on
+	# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
+	if ! use alsa ; then
+		rm -v lib/libjsound.* || die
+	fi
+
+	if ! use examples ; then
+		rm -vr demo/ || die
+	fi
+
+	if ! use source ; then
+		rm -v lib/src.zip || die
+	fi
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+
+	if use doc ; then
+		insinto /usr/share/doc/${PF}/html
+		doins -r "${S}"/build/*-release/images/docs/*
+	fi
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+
+	if use gentoo-vm ; then
+		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
+		ewarn "recognised by the system. This will almost certainly break things."
+	else
+		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
+		ewarn "will not be recognised by the system. For example, simply calling"
+		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+		ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
+		ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
+	fi
+}
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 6b3851be3877..c415eeda0126 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -2,20 +2,6 @@ AUX fontconfig.properties 11196 BLAKE2B 31abb25a488c4680ee6a276d4c4fd0f0c8da5572
 AUX oracle-jdk-bin-9.env.sh 497 BLAKE2B 281d53c547c2067359af307846c29f31683cd18c8d7b305de278398eed254d0c3cdcd153b9ae67edfea7f09190f1da5d26f26026c0c4125b5ecbf8a730c9c433 SHA512 e9eee113974c0d570cccaed0a71917dd12d806248db128bafa1fcf744838ff9181f5b53b791e726e178e2164da1b2d901a43eefc37b25a3776288c137231b2d8
 AUX oracle-jdk-bin.env.sh 833 BLAKE2B 2e8254aff8d35795f073fb599c1c51dcd2ecb0356b4e90977577b9cd41376c3517a72e634bfb1420c37c8149af89044f48aa374480b26a19c875d4c1b78390eb SHA512 8d41679b4631016dbe98b15368ed027df9e6f4d96db17133c56bbf16b9a81be908d139617bc5350aa6b0e51bddc56bb1ce1abc5a8a4fad74868172cfdde6ffd8
 DIST jdk-11.0.2_linux-x64_bin.tar.gz 179640645 BLAKE2B eec4537f9c1ca88d65a65b1b827afbe49b2a020f1ba9056fe4a2efa31bcf1e0f134eede8bb0f51669f1978c79cef9a1b7eba6c93eaa2bb79e1847713ccc1cd57 SHA512 f6cd77cdad20107d8920bcf403ec01a7fa6d6eb9c020cc59077bb07633ce824562bec8b261ff1a3ea0e3946f6e4f5db8f704b9700410967c10c583967629270d
-DIST jdk-8u192-linux-arm32-vfp-hflt-demos.tar.gz 9508019 BLAKE2B 6eabd83f98f1497c2c73cfb5972985ca879efba002f474dca9a0f4d30e3986ccae7886aac074f2f6ffc4100cc8c96514ccae0bc60af845028e8e89b301fbfcbb SHA512 8b5e79d55e2c88127b53f9c52fb0e7033b1023daddcb59b43c991baf46db7276a5fabf8b39516b097967aeed354e4d7399c459a5784448cd4f6f4872b1d758a0
-DIST jdk-8u192-linux-arm32-vfp-hflt.tar.gz 76544503 BLAKE2B fdafcddd9e277a9421e9218e2b5de83792f9533cfc3b3e99afe8ee94776ae573fc97ed73702dbf7e96461741e7939b111ac8dcdfba9bdf28d2b6951acad8479f SHA512 ccf6c6fbae9453c86b53255e13a3eaf3cc1ab999480244c8a38236c7d29ca46e9f1a0ce9e9fd02295a0f98eac97f3ac5231909fab655c0eda0f24a2d42c7c4ed
-DIST jdk-8u192-linux-arm64-vfp-hflt-demos.tar.gz 9506333 BLAKE2B 1928bab95e3877fd9f5c28a7ac988c37613f5ae74abca9646c8fca1d9ebb2c4d984783699411263537bd957b0268647e1dd1d62036a15f6dc7d918e4582ccebd SHA512 cee7a8de81fddafb26ca4b64f6c01052c51524e28e281863b17536200068de0e68ae66494e9e0d86cc6bad1dd01aafed281a9690e3e1c0a05d890a3e32850e5f
-DIST jdk-8u192-linux-arm64-vfp-hflt.tar.gz 73317460 BLAKE2B 5be8ac7829ecf7a95c7ee60436abf5ca318003d11a4c3ad9ba75306983c934bd3edbce2e54fbfd472a8a6ac6d7b24be57ef87f14c7af2ad4d5acb2c74ce167c9 SHA512 8471afed26e5ded356bbd39b95d8f1ebd3a5147ae7cc4a94c90efa9bf8baff23dc8f4b10f2973307a1f48d3722604603c3e4d708bdf21c4f5aacfb0cac088b7d
-DIST jdk-8u192-linux-i586-demos.tar.gz 58483041 BLAKE2B e333914701dcf4ae57506f12846b19de91b323a63cb11f1bf840d4f3dc1b620ff141b0b7c5e2a21e4d2e2e3141c1e9a9ea6ccb01d0a5bc97d51053e9ac4e5f9e SHA512 d9b2e4b2f1052c56dad3dc0c715ab51e3cd68eeb8e6911a4f15683fec98873bf510b36541c8725263bfca7fcba65e4cb6c8bb47e4bc7e67d660b06b7e0cf0fdf
-DIST jdk-8u192-linux-i586.tar.gz 194717101 BLAKE2B 73f59da39bb5b9c2bcedec5e112b4f7ad16df144a8ef0d030f157903eb3a51bbd7a7f262da5fb478c4441658c2a0a30ff96e497d72c24a143e2118e4b3ae6b96 SHA512 a4bd3bfa9dbd9d64d270c75b23c985ccc5bc2a706dedcf5007b6cd027249acf4e1a0379e470baf9cb2b83f8b3b26a3720320171b4ea286c38d9c1318195257d1
-DIST jdk-8u192-linux-x64-demos.tar.gz 58589568 BLAKE2B 3a025954ed0b9a174f3bd642fe3a650562e200a549e6dfde4b34e01df0137a24a8d89b30b3bc9a2f7f189b4a41236b3678d54a7012a7c3555e168ed258a2bb3e SHA512 48e1b112c91e7b81579625b29050a48f3237b18b15a278750ed4436a3eb9869392af091599e39f1d492eb3b92cdf932a8c772040539f9e10f0d263b1afafd1c4
-DIST jdk-8u192-linux-x64.tar.gz 191757099 BLAKE2B 42135add35e5acf2ebe539a5667828f41e88de1dbb79d39228353d5cb5597899b6a15cfc5637317706f209888120af5d044cf3a074bbea960f425226e8e4002c SHA512 96ce0662ab474b33d28fa14edada040bd6b0a17b9374741bb132f7e9cc21b6f5f03cf8926bdef5e44669a9ffa593f887ab82d42b7b701eeca74a173f70dfdedb
-DIST jdk-8u192-macosx-x64.dmg 257868944 BLAKE2B 86e915111aabf53fddc46cdea4d7a1b6a9425e1238d156888e5d2f2784a685873c7a388cf066099d8bf5d164ff7d14380c3b9c329a48accb4d300542d95a67a5 SHA512 db059e7c8ec627dabbad46a388c0a36ec5591ae9513e9f82db9a0bd154c6001e97a526234c5f435ead867702986995dc8b866d925b63dfe2ff6d4d6394f10db9
-DIST jdk-8u192-macosx-x86_64-demos.zip 58763903 BLAKE2B b38c05db314582c5015ee7253473aa8bf81bb098e27e952153b139186390047b9357a5134ed1574cd0923d9fea4fafd265248ed65179c4288b4d57c0ae86044a SHA512 c55ac8338b494cc20cf521163b500856d8583f6873100b30d1d7eb388789c28907f76f8504bfb1ccd657094280a1c26b26d5c0122bd95de6b30f3e72e300428c
-DIST jdk-8u192-solaris-sparcv9-demos.tar.gz 8867227 BLAKE2B 76d8a98475eaa3ae2c0209d11640dbbd32aa677f8db40fcc87a9a4c86dd249fbf6bbc3ae9b84ae268468b8082dedd23374b1cae41438f45f7bf42038b2c2a5b9 SHA512 d5ccf03d693ab8ed10aac35b2bbd6823524e915a32e953dd162352cfa1bad7b5fe0db5cd1dcb44d79ab454bc2566d1ca6ba145ab4b28dba1a6c6a001198f3f91
-DIST jdk-8u192-solaris-sparcv9.tar.gz 98913870 BLAKE2B a27a3dc4a6e68972919417f769aeab5716410ed4f793f46886a081799fd4f8b0c2de6f30d7a0a65e08fe9dafe35c83e33f2c26d5e71e9161b6ef40ff3e05d8b4 SHA512 e241c00b29b3e18a3d0ddcc3f88f35c092488cc1b93b0daa348088d85f0a117a43903c5cb3c9edc93653e6f420c4c2f2f8a2647682ed0a2a509add5dd844012e
-DIST jdk-8u192-solaris-x64-demos.tar.gz 8827060 BLAKE2B 9306b0cd984139a5ab1c32c8a436e1e294dbaf0118e1b88eed5079eada806d9049b0acc41279de385173bad94f351891e4bf6baeef4a0478ffb552773fab4dad SHA512 d6f2dc2a8c61b65b3a16b206b7ed7767153bd0713701b1b0d545cc1305739239dff6f1c33d0b7f1412f59262666bcb005b48154ae6d9ef4dbbc900e3ae253c88
-DIST jdk-8u192-solaris-x64.tar.gz 96644048 BLAKE2B 24cdbdc006c45ed28fb7eb855ec295f568bad1c866d57961085047901dcf72e341d05b407fccba43f66896fcf28b09bed8e02e6ee5069071a430b4424bdf1af4 SHA512 7db73b08d3ef52a7e486a99140265091916433c3d0768e2b0631de5ad649ca76a9792e40122de49677caac67951f036824021f91f50f36026d7cf7971b93e4a0
 DIST jdk-8u202-linux-arm32-vfp-hflt-demos.tar.gz 9490823 BLAKE2B 8b7b52e371e0f47e0b0434a6809feaf45500ec46c49a2ea4ae0202de773df88dc3b400f260e629f65b8ddaebd362ba43a8fe83da430d4cdc5d21fe79a6da42ea SHA512 7a3e3d9b89825eee22b171d60d53ee5097823538d0b0ccfe6f3cdde4f9d42861fe85e571fe38bc40dc2d74aa1dd1d8a131dec40ce8f4254c91b51693bbf85d5c
 DIST jdk-8u202-linux-arm32-vfp-hflt.tar.gz 76402495 BLAKE2B 3957e542a0184a5193601553006a314cf970720bbb3ccffec95111d1dfbbbef92c25df93fc60a08eb27338cfbc400681afbd0532eeea54075e7f41e87237b6af SHA512 c406ced79d8ae86e25754e731c3c180f8855d46581e752febfa9c609b28ef2b590ee13f4700b80f51097649abace46aa562fc2fbb74a7face5aafda33732b08f
 DIST jdk-8u202-linux-arm64-vfp-hflt-demos.tar.gz 9494073 BLAKE2B da9d9dade31ebee6fde009ac178c8678e2163da9739950eef61152043cd65f4bd38e919e8da257e4452cbf8783373be387021ccdfda0d60537e58f5be4218efa SHA512 5364da862ffa745137f2305cbb1e9473cc0c5f495ac2d454328afdd4bfa9343f0e1bfbcb8119ac68466d239e7c42683af6a1a3a33ab7a784f6bed0610d9e0677
@@ -30,7 +16,6 @@ DIST jdk-8u202-solaris-sparcv9-demos.tar.gz 8838689 BLAKE2B e86ed9372d9d76abb4ee
 DIST jdk-8u202-solaris-sparcv9.tar.gz 92381302 BLAKE2B 331eda8ffa0128853e872f7f2543e966efb2498b62f8d1179d9b47d6af8a411a59dc9b1733423ea73d330cba3cc59f10911e6c81dd6b9f5b497de6ec2f73a864 SHA512 e02fe78552e3c21d40c9bf380228bafd5ff46034d6b9040d0c08ec725003aa5be7da8c61a72a8175bf49074ba89e0e172019db8aa823b5b349414950afc56d33
 DIST jdk-8u202-solaris-x64-demos.tar.gz 8830525 BLAKE2B 6b6ced784d5b549d647c29b5859e376bbb44d3310d424bfdb087a3043d4849c43c24a370f166739850588f2b83ec7f24b3f3d9ae68a544f4f1cc152249137057 SHA512 eaa9adf1df2e554d2c76ea5f109e0ccf2f7c4a8221c78c402d1bfeb1da74cfe8bf2b8ecdac4cdfbef6b63b7439f94daadbcecd4dadfc73456400387c6d3a6353
 DIST jdk-8u202-solaris-x64.tar.gz 89523049 BLAKE2B 4b93344feaf6235d2e41cee688668c067ebb8107ba62b66d6cffec0b3b021a2f34537957743dfecfe7e97231ba709c948da0deac3bbbd7a9ca7de2086ee7f359 SHA512 4b4480bfc25be8d4bc8efe4aac3b5c28c240fd7f39875b5976bf735f58e11c39083d6c48387ecd81b507fd8284296df7844675450e6b5edc2c04627a73cc5923
-EBUILD oracle-jdk-bin-1.8.0.192.ebuild 8499 BLAKE2B b0d6aec6ef4111cfb45e26dd2c53d7f673a1253dc2ad61cfb6d11d5aca5fef7533d7ab2e704b2269f75398978da4551774bbec98fc93c4d86abe7c17a0cbd606 SHA512 311006a218f6b65627943a9eaa2db29f1feaf4d90747a7481e6c492f7ab19e651bf07595772ad97e696732d02ab6bdb9326c8d67ccc4a7ebeda0fc54baa41fb1
-EBUILD oracle-jdk-bin-1.8.0.202.ebuild 8500 BLAKE2B 279c3fbe5a0e22854e20fce7634ee2a818e784a88d4c4b12506236a7ebfb7040fdb890ea3c894da54f22454c35bd7f98b6862cce4d945d5e1f26144ec3a7d572 SHA512 fa4bf303f56eba121cf4d1b3684b21c6fb93f02f823ed58842b31e73b79df2d7aacbb7066ebfa046af4efdf7af5397205a044190e857da40b392fa9699db8dc1
+EBUILD oracle-jdk-bin-1.8.0.202.ebuild 8499 BLAKE2B aff03ec92a390ce36ceb77ed96794d35318b768f14703226bc0d94ce4536609cc33eadae66fb7f34fa12b12c2a159ca28acc60af283d596b008469c70346b68e SHA512 1785b6c76c4bca2ba2ab98dae9dd85648ca754bc5740ad24fa53c5aa8f61c042e97623776ac8ab8b26721f212fe07794ef4e1fa4d970dd59bbbb8c9e4a7dd73a
 EBUILD oracle-jdk-bin-11.0.2.ebuild 6921 BLAKE2B ea5ed5d866f51767aad5781cd9b34dd5ed2490afe815e1139b80dc6b6940f27c799269aea4eecd69e5586750611de92a8114fd52982bdd839b1d1ad60cbb69ad SHA512 5132b1fd4a3b0de6c4caa1f3c2e1446c0db28c7177d3599a733214e3ff49da756208d1782ccec4e36013a6887f8a7a7409510273d3ceb17cbe52da3ce0b31a72
 MISC metadata.xml 1132 BLAKE2B 6029eb0374ee0cfeb6f83c56dc8fd5206e297cfad6a799626ccdd2df7cac20e9c97eb7008a3ca210da474a78a26c9052d97b85f04b38aad7367d83ce78bc1c24 SHA512 eeae92c31db1c935fc4b248342428f5a34138e3b6f558927aa75c7f2c9f42ab574083e00b234752a6dcc685e9bd5f1daa2a15571d73a1a7576a35860df90e903
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.192.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.192.ebuild
deleted file mode 100644
index 767754a40fa4..000000000000
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.192.ebuild
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 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 your distfiles directory:"
-	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
-		local jdkgen=$(get_version_component_range 2)
-		local uver=$(get_version_component_range 4)
-		( cd "${T}" &&
-		  xar -xf "${T}/dmgmount/JDK ${jdkgen} Update ${uver}.pkg" \
-		  jdk${PV//.}.pkg/Payload ) || die
-		zcat "${T}"/jdk${PV//.}.pkg/Payload | 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 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.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-1.8.0.202.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild
index f11f44490052..c1ce65502d32 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild
@@ -5,7 +5,7 @@ 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"
+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)"
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index 8da67ef3da69..9a755af7a16b 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -1,9 +1,6 @@
 AUX fontconfig.properties 11196 BLAKE2B 31abb25a488c4680ee6a276d4c4fd0f0c8da5572a923cc1f755a6baf6ef007453c1cda4fb280fa108ae124c888a5b36b05658a9695dc5311f859742fbf9e7a79 SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9
 AUX oracle-jre-bin.env.sh 749 BLAKE2B b8c1f54712f4d41fd78bae4e7ad9e351516487b3c4573593674c1f340c4f9bafe9a283c35f8c3f136e1f93a6b0c8f6cf85837b4532db62059c7e66f05d7e0610 SHA512 273fafcafabd64946932eb42552476aeea2a9fc1c803cbcaa4f86b4fc8c80d109abdad068bf2063d7ea7e7c2d2794d7dc96dca6aae5ef8787b98ad57f467fa69
-DIST jre-8u192-linux-i586.tar.gz 87804679 BLAKE2B bb1dea51f0d45dcd3aabc82668790ee274c83f2e3c596d836d7b57c971ff6535881849cce5757132fed1b537a4a9677fbbb0b8b003d423d26ee72cb71047428f SHA512 5c749f358aa5b55513765eeb52dd2e0d3cb2b3223cc93739aa36445af8c6a3171a01cab673e106312e816c0a3b584a8a1be4aed1e2662e86b6d318d86a135485
-DIST jre-8u192-linux-x64.tar.gz 84597342 BLAKE2B 655db641df8349109e2944838f16f37ea208772580f0753e664a0642649745c123b2a781497ca3b9028f55c0bd2816cb5746d7d1d04cc83bb536ca0b467a4fc0 SHA512 d786f9e032bc286f3d4f361c382b6606c7462240b191d04606ca5ed9e59e3d7703cbaf1d57693c6763d00374c76c99cdb2f58c0bc372ef5c14c6304d556b4c8a
 DIST jre-8u202-linux-i586.tar.gz 90106000 BLAKE2B e756771caf8567c58870a267aafc9d48e98f06da1373a33bfdf40cc564c8df1645df38ad2f6951bc34d703bb0f4646b52ebf008dfc470231b4e93078c7730862 SHA512 573e32dc715d280084e71999e71a2875a488cbbba2b42c5107c55669c8842dd4ca6c6f42034b5e0b705c22a7a1d9799b456211034a6f351bc9d8e8fd803e0ad3
 DIST jre-8u202-linux-x64.tar.gz 86883826 BLAKE2B 8e69f4e8d6ce7d556ce7c8f30f5c71a50997103f729935269581f0af054fd1dc769b7099ad3a35d4baf41c8a6bdd76b049ae4908714701b196c4ce57ff61b39b SHA512 2460cde88162b00f5ca5600084f5f6b8720b8158869f5f5832fe886a5a6e839eb48398e9e3df47c45be257d9f6915e682d294d560b09e097ff610f09a76b1760
-EBUILD oracle-jre-bin-1.8.0.192.ebuild 6051 BLAKE2B beaac4bd855933446e09beb4536df6fc7dc90c04b47d754a278c13f681e6ef52e10cc05c29d4504c9c8e8e790f99018024ada60e7da445049549a2ae75d8c166 SHA512 93a9ca002faeb3225b195ebe95799b66ddf436e67309fdfe4290388748534513a84f6d99fedacea90aa5f3fe6cc2978ab7e7f8b80031c16545bd7bbe03a9131d
-EBUILD oracle-jre-bin-1.8.0.202.ebuild 6052 BLAKE2B d81f20107dcfd942a5f415549c7f127cbd171cfc3b9cfebfe271e2f99fa16412c900110a8d51cee7dfebbb01fcbe943d18a745300b4e8f2d10e62a8639d03417 SHA512 37ef970f996f61d273b416df6421c23677491fe5ddc0cb6236a480a889d409b3d9087e30ac98876e0c699b3eb5ee8e0e346612d865b26fe9c7fc9526048b9f1c
+EBUILD oracle-jre-bin-1.8.0.202.ebuild 6051 BLAKE2B 51ec565172dd4f65a1d437091384493f02d4112788ea1ca8dc0e2ffe0afda855490013dd4ac9369e940d8640652459fe516b5e5f51aa58ff47dee7f7243cd97a SHA512 0e958a86b530d7f0fb86681a27cd4a77855cd31d8af8ae47f6a68765904d652efbf4a17c693c2f124bbf28de1619350e4482b689bf8cb55e9a0f984be04d1b12
 MISC metadata.xml 743 BLAKE2B 8669a83860c5bde6fa4dc380173d97756cac52e46cfd60effebe73088e35b8e31876e0c2d267201cb2c739afaed94515ec90ec2b2b2e346664b02bd173540bda SHA512 31515728907e1fdc96fe6a27f62585c528370a544a306b4a3a26cf86d8a248211e3852e4a532d9a59be0e534393e6f11bd46df39b439084eb1234d7a6bea4d42
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.192.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.192.ebuild
deleted file mode 100644
index be2fb2010c25..000000000000
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.192.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 "your distfiles directory:"
-	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.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-1.8.0.202.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.202.ebuild
index 4a38c8f94746..bf404b46ca6b 100644
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.202.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.202.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit desktop gnome2-utils java-vm-2 prefix versionator
 
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 
 if [[ "$(get_version_component_range 4)" == 0 ]] ; then
 	S_PV="$(get_version_component_range 1-3)"