gentoo resync : 23.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-23 10:22:15 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-23 10:22:15 +0100
commit: 8b4ace9c50842c5b83401ea7b179dcab940387e1 (patch)
tree: 230f3135ceaace633cf93e9838b185c4a6664c2e /dev-java
parent: 9ee6d97c2883d42f204a533a8bc1f4562df778fb (diff)
89 files changed, 1211 insertions, 2227 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 21d59a7032a4..dd8ad39ed6c5 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index b57e9c478452..173a2552eb74 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,16 +1,13 @@
 AUX ecj-4.10 342 BLAKE2B c69e9a66c9239e7ff4b7b35a4dcddec7cdec02ccf782862a0428e7e4d720dc22a931b58d40db5027e186a6129d0598702d9a95b1fc85ac38957ab6769377054b SHA512 c5ed672288d957ff52d6b44e2758dd589aba050e5915ebc1be92c112ef91c7506051893ac03f08115e9a75e16f91a68d26837e8e8e1e84c6bdb5fd8f4b953474
 AUX ecj-4.13 348 BLAKE2B 6faabe227677bccec08ae3c6a04dc08e30fbf8b2469908b73d63f2f7a2c03f04fb1e0bd9bec74312fec26cbeafab83b37d714a4cbe4069def5d9ab00276ac8a1 SHA512 9866236b6ae4923b3bd4d6147d1babb039f46dd2488a01d0495b5ee19c5900d64c809d1dcfdc958017afb4002fd8908984543deea237e9f52e7f79b13ca5f2a3
-AUX ecj-4.2 290 BLAKE2B 4c96c6ead1903a37769bb2453d6320f2cff933855e7086bd9e59b3577ce0a30ac0887aea26eac1599a89a28eb048fc19c05cb1eba21b4dad23caaacefa36cfc8 SHA512 9fee5e853c9ffde67103b35cb8b28d06dde9be305aba872703a14a95be3e51f5087a5c897e6685f0381794415a524513a4e988ca088b7d30a574518943f97713
 AUX ecj-4.4 314 BLAKE2B 9855d136e85d003ef85e2b0e854d0ea6d29ee37e4221ca612d1ed6c51f89e6f2268f9082dd946468119129240166394122f54618e1a6a799dded0eeb9f0046cc SHA512 a0023e61ed3b1174e7ab7ebc9eb2bc42e9df6a23e5010ede6c2456eca60c4f4a9e11633fcc6438824fe1db4c881499b5f384715c19381411460e78e78ddca678
 AUX ecj-4.5 322 BLAKE2B 2941d70de68459d2bea21ae10680dbbee7888e156753e2bb7bae89b4c2aa41e453106b6ab0ae3660790cf70799550e09fd612a8736b0ac07a3859cdc25446e86 SHA512 d46976eb709a65e1d01af6b48d095325daf10a1ee4ff5da22de12593a253ba21e9550538ff13d1b7844fdb2604462d28133011301ba6a69cab83b2de7c7324f2
 DIST ecjsrc-4.10.jar 2036945 BLAKE2B cf9e50e53dac970a0b6b1231024a4efdc9adc92e02585aa4767c6511b367b32eefaf6fb3461c3c5c8160cf7205c0f708af0c433f4636b5a49caf637ba60fa092 SHA512 e85cacf6d2e21d464ff0226eac12bab8388df7a1413cb16d2982e255eb7369341792562f5080354279be0643c08fd80564a8eb2d8f59b72c8443c02577e4e1ee
 DIST ecjsrc-4.13.jar 2074963 BLAKE2B d74caf3b81543ac12497148a477dcd99fb6d14bd1d601b9e2baa0fb82d12f1211533f5ee909465b190c780ac18f1fbc1f8e12c22cddfce10501923effd7a4cc1 SHA512 f7e49b29e8aa80d627230059c9aba3f1e1fe3824bfd43eac962331d545471df5af0ac49b489aa3795e79e161101a3c6406b29f71a06143914f241916ae6953a9
-DIST ecjsrc-4.2.1.jar 1417043 BLAKE2B dc6915ec85d96a6ecdafb04485549feeb6ef8329811e294647e9e179ff3b1ec3cea55c29ad23b306ff3489dbfe6f574dc691ee31080a592d71607d3a996e9bb4 SHA512 967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf
 DIST ecjsrc-4.4.2.jar 1764959 BLAKE2B 402bcbb040c28fa10dad07c4223daed9976f3246d6984ac74d95087a6cdcd5a742072126a999435eb2d49d49bb2884474461ae8439a9839617b2891297cd7c07 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20
 DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
 EBUILD ant-eclipse-ecj-4.10-r1.ebuild 1247 BLAKE2B fec5a58b0569cd24b4f992cce0aa3b3957365ac8e33e9ecd44d1198ee4c368272d8b7c825181519c573a1878d131608acc2bd9b06cf07e4f6007a906d3fe5077 SHA512 04f59d6699ec060918496fdfecfd3214f45ef41e86f81bd80b7d5e29dde9c65bd46cc8346b3751bbb5bd00d2456583a967b31428feeb24f525d10b4ccec9a297
 EBUILD ant-eclipse-ecj-4.13.ebuild 1252 BLAKE2B 697a4bfae3f28eda5f91137c1f31198c64f530374218f1b69f2ec3dadc04fd085583f950ef852c410abd0688355c31c5cf715a359ceaf8b2f2422d03c00535dc SHA512 3f6897bc51f8c1b641dee6c7735a38b4d00903d8920c2112f863b185f62fcb67a79a1feedcd09bd103cf9f3d58bfd818f10d3043f862f775df9643b9d01757e8
-EBUILD ant-eclipse-ecj-4.2.1.ebuild 1363 BLAKE2B 1fd46c888db8d7662c55ceda97bfcfb2074bde7d26a249f0837e9a4f53f130b7776b9e131f3714d0ce272dbe8a777879366160e7fcb03e809099d7d3e168de50 SHA512 edbcd030f67950128afb6aad948d2104ca9610152cded95750c10771513246463c3da9d9a7fd128a623c9669cb3d6559875c69f4045e2ff1ea6a0b6f6bae9461
 EBUILD ant-eclipse-ecj-4.4.2.ebuild 1248 BLAKE2B dd7249882bbb0c2511e424165dcc12ccdee58baf9985da2182d31d451fa1fb94f736407e303bc1a61d9d43355a7142fd7af1078ff7277122540e1bc0a47786f5 SHA512 310dd8cb237d922b55186fcfad23136e0861464dc6aaa252ea8615a9dcf61a3f6042c5edc463af1147fb1f9d4c76b61fca15a035b8b9718252cc8d9ef85c4277
 EBUILD ant-eclipse-ecj-4.5.1.ebuild 1249 BLAKE2B 4f0fd6db9c642716d87396a421521a5087d014c41235436596a1e3d81c32ffc71d6734d1dd858b1d3c4ec088b8adf1cf2920402575910f51f1bda35c6a6f964d SHA512 45c87738ac2c850d2fbbcf1fb2cdbb03b271900b63324f6d9418337431da7fb260371a39814354e6abae1115fa9e84ffd43d6036be7bca724ff0e32780bef69f
 MISC metadata.xml 546 BLAKE2B 1d3e6201cf0f0e87bf1ede2db78c4c706d9a59df9321a0820a9d180c7da9736c4af6a3442c1abf175e45969447ef9c8e0a0f8d73ce50985405c445f14c694903 SHA512 999312c6cfed7b52584e3e80ac1a9f5b372a05b1f6523f859b367080e7989c988e2773fd2b0f5ec5fb11da42386e37dffedf761324a41b43c309b3ab5a57fd36
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.2.1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.2.1.ebuild
deleted file mode 100644
index 79c8636d1587..000000000000
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.2.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit java-pkg-2
-
-DMF="R-${PV}-201209141800"
-S="${WORKDIR}"
-
-DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF/.0}/ecjsrc-${PV}.jar"
-
-LICENSE="EPL-1.0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-SLOT="4.2"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4
-	~dev-java/eclipse-ecj-${PV}
-	>=dev-java/ant-core-1.7"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.4"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p src/org/eclipse/jdt/{core,internal}
-	cp org/eclipse/jdt/core/JDTCompilerAdapter.java \
-		src/org/eclipse/jdt/core || die
-	cp -r org/eclipse/jdt/internal/antadapter \
-		src/org/eclipse/jdt/internal || die
-	rm -fr about* org
-}
-
-src_compile() {
-	cd src
-	java-pkg_filter-compiler jikes
-	ejavac -classpath "$(java-pkg_getjars ant-core,eclipse-ecj-${SLOT})" \
-		$(find org/ -name '*.java') || die "ejavac failed!"
-	find org/ -name '*.class' -o -name '*.properties' | \
-			xargs jar cf "${S}/${PN}.jar" || die "jar failed!"
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	insinto /usr/share/java-config-2/compiler
-	doins "${FILESDIR}/ecj-${SLOT}"
-	sed -i "s/^JAVAC=/&${EPREFIX}:" /usr/share/java-config-2/compiler/ecj-${SLOT}
-}
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.2 b/dev-java/ant-eclipse-ecj/files/ecj-4.2
deleted file mode 100644
index 5100ad03962f..000000000000
--- a/dev-java/ant-eclipse-ecj/files/ecj-4.2
+++ /dev/null
@@ -1,7 +0,0 @@
-JAVAC="/usr/bin/ecj-4.2"
-PACKAGE="=dev-java/ant-eclipse-ecj-4.2*"
-SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7"
-SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7"
-ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
-ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.2,ant-eclipse-ecj-4.2"
-GENERATION="2"
diff --git a/dev-java/cpptasks/Manifest b/dev-java/cpptasks/Manifest
index e90c6ed5e2ee..1a5359e9e8a5 100644
--- a/dev-java/cpptasks/Manifest
+++ b/dev-java/cpptasks/Manifest
@@ -1,3 +1,3 @@
 DIST cpptasks-1.0b5.tar.gz 902930 BLAKE2B 02cc20ea8e4316f7d0572cd147868219f1cfa326fd87d2edbea8a9b81c88f83173a373a88149bc2da55099bb9a0ac4d1f8927a6c708e6a5640b56220dbdba006 SHA512 620d16e60cdd4d8a09efe6c5889ec1beb20d38df3a7ebf337de546cd60881b4c22a08f24374e7dac02dbbb3b23defbb740a70f1d0ff59212496e631251f0e32c
-EBUILD cpptasks-1.0_beta5.ebuild 1086 BLAKE2B e64dccaa56ccf4293296d7f3e3867cab2f8e42eba14e838208ae1ba462b2f66b51eec1721e7f6aa462412d435d24fca25275abde92999a760d3054c8c656cb6c SHA512 ebd302f4af84c292eb974ab6f1968e702934ef7504458507c54931116af6fdbb640ab143ee061f471bea1b8ac16f23af337087b94a562663c2dd0b4545e4c07a
+EBUILD cpptasks-1.0_beta5.ebuild 1073 BLAKE2B bd8f1f109f6b759054cea5712ecccc32a824782b5a5504152d2d7aaa944fc8a9bfb5f5fccd788f49df87639859f5852284717171395ffae295a19599f3b7322e SHA512 311f5b5ffb5cc8bdb5a64ddbba2af248d68b4017c84dbb2dbd149dc20c21a6f94049cd4d5e2af84ad7c49ece0b249f49dfcccdc33fc064a0a68f9baef5f4245f
 MISC metadata.xml 317 BLAKE2B 7a5bf5450578fb6d057233a53ba7f3e7fa6c3f969f7fa0eba8c22ac17b4efa19b270a765043d61635780b0da1f22e8a0d0304f0c15d468f72fafee1341b8131d SHA512 4f45c942983f0ebb77130dc40a6407ec9781bb2657ac24bdebeddcb21135b7f0b39b560015ce5c7b0df3302c1c6d2e5783cf86d73aa372b9e24c8d1df28249c8
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
index fd8f96b943c7..c0dade630289 100644
--- a/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
+++ b/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
 JAVA_PKG_IUSE="doc source examples"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Ant-tasks to compile various source languages and produce executables"
 HOMEPAGE="http://ant-contrib.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ant-contrib/ant-contrib/${P/_/-}/${P/_beta/b}.tar.gz"
+S="${WORKDIR}/${P/_beta/b}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 CDEPEND="
 	dev-java/ant-core:0
@@ -24,18 +24,17 @@ RDEPEND="${CDEPEND}
 DEPEND="${CDEPEND}
 	>=virtual/jdk-1.6"
 
-S="${WORKDIR}/${P/_beta/b}"
-
-java_prepare() {
-	find -name '*.jar' -exec rm -v {} + || die
-}
-
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 
 EANT_BUILD_TARGET="jars"
 EANT_DOC_TARGET="javadocs -Dbuild.javadocs=build/api"
 EANT_GENTOO_CLASSPATH="ant-core,xerces-2"
 
