gentoo resync : 21.05.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-05-21 10:20:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-05-21 10:20:03 +0100
commit: 6f8038813c460b4f0572d5ef595cdfa94af3a94d (patch)
tree: 3509e94070265053394b7f2e30a779d7e60c2064 /dev-java
parent: eccb70a7f91b2d22582587f26d1a28bb31408b45 (diff)
73 files changed, 103 insertions, 111 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index a9da6289a9f5..80b618f57baf 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 fbef9b90dd60..13e73ad4f98d 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -2,6 +2,6 @@ DIST ant-1.10.5-r1-gentoo.tar.bz2 6400 BLAKE2B 349a45ee678217ee31ae2f6e982ceec2d
 DIST ant-1.9.13-r1-gentoo.tar.bz2 7208 BLAKE2B 6f041a69f5f8e38e95b26030cf4d730ed22b071ad1d6e87ab1fb2707e2b40c7e23e1c8f7759d6904ad2b25793a7d9b2ead1c2649b6b029296cd9d05bec4ea296 SHA512 5b105ea00fbc7d6f63c0016b288f5e46a81b89cc46015e2ffcb2a4d41f915331ac8f8183752fea547396f204748132f6ce7aa7b3e6f6181c4983b4eb7ee84d54
 DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
-EBUILD ant-core-1.10.5-r2.ebuild 3173 BLAKE2B b558cf3ba6f8ce8c8001d94fa3c46f35d2341edbb32f8eb5f4a59f5dc0c7c313571fda02a96e3dfa89881798dd43bd3fbd736bb9da34bda257a7275657c72c93 SHA512 bb62b796f2282de6e326140690df1e1318269ca8b03ccc0dac2f501ad4782d40c233ad047acde082d1a28544bbf9eda911c0f285c47d327d8d274115d5b099ab
+EBUILD ant-core-1.10.5-r2.ebuild 3172 BLAKE2B dbf14d76e6369d3e952407fb4ab2a7dd362deddfb2b57d515027abb5f34c92fef66a1897314eda3c6affaaa0ed8366a1eb8ceb67251f93761b16e392c7b4253b SHA512 850a85fc389fa624e829877d23750bc155d1459dcbaf6e13452b83a0c100e188c39e3165ce26400685160d7d4bf26081db8cb68c7a9be1f8ca658d355b806366
 EBUILD ant-core-1.9.13-r2.ebuild 3173 BLAKE2B b558cf3ba6f8ce8c8001d94fa3c46f35d2341edbb32f8eb5f4a59f5dc0c7c313571fda02a96e3dfa89881798dd43bd3fbd736bb9da34bda257a7275657c72c93 SHA512 bb62b796f2282de6e326140690df1e1318269ca8b03ccc0dac2f501ad4782d40c233ad047acde082d1a28544bbf9eda911c0f285c47d327d8d274115d5b099ab
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-core/ant-core-1.10.5-r2.ebuild b/dev-java/ant-core/ant-core-1.10.5-r2.ebuild
index d5c615d4701a..c5cc705083b8 100644
--- a/dev-java/ant-core/ant-core-1.10.5-r2.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.5-r2.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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=virtual/jdk-1.8:*
 	!dev-java/ant-tasks
diff --git a/dev-java/ant-junit/Manifest b/dev-java/ant-junit/Manifest
index 75f377580b55..4566cf555038 100644
--- a/dev-java/ant-junit/Manifest
+++ b/dev-java/ant-junit/Manifest
@@ -2,6 +2,6 @@ DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8
 DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
 DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
-EBUILD ant-junit-1.10.5-r1.ebuild 497 BLAKE2B 0207bc0b6a519399adcb49c2ddcbc1a73ecb39bf54a87e726fd33346ffc6b3f4163b2fcb70796540ec55a143fe38694d580eab5beb5fd34ba10dbf821db27028 SHA512 36ef29c67d3c0051837a474ea185023cc1664f67d7fc4cf7252ac65f8d0e2519e779bf2aecbe77487cea9f9172da0b3f5d3bf56b36e481853438053c65f669ca
+EBUILD ant-junit-1.10.5-r1.ebuild 496 BLAKE2B 54692d1ed0dd3ae37b961b67e064378d6ba861276dbf4a2935e52296ff5d11eb868bea3bc50adfb61e6095c3758ce044b139ca16b6cd26be8eb71508b2fbae6a SHA512 0f2e756b2131d5181d71feef7b0d2b395b5c2ed1f5c7df0e7d139fd6c105f70ce4230545c1ceddda1be21674f41e0f8a35049e33d3005a97d5acd071b50c094f
 EBUILD ant-junit-1.9.13-r1.ebuild 497 BLAKE2B 0207bc0b6a519399adcb49c2ddcbc1a73ecb39bf54a87e726fd33346ffc6b3f4163b2fcb70796540ec55a143fe38694d580eab5beb5fd34ba10dbf821db27028 SHA512 36ef29c67d3c0051837a474ea185023cc1664f67d7fc4cf7252ac65f8d0e2519e779bf2aecbe77487cea9f9172da0b3f5d3bf56b36e481853438053c65f669ca
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-junit/ant-junit-1.10.5-r1.ebuild b/dev-java/ant-junit/ant-junit-1.10.5-r1.ebuild
index db0df142a354..396f79a943f4 100644
--- a/dev-java/ant-junit/ant-junit-1.10.5-r1.ebuild
+++ b/dev-java/ant-junit/ant-junit-1.10.5-r1.ebuild
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~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"
 
 DEPEND="
 	dev-java/junit:0
diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest
index 0e8ad31eba8e..a2fe7961ac24 100644
--- a/dev-java/bcel/Manifest
+++ b/dev-java/bcel/Manifest
@@ -1,3 +1,3 @@
 DIST BCEL_6_0_RC3.tar.gz 929878 BLAKE2B 05e2e307f226785cda54c06e80b47b8f738d2f5117deb4492cc758e4bfc2b046068f2aa7836336c26514f56c99525732c62acb02ed982e7f446dc254a5aeab3f SHA512 05ccf95ebf6b374fb112296509b4011d741acf2315b331aa971f8c3bc6be2f73b39592721a8c769b6b9d631e78e348c124c56f567adc2338ed5508d5ec3bed77
-EBUILD bcel-6.0_rc3.ebuild 1195 BLAKE2B 0c30434811449792b24275b28f518abbd6ea97390d5d4f9e744af468b1c8928444913c1fb53e073a1c8475fec346439bfc4a756d86a8cbcb5a6bdeb8eca2c350 SHA512 7ce0ffd7ef9472cdea7585a9671784c8d8267c6600d4b9c207c80c575daeaf2cc0b2096b48549f7669487749b2a2b9e72688ca44a4a3940383e8d255d30fe572
+EBUILD bcel-6.0_rc3.ebuild 1191 BLAKE2B 13cdc05ac6187d496c2e796e7f53c54e832b4a9ea617eb98bf6c125ea878956f7db8d9cf6f3cfdceec83f72f0c6860f9c2f32444bd9c3a1b493f59c73354d183 SHA512 758dde9401a9a0f1d06e9f28f32766a81078e9c3df37daf71ae90dd225a12bc82b049e7e97d062e28d243ca4f6cc959ff653cc47e33fb6ce8706d0a1c4a8d46a
 MISC metadata.xml 819 BLAKE2B e997d77649047065ba6102ad1e4c71a3622fb20544234f529566e665c6c97830bead40f81fb4664f3565225f07abb6d7829b9a6a9f2b7d5365c9fdd02572b020 SHA512 2dd8f3339c680fe11255c65ea92b2ad808ec4cb59d49b47ea533092119fef14424859368feee8ce94e7621a607ef71c4499ab78e518ce07886388def593e7281
diff --git a/dev-java/bcel/bcel-6.0_rc3.ebuild b/dev-java/bcel/bcel-6.0_rc3.ebuild
index 0dcfd4552f2e..5247d0b95179 100644
--- a/dev-java/bcel/bcel-6.0_rc3.ebuild
+++ b/dev-java/bcel/bcel-6.0_rc3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/apache/commons-${PN}/archive/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~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"
 IUSE="test"
 
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/byaccj/Manifest b/dev-java/byaccj/Manifest
index 5102aca816db..063652445b29 100644
--- a/dev-java/byaccj/Manifest
+++ b/dev-java/byaccj/Manifest
@@ -1,4 +1,4 @@
 AUX Makefile 2003 BLAKE2B e57447ec26975954239e92509fa1491fb31235a150d56db7fdefbd4fb61bd53e13df5d0b6157843c094ff8b691de00515e92fdf4c95c9ea6e71fc122c4d27efb SHA512 d48f81fcf89ca5f6524572b75dcde4866cea5f434059233c234a664f56e80c0daadc8f314711cb9c55430a947cc9dbf48f4a0bead0433da5b333f5fd73fcbc68
 DIST byaccj1.15_src.tar.gz 53646 BLAKE2B a57cdb85253f2ea8485c05687222cf99912494841cdfb6deb13d80d49f87a3dd8f1eb3350bf2501c7c86b70a198415e339019930301bd8d2a770e10ca9bb850f SHA512 6423ecca70d21dd0c1dd8366361f6c4420536e099090b18738013fbb6e8e0710ee739e51dfd7f603a64f8761f48cdd1d8dc7844d1b5ec6b792535254d290addc
-EBUILD byaccj-1.15-r1.ebuild 691 BLAKE2B 4264f45b95fa79e347af7f4f731906398f630e7c186352df1f1de708b84b8d96de7fd022132c08fc015dc7a5a8b648f1b654a1fadc6dd0679ff4b63987f490a7 SHA512 e24b9878b8551f984060bb3b4b449f7d9cf8c7d876c9a1fbfa9efc46bb2f1a3a1eda104706b8e07bd52623019e0c348453a4ac33d66b17fe409f2602b8113551
+EBUILD byaccj-1.15-r1.ebuild 687 BLAKE2B 3693ccdc5136bcc216a31e3a545a08c7a99a90176c6b8f0594b9d4df37f2dd28f44cb935116eb13130c133b21983e65fd913e67dc196bcad09503cf27fa6bf75 SHA512 3436b921566c3326fc13716fe55d95c927873bb02cbb1b7b6f98799b6dc9ae2f64f7aa0b0a5593646edae9966f31364840419263c1c813ea6578950ca69e27cb
 MISC metadata.xml 312 BLAKE2B 1148e4e9d86c4155c8413261aa2bd091a462baac98b22bbe6e7d609088c5dbe3fc3d0f8d4d537f2052c87571c29a95ffeeeebabbbaa6a623559bc5ba463c6171 SHA512 3ce25507ed5012c2f4c4961a9a9b739b04762e0a34bef6db4202240a65e6c1212a459ab35fa1c680dea52928c88f88301e36abc780228fb4b3591a37b3cff749
diff --git a/dev-java/byaccj/byaccj-1.15-r1.ebuild b/dev-java/byaccj/byaccj-1.15-r1.ebuild
index ecb1c7ade4cb..f848e9b072e0 100644
--- a/dev-java/byaccj/byaccj-1.15-r1.ebuild
+++ b/dev-java/byaccj/byaccj-1.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 S="${WORKDIR}/${PN}${PV}"
diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
index 47c5e549ebcf..7b3c9d9e542a 100644
--- a/dev-java/dom4j/Manifest
+++ b/dev-java/dom4j/Manifest
@@ -1,4 +1,4 @@
 DIST dom4j-1.6.1-java5.patch.bz2 2900 BLAKE2B cdd7dc901f5292af3ef7f0ea200c3d22bbc8c0adc27606da3c8fbadc44625b114c995321723dca331f0b23d5248e1f9177f0def2f4138eebcbd4aaac0495d4dd SHA512 38da606d77b62976366cd089e5194a922e348ec396e7b9af4dceb0a536c47f66e0900cfa59c91df04aade6076630077a8f88c713b9c20224d69316109b293a96
 DIST dom4j-1.6.1.tar.gz 9687211 BLAKE2B 3daa3729ea071aa87c7c1e1e2b91f1635109774dd2bd564a85265a0286f1369373084b945409d9d5213d66a7e14224033d42c58d80125b7982eef8961eb29248 SHA512 95c5a7105a81734f77b4bf27f8bb0af116bf43d8ad5297a0902a6687a54109a87dffe2953cf430d14947cdaa590aa0fdf083b46a91d1d98d48431cfae4459d94
