gentoo resync : 13.06.2020

19 files changed, 164 insertions, 169 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 5ebb3e29d822..ddde05d0060d 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest
index 49b5859365ba..211ff8e7b6d6 100644
--- a/dev-java/commons-lang/Manifest
+++ b/dev-java/commons-lang/Manifest
@@ -6,7 +6,7 @@ DIST commons-lang3-3.3.2-src.tar.gz 740462 BLAKE2B dbf8fe7f6a4bb0cf462e2281d709e
 DIST commons-lang3-3.4-src.tar.gz 771275 BLAKE2B 870f9c5aa18cb68cb88edc28d426df258af69eb6efc3dfe77bab40e2e81bddd4e56b1244a5ad4433f9dd4c0d533dc7b3b10c865fcaaefd9602e1f681bb48538b SHA512 44e93f2d8f7e6a54becaa797ee3348c6125ccdce96d772158f2a1e5ba2a7ecaecf00a6290f2e0fe2fa61db422313709ec6bc836d9296e2f16c5acf6635bb12b5
 EBUILD commons-lang-2.0-r3.ebuild 853 BLAKE2B b3b1ef307f8f400e60549b30742f950e9768eb9f98f05221906fc911e66e75c5c29e4e5dd852c689923becb69ae02a126948d630992942adf5f6397290f9930d SHA512 8474d22076ad123848ad765100b5f84c0a76d74980451c6a2fe983bb7bbff5b5ec28968e86cb422dd07390af4eb6b0bdb0db7d904cc46a514a1fb835887517e8
 EBUILD commons-lang-2.6-r1.ebuild 841 BLAKE2B d21f73d96b0335a1048056fd0c1570e8f0961f4a9f9bc820fd41cf68e34cf85fad1d8aa3585a3d4437e585c727abb5b91dc4da04b59c26f9fd297e29c3e5671f SHA512 2a47b5444859beed98e249fd48d06c6c97178503607a740e2265d95da062d8fb6ee139edac3f76ed00bd7d44f7a8d7c18525fb2300b83195ff1f441297e0030a
-EBUILD commons-lang-3.1.ebuild 841 BLAKE2B 1de87e9c73eea5aebd3891889025b5a81107ae54d6e8b3e456d66a9519cb87e90412ef16680cdefb06451320bfe021d490b1e42a4d205b9927676a5af2e8e012 SHA512 95de6c0c16b0b07def8cd4d698ec9ab5e79cb2715c658e95be67d9b7f3c28c04f47c5649edfa71be51026fcfa98c618e5283fa031ebcd621a1700dbe1d539c98
+EBUILD commons-lang-3.1.ebuild 836 BLAKE2B 5f864be126f1baf7c8451507ac8dc5c944a0fa236ebe17b1e0e5dae2bb1118a80e3994f103463632df0bd5060bdbd3ac8e7aaa372ea85bdc93a60a28d7c048cf SHA512 4a2e8154186bf9d4f47154a887108b34f83e6ee3c8ff3dfdb52c12c628862e3b0133e8abd7c2dad93823a745050c27b70ab2b3f86f98fcb63ef6d98ae8b4dfe4
 EBUILD commons-lang-3.3.2.ebuild 1111 BLAKE2B fecd7695bede1dbaf79d944466678d0671bfa248979e52264c05201aca89db664fd9c21e15f242662dc0908d73eee16bad165dd8a028e8c571fe505042b4433b SHA512 3d50c00b2e0c6795a454a39c0fd3ff9651a04c8243cb1ebc208835a5b2e929857af153870cf2ad7ed097630a422fc0734b059ea06aad3aa0c2b5ee36e76864f9
 EBUILD commons-lang-3.4.ebuild 1109 BLAKE2B 7106a50e065ec2be273259cee1f7b3af8646cddbb7c5bcbe859a16f0b8bcd68c5e63d0f323b7437b2df8eb6361397a69917e2b612409885fae3d643f496578ce SHA512 5789acfafd94d8d5cba8a8dc7748007f86147835eb08968d6083fc7c407ef7ae9849a21f42f53d8f226577d322798ab80c9341ae870f69c10d4b44bd400287a0
 EBUILD commons-lang-3.6.ebuild 957 BLAKE2B 70397b21b4bbb9e46bfcd3a2f9731486a94efcb9ef3a24f5000e3d7140c153d94782c4d630291c11c7b2da0e23017ef0a472d422ef1927d8cee89821fd1ac22c SHA512 15abf5f5fb7c29fcaf85e6fda4fd64f6352a88e4547839e00aa75dfe4f284a9ae37ea5efcfd557486f1f857c2a92c0c2dfd274b05ad6b1914172ee367d739c13
