gentoo resync : 12.03.2021

39 files changed, 446 insertions, 75 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 2da958e2da97..1f56532f07a2 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
index 1012874719e9..07942b1fb5d0 100644
--- a/dev-java/ant-ivy/Manifest
+++ b/dev-java/ant-ivy/Manifest
@@ -1,6 +1,6 @@
 AUX 1.4.1-javadoc.patch 500 BLAKE2B 9954ccef76c45a403d444a730986c15d9fc5c6106908a209691a04c1e3b24af21eddccf217c46120cc2c89eabe0cfe277fe245b7e174974de29ec2bd5affca2b SHA512 e50463fb7bb7ffd493ad212cf2fbdef89e454de48521c6903ddbd9c7ba1a799172cf36265c6131e3a81136c0872977c63e654b7ce2913aac3672357718b8f93f
 DIST apache-ivy-2.3.0-src.tar.gz 2790722 BLAKE2B 87a79bad15b9b74517ce240fcfd0ae9e58b67816f0ec1fbd14081a17bd837c497da419d0b45ad63b3782b151e86c85b79cafa11f8c1170ab0287597be78cabe7 SHA512 fde43ff288cd8c77f2bdecdcbf52f180247ed99a8526be9d875d60e209b66155d5526e968400382d2cef22cabb8899c3b0912e049ae7d23e2cb79be8a81fe00f
 DIST ivy-1.4.1-src.zip 751792 BLAKE2B 3a6ca8aaa49be9c664c3de4789debfe5770bb32084c548aa49a8d6146b55391729d5d68758e26f29253ab727e8a2a731961ba45419f3c1a212b26d74f33b0a0e SHA512 8ccb4680e8c32178bf12b74f4c6df668bbdd06c6dce6a2d0bf1b9daeec8fb5166d4d510cadb247dc4e2a91b71f5dc7fc429d0d7faed95a2898fd4f9d0888ee8d
-EBUILD ant-ivy-1.4.1-r1.ebuild 1742 BLAKE2B 3e2afbb8620bb69395b7869790b7e65866784b94835e59779e24817f1e5b3c44c62eba0e6dfe586362cfcbe55f26434f60dcc101e992f1c451b3ee7020c7ba76 SHA512 fc9c5b8b9da85c510af2540b074d511460302d538dbde9bbcc805aa6cada0e69d0c2b516cd85cebc72a08d5e3e935eb1bdd3a858bdacb9def22fd5dd581cd0ea
-EBUILD ant-ivy-2.3.0-r2.ebuild 2202 BLAKE2B 92b2dfcb3e3cf3bcf5879d649062770ba2f72c08a52d9ba686858de31f315031921da9baedabd01efe3406950c1633464b1fab466b8843f2c3595d7c3ecf321f SHA512 5057ecea8ae376b67e1b415899ea959336370bba4dea50198380e9d392d1a7c4847d84c6b33cb60484567c6968c61ea44deb17f19cc90279b49f6a5564c18185
+EBUILD ant-ivy-1.4.1-r2.ebuild 1760 BLAKE2B 042c11aee2720ffaf77877ab6f903026833db5600c98ea4fc70f0534fe33d478ab01d337b4dfcbfb2218a916ee06bbab42a3afffc29b8b60d663e4e51dec8bed SHA512 926b90f406b1be28920cf56b1463765b676fa00c01ddb4fa7d8a7f3b60b99ea009cad9591015fe65dae636827717390a3d4c5c00118c141f65e4e842f7599e2f
+EBUILD ant-ivy-2.3.0-r3.ebuild 2213 BLAKE2B c47655fedaf297eef86e78ef1e28966d98fd6f93ec4c97ec0d36fbd4612837bce74727f66f6108f7fb692e0bdcf86907d0e0fe2444a38bd1182f14daba347d08 SHA512 122f6c157a461bed828bd8ee0a545ca6f178130ebb5d5b0069540ecffce35947abb26a9d54572db429d61ee0a8bd26677bf9a1e67e4ac3d3e7996723b3c83216
 MISC metadata.xml 655 BLAKE2B ae710cffd6d182e1f67df6734f0bb1e3b61daa87629b8259f8d75f7476fa732904cd73d2ef02d496448191e33c069d3d284a79aeedb87323e28c029e8ceaa40f SHA512 81eb7f4ce41f17a43b32ac6e4ade9677397696cab06ae94964d1756d6745aadc9d61df9ef3b0749eb547b62fdc5bb19a98484268fbce9d56773be09a03671c0d
diff --git a/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild b/dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild
index 92df6ba8e8ba..62198fb29dc1 100644
--- a/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-1.4.1-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 examples source test"
 
@@ -11,7 +11,7 @@ WANT_SPLIT_ANT="true"
 # Rewrites examples otherwise... bad.
 JAVA_PKG_BSFIX_ALL="no"
 
-inherit java-pkg-2 java-ant-2 eutils
+inherit java-pkg-2 java-ant-2
 
 MY_PN="${PN##*-}"
 MY_P="${MY_PN}-${PV}"
@@ -32,19 +32,23 @@ COMMON_DEP="
 	dev-java/jakarta-oro:2.0
 	dev-java/jsch:0"
 
+BDEPEND="app-arch/unzip"
 DEPEND="
-	>=virtual/jdk-1.4
-	app-arch/unzip
+	>=virtual/jdk-1.8:*
 	test? ( dev-java/ant-junit:0 )
 	${COMMON_DEP}"
 
-RDEPEND=">=virtual/jre-1.4
+RDEPEND=">=virtual/jre-1.8:*
 	${COMMON_DEP}"
 
 S="${WORKDIR}/${MY_P}"
 
