gentoo new year resync : 01.01.2021

17 files changed, 17 insertions, 72 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 8dc9bbae4159..1ff438ae0224 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index c47126c17425..12bfc79d9ef8 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-core-1.10.9.ebuild 2770 BLAKE2B c411d5fda4c57fb1534484bb2fd771b9f88b6f4bf60764c0adacdb84d7b1c39abb54fef5fc55f1ed4db5b4209ee69a11b797de6c1c748237c68689c90a88e05e SHA512 08485230f04dc5f12978be44f27a0ae39774ee6be355fc2cdb75531e944a61eb9048baeecffb9f3d322d3b5b0ea82bde2d5246174c28e708e9422044bb0dd9ab
+EBUILD ant-core-1.10.9.ebuild 2761 BLAKE2B 15dfa89cae92ddf074f225b9c09affdbb5aa14d99717d15bf8b058b0cb1f9c1d5080619bdc0c48da52d31aa26c9c2441f4e76621c7255fc2093de12a100e8a04 SHA512 f3fbe0d13d94a3fc6e008eae1845781076e6dccc42c2c1709f854636fa786a83902d939579b5b915b6e094a657c558350c77d98a9fe68f2d0bebfebdddb9f2ab
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-core/ant-core-1.10.9.ebuild b/dev-java/ant-core/ant-core-1.10.9.ebuild
index 12b283e416e4..7dd9454c91a9 100644
--- a/dev-java/ant-core/ant-core-1.10.9.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.9.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CDEPEND=">=virtual/jdk-1.8:*"
 DEPEND="${CDEPEND}"
diff --git a/dev-java/javatoolkit/Manifest b/dev-java/javatoolkit/Manifest
index e0c0500791d6..ba31b5f6268b 100644
--- a/dev-java/javatoolkit/Manifest
+++ b/dev-java/javatoolkit/Manifest
@@ -1,3 +1,3 @@
 DIST javatoolkit-0.6.5.tar.bz2 24380 BLAKE2B 69442b45e32e63e9f4f8104570ae644d6dd5571b6b909fd751a7060abddfedf84cc147f342a40ade8c4e04764f1a8362d853fae91353171708d5daf68ef3f8e1 SHA512 8a9cf0f2b7951bfe9ab544b48eecf5857ae4bddf129a1a0b928a2b37df7960b082495c44f42954cffe885d48f850b070781593352f09221d1b35b9a94ba5b55b
