gentoo (leap year) resync : 29.02.2020

29 files changed, 37 insertions, 206 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 9658392e5e8a..fec72f0f60a3 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 0e042693f702..6b3a8d50565a 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -4,7 +4,7 @@ DIST ecjsrc-4.2.1.jar 1417043 BLAKE2B dc6915ec85d96a6ecdafb04485549feeb6ef832981
 DIST ecjsrc-4.4.2.jar 1764959 BLAKE2B 402bcbb040c28fa10dad07c4223daed9976f3246d6984ac74d95087a6cdcd5a742072126a999435eb2d49d49bb2884474461ae8439a9839617b2891297cd7c07 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20
 DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
 EBUILD eclipse-ecj-4.10.ebuild 1678 BLAKE2B 933c353919c86dd1d1a8adff7604bb42a35ed0de363134d8a3169dfefd91c90f6827a0bd661371515da6b9a63fd55745578dd70c50e808ccb29f1e5e1ffa4fb1 SHA512 2bd4398ccc15505ef35081e5afce5302001a0eec585c8c5463b233922e3faf234fc982293d873b4c181785f23b883993e157555202c0e2c1f823b68aa844f87f
-EBUILD eclipse-ecj-4.13.ebuild 1689 BLAKE2B c8148ba1d2efee9ab97a57aa9b8626a3eaa1bd5835058325acc757968fc3ff0fa1c369a9b2ae7a5ada98f54ff7abaaeb6cddec8c2a0b88ece2070b46b15c8eb8 SHA512 397ddd898b681be62cc11da046a43f3d4fa7345bd83e619c7b2eb4dbcd2ae6596d76c07df848b4315fef0507209336b216a4d7517e7dd4dafa666c56686c3fc0
+EBUILD eclipse-ecj-4.13-r2.ebuild 1738 BLAKE2B fc8b94e3d55e1a72473c9723b496fef18a5122af2f94c34ed52c929fce8be6703d2a4c8f99ef836a896bbc0c7e6e93d5675db2588f79beb9551e918b251c5864 SHA512 5a4e6e40cd35e1d815f2eb83ca15ad638d5f931a3ad1539147aa716dbae82a89763b51ffcd59490ceee6e80846475ce550654acb45cac5444be1835b080b8ea5
 EBUILD eclipse-ecj-4.2.1.ebuild 2770 BLAKE2B 23996155f35ac40c9a44a92f49e794a0f02468c1fd94a4a151f2b5451ac02d22feaa5381d07f8fcf49592b407842aae438c6e0866f7c20ecd7514edf6127e0b1 SHA512 b1e4e064ce41776a958ee2c8290382baaf228d998ea8b1d7db5c036369cff259da43877b1f8e7712678985f2facd0adabc9922c3ecd7072f499f52adc929a9ce
 EBUILD eclipse-ecj-4.4.2-r1.ebuild 1361 BLAKE2B 3f2fea077ce628cb057ee841d6a19b06f9b56344c085a5fd7533fa084d3f7cf92a5ac6edc31632e31c470852f742b383cc913371e927d59aabfbb38e42496f6e SHA512 9a870d4ce61c4a5ed3f9c0e9b7b75f0006a1649269849a08a5b5b809f980abb3773be37338564578e4fc8ee8921e231c93b5cfc0f72e99f71190c7a91ff86eef
 EBUILD eclipse-ecj-4.5.1.ebuild 1628 BLAKE2B 19a0422c19a19998e199dae7170e3b89954d412e62523ec4742fbf514015afdfe01a9c932b044dfd4f6971a96ba1bf3bf98697732b677f567c3d2a83368d575e SHA512 ba5ded5ba46b10e1467c42ad8f63f67f065acd08f3e39541e3794e97a0f8974edc1d4e3eff474916922b83e8fd9656cba6f34b67c3febc4ea15bf08c933ca2ff
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.13.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.13-r2.ebuild
index 395198f56fed..11d2edd08bd6 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.13.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.13-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,13 +23,15 @@ COMMON_DEP="
 	app-eselect/eselect-java
 	dev-java/ant-core:0"
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-11"
+	virtual/jre"
 DEPEND="${COMMON_DEP}
 	>=virtual/jdk-11
 	app-arch/unzip"
 PDEPEND="
 	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
 
+JAVA_PKG_WANT_SOURCE="1.8"
+JAVA_PKG_WANT_TARGET="1.8"
 JAVA_JAR_FILENAME="${MY_PN}.jar"
 JAVA_GENTOO_CLASSPATH="ant-core"
 
diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest
index 4ca56d385d18..092fe5b2771d 100644
--- a/dev-java/gnu-classpath/Manifest
+++ b/dev-java/gnu-classpath/Manifest
@@ -1,4 +1,4 @@
 AUX gnu-classpath-0.98-freetype-2.5.3-support.patch 1192 BLAKE2B 18a8c2a6516def598c614a50c7c260c13ba7304a1d189ef0d0d7ffbea37b2c8972fdb0449eacfe49deb58c3aaaac44b36593d2b3df745066f64889a957e08d51 SHA512 5832a27caf0a064a29fb00a186d116193af98c0f2a97ef868be7ca0cab1aa51bd32df90f32ee43f9ecdbda52ea3b264f6f3bbd48d8b8f7cb4d1e0a1444f716fb
 DIST classpath-0.98.tar.gz 11021342 BLAKE2B 8bd0c55153569b34dfde767233ed48f6ebf0f507d34d991a410b0e40a2ddfbd20d4568697265f8544823337f568a916288e92c096b39fcd5c67afc82ddfc3cc3 SHA512 0d98f87cd78c166d566ecd8d0372f2d6cdf422e8c4c806ca01d3a77dafbdd80ee936de78a2c5d4226174027efdc053fe92669514bdd8acb3290a7b3ec002d31f
