gentoo resync : 11.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-11 19:55:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-11 19:55:43 +0100
commit: 185fa19bbf68a4d4dca534d2b46729207a177f16 (patch)
tree: a8a537b82fda83a0799c2ca9887f212558363aa7 /dev-java
parent: c8fd0d84af0bfd1949542adc2cbb735b1d28f9ed (diff)
35 files changed, 154 insertions, 518 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 1f7e15771fcd..d02bb438d885 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/apache-rat-core/Manifest b/dev-java/apache-rat-core/Manifest
index c9a5d40a25da..93ea642d9eb5 100644
--- a/dev-java/apache-rat-core/Manifest
+++ b/dev-java/apache-rat-core/Manifest
@@ -1,4 +1,4 @@
 AUX apache-rat-core-0.13-commons-lang3.patch 1813 BLAKE2B 6351b49b0155381902ac2585014ce1c5775444ce2d1fe1292ca9e995316596210ee8afa41603f656c4f02565489231905bb4b157f1fdbcf0e993a9cd40c2dcf4 SHA512 ef0863a0954f47196f45b2ea2a8eb1bf06556535c19b39c5cd7cfee72605dc63f7a3bfa1e1613336b3a357578ab8e419c431a7a41261ab6cda236ebe7adc2567
 DIST apache-rat-0.13-src.tar.bz2 197443 BLAKE2B 5880894bf48e62c97fefebe5672964a78016ba045ca6a13a9b100c1a15cf0a6933edc22c41cb3552f30ebea0486fd6b415f60902f0af7d96663611bfef1a1781 SHA512 564cb2b0f21c98ca5c10566417c0d2732cd177efb68607589e43bcf64eeedee7a570dbea7ef4d6237f6438ecb40d382cb96bd0d6f60c1d1ba1f76778f15ee26a
-EBUILD apache-rat-core-0.13.ebuild 1990 BLAKE2B 36059c19f24974be33d9bbdb183d80e16938f731d7ea835b86982b30e6e559afbad33f48d56b9b77026023867db9b58c01a20392ef092ee166a2cdd6f853cc23 SHA512 95e1ac779a4a8420345eab705bb8403b9fe72134835e84c46553e97c915a895162c40aa70a44172263510f1acfe2e6ff87fd405502f3a6500f156dd0bb0e4d4c
+EBUILD apache-rat-core-0.13.ebuild 1995 BLAKE2B 8e29838e3292e23693b7539127c532da62233673051103a60edd14b2a22cfd49149af18415709a8678484ff2ef5afdbae54465612a81d06123b2e9d7bb8364d9 SHA512 641c440c87861578a94a9687383b688ccd8fae13ae085b5a85312deca16e76b4d61d213a93ed599cf90670843fa8faffcc32cb5155cc1b9dd56756a91901c9b7
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/apache-rat-core/apache-rat-core-0.13.ebuild b/dev-java/apache-rat-core/apache-rat-core-0.13.ebuild
index 1131e321b701..3e4f0b9bf595 100644
--- a/dev-java/apache-rat-core/apache-rat-core-0.13.ebuild
+++ b/dev-java/apache-rat-core/apache-rat-core-0.13.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://creadur.apache.org/rat/apache-rat-core/"
 SRC_URI="mirror://apache//creadur/apache-rat-${PV}/apache-rat-${PV}-src.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 # Common dependencies
 # POM: ${PN}/pom.xml
diff --git a/dev-java/apache-rat-tasks/Manifest b/dev-java/apache-rat-tasks/Manifest
index bed07b5a6a02..a42db8ccde86 100644
--- a/dev-java/apache-rat-tasks/Manifest
+++ b/dev-java/apache-rat-tasks/Manifest
@@ -1,4 +1,4 @@
 AUX apache-rat-tasks-0.13-fix-tests.patch 1850 BLAKE2B 2dbb2a5370003bfbe9f312044a557e7fadd3d38dcd093b54ab3eeaef60bb5c366ad673f862cd77d39911781847c664c99d184b68807ee95b4f3dfaa6a258019e SHA512 c3d1796144843c7da3edffccf241c79dae9b619fb83fd94ae3142b7fa52e2d01947cfe2b795b7d9ce7171926a058e758c4468a8b0454ec31215add5b0f028ad1
 DIST apache-rat-0.13-src.tar.bz2 197443 BLAKE2B 5880894bf48e62c97fefebe5672964a78016ba045ca6a13a9b100c1a15cf0a6933edc22c41cb3552f30ebea0486fd6b415f60902f0af7d96663611bfef1a1781 SHA512 564cb2b0f21c98ca5c10566417c0d2732cd177efb68607589e43bcf64eeedee7a570dbea7ef4d6237f6438ecb40d382cb96bd0d6f60c1d1ba1f76778f15ee26a
-EBUILD apache-rat-tasks-0.13.ebuild 1825 BLAKE2B 48d66e9b04468ef01b4bea43fcb61fed89a4490bdd7e278478e472f2a932d25e74cadd7bfcdf25767dcc540b798a909da69a960cbd5befec48c0f4eef06f6444 SHA512 09c771124bd48dd6164e49faf1c4c8522593ad7f69831a5f5330a11de9df6807763d0dd04e8d034d31f45f420ccb9720c571befe0ac2cf3402c5abe79b808d90
+EBUILD apache-rat-tasks-0.13.ebuild 1830 BLAKE2B 0e6bc3926726a31c7a4a1580207fc7db7ea34feca088f491ee93cfcf6557c1be68e07c9a151eb8485050ca88cb5f4187cc6f076b3c4df095cc14f26cd999ac68 SHA512 30d933fdf3904cb47f7a39186e080cf90e362b45a1713d0c9af3fc80afb0d88570e17d3925a96150fb7037036dc69f99c93143dc98fd8b2a96d80d3a55feedaa
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/apache-rat-tasks/apache-rat-tasks-0.13.ebuild b/dev-java/apache-rat-tasks/apache-rat-tasks-0.13.ebuild
index deed67e6ee11..eb400924c5c0 100644
--- a/dev-java/apache-rat-tasks/apache-rat-tasks-0.13.ebuild
+++ b/dev-java/apache-rat-tasks/apache-rat-tasks-0.13.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://creadur.apache.org/rat/apache-rat-tasks/"
 SRC_URI="mirror://apache//creadur/apache-rat-${PV}/apache-rat-${PV}-src.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 # Common dependencies
 # POM: ${PN}/pom.xml
diff --git a/dev-java/aspectj/Manifest b/dev-java/aspectj/Manifest
index 50a0b142682c..3e3870b459c1 100644
--- a/dev-java/aspectj/Manifest
+++ b/dev-java/aspectj/Manifest
@@ -1,5 +1,3 @@
-DIST aspectj-1.7.4-src.jar 7570114 BLAKE2B caa942a2414c6f1b39b881bc5abad0cd4e718b231822833756493ce389207d1d855be36f74a4c58ad5f00f7acfcd5791b4ab8e151fd0e11ac497d4f68cab2eb0 SHA512 643d457fba4d58114ee09a37007f5cf5fd40f7ff196ffc69d371d1986cbf6930567ddffd3f1af625139619a0be386e1d9c7e30d267bf53b4286e2179735299bf
 DIST aspectj-1.9.6-src.jar 8616829 BLAKE2B adc12e181b2584287dd149657f0505b2d3ba877aa3e8cea1f2fd827b4d05c24728f120798019f1679ebafe850a8e68fa3db1467ac080c27692d5f81d31aebd48 SHA512 f15416a3921ef614ab8068c8ff8277f0fd3c177e9b277ac471786953615f1fe81638b8d13d77ebfe0643fdf089ee3cd5e718d522d2e588989a42df775f2a0516