+src_prepare() {
+	default
+	find -name '*.jar' -exec rm -v {} + || die
+}
+
 src_install() {
 	java-pkg_dojar target/lib/${PN}.jar
 
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 6b3a8d50565a..eb3a73387996 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,11 +1,9 @@
 DIST ecjsrc-4.10.jar 2036945 BLAKE2B cf9e50e53dac970a0b6b1231024a4efdc9adc92e02585aa4767c6511b367b32eefaf6fb3461c3c5c8160cf7205c0f708af0c433f4636b5a49caf637ba60fa092 SHA512 e85cacf6d2e21d464ff0226eac12bab8388df7a1413cb16d2982e255eb7369341792562f5080354279be0643c08fd80564a8eb2d8f59b72c8443c02577e4e1ee
 DIST ecjsrc-4.13.jar 2074963 BLAKE2B d74caf3b81543ac12497148a477dcd99fb6d14bd1d601b9e2baa0fb82d12f1211533f5ee909465b190c780ac18f1fbc1f8e12c22cddfce10501923effd7a4cc1 SHA512 f7e49b29e8aa80d627230059c9aba3f1e1fe3824bfd43eac962331d545471df5af0ac49b489aa3795e79e161101a3c6406b29f71a06143914f241916ae6953a9
-DIST ecjsrc-4.2.1.jar 1417043 BLAKE2B dc6915ec85d96a6ecdafb04485549feeb6ef8329811e294647e9e179ff3b1ec3cea55c29ad23b306ff3489dbfe6f574dc691ee31080a592d71607d3a996e9bb4 SHA512 967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf
 DIST ecjsrc-4.4.2.jar 1764959 BLAKE2B 402bcbb040c28fa10dad07c4223daed9976f3246d6984ac74d95087a6cdcd5a742072126a999435eb2d49d49bb2884474461ae8439a9839617b2891297cd7c07 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20
 DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
 EBUILD eclipse-ecj-4.10.ebuild 1678 BLAKE2B 933c353919c86dd1d1a8adff7604bb42a35ed0de363134d8a3169dfefd91c90f6827a0bd661371515da6b9a63fd55745578dd70c50e808ccb29f1e5e1ffa4fb1 SHA512 2bd4398ccc15505ef35081e5afce5302001a0eec585c8c5463b233922e3faf234fc982293d873b4c181785f23b883993e157555202c0e2c1f823b68aa844f87f
 EBUILD eclipse-ecj-4.13-r2.ebuild 1738 BLAKE2B fc8b94e3d55e1a72473c9723b496fef18a5122af2f94c34ed52c929fce8be6703d2a4c8f99ef836a896bbc0c7e6e93d5675db2588f79beb9551e918b251c5864 SHA512 5a4e6e40cd35e1d815f2eb83ca15ad638d5f931a3ad1539147aa716dbae82a89763b51ffcd59490ceee6e80846475ce550654acb45cac5444be1835b080b8ea5
-EBUILD eclipse-ecj-4.2.1.ebuild 2770 BLAKE2B 23996155f35ac40c9a44a92f49e794a0f02468c1fd94a4a151f2b5451ac02d22feaa5381d07f8fcf49592b407842aae438c6e0866f7c20ecd7514edf6127e0b1 SHA512 b1e4e064ce41776a958ee2c8290382baaf228d998ea8b1d7db5c036369cff259da43877b1f8e7712678985f2facd0adabc9922c3ecd7072f499f52adc929a9ce
 EBUILD eclipse-ecj-4.4.2-r1.ebuild 1361 BLAKE2B 3f2fea077ce628cb057ee841d6a19b06f9b56344c085a5fd7533fa084d3f7cf92a5ac6edc31632e31c470852f742b383cc913371e927d59aabfbb38e42496f6e SHA512 9a870d4ce61c4a5ed3f9c0e9b7b75f0006a1649269849a08a5b5b809f980abb3773be37338564578e4fc8ee8921e231c93b5cfc0f72e99f71190c7a91ff86eef
 EBUILD eclipse-ecj-4.5.1.ebuild 1628 BLAKE2B 19a0422c19a19998e199dae7170e3b89954d412e62523ec4742fbf514015afdfe01a9c932b044dfd4f6971a96ba1bf3bf98697732b677f567c3d2a83368d575e SHA512 ba5ded5ba46b10e1467c42ad8f63f67f065acd08f3e39541e3794e97a0f8974edc1d4e3eff474916922b83e8fd9656cba6f34b67c3febc4ea15bf08c933ca2ff
 MISC metadata.xml 645 BLAKE2B f774dea11925d1031013a012083f962369714c32d58ce7480f114dd732ec4f19465c174ce4387ce54d138b8a38072c767c18e21ab47e6f92480085f1104a974c SHA512 0ba8d7ccd7280fc72bf485c5450a3e6bcd09713c432867439aaa7ebed6db5530ee15a0687c381a9191b533abebba4a6a06d9fbfa6ee3e01dae9dc2936de6836a
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild
deleted file mode 100644
index ed2ff2427af1..000000000000
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit java-pkg-2
-
-MY_PN="ecj"
-DMF="R-${PV}-201209141800"
-
-DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
-
-LICENSE="EPL-1.0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-SLOT="4.2"
-IUSE="+ant userland_GNU"
-
-COMMON_DEP="
-	app-eselect/eselect-java"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.4"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.6
-	app-arch/unzip
-	userland_GNU? ( sys-apps/findutils )"
-PDEPEND="
-	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
-
-S="${WORKDIR}"
-
-JAVA_PKG_WANT_SOURCE=1.4
-JAVA_PKG_WANT_TARGET=1.4
-
-java_prepare() {
-	# These have their own package.
-	rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die
-	rm -fr org/eclipse/jdt/internal/antadapter || die
-}
-
-src_compile() {
-	local javac_opts javac java jar
-
-	javac_opts="$(java-pkg_javac-args) -encoding ISO-8859-1"
-	javac="$(java-config -c)"
-	java="$(java-config -J)"
-	jar="$(java-config -j)"
-
-	find org/ -path org/eclipse/jdt/internal/compiler/apt -prune -o \
-		-path org/eclipse/jdt/internal/compiler/tool -prune -o -name '*.java' \
-		-print > sources-1.4
-	find org/eclipse/jdt/internal/compiler/{apt,tool} -name '*.java' > sources-1.6
-
-	mkdir -p bootstrap || die
-	cp -pPR org META-INF bootstrap || die
-	cd "${S}/bootstrap" || die
-
-	einfo "bootstrapping ${MY_PN} with ${javac} ..."
-	${javac} ${javac_opts} @../sources-1.4 || die
-	${javac} -encoding ISO-8859-1 -source 1.6 -target 1.6 @../sources-1.6 || die
-
-	find org/ META-INF/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' -o -name '*.inf' -o -name '*.props' \) \
-		-exec ${jar} cf ${MY_PN}.jar {} + || die
-
-	cd "${S}" || die
-	einfo "building ${MY_PN} with bootstrapped ${MY_PN} ..."
-	${java} -classpath bootstrap/${MY_PN}.jar \
-		org.eclipse.jdt.internal.compiler.batch.Main \
-		${javac_opts} -nowarn @sources-1.4 || die
-	${java} -classpath bootstrap/${MY_PN}.jar \
-		org.eclipse.jdt.internal.compiler.batch.Main \
-		-encoding ISO-8859-1 -source 1.6 -target 1.6 -nowarn @sources-1.6 || die
-
-	find org/ META-INF/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' -o -name '*.inf' -o -name '*.props' \) \
-		-exec ${jar} cf ${MY_PN}.jar {} + || die
-}
-
-src_install() {
-	java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
-		org.eclipse.jdt.internal.compiler.batch.Main
-
-	# disable the class version verify, this has intentionally
-	# some classes with 1.6, but most is 1.4
-	JAVA_PKG_STRICT="" java-pkg_dojar ${MY_PN}.jar
-}
-
-pkg_postinst() {
-	einfo "To select between slots of ECJ..."
-	einfo " # eselect ecj"
-
-	eselect ecj update ecj-${SLOT}
-}
-
-pkg_postrm() {
-	eselect ecj update
-}
diff --git a/dev-java/glassfish-persistence/Manifest b/dev-java/glassfish-persistence/Manifest
index 4726c7762b4e..b3d111003d11 100644
--- a/dev-java/glassfish-persistence/Manifest
+++ b/dev-java/glassfish-persistence/Manifest
@@ -1,4 +1,4 @@
 AUX glassfish-persistence-1.0-python2.7-sax-parser.patch 286 BLAKE2B 49667ba4e41eadfea73fc8b53cf61f5fafd4654292ecd1b2e2b653411d252b1ff8bc40e6c9e0cd8fdd1375ba86a358495415a68ff1466f857d96cfd90ce5605a SHA512 ba7c32d86991407d45a86d640d95007cc47dcd28c74f441e38840206093653dc31e4824d4986cd9cd60d44fba0c1f4365f9348a9362529531fa9410e9fd5cad1
 DIST glassfish-9_0-b48-src.zip 35162972 BLAKE2B ff96f2135c6bbdc60eadab6a6bd60b623ac1a3635e4465591ee75f6c1229e83f9f6424b46e42eb333eb6edd3ba1aba51897ab80ca5bd5c754e516a27a03381d9 SHA512 512ccd1c89a1bbd88ca1e45b1e60693bd3c4a6c6ffa19376febb786eb73556f27bc0ce4f0e760d6d80b0711206f6701e7c7da70ef3a5e0084ad0482246506a48
-EBUILD glassfish-persistence-1.0-r1.ebuild 814 BLAKE2B cdd2d0a552118d855c34056983e69a1453506abc535cd2cf49a1f9460dce7e809805172bea2f6fcf7c3efdd32a30441be1a2b3a6b6229f37e861c6ddb33b975f SHA512 92366fb448d2a99342c812b80edad37c0ca8c4486fbe561252f443c91ac585fd8b63abb82ed8a58b03d44d9199d930e2a6be38779732fae2448290a657934000
+EBUILD glassfish-persistence-1.0-r1.ebuild 809 BLAKE2B 507f47d8a7d2ad043218997f2fb0bf402111ff5b384bffb3fa9523bd4a92867bb5715b8ce7d102d34988de6f4892cc1eec59c6a17b88d4ec56c7adbc9fad029a SHA512 028a1ffc006759847744735231c8979bee0ea3c15a180119a7cc99d4f60a9990cb36681a35a63b5409ecd3bd12a16f0d2b4dfa6377b0bf0f018e9b6f1d50f614
 MISC metadata.xml 214 BLAKE2B 5452fb11be445b7579865f9777af292067658bf101f6321db48ab1b478101fe031bb7914c6c24215bcdbe369dda396c164fcbbc4253ecb315de82141ee25f8b0 SHA512 d2b6ecfbbd79440de1909d9f195e5d4a6f9886b685ac1e6d7a1db39b8925b29942fac2998cde06040c921f2cc9ef2cbfbf836b60e191d894b00f75628476b1f7
diff --git a/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild b/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild
index f7157f5db556..898ef4606059 100644
--- a/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild
+++ b/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild
@@ -1,34 +1,34 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Glassfish implementation of persistence API"
 HOMEPAGE="https://glassfish.java.net/"
 SRC_URI="http://download.java.net/javaee5/fcs_branch/promoted/source/glassfish-9_0-b48-src.zip"
+S="${WORKDIR}/glassfish"
 
 LICENSE="CDDL"
 SLOT="0"
 KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.5"
-DEPEND="
-	>=virtual/jdk-1.5
-	app-arch/unzip"
-
-S="${WORKDIR}/glassfish"
 
-java_prepare() {
-	epatch "${FILESDIR}"/${P}-python2.7-sax-parser.patch #414807
-}
+BDEPEND="app-arch/unzip"
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
 
 EANT_BUILD_XML="persistence-api/build.xml"
 EANT_BUILD_TARGET="all"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-python2.7-sax-parser.patch
+)
+
+src_prepare() {
+	default
+}
+
 src_install() {
 	cd "${WORKDIR}"/publish/glassfish || die
 	java-pkg_newjar lib/javaee.jar
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
deleted file mode 100644
index d7018277c2a4..000000000000
--- a/dev-java/java-sdk-docs/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST jdk-11.0.5_doc-all.zip 51476228 BLAKE2B 4515b7aaba27446971047b4c95a8684951b5816db6d5220333377120461ae975994890442811789ed11377715466974645af2318f7daa636e092f2949a824eba SHA512 2e0a183e38f4ae5a95c1195b48be16489fde5f63a14a0566170f7fb2d4e10964b8d733fcfeca078304cd10ad98834992d7b86320ebf29000c9474b39d709a9ff
-DIST jdk-8u202-docs-all.zip 93792495 BLAKE2B c1e3f6f5a713d55a62dc6ef0fd2bba5d30b094030e8438b73bd6bf9f27a7ec3bdb924d8251f99182eb62b470f177fdf84db23f57550bc9467a4a7c305190ad50 SHA512 ad8b51bbc705d46d47164918ce2d620cbadaf92a3fe56d72528f9cbc05da900309ecfef7ebf711e9474f292f744e2e33877cb7377e2e21a5a58e1922198be907
-DIST jdk-9.0.4_doc-all.zip 70500089 BLAKE2B 549da2c6baf1b39082f05d42d0fd02f7682a765c1d43a605063b155b3b3e2e20053b4044a238afb41c758700efa5de9ec53c29e2e8be1d682c2e9e7b221c0875 SHA512 7d8b40499a0ea91ac922c6916b19a061b39e73e54e123a943fcaa75fcfe66672ad445dbd789c2c9448c8cee0e7f72974ca6ad53bcaa5667547feca5791dab92b
-EBUILD java-sdk-docs-1.8.0.202.ebuild 1463 BLAKE2B 90333af0e93385f7c17ebcdba8a08022d4e16db20cd13e1081a8e44f7c2fed01de147767f0a52debe08559937a54e40d3636c371bbd1369ccc8fd3ca1c1857d1 SHA512 690b5443f1dbf3cb51c9b6f5201375d225bda54bf4ab83e388546c12b5f3c60a5bbe44b1abb7ebf48d85caaf550339798f5b6d9141cfa8b7bc2867653a5baea6
-EBUILD java-sdk-docs-11.0.5.ebuild 1271 BLAKE2B ba0bd21e7152812761f5ad647a8fdae7224b37ee46e7f4c3f9d902427c7441b73138410caeac3b8d0ad7787eb6e151f47da57213f7cf3fb9a398a4f293178558 SHA512 fddabae8599e811a9133a60f499d60203abe9ab994861bddfcec2bf2e33f6e5f7887d6d8b7308e539abe4dba08ff52e3388f5c587acd19df84bb273e89564a30
-EBUILD java-sdk-docs-9.0.4.ebuild 1268 BLAKE2B ab204f51b780bf7baf6aca9988c794572cb2c304d3be13a11e4abb62192b1181e22d6baaea46897650ffab54cf8601256d43413d7a073132413488d89d1a3011 SHA512 e2d4eb0603fcabfbfde942ac41d0dd3e2e90ba242aa4e180a8bcd03d1b987ab12aab0c1629b5d4f9275300e1717b2f3378aaff62675774ae6a73c00fc6c6545e
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.202.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.202.ebuild
deleted file mode 100644
index 241e93691a30..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.202.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/jdk8-doc-downloads-2133158.html"
-
-[[ "$(ver_cut 4)" == 0 ]] \
-	|| MY_PV_EXT="u$(ver_cut 4)"
-
-MY_PV="$(ver_cut 2)${MY_PV_EXT}"
-
-DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
-HOMEPAGE="http://download.oracle.com/javase/8/docs/"
-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"
-RESTRICT="fetch"
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/docs"
-
-pkg_nofetch() {
-	einfo "Please download ${SRC_URI} from"
-	einfo "${DOWNLOAD_URL}"
-	einfo "by agreeing to the license and place it in your distfiles directory."
-	einfo ""
-	einfo "If you find the file on the download page replaced with a higher"
-	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_prepare() {
-	default
-
-	# Don't need both .Z and .bz2 archives.
-	find -name "*.Z" -delete || die
-}
-
-src_install() {
-	insinto /usr/share/doc/${PN}-${SLOT}/html
-	doins -r index.html */
-}
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-11.0.5.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-11.0.5.ebuild
deleted file mode 100644
index 4ebb1e6d8d5b..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-11.0.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DOWNLOAD_URL="https://www.oracle.com/technetwork/java/javase/documentation/jdk11-doc-downloads-5097203.html"
-
-SLOT="${PV%%.*}"
-DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
-HOMEPAGE="https://docs.oracle.com/javase/11"
-SRC_URI="jdk-${PV}_doc-all.zip"
-LICENSE="oracle-java-documentation-${SLOT}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-RESTRICT="fetch"
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/docs"
-
-pkg_nofetch() {
-	einfo "Please download ${SRC_URI} from"
-	einfo "${DOWNLOAD_URL}"
-	einfo "by agreeing to the license and place it in your distfiles directory."
-	einfo ""
-	einfo "If you find the file on the download page replaced with a higher"
-	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/${PN}-${SLOT}/html
-	doins -r index.html */
-}
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-9.0.4.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-9.0.4.ebuild
deleted file mode 100644
index 7fba329b2417..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-9.0.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/jdk9-doc-downloads-3850606.html"
-
-SLOT="${PV%%.*}"
-DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
-HOMEPAGE="https://docs.oracle.com/javase/9"
-SRC_URI="jdk-${PV}_doc-all.zip"
-LICENSE="oracle-java-documentation-${SLOT}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-RESTRICT="fetch"
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/docs"
-
-pkg_nofetch() {
-	einfo "Please download ${SRC_URI} from"
-	einfo "${DOWNLOAD_URL}"
-	einfo "by agreeing to the license and place it in your distfiles directory."
-	einfo ""
-	einfo "If you find the file on the download page replaced with a higher"
-	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/${PN}-${SLOT}/html
-	doins -r index.html */
-}
diff --git a/dev-java/java-sdk-docs/metadata.xml b/dev-java/java-sdk-docs/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/dev-java/java-sdk-docs/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-java/jcodings/Manifest b/dev-java/jcodings/Manifest
index b5bfd2841668..a9689ea6e194 100644
--- a/dev-java/jcodings/Manifest
+++ b/dev-java/jcodings/Manifest
@@ -1,6 +1,6 @@
 AUX maven-build.xml 7254 BLAKE2B 1004cdec7ec80a02f2a0344d748ec0e17e9902be72ea93ac39542b3cc0e8eacd5d95dfc716d5acd20124b9c71aaee2b99bf4bec084301f53897da52758071900 SHA512 0735062e262c9abcb3649ef48d87a9d7489d0d980ee9c77c1e7b6aff4f386344d423403dc54e4d1ae08606adbe1ffea4ac4cf531d4cf1cb2dcf21f1ab95571ad
 DIST jcodings-1.0.11.tar.gz 123802 BLAKE2B 22cde3714da0f1b9434d630905d9a5a8bcdf7ebcab8de5b03ff12d6b31d6fd256f87680743d96e860cd5af34a0b5e70bb1a326000b5440d9b4c4f8a20d9964ee SHA512 6bff29718ff04fd2f52cff767440d87f3dcb0f4acf71ee7b037241af7ef7533284176f53d08da5b1f37c643b766f4a9113651c994d1893ef302a2056d9ff40f3
 DIST jcodings-1.0.5-git.tar.gz 90788 BLAKE2B f1a72a1879e89c60bbb1537d5a6dd174b9f0a2bb4a3eb80520a2b4f7ddae5da359f11ba220b4f64db0413fd423c31623a0863cedbf62f7efd83ce73952557b35 SHA512 a0122eea18077daefdcf38ec9e6f12b000c558837835fe900f6e0c282fdfcf95dbb10652b4cfeb32e556ae8ebe1aec8c10e4a352cdb565837b2f16335140f8e3
-EBUILD jcodings-1.0.11.ebuild 828 BLAKE2B 555aa132da6212e4c772b3500ddfb54e584afc004c2082716defabee2af6d4c9cf4721e5e28c4b3daf9a91715462829828ff14fadda3aefec5257b461cdc27a7 SHA512 f4495874eda08d74cb2639c5a584ef789344d54a3ea6684d96c15df960ef54fb155d3a2ad7ad342d495435e406931550a63f69dd3dafbe51af333a85a5b4ea9c
-EBUILD jcodings-1.0.5.ebuild 763 BLAKE2B cb9ea59e1101e31c8e5f6fdaa9093dd2fb6bbbbdcffa7506ce10968d9a90b346145f56ffd863ad770a3698eb06fdd9128999a702cfa093b59ae041b089439e98 SHA512 bda1b75cbfef5252d46fa1f927775727fd73c306c62e6c2095a5cbbe4a39c9acf318fd0added610fb29c2d39fee198eb3a856fe500aef8199e13c80f5fc435e8
+EBUILD jcodings-1.0.11.ebuild 834 BLAKE2B 1046e312c4d1c7ad781abc41a34bb37581c0ad67bd7f4ac898994b67778dfe340b68ae5cad8f3fa399220f0a7ba101a544da7af4269e42c74aa594e9a31f8b81 SHA512 8831d4998969594ecd6461d823133c73d2ab5633a3e9b812f5ad876f6c45e759b4705f814261d677ef0761b5f03f779046506ef3279459e1d7c5c679a083b835
+EBUILD jcodings-1.0.5.ebuild 765 BLAKE2B 162acf18d0e80a70902fa8175232f450d308625781ee9952ed45de1ba38d53409167c1d2f9a38a7cc298966d94087bd3a518ef0ad8a36f0d7a7b53eed19e8e92 SHA512 fe97b0dc11501334d48714495b0cf04c5dd3206129a53d4917f4710f37a29223e2bbee0ce7c9552e1c8b63f338462d9129204374c4ab0ab95cc926e5f21ba624
 MISC metadata.xml 325 BLAKE2B ffc57bb511b07c41330a25a5fbc924232362e45c3206c32e7c3d90cd624a9a2b0cd1e5499b510b19387c5eb43134b01bf501b112964beb629d1f1b0b0e6a3abe SHA512 b0a431f148289e90b6bbf25940157336603658375d13d4a256e224174ddeedac53e6dd625239e51763b467678090a6305463c4c89fd878027ca8c4b369434095
diff --git a/dev-java/jcodings/jcodings-1.0.11.ebuild b/dev-java/jcodings/jcodings-1.0.11.ebuild
index 0800cfad7b1d..e1e86c7657f1 100644
--- a/dev-java/jcodings/jcodings-1.0.11.ebuild
+++ b/dev-java/jcodings/jcodings-1.0.11.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
@@ -24,7 +24,8 @@ DEPEND=">=virtual/jdk-1.5
 
 S="${WORKDIR}/${PN}-${PN}-${PV}"
 
-java_prepare() {
+src_prepare() {
+	default
 	cp "${FILESDIR}"/maven-build.xml build.xml || die
 }
 
diff --git a/dev-java/jcodings/jcodings-1.0.5.ebuild b/dev-java/jcodings/jcodings-1.0.5.ebuild
index 3d8343932380..4cfdfa2ba4b7 100644
--- a/dev-java/jcodings/jcodings-1.0.5.ebuild
+++ b/dev-java/jcodings/jcodings-1.0.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 
@@ -9,12 +9,11 @@ inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Byte-based encoding support library for Java"
 HOMEPAGE="https://github.com/codehaus"
-SRC_URI="https://github.com/jruby/${PN}/tarball/${PV} -> ${P}-git.tar.gz"
+SRC_URI="https://github.com/jruby/${PN}/archive/${PV}.tar.gz -> ${P}-git.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
 
 RDEPEND=">=virtual/jre-1.5"
 DEPEND=">=virtual/jdk-1.5"
@@ -24,7 +23,8 @@ src_unpack() {
 	mv jruby-${PN}-* ${P} || die
 }
 
-java_prepare() {
+src_prepare() {
+	default
 	cp "${FILESDIR}"/maven-build.xml build.xml || die
 }
 
diff --git a/dev-java/jnlp-api/Manifest b/dev-java/jnlp-api/Manifest
index f54373e17d1d..f9970ca01e0e 100644
--- a/dev-java/jnlp-api/Manifest
+++ b/dev-java/jnlp-api/Manifest
@@ -1,3 +1,3 @@
 DIST jnlp-api-6.0.18.tar.bz2 10518 BLAKE2B c5e9f1c3f14dac45c2bdd979844ff3a49f573c6a79010d3b412086a2496ca7429a8ecd6211224c934cba90f40f7cc903fe23715006570e5876a504070ac797d8 SHA512 e3b7ed5092255b665feac2c37341be81bd71c1f2c925851338f1dbfb05bf1e1a8f09f5fea63c08ca1e737db7072b6ee25ec55cfaa18789e40101d6930785209f
-EBUILD jnlp-api-6.0.18.ebuild 605 BLAKE2B 62e3b429e0b6a120c6b95aa6a6dc76d7162b524f764345a43d0801867ab7253647afa5b8aa7be7e20942fd2c611f0715884585123f591617638eac1a8fb9100e SHA512 a8082c8a10c131d5609968018bd07a04d35495a8ab5260229a91970ced0a23e3cad00e33b01606763da38a888b9199d69d2b0ffce4c11b1d2db349ea1b6aac29
+EBUILD jnlp-api-6.0.18.ebuild 594 BLAKE2B 8ba5886c83d0beb6b3e27c22d78a02802cba91f02ae5100eaa2aade3d7c23c655dd116123f7073fdb65ec96e5aa95e2e3b65cb634bb1e2cc4b86a0d9dba51296 SHA512 41a89df8c61462718888edbd767e63bc269459726fdcccb02b46d6eb0b05b5869619773c7143701d3ea4d7c1082634bd6e4ccf2aca705f65b487e85dbc935146
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jnlp-api/jnlp-api-6.0.18.ebuild b/dev-java/jnlp-api/jnlp-api-6.0.18.ebuild
index 394507a13802..a5b656de4c1b 100644
--- a/dev-java/jnlp-api/jnlp-api-6.0.18.ebuild
+++ b/dev-java/jnlp-api/jnlp-api-6.0.18.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
+
 JAVA_PKG_IUSE="source"
 
-inherit eutils java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="JNLP API classes, repackaged from the icedtea-web fork of netx"
 HOMEPAGE="http://jcp.org/en/jsr/detail?id=56"
diff --git a/dev-java/jzlib/Manifest b/dev-java/jzlib/Manifest
index 48504abe01aa..b6b343b935bc 100644
--- a/dev-java/jzlib/Manifest
+++ b/dev-java/jzlib/Manifest
@@ -1,7 +1,5 @@
 DIST jzlib-1.0.7.tar.gz 50303 BLAKE2B d38a1560fcbfbda479b797727d8e0ff0e6197ad13f78018d451346ae2f7a201bbffbf87a6ed727776dac2e9eb890aa0ea81486e0c78e11ddcb893c8654711618 SHA512 8cbc492857d432f79da08a9f6dcebc401e25bd888adada8d94caee15d67d0b89b4f66876a5b2275170157977527e1505386dd5a1575dbe658de233d4389941ea
-DIST jzlib-1.1.1.zip 105191 BLAKE2B ba2d53d2d2fb12de6ce6016b393a9147e0a0ffbed576940f629fae50bb60329d076d42a912897925517a2f6a75dca1fba4fc4836046152c45aafadd9e0983e8e SHA512 de76c008e640f17788c69ed2aae72cddbd0a72d039ce61169ca7af640571952080c48ec588b0fdb497a795d3f7644170ec541bdbe834b6b638e6260ffb57dc07
-DIST jzlib-1.1.3.zip 176747 BLAKE2B fb868a254e6beea192de9965bdb8c13313099efd68c0f11b6196c0b70d10bd189b6c82ef75c73376ec391b99e2c029b117cb51cee4bc9d6f888b400fe737c620 SHA512 844a157053a8d6c9b722e9c27e0f1520f3061d7e323f0e50d276c301477128f46dc7b1250c2ca337225690bc641b6f663ee76be8831b6e0c288438e64aa935b0
-EBUILD jzlib-1.0.7-r2.ebuild 762 BLAKE2B c4d8ab0af10c8b0cb09940d823a5df522d2f7afa374e21e94b10dbb985c9754df2fe69b345d709526de2644dc8dcf29dd5c225d2337cf5822993980263c8a784 SHA512 5364cd2fa32bd41178fee876f16be79c454587f6a4bdecce72daa1daf9cbd239d4c0013d36623d9101984cc823551fc4935506ae45c6e134d56996b88e521162
-EBUILD jzlib-1.1.1.ebuild 1360 BLAKE2B 0b6f492e0f41327af685fd4f9458c88df8d1cc47618e33aa8e95307921915d038dd8f93a2ef464eea0851dffdd207ecf6c0cccaf86c7c698557a8c6324f48733 SHA512 0bbb2582a9da8526fdb56698cfca29f988ade0eeeee46d441e06accc2f6a29c532bc9af150f7773a35ff8d956e22c5f7644bbb3250d3d79522de69d2f0451bd5
-EBUILD jzlib-1.1.3.ebuild 1313 BLAKE2B 633f77c17e22f391f2be1e3c59f8e95cad551103b51771f039d71db4baa075454e41df5d943d5e49913f42aeb64f7b9b7a7e81e99c51bedd19031cb72026365a SHA512 3ee03ac380a1abf20dbcc2d0c539f04441c4b1003b299cb127b0ee3916f156f6a3c2fa85a8f71bdcdd69257f3a8adddc373baecfcf52f207bf6348507cba1b68
+DIST jzlib-1.1.3.tar.gz 139424 BLAKE2B cae5f0f6ac8efd99cc916e8cc087280be84e1a2a8b43b8932dc68e2393ac5f1848e4dac1759aa75a54123adba63956463719aaa469ed88cf0c609eaa63647e16 SHA512 d78ed3feaded0bde62b3e2c6fb17b5051a6637bcf12e7fe0f5b1855922358b54b440b05bdba7328c5d2cb9f972bc68195f8f0570ce5d49de9251d7060018d88d
+EBUILD jzlib-1.0.7-r2.ebuild 755 BLAKE2B 4743a43849553e4a2f3766f653388d090fbc4cadcc3191d8d7855d9e319d49d9db1c6c9640246ebb19efb7bd52c649b2d85de1e62d8a77077d625e13a9805c87 SHA512 fc169c1fba14d791429a282805cff3b0c230a1acdeabc29ecdb05ea385f5653fa64f4d26b0c4026fd27455eca2a904b68e4fa7fb88b3136fcd7788141d456ca7
+EBUILD jzlib-1.1.3-r1.ebuild 1323 BLAKE2B 76016461e618b9404bdb579cb261a62c5a31decaea7343fb4cad8d49ad9c8fc43b12cca29b961ea7949505c36b7bc85dbfc329f0ea4258d11381a63b76176720 SHA512 3d323508aca27cb8bf9ee3a664352216fdf5c36da8f7d963730a8a90677f50cd9ccbb3c6819ec01343abe9931b48d3e342d1bbb9b23a6bb956fe550e6bd8bf69
 MISC metadata.xml 321 BLAKE2B 446bb7ac28e63630afcf6bc8583857b6ec3206b0db5fce1ba0c5564fbe6e662f1df4a711e794960dfa00c31b7d1a28779c0bbc48072e2133326cd1d1fbfce1b2 SHA512 0602c7d4ec61795409acf409461bb44105b58d340a3740ace885d3dba9bee4ff146ee1a1ad6a8dd995d51ea406962fe6e5654b1a55a94c05c14cea3482a6ab8e
diff --git a/dev-java/jzlib/jzlib-1.0.7-r2.ebuild b/dev-java/jzlib/jzlib-1.0.7-r2.ebuild
index cafaafe1b74a..4f55768422a5 100644
--- a/dev-java/jzlib/jzlib-1.0.7-r2.ebuild
+++ b/dev-java/jzlib/jzlib-1.0.7-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 JAVA_PKG_IUSE="doc source examples"
 
@@ -14,14 +14,10 @@ SRC_URI="http://www.jcraft.com/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
 
-RDEPEND="
-	>=virtual/jre-1.6"
-
-DEPEND="
-	source? ( app-arch/zip )
-	>=virtual/jdk-1.6"
+BDEPEND="source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
 
 S="${WORKDIR}/${P}"
 
diff --git a/dev-java/jzlib/jzlib-1.1.1.ebuild b/dev-java/jzlib/jzlib-1.1.1.ebuild
deleted file mode 100644
index f07ebfacbbda..000000000000
--- a/dev-java/jzlib/jzlib-1.1.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="JZlib is a re-implementation of zlib in pure Java"
-HOMEPAGE="http://www.jcraft.com/jzlib/"
-SRC_URI="http://www.jcraft.com/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="1.1"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.5"
-DEPEND="
-	>=virtual/jdk-1.5"
-#	test? (
-#		dev-lang/scala
-#		dev-java/junit:4 )"
-# Restrict test due to missing keywords for scala
-RESTRICT="test"
-
-S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="src/main/java"
-
-java_prepare() {
-	# Maven not yet supported, use java-pkg-simple instead.
-	rm -v pom.xml || die
-}
-
-src_test() {
-	local CP TESTS
-	CP="${PN}.jar:$(java-pkg_getjars --with-dependencies scala,junit-4)" || die
-	TESTS=$(find src/test/scala -name '*Test.scala' -printf com.jcraft.jzlib. -exec basename {} .scala \;) || die
-
-	mkdir -p target/test || die
-	find src/test/scala -name '*.scala' -exec scalac -classpath "${CP}" -d target/test {} + || die
-	ejunit4 -classpath "target/test:${CP}" ${TESTS}
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README ChangeLog
-	use examples && java-pkg_doexamples example
-}
diff --git a/dev-java/jzlib/jzlib-1.1.3.ebuild b/dev-java/jzlib/jzlib-1.1.3-r1.ebuild
index 0f0ba0e65841..c90e35e36ccd 100644
--- a/dev-java/jzlib/jzlib-1.1.3.ebuild
+++ b/dev-java/jzlib/jzlib-1.1.3-r1.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
+
 JAVA_PKG_IUSE="examples source test"
 
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="JZlib is a re-implementation of zlib in pure Java"
 HOMEPAGE="http://www.jcraft.com/jzlib/"
-SRC_URI="https://github.com/ymnk/${PN}/archive/${PV}.zip -> ${P}.zip"
+SRC_URI="https://github.com/ymnk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.1.3"
@@ -27,7 +28,8 @@ RESTRICT="test"
 S="${WORKDIR}/${P}"
 JAVA_SRC_DIR="src/main/java"
 
-java_prepare() {
+src_prepare() {
+	default
 	rm pom.xml || die
 }
 
diff --git a/dev-java/miglayout/Manifest b/dev-java/miglayout/Manifest
index bf2ec51a0595..ebf913d60139 100644
--- a/dev-java/miglayout/Manifest
+++ b/dev-java/miglayout/Manifest
@@ -1,3 +1,3 @@
 DIST miglayout-4.0-sources.jar 194675 BLAKE2B 9d0a4fce1b76e49f4a2962fccf323676172fc9fa084060d8b3507031635b7979d8b29ce598a0a484e3707eefdf90721162e67d36be5702e9309ef067fd39aab3 SHA512 27284ceac254707428351fb2451ffd5f2ebd580374df59624bb6af06011f70d87b27849900c2573aff782ebe6d84e1806c18a59741213948f0b238ee5a51ec2f
-EBUILD miglayout-4.0.ebuild 1244 BLAKE2B 2e35fa173ca1956c5656a8e45af706af99c286275c61f944d4048d1298fc86ce2d8d53d18f0d57e2b082f74d3b183137c6e38b994d93cf8ef93155fe8330dc4a SHA512 4d85706df61b695f511ed2a2e197593e692a2492682cdb304c3455bbbd4f9a88b33305e40f6b3af283d30ed029972b79d7d19ad40a92e83a1d87bcd664cc6bcf
+EBUILD miglayout-4.0.ebuild 1270 BLAKE2B efd260a4edba737f9191d3a68412fc08ed14478ae69d26848f3e240a53a8f5144c48e4ca4d3a29e96a969b626addf572134316c0d3542994fa2c8b8234c7dd5d SHA512 ca4f22b9cfbba769e0935aeb25faf3f80579873b86f57ddbaf36284b11d410cd93894d4cafeded2b516f936a4aa7ee1e82840f73afdbe2b1e3861e9118c4ee10
 MISC metadata.xml 751 BLAKE2B 2fdfc28e91176b4c7e1dcc4a1d61c491c1e7a5d835fb1bdc89e340db57dcabbf951da958ac0ae728658fffcc6aada76194745282245a066adc8d9c792ac09a49 SHA512 b097936cfa00fa8468489722f2d9557ee93efdf0d9ac852fbcf745814d35b294d0a8b5f559c4aecc62480c6f59e8329013e133a7dc7618c4f665b79c3b03375d
diff --git a/dev-java/miglayout/miglayout-4.0.ebuild b/dev-java/miglayout/miglayout-4.0.ebuild
index 95862c4d8e1f..83297335bfb2 100644
--- a/dev-java/miglayout/miglayout-4.0.ebuild
+++ b/dev-java/miglayout/miglayout-4.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
 JAVA_PKG_IUSE="doc examples source"
 
@@ -16,17 +16,22 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="swt"
 
-COMMON_DEP="
-	swt? ( dev-java/swt:3.7 )"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
+COMMON_DEPEND="swt? ( dev-java/swt:3.7 )"
+BDEPEND="app-arch/unzip"
+RDEPEND="
+	${COMMON_DEPEND}
+	>=virtual/jre-1.5
+"
+DEPEND="
+	${COMMON_DEPEND}
 	>=virtual/jdk-1.5
-	app-arch/unzip"
+"
 
 S="${WORKDIR}"
 
-java_prepare() {
+src_prepare() {
+	default
+
 	mv net/miginfocom/{demo,examples} . || die
 	mv demo/* examples || die
 
diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
deleted file mode 100644
index 604c5b7c8fe1..000000000000
--- a/dev-java/netbeans-harness/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST 20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar 61713 BLAKE2B 4b4c47851bca5a7cb4e81791ed186790167e5804a072f52a0ad75d6e133f7f37875ed20350f6d39b72da32aa659486e4d3334972f21ff27d8f0a400545bc3793 SHA512 2d06db5267ac5d8fd227819014177f0d5cc345583628f1ff2fff89f180a4269936a136af0b4649cf43603b0adab6ce3e3f525ef2033537c6f035b558c356d900
-DIST 49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip 579550 BLAKE2B e58aecad031e08a69d9f3f69be74960a9ed8049a94d8445bf5750c6b2907b4739f63d1f37ac6aa50a5fe96c02cba7d3ccfb836304b6956d3a21add3d8c83f32a SHA512 3de7720a392813cbbbc73a6ce2a745e10054c0888df61b1e623bf327f8a4584a9eaa07303fc41d01d2088fd6c868e7273c6355d23839dfaa9009d1f672520d58
-DIST A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar 109823 BLAKE2B ac04471f6fd5869d4fff8fe86749b599cd49d81d55319085c01f7fdd7ff30aebeffafa46dad254e7193fe3d035f3b4d0310a7e9242cb54daf82188510e4fcafb SHA512 5a0089c36c35ffa2c243cbaee376a246dbfd3dd3f170fa233946b6134f9c80dda610f2900e8bbd1553c3e8bdd3b5548145c881745acc720ec1e059d8252b8399
-DIST D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip 1647417 BLAKE2B e06b4df3e96cdaf8150c74f2039a28251a55469449674cbb045a46d7866ddfa52f6e3ac4a01a7c7da4f40906038245574f1cb208aa3385bdc48f88ece3924519 SHA512 ffad7d45643015d178cdb1b5bb075f0232470f5f7b82acd87d3dbf88e2034aed04fa9fadadbf7831d3c57fe0c4bc9684d841aebaa8a99ba1d6c1f6cb13f80359
-DIST D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar 1713398 BLAKE2B e06cc8c989a3ecf5c501ad3e187b8f2afcd7a4838345812b52e0496a2a68b481d2f4406bde00f9cad662d94d97494769d7ea3a2686cf62d3691d953d67701010 SHA512 66d1435d2214c7259a4a683bbc3596a11bc99568081c214281a635fc0d5af10bbbddf5efbd040169e0e077abc25a4cb3f790530ce2e514270cdf51e9c916d065
-DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
-DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-harness-8.2.ebuild 3756 BLAKE2B 88ec0597dcf06af6d7f89ac44510a7b534de60815b2de76d933a0c899100e976f8a4ced3c9ad5c4c8beda014303e7307159d07dc42a4a0473f02f58812c5850f SHA512 ca207a658bd4109adc70d42afb5a2198e9ce21c26810e81dff98385e03933b50f5574a384b9cc60f2aa8afbf69cbda881162fe861ff717481bd18960d08301fe
-MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-harness/metadata.xml b/dev-java/netbeans-harness/metadata.xml
deleted file mode 100644
index 85f4d904aad0..000000000000
--- a/dev-java/netbeans-harness/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>fordfrog@gentoo.org</email>
-  <name>Miroslav Šulc</name>
-</maintainer>
-<maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/netbeans-harness/netbeans-harness-8.2.ebuild b/dev-java/netbeans-harness/netbeans-harness-8.2.ebuild
deleted file mode 100644
index ce76624e69a9..000000000000
--- a/dev-java/netbeans-harness/netbeans-harness-8.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Harness"
-HOMEPAGE="https://netbeans.org/features/platform/"
-SLOT="8.2"
-SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-	https://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
-	https://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
-	https://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
-	https://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
-	https://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="virtual/jdk:1.8
-	~dev-java/netbeans-platform-${PV}
-	dev-java/javahelp:0"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	>=dev-java/junit-4.4:4"
-RDEPEND="${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.harness -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-8.2-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
-	ln -s "${DISTDIR}"/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar apisupport.harness/external/jnlp-servlet.jar || die
-	ln -s "${DISTDIR}"/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar jemmy/external/jemmy-2.3.1.1.jar || die
-	ln -s "${DISTDIR}"/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip jemmy/external/jemmy-2.3.1.1-doc.zip || die
-	ln -s "${DISTDIR}"/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip jemmy/external/jemmy-2.3.1.1-src.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	eapply netbeans-8.2-build.xml.patch
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-	default
-}
-
-src_install() {
-	pushd nbbuild/netbeans/harness >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/harness$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	fperms 755 launchers/app.sh
-	find "${D}" -name "*.exe" -type f -delete
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/antlib
-	pushd "${instdir}" >/dev/null || die
-	rm jsearch-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jsearch.jar jsearch-2.0_05.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/harness
-}
diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
deleted file mode 100644
index 66c3a009dad0..000000000000
--- a/dev-java/netbeans-platform/Manifest
+++ /dev/null
@@ -1,19 +0,0 @@
-DIST 10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar 26101 BLAKE2B 826c6d577de20d7f37af54869718a078262a17863a3a4e18ed568819d52d5a91eecbf1a7666a7d529552494a79557b0137483bd2e627366b7ccae3ba897eae2d SHA512 be6587de5ba44b05a4912658cff0dff15c20ee984462b441d6f8088a2d6a991f1c070ee78fe75ed35ad406d11c615a08a1b40b3b729cf7b3508c60ded1ad3caf
-DIST 1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar 529233 BLAKE2B 3eb995b936e2de9b8a580e5b96224c016a6fdebe93aabf6060bd339b98d85ea56bbe0db72de29a16866fe2a5c0bf12dcb4b5e0695b8c93814304fcfc52b702ae SHA512 55f88f204cafd6968a952d6d08286220a569f678915446aca2b49bfe3bb7e2de6935d5ce834ef55363209d8f23be7d2275cc517a2ce837b75e5e5a6551e9ba9e
-DIST 1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip 77859 BLAKE2B f5dd4139af4f6f477bc8e344eea5eb280eddcdf19482c9f42bb8286b13fccdf949a2accf691b40acd39a21b42435e2935eb05f13a885077cdd6ef194270294d2 SHA512 15834d5448da80be539259e902ffa678a3b94293ffec221ad1e6238f0abd2dd2b588b8c06165f7e89796e96a6660c3166aad13112d34eebbed29163b52074b56
-DIST 2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar 241636 BLAKE2B 66c75fc8a10cae353751e087b5553499989b9bcb5a662d853f45c992f7a7ee363be8f93872fe2ac918ef2cd591838481e82661abb0c7246f4a062b6a6ccaf364 SHA512 346746e19ca24e7489ba7bb283cefa47d2df33e6795e9e275bdc269dc312537264c24537b2128246cca8a4c2053a73e4172c6d0b9f16450e227d9aa895e9c730
-DIST 5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar 67500 BLAKE2B 6cedf54603f7c5566ab430a53b6337c21f646e4e5f9db2e87b0164e4b8b0e7959c3d98cb82449c0ee09934e17f5da5a37e51a459104900c8a473abe525c9150d SHA512 d87ca1d527b87a47266593bdc0e58f4aa4adb6a04869a342657940e8a442b58a60c08831e27202b9628b996c16bc4635a0985c8d3126962e5d7f2dde049515df
-DIST 6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar 9109 BLAKE2B 45880789d4e460e6d3375de4cbfbbb4f925f023a480ec2eaf3ff27cfdedc7d3c438bbf392bc65aa2b0184f815d15db84ebfde727ad5cc911a5adb7fa2a9717ce SHA512 883d2428460ab3728e60259fa74b5dd6cb0ef168eb54becb10ad0a289a29e518273917daaed64a7d8f8c61033a8dd56a160ea922be4e8df396823d00910b9c52
-DIST 771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar 45895 BLAKE2B 86bcd356cac1c242a4009b8f5ea5ba0a3322535e6ac9e603861bb375e46f0ab1c707b834dffe5ae57fdc8df1a01b11f8e1fde317c0a97191ec964920640b0c1d SHA512 5ea1efe94544f52aa9ac1492929c0342140df12cde399610faff719ad71f3740621834868876bc622f983c237a880df792ec6817bd0c7fd3ad6edc02320584ad
-DIST 7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar 59464 BLAKE2B cf7f28d1ddb8d3305e41e4793e98f1918731618d97214dfa90c04b53db0154ce9b1379fc2e98ca384e8d0f2234db07cc15af1643e14451d4ee56965b6550dd68 SHA512 dddc4e304ea53bead46d2a5d4485ce51447380003d16aab999fee799e98b9aab281e2d9426b2a41274a4c2fea98bd3a2470594c753c10748db3e3c20f5abecbf
-DIST 941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar 937942 BLAKE2B 4f79726785917812d37f6cbb27090317441319c540891e471d55ccf81ce5112862921fe73245b997e3a5c7d70ae540db9826d1cd3e82bb7e063b0b509721d40a SHA512 bea8b53fc64cc3fbab1646a9235e7a9d98ffc7311277ea6a53485364462fce1b4bc9645d9f0bb6f072ee32ca730f963f7cad5c43cad052b1df7fad6245c90177
-DIST A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar 14974 BLAKE2B 8d8149a394eb817e8cec79b50f3a272916e63825945640a7579b4f5f2433d28349670be28cb0caedefc53e6c22075dc90a2e654d8ce887674c331b0e5f7ccbb1 SHA512 7b52a1ad7d32ed98b9bdcc8fe4e179a781cd36b10aa87c3ea60e9fc30f27dd914a1fb94cf09d96b66c2dfb4e4f0811b01febcd746c3316155905f29eeed6abee
-DIST AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip 388369 BLAKE2B b00517bcbeea2f6e529f7e18b931f98d23f23d4fde51506b39890856d877c4370e72c0fb7e01e8fe2d7a4e4704b9f63aa8c149aca24b9b5a697d0c8a68fec8f5 SHA512 2a7938d152d101416ce2d06bce39e07d670189450a723cb298d23a1c6613c49569c6774fb160081b08f22e644e71b27787a4eb9173856cfb3d56b05bca9b95e4
-DIST BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar 10702 BLAKE2B 403ad2646d7cbab7cf630350b9225a72aef5244f839204bdb7ebeddef82de555676d45f87468234d1b9d0e2d64a89ff63b289dd55256eff948ae18afbbeedd91 SHA512 8e054e4b207a30495718ffd0cc01a0654de1eed4a7ec37d0a23a68aa6a8af1fd215d0660d6d6957e39298866a3e0bdbcea6fd329269ec97bc4141548c814bfc3
-DIST CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar 10718 BLAKE2B 0134e79bd2e5671502bd2d75d66cecd247d6f3c8ec2e7fda7f21d9aa59e8ec7bb1aeb09ababee7f9b898a9cd0c916b91a22ee169aa101b0c004b9d894c9d75d1 SHA512 e679b73200a4cd33bb8ef575aa2d79cab29a0e97d042abf7db9576e247ac720effde1c314636719dbf5133fe9d00457865d1209ae15a3022d931a448f0c0758b
-DIST D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar 106018 BLAKE2B 336ca6386a8c781c5414195f0defaa65d8c721f1797397d8620e9fd6e4d137f09d9f3bd1d6dda400b20a2e024142fec35b643d58d83a4285c39c0e3591298285 SHA512 d7465d9ee58ba91facdbd911f38993788ca54865da64e5322fd29d399fc8e4b2680bb7c2575ebe421e7a247bb32a5fa5075527c0b3cc0b783a4dc2599b193a86
-DIST E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar 1333309 BLAKE2B e1b8d0dd9f9e7d9a1a2220c47421bb4b4dc9ba4c60804d598fd8c93b4ea2a4ded9f08483496e6e1f5b710e5b429f7fd4c03aa4c4e02d9035d4c6142ea8ed6926 SHA512 db6581b3e208470ced2ea5c367160dcb9470a1858926da46eaad6011d5a9feb273038467f75e57a375376ad947b3c1ecb4e5ea6a2fd88096eda84e1232b2eaef
-DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
-DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-platform-8.2.ebuild 9179 BLAKE2B b1d295cbf9e57b985cf2b1de68ee9094114c7a2f37765b6a956bec91c40102fd6522dd3d8515e654467879d95e34639665877eb3d1da74b938f6b5c718c11c7c SHA512 107ccfc2d1449559b9ad7bd7d006e6501a2408c1966107876bf673a2b0b453fe1d5dd7e5d2c23096e4b62114833554f579966a865e6585a4bb91379cabbcc340
-MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-platform/metadata.xml b/dev-java/netbeans-platform/metadata.xml
deleted file mode 100644
index 85f4d904aad0..000000000000
--- a/dev-java/netbeans-platform/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>fordfrog@gentoo.org</email>
-  <name>Miroslav Šulc</name>
-</maintainer>
-<maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/netbeans-platform/netbeans-platform-8.2.ebuild b/dev-java/netbeans-platform/netbeans-platform-8.2.ebuild
deleted file mode 100644
index 24d34e90b44d..000000000000
--- a/dev-java/netbeans-platform/netbeans-platform-8.2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Platform"
-HOMEPAGE="https://netbeans.org/features/platform/"
-SLOT="8.2"
-SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-	https://hg.netbeans.org/binaries/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar
-	https://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar
-	https://hg.netbeans.org/binaries/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar
-	https://hg.netbeans.org/binaries/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar
-	https://hg.netbeans.org/binaries/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar
-	https://hg.netbeans.org/binaries/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar
-	https://hg.netbeans.org/binaries/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar
-	https://hg.netbeans.org/binaries/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar
-	https://hg.netbeans.org/binaries/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar
-	https://hg.netbeans.org/binaries/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar
-	https://hg.netbeans.org/binaries/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar
-	https://hg.netbeans.org/binaries/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar
-	https://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
-	https://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip
-	https://hg.netbeans.org/binaries/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-# oracle-jdk-bin is needed for now because of javafx which is not packaged separately yet
-# [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar]
-# [parseprojectxml] Classpath entry /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar does not exist; skipping
-#  [nbmerge] Failed to build target: all-api.htmlui
-
-CDEPEND="dev-java/hamcrest-core:1.3
-	dev-java/javahelp:0
-	>=dev-java/jna-3.4:0
-	dev-java/junit:4[source]
-	>=dev-java/osgi-core-api-5:0
-	dev-java/osgi-compendium:0
-	dev-java/swing-layout:1[source]
-	dev-java/testng:0"
-DEPEND="${CDEPEND}
-	dev-java/oracle-jdk-bin:1.8[javafx]
-	app-arch/unzip"
-RDEPEND="${CDEPEND}
-	virtual/jdk:1.8"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
-JAVA_PKG_WANT_SOURCE="1.7"
-JAVA_PKG_WANT_TARGET="1.7"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-8.2-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar libs.asm/external/asm-all-5.0.1.jar || die
-	ln -s "${DISTDIR}"/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar libs.felix/external/felix-4.2.1.jar || die
-	ln -s "${DISTDIR}"/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar junitlib/external/junit-4.12-javadoc.jar || die
-	ln -s "${DISTDIR}"/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar o.n.html.ko4j/external/ko4j-1.3.jar || die
-	ln -s "${DISTDIR}"/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar net.java.html/external/net.java.html-1.3.jar || die
-	ln -s "${DISTDIR}"/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar net.java.html.boot/external/net.java.html.boot-1.3.jar || die
-	ln -s "${DISTDIR}"/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar net.java.html.boot.fx/external/net.java.html.boot.fx-1.3.jar || die
-	ln -s "${DISTDIR}"/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar net.java.html.boot.script/external/net.java.html.boot.script-1.3.jar || die
-	ln -s "${DISTDIR}"/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar net.java.html.geo/external/net.java.html.geo-1.3.jar || die
-	ln -s "${DISTDIR}"/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar net.java.html.json/external/net.java.html.json-1.3.jar || die
-	ln -s "${DISTDIR}"/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar net.java.html.sound/external/net.java.html.sound-1.3.jar || die
-	ln -s "${DISTDIR}"/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610.jar || die
-	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
-	ln -s "${DISTDIR}"/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip libs.testng/external/testng-6.8.1-javadoc.zip || die
-	ln -s "${DISTDIR}"/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar o.n.html.xhr4j/external/xhr4j-1.3.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	# upstream jna jar contains bundled binary libraries so we disable that feature
-	epatch netbeans-8.2-build.xml.patch
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --into libs.junit4/external hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
-	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.jna/external jna jna.jar jna-4.2.2.jar
-	java-pkg_jar-from --into libs.jna.platform/external jna platform.jar jna-platform-4.2.2.jar
-	java-pkg_jar-from --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-	ln -s /usr/share/junit-4/sources/junit-src.zip junitlib/external/junit-4.12-sources.jar || die
-	java-pkg_jar-from --into libs.osgi/external osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
-	java-pkg_jar-from --into libs.osgi/external osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
-	java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
-	ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
-	java-pkg_jar-from --into libs.testng/external testng testng.jar testng-6.8.1-dist.jar
-
-	java-pkg-2_src_prepare
-	default
-}
-
-src_compile() {
-	unset DISPLAY
-	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
-}
-
-src_install() {
-	pushd nbbuild/netbeans/platform >/dev/null || die
-
-	java-pkg_dojar lib/*.jar
-	grep -E "/platform$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	insinto ${INSTALL_DIR}
-	doins -r *
-	rm "${D}"/${INSTALL_DIR}/docs/junit-4.12-sources.jar || die
-	dosym /usr/share/junit-4/sources/junit-src.zip ${INSTALL_DIR}/docs/junit-4.12-sources.jar
-	rm "${D}"/${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip || die
-	dosym /usr/share/swing-layout-1/sources/swing-layout-src.zip ${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip
-	find "${D}"/${INSTALL_DIR} -name "*.exe" -delete
-	find "${D}"/${INSTALL_DIR} -name "*.dll" -delete
-	rm -fr "${D}"/modules/lib || die
-
-	popd >/dev/null || die
-
-	fperms 775 ${INSTALL_DIR}/lib/nbexec
-	dosym ${INSTALL_DIR}/lib/nbexec /usr/bin/nbexec-${SLOT}
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm hamcrest-core-1.3.jar && java-pkg_jar-from --into "${instdir}" hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
-	rm jhall-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jhall.jar jhall-2.0_05.jar
-	rm jna-4.2.2.jar && java-pkg_jar-from --into "${instdir}" jna jna.jar jna-4.2.2.jar
-	rm jna-platform-4.2.2.jar && java-pkg_jar-from --into "${instdir}" jna platform.jar jna-platform-4.2.2.jar
-	rm junit-4.12.jar && java-pkg_jar-from --into "${instdir}" junit-4 junit.jar junit-4.12.jar
-	rm osgi.cmpn-4.2.jar && java-pkg_jar-from --into "${instdir}" osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
-	rm osgi.core-5.0.0.jar && java-pkg_jar-from --into "${instdir}" osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
-	rm swing-layout-1.0.4.jar && java-pkg_jar-from --into "${instdir}" swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
-	rm testng-6.8.1-dist.jar && java-pkg_jar-from --into "${instdir}" testng testng.jar testng-6.8.1-dist.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
-}
diff --git a/dev-java/odfdom/Manifest b/dev-java/odfdom/Manifest
index 7179e549f373..339fe3637b38 100644
--- a/dev-java/odfdom/Manifest
+++ b/dev-java/odfdom/Manifest
@@ -1,4 +1,4 @@
 AUX build-0.8.6.xml 11328 BLAKE2B 73af33dddbcb829fa0a5e6354a8ac176836fbc975336f633709fb6519e834cc237af80b8bfc4822af58a85dbc89e452e891dcbbc16425f3c245ecc2ad6de5943 SHA512 6db30e3cf5b154e07bba0374beed2781c0aceb4000d73d1e44c9041f876c2aad3510f9d07d7838c7d427755819cb7e57907843a52140755bfdf8818bb15664ef
 DIST odfdom-0.8.6-sources.zip 33171275 BLAKE2B ac509fad6891a715196e36b945071a44e6c1b096d69df1ad08690dead00f9f1ed5811f070859c81da546333fb12bbccf3eed5cbe06efe9520952cde2ed509d0f SHA512 7b71d55da01d604d89c5e0c7b9efcfd67e926db6807c885cb34cb9bd2e1fb1dc4a38d8e75967e08913b7ab1dcd85e7165d561fd3585a3d0c63df35a1a12c44e0
-EBUILD odfdom-0.8.6-r1.ebuild 1723 BLAKE2B 147f3d9e28f450021423afa80df2b199553a9ce4942215c8c3b32a4d19fdb83fb028838894596d0d4c29acf80aedce40fa21fd70d5385d33c57a4ad55c77a472 SHA512 5218670fe7e049b62384d6eaaf3508897cee0068c0577e85032595a0c688da445a3877147b9a1ecbdab7d714bb4f68e3e8606c52279860003c3929b5187a8d68
+EBUILD odfdom-0.8.6-r1.ebuild 1749 BLAKE2B 391c697aeecfc789c220f45b5ff4121baaeec096ed0d8d43839b9204a27a02b977eec72b90cf5d428e75faaff60a2514e5222dff1cfd3d1748bef46e753bb590 SHA512 53ac95ef66ff012522d82a428ff139604005fec01c83f2f1290e56f0f56cbe3bfbce2ac422f1984473c95e26a21a97c177a78cf3d298827c63e105ee02ff00eb
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/odfdom/odfdom-0.8.6-r1.ebuild b/dev-java/odfdom/odfdom-0.8.6-r1.ebuild
index 647424a452f2..ac419a17aa66 100644
--- a/dev-java/odfdom/odfdom-0.8.6-r1.ebuild
+++ b/dev-java/odfdom/odfdom-0.8.6-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
@@ -13,11 +13,11 @@ SRC_URI="http://odftoolkit.org/projects/odfdom/downloads/download/current-versio
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc-aix ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
 
 CDEPEND="dev-java/xerces:2
 	dev-java/xml-commons-external:1.4"
 
+BDEPEND="app-arch/unzip"
 RDEPEND=">=virtual/jre-1.5
 	${CDEPEND}"
 DEPEND=">=virtual/jdk-1.5
@@ -31,9 +31,13 @@ DEPEND=">=virtual/jdk-1.5
 S="${WORKDIR}/${P}-sources"
 
 EANT_GENTOO_CLASSPATH="xerces-2,xml-commons-external-1.4"
+EANT_BUILD_TARGET="package"
+EANT_JAVADOC_TARGET="javadoc"
+EANT_EXTRA_ARGS="-Dmaven.test.skip=true"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},hamcrest-core,junit-4"
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 
-java_prepare() {
+src_prepare() {
 	cp "${FILESDIR}/build-${PV}.xml" build.xml || die
 
 	mkdir lib || die
@@ -43,17 +47,14 @@ java_prepare() {
 		  src/test/java/org/odftoolkit/odfdom/doc/PresentationTest.java \
 		  src/test/java/org/odftoolkit/odfdom/doc/ImageTest.java \
 		  src/test/java/org/odftoolkit/odfdom/incubator/meta/MetaDocumentStatisticTest.java \
-		  src/test/java/org/odftoolkit/odfdom/incubator/meta/OfficeMetaTest.java
-}
+		  src/test/java/org/odftoolkit/odfdom/incubator/meta/OfficeMetaTest.java \
+	|| die
 
-EANT_BUILD_TARGET="package"
-EANT_JAVADOC_TARGET="javadoc"
-EANT_EXTRA_ARGS="-Dmaven.test.skip=true"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},hamcrest-core,junit-4"
+	default
+}
 
 src_test() {
-	EANT_EXTRA_ARGS="" \
-		java-pkg-2_src_test
+	EANT_EXTRA_ARGS="" java-pkg-2_src_test
 }
 
 src_install() {
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 9d4e977e9bb0..c35d80374157 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -8,6 +8,6 @@ DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u265b01.tar.gz 103150208 BLAKE2B 70880
 DIST OpenJDK8U-jdk_arm_linux_hotspot_8u265b01.tar.gz 97641656 BLAKE2B 76d24e975c2ec173b6b4806d145f79d02828e12e2dd412b60a921648fba20920b3b69b03630ece8d5cefeaf408dad01573b15db7f4a7bbdd024806a7b01bd6ae SHA512 8f96d73038579d2873b84d19bfbcc7f481b031a91c35d86d35e127951b6c743a6a1d5230a61ebcacddf854b73c55b18cc53112b9a2759b283254bf93fd691459
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u265b01.tar.gz 100453105 BLAKE2B e57230d5f90821cb8f4c35baf0e5a9580164ad7df10ac67a528b959154317ea14b7bc0dd5c530a2b826ab6322611ddf2387617bc8dd1f444039b00a778a30025 SHA512 6de5694d0415e905848cc99ec6863e96640fca3ded4e851528c794dad82a0961e097f64f8338304d9325357729ae9ea5bc5d2eceecefebdad69a14bc7b50194a
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u265b01.tar.gz 103157351 BLAKE2B efd8a4bcab5472c9775997713b09ab9e94ef4636564f07392263d6963850e07dc07569b2c066856846c16229f1641c169eecedcbb61533067af330262f07b927 SHA512 932fe2702aa3575bcb08d01e384fbd6a49768280931fdc1fb56314656343dc2f8e5b2650c8d72369d0294ac6024df0a142fd14cb0768f9aa7831aa986679e9ae
-EBUILD openjdk-bin-11.0.8_p10.ebuild 3024 BLAKE2B ff43aaa57ea239c48fca7e99051fb4d7066933fb5f556483cf4c5ac8840b7438e1c96cf2192c8bc41142b90c6eafe4073a7e535a917d0bfa3e3309580db6ade2 SHA512 05eb2babac28ee14f6a3126d2b3ca21c1a6497a3b5797afc435dd8899efcb50f967894a3674a57d8479b37645316f23d98590b9190506e90aeab357c128cb44f
+EBUILD openjdk-bin-11.0.8_p10.ebuild 2979 BLAKE2B 079df8fd920641207a0f5473e1bf98d9ec399152a26135d77bb3a4890d773d270d3e43899327201b6d15e64075a34004bf00fbfa3f901eab877fe5286c23e096 SHA512 0b5c6642d6896025b6ecfbef4ab78c680391fd52b1b26a9cc3370403fefe0e83e5ce92c745e06b68a9ea96a72143c1827bb620fd9862a6819fb90d9b4ccfefcc
 EBUILD openjdk-bin-8.265_p01.ebuild 2062 BLAKE2B aa603f7bf1aa0dd9f1e236cc1ef1804c9aa860fae780a0a1d3c63ef07e2b369c0721fa36ee57259803579590ad421426ba117c4ce7bb2f849cfcac44558c9dc5 SHA512 17ee3f142dcfe56bd723654e701f28a74089d887f069f5eafe823c103542154d8c672636881b496b1d46b44bf766347cc93917677b48d027044800cdef690dc5
 MISC metadata.xml 940 BLAKE2B 0b643a9707b0f85db0717d766c1491a4a6110342024a3fcca4455852d96c73e62e44607fdbc7f7069514d796134f1b0b82a36d1c88e166a4d2506646f17dc9f0 SHA512 990f19188c833dbcc6a4dac9f63e8d20604bf4ba1c74f6d42227e1f41528447cf5ea040b55cd813d073dfcd80c12f5ad626f97014fca99365fadc8539d446b2c
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.8_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.8_p10.ebuild
index 6037f69440ec..94b04394047d 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.8_p10.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.8_p10.ebuild
@@ -25,7 +25,7 @@ DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
 HOMEPAGE="https://adoptopenjdk.net"
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-IUSE="alsa cups doc +gentoo-vm headless-awt selinux source"
+IUSE="alsa cups +gentoo-vm headless-awt selinux source"
 
 RDEPEND="
 	media-libs/fontconfig:1.0
@@ -35,7 +35,6 @@ RDEPEND="
 	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
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 6ab4509588ad..25a64a8e0a99 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -2,6 +2,14 @@ AUX openjdk-11.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603bee
 AUX openjdk-8.env.sh 746 BLAKE2B b8a18bb5e2dd3c4722b78531428d4291236a6295973fdcd65c64469b3a49a520686ff8d884c0b3d5dd9017ff4027d2fc1d78d57f062a4cf8910e0bab3ed444cc SHA512 2c65d1875406deabbfadb798501de15850775a4a049f073cdfda684ca1bff4b531b93596ee91a7caf77ff6c377457093f72c7bde4b995bce9ffbc4a8fcceb6dd
 DIST openjdk-11.0.8_p10.tar.bz2 91141175 BLAKE2B eeef0f6b6a8f804e043cde01de256c86ed35d5a391588100caea49c8c2b617c3f06aa37df894feaa89734e68c32fe28d8bc5337755050c457d657cf88fcff7f3 SHA512 f8fd26a11cb044197d3b04a1347e27e177e79cb58436e67116f63025a2a5c39c0083ac17362e7d2234caf89df530422ead088e3fc4546f8d9f68482fc75eb7a0
 DIST openjdk-8.265_p01.tar.bz2 456095 BLAKE2B 8de4d0293f3062583654da99a29d5be02197c323772f663d37ab21bdfdf32a723412d301094e6f70cbba99883241f52406a799a91c3d7c2a69ab7b35932c0a38 SHA512 686b869f9278462c6cb52036c4c9261e1689b917ce0afd4e6b47bb3d3207b2e79b2d03c2d3808a5853ab2fa070ac2206877849f5837282cb6deb80f610ba67f5
+DIST openjdk-aarch64-shenandoah-8.265_p01.tar.bz2 461443 BLAKE2B 169cc30062efd93e93a16c909494d5817e3f6108ed22d4cb09f618732b990091a47c1149fff0f3e5657c2e21443d357e5d11091ef1d4f8eb61a14bcc35d74951 SHA512 b85714731f9a102585308d2df5b271243b523daa7541635f5d4a22e7322890bc024f8abafbacbd1885c07cec479e00b5edb936936fcfefcfe0f6e2e6e2211689
+DIST openjdk-aarch64-shenandoah-corba-8.265_p01.tar.bz2 1050861 BLAKE2B 6803ee3ad1e3804cec3a1008f38538d793b2ae4f0a3c22d48d3c9885af37f4baf2ba94b91824e2e2bb170a5c9a59b28edc5d0c94646fd6265fe2b32fad759cb7 SHA512 859afe2ef587f7151a1fce4a43617a3afa0d8b9e04a07332c8a412b1b8deba4e00d7676cf1579cb2a8a18a307d094d22938ea9a3d70acb9094e268e701c35982
+DIST openjdk-aarch64-shenandoah-hotspot-8.265_p01.tar.bz2 8757379 BLAKE2B aefc9c9b9f5a369db14cc5a22ea54373518daf594b794f74533ea4365416b8adc91cdd6c79934d93f5e0f019d7b07723630f849ab93464d7416d15de54a5c65e SHA512 3f44dadc5a5d9a75d4b6b632991b9fbbcae499e19139e1d902f8f2df101141060bc063996e995b22c462c76962b1312e719495eae99b392da3080c7d875deae5
+DIST openjdk-aarch64-shenandoah-jaxp-8.265_p01.tar.bz2 2696501 BLAKE2B 1b1a459a4400d78c7921593a173059156b53a2cfc5fce695571e5c827bf609c08e02accdd56e1585723d50d93cae6ed0b5cef91f7597de21a16daa9b951046c5 SHA512 a377505e17299ba8fdd9e24fb9d3f786f1e6288e485319f2accf6abe9be957814ceb08c14867839bfd29690e91afb70f2aadfd9cc43db81e924960275792d61c
+DIST openjdk-aarch64-shenandoah-jaxws-8.265_p01.tar.bz2 2556505 BLAKE2B 70a963e625b04717a7dfd8f913d8dad20158abb1c7d5ea474c53692181d5ba099c9c6ebec0efa28d6732275d02380fda613ba446f854052476fdb2b8cd80fbaf SHA512 db06c192bc6b753209870dddf43d896444a1dddb0f04ddec6ec4317034cf8b33173ccfeb6e50f18f76d6f28eb93ca08d8fade299416d3ed2ccb9d65e03d867f4
+DIST openjdk-aarch64-shenandoah-jdk-8.265_p01.tar.bz2 48064316 BLAKE2B 9623b5ea954dfd4c732b35683f859bdfe823e8fe3697f859e73c220e2931e2047271a6382c096d29bd357c5b9f681ce85053cd349c44332db77a53232f56e748 SHA512 9b90dc0d1e7ba0215628687d0594f2e1316bd190b4ff20b22cf0d20269180a160e46810c7ad2bca43603283d3140567a1cd2a1c222a6ffc8c4bc413ae4da5347
+DIST openjdk-aarch64-shenandoah-langtools-8.265_p01.tar.bz2 2396374 BLAKE2B 0aeb7c979824773a7de1ff3ae5f0b47ee965011ff29144a1ff83b84f33bfbfe850bea32aaede1ac174ee9d6850a5bfb88c194db7e4a10b6c800716d854871fb8 SHA512 f97b21a5e369239b11ccb122b6256f1b71edec3cbc6d41c0bd90c43b67126846917c795ba2e954a62d72285b50d9bfa74748488a95c2d51aacebe78575ffd833
+DIST openjdk-aarch64-shenandoah-nashorn-jdk8.265_p01.tar.bz2 2831216 BLAKE2B 02eb3f916feacaf32feb75e4c3a6bb8915e4247dd07bfd3085feb6575c5152c41d0bef46bf51a8465a2555990a7f63315d61e1733d2f36a09293ec8bab30330d SHA512 610b99e04e0afe3fa78907af20d6d297896b9ab7cfbb5bddeefeb2301e733078b147c1d547cb5c3cb08b6f208acfdbf3559ba561b8a3907cf2c6506bb7daf08e
 DIST openjdk-corba-8.265_p01.tar.bz2 1034140 BLAKE2B 4b176bf2d9ff461b5682ad7f4b994091acf017df2caabf292dcda9baa34abd7d8016f56f2aff0866508eac565f4079e6f8ba8cbd8167abf1e38cd1fac727e141 SHA512 d92b69ab33176c29c5b7c0a5a21947d5d28dafa32a5933414bea5d16d4e68e1a381b2a73114952d507e7ee76c132e70dc8234175edfd3a086c4775417eaa7d9a
 DIST openjdk-hotspot-8.265_p01.tar.bz2 8204133 BLAKE2B 3c574da38c9c787e2b40dafa6d7885f9632804a158de26fb4e6f9b5266c955adad8adb1917043eecba97fbb1e53c063da08231e806f5ba8f6c0ef762e88c45b6 SHA512 a3fbc527456aeb8566db24f910e6a64f976e3434fe3717058ee91e66e88d03d77641d342801002f7fa35fb8bb94ce397c95ac2abb86c0616ff25f167878b478b
 DIST openjdk-jaxp-8.265_p01.tar.bz2 2735823 BLAKE2B 84a1248b4eb56f4afff62c5dc0f3517c98a6dc5c7e434012c667d59f05a1719372f68594d9d6b13c04e98887913a01b05eefcdadb3a028275555b2a9720502ba SHA512 d0f9da699d4141fa5535abbdf244b4da0fd466b8b5eca3fcaa7cc739326d79a5aa5ffac90988f8bedb39f80d7d4f1feaac3cf5fb1b019203cc96eae9746d9bbc
@@ -10,5 +18,5 @@ DIST openjdk-jdk-8.265_p01.tar.bz2 48017864 BLAKE2B b30a573a79a06abfe98e5963521f
 DIST openjdk-langtools-8.265_p01.tar.bz2 2399426 BLAKE2B 550a3dcee38b41feaf8c5b6b88f700c52f870ed0c3f25fa23f34bb3f40c333965e911ac126f4b038057472acea2b684917692a6881e46e4aa68b05cd7e4346da SHA512 24d0978a8e6254a96a5399420831d320ea2b2f5b7055ceba030802b85fcb9630031499504ca72305361fa3a386c2ca0a8c38082ee2b15b8569fdf7e815730be6
 DIST openjdk-nashorn-8.265_p01.tar.bz2 2852124 BLAKE2B 380202d487e62e08784b7fd5cb720c22a2b93d802898b90bf2686bac803fe2bc41d8d4b3d56b45bfb45686a2976d208359818b17b96ccce73fd55b389f4d04af SHA512 12522a06f16f1c63d6b6df525011d01ff91ba05f06ee7ade239faa31527ca9aaa9fa609c1ad261f0ae8d75cc195fe1af66e026815bdc0669fb6a286a49f86a5e
 EBUILD openjdk-11.0.8_p10.ebuild 7652 BLAKE2B 9ab04d8e05b7ab65029db969bcfb828db8cb09e93e7e11076cd24f5e4907cc576be0242e1278e801648f26b58d7eeb9d87adc830cf615a433eaa2a72d1388f0e SHA512 2a4b8bbfac4ef720b3a5b29d0a8d5cf8ec09987722df791fecb45b1ca96837ff225bd6605b47073f819a53bb8cec7e2c701e464bc3ffb5dfeec93ae3e3f454c0
-EBUILD openjdk-8.265_p01.ebuild 5979 BLAKE2B d20e84a3cc26ae804c999aec9a0880631b8454cb2443c7af394c9e846916db28774010650e78b6a01325d65733db445cb6b76ca242d598c26a76059b8d07a94a SHA512 7f559217a67e6e86bf404c34c55a5f579b48aea6110548bda5dde6344167a29da446ff9cf4ffe5c62ae56e0171f21617004dadc46dd51ac9cc942b9b12170507
-MISC metadata.xml 1313 BLAKE2B 5642f3fd86732997585e5215e2adf9b9e10af572d86ec1eab1db31667ec027a170825fad97fbf2c9e42c6266036dae8219ff689cd361e14d6e31c9640becd1f0 SHA512 ad6667c6fc65f81754455fed779dff5a13920abd85905c750d9c3ed2d2f2dde6a02616518024cbc1dcd5204cb66c00a0b165f03ff039a59f69948b5c1c178bf5
+EBUILD openjdk-8.265_p01.ebuild 7152 BLAKE2B 6f607268ae92dccc6fd174d120773548e3ba1299895ca037b27ff0940b190c21630b1c129a9a634d134c4e80fee81807e28b65135a5d6118e1147dc652217a9d SHA512 4fd5f162d7a7693eed69e3fb36d8f8c9be312f85f779f61ae2e80a97161c7166e90e070505605579c3d8d21e818f47eb4adeffe469914f4fa1ef105ae34ecb5f
+MISC metadata.xml 1432 BLAKE2B 36a11642c99127a5f97fc0b095a142705c6b4e077ed24604f1886e4d1beaa47b4fa30359600797d5e6a085befd11a2851196fe97a75a0f0907461679946b4cbf SHA512 ecc66015da3a0fc616b91dd5aaffb5b050c9f66e936cad02ec12fb56dd7c6b3b3c331d8856402c0deee16c415ea083e088cce7414703f9d659f551883b055ff0
diff --git a/dev-java/openjdk/metadata.xml b/dev-java/openjdk/metadata.xml
index ebcb18f58970..24efdf8c8119 100644
--- a/dev-java/openjdk/metadata.xml
+++ b/dev-java/openjdk/metadata.xml
@@ -20,6 +20,7 @@
 	<use>
 		<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs</flag>
 		<flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
+		<flag name="javafx" restrict="&lt;=dev-java/openjdk-9">Provide JavaFX support via <pkg>dev-java/openjfx</pkg></flag>
 		<flag name="javafx" restrict="&gt;=dev-java/openjdk-11">Import OpenJFX modules at build time, via <pkg>dev-java/openjfx</pkg></flag>
 		<flag name="jbootstrap">Build OpenJDK twice, the second time using the result of the first</flag>
 		<flag name="source">Install JVM sources</flag>
diff --git a/dev-java/openjdk/openjdk-8.265_p01.ebuild b/dev-java/openjdk/openjdk-8.265_p01.ebuild
index df934d0962ae..038f2db6b3c0 100644
--- a/dev-java/openjdk/openjdk-8.265_p01.ebuild
+++ b/dev-java/openjdk/openjdk-8.265_p01.ebuild
@@ -9,26 +9,42 @@ inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing p
 # as _p component of the gentoo version string.
 
 MY_PV=$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)
+MY_PN_AARCH64="${PN}-aarch64-shenandoah"
+MY_PV_AARCH64="$(ver_rs 1 'u' 2 '-' ${PV/_p/-b})"
+MY_P_AARCH64="${MY_PN_AARCH64/#${PN}-}-jdk${MY_PV_AARCH64}"
 
 BASE_URI="https://hg.${PN}.java.net/jdk8u/jdk8u"
+AARCH64_URI="https://hg.${PN}.java.net/aarch64-port/jdk8u-shenandoah"
 
 DESCRIPTION="Open source implementation of the Java programming language"
 HOMEPAGE="https://openjdk.java.net"
 SRC_URI="
-	${BASE_URI}/archive/jdk${MY_PV}.tar.bz2 -> ${P}.tar.bz2
-	${BASE_URI}/corba/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-corba-${PV}.tar.bz2
-	${BASE_URI}/hotspot/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-hotspot-${PV}.tar.bz2
-	${BASE_URI}/jaxp/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxp-${PV}.tar.bz2
-	${BASE_URI}/jaxws/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxws-${PV}.tar.bz2
-	${BASE_URI}/jdk/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jdk-${PV}.tar.bz2
-	${BASE_URI}/langtools/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-langtools-${PV}.tar.bz2
-	${BASE_URI}/nashorn/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-nashorn-${PV}.tar.bz2
+	!arm64? (
+		${BASE_URI}/archive/jdk${MY_PV}.tar.bz2 -> ${P}.tar.bz2
+		${BASE_URI}/corba/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-corba-${PV}.tar.bz2
+		${BASE_URI}/hotspot/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-hotspot-${PV}.tar.bz2
+		${BASE_URI}/jaxp/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxp-${PV}.tar.bz2
+		${BASE_URI}/jaxws/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxws-${PV}.tar.bz2
+		${BASE_URI}/jdk/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jdk-${PV}.tar.bz2
+		${BASE_URI}/langtools/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-langtools-${PV}.tar.bz2
+		${BASE_URI}/nashorn/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-nashorn-${PV}.tar.bz2
+	)
+	arm64? (
+		${AARCH64_URI}/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-${PV}.tar.bz2
+		${AARCH64_URI}/corba/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-corba-${PV}.tar.bz2
+		${AARCH64_URI}/hotspot/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-hotspot-${PV}.tar.bz2
+		${AARCH64_URI}/jaxp/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-jaxp-${PV}.tar.bz2
+		${AARCH64_URI}/jaxws/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-jaxws-${PV}.tar.bz2
+		${AARCH64_URI}/jdk/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-jdk-${PV}.tar.bz2
+		${AARCH64_URI}/langtools/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-langtools-${PV}.tar.bz2
+		${AARCH64_URI}/nashorn/archive/${MY_P_AARCH64}.tar.bz2 -> ${MY_PN_AARCH64}-nashorn-jdk${PV}.tar.bz2
+	)
 "
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="alsa debug cups doc examples headless-awt +jbootstrap +pch selinux source"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
+IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap +pch selinux source"
 
 COMMON_DEPEND="
 	media-libs/freetype:2=
@@ -73,7 +89,7 @@ DEPEND="
 	)
 "
 
-S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
+PDEPEND="javafx? ( dev-java/openjfx:${SLOT} )"
 
 # The space required to build varies wildly depending on USE flags,
 # ranging from 2GB to 16GB. This function is certainly not exact but
@@ -106,16 +122,24 @@ pkg_setup() {
 	java-pkg-2_pkg_setup
 }
 
-src_prepare() {
+src_unpack() {
 	default
-	chmod +x configure || die
+	mv -v "jdk${SLOT}u"* "${P}" || die
+
 	local repo
 	for repo in corba hotspot jdk jaxp jaxws langtools nashorn; do
-		ln -s ../"${repo}-jdk${MY_PV}" "${repo}" || die
+		mv -v "${repo}-"* "${P}/${repo}" || die
 	done
+}
+
+src_prepare() {
+	default
+
 	# new warnings in new gcc https://bugs.gentoo.org/685426
 	sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \
 		hotspot/make/linux/makefiles/gcc.make || die
+
+	chmod +x configure || die
 }
 
 src_configure() {
@@ -128,6 +152,8 @@ src_configure() {
 	# Work around -fno-common ( GCC10 default ), bug #706638
 	append-flags -fcommon
 
+	tc-export_build_env CC CXX PKG_CONFIG STRIP
+
 	local myconf=(
 			--disable-ccache
 			--enable-unlimited-crypto
@@ -162,6 +188,7 @@ src_configure() {
 		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
 		CFLAGS= CXXFLAGS= LDFLAGS= \
 		CONFIG_SITE=/dev/null \
+		CONFIG_SHELL="${EPREFIX}/bin/bash"
 		econf "${myconf[@]}"
 	)
 }
@@ -186,7 +213,7 @@ src_install() {
 		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
 	fi
 
-	# stupid build system does not remove that
+	# build system does not remove that
 	if use headless-awt ; then
 		rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
 		{,jre/}bin/policytool bin/appletviewer || die
diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest
index eaf662fea9fb..656c6cb39be9 100644
--- a/dev-java/openjfx/Manifest
+++ b/dev-java/openjfx/Manifest
@@ -1,12 +1,28 @@
 AUX 11/11.0.9_p0-version.patch 691 BLAKE2B 33cfcd3c615e9dec14e2df985b48dc85b895d12ff127ffc3df08b670ad1bcc3790efec63c68b639288c44f7cf5da8dcb2de72195df24c049692df109b20e42ac SHA512 472bb5debb929d4191b2dc2bd0b2e2370f3c93671e581fe42616e4ed6fc3e4a34638a90f04ed756acb5e10d404694267cd861ecf698c7c926cd4c6fe6d6fe8ba
+AUX 11/disable-architecture-verification.patch 1288 BLAKE2B 2c228eedfbc9b8642d26c7b92580172b83d492735bd59301fc2506f4a2ab77c002220d728fb2fa57e251c760e77cc224c54e831b15a594186750138336b78c3c SHA512 6d66b16833c61532521666d888cfb1a495c9f2b6bda87e0519ecb907b0c1bb99a267cb059a4ed8428edeb44a34ae6bcfac0c7ca6bd880ba6f08161e851e36252
 AUX 11/disable-buildSrc-tests.patch 534 BLAKE2B d1cb4da89602fa9a48e5509586d1909d10b9d62e167bdd4d57b9615f2896704dd0ee925d14a86753bf53182f85fc9c21f195c3f044a0c6d38c960ee4f5494332 SHA512 ffbc3d671cea448ffddd8d92e4a4031a941008c067d5a7acb358fb82ed217c9388ef1916aa04cf4693ff2a83e0bdcf3fc5bdc919196a6231d57c8341e44ddede
+AUX 11/don-t-force-msse.patch 4621 BLAKE2B e715f5e8a7aa9c7e6637baa4e90169e0cd63e2d42f1ad76305f4cb13c9cae43d1464fef9dabfc4d4f530261db40650a05347f55065af3e152255845c2168f64d SHA512 5d0c72493e9be638c1fbff26531b51a485f9eac1aeb286e2b6b9a8674d866dab7b736a9959c9ee231f96cbe1c11838a77f64a8db3a993e5c4a2059b4202cefc2
 AUX 11/glibc-compatibility.patch 547 BLAKE2B e63e83d708765dc7ad5013ff3a5bf0885fa426290e4fa164684739c15e7c15652c41256b98e9720c35682193086ec19c0225dd202fabc9bd9c9f99fb0fd6d5ff SHA512 abb08198b94e38fe8fb16229f506e2cad78869ed9c4fcabe22490a87884b1851373ee4a92ae4d7dbecaf3fc9a784911d932fad2457b0611a102e63a983113981
 AUX 11/respect-user-cflags.patch 8609 BLAKE2B 865e8c2b10cc24c7ce45a4d6b039a1e852902f702fee06102273565f22ed870391f5f072c59db51fa48077516a8072b41252fdce961cde20581d8f520eb67afe SHA512 ab77752add6fe7b708d7e7eb94cad722b6016d50bc3ba40505107db0e70e642dfd7d48550cba344ee2e88bf2ea7f55d58140f5eeb7b025c112b87be0ce71e74c
 AUX 11/use-system-swt-jar.patch 608 BLAKE2B b0083c54f5f42e6c0069812913c800c9366073e34a401187e90c498ee9cb67b619baa87b7d140cda5a1330076c3b04ff3114898cd264cd51ec4b99498acfd894 SHA512 a700c33639603a26d21b89a4f8a9299cdf42cf7f7a0dc082ec9cd4c9c2235184add1685b05d2a62f3a52bd2251b4c133476e5944471092a2c0c269c973d2604f
 AUX 11/wno-error.patch 1894 BLAKE2B 8b4380c97942cc542164ab1673eb4e5701ae17aab7b6673c3b01518fdce91d2daac1e52dd5d7dad09b619093d0b4a153f0aadf060c32ffab19428ab2f307661c SHA512 0d808836b0f52e911ea6172b3c573cfea84035611ce797da7cf58b5eaa51d8c4ef536eb21d3a0c2139311e3c7ba702f13dc96b9e1d3b6cefaaca88188e409f3b
+AUX 8/0000-Fix-wait-call-in-PosixPlatform.patch 461 BLAKE2B 10c76c946063e35f935348cd6374b08bb2e2d032ab616bffc09ada63e6795e1887033b13a13bd7d467624b112c0e8523d0eb3f83208f1613eefc7e376b3ee1a5 SHA512 7354f81ea1b8246a9a0ae43aa8ffda9e24ef2cd91ca4a5ac499e5f16fbda1248d3ea4ee41580b76f884b0b41233e31b577a1ba8031772c1bbf86a39345f436dd
+AUX 8/0001-Change-Lucene.patch 3008 BLAKE2B 9174e6ecd11b52b15281072195a32e798c833604e9d7ff5bfcf224710be0662a1b6d2d1040f29a053c157f470c4403737b6c05f0cc3debbc682b495b7ff96d27 SHA512 0b5371cfbdb5830649a060f1964830d774d267c38842f077e96e5fd841729f5802c1142874bdf255e9d0bd74c81f704374f9b6a27d883a0ef516f14e586971b6
+AUX 8/0003-fix-cast-between-incompatible-function-types.patch 3383 BLAKE2B 5a0f93db8a64d61874321908d50f7ed049df4f1000a710763384149614ffbb3c7012aecd3b53c89e9fae647746bff934560a91d7637ba3e3c8e95d50ccfd467e SHA512 cfaa6695ffaacc866016d2a78201490ba79ff8a00debf3ef9c793cc910e118f9720b29f54ac172c5f5c010f9a06f7a9cbe10817f3231ccad5435fe3bb5ef9341
+AUX 8/0004-Fix-Compilation-Flags.patch 1126 BLAKE2B 0f3d17a5ce7c501c55c7af0c39c48eda76812052ebdf0ec315663d71faf8d7435c8a88ca7b28900e512bbe6c6e4ebb7a580aa34ab6f0a1031cabd62180fa4701 SHA512 56a83b8aeae1f2767d1013e1ccab8acc0bbce172148b80c9c6121784f7ea35cc69f5d4a924f74720fe3d5b98bc6128a6db75c6f950a72b17202e5b9078e94d9e
+AUX 8/0005-don-t-include-xlocale.h.patch 886 BLAKE2B e55a1695618136442f50bb7c57e0928d8a70154d54cdffcb65a5bc8923a967eabcce74f00c7cbf75f1a583a685fac136b3c0433e096df4809c925f80c7d540fc SHA512 a7959a25c3102c022c16cd259152b64f3edbad9085d93d5146cdaa891db1a3e573afcbc47a1ecfc1b338876fd1cac25d22633001cd3357c254f4c6701e8aa531
+AUX 8/06-disable-architecture-verification.patch 950 BLAKE2B 7cb4a1bb01d347203c3640c541ceb9d1a88b4e1ce6ba4300153e6b66ee010f96c6c392c86e56049283d49a1a28d2a7818f038481143ef1f0afada7999bc46fb0 SHA512 ee8c18fb10eeabe75cfc1d4894fff21ae9d2b0d34e1ffc596a6e58a8fad6159df9ac2fe13d2bdcbd061295a804c56dd4f98f81696bbe6b3318ed427aaffd08d0
+AUX 8/07-disable-assembler-on-unsupported-archs.patch 664 BLAKE2B 516eff1fca4580ba9073603586d7262d7d7dd0f0f6cf0862d4ca0e967b321a8423be0b7c141c2577a61152132ed45a167bd77a70ee78b53b0d9b078d3863f543 SHA512 96405afc3cf4718b32042e2c373370af219d4d0c52f6d4c63d4f71c22ba962b48603799ea7e3a043ea08ccea0d7e48b85001cf6bd8fd72ba3ce314b59457b948
+AUX 8/10-javadoc-locale.patch 768 BLAKE2B e674c8c613eb518dd5de7b6cb253d7f0d6dafd0e8a5f3ae9b619c99b9a87ec0e565f4908aabba8f996d960c2c6fe7010457da5a5bd3c6a9313e9e83843e9df05 SHA512 b97de0f5bcd1a8dcfab8e39694d02c7cdc20619efd5bb1d5fc5928a47e1495e3682ba0474ae064a1db42b9f79d0caab5214747214bacb512ed657773ce510aef
+AUX 8/99-sysdeps.patch 1467 BLAKE2B afb49b067754e93ea3309b10217fd67589f3838a3772f425fac5f3c985cbca8f305bdedd7b9792059e62046d05687e9652047ff83eff01fe52dd3f5fe5ad86e3 SHA512 26d4ca4cc9c860c5d8d1ca9f2d6a13821498bb0f9a709b46b9e1d6fb04d90e74efb35093c1d084099d71343f158a122a2936297883294bc743a65ae81fff4b74
+AUX 8/Wno-error.patch 5055 BLAKE2B 07061a25ac190d3f0546eb7811b98a1b634d7e58686a48e5de5497fe244076e745250d860d577213a14bbf52e8db3b9e7cadfd78cf74b895d171ef5d9a1cc692 SHA512 cd61c99c275648399a0c779aa8efabd8b58320ac939fc305bbca75f4cb33b7a43246251ef9e3e3848d801a3c3588d4508796a2f97eea94a61d2b3f63906cf423
+AUX 8/disable-online-repos.patch 1886 BLAKE2B 2959fd2d324a66430ada639890de5563c987dfea4878d21666df54d0e107f021dfd47e6c29da44c23b934603f543f839f16af67c9e35526990cf11b6092c0455 SHA512 ce377c6fc25157e4e8b7ebc7a030411cef1c9fe0f8051ec4b02c8c6fa0505adc4ae3ed3a62a562019652b4d9d6279d168c0df1acc5a2a36272fea6fe114aea83
+AUX 8/don-t-force-msse.patch 2416 BLAKE2B 20380651c8c05b116aa936776a96b4fab390dce4e054fb75c902a51987a9c7ed9be09d8a419863c7d693e4363c274df65ea3d2fca459379ea3099613590e5e80 SHA512 5a94ed21a7d7ffc55c69f8d956351a0ba162d7ceb7ede5c85e53f39a4c48cd7fc4fea9665d2c60dfe2942250b2fd3be92b79bc47d8ee340a514bb35271ef295c
+AUX 8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch 842 BLAKE2B 7c7b5d5291f51dbedba6b836b3adf863533cc1cac53b17ae39e0c045a0d902a622f71339dd31614c6a0a9ca43528f973a037c0e645b9010c90b721c5d468e259 SHA512 ea2f6b9171ba8c19e92b0972e06ac7774bcce3dfd1e76ce845f387670da3894cbb4236fcef4587f1ed4889cf49c777a4e443eea7578fca06ab03a4387bb293f7
+AUX 8/respect_flags.patch 812 BLAKE2B 1f2ec35dbfdb3c8c2d606a095206d1da187691a7fe054f66504cbb070a3ec74e95e6977e9143c46e98b646d34f5f6dbd57d3d9d253efd888510ab2c6292ddf9a SHA512 9a0fbbc6c849347ad71d3571573e0cfeed9ca0c5ff58634987f0f1faeeb3f2801020f51c6d7bbd7719e3a4d65c9a4e465c50b546c53c79f89e28f757befd37b7
 DIST ST4-4.0.8.jar 239543 BLAKE2B 72d257c6d0f1b3bde0afce805128dd38d8520b2073377bbb995fed3b4e18a3ea69d508d6d7554755ec68bf50940082b896ed89998a5178272d24376404b389c5 SHA512 9877289297cd5b15ad464a19467699387f57c510fe8a476e07e9d2334bd11933f9bdb9c6caa4972d4d4c84b56740c6d885cd39300dd7ce35b7c5bde536238086
 DIST antlr4-4.7.2-complete.jar 2079769 BLAKE2B 9407e5096b5943702a1375f568957f35486a80f122bc59c5ec8e899f59214c43ee4ece551d9078de14b7707d85f9306ae99953981c755a1e1205d83412010738 SHA512 e788d28796c8925a158f0a09048590bdcf6730d46dcb8a12b362cbcc80a7ceb76374b2675987c953faecd3cf4a847b1571485a71081a84684170d25d05176a11
-DIST gradle-4.8-bin.zip 75885015 BLAKE2B eb6592afe122690f5e013abec2821beabac070563556ceec67ce02506582d4d9ac9c5d9f97ad2c464e442446f26ff90e9ead2c04e462a564411259564e3332c6 SHA512 4b351c9c5b0970bafb3b2b9b9e2ec9f37ff681cc3ac30004852d712cf8bb83061211a58e5b1f101813cde6a0aec914badf4ef0a806eec603418b851b64a06882
+DIST gradle-4.10.3-bin.zip 78422006 BLAKE2B f565e591751acb5b05c261b3d8dbc8e07f76b48c73516f6cb1b2846ebf0bbf38000b9a61790e9b3055bddd9f9846d61979d187f4a30c317a1de98546891d9d2d SHA512 fd3f4cfbd5262cc8514b7fb3e303ef46b9ca4b22901f1fe848ec4679f8d6bc283bde12ec584437624f0acf5486e5663966ad0736bf8ab341ac3e2667f514ceec
 DIST gunit-3.5.2.jar 287425 BLAKE2B 86e759c5bb164758b689d93bef4b6a0bcb39eb9fee28d2a8dc113a4c97e5e8516b55ada87c27738ffa0fc512805caa338d8649f6f5c9ba36490c4c3ebed86fdd SHA512 c9f14dacec2f22f62b7d3849d1c0e9d626b3dc20eb74a85b32f1901f6279b7b84af095107128bcbe80c49ac05448a713309b60d0c3d2f88e0bca8a14690292b2
 DIST lucene-core-7.1.0.jar 2779248 BLAKE2B 9edea1cfdeca2f2ec9e5c014e575774dc32fa5cf12ba02fd419fc252da10c03cd9f6cda989203211de4bc2ffcd2e79e8b97914e9792951bb0877a203760f07ad SHA512 0cd96016de2bc7ad94779e30348c443cf6028119fdae42c6f29e33d84495876a7519640f20680762324ea40c42e21b595f79cd606a6142b9875501f1e9179678
 DIST lucene-grouping-7.1.0.jar 87200 BLAKE2B 93f4ca6938b3fbc74752e22ee9d53022a60c57489017985448ddff46bc8c527b72e615e5f28d0301c28dc8119f0e6c75f4e8a711df3e6aaa418190b8ac8d1857 SHA512 41a85eafde03718efba7cf22598a430efbc6a6a68cf68058988f9eff648d19faa6cc4cf68293fe6e39783a7636eae571f27e04006f4607250dd9f6642184c61d
@@ -14,5 +30,8 @@ DIST lucene-queries-7.1.0.jar 243126 BLAKE2B 166c3efea04c19314be7fd8c1d6b1378b2b
 DIST lucene-queryparser-7.1.0.jar 384680 BLAKE2B adce2572de9f534323eead31dd30f97b853b2d5e4be6828c415f0c647460c361e00680d856ff9ffbba0fe45c3e4a425d68938a3d2dc01c76491bb65673e120fa SHA512 7151ef899e318679995138262c3450577ae33580708864581dc22a027f43ca4989825d434680925547e3c04ad4453a454e7045f605d7eee0da57d63db978ed68
 DIST lucene-sandbox-7.1.0.jar 182914 BLAKE2B 70c795f84d8f0908abe47db77f632eeb6571a77e1445b8ab04a75080cea40e3b8171071965ff7fd9f6d39a450dd33144e922d19c1f07c605de54b45e3e881323 SHA512 6faf9fd9c7c082bf062adb6a28d89447e6e27152eb3f0a325081e5f791196e5440334632ccbf9c458940220676f7e73390a174889d9b7a656d088b3dade5d500
 DIST openjfx-11.0.9_p0.tar.bz2 64148934 BLAKE2B 317fb1c9ea99816ecbd8ab64ed3a6ad0aaa319bedd17bf71ee192c5e610fea14611f3938302f1caf666980bcc7d4787f770e36aec1884a73dac3ddba8e1a878f SHA512 8b6d339131f096b4490d7a8c4a20c15362b4f6c6aa4ddd74f610f3b5a8b8c7aac3ab123dcdd5488cc37dc38f1536ce1db95286f4233ee4db1845d1bd560b2236
-EBUILD openjfx-11.0.9_p0.ebuild 6502 BLAKE2B a21489ee9fc2342d3c2cd5808cc2c3ba1567b96f8391b2356028a18ebf4e5c77e54d537dbaba74ebcdddc4a6d8ac6e4c6ace4f75749b7e6f8d0e5159afbc3835 SHA512 474743ff11d921b7654508e3ee9a2644cf7d1b1baeb5dc5b7348b6bd6bc84877354313bb62f64b84ccd27a68eb55690838170e1aadc510eeb6d0ebeb6d18bb0a
+DIST openjfx-8.999-backports.tar.xz 2794912 BLAKE2B cdcef2e443dce274b90ce5d0d148e7d10e73eebd9a62ec1514bc13017defa624ce6486f00de80f03d055d2294c9656de9bd3965bb07393d4397a201023a52a69 SHA512 eabbce2f230ef37d392d564d272a95d0f5225cfad0441268b020200e63fbb15b1883df3f21b5f75e34e8b2cf61bc3d843451315a51f1ec2cd487abaae3ee7893
+DIST openjfx-8.999.tar.bz2 62286455 BLAKE2B c9a714a618d9ae02768dae6128756d64b2b6299a36a6ad9828bf2213dc641cbbcaa2d3f3e0b4913bb60893419a2d5c730ca2db88f759bbd94b3e83112199278c SHA512 6049730b72e569939fed3d62b46a409e949b4c2309f4355253c8c891799c7fb5138e20aa217454fbbd78b1dd99c254b34b3fe6c9cbb35854bd8656993655bf32
+EBUILD openjfx-11.0.9_p0.ebuild 6529 BLAKE2B ff736eb45f3c448c54c918da73ca36b49b917a0e4e7181f79bd3d0665fed434295e43ec09c9054f07d546a28312ab7bb92d28e4d2714608b355080dd5471e476 SHA512 1e34a7876c9dadf87edc96ae2e3c3159069c9fb2d057f2a98546f231e67724c338fb06e1a9c7045e5da390c45d2c84232fb7241d6442d5fc48f14b0581c493aa
+EBUILD openjfx-8.999.ebuild 5613 BLAKE2B 3e173120520d2e0918a8d6532c8cf3a681bb8314b3898b55da3c9c8f7583177977b93a651936f099bf2b9b83dea70f074d1abe042fd12463d32fda7352bc8aae SHA512 1fcf6839af3edca556c40c6f75797b840ee08010e762b985c6864cdefedb44c4f1e9945c72237e39c33920481a26d1d2650fe18f4546ef945bbafcce0ed51f87
 MISC metadata.xml 678 BLAKE2B 2b7537a59f3d6cb5b465322c68d374e664291178dad94a527a625243c1abe5846b3d0e066e9a715ccf8d5b12a9a58c46c58d00b13881265973e20a29c4f5b720 SHA512 889ad3984e64acb24e01041d98c1f9273d02256bf89810c8e84607911ba35bcac239fdc8341e839b91d7af999e575d06249d87a64c78a3684f63ad5a3003bd8d
diff --git a/dev-java/openjfx/files/11/disable-architecture-verification.patch b/dev-java/openjfx/files/11/disable-architecture-verification.patch
new file mode 100644
index 000000000000..9e5a3fc3b750
--- /dev/null
+++ b/dev-java/openjfx/files/11/disable-architecture-verification.patch
@@ -0,0 +1,33 @@
+From 715ea681d14364be4fb2bdda120f6bf9ebaa9d5e Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Sat, 19 Sep 2020 18:38:05 -0700
+Subject: [PATCH] disable architecture verification
+
+---
+ build.gradle | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/build.gradle b/build.gradle
+index 66a4b3c..f66ee01 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -302,6 +302,7 @@ ext.MAVEN_GROUP_ID = "org.openjfx"
+ // at present building on PI is not supported, but we would only need to make
+ // some changes on assumptions on what should be built (like SWT / Swing) and
+ // such and we could probably make it work.
++/*
+ if (!IS_MAC && !IS_WINDOWS && !IS_LINUX) fail("Unsupported build OS ${OS_NAME}")
+ if (IS_WINDOWS && OS_ARCH != "x86" && OS_ARCH != "amd64") {
+     fail("Unknown and unsupported build architecture: $OS_ARCH")
+@@ -310,7 +311,7 @@ if (IS_WINDOWS && OS_ARCH != "x86" && OS_ARCH != "amd64") {
+ } else if (IS_LINUX && OS_ARCH != "i386" && OS_ARCH != "amd64") {
+     fail("Unknown and unsupported build architecture: $OS_ARCH")
+ }
+-
++*/
+ 
+ // Get the JDK_HOME automatically based on the version of Java used to execute gradle. Or, if specified,
+ // use a user supplied JDK_HOME, STUB_RUNTIME, JAVAC, all of which may be specified
+-- 
+2.28.0
+
diff --git a/dev-java/openjfx/files/11/don-t-force-msse.patch b/dev-java/openjfx/files/11/don-t-force-msse.patch
new file mode 100644
index 000000000000..f3d62c8e26f2
--- /dev/null
+++ b/dev-java/openjfx/files/11/don-t-force-msse.patch
@@ -0,0 +1,95 @@
+From cf60da4cb9429f01b5793b0116651e6766068e7b Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Sat, 19 Sep 2020 18:30:58 -0700
+Subject: [PATCH] don't force -msse
+
+---
+ .../src/main/native/gstreamer/projects/linux/avplugin/Makefile | 1 -
+ .../main/native/gstreamer/projects/linux/fxplugins/Makefile    | 1 -
+ .../src/main/native/gstreamer/projects/mac/fxplugins/Makefile  | 3 +--
+ .../main/native/gstreamer/projects/mac/gstreamer-lite/Makefile | 3 +--
+ .../src/main/native/jfxmedia/projects/linux/Makefile           | 1 -
+ .../src/main/native/jfxmedia/projects/mac/Makefile             | 3 +--
+ 6 files changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
+index f27b9479..4e229f20 100644
+--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
++++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
+@@ -23,7 +23,6 @@ CFLAGS := -fPIC                   \
+          -Wformat-security       \
+          -fstack-protector       \
+          -Werror=implicit-function-declaration \
+-         -msse2                  \
+          -fbuiltin               \
+          -DHAVE_STDINT_H         \
+          -DLINUX                 \
+diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
+index 627865f9..a4d99299 100644
+--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
++++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
+@@ -20,7 +20,6 @@ CFLAGS := -fPIC                   \
+          -Wformat-security       \
+          -fstack-protector       \
+          -Werror=implicit-function-declaration \
+-         -msse2                  \
+          -fbuiltin               \
+          -DHAVE_STDINT_H         \
+          -DLINUX                 \
+diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile
+index 9f80434d..659ab1c1 100644
+--- a/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile
++++ b/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile
+@@ -30,8 +30,7 @@ CFLAGS += -fPIC                     \
+          -DHAVE_STDINT_H           \
+          -DGSTREAMER_LITE          \
+          -DG_DISABLE_DEPRECATED    \
+-         -DOSX                     \
+-         -msse2
++         -DOSX
+ 
+ ifeq ($(BUILD_TYPE), Release)
+     CFLAGS += -Os
+diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile
+index 2020404c..34bdf42c 100644
+--- a/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile
++++ b/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile
+@@ -51,8 +51,7 @@ CFLAGS += -fPIC \
+          -DHAVE_CONFIG_H \
+          -DGSTREAMER_LITE \
+          -DGST_REMOVE_DISABLED \
+-         -DOSX \
+-         -msse2
++         -DOSX
+ 
+ ifeq ($(BUILD_TYPE), Release)
+     CFLAGS += -Os
+diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
+index c9500236..175be13e 100644
+--- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
++++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
+@@ -43,7 +43,6 @@ ifdef HOST_COMPILE
+                   -Wformat-security \
+                   -fstack-protector \
+                   -Werror=implicit-function-declaration \
+-		  -msse2 \
+ 	          -DGSTREAMER_LITE
+ 
+ 	PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
+diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile
+index 5ffd9eac..a7b3ddbb 100644
+--- a/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile
++++ b/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile
+@@ -30,8 +30,7 @@ CFLAGS += -pipe \
+          -fPIC                     \
+          -Werror=implicit-function-declaration \
+          -DTARGET_OS_MAC=1         \
+-         -D_GNU_SOURCE             \
+-         -msse2
++         -D_GNU_SOURCE
+ 
+ ifeq ($(BUILD_TYPE), Release)
+     CFLAGS += -Os
+-- 
+2.28.0
+
diff --git a/dev-java/openjfx/files/8/0000-Fix-wait-call-in-PosixPlatform.patch b/dev-java/openjfx/files/8/0000-Fix-wait-call-in-PosixPlatform.patch
new file mode 100644
index 000000000000..fee211fd8770
--- /dev/null
+++ b/dev-java/openjfx/files/8/0000-Fix-wait-call-in-PosixPlatform.patch
@@ -0,0 +1,14 @@
+--- rt-8u202-b02/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp	2018-10-29 16:26:04.000000000 +0100
++++ rt-8u202-b02-patched/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp	2018-11-27 15:34:52.170181958 +0100
+@@ -232,10 +232,7 @@
+     pid_t wpid = 0;
+ 
+     //TODO Use waitpid instead of wait
+-#ifdef LINUX
+-    wait(&status);
+-#endif
+-#ifdef MAC
++#if defined(LINUX) || defined(MAC)
+     wpid = wait(&status);
+ #endif
+ 
diff --git a/dev-java/openjfx/files/8/0001-Change-Lucene.patch b/dev-java/openjfx/files/8/0001-Change-Lucene.patch
new file mode 100644
index 000000000000..58d0c805ccb5
--- /dev/null
+++ b/dev-java/openjfx/files/8/0001-Change-Lucene.patch
@@ -0,0 +1,79 @@
+--- rt-8u202-b02/build.gradle
++++ rt-8u202-b02-patched/build.gradle
+@@ -3268,38 +3268,38 @@
+     // The apps build is Ant based, and gradle lets us "import" ant build.xml
+     // into our configuration.
+ 
+-    ant.importBuild 'build.xml'
++    //ant.importBuild 'build.xml'
+ 
+     // Download the Lucene libraries needed for the Ensemble8 app
+-    def luceneVersion = "7.4.0"
+-    getConfigurations().create("lucene");
+-    dependencies {
+-        lucene group: "org.apache.lucene", name: "lucene-core", version: luceneVersion
+-        lucene group: "org.apache.lucene", name: "lucene-grouping", version: luceneVersion
+-        lucene group: "org.apache.lucene", name: "lucene-queryparser", version: luceneVersion
+-    }
++    //def luceneVersion = "7.4.0"
++    //getConfigurations().create("lucene");
++    //dependencies {
++    //    lucene group: "org.apache.lucene", name: "lucene-core", version: luceneVersion
++    //    lucene group: "org.apache.lucene", name: "lucene-grouping", version: luceneVersion
++    //    lucene group: "org.apache.lucene", name: "lucene-queryparser", version: luceneVersion
++    //}
+ 
+     // Copy Lucene libraries into the Ensemble8/lib directory
+-    File ensembleLibDir = rootProject.file("apps/samples/Ensemble8/lib");
+-    def libNames = [ "lucene-core-${luceneVersion}.jar",
+-                     "lucene-grouping-${luceneVersion}.jar",
+-                     "lucene-queryparser-${luceneVersion}.jar" ]
+-
+-
+-    task getLucene(type: Copy) {
+-        doFirst {
+-            ensembleLibDir.mkdirs();
+-        }
+-        into ensembleLibDir
+-        includeEmptyDirs = false
+-        configurations.lucene.files.each { f ->
+-            libNames.each { name ->
+-                if (name == f.getName()) {
+-                    from f.getPath()
+-                }
+-            }
+-        }
+-    }
++    //File ensembleLibDir = rootProject.file("apps/samples/Ensemble8/lib");
++    //def libNames = [ "lucene-core-${luceneVersion}.jar",
++    //                 "lucene-grouping-${luceneVersion}.jar",
++    //                 "lucene-queryparser-${luceneVersion}.jar" ]
++
++
++    //task getLucene(type: Copy) {
++    //    doFirst {
++    //        ensembleLibDir.mkdirs();
++    //    }
++    //    into ensembleLibDir
++    //    includeEmptyDirs = false
++    //    configurations.lucene.files.each { f ->
++    //        libNames.each { name ->
++    //            if (name == f.getName()) {
++    //                from f.getPath()
++    //            }
++    //        }
++    //    }
++    //}
+ 
+     compileTargets { t ->
+         // The apps build is Ant based, and gradle lets us "import" ant apps/build.xml
+@@ -3310,7 +3310,7 @@
+         def jfxrtJar = "${rootProject.buildDir}/${sdkDirName}/rt/lib/ext/jfxrt.jar"
+ 
+         def appsJar = project.task("appsJar${t.capital}") {
+-            dependsOn(sdk, getLucene)
++            dependsOn(sdk)
+             doLast() {
+               ant.properties['targetBld'] = "$t.name"
+               if (!rootProject.ext[t.upper].compileSwing) {
+
diff --git a/dev-java/openjfx/files/8/0003-fix-cast-between-incompatible-function-types.patch b/dev-java/openjfx/files/8/0003-fix-cast-between-incompatible-function-types.patch
new file mode 100644
index 000000000000..011e952b9440
--- /dev/null
+++ b/dev-java/openjfx/files/8/0003-fix-cast-between-incompatible-function-types.patch
@@ -0,0 +1,77 @@
+From 36b952bdcdc301a600009308bff90440b6ceab5b Mon Sep 17 00:00:00 2001
+From: Mat Booth <mat.booth@redhat.com>
+Date: Thu, 21 Jun 2018 15:57:01 +0100
+Subject: [PATCH 4/4] fix cast between incompatible function types
+
+---
+ modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp | 8 ++++++--
+ .../src/main/native-glass/gtk/glass_window_ime.cpp       | 9 +++------
+ 2 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp b/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp
+index f85b1dae..3b9225f7 100644
+--- a/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp
++++ b/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp
+@@ -556,7 +556,7 @@ static GdkDragContext *get_drag_context() {
+     return ctx;
+ }
+ 
+-static gboolean dnd_finish_callback() {
++static gboolean dnd_finish_callback(gpointer data) {
+     if (dnd_window) {
+         dnd_set_performed_action(
+                 translate_gdk_action_to_glass(
+@@ -1079,6 +1079,10 @@ gboolean DragView::get_drag_image_offset(int* x, int* y) {
+     return offset_set;
+ }
+ 
++static void on_pixbuf_destroy_notify(guchar *pixels, gpointer data) {
++	g_free(pixels);
++}
++
+ GdkPixbuf* DragView::get_drag_image(gboolean* is_raw_image, gint* width, gint* height) {
+     GdkPixbuf *pixbuf = NULL;
+     gboolean is_raw = FALSE;
+@@ -1106,7 +1110,7 @@ GdkPixbuf* DragView::get_drag_image(gboolean* is_raw_image, gint* width, gint* h
+                     if (data) {
+                         memcpy(data, (raw + whsz), nraw - whsz);
+                         pixbuf = gdk_pixbuf_new_from_data(data, GDK_COLORSPACE_RGB, TRUE, 8,
+-                                w, h, w * 4, (GdkPixbufDestroyNotify) g_free, NULL);
++                                w, h, w * 4, (GdkPixbufDestroyNotify) on_pixbuf_destroy_notify, NULL);
+                     }
+                 }
+             }
+diff --git a/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp b/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp
+index 82e54d11..51af2a6a 100644
+--- a/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp
++++ b/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp
+@@ -122,15 +122,12 @@ bool WindowContextBase::filterIME(GdkEvent * event) {
+     }
+ }
+ 
+-//Note: this function must return int, despite the fact it doesn't conform to XIMProc type.
+-// This is required in documentation of XIM
+-static int im_preedit_start(XIM im_xim, XPointer client, XPointer call) {
++static void im_preedit_start(XIM im_xim, XPointer client, XPointer call) {
+     (void)im_xim;
+     (void)call;
+ 
+     mainEnv->CallVoidMethod((jobject) client, jViewNotifyPreeditMode, JNI_TRUE);
+-    CHECK_JNI_EXCEPTION_RET(mainEnv, -1);
+-    return -1; // No restrictions
++    CHECK_JNI_EXCEPTION(mainEnv);
+ }
+ 
+ static void im_preedit_done(XIM im_xim, XPointer client, XPointer call) {
+@@ -234,7 +231,7 @@ void WindowContextBase::enableOrResetIME() {
+             return;
+         }
+ 
+-        XIMCallback startCallback = {(XPointer) jview, (XIMProc) im_preedit_start};
++        XIMCallback startCallback = {(XPointer) jview, im_preedit_start};
+         XIMCallback doneCallback = {(XPointer) jview, im_preedit_done};
+         XIMCallback drawCallback = {(XPointer) jview, im_preedit_draw};
+         XIMCallback caretCallback = {(XPointer) jview, im_preedit_caret};
+-- 
+2.17.1
+
diff --git a/dev-java/openjfx/files/8/0004-Fix-Compilation-Flags.patch b/dev-java/openjfx/files/8/0004-Fix-Compilation-Flags.patch
new file mode 100644
index 000000000000..17c91ab9ab88
--- /dev/null
+++ b/dev-java/openjfx/files/8/0004-Fix-Compilation-Flags.patch
@@ -0,0 +1,23 @@
+--- rt-8u202-b07/buildSrc/linux.gradle
++++ rt-8u202-b07-patched/buildSrc/linux.gradle
+@@ -54,7 +54,7 @@
+ def ccFlags = [
+         commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c",
+         "-ffunction-sections", "-fdata-sections",
+-        IS_DEBUG_NATIVE ? ["-ggdb", "-DVERBOSE"] : ["-O2", "-DNDEBUG"]].flatten()
++        IS_DEBUG_NATIVE ? ["-ggdb", "-DNDEBUG"] : ["-O2", "-DNDEBUG"]].flatten()
+ def ccFlagsGTK3 = ccFlags
+ //ccFlags.addAll(["-Wnon-virtual-dtor", "-Woverloaded-virtual", "-std=c++0x"])
+ def linkFlags = ["-static-libgcc", "-static-libstdc++", "-shared", commonFlags,
+
+--- rt-8u202-b07/buildSrc/x86egl.gradle
++++ rt-8u202-b07-patched/buildSrc/x86egl.gradle
+@@ -99,7 +99,7 @@
+ def ccFlags = [
+         commonFlags,
+         "-I$JDK_HOME/include", "-I$JDK_HOME/include/${jniPlatform}", "-c",
+-        IS_DEBUG_NATIVE ? ["-ggdb", "-DVERBOSE"] : ["-O2", "-DNDEBUG"]].flatten()
++        IS_DEBUG_NATIVE ? ["-ggdb", "-DNDEBUG"] : ["-O2", "-DNDEBUG"]].flatten()
+ //ccFlags.addAll(["-Wnon-virtual-dtor", "-Woverloaded-virtual", "-std=c++0x"])
+ def linkFlags = ["-shared", commonFlags].flatten()
+ 
diff --git a/dev-java/openjfx/files/8/0005-don-t-include-xlocale.h.patch b/dev-java/openjfx/files/8/0005-don-t-include-xlocale.h.patch
new file mode 100644
index 000000000000..883c3da57e72
--- /dev/null
+++ b/dev-java/openjfx/files/8/0005-don-t-include-xlocale.h.patch
@@ -0,0 +1,25 @@
+From 597f200762be416d5a62f1efd351cba6e47c1c4c Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Thu, 30 May 2019 12:07:30 -0700
+Subject: [PATCH] don't include xlocale.h
+
+---
+ .../gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c       | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c
+index 72dc1301..32669789 100644
+--- a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c
++++ b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c
+@@ -39,7 +39,7 @@
+ 
+ #ifdef HAVE_XLOCALE_H
+ /* Needed on BSD/OS X for e.g. strtod_l */
+-#include <xlocale.h>
++#include <locale.h>
+ #endif
+ 
+ #ifdef G_OS_WIN32
+-- 
+2.21.0
+
diff --git a/dev-java/openjfx/files/8/06-disable-architecture-verification.patch b/dev-java/openjfx/files/8/06-disable-architecture-verification.patch
new file mode 100644
index 000000000000..d10e62850c31
--- /dev/null
+++ b/dev-java/openjfx/files/8/06-disable-architecture-verification.patch
@@ -0,0 +1,21 @@
+Description: Disable the architecture verification which is limited to i386 and amd64
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/build.gradle
++++ b/build.gradle
+@@ -699,6 +699,7 @@
+ // at present building on PI is not supported, but we would only need to make
+ // some changes on assumptions on what should be built (like SWT / Swing) and
+ // such and we could probably make it work.
++/*
+ if (!IS_MAC && !IS_WINDOWS && !IS_LINUX) logger.error("Unsupported build OS ${OS_NAME}")
+ if (IS_WINDOWS && OS_ARCH != "x86" && OS_ARCH != "amd64") {
+     throw new Exception("Unknown and unsupported build architecture: $OS_ARCH")
+@@ -707,6 +708,7 @@
+ } else if (IS_LINUX && OS_ARCH != "i386" && OS_ARCH != "amd64") {
+     throw new Exception("Unknown and unsupported build architecture: $OS_ARCH")
+ }
++*/
+ 
+ // Sanity check that we actually have a list of compile targets to execute
+ if (COMPILE_TARGETS == null || COMPILE_TARGETS == "") {
diff --git a/dev-java/openjfx/files/8/07-disable-assembler-on-unsupported-archs.patch b/dev-java/openjfx/files/8/07-disable-assembler-on-unsupported-archs.patch
new file mode 100644
index 000000000000..551a1e82ba50
--- /dev/null
+++ b/dev-java/openjfx/files/8/07-disable-assembler-on-unsupported-archs.patch
@@ -0,0 +1,18 @@
+Description: Disable assembler in WebKit on unsupported architectures
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/modules/web/src/main/native/Source/WTF/wtf/Platform.h
++++ b/modules/web/src/main/native/Source/WTF/wtf/Platform.h
+@@ -325,6 +325,12 @@
+ #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
+ #endif
+ 
++#if !CPU(ARM_THUMB2) && !CPU(ARM_TRADITIONAL) && !CPU(MIPS) && !CPU(X86) && !CPU(X86_64) && !CPU(SH4)
++#define ENABLE_ASSEMBLER 0
++#define ENABLE_JIT 0
++#define ENABLE_YARR_JIT 0
++#endif
++
+ /* ==== OS() - underlying operating system; only to be used for mandated low-level services like
+    virtual memory, not to choose a GUI toolkit ==== */
+ 
diff --git a/dev-java/openjfx/files/8/10-javadoc-locale.patch b/dev-java/openjfx/files/8/10-javadoc-locale.patch
new file mode 100644
index 000000000000..39d346a4fb73
--- /dev/null
+++ b/dev-java/openjfx/files/8/10-javadoc-locale.patch
@@ -0,0 +1,21 @@
+Description: Set the locale of the javadoc to make the build reproducible
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/build.gradle
++++ b/build.gradle
+@@ -1218,6 +1218,7 @@
+         } else {
+             options.links(JDK_DOCS);
+         }
++        options.locale("en");
+         options.addBooleanOption("XDignore.symbol.file").setValue(true);
+         options.addBooleanOption("Xdoclint:none").setValue(!IS_DOC_LINT);
+         options.addBooleanOption("javafx").setValue(true);
+@@ -2769,6 +2770,7 @@
+     options.windowTitle("${javadocTitle}")
+     options.header("${javadocHeader}")
+     options.bottom("${javadocBottom}")
++    options.locale("en");
+     if (BUILD_CLOSED) {
+         options.linksOffline(JDK_DOCS, JDK_DOCS_CLOSED);
+     } else {
diff --git a/dev-java/openjfx/files/8/99-sysdeps.patch b/dev-java/openjfx/files/8/99-sysdeps.patch
new file mode 100644
index 000000000000..367d9392d95e
--- /dev/null
+++ b/dev-java/openjfx/files/8/99-sysdeps.patch
@@ -0,0 +1,30 @@
+diff --git a/build.gradle b/build.gradle
+index 0914d7d..6bd9e78 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -1309,6 +1309,7 @@ project(":graphics") {
+         antlr3 group: "org.antlr", name: "antlr", version: "3.1.3"
+         antlr3 group: "org.antlr", name: "antlr-runtime",  version: "3.1.3"
+         antlr3 group: "org.antlr", name: "stringtemplate", version: "3.2"
++        antlr3 group: "antlr", name: "antlr", version: "2.7.7"
+     }
+ 
+     // Create a single "native" task which will depend on all the individual native tasks for graphics
+diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
+index 25f88d1..642450d 100644
+--- a/buildSrc/build.gradle
++++ b/buildSrc/build.gradle
+@@ -82,10 +82,13 @@ getConfigurations().create("antlr3");
+ 
+ dependencies {
+     compile     group: "org.antlr", name: "antlr",          version: "3.1.3"
++    compile     group: "org.antlr", name: "antlr-runtime",  version: "3.1.3"
++    compile     group: "org.antlr", name: "stringtemplate", version: "3.2"
+     testCompile group: "junit",     name: "junit",          version: "4.8.2"
+     antlr3      group: "org.antlr", name: "antlr-runtime",  version: "3.1.3"
+     antlr3      group: "org.antlr", name: "stringtemplate", version: "3.2"
+     antlr3      group: "org.antlr", name: "antlr",          version: "3.1.3"
++    antlr3      group: "antlr",     name: "antlr",          version: "2.7.7"
+ }
+ 
+ // At the moment the ASM library shipped with Gradle that is used to
diff --git a/dev-java/openjfx/files/8/Wno-error.patch b/dev-java/openjfx/files/8/Wno-error.patch
new file mode 100644
index 000000000000..208411508d87
--- /dev/null
+++ b/dev-java/openjfx/files/8/Wno-error.patch
@@ -0,0 +1,121 @@
+From 822bf818933311327c5b73cb1b185484f22f55fb Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Sun, 26 Apr 2020 21:15:36 -0700
+Subject: [PATCH] Wno-error
+
+---
+ buildSrc/armv5sf.gradle | 1 -
+ buildSrc/armv6hf.gradle | 1 -
+ buildSrc/armv6sf.gradle | 1 -
+ buildSrc/armv7hf.gradle | 1 -
+ buildSrc/armv7sf.gradle | 1 -
+ buildSrc/linux.gradle   | 6 +++---
+ buildSrc/x86egl.gradle  | 1 -
+ 7 files changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/buildSrc/armv5sf.gradle b/buildSrc/armv5sf.gradle
+index ee154182..bee6003e 100644
+--- a/buildSrc/armv5sf.gradle
++++ b/buildSrc/armv5sf.gradle
+@@ -135,7 +135,6 @@ def dfbLFlags = ["-ldl"]
+ def lensLFlags = [extraLFlags, "-lpthread", "-ludev", "-ldl", "-lm"].flatten()
+ def monocleCFlags = [
+         extraCFlags,
+-        "-Werror",
+         "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten();
+ def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten()
+ def glassCFlags = ["-ffast-math"]
+diff --git a/buildSrc/armv6hf.gradle b/buildSrc/armv6hf.gradle
+index dfdff237..0f090f23 100644
+--- a/buildSrc/armv6hf.gradle
++++ b/buildSrc/armv6hf.gradle
+@@ -131,7 +131,6 @@ def extraLFlags = [
+ def lensLFlags = [extraLFlags, "-lpthread", "-ludev", "-ldl", "-lm"].flatten()
+ def monocleCFlags = [
+         extraCFlags,
+-        "-Werror",
+         "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten();
+ def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten()
+ 
+diff --git a/buildSrc/armv6sf.gradle b/buildSrc/armv6sf.gradle
+index ee6615f0..6ebbdd90 100644
+--- a/buildSrc/armv6sf.gradle
++++ b/buildSrc/armv6sf.gradle
+@@ -135,7 +135,6 @@ def dfbLFlags = ["-ldl"]
+ def lensLFlags = [extraLFlags, "-lpthread", "-ludev", "-ldl", "-lm"].flatten()
+ def monocleCFlags = [
+         extraCFlags,
+-        "-Werror",
+         "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten();
+ def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten()
+ def glassCFlags = ["-ffast-math"]
+diff --git a/buildSrc/armv7hf.gradle b/buildSrc/armv7hf.gradle
+index e75bf8a9..092be817 100644
+--- a/buildSrc/armv7hf.gradle
++++ b/buildSrc/armv7hf.gradle
+@@ -131,7 +131,6 @@ def extraLFlags = [
+ def lensLFlags = [extraLFlags, "-lpthread", "-ludev", "-ldl", "-lm"].flatten()
+ def monocleCFlags = [
+         extraCFlags,
+-        "-Werror",
+         "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten();
+ def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten()
+ 
+diff --git a/buildSrc/armv7sf.gradle b/buildSrc/armv7sf.gradle
+index 0bb8a530..38e98303 100644
+--- a/buildSrc/armv7sf.gradle
++++ b/buildSrc/armv7sf.gradle
+@@ -135,7 +135,6 @@ def dfbLFlags = ["-ldl"]
+ def lensLFlags = [extraLFlags, "-lpthread", "-ludev", "-ldl", "-lm"].flatten()
+ def monocleCFlags = [
+         extraCFlags,
+-        "-Werror",
+         "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten();
+ def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten()
+ def glassCFlags = ["-ffast-math"]
+diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle
+index f233b817..0f9d5252 100644
+--- a/buildSrc/linux.gradle
++++ b/buildSrc/linux.gradle
+@@ -203,7 +203,7 @@ LINUX.glass.javahInclude = [
+     "com/sun/glass/ui/gtk/*"]
+ LINUX.glass.glass.nativeSource = ft_gtk_launcher.getFiles()
+ LINUX.glass.glass.compiler = compiler
+-LINUX.glass.glass.ccFlags = [ccFlags, gtk2CCFlags,  "-Werror"].flatten()
++LINUX.glass.glass.ccFlags = [ccFlags, gtk2CCFlags].flatten()
+ LINUX.glass.glass.linker = linker
+ LINUX.glass.glass.linkFlags = [linkFlags, "-lX11", "-ldl" ].flatten()
+ LINUX.glass.glass.lib = "glass"
+@@ -211,7 +211,7 @@ LINUX.glass.glass.lib = "glass"
+ LINUX.glass.glassgtk2 = [:]
+ LINUX.glass.glassgtk2.nativeSource =  ft_gtk.getFiles()
+ LINUX.glass.glassgtk2.compiler = compiler
+-LINUX.glass.glassgtk2.ccFlags = [ccFlags, gtk2CCFlags, "-Werror"].flatten()
++LINUX.glass.glassgtk2.ccFlags = [ccFlags, gtk2CCFlags].flatten()
+ LINUX.glass.glassgtk2.linker = linker
+ LINUX.glass.glassgtk2.linkFlags = [linkFlags, gtk2LinkFlags ].flatten()
+ LINUX.glass.glassgtk2.lib = "glassgtk2"
+@@ -219,7 +219,7 @@ LINUX.glass.glassgtk2.lib = "glassgtk2"
+ LINUX.glass.glassgtk3 = [:]
+ LINUX.glass.glassgtk3.nativeSource =  ft_gtk.getFiles()
+ LINUX.glass.glassgtk3.compiler = compiler
+-LINUX.glass.glassgtk3.ccFlags = [ccFlags, gtk3CCFlags, "-Werror"].flatten()
++LINUX.glass.glassgtk3.ccFlags = [ccFlags, gtk3CCFlags].flatten()
+ LINUX.glass.glassgtk3.linker = linker
+ LINUX.glass.glassgtk3.linkFlags = [linkFlags, gtk3LinkFlags ].flatten()
+ LINUX.glass.glassgtk3.lib = "glassgtk3"
+diff --git a/buildSrc/x86egl.gradle b/buildSrc/x86egl.gradle
+index 6bf6196b..ff24207d 100644
+--- a/buildSrc/x86egl.gradle
++++ b/buildSrc/x86egl.gradle
+@@ -118,7 +118,6 @@ def extraLFlags = [
+ def lensLFlags = [extraLFlags, "-lpthread", "-ludev", "-ldl", "-lm"].flatten()
+ def monocleCFlags = [
+         extraCFlags,
+-        "-Werror",
+         "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten();
+ def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten()
+ 
+-- 
+2.26.2
+
diff --git a/dev-java/openjfx/files/8/disable-online-repos.patch b/dev-java/openjfx/files/8/disable-online-repos.patch
new file mode 100644
index 000000000000..6b0afe4bf070
--- /dev/null
+++ b/dev-java/openjfx/files/8/disable-online-repos.patch
@@ -0,0 +1,54 @@
+diff --git a/build.gradle b/build.gradle
+index df82f63..3f920b6 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -1135,17 +1135,17 @@ allprojects {
+     // "artifact" in the pattern below. Note that the closed builds use different repositories
+     // so if you are debugging a closed-build artifact related build issue, check out the
+     // closed gradle file instead.
+-    if (!BUILD_CLOSED) {
+-        repositories {
+-            mavenCentral()
+-            ivy {
+-                url "http://download.eclipse.org/eclipse/updates/4.6/R-4.6.3-201703010400/plugins/"
+-                layout "pattern", {
+-                    artifact "[artifact].[ext]"
+-                }
+-            }
+-        }
+-    }
++    // if (!BUILD_CLOSED) {
++    //     repositories {
++    //         mavenCentral()
++    //         ivy {
++    //             url "http://download.eclipse.org/eclipse/updates/4.6/R-4.6.3-201703010400/plugins/"
++    //             layout "pattern", {
++    //                 artifact "[artifact].[ext]"
++    //             }
++    //         }
++    //     }
++    // }
+ 
+     // We want to configure all projects as java projects and use the same compile settings
+     // etc, except for the root project which we just want to ignore (and for now media)
+@@ -1785,13 +1785,13 @@ project(":fxpackager") {
+     }
+     // fxpackager has a dependency on ant in order to build the ant jar,
+     // and as such needs to point to the apache binary repository
+-    if (!BUILD_CLOSED) {
+-        repositories {
+-            maven {
+-                url "https://repository.apache.org"
+-            }
+-        }
+-    }
++    // if (!BUILD_CLOSED) {
++    //     repositories {
++    //         maven {
++    //             url "https://repository.apache.org"
++    //         }
++    //     }
++    // }
+ 
+     dependencies {
+         compile group: "org.apache.ant", name: "ant", version: "1.8.2"
diff --git a/dev-java/openjfx/files/8/don-t-force-msse.patch b/dev-java/openjfx/files/8/don-t-force-msse.patch
new file mode 100644
index 000000000000..2f5d56718cca
--- /dev/null
+++ b/dev-java/openjfx/files/8/don-t-force-msse.patch
@@ -0,0 +1,51 @@
+From 6483d73551590e8036cd5ec6d317e8114b403f36 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Sun, 26 Apr 2020 20:57:39 -0700
+Subject: [PATCH] don't force msse
+
+---
+ .../main/native/gstreamer/projects/linux/avplugin/Makefile | 1 -
+ .../native/gstreamer/projects/linux/fxplugins/Makefile     | 1 -
+ .../media/src/main/native/jfxmedia/projects/linux/Makefile | 1 -
+ modules/web/src/main/native/Tools/Scripts/webkitdirs.pm    | 7 -------
+ 4 files changed, 10 deletions(-)
+
+diff --git a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
+index df9f7f21..f82f0537 100644
+--- a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
++++ b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
+@@ -28,7 +28,6 @@ CFLAGS = -fPIC                   \
+          -Wformat-security       \
+          -Werror=implicit-function-declaration \
+          -fstack-protector       \
+-         -msse2                  \
+          -fbuiltin               \
+          -DHAVE_STDINT_H         \
+          -DLINUX                 \
+diff --git a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
+index fd3847d0..3887ac6d 100644
+--- a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
++++ b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
+@@ -25,7 +25,6 @@ CFLAGS = -fPIC                   \
+          -Wformat-security       \
+          -Werror=implicit-function-declaration \
+          -fstack-protector       \
+-         -msse2                  \
+          -fbuiltin               \
+          -DHAVE_STDINT_H         \
+          -DLINUX                 \
+diff --git a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
+index 3d089501..10fad68f 100644
+--- a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
++++ b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
+@@ -44,7 +44,6 @@ ifdef HOST_COMPILE
+                   -Wformat-security \
+                   -fstack-protector \
+                   -Werror=implicit-function-declaration \
+-		  -msse2 \
+ 	          -DGSTREAMER_LITE
+ 
+ 	INCLUDES = $(BASE_INCLUDES) \
+-- 
+2.26.2
+
diff --git a/dev-java/openjfx/files/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch b/dev-java/openjfx/files/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch
new file mode 100644
index 000000000000..a01dd05494fe
--- /dev/null
+++ b/dev-java/openjfx/files/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch
@@ -0,0 +1,24 @@
+From 26d59b7c8cc2b40277756f55387606ba8a852b31 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Fri, 18 Sep 2020 21:43:57 -0700
+Subject: [PATCH] fxpackager: don't include obsolete sys/sysctl.h
+
+---
+ .../fxpackager/src/main/native/library/common/PosixPlatform.cpp  | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp b/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp
+index 5ea3bc6..b5d167b 100644
+--- a/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp
++++ b/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp
+@@ -43,7 +43,6 @@
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <unistd.h>
+-#include <sys/sysctl.h>
+ #include <iostream>
+ #include <dlfcn.h>
+ #include <signal.h>
+-- 
+2.28.0
+
diff --git a/dev-java/openjfx/files/8/respect_flags.patch b/dev-java/openjfx/files/8/respect_flags.patch
new file mode 100644
index 000000000000..5c5dfa14e042
--- /dev/null
+++ b/dev-java/openjfx/files/8/respect_flags.patch
@@ -0,0 +1,22 @@
+diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle
+index 022d073..8bccdd8 100644
+--- a/buildSrc/linux.gradle
++++ b/buildSrc/linux.gradle
+@@ -46,6 +46,9 @@ def commonFlags = [
+         "-fstack-protector",
+         "-W", "-Wall", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration"] // warning flags
+ 
++
++commonFlags.addAll(System.getenv('CFLAGS').trim().split(" "))
++
+ if (!IS_64) {
+     commonFlags += "-m32"
+ }
+@@ -61,6 +64,7 @@ def linkFlags = ["-static-libgcc", "-static-libstdc++", "-shared", commonFlags,
+                  "-z", "relro",
+                  "-Wl,--gc-sections"].flatten()
+ def defaultLinkFlags = linkFlags.flatten()
++linkFlags.addAll(System.getenv('LDFLAGS').trim().split(" "))
+ 
+ def gtk2CCFlags = [  ];
+ def gtk3CCFlags = [ "-Wno-deprecated-declarations" ];
diff --git a/dev-java/openjfx/openjfx-11.0.9_p0.ebuild b/dev-java/openjfx/openjfx-11.0.9_p0.ebuild
index d9fd79845b49..119aa94597c6 100644
--- a/dev-java/openjfx/openjfx-11.0.9_p0.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.9_p0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 MY_PV="${PV/_p/+}"
 SLOT="${MY_PV%%[.+]*}"
-EGRADLE_VER="4.8"
+EGRADLE_VER="4.10.3"
 
 inherit flag-o-matic java-pkg-2 multiprocessing
 
@@ -25,7 +25,7 @@ SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.b
 "
 
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* ~amd64 ~ppc64"
 
 IUSE="cpu_flags_x86_sse2 debug doc source +media"
 
@@ -48,9 +48,12 @@ RDEPEND="
 	x11-libs/pango
 	virtual/jpeg
 	virtual/opengl
-	|| (
-		dev-java/openjdk-bin:${SLOT}[doc?]
-		dev-java/openjdk:${SLOT}[doc?]
+	doc? ( dev-java/openjdk:${SLOT}[doc] )
+	!doc? (
+		|| (
+			dev-java/openjdk-bin:${SLOT}
+			dev-java/openjdk:${SLOT}
+		)
 	)
 "
 
@@ -66,7 +69,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-REQUIRED_USE="cpu_flags_x86_sse2"
+REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )"
 
 PATCHES=(
 	"${FILESDIR}"/11/disable-buildSrc-tests.patch
@@ -74,6 +77,8 @@ PATCHES=(
 	"${FILESDIR}"/11/respect-user-cflags.patch
 	"${FILESDIR}"/11/use-system-swt-jar.patch
 	"${FILESDIR}"/11/wno-error.patch
+	"${FILESDIR}"/11/don-t-force-msse.patch
+	"${FILESDIR}"/11/disable-architecture-verification.patch
 	"${FILESDIR}/11/${PV}-version.patch"
 )
 
@@ -180,8 +185,6 @@ src_configure() {
 		local jdk_doc
 		if has_version --host-root dev-java/openjdk:${SLOT}[doc]; then
 			jdk_doc="${EROOT%/}/usr/share/doc/openjdk-${SLOT}/html/api"
-		elif has_version --host-root dev-java/java-sdk-docs:${SLOT}; then
-			jdk_doc="${EROOT%/}/usr/share/doc/java-sdk-docs-${SLOT}/html/api"
 		fi
 		[[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early"
 	fi
diff --git a/dev-java/openjfx/openjfx-8.999.ebuild b/dev-java/openjfx/openjfx-8.999.ebuild
new file mode 100644
index 000000000000..b7520c0307b2
--- /dev/null
+++ b/dev-java/openjfx/openjfx-8.999.ebuild
@@ -0,0 +1,199 @@
+# Copyright 2020 Gentoo Authors
+# 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 multiprocessing toolchain-funcs
+
+EGRADLE_VER="4.10.3"
+EHG_COMMIT="9f49e3b6147f"
+
+DESCRIPTION="Java OpenJFX 8 client application platform"
+HOMEPAGE="https://openjfx.io"
+SRC_URI="
+	https://hg.openjdk.java.net/${PN}/8u-dev/rt/archive/${EHG_COMMIT}.tar.bz2 -> ${P}.tar.bz2
+	https://dev.gentoo.org/~gyakovlev/distfiles/${P}-backports.tar.xz
+	https://services.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip
+"
+
+LICENSE="GPL-2-with-classpath-exception"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~ppc64"
+
+IUSE="debug doc media cpu_flags_x86_sse2"
+
+DEPEND="
+	app-arch/unzip
+	>=dev-java/ant-core-1.8.2:0
+	>=dev-java/antlr-2.7.7-r7:0
+	dev-java/antlr:3
+	dev-java/openjdk:8
+	dev-java/stringtemplate:0
+	dev-java/swt:4.10[cairo,opengl]
+	sys-devel/bison
+	sys-devel/flex
+	virtual/jdk:1.8
+	virtual/pkgconfig
+"
+
+RDEPEND="
+	dev-java/swt:4.10[cairo,opengl]
+	virtual/jre:1.8
+"
+
+REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )"
+
+RESTRICT="test" # needs junit version we don't have, fragile
+
+# eclass overrides it, set back to normal
+S="${WORKDIR}/${P}"
+
+# FIXME: majority of flags are honored, needs a bit more patching
+QA_FLAGS_IGNORED=".*"
+
+JAVA_PKG_WANT_BUILD_VM="openjdk-8"
+JAVA_PKG_WANT_SOURCE="1.8"
+JAVA_PKG_WANT_TARGET="1.8"
+
+PATCHES=(
+	"${FILESDIR}"/8/99-sysdeps.patch
+	"${FILESDIR}"/8/disable-online-repos.patch
+	"${FILESDIR}"/8/respect_flags.patch
+	"${FILESDIR}"/8/0000-Fix-wait-call-in-PosixPlatform.patch
+	"${FILESDIR}"/8/0001-Change-Lucene.patch
+	"${FILESDIR}"/8/0003-fix-cast-between-incompatible-function-types.patch
+	"${FILESDIR}"/8/0004-Fix-Compilation-Flags.patch
+	"${FILESDIR}"/8/0005-don-t-include-xlocale.h.patch
+	"${FILESDIR}"/8/06-disable-architecture-verification.patch
+	"${FILESDIR}"/8/07-disable-assembler-on-unsupported-archs.patch
+	"${FILESDIR}"/8/10-javadoc-locale.patch
+	"${FILESDIR}"/8/Wno-error.patch
+	"${FILESDIR}"/8/don-t-force-msse.patch
+	"${FILESDIR}"/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch
+)
+
+egradle() {
+	local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}"
+	local gradle="${GRADLE_HOME}/bin/gradle"
+	local gradle_args=(
+		--info
+		--stacktrace
+		--no-build-cache
+		--no-daemon
+		--offline
+		--gradle-user-home	"${T}/gradle_user_home"
+		--project-cache-dir "${T}/gradle_project_cache"
+	)
+
+	export GRADLE_HOME
+
+	# FIXME: build.gradle believes $ANT_HOME/bin/ant shoud exist
+	unset ANT_HOME
+
+	einfo "gradle "${gradle_args[@]}" ${@}"
+	# TERM needed, otherwise gradle may fail on terms it does not know about
+	TERM="xterm" "${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed"
+}
+
+src_unpack() {
+	default
+	mv -v "rt-${EHG_COMMIT}" "${P}" || die
+}
+
+src_prepare() {
+	eapply "${WORKDIR}/${P}-backports"
+	default
+
+	# this will create local jar storage to be used as ivy repo
+	local d="${T}/jars"
+	mkdir "${d}" || die
+
+	# we need jars subdir in every prokect so gradle can find them
+	# only system jars, no bundling
+	local target targets
+	targets=(
+		jars
+		buildSrc/jars
+		modules/{base,builders,controls,extensions,fxml}/jars
+		modules/{graphics,jmx,media,swing,swt,web,fxpackager}/jars
+	)
+	einfo "Copying system jars"
+	for target in ${targets[@]}; do
+		ln -vs "${T}/jars" "${target}" || die
+	done
+
+	local swt_file_name="$(java-pkg_getjars swt-4.10)"
+	java-pkg_jar-from --build-only --into "${d}" ant-core ant.jar ant-1.8.2.jar
+	java-pkg_jar-from --build-only --into "${d}" ant-core ant-launcher.jar ant-launcher-1.8.2.jar
+	java-pkg_jar-from --build-only --into "${d}" antlr antlr.jar antlr-2.7.7.jar
+	java-pkg_jar-from --build-only --into "${d}" antlr-3 antlr-tool.jar antlr-3.1.3.jar
+	java-pkg_jar-from --build-only --into "${d}" antlr-3 antlr-runtime.jar antlr-runtime-3.1.3.jar
+	java-pkg_jar-from --build-only --into "${d}" stringtemplate  stringtemplate.jar stringtemplate-3.2.jar
+	sed -i "s#compile name: SWT_FILE_NAME#compile files(\"${swt_file_name#/}\")#" "${S}"/build.gradle || die
+
+	sed -i 's/-rpath/-rpath-link/g' modules/media/src/main/native/jfxmedia/projects/linux/Makefile || die
+}
+
+src_configure() {
+	# see gradle.properties.template in ${S}
+	cat <<- _EOF_ > "${S}"/gradle.properties
+		COMPILE_TARGETS = linux
+		GRADLE_VERSION_CHECK = false
+		COMPILE_AVPLUGIN = $(usex media true false)
+		COMPILE_MEDIA = $(usex media true false)
+		COMPILE_WEBKIT = false
+		BUILD_JAVADOC = $(usex doc true false)
+		BUILD_SRC_ZIP = $(usex source true false)
+		FULL_TEST = false
+		CONF = $(usex debug DebugNative Release)
+		NUM_COMPILE_THREADS = $(makeopts_jobs)
+	_EOF_
+
+	local repostring='
+		repositories {
+		ivy {
+			url file("${projectDir}/jars")
+			layout "pattern", {
+				artifact "[artifact]-[revision].[ext]"
+				artifact "[artifact].[ext]"
+			}
+		}
+		mavenLocal()
+	}'
+
+	cat <<- _EOF_ > "${S}"/buildSrc/gentoo.gradle
+		${repostring}
+	_EOF_
+
+	cat <<- _EOF_ > "${S}"/gentoo.gradle
+		${repostring}
+		allprojects {
+			${repostring}
+		}
+	_EOF_
+
+	echo "apply from: 'gentoo.gradle'" >> build.gradle || die
+	echo "apply from: 'gentoo.gradle'" >> buildSrc/build.gradle || die
+	sed -i 's/mavenCentral/mavenLocal/g' build.gradle || die
+	sed -i 's/mavenCentral/mavenLocal/g' buildSrc/build.gradle || die
+	einfo "Configured with the following settings:"
+	cat gradle.properties || die
+
+}
+
+src_compile() {
+	tc-export_build_env CC CXX PKG_CONFIG
+	rm -r tests buildSrc/src/test || die
+	egradle openExportLinux
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/openjdk-${SLOT}"
+	local ddest="${ED%/}/${dest#/}"
+	dodir "${dest}"
+	pushd build/export/sdk > /dev/null || die
+	cp -pPRv * "${ddest}" || die
+	popd > /dev/null || die
+}
diff --git a/dev-java/oracle-javamail/Manifest b/dev-java/oracle-javamail/Manifest
index 6ba70b534cd6..29c8a03bd5d7 100644
--- a/dev-java/oracle-javamail/Manifest
+++ b/dev-java/oracle-javamail/Manifest
@@ -1,7 +1,3 @@
-DIST javamail-1.5.2-src.zip 1573447 BLAKE2B 0ba805e20de84c8a4457d0a03225299a458c5324dc47bccbbf9708673a63521299565e45b66eec552d0216f144505aa319ea724a867ab7de2a69acd072e1a67f SHA512 9d2ae8c38a8e7464023219dac13df95a34cab52a5ff9f19015ea0dde73a838f49ae006c9dc1538eeb978844af7ac962ce3b22d89f0f9ccda684141f7b52840bc
-DIST oracle-javamail-1.5.5.zip 1794428 BLAKE2B 6bcba7aa40ad668b8cfd55ae3b4afddcd0df51298860fb75a2e1ae805920b5a966ef031d91c7a5e0a6cd2f5a2892f4f70ae0e24c87c9623bc1a6c15df93be7a9 SHA512 20eb12e757d00ceedbf45c43ddc1b6fe1155e79766e5843fbb8fd58c3ad91305edb07351b4ff9ed411aaffe977e9e4f287ac16b88ac55541f6f4f93c1c81a58a
 DIST oracle-javamail-1.5.6.zip 1812631 BLAKE2B 9fd43058b10726db9359c4b59fd42226da329268ec4974a510940a4e7d6bd16afc3a3a73b6ee17914cd5d3577c42ddf22f29bc93e2ca185660ea03196ed2bd28 SHA512 3fde7901f5975f4a58d675d94e397bf1a169db227b138bfd684c0e2d0f6522ea1c8e2a5425b23fc08775a6824a9e9e68b2d6e6312f20c53af127f00a897363e2
-EBUILD oracle-javamail-1.5.2.ebuild 1242 BLAKE2B 4b78ffe20c74bf8a95544b657846d9197f31534c1f64057c3304509625b7bcddac1fe78d6e0a87ea4e44661ed24879b29f9d738cb788c3d7ddaca07954722f4c SHA512 da9bb50b684173beeefae7c3c7b08d634ded0b5766032e142cbc1a30e5432df625df1fc69193e894af4391399d0dd5ef0dd25f0c30df00e413e69a3cb060ab9d
-EBUILD oracle-javamail-1.5.5.ebuild 1257 BLAKE2B bb9eb357f3297185acc36e1337018d4f2a864d512e772144e882e26f90a82c162ce8e49911802ea9925b2203f959567809bbc37e32a7e82de70dd27041194416 SHA512 ea40d4db114504653cbc39780c2a8c466d116c55d7d9e8822305fb10e21662dc829ff2d3dacc634f63afcff9406622dadfd757445fcc5020404172a49d8b8941
-EBUILD oracle-javamail-1.5.6.ebuild 1259 BLAKE2B 23df8cc69879f8f46455af9ec07461896a82b8dcff688ce660a608f7d9d7e4419458e7ac0c545e74e8b2072f3807f23cd1256fefed61e4153c8d9a8864cf6b82 SHA512 e3c61398696a2834594ccbfe99035a3661d551c51e892729c8dfa672d0422dcb22348f8e214bdff6347947a5405d93d463af838b68f1dd651d2f3168cfb86336
+EBUILD oracle-javamail-1.5.6.ebuild 1258 BLAKE2B a275dffb12bc1bd57feb8477bfab10e51959b3b0ede40e3004b406a24e18a8aba23e2dd9540453e95bae31408714f32c4944fc2e90a382bb8ed326c3480fba1b SHA512 4b4b4b29779215c8502501d8eb823f42aedf43d4020ba8ac90d39630ea1643c4f36ac659b7878a406704df76320d38e0b6dfac7ce1b2f5a32198e5cebc1a4c10
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild
deleted file mode 100644
index 14621389420c..000000000000
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A Java-based framework to build multiplatform mail and messaging applications"
-HOMEPAGE="https://java.net/projects/javamail/pages/Home"
-
-SRC_URI="https://java.net/projects/javamail/downloads/download/source/javamail-${PV}-src.zip"
-
-# either of these
-LICENSE="CDDL GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	default
-
-	# build.xml expects it here
-	mkdir -p legal/src/main/resources/META-INF || die
-	cp mail/src/main/resources/META-INF/LICENSE.txt \
-		legal/src/main/resources/META-INF || die
-}
-
-EANT_DOC_TARGET="docs"
-EANT_EXTRA_ARGS="-Dspec.dir=doc/spec"
-
-src_install() {
-	java-pkg_dojar target/release/mail.jar
-
-	dodoc doc/release/{CHANGES,COMPAT,NOTES,NTLMNOTES,README,SSLNOTES}.txt
-	dohtml -r doc/release/{*.html,images}
-
-	use doc && java-pkg_dojavadoc target/release/docs/javadocs
-	use source && java-pkg_dosrc mail/src/main/java
-}
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild
deleted file mode 100644
index 90e1f7aec221..000000000000
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A Java-based framework to build multiplatform mail and messaging applications"
-HOMEPAGE="https://java.net/projects/javamail/pages/Home"
-SRC_URI="https://java.net/projects/javamail/downloads/download/source/javamail-${PV}-src.zip -> ${P}.zip"
-
-# either of these
-LICENSE="CDDL GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	default
-
-	# build.xml expects it here
-	mkdir -p legal/src/main/resources/META-INF || die
-	cp mail/src/main/resources/META-INF/LICENSE.txt \
-		legal/src/main/resources/META-INF || die
-}
-
-EANT_DOC_TARGET="docs"
-EANT_EXTRA_ARGS="-Dspec.dir=doc/spec"
-
-src_install() {
-	java-pkg_dojar target/release/mail.jar
-
-	dodoc doc/release/{CHANGES,COMPAT,NOTES,NTLMNOTES,README,SSLNOTES}.txt
-	dohtml -r doc/release/{*.html,images}
-
-	use doc && java-pkg_dojavadoc target/release/docs/javadocs
-	use source && java-pkg_dosrc mail/src/main/java
-}
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
index b9cfbd3adefc..7343cc9b90cd 100644
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://java.net/projects/javamail/downloads/download/source/javamail-$
 # either of these
 LICENSE="CDDL GPL-2 BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
deleted file mode 100644
index a61fc83a11d6..000000000000
--- a/dev-java/oracle-jdk-bin/Manifest
+++ /dev/null
@@ -1,21 +0,0 @@
-AUX fontconfig.properties 11196 BLAKE2B 31abb25a488c4680ee6a276d4c4fd0f0c8da5572a923cc1f755a6baf6ef007453c1cda4fb280fa108ae124c888a5b36b05658a9695dc5311f859742fbf9e7a79 SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9
-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-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
-DIST jdk-8u202-linux-arm64-vfp-hflt.tar.gz 73141712 BLAKE2B 3e9ba3b12616eddc5f55397bad22ca7dbded5a277beb9ee5ee9bace882247c8197534df42f79a0441b299724e41223fe493a2246669986a70860f66abe68130a SHA512 5a3950c3bf370fd41a81514d28f93da32a299376818cbb4f1b05be3adeca5a86e099ff9a225d8267bcd965cd51db9c357cee054faa6fad139d150d9b359964e7
-DIST jdk-8u202-linux-i586-demos.tar.gz 58698723 BLAKE2B 56c07b9ab2093689eb4b9136cdff41e5deba75f3388cbffc624c3c0c27b24c732a5ae826c1c2381065abad2320c1c5ccfaaad5933a03a395f148804950313e47 SHA512 e15e4141846ba0df052f90cee9827b71f158fdae4eae20289eab4a37a21a78f6ed5b9ef94345a324b23b7e5b6140fdbef7e00265d6f234cea56f2f6aa6c5dde8
-DIST jdk-8u202-linux-i586.tar.gz 197025433 BLAKE2B 6521552b0b41c9f0eebb4cd59247775a895d09ce899ee3bb941708c67ebd2c6f23bbce4ebde3def5c1d62fcb97d6c7d229457b33e982ab3d0709a10518b3c7b0 SHA512 1bb370b582628d92b41e4c205a76c75be783c044cf0bd27cc269bbf1cb50a9840ee10b50c7b1381373eabee0a2a4e47b007dceecd205d2f7adb89845e4d2e380
-DIST jdk-8u202-linux-x64-demos.tar.gz 58808123 BLAKE2B 1f2bd5364a3d658fad7859842f1cde270a7442707f61ecb0e2d840562a18dc6bf093c029491ab2c912fc8f52a93e6b23b201e4516416b8f97e4d914250563847 SHA512 1ff395bf6abbafa07ed9ddc1a58b05e564342ad7c9a3ef26d0a55b7f49e233ff9a5349984be55c295fd17e4ae15fc9e9a0960f6e76a67de4c8e598ac7707daf3
-DIST jdk-8u202-linux-x64.tar.gz 194042837 BLAKE2B db8193e47b93ebad1f984d39e887babea1f1e8e6b5cf9ea9ca8f243bd6f0e12c40fb1531ba5b22835a4c7c6613ea8bfd1bc233f322afee617988fc7123f6202a SHA512 a69cd3128595725435d7c0c3e02034f82f48694589afacca3430bd476f86489ec8ad57543c285a831f5affc8241b6d39ab84d1f1ac971200a3913baf97d54094
-DIST jdk-8u202-macosx-x64.dmg 261255287 BLAKE2B e9f1b21d87750c79c3dae1a37fb3727e426fa0baf95fed396f937541ebd9df2ee832cb2b9b7971020726107cc13382bef59267669872867749cf78b07d7ad680 SHA512 5935864f9ecb184dcbbac9c11de98443effc3f0264612c4a0c842465390551e5d73341eac950efb08ddcdd7b39ad0a49554fb1bf953f962f89a00322515ce368
-DIST jdk-8u202-macosx-x86_64-demos.zip 58980556 BLAKE2B 380567dce812bcdc4e67ead8185629f0d00163ac823ec15d8a68dc62cd66e7bd45231a6d38ffbc6a4ee255080cd7193d8797b823bb41abce06bdb65ae44e2b4d SHA512 c755ff14ef6d5d327e98e315d88640ad8d6513ec05ccb87c0925544b26ab18968cf85921f65029735abe9271dead6055b5efbe2b011583a160b280ed86015779
-DIST jdk-8u202-solaris-sparcv9-demos.tar.gz 8838689 BLAKE2B e86ed9372d9d76abb4eeab07b07fbbe988ae39b747b048d937d798cd908e6a8b838e07d5afb99e84357fd1cef8eac87bb039f643745b32df1085bfa9e71b28d3 SHA512 a6a7201b82f05641523f3fafa972659fbbfd1787d13f718b574d94a4e2646ead60fbb25037fa8ec14e12055c36b4c9d1046dce42b0785219ac3293515bf05b49
-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.202.ebuild 8514 BLAKE2B 5112bd68fcfa9b62af4d4f23b939ee4fe91681e4dba68d775e423fa6714fd53bfa5b28e5bf26bbef40c88dc84374f9e6ef8e524726709bb95ab758c64446081a SHA512 f92a5d30ae8e77006c1463395d05acea8a49a1d141a8219ddf42bfc09afff157b6d45eb0e961a5932aa4f614a9f4e9db52f3e218943a7b144ed79562bcdc8918
-EBUILD oracle-jdk-bin-11.0.2.ebuild 6929 BLAKE2B faf728d437351afb603fc2fff362ed3c0333c61355091de3705e014d4337e77afafe3f896d69dc9d55937b523689db4bba48050a208acf1b7e0e767ae9879233 SHA512 dcf92793aebc5a8cef0fed6ba2d031273afb8f2f540eab13c8f63b565e39d17fd0cb8abd483f24a5aca09ea88f50eb20ab288d7cab9226ff6ef552dd395650f0
-MISC metadata.xml 960 BLAKE2B 08132d03d01dbfbbaab7c4701da19fd3e8ecf9a8877e672e9c6d01afca3b4484d228f065a220fbf63277a0e1eda0f8ac6d918e653f6c527402db3d220adff034 SHA512 e43885c5dcd4a5e5a8d69e6025a0715da57131bd38f740449364c6e2f65abfc507eef3f1fc31272e1710b772b5f317f1fee63ea20bbede79fbf1b82cd014dd7a
diff --git a/dev-java/oracle-jdk-bin/files/fontconfig.properties b/dev-java/oracle-jdk-bin/files/fontconfig.properties
deleted file mode 100644
index 43cb5eed0c47..000000000000
--- a/dev-java/oracle-jdk-bin/files/fontconfig.properties
+++ /dev/null
@@ -1,161 +0,0 @@
-# Version
-
-version=1
-
-# Component Font Mappings
-
-allfonts.chinese-gb18030=-misc-ming for iso10646 -medium-r-normal--*-%d-*-*-c-*-iso10646-1
-allfonts.chinese-gb18030.motif=-isas-song ti-medium-r-normal--*-%d-*-*-c-*-gb2312.1980-0
-allfonts.chinese-big5=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-allfonts.chinese-big5.motif=-taipei-fixed-medium-r-normal--*-%d-*-*-c-*-big5-0
-allfonts.lucida=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-
-serif.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-serif.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-serif.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-serif.plain.latin-1=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-serif.plain.latin-1.motif=-b&h-luxi serif-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-
-serif.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-serif.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-serif.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-serif.bold.latin-1=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1
-serif.bold.latin-1.motif=-b&h-luxi serif-bold-r-normal--*-%d-*-*-p-*-iso8859-1
-
-serif.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-serif.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-serif.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-serif.italic.latin-1=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-serif.italic.latin-1.motif=-b&h-luxi serif-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-
-serif.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-serif.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-serif.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-serif.bolditalic.latin-1=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1
-serif.bolditalic.latin-1.motif=-b&h-luxi serif-bold-i-normal--*-%d-*-*-p-*-iso8859-1
-
-sansserif.plain.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-sansserif.plain.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-sansserif.plain.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-sansserif.plain.latin-1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.plain.latin-1.motif=-b&h-luxi sans-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-
-sansserif.bold.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-sansserif.bold.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-sansserif.bold.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-sansserif.bold.latin-1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.bold.latin-1.motif=-b&h-luxi sans-bold-r-normal--*-%d-*-*-p-*-iso8859-1
-
-sansserif.italic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-sansserif.italic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-sansserif.italic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-sansserif.italic.latin-1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.italic.latin-1.motif=-b&h-luxi sans-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-
-sansserif.bolditalic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-sansserif.bolditalic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-sansserif.bolditalic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-sansserif.bolditalic.latin-1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.bolditalic.latin-1.motif=-b&h-luxi sans-bold-i-normal--*-%d-*-*-p-*-iso8859-1
-
-monospaced.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-monospaced.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-monospaced.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-monospaced.plain.latin-1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.plain.latin-1.motif=-b&h-luxi mono-medium-r-normal--*-%d-*-*-m-*-iso8859-1
-
-monospaced.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-monospaced.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-monospaced.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-monospaced.bold.latin-1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.bold.latin-1.motif=-b&h-luxi mono-bold-r-normal--*-%d-*-*-m-*-iso8859-1
-
-monospaced.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-monospaced.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-monospaced.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-monospaced.italic.latin-1=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.italic.latin-1.motif=-b&h-luxi mono-medium-i-normal--*-%d-*-*-m-*-iso8859-1
-
-monospaced.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-monospaced.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-monospaced.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-monospaced.bolditalic.latin-1=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.bolditalic.latin-1.motif=-b&h-luxi mono-bold-i-normal--*-%d-*-*-m-*-iso8859-1
-
-dialog.plain.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialog.plain.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialog.plain.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialog.plain.latin-1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.plain.latin-1.motif=-b&h-luxi sans-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-
-dialog.bold.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialog.bold.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialog.bold.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialog.bold.latin-1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.bold.latin-1.motif=-b&h-luxi sans-bold-r-normal--*-%d-*-*-p-*-iso8859-1
-
-dialog.italic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialog.italic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialog.italic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialog.italic.latin-1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.italic.latin-1.motif=-b&h-luxi sans-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-
-dialog.bolditalic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialog.bolditalic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialog.bolditalic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialog.bolditalic.latin-1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.bolditalic.latin-1.motif=-b&h-luxi sans-bold-i-normal--*-%d-*-*-p-*-iso8859-1
-
-dialoginput.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialoginput.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialoginput.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialoginput.plain.latin-1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.plain.latin-1.motif=-b&h-luxi mono-medium-r-normal--*-%d-*-*-m-*-iso8859-1
-
-dialoginput.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialoginput.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialoginput.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialoginput.bold.latin-1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.bold.latin-1.motif=-b&h-luxi mono-bold-r-normal--*-%d-*-*-m-*-iso8859-1
-
-dialoginput.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialoginput.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialoginput.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialoginput.italic.latin-1=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.italic.latin-1.motif=-b&h-luxi mono-medium-i-normal--*-%d-*-*-m-*-iso8859-1
-
-dialoginput.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialoginput.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialoginput.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialoginput.bolditalic.latin-1=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.bolditalic.latin-1.motif=-b&h-luxi mono-bold-i-normal--*-%d-*-*-m-*-iso8859-1
-
-# Search Sequences
-
-sequence.allfonts=latin-1
-sequence.allfonts.Big5=latin-1,chinese-big5
-sequence.allfonts.GB2312=latin-1,chinese-gb18030
-sequence.allfonts.x-euc-jp-linux=latin-1,japanese-x0208
-sequence.allfonts.EUC-KR=latin-1,korean
-sequence.allfonts.GB18030=latin-1,chinese-gb18030
-sequence.fallback=lucida,chinese-big5,chinese-gb18030,japanese-x0208,korean
-
-# Exclusion Ranges
-
-exclusion.japanese-x0208=0390-03d6,2200-22ef,2701-27be
-
-# Font File Names
-
-filename.-arphic_technology_co.-ar_pl_mingti2l_big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts/bsmi00lp.ttf
-filename.-misc-baekmuk_batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts/batang.ttf
-filename.-misc-baekmuk_gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts/gulim.ttf
-filename.-misc-kochi_gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
-filename.-misc-kochi_mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
-filename.-misc-ming for iso10646 -medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/hkscs-ming/min_uni.ttf
-
-# AWT X11 font paths
-awtfontpath.latin-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/Type1
-awtfontpath.chinese-big5=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts
-awtfontpath.chinese-gb18030=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts
-awtfontpath.japanese-x0208=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/kochi-substitute
-awtfontpath.korean=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts
diff --git a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-9.env.sh b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-9.env.sh
deleted file mode 100644
index 503707550e23..000000000000
--- a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-9.env.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-VERSION="Oracle JDK ${PV}"
-JAVA_HOME="${EPREFIX}/opt/${P}"
-JDK_HOME="${EPREFIX}/opt/${P}"
-JAVAC="\${JAVA_HOME}/bin/javac"
-PATH="\${JAVA_HOME}/bin"
-ROOTPATH="\${JAVA_HOME}/bin"
-LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
-MANPATH=""
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="${SLOT}"
-BOOTCLASSPATH=""
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin.env.sh b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin.env.sh
deleted file mode 100644
index 508a5c647874..000000000000
--- a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin.env.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-VERSION="Oracle JDK ${PV}"
-JAVA_HOME="${EPREFIX}/opt/${P}"
-JDK_HOME="${EPREFIX}/opt/${P}"
-JAVAC="\${JAVA_HOME}/bin/javac"
-PATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
-ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
-LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/"
-MANPATH="${EPREFIX}/opt/${P}/man"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="${SLOT}"
-BOOTCLASSPATH="\${JAVA_HOME}/jre/lib/resources.jar:\${JAVA_HOME}/jre/lib/rt.jar:\${JAVA_HOME}/jre/lib/sunrsasign.jar:\${JAVA_HOME}/jre/lib/jsse.jar:\${JAVA_HOME}/jre/lib/jce.jar:\${JAVA_HOME}/jre/lib/charsets.jar:\${JAVA_HOME}/jre/classes"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/oracle-jdk-bin/metadata.xml b/dev-java/oracle-jdk-bin/metadata.xml
deleted file mode 100644
index ef1e9ad9d7fb..000000000000
--- a/dev-java/oracle-jdk-bin/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="commercial">Install features requiring a commercial license for production use</flag>
-    <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
-    <flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
-    <flag name="gtk2">Enable GTK+ 2 support in JavaFX</flag>
-    <flag name="gtk3">Enable GTK+ 3 support in JavaFX</flag>
-    <flag name="javafx">Install JavaFX libraries</flag>
-    <flag name="jce">Install Java Cryptographic Extension Unlimited Strength Jurisdiction Policy Files</flag>
-    <flag name="source">Install JVM (and optionally JavaFX) sources</flag>
-    <flag name="visualvm">Install VisualVM debugging tool</flag>
-  </use>
-</pkgmetadata>
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
deleted file mode 100644
index 03aed071bd2e..000000000000
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop eutils 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="bindist 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-11.0.2.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-11.0.2.ebuild
deleted file mode 100644
index 7456808001d5..000000000000
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-11.0.2.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils java-vm-2 prefix
-
-KEYWORDS="-* ~amd64 ~x64-macos ~sparc64-solaris"
-KEYWORDS="-* ~amd64"
-
-declare -A ARCH_FILES
-ARCH_FILES[amd64]="jdk-${PV}_linux-x64_bin.tar.gz"
-ARCH_FILES[sparc64-solaris]="jdk-${PV}_solaris-sparcv9_bin.tar.gz"
-ARCH_FILES[x64-macos]="jdk-${PV}_osx-x64_bin.dmg"
-
-for keyword in ${KEYWORDS//-\*} ; do
-	SRC_URI+=" ${keyword#\~}? ( ${ARCH_FILES[${keyword#\~}]} )"
-done
-
-DESCRIPTION="Oracle's Java SE Development Kit"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-LICENSE="Oracle-BCLA-JavaSE"
-SLOT="${PV%%.*}"
-IUSE="alsa commercial cups doc +fontconfig +gentoo-vm gtk2 gtk3 headless-awt javafx nsplugin selinux source"
-REQUIRED_USE="javafx? ( alsa fontconfig ^^ ( gtk2 gtk3 ) )"
-RESTRICT="bindist 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/atk
-			dev-libs/glib:2
-			dev-libs/libxml2:2
-			dev-libs/libxslt
-			media-libs/freetype:2
-			x11-libs/gdk-pixbuf
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXxf86vm
-			x11-libs/pango
-			virtual/opengl
-
-			gtk2? (
-				x11-libs/cairo
-				x11-libs/gtk+:2
-			)
-			gtk3? (
-				x11-libs/cairo[glib]
-				x11-libs/gtk+:3
-			)
-		)
-	)
-	!prefix? (
-		dev-libs/elfutils
-		sys-libs/glibc:*
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	doc? ( dev-java/java-sdk-docs:${SLOT} )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	selinux? ( sec-policy/selinux-java )"
-
-pkg_nofetch() {
-	einfo "Please download ${ARCH_FILES[${ARCH}]} and move it to"
-	einfo "your distfiles directory:"
-	einfo
-	einfo "  https://www.oracle.com/technetwork/java/javase/downloads/jdk11-downloads-5066655.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 "  https://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase11-5116896.html"
-	einfo
-}
-
-src_unpack() {
-	if use x64-macos ; then
-		S="${WORKDIR}/Contents/Home"
-		mkdir -p "${T}"/dmgmount || die
-		hdiutil attach "${DISTDIR}/${A}" -mountpoint "${T}"/dmgmount || die
-		( cd "${T}" &&
-		  xar -xf "${T}/dmgmount/JDK ${PV}.pkg" \
-		  jdk${PV//.}.pkg/Payload ) || die
-		zcat "${T}"/jdk${PV//.}.pkg/Payload | cpio -idv || die
-		hdiutil detach "${T}"/dmgmount || die
-	else
-		S="${WORKDIR}/jdk-${PV}"
-		default
-	fi
-}
-
-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 jmods/*.jfr.* lib/jfr* \
-			lib/missioncontrol || die
-	fi
-
-	if use headless-awt ; then
-		rm -vf lib/lib*{[jx]awt,splashscreen}* \
-		   bin/{appletviewer,javaws,policytool} || die
-	fi
-
-	if ! use javafx ; then
-		rm -vf lib/lib*{decora,fx,glass,prism}* \
-		   lib/libgstreamer-lite.* lib/*fx* \
-		   bin/javapackager jmods/javafx* || die
-	else
-		if ! use gtk2 ; then
-			rm -vf lib/libglassgtk2.* || die
-		elif ! use gtk3 ; then
-			rm -vf lib/libglassgtk3.* || die
-		fi
-	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
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	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 JRE 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 JDK ${SLOT}" \
-			sun-jcontrol-${PN}-${SLOT} \
-			"Settings;Java;"
-	fi
-
-	dodir "${dest}"
-	cp -pPR bin conf include jmods lib "${ddest}" || 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"
-	# "${ddest}/bin/java" -server -Xshare:dump || die
-	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
-
-	# 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}"/lib/${lib} \
-				"${ddest}"/lib/${lib} || die
-			eend $?
-		done
-	fi
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-9.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
-
-	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 9. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	java-vm-2_pkg_postrm
-}
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
deleted file mode 100644
index e51a031c4abb..000000000000
--- a/dev-java/oracle-jre-bin/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX fontconfig.properties 11196 BLAKE2B 31abb25a488c4680ee6a276d4c4fd0f0c8da5572a923cc1f755a6baf6ef007453c1cda4fb280fa108ae124c888a5b36b05658a9695dc5311f859742fbf9e7a79 SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9
-AUX oracle-jre-bin.env.sh 749 BLAKE2B b8c1f54712f4d41fd78bae4e7ad9e351516487b3c4573593674c1f340c4f9bafe9a283c35f8c3f136e1f93a6b0c8f6cf85837b4532db62059c7e66f05d7e0610 SHA512 273fafcafabd64946932eb42552476aeea2a9fc1c803cbcaa4f86b4fc8c80d109abdad068bf2063d7ea7e7c2d2794d7dc96dca6aae5ef8787b98ad57f467fa69
-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.202.ebuild 6059 BLAKE2B 54348f5c7582bbca652c441d64639f6ae96db3775b299460db927eab5ae382bbc1680a791d91d210096dadca473b66990a96cba470441bdfeb6ab8a13e236053 SHA512 2671d78ef0b0f57392a58d7eb05e858d0bdb5facbc4ee46cb0044c19f63bbb9a532cca6c9214bd45dc9997ace391d86ce96aa159178e48db35808e320259031f
-MISC metadata.xml 567 BLAKE2B 78bb5f186b86d6aff00538825186ed77d31e1270370a812e0aa5b6f059358144f01677efff63fadd1d9e9a927b40f87e783b0e731c883e28e6f8414faeba112f SHA512 77de100308e5febd2d11e2fc47bb0c5872be620ad6f382f6173574df657fb5ad0b0478246a5a3576457fc168df13b444dc1661228e87d0c5378e1288785e74ec
diff --git a/dev-java/oracle-jre-bin/files/fontconfig.properties b/dev-java/oracle-jre-bin/files/fontconfig.properties
deleted file mode 100644
index 43cb5eed0c47..000000000000
--- a/dev-java/oracle-jre-bin/files/fontconfig.properties
+++ /dev/null
@@ -1,161 +0,0 @@
-# Version
-
-version=1
-
-# Component Font Mappings
-
-allfonts.chinese-gb18030=-misc-ming for iso10646 -medium-r-normal--*-%d-*-*-c-*-iso10646-1
-allfonts.chinese-gb18030.motif=-isas-song ti-medium-r-normal--*-%d-*-*-c-*-gb2312.1980-0
-allfonts.chinese-big5=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-allfonts.chinese-big5.motif=-taipei-fixed-medium-r-normal--*-%d-*-*-c-*-big5-0
-allfonts.lucida=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-
-serif.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-serif.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-serif.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-serif.plain.latin-1=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-serif.plain.latin-1.motif=-b&h-luxi serif-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-
-serif.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-serif.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-serif.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-serif.bold.latin-1=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1
-serif.bold.latin-1.motif=-b&h-luxi serif-bold-r-normal--*-%d-*-*-p-*-iso8859-1
-
-serif.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-serif.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-serif.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-serif.italic.latin-1=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-serif.italic.latin-1.motif=-b&h-luxi serif-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-
-serif.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-serif.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-serif.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-serif.bolditalic.latin-1=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1
-serif.bolditalic.latin-1.motif=-b&h-luxi serif-bold-i-normal--*-%d-*-*-p-*-iso8859-1
-
-sansserif.plain.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-sansserif.plain.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-sansserif.plain.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-sansserif.plain.latin-1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.plain.latin-1.motif=-b&h-luxi sans-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-
-sansserif.bold.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-sansserif.bold.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-sansserif.bold.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-sansserif.bold.latin-1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.bold.latin-1.motif=-b&h-luxi sans-bold-r-normal--*-%d-*-*-p-*-iso8859-1
-
-sansserif.italic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-sansserif.italic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-sansserif.italic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-sansserif.italic.latin-1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.italic.latin-1.motif=-b&h-luxi sans-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-
-sansserif.bolditalic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-sansserif.bolditalic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-sansserif.bolditalic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-sansserif.bolditalic.latin-1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.bolditalic.latin-1.motif=-b&h-luxi sans-bold-i-normal--*-%d-*-*-p-*-iso8859-1
-
-monospaced.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-monospaced.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-monospaced.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-monospaced.plain.latin-1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.plain.latin-1.motif=-b&h-luxi mono-medium-r-normal--*-%d-*-*-m-*-iso8859-1
-
-monospaced.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-monospaced.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-monospaced.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-monospaced.bold.latin-1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.bold.latin-1.motif=-b&h-luxi mono-bold-r-normal--*-%d-*-*-m-*-iso8859-1
-
-monospaced.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-monospaced.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-monospaced.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-monospaced.italic.latin-1=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.italic.latin-1.motif=-b&h-luxi mono-medium-i-normal--*-%d-*-*-m-*-iso8859-1
-
-monospaced.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-monospaced.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-monospaced.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-monospaced.bolditalic.latin-1=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.bolditalic.latin-1.motif=-b&h-luxi mono-bold-i-normal--*-%d-*-*-m-*-iso8859-1
-
-dialog.plain.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialog.plain.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialog.plain.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialog.plain.latin-1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.plain.latin-1.motif=-b&h-luxi sans-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-
-dialog.bold.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialog.bold.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialog.bold.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialog.bold.latin-1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.bold.latin-1.motif=-b&h-luxi sans-bold-r-normal--*-%d-*-*-p-*-iso8859-1
-
-dialog.italic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialog.italic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialog.italic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialog.italic.latin-1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.italic.latin-1.motif=-b&h-luxi sans-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-
-dialog.bolditalic.japanese-x0208=-misc-kochi gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialog.bolditalic.korean=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialog.bolditalic.korean.motif=-misc-baekmuk gulim-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialog.bolditalic.latin-1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.bolditalic.latin-1.motif=-b&h-luxi sans-bold-i-normal--*-%d-*-*-p-*-iso8859-1
-
-dialoginput.plain.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialoginput.plain.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialoginput.plain.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialoginput.plain.latin-1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.plain.latin-1.motif=-b&h-luxi mono-medium-r-normal--*-%d-*-*-m-*-iso8859-1
-
-dialoginput.bold.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialoginput.bold.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialoginput.bold.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialoginput.bold.latin-1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.bold.latin-1.motif=-b&h-luxi mono-bold-r-normal--*-%d-*-*-m-*-iso8859-1
-
-dialoginput.italic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialoginput.italic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialoginput.italic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialoginput.italic.latin-1=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.italic.latin-1.motif=-b&h-luxi mono-medium-i-normal--*-%d-*-*-m-*-iso8859-1
-
-dialoginput.bolditalic.japanese-x0208=-misc-kochi mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialoginput.bolditalic.korean=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1
-dialoginput.bolditalic.korean.motif=-misc-baekmuk batang-medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
-dialoginput.bolditalic.latin-1=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.bolditalic.latin-1.motif=-b&h-luxi mono-bold-i-normal--*-%d-*-*-m-*-iso8859-1
-
-# Search Sequences
-
-sequence.allfonts=latin-1
-sequence.allfonts.Big5=latin-1,chinese-big5
-sequence.allfonts.GB2312=latin-1,chinese-gb18030
-sequence.allfonts.x-euc-jp-linux=latin-1,japanese-x0208
-sequence.allfonts.EUC-KR=latin-1,korean
-sequence.allfonts.GB18030=latin-1,chinese-gb18030
-sequence.fallback=lucida,chinese-big5,chinese-gb18030,japanese-x0208,korean
-
-# Exclusion Ranges
-
-exclusion.japanese-x0208=0390-03d6,2200-22ef,2701-27be
-
-# Font File Names
-
-filename.-arphic_technology_co.-ar_pl_mingti2l_big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts/bsmi00lp.ttf
-filename.-misc-baekmuk_batang-medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts/batang.ttf
-filename.-misc-baekmuk_gulim-medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts/gulim.ttf
-filename.-misc-kochi_gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf
-filename.-misc-kochi_mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf
-filename.-misc-ming for iso10646 -medium-r-normal--*-%d-*-*-c-*-iso10646-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/hkscs-ming/min_uni.ttf
-
-# AWT X11 font paths
-awtfontpath.latin-1=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/Type1
-awtfontpath.chinese-big5=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts
-awtfontpath.chinese-gb18030=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/arphicfonts
-awtfontpath.japanese-x0208=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/kochi-substitute
-awtfontpath.korean=@GENTOO_PORTAGE_EPREFIX@/usr/share/fonts/baekmuk-fonts
diff --git a/dev-java/oracle-jre-bin/files/oracle-jre-bin.env.sh b/dev-java/oracle-jre-bin/files/oracle-jre-bin.env.sh
deleted file mode 100644
index a52547ca506f..000000000000
--- a/dev-java/oracle-jre-bin/files/oracle-jre-bin.env.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-VERSION="Oracle JRE ${PV}"
-JAVA_HOME="${EPREFIX}/opt/${P}"
-JDK_HOME="${EPREFIX}/opt/${P}"
-JAVAC="\${JAVA_HOME}/bin/javac"
-PATH="\${JAVA_HOME}/bin"
-ROOTPATH="\${JAVA_HOME}/bin"
-LDPATH="\${JAVA_HOME}/lib/$(get_system_arch)/:\${JAVA_HOME}/lib/$(get_system_arch)/server/"
-MANPATH="${EPREFIX}/opt/${P}/man"
-PROVIDES_TYPE="JRE"
-PROVIDES_VERSION="${SLOT}"
-BOOTCLASSPATH="\${JAVA_HOME}/lib/resources.jar:\${JAVA_HOME}/lib/rt.jar:\${JAVA_HOME}/lib/sunrsasign.jar:\${JAVA_HOME}/lib/jsse.jar:\${JAVA_HOME}/lib/jce.jar:\${JAVA_HOME}/lib/charsets.jar:\${JAVA_HOME}/classes"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/oracle-jre-bin/metadata.xml b/dev-java/oracle-jre-bin/metadata.xml
deleted file mode 100644
index 121d93f8f12e..000000000000
--- a/dev-java/oracle-jre-bin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="commercial">Install features requiring a commercial license for production use</flag>
-    <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
-    <flag name="javafx">Install JavaFX libraries</flag>
-    <flag name="jce">Install Java Cryptographic Extension Unlimited Strength Jurisdiction Policy Files</flag>
-  </use>
-</pkgmetadata>
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
deleted file mode 100644
index b7d97ab8a11c..000000000000
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.202.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2019 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="bindist 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/pdf-renderer/Manifest b/dev-java/pdf-renderer/Manifest
index c8547d7444bb..6e693b86984c 100644
--- a/dev-java/pdf-renderer/Manifest
+++ b/dev-java/pdf-renderer/Manifest
@@ -1,5 +1,3 @@
-DIST PDFRenderer-full-0.9.1.zip 3877379 BLAKE2B fb8db9b4accdb18e423c2b4d659af07fd3f750e61e87cf047972807cd0774d5c1e04c15a9678efcd138b1c207770edf7b565468f3e8de50f21f89bc0fba4c71e SHA512 a678b7f89068890a00317a84557c659b4401450a94d8f7776df652715891a4c41ab138dbfd35093197848635e44ca2e3a114465a6049e746df87ab668ea74a17
 DIST pdf-renderer-1.0.5-sources.jar 1736806 BLAKE2B b897d4f30ae0143a6eb7c3499c5d7c165cd4e81c950fbe3185066d5ab6dbe68d874a5ff7561d35a65e014a6d8b82f92de73574018f58dd3817a32488c5b09ed7 SHA512 086355441df0d59306839de3097d1e557870435dcb4ee878d4e7f3f46352a103ecfc1da4055f107c2c53a61f815f985f3e1e176dc9f99634afd58cf1faca940b
-EBUILD pdf-renderer-0.9.1.ebuild 775 BLAKE2B b16adbb2a0a2bb0c93521ac40b5b6a6915085a5f346bd06096d04216a15bd3e7eaec0b1821252783fb7bac50b21f8f879f64a01c6593ef1efb91e3e5ef9fce88 SHA512 27aa46678a3f31242ca0658a89a1f09bcca494fe77f1c9118224e621c7cefd40384ba6a2aed688e36506f6d354cfb9e15c38f477d26ce0cd7def19792b6bebc3
-EBUILD pdf-renderer-1.0.5.ebuild 511 BLAKE2B 2cddb4256d5c1a4479d878474429e3cf916399a75493438cbaabbad72386ccce090f35ad948be28ff8b5fb79acb2d3b1001758de8b4b2d10614bc210e2eb0172 SHA512 3266d368b3ec55923a87cd4ee5b40356baf33c247bff442a062580086c8b26eca290e97f0b3a32fd403d9a9928bc37380f8c9f33d4dc2237979028f52ecacb00
+EBUILD pdf-renderer-1.0.5.ebuild 510 BLAKE2B a32c1ded27a21c2ebc2441ea17244c14042ed7e14d63205f7a8034ab4d6019ba0a5cf3a62c421f9300ced5a07ccfb6319876780f26bd10bce35d8d82b3c10803 SHA512 a90db5250b1bb984889eea66861c1718699714b49b59448cd667e43727d0fd90365ad4e028ba369391c408dd3afa6980a433ae63d99359a6e2262bfd8a0affc2
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/pdf-renderer/pdf-renderer-0.9.1.ebuild b/dev-java/pdf-renderer/pdf-renderer-0.9.1.ebuild
deleted file mode 100644
index 835e3e6b6624..000000000000
--- a/dev-java/pdf-renderer/pdf-renderer-0.9.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="a 100% Java PDF renderer and viewer"
-HOMEPAGE="https://pdf-renderer.dev.java.net/"
-SRC_URI="http://java.net/projects/${PN}/downloads/download/PDFRenderer-full-${PV}.zip"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.5"
-DEPEND="
-	>=virtual/jdk-1.5
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-java_prepare() {
-	find -name '*.jar' -exec rm -v {} + || die
-}
-
-# There is a test target (default from Netbeans)
-# but no junit code
-
-src_install() {
-	java-pkg_dojar dist/*.jar
-
-	use doc && java-pkg_dojavadoc dist/javadoc
-	use source && java-pkg_dosrc src/com
-}
diff --git a/dev-java/pdf-renderer/pdf-renderer-1.0.5.ebuild b/dev-java/pdf-renderer/pdf-renderer-1.0.5.ebuild
index bc86a6023c2d..822016676742 100644
--- a/dev-java/pdf-renderer/pdf-renderer-1.0.5.ebuild
+++ b/dev-java/pdf-renderer/pdf-renderer-1.0.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://repo1.maven.org/maven2/org/swinglabs/${PN}/${PV}/${P}-sources.ja
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/rxtx/Manifest b/dev-java/rxtx/Manifest
index 656b0b80ce5a..60cfba9903ce 100644
--- a/dev-java/rxtx/Manifest
+++ b/dev-java/rxtx/Manifest
@@ -4,6 +4,5 @@ AUX rxtx-2.1-7r2-nouts.diff 3583 BLAKE2B a92f5459ec2309f941ca7f8c3437a1c392da069
 AUX rxtx-2.2_pre2-add-ttyACM.patch 328 BLAKE2B 93e5ddca58bf3886c1ed7d34ef6e718d844eb067b55d9ff4fde7faa083735b135a853ebad7f9baf9ce1877fbc5cc3ce9bbd88b342aac4f040a2c0b6045629b99 SHA512 c81ae4e3f6fe09722709b6a9ae09fd3a300c9ef94641a3aa9f821b6fd4e4c28f15e9f672d2bfe6b51715f9e6b2caa5f637be20a76027cb31098062f60a0b0d0f
 AUX rxtx-2.2_pre2-limits.patch 272 BLAKE2B 8f49c4a9dbf852f444a742ab3b2b5c846d3d0035307415dd3b4ba34bf3a37179e82d63e04eeb3b553e678fcfc5d0cc3ab0651fdcbf6be20228e35d13db3bf1b0 SHA512 0e4d5b8e622515c75613aeb8c5e4fc1786f1c05ef2619b65c4b1060776933172479957b9f9a15195c79f10c90a1802956eac32cd60939b9b0a15540901e62180
 DIST rxtx-2.2pre2.zip 1491209 BLAKE2B fe115833ee89cfe9a3ae58117ac4a4326e8f79e6fdc0528cb8dd2824e231c862e4b421c94784059e4cf03f6cc93a32636444916a5c8cebe002da470b460bf23b SHA512 cd94bd08bc8b5689fc9a0e539f17645f530a3a280998e9838a2e4c8b3386f2b00a592ab41c07bd720eadf26fddb324bf80d8f7b9ecb35ea8507120c16048f514
-EBUILD rxtx-2.2_pre2-r1.ebuild 2227 BLAKE2B 5d1452dbaddce8f467f46ed44a789e10dfa2717e6683c6823319129fea5960603a078795b7d75f2fd9db144b6ec331da9d14d9418928ff2dd383ff7c57f66271 SHA512 4a97e69b8601c3ec5ced216f3236c5e564fe2edc91f813ac0a620bd602b07bbc15d471c6f10c3d05d4a6720e12d914d0236e228723ad74f607f7a46dec6e6c1d
-EBUILD rxtx-2.2_pre2.ebuild 2300 BLAKE2B bac12b8d60a71184581a8c6fd72e02aae1d13359bdd47cd06599edd82c4e30e690556e4271ddb746a9db1f8da073cb58a3020d4213223bf67693125fb11f5c88 SHA512 04eea992fa9f8553ecd4fa8eef777db949996bfae176ed8f23e575034d334c1eff3ebb783452899edefbabae459ac04e5c59ca41fadb78ff530ce90d4191ed70
+EBUILD rxtx-2.2_pre2-r1.ebuild 2222 BLAKE2B f94fffc150c4ec4fec5788ac72156208bfedad321ebf40b220b1abc98e31be3df6ad22705b6491df61028e0fd79e9cca453f5a989322006ebf153b53b6da34b9 SHA512 92a9461b5789013746a149a11d3d52e2476933200b127975c64c6969751193919fe70ff7b871ae0e1b6c59f7ac4d3292d66ad9fdf3a189766e428254db7ede12
 MISC metadata.xml 333 BLAKE2B 1863349617d00ca1b5076d4a8f626e43afbe0be700385cd46a4c6a9636486ce100cb916ac6013b6fe8de41bc69dae4bfd95f96c60c960ca04730411e90fdb94d SHA512 fa687c6a61c8be4e5b80f14b9eb6ef7637f9de649e3c35dd81f81096c1bbafe67ee5979c551d958422fdbff1ebb08b43a1630d9cbdf283e56c4ea5aca1cd3ac7
diff --git a/dev-java/rxtx/rxtx-2.2_pre2-r1.ebuild b/dev-java/rxtx/rxtx-2.2_pre2-r1.ebuild
index 4a59306f198f..250fe5e92412 100644
--- a/dev-java/rxtx/rxtx-2.2_pre2-r1.ebuild
+++ b/dev-java/rxtx/rxtx-2.2_pre2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ HOMEPAGE="http://rxtx.qbang.org/"
 SRC_URI="ftp://ftp.qbang.org/pub/rxtx/${MY_P}.zip"
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="lfd"
 
 RDEPEND=">=virtual/jre-1.6
diff --git a/dev-java/rxtx/rxtx-2.2_pre2.ebuild b/dev-java/rxtx/rxtx-2.2_pre2.ebuild
deleted file mode 100644
index 906a1b6e0471..000000000000
--- a/dev-java/rxtx/rxtx-2.2_pre2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs versionator autotools java-pkg-2
-
-MY_PV="$(delete_version_separator 2)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Native lib providing serial and parallel communication for Java"
-HOMEPAGE="http://rxtx.qbang.org/"
-SRC_URI="ftp://ftp.qbang.org/pub/rxtx/${MY_P}.zip"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="amd64 x86"
-IUSE="doc source lfd"
-
-RDEPEND=">=virtual/jre-1.4"
-
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	dev-java/ant-core
-	lfd? ( sys-apps/xinetd )
-	source? ( app-arch/zip )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# some minor fixes
-	sed -i -e "s:UTS_RELEASE::g" configure.in || die
-	sed -i -e "s:|1.5\*:|1.5*|1.6*|1.7*:g" configure.in || die
-	sed -i -e "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g" configure.in || die
-	sed -i -e "s:\(\$(JAVADOC)\):\1 -d api:g" Makefile.am || die
-
-	# some patches
-	epatch "${FILESDIR}/${PN}-2.1-7r2-lfd.diff"
-	epatch "${FILESDIR}/${PN}-2.1-7r2-nouts.diff"
-	epatch "${FILESDIR}/${P}-add-ttyACM.patch"
-
-	# update autotools stuff
-	rm acinclude.m4
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		$(use_enable lfd lockfile_server)
-}
-
-src_compile() {
-	emake
-
-	if use lfd ; then
-		# see INSTALL in src/ldf
-		$(tc-getCC) ${LDFLAGS} ${CFLAGS} src/lfd/lockdaemon.c -o src/lfd/in.lfd || die "compiling lfd failed"
-	fi
-
-	if use doc ; then
-		emake docs
-	fi
-
-	#Fix for src zip creation
-	if use source ; then
-		mkdir -p src_with_pkg/gnu
-		ln -s ../../src src_with_pkg/gnu/io
-	fi
-}
-
-src_install() {
-	java-pkg_dojar RXTXcomm.jar
-	java-pkg_doso ${CHOST}/.libs/*.so
-
-	dodoc AUTHORS ChangeLog INSTALL PORTING TODO SerialPortInstructions.txt
-	dohtml RMISecurityManager.html
-
-	if use lfd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/lockfiled.xinetd" lfd
-		dosbin src/lfd/in.lfd
-		dodoc src/lfd/LockFileServer.rfc
-	fi
-
-	use doc && java-pkg_dojavadoc api
-	use source && java-pkg_dosrc src_with_pkg/gnu
-}
-
-pkg_postinst() {
-	if use lfd ; then
-		elog "Don't forget to enable the LockFileServer"
-		elog "daemon (lfd) in /etc/xinetd.d/lfd"
-	else
-		elog "RXTX uses UUCP style device-locks. You should"
-		elog "add every user who needs to access serial ports"
-		elog "to the 'uucp' group:"
-		elog
-		elog "    usermod -aG uucp <user>"
-	fi
-}
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index f8e5acf21950..6f92c213849b 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -1,4 +1,4 @@
-AUX as-needed-and-flag-fixes-3.6.patch 7755 BLAKE2B 8e15b6cba2fa403b63647eab5e9b1ffc293d6db67cac2c2ecdc437cbe540433ef4077a333e9290a36c9615204a8361864b322442be9030e66d4d8bfa1569a8ed SHA512 9c2061b82d0a9a10fc99500ea27192cbf74001ab48254f528f00c15ca28e56de697c3861975691d0f8e4d6079a77236a8389ba07612c98031297e3289f4bf083
+AUX as-needed-and-flag-fixes-3.6.patch 7761 BLAKE2B aed8b1b1060d8e8b762386eb43f498a498a802bc9dd0c01d25def325552aadceedc07852e0ca9da488d9650b12b1c107f82d76248789dc95048e7e10e396100b SHA512 c28571145d6e4dcaa0fef8ff1c4837d3e6f98060ac71f72ac6693102d43ce1dcff94782185272933e10bea37c81fe086de298ae19a5abd36ba12a7cfcf295b51
 AUX build.xml 458 BLAKE2B 5e37fe8b8428e23f477c2767a2a96b1dc02aa6a8d4caa70b9f900c84d734f72665bb7cfeb7fd24dd6b54189ef4a242b1a6b9ab9d4d0bb0b370d59b491f09d2bd SHA512 49f3a4cc04d4d9cf0609aa97e01fa409a8f2dbb953ab3a52bc9984799d0bf4092d2a63fe665d8ba6ca0428089984b6ef47bc78900c613373ca1a7b588f6c5525
 AUX swt-3.7-manifest 750 BLAKE2B b0182c7e25e66be2443e3dcf0d64be1a92b836b8cd461cd6a92e7b73985a91a0c853fb8a3b784fa1edb70e2261f4a94e7273a505e4b130fcfe7b1c372b41efa1 SHA512 e4f6aa5ce58cdc697c234a2a4be43de0510d3c082a2737627a35df74d378a50edc0f7d3e62221f402eed602fcdc50fa7eff969b12602189fd400e1f1580f0d8f
 AUX swt-3.7.2-gio_launch-URI-x86.patch 4287 BLAKE2B 54c55cd48cb4f4d64deae90769aa84b7d2785c070c2e5b3e647037ca986d152b8ea71bb58c0d9749e8efb50fca53ab3fc9dbb4ae4355a86dc2285f253e74e064 SHA512 c82364b7e7bc255ed592a254201346a4159789ddbf486f22c026fdefce3f0d26bc91b42535228050eee4ec9b4e7a840008b60b2c7cb98896d6b8f1d875b5bef7
@@ -21,8 +21,8 @@ DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee63
 DIST swt-4.2-gtk-linux-ppc64.zip 5935799 BLAKE2B 6b1ca0d25d81134239e56ead673303075b6d9c5f20e4ab07fb7b5b87d54582023d02c28a1d330fd40d647bdbc27823ca7b184837cb974706ee13809ebdfd2db4 SHA512 bedd64099380980a6dbe47b86f4719666366680f7580150f97282c6f6b6acc95822493469e950e8fcbc9c584f6fca9f35a59937551ae8b6e799b188dc3751e9d
 DIST swt-4.2-gtk-linux-x86.zip 5561088 BLAKE2B cf8bda6a48d5d8e389c387162bf2aafde5a95c43d76e444a4b79008e1154348d2c99850851b3d0e428890e6b2da1e4bec53a7f9050169ad4866a5a8352e9ed2b SHA512 e3d53bcd0521411c40f4c37719917f3570a17fb3ea5c617560986273fd155b99d9b0790ba27c57da26663d49ebec4c6a8387b41bd01b0ba934b21724ba98e133
 DIST swt-4.2-gtk-linux-x86_64.zip 5867140 BLAKE2B 994bf18799297529329637c1b9ebf15638187339b4f56bf8cc1dedfc97c25a1ea4a1664605cac1374fe3d79b321dc450c6129ebef00ddd6f9507f238b7836316 SHA512 56c5ec4ca2ddeed5256dd6ff350dc3911034ecbc414a06ba879f04ab53d6380ca9da9037097f76228ca8182f6076bcd9cc4cb9b01c10766c10048e6576fc5f50
-EBUILD swt-3.7.2-r3.ebuild 4392 BLAKE2B 70df10c87dc15097c330b521eac0348c19778bc9b2abd3868c3b4faa488b1ca6727411df26ea9226173c1d59f94cc2e6137a1e7532ccbb641b1e5eeb0c8b1445 SHA512 83a6562632fe653c556084bf1413fae2be1b8fd0351241e4b5198d317cca2cc753d6798a74fcccbc5c2b50f088ad02ad6989183ca94bcb1d1ef26a8f74f52310
+EBUILD swt-3.7.2-r3.ebuild 4437 BLAKE2B f488c4f50f7019580f29cbbc374d440444a699934193db8f6251d76c2342c5a26a5b65cc7c993ffb90155f771bc9039075b6a202c06d98abbdf7a2ff5959f63a SHA512 afdf8e0de244d457b4aa857bc1f045d0a3aa304158ece0a147c7b20308a27c79b5f614dd7ab0143c4372f7155679019cd972ab28a997cd9fe666f0d2985ea21b
 EBUILD swt-3.8.2-r3.ebuild 4240 BLAKE2B 200a47aee302fb32a3fb8000177d036e426d929e20ad5646879e252e10a8537bc87902951f4f2bf4380a430ce8031e576bd36bc3db810bc3ec8bc8db62b10b7b SHA512 15b59cee721bb901ca2e3ca8697c813747f345387bc31fcb397da152c131b7a70fd8f3d740c71bda54bc51f11f9458ed4d41179907f77ee29af8b3c3e2791ba2
-EBUILD swt-4.10.ebuild 4592 BLAKE2B 67488fd6d7b6ad25efcc2aeec388851d6d8e10c7ce067694147d97beb3f55b182fff6c58b8b93d8c0c6900ec2d3169225e965b7c7d973106af4667e9485e8462 SHA512 5adb2848bff4d4a22b319975d59cae88fade7f3e16db1d5b34ac4e2c1c542644ada45695f929421d9339d482bbbee0572ae3001bf6d2d5d99da0e643ed2d7876
+EBUILD swt-4.10.ebuild 4620 BLAKE2B 4a9c169e7ed2c3c9fc124ba5ebca315dd923336e2bb5ec30aa4e73f58222db72495e0d92af1a6939ba9a085df8062b4834033713cd94071135aff910a798a831 SHA512 d9c92cc3bbc5741a942c284a9bf4f63783ce7f495d2db582ee9ce09739a61d4d7bcc868c979d53b405e789dc09983565cf0e82c8563f5eaa4fad811020689bff
 EBUILD swt-4.2-r4.ebuild 4489 BLAKE2B ac412f8ae913a503bc5e5264a6f28967bfcab630351c0a571df3f7cd8c45c7847ad5c5d66302ab97f8ff66207d21000c85387c268092b0080bcdb92a7c47a705 SHA512 2629590b0679a5372f1974c7f5644e576497b1282672d3902fa680dfc9d302148b9a3049a23f9de2c0014a65f93a644146ed33ed1f5ca4161307867f9e87ad8f
 MISC metadata.xml 518 BLAKE2B a325a8cd71c85886ffabde744769f9edfac99311d30be502937ff560e3cdced76c92a4a90979e0d46950fa2f345d2364d21902ee13fefa4d78477bb829e6298f SHA512 088a1c3b97e2496e801234ef5a99ce14bb259f8065545e4be1af65e6e5639c273a88a77ed50c414e35c20f62e7b5183c721321a0e463ffb990dba05ea271251e
diff --git a/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch b/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch
index 16194fdc5f51..fba4a36aaf1c 100644
--- a/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch
+++ b/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch
@@ -1,5 +1,5 @@
---- make_linux.mak~	2010-06-08 17:30:58.000000000 +0000
-+++ make_linux.mak	2010-08-09 22:48:01.515433721 +0000
+--- a/make_linux.mak	2010-06-08 17:30:58.000000000 +0000
++++ b/make_linux.mak	2010-08-09 22:48:01.515433721 +0000
 @@ -66,7 +66,7 @@
  # Uncomment for Native Stats tool
  #NATIVE_STATS = -DNATIVE_STATS
@@ -124,8 +124,8 @@
  
  glx.o: glx.c 
  	$(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
---- make_freebsd.mak~	2010-06-08 17:30:58.000000000 +0000
-+++ make_freebsd.mak	2010-08-09 22:50:26.173246263 +0000
+--- a/make_freebsd.mak	2010-06-08 17:30:58.000000000 +0000
++++ b/make_freebsd.mak	2010-08-09 22:50:26.173246263 +0000
 @@ -64,7 +64,7 @@
  # Uncomment for Native Stats tool
  #NATIVE_STATS = -DNATIVE_STATS
diff --git a/dev-java/swt/swt-3.7.2-r3.ebuild b/dev-java/swt/swt-3.7.2-r3.ebuild
index 1da53e158609..24e69a974015 100644
--- a/dev-java/swt/swt-3.7.2-r3.ebuild
+++ b/dev-java/swt/swt-3.7.2-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+inherit java-pkg-2 java-ant-2 java-osgi toolchain-funcs
 
 MY_PV="${PV/_rc/RC}"
 MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800"
@@ -33,10 +33,12 @@ COMMON_DEPEND="
 		virtual/glu
 		virtual/opengl
 	)"
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
 	app-arch/unzip
-	virtual/jdk:1.8
 	virtual/pkgconfig
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/jdk:1.8
 	x11-base/xorg-proto
 	x11-libs/libX11
 	x11-libs/libXrender
@@ -48,7 +50,12 @@ RDEPEND="${COMMON_DEPEND}
 S="${WORKDIR}"
 
 # JNI libraries don't need SONAME, bug #253756
-QA_SONAME="usr/$(get_libdir)/libswt-.*.so"
+QA_SONAME="usr/lib.*/libswt-.*.so"
+
+PATCHES=(
+	# Fix Makefiles to respect flags and work with --as-needed
+	"${FILESDIR}"/as-needed-and-flag-fixes-3.6.patch
+)
 
 src_unpack() {
 	local DISTFILE=${A}
@@ -59,18 +66,17 @@ src_unpack() {
 	rm -rf about_files/ || die
 }
 
-java_prepare() {
+src_prepare() {
 	# Replace the build.xml to allow compilation without Eclipse tasks
 	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
 	mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
 
-	# Fix Makefiles to respect flags and work with --as-needed
-	epatch "${FILESDIR}"/as-needed-and-flag-fixes-3.6.patch
-
 	case ${ARCH} in
-		ppc|x86) epatch "${FILESDIR}"/${P}-gio_launch-URI-x86.patch ;;
-		*)       epatch "${FILESDIR}"/${P}-gio_launch-URI.patch ;;
+		ppc|x86) eapply "${FILESDIR}"/${P}-gio_launch-URI-x86.patch ;;
+		*)       eapply "${FILESDIR}"/${P}-gio_launch-URI.patch ;;
 	esac
+
+	default
 }
 
 src_compile() {
@@ -131,7 +137,7 @@ src_compile() {
 	eant compile
 
 	einfo "Copying missing files"
-	cp -i "${S}/version.txt" "${S}/build/version.txt"
+	cp -i "${S}/version.txt" "${S}/build/version.txt" || die
 	cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
 		"${S}/build/org/eclipse/swt/internal/" || die
 
@@ -146,13 +152,14 @@ src_install() {
 
 	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
 	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF" || die
 	use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF" || die
 	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
 
 	java-pkg_sointo /usr/$(get_libdir)
 	java-pkg_doso *.so
 
-	dohtml about.html
+	docinto html
+	dodoc about.html
 }
diff --git a/dev-java/swt/swt-4.10.ebuild b/dev-java/swt/swt-4.10.ebuild
index 4b2c5aafc0e2..a029c5bc5084 100644
--- a/dev-java/swt/swt-4.10.ebuild
+++ b/dev-java/swt/swt-4.10.ebuild
@@ -88,7 +88,8 @@ src_compile() {
 	local AWT_ARCH
 	local JAWTSO="libjawt.so"
 	if [[ $(tc-arch) == 'ppc64' ]] ; then
-		AWT_ARCH="ppc64"
+		# no big-endian support
+		AWT_ARCH="ppc64le"
 	else
 		AWT_ARCH="amd64"
 	fi
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 4630d40ec677..1bacab44fb5e 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -9,11 +9,15 @@ DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
 DIST apache-tomcat-7.0.105-src.tar.gz 5312024 BLAKE2B 0eaad66c6dcc3e2f6a2d8e142a7832cbd413724cab8b10f00e87d5535f4f20d5ba4712794e09444a8b3e0cf23f036da7c6923f038a6a11714682b129ed4ac5dd SHA512 249e039775e833d75b631cec26132b42e4aed25491a29f2349fa41b81737688b0a2e453072d8e3c5fc28763a9d1922f59da7529378ce8fd472eca7bbc73a6bd2
 DIST apache-tomcat-8.5.57-src.tar.gz 5730658 BLAKE2B f9bd2e159abc6af62c8681c38ea4eae8155f95df11f7c244e45018929189ef6b6a37a11e84119c3ddcb134a8ab58773add19cbab7506bb87c43b0039899fde60 SHA512 8bf4334b190c36900b708ee7097097e513f2d4572f119173bee732c76b5b660350fe516e58ac867250c2ef7a1371b55c116d3a1abd18323ceb92337f1dcb0f60
+DIST apache-tomcat-8.5.58-src.tar.gz 5773000 BLAKE2B e361cc359f86bb02fa4c39ebd51b52b4552aa78603c4d8fa5c5c8d87bcb89f6ed391408e3713a5011b7b8cc29506ad65f25b6047ec1009267ce8a68d396b3bc6 SHA512 f9e21c0c60b80e1a15049ff4ee6a4914036d19ed171c40bc614fc999c81c59c394c0a6595ac969a5b86662fa6c366676e7ecb2695c28518473b3f6c79e9a0e05
 DIST apache-tomcat-9.0.37-src.tar.gz 5894559 BLAKE2B 63148418ef96e90f212ce8a00dc6a274a8da2a1aa8a53ad0f6d3960efc8e876dd2812f425c0f21c73ee291752c5fd3bc8025eed46d18d31ae72e8bbe6dc1ba10 SHA512 6e819fe255c467b0081e91c17a53fa383fe84d922492c62d7dd93cabf00e22ab30872ecaa298a9b12977b8c7518f36c8429091b24c9fb5200db64e80e853ce98
+DIST apache-tomcat-9.0.38-src.tar.gz 5948083 BLAKE2B ac076684f10a51bf0e0b5b0dbf18ee476ec900bead0089010de7b4a7d380a1e18035eaa0d0f661c863aa53491e51f719c2a5985e4791bcc9dada4c421db39fe7 SHA512 13c79abed71ead564b108ec8a046e78374611acd906f4b6e775ac0427446117192be6b25f29894e625e2dc13f79abbc97bc52b32120ce5701cbe0f5ae05bc57b
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1001 BLAKE2B c3a337a341d14d193e0b409e2ae751ad7e2f4d7dcff941e28c4eb7ef4d614ae5f626235bf7cfdeb56eaf3bba608913bf12bde46b2a9e576c7cf1d886c275336a SHA512 b36e97e60cb546ef2a980d1b9787dda5b21e5c788555d9a696ca166632315a870477fb8c52fa24c1698dcf43bb096201b6d4835113ec87192287eff9f5664e3b
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1437 BLAKE2B b4c1e56e9d529fe47a4705255bdde6845603605e473ed2e07d7fafe1b470123e7c186f8ca80ee98bf52ab43c504c0fff4ad996601646082735b7155a6cd4f928 SHA512 4d7033bd7aab26684b0e81d2f16eb1870813ea515f7024fe189469d48406a09fdd4a9497a89e254f8567c11f3a62c7e0d561246933bf07c242161c88daa31061
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 962 BLAKE2B 6abe44ba77bb16d78f1529cacbb95bfc439c63ba7cc3ee594209cb22927374e184edb90804ad1f55aa6721f98aa927f3bd8ca713463085233db1b233837acb07 SHA512 7a45a663f00ae5a71bea3002a72bd11a640583af44c0ab6a3dfbd6551bbf3a6de5f35e880643294c56027ecb3b7757425a2c26f34a96fbf8cd26df4a545086c0
 EBUILD tomcat-servlet-api-7.0.105.ebuild 906 BLAKE2B 275c28cec529a0e2eb3a1dfab4faca4a557555744ef8cf3a6b68c88fbd48233e67bd414c809d03aec790a33536117605d5c199a10f5224c15e07976d19384503 SHA512 37763c6d8945329c26fa0c3222b58ad5e5944fd35708a58c149269cdd1596bdca80db0c450a9db6604bca6ec87da4c9abc4f53fddf1decc94b25d4b9dfd7205f
 EBUILD tomcat-servlet-api-8.5.57.ebuild 1010 BLAKE2B a366fb083a2773dc36ea015153eeeb3938baa9f660f156ced603f854cf75b2ad515e8c0a900a1230b96c3eb99b9af8df130cb7c94208a1b0ecd6f1885b4c5813 SHA512 955beccf5a490a86c20fc3d77bb9aaf6e115ab2cebbb8a05b85ea4a8cb22cb1267fe323bfd0cd97576f8e581276e2f15d6f4cdd7e5fa9cbf62bb808b8c4759b9
+EBUILD tomcat-servlet-api-8.5.58.ebuild 1013 BLAKE2B 01c959704db8d43db38477022598b7806d864a368b06d07abade1e550efe7e8917fb9027cf2d4aea05dfdf3bac72bc50d613c8df5d219c4e6555b26a9d09e999 SHA512 8e27db7deeee4afa07ba50ad6e75e5065401095cf6fd6e4990ba9b32d2ce54ea83ce66b90b79709c156e555f9d60292208126670b901ff08b9a2b120ce20214f
 EBUILD tomcat-servlet-api-9.0.37.ebuild 1012 BLAKE2B 0bfd9e19febd187f1a79298e5c051e8eba1bb4f72c64cda5bd90f64b34772b851008241b3866ebcec0a59aee0c0d4d29d2b883ce2f9c9a3253280e58577fe3b6 SHA512 4831af547dce2d5372fb7fe9f79cbb2bafc1c5bba3435477adf71c06ebf9498792f06e2ae321bab32a4cbad6eef64961c1bf6c4db611c796f036bdc5ff8bcde7
+EBUILD tomcat-servlet-api-9.0.38.ebuild 1013 BLAKE2B a4d9758bbc5144a2f1bd07e5b6f9f52669e93fb659157e094d8b18b20c789206a90998ab288289d08585660604a4f1fd2741fc7184365c147d9155cf56ce0e05 SHA512 b3be9c5ceeed3c2f52e6861b1d353b213b77a3b5eb0828060a69ae97b1b481b523baf644e1c73322266492b6f58bf724ef5a992b58215a4ef83ce2f47bf3cc1a
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.58.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.58.ebuild
new file mode 100644
index 000000000000..bfc2b5c24170
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.58.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.38.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.38.ebuild
new file mode 100644
index 000000000000..7adcc0c40e9f
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.38.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${PN}-${PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/xsdlib/Manifest b/dev-java/xsdlib/Manifest
index d7dfdc73fa8a..c409e31573df 100644
--- a/dev-java/xsdlib/Manifest
+++ b/dev-java/xsdlib/Manifest
@@ -1,3 +1,3 @@
 DIST xsdlib.20090415.zip 914126 BLAKE2B 7f8dc45c590606ece1775d08634f87bb7cd392c69c66204073d4867f925cf7159fe14b43cde6d59a72da90ab284d9a3adc0c4d6aa117ea5143eff8efc5bf6534 SHA512 479b20bb24c32f7a8bf548689cb6d7efc99e36d7f887d9e33b34b2e4707d74149ae1e312f7166a90acbd44422248729d6158a55d710616b656eb628cafc1e3f2
-EBUILD xsdlib-20090415.ebuild 1140 BLAKE2B 2930216d726b2555e39622a2973f1cd8e8ac0ea1d2a40bf5865989e1c4882ffadfa4bf7de00a84bb20251f8f25e6e9889c5fe8b5967ca334b84fa0a54bb79d0e SHA512 9097e2318b21b184c067a7ea2898b7229d802f75fb368cb4ff0393de35ea4fb473c8da09ea2fc7500df83f149576636407069e7b8c5c801b5ada87e2e61a38af
+EBUILD xsdlib-20090415.ebuild 1157 BLAKE2B c1573697f8119eb0b1b4162d39781eb1493e26ae1c4a69a83fc8f02a9a6d465bc2c862bf48dd1bb9069e20122e9f022c33eabca1c0ecac335ea8f06167767d44 SHA512 5d9cd42055027a5ea47cb394600edfaeb06bfe0b689d854d0beaf1aa6971fbd43e071ee09556b767f1b923fcc88e50355430396a64c575a4a4d6ffbe22a6cd7a
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/xsdlib/xsdlib-20090415.ebuild b/dev-java/xsdlib/xsdlib-20090415.ebuild
index 0cb2aba0120a..9be3fe0b7cb5 100644
--- a/dev-java/xsdlib/xsdlib-20090415.ebuild
+++ b/dev-java/xsdlib/xsdlib-20090415.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 
@@ -14,33 +14,33 @@ SRC_URI="http://java.net/downloads/msv/releases/${PN}.${PV}.zip"
 LICENSE="BSD Apache-1.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
 
 COMMON_DEP="
 	dev-java/xerces:2
 	dev-java/relaxng-datatype:0"
+BDEPEND="app-arch/unzip"
 RDEPEND="${COMMON_DEP}
 	>=virtual/jre-1.4"
 DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.4
-	app-arch/unzip"
+	>=virtual/jdk-1.4"
 
 S="${WORKDIR}/${P}"
 
-java_prepare() {
-	find -name '*.jar' -exec rm -v {} + || die
-}
-
 JAVA_SRC_DIR=( "src" "src-apache" )
 JAVA_GENTOO_CLASSPATH="relaxng-datatype,xerces-2"
 
+src_prepare() {
+	default
+	find -name '*.jar' -delete || die
+}
+
 src_compile() {
 	java-pkg-simple_src_compile
 
 	local dir; for dir in "${JAVA_SRC_DIR[@]}"; do
 		pushd ${dir} > /dev/null || die
-			jar -uf "${S}"/${PN}.jar $(find -name '*.properties') || die
-		popd > /dev/null
+		jar -uf "${S}"/${PN}.jar $(find -name '*.properties') || die
+		popd > /dev/null || die
 	done
 }
 
@@ -48,5 +48,6 @@ src_install() {
 	java-pkg-simple_src_install
 
 	dodoc README.txt
-	dohtml HowToUse.html
+	docinto html
+	dodoc HowToUse.html
 }
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-23 10:22:15 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-23 10:22:15 +0100
commit	8b4ace9c50842c5b83401ea7b179dcab940387e1 (patch)
tree	230f3135ceaace633cf93e9838b185c4a6664c2e /dev-java
parent	9ee6d97c2883d42f204a533a8bc1f4562df778fb (diff)