gentoo resync : 28.07.2021

42 files changed, 982 insertions, 114 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index aa9c129ca3d4..51f69a4c4cae 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/asm-analysis/Manifest b/dev-java/asm-analysis/Manifest
index e529375b0cdc..f20080350b99 100644
--- a/dev-java/asm-analysis/Manifest
+++ b/dev-java/asm-analysis/Manifest
@@ -1,3 +1,5 @@
 DIST asm-ASM_9_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18
+DIST asm-ASM_9_2.tar.gz 1614845 BLAKE2B 3fc0fb45d0583b06371452d2df166ce53f81a114a386eda96fe3b0c748beffdd42791d59ddfb4c9ad368f73728f3382855a7336324b013e937c20a4f31cea44b SHA512 a0077e3c1ebbd8a841d3556be4363383951244ba87670af45a8565e14ad3ac94ab89a23b934b3609190e1b16dd9663798c01d1c859eddb2e825c41908c2e2afd
 EBUILD asm-analysis-9.1.ebuild 740 BLAKE2B 7572ed77471724a907ddd36d146ab5e911f743ea2837cda38a4ba93852d21e408108791aeb6c76d19b38a351dcde62e7ebbd9c75a9f33bde94f4621dddeaf1fd SHA512 f741334e33572f21bcbf46cc7573ebf80504e4d13c385dcac203a38427bce384782b6bdc2a205d459bd8bf9d3073fb53e41db7e3c47176102a884f50cee7b088
+EBUILD asm-analysis-9.2.ebuild 744 BLAKE2B f7610bd48da48008831ee6480bf0279ef98908764bcbc30753c189c0c508e8f68092fe95d3e0442033c9c6ef651db3f52109226817cd8b345737f02978ef0990 SHA512 e4dd8b53afa0be39ab00621f348edeb907933a795f787fb594b6d1090618d6fc9e8c2819bb081b4e585232fb52a59c3b4b8215273e5f5808cc13797fad43738f
 MISC metadata.xml 1095 BLAKE2B d02943be5ee7eeae4250adc26d2c70c97c601fb1b8cf1f6d95a9b412b09d80e4f035a02106f2d9f1c3dc8dae2cf4261ae52522801513f8c6254b6271d5864a6d SHA512 e46d43827595682502ae3fc377544dd2a70f72c7784ea4768b3dbf06e62188f6b81fd9a341c2c0467bb8cffc960c0a860affdc18e2221e24db5a2d6269e81b53
diff --git a/dev-java/asm-analysis/asm-analysis-9.2.ebuild b/dev-java/asm-analysis/asm-analysis-9.2.ebuild
new file mode 100644
index 000000000000..405a33e55b42
--- /dev/null
+++ b/dev-java/asm-analysis/asm-analysis-9.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.ow2.asm:asm-analysis:9.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Bytecode manipulation framework for Java (Static code analysis API)"
+HOMEPAGE="http://asm.ow2.org"
+MY_P="ASM_${PV//./_}"
+SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT=`ver_cut 1`
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+RESTRICT="test"
+
+CDEPEND="dev-java/asm-tree:${SLOT}"
+DEPEND=">=virtual/jdk-1.8:*
+${CDEPEND}
+"
+RDEPEND=">=virtual/jre-1.8:*
+${CDEPEND}
+"
+
+JAVA_GENTOO_CLASSPATH="asm-${SLOT} asm-tree-${SLOT}"
+JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/asm-commons/Manifest b/dev-java/asm-commons/Manifest
index eae3fcf4ad73..ee9d49b019c0 100644
--- a/dev-java/asm-commons/Manifest
+++ b/dev-java/asm-commons/Manifest
@@ -1,3 +1,5 @@
 DIST asm-ASM_9_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18
+DIST asm-ASM_9_2.tar.gz 1614845 BLAKE2B 3fc0fb45d0583b06371452d2df166ce53f81a114a386eda96fe3b0c748beffdd42791d59ddfb4c9ad368f73728f3382855a7336324b013e937c20a4f31cea44b SHA512 a0077e3c1ebbd8a841d3556be4363383951244ba87670af45a8565e14ad3ac94ab89a23b934b3609190e1b16dd9663798c01d1c859eddb2e825c41908c2e2afd
 EBUILD asm-commons-9.1.ebuild 808 BLAKE2B 35ccd30ac59d1a044520502bd206608c67e55b0fc6cb9d8add8377f6c60137c23f30d0bd3f9764bd5388daff9122fca67fd4743eecd7f9c3f75e5dc0ffc8d612 SHA512 f5b82ce78db28ae2dcceee8e07cb2fa816a9a24878ff58d1de7c6232bf19a86f5ccd0b1fb837b59bfa0494fd4efba87176d54bc8a3b79e4435b8cddefbae906e
+EBUILD asm-commons-9.2.ebuild 812 BLAKE2B 5116c609ae3ae62bca80cc021c6f760454472f6fa6ea066a42c4d30213be2187e07b50a3d556520c2fb5babf73e3a2959e9dc888bcb6d6d77615a72a3fc16070 SHA512 47fc7294e928f2ddd932312c19fe434ac536b44732e89a102914c08538bdcf69e972c4130555e7c5bb4a2b059f2e26286fcb8493b885ae658f33d11baef4dffb
 MISC metadata.xml 1095 BLAKE2B d02943be5ee7eeae4250adc26d2c70c97c601fb1b8cf1f6d95a9b412b09d80e4f035a02106f2d9f1c3dc8dae2cf4261ae52522801513f8c6254b6271d5864a6d SHA512 e46d43827595682502ae3fc377544dd2a70f72c7784ea4768b3dbf06e62188f6b81fd9a341c2c0467bb8cffc960c0a860affdc18e2221e24db5a2d6269e81b53
diff --git a/dev-java/asm-commons/asm-commons-9.2.ebuild b/dev-java/asm-commons/asm-commons-9.2.ebuild
new file mode 100644
index 000000000000..a41b83579109
--- /dev/null
+++ b/dev-java/asm-commons/asm-commons-9.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.ow2.asm:asm-commons:9.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Bytecode manipulation framework for Java (Common class adaptors)"
+HOMEPAGE="http://asm.ow2.org"
+MY_P="ASM_${PV//./_}"
+SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT=`ver_cut 1`
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+RESTRICT="test"
+
+CDEPEND="dev-java/asm-analysis:${SLOT} dev-java/asm-tree:${SLOT} dev-java/asm:${SLOT}"
+DEPEND=">=virtual/jdk-1.8:*
+${CDEPEND}
+"
+RDEPEND=">=virtual/jre-1.8:*
+${CDEPEND}
+"
+
+JAVA_GENTOO_CLASSPATH="asm-${SLOT} asm-tree-${SLOT} asm-analysis-${SLOT}"
+JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/asm-tree/Manifest b/dev-java/asm-tree/Manifest
index 31cc4ed777f7..9fe683cc0320 100644
--- a/dev-java/asm-tree/Manifest
+++ b/dev-java/asm-tree/Manifest
@@ -1,3 +1,5 @@
 DIST asm-ASM_9_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18
+DIST asm-ASM_9_2.tar.gz 1614845 BLAKE2B 3fc0fb45d0583b06371452d2df166ce53f81a114a386eda96fe3b0c748beffdd42791d59ddfb4c9ad368f73728f3382855a7336324b013e937c20a4f31cea44b SHA512 a0077e3c1ebbd8a841d3556be4363383951244ba87670af45a8565e14ad3ac94ab89a23b934b3609190e1b16dd9663798c01d1c859eddb2e825c41908c2e2afd
 EBUILD asm-tree-9.1.ebuild 698 BLAKE2B fbf8fcd6062226e8081c205c4180199bd3ed7bba439dfe9c6d38ee38c91858d34858b075416d257c50ea57f5d0641179ecbfc6f2b5551a1a1e0acd8335d14c2d SHA512 300f307d92b369bb9306e251e2e09edb8dd660726b78cb398f50620701c5fd726a20ccccbc329760949a3b2ac4ebe0797d36f9eb8aac1f3e4fde30b9fc3d0513
