Adding metadata

28 files changed, 426 insertions, 59 deletions

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 a7dcd2be251b..1050fd7db142 100644
--- a/dev-java/bcel/Manifest
+++ b/dev-java/bcel/Manifest
@@ -1 +1,2 @@
 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
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..f51877395af9
--- /dev/null
+++ b/dev-java/brotli-dec/Manifest
@@ -0,0 +1 @@
+DIST brotli-dec-0.1.2-sources.jar 89491 BLAKE2B 68bb997d4e9513cfa50c22d93065a713340cf7ef75b6e08ba4fddbdeaed5a4423f2b51e7a277dbe435e835ccebed8fe5c80a2a61baaefc725e3a2840df1f54c3 SHA512 00ebbda7e3d8e558651523f8d3ab3f66aa20e300422ae2f5de57fca9a95538cb12751b87a959c8229a228878e61661ba01c4f08077b1e540c3a2d2219a71f070
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..e25b5c52aab3
--- /dev/null
+++ b/dev-java/brotli-dec/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
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/dom4j-1.6.1-r7.ebuild b/dev-java/dom4j/dom4j-1.6.1-r8.ebuild
index eba6e6f50379..2cae04e326a9 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/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/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/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 40684a7f4598..ac126779a47e 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -6,5 +6,7 @@ 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
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/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/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/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/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..1aa4df06c8af
--- /dev/null
+++ b/dev-java/zstd-jni/Manifest
@@ -0,0 +1 @@
+DIST v1.4.9-1.tar.gz 9283717 BLAKE2B 1f5f397e6ee78d029110b98aadbf77e8acaf3b3721ff0729b1b382f193367c8ffb20e08c1f7f905c34a5128e6e061652792cdd4f83dd292e3a3b19906f3bf86b SHA512 2a3a2020e46fbf654796ca065ec84fdce05c308d7925a667b239aa0cc8607f78d8944230578e3c663cdd7932bce05e056895f8457af523d939afb24f68f8087b
diff --git a/dev-java/zstd-jni/metadata.xml b/dev-java/zstd-jni/metadata.xml
new file mode 100644
index 000000000000..e25b5c52aab3
--- /dev/null
+++ b/dev-java/zstd-jni/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
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
+}