-EBUILD aspectj-1.7.4.ebuild 1259 BLAKE2B 897ff1e5eaaec08f9ac8998174b2251265c1d43373fcdfe97e2def0ab06cbfce039e1080fcc459c0eecf3c11b3022ed2f5c131fb90ef63b41e663267dead0b00 SHA512 885778f6e1ab1c66118ba3756a5369e705c464869898866e73b032014c143310bdd790a7d9bba003fb50d574ec92330afc6d99f7ea66f0213e8abf6e627bef3c
-EBUILD aspectj-1.9.6.ebuild 1174 BLAKE2B 17ae90141631e398d05186512bfbb3a1f0a71d30f2d2ce2689147760b5c5fc675d0053e49b8e00ed7025a0b64276b924a6c6719dc4a83ad399996d35855c0098 SHA512 1c4eee056643286c019d3cc70dbe07ce4133443dc41dd5e2673e5e23696346af21ffce3dc8d14158ac6ddccd070062191a44d275e0176f933ee4e60ff0bf2058
+EBUILD aspectj-1.9.6.ebuild 1173 BLAKE2B 4c8d8cbce69324c37f5063c541a0908c8e329ddb89514358dff7a864038ebea551defce25fe001a05718d8021b4159e686fcb566b1a2a485ff0f553c089a8fd8 SHA512 6817518bc3776e7df086c81155c3d8d03dc135dd3bbc4ac3f598d1cade97c3f403aebeb4c7194a556b4e721d406debeb4b4b0e0e94726cacbb33bd262d7b7819
 MISC metadata.xml 382 BLAKE2B f2aa03e9e9411d65bfd57f63e9de032ba3f48f9ee80e2ca11e2b1ebea7c7223820c75d3e1516f07e94edf4328cd44a511005636f8bead11506b934513fcc8c5e SHA512 c4581ac985534be3aba02b312bcb54c36c358db73d91a449b72d19b3e7e743ad28d50f4bc6f08eb56409f8270b601f41b5f69f18d4a392937aac577bb5515a25