-java_prepare() {
-	epatch "${FILESDIR}/1.4.1-javadoc.patch"
+PATCHES=(
+	"${FILESDIR}/1.4.1-javadoc.patch"
+)
+
+src_prepare() {
+	default
 
 	# init-ivy expects existing ivy.jar, but we don't need actually it
 	sed -i -e 's/depends="init-ivy, prepare"/depends="prepare"/' build.xml \
diff --git a/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild b/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild
index d39bf4890818..ef8d904b79d8 100644
--- a/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.3.0-r3.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 examples source test"
 
@@ -40,18 +40,20 @@ CDEPEND="dev-java/jsch:0
 	dev-java/jakarta-oro:2.0
 	dev-java/commons-httpclient:3"
 
-DEPEND=">=virtual/jdk-1.6
+DEPEND=">=virtual/jdk-1.8:*
 	test? (
 		dev-java/ant-junit:0
 	)
 	${CDEPEND}"
 
-RDEPEND=">=virtual/jre-1.6
+RDEPEND=">=virtual/jre-1.8:*
 	${CDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-java_prepare() {
+src_prepare() {
+	default
+
 	# This stuff needs removing.
 	local CLEANUP=(
 		doc/reports
diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest
index dca6cafdd355..91d03fe4d387 100644
--- a/dev-java/bcel/Manifest
+++ b/dev-java/bcel/Manifest
@@ -1,3 +1,5 @@
 DIST BCEL_6_0_RC3.tar.gz 929878 BLAKE2B 05e2e307f226785cda54c06e80b47b8f738d2f5117deb4492cc758e4bfc2b046068f2aa7836336c26514f56c99525732c62acb02ed982e7f446dc254a5aeab3f SHA512 05ccf95ebf6b374fb112296509b4011d741acf2315b331aa971f8c3bc6be2f73b39592721a8c769b6b9d631e78e348c124c56f567adc2338ed5508d5ec3bed77
+DIST bcel-6.5.0-sources.tar.gz 1009051 BLAKE2B fd07d8a5144112efe38e30a8d10c3b6a189a4ec70defa96c402fa88027acf84b07c15138d235354baac18bdb798d407c11ccfada7bbe7339532f829e814e2d2c SHA512 c6da4b4d4cbad3ad2b3a4c0208063e3858170356fc4f6670c95ce819f0aea69f103914875a12bf2715a869c2b19a3e79fcb55a695eb269d9937520db25da1e3d
 EBUILD bcel-6.0_rc3.ebuild 1207 BLAKE2B 99192e908a274cc224f30452a28edd6931f31a570204f51aa1023e6498e062476610485ff9cb2006dd54235522f52bdcd6dab3e7136d45855ccad845450ddf8c SHA512 ebab70ad29898ef6494147629cb08d843da4c566faaea64941e8293ecec8151f8c1ffd745d082d8155f63c008b4209202b887ee14423d3e7f093ed24dda96e14
+EBUILD bcel-6.5.0.ebuild 1080 BLAKE2B 7ad26bbfccedbf4375c23027b47458175134ef9a05fd48099ccd869c2c4bbea0e243becfeeb3664dcf80084fa5e7a3ee2fa247ee7668376e154d3e74b9e9a568 SHA512 fc8783e11bb675ea899fbb651a8a49fcc5e72f52a52e0f45cae0f3588babf8fba44da1eddd2ff54d386dc2a09416fbabeb4b6c6901d265d06496f14d75d43054
 MISC metadata.xml 819 BLAKE2B e997d77649047065ba6102ad1e4c71a3622fb20544234f529566e665c6c97830bead40f81fb4664f3565225f07abb6d7829b9a6a9f2b7d5365c9fdd02572b020 SHA512 2dd8f3339c680fe11255c65ea92b2ad808ec4cb59d49b47ea533092119fef14424859368feee8ce94e7621a607ef71c4499ab78e518ce07886388def593e7281
diff --git a/dev-java/bcel/bcel-6.5.0.ebuild b/dev-java/bcel/bcel-6.5.0.ebuild
new file mode 100644
index 000000000000..a16085388107
--- /dev/null
+++ b/dev-java/bcel/bcel-6.5.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir bcel-6.5.0-src --pom pom.xml --download-uri https://ftp.wayne.edu/apache//commons/bcel/source/bcel-6.5.0-src.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" --ebuild bcel-6.5.0.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.bcel:bcel:6.5.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache Commons Bytecode Engineering Library"
+HOMEPAGE="https://commons.apache.org/proper/commons-bcel"
+SRC_URI="mirror://apache/commons/${PN}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
+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:*
+"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/brotli-dec/Manifest b/dev-java/brotli-dec/Manifest
new file mode 100644
index 000000000000..6af7da26ede7
--- /dev/null
+++ b/dev-java/brotli-dec/Manifest
@@ -0,0 +1,3 @@
+DIST brotli-dec-0.1.2-sources.jar 89491 BLAKE2B 68bb997d4e9513cfa50c22d93065a713340cf7ef75b6e08ba4fddbdeaed5a4423f2b51e7a277dbe435e835ccebed8fe5c80a2a61baaefc725e3a2840df1f54c3 SHA512 00ebbda7e3d8e558651523f8d3ab3f66aa20e300422ae2f5de57fca9a95538cb12751b87a959c8229a228878e61661ba01c4f08077b1e540c3a2d2219a71f070
+EBUILD brotli-dec-0.1.2.ebuild 522 BLAKE2B d8c12fd52da8b56f334ac569e4342c80cc1191552c2899e05f87d94aeac1c6e66eba64439222b088db5fc178a43e4f0a63dbedc1bd060107defa60ea9333a89a SHA512 b07a2a43af521fca76e3c3abf67bf16c42d2ff937748775ed99199ecd77de938575f304cad9b5ecc0c200a0b90f87af0cdeb76ebcaaae4b50cc177722cb69a4a
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/brotli-dec/brotli-dec-0.1.2.ebuild b/dev-java/brotli-dec/brotli-dec-0.1.2.ebuild
new file mode 100644
index 000000000000..72b0761c55f2
--- /dev/null
+++ b/dev-java/brotli-dec/brotli-dec-0.1.2.ebuild
@@ -0,0 +1,20 @@
+# 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.brotli:dec:0.1.2"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Brotli decompressor"
+HOMEPAGE="https://github.com/google/brotli"
+SRC_URI="https://repo1.maven.org/maven2/org/brotli/dec/0.1.2/dec-0.1.2-sources.jar -> ${P}-sources.jar"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-arch/unzip"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/brotli-dec/metadata.xml b/dev-java/brotli-dec/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/brotli-dec/metadata.xml
@@ -0,0 +1,8 @@
+<?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>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest
index d2f420e59b90..abe324bd1669 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -1,4 +1,4 @@
-AUX commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch 12400 BLAKE2B 76cd9cff541adc08b987119de99e23ae50e2b849432aaab9431a760da67d4cb3ac53199ac7ca74393ee5d55a5d3c2148ffbffbfde005b7ff936da00620b94dac SHA512 3f20161688bcd40497747fc2e5802d12881d10a071c04a151d56b3603f81b4c14f56962b83ee72cc38d1e7a4e7e43e51426f00d06ec983feb23d8771df237c2a
+AUX commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch 12404 BLAKE2B 294ef11924310e2e63865018843faf199521f619e0859cc2c857d8a9fb038fbc44d88b06cf2df44b05cc6891c9e9d1bba5898071a873fc0dd774427afb0a2de2 SHA512 af18eeb48d8da55fc63526a528b88f626d9fad2369a6a8f570fe2dfee76384a5d86a9bab4883e557a1acd0a866859c4bd075476f9cfaff8e8465de6db0f2848d
 DIST commons-httpclient-3.1-src.tar.gz 1882664 BLAKE2B ccf96bedad09011ee20eae38aae1fdfdd6fea5a8226f4b4d156762080c286c71b34c149035abfd61e70c55a1de84ab3cd38d73c3228f591dd8e16c0a7e79c3a5 SHA512 e73ceeba3f34a35c30b24a3c6cb8dfc2102ff21079a5ff9270935908cb2f707d366c2f31a53fbdafa99673cc2b82e05470a2bf40d96767c72b2ab037c0f55490
-EBUILD commons-httpclient-3.1-r1.ebuild 1618 BLAKE2B e82e0b6ad99f5800d38edcb9225b36853b5fcb38b02aafecc7ac24380e15f4eaeb3fd9e4c79322c3032649dc1ce0be78e7a6afce1d6a3c59a454259977ed667f SHA512 406fd3fd24975f136ef9b80f65e6a7adb9ea36699ff6e9683cdd49bba9fc15f0c46d5448c8de9ce5ec5e3559dc1b46842e8215017ebd46f8e1beb0cc7c8f8f3f
+EBUILD commons-httpclient-3.1-r2.ebuild 1680 BLAKE2B 39796278c783e63835011467992fc9d8891bd2c691924078b909d409cd5567a8ebe505a834bfe65617936b4196cc99bcd12770e6a0462c237b5a5ff0f33cef11 SHA512 c1c327018aa78ccadd57a06845771ce12eef99106092823763eb7285d9bee587aa654b3fafcfabc7e725d36a5db7cda5e276bc6c6c7c291bf19bfbb553116244
 MISC metadata.xml 456 BLAKE2B b4e2261943e4bd92d413eae20f60f23b79e7deb961d9c7e08f855f28cf69f0b45c5113a308138122a9cc4b42da1498e67c8be2093ce0252f60d5ef56ea55e72a SHA512 27c629a07a007dd4336cd50f4ea32156ec301b02f398b008c057532b36bc0698132282e32007ee31f0dd21f3f5664b3d7c9607fe43a4dfbbffb67d3000c3a661
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
index 0c9f3363633b..5921250be5ee 100644
--- a/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 JAVA_PKG_IUSE="doc examples source test"
+MAVEN_ID="commons-httpclient:commons-httpclient:3.1"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="The Jakarta Commons HttpClient library"
-HOMEPAGE="http://hc.apache.org/"
+HOMEPAGE="https://hc.apache.org/"
 SRC_URI="mirror://apache/httpcomponents/${PN}/source/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="3"
@@ -20,9 +21,9 @@ RESTRICT="test"
 
 CDEPEND="dev-java/commons-logging:0
 	dev-java/commons-codec:0"
-RDEPEND=">=virtual/jre-1.6
+RDEPEND=">=virtual/jre-1.8:*
 	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
+DEPEND=">=virtual/jdk-1.8:*
 	test? ( dev-java/ant-junit:0 )
 	${CDEPEND}"
 
@@ -32,9 +33,13 @@ EANT_GENTOO_CLASSPATH="commons-logging,commons-codec"
 EANT_BUILD_TARGET="dist"
 EANT_DOC_TARGET="doc"
 
-java_prepare() {
-	# patch against CVE-2012-{5783,6153}. See bug 442292.
-	epatch "${FILESDIR}"/"${P}-SSLProtocolSocketFactory.java.patch"
+# patch against CVE-2012-{5783,6153}. See bug 442292.
+PATCHES=(
+	"${FILESDIR}/${P}-SSLProtocolSocketFactory.java.patch"
+)
+
+src_prepare() {
+	default
 
 	# generated docs go into docs/api
 	rm -rf docs/apidocs
diff --git a/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch b/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch
index 45df330092ab..c059bf496a45 100644
--- a/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch
+++ b/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch
@@ -1,5 +1,5 @@
---- src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java
-+++ src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java
+--- ./src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java
++++ ./src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java
 @@ -31,10 +31,25 @@
  package org.apache.commons.httpclient.protocol;
  
diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
index c82ae3611c57..bb9d9c2d504d 100644
--- a/dev-java/dom4j/Manifest
+++ b/dev-java/dom4j/Manifest
@@ -1,4 +1,4 @@
 DIST dom4j-1.6.1-java5.patch.bz2 2900 BLAKE2B cdd7dc901f5292af3ef7f0ea200c3d22bbc8c0adc27606da3c8fbadc44625b114c995321723dca331f0b23d5248e1f9177f0def2f4138eebcbd4aaac0495d4dd SHA512 38da606d77b62976366cd089e5194a922e348ec396e7b9af4dceb0a536c47f66e0900cfa59c91df04aade6076630077a8f88c713b9c20224d69316109b293a96
 DIST dom4j-1.6.1.tar.gz 9687211 BLAKE2B 3daa3729ea071aa87c7c1e1e2b91f1635109774dd2bd564a85265a0286f1369373084b945409d9d5213d66a7e14224033d42c58d80125b7982eef8961eb29248 SHA512 95c5a7105a81734f77b4bf27f8bb0af116bf43d8ad5297a0902a6687a54109a87dffe2953cf430d14947cdaa590aa0fdf083b46a91d1d98d48431cfae4459d94
-EBUILD dom4j-1.6.1-r7.ebuild 1856 BLAKE2B bd1a95d0a70b20ed36a4652de930ff196926cdfa511aaabbc561cae4919e978f6062072de90254706ee2d5a66e57a1a9c18278831a1633b2fa7c0707d299236c SHA512 d25f76b76da53a44b5b9e69360fed19ce9bb761d96ed5ffa1d96ec8b2bcb8840e254a80f6ef2bf6f8d6236ddf889024f54e3670acde4356890a5a745fc14b704
+EBUILD dom4j-1.6.1-r8.ebuild 1912 BLAKE2B 7d30137c42a0cdb16e8f7ab3d4ebc6ebf10b5d8b6c969902382a6645aa43654d39d12018efe574397fa8d0a2454e0f48fe8e4aaac60aa279d25b24fcf78bad9d SHA512 1df48894e8cb08b994c53b04b2d6266b4a2c394d35a25e607f0b28a30cf539e950f35f5f2a60fe672146c596e116966fd13043a959ef08f539f9ba3890bec12b
 MISC metadata.xml 529 BLAKE2B 27e8a2aa0c95e7690b99386698f800291371b9962a1a667899c425e58ce73c8eb21dac1c589d47449242f0e2522b66c66379d6dd3b01708015e66278d634a480 SHA512 a9845c5229efbf48ac83b5b8fd0a769d90275de1f336b52147330cc2652a858df2689e17895e2fca5af067288413102de67316e49108c7d9eaf232e9dda31bbd
diff --git a/dev-java/dom4j/dom4j-1.6.1-r7.ebuild b/dev-java/dom4j/dom4j-1.6.1-r8.ebuild
index b74f951b8209..894aca08368f 100644
--- a/dev-java/dom4j/dom4j-1.6.1-r7.ebuild
+++ b/dev-java/dom4j/dom4j-1.6.1-r8.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
@@ -26,8 +26,9 @@ CDEPEND="
 
 RDEPEND="
 	${CDEPEND}
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.8:*"
 
+# restricted to jdk 1.8 because it needs javax.xml.bind
 DEPEND="
 	${CDEPEND}
 	test? (
@@ -35,7 +36,7 @@ DEPEND="
 		dev-java/ant-junit:0
 		dev-java/junitperf:0
 	)
-	>=virtual/jdk-1.6"
+	virtual/jdk:1.8"
 
 PDEPEND="dev-java/jaxen:1.1"
 
diff --git a/dev-java/jcip-annotations/Manifest b/dev-java/jcip-annotations/Manifest
index b3a1a34eb99e..1874c0316013 100644
--- a/dev-java/jcip-annotations/Manifest
+++ b/dev-java/jcip-annotations/Manifest
@@ -1,3 +1,3 @@
 DIST jcip-annotations-1.0-1.tar.gz 7524 BLAKE2B cd31ecf1fe1ef4d78a9624cd92b9837acaccc35b1edfe5fbfac517d94edada03b5f7ac065ba21b26b43e6a8a6aef70434f3dfb7a76bb866ef4e3e25467ff1c01 SHA512 22eb285a445b25a718846dad45581dbe7a324a2d670bd05f4b2aa5e850ae34af6bcedbf143e17a7cd6cf7e510e0dd447992ba1d5316432e8a8db5584a1e1973e
-EBUILD jcip-annotations-1.0.1.ebuild 705 BLAKE2B ca622855bb77890a79f336fa709c7e6550f114ed072bb2d3f7eab2c1bb0231c06bdf1cf5ec7a07e527590b2c865ff32b735ad45cd55212b371519b523d518dcb SHA512 9ee18887230329c7149ad8b5d3e81eb57bacb059f7535a9c1ca92c1818edfdf224cd991d8056f1034247a7a717f3373bbe7fae1b973c8c5cc74ce6025e740038
+EBUILD jcip-annotations-1.0.1-r1.ebuild 641 BLAKE2B d730761619f89edc0dd65cabbf55b860c548995fd06f78c245c0c9e16bb02fa10b4877d3ddbace6559284f5553051e9043cb57a476b0f0922a9629d34fd85f57 SHA512 d22e8804cc92256e43643ecdd0e973504e36b9a59791409c078a85e00b5c11adbd165611a0beecf07a024f6739f32ad7040300065dfe30eb20bce6b46c183454
 MISC metadata.xml 583 BLAKE2B c986afba09f7a872552a05f62fc20280ccbbecdc50c2b8ea158d87b160630c643610e431f4ed0202d90c485c40a5947027691639b9b0c8dd90fb1483f2e9c9f2 SHA512 d05c3ee0c0349388f4504ad9b04c17f92659317878215b49f133cc8f9871ccb9cc23625b6d476b88a255c5a452a5c5d82545fb5ef79d8f08b297298d7be92bc4
diff --git a/dev-java/jcip-annotations/jcip-annotations-1.0.1.ebuild b/dev-java/jcip-annotations/jcip-annotations-1.0.1-r1.ebuild
index 4eca0bce1671..1f9c6101e325 100644
--- a/dev-java/jcip-annotations/jcip-annotations-1.0.1.ebuild
+++ b/dev-java/jcip-annotations/jcip-annotations-1.0.1-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# 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"
 
-inherit versionator java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple
 
-MY_P="${PN}-$(replace_version_separator $(get_last_version_component_index) -)"
+MY_P="${PN}-$(ver_rs 2 -)"
 
 DESCRIPTION="Clean room implementation of the JCIP Annotations"
 HOMEPAGE="https://github.com/stephenc/jcip-annotations"
@@ -18,8 +18,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
 
 S="${WORKDIR}/${PN}-${MY_P}/src"
 JAVA_SRC_DIR="main/java"
diff --git a/dev-java/jformatstring/Manifest b/dev-java/jformatstring/Manifest
index d8658bac2bda..254dac8790a6 100644
--- a/dev-java/jformatstring/Manifest
+++ b/dev-java/jformatstring/Manifest
@@ -1,3 +1,3 @@
 DIST findbugs-3.0.1-source.zip 9625065 BLAKE2B 26c940ac0eaec16de89ffbbe26d16b0b5c2883a6131a8b3ce93b9a35014a42c221456f977e581d2f4f1b8d9333237c24ac6d5ad8fc2ba6bb018c333b6a09f4eb SHA512 d967769f2356f28b34d92c7451cf3e2ac004e667bfc3b049b5b10b1c19d7be2cfa0db132a77698d042300330f77a2bb5dd8c4baa0d67c37b7e5ae6da9e83a64f
-EBUILD jformatstring-2.0.3.ebuild 742 BLAKE2B 9690cf96d791d2697b1c8076627ba61e24ab67891622b91d5f8065a2a7e3b1fa969e16000c6305537feacafeccff96687e1e92867077305d811faa3c07c07ef7 SHA512 e8bad5064a97d7306b5197bad4a00308c6da9a72360660b505fc4f828abcb0bcb801bd3be00f2ba2d5d5283760d5ef17514da7ec56d8a839d555603960042e5a
+EBUILD jformatstring-2.0.3-r1.ebuild 743 BLAKE2B 53e5fec94122b0be2e112c5f721a9e1342763bde40ee96760fefe5cef3e87376df0f7acf4849a08ce4bda4bf0bb4ea1c01ace3d124afb2276efa8b056b09f450 SHA512 1927fdf32bdc13e4fa64414bc2d20165bc4ac2f4f4f4b860084ecb16fb7a353610a5a0fc6c9b10780b6c3921d58b54e6ac99a062ca0d8bd872faad8511497878
 MISC metadata.xml 565 BLAKE2B a9dd51e1767f5e5244f848a899e891b3a0cf7cffe44af9246a92c7a5c319ba1e64aed570431137ef013c0113128abac9c30a38e7cf9b4a40075d8a9b9c90ff8e SHA512 7e8464b49caa095274ccb367f36b78267accaff8af30b88148cb5f91b32e84b28069445c3fc84338b9276308ff487662f070e8f9f82d167f586f264ac0a31501
diff --git a/dev-java/jformatstring/jformatstring-2.0.3.ebuild b/dev-java/jformatstring/jformatstring-2.0.3-r1.ebuild
index 2aaf83dfdd53..f0c536f80c94 100644
--- a/dev-java/jformatstring/jformatstring-2.0.3.ebuild
+++ b/dev-java/jformatstring/jformatstring-2.0.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 FINDBUGS_PV="3.0.1"
 JAVA_PKG_IUSE="doc source"
@@ -15,10 +15,9 @@ HOMEPAGE="https://code.google.com/p/j-format-string"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
 
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*
 	app-arch/unzip"
 
 src_unpack() {
@@ -26,6 +25,7 @@ src_unpack() {
 	unpack ./jFormatString.jar
 }
 
-java_prepare() {
+src_prepare() {
+	default
 	find -name "*.class" -delete || die
 }
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index 02edd95a2eea..f06b996a8f19 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,7 +1,7 @@
 DIST junit3.8.2.zip 461426 BLAKE2B 8fbef1ccdf7f71c611976d63f45838f4cb2564da5f5064e7abc39931a3c99039a40660093aba2cc3c70af761171125f434c16c52021226f2e92fdf23597dbf25 SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930
 DIST junit4-r4.12.tar.gz 443804 BLAKE2B b36248266eb83d8f2dfb1c525f635a4fce5a46c6042652ef27a5d405b83c471848edf83e799a4d1e950d83e127caa288f453edf19959a9a8aa5a9e26eeb4e771 SHA512 ba612598fa6c328e8f4bbea3afda08b459a110837ca3805a62e811535f7bca8d04509f8fe51a413c7bc855fccee35d6946c9eece4dd01726d12454c002a4de32
 DIST junit4-r4.13.1.tar.gz 1072560 BLAKE2B d7a8ecf804f83461c281a494c1ad85e6797af64fd1344ba41a919a2783c28fc7c36b6c85984aaff66d41a99fde0141532be2e9bb00f3f53ae467f6dbde937f4a SHA512 a4c284f756916077100181af1dd8c0febdc855e21ea600366e5fda3904919ec2c4a5e828961c322f080f177eb53485c9ad01bfc65c7489a741be63c96cd472bb
-EBUILD junit-3.8.2-r2.ebuild 813 BLAKE2B ac6f190e677782fa64b444fd8bed9075de0931cc6486b9d348df6d3b4a542502a841176d316257d638c1ecf3bf61a182c150ca2800bbaf012ee63301647138a3 SHA512 f3af904c6e1273ef937a892380187e90ae49a35c2f15754d720fe02000f479a009120e29733ea33ae42d35ee29bdc93fdc7aff7d45a925a305c9179242f7cfa0
-EBUILD junit-4.12-r1.ebuild 1449 BLAKE2B 0b2be1b853ec60b066bf90501e9d15457f007b9508ca5063c57eec54b0f338453f4d2b0e2ecf8096971d27c881da2e4ce016c405cb4b39b13a275ae34f2da727 SHA512 d9a6566c011cb81a82918fc6053265b486a0a362a148a1c555b18f48c4aa680addb7a7387a533d37e4340e7f0f27ae65037997bbc9678bb8e72394eebdea8bf1
-EBUILD junit-4.13.1.ebuild 1453 BLAKE2B f5955da17e123556f255bdbed28597ffac5ff603abc6e44653e1d8b875d4d8f1054f2072be7f3c95a13d8d6147c654d204d13fda0132cd46a827b7180e240d33 SHA512 0cb25e915a75a8b7fb922e0be60bfb9e4f490080c98b8c395426d63e128338aa3258ed9d3bbd9eff47f3aa747334becf3b2352b824eadd2e7766e22984986f02
+EBUILD junit-3.8.2-r2.ebuild 842 BLAKE2B 01cc39cca58291852a2bd71b97283ce344656648c741792013e7daaf50cccad14551e4d0885d9fa4c3dfe52cfccd18c0943a55c0d479cd49b1d182eaa8252f75 SHA512 25a498140852340c429d965b8770a1844fdcff906164fcdf873e32cd303871b446d80d88fef2772c765254c7396fdd6a3688e9b253f04cf02c289c5a85e99ebe
+EBUILD junit-4.12-r1.ebuild 1477 BLAKE2B 92482da40156f07c657f3f9463f7e9763330ad496032b74199084f8fb4bd521e236332050c461a06270b3574086d5dd2b3413f55cbf9c6361c171e31aafccdbb SHA512 418decaf336841e80eb82a8905d99fb897155fc2bc1ec45f7be72324f03cc63e6f07b9e1ecd3b12e9d8149291970ab2f27b0c482a96e48d1bc7e8301e8190f35
+EBUILD junit-4.13.1.ebuild 1483 BLAKE2B f56b0f948417658ab16cf313b4aff3c6122331e8ae2229da5854b9b36203a4927ef0fdfee7a4a37b7c393a8700868b8fae09d7722cee5cf264a411e890413614 SHA512 63916ea343e2e3472b861826de9aff49ed621d10bc59e2d8c6e1fba15877e255234448a07951a27d26cf9d1454e9bf4b5d93b41da960733000e4de7b6cd9b0c7
 MISC metadata.xml 367 BLAKE2B 7cd798ae028c83275e61522be10a35abba419a823042be242ee7fdf7e0ccfc978e817affaaf154b8d0723f502499f17bb81b0622fa493dc812b82ad23dfa647b SHA512 44e492dfaaa9faf54f4aaf420d5816da8d117951d6a52e37c76a9e533fcefbeaa3c44bafa4d525f878deb3af2b7f426e72a62b16464e85ce9690c61b1f0da71f
diff --git a/dev-java/junit/junit-3.8.2-r2.ebuild b/dev-java/junit/junit-3.8.2-r2.ebuild
index 4079e6685fb3..712ad30d85d9 100644
--- a/dev-java/junit/junit-3.8.2-r2.ebuild
+++ b/dev-java/junit/junit-3.8.2-r2.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="junit:junit:3.8.2"
 
 inherit java-pkg-2 java-pkg-simple
 
@@ -16,8 +17,8 @@ LICENSE="CPL-1.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.6"
-RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
 
 DOCS=( README.html cpl-v10.html )
 
diff --git a/dev-java/junit/junit-4.12-r1.ebuild b/dev-java/junit/junit-4.12-r1.ebuild
index bdb81d48ce75..3f19ad05eede 100644
--- a/dev-java/junit/junit-4.12-r1.ebuild
+++ b/dev-java/junit/junit-4.12-r1.ebuild
@@ -6,6 +6,7 @@ EAPI=5
 MY_PN="${PN}${PV%%.*}"
 MY_P="${MY_PN}-r${PV}"
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="junit:junit:4.12"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/junit/junit-4.13.1.ebuild b/dev-java/junit/junit-4.13.1.ebuild
index d96833a1236d..60c035757c38 100644
--- a/dev-java/junit/junit-4.13.1.ebuild
+++ b/dev-java/junit/junit-4.13.1.ebuild
@@ -6,6 +6,7 @@ EAPI=7
 MY_PN="${PN}${PV%%.*}"
 MY_P="${MY_PN}-r${PV}"
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="junit:junit:4.13.1"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 25c51ef96b44..691386ff2a85 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -11,16 +11,20 @@ DIST apache-tomcat-7.0.107-src.tar.gz 5312698 BLAKE2B 1f2712ddce6aa604692aaf6a6c
 DIST apache-tomcat-7.0.108-src.tar.gz 5313375 BLAKE2B 200a1ccbc39a572ca7e4f7805bf3d27e0bd645156d8886b0fcbee5e64279a4d2f4e2ad847d67a70e1c65a8d88fa5bd4757a0066ceff367fe92914e22cc809aa5 SHA512 bdd957ca5b3b7dd152efa6406dbb6397ed62661ec44c83b6a8f6e9e3c33362c51ff5e0451a57d6aa3874cd745811f2afe78d08825ddaba8e29cb38ef922c48e2
 DIST apache-tomcat-8.5.61-src.tar.gz 5840559 BLAKE2B 18e1505b6b7d8e1a024d9f834d33ef105a16e6fc1f9e80abd3e6e88b2326597b9973e13c2ebc030a1db4a2d4dc5572d195b9f61db6cb7bf51e97cbfaa121678a SHA512 fd6bb5926b5e7cf44f359c93dadc4edd87fa5f2e26fb0fb3a9bc0a5c89ae4d844d66872055e1b441392cf03d7690aca3429b66afd8334319784f089f821d8c22
 DIST apache-tomcat-8.5.63-src.tar.gz 5853051 BLAKE2B d007d9922d54578bdebcbbaec3e7c0ffcafdce913e52fdd93d5c174c9d1304980b5eb7f126e957c5975a59dfb126857dcc87ef3ca5e479e44cd7910b6183e469 SHA512 d78a140117844675239e834a0890641c0ef0d6fc3c89eb4512536fece2c128f088edfdea15f79ba7a31e0478431f155230f8f60a57bfea0aed191298a95310c4
+DIST apache-tomcat-8.5.64-src.tar.gz 5863485 BLAKE2B c297c0803c74a969e96b99c379bcd050d6e08cb1036d69b5c49c64311d6f17695754631738130a76def849da6c2de70a49d4452b24ee34c5720d9474f8d4d41b SHA512 ffcc8e97b56730e7e15daa8c4ce628547afcf0bb008bb8d8142ae684c963ed6a366c1dfdbaaca9080201c3c1bcda60c759b76447dd72493f0ec922a034b75f08
 DIST apache-tomcat-9.0.41-src.tar.gz 6022059 BLAKE2B 6e97390aec956c16f271e57a2fa8805b6f49f593434f0dff8d82e14bc9abc199b00a7523dbb8da335a7ffa9dfee6790430c30f8b0ee90bcd133694c8da42197f SHA512 094e7cbd2519a4b812a2ca865f92802ece3385a20826c5e29b5f7cda8b9265d01ede6f598999f8aa2f1b04bcaca2e67e3f0132781b3f22007356df49ab6b1838
 DIST apache-tomcat-9.0.43-src.tar.gz 6042010 BLAKE2B 78c0e7d711dd826ba93b12db6a96929ddeeb0df189a12e907c51f02baa08d84757915b8744b5ebd027892ff2823b955d7b1c3c749ab54b588686dfd8d3157640 SHA512 8c23f8a371b3ffbc1ab4d5f24be08ecf2c9e6ba466ef36ef97e075bd0f12b1ffc93f63b9ff1def9953b3f791319c7c355a76e7a54061a21d25be37a5dc22da26
+DIST apache-tomcat-9.0.44-src.tar.gz 6047722 BLAKE2B fda3081d66c9018a49e5a07bfb5d54b133fe51dff69b692480065d8d9a4877ce5b5b152e33f6d4cfaf28940ec6b556c9a2455c8fda56ea0552e4d1f83f0f9cbe SHA512 68f6a6edecc0469e21cf062cd4b5aacd2df4903fe98aea052acfc9f725268490d5a6917ac1565f26e15a513afa09814014aed267dc1b5aa92733a51ef52b305f
 EBUILD tomcat-servlet-api-10.0.2.ebuild 3165 BLAKE2B cf4aa92c2b241461c134a5c77349dc03c20e64d3eb3ab30ca89841a1ecfa48346e5295bf6485ef169121e2d714fc290e8fa108fec4448702ba9894285b649215 SHA512 4b26edaa5ef0802a210a52c8f43e363cce30d5a2746cf241e79de7ba62bad52b412ab9b8913895a190d1a26c223f69412d23e5bd8777fb26c684ab028a041c8f
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1001 BLAKE2B c3a337a341d14d193e0b409e2ae751ad7e2f4d7dcff941e28c4eb7ef4d614ae5f626235bf7cfdeb56eaf3bba608913bf12bde46b2a9e576c7cf1d886c275336a SHA512 b36e97e60cb546ef2a980d1b9787dda5b21e5c788555d9a696ca166632315a870477fb8c52fa24c1698dcf43bb096201b6d4835113ec87192287eff9f5664e3b
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1426 BLAKE2B 02098b91f21bde7a24d0cf38bb224cfeca5218d53c943c24db8a342cb54a7658016e127a0719b0206b9cdc14c73b8066f335400202710d5a82ea3db91cd4b2f6 SHA512 d70314124ddd901892fb92163ba78d719d875582704868870c74b94163da96e56f17eadd1a833a64058467f0de9c39ccb3f8892970221fb946d8a645db174218
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 962 BLAKE2B 6abe44ba77bb16d78f1529cacbb95bfc439c63ba7cc3ee594209cb22927374e184edb90804ad1f55aa6721f98aa927f3bd8ca713463085233db1b233837acb07 SHA512 7a45a663f00ae5a71bea3002a72bd11a640583af44c0ab6a3dfbd6551bbf3a6de5f35e880643294c56027ecb3b7757425a2c26f34a96fbf8cd26df4a545086c0
 EBUILD tomcat-servlet-api-7.0.107.ebuild 2994 BLAKE2B 4e8f86d3f068f2e1dd1029ba8fa6d7df7b628a26ed5366d940b20d5375070d09caf2efd3429e8784fd1777d771a107a9184d7a46113966a994e4c496106bf37e SHA512 dde6491804e3f3ecae22d42fc35f40e64d867af0962fa0f9f4e91eedeb4df973175b3eccd45e59ed00eb3e7ec676326861540da6a8176e8275bbd6abfd8da6eb
-EBUILD tomcat-servlet-api-7.0.108.ebuild 2997 BLAKE2B e3f860205944fe45e64aae0844c872d1df657ea3609d4a2ba816ff084c0dbeaf3e5825314e4eda730aba4c1ed9afcb11fff3e8259795857fcc21c23b74281ca6 SHA512 d9d4f901a1904c95eaadd600f21d5a7601efe68a4f8438704c4ff8e90cd0955a0dad32fa13d30a017651e0cadfeb0a46aae553016a67e027a7f448acd8d25a04
+EBUILD tomcat-servlet-api-7.0.108.ebuild 2996 BLAKE2B bc663cdfda29e16b0d0bff18bb6a6e4f8f3f5c3deb7a7a9a134cce09115c6f57606061e5238f279d99a5476f7fb9388d1280ad3f0e2b1844034dee186ed0bd27 SHA512 d78ba594fc8f2c65c3e1ef8856a1269bf282e3c33ad260941a2d7f671b68752456bcacddc08d4cde175f9db12fc839de68d79f559f00a349edff50eae1b1bf8b
 EBUILD tomcat-servlet-api-8.5.61.ebuild 3006 BLAKE2B 5a5ace1a95a190f6de2b56f42eaa80a0c35e4bec8905143350cf0f98af9e1d5d110622579b1164ea3f1af65581f06f886fa49d589e81f676694ed67178f613f2 SHA512 73d09c2d4aac971b1f00f9d4f6028d19270c343dcd0e4048585c2addd33b781bae4be3a9376739763fee8432479a4a1ad85a8e63c46dcf8b1b17b22ee872456c
-EBUILD tomcat-servlet-api-8.5.63.ebuild 3009 BLAKE2B c9b1c9ad1579a72d83610ad3b8091402763a568c8a14e39b74be586bb4b36170cde768c90d6213996b30e2c353d4d03b20321f749f532681d79ef9fb059cac5b SHA512 a9fd18773a807692b4aedfdb2f48053a4329b4cbad9a5948c8a33e99e6e3a6cf3f3c0a8ba3b99424809f1e1eab7541658e8f36bf76626e4a1ac91b3e8ee21d1c
+EBUILD tomcat-servlet-api-8.5.63.ebuild 3008 BLAKE2B 8f01f33afc915191bdeb51e7b3989b7486e91e280e373dc06f80c228c1732ab6ccedad59f456425bfaf5b379d8afbb9cc0ae10241d874d5e3f67baeeed1dd20b SHA512 817cab543d860a9906a6b61e6dfe102da11beeda46c324d6ffa4711e5a17921185c3566f8da832a8f0d409b019946ab9c395a2ad6c7a717a6e9eb3fce22a91f4
+EBUILD tomcat-servlet-api-8.5.64.ebuild 3013 BLAKE2B eaafab16ad5d3abd8548472444dde131df8aa69d8c76e5791fe9411649e5e0d02f6c2acfceedb46a437b9f6751b881aac947cec86df75d585bcba767f937a659 SHA512 59cfd4b848df3ca159c9cedb031d15fb9d5b0f28e9d2c8e7d6e2244ff0d4a70f2d39033bf49857ab4cd55406bca5ecc6de82d9c50e82acd6a04ff4709fbe0a44
 EBUILD tomcat-servlet-api-9.0.41.ebuild 3172 BLAKE2B 28700a17edaf81fa47d08083fa506c89cc81a876dd4cc29310bba7487454317c271bef7641c0fc93f99b9a53155c2d99c4ebfa90c5f73d2e0188b75211f46625 SHA512 11cf7359592cf2ff2e2ff453fb90f649f6c9f2e444c5e58dfb84808256f13557be9dfadb188669fae88856af6aca9ecd242d043f9d43f96574715c35db9ef17f
 EBUILD tomcat-servlet-api-9.0.43.ebuild 3174 BLAKE2B 1e0e628d53d7747c3882523cb73de01000800bdf16e2daed89c769047935d49d35ca49fba0ea2aa071e232193507a2bbab0e1b7a05cca3a4b44ddd3df6c9c9dc SHA512 7506cd8f698ee205dfa186a5e0715eb3844fe71f7afe4f56e51c3b0695f8af2285e0d7cbf157e7bdec81ee96bae2d9aae1218ee940579e82109007945d2648c3
+EBUILD tomcat-servlet-api-9.0.44.ebuild 3178 BLAKE2B 340842e202037af6b9df88fb08a73e7aaf9c52e1ddaab5034aa5611f70df1d8aa5213eb1d783c38fce546dcf3fb6658c224342a4b00310b042b6fac5232e4d37 SHA512 63f9e79717f395a40ab5d9ea9429273ec902ec1866c43551099095298e1a8c4d0e603dc61bc7ea914ad1957d8a794a52826ef23ea6376dfbdadf777dbbd39bca
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild
index 52e6931e9e29..cdb2d22d435e 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.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/tomcat-servlet-api/tomcat-servlet-api-8.5.63.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.63.ebuild
index 76e873d75997..0209b9ea50cd 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.63.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.63.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+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/tomcat-servlet-api/tomcat-servlet-api-8.5.64.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.64.ebuild
new file mode 100644
index 000000000000..9d54d656a065
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.64.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${MY_P}/"
+
+JAVA_TEST_SRC_DIR="src/test"
+
+SERVLET_API_JAR="servlet-api.jar"
+SERVLET_API_SRC="src/main/servlet-api"
+SERVLET_API_RESOURCES="src/resources/servlet-api"
+EL_API_JAR="el-api.jar"
+EL_API_SRC="src/main/el-api"
+EL_API_RESOURCES="src/resources/el-api"
+JSP_API_JAR="jsp-api.jar"
+JSP_API_SRC="src/main/jsp-api"
+JSP_API_RESOURCES="src/resources/jsp-api"
+
+src_prepare() {
+	default
+
+	# The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
+
+	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
+		${EL_API_SRC} ${EL_API_RESOURCES} \
+		${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
+		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
+
+	pushd java || die "Failed to cd to java dir"
+
+	cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
+	mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
+	cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
+
+	popd
+
+	for file in $(find src -type f | grep -vE "\.java$"); do
+		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
+		mkdir -p ${target_dir} || die "Failed to create resource directory"
+		mv $file ${target_dir} || die "Failed to move resource file"
+	done
+
+	mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.44.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.44.ebuild
new file mode 100644
index 000000000000..5b8c94f2e0c3
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.44.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+MY_A="apache-${PN}-${PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${MY_P}/"
+
+# we don't have the aQute.bnd.annotation.spi packaged
+PATCHES=(
+	"${FILESDIR}/tomcat-servlet-api-9.0.40-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch"
+)
+
+JAVA_TEST_SRC_DIR="src/test"
+
+SERVLET_API_JAR="servlet-api.jar"
+SERVLET_API_SRC="src/main/servlet-api"
+SERVLET_API_RESOURCES="src/resources/servlet-api"
+EL_API_JAR="el-api.jar"
+EL_API_SRC="src/main/el-api"
+EL_API_RESOURCES="src/resources/el-api"
+JSP_API_JAR="jsp-api.jar"
+JSP_API_SRC="src/main/jsp-api"
+JSP_API_RESOURCES="src/resources/jsp-api"
+
+src_prepare() {
+	default
+
+	# The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
+
+	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
+		${EL_API_SRC} ${EL_API_RESOURCES} \
+		${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
+		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
+
+	pushd java || die "Failed to cd to java dir"
+
+	cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
+	mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
+	cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
+
+	popd
+
+	for file in $(find src -type f | grep -vE "\.java$"); do
+		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
+		mkdir -p ${target_dir} || die "Failed to create resource directory"
+		mv $file ${target_dir} || die "Failed to move resource file"
+	done
+
+	mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_compile
+	rm -fr target || die "Failed to remove compiled files"
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	JAVA_SRC_DIR="${SERVLET_API_SRC}"
+	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${EL_API_SRC}"
+	JAVA_JAR_FILENAME="${EL_API_JAR}"
+	java-pkg-simple_src_install
+
+	JAVA_SRC_DIR="${JSP_API_SRC}"
+	JAVA_JAR_FILENAME="${JSP_API_JAR}"
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/xalan/Manifest b/dev-java/xalan/Manifest
index f196f181580d..7665ef120bf9 100644
--- a/dev-java/xalan/Manifest
+++ b/dev-java/xalan/Manifest
@@ -1,4 +1,4 @@
 DIST xalan-j_2_7_2-bin.zip 17740075 BLAKE2B 244fd71011fa957ff1988dbbb58e40af4ad218aafbd92f2a6ec305d59ec0fb221a283442b24e4290f6d2e853cfad39d689c1397b4d18f34f4c94403610079328 SHA512 ae2be0bfc5e794b159c2d16718275a6ce6e8f63d681e2d13875f233d334a37aba872206c6c1f70565698ceaf4c66261c7df6db6c524e6e8da5dafe2f17cefddf
 DIST xalan-j_2_7_2-src.tar.gz 8416261 BLAKE2B be67c9f2f7ec1140965dc148aea94347e60a2969deb1fac5834c1458d10b3dca91b448a44ed6ebbbb227e4f04780ce0142e812cd99d8862a4cbbf5e8e2af4cb3 SHA512 2f1fa105b3cb8082594e3121a245464e1b7c15464b1ead2d10e306e51ef61ded5d7fcd70c034fa46f41c4a8c14316e376cc14d8045c8aadfce80f2e4bd1b61d8
-EBUILD xalan-2.7.2.ebuild 1818 BLAKE2B d7f8b82abe9c9f295851a866879df0341560b88cd3244937d83707cc3d92137e4a528f8260225e5bd8056f5ea014d36c57c30d814cb2e94f599c7bc91b215725 SHA512 f8d7d85cb4d2b5836b2294c58d01347fc9cce7cd355a099acdecd7208a00e2eb932e1b234afa13dd24b7aecb7428130f7a26b1b6b96f978f8543fa5cb4dc1959
+EBUILD xalan-2.7.2-r1.ebuild 1804 BLAKE2B 232fc0f7afdaf42e099c6d96af1123f88a53a66f061bb0966604b38818d7189efa3d3c8e37e1378a3ac0310ae46b12ac918495cc943fa1084b25cef8496a241f SHA512 ba00767a262f80fb54498cc47661bf605e9f0d72c30cd7c6d4370d29a1bfa69a31c558a32ffa3948f07e2609bb06cbd89e701c1bef8e6740958fca1a5b7dd598
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xalan/xalan-2.7.2.ebuild b/dev-java/xalan/xalan-2.7.2-r1.ebuild
index c5f4ec852ee9..332cb5588c95 100644
--- a/dev-java/xalan/xalan-2.7.2.ebuild
+++ b/dev-java/xalan/xalan-2.7.2-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
 
 # NOTE: Building the docs is much more hassle than it's worth. It
 # requires com.sun.image.codec, which has long gone from JDKs, and
@@ -9,16 +9,16 @@ EAPI=5
 
 JAVA_PKG_IUSE="doc source"
 
-inherit java-pkg-2 java-ant-2 versionator
+inherit java-pkg-2 java-ant-2
 
 MY_PN="${PN}-j"
-MY_PV="$(replace_all_version_separators _)"
+MY_PV="$(ver_rs 1- _)"
 MY_P="${MY_PN}_${MY_PV}"
 SRC_DIST="${MY_P}-src.tar.gz"
 BIN_DIST="${MY_P}-bin.zip"
 
 DESCRIPTION="Transforming XML documents into HTML, text, or other XML document types"
-HOMEPAGE="http://xalan.apache.org/"
+HOMEPAGE="https://xalan.apache.org/"
 SRC_URI="mirror://apache/${PN}/${MY_PN}/source/${SRC_DIST}
 	doc? ( mirror://apache/${PN}/${MY_PN}/binaries/${BIN_DIST} )"
 LICENSE="Apache-2.0"
@@ -28,13 +28,13 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-mac
 CDEPEND="dev-java/javacup:0
 	dev-java/bcel:0"
 
+BDEPEND="doc? ( app-arch/unzip )"
 RDEPEND="${CDEPEND}
-	>=virtual/jre-1.3
+	>=virtual/jre-1.8:*
 	~dev-java/xalan-serializer-${PV}:${SLOT}"
 
 DEPEND="${CDEPEND}
-	>=virtual/jdk-1.3
-	doc? ( app-arch/unzip )"
+	virtual/jdk:1.8"
 
 EANT_GENTOO_CLASSPATH="bcel,javacup"
 EANT_BUILD_TARGET="unbundledjar"
@@ -43,7 +43,9 @@ EANT_DOC_TARGET=""
 JAVA_ANT_REWRITE_CLASSPATH="true"
 S="${WORKDIR}/${MY_P}"
 
-java_prepare() {
+src_prepare() {
+	default
+
 	# disable building of serializer.jar
 	sed -i -e 's/depends="prepare,serializer.jar"/depends="prepare"/' \
 		build.xml || die "sed build.xml failed"
diff --git a/dev-java/xpp2/Manifest b/dev-java/xpp2/Manifest
index df2393a6e352..0230a78c73b5 100644
--- a/dev-java/xpp2/Manifest
+++ b/dev-java/xpp2/Manifest
@@ -1,3 +1,4 @@
+AUX xpp2-2.1.10-fix-java5+.patch 872 BLAKE2B a8fa53326a2fefa40f726a4cd3e5e2828b3d2e50907736be1b2639489692ff2a0ff683d1538123163d5fe52d2935d97832d643d7365829ca1eaa7c7936623e75 SHA512 495dfb83a773d11fb1f9f423f1bfa532770710b4b16c1f6e64e517e8148958a5160ddbbc43dd4cdc7ecc51126fba1062a10277bc9234b58e46a044e81180b3a5
 DIST PullParser2.1.10.tgz 2310288 BLAKE2B 0c1f3aedf88aae18e7cab40b04055fa7a20f6bfe05973e6cbe3b459b408dfa193834d22a6d77b3d1ba3802e115d89f73e3f423efc7571efc8f09bb73625950d6 SHA512 87a091e415a31cde27ca1193735743b60f516feb336a9a3577792636e54ab8d671a22e74eb8aa41268f6251c688c68fe92a28f735ec78b96b919909f80c59590
-EBUILD xpp2-2.1.10-r2.ebuild 1703 BLAKE2B e06143290e012eeda79ad750174ecf4003dd9c516ebc8c026a804d95c9d3dbc941a77283663397c1dabf7e41950896571b3439de09729b0f0e77861b6c3943ff SHA512 f0da8a4f57ff45c47185bfa7bf8dc825bf5ad73117c6658993efe747b3396d656536337ef228f8d847143c2d050209af0c7cf02104e0f297ef7bea3bc45eaa0b
+EBUILD xpp2-2.1.10-r3.ebuild 1766 BLAKE2B d1c35f7eba0510c1a89781cc9dd2d6407eb070bef990786e485a71be119a730d6f8f9800afbb124caaaed2c1f5c619b680f2c916ccb78f84e2ca64dc37f18f35 SHA512 c37dd9b0c3fadb9b37567ece77598565eb70d75ef045925f99255c77c15e26b8b5dbe8e5d1c23ab1f32f14d555d3d3980bfaa4ddb6b50f628cb988ba3853039e
 MISC metadata.xml 458 BLAKE2B 5a23e3b43da0a680538428c1cbd29dc6555459408a7d9520410a5da0f904cd9bfc1864e27b7f3aae2a94afca4c0f276c5cdaf09612a77759a64b7fb0c2f345ed SHA512 9004485c7ad032ec1f11aa89e7bc286f52d45f3886cca36912d12891f409d6d70cff063cf3790b7e05f4e280e1a953987dab155feecea461d5a3ff5cea0a430a
diff --git a/dev-java/xpp2/files/xpp2-2.1.10-fix-java5+.patch b/dev-java/xpp2/files/xpp2-2.1.10-fix-java5+.patch
new file mode 100644
index 000000000000..883bf5fa2d9a
--- /dev/null
+++ b/dev-java/xpp2/files/xpp2-2.1.10-fix-java5+.patch
@@ -0,0 +1,17 @@
+diff --git a/src/java/impl/node/org/gjt/xpp/impl/node/Node.java b/src/java/impl/node/org/gjt/xpp/impl/node/Node.java
+index 7c66608..6c128e9 100644
+--- a/src/java/impl/node/org/gjt/xpp/impl/node/Node.java
++++ b/src/java/impl/node/org/gjt/xpp/impl/node/Node.java
+@@ -273,9 +273,9 @@ public class Node extends StartTag implements XmlNode {
+         oneChild = null;

+ 

+         if(children != null && children.size() > 0) {

+-            Enumeration enum = children.elements();

+-            while (enum.hasMoreElements()) {

+-                Object child = enum.nextElement();

++            Enumeration elements = children.elements();

++            while (elements.hasMoreElements()) {

++                Object child = elements.nextElement();

+                 if(child instanceof XmlNode) {

+                     ((XmlNode)child).setParentNode(null);

+                 }

diff --git a/dev-java/xpp2/xpp2-2.1.10-r2.ebuild b/dev-java/xpp2/xpp2-2.1.10-r3.ebuild
index bb124374b5c7..db77c7e64ae0 100644
--- a/dev-java/xpp2/xpp2-2.1.10-r2.ebuild
+++ b/dev-java/xpp2/xpp2-2.1.10-r3.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"
 
 inherit java-pkg-2 java-ant-2
@@ -23,21 +23,27 @@ IUSE="test"
 RESTRICT="test"
 
 CDEPEND="dev-java/xerces:2"
-DEPEND=">=virtual/jdk-1.3
+DEPEND=">=virtual/jdk-1.8:*
 	test? ( dev-java/junit:4 )
 	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.3
+RDEPEND=">=virtual/jre-1.8:*
 	${CDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-java5+.patch"
+)
+
 EANT_GENTOO_CLASSPATH="xerces-2"
 EANT_EXTRA_ARGS="-Dx2_present=true -Djunit.present=true"
 EANT_BUILD_TARGET="intf intf_jar impl x2impl"
 EANT_DOC_TARGET="api"
 EANT_TEST_TARGET="junit"
 
-java_prepare() {
+src_prepare() {
+	default
+
 	rm -r build/ lib/ || die
 
 	# Our usual rewriting stomps over the existing classpath, which
diff --git a/dev-java/xsdlib/Manifest b/dev-java/xsdlib/Manifest
index 6a29150ee537..0d3a0438abd4 100644
--- a/dev-java/xsdlib/Manifest
+++ b/dev-java/xsdlib/Manifest
@@ -1,3 +1,3 @@
 DIST xsdlib.20090415.zip 914126 BLAKE2B 7f8dc45c590606ece1775d08634f87bb7cd392c69c66204073d4867f925cf7159fe14b43cde6d59a72da90ab284d9a3adc0c4d6aa117ea5143eff8efc5bf6534 SHA512 479b20bb24c32f7a8bf548689cb6d7efc99e36d7f887d9e33b34b2e4707d74149ae1e312f7166a90acbd44422248729d6158a55d710616b656eb628cafc1e3f2
-EBUILD xsdlib-20090415.ebuild 1146 BLAKE2B 085af826f89fe7401fa25671563a5c160f39d27ce116f2cd022452e91bea1dc75d77183cb05c01eb7041e6c3168aff3ba1dbacd2677bd383bf8733235e60fd10 SHA512 3e0c9a971e0063b3098b946cb147d65d9489e74151639187961b6f9cb5b192f4eb10a7b1c69f183e7c1a2e94ffa70fb059b9e0b2e97c9c88543e6736b7a18679
+EBUILD xsdlib-20090415-r1.ebuild 1150 BLAKE2B 7bcc97e4f4c2e5d05c411ba578f078644d8e7a168a76dc7ed5962014543bca46da4e3dc30c0d3eb662995445354e54cc57fe3e4b366db9d7ab6911c365260131 SHA512 6ab425a67dd1956a5e166add3b9a87e899cf075e5ba19e70132acbb212131db207526a0baa28d3423f8424e432bf17083f009114af10ebcd011e894eebc26e19
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/xsdlib/xsdlib-20090415.ebuild b/dev-java/xsdlib/xsdlib-20090415-r1.ebuild
index 8628881c0abd..58537f49874b 100644
--- a/dev-java/xsdlib/xsdlib-20090415.ebuild
+++ b/dev-java/xsdlib/xsdlib-20090415-r1.ebuild
@@ -20,9 +20,9 @@ COMMON_DEP="
 	dev-java/relaxng-datatype:0"
 BDEPEND="app-arch/unzip"
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.4"
+	>=virtual/jre-1.8:*"
 DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.4"
+	>=virtual/jdk-1.8:*"
 
 S="${WORKDIR}/${P}"
 
diff --git a/dev-java/xz-java/Manifest b/dev-java/xz-java/Manifest
index 27fba322e563..3520590c6a86 100644
--- a/dev-java/xz-java/Manifest
+++ b/dev-java/xz-java/Manifest
@@ -1,3 +1,3 @@
 DIST xz-java-1.8.zip 152470 BLAKE2B 601e3292936cb8b3a885551a275248628171f0fa15829785e2fb99d5dfefab59fd2283df4040f090a9d96d30bef5dacd5f4aed4f9d3163ee17dea4a72ad1b0f8 SHA512 3d30804baf9bf743347d87befdbf103107f413c4460639171257e87c4ac96c5e9bc6401a85c44939cd40a25b965162d916a552ae9967f1ff1c71ed389508f5b0
-EBUILD xz-java-1.8.ebuild 677 BLAKE2B 8313b394a56ff0b9227e73fccefdbfac9698f1b15586caa66ebe1523fc55a6f21d5bb4a0bda95d0c298dd067f6d868298db48681ed8385cfc6a6d0326ec96d61 SHA512 6faf205c18ab9cfe09ddbc22f51fc05705543669b4822ae9df99c59aae267c271795498d8ea626ac5005039e0b04dda66f0145ac3f607b3d253b4e6c41dab401
+EBUILD xz-java-1.8-r1.ebuild 711 BLAKE2B 27665da0629c1c996d85b16006e98edf3b9ef02d112a38be792e608a6a0155b365e83504c49df59d416e6c679d675de48172a7a7611b0334917236938613f808 SHA512 a500174911f338f9becc3444ca380e83d3ab2e734051a4f229c1a932a645688ca2994b61c9b5c45906f41e68f71aa3f8f545166454c5d67c8330ff69cd56744b
 MISC metadata.xml 352 BLAKE2B 8390000455654697f473905c14903172230b9667fd16c4db74dd32643b096cb7c8efa21f8614b30d676fb32e052a76c613298e2a28c362d6135f61a4fe27c242 SHA512 a3c6ce3cd97b39644238700277dd416e1ee79df975184de3429810ca4d77f7160112adef6a9b56f77243a003187f6642798b278cf8501d55da766ccfbaa861cf
diff --git a/dev-java/xz-java/xz-java-1.8.ebuild b/dev-java/xz-java/xz-java-1.8-r1.ebuild
index 36cba78282b6..2e055ca8f737 100644
--- a/dev-java/xz-java/xz-java-1.8.ebuild
+++ b/dev-java/xz-java/xz-java-1.8-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 JAVA_PKG_IUSE="doc examples source"
+MAVEN_ID="org.tukaani:xz:1.8"
 
 inherit java-pkg-2 java-pkg-simple
 
@@ -16,11 +17,11 @@ SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 RDEPEND="
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.8:*"
 
 DEPEND="
 	app-arch/unzip
-	>=virtual/jdk-1.6"
+	>=virtual/jdk-1.8:*"
 
 S="${WORKDIR}"
 
diff --git a/dev-java/zstd-jni/Manifest b/dev-java/zstd-jni/Manifest
new file mode 100644
index 000000000000..594c32a27938
--- /dev/null
+++ b/dev-java/zstd-jni/Manifest
@@ -0,0 +1,3 @@
+DIST v1.4.9-1.tar.gz 9283717 BLAKE2B 1f5f397e6ee78d029110b98aadbf77e8acaf3b3721ff0729b1b382f193367c8ffb20e08c1f7f905c34a5128e6e061652792cdd4f83dd292e3a3b19906f3bf86b SHA512 2a3a2020e46fbf654796ca065ec84fdce05c308d7925a667b239aa0cc8607f78d8944230578e3c663cdd7932bce05e056895f8457af523d939afb24f68f8087b
+EBUILD zstd-jni-1.4.9.1.ebuild 1151 BLAKE2B 192577cddf42c0acd44a379e44df9ab4795770948359f92f17825b61b304241b9169dc3a28a10d4544a1923020e945abb3dc7bb3ce8a3caf2f4c2b7a60116d88 SHA512 8ec83561effb39657aae0dff182059f14938474ad9e1832da7cfc5f7a9f0b7a3cbcef30859c27682053599a4b6ac793bdc1b5f0c5deed194144158b6c9a27c00
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/zstd-jni/metadata.xml b/dev-java/zstd-jni/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/dev-java/zstd-jni/metadata.xml
@@ -0,0 +1,8 @@
+<?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>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild b/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild
new file mode 100644
index 000000000000..ee4f35125cc7
--- /dev/null
+++ b/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild
@@ -0,0 +1,47 @@
+# 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.4.9-1"
+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"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND="${RDEPEND}"
+
+JAVA_SRC_DIR="src/main/java"
+
+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
+}