-EBUILD javatoolkit-0.6.5.ebuild 830 BLAKE2B b8e7f4ead0af3e53901313d0a295664945f74abfec188d3bb83d615346255af872464164c522e26366bedfd933d5f458a65ab2d313f7fd46ba52068f1346aaa2 SHA512 9a2150903a87736d5f9f9431eba2707175c1cb7f29270877a7605d340e2e83402c3f76286cca187dc2fb74bf6b1f0d7884aeab4fb84f1c7980130472ab64c49e
+EBUILD javatoolkit-0.6.5.ebuild 821 BLAKE2B 681c9526f03d031e8fda801d33165b255680b967a57c7009c3e348679c71288a99756000ee55925a493ef3d1efb5a3287c0b953706aa2ea043bfe1fbf278381a SHA512 5e5e4c8cd275b8b6f68c6f86c5e6dabdaf791bd0f7862e0b70e58107d9e6c4ff9d80f412e7a184a071ab813242d33a292e7b48b94b3ed216d61f226bae245d73
 MISC metadata.xml 260 BLAKE2B b37eb6d2d2182a4b64e7c3a9881a08a7072533de1f0920927c3c197f53db2a0ad57a44bdf47cf75cf08a93d6c55b2f6e0694227bcf07a606e337345131719cee SHA512 c4b63e127973fa92d06e9e1efb5d42571a9963a23c60e50039d8a4fc31b2ddfeac407deae9e03c2c1636957b3b3c53ba3944c03978958bada06a7996337fbb7c
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.5.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.5.ebuild
index 11bfc1930686..68412cd4bfcf 100644
--- a/dev-java/javatoolkit/javatoolkit-0.6.5.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 python_prepare_all() {
 	hprefixify src/py/buildparser src/py/findclass setup.py
diff --git a/dev-java/odfdom/Manifest b/dev-java/odfdom/Manifest
index 339fe3637b38..31f95fbd69ce 100644
--- a/dev-java/odfdom/Manifest
+++ b/dev-java/odfdom/Manifest
@@ -1,4 +1,4 @@
 AUX build-0.8.6.xml 11328 BLAKE2B 73af33dddbcb829fa0a5e6354a8ac176836fbc975336f633709fb6519e834cc237af80b8bfc4822af58a85dbc89e452e891dcbbc16425f3c245ecc2ad6de5943 SHA512 6db30e3cf5b154e07bba0374beed2781c0aceb4000d73d1e44c9041f876c2aad3510f9d07d7838c7d427755819cb7e57907843a52140755bfdf8818bb15664ef
 DIST odfdom-0.8.6-sources.zip 33171275 BLAKE2B ac509fad6891a715196e36b945071a44e6c1b096d69df1ad08690dead00f9f1ed5811f070859c81da546333fb12bbccf3eed5cbe06efe9520952cde2ed509d0f SHA512 7b71d55da01d604d89c5e0c7b9efcfd67e926db6807c885cb34cb9bd2e1fb1dc4a38d8e75967e08913b7ab1dcd85e7165d561fd3585a3d0c63df35a1a12c44e0
-EBUILD odfdom-0.8.6-r1.ebuild 1749 BLAKE2B 391c697aeecfc789c220f45b5ff4121baaeec096ed0d8d43839b9204a27a02b977eec72b90cf5d428e75faaff60a2514e5222dff1cfd3d1748bef46e753bb590 SHA512 53ac95ef66ff012522d82a428ff139604005fec01c83f2f1290e56f0f56cbe3bfbce2ac422f1984473c95e26a21a97c177a78cf3d298827c63e105ee02ff00eb
+EBUILD odfdom-0.8.6-r1.ebuild 1740 BLAKE2B 316376eb1caaaf1d88e23471253a64bc5018a5f45a8b143d543402d37ba651e5a91e9192f5f26ad696af9b13c814a7a519b364eb7829d22d8073e07200c49651 SHA512 c4b32318400379bcacd0e14b94a5b29972cedaea87d56129a4aca6a9c4a38fd1933df3007a8094fc6024f3c56bf9b5afdefbd3eaa50764d3224f7ba0b08d6c76
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/odfdom/odfdom-0.8.6-r1.ebuild b/dev-java/odfdom/odfdom-0.8.6-r1.ebuild
index ac419a17aa66..1555263da739 100644
--- a/dev-java/odfdom/odfdom-0.8.6-r1.ebuild
+++ b/dev-java/odfdom/odfdom-0.8.6-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://odftoolkit.org/projects/odfdom"
 SRC_URI="http://odftoolkit.org/projects/odfdom/downloads/download/current-version%252F${P}-sources.zip -> ${P}-sources.zip"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc-aix ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86-linux ~sparc-solaris ~x86-solaris"
 
 CDEPEND="dev-java/xerces:2
 	dev-java/xml-commons-external:1.4"
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 244f12bb7a44..d0d680e89ace 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,9 +1,7 @@
-DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001 SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261
 DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 6f04ab75a165d8135b4c1de210f8698f56f309f73d664192209de10580e0ef850bf56f6f394b860f21912e341141f7bbb1f63198eaee55fd7ad74d86b00c3b1f SHA512 84a349a1dcb5bce6a6a892cf11264390b557ed1e7b05883b71fa9cfb7460d9f73119da1f2861066869e33c752246ea438d5ce2c2b3ff7a4b07696d9450b7916b
 DIST protobuf-3.12.4.tar.gz 5310348 BLAKE2B 2630941672963165467221843c10079a0ed966f2fdfcbc970b0b41e1ed3c7f78734496c1fbd3ec509c68999a14f637fff267b309cf82a8acf2bb5a948484f79b SHA512 c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c
 DIST protobuf-3.13.0.tar.gz 5277913 BLAKE2B 168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2 SHA512 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
 DIST protobuf-3.14.0.tar.gz 5319779 BLAKE2B cea083eea4d7fec441536effdfe2bf1811913154b0cc0da2f14f4edeb0efb200236da102c36700e24fab73fd9883aa90576ad64603a7f175ebf5cef0dc29aae5 SHA512 9dabba81119cb6196ef5de382a1032c57f6e69038f4dce0156f8671b98e51bb5095915fb6d05bb5a8ad8b17b559e652e1e9a392dd30c7ed8dcf1d986c137be11
-EBUILD protobuf-java-3.11.4.ebuild 1406 BLAKE2B e340b1b5f90c401c29928ec99e4214f1f59dc20e759004af30dcde4d1666879b6399addd932dda56311c3e1aae258e4f7708edb4ce79c70e6c191c496a56510d SHA512 6946b5d21e0f6a3e79d324db108a425ebdc1517eb39cd89574a088814c0e87f74ef72094545a1860e2b8e86a14c1e9a61824c1171e39f0975ef05e74629443f3
 EBUILD protobuf-java-3.12.2.ebuild 1407 BLAKE2B 8cb3425f46c6abe6e0c45b8ca5c0b6e460f99b6bfaaa5e505364ed75e7da2411729c84ebd0e9a4cb082672c04f0cff74a025a43a3f9ca6f3746e75765b393e5f SHA512 965bdbc69bda2810a809672bfb1c35bd58bb89d9bc9abf3e959d42385d82745abe5a15eaac50c7ee7e3ea0306e29e70fc36d9a2d8713d07b95049d43297264e0
 EBUILD protobuf-java-3.12.4.ebuild 1489 BLAKE2B d614cccadfeb776ad3a0ce67472a15034c89f07102ae766190710b89013ecae6bc7eeb691f37fd08080bbe2a4faeb70b669f822ee06078a680cb0e182a785d47 SHA512 a647dab84ade743212c3a726391023b9e2807017f75727df7225c7249af0a4b8960e9f6af6b3fe74bb4359501e0ed33c253a751dcfb17e6a657ddf0f428221cf
 EBUILD protobuf-java-3.13.0.ebuild 1488 BLAKE2B aaf459f56556a36f440b8d413100220035022d58f4354e1e301012d389a23f10e96cae3b1a48d028e7bd8392bae5057db94509b70c5b14aab191d0420235ae76 SHA512 cf0c8d423649de8dadc62867a40b83bf4b98fb66b65c9c82f956dc9c101d5eced3e2d9dd6020eefffb887d04bf9fd690106ce899e14d5bd96f4159f801d76c7e
diff --git a/dev-java/protobuf-java/protobuf-java-3.11.4.ebuild b/dev-java/protobuf-java/protobuf-java-3.11.4.ebuild
deleted file mode 100644
index 0d5d98cde220..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.11.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2008-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/22"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.7"
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-src_prepare() {
-	default
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	"${EPREFIX}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
-}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 0078253d5594..f1d286788f56 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -18,7 +18,7 @@ EBUILD tomcat-servlet-api-4.1.40.ebuild 1001 BLAKE2B c3a337a341d14d193e0b409e2ae
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1437 BLAKE2B b4c1e56e9d529fe47a4705255bdde6845603605e473ed2e07d7fafe1b470123e7c186f8ca80ee98bf52ab43c504c0fff4ad996601646082735b7155a6cd4f928 SHA512 4d7033bd7aab26684b0e81d2f16eb1870813ea515f7024fe189469d48406a09fdd4a9497a89e254f8567c11f3a62c7e0d561246933bf07c242161c88daa31061
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 962 BLAKE2B 6abe44ba77bb16d78f1529cacbb95bfc439c63ba7cc3ee594209cb22927374e184edb90804ad1f55aa6721f98aa927f3bd8ca713463085233db1b233837acb07 SHA512 7a45a663f00ae5a71bea3002a72bd11a640583af44c0ab6a3dfbd6551bbf3a6de5f35e880643294c56027ecb3b7757425a2c26f34a96fbf8cd26df4a545086c0
 EBUILD tomcat-servlet-api-7.0.106.ebuild 905 BLAKE2B 9957aa960b21b87cefbe5cc3fb979e9c9489e35caaf47b53e66a6cc37b71f5412fe43a84d6530f4841446c2a7a1b6387af610ef3b00ee54284c696c91b123b11 SHA512 2f0fb2ec3f2026c33efeedda13aed94283a8ad1d958c44af873b2b41c43521fc59e4696a049e25465df9233a4458d84ce6f73d7dc70935fe5347ad3bcdac4370
-EBUILD tomcat-servlet-api-7.0.107.ebuild 2997 BLAKE2B f3f4d7bfab2ab5290da8bf0d3cd318f40811080c67017921ef23ca08b20a8064c9d3e533d0068de10d0404617d069088c035d7d1ba022cd230058afd1f044ae4 SHA512 769a9cfcca2baed04d1a0e5a91fc2d81c7bf29545ec52544c5e5004f0d4f79c354ef655cdd5a843f2a7298508cd57584e10f0a60318cb3829e436759bd2a3160
+EBUILD tomcat-servlet-api-7.0.107.ebuild 2995 BLAKE2B 12e3762f74cc16679c6506ff371e8e9ca16d28a49aa42d1ed63ddb68765e3bab85194972c112624eabf27ff53f0dd45e466ada7ace094ebb8bea36b4f4289a7e SHA512 2bf8d0f4baf7b97e899c97930eeb349fec0547f09137ce3984e6e0d57f5a0da8bed51a6cb68acd361b626784b49563d2141230bc6283b7d95363ae52006b115c
 EBUILD tomcat-servlet-api-8.5.60.ebuild 3006 BLAKE2B 7608f3ce7ecb52570528e05e040ec079b76970fd4dc408e481842d005bbcd292b5db0a45985b3833d3f2129ec8e69792d225b6bbac2f474e9221ffb38af4667b SHA512 e21868d016e2ce116be08ed06827f59da07dc3bf4ca0f0ffd29369c3b8865ee3c73ff0aeced838cab3cbc7defabdb637ae13ff77f083de8bb1f46f7da4e16539
 EBUILD tomcat-servlet-api-8.5.61.ebuild 3009 BLAKE2B 73382c67d346ac48e0a3cc8fc35fd48be7c2a9bfe8fc9b18da0dec532f0d131875dd169916eea4f32aa82005e025c5b1073d6cdb3da25b9886b9687287cb7284 SHA512 e085c0821b6635da8c3201c472d883d40900828780f0ab8143c17c87c86d837a9602da05e0574a2af3fca268a3bf73de71be2ed5f6798c59aea3b97497220c60
 EBUILD tomcat-servlet-api-9.0.40.ebuild 3172 BLAKE2B 6c853abc08b2448a4f6cb507968a4d06c8c952f631b142ac50f72443c55a3a27fd44c347b987a6beee703fd13e1922de9d4da20920c4d4a34f06598d8daa6bb2 SHA512 e3ecd5cffcaef886fee3bfcc7f11d54258c3e2642d8e2b4328ce9b60089dd4992c4bc4ff137eec99f3d2f8a74e72115e50541486268f4cedfa8962eaf491250e
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.107.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.107.ebuild
index 101f0a953182..3ec03e06118c 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.107.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.107.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/xjavac/Manifest b/dev-java/xjavac/Manifest
index 2e384fb1763f..b2dae4d0b15f 100644
--- a/dev-java/xjavac/Manifest
+++ b/dev-java/xjavac/Manifest
@@ -1,3 +1,3 @@
 DIST xjavac-2.4.0.tar.gz 2472 BLAKE2B 4693c2fa74a2951909ff6dc55638e7f3de19fecf82bcfeba0abfeaff82f941ea9d02dde3de969e850da9c5bfc98684b0a34be391d6db6c3fe12de0a734137afd SHA512 6a12c605f6f455f20981214d1ce8ed752070ae2b268e9279692a3b05921c84857636055d9c4d7b1de92bafbaa4b528f36983dc2eca0ca883a7fa340320e503a0
-EBUILD xjavac-2.4.0.ebuild 665 BLAKE2B d58a39f010f0c909ed86d48efbfdb01c1d29bef81e3afb1b60cb94c31764230d9203e46f7fafe32766f02e0ed6b2f1a16fa2ec99165d9b6cb93e87bdc5ceb5f5 SHA512 53e642f8d974bc9b3dc8b53ecf4db1f7dbb42080b64d63fe4f37280dcf038b0de37e1cc4275c49107d1562c76b316433fb364dbcc47b52648f403894bee85316
+EBUILD xjavac-2.4.0.ebuild 656 BLAKE2B edb07ec2b43dafc213c87d2ddc18afbd2ca0d3695a84e2ecfdcd0461e131b3ed1bdd6673b965f8c91a9de865febfc9ec6a9b4de17d97c3cc353869c540e901ec SHA512 a65c94cc57d442058d1cc14b131fc5ddf53649b7b5cbbbe3f3b686467dd90722ede62b038969e07480f047738fe9e8b54b5b08e539e53e64917f574e7ee8f83f
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/xjavac/xjavac-2.4.0.ebuild b/dev-java/xjavac/xjavac-2.4.0.ebuild
index 9015639a3f9b..7369c3afd50f 100644
--- a/dev-java/xjavac/xjavac-2.4.0.ebuild
+++ b/dev-java/xjavac/xjavac-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="1"
 
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CDEPEND="dev-java/ant-core:0"
 
diff --git a/dev-java/xml-commons-external/Manifest b/dev-java/xml-commons-external/Manifest
index f8ca32f96ada..5a48f9996d81 100644
--- a/dev-java/xml-commons-external/Manifest
+++ b/dev-java/xml-commons-external/Manifest
@@ -1,5 +1,5 @@
 DIST xml-commons-external-1.3.04.tar.bz2 659665 BLAKE2B b7f51fab7162b905142c5256f1d03d519b4ab387edf8b4c3d738ac138cf6ad71f29fd568c99423f840be6eb02bb50e89cfab3c729d2d5071d8a66e30836d8f5e SHA512 8bc71a0850e751ae4a5057833d57b2235734facbae43c733b0a9d86e5be99af016b737f12f5566c736f71374a709dee9954089db8fbeff4fb4cbb236a9fd6abb
 DIST xml-commons-external-1.4.01.jar 656529 BLAKE2B c51ca760c23759d4f4ad11fcb44caa1cb0bcb2785d9095ed56dba9b0d5fe57370a9d9aaeed5a8e0c1fa67918237ce693590bac791200add2e85155ab87ffe40b SHA512 f00773eec613453d0e1b7b0857b01c51d1926079f38e172953c4ef0350f063439acc8b5967f947c8d15a73e5d53e8887c3bf30122d5f7c553bcef349e5a8cb9a
 EBUILD xml-commons-external-1.3.04-r1.ebuild 1147 BLAKE2B 62835033096f4ba8c7c55c765250b01e4e6317e7dbf0bf196b20dc20b4538721a55087d74dbe1e2765bd936e0186c98cf4036f0cc6bc3eb677e91b2addc59560 SHA512 9ba06d0f0def19abf6091a15f9ef9498c83c18f5846d4f8d54159bdc5bdb29cb8f0ac1d9d8c2c506a9c676df1cf55f05796a408efc2bf77674e7dc4191614e96
-EBUILD xml-commons-external-1.4.01-r1.ebuild 761 BLAKE2B cfd6bf31bc318c0163e2a07753739ab0cd204c7a47ec8ea1dab4672158d89a3923144e31de36db838a438fd327104f05ebfdeb63bacc5e4c7edd29aac0e79699 SHA512 76ad3e34c69a068071984c29445885da84b464c1b290946e65433d8365ad589a43a161ce12870edd3d5beea5d41b319e0233532fd9da5e2bb5a5c7bbc5a8dbee
+EBUILD xml-commons-external-1.4.01-r1.ebuild 752 BLAKE2B a3b10393962277bfda7911d43652f94f35f13861f5be8b02382714feec7ab6a36d222b486215bf6af7ba683c2741326d74ca3530f179d73d8f40053cb8f9014c SHA512 1ffe54c68897caae51452826c78c6cba64d1c2f44cfc1c6171f93766164e45a3c61d9aa71614f4d728cab89757abf27ecc83cfc454c83dc5151b756628c62ef5
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.4.01-r1.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.4.01-r1.ebuild
index a42ddcce02b7..cc9142bc5fd3 100644
--- a/dev-java/xml-commons-external/xml-commons-external-1.4.01-r1.ebuild
+++ b/dev-java/xml-commons-external/xml-commons-external-1.4.01-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ HOMEPAGE="https://xerces.apache.org/xml-commons/components/external/"
 SRC_URI="https://repo1.maven.org/maven2/${MY_PN}/${MY_PN}/${PV}/${MY_P}-sources.jar -> ${P}.jar"
 
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="1.4"
 IUSE=""
 
diff --git a/dev-java/xml-commons-resolver/Manifest b/dev-java/xml-commons-resolver/Manifest
index 892ee30305f0..11623b96f308 100644
--- a/dev-java/xml-commons-resolver/Manifest
+++ b/dev-java/xml-commons-resolver/Manifest
@@ -1,3 +1,3 @@
 DIST xml-commons-resolver-1.2.tar.gz 262701 BLAKE2B 54258372fb2d08dd08777bb8355b13c26f426d843e47c6790a6174f82998b9a20bc1bfb8073c5bab8c4d521db54600c8eb3ffdb6c03ce6091073ada655e7c6b2 SHA512 0c91057da3198fc488c7b2c20afb029aa4441ad979159c378d532b02caa294d27e730ae2f9857062af5e3815a603a6110c5441dd3fe6b36c342a78beac3c8a6f
-EBUILD xml-commons-resolver-1.2-r1.ebuild 815 BLAKE2B 36cde061b80c83c454a04892a8a1f0ef730837798fac5416127c0bd7160213f824b08fc83d9ef0506d5019d8cdeaee93daa0c90b7413dd9edead5ba74367ff93 SHA512 5ad2ddd997d65fc6e8f395d8b108b68ced5415930dfee0fc117a434d821a6c9cd19b1824bb3fe0334c59e5a695436973bb436f0d47d3500da2c93bd2548aa8c5
+EBUILD xml-commons-resolver-1.2-r1.ebuild 806 BLAKE2B 2b7287de6650b0b00f7d2a5a394a4564860f710dca673db3e7e817db0b2022b6c1e1c5e4f55cb600e17016fc82304ecc3b446317d63fd55fda4a532c86864e8f SHA512 cfe84762cd7216b95d2f7e878cefe518a5a290a2d5ab9339aee819db9baac06e9f67b9f6869f55386e3a3e755a8a5157b28bca14afe7d7f9177d40ef1306a27b
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r1.ebuild b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r1.ebuild
index f1d499ba8da8..710323bf2fdb 100644
--- a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r1.ebuild
+++ b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="An XML Entity and URI Resolver"
 HOMEPAGE="http://xml.apache.org/commons/"
 SRC_URI="mirror://apache/xml/commons/${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 LICENSE="Apache-2.0"
 SLOT="0"