diff --git a/dev-java/aspectj/aspectj-1.7.4.ebuild b/dev-java/aspectj/aspectj-1.7.4.ebuild
deleted file mode 100644
index 4a9e2ff58cd1..000000000000
--- a/dev-java/aspectj/aspectj-1.7.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A seamless aspect-oriented extension to the Java programming language"
-HOMEPAGE="http://eclipse.org/aspectj/"
-SRC_URI="http://www.eclipse.org/downloads/download.php?file=/tools/${PN}/${P}-src.jar&r=1 -> ${P}-src.jar"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CDEPEND="dev-java/asm:4
-	dev-java/commons-logging:0"
-DEPEND="${CDEPEND}
-	app-arch/zip
-	>=virtual/jdk-1.5"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-
-S=${WORKDIR}
-
-JAVA_SRC_DIR="${S}/src"
-JAVA_GENTOO_CLASSPATH="commons-logging,asm-4"
-JAVA_ENCODING="iso8859-1"
-
-src_unpack() {
-	default
-	unzip "${S}"/aspectjweaver${PV}-src.jar -d "${S}"/src/ || die
-}
-
-java_prepare() {
-	default
-
-	# needs part of BEA JRockit to compile
-	rm "${S}"/src/org/aspectj/weaver/loadtime/JRockitAgent.java || die
-	# aspectj uses a renamed version of asm:4
-	find -name "*.java" -exec sed -i -e 's/import aj.org.objectweb.asm./import org.objectweb.asm./g' {} \; || die
-	mkdir -p "${S}"/target/classes/org/aspectj/weaver/ || die
-	cp -vr "${S}"/src/org/aspectj/weaver/*.properties "${S}"/target/classes/org/aspectj/weaver/ || die
-}
diff --git a/dev-java/aspectj/aspectj-1.9.6.ebuild b/dev-java/aspectj/aspectj-1.9.6.ebuild
index 8c7f6df2776b..b1bc3636c59f 100644
--- a/dev-java/aspectj/aspectj-1.9.6.ebuild
+++ b/dev-java/aspectj/aspectj-1.9.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.eclipse.org/downloads/download.php?file=/tools/${PN}/${P}-s
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CDEPEND="dev-java/asm:9
 	dev-java/commons-logging:0"
diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest
index 5b1d38807286..94b4d3b62183 100644
--- a/dev-java/commons-compress/Manifest
+++ b/dev-java/commons-compress/Manifest
@@ -3,5 +3,5 @@ AUX build.xml 11340 BLAKE2B 9a0366053069ca9d060257887cbe70a9de8e8796894975b00b0c
 DIST commons-compress-1.10-src.tar.gz 8528642 BLAKE2B 7fe3891340f8d215134c6926711dabe139cc978560c1c92739a755d69f8f99503e3aa7f8b9a5728922e11109ee196f27ae04a03e26e009a61415d5df2bba975e SHA512 1eee157134d861f49b735df02f028781ef86370d7d246cb8fbfc1f445427d5cdd753a9df7a78e760d53667c43ab5c37df315a1e36e845e5d308961ebe138d910
 DIST commons-compress-1.20-sources.tar.gz 12990994 BLAKE2B 5709419bc7b54ac9eee4ee9a42f2ecef9ae7ed0d4b1a91e0b79c791f4cf018aed8bff4ce507d1ef9136fdc28bd550d234632d0bb9ebe7819b57c5ce99694adb6 SHA512 1794bae69e00339d9e4d35b3276543ff6f9a0f1614ec9bd7c4ec8ff1bc86d08cd48e9dc3ec712b969cf8ccd61ef6054d0c6203d7cba0c28b22e6a3ecccd0c43e
 EBUILD commons-compress-1.10.ebuild 1498 BLAKE2B 753e2e3e8cc14f90ccadcdfc82f73dc5af6d54d7db6ad81b28465c235895325119df88e03028b214427a6642c05aa4b8b4554a5572dcf71dceebdb61bfef42a9 SHA512 0a172dfe3c1026925fd92418085c1324e9fae506f85917e84fee68d9ee4fb38d38c8019c7730157deb2e3fea7ab241296ff74787be3e5a23c996f81267695537
-EBUILD commons-compress-1.20.ebuild 1077 BLAKE2B 9dc9af763b14ec2f2365b21b196b29280e549d43f4c0ebe63f2e0345e35037317a6a864d2758814b94c1b9c54a5c4f3ecc6d18427e63739528e42c5bd3c46b7d SHA512 2f0ce4cdadad28bf19f8c881582b954b664ede4e3c4495ef129b843de9fbce35ab911d077113618dbabdd07480b3496811663b7cae956ef4de2210881f6f1ed9
+EBUILD commons-compress-1.20.ebuild 1082 BLAKE2B 2d4fb689d8bd3fbd7963d63ea1b6a352090ae449973d62b01fb7aa47bccecdeddfd9cde1af683c64407013f3a20e863b9b42cb81f53531e5a12063f2be002ad9 SHA512 5d92f1a8c76d9e984c0398ff940527399b3fdd80e506bedcbbbf174ddc5f0c2dad9725d3964bf1147811e3434b710cad76181d65bfdd413429b97deeb3bba054
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-compress/commons-compress-1.20.ebuild b/dev-java/commons-compress/commons-compress-1.20.ebuild
index dd5d1067aff2..111044934f93 100644
--- a/dev-java/commons-compress/commons-compress-1.20.ebuild
+++ b/dev-java/commons-compress/commons-compress-1.20.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-compress/"
 SRC_URI="https://mirrors.supportex.net/apache//commons/compress/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 CDEPEND="
 	dev-java/brotli-dec:0
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index a58fe775813d..8f407747db70 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1,6 +1,5 @@
 AUX commons-logging-1.2-gentoo.patch 825 BLAKE2B 154927ebbda77a76007fe9b448fc2801404717fa933002a69916b9a0558af82b0172039ef294ba01b4cb98bcc93bf40b54681d4c2343e4a404e58772e8a8585d SHA512 1886a28bbccf0f8aa42a147628aeac444a672cb3dc006604088a67d536c376a03781b22394770c580d80c5616569b751e63c91d86cbff6f5caa47100897cd027
 AUX commons-logging-1.2-servletapi.patch 1783 BLAKE2B 5f8bc256542335b5d955d998ef2ee49d8becca46b367ba0ac1152f68ea4fccc226afcd2475331cf292c3f0f11471052e6917c9508a6737c6482c556c2ec87363 SHA512 bf2f0aca771b7278f2d80ae3c149492040c137c1ab190513fd9894fad315f75e4b0423f65a5ffaff04faed3f7256728b5f474cfbe0aefc2a53d60337a6344d39
 DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
-EBUILD commons-logging-1.2-r1.ebuild 2200 BLAKE2B 00edbc2be3dbf082669f84234fb6e198f6f0209e3b668e227294e25632eafafdc242fce9b56d6cde269bfa2bab3e9110ee5d5d8dd99d268ad11257e144cfd095 SHA512 e3501a786040b5db5d6b323edfc80e8bfab2b9347a8dd3303fe874ad4f05e62ce7f27e723aeec8f25dedf7e5525a6cabd1f43f6169f0efe58b8366c917121e4b
-EBUILD commons-logging-1.2-r3.ebuild 2353 BLAKE2B 6d9d08371ee42a3707b8aea82abe37a994038dd0f4790330aaf099aa506803fac9e67aa0cb0d96ff20c56f997a4734c8bc5a4e4f74a2c006d7bd076ab56b8e68 SHA512 6c883de9c872c96bc33c8d1b5d0772603524f7d8905388c4c6871df6ddd1f4dd4aaf79bd3f7876f5156490b69457ce51028a39cb4b031f3dc6335ab866abc218
+EBUILD commons-logging-1.2-r3.ebuild 2352 BLAKE2B ad555871569da38ea2a881bb9320d8d8611292d20e7e93c6724d5fc37d25ebb163b5038d64919a98d6224ca29c235cc3ac7ec13d07588f682ca5f1f4bb964b1a SHA512 4f61d2a39de676f9498444ca339ab833f02b311e9d7058b35b68a62fc0e2f1e6a6428d25d9fbf3ca9110f51375cf2959996d1f29d1c02a042d02493d65623e8c
 MISC metadata.xml 551 BLAKE2B c48c3681129ce8ab7a497385bc3bed8a16ca0f5f4557ebda30565db471b25fea1b6c48ad43a470cf27930a0b2dc3a282242600aee3f60eff66291e6d0c80491f SHA512 1ea71763a6890b1f01fb357a7427b99bcb4918eb87290997e61918808daea37dab371b7fd5b6fee114104b2ee4445e022c0f090a2a58017a3d8b755f8dfcd5bd
diff --git a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
deleted file mode 100644
index 890c4bea49ac..000000000000
--- a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 java-osgi
-
-DESCRIPTION="An ultra-thin bridge between different Java logging libraries"
-HOMEPAGE="https://commons.apache.org/logging/"
-SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="avalon-framework avalon-logkit log4j servletapi test"
-RESTRICT="!test? ( test ) !servletapi? ( test )"
-
-CDEPEND="avalon-framework? ( dev-java/avalon-framework:4.2 )
-	avalon-logkit? ( dev-java/avalon-logkit:2.0 )
-	log4j? ( dev-java/log4j:0 )
-	servletapi? ( java-virtuals/servlet-api:3.1 )"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6
-	test? ( dev-java/ant-junit:0 )"
-
-S="${WORKDIR}/${P}-src"
-
-EANT_BUILD_TARGET="compile"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="yes"
-
-java_prepare() {
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	# patch to make the build.xml respect no servletapi
-	epatch "${FILESDIR}/${P}-servletapi.patch"
-
-	# bug #208098
-	echo "jdk.1.4.present=true" > build.properties
-
-	use avalon-framework && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties
-	use avalon-logkit && echo "logkit.jar=$(java-pkg_getjars avalon-logkit-2.0)" >> build.properties
-	use log4j && echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties
-	use servletapi && echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-3.1 servlet-api.jar)" >> build.properties
-}
-
-src_install() {
-	local pkg=org.apache.commons.logging
-	java-osgi_newjar "target/${P}.jar" "${pkg}" "Apache Commons Logging" "${pkg};version=\"${PV}\", ${pkg}.impl;version=\"${PV}\""
-	java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
-	java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
-
-	dodoc RELEASE-NOTES.txt
-	dohtml PROPOSAL.html
-	use doc && java-pkg_dojavadoc target/docs/
-	use source && java-pkg_dosrc src/main/java/org
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
diff --git a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
index 0b487ad920db..adffeb36c057 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="avalon-framework avalon-logkit log4j servletapi test"
 RESTRICT="!test? ( test ) !servletapi? ( test )"
 
diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index cc8457e5fa9c..90a3aa24f546 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -3,6 +3,6 @@ DIST jaxen-1.1.4-src.tar.gz 268493 BLAKE2B ff51cf3b6507f19549ab864fa4cd53d0b2d0c
 DIST jaxen-1.1.6.jar 409677 BLAKE2B 55e03939420c103fb5a6d323595ff0cb7653885eb9ba233fd581c5376d2ac90eecde7aa5576f602cdc459cfd9ba9e79c6bb5bfab3ed7805e717a21670a5748ee SHA512 979044fe959493eb6d66fa92b420251cd9c12414051ff6956d5835888a8999d4f337c18646c53806fc19203cef744f53b7597850cd2f695910c90df7a9725b48
 DIST jaxen-1.2.0.tar.gz 282829 BLAKE2B 4d89d4fd3dfd8c4113fe7ecc05597ea9dd743d9c871f320936809016ae8cb3a3d4fb3f935de19463e6c99db1b67eff3545e909b707e81f4c0f114ec0f0e7bb97 SHA512 cecfc62eab1cf6586b28594855bd983679a932dbdc6cbdd07d85a9a9458e78b2e784dfd6287e6e87e4f4443239eefbeac59a7316dae53b818379daaccae56b53
 EBUILD jaxen-1.1.4-r1.ebuild 1082 BLAKE2B 5a63323c265e84a70008b4f44788ab50f0c370906f63d46aecd4e476b23c31aa37162b21d9d6ad950c3e59e758ffd711d204b8d8bf05fe1ee3e4076ec07d5daf SHA512 82a7a8b205958e9e81d28887c747a9731077458f213af8c30551fd9eed78cdcf9cd7e29fe385e3c9513f3421fb222c4aad8f959bc1c59d1e42da38847e3e1f0d
-EBUILD jaxen-1.1.6-r2.ebuild 863 BLAKE2B 859d58fd895b3ace5e8362ee646ab092b832c7b4e91f7cac23e14e9032fd13d34d6aa054b21dcb903d71464496138ae135dfb0ccd8028a97ccbc9f565203a571 SHA512 7ffdeaf9cde0f3c0f2129eef7c78166544abcd8f37a1d1a56eec06ba1566e9c0eacba19f812b821b3aa7241ecf9c08e519e268ac66b936285f6d4a5ea8487ef5
+EBUILD jaxen-1.1.6-r2.ebuild 862 BLAKE2B 9ff56c92543733c389227c44b32b219cc84374e96dbd1aacabe123de5d9c940862cc93e0f9822312112e93b585c10fa0905e2a5adbd8076a818e39e295f9e89b SHA512 13e3ab9d0223f7b9448e0c125d29422652b4d6298d1d4b002b1cf66a3a11e480478e03d16fed59650b97b61438a425f2e6b87e5a4eb4601e5a23daada78ee128
 EBUILD jaxen-1.2.0-r1.ebuild 1919 BLAKE2B 90a69225c4086bf95f16cb8308842f703970cdc0ebd95e354d6868d29172ec6b9af479fa3ef546f1f8432afc807643bcf2de6ea937524fd32ee26a7f10807d8b SHA512 51df4c02d9ff569fb37b2f4629f2ea9b7817fdb3030d303728401c424f0feec73528b328af05e910de5a9b7b1dee7e48cda55e5662a903a0c0272df842ef3990
 MISC metadata.xml 718 BLAKE2B 14654870dfbaef53f3fc46124c5df04970de2699ed0d3f453a1b98603dee6f805fc6018477b08ea82c01617d17969a06233c0cc1e41038dc43c5ae4ffe3d16b8 SHA512 d37502fe1c0e32f28599da74657433561cddb87d15b80c3fe05242cbb0032a7abcb04180890126f89ff5c30b39f9614b1eb255bce7af01ca51eda3807902aafa
diff --git a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
index 5f921311ff48..90a7eed0092f 100644
--- a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${
 
 LICENSE="JDOM"
 SLOT="1.1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 RDEPEND="
 	${CDEPEND}
diff --git a/dev-java/junitparams/Manifest b/dev-java/junitparams/Manifest
new file mode 100644
index 000000000000..cdb39ab768a0
--- /dev/null
+++ b/dev-java/junitparams/Manifest
@@ -0,0 +1,4 @@
+AUX junitparams-1.1.1-test.patch 1894 BLAKE2B 8c2aacc726a9d5ac733971f20aa06ab21e1ac31cfa14cf23e11b0541777f22291417710f944fd3f6554791ea8deae022e42ea0af5177f6d97a542d55f510b8d4 SHA512 cae119b7c22b65e42a252d70bc92ad05cae568b2257d9640a498bc7cb15e3917f32c9fafd6b06ded8f739b4825c1662a8c4625114aab1252f4adf58cf52f1f34
+DIST junitparams-1.1.1.tar.gz 96180 BLAKE2B 0b12d61841d13c893d90f1a28e6b881930a66a9359b368b601a9ee9ced1fa82ff17c9142610e1ed122684e454b86a46d9d2cf451544a900b0a86399484df141c SHA512 77e25bff2f821e8be4f3747c58e550b728aace1dac4ac98f0cd8f99235d6a2b0129e61d7f90063d5f85dd3dd4b0e5d0614e3591633bdcf5dfa452c62a114acae
+EBUILD junitparams-1.1.1.ebuild 1640 BLAKE2B 8aa9fd7add5c23199e9ad8ecb18a2a379428c5bab592731ccc538df9814e12b956aea7b83c47598f223efc56101a3911a77c8843fbe7cb7366b1d8ed1649cb84 SHA512 b666ca63f3644afba27612eda3788e1388b3fdb48271871135925c10733add9c467bcaa09d55879737c9e9b9338b786be7287c288e3203ad0793b3af69b9d198
+MISC metadata.xml 441 BLAKE2B bb19fcc1426ce3b532fba9d7bc04c796ff08a132f84860fa5bc51b0b6f6371ab1ed670e1e680b641fd858dcbb934bf83a800ee8e8ca4385d9b900d0f2dd255c3 SHA512 fd015a318961bdb03541ea34ccbd91183ce19abd7d73bb78970ced8e95325ba2525dbaa35f898475347dc59b87b005d57ff9b090d298d270624a46557573b1ba
diff --git a/dev-java/junitparams/files/junitparams-1.1.1-test.patch b/dev-java/junitparams/files/junitparams-1.1.1-test.patch
new file mode 100644
index 000000000000..02c9af4a0ab7
--- /dev/null
+++ b/dev-java/junitparams/files/junitparams-1.1.1-test.patch
@@ -0,0 +1,45 @@
+--- a/src/test/java/junitparams/BeforeAfterClassTest.java
++++ b/src/test/java/junitparams/BeforeAfterClassTest.java
+@@ -41,7 +41,7 @@ public class BeforeAfterClassTest {
+ 
+         assertThat(result.getFailureCount()).isEqualTo(1);
+         assertThat(result.getFailures().get(0).getException())
+-                .hasMessage("Method fail() should be static");
++                .hasMessage("Invalid test class 'junitparams.BeforeAfterClassTest$NonStaticBeforeTest':\n  1. Method fail() should be static");
+     }
+ 
+ 
+--- a/src/test/java/junitparams/RulesTest.java
++++ b/src/test/java/junitparams/RulesTest.java
+@@ -45,7 +45,7 @@ public class RulesTest {
+ 
+         assertThat(result.getFailureCount()).isEqualTo(1);
+         assertThat(result.getFailures().get(0).getException())
+-                .hasMessage("The @Rule 'testRule' must be public.");
++                .hasMessage("Invalid test class 'junitparams.RulesTest$ProtectedRuleTest':\n  1. The @Rule 'testRule' must be public.");
+     }
+ 
+     public class ProtectedRuleTest {
+
+--- a/src/test/java/junitparams/FilterableTest.java
++++ b/src/test/java/junitparams/FilterableTest.java
+@@ -44,8 +44,8 @@ public class FilterableTest {
+ 
+         Description description = request.getRunner().getDescription();
+ 
+-        assertThat(description.getChildren()).hasSize(1);
+-        assertThat(description.getChildren().get(0).getChildren()).hasSize(0);
++        assertThat(description.getChildren()).hasSize(2);
++        assertThat(description.getChildren().get(0).getChildren()).hasSize(2);
+     }
+ 
+     @Test
+@@ -54,7 +54,7 @@ public class FilterableTest {
+ 
+         Description description = request.getRunner().getDescription();
+ 
+-        assertThat(description.getChildren()).hasSize(1);
++        assertThat(description.getChildren()).hasSize(2);
+         assertThat(description.getChildren().get(0).getChildren()).hasSize(2);
+     }
+ 
diff --git a/dev-java/junitparams/junitparams-1.1.1.ebuild b/dev-java/junitparams/junitparams-1.1.1.ebuild
new file mode 100644
index 000000000000..8177e81b47d4
--- /dev/null
+++ b/dev-java/junitparams/junitparams-1.1.1.ebuild
@@ -0,0 +1,67 @@
+# 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/Pragmatists/JUnitParams/archive/refs/tags/JUnitParams-1.1.1.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild junitparams-1.1.1.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="pl.pragmatists:JUnitParams:1.1.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Better parameterised tests for JUnit"
+HOMEPAGE="https://github.com/Pragmatists/JUnitParams"
+SRC_URI="https://github.com/Pragmatists/JUnitParams/archive/refs/tags/JUnitParams-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# junit:junit:4.12 -> >=dev-java/junit-4.12:4
+
+CDEPEND="
+	>=dev-java/junit-4.12:4
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? org.assertj:assertj-core:1.7.1 -> >=dev-java/assertj-core-2.3.0:2
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+	test? (
+		>=dev-java/assertj-core-2.3.0:2
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/junitparams-1.1.1-test.patch
+)
+
+S="${WORKDIR}/JUnitParams-JUnitParams-${PV}"
+
+JAVA_GENTOO_CLASSPATH="junit-4"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="assertj-core-2"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+	# java.lang.RuntimeException: Could not find method: paramsForSuperclassMethod so no params were used.
+	"junitparams.SuperclassTest"
+)
+
+src_prepare() {
+	default
+}
diff --git a/dev-java/junitparams/metadata.xml b/dev-java/junitparams/metadata.xml
new file mode 100644
index 000000000000..d5b551e571ab
--- /dev/null
+++ b/dev-java/junitparams/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Pragmatists/JUnitParams/tags</remote-id>
+		<doc>https://github.com/Pragmatists/JUnitParams/wiki</doc>
+		<bugs-to>https://github.com/Pragmatists/JUnitParams/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 9e92f62eda11..cf5fe1c2c3f0 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -53,5 +53,5 @@ DIST openjdk-nashorn-8.292_p10.tar.bz2 2849397 BLAKE2B d875dea02ec8a3a3cba49f173
 EBUILD openjdk-11.0.11_p9-r1.ebuild 7795 BLAKE2B 302d1b466151f220899fa03e0a1da8a25c399499a9594264b474d0fac46557fe3327d5977fd2167bbcc899edc7dd924237fa99d243b29cf578f2d8725e615802 SHA512 f286fc0657a2a43405ce040829fb0c196ed8ecbc6affe833484bcd0091a4e645cd1e1d492d466ff58b5dcbe19f832f3529cbcd8d481e80daaa133aee42c4ea85
 EBUILD openjdk-8.272_p10.ebuild 7239 BLAKE2B e1543b8b5f1a15ead1feb98a03cde07657734ec0fcd33066d425d7f704ddb906ca5ffd99e3c14fdde4bae7924552616ee7fea0c189a935d5b71a8903afdd445b SHA512 f59a740c3acec9a47e13dfa1be11ad14a14f24576313add1fb9092bf0bf9cc2f55be0e17c2ead9004f154b3fa4f5bd7c717bfc93baaa052203e12f7fb9d59bbf
 EBUILD openjdk-8.282_p08-r1.ebuild 7312 BLAKE2B c2771e19437b22e234a5be8deec7642688f377bc66d67a81cfb0911addf16c7a71560966ac5321268876244525ac47a6f136224136772b3d88272eb135dbaa56 SHA512 abf540f2160c45add83e8e64dc9c9d7605ee6e46ee879c16664bcb9008e6bd5deae0a5352c3bfb6b3bc5e9bd9f1f0cc9cd43235b10757cad839f3d9a48df9552
-EBUILD openjdk-8.292_p10.ebuild 7310 BLAKE2B ddaf356f767b609865dca4d1d77886f9f825ea659c813f82cbc669aab8f6dd7617fe9657347593abc8fc67eba921b7aa7596f65513516812e90638eb17307066 SHA512 6bd4f0bdd41bbe8c3c198284abc61814c9895a956094138d813ce9644423d229c37d7f3b3e675f8fa81791364a8575983a504f744bad1b55624b50d388a04acf
+EBUILD openjdk-8.292_p10.ebuild 7309 BLAKE2B b572ae29c8c2d8811cc6acf3b13f6fee147ae0d3fea374884910ad1cf91d97991f8840c0e98249f1987449a3df71a8941467bcb70bdaec1838381ab0251a774b SHA512 6d94c0dd8ee3f9ec7fed554deab7418d6e125a38c5a8a93859fa8c5f1614ee1a3610cdeff21b72b3766d05150d21da742c5e10fcc3b9ddce4a34c8314a7c6fe7
 MISC metadata.xml 1432 BLAKE2B 36a11642c99127a5f97fc0b095a142705c6b4e077ed24604f1886e4d1beaa47b4fa30359600797d5e6a085befd11a2851196fe97a75a0f0907461679946b4cbf SHA512 ecc66015da3a0fc616b91dd5aaffb5b050c9f66e936cad02ec12fb56dd7c6b3b3c331d8856402c0deee16c415ea083e088cce7414703f9d659f551883b055ff0
diff --git a/dev-java/openjdk/openjdk-8.292_p10.ebuild b/dev-java/openjdk/openjdk-8.292_p10.ebuild
index 973bab562b1b..2c2c77c7bbbc 100644
--- a/dev-java/openjdk/openjdk-8.292_p10.ebuild
+++ b/dev-java/openjdk/openjdk-8.292_p10.ebuild
@@ -43,7 +43,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap +pch selinux source"
 
 COMMON_DEPEND="
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 4b71c2c8def7..14374813b8f4 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -20,5 +20,5 @@ EBUILD protobuf-java-3.15.5.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1
 EBUILD protobuf-java-3.15.6.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1f0c99e4b67429b5d205adccc714a3cd8f994f0cfb961e5b0f6fc6fd7f9a0ca2b28b9ef01ad151bdafd81f21dbfff21fe SHA512 5cb8996f94ee127f5fed684e3723d39e09879f72f8b89f16e6f5cc3bd87fccec0bcee98e1f768e79d86e7387b18864263816a8fb479bfa57c40838b13f5682bb
 EBUILD protobuf-java-3.15.7.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1f0c99e4b67429b5d205adccc714a3cd8f994f0cfb961e5b0f6fc6fd7f9a0ca2b28b9ef01ad151bdafd81f21dbfff21fe SHA512 5cb8996f94ee127f5fed684e3723d39e09879f72f8b89f16e6f5cc3bd87fccec0bcee98e1f768e79d86e7387b18864263816a8fb479bfa57c40838b13f5682bb
 EBUILD protobuf-java-3.15.8.ebuild 1478 BLAKE2B d617e38efc90574bd768311d74fa430c3b63e16b4c52c0f73e8ae22eed797822d1dd6e03fd89960762d3eef6c40c1d6adbf4592c03ccc3f9fcc3c087e97e9880 SHA512 2377ca511591d13fd9dd600b460d55481e80e086578e3d5d278cc8304d609d8869d02b608e65d33310d4efc9b884f23e026e54630c38c6a56be775c5a0072932
-EBUILD protobuf-java-9999.ebuild 1415 BLAKE2B 2b9a19943db37248fefd4fe65c15e2a3ced5748a5340f572108e3b0f9013aa46982421d3e7a4b044a0949742b90dd9014045486761ee2d8654c70fa605c06e14 SHA512 c4f6d08af080dcb0c93c5f03242bca8662db069aeebd0d42c06dc80386c17867021db7f67104405d9d58a71659a94c3fbcef8bd5463d44c647e2f21bdcdb976d
+EBUILD protobuf-java-9999.ebuild 1415 BLAKE2B eb06a6a5c6fd59bc30ab6b2c828afec993e3643a9761d752e95898f5bcb8d0aaa7225c0cc6e6a2e1519f0ca7e65a962ce5f43b6577535ced88436f43c6472c6b SHA512 fdc0efd31cfa8494351379343031a3d27cb7a5ec6a2650a6014e8bb8b5f76be6178e319c382aa0931eb3ff32aeed98a4c9690c449dc9bf7cda919601d9a29635
 MISC metadata.xml 549 BLAKE2B 3b081008d6ff92b24f670c1b8861400871454e96c5f0ca170c3825d6dda8d356f341fbfad7b5a9f330a7f9891d0e3b91a9f4842c480ee8a74f6aaf371884dcc2 SHA512 37ecf8aa151f5d08443a07c40188ec7061947a06453e39d07fa9b0da0cbeb2ccb76e517e7e2c2e3a2afe07874c817cf644dcd8775ad78f18b5f55496bc198b72
diff --git a/dev-java/protobuf-java/protobuf-java-9999.ebuild b/dev-java/protobuf-java/protobuf-java-9999.ebuild
index c6cb75e6c81a..cf89398a1afb 100644
--- a/dev-java/protobuf-java/protobuf-java-9999.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-9999.ebuild
@@ -22,7 +22,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/26"
+SLOT="0/27"
 KEYWORDS=""
 IUSE=""
 
diff --git a/dev-java/rat/Manifest b/dev-java/rat/Manifest
index 52b701529bc8..07864bac68ca 100644
--- a/dev-java/rat/Manifest
+++ b/dev-java/rat/Manifest
@@ -1,5 +1,5 @@
 DIST apache-rat-core-0.11-sources.jar 124710 BLAKE2B 354755c1e9be4952f3313ae948bd0ef034d0b5ca653f646af33f78b3ec0db4b137b44fa9d30352b82c25c94b0f097a2f533697aee5307b91df710ed7977ecdf0 SHA512 1f75e6830bffa7b1a2410aa421a548a4c78db6686c8f940471e38d1bb455201cbfd797be3bb5da027966ee39bb93e7c7b393e3d7ff330866235fafffe1ee6991
 DIST apache-rat-tasks-0.11-sources.jar 17602 BLAKE2B c960c73e708db5888bea6c12b19958ce7549d54fe2df644ebfc46d86b6724aaf2307a99e58cb1e8530ff1ff1ada57d9bdf26b00a3e902da516652125492e0ba3 SHA512 54430fd7f8c227fe9fa14bbd44adc1222e8b7de0bbc5a5b861f4df773f5db0fdaf80b6ab327e17cdf57af54447d13f3431e8cdf86728af6f8a84e85c89376565
 EBUILD rat-0.11.ebuild 1094 BLAKE2B 417f48a30848de17e555600e7957eb35e11cdad8094cd75a9b2268073f20725f2f2af03aa7ffc32196e089561c0a3f9773317a278d00bb49970ce912ee4427d8 SHA512 cc665ba195edf8b8b67b9a67e2ed0e677788edc9924336f943621ecdd469caaa5fe1bf521a90fade4aa336dff6bffcb83409565daed4e31ae097a475a22ee837
-EBUILD rat-0.13.ebuild 656 BLAKE2B 0886ecbc2b0e9eaaaf2f0f1bf1d4e35a8230efcba6b728b42998f54cd7e6e3ef295ed8b7a64406605f57771e92823c997708ebca419ebc6fed859330454651f8 SHA512 4630928f8550e7efed7d3a1dfd542c9459bfe11699d398698ebe905f205c2eaa137d16f326a5ccdec681e07533ceb1227269856fac4cb8305b5cc625a7e37eca
+EBUILD rat-0.13.ebuild 661 BLAKE2B 7c44626518c60c78b3717ebfd2756bb8131ce8d47d5b9f9fa2cfe9972ab1eb21165fb56835a9d45a487d14ff35eb99e81bea57ba63c5603e8dcd60a7b0e22edc SHA512 f7921b7a0362b936f0f9bbf3e0f8e33764ba1f386dffb9532c8af7254fcd6b8434efeaa2a80f889ee5391b6fc2050f566f209dceaa8debbf51d5e9c739c10d8a
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/rat/rat-0.13.ebuild b/dev-java/rat/rat-0.13.ebuild
index ece22ac8b664..be441fd30aaf 100644
--- a/dev-java/rat/rat-0.13.ebuild
+++ b/dev-java/rat/rat-0.13.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://creadur.apache.org/rat/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	~dev-java/apache-rat-core-${PV}:0
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index ceb3adc1528e..81b4b430c4ad 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,5 +1,3 @@
-DIST tomcat-native-1.2.26-src.tar.gz 423135 BLAKE2B 84be9b04e73b9e9e2f8c751a2fbcd6469d4ecb265639973801502d7b7cc9f0202e1761a0bdae6526da182afb8135b6d5693475e6ba7a2d187f602247c0b26dc4 SHA512 cad9d9efdb6c980afcf304bd78e5ea572271075e153e2015d393dd5e6f4612992c7d0ac499c9aeafe0c3874832356e197564717df15b36a48aba775960659ac2
 DIST tomcat-native-1.2.28-src.tar.gz 423848 BLAKE2B f0528817e1ea7e90ce67d8e181c0f620211d36529809a4c89ae687f4cefe4b0f977eb53b87e70bd0132ef1a5a000df82fc8c70e08f9bb568644b47cbf8817470 SHA512 16b8659dcd228ea153d05c9ae19e3d97add944315f3b8b42905162d0e4e8a28fd51a172d59d7da8508271ecad0b8ac025a386895565acaf8e2ba11fba77492bb
-EBUILD tomcat-native-1.2.26.ebuild 1178 BLAKE2B ed2752ed6f5563bb2cb5c7554cfda37c98a16dff1581559011350f55520662b33431bf347476c80ea2d7e9ab45e4232359229ae573dcce748e2d65793d2e8bd2 SHA512 0ff1066ee666702b936d467a44d077f6b258e1cd9750f07f2b528e9988cedb14b03c677d4dbbe22e145f3f137337b7da546887a8c1f9aea3a8fa1b041d475d89
-EBUILD tomcat-native-1.2.28.ebuild 1183 BLAKE2B 3fe9fa721ae862875f026e4a0c47e2b04cea7a0f4e3cea4dea9a253b5142e34a6676209ef3d1557ef397a186897b1f6c992464e70962b01b4364d6760553b1cd SHA512 486bffb651f11774551d532b008f343411f812d692b3301e3f474e60a5a2678b26ca1869ccc42317201cd48cdf5d3db345fda5f79609d9dff9b182cc71a90ce9
+EBUILD tomcat-native-1.2.28.ebuild 1182 BLAKE2B 9a7261837690e5b5a1bc07019bcf27f1c34e9c08740ede80ce86e844132736515c4ce9f18e940509f67f8f85616b376806180901da445a57f1026ceb1c085a02 SHA512 75b69feb9bd93291cd8d834394c8344fd792205d28ab6e381f07f0139b241a27c32befd5f63b3db40fac5365d22f79024ee08e6b9b38d38d4702cbab5b1f064b
 MISC metadata.xml 806 BLAKE2B 7f193bb62b100b0c141677fcfe9671122b70bf5091663757fca98941ca2a7c195c0b7f4f1fd95c96706a8a8c8508a7a6b63858d2eb7a3afb75b4ec21f5eae021 SHA512 7bedd98efaa696458ae80b5bd844a569b2bda8903a7d4e7c9ee9ea197b80abacf7f257ff91aa14d4cf6df830425df58f08cac7c3e9ded79823424b352fd9e978
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.26.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.26.ebuild
deleted file mode 100644
index 9aa95d1557dc..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.26.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
-
-KEYWORDS="amd64 ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/apr:1=
-	dev-libs/openssl:0=
-	>=virtual/jre-1.8"
-
-DEPEND=">=virtual/jdk-1.8
-	test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${P}-src
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_configure() {
-	local myeconfargs=(
-		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
-		--with-ssl="${EPREFIX}"/usr
-	)
-
-	cd native || die
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	eant jar
-
-	cd native || die
-	default
-}
-
-src_install() {
-	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
-
-	cd native || die
-	default
-
-	! use static-libs && find "${D}" -name '*.la' -delete || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-pkg_postinst() {
-	elog "For more information, please visit"
-	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
-}
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.28.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.28.ebuild
index 76a4520b2d1f..fd32b6403ca4 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.28.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.28.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Allows Tomcat to use certain native resources for better performanc
 HOMEPAGE="https://tomcat.apache.org/"
 SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="static-libs test"
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index cfbfe18281ac..a63b6e7493a5 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -3,26 +3,20 @@ AUX jsp-api-2.0-manifest 474 BLAKE2B 51ae750bf0caa563387eb51f0fb1be53c693c7cb0d1
 AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e8414cbc1ce835f09ccc2921e3aa50bffc3d3c38364bd61d38f14e979219f93125c3b61403ebecebd16226fa56 SHA512 bb16a0fd2d277d2b7990294bfc730def285d6e390c8ab3166d8ffb08e9d9c62c9f462893fdd9eb84cfa93685262a8800622acdbf0fd9a7f2ffb5709f0387f9ca
 AUX tomcat-servlet-api-10.0.2-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch 718 BLAKE2B f6e5fb4b569cb54dd6274023e155abf988c1efe724b4e42e31d96e897f8a1cc8afb64ca673d32ef30e2b44d74afcafd8cf7e1fb33372e95b802e17d9c6354270 SHA512 c7d5d2babde536adff9c5fa2ff41405ef7ab8013ebf91cd5f9ff7aeb5f5bfebe6e1e0dd9ceb7c031a4905258701156060a26ee5555ca1e3077181afe4d351c9f
 AUX tomcat-servlet-api-9.0.40-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch 710 BLAKE2B 177affee37d70208942c709324c4a7a4c561a28197792683a1f21dd747cb90f2d9fc2c32cf28cab0ad575c22dfa93efeaf7ba7f5254dbe67fe1a8b6fe5fd504f SHA512 0233b3fa6f6e3de36d62056035c84f9a22e866ff61e4cfd0976b7aa7e8ae019421bad25e49430e47a0476d09b5c1037d453e807ea02605a4f161d876f303c24a
-DIST apache-tomcat-10.0.4-src.tar.gz 5964416 BLAKE2B 23332b90316cedd1916b59b1b31b1c16e34c193ba61660c7c8e41e3b983a35873660eaf8e3f0777704d5663f0ede2dc39b81997a73ee726ff73d6c6392582163 SHA512 677b978afd51fe1756b486c9d5576b9fa03b5b775c462263237aef6d17f36d7e718cfb5e46a49da942b1bf6681b166a4af781138f55d89a019bf12b48eb22882
 DIST apache-tomcat-10.0.5-src.tar.gz 5976090 BLAKE2B 5441bec39ddaa74a7a4b39e48ecb524f6edb230760272678e6bf8d0a26b4a39e9a6c276b591d5d7962d8cae7d211486d65a334f363931d7cd8750a902c8aaf98 SHA512 177e497b2355b260fc59cfcfb8b1fc2fabf5fe5a0f5705b5feee2c330881545aad359a746074c9fb180acb54035d0c2f25b23daac84202788178a256e48f0c9f
 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
 DIST apache-tomcat-7.0.108-src.tar.gz 5313375 BLAKE2B 200a1ccbc39a572ca7e4f7805bf3d27e0bd645156d8886b0fcbee5e64279a4d2f4e2ad847d67a70e1c65a8d88fa5bd4757a0066ceff367fe92914e22cc809aa5 SHA512 bdd957ca5b3b7dd152efa6406dbb6397ed62661ec44c83b6a8f6e9e3c33362c51ff5e0451a57d6aa3874cd745811f2afe78d08825ddaba8e29cb38ef922c48e2
 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
-DIST apache-tomcat-8.5.64-src.tar.gz 5863485 BLAKE2B c297c0803c74a969e96b99c379bcd050d6e08cb1036d69b5c49c64311d6f17695754631738130a76def849da6c2de70a49d4452b24ee34c5720d9474f8d4d41b SHA512 ffcc8e97b56730e7e15daa8c4ce628547afcf0bb008bb8d8142ae684c963ed6a366c1dfdbaaca9080201c3c1bcda60c759b76447dd72493f0ec922a034b75f08
 DIST apache-tomcat-8.5.65-src.tar.gz 5874743 BLAKE2B 8a605b0fe5026315aa0a5463d42c01eac164c91737cc81f8df4e174075783a829ddd30a8fc9f5129cf1f83a98d85fa33cb7ec9223f365de0ad91ecffb319d187 SHA512 df6ea4e8e04fe1f787ef105cb3e453516ad25d32ad3d559c86997b44492c9a1e93e8c22c88ba2203dcfefc14404f7d1bb28a9e2e20d44ba85adf8c374a4456fa
-DIST apache-tomcat-9.0.44-src.tar.gz 6047722 BLAKE2B fda3081d66c9018a49e5a07bfb5d54b133fe51dff69b692480065d8d9a4877ce5b5b152e33f6d4cfaf28940ec6b556c9a2455c8fda56ea0552e4d1f83f0f9cbe SHA512 68f6a6edecc0469e21cf062cd4b5aacd2df4903fe98aea052acfc9f725268490d5a6917ac1565f26e15a513afa09814014aed267dc1b5aa92733a51ef52b305f
 DIST apache-tomcat-9.0.45-src.tar.gz 6055044 BLAKE2B 66ca4ee2c0a3bbd1f73d7257c55105e28d1619c8e533f945438cdb283cb8ccdceada163698641b034b5e43b513fcdd16e331c4c11ea300501276a5247f8ef682 SHA512 e3edfd6ab9e3ddf6a15f63a4e11f5237e03d7cacdec11805f4a901bd325c0edeca1ee0b62bee92d53e521af0a9d5a7b10ce12a8262a57fd7faa69d93ca1c066e
-EBUILD tomcat-servlet-api-10.0.4.ebuild 3164 BLAKE2B f515eb28cb5147b27b882e3bf83dd205e5b829fa75859d97f85a900776f384ac68c4b10da65c1bee2c4d2c00dd9b3f0693b3dd367597b0c20400916e6bbf53f3 SHA512 01241faac7be775e936a788068f824431de9a46c5ba7e7cdb64dda93c22eecf86c5d021fd231f4f7982b2e649becdc03be47db683eea53126c36c9d946ecfcc5
-EBUILD tomcat-servlet-api-10.0.5.ebuild 3170 BLAKE2B 40c03eb67e43ce9dc5761f73e905f8b252144c16622262b576a8ffc81d21289fed1984862934e01fc5a371b305a9a578849c4a81b97c709f1c5be9eb409e190b SHA512 32a43e27703152cf72d85d5d4d8092acb97f138c16a565b5167b4cfffdf8f51b31c119fc09aa2a4447d9ed011b0dde9f8a503d5056ba1507d9a1b93fd9def532
+EBUILD tomcat-servlet-api-10.0.5.ebuild 3168 BLAKE2B 0ccf3292c4a661229d1c9f8341dddeefc7e8247169397f59d2e9e039ea65f24782a60f4d806cead97364b9d9e4080329e5f24cff6b75024e11637fb202b6dfb0 SHA512 aecc5b1b3a2ffc970aadad28e0f0fb6961f93259ae77a8af76d124204cbf11f5eac46effdfb6e9b8460be3948b002d542a95a35b78bbe04168688c97126da4f2
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1001 BLAKE2B c3a337a341d14d193e0b409e2ae751ad7e2f4d7dcff941e28c4eb7ef4d614ae5f626235bf7cfdeb56eaf3bba608913bf12bde46b2a9e576c7cf1d886c275336a SHA512 b36e97e60cb546ef2a980d1b9787dda5b21e5c788555d9a696ca166632315a870477fb8c52fa24c1698dcf43bb096201b6d4835113ec87192287eff9f5664e3b
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1419 BLAKE2B e512a93e76e7e675606f112baad26f0c5013654293bf0a95085d255911c444b8ede5f0c283237810e025a9877dd41ae7285c57e0ce781ab434f29a98d3f58122 SHA512 d64b2289bdd50b8e320bc2927580080e70b532c25ffd4743342401527c4e90b7db2b6ffec35598d4e6e9e426880f7b0e10ccffc711ae05c06043586f06972ee2
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 955 BLAKE2B e7046e9afdfc33a906b44bcc98d092f75d3c6cae4ca7263b5e0605318aa19257edeaf83c2ea7a3639852c0ff140b6b65d16dc04433d94bbccce9db12ad82a9c6 SHA512 3a3d5450df02d079c04406cb3a4b63e986ce4f2d591ab12ee8918d4fecc6337634cf5627539bd277d9fda07ed4b6398c70dd87c322ae598649b61a8fd7cab58a
 EBUILD tomcat-servlet-api-7.0.108.ebuild 2987 BLAKE2B 58215b6b83dd299746d8a57bb9dd09b0ca04868f8de442b894d2a06ee68d901041a12594390bf87bc291f96f78cc6e5c207d01766948e9eaa0fbd29d1f194e6a SHA512 c93c1e035d0fce24fcb6a2fa28cb6713d8f38114a6ba76081d6eb1b5e42b2087fa9920c7a443c8b36fdf5d2d157886d70e2ddefbf901c33c53236c5e8901cb11
 EBUILD tomcat-servlet-api-7.0.109.ebuild 2990 BLAKE2B 08f62ce9a014e01926a2d2eaac5daf393e8df8f2dff737d1215b5304b9ab8bc92f794bd00a3bb6f2fd17b00b921b3445d86c44743a5e915a8e4fb33c762ac81f SHA512 c4db6d1df1fedf89adbbb90e8197dde37c5f656034e3629420096ad40af1e50644de527b0eab432e20463d811192ff889a06a72fe949084168bcbcc3e5ea5b79
-EBUILD tomcat-servlet-api-8.5.64.ebuild 3003 BLAKE2B b8bbaaed51e3d2d25497f6a5f4ba493cd249edef833ac72171d5f8e19c83c11ce00928ceff8ff1348842ea85c3196791103608fc3b7ceca184519a6eaa2e8364 SHA512 68ae1a904dc5c9cf2824db5fe7ef4ce1a07b41becbb69ea14f3717cc02b0f8d5ced6c860bac740c78a4ee80c5862811465850772d741841e4b4dd9d91e55edb5
-EBUILD tomcat-servlet-api-8.5.65.ebuild 3006 BLAKE2B 039405bb1fd288272473d64eb9e4aa44e5b7c2dbd54b25e1fde030f4f511a43127f2d88e45b549084afc3b1dd4024d09360601305e021e7d2fd01b8a49598e5e SHA512 4dde713a2e6484a959abf8c924ab5c48509c53e9f0b7491fe67b8717790f1231e8e4fc7d367cd77297700538abe4b00661509c55454841704dc7ef943a9cb5ac
-EBUILD tomcat-servlet-api-9.0.44.ebuild 3175 BLAKE2B 996c4285297fa2560227d87381d06be9c7120cce6d802ee9ada2387e7589726be83c76d57c5a6cbfbcf42dd5670194ced0de72268ff237861ce900959eef9b40 SHA512 dca2fac51ed5a98f4004c9536a9623dab69e38f5b7e02edc98dd1365a98321caeb78ea03a9e68a0db517cdc559a253a394e812b2e03306944d9c73718d30d53b
-EBUILD tomcat-servlet-api-9.0.45.ebuild 3178 BLAKE2B b2d3652b91c3e8acc96b387ffb6375cf013694f4ffce215d2f1138b006befac9eff922bc25cf717d00bd0f65f6922256a6aa5f4eb643a37656b0026c1e829289 SHA512 5bf275389da0c1dccb3605cc66eeb416416dc8a65e34252d0f7f321c938b4ef02e9c2accb1eafc3fc349fb58d2b4c1418ff10f31146cf5b7086f4afb9daf6a32
+EBUILD tomcat-servlet-api-8.5.65.ebuild 3003 BLAKE2B b8bbaaed51e3d2d25497f6a5f4ba493cd249edef833ac72171d5f8e19c83c11ce00928ceff8ff1348842ea85c3196791103608fc3b7ceca184519a6eaa2e8364 SHA512 68ae1a904dc5c9cf2824db5fe7ef4ce1a07b41becbb69ea14f3717cc02b0f8d5ced6c860bac740c78a4ee80c5862811465850772d741841e4b4dd9d91e55edb5
+EBUILD tomcat-servlet-api-9.0.45.ebuild 3175 BLAKE2B 996c4285297fa2560227d87381d06be9c7120cce6d802ee9ada2387e7589726be83c76d57c5a6cbfbcf42dd5670194ced0de72268ff237861ce900959eef9b40 SHA512 dca2fac51ed5a98f4004c9536a9623dab69e38f5b7e02edc98dd1365a98321caeb78ea03a9e68a0db517cdc559a253a394e812b2e03306944d9c73718d30d53b
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.4.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.4.ebuild
deleted file mode 100644
index 0b2df8987699..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.4.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_A="apache-${PN}-${PV}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="5.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}/${PN}-10.0.2-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 compile and package
-	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
-		${EL_API_SRC} ${EL_API_RESOURCES} \
-		${JSP_API_SRC}/jakarta/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 jakarta/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
-	mv "${S}/${SERVLET_API_SRC}/jakarta/servlet/jsp" "${S}/${JSP_API_SRC}/jakarta/servlet" || die "Failed to copy jsp-api sources"
-	cp --parents -R jakarta/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/jakarta ${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-10.0.5.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.5.ebuild
index 222dab67e501..3bb2fe1d1a9b 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.5.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="5.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 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
deleted file mode 100644
index d5d3aa1096eb..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.64.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-inherit 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-8.5.65.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.65.ebuild
index eaffc40f4037..d5d3aa1096eb 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.65.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.65.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-9.0.44.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.44.ebuild
deleted file mode 100644
index 12c59541c7f8..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.44.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-inherit 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 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}/"
-
-# 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/tomcat-servlet-api/tomcat-servlet-api-9.0.45.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.45.ebuild
index 91497ceece0b..12c59541c7f8 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.45.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.45.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-11 19:55:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-11 19:55:43 +0100
commit	185fa19bbf68a4d4dca534d2b46729207a177f16 (patch)
tree	a8a537b82fda83a0799c2ca9887f212558363aa7 /dev-java
parent	c8fd0d84af0bfd1949542adc2cbb735b1d28f9ed (diff)