+EBUILD asm-tree-9.2.ebuild 702 BLAKE2B 4e417a23cf822d522d3ac6725b15b37ef46ed24c7f5c38021007332755e9b6cfd97a1de2dd89aa4bcc627fcfd1b1841090d421ef504acfb2ba99bd4a69de51f9 SHA512 6682c04bc7212ddacde11407f7a1eb3850bb6625940d989326bb8d93c0250532d5dbf08b0c4733e4e6334f3ce0c827a4a27b5566df3ab810ab6fa6ffda59b94e
 MISC metadata.xml 1095 BLAKE2B d02943be5ee7eeae4250adc26d2c70c97c601fb1b8cf1f6d95a9b412b09d80e4f035a02106f2d9f1c3dc8dae2cf4261ae52522801513f8c6254b6271d5864a6d SHA512 e46d43827595682502ae3fc377544dd2a70f72c7784ea4768b3dbf06e62188f6b81fd9a341c2c0467bb8cffc960c0a860affdc18e2221e24db5a2d6269e81b53
diff --git a/dev-java/asm-tree/asm-tree-9.2.ebuild b/dev-java/asm-tree/asm-tree-9.2.ebuild
new file mode 100644
index 000000000000..d8ced9551e3f
--- /dev/null
+++ b/dev-java/asm-tree/asm-tree-9.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.ow2.asm:asm-tree:9.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Bytecode manipulation framework for Java (Tree API)"
+HOMEPAGE="http://asm.ow2.org"
+MY_P="ASM_${PV//./_}"
+SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT=`ver_cut 1`
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+RESTRICT="test"
+
+CDEPEND="dev-java/asm:${SLOT}"
+DEPEND=">=virtual/jdk-1.8:*
+${CDEPEND}
+"
+RDEPEND=">=virtual/jre-1.8:*
+${CDEPEND}
+"
+
+JAVA_GENTOO_CLASSPATH="asm-${SLOT}"
+JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/asm-util/Manifest b/dev-java/asm-util/Manifest
index 19829856faaa..6020a726a7ea 100644
--- a/dev-java/asm-util/Manifest
+++ b/dev-java/asm-util/Manifest
@@ -1,3 +1,5 @@
 DIST asm-ASM_9_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18
+DIST asm-ASM_9_2.tar.gz 1614845 BLAKE2B 3fc0fb45d0583b06371452d2df166ce53f81a114a386eda96fe3b0c748beffdd42791d59ddfb4c9ad368f73728f3382855a7336324b013e937c20a4f31cea44b SHA512 a0077e3c1ebbd8a841d3556be4363383951244ba87670af45a8565e14ad3ac94ab89a23b934b3609190e1b16dd9663798c01d1c859eddb2e825c41908c2e2afd
 EBUILD asm-util-9.1.ebuild 793 BLAKE2B 95991d7c4a603bb8831bcc798625ca86a39ec7ba7c431b79795069016498201a11e72ea386ef5ec19ba229bfe965f43192a70aa93ba7fc60807ba632148a50cd SHA512 b1eed72c60ce1f075f83745b0903b41b1041924eea78a626f9f956534fea87c14110d6a894141a1fe629267801b4534fdd86c8718d1475e48a82462c96aac329
+EBUILD asm-util-9.2.ebuild 797 BLAKE2B 75ef50f0359eab77ce6f0315dfcf8a7f99d84c94b527e9a64a390151008bafed628bc345eabcf12e073d067b750f1be7a2566c0b0a3d3cd1fa149e9ef44d6930 SHA512 84cf8bbb90461c9f837d2424272ef8fd6cc28bee4020473985483559a825b3c64acfb9e2644f7c9b930579cfa339cd20474bd29a91d443e4012813b6cc4c4a48
 MISC metadata.xml 1095 BLAKE2B d02943be5ee7eeae4250adc26d2c70c97c601fb1b8cf1f6d95a9b412b09d80e4f035a02106f2d9f1c3dc8dae2cf4261ae52522801513f8c6254b6271d5864a6d SHA512 e46d43827595682502ae3fc377544dd2a70f72c7784ea4768b3dbf06e62188f6b81fd9a341c2c0467bb8cffc960c0a860affdc18e2221e24db5a2d6269e81b53
diff --git a/dev-java/asm-util/asm-util-9.2.ebuild b/dev-java/asm-util/asm-util-9.2.ebuild
new file mode 100644
index 000000000000..93abddd311d0
--- /dev/null
+++ b/dev-java/asm-util/asm-util-9.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.ow2.asm:asm-util:9.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Bytecode manipulation framework for Java (Utilities)"
+HOMEPAGE="http://asm.ow2.org"
+MY_P="ASM_${PV//./_}"
+SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT=`ver_cut 1`
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+RESTRICT="test"
+
+CDEPEND="dev-java/asm-analysis:${SLOT} dev-java/asm-tree:${SLOT} dev-java/asm:${SLOT}"
+DEPEND=">=virtual/jdk-1.8:*
+${CDEPEND}
+"
+RDEPEND=">=virtual/jre-1.8:*
+${CDEPEND}
+"
+
+JAVA_GENTOO_CLASSPATH="asm-${SLOT} asm-tree-${SLOT} asm-analysis-${SLOT}"
+JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index 5c3fe8c5facd..5d7f0711af74 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -1,6 +1,8 @@
 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_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18
+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-9.1.ebuild 595 BLAKE2B 784a00c90d2ac3acb2fdd667bcf9f1f4979e25dc98966d63b7330211ed8aa9b3a1ad018654163cdf6ba96617198987b663f34b122346145b5e91eca117a09189 SHA512 562c2c83bc2604c2f064256aa5fbb25c6a86a4db784cc32a1582d2bdce01271fecff910eaadf70c21a212d5ce6bbf4b4b214eb36b8d05d2587a856a9a5a7bee3
+EBUILD asm-9.2.ebuild 603 BLAKE2B 00f9e99d58a3d8dcdd6879a9da154ee9987ebddecdf90df1afe66689264abceb3a1395673fcafef02b7de1855b3907f2e28780d2f60a8d01e63f306b870f9781 SHA512 36722f9b79cce99b415d25174ab7981d148489109926643ef51db1bc0a5818f18febac25c9a54cfc839fc94b936b7bb7245d69f93bee35b56fedd027e021d838
 MISC metadata.xml 1230 BLAKE2B a71da4c461c9ba0e7092f9c16916b0a72359fa198654c7ddabd4544efa0eb17c52378712dfe4bad27f5dcd14b289999d899dac0e89a7fd19350afe951de27839 SHA512 91a6876a431249ac794c998ab741eb4c8e3bef302e090402fd7b84dd6ebfb7734a4dfcf85fdd1ab3cedbf1d746f60ec7aa4444be44a8e316e01b8d1d45fcee5d
diff --git a/dev-java/asm/asm-9.2.ebuild b/dev-java/asm/asm-9.2.ebuild
new file mode 100644
index 000000000000..e5b02c9c8299
--- /dev/null
+++ b/dev-java/asm/asm-9.2.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"
+MAVEN_ID="org.ow2.asm:asm:9.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Bytecode manipulation framework for Java"
+HOMEPAGE="https://asm.ow2.io"
+MY_P="ASM_${PV//./_}"
+SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="9"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+RESTRICT="test"
+
+CDEPEND=""
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest
index 8cdffe228601..619c58498cc3 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -2,5 +2,5 @@ AUX commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch 12404 BLAKE2B 294
 DIST commons-httpclient-3.1-src.tar.gz 1882664 BLAKE2B ccf96bedad09011ee20eae38aae1fdfdd6fea5a8226f4b4d156762080c286c71b34c149035abfd61e70c55a1de84ab3cd38d73c3228f591dd8e16c0a7e79c3a5 SHA512 e73ceeba3f34a35c30b24a3c6cb8dfc2102ff21079a5ff9270935908cb2f707d366c2f31a53fbdafa99673cc2b82e05470a2bf40d96767c72b2ab037c0f55490
 DIST httpcomponents-client-4.5.13-src.tar.gz 824131 BLAKE2B 1507c81749a92afcf8b170b606761236d71b02d8b8b257d753a0f09abbdc297057df39661e827dee52804a2138de7d201b2a837418cbec21085fd3ffd558b51c SHA512 421e413fb2206fa95b6428ff067cdf2b440d2d3d4503cc3ca9bcf70ccd8ed1b8273ec4fe0703e6a8cd7612940b7ed966d9f163dbfeb8bf699ae2a8b2e0866d05
 EBUILD commons-httpclient-3.1-r2.ebuild 1680 BLAKE2B 39796278c783e63835011467992fc9d8891bd2c691924078b909d409cd5567a8ebe505a834bfe65617936b4196cc99bcd12770e6a0462c237b5a5ff0f33cef11 SHA512 c1c327018aa78ccadd57a06845771ce12eef99106092823763eb7285d9bee587aa654b3fafcfabc7e725d36a5db7cda5e276bc6c6c7c291bf19bfbb553116244
