gentoo resync : 17.07.2021

21 files changed, 315 insertions, 269 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 8d50b6e6f8c2..470e30cbbd00 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest
index 174d58981dde..45472d5a010f 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -2,5 +2,5 @@ AUX commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch 12404 BLAKE2B 294
 DIST commons-httpclient-3.1-src.tar.gz 1882664 BLAKE2B ccf96bedad09011ee20eae38aae1fdfdd6fea5a8226f4b4d156762080c286c71b34c149035abfd61e70c55a1de84ab3cd38d73c3228f591dd8e16c0a7e79c3a5 SHA512 e73ceeba3f34a35c30b24a3c6cb8dfc2102ff21079a5ff9270935908cb2f707d366c2f31a53fbdafa99673cc2b82e05470a2bf40d96767c72b2ab037c0f55490
 DIST httpcomponents-client-4.5.13-src.tar.gz 824131 BLAKE2B 1507c81749a92afcf8b170b606761236d71b02d8b8b257d753a0f09abbdc297057df39661e827dee52804a2138de7d201b2a837418cbec21085fd3ffd558b51c SHA512 421e413fb2206fa95b6428ff067cdf2b440d2d3d4503cc3ca9bcf70ccd8ed1b8273ec4fe0703e6a8cd7612940b7ed966d9f163dbfeb8bf699ae2a8b2e0866d05
 EBUILD commons-httpclient-3.1-r2.ebuild 1680 BLAKE2B 39796278c783e63835011467992fc9d8891bd2c691924078b909d409cd5567a8ebe505a834bfe65617936b4196cc99bcd12770e6a0462c237b5a5ff0f33cef11 SHA512 c1c327018aa78ccadd57a06845771ce12eef99106092823763eb7285d9bee587aa654b3fafcfabc7e725d36a5db7cda5e276bc6c6c7c291bf19bfbb553116244
-EBUILD commons-httpclient-4.5.13.ebuild 2178 BLAKE2B d67eabd14e654db2e07113230008c9730024a4e7aff9b03259f3c9a973a7c2a1422dc47d9add60ec9f901da12df40b34f31a45b8085f4c1adbe6251bc4d37e0b SHA512 b19206d4ab9498d79a5737aa9057fbdb03acba110dbbdfc33f4ae820f10c54b2ecf8c27d8ecd4e69300ff6dc2ff12116f11dc89a6cba454ce94550a591a05fe9
+EBUILD commons-httpclient-4.5.13-r1.ebuild 2224 BLAKE2B df78302c2e2a43e993ef8415ec9ba3a32871a50ead217eaf14c2b73707f7f561322f5f866ccadf94444b52ec4ca29eb60084d9a0c6f9148661909e06a1ee30dd SHA512 adfb02f15e6e5bd9aa9fc180e0e1ac8b60d5ce64a4dd5a3de865eb5b5781f246cf055bf876495a44489c3b370466c151cc0fa22dbc30c4c295d80f3fb6b5d2ce
 MISC metadata.xml 456 BLAKE2B b4e2261943e4bd92d413eae20f60f23b79e7deb961d9c7e08f855f28cf69f0b45c5113a308138122a9cc4b42da1498e67c8be2093ce0252f60d5ef56ea55e72a SHA512 27c629a07a007dd4336cd50f4ea32156ec301b02f398b008c057532b36bc0698132282e32007ee31f0dd21f3f5664b3d7c9607fe43a4dfbbffb67d3000c3a661
diff --git a/dev-java/commons-httpclient/commons-httpclient-4.5.13.ebuild b/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
index 736ff629cee5..a9080209c2fd 100644
--- a/dev-java/commons-httpclient/commons-httpclient-4.5.13.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-4.5.13-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-
 
 LICENSE="Apache-2.0"
 SLOT="4"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 x86"
 
 # Common dependencies
 # POM: httpcomponents-client-${PV}/httpclient/pom.xml
@@ -40,6 +40,7 @@ CDEPEND="
 DEPEND="${CDEPEND}
 	>=virtual/jdk-1.8:*
 	test? (
+		dev-java/hamcrest-core:1.3
 		dev-java/mockito:0
 	)"
 
@@ -57,7 +58,7 @@ JAVA_SRC_DIR=(
 )
 JAVA_RESOURCE_DIRS="src/main/resources"
 
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito,hamcrest-core-1.3"
 JAVA_TEST_SRC_DIR="src/test/java"
 JAVA_TEST_RESOURCE_DIRS="src/test/resources"
 
diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
index f73aba114cbc..3848ac07e9d7 100644
--- a/dev-java/dom4j/Manifest
+++ b/dev-java/dom4j/Manifest
@@ -1,5 +1,9 @@
+AUX dom4j-2.1.3-xpp3-add-removeAttribute.patch 1847 BLAKE2B 08e1bc056f0982c4fb30782321724137870afd81d1d9158cd6a2179fb50b8c77cec3e5c2e7e2d97072cd60122e7b5ad3b8a8107f7d85e99fda7ab06dd0f276bd SHA512 7c0da264384436bd3565d098059faac6ea0ac3a75d1bd21a22fa51dc9e77027c4acf0efccc0e1cfc7a4bed191e65d25eb4fc4b6fdb10f315202b1c93f0c15be4
 DIST dom4j-1.6.1-java5.patch.bz2 2900 BLAKE2B cdd7dc901f5292af3ef7f0ea200c3d22bbc8c0adc27606da3c8fbadc44625b114c995321723dca331f0b23d5248e1f9177f0def2f4138eebcbd4aaac0495d4dd SHA512 38da606d77b62976366cd089e5194a922e348ec396e7b9af4dceb0a536c47f66e0900cfa59c91df04aade6076630077a8f88c713b9c20224d69316109b293a96
 DIST dom4j-1.6.1.tar.gz 9687211 BLAKE2B 3daa3729ea071aa87c7c1e1e2b91f1635109774dd2bd564a85265a0286f1369373084b945409d9d5213d66a7e14224033d42c58d80125b7982eef8961eb29248 SHA512 95c5a7105a81734f77b4bf27f8bb0af116bf43d8ad5297a0902a6687a54109a87dffe2953cf430d14947cdaa590aa0fdf083b46a91d1d98d48431cfae4459d94