-EBUILD dom4j-1.6.1-r7.ebuild 1871 BLAKE2B ac9a685c9e4218a5ce85f9f8d2005d6683b4e84c35f09ba27d632208cef47b92b31de3102197077b62ca00aed707f62a50a58537ff8b5a5944e9e9b5486b64cc SHA512 e34d4811f98f27fbbd4153c702f0845c7616801ef620ae800cf2bfb2a21567c402ef6d07e6a5035c34a48d4ff8aa0a4ee2823e313e4d6f735675764889619c3c
+EBUILD dom4j-1.6.1-r7.ebuild 1867 BLAKE2B 7230fff7a2b43fe300a542c5373c4f781108705fd89b87f3a6c117e4ce6fc97753b9bbb8622f76259c0a6a344aa6a6f1bcf88268b30e0345af1ab098d4f81fab SHA512 03d6a354fa1b0e4d9f5dd4f836521830574e20ce3c95dba631571496453eec3298d5429089ecd86a129e47c86bdc19e8027cb2b7270aa9dbb333c779e53298be
 MISC metadata.xml 529 BLAKE2B 27e8a2aa0c95e7690b99386698f800291371b9962a1a667899c425e58ce73c8eb21dac1c589d47449242f0e2522b66c66379d6dd3b01708015e66278d634a480 SHA512 a9845c5229efbf48ac83b5b8fd0a769d90275de1f336b52147330cc2652a858df2689e17895e2fca5af067288413102de67316e49108c7d9eaf232e9dda31bbd
diff --git a/dev-java/dom4j/dom4j-1.6.1-r7.ebuild b/dev-java/dom4j/dom4j-1.6.1-r7.ebuild
index c3ac813cd529..d287d177e66e 100644
--- a/dev-java/dom4j/dom4j-1.6.1-r7.ebuild
+++ b/dev-java/dom4j/dom4j-1.6.1-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="dom4j"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/emma/Manifest b/dev-java/emma/Manifest
index e3dc1ff335c8..8634fc391262 100644
--- a/dev-java/emma/Manifest
+++ b/dev-java/emma/Manifest
@@ -1,4 +1,4 @@
 AUX emma-2.0.5312-java15api.patch 841 BLAKE2B b3a03a2f309303e0966703204a66980081778ca261b7ed82d8471ce3a295e4b5f8af0d6a8547f01150930a7c3378f8472ccef3ccb9382b74d9782e246530bc93 SHA512 cd485a0bd9bb157f9a0e420bd3bd8863ae5b1127401b8ff8944459c04fa2f5a7e6b008d9f86affe25cb24cf007d9dfe780f843745c6fcdfcfe1f734e9bb8fd23
 DIST emma-2.0.5312-src.zip 421109 BLAKE2B bca287d7cdd61902fd156eac80596db07801e8dabd342d7cc68d3e0b4c0ff7b4de2b14d8b01d3521a291f7401ddc0ead67db6f9c601b26669ce9265bc28e0209 SHA512 d99b7ff1c4682a97f714f74cc6142bb766cde47bcb33932dc466f1e505e836883f01faa0a959dad77c0837fca3ae744754e0fcdc34d7a8d14720b0b7ce90ee4b
-EBUILD emma-2.0.5312-r3.ebuild 1043 BLAKE2B b93c80ed04f62d0281fc8f70d0b950ffcb238b34f8877a5de2dd19da24d1fcb77c56c416a65c4bba87f911f49bd7a053795546489f3df3286d336864bb25031e SHA512 8e92ba3a851ca3d14de2dc9e93f5d6526002b63f860fee181d6cade4b7f9ade88de92588f370d549c9f733ace9b12e618aeff632df7a4ec8bf8c04b869f58a32
+EBUILD emma-2.0.5312-r3.ebuild 1039 BLAKE2B b2de84bac7d81c2af8a0ccd6cbc7df2ef24671d32e76ea768026a2f38f01599c0ddc3b4f152af084d2c7f4d121e083c74951df52a37af79717a20b3dda053c77 SHA512 6f0ee5d7c95a68765a83ef268ffac1b5d8f05ba7a2c270332e7f86ca929274cf7359f5abb29a9b75c00b6d4d41202a70b15f1c46ba40db3168c5305f40320475
 MISC metadata.xml 859 BLAKE2B d474ccceca08cc1c567c3376a7b07e9d2e353f078774cf852d73d452af719700300cdc5ad2959cd152de9f7e41709d595256de37e02581b638ec7d04cdda6869 SHA512 ac17b5b8a16adcc4eb751c272805edf5e3c25df27615efeffac2b188f689a8e40461d733921868c1a7e52bbf1e99c618cc99a70d921ed51661241c87b46a7a3b
diff --git a/dev-java/emma/emma-2.0.5312-r3.ebuild b/dev-java/emma/emma-2.0.5312-r3.ebuild
index 7980a191226b..08620ee93566 100644
--- a/dev-java/emma/emma-2.0.5312-r3.ebuild
+++ b/dev-java/emma/emma-2.0.5312-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 IUSE="+launcher"
 
diff --git a/dev-java/hamcrest-core/Manifest b/dev-java/hamcrest-core/Manifest
index 5741b3122ec3..d05df4844861 100644
--- a/dev-java/hamcrest-core/Manifest
+++ b/dev-java/hamcrest-core/Manifest
@@ -3,5 +3,5 @@ AUX hamcrest-core-1.3-fix_javadoc.patch 3036 BLAKE2B ee65eb88f113a5f6fd93b49dafb
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
 DIST hamcrest-core-1.1.zip 1344232 BLAKE2B de9d346ff12ff29c4d1a13138eb8a80a527865b003f5d738cdfba4927714170720e2a778aecefeb895b82d0c40feeb1980c2ae5ab17a7caf2c27e19a0fcf6188 SHA512 af8d5d3a82df70a446f79f7247252595368820b0b54d8f612aa5b9bb3166c4664b97aaae338278f8f5d84add2d58d9c7a764e5e03a93588d3eba4472eaaa712b
 EBUILD hamcrest-core-1.1-r1.ebuild 726 BLAKE2B 0bf2ceff64edd7c6359d06c2019e34dfea5862c0055f86865162127ed8946dafb71481d7fa37786bc613386cae965df060448841805e8f4c599097e47c09fc9e SHA512 7fa43c784e0ce93356d60704e1e1146fbfb34448252ea9d94849749a6f876a99c830fd3154fa37692fb14b12f2dc67c995b9047e067e968e59ccab04f318dc0c
-EBUILD hamcrest-core-1.3.ebuild 1521 BLAKE2B b3f820d2a13406937497405865c7603d7985740a75f3c40e6ae6a3264d200c3b596921dfa844dbe550b8d0fce15e9318c629ba8658334a22fc9218039fc8139c SHA512 3416e84cda9a2c7939b9e61fcec5ae1663295568b541782f522d82f6ec2a16556416daaf3c31410e2368030c822852d211a86e3095a7406775e742730bdef3ec
+EBUILD hamcrest-core-1.3.ebuild 1517 BLAKE2B 7954ea5feca44fcd1b83e8d1a7f90036ff0351f4d7d4519d6fcc3e2d06ee702b3d58bbe6e6227623e745d931bd8e7b8026df54d9cf9724fcf7ee5c774a08ebbf SHA512 436023213e773fa3f92ca941225955b14ce8b8b6e7332a62965f121b735d2e4b3aef01978bc59f288a3a6d1c0e12667da106b0e6675cb70b2e757a99d02e60de
 MISC metadata.xml 363 BLAKE2B 949dd901636266a4874e05a9902cabbfa703b665d96402ffa219ca9dfc6d6bb340518ecab596dac5cf38292b3303ebc63ae0831285cf3e6a3b5379c0ed9b7366 SHA512 7c71d7b035ce5a0a53a33932a8e7c90d2c4749deecb2a6e2b1dbaf7183b2526ad18d2233717f8c405039bf7d87939a544092d8f058f006418b8584caaff8fbf8
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild
index 24bdc77cad61..c57f1153be9d 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -17,7 +17,7 @@ SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
 
 LICENSE="BSD-2"
 SLOT="${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
 
 DEPEND=">=virtual/jdk-1.5
 	~dev-java/hamcrest-generator-${PV}
diff --git a/dev-java/hamcrest-generator/Manifest b/dev-java/hamcrest-generator/Manifest
index 85a205910e9f..df7e92a74d88 100644
--- a/dev-java/hamcrest-generator/Manifest
+++ b/dev-java/hamcrest-generator/Manifest
@@ -3,5 +3,5 @@ AUX hamcrest-generator-1.3-no_jarjar.patch 982 BLAKE2B 4c09b64a6b824025771682dad
 DIST hamcrest-1.1.tgz 1670123 BLAKE2B 2b1242a782949e084374918778c17f20b3b09746521949c12153cf1e599ab38a2a5a2bf0174d9676a8146cfab1e3f7c91a8a1b3ec829dd617f34f92c6852b931 SHA512 07b55c539ffcd3b1d33e94bec518164b95cefa39d96e0c3d02fc97c0a20f71bd8d1dea90a59ffd163e748ed1007b087c3d0d355876a68a429e8e564d0cfd3595
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
 EBUILD hamcrest-generator-1.1.ebuild 1274 BLAKE2B 717dff6fd73252c1c6d347e3aca112a3f6bd998ba06062c793c251356d59a943b43f73cba2410d2e5f22a341ac4836e4cd8ead1014bb07578cd9b4d59f7b4a1d SHA512 377f209ef46d2754954e01dd969ac04226c464584ec8d92ea76d36cc2ce1462ef49af2b7159dd1da82b8a1481b08fdff5f3973aea1b4652964e4d2c0ecfe48d1
-EBUILD hamcrest-generator-1.3-r1.ebuild 1339 BLAKE2B 77616c2e8d04bd08c1128536888bf8cee4c7bcdc025773222846b7924bff417c8657d0241de63d8264ba6b893cc37308db8fbdccb8df86bd55c996f319248404 SHA512 bb6112925539fd5844b85a3d746b095cf6c4583d95b1bc53d5a813790c1e0af120147939b5eb2b1478ae85bf5af1a9ca12f665904e3ecf3d58d8c4d96d8176d9
+EBUILD hamcrest-generator-1.3-r1.ebuild 1335 BLAKE2B fb8a85358fb10b39d4ff60cede789cc205f32abecff2d359b5e6de5b8b000e63a4150e70c7392b471c8b86e92df13189fa3ca9ea69f10ef557f5d66ce8afaeaa SHA512 c031ed09243682d55fce77f2ffa8226268e19afa30a8d15b1f8bff3cdbc24fc8bcb6f00d369d67c8e429e6d5634667e269760d9e41d427a7ddf4bc6eb7a6398f
 MISC metadata.xml 363 BLAKE2B 949dd901636266a4874e05a9902cabbfa703b665d96402ffa219ca9dfc6d6bb340518ecab596dac5cf38292b3303ebc63ae0831285cf3e6a3b5379c0ed9b7366 SHA512 7c71d7b035ce5a0a53a33932a8e7c90d2c4749deecb2a6e2b1dbaf7183b2526ad18d2233717f8c405039bf7d87939a544092d8f058f006418b8584caaff8fbf8
diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r1.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r1.ebuild
index 66c19578868e..14529ec5b9f8 100644
--- a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r1.ebuild
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -17,7 +17,7 @@ SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
 
 LICENSE="BSD-2"
 SLOT="${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
 
 CDEPEND=">=dev-java/qdox-1.12-r1:1.12"
 
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 899c8bde7756..8f27b18f99ff 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -23,6 +23,6 @@ DIST icedtea-bin-examples-3.12.0-ppc64le.tar.xz 1867256 BLAKE2B f8110bffd2d1b30f
 DIST icedtea-bin-examples-3.12.0-x86.tar.xz 1859900 BLAKE2B 44ea53632b82e1bbcc7b569d3aaf9f3f247c79b465ca4f4e54f70f3e3fe1752b1f5d9c84ab40328270e074be6da13b34af3803fa43584df16c9f22898b77265e SHA512 1aa895aa3e02081ec45f7b3b250605ce914c7f06ef4e9c37aaa6d7f2b084295ab48e490174fa443b419d37299f88db217407d81651c08996aba1af91401629ce
 DIST icedtea-bin-src-3.10.0.tar.xz 45755380 BLAKE2B ba6fd20de7d21e728108ff1d30599112ddf7ac24135e30891ae0d033bf77d52238c81c5c7fc7375e062ad4e8bb9492098cc0a20d3ab8486a4a02f20efa1f06a5 SHA512 0693cfe83a80d5e9e86be394b142b23097b0cfc1193f68f0fd07045ad4792b38bffcce47ea764f934d3dbfc568bdfbf5017725e7f35fbe1175b48498d53b0c5e
 DIST icedtea-bin-src-3.12.0.tar.xz 45776320 BLAKE2B 97ca4172ed8eadbcda0e20b598083b6948cd3a90705653716f1b6a9e65e150a1ef7d9e9ecdd3ad5ea90fd972ec9f1c3fe20ace44e4d2a0ede8e6d491991f7f9f SHA512 f6e7efa0962632d52032cd22a6b8de50bc2571a5ebcd18314b9aa01fb23cbd8d134eda5d1d2a6bb7fb1e26decc8a5740dfa60318019b920eb3f0498c2a9e9784
