gentoo resync : 03.07.2021

25 files changed, 265 insertions, 273 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index c2cae427a81b..105fe4a2b1b3 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/bcmail/Manifest b/dev-java/bcmail/Manifest
index 478492a5d638..101f11729d0c 100644
--- a/dev-java/bcmail/Manifest
+++ b/dev-java/bcmail/Manifest
@@ -1,5 +1,3 @@
 DIST bcmail-jdk15-145.tar.gz 483519 BLAKE2B aed9d4ef1ede10b97979652a012f18e45b7d4d597cb8b3ad168e847563ce14f7effe429b7f213adb77befeb144c4c3a279738b76718bde85ce04265d62ef8e75 SHA512 2d3232d5eb1cd75ad56a7316beb32880f3f935fcd3ed0a6cb2cc3e1861dc9f0bece0cbae53471760246505adb5c28328691eb82e11fedb0b160c1248d21c48bb
-DIST bcmail-jdk15on-150.tar.gz 221760 BLAKE2B 48c5d3b692295dcf2ce1e73ce58097b20c11cc353a8e13da9b8987f19eb69f1dbb37747e778e9323c170c0a3baa2ec7257681beea8da4e95343f71c5c6ed186a SHA512 91727ddc4bf932cfaedd3cb90a807b5fec3120e56fde3e5fc73bb5bf2e97db50a35a63e0b5e342fe29e4b974579c5cdd5d427d01c9dd8e7abd521ccd3d1959f1
 EBUILD bcmail-1.45-r5.ebuild 912 BLAKE2B ef76eb9c860233cc5e90b84123eeca0317ea2690e03d09a90bebbd13adfdb0ec3c84335b3ea886306b64caf20b20460158b84d260417fc7f0496cfb75bc63731 SHA512 7936c6be67385f5d97d639697c4295bfa2c886c40b4271ab54cb58fde64233c22184a18ef1e4c247a016d12db16fab2d4a846e4e1039d545730bf22d41f03bfc