+DIST dom4j-2.1.3.tar.gz 565918 BLAKE2B d6f8c9ae22f84086491ca7e60e5498edda727b219b4fe019da8f62a441dc3cea86ecf0554e32f8e717e21234b8ef8e2905946ab3722462f1fa748ad7e68e9e20 SHA512 8c4d7b4f2dd1b3f806e0d5103101998a094c31e9a4912539dcee32f24b35452c7f0d72c5f4cf55f8a8c9a416fee7284f9bca43ae56b0e66104b2b54fdb49ad96
+DIST jaxen-1.2.0.jar 232455 BLAKE2B 6bd16e8ac34f3af1b9d61218dc6a29862178516cfbb98c6834bf6db846b537e44b48db6ff578b3d67d32c3e2b142e44440a2fdcc6dc06a6ea427b04e6bf1f370 SHA512 cad582fc12d0741e9e6fd7e0cf80a50feb04f5ef42043df96f8a5b78476c77695d8b43836d2241f76b35676ea759921edd25eaeb2c04ec916eb138aa2901ce5f
 EBUILD dom4j-1.6.1-r8.ebuild 1907 BLAKE2B c2802e3270130c27a14cbcd02dfb9228f73e29f39f9866521af5f870396e43a0745836c2279f16b8f4452bed47f2529ac9cb488aa7fe982602affd9ef5fc2f00 SHA512 843e5b3a520ab7ed50fe1ec926b34d5ef114c2dd5d3d7813f12fbd00c018ba791f98294aa300b8042bd6659c31e2e25ee407710c0f9e8a36f79eba7a4e3c603f
 EBUILD dom4j-1.6.1-r9.ebuild 1900 BLAKE2B 314238d8a36167053c0b148c429206b042b5fa14929edd7c92741131596fc24f39e668d165abcb26ea3b5b14363777f725a30893e2395ee57564a875b6cc2306 SHA512 30dab95cdb84bae7a4873be00f1d37f8f412a31f19748a02370071a94407c7d0de1dcdcaaee67aad7d1e024db24218b88d206d373e781b5d2e18154dab051cb1