-EBUILD icedtea-bin-3.10.0-r1.ebuild 4388 BLAKE2B da06af20cb6565b9958c9b63e5d08e33273d7f6ce7f0d80a88ed450cec50a647856f973343671a1f992e7b80af671fcbb90507b91d0036472d6e889f4aaa5686 SHA512 87a69ae5cfc1e0c1596330ca7032ac7a03b4de984d9c2aee766ace77d9ce8f14461f323fb5ce1e2c280b42308d699f078f5ba912537207ecc3cd646a72d50cce
+EBUILD icedtea-bin-3.10.0-r1.ebuild 4387 BLAKE2B 59c2c959ea97b31698aa0ccd14ef299fee806f396cc16a460ba71eb81982b1fee96f249189dedb2ea5aac8bdae463b2dff55dfbba5a704c46fbba5dd514c4018 SHA512 587fc838632fbaf176ce377c2e9ac0fe162ff45b2d9750799bdd216c11d3e3d643856298c2effa2e55223bb3f417eca6d5dfcdcaacadbd1f3659d79d0094e7eb
 EBUILD icedtea-bin-3.12.0.ebuild 4549 BLAKE2B 77861e6ee5c4d6872243c3f74cb52c81a7bb7192568a5e9436de0320d1cbd9c688d4d690e1c8a3d5ba976e1d63af95273cb310c92a672638c6de8749c10b0683 SHA512 24582891626aa33f30a94a001ff1d759e74904ee19b0fd2613e9f72a8fa5eea7e6a3a16cb9400554d3472d2daa5ed53156b880bd6d00d02a099b5f29f9b4e27a
 MISC metadata.xml 560 BLAKE2B f377bffd73661fbf1573f3d80906a38fa9fd170a686dee6c13ee7769ffadd8ff2de696d63cd7fdc4332ca654851da027b76e22389a98412b52b4fd5c00935429 SHA512 71613013231a9bf6daabb672557c3f419bd9443999b740a4d73fe242b827a278a66671f2cb347d20833008c332262609f7df03691e313e0dc0ec3e2a56e79565
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.10.0-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.10.0-r1.ebuild
index 8ee86e39e2fe..9dc6568062cc 100644
--- a/dev-java/icedtea-bin/icedtea-bin-3.10.0-r1.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-3.10.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 # Don't block arm. See bug #600134.
 #MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
-KEYWORDS="-* amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="-* amd64 ~arm arm64 ppc64 x86"
 
 inherit java-vm-2 multilib-build toolchain-funcs
 
diff --git a/dev-java/icedtea-sound/Manifest b/dev-java/icedtea-sound/Manifest
index 0959325bf35b..fd1cac4f9e87 100644
--- a/dev-java/icedtea-sound/Manifest
+++ b/dev-java/icedtea-sound/Manifest
@@ -1,3 +1,3 @@
 DIST icedtea-sound-1.0.1.tar.xz 1515308 BLAKE2B 4d9939e1bc0e0b331b032c3a54244960d61354d6b85b83cbbce1aeb96f2748906d5bd0936b36e2aacac526bd7927dbc0686a47a0dd0f41568ca86e3805b943ea SHA512 505d02f5ce885d4c7638cde8042a686aa3651de9072d325db6fefb8c5bd3d7de73253b27162555396e827a65f50aeed8326e99099757d5efe18d14ccebc1c07a
-EBUILD icedtea-sound-1.0.1.ebuild 858 BLAKE2B daa4efaa3b6b38bc54c6e531375adf6d7c566f5e5fa23941ef6c792cb357263f9a4419a8e6f0b5bc48a6ca78537cb94131384aa86e2ea7fa61899bcb8e5309e6 SHA512 ecfbd4a72ca1ac5a9ef9ee2d60f03a3be8ed4af23317017396bba3d0b68ebf06bde0fef1220ddbf9f38e64d3090a90ae85aed5589c9c932a2df6b7f0d0e017f3
+EBUILD icedtea-sound-1.0.1.ebuild 857 BLAKE2B e0c9c974b8e120a237eb2fe1c07f020fe6ed45741463a5addb29d2c86f1f0af82d5f0ad441b359fbc019decf10bbef2ab09c27300652651c2808bb470dc97bbf SHA512 3dfc82d61590332bb651c8189250ce804fb6140b73e09971f87e6e655c3d29efa81089bdf788befd53683d095ca5cb540c8f91b6fd135c0a68c822521a3df7f9
 MISC metadata.xml 502 BLAKE2B 956158234bf2b4cf3e69d59e5db820789235dba816167c1a64ae1c94e585996f14c75b72526c8344584950336fb273c094176b9dd042fc41baaadfa56f46e2b9 SHA512 2d7a91be3364f491b4402f6cd525ff8e27fd4ed27b89268817ccc9d8318f207a0b315827fdf12bae8a443751469ebc9987e0bd6f08857199f53b62f4db93c00e
diff --git a/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild b/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
index 52150dcdba3b..497d77c4f528 100644
--- a/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
+++ b/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.xz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 IUSE="+doc test"
 
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
index feddb7bb365b..8aa014ff96ad 100644
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@@ -7,5 +7,5 @@ AUX icedtea-web-1.6-unused-libs.patch 697 BLAKE2B ea140038785a4954ebfbc8dac7e547
 DIST icedtea-web-1.6.1.tar.gz 1776222 BLAKE2B e6141303b24e3b4a3a5568562f34c4a512250a1e16234c455d8ca04030324e11eb20134cd352d36c5d2c27769911558e0b739525bba9a58acf892fa5e7bb2b14 SHA512 dae39818f74a098289acd0736d27c2e68b10b603a3fb0a180cf4b6444345cbe71ab1ba77dfb198f053f9567bb18aa96de09049c3b595b3d292d142a7ae7d3ef9
 DIST icedtea-web-1.6.2.tar.gz 1824557 BLAKE2B 897155b528a873b2e0166f47973136c5ccc640fa9da26c934dc93deebacf2b2d714cd70943fc4f7eb2c596542e97656d844638dbd12f407f917d30c9cd75f4d7 SHA512 32c9618a575bf05d3fbe5fec3f8429d55036acde70bf7ccf40b59e14eba775d1f561640acbf673b1737a8c5c3a8eadb74e8f1bef525cfa6060e3f1968d45b3f7
 EBUILD icedtea-web-1.6.1-r1.ebuild 2245 BLAKE2B 86e91baf340e3ac8fd2e88dbc16b3f0d04565a0a5011167be5487676c3821b142b4b187167ee4eebd519310e61c8facfc680413cc3e1bb347f66b08ab4bd020f SHA512 37c9aefae8a58b59e455ae6614d6e57367f5f461f3f71c0bb1cdb8d5988fc3b513ec2977a953af7b1f20e0e4a8322413d8f8dd8feecb576768ec1624d99b8255
-EBUILD icedtea-web-1.6.2.ebuild 2114 BLAKE2B 5eec9454df55c9f027169bcae07e93cfb4e4591467524fd33040b6d44af7f6eb7ee2b2a3a6fbe307cab2fdeb00a6983ebbc3b4f324fa3019892e9225f078fd12 SHA512 5404a85384e133d3125a9305387f7d1808bec43e4d3491916c0ed737d3e31fa679b93a46a2ded1089337420573e75de5dd5c46cfeab7b51e8003ab086bb3bfe3
+EBUILD icedtea-web-1.6.2.ebuild 2110 BLAKE2B b0d8c5d7f7fda90e25f842f7da8e8676cb0bf8ff19d7eeae886679901fe8a919b1189439a55572c8dcad59a05f82b1a8ab383a5d5472656ffb0b059e107989fe SHA512 06b66744888ae211123c107ec2e012442872481e9d0897e1d505028b48ee13d4279b7acb8a8e5e0fb93d79700784ac880700e470be61776e393ebb40bbf32067
 MISC metadata.xml 653 BLAKE2B 4b0309721007539cdfcfc155039efd0dfdf2bcfccb1673cc4c930ee4267e73b5aa1c29b777a139dda6bb1c804fe827160366f59709843e9a03f66ecad41b3c8d SHA512 0b0cc5e6a5226dce345c2ebc01df0459ebaf4dc37d5241748bcba81d80e0429f599ab41d7a3e7020c581eb0c40825f07ad37e5340dbf643240ebb9830c0d500c
diff --git a/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild b/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild
index 8ff8c11bb7d6..d680ff97d0cb 100644
--- a/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ HOMEPAGE="http://icedtea.classpath.org"
 SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
 LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE="doc javascript nsplugin tagsoup test"
 RESTRICT="test"
 
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 52ae123df1db..43695b19b429 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,4 +1,4 @@
 AUX java-config-2.2.0-prefix.patch 653 BLAKE2B 837f741e45b8228944e6287a57b05e933d85db00375ea68690e32b101da45b8150bcc6665d1d03ed6836724bbe43c4bfe1e89fb9449723fb4532dca4f4dcf01a SHA512 591591828ddadf76b5ed65811f7ed9e1e60583c5575926edf175ebc7ed1d76562ec980ec3bb530dedc7626f841dc7d143383bad25303399eac2ad49328d63dc0
 DIST java-config-2.2.0.tar.bz2 51851 BLAKE2B 7b7c15dc988d2f5f54ebacba224f57193577e24f99a798657b40d83d723280562e314ba71319958a83be44defc6a48ac1114cce37eaeddea025ea31f26cf331a SHA512 a491cfe86bde8afadfc5b875740d79f9077526d8650ffb034fdad67a7ffa1b02646f67b1ef0eab7b0fe3ae57b5d767fa6a0d5593fe07416993d60588a8ed595a
-EBUILD java-config-2.2.0-r4.ebuild 1092 BLAKE2B 863a02cd241a94d3bdff5023ec2a4ada4404368bfbdfe31d95b69f09b31a070bf5df59b6c2609e4f7bbeed17d79a7e23e7d406a7f0d9e1d375983efd998b0b9c SHA512 3cc00a8c4055786ac18c1880390c0bd7d6169bb17835017fd9285ea985ac29d727a964e6c1ef84d44fbbb20d547f0b603198d780cfe052711b38e3651af40329
+EBUILD java-config-2.2.0-r4.ebuild 977 BLAKE2B 5c84e00e02608c0402f7c0aab63f3a4d580027cda0723e4c34a44b66c5ab37b0c95668302ecc94e26859abbdbab8a49266a292620eeff3290a71306510897cf9 SHA512 be2f4b043634cc9b0b80678e798e90075fcc0bc621e0c688efa31fd78bc4c73b064be225857e84d4b75f0090fa42f31701f3ba2a3c0973d8c661bd1fabfd80de
 MISC metadata.xml 560 BLAKE2B a2cc44cb88cb8e0b80ef1fb56ed610fc10257a0858725fc01f793ae9275fc5ef6e37708c377ccf56425c08eacceea6e52a84eee35a7b2c239484080b6203c4d7 SHA512 9bd085048548f98faa638b23333ee0cf83b870c962b1aba62fa2df897393ce37c2b2e60736c988230252f29fc42e9dbe58ab8e720f7ec05a3e0b3d4c999e2c8a
diff --git a/dev-java/java-config/java-config-2.2.0-r4.ebuild b/dev-java/java-config/java-config-2.2.0-r4.ebuild
index 7026650e464e..5ab370d88996 100644
--- a/dev-java/java-config/java-config-2.2.0-r4.ebuild
+++ b/dev-java/java-config/java-config-2.2.0-r4.ebuild
@@ -14,24 +14,16 @@ SRC_URI="https://dev.gentoo.org/~gyakovlev/distfiles/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE="test"
 
-DEPEND="test? (
-		|| (
-			sys-apps/portage[${PYTHON_USEDEP}]
-			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-		)
-	)"
+DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
 
 # baselayout-java is added as a dep till it can be added to eclass.
 RDEPEND="
 	!dev-java/java-config-wrapper
 	sys-apps/baselayout-java
