gentoo resync : 18.05.2019

8 files changed, 23 insertions, 328 deletions

diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 5f8f5fdd329a..730de576a718 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,21 +1,12 @@
 AUX openjdk-bin-11.env.sh 496 BLAKE2B 6a99de9730f8e84f6082a08fc925126a2fa1579f040b7f083af371218c4523956d5a86777e1bfbca7a63a717992d1a170d539d04f26f5317c3fbb9a14972c191 SHA512 94ec17c26c7305c57fb53356a4477711fd987c4d48af114f481579f316c20ed487ec40124361bd0cf2c947f59eaf93ca629975f9e999d47f5025269187db82ad
 AUX openjdk-bin-8.env.sh 705 BLAKE2B 0e155706fa9633a9a2e54ae2c9ecb95516c0b46ead84e24dc4c4d79a1b67644eedc6b97e6d4e17da4f6162e2ce7bfafe60dddc950e7f76a666af46920a8a5025 SHA512 ca6fc7b0889ae3d2be386696eadaf9f25fdedaf94cb24696a2de56214695cb0211226bc87671449bf366763f568229b22409201e532d14394c641164c48ffe2d
-DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.2_7.tar.gz 194181157 BLAKE2B 7883e6846670c87f4ed8338804671bff19ba2910e1e96eacd9729f2ba64e9c6b460d300080e3cd3a4f94722ff9942832681bf23f64e9401e07d824028614874f SHA512 d982d4ba8c1b99b8685b36b9c0b6bb6ff8f8ec04de74945876915e01827fb389ad72d868c387f0ef4d5dd1a21cb09170b0d14ca33a2c2ec0c1f95c09fc1a475a
-DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.2_9.tar.gz 194151421 BLAKE2B f2190472dc06a297ffd9fcdb69e6c432503599297ad61795ee6fe57fe7475b1bd8b32105b29da33324f74bd34de2050809362dc4cad0165fcbd09b88d75431ce SHA512 c4703e840aa719adb35e83286fb921a3e8feae08e5b483eae726c892ddbc2c312c43bec3ba093e124b8541d08e417e46dc4dd0de3d5b1aa00b253e1532d43edb
-DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.2_7.tar.gz 180394013 BLAKE2B b5b82b6cd4121e2fbf66c948435bc84d549a11a793310bf0624898562005d5fc01a2f2de84a18517a75ccb2ed7d9f5173dc0a087500eb897e8d7461838991af1 SHA512 5f1a54e7d2456b42e23488b3699b09d82c57f3cb7056684a15f5aa19b992f4b1638acac716d6ed15c0a409ff1953022892ea55f7ed0542d210f5fd43f33fd8e0
-DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.2_9.tar.gz 180384673 BLAKE2B 51cc7f53c371dc140f9cd17c3523251929e384ca73eb34c283b969be1b5c91b1ec15bf72fe08c80b141a96aa0de5dcb0c9631e2f776e123ad5a4059174dfbc1a SHA512 00ecb0fe1e5b4f682841eeda41525dc5a9205e55ec8ccb332aa1dc724499d2df927870c8b70da950384b50a8014bbd70d0025a5ce0ccb90bfc4df028e64613cb
-DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_7.tar.gz 195593592 BLAKE2B 038c88dd4475842ffd27afc9249925baea0230cd993a963e13c2e090a0f6332fbeaebefae5b5e98026a12a7d94696633507a9d08af469b0227372088b5cd4869 SHA512 f9f4d168105e499b0da4923c6fe18c31ea6f6a24a48fc9d47b643460316d75de273f8f6dcbd43c9df6efcfb77127182dab8125c55f63200c5ff53cc9eb0ddcdc
-DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz 195592867 BLAKE2B 91593fc849e558abf965ecfeadefbeab464e1c4562ec57d0bb6dcb9c17525a7cf37593d8fa2146d4545122a634d22c46764af32a124a0e17621da8b643c2770d SHA512 976874e04df71f747a5a7a78081b5989adfcf783b5642d3a0ca2ab2a98547fbe9495dce57b8eda69240f1850bead7bdd6cd59bf9f53ba70400e0806e0950866d
+DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.3_7.tar.gz 194142513 BLAKE2B 1809ee89a4dd31d5453d15b0e3672e1d4a9e1e4573954a8dcf793cb4f837ca4bb44eab73fb685896273fa5301011d671568cb7648c0c5095659f5441a559bfad SHA512 22964e4b0819eb214f378969501b9ad67e39f4efeb7425245022f7eae804386a5e0c7a8139a5df604efd649ff1d551323e6b08299ce0e3f71719e3cd120d7b91
+DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.3_7.tar.gz 180425080 BLAKE2B 77f571a145e837c80da49a2ef8d20089b24ec23abf8078cc5781762ec9b88038d4c47c9d36766195c2f96809c98e4706b249c14518ef450b1fbfb100ba8c49d8 SHA512 6b7542fcbd9b727e93a2c2e157ecd52fb27db74d67cc98fb713eed531c7ea4420fdae2e420131b3d046e6ad2bccb2f91461928750e7b9c4274984a983293be8a
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.3_7.tar.gz 195982221 BLAKE2B 61ccbceb07bcb72a5f9d797997b4a250c2d171d7c7930877db0865d95b1faeb83e160eab59c484d2fce06a7116f06eb8a57eb5295a254fba7315ccb2e88b6db9 SHA512 2c590492ab9bddef68afcfbb54117688e1b24b41dc871bc4ba869319c16587ebfc061ce72712f209403e76d589f01d57cd85384653b1ecf767ee8e4018e1607a
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u191b12.tar.gz 75382012 BLAKE2B 9521bb3d0dc08d5069108bb56594d401cbadf7a290652a39c7379e6ded530044e85f1ffae1cd3eb7e881d7c283c06463e6f8b76602d03a7bf5b188b1004f5daf SHA512 156f7a57f095095b72edb4bfc766d575795e496b006fb994566b0207d346e89863cf377ce97290bf1b47923c5d6aee5558eaa7a54f394f95a270b1cfec4308e2
-DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u202b08.tar.gz 101497437 BLAKE2B 4fdc659f9cc50fd968cd339cf24780cd0097286fe3004669972b925fa5c8bbd0e6024587f761ef05ec170c4caa6a915f9f748badd021fae6eb669aa613e1c90d SHA512 42991d2203d51492090e92ee4c7600e7b0ab613550d925f52dd7c7c3b796f9bd36e7284d55540b661a5175064d714267cddd786d81aeda358feda3927e3676e3
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u212b03.tar.gz 101610850 BLAKE2B 3a782f21855b1633255b2691e4adb516b12b84e37d81cdfda2b7b251cf78602a3b4c4120fbaec01d177fe7187b581f5dde392c7f841a39d269b548f1ada18be2 SHA512 25d53c8ca9bc4e1fd0ae1fca349d1e605e0dfb8a4aa386408875d5c23ef8b3ecc42ed297bc125f2ab74e9726e10374ec12d6c39736a53a94d3150001756e0027
-DIST OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz 104336613 BLAKE2B 3bf42af57707a057077969487f66c32289d0dc96639aee553b18812262d517b07a8e80e3351a4b22731569c7d7c1443d8018d05a41a26abf844a1a2950e7c368 SHA512 8e04d22fe03d2ab92e48fbbfe7d6015d9062d8e767d55ca9235e02b39841236d47b8977ae0252d5f4351a4c5fe082d377e2f8978156cf73c0208028a422e5e4c
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u212b03.tar.gz 104368598 BLAKE2B 0c16398c1e962e53316eb9301a8ebb6dc7b37ef812d3b65719c239f392074fcba999fca8442cc52a0b067eb4761b0477e9da243d0d84a2e2ded1d883614d15b3 SHA512 7674f26bbc69535c1d06d7364f515ddd00f1f43f6fb76c806c56cd3b379e03047084fbf6439e375cf57257b8a1fdf94702ba063bf843793b009a76fb449a5cc9
-EBUILD openjdk-bin-11.0.2_p7.ebuild 2785 BLAKE2B 77c144ad87f6024f82b3ea81a0dfb9f79e6adaa2e172c061215e047f3e812ae025d0d73f05801cbd3775c36d70bf8045e8f3f9d3b2cd25d4e4fa5fab4559a186 SHA512 9b26a81ca3401bc24c54c5f1c26df6da1749adf905f1d8476ab2696bf6810deb587619ee4d57c8b05498d46f2fc1753484e2cd29929ee618ba989ab14970a34c
-EBUILD openjdk-bin-11.0.2_p9.ebuild 2785 BLAKE2B 77c144ad87f6024f82b3ea81a0dfb9f79e6adaa2e172c061215e047f3e812ae025d0d73f05801cbd3775c36d70bf8045e8f3f9d3b2cd25d4e4fa5fab4559a186 SHA512 9b26a81ca3401bc24c54c5f1c26df6da1749adf905f1d8476ab2696bf6810deb587619ee4d57c8b05498d46f2fc1753484e2cd29929ee618ba989ab14970a34c
-EBUILD openjdk-bin-11.0.3_p7.ebuild 2719 BLAKE2B fa3bc2d29ead40bae119d5922547684d0612ac117557d3ad99dff2b8359fd847e0a86002f12f362b6bbd5db2033a3d4e4f5c18331c53acbf6e0930b16d716b3d SHA512 94f78bd9968083bcbaf72e990ce8f4071183e406c6f98fad0702845cb4f3c720a15fb088e390a70c97659e462b86993190565198e32f31d8c56f03aebde10b38
-EBUILD openjdk-bin-8.191_p12.ebuild 2590 BLAKE2B 29cc600adece87f8d040891e5ea84fdec01245e5823d7cfc9631010cdfd053545b9fa75aadb74b2b882127a87609404a7f7e4d061d7854110d5a08f4bb6359d5 SHA512 d16e2f164b8f521a3d36f24c56afef4f9b0b7f2bf01edd22d5267689f5186afc2c1079a547d73c6ad61306e3b41ab8b3dc6abbbded0f8e8444b431d4c86f6c58
-EBUILD openjdk-bin-8.202_p08.ebuild 2619 BLAKE2B d96761323c832f37e8fa7b9792ba36c07ed4e9313aa8acd9a072589039b738baf0b5402fc673426203e3276e7ee624fd091c7a08f6b25baf464b026716042218 SHA512 cb07634a89a7f10bdb099188980b26e4ad6ebb7f460c52b1d0adec3b390e58619bf1a15bc2723d239e6e926fb9e43a16ecd310a838fd6e1c211f2683f8de92ae
-EBUILD openjdk-bin-8.212_p03.ebuild 2619 BLAKE2B d96761323c832f37e8fa7b9792ba36c07ed4e9313aa8acd9a072589039b738baf0b5402fc673426203e3276e7ee624fd091c7a08f6b25baf464b026716042218 SHA512 cb07634a89a7f10bdb099188980b26e4ad6ebb7f460c52b1d0adec3b390e58619bf1a15bc2723d239e6e926fb9e43a16ecd310a838fd6e1c211f2683f8de92ae
-MISC metadata.xml 1027 BLAKE2B 19dba71d9f0c1136eb90f90ed4077275a75d7217618048f669879372fc863875c52f95c7f29ff9eb93a922d1dcf6249dfe742c34ed40b795b36e7be1efa658b8 SHA512 8e3eae238896c378a4807d58597566db7e059a0d892e949dfce095136a2788f49bfd736c4577c13ad35924a65c384fd308b13146944dd8ace382fdf6e101db56
+EBUILD openjdk-bin-11.0.3_p7-r1.ebuild 2963 BLAKE2B 83ecbd0e1d771404d63da0162604331aa5d56d1b081b65489bbcf821e7d5a6a961219002e991e986cf42b5ca0973316745319ed6268925b0dd8c3c9d76b37217 SHA512 9db8bd814a2b0a3ec915737de22d8e1082015a5dd641915fd5fd56a6abde8a72fc3b4c70f0933833bd3fbd3646bb55eb1c4b2aa2cfa32dc9e1a61dc0fe302601
+EBUILD openjdk-bin-8.191_p12-r1.ebuild 2588 BLAKE2B a5621d26ba42de2ac06e4c4bbc3b044868645d554d4a21c6290a8f25fed8b492986d2affa80d2ec5bafdf9177b0d6688a916cdbdd2f33901523e883b2fe9812d SHA512 05f94a9eace6c0388ade4a75470c63d7f93732c47bbc7475642651a9de90431fef0974be8c266fcf6246992c57170e42f16775e52718a298ac91b03982c122df
+EBUILD openjdk-bin-8.212_p03-r3.ebuild 2802 BLAKE2B be06cd2dab9c4a3654a53a148850e3fcbf6ecb541117035c6e4d872a155e456b2371665ad719d86f113d6f88ffa453a2e6b95a633543a9f0cbd688298ebd7591 SHA512 c065c02e0e807e4482577e4c3d3236cb622a002966ae17e5426cb677ac05b78a15ce0b1c3edfdd9fa6a4d3a1a17e537931160f0e1818c3294736dfdd4a6138e0
+MISC metadata.xml 1025 BLAKE2B d7678bc38651044e8551f51b82f628f6c682cd15305fbe4bc9a9fa9b8f66417e526da18d46ff092d1b82a13a83465d060ef6ffbcfa562ba82bfe6fb9e59de60e SHA512 809731d43dcecd74f45e328780e35ba70b4ae384aea3a28c796a84c6ce2ad8bfc7cf0a6920f150cb4096f61147e9d5326128aeddcc14836752694cf5cdd6e7e0
diff --git a/dev-java/openjdk-bin/metadata.xml b/dev-java/openjdk-bin/metadata.xml
index 5197cf9973cb..941e830900e4 100644
--- a/dev-java/openjdk-bin/metadata.xml
+++ b/dev-java/openjdk-bin/metadata.xml
@@ -11,8 +11,8 @@
 	</maintainer>
 	<longdescription>
 		Java™ is the world's leading programming language and platform.