-EBUILD commons-httpclient-4.5.13-r1.ebuild 2223 BLAKE2B 0289176e10c609a13f173314f6aada1f74011c729309889a96e5485aa05c28517da26621988c962d1ff79c0bd5526d964ac9cf275021687c7c148536fd78eb63 SHA512 a2913be90a81fc105f2a1ea12faa38eb07ba0a52a16b2c65d2d3b0398fde21b4be4582818af3d1434934bba6cd177459efbeefd98c6d8dd4c599645b01390425
+EBUILD commons-httpclient-4.5.13-r1.ebuild 2222 BLAKE2B c76899701077772f6f4b3022c354f007cb21fa86aa0b1a5ba5c374a51edfcf887b3e40e3f81164465b1cc8c0f5db1480d0c801947ebc868db449b62f1f633d2b SHA512 fd6ac61fccb261dc986abb06b48a4ea89764d2b21b46316a3ce3e75d6294a29e968619c9ca7838685d23dcb4be4f8ea2143aafa72af963d83fdbce6c53bc6493
 MISC metadata.xml 456 BLAKE2B b4e2261943e4bd92d413eae20f60f23b79e7deb961d9c7e08f855f28cf69f0b45c5113a308138122a9cc4b42da1498e67c8be2093ce0252f60d5ef56ea55e72a SHA512 27c629a07a007dd4336cd50f4ea32156ec301b02f398b008c057532b36bc0698132282e32007ee31f0dd21f3f5664b3d7c9607fe43a4dfbbffb67d3000c3a661
diff --git a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
index c13ad1428399..004ca865dbdb 100644
--- a/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-
 
 LICENSE="Apache-2.0"
 SLOT="4"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 # Common dependencies
 # POM: httpcomponents-client-${PV}/httpclient/pom.xml
diff --git a/dev-java/httpcore/Manifest b/dev-java/httpcore/Manifest
index 2615f873513b..141da168c046 100644
--- a/dev-java/httpcore/Manifest
+++ b/dev-java/httpcore/Manifest
@@ -1,3 +1,3 @@
 DIST httpcomponents-core-4.4.14-src.tar.gz 591869 BLAKE2B d6f4900d8781cf7189edb2dfa9c1157b02584e8c66cde02dc261b0e29cdfb971e0323ce4478966b8e125df475ab1014fbee5b4bdf411eb118647f47f95c8f1a7 SHA512 9c713c7ea4e966a35ed391bc2a3aa10a0963cd21978c028dbd0790c9c2a6592385c7b2f135ea2836e6c495d9faea1bdcc65aa994bd5548bc2d84db38d5dbb713
-EBUILD httpcore-4.4.14.ebuild 1590 BLAKE2B d60f9f57fa1d305c754fe2c7c41ba0b84d900f55392e96ba8f340d810ea6446e88893a3542a8668dbafb20f5f66fb0de006c472c33d3220a8bf370febc160ad7 SHA512 d1eb80fd5467a6a7150bbe83facdbaead1068660de3d923a553d2e2b794bc53140fba54702d298520f9f6da1cd00e4fcc0ebdec39d20dd10bcf5dc90f3f2eef1
+EBUILD httpcore-4.4.14.ebuild 1589 BLAKE2B 9246b0de46ea669d2238eafa92d93f7095d5e89d6ab201415f81dabcff3686574b1e536309985036e8bfde131f24b438ea8d1e659fe1b0e727e95e76bdeeef14 SHA512 acd7ed62dbfa45cbcdecaee08f1c2fca337c719baceaa093a94e634569f03c54f54244fe862e6d13124f961d1177c7305cc3eca1a2749568638ceff151178935
 MISC metadata.xml 216 BLAKE2B da3631f8f6582ec2aad6497bbadf58b72bd143f39387aa3a5ee5842db7dc470f1693503286c6c1cde6e4f1ac72c271afabd139d1cb6f25de7d06a5469dd66c03 SHA512 241c7b10d088e8d6b9ace6781434e64c4a5d2eb80e5dfceea04e09a9637475e927ebd804588e5624622b24ef60a29331ad07f995360b0c1c2d5ffa25033a9f4d