-	|| (
-		sys-apps/portage[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-	)"
+	sys-apps/portage[${PYTHON_USEDEP}]"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.2.0-prefix.patch )
 
diff --git a/dev-java/javacup/Manifest b/dev-java/javacup/Manifest
index 4bc1966ed590..15d1e9888ca7 100644
--- a/dev-java/javacup/Manifest
+++ b/dev-java/javacup/Manifest
@@ -1,4 +1,4 @@
 AUX javacup-0.11b_beta20150326-build-xml-svn.patch 1385 BLAKE2B 43ed5b0c75aa308f2301d8e7d633ca69689a1772a7d8f0f7dbd6f914f1bbf571dcef0ac9fb9cacbe07aaa8c50fca69f0fa95f661314dfab2c16ac96ad50f11f7 SHA512 211157370c61995a05ce45e70941d99da9031174fae2b6e4bbacfdd0c402c451009eb5952a8c3cf8a586402aa138e70733dfd46ce9cf6b5fb680edf65657506c
 DIST java-cup-src-11b-20151001.tar.gz 313405 BLAKE2B 126944916d120dd2150e4a665fea6d216f3d55e002a72b581621df726e4bf0e0664f9ff925189c97162582277c08a4f121e056299ea5a3f5c10cc31d7c0feb9c SHA512 70bb6a0e13fe52694980040205fcf5b3e904c4a07e50c7740c55cc3bb481496c5c071377757b94f59807b936b8c4fdde5423d78cc2d12a7ada1870f71cd9f47e
-EBUILD javacup-0.11b_p20151001.ebuild 2813 BLAKE2B b4a86c461fbee7fdac2a5413e88c333e01ba4fbbaef709b55db89e0bd976aaf4c740e1df91905857fc339c4686091d2d975478a42f5cf42bb4cd3edd1202cd5d SHA512 cc39cff092b0b3abdc5706ee85a30024d03fcdc2424bc845331bb486f78c192625321b0a44f932bf8e5df9b14d0cc12a482ac7218578ae0c8d8a09d5a78aa4d4
+EBUILD javacup-0.11b_p20151001.ebuild 2809 BLAKE2B 76a0cc3771df9024b9a7235aee6bcef6f4801e134cf556007250d7fd6d376dbc85c5e422ebf092593836326adda8513cae75b045db1719ee864c2607f20d9645 SHA512 edd6c3e780a36fb98ba7b51c9415b5b88852aed0f1ddbdc6519910f9dc697af3af11de0475a02fffaebc90be468e659f3a34eae570616992d247136721d198f7
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/javacup/javacup-0.11b_p20151001.ebuild b/dev-java/javacup/javacup-0.11b_p20151001.ebuild
index bd0ec5820966..0f29803d09c1 100644
--- a/dev-java/javacup/javacup-0.11b_p20151001.ebuild
+++ b/dev-java/javacup/javacup-0.11b_p20151001.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -17,7 +17,7 @@ HOMEPAGE="http://www2.cs.tum.edu/projects/cup/"
 SRC_URI="http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${MY_PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~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"
 
 DEPEND=">=virtual/jdk-1.7
 	>=dev-java/ant-core-1.7.0:0
diff --git a/dev-java/javatoolkit/Manifest b/dev-java/javatoolkit/Manifest
index d4062a23273e..ed9a873398b0 100644
--- a/dev-java/javatoolkit/Manifest
+++ b/dev-java/javatoolkit/Manifest
@@ -2,7 +2,7 @@ AUX javatoolkit-0.3.0-no-pyxml.patch 1128 BLAKE2B f0bad195ad20c5158f1ec84269b421
 AUX javatoolkit-0.3.0-python2.6.patch 413 BLAKE2B 0520b5ee7ebed18e0c3531d99d89a790d68277003713ff8dc9034adc2f4756b5f514ffcb464eb52ed827ad9d2e61d54ad5e4f401af4e7084c2a41fa591801ff0 SHA512 54df3c263a4b8f42457eb848f3fd79ef83953cfc1069c9229e339a178d2363bdaa636ec11ea49dbf5693c5eafe4d123942bf06f3b77b80b0cd8de2177045952c
 DIST javatoolkit-0.3.0.tar.bz2 16823 BLAKE2B a19307053e0ae4e2415449470c16fced90440fbc9f36d250be3c22a82b901b7f46486c8c7512784f9fe462bf3ab3109ecd7482bff13737a1c7dda57ef0aaf3eb SHA512 e7bbe04e39ab277d0aab89f0eea963c4b0341a336660dab08bfad0510ad1b2b49ce7410a2363bcf9ebad5f8757ee254ddc27af642b4bfb374db52d82cf02c3b1
 DIST javatoolkit-0.6.0.tar.bz2 26009 BLAKE2B d99695ee6dd9df2eef3612418aee4b28acfef06042e633abd05d8876d054c25499f4fcc15f2446adb28c08d4715cf1c1425c358324a7c323604b9f218aba5db2 SHA512 ab17ce59032286af30f238a3f0b37b5ebee2bcfbf4029239fce5f691265f87dfec3a7b29972a3d03aebe79ec22c435c2e37ca0e009fd8d53a58e7424a5e61409
-EBUILD javatoolkit-0.3.0-r9.ebuild 892 BLAKE2B d482eafeef50138a13c9f26c954d64a1dc342bed789c116fdd7d3fe76123d1fbf1c0b052d94a5457bbfb0e0eae4af079c58299b608271bde9399f106da6b0f49 SHA512 a0e91098feee018748081220a78ffbd3e59bc85bba891037a954d4e39e238bed64cbd356c324e90a13823b07bb86a984712db5b6e2dc1e375f138cc7a25b5201
+EBUILD javatoolkit-0.3.0-r9.ebuild 888 BLAKE2B 046e65b74a8cf478d6c3bcda668c47be15818c63b95fd32b357b9c4a24d458d8be24a48937d4f4fab6326fe5ac4f649e5571049de74602b7d4a620f82b90c04a SHA512 73692e960858bc62c61aca95f224021552f74298a11667f1e48e0ba514fea47bc2e4118adcbb590b5e5425fda7b20a17d33e4e0ca1c931375a05a3b9fdc46f92
 EBUILD javatoolkit-0.6.0.ebuild 832 BLAKE2B e81d4e7cb2f98cbec94475ac1293825db46b20554b1c614686c628988a3814760bc48189738cd0759d60f1ee46ac871b6591a848fb6d2ee6674fbc455c27e646 SHA512 6dbbc6731aa7ad8c624328d12efab4dd479768ef37fe606256dd3f3c88aefeb803bbbb836bfb2a6149dd67ae1275942c33230039b04e4e622c8874cb24a2eccd
 EBUILD javatoolkit-9999.ebuild 676 BLAKE2B cd8e02bb65fd37d6eb50e7283dbd74ff9c1a9636056e83069693612c0760858f9f4ea2498545cc860872fbfe704c617068423adc483ed90c9f6386826452d2cd SHA512 56812eb6eceac6151ce6ff573cd7ed2d936a5188c84571bfcbf285d9077fb5dd1219a4938062f238f3d3187c79998deb09b1fa2b7f7fea965dee8a35ebfbcbf4
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild b/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
index 8452d0182b88..f85943441ca1 100644
--- a/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 python_prepare_all() {
diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index adc4782eec9c..a1a9995068a1 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1,7 +1,7 @@
 AUX jaxen-1.1.4_maven1-build.xml 13148 BLAKE2B c5f6421878e732db00b2d5daede8d93cdf1d349c1dfdbb6f83a607d734dc05f0847ce5f8cc86ec1a2be5855d96dfc1a3128c0811846f4a5c7679dd60ad730c12 SHA512 2f3625a2a14066289b20e1118a87168e6cf1ce252becdccbc6f4eeefac446e528298e1e6af7d1304ff9d1d4ee8c394c2cf67f6799d3062091d53cce7ff5b1e42
 DIST jaxen-1.1.4-src.tar.gz 268493 BLAKE2B ff51cf3b6507f19549ab864fa4cd53d0b2d0c34a21a944d22feed74d58fb71c0273f5b560cc9c02aa50748f672115e77fab24a2d986508841d6a0ba4b8911690 SHA512 11c1c744af030c50579f872d8c8bf437e48ab4a01e6dd34529f2d9039c154533edaa9b5a367a866e2b57f311f1111717be300db8f80423c5492be38e0cffc031
 DIST jaxen-1.1.6.jar 409677 BLAKE2B 55e03939420c103fb5a6d323595ff0cb7653885eb9ba233fd581c5376d2ac90eecde7aa5576f602cdc459cfd9ba9e79c6bb5bfab3ed7805e717a21670a5748ee SHA512 979044fe959493eb6d66fa92b420251cd9c12414051ff6956d5835888a8999d4f337c18646c53806fc19203cef744f53b7597850cd2f695910c90df7a9725b48
-EBUILD jaxen-1.1.4-r1.ebuild 1090 BLAKE2B c28b7b787c6ea71c7d8a571196be139f1808584d79c986f634663d3aaf4d71917706f74a064c5811d9341734bdb47e02a48836379e90bc7fad5f7f4dc489052e SHA512 26f400c5aedc4449ff42ab48f503c28997e45d99cf76b8c8c18dd1378c19cf9df9c032c968faa47e7cc0a5b02410a115002a1f74ca0d1ef2b8aae186b652fbf8
+EBUILD jaxen-1.1.4-r1.ebuild 1093 BLAKE2B 0e47f2c480364aba8866fbe784575a2ab06551c6887a74039937729f5e0a73e9a5d99db8dfaf31deccf13274433bdd1b350879d0bb6edde88c8ce6cf0300fb3f SHA512 ef571e18bd273a59d179dcfeebb52babfc31696ab9329abbd7a27b63be4be9af22c39050490b644f01becb13057aec1c9425a99283107c472dbd1a0587d863d9
 EBUILD jaxen-1.1.6-r1.ebuild 886 BLAKE2B 9bdcae339d701ba219baa7ba9fea620f6107cbbab7e14baa7533ef14d7b8cb5450af23044cdcb11af32273bf260fd366294a6a5348c957850c657c996e9a6b50 SHA512 2facca63e346083a6842c004d048ca819668668f78dd8444f88a3d6425c785828178a2a482608c4b02395e2340e4405c8a87a78b9643e83fe8f2bdb92ac7c104
 EBUILD jaxen-1.1.6.ebuild 613 BLAKE2B 7f5654f3b927954ff7511664248e6083fa7b3019e1fa893e356175a27fd40d812f8ef0470fbf9c1cff8906e87048b9d808c9d377f8c7e872662339ce821b2690 SHA512 4bb8b4f2c124f9eac8e96ce99cb32d39dd04c46e6e17b7217f8791d417ce8dc87067d611df50967a2caec67265fdb14aac9d0f28a57c4bfe88f941bd860bf91e
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jaxen/jaxen-1.1.4-r1.ebuild b/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
index c9891f11b423..7b7eabf75220 100644
--- a/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}-src.tar.gz"
 
 LICENSE="JDOM"
 SLOT="1.1"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index 2baa7d8fc191..a1cecfe703cd 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,6 +1,6 @@
 AUX build-xml-2.patch 1529 BLAKE2B 37aee7dc0ab5b130c16a67b2470e8e3d4052b73c9cc944fc5f1e6cf5b1c8d57d046260829f7a785a0f7b35240318fc9bbcb28fc10b245981dd36957637084fa3 SHA512 210f0fa113a75a0bb2f34b50e3893df69e5b7f02174f7f10ea981cd16371da515a6c8514c2f82045c3a6a64c5a11874b2f81e5ad975270f11eb8c12fa707f563
 DIST JDOM-2.0.6.tar.gz 8344114 BLAKE2B 0b9a568fe4de1fb9afc5a547d75aa1d3556bf497c76e3d32d1ebd7658634ea02e4fafa3c6261b64d9b803fc6e78ae013fb8a366bcbd5024e8ab0aced83f58e33 SHA512 d585b39159f0887485b2e681609b51113de6bc7c43627c42d7e81eb06ac65c507b43cf3d81c5df4399b1e3abf454c8852264a84567940bc5ba0c358eb9c0c4a1
 DIST jdom-1.1.3.tar.gz 4233403 BLAKE2B 9e4afacc6f10d2be1d793bd3b9f438f79e8e27f50bcae83eac5054df806c01c211ac493465bcda58ac204e796663ffb8aedf43a177f23c23a69af399243461a0 SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278
-EBUILD jdom-1.1.3.ebuild 1257 BLAKE2B 9d7d93ab036539abbe0d945e7b7f0767b0e7d0a3f39ec68f7bb20047ad5182bb283160e9fe3484d5cad853b17479947ae3e1edfb1113c76483b8c4da4d70fa84 SHA512 91cbb5345d46dcd100384da0f249749dc840aaddc90f4d525ae14dc22e2dcff06d8649713d343e81de1c5d9cb99c5559adcd23156a7be33e6be5ac428ab6be41
+EBUILD jdom-1.1.3.ebuild 1253 BLAKE2B 7b79acd0573e7b67b9c4fad200cf3e9500575aa452c773f6fa5856a500b62825b31d09d1b80d76df81674a857cd5a57dd6404d2b799aede87bd158bac2d9e66d SHA512 fd7aa96f0eba2719d98a02aa6f3e95528d399c096ada58d3db320f7eb113cca1f2da1754c2a0c653b52cecbd4de9f90ee1bd415616c8bc1204977aba6330c7ec
 EBUILD jdom-2.0.6-r4.ebuild 1358 BLAKE2B a55b3a295f11d855d15cd2ab4f91a0fc8805aa8881cf2f374d970c4b43ef829add955b283ba410202d370c0eb53777f87e943d54868d2ff0c0e327c6160cdf11 SHA512 32aaaca3059544b6aaae40545f3350799efd730cf790d5acb101886b3534f6b21d75df5bfc9e2addb0964cf5466a5f527a0ea127eeab2045b70ebbda9d488b01
 MISC metadata.xml 318 BLAKE2B cbcc3f9c0ce67aa9619d21197006bffc71f6ae3d0707a5bdd3902a0d51f90724f3ce81e21c80f6a011885cd036f397d2cb679335d05a0e1bf7e4bff3470c9019 SHA512 1587f961d80cba775d94e97a9c41516766d6a502f9b144f401ebcd0ee0b21b2e04220730c03a44986af8bc860a0311acdd6e721d4de201defcbc89599df5803b
diff --git a/dev-java/jdom/jdom-1.1.3.ebuild b/dev-java/jdom/jdom-1.1.3.ebuild
index 50b12a26e0cf..8fc3d32e45a6 100644
--- a/dev-java/jdom/jdom-1.1.3.ebuild
+++ b/dev-java/jdom/jdom-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.jdom.org/dist/binary/archive/${P}.tar.gz"
 HOMEPAGE="http://www.jdom.org"
 LICENSE="JDOM"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest
index 69bb1b8f4c3a..b7cfa080e716 100644
--- a/dev-java/jflex/Manifest
+++ b/dev-java/jflex/Manifest
@@ -1,4 +1,4 @@
 AUX icedtea-arm.patch 710 BLAKE2B dc479f8db4f1188ecb63708700d1ef0905590aba6b552b573c9fc05027e195d2dc1143542ca1998a5a6feac53af4ef64326da3f746f8aff1149b0bb01a3793a9 SHA512 9ebf22f2771672bb9ef28fcb7eff0d907e9fe4466b18b3ec3915b27caa2edb07934a47311abf41fbe124b484cccbb19ca68f69acd5bd76e46a49b029dbf275b6
 DIST jflex-1.6.1.tar.gz 3027791 BLAKE2B 4262f75c16a847314db8cb175901658ff6b424469e66523b41564179fa30f0e64bcf2d7ad0e06ad918336e5a41e166a74d55f19f7451662d19fbcaa29f716dce SHA512 436840c90d906042205d27e1d3c56dec724bf62cc3d8c8d3445f217af0a50c9ca2bb56ed91f0cd3c37a930f7ca22f4cc50e8c28dbe905f02adf695c8e96fb07b
-EBUILD jflex-1.6.1.ebuild 3536 BLAKE2B e05d525af00a7154238def050204aed0ab16991358714a4a7536be6a50adc89d651c6526c6e2563255ec1f8dcfb81b1431037fcbcbdd3831ce99367511938f41 SHA512 145ae0fe9106a6835070faf0a83bae46a8e46842ef2c8041e5f8bb9fbecd94051f8e252248434cefb2b82344a448e7b8886becb925673f072c85145ac43989a9
+EBUILD jflex-1.6.1.ebuild 3532 BLAKE2B 856a902a68a9b26d92e2eeba080ab3bf52eb8e3ef4fe125505df2d6351807d40d90a7571c91aae52eb6c8b0cd0f69d3fea9ddd69405c485bebe924762c18ee7d SHA512 d4d38d66b90fb7b2e45a2a20be5434472e9accc92751e6e08b00a62377214ae4c7063ac2def81ce9e827adf15687d7192286d1a4e45806c3088b584f09473e0b
 MISC metadata.xml 365 BLAKE2B 59ac73e145626ce1448d4edef5ad2b115fcf762d368131b3b59438e3d21a8f4aaee0d56723a3c79539b7806caa8c456acf0554ce22333b097caf9f3f07dc8014 SHA512 cb20e2901f90975ffa7722c69edbc884b0f6ebc7500636e6ea41668754e8d8dd4732a71774dbb74a7d38240b2fbd6c1941adfc092fe83154e1ee70f6ab89e379
diff --git a/dev-java/jflex/jflex-1.6.1.ebuild b/dev-java/jflex/jflex-1.6.1.ebuild
index e5f745463c4c..2990735567f4 100644
--- a/dev-java/jflex/jflex-1.6.1.ebuild
+++ b/dev-java/jflex/jflex-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.jflex.de/"
 SRC_URI="http://${PN}.de/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples test vim-syntax"
 
 CDEPEND="dev-java/ant-core:0"
diff --git a/dev-java/jmock/Manifest b/dev-java/jmock/Manifest
index fdd789c787c0..34b4baeabe05 100644
--- a/dev-java/jmock/Manifest
+++ b/dev-java/jmock/Manifest
@@ -1,6 +1,6 @@
 AUX jmock-1.2.0-AbstractMo.patch 1189 BLAKE2B d10edde92384c86c2cbf9605cffcf25aa0acbd073e8803b88cccca2b4b94839e28458cb02f647cb492615836e7df02562329fb6135876c2a39fe5bb8fa7766bd SHA512 b4d59d16c2c513031b3b36fc2bdf4526cee8bfa405cac4c2c76d850289a835ba6e57d4e042ed4afe2814a217dcc1493afe80af9fd17fa066d1ada96af6dfa663
 DIST jmock-1.2.0-jars.zip 153214 BLAKE2B 2c40696229018406f3b60559013b73b5331c223da6e2743830c4c9b8b728484b1ebed8fb347c240f50f6936c2fd1e4ee85b754315682047a87a14414effc3a48 SHA512 5290f1d14cbc3d0f223bdaf59716b037dbc021c8f39a3784d13af8d8be3edbddc5e2eb4754b80e78ae954daf12889210183e7e11c110012b4d9320344efe19da
 DIST jmock-2.6.1-jars.zip 1249841 BLAKE2B 87861dad7151000e1397a54d0ded7e49c3fd81fca64afd74d6176436f336be5b5e89f73be8c124cf086798f74aef4972303137529113e3c85ba93353f95e3a42 SHA512 7cd1d2e89dceb31c68ad3f702ad937b5de6ec77cc37e94be7aa53db2fc61d11aa40ec5aab225a3eeeba5064ad8384f10413ac05a9df97102c8e63f4209ea149e
-EBUILD jmock-1.2.0-r1.ebuild 986 BLAKE2B a93c5e07830ed1dc6f2b92da16a796452ebfb74411555ea11e15d1ea0d7d8e5e1277184811723f2a44d97085bd879ffdc2a1a08fff1eb30be19a81693e3b1060 SHA512 336584062f37ef805f0320ec17562f9547900c11a0f24d7d450401acb544f1f1954c035e4d1ba5156cf8739d473d880ed5ff61816504258b4d9d4d468edfa675
+EBUILD jmock-1.2.0-r1.ebuild 982 BLAKE2B 3a54d28e26962d0d42eae18358300b6d4e34a580d1b57969e6e3aba55cd0fb3c3f3752d0b645c736a420ad370e25a826813f929feda25574552b3f22ccabf42c SHA512 794064652eccec3db0b5ba1aa34b3abfc942ae3a8df5b9b415703919f2cfd46915a45736949a9fbbb0c804312e049df3dfe9bc0342a828d2c431e0e689ecb9e2
 EBUILD jmock-2.6.1.ebuild 812 BLAKE2B 3d72677eb23caf056604dc2c799b1344cc38080fad875edbfe87c3e4f6dcb5f94dc7ad6ad8204f58770d1dbfef57061e0a47e84707511d837a71dfbba917d7b2 SHA512 a1cad09703ea22c47a6e898daa43764c708eb2ab400674e7efeb4b0d61451de1d0153495f81d42ccfa23a73ca4884df841f5262a148cf7c284d609874a9624c7
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jmock/jmock-1.2.0-r1.ebuild b/dev-java/jmock/jmock-1.2.0-r1.ebuild
index 30bbbb34de42..06a2670cff1b 100644
--- a/dev-java/jmock/jmock-1.2.0-r1.ebuild
+++ b/dev-java/jmock/jmock-1.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.jmock.org/"
 
 LICENSE="BSD"
 SLOT="1.0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 CDEPEND="dev-java/junit:0"
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index 75d4641b7879..22e6d465db05 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,5 +1,5 @@
 DIST junit3.8.2.zip 461426 BLAKE2B 8fbef1ccdf7f71c611976d63f45838f4cb2564da5f5064e7abc39931a3c99039a40660093aba2cc3c70af761171125f434c16c52021226f2e92fdf23597dbf25 SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930
 DIST junit4-r4.12.tar.gz 443804 BLAKE2B b36248266eb83d8f2dfb1c525f635a4fce5a46c6042652ef27a5d405b83c471848edf83e799a4d1e950d83e127caa288f453edf19959a9a8aa5a9e26eeb4e771 SHA512 ba612598fa6c328e8f4bbea3afda08b459a110837ca3805a62e811535f7bca8d04509f8fe51a413c7bc855fccee35d6946c9eece4dd01726d12454c002a4de32
-EBUILD junit-3.8.2-r2.ebuild 825 BLAKE2B 34421948bc01948ec4558d90a5095580618dc7f39772035c838fffec10f9fcb367c600ec73a5f464a91688179062a4b187bc4cd3a888f5553677816002bcc52a SHA512 5af2dda815227e335267a0993fbd9064b03f411adf886f6dc38f06a44b169103f051f1e9914d0895bef40525765c04527bde431cbf125794e13430a60e30f990
-EBUILD junit-4.12-r1.ebuild 1464 BLAKE2B c5c998dca82ed919aef941435b371d5f5788afbbe952b22f976740d53a37d8daeb6851e5c74c2d2ac6d9c066cb75f777372f272c5af4095e59f0adb80b980316 SHA512 a2f0b67b093f7bc86ac7a671bd66b69e67d561140ceffbf21e5ac5a3ebe935cb2bc3907b5f3bfae2248f6f6b2561d02e4afd327877adc8f761b393687306ee29
+EBUILD junit-3.8.2-r2.ebuild 824 BLAKE2B eaf4fa5b7bb42f945f1ed3fe444234d91efc02d6fc93e8238c7f4a8015b6a63c53376f775b2972cb10215c9afbfc13a499ae6b48f89d53921c0f2f8b9626ef4b SHA512 94fd353a30abb032d9847e2f22ee22b2b05de25310ac2671247a66efdb2b33eb43dfa2a10f0e3db02604f42ada9b0b6740f84bdb61972b2b72efd711470e3a9a
+EBUILD junit-4.12-r1.ebuild 1460 BLAKE2B e1f1c8af5405514e0cb2dd165c62d84eb0d8a50ffdd44a1afbf817d4fc977da72d08c07a3e842b272fb1d01610adb3707e4c8c44855248d4bb048dc99e6e7d4d SHA512 1ad3ac18cca913636d1bf51ad3721b5df4a1b3702e700944c5f637a32a436a7320e9f0a9b2c473857b20b3f895aeef80891831598044850886ff960eb60ac9ce
 MISC metadata.xml 367 BLAKE2B 7cd798ae028c83275e61522be10a35abba419a823042be242ee7fdf7e0ccfc978e817affaaf154b8d0723f502499f17bb81b0622fa493dc812b82ad23dfa647b SHA512 44e492dfaaa9faf54f4aaf420d5816da8d117951d6a52e37c76a9e533fcefbeaa3c44bafa4d525f878deb3af2b7f426e72a62b16464e85ce9690c61b1f0da71f
diff --git a/dev-java/junit/junit-3.8.2-r2.ebuild b/dev-java/junit/junit-3.8.2-r2.ebuild
index 95e8f4c93c8e..043428932153 100644
--- a/dev-java/junit/junit-3.8.2-r2.ebuild
+++ b/dev-java/junit/junit-3.8.2-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 HOMEPAGE="http://www.junit.org/"
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~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"
 
 DEPEND=">=virtual/jdk-1.6"
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/junit/junit-4.12-r1.ebuild b/dev-java/junit/junit-4.12-r1.ebuild
index f3190da6c338..d0a50caac8b4 100644
--- a/dev-java/junit/junit-4.12-r1.ebuild
+++ b/dev-java/junit/junit-4.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}-team/${MY_PN}/archive/r${PV}.tar.gz -> ${MY_P}
 HOMEPAGE="http://junit.org/"
 LICENSE="EPL-1.0"
 SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 CDEPEND="dev-java/hamcrest-core:1.3"