diff --git a/dev-java/commons-lang/commons-lang-3.1.ebuild b/dev-java/commons-lang/commons-lang-3.1.ebuild
index d114a31c54a0..ec1a4a37c148 100644
--- a/dev-java/commons-lang/commons-lang-3.1.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.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"
@@ -19,7 +19,7 @@ RDEPEND=">=virtual/jre-1.5"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
 
 S="${WORKDIR}/${MY_P}-src"
 
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 23659a174021..d34659743877 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -12,5 +12,5 @@ DIST icedtea-3.16-shenandoah-e4e81ae21643.tar.xz 7081200 BLAKE2B bbbd4f3cc7f3adb
 DIST icedtea-3.16.0.tar.xz 1534432 BLAKE2B ef8ffc6773c2ea1d71a2bad1f425f891edd65cb61fd22b1c36b06539b9656f211422d897e35b707bac1b0005eaa95d31bab3079c5e31454383be01d9750394ba SHA512 67964f283b5a220ded7c86141ac359fc51f41077686d3e68568a9f303d2e5e6d62472bef2d6f5f9d53897a55589c84d3212983194607b9a6704192752f8ad2ac
 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.16.0.ebuild 12204 BLAKE2B 1cc6ba72322d962c5636f022d6fc7e60808a4305bff333f520ad5834ea6cfb608f9aabb510fdc62b4d4d00c81bd459f3bf1ecc2434fd212fc2008a5330e35fdb SHA512 64a96f379c844a4530bdaab3cfa78897dd7e814f513639d8235d338c71b8997cd0ab3fd05e20f7b04ea1a8c756f054ec428c53d87f743fdd1ae83bd0721d3a03
+EBUILD icedtea-3.16.0.ebuild 12343 BLAKE2B 970d168c457217a1396c9d5552999eb2e15e567a8f8930391256756a10f420cece2f4f1c3ac9781796962fe5224e228201570740dac8c789af86b93576fe6b33 SHA512 e7eb6e347acd606ab43f64ac80aaa8ed17eb13607b870151030bf5f1613943205c04050f218d5eb3d7a5c828eb09a59b133e8487e87c549f4327f36bb6359c73
 MISC metadata.xml 2258 BLAKE2B 589f588b726745c7c488da1a900a97586cd7283534e675fe478149c3ea178e7c4fe6149b0430ca6db3546f74a632ec6da7ddb12f6efecc0e0aebbe8fd63790ae SHA512 22d6948a51e8b56d98aa60158903eda355fca255f5ea1d8b0cfb7767c346d91ed38d51fe0a06938e95efee3d544708d880f8a41fec9cb789a6af9eb1126a95d7
diff --git a/dev-java/icedtea/icedtea-3.16.0.ebuild b/dev-java/icedtea/icedtea-3.16.0.ebuild
index de38d49e5933..0d8a40ccf226 100644
--- a/dev-java/icedtea/icedtea-3.16.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.16.0.ebuild
@@ -10,7 +10,7 @@
 EAPI="6"
 SLOT="8"
 
-inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator xdg-utils
+inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils prefix toolchain-funcs versionator xdg-utils
 
 ICEDTEA_VER=$(get_version_component_range 1-3)
 ICEDTEA_BRANCH=$(get_version_component_range 1-2)