diff --git a/dev-java/httpcore/httpcore-4.4.14.ebuild b/dev-java/httpcore/httpcore-4.4.14.ebuild
index 8e3fe959caa0..c208cb1c3702 100644
--- a/dev-java/httpcore/httpcore-4.4.14.ebuild
+++ b/dev-java/httpcore/httpcore-4.4.14.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-${PV
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 # Compile dependencies
 # POM: httpcore/pom.xml
diff --git a/dev-java/jackrabbit-webdav/Manifest b/dev-java/jackrabbit-webdav/Manifest
index 3d7db43ecad5..8952f20a76c5 100644
--- a/dev-java/jackrabbit-webdav/Manifest
+++ b/dev-java/jackrabbit-webdav/Manifest
@@ -2,5 +2,7 @@ AUX jackrabbit-webdav-2.10.1-CSRFUtilTest.java.patch 674 BLAKE2B 1d3275a45d9f472
 AUX jackrabbit-webdav-2.10.1-OutputContextImplTest.java.patch 696 BLAKE2B e888cacb419050b6bf412ecd70df42ea13a11937bcf00d7e716e36e1842003a2a53626179a6e642ab2df7aec84a2c7f9bc660754456e0ba4ad4912ea80dc1ffd SHA512 ab32fefc4f24d422eab5c399355e4188c0f8b7171e0e1ad9cacb5d031e1cee01ff3312d0df47cccc15a949d374e7c07749e5dc020a7e6d1e9fab7a86289d0d19
 AUX jackrabbit-webdav-2.10.1-build.xml 17644 BLAKE2B c878975d2f1ffe74752b36873d0625c73605469e5d8a1287568b461fe402e4a91ea0f2c6334514d526a011dbe4311b0b49439d508c9ea99e127cad49abe6ebee SHA512 5b22661e3d36d227edb618b553671964be14f34dd245f1749caf9b6f3c9981fdc9fad11659ae98cdd5fb3b343b6bc450478d3655054b055f7ffb3663378b7a8a
 DIST jackrabbit-2.10.1-src.zip 13437021 BLAKE2B 3542bbe5f7c8ab8feb585fecdaca028a4908eb664d01cb9fb32156c71756973671969b1141e796fbc165f7f6f305db25f74d36657e4d86dac6766e4d79b888dd SHA512 c371ff941054f3a916f43f7020f0aebd8146422835a75ab2ad9f9f716c4ef0a94b3b962f9b6e4fadef87b9e82e8143b4ece27280714a4eb71a6b0a38c47d48e9
+DIST jackrabbit-2.21.7-src.zip 13532529 BLAKE2B ea3ebf687e29b58e75840d6f5665da8abcb474dbaa353c0caf6a8d1cb1de6c6347830cbe0b6c91259fd496eeff834278874b64306da85a7e0c82ab71dd0b1c34 SHA512 254e151ed7e814ff8b4df985814ace12316a9dc56e87f4ba6236986ac2364936d3b15327f50ebc1b9fa7ac9bbed067924148436cc8ac31a7ef91d11faecb4678
 EBUILD jackrabbit-webdav-2.10.1.ebuild 1264 BLAKE2B 154ede9b836795eef7ebfe23bac873e765a948a9a969f423e0e769de2794dfe4c3b1228d416cb9030b3e6d6475cadfd6b43be1717fe1d42f4d0d327862f26188 SHA512 4b8bb9ac87bc6b65f6de46740b704781df056ca1488fc55f892a9cd9614c7cb61a46d6caa3eefe09533819787dcc3a0937a660a7ac90937f7b3fdcaccc0b3fc5
+EBUILD jackrabbit-webdav-2.21.7.ebuild 2073 BLAKE2B 2b06651a430e781e995c9fe73e78225ca72f7e3a02bac767f9a1bfbb6ccaf7ccb602f2a72f3a45a067f26bfa5e46514d3fc70a4960d24a228563018fe73fb49d SHA512 cfdfa08f035949c0f9c87c90f2285bfa6fd086c79fa5ec966efe9757c735ae4fb05ea89a1373c86accf1eeed029eea585d5606e40d8c2f6a681bd6767e2261b2
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7.ebuild
new file mode 100644
index 000000000000..3d1d2d4f953f
--- /dev/null
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7.ebuild
@@ -0,0 +1,63 @@
+# 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://ftp.halifax.rwth-aachen.de/gentoo/distfiles/3b/jackrabbit-2.21.7-src.zip --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild jackrabbit-webdav-2.21.7.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.jackrabbit:jackrabbit-webdav:2.21.7"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Generic WebDAV Library"
+HOMEPAGE="http://jackrabbit.apache.org/jackrabbit-webdav/"
+SRC_URI="mirror://apache/jackrabbit/${PV}/jackrabbit-${PV}-src.zip"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# org.apache.httpcomponents:httpclient:4.5.13 -> >=dev-java/commons-httpclient-4.5.13:4
+# org.apache.httpcomponents:httpcore:4.4.14 -> >=dev-java/httpcore-4.4.14:0
+# org.slf4j:jcl-over-slf4j:1.7.30 -> !!!artifactId-not-found!!!
+# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
+
+CDEPEND="
+	dev-java/commons-httpclient:4
+	dev-java/httpcore:0
+	dev-java/osgi-annotation-versioning:0
+	dev-java/slf4j-api:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# javax.servlet:javax.servlet-api:3.1.0 -> !!!groupId-not-found!!!
+# org.osgi:org.osgi.annotation:6.0.0 -> !!!groupId-not-found!!!
+# POM: pom.xml
+# test? ch.qos.logback:logback-classic:1.2.3 -> !!!groupId-not-found!!!
+# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*
+	dev-java/osgi-annotation-versioning:0
+	java-virtuals/servlet-api:3.1"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/jackrabbit-${PV}/${PN}"
+
+JAVA_GENTOO_CLASSPATH="commons-httpclient-4,httpcore,osgi-annotation-versioning,servlet-api-3.1,slf4j-api"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS=( "src/main/resources" "src/main/appended-resources" )
+
+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/openjdk/Manifest b/dev-java/openjdk/Manifest
index 577be5988978..d61834c4c2b5 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,23 +1,42 @@
 AUX openjdk-11.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e
 AUX openjdk-8-insantiate-arrayallocator.patch 647 BLAKE2B b2403d842ace7198520a25bf7c2027e6d74b5d418b52321722b21cac866df883d47e53e4f5e040aed55a9cc4bf03b5a62d008a0877add6c649a41f6230d78a38 SHA512 4bf002ec25844f4e55b588d0516e658c548700d3bcae79be74bf75d9cf30cf9cd448767db36935924dd3b07f34d0cf087321cb35abb4943690353d11485ab0de
-AUX openjdk-8.env.sh 746 BLAKE2B b8a18bb5e2dd3c4722b78531428d4291236a6295973fdcd65c64469b3a49a520686ff8d884c0b3d5dd9017ff4027d2fc1d78d57f062a4cf8910e0bab3ed444cc SHA512 2c65d1875406deabbfadb798501de15850775a4a049f073cdfda684ca1bff4b531b93596ee91a7caf77ff6c377457093f72c7bde4b995bce9ffbc4a8fcceb6dd
+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-8.292_p10.tar.bz2 457861 BLAKE2B 043c1d6f7d040dedaadd05091ce4fdf3f516c1cd241e3603c81f2c49fd81df9c4f1082822a5471255381d56f3ab838a24e499b4ec647f3354ee051078c496b2c SHA512 6e1ac380db32fa5f1decc80291dcdb5e1d3d9afb0dc4587966c5a1b840588a984bc07109c23cb0c69c60509c6db8152e7306509280063f7d2e853aed41e391cc
+DIST openjdk-8.302_p08.tar.bz2 459824 BLAKE2B 19909605f3ae93f94875268e88b8fea0a49be0d8adbf2d2369c5fa1e66f6880094730294cb52bad009984c7ac7f63b8271fa43d0901fe4ce52b7b03696aaa6e3 SHA512 2be9c2965e307b09dcd07225e09665bbc818ba851d9e854645218194f0052eb4736f49915fddebb2a89043b0c14d7a6d5de145fb712034661568610e596fe0e5
 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-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-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-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-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-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-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-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-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-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-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-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-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-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-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 7792 BLAKE2B e56b763df2fd4006fb19f4ee4fcbc661bd7e2cb30bba2ccf203685bb7e194540d9cc39d53c6e1f7b8f19353a9dbf964a47d43b816d45cfbf22a339a373e3e28b SHA512 e11ee803045f9fd994ccf4ee617aceb31a527a64b568290a46f7f36a260c2a0587dc65c1104780a54d4d73110027d83dc077e2c1703ec2e932ca090b54390db4
+EBUILD openjdk-11.0.12_p7.ebuild 7795 BLAKE2B 302d1b466151f220899fa03e0a1da8a25c399499a9594264b474d0fac46557fe3327d5977fd2167bbcc899edc7dd924237fa99d243b29cf578f2d8725e615802 SHA512 f286fc0657a2a43405ce040829fb0c196ed8ecbc6affe833484bcd0091a4e645cd1e1d492d466ff58b5dcbe19f832f3529cbcd8d481e80daaa133aee42c4ea85
 EBUILD openjdk-8.292_p10.ebuild 7313 BLAKE2B 1c5db4f660ab13a3bdd21e009900fd6f4f7b79005f89da8c802e611cb325929f42eb60f59c88220fc2d865fa5554d0b88c09846767e907c11d787a9433b6cee1 SHA512 eb35e875c863ba47d1a1b6de1f493ff2efdd5bc82a82be775f9977ffc46cb64854f9576498aba8cf424bdb78003c1301efae487c7223b4ef138f1efbe7e51b2b
+EBUILD openjdk-8.302_p08.ebuild 7317 BLAKE2B d5fd80468d705f9d5db8b697470c03b96f6913e21b13d61d13a57a1b944a8f4a3e894202a6b81d89f93640f6827f59d5413358fa90defbeb33c4f9b0cf8e6be8 SHA512 1fcac421dbb59fc36276afd7c38ec28dc9194f1005c58a4ac2fcadc1f9d9d1c154546caf25558f5bb4e0a98e81ead35aa7d17d3bfc19fb8dc5a9e06788d8ec55
 MISC metadata.xml 1432 BLAKE2B 36a11642c99127a5f97fc0b095a142705c6b4e077ed24604f1886e4d1beaa47b4fa30359600797d5e6a085befd11a2851196fe97a75a0f0907461679946b4cbf SHA512 ecc66015da3a0fc616b91dd5aaffb5b050c9f66e936cad02ec12fb56dd7c6b3b3c331d8856402c0deee16c415ea083e088cce7414703f9d659f551883b055ff0
diff --git a/dev-java/openjdk/files/openjdk-8.env.sh b/dev-java/openjdk/files/openjdk-8.env.sh
index e85a08ce4a8b..8f863e4c869a 100644
--- a/dev-java/openjdk/files/openjdk-8.env.sh
+++ b/dev-java/openjdk/files/openjdk-8.env.sh
@@ -7,7 +7,7 @@ JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}"
 JAVAC="\${JAVA_HOME}/bin/javac"
 PATH="\${JAVA_HOME}/bin"
 ROOTPATH="\${JAVA_HOME}/bin"
-LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
+LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/"
 MANPATH="\${JAVA_HOME}/man"
 PROVIDES_TYPE="JDK JRE"
 PROVIDES_VERSION="1.${SLOT}"