diff --git a/dev-java/junitperf/Manifest b/dev-java/junitperf/Manifest
index b3d04acd9992..06372a6c70cc 100644
--- a/dev-java/junitperf/Manifest
+++ b/dev-java/junitperf/Manifest
@@ -1,3 +1,3 @@
 DIST junitperf-1.9.1.zip 110600 BLAKE2B f3f1467382da532d104fb1236607c72f2984f00e98eb9ae931df6cfdd8235f075e485f2cdb21a9837a866ea00fd4d07a55ed80c29c9a74871890441519a551a9 SHA512 35fd3cddf5643ede31a89f39e0149ceb5a07c97521bcb4e661fce32b08a5299064f6b52828889d4918485f3ca000f6020dd6cec802d8b1579f46bd861ad74b1b
-EBUILD junitperf-1.9.1-r2.ebuild 1033 BLAKE2B f0f6b4d75506748c872f6565f49dd8ffba6d95b2c9ed4de16f3c774ff521d68b3ff8bba79ab53bbf4b9eebc949350a9a9342530663857dd3de72bb0bd8aa3a78 SHA512 7cc0448e771002305887038f09a952369a3fc93688911dbcf39bab595bf0190b11d4166367602fb578b6f41db32b4f70ff7ca03bb9f6674f7d087ef67290cb4c
+EBUILD junitperf-1.9.1-r2.ebuild 1029 BLAKE2B b35a8b6b6551c71fb65ad7d8243b5747f5de71489cc91df07106649384b8122f8975c91c06b723643359e152fc376fee4b75812bc299a4c2437c1498af291671 SHA512 59a1bf0355241154f1ae6cc00fd61ab81d6193add96baba9b1c7dfe704852a4f2aa8acc0b49c6f13daaea48a5bfc5dec3e35a5deb9376460210109fd81863507
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/junitperf/junitperf-1.9.1-r2.ebuild b/dev-java/junitperf/junitperf-1.9.1-r2.ebuild
index 147b97e61da2..14f04e6e3b16 100644
--- a/dev-java/junitperf/junitperf-1.9.1-r2.ebuild
+++ b/dev-java/junitperf/junitperf-1.9.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://www.clarkware.com/software/${P}.zip"
 HOMEPAGE="http://www.clarkware.com/software/JUnitPerf.html"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE=""
 
diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest
index ac8eb533fc33..5197dde3dacc 100644
--- a/dev-java/qdox/Manifest
+++ b/dev-java/qdox/Manifest
@@ -1,6 +1,6 @@
 AUX jflex-1.6.1.patch 680 BLAKE2B 2dba9bdba8ce77ebe28a608b505891ff49d51e9d7549bb17f21935ad9511fcdf4428a79b5243e5eb8cfb5747eaaaafb97eb6edca980ce337d37ed48772ff5ea5 SHA512 73e8067a31392a1975877470a2a239c9ca0913f807faa3e5c660bc2487dca9a46c1753ab86526e66581111fcded89229a4e9e3a16fa787ce3669ef6c07a28081
 DIST qdox-1.12.1.tar.gz 519833 BLAKE2B 83a732f1582b714cf943ede61bacc5216804c00cfbb642a479afb74739564f4fdbcd923dd7cb84a9626a97c5ad0a0f04895e0ae68252891cb25299e1fe1c9c72 SHA512 17ac933854ebd0560921805ea4339c151a7fd095bf8d50d5d71e656afda77ba30efac7926cfcc7543e4a8420b12d1eb75cdd305c50d1c28ad8cd6b0f4d95f5c5
 DIST qdox-1.6.3.jar 63731 BLAKE2B 77d117f0f76f531f9320b5eb3650db315aab838d5d79a9df8997649b498b375db3fb0c694ea8b5911512097dd2325554d7599bed51a978e38af6fa55600d7c24 SHA512 0b05620809e3830c7e12c289cd4765f96d845adabc1f09497993bd9f39852784f454eb4aff1deecb325608a5773e86fbb1f5863e0f25387805472b59b46cf965
-EBUILD qdox-1.12.1-r1.ebuild 2190 BLAKE2B 6ed08cbbbfd4fbc8eb710095e310b8c2a795039db3f3da520dbe2713d043dff08710747e1bee1f6fc10f51bf3a31e0cc7428948c4d6125499c40bbfe79465c98 SHA512 bae61bdf03378a6053c40b3663a8ee4d011520366a115364b02e90b54f55074cd4639201ac0ec46aecaaee1588b8b9894ca1b5544fd74b171f2344aa614e9376
+EBUILD qdox-1.12.1-r1.ebuild 2186 BLAKE2B 1e382e501f402279c3986fe567a951fe94383768c25eb2f4450b8d3ec51f6f05f09c98a7e78b97416399a7a05b614c72821e7fed36e0eda43388b2eec0665707 SHA512 1b17f679a68677f14c8a974190037b8600573436e1560160225b3b77db21fbbe97efde507a2aaa32952387df186a693c993869383623137d7f13513bb4c39e1a
 EBUILD qdox-1.6.3-r1.ebuild 718 BLAKE2B 806682589082bffff8ee32ffc55b9feae2b68750c65f1c683c5818af07c4c7a6763529e9cfae74ae11c02400e947dc23fc68c0e5ea761aaf3faeb2043ec07d98 SHA512 d3b285b8a4bedf556e631a20494998e748e3d066e72a058bd5bf3d0ebea59a28c7368e58bf4965459d17b7fbb17a2fc122e10eeacb2bec37afb0f70232c13b2e
 MISC metadata.xml 489 BLAKE2B 88377b6fe8ec7278767a18b227778e6f5ec320221fc7293090c67ea268b695de6b131a08172031cc08d3baf8bfd347da0d18bc2ae5c632026eccf20b9d958267 SHA512 709f38b7f8bb7fabd77d9c17a15e537b7c5b46d6c3e203f24847377980ad6afe55adede125b703215b3ab00ad6cb02b8994b75a3db2a4b1b556775bb9f00ee8d
diff --git a/dev-java/qdox/qdox-1.12.1-r1.ebuild b/dev-java/qdox/qdox-1.12.1-r1.ebuild
index f471a8ddecd7..7100ae1aba62 100644
--- a/dev-java/qdox/qdox-1.12.1-r1.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/codehaus/qdox/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.12"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${PN}-${PN}-${PV}"
 
diff --git a/dev-java/relaxng-datatype/Manifest b/dev-java/relaxng-datatype/Manifest
index d2e235f00b73..bae500a49216 100644
--- a/dev-java/relaxng-datatype/Manifest
+++ b/dev-java/relaxng-datatype/Manifest
@@ -1,3 +1,3 @@
 DIST relaxng-datatype-1.0.zip 74033 BLAKE2B 15b488e914cab28fb9ade71b491d961ffa4f683f66759e96cd53dcf69edd39d423b5562831698bb3e03191396c86a2a93369f14d278f3c55a90728031d1921d3 SHA512 712b99209e927e8929c46797cf3733993cc2740bfbafb458c518e5e130a7860a19dee45acd360a9d7179137f9340c3edeb514cacf501233cca515b38e60d6b79
-EBUILD relaxng-datatype-1.0-r2.ebuild 764 BLAKE2B 3115e7a4cbd43f7756f2a580ff63f73b5ba829bb01fc09e694c0368ec241138cc9dad7a695d43deb78a7499def4b27f33d68300894ede11f9cf101ecfb036dd8 SHA512 1d9c0a893e66ea67d1eb07d0db596390d5d15a8b2ccce89c9ca22c726de6df82810d49e15e1473dd5d3d607d652d310e6876123fe625d857482b5270b45e25d6
+EBUILD relaxng-datatype-1.0-r2.ebuild 760 BLAKE2B 0839f4b91de54ebfa1b258676492299434146a9a4fddb1ab08684bb97b3f37f9b2b02edaa147c42516d4503a59c83269d0609e3207ee5475bfc342488f7a373f SHA512 f61619e652284531ad0c298caa33d72eccf739867960e1bb151e37e7d2736beb17477fd15e5f55f27cd281ba10d3af31f29bd49b3264f05c233e4520d8970ec4
 MISC metadata.xml 313 BLAKE2B 151379a0c11efd556a9c630fdbc52358ba2ca7baa4a4701526d65d394c1fcc0ccce38f4b874e47b669c3cade9c6faaf0b5bb42ff1a652809c60cc039eac9a582 SHA512 97bbf1c308f5f2436f0c24dac17f5219cc71a8e9882037f9bf59689f75524521ea42c63989491779ca59fd2878e2c478779ed6945fcf2eab661f28be3d9e2a4b
diff --git a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.ebuild b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.ebuild
index e2bae382dc23..815a5e4cf8b5 100644
--- a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.ebuild
+++ b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ DESCRIPTION="Interface between RELAX NG validators and datatype libraries"
 HOMEPAGE="http://relaxng.org/"
 SRC_URI="mirror://sourceforge/relaxng/${MY_P}.zip -> ${P}.zip"
 
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 LICENSE="BSD"
 SLOT="0"
 
diff --git a/dev-java/rhino/Manifest b/dev-java/rhino/Manifest
index ec4dda43054f..ff7051ffd781 100644
--- a/dev-java/rhino/Manifest
+++ b/dev-java/rhino/Manifest
@@ -1,4 +1,4 @@
 AUX rhino-1.7.7-testsrc-build.xml.patch 1414 BLAKE2B c96d595d6c0bcd0225f8df9ac63e28a68cd6045b0f5395a13826fd7b7c7bce01ccc6963e58e2a07e41cd3c138de92cabd2627163cb16b5b2c21bc4f91b4a7eac SHA512 f7fa8d77a584399e6049414ed46b138c14f984148b6dda6e20e376c4312295728de24f31331d20c2b1dc62f81c8d9bd8732227ad64fcf430f2ba721b8de490fe
 DIST Rhino1_7_7_RELEASE.zip 6059127 BLAKE2B 431885bf287da524cfc82e6594802c93e75d48177b4056e9b893d7c852c3c3b30291d616a140981e520fdebacf5cbc8b802a6137f0e29a369f1d01cc771c6b77 SHA512 ce89b6a153d62dd459a86360c67d6db4b05922d8ab49a8d45ccb0deb0f639cd819f0ad75cb4929eda6b7f0fd6ddb5879a4035de6968283317bfd0e93d2bb744e
-EBUILD rhino-1.7.7-r1.ebuild 2052 BLAKE2B c48a12c3aa6f5cef28d58e3fd6f0f5b14dcd12dcab67f949f0961e76058da2ed36f0d8f9cefa0fe734e8c9f15fc09c556860d3fdee71541cd322c07a7d065337 SHA512 0a4e9beb1503b80e8ee801ced0e4a94f94a871179f19ee7c6a7242e02a097336a2a13ba798e182bb43fb4beaa727d3e05de6d18734490bb604e7855938d975bd
+EBUILD rhino-1.7.7-r1.ebuild 2048 BLAKE2B 49665d6459ad3c5ad9307e1c8233d1ff514629d51931bda111424b47844d56f160ec6682970205fc8e52241b90c1cc3dfc4bed5fa35ac8fd5b22a2a86a034c02 SHA512 2384afcb7de09ffadb3f480bd64be455b2756659e216cdac59bfc1ee703ace63249ff0391a0489859f1784d0ad9517a6d6304c5e366398bfc0477d1a4c201207
 MISC metadata.xml 509 BLAKE2B 7b61b016be8e7149ead29ef6ec73f2da96d3bc864650845b68d452dd2a5c3d6e1093b7e432a4be7ee7a8f4721ada8b998982876ef709ff2bb4f36568c30a0947 SHA512 73d3c55306da2299fb537dda46cd2551db5913d130bf069ef24b5481a233f84a164338aa31b37dbbcd351d4de2d90d7411d93010d531815977ebed73646d41cd
diff --git a/dev-java/rhino/rhino-1.7.7-r1.ebuild b/dev-java/rhino/rhino-1.7.7-r1.ebuild
index 6183419c40ea..0ed1121c184c 100644
--- a/dev-java/rhino/rhino-1.7.7-r1.ebuild
+++ b/dev-java/rhino/rhino-1.7.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.mozilla.org/rhino/"
 
 LICENSE="MPL-1.1 GPL-2"
 SLOT="1.6"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE=""
 
 # ../rhino-Rhino1_7_7_RELEASE
diff --git a/dev-java/saxon/Manifest b/dev-java/saxon/Manifest
index aecca257cda8..f4c03b15a18d 100644
--- a/dev-java/saxon/Manifest
+++ b/dev-java/saxon/Manifest
@@ -3,5 +3,5 @@ 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 1965 BLAKE2B a6fc49263e9322f3172a97a85721c614157449f3f9582ac9a74a5649c28078fda0588bd4ae3dea4367aae8f7b06eba69b64dcd13bac690303088755ba8298eef SHA512 204c2924bf4a4e9610a8b3e1377c47185129d92f714358df1f41c8a5191b15f9d86e74ac32af3c36232b411e1273ba870b74da464d5b76efeb1d3df941e07b9c
+EBUILD saxon-9.2.0.6-r2.ebuild 1961 BLAKE2B 354e76f42bf4f4b7d3cb578349810c55b7a1266bb74f5531522877bf055fe10574417e2484a290916515775003c4bfd19a8deb36c93de11e9c0a506800af3821 SHA512 b608604e1a13138534f4bde9ca0fe8496a7f6fa914571897d355d8d68aa289aadb7c0081f32f7c66fbbdb185697ef4779044aa77c9267d292911680246f52f53
 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 d538db728ef6..d872fb71a280 100644
--- a/dev-java/saxon/saxon-9.2.0.6-r2.ebuild
+++ b/dev-java/saxon/saxon-9.2.0.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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/tagsoup/Manifest b/dev-java/tagsoup/Manifest
index d416e92a44b0..5035a9f3590d 100644
--- a/dev-java/tagsoup/Manifest
+++ b/dev-java/tagsoup/Manifest
@@ -1,3 +1,3 @@
 DIST tagsoup-1.2.1-src.zip 222757 BLAKE2B 79a43edfa9aed7f08bfaedbe758b2a08d5ff596e268cc415707aee9076bcdbf8de0b4c2a855b9558ff2cf598ed4811a7a690aef6c5004e34484ffe3087bef8e9 SHA512 3bb1608746270663f6ed45318457e3ee27419929411689d962cffc0ab0c32ec4b858020043be46e929014b696c753a01b49d6eea9a98f18d81fb9205e99ac0a1