@@ -195,8 +195,11 @@ src_unpack() {
 }
 
 src_configure() {
-	# GCC10/-fno-common handling
-	append-flags -fcommon
+	# GCC10/-fno-common handling, #723102
+	if [[ $(gcc-major-version) -ge 10 ]]; then
+		append-flags -fcommon
+		append-flags -fno-delete-null-pointer-checks -fno-lifetime-dse
+	fi
 
 	# For bootstrap builds as the sandbox control file might not yet exist.
 	addpredict /proc/self/coredump_filter #nowarn
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 992eec99323f..f689805341d5 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -8,6 +8,6 @@ DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u252b09.tar.gz 102238546 BLAKE2B ffa0a
 DIST OpenJDK8U-jdk_arm_linux_hotspot_8u252b09.tar.gz 96925784 BLAKE2B 3e294a9a38729e453dd74d691bad4abd043fefd2a850a1d8fa142e5e5c2b908a1c7a0d9f2ebf1760ecf065cb615a59a930c84e86e86a339da01a794f1f3319ed SHA512 a361cb07b43ebaf7d1aa277c15ee41493fb25ff78dcad1801436ef68a54c4a89f2361c3f57ce328c507b9f36c81a301d95d9315d32aa888163d533d7d741effd
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u252b09.tar.gz 99444051 BLAKE2B 87f691298c7335c0adb285db6eff8ecb3897bb7b229bc6491b992375bd63c93eef126702ee461609b3a781240747d3f1372b4ed711a420cca1248878a82a2b6f SHA512 875d0d74088744a0a56a4706cd86a78ef2c5eb1a5792ba94ef2f51bf894a94123e761ab8fa0e5e74272c2f350a881073e4054e9f1c504421f43bb93b837d26a4
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u252b09.tar.gz 102170196 BLAKE2B 529630d67553064d302a81079eb61f10da8fc7fbcb69375020f5572fa4e9a46a679e6b0de99b7f67d9f40305a5347e9337cb6dec1c3cac5576671f52866beb2e SHA512 923a3122aa15db27f1605d1f988efa4a5bc920ad132121ba906f9d4cea11b8bfdcfe5b777ea7f37f5789e0be85135f24f1ddf7cbdff40594336fde7fc0474a6d
-EBUILD openjdk-bin-11.0.7_p10.ebuild 3092 BLAKE2B 408614638686de5d29145d3e30665f99d6d7a46594363f7ca8973b560eebc214d57c0e7ecdb3944dae23ffba95283e4050945c6d73960b40ea08598b348e8aaa SHA512 619777afe9911ac1d15079ff4947ba8cb90c1bee3aa8cf837de203100a754bb8f19d4a022759661ba3962f9ff49e0ee18e80228b76604e467416b83f53a0ae46
+EBUILD openjdk-bin-11.0.7_p10-r1.ebuild 3154 BLAKE2B 0bc992ac9a262043a1e1cd7289ceed6f58d9f64580358e8c8d78cff313cad0d8b8fff602e62743cbb05a3bf33994fd0d70dc43ff45d0b4d6daea14e28d1490ff SHA512 70b4fe98021cbe4dc671b2229c82bbfb05a15acf1bbcfd523335851d4af58970dd2b70f78594c3ff7c47a959b0eb9197585659ce57c1da10ff17bf23f966c6a6
 EBUILD openjdk-bin-8.252_p09.ebuild 2155 BLAKE2B d5832197b20177c54ea2fff0f636695f9755ebac665fb7eb72e2c010bda94d71aef30152ef41ffa6970292a56c73999587c3edee859cea7378da44a4c19417a8 SHA512 798bdc975d8b4073da3ee575b0a17ba929da4da9ccbbcdbbae0ec6fb32aed37f894707a3c16ab51ed3f61a6126d84a03b38ae6f6f988c9dc52e1cf619fc76e66
 MISC metadata.xml 1025 BLAKE2B d7678bc38651044e8551f51b82f628f6c682cd15305fbe4bc9a9fa9b8f66417e526da18d46ff092d1b82a13a83465d060ef6ffbcfa562ba82bfe6fb9e59de60e SHA512 809731d43dcecd74f45e328780e35ba70b4ae384aea3a28c796a84c6ce2ad8bfc7cf0a6920f150cb4096f61147e9d5326128aeddcc14836752694cf5cdd6e7e0
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.7_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.7_p10-r1.ebuild
index b62ea6e8fe17..4ccc0089139d 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.7_p10.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.7_p10-r1.ebuild
@@ -89,6 +89,9 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
+	# provide stable symlink
+	dosym "${P}" "/opt/${PN}-${SLOT}"
+
 	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
 	java-vm_revdep-mask
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index 3e25d1ec74cf..b4ad32b7cca5 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -2,6 +2,6 @@ AUX openjdk-jre-bin-11.env.sh 513 BLAKE2B b7dfc571fda637776479ca4f8a8f0eb1fa0f03
 AUX openjdk-jre-bin-8.env.sh 675 BLAKE2B 66fb3b2690af2cb8bfb959bdd6edf66e130cd5e2c8968c96aa8d6cd09e01d193c6ab9973803e97105da4cb573b4221528d1cc830e044feac1b2c8ebe9f17d405 SHA512 ad361aeea566fd23fc21a607c9cdf63b164ad9d38a63fa01f435640af90e49cdb6562cb64409ab873a6603def04f8ecfc164340988c1a0660e8c6bdda500cd9d
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.7_10.tar.gz 42917723 BLAKE2B c5635b3727e10462396891cab89e257ded57c59f56e9bcb84a3d040ce8a27d7d67d6b78e5f55b63806dd93f6151b767df42e4428d12e763f9722196ca0736a08 SHA512 a776dd9168e3c2635a8492405d58628713e646292d7ee16454681d46866e7ea41afa712227e94ed2e8ce52c727e445f4631db63a02408aa817f1c79af8057dbe
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u252b09.tar.gz 41104123 BLAKE2B 52a9f288054c4a96ed5d70c2c9c6cf14ceb32262ec3a38f547286518ccc14a4695d330adc19e272436c0a7154771cddd9b0672b05beb6d5013c44c69be0ad25a SHA512 b1b0627e8495b11e0ef3e4ecb387d92537bb97b3f3045213658d48b6f2dffa0bc975b1bc92e84c487152b43d1f0ee0449730bf84dd62d98d13354bf73d3a0a20
-EBUILD openjdk-jre-bin-11.0.7_p10.ebuild 2727 BLAKE2B 13c53dde5e577bfb934f108fc0b9fd07744da6fc3dcefb6d57554f2aab733906f1f8fe1009fea3440d6e481fd9c906398a83a72296f58687d93c66d97bf4d01d SHA512 592a61cf6b31657706f0a83fcec0137dd2d4ed9e56b5a94de3326d692337e1c5ad665a74fa434530ceaed5feaaf0cd2a5c9950e7de19f8514d1ae3ce7bd1c988
+EBUILD openjdk-jre-bin-11.0.7_p10-r1.ebuild 2789 BLAKE2B 6268a58c4546fae96623f74b6b1b9a79ab620f281def5be76fd5bf8b9f002624815fde2a4d0a94f4746b3c915ff40024efa7541bfd903b88e9230fe242c89fc2 SHA512 95c655d90572b0fe94c95fa71af5e6623045ef291c2b350c533a6979c464a968c0d03454f72ce37a11ffd191e87dac86f8020c825b9773482821926c0178f4d5
 EBUILD openjdk-jre-bin-8.252_p09.ebuild 1934 BLAKE2B 4886fad419ce981cc39af9c791c00fa4fed1aff50a55fa26c4c607d7be35cfedfd1ad583e8502a01e3edbd568fe3ec32f9897d3e9f110271d4cc5735a654cd89 SHA512 4cca4b3bd3ec8958e8cf0cbe9873b11727d75a92a1edbe174e9d7275b6febe5cf273a4414fdf1b649d48d8c62d7e93a7267f5b78440189d4815634c853da3768
 MISC metadata.xml 980 BLAKE2B bedd68b0facaa23d89578762fc5fd80dea94a3dce51e8afdd70dde4fb949168694e633564384a506afce44de11f81bc46ad33c324ff2e8e4c37b2fafd246bac3 SHA512 fbf6411ee2bf3f0aa6d7f475a883c7316b87fe20c54ee43200034268a7f57f8454e1aba5ce272645e08ef41dc35e61a4b965543215ed8278c4b8606fdbaf5f00
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.7_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.7_p10-r1.ebuild
index 33938cb19738..23e7a0fbadc0 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.7_p10.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.7_p10-r1.ebuild
@@ -75,6 +75,9 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
+	# provide stable symlink
+	dosym "${P}" "/opt/${PN}-${SLOT}"
+
 	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
 	java-vm_revdep-mask
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index ea7b85cc5d09..498726c6b65c 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -21,8 +21,8 @@ DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee63
 DIST swt-4.2-gtk-linux-ppc64.zip 5935799 BLAKE2B 6b1ca0d25d81134239e56ead673303075b6d9c5f20e4ab07fb7b5b87d54582023d02c28a1d330fd40d647bdbc27823ca7b184837cb974706ee13809ebdfd2db4 SHA512 bedd64099380980a6dbe47b86f4719666366680f7580150f97282c6f6b6acc95822493469e950e8fcbc9c584f6fca9f35a59937551ae8b6e799b188dc3751e9d
 DIST swt-4.2-gtk-linux-x86.zip 5561088 BLAKE2B cf8bda6a48d5d8e389c387162bf2aafde5a95c43d76e444a4b79008e1154348d2c99850851b3d0e428890e6b2da1e4bec53a7f9050169ad4866a5a8352e9ed2b SHA512 e3d53bcd0521411c40f4c37719917f3570a17fb3ea5c617560986273fd155b99d9b0790ba27c57da26663d49ebec4c6a8387b41bd01b0ba934b21724ba98e133
 DIST swt-4.2-gtk-linux-x86_64.zip 5867140 BLAKE2B 994bf18799297529329637c1b9ebf15638187339b4f56bf8cc1dedfc97c25a1ea4a1664605cac1374fe3d79b321dc450c6129ebef00ddd6f9507f238b7836316 SHA512 56c5ec4ca2ddeed5256dd6ff350dc3911034ecbc414a06ba879f04ab53d6380ca9da9037097f76228ca8182f6076bcd9cc4cb9b01c10766c10048e6576fc5f50
-EBUILD swt-3.7.2-r2.ebuild 4599 BLAKE2B 40622f45bbed4e5ccd75088e29aa1715faceaa3ff4823609ee832ef068ebc4d08c921f5b8f7e2a656c46f3f69ba7c8edb32c1defea7cc4c3f723f5765e60b1dc SHA512 9a97b882c2f18f0e9dc552a5dde1476fe360ef478741735601e6aa5cb847aad35b71c3f258644b9ca2cc1b1649e0838cd44ef7278f3f02682afc0f7c9d24da8c
-EBUILD swt-3.8.2-r2.ebuild 4437 BLAKE2B 19f84cd5506ca1306754a26f601d9a1a18b6e3f3091e7f38fb768db833621c741502794417ab7099a1edec0546ba6c79785c918bb26aa0acfb3bdc5dc788b860 SHA512 c4e25e86c66d29d74d5bc100d97214b3742369ab7bbf96f38fd95ed28c7c03838f3260dcd45f755c90a07ba4f0f0a066702f7f8b2396e66569fe6f513770ab28
+EBUILD swt-3.7.2-r3.ebuild 4392 BLAKE2B 70df10c87dc15097c330b521eac0348c19778bc9b2abd3868c3b4faa488b1ca6727411df26ea9226173c1d59f94cc2e6137a1e7532ccbb641b1e5eeb0c8b1445 SHA512 83a6562632fe653c556084bf1413fae2be1b8fd0351241e4b5198d317cca2cc753d6798a74fcccbc5c2b50f088ad02ad6989183ca94bcb1d1ef26a8f74f52310
+EBUILD swt-3.8.2-r3.ebuild 4240 BLAKE2B 200a47aee302fb32a3fb8000177d036e426d929e20ad5646879e252e10a8537bc87902951f4f2bf4380a430ce8031e576bd36bc3db810bc3ec8bc8db62b10b7b SHA512 15b59cee721bb901ca2e3ca8697c813747f345387bc31fcb397da152c131b7a70fd8f3d740c71bda54bc51f11f9458ed4d41179907f77ee29af8b3c3e2791ba2
 EBUILD swt-4.10.ebuild 4534 BLAKE2B e331f67fa0516ad79467543694f22ee36ee2621200ecb30b84abf493ddce28d5ba10a20195a42e9a32271ae86f578555ad31b730e3140ff83d7e1f642ef5d853 SHA512 13ae51af08ac1653a8ca5c226cb7b69e8f9d64b50a311b74e30b90f3d30376d486e132299e2de8853efc4074d422419b71d65ac53c1f5777c98198e2367b5dfa
-EBUILD swt-4.2-r3.ebuild 4682 BLAKE2B 1e47fc517f3eba4ff626129f5b4810dba8930da995aa03788806d324192443e56570c280e3e732f4a58b6b3aad125574b22e8d024de11b56cced051675cb382c SHA512 15ffbb9e0cdaca5bc782327052d049efce05686d2a27ab84f44c9388e82a2f83ce42adab9e2c8110580b7572b18b111d5dcdf5ab601021cc2a321a84ffeca130
+EBUILD swt-4.2-r4.ebuild 4489 BLAKE2B ac412f8ae913a503bc5e5264a6f28967bfcab630351c0a571df3f7cd8c45c7847ad5c5d66302ab97f8ff66207d21000c85387c268092b0080bcdb92a7c47a705 SHA512 2629590b0679a5372f1974c7f5644e576497b1282672d3902fa680dfc9d302148b9a3049a23f9de2c0014a65f93a644146ed33ed1f5ca4161307867f9e87ad8f
 MISC metadata.xml 518 BLAKE2B a325a8cd71c85886ffabde744769f9edfac99311d30be502937ff560e3cdced76c92a4a90979e0d46950fa2f345d2364d21902ee13fefa4d78477bb829e6298f SHA512 088a1c3b97e2496e801234ef5a99ce14bb259f8065545e4be1af65e6e5639c273a88a77ed50c414e35c20f62e7b5183c721321a0e463ffb990dba05ea271251e
diff --git a/dev-java/swt/swt-3.7.2-r2.ebuild b/dev-java/swt/swt-3.7.2-r3.ebuild
index 8444b55d8ef2..1da53e158609 100644
--- a/dev-java/swt/swt-3.7.2-r2.ebuild
+++ b/dev-java/swt/swt-3.7.2-r3.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=4
@@ -18,38 +18,32 @@ SRC_URI="
 	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
 	x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
 
-SLOT="3.7"
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+SLOT="3.7"
 KEYWORDS="amd64 ppc64 x86"
-
-IUSE="cairo gnome opengl"
-COMMON=">=dev-libs/glib-2.6
-		>=x11-libs/gtk+-2.6.8:2
-		>=dev-libs/atk-1.10.2
-		cairo? ( >=x11-libs/cairo-1.4.14 )
-		gnome?	(
-				=gnome-base/libgnome-2*
-				=gnome-base/gnome-vfs-2*
-				=gnome-base/libgnomeui-2*
-				)
-		opengl?	(
-			virtual/opengl
-			virtual/glu
-		)
-		x11-libs/libXtst"
-
-DEPEND=">=virtual/jdk-1.4
-		app-arch/unzip
-		x11-base/xorg-proto
-		x11-libs/libX11
-		x11-libs/libXrender
-		x11-libs/libXt
-		>=x11-libs/libXtst-1.1.0
-		virtual/pkgconfig
-		${COMMON}"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON}"
+IUSE="cairo opengl"
+
+COMMON_DEPEND="
+	>=dev-libs/atk-1.10.2
+	>=dev-libs/glib-2.6
+	>=x11-libs/gtk+-2.6.8:2
+	x11-libs/libXtst
+	cairo? ( >=x11-libs/cairo-1.4.14 )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+	virtual/jdk:1.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/libXtst-1.1.0"
+RDEPEND="${COMMON_DEPEND}
+	>=virtual/jre-1.4"
 
 S="${WORKDIR}"
 
@@ -123,11 +117,6 @@ src_compile() {
 	einfo "Building JAVA-AT-SPI bridge"
 	${make} make_atk
 
-	if use gnome ; then
-		einfo "Building GNOME VFS support"
-		${make} make_gnome
-	fi
-
 	if use cairo ; then
 		einfo "Building CAIRO support"
 		${make} make_cairo
@@ -157,7 +146,7 @@ src_install() {
 
 	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
 	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	use gnome || sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
 	use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
 	sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
 	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
diff --git a/dev-java/swt/swt-3.8.2-r2.ebuild b/dev-java/swt/swt-3.8.2-r3.ebuild
index 64b28cc018f3..6234e6e49421 100644
--- a/dev-java/swt/swt-3.8.2-r2.ebuild
+++ b/dev-java/swt/swt-3.8.2-r3.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"
@@ -18,38 +18,32 @@ SRC_URI="
 	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
 	x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
 
-SLOT="3.8"
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+SLOT="3.8"
 KEYWORDS="amd64 ppc64 x86"
-
-IUSE="cairo gnome opengl"
-COMMON=">=dev-libs/glib-2.6
-		>=x11-libs/gtk+-2.6.8:2
-		>=dev-libs/atk-1.10.2
-		cairo? ( >=x11-libs/cairo-1.4.14 )
-		gnome?	(
-				gnome-base/gnome-vfs:2
-				gnome-base/libgnome
-				gnome-base/libgnomeui
-				)
-		opengl?	(
-			virtual/opengl
-			virtual/glu
-		)
-		x11-libs/libXtst"
-
-DEPEND=">=virtual/jdk-1.4
-		app-arch/unzip
-		x11-base/xorg-proto
-		x11-libs/libX11
-		x11-libs/libXrender
-		x11-libs/libXt
-		>=x11-libs/libXtst-1.1.0
-		virtual/pkgconfig
-		${COMMON}"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON}"
+IUSE="cairo opengl"
+
+COMMON_DEPEND="
+	>=dev-libs/atk-1.10.2
+	>=dev-libs/glib-2.6
+	>=x11-libs/gtk+-2.6.8:2
+	x11-libs/libXtst
+	cairo? ( >=x11-libs/cairo-1.4.14 )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+	virtual/jdk:1.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/libXtst-1.1.0"
+RDEPEND="${COMMON_DEPEND}
+	>=virtual/jre-1.4"
 
 S="${WORKDIR}"
 
@@ -120,11 +114,6 @@ src_compile() {
 	einfo "Building JAVA-AT-SPI bridge"
 	${make} make_atk
 
-	if use gnome ; then
-		einfo "Building GNOME VFS support"
-		${make} make_gnome
-	fi
-
 	if use cairo ; then
 		einfo "Building CAIRO support"
 		${make} make_cairo
@@ -154,7 +143,7 @@ src_install() {
 
 	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
 	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	use gnome || sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
 	use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
 	sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
 	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
diff --git a/dev-java/swt/swt-4.2-r3.ebuild b/dev-java/swt/swt-4.2-r4.ebuild
index fdfce91451a6..eff2fb275a5e 100644
--- a/dev-java/swt/swt-4.2-r3.ebuild
+++ b/dev-java/swt/swt-4.2-r4.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"
@@ -21,33 +21,28 @@ SRC_URI="
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
 SLOT="4.2"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="cairo gnome opengl"
+IUSE="cairo opengl"
 
-COMMON_DEP="
+COMMON_DEPEND="
 	>=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 )
-	gnome?	(
-		=gnome-base/gnome-vfs-2*
-		=gnome-base/libgnome-2*
-		=gnome-base/libgnomeui-2*
-	)
 	opengl?	(
 		virtual/glu
 		virtual/opengl
 	)"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.4
+DEPEND="${COMMON_DEPEND}
 	app-arch/unzip
+	virtual/jdk:1.8
 	virtual/pkgconfig
 	x11-base/xorg-proto
 	x11-libs/libX11
 	x11-libs/libXrender
 	x11-libs/libXt
 	>=x11-libs/libXtst-1.1.0"
-RDEPEND="${COMMON_DEP}
+RDEPEND="${COMMON_DEPEND}
 	>=virtual/jre-1.4"
 
 S="${WORKDIR}"
@@ -123,11 +118,6 @@ src_compile() {
 	einfo "Building JAVA-AT-SPI bridge"
 	${make} make_atk
 
-	if use gnome ; then
-		einfo "Building GNOME VFS support"
-		${make} make_gnome
-	fi
-
 	if use cairo ; then
 		einfo "Building CAIRO support"
 		${make} make_cairo
@@ -157,7 +147,7 @@ src_install() {
 
 	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
 	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	use gnome || sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
 	use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
 	sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
 	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 4734891b0aa7..c21176b3d38a 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,5 +1,3 @@
-DIST tomcat-native-1.2.23-src.tar.gz 419428 BLAKE2B b8e0584d3e42c33158c4edf0432b029ee924a509b00625af6a34af3d580fec510fa0222367ea8679a20b51cb5a7c55198f5a2d4ec60d0fa9dbec3a0a22a11b52 SHA512 89a0363961d322a87f4e752f4727f54f28ac6e4ad10fa21b6b7390c62b041d4068672d95495d9233c1cad7d6c1dc3c85fbd0186894085b3b94e476876af160ee
 DIST tomcat-native-1.2.24-src.tar.gz 419572 BLAKE2B 572f6d64b8f4c22ed1ab68efcec5cd1c57fe01e7b0830dea979039cb702a2930458e7bb31abdeddcacc6d673513c896ca46d28ece681c6c42938498351962b36 SHA512 5dae151a60f8bd5a9a29d63eca838c77174426025ee65a826f0698943494dd3656d50bcd417e220a926b9ce111ea167043d4b806264030e951873d06767b3d6f
-EBUILD tomcat-native-1.2.23.ebuild 1178 BLAKE2B 10749abb4552c7f7411f65b225afb1c8f42095912077b1f8783de3f597152c5783ed0d986e644ebac986d9a59e835ff888e4ac0d0461eb31d2202b6fd01e6ece SHA512 b62fc8cc5d355898530a7a7dc9db642ce3074d5d72a6da7a2ee25a211c55120d29b631a61b1d3ac5cb4aa7c1341333a18929c0d6c1fb8cd2223ea5a9b12f64a2
-EBUILD tomcat-native-1.2.24.ebuild 1179 BLAKE2B 6f6768247218c3f40ea7b89d03468e1bded2962b354f9d14cb4956a3d0656ad84017a2d9b717d12b0bb4c65c7e5587f21ed014974ca86e7c84911261ae81a0b1 SHA512 25aff507afd4a8b1e4f0a485b643caa31b234079ba368a6a8d524f2cc70d9c32de19a967f176c8a59dd276eb3504a01bb684ae6b438fbcd102f1e416b1e863ad
+EBUILD tomcat-native-1.2.24.ebuild 1178 BLAKE2B a99246469d416372df02e87f7a401e3caf013a260c8d75ba519c26ad0fe0b0b7d56462b738690b6635b265e6d343942320a437699e3837f802929b30829bdb40 SHA512 eb969c2d30befcda019b155e8845a922471d16be31aefa8b2d15ee21c14153a491b812d838b31261867e669d35759e2975674d719e6bb80990a2fa0ccac8e215
 MISC metadata.xml 806 BLAKE2B 7f193bb62b100b0c141677fcfe9671122b70bf5091663757fca98941ca2a7c195c0b7f4f1fd95c96706a8a8c8508a7a6b63858d2eb7a3afb75b4ec21f5eae021 SHA512 7bedd98efaa696458ae80b5bd844a569b2bda8903a7d4e7c9ee9ea197b80abacf7f257ff91aa14d4cf6df830425df58f08cac7c3e9ded79823424b352fd9e978
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.23.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.23.ebuild
deleted file mode 100644
index 566f24ceaf17..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.23.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
-
-KEYWORDS="amd64 ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/apr:1=
-	dev-libs/openssl:0=
-	>=virtual/jre-1.8"
-
-DEPEND=">=virtual/jdk-1.8
-	test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${P}-src
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_configure() {
-	local myeconfargs=(
-		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
-		--with-ssl="${EPREFIX}"/usr
-	)
-
-	cd native || die
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	eant jar
-
-	cd native || die
-	default
-}
-
-src_install() {
-	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
-
-	cd native || die
-	default
-
-	! use static-libs && find "${D}" -name '*.la' -delete || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-pkg_postinst() {
-	elog "For more information, please visit"
-	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
-}
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.24.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.24.ebuild
index 2dd1db52c691..0b63dda09194 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.24.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.24.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Allows Tomcat to use certain native resources for better performanc
 HOMEPAGE="https://tomcat.apache.org/"
 SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="static-libs test"
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index ccac7559d65d..fbb477b3e4a7 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -11,8 +11,10 @@ DIST apache-tomcat-7.0.103-src.tar.gz 5279592 BLAKE2B a8ab36fb84cf158fcd8b888276
 DIST apache-tomcat-7.0.104-src.tar.gz 5309794 BLAKE2B 0d4d5d668e1131bb533af1d56fe37ee1f5c252c2c4dd987e24aae67484f27805f88750b27248c6acfd0585eacd0d3f2155c723e9a25c8613652101944add2a15 SHA512 788eab3ac343815362decf4c0d5db91f3697cc669e7e051f93bf82905cc52f9b040d00b7e07f7b85bcf470e802418896a678f991e523e08a3ae5a2f212a53257
 DIST apache-tomcat-8.5.54-src.tar.gz 5689648 BLAKE2B 7d4c80cb86261bba46b1879d8f2b9218a63cfb069d32dfe72bd5d73baf87887cdff37c5841c44196ded1dbafcfe2d525cb09d8a15905c24600caf107255416cf SHA512 fe4a82fc58aed0df203abf03367f840d7ac498a3ba317eb2b08826e8ab5e705ea13b99f3af1e17878b2cf96271c5d9ff4e7cecf3b2631e061f1b02988449f9e2
 DIST apache-tomcat-8.5.55-src.tar.gz 5719386 BLAKE2B 4d5d20cf81e0a9aba1fe2b0fc2e9641696a2c7b4bfe1cefd1e86025612484ef06a8171e28722bcde91b671df5bd6e148b22c2fc267828109c6af762fe35f8fdb SHA512 214758bf4dc868c38fd92a19e405f3cd8e47008dee82610f8f7373d92ab5f8800c160a42c96c293f599b702c1c9d2967ca40d3410c1f6a14745edac4739f177d
+DIST apache-tomcat-8.5.56-src.tar.gz 5724546 BLAKE2B 623dc2d1f6808f012f19fdd0d914c4bb200e8328ab6b6855666c1db1704e198d069ff74d227bf51e8376c20daf0640002e5d6907edadfde294d8c62a64d55f83 SHA512 75529e567a7be48f2c1034f3eeada571478d0babb63fb2d368061573d7e64d5fc0a937304e2e2ffa956b5d8a403936c1543a93ee78b258b532939fb9ce80ef3d
 DIST apache-tomcat-9.0.34-src.tar.gz 5843244 BLAKE2B e4124c5986b0be26f17cf5e62443fa945ebea6dd713db6a7f96c8e4c7eed7d8e38610763adda928a7099c1574b00e072635576d9d29cc8ae1b98658f0e341acb SHA512 8ac8a916bfe2d3daf679dab9f299bc50f138f3cc9a6e8679a22862d122dea1e5ce3b9101472295398366f5b5d8477097a3cfb536f01136e72ff09d69b2f6c3df
 DIST apache-tomcat-9.0.35-src.tar.gz 5887816 BLAKE2B 8103a50a62aa527861fdc35ce8256d9ff0b7185bfa647e25c30c226f9850e88632e0c1e3575bac3a07513fe9c9777b4ef230275e685f48b0bbc733bc68ff7dad SHA512 8931c0f7c30f50d352879f8dfddc02fa59d7128813399e4eca3994be7cf2448e32e726a3cb8b387a5470ccbfa3fb74d0192c825b5f68bbb9fb6b43a9353cb24a
+DIST apache-tomcat-9.0.36-src.tar.gz 5890912 BLAKE2B 18962c7d4dcd75a04476acd306002977bf039d832aa1ed5551ffcaa0612e612e6b11db6d80cea149b9fb5df9d0f76284d55a1745760df8f4fa7449999e095c61 SHA512 f8263594bc679f75cecf5bcf4ad8e8ccfea42ad8e90eaeb7004c63875c6b700b0f863d68f1cdd932ebc7b303bdfb86d70afe88686e576c8ea7ccd9574c74e25b
 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
@@ -20,6 +22,8 @@ EBUILD tomcat-servlet-api-7.0.103.ebuild 901 BLAKE2B d0ee4ec8ba0e77f5c555ce53b1d
 EBUILD tomcat-servlet-api-7.0.104.ebuild 902 BLAKE2B 67cf14b835e7ce4ee75dc7739a31ffbc5c80d858087296ea98a1d1bc080079967350683f79d8b1db67977b9d82458a720cf7213a2ae4df8de72792fb81d3d771 SHA512 ab872c195c057c032267e3b1ac6e8093823f63d3b1e268dba9be610126b88ed0de2b3419d62ebc7379835c8cff0e109bdfa272abc777d67f70ada13daddae9a4
 EBUILD tomcat-servlet-api-8.5.54.ebuild 1005 BLAKE2B 81ce97c43775137f7c4760a58abe4d7a6192dded9e9cbcef8d29fa10b5cc0868740aa0683c94a349494232c64e42dfc0b09aeac3571260dcb6d8405dc233ec6e SHA512 520be8a3bb582a0b3dc783f5bc1763076d94a84a71e7678dc9d2def1d1c2be228097282667ecd9c3a5ba84b57b2403c5a446d45cfa249468932576df81e9d0ad
 EBUILD tomcat-servlet-api-8.5.55.ebuild 1007 BLAKE2B 8024ac34183cbcd4a4b682ec1dd586c8fef7c263cc0976e951249e6d71278bf1738e5224a5034c6d32611cc398ccd02b84621875d8c74d8980c4a62206d328ba SHA512 d2173e0e1be773992f67c77be7333e270a401d8f7e4c085a876f568e0e93055f9a7506ef8ae8774a98a576d58e0419f6367347ad34daf207b6e844b1d6b23edd
+EBUILD tomcat-servlet-api-8.5.56.ebuild 1008 BLAKE2B 1560f356f09d29d3cfa9c0e69a4bab73a412cd2d174745164d1d0efae7760cff91f21c6692bfc90adb5eaed11c090ec11aec3b77fd7d2116a0d2dfdf0eb7f4c0 SHA512 5f9233d432a3710356b31633a42f16e1a500423f8fb8722772d0f8f18e95b435debedc3e53d4a87adcfd12989570d4682cc7308990b8ff00b4d15e696d5864b8
 EBUILD tomcat-servlet-api-9.0.34.ebuild 1000 BLAKE2B cf72ff5044130696fc74a4ee7cfd28e55e82077d8972c56ce9324007e5d5776e4ed7fc4d00e10ba8c08ffdcf6fc862ecd8a86f177d41fc5264d4a1f9d110f6d4 SHA512 a72ac598d71fd597c238b4fd9d7aa6365540874cb8f1ae5aff63f6bf32d0f7f8195c9a1248d05bf2fa7d03a7d12a11e18c4641ce29b0a60939f03110c9ac454d
 EBUILD tomcat-servlet-api-9.0.35.ebuild 1001 BLAKE2B 0c3a54000bca6bac53d53bce38b3caa85dff31bcefb40f257408ad2113fba2e44b819630307492287f26984fdf5e4d88b68337c39768141b4ff17dea1d1353b6 SHA512 757be3ac0c480bacc7c03cf7bf1341189c5848b66b9eeb5520c82e67dd7b704bfbf3eb9f80f54130796b814c15e5d46b35eb4e1d2aeef02183d3b0bad1c90ca8
+EBUILD tomcat-servlet-api-9.0.36.ebuild 1001 BLAKE2B 0c3a54000bca6bac53d53bce38b3caa85dff31bcefb40f257408ad2113fba2e44b819630307492287f26984fdf5e4d88b68337c39768141b4ff17dea1d1353b6 SHA512 757be3ac0c480bacc7c03cf7bf1341189c5848b66b9eeb5520c82e67dd7b704bfbf3eb9f80f54130796b814c15e5d46b35eb4e1d2aeef02183d3b0bad1c90ca8
 MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.56.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.56.ebuild
new file mode 100644
index 000000000000..b6216e53c6b0
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.56.ebuild
@@ -0,0 +1,39 @@
+# 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-${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-9.0.36.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.36.ebuild
new file mode 100644
index 000000000000..9ddac4eebd99
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.36.ebuild
@@ -0,0 +1,39 @@
+# 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/
+}