-MISC metadata.xml 638 BLAKE2B f46f8d2dd95d34b00a632c896e6baa1fa889722364d19b4eb9545f3b4158fd25c7d33351c420a5c4cd06b70944dff110df695f82b00e3c99bab601df21f19ef7 SHA512 77351358dfa7f4d7ae987e49acc828344448578423ad613e2fac18543949ca050e2746c469e0bb7e5b764a8512e3a97b675ab0e1cfbfe2493f013911fcf45f38
+EBUILD dom4j-2.1.3.ebuild 2235 BLAKE2B 0c26954207b20bca551adf3bc8a464e911adfe4aa1d0f4df1b2d2dd4b590d482396120d13d8d216b47a8b28734a2798200436329aa9730f3f3034dc4f5f36deb SHA512 949fb855f87ef0ba7707a5f5dd778ae654f5671a8c8521678d1296a3883fb34c27ccdfde30cb4282c9058786c53b137151545f571c14f96f7009522d67ac1b59
+MISC metadata.xml 714 BLAKE2B 9669602bf999a3bcf3f303afb06edfe82c3dbd1b52bc79b1a4cafbc944b0c75067715ecbcee9568734af95bbbdda480a972a5d7e26b454460abd16c9feeaa3b9 SHA512 4a1cf930f62685579e6361db5999f377bc8b17acb2b98d3d87fa4501f4de107f6f21822cd0b3d1c2808c3a17f157baf9346af56ebd3e8aa45ff8f4452d0244e4
diff --git a/dev-java/dom4j/dom4j-2.1.3.ebuild b/dev-java/dom4j/dom4j-2.1.3.ebuild
new file mode 100644
index 000000000000..46f4b4956895
--- /dev/null
+++ b/dev-java/dom4j/dom4j-2.1.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom dom4j-2.1.3.pom --download-uri https://github.com/dom4j/dom4j/archive/refs/tags/version-2.1.3.tar.gz --slot 1 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild dom4j-2.1.3.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.dom4j:dom4j:2.1.3"
+JAVA_TESTING_FRAMEWORKS="testng"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="flexible XML framework for Java"
+HOMEPAGE="https://dom4j.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/version-${PV}.tar.gz -> ${P}.tar.gz
+	https://repo1.maven.org/maven2/jaxen/jaxen/1.2.0/jaxen-1.2.0.jar"
+
+LICENSE="dom4j"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE="jaxen"
+
+CDEPEND="
+	dev-java/jaxb-api:2
+	dev-java/xpp2:0
+	dev-java/xpp3:0
+	dev-java/xsdlib:0
+	jaxen? ( dev-java/jaxen:1.2[dom4j] )
+"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*
+	test? ( dev-java/xerces:2 )
+"
+
+# Runtime dependencies
+# POM: ${P}.pom
+# javax.xml.bind:jaxb-api:2.2.12 -> !!!groupId-not-found!!!
+# javax.xml.stream:stax-api:1.0-2 -> java-virtuals/stax-api:0
+# jaxen:jaxen:1.1.6 -> >=dev-java/jaxen-1.2.0:1.2
+# net.java.dev.msv:xsdlib:2013.6.1 -> >=dev-java/xsdlib-20090415:0
+# pull-parser:pull-parser:2 -> >=dev-java/xpp2-2.1.10:0
+# xpp3:xpp3:1.1.4c -> >=dev-java/xpp3-1.1.4c:0
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*
+"
+
+PATCHES=(
+	# XmlStartTag.java:31: error: ProxyXmlStartTag is not abstract and does not override abstract method removeAttributeByRawName
+	# patch from https://github.com/dom4j/dom4j/pull/22
+	"${FILESDIR}"/dom4j-2.1.3-xpp3-add-removeAttribute.patch
+)
+
+S="${WORKDIR}/${PN}-version-${PV}"
+
+# dom4j has a cyclic dependency on jaxen[dom4j].
+# The downloaded jaxen-1.2.0.jar is provided for compilation only.
+# No prebuilt software is actually installed onto the system.
+JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/jaxen-1.2.0.jar"
+JAVA_GENTOO_CLASSPATH="jaxb-api-2,xpp2,xpp3,xsdlib"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="testng,xerces-2"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="xml"
+
+src_prepare() {
+	default
+
+	if use jaxen; then
+		JAVA_GENTOO_CLASSPATH+=" jaxen-1.2"
+	fi
+}
diff --git a/dev-java/dom4j/files/dom4j-2.1.3-xpp3-add-removeAttribute.patch b/dev-java/dom4j/files/dom4j-2.1.3-xpp3-add-removeAttribute.patch
new file mode 100644
index 000000000000..a58a06dfcd61
--- /dev/null
+++ b/dev-java/dom4j/files/dom4j-2.1.3-xpp3-add-removeAttribute.patch
@@ -0,0 +1,47 @@
+diff --git a/src/main/java/org/dom4j/xpp/ProxyXmlStartTag.java b/src/main/java/org/dom4j/xpp/ProxyXmlStartTag.java
+index 08b88fc..aa27c10 100644
+--- a/src/main/java/org/dom4j/xpp/ProxyXmlStartTag.java
++++ b/src/main/java/org/dom4j/xpp/ProxyXmlStartTag.java
+@@ -211,7 +211,7 @@ public class ProxyXmlStartTag implements XmlStartTag {
+      * @throws XmlPullParserException
+      *             DOCUMENT ME!
+      */
+-    public void removeAtttributes() throws XmlPullParserException {
++    public void removeAttributes() throws XmlPullParserException {
+         if (element != null) {
+             element.setAttributes(new ArrayList());
+ 
+@@ -221,6 +221,33 @@ public class ProxyXmlStartTag implements XmlStartTag {
+         }
+     }
+ 
++    public boolean removeAttributeByName(String namespaceURI, String localName) throws XmlPullParserException {
++        if (element != null) {
++            for (Iterator<Attribute> iter = element.attributeIterator(); iter.hasNext();) {
++                Attribute attribute = iter.next();
++
++                if (namespaceURI.equals(attribute.getNamespaceURI())
++                        && localName.equals(attribute.getName())) {
++                    return element.remove(attribute);
++                }
++            }
++        }
++        return false;
++    }
++
++    public boolean removeAttributeByRawName(String rawName) throws XmlPullParserException {
++        if (element != null) {
++            for (Iterator<Attribute> iter = element.attributeIterator(); iter.hasNext();) {
++                Attribute attribute = iter.next();
++
++                if (rawName.equals(attribute.getQualifiedName())) {
++                    return element.remove(attribute);
++                }
++            }
++        }
++        return false;
++    }
++
+     public String getLocalName() {
+         return element.getName();
+     }
diff --git a/dev-java/dom4j/metadata.xml b/dev-java/dom4j/metadata.xml
index 2d873897cf3c..cdff47537f0c 100644
--- a/dev-java/dom4j/metadata.xml
+++ b/dev-java/dom4j/metadata.xml
@@ -5,6 +5,9 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<use>
+		<flag name="jaxen">Includes org.jaxen.dom4j package</flag>
+	</use>
 	<longdescription>
 		Easy to use, open source library for working with XML, XPath and
 		XSLT on the Java platform using the Java Collections Framework
diff --git a/dev-java/gwt/Manifest b/dev-java/gwt/Manifest
index bd92d7ebc1c1..d1896c6b941f 100644
--- a/dev-java/gwt/Manifest
+++ b/dev-java/gwt/Manifest
@@ -1,10 +1,6 @@
-AUX gwt-2.8.2-build-system.patch 758 BLAKE2B b1aca717473f2ebee42bfc2902c8eb0012698c8f7a059f5c9d29944b154c1a85ae296d8639271aaa6f749e5fa84de8e4e8ad5da45c90495e1f5ab429eff13740 SHA512 c469c23ded60e5f844abda0001f4ca99fd6756f9bd433f3e8a433c9441db3dd62d0523ab90b3f2eb1bf2b26675ef0f01a3ddf7dd371df844037a9f249c5b59a5
 AUX gwt-2.9.0-jsinterop-classpath.patch 1045 BLAKE2B 8efec183d5d7f2d2196d176d13e53c4356af3551838c3f32f586c673e03c8d3aa029d53ef490c2961482ed6ab1a4c53838f4060e1438cbd540823cfd11380f6b SHA512 85a0aad95157f0ab8adcefc43b6fa9d98d3970719ff7cc488e700ad23c0b3944c72ea837c689f4f50829d04c54b4693123a610a6f3600f522eb3026a1add4056
 AUX gwt-2.9.0-remove-git-usage.patch 1284 BLAKE2B cf06867ab6917e04a90a6f98f6868467dab8a54eda93847cf77a2e45917a59329c5be0857e3ad38eab942c90f696f9d6e8fd8509174b16c1cc72d242a01fcc3c SHA512 b32c808cf6514893aad5fdd07aa2724a9a3f0c9dede9aa1092ffe2470db02f481f6d2cba8b1521f221dfff0f2353dbe41aa1169eba28512f7c8feaf1dffba879
-DIST gwt-2.8.2.zip 22017212 BLAKE2B b112df08885e607c975f9585d6b83e2a12894e974850ada052918e4b946b11bfc8d9cf9d71f4e684121d9d16714885be549eed44d77a119e695c2b50cd6bc6c3 SHA512 ac16311c3b00b36d421eef914e73ad8dea01f022c87fc7ed722fdfee8eed391f1987cc1c34522978afc542cdb90eee791efcdcc725d9a395ab468e458b708074
 DIST gwt-2.9.0.tar.gz 13081965 BLAKE2B 8b18e4cad6df9b1a2336bdf537a26def021ccd950299a6064e9a7328d0161c093f56284cce7b8a0e0a0c72b0dc9604e5e5527332d1878afd19a3c95eed5129a7 SHA512 424484a42f28387734a89a3a12b48716031e194e3a712a5e7cbdb66f77ab68e72ff8751f70a4048f4b9f35d92948c285490fd8e23c34d5c5e5558fee33952bf5
 DIST gwt-tools-194772ed94078802d8030136796de344eb1fdbe1.tar.gz 575902138 BLAKE2B 518ed1752cc82a527521525e181db712a641d36db203f511bdcc5206de314aa1eb693415b690fc42f38c9beabaffc484ad6ec3444e3cd8b4f2a3fa2ab9505f11 SHA512 0365d664b4b14ec833c922c8fab5df269e69ac8f1526315810f4922132439b880ee15e7e8b80e8b505469a374ba4a47998c7ed07b5f53227d50100247fade82b
-DIST gwt-tools-f42d2729a3a8e6ba9b9aec069957bce5dc0f6f6d.zip 577453206 BLAKE2B 83a3824d6418727876b4708ed44ab1f58513a5b39d4e48f9bf21290ca358f76ec2ccd98ce2aee76afe7f621fb1f703bf459b8c3d6a3d4f32d4be807bc723513e SHA512 f4f033c972d955da40258020a9fb84ae90f30b7afeb1ae8044cf00f4f5f45200129bf84e2f69660a4eb80bb60f3a5a1d3c5af69fe9e07e0b985de0e708ca933f
-EBUILD gwt-2.8.2.ebuild 1855 BLAKE2B 3aaa9cc77f59b1de68576ffb181b79cea5df324bca29149430dfca81c114fe07401136e5afb8ee78dddaa7242c0ca00da4263483b7aabd756ff6c87daffb61b5 SHA512 806919aefcd54194e9c1b53066f2c7bd7585151c54b0a7706211dec59bf31e4ec4992a8a26df6217a9265019705c1ef777d1728314344e2dfa08bd42050491ee
 EBUILD gwt-2.9.0.ebuild 2239 BLAKE2B 4c3a7ee2474cdacbafebdf1107750f37e9e73573d032746fad912f2a40ab77773572b648592d567c8cf7105281a40af774f4bacd349f25f069306281d51ee877 SHA512 0c28f0495b51d5789524529f91f2eed43d92ef059990fa7d747b58b46f1157f8dd2fec912d6c773959a7fa3b8a03040923de5edd47471b1e8e73776c2754eca9
 MISC metadata.xml 766 BLAKE2B e023f4897d31fa31c961563600b21d9a03a26b1ac70b75859c66e558177e7b42b747cfb40d22760eb132b44ac5ec2ee8906a48ea09b591e8a5cc1dd7a91cc55e SHA512 c4fdbf613e76d4be2c71a15fc9f99f0cd744aa4508725dc36a11421eee6029a22af833c360b525002a5be76b74494b14ec093945e1c5f25a9c2fb71867cf3f32
diff --git a/dev-java/gwt/files/gwt-2.8.2-build-system.patch b/dev-java/gwt/files/gwt-2.8.2-build-system.patch
deleted file mode 100644
index 82340416e7a7..000000000000
--- a/dev-java/gwt/files/gwt-2.8.2-build-system.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gwt-2.8.2-orig/common.ant.xml	2017-10-18 22:39:31.000000000 +1100
-+++ gwt-2.8.2/common.ant.xml	2020-01-13 13:23:58.653719957 +1100
-@@ -277,9 +277,7 @@
- 
-   <macrodef name="gwt.getgitinfo" description="Identifies the GIT info of a workspace">
-     <sequential>
--      <exec executable="git" searchpath="true" outputproperty="gwt.gitrev">
--        <arg line="rev-parse --short HEAD"/>
--      </exec>
-+      <property name="gwt.gitrev" value="faff18e7a1f065e3a4ac4ef32ab5cce394557070"/>
-       <!-- Generally, filtering requires a sentinel file so that changes to git rev will
-          be noticed as invalidating the previously-generated filter output.  This property
-          names where such a sentinel lives; it is tested with <available/> and created
diff --git a/dev-java/gwt/gwt-2.8.2.ebuild b/dev-java/gwt/gwt-2.8.2.ebuild
deleted file mode 100644
index 0a0f40fa707a..000000000000
--- a/dev-java/gwt/gwt-2.8.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2 java-utils-2
-
-GWT_TOOLS_COMMIT="f42d2729a3a8e6ba9b9aec069957bce5dc0f6f6d"
-GWT_TOOLS_PN="tools"
-
-GWT_COMMIT="faff18e7a1f065e3a4ac4ef32ab5cce394557070"
-
-DESCRIPTION="Google Web Toolkit library"
-HOMEPAGE="http://www.gwtproject.org/"
-SRC_URI="https://github.com/gwtproject/${PN}/archive/${PV}.zip -> ${P}.zip
-		https://github.com/gwtproject/${GWT_TOOLS_PN}/archive/${GWT_TOOLS_COMMIT}.zip -> ${PN}-${GWT_TOOLS_PN}-${GWT_TOOLS_COMMIT}.zip"
-RESTRICT="mirror"
-SLOT="2.8"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-CDEPEND="
-		dev-java/json:0
-		dev-java/guava:20
-		dev-java/rhino:1.6
-		>=dev-java/asm-5.0.3:4
-		dev-java/eclipse-ecj:4.5
-		dev-java/validation-api:1.0
-"
-
-RDEPEND="
-		${CDEPEND}
-		>=virtual/jre-1.8:*"
-DEPEND="
-		${CDEPEND}
-		>=virtual/jdk-1.8:*"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_BUILD_XML="build.xml"
-EANT_BUILD_TARGET="build"
-EANT_EXTRA_ARGS="-Dgwt.gitrev=${GWT_COMMIT}"
-EANT_GENTOO_CLASSPATH="
-		json
-		asm-4
-		guava-20
-		rhino-1.6
-		eclipse-ecj-4.5
-		validation-api-1.0
-"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-build-system.patch
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	GWT_TOOLS="${WORKDIR}/${GWT_TOOLS_PN}-${GWT_TOOLS_COMMIT}" \
-		GWT_VERSION="${PV}" \
-		java-pkg-2_src_compile
-}
-
-src_test() {
-	GWT_TOOLS="${WORKDIR}/${GWT_TOOLS_PN}-${GWT_TOOLS_COMMIT}" \
-		GWT_VERSION="${PV}" \
-		TZ=America/Los_Angeles ANT_OPTS=-Dfile.encoding=UTF-8 \
-		ant ${EANT_EXTRA_ARGS} test || die
-}
-
-src_install() {
-	java-pkg_dojar \
-		build/lib/*.jar
-	java-pkg_dolauncher i18nCreator --main com.google.gwt.i18n.tools.I18NCreator --jar gwt-dev.jar
-	java-pkg_dolauncher webAppCreator --main com.google.gwt.user.tools.WebAppCreator --jar gwt-dev.jar
-}
diff --git a/dev-java/httpcore/Manifest b/dev-java/httpcore/Manifest
index a5d04bdbc38e..70c4c022014c 100644
--- a/dev-java/httpcore/Manifest
+++ b/dev-java/httpcore/Manifest
@@ -1,3 +1,3 @@
 DIST httpcomponents-core-4.4.14-src.tar.gz 591869 BLAKE2B d6f4900d8781cf7189edb2dfa9c1157b02584e8c66cde02dc261b0e29cdfb971e0323ce4478966b8e125df475ab1014fbee5b4bdf411eb118647f47f95c8f1a7 SHA512 9c713c7ea4e966a35ed391bc2a3aa10a0963cd21978c028dbd0790c9c2a6592385c7b2f135ea2836e6c495d9faea1bdcc65aa994bd5548bc2d84db38d5dbb713
-EBUILD httpcore-4.4.14.ebuild 1592 BLAKE2B 692c414be0d6b732716b480552937a1bf7bad992d9c10825a63f0c881b706dbebe880515b0f7e23dbe22ff84b0db5f05884a30a2b55f3a8d2986c86677a2a7eb SHA512 cf8aa04377e6c60954f36e58126cfca7501a921a3e967cf183aa5723481737dc2ab7d9713df0632c0f98134883daf73d59f3e02ac10164c472645ff47d40b456
+EBUILD httpcore-4.4.14.ebuild 1591 BLAKE2B 86b63de69b8803971a875fd7b1aaf34d7ac65cf2e9f4b7683f99d2d585c0896ea89304c28583dc3301d446d80872af535f69867fb57fb1e8b127a356a7b985c8 SHA512 a2f1b1a16d53d7b0ce562a752a567d951bbc02b1297d9e9cd44ed258891e7c2bee0c61699d2438c4d7d2a43536b1fb932ae2db33f31a2e239301ef70a5960a25
 MISC metadata.xml 216 BLAKE2B da3631f8f6582ec2aad6497bbadf58b72bd143f39387aa3a5ee5842db7dc470f1693503286c6c1cde6e4f1ac72c271afabd139d1cb6f25de7d06a5469dd66c03 SHA512 241c7b10d088e8d6b9ace6781434e64c4a5d2eb80e5dfceea04e09a9637475e927ebd804588e5624622b24ef60a29331ad07f995360b0c1c2d5ffa25033a9f4d
diff --git a/dev-java/httpcore/httpcore-4.4.14.ebuild b/dev-java/httpcore/httpcore-4.4.14.ebuild
index 5584b7dab67a..f5b9fdf5466a 100644
--- a/dev-java/httpcore/httpcore-4.4.14.ebuild
+++ b/dev-java/httpcore/httpcore-4.4.14.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-${PV
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 x86"
 
 # Compile dependencies
 # POM: httpcore/pom.xml
diff --git a/dev-java/sun-jai-bin/Manifest b/dev-java/sun-jai-bin/Manifest
index de77a75c7e81..46bb20fc6299 100644
--- a/dev-java/sun-jai-bin/Manifest
+++ b/dev-java/sun-jai-bin/Manifest
@@ -1,6 +1,6 @@
 DIST jai-1_1_3-lib-linux-amd64.tar.gz 3510451 BLAKE2B c16dc0e04127bf57df6390dc9d99a1e44040c0fe81ccacc88698493d3fd3483aae12d664a89bc13939655d21ce2d92b64537b073c0d1063bbf91e18129da5eb4 SHA512 5089b696baabdea9622683aa7a3569daf724fd7fa8a4f1c95073b9e96ff5c37fc55a9e3a6fe499abafe61f5f4a109770bd27172ae6711ab7b4da3de55d8b0f56
 DIST jai-1_1_3-lib-linux-i586.tar.gz 3501711 BLAKE2B eec4976124a9701367e7b61c652ed619df69fa12eb02c5288d9d1ba4845ca7e2315514fba1f75f15c8bbb90cba981972961e8d1e843a8a8ac2b000e5e4917975 SHA512 bd142eea557b68d10d26a18b6b0d04e5cb42212e98268035b1b3615d6489bbc4fa07ad141fd04fc5ae3c74f1703c9ade77130cbf8a61603b4b271e3a0e06e860
 EBUILD sun-jai-bin-1.1.3-r1.ebuild 1099 BLAKE2B 0257abd4b7fd290f56200786782459183a09c1c55e7cfe8702b85447f8f05b8e80e21a688e26bdb000b5ae28cae43bd9f9ea3b234df2cc5e3723781c6f0c3e34 SHA512 621448fc993b3376701632312d1efc7d8e675b7f3eeaf1ed2391a58b3e0e10e212a8dae9b69f2d52473703ff695e1c0edd5fc416ba9fcf8dd4e98dd2c74e0150
-EBUILD sun-jai-bin-1.1.3-r2.ebuild 1097 BLAKE2B 6bd63c72f815f2e3c96ee7e74757e3e2bf23135c61d0fc09855069490935cb4ad752aee342e0dbe5168a5ed5da92e8479f2e0284aebf3e689f758906f6a5ba7e SHA512 f36c961a1c2de6786818febf77572ca6b57bbbd2a4c97044c27a77bc394b314ede408e9753762c6001616bbc6bea4bdc7247c301b844fec0484a1286385fd143
+EBUILD sun-jai-bin-1.1.3-r2.ebuild 1096 BLAKE2B c0087efbee4ff6b2055f4661401fb582016bb660bfaf13be938be60cafbb74e442384bf01f31291f844f57fc6a8de324d307ab9e1a46cc82aee19a2318d2ab62 SHA512 a06f8f9eb99a1682f0b96229300e77d9ccd8b40cd1576189da6c55757f09f1b6a6e280ba4666ad4b1c6e9c54dfe388ef526367d848de8676dcb32325c6a156b7
 EBUILD sun-jai-bin-1.1.3.ebuild 973 BLAKE2B 07e9e2c6e99b48b56f5ea8dc8d1bc8efc9d5a353b79b398ba078d92e1d92e286d61bad00a81a580e108a64317b3c87644889cb87dd1a69f51683f59380ab4a83 SHA512 2a2e4756e1b32c14d25642d912cba5b08371d4722b69fd0bf0db0f8c8d0348a7f4bbd136b9d28fe9355f3baeed54492c3b22bffce8f616c3d3c992feb518bc0e
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
index 55b5518402a6..9ad9f62e197e 100644
--- a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
+++ b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="sun-bcla-jai"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64"
+KEYWORDS="amd64 ppc64"
 
 DEPEND=""
 RDEPEND="virtual/jre:1.8"
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 5bfd11d592ae..4af4635d55c1 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -19,4 +19,5 @@ DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee63
 EBUILD swt-3.7.2-r3.ebuild 4437 BLAKE2B f488c4f50f7019580f29cbbc374d440444a699934193db8f6251d76c2342c5a26a5b65cc7c993ffb90155f771bc9039075b6a202c06d98abbdf7a2ff5959f63a SHA512 afdf8e0de244d457b4aa857bc1f045d0a3aa304158ece0a147c7b20308a27c79b5f614dd7ab0143c4372f7155679019cd972ab28a997cd9fe666f0d2985ea21b
 EBUILD swt-3.8.2-r3.ebuild 4240 BLAKE2B 3c08a0ee771d859e07af9d01c9796571ec9295bc0be4058abb330bd62194f20c77744795fcd27412a7397e7a341b7556080d3a7589faa9548ab1f1ac97433005 SHA512 f5c8f79cb9c801062d21d17f6ccdc30b28d5d1716e63ecae00872fce2c7c1b8a6152882ab90ddf6a39d4f525429462415cef6597a9425ec59060d6d0fdbe5099
 EBUILD swt-4.10-r1.ebuild 4628 BLAKE2B 91201a8ef41b011d1727120b2bcd32daf3c7dd3e042f88e391b982234932751150425ff2cc119a82e0c5d58e4b9544f1e6568ce36f3a8a7ea69b522bbb2cf7d9 SHA512 826f37b9d626e79f22011a3f2dd64701a1899a9dc3009cac3fdbce2cf4ba0159133ec9355205eece0cc0ae6a6e6c6c98acd873a54fbf4a3080f00d92cc117cd0
+EBUILD swt-4.10-r2.ebuild 4644 BLAKE2B 3128a781fe1517bee80087d58a5920b6394363dd592d69ddbf733d6331a4eac1b7ca2c2ca2df8ab978a7264269eff3d0dd8147bd169275ab5632077548312438 SHA512 9401c712c6230413da3f4ebcbadce7dd0411f16930cd6adbe79daa193197b83bcfd41ac8f465a5ea27a34264da74a1458a8e8b806975a63e4b1e6ae15be778fa
 MISC metadata.xml 518 BLAKE2B a325a8cd71c85886ffabde744769f9edfac99311d30be502937ff560e3cdced76c92a4a90979e0d46950fa2f345d2364d21902ee13fefa4d78477bb829e6298f SHA512 088a1c3b97e2496e801234ef5a99ce14bb259f8065545e4be1af65e6e5639c273a88a77ed50c414e35c20f62e7b5183c721321a0e463ffb990dba05ea271251e
diff --git a/dev-java/swt/swt-4.10-r2.ebuild b/dev-java/swt/swt-4.10-r2.ebuild
new file mode 100644
index 000000000000..8c3986977dbe
--- /dev/null
+++ b/dev-java/swt/swt-4.10-r2.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+
+MY_PV="${PV/_rc/RC}"
+MY_DMF="http://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201812060815"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="GTK based SWT Library"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="
+	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
+	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )"
+
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+SLOT="4.10"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="cairo opengl webkit"
+
+COMMON_DEP="
+	>=dev-libs/atk-1.10.2
+	>=dev-libs/glib-2.32
+	>=x11-libs/gtk+-2.6.8:2
+	x11-libs/libXtst
+	cairo? ( >=x11-libs/cairo-1.4.14 )
+	opengl?	(
+		virtual/glu
+		virtual/opengl
+	)
+	webkit? (
+		net-libs/webkit-gtk:4
+	)"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.8:*[-headless-awt]
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/libXtst-1.1.0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.8:*"
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}"
+
+# JNI libraries don't need SONAME, bug #253756
+QA_SONAME='usr/lib[^/]*/libswt-[^/]+.so'
+
+PATCHES=(
+	"${FILESDIR}"/${P}-as-needed-and-flag-fixes.patch
+)
+
+src_unpack() {
+	local DISTFILE=${A}
+	unzip -jq "${DISTDIR}"/${DISTFILE} swt.jar src.zip || die "Unable to extract distfile"
+	unpack "./src.zip"
+
+	# Cleanup the redirtied directory structure
+	rm -rf about_files/ || die
+}
+
+src_prepare() {
+	# Replace the build.xml to allow compilation without Eclipse tasks
+	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
+	mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
+
+	# Apply patches
+	default
+
+	# Define missing g_thread_supported() to be already started.
+	sed -i '1s/^/#define g_thread_supported() 1\n\n/' "${S}"/os_custom.h || die
+
+	# Webext is also in the library directory
+	sed -i 's|findResource([^,]\+|findResource("swt"|' \
+		"${S}"/src/org/eclipse/swt/browser/WebKit.java || die
+}
+
+src_compile() {
+	append-cflags -fcommon # https://bugs.gentoo.org/707838
+
+	# Drop jikes support as it seems to be unfriendly with SWT
+	java-pkg_filter-compiler jikes
+
+	local AWT_ARCH
+	local JAWTSO="libjawt.so"
+	if [[ $(tc-arch) == 'ppc64' ]] ; then
+		# no big-endian support
+		AWT_ARCH="ppc64le"
+	else
+		AWT_ARCH="amd64"
+	fi
+	if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
+		export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
+	elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
+		export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
+	elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
+		export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
+	elif [[ -f "${JAVA_HOME}/lib/${JAWTSO}" ]] ; then
+		export AWT_LIB_PATH="${JAVA_HOME}/lib"
+	else
+		eerror "${JAWTSO} not found in the JDK being used for compilation!"
+		die "cannot build AWT library"
+	fi
+
+	# Fix the pointer size for AMD64
+	export SWT_PTR_CFLAGS=-DJNI64
+
+	# Bug #461784, g_thread_init is deprecated since glib-2.32.
+	append-cflags -DNO__1g_1thread_1init
+
+	local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
+
+	einfo "Building AWT library"
+	${make} make_awt AWT_LIBS="-L\$(AWT_LIB_PATH) -Wl,-rpath,\$(AWT_LIB_PATH) -ljawt \`pkg-config --libs x11\`"
+
+	einfo "Building SWT library"
+	${make} make_swt
+
+	einfo "Building JAVA-AT-SPI bridge"
+	${make} make_atk
+
+	if use cairo ; then
+		einfo "Building CAIRO support"
+		${make} make_cairo
+	fi
+
+	if use opengl ; then
+		einfo "Building OpenGL component"
+		${make} make_glx
+	fi
+
+	if use webkit ; then
+		einfo "Building WebKit component"
+		${make} make_webkit make_webkit2extension
+	fi
+
+	einfo "Building JNI libraries"
+	eant compile
+
+	einfo "Copying missing files"
+	cp -i "${S}/version.txt" "${S}/build/version.txt" || die
+	cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
+		"${S}/build/org/eclipse/swt/internal/" || die
+	unzip swt.jar 'org/eclipse/swt/internal/gtk/*.css' -d build || die
+
+	einfo "Packing JNI libraries"
+	eant jar
+}
+
+src_install() {
+	local swtArch=${ARCH}
+	use amd64 && swtArch=x86_64
+
+	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
+	remove_from_manifest() {
+		local subpkg=$1
+		sed -i -e "/ org.eclipse.swt.internal.$subpkg; x-internal:=true,/d" "MANIFEST_TMP.MF" || die
+	}
+	use cairo || remove_from_manifest cairo
+	use opengl || remove_from_manifest opengl.glx
+	use webkit || remove_from_manifest webkit
+	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
+
+	java-pkg_sointo "/usr/$(get_libdir)/swt"
+	java-pkg_doso *.so
+
+	dodoc about.html
+}
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 138271183792..5ca7db78f381 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,5 +1,3 @@
-DIST tomcat-native-1.2.28-src.tar.gz 423848 BLAKE2B f0528817e1ea7e90ce67d8e181c0f620211d36529809a4c89ae687f4cefe4b0f977eb53b87e70bd0132ef1a5a000df82fc8c70e08f9bb568644b47cbf8817470 SHA512 16b8659dcd228ea153d05c9ae19e3d97add944315f3b8b42905162d0e4e8a28fd51a172d59d7da8508271ecad0b8ac025a386895565acaf8e2ba11fba77492bb
 DIST tomcat-native-1.2.30-src.tar.gz 425741 BLAKE2B d39c7762db0f8c6b3422d1a4811d65793e2315e0d34fae8a37f250ff41a2c11a0c89ccaf8a361cda7cb16434dcd9678289ecec60cc5322a5fae2d6963c76f36c SHA512 51a8c55214de166cace193c3330abe77cabea56c2d05efc8c3408bc06369c328899376c94c572725ebe2887f2faf99fea05d1819fa84c712d57fd309d0476953
-EBUILD tomcat-native-1.2.28.ebuild 1182 BLAKE2B 9a7261837690e5b5a1bc07019bcf27f1c34e9c08740ede80ce86e844132736515c4ce9f18e940509f67f8f85616b376806180901da445a57f1026ceb1c085a02 SHA512 75b69feb9bd93291cd8d834394c8344fd792205d28ab6e381f07f0139b241a27c32befd5f63b3db40fac5365d22f79024ee08e6b9b38d38d4702cbab5b1f064b
 EBUILD tomcat-native-1.2.30.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.28.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.28.ebuild
deleted file mode 100644
index fd32b6403ca4..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.28.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-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index b04b8f6cad4f..9f70e66f72cc 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -8,7 +8,6 @@ DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc387
 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.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
-DIST apache-tomcat-8.5.66-src.tar.gz 5879748 BLAKE2B bfef20872bd19ffa2bb34b98a1da875fdd5f232e681458f0aef093b7eecd63a95c1cd26130f54251f149249e639d0da2577770e43314d2a86b8ee9b48b675f0d SHA512 322fda683197898f873feb375791092d33c90aac08a54889fabab0f59ecbc7b27784f027b37008c6893fdbf8ca7973b73268f42673d7e8df762419b5a536593b
 DIST apache-tomcat-8.5.68-src.tar.gz 5907026 BLAKE2B 2312edb94f98ee98b594325fbc32521776e9cadc4422a3a46f3651f1fee072a99c5f6874378ac06215396504d34ad750edd6ec3399a3931554068195a8ee15ef SHA512 579a35f944ead756995d288b66ea8a4ab30289a90c32aa01119abcea85a8524f6594ce5cb7ac9df6d352c1e3b54a18c814b5d3a6409dce6a43614e3a89284066
 DIST apache-tomcat-8.5.69-src.tar.gz 5916996 BLAKE2B 4a3ef958b6bb0089149877c25baaa2c1a0bcee473c0942b419c5c1d7071dcae4f8a6e6f1805efdee1201042feedc64e213fffbcdb35cf2b7f9a67217b8dcad48 SHA512 467dd38bd77d8b5ac6fa2acf9f6ee71d04467a3182647757fa47f5d1d9576c96e5061db61ba08b04318f1db9ee4f2bcac7b45f1f9f4f81cd1807a57483dd7bbb
 DIST apache-tomcat-9.0.46-src.tar.gz 6068533 BLAKE2B 400814281aedd588c008a1363199f8602e856870d4c39d536b13f8a357c2390d2db689940f4a6971ec74a84e8e400174e72610e0d64a220de41f2dff419dda3c SHA512 dc380e23aa87273c6ba32e79659e768c551b07812635c2f1c62d2c34b493b1d3d51b4548fec5014fdb36f8461fc90942aa7917874ddf3d6f5c5345d8ca02dfc1
@@ -21,8 +20,7 @@ EBUILD tomcat-servlet-api-4.1.40.ebuild 1001 BLAKE2B c3a337a341d14d193e0b409e2ae
 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.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
-EBUILD tomcat-servlet-api-8.5.66.ebuild 3002 BLAKE2B 18e52e0a01dac33784343e0204513cd694e227ae12666f8158106c053956723168d5ea0ce526bd46ec9983ad49b0b6a9ad21b4da2fe38ed5b71f9167ea510517 SHA512 b878c7a52254babccc96fc3e144bbf08a5fe42d04de614a0a2122bfc8459be7fe7c2816d517ee43da131fc542c795d348e420e10aa507cac6fff9b67a788ac6c
-EBUILD tomcat-servlet-api-8.5.68.ebuild 3006 BLAKE2B 039405bb1fd288272473d64eb9e4aa44e5b7c2dbd54b25e1fde030f4f511a43127f2d88e45b549084afc3b1dd4024d09360601305e021e7d2fd01b8a49598e5e SHA512 4dde713a2e6484a959abf8c924ab5c48509c53e9f0b7491fe67b8717790f1231e8e4fc7d367cd77297700538abe4b00661509c55454841704dc7ef943a9cb5ac
+EBUILD tomcat-servlet-api-8.5.68.ebuild 3002 BLAKE2B 18e52e0a01dac33784343e0204513cd694e227ae12666f8158106c053956723168d5ea0ce526bd46ec9983ad49b0b6a9ad21b4da2fe38ed5b71f9167ea510517 SHA512 b878c7a52254babccc96fc3e144bbf08a5fe42d04de614a0a2122bfc8459be7fe7c2816d517ee43da131fc542c795d348e420e10aa507cac6fff9b67a788ac6c
 EBUILD tomcat-servlet-api-8.5.69.ebuild 3006 BLAKE2B 039405bb1fd288272473d64eb9e4aa44e5b7c2dbd54b25e1fde030f4f511a43127f2d88e45b549084afc3b1dd4024d09360601305e021e7d2fd01b8a49598e5e SHA512 4dde713a2e6484a959abf8c924ab5c48509c53e9f0b7491fe67b8717790f1231e8e4fc7d367cd77297700538abe4b00661509c55454841704dc7ef943a9cb5ac
 EBUILD tomcat-servlet-api-9.0.46.ebuild 3009 BLAKE2B 6a687dee6eeb283532ccffe1e29c248755c2aa639d7a716b21b6097a99c2bdca62fc6b1acf017cff5de27d2a7e91037f2b1212d6bbb5699b3ba9f1b04f9d909e SHA512 e330e8959e3d3d2d7f3639160065e35963515df5bb886672c4359c26562fc2fab9d77ff40c8fb23e6ecdf9a67adcf1ee77f69da8fed681b7b2e0acc67d02b945
 EBUILD tomcat-servlet-api-9.0.48.ebuild 3013 BLAKE2B de9767718af5e643a912a112bde60431cf461d02bdcc157834a3806299f3ebebf8df8b467278727c1eb5ef588874c70f3637f8ce2f1fe4e0b5cb169aa3954683 SHA512 7d5febfe5fd7d4760e03449dfc177f1c0aa21d9752f49429ca2ecfc3f9b8bef45381cc83f6bbd1a132b0d9366d65fb45c32ff4e3b1d87f922bb6b71fed7f3a3d
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.66.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.66.ebuild
deleted file mode 100644
index 8846bfbc900c..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.66.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.68.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.68.ebuild
index eaffc40f4037..8846bfbc900c 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.68.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.68.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:*"