diff --git a/dev-java/openjdk/openjdk-11.0.12_p7.ebuild b/dev-java/openjdk/openjdk-11.0.12_p7.ebuild
new file mode 100644
index 000000000000..e6cf8c5cdf7b
--- /dev/null
+++ b/dev-java/openjdk/openjdk-11.0.12_p7.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
+
+# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
+# set build version properly
+MY_PV="${PV%_p*}-ga"
+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"
+
+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
+
+	# 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
+		--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-11"
+	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
new file mode 100644
index 000000000000..e0adcf48d134
--- /dev/null
+++ b/dev-java/openjdk/openjdk-8.302_p08.ebuild
@@ -0,0 +1,253 @@
+# 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
+
+	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/osgi-annotation-versioning/Manifest b/dev-java/osgi-annotation-versioning/Manifest
new file mode 100644
index 000000000000..7ef0d3883dcd
--- /dev/null
+++ b/dev-java/osgi-annotation-versioning/Manifest
@@ -0,0 +1,3 @@
+DIST osgi-annotation-versioning-1.1.1-sources.jar 5301 BLAKE2B 3c45fc25bda97a3b98e8db1d725f64a4e237300251a3414daed8ddcb54c5d8a68aa4c603e57a3831a34761c4cbfa0d544b1ed345e26ca1a1a1b4d4fa5bf2f9dc SHA512 39b208b4f72a33cb9a8c2dff1a4c52e07b32a553bcf2d7cb014ae50935c6b8ff26b67961117019fb5222e99c59ab4ec6e73788124f309dac86defeeb212d407b
+EBUILD osgi-annotation-versioning-1.1.1.ebuild 1010 BLAKE2B f88211d6718bf7929061cc7b9d2cdf50e0800391f07e24c8b0426fec8b4c9648985c28df32d01faea2cde9e7ddf86d75c9ff77acbb3e471bcc41e2a2f8f5d26b SHA512 477fc8678beb83325e261510e82a42a2ec136bbde78867c6bde758bab63d4b28e815b3d9389c98a810cbede21b0e956e6d945e56109d28aee7911c5a8624c2cb
+MISC metadata.xml 290 BLAKE2B 40d1845899c527a4e1850e5e70833b458b781485212cd32948e093a3ef7c72be3a3d085cc29655cb413a8341816184ff55a73a7b8b7de6b72dfe6cd0937a729a SHA512 a0bae39590140254ab2ebc81fd17673c1510e02e23ea505cea28d644d3a2c53f8ca8132529a329ed83817083ebafdd3417ce94f67ad11bc4b390c5f568228496
diff --git a/dev-java/osgi-annotation-versioning/metadata.xml b/dev-java/osgi-annotation-versioning/metadata.xml
new file mode 100644
index 000000000000..1f82e2d86cc4
--- /dev/null
+++ b/dev-java/osgi-annotation-versioning/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">osgi/osgi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/osgi-annotation-versioning/osgi-annotation-versioning-1.1.1.ebuild b/dev-java/osgi-annotation-versioning/osgi-annotation-versioning-1.1.1.ebuild
new file mode 100644
index 000000000000..1b4c55193164
--- /dev/null
+++ b/dev-java/osgi-annotation-versioning/osgi-annotation-versioning-1.1.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom org.osgi.annotation.versioning-1.1.1.pom.xml --download-uri https://repo1.maven.org/maven2/org/osgi/org.osgi.annotation.versioning/1.1.1/org.osgi.annotation.versioning-1.1.1-sources.jar --slot 0 --keywords "~amd64 ~x86" --ebuild osgi-annotation-versioning-1.1.1.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.osgi:org.osgi.annotation.versioning:1.1.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="OSGi Companion Code for org.osgi.annotation.versioning Version 1.1.1"
+HOMEPAGE="https://www.osgi.org/"
+SRC_URI="https://repo1.maven.org/maven2/org/osgi/org.osgi.annotation.versioning/${PV}/org.osgi.annotation.versioning-${PV}-sources.jar -> ${P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
diff --git a/dev-java/piccolo2d/Manifest b/dev-java/piccolo2d/Manifest
index 573d95d3f045..7adde0058763 100644
--- a/dev-java/piccolo2d/Manifest
+++ b/dev-java/piccolo2d/Manifest
@@ -1,5 +1,5 @@
 DIST piccolo2d-3.0.tar.gz 402866 BLAKE2B b78b93084e13c738126ab04babab4ee502deca869dc28a5bd066c13b46f455af55cf76531270d546d6cf56d56c0e48f2edbbda40944479cb9762db56421fb021 SHA512 609b38e27386ea0dac821f8d0a23bbf57afa056ed928944d63c2c8d1572c4f8b6541d27f5d26ab167948724c9f1198069fb6e0b76ce2770fe795662c76151100
 DIST piccolo2d-3.0.zip 786064 BLAKE2B f550bc7d39811998616000833543e048c879eeaf5006ba3d1cd19c7ac3c3c588fdf1c9b66986e5232dea49c1081082716e16542918319c18207cc2177d38ff10 SHA512 c57d0e86ea36e662027559c63c8e300629361849d4526d9271ea1ed3c8d55296ab1fab846c7a475c5d831fc6330052fa897ba8d3f89a196bca752a7ae802aa2a
 EBUILD piccolo2d-3.0-r1.ebuild 1120 BLAKE2B 0bada107c136f31b96d5045132a717ba15deb80129a22a8dd800e2644fc2055cb41a91594fc9aa897cddaeb72192af19613aced26826c687cb43250dd2f22f35 SHA512 dddbb48aa868a36363479e8f28fbbda3bb5fb8d2ac1642da705c7255c4cfb48afb770a9742fdb6688b4120a4d1f7147a567d581eadae3235ecf34a28a5c5f05b
-EBUILD piccolo2d-3.0-r2.ebuild 1135 BLAKE2B a1121922f136b23c3b07aa45b69c5d7f33366620d494f389abc452e59eea9b80a762809253501a9a64591802ebd682f26fdae0eed32a7dceafaf8ec6d2742acf SHA512 f7ee2b9cbc451cee3496e7fbd718b08d8f8da1bd759b01d25c301567deb6b8fcf6f37cbbd7a1fa5096fed6b1f29cad8c63b57902c678974d3364dcb4685649cd
+EBUILD piccolo2d-3.0-r2.ebuild 1134 BLAKE2B 105de0bc203751415cdcc5001ece11cc3dfb7033e0f6dc52add05059939d2aeb6849b49c586435952cec184e0f115d3709b4e8a68013507fa871f4543a12d4b3 SHA512 a3e50a18e9ccbc48ac964e055f38b88b7826c148e831b71e598bb98d7cf78e9efe06e5406da2f52d4ae8c9b6a11b1fc83f1d98320931e62856456bd4cc825aba
 MISC metadata.xml 379 BLAKE2B 8e4337e2de075e9c1697e3a9497b50f9c3e549ca16bc7ec5e242bf8021e75154d28dedf7a7fc481d2177a8a70e2012ff8547cacea4666bbe173c611cb1892855 SHA512 6411900dad2b5f7e410713dc14fd3d968d28a4c0a8235435e60e67d2ceeb9576681b8fd33efe9c9324a04869c29f73ee69d0469b5a56656eb2e256cc58849fd7