-EBUILD tagsoup-1.2.1.ebuild 1099 BLAKE2B c77f5066d6aaac5ad22ee09d0f714afc808d4dcbaecc9506f58568413f23a012ba531b95c034dc8d70546c03e80e06f68ae302a2341d50e29d9e3e71da66a252 SHA512 a0cb991662cb75a51a10080ea82c3aa73ffba29d05e163a80ae4f1e488dfce20ef66b6477804af1cbd48a25bb7fdc47c5f19108d86126c2537187a52a1602e79
+EBUILD tagsoup-1.2.1.ebuild 1095 BLAKE2B 2ed1adecb2a8eea7f2970765e6cc0d22274d897b179bd0bdc22ce831366bed2355789eff466ed027b2caa089ded99df47cb61320358aabf5ccb0cd28363fb285 SHA512 706a39c9e8c4cf763ea7052a2fe8f429c87fb75f9dba24a5cd1701e582058fd8c7642eafe943be337c75cd5ec7fe1b438e20a9037671f20885611754e5b378c8
 MISC metadata.xml 501 BLAKE2B e343c2ff8cc35280a493830bff0fbd4486a37fcc22d79eb8b74e6712250e9c879b50f8beede300189d233cdfa9579f02b921573f6e3af1bb399d34099764caf6 SHA512 e8abb4f880b76ee62dd56e0caa65868efa920f080cae9c137a9ff2646e77c2e22e5bb687e584f1b9621bb10140d6725626b01adad7df85f19ce55d80b4706ba1
diff --git a/dev-java/tagsoup/tagsoup-1.2.1.ebuild b/dev-java/tagsoup/tagsoup-1.2.1.ebuild
index b31f93d18bc4..003f63259bff 100644
--- a/dev-java/tagsoup/tagsoup-1.2.1.ebuild
+++ b/dev-java/tagsoup/tagsoup-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -13,7 +13,7 @@ SRC_URI="http://mercury.ccil.org/~cowan/XML/tagsoup/${P}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-java/xalan-serializer/Manifest b/dev-java/xalan-serializer/Manifest
index fea0314a771f..8a5f778e2b37 100644
--- a/dev-java/xalan-serializer/Manifest
+++ b/dev-java/xalan-serializer/Manifest
@@ -1,3 +1,3 @@
 DIST xalan-j_2_7_2-src.tar.gz 8416261 BLAKE2B be67c9f2f7ec1140965dc148aea94347e60a2969deb1fac5834c1458d10b3dca91b448a44ed6ebbbb227e4f04780ce0142e812cd99d8862a4cbbf5e8e2af4cb3 SHA512 2f1fa105b3cb8082594e3121a245464e1b7c15464b1ead2d10e306e51ef61ded5d7fcd70c034fa46f41c4a8c14316e376cc14d8045c8aadfce80f2e4bd1b61d8
-EBUILD xalan-serializer-2.7.2.ebuild 1187 BLAKE2B 1eaa01ed3864bd624ebd7a78461d23ed8705138ccf23d897cf4490d23210240f7e274b972ce488d1086b62a486be3c716ce72c8b0d413f40e5259fa85e2dcacd SHA512 69e2910d0284fbde84f3802ee30e179f788d43d81d2816c70b8729ddf6be3a0dc47bb3429161d32797754ffcfb64849dcfc6d8d09721f84f247cc8b8ae74c135
+EBUILD xalan-serializer-2.7.2.ebuild 1183 BLAKE2B 77b50ee853632bff8686e66fcb84008c9ae9130d5759e3afbb1d2f7a7b7466d338bb4fe03bff4eb442b402981f946de37963799daab00d1cb6349e3a9c875c67 SHA512 a379a2d3d6d22adbe5dd4206bb0e91185c2094b6968fec8c9a56efd012107f727b98a290169df721767ae82997026a81f5c3a71f4c80cffa3b9c0188beb54e9c
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild b/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild
index db89ae90c1d3..bfbc91e6756b 100644
--- a/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild
+++ b/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ HOMEPAGE="http://xalan.apache.org/"
 SRC_URI="mirror://apache/xalan/${MY_PN}/source/${MY_P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~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"
 
 RDEPEND=">=virtual/jre-1.3"
 DEPEND=">=virtual/jdk-1.3"
diff --git a/dev-java/xalan/Manifest b/dev-java/xalan/Manifest
index 7881f925af05..cae15fc68880 100644
--- a/dev-java/xalan/Manifest
+++ b/dev-java/xalan/Manifest
@@ -1,4 +1,4 @@
 DIST xalan-j_2_7_2-bin.zip 17740075 BLAKE2B 244fd71011fa957ff1988dbbb58e40af4ad218aafbd92f2a6ec305d59ec0fb221a283442b24e4290f6d2e853cfad39d689c1397b4d18f34f4c94403610079328 SHA512 ae2be0bfc5e794b159c2d16718275a6ce6e8f63d681e2d13875f233d334a37aba872206c6c1f70565698ceaf4c66261c7df6db6c524e6e8da5dafe2f17cefddf
 DIST xalan-j_2_7_2-src.tar.gz 8416261 BLAKE2B be67c9f2f7ec1140965dc148aea94347e60a2969deb1fac5834c1458d10b3dca91b448a44ed6ebbbb227e4f04780ce0142e812cd99d8862a4cbbf5e8e2af4cb3 SHA512 2f1fa105b3cb8082594e3121a245464e1b7c15464b1ead2d10e306e51ef61ded5d7fcd70c034fa46f41c4a8c14316e376cc14d8045c8aadfce80f2e4bd1b61d8
