gentoo resync : 13.11.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-11-13 13:10:00 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-11-13 13:10:00 +0000
commit: e9d044d4b9b71200a96adfa280848858c0f468c9 (patch)
tree: 1bd8ef816043a8cd340f1d774e79553a1a7d31d8 /dev-java
parent: fc2f1018fc323ef2c6572734a9b130427cba76a6 (diff)
96 files changed, 2060 insertions, 406 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index d680f9173eb9..bbb07a7b6c61 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/animal-sniffer-annotations/Manifest b/dev-java/animal-sniffer-annotations/Manifest
index 11a521f6c735..2ef504e95f75 100644
--- a/dev-java/animal-sniffer-annotations/Manifest
+++ b/dev-java/animal-sniffer-annotations/Manifest
@@ -1,3 +1,3 @@
 DIST animal-sniffer-parent-1.15.tar.gz 77766 BLAKE2B 6d99959c457d032e69f5a5109dc9ae80660db0a3fa34e2ebfdd7e3941a33e19f0078a05f3c6d561760a89584b2826bca6ef40dd7f5ea943b32ae43a4f2ed403b SHA512 8d0f6baa86fcb79fc54b826eff0f7c390d236d3cfc285914d3645e3bd9c72612c039eb0f1c3c2a9fbaca43040d967a2a69e10a9e5713682d1e441e44f3b55eb1
-EBUILD animal-sniffer-annotations-1.15.ebuild 647 BLAKE2B 601078d6bb59c7a386d5ba9d5534c03e7c23617cc60b8b2d1b7045630f5f0f74a6745fcbc6f628b3ae4a8f99237c86a4ab454d8c69e5e9f8e39b1658f5558016 SHA512 e36300a5bfe835156b4474fc7b2ee0873a406376fbfbc1abc7cf29ef2709e074d6411a176e722d4c9cecb8a9deda9397f31780f0e98171c5d32b56283b86afc9
+EBUILD animal-sniffer-annotations-1.15.ebuild 645 BLAKE2B 16ed0faeecea74941c20bb0eb59dafa940263cad0dba9e4cc5724b9adc56789a4db1a93d8d21bb2ea3e75b94180a0a008957f60f2cd2f70a3240b17a9032ad44 SHA512 29b609d7357aa0a1dbd2075ec0e54dd762d5a0665cb9490f7bb8bc1791c4b2b284ecc81b030e6a7a6b3a1f64f565930ae1c0fbfec80cdf58b077e749600f654c
 MISC metadata.xml 325 BLAKE2B 96e92a307063c6d997316abf0b9395c65445907c3141313f07aa336eed839cb909f624bce9b67d6960c7703b79537e136beaf01025d7cf39dcbbe6262a0093f8 SHA512 032db77bc61e5e86c039cb49faa6d50363e4b94c0b14b2ef5192e8ee6fdba3592616e1970ad6f87d662ad01b187627e7b6fb6774664839fa549e76aa3e9bbe7b
diff --git a/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15.ebuild b/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15.ebuild
index 97a7b209dc8f..36f83951a32b 100644
--- a/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15.ebuild
+++ b/dev-java/animal-sniffer-annotations/animal-sniffer-annotations-1.15.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations/"
 SRC_URI="https://github.com/mojohaus/${MY_PN}/archive/${MY_PN}-parent-${PV}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.7"
 RDEPEND=">=virtual/jre-1.7"
diff --git a/dev-java/aopalliance/Manifest b/dev-java/aopalliance/Manifest
index 6be90d85aa6c..51c1d896fcfc 100644
--- a/dev-java/aopalliance/Manifest
+++ b/dev-java/aopalliance/Manifest
@@ -1,3 +1,3 @@
 DIST aopalliance-1.0-gentoo.tar.bz2 4203 BLAKE2B 193ef51f8670a0e659ff7d43e909629168c3840f205368ab31a00b07e1e0bd81c8fec2a0429dd4d2932dd7bc6f582c54708c4f118ad697b4f3b41ab999a322c7 SHA512 6761933b9c127af9773f518df89a905fd67696964837b8cb841664f16564bc879dcfbd5f47dcf85e999d4dd64561a3b46edac1c639471d3ee9be3237d9064187
-EBUILD aopalliance-1.0-r2.ebuild 891 BLAKE2B 041254a0ccb03d6280b0aaedd4d0b642f49f6825a74b6fd2b9ad03c8a1901547d166f7dc7d70a8c4d1e9f89c521d71415174fa4955bf5607308bf7a3ee685da3 SHA512 bbb01117a800615d77975a6accdd9fb16b5cdb016746bd9aa382e57315d475b0458889bff9c80602e4cd7cb11b4475eb61ab97416bf8f70bc51f6a0b799e8285
+EBUILD aopalliance-1.0-r2.ebuild 890 BLAKE2B 7dd8eddeb6a11069f34f9026401b700887b7aa63df62dd33b5f8b4f352c3b42d7aef23c7c263f9f595932e32c6fb9bd7b1698651f82deeb17385f990cf5048b4 SHA512 2719606a31795eb1b578c5bca2252f70507ae6653d539354dd5901c89e47905769a13fa29ed3a6467c9616570e03072de6501f4179b59e12f600ad6d24e40af0
 MISC metadata.xml 318 BLAKE2B 8f8307ee22954f2e845092c05b3552d9320a1ccb8421787a5373cbc0123e76ce2dacc93cfd6b83cec87b85927c95a674b28b81811ebd2223b78a1988c7904e4c SHA512 4307e863e3fabedc9971ae68ad8f1c46c2bef00e7daea5fc928c623caeb09424150b1f724dda149d755a7af1ddf22db065160e3dd11dc86b51ec32f6846d4d8d
diff --git a/dev-java/aopalliance/aopalliance-1.0-r2.ebuild b/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
index c4597d374e9b..a9adc6ec5c8e 100644
--- a/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
+++ b/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://aopalliance.sourceforge.net/"
 LICENSE="public-domain"
 SLOT="1"
 
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux"
 
 IUSE=""
 
diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index 4cc07deceb40..c2fd8ed7fc1f 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -1,6 +1,6 @@
 DIST asm-ASM_4_0.tar.gz 14789505 BLAKE2B 62b49d904f1ef2d32379f4f5d644cdc274b30f292ee4f64ad02be7d2226a90965f7b12421700e79dcd1e67a46e6a8543d5e353486a1577313616688ddc57f3b3 SHA512 e654623a882d9fe414e71861183f64840f7b6629231864872497d4bf9274e8ac05e05496593fa54a90d8c6a2e6d701b9a6f3876df611637f7d2079c5519def1e
 DIST asm-ASM_5_1.tar.gz 16258842 BLAKE2B bd7d717cdfa6ff652c96b88d7b7d33fae614acba390c256ea72ecfbb3edc48382621a076dedf9b8728fdb1d0961cda943f165f99de840824b766c9af45a49339 SHA512 4bb32ce6eba267928261238f8f13cd2365ab374780039ad1df31698cd791645a370aca58c44270ec05f8377d6aa0a0d00f9f3890961cbd32a10cbd2e79e2d518
 DIST asm-ASM_9_2.tar.gz 1614845 BLAKE2B 3fc0fb45d0583b06371452d2df166ce53f81a114a386eda96fe3b0c748beffdd42791d59ddfb4c9ad368f73728f3382855a7336324b013e937c20a4f31cea44b SHA512 a0077e3c1ebbd8a841d3556be4363383951244ba87670af45a8565e14ad3ac94ab89a23b934b3609190e1b16dd9663798c01d1c859eddb2e825c41908c2e2afd
-EBUILD asm-5.1-r1.ebuild 1281 BLAKE2B 4b96ddb02de5c1fddf23646db0133774464554bf2957161e1d83c3bab9c3c9bc8fdbeeec67c04b2e2d83438fee807f44d8fb535baf750e6e4e413410a5045582 SHA512 fccc9bd86fe9e41469e2002c2c5ff9cb3bd53b6ba3d935195d92bb8ab771091290b3db0bfa3ce5a685480511a364d3c17a0f74ee08f6be16a1779b6e25f081df
+EBUILD asm-5.1-r1.ebuild 1280 BLAKE2B 9b4395b97760514e0f54c72ab1df3a0751991d13caf567a0441fb16c05f4a89559b1347b19a820ea79871123895a4f86431230fd41bd4735aa1e0d4e57c7d128 SHA512 78fa99694b9a1156a85067bab400bfb99f83f4908cd0e6f03eb64e067b15fe757f3cf4cd6b8b109227d6c42b1e3bc2900fc798d3e35d7323cf18a6dde9605c69
 EBUILD asm-9.2.ebuild 599 BLAKE2B cdcaf6910008f7b48257e11cfe495261a5b72650829c55c6944cb71e202128678c393fda65deb2c553c5ea2f012de7d0e94264d733ddae33555b11bda9baa05e SHA512 34811b7acbdf352e8e2776bca3524a9b97bddcb496bd9502bfbe073cc85b1c306599c209f92121e8fd63971fc35bf25873af2d5166f3a43fa440178e0f27610e
 MISC metadata.xml 1231 BLAKE2B c61d8566d1a337e99616013267474cf4fc92afdfed38f1c2183d41980528fd1b8994bd6ce5a06b4fa85f54819d560379bb1b505c62f26f7421bd1965cbcf7244 SHA512 c0b4d632146cab80755c18a6e15e9e9673c7adc60addac523bbf98e8fb0f771b526fbaa65906914984d27658a7ee390e90d164e855f5bc5601bfef7b89d902a2
diff --git a/dev-java/asm/asm-5.1-r1.ebuild b/dev-java/asm/asm-5.1-r1.ebuild
index cae7bdcc920f..ff2f2f95764b 100644
--- a/dev-java/asm/asm-5.1-r1.ebuild
+++ b/dev-java/asm/asm-5.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz htt
 
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~x64-macos"
 
 CDEPEND=""
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/aspectj/Manifest b/dev-java/aspectj/Manifest
index 1eceda11620c..f3364501c391 100644
--- a/dev-java/aspectj/Manifest
+++ b/dev-java/aspectj/Manifest
@@ -1,3 +1,5 @@
 DIST aspectj-1.9.6-src.jar 8616829 BLAKE2B adc12e181b2584287dd149657f0505b2d3ba877aa3e8cea1f2fd827b4d05c24728f120798019f1679ebafe850a8e68fa3db1467ac080c27692d5f81d31aebd48 SHA512 f15416a3921ef614ab8068c8ff8277f0fd3c177e9b277ac471786953615f1fe81638b8d13d77ebfe0643fdf089ee3cd5e718d522d2e588989a42df775f2a0516
+DIST aspectj-1.9.7.tar.gz 26472044 BLAKE2B a66605845e188903d50566df658fe636b8feb980bbafdc3b4c3e73e46558b24e4bbaf931790012266ac62bff70c3139f0034dafc7de4622827c0f09d4d626efa SHA512 5db2122d95e78056752bbca9adee72c0fa634963b4ea6979c0b75a9cc58b5ef4cf88b79ad640920363ebe7855311bedfa7e30eaba378274a0eebc31557dd57e7
 EBUILD aspectj-1.9.6.ebuild 1173 BLAKE2B 4c8d8cbce69324c37f5063c541a0908c8e329ddb89514358dff7a864038ebea551defce25fe001a05718d8021b4159e686fcb566b1a2a485ff0f553c089a8fd8 SHA512 6817518bc3776e7df086c81155c3d8d03dc135dd3bbc4ac3f598d1cade97c3f403aebeb4c7194a556b4e721d406debeb4b4b0e0e94726cacbb33bd262d7b7819
+EBUILD aspectj-1.9.7.ebuild 2315 BLAKE2B 5240251e776248d9933bc7c62808f84158cf6359b8225ae54b4fc9d98e3cf2eefe898386f9dc528626a1f26e36cf463753d6238ff42a5a96c75271be61877053 SHA512 bb7ecee75fb607bfcbc2c8103839d9311d00a9915e7bd01db8dd251e70a3626aeddc5e01ad98f3fb1e04d0f026bf6cdc3acc7800f0f597e8e43b25758cea880e
 MISC metadata.xml 383 BLAKE2B c149ffc9749aead74e303a161c98d052328b8e5a7fc5c7f81f4ca7ff51ba6a5ba6d3456131ddb53d8d6339c211646f689f8712021485fec300f29d83952fe606 SHA512 33d9e6df4103d1fd3f10dcd95780325178b8cdebe4f747ae1983239fc8273c1a5461c7a763a9447556e3fb9641af000789235aefb5933698590f340865c2b161
