gentoo resync : 14.04.2018

44 files changed, 40 insertions, 408 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 9d0b8d75bec3..fec704c49b9d 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/backport-util-concurrent/Manifest b/dev-java/backport-util-concurrent/Manifest
index b5d97cecbfc7..61b9417f9d03 100644
--- a/dev-java/backport-util-concurrent/Manifest
+++ b/dev-java/backport-util-concurrent/Manifest
@@ -1,6 +1,5 @@
 AUX backport-util-concurrent-3.0-notest.patch 491 BLAKE2B ea587be0736cd1aa4fcbc4095c31dd321816cbefa0cec4d6f0c8969e24e9e96038b30db4baec0d386ba18828cafad0c2d084b48d69c7db77414dd5282f1197f0 SHA512 f2f53a87283c1a6b13e360ba0140a93b0580a023cefbcb5dcd8658ddc7e80c401878229a323416213368f493226b445b5896bb0ff51f1a2bd95ef460f4ddd080
 AUX backport-util-concurrent-3.0-test.patch 380 BLAKE2B 5e1e437564035e652d6c41f8ab75b0589257e955aa06f2b83d8fb488ec7f2d7c4879fdc1556a47599231bf2ab1497243cdacfb7f64f5142bb4728265c296790a SHA512 01ad87f71b07c25193faf1d67de159233b2b298ef4ea31013f3af8d326a09b83f73bdbcfa5629f5531ffc0a0c02b20843c11377f1260448a9758be05c64420fe
 DIST backport-util-concurrent-Java60-3.1-src.tar.bz2 622882 BLAKE2B 49dd1065fb80d697dc917aeff1bf653a1c82bc24e3edf6d1eb272f3cee17130a6db20f562f40e7911a6382f8c545bdf37e1ce34b69a6a7ddf5a569e114a78e87 SHA512 caef9eef43d0de5ee3d05a84b44d3d2f6bb9498bdc82105626bd2631494fcd0347387da9beb6000fe9c80efacbbf2c2c3603a97b53e4c74037eaf629d790cd54
-EBUILD backport-util-concurrent-3.1-r1.ebuild 1164 BLAKE2B c3dbe265ef0945c94561a24b1e676fdce5a2144a592fba126663b7592e5c7a4916919bc8e0461507aa0280fd067afd1d319359b1e9472d7b15c3a220be824b28 SHA512 8e1ee760dc6df96e614a6bf36d27707e220e60917854bec2768874c96c8c224d70ce496769260f90961c53e5e1da1b17afd726a55914b306992221abf1cc6001
-EBUILD backport-util-concurrent-3.1.ebuild 1156 BLAKE2B 61ec36be722938985d187523dbf08d42da6d97b028d8fca73d3bd08b002b963ad275980528b11d49185a12c2a2c01907a22427f876ee19392a74cb2e4e57c1d0 SHA512 09049db9cc11693d88f0cff4cc2371abcde1ed93c2678a981346cf89cdfd191eb8cd277d419c788e20eeead6ff2c5c8d2cba24a067a08844ff36e9cea787036e
+EBUILD backport-util-concurrent-3.1-r1.ebuild 1163 BLAKE2B 9f5bc96e8401dd8451d213c04942458c46b8fa3c0d2d944e27727b6bdb63801cc0011b9b495eddd9678536e8b9fe9b0ff13769d81adabd12b58831bdf5952855 SHA512 ad14c0f08d9eae8e5cf8ea1281705bab4d4b225c51c5ffc8c9fc49c1bebc6ac80a9da8ca765a7e5e49afe9a62225df5b3f86d8eb4b82bfa68f20341a01aa3e76
 MISC metadata.xml 490 BLAKE2B 8c30e55ff1a4b70180d42e365d9eba3405a1591438e0fc801383b8a1ee65daf759b2544c1edb3b2a03cfe8f7932b5c4de8d12980c630fd5b625ad2f6a674c291 SHA512 81d2a6f504093869e765c56667feb53583a85c7cfe98bf12f571b2d4e202e5ab247e24b8a92ad5141654069d3a66179fbb28790781464dd43821ab55dee62eb9