diff --git a/dev-java/piccolo2d/piccolo2d-3.0-r2.ebuild b/dev-java/piccolo2d/piccolo2d-3.0-r2.ebuild
index 5526f91037b6..84bb299ca780 100644
--- a/dev-java/piccolo2d/piccolo2d-3.0-r2.ebuild
+++ b/dev-java/piccolo2d/piccolo2d-3.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}.java/archive/${PN}-complete-${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64"
+KEYWORDS="amd64 ppc64"
 
 CDEPEND="dev-java/swt:4.10"
 
diff --git a/dev-java/picocli/Manifest b/dev-java/picocli/Manifest
new file mode 100644
index 000000000000..0f14c604a24b
--- /dev/null
+++ b/dev-java/picocli/Manifest
@@ -0,0 +1,3 @@
+DIST picocli-4.6.1-sources.tar.gz 13467061 BLAKE2B fd7dc19d572e975a4b47ac0bd9a7ab4be0f5fdf1e3e03c2d3b5026ee9ad6cbcf5e6214234746551d61c427915095e067f44c1d3dfb27071456e76db26d567b23 SHA512 e2c6c6171c3ec9cbe35e7034e119dfe922993c9e7b8d81ea94faeb8b24c9c4c26023be1edb5d67041119c4bf73077d522fbe711e8c1af788063663e2bb06ab1f
+EBUILD picocli-4.6.1.ebuild 1250 BLAKE2B c247b67dc8696752560efd06e30a52a01914ac7f3134fa0afef6c33a2f2a4e96143abcaab78ce7a24993d4f0770f7a9dfacadfca9a8637fe51d12cd6fa4c9e25 SHA512 f3846290432589e4bd0d742f1ae07cb51a93acedc892ef972771fbfc4a17d762580e882364b6be4e5a470fdb5e4059f6e488d86a2f29911d5b9eb5e2d8a38135
+MISC metadata.xml 700 BLAKE2B 2b5ab558999edb1ff28e1f72da64864781c1846e16c0914a081325878d6fca2d81f857285cf09995ef18d3484d0cd0d058a2f92585518ea293d2c249690083f9 SHA512 aa444977e0bf1546fb2f0f895d2b93191627f1fc3e79404e5ad6487140aaa2cb19cf0d6b736208c5fc625a75c7d28e8fb5abdb438d9f0ce7f762cb8a0e1609ac
diff --git a/dev-java/picocli/metadata.xml b/dev-java/picocli/metadata.xml
new file mode 100644
index 000000000000..8a708bc0b47c
--- /dev/null
+++ b/dev-java/picocli/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<longdescription>Picocli is a modern framework for building powerful, user-friendly, GraalVM-enabled command line apps with ease. It supports colors, autocompletion, subcommands, and more. In 1 source file so apps can include as source and avoid adding a dependency. Written in Java, usable from Groovy, Kotlin, Scala, etc.</longdescription>
+	<upstream>
+		<remote-id type="github">remkop/picocli</remote-id>
+		<bugs-to>https://github.com/remkop/picocli/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/picocli/picocli-4.6.1.ebuild b/dev-java/picocli/picocli-4.6.1.ebuild
new file mode 100644
index 000000000000..c0a9f09b3b48
--- /dev/null
+++ b/dev-java/picocli/picocli-4.6.1.ebuild
@@ -0,0 +1,46 @@
+# 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.1.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x68" --ebuild picocli-4.6.1.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="info.picocli:picocli:4.0.0-alpha-3"
+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
+RESTRICT="test"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*
+	test? ( dev-java/jansi:0 )"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( LICENSE README.md RELEASE-NOTES.md )
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main"
+
+JAVA_TEST_GENTOO_CLASSPATH="jansi,junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+src_install() {
+	default
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/sun-jai-bin/Manifest b/dev-java/sun-jai-bin/Manifest
index 46bb20fc6299..a31e10afee64 100644
--- a/dev-java/sun-jai-bin/Manifest
+++ b/dev-java/sun-jai-bin/Manifest
@@ -1,6 +1,4 @@
 DIST jai-1_1_3-lib-linux-amd64.tar.gz 3510451 BLAKE2B c16dc0e04127bf57df6390dc9d99a1e44040c0fe81ccacc88698493d3fd3483aae12d664a89bc13939655d21ce2d92b64537b073c0d1063bbf91e18129da5eb4 SHA512 5089b696baabdea9622683aa7a3569daf724fd7fa8a4f1c95073b9e96ff5c37fc55a9e3a6fe499abafe61f5f4a109770bd27172ae6711ab7b4da3de55d8b0f56
 DIST jai-1_1_3-lib-linux-i586.tar.gz 3501711 BLAKE2B eec4976124a9701367e7b61c652ed619df69fa12eb02c5288d9d1ba4845ca7e2315514fba1f75f15c8bbb90cba981972961e8d1e843a8a8ac2b000e5e4917975 SHA512 bd142eea557b68d10d26a18b6b0d04e5cb42212e98268035b1b3615d6489bbc4fa07ad141fd04fc5ae3c74f1703c9ade77130cbf8a61603b4b271e3a0e06e860
-EBUILD sun-jai-bin-1.1.3-r1.ebuild 1099 BLAKE2B 0257abd4b7fd290f56200786782459183a09c1c55e7cfe8702b85447f8f05b8e80e21a688e26bdb000b5ae28cae43bd9f9ea3b234df2cc5e3723781c6f0c3e34 SHA512 621448fc993b3376701632312d1efc7d8e675b7f3eeaf1ed2391a58b3e0e10e212a8dae9b69f2d52473703ff695e1c0edd5fc416ba9fcf8dd4e98dd2c74e0150
-EBUILD sun-jai-bin-1.1.3-r2.ebuild 1096 BLAKE2B c0087efbee4ff6b2055f4661401fb582016bb660bfaf13be938be60cafbb74e442384bf01f31291f844f57fc6a8de324d307ab9e1a46cc82aee19a2318d2ab62 SHA512 a06f8f9eb99a1682f0b96229300e77d9ccd8b40cd1576189da6c55757f09f1b6a6e280ba4666ad4b1c6e9c54dfe388ef526367d848de8676dcb32325c6a156b7
-EBUILD sun-jai-bin-1.1.3.ebuild 973 BLAKE2B 07e9e2c6e99b48b56f5ea8dc8d1bc8efc9d5a353b79b398ba078d92e1d92e286d61bad00a81a580e108a64317b3c87644889cb87dd1a69f51683f59380ab4a83 SHA512 2a2e4756e1b32c14d25642d912cba5b08371d4722b69fd0bf0db0f8c8d0348a7f4bbd136b9d28fe9355f3baeed54492c3b22bffce8f616c3d3c992feb518bc0e
+EBUILD sun-jai-bin-1.1.3-r2.ebuild 1100 BLAKE2B 27bde07cf2f3cf4a3549c6ba772b1ce8281f527058934adc725f248a499b264839de4308c70e57d0eba0cae25c4bbe17b7c0cd403d18ab07f1b1d30532538593 SHA512 9841c2bc9294daf8c6134017e65c25b58fc5b6606f8ca7ee1aa8ff2669f2c37a478933f90596e48c9cfe127523fc00aa9e365c5861a649255a4884c8523d4379
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r1.ebuild b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r1.ebuild
deleted file mode 100644
index b611b620af97..000000000000
--- a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-MY_PV=${PV//./_}
-DESCRIPTION="JAI is a class library for managing images"
-HOMEPAGE="https://jai.dev.java.net/"
-
-BASE=http://download.java.net/media/jai/builds/release/${MY_PV}
-MY_P="jai-${MY_PV}"
-SRC_URI="
-	!amd64? ( ${BASE}/${MY_P}-lib-linux-i586.tar.gz )
-	amd64? ( ${BASE}/${MY_P}-lib-linux-amd64.tar.gz )"
-
-LICENSE="sun-bcla-jai"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=virtual/jre-1.3"
-
-RESTRICT="bindist mirror"
-QA_PREBUILT="*"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-	rm LICENSE-jai.txt || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	dodoc *.txt
-
-	java-pkg_dojar lib/*.jar
-	use x86 && java-pkg_doso lib/*.so
-	use amd64 && java-pkg_doso lib/*.so
-}
-
-pkg_postinst() {
-	elog "This ebuild now installs into /opt/${PN} and /usr/share/${PN}"
-	elog 'To use you need to pass the following to java'
-	if use x86 || use amd64; then
-		elog '-Djava.library.path=$(java-config -i sun-jai-bin)'
-	fi
-	elog '-classpath $(java-config -p sun-jai-bin)'
-}
diff --git a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
index 9ad9f62e197e..36c1c67af629 100644
--- a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
+++ b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="sun-bcla-jai"
 SLOT="0"
-KEYWORDS="amd64 ppc64"
+KEYWORDS="amd64 ppc64 x86"
 
 DEPEND=""
 RDEPEND="virtual/jre:1.8"
diff --git a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
deleted file mode 100644
index 1e21ce70574f..000000000000
--- a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-MY_PV=${PV//./_}
-DESCRIPTION="JAI is a class library for managing images"
-HOMEPAGE="https://jai.dev.java.net/"
-SRC_URI="http://download.java.net/media/jai/builds/release/${MY_PV}/jai-${MY_PV}-lib-linux-i586.tar.gz"
-
-LICENSE="sun-bcla-jai"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-BDEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.3"
-
-RESTRICT="bindist mirror"
-QA_PREBUILT="*"
-
-S=${WORKDIR}/jai-${MY_PV}
-
-src_prepare() {
-	default
-	rm LICENSE-jai.txt || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	dodoc *.txt
-
-	java-pkg_dojar lib/*.jar
-	use x86 && java-pkg_doso lib/*.so
-}
-
-pkg_postinst() {
-	elog "This ebuild now installs into /opt/${PN} and /usr/share/${PN}"
-	elog 'To use you need to pass the following to java'
-	use x86 && elog '-Djava.library.path=$(java-config -i sun-jai-bin)'
-	elog '-classpath $(java-config -p sun-jai-bin)'
-}
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 7b88f2fd548d..250711591871 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -19,5 +19,5 @@ DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee63
 EBUILD swt-3.7.2-r3.ebuild 4437 BLAKE2B f488c4f50f7019580f29cbbc374d440444a699934193db8f6251d76c2342c5a26a5b65cc7c993ffb90155f771bc9039075b6a202c06d98abbdf7a2ff5959f63a SHA512 afdf8e0de244d457b4aa857bc1f045d0a3aa304158ece0a147c7b20308a27c79b5f614dd7ab0143c4372f7155679019cd972ab28a997cd9fe666f0d2985ea21b
 EBUILD swt-3.8.2-r3.ebuild 4240 BLAKE2B 3c08a0ee771d859e07af9d01c9796571ec9295bc0be4058abb330bd62194f20c77744795fcd27412a7397e7a341b7556080d3a7589faa9548ab1f1ac97433005 SHA512 f5c8f79cb9c801062d21d17f6ccdc30b28d5d1716e63ecae00872fce2c7c1b8a6152882ab90ddf6a39d4f525429462415cef6597a9425ec59060d6d0fdbe5099
 EBUILD swt-4.10-r1.ebuild 4628 BLAKE2B 91201a8ef41b011d1727120b2bcd32daf3c7dd3e042f88e391b982234932751150425ff2cc119a82e0c5d58e4b9544f1e6568ce36f3a8a7ea69b522bbb2cf7d9 SHA512 826f37b9d626e79f22011a3f2dd64701a1899a9dc3009cac3fdbce2cf4ba0159133ec9355205eece0cc0ae6a6e6c6c98acd873a54fbf4a3080f00d92cc117cd0
-EBUILD swt-4.10-r2.ebuild 4314 BLAKE2B ba5c51b5a3b0d809ed5f4b258c973eed2fdb005af8c24a13d4de99d6e2ffb297431a91f9a1b67e6504a1fea1260c16e57ad9c08abbac558fcb51abbd2853b8fe SHA512 fdc24c724ba8e238140f1cee87b310fdd3c50faf805dd51776d6ae88615ec8467a1956def30be559af3d7c5ca5740ac515490daa44d6db770875aa3c6d8c9295
+EBUILD swt-4.10-r2.ebuild 4528 BLAKE2B 31af6057258ccc6af0f8f5557f8a538bb9977cbd6f0815975e87530ce1b55d5910075d984c1e3643f5a05ac0e8f8cdf71443bf2fbd8345e16ce6885c981883e8 SHA512 11e03fc361c60a38149e9a9c2e063eb6429311934cb35a7b8dcfc74f740187fe4cece4d80bd0173bd524cbe29bca6177c76644ece05aa9fbaeb3b08b91e9785e
 MISC metadata.xml 518 BLAKE2B a325a8cd71c85886ffabde744769f9edfac99311d30be502937ff560e3cdced76c92a4a90979e0d46950fa2f345d2364d21902ee13fefa4d78477bb829e6298f SHA512 088a1c3b97e2496e801234ef5a99ce14bb259f8065545e4be1af65e6e5639c273a88a77ed50c414e35c20f62e7b5183c721321a0e463ffb990dba05ea271251e
diff --git a/dev-java/swt/swt-4.10-r2.ebuild b/dev-java/swt/swt-4.10-r2.ebuild
index 291a35848865..4387c8f78a32 100644
--- a/dev-java/swt/swt-4.10-r2.ebuild
+++ b/dev-java/swt/swt-4.10-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
 SLOT="4.10"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ppc64"
 IUSE="cairo opengl webkit"
 
 COMMON_DEP="
@@ -94,6 +94,10 @@ src_compile() {
 		if [[ -f "${libpath}/${JAWTSO}" ]]; then
 			export AWT_LIB_PATH="${libpath}"
 			break
+		# this is a workaround for broken LDPATH in <=openjdk-8.292_p10 and <=dev-java/openjdk-bin-8.292_p10
+		elif [[ -f "${libpath}/$(tc-arch)/${JAWTSO}" ]]; then
+			export AWT_LIB_PATH="${libpath}/$(tc-arch)"
+			break
 		fi
 	done
 
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index fb00bda45bec..793e6f90d1ca 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -23,6 +23,6 @@ EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf
 EBUILD tomcat-servlet-api-8.5.68.ebuild 3002 BLAKE2B 18e52e0a01dac33784343e0204513cd694e227ae12666f8158106c053956723168d5ea0ce526bd46ec9983ad49b0b6a9ad21b4da2fe38ed5b71f9167ea510517 SHA512 b878c7a52254babccc96fc3e144bbf08a5fe42d04de614a0a2122bfc8459be7fe7c2816d517ee43da131fc542c795d348e420e10aa507cac6fff9b67a788ac6c
 EBUILD tomcat-servlet-api-8.5.69.ebuild 3006 BLAKE2B 039405bb1fd288272473d64eb9e4aa44e5b7c2dbd54b25e1fde030f4f511a43127f2d88e45b549084afc3b1dd4024d09360601305e021e7d2fd01b8a49598e5e SHA512 4dde713a2e6484a959abf8c924ab5c48509c53e9f0b7491fe67b8717790f1231e8e4fc7d367cd77297700538abe4b00661509c55454841704dc7ef943a9cb5ac
 EBUILD tomcat-servlet-api-9.0.46.ebuild 3009 BLAKE2B 6a687dee6eeb283532ccffe1e29c248755c2aa639d7a716b21b6097a99c2bdca62fc6b1acf017cff5de27d2a7e91037f2b1212d6bbb5699b3ba9f1b04f9d909e SHA512 e330e8959e3d3d2d7f3639160065e35963515df5bb886672c4359c26562fc2fab9d77ff40c8fb23e6ecdf9a67adcf1ee77f69da8fed681b7b2e0acc67d02b945
-EBUILD tomcat-servlet-api-9.0.48.ebuild 3011 BLAKE2B 4208db9782f6ba2354476bca2b134ba104bd5cf12a33ff1fc133b914fee21ee5016699da48305e7fbe7c76d4d324192b361d66983c0ac977899fb3050ca1a4b7 SHA512 89a6cfb80295f0a9fc4b6bd87e6d6dcbcd7acc5ec660050796ccfd2d13723804d0e5cd25c531da8ec6174c76e24139dda051e6f771630990558c1b9da3fd949d
+EBUILD tomcat-servlet-api-9.0.48.ebuild 3010 BLAKE2B f9496cb27b626b16eff3d2e3c0358dce807ae34089cd205ccabe66172632b9555145a4109daa4f1ea9d3b3d951afb3234c534ee0a0f526d25c151e04c86f584b SHA512 739edfe11422094aeea69f57e0c22ac31d05ab1b996d237956a9596d7e4c36db91e1ae8cb558ea0e28f325e9e00fbc0704d57dc8f185d55c0dae525740632386
 EBUILD tomcat-servlet-api-9.0.50.ebuild 3013 BLAKE2B de9767718af5e643a912a112bde60431cf461d02bdcc157834a3806299f3ebebf8df8b467278727c1eb5ef588874c70f3637f8ce2f1fe4e0b5cb169aa3954683 SHA512 7d5febfe5fd7d4760e03449dfc177f1c0aa21d9752f49429ca2ecfc3f9b8bef45381cc83f6bbd1a132b0d9366d65fb45c32ff4e3b1d87f922bb6b71fed7f3a3d
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.48.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.48.ebuild
index eb33dde54b1d..b008bbac0cd2 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.48.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.48.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/xz-java/Manifest b/dev-java/xz-java/Manifest
index 3520590c6a86..05f25a0e7e37 100644
--- a/dev-java/xz-java/Manifest
+++ b/dev-java/xz-java/Manifest
@@ -1,3 +1,5 @@
 DIST xz-java-1.8.zip 152470 BLAKE2B 601e3292936cb8b3a885551a275248628171f0fa15829785e2fb99d5dfefab59fd2283df4040f090a9d96d30bef5dacd5f4aed4f9d3163ee17dea4a72ad1b0f8 SHA512 3d30804baf9bf743347d87befdbf103107f413c4460639171257e87c4ac96c5e9bc6401a85c44939cd40a25b965162d916a552ae9967f1ff1c71ed389508f5b0
+DIST xz-java-1.9.zip 155868 BLAKE2B e1e355e75b3d14cae9a12dd00105ff38e25ab9c270cecafc83f27a7a03b36aa7a33647b40b7458b3592319a2b574e10cef9786413f0a12af585199a8f00731de SHA512 743f81ac715d7ac2760af8cee4c62d8fbeef156c0d3e0e85e4605ae08d6a71d1e6f6675e0558e7906a92d5fb3ca1feab9db015a1d42b5df73de2dec770a339cb
 EBUILD xz-java-1.8-r1.ebuild 711 BLAKE2B 27665da0629c1c996d85b16006e98edf3b9ef02d112a38be792e608a6a0155b365e83504c49df59d416e6c679d675de48172a7a7611b0334917236938613f808 SHA512 a500174911f338f9becc3444ca380e83d3ab2e734051a4f229c1a932a645688ca2994b61c9b5c45906f41e68f71aa3f8f545166454c5d67c8330ff69cd56744b
+EBUILD xz-java-1.9.ebuild 715 BLAKE2B 31f57552411cd2a431130037d39804c87097dbbb6a22f17b90e74ceb18f015d57845ec038b6ecab7e5c0a1c63a877dfc49f4f29998ec2c6370a0cbf8115d56e3 SHA512 ec665b2e73331d7345dba20e4a152073663d8b909e7a8dadbf734717d3b0add8b6b867a35f8a3031ed341b263eb9b1681fa453b439baff7be786133f28a6ac1a
 MISC metadata.xml 352 BLAKE2B 8390000455654697f473905c14903172230b9667fd16c4db74dd32643b096cb7c8efa21f8614b30d676fb32e052a76c613298e2a28c362d6135f61a4fe27c242 SHA512 a3c6ce3cd97b39644238700277dd416e1ee79df975184de3429810ca4d77f7160112adef6a9b56f77243a003187f6642798b278cf8501d55da766ccfbaa861cf
diff --git a/dev-java/xz-java/xz-java-1.9.ebuild b/dev-java/xz-java/xz-java-1.9.ebuild
new file mode 100644
index 000000000000..2a0688b9ae68
--- /dev/null
+++ b/dev-java/xz-java/xz-java-1.9.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc examples source"
+MAVEN_ID="org.tukaani:xz:1.9"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Implementation of xz data compression in pure java"
+HOMEPAGE="https://tukaani.org/xz/java.html"
+SRC_URI="https://tukaani.org/xz/${P}.zip"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.8:*"
+
+S="${WORKDIR}"
+
+JAVA_SRC_DIR="src/org"
+
+DOCS=( README NEWS COPYING THANKS )
+
+src_install() {
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples src/*Demo.java
+	einstalldocs
+}
diff --git a/dev-java/zstd-jni/Manifest b/dev-java/zstd-jni/Manifest
index 9286e5d40b31..845c06bf18d9 100644
--- a/dev-java/zstd-jni/Manifest
+++ b/dev-java/zstd-jni/Manifest
@@ -1,3 +1,6 @@
+AUX zstd-jni-1.5.0.4-filter-flags.patch 369 BLAKE2B d79c3f5bee1e8faafb96a6d87c03c1cf5d1f292697fef1d7724394b9a415a30d9912946a612003e93a278648e4e5b1cc532e28d2c296c90b683eb7e0e769ac9c SHA512 fb56c386c6db387aa2c27a722d3c417813c427425d0dc6fb350ca02bee3f261efbb639eefbcc5dd58107f33c0211dba1b5bc696680e111a6338d0a67381ab533
 DIST zstd-jni-1.4.9.1.tar.gz 9283717 BLAKE2B 1f5f397e6ee78d029110b98aadbf77e8acaf3b3721ff0729b1b382f193367c8ffb20e08c1f7f905c34a5128e6e061652792cdd4f83dd292e3a3b19906f3bf86b SHA512 2a3a2020e46fbf654796ca065ec84fdce05c308d7925a667b239aa0cc8607f78d8944230578e3c663cdd7932bce05e056895f8457af523d939afb24f68f8087b
+DIST zstd-jni-1.5.0.4.tar.gz 9296353 BLAKE2B 1b4011cc7876d3d4ca2636d9872b1127d3a700f4cc6b159a36dbff5e73a2ec3af91d4a27965123c9dbb9f017200bb68bf7e078806d25d7e395243c2251936891 SHA512 2d83a1e4ff6c25ef301dc25343dcfd4f2dda7f8c44aae2d1d5da2159affb6d0c2885693022dd5cbd2d360540092bebfe0635b61c899fc7ce8dc496a96ba6f017
 EBUILD zstd-jni-1.4.9.1.ebuild 1175 BLAKE2B 05110ee23b299827046cf47a18734131394944a6495701c71fdc486df616e6b1ebb2348407500000a4e0669343b3f02774d78ef5171de8ca1bbf533ed7155ba8 SHA512 2c858cf1079cbf408d8623fecaf010ca38a019d9d9364fbd538e7b21fc76f2c7cc9242e4a6e168777c4b0d9d8edbe26689f10269fa1681b721230f8b1eb9b232
+EBUILD zstd-jni-1.5.0.4.ebuild 1511 BLAKE2B 63a3a04987337af882ed5cec2b8ca0e3a9506faaa1dbb2cb611a7277715aababf8d83050f88bd95df0bf9bf9cef2f5689e5f2cfe62731115fadf32b99f0958f8 SHA512 beba7076a1a96f16f82b604a88dd1dbdc69397b58f608e83d3c125de116ef53d902471e6ca708dec8f521ef3f66a6dbcb77f1fd1d8d4575591bf7a38dea985aa
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/zstd-jni/files/zstd-jni-1.5.0.4-filter-flags.patch b/dev-java/zstd-jni/files/zstd-jni-1.5.0.4-filter-flags.patch
new file mode 100644
index 000000000000..8c880da46623
--- /dev/null
+++ b/dev-java/zstd-jni/files/zstd-jni-1.5.0.4-filter-flags.patch
@@ -0,0 +1,9 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5d0092f..d0f45b5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10,4 +10,3 @@ file(GLOB_RECURSE SOURCES RELATIVE ${CMAKE_SOURCE_DIR} "src/*.c")
+ add_library(zstd-jni-${NATIVE_VERSION} SHARED ${SOURCES})
+ add_definitions("-DZSTD_MULTITHREAD=1")
+ add_definitions("-DZSTD_LEGACY_SUPPORT=4")
+-add_definitions("-Oz")
diff --git a/dev-java/zstd-jni/zstd-jni-1.5.0.4.ebuild b/dev-java/zstd-jni/zstd-jni-1.5.0.4.ebuild
new file mode 100644
index 000000000000..116244dc24e7
--- /dev/null
+++ b/dev-java/zstd-jni/zstd-jni-1.5.0.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MAVEN_ID="com.github.luben:zstd-jni:1.5.0-4"
+MY_PV="$(ver_rs 3 -)"
+
+inherit java-pkg-2 java-pkg-simple cmake
+
+DESCRIPTION="JNI bindings for Zstd native library"
+
+HOMEPAGE="https://github.com/luben/zstd-jni"
+SRC_URI="https://github.com/luben/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-filter-flags.patch"
+)
+
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	cmake_src_prepare
+
+	echo -e "package com.github.luben.zstd.util;\n\npublic class ZstdVersion\n{\n\tpublic static final String VERSION = \"${PV}\";\n}\n" \
+		>> ${JAVA_SRC_DIR}/com/github/luben/zstd/util/ZstdVersion.java || die "Failed to generate version class"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DJAVA_HOME="$(java-config -g JAVA_HOME)"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	mkdir -p "${S}/target/classes/META-INF" || die "Failed to create META-INF dir"
+	echo "Manifest-Version: 1.0
+Implementation-Version: ${MY_PV}
+Bundle-NativeCode: libzstd-jni.so;osname=Linux" > "${S}/target/classes/META-INF/MANIFEST.MF" || die "Failed to create MANIFEST.MF"
+	java-pkg-simple_src_compile
+	java-pkg_addres ${JAVA_JAR_FILENAME} "${BUILD_DIR}" -name libzstd-jni.so || die "Failed to add library to jar"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+}