diff --git a/dev-java/aspectj/aspectj-1.9.7.ebuild b/dev-java/aspectj/aspectj-1.9.7.ebuild
new file mode 100644
index 000000000000..92f77bf5becd
--- /dev/null
+++ b/dev-java/aspectj/aspectj-1.9.7.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A seamless aspect-oriented extension to the Java programming language"
+HOMEPAGE="https://eclipse.org/aspectj/"
+SRC_URI="https://github.com/eclipse/org.aspectj/archive/refs/tags/V${PV//./_}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/asm:9
+	dev-java/commons-logging:0
+	dev-java/ant-apache-regexp:0"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+BDEPEND="app-arch/zip"
+
+S=${WORKDIR}/org.${P//./_}
+
+JAVA_GENTOO_CLASSPATH_EXTRA="aspectjweaver.jar"
+JAVA_GENTOO_CLASSPATH="commons-logging,asm-9,ant-apache-regexp"
+JAVA_ENCODING="iso8859-1"
+
+src_compile() {
+	JAVA_SRC_DIR=( {asm,bcel-builder,bridge,loadtime,org.aspectj.matcher,runtime,util,weaver}/src/main/java )
+	JAVA_RESOURCE_DIRS=( {bridge,org.aspectj.matcher,weaver}/src/main/resources )
+	JAVA_JAR_FILENAME="aspectjweaver.jar"
+	java-pkg-simple_src_compile
+	rm -rf target || die
+
+	JAVA_SRC_DIR=( runtime/src/main )
+	JAVA_JAR_FILENAME="aspectjrt.jar"
+	java-pkg-simple_src_compile
+	zip -d aspectjrt.jar *.dtd org/aspectj/{bridge,weaver}/* || die
+	rm -rf target || die
+
+	# package org.eclipse.core.resources does not exist
+	# package org.eclipse.core.runtime does not exist
+#	JAVA_SRC_DIR=( org/aspectj/{ajde,ajdt,apache,asm,bridge,internal,lang,org,runtime,tools,util,weaver} )
+#	JAVA_JAR_FILENAME="aspectjtools.jar"
+#	java-pkg-simple_src_compile
+
+	# bcel-verifier is needed for testing dev-java/asm:3
+	# should go away once aspectjtools.jar can be built (included there)
+	JAVA_SRC_DIR=( bcel-builder/verifier-src )
+	JAVA_JAR_FILENAME="bcel-verifier.jar"
+	java-pkg-simple_src_compile
+	rm -rf target || die
+
+	# once again for javadocs
+	if use doc; then
+		JAVA_SRC_DIR=( {asm,bcel-builder,bridge,loadtime,org.aspectj.matcher,runtime,util,weaver}/src/main/java )
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_install() {
+	java-pkg_dojar "aspectjweaver.jar"
+	java-pkg_dojar "aspectjrt.jar"
+#	java-pkg_dojar "aspectjtools.jar"
+	java-pkg_dojar "bcel-verifier.jar"
+
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+
+	if use source; then
+		java-pkg_dosrc "org"
+	fi
+}
diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest
index 193629b4af23..255aa6f9e9c2 100644
--- a/dev-java/bcprov/Manifest
+++ b/dev-java/bcprov/Manifest
@@ -8,5 +8,5 @@ EBUILD bcprov-1.50-r2.ebuild 1345 BLAKE2B 6e0103ebcfa6a52bdba02bb40f7085d0361b98
 EBUILD bcprov-1.50-r4.ebuild 1326 BLAKE2B dbd3892976d4eaff7e3af566e13c5f38d5b74bf27cbb3290f3846d560dd0393156c41e6fd92f435ca6bf6609692c195c75743f6c87698bf99cb843369ad7ee92 SHA512 7dfed9b2cae7ea3914278b7be298e517796d8623a33109dbb62ddc87b6d284bcaadf4f4b88d890a1bb8d9447c3b6dfdc80239bdf0b3d5b74e3b96bf99a9485f2
 EBUILD bcprov-1.52-r2.ebuild 1350 BLAKE2B 145f54219d8596d18127ceb1b626bae03bd4cceec442a1e04c5f8f64ce53017ddeb78e2dc33e9d781123e8392dbd249914cd9614f6da6c010665950b8fb1f6a1 SHA512 cd874722a978e52fda5ee92424cd8a0b430c9b9e4c6ab797fa1b0bd63cea199e0f40d4cb4ae1a62d2eb22921665e6580cebe7ec7f5c681ffc349f73b4d9cd334
 EBUILD bcprov-1.68-r2.ebuild 1166 BLAKE2B f8ffaf33eaa23a1ce5938a6b5f6412d605826536551735d919fe091aab221e6a4e70b1e23fa117098c3d6c2d316ea85061c86b373911e87a502a16a86d42dacf SHA512 3f992af0e197f0a020606b7023ea44354ffeffde3856cf1fc5711ee9c313cc129351134f92f666849110f164fe77405c1a2e58acc6279310374ef4dad9abf341
-EBUILD bcprov-1.69.ebuild 2469 BLAKE2B 037e181b2f575595135ed39f72a5def6b4498f64ecb483b3c85681076586dca3b3a7d58cd374bc2c90e21ed91ce86263bf94d054814479c9b1fc47326dd16a36 SHA512 eb0f703a83f7156f76ff460ed26a0c1754bdc41c2dbcff9df766167688930b2c4d20806d08dd8f539738f61eb5d8026ce183c60a20ea36c2a20a3f9ecde4602e
+EBUILD bcprov-1.69.ebuild 2756 BLAKE2B e0ba31cea128853e35eff55363c00766f0ddb63f007b9d1ce16491ef3038469d6bcd62684a52235a695a7873fcf84290c3afc036ea4a10216e5fd35755057072 SHA512 e58d7b357994f68492ce13db7c591e182894c908bfa811b787d20128881d0a65f2acf732111bea9fc60beb89ae9c0d50fa3b98a8b9968d6ea53f56ddf85716eb
 MISC metadata.xml 482 BLAKE2B 0afc6ceb6e81b57040e44020b919d226bd8d9ae3eb64bb4955a31c23f929712db16c0c2245dad2dbd7750ec20d0794af53ba05fc7411cf19445daee331b1f21d SHA512 1c342946be63fe9caf6905074d8590b60c1044ef8a6b89714a33b8e97f3ab70409748a697453d23f7b8d3c27ccf14dc8f3be84fb36cc5f810c30b54ce6118b06
diff --git a/dev-java/bcprov/bcprov-1.69.ebuild b/dev-java/bcprov/bcprov-1.69.ebuild
index 7849fe08b47e..81cc3229bc03 100644
--- a/dev-java/bcprov/bcprov-1.69.ebuild
+++ b/dev-java/bcprov/bcprov-1.69.ebuild
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source test"
 MAVEN_ID="org.bouncycastle:bcprov-jdk15on:1.69"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
-inherit java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple check-reqs
 
 DESCRIPTION="Java cryptography APIs"
 HOMEPAGE="https://www.bouncycastle.org/java.html"
@@ -55,12 +55,33 @@ JAVA_TEST_RUN_ONLY=(
 	"org.bouncycastle.util.encoders.test.AllTests"	# OK (15 tests)
 )
 
+check_env() {
+	if use test; then
+		# this is needed only for tests
+		CHECKREQS_MEMORY="1200M"
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_env
+}
+
+pkg_setup() {
+	check_env
+}
+
 src_prepare() {
 	default
 	cd ../ || die
 	java-pkg_clean
 }
 
+src_test() {
+	JAVA_TEST_EXTRA_ARGS+=" -Xmx${CHECKREQS_MEMORY}"
+	java-pkg-simple_src_test
+}
+
 src_install() {
 	default
 	einstalldocs
diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest
index db695a09abb8..5cdbc8630c85 100644
--- a/dev-java/commons-compress/Manifest
+++ b/dev-java/commons-compress/Manifest
@@ -1,6 +1,4 @@
 AUX commons-compress-1.21-asm7+.patch 7037 BLAKE2B 49270e040492c413fb9f26ce81dde2e7594a02b48d4dfd68bfe977eefc9d41e21e585d1a0d2e56803d08d1af617f8c2d0e3f3d3b0cffa893bfc8d2d3c50b6d9d SHA512 6722a9fb119d72c7061d12b94452fac40eef63be7610eee81ddc115c346610e5e4caca0cbf659ec9e7ff1a58f9def4ebfef26476b915bc74299a1f984d2eb29c
-DIST commons-compress-1.20-sources.tar.gz 12990994 BLAKE2B 5709419bc7b54ac9eee4ee9a42f2ecef9ae7ed0d4b1a91e0b79c791f4cf018aed8bff4ce507d1ef9136fdc28bd550d234632d0bb9ebe7819b57c5ce99694adb6 SHA512 1794bae69e00339d9e4d35b3276543ff6f9a0f1614ec9bd7c4ec8ff1bc86d08cd48e9dc3ec712b969cf8ccd61ef6054d0c6203d7cba0c28b22e6a3ecccd0c43e
 DIST commons-compress-1.21-sources.tar.gz 15165800 BLAKE2B 3fed32af039860c6b434c485f0c78939ed810a224a12680ddf1d9d6ed540f4e74530edd0e0077fd41af31404c296a607db912465cfd725c31446bc6fa7b8df8a SHA512 8041371b491057435ca62390e70b30031e4d21e80c37d9cb922fdffa794b56aee3b5d60d8241e4db0cecc28c82dfdaafbe52b2175e26062da169fec8efbb17e1
-EBUILD commons-compress-1.20.ebuild 1080 BLAKE2B 7f8ec8fd6bc9dd45e53cf4766a419bb2f74c9d3aad7de3641bdbc0c86cc67719e592dfb64583bc0a3df51f3b2b37264eade555133c4cf249a38b10a02bff6053 SHA512 a8f6cff1e9332f5ff83e58f01a6900dd81dcf51e190cc447fb92b0fd02f31583278b5d70aaa50ba114b4c04cffbce8af7d08db3ab2c0da7aacfe1fa1df628e00
-EBUILD commons-compress-1.21.ebuild 2361 BLAKE2B 84c3980c685abf58728d1b5e1c6ccc40780e16cb6237164751705c89bac091c7db69193025b831f624fcfa58c83b1a9a7762adca9b3a6a515ef8ec47af2a3844 SHA512 3c081300aad69e4b5e0cbc2cd8a318ef4b0826bbda4c275d637223b30919dec18122ba7138700a7681b2a51c429613f8814a694d405388834420d2ff52490333
+EBUILD commons-compress-1.21.ebuild 2359 BLAKE2B 3ada4105ca9905e512c4c94cbca7dad60e06650de876eaea6888684eea7356f7945dff494d1a9edae6a8631698238039c54ea3770effe896613c932f3ea73a5b SHA512 e244342e866f12920aa23e611ec7b2a382514c28f07d3417619388e8d2fd0005a4ebf8c4c4624d077cc9133fc15989a53ff4a90b3f30fccc3094937d497171de
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/commons-compress/commons-compress-1.20.ebuild b/dev-java/commons-compress/commons-compress-1.20.ebuild
deleted file mode 100644
index 2895ec27d09a..000000000000
--- a/dev-java/commons-compress/commons-compress-1.20.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://mirrors.supportex.net/apache//commons/compress/source/commons-compress-1.20-src.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild commons-compress-1.20.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.apache.commons:commons-compress:1.20"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java API for working with archive files"
-HOMEPAGE="https://commons.apache.org/proper/commons-compress/"
-SRC_URI="https://mirrors.supportex.net/apache//commons/compress/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-CDEPEND="
-	dev-java/brotli-dec:0
-	dev-java/xz-java:0
-	dev-java/zstd-jni:0
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CDEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_ENCODING="iso-8859-1"
-
-JAVA_GENTOO_CLASSPATH="brotli-dec,xz-java,zstd-jni"
-JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/commons-compress/commons-compress-1.21.ebuild b/dev-java/commons-compress/commons-compress-1.21.ebuild
index 3d5ac30baec0..1a63c66e8845 100644
--- a/dev-java/commons-compress/commons-compress-1.21.ebuild
+++ b/dev-java/commons-compress/commons-compress-1.21.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-compress/"
 SRC_URI="mirror://apache/commons/compress/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
index 3855b3c1a4c8..14c16e1ff1a9 100644
--- a/dev-java/dom4j/Manifest
+++ b/dev-java/dom4j/Manifest
@@ -5,5 +5,5 @@ DIST dom4j-2.1.3.tar.gz 565918 BLAKE2B d6f8c9ae22f84086491ca7e60e5498edda727b219
 DIST jaxen-1.2.0.jar 232455 BLAKE2B 6bd16e8ac34f3af1b9d61218dc6a29862178516cfbb98c6834bf6db846b537e44b48db6ff578b3d67d32c3e2b142e44440a2fdcc6dc06a6ea427b04e6bf1f370 SHA512 cad582fc12d0741e9e6fd7e0cf80a50feb04f5ef42043df96f8a5b78476c77695d8b43836d2241f76b35676ea759921edd25eaeb2c04ec916eb138aa2901ce5f
 EBUILD dom4j-1.6.1-r8.ebuild 1907 BLAKE2B c2802e3270130c27a14cbcd02dfb9228f73e29f39f9866521af5f870396e43a0745836c2279f16b8f4452bed47f2529ac9cb488aa7fe982602affd9ef5fc2f00 SHA512 843e5b3a520ab7ed50fe1ec926b34d5ef114c2dd5d3d7813f12fbd00c018ba791f98294aa300b8042bd6659c31e2e25ee407710c0f9e8a36f79eba7a4e3c603f
 EBUILD dom4j-1.6.1-r9.ebuild 1900 BLAKE2B 314238d8a36167053c0b148c429206b042b5fa14929edd7c92741131596fc24f39e668d165abcb26ea3b5b14363777f725a30893e2395ee57564a875b6cc2306 SHA512 30dab95cdb84bae7a4873be00f1d37f8f412a31f19748a02370071a94407c7d0de1dcdcaaee67aad7d1e024db24218b88d206d373e781b5d2e18154dab051cb1
-EBUILD dom4j-2.1.3.ebuild 2249 BLAKE2B 40adc7c304a6715c46ecb65166735b60f250193a8dd7f796155cf80f0192a0f13a35928c9316cf3a4e68b629a34ae78781fd2e882188f5dfe74d4f68f6fe4890 SHA512 d843698aff07affdfaf601b92ac6559e87fd233ca6bbb73ddeac060d6e185225db407062ca35e6bd1078f8965275c0b40dc9a31cafbc1aa34b302ae52363527c
+EBUILD dom4j-2.1.3.ebuild 2247 BLAKE2B 75f009a9e0a120978601965e07647c15bb348cca29f7763e38613b542f70d0e58fbefdf96ccf725fbe0da59d8cbbb1dac0865c083ef2e6e5825d48e98a63f7fc SHA512 2b7dd256d0fe31bb35a63fbb4575e0de62ac58248130b8dd6d4610938abaa26c26fb6b81da49273bb52e8320fa67ef9206ee0c4da2cb8907ef8047357ee2d7f6
 MISC metadata.xml 715 BLAKE2B c04caaffea1283ffce1b0057504dc0f1962cdab8c5f17ec933699b1731d75799ce969ee41b75f004d64de46b0be92cc36bd7147d4e06d1f53245a570264be0a8 SHA512 23834e036c2ff56e52bc5f7d2b4eb357dc438fd44245bf30bf2c2946a50b7872f07b2651df2ed4772235cf1457928c71fc1d993c6a7e9229e247fc15a279a456
diff --git a/dev-java/dom4j/dom4j-2.1.3.ebuild b/dev-java/dom4j/dom4j-2.1.3.ebuild
index da4825f390c5..48d0ffcb2cfa 100644
--- a/dev-java/dom4j/dom4j-2.1.3.ebuild
+++ b/dev-java/dom4j/dom4j-2.1.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/version-${PV}.tar.gz -
 
 LICENSE="dom4j"
 SLOT="1"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="jaxen"
 
 CDEPEND="
diff --git a/dev-java/error-prone-annotations/Manifest b/dev-java/error-prone-annotations/Manifest
index d83a5589c8ff..c5cfc2899213 100644
--- a/dev-java/error-prone-annotations/Manifest
+++ b/dev-java/error-prone-annotations/Manifest
@@ -1,3 +1,3 @@
 DIST error-prone-2.0.14.tar.gz 677991 BLAKE2B e247249b385b4d5ff46cd9faaeb88b7c2053204c17a2a81846c554e2eb95389a17ca340f02dbab187f7b9e297fb13c030912e49bfbe5b29c7158391b1a7c50da SHA512 0bf2c869638e03fea5395e2b84a690c42df320903e48a171537e68a60ae7a47a8a83de07fa0a8dfb03340c035878b4380fd6677ba3bf1d13eeffcfaee4e63658
-EBUILD error-prone-annotations-2.0.14.ebuild 603 BLAKE2B da8cecf785fd3292b6b62e422fa54817ba9ac1276571dda005f5272e8f3052fccd03bdada317c4f52b196c5a50be637c17bd32584523dddc389d95e9e218609a SHA512 48fdef6dc711cf89f9f4c56c10c98f40ea051df61bf1cdc88f5ba17f5631e9fc6cce8236e7901fd3b88908d45e991f5fdffa07c30ce5d7f4ac44ca3b0bd45381
+EBUILD error-prone-annotations-2.0.14.ebuild 601 BLAKE2B 712a89b184fc787a32f640f94fe36d2a668b645ea97fcaa52092309487d88fee12c382ad3303097192501e8c50b059b363824220bab527cdb1af8adcb5a47903 SHA512 a225b356abcb4aa69394cd90355af6ff8487a6f7fd6b62143b481337742ba48d4e962b7b193a9212b8cbb401467154cbaf92a5b4f2978e511e7c6ee8e39a4ea6
 MISC metadata.xml 320 BLAKE2B 2e99f822caa8b83ed1ababb800cd9d3b1c8027e5623bc4498a475b7e0e72943c2140ec07c42a1d967472186094a0933fcc82b5cbfe45d1111f0fec9924e161dc SHA512 c47744406f133d3553b5982f0a7f690ca4bb360e76e633c30015489bb6489ee74629f4d6cd1986558932acc7b18449cd9840f9080f71d682cc6fbf97981cbf21
diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild
index 5f84c472f4bb..c24f32ac3cb7 100644
--- a/dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild
+++ b/dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://errorprone.info"
 SRC_URI="https://github.com/google/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.7"
 RDEPEND=">=virtual/jre-1.7"
diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest
index b92fd184585c..7a6bd9f7de08 100644
--- a/dev-java/gson/Manifest
+++ b/dev-java/gson/Manifest
@@ -1,5 +1,5 @@
 DIST gson-2.8.8-sources.tar.gz 393941 BLAKE2B ebdd1088a069eea58e5ea4e2eddea0d42064c53f7284778b1b7217c8bc7abeb7e14350e19d838af1d94f78c5c38aca6de0f37674b022f0e528ed65eef803c3f1 SHA512 f90ad679c99c5e9a6ee9e397e59ab1d7d94a9c82366902b808addc40ebbab101fdba7fc83e4666c4f35e52d8b127e6f901e65072a7de210496466074dcd043c5
 DIST gson-parent-2.8.7.tar.gz 391617 BLAKE2B 2c0fa3927d44c4a5c961518955dfbe6fee60dd61026002d0152d25d6f22dd4ac08b4323256af1053d0f17ef5d9f2a2a3ee86cedebd52a112d258e8c8c37e545d SHA512 044032b24ec1198d054807ccbfd91301307992b6e7d03a2e8578be79a2cdb28ba0ba57a954f11ad43022ec696c1522d242ed6b1045f831c9a370e0621e674fe0
-EBUILD gson-2.8.7.ebuild 1122 BLAKE2B fe36a3255c95238213b909258c3b160d27e09629d14838d6684a3a4db273021434db1cf994093ff6134ee910c030d771ebaab45c045691a8696c4fc27d234f42 SHA512 e7a387f35ade78894858f138ce01e8e3e47a60e6506e7558a7fabd037eb46cac7759de4ffed37da345c94997e0e8abb911459b1ed37f674e2afa619b5476a721
+EBUILD gson-2.8.7.ebuild 1120 BLAKE2B 1ace38c0d13d94178e46e3e513a579743f32b6620e807bc83ab5a634126f1a436d36bde5ddc109d9a271a878a75562b98bc6bf96955fec8b30bf6dd851693f65 SHA512 2f0cc85039dd54745721edf880255d577af28fd0f95009b063e35b14f587a679c33b2502b2af542f606b85aacd3a181153ba888e4963333a4ad4e060343cd047
 EBUILD gson-2.8.8.ebuild 1545 BLAKE2B 47fda7d8d7dfac09575292eb3d4a864b63348720691a66779abe023f88ce7eabf7c0d00dfb6cc1fbc59cde279720f139f6bf616001baf9ec90332f50f45a49ae SHA512 c77ed166187d3a63e92d7689b69b21f56f0c59b97777e4087024fc5684b4bafd6d40c4c57c3227c3af52b6c5ac2da45794d0c4eec0d42a56c536cd126441e043
 MISC metadata.xml 630 BLAKE2B e4732be361d93273cb3c6084e4fa596def785aa6b0cd747f3cc65b9d9b693666e60188c6b30c0e7a234cca56239b9d22c14eaf21af7958f818de3a6b4b246729 SHA512 063d42b12383dde777dfdea7fb884423bdf3e377aa585b4b46d6d2581e81cd943e0a444792997c87d3443fa4516d211d9c3f78e5702b7376cda63718f14f6504
diff --git a/dev-java/gson/gson-2.8.7.ebuild b/dev-java/gson/gson-2.8.7.ebuild
index af292bcfcff5..35e416438a42 100644
--- a/dev-java/gson/gson-2.8.7.ebuild
+++ b/dev-java/gson/gson-2.8.7.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PN}-parent-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.6"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest
index 325b605e90e1..f3bb496e4ed1 100644
--- a/dev-java/guava/Manifest
+++ b/dev-java/guava/Manifest
@@ -1,3 +1,3 @@
 DIST guava-20.0.tar.gz 2522092 BLAKE2B 2ca76a71d0c169b80bfaa3e9847b2e465c57aabc0a67622a69519808fa8455146228747dc20e999ebc20ef7cd5fec1cfa82f6c025e9378011619cfedbc2c7d6c SHA512 e89eee8e66502f208878af286c660393712b12fb37647ec70719ca7c5184686c8dc5fc59d45c1813d792ecad9421e2c077dab075f76b1907c04f9f6e80567ac9
-EBUILD guava-20.0.ebuild 842 BLAKE2B 7ce9df91ea55b66c9e0b2705d5f1969d2d91cd66bf57ef4e50cf934bab587ce2d6838cd553720597bacdae6349beb834bd7f78047a169620bcf004ef81089e6a SHA512 10c9e67adc9461f82efd10502ce687c7284b3103893ec80de979f705ab8b1a17cd75d527bfcdbb3aa1d39f9d931c044febe15f16183d642af3d8c9292ac70821
+EBUILD guava-20.0.ebuild 840 BLAKE2B 35dfd34ff420d4442efcf7a2ce2f85a983e36642359a829132dc6b98125f363c9258d8a8085f71d4b2cfb35a2358bddd7ae2feb0ffd0a66c23a7613ae12a53b3 SHA512 665225fee88e207a37e43da0e1b05c09b273031e3e3fbdae02c2cc83a5abf3122e50d682563f66a55866ba3b00aaf9b7d2f634f81876d846f1332490c3b59114
 MISC metadata.xml 589 BLAKE2B 36b17e71aeb533194b87a9101d730b3f233c23b175b65216bdeecfcbf1bc7ac0936b7b284cdb40a30573d630d34a9bf7c2ca966b26bef4a3e7c5d6e90a1075a5 SHA512 0b8556db4fe43dc25f7604dd98ebb01fb4318c8a861ca25a5d7db76fef4b076c2eb2a67b801807233ad950cfb0d70b438af3f9e84f408060a168d9897158c6eb
diff --git a/dev-java/guava/guava-20.0.ebuild b/dev-java/guava/guava-20.0.ebuild
index a7e19f2e33f1..ef48f5e71bc8 100644
--- a/dev-java/guava/guava-20.0.ebuild
+++ b/dev-java/guava/guava-20.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/google/guava"
 SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="${PV%.*}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 CP_DEPEND="
 	dev-java/animal-sniffer-annotations:0
diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest
index 3725522a0359..98ca2729ae05 100644
--- a/dev-java/guice/Manifest
+++ b/dev-java/guice/Manifest
@@ -1,3 +1,3 @@
 DIST guice-4.1.tar.gz 23212767 BLAKE2B bab34da971c1a154eca468bbae4f32db97c0f7ce88bd66cea9c79ef08871db06877ab1ea6495c920977ae139af0bddef2fa4bef8ff5783d2bd53c736bfa07153 SHA512 b42c6475a1d17c111a2ca278ac007bee541806685c0938c66f638808bd81d58aa99ba5aef2e4d8320dd5014df4307c5d2dd192111f4610c73a1eeef328771c00
-EBUILD guice-4.1.ebuild 1137 BLAKE2B 2c9ad78cccbf2612af1e9cfe5a09bd845231c396aaefd9c6735e0431239d0e330f9746a5d9ffe8b35c6a81cdc6de483dad788f04848cce922dd531d2a7f40982 SHA512 8504e61a6937648464530ebba4192d0cab00a666ec3ef2bc425591c9220517eee4480e4ec730576b2b11b798319119a0a55ae9a8c18802ef594301cc91a66de9
+EBUILD guice-4.1.ebuild 1136 BLAKE2B 8432902398e208c7c662baee44b103ee78a7125330bc54c5742e658ba5493599464fa4d1d2d97b45ea2236c444d9b14683e0d22eb3d68835576a540c46992524 SHA512 e2eba78d4c5326939daeaa2174d4653d9e1033e606130369e6abefa895fd465970d7f5135c47a42bee0f43efa46eb4f06c269586942168013e0760bdafc6cb5a
 MISC metadata.xml 371 BLAKE2B 2960f7040449f39cf4371b64df2a64fadfb000d042ccc4560d23cdc0f92cc4c55718a155990db42f7d1eebf1d8b5702e5094cca9bcb0e3e01cccf37e6509889d SHA512 522b9d8b6b85e48e522663cf9b93ee077b2adeb073795d5adb4df81935518dc8e712e85e2a4fc56e4ae1a0656ccc0b35831038afed7d65b880b80d1bffcbbec8
diff --git a/dev-java/guice/guice-4.1.ebuild b/dev-java/guice/guice-4.1.ebuild
index c0a7d2f86aca..eae84b6f3479 100644
--- a/dev-java/guice/guice-4.1.ebuild
+++ b/dev-java/guice/guice-4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 RESTRICT="test"
 
 CP_DEPEND="dev-java/aopalliance:1
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 8079e843fad8..7397a9ca0fcd 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -22,8 +22,20 @@ DIST icedtea-3.19-nashorn-3.19.0.tar.xz 2326776 BLAKE2B 5dfb09fffbec8f36eccaa81c
 DIST icedtea-3.19-openjdk-3.19.0.tar.xz 365128 BLAKE2B 8abc4d77d961810df0ac8a1c5fcc4eea0e0cc888b4471b987d708569116cba4871d37fdb9e7d115f5b2bb387e73e71593e04bad2d3ed2e33ab2938192251506a SHA512 90dea98d26279a5d0a5869a8d53234bc27a4fdcb0682ebc3baba1670ccca2035e41d24d0d67a7ee5d9304058516136c11177eb8190edb35f03ce8b8f63e56357
 DIST icedtea-3.19-shenandoah-3.19.0.tar.xz 7286788 BLAKE2B d1df26c9c25930a19ad1acad3c3a7b249456c1732981b5aa9f77f847c7e0c53010a7eea646ea0b63293985af238309c72320b0ac71678c0ca88c211d2adb601d SHA512 7db3b3f9c3e42fef50f1a84e9db1d1c2b5322f15ea26e7f0bcbbae8011365faf7f0ad4bf0bcf861c2d5eb1fe2845d57f9355b1b2e0203558f47a3564ae4709a0
 DIST icedtea-3.19.0.tar.xz 1568996 BLAKE2B 0ded447c674aa5dbfba690652de474b13f2107c221e0a7a9d98912ac374efbd44093c482abc5e4d4dcde0f9712020d8bdd9de98b347145217e719edf801e9afc SHA512 27d7c4c8e025a2c9320c0a47f3c521f51b49bf55d021c7a08aea9b7cb3d522cfc3e10d438b837669eeb5d427e950e7643c5ce4f817567d5e9fe39b56cdce8835
+DIST icedtea-3.21-aarch32-3.21.0.tar.xz 7207712 BLAKE2B bb9001aa31011fd0b29141caa1ba48344f2ca08e5dbe69cb3501a4830886d02b7a8782336a84273aad2ea721f26db2d3f51cdc72a9eccde1ad45a2790fb2caf1 SHA512 fc44c3c59164f6904ad92e04cb8023f39e82d6a2704fb5a91bf84d41066183ca6140273fa4c13d08a0dda47f263bd2d7d5138a5c45f205c58f649e6b87f15a9e
+DIST icedtea-3.21-corba-3.21.0.tar.xz 949700 BLAKE2B b845a46b5dcb22545073f894fbc5464e014f8f0e02e0cc66bccda0db6bd5566908a886823189ecf476847adb7f3fa5c009814e54c69d65a3a4a6c3cfc692564d SHA512 55110b92c6eddeb29eab97cbe644d8cc171a489b9fa806c81e4af88a1e5e3e6776fb97371715782935222944464f68e7d6783c46bd0d0de5659123f46c577a7a
+DIST icedtea-3.21-hotspot-3.21.0.tar.xz 7121192 BLAKE2B 64813c6a71405c5c093792dadf8613361a056b590fa4fa7453887ac5eb1eda1da63777a2f1e529e50eefe033d6f7f757d3235d53ba8f0f45d40dad6f0c215334 SHA512 678f6c53db5858ba828e063eeeddb727dbeb0586ff26a4287f9735dc01ad00ddcd9f41fa65343b81d5f5c512a944f47a447d4bdc929ca26ba78a68a7e3dfc1cd
+DIST icedtea-3.21-jaxp-3.21.0.tar.xz 2269276 BLAKE2B a1848fa6832a8c87c9a6edcfc5ac45fc487b5378368c07bafe5a3e54b849b81b781fb3652593e3506ffbd220a933cb5a04ae6dee86b3a44be7a1138813f5454c SHA512 ff14c9b63cee2a7b9213872b8710b1c5b901ccaf4122c8ddf5d8437d1cdd35cf9af50f461d05f004b74802ba8a21c7e9f288ec080b2b5f7daad065d40dc39258
+DIST icedtea-3.21-jaxws-3.21.0.tar.xz 2278396 BLAKE2B 1fb8608df94937447e192d010465379b2c3aa578f9c1ebd2eba445b1cd92ea9427511fd72351537ae78796d90d130497b02bc3e89b9e1ff1765013c681e6cf83 SHA512 e21bd36b6cfa92f648856532647150243f2184943dc6f5003fea02cf69aa9b6a94fb18d6478db28d5ee5e3af9b780122c0539fd3207cf4dfcb69a042835c13d6
+DIST icedtea-3.21-jdk-3.21.0.tar.xz 40714380 BLAKE2B be2bda5027d20515717ffecef71996bd56c4246a2a0e4d670bb386ea9ed2ff71c91ca8faa17ee209a5894784dff8e1b7d8df544c0b88b8f9da946514d9070bc7 SHA512 06385f14d093be250aa530d0659576d75aed57b0264ec7329d6b2c9309cf4ed660a9ecbfb6f199868ae23aedfbdb97036fccda501c00e9d2e3b1562c92b0ed37
+DIST icedtea-3.21-langtools-3.21.0.tar.xz 2081452 BLAKE2B 97c0820a9c734fc8d155fd5ec8fa9c56b4eaa0bf6fe5df5235b2dc5680f8c1989e608210007faa8e0120ad7dadfe682f4fe174e5cdae64d34624f239a7b1bb16 SHA512 949366138278104fc06452d8227bbe5d0829a9124503928cab34e5e9df37e25d25964a5c755e46d9ca74e63f1b318b2e3366f8f08e144524a8043bc2a7ca626e
+DIST icedtea-3.21-nashorn-3.21.0.tar.xz 2324264 BLAKE2B d7bcd9dd6df244004e3cb3ea1cdc178d781dd7f1b1d7b97df32385b67829bc3d9cb168caa64dc13fc15f27a9eeab276576d22cb804de5bc0d0209b98308a7105 SHA512 eda17f94ed2f34dd5bc4670dd3340d50de956723213948fd15963b0a589433bbe2e0ba8be7761974754b6a5d875ef58c31839daa6fef7215af552842f787bb44
+DIST icedtea-3.21-openjdk-3.21.0.tar.xz 367068 BLAKE2B 7fe212e84f1f527c229a854212617cd99457c0a4c5fdbd41a1ae65098706a22843e52a108cbf62fac341b9aa85e22f00746bb5a84e7d249ebbd605630bee127a SHA512 6a1706dfcb5e5d79191c01db6da30ca0ca48cea628a26a3a35f6e43c710091e25c97ec95122e8bc19b4ac69ede27a8dae37b49e1a7e4db07a635ded69e2e0336
+DIST icedtea-3.21-shenandoah-3.21.0.tar.xz 7295776 BLAKE2B c139711d81ccf593a93f786c398371eaddbaa9aa5044683669204ef9671cd17e80488ba2d290565ba5f1e27a62fa696c3d331c215442ddd29f3067b60682adec SHA512 c0282207854ad13d57dc7e1dd73412fb184406e7783d720cacbf58152177ae70af51bb4d577442bc1bebc75e88458cdb86356b79857b01eafb1eb214dbc439f4
+DIST icedtea-3.21.0.tar.xz 1574548 BLAKE2B 55dca04bf55a272a92f161a96a1cabe7c0e1f46289d95d74e9253c4da45d8df00e292e5d806118805241ea5c4b914643e380b05ad7996d850a8e5eebd7a2959a SHA512 874f91f3c3311d7017efb91aaff4e2fb660f55c58a626bcf5b120b7158df15e9b94abda7cd28f9620ad76c50bfa89cc8c1d251c193404c0db51ff1430167b018
 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
 EBUILD icedtea-3.18.0.ebuild 12385 BLAKE2B 0aa3430a85e5f4f5526cbe2324682e9618d581485ac85fac44ab5df18a5b743bfdbdee9b00e75284020cec934d7c262cc31d83e586697de7ccfb02a3e7f489d3 SHA512 18177e66557a2eefb7395848ddd5698c2a4eced1954a37e5bedcdbc0152d9b0dac83d78862d934c14ad0b3845b782ba8b93dd4227c585f2a7b10f4b0e8d2812a
 EBUILD icedtea-3.19.0.ebuild 12385 BLAKE2B 0aa3430a85e5f4f5526cbe2324682e9618d581485ac85fac44ab5df18a5b743bfdbdee9b00e75284020cec934d7c262cc31d83e586697de7ccfb02a3e7f489d3 SHA512 18177e66557a2eefb7395848ddd5698c2a4eced1954a37e5bedcdbc0152d9b0dac83d78862d934c14ad0b3845b782ba8b93dd4227c585f2a7b10f4b0e8d2812a
+EBUILD icedtea-3.21.0.ebuild 12378 BLAKE2B e0f4e68d717b9ab68117334e43544f3b1dc6514d996df0dc7e75ee7fdf2c924a58482612a758661f702993e5173a654c80b5c17a0da7bd966d99a9904359f604 SHA512 b6e6de29afdc873d44381a89acaa2b4a130bea924147287142d74cfe0ea8b495a438bcefac04e5e389f328f1c60ee6259522ca13ada398b1b4428addb54e1b56
 MISC metadata.xml 2109 BLAKE2B d6573077ef923e08d04d92d3e81d79efd4b2996c26e36b9f356a806e2891d235883deacd64308d0659dde87a6c891a8a0b81706e93353fd3a7a280a03acb4956 SHA512 49970666bdfad586f8f11e779cb765df60f0e224844852ae6740fe781033b39526c6d2cd458752bc7c2dc5072c518330d7ed533df59948cd4b87399a4b2f24ad
diff --git a/dev-java/icedtea/icedtea-3.21.0.ebuild b/dev-java/icedtea/icedtea-3.21.0.ebuild
new file mode 100644
index 000000000000..b4f4020fce29
--- /dev/null
+++ b/dev-java/icedtea/icedtea-3.21.0.ebuild
@@ -0,0 +1,385 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
+# *********************************************************
+
+EAPI=6
+SLOT="8"
+
+inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs xdg-utils
+
+ICEDTEA_VER=$(ver_cut 1-3)
+ICEDTEA_BRANCH=$(ver_cut 1-2)
+ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
+
+CORBA_TARBALL="${PV}.tar.xz"
+JAXP_TARBALL="${PV}.tar.xz"
+JAXWS_TARBALL="${PV}.tar.xz"
+JDK_TARBALL="${PV}.tar.xz"
+LANGTOOLS_TARBALL="${PV}.tar.xz"
+OPENJDK_TARBALL="${PV}.tar.xz"
+NASHORN_TARBALL="${PV}.tar.xz"
+HOTSPOT_TARBALL="${PV}.tar.xz"
+SHENANDOAH_TARBALL="${PV}.tar.xz"
+AARCH32_TARBALL="${PV}.tar.xz"
+
+CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
+JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
+
+CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
+JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
+JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
+JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
+LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
+OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
+NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
+HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
+SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}"
+AARCH32_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch32-${AARCH32_TARBALL}"
+
+CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
+
+DROP_URL="https://icedtea.classpath.org/download/drops"
+ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="https://icedtea.classpath.org"
+SRC_PKG="${ICEDTEA_PKG}.tar.xz"
+SRC_URI="
+	https://icedtea.classpath.org/download/source/${SRC_PKG}
+	${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL}
+	${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
+	${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
+	${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
+	${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
+	shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} )
+	arm? ( ${ICEDTEA_URL}/aarch32.tar.xz -> ${AARCH32_GENTOO_TARBALL} )
+	${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
+	${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
+
+LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+IUSE="+alsa cacao +cups doc examples +gtk headless-awt
+	jamvm +jbootstrap kerberos pax-kernel +pch
+	pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test zero"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="gtk? ( !headless-awt )"
+
+# Ideally the following were optional at build time.
+ALSA_COMMON_DEP=">=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP=">=net-print/cups-1.2.12"
+
+X_COMMON_DEP="
+	>=media-libs/giflib-4.1.6:0=
+	>=media-libs/libpng-1.2:0=
+	>=x11-libs/libX11-1.1.3
+	>=x11-libs/libXext-1.1.1
+	>=x11-libs/libXi-1.1.3
+	>=x11-libs/libXrender-0.9.4
+	>=x11-libs/libXtst-1.0.3
+	x11-libs/libXcomposite
+"
+
+X_DEPEND="
+	x11-base/xorg-proto
+	>=x11-libs/libXau-1.0.3
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXinerama-1.0.2
+"
+
+# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
+COMMON_DEP="
+	>=dev-libs/glib-2.26:2=
+	>=dev-util/systemtap-1
+	media-libs/fontconfig:1.0=
+	>=media-libs/freetype-2.5.3:2=
+	>=sys-libs/zlib-1.2.3
+	virtual/jpeg:0=
+	gtk? (
+		>=dev-libs/atk-1.30.0
+		>=x11-libs/cairo-1.8.8
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.8:2
+		>=x11-libs/pango-1.24.5
+	)
+	kerberos? ( virtual/krb5 )
+	sctp? ( net-misc/lksctp-tools )
+	smartcard? ( sys-apps/pcsc-lite )
+	system-lcms? ( >=media-libs/lcms-2.9:2= )
+"
+
+RDEPEND="${COMMON_DEP}
+	!dev-java/icedtea:0
+	!dev-java/icedtea-web:7
+	>=gnome-base/gsettings-desktop-schemas-3.12.2
+	>=sys-apps/baselayout-java-0.1.0-r1
+	virtual/ttf-fonts
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )
+	!headless-awt? ( ${X_COMMON_DEP} )
+	selinux? ( sec-policy/selinux-java )
+"
+
+# perl is needed for running the SystemTap tests and the bootstrap javac
+# lsb-release is used to obtain distro information for the version & crash dump output
+# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
+# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
+# Ant is no longer needed under the new build system
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
+	|| (
+		dev-java/openjdk-bin:8
+		dev-java/openjdk:8
+		dev-java/icedtea-bin:8
+		dev-java/icedtea:8
+	)
+	app-arch/cpio
+	app-arch/unzip
+	app-arch/zip
+	app-misc/ca-certificates
+	dev-lang/perl
+	dev-libs/openssl:0
+	sys-apps/attr
+	sys-apps/lsb-release
+	x11-libs/libXt
+	virtual/pkgconfig
+	pax-kernel? ( sys-apps/elfix )"
+
+PDEPEND="pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+icedtea_check_requirements() {
+	local CHECKREQS_DISK_BUILD
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="9000M"
+	else
+		CHECKREQS_DISK_BUILD="8500M"
+	fi
+
+	check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	icedtea_check_requirements
+}
+
+pkg_setup() {
+	icedtea_check_requirements
+
+	JAVA_PKG_WANT_BUILD_VM="
+		openjdk-8 openjdk-bin-8
+		icedtea-8 icedtea-bin-8"
+	JAVA_PKG_WANT_SOURCE="1.5"
+	JAVA_PKG_WANT_TARGET="1.5"
+
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${SRC_PKG}
+}
+
+src_configure() {
+	# GCC10/-fno-common handling, #723102
+	if [[ $(gcc-major-version) -ge 10 ]]; then
+		append-flags -fcommon
+		append-flags -fno-delete-null-pointer-checks -fno-lifetime-dse
+	fi
+	# this patch helps with gcc10 as well
+	# since build system unpacks tarballs itself, this is a way to force makefile
+	# to apply our patch. it expects relative path inside source, so we can't specify
+	# ${FILESDIR} directly.
+	mkdir -v gentoo_patches || die
+	cp -v "${FILESDIR}/openjdk-8-hotspot-arrayallocator.patch" gentoo_patches || die
+	export DISTRIBUTION_PATCHES="gentoo_patches//openjdk-8-hotspot-arrayallocator.patch"
+
+	# For bootstrap builds as the sandbox control file might not yet exist.
+	addpredict /proc/self/coredump_filter #nowarn
+
+	# icedtea doesn't like some locales. #330433 #389717
+	export LANG="C" LC_ALL="C"
+
+	local cacao_config config hotspot_port hs_config jamvm_config use_cacao use_jamvm use_zero zero_config
+	local vm=$(java-pkg_get-current-vm)
+
+	# gcj-jdk ensures ecj is present.
+	if use jbootstrap || has "${vm}" gcj-jdk; then
+		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+		config+=" --enable-bootstrap"
+	else
+		config+=" --disable-bootstrap"
+	fi
+
+	# Use Zero if requested
+	if use zero; then
+		use_zero="yes"
+	fi
+
+	# Use JamVM if requested
+	if use jamvm; then
+		use_jamvm="yes"
+	fi
+
+	# Use CACAO if requested
+	if use cacao; then
+		use_cacao="yes"
+	fi
+
+	# Are we on a architecture with a HotSpot port?
+	# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
+	if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
+		hotspot_port="yes"
+		# Work around stack alignment issue, bug #647954.
+		use x86 && append-flags -mincoming-stack-boundary=2
+	fi
+
+	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+	# Otherwise use Zero for now until alternate VMs are working
+	if test "x${hotspot_port}" != "xyes"; then
+			use_zero="yes"
+	fi
+
+	if use shenandoah; then
+		if { use amd64 || use arm64; }; then
+			hs_config="--with-hotspot-build=shenandoah"
+			hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
+		else
+			eerror "Shenandoah is only supported on arm64 and x86_64. Please re-build with USE="-shenandoah""
+		fi
+	else
+		if use arm ; then
+			hs_config="--with-hotspot-src-zip="${DISTDIR}/${AARCH32_GENTOO_TARBALL}""
+		else
+			hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
+		fi
+	fi
+
+	# Turn on JamVM if needed (non-HS archs) or requested
+	if test "x${use_jamvm}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
+			ewarn 'If so, please rebuild with USE="-jamvm"'
+		fi
+		ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
+		jamvm_config="--enable-jamvm"
+	fi
+
+	# Turn on CACAO if needed (non-HS archs) or requested
+	if test "x${use_cacao}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
+			ewarn 'If so, please rebuild with USE="-cacao"'
+		fi
+		ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
+		cacao_config="--enable-cacao"
+	fi
+
+	# Turn on Zero if needed (non-HS/CACAO archs) or requested
+	if test "x${use_zero}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
+		fi
+		zero_config="--enable-zero"
+	fi
+
+	# PaX breaks pch, bug #601016
+	if use pch && ! host-is-pax; then
+		config+=" --enable-precompiled-headers"
+	else
+		config+=" --disable-precompiled-headers"
+	fi
+
+	config+=" --with-parallel-jobs=$(makeopts_jobs)"
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+	# force bash for now https://bugs.gentoo.org/722292
+	CONFIG_SHELL="${EPREFIX}/bin/bash" econf ${config} \
+		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
+		--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
+		--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
+		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
+		--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
+		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
+		--with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
+		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
+		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
+		--with-jdk-home="$(java-config -O)" \
+		--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
+		--mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
+		--with-pkgversion="Gentoo ${PF}" \
+		--disable-ccache \
+		--disable-downloading --disable-Werror --disable-tests \
+		--disable-systemtap-tests --enable-improved-font-rendering \
+		--enable-system-jpeg --enable-system-zlib \
+		$(use_enable headless-awt headless) \
+		$(use_enable !headless-awt system-gif) \
+		$(use_enable !headless-awt system-png) \
+		$(use_enable doc docs) \
+		$(use_enable kerberos system-kerberos) \
+		$(use_enable system-lcms) \
+		$(use_with pax-kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+		$(use_enable sctp system-sctp) \
+		$(use_enable smartcard system-pcsc) \
+		${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
+}
+
+src_compile() {
+	default
+}
+
+src_test() {
+	default
+}
+
+src_install() {
+	default
+
+	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+	local ddest="${ED}${dest#/}"
+
+	if ! use alsa; then
+		rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+	fi
+
+	if ! use examples; then
+		rm -r "${ddest}"/demo "${ddest}"/sample || die
+	fi
+
+	if ! use source; then
+		rm -v "${ddest}"/src.zip || die
+	fi
+
+	dosym ../../../usr/share/doc/"${PF}" usr/share/doc/"${PN}${SLOT}"
+
+	# Fix the permissions.
+	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+	dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+
+	java-vm_install-env "${FILESDIR}/icedtea.env.sh"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	java-vm-2_pkg_postinst
+	einfo "JavaWebStart functionality provided by icedtea-web package"
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	java-vm-2_pkg_postrm
+}
diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
index 4bd37b410436..fd66d7445a1b 100644
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -1,7 +1,5 @@
 DIST icu4j-54_1_1.tgz 23457651 BLAKE2B f200d170c32065d2f678247d595085283446e401da2c2433b426466fc5c6f93f5ce629bce23d1114cad7d360aa4d127060750d380da8cc3e7fa1e529b454bae9 SHA512 c41f7f9fb0819767da48ac21c4883a628da8397e0ad5b0d75e51d9185b5511608c9a635933c4ae2e0c8911b2cdecf47bc661050935bbae2ba58abfb5ad04dadf
 DIST icu4j-55_1.tgz 23617640 BLAKE2B fe22524761e0c6be4ea440f90ffe5fba8a2f34484207248762ab127c3bb7e4328ced3502a336edd7d3a1026804381cd2b8738b15cd1745af0cee813dc60d7893 SHA512 706daed61d9d3722a0813d175fa66b24570abba492c32704d4df924861e5d2592a4a5ff40fdec2bd3fb662c3679dbc9addd580966c3cc69470d14e3fce27a054
-DIST icu4j-56_1.tgz 23189284 BLAKE2B d53aa869d6cde8cc9c83e66b55986b61736fbaf7a890e3c7bacab5abb23623ec64b5a23fd740dca8e51fd2336ced5e79546b4c08edca25beced22e6560f7814d SHA512 9ecc36c03a6713dbfb909e109b5e982525958b6137bd7006c93ff3b8578d816c59fa331555b43c94248f392ba9b456b1adb37be74e02e9ea818c8a9a7c669f4a
-EBUILD icu4j-54.1.1.ebuild 1199 BLAKE2B 7612a378d369776fe5582968a77af47c36d8c01b98d8f536191e426db0cbb1f2fe8feabaffb53e89466126269ad7161ee4e9f4881665bb8b87677b2d66670c76 SHA512 ca85754e65904369431f23759bdc3af849294a746f0c02cb4f4fb427bc586ead07a513556e67b2bd362ff0e3b02398a80855ac3af844c625f4128da2cb1a763a
+EBUILD icu4j-54.1.1-r1.ebuild 1295 BLAKE2B f2bacdbc333dcf7e25503cca563ac8eac94d470a348feaa71b3053f99d246b83ff104cef218b53aa2a22cf3b67e069c2973904ea1d42afb8fe7900b41cf7f4e6 SHA512 e98b2308eb5a8ce3eebede4ce91668978e2551938141af3951683a2088efe7b837e0b3a0fbb7ae8689e4c19a8f1b1d0fb3e5825c6dc291de8fea2f45a57eff69
 EBUILD icu4j-55.1.ebuild 1122 BLAKE2B 8e4bbd842f673a1618f95d1dcad6d96379d58aa265fb06aa7c0e7bfb46f9bab940a7e3b8c169a1f2751289e29c16e700d87d01c860f0688d726b47620741228e SHA512 b8426a6b8103c2cb107f4c216b27cc10609004f6624246773ffacb202a595437b3e10e2567d834b754bd96d74465627897047cd0f794264d0e809f58b116eaf4
-EBUILD icu4j-56.1.ebuild 1074 BLAKE2B 99d5c953645ffb08a744b74f865fe9d068f7949c09f4e7d9d9757a665337703b8f450a7bf1ea841115b093a73c7762c9c0a78dc957724432f22e65a1ba7c3778 SHA512 c475b899d49043fb3929a49f9ac1aff4e42ab8bf1ce2a8cd906930d04e8f9b700e224cc3e44f3c078739680440f00074907dd96796bd0ab5c00c998f68aff36b
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/icu4j/icu4j-54.1.1.ebuild b/dev-java/icu4j/icu4j-54.1.1-r1.ebuild
index e58375be105d..640cdc0756f7 100644
--- a/dev-java/icu4j/icu4j-54.1.1.ebuild
+++ b/dev-java/icu4j/icu4j-54.1.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 # testdata.jar, icudata.jar and icutzdata.jar do not contain *.class files
 # but *.res files. These *.res data files are needed to build the final jar.
@@ -19,12 +19,15 @@ SLOT="52"
 KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
-# Beware of jdk version dependant code #361593
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
+# the build system does not support java > 1.8
+# also the package does not compile with newer jdks because of missing classes
+DEPEND="virtual/jdk:1.8"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}"
 
+HTML_DOCS="readme.html"
+
 JAVA_PKG_BSFIX_NAME+=" common-targets.xml"
 
 EANT_DOC_TARGET="docs"
@@ -39,7 +42,7 @@ src_install() {
 	java-pkg_dojar ${PN}-charset.jar
 	java-pkg_dojar ${PN}-localespi.jar
 
-	dohtml readme.html
+	einstalldocs
 
 	use doc && java-pkg_dojavadoc doc
 	use examples && java-pkg_doexamples demos samples
diff --git a/dev-java/icu4j/icu4j-56.1.ebuild b/dev-java/icu4j/icu4j-56.1.ebuild
deleted file mode 100644
index 870e9f7a2de0..000000000000
--- a/dev-java/icu4j/icu4j-56.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A set of Java libraries providing Unicode and Globalization support"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${PV//./_}.tgz"
-
-LICENSE="icu"
-SLOT="56"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}"
-
-JAVA_PKG_BSFIX_NAME+=" common-targets.xml"
-
-EANT_DOC_TARGET="docs"
-EANT_TEST_TARGET="check"
-
-JAVA_RM_FILES=(
-	tools/build/src/com/ibm/icu/dev/tool/docs/ICUTaglet.java
-)
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	java-pkg_dojar ${PN}-charset.jar
-	java-pkg_dojar ${PN}-localespi.jar
-
-	dodoc readme.html
-
-	use doc && java-pkg_dojavadoc doc
-	use examples && java-pkg_doexamples demos samples
-	use source && java-pkg_dosrc main/classes/*/src/com
-}
diff --git a/dev-java/j2objc-annotations/Manifest b/dev-java/j2objc-annotations/Manifest
index b9eb6dfd520d..2c12ee6c32af 100644
--- a/dev-java/j2objc-annotations/Manifest
+++ b/dev-java/j2objc-annotations/Manifest
@@ -1,3 +1,3 @@
 DIST j2objc-1.2.tar.gz 9718769 BLAKE2B 370a52fe9821814c12dd7a13072930f178e041d14baa2e912de3379030828ae62114b213f38f849934e68060fa51d8017a28772a794658aa23272ac5d254d933 SHA512 d2b4d12ba8107728ca33cfe18124eae092a2c2b9ce0b588374180d35816d83d6d6c9d029c3524537ac48f052dfa4c88b273405cddf56c54966216b1ed1a160eb
-EBUILD j2objc-annotations-1.2.ebuild 597 BLAKE2B f6fb9ba8a8c2c148bfe2a005fb726d0d5f5d390dc673b0d5f1baf5728868bae538bb2974e8bec877e3655e62dd5fd3e9f733f0c7e58688fc3873bde46623f21a SHA512 2c40461941457d5a9ec96a8d37e741169695bcc7c243098738d8be3fd77f4d7bda9c0c419bbd2b2a072c52c89efd285aba5e685ce90f87890d37ecb3b236aa98
+EBUILD j2objc-annotations-1.2.ebuild 595 BLAKE2B cc0646e0ee79815bbf523994d222c2f4bcd3d6934565ab7d1d7acaed8dd888bfd8ff62c402699bdad36707d3b8e3facd9638f9ffcdbf29fcf82fe221086e43d0 SHA512 5f791a23b6dbad302ba069f1fcf49cbf5850b4ee4c70e13af3ce3a101652effa52aa61105fe4a1803ee25632ad91f251f36166d54bd31fe7105f5b0a530ce570
 MISC metadata.xml 315 BLAKE2B 5403ef9a3b61aa4b5bef35fe46ff921be35190630f344563cdd60c8ca0fa6e3f8b1e612ad05df478f69257d85f30c36cd265e2f9664cc41d67e05fc47622f784 SHA512 fd176c272bbae6a6c861625828e363bebee5d92298540a8ec0bd9574d8adbc3f44f273ccb9ac576ac097a9d1c9deb8ff28c9f59ae001e951b030d5276f3a95ec
diff --git a/dev-java/j2objc-annotations/j2objc-annotations-1.2.ebuild b/dev-java/j2objc-annotations/j2objc-annotations-1.2.ebuild
index 94d15d90b4cc..4d97b4ab4bb2 100644
--- a/dev-java/j2objc-annotations/j2objc-annotations-1.2.ebuild
+++ b/dev-java/j2objc-annotations/j2objc-annotations-1.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://j2objc.org"
 SRC_URI="https://github.com/google/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.7"
 RDEPEND=">=virtual/jre-1.7"
diff --git a/dev-java/jakarta-activation-api/Manifest b/dev-java/jakarta-activation-api/Manifest
index 185f40a9f496..15ad71a95103 100644
--- a/dev-java/jakarta-activation-api/Manifest
+++ b/dev-java/jakarta-activation-api/Manifest
@@ -1,5 +1,5 @@
 DIST jakarta-activation-2.0.1.tar.gz 133807 BLAKE2B 3b793fc767601cc1406482facb0456efd1f784371dff602e71f579a2c74f8e66affed384c8ce3b6aa7c2abfcb5cb0ff5f781ea109829c03f645099fb52016e21 SHA512 51e60d851b9f2027944ab24b248b3c7c19028a504ccf5f92a61495ffa65176df78c63c25e91de4a22d6aa9a1989db274f419f91693a21f052875635b8b21bad1
 DIST jakarta-activation-api-1.2.2.tar.gz 123283 BLAKE2B 2d205b0a042790f931d20b30f422690eb4f7b51ffa3e8eb2af0eb1fabbcd3fa9e469e9b68384bd95278c319f97911795473cbc81282b516f30148488da729f4d SHA512 a9062eadf260621e0a10695e63082d010567665bc749f76be43381c0f313d61fdb8ab04b9b2765e7da740277cd0335e9f555dd7a1cd89b7eedf88f6e557427c4
-EBUILD jakarta-activation-api-1.2.2.ebuild 1592 BLAKE2B eb1f1dbe3ee12433b56f3ef5b7fe385655c2676fa9f688614ae6696448a4b4ebbfe4b2cdb4aa8bb29fbac06c15d8c9b14ddf1e2ee7cfbfd33c2f222d96cc76b0 SHA512 6944260c2ee150bfb8791b8ed5fe98342d00265a6d77183a2aed6d29795b29868905b98d27865a5c3f72ee225d4bc48cf47684cc2fb01ae12ef5c63459f40f84
-EBUILD jakarta-activation-api-2.0.1-r1.ebuild 1558 BLAKE2B 3951b0ea3bd20d0bb129387747c215122f662f1f52b6660bc5be83b4eb6afcb966bf8518bba74131026933d9d944ece5d15b9100963adf2c826c61d0f4d4bb86 SHA512 09d0f47c9472f4ec6528f109f238beabf68a7dbdd7f71458fc07747f46457972e1eb74e8aa5ba49ea38b8ec66722c47eed805c3c1b469f396441c4f735f06c10
+EBUILD jakarta-activation-api-1.2.2.ebuild 1590 BLAKE2B ba56e982f02880249e8a1cd29da6b83d3e8cf0d6ed78675da877cca54067f70f0d1e5655c2e83b759db7968740bffaea1ed124ff2ff1f8ff82533a4af68f19aa SHA512 a762af840f87fbb91659e96aad528f0fb2b3163f8579ec154a1c997ad9f5569d751cbf38653396cbd84d47e7f89e7df8f0b4ddb32a11dbc98ed6eca293d360ec
+EBUILD jakarta-activation-api-2.0.1-r1.ebuild 1556 BLAKE2B 8b4cdc1b8139f03d37890f6fe44bc021468dbc12f6c519dd0e79630cd21ebe6bb2f9d05de35f303303ec00a1556c9c3dc8402fb40f65fd27d239d267a2682489 SHA512 3146719d2e89d9f187f907b42ae72b92e61be8a9a7ce040e557a12a183547f19fd816af093dafc84cdcfb53f9b96774961ebd572f5df19c9c36cb0b913d7889f
 MISC metadata.xml 362 BLAKE2B bfda62be71a4c85153713dd7e8546ce32c783612d2810046280cb9bdb86f3e2187000254c12b040bdb9fd91ac29a7dd910a9d99022fae851402944eebb428b8f SHA512 61b83467d9f5636bbd8c1e4bd4a553de3e36173db5c572d1d499c41615c7a3ffc83a2d8db1e6ee1551602534deba745edfc0394659b61f4dd3c252d84c196c06
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2.ebuild
index c3f8a4078df7..94b9355e3a91 100644
--- a/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2.ebuild
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> $
 
 LICENSE="EPL-1.0"
 SLOT="1"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-2.0.1-r1.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-2.0.1-r1.ebuild
index 9537b85bd9ff..66b3c87f408d 100644
--- a/dev-java/jakarta-activation-api/jakarta-activation-api-2.0.1-r1.ebuild
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-2.0.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> j
 
 LICENSE="EPL-1.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/javassist/Manifest b/dev-java/javassist/Manifest
index 7e5ac79e4bf5..0e17a52c761d 100644
--- a/dev-java/javassist/Manifest
+++ b/dev-java/javassist/Manifest
@@ -1,5 +1,6 @@
 DIST javassist-2.6.zip 1143271 BLAKE2B 05f4e5ebc47420054d4c3d2f77cde33b92e616f3c6740fc030e69b90a697bfbb67be300375d9efc1929a2acfe3493f427222f8a7b1e3137d8bc42f749e51f840 SHA512 8a6da5e2a44cc3bc5b87538a4eda56808d13998d8c9932153f9bb42a1c7844d1a1c7311eb22b0b4ad04649bb7c22156acf851bee638cffbd3328bcef1d2a9f37
 DIST javassist-3.18.2.tar.gz 1179428 BLAKE2B cc7dfebca2e47576f902e6249c1efb65c18823e75ba3698c2d94541bdc910b9b7547e8619c1f19a84c158771230ddd112ddb0445ed97cd64810beacf3468a1ba SHA512 67f22a70584eba31088d63b7862f0f7872a6a7ec57f4397b95044695af75be005e86aa5a5f20fe8e650c2178a9b63b4b922accf940b46ceb1c8e7ce9c51798ca
 EBUILD javassist-2.6-r2.ebuild 756 BLAKE2B 42f0ab587abaa592c82da66bca499abca1c726ed39b9588a8cdfe3a74c78a8d1c30982aaaa8c754af53c9728e0f341b4c4ec7b189249ac161ae63bd220c6a738 SHA512 58373704cb574b16a6bae4c2a1788c565fdfc83eaa6774a21f6dcae1814fd0be1c9306209b08d8aec801e5d4e34ef6a0f190cfa6ff410515230ef626c439c50f
+EBUILD javassist-3.18.2-r1.ebuild 1032 BLAKE2B f42bd2ab25ceb35db177f2ace8cd06778a1241e3b4280d87fed389b70b35c671657cc2b60b3213871649fb7e8b4e20c345b2df86b5348ddab70959e247113bac SHA512 8e58907a0f1f907182fd843b79c18741be60a22024197b233e03c41842ed147e10ae84bb4babe3fabf673e18a553a44a0e931303a26b03cb775c2501b62c9caa
 EBUILD javassist-3.18.2.ebuild 1000 BLAKE2B 26fa128fb46bb3746bdc9efb3556329b78f612bf5d419eed5719ba0e98d2e2314a9cc2e325ba0c9100265d756b5b53857f03a6540afd2dc4d7740b154a23b7f5 SHA512 ae7b080aac74f5973431125e8351aba6c533743d1df0e157ba624523efb8628eef3824261161d6091c6cba14683767145721f750dd3523d62799b38fa9806a81
 MISC metadata.xml 377 BLAKE2B 4503d9387a65e6f722a3694870c9a9b36a2a1ccc09a2635372d386484a4113c507ade595283ee1f77038517f87814e923bb2f342e226eabb900abb9fdea9b407 SHA512 159f9374d2b9ce20eb531961e35dff0cf90b93eac4a929d1c4cf85242b50bac082ee3bd6dab5cae10dd9cd50a19b7af650df379e27d3238f12794b75ddcbeeb8
diff --git a/dev-java/javassist/javassist-3.18.2-r1.ebuild b/dev-java/javassist/javassist-3.18.2-r1.ebuild
new file mode 100644
index 000000000000..6b89aac947ce
--- /dev/null
+++ b/dev-java/javassist/javassist-3.18.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_ANT_REWRITE_CLASSPATH=y
+JAVA_PKG_IUSE="doc source examples"
+
+EANT_DOC_TARGET="javadocs"
+EANT_NEEDS_TOOLS="yes"
+
+MAVEN_ID="javassist:javassist:3.18.2"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Javassist makes Java bytecode manipulation simple"
+HOMEPAGE="http://www.csg.is.titech.ac.jp/~chiba/javassist/"
+SRC_URI="https://github.com/jboss-javassist/javassist/archive/rel_${PV//./_}_ga_build.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-rel_${PV//./_}_ga_build"
+
+LICENSE="MPL-1.1"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+BDEPEND="app-arch/unzip"
+
+src_prepare() {
+	default
+
+	find -name "*.jar" -delete || die
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	use doc && java-pkg_dojavadoc html
+	use source && java-pkg_dosrc src/main/javassist
+	use examples && java-pkg_doexamples sample/*
+
+	docinto html
+	dodoc Readme.html
+}
diff --git a/dev-java/javax-inject/Manifest b/dev-java/javax-inject/Manifest
index 83a5e73b1556..4174d5ebd4c8 100644
--- a/dev-java/javax-inject/Manifest
+++ b/dev-java/javax-inject/Manifest
@@ -1,5 +1,5 @@
 DIST javax-inject-1.jar 10928 BLAKE2B 3294e302dd1af079d1bc57620dcd4b46169498a1619711837e329dc682aae4e204bc1d6733c9e7dac3fa978ddc183bf6d9833f5d0524d31c1ac95db8c81f2648 SHA512 8bcfae4933073c212c3370a36cdacbff0474648720766df5d0acfc2dafd3307a514b7fb49c08762d32bfca9d8afce47cbfe1eba7399b459b6543472ac9de715b
 DIST javax.inject-1-sources.jar 10928 BLAKE2B 3294e302dd1af079d1bc57620dcd4b46169498a1619711837e329dc682aae4e204bc1d6733c9e7dac3fa978ddc183bf6d9833f5d0524d31c1ac95db8c81f2648 SHA512 8bcfae4933073c212c3370a36cdacbff0474648720766df5d0acfc2dafd3307a514b7fb49c08762d32bfca9d8afce47cbfe1eba7399b459b6543472ac9de715b
 EBUILD javax-inject-1-r2.ebuild 578 BLAKE2B 060433c8a619ebb3d2538115922820f85a1c63d19998a345160a83d07bc1afde5593de92f60f165acab4bd61d9f60f3281e11a9b29b202a2ac54da905e3853de SHA512 411f1bec81aaf28f8f94fdc42325a71c30bf33a57c872b3fd34184a5603866b15c8f17cfce7727f623e8223086babed3654860449e8ed73dadd1555d05f503b5
-EBUILD javax-inject-1-r3.ebuild 558 BLAKE2B c57421d9a4a5e0ab9c62c5fa0f90ce71a9a5eee1f39d73baac7f79b9fecf6172c7d7dae25361e5f84f95f93b3d12f9f67c26d45cc0a6bb04876b8f3ee2a46ee9 SHA512 9006b1f749b0eeda97bd2970fe096e1addcf810083ff7767aae9acc9818979d7be56501c4f676d54353f5ed2940f6ff3b4baaf0055885239ea16152afc920d4a
+EBUILD javax-inject-1-r3.ebuild 557 BLAKE2B 6d6d775132969a785138621a29cea68d7479dd71e7f8b46eaa877feb5818446a0d8cced88b613ea37e1d8f981487a70ef162b38dd70ab8321636da091a9ca3af SHA512 f9ae26244b458849044cb7bb893022426911c4e8b9a1a82dc87e56ff2a141e2a8618084d4cba5b908f04ffedbf3136eae261e13ecdd97f0c6b802989ba63d29f
 MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/javax-inject/javax-inject-1-r3.ebuild b/dev-java/javax-inject/javax-inject-1-r3.ebuild
index 17c565ad43dc..b856834e8498 100644
--- a/dev-java/javax-inject/javax-inject-1-r3.ebuild
+++ b/dev-java/javax-inject/javax-inject-1-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://central.maven.org/maven2/javax/inject/${MY_PN}/${PV}/${MY_P}-sou
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 arm64 ~ppc64 ~x86 ~amd64-linux"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jaxb-api/Manifest b/dev-java/jaxb-api/Manifest
index 0806b99c3c5a..3d091da5e4b8 100644
--- a/dev-java/jaxb-api/Manifest
+++ b/dev-java/jaxb-api/Manifest
@@ -1,3 +1,3 @@
 DIST jaxb-api-2.3.3.tar.gz 193025 BLAKE2B 1cf4461fdc67cc05ee43e880c254290b9dbe8a40b1dc39444d8fb6656698876a4bb16c679ee551ec7baa95c07eaf83e2fe5638a71eafbb158805c14c38888cb8 SHA512 37d6705fc1563f0d35a215e2f176473ee5e817a4a3017afe22042a4235c86b8556ea1fb23210d07ca7ea3cd1e0a3271daa4be8c9652cfe92ce2898f1381de3bf
-EBUILD jaxb-api-2.3.3.ebuild 1546 BLAKE2B bb387e63dba7fcc84408e279ebd609f9bcccb98d581951fce1d0df2ea1340e9ea22e7b00354cd1654f4b05ef033b86bd0a05a0cf6c6a3d7231b9f4dd8c7c1922 SHA512 5b3ec04eeed4536bd952909de96083665a17ae8d57601397302b522f8c0bd16150611ffd60605a24e912e33627be59e017b92e960ce205bf45727036e8db3af6
+EBUILD jaxb-api-2.3.3.ebuild 1786 BLAKE2B 677c14dcf9c7b350c71ee541ca2f3c873bfbd4dcbe06e6e2ae6242574612b78cfb62459286f2747c55b57168a1b1b5e1a77c336a85a7b057fb5aa3cb237a7dca SHA512 50e54d9ba94020606b0074a4da951c8d487c1c5e884c4d585880a73824a014b5188b275537d09954a3e1aa225424b0d0bfb55a77f0813f0562dcf85aab956139
 MISC metadata.xml 372 BLAKE2B 989cc55b0f2734eaffc192a47e27d159a4dcb39b4383c9a19d5a331e2f30d136e7db69e67533d1e6823433ddadd08d127372fa4be0bbf20971dcd9d4d3eade82 SHA512 75fbacfd6c24164733c2382ffef0e56545b304af647880c10f1de7ac599062fed293f9f907097fcb0afe566b370cc9e74887d8450af6f196ca34087e4e0c8153
diff --git a/dev-java/jaxb-api/jaxb-api-2.3.3.ebuild b/dev-java/jaxb-api/jaxb-api-2.3.3.ebuild
index 90e543acd3b8..9fa240685dea 100644
--- a/dev-java/jaxb-api/jaxb-api-2.3.3.ebuild
+++ b/dev-java/jaxb-api/jaxb-api-2.3.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="EPL-1.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
@@ -44,6 +44,15 @@ JAVA_TEST_GENTOO_CLASSPATH="junit-4"
 JAVA_TEST_SRC_DIR="../${PN}-test/src/test/java"
 JAVA_TEST_RESOURCE_DIRS="../${PN}-test/src/test/resources"
 
+src_test() {
+	# Suppress tests for vm_version 1.8 (too many test failures)
+	# see https://bugs.gentoo.org/796995
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if [[ "${vm_version}" != "1.8" ]] ; then
+		java-pkg-simple_src_test
+	fi
+}
+
 src_install() {
 	default
 	java-pkg-simple_src_install
diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest
index 41fc76718b7c..8a58f0d25f95 100644
--- a/dev-java/jflex/Manifest
+++ b/dev-java/jflex/Manifest
@@ -1,5 +1,4 @@
 AUX icedtea-arm.patch 710 BLAKE2B dc479f8db4f1188ecb63708700d1ef0905590aba6b552b573c9fc05027e195d2dc1143542ca1998a5a6feac53af4ef64326da3f746f8aff1149b0bb01a3793a9 SHA512 9ebf22f2771672bb9ef28fcb7eff0d907e9fe4466b18b3ec3915b27caa2edb07934a47311abf41fbe124b484cccbb19ca68f69acd5bd76e46a49b029dbf275b6
 DIST jflex-1.6.1.tar.gz 3027791 BLAKE2B 4262f75c16a847314db8cb175901658ff6b424469e66523b41564179fa30f0e64bcf2d7ad0e06ad918336e5a41e166a74d55f19f7451662d19fbcaa29f716dce SHA512 436840c90d906042205d27e1d3c56dec724bf62cc3d8c8d3445f217af0a50c9ca2bb56ed91f0cd3c37a930f7ca22f4cc50e8c28dbe905f02adf695c8e96fb07b
-EBUILD jflex-1.6.1-r1.ebuild 3544 BLAKE2B 07454e651d891b2da9e4785575c6c31f65af2dbd13d3cc0c9f00f238f3a73040218ef666dc0cea8c7ee089d0ba90c4e190ca3112fcc87d00e85d0f117ae2dc07 SHA512 373529d569d7e4ad8db0d0a96da1f9aa64c536ffe23d5f22c6e9912f665bb23b59f13c3c7ee5db13e1e3125eb0227dc45de220e1c7e05722832b01c994c6ca02
-EBUILD jflex-1.6.1.ebuild 3550 BLAKE2B 68ff187aaa48cefb2018bd12098d7f334859166d7dd03694613c9ec3cdc4050d93daffda51f2cf8f4d55546314c3f4a11cf3e5927e4df455a58a77d59b0263cd SHA512 92cba8225532e333f950dbf078c6c1b71404b044f058e4be1d0a66c10cc29c3b2cc4dd8d7875db5ad8636854cac4f0800b5b8c41694076a22bda334ab6dfe469
+EBUILD jflex-1.6.1-r1.ebuild 3543 BLAKE2B 9dabbd888b52ff63732c80da18559576dd871a34269dd2fd7a6f1817d3d24f464467e149f1e04c3fa6476225bdf6efd6894ab31a797466bb11ce0a1365835df3 SHA512 b1511c58686dbe4d6f4ae5d2e6e730532070508be2b25569ba927c09e6dafdec2614c3cbbfa74725f7fe16ba5de1c76269f1807df3c9624cbc8920361bac9f8a
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jflex/jflex-1.6.1-r1.ebuild b/dev-java/jflex/jflex-1.6.1-r1.ebuild
index 80b924fcbda7..58580490d2fc 100644
--- a/dev-java/jflex/jflex-1.6.1-r1.ebuild
+++ b/dev-java/jflex/jflex-1.6.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://${PN}.de/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
 IUSE="examples test vim-syntax"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/jflex/jflex-1.6.1.ebuild b/dev-java/jflex/jflex-1.6.1.ebuild
deleted file mode 100644
index 32c5d3413238..000000000000
--- a/dev-java/jflex/jflex-1.6.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit epatch java-pkg-2 java-pkg-simple
-
-DESCRIPTION="JFlex is a lexical analyzer generator for Java"
-HOMEPAGE="https://www.jflex.de/"
-SRC_URI="https://${PN}.de/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos"
-IUSE="examples test vim-syntax"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-java/ant-core:0"
-
-RDEPEND=">=virtual/jre-1.6
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	test? ( dev-java/junit:4 )
-	${CDEPEND}"
-
-PDEPEND=">=dev-java/javacup-0.11b_p20151001:0"
-
-S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="src/main/java"
-
-java_prepare() {
-	# See below for details.
-	epatch "${FILESDIR}/icedtea-arm.patch"
-
-	# We need the bundled jflex.jar.
-	rm -rv ${JAVA_SRC_DIR}/java_cup examples/pom.xml || die
-
-	# Remove the bundled java-cup.jar if unneeded.
-	if has_version ${PDEPEND}; then
-		rm -v lib/java-cup-*.jar || die
-	fi
-}
-
-src_configure() {
-	# javacup is a cyclic dependency. Use the package if we have it,
-	# otherwise use the bundled version and install the package later.
-	if has_version ${PDEPEND}; then
-		# Use PORTAGE_QUIET to suppress a QA warning that is spurious
-		# thanks to has_version above. This is Portage-specific but
-		# showing the warning elsewhere isn't the end of the world.
-		JAVACUP=$(PORTAGE_QUIET=1 java-pkg_getjar --build-only javacup javacup.jar)
-	else
-		JAVACUP=$(echo lib/java-cup-*.jar)
-	fi
-
-	JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only ant-core):${JAVACUP}"
-}
-
-jflex_compile() {
-	java "${@}" jflex.Main -d ${JAVA_SRC_DIR}/${PN} --skel src/main/${PN}/skeleton.nested src/main/${PN}/LexScan.flex || die
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_compile() {
-	java -jar "${JAVACUP}" -destdir ${JAVA_SRC_DIR}/${PN} -package ${PN} -parser LexParse -interface src/main/cup/LexParse.cup || die
-
-	# The IcedTea ARM HotSpot port (as of 2.6.1) hangs when running
-	# jflex. We have patched jflex to fix it but we have to run the
-	# bundled version first. -Xint works around the problem. See
-	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2678.
-	use arm && local JFLEX_ARGS="-Xint"
-
-	# First compile (without doc/source) using the bundled jflex.
-	JAVA_PKG_IUSE= jflex_compile -cp "lib/${P}.jar:${JAVACUP}" ${JFLEX_ARGS}
-
-	# Then recompile using the fresh jflex.
-	jflex_compile -cp "${PN}.jar:${JAVACUP}"
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher ${PN} --main ${PN}.Main
-
-	java-pkg_register-dependency javacup javacup-runtime.jar
-	java-pkg_register-ant-task
-
-	use examples && java-pkg_doexamples examples
-	dodoc {changelog,README}.md
-
-	if use doc; then
-		dodoc doc/*.pdf
-		docinto html
-		dodoc doc/*.{css,html,png} doc/COPYRIGHT
-	fi
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins lib/${PN}.vim
-	fi
-}
-
-src_test() {
-	if use arm && java-pkg_current-vm-matches oracle-jdk-bin-1.8; then
-		# This results in a StackOverflowError as of 1.8.0.65 but works
-		# fine on icedtea:7. Don't know about icedtea:8 yet.
-		rm -v src/test/java/jflex/EmitterTest.java || die
-	fi
-
-	local CP="src/test/java:${PN}.jar:${JAVA_GENTOO_CLASSPATH_EXTRA}:$(java-pkg_getjars junit-4)"
-
-	local TESTS=$(find src/test/java -name "*Test*.java" -printf "%P\n")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -classpath "${CP}" $(find src/test/java -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/jide-oss/Manifest b/dev-java/jide-oss/Manifest
index 748e4d14c78f..f1e95d69c134 100644
--- a/dev-java/jide-oss/Manifest
+++ b/dev-java/jide-oss/Manifest
@@ -1,5 +1,7 @@
 DIST jide-oss-3.6.12.tar.gz 4751908 BLAKE2B 731e2c2308e1a7d118a348e3f88258078e16b15f0b3c5bd2ab2ded72d75c4a4c2649e6928d9fbdd1ba7d7b99589a7c1090cb10798e678c44f830df26f0afedff SHA512 a2a60a2af653a1c20099fe81479aadfd252eed086c1009c20a17b561502748cca1cc4b016fe184a60dcb281fd5843c63ad876ca93062bb788e55b485d0e46124
 DIST jide-oss-3.6.18.tar.gz 4752506 BLAKE2B dae7fa89da88295ef5aee03e54778c971b44cc2fc6c017d2e9b24ff9454b9691c34849c9649435ac0a04b28f7fb1ac6b1c147e7fb632e2e30461cf388b3dee7f SHA512 c35f4e5b0462247bb8cc207e1f2120f6a861e796893ce6e7c55e06cab76da84402b3465d420f3fc8d09490f0eb98361d3609bb1675beb9fbf145be4c0bd5ea8c
+DIST jide-oss-3.7.12.tar.gz 4819086 BLAKE2B 9f84b8f9e87b6e74844e11c925546b9a43ae99476c91b84be9269dd8e31658889c3cf38cd67c4a5ec94419d8c5ccecb600c55f747d15e3427e01eb146b0ee755 SHA512 f17ab94fd77237fa0891eb87972b0630a0709fbd7e5d07e6d8389fd18668747d13ca9f631f81cf1153f7d233131a0500e8e76dabf8d33fdce846db14f9958456
 EBUILD jide-oss-3.6.12.ebuild 705 BLAKE2B 9033662f779b7768f4ad56e1771409a3c476f0ad30d3bb5c54ef21aa0e966c3f26533e4e19a3710f871c258e27fe85cbec10679afc889cc3e474d0a05926ef44 SHA512 4bd5def7916adff670bef949d78ff3dc70d07280b7e75060e6e2bcb3bf3fb98c571d3911e53abe30c5be6bf45188466f73d0e97e566febaff5c1f798f8cf2fa9
 EBUILD jide-oss-3.6.18.ebuild 658 BLAKE2B c3c36d5099d427427dbde7169d11411699966a1f8476e3da8215d96404f36247d74faebf9daf451325c2eb40f8a3e3f081758db97313fb9407936758b4523e8e SHA512 ba47cd9be0cd006fc0beba591e4982734050b98692fbf12c09fd1317029b2e930aa69f2037cfbd1912b16b7cad2146c734385ad1ecba48baad0483d9c5d23a9b
+EBUILD jide-oss-3.7.12.ebuild 1808 BLAKE2B 529bdd602f14f22dc744f11581f476b91cd23464830940b21baeebb8ddd4d946fbb19ed1b4a8be42f8010315511bca34460bb2d5e8db7f17ff6a822621e58705 SHA512 dd8b749515c3bb4f0125a32b5c37c0a0e90aea620a9cbc323a574e6c81aacdd0a40b30a918849c33a98c73c5e017d9428dbb883c9155bc3bb676a0a6f95c024b
 MISC metadata.xml 648 BLAKE2B 5cfa79058c3e1e448ea36658dc31dfc7cabad5e9b182c0323a7bfa4b5a2731fb1576077efa90f9b884c02581cb1a27690e4ff36a52d604ffc1fb6add83d2d5d4 SHA512 ec85bfd3f9a4311c5b0ab7314ff9f0e9806eed63cab859f7315b1e693bb74a516ba32786bec62ce826b4eed8e149f4d0e60de4a9cf1311da970f5b7ba443b865
diff --git a/dev-java/jide-oss/jide-oss-3.7.12.ebuild b/dev-java/jide-oss/jide-oss-3.7.12.ebuild
new file mode 100644
index 000000000000..6445ab563a08
--- /dev/null
+++ b/dev-java/jide-oss/jide-oss-3.7.12.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jidesoft/jide-oss/archive/19083238ce00ecbd7370f856cb64ea69dae669a5.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild jide-oss.3.7.12-r2.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.jidesoft:jide-oss:3.7.12"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+MY_COMMIT="19083238ce00ecbd7370f856cb64ea69dae669a5"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JIDE Common Layer (Professional Swing Components)"
+HOMEPAGE="https://github.com/jidesoft/jide-oss"
+SRC_URI="https://github.com/jidesoft/jide-oss/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2-with-exceptions"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Upstream does not support java-11
+# https://github.com/jidesoft/jide-oss/issues/30
+DEPEND="virtual/jdk:1.8"
+RDEPEND="virtual/jre:1.8"
+
+DOCS=( {LICENSE,'Readme JDK9',README}.txt libs/README_lib )
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+JAVA_GENTOO_CLASSPATH_EXTRA="libs/ui.jar"
+JAVA_SRC_DIR=( "src" "src-jdk8" )
+JAVA_RESOURCE_DIRS=( "src" "properties" )
+
+JAVA_TEST_SRC_DIR="test"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+
+JAVA_TEST_EXCLUDES=(
+	"com.jidesoft.swing.CornerScrollerVisualTest" # No runnable methods
+	"com.jidesoft.swing.TestResizableWindow" # No runnable methods
+	"com.jidesoft.utils.TestCacheArray" # No runnable methods
+	# junit.framework.AssertionFailedError: expected:<0> but was:<100>
+	# probably the test is wrong as a cache entry is created for each font size
+	# and each iteration creates a new font size
+	"com.jidesoft.utils.TestFontUtils"
+)
+
+src_prepare() {
+	default
+	rm libs/junit-4.10.jar || die
+}
+
+src_install() {
+	default
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jline/Manifest b/dev-java/jline/Manifest
index 94967560fdea..fc279be0c551 100644
--- a/dev-java/jline/Manifest
+++ b/dev-java/jline/Manifest
@@ -2,6 +2,8 @@ AUX maven-build.properties 501 BLAKE2B aaaaeb13e4e23588d6fe8c5e990b1e95edade85a7
 AUX maven-build.xml 8634 BLAKE2B 4d1078e1201baf11da35772d0e48304522cad6b606a6d601c449bf1d97b2a43725ddcf703dea154ac923955aac5489d164686fb042fcb7c1753d0e9ef619a283 SHA512 45648b88f3df01e0623483c6c409ce1fb57b6b73e62775064b4bc7762d1dc3a3ead3a4925efe987986081ed34c26195827f3f34a1b631fdf4e7ce227376c2936
 DIST jline-1.0.zip 463082 BLAKE2B 4f4eec5a2674bf97ed9fe83c60d339fce54dcd556aca6e95db74438e87253fd4e36e4eef26b3ac14ed84fff3d2fe1b58ba3a6fe13f33d96fe50a34f7bb34f541 SHA512 2957e19a3536d89aeaf8f27afb1f8eb4eb8bcc99560244c7f1ba14693a84a2f5e677a6c21d5f85ec519674cc4cd6cb3c9e4725cb4797144168d2f6df3954aba9
 DIST jline-2.12.1.tar.gz 97289 BLAKE2B 375711ad78cba26c0b4702dd739a18dd4db2fd1e8b16ce817dd1f567c405b7b0f96c72a6c6b7fabff1520617cf9149a29040e132d0b61e2d57149bb83b404c8d SHA512 368492fa0b28e6aa3827db05d266b332935d9a03c2f6645d039941c61a698e85fd57accfac444503de4cb2f2dae5787496924b8d258faad1c18b6cafe787f99d
+DIST jline-2.14.6.tar.gz 116599 BLAKE2B a3576314d8bb4886e0297822e0f37b4cc4c49cad1c5ea71a61a2813b0afae7ba8a5d5ad914fe900c4dca6c2f3891551157ca4a3d24231e8731cda4b5dbe80b32 SHA512 9e141c9a112dcb4850db95a7c2cec9b84f11be1f6740a3a33c99ec2ed5f900f4dae7474058e14319ef79476121997afbdb248ca22559a82a905c31690afa1d51
 EBUILD jline-1.0-r1.ebuild 1648 BLAKE2B 19912fc975f67b97d779cb4b45ecc166abb6a888199b8fc22e2ef756a0fca488bb5392f0d4a49cc600950f7c84e654342c780170151567c1f3bc18ed9ececf14 SHA512 0720db354b7051ee9f322fb186dc5cb2a9f75919ee2daa92710f1d2fbd001519f61ecfe994a11de67eb7c5f5a8f20191235f3ff1ede74cd75eff733d2a436eff
 EBUILD jline-2.12.1-r1.ebuild 1286 BLAKE2B 617c3fa79f322537294de7546548a0ffe9d0ecf5ea7fff4bdd2becf22c20c0d648b4c0835c6d94756cf8f55b9bd5f8c95609ee0a52aed1808f7829a68de02820 SHA512 efe14afc050da11b56004f1abc43dd4d4346a8c50a839e8292e054958e372e8d2d56cf62631a702fe06cff7efc78a99cda92f859dbf30941f94e4ab3380c2ebd
+EBUILD jline-2.14.6.ebuild 1396 BLAKE2B 0d3d062551a82ea592ae995e5dd1eee4526cb23a976c110bb37173200d11b54584797823940a028cefc8936a438102eede91629f5b3cc47e47ae3de3d0633870 SHA512 ea4b027c443910aa74f0f8cb79eb3a7bd376a4b964fad245ffdce20a4b6bbfcd530085c5538049436dca0397aa76fc18a857d452eb427e5b492144578950e34c
 MISC metadata.xml 376 BLAKE2B 5879728bea0aa1b1d38110a053b6144407077d14968a0f45a76079388a302071ecb543c67366d3b3bbb30768eba852f07100e89253a7cdd9342614828d171a3c SHA512 363bc722f4e7908aba60f0c655265b289614ba80338ad381b92f2cd6e2214331b76fda29855a5a0fda992de7f03acb3a48e4bca10cb0147b5b302f499a5b25bb
diff --git a/dev-java/jline/jline-2.14.6.ebuild b/dev-java/jline/jline-2.14.6.ebuild
new file mode 100644
index 000000000000..d8cb303a8f10
--- /dev/null
+++ b/dev-java/jline/jline-2.14.6.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="jansi,jansi-native"
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java library for handling console input"
+HOMEPAGE="https://github.com/jline/jline2"
+SRC_URI="https://github.com/jline/${PN}2/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}2-${P}"
+
+LICENSE="BSD"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+# Needs yet-unpackaged powermock for tests
+RESTRICT="!test? ( test ) test"
+
+CDEPEND="
+	dev-java/jansi:0
+	dev-java/jansi-native:0"
+
+DEPEND="
+	test? (
+		dev-java/easymock:3.2
+		dev-java/junit:4
+	)
+	${CDEPEND}
+	>=virtual/jdk-1.8:*"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+src_prepare() {
+	default
+
+	# Easier to use java-pkg-simple.
+	rm -v pom.xml || die
+
+	# Don't forget the resources!
+	mkdir -p target/classes || die
+	cp -r src/main/resources/* target/classes || die
+}
+
+src_test() {
+	cd src/test/java || die
+
+	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars junit-4,easymock-3.2,${JAVA_GENTOO_CLASSPATH})"
+	local TESTS=$(find * -name "*Test.java" || die)
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java" || die)
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	dodoc {CHANGELOG,README}.md
+}
diff --git a/dev-java/jmh-core/Manifest b/dev-java/jmh-core/Manifest
index d3aea38d29b6..e341d6d89c77 100644
--- a/dev-java/jmh-core/Manifest
+++ b/dev-java/jmh-core/Manifest
@@ -1,5 +1,3 @@
 DIST jmh-core-1.21.tar.gz 615305 BLAKE2B 1a5cfe9784efe0cd7706382eaa89c8bcce0efcce3c2b802ce0772992dd16f0c6900a47d70b72d1c556584adb8afda442f49267ad4e0b53d04c20026979787210 SHA512 ac51d58d9b746157842a3bc9c4828bbff52c5882582e123e04b5ab6c4bfc1ff3cad1f6023ab1fe1eccfa68c73ffbd21b34388547bba544626af87092852ec166
-DIST jmh-core-1.4.1.tar.gz 585746 BLAKE2B ff6e9d3e8b11827042a9ff9983505fa5272d943a8365cf14ac43d940a7815f280c2b82c3ab810f1c22328a932912f6b09b9c5d5f1838a3cb357e6ebe21006e49 SHA512 a33c63b82712deb53218bb8d955c9606e5f393ff0c6256052ac8df022ec45be79bc0ee5ee08ce0d3762594214814bcf1e562717d83daa9ce13c664ca9e7c431b
 EBUILD jmh-core-1.21.ebuild 885 BLAKE2B b5ab688fae4c7af12e0cfd2f5df1d578eb289ef2f2cf8a447749c6a21f840af6a88538773a9589785cc7aca78d90a2b2aadcba45921a4dd70371a0dfc30aa125 SHA512 542c21c157bb7b3c4b05b9ae50fccf42ddd0c6a279a3da4850e65e9f6c441d8e19d51cbd5234b55e7fa9006067c043129bcffd627a257caa5d3be10dc48ac6d3
-EBUILD jmh-core-1.4.1.ebuild 973 BLAKE2B 19bbd2fd6f94225ccd6c228ad5ba369770b301e86084eca8483a2f1234b20df183e4c47667e58bb28699d8766f413f76d5942390356c7b9b27822a2f584f2b59 SHA512 148cd479199a30796be28f2ff29a4a47db9b63179f99a5f7d9183f8e578cf8cb50e47843d8da7aecdcf1232ba365223cff6b3012ea7e35ad44f101c068b37211
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/jmh-core/jmh-core-1.4.1.ebuild b/dev-java/jmh-core/jmh-core-1.4.1.ebuild
deleted file mode 100644
index b2ef63a5460b..000000000000
--- a/dev-java/jmh-core/jmh-core-1.4.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-# Hash of tag, download not available via ${PV}
-MY_PN="jmh"
-MY_PV="7ff584954008"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Harness for building, running, and analysing nano/micro/milli/macro benchmarks"
-HOMEPAGE="https://openjdk.java.net/projects/code-tools/jmh"
-SRC_URI="https://hg.openjdk.java.net/code-tools/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# jopt *must* be 4.6, see https://mail.openjdk.java.net/pipermail/jmh-dev/2016-October/002395.html
-CDEPEND="
-	dev-java/asm:4
-	dev-java/junit:4
-	dev-java/commons-math:3
-	dev-java/jopt-simple:4.6
-	source? ( app-arch/zip )"
-
-DEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.7
-	${CDEPEND}"
-
-JAVA_GENTOO_CLASSPATH="asm-4,commons-math-3,jopt-simple,junit-4"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}/${PN}"
diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index 6ce33b39267b..9ae1503b2225 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -1,5 +1,5 @@
 AUX 4.2.2-build.xml.patch 819 BLAKE2B 5f411361cd566360206c996ff5c2c508e829e41bb56868dce428da1347ab91f7fc8e1230b6aca3e82806c80b23a038966f690a16f99b43b5b2594bca543cb606 SHA512 8d2e0552690c9282ce93e39aa489c1fd829e5e63e39c6e6db935b6b5e2308a3ee3cbe1a274ebf2ba59d9819dd4f618d89e22194a9f88dec0763d2a36cd3ca44e
 AUX 4.2.2-makefile-flags.patch 925 BLAKE2B 642982867b5c187345123725f5e19bccb363915aefc5ea6e69f02e9ca86efee1e5f466c7cb9abf1b2871a735c45f8b7adaf999e42a351e01e515ecdc6648387e SHA512 be29adfff3b92875b38cf9bb326d935a189555bbb10315412b2544b43698cf76132554df64f28a18d4910ef1c46daf8b0a2ef9db7a9bca1ab53c421504187e54
 DIST jna-4.2.2.tar.gz 58638853 BLAKE2B 3941202ad7839f748c65f1abf53a335f6de7959def06de27a30520457147af3f70f6de54d640718b8314f6e61ab61ee9b26c39812d5cb1f918b8ff714d6b902e SHA512 11ab524f87f6dc7fe3ac8eb0620f9ba392445147770304be7b7fa5cd49de8efed983ad30c16077bfa6419eaf1ff50311a3ded811a78fdcd09bc686ef93ad7f9f
-EBUILD jna-4.2.2-r3.ebuild 2143 BLAKE2B fc92ccc827c1d4118707c76477119d0c0d31d3783fc6f900c49bfaa8fa5359cc1a05c9a72febdcd9831363b3a1353992df35e9fa1446135e90a43d613b2b5e12 SHA512 23106b242b13f8927a928b18cecc87d9422275a7b82b59eaf9d143c5f57d13a65a44991357d04dc5a60e4da78cee837d7bfb1a496bd52bad4a3bb0fcbf60defe
+EBUILD jna-4.2.2-r3.ebuild 2141 BLAKE2B d5a90972ec2f0239869e6730183c20d8f79aab6941bd2fd9467460c038c75cdf0823650b1910da1a68e4fc228e6e73efc122e55b43cfc785dbf5ab4eb0a09757 SHA512 858d76df1db600b5b9b2db814fab0da2a9e9f83c807c78ccc26e90285fc9354a6d3c86ef04882a37c157566a0e75bb382593457fc4d57f921663a4d63769261e
 MISC metadata.xml 463 BLAKE2B 9ead7422212fdd6bebd8ec6aabafcdedf0d32420d312a8a0f2cd701dc7eeb940a30e91d1dc0449899a6134e1cb96d47cf95cea5dc20b4974b3d8714c6c00f93b SHA512 1365756d0d98cd7e7bcee2a608a77f1ca95c9546567a0bb37ba0033eb997ef6ae37d86e79c7c7fdc0916cb515658f9a37924181efc3215d00c825b10f9f99b45
diff --git a/dev-java/jna/jna-4.2.2-r3.ebuild b/dev-java/jna/jna-4.2.2-r3.ebuild
index 6ba89af05328..7568ac95b61e 100644
--- a/dev-java/jna/jna-4.2.2-r3.ebuild
+++ b/dev-java/jna/jna-4.2.2-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/java-native-access/jna/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="LGPL-2.1"
 SLOT="4"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="+awt +nio-buffers test"
 
 REQUIRED_USE="test? ( awt nio-buffers )"
diff --git a/dev-java/jnr-constants/Manifest b/dev-java/jnr-constants/Manifest
index ba000f809c2d..0270d2634970 100644
--- a/dev-java/jnr-constants/Manifest
+++ b/dev-java/jnr-constants/Manifest
@@ -1,4 +1,6 @@
 AUX jnr-constants_maven-build.xml 11304 BLAKE2B fad6aa5bfb222be73e0c064802dfabf5370562de03db80c2c35c03423e6829e11622cbb1a87f92929de9a8f2b70c3dfc039071c5e9c1cc5b27e40289a3f92fca SHA512 ebe66da46f9d80e02361a895c2aba7b635cf0a4e550f7a4f4c5534684bcf06585b43458381d6a3dc526d0f020b96bf93a259d2b4b6125c23e5d6d571a373ce2f
+DIST jnr-constants-0.10.3-sources.tar.gz 261921 BLAKE2B f8137455c067e774dd30d64fe457dd859692315f43415bdfbffa4870b981db26de23d73fa7682bbd924523ac17dec56caa7078580cf817d8df3eae4d87c61343 SHA512 f7cd6a3778670c9835f8dce87c8470c8b8cfeda6f30d68051c09dae40c4f7dd7db88bed016450c33ab5c8da9a802b4bd050adf358680d5ec6735467e398404dc
 DIST jnr-constants-0.8.6.tar.gz 71080 BLAKE2B db86f3c0347b85dd56de72465c4198e74faa877b8a1373ab378728945edaf0c45748ed707e6b591224858f498ae7d43269d8127cb61b7ac2893ef9817e36ca1c SHA512 2098f8e1869b9c018ba3afa70ef386fce2609d9c650ee851dcd7cf7dc9d4d87dbe26886eb2e744d96cc11425f6b66144a018826360b7bab48a4b99e323f3717a
+EBUILD jnr-constants-0.10.3.ebuild 978 BLAKE2B 43649757debf23919460872fc67a8e6277fb4db8883464ac68a90c3aef1e8fc74fbfb7bb0624a94217702670fb2aba9da2a8a38c7fb1d59bcc34d5c318d6e70f SHA512 36d4f2371cd45f2c031829d37a7db985693f94e45e8272300ae920fea0904be33b648fa9ea4e00dcba1d4205df608eb4aa35b1e59ea18224234e36b76c2e5ba6
 EBUILD jnr-constants-0.8.6.ebuild 1058 BLAKE2B 512071e039a49fe64ae6432bd51979a1c3e13abf3cd655570f9aba4c74fb66df9eb433014f191d676aa79d7a04ae70394905f72dd812414e74f4d359853199a6 SHA512 d1fe0d566c5b8749bea6015a5cf6955763d187e48d4855147b9660a87dd8f0231f4a678080569f5b0b6ab48024d61948b232a0ef23451420c6969e2ad830d985
 MISC metadata.xml 329 BLAKE2B 6ab95abb16b9a4503c12cf6e06ae18a6ecbf217390f9ca6ba52516bedbe0c69c074aa3a01906974cca84efc02751afc2328d51245fce52d86996d64358f1fd08 SHA512 2e04327f332a4a421dcec67655242822cdd5f5ea5a8d2fdd37f24e68069320014a3bda438041f189831ef85087d53b4015c506fae40ec3a7494ef1f1efe41970
diff --git a/dev-java/jnr-constants/jnr-constants-0.10.3.ebuild b/dev-java/jnr-constants/jnr-constants-0.10.3.ebuild
new file mode 100644
index 000000000000..f6faf1a073e1
--- /dev/null
+++ b/dev-java/jnr-constants/jnr-constants-0.10.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jnr/jnr-constants/archive/refs/tags/jnr-constants-0.10.3.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~x86" --ebuild jnr-constants-0.10.3.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.github.jnr:jnr-constants:0.10.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A set of platform constants (e.g. errno values)"
+HOMEPAGE="https://github.com/jnr/jnr-constants"
+SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${P}.tar.gz -> ${P}-sources.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/jnr-posix/Manifest b/dev-java/jnr-posix/Manifest
index d75538b4383b..d5a0c7ef5ead 100644
--- a/dev-java/jnr-posix/Manifest
+++ b/dev-java/jnr-posix/Manifest
@@ -1,4 +1,5 @@
 AUX jnr-posix_maven-build.xml 11760 BLAKE2B ec75beb884ccb81dc28c38db22e64953a6f536726105e2fec5cd38f7be2286091054026d6cf77471d03f5095c44087d8f7fe9d3065d31df26b018988a843fe39 SHA512 ab3f6b00e08cd7fff5f44df1c2a0eb9e73d3ad7400e6e708dcd1432b6ad122bfb0b8dac6417eb67a02d0fc2d19477d81287d2b202275676826081610d3e27d8e
 DIST jnr-posix-3.0.10.tar.gz 85912 BLAKE2B b87ff78ccf10718bd1faf9e308421ba3ab5e90dee5e244fb1b7f53592da8ad98973cc50e6469bcea59e1202ee82b3f77522eb95e23584ff70cc66099ef1c4266 SHA512 a282c164b0b9ace8aba508a48d08d53beb0ddcd4baf5389412941a1e1430d75df9bdd35935a6982d4bb1910c0fdad55910ba028b1b5388c55e19a6c4ed2ba6a1
+EBUILD jnr-posix-3.0.10-r1.ebuild 1287 BLAKE2B 73098e3f6119cc1f0ffa586ba124e4abf2ccacf1b9fd4a0c0bf722a0886948230216d613357e4fb30ae051c84dd34857a5faf4686740ebc68d9c4b6a25813cd3 SHA512 a77250f3318c7341b177870ed973f0f1c1b53e89e709f504d8aaf6d8fe38957a8186c0af86259f86a6e9b5f5da1a46d173a30a2d108bccbda1a3df0bd0fff9fc
 EBUILD jnr-posix-3.0.10.ebuild 1241 BLAKE2B 00b01e8f5a6426c41dd2b9c31528d7bed51ff75d1a27f9faf333d0adb7d1e0af0e4439a82bea687cb073881360a94545725c7f34fc161c8b43999b38b19dae35 SHA512 a89817b0b1217cf3abc7ab01a58167f7fdb860e0e90794fa025cdcbc236e82763c1f7134cfe3830b51ba67bed21d3d00e63052c959d7551a8f4370bf3eef8892
 MISC metadata.xml 325 BLAKE2B f40ca825a92205c1ef0e0be2e72c859b680593c0f852aec73c3d84356a9927f5f536ffcec7b7a365353ac56489677d7881f9f27431abc56cdf9cc24550493097 SHA512 ff2bae0526d5ae082ad290411e7d3cd95a197918e4d834a531cab016ff9a718197a27fb2c7a4f7426bb44a5b295e164a72dd36f5fac800bc20388fde0f52e0a4
diff --git a/dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild b/dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild
new file mode 100644
index 000000000000..56aef1d07026
--- /dev/null
+++ b/dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
+JAVA_ANT_ENCODING="UTF-8"
+
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+EANT_GENTOO_CLASSPATH="jnr-constants,jnr-ffi-2"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Lightweight cross-platform POSIX emulation layer for Java"
+HOMEPAGE="https://github.com/jnr/jnr-posix"
+SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
+SLOT="3.0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+CDEPEND="dev-java/jnr-constants:0
+	dev-java/jnr-ffi:2"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/junit:4
+	)"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+}
+
+src_test() {
+	ANT_TASKS="ant-junit4" eant test -DJunit.present=true
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+	dodoc README.txt
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/jnr-x86asm/Manifest b/dev-java/jnr-x86asm/Manifest
index c0fd420ff2ef..f07d9e4b3e09 100644
--- a/dev-java/jnr-x86asm/Manifest
+++ b/dev-java/jnr-x86asm/Manifest
@@ -1,3 +1,3 @@
-DIST jnr-x86asm-1.0.2.zip 180046 BLAKE2B f346357dadaf4727e061ae4f11cb4a2fcb0aac7056c1ddc902c1779a0aa323ed47a90b7a7fef1148e4aefba2f003853d10718ae01ddcaffeb2b5b6d80d362b83 SHA512 e77124b7f0074dcd8b17ba200a1c99350827e6a3c641d6caa33b6bd900c95af9140f8ab716a5299bc591969f295158709b381f9b45faddbd6b75355949e4f463
-EBUILD jnr-x86asm-1.0.2-r1.ebuild 577 BLAKE2B becf1dd79bcf6986973721edfc415ae50b54d57001923f2ae12b4230ae43e80b2a9373845aa813c34db393ae1f495b9b238bf797f33067257fea997fed990741 SHA512 ae6ce3fdc502bffa25a2444976f29e90c069135fccbaa1a7912fbc3adc2cca37785d021b84f42dfbb1e7a422fce3eb539bb4b1fe3bd97ed7aab76501a298f802
+DIST jnr-x86asm-1.0.2.tar.gz 114138 BLAKE2B 4fd5d331e271e03771c1165823a3852b0ea9f5c45df26c7a009d356173050aabf99a7ef5a17559ef8fc907e521f8fae96b048867703bc901504fa21bcd24c3d1 SHA512 e3ad28b2d6be36b9e9d3e20bbe5cc6bf98361372fa02a40d0bbf64437fca351c3dac5cb04dfc8c2f08d73b9bffc8ca69276fb6a6fc00c7cc5cc3cf08fa2b6463
+EBUILD jnr-x86asm-1.0.2-r2.ebuild 595 BLAKE2B 66fd5c0475511dafaded9c2c746be50498671c5a016320ce87da166615302e63468689b56064cd3f4d36f0faf3a49149ec78de35548f1d3522f9cbdc5a8df728 SHA512 de5fa9e73b9efe60fc0e01751dd5c62d3e27800a5974bcd999ce9db7730204979d0f83dddaff29d03e77ad069ca63a2f8a637361fee43a8e6dd03f32afad3f3a
 MISC metadata.xml 326 BLAKE2B d21a275305a4fb768fb9d3de5852aa7af12456df54a67386f5cab01a16b999a7b59528729aae8b8bc285c134be3d1b63f0c4bce5d6c0c90467debce762da304f SHA512 769360259d3ea42979fd724dc2b0115b63d625e561377378f992313092ed2143ef80edd877d97e1923134d28966876e1e820e369347b89e0a8ebba15058855a1
diff --git a/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r1.ebuild b/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r2.ebuild
index 4cf9bc564824..d07cd3ef9b66 100644
--- a/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r1.ebuild
+++ b/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 JAVA_PKG_IUSE="doc source"
 MAVEN_ID="com.github.jnr:jnr-x86asm:1.0.2"
 
@@ -9,15 +9,15 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A pure-java port of asmjit"
 HOMEPAGE="https://github.com/jnr/jnr-x86asm"
-SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.zip -> ${P}.zip"
+SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="1.0"
 KEYWORDS="amd64 ~arm64 ppc64 x86"
 IUSE=""
 
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/${P}"
 
diff --git a/dev-java/jsch-agent-proxy/Manifest b/dev-java/jsch-agent-proxy/Manifest
index 7f19e5263eb8..c937d7e3a599 100644
--- a/dev-java/jsch-agent-proxy/Manifest
+++ b/dev-java/jsch-agent-proxy/Manifest
@@ -1,3 +1,3 @@
 DIST jsch-agent-proxy-0.0.9.tar.gz 19040 BLAKE2B d20989663ed4544d60e890d48c8b3262184bbdf5bc6b8a42d8a008a0ad94831b283ec76382616a3df2f9ad677e59608920bcbc973f6da79d8e373dc21758ece8 SHA512 a80bb2cda8f0a96f4d069c64bc60633292fac46fcca94402f2c2762d3def94e3b9fef886b56e8f2b834141643173cea29ca678a61963fefa33fbb3cd56c1af88
-EBUILD jsch-agent-proxy-0.0.9.ebuild 3306 BLAKE2B 610046d057c153c5af07b4f768e105a487d00e14ded7e7113e8fe57a39cd11d4f9d59ec4d04ebc6a19699345ff17e1d0ab45da150269ee2ce05b91cf0bd28966 SHA512 b930f3a2cc8266a6a8034563a9b64e95f1b2a3f5e5b291382e6dc7eae10bc15e88f14813a09aaafcff10636424a45015235d319a4788929c78cff896d9e17ce7
+EBUILD jsch-agent-proxy-0.0.9.ebuild 3304 BLAKE2B e192b7a5954e7558d1df4e0ee02040c9e2418c15c06f26188d93c971ebe0260ac11d8c91479cbc41dbb639d2be1e9af3dbac1a536f92cf718c107896a8ddf58d SHA512 3323ba714ef7617d534b743b290c66cc0b3e5a7a2129fd0986ecf51e1a570d4573c0a0acc11e7131d8eccebe7c015f8fbc001aa12598abad3c766fd7ad25126b
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9.ebuild b/dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9.ebuild
index 1d9101a28232..e4c6da170965 100644
--- a/dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9.ebuild
+++ b/dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ymnk/jsch-agent-proxy/archive/${MY_COMMIT}.tar.gz ->
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 # Common dependencies
 # POM: ${PN}-12c3d64fc2b0a4fd37659369edfdee26e48954e2/${PN}-jsch/pom.xml
diff --git a/dev-java/jsr305/Manifest b/dev-java/jsr305/Manifest
index 48478718a433..d4ac253cf815 100644
--- a/dev-java/jsr305/Manifest
+++ b/dev-java/jsr305/Manifest
@@ -1,5 +1,5 @@
 DIST jsr305-3.0.1-sources.jar 16622 BLAKE2B c9cc042845c8cd0d4680568d1c1f7c3ae43ba03c0bc21eeac662572ec17a048b86d38848f116653f466904f5a90c345ab7e5ac827fdfe00c899521cea54e3474 SHA512 ca9902929de94fbc03b848599bb1f5f542898ade724eb0d6022f799733c9093bb27c0a565f0a90f47dba7bff72d5a6d24de687746721a1bec2050c2061ecd148
 DIST jsr305-3.0.2.jar 18102 BLAKE2B fa6c40a63eb3e4683ae70612058420a905428b9ac9b920b2f7f4024579a5ff6fcffa576d50a616ed585b4896cbba87f4496273b860930f047184cf5df77004d0 SHA512 02327071dde09470c8cd0fe39405263146d7e86b15312bc3f909c6a6fa9b11c730bdb833b6cdbdf1aee0c6553e519cecd0257a296947f94636650e88cd8c5b79
 EBUILD jsr305-3.0.1.ebuild 503 BLAKE2B ac29e41915dcde9d9913dd1c80ebeb0d5fd4d3a7156bf9bb47a94e6b6d79039ec23ead549001c696e2aef3bd8ba30844a50274b67f5af34cc67d4dd2b07eef07 SHA512 22e394320bf2bbbfe313a0228e6bebe6f67e0f66e23ada4c2ab1989dbb21a7ad602e2df1fd4ddbde6c005108fd917f7ef6f70db3bdd6c938201ca92181b8f88d
-EBUILD jsr305-3.0.2.ebuild 515 BLAKE2B b5db1b566a513b5aadf5082f7b8cdd9d60c27b1c96f440b8b3c1226f7bfa9350532c7f0ada9ec23e02283cf6dbc0f4091260991b15dac79055da8bdaa2a1bde6 SHA512 d823252f6e0a007a2994009a15361b284cd997144b7f18679bb4fca8147e669f0dabaee8dc53bb8cf002204e18fddcc331a913812ec033f572499f74a4711f2c
+EBUILD jsr305-3.0.2.ebuild 509 BLAKE2B d439ce95a708467ee1e9ed9e57b7e9bc1902ca31c1185b4b3849dedb84da1a2bb9dbd547f0a92b13128d76548c395a49a64b5dd0d4e86ce1e65f85ad2c1c7c8a SHA512 638cfc78322fd55d93134c129c226ed0c7cb43e6f3a3ead4893a733a15d7a4cc74d9c351339b26049f93e885fe7e8fa0c45b1ae64e2205934f1de0359c0e0ab2
 MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/jsr305/jsr305-3.0.2.ebuild b/dev-java/jsr305/jsr305-3.0.2.ebuild
index 13fb5256256d..c9b9cc291ba3 100644
--- a/dev-java/jsr305/jsr305-3.0.2.ebuild
+++ b/dev-java/jsr305/jsr305-3.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="http://central.maven.org/maven2/com/google/code/findbugs/${PN}/${PV}/${
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 ~x86"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index b1211290ee0a..7e1af474a680 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -7,4 +7,5 @@ AUX jython-2.7_beta1-dont-always-recompile-classes.patch 309 BLAKE2B 72fe6e0afe6
 AUX jython-2.7_beta2-maxrepeat-import.patch 457 BLAKE2B a55f47a16264544608ba9916d3f2ced081a4f47d260bab2eeeb5959ad1aaf1074a69bea4d8083383d039f541f6b379a141c81c4376a7f7cf324ce06ddeb84ab1 SHA512 e06ddb36805e2545f351d9d5df651fa90b0b39d340e4772cbb24910f1e1c999463a21fbe4a62c9cc73f9ccdc0047f8900e6300602cb8d5b70cef7cacf1bd46d0
 DIST jython-2.7.0-sources.jar 15371691 BLAKE2B 7e1c29f2a2c03b034e89bb9c3a8fdddbaef6a0191a7320c82b76e31b41336f3d99c1995b2e9864c033ec53629d45669ad460fb4a1433ea7bc6b0390919500a24 SHA512 7583810245d694fd1d99a57ad504fcefdfbc1183def2cbb93ae3660f341104205c73041d846bdcf2b564b3cf4b770b481703c1dcdb1458396812c92d30ee9fa6
 EBUILD jython-2.7.0-r2.ebuild 4293 BLAKE2B bda7d9292683c1b8d1b411e537cd82820a4cea8ecc53ac43089bb8252cdfee7f5c89a9cbaac05970a547c0aa27a35739237d7026cb347156baf27f74fae1fad5 SHA512 65412b5ecbf72f2dc4e8f7873e600e3fb044b8377c07b9b1e3ace713796603945b0c823d8064eceb0700434045693926ea5ddc8ec6ab758683b42f9b37064576
+EBUILD jython-2.7.0-r3.ebuild 4288 BLAKE2B ff21369c1d36b3db3a5a4b87a14c7112778769b6bd3efc55bd3d79feacd71e112099d4e2912db49b2259e4c9e95b66bec7bd990ac5809bec8e5c3fd9cc2960ca SHA512 74ca760a0f631dfcada8574a6d4a5f50b683e8aec53868599844109d8ea02c08e3e7753aa5a9e55481f23599b9f251138dfdf10abca93d3cea0342b54368c25d
 MISC metadata.xml 323 BLAKE2B 4c2b07b6a519fb3f1e4f7d0662e2488705d8ba2239a6cbd25b42aebd1bff1ca368105e1c5eee604915428c5b909ecc2547f6be4dfad126139a7f496bb276ae02 SHA512 de33eb0b1518ca8c0c9f8a44880946f491620bbcbfe0d5ebcb68dca71eba3965f0cf0ccd8c67128022c33845699222bd8b899c061cb5f7d7c0e09a4783fa3464
diff --git a/dev-java/jython/jython-2.7.0-r3.ebuild b/dev-java/jython/jython-2.7.0-r3.ebuild
new file mode 100644
index 000000000000..e4c5606e1118
--- /dev/null
+++ b/dev-java/jython/jython-2.7.0-r3.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 python-utils-r1 flag-o-matic
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="An implementation of Python written in Java"
+HOMEPAGE="https://www.jython.org"
+SRC_URI="https://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_PV}/${MY_P}-sources.jar"
+
+LICENSE="PSF-2"
+SLOT="2.7"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+CP_DEPEND="dev-java/antlr:3
+	dev-java/netty-transport:0
+	dev-java/asm:9
+	dev-java/commons-compress:0
+	dev-java/guava:20
+	dev-java/jffi:1.2
+	dev-java/jline:2
+	dev-java/icu4j:55
+	dev-java/jnr-constants:0
+	dev-java/jnr-posix:3.0
+	dev-java/jnr-netdb:1.0
+	dev-java/stringtemplate:0
+	dev-java/xerces:2
+	java-virtuals/script-api:0
+	java-virtuals/servlet-api:3.0"
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	dev-java/ant-core:0
+	test? (
+		dev-java/junit:4
+		dev-java/ant-junit:0
+	)"
+BDEPEND="app-arch/unzip"
+
+S=${WORKDIR}
+
+RESTRICT="test"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" java"
+
+EANT_BUILD_TARGET="developer-build"
+EANT_TEST_EXTRA_ARGS="-Dpython.home=dist"
+
+# jdbc-informix and jdbc-oracle-bin (requires registration) aren't exposed.
+# Uncomment and add to CDEPEND if you want either of them
+#EANT_GENTOO_CLASSPATH+=",jdbc-informix"   EANT_EXTRA_ARGS+=" -Dinformix.present"
+#EANT_GENTOO_CLASSPATH+=",jdbc-oracle-bin" EANT_EXTRA_ARGS+=" -Doracle.present"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.2-distutils_scripts_location.patch
+	"${FILESDIR}"/${PN}-2.5.2-respect_PYTHONPATH.patch
+	"${FILESDIR}"/${PN}-2.7_beta1-ant.patch
+	"${FILESDIR}"/${PN}-2.7_beta1-dont-always-recompile-classes.patch
+	"${FILESDIR}"/${PN}-2.7_beta2-maxrepeat-import.patch
+	"${FILESDIR}"/${PN}-2.7.0-build.xml.patch
+	"${FILESDIR}"/CVE-2016-4000.patch
+)
+
+src_prepare() {
+	default
+
+	find \( -name '*.jar' -o -name '*.class' \
+		-o -name '*.pyc' -o -name '*.exe' \) -delete
+
+	# needed for launchertest
+	chmod +x tests/shell/test-jython.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+src_configure() {
+	# apparently this can cause problems
+	append-flags -fno-stack-protector
+
+	EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --with-dependencies antlr-3,jnr-posix-3.0)"
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only ant-core)"
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local instdir=/usr/share/${PN}-${SLOT}
+
+	java-pkg_newjar dist/${PN}-dev.jar
+
+	java-pkg_register-optional-dependency jdbc-mysql
+	java-pkg_register-optional-dependency jdbc-postgresql
+
+	insinto ${instdir}
+	doins -r dist/{Lib,registry}
+
+	dodoc ACKNOWLEDGMENTS NEWS README.txt
+
+	use doc && java-pkg_dohtml -r dist/Doc/javadoc
+	use source && java-pkg_dosrc src/*
+	use examples && java-pkg_doexamples Demo/*
+
+	local java_args=(
+		-Dpython.home="${EPREFIX}"/usr/share/${PN}-${SLOT}
+		-Dpython.executable="${EPREFIX}"/usr/bin/jython${SLOT}
+		-Dpython.cachedir="\${HOME}/.jythoncachedir"
+	)
+
+	java-pkg_dolauncher jython${SLOT} \
+		--main org.python.util.jython \
+		--java_args "${java_args[*]}"
+
+	# we need a wrapper to help python_optimize
+	cat <<-EOF > "${T}"/jython
+		exec java -cp "$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}:dist/${PN}-dev.jar" \
+			-Dpython.home="${ED}${instdir}" \
+			-Dpython.cachedir="${T}/.jythoncachedir" \
+			-Duser.home="${T}" \
+			org.python.util.jython "\${@}"
+	EOF
+	chmod +x "${T}"/jython || die
+
+	local -x PYTHON="${T}"/jython
+	# we can't get the path from the interpreter since it does some
+	# magic that fails on non-installed copy...
+	_python_export jython${SLOT} EPYTHON
+
+	# compile tests (everything else is compiled already)
+	# we're keeping it quiet since jython reports errors verbosely
+	# and some of the tests are supposed to trigger compile errors
+	python_optimize "${ED}${instdir}"/Lib/test &>/dev/null
+
+	# for python-exec
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_moduleinto "/usr/share/jython-${SLOT}/Lib/site-packages"
+	python_domodule epython.py
+
+	# some of the class files end up with newer timestamps than the files they
+	# were generated from, make sure this doesn't happen
+	find "${ED}${instdir}"/Lib/ -name '*.class' | xargs touch
+}
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 0f0b2518e385..3c5812349752 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,5 +1,5 @@
 DIST apache-maven-3.8.2-bin.tar.gz 9338426 BLAKE2B b39c9c87b6d05d633172152598496b6cb9b82c64c0572426c6a612ecfcc6d087085d58fdcaef0b61f5554c2b58e90b47bb0e6844dacc88c95bfb72ffc618e355 SHA512 b0bf39460348b2d8eae1c861ced6c3e8a077b6e761fb3d4669be5de09490521a74db294cf031b0775b2dfcd57bd82246e42ce10904063ef8e3806222e686f222
 DIST apache-maven-3.8.3-bin.tar.gz 9042049 BLAKE2B 2709a47fddca340d9ddaa1f716990e5a4580667169552cedcda2f2017b190cacfc545e2d5b0d5aaae5f95172fb49201eefc4edaff1009f855fb93065e0de6919 SHA512 1c12a5df43421795054874fd54bb8b37d242949133b5bf6052a063a13a93f13a20e6e9dae2b3d85b9c7034ec977bbc2b6e7f66832182b9c863711d78bfe60faa
 EBUILD maven-bin-3.8.2.ebuild 1372 BLAKE2B e31f57f1f30b411ae889b6b210cb0689c2b800e99f97de192648e828d78700201391269f4c9ac62c276699e1fe987a5e0421ff694aaed9299e65656d1e7ac704 SHA512 f742703fc9096acbd3f7edafa2040cafe74d2a6c4f0de7cbdafc1f07d4a57a60657f6a293e8523fb6678be9bc61e306d398b33e91f7af74319bc0da5a4455a30
-EBUILD maven-bin-3.8.3.ebuild 1374 BLAKE2B a6f0026867f2142587b626b74bde23dd7b3d8079538b48644452ba633d26fc6e925d7fb5d9be4608728250619d6865125580236877dcd4ea2bef4d4175061dcc SHA512 160579460a6c14784bab62d786b45c55998ef836a8172c0366f95d25548fbe918563082483a5cd383d165aa7a189765378060ed2bc6a385969fd05ae140c1239
+EBUILD maven-bin-3.8.3.ebuild 1372 BLAKE2B e31f57f1f30b411ae889b6b210cb0689c2b800e99f97de192648e828d78700201391269f4c9ac62c276699e1fe987a5e0421ff694aaed9299e65656d1e7ac704 SHA512 f742703fc9096acbd3f7edafa2040cafe74d2a6c4f0de7cbdafc1f07d4a57a60657f6a293e8523fb6678be9bc61e306d398b33e91f7af74319bc0da5a4455a30
 MISC metadata.xml 611 BLAKE2B 5ef6682d362deee6aff000f37dccd97c48e90e3071133a44d9f0ec2a5c6876fdd1a5f44b064eb6992a06cfda27c0c0e599e0bd0474997611aedce017febda203 SHA512 5ba3e55ea839b5e616f37321960021c58846089cb0b51982617f45946ba25747ac10eef70409f9848fbb8267fb2cc0c90c319fb66aeb52ffa5e0e1cd6d5840ff
diff --git a/dev-java/maven-bin/maven-bin-3.8.3.ebuild b/dev-java/maven-bin/maven-bin-3.8.3.ebuild
index 3d422db02a49..15cbb360e0de 100644
--- a/dev-java/maven-bin/maven-bin-3.8.3.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.8.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://maven.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="3.8"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/miglayout/Manifest b/dev-java/miglayout/Manifest
index ab01e0605ec9..14a45aa8a0d8 100644
--- a/dev-java/miglayout/Manifest
+++ b/dev-java/miglayout/Manifest
@@ -1,4 +1,3 @@
 DIST miglayout-4.0-sources.jar 194675 BLAKE2B 9d0a4fce1b76e49f4a2962fccf323676172fc9fa084060d8b3507031635b7979d8b29ce598a0a484e3707eefdf90721162e67d36be5702e9309ef067fd39aab3 SHA512 27284ceac254707428351fb2451ffd5f2ebd580374df59624bb6af06011f70d87b27849900c2573aff782ebe6d84e1806c18a59741213948f0b238ee5a51ec2f
 EBUILD miglayout-4.0-r1.ebuild 1274 BLAKE2B 8d7d2db7d2fe14b4a827ff1f089083476fee8daf84c5ce96cae6ebc886d37234e106da7d8f72693d77a321d5675c6b6e99ba58d2f06ac7cfeeea0f71e4862ee9 SHA512 a51a700c956e4693eded18a36c848da2b8e6582c5527b75ada686f00fb8ad95b313f6fcd3de725d46f113bfacdcc9d62b7e06f3e7e7f6c5d920cd0b02ec5d572
-EBUILD miglayout-4.0-r2.ebuild 1138 BLAKE2B 96a5f9e8f8d4de652e0c91e3fdaf1ad2fc7468128fe4469cba58f30691d029eaeb3bc642c94adfe96c8cc742dd9ea5e5d256a29bcd9f14230421513c7c3c3b72 SHA512 9a365cff4aca8c56c553a85376f21b868963812520caafc4329b8612809fc0a1e64fcc292e0f6351948c2cb14be5dc616f00b1e11aa3c32c9c68bd3875ce4a0b
 MISC metadata.xml 752 BLAKE2B 2e26b7205144acd5867f48c06390d9366d4478fdb63cea8dedfdcbde51429345c45f532d820574fbdd0c1d66e10d05c216759c579a9021b9566e09a05af33b8b SHA512 7bde051cc584a41b262ee5043762ed0662e08883b66dcffb732fc9af4f8f4d3b616e53746aea23c299dd9bd600faf97d3dcd78655ad08d379125ddcfd242f150
diff --git a/dev-java/miglayout/miglayout-4.0-r2.ebuild b/dev-java/miglayout/miglayout-4.0-r2.ebuild
deleted file mode 100644
index c27929b85db7..000000000000
--- a/dev-java/miglayout/miglayout-4.0-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="examples source"
-
-inherit java-pkg-2
-
-DESCRIPTION="Easy to use yet very powerful Java Swing layout manager"
-HOMEPAGE="http://www.miglayout.com/"
-SRC_URI="http://www.migcalendar.com/miglayout/versions/${PV}/${P}-sources.jar"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="swt"
-
-COMMON_DEPEND="swt? ( dev-java/swt:4.10 )"
-BDEPEND="app-arch/unzip"
-RDEPEND="
-	${COMMON_DEPEND}
-	>=virtual/jre-1.8:*
-"
-DEPEND="
-	${COMMON_DEPEND}
-	>=virtual/jdk-1.8:*
-"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	mv net/miginfocom/{demo,examples} . || die
-	mv demo/* examples || die
-
-	if ! use swt; then
-		rm -r net/miginfocom/swt || die
-	fi
-
-	find net -name '*.java' > sources.lst
-}
-
-src_compile() {
-	local classpath
-	use swt && classpath=( -classpath "$(java-pkg_getjars swt-4.10)" )
-
-	mkdir classes || die
-	ejavac "${classpath[@]}" -d classes @sources.lst || die
-	jar -cf ${PN}.jar -C classes . || die
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-
-	use examples && java-pkg_doexamples examples
-	use source && java-pkg_dosrc net
-}
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index c4b6d1c5e8e9..acadb112df84 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,35 +1,42 @@
 AUX openjdk-bin-11.env.sh 496 BLAKE2B 6a99de9730f8e84f6082a08fc925126a2fa1579f040b7f083af371218c4523956d5a86777e1bfbca7a63a717992d1a170d539d04f26f5317c3fbb9a14972c191 SHA512 94ec17c26c7305c57fb53356a4477711fd987c4d48af114f481579f316c20ed487ec40124361bd0cf2c947f59eaf93ca629975f9e999d47f5025269187db82ad
 AUX openjdk-bin-17.env.sh 496 BLAKE2B ccfd99807b5b5990381c8be464d5084159bde9a39872b468eb00acc1832a465cc0ad70bb1e9c97e7632e86ae9854a7f2557f8994e18219c52f281908e975151c SHA512 3591f5b574ab0eff5b414a9414f114c1bc863427144847229041ee0fbab22a925c24b8c3b7b057a6c3d34dce4a9b5aff0c60caeb1dd6d709ddd63aebe870e336
 AUX openjdk-bin-8.env.sh 705 BLAKE2B 0e155706fa9633a9a2e54ae2c9ecb95516c0b46ead84e24dc4c4d79a1b67644eedc6b97e6d4e17da4f6162e2ce7bfafe60dddc950e7f76a666af46920a8a5025 SHA512 ca6fc7b0889ae3d2be386696eadaf9f25fdedaf94cb24696a2de56214695cb0211226bc87671449bf366763f568229b22409201e532d14394c641164c48ffe2d
-DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.11_9.tar.gz 189549576 BLAKE2B 9eb55593643911573dbb7aa0f69169cf63c0cd8d0a4b4d3a4bf42131f2dfa51305c55c26e802f07fddd70911dba20c4d7b57983782aa2da61fa730f12258a94c SHA512 f2aa4514bad0a4116d0b703adef866f420b1bf264781b58d4075c54747856a657ec7fd1ef622712419823f76a87b9965426f59e5c66b21dbc073387e66f949a9
 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.12_7.tar.gz 189702606 BLAKE2B 110b03fdc85f9456b253569caa6f6be119045cbecb8e13cd1ecc1566236a9ad860dddad9d46ba88c46396a16f27f080364909bf1587f5bdc96e72c9d0ba0b165 SHA512 c6122bae7269143638e43191505e9ea2265280d039de89b7bc2a79aa89eaa3a1658765d8490c4e363e7e7982575bd309f7e6ac18c4fc7bb915dca2b27e7a6a3f
-DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.11_9.tar.gz 180784025 BLAKE2B c15ae126f1c2bb00f97571d4bb3316ecf5ee36a18895eefb48db616996dcdf363acbbd8ac17ecb6a507cc0f3a811f476cd72993b42e0a0b857b82c3e2d4d5279 SHA512 33cdc99dcf119a3f5161cdc08853ed1b8a1630f884577b6a167cf79621b0fa6f87ec652452fce0e27ee550b63952fcf75a3a6bd70c61564faafc0e8e1c74c0bf
+DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.13_8.tar.gz 189667474 BLAKE2B e79c362e30a21871ed56b95a51d17bbcae4d16ccb9f1747c00615537aedaf6b43a675d2fe66638f95d06a7a6bec3c296c5c198ac4595707f434e228e899aec70 SHA512 317cce81d129f823a63d4f1a234826d28bb8e9799b5dcc9c0d6b84fc44d2bab9713875f08416c1db6ca5d8c23bdb63e7837fc640b5931940be365ea059e165d9
 DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.12_7.tar.gz 180761575 BLAKE2B a04e91561aaa6c3e921c61b8956e797c0de20eea98b1356267a3046db9917df65fcec4c569134675e3adaef259572772deb62c0cbe3e70aef01e7984233f78af SHA512 b0ebe7832c5b03930ee72d2f5ff5171dd44cf0fa1c48120fcb508f1be08921e8ce848f4348f0424eaa9955e1be4b04a9d82ebb72e5bc6a2cf8551fa35da093c7
-DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.11_9.tar.gz 174865783 BLAKE2B 717168b8b2dc326495dc41f3af2d85b515c10774ae58f35bcdf86694d89b1e11db50be24f4c046add5223e912448d67c2ecac8a3a6f3ca2dca3e915fa61f9654 SHA512 dafd40c133fd83c06a29816f4e45ff63e588ea5e6046fe331acbee4eb5efac4b3fc7da0f0fd55e4044846a053644a71efa00e45cf4ba39106b8d1018f9bca0ec
+DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.13_8.tar.gz 180757722 BLAKE2B b34bb2c2346609da20bc27db5e1dd0f7aa124ea9ac9e7501ce2a374b61596f96e950a7d69e675dad1dd16037183dbbd155089c6b10d965adff56f000ab19355b SHA512 88500ddbff3c58a69ec450428bfa1ade8e01056c926fbaf77d6908d08b24b0e0536a4d067f32cdb50fb6003cdcc2b22509c5478e080e748c001340334514c711
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.12_7.tar.gz 175004135 BLAKE2B 36b63c4b8c654c418c244c06d2b2d0d6395ec462c98c3b8548ad15d9f7620b685074307f80c79a0d42e353158d91a2a2c9c2dd6a2d4cca889d2158c2f0736f6a SHA512 34c6c6a309205bb02e52565dbcdb3d7a1f7eff9b7c2212f3a45b519a5032491b8d2c55811b097a6a4a744d4ace38d93ca89c463be9f058008786b1ba0b20cae8
-DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz 192792051 BLAKE2B b11a0934d358d255df743e241fa5040bbc48746b5fd131e98a9b253add114d3504a0f4b10887d9b86189da4f2bccfc65134247b0580d96e2fa7ae9374d44ff38 SHA512 b79eb8a672706b643773711a59a756de88eadd54e74bfef7dad14a0f7ab7412ee6c457b4d3489f6c530abbd442307a9355b5d4a01d2610f90cfd614b614f6507
+DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.13_8.tar.gz 174991442 BLAKE2B 376fe73257f8518599be31262d83d1a01381cd9891fb45c18460bdf33c3569b3032206363593db5b7e3006b895ab855407a1938cbabed0fc58f3bcc86c650cb4 SHA512 d3ef319edc1f29b12e681c09e639cf296ff4e4890c81ecb2c8bb38ea2936f5425ae892420a53db5a0796b192f55a9a8c97b850d8bd400d6d7a8b3c4effc90f34
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.12_7.tar.gz 192983830 BLAKE2B 4d97711e37b72bb24e9feb14b4902378d02e7bc4fa1f12dd40a277957ebb4b36efb115666124337331bb95a1f53ae3b13ffeededee8c3c0eda66ba9abf937bcc SHA512 73b7c430d4095fd518191a9d85eebb2749d4940eb64a95cca8f3c6fe2392a71239e264b47f4f74b433c488aa0a80cca610c87a49bbc143da1c15b45fb491c62b
-DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.11_9.tar.gz 186275966 BLAKE2B 09c54989a7d1c4989946bd1afe26c3254e2a0294ed4a8ae92e1e3e62f7e53eff7e30739b362d8a07cfe601633850efa4ad91445d474e1de196fd5b88d4e14338 SHA512 04bd14301bc9e1601096141c4c8d8b1637a8a99f8bf66d60081e5a36360440d6eb87d595df6b4b34fb44446746681774b2761fe837f3353a4e5bd5669182a09e
+DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.13_8.tar.gz 192958006 BLAKE2B 441d396e0c43c78bb3802800f58779999dfa2275c4e0e0a048e28e3b99a41044b9c66904f1eba435cc22ab1bcf6d6d98723b8b090eefdece4d712279f36a74fa SHA512 abcbc5b781749e3c8fbcfb999e724d4862c03d60c78962d75d31b7cbc71124b04488872bc70f6a6642ec59b6d2289c391b564fc5fd7f465863f96dd4d2b5207d
 DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.12_7.tar.gz 191257594 BLAKE2B f747b108b51f09d6e15ca009291a5f5d81f46d55357c2d80351b3d20b459c37995fe434ffb2d666d64e1311ddc510a5a73a49f0d19c00767dc4749e06e432cd4 SHA512 e38bf5a31c3e453784d4067601b3f2125d528f8d210d3a80910c66fc70b5a5beca56dbc0328ee3add99776bdd6d6284506803e553540ae434c438f2dd706e268
+DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.13_8.tar.gz 190666788 BLAKE2B 9248072292727e6ac6d3f1783996c13ad7c78418da444d96e8df3c11ac1f2a7c047dcc16951dbabcfa0e46d7121c91e916940ef0749e982f20b6fc36be516d64 SHA512 603ddb6f01a556040e56a8f1d0769636295e2c1579f07d1f58828ab1db9634cc07cada66496a6144cc6de29469eedd02e6fa788961a9e4e6b5c7c6a5fd94839e
 DIST OpenJDK17-jdk_aarch64_linux_hotspot_17_35.tar.gz 188907472 BLAKE2B 7159e03fe2a9ae79bea6130574b484e9f1ecc0549065d31e019f9d90c299be4b4f4a09bea85e6ebb13eabb5eace3db0283f00f19d7bdf362e52849aeb476adf5 SHA512 1daec8504962c06cbafeb3265edf5e220adb75e7b9d11e8f92b784ee273623b770bb38182dbbab2ffd8751254667d972c99f3d859620751f94c9c1d1b603546d
 DIST OpenJDK17-jdk_arm_linux_hotspot_17_35.tar.gz 188807831 BLAKE2B 55e0d944f5d2f7f09ce9a6bd87d6d432f9b086083f906fa9aa6f85f0e006cf15bb88cc6433ce41d6840ab2d7bc6d07223b51a1855ceb937aff6d0142c3f87c63 SHA512 a20c0de63ea404653e54b7eb30fd9c8c66cf6aae43845fefc7a67edbfc60e777fc4bf1a16a7958a56b36a868a8b4ce75e065b78ccb74a8ff26efc61a90d6e498
 DIST OpenJDK17-jdk_ppc64le_linux_hotspot_17_35.tar.gz 187664371 BLAKE2B c12df4a24cd14fb57e6757056931da69b067576d22fdc9493c3d8eee34cace10718dc234b4f1cf6b525ee082752cdc7de9e1bc6467f2ecfffd5fa391095662e6 SHA512 c1f3ce3d8d7e33dbf1a838fee054741cf1aa6133fe375ec8c8508072b9da78158bcbbe633f4cdd3b1b8dae4915418b26de2fd218354ae2264a3694aad5fc9cd9
 DIST OpenJDK17-jdk_x64_alpine-linux_hotspot_17_35.tar.gz 191382466 BLAKE2B 78b5e126b25bf6fa4471913cb209ff0f76838b44f1a2a5845cee190d2fa5b3957696f353ff8bcf7395a716b3ff22431e12be2f966457cf525fb89ff1a6f32d7c SHA512 2264bebae07d060ce34ef0b743d11afb06c66fcd21d2ff338c5fb641cc55b95d70b2e1b17456cf68264442e58d0dea3988a36ee29d7c2430ee8a8f84116a5584
 DIST OpenJDK17-jdk_x64_linux_hotspot_17_35.tar.gz 192014376 BLAKE2B 6707451ca3aaa22f232592f6497899f4751a67cfce5c539a275806b551d3494c686905dd91c03ba6de64afc65841d1e9836a1dead4ce55d99df3da4a077aecb4 SHA512 9af1945e46a1b444cb49ec8e58e14650098266e29973688c2a25b3707d23bf90b0a1287ad0ea5c467425f959354359fcdf1eaa8bd68e784399a6780298b22a44
 DIST OpenJDK17-jdk_x64_mac_hotspot_17_35.tar.gz 192417649 BLAKE2B 53fdd3f71b9c3860231451eb0f59414c03a863944c9b7f2106490c1d39a8b94715d1743bab10959fe513277f5fa9a4d397c76c464680f9b1f35d879e7c82ff05 SHA512 ebe2f1f936c93150f2bd5e2bb9b07b572eb14abd71ad7446dd0f5c511c8b6debc882d6ec69376b55a50b964c9a2b8efb52db96de1041dd2aa857bcdb64915494
-DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz 102423506 BLAKE2B dab839491d359e4366d316fd1a0eb3b7009e1739d7c6d4dc3ded47bd44fc7af36068d76183d9656d748beec0117bf95f09a78e577c3e1f685f0fb3c2e2d45e28 SHA512 6ca2dddd371223c0bae6caea1f4841d7d718b9ea812d914ec8fe3f03671e2176454ca094c05e55286ba0560e2897a515714bf607e868b4b0405b6bce03c5c22c
+DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.1_12.tar.gz 188878354 BLAKE2B 4e2b4272ae91f12b8a4c7a3c1cf2eab250102ff1590c84f2f3612bc206337477284d63914dddcecd8dc259da1ddd08a1fc6e3c52a37b0cbb5ed0187456c2b24e SHA512 8289fb50b06f08c6288bcbab9e609a24744f123568a901b5ea4f2c1928bfdc236a9a9cfa572708c56f1f7f844b17562f9ddcb502b15df8ac8bc7d1ef758a741b
+DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.1_12.tar.gz 188832535 BLAKE2B 4ea2e209f7bebde4cfae439773b42cb9d4143eb5b61a5e69fba181946cd3a3dc977966ed14e24ce6b23066450e64bbf204b72b04562f7af381c765bb4ea31d53 SHA512 615806f02c108c08be70d975f3dc402fc2e30f9a961630fe6528eedb7a5ee76ac07851ada5264fe263453eaefc40aa1ded1cefa37d3455af78b04fdf9caf9a93
+DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.1_12.tar.gz 187718236 BLAKE2B a55eeb2651d6fbd83b579527761e246bc3babb3858b7c14823e0d512e308a65be1e35899206c1e2458db74ee2aaf4d69578b4045a13a35a0b3d6577d4821d137 SHA512 5179991d451f8736776de933aa44fa726217282da66236f373a0e47d815d03754f28588acf0aca55258ca1085d0e06f53627092bd0cff2c2b60eb6ff9c1df248
+DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.1_12.tar.gz 191355612 BLAKE2B 21c1459c58a10ed6a87a422e70fc4fa27a37a1ea4cbd121e237d82f9ec0991e7245193c5a44cd2826d502301166a48e2d3e7ac0015dcb9a1c3732f03210ff366 SHA512 30ce2ff05d46ea125fc17256420c8bf9dcc3afe802338cd62d0961e6588cf54663aee07c6d4d21fd0f363b58628ee34cf4f9cf622b6da970924aa94d47e6406a
+DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz 191978211 BLAKE2B f0428e67c6f75bc204c8e7c74b25c73a270cff1889c0e3fdcc830f868bcddb58e6c9a480ba0313638a7edf56dd2e61e52b7c4f1dd9ad3643f3e70c9770141c93 SHA512 057fc5c4869bc9113c1a299b125c8bed47e4a841238b42fbd4b39adfd7bbbca0fa9efed7315a98303ff8f4000afd02baaa5b3169be6287d06edbfbbb44728538
+DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.1_12.tar.gz 192449459 BLAKE2B 506d31e97c7be57a870e80e1beb0bfa72528cb0e5d006b0dc76667f6ef29624165375a91127e3cc934f3135298d748c43a5adcecb9a07c5d758998bbf6551837 SHA512 8d7afed31b37759ba426d412f70c36e380f0f472d850c9ba9e895e0ebd4a2cf9a7f6118526f0a30f6a1d9d880affca4e1ed9848125509ae97e32f506ad78f541
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u302b08.tar.gz 102111219 BLAKE2B 0af54c05957c3f56c495cc83baf68f27fea4773ab4577b212e8abd19e7c7be123c067cb614fb42a320a865c3ab96c9e6ae663d96f79346f73282d99ea8aba5e6 SHA512 43e74f8029cb0d0ea48c6af4e2b8f00c4664264a51803acf0f539efb117be2dadf4c6a216ecf81c86e24152e6f87933f7a9e97bf4ba526eb01557bf561c2cc22
-DIST OpenJDK8U-jdk_arm_linux_hotspot_8u292b10.tar.gz 98376195 BLAKE2B 55ae7181b8e4aa5d3097bee40a5acfaee48a2f208e4362e74cdec1647460770efe49b774b22188c78ca6816716ef20173471b881ce3f75b0d90e95740049f4c7 SHA512 d2c88712a95bcc96172b6b589493038d8e721eb7ec4ae546dd998d82a5148dd5ada6e22c92bacaec2ef88e47a75761d283d1f73983f1848a631e00c5833901ee
+DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u312b07.tar.gz 102144826 BLAKE2B b351fe3a82d8ef1e77314890a00c2920dbe5621bb524c4d4ed80b2f3a3b10853f91b0488ab42a5b1691ba66aa9de8eb0630b9325c3dc7fe6b071e2a95dad6bed SHA512 1b58c5453c473d798e5c4871212c484518b44038f81b32623668174fc47c4118120f770ebe3a21534b7f9e01c383a75cb558538e1e635f7c290686825b4ea78a
 DIST OpenJDK8U-jdk_arm_linux_hotspot_8u302b08.tar.gz 98335583 BLAKE2B 03cf038f460938b2460f66748257194b8b1b1101a06395be9b21134d9594138e57fad1b34b02c742c721474a299e53029013019fbfbf9f7fc07447ecdd56da1c SHA512 8d1065f6997b5a242c6f68c919bf837820c93580054d23cc4ab46301ed6fc78a53872174a5573a41d96daaf5542a99923b3aee5acb7472471d8a79614fdbb6b8
-DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u292b10.tar.gz 100518660 BLAKE2B 11b1d1b32f76359362bc101678b0123d29d32bd720a10b806a55cf9b4cd3e9d5cf2ec50f985a4de85ae41ec4b90376e7b7e2f501bfe86ad9ba832813444a8f9a SHA512 2999972ecd574169d50afc6c7ff3e7b3f892939b125a9d02184b09ac11ed32b741e1bacac64f93fd4fce75bb4b16130290c1011d3948c66095132208cfc05839
+DIST OpenJDK8U-jdk_arm_linux_hotspot_8u312b07.tar.gz 98364180 BLAKE2B 2b7cfffa33e9486637f9274f5a3138d6c1a53afa63d24ecb82aff4c0baa8b765003642c582c0191d0d229754dd9de64ab7cda4d81e9168df3d960baa44a5de9a SHA512 8b7273688a1ee28d0a2f918f2fe02586b8ff9e7962bbf8cd2973001594e627b1eef7a9f1893bf3bd3789fabe0058a916ac2d4d53c72cbd8d586e4e7c3217438e
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u302b08.tar.gz 100547467 BLAKE2B de5e0432be01db8712c0f19801d7c5478d9f241579042ba9aed60631f4415e025b880f985a7a5fe14af136599cecda70895fab80febe7ea888604615e18ab749 SHA512 458d92a9d4ac7ed2be5bc125db5f5038ee8f6d64c6d1a20d51c3d422f38d2255ca48a30d41ce4a551b7b684f35ca9b3c266992c33810f1bbda6f8a94f8e915e0
-DIST OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz 103026380 BLAKE2B 4aca546720c8cdb9f8ca5ffe59eca4a2f4a5d36716faa3f3dff7517ebcb9cc13dc6749f16c3f7da9d0d7dbce28a7b4405cef9c5d96306fa79bf87ebefb4c6113 SHA512 44d36d221c4fe660f3f5b5627c6629d4716e7ae1fdc2d2c2b74c1235aae3c2b2f1ad28b9fb882ad574c7d6dd579a24ffdfab6809b2be6f02e4d6e802dab7e3ba
+DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u312b07.tar.gz 100571080 BLAKE2B 3a1c5c7488de740210758a34dcc34517c8d5310a9d17c1d251d0ad6d5e7a619595304479b88c807b5d0cd839f85f9b7c819d0dcc297a738052b337b3e962b457 SHA512 0b530ffd0c41fa71962072c70c0712b71573b9d1b66e9b23f6122b770bfa7cc42d8ca0c87a721bb8481104edd062b79ebc09a728f1977699b242b62cd546146b
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u302b08.tar.gz 102954777 BLAKE2B 8df9f811fd69be55cc811671d57aa9911cb889eba1507f458627fe568c4491931e0fb32455bcb17d9540a8f074aea5fb9767d246d35a29520e82fcd56886ddac SHA512 ae5402b9b414c0fca15c86a4f18d5aa6d09f48efd16a3d2d82a529095063fc87e36d041b3cb3379135605a62ad7799c42332f177682cd220364052c25ea68e11
-DIST OpenJDK8U-jdk_x64_mac_hotspot_8u292b10.tar.gz 103785976 BLAKE2B 81f4b24f2b201478dbd439603e19df2c0b699cbceb679dd2fae14f72a19550c78cf52e7932f4816491bd04ec6556e157b7010518d1ffde4a3e99fcd9e183a721 SHA512 044ffada083a0ca32209513d7bb4ad51af9667611635a2a343e01b0d07d30257493ec1439ed104b094ef88844c1ed69671e3a8f413b51468e15f6172220747ae
+DIST OpenJDK8U-jdk_x64_linux_hotspot_8u312b07.tar.gz 103016010 BLAKE2B 9e7b10497bb46a176016f4df6bfa5fa90905bffaaf9668ca39f30a01cccf78c04d1391aed304493159d5b520879762b7e284befdc11c5444b0edff6b363d9c3c SHA512 20ba919c6b4b2f1253b7a9119193f2ee6c16498ed15296ed5d4588284e635fbc53fa368180c1362cb5c3cc2f2446e96d5a752a96d64382ddf73b062319b1ef47
 DIST OpenJDK8U-jdk_x64_mac_hotspot_8u302b08.tar.gz 107303398 BLAKE2B 0eda36bfe60a870d7389eef6f5babc96e7777896c3a3fe584cc713db962175aeb504ec3b69c4a8f126568596b81ad3df855097d5c179dbada10545bee3771cab SHA512 a0bd5d487ddd1d0370b20879249b63981b9739455d280c3e7d9a13d62e5f255a7f9cc34e892c45bcc2f8dce0e29c9f93842a99ab909b63432e194eeaf3ec494b
-EBUILD openjdk-bin-11.0.11_p9-r1.ebuild 3622 BLAKE2B 2406f9ed451ea6433bbb399d3b6d141876192abbfd79199361a3254206644e0dd7dc310b7859dd594568052df8aa75330d2603073627c81c02c94d5bf63542af SHA512 cb02764cdca39c3dbd525d2604378e4593919c2a94b16deca5a34cdba00932d370ecc295a09697bd4fe81dee0e47c16408c2805a6c3cebbc37a8fb1a6aeea73c
-EBUILD openjdk-bin-11.0.12_p7.ebuild 3618 BLAKE2B 7ea41f851fd51bdea387e959721f4a2c5843785460f5897eba27e0a088cfbb52ae953941a8e3a64dfe18ef052a3ab293ed58bc6ac2c70f55037e4d3de7c61f65 SHA512 9fe249b28a686b596e45c4d904cf54abe8eb2940783f9701eda0bb234dd19cd9cf249f1fa16cf2f43be3b810322900b10a86d4f5d8e85567918e9246bc3c4c4c
+DIST OpenJDK8U-jdk_x64_mac_hotspot_8u312b07.tar.gz 107991615 BLAKE2B fb068abc6788c00d8ed51b0beb3a08c6dee80e3fe40bdd5ca79bbaf59159869a9b3234f1ac53321e988152293c938a13202fcd9e57ec133bbd2cde3f849a0fa6 SHA512 fc75b7fe2489ac6fcf7180407db3fa839ef1a0b5de2aedf4c9db902eeb3618e2e1d1436970fc7a002b111c6f6be6250e0e1e62dba28aba21b4c88fa8f765a92e
+EBUILD openjdk-bin-11.0.12_p7.ebuild 3617 BLAKE2B 2bb109caa07d44bdaea3c8cfc8d71e7f3f37980a99ad2c99b2fa793442cc154cb5e3f61e9ceba1a3bb400ad2b8fbe5a3bfd2bc6afd350efd3e3bf7918ba5e387 SHA512 c199f61d9991087b6b0a3b6935f88cff625997aa0246127ea3cdd65bc14611b50bfcd7a3d16d5cd7778f7a20ce7a153aae7763e9457b0a43b68f7e26f88ad330
+EBUILD openjdk-bin-11.0.13_p8.ebuild 3620 BLAKE2B d6bdab9b182a1f1a5611b8c6c0fa7f613881d6358ec267d18b2402ad10034f7ae72adb7df686586fb65cdc0493cee44f6064b19c4a37fea95e30d7fb26d139ef SHA512 dd09408cbfd2f337db68cbe31103ac95833e3d7cd3569f549301649fe9ed33d69143b45cf35ab1718f86025428c304691cc6cc4eec981b3814dda866ded97910
+EBUILD openjdk-bin-17.0.1_p12.ebuild 3822 BLAKE2B 46e746cd152d9d389b8b50e0e07ec89ed77c3c040a5441678403f392888197cd838ffdce0c5f3621a3b3811fc71ac5dd72d9fcd723ddb6a5a880dbd8a6ab4836 SHA512 151d8aad48b04f137f95eccf213919ac702cf3e11c96ad78aeaafe8e9e9724508a4f81ca03522ad9c3095c1b40deb4c6a49bac3434c206bb65b64ea77bf21a68
 EBUILD openjdk-bin-17_p35.ebuild 3821 BLAKE2B 4f67024f885da85a8336f662cfa0587b082d73e07b90e063133325af1a8efcea074d67a3f264aa8f73ec99027c01f19331afa53f95ce33759ed8eb32995a700d SHA512 449dd32bee45a47cee082de1a3a8638ae26532aaf0972fa67543d0dfea1c27958dc2877f296807dd13862545e4f57398bc062572c638f614983dbfdc6bf84f6e
-EBUILD openjdk-bin-8.292_p10.ebuild 3052 BLAKE2B 65641297f9bd53fcc2db687520cadf650e8e342e6920694507c1bcb2e7356c8d849f90b1946098ab40339b26810f369aa7cc3ea55ab9fef809de3365d225e877 SHA512 ce12ff1d1f36f2ac0c44fde0c35af334d4a43e76a217f1f943261e2971ad41539bfb933ff7ab584826b096d16e13c1ee0a3447e3b22a65361cf1a400bcc29387
-EBUILD openjdk-bin-8.302_p08.ebuild 3048 BLAKE2B 7c5b1f0dc83fe6c27feb67a4268fc5353ec08556486b1be745aca38d259d7cea632a452a6808eb56d4b43f0bc728d71ca3b545a45fb58a783824db46ac468d23 SHA512 df1ec46275ab1cdf8fc091da0ea1901c1231bdb1a002a49fbeddd3de09268cd69917ebc3f4707c83a93a823db52d59bef897ce6fac9b9934172ca6c55a744bab
+EBUILD openjdk-bin-8.302_p08.ebuild 3047 BLAKE2B e636d705075e18d16bdb5fab3c018db59af78afb52c189c21400990c11929bec7edba0592fc14e5b800bc0e898cbe13f352e3572426e7320b5d524e6c2cf4152 SHA512 406fc714f07b1e743fd3f5b0570c2a0f9805bacecbe2c97fdae8c8551dd51ad789dfa1ec51b23321801dbe1a0f44575af58485f2d6dc3662e7432b29d95ebd1d
+EBUILD openjdk-bin-8.312_p07.ebuild 3050 BLAKE2B 714cf6b969e35324774f70437b726ed37fee585a8908666d79fc2e302a49293b798821511f8ca3d8c10bf9f7720993151af8566a0310d6f7610b54c37ad0d417 SHA512 2e53af06dcfc53dc12490c628ed83670dc813963b90fb4da15032fa542738e48e97884013049a4c95c7422bc5380a12acd816243a112450802a602ad262d0376
 MISC metadata.xml 941 BLAKE2B 16002011c075cd453721b20649521e7370b0835939bf228e3a66cb6994b98d11ee2b0074bd9ead474c8787301d2be44a2c05d2d49c09b3f2767995153c37a69a SHA512 37681cf8ecc00361d9bc3ab5b26defae227a1d95aec0a5f51b39d412e1d4f62bc3c9db0c1296b394c02f81f0b8eb052ea85212eed0319991f372525c0bf26b09
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.12_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.12_p7.ebuild
index 6c91078ca3a6..1fd28021ae50 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.12_p7.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.12_p7.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
 DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptium.net"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
 IUSE="alsa cups +gentoo-vm headless-awt selinux source"
 
 RDEPEND="
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.11_p9-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8.ebuild
index b103904be5a9..85c12bd7c71a 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.11_p9-r1.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.13_p8.ebuild
@@ -12,7 +12,7 @@ abi_uri() {
 		*-solaris)  os=solaris  ;;
 	esac
 	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
+			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
 		)"
 }
 
@@ -27,10 +27,10 @@ SRC_URI="
 	$(abi_uri x64 x64-macos)
 "
 
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
+DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
 IUSE="alsa cups +gentoo-vm headless-awt selinux source"
 
 RDEPEND="
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.1_p12.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.1_p12.ebuild
new file mode 100644
index 000000000000..e90e1c5b5be2
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.1_p12.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-vm-2 toolchain-funcs
+
+abi_uri() {
+	local baseuri="https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/"
+	local musl=
+	local os=linux
+
+	case ${2} in
+		*-macos)    os=mac      ;;
+		*-solaris)  os=solaris  ;;
+	esac
+
+	if [[ ${3} == musl ]]; then
+		os=alpine-linux
+		musl=true
+	fi
+
+	echo "${2-$1}? (
+		${musl:+ elibc_musl? ( }
+			${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
+		${musl:+ ) } )"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+
+SRC_URI="
+	$(abi_uri arm)
+	$(abi_uri aarch64 arm64)
+	$(abi_uri ppc64le ppc64)
+	$(abi_uri x64 amd64)
+	$(abi_uri x64 amd64 musl)
+	$(abi_uri x64 x64-macos)
+"
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+IUSE="alsa cups +gentoo-vm headless-awt selinux source"
+
+RDEPEND="
+	>=sys-apps/baselayout-java-0.1.0-r1
+	kernel_linux? (
+		media-libs/fontconfig:1.0
+		media-libs/freetype:2
+		media-libs/harfbuzz
+		elibc_glibc? ( >=sys-libs/glibc-2.2.5:* )
+		sys-libs/zlib
+		alsa? ( media-libs/alsa-lib )
+		cups? ( net-print/cups )
+		selinux? ( sec-policy/selinux-java )
+		!headless-awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			x11-libs/libXtst
+		)
+	)"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${MY_PV}"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_unpack() {
+	default
+	if [[ ${A} == *_mac_* ]] ; then
+		mv -v "${S}/Contents/Home/"* "${S}" || die
+		rm -Rf "${S}/Contents"  # drop macOS executable
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED%/}/${dest#/}"
+
+	# on macOS if they would exist they would be called .dylib, but most
+	# importantly, there are no different providers, so everything
+	# that's shipped works.
+	if [[ ${A} != *_mac_* ]] ; then
+		# Not sure why they bundle this as it's commonly available and they
+		# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+		# also has an explicit dependency while Oracle seemingly dlopens it.
+		rm -vf lib/libfreetype.so || die
+
+		# prefer system copy # https://bugs.gentoo.org/776676
+		rm -vf lib/libharfbuzz.so || die
+
+		# Oracle and IcedTea have libjsoundalsa.so depending on
+		# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+		if ! use alsa ; then
+			rm -v lib/libjsound.* || die
+		fi
+
+		if use headless-awt ; then
+			rm -v lib/lib*{[jx]awt,splashscreen}* || die
+		fi
+	fi
+
+	if ! use source ; then
+		rm -v lib/src.zip || die
+	fi
+
+	rm -v lib/security/cacerts || die
+	dosym ../../../../etc/ssl/certs/java/cacerts \
+		"${dest}"/lib/security/cacerts
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	# provide stable symlink
+	dosym "${P}" "/opt/${PN}-${SLOT}"
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+
+	if use gentoo-vm ; then
+		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
+		ewarn "recognised by the system. This will almost certainly break"
+		ewarn "many java ebuilds as they are not ready for openjdk-${SLOT}"
+	else
+		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
+		ewarn "will not be recognised by the system. For example, simply calling"
+		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+		ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
+		ewarn "absolute location under ${EPREFIX}/opt/${P}."
+	fi
+}
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.302_p08.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.302_p08.ebuild
index f76e6a2e0cb0..6abd1ee29121 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.302_p08.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.302_p08.ebuild
@@ -34,7 +34,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
 
 IUSE="alsa cups examples headless-awt selinux source"
 
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.292_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.312_p07.ebuild
index 855c583cbcfc..4b692dbadd7d 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.292_p10.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.312_p07.ebuild
@@ -12,7 +12,7 @@ abi_uri() {
 		*-solaris)  os=solaris  ;;
 	esac
 	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_${os}_hotspot_${3-${MY_PV/-/}}.tar.gz
+			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_${os}_hotspot_${3-${MY_PV/-/}}.tar.gz
 		)"
 }
 
@@ -23,8 +23,8 @@ abi_uri() {
 MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
 SLOT="$(ver_cut 1)"
 
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
+DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net"
 SRC_URI="
 	$(abi_uri aarch64 arm64)
 	$(abi_uri arm)
@@ -34,7 +34,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
 
 IUSE="alsa cups examples headless-awt selinux source"
 
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index 3748a20f3bb4..9395c7b3f609 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -2,10 +2,14 @@ AUX openjdk-jre-bin-11.env.sh 513 BLAKE2B b7dfc571fda637776479ca4f8a8f0eb1fa0f03
 AUX openjdk-jre-bin-8.env.sh 675 BLAKE2B 66fb3b2690af2cb8bfb959bdd6edf66e130cd5e2c8968c96aa8d6cd09e01d193c6ab9973803e97105da4cb573b4221528d1cc830e044feac1b2c8ebe9f17d405 SHA512 ad361aeea566fd23fc21a607c9cdf63b164ad9d38a63fa01f435640af90e49cdb6562cb64409ab873a6603def04f8ecfc164340988c1a0660e8c6bdda500cd9d
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz 42432277 BLAKE2B 18138eb163db4609790286cfe7bc951da9ea244eed50bafa10e5d84ec43e7a80ebc2f759f3e1547b9d785b1a6d560b5399a0449a8fe301e19625c2b98abba928 SHA512 5b8c1c16c5faa467bbb35a1d1e694afc50b0c2dbbe77abb29620f30602187a1a903f60169e2b691dcc81b6d902ed5a17239318f27765f19351281209befb0e96
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.12_7.tar.gz 42400222 BLAKE2B 4cb727bac0a68f2b7461569d96fb4b5b6f9d0d915edf1e869cc72ed9a0bcd977f365923f1b23031e15cba4ac46d336f011bcd5f2230454b436e839cc5e1371b8 SHA512 662a65f2d601b537f3b05d06cb1785d341d519c24cd86f2a4ef8886919d7793be363da1bb8833cb81c6bc4f2e1456cc0f34e5831c6ac80924a93002c2f156691
+DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.13_8.tar.gz 42404190 BLAKE2B 5825d8edcb890c4447354414fd5ad6a153fd7b5a36082607a0b41430c8a9be52dec025cb0c388adcc80877c23c389e031c0451d3e109312c0fc9878410633444 SHA512 41f84fb17afe142264a1e10612e67c201b090feda86858a257fe02fc4f4b65b61397e23585f3d9334e1ee407aea11b5b1affb734a2823f3cf749507d1e54ec4d
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u292b10.tar.gz 41355668 BLAKE2B 761358d7e5dd9c96ed13d7302ea5f39719f044a37add7fcadb76ed799d41b17faee014c9e4bec3ce388d4a6965e2c14dd4ddf029baa6dd1f5f84cde7e7b1fcd5 SHA512 fd63dceddcd32b0f48b6d35c14ab3165f2b45152fdbc2bcaf833ed2624d833592cf1001627029fd04f9b77a033e2d4e993830d54c2e7c08adde5cd7a684447fd
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u302b08.tar.gz 41249161 BLAKE2B 643c8cdb50e6d7ff24bdda2fb8e99d0ee33dcf550313db879bcc4661d85b715de4e6e01b979e92005208b004ad1d6e0641e328dfacb81f70541a759f022826a8 SHA512 e435cf0d9e5a8edb26ada1568a6a041b685bd92302ddc60be73acc02aa1aaa43fda08d327d456749405866a0d1e3feaded2796d8a0db65fa650a9e60520bcb96
+DIST OpenJDK8U-jre_x64_linux_hotspot_8u312b07.tar.gz 41286015 BLAKE2B f555fee173b8af98f64cdd08b8141c823033473d8fa0601f8e69899bc6b82234ac33a6de45f87b2cd9457e22d500da9052209c45798d47ec3c4a34496b30d154 SHA512 36d07389e63e49ee16f1329aa7e0bd5b42b397f864f10080038017920fd2b178d5cd9dfaef157080ac020721d0e6e7b26b0277ab1cde69c20500fc34bab0e915
 EBUILD openjdk-jre-bin-11.0.11_p9.ebuild 2659 BLAKE2B bb9e36d5912be413bd89340832029a5cf1f4d88cd053986a9e49f0215c8b9e2e528078acd751e580b978d42724c66550cf9d046f3c4cd902e50e12cee0abfcf7 SHA512 d8220b1f36b6aff13b9c0279110a06f9344cced376fa8e2ce3ed91fb21a23c95e4be0f0fe1f4f4d060782a372472f87e0da4c2d8536644013662412e14c7296c
 EBUILD openjdk-jre-bin-11.0.12_p7.ebuild 2654 BLAKE2B 83bff5854cb15ae586350e0383f24f6042d87c34576396cab523b607650604233fc0a3a77230d752eded39316d5764bc264494803df58c410a606c9d1a416d98 SHA512 408f1be2b1bf1289108f903f8d154d128cc7102ac8c27f8bf2b6f27b4c9d034cce196a97893043508679dc336e8a7915b5d48052c8b89e83fe9490d49a062c84
+EBUILD openjdk-jre-bin-11.0.13_p8.ebuild 2655 BLAKE2B 1fc88a11362ccd870ca6011e50ce7bddb90967f392acfeadd0a04050fd8a541a845c79196f48d731914c4380ab51c0fb8091a89f228901946b8a0901ff2950fa SHA512 336dcc92c9d6dfbc44f68689df6effd9d8971df0a42bbdcae88c5cc6be510a2697d36e26648e01248cfad2cdf024e767d9dd52929450795da139f3719d41314a
 EBUILD openjdk-jre-bin-8.292_p10.ebuild 1864 BLAKE2B 1fed435abcd6dc7aac2c71336162c3e4a77117a2387a9bc6ad80bdd60dcdd8f83648701b47baba0a782927ec11f7af78c157067b597f5dd24fdbefccacf93cf7 SHA512 5105f215171f50d0ea487cdc371be630047bc74155012e0a509822a4b55739820b5668511c05611417d9c0c30d6cdaebb26228dcac73ce4fc785d66ac2b9a8a1
 EBUILD openjdk-jre-bin-8.302_p08.ebuild 1859 BLAKE2B 6abad72cdb322bb1c52714b999085eca3a92c7269194e8c03efe1be93c0de274b6e50d72c5c0b804267c074eb76bf9e438ac3c2c565812bd8af8da6157a3e8a6 SHA512 07bc482870ba9810e54aa1e25deeb91f10391e93984ce0fa8321a45965c53324929a6db0374b78037f4d8420d32bf1be755fe80e3258b039da4a7c0bfb96495c
+EBUILD openjdk-jre-bin-8.312_p07.ebuild 1860 BLAKE2B 0fcce9e0cc8ad93c948b099e0a145c987be058bef7761bf3b51e71d7986ae2e74bfda6d834c2ce07227da7b94d34a675ab48f06879ee04bfd6fa9f5400bc6151 SHA512 26f5eecc6a7d130a3dec5277c2b6415d9ac01e9c56f4d53f2464c29915cc4802c7888c7175cc8ba092097a17ce4559a9bc4912f63ff36cd99b132f8c56d45342
 MISC metadata.xml 896 BLAKE2B db8489d7738bb5444ee789ae0dc516941ece1b814ce4c4d0e12284e4027315aa20b141027ca6db8aae7ab6580d881e79bcb1b4dffa8a890f75da6d7177c7c279 SHA512 8833e637b8b935247972eaf7afbf3787cc17013080d9747defad4784ea89c2b147d0f2284327e9ade30100594a0d1e638f0ecd01f0375101372028dbfd0b31a3
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.13_p8.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.13_p8.ebuild
new file mode 100644
index 000000000000..92fa295b7789
--- /dev/null
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.13_p8.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-vm-2
+
+abi_uri() {
+	echo "${2-$1}? (
+			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
+		)"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+
+SRC_URI="
+	$(abi_uri x64 amd64)
+"
+
+DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
+HOMEPAGE="https://adoptopenjdk.net"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64"
+IUSE="alsa cups +gentoo-vm headless-awt selinux"
+
+RDEPEND="
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	>net-libs/libnet-1.1
+	>=sys-apps/baselayout-java-0.1.0-r1
+	>=sys-libs/glibc-2.2.5:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	)"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${MY_PV}-jre"
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED%/}/${dest#/}"
+
+	# Not sure why they bundle this as it's commonly available and they
+	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+	# also has an explicit dependency while Oracle seemingly dlopens it.
+	rm -vf lib/libfreetype.so || die
+
+	# Oracle and IcedTea have libjsoundalsa.so depending on
+	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+	if ! use alsa ; then
+		rm -v lib/libjsound.* || die
+	fi
+
+	if use headless-awt ; then
+		rm -v lib/lib*{[jx]awt,splashscreen}* || die
+	fi
+
+	rm -v lib/security/cacerts || die
+	dosym ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	# provide stable symlink
+	dosym "${P}" "/opt/${PN}-${SLOT}"
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+
+	if use gentoo-vm ; then
+		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE"
+		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 JRE"
+		ewarn "will not be recognised by the system. For example, simply calling"
+		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+		ewarn "fully supports Java 11. This JRE must therefore be invoked using its"
+		ewarn "absolute location under ${EPREFIX}/opt/${P}."
+	fi
+}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.312_p07.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.312_p07.ebuild
new file mode 100644
index 000000000000..84b9bc863e10
--- /dev/null
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.312_p07.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver java-vm-2
+
+abi_uri() {
+	echo "${2-$1}? (
+			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
+		)"
+}
+
+MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
+SLOT="$(ver_cut 1)"
+
+DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net"
+SRC_URI="
+	$(abi_uri x64 amd64)
+"
+
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64"
+
+IUSE="alsa cups headless-awt selinux"
+
+RDEPEND="
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	>net-libs/libnet-1.1
+	>=sys-apps/baselayout-java-0.1.0-r1
+	>=sys-libs/glibc-2.2.5:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	)"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk${MY_PV}-jre"
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED%/}/${dest#/}"
+
+	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
+
+	# this does not exist on arm64 hence -f
+	rm -fv lib/*/libfreetype.so* || die
+
+	if ! use alsa ; then
+		rm -v lib/*/libjsoundalsa.so* || die
+	fi
+
+	if use headless-awt ; then
+		rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \
+			bin/policytool || die
+	fi
+
+	rm -v lib/security/cacerts || die
+	dosym ../../../../../etc/ssl/certs/java/cacerts \
+		"${dest}"/lib/security/cacerts
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	# provide stable symlink
+	dosym "${P}" "/opt/${PN}-${SLOT}"
+
+	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 7936573832be..cced51f7a907 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -2,44 +2,63 @@ AUX openjdk-11.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603bee
 AUX openjdk-17.env.sh 537 BLAKE2B 64ef0f37bc0fb1f20d5f30751727e8f70a0460ad5917a9aa0dd346732e0862ebe10ea48145d585aea45f3689c9d359ed3f983dbaafeaf9da4c5f306fac8db0fa SHA512 b6add3bd4cf296debcaa57c7e73c1469c2dab1450157259a70702098aaa40339b6927ac444116f62b9448806c88616049d4733b4d7d8b2ae6a1ec106c16a6a07
 AUX openjdk-8-insantiate-arrayallocator.patch 647 BLAKE2B b2403d842ace7198520a25bf7c2027e6d74b5d418b52321722b21cac866df883d47e53e4f5e040aed55a9cc4bf03b5a62d008a0877add6c649a41f6230d78a38 SHA512 4bf002ec25844f4e55b588d0516e658c548700d3bcae79be74bf75d9cf30cf9cd448767db36935924dd3b07f34d0cf087321cb35abb4943690353d11485ab0de
 AUX openjdk-8.env.sh 792 BLAKE2B efabd83be56cdbd06419267361b82278bd52bfce8df8f369b7b9cadac74196ad90b9ab83e3abe8ae73e5ac51c49236d24d7762450832236414f98c1f6d13d6b2 SHA512 acdf229fff329c79e2263bd433c953dd18fc0945a0ffb6428c7004baf0bedbe3a9503c22ba1e777e7598412dfa2d2d9255c9007ecd14b4590c558e6a52c48a9f
-DIST openjdk-11.0.11_p9.tar.bz2 95298760 BLAKE2B 7572d297fecffa9d38998c79dda00ea9361c1cf2f6c8bf51bac782da17cd3b6b272d08ab57fff96d523a1299f5514cb3788d05eeb37ef467ee7ad8bbb156d98e SHA512 72deecf32b793fa331deb6a1c0294b1efc68b72af9aebc1ba0528189e0097ff6d226cd0c3947d3cdc35c3cf28b3450cc538d375be0b9d43dca379f244894d20e
 DIST openjdk-11.0.12_p7.tar.bz2 95201432 BLAKE2B 6a031fec8e49025dd07d970bc12ef4da23c0e6be8a7b6f6609154bbe607de386669e58c529a935504a4a115269cf3e5a142ced50be5b21961b21d6ba53c6ecc2 SHA512 ca2af877839ee91b989981112be0af446d835ddf9eb68fc4976c2f97b21a4b0c9ec67625c202084e92834dd1a75f97a8aeff77a45570a79dc870cf6bd9d5d97f
+DIST openjdk-11.0.13_p8.tar.gz 122738754 BLAKE2B 5a60bf4245bc1e3591f4ebdf83a441f95a97a50a72a774612e99792789cd81a9317471cdadf4541efbe9b1549c2738a3cd30d134d3ded8de6d58f8a67b2aebe6 SHA512 38bd1be54533e9eebe407e771b1ece86ead755d1f3f0199e425aa4ad3e8fe511b0024986b7ffc59c571faa3dad510956e98ab1a48cb184c9cf5353bb7512cb06
+DIST openjdk-17.0.1_p12.tar.gz 104597561 BLAKE2B 9bae16c0c0b973017258076bf8597101538e7ef29cb16357b17b112ae1aa058b17d26f22057cf3d6638104dbd83f5c19b6bcd124f589fc100eae83f78dc1c269 SHA512 220d87a29e1a25b670d721c27069b601a48c833069cb252f81ee6de2ff65fef23fd76e689fc755940f7e457b2419ef93a15cbeca64db2a8798028729df876d25
 DIST openjdk-17_p35.tar.gz 104583143 BLAKE2B bc5cb90ea42d6a6fa414e807c04dbabadb097e9a3a3fe27010b03375997446a1d2ddfcd6ca8afc604730538ad0a375266e5a7fa4e111b02cef23b06b39160a89 SHA512 38a108752072133683bfdb5564f6406a4d0e95f4c15116f0b0dbae1d024450ff0be8a01f3a58ed5de9d93e1b0c70cb481a21237a9eb0d5034be85793785d19a4
 DIST openjdk-8.292_p10.tar.bz2 457861 BLAKE2B 043c1d6f7d040dedaadd05091ce4fdf3f516c1cd241e3603c81f2c49fd81df9c4f1082822a5471255381d56f3ab838a24e499b4ec647f3354ee051078c496b2c SHA512 6e1ac380db32fa5f1decc80291dcdb5e1d3d9afb0dc4587966c5a1b840588a984bc07109c23cb0c69c60509c6db8152e7306509280063f7d2e853aed41e391cc
 DIST openjdk-8.302_p08.tar.bz2 459824 BLAKE2B 19909605f3ae93f94875268e88b8fea0a49be0d8adbf2d2369c5fa1e66f6880094730294cb52bad009984c7ac7f63b8271fa43d0901fe4ce52b7b03696aaa6e3 SHA512 2be9c2965e307b09dcd07225e09665bbc818ba851d9e854645218194f0052eb4736f49915fddebb2a89043b0c14d7a6d5de145fb712034661568610e596fe0e5
+DIST openjdk-8.312_p07.tar.bz2 460874 BLAKE2B 2230d45b74044c894d1c1d25e7354ab9cf3d4df82ef1f149c31e2a755220775f59c76178847f61b99fc0859522fef4106c696e807c70602f9138c5110bcd3ed2 SHA512 483503cf4a54b736a9cb17179246d0fc602450e15d7815d3897d2c5a056483187b96f09280f6bb0522044150eb6733777bbb3a9130e8e34b6f6c865cb306e5a8
 DIST openjdk-aarch64-shenandoah-8.292_p10.tar.bz2 464164 BLAKE2B 3f50f20517ef7b4599f9062330b3bc86900c137751e65d3047d165ad153032447b5f9c88e0d390c0ed758ad10d818295ce2cde04150da5036dd6b05fa26c2745 SHA512 074e9ea2fe83f4edb4d0de72f0d1a9c9091c28707c17b08ffab11cad2620790e740bfe53cef41a07d04b31cc32c1388e52e09eb07ca0b9929300d611c514619e
 DIST openjdk-aarch64-shenandoah-8.302_p08.tar.bz2 466591 BLAKE2B 3ef3939a2ed30c628d92319b2ef68472e53b47752faa331728966432c8469138b61e634e021aa5f69eef608e951cee5f0b77c1de6f3768cf568900f2eb78c5be SHA512 deb126036fecdc9a65b8a203ba32f99a2114cbcba2680950963d3e87565277e14ac53d802278e1f27c2a73be02d0ef77549de4ecd9ee355b1c8e45a86c83b095
+DIST openjdk-aarch64-shenandoah-8.312_p07.tar.bz2 467870 BLAKE2B 5ed4301b942fd2757644d82b1eb8f212d27ae6c39a225fa739b6a665deb42ba85ebb3e95d8563a8031cd08e3fed9ce2fa2aa675e2d348bcbd16d5b82bff74d43 SHA512 157f53f096f7cdf9bc4af2200cf1bc5dea566a839beb59e2d21a8001e0dd1c6596e409b7e21b9484832c9826dbaec97c00f5e980926142c89117650e390ec63e
 DIST openjdk-aarch64-shenandoah-corba-8.292_p10.tar.bz2 1052188 BLAKE2B b4acda6a4d97cdfb4cfe16e1442dac6989af5fec82143dabb914ee31632b5421bc091708b06e37f95d552b21dbf24ed681b026635e96d32f05ac7d964eb53ac0 SHA512 9f4cfdf8a2580414f90ce0b128fd2ebbeb46977994605d3182ee5033be92898f3b292bafe6c0ca3a0fc767c03de598c93e25cbbc06726383b35961d40c601cee
 DIST openjdk-aarch64-shenandoah-corba-8.302_p08.tar.bz2 1053085 BLAKE2B 02296f31b6ad8f72e89baf669c47d59a71ff02dcb87efac020b3dd443b033e8e9e4faa831a08922db5fc5f07872233e3314bd416eb97d7946110d89fa2cc9f87 SHA512 11f3413ec44b3cd7d543464b1757fa041798861e3b323641b26abe5edd3ba8edaacb6a5fd26d5b9f27d60cbb38983c6fd55ba80c13ff7ec09839d2c340f305bb
+DIST openjdk-aarch64-shenandoah-corba-8.312_p07.tar.bz2 1053490 BLAKE2B 47ee0c89deddb3aefef02d9a71a8d3bdfddd95977e57c70e2699a18c76bc1724b48609c106126527085bca8892a4b071d26d0d47c72cc0681757c8dacbb85c78 SHA512 49f27951b3b57c10ea996f2490a089e1eb28be4762d57962b6b2616020a3cca248ab61580c6f27842b9986eadcc1bcb208af543832fe839d6fd548a3f7a5a04a
 DIST openjdk-aarch64-shenandoah-hotspot-8.292_p10.tar.bz2 8787501 BLAKE2B 628c84ad165e82b782a66c159ea2bfc2e739eafa41981d353272911bce3338b8eedeb204bf5c8238270ef22259c215301dbf30bcbcc366bbb1c1ed05c6bcf0fc SHA512 50a97c8bbf225c7b2dae50d398eb17831ad761fafb210a481942101bac54164604c76353ca4f0ec7c3a601039eb80164afdfc62f509c0b87e9c948970c0e6140
 DIST openjdk-aarch64-shenandoah-hotspot-8.302_p08.tar.bz2 8790278 BLAKE2B 4dfc70455f680f683c51620acc4624f2301b4304ff5e56783665a00b0366a67612b0219f45fd97021f7e6c396ffcd60355bc642e2cb4fd87c9f93443f72df9de SHA512 68473f17aeb4bdac87385ae33f8c241003b8dde51200633a1cc7f7f92e2ed92151c49ad023427970d855d52f35615709f0076b1cf073a00961f320b825ecbf78
+DIST openjdk-aarch64-shenandoah-hotspot-8.312_p07.tar.bz2 8802379 BLAKE2B 53a8fa582f002c19a50d6dea07aa9d21374b59cc0fb973ca84429191060ba60da609ea115d6249d835f7a945279073c896abb534f1b59ed3b5811b70dd8a6503 SHA512 b0b19a9277af9ab0f395367ba010d4574ae4e7d5a0f9c9c44c3222545642ec6a4342bd2caaa8f8db3ade23f4680b8cbfbb74b4cf4526622ce9eb4d16a3190fa5
 DIST openjdk-aarch64-shenandoah-jaxp-8.292_p10.tar.bz2 2726660 BLAKE2B dc720b115212084ab59a4af6b257b485592a84e630650445ed3bdc0c471d529bdc8a1f2b73c5e38fbdd65ff1c221309e814adbba851c59279c8b3740b4560d90 SHA512 43c0e6327c3f7ff2d6320e7d1504f1575c0993c53a207dcabc75a0e1785fcca2aac7f78856db374198e3e95bce4bb05520a9a4e94f2ec03446b28f4d65cd69b6
 DIST openjdk-aarch64-shenandoah-jaxp-8.302_p08.tar.bz2 2726090 BLAKE2B b15a940dc1832f9c5536da5b0f024a091e62500eed7300075e7e8b21491cbe67a4e56f0cbb0e247e288b766619212f34e5cbb4265bb7688f44dc85f6d666c622 SHA512 e77d10caa9e2844470e01512a78cfce10c4d93c1d0597e405fa7233d5b402bb5c015045770fc2f338d24d98c978d23bfa7c6c0edc65f8bb48233c3a5a846e3e9
+DIST openjdk-aarch64-shenandoah-jaxp-8.312_p07.tar.bz2 2727550 BLAKE2B c56530d3b227565ec7eb300dd15c7e00a0efcc745177f6adc23636f29bb1517357829efa998ed7614ded752b75b1a5ff74f3cc88876110b97ec564bf1b1d8254 SHA512 e40f271453fb8524d9da8ac6790e7f3d4cbf68e14b9216bf3dac2fd8c04d67bdd81144e027b9d9b0bec2516bf7fb5bb1ab5cbf1838d3c35f9c5479204980a69d
 DIST openjdk-aarch64-shenandoah-jaxws-8.292_p10.tar.bz2 2560138 BLAKE2B 6e40ca6fd363c6ef9500b6b40c7f6c836b496899d289d0626f0e52412924498eb6b000291b58af8d42b9bc7dcc2beb1374ef6b8ea18d483841568d3848230842 SHA512 0ffbe33f375f18679797a7e724b621015650a6a9374ff231814f8e8ad0eafe42f281f76a83e87e234604c266ccbc15bd6e84692c3d7e272e702be316ce0048b2
 DIST openjdk-aarch64-shenandoah-jaxws-8.302_p08.tar.bz2 2560243 BLAKE2B 9a548756d609df495f77b2fe79884698d73e6c18254507c31b3364693eabf91d3a31153e182efeef4f5c2d505d509e01bebbe19afdce9d5294678c38a4791111 SHA512 b9bbe9ca06336daf8e10c60de1bdd209d8d561baed4d0ec77e419280d50b34f5297291a442568b0bba366fd39c6e8ac5a10fb9a19644fd584632456be618be6e
+DIST openjdk-aarch64-shenandoah-jaxws-8.312_p07.tar.bz2 2559773 BLAKE2B b3c065490fc4a7ea69d7e5b74fc7c3d971e661fbc398dd8fc46a76f992a6b32059afc266cf85bd54024f4c1e134ca6efb6b9cae3d7966a08be863ea44c3b9c1c SHA512 936b7fae3b2c2b2262c85ae4816839e7f3ef5ab361070e487ecb5d71d637bc6312d5b98abd3a52a29b7e02cf3fa9aab7447f5ca1ff19bcac6cb46c0e539cf32a
 DIST openjdk-aarch64-shenandoah-jdk-8.292_p10.tar.bz2 48705934 BLAKE2B ab8995ef30267d635f670791417124ce63435f4cde095c057e4b506cbc23b879bf308986ea0960392836acd46aa6fd7be9a09fea011a85c981388ad58a876f0a SHA512 7f76a8e81cf759989657101a4b71ae0e896273571e5d61790100e412dc1c211118251b6f068da3764ff1059635f98079d88c6cdddf04f676c5db3a665d3d9d8b
 DIST openjdk-aarch64-shenandoah-jdk-8.302_p08.tar.bz2 48780613 BLAKE2B fdf5c10e57ae153728c560de643e1a73070ba72a97e72ea94f66e8e69bd7602b7b821bc8240fa09b0fa16a563a4c7083e386989f947f2027b966e6b859dc6491 SHA512 ed7e884daa9899224c75577d6a86e0f431314d561e2afb244b7cd208f9e5614a4cc80578e7e14d803b4096b1bfca5d3929abec63e201c13f28de2fe6cef59398
+DIST openjdk-aarch64-shenandoah-jdk-8.312_p07.tar.bz2 48837594 BLAKE2B 368caa0a628e3bd0d0343baf7ac6c8854f6998ea5b5f96594e99ac565293bfdbfe733acfdfd398964634ffaf4e0eef298dbed078b0a61626c97711764a45a0bb SHA512 8436daa785fba98ed2c23444673842dc28b18f114ebafd203bc01bd2295a9501c2391c2e51d0f589cd4112243eee2e18a8a71180b2aca3988c58a02f33d13d57
 DIST openjdk-aarch64-shenandoah-langtools-8.292_p10.tar.bz2 2402059 BLAKE2B 707654793fa26f2a992c2ded6130d5710efac6a91661914bde150a91720fcf08a54931fcd1a56fbc31dc1a61a5216b61e3871d963a2b03803ae8cbcfa8b095ab SHA512 6dc82a18edeb5390d078a3113d2f7c7510737b9a9761b1a714d855d36afe4530b41a6e980af0bb090b31e8f95f67e097190d656d265c8518f3971526ee5e4001
 DIST openjdk-aarch64-shenandoah-langtools-8.302_p08.tar.bz2 2403538 BLAKE2B a26e79353637e0f3c431dbd5edc9ce959f9f60057af76d3b24c09ac623f2f3272de5fd5d2ffc3153247f1f76d339ab4ad62a87864d70ca64881dc5d177e6c96e SHA512 97c5a039620df40185327bd04865d3a11ea8a419c310f27ae1c4b45cb4f8dbe940c8a08bb9903525faaa79d917b009175d4b3827e6cfa0b64e4807b6da3328b2
+DIST openjdk-aarch64-shenandoah-langtools-8.312_p07.tar.bz2 2403116 BLAKE2B 10c1ca4e78dfad90bf9b8d6745cda41605d5985eddfd8e4c3bfbfcb6458c5b5115813e9aa7b4aec148c4d82f268ab02ca6cef9e68bb902f1944858b6bb6b36d4 SHA512 2c9fc95cb19b1c3a4e7b9c2e305d9a285f1dedb7954cce365738e683c3a52eb7f4e3f3485b947860aee2fd6059b7d2b18e196cc1c585427c6b4b8299f6fc3105
 DIST openjdk-aarch64-shenandoah-nashorn-jdk8.292_p10.tar.bz2 2841484 BLAKE2B 4d95d38c6af366fa4be8e9ad2d3cf09d6ad1ac05d25ca94d15200a051cdfcc67af666420a5487f0b2782040dc3483475bf2515b0b5d40e520f162e78f768d5c5 SHA512 523e1292169a6a791c2b90672295cd3210a09b8c973cc038e9ebda7e89afc0339568a993909eb108985998060ccdd13601a9bd9a8e4890ac606febf07578a887
 DIST openjdk-aarch64-shenandoah-nashorn-jdk8.302_p08.tar.bz2 2842578 BLAKE2B 0ce96a05392250116099a23d6ec54117dfdeff3e75a8fecfab6c1350edb0a45b9652befef6d0387579835c3450e61a4409e51d1a471aefcbe5016c3f346df9b4 SHA512 87140f7e451234b916df6948c0f5a59e5c4321939474aba8318076ff76c247414807d51cdc006f6db6d45f71c1b2e7cc1e7e7ada44b7bc446adebbe622af6062
+DIST openjdk-aarch64-shenandoah-nashorn-jdk8.312_p07.tar.bz2 2845057 BLAKE2B ff32686b27b767683ae0a670b2509291b6708d371b398cac854210132f555218b9189d3012cf9b45e0584f44425e09aefb8acbef95f1786787067f4d5275fdbe SHA512 71fad14ad6b7a75ee499bc0b3370e5beb22d5a7e32a02d54fc5dff1cf25ede51c3a8a04de6424947ddaa3b5d4a0d7f5a447ba073b62c5c86a49c0543cec3f374
 DIST openjdk-corba-8.292_p10.tar.bz2 1033217 BLAKE2B f6ac60ad0aab0c1ca149fdf2b26648d38ab083ee6fa36b2f82aca19e79037ac7166c43f91c193493923ea4dabd57de3bcccd75a73aeb6439c1d464729afa957b SHA512 7bbc2b61421a81ca2f0e1080bf5c3bd065f737c0dbc822f123875f2675515b947b4f8efbf0ddb3b8d887b90ab5c646fbb12ae35607ff295d9ca489737ff4fac9
 DIST openjdk-corba-8.302_p08.tar.bz2 1033971 BLAKE2B 0e714a7f8344cd5a1a4800b7a3cdc06d1993f97a34bb15af6f259ab4aa36fad883f82aaa16136c5c62fed0716c8d63ec5d6990d2f4b9385906c99ca4c62c286f SHA512 d539e7222df64cee23b071087d2f5fd5467ebf5fbb0c49bda631c735517073e0f7e2b933f8595bb33b2fe5bf3e3064efaaaada41f7538537914678efdae543a7
+DIST openjdk-corba-8.312_p07.tar.bz2 1035097 BLAKE2B 38ae2cf2e61c44a42320b26f7bdea424066ee4568f2f3bbe6e7aa2d8b7aa927429d0b8c2cc757f580867df6c6e5dbe1270da5f91d9c52aa131e66c146a311caa SHA512 9035449c07e5fc9776b40e32de3e4f1c6efac482c14298671e5e719a1f9830fe9a20851dac3f9c6d6c0c8c387a7b44e40019570c1f054fd1d1f24e2f5cef5bfc
 DIST openjdk-hotspot-8.292_p10.tar.bz2 8558678 BLAKE2B 02aaa0cef73dc7aa7e9db426fb021d00f25321426438365f672e0fcbec476826d62c92d897b520f0162ab63f2bf72ecdbf6d8e8a7241d455900d427aafa22bb8 SHA512 ae1e174fad6c41f30593abb4c0be17752d6f7de0fa0a1b83c383cb7cd0848e462ca88feb391c9a8427e167c06e6c3d01230fb769f711dcfddd007f8e43d4c481
 DIST openjdk-hotspot-8.302_p08.tar.bz2 8559747 BLAKE2B 0050b7f4fd8a8beafa6e95215c820bb98a3576b6c8620ea5cc8d631a5e1be7f0f2237734b962ed648ddd038cb0abbb571b24ae71ba488816cdf93ba59915e905 SHA512 86bfcf6c2e4e63dc646062da004520e8ad5c146bb7a6aa3ea1a80813f0b05cc972bce9c3e75a2bb73822ddcef1fbaa525f8b43b36da7f62740a70e1c572d1683
+DIST openjdk-hotspot-8.312_p07.tar.bz2 8559682 BLAKE2B 776acb83bc065885da90b26c88f0083c3bb7bb1f6dfd0585e37e58f185b5612f6501f2b26e1eeb7533d30f82faea7ccedeeee21dcf454a4e8fe951aca0406a1d SHA512 0c501d284bb22867391de0f8da8b098ca9309173ab6f7415d591d056a2d8859757aaa3da4a9c294dcc434a41771928a9f1edd8a69dad38ef7a9bcad793deeaa8
 DIST openjdk-jaxp-8.292_p10.tar.bz2 2684063 BLAKE2B 7130d33afb81d83f0ec3afb5e6e161c318e7c6b36189dd7f88410a7edc07a17ebe2d5c15c5991b31d180d4d1c70c683953a9cfcac1c3eded64a4ab679d4a0366 SHA512 92a15a693440cda28aebe9033675aadcbc099a913f9148b26eae90004d54b246152b326e0005b3da6178286ee21f71f12ecd2f395c09b6707679239506154849
 DIST openjdk-jaxp-8.302_p08.tar.bz2 2684910 BLAKE2B 0f6b7066efb2064a8af59c53da182bdf21313389ea933352a7cd8d1ddbabc7286b8558dd0770ac121b74b55ea47107f037603202d2b12582d6ae00a37b6ba567 SHA512 13aafaa978a28a31beb3c25a6d85626dfd91972a1bb43273dcb1b55c6d48cd4fe0f0d1d78aa309792a00885534d767c05a38b7da24b4ba9c7f81eb0702a9025e
+DIST openjdk-jaxp-8.312_p07.tar.bz2 2686710 BLAKE2B acbfd2a7ebfdcfbfa1c4467dbc6778afbb2b8fab5c70381000b926645197c3bb5537a81574ed98960cae2fd0d70e50ca5976aabd0c49cf833c07f1f3b7935773 SHA512 da3fbd82ff05e48809cf6180d876f09764f5f97e4fc37c4352c7875ccd5bebe66cb51ff4565e6fcd67699ec5b5ae3eebc9c0a1510998697519cfc94d3d04df5f
 DIST openjdk-jaxws-8.292_p10.tar.bz2 2543680 BLAKE2B f39b7e939de9ba19f9ff53d2748e2fee7acc82bd4d85a4d8e1f49e3b0919daa03c4996e63a46e908da966dbebbf7051955104b291178f9b059d60e8208dce51c SHA512 5106a28819da3708f8a71e4595cb0191099a7d2e06b7190981beea6af504681927be6c07ebcbe77340735bb22c365e1cf001709311c0a57940247d9584a0ee48
 DIST openjdk-jaxws-8.302_p08.tar.bz2 2544355 BLAKE2B 94665442869022a94db1e6ac945b6baa262c055d17c458b936cdfbec1b0cac8cb975f4949c64b7ad39a7c76096e8457a9e6bc752fcb91b2342a18593b7b98521 SHA512 b0a933ee76f0b787d9ca7835e4191812669259d471b4214906e247fcf30ccfeca76ee213bd07ed8263af2a1ecca11df5c2870fe64bfb8c68f838992f64962da0
+DIST openjdk-jaxws-8.312_p07.tar.bz2 2544672 BLAKE2B cdf1e2ca85a91163599d4ce9473983b80ab7bbdc07303b8d8ee02d0f83306c5bb6ed909d4af29378673959dd08cbf1ee0629282e812c38a660625677a68d59da SHA512 317e6c684e1034f8ebfa7230694d74d0b615d0c874b991745a234a55da3af15ef7f7a56769293274bd1b7677cee773878f414b2f6c0d61253af8f5ec3b3d82f5
 DIST openjdk-jdk-8.292_p10.tar.bz2 48746031 BLAKE2B a54a832a305b87cbd4ceda4eb5bcea07e2a3d4b9f5648f21f52b4e29cf6053b830f876591a0c2c1a6447473354bfcf79d70c260c7bb24505743bd3ba67ba2568 SHA512 c10a64086e0fd63f2ecab884b7baa88c3dcdaad83f2240d7fe3d590913af252a57c9d735268acb1e75bda2883c4c41d47f405db0c15f82d833d33d08c824b9d6
 DIST openjdk-jdk-8.302_p08.tar.bz2 48761793 BLAKE2B d27904377719193603f20af54ffaff918f490b09c79eea371edf920c1a254cf8e5520b286be33b7adc035668ffb483bec158c0c7e12b4af6ab8b9436a3aea534 SHA512 bd07b21bbfbb8340f4e08e6ad7a39d68f4e1ec091a39a773ae87a9212b11218b82419f35523ae85300369e704595fbde6da6446625e349801bc07c5d13b46b2f
+DIST openjdk-jdk-8.312_p07.tar.bz2 48705905 BLAKE2B 0e9849a58a05e300441e63702846ee2d76e461939c5eb9c458c29ddc9c854f5278d464e3cc98112976b2b34268fa5a628e21183b8ea117eb53a805494182ef22 SHA512 cda0fcb171fec3d652340475c91b2c9099d7cb951ca352122236648272e94ccdf153bdf616cb772185cd7c9300b6e6b10490082ed5887d83e368edbefe2a4f8f
 DIST openjdk-langtools-8.292_p10.tar.bz2 2401270 BLAKE2B b4043862df04e9f0056d420116e47f4f1515d1e935bfb6830a67a9de3894c94a6289a7952153bef971369cdbdf2374154cd4895950fe49f8a21af5e3316dfa8a SHA512 ba66be7f37ca8268d1dd0b8d4e68c90ae19f815ac3b64aa1f1abf02a722a09ec46c7605d5124ac960bd44335b053da12b36d4b0562b3675ac503fd838d4924d7
 DIST openjdk-langtools-8.302_p08.tar.bz2 2401910 BLAKE2B 64e1d65121bfc75314b0f4205691140ec167f2ee72472650b1558f0a387bad1a657ad51a001c184ae65d8e8a1fd5bbe6f07a96e7e8c41cf13a195e0ba6aaf638 SHA512 517f75fa6e22fca92892d1811914bdcbcd7d85bd5357ac5253a0c3b3551a119d0ec68a82ca99bb336e34c6ff33b82195379c4ae9fb07f10e71f45e9a2ed65d75
+DIST openjdk-langtools-8.312_p07.tar.bz2 2403774 BLAKE2B 2eaaf2d23b0d31d566b95075f1e00a8ec01617a48bd860b927fc56f56c0ec1e4232c1d2e316b9b13bf563b89ecc6464bf1e49a86eda1a31d998dbbc85e1fa542 SHA512 b77d8b1864e121a838023da424b0910903cc2b11cd9669e61c0ced84e1210d4902b2a0b97031e6646f26b01f1120d72b6f3382c6aee4d25fcd2d8e4605b8b4ff
 DIST openjdk-nashorn-8.292_p10.tar.bz2 2849397 BLAKE2B d875dea02ec8a3a3cba49f173f42ad7d73d15492cb86a15b095063ad327655ab9c260571c8a8ed35daf4078d52eb24d58b04125d3cea148bbc9e3fe924375c45 SHA512 4b707059bc6b217bdae2d9ea685c18b9cc3759180d5dcb5e51ad4eb00e6e660ca6181a68427f1e53c81b9636a323c1229e19de35b51e14a5d599cb64412ae11f
 DIST openjdk-nashorn-8.302_p08.tar.bz2 2848729 BLAKE2B 75cb7e04c0b398f7b5443738b08473a4a806ffbd416828dfa9d7696e11c4ed28337330a4ba19794394689d571a05e6dd95ffbb047482b744cf25ac9551e94100 SHA512 c0634948d4d35271c27009108c322779ee67cdc764c3e49aeaa0bf9e59729486bdaf7f54dcd5289e82fd0e83f03f68a04597d187d37ccb4aa5b2e93f30111a06
-EBUILD openjdk-11.0.11_p9-r1.ebuild 7880 BLAKE2B f445e99b98d7833b477af27ad5f3912a7db667ee4dc851898cc509197af42c40bf93a5b640627bdb4fd6e8dba624f99884a54b31cdda788290bdb971cbe28877 SHA512 3c072d057b6987315b0722fc76e9c00773fc347cb7412811b4aa6479baee8278e88aefb2a29ea9c5c14b70241815fec09c2f9d1268474386938b7cd55873215e
-EBUILD openjdk-11.0.12_p7.ebuild 7880 BLAKE2B 90be95ba0aa11179f0cb1f71277c28d53c9df33f630e5c3cf876009efeed9032426d85d304b20990972fb2b5eead1c67c3d25b1b546c88c83273fb0401d82c86 SHA512 631287cbf9a147fb7a6a0d33d5011b34229ac66b09234cdc750ac3019765cae990016b2c3821048a524bb6e54784c74342966f94d1e332fae1284b4ad0183eb6
+DIST openjdk-nashorn-8.312_p07.tar.bz2 2848133 BLAKE2B 4e416ddb38aafb97796233adda615525fb6e583428cdf0b25fd285276b3bef81682d3a607122aa8724dd9ec2ef0890b889ef809aa8f72cb03ac5bc9bfce9192e SHA512 411ac87cf1e8c889330b3fc41ce8cd8ed70c553d079dd46349813b02b171a22c2421075cc6391e46a866ee802df874cf1a6ff3e7dfba20e73564380be24ae843
+EBUILD openjdk-11.0.12_p7.ebuild 7879 BLAKE2B 94cf9fd5534dc12a279467b992891dac7caa168bd9f149486b1597754da3ba2d143604f7664c7ca0e30ebeb687aa708e3c060e0b012d58bc0085b55acba5b1f8 SHA512 d0ebfb06671cec86201afe36fd9c60fb56e9cfff3e7485e45738d36ce9ed0123ff6101f302b9f1baa70f98e6ff6a0cb0bb433861bb21b2c5dc58f78d912b7be3
+EBUILD openjdk-11.0.13_p8.ebuild 7885 BLAKE2B 366fd32dc6a43829566d7571f69c856aed51f764bc3e3dc17a3880302da10752ff6af8cd5d28525eafa3c5c395b29d0285072a52bdeef58ca17b7c68d3690ee9 SHA512 f9fe631c8e30b2dee69f43c1d583d21b0b31f776a99c78f29b1e7fc05b8ee2dd71b7f3bdaaf4dc12675c3ac8bded5b72fab61a0a1931923497e14b199c97c2a5
+EBUILD openjdk-17.0.1_p12.ebuild 7801 BLAKE2B de1e5e767add36f98d18180bb57e2f65e73d2119e68f025cd315264bc486979ccd5e26b1c748c2c7b246b39ed67f9749bd0f484408549064c267c00356b06462 SHA512 3b0301ce9ec2ca457e687661b6f1444db69cffde4b5ba3c1984cf38f9c2d20fcf41b197a8dda4427c8fa8a4c1018eb233bce06c5205f9bbed03e026bf5ff6c1c
 EBUILD openjdk-17_p35.ebuild 7801 BLAKE2B de1e5e767add36f98d18180bb57e2f65e73d2119e68f025cd315264bc486979ccd5e26b1c748c2c7b246b39ed67f9749bd0f484408549064c267c00356b06462 SHA512 3b0301ce9ec2ca457e687661b6f1444db69cffde4b5ba3c1984cf38f9c2d20fcf41b197a8dda4427c8fa8a4c1018eb233bce06c5205f9bbed03e026bf5ff6c1c
 EBUILD openjdk-8.292_p10.ebuild 7401 BLAKE2B fdaac61668973e591bc885b6a2033da7ac3ffa3263558a507f800df7a013d873eadec2259b324c1f56823e7c36629f7af7e470552c58e29a53096de212309a6a SHA512 0972113635d2c22aa7cad3b847368d0ce89f85ede1441488d8f13df19fbfbb051513188513960299b0ef1d57c8e5c4b2a898ee01c171cc6ebecc0d8ed954ca39
-EBUILD openjdk-8.302_p08.ebuild 7402 BLAKE2B 9c305a3a852441a557f9bd4213e9c4c29c6cc2cd8184c6c68d4181f65680efe4fb783f50f8d70e5257e4e0b1b1666ff475bf4cd33ed0dddf453e77c6a8859160 SHA512 aaae2b31dedd15ae27bd369d34bcd2077b8ab820d2ca54b99cbf83dfc3f58c68c618485cc6d58597de944b3c3efade774184359ed49444245cd71076d9576fc5
+EBUILD openjdk-8.302_p08.ebuild 7400 BLAKE2B ad43ad78fb789a080b35a78d932ede47359f2c810122982d23c6974f1d491ecf229a04b454518e8356a5d606c7c59e4d8ea35535d00399985570bdbb526f07a0 SHA512 d520d183f5341f78c0332bf18a9acc8f70bb27cdaee8344c9b18313c0c990d94f06b252c5f11be5666d561bfa452d74ca100dc647eafa967ae280b49ee26267b
+EBUILD openjdk-8.312_p07.ebuild 7404 BLAKE2B 3575a44599c210502598bd53e994f0eb4133695a4bcdb6941cffa8b988271b2b71d417f416d5d60d13dcb1aa3d338761cd0b934e32ee225af3938a56ead8f2b2 SHA512 9734ee5f30578fe5a46172a29ccf3970fcbd32f4cbef849206ce178296e7410744cac85a0587b11e028f11a53e09ab7c4d71b05e30ac14fa713947415a0bd471
 MISC metadata.xml 1433 BLAKE2B f1c32727711519e4f3ecbaf9f9be6c025b467d93e2423bb5e6d9f3644242ad8f356204e7a804b0fccb56a3df5b9283cce305e82b19659a1c39bffc6b65676316 SHA512 cee169279a8c13fd3bfbc89eb1e0ecdda9a34214d001cf941f08abf89516f224e1532e916bbdb6597c56bd6a1df18ede2c4bb18e54c5e4ad67be70250f836fb5
diff --git a/dev-java/openjdk/openjdk-11.0.12_p7.ebuild b/dev-java/openjdk/openjdk-11.0.12_p7.ebuild
index e0b6a2896eeb..5b9b4bbe4c67 100644
--- a/dev-java/openjdk/openjdk-11.0.12_p7.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.12_p7.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://openjdk.java.net"
 SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64"
 
 IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap"
 
diff --git a/dev-java/openjdk/openjdk-11.0.11_p9-r1.ebuild b/dev-java/openjdk/openjdk-11.0.13_p8.ebuild
index d54714848896..585f789e5f81 100644
--- a/dev-java/openjdk/openjdk-11.0.11_p9-r1.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.13_p8.ebuild
@@ -12,10 +12,10 @@ SLOT="${MY_PV%%[.+]*}"
 
 DESCRIPTION="Open source implementation of the Java programming language"
 HOMEPAGE="https://openjdk.java.net"
-SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
+SRC_URI="https://github.com/${PN}/jdk${SLOT}u-dev/archive/refs/tags/jdk-${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 
 IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap"
 
@@ -71,7 +71,7 @@ DEPEND="
 
 REQUIRED_USE="javafx? ( alsa !headless-awt )"
 
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
+S="${WORKDIR}/jdk${SLOT}u-dev-jdk-${MY_PV}"
 
 # The space required to build varies wildly depending on USE flags,
 # ranging from 2GB to 16GB. This function is certainly not exact but
@@ -141,7 +141,7 @@ src_configure() {
 
 	# Work around -fno-common ( GCC10 default ), bug #713180
 	append-flags -fcommon
-	
+
 	# Strip some flags users may set, but should not. #818502
 	filter-flags -fexceptions
 
diff --git a/dev-java/openjdk/openjdk-17.0.1_p12.ebuild b/dev-java/openjdk/openjdk-17.0.1_p12.ebuild
new file mode 100644
index 000000000000..b5e1cacf9515
--- /dev/null
+++ b/dev-java/openjdk/openjdk-17.0.1_p12.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
+
+MY_PV="${PV//_p/+}"
+SLOT="$(ver_cut 1)"
+
+DESCRIPTION="Open source implementation of the Java programming language"
+HOMEPAGE="https://openjdk.java.net"
+SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+
+IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap"
+
+COMMON_DEPEND="
+	media-libs/freetype:2=
+	media-libs/giflib:0/7
+	media-libs/harfbuzz:=
+	media-libs/libpng:0=
+	media-libs/lcms:2=
+	sys-libs/zlib
+	virtual/jpeg:0=
+	systemtap? ( dev-util/systemtap )
+"
+
+# Many libs are required to build, but not to run, make is possible to remove
+# by listing conditionally in RDEPEND unconditionally in DEPEND
+RDEPEND="
+	${COMMON_DEPEND}
+	>=sys-apps/baselayout-java-0.1.0-r1
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXt
+		x11-libs/libXtst
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	app-arch/zip
+	media-libs/alsa-lib
+	net-print/cups
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXtst
+	javafx? ( dev-java/openjfx:${SLOT}= )
+	|| (
+		dev-java/openjdk-bin:${SLOT}
+		dev-java/openjdk:${SLOT}
+	)
+"
+
+REQUIRED_USE="javafx? ( alsa !headless-awt )"
+
+S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
+
+# The space required to build varies wildly depending on USE flags,
+# ranging from 2GB to 16GB. This function is certainly not exact but
+# should be close enough to be useful.
+openjdk_check_requirements() {
+	local M
+	M=2048
+	M=$(( $(usex jbootstrap 2 1) * $M ))
+	M=$(( $(usex debug 3 1) * $M ))
+	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
+
+	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	openjdk_check_requirements
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
+	fi
+}
+
+pkg_setup() {
+	openjdk_check_requirements
+	java-vm-2_pkg_setup
+
+	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
+	JAVA_PKG_WANT_SOURCE="${SLOT}"
+	JAVA_PKG_WANT_TARGET="${SLOT}"
+
+	# The nastiness below is necessary while the gentoo-vm USE flag is
+	# masked. First we call java-pkg-2_pkg_setup if it looks like the
+	# flag was unmasked against one of the possible build VMs. If not,
+	# we try finding one of them in their expected locations. This would
+	# have been slightly less messy if openjdk-bin had been installed to
+	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
+	# file but disable it so that it would not normally be selectable.
+
+	local vm
+	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
+		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
+			java-pkg-2_pkg_setup
+			return
+		fi
+	done
+
+	if has_version --host-root dev-java/openjdk:${SLOT}; then
+		export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
+	else
+		if [[ ${MERGE_TYPE} != "binary" ]]; then
+			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
+			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
+			JDK_HOME=${JDK_HOME#*/}
+			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
+			export JDK_HOME
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+	chmod +x configure || die
+}
+
+src_configure() {
+	# Work around stack alignment issue, bug #647954. in case we ever have x86
+	use x86 && append-flags -mincoming-stack-boundary=2
+
+	# Work around -fno-common ( GCC10 default ), bug #713180
+	append-flags -fcommon
+
+	# Strip some flags users may set, but should not. #818502
+	filter-flags -fexceptions
+
+	# Enabling full docs appears to break doc building. If not
+	# explicitly disabled, the flag will get auto-enabled if pandoc and
+	# graphviz are detected. pandoc has loads of dependencies anyway.
+
+	local myconf=(
+		--disable-ccache
+		--disable-warnings-as-errors
+		--enable-full-docs=no
+		--with-boot-jdk="${JDK_HOME}"
+		--with-extra-cflags="${CFLAGS}"
+		--with-extra-cxxflags="${CXXFLAGS}"
+		--with-extra-ldflags="${LDFLAGS}"
+		--with-freetype=system
+		--with-giflib=system
+		--with-harfbuzz=system
+		--with-lcms=system
+		--with-libjpeg=system
+		--with-libpng=system
+		--with-native-debug-symbols=$(usex debug internal none)
+		--with-vendor-name="Gentoo"
+		--with-vendor-url="https://gentoo.org"
+		--with-vendor-bug-url="https://bugs.gentoo.org"
+		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
+		--with-vendor-version-string="${PVR}"
+		--with-version-pre=""
+		--with-version-string="${PV%_p*}"
+		--with-version-build="${PV#*_p}"
+		--with-zlib=system
+		--enable-dtrace=$(usex systemtap yes no)
+		--enable-headless-only=$(usex headless-awt yes no)
+		$(tc-is-clang && echo "--with-toolchain-type=clang")
+	)
+
+	if use javafx; then
+		local zip="${EPREFIX%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
+		if [[ -r ${zip} ]]; then
+			myconf+=( --with-import-modules="${zip}" )
+		else
+			die "${zip} not found or not readable"
+		fi
+	fi
+
+	# PaX breaks pch, bug #601016
+	if use pch && ! host-is-pax; then
+		myconf+=( --enable-precompiled-headers )
+	else
+		myconf+=( --disable-precompiled-headers )
+	fi
+
+	(
+		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
+		CFLAGS= CXXFLAGS= LDFLAGS= \
+		CONFIG_SITE=/dev/null \
+		econf "${myconf[@]}"
+	)
+}
+
+src_compile() {
+	local myemakeargs=(
+		JOBS=$(makeopts_jobs)
+		LOG=debug
+		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
+		$(usex doc docs '')
+		$(usex jbootstrap bootcycle-images product-images)
+	)
+	emake "${myemakeargs[@]}" -j1 #nowarn
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
+	local ddest="${ED}${dest#/}"
+
+	cd "${S}"/build/*-release/images/jdk || die
+
+	# Create files used as storage for system preferences.
+	mkdir .systemPrefs || die
+	touch .systemPrefs/.system.lock || die
+	touch .systemPrefs/.systemRootModFile || die
+
+	# Oracle and IcedTea have libjsoundalsa.so depending on
+	# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
+	if ! use alsa ; then
+		rm -v lib/libjsound.* || die
+	fi
+
+	if ! use examples ; then
+		rm -vr demo/ || die
+	fi
+
+	if ! use source ; then
+		rm -v lib/src.zip || die
+	fi
+
+	rm -v lib/security/cacerts || die
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
+	# must be done before running itself
+	java-vm_set-pax-markings "${ddest}"
+
+	einfo "Creating the Class Data Sharing archives and disabling usage tracking"
+	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+
+	if use doc ; then
+		docinto html
+		dodoc -r "${S}"/build/*-release/images/docs/*
+		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+	fi
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+
+	if use gentoo-vm ; then
+		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
+		ewarn "recognised by the system. This will almost certainly break"
+		ewarn "many java ebuilds as they are not ready for openjdk-${SLOT}"
+	else
+		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
+		ewarn "will not be recognised by the system. For example, simply calling"
+		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+		ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
+		ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
+	fi
+}
diff --git a/dev-java/openjdk/openjdk-8.302_p08.ebuild b/dev-java/openjdk/openjdk-8.302_p08.ebuild
index fef83580c303..6ee82279c9fc 100644
--- a/dev-java/openjdk/openjdk-8.302_p08.ebuild
+++ b/dev-java/openjdk/openjdk-8.302_p08.ebuild
@@ -43,7 +43,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap +pch selinux source"
 
 COMMON_DEPEND="
diff --git a/dev-java/openjdk/openjdk-8.312_p07.ebuild b/dev-java/openjdk/openjdk-8.312_p07.ebuild
new file mode 100644
index 000000000000..751091fff6c7
--- /dev/null
+++ b/dev-java/openjdk/openjdk-8.312_p07.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
+
+# we need latest -ga tag from hg, but want to keep build number as well
+# 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="
+	!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 ~arm64 ~ppc64 ~x86"
+IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap +pch selinux source"
+
+COMMON_DEPEND="
+	media-libs/freetype:2=
+	media-libs/giflib:0/7
+	sys-libs/zlib
+"
+# Many libs are required to build, but not to run, make is possible to remove
+# by listing conditionally in RDEPEND unconditionally in DEPEND
+RDEPEND="
+	${COMMON_DEPEND}
+	>=sys-apps/baselayout-java-0.1.0-r1
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXt
+		x11-libs/libXtst
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	app-arch/zip
+	media-libs/alsa-lib
+	net-print/cups
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXtst
+	|| (
+		dev-java/openjdk-bin:${SLOT}
+		dev-java/icedtea-bin:${SLOT}
+		dev-java/openjdk:${SLOT}
+		dev-java/icedtea:${SLOT}
+	)
+"
+
+PDEPEND="javafx? ( dev-java/openjfx:${SLOT} )"
+
+PATCHES=( "${FILESDIR}/openjdk-8-insantiate-arrayallocator.patch" )
+
+# The space required to build varies wildly depending on USE flags,
+# ranging from 2GB to 16GB. This function is certainly not exact but
+# should be close enough to be useful.
+openjdk_check_requirements() {
+	local M
+	M=2048
+	M=$(( $(usex debug 3 1) * $M ))
+	M=$(( $(usex jbootstrap 2 1) * $M ))
+	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
+
+	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	openjdk_check_requirements
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
+	fi
+}
+
+pkg_setup() {
+	openjdk_check_requirements
+
+	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-${SLOT} icedtea-bin-${SLOT}"
+	JAVA_PKG_WANT_SOURCE="${SLOT}"
+	JAVA_PKG_WANT_TARGET="${SLOT}"
+
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	default
+	mv -v "jdk${SLOT}u"* "${P}" || die
+
+	local repo
+	for repo in corba hotspot jdk jaxp jaxws langtools nashorn; do
+		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() {
+	# general build info found here:
+	#https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
+
+	# Work around stack alignment issue, bug #647954.
+	use x86 && append-flags -mincoming-stack-boundary=2
+
+	# Work around -fno-common ( GCC10 default ), bug #706638
+	append-flags -fcommon
+
+	# Strip some flags users may set, but should not. #818502
+	filter-flags -fexceptions
+
+	tc-export_build_env CC CXX PKG_CONFIG STRIP
+
+	local myconf=(
+			--disable-ccache
+			--enable-unlimited-crypto
+			--with-boot-jdk="${JDK_HOME}"
+			--with-extra-cflags="${CFLAGS}"
+			--with-extra-cxxflags="${CXXFLAGS}"
+			--with-extra-ldflags="${LDFLAGS}"
+			--with-giflib=system
+			--with-jtreg=no
+			--with-jobs=1
+			--with-num-cores=1
+			--with-update-version="$(ver_cut 2)"
+			--with-build-number="b$(ver_cut 4)"
+			--with-milestone="fcs" # magic variable that means "release version"
+			--with-vendor-name="Gentoo"
+			--with-vendor-url="https://gentoo.org"
+			--with-vendor-bug-url="https://bugs.gentoo.org"
+			--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
+			--with-zlib=system
+			--with-native-debug-symbols=$(usex debug internal none)
+			$(usex headless-awt --disable-headful '')
+			$(tc-is-clang && echo "--with-toolchain-type=clang")
+		)
+
+	# PaX breaks pch, bug #601016
+	if use pch && ! host-is-pax; then
+		myconf+=( --enable-precompiled-headers )
+	else
+		myconf+=( --disable-precompiled-headers )
+	fi
+
+	(
+		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC MAKE XARGS
+		CFLAGS= CXXFLAGS= LDFLAGS= \
+		CONFIG_SITE=/dev/null \
+		CONFIG_SHELL="${EPREFIX}/bin/bash"
+		econf "${myconf[@]}"
+	)
+}
+
+src_compile() {
+	local myemakeargs=(
+		JOBS=$(makeopts_jobs)
+		LOG=debug
+		$(usex doc docs '')
+		$(usex jbootstrap bootcycle-images images)
+	)
+	emake "${myemakeargs[@]}" -j1 #nowarn
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
+	local ddest="${ED%/}/${dest#/}"
+
+	cd "${S}"/build/*-release/images/j2sdk-image || die
+
+	if ! use alsa; then
+		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+	fi
+
+	# 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
+	fi
+
+	if ! use examples ; then
+		rm -vr demo/ || die
+	fi
+
+	if ! use source ; then
+		rm -v src.zip || die
+	fi
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+
+	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+
+	if use doc ; then
+		docinto html
+		dodoc -r "${S}"/build/*-release/docs/*
+	fi
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+	einfo "JavaWebStart functionality provided by icedtea-web package"
+}
diff --git a/dev-java/picocli/Manifest b/dev-java/picocli/Manifest
index 833b46271be8..058f91f4584e 100644
--- a/dev-java/picocli/Manifest
+++ b/dev-java/picocli/Manifest
@@ -1,3 +1,5 @@
 DIST picocli-4.6.1-sources.tar.gz 13467061 BLAKE2B fd7dc19d572e975a4b47ac0bd9a7ab4be0f5fdf1e3e03c2d3b5026ee9ad6cbcf5e6214234746551d61c427915095e067f44c1d3dfb27071456e76db26d567b23 SHA512 e2c6c6171c3ec9cbe35e7034e119dfe922993c9e7b8d81ea94faeb8b24c9c4c26023be1edb5d67041119c4bf73077d522fbe711e8c1af788063663e2bb06ab1f
+DIST picocli-4.6.2-sources.tar.gz 13488726 BLAKE2B dbec032bd0f40a45172e7c72884c32c9f769a9df0bdacc1904f3d45f4b02d1a3cc7c541a2ae4ca8a6754d67b5351412e4d91f2dc6fbbb3fc37bc4e2776ccdd68 SHA512 83ae37666a3c703b186cdb920095ad46de46de9a092841c352ec7db33877fa102afbd24227a1f73cad8be8a75b800f5c1487a8720d7080bdc8aa20dd8acafbe4
 EBUILD picocli-4.6.1.ebuild 1247 BLAKE2B 56c3c7700421d893aa08bc19f31a868ecbc6d8347883c9f88b5e01435e9aab49bce8725bffc8ebae621cbbaaa477a3490424fbe38cffb728e15cdde4cd40c938 SHA512 d4822745a22635ca00fb9870ebd8ac4ed7996650138d9107722ff38a5a2a800338fd70dce131569b2a268ac0dfb5e4789340f39cfa2b742bb0d7ef518c4d03d3
+EBUILD picocli-4.6.2.ebuild 1211 BLAKE2B ef88ce4a8f08d847b87a183f1fc7ff611079dba66fa405c0c021ae3da632ac442c1e84886d0d4f242780bea0272f3c934454944d4a51067dde4e8b5d41e20f0a SHA512 2ababe0418c0992436daea6d0a3dda255d1144dbddec1e469d2ebf814bc86171305855e1ec24f16ab67f51e2b655157ac41693c01c5083f2242d1b8b847f171a
 MISC metadata.xml 701 BLAKE2B 67e85243551f69c831b4a91807a5dc0661da92e2e7c21fcb8fc9936dd047defa9382d659b7910d5929e193a0a97397c1bf7f8a4d20c86ce46185f5fec4ec15c7 SHA512 6c6056c3e204886ccdc9c6ca28911cf6a5e3cf64e1830fc5c3acca736d28f4c050dba5d1a4ae4bab6c3ae48ae3e34d6b3187d695b2275d20bfb2722bfea753a6
diff --git a/dev-java/picocli/picocli-4.6.2.ebuild b/dev-java/picocli/picocli-4.6.2.ebuild
new file mode 100644
index 000000000000..fc331f6ba11f
--- /dev/null
+++ b/dev-java/picocli/picocli-4.6.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/remkop/picocli/archive/refs/tags/v4.6.2.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild picocli-4.6.2.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="info.picocli:picocli:4.6.2"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java command line parser with both an annotations API and a programmatic API"
+HOMEPAGE="http://picocli.info"
+SRC_URI="https://github.com/remkop/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}-sources.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# package org.junit.contrib.java.lang.system does not exist
+# the project is here: https://github.com/stefanbirkner/system-rules
+RESTRICT="test"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( LICENSE README.md RELEASE-NOTES.md )
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS=(
+	"src/test/resources"
+)
diff --git a/dev-java/reflections/Manifest b/dev-java/reflections/Manifest
index 12edda805273..a029adbfc074 100644
--- a/dev-java/reflections/Manifest
+++ b/dev-java/reflections/Manifest
@@ -1,3 +1,3 @@
 DIST reflections-0.9.10-sources.jar 53049 BLAKE2B 23491098dc648206161d983148bf11a1c4523df0593c903f9dbf03672b481d85aabaed7733a5d829b7f334e51d53dadde3fd439e62f9873ceb11f49f40a2cfef SHA512 940b80ed43aa900177e6c3551980eafe10f7ea16a1e5c0d24fc8c1e29f1e0155aae83e24f60af10f9743449ed38d2d3b211f3668fafbd95a6a2cb9c5581f56bf
-EBUILD reflections-0.9.10-r1.ebuild 714 BLAKE2B efccbab2cbbf812e21acdc7d2359af04c75d9dba37a593a9b7568832eafcd86978e9160ea819c39fd365924b6b33b084a7b795ba9e8ff99006e9835982cb8d5a SHA512 fa900b4ea01bbc0895214df06f74ecb1be6836cd330fadf43b3b80f7643dc59596324750490fc80d821e3406167e648d11ddd36e4f2840ffd6053074bba7ebc6
+EBUILD reflections-0.9.10-r1.ebuild 712 BLAKE2B 8a6fd8dfcdb830f1b2df64cb7d767b5ef2e580bdb80dcc0c8bf0ee546707fe9d04099927a0ca59b153a4ca9555d154e124789e55ee5847f518ef598723d59225 SHA512 6b59d6059ecdf2beedbf9f89ae0a76080fb56046882cee78f4362a988e232396cff15d09ffcc765094514caeeb742dbe95447c4bdf2f29a7799e51301637f982
 MISC metadata.xml 527 BLAKE2B 92b0ca46422b8b0107bef220664c0079db47a3c8f306f59d5b681b653e5bcb835a192c8018d719447ebc864ead58f3844340bf3f84ff5bbef0ab126b7d314efe SHA512 a7ad6c598f83a911b20f5b31573127433d2bd756ac15d4a29de907ce102a5fb77de2426035a8255125446128b8ef13ed1f9fa002bff285cddbaf9043bd71dddc
diff --git a/dev-java/reflections/reflections-0.9.10-r1.ebuild b/dev-java/reflections/reflections-0.9.10-r1.ebuild
index 8ca41b4098f7..c4ffbd6aa2ee 100644
--- a/dev-java/reflections/reflections-0.9.10-r1.ebuild
+++ b/dev-java/reflections/reflections-0.9.10-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/ronmamo/reflections"
 SRC_URI="http://search.maven.org/remotecontent?filepath=org/${PN}/${PN}/${PV}/${P}-sources.jar"
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 CP_DEPEND="dev-java/commons-vfs:2
 	dev-java/dom4j:1
diff --git a/dev-java/snakeyaml/Manifest b/dev-java/snakeyaml/Manifest
index b570ceec57ef..e4c232fc78e5 100644
--- a/dev-java/snakeyaml/Manifest
+++ b/dev-java/snakeyaml/Manifest
@@ -1,4 +1,4 @@
 AUX snakeyaml-1.28-fix-test-check.patch 728 BLAKE2B 3c2e1607f03cfb00dba8808fec19b7a705afcc6ad8b1a3c2ee9b2b38e05e0e4e50b00413e5da236827ba4d7ca715b27158d0354dd7ce3950645a2a3bc9057540 SHA512 81bd69b9780e75df4d0964119a0c15684b54533ce2eebc94de3d481b7cf521b26f82f62279eabf3fc0e41eefb9c1648fb2700d6f07ae3b1fd99c6a5f55cbecd8
 DIST asomov-snakeyaml-b28f0b4d87c6.tar.gz 397832 BLAKE2B 054c228cd739e0d7ae89227cba7ae1aba76e5b6a7aae4915a765816d916ab3a47e80d6c2795a5e9bcaee96a70c1751fb9e67523e7faed2db5a6d2123d773d04a SHA512 2d19aee8c3aef2c4c300382451c1241dd2452180fe28c39eb9fe1bbc9d6c615bb8504535d3cf1cf5fe2ad55def8c43b709e8ecd97f760403cfaee7db977f074c
-EBUILD snakeyaml-1.28-r1.ebuild 2961 BLAKE2B 55e25a0aec4279a1847d3fef81a9638d7f894bd7b616a69e82ede019c80b4a51fe71c344018bc7477f6f131fa98a7f4ac03bf346d8f4e684063dc97ee6ca5b7b SHA512 5901b210ea06f4eac34abe3f8678cf751cc1458066181e4ea83f2622eb8e17fda321d44a8de9eb12192de6bdf527fce434ad27b2f80178fec329d88495bbc4d6
+EBUILD snakeyaml-1.28-r1.ebuild 2960 BLAKE2B 554ad653d1eba48e11e4b319eaef2d033eb352913cc07eb907dd25cd9342ba2f64f67a4ff34b94814f95e601bdae4f7f7eab5decc47669448f08410b3f250daa SHA512 adc3acc0c66f9410ed29ddb04f9c8cd7b5445798e7cf0c87bee94de3abd86efbfc0234e8c3105e5196a83845f7a701dab7a07f1e16db37eaf02cb750e991212a
 MISC metadata.xml 321 BLAKE2B 289b6f22e9b660717461d5da64ab6fc7543bc6d46dc803e79ac0694ad1836297469eec4ab224b1c5dccf8a77e7e750b688e0cfcdab371506aff143fce090794c SHA512 b4a92e6a613847f4b8d59e723505b223ee34cc03a31ab656b5d4f8424ff76f3073ec626dbe4ef6cabb93674c62a4ac923756d05bec8a110c25f0b9880effa5d7
diff --git a/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild b/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
index 6162bde6ffe7..c302870c4aee 100644
--- a/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
+++ b/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://bitbucket.org/asomov/${PN}/get/${P}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 
 # Compile dependencies
 # POM: pom.xml
diff --git a/dev-java/treelayout/Manifest b/dev-java/treelayout/Manifest
index 22da6c956085..9813d1758cd2 100644
--- a/dev-java/treelayout/Manifest
+++ b/dev-java/treelayout/Manifest
@@ -1,3 +1,5 @@
 DIST treelayout-1.0.2.tar.gz 1007086 BLAKE2B c5ef3f0bc2a7c99a983f648efcca65a4a4fd9d72710b7a1a8263629435da6a79a328778983475565dfc23738978bf658067e3e63e7c36db84a54189821c0da07 SHA512 89a627d8ab2f248bb9b22139de0a28f310deb555f78825f29f4acfd0df7b4c212c8df241b004f8452a4be8a0f7717ee996df3eef4dd88ca905f4ad211df92655
+DIST treelayout-1.0.3.tar.gz 965389 BLAKE2B 5fb893ca0176e245778cf115a3c537d7a0ae4bcaf8119be41aa214dcf3887f5c286445d3d289134193a1b28269a2ba4952c6b9e81e3e462163bead188768f919 SHA512 5fb6a70206978c6bf8ea3c70603f38049cad21038bcedfd5a7f4dde1e4f8b080bfa78ca6dc2e43a7d0771ded39d5793f0c5340cf60ce63348d28a9be6abc3be4
 EBUILD treelayout-1.0.2.ebuild 1004 BLAKE2B 7eafdbac19bf6141d67a96d666cd592946b4a93e9bf3cd4b35221b5a3df1eadeadaaec698d748c7bc7b8a8ed9c525b13d351566916dfd4e3e0a2a157ba242f00 SHA512 a7ee265033e143173d1cb0e2f59d88c9e66cc57b9fb1f4b3ab6fe7eb6893e42a3db235455a115d5eed64c6fa177ac5ae04adb06c2801a3f4b54be622103a47ec
+EBUILD treelayout-1.0.3.ebuild 1017 BLAKE2B a819a2735f4f8a6145425f91d86d43175a4852510ac369a05b72455ebbb8b3441c7ec3c3764716100ca500bfd5fdd8b40380beb243675df7d95e048b677429c0 SHA512 bc4491ef38618fec210518054107ba81257b4de258aad99102e5ecd60ba4b5d2b619b4e1b8c2884d7f1be157b09665910b05ce07c0f0f9a3f0d6b2aba3335ba1
 MISC metadata.xml 678 BLAKE2B 938023ea4359e75dbde9c82c09764342f83b97e0aa35c53820f38dcd91832a8e1c930a97f5f58f379f18ac94e352ffc8b8bc039c4bcf4d723e925b5ddfe34a3b SHA512 db1c6876c80fc0c2adbb380b3c32c64827a8c203dcac99a7d428e2e7ab3a042ed3aa064c819510110480497fcea5b51a603b3a0e3d8e0cc46dbe624986232d1d
diff --git a/dev-java/treelayout/treelayout-1.0.3.ebuild b/dev-java/treelayout/treelayout-1.0.3.ebuild
new file mode 100644
index 000000000000..6785a357c359
--- /dev/null
+++ b/dev-java/treelayout/treelayout-1.0.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_PKG_BSFIX_NAME="build-impl.xml"
+EANT_BUILD_XML="nbproject/build-impl.xml"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Efficiently create compact tree layouts in Java"
+HOMEPAGE="https://github.com/abego/treelayout"
+SRC_URI="https://github.com/abego/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}/org.abego.${PN}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*
+	test? ( dev-java/ant-junit:0 )"
+
+src_configure() {
+	EANT_EXTRA_ARGS="-Dplatform.home=${JAVA_HOME}"
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar dist/org.abego.${PN}.core.jar
+	dodoc CHANGES.txt src/website/abegoTreeLayout.pdf
+	use doc && java-pkg_dojavadoc dist/javadoc
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index 55a4ab5d74ae..d94c187bd6b2 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,3 +1,3 @@
 DIST velocity-2.3.tar.gz 443754 BLAKE2B 16b7aaa87eb6be899f40d09ee8aa50b2ac24dd59c33f29b944d46ea84a77de07cd69f344632b4b829b92a92fe6ccd75cf79e021787b2ca59a79040aa08a53eed SHA512 987f2991a96fa8fae43ff2f72d6a57b25b1cb7d98b7def7a1a6e9a308c8b5b86e394444c47ee0eca8b70d41b341759c7309404dc4b952dbc65fc3a5b92d46cdb
-EBUILD velocity-2.3.ebuild 5225 BLAKE2B 690aef62fefdc2b214843926354dd73e3636d22017cb895c993a806c0ff04f990e29f4126862c5ccbdd48b820f71e72127af1b47a38591ff609b2cd321e0c04c SHA512 b6dada0a50a62f81b71332846f19f34a1ebc6a8b9c14a39b5c01f7edbcffe2d4f29942d9da12dea30b75f2392413c618371087daeb95f377cfbc7599858aec01
+EBUILD velocity-2.3.ebuild 5224 BLAKE2B 81dc030dbb099956ec1c3e2497a51caabf5a0a07d5c3b397b13ff4130f8134ddf01e9b080ef3f0684bf90f95039b675f174ff5cf5b44a66ee4fbfe2f993b60cc SHA512 01080171122ce8d349229f8080eb12f8d42674a981977ff95468af251ebfd39341bec5206f8d00380b55adca9bc6ce138668053a833620f6cfcb6e09a094134e
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/velocity/velocity-2.3.ebuild b/dev-java/velocity/velocity-2.3.ebuild
index 0cdd182bf73b..4bf40b921b6d 100644
--- a/dev-java/velocity/velocity-2.3.ebuild
+++ b/dev-java/velocity/velocity-2.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/apache/${PN}-engine/archive/refs/tags/${PV}.tar.gz -
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/xml-commons-external/Manifest b/dev-java/xml-commons-external/Manifest
index 27e0781221ba..69df21f28eb1 100644
--- a/dev-java/xml-commons-external/Manifest
+++ b/dev-java/xml-commons-external/Manifest
@@ -2,4 +2,5 @@ DIST xml-commons-external-1.3.04.tar.bz2 659665 BLAKE2B b7f51fab7162b905142c5256
 DIST xml-commons-external-1.4.01.jar 656529 BLAKE2B c51ca760c23759d4f4ad11fcb44caa1cb0bcb2785d9095ed56dba9b0d5fe57370a9d9aaeed5a8e0c1fa67918237ce693590bac791200add2e85155ab87ffe40b SHA512 f00773eec613453d0e1b7b0857b01c51d1926079f38e172953c4ef0350f063439acc8b5967f947c8d15a73e5d53e8887c3bf30122d5f7c553bcef349e5a8cb9a
 EBUILD xml-commons-external-1.3.04-r1.ebuild 1136 BLAKE2B 11a888f3719764a06ea3c6ad0d7ac5732410e8b67c3e4a431386e9e969d30104a5f02131fe2005f091b26df2f3a996366be5c82519b867ee66143ce118f3a015 SHA512 32e690d333a743c4ba1ea36763edb0510f8d8e9a43ba0272164e42df3a35d11e495d357ff7955bcc0dbe670957aa9224f21fda4fe6f084a2d37f082f9ea7d73a
 EBUILD xml-commons-external-1.4.01-r1.ebuild 741 BLAKE2B eaa58ef734007ff018e74195868fc75f95b96d0c9b8760cb8af5b04136758f2f45cd56e86401bcc0cba844e00f96bfe0f1c26251b1b931d6729fce4736707ca0 SHA512 fd6c527195c0e2406ed69c983f999f2814609985badbec8b2bd474005bce7e65a4afc654276df9cbb0e007a8c073d585a8cd7093e4a8053b8d65d5e9a342a415
+EBUILD xml-commons-external-1.4.01-r2.ebuild 745 BLAKE2B b12a002d78265159011576376c0ae8a2ead7c10c12d18695b08097ff7ad5aad4462f5fb058710ee1d6216640d99e5be8e9cc1b4f2f6313d4d75e04ab88752edc SHA512 0b4a591c2a37ee3a7c292bbed0e81ca9e790ca6709ae67e9c485c538d66a3a85a4dcfcc0ecc3560c55a0e81ed88f6bb14e02cfff8781fa5829b0fe6c412f56cc
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.4.01-r2.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.4.01-r2.ebuild
new file mode 100644
index 000000000000..940862af2f32
--- /dev/null
+++ b/dev-java/xml-commons-external/xml-commons-external-1.4.01-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="xml-apis"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Externally-defined set of standard interfaces, namely DOM, SAX, and JAXP"
+HOMEPAGE="https://xerces.apache.org/xml-commons/components/external/"
+SRC_URI="https://repo1.maven.org/maven2/${MY_PN}/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="1.4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+BDEPEND="source? ( app-arch/zip )"
diff --git a/dev-java/xml-commons-resolver/Manifest b/dev-java/xml-commons-resolver/Manifest
index 369986a9997a..90d830adefbb 100644
--- a/dev-java/xml-commons-resolver/Manifest
+++ b/dev-java/xml-commons-resolver/Manifest
@@ -1,3 +1,4 @@
 DIST xml-commons-resolver-1.2.tar.gz 262701 BLAKE2B 54258372fb2d08dd08777bb8355b13c26f426d843e47c6790a6174f82998b9a20bc1bfb8073c5bab8c4d521db54600c8eb3ffdb6c03ce6091073ada655e7c6b2 SHA512 0c91057da3198fc488c7b2c20afb029aa4441ad979159c378d532b02caa294d27e730ae2f9857062af5e3815a603a6110c5441dd3fe6b36c342a78beac3c8a6f
 EBUILD xml-commons-resolver-1.2-r1.ebuild 836 BLAKE2B 83d0bbd597087abd3df5639033fdfdaea6b532de20cafa92e34c235af846d82f534b9885addd4f99622fc5a296987973dc0c5dfb463d4ec7396d42a8ee385f7f SHA512 02e04857be619112b24ac90609c41e7e69b938c554a270492d5f1a959976a0499365c3b726038b17e27293db07a013d78a24e0e0e0bfa839aabb840e2cf58cd9
+EBUILD xml-commons-resolver-1.2-r2.ebuild 842 BLAKE2B 1544470d5d18fb72aad32d86bb59ff1e7b0d42889fd107f8a81f6cb6866456f93b8e68924f34147b44b793c1dd674de4bf66aeb3aedfdbb2118ba4d1554ab464 SHA512 fc53eb690d4aaabc2845d0bfdcc1e242de8ea4a37ffa166f6e5d4de6ddea472b735063694a3d8bdbbca80bee6045c621f122e4b54e6cf363599b8c2415f9e5a3
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r2.ebuild b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r2.ebuild
new file mode 100644
index 000000000000..33c5c8d83ee5
--- /dev/null
+++ b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+JAVA_SRC_DIR="src"
+MAVEN_ID="xml-resolver:xml-resolver:1.2"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An XML Entity and URI Resolver"
+HOMEPAGE="http://xml.apache.org/commons/"
+SRC_URI="mirror://apache/xml/commons/${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( KEYS LICENSE.resolver.txt NOTICE-resolver.txt )
+
+src_prepare() {
+	default
+	java-pkg_clean
+	rm -rv src/org/apache/xml/resolver/tests || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	einstalldocs
+}
author	V3n3RiX <venerix@koprulu.sector>	2021-11-13 13:10:00 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-11-13 13:10:00 +0000
commit	e9d044d4b9b71200a96adfa280848858c0f468c9 (patch)
tree	1bd8ef816043a8cd340f1d774e79553a1a7d31d8 /dev-java
parent	fc2f1018fc323ef2c6572734a9b130427cba76a6 (diff)