-EBUILD bcmail-1.50-r3.ebuild 1194 BLAKE2B 5e040e7cf8852f8398aa6526a11533a57340abbf324be1658ac57d86f805e6fd5d197f8ae154830d1c09fbc6d7310fa71f8e0d6ac905672646dec4b7b1a25334 SHA512 c22936d51fead1ad4a5350bd11614e3efe7ff7dcc2378d7047f1b5fc8e650c18b57b9649f199fc735a7314b010e7da6fd3040c80ad9e011c5fba581aeb10614c
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcmail/bcmail-1.50-r3.ebuild b/dev-java/bcmail/bcmail-1.50-r3.ebuild
deleted file mode 100644
index 8cf8473d44ec..000000000000
--- a/dev-java/bcmail/bcmail-1.50-r3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.50"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-CDEPEND="
-	dev-java/junit:0
-	dev-java/bcprov:${SLOT}
-	dev-java/bcpkix:${SLOT}
-	dev-java/oracle-javamail:0"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	${CDEPEND}"
-
-RDEPEND="
-	>=virtual/jre-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_GENTOO_CLASSPATH="
-	junit
-	bcprov-${SLOT}
-	bcpkix-${SLOT}
-	oracle-javamail
-"
-
-# Package can't be built with test as bcprov and bcpkix can't be built with test.
-RESTRICT="test"
-
-src_unpack() {
-	default
-	cd "${S}" || die
-	unpack ./src.zip
-}
-
-src_prepare() {
-	default
-	rm -rv \
-		org/bouncycastle/mail/smime/test/* \
-		org/bouncycastle/mail/smime/examples/CreateSignedMail.java || die
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/commons-csv/Manifest b/dev-java/commons-csv/Manifest
new file mode 100644
index 000000000000..9d9b3c59e70a
--- /dev/null
+++ b/dev-java/commons-csv/Manifest
@@ -0,0 +1,3 @@
+DIST commons-csv-1.8-sources.tar.gz 36962976 BLAKE2B 6b3ee00a9e6185b30aa5dd4cb8be684740ce9e61c38a5e3596b0e96da9674b05494b6996a4d39b88412f0cd333ec3d6c5b2c0e10171a5e9d3b6e8925107aa3e9 SHA512 e0a7f7dbb0bf381f0f8f703e0ccb689f96c0a610b7afbd771cfeecab7042416f6dddc15c0a6e9a23f157da87c2bf3f16efb2e2aeb135ef1ac8c7306659936443
+EBUILD commons-csv-1.8.ebuild 1708 BLAKE2B 6f19376dfe068931da7e8e4bc8eae0c0ee41027e8a68b1be717c021dfda126e5522ca4ea523af83e68272992ef69b86458e5f779e13506c4fcf1f32abb5f5e4e SHA512 baf9e2a304b60f6d625586e320394126bdda69ef9468d7713eeb8308f2fb59121ada4b302cc4832f7125ddc0f521a3dcba9282a7e9d3e63a32ca222aae22afd8
+MISC metadata.xml 415 BLAKE2B c6704cfc35e7c49d11d776d8e37132a587d737a19dea17849e0dada182a49991f6ef87d4d8a8ab4d4c5433bf3003507981f3539c51de1bbc913cefd5134a50ba SHA512 f1bea89dfbbfb1434640aea4c27a7e4d6576bfcd0272049bb789c66e1248d9b62049833ce9da19fbe1b1094f2b055b2ace56c74c84e6b416c9a0fde49dd2e237
diff --git a/dev-java/commons-csv/commons-csv-1.8.ebuild b/dev-java/commons-csv/commons-csv-1.8.ebuild
new file mode 100644
index 000000000000..2bfad6f75733
--- /dev/null
+++ b/dev-java/commons-csv/commons-csv-1.8.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://mirror.dkm.cz/apache//commons/csv/source/commons-csv-1.8-src.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild commons-csv-1.8.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.commons:commons-csv:1.8"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Simple interface for reading and writing CSV files of various types."
+HOMEPAGE="https://commons.apache.org/proper/commons-csv/"
+SRC_URI="https://mirror.dkm.cz/apache//commons/csv/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+# missing test deps
+RESTRICT="test"
+
+# Compile dependencies
+# POM: pom.xml
+# test? com.h2database:h2:1.4.200 -> !!!groupId-not-found!!!
+# test? commons-io:commons-io:2.6 -> >=dev-java/commons-io-2.8.0:1
+# test? org.apache.commons:commons-lang3:3.9 -> >=dev-java/commons-lang-3.12.0:3.6
+# test? org.hamcrest:hamcrest:2.2 -> !!!artifactId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter:5.6.0 -> !!!groupId-not-found!!!
+# test? org.mockito:mockito-core:3.2.4 -> !!!suitble-mavenVersion-not-found!!!
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		>=dev-java/commons-io-2.8.0:1
+		>=dev-java/commons-lang-3.12.0:3.6
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${P}-src"
+
+DOCS=( LICENSE.txt NOTICE.txt RELEASE-NOTES.txt )
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS=(
+	"src/main/resources"
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="commons-io-1,commons-lang-3.6"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS=(
+	"src/test/resources"
+)
diff --git a/dev-java/commons-csv/metadata.xml b/dev-java/commons-csv/metadata.xml
new file mode 100644
index 000000000000..a3076d914bd7
--- /dev/null
+++ b/dev-java/commons-csv/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>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://issues.apache.org/jira/browse/CSV</bugs-to>
+		<changelog>https://commons.apache.org/proper/commons-csv/changes-report.html</changelog>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/commons-validator/Manifest b/dev-java/commons-validator/Manifest
index 25e8110e71d6..b0df1670d9b8 100644
--- a/dev-java/commons-validator/Manifest
+++ b/dev-java/commons-validator/Manifest
@@ -1,6 +1,3 @@
-AUX validator-1.4.build.xml.patch 676 BLAKE2B 43e8729df9775683413d746756d820bc50f593e8b97dfec0e19bfb543e15b2ed790571d2508247f5f46922be26f2e0e57d7877e390189a6b4ac1380c791d074b SHA512 3b426b65d32799398de59d063f67c840d261593278a48afd81024479171e68483add4c69aeed1e65127812850500ba6ffe24cf31ecda6ad16d3a2df64fb2c218
-DIST commons-validator-1.4.0-src.tar.gz 222421 BLAKE2B 1a83d39be6b2cd8c20cc027cd49b813cd23f65772f17e2c8f1dc7357edd0abf80ce2f76c2c8fb5a5b4acc66eff740925b970cc21ba6a582ecab71f74be84f7bf SHA512 35005d5ada8a1070cdd02f78464886e16157a05f895e3abfe2dcd51fa4b443d9ee359bb54a40e13ed463b757a77a64669c89cd9b914051a4ab1c745be3526d98
-DIST commons-validator-1.4.1-src.tar.gz 244155 BLAKE2B 4d7d63f30bdc9196f73812fa584226f28d9514918c13f0279be74e868f2410e08b2bc2a71a4a54d2b2ba91d580438f3de6fa71afe8dd38838d234723921b6c27 SHA512 e64d16de2481c388c81a488dbe894c4d16a1abad12f841f6f77e2606013edbce75ec7a1371976b7e642adfc7cbc5038ff7271cb4d184fbeb32a635acf6bccb38
-EBUILD commons-validator-1.4.0.ebuild 2655 BLAKE2B 46acd60320b348d2b9e6b1747f781d402482a0ffd83ed04000919b1f5879728f18404fa4a7d943c512dd824cca2d428b3beb7f1fb3e9ccd34d7d2d08ec153bf7 SHA512 3180153f474f63d2d5a137d7a4ba93342bd281172f25ce813ad7d1f7cdcefa502f3f0cc05cea5a2a03f7fbd9cf2acf70ed3e18fd1852c60531634c717956faa2
-EBUILD commons-validator-1.4.1.ebuild 2661 BLAKE2B f49b3f0e370034d7f15f7ad23774356720d72ac54f361b0da8c7f2c16986db949df477e49dff9929bf0425665c23d8b741d01f304d384cdfa33626c467ac13e9 SHA512 c049a29d136eb6ff081959dbf7c97b2fb47a05c7f9913d8c0988fdb7c7b2d3ca4d7330afd68bc5fb7bbab9e6662255c22872ca669b6daff808c1e498bff38a3e
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
+DIST commons-validator-1.7-src.tar.gz 289870 BLAKE2B 576c6ac00187b67618eee251a69e7166cd817bb6184f4cf138a226539fc100a1a4e32ebc4ef6cea567aff581d11c63a817a9dad4836142de4d9a3b313d59a31b SHA512 4007872fda856e9e154f325270748081920d21a716143389713706ca0e5a8ec3c88b9b978d75801a5926723764a81f1dbfd77a8fd4b361b16cd65e84cf47a868
+EBUILD commons-validator-1.7.ebuild 2118 BLAKE2B 2e202adb19e516314b96709e190e69bd0367905c4b9a9ef320010f37e8439bf01fa697e0bd52d5dbfd7e459ce2518c3a8fbb5f45f9be4f48fa7cf65784bd376d SHA512 6127dcee106e86a2e728090c6b0ffca675461836e4945fecfc2f25c983aff1868ea95cc7d0d90c75f0e6d4d720816137a30f491554c33f127531791914dcf137
+MISC metadata.xml 436 BLAKE2B c228665acb7f7d2f5662f0993a55abf29a0c42d580de51d7ac1ad8c100959762292d575281675dd0d58dc39607c3f0639715eb6c66f30c618d80b98745264930 SHA512 8e168e85f4a50c0aeb9eb7c1dbad276a1f4ec2a980a508c0ed39b37d16d42b4b5a74a3b3d914b9b875c2be7a9a98ffd7cad6811bcb958097bab46406a74b5d5e
diff --git a/dev-java/commons-validator/commons-validator-1.4.0.ebuild b/dev-java/commons-validator/commons-validator-1.4.0.ebuild
deleted file mode 100644
index 00a7eebf1026..000000000000
--- a/dev-java/commons-validator/commons-validator-1.4.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="examples source test" # doc
-
-inherit java-pkg-2 java-ant-2
-
-MY_P=${P}-src
-
-DESCRIPTION="Commons component to validate user input, or data input"
-HOMEPAGE="http://commons.apache.org/validator/"
-SRC_URI="mirror://apache/commons/validator/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-RDEPEND=">=virtual/jre-1.4
-	>=dev-java/commons-digester-1.6:0
-	>=dev-java/commons-collections-3.1:0
-	>=dev-java/commons-logging-1.0.4:0
-	dev-java/commons-beanutils:1.7"
-
-DEPEND=">=virtual/jdk-1.4
-	test? ( dev-java/junit:0 )
-	${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
-	epatch "${FILESDIR}"/validator-1.4.build.xml.patch
-
-	JAVA_ANT_CLASSPATH_TAGS="javac java" java-ant_rewrite-classpath
-
-	echo "commons-digester.jar=$(java-pkg_getjars commons-digester)" >> build.properties
-	echo "commons-beanutils.jar=$(java-pkg_getjars commons-beanutils-1.7)" >> build.properties
-	echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties
-	echo "commons-collections.jar=$(java-pkg_getjars commons-collections)" >> build.properties
-}
-
-EANT_JAVA_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-collections"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},commons-digester,commons-logging,junit"
-
-EANT_BUILD_TARGET="compile"
-EANT_EXTRA_ARGS="-Dskip.download=true"
-
-src_compile() {
-	java-pkg-2_src_compile
-	jar -cf ${PN}.jar -C target/classes/ . || die "Could not create jar."
-
-	if use test ; then
-		eant compile.tests ${EANT_EXTRA_ARGS} -Dgentoo.classpath="$(java-pkg_getjars --build-only --with-dependencies ${EANT_TEST_GENTOO_CLASSPATH})"
-		jar -cf ${PN}-test.jar -C target/tests/ . || die "Could not create test jar."
-	fi
-}
-
-# Missing test suite org.apache.commons.validator.ValidatorTestSuite; therefore, tests can't be ran.
-# See https://issues.apache.org/jira/browse/VALIDATOR-323 for a bug report about this.
-RESTRICT="test"
-
-src_test() {
-	echo "junit.jar=$(java-pkg_getjars junit)" >> build.properties
-	eant test ${EANT_EXTRA_ARGS} -Dgentoo.classpath="$(java-pkg_getjars --build-only --with-dependencies ${EANT_TEST_GENTOO_CLASSPATH}):${PN}.jar:${PN}-test.jar"
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-
-	dodoc NOTICE.txt RELEASE-NOTES.txt
-
-	# Docs are no longer generated, as they have commented them out;
-	# probably on purpose, since this is the start of a new branch.
-	# use doc && java-pkg_dojavadoc dist/docs/apidocs
-	use examples && java-pkg_doexamples src/example
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/commons-validator/commons-validator-1.4.1.ebuild b/dev-java/commons-validator/commons-validator-1.4.1.ebuild
deleted file mode 100644
index a7f4bcc21ed6..000000000000
--- a/dev-java/commons-validator/commons-validator-1.4.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="examples source test" # doc
-
-inherit java-pkg-2 java-ant-2
-
-MY_P=${P}-src
-
-DESCRIPTION="Commons component to validate user input, or data input"
-HOMEPAGE="http://commons.apache.org/validator/"
-SRC_URI="mirror://apache/commons/validator/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-RDEPEND=">=virtual/jre-1.6
-	>=dev-java/commons-digester-1.6:0
-	>=dev-java/commons-collections-3.1:0
-	>=dev-java/commons-logging-1.0.4:0
-	dev-java/commons-beanutils:1.7"
-
-DEPEND=">=virtual/jdk-1.6
-	test? ( dev-java/junit:0 )
-	${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
-	epatch "${FILESDIR}"/validator-1.4.build.xml.patch
-
-	JAVA_ANT_CLASSPATH_TAGS="javac java" java-ant_rewrite-classpath
-
-	echo "commons-digester.jar=$(java-pkg_getjars commons-digester)" >> build.properties
-	echo "commons-beanutils.jar=$(java-pkg_getjars commons-beanutils-1.7)" >> build.properties
-	echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties
-	echo "commons-collections.jar=$(java-pkg_getjars commons-collections)" >> build.properties
-}
-
-EANT_JAVA_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-collections"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},commons-digester,commons-logging,junit"
-
-EANT_BUILD_TARGET="compile"
-EANT_EXTRA_ARGS="-Dskip.download=true"
-
-src_compile() {
-	java-pkg-2_src_compile
-	jar -cf ${PN}.jar -C target/classes/ . || die "Could not create jar."
-
-	if use test ; then
-		eant compile.tests ${EANT_EXTRA_ARGS} -Dgentoo.classpath="$(java-pkg_getjars --build-only --with-dependencies ${EANT_TEST_GENTOO_CLASSPATH})"
-		jar -cf ${PN}-test.jar -C target/tests/ . || die "Could not create test jar."
-	fi
-}
-
-# Missing test suite org.apache.commons.validator.ValidatorTestSuite;
-# therefore, tests can't be run.
-
-# See https://issues.apache.org/jira/browse/VALIDATOR-323 for a bug report about this.
-RESTRICT="test"
-
-src_test() {
-	echo "junit.jar=$(java-pkg_getjars junit)" >> build.properties
-	eant test ${EANT_EXTRA_ARGS} -Dgentoo.classpath="$(java-pkg_getjars --build-only --with-dependencies ${EANT_TEST_GENTOO_CLASSPATH}):${PN}.jar:${PN}-test.jar"
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-
-	dodoc NOTICE.txt RELEASE-NOTES.txt
-
-	# Docs are no longer generated, as they have commented them out;
-	# probably on purpose, since this is the start of a new branch.
-	# use doc && java-pkg_dojavadoc dist/docs/apidocs
-	use examples && java-pkg_doexamples src/example
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/commons-validator/commons-validator-1.7.ebuild b/dev-java/commons-validator/commons-validator-1.7.ebuild
new file mode 100644
index 000000000000..b71d4a85a4b9
--- /dev/null
+++ b/dev-java/commons-validator/commons-validator-1.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://artfiles.org/apache.org//commons/validator/source/commons-validator-1.7-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-validator-1.7.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-validator:commons-validator:1.7"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Commons component to validate user input, or data input"
+HOMEPAGE="https://commons.apache.org/proper/commons-validator/"
+SRC_URI="mirror://apache/commons/validator/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+# Common dependencies
+# POM: pom.xml
+# commons-beanutils:commons-beanutils:1.9.4 -> >=dev-java/commons-beanutils-1.9.4:1.7
+# commons-collections:commons-collections:3.2.2 -> >=dev-java/commons-collections-3.2.2:0
+# commons-digester:commons-digester:2.1 -> >=dev-java/commons-digester-2.1:2.1
+# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
+
+CDEPEND="
+	dev-java/commons-beanutils:1.7
+	dev-java/commons-digester:2.1
+	dev-java/commons-logging:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.13 -> >=dev-java/junit-4.13.1:4
+# test? org.apache.commons:commons-csv:1.6 -> dev-java/commons-csv:0
+# test? org.bitstrings.test:junit-clptr:1.2.2 -> dev-java/junit-clptr:0
+#
+# restricting for compilation to jdk 1.8 just because of tests which
+# are not adjusted by upstream for jdk 11, otherwise the package works fine with jdk 11
+
+DEPEND="${CDEPEND}
+	virtual/jdk:1.8
+	test? (
+		dev-java/commons-csv:0
+		dev-java/junit-clptr:0
+	)
+"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-digester-2.1,commons-logging"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="commons-csv,junit-4,junit-clptr"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
diff --git a/dev-java/commons-validator/files/validator-1.4.build.xml.patch b/dev-java/commons-validator/files/validator-1.4.build.xml.patch
deleted file mode 100644
index 579832bb4a09..000000000000
--- a/dev-java/commons-validator/files/validator-1.4.build.xml.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- build.xml.o	2006-10-21 18:12:49.000000000 +0200

-+++ build.xml	2006-10-21 18:29:18.000000000 +0200

-@@ -204,7 +205,7 @@

-   </target>

- 

- 

--  <target name="compile" depends="static"

-+  <target name="compile" depends="prepare"

-    description="Compile shareable components">

-     <javac  srcdir="${source.home}"

-            destdir="${build.home}/classes"

-@@ -278,7 +279,7 @@

-     </exec>

-   </target>

- 

--  <target name="javadoc" depends="compile, javadoc.js"

-+  <target name="javadoc" depends="compile"

-    description="Create component Javadoc documentation">

-     <javadoc sourcepath="${source.home}"

-                 destdir="${dist.home}/docs/apidocs"

diff --git a/dev-java/commons-validator/metadata.xml b/dev-java/commons-validator/metadata.xml
index 2444066aa02b..0bb1954fb41e 100644
--- a/dev-java/commons-validator/metadata.xml
+++ b/dev-java/commons-validator/metadata.xml
@@ -1,8 +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>
-	<name>Java</name>
-</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://issues.apache.org/jira/projects/VALIDATOR/issues/</bugs-to>
+		<changelog>http://commons.apache.org/proper/commons-validator/changes-report.html</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest
index 38ea998e40ba..53f2e92efa58 100644
--- a/dev-java/gson/Manifest
+++ b/dev-java/gson/Manifest
@@ -1,3 +1,5 @@
 DIST gson-parent-2.7.tar.gz 437390 BLAKE2B 596331eb829797ecb172c55bef3bca0710c1461f504d1ff6170f332c3a77fbe8cf79b85b8ca16867040b86c46d6dcef09b0bf29d213fa82dfb911feeeeff57eb SHA512 663365566234bff0a94eac6ad4cd6e772b8fd542af2cccba2c2f75081935247eebf1a2502d5ce5dd0a0e75e140e17a689880a3aa04fa7c47a1e7bc834edd415e
+DIST gson-parent-2.8.7.tar.gz 391617 BLAKE2B 2c0fa3927d44c4a5c961518955dfbe6fee60dd61026002d0152d25d6f22dd4ac08b4323256af1053d0f17ef5d9f2a2a3ee86cedebd52a112d258e8c8c37e545d SHA512 044032b24ec1198d054807ccbfd91301307992b6e7d03a2e8578be79a2cdb28ba0ba57a954f11ad43022ec696c1522d242ed6b1045f831c9a370e0621e674fe0
 EBUILD gson-2.7-r1.ebuild 571 BLAKE2B 4822c5d75ea5822d20a3b48e6ccd64e792efa32a2810fc1ccc88f430d5183b7b9a756744a8239d74a3fa3b550707ba9fe7d43d9180ae56638d814b4f1d76e1a3 SHA512 76945946101257ecfbef0c3cf97a3badc2a3e15a9def7e863a551b8ecd52f323fe8b2fdf7a4f4bf912a5d35503a5eefb0c7a71a658567b02d40f9767bf6d9fed
+EBUILD gson-2.8.7.ebuild 1122 BLAKE2B fe36a3255c95238213b909258c3b160d27e09629d14838d6684a3a4db273021434db1cf994093ff6134ee910c030d771ebaab45c045691a8696c4fc27d234f42 SHA512 e7a387f35ade78894858f138ce01e8e3e47a60e6506e7558a7fabd037eb46cac7759de4ffed37da345c94997e0e8abb911459b1ed37f674e2afa619b5476a721
 MISC metadata.xml 629 BLAKE2B 4e0b0c0f59d898923ef06924e2de1e5bab0cfed3ac891d739ddb16641f927ab878bcea986020c95d8c535114ec232260ddcba2e4100e0a6ff0d92284c66d73ba SHA512 66089434169cfb86acf2e024d61e4cbe90022350223111589d72de9301a6dfc2f3a66596e2e9e4ec4e91ec70932b3aa9ac0fb130f6c1a7ed47efd2e6b81fef76
diff --git a/dev-java/gson/gson-2.8.7.ebuild b/dev-java/gson/gson-2.8.7.ebuild
new file mode 100644
index 000000000000..af292bcfcff5
--- /dev/null
+++ b/dev-java/gson/gson-2.8.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom gson/pom.xml --download-uri https://github.com/google/gson/archive/gson-parent-2.8.7.tar.gz --slot 2.6 --keywords "~amd64 ~ppc64 ~x86" --ebuild gson-2.8.7.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.google.code.gson:gson:2.8.7"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Gson JSON library"
+HOMEPAGE="https://github.com/google/gson/gson"
+SRC_URI="https://github.com/google/${PN}/archive/${PN}-parent-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.6"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${PN}-${PN}-parent-${PV}/${PN}"
+
+JAVA_SRC_DIR=(
+	"src/main/java"
+	"src/main/java-templates"
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	default
+	sed -i "s/\${project.version}/${PV}/g" src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java || die "Failed to set version"
+}
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 9dc9ffd822b9..23eb0daa5d3f 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -24,6 +24,6 @@ DIST icedtea-3.19-shenandoah-3.19.0.tar.xz 7286788 BLAKE2B d1df26c9c25930a19ad1a
 DIST icedtea-3.19.0.tar.xz 1568996 BLAKE2B 0ded447c674aa5dbfba690652de474b13f2107c221e0a7a9d98912ac374efbd44093c482abc5e4d4dcde0f9712020d8bdd9de98b347145217e719edf801e9afc SHA512 27d7c4c8e025a2c9320c0a47f3c521f51b49bf55d021c7a08aea9b7cb3d522cfc3e10d438b837669eeb5d427e950e7643c5ce4f817567d5e9fe39b56cdce8835
 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
-EBUILD icedtea-3.18.0.ebuild 12385 BLAKE2B 1dd24c16d4c280249ce3adbc183b347318ed7f101fadfd11a04031a31e2957b0df438882bc200b6d8837358ab5f1cb7cf554b6fb666c5ded4fc1377d49b9158c SHA512 3dfaf9dd4bd5a7dd54ec71061561d94706ad27ec923aaf1e510a51b19b242a1fcad5d6b05f3cf5d90e599a6819b9ff1cb24eb80c26bf40eb359a1b723ee39f5e
-EBUILD icedtea-3.19.0.ebuild 12385 BLAKE2B 1dd24c16d4c280249ce3adbc183b347318ed7f101fadfd11a04031a31e2957b0df438882bc200b6d8837358ab5f1cb7cf554b6fb666c5ded4fc1377d49b9158c SHA512 3dfaf9dd4bd5a7dd54ec71061561d94706ad27ec923aaf1e510a51b19b242a1fcad5d6b05f3cf5d90e599a6819b9ff1cb24eb80c26bf40eb359a1b723ee39f5e
-MISC metadata.xml 2108 BLAKE2B 3160040a91a46f2b5dc9be02405ad35849b5c02ddfae81a17ec47a15bd9103cb17bcd0c1065a660e3ffcd4e8d815fffab4c020d3dfbe5e9936826bb15072e00d SHA512 fdcb8411daaabf953bbb75d8b58137ab1f7a3755a1c016ba431ab366177eb91e9cef365fc921d989384f076c589fc46358838d4a4c86cd50955cfcfc9b97dd74
+EBUILD icedtea-3.18.0.ebuild 12385 BLAKE2B 0aa3430a85e5f4f5526cbe2324682e9618d581485ac85fac44ab5df18a5b743bfdbdee9b00e75284020cec934d7c262cc31d83e586697de7ccfb02a3e7f489d3 SHA512 18177e66557a2eefb7395848ddd5698c2a4eced1954a37e5bedcdbc0152d9b0dac83d78862d934c14ad0b3845b782ba8b93dd4227c585f2a7b10f4b0e8d2812a
+EBUILD icedtea-3.19.0.ebuild 12385 BLAKE2B 0aa3430a85e5f4f5526cbe2324682e9618d581485ac85fac44ab5df18a5b743bfdbdee9b00e75284020cec934d7c262cc31d83e586697de7ccfb02a3e7f489d3 SHA512 18177e66557a2eefb7395848ddd5698c2a4eced1954a37e5bedcdbc0152d9b0dac83d78862d934c14ad0b3845b782ba8b93dd4227c585f2a7b10f4b0e8d2812a
+MISC metadata.xml 2108 BLAKE2B ebfe992629c0864c55bcac76e2c215b2a5fd7a436ce56375332d978f8fc4e6f748c0dc877821f0df67c59930846e1e1b2776872360fe1dae1066913c5b7e16bc SHA512 bf65b212b724c26184f57b4141e383f81a8f0c7610368760ff623ab4556f5de0f9cd4df233f57021ff96d07ab13b4834bbb56dc43d2373bfabfd5b02cf3f60e7
diff --git a/dev-java/icedtea/icedtea-3.18.0.ebuild b/dev-java/icedtea/icedtea-3.18.0.ebuild
index 505db1a198f0..8adf0db21c72 100644
--- a/dev-java/icedtea/icedtea-3.18.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.18.0.ebuild
@@ -69,7 +69,7 @@ LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 M
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 IUSE="+alsa cacao +cups doc examples +gtk headless-awt
-	jamvm +jbootstrap kerberos pax_kernel +pch
+	jamvm +jbootstrap kerberos pax-kernel +pch
 	pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test zero"
 
 RESTRICT="!test? ( test )"
@@ -152,7 +152,7 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_
 	sys-apps/lsb-release
 	x11-libs/libXt
 	virtual/pkgconfig
-	pax_kernel? ( sys-apps/elfix )"
+	pax-kernel? ( sys-apps/elfix )"
 
 PDEPEND="pulseaudio? ( dev-java/icedtea-sound )"
 
@@ -330,7 +330,7 @@ src_configure() {
 		$(use_enable doc docs) \
 		$(use_enable kerberos system-kerberos) \
 		$(use_enable system-lcms) \
-		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+		$(use_with pax-kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
 		$(use_enable sctp system-sctp) \
 		$(use_enable smartcard system-pcsc) \
 		${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
diff --git a/dev-java/icedtea/icedtea-3.19.0.ebuild b/dev-java/icedtea/icedtea-3.19.0.ebuild
index 505db1a198f0..8adf0db21c72 100644
--- a/dev-java/icedtea/icedtea-3.19.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.19.0.ebuild
@@ -69,7 +69,7 @@ LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 M
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 IUSE="+alsa cacao +cups doc examples +gtk headless-awt
-	jamvm +jbootstrap kerberos pax_kernel +pch
+	jamvm +jbootstrap kerberos pax-kernel +pch
 	pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test zero"
 
 RESTRICT="!test? ( test )"
@@ -152,7 +152,7 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_
 	sys-apps/lsb-release
 	x11-libs/libXt
 	virtual/pkgconfig
-	pax_kernel? ( sys-apps/elfix )"
+	pax-kernel? ( sys-apps/elfix )"
 
 PDEPEND="pulseaudio? ( dev-java/icedtea-sound )"
 
@@ -330,7 +330,7 @@ src_configure() {
 		$(use_enable doc docs) \
 		$(use_enable kerberos system-kerberos) \
 		$(use_enable system-lcms) \
-		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+		$(use_with pax-kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
 		$(use_enable sctp system-sctp) \
 		$(use_enable smartcard system-pcsc) \
 		${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index 18643722fecb..e45709af55fd 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -27,7 +27,7 @@
 		<flag name="jamvm">Use the JamVM virtual machine rather than HotSpot.</flag>
 		<flag name="jbootstrap">If possible, recompile the final IcedTea executables with itself.</flag>
 		<flag name="kerberos">Link against Kerberos in order to obtain the cache location.</flag>
-		<flag name="pax_kernel">Apply patch needed for pax enabled kernels.</flag>
+		<flag name="pax-kernel">Apply patch needed for pax enabled kernels.</flag>
 		<flag name="pch">Build using pre-compiled headers.</flag>
 		<flag name="sctp">Build the SCTP NIO channel implementation against lksctp</flag>
 		<flag name="shenandoah">Include the Shenandoah ultra-low pause time garbage collector (-XX:+UseShenandoahGC) (arm64 and x86_64 only)</flag>
diff --git a/dev-java/junit-clptr/Manifest b/dev-java/junit-clptr/Manifest
new file mode 100644
index 000000000000..616983c1538c
--- /dev/null
+++ b/dev-java/junit-clptr/Manifest
@@ -0,0 +1,3 @@
+DIST junit-clptr-1.2.2-sources.tar.gz 11418 BLAKE2B 9089cb4ce38ac4318ff7a26db978a1b1a9bf70d4efd4c35e94a88a312d05100cd53a2ebe7b162885904e0cec04a513393e3e5a137ec3ecba684b70653cef22e6 SHA512 28400aca95686d67bb81c7ce8fd0bd2804ec33cabc86aceb01cbb2fd42d89b3c4b4c5f3a1670ecd3d0b486a087ebbd3e7b41fd18061c0653246b17bae557032d
+EBUILD junit-clptr-1.2.2.ebuild 1143 BLAKE2B 8d6f25accab6c8c20ec234df3558d760a00a527e695378ede46f7333771e44a6f34088644cf032d72d0c2a0e1342d95ce5b2868f634c7bb512d480e348c4cf65 SHA512 b4a367579e8021bc3fb25f3915a80970936590b2c23eb322556aaac6babee5605eed63c618ba41680e93025de2605e17caf693fc436e8a432a4cf934fa20da8b
+MISC metadata.xml 413 BLAKE2B 9c720110ecbcb5f41f31cbc8b745cc430c4dba85ae48956cfe56ec55fb700e1ae60e2fb1b25f417270e85a327d8a1d8ba38dc79d2f6d85a920189fae5a014138 SHA512 e54984d68b89a2bfb28f4c4fcc210bdd5394dd4d2a75a647d2b7e3c84fb5119d03248ce0ca609b62dd6201bdfe977394b67a8b23d6043f5103e64a14ffecce9f
diff --git a/dev-java/junit-clptr/junit-clptr-1.2.2.ebuild b/dev-java/junit-clptr/junit-clptr-1.2.2.ebuild
new file mode 100644
index 000000000000..9a946560a51c
--- /dev/null
+++ b/dev-java/junit-clptr/junit-clptr-1.2.2.ebuild
@@ -0,0 +1,45 @@
+# 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/bitstrings/junit-clptr/archive/refs/tags/1.2.2.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild junit-clptr-1.2.2.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.bitstrings.test:junit-clptr:1.2.2"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="ClassLoader per Test runner for JUnit 4.12+ based on myfaces-test \"TestPerClassLoaderRunner\"."
+HOMEPAGE="http://nexus.sonatype.org/oss-repository-hosting.html/junit-clptr"
+SRC_URI="https://github.com/bitstrings/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}-sources.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+# Common dependencies
+# POM: pom.xml
+# junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
+
+CDEPEND="
+	dev-java/junit:4
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}
+"
+
+S="${WORKDIR}/${P}"
+
+JAVA_GENTOO_CLASSPATH="junit-4"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS=(
+	"src/main/resources"
+)
diff --git a/dev-java/junit-clptr/metadata.xml b/dev-java/junit-clptr/metadata.xml
new file mode 100644
index 000000000000..4db8151c43f1
--- /dev/null
+++ b/dev-java/junit-clptr/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>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/bitstrings/junit-clptr/issues</bugs-to>
+		<changelog>https://github.com/bitstrings/junit-clptr/commits/master</changelog>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index c6d74ee328c4..e6f82b6ed5b6 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -9,6 +9,6 @@ EBUILD protobuf-java-3.16.0.ebuild 1454 BLAKE2B 72947e022e40f1584a085c0b04a4d14f
 EBUILD protobuf-java-3.17.0.ebuild 1454 BLAKE2B 8677e5ec0fdc53308a9a219ba1ffd719112e46075f6c376a1d88c542039559173bd9a7b7e386021a78e3ea0c41a66af2effb263d8cb6ff11a4da851a2d7d5dd1 SHA512 125deb6bfb83d79ae3f6169c92ab9d17ea0c4c5f47123024e418811a1460c2c8e96e872c340c19b43991d9b566c5fac5a422278e15944b14cf5a7a6e73610575
 EBUILD protobuf-java-3.17.1.ebuild 1454 BLAKE2B 8677e5ec0fdc53308a9a219ba1ffd719112e46075f6c376a1d88c542039559173bd9a7b7e386021a78e3ea0c41a66af2effb263d8cb6ff11a4da851a2d7d5dd1 SHA512 125deb6bfb83d79ae3f6169c92ab9d17ea0c4c5f47123024e418811a1460c2c8e96e872c340c19b43991d9b566c5fac5a422278e15944b14cf5a7a6e73610575
 EBUILD protobuf-java-3.17.2.ebuild 1454 BLAKE2B 8677e5ec0fdc53308a9a219ba1ffd719112e46075f6c376a1d88c542039559173bd9a7b7e386021a78e3ea0c41a66af2effb263d8cb6ff11a4da851a2d7d5dd1 SHA512 125deb6bfb83d79ae3f6169c92ab9d17ea0c4c5f47123024e418811a1460c2c8e96e872c340c19b43991d9b566c5fac5a422278e15944b14cf5a7a6e73610575
-EBUILD protobuf-java-3.17.3.ebuild 1454 BLAKE2B 8677e5ec0fdc53308a9a219ba1ffd719112e46075f6c376a1d88c542039559173bd9a7b7e386021a78e3ea0c41a66af2effb263d8cb6ff11a4da851a2d7d5dd1 SHA512 125deb6bfb83d79ae3f6169c92ab9d17ea0c4c5f47123024e418811a1460c2c8e96e872c340c19b43991d9b566c5fac5a422278e15944b14cf5a7a6e73610575
+EBUILD protobuf-java-3.17.3.ebuild 1451 BLAKE2B 4d08dcb9be366902af79f53bf8cb388ed2fd61192406ccca8089147f3854cef4e9d6824482dc2f35209cfe305e1ac69d1be790eeac87365aefd550c0a9d215ea SHA512 6804911a2b3167a7eb0889b4f7da071c97ec2b7aca9adb613679905f6ae3abb391caefbf3737a5ec30e7aef4ecd9a817df05b7ac16d95f893d4b6cce853cb89c
 EBUILD protobuf-java-9999.ebuild 1389 BLAKE2B 3ed9ebe10fa9926d513e6f9367c6054cea58b33f007cc4250d251376c2a69b0e9aa305dfa88c7db109ce3262d0563d345ba4bdda98e004cf2ffdb699bf81eca9 SHA512 b8df11ef1583f01bb9633e67e5c6aa9b89782a0e42a15c94d5d826926887b45a068b8ef563ba08ded7c14ae1ddafc6f36dab761d607fcbb7122195b41d2edf67
 MISC metadata.xml 549 BLAKE2B 3b081008d6ff92b24f670c1b8861400871454e96c5f0ca170c3825d6dda8d356f341fbfad7b5a9f330a7f9891d0e3b91a9f4842c480ee8a74f6aaf371884dcc2 SHA512 37ecf8aa151f5d08443a07c40188ec7061947a06453e39d07fa9b0da0cbeb2ccb76e517e7e2c2e3a2afe07874c817cf644dcd8775ad78f18b5f55496bc198b72
diff --git a/dev-java/protobuf-java/protobuf-java-3.17.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.17.3.ebuild
index d24b960991a9..9f9368560137 100644
--- a/dev-java/protobuf-java/protobuf-java-3.17.3.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.17.3.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/28"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 BDEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/xpp2/Manifest b/dev-java/xpp2/Manifest
index 0230a78c73b5..d27ede6a9611 100644
--- a/dev-java/xpp2/Manifest
+++ b/dev-java/xpp2/Manifest
@@ -1,4 +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-r3.ebuild 1766 BLAKE2B d1c35f7eba0510c1a89781cc9dd2d6407eb070bef990786e485a71be119a730d6f8f9800afbb124caaaed2c1f5c619b680f2c916ccb78f84e2ca64dc37f18f35 SHA512 c37dd9b0c3fadb9b37567ece77598565eb70d75ef045925f99255c77c15e26b8b5dbe8e5d1c23ab1f32f14d555d3d3980bfaa4ddb6b50f628cb988ba3853039e
+EBUILD xpp2-2.1.10-r3.ebuild 1882 BLAKE2B fd1f4f1cb34965b371bfe90ccec14f7089d695382c4472c565ee70bd25f7b402fecbf65272259559c691be7624d6681ebf232b278fe18a6a06b72cb250666390 SHA512 5ed2ce7f2b7f9dcc68cb2454820d90b041a00091bbfd6c74bb183793a346c2e1f04cfb861dbee568d6634bc1cee269f4d493d8b903f92399ae2b78c327d71a2b
 MISC metadata.xml 458 BLAKE2B 5a23e3b43da0a680538428c1cbd29dc6555459408a7d9520410a5da0f904cd9bfc1864e27b7f3aae2a94afca4c0f276c5cdaf09612a77759a64b7fb0c2f345ed SHA512 9004485c7ad032ec1f11aa89e7bc286f52d45f3886cca36912d12891f409d6d70cff063cf3790b7e05f4e280e1a953987dab155feecea461d5a3ff5cea0a430a
diff --git a/dev-java/xpp2/xpp2-2.1.10-r3.ebuild b/dev-java/xpp2/xpp2-2.1.10-r3.ebuild
index db77c7e64ae0..8874e74bb93b 100644
--- a/dev-java/xpp2/xpp2-2.1.10-r3.ebuild
+++ b/dev-java/xpp2/xpp2-2.1.10-r3.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="pull-parser:pull-parser:2"
 
 inherit java-pkg-2 java-ant-2
 
@@ -10,8 +12,8 @@ MY_PN="PullParser"
 MY_P="${MY_PN}${PV}"
 
 DESCRIPTION="A streaming pull XML parser used to quickly process input elements"
-HOMEPAGE="http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html"
-SRC_URI="http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/${MY_PN}2/${MY_P}.tgz"
+HOMEPAGE="https://web.archive.org/web/20130904163229/http://www.extreme.indiana.edu/xgws/xsoap/xpp/xpp2/"
+SRC_URI="https://web.archive.org/web/20130904173708/http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/${MY_P}.tgz"
 
 LICENSE="Apache-1.1 IBM"
 SLOT="0"