-EBUILD gnu-classpath-0.98-r6.ebuild 2958 BLAKE2B 2a2e72edc149a07ac7175888989a5257dd8f9fb48c719f2570bf18ac429622bf23480b9bf29104482ab08234e38f239e2aca14624f8e4e74a819193fff546f2b SHA512 590dfe5b99b2b61d6123d33795599f02d02fafc02ef6e033d1dcba667e211024db7771165f90ead624a779c9c2816d5af3932a583e9e212a977d065748a1cb15
+EBUILD gnu-classpath-0.98-r6.ebuild 2921 BLAKE2B a2740a417dde3f84d416ac9d3ab78b9f316d192db1470e6621837dfeeda024c7a28e6e21904d37daab040f46465ea2df9e4d788b40939ecca4fe198f68abef76 SHA512 a67ffbdd6fa4b6fdc1edf32fa52e7fb0d8dd3fcaf361182cfed8710bde58bcc6db12fac8eeb5c80764eddcbdd2a6b4424ff02fae7441fb5b1bb9a0f41d941de3
 MISC metadata.xml 703 BLAKE2B 221917dd1d999eb06d4cd4d896f1ae60f06f425442c27cea566c2f19a4366064fc45545e43dd72983ae3810cb8c8753c128f3b690a5234910828dcda2f03131e SHA512 e97e2eb0800c588b0b50a108559cc164df1ae33f626b089c5ed93476e69ce0dc9d47f043988beed9db9c79e6bc9479f0923f8dfbd61c4a6c619dacc8d7863865
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild
index 9229206c5f76..e90cd2dce215 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -83,7 +83,6 @@ src_configure() {
 		$(use_enable dssi ) \
 		$(use_with doc gjdoc "${S}/tools/gjdoc.build") \
 		--enable-jni \
-		--disable-dependency-tracking \
 		--disable-plugin \
 		--host=${CHOST} \
 		--prefix="${EPREFIX}"/usr/${PN}-${SLOT} \
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index ebb4d1e2a91c..3b9dd4dabb97 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -12,5 +12,5 @@ DIST icedtea-3.15-shenandoah-9fcff2250bb4.tar.xz 7077244 BLAKE2B 1122b74e1268357
 DIST icedtea-3.15.0.tar.xz 1532664 BLAKE2B cdaa6fedc3ca804d63c9025c7798287948ddf917a4e04e15019c5b9b96db661ea339e51dc94b68647e4c19a01498c21a1a61da5496bc6cd873f144fd0c76d1db SHA512 7c5917acc03b19a41b5001beb71a72b3f63e65b3c97c5f9173067fbd795088f9578f628b386bfa0e934caa8f4faab4cfcae80329ee7180c0cbe49563309c84ca
 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
-EBUILD icedtea-3.15.0.ebuild 12248 BLAKE2B be6cd05a48452352e84471715dc094afc52fd433c11e77d256ef77c87114285ea96c79c41a1da50736f3312d714e40fc9529a32f10bd5fc1bd060e00d48b3116 SHA512 55e4d81ebc07841f4f03b6ad85fae2fda942574b4e880471eb222de6c37fc5d1f89bee5e4cdb652ed4e3335597f3c51615a073222ccdb69d1ec0c8cdfbeac005
+EBUILD icedtea-3.15.0.ebuild 12150 BLAKE2B 5624d8b5003a46b9882d7d9ef5d71db4f136738c1c0764482ed5c0f57a9914d30c3d0099c514597285a2978f57cbc80842478eca01ec9c51fc807160691131ed SHA512 de17c10b87744b38c2a22b6b0010696d16830f155ed88bdb53e042ad0a99ea102bd778b4a76371dc95001806b89694c06f395cf1625d7d26cc534d69f377d699
 MISC metadata.xml 2258 BLAKE2B 589f588b726745c7c488da1a900a97586cd7283534e675fe478149c3ea178e7c4fe6149b0430ca6db3546f74a632ec6da7ddb12f6efecc0e0aebbe8fd63790ae SHA512 22d6948a51e8b56d98aa60158903eda355fca255f5ea1d8b0cfb7767c346d91ed38d51fe0a06938e95efee3d544708d880f8a41fec9cb789a6af9eb1126a95d7
diff --git a/dev-java/icedtea/icedtea-3.15.0.ebuild b/dev-java/icedtea/icedtea-3.15.0.ebuild
index 73ff69662c2a..c6bcefc57e60 100644
--- a/dev-java/icedtea/icedtea-3.15.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.15.0.ebuild
@@ -308,8 +308,6 @@ src_configure() {
 		--with-jdk-home="$(java-config -O)" \
 		--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
 		--mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
 		--with-pkgversion="Gentoo ${PF}" \
 		--disable-ccache \
 		--disable-downloading --disable-Werror --disable-tests \
diff --git a/dev-java/jamvm/Manifest b/dev-java/jamvm/Manifest
index 64cfb467cf08..f1d7e5d33e24 100644
--- a/dev-java/jamvm/Manifest
+++ b/dev-java/jamvm/Manifest
@@ -3,5 +3,5 @@ AUX jamvm-2.0.0-env.file 544 BLAKE2B 25197538a4c10d6ae1b0038113c094cdbca9a1a22b2
 AUX jamvm-2.0.0-javac.in 1739 BLAKE2B ff167bfba594dbfb71dd1d09e41ce502ebfcc598fbcef0794cb967c00894745f8b16412adc7b4afbd167878defa29351e99b30a71b4377987c5c8a692f404e30 SHA512 65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb
 AUX jamvm-2.0.0-noexecstack.patch 1387 BLAKE2B afd020772bf627c3dbd6b5da9e03d3b03e8f5c9dc3844279fe325183819cb11deadaedb4920ebfb0c6b25321daeee9f0e4fff45addd162e2b6c02e3f3ea12d31 SHA512 17c38ad0017e5659295dea7ed57f263eb0eee673bbc1f5d1e44e0c8fe588f4172a8a05c832a1fd41f3dc094779fade66aa710c8ce48c754412b0b6afdea6551a
 DIST jamvm-2.0.0.tar.gz 741459 BLAKE2B 9b8b0f8cfd8f56c0b835144c07aaca709ef466fdfe5df18438d05c66cd8a07fecfebf27e1581c67658feb3674a96c2e916b85f13dc434baf2db9be4e4fbfd0cf SHA512 8ac27787ee94fa8fde962635d3c08d1dc1e5244c9d56bb693e73f3fd9b58e944ad3f7a0127afeed727d7c00d904a775d2c483157f5ac87e7eab6ecade1aad21d
-EBUILD jamvm-2.0.0-r1.ebuild 3687 BLAKE2B b7fedfd711f672023a3a5428ab6f3d5d9358368daeeb0ba2a0604be3b2aa650befb8c8c84505932a9fa56009f2a76625ad66bc90e85adac1ae9c3f6317873cfa SHA512 a7ee77a0ea283a5e76859f897e775815921734a11e309fc7591ba9772c07bef01ff374e9b5dc870b246c0af04c2e034e3b5b70417ec5451796c7a0a0af1ab8d4
+EBUILD jamvm-2.0.0-r1.ebuild 3650 BLAKE2B 1faefeed925b84c261645a07dd9e4888bac7e7ca6e4a6b551d420e77897e3ba54347eba2ac7f9fc6019364b11489f0696d5c63e791789d5fe0efba04cb6d23ea SHA512 d68421e7462f76880c3643056420f6db693c3aad605a3283f40607c6698b7aa269ffd297b3a2e795ba7cf297e82cf8ac857d3bcab4fd4fde230b09a5689ec9d8
 MISC metadata.xml 311 BLAKE2B f89901d2404c3d1004a7b53345d8e533059995634d1109f620d6685de9defd6126dc1e619f8c8ba0d8f53d57a1d7b1f2f51b0f93fc12b1afb179385b30b4d514 SHA512 3c73e7134e8adf35e0a1418dfcb0215082b5cfc7e3baabc11d89fb1044996a382c551309e5c04dbc54257a65173384b690ad951ceaec2b8569d89bb8a5e757ee
diff --git a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
index 457e883de306..9585dcebb6e8 100644
--- a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
+++ b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -53,7 +53,6 @@ src_configure() {
 	fi
 
 	econf ${fficonf} \
-		--disable-dependency-tracking \
 		$(use_enable debug trace) \
 		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
 		--includedir="${EPREFIX}"/usr/include/${PN} \
diff --git a/dev-java/jrrd/Manifest b/dev-java/jrrd/Manifest
index 139713597ec8..196830290d88 100644
--- a/dev-java/jrrd/Manifest
+++ b/dev-java/jrrd/Manifest
@@ -1,4 +1,4 @@
 AUX jrrd-1.0.1-javacflags.patch 263 BLAKE2B d20065e16d2648c6be5718a40b0ec164ee66f644b611f932ee379470d993062038a9ba3cbfd5cac09a2da909c4aab1c1d1fe66407548f67b05e9791385627b1b SHA512 1c1475647f7535c359b1a686295edffddb9a1b2d53529f51e9a17d0d7e5de2a39846e56e9e4eb3441519b05da645052ed177b3d2e7a2779f6385ec5ace0609ba
 DIST jrrd-1.0.1.tar.gz 320476 BLAKE2B c8f2a16bd9e3d1dc53e6523e7b936ea65e23852feb69af917df9fcb40fe63a69335faf0bb476779f1e618ad44dabfec52f890232a8d85d8d5aa5c901c739bb6f SHA512 f794f052af32544e17d5aef58c7acb068f442c85e991d7f11c25119d94edb4aebb75f744df53caa64f4fd1e9f900f9018a82790a77dcac48e071b13833a8cced
-EBUILD jrrd-1.0.1-r2.ebuild 796 BLAKE2B b36e1d5d4a77184232de326b4314290851dcc56afcdee93fe854a45aa57e4622eeef654e6d3463e230cdcbf2aad9979a6de4830227bc565a70572efb01209ee0 SHA512 ff030fba1cc6a92615c747f6d0b0965948e3d3a51a2cd922e3128a0588f30e1712dc5d0b812f2ef3e846da0229ff204abc903f0aff1e9a21ff5d208660a9fa8e
+EBUILD jrrd-1.0.1-r2.ebuild 797 BLAKE2B c91de90bca8f7a0c333354a8b8e3715c24f762538cfd4c8098da9d7abe2965d8fc6c4740437bb6f647add90045706bf76ac72a6db78fbb6b4f7a02c70abb5886 SHA512 baac4ac46d64c1edbb8c69a1386962392e033557e4175041746a31f9a4586812228fb1e82f9a3be916a50f8ccf11fc40b6e8510c395a0bb9dd558ed9733c3741
 MISC metadata.xml 396 BLAKE2B 66db2600dc0aa0b7ff5e5d6275f265495f0c7c7ea97baab568f993c49642dd2b928042fcdab7dbf5e5aeca154d5f463d472be2dfd4339b21f8429154fdb05e5c SHA512 4d701ce0342203d158d1fdb3d00d1c2f0fcdaf7a5f891584be4cb33e2b3ceeac22a25b780410c9be7c1c4c3a1f4494561a2dddaf37981b68b23911d55ae1f26c
diff --git a/dev-java/jrrd/jrrd-1.0.1-r2.ebuild b/dev-java/jrrd/jrrd-1.0.1-r2.ebuild
index 99bc7ddf318d..286cb6ffdc32 100644
--- a/dev-java/jrrd/jrrd-1.0.1-r2.ebuild
+++ b/dev-java/jrrd/jrrd-1.0.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,7 +32,7 @@ src_configure() {
 	econf
 }
 
-src_compile(){
+src_compile() {
 	emake -j1
 	use doc && ejavadoc -d javadoc $(find org -name "*.java")
 }
diff --git a/dev-java/netty-tcnative/Manifest b/dev-java/netty-tcnative/Manifest
index 7a0222187681..2df0f6062d17 100644
--- a/dev-java/netty-tcnative/Manifest
+++ b/dev-java/netty-tcnative/Manifest
@@ -1,3 +1,3 @@
 DIST netty-tcnative-1.1.33.Fork15.tar.gz 186153 BLAKE2B 3d769a04e659c09aa32059fc2a2eede84f6105469de33ef7d26df436de6a1f6290a6640268934f63f77a969eb6aa024651380cca6dc69099c4016ed61f7d5310 SHA512 592c70a926473a4903b704be920aac1a4fd5a032a8d821a77800b6922b374cb28decf496a65ef62867c027dbac93f0e563e9bb4ecf6659bc70cc33663bb979f5
-EBUILD netty-tcnative-1.1.33.15.ebuild 1657 BLAKE2B 5bb72d18f8230cc0423b1909236284f0edf5290061b8b67052e11fde1328da4ab273943dedd7f3f4f416739631c8fa9eac5233f9fe931a7cb1fbb818c8875e8c SHA512 4a533c530136e2eb72bd6070515490e4a49898b1742ce8d986a367140ebba978c0d619727270d7a13a5aa9ee9ec4c19008d87447b8c7853045793cc2791eee20
+EBUILD netty-tcnative-1.1.33.15.ebuild 1655 BLAKE2B f4f79650cf5159c1c74f4237ccccfa008b39cc603ed99ef76ce844083187707787b4f50cfe0de9d9a0d2edd86aed953295cf2a8cd237f8606a67b93a05313b75 SHA512 92b33eda5ac2a5ee45d2c9e438ec8107f94a77f7a4cb55858a1457833a010e46683c7f31e964d149ff7233d6c446f6f849911130c1a6117809a9f2c33c508b3e
 MISC metadata.xml 321 BLAKE2B d5ef2b6901e18ae4fcbb63df20a62edbe59169783a0ae50553194b6e4760b421078ad26fefb1fe38527a71d2e0053b3ee24683e166660cdd2b8ca1d9e1b47d94 SHA512 cafd11002a29f2a3f485ea8c2abc2c338811c0c9e9f6fe416f089d545971b44dbd6490cdbf9c9f3be75fb1fbad56c533d9d3e6141721027545b6e1ae31bdddd5
diff --git a/dev-java/netty-tcnative/netty-tcnative-1.1.33.15.ebuild b/dev-java/netty-tcnative/netty-tcnative-1.1.33.15.ebuild
index 395e9a7a95df..a8a2536e6871 100644
--- a/dev-java/netty-tcnative/netty-tcnative-1.1.33.15.ebuild
+++ b/dev-java/netty-tcnative/netty-tcnative-1.1.33.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -51,7 +51,7 @@ java_prepare() {
 	eautoreconf
 }
 
-src_configure(){
+src_configure() {
 	cd "${NATIVE_DIR}" || die
 	econf --with-apr=/usr/bin/apr-1-config --with-ssl=/usr
 }
diff --git a/dev-java/okio/Manifest b/dev-java/okio/Manifest
index c9282b82e011..e215e34be6de 100644
--- a/dev-java/okio/Manifest
+++ b/dev-java/okio/Manifest
@@ -1,4 +1,4 @@
 AUX okio-remove-maven-animal-jre.patch 1631 BLAKE2B e43c497a63d598ceb825716de40a6f1869e39a45eccbb4759c128805bfcf52a5b95658bb776299a32e7ef2970dc6466dcfb5d422032c460675d416ec2412fc09 SHA512 5bd6cacf2ca9cf51ee7b80fc5deead8174fb579dc3a8422f65b7af80492f37d24ccad4605896f0653984852db89c2ca9ce0b78bd0ea2630ad8c71e1808b9a3f7
 DIST okio-1.11.0.zip 147483 BLAKE2B 776b77f12d72eafd573793b3a7e146d042cd07c38bdc96dd549ce82018cf128e40aee0a19bf019ffd174d73e75b35508c96684d87f443e4fb28da2964276eb4d SHA512 c8f440284d683a04e3d75d6f6715e229c06caad5e7f2bc544348703cdfbd8fe5bfb19f0c316ea4cfb473a933b03bda2277de8c0b7c956b143cc04826e61cf0b6
-EBUILD okio-1.11.0.ebuild 754 BLAKE2B 91748fc321cbac3b333bb7f39b07ca74e5f1a850e723256aa4f686909e99b4ab6d01a5ff812da3892d622bfa6052947a10ba8c5c182c3d8a63abf3337131e2d9 SHA512 405fb52d98b0b3b044d1e92ce3c6cca8654ea1816b6149a4b9bfe9a76943994e6f8d3975e985127cbf76395bf59acd3297ed5d1217c198d1fcdfd08b4ce01544
+EBUILD okio-1.11.0.ebuild 752 BLAKE2B f3e34217c1887e7616852f54ab2b4a53ded8b3927a45ed699819519465d0b870312dc8b2404a3437f7b13452f36afcf651a35b2f018a6da2b988a6c2137732f2 SHA512 c2ec52ed00ee26e9e840bc685352b184da6ac7ae4c2394bbb89a8d01242bcee74c72ab2905f85ca57a26a56cde03cfc11de3603d65196afa536f3811e151afb2
 MISC metadata.xml 312 BLAKE2B 4d749d9fd3b69a6e7cd51d9c1c9fbca98d6d6363147f0ee55ff767a3a8880d53cb0f4ab41fb8338e2c2d5aa3234b28fa61608d2332fcf9e1491e9f411c6d6a25 SHA512 595713b72b25fddd2950c667f082fef0ce861354c44a878efcaf721abdb8761c2496a9b975c21824cfebdea6d9d4fc39560c2f8747a868ccbf08b49ff7dbbb25
diff --git a/dev-java/okio/okio-1.11.0.ebuild b/dev-java/okio/okio-1.11.0.ebuild
index 57105c8e9838..ce07c77a5885 100644
--- a/dev-java/okio/okio-1.11.0.ebuild
+++ b/dev-java/okio/okio-1.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -34,6 +34,6 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 JAVA_GENTOO_CLASSPATH="jmh-core,junit-4"
 
-src_prepare(){
+src_prepare() {
 	epatch "${FILESDIR}/okio-remove-maven-animal-jre.patch"
 }
diff --git a/dev-java/tijmp/Manifest b/dev-java/tijmp/Manifest
index 7aba69ea965b..fe432fd97e69 100644
--- a/dev-java/tijmp/Manifest
+++ b/dev-java/tijmp/Manifest
@@ -1,5 +1,5 @@
 AUX tijmp-0.8-respect-javacflags.patch 433 BLAKE2B 22999d08accccc8a00bb27e4db93b47faad83481083ecfef8b33c43e670093d15c6f483f5f15f1e02069e14d7dfa9df2d67846e2455ff73a01a5a209a8ac702e SHA512 01de85f6dd0609a85faecf398de83862dc99741d7447127ae8fbd57a16ead7b1493cee0479700e1027c45c4ee5a9561352868c2a45293f29a6e2fe8ee501f972
 AUX tijmp-jni.h.patch 1120 BLAKE2B e444841f9454f7fc8f8423986a5b82cceda43513a07c5ed3d4a143e813645a2f2323aa42e4fdc391e7ab38f3603acaf6efc18c8de0fc3c363273916b6db47477 SHA512 03c5b6425b4b92d929117366bbf1e3d3c5376f0882e7363e83f70324e5ba6533f212226cc811eb61b24772a45853f3b3243c24a444d181eedd1aa67017a15dc6
 DIST tijmp-0.8.tar.gz 347809 BLAKE2B d18fd0ba9145fb9277404a24fa26a65e4cbba34e62dfa0b080bc380d61a3dd11aab23e2c7fb982a97cb40fa216b1b3347c949cee52f7462f0113c3adef993c8d SHA512 911efd93c1548db45fcf8fd924675329aa82c6853ffe93074768646d08f80f4b076f336dba0da293d1acb084a12eb62c68803fa9408e2b64b2b82ab62db1de25
-EBUILD tijmp-0.8-r1.ebuild 1075 BLAKE2B 9b0f320ac0454d8e6f3533ff1a33e75376086396e45074cbc9089cfcb7464d3b8f2cd022f0cb8a398f42b560ee50db3354062a657d5dab1790561091ab99171e SHA512 2bcfd356f43c9a4994045d0571f52f6bf767466a0ffce853f62a295a852506215d5ab8f830027c2cc38e409d42a5639b641328d2739ca9a205ebe2cf298f43ac
+EBUILD tijmp-0.8-r1.ebuild 1015 BLAKE2B b4efdd99f67d769fe9d4d2eafd4bb142865d07381da7b17a2b0d9381fe46ac46a91f9909e1e8b54f87dba17f004a1f70bd4c596f1dd69a9a5e9d18eae9e75566 SHA512 56ac465b66ec0ccd8bed635d05350d3ceace3a43df53f395e02f883eda535be24162b34c3668fb1ff28e1f7abdf2021c4a3b9591f6fa69014c2fd07e4a380920
 MISC metadata.xml 481 BLAKE2B 6b151d4c0ca3047811c3902cbe5dafd42cdbc05cb6d44a35e116be42276fabc8dd9ef90a8e4b05c58f3ed228dfa0df37ac1c8b5eeb4859373abf9e7624a093dc SHA512 52940eb0d565ae1419ea5b10d90997551cf1a9accf3ae2369b37a7afbd7e5cf0a11e0fa0afa84baeeac34d516a734b779a40ffd74f06767549ae0ad82010661e
diff --git a/dev-java/tijmp/tijmp-0.8-r1.ebuild b/dev-java/tijmp/tijmp-0.8-r1.ebuild
index a6e2774efc3a..dfe78930f1a1 100644
--- a/dev-java/tijmp/tijmp-0.8-r1.ebuild
+++ b/dev-java/tijmp/tijmp-0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,10 +29,6 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
-	econf --docdir="/usr/share/doc/${PF}"
-}
-
 src_install() {
 	emake DESTDIR="${D}" jardir="/usr/share/${PN}/lib/" install
 	java-pkg_regjar "${D}/usr/share/${PN}/lib/${PN}.jar"
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 88af4547e7fc..49df05a66af0 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -7,23 +7,15 @@ AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e
 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.96-src.tar.gz 4983881 BLAKE2B d5b828b7a4e8a7a5ce793a15421fbd6b12b55918aa7c15bc8209b4c762d7f422a7315e4cbe9b4ae2da754b6d8493bc11ae6a5c99f11a1ac3b23473e05fa26c83 SHA512 5797e66fb9ce558340e08d3a4ccd372d912707aabd6177318781925dd35055902a0ecc3e50e677d76b0feea547cc8fc038bb83ae5de65d28680cb4c9582f60c0
-DIST apache-tomcat-7.0.99-src.tar.gz 5242549 BLAKE2B e24933364bae6ddd2b7aeec342f3bfe0293533e2513a34ec6e9b5b6da7ecc3c2fb1d88c1b49f470532d8db821a0b8f0821698d8ec52a6d88a7769cd86912a8bc SHA512 3148879d4a893167b9e60fd1ee6972fc9be8a5be97016ad1d86117c0cb681ac40702680bd21562a284f78aac327f0388e99af458cf1868a3b0ad5e31899b23c0
+DIST apache-tomcat-7.0.100-src.tar.gz 5265444 BLAKE2B 9c706e6a50e13cd8f542669e2d80f8940816976cfb84f62c3e17bbe6f0cc6d76d6fcdd18ec69e706ce27552aa66041833f6ae7bba8e671e187de3246e90a25c5 SHA512 53ef64c64263d0f25d72ed179bd7b7beed3f73cd63010988ba740ff7328b00a5ec09fe1d4575188ecacf258c891e022a0f1ae07d2957d9830a56881170bb1a57
 DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 3c326056f674032424d298c7581243a24dd01fae39b1ce7069b60e1bcf3d825de954164f643e887618c43c87d691bc41f942e73bf86b254b4c7dca9c68ce7cce SHA512 1513fdaf7751ee263d878cdfc05329bc4ee50e2f3aeea68e1d173a5f4d555ec59a43050222f013758f704967730dd25a64337cf1ba4365ab53b8730af87b4051
-DIST apache-tomcat-8.5.49-src.tar.gz 5633029 BLAKE2B a01e88df94e27446a7792cccea64ffd30580db40d5473445e62ec15cb21046fb1baf2155fa36462f72aa477a15fb1c892b2494a93e601eebcd49241d5316a9f6 SHA512 c90615ed1548ed6f7bcec77dbebb6b4b95c91086042cba53c207bf1475ab6183a435f3c2c1e3f8fb769f9a144216e64a6dd08b3f9dd56fe2e4b143e00a35161d
-DIST apache-tomcat-8.5.50-src.tar.gz 5646813 BLAKE2B cb9ebc0fca2827f1686c28a462b3d646b84af9b6eabee55d7d6c418c270142f9626d9797137a18dce037a6290904911edc6f3609feec96cdf48f37e9431c98da SHA512 e96343179ccb21525ad2bae31aadbdc0ee4b9e94a59186eb1f5d7928b72312c8a6e631b335ff07d4e36d6c9512ce2d8daefcc0a108356f45f8ad987a392ab7b6
-DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4 SHA512 3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8
-DIST apache-tomcat-9.0.29-src.tar.gz 5783830 BLAKE2B e724bb6b35e9a466d39e95a8004751e982e50cdf303097fef6af1d6b3feac5442d38e1c30c141dbf91cd4b262954f0d266baab489d4e369e6c4056e101d9e6b5 SHA512 f4ea845ea4f6161ebc43f84b66704357ca507afe534d37f7605ccb7a0dfc22e6fdc53507d9c11108f01c458b937033472b8b5b01ecf50d082d21ef90aa516fdd
-DIST apache-tomcat-9.0.30-src.tar.gz 5798307 BLAKE2B 27e3f238e25f62860852977140e9ab53e4121d200600e842e7b73cf8baa03dd80b678504531ce252c0fefbcc107999983846d6dcf96866f7616f7ebdcf8bc118 SHA512 5a693c26bc78c504ca9c30cab6356927dbeded199798b558f2efe428a98fd68a88e0c113cc7b710fe3b2109e5ae3a970ff3989f909b95eb782d47d12a2a3a20d
+DIST apache-tomcat-8.5.51-src.tar.gz 5661227 BLAKE2B 711de5678903941a5261693972906f2d0fca2c9d3219e62d3186e5d71a2e3cb4da0a5028e62790a26dad2d244246c2f41c74f18e17d52ec0af070f0d5842ca3f SHA512 8529d2e7d83a863fe88ed4ee8ec29b673e5df4bea53231412c0d89e2384d3939b9d1f29350a4ca46966ab5d4a0d3178ed5d2caa50aa766092a3ab8f28dd27592
+DIST apache-tomcat-9.0.31-src.tar.gz 5812430 BLAKE2B 7ef0f989860b046b4ddbacde50013284a623eb9d81e2c3465b0e04ec9c934a5319293677919ab758243a352fc60cb6691b51f946d8c5a36360b9108dafc5dfe3 SHA512 a0ba9e46a3d2a4cf708e6e29b4647c041495e45865ce5c679c9dcfee77181373a2d3034222701d0f15d5c7e71e6aa3cc7db236c66ba069b3e3660a948b44342f
 EBUILD tomcat-servlet-api-4.1.40.ebuild 996 BLAKE2B 0820bfc92a49246c9d35774e8efcb02eb64a7a98b1276c847bdd42528f0331bfd9d3e8d8f4d6320667cc0fbb52552ca52fdee6735cf0ce97d6d975377061af91 SHA512 c3cca19f2a4206dd68328f6d6c902b15f6fb4a8b740dab698b8d668354f98c6fc272b19ec1df4bb7c4c65e729460b41a512d4d13ca765ee4be8879108b14766c
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1430 BLAKE2B 2bceaac608b1e285da260b9041596b18d5c360d9d7ff596f1b558fcddb6a4c38865ef1a384bcc98b8187e9ac4fb0ac45d57676fab2001bb7f595c6fb9080e0cc SHA512 b9745c4beb9d3ce8645c495345d7dd76fb9d930ce72c8f7387d9cc73e615b62f40a2f470b46cef407ed0b097b050413451763acb81edb0c87d0d95ffb28c9319
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 962 BLAKE2B 6abe44ba77bb16d78f1529cacbb95bfc439c63ba7cc3ee594209cb22927374e184edb90804ad1f55aa6721f98aa927f3bd8ca713463085233db1b233837acb07 SHA512 7a45a663f00ae5a71bea3002a72bd11a640583af44c0ab6a3dfbd6551bbf3a6de5f35e880643294c56027ecb3b7757425a2c26f34a96fbf8cd26df4a545086c0
-EBUILD tomcat-servlet-api-7.0.96.ebuild 903 BLAKE2B 96a68aedd7a8659c8e28026ba7bafb0f6ac8b468a95daf136eb44ef793b36e3d7adf16f1bf3f01bda4f198cbdd9f792051c492e47e5adf2b45f35d9e2b2d2702 SHA512 0867575b7ce8681f4a15edcdf70ed1ed3bb82bbed97128e238d650726e29e66f48dd2bbea4153e1426c24eb30b49b5eb783407533612336d1f5230d05a882eda
-EBUILD tomcat-servlet-api-7.0.99.ebuild 905 BLAKE2B bf918997ee9c96063bd7cf0593209da710caf03d42aaf2381ec2a500c0db45c86cf36e33c07b3ded5facff6dc9ec022f42731bb21c35fbfec6fd71bf2b58e6f7 SHA512 f2f5d74d1e11361da8f46895dd34f2ce0e936fd3ce146776f400b9bf00d329810cbcb1e1ef3e60a44729f673dc7fe39bc7ff218ffddb75324ebac9a967550a15
+EBUILD tomcat-servlet-api-7.0.100.ebuild 901 BLAKE2B d0ee4ec8ba0e77f5c555ce53b1dad3558371a7667e55a3991b9753e135eedd67af5627b7c819620ea5f52c741f14b53fbc1fb1a6cd0cc680f62e0d651de6b22c SHA512 57e57d722ed3ae8c3cd99c0a0351242c6c74bc556babb4719db51ace5b73ea57eb538e69ce3b19c32cb33defcd1ffbaea99bf401d856539560c0a4cc9f5bd685
 EBUILD tomcat-servlet-api-8.5.47.ebuild 1005 BLAKE2B 029fadc44ace7749ca1c4db4178f2c15cff949455e76510f31be9693266d9ddf08cd674922703045e462925ba413450b5bb61c3168796b0f21cfc498c3954cb4 SHA512 6e4e625564a15b37795c7f13277e0f3750a8ebd94d9b733867b28806f9dfa066baa88803840f6b26c1ec0a12b00c5b5440ef43a9bd77177161f7134aded2b5b6
-EBUILD tomcat-servlet-api-8.5.49.ebuild 1008 BLAKE2B b0a72cde70dc747a59e3132f9e7137b9357e96246e3aff202fa2915f2bb8b605984861abfb2d6cbab144d829469b26644e8a996dca682d41d9beddcf6bbbf55b SHA512 4555d6f5edade7813fc1f36b7929221878447ef4224c96f978f5d36db262364bbe65b37c8bd0b844e10858055dddd7eb7d5840de00c32ef2b1fa219a741da1ba
-EBUILD tomcat-servlet-api-8.5.50.ebuild 1008 BLAKE2B 1560f356f09d29d3cfa9c0e69a4bab73a412cd2d174745164d1d0efae7760cff91f21c6692bfc90adb5eaed11c090ec11aec3b77fd7d2116a0d2dfdf0eb7f4c0 SHA512 5f9233d432a3710356b31633a42f16e1a500423f8fb8722772d0f8f18e95b435debedc3e53d4a87adcfd12989570d4682cc7308990b8ff00b4d15e696d5864b8
-EBUILD tomcat-servlet-api-9.0.27.ebuild 1000 BLAKE2B b410d7f4731df2e4bf4a6662e0af2499abb8025cd151f7945c36d5866ab9582794a1fec9ba83efc2ffeadbdf1be947a6827e2a022922dcd44912cc16eb0162a6 SHA512 d70c5000a9122e187b45d755f08a4bb8b76f994c5dfdc12146f6c4cef0d7e70607636dac9a43e221d8f7b6e50f85b34f435d221a8c837014cb309a2c9a993ed4
-EBUILD tomcat-servlet-api-9.0.29.ebuild 1001 BLAKE2B d3ed95575adb0ac164f17e721146bb7f8c2e23bbe424cba29a1d2bf4bb97185371a635c5d5d06f78f395f0a8fda33bd00a707e545c706b4c43c288fbce976a94 SHA512 24d54ded5e701697509b6044be4b6f24591ad8349ff36ac331e7628c26eed22f7ec29f0ee82587b5005acf566f01e23e6e219670dc5e1269a80ff5536bc33765
-EBUILD tomcat-servlet-api-9.0.30.ebuild 1001 BLAKE2B 0c3a54000bca6bac53d53bce38b3caa85dff31bcefb40f257408ad2113fba2e44b819630307492287f26984fdf5e4d88b68337c39768141b4ff17dea1d1353b6 SHA512 757be3ac0c480bacc7c03cf7bf1341189c5848b66b9eeb5520c82e67dd7b704bfbf3eb9f80f54130796b814c15e5d46b35eb4e1d2aeef02183d3b0bad1c90ca8
+EBUILD tomcat-servlet-api-8.5.51.ebuild 1006 BLAKE2B 5e5f54bc4204bbc7d2543b89b551af46bc871dc5e7e1056f0bec42e525dadb35060626df00bfa71557cf463979e734d5eb3d7fa526257b200f77b63ce3c8b826 SHA512 0e33cb31632341a749c1d3aed42882b8789be0909eb2b2a5d9685148a16ce6f1a3fd2f669f23f2ce2caf2993c2745248a2adab5f879396fadb776f1e9e60866d
+EBUILD tomcat-servlet-api-9.0.31.ebuild 1000 BLAKE2B cf72ff5044130696fc74a4ee7cfd28e55e82077d8972c56ce9324007e5d5776e4ed7fc4d00e10ba8c08ffdcf6fc862ecd8a86f177d41fc5264d4a1f9d110f6d4 SHA512 a72ac598d71fd597c238b4fd9d7aa6365540874cb8f1ae5aff63f6bf32d0f7f8195c9a1248d05bf2fa7d03a7d12a11e18c4641ce29b0a60939f03110c9ac454d
 MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
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.100.ebuild
index 9dead90b5a90..0bd7295e539b 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.100.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 JAVA_PKG_IUSE="source"
 
 inherit eutils java-pkg-2 java-ant-2
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.99.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.99.ebuild
deleted file mode 100644
index 88c4f9f8e140..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.99.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 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-8.5.49.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.49.ebuild
deleted file mode 100644
index 328f44502237..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.49.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-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 ~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}/"
-
-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-8.5.50.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.51.ebuild
index b6216e53c6b0..4d0bf5c4de6e 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.50.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.51.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.8"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.29.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.29.ebuild
deleted file mode 100644
index 75af8e3a7dff..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.29.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-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 ~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.30.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.30.ebuild
deleted file mode 100644
index 9ddac4eebd99..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.30.ebuild
+++ /dev/null
@@ -1,39 +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 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.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 ~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.27.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.31.ebuild
index 2fcbc10f1d8f..146f9bc7ea9f 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.27.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-java/wstx/Manifest b/dev-java/wstx/Manifest
index f66e4a9d5084..4cb18f6cfcdf 100644
--- a/dev-java/wstx/Manifest
+++ b/dev-java/wstx/Manifest
@@ -1,4 +1,4 @@
 AUX wstx-3.2.9-build.xml.patch 389 BLAKE2B ddb6b3e359aaffeab92a7cf21bfd00070a178c9baf594d0d742dd393f2cbe5fa81d13ce8c2a1555eeecc9efe58e3797274547d3b9c9e746247fa34727a438132 SHA512 e9fb8f3c81957970b9b2fb73bdeb8d3b91d1fe30712829aa3dfa2efc3b0be5b97f0a3b668c99570d5d6ebd1893d0dfd11d8f1961af700a8ff4826ce3250ffcb5
 DIST wstx-src-3.2.9.zip 2218419 BLAKE2B 98daf8a6bca50085cfa3f281c65567da5a51fd376042f6bb4fcb6bd1f77a442acbae8e27507e9aea8bc5da8da969f30c38a8e253f55d535f6669a3a0690c850e SHA512 316679a6586e453b85ffe4dd573a92019282b0d2028e931f33fafa8b0f3aef856c8326c72049ce42645e4b520bbd1bd91e74005f090dc22dc7ca7c76a0640117
-EBUILD wstx-3.2.9-r1.ebuild 1247 BLAKE2B fedfc57253e9b936cd323f8be737dd0bad0fce388741597508a1bd03a5fb5bc4db4c990c2625979d419de5fd3cb50c0cee1ad5f245c9d8c3088855a39a05da09 SHA512 26e77262befddbca1cb3350915ccb2ec5d02c4d001352b364c7956af9045757ece1f771fb972ff0f1125d3d55657a69b2d015917263b587131e649fd9a72f42f
+EBUILD wstx-3.2.9-r1.ebuild 1248 BLAKE2B a99aaaa70c10b7e48a28118b252110df743865018e9a3be90a01ba12708ab7581994c98f42a99e99fa304654d071830a8f864577fb8e3a31a804045652209598 SHA512 16f531b9d01b177a1b90a813320e6b501e01f9d6bbfb1e9bfa98b5fdc3f8381d800e1ce5ad844dca8f2cd3b0aae7501988b7e64cfd20986f0465b0690418e03d
 MISC metadata.xml 498 BLAKE2B 527aeb1edb2d32a86b920d0fe640c3665f62ed3c03d0512ae7bb7c3b2c011b94b487804dfa07bba68bc03ea46b69a05c2f4fad0e66738891615120a220d4807c SHA512 fe5cf72ac01bc004dc57fbf57a49e1c28b3b8191f236d5ef025dee65bfad7b44028abd374c02b4cc1107564e2a1706ef8c44e23c5b89a0dfda950cac4a6f75c1
diff --git a/dev-java/wstx/wstx-3.2.9-r1.ebuild b/dev-java/wstx/wstx-3.2.9-r1.ebuild
index aab3ce385731..ddddc0b42a6c 100644
--- a/dev-java/wstx/wstx-3.2.9-r1.ebuild
+++ b/dev-java/wstx/wstx-3.2.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -49,7 +49,7 @@ java_prepare() {
 
 EANT_GENTOO_CLASSPATH="sax,msv,relaxng-datatype"
 
-src_test(){
+src_test() {
 	java-pkg-2_src_test
 }
 
diff --git a/dev-java/xmlgraphics-commons/Manifest b/dev-java/xmlgraphics-commons/Manifest
index 8d65bf959b10..621b91b33233 100644
--- a/dev-java/xmlgraphics-commons/Manifest
+++ b/dev-java/xmlgraphics-commons/Manifest
@@ -1,3 +1,3 @@
 DIST xmlgraphics-commons-2.0.1-src.tar.gz 2716982 BLAKE2B 52d878455886f85a04ec27d04568a6a0a955860978243d6840f61083fd13597a2f066cc9821f2fced27245c98c6cb6e09caa3ad200d45069f640166a7c772cbd SHA512 fca5c593ceec18b040a0a57b74ba5377d5e070030f48b7835285986382795b19072bdf6320fd7e37182e4127883b795249ee1cb4255bcdfb1b00da1cf6032018
-EBUILD xmlgraphics-commons-2.0.1.ebuild 1261 BLAKE2B 06dd7f0b2c9e57f3bfda985b9983bb6b9300e979313ed588a71d44cebe5091215658c4c6acdde37f0f5f5bf87e7432213a434e367da791d614f86a3600ae98ce SHA512 44bdde6e9e5f43ef5f2ecc71074e939c20dac9a723326a4e6bb43e50e9826effe977b76567d9ac9e7272b53a16a9c779550fce7a334fd8772483a5ca6bd6c536
+EBUILD xmlgraphics-commons-2.0.1.ebuild 1259 BLAKE2B 6e84d4113cee88f2c2e612df69cebb7356c61c57fa5d1c831bc5ea93801d394402c0a8a40282938f8f716c3290f068c28af04bc933e2a0299617c75d9c4e7a09 SHA512 ad47791391bec0367135dc564d8814ae920dd3a58a082ad862d5fc4cb7ab92067992653446717f4404b849102f942e2d9e1c7b8de080049fc40a91b9d3f7c2f9
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.ebuild
index 080a086917d9..a7faa6d725e0 100644
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.ebuild
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -55,7 +55,7 @@ src_test() {
 		java-pkg-2_src_test
 }
 
-src_install(){
+src_install() {
 	java-pkg_newjar build/${P}.jar
 
 	use source && java-pkg_dosrc src/java/org