summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/Manifest.gzbin86965 -> 86983 bytes
-rw-r--r--dev-java/jackson-annotations/Manifest4
-rw-r--r--dev-java/jackson-annotations/jackson-annotations-2.9.10.ebuild (renamed from dev-java/jackson-annotations/jackson-annotations-2.8.5.ebuild)4
-rw-r--r--dev-java/jackson/Manifest4
-rw-r--r--dev-java/jackson/jackson-2.9.10.ebuild (renamed from dev-java/jackson/jackson-2.8.5.ebuild)6
-rw-r--r--dev-java/jdbc2-stdext/Manifest2
-rw-r--r--dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r3.ebuild4
-rw-r--r--dev-java/maven-bin/Manifest2
-rw-r--r--dev-java/maven-bin/maven-bin-3.6.2.ebuild59
-rw-r--r--dev-java/openjdk/Manifest8
-rw-r--r--dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild2
-rw-r--r--dev-java/openjdk/openjdk-11.0.4_p11.ebuild2
-rw-r--r--dev-java/openjdk/openjdk-8.212_p03-r3.ebuild2
-rw-r--r--dev-java/openjdk/openjdk-8.222_p10.ebuild2
-rw-r--r--dev-java/oracle-jdk-bin/Manifest4
-rw-r--r--dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild2
-rw-r--r--dev-java/oracle-jdk-bin/oracle-jdk-bin-11.0.2.ebuild2
-rw-r--r--dev-java/oracle-jre-bin/Manifest2
-rw-r--r--dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.202.ebuild2
-rw-r--r--dev-java/sun-jimi/Manifest2
-rw-r--r--dev-java/sun-jimi/sun-jimi-1.0-r3.ebuild4
-rw-r--r--dev-java/sun-jmx/Manifest2
-rw-r--r--dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild4
-rw-r--r--dev-java/tomcat-servlet-api/Manifest18
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.94.ebuild38
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.96.ebuild2
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.43.ebuild2
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.46.ebuild (renamed from dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.42.ebuild)2
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.21.ebuild39
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.24.ebuild2
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.26.ebuild (renamed from dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.22.ebuild)0
31 files changed, 104 insertions, 124 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index b094b88a5b48..c39758f413a9 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
Binary files differ
diff --git a/dev-java/jackson-annotations/Manifest b/dev-java/jackson-annotations/Manifest
index 94f5e365490e..6cf2dc5d5231 100644
--- a/dev-java/jackson-annotations/Manifest
+++ b/dev-java/jackson-annotations/Manifest
@@ -1,3 +1,3 @@
-DIST jackson-annotations-2.8.5.tar.gz 44906 BLAKE2B bea484d1b7b7312ff83f87f373fdcecb718b62f1d694ee687df8da7d3f09d70007bc4a6da111a57bed14b2a7921c71825b966f6709f3e143ce9f6fbf6069b45a SHA512 2d98a51c0e3b44e3ac2fe47647b0c7499d7b978cd46df275807e3802ba877717a6c2f620edfe581f31ef947de7096950816104250989eebf029d7a5bf1b53381
-EBUILD jackson-annotations-2.8.5.ebuild 1039 BLAKE2B ec39892afc0cfd82680a94cb84104e60f0a881143000f7ea91cf4ef33dfa87199f2c4f4fe02e64ddc7df77f92cfa246c626ddf6ece32185c9834ca2afe773428 SHA512 c5b3aaa3fdb15c111ced4a3ad2f3f5772a764d3ccc6e8a8f137c7f956a9134379bc8283bceca0eb5108281c1a7e14b5709b0221615a681f973482984cd010eae
+DIST jackson-annotations-2.9.10.tar.gz 57322 BLAKE2B 85e3ac040e3adc986fa7b2a1892bb536ff2b46415af9390a6ec4e59bc9770b2bced4fd80edffc7b2083853b0b1bb5022dde137fda7e9920ec27e3fa54858e5fc SHA512 27c28e9453570aab4758031d406bfc8b8ba0eb443dcd0a884d6098840e5b577b2628288daf10e9de6ce5d1e4da2f4b8e4ec36a6559233e012725a906c4da21b9
+EBUILD jackson-annotations-2.9.10.ebuild 1036 BLAKE2B 34c92c554471a5347b8eaf8038ced92f1836c22134ab714afc32899cb1e2d8af462276cfe1f6244634820a4efd6d781cd6f3a3ed973a1efa6ba9c2f90bf30691 SHA512 50e0dd7ae6ff3f2d7da4e7f90d3c9b33e233ff8f84b86730e4b6d4e714f89562547a1a2280482cb982b775b300161f1af0246b76bcd61d992c34ff878aaa08fd
MISC metadata.xml 340 BLAKE2B a9f7d89117ded69cf6f51d86ad904597123d218e694938716deafd4fa66f0308777eaf89a42f1b8c030b0fb23646ddbfd5dfddebe8a17562bc332cf8f174b469 SHA512 52a2836de2359eb77cf2ff83ecc97efb34e19028261cb69655808cb2e939bb1120eaa4e3dcfac242747998ca397caabcf9ca4448e52c8a9772558f3ebf4037f7
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.8.5.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.9.10.ebuild
index 983a3502db4a..ea9864354038 100644
--- a/dev-java/jackson-annotations/jackson-annotations-2.8.5.ebuild
+++ b/dev-java/jackson-annotations/jackson-annotations-2.9.10.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
JAVA_PKG_IUSE="doc source"
diff --git a/dev-java/jackson/Manifest b/dev-java/jackson/Manifest
index a82647c4f01c..9befb833c7ca 100644
--- a/dev-java/jackson/Manifest
+++ b/dev-java/jackson/Manifest
@@ -1,3 +1,3 @@
-DIST jackson-core-2.8.5.tar.gz 338770 BLAKE2B d02643ecd2fd2528d0fedba7aae54a88ccb223491f1198f3bb8e8f6f70d5a70be3d250e57c9b5b17bfe44c0508eab725fd57cb17a1e2d5224c1ef6dacfdb3795 SHA512 43a2a7959b182ecf3a805d138bb1d49e1dd496d9a36274f5d9f2cdec5f06d02b1cde0e932216768689609faec2bd3f8d7747c61db2a12d0ae68bf22e87a4782c
-EBUILD jackson-2.8.5.ebuild 1474 BLAKE2B 40772d814342eccf87edbae9297477a0c5e7f84cfaeb3e6414f3e66f6e400455c4992e6608dcbaea98c7a4a37f955253e8fc7a945d72f65393b09dd727d2a458 SHA512 5aa8a0f55daab73110fb586370050665dbd22cbeb0cc2323857557a0ad2286a4f779e411646f94cb179c67a38490de873e84f723f20b92e91beaf65939cad52d
+DIST jackson-core-2.9.10.tar.gz 416803 BLAKE2B 9d8efc39b09b9619da301dc7fec3bd6339133c3fea3af46bbd77530883662b3b1d4ba2536cb8bd7ff7609a79ae6cfce135a3a5d75076bb7884e5e2878ac0107b SHA512 26b22e3fa60190877f5227c936ee32fdb4014347307904b140a6c787bb732df598b0ed48e7014cb6e51172abe52783e4d866f135706c8ebc77e24bdf087e9e71
+EBUILD jackson-2.9.10.ebuild 1475 BLAKE2B a5f482a1f59bd8341864ee54b3d3cc28f3807e8c50d29c484012806a74816fd634e64ecfc11802eb84a7ac66d9d0c94772de57d167069cc95ff6a9a436482684 SHA512 86d390ad11e76da3723f9a2b99c0c49511744e499cb3de5d4920ae14009822949e9bfe0b2351997a0624655d635cdee3582fd2ce7c816ea948736a867c0966d9
MISC metadata.xml 333 BLAKE2B e99f0c591182d75965d697a1dc4860ed964ac9cac4140b68d9ffc5ae1ae6021027b0514ca3f57520fe948c60388e4670c95f63546f2355d9d81258396a870879 SHA512 c5994d267b092ad22aec1586e2a884ed023f945a005310205e737fdf60648837c15764616bba08c8a69314ebee43fe9940c790c624555ec00c0e3d3d529d3a1e
diff --git a/dev-java/jackson/jackson-2.8.5.ebuild b/dev-java/jackson/jackson-2.9.10.ebuild
index c28af8794347..20987cc01db5 100644
--- a/dev-java/jackson/jackson-2.8.5.ebuild
+++ b/dev-java/jackson/jackson-2.9.10.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
JAVA_PKG_IUSE="doc source"
@@ -42,7 +42,7 @@ src_compile() {
src_install() {
java-pkg-simple_src_install
- dodoc README.md release-notes/{CREDITS,VERSION}
+ dodoc README.md release-notes/{CREDITS,VERSION}-2.x
}
src_test() {
diff --git a/dev-java/jdbc2-stdext/Manifest b/dev-java/jdbc2-stdext/Manifest
index 2ce46e7c0f7b..f1485fdee5a5 100644
--- a/dev-java/jdbc2-stdext/Manifest
+++ b/dev-java/jdbc2-stdext/Manifest
@@ -1,3 +1,3 @@
DIST jdbc2_0-stdext-src.zip 21642 BLAKE2B 475892fc77247a93eaaf400e48c585832df843cedcd1ff2f8de364f6895fc9661d1d2241969b126fbb056b23be78085317fbb14c69c349612d39b700913a5b72 SHA512 5157a5835983c094b13d947a39311d08ea57cd8e60197176681289d41a209f3f8b464e1e0dd97ed714534ba5afb749807e02efb3edba4e2c91e273e71f6f1ce3
-EBUILD jdbc2-stdext-2.0-r3.ebuild 1532 BLAKE2B 307b27dfb5e8eb03279468d0fd1cda8e378c6d90568fb6bba62beb1a082c9cc02de0abbb9206921575db7ca253c3b231884eb5d1191637e134d8c0e0bd9c9582 SHA512 bcd2ee5029da8416bb5cdc3605ad944f1e5c3cfdcdc65ada998deb1d82ff3b52ed4705cfe850d452d2a29f863964cb8c6df2e8c6263d5ad6c3cd233a0c3d0ce6
+EBUILD jdbc2-stdext-2.0-r3.ebuild 1540 BLAKE2B 146a0d55ecc9e6e115844cc091a73d144738bc29756faab2b36b7599198662169fd6c8ac8b2544158d524a6f55b1b344de34c0ef6b19c26251ec2917b8930dbf SHA512 b94b09f843dc560b56999e7fce4ccfbc9bbb78a272edaee044a5485397b1491af85f245fa8608769b4c23bf2ba8a666cd5c2652507fac6d952b5e3ac9f4bf875
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r3.ebuild b/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r3.ebuild
index 1c8b12f2670c..2bdf7b0aa246 100644
--- a/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r3.ebuild
+++ b/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -18,7 +18,7 @@ LICENSE="Oracle-BCLA-JavaSE"
SLOT="0"
KEYWORDS="~amd64"
-RESTRICT="fetch"
+RESTRICT="bindist fetch"
RDEPEND="
>=virtual/jre-1.4"
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index d4c8e15b56dc..ae86a7296417 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -3,9 +3,11 @@ DIST apache-maven-3.1.1-bin.tar.gz 5494427 BLAKE2B 39b8b29a4747562d96231f575ff5c
DIST apache-maven-3.2.5-bin.tar.gz 7956528 BLAKE2B 41313c35859946c8387b0e58f4a25b38d97d48065deb1db9ddbb576417beef1c3391e0a06526c51878f0a7e451b949f8f8ebc001611429b68332dcef24b594ee SHA512 0cdbf4c1e045ac7f96c176058f19ebb838bd46caadc4fb479e11eda67efbb66218fe67c370ddec6d2e4d91091ac9e81ff9eea8d64174cbe1e6d5f7e15962cfc5
DIST apache-maven-3.3.9-bin.tar.gz 8491533 BLAKE2B c6947c379dd2d64fe28eeab52da443d771c276553d40f70cced2637df17b18c95108932cbb88d4b747f6a8c0a47150849360ffa9095f6ce50724abeaa2369152 SHA512 9b4b22aba67af48648c634e30edbb03de2a7742b7d4e58b3d637fcd20358a51ccb288dcbd473169a58b9322f7c8fbedcf5336b87d06460d0b20ce37d4c3948b0
DIST apache-maven-3.6.1-bin.tar.gz 9136463 BLAKE2B d630ceeb1c35f742eae324a025c3385fac0b7aa58e0bd3fe239a2027138127604a076958e5f6db6bba4f1e99bc524f0c62643bc4ab4d570378e93e8f72c234c0 SHA512 b4880fb7a3d81edd190a029440cdf17f308621af68475a4fe976296e71ff4a4b546dd6d8a58aaafba334d309cc11e638c52808a4b0e818fc0fd544226d952544
+DIST apache-maven-3.6.2-bin.tar.gz 9142315 BLAKE2B f8b4ad4148a508b076cdb9f5ca322860157d6c3517c1ac7bd7d369066cc1567681761e1b638ea74f20461f8c111ff488e1478399a2ebfd406e91a10ace582d86 SHA512 d941423d115cd021514bfd06c453658b1b3e39e6240969caf4315ab7119a77299713f14b620fb2571a264f8dff2473d8af3cb47b05acf0036fc2553199a5c1ee
EBUILD maven-bin-3.0.5-r1.ebuild 1288 BLAKE2B 5df56d1fb434fa78f2e31b706923a954f3eb544287ef2f2c903972d1f12b107c166b1415a04f9aadfaac0e1bd5d9c57b9227ee3eb1da8b950f4d3925f6f375d4 SHA512 d661caf7691165fceddb6b469d36ecc533b52dc2ee376cbc3bc1d158e5ea37f37c07212d6c6f79269d5101cf953c1b025b81703fc1a6493ceb88ebcefc9d652a
EBUILD maven-bin-3.1.1-r1.ebuild 1234 BLAKE2B 4e3435b9bbfb4661f36cf1375211fc2818d0fcc937319bd918615c9ade29ad913ce570bb2ba3bb32a76bf52941a4e45c02c08a5617eac6f5745714ab1620e6f9 SHA512 d02c484ce95bff8e37d9c360ad49a987796e1332a7a9a33dcf69a7d472db4b50bc2f7f715c48786238b39bceac7ee707f690f47091aee290885703470b6ef114
EBUILD maven-bin-3.2.5-r1.ebuild 1232 BLAKE2B 7e0fc95a813cd06342c77aef9aa137e06ac50f9dcd7089f175ece037583085f8d63fbd4e6cbdb3a0e779ce5eb018b19b6b6139aa8fa8dc80eaacae6561bf1862 SHA512 66a6e136376517e82b862bfca3033dcb92366bec865b51fafb19ce27a4e8d50e97ebef916b39b4c8438a69984698c71e8a146969cb16aa6a2d963675a054c992
EBUILD maven-bin-3.3.9-r1.ebuild 1236 BLAKE2B 9641f5146ef168f7b1edb7616940f492011adc2d96d5c9852ec22171f2d3ab45452ab0ff2801348f82c726fe12c43160f2056b06d973b05c2d4f871e13d4fc16 SHA512 fe144d82cde207dca1b10cb072a747e8bc3649e493301bc9f45280e767a0ff85946f3702d1e86ea047a430fe8d088d2adae28a651e2c04e16a7f78e06c5f5b62
EBUILD maven-bin-3.6.1-r1.ebuild 1236 BLAKE2B a18fa4ad369338ebd818f894414e084b895df52c9fd2123db1136133b1b71f3e11b2f2bd2f0cc76847c1f0998416317d7ea9b44f65336369ef5456a57e1ddd7f SHA512 ed8e9bc788d03e581e3d802eb350fce294034c726294e9929465d5a574900845cd003cf94251dc6f3b7739cd9b2612b3a044c705fdd48f0e678dd47054e96ace
+EBUILD maven-bin-3.6.2.ebuild 1238 BLAKE2B 70b2f11810a3ad337ad44c5f8ddd205330f34a2fe88eaef02282272a65cb407c5b989295b198860d47d47c5e3bb58856f6c71fdb577b318b871d7d1a28c43200 SHA512 3b8ebad0bd82d23b0d29d04e970ea43064b7018ee3825487d99022ba315650daa98061e03374192f7cd90d933ae08b64480484e9b72f197b4a9a0b68b8e09fe4
MISC metadata.xml 610 BLAKE2B 84180dd51fc9e6b9089111a4f79aae2f2e8339a50b3db00cebb103714e7bb87c99a7fbfbd2401a5646f044b6d78cf370b1a1af7e524be91b7065176cf6b8673f SHA512 e761707a3985b90298ab8511d26458c9c04c7c1750b861f2c866862db07345d645953559b6ca8c1cdcd75c4aae1e84a7646eb376c32f0fe87427d4938d44a083
diff --git a/dev-java/maven-bin/maven-bin-3.6.2.ebuild b/dev-java/maven-bin/maven-bin-3.6.2.ebuild
new file mode 100644
index 000000000000..32ededf3fc7b
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.6.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="https://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.6"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ >=virtual/jdk-1.8
+ app-eselect/eselect-java"
+
+RDEPEND="
+ >=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN="${PN}-${SLOT}"
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+# TODO:
+# We should use jars from packages, instead of what is bundled.
+src_install() {
+ dodir "${MAVEN_SHARE}"
+
+ cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+ java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+ java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+ dodoc NOTICE README.txt
+
+ dodir /usr/bin
+ dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+ # See bug #342901.
+ echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+ doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+ eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+ eselect maven update
+}
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index a939bc475eea..2f6d81ebf53a 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -19,8 +19,8 @@ DIST openjdk-langtools-8.212_p03.tar.bz2 2393112 BLAKE2B 96656795114bad1d2e5eaba
DIST openjdk-langtools-8.222_p10.tar.bz2 2394871 BLAKE2B 376dd5d5cd86704b7cf6d02e8a117ce0d36f43316cc9000bee3f3f1fc7568e080c039e9adc40b6fb78720e2aa8ac921c638e20be1766e2252b29329bd17d28b8 SHA512 79a1db1c8afd5d6834ae5e565929eeb7567bc4ff3fa823789f6f170fb21e0df71d965595f4fb53efb6c5af1c1b4c7c8e2edc91e60178b57a8957935968f480c9
DIST openjdk-nashorn-8.212_p03.tar.bz2 2854888 BLAKE2B 3e5a1867d8a5db301fb3512ebdc4dea8f8226fe3308142d6f3f616795c9cee0d598a257ccd7e790ec440c966339399776d1118764dbf882a46a2daa32d81ddd5 SHA512 5c7fba1d567aa1d0602ef045b24a8624fed9ced72b3bae030ee15ea133ed2223e402cc08c996ff253c4792570da87b7713f351c84704b12556466349f6452f74
DIST openjdk-nashorn-8.222_p10.tar.bz2 2859130 BLAKE2B d43b2e05dea1f97eff9e6d81ac0a6c8bfbe8cd444ff23df4b7d2fec29b678386893c169742a80fca6f0a785189796d2a6f29c10011a835cf5ac9e74001ae2b72 SHA512 453cefcd3f34cf6fca9bb14176145c9e4620e4188461b49049e5363cd62d87cc4f7703356369677dcd1e4862de0b5c16d1c505d66317944226a590af56026ac4
-EBUILD openjdk-11.0.3_p7-r4.ebuild 7394 BLAKE2B d82ea0a57aa97fb40887b7f4da9bc7a6c61b17c6bb0026eef979e9cb44937a7c253e0364c0487348d6274cd7e6f1f84d0a7a3e9ce710729992b1484b42b41531 SHA512 cfb17b2bcfff4a0d63dc4e1a180ad1b088c7d49cd1949ee0605e68342424e4d1e91468cb0c053937d535423d569d7f4164f99c05ffc1618ae996337d73c603d7
-EBUILD openjdk-11.0.4_p11.ebuild 7515 BLAKE2B a7fc8c6fe736d87f0d92ef6b1b7ccafbcce6da8d1397fa3562e6119215e123228906ee44e7a824b143f040e7a154862960f34075393898b9e2d7645310afb3ee SHA512 111db2827aa3eeb96e62efd4db9b551f22877b8740b5d7990b72cc3b3e52e3f9520d58decfe05f8d248dbc67c1690c5a48082c3aa5b2928528a27aa4ba21b70f
-EBUILD openjdk-8.212_p03-r3.ebuild 7320 BLAKE2B dc4a418d885c1db666dee134dd5fa73a041772dac925fe7249a24531ed7e38e29c8f1f8ea4d7aa41dcea7173cebb1ef110b6ffe8cffc8bb7b0166751e13e8c2b SHA512 c6b402eadf629322aaa9207cf8ebfcacbd3bb702ee565372200b2f74be8d26b4eb41ffdfc85feb945e8dc044c7f4c5c650172fe27cb59deb32daaa95be3e1063
-EBUILD openjdk-8.222_p10.ebuild 7405 BLAKE2B 4f2f21ebac598a3c8615eeecefecb54f440ee62eb1c6a2a167dd8d4431297c9949e8587bac40e2948151176150c8451e2cb4de610567af394633edcaa085e7c9 SHA512 ad09d11861fdbffe39b51c447ba5b8a0a4f2adf61c231dfdf95b1709eb35becc81a3db7724c6c47456328d02b070a855ac6f45feafc1c62cd0e1f63ce1aa5cf1
+EBUILD openjdk-11.0.3_p7-r4.ebuild 7412 BLAKE2B ae6891fa80816a734f9f9d85c23451091d59ef3132988431077fb2f4a9e42ab395ac60db0dafe2ef6c73b9de0bdf0ae850d5feade7d06b3177ab139fa2ac34bd SHA512 bbbd123c244b8e988af793bb0731d9644a640871e87e15824f787cce63dd8daad31d1772e5e1533cbce723283247c92bd6da214606b1d18fa53479b883572046
+EBUILD openjdk-11.0.4_p11.ebuild 7533 BLAKE2B 5ae76dae294c63c4286cc92c912f86e69fcb087904354408c782ee284c8bd56d4a919edac3c98cf89d10f4d2696c467352648dd5fb578c9c83af37ee318aa2b4 SHA512 f63f91e0c8310890e6616a281d12e2077ad73b35e3d055bc0d63d4c02ea7412a83dbf75c6a7e24e1a6e82919d2207fe6132dd77560500bf6eb5d18628188c36c
+EBUILD openjdk-8.212_p03-r3.ebuild 7338 BLAKE2B 2f1234bc40edaca88f1519a827ce29824b97e2b8ed3cfe366ff5fb7bab342f9ba5eb9f134edc6853de10e9c962e2957436b323720cbd5b455621de4951ae3d8d SHA512 891fa8038fd6ee9990d71817022c1659cb15a98ca738bd89b54977708fcdba96c2d28572414d4e81f36baa6f7342eae0097360ef77eb06debe0b6d0663ada6cc
+EBUILD openjdk-8.222_p10.ebuild 7423 BLAKE2B 441c46eab29c687dfd8f3208404e1881cee5b3e6d8693fc9a1b8a9e9d69fd42cc76a020a9208fdcc6773e79db01382687b5ced207d62e832db594e7993c2a3d8 SHA512 ea10d96953b398b5c73a967d22874392f6e733edfccb6e1f1a7ba2afc492fd76c0fe65eb2aac828f3f0c71376b48693510fb443f286d219eddd32af8f68efd29
MISC metadata.xml 1398 BLAKE2B 7b99e080f6dc261c94314c7f7a0314ee25b48752ca494dd23d1534c5e8e3f930601262a0316ed674786c5fd960dfbc25dd6c6768cd06325ef45c0b41f920eafc SHA512 1747f484c6f784cb551f0969aab9ca1e6c42509c06b6187b72f3e16861ce3e2e71e131deb1ae6ebe2eda1c768276794cd5a0db7918eb419b9502a3c45bf78959
diff --git a/dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild b/dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild
index 67e91789000b..792678b70287 100644
--- a/dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild
@@ -183,7 +183,7 @@ src_configure() {
fi
(
- unset _JAVA_OPTIONS JAVA JAVAC XARGS
+ unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
CFLAGS= CXXFLAGS= LDFLAGS= \
CONFIG_SITE=/dev/null \
econf "${myconf[@]}"
diff --git a/dev-java/openjdk/openjdk-11.0.4_p11.ebuild b/dev-java/openjdk/openjdk-11.0.4_p11.ebuild
index d9e47c67e52e..a40f54aa69b2 100644
--- a/dev-java/openjdk/openjdk-11.0.4_p11.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.4_p11.ebuild
@@ -185,7 +185,7 @@ src_configure() {
fi
(
- unset _JAVA_OPTIONS JAVA JAVAC XARGS
+ unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
CFLAGS= CXXFLAGS= LDFLAGS= \
CONFIG_SITE=/dev/null \
econf "${myconf[@]}"
diff --git a/dev-java/openjdk/openjdk-8.212_p03-r3.ebuild b/dev-java/openjdk/openjdk-8.212_p03-r3.ebuild
index 2f13332849d1..7626286e5fa9 100644
--- a/dev-java/openjdk/openjdk-8.212_p03-r3.ebuild
+++ b/dev-java/openjdk/openjdk-8.212_p03-r3.ebuild
@@ -182,7 +182,7 @@ src_configure() {
fi
(
- unset _JAVA_OPTIONS JAVA JAVAC XARGS
+ unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
CFLAGS= CXXFLAGS= LDFLAGS= \
CONFIG_SITE=/dev/null \
econf "${myconf[@]}"
diff --git a/dev-java/openjdk/openjdk-8.222_p10.ebuild b/dev-java/openjdk/openjdk-8.222_p10.ebuild
index e0c0bb541293..2bb661e689e7 100644
--- a/dev-java/openjdk/openjdk-8.222_p10.ebuild
+++ b/dev-java/openjdk/openjdk-8.222_p10.ebuild
@@ -182,7 +182,7 @@ src_configure() {
fi
(
- unset _JAVA_OPTIONS JAVA JAVAC XARGS
+ unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
CFLAGS= CXXFLAGS= LDFLAGS= \
CONFIG_SITE=/dev/null \
econf "${myconf[@]}"
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index c8f285cdb069..0a67a4f11a39 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -16,6 +16,6 @@ DIST jdk-8u202-solaris-sparcv9-demos.tar.gz 8838689 BLAKE2B e86ed9372d9d76abb4ee
DIST jdk-8u202-solaris-sparcv9.tar.gz 92381302 BLAKE2B 331eda8ffa0128853e872f7f2543e966efb2498b62f8d1179d9b47d6af8a411a59dc9b1733423ea73d330cba3cc59f10911e6c81dd6b9f5b497de6ec2f73a864 SHA512 e02fe78552e3c21d40c9bf380228bafd5ff46034d6b9040d0c08ec725003aa5be7da8c61a72a8175bf49074ba89e0e172019db8aa823b5b349414950afc56d33
DIST jdk-8u202-solaris-x64-demos.tar.gz 8830525 BLAKE2B 6b6ced784d5b549d647c29b5859e376bbb44d3310d424bfdb087a3043d4849c43c24a370f166739850588f2b83ec7f24b3f3d9ae68a544f4f1cc152249137057 SHA512 eaa9adf1df2e554d2c76ea5f109e0ccf2f7c4a8221c78c402d1bfeb1da74cfe8bf2b8ecdac4cdfbef6b63b7439f94daadbcecd4dadfc73456400387c6d3a6353
DIST jdk-8u202-solaris-x64.tar.gz 89523049 BLAKE2B 4b93344feaf6235d2e41cee688668c067ebb8107ba62b66d6cffec0b3b021a2f34537957743dfecfe7e97231ba709c948da0deac3bbbd7a9ca7de2086ee7f359 SHA512 4b4480bfc25be8d4bc8efe4aac3b5c28c240fd7f39875b5976bf735f58e11c39083d6c48387ecd81b507fd8284296df7844675450e6b5edc2c04627a73cc5923
-EBUILD oracle-jdk-bin-1.8.0.202.ebuild 8499 BLAKE2B aff03ec92a390ce36ceb77ed96794d35318b768f14703226bc0d94ce4536609cc33eadae66fb7f34fa12b12c2a159ca28acc60af283d596b008469c70346b68e SHA512 1785b6c76c4bca2ba2ab98dae9dd85648ca754bc5740ad24fa53c5aa8f61c042e97623776ac8ab8b26721f212fe07794ef4e1fa4d970dd59bbbb8c9e4a7dd73a
-EBUILD oracle-jdk-bin-11.0.2.ebuild 6921 BLAKE2B ea5ed5d866f51767aad5781cd9b34dd5ed2490afe815e1139b80dc6b6940f27c799269aea4eecd69e5586750611de92a8114fd52982bdd839b1d1ad60cbb69ad SHA512 5132b1fd4a3b0de6c4caa1f3c2e1446c0db28c7177d3599a733214e3ff49da756208d1782ccec4e36013a6887f8a7a7409510273d3ceb17cbe52da3ce0b31a72
+EBUILD oracle-jdk-bin-1.8.0.202.ebuild 8507 BLAKE2B 21f150ef74a2c1139d71508a1e94d8527cd9639c3e3c71849ffe28ce6298b0ff7538d6982cc8e5c3263e17036da82c1b3a47005ae3b95af8f8581c52ee5704e2 SHA512 cfbbd1a81bedb21160ba00a3df6a6c9dfdb9300416453c5721b56a88d8b4dd9e6e3d8bd81c5b8815da9b5e8cf2c6c21892798f0894ef2f1321e6a834d9870b8f
+EBUILD oracle-jdk-bin-11.0.2.ebuild 6929 BLAKE2B faf728d437351afb603fc2fff362ed3c0333c61355091de3705e014d4337e77afafe3f896d69dc9d55937b523689db4bba48050a208acf1b7e0e767ae9879233 SHA512 dcf92793aebc5a8cef0fed6ba2d031273afb8f2f540eab13c8f63b565e39d17fd0cb8abd483f24a5aca09ea88f50eb20ab288d7cab9226ff6ef552dd395650f0
MISC metadata.xml 1058 BLAKE2B 1244803eb809b35a51503b49d50f49f08f10e39291c9bac3c4534b7f9391dbc0f944422ad3e80a4a8d35f2a4054add8ce2e5eab7860b60a0ad2a1786e0703860 SHA512 a03c7f2240090c96033a0739387f2cedd94bda4047b8698685ddaf229de7817ceff70cab3672d77db759e6364614da53ce151f5293a17d7b87ec1d855f5e54fb
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild
index c1ce65502d32..6961bd389bef 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild
@@ -45,7 +45,7 @@ LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
SLOT="1.8"
IUSE="alsa commercial cups doc examples +fontconfig headless-awt javafx jce nsplugin selinux source visualvm"
REQUIRED_USE="javafx? ( alsa fontconfig )"
-RESTRICT="fetch preserve-libs strip"
+RESTRICT="bindist fetch preserve-libs strip"
QA_PREBUILT="*"
# NOTES:
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-11.0.2.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-11.0.2.ebuild
index ffbe55324092..7456808001d5 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-11.0.2.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-11.0.2.ebuild
@@ -23,7 +23,7 @@ LICENSE="Oracle-BCLA-JavaSE"
SLOT="${PV%%.*}"
IUSE="alsa commercial cups doc +fontconfig +gentoo-vm gtk2 gtk3 headless-awt javafx nsplugin selinux source"
REQUIRED_USE="javafx? ( alsa fontconfig ^^ ( gtk2 gtk3 ) )"
-RESTRICT="fetch preserve-libs strip"
+RESTRICT="bindist fetch preserve-libs strip"
QA_PREBUILT="*"
# NOTES:
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index def59c78a307..e3ba43b7416c 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -2,5 +2,5 @@ AUX fontconfig.properties 11196 BLAKE2B 31abb25a488c4680ee6a276d4c4fd0f0c8da5572
AUX oracle-jre-bin.env.sh 749 BLAKE2B b8c1f54712f4d41fd78bae4e7ad9e351516487b3c4573593674c1f340c4f9bafe9a283c35f8c3f136e1f93a6b0c8f6cf85837b4532db62059c7e66f05d7e0610 SHA512 273fafcafabd64946932eb42552476aeea2a9fc1c803cbcaa4f86b4fc8c80d109abdad068bf2063d7ea7e7c2d2794d7dc96dca6aae5ef8787b98ad57f467fa69
DIST jre-8u202-linux-i586.tar.gz 90106000 BLAKE2B e756771caf8567c58870a267aafc9d48e98f06da1373a33bfdf40cc564c8df1645df38ad2f6951bc34d703bb0f4646b52ebf008dfc470231b4e93078c7730862 SHA512 573e32dc715d280084e71999e71a2875a488cbbba2b42c5107c55669c8842dd4ca6c6f42034b5e0b705c22a7a1d9799b456211034a6f351bc9d8e8fd803e0ad3
DIST jre-8u202-linux-x64.tar.gz 86883826 BLAKE2B 8e69f4e8d6ce7d556ce7c8f30f5c71a50997103f729935269581f0af054fd1dc769b7099ad3a35d4baf41c8a6bdd76b049ae4908714701b196c4ce57ff61b39b SHA512 2460cde88162b00f5ca5600084f5f6b8720b8158869f5f5832fe886a5a6e839eb48398e9e3df47c45be257d9f6915e682d294d560b09e097ff610f09a76b1760
-EBUILD oracle-jre-bin-1.8.0.202.ebuild 6051 BLAKE2B 51ec565172dd4f65a1d437091384493f02d4112788ea1ca8dc0e2ffe0afda855490013dd4ac9369e940d8640652459fe516b5e5f51aa58ff47dee7f7243cd97a SHA512 0e958a86b530d7f0fb86681a27cd4a77855cd31d8af8ae47f6a68765904d652efbf4a17c693c2f124bbf28de1619350e4482b689bf8cb55e9a0f984be04d1b12
+EBUILD oracle-jre-bin-1.8.0.202.ebuild 6059 BLAKE2B 54348f5c7582bbca652c441d64639f6ae96db3775b299460db927eab5ae382bbc1680a791d91d210096dadca473b66990a96cba470441bdfeb6ab8a13e236053 SHA512 2671d78ef0b0f57392a58d7eb05e858d0bdb5facbc4ee46cb0044c19f63bbb9a532cca6c9214bd45dc9997ace391d86ce96aa159178e48db35808e320259031f
MISC metadata.xml 669 BLAKE2B 45622e9b66d725d20eca519ef4a61be14c1ee2c7166a77b471fafc8cee81a008e23bdc46f2c87ccea2cee65d94e0ac7deeaa72a757fe776047ad8d4074bf067d SHA512 f1ce240052a322dc2cfe12a5b263156d4e008a5b74c5bf7b84f652d6d20abffb765b95a183aeb97df199a736be57a35e2fc5bc8c06cb2f296b453a6589af8746
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.202.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.202.ebuild
index bf404b46ca6b..b7d97ab8a11c 100644
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.202.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.202.ebuild
@@ -29,7 +29,7 @@ HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
LICENSE="Oracle-BCLA-JavaSE"
SLOT="1.8"
IUSE="alsa commercial cups +fontconfig headless-awt javafx jce nsplugin selinux"
-RESTRICT="fetch preserve-libs strip"
+RESTRICT="bindist fetch preserve-libs strip"
QA_PREBUILT="*"
# NOTES:
diff --git a/dev-java/sun-jimi/Manifest b/dev-java/sun-jimi/Manifest
index 0ddfaa22fd28..dde5ff540c65 100644
--- a/dev-java/sun-jimi/Manifest
+++ b/dev-java/sun-jimi/Manifest
@@ -1,3 +1,3 @@
DIST jimi1_0.zip 3880977 BLAKE2B b286cdc725cad2037d19bb188145ca0cd0799993011a8f22aa671e8807afd96dd3a9f3035a82dff9823ccba503e711db6b2ef377fc039c7050fc105655114ce6 SHA512 28ae3b3044910fca80dbdf23fee5f0d050df64ef48a09c41a836f3ff78365258c747f69a958579abda68d6d6f1c6b6a3ea5e960d36f2199afdb06258a25173d5
-EBUILD sun-jimi-1.0-r3.ebuild 1115 BLAKE2B 4a24a10891eb1b87e91f89029d211c6b984a6b37f0cbb1604ed88b8c1d76025352847bf33d4f02b5d52d04d6bf7ffc9181d3089dd651b11555cd1109b2e93472 SHA512 63d4e2d9493cb2b93332cb92f7d75663d9484b1820c3fc12545df3326f32a72ee007705d790b371c1ecba3fed4565b39a75087d379c34f3df04e889a0695da76
+EBUILD sun-jimi-1.0-r3.ebuild 1123 BLAKE2B f6d0373b4ff75d25e34fe946d29404e34697d8208627cc2316f319c10fa43a058fac3bedbf597a86b176247ee4af17bbe38d7e4d5716cb37ee47b05282df94c6 SHA512 fb9b9f45bf53b2d5fdd5bb7e3e315c8e41adf620d62120888bafac331dc72ad02fa855df0d675964c204f098ff90a436a0985a09b841b3cb8b8f4e614dd050c6
MISC metadata.xml 603 BLAKE2B eb5162c96ffdfd1e0b07f8c6fc950b7c90bef41e49514d69121a546e60e0d7affe6d630e328fa4e3df505cc1dd68d5caf318a6ed9ab25496bc11b312286cbffa SHA512 9bb4826797c652c42446acc1c40de86e79b4a96fab91b36835439794f7f1df27fb1d03d73bf6e9e6e8762cc998a3026ab04309d176e9968bc2f19423c147ce7f
diff --git a/dev-java/sun-jimi/sun-jimi-1.0-r3.ebuild b/dev-java/sun-jimi/sun-jimi-1.0-r3.ebuild
index 25366df780b4..23519e269b4d 100644
--- a/dev-java/sun-jimi/sun-jimi-1.0-r3.ebuild
+++ b/dev-java/sun-jimi/sun-jimi-1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -20,7 +20,7 @@ RDEPEND=">=virtual/jre-1.3"
DEPEND=">=virtual/jdk-1.3
app-arch/unzip"
-RESTRICT="fetch"
+RESTRICT="bindist fetch"
S=${WORKDIR}/Jimi
diff --git a/dev-java/sun-jmx/Manifest b/dev-java/sun-jmx/Manifest
index 1e230ec609d4..2f7c263e599a 100644
--- a/dev-java/sun-jmx/Manifest
+++ b/dev-java/sun-jmx/Manifest
@@ -1,3 +1,3 @@
DIST jmx-1_2_1-ri.zip 1624569 BLAKE2B 7262ee10ab49d7371da988f6f636c22e7ad8cc06bd61db5490659899424465f2ed85000d176e6dc5cb7631942079fde19cde35837cda677fa463cdf53c94780c SHA512 39c933ec39f3fcc631d6d8f3aa88724bb0aa11ff62dfbac61762d07c718dff4ba1e16b1b565c7aa1ede7d616516e68d0dbe8c227db34a6d30bd8f29880c7a5d1
-EBUILD sun-jmx-1.2.1-r3.ebuild 1268 BLAKE2B 7a18f07f02cc756d9e70bccc15e2cf305ced677b0381fbe85c7f257df739c45b0f073def1cd03e3150a9187d71b6ce4173b440e45bfe1b4755aafdca0c967541 SHA512 47de6c96bb82f1a4db067565891c59b59a3b808e0615306b6e645a269b8e27d2da92b4d7f8ef9f3550d1e62e2d47aa722adcf82491fec964782b3ec32c4deadf
+EBUILD sun-jmx-1.2.1-r3.ebuild 1276 BLAKE2B 5fb15955b2c398f9f710a67f8e4ba2a8982e07a9a2070d6c22fe7f6dd873c5ab3e84d44bf654ca4bf393cb0bc94db75a647b5a01027c1caa1a50e2334db959ce SHA512 59d99ff0e1ec1a40f0aab1a9f29247d81904fe10dc3663d06c29068f8f0a95394ec107efdb504103c631526d2b9faa69bea111ef6b2f217ab96b4d1a70279d99
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild b/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
index 701e392e4734..42e2b32f5178 100644
--- a/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
+++ b/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -20,7 +20,7 @@ IUSE=""
DEPEND=">=virtual/jdk-1.4
app-arch/unzip"
RDEPEND=">=virtual/jre-1.4"
-RESTRICT="fetch"
+RESTRICT="bindist fetch"
S="${WORKDIR}/${MY_P}-bin"
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 6d5c8cacbae4..0644ec861744 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -10,16 +10,14 @@ DIST apache-tomcat-5.5.34-src.tar.gz 3720299 BLAKE2B 9ec9171f7fb5aa43a3d7df0d3e0
DIST apache-tomcat-6.0.44-src.tar.gz 3447711 BLAKE2B 7baf1fc24a7c9aba7e2ddac63fe0c0975178616bfad8cd625d2910d18ad9b00cd85c98ba4a1ada251119629b96ff464ac623857f6928e3b9465708cdf5bc7513 SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be
DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
DIST apache-tomcat-7.0.82-src.tar.gz 4697342 BLAKE2B 1106ed04dc83e64e395de29f01a7752a0578b0c88046eb59614a7cfc0d8a98e3aebb698c8eb56763eea41620d9b42482971c5093304184b1028c6bd8f9770ada SHA512 fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db
-DIST apache-tomcat-7.0.94-src.tar.gz 4966331 BLAKE2B e806baa91ebe4672fb238d6fd461b2055ff90db822b7edb2ad4432334d45cf2c2286639bc12f83987972a47129493bef4ba6ec77e544a93e000282a2d24ae9e8 SHA512 5e8d2fab7145af5677170299bec0ae5ea5fd20b7a539738678a420581f9b53a95a6fbb1caffb54c7222d97edfe8ff34ce6dbb7ba62adb1a61f2bfa6b15c43139
DIST apache-tomcat-7.0.96-src.tar.gz 4983881 BLAKE2B d5b828b7a4e8a7a5ce793a15421fbd6b12b55918aa7c15bc8209b4c762d7f422a7315e4cbe9b4ae2da754b6d8493bc11ae6a5c99f11a1ac3b23473e05fa26c83 SHA512 5797e66fb9ce558340e08d3a4ccd372d912707aabd6177318781925dd35055902a0ecc3e50e677d76b0feea547cc8fc038bb83ae5de65d28680cb4c9582f60c0
DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 3a50d2f61baecb5244909972384e36478c69e7592dd35119d8b7b974273c57a4855082f309146ed160144dbdcced3236fd586b047970bd8558bbe7b7e002e9fd SHA512 0b56bc723277b2888896ab34ec3e49cb56bac94ddf1a9b96bd023982e2ffabd5317f63b3c0971afdc8cd7a6364197409df461d22151dbaab3a2be7daf6858b9e
DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 9bcad0d465aff6da1ba4a846042491bc8d5963283ed1d2530a26ab48289d14e8b85834d24ca476c95a75c1a5f51ee3ecd71c190b9609983cce56b56bc046b6d3 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef
-DIST apache-tomcat-8.5.42-src.tar.gz 5293083 BLAKE2B 4439b6a894aaa8d8db041ff25d3614271d895155d86250e25dfffc8355452d7c230bf81c22f4b75dcdb5cb528af489a8dcad6c93561a89a2aa8cea5173792331 SHA512 e06f3a0cacde6317a1f10f95a17cb7a460c81e3437a68f53da94aafdcbd528e29ed612bd0ffc5f2a3641417558348c4c0e66c1ae937bf709f9f74f79a339ad05
DIST apache-tomcat-8.5.43-src.tar.gz 5283886 BLAKE2B 2d76e66eedf4de474d439289a9a491e5c490e2373bc91ae30113b8f3c624255339d24149b58fba640aaf3131ab3c9a449930049d26928627e1b7910f0cddd40f SHA512 f6a0439dbfd3f233bd1eb395d37466ba2cce32cd456d067fb2bb45099ac173dec7e42e7fbfab2cb50c0fce2e9dba1f1afe6c8d65877525cb13cb116489cf27a7
DIST apache-tomcat-8.5.45-src.tar.gz 5324847 BLAKE2B 5ef3388b9324bb04772543c03686057b3035f5a5f40009d0aa1ec34fe18d04af87527bcc9ae0566f41faf64de8ce191f8ea4e2ed2869da569777621aad227d6c SHA512 1fe94b9d5ccf63d2c5fc3dd7a47dabade160ed2882848e0a41422b5a67215d53e8265535ee8e645157d56c4eba9093722982684be6668064648b0782fc48927a
-DIST apache-tomcat-9.0.21-src.tar.gz 5717051 BLAKE2B 004c5256e72c62e885a9d9040396d144d9fa73789a9699eb38210212f4ca6fa5f98c4b092f6fa2165166fd8cccc892eabcaee7a21570645ee057b0b61d3e1942 SHA512 6df978bbe9bb3a327d784d81a46affa4cfe5d370c2b847e102d25a792752ba487ebae329d1763ed7459cb3d49098c3d0cf6b01155536a04c17c4ffdf9e9a774f
-DIST apache-tomcat-9.0.22-src.tar.gz 5722896 BLAKE2B 1a006840e870ec01455285b324405e3d1ab7214daf9ea929be749a05149d6b84bcccf34787ba791a31be0d2bb295ede0dddff5053adef885080b31bc39e24ac1 SHA512 b3806caaef24821fb4b96fb1af86e0c04381d9e8943a9f94064e028e623f57b6f2ba056e62f1997bbca934fb929ee92ffecd0d0192dd08d59e2f7dde6848c5cf
+DIST apache-tomcat-8.5.46-src.tar.gz 5599021 BLAKE2B 3755f15612e63ac06cbfa097f1531dc36542ba559a6ef60230b133e45d14bb4c4c54d4dcc8b05b9996f54ac253fb1630f6a6e900ee00e4af0a9200f83455a952 SHA512 02e93cc6fb4226e81b03ae60f479e15b438b1c68c1a4104200db9cc473939b92d66eea12f0783727b06f643d11ebe3da2a81c80cbe486ed497a3280e8cdb2e62
DIST apache-tomcat-9.0.24-src.tar.gz 5746934 BLAKE2B fe0ff76fd8b3caa2860c0798d66f0dfff1e907ca02d10913c768d8513b207ef11e8fe885cd7578348136b8d007e08ccc2044952198259ffcdb2d58acf9fbb8b6 SHA512 de11d0e992cce08edb83474bd4cab04857e3e2bf63ef334c8c9f3ad053edcc76691e831cc95b8c489b820773a6fa5d2755837b470d73471f9587bb7062d75a31
+DIST apache-tomcat-9.0.26-src.tar.gz 5750303 BLAKE2B 582acae0f24cab5fdd44c085b36e771508020d124f9329036b3bf0698da1fb2cda69d6f4254eeaca00ce3c34c3740fe69c077637107167fface60b9fa74c8869 SHA512 8f430439c66f5a43c7a35bc99edd11549100be28b17fb44e17ec432f72e1797cdebd641a7f19c1d918635e51c164ecd1c9d1399a63abfce05d9a8c37db381837
DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
DIST jakarta-servletapi-src.tar.gz 65342 BLAKE2B 03674ca65e0cc509b04a6255d5dd20d26aa5053ed54588e9ba655330c56c9c523c5b382804aee9816cb9aa2ac19cccc1ad288ed06b2af85ba535854bc72bed73 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084
EBUILD tomcat-servlet-api-3.ebuild 849 BLAKE2B 88f6dc377d4c33eb50a3559f5b1b275cbbddf077c119e792afc567458d74e4f6fa710a97e71543c19caecafb8a7e26ee0cfb4cf34006a2aaae9a97924cb9463b SHA512 085c9e220972fb0f923b710a33a76977aaf76c8abee84c5c0c80ff40932585fdb0cd3a00705a60ef615558a0c20f93522cfd705fc5e5c0af70fe9eb2e640ee5a
@@ -29,15 +27,13 @@ EBUILD tomcat-servlet-api-5.5.34.ebuild 1419 BLAKE2B 8c55639dd2ef3367f74b6371561
EBUILD tomcat-servlet-api-6.0.44-r1.ebuild 941 BLAKE2B c253c51b56d719fc6abe9cc714ef2ffbc2e4dcd8fa1ebe61b77968cb15f8d8e224300c491e445350396b67713a0474598f6c8d761361b3d49c05411f29df900f SHA512 b0a47a4631bbfcc5986ed9f61565782aed2437e169210bcae2df459adcaf6fd9727133006701650735ace3d0203235f22b845dca2791abb79c0564c8ad03c764
EBUILD tomcat-servlet-api-6.0.53.ebuild 943 BLAKE2B c7b1a81fcb5f243e1888df39fc624a11385809ae602b4af2547b8a8a04ba4b1f4baf66703e9cd16ccf380b0dabe90c93b95c282c6605db03186d180a491c94c4 SHA512 d6bcfceea13c347ef6b467c3e2b18313465717d3c855c5011f3d5a0b130bc7a6f19c1f02eb647bdc328d16ceb8582ed7f3b68ca13c60bd29861a68700bb52e02
EBUILD tomcat-servlet-api-7.0.82.ebuild 906 BLAKE2B 2169547e97371a8532c797f02e31ad1e17b04d2f03f7ab3041dac4ac1f23e699cdea60fb5779436d259cb3fdba6c59cd083d9cf4f874e8dad3f3194919c38c6c SHA512 ea84aa02351af9a21ffdad739619e1b8bc22b0978a03f464fedd7400257ed253040c2bd89be2749f00889f009988dd4083a5ceb81a89d3d6d5e8a5b6bfc07dbb
-EBUILD tomcat-servlet-api-7.0.94.ebuild 904 BLAKE2B b380f8e0c06f18c2d2c4042fc9a746c2008a2a195f45d7d4a7c6636f4fc22a0b99590e94dfa41a47910ff13b3d45b04d18e055f933ef03ea1f722fba79a9b979 SHA512 eaab24b5d2ad2abde36fc52328a17893cd8f618bd3e8c9c06350f06549b7daa34667f2206e622ae2fbb1d9f06881e084b9b1b3482a434ed69e57b43e737d4670
-EBUILD tomcat-servlet-api-7.0.96.ebuild 905 BLAKE2B 30ef1491ebc2075c2ac674b51daa2ca189e07c96d15ab3ed001ae5fe65a06f9d65dc9ee89a6f2f183d6445ffb8ddf9be616327f5e5c64c493688edcfc4c39eaa SHA512 541679a0de3f1e192a738f956fea4fd1ca7f56476c5dad5c3f017be01f03a4506f2798a0985aa42cfb49dbf40db3015ea5da93d5ac362f2bacb824d442102bb2
+EBUILD tomcat-servlet-api-7.0.96.ebuild 904 BLAKE2B b380f8e0c06f18c2d2c4042fc9a746c2008a2a195f45d7d4a7c6636f4fc22a0b99590e94dfa41a47910ff13b3d45b04d18e055f933ef03ea1f722fba79a9b979 SHA512 eaab24b5d2ad2abde36fc52328a17893cd8f618bd3e8c9c06350f06549b7daa34667f2206e622ae2fbb1d9f06881e084b9b1b3482a434ed69e57b43e737d4670
EBUILD tomcat-servlet-api-8.0.53.ebuild 961 BLAKE2B 4d207cbd6e39369ceace593d2f02d644bba3d81b2a88d34f9288cbd08cc58a40220e5a2f791074d3aafa7dbdbe3a9a1327436e4427aa5017ab3a11667b98c390 SHA512 6eb575f867923c318e684ae4fb182753fbb15e078d1da4fc8583461c2c7360bf9a2b82e3fb8839046895ae8f9a1d5c7634348edfb6ba0c12b6599805a5e50427
EBUILD tomcat-servlet-api-8.5.23.ebuild 1010 BLAKE2B fb16fa9955dd865619850de21cdae0e44130895b3f886ec96ad5cff37f45f8a13b5caaddc083f46d2eab6b00e174689e652a5a0ead58fb4626e40612c1fd5784 SHA512 1ceaa37c6434f32e10705b0663bc39e2ccc5507c621a2ede604feec69a49bcb46ddd49fff33a5ccce50d4daa228170a3db30e31624ae84dfc83b538de10f7824
-EBUILD tomcat-servlet-api-8.5.42.ebuild 1009 BLAKE2B 616e51d8822c6876501edd4bc2408cf0bf8874c7bb2be477492d83aab8a90ce472072b0f92f475362109acc1468f5e80c83bc31f201694ace3485cde174dbc8d SHA512 bf685eedd82d08d142aad7301694e54ea8677f4b730def058c09e6c0b92b9db69d2df37859f113a024283e8b05e5eaa38a5ac30784c4fc269d221387e50d6e4b
-EBUILD tomcat-servlet-api-8.5.43.ebuild 1010 BLAKE2B 04f7dd7c54b930a54631cd1e444052db3290f7e9f2e289040a58a0bdd2d2410996197a22c6a36df9462328153b8a28b58f1cfa4554283ecb10ce0806c25ff484 SHA512 e6c416bae0febef9521b8ae3385c2fe41b7926b4c734f6e09b1f77d92a74ac986579811ec93d9c1887d13133a9520b9327a82725e5c90a35b5ba2aa4f93fc53d
+EBUILD tomcat-servlet-api-8.5.43.ebuild 1009 BLAKE2B 616e51d8822c6876501edd4bc2408cf0bf8874c7bb2be477492d83aab8a90ce472072b0f92f475362109acc1468f5e80c83bc31f201694ace3485cde174dbc8d SHA512 bf685eedd82d08d142aad7301694e54ea8677f4b730def058c09e6c0b92b9db69d2df37859f113a024283e8b05e5eaa38a5ac30784c4fc269d221387e50d6e4b
EBUILD tomcat-servlet-api-8.5.45.ebuild 1010 BLAKE2B 04f7dd7c54b930a54631cd1e444052db3290f7e9f2e289040a58a0bdd2d2410996197a22c6a36df9462328153b8a28b58f1cfa4554283ecb10ce0806c25ff484 SHA512 e6c416bae0febef9521b8ae3385c2fe41b7926b4c734f6e09b1f77d92a74ac986579811ec93d9c1887d13133a9520b9327a82725e5c90a35b5ba2aa4f93fc53d
-EBUILD tomcat-servlet-api-9.0.21.ebuild 1004 BLAKE2B 7f18ece7027e7c7e4af92c417870389e5938963ed8d5c03c06a4c44140e0803712a356bad0853f64fc860e900905169811dd85fa733b82940da4d9b03f1bd61a SHA512 467a31bf3148372c850fa94a9c0467163038aabe29ab72be1a539e5f2642bb363c9a0bbc4416fec9e24e46aa0c76e2b51ec000512772e8964177841310468303
-EBUILD tomcat-servlet-api-9.0.22.ebuild 1005 BLAKE2B 13c34d148546c4adaad25d2fa7ff3d90bb2464865b5af19832cc611ee3fb6c0a10c26fac4ca76da16d42e7fa9301deeed7b2c94e73e08c7ad0287c59730c81f0 SHA512 f552bd4b8f38a5e3a569755a2105fedf4ddf03572cfc3c363455e0a4bfc17a0272a0bc264b1e3d84dfaa51089f0f54fc4123a5964dc116be9b9181862b127f4e
-EBUILD tomcat-servlet-api-9.0.24.ebuild 1005 BLAKE2B 13c34d148546c4adaad25d2fa7ff3d90bb2464865b5af19832cc611ee3fb6c0a10c26fac4ca76da16d42e7fa9301deeed7b2c94e73e08c7ad0287c59730c81f0 SHA512 f552bd4b8f38a5e3a569755a2105fedf4ddf03572cfc3c363455e0a4bfc17a0272a0bc264b1e3d84dfaa51089f0f54fc4123a5964dc116be9b9181862b127f4e
+EBUILD tomcat-servlet-api-8.5.46.ebuild 1010 BLAKE2B 04f7dd7c54b930a54631cd1e444052db3290f7e9f2e289040a58a0bdd2d2410996197a22c6a36df9462328153b8a28b58f1cfa4554283ecb10ce0806c25ff484 SHA512 e6c416bae0febef9521b8ae3385c2fe41b7926b4c734f6e09b1f77d92a74ac986579811ec93d9c1887d13133a9520b9327a82725e5c90a35b5ba2aa4f93fc53d
+EBUILD tomcat-servlet-api-9.0.24.ebuild 1004 BLAKE2B 7f18ece7027e7c7e4af92c417870389e5938963ed8d5c03c06a4c44140e0803712a356bad0853f64fc860e900905169811dd85fa733b82940da4d9b03f1bd61a SHA512 467a31bf3148372c850fa94a9c0467163038aabe29ab72be1a539e5f2642bb363c9a0bbc4416fec9e24e46aa0c76e2b51ec000512772e8964177841310468303
+EBUILD tomcat-servlet-api-9.0.26.ebuild 1005 BLAKE2B 13c34d148546c4adaad25d2fa7ff3d90bb2464865b5af19832cc611ee3fb6c0a10c26fac4ca76da16d42e7fa9301deeed7b2c94e73e08c7ad0287c59730c81f0 SHA512 f552bd4b8f38a5e3a569755a2105fedf4ddf03572cfc3c363455e0a4bfc17a0272a0bc264b1e3d84dfaa51089f0f54fc4123a5964dc116be9b9181862b127f4e
EBUILD tomcat-servlet-api-9.0.7.ebuild 1007 BLAKE2B 93f6cdc024db1fd4959c86661de3d58e4a3457e54e94bc26d28cfa14f276b17ae61113252b9004de8492f815fd4b02744e055c8082d3fe50918376e61dcca071 SHA512 4cbd09d197fa558fb2172bfb637c06c6f028939038ad3071074019de4663c833d24f8f96a1c7ca628241ae65ef16fc88a06b226f210070170844ad95e2890c51
MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.94.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.94.ebuild
deleted file mode 100644
index 412dd425bf5f..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.94.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}/"
-
-src_prepare() {
- default
-
- cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
- rm -fR */*/build.xml ||die
- java-pkg_clean
-
- java-pkg-2_src_prepare
-}
-
-src_install() {
- java-pkg_dojar "${S}"/output/build/lib/*.jar
- use source && java-pkg_dosrc java/javax/servlet/
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.96.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.96.ebuild
index 15794b7e3626..412dd425bf5f 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.96.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.96.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.43.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.43.ebuild
index a6df79ab2dec..640c06837c8c 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.43.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.43.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.1"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.7"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.42.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.46.ebuild
index 640c06837c8c..a6df79ab2dec 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.42.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.46.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.1"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.7"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.21.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.21.ebuild
deleted file mode 100644
index d66f7a815533..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.21.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${PN}-${PV}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? 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 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8"
-
-S="${WORKDIR}/${MY_P}/"
-
-src_prepare() {
- default
-
- cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
- rm -fR */*/build.xml
- einfo "Removing bundled jars and classes"
- find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
-
- java-pkg-2_src_prepare
-}
-
-src_install() {
- java-pkg_dojar "${S}"/output/build/lib/*.jar
- use source && java-pkg_dosrc java/javax/servlet/
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.24.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.24.ebuild
index e35055493b79..d66f7a815533 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.24.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.24.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="4.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~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.22.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.26.ebuild
index e35055493b79..e35055493b79 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.22.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.26.ebuild