- 		The code for Java is open source and available at OpenJDK™.
- 		AdoptOpenJDK provides prebuilt OpenJDK binaries from a fully open source set of build scripts and infrastructure.
+		The code for Java is open source and available at OpenJDK™.
+		AdoptOpenJDK provides prebuilt OpenJDK binaries from a fully open source set of build scripts and infrastructure.
 	</longdescription>
 	<use>
 		<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.2_p9.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.2_p9.ebuild
deleted file mode 100644
index ad6e3e5d68c6..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.2_p9.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
-		)"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri x64 amd64)
-	$(abi_uri aarch64 arm64)
-	$(abi_uri ppc64le ppc64)
-"
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
-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"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	doc? ( dev-java/java-sdk-docs:${SLOT} )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-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() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-
-	# Not sure why they bundle this as it's commonly available and they
-	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-	# also has an explicit dependency while Oracle seemingly dlopens it.
-	rm -vf lib/libfreetype.so || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but AdoptOpenJDK 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 headless-awt ; then
-		rm -v lib/lib*{[jx]awt,splashscreen}* || 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
-}
-
-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 11. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.2_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7-r1.ebuild
index ad6e3e5d68c6..a70143ee9f51 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.2_p7.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7-r1.ebuild
@@ -29,6 +29,7 @@ IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +we
 RDEPEND="
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
+	>=sys-apps/baselayout-java-0.1.0-r1
 	>=sys-libs/glibc-2.2.5:*
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
@@ -53,7 +54,7 @@ S="${WORKDIR}/jdk-${MY_PV}"
 
 src_install() {
 	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
+	local ddest="${ED%/}/${dest#/}"
 
 	# Not sure why they bundle this as it's commonly available and they
 	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
@@ -78,9 +79,13 @@ src_install() {
 		rm -v lib/src.zip || die
 	fi
 
+	mv lib/security/cacerts lib/security/cacerts.orig || die
+
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
+	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
 	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
 	java-vm_revdep-mask
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild
deleted file mode 100644
index 8cc6752e5ae0..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
-		)"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
-IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	doc? ( dev-java/java-sdk-docs:${SLOT} )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-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() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-
-	# Not sure why they bundle this as it's commonly available and they
-	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-	# also has an explicit dependency while Oracle seemingly dlopens it.
-	rm -vf lib/libfreetype.so || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but AdoptOpenJDK 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 headless-awt ; then
-		rm -v lib/lib*{[jx]awt,splashscreen}* || 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
-}
-
-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 11. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.191_p12.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.191_p12-r1.ebuild
index baff27abbc59..6c1280109ae0 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.191_p12.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.191_p12-r1.ebuild
@@ -68,7 +68,7 @@ src_install() {
 	fi
 
 	if use headless-awt ; then
-		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
+		rm -fvr jre/lib/*/lib*{[jx]awt,splashscreen}* \
 			{,jre/}bin/policytool bin/appletviewer || die
 	fi
 
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.202_p08.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.202_p08.ebuild
deleted file mode 100644
index d214f0e0b459..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-8.202_p08.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
-		)"
-}
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-SLOT="$(ver_cut 1)"
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-SRC_URI="
-	$(abi_uri x64 amd64)
-	$(abi_uri ppc64le ppc64)
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~ppc64"
-
-IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	doc? ( dev-java/java-sdk-docs:1.${SLOT} )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-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() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-
-	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
-
-	# this does not exist on arm64 hence -f
-	rm -fv jre/lib/*/libfreetype.so* || die
-
-	if ! use alsa ; then
-		rm -v jre/lib/*/libjsoundalsa.so* || die
-	fi
-
-	if ! use examples ; then
-		rm -vr sample || die
-	fi
-
-	if use headless-awt ; then
-		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
-			{,jre/}bin/policytool bin/appletviewer || die
-	fi
-
-	if ! use source ; then
-		rm -v 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
-}
-
-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 OpenJDK 8. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.212_p03.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.212_p03-r3.ebuild
index d214f0e0b459..8a192994e1e4 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.212_p03.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.212_p03-r3.ebuild
@@ -29,6 +29,7 @@ IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +we
 RDEPEND="
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
+	>=sys-apps/baselayout-java-0.1.0-r1
 	>=sys-libs/glibc-2.2.5:*
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
@@ -46,14 +47,14 @@ 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"
+RESTRICT="preserve-libs strip"
 QA_PREBUILT="*"
 
 S="${WORKDIR}/jdk${MY_PV}"
 
 src_install() {
 	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
+	local ddest="${ED%/}/${dest#/}"
 
 	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
 
@@ -69,7 +70,7 @@ src_install() {
 	fi
 
 	if use headless-awt ; then
-		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
+		rm -fvr jre/lib/*/lib*{[jx]awt,splashscreen}* \
 			{,jre/}bin/policytool bin/appletviewer || die
 	fi
 
@@ -77,9 +78,13 @@ src_install() {
 		rm -v src.zip || die
 	fi
 
+	mv jre/lib/security/cacerts jre/lib/security/cacerts.orig || die
+
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
+	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+
 	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
 	java-vm_revdep-mask