-EBUILD xalan-2.7.2.ebuild 1833 BLAKE2B 7a390c747ee190010b9884b7d8c70497595eb341a31b1b6e85b4fbfd6e880d6c6f670e9e6018f64647fbb781ba11f78c93d87d1c5eb708ebf55aaebcb64251c0 SHA512 eadca11ef9dcbec73a8f6a048fb518d6fbe6f8c8976ec37c71d014d7acbd640baee7a8422ab2ee7db38f280fe96019619989a109f35e75f45cc3c2fee0625018
+EBUILD xalan-2.7.2.ebuild 1829 BLAKE2B b51b6326d93c8dd08cb98ca966238dfe33dcb0f30ef3bc2b1c0d377c8274a7631289e9d03f268a8858ee5bc58982a5e2ebca94fc5439985ff9b083c69f713051 SHA512 402abaf66b08fdaf91f71662153aa066e997b1b29853f869a4e5059ed127b6dc784513c2834ce520d2aebc25ca4a8a5ca091a67ad2360d4bdb8555508c571e27
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xalan/xalan-2.7.2.ebuild b/dev-java/xalan/xalan-2.7.2.ebuild
index d5c0c149b9de..2db4963bdd6a 100644
--- a/dev-java/xalan/xalan-2.7.2.ebuild
+++ b/dev-java/xalan/xalan-2.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,7 +23,7 @@ SRC_URI="mirror://apache/${PN}/${MY_PN}/source/${SRC_DIST}
 	doc? ( mirror://apache/${PN}/${MY_PN}/binaries/${BIN_DIST} )"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~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/javacup:0
 	dev-java/bcel:0"
diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index 0dea478d7872..96fbcf645441 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,4 +1,4 @@
 AUX xerces-2.12.0-overrides.patch 1526 BLAKE2B 837bba05c47933fa4cc44a5a326fe6a7c872028181ec11c8da7e8ec182c8bcabeead38b1ad336ae20ec47dffb30e98a8d2c181e4dfbffa12d14bfe017fff4e19 SHA512 b81fb06ba89b6ef374205d623d655309778c9713f0ff11fa392d9f53d6331eaa342ce4145433c2e187f26145b3d9b8de7d48778bfd0c29497900ab47556d2bf9
 DIST xerces-2.12.0.jar 2113705 BLAKE2B 4224b9c00b9c7f388fc40f3bebe6520a21011f36ee1ffcf62e864fe370bbcac8c45b3627d2aff20655f467661a252e1bfd5cb9613f9bbe5b08f1917d09493fa7 SHA512 21f5218f71b3423a883e2bf5c99f7badd5a004a09454d0b218f57f463daf8fe83e7a186b64dd4c19388795a6e6e995f6ed133bbe4c81aab07b0a0d33cf2f7dbb
-EBUILD xerces-2.12.0.ebuild 852 BLAKE2B 7c83c58d2d170c7df692eeca7cc729aadc123a994b8abedc379be3bc85677e90dec14c1a1096349de6136dec597cfc6862dc284156038364164b491a4f421b73 SHA512 dc34eb8b10d1cf1bda87346387abbcc67e26d24a462a386e3fbc56ceb6227f8ec58abaae431ea217bff990865f7f15ba336b5134639d05d4d898905958fe59ee
+EBUILD xerces-2.12.0.ebuild 851 BLAKE2B 9755ce17d188c07894bc6041c666776f342d1236222b3f1f81722bf9d6b661091804701ac0b64998fbb6f7eae950703abbce7ebb0a3b4bcc1c4a344c480db74a SHA512 4fac8c7f9b83911e0d53dc0f64d1df08f9454e87b15638231349f2bf391c847bbdc5856ed9db772b8fa74c5dea55861b5501c6ee99019307837910a676287562
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xerces/xerces-2.12.0.ebuild b/dev-java/xerces/xerces-2.12.0.ebuild
index 220873851392..92df4f503cd6 100644
--- a/dev-java/xerces/xerces-2.12.0.ebuild
+++ b/dev-java/xerces/xerces-2.12.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://repo1.maven.org/maven2/xerces/${MY_PN}/${PV}/${MY_P}-sources.ja
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CDEPEND="
 	dev-java/xjavac:1
diff --git a/dev-java/xjavac/Manifest b/dev-java/xjavac/Manifest
index 2a5b1b100ad3..2e384fb1763f 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 666 BLAKE2B 53ff28cbcd4e403313f686547f95e5454722840563cd3f8d2db905f35aca4071327e5acf09a37f66d368e9e7439ad697b6cb00906563e2d59d9b181e0d2b00c3 SHA512 4f28557c34981eb71bbd59d8390f8fb6d23a767053b58b26b6860845d9779d7aeb2b53ac02e5d968fbe0214cdda9797bfcdc0868d04ef1ebb5e60b13438178cb
+EBUILD xjavac-2.4.0.ebuild 665 BLAKE2B d58a39f010f0c909ed86d48efbfdb01c1d29bef81e3afb1b60cb94c31764230d9203e46f7fafe32766f02e0ed6b2f1a16fa2ec99165d9b6cb93e87bdc5ceb5f5 SHA512 53e642f8d974bc9b3dc8b53ecf4db1f7dbb42080b64d63fe4f37280dcf038b0de37e1cc4275c49107d1562c76b316433fb364dbcc47b52648f403894bee85316
 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 c3c95f345da0..9015639a3f9b 100644
--- a/dev-java/xjavac/xjavac-2.4.0.ebuild
+++ b/dev-java/xjavac/xjavac-2.4.0.ebuild
@@ -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 ~ppc-aix ~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 ea60a041b4fb..f8ca32f96ada 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 1148 BLAKE2B f5d41cbc967afc602607e5be09d5d9ddd665704ca38aa27536414b662c0ca02b5a23bd91656f8b382a648aaa49ce08154c4e127414fe7cd85f0813e98afc2192 SHA512 8c61287c03748461c423aba1bb32ffcd955f1d160d4f765bf92d944dad8dad3965b875943762e697efe2c6ff9e23750e09867b7ea0380281403d9267d50ffb03
-EBUILD xml-commons-external-1.4.01-r1.ebuild 765 BLAKE2B 440880741e66b11dd422037d95ce1f40cb03239fea156025f41082431eb42f95b8cd860a1031374c1aecc9fdaaafea865c2d28b11a6ed2595a6fc6df6f4a505d SHA512 3c5c8f0ec9c9381e143c3fed532469125386eaed6cc117aa86227f7632e097a94f068df76e6e923e0a449394b791e5eb69dc9b104ae5480adde3cbb54a90b8eb
+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
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.3.04-r1.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.3.04-r1.ebuild
index 39fcc656f67d..fef9e0f08c09 100644
--- a/dev-java/xml-commons-external/xml-commons-external-1.3.04-r1.ebuild
+++ b/dev-java/xml-commons-external/xml-commons-external-1.3.04-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1.3"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~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"
 IUSE="doc source"
 
 DEPEND="
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 e1769bb1d657..a42ddcce02b7 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-2018 Gentoo Foundation
+# Copyright 1999-2019 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 ~ppc-aix ~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 09914b63f8bd..892ee30305f0 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 819 BLAKE2B bf72e8529e04df92e120bdc53da0469b64fe5fdfe8e3c6d3f4e2641179247fed901a99136f99ac0850323e2cbfcd36fb500d3fb031da64dab6e547a6b85d12f7 SHA512 03e429403c1e8104a090ad5af0d32391a8a80a38dd0b019a5a920c6a6db79ae56cd5277300cde55b6840c89a9841fd1c95f7ae9a07f38a0ec294f579afd0e63b
+EBUILD xml-commons-resolver-1.2-r1.ebuild 815 BLAKE2B 36cde061b80c83c454a04892a8a1f0ef730837798fac5416127c0bd7160213f824b08fc83d9ef0506d5019d8cdeaee93daa0c90b7413dd9edead5ba74367ff93 SHA512 5ad2ddd997d65fc6e8f395d8b108b68ced5415930dfee0fc117a434d821a6c9cd19b1824bb3fe0334c59e5a695436973bb436f0d47d3500da2c93bd2548aa8c5
 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 f70a3a4ec7f5..f1d499ba8da8 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-2018 Gentoo Foundation
+# Copyright 1999-2019 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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/dev-java/xom/Manifest b/dev-java/xom/Manifest
index 75cfb3f43282..717c47254417 100644
--- a/dev-java/xom/Manifest
+++ b/dev-java/xom/Manifest
@@ -4,5 +4,5 @@ DIST jaxen-1.1.6-src.tar.gz 204211 BLAKE2B 02e3ca40f3d6a41d417ae7f40b70ca74b4dff
 DIST xom-1.2.10.tar.gz 11717279 BLAKE2B dd66d423563abd717c0a663db3300b5baccf549f9dd71e42cc86b9c222f60faed1fc8525dbab04c27f271a3f048dcc01fbcb20da6ec6efd093e192c7a4b90685 SHA512 edaa4abbb929f4eba1ee092be7a196ba1c7a359b233a38abbf100dc519a9a6ca2b9a4947497e412f96ceaf509bbd03c0ce25b17e401b6cd0a95fc355bbdc7680
 DIST xom-1.3.2.jar 317416 BLAKE2B cd891743b6c83eaf39be0e7c973b0221330532464dc433f64b769d07e7dd4f43341e01cb6bc4c237b7cab2a939280acde2dfc7f1da4467f87af6458409e7b37c SHA512 958c25262d297280ab87b000a8a9a0fa0842c062a52229f818568f937d5adc69f7b2214b9463a9a75b5d1714487ecc2b434a47c4627d9350e497367787e98aa4
 EBUILD xom-1.2.10.ebuild 2180 BLAKE2B 6d72a78523641f9bf871d64d846e7641719e31a344c63f532107b356a297c6f88d444026d237c8835a51fd48dd6ac129b201e42494ed88343a0e9c55ece7bdab SHA512 4acb2e5879b5eba4e358b39aa80980f62b663ab37bac936e91d8d338e56bd8d9364646ef845d684593550fe6c5d75d57d17274b5aaa87d84a9c0ada59dbce002
-EBUILD xom-1.3.2.ebuild 831 BLAKE2B 5da5e2cad4089243df2b541ecdeae7de4d187c826e651ffe64423850cd9a415eb53925a93fe4549824747322fe7d1968de451a5745af7df31bd6f9f09f15f0ae SHA512 445ac19f214e33b2920b51170cf7e42045173a6fe0c10a6e325d84694d90973cf649dddb82970ee8f4d4ae8e5be248e5b7c0ed54afb620ecf36c633dbadbcde4
+EBUILD xom-1.3.2.ebuild 830 BLAKE2B aa85934dec069b68ac942019c417a8e94ffad244be4372e00602fe9ad096362da01ba152887f1186d802d8c45e49c9e23245d7f88e75e483525d05453f595d12 SHA512 b3692ea8c5fda1a38f014a100c4930718584149e18b169836628db59647cae41370a4dd4ec0bab96e9f62dfa329050213a26224c735b8b1eb62afc787ea9eeb3
 MISC metadata.xml 407 BLAKE2B 2486554418b17502be636181d1dc619a50143016a72e05d5bef8a42c631b9f09913040bc868cefae0759075f26853c605e6a11179b20f3ca3081dd091536b56e SHA512 4ec08597d54cbea6121f240565ff7b7ee614c370357b551bebd18d31749c1863e30bc8b7935caa00051f9946cc927cd34c1bad02be07eca40c89d2c6e0e7b2f6
diff --git a/dev-java/xom/xom-1.3.2.ebuild b/dev-java/xom/xom-1.3.2.ebuild
index 177dd35991f2..926f815bc3b5 100644
--- a/dev-java/xom/xom-1.3.2.ebuild
+++ b/dev-java/xom/xom-1.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 CDEPEND="
 	dev-java/xerces:2
diff --git a/dev-java/xpp2/Manifest b/dev-java/xpp2/Manifest
index 62eb2ae0b361..228af5a7cc3d 100644
--- a/dev-java/xpp2/Manifest
+++ b/dev-java/xpp2/Manifest
@@ -1,3 +1,3 @@
 DIST PullParser2.1.10.tgz 2310288 BLAKE2B 0c1f3aedf88aae18e7cab40b04055fa7a20f6bfe05973e6cbe3b459b408dfa193834d22a6d77b3d1ba3802e115d89f73e3f423efc7571efc8f09bb73625950d6 SHA512 87a091e415a31cde27ca1193735743b60f516feb336a9a3577792636e54ab8d671a22e74eb8aa41268f6251c688c68fe92a28f735ec78b96b919909f80c59590
-EBUILD xpp2-2.1.10-r2.ebuild 1718 BLAKE2B 8ea25c2ad23d66eb7ab261fe261a16eff8c6aba449b3fc23cdae9b74124b3956e90f00d570a8cd3f82d85311f74ddfdaad1608b3db26981f885080aef8568ff5 SHA512 2e65db2bf9cb673d9a920ff2f51560a0ef54b4648c70db28bb56f5f3e406d2ca81d8c9d46e9aad30f87efcbf4ba9e147b1cea00ba2c136a5c15fe926852c9006
+EBUILD xpp2-2.1.10-r2.ebuild 1714 BLAKE2B be7808ceaae770f7878853fd0b90304677c9afab02a6b84e5981f3ee27583f92d2ca36c9b3f770b84a9405f83fef62c6335dd6ab8e6668e1b6c159285d336a8c SHA512 54152f83cef7165e6ab1a7de349a68f37e515c3915e8f87a59b07194515242e3132861aea15c95b6f822d8fc76b836b4c0077afae85d373e9271658192283f8c
 MISC metadata.xml 458 BLAKE2B 5a23e3b43da0a680538428c1cbd29dc6555459408a7d9520410a5da0f904cd9bfc1864e27b7f3aae2a94afca4c0f276c5cdaf09612a77759a64b7fb0c2f345ed SHA512 9004485c7ad032ec1f11aa89e7bc286f52d45f3886cca36912d12891f409d6d70cff063cf3790b7e05f4e280e1a953987dab155feecea461d5a3ff5cea0a430a
diff --git a/dev-java/xpp2/xpp2-2.1.10-r2.ebuild b/dev-java/xpp2/xpp2-2.1.10-r2.ebuild
index 540d963e8527..b0e089cff3ec 100644
--- a/dev-java/xpp2/xpp2-2.1.10-r2.ebuild
+++ b/dev-java/xpp2/xpp2-2.1.10-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/${MY_PN}2/${MY_P
 
 LICENSE="Apache-1.1 IBM"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 # Some failures, partly because we haven't patched Xerces but probably
diff --git a/dev-java/xpp3/Manifest b/dev-java/xpp3/Manifest
index eedfb0d78c70..deb940e27086 100644
--- a/dev-java/xpp3/Manifest
+++ b/dev-java/xpp3/Manifest
@@ -1,4 +1,4 @@
 DIST xpp3-1.1.4c.jar 128334 BLAKE2B a0c1d871216e44f7196ae8edd4c0ca2503a16821b6f592e4af0fcc1da346135fd5023fa5210abe1ce772d0001274c0f6a3d2383b7ebad1a65ffa967ac31c1d5e SHA512 743d2a0b20d16e97b640d9ad3e20e56a7446cdaf4ca0ebba072bdbe3eed0ef90289c2829376b4a209b35e0960adee5e01f11e8f361798333d8b4eaf4f1038445
 EBUILD xpp3-1.1.4c-r3.ebuild 680 BLAKE2B 4fdc0c6ec0bfbf04c6f67d2df5a2497bff293d7eb1643ad1806d58bb1bd2c96b04a2666fad2e33291f70de00c77f2d14227732d262ce63d7a9eaf035684505be SHA512 b0d9e9746ecaad9b78b0ea10745781c9c5e9f653fb7f4132a63abc1cffcc58bbd719d6e1b956374ef3bfc6d2f5ccf7db4d7e85a928fc585d4bebf5cbbb3a96e0
-EBUILD xpp3-1.1.4c-r4.ebuild 638 BLAKE2B 99302a1b8637af115bce4fa8c3facd472060bc2a2d1b1f21d5df79ace49030d7614d3c347eb79b7f2acc16a20d7cd7ba56c28df4ac4e91d88e274aa491524212 SHA512 0c37fc533f9914f0bd0bb2d1c09c315df412990a3d7859782ad97cdbcc88cbb9565586f238784cf10c84f38ba62ff606d478af71922d41773fc99e1274886858
+EBUILD xpp3-1.1.4c-r4.ebuild 634 BLAKE2B c8272523958b3d7d7ee5aa3f269f29b981b4c063c68f7e959a2ccfde142dc28f86c875124b477a535f021c639c27f8a76597f6f80ba8c59f4ff0261f33ceb4a3 SHA512 f97711bb2fcd90e3bb3b50ee0ba455db43240527d3402bceb29177f0c1738a1ae2fefae69ea23978e833b3f0114f565ef91dca7dfa7a7b2ca07ae1f9ca798dd4
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r4.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r4.ebuild
index 7628ee79b00f..5471aaa80309 100644
--- a/dev-java/xpp3/xpp3-1.1.4c-r4.ebuild
+++ b/dev-java/xpp3/xpp3-1.1.4c-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${
 LICENSE="Apache-1.1 IBM JDOM LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/xsdlib/Manifest b/dev-java/xsdlib/Manifest
index da44165b0773..dbd9709cf3c4 100644
--- a/dev-java/xsdlib/Manifest
+++ b/dev-java/xsdlib/Manifest
@@ -1,3 +1,3 @@
 DIST xsdlib.20090415.zip 914126 BLAKE2B 7f8dc45c590606ece1775d08634f87bb7cd392c69c66204073d4867f925cf7159fe14b43cde6d59a72da90ab284d9a3adc0c4d6aa117ea5143eff8efc5bf6534 SHA512 479b20bb24c32f7a8bf548689cb6d7efc99e36d7f887d9e33b34b2e4707d74149ae1e312f7166a90acbd44422248729d6158a55d710616b656eb628cafc1e3f2
-EBUILD xsdlib-20090415.ebuild 1133 BLAKE2B 628d939f225846c81858e6919241a5bc31e18768713c183089613395e7ebe14e239b463b5ccd668f7e3594f17e41595a158f9ab62f6b67003d1d6022362beb87 SHA512 77387cf5d2ceef4fb0a8fd81861dcf3fcc08a006cacfaa9d994ca48e9e6d3288a201f82d3e7ac7f05697207c907793bde4b173cfd8ccdf05ee4647f4392b4794
+EBUILD xsdlib-20090415.ebuild 1129 BLAKE2B 35b0645927a87c0e0694ddb6f34b55bd13b57b5b47659c303ad9913815df75d2baffd32697fb8ae8645b534b67891dd96ef85d8b786dfb0582263bb848111fa0 SHA512 444afb0d39f0d1e4dedfbb923b6a94254f692681e90962bca5c6a06f3d269427d34174eb1c6d8862befb23815c0a4eb6386ca34763bc438dc1b042ab2b48b7af
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/xsdlib/xsdlib-20090415.ebuild b/dev-java/xsdlib/xsdlib-20090415.ebuild
index 0ca67cf144de..c317785fc9fb 100644
--- a/dev-java/xsdlib/xsdlib-20090415.ebuild
+++ b/dev-java/xsdlib/xsdlib-20090415.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -13,7 +13,7 @@ SRC_URI="http://java.net/downloads/msv/releases/${PN}.${PV}.zip"
 
 LICENSE="BSD Apache-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 COMMON_DEP="
author	V3n3RiX <venerix@redcorelinux.org>	2019-05-21 10:20:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-05-21 10:20:03 +0100
commit	6f8038813c460b4f0572d5ef595cdfa94af3a94d (patch)
tree	3509e94070265053394b7f2e30a779d7e60c2064 /dev-java
parent	eccb70a7f91b2d22582587f26d1a28bb31408b45 (diff)