diff --git a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
index 3471e39f2aeb..0c7e2df0256c 100644
--- a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
+++ b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${SF_PN}/${PV}/${MY_P}-src.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1.ebuild b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1.ebuild
deleted file mode 100644
index 2a1de217e8c5..000000000000
--- a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-JAVA_PKG_IUSE="doc source test"
-inherit java-pkg-2 java-ant-2
-
-SF_PN="backport-jsr166"
-MY_P="${PN}-Java60-${PV}"
-
-DESCRIPTION="A portability wrapper for java.util.concurrent API (jsr166) 6.0"
-HOMEPAGE="http://${SF_PN}.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${SF_PN}/${PV}/${MY_P}-src.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6
-	test? ( =dev-java/junit-3* )
-	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}-src"
-
-java_prepare() {
-	if use test; then
-		# make test not depend on make
-		epatch "${FILESDIR}/${PN}-3.0-test.patch"
-	else
-		# don't compile test classes
-		epatch "${FILESDIR}/${PN}-3.0-notest.patch"
-	fi
-
-	cd "${S}/external"
-	rm -v *.jar || die
-
-	use test && java-pkg_jar-from --build-only junit
-}
-
-EANT_BUILD_TARGET="javacompile archive"
-
-src_test() {
-	eant test
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	dohtml README.html || die
-
-	use doc && java-pkg_dojavadoc doc/api
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/cdegroot-db/Manifest b/dev-java/cdegroot-db/Manifest
index 56eabc112506..4fa6bb383800 100644
--- a/dev-java/cdegroot-db/Manifest
+++ b/dev-java/cdegroot-db/Manifest
@@ -2,5 +2,5 @@ AUX build.xml 1612 BLAKE2B 2480ba7774db6f2e20b70b3cfd2ffd3a690c86a7d1d12c521faab
 AUX cdegroot-db-0.08-gentoo.patch 7914 BLAKE2B 6139fd7ffcf65bc04ebe03f35919ba28debf86b732dcbfcc8b37192c424ae7cc1f8863556f111c23bd1327cba94e1ffd7d79787ff850b0b99a4933badf9d8ca8 SHA512 f24f13acb265f75408e6cae2a432cbcebbcad912f77ce2883159dc93743ad85c636e5656f21478914712fe393c84a6fe11600c9394b81ce128403c8f59e521cf
 DIST com.cdegroot.db-0.08.tar.gz 154705 BLAKE2B a267d402d1741f701e0fc1a99fa765c0f86a9b13ccca20f4a592661472a31e85a4da49d6fb8be07ef1800cbd0fbb123366def29e30667448484ba419a0938684 SHA512 c8a6a6a46add440499dce42f27876cadfb9d247f4e7f8852e94cc20ca9afacb400f91f884760bf3659bad46979ddd5a65f6dda4bd5416da14d89a93ff5b447d1
 EBUILD cdegroot-db-0.08-r1.ebuild 864 BLAKE2B e3a38203c2fe58a6266e2c98c99b6abe34ed6606256478a2c8238a1b07b48d01c9fe047f7fd7c680f26ccb5ca4311ddd89fe99c2453b30d595e316ff521f5124 SHA512 685922ae9b839edc402286835e2e0c2fe91662106f532435986667040db3fa1a42e687c2da9620f19bf375f10c3893b59ba48a4d05a043aba4de6108a0256949
-EBUILD cdegroot-db-0.08-r2.ebuild 854 BLAKE2B 7e6b689b7b49418fffd2c63c29c7a73b8363c3289dac93e57160cb7b4c7b580482324202477ebe25698d5db985bab7d14ecfe2f2000799107b34f3fa4cec4317 SHA512 62d48b510790bb3214608343307c0e30098c77c56064f8ba1c0b21e93c22c1291a656f24f7a66632a823c9c444be8416ae2b7ddecde3da93ac7f5915656ee4eb
+EBUILD cdegroot-db-0.08-r2.ebuild 853 BLAKE2B 9d2a183d4b75eed0599f16ba2a312a83710ef0ec50384b5a9c33f251ac950ca4b2a15787e8bae4736d42336eacb63fb5ff70054d73a77a5b2afab5a1e28c7915 SHA512 84a8476d33ac372b2b921e932373fb4cddf7532b5ade3b486a8cc94385ff8d4862f37562a2c9240d362442e08b0948ce165cbfe84b388be5a33bc4b76bd33421
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild b/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild
index 9334505bad21..4149fbc8454c 100644
--- a/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild
+++ b/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.cdegroot.com/software/db/download/com.${P/-/.}.tar.gz"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64 ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="doc source"
 
 DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest
index f1795e3684e4..aa4399ecf4e2 100644
--- a/dev-java/commons-lang/Manifest
+++ b/dev-java/commons-lang/Manifest
@@ -4,8 +4,7 @@ DIST commons-lang-3.6.tar.gz 852347 BLAKE2B 4a3ad5f557d27e4a109f6e65f9fe8d792b01
 DIST commons-lang3-3.1-src.tar.gz 638619 BLAKE2B f971afc9bdd3896178bc4be0b6c5d8809f1c1ac0d69ad73ba0d71c185c600ca7a55c3b4877af64b552ccebed9567aa7830f236f2c0d9c38f259870b894c9d745 SHA512 4d201c695a9b908a1809bbab689f80c6aa508b221b4c2786974eada08e647936f5879841c64eed509032ffdd5410735480e7ecb2910295d0f79e857c27019560
 DIST commons-lang3-3.3.2-src.tar.gz 740462 BLAKE2B dbf8fe7f6a4bb0cf462e2281d709e4ecd65e5fa116bb707af14a2b7b248eb1877f872f937fde2e5743bbe9b4775fabd1d0897ebeb8ebe92af235914cac7dbc2f SHA512 be889e0e9d7aaa7d6635e41c17d19dd1e5f9e03fd78eac61fd5f5483321170b9a72007ad0bfa7023e6ff55ae418b40eaa01dae350641c4e88138ac59d4001667
 DIST commons-lang3-3.4-src.tar.gz 771275 BLAKE2B 870f9c5aa18cb68cb88edc28d426df258af69eb6efc3dfe77bab40e2e81bddd4e56b1244a5ad4433f9dd4c0d533dc7b3b10c865fcaaefd9602e1f681bb48538b SHA512 44e93f2d8f7e6a54becaa797ee3348c6125ccdce96d772158f2a1e5ba2a7ecaecf00a6290f2e0fe2fa61db422313709ec6bc836d9296e2f16c5acf6635bb12b5
-EBUILD commons-lang-2.0-r2.ebuild 864 BLAKE2B e92e62f8ed4262dfdf3894e1e8d65a29f11c807cd986df5d54dca85e8f17647914019237a18be07a71ede1b87de5aed100c904e31880d74d60246883892290a9 SHA512 7eb37ca88bc49eaad9978858fea9f7e319bc8630be4eafd8fe05e67efc94b0c4131449c0f68daa489513aae9f6538e8c5538bd35957efdd950b062f495f53b0b
-EBUILD commons-lang-2.0-r3.ebuild 861 BLAKE2B 067595f0b94f286200fdd8e204e203fe07c40063d3c0228cfb2cb0b12fed00eedccc6736929fbe3f3d1cc03946250608e17a7bc004d1593841109ca2aa50351d SHA512 96e96b8989194961045cb5ca8cfb70bccfa7cfe6f1d5976e1e25026354f37403eb85673933bfe96213d7c3abb43351436581634c5550ebdb2099bb3acd318561
+EBUILD commons-lang-2.0-r3.ebuild 860 BLAKE2B c75078eb5c4b40727ebb7d8767158b6458c3de3e6d7220a32f5426b5d8bc388ddd6f27d036cd5e009c92bd8dd13a6cc5b1bac91ce28402c5f66a2a3e3c1c40cb SHA512 a5343eb554e885fa53d92f388538917d7138ebc083799ddd4b341003ac16fca1df0d756deb0c04f93cb7443458063e697a8d7ca802761f0a5593210a7aefb830
 EBUILD commons-lang-2.6-r1.ebuild 855 BLAKE2B e6c3f943bb7a61064323748ec99c54e44acef2ac7899c864dcc554e66d23a7463d4e1e6e786a3145ebae636bb976896d26a038fedca3c5c195d64139ef8d0e02 SHA512 b3a1a0c9eea0742c8803046880b91784c87d0719bc38121246d143b3de1f1a04ef9ec775692b2862833a0f07f565af1dbd16f750cc439e2a6d69de9d7a455d40
 EBUILD commons-lang-3.1.ebuild 841 BLAKE2B 1de87e9c73eea5aebd3891889025b5a81107ae54d6e8b3e456d66a9519cb87e90412ef16680cdefb06451320bfe021d490b1e42a4d205b9927676a5af2e8e012 SHA512 95de6c0c16b0b07def8cd4d698ec9ab5e79cb2715c658e95be67d9b7f3c28c04f47c5649edfa71be51026fcfa98c618e5283fa031ebcd621a1700dbe1d539c98
 EBUILD commons-lang-3.3.2.ebuild 1112 BLAKE2B 1b45826fa5fb04a270fd93c0b3526223d48fe32289f8a3c9d02b5c99b2997f65eff7d542700c13aafc68cb5c95e7af7cc8d9b7b74840d5a7d4b6c1fe715e3e2f SHA512 dba87629c9c5234c6b29604aa1401a52933644f901005c17f8a3eb4bd68fe5b6b5bc9c45096b7822e95aaedb292cc835604ec31b817c4babcde442cd2e4f11b6
diff --git a/dev-java/commons-lang/commons-lang-2.0-r2.ebuild b/dev-java/commons-lang/commons-lang-2.0-r2.ebuild
deleted file mode 100644
index 4df1c77e13c9..000000000000
--- a/dev-java/commons-lang/commons-lang-2.0-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Jakarta components to manipulate core java classes"
-HOMEPAGE="http://commons.apache.org/lang/"
-SRC_URI="mirror://apache/jakarta/commons/lang/source/${P}-src.tar.gz"
-DEPEND=">=virtual/jdk-1.4
-	test? ( dev-java/ant-junit )"
-RDEPEND=">=virtual/jre-1.4"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-S="${WORKDIR}/${P}-src"
-
-java_prepare() {
-	rm -v *.jar || die
-}
-
-src_install() {
-	java-pkg_newjar dist/${P}.jar ${PN}.jar
-
-	dodoc RELEASE-NOTES.txt || die
-	java-pkg_dohtml DEVELOPERS-GUIDE.html PROPOSAL.html STATUS.html
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-lang/commons-lang-2.0-r3.ebuild b/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
index b65b01eba225..be7a4b9bb238 100644
--- a/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
@@ -14,7 +14,7 @@ DEPEND=">=virtual/jdk-1.4
 RDEPEND=">=virtual/jre-1.4"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="amd64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 S="${WORKDIR}/${P}-src"
diff --git a/dev-java/commons-math/Manifest b/dev-java/commons-math/Manifest
index c986f1898e54..514d71f9779c 100644
--- a/dev-java/commons-math/Manifest
+++ b/dev-java/commons-math/Manifest
@@ -3,6 +3,6 @@ AUX commons-math-3.2-build.xml 12448 BLAKE2B 04021b793945a00a95152ef98772dfb5735
 DIST commons-math-2.1-src.tar.gz 1099423 BLAKE2B 83c52abc10eebb6c749aec218aa435df4cd05106e6bcbead5061df7381d168aa9392ab70dce8eb0b8e254d6d95a372cacddc8f7714198a186a95a04a394bda9d SHA512 53ed8c0400402c588d824c15365ebe60bef41697ff9728270a9fdc3ac30eb60c4c397caf939ccda839eb701453d98af4eac9eae2090575fcfdee4df2d6f6045b
 DIST commons-math3-3.2-src.tar.gz 2602474 BLAKE2B a818ca5ab1b9799359bad1c84d2774329c7c2605aeea3e13769eed9f1578d412555ad90a8de68971daa42b270d4bcd5fbf0fe79714e839d41b08077e32633125 SHA512 132c4725be582e25f67a955c7b3b8c7ef155606d8f4da07770464c422ded6b5e6efd1a13a6e98cff222f4fcac73606d512ee1ab9e3b1c4befcc1ba16ab68787b
 EBUILD commons-math-2.1-r1.ebuild 923 BLAKE2B ba238f19102de7511a9b5fbfe42d4a6b9b32d035ee7f6a28fc500eb4d139f7edb9c02d1f46c1c4bbcffc8499c2ef2a4d7a75879c01501ff9d77bc7619cd2ca2a SHA512 27e322ceeae09a6b38fe639f4eada113e73ce14d86995585a2640324339b5cb9cfee77b8ad63b8b9cb806dbdc6902f5b8d126ca88e0f089d18e55cb823c702cc
-EBUILD commons-math-2.1-r2.ebuild 905 BLAKE2B b8f1b7372aacb9371321fdec06721060d3b040a15218e452365bf0871e4fc522039e37ee5792c8df7fe976029f8a24b0cd30274731b79f4b5b1a90e0f345e86e SHA512 491637d6c600a2075e5477256d7c0cf3cd77df61e2dfa402d1ec1a11e2538541869b102a07cc375fb32937dac1047579187930ec61d12765af5cbb6422d126d1
+EBUILD commons-math-2.1-r2.ebuild 904 BLAKE2B b44fc90bea0e0e7f41cd8c73d3f1f053d268290e7cc410f90c54583b178d6f43dc921f9abf344c0cb2e2cf37813a1ea9ffea9c3f31a15cbb2552e30c6cc0c213 SHA512 31fe0b2137e32bcf03a2650c71871bf035daec46478dcd0809f6a2b8f2df7150d4af2586c0a80b4a2dccba4a06935fa6ab4c1e8f6e6d88ed45916d3941dad3bf
 EBUILD commons-math-3.2.ebuild 1315 BLAKE2B a0fe207cc34dae87b52df7709e27f9fc4588e591347d507f8b69cf46ded1eb0b2d23943a93af9997ab215146873fd60479628c80fbcc72dcf8cd1d3c5dc1b72f SHA512 a1f5e7f79e7b36e011a16ed87de7aecf5a9cf8ae8570cdc5fff90a79505bde6120c475df96e188129daec1c436d0409e1260136849c36edafef29e9a70389329
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/commons-math/commons-math-2.1-r2.ebuild b/dev-java/commons-math/commons-math-2.1-r2.ebuild
index 9f447d65ff8c..5722f745c40e 100644
--- a/dev-java/commons-math/commons-math-2.1-r2.ebuild
+++ b/dev-java/commons-math/commons-math-2.1-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://commons.apache.org/math/"
 SRC_URI="mirror://apache/commons/math/source/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.6
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 6026ab33cae4..a4920e5f2ff6 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -13,5 +13,5 @@ DIST icedtea-3.7-shenandoah-773364cde857.tar.xz 6948788 BLAKE2B 16dcc546ee7e0201
 DIST icedtea-3.7.0.tar.xz 1487360 BLAKE2B efef75c5ac615c21310f16f50fc425c5a760767e581004e7f545749f67cd1e0b238de735787a01e5a85ca6b72c351ee32a7c8f0aa3ec34d6dfe6a8e2e024ca06 SHA512 f2dc2464139d18385d4734e6380d7c4efc69f0e5b507218397032e0ea1b2e0d96688c88979de90a1fcd453809a4b1d6081ce2970f4e3cc73a236bd2d17bcc704
 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.7.0.ebuild 13829 BLAKE2B 61a2c0ec77f4c029960611c165c3e2770cec03c9533dea4c79f4c83f5b65700247a359392e6c206ba24b2eed7cb94f5e9989d0a4e2eb190c85f0b64398a54dbb SHA512 78bbca6411fb6ebb7afd06bace3a579c4b73f21398a2de45e6f387f88a268c50fc08d9b4439549ddd5e691892facf7e83a3c44023fe9eba78a34afcfe18ef4f9
+EBUILD icedtea-3.7.0.ebuild 13880 BLAKE2B 1f9bbc40b20810a1bdc39e874d46be54c719558a8d3d82ba293e7f38469effb1ebe8e16d826d2387a966e4ec86fcae34ae5044bea6575c734dcd5f541eea37cb SHA512 bf9f05f87920ed36721efc1934f706185520c05f2e0f7752256c70721744672d78f1c0b92e25701cacebf761e789ede5af38d3f3a391904a994cdd5829aacb84
 MISC metadata.xml 1957 BLAKE2B 46e8fcdad93fb80f91e0af3b2cabfaecca347a17537ce9dac81b76dcd85e5b1532cb63bea6dad6d1d5d9423c1a08315c43ca54b559370e44c413ab92a5ec5649 SHA512 cbfb9a87cee0ab7d7245f758840c96b320bd8f50567d9181830155d849dc411fb17f2e0dde6ecbb840fe48268f5bc09840e3cce25edb73224286c854ae38db1e
diff --git a/dev-java/icedtea/icedtea-3.7.0.ebuild b/dev-java/icedtea/icedtea-3.7.0.ebuild
index f65c310d3fa9..be3cb438b0bc 100644
--- a/dev-java/icedtea/icedtea-3.7.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.7.0.ebuild
@@ -139,6 +139,7 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_
 		dev-java/icedtea-bin:7
 		dev-java/icedtea:8
 		dev-java/icedtea:7
+		dev-java/oracle-jdk-bin:1.8
 	)
 	app-arch/cpio
 	app-arch/unzip
@@ -197,7 +198,8 @@ pkg_setup() {
 
 	JAVA_PKG_WANT_BUILD_VM="
 		icedtea-8 icedtea-bin-8
-		icedtea-7 icedtea-bin-7"
+		icedtea-7 icedtea-bin-7
+		oracle-jdk-bin-1.8"
 	JAVA_PKG_WANT_SOURCE="1.5"
 	JAVA_PKG_WANT_TARGET="1.5"
 
diff --git a/dev-java/javahelp/Manifest b/dev-java/javahelp/Manifest
index 0865160a5aeb..89de8712d130 100644
--- a/dev-java/javahelp/Manifest
+++ b/dev-java/javahelp/Manifest
@@ -1,5 +1,5 @@
 DIST javahelp-2.0.05_p20170719.tar.gz 6045243 BLAKE2B 3cea100e6087f7f8884a04cc1b046f2611e4c516be0086faec685a85311f2cfd9ca49ee9f3fdff37d7e9a496685dc288601521047a3d4c2ae6b31faee2ad7390 SHA512 6d98c33f831052133176cf50419aae6dc1f5715485bcfd33f7e346cb694f5483b1f7a159f47799a72933db8ca42d83cb73b23946179aa6ccaee946d524b3bd36
 DIST javahelp2-src-2.0.05_svn63.zip 3747088 BLAKE2B 80f0fd45741d313fd47ccb9874d31636d12f452ff012dc010de2879bf67a22bd58f6fbde7df86117f463a949f7897ec5e1e3721b1fdd1ee0fc794f30152e188f SHA512 ed795dad98f8d80f4cd4cda40b6aea0978cda621b131b1563016c1ddc02afeb37f3626a28003dac26d7fe996274fb9a97e741a500b15d06b1e5a93342020abc3
-EBUILD javahelp-2.0.05_p20170719.ebuild 1654 BLAKE2B 8dedf94540773528599aab34ae91e97b24792621b9714bb7821f3261fe9533b935fc2491033b86d62215d0d40dc2eddcbee12cb59c445d1c75bcb974746630e4 SHA512 0a051bc7cbcfd4efae20ebe87b7e07c49f76b4320ec2950899b23ad5c8b50eeb42b39f1d458249d59c9081365871d698ea033d3ceffdc016425cf110906872dc
+EBUILD javahelp-2.0.05_p20170719.ebuild 1653 BLAKE2B 9988bdfdc76560c9178c23380f48b93b9286c0a9a65d87088900a950e48ea3a324ec6650052a7d857f0a2692ef7bcdffb39e197a128f978f130de78fd4363c5a SHA512 40de8fa2d8c38c88cee306a34c3aad81742cc54dc8c2b29a10ae2b928bb13f9502fe165f434d546566f610a1f4616f4812eb13088e708d4b7047a6e1b7f32447
 EBUILD javahelp-2.0.05_p63.ebuild 2285 BLAKE2B 360be60aba7c50cb0b7235fa7dd970b5ee1dcf456c9cd40098da59a2d9d97c4c7519cc9c1e80b255f0ba70800b740dc4605d05d303243a30b0e5dda3c6585b05 SHA512 d79e0278aad0ac421036c44d9c748c854b6e2ce03abbd51e4b71ec183b1536636fc267a57f724bbe2f35f3b113bc269a0b9683fbb3b7f883926c0f0d9f946b49
 MISC metadata.xml 624 BLAKE2B 0c06c71189c699c3baf3f8d307f8b077ec8e6e03acb4e0ede09c7537354ab6b7bc043824fa6052be49ccbd6f0debc1cbf2b1e46f42f69a95a1906be6e43639b8 SHA512 bd475a0c41855b34bb58ae6d6a3e2d164abbb97348d809f2fc305e77ca80495bccb4d71ad0aeb0b5586565c71649c6e3775b83c92272dbe8518949864120f484
diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild
index 0b4e42896986..0caa6c36ddf8 100644
--- a/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild
+++ b/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/javaee/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 CDEPEND="java-virtuals/servlet-api:2.4"
 
diff --git a/dev-java/jcifs/Manifest b/dev-java/jcifs/Manifest
index 7d9c5e58e8c7..39a6c3c71c95 100644
--- a/dev-java/jcifs/Manifest
+++ b/dev-java/jcifs/Manifest
@@ -1,5 +1,4 @@
 AUX 1.3.17-build.xml.patch 402 BLAKE2B 797df1a932f241974926602d2f1d7c88fcfc7c5e413fc9327ea331d5242fa13a8a3b8f57cd9952f537c206f3363de7e623745ede5134746b379f6767bfc6119e SHA512 a044037c94a8f4a1ba1f9635b4ac8426287fdad9b9942caf89b96665abb7d38f451f8e05666526087cb93511f258491f034af46589b4d611770044c62e27c732
 DIST jcifs-1.3.17.tgz 862091 BLAKE2B 67605ebd810caf097a9172c17f31d39c9e16af5885c706f7d8c2c2cff9b8e6a643174c9aaa8bd6aa06c816e312b7170a5aa06535f823a5c5b182e97beecccd0d SHA512 2fa1950f9ab6f0f3d45fd9b7866cc94993d1135f48d78ce357dca1d872746d22bff6097da8c418d0d11fd71d86b3fdc79b23195bcbab5bc460d8d0cca87efedc
-EBUILD jcifs-1.3.17-r1.ebuild 958 BLAKE2B 462e0c2f18f77b3905d459c52c8879dba9ef1a6dd2b1c70742a914275b61773e86c42394785887aa18b56f52a9c5d50d1496dae78d1677f367bf1d4c5498dc70 SHA512 6884e56cd264f7ae003deea5e6a5a078f2636eb83e61bf5862c4477cf8279542c538f7c8cefc3d02d9c2450692b6f2b3ea084bc587b447182bb274f63d662c8e
-EBUILD jcifs-1.3.17-r2.ebuild 795 BLAKE2B ade43bb113ad9d977da513d4687c3179e72cb4351ab3a28dc677f22ab7aef22a8bc1a64c669079aea8a12d98b729b784181881c65cc253752cbb85f4691787d7 SHA512 778a8bca5afb84ca542e115307d063d847f2303677cc394692208365e63bf9752a3db7e0e309cf3a68731b9ebdc595e1f8f0d1abba8bcab20735b045cb8bd352
+EBUILD jcifs-1.3.17-r2.ebuild 794 BLAKE2B 4da988b2dc46f9b33b84a6a18b3309c40cb775c7c5faa6312d89d0ee7444e69831cfccb62d4c4f99713c7c98b1755732cd50234aba5f4429f68a5fb449144c49 SHA512 5fa03afb1988311c5398d01ef9af4618260af25ebc0deafb204378553037eb0243051c14bc372484e2b0995a1791d6352f7eba956b564748e03d48f8c604141b
 MISC metadata.xml 547 BLAKE2B 654c37f05e5dd6b09b76c364070d1fe0f60fb0c9adcbc4c111a900cff3f7a0d1320ae934ee1290d015f64eb59bbe18d6965af52a7be69db16461908cd6d5087a SHA512 5783f25610ce9cf8db737748ca4f493d62e22ac5014de06d8e051d114b8aad73484e496b0ca10216462c8f68125ec501f604168fa1957306b8a2ceaed64d42ae
diff --git a/dev-java/jcifs/jcifs-1.3.17-r1.ebuild b/dev-java/jcifs/jcifs-1.3.17-r1.ebuild
deleted file mode 100644
index f5a1b1ecc8df..000000000000
--- a/dev-java/jcifs/jcifs-1.3.17-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-JAVA_PKG_IUSE="doc examples source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Library that implements the CIFS/SMB networking protocol in Java"
-SRC_URI="https://jcifs.samba.org/src/${P}.tgz"
-HOMEPAGE="https://jcifs.samba.org/"
-LICENSE="LGPL-2.1"
-SLOT="1.1"
-KEYWORDS="amd64 ppc64 x86"
-RDEPEND=">=virtual/jre-1.4
-	java-virtuals/servlet-api:2.4"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}"
-IUSE=""
-
-S=${WORKDIR}/${P/-/_}
-
-java_prepare() {
-	rm -v *.jar || die
-	epatch "${FILESDIR}/${PV}-build.xml.patch"
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_EXTRA_ARGS="-DhasServlet=true"
-EANT_GENTOO_CLASSPATH="servlet-api-2.4"
-
-src_install() {
-	java-pkg_newjar ${P}.jar
-
-	dodoc README.txt || die
-	# other stuff besides javadocs
-	use doc && java-pkg_dohtml -r docs/*
-	use source && java-pkg_dosrc src/*
-	use examples && java-pkg_doexamples examples
-}
diff --git a/dev-java/jcifs/jcifs-1.3.17-r2.ebuild b/dev-java/jcifs/jcifs-1.3.17-r2.ebuild
index 2a16955fe8b9..5a4129393d4c 100644
--- a/dev-java/jcifs/jcifs-1.3.17-r2.ebuild
+++ b/dev-java/jcifs/jcifs-1.3.17-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://jcifs.samba.org/"
 LICENSE="LGPL-2.1"
 SLOT="1.1"
 
-KEYWORDS="amd64 ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 CDEPEND="java-virtuals/servlet-api:3.0"
 
diff --git a/dev-java/jgoodies-binding/Manifest b/dev-java/jgoodies-binding/Manifest
index 69c7bfb82374..f4798ce285ec 100644
--- a/dev-java/jgoodies-binding/Manifest
+++ b/dev-java/jgoodies-binding/Manifest
@@ -1,6 +1,6 @@
 DIST binding-1_1_2.zip 1265099 BLAKE2B 15cbb78e8289d7457d8c34112b18293b975046221226630542ffdee1950f8e0cf6120eb69daff57e601f75141b037e5ebc85248f396487e37f4435fbb9e77fe6 SHA512 2373a21f7866173a634adf34c089895ff69022ce24af3a0a9225dc312d659c910df387d26ccd94f3f9f2b79edf5a40a9c101e9040a36f08888cf96228cfcf5b7
 DIST jgoodies-binding-1.1.2.zip 1265099 BLAKE2B 15cbb78e8289d7457d8c34112b18293b975046221226630542ffdee1950f8e0cf6120eb69daff57e601f75141b037e5ebc85248f396487e37f4435fbb9e77fe6 SHA512 2373a21f7866173a634adf34c089895ff69022ce24af3a0a9225dc312d659c910df387d26ccd94f3f9f2b79edf5a40a9c101e9040a36f08888cf96228cfcf5b7
 EBUILD jgoodies-binding-1.1.2-r1.ebuild 939 BLAKE2B fcbef0baeee3151064fcb88c194dd5e4f537992f9be5c135497e312077d358ac7282d79c89af3c17043471321fcc80795a70d10953ec1ca8547dd99e0c4b2231 SHA512 1dcf0acc99204a24da3979d2dc6cd5bd4d6127fc9ee976520a51d4ffb1ab58b70c079d81cd4036f510f46f0f5012afd92bd9d9d037f4804e13d881f67670dfd6
-EBUILD jgoodies-binding-1.1.2-r2.ebuild 728 BLAKE2B 90a6b304e60209ca95ba7ba361f37d88c1c4b37441f179c11f780c6028d9ad79162bad24593c884f6f4d586c9572ad82051def6d2b6fc0e27efb7d1827988cda SHA512 1b7022a299178bbdc5418ed74cabbbaebe801fd5a7fdefb6be67f0629fa40b532873990fa99fd3f9566b2e51cea98f27033c8130ef2a7b5b64b92535f41ed940
+EBUILD jgoodies-binding-1.1.2-r2.ebuild 727 BLAKE2B 7da37b4d1b8afcf534fc20d79aaf6da594da83eb48381f23157dc903d1640b9287b6f153d632428226c4e868360f85dfa8df2547e343ad7e6e8c2c277e9d0047 SHA512 d095b153caed39783f705f34a3e9d5729950e651704559d54850d67be6d080c1cea93fc265c05752548b2f5393ae430650a07571319172f0292066145c13e9a9
 EBUILD jgoodies-binding-1.1.2.ebuild 1295 BLAKE2B 512361bc27c3a0b548d6d19c487dcc5612ad0fb1677ea88b96b70deae011fce0fa824f2cef747e42e017cb29f5e7a8e101e72726ab925a0ff03c9a37f8e9b3bb SHA512 0eda77fd71e65f2109a4d2ae7995e92469320a9af6cbbb6f402ede96cc6d6320e6bd6d7b9b90fdd4d826580046a91648e75652b1b5b99be957286260559f3aeb
 MISC metadata.xml 341 BLAKE2B df75f028a7f38b32d21a20cd1cf3d17f298bf92e99187d95f525d30be00e7a02ca1d0f04dc4e6dcefd028be89b83069e6db326bdc4d1e8eefdd84aa523e4fb5e SHA512 ca7c045eb07e88e8cdb6c6639ec651b038159d824df55dcb5f0819dae264edb8873e4dadf94fd6bf71879ddd64a75e44820fe2b6cf485df18ca743b264c9f267
diff --git a/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r2.ebuild b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r2.ebuild
index b9d838d99233..9d62dba26479 100644
--- a/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r2.ebuild
+++ b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/binding-${MY_V}.zip -> ${P}.zip"
 
 LICENSE="BSD"
 SLOT="1.0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=virtual/jdk-1.6"
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/jtds/Manifest b/dev-java/jtds/Manifest
index a5f6d31ab720..a524ee79ff0e 100644
--- a/dev-java/jtds/Manifest
+++ b/dev-java/jtds/Manifest
@@ -1,3 +1,3 @@
 DIST jtds-1.3.1-src.zip 3377625 BLAKE2B 2c5ccfa4d7c6fbb1879007b5f0e9bcfd1ae1061fc68174d1679c72f3f9806433af842d5ca8e47da69acf53b8d517522f33a901adfa35867c96a63446da5269c3 SHA512 1744219a52c7167449388d774fd5e834ef551f60548569c4c54e6caefaade1d932a3879a023869d8d9ddb29ce4ab52b6d08bc4c364d5f372ff5fa96bed6d9864
-EBUILD jtds-1.3.1.ebuild 830 BLAKE2B c6417e938294505e53b0cb46a41d2f692e8667570022f8669091b28eb74c5669b2fb5ad49d500f735342e75aa40f667fb0748aabece1c36db6c0c97938e6b0c6 SHA512 3462ff6d3ab589a6f3d9bbf73d2d34dc01ed2deb1d0c4dec13b0c1e032d776b55c07a7522931cbb558cc3f933a3d2df3160f15a57065343e9c7bb8ae62f48484
+EBUILD jtds-1.3.1.ebuild 829 BLAKE2B 692867bb0c1c9f82f98d5fa30cfaee62025d6c16a2411262ef2f11fc375b20fca5d8bd5efce3e53167d0045df22a2dcc358f6d94be28e347ec31f346ecf24241 SHA512 482f2b94a427eecbfd3bccdd678635bd733379c7cd5b04ade41e12dfa5a30f7cc9f5dfa9e871936b0e74b77947bc141a75fe45d23de4509ca9cb8b75adf6adeb
 MISC metadata.xml 877 BLAKE2B fc1466a12596bb64c25bfae6c5d00d90e9541f3e01ba181224ef3c821e4312e46da4e0e1f251cce58654d71d4dd148b057bcba970ce5e9558b8238e936056bce SHA512 0a8371b9d8819206fa47ca34dae6a4ade669eabefc2b94fadb76bc4bcbd3c5d563a0dbe36860c8a90ca23d2b74f2088ed7d89864c94bd0f8f4650bd31844047c
diff --git a/dev-java/jtds/jtds-1.3.1.ebuild b/dev-java/jtds/jtds-1.3.1.ebuild
index f6f9cf372943..fd6ec16d4026 100644
--- a/dev-java/jtds/jtds-1.3.1.ebuild
+++ b/dev-java/jtds/jtds-1.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
 HOMEPAGE="http://jtds.sourceforge.net"
 LICENSE="LGPL-2.1"
 SLOT="1.3"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 RESTRICT="test" # Needs a running server
 
 CDEPEND="dev-java/jcifs:1.1"
diff --git a/dev-java/jung/Manifest b/dev-java/jung/Manifest
index d5331538922a..ddf018312acb 100644
--- a/dev-java/jung/Manifest
+++ b/dev-java/jung/Manifest
@@ -1,5 +1,4 @@
 AUX jung-1.7.6-build.xml.patch 714 BLAKE2B 593d710468ffa969e709936892a47686218ab32e9afe4ae2dd5b89253042561ccd486c758748db54d7a4b25eb564f618c4e78f40a40fce51b090baa1f6876e70 SHA512 d9e8548ed4b0271a88aa827dd94a49a95fda7e22e78dfe0e0490ef7c9e161c86d7289f5f3382d4bfcdfa95daf84582143ee6d1cfe7946114c9fb35d2fea17c4e
 DIST jung-1.7.6.zip 8164548 BLAKE2B f7ae35557e531686ca56235a6087587dd520ab1336e1121871e1f6727d64818b078dedaf55b1cbd83c32a8c5e03af7926a75302033a7e21e07200ac8f5d729b5 SHA512 126f06e34a6db6cc55df2b1c1b52612ddece7db7a1fb45cbc91892122678b0b629eac00276fc501aeab558cf1f01a4e5e7f5d0392bfae977ca1950df2c3d063a
-EBUILD jung-1.7.6-r1.ebuild 661 BLAKE2B ce7752ba2806d026817867bd0218d6836f9ed39df84aa7c05ef8487c2b3b5f42f27855934d9c1f16206703ab7700084f58fa32d74bc402ca2045bcbb530eb8bc SHA512 001ea4d1793b91c4b5ef2343811708fb916fa07e380792c88c4e52982ea8d8d8cd41c5623baad54c176e1013bc7bf5946429be0cf40913452d129b9758ac9c70
-EBUILD jung-1.7.6.ebuild 1081 BLAKE2B 0b6c30f03b071fc215f84de8bdef3bea14b23395d93155d0c9fa45c6953e6f9f5d35d72c047769ac3c416063e807a9525261660ea44d02c4d0813a03611dd7ef SHA512 ff85c9c612b716df1913a6bbf9525fe5d0bca1202fc67e76382d7fde0cc4c597fc70eb800c63157288d848c44275fcc9af2db1e7ce36883200df5a8307d222cc
+EBUILD jung-1.7.6-r1.ebuild 660 BLAKE2B 782c19117a4c1d230c7bf2b9dd0fc884cfa4b25bc1ce452782fd3140b3aefe7a623bbbba6533db43baf9027dab450cf85b3855591c93ef7a3ee0e9b3356f175c SHA512 f5676eaa00faba26d7e9f1dd9227bb9f5798753cc55d1e322e64c0a88ffd284bdb6aafbd5dfa5321060813552056074838480b8fed1a890baae5877d4dc0eb2e
 MISC metadata.xml 532 BLAKE2B 3f7a781a447b885d31f1a33b8e6030dcb56e4be649b6a1716ef4bba3ee2047caa037dae275c9781f6a90b5d242482eb32dcf35353be8ee7098abec46f9195c41 SHA512 2662c5bedc6f2e200bbcca0af62dfa46063e01759e4abd5ffdaa908abe82f20f875c3fbd3e83134616997d67f8989e059810847ee5951cb0c2b296bb127f3c14
diff --git a/dev-java/jung/jung-1.7.6-r1.ebuild b/dev-java/jung/jung-1.7.6-r1.ebuild
index e34b3e5d87e0..529a37e622f1 100644
--- a/dev-java/jung/jung-1.7.6-r1.ebuild
+++ b/dev-java/jung/jung-1.7.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/jung/jung-1.7.6.ebuild b/dev-java/jung/jung-1.7.6.ebuild
deleted file mode 100644
index bbe81f6a7456..000000000000
--- a/dev-java/jung/jung-1.7.6.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="The Java Universal Network/Graph Framework"
-HOMEPAGE="http://jung.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-COMMON_DEP="dev-java/colt:0
-	dev-java/commons-collections"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	dev-java/junit:0
-	app-arch/unzip
-	${COMMON_DEP}"
-
-PATCHES=( "${FILESDIR}/${P}-build.xml.patch" )
-
-S="${WORKDIR}/src"
-
-java_prepare() {
-	epatch "${PATCHES[@]}"
-	rm -R doc/*
-	find "${WORKDIR}" -iname '*.jar' -delete
-	find "${WORKDIR}" -iname '*.class' -delete
-	java-pkg_jar-from --into ../lib colt
-	java-pkg_jar-from --into ../lib commons-collections
-	java-pkg_jar-from --build-only --into ../lib junit
-}
-
-src_compile() {
-	eant -Djardir="../lib" jar $(use_doc)
-}
-
-src_install() {
-	java-pkg_newjar "${P}.jar"
-	use doc && java-pkg_dojavadoc doc
-	use source && java-pkg_dosrc edu
-}
diff --git a/dev-java/jupidator/Manifest b/dev-java/jupidator/Manifest
index 3592c040f889..1f647a1a130c 100644
--- a/dev-java/jupidator/Manifest
+++ b/dev-java/jupidator/Manifest
@@ -1,5 +1,3 @@
 DIST jupidator-0.6.0.tar.bz2 253170 BLAKE2B 0a32df25c2885115ba914ecbcad8d8c426893eace2f8067a3f6c858ae15f3573e9106693694acc9179fe6841e5f3a664a0b1038cbda001dbbee08b475914d29b SHA512 5e96831ca41b6871eb5f6c883c21eae17474844a74fc5e103b534d6e225d0a16ef98149da1d52728e737607eb7ece586f05aafa0a0ada29c4c28ff3e078a2415
-DIST jupidator.0.6.0.tar.bz2 253170 BLAKE2B 0a32df25c2885115ba914ecbcad8d8c426893eace2f8067a3f6c858ae15f3573e9106693694acc9179fe6841e5f3a664a0b1038cbda001dbbee08b475914d29b SHA512 5e96831ca41b6871eb5f6c883c21eae17474844a74fc5e103b534d6e225d0a16ef98149da1d52728e737607eb7ece586f05aafa0a0ada29c4c28ff3e078a2415
-EBUILD jupidator-0.6.0-r1.ebuild 637 BLAKE2B 0d8010de4de296c68e657aa88082e0d82fc8e6b87d7799660c4b3c333a553666223d1f857ca6a3f7ea134ca607e79c6a7561ecbb30249fbe05b8809d66602f1c SHA512 7ff7ee0d3417c6a3c8414d368dd1a5bf98f43b9a9ae2e6f14af614857fd2cb9bdcd313fd439e70087e70ebea5064721c96263e974a3a123d1e915071d17de87b
-EBUILD jupidator-0.6.0.ebuild 1085 BLAKE2B aec262706447ac3f0a21c8e0cedd596266e922e7bff074fa85231ca727d4403eadeac0ecc4713b1d7e832695747c8b7e9aa6de665e21731dc4f7916926a59c8e SHA512 c9768062ea9909206fb52aa8e3ab1b2e65f8e8a54efa06a9317e4ca4bcf4c09fa603ff0dbe230226db492bbf36c37de90fdb8325a7dbd2a9b07623bea1311642
+EBUILD jupidator-0.6.0-r1.ebuild 636 BLAKE2B a4fa93db37d87e123d4b254fe59c24e79a2bf1c0ad6373438d5ddeba6eb39cb6a3ea65d9cfecd912e53797f613693765495cb0d09bb7eeaaf2e3879c021a8da8 SHA512 8da8b551d581f4261d380bd2803d7aeb5a0e7383caa83b821635f8fdc91c24ec6e592d93fb654c834d4454d0fd1ea21abb6fa254dbfd639b0f06364332084861
 MISC metadata.xml 315 BLAKE2B b2b3803bab58cdcc7fe68de765c6a2041b615b741c9252aebf54235a18293325a2da0c16a2292a04266514a10cf54930e9ba7411b6f0ebf385b6b76221eb0675 SHA512 ee74e4fc53d2a94b32fda03601185b2178e7329c1ca4a0560f94d3715b9f8cb8aab34ec1b09a8e388e87844bf4cbed70f36bad166eb2f7ee7420259ceaa95203
diff --git a/dev-java/jupidator/jupidator-0.6.0-r1.ebuild b/dev-java/jupidator/jupidator-0.6.0-r1.ebuild
index 523ea542a97b..eecea93a1353 100644
--- a/dev-java/jupidator/jupidator-0.6.0-r1.ebuild
+++ b/dev-java/jupidator/jupidator-0.6.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-java/jupidator/jupidator-0.6.0.ebuild b/dev-java/jupidator/jupidator-0.6.0.ebuild
deleted file mode 100644
index 690f152de270..000000000000
--- a/dev-java/jupidator/jupidator-0.6.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-WANT_ANT_TASKS="ant-nodeps"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_P="${PN}.${PV}"
-
-DESCRIPTION="Jupidator is a library/tool in Java for automatic updating of applications"
-HOMEPAGE="http://www.sourceforge.net/projects/jupidator"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5
-	dev-java/ant-core"
-DEPEND=">=virtual/jdk-1.5
-	dev-java/ant-core
-	doc? ( app-text/xmlto )
-	sys-devel/gettext"
-
-S="${WORKDIR}/${PN}"
-
-java_prepare() {
-	rm -v dist/*.jar || die
-	rm -rv src/java/org/apache/tools/bzip2 || die
-	#Bundled ant classes
-	java-ant_rewrite-classpath nbproject/build-impl.xml
-	chmod +x i18n/make.sh || die
-}
-
-src_compile() {
-	ANT_TASKS="ant-nodeps" eant -Dgentoo.classpath="$(java-pkg_getjars ant-core)" compile jar
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	use doc && java-pkg_dohtml -r dist/doc
-	use source && java-pkg_dosrc src/java/com
-}
diff --git a/dev-java/resin-servlet-api/Manifest b/dev-java/resin-servlet-api/Manifest
index dd157659b5c2..c5fe97d5826f 100644
--- a/dev-java/resin-servlet-api/Manifest
+++ b/dev-java/resin-servlet-api/Manifest
@@ -1,15 +1,11 @@
 DIST resin-3.0.25-src.zip 10690692 BLAKE2B dde17819f958053bfe2e1ac0068db0a56c068185d676dce047769ffcd219036318e0f1adc0fee1757136aa4d5f8c75e112e286cb66d445bd30a283afe2c6ebba SHA512 f80f109b120cfbb484614c733cd10e0e057b7a704a7a00d2a6b83d95876558e4800ecc6d9fe3a3b8ddc32f9d556a51145edc3d08a8625937b8c06f413a335057
 DIST resin-3.1.12-src.zip 13579367 BLAKE2B 4c5205296f4fd35bbcfd2c0b9a665d83308def83d31df9e919d1823a2bf256f4668fd8b75c05681277e6f3d87a3a5a76c9761ebbd1aad9489b88245a3d0e39b5 SHA512 5d348482175962e4e0401437fa69ce3c7569e514ab7b02ef236937686cfb5185b5cef2deef831d510cf458a41d786457041f579d551c9f1f1aab49829015ff6f
-DIST resin-4.0.26-src.zip 17879008 BLAKE2B 3c8a510fbcbeb1576033841a90ec3e1ffdcae63f4e5b64196e078ce8d1fa6a29aa436ff48f38bb030be8c6d8cd4ca2528b140b10d902d1b8513d6f55a059d63a SHA512 aae0304664c67667b9abf304ccc3dbaf073be42fcd1dd6aa380d841a34a2a44f0187fa91abe6bf92bf66f394b4b2d4eda7c4c9a55b5cb8a76436446cca3d5512
 DIST resin-4.0.27-src.zip 17990178 BLAKE2B 2da8c4bae7328f0a39fc7cc84c2d7a25408a8242150a9b324cc34a15e0342ed709b9e1db8773873d804d59b47f0c62945433d211fe06ded03db1aad39c46a6d6 SHA512 ce1d7eb19ab722c2942d82b6ce80ddd193907d6062df361501d28adbbe57e6b7a2effc734e7820bc73d7743b2546799bc6badbcc2187c7da75cab0b9294b8a53
-DIST resin-4.0.44-src.zip 40342346 BLAKE2B 3ad80e84bcc18a44d6af3441f042b43d74a98318d4d906883ac6074f33420c7bb02dfd6b264e918865f10e48f36dfeb8e8d9ec18b995cedb6ea2010c13912fab SHA512 bef7cc8e42522396b6041e6b38858f8f2ef92f0a753b7a86e191f62f6060810930765cb834eeb53404e08f8b9b3f2e4c4d3b632cb9b80edf929b4a41bbb3d5f8
 DIST resin-4.0.46-src.zip 40400255 BLAKE2B e31505ba82a8e87ea0b28634b3055c3a01d6629483c2d5ab6af4b428c9cb5d7803b7ed7de58181222bae669412c239458c43be35f23922f3414ce7ac0173ee56 SHA512 49f468706a3269f851a6b359d6020b01dadb312890c97208b1a66353fb82b2d95625947a472d8d3e535d0c52ec6ad3e110eb4d227014fe7a89f313ae1df6970f
 DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 BLAKE2B df087e05a80442c44969ccd20099ad5ff5d1e6ab92886255cfa262bcce73043f07b01109e84e224dd991c43730d6c0795bf63bde3b8aaa5fa6dbf749dfbb78f5 SHA512 23ce290e97f18248e08e0b3b7ccf37f60a4b0bf2c3aa28d856384295a286b3eeb9636e299e0620c2c858f8e523806707fe1d4531070ee7ffb4037ad483e6d035
 DIST resin-gentoo-patches-3.1.12.tar.bz2 1618 BLAKE2B 672ff977f307d0abe225bdc57bed8778d0855c175532a39f8984dae39aaecb4a708f569179e76d5dbdd47df25f9ca7ae75f7880c8adc85f74a3ab52dc3ecc8fb SHA512 12dfd508765c46a9c9ca782e1b63def2989a3d2e025b3e8a7b15e5b389976aeba898e1659044a737156d953c0eaca9a4a461a9c71dc601aaaeddac8cd5da03ea
 EBUILD resin-servlet-api-3.0.25.ebuild 865 BLAKE2B 1429e7888ec44189bd47ab530b4089e034632022fcf83a61bd7c99a1e2e1eaa3107292dc7c625469c722067df315a249fa0dc24d6e8abf0c9d55760c6a0268b9 SHA512 83efdc313c63c98eb07c8a2ef130f69aff349b4e39619c08c89816933f4ee9d6aff18f8df6b97734e28069d4b36c2fdc705fedce77ef141aa3811c8bdc61743f
 EBUILD resin-servlet-api-3.1.12.ebuild 1103 BLAKE2B 2a26ff67220cb360c1bd7909bae7b36076ddacfac8dac56009a846af90062d5cf1339ad5b582decc7d05847e8a558e9ac2d75a6404e0f12db7cf437e91a1a227 SHA512 368faeff8853b60deef26c056c82181e182810a92786e947e7a578797d8ebde6253701e4ced228dc06edc960be31e9210b7e0cccdf6062b03f428d21468df319
-EBUILD resin-servlet-api-4.0.26.ebuild 1139 BLAKE2B 60264990c2f7ab4bd58fd509f42c3f680b372acdec7a8c02a12c3501037a4ae5d2050259bc3fdddb48af88e2ab99dfa3e49fe76759bb37c2340864b766c26daf SHA512 4e33c22526558a60581893879519735b9e75cd653968020b58e74ffbf39adb64273f7faa0bdd22520faa3c47b52418ecd3eb924363c1fa12cf55fbf45fad4757
-EBUILD resin-servlet-api-4.0.27.ebuild 1128 BLAKE2B 813e48c9553ec7634ab5812a669ea475e0f70da568df68e02303de0b490d3f5df82386b6c436501b437cc5fdd5349ef39f49bf3f5422d853d9819796f3c8e0d0 SHA512 66a5d9c3f148221a55594e9b7b252512947aa40f2b19041fae3d2c68d657a963a5f075c5c2ab07f732dcf13035baf7cad9f778c0b32b2796fa4ef10debcd6adb
-EBUILD resin-servlet-api-4.0.44.ebuild 1130 BLAKE2B 2f6725b53f1474c6c02150b70c30f89087ded68f61f0510217203c2a8ecb5327ca5b2886e793163084d9e4839cc8cb7319912520d45b819ec0af0e2407ed68db SHA512 2dd96a756b7433887aa4f9b521c4e385a1dc1e5c887acd73525a42df41e28807ef1070e233f40081eb2d0cac9d0820a145bd95923344e549aaad8503f18e9f9c
+EBUILD resin-servlet-api-4.0.27.ebuild 1127 BLAKE2B ef2e0779a6ba6ec6bc211fdbffb138aa6dc2442b8c556120e3d3b73abe79942851c3ddc19b560e26037ac04c4e900aaf0e6ea25147237586b7fc14a8260730b1 SHA512 c76c4f45a84e7b1806bdd2b0348e7251e84f4e571ad4c3651a42c5a49672257939a7e9e4a70230d63be6c240d1a4b79d291da5fa7bd94743cbb07332294083db
 EBUILD resin-servlet-api-4.0.46.ebuild 1130 BLAKE2B 2f6725b53f1474c6c02150b70c30f89087ded68f61f0510217203c2a8ecb5327ca5b2886e793163084d9e4839cc8cb7319912520d45b819ec0af0e2407ed68db SHA512 2dd96a756b7433887aa4f9b521c4e385a1dc1e5c887acd73525a42df41e28807ef1070e233f40081eb2d0cac9d0820a145bd95923344e549aaad8503f18e9f9c
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.26.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.26.ebuild
deleted file mode 100644
index e73b7d1f7ece..000000000000
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.26.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Resin Servlet API 3.0/JSP API 2.1 implementation"
-HOMEPAGE="http://www.caucho.com/"
-SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip"
-
-LICENSE="GPL-2"
-SLOT="3.0"
-KEYWORDS="amd64 ppc64 x86"
-
-IUSE=""
-
-COMMON_DEP=""
-
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${COMMON_DEP}"
-
-S="${WORKDIR}/resin-${PV}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	rm -f modules/ext/*.jar project-jars/*.jar webapp-jars/*.jar
-	java-ant_bsfix_files build-common.xml || die
-}
-
-EANT_BUILD_TARGET="servlet16"
-EANT_DOC_TARGET=""
-
-src_install() {
-	java-pkg_newjar "modules/servlet16/dist/servlet-16.jar"
-	use source && java-pkg_dosrc "${S}"/modules/servlet16/src/*
-
-	dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
-	java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
-	dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
-	java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
-}
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
index 0f94a41e68c8..62503ad641b1 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip"
 
 LICENSE="GPL-2"
 SLOT="3.0"
-KEYWORDS="amd64 ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 IUSE=""
 
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.44.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.44.ebuild
deleted file mode 100644
index 0263bbaf7018..000000000000
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.44.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Resin Servlet API 3.0/JSP API 2.1 implementation"
-HOMEPAGE="http://www.caucho.com/"
-SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip"
-
-LICENSE="GPL-2"
-SLOT="3.1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-IUSE=""
-
-COMMON_DEP=""
-
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${COMMON_DEP}"
-
-S="${WORKDIR}/resin-${PV}"
-
-java_prepare() {
-	cd "${S}"
-	rm -f modules/ext/*.jar project-jars/*.jar webapp-jars/*.jar
-	java-ant_bsfix_files build-common.xml || die
-}
-
-EANT_BUILD_TARGET="servlet16"
-EANT_DOC_TARGET=""
-
-src_install() {
-	java-pkg_newjar "modules/servlet16/dist/servlet-16.jar"
-	use source && java-pkg_dosrc "${S}"/modules/servlet16/src/*
-
-	dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
-	java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
-	dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
-	java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
-}
diff --git a/dev-java/saxon/Manifest b/dev-java/saxon/Manifest
index b35d62d5b3fe..9bef71ed39e9 100644
--- a/dev-java/saxon/Manifest
+++ b/dev-java/saxon/Manifest
@@ -3,6 +3,6 @@ AUX 9.2-edition.properties 74 BLAKE2B d468841c782fa7bf1b39cbeeac01d983a8d6891a13
 DIST saxon6-5-5.zip 3346162 BLAKE2B 63d49545d101c3b595ff3f3db6d781158b8a51862ccdc294e782ac0935010a841405fb21663bd35853042c53548991dfefa7f789be292fe8497a29253c87ee09 SHA512 2d76ab6da8fc8ca8502139f6b620d4c9e94732a520083480e3936f6bd0a9f069252a7a05df53dab49aabec505764b2ec4ca1b36022bb56df568883a0491f495a
 DIST saxonhe9-2-0-6source.zip 2942625 BLAKE2B 45f9cc12591ebb94076392b16edba52811d911c41f2f197ffe864e37c1ef478670ff276b7dc8dff316dcd2986f777b4cc2d43989e5d300510ee0edfe7e54103d SHA512 6c59c0cbed905cf561387acb54bb31f0a251432deb0edf498ec4f4d9955bbcc12d1765ace594090d3ccb0416e3e72349466e430bb4f799b51fd12ce8fc5a144e
 EBUILD saxon-6.5.5-r2.ebuild 867 BLAKE2B a5879fbeb51e113e05dfbfe4dff8088e26621278c76f83cde4b47b6744cf83e9fb94fd25f661f25e57a3f8a5d513d903f3808dfb6fb6ba79d6e450cbccb03b5a SHA512 a8a6978c47998380b6c7ec09f7102584007aedd829cd95d0ff629d2df9062c5eb46ceecff88b2bb0fa575907810fb21fa14dc1253ff0da3f9962687935f53df1
-EBUILD saxon-9.2.0.6-r2.ebuild 1967 BLAKE2B 8d83268e8eb8e55f2db6a3d1948e824b53bab2d9a8edd9e26f6c1ecd19f105016a65b6dfbbc31bee9841252fd5dba4a3797f146433e1d3f831e46f165528f45d SHA512 cf97aa8ca4e695d42db531df097d37fa642513697832726767c45fb64ff0afa310e49294d9e8b2063be10262f6f2a8e5bf690fda01021dd64d1582fbc75d5d0d
+EBUILD saxon-9.2.0.6-r2.ebuild 1966 BLAKE2B 305d50270c2603fa68dac2f6a43a3d1c6ee9ad0d7d964bc6974364fa5faa907e76643add8a25e8057bf69d521c0721678ebe05a1c17873ad585fb2a311273a95 SHA512 1485a7ae386034895a82f2ac638fd843df9c913cda57fa78b982b5b9900053fb4f57935cdcb33038ecc874908f68f90c4a1b7142c8b41591da35782c3013491d
 EBUILD saxon-9.2.0.6.ebuild 2191 BLAKE2B a383bf6d0e8cde78e45945ec028fa2fe5ff0a21051b4a05eb325147c88adc0376b6c250339da2fbcc99a8495d3975845aa832cd22c2cb235e4747cee333ba70d SHA512 c20b14dbad9faf4306a7ac0a1ccb3c49388197521185e4d6bbc3b9bfed9535432105cb3645071ba4ca0ed2faf1a7e40b2f6cbcf1e48abf1d6e305a28fcc29f85
 MISC metadata.xml 311 BLAKE2B fdce161da5c8394b66ee6b1bcebbccd863cd5e70291afab04400c4d806afc955f803b5c5aa15601157f2784e434baf505dcbebdbff9817fe960961f8108d3b63 SHA512 2fc12b71b9e977a095610f8f784f19252d44e31442cc5d5ce513f601a2394f4bf491fc9065de88bbf45afe7b8f1ca33ea907e31aa26875f48846856f1bf51126
diff --git a/dev-java/saxon/saxon-9.2.0.6-r2.ebuild b/dev-java/saxon/saxon-9.2.0.6-r2.ebuild
index 6306c9d5c002..8851b65890bb 100644
--- a/dev-java/saxon/saxon-9.2.0.6-r2.ebuild
+++ b/dev-java/saxon/saxon-9.2.0.6-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}he${MY_PV}source.zip"
 
 LICENSE="MPL-1.0"
 SLOT="9"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 CDEPEND="
 	dev-java/xom:0
diff --git a/dev-java/sun-jaf/Manifest b/dev-java/sun-jaf/Manifest
index b2a628a0fbc9..2bbd1a5d1b12 100644
--- a/dev-java/sun-jaf/Manifest
+++ b/dev-java/sun-jaf/Manifest
@@ -1,4 +1,4 @@
 DIST sun-jaf-1.1.1.tar.bz2 125305 BLAKE2B bf7676f3b47e9cf4c169a7625160604c7973d2bb8f6a087f7a7759c924efc0c24fbc6d59f03fb89dc874b2ad03e311b5029fc066fe5083c1accdc73fa9666ea6 SHA512 c7287056514324aa5feeed3d4afaf861869974dd565f7810e0161fe590f070ec894e7005ffac4dd42cf075313237027d7d7c88cbf583e28e05df361536d73001
-EBUILD sun-jaf-1.1.1-r1.ebuild 604 BLAKE2B ca96d6b689ee7331372f518ee533df809edcf83a82efb8da8c216fedb2703f32d7a097bcf04964be1fa85f941395aa493e73ea58b881b787cd7bf4b28c112be7 SHA512 15f582c7bda9489bc2849435a98207c6b451d2aa70e6dae96c48e86d01d3e65faa9cc1ea9135009cc48fbd766a7c346c24289403cf70ace30216da5b803fc5aa
+EBUILD sun-jaf-1.1.1-r1.ebuild 603 BLAKE2B 15be8c5346fc16252a2e939c4ea732e2d9524b65ab3fde7f7aa8f66ecad32db09da37407e4dcce322eee19be9c28964ead1619c501bb5291fbcbaa54c02d7c0e SHA512 45f7f0445c3d2e886fdd02646f2d54c9f730b84400165135d000e7bdfb409fba869fad7c1c9d58f560b528d2c4e4025eb1759ecfeaf4d30be894eea7f98c7afd
 EBUILD sun-jaf-1.1.1.ebuild 1266 BLAKE2B 1a17eb9a250e2674871ef5cd4d76e38e5a19316eea75f2ef6f13544a8e94c3e0993f9908246e5a8a40a6510aa5ccbd58989579d4c514790fc6f0a780e0051cbd SHA512 355d421f1146d4b3d3e4dac18eb586b3000bf74943330a9617be9d0ce49d7a03e4c338a6708e8f44985e8d2100988be7460b13adc844575298509d198004572f
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild b/dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild
index ee575afa19cc..c7d4d045ff91 100644
--- a/dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild
+++ b/dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Sun's JavaBeans Activation Framework (JAF)"
 HOMEPAGE="http://java.sun.com/products/javabeans/glasgow/jaf.html"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
-KEYWORDS="amd64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 LICENSE="CDDL"
 SLOT="0"
 
diff --git a/dev-java/swarmcache/Manifest b/dev-java/swarmcache/Manifest
index 7cf8a138be9a..1b88d10b99fb 100644
--- a/dev-java/swarmcache/Manifest
+++ b/dev-java/swarmcache/Manifest
@@ -1,4 +1,4 @@
 DIST swarmcache-1.0_pre20050106.tar.bz2 34632 BLAKE2B c33ac3c27e7a034a375fe64c6df044aa65c15ef5d926243d5ffa20a831ee70980b6116eef0c333138f4488509bfa1c96cbeb7cf9a815079ba6830a2baa066be0 SHA512 21c05d83a6e05f3c31a1785e0286d2f584375e3aa97e9fa2dd18a0aca5f3678817a6a019524e6b55c2f047547296cec83c9e108c9272401b592ea0f8338878d7
 EBUILD swarmcache-1.0_pre20050106-r1.ebuild 1012 BLAKE2B b888bf09339a1e2c3fb407f9bd8a70a8c5cdac66c2c55d1c6a5df6f3f57ad603be2be3966c24805725d845f9eee021c1ba2d11abe88972bfee9a4f32d7878ed9 SHA512 c721a879525592ad6720ee15dc4334009c74a6277ad890881775672cb8f188555aed44877c0ea9490027bbc475d6d1a4549c1ecc77c5fdea47c5be346d8c3df4
-EBUILD swarmcache-1.0_pre20050106-r2.ebuild 675 BLAKE2B 989d9e0502b5eb71804b9d108ad146019daee44549a2e7f91e40d8374efb4c72cfa6ab9b0c7cc943368f33f8ceaa6511ce7113ae865ac16093905f5d0e6081da SHA512 827d0c43bfde5a1d3bd57cf8b12742ccb9053fa6cb161f764563986531c4a973d9d8951c927873aad2215225fc745374a651efb3949760ec723c0a6d75e91e9f
+EBUILD swarmcache-1.0_pre20050106-r2.ebuild 674 BLAKE2B d46417189ce426ed2075803cb3aa7d59c3fe3fd48c028b65c7b5f1dec878bd6ffa3e5d8f13460ddce592fa72bb0711d5161385555208aad75f5743bfb2719bbb SHA512 b6f8a86b1cccd0e262d727914fdd6e823cd6bc5fe19a3e1529b079ad22bd27e215f63948ff64bc82771439fec8c4c494605cedfd761785ee3c48061216a6ba31
 MISC metadata.xml 316 BLAKE2B 6adc8bc24794557402b5e1eed5f33c8e420791de51dbc0d97b6d6110f4a39b7b5b28eb625f2b64062d743e8dc204961063bc66f5b4d63a0ff46a9dab8dc96cfb SHA512 77c639a56c22f43f936a864153af61bfb55ddc9738a76451bc337e08371ee5947c5cee2ee41674e480a74d9d78b69054400671c329511be499250c16b35a57d9
diff --git a/dev-java/swarmcache/swarmcache-1.0_pre20050106-r2.ebuild b/dev-java/swarmcache/swarmcache-1.0_pre20050106-r2.ebuild
index 4d6d9b6cbd40..26b7ff630e5b 100644
--- a/dev-java/swarmcache/swarmcache-1.0_pre20050106-r2.ebuild
+++ b/dev-java/swarmcache/swarmcache-1.0_pre20050106-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Cluster-aware Caching for Java"
 HOMEPAGE="http://swarmcache.sourceforge.net"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 LICENSE="LGPL-2"
 SLOT="0"
 
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index edc89562a861..4d452ff0d3fe 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -18,11 +18,10 @@ DIST apache-tomcat-8.0.49-src.tar.gz 5017328 BLAKE2B a3494c73fc6b9ffecfe7b09380f
 DIST apache-tomcat-8.0.50-src.tar.gz 5023017 BLAKE2B 862799b7f6a227217c93e1b65aacc49a765b6d11886d0f2278a860c3f4e2b89692cfb724e323d3afe074ad3af3ef8cfd780e4be1ad2f55fee381e5054fbb1941 SHA512 c46efe03cfaadbc2b89063c05c5ec9f315a4eeacdfbf6dd43691c3d23a87d75b23b6679550518d825f8ec7ed853a899ca88cc54c61da9983b025ec7042c3bfff
 DIST apache-tomcat-8.5.11-src.tar.gz 4996153 BLAKE2B c529fc37a12c14c942f4be23751acc0b7fe91de0c84ef3ad7c5a451499a86572d36fd5973dc60bfc97d07cb7d82b4e9a2d36d55eb31cccf2f6b15b2b3fb5d7c7 SHA512 d1a9513535773805c26825f8843fa502e044c9f1ccc22176db5418a7a0abb6d1bcff3db401b449a5867065359abbc8277d14085d807fe00c95dd267d9091620d
 DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 9bcad0d465aff6da1ba4a846042491bc8d5963283ed1d2530a26ab48289d14e8b85834d24ca476c95a75c1a5f51ee3ecd71c190b9609983cce56b56bc046b6d3 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef
-DIST apache-tomcat-8.5.24-src.tar.gz 5101516 BLAKE2B c19c46cca562f0c4c4733608ec007dd423f9a8ed0595bfb835554a7d08be06b791933e4beacbb0fe472589feae82f7d1a46934c0fb68930343cb2f4589bf6530 SHA512 f4ef9a66f2cafb3207c5a38c0f88efc1189e72f02fa88ef2a1b3626a03a57d0ba505b099f6185d747d5ab858aa3f8f3446ae60789312a900ec443eac45233efc
-DIST apache-tomcat-8.5.27-src.tar.gz 5123614 BLAKE2B 0051a7b5a9d3529a012338e0b12ed5fca218fc6740a0c576d3195a9c7848a78d93d0a6151541e314d82723de1b533b28024eeb231e33b21c38a2c4f702007415 SHA512 d3cac3d618283f0c26f861df67223fcb889da750f5e42563ec2ebc17d72169a7639d05d4d42fe403f4e49052962da09bc4b312b012c31309d8a096036baec8ab
 DIST apache-tomcat-8.5.28-src.tar.gz 5128929 BLAKE2B fe862a44fe57a50502b95d6f31863567b5596b183355a75fb7b75827a697299878920cc5ca5c24ffcdabae885a893266f40f174c76c32f449bec31e7a1be489b SHA512 55970e8babc1fde783e6e9f67a221012cae88e871391aa751e3c87c0fc7e58cd45662f025dc286dd529caced317dada48bb65786f87b44abbc9ce16f0d8fb0b5
-DIST apache-tomcat-9.0.4-src.tar.gz 5073991 BLAKE2B 7efffbba395d78d5ab051dd2bdb7a1491cb04159421bec17deebcb901bbca5cfec67a651f8e1fcd9a394ba3e0650fc61e7da039f0f979ae60a87f477bc4bc3b8 SHA512 bb8777f6fff861a53381b15a4196053abd9cc01e080f0511032f69eb6f57f5c6ed0eafd8a94155f19a4654bce4fad39e0fcaa2e5473cb269bceeb46a2ea43557
+DIST apache-tomcat-8.5.30-src.tar.gz 5143270 BLAKE2B 3bdcff663ca509efc3b2ee92ce140a3a22abf7fc0e32b5fa9a0ee713bdc1065ebde0b77cf624cedc2e0893194518d10e1f5df5b2f41edf76cb61157ac4d02862 SHA512 53729cfd1859872109f816df2642e3cd776a7faf8c55b1d50df0459f12958aacbf36debe6e8f10c19ab0a5bb2973fa63a2fec57f83ecaf19f4cf9d82e4a20265
 DIST apache-tomcat-9.0.5-src.tar.gz 5077379 BLAKE2B db345767f6c35557054c33d789fc40b1d2071501130bec57df41bb3fdf6f8be5260c0faed317b9fe6fa40474f9de1f29c6a71039eb0b7d07fee4ee0109ac16e4 SHA512 4d0b24dcf26b94f4280382f64bcdeb74f24b69b86b1410ad40d4a0284d6787809485f7c2501b66126d778a73a5c3eb155856ac6d3b3e2a477d1742d8588c1e84
+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 841 BLAKE2B f046abedec62ab2daf51ab5f0a45ea5003cd505e7e2fc10b32ba6c46c5d6c844776ac6bbca0cb7b1ff4798bc1f87af11e7c4e25a5d5397a4ea427b16660aa6db SHA512 532299ee901a84368a297a4fc033c37e3bedab95853fe1856b67f883a787ded535ecd4add05711bd57fd6e232e110ce9ed1f2ffeb462d0b8551d807610bb8ad6
 EBUILD tomcat-servlet-api-4.1.36.ebuild 974 BLAKE2B 138b53684d8e667e00e805e2069d51188dc453140d91bc58700a38b531ed1ce226db4dcf9fe6b030d85670c1b7a04640b09ada55388a7b95b22a0c69ba25b04f SHA512 5d4d397f7c77823074e4b6088792063cdd3c9edcbcdca4031916bdd05cc49bee175825d366ad6fdb6980adab29fdda8636ec2304cfb27dfd9e7b93f2d6353136
@@ -39,9 +38,8 @@ EBUILD tomcat-servlet-api-8.0.49.ebuild 965 BLAKE2B 8137fd074339a70166e04ecbdd63
 EBUILD tomcat-servlet-api-8.0.50.ebuild 965 BLAKE2B 8137fd074339a70166e04ecbdd631dbeb32ae21804918a65d79bd30b9790c54bfc9acffae5bfc6390b86d1b230959eba5043539bc367cafc0bb7f4eb6582b33c SHA512 f4e9c7c4be07457d48d8162a2e68c12a21289cc58b509cc2cc2570bd11a60d74ff83e98c31ed09a96a12e376eb22042a21ed08319a74c21fe6b3faa663bd4f05
 EBUILD tomcat-servlet-api-8.5.11.ebuild 1004 BLAKE2B c60fa1af6d8f0aa830b231315a425dc5388ef69916e583387d266da060ae18a4c9d9896b5cd39d2d99788ebac2bb1e60811e70e24077fd789991c23a9fa5e4d8 SHA512 867a52e39a6a74e8504d42deb6506842f1f87f3a70b0639b89fc2073f10b16d4dd6d3a375fde1ee5a91611acd70b04c4feeb02932289e39fdbb092041a4b7d63
 EBUILD tomcat-servlet-api-8.5.23.ebuild 1010 BLAKE2B fb16fa9955dd865619850de21cdae0e44130895b3f886ec96ad5cff37f45f8a13b5caaddc083f46d2eab6b00e174689e652a5a0ead58fb4626e40612c1fd5784 SHA512 1ceaa37c6434f32e10705b0663bc39e2ccc5507c621a2ede604feec69a49bcb46ddd49fff33a5ccce50d4daa228170a3db30e31624ae84dfc83b538de10f7824
-EBUILD tomcat-servlet-api-8.5.24.ebuild 1012 BLAKE2B 9b0a3428cace85369df81f0396d28a6d1a616be8d47702bd8a86fdaea6f97add9ebfd005e9834b39c48ab27767a2284bc2dc9d4299c80bc6f3b249639c593d39 SHA512 5f9c4742f04f8d607e54a7abd01d4dcaacd461a0751785f5c153d8547b20a70fe6c5d243a9d4f8c8f84c7d4230c05d66f4c8041940d7e00741afa11a952619f7
-EBUILD tomcat-servlet-api-8.5.27.ebuild 1013 BLAKE2B 1500538e35d723b1f5f78eb587db6169a531ae47c8cd66a05c19fddae518b4119ac84922100e840de84ff8cb647f974b55b3374b599560b62cfb1f743dffe18c SHA512 0f8c8fea52bfd4f9ef321a258e6dde507fa99a3d5d3626be1bc4c6972d3a6e57bde977d3dbbf3e5de3e3b877fbbb2ede8857d94e5cadd420a5994e21558a16c3
-EBUILD tomcat-servlet-api-8.5.28.ebuild 1013 BLAKE2B 1500538e35d723b1f5f78eb587db6169a531ae47c8cd66a05c19fddae518b4119ac84922100e840de84ff8cb647f974b55b3374b599560b62cfb1f743dffe18c SHA512 0f8c8fea52bfd4f9ef321a258e6dde507fa99a3d5d3626be1bc4c6972d3a6e57bde977d3dbbf3e5de3e3b877fbbb2ede8857d94e5cadd420a5994e21558a16c3
-EBUILD tomcat-servlet-api-9.0.4.ebuild 1008 BLAKE2B 315c88c9c197728d0587b70a6601d9bcf96d2b8a638c6cea32a06bf0d3e12161a6bcd2484fd4552bdc0e042a2a7a604e304636bea99e5f2f6bbf2f20b2cda407 SHA512 fe215a2c4c26d54748eff5a1250b65d16c2913e0040eb7b31295de9b4be46a84b725a8c34307db9211e17c77abbd7e49725c1ecd99519964d0995eaa30711fe6
-EBUILD tomcat-servlet-api-9.0.5.ebuild 1008 BLAKE2B 315c88c9c197728d0587b70a6601d9bcf96d2b8a638c6cea32a06bf0d3e12161a6bcd2484fd4552bdc0e042a2a7a604e304636bea99e5f2f6bbf2f20b2cda407 SHA512 fe215a2c4c26d54748eff5a1250b65d16c2913e0040eb7b31295de9b4be46a84b725a8c34307db9211e17c77abbd7e49725c1ecd99519964d0995eaa30711fe6
+EBUILD tomcat-servlet-api-8.5.28.ebuild 1012 BLAKE2B 9b0a3428cace85369df81f0396d28a6d1a616be8d47702bd8a86fdaea6f97add9ebfd005e9834b39c48ab27767a2284bc2dc9d4299c80bc6f3b249639c593d39 SHA512 5f9c4742f04f8d607e54a7abd01d4dcaacd461a0751785f5c153d8547b20a70fe6c5d243a9d4f8c8f84c7d4230c05d66f4c8041940d7e00741afa11a952619f7
+EBUILD tomcat-servlet-api-8.5.30.ebuild 1013 BLAKE2B 1500538e35d723b1f5f78eb587db6169a531ae47c8cd66a05c19fddae518b4119ac84922100e840de84ff8cb647f974b55b3374b599560b62cfb1f743dffe18c SHA512 0f8c8fea52bfd4f9ef321a258e6dde507fa99a3d5d3626be1bc4c6972d3a6e57bde977d3dbbf3e5de3e3b877fbbb2ede8857d94e5cadd420a5994e21558a16c3
+EBUILD tomcat-servlet-api-9.0.5.ebuild 1007 BLAKE2B 93f6cdc024db1fd4959c86661de3d58e4a3457e54e94bc26d28cfa14f276b17ae61113252b9004de8492f815fd4b02744e055c8082d3fe50918376e61dcca071 SHA512 4cbd09d197fa558fb2172bfb637c06c6f028939038ad3071074019de4663c833d24f8f96a1c7ca628241ae65ef16fc88a06b226f210070170844ad95e2890c51
+EBUILD tomcat-servlet-api-9.0.7.ebuild 1008 BLAKE2B 315c88c9c197728d0587b70a6601d9bcf96d2b8a638c6cea32a06bf0d3e12161a6bcd2484fd4552bdc0e042a2a7a604e304636bea99e5f2f6bbf2f20b2cda407 SHA512 fe215a2c4c26d54748eff5a1250b65d16c2913e0040eb7b31295de9b4be46a84b725a8c34307db9211e17c77abbd7e49725c1ecd99519964d0995eaa30711fe6
 MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.24.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.24.ebuild
deleted file mode 100644
index 06c703b27fb1..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.24.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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.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.7"
-RDEPEND=">=virtual/jre-1.7"
-
-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.28.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.28.ebuild
index c543bdd19c25..06c703b27fb1 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.28.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.28.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.27.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.30.ebuild
index c543bdd19c25..c543bdd19c25 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.27.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.30.ebuild
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.5.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.5.ebuild
index f00a9f12c2d2..a0340d723de1 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.5.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.5.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.4.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.7.ebuild
index f00a9f12c2d2..f00a9f12c2d2 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.4.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.7.ebuild