gentoo resync : 02.03.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-03-02 15:59:12 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-03-02 15:59:12 +0000
commit: 06a7b5647e11a8ddf69b1c3d3ded6a8ba28b923e (patch)
tree: 8d58c1f4b049da677b33209b072f2b3057268fe0 /dev-java
parent: 99abbc5e5a6ecd3fc981b45646fd8cb5d320377b (diff)
398 files changed, 727 insertions, 727 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 850ffb2fd3e8..b17b2bb4aaac 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-antlr/Manifest b/dev-java/ant-antlr/Manifest
index 841dafdf5c74..0701346f5add 100644
--- a/dev-java/ant-antlr/Manifest
+++ b/dev-java/ant-antlr/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-antlr-1.9.2-r1.ebuild 484 BLAKE2B 6ebbd4ebc80a12e1c79bb0f59521a7e2ba10f1a308aa0ea5d6b03322d44e284fa03fd875e64e77aae1733f9633c2b07830d3f5554961ba90743e8b2fe5e96589 SHA512 64315256407eb17757872e5c4fcf41adf8f5e812e61bf9df3948dd595fce8d0c753eba44e1f096ddd4bdb9ff04bc648fdfa84d5f52b7b3edca169cb9a1bb035e
+EBUILD ant-antlr-1.9.2-r1.ebuild 474 BLAKE2B c97085ba99084edc5df177278c5d1e54c0e1cdbeb6aa28c1bf77c7996aa9e1c3178cc0d5a861e1bd8443f2bbeed27252ea2453f6e4a49d94f5ef4fccdacf9a28 SHA512 3701e4e4504ebe741c095dd7e66d4d4a81a5e7e38b09f42e8b3f4c369b85a676572c6ec93c497b5fea101fc47afe188c913592280b7d06891d12a737c9f67c6a
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild b/dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild
index 6c8721c75252..61c7c31879f1 100644
--- a/dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild
+++ b/dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ ANT_TASK_DEPNAME=""
 inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional tasks for Antlr"
-KEYWORDS="amd64 ~arm ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-java/antlr-2.7.7-r7:0"
 
diff --git a/dev-java/ant-apache-bcel/Manifest b/dev-java/ant-apache-bcel/Manifest
index 179a313a877a..12c86e82c21f 100644
--- a/dev-java/ant-apache-bcel/Manifest
+++ b/dev-java/ant-apache-bcel/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-apache-bcel-1.9.2.ebuild 369 BLAKE2B 441eff1855cb66ef97ae39da3b2f8588c71ce40b976e15590bb24539e990d2f441dac1337cb37b9e1bd5b421ebf39eaf4baec82202f6f6080ad0cf578b4a8266 SHA512 cc777ae32e5ad277f6c682dc6eb89312415cd049f241bea5face0ff74ae41c76a4f3e4639f2e2800959e7348d146b71adaef6cd8dff89aba2a4039a1becebb43
+EBUILD ant-apache-bcel-1.9.2.ebuild 359 BLAKE2B 6e3412a4764180bfbb9cbd3aef6134e228ce1b4bff207512b32a23a6b85214d671f89806aa02d5464819af8b1958d051df64c9c0f226ae0f8c734a01bb17a621 SHA512 d2a898cf6d8edea0f5b6f4e3c70c1547737337a2a5b0ff14619eb0173fab3b62386e00ef7316a50541ad49c34b6514d0985d174bd0fb7bf89d5fadf8f324cc21
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.2.ebuild b/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.2.ebuild
index b39e39879154..4c880a1ade48 100644
--- a/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.2.ebuild
+++ b/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,7 +7,7 @@ ANT_TASK_DEPNAME="bcel"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/bcel-5.1-r3:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-bsf/Manifest b/dev-java/ant-apache-bsf/Manifest
index 6398747216de..75abdb452b9c 100644
--- a/dev-java/ant-apache-bsf/Manifest
+++ b/dev-java/ant-apache-bsf/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-apache-bsf-1.9.2.ebuild 648 BLAKE2B 24e6122216629b330d6bfc2282c7760af03737c1ce2e2ac8ad6acd015a85a5101782f976d1a011c859c38237c674ed4bef7696fff05956a99a2db57f87b65e7d SHA512 0f473a26a076c9d007ebfbbb3c0a6ad9e3e1bc074616ed912a99a8ed5d3341511aaa7fab511a7036dc398782787640a6a4abc5c2fd40327c2e614d550a814e6e
+EBUILD ant-apache-bsf-1.9.2.ebuild 638 BLAKE2B c9eab574053f8817ee6fa07012a6012524fbb295f45d53bb47835cf7a454152516fae1b1daed4108b6a563557adbc964d7184942a3d735801d01b9457d7ce0a5 SHA512 31d6748a916d8852015bd5d64f54745571050093b390c067f37cdfa57014c0798936478ce0823c54733b3563ba4b9a696aefb3992f51909aeafdb2e49d66517f
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.2.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.2.ebuild
index ddf3c4154b14..45ae131b3f60 100644
--- a/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.2.ebuild
+++ b/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,7 +7,7 @@ ANT_TASK_DEPNAME="bsf-2.3"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="python javascript tcl"
 
 DEPEND=">=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?]"
diff --git a/dev-java/ant-apache-log4j/Manifest b/dev-java/ant-apache-log4j/Manifest
index 36c80628774d..c02d3edbe653 100644
--- a/dev-java/ant-apache-log4j/Manifest
+++ b/dev-java/ant-apache-log4j/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-apache-log4j-1.9.2.ebuild 374 BLAKE2B b8c912b5580db5614e0deec0ad9fb5967070af304e78f3ff6f8dd3046b8b84e72a73c14ca431afdab2f352cfa063a8ec5a17a215e2597457800f10791324d6e6 SHA512 d521be4a9867dfc2637b91a9c557434b54f3530e2b7f2987f2c9cb95fd632a503ca2db5bdae568fe22a0fa33d5341db4d0252e836ba89095c906f6c24f5280cb
+EBUILD ant-apache-log4j-1.9.2.ebuild 364 BLAKE2B 17c62ecc9ca6650e3fcadda3b6c6d83afd0fe5e77ffb33ec8ac1a5fa926acf85107b87d91def668d76a405dc35de68aa49654e2e5be0a553f8125ac1ec730f8a SHA512 648e4a5370d9f5ee6d9ab9af80df505bb9eae238caf65b4b4ab7dc898ce61c8e552cddb2e1d303ec64e17eb5e5e7aebb9601a6719413a0759b4f63ec6a439de9
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.2.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.2.ebuild
index cf479cda65cb..da86da4ae08a 100644
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.2.ebuild
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,7 +7,7 @@ ANT_TASK_DEPNAME="log4j"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/log4j-1.2.13-r2:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-oro/Manifest b/dev-java/ant-apache-oro/Manifest
index 14c571af3d86..001510268459 100644
--- a/dev-java/ant-apache-oro/Manifest
+++ b/dev-java/ant-apache-oro/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-apache-oro-1.9.2.ebuild 391 BLAKE2B fcdd717a434db672385c2e0bd0a5e02e2191d297e66299da61c7933cd8e7900dfff3c13ed83f82225c8952147af9ba6f9a255f8b47c1d385c4e847a29950523a SHA512 eac1a9053adcc4d1ab2f980c6d16cdfe25416aec1329d0352e7e466ad5da0b0db909e03fbeefabe45a62230e20ba779b5aa3d0467394b8bad529a73f2fcac1cf
+EBUILD ant-apache-oro-1.9.2.ebuild 381 BLAKE2B 7c53667cf3fa487b6a951bfd5ebb3e14fe40b0501eac2592c62c38b4eb9c6b0fcc65da7050724f518958232af5373f85716cc4a8a89e2cacedb597bf9eb8b856 SHA512 a996273c2bc9d48bfe09d0f0bd952fb52fbcd5fa21950865943ae09a4ca430f6c3aacf6b649d6f166c58815838c19bef5d6c7ccce22025cca635f02ede31c45c
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-oro/ant-apache-oro-1.9.2.ebuild b/dev-java/ant-apache-oro/ant-apache-oro-1.9.2.ebuild
index 593cd1953176..834e899d1b83 100644
--- a/dev-java/ant-apache-oro/ant-apache-oro-1.9.2.ebuild
+++ b/dev-java/ant-apache-oro/ant-apache-oro-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,7 +7,7 @@ ANT_TASK_DEPNAME="jakarta-oro-2.0"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/jakarta-oro-2.0.8-r2:2.0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-regexp/Manifest b/dev-java/ant-apache-regexp/Manifest
index c871ff166e01..8186ff13b977 100644
--- a/dev-java/ant-apache-regexp/Manifest
+++ b/dev-java/ant-apache-regexp/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-apache-regexp-1.9.2.ebuild 395 BLAKE2B 7753358da9eb47fcc4eb81f8ce6962715fde8b3de354805a473cd1235f95e6aaf9e928a70194a5beb7adab2b7d792e489ac2a34a73daac730337e05737b660ba SHA512 fc124c90e89a08f721734177b80491f631fa9a58b8bc4e4dedb89f732d25103b5c25b4d63db052522b54292fdb1ffd6f880c99056d1d65a706576154ab044994
+EBUILD ant-apache-regexp-1.9.2.ebuild 385 BLAKE2B c861e14076d4c261a93229a25b490b19f797850abba6f01a34c0ab7fc0cceaa5ce83a3f0177351bb1f7a053ac279c4c2530c064450e03dd25ba29fea1072aac2 SHA512 9d110c02c11a0ce43995b52d17f46d4542712625eec0a90ecd2b4653e954117306f5e59f52611a80d2b0b750e1b1f34ffd4df6de91c991e01082426c1ca39222
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.2.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.2.ebuild
index 4465d09e18d1..3e5ad52958e3 100644
--- a/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.2.ebuild
+++ b/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,7 +7,7 @@ ANT_TASK_DEPNAME="jakarta-regexp-1.4"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/jakarta-regexp-1.4-r1:1.4"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-resolver/Manifest b/dev-java/ant-apache-resolver/Manifest
index 70d9ea56f01c..4a050cc5907d 100644
--- a/dev-java/ant-apache-resolver/Manifest
+++ b/dev-java/ant-apache-resolver/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-apache-resolver-1.9.2.ebuild 398 BLAKE2B cdaa14daee89e17e51968aa9cc4ffa05c615a3dd8e6eff12ba9acfcc154bac1a366fd9bea0f6b44ffb2f6ab763ff114c55f99199b69105ae9617e0b1e04e51bb SHA512 68c92547682edb35eeb4f7dde15adf47f28197b6600783c52b8aa73c4bb8c14f26c556475ab84f4cf3ce80716f8c0b4a5d268e2ec40bafd7730f3c6c719439a7
+EBUILD ant-apache-resolver-1.9.2.ebuild 388 BLAKE2B a5313956f0cf362f9df0d0943e53a383c00aebd76cc4d1b1dfd61378095af53f59700463d5d9538092340e75ecf6dae6d30e92f15edd9d307bf0e1cfa8987229 SHA512 38aa44f7bb8aa22f078a85e71f5429a5c9905891cb967458f890d0bb5fbc3c5c1cc52c98590a0907bd517eff310f0c881dea2dfa5e38b9c2060d37f83c1cdd0e
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.2.ebuild b/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.2.ebuild
index 8c6678ff70e1..cba18e193cf5 100644
--- a/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.2.ebuild
+++ b/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,7 +7,7 @@ ANT_TASK_DEPNAME="xml-commons-resolver"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/xml-commons-resolver-1.2:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-xalan2/Manifest b/dev-java/ant-apache-xalan2/Manifest
index abd0a89229b5..049cbb684b78 100644
--- a/dev-java/ant-apache-xalan2/Manifest
+++ b/dev-java/ant-apache-xalan2/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-apache-xalan2-1.9.2-r1.ebuild 472 BLAKE2B d9e54ed15f55002d31e687fbbdf43ca1f8830938f273e5640ebd2d55181fa4ab6e2c898b70c7d8f1ea0c1093c13b5470a4b77257cbe0a70dd8d9e4a8b1d3f2e8 SHA512 112a3228ee75bac52ecc12d805f7f5d5da2ac5add8f566e3fe2807f00dccb4bb903aafd902136554db3ec013c690aff41200086f06ad1fa9af17322e1cf7cee5
+EBUILD ant-apache-xalan2-1.9.2-r1.ebuild 462 BLAKE2B 7043bd1b05eeda1bbc2c313853b4a15c8d94c3442fbd53e81eab9972d039230893219a375a92435addcfcfff7a5ab96d3d8520a3b00503b339a03cfee16b9dac SHA512 08d378e572d27dcb93db643d246a219c89a4e3ed27f55749162a2d932ac89c1acd91fb23b80c556613350581e56be9df7221f35827b98a0d96cb11e4db199fd8
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2-r1.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2-r1.ebuild
index db78e8f433a2..3f3b7c497853 100644
--- a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2-r1.ebuild
+++ b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,7 +7,7 @@ ANT_TASK_DEPNAME="xalan"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="dev-java/xalan:0
 	dev-java/xalan-serializer:0"
diff --git a/dev-java/ant-commons-logging/Manifest b/dev-java/ant-commons-logging/Manifest
index 8988b2e1a650..f611f60219d7 100644
--- a/dev-java/ant-commons-logging/Manifest
+++ b/dev-java/ant-commons-logging/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-commons-logging-1.9.2.ebuild 357 BLAKE2B ec5312bafe52c28f9b558d590446cd5d5758794e2569907f1e92769d82143ba6faa1663b8c4662674ad3dc5ec4de8d5fade00afdf1eb2744c57605c2b6cd2fc5 SHA512 5edc9bf9f72ee21872dde485a614bac577dc26a90a9e3b5b4e0094c615a18ca32830aa0cafe4ff435efb5fe5b7077522acf12b0d0100183a45bf8205dc37a9b0
+EBUILD ant-commons-logging-1.9.2.ebuild 347 BLAKE2B 5006e6af3bce302bdbd1faf26a94386a79a0638b89e8028debd2d62a80b7fb9bae84ba666bcd1bb6645fb20eef74de283c4f538196fd5043e4359cde8aac7542 SHA512 4fa770c28772e034807242fc5051d19227c7efd233bc362fd650ae7dfcd3032c2b759ff04c73e5689bcaa97080fd388e7d012574b35f19fa4bd0cfffa63863bd
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.9.2.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.9.2.ebuild
index 2ca3455abc4a..c4e08645d064 100644
--- a/dev-java/ant-commons-logging/ant-commons-logging-1.9.2.ebuild
+++ b/dev-java/ant-commons-logging/ant-commons-logging-1.9.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/commons-logging-1.0.4-r2:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-net/Manifest b/dev-java/ant-commons-net/Manifest
index de8157fa457c..9203ff75d7e7 100644
--- a/dev-java/ant-commons-net/Manifest
+++ b/dev-java/ant-commons-net/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-commons-net-1.9.2.ebuild 353 BLAKE2B 3512142b03549340229f19e5d34ac66c4351d2caba5f0571d325b37ffb80e360544a6a37517090b60153c9d2369798ce85b67b8fd1c6287129875506282385d5 SHA512 67f4442f92c8c673c4bced36eacd90136846ba122bdc1e9dab9cc623a5263651093deb2c2ce878da9f905ca1491669b203d1c9a7b6792bb192c08a4c886ce36b
+EBUILD ant-commons-net-1.9.2.ebuild 343 BLAKE2B d6a203ecbb2c405b725819c206c4a6af97b11d1632bbff59b8f9baeddd1cb24ae302792ef5e6fb79997a7c8726c992f6cba9cf0f087276bddcbf5aa4e5c6da75 SHA512 7681da0c70374d90f106e93dbb7f153db36fef7dfda3f31a780419f65ae071788ed7a1f12e5ec63a6408bb8ea9afdc4e532c2915b5059ae956391009f3cc5350
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-commons-net/ant-commons-net-1.9.2.ebuild b/dev-java/ant-commons-net/ant-commons-net-1.9.2.ebuild
index b9e768e4fc32..fcf4a4acdfe6 100644
--- a/dev-java/ant-commons-net/ant-commons-net-1.9.2.ebuild
+++ b/dev-java/ant-commons-net/ant-commons-net-1.9.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/commons-net-1.4.1-r1:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest
index 814663af3303..a30e74cbc4a3 100644
--- a/dev-java/ant-contrib/Manifest
+++ b/dev-java/ant-contrib/Manifest
@@ -1,6 +1,6 @@
 AUX tests-visibility.patch 755 BLAKE2B 57a0815dc7881b5e5b1ebccf20a139624bc237aa67553634f9a2f91d45065694c655c8a63fc78c64c27e389f31c5a9356cafed8864aa56f720d648eff72a005f SHA512 a848c5573ffc9e02b77dd63c74d4314be5c35e47da7646d048d7e28a098290bc50d30287928ef3e06d8dcbba758b7ec1e87118ebac29bf72b04021f20e8c371d
 DIST ant-contrib-1.0b2-src.tar.bz2 118216 BLAKE2B 518e7bd19280ea035be155a5b8c5f1f5e228a7b24ebe1291c859c2216a57ce673c41f4d8975e73d9a4d07d54fbef404604dd22cc52adfe49820445c05c79e471 SHA512 5245ed1458c9c4892ab8196a8acdf8678aab0d45fc58fcd8ca446e3589f378a9a02de8e608abb75d24fa190cdcbe209454a703eec8d4e563b7690d6d58ea9af8
 DIST ant-contrib-1.0b3-src.tar.bz2 3298187 BLAKE2B 0572d583a770c239880fb7e8e4a1e91331dfe80a52d7cf83a90d108f1e717caa26699dce43b72fb1944a74c8c738ad659f60864e2e8e945c8e91569d80c1214b SHA512 8147ed51612eed9d41515c00ef2bb7210ebd50dba8b471abfadf8a56c67b53c030602ce9e49e9070d72d383de61f290e941a76c282e223330fee606f3633b0a8
-EBUILD ant-contrib-1.0_beta2-r2.ebuild 1457 BLAKE2B 68d1e09686c6fa8637093274a60a2e36d837b5fdf46129a6029fcaae3720eb0bb9aa0e8052ddee1489be5d5bfb7b34186ee8c24fa6e7c46dd1e4418da009b2fa SHA512 b01aa5faf840f0c9befffaa2dd5caf3c2bf73ebb9e2286fbf222352b9c72f15d2d7b1e6f8066fa36b2610e8a2e9ca541b22bcb2eb25abb77a0e5fed1b8ef8b84
-EBUILD ant-contrib-1.0_beta3-r2.ebuild 1841 BLAKE2B 61a654509ef8571be882e690b6151d1453ebd12f2322dc56e0beb70085125c3ab16116caf3366670b14eda7bc4953071a021ae66fccf1b84e74908e67d4998df SHA512 b1ba13d26296bf3751cbd14c800a3df64a12a54db3af2fa3eade7c0fd77a8ebffde18024ef80d2c252929187f2d15ac5d6b4309037157eea596def084971cde8
+EBUILD ant-contrib-1.0_beta2-r2.ebuild 1447 BLAKE2B 3cbbacfa525663b6c805735ca0ba49e0652b67bdd1d7cd441ab55e17075f26b78ed3f894fa82336aec2319cc6497dc15cf26c59900f140708d33f6a7120d67e2 SHA512 a60fa1ae7800acbc917ad70bc6f2c004786dc6742ae66e29de17e93bbe5df77d4aedc0b04527b92318ea59cbea0fe93bb52e0b14a5f987f96d399c2138dbfdfb
+EBUILD ant-contrib-1.0_beta3-r2.ebuild 1831 BLAKE2B 84992885fae9dfa5ce27b0992e6d9b98e29741f68797c59ced485afdff4e4b80f04d5cb6676a49ebec1669ccdbafa738b4f8443bf2bfd2d696b5f59e70e4d704 SHA512 373a13f4d4d027a6ecd58615a98b0b4a53f14db7a38a17a2c2aec88c28ebfe52150009a5ebbbb1fc9c50d98aa65cf794ed98f113e93cb02c4b1840524ca25b60
 MISC metadata.xml 317 BLAKE2B 7a5bf5450578fb6d057233a53ba7f3e7fa6c3f969f7fa0eba8c22ac17b4efa19b270a765043d61635780b0da1f22e8a0d0304f0c15d468f72fafee1341b8131d SHA512 4f45c942983f0ebb77130dc40a6407ec9781bb2657ac24bdebeddcb21135b7f0b39b560015ce5c7b0df3302c1c6d2e5783cf86d73aa372b9e24c8d1df28249c8
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
index 347d5d2bab3f..4b859e87061f 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 JAVA_PKG_IUSE="doc source"
@@ -10,7 +10,7 @@ HOMEPAGE="http://ant-contrib.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ant-contrib/${PN}-${PV/_beta/b}-src.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 #	test? ( dev-java/ant-junit dev-java/ant-testutil )
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild
index 973516ec43cb..7d467945ad73 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/ant-contrib/${PN}-${PV/_beta/b}-src.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 #	test? ( dev-java/ant-junit dev-java/ant-testutil )
 CP_DEPEND="
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index df9ee9a6fe0e..b40bf9f81128 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-core-1.9.2.ebuild 3238 BLAKE2B be308ecc951e791d77c83af9119a4bf10a6ef716f8cc2a2b6a9c25cd63c6172e78111c6b412330b1f66f1030801ba5276de6d50619e9a6b733926b5352ef0688 SHA512 6410f6a3a293b7fe15103c3474940526f6597a059c0e8e29762155da56c0c47df95a2c7a9c84781ea40fa4e551b7baa1db47a6427bc5653ff7f62602eada1864
+EBUILD ant-core-1.9.2.ebuild 3216 BLAKE2B fdd1e40be093d25a40afd4e6009539ee1be4877a5e281596fb246d64c913da5c0877b05b7b8f024132ecdff31dc48bf9df691b1a6d07cc6580d1176b16027600 SHA512 fa3f6f9120f3ba469aad57c73317ea37adde68d39451d773172fd2c0c6c5e2b537f2c3ab1334733481740ec74021bc73756e8c502de861aae0057a87c36237a1
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-core/ant-core-1.9.2.ebuild b/dev-java/ant-core/ant-core-1.9.2.ebuild
index e2696d37d4ba..1f5fc1092c46 100644
--- a/dev-java/ant-core/ant-core-1.9.2.ebuild
+++ b/dev-java/ant-core/ant-core-1.9.2.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-fbsd ~x86-fbsd ~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.5 dev-java/gcj-jdk )
 	!dev-java/ant-tasks
diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index 8b415f6124c1..995ec6828b00 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -4,7 +4,7 @@ AUX ecj-4.5 322 BLAKE2B 2941d70de68459d2bea21ae10680dbbee7888e156753e2bb7bae89b4
 DIST ecjsrc-4.2.1.jar 1417043 BLAKE2B dc6915ec85d96a6ecdafb04485549feeb6ef8329811e294647e9e179ff3b1ec3cea55c29ad23b306ff3489dbfe6f574dc691ee31080a592d71607d3a996e9bb4 SHA512 967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf
 DIST ecjsrc-4.4.2.jar 1764959 BLAKE2B 402bcbb040c28fa10dad07c4223daed9976f3246d6984ac74d95087a6cdcd5a742072126a999435eb2d49d49bb2884474461ae8439a9839617b2891297cd7c07 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20
 DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
-EBUILD ant-eclipse-ecj-4.2.1.ebuild 1373 BLAKE2B 4ccac3c0c0fc882e43be0a7d601ad31eda70a20bb69e7d52c32d0d16056316b1d462cbfcc7dd8ecabf35b8e50657623ee3c6baec5a316ef140bcdfeca388fab8 SHA512 6c52e3176ca5fadd62fe8e203906eb91a169404488a1ac8f4d5fe1a76c9f103c6c1a1b9f8f31067a9b2a377772d0c7d08423a7cb5357e056f424d97051a2c69d
-EBUILD ant-eclipse-ecj-4.4.2.ebuild 1258 BLAKE2B d13a5e1c897f0e731edfbce2850cb7dd3c540ab113365020d21722b84b8b9c21b271b43a738433d40cca6dc6c5cb69b3e9b70908df0d472f6fb16869d348b87a SHA512 69ad42f42673352226ec24566248ab45b131833c1778ad14be1ec2d93f2005d2189be57a32c8da2c00bdc99c99d88850439971ec9287b3997aa5eef36f16fbf4
-EBUILD ant-eclipse-ecj-4.5.1.ebuild 1259 BLAKE2B 9bc07f7af2fb768eaea3d201d305ed70fbc7bb02d57a3c4f7767dc320743cee4377ea15cc6ff4145ffeba8ec8e2537d054e79596fd7a77b33a290b14694d906b SHA512 30c416ef45d8414ea89fdeb929694f7d902b20b6036e040640c22a518cb179b4e8c5a173e77e14098ec85edb3a6b17160d2814f6df0c2a035513594eb2e96675
+EBUILD ant-eclipse-ecj-4.2.1.ebuild 1363 BLAKE2B 1fd46c888db8d7662c55ceda97bfcfb2074bde7d26a249f0837e9a4f53f130b7776b9e131f3714d0ce272dbe8a777879366160e7fcb03e809099d7d3e168de50 SHA512 edbcd030f67950128afb6aad948d2104ca9610152cded95750c10771513246463c3da9d9a7fd128a623c9669cb3d6559875c69f4045e2ff1ea6a0b6f6bae9461
+EBUILD ant-eclipse-ecj-4.4.2.ebuild 1248 BLAKE2B dd7249882bbb0c2511e424165dcc12ccdee58baf9985da2182d31d451fa1fb94f736407e303bc1a61d9d43355a7142fd7af1078ff7277122540e1bc0a47786f5 SHA512 310dd8cb237d922b55186fcfad23136e0861464dc6aaa252ea8615a9dcf61a3f6042c5edc463af1147fb1f9d4c76b61fca15a035b8b9718252cc8d9ef85c4277
+EBUILD ant-eclipse-ecj-4.5.1.ebuild 1249 BLAKE2B 4f0fd6db9c642716d87396a421521a5087d014c41235436596a1e3d81c32ffc71d6734d1dd858b1d3c4ec088b8adf1cf2920402575910f51f1bda35c6a6f964d SHA512 45c87738ac2c850d2fbbcf1fb2cdbb03b271900b63324f6d9418337431da7fb260371a39814354e6abae1115fa9e84ffd43d6036be7bca724ff0e32780bef69f
 MISC metadata.xml 546 BLAKE2B 1d3e6201cf0f0e87bf1ede2db78c4c706d9a59df9321a0820a9d180c7da9736c4af6a3442c1abf175e45969447ef9c8e0a0f8d73ce50985405c445f14c694903 SHA512 999312c6cfed7b52584e3e80ac1a9f5b372a05b1f6523f859b367080e7989c988e2773fd2b0f5ec5fb11da42386e37dffedf761324a41b43c309b3ab5a57fd36
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.2.1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.2.1.ebuild
index 1f176373088e..79c8636d1587 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.2.1.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.eclipse.org/"
 SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF/.0}/ecjsrc-${PV}.jar"
 
 LICENSE="EPL-1.0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="4.2"
 IUSE=""
 
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild
index a18201abd582..3656f27ea48d 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.eclipse.org/"
 SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
 
 LICENSE="EPL-1.0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="4.4"
 IUSE=""
 
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild
index 82815eb9ed9f..3e841d328273 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.eclipse.org/"
 SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
 
 LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="4.5"
 IUSE=""
 
diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
index 73507155f375..b43b1128551f 100644
--- a/dev-java/ant-ivy/Manifest
+++ b/dev-java/ant-ivy/Manifest
@@ -6,7 +6,7 @@ DIST apache-ivy-2.3.0-src.tar.gz 2790722 BLAKE2B 87a79bad15b9b74517ce240fcfd0ae9
 DIST ivy-1.3.1-src.zip 1302693 BLAKE2B fbf6da871fdb629810bfa15ec977da4e998a987bd509e80c462d6ebfc113f88ea0c609526795bc414cb0d17fb424c345e40d2fc1a6d17ac8a8bcd25cd9c9bcef SHA512 35c425ea8adc714496dbc2bc0d5a6037fe295967bea9014a16850e54ab3925192e42579ca1e23d68d776326e81e1e195ce85f1a7791a6b0b20ed179c09a22f82
 DIST ivy-1.4.1-src.zip 751792 BLAKE2B 3a6ca8aaa49be9c664c3de4789debfe5770bb32084c548aa49a8d6146b55391729d5d68758e26f29253ab727e8a2a731961ba45419f3c1a212b26d74f33b0a0e SHA512 8ccb4680e8c32178bf12b74f4c6df668bbdd06c6dce6a2d0bf1b9daeec8fb5166d4d510cadb247dc4e2a91b71f5dc7fc429d0d7faed95a2898fd4f9d0888ee8d
 EBUILD ant-ivy-1.3.1-r1.ebuild 1493 BLAKE2B 0d104f5fa4acd078ccf125aa4e39229bbdb3fa221ed3890bdb907d32c1abdcc8fe46a51b0e97d445d34a6de726905debc6fa8ad5b5660abf47bcc59708b9d4e6 SHA512 09c988206b8822d450ad5219d5aeaf132ace56528d3e2065569e228628381ee61fc6d308b70f2a0a557682aeaf32c8b2e0a04529922892c07c813606faa570b8
-EBUILD ant-ivy-1.4.1-r1.ebuild 1767 BLAKE2B 9b3beb8bb2d9cbbde91f7df759bc6eee474ccfee4a54cb9dee045d2e12b0cded1a49a7c539e8abf115624c2d363968131fc7d2f17df944f2305efb966da7544d SHA512 b3bd82273c970bb54860ae10863583cd7e750beb43998adbf6bf30a630397594e4cbcf95a6819f0f0c7fd86ef41340ff163e4f17d8294d2373a593218533c1be
-EBUILD ant-ivy-2.0.0.ebuild 2000 BLAKE2B 70881cc7b48cc531a3627b3e9c8570a71eab4c21350513e5af7b3498fce94de04c3880b46c5c412e8408f3e46de55d124d77bb7158b20b1d357ae9c14d3e515d SHA512 24e2f9ce7b08aad3fcafc35a783b2d8e05c1a8dfeb320a1911211ae4e0b1a6a110ba6c7bc3ab2b2c961a5b689f0c1c0cf1284dad2290222ec824b60ce5399092
-EBUILD ant-ivy-2.3.0-r2.ebuild 2224 BLAKE2B 315d3038a03e0bd78a560b942acc741193604eb24edf1dd00c2c616c5d6e31329a4449178dfca86dcf96a061d28f6e528e210d56890b5cbd281e47de59096ab7 SHA512 a0a2a60ec9e604e03a5323bf603700b7b3d184f9e5ed320323ec56a2cd1340b3dd1bbf9d719bf117e053a738ce94920c2a4471ae5da5f9f7f8dd26d0b55bc2bd
+EBUILD ant-ivy-1.4.1-r1.ebuild 1757 BLAKE2B 5617ee2809bc014234ffd8a36389e01dd6bc4df89a065b2529fd32c8f6136abbf1866437c7d9344bd1f164cc60409c6b022ad15bae7da12c6629ee34b49f2c24 SHA512 43597be452606c70effd32cab90499d00e9cfd79b4ecae340c70c2a007304a4eddc3d9b40ff908bb2458a0f0495d1c3f37076d90a902ffc58fb6ec384591ce8a
+EBUILD ant-ivy-2.0.0.ebuild 1990 BLAKE2B b7b6b13e81772b1ae7a0a54fdafbcb66a3291ab703d9bd9b1171f7c947a515ca544fbf2aa0b52bc6d08627bca3a8ef73356cd0ae21039bd1f6c00f30e9b98162 SHA512 f054419d16331a9fb1af8ed39f9d2eb5857bfc3c8322cdd448d92236d9fffd60b4f9ed373521d71b1b498fae954639e452289ae62fdd2d7fc3c666c221d45095
+EBUILD ant-ivy-2.3.0-r2.ebuild 2214 BLAKE2B 6183c26c9a6386780860bc9a85d52b90605078837f9d8955c483a68be1296f8be5c5faf149129e7d207321008dbbc8d29251a2014792943310230e8c13353cca SHA512 6836c73cf116e4314bf504040f0ca6bd76cbd6f63d4f867700f5dea8b44e961e57ccd18305ecccfb9977810e4600e3e171e17cfce9f3269e51347f944ae451f7
 MISC metadata.xml 655 BLAKE2B ae710cffd6d182e1f67df6734f0bb1e3b61daa87629b8259f8d75f7476fa732904cd73d2ef02d496448191e33c069d3d284a79aeedb87323e28c029e8ceaa40f SHA512 81eb7f4ce41f17a43b32ac6e4ade9677397696cab06ae94964d1756d6745aadc9d61df9ef3b0749eb547b62fdc5bb19a98484268fbce9d56773be09a03671c0d
diff --git a/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild b/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild
index e480764befa7..9fb36ce5839e 100644
--- a/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -22,7 +22,7 @@ SRC_URI="http://www.jaya.free.fr/downloads/ivy/${PV}/${MY_P}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 COMMON_DEP="
 	dev-java/ant-core:0
diff --git a/dev-java/ant-ivy/ant-ivy-2.0.0.ebuild b/dev-java/ant-ivy/ant-ivy-2.0.0.ebuild
index aa8ea1ea251c..f40c108edb8a 100644
--- a/dev-java/ant-ivy/ant-ivy-2.0.0.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -20,7 +20,7 @@ SRC_URI="mirror://apache/ant/ivy/${PV}/${MY_P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 RESTRICT="test" # We cannot build tests yet as there is no org.apache.tools.ant.BuildFileTest packaged anywhere yet
 
diff --git a/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild b/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
index 02b41428352b..aed774920476 100644
--- a/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -22,7 +22,7 @@ SRC_URI="mirror://apache/ant/ivy/${PV}/${MY_P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 # We cannot build tests yet as there is no org.apache.tools.ant.BuildFileTest packaged anywhere yet.
 RESTRICT="test"
diff --git a/dev-java/ant-jai/Manifest b/dev-java/ant-jai/Manifest
index 40e3c9e1a61a..e999fb035ec0 100644
--- a/dev-java/ant-jai/Manifest
+++ b/dev-java/ant-jai/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-jai-1.9.2.ebuild 340 BLAKE2B 2fb1d7ed5afff4edf4ebb14f8aa89d10c1ebe809959c268ff9bf68deb3a1446d0bf44cea7b2079551946d1edffa24e945f4f673ab820f310b3a2d25271674c7f SHA512 a8bc99512c1587fab1aa02e4f2fb187cd25b5204413ac0c394e2d10967289245f6dfad6728ea77abf0e62e3a4cee48b2c6923f7286607c4514ed58e6fc33213d
+EBUILD ant-jai-1.9.2.ebuild 330 BLAKE2B bd2f662e949c6ea8155595ecf7778a6cd7453e19c7dc4e61e3ee4880755005ea628a34091209e1d53c856accd3b3694e83857657579b27411147d498003dba99 SHA512 797fe5463151d9a66ccc7f4fdc666dee23935b36d45c1543ee6221d7a0d74c400921b9456677e3555f9f8bdb3242a658f3e361b54b1c968b4d19f999ad27b7a4
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-jai/ant-jai-1.9.2.ebuild b/dev-java/ant-jai/ant-jai-1.9.2.ebuild
index f0535e9d7c1d..4d424488a10a 100644
--- a/dev-java/ant-jai/ant-jai-1.9.2.ebuild
+++ b/dev-java/ant-jai/ant-jai-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,7 +7,7 @@ ANT_TASK_DEPNAME="sun-jai-bin"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86"
 
 # Unmigrated, has textrels and there's also some source one now too.
 DEPEND=">=dev-java/sun-jai-bin-1.1.2.01-r1"
diff --git a/dev-java/ant-javamail/Manifest b/dev-java/ant-javamail/Manifest
index ed67caf43f49..508d2aaf8583 100644
--- a/dev-java/ant-javamail/Manifest
+++ b/dev-java/ant-javamail/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-javamail-1.9.2-r2.ebuild 382 BLAKE2B cc8f980fafe29e0bd646da1e64a755a9c5d01fb4d29aa23ca4087d7654f3dfb5726b154d05f628a63c9e965d5ba7316188f3f88db834e1d4373967ac9a02bd92 SHA512 f4d6f0df610de7541cf9cb3ea043a8f81fe2a2ee4519516c1b9417a815423dbccc4de22d3ef233051e50526190c91c60667b66b26d5aed31c7349a9ae56dc26d
+EBUILD ant-javamail-1.9.2-r2.ebuild 372 BLAKE2B 729648d88eb3d1af5da67c490d0d4437d7dbd19344a81c1c3dc67ede261acf87e170b1e3c87df226fec860440b1184bbdd1fbaa2fc86a85496a51f7b57382a45 SHA512 956c6a3bb062f99efc8d45538d9703e9a90665559079d34e3edaedf0cd029969b84a88877cf8d5a47c6da1a95d5e1acc915d161a884e11ff774a589863907ea2
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-javamail/ant-javamail-1.9.2-r2.ebuild b/dev-java/ant-javamail/ant-javamail-1.9.2-r2.ebuild
index 4bfc033218bd..f09165a59c20 100644
--- a/dev-java/ant-javamail/ant-javamail-1.9.2-r2.ebuild
+++ b/dev-java/ant-javamail/ant-javamail-1.9.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,7 +7,7 @@ ANT_TASK_DEPNAME="oracle-javamail"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="dev-java/oracle-javamail:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jdepend/Manifest b/dev-java/ant-jdepend/Manifest
index 9d39acb24b15..6f943f0aa79c 100644
--- a/dev-java/ant-jdepend/Manifest
+++ b/dev-java/ant-jdepend/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-jdepend-1.9.2.ebuild 347 BLAKE2B 8bd2488947c7074f3c943146a3b7482f0a8119eddf3d4a3a965f6f2fdf5134f5613cb0275807e93413bb6c71f7b73c81089d059224304ddbd0d03cda7e23bdf3 SHA512 2496c86c4dde5df6ec98450fc6d4a82da97a9380de7f47999c28ae60bcdc62537a54aafef38b0b79f5cc7c4a7a1d206c96bad6d3427fdba585c8c73fccc82156
+EBUILD ant-jdepend-1.9.2.ebuild 337 BLAKE2B e761853e3f289559d234740faeff0155ed6dba6d22983edeea141785498f83f1854442cb0f55704d602ef844131b0678a4e42d1998317706a0237067c76cc9a7 SHA512 b8c848cc52646142102056f523f2fef73ac28bf6f1899522e74a7b32caf7adc8003f8e923cd46ad3e245a771b2a9b7fc5df46a81303795209648b9542f2af4e9
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-jdepend/ant-jdepend-1.9.2.ebuild b/dev-java/ant-jdepend/ant-jdepend-1.9.2.ebuild
index f808cbe1d6d8..fd84d5ea01db 100644
--- a/dev-java/ant-jdepend/ant-jdepend-1.9.2.ebuild
+++ b/dev-java/ant-jdepend/ant-jdepend-1.9.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/jdepend-2.9-r2:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jmf/Manifest b/dev-java/ant-jmf/Manifest
index db13a9b0cacb..0c68af7be756 100644
--- a/dev-java/ant-jmf/Manifest
+++ b/dev-java/ant-jmf/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-jmf-1.9.2.ebuild 452 BLAKE2B 8db7c623600f424d222378b2c3307c26ab1601c5bb5e0801c8acb4397fa8fc0f6905ed17e14d22daa8cd7ce0f1c3becdd0c3b124c9f5514fad3308d86225e1d1 SHA512 4c8c3e93d4bd0fe60b5b18e4e4536b8b2b9ef63a59e050db9b2424466cd6a81a5237c64ba22e28231a8fbcd9761cc3700336703a3b1313f6ac24b839c2ec827c
+EBUILD ant-jmf-1.9.2.ebuild 442 BLAKE2B 72c38a29c480b64d268a4fcb35343360fec007cdd9bc5001fc85117f881b9380384574767b57d337dbce4e751dcd1b9d9f9153070eb70625035226e7dd543acb SHA512 25ff6db6ea214003d27446f52a20fee2c34a78b4ee0f4bb96995d4059b1b3d2f04abd116a9c3bf086b9c507293063dcba7a1d96e667cdaac76679d1d77be6700
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-jmf/ant-jmf-1.9.2.ebuild b/dev-java/ant-jmf/ant-jmf-1.9.2.ebuild
index ab8386e7cffa..bc8934bcd488 100644
--- a/dev-java/ant-jmf/ant-jmf-1.9.2.ebuild
+++ b/dev-java/ant-jmf/ant-jmf-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,4 +11,4 @@ inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional tasks for the Java Media Framework (JMF)"
 
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
diff --git a/dev-java/ant-jsch/Manifest b/dev-java/ant-jsch/Manifest
index 1bb861697ea1..85dafcf55d79 100644
--- a/dev-java/ant-jsch/Manifest
+++ b/dev-java/ant-jsch/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-jsch-1.9.2.ebuild 344 BLAKE2B 8c4dfa503ddfcdf497e2164cb833f7a9d4788de1d34771d86e3239ae38b7b0689803a7d67e097a0f4cae82c53b44abab95d738ee0565d44b8cefa75fc7b2912a SHA512 72cd533c5a834c0e0465bb61c43aad4eabff9d807b3c6ed1e6eceb474228179b82693d0ad45e19f5bd85de7f4729f74cbc45743a70e914e9dc96e2da2de15d36
+EBUILD ant-jsch-1.9.2.ebuild 334 BLAKE2B ca0fb3b2033c1405cfc6ed4d53ff1a00313d584c8bd70ffde3856f64cd2f5792ff82b91d5cf2fd6743e772e528188b244c45b6f52d7ed943621a20d1b4748bdd SHA512 eab9878016474d7c2dd04994b97f37fab9e7556dabb6fc4e556fd877ca274bcda0d04c349c9e59a0e3b20e46c75c3baaa4df40f7fa339b4669b340f81bd15c04
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-jsch/ant-jsch-1.9.2.ebuild b/dev-java/ant-jsch/ant-jsch-1.9.2.ebuild
index 2c3a6d228113..bf0f7290e70c 100644
--- a/dev-java/ant-jsch/ant-jsch-1.9.2.ebuild
+++ b/dev-java/ant-jsch/ant-jsch-1.9.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/jsch-0.1.37:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-junit/Manifest b/dev-java/ant-junit/Manifest
index 0618ee2c0739..447f2adcff58 100644
--- a/dev-java/ant-junit/Manifest
+++ b/dev-java/ant-junit/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-junit-1.9.2.ebuild 462 BLAKE2B 971159facdc6fa9807860883b3fde4e1695912b4368e253c5270624f1678630e0d9e258c4babdb9cf3e64b7f2446b34c106f32332c4d8a0eb1b614b04a18d89e SHA512 0730e8fb193fccec8f16804d67f8603334175380dc1d216eb0163806fda1e39df0d4bb1ed5d03a5090ce52c40fe83ad7261c926b05eb2fb6aa0d1c012ce4c6d1
+EBUILD ant-junit-1.9.2.ebuild 440 BLAKE2B 1591305f815f914e673e2b32b2431cfd0366d8624c1b7f5714ee467c5f447bb2a1d6f1e3cc06b8158df038f0cadc00db673144d175861e18e97df4d67630354e SHA512 60fe961cb9b9f919ed04ec80d79cff2ac7468fe58cdd76de85170bd51ebf6b6443d449c80831713ab3b221ba2feb8db28f3c64458a8cbf17e008df75ff340ef9
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-junit/ant-junit-1.9.2.ebuild b/dev-java/ant-junit/ant-junit-1.9.2.ebuild
index 5d38d7307664..262d4c31b670 100644
--- a/dev-java/ant-junit/ant-junit-1.9.2.ebuild
+++ b/dev-java/ant-junit/ant-junit-1.9.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~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:4"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-junit4/Manifest b/dev-java/ant-junit4/Manifest
index 7d2eb0746c96..5a1f955ac92b 100644
--- a/dev-java/ant-junit4/Manifest
+++ b/dev-java/ant-junit4/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-junit4-1.9.2.ebuild 902 BLAKE2B bfd665b3e2f39cb9265514c017449d8261b62be63c6faae86ac3a44dd95c8bddd477bfb1e5dc2ccf49666227b8b827ae5637512212256d37cb10f89ba65f8d16 SHA512 d5b0ac15ce7e0700518f12515fddef3758a6f6a2d9c8ac3eda4db6fe9a7b1871e2845b0845009ccea47428eac9426a5a877d04d4dff4c5911104ea582f4e3a9f
+EBUILD ant-junit4-1.9.2.ebuild 892 BLAKE2B a86fbea1362673fa5a870d99aeda048af324cdd17378d544c26407d156ba4a95153711e6a640c484aca4920e12237e3a3ce79e5ee0ab01e331fd036ef2ba9149 SHA512 fb4d96d2c9f25d3be82aac963a73198f84fe98f0a517e131c604b3ad3b97f62ef517a3421fd947daa1dcab68e27c6d33a4647d51b875f3b1d90b1bdc93f62358
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-junit4/ant-junit4-1.9.2.ebuild b/dev-java/ant-junit4/ant-junit4-1.9.2.ebuild
index b58b83bf4437..7e52132ebaa4 100644
--- a/dev-java/ant-junit4/ant-junit4-1.9.2.ebuild
+++ b/dev-java/ant-junit4/ant-junit4-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="junit-4"
 
 inherit ant-tasks
 
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 
 DEPEND="dev-java/junit:4
 	~dev-java/ant-junit-${PV}"
diff --git a/dev-java/ant-nodeps/Manifest b/dev-java/ant-nodeps/Manifest
index 99f2deecc45e..83cf4e50464a 100644
--- a/dev-java/ant-nodeps/Manifest
+++ b/dev-java/ant-nodeps/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-nodeps-1.9.2.ebuild 932 BLAKE2B 19cffa8a47e3f60709df316c7950a0df8fb2d1b6a66eabe6b1505be6f376b600b0b70f1f066d4ef24843c3dcb114860718ea49402c412ab7338b4410e1db855b SHA512 469024e1ef97f587af650b8b5be03442b0ec92512edb1ba1bd9299f714f268192d423b493f1c7106cba877f4209fd02b1d7fe2efc4e0416f94a0c361d24ccd6a
+EBUILD ant-nodeps-1.9.2.ebuild 910 BLAKE2B 1070d9ed907ae07fff24be179bf2591b6b8e5bec091fc7409a17799670a111c9f6da8f8c84aa80c9623cd4c249063971a412066f29ff36580e761059d837f27f SHA512 123fd523f2c641e0c64dc857b90111dc1f57aadcd28872f09d380310e44687b9a5ec34a65655ffe6e70412ec8ed33392793888f9d298d84f73ac34829437a1d6
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-nodeps/ant-nodeps-1.9.2.ebuild b/dev-java/ant-nodeps/ant-nodeps-1.9.2.ebuild
index 4e74b362cd6e..11cd200f684f 100644
--- a/dev-java/ant-nodeps/ant-nodeps-1.9.2.ebuild
+++ b/dev-java/ant-nodeps/ant-nodeps-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ ANT_TASK_DISABLE_VM_DEPS="true"
 inherit ant-tasks
 
 DESCRIPTION="Formerly Ant's optional tasks w/o external deps, now compat empty jar"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Dependency needed for jar.
 DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/ant-owanttask/Manifest b/dev-java/ant-owanttask/Manifest
index 67f3b9499341..17da93cd3ff0 100644
--- a/dev-java/ant-owanttask/Manifest
+++ b/dev-java/ant-owanttask/Manifest
@@ -1,3 +1,3 @@
 DIST ow_util_ant_tasks_1.3.2.zip 1170518 BLAKE2B bf0792c7ea18f8122a6a8755d976e109bf0d4bc6b26e8ae5dd7e9bdc8d6f1e16e4e0ff40ded79ebb571b57a433e96dd9e259843091be1efa18ac4bb227ea8e89 SHA512 c2ca84d34864b075c39e9699ac1a41c2980615ea6d813d007ee503fe19cfd5c869cdd0f6be27cbfdafc33aa49c32022b99ced2387381fdb6816925957207a603
-EBUILD ant-owanttask-1.3.2.ebuild 894 BLAKE2B 710e106adc26c1f96c6ad0ee4b2c80534f00ef5f9f5b59fe21cb4ac2bb523d222d4122de1e5b9c05dcda44db9a41581ed0b492f3393d58243cd3ea32a0ac6470 SHA512 30ff00a5ecfe8df095e22452ecb1bb76f135f2830f221dba8f3b3a9480ca452e57e98dec2c761b33e32d045022dd0e65d4e703cb2ba9b77142b5f5bf7059f952
+EBUILD ant-owanttask-1.3.2.ebuild 872 BLAKE2B 2f271ca7df182e8e98dbbe7b6e1e5b8a5d8ce2b412e11e70f755433a8d57fefdcc44460cb20d3b748e34c010aa0d61a491f1c3d6669b41b788014be7bda83ad2 SHA512 b7eeaf61829e0686a3690e11c19ebdcc17addee299a8def640ce0a2229b93c7f6c5f13938ed4e2290539ac09e7f0c39b05007465c0660e9e1cf918dc10a47fa4
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild b/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild
index 160cf111ab41..0a15fae99035 100644
--- a/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild
+++ b/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_${PV}.zip
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 COMMON_DEP="dev-java/xalan"
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/ant-swing/Manifest b/dev-java/ant-swing/Manifest
index 3c1fd7cb21ea..972b58225f99 100644
--- a/dev-java/ant-swing/Manifest
+++ b/dev-java/ant-swing/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-swing-1.9.2.ebuild 388 BLAKE2B 7229bd08988858fa37fa33b2b44e900dcfb6bc54768639c0d6fa42a50966bcf6bd138c0e9faad6bdea09a8e91cec52325f64a54ae45e8b8e8d5e6d2416c3e8ed SHA512 0bfffa2ab4b814e95cdb9bd0917506463b4eff4145c8fae2e721584ecdafd09fdde177c0aae5f3d85a54ae7d3451663fd5db35acc9acc1b130b1287b6c5c1bf5
+EBUILD ant-swing-1.9.2.ebuild 378 BLAKE2B 929e21c190b22bf1a2208d257a1d869fea004c18c1744c20868ea5b217a8ccdae554d4d191825b43574c2ca51ca97aedc0d9cff5b10ddf26e8cde9650c09f8ea SHA512 1ffdf04554b7dfcaf301e28f8c39ad73701ec7c8348a4dae57c0f39183a8a044a51a363d9645ab0815ed4b0c0a9a7e294ae4c16acca25597f43d4ffc6de8f177
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-swing/ant-swing-1.9.2.ebuild b/dev-java/ant-swing/ant-swing-1.9.2.ebuild
index 4885f92ae62c..ce2b13e20711 100644
--- a/dev-java/ant-swing/ant-swing-1.9.2.ebuild
+++ b/dev-java/ant-swing/ant-swing-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -10,4 +10,4 @@ inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional tasks for Swing"
 
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/ant-testutil/Manifest b/dev-java/ant-testutil/Manifest
index 0248c85529a2..8ae65e5e79a6 100644
--- a/dev-java/ant-testutil/Manifest
+++ b/dev-java/ant-testutil/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-testutil-1.9.2.ebuild 889 BLAKE2B acc7b5e42f7a2f481fef3083ecd1c917809040d243294e7a5783f89453b2fb41c2b00b10611d05eab5c0e6c846813a7c467992b8c544aeca4528f52af85af700 SHA512 20530af423ccdf6f3ac96cc1cbd5910ff790d18e4bc4ca672f0c48847b66edfaeb12121af3a20aa36fec85dcb86bb3683f6e17a6ca3504a4863d0a94b07ea18d
+EBUILD ant-testutil-1.9.2.ebuild 879 BLAKE2B b5d43761171505f960122afe17265f0d76e2c336a00510daa726adb31efba3586389a924acd37cdaa26cdfe6ef788b67c35de0ce972fded71e9fc3e56bdab346 SHA512 35fbd1785a5d1ed76bf8cb78b90d67fdb1eca04fab19f45fa04e2d2e80993ed2432d8ef1198f1bb0464691169bf76748cdd7c2ae862e48e80d3173617e9b9739
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-testutil/ant-testutil-1.9.2.ebuild b/dev-java/ant-testutil/ant-testutil-1.9.2.ebuild
index b3690e3f151e..5b82bd8d0c38 100644
--- a/dev-java/ant-testutil/ant-testutil-1.9.2.ebuild
+++ b/dev-java/ant-testutil/ant-testutil-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,7 +6,7 @@ EAPI="5"
 inherit ant-tasks
 
 DESCRIPTION="Apache Ant's optional test utility classes"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CDEPEND="dev-java/ant-core:0"
 
diff --git a/dev-java/ant-trax/Manifest b/dev-java/ant-trax/Manifest
index 7f8371bbb27d..061d01a53044 100644
--- a/dev-java/ant-trax/Manifest
+++ b/dev-java/ant-trax/Manifest
@@ -1,4 +1,4 @@
 DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-trax-1.9.2.ebuild 920 BLAKE2B 6e54374b7c0a720048f5f225a2f05624e363dbf27905e14e4d32ea2c7fb3e2a1a2f7ca80401eecda679b48444f7ffd4b5e574025e8726162a6c8955103782048 SHA512 b38466c2f955dd5169193ec180966cf85f31a99cded54dfce1f9f71acbe01b63dc650faa4994e6bb10e07b52d2ae6f27e18eae67665d8c265e497ec977703598
+EBUILD ant-trax-1.9.2.ebuild 910 BLAKE2B 3980b05b32731b1a97f4574fbd3a2127b05e13160fc2d93d3d8f859e3d8b1dee5bdacbbb8e3b63618dbe19de790c8896d82cfab806924464fce4525f9d6f23d7 SHA512 aac3b8e362f2c0fff8426437dadf84e64fae853dd735d7ef26c97cfe0039b000be9ab9a4b53bada5eec23b9189554dc9ed65b72242089927c43a69b63fa5fb07
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-trax/ant-trax-1.9.2.ebuild b/dev-java/ant-trax/ant-trax-1.9.2.ebuild
index ea41617835ec..e6c1636dcb56 100644
--- a/dev-java/ant-trax/ant-trax-1.9.2.ebuild
+++ b/dev-java/ant-trax/ant-trax-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ ANT_TASK_DISABLE_VM_DEPS="true"
 inherit ant-tasks
 
 DESCRIPTION="Apache Ant .jar with optional tasks depending on XML transformer (Deprecated!)"
-KEYWORDS="amd64 ~arm ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Dependency needed for jar.
 DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index 90d8c52ef7d7..93ee081b1a5b 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,2 +1,2 @@
-EBUILD ant-1.9.2.ebuild 2112 BLAKE2B ea062986a684790717ad3462beb6f8a71ebe41a78c0c6e0d885dd375e881d715eb1788bc71b9f791a339e6aa2ac946a6aad0dd50a9190069a422b238f5422267 SHA512 9c1b76d4536b4638b82a868d8913a2b53466e442eecd5eef6e511e276af0dbeda8206709ce912c91b47699d79cae10bedcd26ff6c32fcf94d263eb86dc58d2c2
+EBUILD ant-1.9.2.ebuild 2102 BLAKE2B e024fddb5059511959821e2a1b56e5da26ac1a9d07708cc70ffb0425118294c7418d59d362ed56ebfb61166c8315f8f81006148a99beb2d5611e9e5f95dddab2 SHA512 e384f395421d69568246bdb370d7b3e40a06f4d96c727a090ce64997b20fec585680e36176507c132b74b44716d72559a781d8acb71c86dc749deafe48785bb9
 MISC metadata.xml 1159 BLAKE2B 393c61676e20af2acd08d2ecee954ea68ddb794f3aaf52bb576f72049b8807b25b8122919254d41cc249c88b375283d459193fe2c05dda46ae344e6774674ca2 SHA512 daa64360ccca2ae691a7d47b980cc35eb0c4577fd99493b235c4931861edc60a0bce1c7da5d360fd58c3c426421a7bbf41a8d9b463783e212dbae91f32a06a49
diff --git a/dev-java/ant/ant-1.9.2.ebuild b/dev-java/ant/ant-1.9.2.ebuild
index ab04f04399ef..c1ebdce94aa0 100644
--- a/dev-java/ant/ant-1.9.2.ebuild
+++ b/dev-java/ant/ant-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -10,7 +10,7 @@ HOMEPAGE="http://ant.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="~dev-java/ant-core-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index ba4f0af847d0..19ee2f8409c6 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -10,8 +10,8 @@ DIST antlr-4.5.1-complete.jar 1478820 BLAKE2B 7f6ab8d1bad6b75ede4930fe594a3302bd
 DIST antlr-4.5.1.tar.gz 6158475 BLAKE2B 17cf84a60393c786d8b8addd93b87998178cea55f2a6bcc4ca244655a6d2aacc15226111b00fc0a8a6424f8a7c6eb3bfa49172e3b2149714a5c0c6ad69943cd9 SHA512 949306b0ee87a0c002664ee7ac0f32c43385c501b4e28f181417559ce09b07cc12a8441c3bb81f8a72feba3d4ccc693a3c03bcccad7fc81223cddb19e10468a9
 DIST antlr-4.5.3-complete.jar 1485121 BLAKE2B 84d41b17bd30dfad7a79e9759802c76d986299cc592c7b2c859225ed00989bb2709b14635ee40c8ecfe79e2441ecb697b2d17b7e6e789a7549868b93a3876f77 SHA512 53dcadf3007c9bdbeb391ea72fb9bab7c086fa0b9d1d93b83050b2ebb726c2f52743b5ba944c68f6da513d915ab5e8721676d74d823c32484928ccad2a28f1e4
 DIST antlr-4.5.3.tar.gz 6760401 BLAKE2B d436b4a964c527e230912a0ba23146af199478570cf5491eadeb5025e814642658cc71d71e6a09b5df3cc18e9b8991abf930cab70677d117a112e0922e046e07 SHA512 d0e61baebb338e5e4e8eaf87aa6ef52a568ec51bc86bc07acf8f82be0c173ea4f0f85978dfd034c2642505888c0849663f6b6fb030c4c19e0571f29277fb54f7
-EBUILD antlr-2.7.7-r7.ebuild 1110 BLAKE2B fea5fa5af7df07dffcfb0a550209d7be754a3974772c81990f42e0b0d56f992d68a051fd9b7b79fa3852f0554ff92f3bbada51662a90b6f0a4206f176637cf22 SHA512 3222c36c63ca49e4eec7418192eb25b7466b2d39a9c2531ff29db22c93d9c89075fdd59c1571adcf7c3ba98ad2170e920fc30ce4eff39a25c3e02fa7ba9ac3fc
-EBUILD antlr-2.7.7-r8.ebuild 1121 BLAKE2B 0dc704ecefbd7b37965ec0a5a56a87e05583fb5e7b2ce2034b4253f16c420ba31842288fb62d4301db12c720291d4eaad2bba860870f19c8671c68cd87c4b8c4 SHA512 4d2387a3ab329f37496ca8ca108708f2e53de4799bd473deeb1f1f296335370ddfae4527e05f81b3d551593285ef202fc1d57a9ed27c885ae8c6d1f819b71bf2
+EBUILD antlr-2.7.7-r7.ebuild 1088 BLAKE2B e142dbcdb4c0d46a6ffe42b9106156e1ded900014521ce184c0b1f124c4424c059034d60ee0ce1e115baa1bc820934ab98047878522294e355291c19310b71d4 SHA512 f4d31e2a60405ad2934321406f6ade73bdb903ee79304a3726351adbdb8f5f89a1b284fe27e796b3aabe8bfa0b71d0b4941fdc045492ea001d1f0005634dba4a
+EBUILD antlr-2.7.7-r8.ebuild 1099 BLAKE2B 33c966b64de3577aada4aa8e19b367104f89e236a42e78b8ea106682030a5989512e24ed0dbbf0b263716c9c7a081fc81ff1fa77b602d39fbac0abb1b0298d3c SHA512 a308fb2c7c359d206a25fc4215b37d72220f5e33425577d126379c960d1a009c7644dd18dd0e5b5b608abb55c7c34a3f25abcd826cc2c617e0a8d581c10eba02
 EBUILD antlr-3.2.ebuild 3242 BLAKE2B 19729b322437e4ef21672eaa432568b94a6f6bc0efde5ac856e148c55a3bcccf9fbb4631421c2f25a7d09f88758033d2f830d1565ff88051eb7016473b778fbd SHA512 38d68d796dc5ea1bf214779642e9ea40840295c6caf69017bfa92ca623289f9ac532e5262a64d48bd8ef1c709b45a1a9590da8e0636c37377649a6c335bddb5f
 EBUILD antlr-3.5.2.ebuild 2995 BLAKE2B b9825d24f8743279add37e97612644fdad2ff5731ad1806fe610b87e926461c1cf5913c64ff5be1321ca88c46a466a66f5d1bbbbeaaf87eefe4b9c52352bfa34 SHA512 abe140c64f10c39f82c5771acdb2a848ca0ecbfe718a0cb9514805c2109c2f4128b97ae8e5abb81f63417507dcbf5b23b42850d48f1eb826c7e0d390e64cc0e9
 EBUILD antlr-4.5.1.ebuild 2452 BLAKE2B eeb1ef4d8aac8a1317fb494c6943f496d39f706ad4f077afb58efc90f5b92ceb7cea296c0fbd4f1f31dc2c7787f9191eda7cb47584692e7984dc53b4e1b1e1e3 SHA512 ccb84e30811f01bb4d28d38117c75c79b8e0048a86d06194bdfe1aeb7de5b33b9d08e907a850a8a3714e637dcee4a7a396cd314ffc6c8472671e236220bbdee2
diff --git a/dev-java/antlr/antlr-2.7.7-r7.ebuild b/dev-java/antlr/antlr-2.7.7-r7.ebuild
index 3eae09ac430b..09dc38c165a3 100644
--- a/dev-java/antlr/antlr-2.7.7-r7.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.antlr2.org/"
 SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples source"
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/antlr/antlr-2.7.7-r8.ebuild b/dev-java/antlr/antlr-2.7.7-r8.ebuild
index 7b6c1b00af0e..10056965f258 100644
--- a/dev-java/antlr/antlr-2.7.7-r8.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.antlr2.org/"
 SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~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="examples"
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index 73241703aae6..9ab18dd6a0d8 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -2,7 +2,7 @@ DIST asm-3.3.1.tar.gz 854626 BLAKE2B e8738aeda26f72c4630d33f1696188501022b4764f9
 DIST asm-4.0.tar.gz 752187 BLAKE2B 00795e18a65d1c3d17ddb722fad20c0c7b01101ffc766a0d5f82da83ce0763401c36857780ee82267d18fa67993314069645ffc188207e4628e99626b3409a07 SHA512 642bc32fc0310b8e4291386866e53ba62802f2ae888163cd6e879232bbe3c3728c3a135aa667f91aec5bbb743621c2ee2d2a1a1d1ccb36c5249874a5ba9b08db
 DIST asm-5.0.3.tar.gz 781742 BLAKE2B a2d3f0e59244d27c090be8cfab67f86369a6dae0c49a3526ee25b7c4454c93df1efee461c9a4be33b414161b66d0df65b935ff06850ad8fa6a48fdbc178e77c1 SHA512 fb2fbddbd01ec6d355d5f218db801512a160b505e91c4ad81cc1a0f1265c358cf8df6140c216e2d5acc109dc2286c29de6bf5b60b29a094e70c96070a54b20af
 DIST asm-5.1.tar.gz 791417 BLAKE2B 90ee3e28b20ce649763c43cf1b0bb495995dcfc31a534d774c727d201a913b8ae25f4c015e580c9d73b6f3a847ce32720a0c2b0ea61eab8b35e92be4beaab2fe SHA512 de702516f9e16686c027c9a200a1750e6dcaee96bb1ed8bc0591673404d015b8817e37f210be645681dff7a2c31f7ddce8b406ccc8c6e11f1424e19c04c38f1e
-EBUILD asm-3.3.1-r1.ebuild 892 BLAKE2B b905c78e41c4083b76484a041a94f2c7059197826359ba3923c707368d55c3b2d7459c8047874477444212a3913e0051e4e47d1b83980d95a19bc1b8ff0afa5d SHA512 4fcc3252ca4526fae84a7661a166bdeb991a67ece5d6879ee668ae89c8872b5169e607552a3cbdb4ef795a78b207cc51697537bd5bf38ab8d7145751bea6c5f4
-EBUILD asm-5.0.3.ebuild 1221 BLAKE2B 508a8fb279babc15c72447523a577a0f7231f7137e1c469edcbdac79be8fad64f60ac8ce992cc126ca074de894ac8803b3e19ca2504309607946caed3d875a66 SHA512 559011f6e853b362131a88d849c5f2e590b34d7f5ddae5e215045df2682a49dbb4a41a9b89559ca4d9aa283226e885261728cc5d3bc3c6da63db44ae7de2aab8
-EBUILD asm-5.1.ebuild 1217 BLAKE2B 63204e07991620ab24fe862312e8dfb80d3812c60937812ca364b53db040f150fa05c3f32e8e1e38a8c1197f04524840abe35ecb66cdda299c5fdf2f0dc8f6fb SHA512 4901ecf4564e32c51a6715e59e55ada8d22007c4de3ff23fa3cb372c10291c0cf6d82c474efab3f378bbe51edbafb1065b7dc32cd1fb2cd3b43bd7199ff31274
+EBUILD asm-3.3.1-r1.ebuild 870 BLAKE2B e51b652599a40b8845d5c35ba37d6f20202c92092fab393040dfc7f9fbd17834d8afc73869065956bb4b2bf2d14b62f3d0c200b3dc8524bd029d4d98c244db8a SHA512 55384ff316829c25d191ec5d6280a487627ae2354436ff9ebd7ad0d10efb32d734a9dd33bb6cfa0cf823bf4d4b84b7651605cf3ea7b2a6022aba848f849afb43
+EBUILD asm-5.0.3.ebuild 1209 BLAKE2B 79453429c1e78192909435ae7247f0e11e4464ed38f4a0d2d1c2cfe5714ec1e433aed16ad5f0433abb07bee40369a5b5b135d644bbcf36719336d658937343e5 SHA512 3c03125070730ce4d554d163afde459b1f862235fddbff7788fb50556772c8709107c84eb56948c5c4d2bb2e86c9e98be18417ea70b573e562efac971f97003e
+EBUILD asm-5.1.ebuild 1205 BLAKE2B 2fc237ee6ad8d607b484b69034da962ea5136894b564e143ff51f7170f85a856c85a40da78eb43209e8472ffb0f0dd873cf6da87553381e73ac6a6521445ad2a SHA512 45710856d07d89fecd60c97605792eb723e4ce0c30301c38eebcffc36427851b0ce58c546cda2a075cd8c5bf639dfcf65c07945793da872b05bb53207204ab41
 MISC metadata.xml 978 BLAKE2B 6b111138552526b7876570392f2cf2bc1ff8fd72909c8565746e6f193c0e929f7a06e2e3654fd3fa02ae86250d4cc98c838217d4b4f22fc63143ec64f979b7a6 SHA512 79bd031562a3e6208ca10683f6ca33edb8d542461d96058f36e8c218b667b9815fedd006f02a94572118444023c169c466dc9bd5eade325654bd274be23e5a61
diff --git a/dev-java/asm/asm-3.3.1-r1.ebuild b/dev-java/asm/asm-3.3.1-r1.ebuild
index 06754913be5a..e37a56ad9fdd 100644
--- a/dev-java/asm/asm-3.3.1-r1.ebuild
+++ b/dev-java/asm/asm-3.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="3"
 IUSE=""
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~sparc-solaris ~x86-solaris"
 
 DEPEND=">=virtual/jdk-1.6"
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/asm/asm-5.0.3.ebuild b/dev-java/asm/asm-5.0.3.ebuild
index 52f63bc8cbaa..6bd00d55c4a1 100644
--- a/dev-java/asm/asm-5.0.3.ebuild
+++ b/dev-java/asm/asm-5.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz
 LICENSE="BSD"
 SLOT="4"
 IUSE=""
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-fbsd ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~x64-macos"
 
 DEPEND=">=virtual/jdk-1.5"
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/asm/asm-5.1.ebuild b/dev-java/asm/asm-5.1.ebuild
index 43675d631d19..e71765b94842 100644
--- a/dev-java/asm/asm-5.1.ebuild
+++ b/dev-java/asm/asm-5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz
 LICENSE="BSD"
 SLOT="4"
 IUSE=""
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x64-macos"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x64-macos"
 
 DEPEND=">=virtual/jdk-1.6"
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/avalon-framework/Manifest b/dev-java/avalon-framework/Manifest
index f71ab494cf2b..aca9587904f6 100644
--- a/dev-java/avalon-framework/Manifest
+++ b/dev-java/avalon-framework/Manifest
@@ -1,8 +1,8 @@
 AUX build.xml 1838 BLAKE2B aa6ad2f58ef4bc96837c5f616376e2bc6dca2b338d0bdbff575b4ba0e45381e18d96c3266769fa23af60888d1baeb86e9456abb091f08cf92a54389e579a05d4 SHA512 a6dafeac52a7e7421c6e97972407b7b5424a8e35bae66153c52b92419c038d0cf31a049619b843ece7f26bcb1fbd675ea36475857609820ab6c66d03d4f8da2b
 DIST avalon-framework-4.1.5.src.tar.gz 99475 BLAKE2B c57c89661042137dd0f5b8d6fe4295030a861499b300d84a8c2dc6364d6bdca443cda96e954816da0351fda3d3ce70d47734656949bffba8d823f7e1c9f4ead9 SHA512 7a15dc2f7c691d7daaa5cbb589eb21e23ef8d6232b5bd1b6b3bb1d6962f4a4dd2dff0c0a1793309d7e8f3aaf4e75de65a9705431e1103c2e33c575770131471b
 DIST avalon-framework-4.2.0-src.tar.gz 68887 BLAKE2B da71631548bf725315c57439c5db017107d4dac529fbfdd59f68da6b97faa8b9a78fc5d89b05ccd05c7ec68b2de05d286ece6654137278b3e8873c78c65adf6c SHA512 b53dc20ecec058ef0b35a626bea6e04f85f6ae8b3645d7dc5c33c194db49b42071093cd305ef718f925b948ec1b885b2a0d8bec534592f97dc48d6e93db45671
-EBUILD avalon-framework-4.1.5-r1.ebuild 940 BLAKE2B aed1991f3497d43d7b1b2b2f963b04e3be4b5b3ca11998ebe63d1967c2297c4b2cf910338627aeb998a6a084cb19a494a4164656d19c8fd1a6c23d868b3bbd55 SHA512 2e07a19eada2a13044f16cbb9eff6f9f9a136992baf6cf886fd1aada114490f8302f32dff42678ce34d2b2f028526419a76ccf5c4253dda7fb954f9b81dabf66
-EBUILD avalon-framework-4.1.5-r2.ebuild 928 BLAKE2B e4a0aa00bb7a42185ab2dfa5c0888fe54ec4ae40a43a3f9b0ca983cee4d4e1428abc69f7960ab2e88e9ee20a42bc00890f5153e4144c113f0c2bc8963f9ad5f6 SHA512 c1febfbd2c41261b8fd5bd431cd294395cb629b5b1603598d1393bfadd2fd4c26585e7b4459100d65a4ce38c96431dc1707e8c0d92357a85facecea04d3d8837
-EBUILD avalon-framework-4.2.0-r1.ebuild 1030 BLAKE2B 376fbfce3cb53e6e3a1f1372917e86ba6068b283e1d0c77973eaee654e963eb6b1aeaae5393b3acc7d5a322e5128119263b2166628b111ab25226e86972b0c6d SHA512 ea657648b3339066ceecb5424b6909ebe2c21b960e0fbb14410c5f6cab251829940a7498f1a534dd9c78db542c8e81adf9efe4396071d7702ebcf22639b13cdb
-EBUILD avalon-framework-4.2.0-r2.ebuild 1014 BLAKE2B b05aac50930bdb2e69f411488b4cb010ec14047dd9b9a24f076c8e9db3998bd84855b57be8ab19702e45cdcf2ff81d9c8eec59df4a1e58bff42a6e26dc6f1f2f SHA512 3201ed57be828054cfe12e60fa46bfbfd1ccd443d5b524afbd6d4cb7f9f89eb6718ab0cd4554edd5ea74319d8c1256eb6471a01a69684aceb52bd2b5b6877e2e
+EBUILD avalon-framework-4.1.5-r1.ebuild 930 BLAKE2B a1b11b0cccc86e485aa6f13db83a86679e4e472c7de9b9cb95293a56f8e605801f468f98a16cd7a61452a160e22f942f548f437f678d805ac1e6f2f9d74f2fdb SHA512 fd124b4c5a0ba411f84871e151915ba95f84e2221657813bb9423c00fee079b0d6155087064392e1869e9fd5bf7f92ed6b52594940e32e04e6bd8dce6b8e942a
+EBUILD avalon-framework-4.1.5-r2.ebuild 918 BLAKE2B a056554d0ce98cb5d6fadfb64d3dee801ba126bee4c6818dd069ff75b979556a11e15584a39940a64dcf5283dfcdf8714cdf540b75b6e13da477695157f3ea6d SHA512 47630957356af551f77d6c5070e5b6aaf15fa0049ff20feb9c16fa1abe54c228e1d10cbbd8d06e54ef3920d4d5caf7b09895018d4694dba4b348dad5ad454279
+EBUILD avalon-framework-4.2.0-r1.ebuild 1020 BLAKE2B 9b254a2503286f3fa550015ca4fddae86fbd2755779ed8bf10c6189de278f17c665178e8b0631cdba19c5a0840670ad26167b2eff4c50796839354d6d4cf66cf SHA512 09915968d7f41194ee47feb4240459561445751a29120797c2fac1b71bca64d4756a064ff07af32337d8a7965330c4efbf49049675792456ca198de12f914b15
+EBUILD avalon-framework-4.2.0-r2.ebuild 1004 BLAKE2B 161856652897e992c483ea7d1711394d5aad6b3ae1ca7f2371b6d5bb44fd69b549db7b1f8bc5677599306bb3577fdc2ce9dfe756d3c7c2c891eb1fe54949b39b SHA512 2f3b59f96c7d6a4b7aef7375a8b8dfadf6dee4beba0259233b50bf468eb0710a9428f4bb8a8ef4b06aeb6eda5404b489b3d4c4306401e1cac5d33bae3e223fe6
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild b/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild
index 91a7684c2add..433a40e70c74 100644
--- a/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 JAVA_PKG_IUSE="doc source"
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}.src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.1"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 COMMON_DEP="
diff --git a/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild b/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild
index 1e98a016672c..4e0a11914774 100644
--- a/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}.src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.1"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 CDEPEND="dev-java/avalon-logkit:2.0
diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild
index 5363933b783d..3a80b4691dcc 100644
--- a/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 JAVA_PKG_IUSE="doc source"
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.2"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 COMMON_DEP="=dev-java/avalon-logkit-2*
diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
index bec22f05cc29..18d039354186 100644
--- a/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 CDEPEND="dev-java/avalon-logkit:2.0
diff --git a/dev-java/avalon-logkit/Manifest b/dev-java/avalon-logkit/Manifest
index 2163bdda8193..beb1269a4f67 100644
--- a/dev-java/avalon-logkit/Manifest
+++ b/dev-java/avalon-logkit/Manifest
@@ -1,4 +1,4 @@
 AUX avalon-logkit-2.1-java7.patch 1155 BLAKE2B 8e5a7756fed565d23cb7d9265171ad7c42c7c1a1f1f81284461aaad1d85718d77a7767f51d8e5cc7a3724c2a0b15dabc541d1c6c8fbfad670fe56765ac3beda4 SHA512 155bd7d65a2eb59528067605f1c40b1f176228af2fbc11f6560ad929cf5344d74ba79bbd58c7cb35b6065c74ec4e579cea590c0cc23082979d79cd70ce8414e7
 DIST avalon-logkit-2.1-src.tar.gz 60218 BLAKE2B 1c35b38a22d95cffabb19e099d42697adf7aa6ad471f6cb62e02a30b6612c8405b9f7473ca61ea4f7f9c1f3b1ece6ee68f7ec711b79672330db3ac9e57642e0d SHA512 9977a3a172ca4fb5c3ad1f623ff109214f71900d2e244f175cc5d140f5f9993caca7e5ca3220728f18a1d6242d11a48990f9ce0150c36b7a9bb10a7a6d5a905a
-EBUILD avalon-logkit-2.1-r8.ebuild 1413 BLAKE2B 45508e4a0b334959506546284b303d5afc5c83a8472d28a7b0107a74b09db1639492fcd872c54e93b93b302f149f8f46a7fb8684e7a45448ea01f59681c82ced SHA512 aecf4b592f090b545e71e50158e96b7d3a1450814d46a28976482337b075bb13315d2dbdd76360f29306ac4aefd8d07fb8b38f72b803ef42f4bcba0abe33eb7b
+EBUILD avalon-logkit-2.1-r8.ebuild 1403 BLAKE2B c7886b499be92a24d299f86c040709a387caa925fd8db8c0676d2046b9e5a80053ffa3f32fc197dffca18829de1047f56c2bd048ccc7d41c87d029b42cfebf8e SHA512 132b042be721384a2686cd483aefcfd10236c58dd8fc0560d415d6f8fd3d5b913f67eadd6eca1a689cfce3a244f7c8875b7f5c2128f1d53c8612dcd8ae21a255
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild
index ae9c353e3e14..4db25f78e353 100644
--- a/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ DESCRIPTION="Easy-to-use Java logging toolkit"
 HOMEPAGE="http://avalon.apache.org/"
 SRC_URI="mirror://apache/excalibur/excalibur-logkit/source/${P}-src.tar.gz"
 
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 LICENSE="Apache-2.0"
 SLOT="2.0"
 IUSE=""
diff --git a/dev-java/backport-util-concurrent/Manifest b/dev-java/backport-util-concurrent/Manifest
index 06921a2ff1de..4d168e737f13 100644
--- a/dev-java/backport-util-concurrent/Manifest
+++ b/dev-java/backport-util-concurrent/Manifest
@@ -1,6 +1,6 @@
 AUX backport-util-concurrent-3.0-notest.patch 491 BLAKE2B ea587be0736cd1aa4fcbc4095c31dd321816cbefa0cec4d6f0c8969e24e9e96038b30db4baec0d386ba18828cafad0c2d084b48d69c7db77414dd5282f1197f0 SHA512 f2f53a87283c1a6b13e360ba0140a93b0580a023cefbcb5dcd8658ddc7e80c401878229a323416213368f493226b445b5896bb0ff51f1a2bd95ef460f4ddd080
 AUX backport-util-concurrent-3.0-test.patch 380 BLAKE2B 5e1e437564035e652d6c41f8ab75b0589257e955aa06f2b83d8fb488ec7f2d7c4879fdc1556a47599231bf2ab1497243cdacfb7f64f5142bb4728265c296790a SHA512 01ad87f71b07c25193faf1d67de159233b2b298ef4ea31013f3af8d326a09b83f73bdbcfa5629f5531ffc0a0c02b20843c11377f1260448a9758be05c64420fe
 DIST backport-util-concurrent-Java60-3.1-src.tar.bz2 622882 BLAKE2B 49dd1065fb80d697dc917aeff1bf653a1c82bc24e3edf6d1eb272f3cee17130a6db20f562f40e7911a6382f8c545bdf37e1ce34b69a6a7ddf5a569e114a78e87 SHA512 caef9eef43d0de5ee3d05a84b44d3d2f6bb9498bdc82105626bd2631494fcd0347387da9beb6000fe9c80efacbbf2c2c3603a97b53e4c74037eaf629d790cd54
-EBUILD backport-util-concurrent-3.1-r1.ebuild 1175 BLAKE2B 015e98c402d5ed288e381f60a121ff69c5053ff185cbb615f0ae83e5dbc0726a702e4b43eb86688fa7b4f61cecf1a4e490e787eaf168f8ff3a7fa21ac9a86ee1 SHA512 9c1d19331c742c290c45f67c677d7c34986fe536f97cb366a7ab5b84557da9950c97c275d379899998893bf51320a27027439258115ddfdd5534e09d05c3738b
-EBUILD backport-util-concurrent-3.1.ebuild 1166 BLAKE2B 7925d61da7d3da16b9c453282725ca157bb8ded81a06898ce69c24b2b3d5e19968c980367386f6ad8c8029e7d28a8fa8fe27ecabff3b89fe87f101bd79707d8b SHA512 20e2cce05bffd312d0c1741beb55d664cd2eaea61edd603928c17bd7e4e9156c108bdd96bbfe940958f9e02bc82cf8a9e6a16661f9b256601aa13a5271590ebd
+EBUILD backport-util-concurrent-3.1-r1.ebuild 1165 BLAKE2B 85035bdd0b5911c0e7b46e62636ca712812ec111a539bb1b36066c42774e02abe82e5ba58466b46d5acb117bd5bc994b3042398b9ad48388050c37361686c8fa SHA512 0fcd5a675d10f97ed0c1143a65d87067f30b19f20525ea7e3b1ed70280c4d9531e55e1a7415da1d06734c27ad8f19c88c350d8019111e6f8a677b402596f7329
+EBUILD backport-util-concurrent-3.1.ebuild 1156 BLAKE2B 61ec36be722938985d187523dbf08d42da6d97b028d8fca73d3bd08b002b963ad275980528b11d49185a12c2a2c01907a22427f876ee19392a74cb2e4e57c1d0 SHA512 09049db9cc11693d88f0cff4cc2371abcde1ed93c2678a981346cf89cdfd191eb8cd277d419c788e20eeead6ff2c5c8d2cba24a067a08844ff36e9cea787036e
 MISC metadata.xml 490 BLAKE2B 8c30e55ff1a4b70180d42e365d9eba3405a1591438e0fc801383b8a1ee65daf759b2544c1edb3b2a03cfe8f7932b5c4de8d12980c630fd5b625ad2f6a674c291 SHA512 81d2a6f504093869e765c56667feb53583a85c7cfe98bf12f571b2d4e202e5ab247e24b8a92ad5141654069d3a66179fbb28790781464dd43821ab55dee62eb9
diff --git a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
index 2b1c7be0144c..cf1f3470ad00 100644
--- a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
+++ b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${SF_PN}/${PV}/${MY_P}-src.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1.ebuild b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1.ebuild
index 3e86ce6f6466..2a1de217e8c5 100644
--- a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1.ebuild
+++ b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${SF_PN}/${PV}/${MY_P}-src.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest
index 7a0e54c064cf..0e8ad31eba8e 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 1217 BLAKE2B f96d692d13236f69994e3f9c6826eb09e2d68b0eca95fad9c02b1b200f51643219845478be398d041acf935a767b53217a1dae215956f0c9e9892acac837694e SHA512 fa29b909d100207932aa7eca51da0638cf4c85422a5e76df5da73a4069e8adf156ded2ef74b26926d035e1cfdaec5b9bf5584a93dabfcd48c309a64ea3bd4d12
+EBUILD bcel-6.0_rc3.ebuild 1195 BLAKE2B 0c30434811449792b24275b28f518abbd6ea97390d5d4f9e744af468b1c8928444913c1fb53e073a1c8475fec346439bfc4a756d86a8cbcb5a6bdeb8eca2c350 SHA512 7ce0ffd7ef9472cdea7585a9671784c8d8267c6600d4b9c207c80c575daeaf2cc0b2096b48549f7669487749b2a2b9e72688ca44a4a3940383e8d255d30fe572
 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 c50b44a0223c..0dcfd4552f2e 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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-fbsd ~x86-fbsd ~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/bcmail/Manifest b/dev-java/bcmail/Manifest
index 5fead4b078c5..897442c23902 100644
--- a/dev-java/bcmail/Manifest
+++ b/dev-java/bcmail/Manifest
@@ -2,8 +2,8 @@ DIST bcmail-jdk14-138.tar.gz 386478 BLAKE2B 2fee04eee66ab352aa08f72063e0088e61b2
 DIST bcmail-jdk15-145.tar.gz 483519 BLAKE2B aed9d4ef1ede10b97979652a012f18e45b7d4d597cb8b3ad168e847563ce14f7effe429b7f213adb77befeb144c4c3a279738b76718bde85ce04265d62ef8e75 SHA512 2d3232d5eb1cd75ad56a7316beb32880f3f935fcd3ed0a6cb2cc3e1861dc9f0bece0cbae53471760246505adb5c28328691eb82e11fedb0b160c1248d21c48bb
 DIST bcmail-jdk15on-150.tar.gz 221760 BLAKE2B 48c5d3b692295dcf2ce1e73ce58097b20c11cc353a8e13da9b8987f19eb69f1dbb37747e778e9323c170c0a3baa2ec7257681beea8da4e95343f71c5c6ed186a SHA512 91727ddc4bf932cfaedd3cb90a807b5fec3120e56fde3e5fc73bb5bf2e97db50a35a63e0b5e342fe29e4b974579c5cdd5d427d01c9dd8e7abd521ccd3d1959f1
 DIST bcmail-jdk15on-152.tar.gz 240800 BLAKE2B eb7077f742a8746a1ce13c37bcb936c16f49f6a5eec7421d8f3f93048091d123f416a732add10ed5596fc150d3f129e6b216190c48f6bb1b9d226a0e2bf19637 SHA512 e7301991071709b5788e5a813ea765a5e59bb089104a031ca91a509036e7823b851f854e5f96de6a2d2ef817aad4435f78742dea3a9b1dbeb95a6cddf250619e
-EBUILD bcmail-1.38-r6.ebuild 930 BLAKE2B 7bb9d908d4554f793225e87075885b007eae237456e6ebfec3efe4f7b7e9397d95f3713ab87e89ed3016969f462efc36b1b69f0293dca634dab02d79df086b58 SHA512 9e53ed25f488ca4037249a5bf1cd5c4fac18d3ff16fc134abaa3962d3e7dfc6c9d6e328b67c48306d0f2864a3926eedda2b99131fe22c49675926e31bcf7edce
-EBUILD bcmail-1.45-r5.ebuild 948 BLAKE2B 148ac6170c9338a6d6a96aed5dea73e363fe529f903515df6f7281251a7182d56d6fd47734d5f4f62b572f93e8cf06c905be3ec359695732c68e89fc93fdfe87 SHA512 95f9661df2701b0e8afd155269572b767f50654b8cfcda615d600ece833a9a7ce66647aeb7529e06dc5279901915d1496a3f2a52da36d112a6cdaf21f96bfce5
-EBUILD bcmail-1.50-r3.ebuild 1212 BLAKE2B c70ad79b106289b476b6f938c74b5f813d199bf9aebd723739e7217b90b4acbcee603e0e6c60a277b2203cb9b0737a225e3baa4d06ab3b5665627338637c95a0 SHA512 b015ed6e4f7d98575795b45f982c49ff117623f7d820d892543661b799c04522037530c61bc79ea44b247b0412126f6c0aab1df5f4c54517b2814e797f09f97f
-EBUILD bcmail-1.52-r3.ebuild 1212 BLAKE2B a866ace92da8f7135ce2affb449366bff4ccdbb3c170527775e958abc86c9eecb3984a19c7ab9aea25cb2ca43444bfd08b5bc99147fb8341c401977308dfded7 SHA512 3e69d5e7bcc3435de5491286e454ee00fb4b55e5d6f7f3a2a10d37e6fdcf9f03236dee63277e8b5e7427ef7d280b9a548523a5d6d24b02564342f1b8a1fa4e13
+EBUILD bcmail-1.38-r6.ebuild 918 BLAKE2B 76256eb09047227c4762af8e3c8c209a55b01b434b5c2fb1f4f484e4684604e264700b13efe1c0ca64935b93bcb2057d9113036b486642a250d588f946089782 SHA512 2a3500d4c8b22e574e97a4fdc6d6c77ecf641ce36080e49f2b1c693addb601dc0dd607828dbd3880293fb4b56257fe8d8d7781dbe304c31078be435b864409bc
+EBUILD bcmail-1.45-r5.ebuild 926 BLAKE2B 4f3ffde3e41a70c37d9e8529e881ef08d89645d78253cc63677ca6d699c6f2040c62a51fe2a158d3f1872ef4ccc81dc2582e4b84b7dedf87f79d80c4faf69863 SHA512 c4f846ae38bb7862ac39ae7472f5d25d1487cc67cc2731cc9bdf05e03d3356425f7e3e323650422b4f88f1e5d0dfb754465d8e953757cd1493a319ebe44a344f
+EBUILD bcmail-1.50-r3.ebuild 1190 BLAKE2B de5dce6dcce067dbe08ae08eca5c5769814bc4dece868c136b84703be1c12191048650044432ff2ce27276a3c76ae9e0267b6bd02fc9c1b0ceb1ca93719143c3 SHA512 d9b391bd4b4076d57b8109fd046a95e354273e1061a239915707305f175327260d7063b0951f606bd8e204232fdd61f4e30aead42147afad6873dca1a661fa50
+EBUILD bcmail-1.52-r3.ebuild 1190 BLAKE2B 23b0b40fa5af147ccf7b70fd4e5f10bf3f873cf1e4a4f73f8429f1b68b7eba65e8f5d2a1675a5f12827189eed2a2c43ac92b1a65eca5bdca701a8f7be57ad8ad SHA512 325d3e340faa4efe028447703ae9e8c33f3de0a1f311d6c4512eab65c4c830235ac68b2f9380b41bd97d56cf5d4d5cf93de5ec495337c0015c7756146783d4e6
 MISC metadata.xml 369 BLAKE2B 878e0ea0c58e12199e0370cd6898f990ec0b7c884e9937d11e8dac850e203e18f892f3a4e19e9fa98d9607899e4284c6f2760e8f4da352840702a27c07326e8e SHA512 d97ce68b00b528488ba871164a2fc5aee28d7128e756e381c2f1d1d0abd31c67204bbbfb2e61b0d3484a9545d279493f197e0254833353378aa88aacf3fba018
diff --git a/dev-java/bcmail/bcmail-1.38-r6.ebuild b/dev-java/bcmail/bcmail-1.38-r6.ebuild
index bb3e46cc7b9d..7a441755a8bb 100644
--- a/dev-java/bcmail/bcmail-1.38-r6.ebuild
+++ b/dev-java/bcmail/bcmail-1.38-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.38"
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 CDEPEND="
 	dev-java/junit:0
diff --git a/dev-java/bcmail/bcmail-1.45-r5.ebuild b/dev-java/bcmail/bcmail-1.45-r5.ebuild
index b7ccc9eedd46..88f13dd1b289 100644
--- a/dev-java/bcmail/bcmail-1.45-r5.ebuild
+++ b/dev-java/bcmail/bcmail-1.45-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.45"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 CDEPEND="
 	dev-java/junit:0
diff --git a/dev-java/bcmail/bcmail-1.50-r3.ebuild b/dev-java/bcmail/bcmail-1.50-r3.ebuild
index 9ced27690d87..7a0136a1aa48 100644
--- a/dev-java/bcmail/bcmail-1.50-r3.ebuild
+++ b/dev-java/bcmail/bcmail-1.50-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.50"
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 CDEPEND="
 	dev-java/junit:0
diff --git a/dev-java/bcmail/bcmail-1.52-r3.ebuild b/dev-java/bcmail/bcmail-1.52-r3.ebuild
index c53fe54fdc6f..8f6f1ad4c443 100644
--- a/dev-java/bcmail/bcmail-1.52-r3.ebuild
+++ b/dev-java/bcmail/bcmail-1.52-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.52"
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 CDEPEND="
 	dev-java/junit:0
diff --git a/dev-java/bcpg/Manifest b/dev-java/bcpg/Manifest
index bac3301b81ca..5d8e52dc919e 100644
--- a/dev-java/bcpg/Manifest
+++ b/dev-java/bcpg/Manifest
@@ -1,5 +1,5 @@
 DIST bcpg-jdk15on-150.tar.gz 691012 BLAKE2B ee566fb6deb44177e31bfe80b6bd1f13d39d6820cffe3693bd85314ccfd65c4805275b3925d52a6bda6b1ad7e3ea267f1f0bed3926420b5920e5f300020ecd9a SHA512 763d253b9bb45b7e7fab75d557daa784c3d4a503ced979adc986e5688c3939db248853c864a2f4bec6d5b1dd9ed668d5f278c91b5607774fc703971d0b330fe6
 DIST bcpg-jdk15on-152.tar.gz 748424 BLAKE2B f847fa95ae4eff6c9c95f23ad318d3b967bd224a5dbaea20f8e904a50173076e16723519e8985d4afd2ac02c6a7fe83399e0c6005971bd460b41055c4866a506 SHA512 1619a8cd4024129876266415406882ac5df3dd84fd3e01d7593304874ad641fe72ae95150d0e4414b294e2e5ca8eb39e41a25658f9502b4cd9622fbf0f3d45a0
-EBUILD bcpg-1.50-r1.ebuild 1537 BLAKE2B 7d97ec149303d510fa95ab8fcc047cce9ad5a1141f1209e0bda5cc125a728a36a65b6b203cf03ac081e6fa45d112d57231b666cbae08b47433e8af80a58ee73c SHA512 cd517a2b295436ab520a1c9e67c880e9bd5bfb73328f98bb0a25bf7a8caf3eb7d21cda75700b7fe633123f815eaad7238e147f0c2196f3c74ae7d4f0d916aa56
-EBUILD bcpg-1.52-r1.ebuild 1537 BLAKE2B 060254ddfbb298c595419d8232a3abd404607768ff43709155df368fc9244f85a011df916c309167cd68a8adafaf9f76f31f216f6bc49dbdc4c007f7b548c33c SHA512 a658c4093e5622b2d70ace863b1a30823d553a383c2422503db60c8e0d22177c06b6fc72b547263ca9b4f3219b5ffef1b113d01eae48cd42c64ac42991ae09c2
+EBUILD bcpg-1.50-r1.ebuild 1515 BLAKE2B 25e57aba985350e8922eb0edf9f6a12dbc8f5a2750e4d45c1cb9eb0df0b9ba909ac1eb8d2aa151bdaaa123e7e6accce4eb6182fdd9105c39a2414de9eda46c07 SHA512 eddecb8d3365fe745bf132119d52a46d12a835973e5c9e3e0121822f53b525e8ee24a2b3a6c98920082c24cdc7daf2da6d9d27784abcc424dc41dfbd6a185558
+EBUILD bcpg-1.52-r1.ebuild 1515 BLAKE2B 72b4bf72e59b56261b478537c5a29ac660a1504ba824c69c17355d61bdc9284b90e4aaac577856c145576eceff0ed1d453fad2fd22f6fffa70b2c4ec0f00cd3d SHA512 fe5f38bbb296c0217acf3564e403b184dae5e3e87f7a782b55a19e316869fd41853e9c8d7825e51a6825020965c5a7f30c884ba36ccfbb030555d5ddcc948814
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcpg/bcpg-1.50-r1.ebuild b/dev-java/bcpg/bcpg-1.50-r1.ebuild
index 07ea7c547e7b..b895d1674885 100644
--- a/dev-java/bcpg/bcpg-1.50-r1.ebuild
+++ b/dev-java/bcpg/bcpg-1.50-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,7 +15,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.50"
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 # Tests are currently broken. Appears to need older version of bcprov; but since bcprov is not slotted, this can cause conflicts.
 # Needs further investigation; though, only a small part has tests and there are no tests for bcpg itself.
diff --git a/dev-java/bcpg/bcpg-1.52-r1.ebuild b/dev-java/bcpg/bcpg-1.52-r1.ebuild
index b6d307d74531..74354a732de7 100644
--- a/dev-java/bcpg/bcpg-1.52-r1.ebuild
+++ b/dev-java/bcpg/bcpg-1.52-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,7 +15,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.52"
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 # Tests are currently broken. Appears to need older version of bcprov; but since bcprov is not slotted, this can cause conflicts.
 # Needs further investigation; though, only a small part has tests and there are no tests for bcpg itself.
diff --git a/dev-java/bcpkix/Manifest b/dev-java/bcpkix/Manifest
index 8e80aab55bd3..fd987248372e 100644
--- a/dev-java/bcpkix/Manifest
+++ b/dev-java/bcpkix/Manifest
@@ -1,5 +1,5 @@
 DIST bcpkix-jdk15on-1.50-sources.jar 401716 BLAKE2B 7a656218b96da46027c82a023404c32b92a640aa0ed5a1256213139e8dc54f9ef07453478dcc66372a0a49562b92165148f18a5063c24f7569a3e40f649494ba SHA512 6dc6d63db649a94f54c7739144b4120db4255e0a0a713389d54fcd427b95a3ff5ec326ae066cb5aa8a6cf19ccb959cbb22f9f898d39bfe5bf8e20c4d9de6931c
 DIST bcpkix-jdk15on-1.52-sources.jar 422301 BLAKE2B 10a1b16d0d1f7560ce71f9f99c6efaede73250a1ae298c22396c6ac1eeebe0d51c52f8a6a6b1ff68cfd11ab076d5dc97182fb0accd53e769ef9fa65c6764961c SHA512 55f33846e16f7367a25df0933c904b435933e96d0e881bb949c3e3812618fc0d0b5a2901efa779e02a6f48157231da197e2bf5d8037b22169330fa374b07a988
-EBUILD bcpkix-1.50-r2.ebuild 737 BLAKE2B 40a987a45c9f10f81331be0447529752e1ae948ca42c873e1a182209276e19c03eed57a1a7ff5507492b82dca99117e06614591559d500df6df9dc7337d5d5cf SHA512 aeea3a125f1111440d35c19c4d1570b82bca0f6f6fea30f55af7736c737dc09920b23b5cbaeec335a399509ad05edab1a387a4b90c676040ee83a0ff3999f5bb
-EBUILD bcpkix-1.52-r1.ebuild 737 BLAKE2B ea760a8dbf169110131dfea87973009e8fc9c10f12e068ec2f8bf5988a70c14eac5b0fc20a3daf62f6410bcfe7e58db40b212371b86043e6927d829cc2ab1925 SHA512 9a1cf24f1b10a782388b3c92a0f86c43f8d317819640e3a9b8098e1dec821864bfa8f425c4193f6b44b28a46e47b107e02169eb00654cca4870f4ba3042bd30b
+EBUILD bcpkix-1.50-r2.ebuild 715 BLAKE2B f2c0de3af8417fe27d20ba8f167fb2077a2f9dd1cf813b19559f6a163a30eca41803021bcd2b784ab1d8dd9f36de09bebc25287c47eb3f9cc2eb0b1d6bca9f5b SHA512 e9e7eff9f0cc68bb263b17af42dac1daa3864b5d50072dd7f9e48262a86c38bf1aa3fc8d61722b538ddd5f8ef70107605fd2d67fbbbfd5d08b7acd8379d4e84f
+EBUILD bcpkix-1.52-r1.ebuild 715 BLAKE2B dac94d79e39ff06e6fd097337774a8aecc02a96ee4960dd52bf9c2d81c7d18db3d0a3006486cd71b55cb55469e26af1b9134a101fcabc63914b45cdba5cc468e SHA512 d49f72ca1073cf56257e0c6abab3cb734ad9c2458c03579c0f6772428d0ceba62591b1516b0790a288f6be7aaff403bc8a8064898d74422a93c119c23aeb0779
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcpkix/bcpkix-1.50-r2.ebuild b/dev-java/bcpkix/bcpkix-1.50-r2.ebuild
index 3f226f1ff42e..4689c228fa4f 100644
--- a/dev-java/bcpkix/bcpkix-1.50-r2.ebuild
+++ b/dev-java/bcpkix/bcpkix-1.50-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -14,7 +14,7 @@ DESCRIPTION="Java cryptography APIs"
 HOMEPAGE="http://www.bouncycastle.org/java.html"
 SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
 
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 LICENSE="BSD"
 SLOT="1.50"
diff --git a/dev-java/bcpkix/bcpkix-1.52-r1.ebuild b/dev-java/bcpkix/bcpkix-1.52-r1.ebuild
index d5c1e6bffc5e..e99938a8a878 100644
--- a/dev-java/bcpkix/bcpkix-1.52-r1.ebuild
+++ b/dev-java/bcpkix/bcpkix-1.52-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -14,7 +14,7 @@ DESCRIPTION="Java cryptography APIs"
 HOMEPAGE="http://www.bouncycastle.org/java.html"
 SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
 
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 LICENSE="BSD"
 SLOT="1.52"
diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest
index a702d10a9382..b412ec24eae1 100644
--- a/dev-java/bcprov/Manifest
+++ b/dev-java/bcprov/Manifest
@@ -6,16 +6,16 @@ DIST bcprov-jdk15on-154.tar.gz 6903567 BLAKE2B 12039cc6c7dbe06b74a0be8f948220959
 DIST bcprov-jdk16-1.38-sources.jar 1197644 BLAKE2B 758b3c894d648dce357d27f20522f8df9c70e87d83702a4eebf5a96529ba3df7fb65dfd62555544fe5f2757ed3194bccc5bc6d97a074036f8b188d84f1f85a42 SHA512 e8ab0b6f47b9737f19ee548dfc6cf09087d1b9339bc48b599fac05d0eb3b00d355f203787a84ee3a504eff2dffd707237a0cc5e26c64a672a362b9161077326f
 DIST bcprov-jdk16-1.40-sources.jar 1221202 BLAKE2B a046d9ac06ed6087c39c9e2d9ae5bf932727b093b5138f6226a4ebcd95640d7b6b6607cf1bd70e6b7b342b5f4d59c358e35225e77ebe8133e8e81a61f632b4ca SHA512 ed94e54cd7a53b5219d0eebb1651f93201c177faf26724613a520e045987e74c462e7adde491bda5bd092fd651b9a7abef93bfac2fd6f0765fb7651525c199ce
 DIST bcprov-jdk16-1.45-sources.jar 1286663 BLAKE2B da19e2343761f10248f315f6966d071a87660f22fe3e51a35308a3b51f907990ef339f05f0c2367babcb06322ffb4600247ecb22b5a19bba3f5c820ed6fe2d2a SHA512 541b390efafba17c21a25bdf84725fd0f9808555eec9c4db51b0642c348d552417d9ba8d584d54690146f3e72fe3b348ab49f92ca263ea8a7a8f7b27bb7b8e5d
-EBUILD bcprov-1.38-r4.ebuild 1358 BLAKE2B 3018ad2f3f77833bfaf8543b2e460716706a3b979807244d486b11f8a7359c8bb061e821bbb5d5d46ea6c260ce596426ffcfc7c53845c876ca3dc3623c644772 SHA512 76183e337d833143880e5cfcb798c76ea0e68a785906a24f0775cfe215df10188da2080e0cdc310a5f497b2384e7fcc13232bf6d751f4ff36b02bf4a98283429
-EBUILD bcprov-1.40-r2.ebuild 1358 BLAKE2B 85f2d79e12664cba7908f94f46512fc2e59918a56ecd36e70fc0595a527cde5c288b63e5617f017371e52a7be4cfae464834ea64066c128d6ef842b565ac8684 SHA512 6aa905b528082cf89019165cda650cade46cbda100219bbe1252db84402d1dc9760c11a08276142884847349897250d4dc09063de3214c894394564ca51cb6a8
-EBUILD bcprov-1.45-r2.ebuild 1365 BLAKE2B 12067f7f2530a2d7dc9866a833c0c6c658524549d2f46100e79613749134055298e31820c9b776d60cf848fb88f8b77bf04f82cf33a42da96e78c501bed9c49f SHA512 8e834b4c37dcc6375b8a4556f41c7b3d0abc2045d1b8b711cbd56d5b4c5125aa7e2d1d356a6e300222acc2ed5434d7f6d871e530696789fe42194d008292c439
-EBUILD bcprov-1.48-r2.ebuild 1376 BLAKE2B d763bae559c65ae580f0123d0889a63e0932d454662bd80efc1a8dd3b5ba3e4b48e9d05f48bc4388b074ee38332165b633d4564493a9fdaadacfb60a8c3cdf8b SHA512 b31cca1f16f497f27211674843d278675ab3a6a695886da6547fe0fd0c63a7dbac2f40e14ed4b8d5f044f399c608b0486eff4abb43399c7bae9535735db21d17
-EBUILD bcprov-1.49-r4.ebuild 1376 BLAKE2B b9f5500c78f8fb55d810fb50e40901b2fc9f789ab343941361787099b5998eeb9d756bec75e701cc4a06c3065d46d2498824f78dd1da8bd3c503c849fd5835e3 SHA512 f485ab13f87f2d2c4ee975cc263eb043049788b1ea52e7a965351e374a6ab77d407b6f2168dfc5302567819778f188c9c7db4867e1053fdf98f8a0e3580e3aed
-EBUILD bcprov-1.50-r2.ebuild 1369 BLAKE2B 11a2fa6579454417baebe79ef73fbd629e2d32fb13ee8f062517d9f8c3dc996b6a4c67e39d74a3f721fb419df64dc13f3ea3097905402e41791ac413397b5bf2 SHA512 85506401327286ac8328e2da29e5cacc796231733bd5c3562fdf0fc64ec7e715edcd2bb4532849382f0061ac57e60da24f81ff6450ced024875f29a1b23d35b7
-EBUILD bcprov-1.50-r3.ebuild 1373 BLAKE2B 3ecdc3d8f91e071bf104bebe4ded6a8eb2a90db63bc6675505c2d5228ce0f4c89a1e72abb5d57f939a38ac62f95f852fdde08af74cfcfb5b6e0b8340bdcdd42a SHA512 b7f33bb1a7af3f76200744c7e5ae4b2bf2c954943769efd1c3435e4788a42c4910d461e5456382b83a99ec73d2fb2dae4533ecace3eec7ade04b0679e8e69226
-EBUILD bcprov-1.50-r4.ebuild 1343 BLAKE2B ebb1610618ce98f533206f9cda82b6abfd93c6b009331e768576117efb8254b3b0bf7887360c969047c120f6c988cb682c7245b7185eed20638fa64fbf6599f0 SHA512 a39c2ea407372538797e7d4af340aaafb0c03af44d9ed2796d220db7a7d578bd5de654d1035dd615bb7c77b9fa34a12cb9c76a8e0328bb1d0f1e8d8c1f582e19
-EBUILD bcprov-1.52-r1.ebuild 1369 BLAKE2B 16139479aae765748a2aa496537532583fb3a44c8d914f1286b7abfdef761ee9897aa6d48c059f8c93a751ce24d019beb00099641d5ddf077ab9b0cb0b0f9de1 SHA512 fc27741628da218b68c8d7d55a9a21e6e490c9a6937db331dfe453edc5781ff265198766e4443417308ca390b1beb56b395516caf9c203496a838c13617f3b06
-EBUILD bcprov-1.52-r2.ebuild 1373 BLAKE2B e6452b7f3a2755aafc427513fd4f8cb2b263a00146f0ea81f0c857627414f2ede7663b20949fe5bbe1c122a0367701f3ec98d0abd5cae71c0ad7353b26f85e42 SHA512 29374a8da39e7a7430e45fa95460007f08561132001e7972b5c3fd83b592a77c5e8ca160366a6268abf6c9c8c5cd453a9ed2e3b22972e97cedb467b57a03061b
-EBUILD bcprov-1.52-r3.ebuild 1343 BLAKE2B 411aa48d6b41ed46f5a95b16497f60fa789a814ee49a62cb9209e0ccda9a1867b2cc022e2d3cb3279725aaffd84dc1f786eb70eae5122e4732d428fbdef08d96 SHA512 363c1edd6382849e1585240a92e34f17bb2597b54ce11c4407e23c7dcd6cd3f1cc6c60f8dd990f53aedbed204914b0ba0a9ca6a6cabd23fa8beebc97495ecb09
-EBUILD bcprov-1.54.ebuild 1350 BLAKE2B 50e7edcf0ce1bacaff96b72c60250637ab8aecde38971b722baebef5266ac5a5fc16f14480edb01610a5148d6d084256c4340cb97f0261bcfffc06947b2447c9 SHA512 e04c5bdf3896c522e4005f199ce6e71a761d92498f36265234f845d7407737db188798d95fcb9296525248a7aa00db2393107036496e14bddb5a232ef511f459
+EBUILD bcprov-1.38-r4.ebuild 1336 BLAKE2B 805b34cea2e31c685e8e241cc39bd81545f5de7421006b12f86b3274a09822c42b16a391c7a9506917cb728126dc80c34c2dfacc4a0f21f4ba26b76e5c685fc0 SHA512 dd26a429c403e8e5af917ee25c3ba56891176fd62455e839a9ca3b5046f88d30b8261cb1126a29f37571f290c3232a1789e145e2384f98ffc41805363f750a4f
+EBUILD bcprov-1.40-r2.ebuild 1336 BLAKE2B 8f2f2010097782f0492da774b38bb53460cde92e783ad1c4f78d5545da20f9b3b79bf849d6b7089f4670cf26aa39ee80eec2c48ce3976fc97763e14add3feeb2 SHA512 fe888f263a24ebdc20585cc98bbd9fb2d32c494d695d2eee3d14aae396bca791d4dd3d93e8f7fb20d3c974f31397012c4f126ee0c31d8a3f60a5b06d67d7488d
+EBUILD bcprov-1.45-r2.ebuild 1343 BLAKE2B 1f4e510474a375d532313eb6c6da68fa8b039ee361103d3c44bbc85061ccfce58979118a3be71e190e7ce68bb6c8a291561952a89016bc8a1f3654ceb901ae6b SHA512 d2c2dd791cdcbe27d98b804bfbe5caf5ee04f0a58568ad9917bc0eee43d9547e01cfcd059eba55b39e0e1cde821e75fcb71c15c3bce0afce9213326490341c96
+EBUILD bcprov-1.48-r2.ebuild 1354 BLAKE2B 118806a94e85354cdbe83fab557ae506625cdce911e03c8d3da5e7f059a04eecd37e691adf8c6f49fb2f526f9c68973ace7c62a6bfc4675e9fcf8d5326d08120 SHA512 f3b31ed53af927df1cf491382fc7297aadca264170de9024f1b1123b5debdf7a22d9b97922dd8e5849fcdd586bf5fc89e6bc2657a0428982a6f2893b58df907d
+EBUILD bcprov-1.49-r4.ebuild 1354 BLAKE2B c60a6a2e643aa5a426b154a39071db242c5361e99d8d9ff72853f6071f78f070b9ccbe8a71964b790601900d46e114836dc9110c6610531cf7708b6be7ae800e SHA512 b12cb9c84fd0a89f91850ba8a5ce9b60af846e70ea911adfa510715dcc4535e277c3c841a4e5afc8409dba31d705da3a545e1fa19a8a47f87475a1d33ff6e383
+EBUILD bcprov-1.50-r2.ebuild 1347 BLAKE2B c242438b0f9a8b1802971c1b44424e76bf6c2c11cf359cef7bcb317024c39c7828d6aa901f309055f8c51a180495cf4c3e9e41a788cab4e0a1ae15c3daa83d03 SHA512 3ad3610ab9b2459797bb1fb864582e9e38f85897982f8b1db0ceccb01a80393968a778f11efe04cd59e9b93c5cad2d684e31ac62cc2de6f12192804c847ef1fb
+EBUILD bcprov-1.50-r3.ebuild 1351 BLAKE2B 3092f94f003db082923aaba5140d7b6b5df3247d67ec8b5237c2bb954132fb72a40daecd32e59667c1c3b03c944de6c11d5863902928e80f70137e0921731a71 SHA512 97e407686a4f4fc58cf1a69876944d57a84c564e5cbd1ff06eb94da65afdb0c0f66a6a6e9a1ba379eef21368e072ef8777d550837eee7e115cf50d6ceb40cad5
+EBUILD bcprov-1.50-r4.ebuild 1321 BLAKE2B 3fb23d92770957225bd91d3ddbb81a70bf04a56f890b40e78849fd61c892d148c3f590444475c7afd26ba33a92e1bfb24a3ddd4b8735b7114d205328b479179c SHA512 410204b40d501bfc22d16798bff642b2c9db93f7a08a2b68213737553b17483f472cfc342bffe40ddb5b82b486ddd9198274cc0a8c548ad4f6ea96208a8cbc05
+EBUILD bcprov-1.52-r1.ebuild 1347 BLAKE2B 53b6e67db4ad60cd847a4d4ff23231d19fd158d2a396ee002b91f55a917e5eefc2e1cd9c9c4e5b3dc4b0c1eb0899d693281e0098146de2a448353191092cb50a SHA512 005e608991619786a105699c981c0ac63ae3cd22bd1355aed66693a482b7da25e6474f60dbc11d38c6ab9f8b1202ff3d1b8b6b38f2e404512439b646998957c7
+EBUILD bcprov-1.52-r2.ebuild 1351 BLAKE2B 45190c8d4b5b1118bc9e0156e9cda501f3a8ea1426f5cd84ae3245e379d978b221d2ff859623c1a67abb7e208fc1d746f74fc09ce9a37da15753fdef659a6cc9 SHA512 065b2308e1efd074e2d73d307167bbf940e7dadd5452497c9b2e3bd284dab1dd2a7bfe5644a0193431f82288cc189733af211f9b17cc96c15fedcc15aee04eb2
+EBUILD bcprov-1.52-r3.ebuild 1321 BLAKE2B 82624cae6b6b36512f5c6df7b142da19e9def5dc4994a54b90496152273252cbf969df84404be2e584204ec90dec617eb3e85525adcae69ab5334fb09c77d25d SHA512 4f15bae3a89e35a3b1fa0e5530273570a82e48d945e412181a0dda6344b80fd416967aef1bae5783b45e6599bf03b6046e1ee316d28d34e9eae93504f3a38408
+EBUILD bcprov-1.54.ebuild 1328 BLAKE2B 9dc47ddea0ac595232d2037d5eefa5da6a643838d4204ce73062743d3426eb7adf0dfaa18f74d71538193c55df6c49e1cf4ebf24b12c6985cdc8d2d14aba367f SHA512 8102dbf7060f6f71f2a696e3624938e659e9fd6823b23390247a86b36286b693c96e7d3ba6e3fe7b771eea9b79b4d1d6fa3c4002ad5755d232be6b0c4651e507
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcprov/bcprov-1.38-r4.ebuild b/dev-java/bcprov/bcprov-1.38-r4.ebuild
index 91ee42e0e7f9..e44ab2704b0a 100644
--- a/dev-java/bcprov/bcprov-1.38-r4.ebuild
+++ b/dev-java/bcprov/bcprov-1.38-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.bouncycastle.org/java.html"
 SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
 LICENSE="BSD"
 SLOT="1.38"
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 CDEPEND=""
 
diff --git a/dev-java/bcprov/bcprov-1.40-r2.ebuild b/dev-java/bcprov/bcprov-1.40-r2.ebuild
index 530e6fb9daf1..6ac8d34d571e 100644
--- a/dev-java/bcprov/bcprov-1.40-r2.ebuild
+++ b/dev-java/bcprov/bcprov-1.40-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.bouncycastle.org/java.html"
 SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
 LICENSE="BSD"
 SLOT="1.40"
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 CDEPEND=""
 
diff --git a/dev-java/bcprov/bcprov-1.45-r2.ebuild b/dev-java/bcprov/bcprov-1.45-r2.ebuild
index 1b4ff67b4d8e..2722165d64d1 100644
--- a/dev-java/bcprov/bcprov-1.45-r2.ebuild
+++ b/dev-java/bcprov/bcprov-1.45-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.bouncycastle.org/java.html"
 SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
 LICENSE="BSD"
 SLOT="1.45"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 CDEPEND=""
 
diff --git a/dev-java/bcprov/bcprov-1.48-r2.ebuild b/dev-java/bcprov/bcprov-1.48-r2.ebuild
index f8982a92a2ed..f3659b9a509a 100644
--- a/dev-java/bcprov/bcprov-1.48-r2.ebuild
+++ b/dev-java/bcprov/bcprov-1.48-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.48"
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 CDEPEND=""
 
diff --git a/dev-java/bcprov/bcprov-1.49-r4.ebuild b/dev-java/bcprov/bcprov-1.49-r4.ebuild
index 1524fdfa90a3..3e9043e3333e 100644
--- a/dev-java/bcprov/bcprov-1.49-r4.ebuild
+++ b/dev-java/bcprov/bcprov-1.49-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.49"
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 CDEPEND=""
 
diff --git a/dev-java/bcprov/bcprov-1.50-r2.ebuild b/dev-java/bcprov/bcprov-1.50-r2.ebuild
index 2b5749707691..1eba489d573b 100644
--- a/dev-java/bcprov/bcprov-1.50-r2.ebuild
+++ b/dev-java/bcprov/bcprov-1.50-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.50"
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 CDEPEND=""
 
diff --git a/dev-java/bcprov/bcprov-1.50-r3.ebuild b/dev-java/bcprov/bcprov-1.50-r3.ebuild
index ccabfc96056f..08a9cb8ef610 100644
--- a/dev-java/bcprov/bcprov-1.50-r3.ebuild
+++ b/dev-java/bcprov/bcprov-1.50-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 CDEPEND=""
 
diff --git a/dev-java/bcprov/bcprov-1.50-r4.ebuild b/dev-java/bcprov/bcprov-1.50-r4.ebuild
index 19461145ea01..72fcc048689a 100644
--- a/dev-java/bcprov/bcprov-1.50-r4.ebuild
+++ b/dev-java/bcprov/bcprov-1.50-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.50"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 DEPEND=">=virtual/jdk-1.6
 	app-arch/unzip"
diff --git a/dev-java/bcprov/bcprov-1.52-r1.ebuild b/dev-java/bcprov/bcprov-1.52-r1.ebuild
index 46de42c22e14..2ac1295addb8 100644
--- a/dev-java/bcprov/bcprov-1.52-r1.ebuild
+++ b/dev-java/bcprov/bcprov-1.52-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.52"
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 CDEPEND=""
 
diff --git a/dev-java/bcprov/bcprov-1.52-r2.ebuild b/dev-java/bcprov/bcprov-1.52-r2.ebuild
index 1569b79f728f..2bb1d2ce9d88 100644
--- a/dev-java/bcprov/bcprov-1.52-r2.ebuild
+++ b/dev-java/bcprov/bcprov-1.52-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 CDEPEND=""
 
diff --git a/dev-java/bcprov/bcprov-1.52-r3.ebuild b/dev-java/bcprov/bcprov-1.52-r3.ebuild
index 41830e429220..a3cf4ff83b52 100644
--- a/dev-java/bcprov/bcprov-1.52-r3.ebuild
+++ b/dev-java/bcprov/bcprov-1.52-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.52"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 DEPEND=">=virtual/jdk-1.6
 	app-arch/unzip"
diff --git a/dev-java/bcprov/bcprov-1.54.ebuild b/dev-java/bcprov/bcprov-1.54.ebuild
index 81485c298715..0b89cd3146bc 100644
--- a/dev-java/bcprov/bcprov-1.54.ebuild
+++ b/dev-java/bcprov/bcprov-1.54.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.54"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 DEPEND=">=virtual/jdk-1.6
 	app-arch/unzip"
diff --git a/dev-java/bsf/Manifest b/dev-java/bsf/Manifest
index e2ca42aadc65..bfd19426542a 100644
--- a/dev-java/bsf/Manifest
+++ b/dev-java/bsf/Manifest
@@ -1,5 +1,5 @@
 AUX bsf-2.4.0-PyJavaInstance.patch 1650 BLAKE2B ceb772a69d454d1d85e05486d28d13824724813e7875f731a165aaf97bdd7f0c006baa927e849f82de7fa16228c3de5847f8d59013142f8df4823a951b42c785 SHA512 7946622658473ef4cf6b5921f58d224f7378cb00c345a748653306d2648a89b5ab3ed68786d09bbb170b95dc657f7f55501013c854536d6dfd6b38e6a1f3963e
 AUX bsf-2.4.0-build-properties.xml 1984 BLAKE2B 6db0c1ca7f899e95a0728d61b79ef6c0a1320ee747b5479c9c50a7bd258dc7fee0b6b569e3813f323cbc694d405f9af1d269dd5370ac82e6eca2bde5072d905d SHA512 d262daec432d7a22c217e24089f22e4c349be0487fd00a2e6992e77770a3699e7e2b5977e2108455d7f73c31b372d6a73febdff2856e256f93b25f3781e11679
 DIST bsf-src-2.4.0.tar.gz 299749 BLAKE2B 41f3cfe77b1ccf6b78493df7f5f288b397234b3236977c4b7d2e6c85b330e40319474419f560eefa1632da4d0524593b8c3e0c66cd27b852749b1405c20df5a6 SHA512 a1e7564fd14abbf725fee75c4b0ba5f92d7eada0e242ad05897753bb4afe639d859c42cae1d684e8dd9151409d4cc68e1a422a70bc74d8016144cc30d03a2d43
-EBUILD bsf-2.4.0-r2.ebuild 2723 BLAKE2B c6ae0f1898b675b8db7a2b7110c6eed151b04654ec49a7580c4278fe806c083c4e0a1de347af23fe69209c528b08cccaa2b7f68ce593fa0ae169ac34b35059b3 SHA512 6b53ba359ac3700336d89886d1bc4dcc30632cd40ff4d618741a9fd030ec9d9f3f4d76acfb7ceae6603cce23e1c6e242e69ef24737d8da4be22a48a8bba0165a
+EBUILD bsf-2.4.0-r2.ebuild 2713 BLAKE2B 36f4a13e7af9b0c02106346cd6927ca94d05cbbdd52e9fb396b789b5f1b1123232793ba2c821b1b8d620707c658d8002612bc1a35d3a4113242085e8cfcde736 SHA512 a639398a172fc896f123832b0ea5f5026c565a779f9848eb9361d77379cd61ac404ac2a6fb03f27dcf61a6e083e24980ba0a06679bb4f56ce437c7b993f036d6
 MISC metadata.xml 903 BLAKE2B 65b2684054dd53636f1fddfa7b83c5fc9bf9c10253f12d426a8641fbf431418c24acaf6762e02159f5a2f3e1bd3c16fe97d4b44093ff04a518a79d2645f11515 SHA512 f55f803d1d0fc7a1ce20ea5d46ee89afe46b738362a2b78adfd5f6a4e9d09360f3522de148c56a9b2fae9370df1ed003611d7b68b8ba8e2e4cd7ff5683696abf
diff --git a/dev-java/bsf/bsf-2.4.0-r2.ebuild b/dev-java/bsf/bsf-2.4.0-r2.ebuild
index d079cbe696f2..ba7669ffd2c1 100644
--- a/dev-java/bsf/bsf-2.4.0-r2.ebuild
+++ b/dev-java/bsf/bsf-2.4.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ HOMEPAGE="http://commons.apache.org/bsf/"
 SRC_URI="mirror://apache/jakarta/bsf/source/${PN}-src-${PV}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="2.3"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # If you add new ones, add them to ant-apache-bsf too for use dependencies
 IUSE="javascript python tcl"
diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest
index 5c68080d3d06..7761b988a4a0 100644
--- a/dev-java/bsh/Manifest
+++ b/dev-java/bsh/Manifest
@@ -1,3 +1,3 @@
 DIST bsh-2.0b6.zip 1994608 BLAKE2B c06b783fed6a1b433d5c6efcf3f2343493c96895863118326f41076d56465b88b9139810c8ae38895b9c2c2da226788ef8ba7657b1ceadcac8ee8e7ed79d9c07 SHA512 ce461cc74bc48580c636c2f2e55e4e734a2b2075547cc5663722866e5c978a680051131c13240afb586a777ab93165119d1f96f9623bd9747f8e7d8293dd3bcf
-EBUILD bsh-2.0_beta6.ebuild 1323 BLAKE2B 9ccc3622ae1747258124008ca234ffb7f52400c3f029fd3a136c6abeb98bd4b0d44422c939dddda1bc4647a0f75972972f1b8fdb315c7cd7b19c92fca78a95ed SHA512 fb991116582686e7d6c07d4135c481831bfeee0a4f3d2fcd69c6d33f3989fd26a506085b4eab9b54e261abd9e9bf0819d260d00304378e6300acb519463923ac
+EBUILD bsh-2.0_beta6.ebuild 1313 BLAKE2B 67d40df99363970f214d50593c4d300f6e29a03c3208bebe8636ecfd4dd5394943ab8c07e5777210d4e31fa4894c8856c4fee92262f99b50bf810b6fd431c6b2 SHA512 5294ec898198726a1b5c1261bdb6d19bb23da96101882f82757a72b585c0453b26325244f2aebdc691ebb13cc09397f7b5eaa0f2f6b47d36a902ab52c2b8961a
 MISC metadata.xml 330 BLAKE2B 4295b9afc957d9b69add3267ff62910a7cb8bed9b918dec04d0f56612f452b669639462479e9627c2fd451977c4f74b2ddbf031b395e34e11a0af34a70405d8b SHA512 5c495c72dfc5d55c63b0af0740b0b82306e047817965a8c095dc6ae89324af842d5f8ccaa218107ff715544051e9c984fd1997ca11786a9c0fd070d72441b7be
diff --git a/dev-java/bsh/bsh-2.0_beta6.ebuild b/dev-java/bsh/bsh-2.0_beta6.ebuild
index e0de82482628..2026697f5ffc 100644
--- a/dev-java/bsh/bsh-2.0_beta6.ebuild
+++ b/dev-java/bsh/bsh-2.0_beta6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}${MY_BETA}.zip ->
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/byaccj/Manifest b/dev-java/byaccj/Manifest
index 5ea43c1ed00f..5102aca816db 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 713 BLAKE2B d098c36a0690f9c1821f927dab6c7dc6e99742fa1108b8956c58d6a0caeed97f6dd1e2d1020accaae7f724bf380c284304addbc5b4b98507837a6561b7b257f8 SHA512 10336b2858825506e4693d5d1381a674dc3f43a131be9153f99fe296c5f675d3a0fba7de73036994ea43f1b7ce3aebaccac33b046ee7fd567d0092752210da3b
+EBUILD byaccj-1.15-r1.ebuild 691 BLAKE2B 4264f45b95fa79e347af7f4f731906398f630e7c186352df1f1de708b84b8d96de7fd022132c08fc015dc7a5a8b648f1b654a1fadc6dd0679ff4b63987f490a7 SHA512 e24b9878b8551f984060bb3b4b449f7d9cf8c7d876c9a1fbfa9efc46bb2f1a3a1eda104706b8e07bd52623019e0c348453a4ac33d66b17fe409f2602b8113551
 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 03bf293aa05f..ecb1c7ade4cb 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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 ~amd64-fbsd ~x86-fbsd ~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/codemodel/Manifest b/dev-java/codemodel/Manifest
index 38cd5f78fee6..d84185c5bbf3 100644
--- a/dev-java/codemodel/Manifest
+++ b/dev-java/codemodel/Manifest
@@ -1,3 +1,3 @@
 DIST codemodel-2.6-sources.jar 178745 BLAKE2B d04979e3d912af5f16b0d0f6842c87e741abd32c8294fa429276a7457b328d577ed42352d8ea1874e9092845f7e8932df569f09f053702c5de635d243513d404 SHA512 f314fcd242d61bf0236b0520e8316df12cc5c068029d3a3a889db5d67ad1f0da37f3a1c09cc73d4709b7735b70f0ce8737365cb01441b3dedc6614f733e932c7
-EBUILD codemodel-2.6.ebuild 484 BLAKE2B 2a41e8524f4a8b157d5675eade37e41c3beca9b23defd8583dc4a74a5a5028a5c9b5b33221fd14f39c594206f572c46275b1cc9fdf8c3ed899652e7da78908ad SHA512 afcc3d639288841ec6ea28d2a76082a89b6a34c361bf305f49e2c334238ad807482ae88e62526119cfa22ac2f44817f9291ffcab2686de0f7f2940ea7445d75e
+EBUILD codemodel-2.6.ebuild 474 BLAKE2B 82e0476feca46ebe6aa760706a105b851964823e8f525fcb80950248c7ca52640506bc37982a7a0eb8dabed317344fc051bd7026f07da13bfb0c66103786c86e SHA512 c0bf6249f1b201ad3111a62f962a39d9aa082c3b44b5ec1b0a7ef368d665e5afcce3fd54c7b812ca855623641ea663d9089f0189fcb85110bd3f031d748adc50
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/codemodel/codemodel-2.6.ebuild b/dev-java/codemodel/codemodel-2.6.ebuild
index 87e008a138f6..649702793616 100644
--- a/dev-java/codemodel/codemodel-2.6.ebuild
+++ b/dev-java/codemodel/codemodel-2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://repo.maven.apache.org/maven2/com/sun/${PN}/${PN}/${PV}/${P}-sour
 
 LICENSE="CDDL"
 SLOT="2"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=virtual/jdk-1.5
 		app-arch/unzip"
diff --git a/dev-java/commons-beanutils/Manifest b/dev-java/commons-beanutils/Manifest
index b5c13998243a..10d25ea25457 100644
--- a/dev-java/commons-beanutils/Manifest
+++ b/dev-java/commons-beanutils/Manifest
@@ -1,3 +1,3 @@
 DIST commons-beanutils-1.9.2-src.tar.gz 396910 BLAKE2B 1324c49605c9640aa3eee5c016a43bbb45b1984dd49eeab8f9b7a4ef1c5284ff8869228dda51719c2e6b3576517fdd02018a4f36654efc7f92d3fb7432008d05 SHA512 cf43aace33eb91368f86445874b16d977e827451f1355bb00e9b33bf0707855b5d757b0d58ad617f3a7f86f9065e7c900907dd604ba4de5ae61473d40cb758a9
-EBUILD commons-beanutils-1.9.2.ebuild 1907 BLAKE2B 26edec28dffe0c163e93940670e705dcb6891bad21196fc8a7f15d9fd655c7d683cff7933aeb70e00804b4e81e612d5e5ff473a131a3cb5a8b8f0591351610a2 SHA512 b48876af2189f7271b900305a388a9f833bd78c77ec63dff39b6cefd34efd969ce123c964042edaf3baae0364ad7a42c6369dec229c357eb5a2fc998d6aaa785
+EBUILD commons-beanutils-1.9.2.ebuild 1897 BLAKE2B b684bad7e63c70cb8aa3e30947dcdd28650b0f580e777f3a93516569d966bbaeeac4b78023ffe8b592fc014e189f28c5a371987970ebe6bc0b0fe5cd394e1915 SHA512 fee166916e7fff8d39cf99d8e0b6278471b2e0ee7f740ca6075ec8cde4cce598b27796f02777b0b2cb44f25b218e77dc605f295fab735791e34933388cb9717f
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild
index 25e6206fbe83..e5b223986bbe 100644
--- a/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/commons/beanutils/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.7"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 CDEPEND="dev-java/commons-collections:0
diff --git a/dev-java/commons-cli/Manifest b/dev-java/commons-cli/Manifest
index cc999fb97192..d6e20fa5e32e 100644
--- a/dev-java/commons-cli/Manifest
+++ b/dev-java/commons-cli/Manifest
@@ -1,5 +1,5 @@
 DIST commons-cli-1.3.1-src.tar.gz 145886 BLAKE2B 951dd516a2b80089cbd3029e456dec295adef12a6e2225a99cf3acf88cb7434bbe0ea3b2dd40190ac1cbbaaf099a88405ac7c4cd9ae096ceeb13c9a13bd0198e SHA512 b5c569bea3c213a1959ae698894f2234477a7a5ed246f8e81142041173f668802959be018011bce6aa2a5631081378e67d69eeba9136fa19c96193dbdf2a7d15
 DIST commons-cli-1.4-src.tar.gz 148530 BLAKE2B 72460ee073b4e8c5179da03c3d599cf04b37b5b3aff89e4927b07765bd879acc9ac56f52e7dee03214e21f7ba9e5af3adf54d2f943aebb266bfa9b4983ba0380 SHA512 a5db856f6154e4340aab1865e3b34c752c0dceb8063faa64740ed470d8e6b3e7782242ae51d6bb57a535a6d6dad2943cc3130d7202223b8f89b8cbecdc3d9d4f
-EBUILD commons-cli-1.3.1.ebuild 1031 BLAKE2B 21ac2ffc42b1001d82a4afb9a0dd25ce111708e70d6deda292d3b7dc89c69827fdd9f92aeba43a823a31a9f78e8f5f91d87108f7bb01e9bdf56a530d5900af08 SHA512 2ecdaf8fa0920a522ace2b205d3a0cf7acda765ef618b9beb62c9800060e1f7e976221d1bd6af3eda2a10f9d8a2f8772429aa2d26b9588e6c94b424afa8765d0
-EBUILD commons-cli-1.4.ebuild 1034 BLAKE2B e6189947614080f52be75cc7c9390cd0f19caf881f3716204f000341a970fc076b4d8603f35aed6f9b54f61fb23e3c95615fd90a02ad6992328da74aa930467e SHA512 117197da7bfc28a8b62428e88e67133020bd891c2947e808506e52aabdd8883a12bf90fa40dab37656bb69d1354910e72cda137f83607da75f0391a2beca14ac
+EBUILD commons-cli-1.3.1.ebuild 1021 BLAKE2B b8e5af04fc22daac049f839ff28b3bb3f9bec1e6c3f412dda46510a05273ee4acdd3fdeef08c5b248b12a38d9963e26d3a8bd43a585e08d1b460b3f4cf1feb60 SHA512 a8f52c8889c3c75778bce7c491fb8b128da0578c33c5bff0477ef9c4c5f6f5fdcd1cafb9649630074213431efe02364ee731ce582480f238ea5d24d710718b1d
+EBUILD commons-cli-1.4.ebuild 1024 BLAKE2B 212a0952bd184096959f49d57df0a6cabb7dad9faf755c5a76fd3735a230dcd296fc756ae7a2400b3fae6075b18a0370fc5409c7240baddb332508da15f73ab7 SHA512 3c1f769888ebb51a017a73a92f89006735f28db41d8ee146eb1180d14a25e0d1487ee1712c795cd46ac7bd8df082671d1ce8294b8f075033bf21bbaf65b5ddc9
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-cli/commons-cli-1.3.1.ebuild b/dev-java/commons-cli/commons-cli-1.3.1.ebuild
index 5fb219354aac..a61fd6a54cde 100644
--- a/dev-java/commons-cli/commons-cli-1.3.1.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="http://commons.apache.org/cli/"
 SRC_URI="mirror://apache/commons/cli/source/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND=">=virtual/jre-1.7"
diff --git a/dev-java/commons-cli/commons-cli-1.4.ebuild b/dev-java/commons-cli/commons-cli-1.4.ebuild
index e047a4e68228..91a2f1e31ae3 100644
--- a/dev-java/commons-cli/commons-cli-1.4.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="http://commons.apache.org/cli/"
 SRC_URI="mirror://apache/commons/cli/source/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND=">=virtual/jre-1.7"
diff --git a/dev-java/commons-codec/Manifest b/dev-java/commons-codec/Manifest
index 252dcf32a4d5..32b750366d82 100644
--- a/dev-java/commons-codec/Manifest
+++ b/dev-java/commons-codec/Manifest
@@ -1,3 +1,3 @@
 DIST commons-codec-1.7-src.tar.gz 291251 BLAKE2B b8fecdb9b88a21ceb3106a13332493617ecd2c8064c84a1514dec1c1c254e18116ff4926f7445bef4171000ba77da411efd6a93fe80a4795e887832035373e10 SHA512 31358283ac2827cb05486b8ff1512242153f61deb086f7fe145ee3ca38d96e43fba080a1e89a3b8cd44d09761015ff4dbe5226d29b7f9fcd59e68ca7701b28d6
-EBUILD commons-codec-1.7.ebuild 905 BLAKE2B 41f78fa84e35cef7a9c217b2313c3678f36ca6dde60546b55cb080ef5225abb85335ceff033213cf7397f96925adeb3330f6051dc92a16937967d4c4c7bdb6b7 SHA512 2f62c9745717fcf1bd7761531933bd0eb4aa0c65251ae6a33f4b353ac8594e390c69c915ba4805ff132874c3f53fe38075478c51d62c778103730ab1168b5cd7
+EBUILD commons-codec-1.7.ebuild 895 BLAKE2B 25171d147e9638b88f210f02b6e12d13e6c391b51191a1c00ab118cac8e4fba1a063e824ab852500fcb2a99081378c81e12317d31349f8e0e6c15a9ceeceeb41 SHA512 d842c00d962bfbd508e893aa14e303ad74f9d5e9afdd85ab9df7ee67ffad174dc77d950328333566e29eaf04c5402b95a1080439724579cd4bd0209102945619
 MISC metadata.xml 1360 BLAKE2B 5e996a35877486521352b61fdb44872970caab9497267c9d95d1364bd299838486f1853b46f35ec140259d33e7158bca7224488f21c388caa4fa9e7a153006bb SHA512 d16f70860d4880e50d25e6297823fb71955c147eedd115ca7eda0a0bf6c4cbc6121bf8b12062241192facd4583f10df56a838c84940b5914f75d13f10c96e9ae
diff --git a/dev-java/commons-codec/commons-codec-1.7.ebuild b/dev-java/commons-codec/commons-codec-1.7.ebuild
index a4da5c3a9be3..8a328da43bbc 100644
--- a/dev-java/commons-codec/commons-codec-1.7.ebuild
+++ b/dev-java/commons-codec/commons-codec-1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/commons/codec/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="test"
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
index fdb67c42e654..bbbff6d57b9b 100644
--- a/dev-java/commons-collections/Manifest
+++ b/dev-java/commons-collections/Manifest
@@ -1,7 +1,7 @@
 AUX commons-collections-3.2.1-Java-8.patch 7059 BLAKE2B c2dd3d388b15cd61224e96eb8b380f881ad4629ce58082c1b80cb843372741f10eaa4f3a71689a3f7817d7a702a82ef61dc7634187992fb03b2a8730262035ff SHA512 1007c9c46944c4b0104b0b13c4c2acdfc9791274019b20bd38b95769095843e4be1ee29d81ff61517d9a7d9b2ad5bd77c92a2f25ebe3bab68f9a04d3a986a44d
 DIST commons-collections-3.2.1-src.tar.gz 609930 BLAKE2B 547b785b82e16f1c318fafb5761292c5fe8beb57dd4a4881cc16ef7df7328df279713442cd1fc4a64fad0d84457c06d5536c084fd8084f62495ce44bfde19a34 SHA512 8b9b5344528b3b8a53142abd944ff6b89cc149a3fa0c1eadf3f2172509499af5820ba86859e47fe7f15f994f680fa3c577c21891540b64f41f826babe81a0fc0
 DIST commons-collections4-4.1-src.tar.gz 704671 BLAKE2B dea1b630168373013ca937c9b02414b92845fdd9ddf7a22a05c4d7f8d30ff26d73f3a2d399d7a4c026f8ec43a282120fdf3d3cb1042a311c3b490ffed1774e30 SHA512 c5666f41b68c9fdba3731730595616b16f98579c077cf047f421a46729b5a65476a8707125a2c0b0c6c024ca94df8c2633123bd99e705149fcb1afadcd3bf68b
-EBUILD commons-collections-3.2.1-r1.ebuild 1738 BLAKE2B 833bacda17d6bfb63dcd247ab2334f477a209bd583f4b6d0b61e3bda9bdae43644fa1e9359b6414d7c2ba38c443e1aab6b4dbc406b19d6ae8d094d67fbed2508 SHA512 ae2dcd035e5c0e596efb656add167b5047b424f14546dedcfb0f52bd0a5bdc6e2a568211b0b57f57735eb018f8ce55f10087a0b43ddbbe3d1d5bb0be09dcd731
-EBUILD commons-collections-3.2.1-r2.ebuild 1304 BLAKE2B b2dfdf67c6912c8c9c277058a91595df2feb545d017cb686f9ba92f4a222f04990fd38a48242d8ae7efe86ca9f282d182f603b587bdf9d836d5251d7d576e660 SHA512 274ef26224a9a615c634cd75c86aa519df78ec0bc1dc35f0ca80f6213280454eaa67a33f9bcdd64e068bdda34e58529df8a9449b5cb24c720120b0f65a2f5025
+EBUILD commons-collections-3.2.1-r1.ebuild 1728 BLAKE2B 56dd7214eff19ebe391363a1c1066ab234290a458ee8943e5e13838cf41f6eca68abd6e9a31e62bc8e2c4285c628afdda809c2b6544080ba13b2ee54498d12dd SHA512 dea746396617ff3b693f444056ab157510980f191567d09910005352d51c0b3807d7a2c91897125da8a9a5608a35991898f41ad77d7948082ab100d7f64f15e3
+EBUILD commons-collections-3.2.1-r2.ebuild 1294 BLAKE2B a61b2884d319cc5c648ce5133d57a87f6d95128094d344adf4f206e5eacb3e925e370adeb958adaf8f41bac4a7d9b73a2010c3477dfb175cc487db9b6e822db4 SHA512 bccd79f3babd4416a1cdd0d27f3c6540258c61a395a261af024f84622f01f8bfcd3d0a3bcccff8f392a3a921637e40709dee12e1812f87f3533ab35b45be3cb8
 EBUILD commons-collections-4.1.ebuild 1182 BLAKE2B c127dfbfc2dcab974143e7efb1a5eee63e2472b81f2a75b8eff8d011d8b6528e023326aec74de1447bec9acdfb330e91ee19b949941dd33939333965291eb7c2 SHA512 e55765f2d3896a45f064cbaecb05b90d5a8bc9004055ca22629428b6778c62584a0ce3264cd3285edbcd5cfe7ce10559cd24f202b55d6e2a718948142a717605
 MISC metadata.xml 325 BLAKE2B af3d8863d79f6cb8290734821ff82fbff7b65ec3d017f7f530e5c74d745d94f4a15713fa06b24b7e3dcd092dedc10f6642a0a480ee13e916bbd5895c52f1fab0 SHA512 23d211dbb0efeb5909d6d43ddf7a58ab34d33d25fc80216e0e6d7722424c06df89912947105070e63a64d44b6ad37e3053e19bcddc4c808d9cfc234f4d923645
diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
index ddceb7ea23c4..accce8f13e04 100644
--- a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test-framework"
 
 CDEPEND="
diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
index 9c732bfc5386..50ad9b9cf0a5 100644
--- a/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-java/commons-daemon/Manifest b/dev-java/commons-daemon/Manifest
index a7741b21b5c1..74bc09cb6dfb 100644
--- a/dev-java/commons-daemon/Manifest
+++ b/dev-java/commons-daemon/Manifest
@@ -1,3 +1,3 @@
 DIST commons-daemon-1.0.15-src.tar.gz 291128 BLAKE2B af874e6a0852c2dc5c84fcbf5e1e443fb880a306b19054263d06e8d83a9b0866a52f2950c457315d80031a58250ec75284fc7839df82b7555b1ff3bd92e67810 SHA512 f20cc8796978fb09b6ecc8d99bb3c8b271b097d74c1f99b286cde213631e7f50a4104f5db2c354f9624ba8b037502d81e327c581b38253b9b216aa2172016e40
-EBUILD commons-daemon-1.0.15.ebuild 1265 BLAKE2B 2f05a259bf802960477caa9f336f1ced45c2692760a2916b333cf28193e1ee5ae96a21061ffff2ba3c88922a6e37f080509d113d7773b61eb7ca9e9f44c47528 SHA512 0fefdbe50e3c3a9a026f2695e6633ed97cd572a00de32a62bdc0371ffac9573cc2266e28dcdc113722a88fa2c72d70a46e010e5f489778a1edf67b56bc2cdee8
+EBUILD commons-daemon-1.0.15.ebuild 1255 BLAKE2B 7dba8b76b4d39cdf13269a5e55babb479aa3bb0645a3d83ec8b80d870834aec80f8245fb5c9a7d8caadb23ac3d660b3db30305d93da18674fd0469a7b8fe23e7 SHA512 9f6b2160da39f474dddeb165397c523764069f1ed4123de817c279ce41ab0b0be3aa8396741f1dd201dff28577d5e39acd18431d94e75f27316b315330606524
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild b/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild
index 17af8cbfae4f..1b467fb6bde5 100644
--- a/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild
+++ b/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://commons.apache.org/daemon/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="kernel_linux"
 
 CDEPEND="kernel_linux? ( sys-libs/libcap )"
diff --git a/dev-java/commons-dbcp/Manifest b/dev-java/commons-dbcp/Manifest
index d64b07cbdd61..a521156102ab 100644
--- a/dev-java/commons-dbcp/Manifest
+++ b/dev-java/commons-dbcp/Manifest
@@ -1,3 +1,3 @@
 DIST commons-dbcp2-2.1-src.tar.gz 580017 BLAKE2B 5bcc79ace49e57199fc99ea52ffbefc3ec428aff51fab3c08679f851e51fdbc02ac539ebea64eb3f6f8e5cbaf910269630096a4efb27f19cef336beb026cf441 SHA512 830fb550cee5f9c79fad830d8b3e56417aa9dfed26093fd366693260f5b4d821baa592e60c7f5997766276049a90eacd5854b8422803825154fedee56d46409d
-EBUILD commons-dbcp-2.1.ebuild 2232 BLAKE2B 941e588970f6ecec18cf5fd688419e64e4c2949c3cfef0b278f5ec9c6936266994562df5a86b0958917b65e585f35118199d444a9f1b3cf3b4b46df53af018be SHA512 2d3b5426edf5d0b37e27161c4cb3a219dd2e556b2acadd6ec91a0c9717a11aec3f931dc2f1ce0ffe4e73dc8720a1f1222443150f3ec9dbc017ac43b67e521cfd
+EBUILD commons-dbcp-2.1.ebuild 2222 BLAKE2B c1ea89e044a7f7e1b613010609bb26025721c41fe18ffb121ea8ee50f35d552ffce9772cf1c83b120c816d3f26c3b016e5cb8d7a157e620acda45c8d375a2ce9 SHA512 655d48cdfc6a6ca83fa27f9c35872c91f6cc0eb0f8536d1b2212e5ef03ff90205368fa291c531abb119001dc9681413eaac07779944091327a5b5fd81e90c207
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild b/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild
index ea6fe6814c80..b7928a7c40e3 100644
--- a/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild
+++ b/dev-java/commons-dbcp/commons-dbcp-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ SRC_URI="mirror://apache/commons/dbcp/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 CDEPEND=">=dev-java/commons-logging-1.1.1
diff --git a/dev-java/commons-digester/Manifest b/dev-java/commons-digester/Manifest
index f1791795ce17..7853c51edbf2 100644
--- a/dev-java/commons-digester/Manifest
+++ b/dev-java/commons-digester/Manifest
@@ -3,7 +3,7 @@ AUX commons-digester-2.1-build.xml 12816 BLAKE2B 7309479a61897c3ecc28e6394714c1f
 DIST commons-digester-1.8.1-src.tar.gz 303266 BLAKE2B 618885c812a9bf40c080bc5736b8b4be4e18fe4d2f732d2a44d39369ae6cf3beb3af0cf500da3d103d7aa8c18b41b84d06907b6fc90f7f10d30840d6cfc83012 SHA512 0a39069662b4792d4856b79b5cedc2b44cb70303a19045d21c233d45ae4dde9e80662bd242a381e759d7cdb5adaf0b9fa6206bb8397b53348fa9eac12e9a4e96
 DIST commons-digester-2.1-src.tar.gz 304060 BLAKE2B 2360f6f8ab77b20ad6b4058e0437aa792bf3886ddec2e09b6db259bc142c070965ce066ef224e92fb91614075631a2af1358ae4b4fc065fe9118e1d2559bb9bb SHA512 6bdb63431ed1e17f5e8ba24951762750a0e59b70c76eabecbf13f5fe6974864825456beed615c8f2c16f9a2f1404f2e56bdbc3ba335656c3661d5f368c708b88
 DIST commons-digester3-3.2-src.tar.gz 324555 BLAKE2B 7b8bdaa70eeafb069e9ecbfe697ab86f5167ae3b9933e8aa306f0080de0ec99d12bd023067678b7b904329178f553fd6d4d98141ab329154a1c27385b33e449f SHA512 6d5ed9a1cc7612244747dcbd5c713349f27d63d1cef39fa368b4e91eaa3b1fe7043ab2fb498a73e8afde8081b8ff26a966e5b87b8b6dc68a3d907e9b25aa7cad
-EBUILD commons-digester-1.8.1-r2.ebuild 1344 BLAKE2B d38c29dcdb5e22816ab62293b817ae42dcdcf7a8983e776c436479e4ac6fb0808fa8b861f3828c63895d16a2f1f6f42532282fbfaa11aa16d577658e95c61cc8 SHA512 ffb81b347ce8cf68a4f99cbab48044345273f4abd49c8e48482219869f1eb5a522e5e549833f9cf0c31435229b500d4447c9928a30aadd03958fa0776ceb76e1
-EBUILD commons-digester-2.1-r1.ebuild 1281 BLAKE2B a4d18575de19d2bd9cf1dce5cde53f7aee4132179f0aa18a4a216416bcfa6df698ae3a0762e6269ba31317a46036bef6fc5e258f943fe8d66535eca92d2d7e52 SHA512 084f7e7ea4029dbca1b6687f0457091f11d7f00af4c6d81e4d20c43a6912f06b20dd9b25acb1b63aca1d0d5d446f1dbfeee50b06b5259cc1af9ff029666cb302
+EBUILD commons-digester-1.8.1-r2.ebuild 1334 BLAKE2B 041afef35e29c544ef5a55d636e1567282e9aa88f3777ee092563b0b69587eb73c0cd1a6d613a292d8cf59f79c324cc9239ff80fc0412dae51fb9606b5b447f8 SHA512 e86d5c4195016eccc3a76a78c70d9ced9ff0cb7b7fc5ba1cd49720e84d57f439cc3fb8ea206c7f9bee8cd5e13fbc20da6dcbbb53d8404c875e142cfd5d64eed2
+EBUILD commons-digester-2.1-r1.ebuild 1271 BLAKE2B 627edfe47d49d94e97b2d40773a4a55ccbc885bd95f5889500fd1a6662fb008d5d5efbf4727bec54e04e7a9e6fb6b412bf5425316aaeea5454ac86ff076cc3d6 SHA512 3b6b050868c748e172afcaa91f3f7632f265272cf9cf87a7d8aa24ae044dae92ebb60ab2ba05fc1bc7c5b823d22ea7597d856f7b0151cf4ad4dd2d545a035054
 EBUILD commons-digester-3.2-r2.ebuild 1346 BLAKE2B 569d0a11ac290485043abeaad1f6d5605e23e3c86e2514fddb14c90422499139056ae938d93d1f0c237740e7368844ca9a721f2a36a4c852e65f7d93e353f504 SHA512 380541befcf378f7446af7af0931fb3d95b682400b4fae1beb369a48d1ec807ecfb816a6a120085147924358ed17037027f03f9d9d049659342c3dc7a3882c0e
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild b/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
index cba93118e2c7..ef48eccd8418 100644
--- a/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
+++ b/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/commons/digester/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 CDEPEND="dev-java/commons-beanutils:1.7
diff --git a/dev-java/commons-digester/commons-digester-2.1-r1.ebuild b/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
index e4adb2d2ba0d..a6546742511c 100644
--- a/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
+++ b/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/commons/digester/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.1"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86"
 
 CDEPEND="dev-java/commons-beanutils:1.7
 	>=dev-java/commons-collections-2.1:0
diff --git a/dev-java/commons-el/Manifest b/dev-java/commons-el/Manifest
index eb0e59cf6d6e..63488d779190 100644
--- a/dev-java/commons-el/Manifest
+++ b/dev-java/commons-el/Manifest
@@ -1,5 +1,5 @@
 AUX commons-el-1.0-java-1.7-compiler.patch 738 BLAKE2B dd71cf204af414172484d5d537c3bd0acd8d3056eabfff95161d7b30db0490a611cf22cb07c76f8782e4543ab8760602ad391ac6f4de12def16468e096bef7a2 SHA512 b189a50f4de4f3362eec45a7dba4e5d4227aae30723180ddbebaae86949687ebb217d4bf28879723fdbcb1393a54dcbf9e14e543373faaeab3975c02e01e2807
 AUX commons-el-1.0-manifest 557 BLAKE2B 085ab2a725e32c7a277a9713f31f613637ea3be5c43e8e4d3134f0cfd996622b9472fc275776a9c03aa2b58fdeb430ddd7f6179e06a84fce24e209ba4ceadf1c SHA512 6f2eba221225f9842eef312519b8c92532be4e87732202d72ecb8c1182264d5219c70fe5c3517b2df8d43bd4f828e556ae57e7e145a4be811acf914ad6b3314e
 DIST commons-el-1.0-src.tar.gz 64009 BLAKE2B df9f6daa8b5a9d86a43f5fdf0e1608b04a5cb3e78dbf7cdce5ba7e484685c9e4271db22777661d07c89a4c792fc9c519b7efef484a41394ba5f1a3a7e302594c SHA512 51bee4a33816b2c7416f55bd2efe1e663350ca0b30b2b5a8f89154c51596df8481c736fa13576a9dad69b2da113728050c2c9b6f50125d38a36f45e4b82e2e83
-EBUILD commons-el-1.0-r3.ebuild 1214 BLAKE2B 211c2ebf04f7185ba7a0d919364a21631a620aafabb2df486517e516c8be8b4e66d6e4a94f93ce15159b0d200babd27312eb619ccf5e41a25534f3e0f477d34a SHA512 d6b785a5663de56b0ed11a5b816d69b629c78deeb9a122540aa0961d7b1996ee4454e9789a58077b69417525052ab53e3e8502de0fbbdf04f31834c4f77be919
+EBUILD commons-el-1.0-r3.ebuild 1204 BLAKE2B bb58285024b5392e4771a834b231c334526395f7c9edf2bd401ec4ac17f72d5cf29837b4e2c3569fa04751046c7684de3fda3785cc638ba0528a5ab0d2aaf660 SHA512 3a9bee59dc8b1c62040d1de1c177b73a55d690e1a6fec5649e7182eccf200f84257b4c3a50acc26758126df5c1d6fb67f590b04f35774a1ed0af3282fb1b1370
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-el/commons-el-1.0-r3.ebuild b/dev-java/commons-el/commons-el-1.0-r3.ebuild
index f71ae892d58e..a7b3d71f48c2 100644
--- a/dev-java/commons-el/commons-el-1.0-r3.ebuild
+++ b/dev-java/commons-el/commons-el-1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/jakarta/commons/el/source/${P}-src.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 COMMON_DEP="
diff --git a/dev-java/commons-fileupload/Manifest b/dev-java/commons-fileupload/Manifest
index 8734379e5c37..8654c926c2f7 100644
--- a/dev-java/commons-fileupload/Manifest
+++ b/dev-java/commons-fileupload/Manifest
@@ -1,5 +1,5 @@
 AUX 0001-Remove-bogous-manifest-entry.patch 744 BLAKE2B 88886753a79a47ed7400de168fe7e560173c3427108f44237c86290551e5abe381f5edf9a86ea506b7dcbdb2de5ce327b21fe89e1c920eec337b138ab51d588a SHA512 a952ea640ca36fd4e4f2fdf13053d4487a88bb5bc95a70909f8202d46dba1cca0d2aacab6d6fbcf3cf8dbc6cd9b3e7b7085963d4ab9b7bb31267a63a5c037db0
 AUX 0002-Fix-running-tests.patch 736 BLAKE2B 71723de12ca1b3f256c6a83357ecf4ca1f69a7aaa42bf822906851893741649a836953cb4067e036c960b4156c17d0efdc21c7f7ad76ac122693e8e69e7e8524 SHA512 c29c2c7d67214b940700cc50905fe879791c451686343a3a52fd840c95d8210663bf667548207d61d53b9967187ca468fa2dc439b56edc6bc137ce0c955fe289
 DIST commons-fileupload-1.3-src.tar.gz 137105 BLAKE2B bfb5a4604aa69d8490fb1e661d0f82c0851ac9281e8e0e43a2e5d68b9cb330556a8df9f67fe9c2b5eaa1f9b871b3fde2b9a8064f94d6d55f7d13f64d5150bce9 SHA512 dbaaef89eb8b4be3555f0736919234b42217e8b6a021dcd99c11d18462b39b10ba92e25bafda51d1b1fcc306c9becf3fb124d03debb66922ab5442197f6360d2
-EBUILD commons-fileupload-1.3.ebuild 1324 BLAKE2B 9d9503a1028c823c549f665616efe2a0a7e3b8482ddb78142558d3ad67353e1648b1de423a883a034ce3b63ced3a4885e3c48e6f233fb369f8abd08130445f58 SHA512 5a549b74a31dbdd80c1bf9dd3cd8fe756e09118643dd72ee83469be8304208031395659bcfe495657aea50b38d5c7e505bac07734f3ab61bdbf11b3668c59e40
+EBUILD commons-fileupload-1.3.ebuild 1314 BLAKE2B 32d44b8e8567172ff72b79fecb33bee18bc8eff941b47e350b35797a3cc8ee8d151428dbb2803d50d5ec082285503e1743024b547dd0f5762889ec84a0f590f9 SHA512 c4f563ae6d2d0e0f313e2cb637bee659262a2a1929f08c495d4bbeb886fb6a12f387c2c99351e58fd753d9a48168c7c78cb38e7cf0d2a2190bd7967d3336e8cb
 MISC metadata.xml 749 BLAKE2B 88142a38969fdeab7a7ef48a0a72e78a24d3ec386cfcc5f8424833c026c3e2a135f02bad3eacc0fb0860633da5c71f85eda3db9d76ac52076c17cd2724236c56 SHA512 e18d72be4bcc733ced0cec17570803ff311fb9b31f28367ea2094779e0da40b379c20134fe2b4e81e9f21acd0372115671d41b7224c2f4a302123dc58d12a8ba
diff --git a/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild b/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild
index ee615f821310..c3bb05e55607 100644
--- a/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild
+++ b/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/commons/fileupload/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEP="
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest
index 4364307bff5c..6ad37d5e0003 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -1,4 +1,4 @@
 AUX commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch 12400 BLAKE2B 76cd9cff541adc08b987119de99e23ae50e2b849432aaab9431a760da67d4cb3ac53199ac7ca74393ee5d55a5d3c2148ffbffbfde005b7ff936da00620b94dac SHA512 3f20161688bcd40497747fc2e5802d12881d10a071c04a151d56b3603f81b4c14f56962b83ee72cc38d1e7a4e7e43e51426f00d06ec983feb23d8771df237c2a
 DIST commons-httpclient-3.1-src.tar.gz 1882664 BLAKE2B ccf96bedad09011ee20eae38aae1fdfdd6fea5a8226f4b4d156762080c286c71b34c149035abfd61e70c55a1de84ab3cd38d73c3228f591dd8e16c0a7e79c3a5 SHA512 e73ceeba3f34a35c30b24a3c6cb8dfc2102ff21079a5ff9270935908cb2f707d366c2f31a53fbdafa99673cc2b82e05470a2bf40d96767c72b2ab037c0f55490
-EBUILD commons-httpclient-3.1-r1.ebuild 1642 BLAKE2B 93f0bc8a5700f55c2115000f4c990db26cbc97efa402092207f73ab7c502da97345615850bfbecd56ae0ced64a67ada75505091ee58a050d64e103ae6ddf3053 SHA512 971b5e1b591d18630f2746ae0110d96438e0f60724863728034c24247de78a4afa93fca2d9e806065c30204250d37ba76f59af9d6297e1b949c178b7e3a3aa01
+EBUILD commons-httpclient-3.1-r1.ebuild 1632 BLAKE2B a584dbf8ce2bacef3cbcb749a8e5d889df7c26cafb2d166d99a6779b1f18ebad39553f2ed6187a845df608f91a523197be993862738311476953e078f0944fd6 SHA512 bea8370ae920285691edec3c10062f585fc5537f3e4a038e79aa6f9fb6d4c23dbebfaf97ca75384467dee96519bd9cd454fa547379b22158783ce1db08357329
 MISC metadata.xml 456 BLAKE2B b4e2261943e4bd92d413eae20f60f23b79e7deb961d9c7e08f855f28cf69f0b45c5113a308138122a9cc4b42da1498e67c8be2093ce0252f60d5ef56ea55e72a SHA512 27c629a07a007dd4336cd50f4ea32156ec301b02f398b008c057532b36bc0698132282e32007ee31f0dd21f3f5664b3d7c9607fe43a4dfbbffb67d3000c3a661
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild
index d72a6b096347..9afa77321024 100644
--- a/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ HOMEPAGE="http://hc.apache.org/"
 SRC_URI="mirror://apache/httpcomponents/${PN}/source/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 # doesn't work with IBM JDK, bug #176133
diff --git a/dev-java/commons-io/Manifest b/dev-java/commons-io/Manifest
index 50c476a1c8e4..988a8396ebad 100644
--- a/dev-java/commons-io/Manifest
+++ b/dev-java/commons-io/Manifest
@@ -1,3 +1,3 @@
 DIST commons-io-2.4-src.tar.gz 330961 BLAKE2B 1a1ae7c968bfc38b4a4f3c4c131de088c4efdd8fff0858e7493e057909076c74d4b0ebee1999ef01af9636d88600ecca71bb0808686a6f9c1a20f4d7a5cbe6e6 SHA512 69ac5f7b8de952d8b519ad89d4e9a33a9d269af0e68b735c0180ee8853a30e2a09147ceac362626a2fb3a041bd46eca094be2661ff280c1bab54a0548cae0aee
-EBUILD commons-io-2.4.ebuild 1568 BLAKE2B 2d96ebca1209d299063ec759f0a86d3dbe57b117d2aec4f5fe1f30fc9488751d703c2a71b035ea451d4fa51a6f6af32ac689820573e76c91146108a4b737c70d SHA512 c647961b7f5267f97aecf5009b1963d28262968c914a61ac18b6d990d8fc4f28fdfe571f3b978fe6ba4725ece019c3d0be4d3ed8a00da1413f6371453c3d7d48
+EBUILD commons-io-2.4.ebuild 1558 BLAKE2B 72e6e2ac3f82e4ec4ae670309b8512cde13af0508e6daf9ab97b015b25aa62ded0f6e23a7242557242ed6d71b8ff64107a9288bb81387aebd9a4ebb78e66e995 SHA512 cb2bedb1bea8e6147bc957d67f6c3aa8ea71c433a2d4bad134bfe71f58cda58f36c0b4eb3b712b9176bac4e0a4ecfc5d6c8f2598f2c9ee8ad0b9631bf3827bde
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-io/commons-io-2.4.ebuild b/dev-java/commons-io/commons-io-2.4.ebuild
index a300a552a885..464bb54f6738 100644
--- a/dev-java/commons-io/commons-io-2.4.ebuild
+++ b/dev-java/commons-io/commons-io-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/commons/io/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/commons-jxpath/Manifest b/dev-java/commons-jxpath/Manifest
index 782179b5914b..ff621e0bf670 100644
--- a/dev-java/commons-jxpath/Manifest
+++ b/dev-java/commons-jxpath/Manifest
@@ -1,3 +1,3 @@
 DIST commons-jxpath-1.3.tar.gz 285339 BLAKE2B c0127ff90c51b7ba69c12072689cc7ca5b969fa29e4793839bef3200b0dc3fbb529c89e21877daa4def4386f94298e43054828d4b4b05be3671e38d9f728d3d0 SHA512 a0ad0b90c9aa4c732c47c8f38f036990438f526295b782fbdc00fd67e4c0e92643c7850429eb5263f9d322aff7cb7000b8ff2bffcdcfa88fa3ba5354dce7e152
-EBUILD commons-jxpath-1.3-r3.ebuild 1428 BLAKE2B c522cfd300229da871539d3a68fbceb8b284fffe2efe7cfb08fb8e085cb7b00f44ef336725b69c0ebf32b8c802bcc47325151795606504311acd8cf3f8f42e3b SHA512 9df36ed8a4341e9ddc38794e01597f0db6455df4d1b071fa35c10ef34053dd44610d0e3ccfc73a7b7f064a0aceeb8e61b0275fd552fd9de0a9410de6781cd404
+EBUILD commons-jxpath-1.3-r3.ebuild 1418 BLAKE2B c79ac6ce0e52a8e9d7742ff1dfb270a500ad79329c8cbbf64d7b6c8c4be773f8b64dcd36520fa1241c92e4151c8b9aa73bbe2853fa5260e73307e3be08824780 SHA512 ce9597f2e492e2d7d346d8ef74f50395c5a40bf0b143a06544f49c2aa3f40832aa5425925b864b425584df7070401ec6777ca05bce4409c94346d93c0960ce37
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.3-r3.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.3-r3.ebuild
index 04c796d859de..270da007b138 100644
--- a/dev-java/commons-jxpath/commons-jxpath-1.3-r3.ebuild
+++ b/dev-java/commons-jxpath/commons-jxpath-1.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/commons/jxpath/source/${P}-src.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86"
 
 S="${WORKDIR}/${P}-src"
 
diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest
index 271e43bace46..a7e5df0d4fa1 100644
--- a/dev-java/commons-lang/Manifest
+++ b/dev-java/commons-lang/Manifest
@@ -4,11 +4,11 @@ DIST commons-lang-3.6.tar.gz 852347 BLAKE2B 4a3ad5f557d27e4a109f6e65f9fe8d792b01
 DIST commons-lang3-3.1-src.tar.gz 638619 BLAKE2B f971afc9bdd3896178bc4be0b6c5d8809f1c1ac0d69ad73ba0d71c185c600ca7a55c3b4877af64b552ccebed9567aa7830f236f2c0d9c38f259870b894c9d745 SHA512 4d201c695a9b908a1809bbab689f80c6aa508b221b4c2786974eada08e647936f5879841c64eed509032ffdd5410735480e7ecb2910295d0f79e857c27019560
 DIST commons-lang3-3.3.2-src.tar.gz 740462 BLAKE2B dbf8fe7f6a4bb0cf462e2281d709e4ecd65e5fa116bb707af14a2b7b248eb1877f872f937fde2e5743bbe9b4775fabd1d0897ebeb8ebe92af235914cac7dbc2f SHA512 be889e0e9d7aaa7d6635e41c17d19dd1e5f9e03fd78eac61fd5f5483321170b9a72007ad0bfa7023e6ff55ae418b40eaa01dae350641c4e88138ac59d4001667
 DIST commons-lang3-3.4-src.tar.gz 771275 BLAKE2B 870f9c5aa18cb68cb88edc28d426df258af69eb6efc3dfe77bab40e2e81bddd4e56b1244a5ad4433f9dd4c0d533dc7b3b10c865fcaaefd9602e1f681bb48538b SHA512 44e93f2d8f7e6a54becaa797ee3348c6125ccdce96d772158f2a1e5ba2a7ecaecf00a6290f2e0fe2fa61db422313709ec6bc836d9296e2f16c5acf6635bb12b5
-EBUILD commons-lang-2.0-r2.ebuild 874 BLAKE2B f135f0a700ee54a9758036bb7691be0889510a6ee9c5ef31d218fca1223747d2845d6c6cf4bbc276ff49c6927c4270d73cca322cd393cd711f6b2a0b651e2302 SHA512 ee09f697161ca674c55aafe4ec19cbcf2c925410836077f7707da6aaac2e93fbb1491957967b0081da7b459807570f67499911f6f3740313e08669619e86c965
-EBUILD commons-lang-2.0-r3.ebuild 873 BLAKE2B 0efb95aafa25d823c81500ef3fdb6d30b999584f4a4577e1c088677e48065cd7e7212f8565fe07b7efafc27b68e1bead0cf3fb7e319bebab47564ea13e8db150 SHA512 195d39a6646005cff173522dc4bf9e984b953bdd4de4459d11ec6bddc1f724cfbca31dabb6a871b55006a303ad61cbdb51a89b0055d9849f663818e55942a13f
-EBUILD commons-lang-2.6-r1.ebuild 865 BLAKE2B b11aa4342a7d4fae1b4d05f7b710cffcaaeb9c5025de5a58c8ab834cbe241912610bbd516ee5ae357a6c03d43badc2c87368e7a841230daf02706b40e40fd96a SHA512 893587c23721ffc0b9c1254b32c1c202634d0c714c3021e0106cbee4331a04adc2780f2f288f673e95399b489d23bc96a426c474c7f4362a3860364a7652936d
-EBUILD commons-lang-3.1.ebuild 851 BLAKE2B 9b8e8afb567116f9f356175418905e26f6908f5689e7a1273fd80b9ab7b73d8b9a85bda42251677e0f367b90fe275f7ebd83d16e810f766df8fd7946f4ae356a SHA512 cc331db00934d271e25edc53475600f4bbc4c7d4322322bb72953eb9576f977faa8565e23019a383e9bf964b72ef6cb5b7cec592d25183b50a5f9f18edec2a26
-EBUILD commons-lang-3.3.2.ebuild 1122 BLAKE2B 67ba8f52d703eaaac83b47a744cb61d2b00f49e0ec93dd17b0883f6c865e59be9b3298bb4f841ca5a7bcacc84f8d85630158b66e9912eb279516906c493736ba SHA512 4ef5e8655b0d0e398d9f936e07a2562ec74013cc1bacbda351a30934d102f1d75e59f8f6b7cd9e8240716e5d3bd26c4e8935ae3587b7d65fcc60601d29e9aa2a
-EBUILD commons-lang-3.4.ebuild 1120 BLAKE2B 47114ae934aed51e8cf68b5e531527c6fd8b4e30a546fc4697474a2ccc4fb644af372af0c854266682dc2dfca1ab72a3f7a218b3e2920e71b72f54cd4c190973 SHA512 001daa92626cdd7b55c3020a40289886f8ece710cc9fb2353ab19f543973dd6ea5fa88b8faca07c13ea476c6ac73e02d677f53b28c82dea9959b45b66c2c5e41
-EBUILD commons-lang-3.6.ebuild 971 BLAKE2B 0dbb9da2944fa4cad12d9477001a691705fcd77aaf8e8ee4121c0fd70abf42b11ee55fb32fe13136f56de460ecc11a172eb512938db3fe632429369f55e9a661 SHA512 bf57956305e5c7146f84b514c6cbe5c2b9d4488f34cf07bcf28495eb4ab3a98cc187026999b5c7c332151918fcefd48ef58c79c77a38d7fe2b2347cf1891922e
+EBUILD commons-lang-2.0-r2.ebuild 864 BLAKE2B e92e62f8ed4262dfdf3894e1e8d65a29f11c807cd986df5d54dca85e8f17647914019237a18be07a71ede1b87de5aed100c904e31880d74d60246883892290a9 SHA512 7eb37ca88bc49eaad9978858fea9f7e319bc8630be4eafd8fe05e67efc94b0c4131449c0f68daa489513aae9f6538e8c5538bd35957efdd950b062f495f53b0b
+EBUILD commons-lang-2.0-r3.ebuild 863 BLAKE2B d62ebce061c4d9a9d20a3074f0d3bb7a50ac472794d913237be675004bb07f8a05948aab38603b0fbd10434316514d63aedcd7a2e5934c431f309357b157d14d SHA512 fdcd33d03960a81fe7b486a12ea0afa8b10c74841c7104dd6a0177db853327ab741c8c70f8a54460bb0a35d545688fddd84cba1bec85dbf9a9bcae4e85079203
+EBUILD commons-lang-2.6-r1.ebuild 855 BLAKE2B e6c3f943bb7a61064323748ec99c54e44acef2ac7899c864dcc554e66d23a7463d4e1e6e786a3145ebae636bb976896d26a038fedca3c5c195d64139ef8d0e02 SHA512 b3a1a0c9eea0742c8803046880b91784c87d0719bc38121246d143b3de1f1a04ef9ec775692b2862833a0f07f565af1dbd16f750cc439e2a6d69de9d7a455d40
+EBUILD commons-lang-3.1.ebuild 841 BLAKE2B 1de87e9c73eea5aebd3891889025b5a81107ae54d6e8b3e456d66a9519cb87e90412ef16680cdefb06451320bfe021d490b1e42a4d205b9927676a5af2e8e012 SHA512 95de6c0c16b0b07def8cd4d698ec9ab5e79cb2715c658e95be67d9b7f3c28c04f47c5649edfa71be51026fcfa98c618e5283fa031ebcd621a1700dbe1d539c98
+EBUILD commons-lang-3.3.2.ebuild 1112 BLAKE2B 1b45826fa5fb04a270fd93c0b3526223d48fe32289f8a3c9d02b5c99b2997f65eff7d542700c13aafc68cb5c95e7af7cc8d9b7b74840d5a7d4b6c1fe715e3e2f SHA512 dba87629c9c5234c6b29604aa1401a52933644f901005c17f8a3eb4bd68fe5b6b5bc9c45096b7822e95aaedb292cc835604ec31b817c4babcde442cd2e4f11b6
+EBUILD commons-lang-3.4.ebuild 1110 BLAKE2B 3be8caf7bab320369e1ae456305abd79faaed94979835c7677f4c81019ccc0e7ea67fdbafbf839cf1c831cd8ba92730621350357db3f8e01cb84333ce62a0541 SHA512 c59defe42c47944e7ed60ae9bb3d6b52cf9e942617f1191f5f7cb8947b1995ab4e4c8db6cb26d1b1fa6f6edd1da1b355648b5f75ee782c6e8256b1a7d929ab2d
+EBUILD commons-lang-3.6.ebuild 961 BLAKE2B 81c6b5c74172be33876c6b9b6979fa636bf174dfff7987560a51d40c255ebe8f936071dd00eb85015ed69d86887454d8ab2fad9d0954e798ea24dd52430242b9 SHA512 5370bcd4273bf7943d5c1f2ddf3dc512e8d9a4f35299dfc805691fdcfe37e5dfc460c8c5dd995880bdb4eea5c91485a54f25bb02cf505967ae1475d3f189e06c
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-lang/commons-lang-2.0-r2.ebuild b/dev-java/commons-lang/commons-lang-2.0-r2.ebuild
index 56f3b88e3f97..4df1c77e13c9 100644
--- a/dev-java/commons-lang/commons-lang-2.0-r2.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -14,7 +14,7 @@ DEPEND=">=virtual/jdk-1.4
 RDEPEND=">=virtual/jre-1.4"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 S="${WORKDIR}/${P}-src"
diff --git a/dev-java/commons-lang/commons-lang-2.0-r3.ebuild b/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
index 10a1b6a7e15d..8f0a4be50675 100644
--- a/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -14,7 +14,7 @@ DEPEND=">=virtual/jdk-1.4
 RDEPEND=">=virtual/jre-1.4"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 S="${WORKDIR}/${P}-src"
diff --git a/dev-java/commons-lang/commons-lang-2.6-r1.ebuild b/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
index 7845550b508d..b108cd7918ee 100644
--- a/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ HOMEPAGE="http://commons.apache.org/lang/"
 SRC_URI="mirror://apache/commons/lang/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
 SLOT="2.1"
 IUSE=""
 
diff --git a/dev-java/commons-lang/commons-lang-3.1.ebuild b/dev-java/commons-lang/commons-lang-3.1.ebuild
index 265797d8aade..d114a31c54a0 100644
--- a/dev-java/commons-lang/commons-lang-3.1.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -19,7 +19,7 @@ RDEPEND=">=virtual/jre-1.5"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
 
 S="${WORKDIR}/${MY_P}-src"
 
diff --git a/dev-java/commons-lang/commons-lang-3.3.2.ebuild b/dev-java/commons-lang/commons-lang-3.3.2.ebuild
index 1a5ef8b518fe..d25470181c51 100644
--- a/dev-java/commons-lang/commons-lang-3.3.2.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -27,7 +27,7 @@ RDEPEND=">=virtual/jre-1.6"
 
 LICENSE="Apache-2.0"
 SLOT="3.3"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
 RESTRICT="ppc? ( test ) ppc64? ( test )"
 
 S="${WORKDIR}/${MY_P}-src"
diff --git a/dev-java/commons-lang/commons-lang-3.4.ebuild b/dev-java/commons-lang/commons-lang-3.4.ebuild
index ccf3f9c9f688..b6f7bc8b459c 100644
--- a/dev-java/commons-lang/commons-lang-3.4.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -27,7 +27,7 @@ RDEPEND=">=virtual/jre-1.6"
 
 LICENSE="Apache-2.0"
 SLOT="3.4"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
 RESTRICT="ppc? ( test ) ppc64? ( test )"
 
 S="${WORKDIR}/${MY_P}-src"
diff --git a/dev-java/commons-lang/commons-lang-3.6.ebuild b/dev-java/commons-lang/commons-lang-3.6.ebuild
index 788f7a0b4eee..1977332102ba 100644
--- a/dev-java/commons-lang/commons-lang-3.6.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ HOMEPAGE="http://commons.apache.org/lang"
 SRC_URI="mirror://apache/commons/lang/source/${MY_P}-src.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="3.6"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
 
 CDEPEND="
 	dev-java/easymock:3.2
diff --git a/dev-java/commons-launcher/Manifest b/dev-java/commons-launcher/Manifest
index 34d162272447..9d3319c00437 100644
--- a/dev-java/commons-launcher/Manifest
+++ b/dev-java/commons-launcher/Manifest
@@ -1,3 +1,3 @@
 DIST commons-launcher-1.1-src.tar.gz 76558 BLAKE2B 23ec27e5ed7d9ab7770da62aa1af69ce8510c67ee5e4f756519a9bc2009c40525b5fa48a1caa8ce5b6062d57dedd469b190cfa7ca9a4ed5a5a72eade40947aed SHA512 87f275ea1dbd08394c173da21023cb761175ff222fbe0ed6553fa6ca34eef775b57561227279216082556a8dd37593c9699a3e0c059bf3da98dbd2f1d3f58ddd
-EBUILD commons-launcher-1.1-r2.ebuild 778 BLAKE2B 716b4ee51fd45e660bacbc172ef79f28822f16725de55b97c5dbfd7bf8a4805505e77adc2bfd1170fa90af9ecae97fa2fa0f18cda765345cfb0e502691251445 SHA512 377e0572023a10161049fe16b5120adc3da11e091e3eeb91b21a3c133133e048ad2a2947a4c6281d010d98cb14231ab2c801e2db4123df1b4566724fcd429f84
+EBUILD commons-launcher-1.1-r2.ebuild 768 BLAKE2B 16af3718271aed24bf19ac35d2a2e5b32e5a206bdd40abdce1f4a5bcef57b30cdffef171b7e2026a71ef21c8c0dea05ffd0bded1f01865a961291bfa04c7eb50 SHA512 825e40a46611b09e3c43175d348ab51d03b4d792c7d5443ebe4d2ea7fd5ca7c85df5c84ece1b98493b2a99eb0a18fdc531dfd4d2c0640bb2e9ce1663c3b0b718
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-launcher/commons-launcher-1.1-r2.ebuild b/dev-java/commons-launcher/commons-launcher-1.1-r2.ebuild
index 3d86cdb82e40..a1e7eef39b71 100644
--- a/dev-java/commons-launcher/commons-launcher-1.1-r2.ebuild
+++ b/dev-java/commons-launcher/commons-launcher-1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN%%-*}/${PN##*-}/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 CDEPEND="dev-java/ant-core:0"
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index 3fadd1e20d56..002ff3946c09 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1,6 +1,6 @@
 AUX commons-logging-1.2-gentoo.patch 897 BLAKE2B 353550109ecc13bfa897217d845ca9cb6e315d29f1a565462d4905cb02b3092eb3a97b16b992f80d13cfdd6938467c064c91e214b62e0ab1160b3b557c3c870f SHA512 b486f96b1d7ae8e8decb3210fb33a31dbfa147cd30ae8311c60eab4f0d48b71518825bba06f146490aeea746dc3dc996a7191a974d57cf990ca253793b9294a1
 AUX commons-logging-1.2-servletapi.patch 1855 BLAKE2B d3c7cb640563f200fde0a72fc1f7e74a89d3072d74593c2c7829162a71df385af9dfbda5cbd3cc82b78a8fadb353eb1dcc6fba0ff30ac425c4306fed9ec7e731 SHA512 3e608ec37279664249d89eb90eaee7e2f5536ab37efcb6e94a8d586b5284a4641aaa5c58f6ef4730955e51fd22491e82f1a6b5b50303f9c4d7cfd066f751799c
 DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
-EBUILD commons-logging-1.2-r1.ebuild 2216 BLAKE2B 6500f43ff9db9150f2f0077bbd6d180d7132c9112e407534f5716c111422cf5e0fde855b6a128690005049591c9ac13b7fa13d8c1f14d4c16f7b79750bba50ae SHA512 9ba1fb6158df59d239036d09ad071b244f0f1aec726355689db92bb0f0d7dda453d23c520388df9afe70cbeba01282b3b67acd0599280bd9c5a1d708e822fcb8
-EBUILD commons-logging-1.2-r2.ebuild 2313 BLAKE2B 8a02627abecd0391eaae3f32923114640ca84e39deb8f68d51e0f6e6f0d9997ca9d26145f2ef6b7a8bc6b117c9da32b1477e838607334e0b151dce40f24bbd50 SHA512 877fe2b27d0a32d77413c56e455080686ea56f06bed709920a321682d4179d62b7a71e41df95519db7a39fa5ac01f1d585c1f215a3fb2a3e0a808fbc33781508
+EBUILD commons-logging-1.2-r1.ebuild 2206 BLAKE2B c9e0282cd31a7d47abb7420a69d1146f674e176bf7753803475a37e15a735189928b5debdd1ec7866b26d89b8b74768c71f096d7058520c945395279b93ef0b0 SHA512 a883053e3a6b7916ba5ce9c58a857df1a3d19ef739d1b466fd9109ff8b91b4ddc4259917a8b2a1f87019f2713b4fafd5702b549f073062c35964a8b84ac8e710
+EBUILD commons-logging-1.2-r2.ebuild 2303 BLAKE2B ef5024e9757c4272af167353900ddd68b6352755238cba889622e1ee0e8d0f9f39ffc29db992d62ad67023ae1b6269f772280b8cf861318c0266430d42845e54 SHA512 7907674ff580c95ece78dfb6481a6510bf6c570c0e6337254c2e01857fbd54ca4f36bb8e68feedfe479b69f196cd7af58b0c449e620d165dc3d8c5f36412bff7
 MISC metadata.xml 551 BLAKE2B c48c3681129ce8ab7a497385bc3bed8a16ca0f5f4557ebda30565db471b25fea1b6c48ad43a470cf27930a0b2dc3a282242600aee3f60eff66291e6d0c80491f SHA512 1ea71763a6890b1f01fb357a7427b99bcb4918eb87290997e61918808daea37dab371b7fd5b6fee114104b2ee4445e022c0f090a2a58017a3d8b755f8dfcd5bd
diff --git a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
index e39e1e328940..be6e19cbc56a 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ HOMEPAGE="http://commons.apache.org/logging/"
 SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="avalon-framework avalon-logkit log4j servletapi test"
 RESTRICT="!servletapi? ( test )"
 
diff --git a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
index 9d530b2fd238..4aae5b05685c 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="avalon-framework avalon-logkit log4j servletapi test"
 RESTRICT="!servletapi? ( test )"
 
diff --git a/dev-java/commons-net/Manifest b/dev-java/commons-net/Manifest
index 6120052cc304..2000ec20a9d8 100644
--- a/dev-java/commons-net/Manifest
+++ b/dev-java/commons-net/Manifest
@@ -1,4 +1,4 @@
 AUX commons-net-3.2-build.xml 12390 BLAKE2B 849ddf4c6525fdb7e7d8a753c5c0e854471c7f6b257bdc506d89be0dd81bc5c02f69c75e23051e283e74a2e66ac07c77a3432899e3de4e30dc93566a85eed554 SHA512 e4784b083ce86b5a22d5bfba0b0d71d811abf55f8375b9982f5ac1b11bb93f4be15ec0ff4bcb8cac58681a68a03cd6b598c998251097e9bf634674712887bdbe
 DIST commons-net-3.2-src.tar.gz 378351 BLAKE2B f40ad73ef7d9865cdbe9da94a458f0c9ce636b0b71dcab3b48b52716aa141de3215581b75b9283d4d918ad0dbbd2761c9b0d9eee1703a2bbc545718c129511d5 SHA512 2152b0c524320702c336b21308bb8166e00487938430b83e08d65b836ab775c372c9251957c674e0bccff6815fc3ed3bdb7113a0d2a140c53f64c2f557eef2ba
-EBUILD commons-net-3.2.ebuild 1270 BLAKE2B 44449173340b513967b9214de70f28a459bf5b6b457f822fb7c63edd06fba738481e351d0017892d01900afc20c724e7165a47dd57a3ef8963b884a09a3e2289 SHA512 86cb4cbc2c57a8280af40b66a3037206d31100cb48f5c9cf4b1889dfa6de2d624007f2a4581e3a266cbab878e7cf83ca0585a338267690e3206279c732fa75a6
+EBUILD commons-net-3.2.ebuild 1260 BLAKE2B c78c4c247038135b24d70b60d660b5d5bf98df859894e574f149f86ca9dafaaee81439ac394fff5143c732c18e8ca1103200105c135792dc1a0676926e049410 SHA512 f5cae63603d9fc2423431c21913b584103bf1d15a67c744a7012b9b0fc7ae303e51ebdcec162c260f005a58fe1a52a4a9215e801d3944c051f40e8788240de51
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-net/commons-net-3.2.ebuild b/dev-java/commons-net/commons-net-3.2.ebuild
index 31c7dfd4180f..ea92d47ba45c 100644
--- a/dev-java/commons-net/commons-net-3.2.ebuild
+++ b/dev-java/commons-net/commons-net-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -20,7 +20,7 @@ RDEPEND=">=virtual/jre-1.5"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-java/commons-pool/Manifest b/dev-java/commons-pool/Manifest
index 9ddd96ce4f29..a339cb8ee8ec 100644
--- a/dev-java/commons-pool/Manifest
+++ b/dev-java/commons-pool/Manifest
@@ -1,5 +1,5 @@
 DIST commons-pool-1.6-src.tar.gz 321409 BLAKE2B 2ed2bc6d7478217fde271bcc64feefae06aa7f946068e7fa3b2ae055e7c788b2431ba20ce202a2cc879c22d32d6d69cdcc4f8dca6794dc4588b11cda4f665934 SHA512 357dd4b1cab8fccb4116add2bee74036c19cf6102946a1e304dcd3049d3d93f1e405f85349e511a4cc71d0d91382696f97997c9e4014303822b386ac7fbfec93
 DIST commons-pool2-2.2-src.tar.gz 163682 BLAKE2B b9a84b1387cd00eb46cc94726ae3295a73f2f47b824401aca525296eddbf04b6c978a4808014bf7e93c113014e0e2fb0db39d6b9ddb9c651bb385cecd05584a5 SHA512 a9c1a30f497f4a6c28b8b4b82d3b2f801b464fc329d1da4f5087dcd6b923c45bde9ac6f3dc9939025453462f9dfea9fff637db9b4334ed513770a546b4807256
-EBUILD commons-pool-1.6.ebuild 894 BLAKE2B 122f83a322d2c4f38e3ef64cfe62f5e8871d27bbaeaab7d3c44ea768e961978fb113b686b9faece51670cdbc42f394413be9197efaeab0b3615fb5cd12b802cf SHA512 e3c01bb5ed31999c1747d45a4e3cdca4fdbdc0567bce8da24519b17149146997b243a14310e9881dc768274030d9b7fcdfd6aa87dff23ba95fe9fe2de4143678
+EBUILD commons-pool-1.6.ebuild 884 BLAKE2B 7751363b2533447a5d9e55034447e8155d7de59dfba492ebf4644273e1edf7f71cd995a37259034a74580486c606a2030bf738460682bc9082452191302f4b1a SHA512 ecc866b7e0761f61354100f4ad11cf93db87832e80e24d55a049fce31396378d9f405f757f0af79d9b9ae3bd336184ddf8e78be42a3402bb13526b1d4af31d3c
 EBUILD commons-pool-2.2.ebuild 1078 BLAKE2B af248d689fc3ed0cbbf84c9bf9650e4aad57e9eae2c67a42cbead532b4be03102e78db9f5305bf894e03e0b7b972ee53467fa009397f6a20fe75bc5684a374be SHA512 3abb6a3aadc14883a683454eade278c3b04cdc0270b52b0e7c798ffb08098792cb771d8d9b072478e0350f837e2fe2178f58779b9fd8808e6ab597341f8bb1b5
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-pool/commons-pool-1.6.ebuild b/dev-java/commons-pool/commons-pool-1.6.ebuild
index fe1f0cc2b5c2..64c331273099 100644
--- a/dev-java/commons-pool/commons-pool-1.6.ebuild
+++ b/dev-java/commons-pool/commons-pool-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/commons/pool/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND=">=virtual/jre-1.5"
 DEPEND=">=virtual/jdk-1.5
diff --git a/dev-java/commons-primitives/Manifest b/dev-java/commons-primitives/Manifest
index 426f174a6d3b..2321e0b29386 100644
--- a/dev-java/commons-primitives/Manifest
+++ b/dev-java/commons-primitives/Manifest
@@ -1,3 +1,3 @@
 DIST commons-primitives-1.0.tar.gz 172369 BLAKE2B b3641bc163b250997db9897b43af3ab7a1e15eaf34420e92429e321eca43c69bcb094f4b11e9789236d6e24f9c83a5674ad68a33c863fbac12dd72526bfbf4ba SHA512 239752a615f3a88049d6c85326a67462362869eda421ab76975c0906d811c970c871042769d851a4341c8a06b501d6b12fd1feba74d83007b2dd73370c5b3195
-EBUILD commons-primitives-1.0-r3.ebuild 621 BLAKE2B d618f03aea9a824f8e2faa19888ea8f3b7bf39365d6191bc2bd7c1318de4912eb1f8f389c637df5de5510da84b2556b418cbcde6e1a590933fad6103b58c2b7b SHA512 93bf0f7ca0deb92a7f15c719713b437ae83361c799a3f24bab33e37991775d04f4f36e4301ba00c6e8723aab52b8b21491877da7abcc0838817d623d01b11d56
+EBUILD commons-primitives-1.0-r3.ebuild 611 BLAKE2B bc715e8459c8a817b8d2ef58f124a54d99f37af06a8b82c5d0c74a084f4f060926bbd10efd70596beb8d6c58e4c9eb36430ea2bb80549e0b1b6d1736b6214c10 SHA512 e051c27374c748042d2a48113f0dd89961fec560a62b61aad99b6b51bfb515d4ad397cb49b9518d3a53f63a2d99b3daae65def9cec175c271320cdcca725e42c
 MISC metadata.xml 594 BLAKE2B 019c3e2a8144043dfa99f87db088bd5ea453f17d8ec2d7023ce911394587bd27d8b595176c923a34a3cb38900a9b3eaa3cf791787e53e9fdeea610a1f54ed2a2 SHA512 575b9c4f8596e075cbefe7ac97e7f1fab1ecdfb38fc4e9e08cdaa23ef8e0ba46d7f3ea5f942aa79699653d7184e00bc2943e446ff737ead6c7984a89065cf334
diff --git a/dev-java/commons-primitives/commons-primitives-1.0-r3.ebuild b/dev-java/commons-primitives/commons-primitives-1.0-r3.ebuild
index 35cda4986a67..22a04bf2b76c 100644
--- a/dev-java/commons-primitives/commons-primitives-1.0-r3.ebuild
+++ b/dev-java/commons-primitives/commons-primitives-1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://www.apache.org/dist/commons/primitives/source/${P}-src.tar.gz -
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-java/commons-validator/Manifest b/dev-java/commons-validator/Manifest
index 411d7b6adfe5..25e8110e71d6 100644
--- a/dev-java/commons-validator/Manifest
+++ b/dev-java/commons-validator/Manifest
@@ -1,6 +1,6 @@
 AUX validator-1.4.build.xml.patch 676 BLAKE2B 43e8729df9775683413d746756d820bc50f593e8b97dfec0e19bfb543e15b2ed790571d2508247f5f46922be26f2e0e57d7877e390189a6b4ac1380c791d074b SHA512 3b426b65d32799398de59d063f67c840d261593278a48afd81024479171e68483add4c69aeed1e65127812850500ba6ffe24cf31ecda6ad16d3a2df64fb2c218
 DIST commons-validator-1.4.0-src.tar.gz 222421 BLAKE2B 1a83d39be6b2cd8c20cc027cd49b813cd23f65772f17e2c8f1dc7357edd0abf80ce2f76c2c8fb5a5b4acc66eff740925b970cc21ba6a582ecab71f74be84f7bf SHA512 35005d5ada8a1070cdd02f78464886e16157a05f895e3abfe2dcd51fa4b443d9ee359bb54a40e13ed463b757a77a64669c89cd9b914051a4ab1c745be3526d98
 DIST commons-validator-1.4.1-src.tar.gz 244155 BLAKE2B 4d7d63f30bdc9196f73812fa584226f28d9514918c13f0279be74e868f2410e08b2bc2a71a4a54d2b2ba91d580438f3de6fa71afe8dd38838d234723921b6c27 SHA512 e64d16de2481c388c81a488dbe894c4d16a1abad12f841f6f77e2606013edbce75ec7a1371976b7e642adfc7cbc5038ff7271cb4d184fbeb32a635acf6bccb38
-EBUILD commons-validator-1.4.0.ebuild 2665 BLAKE2B b459f1812c79eb8d34366aa68fe92060a24fb9b59abe953f40e4234251244bbea4642babf36a77a04850c83f62bc215d60f8e030ac121d8f84d1309058fe1010 SHA512 3d611f49b880b7499c9d2c787570bc8dd715db3b8d6696b0d9edc88b595e93f0171f2bcb89caee80ffbb1ce7f4359f1ef45c175f26439073f5ad2688f4e599c8
-EBUILD commons-validator-1.4.1.ebuild 2671 BLAKE2B 8ac2725f16c71070fce84eaccf7f23101abfd479bc52e397e8bb8f92fb27e6af7a35ebd23db5165c7a496e97cd25af32421f64a33eb99d26a010ed0e4e2540a7 SHA512 f4250d605f1cca1fce461efa3dd3049abb3faf4f788543bd1f8806c0c21f0f68c6fb20f9e8cdfb5cdd98de34f38386cd91e3cacf77bf0601ecb489b349cdf51d
+EBUILD commons-validator-1.4.0.ebuild 2655 BLAKE2B 46acd60320b348d2b9e6b1747f781d402482a0ffd83ed04000919b1f5879728f18404fa4a7d943c512dd824cca2d428b3beb7f1fb3e9ccd34d7d2d08ec153bf7 SHA512 3180153f474f63d2d5a137d7a4ba93342bd281172f25ce813ad7d1f7cdcefa502f3f0cc05cea5a2a03f7fbd9cf2acf70ed3e18fd1852c60531634c717956faa2
+EBUILD commons-validator-1.4.1.ebuild 2661 BLAKE2B f49b3f0e370034d7f15f7ad23774356720d72ac54f361b0da8c7f2c16986db949df477e49dff9929bf0425665c23d8b741d01f304d384cdfa33626c467ac13e9 SHA512 c049a29d136eb6ff081959dbf7c97b2fb47a05c7f9913d8c0988fdb7c7b2d3ca4d7330afd68bc5fb7bbab9e6662255c22872ca669b6daff808c1e498bff38a3e
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-validator/commons-validator-1.4.0.ebuild b/dev-java/commons-validator/commons-validator-1.4.0.ebuild
index 524cbdb63396..00a7eebf1026 100644
--- a/dev-java/commons-validator/commons-validator-1.4.0.ebuild
+++ b/dev-java/commons-validator/commons-validator-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/commons/validator/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86"
 
 RDEPEND=">=virtual/jre-1.4
 	>=dev-java/commons-digester-1.6:0
diff --git a/dev-java/commons-validator/commons-validator-1.4.1.ebuild b/dev-java/commons-validator/commons-validator-1.4.1.ebuild
index 2158383df9e2..a7f4bcc21ed6 100644
--- a/dev-java/commons-validator/commons-validator-1.4.1.ebuild
+++ b/dev-java/commons-validator/commons-validator-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/commons/validator/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND=">=virtual/jre-1.6
 	>=dev-java/commons-digester-1.6:0
diff --git a/dev-java/commons-vfs/Manifest b/dev-java/commons-vfs/Manifest
index 72afd63a639b..00643efc7003 100644
--- a/dev-java/commons-vfs/Manifest
+++ b/dev-java/commons-vfs/Manifest
@@ -2,6 +2,6 @@ AUX commons-vfs-2.0-build.xml 14505 BLAKE2B adcdc22f6d65d5c98676bde1598d0cfe48c9
 AUX commons-vfs-2.0-incompatibility.patch 2699 BLAKE2B 09e8762553ce25d02942b2a70780ab68aacb5e6126df3e3f7b9f0bf8feae8e8809653c2a52eb09b58510944b87c1609d0120397ba7ac4f5d68317c18060a7d0b SHA512 ca554a098d4aaa6b8848927bfb4f70707dcaa0ba61d174ac517ac9864aa9b3f3e899e3890eab920582098aeea379cdf9ff1279ee7f8ddd37906fd24260954095
 DIST commons-vfs-1.0-src.tar.gz 278588 BLAKE2B a92be28e02758bd271d7bf76f8b90c741dad0f1c15c71ab3624e16c6c30a47bbe189ef93c99b1f413034c47dbfdefbc155a526abf9897b85cb7352d1a92b4bef SHA512 5826ccd3faf574d7573b22fbab5f7f3ddc83b22504eb0822efbcc4570059db410d1a32811bf411414d275bdeb16ce39fd7cca2150d8537841cd888b1aef2b5a1
 DIST commons-vfs-2.0-src.tar.gz 335255 BLAKE2B 01c8bba3340487672682af5c6b341ab1e8335070a9b711b5c85cca659854d05881a0ff10c4b168497e3a75867a7225740edc6e56019e55c499256401fb0a53c5 SHA512 433828b9eba73df14dbedaa4037e3da1c69bf1892553c1ae4d213ba864e4ee579e0c7799f39e3cb4ec087d7c9223f54442be46de9c4916d7b7ff8a51214d6346
-EBUILD commons-vfs-1.0-r1.ebuild 936 BLAKE2B 4bef96a39c8206c538a87f2ea77226372307cd91bd3bdcc7424af6854eb455411c924322d2002e29cc3acba9b386dd3bc3431f8716faaa6174a6f70c2d279683 SHA512 462d048230ccc7417ecea946d48c2b7cf7377ae8e77efe6eb958ff4a2614bee49fd710aaef9621f59edcfa5f00a96be53a3c6a66f929f30b1b6f5d02db8e6e26
-EBUILD commons-vfs-2.0-r1.ebuild 1561 BLAKE2B 6edccc91c539c891e3b3edc296400b9141fdbb8d797b6dac3cf3d0d8ddb1c90d49d6d3b06c058d4721065f800f1d5609a5a7664cef618107ae468d6eb68c9a55 SHA512 b415b7487c982b1513bb782ed98fb860939ddd4fac5952cab9eba1c4f32d4741ba1e308b0aa66d7ca3e46d1ee3ef014dc452d68c8bc33914099d264d95d4c103
+EBUILD commons-vfs-1.0-r1.ebuild 926 BLAKE2B 015548e9af71869d3fbbcb86fd2b26357c134f9fc0eff582eda19bda7b57252e05242f519e7e62d5f6600e3df27c8a182c415e23dcd9ceb11b6463be1db583ca SHA512 fbb4861ec1710b7de93d5690be2fa91920833b3274f5d47a558c94c95a912083b494f6bc40d5606b4a2c07ce17d10c46d7ef41105034290beaa0cfc3671bb2f7
+EBUILD commons-vfs-2.0-r1.ebuild 1551 BLAKE2B 43e4cb03cff172de62bddc07ccc970de8cfa599084b3588c3cb7564cd1834b3ac8e65e673de534cd21ffdff0b4f5a4b30d1988de9c8e9b9d2952de7417d32530 SHA512 dc4545c9ff8170375a338780e6f7756e99a454e87d5eb9594367c08d1fc36001b681a760f521ff9c48441d337eefff505106e04acfe9cb79cc8dbcb38a52d758
 MISC metadata.xml 522 BLAKE2B b4fa8415246b36a13af5f876f6fb75a49d867247d47d39fa26652917f0dc6e0fd48e99518cb7406375ea9b5715a8beb0f798dd9d95825969fa320aded7da50e3 SHA512 1c1c96edc32537d782e66dcf44b14081f2cdd249e5bb398dcc711b4dabac745db15af7fee7ceaaf0d758738b99f3fee8be7b9e1561887426c3ae8988bc1900a1
diff --git a/dev-java/commons-vfs/commons-vfs-1.0-r1.ebuild b/dev-java/commons-vfs/commons-vfs-1.0-r1.ebuild
index cd41c2e7792a..0387c4902d78 100644
--- a/dev-java/commons-vfs/commons-vfs-1.0-r1.ebuild
+++ b/dev-java/commons-vfs/commons-vfs-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://commons.apache.org/vfs/"
 SRC_URI="https://archive.apache.org/dist/${PN/-//}/source/${P}-src.tar.gz" # Not on Apache mirrors.
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
 RESTRICT="test" # Some failures, can't figure them out.
 
 CP_DEPEND="
diff --git a/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild
index c0b4d9f74835..dfb280409533 100644
--- a/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild
+++ b/dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/commons/vfs/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 CDEPEND="
 	dev-java/ant-core:0
diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
index 9988abd60e80..47c5e549ebcf 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 1893 BLAKE2B 48c61ac618ab4a82326972a690fd0dc625554ce69b194237f90e8524eed9cc7e5aba44c0f1aa93d1f519adea9c2b47824868c38fa3f65d9197849a3021971cc9 SHA512 ed4ac9bc68ac45cfc6af7fe342530cf756780937adc5cdf073c8b247ce7fe53ddb878f1e6cc5faf4a1097d1ec969ab605c5c389fa19a1fb6d03873245581968b
+EBUILD dom4j-1.6.1-r7.ebuild 1871 BLAKE2B ac9a685c9e4218a5ce85f9f8d2005d6683b4e84c35f09ba27d632208cef47b92b31de3102197077b62ca00aed707f62a50a58537ff8b5a5944e9e9b5486b64cc SHA512 e34d4811f98f27fbbd4153c702f0845c7616801ef620ae800cf2bfb2a21567c402ef6d07e6a5035c34a48d4ff8aa0a4ee2823e313e4d6f735675764889619c3c
 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 9fd5cbffd462..c3ac813cd529 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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-fbsd ~x86-fbsd ~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/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index fe4f95e94094..8c17430413f9 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,7 +1,7 @@
 DIST ecjsrc-4.2.1.jar 1417043 BLAKE2B dc6915ec85d96a6ecdafb04485549feeb6ef8329811e294647e9e179ff3b1ec3cea55c29ad23b306ff3489dbfe6f574dc691ee31080a592d71607d3a996e9bb4 SHA512 967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf
 DIST ecjsrc-4.4.2.jar 1764959 BLAKE2B 402bcbb040c28fa10dad07c4223daed9976f3246d6984ac74d95087a6cdcd5a742072126a999435eb2d49d49bb2884474461ae8439a9839617b2891297cd7c07 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20
 DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
-EBUILD eclipse-ecj-4.2.1.ebuild 2780 BLAKE2B 5031dd4b688ae44f9f168a8718c262da21e1fd0ae76db56597a619dddc81ef5b5feee3c2e712f885e1cb5be79cd523197ae40e25caf9123cdca066922aac28ab SHA512 2d4a870985cd6ab5625fef499541e0a47d435f7bd2d936944c2ed75a1ae221101e6b97f4defac5be462a632488cec7994faa309bc663b4d224d5374ada2e6ea3
-EBUILD eclipse-ecj-4.4.2-r1.ebuild 1371 BLAKE2B 4b8b1a0f512b8dee3a81adb73382809b2b67475709cea18dcfb05aefbd147597fb552c55031be09d2106acb29585cdaccb2df7185f30d1a78abd2b98e7a8a01e SHA512 d8cb8193546b77b66ebe38052994fe1aa422db91f4223a05c37c6eacd2a7039474c2b2fdf016c7fd723669427d6632d6b36ad945229bcc2ed720742be0e695bd
-EBUILD eclipse-ecj-4.5.1.ebuild 1638 BLAKE2B c72c734d0e7a91bc3726d87c16b5539ca47787df95dfc5d5e12f1e3290390bce1aa55a59296d02f2a42405e6ad95c88406bb123a2c2919be0a3eb79a8658acb7 SHA512 3515d245863e5d42ea973dbe700c7699af11f4796dc225fb7985aa4a0f612b799e93a72eac7ca314d664114feb8bd43ed4e14cef4d6e7c17798fb2064644de47
+EBUILD eclipse-ecj-4.2.1.ebuild 2770 BLAKE2B 23996155f35ac40c9a44a92f49e794a0f02468c1fd94a4a151f2b5451ac02d22feaa5381d07f8fcf49592b407842aae438c6e0866f7c20ecd7514edf6127e0b1 SHA512 b1e4e064ce41776a958ee2c8290382baaf228d998ea8b1d7db5c036369cff259da43877b1f8e7712678985f2facd0adabc9922c3ecd7072f499f52adc929a9ce
+EBUILD eclipse-ecj-4.4.2-r1.ebuild 1361 BLAKE2B 3f2fea077ce628cb057ee841d6a19b06f9b56344c085a5fd7533fa084d3f7cf92a5ac6edc31632e31c470852f742b383cc913371e927d59aabfbb38e42496f6e SHA512 9a870d4ce61c4a5ed3f9c0e9b7b75f0006a1649269849a08a5b5b809f980abb3773be37338564578e4fc8ee8921e231c93b5cfc0f72e99f71190c7a91ff86eef
+EBUILD eclipse-ecj-4.5.1.ebuild 1628 BLAKE2B 19a0422c19a19998e199dae7170e3b89954d412e62523ec4742fbf514015afdfe01a9c932b044dfd4f6971a96ba1bf3bf98697732b677f567c3d2a83368d575e SHA512 ba5ded5ba46b10e1467c42ad8f63f67f065acd08f3e39541e3794e97a0f8974edc1d4e3eff474916922b83e8fd9656cba6f34b67c3febc4ea15bf08c933ca2ff
 MISC metadata.xml 645 BLAKE2B f774dea11925d1031013a012083f962369714c32d58ce7480f114dd732ec4f19465c174ce4387ce54d138b8a38072c767c18e21ab47e6f92480085f1104a974c SHA512 0ba8d7ccd7280fc72bf485c5450a3e6bcd09713c432867439aaa7ebed6db5530ee15a0687c381a9191b533abebba4a6a06d9fbfa6ee3e01dae9dc2936de6836a
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild
index 9e9f541213dd..ed2ff2427af1 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.eclipse.org/"
 SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
 
 LICENSE="EPL-1.0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="4.2"
 IUSE="+ant userland_GNU"
 
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild
index 67acbe1e99d8..ea7d04f5d41a 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.eclipse.org/"
 SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
 
 LICENSE="EPL-1.0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="4.4"
 IUSE="+ant"
 
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
index 1301f382b5e3..5e2a7d0f72aa 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.eclipse.org/"
 SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
 
 LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 SLOT="4.5"
 IUSE="+ant"
 
diff --git a/dev-java/emma/Manifest b/dev-java/emma/Manifest
index 9b400984975b..e3dc1ff335c8 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 1053 BLAKE2B 6dbb7cb8369c4e92e3978174c3190ec2ad4bb08a01f63ee33293e9cf7dc6b2a0e0de01e903fa7749115665823f09fe449f48700ea54c285ba17feb20d4d66ed5 SHA512 d5d08c66d803fe24af625df6b793388f85f2ce9a5add53d96f5e6f3cc6de3670b91f1e4b50f6166c0d201270a53fe2534be39634aae497cc26d477025f32bda6
+EBUILD emma-2.0.5312-r3.ebuild 1043 BLAKE2B b93c80ed04f62d0281fc8f70d0b950ffcb238b34f8877a5de2dd19da24d1fcb77c56c416a65c4bba87f911f49bd7a053795546489f3df3286d336864bb25031e SHA512 8e92ba3a851ca3d14de2dc9e93f5d6526002b63f860fee181d6cade4b7f9ade88de92588f370d549c9f733ace9b12e618aeff632df7a4ec8bf8c04b869f58a32
 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 ff56f2afb65f..7980a191226b 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 IUSE="+launcher"
 
diff --git a/dev-java/fastinfoset/Manifest b/dev-java/fastinfoset/Manifest
index 4104abbb903e..53dcb4963fce 100644
--- a/dev-java/fastinfoset/Manifest
+++ b/dev-java/fastinfoset/Manifest
@@ -1,3 +1,3 @@
 DIST FastInfoset-1.2.11-sources.jar 255054 BLAKE2B b5424f34aff73e6d5510b1ebae537751c84dca4d98c305bc0fea75dee9f8aac1a8e9213b0adfd27b840febcb4001cb1a539f9fddb73fc621efbe0453686eba32 SHA512 a1e850e4b235bf767a168dacdaf61f4e1261b6cb50387c3f3cda575f87bed5cf3974c9d04a273baf1aeb47bfa1851aab95432a3890b8bd99f3672c88f0205e3a
-EBUILD fastinfoset-1.2.11.ebuild 586 BLAKE2B 5c3d4601711bcbb5db9e48f3880f4fc421b5c07b2cf5747ffdbf92ed5e4fd8bada79a397de594c5958939be5b0365e7d9da981dd8524b52e4fc200faf0e3a3e6 SHA512 0f3186983efbca765e35ad3afd1a18019b2f8e78f9aa77896d07503ed4b5246fa1e2bf8f79fbfebda1f4d69e84363c6dae2f567ec4372b6d017375ff5ac11641
+EBUILD fastinfoset-1.2.11.ebuild 576 BLAKE2B e82254171cd6b284cbffd16497110be0ed270a36328e18dcfff67254ede6f2c14669f69a3f0f2c178f3cbfd41d15f452771a625b05f5b99b34497cf86ce3d7d6 SHA512 8d95577f414b05929170553ded66178519e1a433f1db14e5e3711a51824b236d76db5ebd5ba2db59d631bb999686b6ef9a5f2629e32bd61c2de9a4c5e7c6b0b5
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/fastinfoset/fastinfoset-1.2.11.ebuild b/dev-java/fastinfoset/fastinfoset-1.2.11.ebuild
index 3bb647c3d87f..d84fbc04414d 100644
--- a/dev-java/fastinfoset/fastinfoset-1.2.11.ebuild
+++ b/dev-java/fastinfoset/fastinfoset-1.2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="http://search.maven.org/remotecontent?filepath=com/sun/xml/${PN}/${MY_P
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/fontbox/Manifest b/dev-java/fontbox/Manifest
index b1698686ad36..a711a3ae79c5 100644
--- a/dev-java/fontbox/Manifest
+++ b/dev-java/fontbox/Manifest
@@ -1,6 +1,6 @@
 AUX fontbox-1.7.1_maven-build.xml 10618 BLAKE2B 6fe7b6a3b274ee3a419675c56e86a865d1e05c393d39b5bd897bf54cf6c45fb27674078747da927c3df1e9d017d332ccf1aec00499947a62fc850590adfd5c31 SHA512 8f3173325808c096cca21f69bb70f9ed5a43c0e56b5d6487604de399625bb40fbeecc569c068bb6840a87fb5edcc3e22171d8c6fab28a2c00b36172196c1935c
 DIST pdfbox-1.7.1-src.zip 9167805 BLAKE2B f9e02d1540eaf7e4bb748906e56887494d81eecc88685fa9d758cb50712a530528573f4a7e5f816b4ff57d664a416b35444517d840c9b37239ec1e2b5a62b5a1 SHA512 8b2af3d8f431626c106e4f6e9e1d59d14abcd58cfdc9553f20c5057eef9f9cfbd0287e14e58e4d34472ad81198eb3f4d0a2fd6e88bd1fa5cbcf01e4befbf77d0
 DIST pdfbox-1.8.11-src.zip 11026359 BLAKE2B b3eb1add38e9bd0e5a1fcb116263fdbc372d6adb77132aeb0647a6c5d2c2b735345220f0a5c22caa97d04f78ad6517df388327aaa625677bd8c99d2051329a9c SHA512 05c8e5075379ed5ebb09555b39434dd936fce9dd24445871d24ea7f0f6afa49e74242bf0c9eba2d1a847b505143789b687dd039ca51ce76851132f2f18d434d1
-EBUILD fontbox-1.7.1.ebuild 968 BLAKE2B c0cfbb09340a5b22c8b72c4d6f831dc5f431afe1d4e4890498a615a6d91238ac70b81b3ee5e574ebf4714f84bebae9310030029dab8054aee1f0f8abb1993f32 SHA512 d499f893e453acc65696b1a9acb2e6a29e1b0cf6495b84c95f57fb69bc512c078613b87ffb1f932b3c2ad13584fdb5020847df41e8622c6f14261f2ba506fa72
+EBUILD fontbox-1.7.1.ebuild 958 BLAKE2B 491457b8dec13a785243e3e65744436674715c6412488ecd077d71e451505d793f4a3ea3d22741b44529176b0de960173682732e6b857ea4d3ea96f29f74d1ef SHA512 ec886298a49d78572e0c6532cbb0ac190e380e4d14b5151e741b7b7b4f9170b2366defbe0b850ad654ea6ba62049ed1bb955d2a30de72b9162961f462c569aaf
 EBUILD fontbox-1.8.11.ebuild 1145 BLAKE2B 7c61fd7605246c936b411cd5165059850a922725d6a55610e6c6b7d9a364d0c6b6f36e94b2bcc8c79172f3fd7d562cfb877bb837da9f481c4ea8cc53a2c4246d SHA512 defb0a63b70461a9409a0ff4b9ee8fcf97a865016b4587c74ac1273fd4c221802eaecb44a148b341f6a7fbfe6cb102b069390d659f292a498057f97687b64445
 MISC metadata.xml 586 BLAKE2B dced74e0b5e677040e5bc60d35050eb2acd6e0c9f88f02ba5fe41dfcf6d90a1dacd70e17f85d1d091b6e4a6135cf31c54629107ae0fe33ff863644f849ceb96d SHA512 d7f91851ceae4b6d8a9315e201f5e5ba09a92c29ae26f4abc8dd4faeec30b1de64b1528f89e09cb84372197de93576a468a6e5897ca55a62c8c39c53e4943809
diff --git a/dev-java/fontbox/fontbox-1.7.1.ebuild b/dev-java/fontbox/fontbox-1.7.1.ebuild
index 243e6d8a8374..af7aed89fd33 100644
--- a/dev-java/fontbox/fontbox-1.7.1.ebuild
+++ b/dev-java/fontbox/fontbox-1.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_PN}-${PV}-src.zip"
 
 LICENSE="BSD"
 SLOT="1.7"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~x64-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-java/glassfish-jms-api/Manifest b/dev-java/glassfish-jms-api/Manifest
index 134ae057b84a..a1a0c74c4d8a 100644
--- a/dev-java/glassfish-jms-api/Manifest
+++ b/dev-java/glassfish-jms-api/Manifest
@@ -1,3 +1,3 @@
 DIST glassfish-v2ur2-b04-src.zip 39817113 BLAKE2B 4aeb0df44f838c91fa8dd52e2a4985e86457f75cec3cd5d527de54f672afcd2824cefaad9d9e67c5ce096515e389bb2fc0874d76ce2ec86a956233f2c3508439 SHA512 4ddf75ad1b81cfb8fc0b772fc75f9a81d74b6239282770d5da0ed70a7cd8b5fca2fd8c95782a2946ed054b43ee8e17edaf47d79c749e89280131bf1d15b1dcf8
-EBUILD glassfish-jms-api-1.1.2.2.04.ebuild 1247 BLAKE2B 9657611c5eccb8494415789d1524a47ac774281f5856ed713abe2de5becec16a791c311b8cb9b3e0f27fa5e08383fdb60a859a43c732ee959b01029c34b28b1a SHA512 fc34504fcc8e2b81dda7fafcc4a24e4d6b99b5e185c1be867bbad9ac02626c2abf278685daa6c934c7df2e390f76e0492cbb9a5edfb2c61645cbe4e986abadf1
+EBUILD glassfish-jms-api-1.1.2.2.04.ebuild 1235 BLAKE2B 553972605cc58642f29f0445f2a2080416c1cc1c7eb89f8c51f90ce2249205b605cd9d9bfbb329d5fb873ce3629e2373269994f82156d5477d0a741deabcc4a6 SHA512 f3ab5eb4ac6455d0dd577b4b1e295d8fed169e9962472989d816c85d3c3d029cc44d65e28e5e3a7170fe0af88d48e94284bd7596d0bb4d7315f0b18ea5d09446
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04.ebuild b/dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04.ebuild
index c14e1050ac3e..a19cf3b26787 100644
--- a/dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04.ebuild
+++ b/dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -17,7 +17,7 @@ SRC_URI="http://download.java.net/javaee5/${MAJOR}/promoted/source/${ZIP}"
 
 LICENSE="|| ( CDDL GPL-2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 
 IUSE=""
 
diff --git a/dev-java/glassfish-persistence/Manifest b/dev-java/glassfish-persistence/Manifest
index 4518382efcb6..1a0d0791c9f0 100644
--- a/dev-java/glassfish-persistence/Manifest
+++ b/dev-java/glassfish-persistence/Manifest
@@ -1,4 +1,4 @@
 AUX glassfish-persistence-1.0-python2.7-sax-parser.patch 286 BLAKE2B 49667ba4e41eadfea73fc8b53cf61f5fafd4654292ecd1b2e2b653411d252b1ff8bc40e6c9e0cd8fdd1375ba86a358495415a68ff1466f857d96cfd90ce5605a SHA512 ba7c32d86991407d45a86d640d95007cc47dcd28c74f441e38840206093653dc31e4824d4986cd9cd60d44fba0c1f4365f9348a9362529531fa9410e9fd5cad1
 DIST glassfish-9_0-b48-src.zip 35162972 BLAKE2B ff96f2135c6bbdc60eadab6a6bd60b623ac1a3635e4465591ee75f6c1229e83f9f6424b46e42eb333eb6edd3ba1aba51897ab80ca5bd5c754e516a27a03381d9 SHA512 512ccd1c89a1bbd88ca1e45b1e60693bd3c4a6c6ffa19376febb786eb73556f27bc0ce4f0e760d6d80b0711206f6701e7c7da70ef3a5e0084ad0482246506a48
-EBUILD glassfish-persistence-1.0-r1.ebuild 820 BLAKE2B 519f9a742f6533b89737ba20b15aaf1130b3a3c99917a9d9eb8c8c06529e0209e4b2f9fead301e0d373d6ccba034650c4d749c2962e44cba915676dc836eeace SHA512 555c94ae5a06f17590abd0dc0917c5d58042362ee6d702d2f6ea9457f502ad06ab9a31617924e1739ffea08faa08ff82008585fcbd745ff56f6ec621b5bd3335
+EBUILD glassfish-persistence-1.0-r1.ebuild 810 BLAKE2B 1deaeff209d96ac7c5fccf60e6c5f884e2aa5cccab66b2ca4d8a6e7144b800994e2feba13f878bae0369e439deb70d21b23f528ea9ed2a5c2d1047f82886226f SHA512 a28365904170c86507fc5f3be45de8e805bdfbdd3fe36d06bc7d6d46e332a98996297c3d2e0beb1447a2ebe32eb7e8946e4c6bcd47042d995bd30af04484154a
 MISC metadata.xml 214 BLAKE2B 5452fb11be445b7579865f9777af292067658bf101f6321db48ab1b478101fe031bb7914c6c24215bcdbe369dda396c164fcbbc4253ecb315de82141ee25f8b0 SHA512 d2b6ecfbbd79440de1909d9f195e5d4a6f9886b685ac1e6d7a1db39b8925b29942fac2998cde06040c921f2cc9ef2cbfbf836b60e191d894b00f75628476b1f7
diff --git a/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild b/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild
index bf1de0a51a36..cbb04e8d159b 100644
--- a/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild
+++ b/dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -11,7 +11,7 @@ SRC_URI="http://download.java.net/javaee5/fcs_branch/promoted/source/glassfish-9
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-java/glassfish-transaction-api/Manifest b/dev-java/glassfish-transaction-api/Manifest
index 62575e141a23..05106b850f35 100644
--- a/dev-java/glassfish-transaction-api/Manifest
+++ b/dev-java/glassfish-transaction-api/Manifest
@@ -1,3 +1,3 @@
 DIST glassfish-v2ur2-b04-src.zip 39817113 BLAKE2B 4aeb0df44f838c91fa8dd52e2a4985e86457f75cec3cd5d527de54f672afcd2824cefaad9d9e67c5ce096515e389bb2fc0874d76ce2ec86a956233f2c3508439 SHA512 4ddf75ad1b81cfb8fc0b772fc75f9a81d74b6239282770d5da0ed70a7cd8b5fca2fd8c95782a2946ed054b43ee8e17edaf47d79c749e89280131bf1d15b1dcf8
-EBUILD glassfish-transaction-api-1.1.2.2.04-r1.ebuild 913 BLAKE2B 490f40da0868647cb492493f7f519fa87dac727dd4d4c3b170639d7dd1cc8c02481475e0d3d31dcd1a37dcf9e982fe9279656ba47680cd9feff9651b22e94641 SHA512 48dc858ce8d256ab93fb8be6556ee04c49cb6a1c8e2dbdd02d76b528f8719a36ce36aed38df00195fed424f9dacbe7844f2e6ec7a7c07ea875a8bfc864d464fc
+EBUILD glassfish-transaction-api-1.1.2.2.04-r1.ebuild 903 BLAKE2B 18b306de152875fbad94346bd36a1073b3f3775ad8fa277a7656f74648a8c61ba500b10a02b730b18cec98ce0c6e0a58bf4ff1521a1f5c1ce4225261f7f2011a SHA512 1afb1d7abe18ede9c9d5aedae753b08c931e5a3eab7bc317716a33f853ab4d9431a636c949e87e92023c5fe1fee99dd7e47f0951b6e044414acfb23e20496e0f
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04-r1.ebuild b/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04-r1.ebuild
index 9f87fc7ad5e6..4ce2f85f2770 100644
--- a/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04-r1.ebuild
+++ b/dev-java/glassfish-transaction-api/glassfish-transaction-api-1.1.2.2.04-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ SRC_URI="http://download.java.net/javaee5/${MAJOR}/promoted/source/${ZIP}"
 
 LICENSE="|| ( CDDL GPL-2 )"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/gnu-crypto/Manifest b/dev-java/gnu-crypto/Manifest
index 9bec32dce516..9854fa901f07 100644
--- a/dev-java/gnu-crypto/Manifest
+++ b/dev-java/gnu-crypto/Manifest
@@ -1,5 +1,5 @@
 AUX gnu-crypto-2.0.1-jdk15.patch 1551 BLAKE2B 9111fdc0ca8eff845c61a298b92fc1abc39c88caf0cbd04e2adb4ca50aa025a21c3f2694854df54c250505bab580cf40a40db9b67ab0ec881d65aa3baea3ca36 SHA512 f30f33e29bf400eb8bdd465ffd649fd2aec03ab6d3a315c5da2a8b6375524f1cc20f6ec3f813a9940fbdecf4364c8985bed946ada633d73bda9508c0dc198923
 DIST gnu-crypto-2.0.1.tar.bz2 3895714 BLAKE2B 4838f7aa58cbd34d97afb7f503a29b7393ae3085f1b83c8ae65110f20ff7143928351f0aaf2a61a2abb363f764dc67dbd12955fbd0f86dd685dafda550e0e7f1 SHA512 c14aa73fb23663559195e8fc7f85a220b25078fa8ab4e7cf43b84febe96599d990ccf52fcf1f6f66f2b547d9b644bbc99b3d44dc4a777dcb72530e58c8509015
-EBUILD gnu-crypto-2.0.1-r2.ebuild 1144 BLAKE2B 2e4c6aa8f536081996eea6922e2638e8f23b25f7bfa9fe39071f22fafd35d1a096558ca6ed06729d6855a866d4787259cda40f33d104ef5207a000b2dfec7977 SHA512 ef533c44dc0b1538bebf170ec139f89792c0e2828b2a1009fbcf3dd94dcfda9d998e26888064f9104c1079f40ea0cfff5cadab811b504fb0edfcba573039ad81
-EBUILD gnu-crypto-2.0.1-r3.ebuild 1248 BLAKE2B 4684db5e63de3c5ebe3a4875ac617f1f75653710a38ca712587af73bfaaf2a4d2dd90779f872b9c52f59d6ca0a6f383a5ac7af7a4b66eab12ae6c89f713e3c6d SHA512 867c1d58164c34c0461536974214fc72f76170f91583b8945f755f0b36cb2d86cf8780cd6ddb82558c4d106e9def839baba1a64ebfa687ea5ec003fa048c02d8
+EBUILD gnu-crypto-2.0.1-r2.ebuild 1134 BLAKE2B 9381cf170ffe744c24f29a9098683d4da17071b5117efa95ea4840ac700e71751cc58d0344dec776adbe1b992c1bb2d49b37b8c66af7b05243cc2d3c37cc21e9 SHA512 34ab8c7a250c6b5e3c18338f53bd0e3ce6cac95fa659b174bf69c751fb764dbff883f55a270d37346f93689763e9c6f4e0e8d85e0e8c6fd526caf5cc5746ae09
+EBUILD gnu-crypto-2.0.1-r3.ebuild 1238 BLAKE2B 301eb79891ff1580da7fdafa88fc44e743a5df88e250d86606dcc02d647db5910bca22511c5875625b1a79bee5ea81b8c33cafc85b66adde0044b26024f54c25 SHA512 01b474db07874cd33fda2671c147c965f445e08c5c51b2ccd34377f34c639bf06fde2875762e1c4166d62de0f450bfac20c56e75d9793bc35b5f6b7bfccd2828
 MISC metadata.xml 535 BLAKE2B 2271d87cef0c6759b2e79d1f22025c8f5899990f5689f9e4343c45e1c039a22a7e242ca0adb95950899e222671dda176c1d5248b8f3d2a9134a58b481b7a5bb2 SHA512 113c98ec48fed10332c9677b90df1803bbcaae3311e5f71be6c681f89bb449618f66b11736bc76bfea5d21828671d30879fe56c49278e9f75b137c62ccb5eb22
diff --git a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild
index 7c3c742aeda4..a193aa43cf2d 100644
--- a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild
+++ b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.gnupg.org/GnuPG/gnu-crypto/gnu-crypto-2.0.1.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.3"
diff --git a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild
index 9d7cea0ce72e..e717650d7a82 100644
--- a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild
+++ b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.gnupg.org/GnuPG/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/gnu-jaf/Manifest b/dev-java/gnu-jaf/Manifest
index a79fc1ba14d3..7c019ae08b98 100644
--- a/dev-java/gnu-jaf/Manifest
+++ b/dev-java/gnu-jaf/Manifest
@@ -1,3 +1,3 @@
 DIST activation-1.1.1.tar.gz 157018 BLAKE2B e9135b4c0996601c7963a46363e8ede3ba81e83e532637a92d83c89586eb52bd11be84ee37f5e8f31e372564f7c14aac4123726ba20712f5cef89a1e4bcd01f3 SHA512 d323644df13a4572bf1c10e7175c1c4cfa3078483886bba7b308989c215a23e12939b054124dbaf0437a4c5fdcb551b4e2189c09afc078218963389e4b3c3b7d
-EBUILD gnu-jaf-1.1.1.ebuild 733 BLAKE2B 7bc465d696506a95500efc13a650a46d11c70bab268a98d796c2f1cc745843ec115f83937759ca2d739758d3768212bb918f7cdf3ffcfcb1ab8502eca4746abc SHA512 738902424f31c47f08f732c41c6db4ef2cda1bf61f27536f9970e9b9ddcf7dcc65d2f648c0636884b5d77e1b15827963d9ca87c15820e5de40a5fe36d29c9a21
+EBUILD gnu-jaf-1.1.1.ebuild 723 BLAKE2B 3035912452f56b0ef016c499b2e4680db3c648ebf61fdfc3f587f97b3205c57d854034c320203c91ec0c6cf0272c68d6e96e0098644a1efbc9530868660aa2de SHA512 6fbcaf63f1022b11e774d8334ffa877702c63077f211379e69b5112e06067f7a2d882857f92e733e9a717b38678b545361b631fb652f19ac04ae310ceb167754
 MISC metadata.xml 1072 BLAKE2B d6b9b7455a12a24c3e64b33f34faa427572e456c0d9c331137790d4db1aaf5bc0d870ff5f1bebf296804549cb69f7484d6536f1b7c4605a66331c08911f18cf5 SHA512 8116cd7f57a163402e1abef43f1abdef212914adda64de9a93585134bb232ad5ac0862f73a5422fa330d761d0c0429511a837ef8ae6b10a203b9de3302b830f3
diff --git a/dev-java/gnu-jaf/gnu-jaf-1.1.1.ebuild b/dev-java/gnu-jaf/gnu-jaf-1.1.1.ebuild
index 95dacd78c581..a44ffd846b2f 100644
--- a/dev-java/gnu-jaf/gnu-jaf-1.1.1.ebuild
+++ b/dev-java/gnu-jaf/gnu-jaf-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 JAVA_PKG_IUSE="doc source"
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/classpathx/activation-${PV}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="1"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/gnu-regexp/Manifest b/dev-java/gnu-regexp/Manifest
index c9fec0bce744..7ccddd7a1fbd 100644
--- a/dev-java/gnu-regexp/Manifest
+++ b/dev-java/gnu-regexp/Manifest
@@ -1,3 +1,3 @@
 DIST gnu-regexp-1.1.4.tar.gz 164741 BLAKE2B b6183e8b12d283616d55112e0cbc8ca9de069c75b793066066606d2e824c4cd182de1e65c6529bc323a58717a7a72d4a97dc303d5a4572dfc53613c2a06adcad SHA512 4397ecd2a485f67213ee74e1c942a1bfd1af5f261f964546cb3c7bc32fe88702a557d717f07d2a4d7d1db2d684ddc4191c120b35b44d1a68a126f7b81d8b0331
-EBUILD gnu-regexp-1.1.4-r3.ebuild 905 BLAKE2B 3ad16860b711c7aa79a2c762eb85ce512ffa80980e660d6010965d1af65d718a07ee7ccc9c900aa932d5c8eb107521ecc010f51b255f406fcd2b68bbb36227a9 SHA512 93dde1881d75ff11a55c0538eca46cccd0dc12ee02efe475d620e3fcf46d1a6a637a241c8a12859f631bf6f2436b4f5f586bbffb590e82f10d7c4879748550d2
+EBUILD gnu-regexp-1.1.4-r3.ebuild 883 BLAKE2B b15e67d2fc6e088d9858a0f188fabd24477aa1950d38660a269e58e5c0c7c02b3804b035c47f85d9183f5ea51b99bb1db48bd0738e2b3159557294190993e757 SHA512 ff33ca282254adde5c8ab22abf6248ad9423704e122e391af1b9171ea0c247cb3f9690ea46f7962e2ce355d3ec53f9684721578d037f998f751801e5cab9d875
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/gnu-regexp/gnu-regexp-1.1.4-r3.ebuild b/dev-java/gnu-regexp/gnu-regexp-1.1.4-r3.ebuild
index cda896e1be02..8787fe4bd8d8 100644
--- a/dev-java/gnu-regexp/gnu-regexp-1.1.4-r3.ebuild
+++ b/dev-java/gnu-regexp/gnu-regexp-1.1.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
 
 CDEPEND="dev-java/java-getopt:1"
diff --git a/dev-java/hamcrest-core/Manifest b/dev-java/hamcrest-core/Manifest
index b54c062ee811..5741b3122ec3 100644
--- a/dev-java/hamcrest-core/Manifest
+++ b/dev-java/hamcrest-core/Manifest
@@ -2,6 +2,6 @@ AUX hamcrest-1.3-empty_generator.patch 1227 BLAKE2B 4e0bc6d085f6d26de9f2da8e09eb
 AUX hamcrest-core-1.3-fix_javadoc.patch 3036 BLAKE2B ee65eb88f113a5f6fd93b49dafb76d8c1c39266f6fb2f220849eeabec7ce5b084d2411c51102fa5b47853aed66acd6d237497c0c8bb2c688c93b7eb0785e27a3 SHA512 f50fe8f2ba32e17118c42e438ef96973f7c04b70321353ed2c19c7ec8f61ba0c801b49920295d0d30add50fb18dbab5cd079b1879f71f4d569b8253ca40b4ce3
 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 748 BLAKE2B 7aaf89cc23f84a6a2bfacbafdfaef00710927ca94d16f818b6a3aec0cbfd8e2195b865857faee97576650437bd77fa7b119e0ca8ac0a28c7c72dab0f0a0f7436 SHA512 24c4c82ceb15beec3c2838041683f0dc07ddf9426b13d04a7f4095b415d33923fd625174c6fc663d5cd63c4cd29d10e0beb993478d4e5c9d839620cf80c95149
-EBUILD hamcrest-core-1.3.ebuild 1533 BLAKE2B 4fea783967db60448905434fd0408c937b9edd470f2f90ffc60e9631996da765c30efae66cd3027e7cb04de9a05986fc914741522be4fb02278a878e5ca285e6 SHA512 e3d9ac4995d55578da658437fefe7cb73c5b78c2cf4185ebb61f4a7d5fca199d9dcf6aff8950026809ec96831f061647a36120439103f5e14dd102416916c7f8
+EBUILD hamcrest-core-1.1-r1.ebuild 726 BLAKE2B 0bf2ceff64edd7c6359d06c2019e34dfea5862c0055f86865162127ed8946dafb71481d7fa37786bc613386cae965df060448841805e8f4c599097e47c09fc9e SHA512 7fa43c784e0ce93356d60704e1e1146fbfb34448252ea9d94849749a6f876a99c830fd3154fa37692fb14b12f2dc67c995b9047e067e968e59ccab04f318dc0c
+EBUILD hamcrest-core-1.3.ebuild 1521 BLAKE2B b3f820d2a13406937497405865c7603d7985740a75f3c40e6ae6a3264d200c3b596921dfa844dbe550b8d0fce15e9318c629ba8658334a22fc9218039fc8139c SHA512 3416e84cda9a2c7939b9e61fcec5ae1663295568b541782f522d82f6ec2a16556416daaf3c31410e2368030c822852d211a86e3095a7406775e742730bdef3ec
 MISC metadata.xml 363 BLAKE2B 949dd901636266a4874e05a9902cabbfa703b665d96402ffa219ca9dfc6d6bb340518ecab596dac5cf38292b3303ebc63ae0831285cf3e6a3b5379c0ed9b7366 SHA512 7c71d7b035ce5a0a53a33932a8e7c90d2c4749deecb2a6e2b1dbaf7183b2526ad18d2233717f8c405039bf7d87939a544092d8f058f006418b8584caaff8fbf8
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild
index df930ee1e323..78621915ae72 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.zi
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild
index 7d20822cae53..24bdc77cad61 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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 ~amd64-fbsd ~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 d08f7202e556..85a205910e9f 100644
--- a/dev-java/hamcrest-generator/Manifest
+++ b/dev-java/hamcrest-generator/Manifest
@@ -2,6 +2,6 @@ AUX 1.1-build.xml.patch 4213 BLAKE2B cf48828ccc8b46ce9488f79462492a03b1a3ec8b5c0
 AUX hamcrest-generator-1.3-no_jarjar.patch 982 BLAKE2B 4c09b64a6b824025771682dad6875b8c048f488fd777545d7c8f7219de04193fe40eaea63b7e319d5c00843175f66033e26216f68436c2d99e256fe06218daba SHA512 26b77758ab603b02dde03ec7a51f6b1f1077aa45580e8a21ffa671fc385c54ff00b3a79f8a3be037f28a8b77289d1290493469a1c8c856a9b61846d4cedac58f
 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 1286 BLAKE2B b98e16c9a51b87cc1923bc139763f82f86f586fc13edfe2fdebdefb327b261cbb6d9c0cd432e1a4bf12a2627b4e50507d8533d521190aa971ae630525e53ec2c SHA512 17c7380ca8472ec64ee48d91c8e2c19f8d5fd6041138810409a6f1e274eb95c26ef1f641a43c3c0a24d210d1b2545a04a5540bcd627f24bb476180cef9cbf668
-EBUILD hamcrest-generator-1.3-r1.ebuild 1351 BLAKE2B 8b886439f64d39ed2cc09a34d11f284ad5553b32bc3b3b16d65dd036cdc3f4410063165afba2df9bb277b490f0fe1e27ad1075b50cc2875468d321c1edb0ca69 SHA512 84fda25410bd08f2b8935255ddf2f634e5dba413861d2d2ccab73a0e1755f5ed0fb325ab691c3ad1d2e60e4676c297fe5954fc364349e02d8dd6211eed3fe3d6
+EBUILD hamcrest-generator-1.1.ebuild 1274 BLAKE2B 717dff6fd73252c1c6d347e3aca112a3f6bd998ba06062c793c251356d59a943b43f73cba2410d2e5f22a341ac4836e4cd8ead1014bb07578cd9b4d59f7b4a1d SHA512 377f209ef46d2754954e01dd969ac04226c464584ec8d92ea76d36cc2ce1462ef49af2b7159dd1da82b8a1481b08fdff5f3973aea1b4652964e4d2c0ecfe48d1
+EBUILD hamcrest-generator-1.3-r1.ebuild 1339 BLAKE2B 77616c2e8d04bd08c1128536888bf8cee4c7bcdc025773222846b7924bff417c8657d0241de63d8264ba6b893cc37308db8fbdccb8df86bd55c996f319248404 SHA512 bb6112925539fd5844b85a3d746b095cf6c4583d95b1bc53d5a813790c1e0af120147939b5eb2b1478ae85bf5af1a9ca12f665904e3ecf3d58d8c4d96d8176d9
 MISC metadata.xml 363 BLAKE2B 949dd901636266a4874e05a9902cabbfa703b665d96402ffa219ca9dfc6d6bb340518ecab596dac5cf38292b3303ebc63ae0831285cf3e6a3b5379c0ed9b7366 SHA512 7c71d7b035ce5a0a53a33932a8e7c90d2c4749deecb2a6e2b1dbaf7183b2526ad18d2233717f8c405039bf7d87939a544092d8f058f006418b8584caaff8fbf8
diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild
index e84582193d26..19e54674594e 100644
--- a/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 CDEPEND="dev-java/qdox:1.6"
 
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 73203f8e5619..66c19578868e 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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 ~amd64-fbsd ~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/ical4j/Manifest b/dev-java/ical4j/Manifest
index a7b64891f88e..f2e61a298140 100644
--- a/dev-java/ical4j/Manifest
+++ b/dev-java/ical4j/Manifest
@@ -1,4 +1,4 @@
 AUX 1.0.5-build.xml.patch 3196 BLAKE2B 307ce2025eea059b3f18567782978f7a03807179b768fd14c3f72a92d299115fac0cc30db03df01860d6a91d47ef8e379eae487d6a899a4ce7edd2063a68f963 SHA512 888a57e0c2ca9bec191c14dde8b33235b024e5ee764c0fc44e61cd51040f30a8ba4698c5457c1b4acf4180092b152c635ac14521b7bee958c533ce4ad3854e34
 DIST ical4j-1.0.5-src.tar.bz2 9307268 BLAKE2B f72cb77a73e1b1740f52accf5296630ba4e2ef9d4610a384a400ea50e84f245c2d320e05b2702e963ef3d7097e073687343fe2e924eca5e64b80a8f2dc1adcdf SHA512 1c2c1eb6207094fd12036d4eb93afaef820c19c7bce99611ddb9115cd62ece76972b7280364b49643147e4456ef4afca4df23ce4413e0288804183f33c2cc286
-EBUILD ical4j-1.0.5.ebuild 1460 BLAKE2B 6561e80d76076de92e72dd88dea019e5171116c04c394e1df4fa13c916e71b10679908c290cbeccf274df2428d1ee0073d6c137fb0ed4141ea39c3860ff5e50d SHA512 25a69d45544748858f15c291b4032ec2dfc27cfdf07372915e2607680baa0d201c3540ee1401ac2fb67da68a1862c7f58b1a312eb0a8e55d952ebc8707d0a9bb
+EBUILD ical4j-1.0.5.ebuild 1450 BLAKE2B be13dd724d2f7e22c0ffdf3f8656ea1549d215f3c7b26cef6d14f7edf18e125c313543863a437d9226706ba9acfe9c40dd6649961ffd8edaee92737f5abc2a19 SHA512 5fbd008813eb539e1a83db013355b223ea4db777c30993a4c96f7dbe7741d852857ed31c7023f5665ea6c4513231f602d4e242465276d2179dd7cadd26da1ec6
 MISC metadata.xml 984 BLAKE2B 81e4a28b90f79647765ccb0738a683f1e350450efda561e693332ce39be4291091ac08068135e24c4227ad9151874d6c9177ae8f0088d5aed2a17384eb825537 SHA512 23aa711de73797e43a847aa485a1d652b4b02cc6f37ea0b79ced99e101c332c4dfb3ebd90d65a1057f8dbf0f9090f6a7d5e582c9d6f7cef5c61afb8289cc804a
diff --git a/dev-java/ical4j/ical4j-1.0.5.ebuild b/dev-java/ical4j/ical4j-1.0.5.ebuild
index 395a5bdddfa7..e82a71816b02 100644
--- a/dev-java/ical4j/ical4j-1.0.5.ebuild
+++ b/dev-java/ical4j/ical4j-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 
 COMMON_DEP="
 	dev-java/commons-logging:0
diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
index 443cfc869ddf..ea22261325b4 100644
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -1,7 +1,7 @@
 DIST icu4j-54_1_1.tgz 23457651 BLAKE2B f200d170c32065d2f678247d595085283446e401da2c2433b426466fc5c6f93f5ce629bce23d1114cad7d360aa4d127060750d380da8cc3e7fa1e529b454bae9 SHA512 c41f7f9fb0819767da48ac21c4883a628da8397e0ad5b0d75e51d9185b5511608c9a635933c4ae2e0c8911b2cdecf47bc661050935bbae2ba58abfb5ad04dadf
 DIST icu4j-55_1.tgz 23617640 BLAKE2B fe22524761e0c6be4ea440f90ffe5fba8a2f34484207248762ab127c3bb7e4328ced3502a336edd7d3a1026804381cd2b8738b15cd1745af0cee813dc60d7893 SHA512 706daed61d9d3722a0813d175fa66b24570abba492c32704d4df924861e5d2592a4a5ff40fdec2bd3fb662c3679dbc9addd580966c3cc69470d14e3fce27a054
 DIST icu4j-56_1.tgz 23189284 BLAKE2B d53aa869d6cde8cc9c83e66b55986b61736fbaf7a890e3c7bacab5abb23623ec64b5a23fd740dca8e51fd2336ced5e79546b4c08edca25beced22e6560f7814d SHA512 9ecc36c03a6713dbfb909e109b5e982525958b6137bd7006c93ff3b8578d816c59fa331555b43c94248f392ba9b456b1adb37be74e02e9ea818c8a9a7c669f4a
-EBUILD icu4j-54.1.1.ebuild 1223 BLAKE2B f5b79f2dd9e0a41a9efca9419e2ea26cf0fc42d9dff637d8fa19b039602c3352cb8f96eb7b6694070db76e58ac840f605bc549a7c9b43dec7775b1e8e1d2c07c SHA512 cca8d8494d59bb302509ec91cb6e74e3026054ae291e2ce42d46318da519c95d0e3189872ab08678d210ff5391b5c09ceddbd6c4577eedaf50888f061fd534ab
-EBUILD icu4j-55.1.ebuild 1146 BLAKE2B f85bfdd53b41308c6afd121cdf8e08237024f4523e1f154e4aea192d13a9f13d2cda849e5716abfda7c91e5bea2ea32d2009bc39f1c30cb10b50180bd92a45b1 SHA512 4b2a01321ab00fee83ebb9ea7728e5ea9f55c9fc6b423b12cfa30458df8ab8383955914e7d9d44c1d184824b861d3c719aea659b01af5b7d06d63c7c9401fed7
-EBUILD icu4j-56.1.ebuild 1091 BLAKE2B 82d7ddea70a1c04cd6f1ee4ea1e4ded2b56a693e18eeb69980bdfa8fd9668d2734bd0e1d550cd6d1764663fb7d2c7a041ab71c022da43507ecaac4ec4a49a307 SHA512 a658683adce960be5ebbc1c7fa939caa2bc8547122d95549324e0c155cedfeef968221630c03c0d8eca6c3580712afdc2668bf3e653a1d284dd54bde6868cc39
+EBUILD icu4j-54.1.1.ebuild 1213 BLAKE2B d47fef652684c16d29b82b733f31ebfcbcaf983117a4a7034f9b29dbb2dc03a5de7c5c342c0b1f9300fd8c5cc600e45fe3a67ec832fc9b972157ff7d636177d4 SHA512 af5cb4dd46107792562c6c9460a09e728b8c79b0cb974ef90cb58c33cfaba621b38a06099b793d2976f608d1d6308bd8e5184f794f24b4a2ec5f2179733b81df
+EBUILD icu4j-55.1.ebuild 1136 BLAKE2B c942cd5c30cf3f12b10deb63edd95f7680d837a5515130bd5f160311859bfba269fe7376927efa0c07dcd56843a8ca6b134bf94ed77a35215848cc6cdef5508d SHA512 11157e68e4c11522c6af2ec1015ed0b63d0a13ad03a5bffb7296026d66ae6da0fbae153529c7305a8b6dc386366dcab9e35c2b8b9831de0a1c92f20354400cd7
+EBUILD icu4j-56.1.ebuild 1081 BLAKE2B 916737c2e0db890bb1e399629af6f0c6c0cf084cbaa3429388e357942c9ed602d8be0c5584c2f68ceb37e4e5f063da2b6ee66cddbcee6019d0ca847b7cdbffb3 SHA512 77bd9ebfd71a0c7a0ebe6683110246e1ef987a8f77f94ff4bb8e0f892fd2801e4cc4243dada495305a0d22fef13b465e426c04ff4eae7db836c9f2b8a7a7d20f
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/icu4j/icu4j-54.1.1.ebuild b/dev-java/icu4j/icu4j-54.1.1.ebuild
index 82a976fcd4a4..b7808b26f206 100644
--- a/dev-java/icu4j/icu4j-54.1.1.ebuild
+++ b/dev-java/icu4j/icu4j-54.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${PV//./_}.tgz"
 
 LICENSE="icu"
 SLOT="52"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 # Beware of jdk version dependant code #361593
diff --git a/dev-java/icu4j/icu4j-55.1.ebuild b/dev-java/icu4j/icu4j-55.1.ebuild
index ab03d68edaac..5c57a734de39 100644
--- a/dev-java/icu4j/icu4j-55.1.ebuild
+++ b/dev-java/icu4j/icu4j-55.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${PV//./_}.tgz"
 
 LICENSE="icu"
 SLOT="55"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 # Beware of jdk version dependant code #361593
diff --git a/dev-java/icu4j/icu4j-56.1.ebuild b/dev-java/icu4j/icu4j-56.1.ebuild
index 44bf2b8ba967..3e0a98276d16 100644
--- a/dev-java/icu4j/icu4j-56.1.ebuild
+++ b/dev-java/icu4j/icu4j-56.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${PV//./_}.tgz"
 
 LICENSE="icu"
 SLOT="56"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/iso-relax/Manifest b/dev-java/iso-relax/Manifest
index 0ffc72e3b250..20ab8fa62e97 100644
--- a/dev-java/iso-relax/Manifest
+++ b/dev-java/iso-relax/Manifest
@@ -1,3 +1,3 @@
 DIST iso-relax-20050331.tar.bz2 696665 BLAKE2B 4f366818bed5e31fa8fc2f8759a38dddda26b8d379c4ba81ff3679228826890f7383606901440f51d958a2401943822bcb3a03bde9be1a647245563d58316526 SHA512 c327b461785ce647f9913afa6f5b77c41440e806d566884058be76e14a118d14fa305a1bc0157ee150b199b573e75af954311dc79eb8535599544f094526320a
-EBUILD iso-relax-20050331-r4.ebuild 762 BLAKE2B 8520da0da5643787719cdfc2eb48ee9887ff26907af9f9e634562d66422b8e7c95c3c33a6ac2731f9768091a721b3f14dc249b6eaf482844562855b81fcfcef6 SHA512 2bad91bf3e87e95cee700b8e073a3f349b06adfa2237bb65a5803d75758d9bf4d34d7d9233095026ab2898b15d76d7dbe79421891d31afce5ea8074d314734e1
+EBUILD iso-relax-20050331-r4.ebuild 752 BLAKE2B 010d212d282382eceadccd139e830e4be159394239804b8656e9e6512c7b3bfc1da264c05aba5e9414e168e7959fcb710d5dcbb2bedebd1a41aacc2da1521583 SHA512 b90fd47eb568f30cb79d952fda2a0467676571a07759eed91aff177fe4b9cfa1a3756c65a562535fbdceee848d9cb0c9f4f8e94cc8c6dd7fb3af26935a73929d
 MISC metadata.xml 315 BLAKE2B 0c45e5fc5f64ce3a8d20de0be018eda7220ffa15c3880d54e49e8a6ac6cb9de770f5ce66e3e113ee6a6406324b440dee40fa6b98dbf4c2920b8c4c714a891a98 SHA512 08eaff739d58710deda145cdac32ab148112f2364f3f5a898095f0f135bca602354287ebc40ee9ab73d80e344330b810caa87b16b86b3c5696040e16d3a54fd9
diff --git a/dev-java/iso-relax/iso-relax-20050331-r4.ebuild b/dev-java/iso-relax/iso-relax-20050331-r4.ebuild
index cc473d9721ed..c82edc65fa0d 100644
--- a/dev-java/iso-relax/iso-relax-20050331-r4.ebuild
+++ b/dev-java/iso-relax/iso-relax-20050331-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}-gentoo.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RESTRICT="test"
diff --git a/dev-java/jakarta-oro/Manifest b/dev-java/jakarta-oro/Manifest
index e78cd8810f26..7fb9219c3254 100644
--- a/dev-java/jakarta-oro/Manifest
+++ b/dev-java/jakarta-oro/Manifest
@@ -1,4 +1,4 @@
 DIST jakarta-oro-2.0.8.tar.gz 345304 BLAKE2B a52b14f2753cb5ce07d16d417e943009dbb9268fddc62850daebb703ba2da3d83a3d05828479c89cab96174582514af75efedc73050a5f933cc0b26fbd51c948 SHA512 a7f6eb6a088765f273df18ccc823f918737f18ec8772275054839a87f8370f1848e795d481f226c712651104d7598ab86c7d90a991fb039df6581f42f1447920
-EBUILD jakarta-oro-2.0.8-r3.ebuild 1033 BLAKE2B 3202018b6f2f88c9646817e9466d951958f8cd45f2be2069f6371c72267ddc94cb643e786e3fba32647a6d2e963230aaade7e512dd2a435af67f6b191ca6cf1c SHA512 a003cb49f2db1274d351928799d70298267d0bfe8b0e9d0cb6395e195c96c125201514045425975f6f9163487c00b3a4f43fd40645002724ee8a5f2b4126d1b1
-EBUILD jakarta-oro-2.0.8-r4.ebuild 856 BLAKE2B 4362425f6c212a3fd6fa8d5b937f2a528d2258383291cac25b01436538a0f7b37d49668bf8187bf79ac0fdbae532b61393ba7f2b956342f3033025d4a0e5f4e1 SHA512 4fec9d9190e4f90e3a2e0cfc2e7b2d77d6b650ef0596f86088a1bc21a72114cdef0414a3b043dd6d106a17bfc289248b5bda9c4b8f2a971def865f0803fbd0d4
+EBUILD jakarta-oro-2.0.8-r3.ebuild 1023 BLAKE2B 8994de05a1a2f24bf4a3f32e8152b3b15c2f801fde2e9c63d39ada08bc75f8c7cc59f12ce55348957b13b57d0e01f64ef7300077a1065b1ffcad651239cbdb6f SHA512 9c0582f359a973d97dcc8dae6632bb23d977671f03d9d0c22d6964121e0c3be5e471c156805aa1609052ff654fdaffa1aacf45ff4718ee1e3af94c5ce9465905
+EBUILD jakarta-oro-2.0.8-r4.ebuild 846 BLAKE2B b62c9f3e1ea2cafaf8f510d1ee8a80d2e6c92088600c1d42897f77eec741abb8330f29bb9ffc318f13eb4537cefb0f2c879cb85bc9eced647358b033f10c000e SHA512 744f0f3f6e48d5d1714e68c2f3730bd66fe538426ece8c2883b699780f9cee7227ed55047a6083d0ebb8e53ba557fac0dae5adda63e41e597a190c7de65f0007
 MISC metadata.xml 513 BLAKE2B 7c56f359436aaddf4ef061d969a24d623a5706526c5c2f7ebdcdf287898271bc40dadf7a0940e2d6bee0c96e53f2d828c9e7030f2b6b9102cbb50daca9ce3e50 SHA512 759a7e18395261364c71cb38e5ff76196588d16913f0992611c952bc0b5ed6dbd47e9a28a51b6ae74ab04b4c548ebbb773d1d813b1dd06a0c8b786cd381e43d2
diff --git a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild
index eb90915d7d22..6cd4191d288c 100644
--- a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild
+++ b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ SRC_URI="http://archive.apache.org/dist/${MY_J}/${MY_O}/${P}.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="2.0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.3"
diff --git a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r4.ebuild b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r4.ebuild
index e20990f9e00c..bb4bd7f86dad 100644
--- a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r4.ebuild
+++ b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ SRC_URI="http://archive.apache.org/dist/${MY_J}/${MY_O}/${P}.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="2.0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jakarta-regexp/Manifest b/dev-java/jakarta-regexp/Manifest
index 2a28e473b6fe..2b2d6618db0a 100644
--- a/dev-java/jakarta-regexp/Manifest
+++ b/dev-java/jakarta-regexp/Manifest
@@ -1,7 +1,7 @@
 DIST jakarta-regexp-1.3.tar.gz 127069 BLAKE2B c6bb7383459a4cacc3af40ec65d83f7d16ae723585fee06b4c874995455924e000d8bdc0b07615028f81fc7d6ba2927755e11bc9e7a726ffb4adf34be034ce63 SHA512 20e932856a2e761ac2c8b62617a0e661eb9ef309230ea8379cf3582a1a9308b50334bea66405fa47fade9b92a3cf9609c0a3e42cb7db85af4af63acaec553112
 DIST jakarta-regexp-1.4.tar.gz 137768 BLAKE2B f6732f6a856736d1394b429453fd8958deb9f3f651f24accf641fee8b5ccc39e9807510135b07452f80fff55423406afc1aed88cef7d80e16ac013a1436b2649 SHA512 209b3f960cd16f05d3fd609b3b6ddb119e056f428b831788caaed6ebcb64c00279b18484845456dd07b8b761a7181f6772dbe9fd578f0401a5d8b1dcf98afc35
 DIST jakarta-regexp-1.5.tar.gz 170142 BLAKE2B f245a3d53eb0be3ed2494269eee956aec7a7459872219f1bb8ecb3e5f544070b0792a690b4a52f70f0e2ba6963842868cfcbf40cdfea0155831f216636d943cf SHA512 428e5971140dd29246ec41e698813d244efc0e871c69d2d83685d8ae3691f0e20ac44aedad3c59f3c356d24384461de83921e40f0cc4d69c95813f02e8aaba82
-EBUILD jakarta-regexp-1.3-r5.ebuild 663 BLAKE2B 850a39175f1f3ba2bd859e297d3ba0d08968929ead40250fb38b630eb605cdc843334adf6ab62dde2edc41edf3fac38aed82b9d5f25221d9cb8e5c39a073295d SHA512 78b001c6c35bc0d739cb45df843dc81ab3d08bc08445a55e84b52eadcf0395fbcee3b7863a870ac0c1efdf7e5671e606fac91249edf10f49960961b69fa4aa68
-EBUILD jakarta-regexp-1.4-r2.ebuild 663 BLAKE2B 850a39175f1f3ba2bd859e297d3ba0d08968929ead40250fb38b630eb605cdc843334adf6ab62dde2edc41edf3fac38aed82b9d5f25221d9cb8e5c39a073295d SHA512 78b001c6c35bc0d739cb45df843dc81ab3d08bc08445a55e84b52eadcf0395fbcee3b7863a870ac0c1efdf7e5671e606fac91249edf10f49960961b69fa4aa68
-EBUILD jakarta-regexp-1.5.ebuild 663 BLAKE2B 850a39175f1f3ba2bd859e297d3ba0d08968929ead40250fb38b630eb605cdc843334adf6ab62dde2edc41edf3fac38aed82b9d5f25221d9cb8e5c39a073295d SHA512 78b001c6c35bc0d739cb45df843dc81ab3d08bc08445a55e84b52eadcf0395fbcee3b7863a870ac0c1efdf7e5671e606fac91249edf10f49960961b69fa4aa68
+EBUILD jakarta-regexp-1.3-r5.ebuild 653 BLAKE2B 8145e0dbb90652da7689ef4bdf2d79a2edba5a19079af1c3bd1e2c9adb910df15320c591bcccedf3f783b9da912c6f5c309ee59b9fbeb48e5761d88dbd3b4971 SHA512 8d7e0e05770e1b4eafcfe8d3ea7927bb929d177adb3c4cffa6ff56b179ed66baa0812acd61d9396cd6db7118ec29a3eb8895e20ce38e82d2cfc9a36753302212
+EBUILD jakarta-regexp-1.4-r2.ebuild 653 BLAKE2B 8145e0dbb90652da7689ef4bdf2d79a2edba5a19079af1c3bd1e2c9adb910df15320c591bcccedf3f783b9da912c6f5c309ee59b9fbeb48e5761d88dbd3b4971 SHA512 8d7e0e05770e1b4eafcfe8d3ea7927bb929d177adb3c4cffa6ff56b179ed66baa0812acd61d9396cd6db7118ec29a3eb8895e20ce38e82d2cfc9a36753302212
+EBUILD jakarta-regexp-1.5.ebuild 653 BLAKE2B 8145e0dbb90652da7689ef4bdf2d79a2edba5a19079af1c3bd1e2c9adb910df15320c591bcccedf3f783b9da912c6f5c309ee59b9fbeb48e5761d88dbd3b4971 SHA512 8d7e0e05770e1b4eafcfe8d3ea7927bb929d177adb3c4cffa6ff56b179ed66baa0812acd61d9396cd6db7118ec29a3eb8895e20ce38e82d2cfc9a36753302212
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
index f3397f38ca62..c510ef52deba 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ HOMEPAGE="http://jakarta.apache.org/"
 SLOT="${PV}"
 IUSE=""
 LICENSE="Apache-1.1"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 RDEPEND="
 	>=virtual/jre-1.6"
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild
index f3397f38ca62..c510ef52deba 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ HOMEPAGE="http://jakarta.apache.org/"
 SLOT="${PV}"
 IUSE=""
 LICENSE="Apache-1.1"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 RDEPEND="
 	>=virtual/jre-1.6"
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild
index f3397f38ca62..c510ef52deba 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ HOMEPAGE="http://jakarta.apache.org/"
 SLOT="${PV}"
 IUSE=""
 LICENSE="Apache-1.1"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 RDEPEND="
 	>=virtual/jre-1.6"
diff --git a/dev-java/jarjar/Manifest b/dev-java/jarjar/Manifest
index 3b4debbfced5..75b92639f7a0 100644
--- a/dev-java/jarjar/Manifest
+++ b/dev-java/jarjar/Manifest
@@ -1,5 +1,5 @@
 AUX 0.9-bootclasspath.patch 630 BLAKE2B a4f65fe4d76ca51c5b5f41b707c52e9dcbb579d08d50eb63be54e7ce15ad0516847f1bc0e1d84ee0767ee068d9a5863e93d8bd5ce20d563a4e3b2ce7c340a43c SHA512 07225e41b1497c369fcd924ea6ff612388c020f89181e583bd5dc55d5219fe81a196c76df3bf5b8bdf882bf3a25b5b874110d231c5a3e5d387bdff16b2d0cc27
 AUX 0.9-system-jars.patch 790 BLAKE2B 702240e131e2e22fe5b32e52493d87e6f88c9025f782cc74579f2027b20f6bc44dc2e229dfd8cbd20fcc8bb9310bc87d24d04b9db779059c0a599e329989fb98 SHA512 6dfcd74af809b85e11a4f9c0cf5aea176ef1dff86705346e26a0f4be6f2b9f45dba82d304d83dd5be6e8def37947217bcebe408fd7627f9a1511a3d6d721d992
 DIST jarjar-src-1.4.zip 339014 BLAKE2B 88694826dad529396cd4471aab135782aca7455daa56f2f8d66dbcef2630466b1f3030c95c79ba8cb054f44bbf5dca39652283c41e982eb63f264d5d163ff1d2 SHA512 62af4f07c3fe2b887da959b8251a94fbd1c142e56b3332ad81865eef9ba32ded47883fc37d943c0081a4496ab71ef044022d13f21ccdb8db690638c26fc52c31
-EBUILD jarjar-1.4.ebuild 1254 BLAKE2B 852a1796c8c82e2f8416c2dfe618bbc8fcaba0469d9e5306b2fc81a6439a50bb9a702e047b257a7cafe006e36946c58e7b021b847d85d33436682ee3cab3eb33 SHA512 5b594c214c39232116a581c370a320b6216a3e9d8f2810d84a6d0cef00f0dd7ecc9183a0be3d4fedf2237bdfe95e114cfca8bfeec2331dc41566e409f06cac14
+EBUILD jarjar-1.4.ebuild 1242 BLAKE2B 7abfc5cb95ddde03bc4241a2317c21b9d2108527d07bb45a7406f63bc9a6f29dfb1df540247ab2afc5f4a2e9208e9bc628953ce472153753368ddac172af8865 SHA512 0036720b57b00a730ba1f67084205851a5234f179e07e018dadf1098edadbac44d76552ddf5ca588c1084a55763bfe38dceccb6e62b97e89a72db019c0377b10
 MISC metadata.xml 312 BLAKE2B bc12f682c75d74033efbbf7b5a286d8903c59e78bf0733416c29a3d6190c1c95538ce72158ab3a0d1d6c3e644ee8f221ffdc01b25b180c10be2606c682e869c3 SHA512 6e73ffaf397ce44fbfc20a9d676eb0e751da1a48e8c1e6d7bd074704b647cb7f7f87464023d71fc4f27e2cb3468b729aeb005f5d0c66e94a6bde035eeebfb211
diff --git a/dev-java/jarjar/jarjar-1.4.ebuild b/dev-java/jarjar/jarjar-1.4.ebuild
index 3b9ae6781270..51487a4f2fa2 100644
--- a/dev-java/jarjar/jarjar-1.4.ebuild
+++ b/dev-java/jarjar/jarjar-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="https://jarjar.googlecode.com/files/${PN}-src-${PV}.zip"
 HOMEPAGE="http://jarjar.sourceforge.net"
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
 RESTRICT="test"
 
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 8f2f2fffb994..05f5178b6920 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-r3.ebuild 998 BLAKE2B 050a170d50bee7aa8d93e45ccb9c37f0e4b73591dfcce716562397dd26ef261e48bd32973d871e8f3e036385c6c42e385d9410ed14c2b823cc6bed3f083a3788 SHA512 67d0bb47febcb5bd7a1714b6c5de0a65883dec0bb655638adaaf044ab1917753facd52c3bbb39a35090066202471f260e216bb532ceec70b7d8fa0116be6b0f0
+EBUILD java-config-2.2.0-r3.ebuild 976 BLAKE2B ee79892df5bed49e30ce894fe39be3188376243a921e4c105efafc24db797032461ba8e702669ec03af15811e2ea14ed4027700930fdd0af81ccdf1bef6f7434 SHA512 ab20a3da89b55a79dd960a7468316def7433b5927094be6f26a008ea02fa6071e0b2ebdafc11f0eab0ef53cc722f3ed55feae0a4e8a15da5b3120982b6cf2b9d
 MISC metadata.xml 560 BLAKE2B a2cc44cb88cb8e0b80ef1fb56ed610fc10257a0858725fc01f793ae9275fc5ef6e37708c377ccf56425c08eacceea6e52a84eee35a7b2c239484080b6203c4d7 SHA512 9bd085048548f98faa638b23333ee0cf83b870c962b1aba62fa2df897393ce37c2b2e60736c988230252f29fc42e9dbe58ab8e720f7ec05a3e0b3d4c999e2c8a
diff --git a/dev-java/java-config/java-config-2.2.0-r3.ebuild b/dev-java/java-config/java-config-2.2.0-r3.ebuild
index 983ce2cb9f34..62b5da6dd713 100644
--- a/dev-java/java-config/java-config-2.2.0-r3.ebuild
+++ b/dev-java/java-config/java-config-2.2.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 IUSE="test"
 
 DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
diff --git a/dev-java/java-getopt/Manifest b/dev-java/java-getopt/Manifest
index d7d20581104e..1574036b21ef 100644
--- a/dev-java/java-getopt/Manifest
+++ b/dev-java/java-getopt/Manifest
@@ -1,3 +1,3 @@
 DIST java-getopt-1.0.14.tar.gz 45561 BLAKE2B d82234c2e49f6f556ddabd38cd283a63c2f6365ed23c227c42c48c75d834ce7de6a3fdc84c890762f05a63d4e09bab7e584f1cb9d17ef0a4784cd36c62f3128e SHA512 611a08b60ed787eaa1bf6bf6ce45075ed2bd75d7eead941879e019ef12cb4fcd7a196d0e64e9a75adaf35240c872f14590d7afa4e2dda03016fa970bd2e2dc25
-EBUILD java-getopt-1.0.14.ebuild 884 BLAKE2B 613d3f8a0dc32f4675ac8e59ba860d7755ba4c1b5e9039db4a60b79b6f1d5160ad0afc3a3b941bda5a43602442a05398143a5a6db7c49510a6b9cb70f11b7680 SHA512 7ecb8b7a0001b6b07c24eb81eaa2da47e257a09a2bdbda425007085b51a2634cfaf1f2ac879d1632d769be2399b03244a4824cff8d59a4c023628b964389923b
+EBUILD java-getopt-1.0.14.ebuild 862 BLAKE2B f84c185cbe343483e770700b9dd783fd2dffde9ceae47079009030249145bf73ff8012869309eac9b16a4b092b5fa22230d350eb73a75ad8c660a5a78c221dc8 SHA512 132efc32f672e5e5f0c0404016f64a64fcab479e23284d44f919597f06aeeec8ac77b315820c97034d58dfc66e480a2c30e59932dd3058273bdf0ae4421d7d7e
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/java-getopt/java-getopt-1.0.14.ebuild b/dev-java/java-getopt/java-getopt-1.0.14.ebuild
index e5e3e71f6d3c..a7baab751965 100644
--- a/dev-java/java-getopt/java-getopt-1.0.14.ebuild
+++ b/dev-java/java-getopt/java-getopt-1.0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://www.urbanophile.com/arenn/hacking/getopt/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest
index 1b1fc853cd02..3972d994a225 100644
--- a/dev-java/javacc/Manifest
+++ b/dev-java/javacc/Manifest
@@ -1,4 +1,4 @@
 AUX javacc-4.0-javadoc.patch 420 BLAKE2B 8f26c37e26f8967cf527a6f7f4b6c5396bffb5cde4cf9aad292217d41e614800cac438b92971e0c942f71ace4f551db30bae873e83ecdcf2ee7940153fca50bf SHA512 e20554696a27137b7f9c086f7d8c4854742fa1e14ad84e2157cecebdc65f2fb6726a0eaaff7bf3f1113a6fade51c5825b86641b61b917a4fcdd96663a8830438
 DIST javacc-5.0src.tar.gz 810123 BLAKE2B 6833e79a33c7ae8b28902d1c372162a2f9e326629f0d4c1936a8c3638d3aa3f6bd5713aca8398ba5f1ff963fe585eb683fcd3009602ee592ba79692c8ba0f3d6 SHA512 91896a0affac1c4fd00a093a731dfd02bda548d1a4d83e1077ed36a67f4f9deab0ce9f2d0212fd4c08ab00065d3029533adbafbc026a22ca071285093bd3bba6
-EBUILD javacc-5.0-r3.ebuild 1404 BLAKE2B 8c2dfc8ef6949ff717798828b2b4511f4c5cec81cece6f094adc2ae651e44a5d88de5e7f7b707cef08ed540ab5bfdfd86c9c6e79551419808b1787a6ec6673da SHA512 ad8a7789976f67488cd3f749efe961b98e72530af5c9097f160eff51cc894648787882a3c69062bbfba9ae0f3e2517a850429beb5b1049af9b933dff104e8c80
+EBUILD javacc-5.0-r3.ebuild 1394 BLAKE2B 473d5547e934a2bbb07f11b93c473288bb86f47fa9fd1e559b831aaeba14588c6e8c19987722928924e35c4911aac3dbb2c0246f3d090487bf88220307d50f1d SHA512 8d9a3d455ee51ab568e6b91f1aed6160abad1d93f45e8edbe99bedbcc24de12c567d3b1f7f5730789cd5fd5ec987dcd4559e4240df72494bbdd01191e04eced6
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/javacc/javacc-5.0-r3.ebuild b/dev-java/javacc/javacc-5.0-r3.ebuild
index 1249b0be132f..455204cb8ba3 100644
--- a/dev-java/javacc/javacc-5.0-r3.ebuild
+++ b/dev-java/javacc/javacc-5.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="http://java.net/projects/${PN}/downloads/download/${P}src.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 CDEPEND="dev-java/junit:0"
 
diff --git a/dev-java/javacup/Manifest b/dev-java/javacup/Manifest
index 931fc4abfdab..4bc1966ed590 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 2835 BLAKE2B e4200f3fc1868f21ec3dd0e2a55019adf1e8b160df628a545c92e3c5f0bf5175fad782945c680b7a8db066229714bed4afb9e79bf674db7db90e8c09e9706422 SHA512 b039022e35780eb43e8c2e6be562a613048c566ae69d1fd5691ae80655396619f5253be7f0e7d5e5c65d6cc9548f58d2c3688ff8aa63605a8deb1f4a556318a7
+EBUILD javacup-0.11b_p20151001.ebuild 2813 BLAKE2B b4a86c461fbee7fdac2a5413e88c333e01ba4fbbaef709b55db89e0bd976aaf4c740e1df91905857fc339c4686091d2d975478a42f5cf42bb4cd3edd1202cd5d SHA512 cc39cff092b0b3abdc5706ee85a30024d03fcdc2424bc845331bb486f78c192625321b0a44f932bf8e5df9b14d0cc12a482ac7218578ae0c8d8a09d5a78aa4d4
 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 f5904bf6a0f3..bd0ec5820966 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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-fbsd ~x86-fbsd ~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/javahelp/Manifest b/dev-java/javahelp/Manifest
index 27d60897ca80..91b8c325801b 100644
--- a/dev-java/javahelp/Manifest
+++ b/dev-java/javahelp/Manifest
@@ -1,3 +1,3 @@
 DIST javahelp2-src-2.0.05_svn63.zip 3747088 BLAKE2B 80f0fd45741d313fd47ccb9874d31636d12f452ff012dc010de2879bf67a22bd58f6fbde7df86117f463a949f7897ec5e1e3721b1fdd1ee0fc794f30152e188f SHA512 ed795dad98f8d80f4cd4cda40b6aea0978cda621b131b1563016c1ddc02afeb37f3626a28003dac26d7fe996274fb9a97e741a500b15d06b1e5a93342020abc3
-EBUILD javahelp-2.0.05_p63.ebuild 2295 BLAKE2B c4e7a3d731b47ef56eabe8b7d852603de82f88ad6d43cc53088eaf166f3854aeac7d6a9aa4ab8441d965e2f94e718cb3d2fee1a43ac89c171ce35951678c0f77 SHA512 503a949dd78c3a1a7288c2db7e0f7fe351a6a1abc64a7007bfa714e9858135f725de493bf2bdd720332712e907996b56668ad1518f3ee09523a18c39679b8050
+EBUILD javahelp-2.0.05_p63.ebuild 2285 BLAKE2B 360be60aba7c50cb0b7235fa7dd970b5ee1dcf456c9cd40098da59a2d9d97c4c7519cc9c1e80b255f0ba70800b740dc4605d05d303243a30b0e5dda3c6585b05 SHA512 d79e0278aad0ac421036c44d9c748c854b6e2ce03abbd51e4b71ec183b1536636fc267a57f724bbe2f35f3b113bc269a0b9683fbb3b7f883926c0f0d9f946b49
 MISC metadata.xml 624 BLAKE2B 0c06c71189c699c3baf3f8d307f8b077ec8e6e03acb4e0ede09c7537354ab6b7bc043824fa6052be49ccbd6f0debc1cbf2b1e46f42f69a95a1906be6e43639b8 SHA512 bd475a0c41855b34bb58ae6d6a3e2d164abbb97348d809f2fc305e77ca80495bccb4d71ad0aeb0b5586565c71649c6e3775b83c92272dbe8518949864120f484
diff --git a/dev-java/javahelp/javahelp-2.0.05_p63.ebuild b/dev-java/javahelp/javahelp-2.0.05_p63.ebuild
index 4164301afa2c..bd11008d4d6a 100644
--- a/dev-java/javahelp/javahelp-2.0.05_p63.ebuild
+++ b/dev-java/javahelp/javahelp-2.0.05_p63.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="3"
@@ -17,7 +17,7 @@ SRC_URI="https://${PN}.dev.java.net/files/documents/5985/145533/${MY_PN}-src-${M
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 COMMON_DEP="
 	java-virtuals/servlet-api:2.4"
diff --git a/dev-java/javatoolkit/Manifest b/dev-java/javatoolkit/Manifest
index 7ef912ccaca0..73eb27070df2 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 914 BLAKE2B ccb7e57f8f5b45902894e15a1908dcfcad16b0446ea2c69a106ddeb320639bb4e048629d39cae8fe502132667975aa35effdf98bae1815147f0eb00fdd6915fa SHA512 4906143e70c2571a5cbffe2b25fff39a151110b8bcd59d79b9fd0b783e641dadd6f3ff304c1094fb495cf0ec190c9d059e062fbdd7a63a85b7b020746e611620
-EBUILD javatoolkit-0.6.0.ebuild 859 BLAKE2B f504779b0777e2d3a1b8d0bb753716aca4bff76f5e3334343bb8cf8b1081ce98d8fd9d1e56c2f4adf8284bd432b20ac3d6686156786d6b260f7c8e19a324c548 SHA512 b4b137610446330088ab3e5e11817a10006969666a548efea31b175df9e5fbf550b73f3dab6fc053eabbf12682b90d0deae69be70c869d9d8cbbf4ceb4537a97
+EBUILD javatoolkit-0.3.0-r9.ebuild 892 BLAKE2B d482eafeef50138a13c9f26c954d64a1dc342bed789c116fdd7d3fe76123d1fbf1c0b052d94a5457bbfb0e0eae4af079c58299b608271bde9399f106da6b0f49 SHA512 a0e91098feee018748081220a78ffbd3e59bc85bba891037a954d4e39e238bed64cbd356c324e90a13823b07bb86a984712db5b6e2dc1e375f138cc7a25b5201
+EBUILD javatoolkit-0.6.0.ebuild 837 BLAKE2B 5421371c1f81b71810b3d64dcf38d7d4d755bb6b852f6a0c65404bec5861c3ce24bcae0e3ab6974e15ab9c2f1a136e6d57a8563a09a6333759a1d7964827cfe0 SHA512 192f7c45fc04250098e460ad3ca08cadcc590d2e02c1f4abf9f36454662af7fb264b5280d67defa326264203f4952104337d6f8734a3ab023287b8258cb8e722
 EBUILD javatoolkit-9999.ebuild 681 BLAKE2B daddf6a3cecd684ea63cdf8c0a56e9e3562c58ef47263289360b63b818c5f2fb323880e13f7ca3b174ef2d9841b1162c8d7c9b9e7ca6a35fb108a2157bf3b25d SHA512 696e6bcdcea76d9b59a65a80a79cf78e1e9634d0a7eba18dd5700edb328b2773399b1dd8c973d19b0aac3c31953015bc0dee37861ee44f551108310fc249997d
 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 36ac61a52b13..8452d0182b88 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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 ~amd64-fbsd ~x86-fbsd ~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/javatoolkit/javatoolkit-0.6.0.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.0.ebuild
index 386dce2991d0..7ba41de80a3c 100644
--- a/dev-java/javatoolkit/javatoolkit-0.6.0.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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"
 
 python_prepare_all() {
 	hprefixify src/py/buildparser src/py/findclass setup.py
diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index 9c98970b8ceb..f03dd90bdd34 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1,6 +1,6 @@
 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 1100 BLAKE2B 137d30c83b47dd9932b5d8ff50cfb78d640e21fa19f2413623240d173526847b7c8094b383fb4561c9f2763ff0ff1a279dc558bdf7155096c062fdeaf440b8e1 SHA512 5702fe35ed5087cd411390f78ada0aa73861517188572daab3adbc6049c735e7339719ef540b410d20acaf1aaa4316c9a27cf8715dd5e3deb2bb38227a934782
+EBUILD jaxen-1.1.4-r1.ebuild 1090 BLAKE2B c28b7b787c6ea71c7d8a571196be139f1808584d79c986f634663d3aaf4d71917706f74a064c5811d9341734bdb47e02a48836379e90bc7fad5f7f4dc489052e SHA512 26f400c5aedc4449ff42ab48f503c28997e45d99cf76b8c8c18dd1378c19cf9df9c032c968faa47e7cc0a5b02410a115002a1f74ca0d1ef2b8aae186b652fbf8
 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 a864a4673434..c9891f11b423 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/jcifs/Manifest b/dev-java/jcifs/Manifest
index aa626dbd53e9..3cc71b4c3eeb 100644
--- a/dev-java/jcifs/Manifest
+++ b/dev-java/jcifs/Manifest
@@ -1,5 +1,5 @@
 AUX 1.3.17-build.xml.patch 402 BLAKE2B 797df1a932f241974926602d2f1d7c88fcfc7c5e413fc9327ea331d5242fa13a8a3b8f57cd9952f537c206f3363de7e623745ede5134746b379f6767bfc6119e SHA512 a044037c94a8f4a1ba1f9635b4ac8426287fdad9b9942caf89b96665abb7d38f451f8e05666526087cb93511f258491f034af46589b4d611770044c62e27c732
 DIST jcifs-1.3.17.tgz 862091 BLAKE2B 67605ebd810caf097a9172c17f31d39c9e16af5885c706f7d8c2c2cff9b8e6a643174c9aaa8bd6aa06c816e312b7170a5aa06535f823a5c5b182e97beecccd0d SHA512 2fa1950f9ab6f0f3d45fd9b7866cc94993d1135f48d78ce357dca1d872746d22bff6097da8c418d0d11fd71d86b3fdc79b23195bcbab5bc460d8d0cca87efedc
-EBUILD jcifs-1.3.17-r1.ebuild 968 BLAKE2B 56b323c9b828b5d21a30a60eb427a39bc408a0babb7a2937ca6d62b7a676fb591ad4bd1d26758cd386a89f7b7bba805e89b89b5c5deaab4a4011b4fb59994e8c SHA512 be0fa671fe5c639876163cf486052249b23a086d6788030bb0bdc7c1106212a2eed8b7de23644730e573cd961826b4dddf6e99b9218b40653c87d8f2db5be153
-EBUILD jcifs-1.3.17-r2.ebuild 807 BLAKE2B e229bd89e41f16f3b0a11a49c4292212acb69bbad54cb1f806e6de5e0cef5ab65b5cb08a937f41d5028811394316908b8ff42a678c7e2725b00643f5fe657e41 SHA512 f026891458229b543dc2244d358ad0308007c86ec627b3c0f849c345c3206c61f554e050d46a6e49597a80b6f2d6a611f6bae712bb934736e0017a858bc237ab
+EBUILD jcifs-1.3.17-r1.ebuild 958 BLAKE2B 462e0c2f18f77b3905d459c52c8879dba9ef1a6dd2b1c70742a914275b61773e86c42394785887aa18b56f52a9c5d50d1496dae78d1677f367bf1d4c5498dc70 SHA512 6884e56cd264f7ae003deea5e6a5a078f2636eb83e61bf5862c4477cf8279542c538f7c8cefc3d02d9c2450692b6f2b3ea084bc587b447182bb274f63d662c8e
+EBUILD jcifs-1.3.17-r2.ebuild 797 BLAKE2B 9dd98545ba043ab9ad45aa4337fbd2bf9e07a7a8820d7f8920a1acff96702ce6be8ea5e5b1c1245ed8b875592196ef4f455d9490f8953d61d93d5a97917d067c SHA512 256be2f575be136208dcf58989386d294076f53cc34b99c3e07e6a0f0f39ddfb9196c3b2362a43d539d226d167d368c14ec54a106dc915e02d78edb22399d7ad
 MISC metadata.xml 547 BLAKE2B 654c37f05e5dd6b09b76c364070d1fe0f60fb0c9adcbc4c111a900cff3f7a0d1320ae934ee1290d015f64eb59bbe18d6965af52a7be69db16461908cd6d5087a SHA512 5783f25610ce9cf8db737748ca4f493d62e22ac5014de06d8e051d114b8aad73484e496b0ca10216462c8f68125ec501f604168fa1957306b8a2ceaed64d42ae
diff --git a/dev-java/jcifs/jcifs-1.3.17-r1.ebuild b/dev-java/jcifs/jcifs-1.3.17-r1.ebuild
index fd2b3752d6cf..f5a1b1ecc8df 100644
--- a/dev-java/jcifs/jcifs-1.3.17-r1.ebuild
+++ b/dev-java/jcifs/jcifs-1.3.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -11,7 +11,7 @@ SRC_URI="https://jcifs.samba.org/src/${P}.tgz"
 HOMEPAGE="https://jcifs.samba.org/"
 LICENSE="LGPL-2.1"
 SLOT="1.1"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86"
 RDEPEND=">=virtual/jre-1.4
 	java-virtuals/servlet-api:2.4"
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/jcifs/jcifs-1.3.17-r2.ebuild b/dev-java/jcifs/jcifs-1.3.17-r2.ebuild
index 354906b03763..de48d1147b20 100644
--- a/dev-java/jcifs/jcifs-1.3.17-r2.ebuild
+++ b/dev-java/jcifs/jcifs-1.3.17-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ HOMEPAGE="https://jcifs.samba.org/"
 LICENSE="LGPL-2.1"
 SLOT="1.1"
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 CDEPEND="java-virtuals/servlet-api:3.0"
 
diff --git a/dev-java/jdepend/Manifest b/dev-java/jdepend/Manifest
index b940386e628b..f3e645be52ab 100644
--- a/dev-java/jdepend/Manifest
+++ b/dev-java/jdepend/Manifest
@@ -1,3 +1,3 @@
 DIST jdepend-2.9.zip 302836 BLAKE2B dcf3b9c37037926d3792932327ddeb1e95fbbc47beaffb2197653b32bb919a0f3bb4d80c3b32d8e8d83f58e3c216ae5ae6e7ad923971adb460ef0d7fd6036149 SHA512 93ae1ca82422be0dce9794f25ad98c078da7437bca59c697405806a462f81b52028e0536075e2a2f428d8f8c5a27ae50fa7a580b75edbd4e8c9c750315b1c919
-EBUILD jdepend-2.9-r5.ebuild 877 BLAKE2B 42842fd71b0b0ffdb4de842f0b2c549ca7c0f6c2535b35e38f6219a3b19ba1d0c736a63aa139973539265631a4253128d4037487b483090cb5d2c2a32e8bfa25 SHA512 514b87a80c7a6a76aad6538b1058f88aee3adbcd9cbe82bad1446014ea8eb28776cee583ea5d878ea8a28beae792c3b25c890c7b0bd1399a2c75f7a31d08761f
+EBUILD jdepend-2.9-r5.ebuild 867 BLAKE2B 4746955577691bea512a8e5294e14769b85d522342f4220a4bccd8589da1b81876cfa0d493906057360dae73355271ffdf62ace15b3e3e7f59dcd2578a344d2a SHA512 5ee63dee5b8a989c727dfea01f0c8306a8d61cf49a4702b71b4f6827f2595d0eaae39be518b5fbd217e14369e16bc5acfeecc1b707520087bcbba48029b5b980
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jdepend/jdepend-2.9-r5.ebuild b/dev-java/jdepend/jdepend-2.9-r5.ebuild
index 2aab642dca3e..0874404b4dec 100644
--- a/dev-java/jdepend/jdepend-2.9-r5.ebuild
+++ b/dev-java/jdepend/jdepend-2.9-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://www.clarkware.com/software/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index 4b56fb87e663..704102bf5841 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -2,7 +2,7 @@ AUX build-xml-2.patch 1529 BLAKE2B 37aee7dc0ab5b130c16a67b2470e8e3d4052b73c9cc94
 DIST JDOM-2.0.6.tar.gz 8344114 BLAKE2B 0b9a568fe4de1fb9afc5a547d75aa1d3556bf497c76e3d32d1ebd7658634ea02e4fafa3c6261b64d9b803fc6e78ae013fb8a366bcbd5024e8ab0aced83f58e33 SHA512 d585b39159f0887485b2e681609b51113de6bc7c43627c42d7e81eb06ac65c507b43cf3d81c5df4399b1e3abf454c8852264a84567940bc5ba0c358eb9c0c4a1
 DIST jdom-1.0.tar.gz 3571788 BLAKE2B f411941b333cb0876a2a88828a8938a346d1a008764638f58723634f24c48a843b71db1c8ddbbc62bc07bba825d5d3f24ae438668ce99389d10415ac5d1a64a8 SHA512 0bf1df21cdacdddb1df8bdfc2c4aa307bb6516a7614eb7382e99a60d03d9fcf77333e84f37ed653f264e7e9cdecb91fb9e2e11fcf76d70b3068bf238be4d0b24
 DIST jdom-1.1.3.tar.gz 4233403 BLAKE2B 9e4afacc6f10d2be1d793bd3b9f438f79e8e27f50bcae83eac5054df806c01c211ac493465bcda58ac204e796663ffb8aedf43a177f23c23a69af399243461a0 SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278
-EBUILD jdom-1.0-r2.ebuild 1638 BLAKE2B 89850180f48d0c2913b968385915b7c747d1d459c7bc9f2b94f36eaf5d984351dd8f0986fbfe4dce07f4226bad3238740da8af9ea0e4949353976a04c6568a0c SHA512 f615d7b6ae05c42433d37d0978e4c87291388291fd2f6324c498fe2b9c7e06f2b7fb5cbb81e22429d7e5b6759ff51da4039d33638c43702a16cd0ea5cf1aa80b
+EBUILD jdom-1.0-r2.ebuild 1628 BLAKE2B 88282bcbd4c511601d02e7dbce5869ac0b0c655b2b0d8cb8dafc678e6e547207c1c5bacfde859e3d90925826a31dfae4b607d1a225b132dab13ddbd7ff5640e4 SHA512 393d5322a1c203da376044292aeca716b2bf5cbdf85a8475167761daf4871d507f33cb7a55f41f60bbff2a61b3f95a0c9979148c338aab7221b5b21744e1a66a
 EBUILD jdom-1.0-r4.ebuild 1357 BLAKE2B d76c29cf354e1de0295da816d5cac8212a6e364f51c49f52f200ac053758e32f6de0369fb770840d03b9c514b79a1973edf96689a6180a96cbd8ba58bf5f6fc6 SHA512 e328bbd9127c23764479d64df4703e204558a5d167b2c100741edcfc5f81e433d0e80c2df3b959d42ad61388f78f2ccc8f393864522cf75d540cf2ba7b807a08
 EBUILD jdom-1.1.3.ebuild 1257 BLAKE2B 9d7d93ab036539abbe0d945e7b7f0767b0e7d0a3f39ec68f7bb20047ad5182bb283160e9fe3484d5cad853b17479947ae3e1edfb1113c76483b8c4da4d70fa84 SHA512 91cbb5345d46dcd100384da0f249749dc840aaddc90f4d525ae14dc22e2dcff06d8649713d343e81de1c5d9cb99c5559adcd23156a7be33e6be5ac428ab6be41
 EBUILD jdom-2.0.6-r4.ebuild 1358 BLAKE2B a55b3a295f11d855d15cd2ab4f91a0fc8805aa8881cf2f374d970c4b43ef829add955b283ba410202d370c0eb53777f87e943d54868d2ff0c0e327c6160cdf11 SHA512 32aaaca3059544b6aaae40545f3350799efd730cf790d5acb101886b3534f6b21d75df5bfc9e2addb0964cf5466a5f527a0ea127eeab2045b70ebbda9d488b01
diff --git a/dev-java/jdom/jdom-1.0-r2.ebuild b/dev-java/jdom/jdom-1.0-r2.ebuild
index 1f2e691c89e9..ad7f5a5d86ea 100644
--- a/dev-java/jdom/jdom-1.0-r2.ebuild
+++ b/dev-java/jdom/jdom-1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 JAVA_PKG_IUSE="doc examples source"
@@ -10,7 +10,7 @@ SRC_URI="http://www.jdom.org/dist/source/${P}.tar.gz"
 HOMEPAGE="http://www.jdom.org"
 LICENSE="JDOM"
 SLOT="${PV}"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86"
 COMMON_DEP="dev-java/saxpath
 		>=dev-java/xerces-2.7"
 RDEPEND=">=virtual/jre-1.4
diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest
index 09550a683a00..69bb1b8f4c3a 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 3548 BLAKE2B 6570c9771c817a4bb8927081b2815e81eb160096fddd542715ed6594062952502ce1e91b9740fb571647ce3ea68bc9575276211b9f993e3403232aa1af86dadf SHA512 cb21aefd34f42052dc666747ed7aa397d2e0c7f97683db135274838ec45f0887e15b69b18dd8b8da3ec91998d6642818c37566f374c185bb03f84fd8e482b4c7
+EBUILD jflex-1.6.1.ebuild 3536 BLAKE2B e05d525af00a7154238def050204aed0ab16991358714a4a7536be6a50adc89d651c6526c6e2563255ec1f8dcfb81b1431037fcbcbdd3831ce99367511938f41 SHA512 145ae0fe9106a6835070faf0a83bae46a8e46842ef2c8041e5f8bb9fbecd94051f8e252248434cefb2b82344a448e7b8886becb925673f072c85145ac43989a9
 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 a9b7189a0559..e5f745463c4c 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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 ~amd64-fbsd ~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/jgoodies-looks/Manifest b/dev-java/jgoodies-looks/Manifest
index 45e8d5d2d6cc..5bc1f8dfce0f 100644
--- a/dev-java/jgoodies-looks/Manifest
+++ b/dev-java/jgoodies-looks/Manifest
@@ -4,7 +4,7 @@ AUX jgoodies-looks-2.3.1-build.xml.patch 2443 BLAKE2B 233024a28d66d68efb71d55cec
 DIST jgoodies-looks-2_6_0.zip 2444893 BLAKE2B 97d00131cf07f609141c97e4fd3e6b3c93f67dc879eb0ad99469c602e7e30b0d78dc4bd59202db1a3a503dec6c92ea061a176ef11e6c5f4fc26a86c697cf961f SHA512 1c33413379f391109d1db35bdf301acf0cc6d66bf8aa1026280015946bddb230b4cc1d233b700d46a519fb02c169df4670c874058f5e636e1e924a9d3a42442a
 DIST looks-1_2_2.zip 1811849 BLAKE2B 47dd516b5523b655757c08ba108b58e7b1e2e113ae4d0e90649db88c4353b66810f9a7b3cc810fe7bdbd5e9c1ad2a32d4b504665d3ffa2917f7a46647f444d09 SHA512 d9c5f0590a44dbc7d778a9da135361f5753eca4d47bef3636f21aa0d014df86dbad90031b5289928b99c352147ea702948028b18b36eb3bc44aef800326fb302
 DIST looks-2_3_1.zip 2105839 BLAKE2B 590412d7ed00d68a3fd8f8e5402802ca69039f2619e542619de787c6e9b4b2019096e87b7809e3b1f5a7d72963da3657fae7e465a245ef1ab0a5630219a968ed SHA512 61278cc0b8556ce19cfb5bdaaab2b42d7035fcdf71d614a8d3673629d5b04c5698e2be521df3e0518e781f78c03a8d3f466f1fdfba525f679e9de7409faf1088
-EBUILD jgoodies-looks-1.2.2-r2.ebuild 961 BLAKE2B 88db05ad6f9b90a1aac295b430dc9715d3023bc085a00b85831900041bcd47691bf9d7b56f659bc2785b5af1f99701cab294eac1191aff95bfc4908477b80be5 SHA512 2987e72904bf7646c11679d18b7b8a0bd000d16dfea7b2f4b4f168cea5e574e8401bdb06691e846835c589c6bbfddb326b68b100a144f288fa4bd9b932ed601f
-EBUILD jgoodies-looks-2.3.1-r1.ebuild 1469 BLAKE2B 5496ffb7d4a4be84e8f0c645391e3bd53a166d0f26b5e73b3e99b33f302c9087d08d67c7067fbba8207eff69dfcb8430b226683ffcf9463e1d515ed87cd2d60d SHA512 f22960412d85f1b3d50785b01301d8e0c8fd7fa21014c7010dec81c1f8cb763597d80e840d72012973d83684c664c1ba18bdac714385b694daee5a13688dc78c
+EBUILD jgoodies-looks-1.2.2-r2.ebuild 951 BLAKE2B 4ae873faf78ee14aa149df23dc3e8f35afa17e15aa4d465ee6faab2b8f5082d321c3a319131e1b5a6d06e78a5f9e8d302136bf1bc0a9310848d8fefccd49c2be SHA512 9fa06f4d662fa9be1fbabe0660d0f30ef6f128c930aa7683a11c0b32e885034807a4ea75ad969922e4900e502f51f218adf8675ea8328bafcdcc39079965007e
+EBUILD jgoodies-looks-2.3.1-r1.ebuild 1459 BLAKE2B b95792fe921d627c9fb78fb1bdfdddab5a8bdc9346e5c799b1e651ca9969ae4c7bdf114486bc1630ccc83b80125f2140fdd5dee3d65619fbef979eb4840c8cab SHA512 2523a2f5755636626ce36eefbc7a28b56aa1c4ac6cda30d36c758b62a75510ec75d6737f9a6dcee4157b6730a34d2ddac93df2a0c321b1751bc4b2046d6a714a
 EBUILD jgoodies-looks-2.6.0.ebuild 779 BLAKE2B 4acc9508d50f8be4892f2d082bb8949a5df0be8a2f8002b3568163a161dacf9333d6ba97131c8346ed0eeff1be0cdd67e738c2703b7369cf625776313a42bf50 SHA512 c5999ca3a392652c2b3cb36e88dbc7081fa9ff0e2d24acc179bb0c983a414775eb3f67ca3adf66ef309d9dc275d2f6f25089c4705f59cdd9ca4522712771d788
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r2.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r2.ebuild
index f95a5a17998c..4dee649843f9 100644
--- a/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r2.ebuild
+++ b/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}-${MY_PV}.zip"
 
 LICENSE="BSD"
 SLOT="1.2"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild
index f73bb7366c22..93852c012269 100644
--- a/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild
+++ b/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
 
 LICENSE="BSD"
 SLOT="2.0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-java/jmi-interface/Manifest b/dev-java/jmi-interface/Manifest
index 94e4829bcf4e..1667f07459e7 100644
--- a/dev-java/jmi-interface/Manifest
+++ b/dev-java/jmi-interface/Manifest
@@ -1,6 +1,6 @@
 AUX jmi-interface-1.0-enum.patch 1334 BLAKE2B 2c45299a83abc3baafba3b0799a86f6a6806bd7b08e14505b81c4ebbf9e29dd3ba87f6aea5ad09a3f7e89df5b390195439de3c828b23915d3d18814943346a4f SHA512 462a3d987fbd2e5461db530c9b0af5d9af17a2b964050da3c7cedcd42159e9acb97262ff292293df9f964585d5652b48367ec13153ee3a2a14135633430a5a1c
 DIST jmi-1_0-fr-interfaces.zip 38946 BLAKE2B fb48e994000bc01b9972bd50d6e110322f251de2356202d33fd16c2f8333e76d9d6c185e064e1b435bc572864f244483680a1a2ff9f4ab1970ebaf50bf647613 SHA512 40a7b983ca8bbd5c35f4e2ef0acda7ecb09230c80a41fd17998a24ae57216b579e0e33bcbb2348d0091d1e75c1132be9bcb959a957519fe9d5d29f347bf1eca6
 DIST mof-1.0.xml.bz2 7076 BLAKE2B e86f8cf05a4922130d70a79c95f3cb369d54f40246f89bd04d1371a6401a923633f353268954674dc86ae28ed1da760a3ff90fbffdbe79f4331814e657f9bd94 SHA512 72dfee938fb3cb019928d3813743d5d535e1a5dbaa39915f5af84c39f9a701f8b043150e53f25b3745c5bbf25010144735834b121e3884bcaf044db6ff22e722
-EBUILD jmi-interface-1.0-r4.ebuild 1066 BLAKE2B 15374d9a629eed6f3cdee0ac1995914f230bc5cfe44174bef03c60029f62a76668480de29d319f1aedfea7f332f88bd1ab4c7799158ec4257965f44c095e8440 SHA512 ad36962baf004dec9d9e207ececac7b4810b4b495754f97d00ba40e2ce4d276778ee2a643c00472ea52839c3d88eb7f7e8f3b87a3e38194143e995a7082b0ceb
-EBUILD jmi-interface-1.0-r5.ebuild 1049 BLAKE2B fb2345d053305e4b3e1bd71c7d823dfdf1625bae2d8f5dd53c3bb490081b28df9f23999a51feaf290916e42e515039b678b0bf90b7254712971ec0a6581e27bd SHA512 f2829dff8811db5854a38fd174d33915fee7e79f6dbc580db847cc28deb4c1872f968fcc260c2ef9f67880c4fe87ac30de762e54f3bdf2ad91d76b07e79dd6a3
+EBUILD jmi-interface-1.0-r4.ebuild 1056 BLAKE2B 0deecf71cd4402749b9a080e9a5be76f8483b6defe0d669645fea973082f6479a0ec50d1234e683a36cf595df74154046198fc29da800d4d8633b5813f705ed2 SHA512 094835e191e82c661b3fcd063eb98d4788eab1b1ac92529cfe3ac91fe2181a10ddec29d9ef333db8848016a06b9f84daf442912d9596cd040c38f06139d3fb4d
+EBUILD jmi-interface-1.0-r5.ebuild 1039 BLAKE2B 95f32750aa18c23adc346c824f3d8b2dfca51515fbb46e8031e7ac64fd636cd10bb0d95332d13c74ce44c11c06f8fb33e2d6a504a1305dd7a249003c86ffcf66 SHA512 b4447dbded9f83ff51d3f59bceb2d5ede9e148a974413557cda49657c1d4f811c753a3f8c1ba2496b8f3f6258cf265358b5c233b14280b8d2ef68bb30a7e6e73
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jmi-interface/jmi-interface-1.0-r4.ebuild b/dev-java/jmi-interface/jmi-interface-1.0-r4.ebuild
index b533b75527f6..338e0ca2b25a 100644
--- a/dev-java/jmi-interface/jmi-interface-1.0-r4.ebuild
+++ b/dev-java/jmi-interface/jmi-interface-1.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ SRC_URI="mirror://gentoo/${JMI_ZIP}
 
 LICENSE="sun-bcla-jmi"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=virtual/jre-1.6"
diff --git a/dev-java/jmi-interface/jmi-interface-1.0-r5.ebuild b/dev-java/jmi-interface/jmi-interface-1.0-r5.ebuild
index 5623e41a4f13..2f8d24bf984a 100644
--- a/dev-java/jmi-interface/jmi-interface-1.0-r5.ebuild
+++ b/dev-java/jmi-interface/jmi-interface-1.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="mirror://gentoo/${JMI_ZIP}
 
 LICENSE="sun-bcla-jmi"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/jmock/Manifest b/dev-java/jmock/Manifest
index f384a0630480..fdd789c787c0 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 998 BLAKE2B a904ce0546b51eb6d804ae58857596269691ae0b6b394c1b027e19b417de61f2bcbba4f1cf8de429aa587ac999142b2df4b5bb59be0ae40236c1590fd9757bf0 SHA512 7539d04bf327d02eefee2880f17b66bfb7374ab98a4bd632cdf14ca83893fc8868dce06bdfec573e432108d64bfd9cb07f0a6e4b1cc0f9608c37d3069208ce19
+EBUILD jmock-1.2.0-r1.ebuild 986 BLAKE2B a93c5e07830ed1dc6f2b92da16a796452ebfb74411555ea11e15d1ea0d7d8e5e1277184811723f2a44d97085bd879ffdc2a1a08fff1eb30be19a81693e3b1060 SHA512 336584062f37ef805f0320ec17562f9547900c11a0f24d7d450401acb544f1f1954c035e4d1ba5156cf8739d473d880ed5ff61816504258b4d9d4d468edfa675
 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 a3b3508b11b3..30bbbb34de42 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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-fbsd ~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/jrexx/Manifest b/dev-java/jrexx/Manifest
index 22aec6b4ff63..eb305da15087 100644
--- a/dev-java/jrexx/Manifest
+++ b/dev-java/jrexx/Manifest
@@ -1,3 +1,3 @@
 DIST jrexx-1.1.1.zip 62878 BLAKE2B bb72a406bace2accb5fa1c31609222e0390debfaf598b5f5afa260a1620d74c259a03ab9000f7a8c62634e73979eb1058b1c3627bc9292ae0008e90fb30299aa SHA512 dc3e84e9c6313d8fc4c8fb57bc2713976d07284eae5d36ca4411d0e28eaae36351bbf7a6a16d9db365105e592d2e0cbccf7c3662f8d24114662422f02f0707d1
-EBUILD jrexx-1.1.1-r2.ebuild 612 BLAKE2B 6358e0bd19d679e1aa38ee269c9305cf4247f0a5770e6bcf63442bb99d2a00d2c02dd34d22c60cbf5f0b33887aa9f6976aab2d3511118780baf1dbf91769edf8 SHA512 a5af80066ad5e6f843266fea08e85cbb17aa40bb5e58abc6477a1bc8167517f96f7a85830928cbee26d7b00ab7e13709f921b3f581bb1f8940fb26e6abd31dd1
+EBUILD jrexx-1.1.1-r2.ebuild 600 BLAKE2B ce8ea06f136b3a2ef202b1713edb69080b49ab6ac13d15f98101e2fe6620dd99e211bcce2f38c36a03c676a3b4d6f5cb1b6a13b7ce979199883c22ec155869d5 SHA512 15528b20f1b6c277c58b2ee1c5c6d4e2355848db2944c5a1c0f36f33cb17cd1c4ac1f1483b253891cbba566fd9dd2234defd21af9b85b23161912476ac6f8c2e
 MISC metadata.xml 311 BLAKE2B 19fe5e29d58ba19931ae5ec5d90028f4b2a3dbdbc326bc98267791df5537fd265fb5e25aa46fd5bd32d224628a4e36aebcb59665c502438490dd1936c1346fe0 SHA512 5758f1cc5327cddfa8f035d816fbb86dbc77f0032c8e23e216b203696c5c94f3c9dc7e46e3c1a003f5027a9f3af4eef8862710b55499b56cc4041e28265867c0
diff --git a/dev-java/jrexx/jrexx-1.1.1-r2.ebuild b/dev-java/jrexx/jrexx-1.1.1-r2.ebuild
index 67ff2e86899d..ebff30ecbbe7 100644
--- a/dev-java/jrexx/jrexx-1.1.1-r2.ebuild
+++ b/dev-java/jrexx/jrexx-1.1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.karneim.com/jrexx/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip -> ${P}.zip"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="
 	>=virtual/jre-1.6"
diff --git a/dev-java/jsch/Manifest b/dev-java/jsch/Manifest
index 243ae3c1c9e3..4bacac52ea5b 100644
--- a/dev-java/jsch/Manifest
+++ b/dev-java/jsch/Manifest
@@ -1,5 +1,5 @@
 DIST jsch-0.1.52.zip 363648 BLAKE2B 37f5105920868957409c6eed8fb7b1517c0816ee6c1da25b0ad5f1cb0b1e6c71954e30e255b8aa94989495e11767ee11c5ce8bfd9721da12d6823832dd57bb16 SHA512 a5a998b6139638eee403e120f5f217112a5c09e81db8e1b1240d53ca311df4540b56aaa5f67f7a5c40cbc8420535d72d456e4fbfc95fe86d46376a00295bec4d
 DIST jsch-0.1.54.zip 365455 BLAKE2B 5cd6fa012e5a511bad8f23a233559e6ad6d600f39ea7b519e66e118b1fdb997491b7ac8cff5bc1491c28f7ee99f0f4a3b4727f5d8ec02030576f34949d74e203 SHA512 2ed29f07495fbc28d6eb7b4fe414e8a9a96b911b2feea5b1513cc48a9439adba12341bceb23a3ea9ab307e32d48bfd4356c7bc877c56e77f6f55d69214db3a9e
-EBUILD jsch-0.1.52.ebuild 1206 BLAKE2B b43a39432f05c743ff18b96ad46932f149a3d24e0f9f48f4ba298389d8b9103e3d87f5bd4cc38b8940218599514ac752b0adc396fc81f0108b4e33e553aa7f74 SHA512 e062f81eaf660728166f826b698efb5e44d7789050e25712f7b4d5d566d57dafe4d551260c1b803811f68e3d8c2c01350597829af0ffb92599ec4f0a49b6748b
-EBUILD jsch-0.1.54.ebuild 1179 BLAKE2B dcd757ee4a69e905b9f8c518ee946c419f24800c4ad6c61ba72cb0979daec5899e1210ece1e09373305f87f2d7b14eb48cb7c1c84c1048838375a67d9828597a SHA512 3b50a8984cb255386a495a2b5a8d0c0faed09daf28027e36f452d57a096a5ac85b57ee0158037389e9ef3682ac23190026f12fafe4dd23649bcccdcecd7ae973
+EBUILD jsch-0.1.52.ebuild 1196 BLAKE2B 5460a7e13f495d3ad958bf083d5131b4ef8838d981f777cf44594f6f6fd64454057a40655f70f04165e25e5eff3b5f9305b5177d6f81b432d4487e6082aa3ef1 SHA512 99af14f4aa3c09acf739297173fc89baede7facdbbd7223a3bc98835cb48246a2eae8803a99c7008973e7e1a761f071f6fda60977b2bde9352800321245e50b5
+EBUILD jsch-0.1.54.ebuild 1169 BLAKE2B a09d7b8eba17059fdf49b15ff459bfe4b35c0da97898e9afd8a1083be958afb3e2e7bc3c8dd10e761de56df87bc9ffb5fc9067e1e3edd5ae8fed059a0e433f1b SHA512 92f6a520c797230e0671d7f590a0794151b954a2ce97eb5cf0fdb6ae226db37846f57ebd01626e4d19923326dd2b4f8728a395032ee38cd542d7ce5106651380
 MISC metadata.xml 310 BLAKE2B 6b76bef1eadb48caec1f3314829856f655be55da55fddeec91c3d3fd14f3eecf65dd2508de12a01fc75e2089e8ce1107481bbdb6f3c92eeac74fe85e5ba02aee SHA512 5051c200e3f618fda4991704418d902b513cf94b96917a1c23c1e552e1443cf9ccbf8a0a2ceddc8db46d7104284b43689be62dee0353d50b207c7c6ad3336262
diff --git a/dev-java/jsch/jsch-0.1.52.ebuild b/dev-java/jsch/jsch-0.1.52.ebuild
index 6646a58dff68..037e4ae36e32 100644
--- a/dev-java/jsch/jsch-0.1.52.ebuild
+++ b/dev-java/jsch/jsch-0.1.52.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.jcraft.com/jsch/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="zlib"
 
 CDEPEND=""
diff --git a/dev-java/jsch/jsch-0.1.54.ebuild b/dev-java/jsch/jsch-0.1.54.ebuild
index 08cae6103282..fa5203966a6e 100644
--- a/dev-java/jsch/jsch-0.1.54.ebuild
+++ b/dev-java/jsch/jsch-0.1.54.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.jcraft.com/jsch/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="zlib"
 
 CDEPEND="
diff --git a/dev-java/jsr101/Manifest b/dev-java/jsr101/Manifest
index a84a12e6ef9f..5e4fb4767fa2 100644
--- a/dev-java/jsr101/Manifest
+++ b/dev-java/jsr101/Manifest
@@ -1,3 +1,3 @@
 DIST jsr101-1.4.tar.bz2 18614 BLAKE2B c181e07db54cdf13ec15c18b8340b4f4bd9befee62aace934fd2ffcc12de386d4749e63d16dd654a7c369795c12f7c71bf4628a7878540f8c486302f65699b6e SHA512 a29cca7e0ed1eb8aff4b70da6d804cb1cd61cdd9a800f420be6794aa927bca6a4146a95d71c8521d4dc16a0da56419f3e82079d942194380dbddb9d44d773317
-EBUILD jsr101-1.4-r3.ebuild 688 BLAKE2B 2469e7121c44db69648a63b954caed577559c5a66f1b1baccf63862881300dd71ec7e0e89c1d2dd4983a8750fdeed58521754014f11042dcc744b487224f8861 SHA512 d96ef98dceb82d7e02d1ef6af4e1b3ad7769fa2c70e7ed05d3c108c6c86872c75133c34749b4e82de83a0017f891767b75263646388bcb7e15ab49873bfb109a
+EBUILD jsr101-1.4-r3.ebuild 678 BLAKE2B bbec42fb8ce1861effdb9905b7489cd6ac997a45b249c2b80fb74b4894de96375bca91dee00a7357f88817b9589c75313f043fe93ce30f24aa1ea45b0f3c63e3 SHA512 52c3f28f0ef4b71bcba93e18519e59a52d1aba08a3dc38036f1daae557b0bf3f3fb61d60fb38c78c6a514bb3101755c611d2911c05d7b22cd94874dd8c0e1af8
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/jsr101/jsr101-1.4-r3.ebuild b/dev-java/jsr101/jsr101-1.4-r3.ebuild
index 03d5eead63b1..c6482614c9f4 100644
--- a/dev-java/jsr101/jsr101-1.4-r3.ebuild
+++ b/dev-java/jsr101/jsr101-1.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/jsr173/Manifest b/dev-java/jsr173/Manifest
index 22dcc8a070a0..1c45135dc1ca 100644
--- a/dev-java/jsr173/Manifest
+++ b/dev-java/jsr173/Manifest
@@ -1,3 +1,3 @@
 DIST jsr173.jar 639734 BLAKE2B f34caff27d216303d14050c78c3a4413685e843b9a5aacb228c38c57c50a009b691bff889ebc970097f998ba93b3a0737256c3b8a19f9df3529d238b43f71538 SHA512 8b299532716682772e5eeafb63a5dd125dec8954a9a284f6766bac05409fff611724ae1a9b6f4f6f303b64c12b19e394371a6b0a87132b36e88f94e20b69efe4
-EBUILD jsr173-1.0-r4.ebuild 907 BLAKE2B 043ad59ed99de1a7cf0bfef1a3b6263df8640a12bbf6f0dc7ebe7ba1f00d7756b558c2c70810904dc74b84a2fa28f0e0330ff9cdf7031c8d1c5e92354627fbd6 SHA512 a527e176b25c95723219bb216c61cf1b3c0fad1abeae0505bf447035b7f4c5630cd588c7abf75597dd6f77ef67934e0adfeda95b7c9583a8a162e1117fdf6ded
+EBUILD jsr173-1.0-r4.ebuild 897 BLAKE2B 2310785a3d07ae50fba866c48e479ca8ba6b233150d1fbe92d1608e931b28f231f441f45a5a9e10333a09563c9204af7d09f873a09fa06cb3acbbbe03d546802 SHA512 87c2fe1796027e64fee8868625fa85762f6a8f1480bfd19282fda9c9ec0ab0f500a4057663b50f3dedb88821d7a9840917e891b6b04003a32b0e81b730e50769
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jsr173/jsr173-1.0-r4.ebuild b/dev-java/jsr173/jsr173-1.0-r4.ebuild
index a91879b24634..332838833908 100644
--- a/dev-java/jsr173/jsr173-1.0-r4.ebuild
+++ b/dev-java/jsr173/jsr173-1.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://ftpna2.bea.com/pub/downloads/${PN}.jar"
 
 LICENSE="bea.ri.jsr173"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	${CDEPEND}
diff --git a/dev-java/jta/Manifest b/dev-java/jta/Manifest
index c75f694f2cb5..03d4a5223e60 100644
--- a/dev-java/jta/Manifest
+++ b/dev-java/jta/Manifest
@@ -1,3 +1,3 @@
 DIST jta-1_1-classes.zip 13236 BLAKE2B f2e1ffd531fce804d562c4cdcbe9b260d08eb2bcd79a879f94fbd3e23801849cbf311d8f7410a9776f9a8866027dcedcac479a64444321e8c6b2b23bd9a69054 SHA512 fb8b76223ccdec0ef97b00d7248d74b6316dd67c570667f3a644d03b05cd28af061a191cf71b6624fd4a4195f7bc107281eb847fc4c0ee4606c85c414da79a14
-EBUILD jta-1.1.ebuild 1048 BLAKE2B 9af8bca10e1c2f99391f4f8fd491cb155d6b6955d7dfe85877d07260139a0defea46ff2cfe2c24a99807179847c5838dcc178a5d6cd0fdf15b8a2671bc2197f7 SHA512 f8d6bc92cddfcb63d5d0f67958d616bd0a3247c4ea08faa90277039bc2bab07eb7f9a5fc2f00d4cd7a26d4073925d42cbc039423ccd86891624732b69c09e6db
+EBUILD jta-1.1.ebuild 1038 BLAKE2B c7033edd634f33b8c3e578445b36c49b337cd49391ac20059fd041c3d95032904c9cb3e85bab1d8b57eec2519ca5ddbf4855e7e6c0fd407d6f28c9ba06d38cd4 SHA512 d23725de3801d5ec78b328a0162c3ab828745debcfdbbfb853d442386e991be5dbc207b15f6d4ab8f958ae9610d2ab6b195eca090482d67380f3b00c7dfb2beb
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jta/jta-1.1.ebuild b/dev-java/jta/jta-1.1.ebuild
index 44221ddef4d8..6293b663d002 100644
--- a/dev-java/jta/jta-1.1.ebuild
+++ b/dev-java/jta/jta-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.oracle.com/technetwork/java/javaee/jta/index.html"
 SRC_URI="${JTA_ZIP}"
 LICENSE="sun-bcla-jta"
 SLOT=0
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 DEPEND=" >=virtual/jdk-1.5"
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index a1c6ea175892..9818f1ee6cb1 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,7 +1,7 @@
 AUX junit-3.8.2-build.xml 3179 BLAKE2B df7dd61b577d415f807d234fe41255bda57235465ec6a96dc793f3c4852278978f4c2be6df89f4910b96b450a280bb0e9bcaf50463430f4769c116bca4ea868c SHA512 6d2c74c70569feed235db70fdb646c813ce9453b5e7fae6d5fe8c818d0ce820fc155eef8426d8f3263cff45cd4b78542d5524aa1d5efbb84e43698c1d4466f55
 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-r1.ebuild 1017 BLAKE2B 564b6c03312d6df9ad3f427c5e965209ab5e61da3e4ab5706f520c974a26aaa908b567d680779e7ce307034c3bbd94626359fdb0b26cd5511222b6002e9c6bb0 SHA512 bdf20d5bb244732f1b63b93644dc21dd2544187e020c20af5307386bfd459b232be993adaa4ac0c9be68aac97eb4c794c78e285c9d3535002dc4af1268d456a0
-EBUILD junit-3.8.2-r2.ebuild 853 BLAKE2B 40aff3982173e01be5c0e30a4c3e775f05c3fd4d34bff94bd7f1e0117982aa62eb23bf509c730db8d891e17031938ee858a7d0cd07e5b4433d3baf3309b80ae1 SHA512 8e738e576bf5b9cd56571f605e6de9994cbeb825b6033caae676e2e7093fc54cc25fc6225a1fda3e6438a13f6f844736058c68b57b1bb6427d3291b052973f26
-EBUILD junit-4.12-r1.ebuild 1486 BLAKE2B 76c872b5996cfc22566b8cfd4dd4e0ae064fd56677fb017fbbb75fdd40d7fec0698f73e7441a8437ce6928f7805a33ec3d2e5cf863e69ec77fc6c081f170f5b3 SHA512 0ce9332b550ebe45b7f09905c776bd9ca8f0a2d3cbdc0f608cced2858a82e452d8f11f3b83fd8c1061aa49a5a639a888d28e2aad4215661afff221d9f01bd9cc
+EBUILD junit-3.8.2-r1.ebuild 995 BLAKE2B 05c1f4e0567b0538ab3e14447a2520657027320930429c3d55ac8b88bb9bae7d3722e3844c675fcce691c57e824687a9d2dff153f743a970c90fe3e56915c8a3 SHA512 3da659253149235e0d8a47217e597d26a39740b11f23e85b5db62ab3759221498f0e1da7a81f89974c79fb38ad05b8fdb8f3d61da29082b210b5c830e8351bde
+EBUILD junit-3.8.2-r2.ebuild 831 BLAKE2B e07f45d637d4aaee89c2ff51f168fd610cc6bb655b2da6efcaa3bdc8392b4a89c860c682a50fd1e4d3bcbea693d61142c7b8c95497f6f1cfe81d7cf2bf9f00d1 SHA512 2db4e78da194aaab043bca14d6679f5ad6b33b88fc01a55ad828bc9c43e47b3de1ba7a3c6e6bd8c867faceaf30cc45debdd9a9fab86c7a0d2b7153cb986b4c06
+EBUILD junit-4.12-r1.ebuild 1464 BLAKE2B c5c998dca82ed919aef941435b371d5f5788afbbe952b22f976740d53a37d8daeb6851e5c74c2d2ac6d9c066cb75f777372f272c5af4095e59f0adb80b980316 SHA512 a2f0b67b093f7bc86ac7a671bd66b69e67d561140ceffbf21e5ac5a3ebe935cb2bc3907b5f3bfae2248f6f6b2561d02e4afd327877adc8f761b393687306ee29
 MISC metadata.xml 367 BLAKE2B 7cd798ae028c83275e61522be10a35abba419a823042be242ee7fdf7e0ccfc978e817affaaf154b8d0723f502499f17bb81b0622fa493dc812b82ad23dfa647b SHA512 44e492dfaaa9faf54f4aaf420d5816da8d117951d6a52e37c76a9e533fcefbeaa3c44bafa4d525f878deb3af2b7f426e72a62b16464e85ce9690c61b1f0da71f
diff --git a/dev-java/junit/junit-3.8.2-r1.ebuild b/dev-java/junit/junit-3.8.2-r1.ebuild
index 3a9ff4344dd8..3cd635a948a8 100644
--- a/dev-java/junit/junit-3.8.2-r1.ebuild
+++ b/dev-java/junit/junit-3.8.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 JAVA_PKG_IUSE="doc source"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 HOMEPAGE="http://www.junit.org/"
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=virtual/jdk-1.4
 	app-arch/unzip"
diff --git a/dev-java/junit/junit-3.8.2-r2.ebuild b/dev-java/junit/junit-3.8.2-r2.ebuild
index 29a5fb5888e6..362aa0129f62 100644
--- a/dev-java/junit/junit-3.8.2-r2.ebuild
+++ b/dev-java/junit/junit-3.8.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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-fbsd ~x86-fbsd ~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 c022aac54dbd..f3190da6c338 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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-fbsd ~x86-fbsd ~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 a5d4d51fe833..b3d04acd9992 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 1055 BLAKE2B f618b31ad8afb657ae21ec8ac9f375bfa34bfccfd69de85580a12f4ad20fbb619e555d9cdea30db62ea638e90ac2070983257684353ab174cd1997641d7df649 SHA512 9633ad3e64884114db7ae1a54a72ce5b0fc8bd891e8cca017fab59c68a09291a923382bfd338d5b5f1995fc0a173f098dfdeee5ce827b2e2f62e62c97ac5d5f8
+EBUILD junitperf-1.9.1-r2.ebuild 1033 BLAKE2B f0f6b4d75506748c872f6565f49dd8ffba6d95b2c9ed4de16f3c774ff521d68b3ff8bba79ab53bbf4b9eebc949350a9a9342530663857dd3de72bb0bd8aa3a78 SHA512 7cc0448e771002305887038f09a952369a3fc93688911dbcf39bab595bf0190b11d4166367602fb578b6f41db32b4f70ff7ca03bb9f6674f7d087ef67290cb4c
 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 758e8b528c1d..147b97e61da2 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE=""
 
diff --git a/dev-java/jzlib/Manifest b/dev-java/jzlib/Manifest
index f624ad3abb72..48504abe01aa 100644
--- a/dev-java/jzlib/Manifest
+++ b/dev-java/jzlib/Manifest
@@ -1,7 +1,7 @@
 DIST jzlib-1.0.7.tar.gz 50303 BLAKE2B d38a1560fcbfbda479b797727d8e0ff0e6197ad13f78018d451346ae2f7a201bbffbf87a6ed727776dac2e9eb890aa0ea81486e0c78e11ddcb893c8654711618 SHA512 8cbc492857d432f79da08a9f6dcebc401e25bd888adada8d94caee15d67d0b89b4f66876a5b2275170157977527e1505386dd5a1575dbe658de233d4389941ea
 DIST jzlib-1.1.1.zip 105191 BLAKE2B ba2d53d2d2fb12de6ce6016b393a9147e0a0ffbed576940f629fae50bb60329d076d42a912897925517a2f6a75dca1fba4fc4836046152c45aafadd9e0983e8e SHA512 de76c008e640f17788c69ed2aae72cddbd0a72d039ce61169ca7af640571952080c48ec588b0fdb497a795d3f7644170ec541bdbe834b6b638e6260ffb57dc07
 DIST jzlib-1.1.3.zip 176747 BLAKE2B fb868a254e6beea192de9965bdb8c13313099efd68c0f11b6196c0b70d10bd189b6c82ef75c73376ec391b99e2c029b117cb51cee4bc9d6f888b400fe737c620 SHA512 844a157053a8d6c9b722e9c27e0f1520f3061d7e323f0e50d276c301477128f46dc7b1250c2ca337225690bc641b6f663ee76be8831b6e0c288438e64aa935b0
-EBUILD jzlib-1.0.7-r2.ebuild 772 BLAKE2B e31fbfa905bf6a94aa824019440826c7b08ecc61bc31f5bcb84776ec9f797aee8b9f9f9619ccef1f452b406063d11339fe0d67a7c568b3571889f58b6992fce3 SHA512 b22a8ea4cd20f4eed7e35c63db64f99af105ce84b854f0bffce9eeaa3ed9f7a02771b9e5159b0aaa4ad7617f278926b4002b421f36ddf1fe3533ecb86a9c484b
-EBUILD jzlib-1.1.1.ebuild 1370 BLAKE2B f9f2d269a4e9a6d36d5683b721b80926ea1d940b2c6a69753bfe9f8ccdbee1db20aafab301f447a0aeffe7a49eee0da9a6e0f4cf12cac2fc75577a3c949c0120 SHA512 46e2e1e47f51f44765ac061d1d07495c85441b12b7f634d984fbbc53947fbe99b4ec0893eaa1c69018ebacf70a13b4b1c22301d7a7260aebc3fa5cbbcc148a8b
-EBUILD jzlib-1.1.3.ebuild 1323 BLAKE2B 84cc1efa0c7de75919b993d3df1fd5faa1dcca6573dd5d20c9b0c778b2efe37f9f2bd23841299aa4187acee4a20c46741ed4a9ae0a958e65b14586fceb5ce067 SHA512 e9c88d5d91caa7cbea56cef689b2d276837c0ddf7e4cac638cf468fbede03ad72c2ce6ee4d640eb8fce20fa907f4bfaf7fec25dfbeabb13232de677e70aaa86a
+EBUILD jzlib-1.0.7-r2.ebuild 762 BLAKE2B c4d8ab0af10c8b0cb09940d823a5df522d2f7afa374e21e94b10dbb985c9754df2fe69b345d709526de2644dc8dcf29dd5c225d2337cf5822993980263c8a784 SHA512 5364cd2fa32bd41178fee876f16be79c454587f6a4bdecce72daa1daf9cbd239d4c0013d36623d9101984cc823551fc4935506ae45c6e134d56996b88e521162
+EBUILD jzlib-1.1.1.ebuild 1360 BLAKE2B 0b6f492e0f41327af685fd4f9458c88df8d1cc47618e33aa8e95307921915d038dd8f93a2ef464eea0851dffdd207ecf6c0cccaf86c7c698557a8c6324f48733 SHA512 0bbb2582a9da8526fdb56698cfca29f988ade0eeeee46d441e06accc2f6a29c532bc9af150f7773a35ff8d956e22c5f7644bbb3250d3d79522de69d2f0451bd5
+EBUILD jzlib-1.1.3.ebuild 1313 BLAKE2B 633f77c17e22f391f2be1e3c59f8e95cad551103b51771f039d71db4baa075454e41df5d943d5e49913f42aeb64f7b9b7a7e81e99c51bedd19031cb72026365a SHA512 3ee03ac380a1abf20dbcc2d0c539f04441c4b1003b299cb127b0ee3916f156f6a3c2fa85a8f71bdcdd69257f3a8adddc373baecfcf52f207bf6348507cba1b68
 MISC metadata.xml 321 BLAKE2B 446bb7ac28e63630afcf6bc8583857b6ec3206b0db5fce1ba0c5564fbe6e662f1df4a711e794960dfa00c31b7d1a28779c0bbc48072e2133326cd1d1fbfce1b2 SHA512 0602c7d4ec61795409acf409461bb44105b58d340a3740ace885d3dba9bee4ff146ee1a1ad6a8dd995d51ea406962fe6e5654b1a55a94c05c14cea3482a6ab8e
diff --git a/dev-java/jzlib/jzlib-1.0.7-r2.ebuild b/dev-java/jzlib/jzlib-1.0.7-r2.ebuild
index bcbd7be61bed..cafaafe1b74a 100644
--- a/dev-java/jzlib/jzlib-1.0.7-r2.ebuild
+++ b/dev-java/jzlib/jzlib-1.0.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://www.jcraft.com/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-java/jzlib/jzlib-1.1.1.ebuild b/dev-java/jzlib/jzlib-1.1.1.ebuild
index 344542899aa8..f07ebfacbbda 100644
--- a/dev-java/jzlib/jzlib-1.1.1.ebuild
+++ b/dev-java/jzlib/jzlib-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="http://www.jcraft.com/${PN}/${P}.zip"
 
 LICENSE="BSD"
 SLOT="1.1"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-java/jzlib/jzlib-1.1.3.ebuild b/dev-java/jzlib/jzlib-1.1.3.ebuild
index 3fcc2b5767d5..0f0ba0e65841 100644
--- a/dev-java/jzlib/jzlib-1.1.3.ebuild
+++ b/dev-java/jzlib/jzlib-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ymnk/${PN}/archive/${PV}.zip -> ${P}.zip"
 
 LICENSE="BSD"
 SLOT="1.1.3"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=virtual/jre-1.5"
diff --git a/dev-java/libmatthew-java/Manifest b/dev-java/libmatthew-java/Manifest
index 1be48598bb4c..cd378ae4d835 100644
--- a/dev-java/libmatthew-java/Manifest
+++ b/dev-java/libmatthew-java/Manifest
@@ -1,4 +1,4 @@
 AUX libmatthew-java-0.7.2-makefile-fixes.patch 2545 BLAKE2B 9662d03e04b55a3041807661b9503644b0595e3cf0ae4479eef9818dbd9edbfa5d7c4a9886e51c1adfc194dec5c06746ac18c559bd4d6768a49c3a8bfef802c9 SHA512 698883f9f0a6485c7d751c70441d0791ddeb78260eceeefff1661983d04d81960c652f9dd64522cd3431981549689b8c9d3051674da5b0871124c912b4d9e3f3
 DIST libmatthew-java-0.7.2.tar.gz 40601 BLAKE2B 92686eb0136ab72c7a7a9bb93a142099f9fa8207a0abe8052a824f46601aa88412bc132be424886b6dc6f7d1b48f5b84f800132031b42ae1c17d5a63c8589393 SHA512 d4a0024fb17221dff4d787b83fd5d9b4a189db0b3110291066f037dc33c009d479a3b94ec8d7c00ab5a39731ec8015dba212f367a858f4329e9d203325fec02a
-EBUILD libmatthew-java-0.7.2-r1.ebuild 1294 BLAKE2B f9bb6ebcabea5e22977856c194c186aa9c980027960ddd44eb67f87b3fe66ceaf5400b629ba6e9f0c2f0cd0192b3955eccf9294d29199c11e6a494c5452f6b48 SHA512 5c5839b643078d4da6b8a68111d9b813d888f825e16a38205f8adddc3f682904b3b7b1ac3c1b4e7530418eaa7339af109df4e0f1faa2ce04f44de84adc2567ed
+EBUILD libmatthew-java-0.7.2-r1.ebuild 1284 BLAKE2B ca74e281eebc9b44740f546fb4e5acfb92c4fc34922fa4def97f9cebc1096995dec17949595dcc8c392a4c1dad3f8256654bba51c729ac879d3a73f9985befc6 SHA512 0f9313b7ad3709827540ebc42d4c97348339ce4523146f4c20348fd8f0dde06003b7cb016fd0bedcfb5d4eb81a800838714b51236e3affb7ebb4bf18f6812c5c
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild b/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild
index b18fec24f39c..e9f2774748c7 100644
--- a/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild
+++ b/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 JAVA_PKG_IUSE="doc source"
@@ -10,7 +10,7 @@ SRC_URI="http://www.matthew.ath.cx/projects/java/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/libreadline-java/Manifest b/dev-java/libreadline-java/Manifest
index 761efe40fed9..a9642f07f8ed 100644
--- a/dev-java/libreadline-java/Manifest
+++ b/dev-java/libreadline-java/Manifest
@@ -2,5 +2,5 @@ AUX libreadline-java-0.8.0-gmake.patch 532 BLAKE2B 2bdc0e198b5daf274ec2bce5cef04
 AUX libreadline-java-0.8.0-respect-flags.patch 651 BLAKE2B e8c4fe1901fb87b5f8b7fa9faa21e5446385e029aa034a482b883df174c0889c65ca09d7f34a7728d7dc2d8fc90ea3373f8dcb16f740befe5b9183481ed32844 SHA512 b3419484c6732d3396ae90fba0c77bec656bb705d63c8ec2bd999222c8e687d6fbecebfa10bcb91c8780e6ffa922e2d58318978073f382c4b7601cd569ec7abd
 AUX termcap-to-ncurses.patch 498 BLAKE2B 693eddef846b0b4e3f570d0cac46164b0990deeacdea55ad0ef547c3c7eabf7a682d2ac9c3360366d478a00c68703092f0641cdce1cc9ab6e6f464be4c2f8d02 SHA512 43b6494d94da3d8874da34caf3e191e489bdea3e680d76514f3acf7d1c55db784efd8220e9aa914831c8dc753c231a06d5c3980bdd28835a3369f4c1d862a932
 DIST libreadline-java-0.8.0-src.tar.gz 77122 BLAKE2B cd25c3aea6189d0d48a10c26ad2f359e7f22533fd4a22d22b8491fd19c2d12c0fda6c8f1b8908bd66be8094efb374a51c6877eb89835360c4a2be8d9107d1336 SHA512 16bbb01a4852244387d63d8d5a7203e2862f235d8a68b436f33b586c7a6ea5297d1fabfa910c54bc33cfdc43b5dfe80e9eb4828b80196a974410c90387c3d1f2
-EBUILD libreadline-java-0.8.0-r3.ebuild 1292 BLAKE2B f5b177da758d8d77611f2cea4f20ef61c9647e411904c7f85f8864f7a96d79fad3e3aba10283330fde96b5edeeb97a7a04087dd1c4e9ce2d809557322bb15aa5 SHA512 8f81e7992ed426ffdfe6e3d800aca91705264904d4c43cdaf9939efc4fdf3dc6e15b122e5b219466278287e177274b37f41e55976933d667c856372ec68894c6
+EBUILD libreadline-java-0.8.0-r3.ebuild 1282 BLAKE2B ab39d4e9fa4d863a94355a886baca4a94804c52b95483dade22d644daf3fd0137ee5821d93d6089f55458ab40313fa7bb55a5c02aa7635f429616cd5341c828d SHA512 cc71cfc74461c13c190ef135d6a53a3f2704888b77ddb8a9401cdec69dc92fcac9fbe850c8eb079198edb9aec225f492118cc83bb3205be0105ecad313ed6221
 MISC metadata.xml 319 BLAKE2B e82b45bce13253c5e40fffb3429166c0613d8841af08a626d6a9d70bfe5f69c036e8fdc4248cfe632ab8ccc54b6901df0ba02ce2faf0ad18b649ef87f92d9bed SHA512 e13714611711ecb54943d5d3ccc5a8ae8f9dcfb6e9a6e6c6e96d04d7d80dec6a07d76225850cb2cdbb6b2d6a99f0c5c5fd0c9c4a9a3c0724c6e8ed7b21a75e8f
diff --git a/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild b/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild
index edf28fb9076e..3fd6a4df55eb 100644
--- a/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild
+++ b/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/java-readline/${P}-src.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="elibc_FreeBSD"
 
 COMMON_DEP="sys-libs/ncurses"
diff --git a/dev-java/lucene-analyzers/Manifest b/dev-java/lucene-analyzers/Manifest
index f53c2e756f44..3bb88cc888b0 100644
--- a/dev-java/lucene-analyzers/Manifest
+++ b/dev-java/lucene-analyzers/Manifest
@@ -1,6 +1,6 @@
 AUX manifest 489 BLAKE2B 8c9c0ab03955824613f736d81c7fbefe9fb4198a59f56bbd042672c6473886b54e8d229d4f94e2b938ad7db058b981cd9207c1e51666fba15531f7642efdf924 SHA512 959662da8f99cf3cb87bb81f6ca4df39eb7e76bfbb9d60eebc1bbf204dfb1beff48448d8ee5d3d2f8ecf8bf3eb01690a9a50b046850277609f3df77303b77c88
 DIST lucene-1.9.1-src.tar.gz 6135056 BLAKE2B 1777d5ff2e9bfda7dd0ce35f973a15c74136829ed42a8b7bcea4902b8d868cc8a6388357f6abf3406b66c4228f20d705bbf2c85e18bd67a1fcdb90df1a160811 SHA512 fb9f29e0d38d6525d7f6f86d339867a08bfe77ba18a023885a3ecb093d217840c274c767b6e1451f7c58135919c6159122756ebde4640a47420526502395a994
 DIST lucene-2.3.2-src.tar.gz 4602041 BLAKE2B baf4c6685ec88d483aa33df8970305c2b34fbe99d328349f33704e24e0ba5b6bd381da272a8aed84bcc7c2bdd25b38aa85f5585de1819a3f235d41040f1472a5 SHA512 42bf988b2eed45ea8d8a3523d9fcf4e384e0e9729a25a54e518a34faf960370a8f7d824f537df7155dc2b64ac11e1b30a8e1ea745a0e054c86722f6e8551360d
-EBUILD lucene-analyzers-1.9.1-r1.ebuild 788 BLAKE2B 30c2e3e5e485b2d1205afab480bf24af3070f27f02b0289d9113bf42a26b33608c57ec7330037bfc6747e1730ea349f0431a9bc537baa48ac0c715ffba577cd8 SHA512 f166c5919c9cee07d790d015b788f1b2a424731cd9324ce540cb2b69fc1c805209a2b931946125a87b716eee6b03f802804c05d3b21f16239d21d09f4dd78d00
-EBUILD lucene-analyzers-2.3.2.ebuild 770 BLAKE2B 69322ae8ab976716561f0225e1ab8939801a489aa51b07c635947e2026502af3d49b5df2b0ea8d8ddf8e746d5cf826005baf8381ee838fc1d4f720f21ff3e491 SHA512 39292669332a857dcb770b5fa8db81afe031ef3faa1e9f2fb8ddb3b93e26b75a9c25e706d71ef5665aaa3cf413915962894d62d71d6a7604c5201c4ca3f0fb19
+EBUILD lucene-analyzers-1.9.1-r1.ebuild 778 BLAKE2B bd49d91684e41b06325b12b8b3a7ca9112b9b32b532fff2a581ca4349c08f57775f862e86e3c5650250884d584d5e9744dffea8a0925925cf50a2cdb40d4fdca SHA512 cb4503576e7ec3ac0914147e960c7eb4e09eb536044dc186d849a973432891b7f6a98dd5ad8c0029a8c02a6b3f2eaa06a38aa8515ccb9029be0f6e6f33cc4bbe
+EBUILD lucene-analyzers-2.3.2.ebuild 760 BLAKE2B 85a0db039ab824b45e0b89abfcf88139aa2a6e97b518b3dad5f0d5c556f18f41533b4253caadcb63095f76a66379b4beb7dcdfdd9f7bb1d11164e46faa7dbcc8 SHA512 1372227ae0549ae2959be978eb41548b4074169bd927646c09dbdc4d64a9d69d7a1de91d3b76ba56048e7e02fc2db4239202b7a5565ddfc852514fb3ed7781ee
 MISC metadata.xml 455 BLAKE2B 81a90fef0b2779f76d2da618f1b14bbaba9219ab81bb395cf255f8b5d661cd4e6a9143760275a37ec87eddac95952e30ac36bc36a8ad767b75407cdd23e36863 SHA512 41dd077d4e3c0771fdda58b3ea22ebe491e4c6ef342df8bcc144e09d2fbd60592c3077ce4763f238d1d8e3f53ac3bf2945da1ebcdda27841e02fbe5563f1226d
diff --git a/dev-java/lucene-analyzers/lucene-analyzers-1.9.1-r1.ebuild b/dev-java/lucene-analyzers/lucene-analyzers-1.9.1-r1.ebuild
index 22bd9404eb83..89f8500b24ff 100644
--- a/dev-java/lucene-analyzers/lucene-analyzers-1.9.1-r1.ebuild
+++ b/dev-java/lucene-analyzers/lucene-analyzers-1.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 JAVA_PKG_IUSE="source"
@@ -13,7 +13,7 @@ HOMEPAGE="http://lucene.apache.org/java"
 SRC_URI="mirror://apache/lucene/java/${MY_P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="1.9"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE=""
 DEPEND=">=virtual/jdk-1.4
 	>=dev-java/ant-core-1.6"
diff --git a/dev-java/lucene-analyzers/lucene-analyzers-2.3.2.ebuild b/dev-java/lucene-analyzers/lucene-analyzers-2.3.2.ebuild
index b520e4342ea0..62cd3b9701ec 100644
--- a/dev-java/lucene-analyzers/lucene-analyzers-2.3.2.ebuild
+++ b/dev-java/lucene-analyzers/lucene-analyzers-2.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 JAVA_PKG_IUSE="source"
@@ -12,7 +12,7 @@ HOMEPAGE="http://lucene.apache.org/java"
 SRC_URI="mirror://apache/lucene/java/${MY_P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="2.3"
-KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4"
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index 2426614ea950..4867c2989da0 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -2,8 +2,8 @@ DIST lucene-1.4.3-src.tar.gz 768320 BLAKE2B 8017b672b0104be007582a67cff5cb130187
 DIST lucene-2.4.1.tar.gz 5057003 BLAKE2B 3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3faaaa3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e
 DIST lucene-3.5.0-src.tgz 39564076 BLAKE2B 5018f0e07a9df3f2f55c540e94e349e64e2c02c99acf14946e4471e16ace4f17a18e306aca6187028cde4434f0d6b38090442baaddaa79ef12ff34a8461f9e98 SHA512 58846190ed0e8c0747e14cb46bf27255d0e4ee93aa0969cf16140713ce20c8fc3f451353437313f14416c92b7b6825d4ce3416d9c7ce4cb1854f31877c2af275
 DIST lucene-3.6.2-src.tgz 32139784 BLAKE2B 48fe88efeae8396e084f827aa66530480f40aee3a2e59c8524420059f004a73be4c1e50c98345ad0ad4808ff8a0a996f9406523bf5c124616657ec91f9797f70 SHA512 e9a08a1b5303c44e4feecc0bb6e7013e4a9420517ae4e98999bd318ec25b5b2ff3b6de8b51db8f68afc0fdc3149829297023a95b103d4f99e7db68deee4c3965
-EBUILD lucene-1.4.3-r4.ebuild 991 BLAKE2B 45c988b556fdc725a1ca374292f0bb952fe272c73fd30d19d6bd02f3ef585d5be80239dec4e17ea84fc6146dd8700c26456660d8f4db4d07a2ea422507803337 SHA512 f5b8d0574672f5d92ae00716fdf16df9695a568b8e18ac854a486484dbba5ea1637a85a086e05a447516f490e8774a0acc1b2d517865decde3f298de3185a3fc
-EBUILD lucene-2.4.1-r2.ebuild 1814 BLAKE2B c2b425b063c4b30f7b87a21760ca5639e1565ce04faf843937eb56a7160b4ff9579f5e7864a73e99fcbba1cf1d3f0b2368936cbae1749770a76e470093bde0b9 SHA512 848453a1c5e1ef8b7fffc6b349682bc060742ea33fd49b28cc9964560c793bf46eedfcec36bfbeda4d77eae6557daf9cc8c9d952ff2249ce591276e8340e8730
+EBUILD lucene-1.4.3-r4.ebuild 981 BLAKE2B c506d4a98402026bca8e4c968bb9d56ecaf5ab5f37891834b587db8069c32bc41ac2d8f75a7c63f26a4eb80929a3fe9b6310ba3577bad32cf505809971cbd568 SHA512 abcbbadabe7dd9dccd2fa59c8888b6871e0104d803139a53549341f2a691975de2a3e9092c7dd4c2738dd89038fa154fd32dc91c293a8373bd012408bf2d1d69
+EBUILD lucene-2.4.1-r2.ebuild 1804 BLAKE2B 09b9ec3959dce0cd93fe8db4f091c4734c61bad7efb0717db0816a357945f310c866d732054920f86755a63849b500d0739f8c7f3f804a3b90d3244baccd560f SHA512 c8558fe7bb43e2bbe40daca7a05fbe5de006ab8aa8eac810e1528a12b5de84e030dbdf724382cfd6667a0c8c456e9b86ff66e8cfa15f5efc9a7a3cb8a6b84e35
 EBUILD lucene-3.5.0-r1.ebuild 3514 BLAKE2B 4e944c04e995278521268166d300e292c21b477969505de26f56d2450c2461e2fe76040d52ab81218176ac52a1104de7de37f7f05e942975789710b5304e2b08 SHA512 c1cd0378af15f5c555cbb9459415552e10861738107a321b3023ce57b569b8733d6779cdb87bcc75ff1f2f526f8cc87a74aab8402fbc3d2ffdedab5a93c805db
 EBUILD lucene-3.6.2-r1.ebuild 5555 BLAKE2B ab16e0833ee520598e3590a98379fd51ea01eb09d46e04e69b350e86fa51c52b329967081a844a33505494ffc953b08420418faf9ef41a994748e900d71649e7 SHA512 c47459c094fa94f22a79c1623a4a9fa3c4edec4de72520d641d21f054eb1089b2949de0666678407dcb0ac9bc3114126a8651b9ddf7ae5729c8b789736513098
 MISC metadata.xml 462 BLAKE2B 2f93e0f1a5f130d6e17e1431764c6492bb1c66200ab79175a54f8ecb3311b8edc9fc6ce1c7e062bc7357d2f48c4155829c34d719a780b373336a2c95d52d70e8 SHA512 611e91130a53366e58e7a628f1eb63317064eff25cc9921e3f4c0c649e7e140a5478667fed236da8c10c52d3c4a70cf0f3d87445d6e82f052910b6b35550036f
diff --git a/dev-java/lucene/lucene-1.4.3-r4.ebuild b/dev-java/lucene/lucene-1.4.3-r4.ebuild
index 327f41c136f7..a5604d395c7c 100644
--- a/dev-java/lucene/lucene-1.4.3-r4.ebuild
+++ b/dev-java/lucene/lucene-1.4.3-r4.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="High-performance, full-featured Java text search engine"
 HOMEPAGE="https://lucene.apache.org"
 SRC_URI="mirror://apache/lucene/java/archive/${P}-src.tar.gz"
 
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 LICENSE="Apache-1.1"
 SLOT="1"
 
diff --git a/dev-java/lucene/lucene-2.4.1-r2.ebuild b/dev-java/lucene/lucene-2.4.1-r2.ebuild
index 018d8ba1bac9..ca86402cd437 100644
--- a/dev-java/lucene/lucene-2.4.1-r2.ebuild
+++ b/dev-java/lucene/lucene-2.4.1-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="2.4"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 
 CDEPEND="
 	dev-java/javacc:0"
diff --git a/dev-java/mimepull/Manifest b/dev-java/mimepull/Manifest
index 054ac72fc7fe..fd7d8aa88805 100644
--- a/dev-java/mimepull/Manifest
+++ b/dev-java/mimepull/Manifest
@@ -1,6 +1,6 @@
 AUX mimepull-maven-build.xml 9697 BLAKE2B a297e74be1aa6bddf7c15b8601df79246a41d8490677bc555fee4db1a1ee81cfeb48ec5226f071c7869638fd8284309ee8857b4c9909a78fa922c5860bef01a5 SHA512 23ec5dfc06aa518632e9d69ddc6633010f0a41baa73f7a9e8695b8666927a2612b9ba3b31a74e9fae436dabb51657e39f2623acb41da14b3df71a93eb64dfa9e
 DIST mimepull-1.8.tar.bz2 48841 BLAKE2B ebc5ba45cff2d01c3d0960433f3334cd9c2e39bf9a627b41b3682ece4e376fc10ad53b00773cbb91fb66463e0f9d29790eb4f55dbd27c4b29b70a6fc24856c0d SHA512 60de5b888ccdf89ffdeba0a5ccd98e77f7497e57c6b3c71049446dab0293836f8f2b84a39354602e9073fb6fef880dbc11c80323413f8ed15f0a3af68086ae07
 DIST mimepull-1.9.6.jar 68382 BLAKE2B a59c4837dd82fa2a1e67e653870ead62c6db6ede03690eb483724d2a9bdb588e34145eff604b372a417cda12a1f4074741630e47b3acd81f438145c938d04578 SHA512 528eb77d6edbbfb1b1d8aebb617f9d20c84b9c18f7ab763163ea136c3898319519bbfa8a8e204bd0697a4eac9b964eaf3fb2ee214555efcb3da152ebf467ae64
-EBUILD mimepull-1.8.ebuild 963 BLAKE2B 839e91810252748dcb9feeaa3b0e3f6a536fbeef4d366ed0e4bc05a72b7dcc231447403833a8b88d4423fa828125b79caba2179e68986171ce1440beb48b271d SHA512 24f9bbcd439f4c9cd9ec49c89e529e9cba5a699cb42c90d949f485b10c4951f27548f7636025c8630de2c82b1b8d50088f3fb7cac6ea111b5ffb28040e19cb5d
+EBUILD mimepull-1.8.ebuild 953 BLAKE2B 1ffe4e9a41b81eae44414e20c84ea4c570c7f9786bdce7ffa33a81ad92e0a1e66da84f2477706603a0c849eb39504d62719ac5aa125c5d8d90229bcc7707c624 SHA512 ad20b2a6b8abc3d49028f575efe82b69218ba156411fbcbac7400934169d5d41dc54649fba4c35fdc575aa5032f8546da941f15dd0ce8f079e5f7d6998c8469f
 EBUILD mimepull-1.9.6-r1.ebuild 496 BLAKE2B 51f4d6ae0fc26652cc9adb3ecd26e0d72f019ab6d2660b30e368071c7a935a61434fbcaf96274836b05646f2fbd057d68814ed115857e6a601cb20768897d408 SHA512 97fe69a0ce8b215a306347a17655fd156754150a22593262927b0dee1740044239c433478fc6bb44bca14ddb9f2b60872b32cfce81acf65550e8d95faeeda357
 MISC metadata.xml 573 BLAKE2B f056f34e757829704b8efe77f55e2da69d27a7dc086cde47135854469195578f1b9dd3b67638a0379bc30eff764c25269a93560e11e0e12f9d7440308d240f44 SHA512 5ba96c89a6e2e5c29367ec1b5e52ab3abbfa7bdb0d8e1dd2e305980d83de83b4c29d657e5ecb4a9c1eb3804fd8589b5de86e4f34f70b951b14b2ed453a8ef427
diff --git a/dev-java/mimepull/mimepull-1.8.ebuild b/dev-java/mimepull/mimepull-1.8.ebuild
index 1e80184557d2..61e403db28c5 100644
--- a/dev-java/mimepull/mimepull-1.8.ebuild
+++ b/dev-java/mimepull/mimepull-1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-java/msv/Manifest b/dev-java/msv/Manifest
index 343aa4b582f9..b9644aabbc26 100644
--- a/dev-java/msv/Manifest
+++ b/dev-java/msv/Manifest
@@ -1,3 +1,3 @@
 DIST msv-core-2013.6.1-sources.jar 1011944 BLAKE2B 474d8a45bc5f16ec76dbe853a835b66cd1d733973ffad0dd5e0a653d349f075e22a72d29d91da312a9a133218f4187ece15fd66b19dc34bc00cdea72b95a5929 SHA512 3985451ff52e50957fdc22ef598edcd7b02495b834a53a048018064d1a6063d4554a7cb5d7752c2d265b852d17c7a55787d9b1ec2b580988ad005fcbc9c6eb8a
-EBUILD msv-20130601.ebuild 1204 BLAKE2B f5799261fd260d670bf1b038bb16f36c4f9bbe3e14bbd8da95ba565b1151d7321b78fc1d4e04a1e11196a53ed860e32bb6d4dbf2c9127789b155f9e69af20bc2 SHA512 73dbba69f162436ccfe3c9388af4b6112f6849e4c8b51827da91f092ac6a1b2ae652c85ab8fe3574bce99e8dffd90f74dcfe4ee8d2405b187cb7987f2f75b3b3
+EBUILD msv-20130601.ebuild 1194 BLAKE2B 271f5fc1729666b46b4d63381060bfa8181673ee3735a6962be6f7eaa3fac4c1e401601da0253396b0bfd3a56b460dc1e953cede5bb5c08627cc8f1e6d421c83 SHA512 138b4479514aec6c7b29e970bf90a50a7c063a60e43613dcb62cc0139495a597a326f0f46252f92390c476bcd00f55d3e9522a0f0e6c43c40652b57be70317c7
 MISC metadata.xml 401 BLAKE2B fbb5715feb77351d3edfb71b51f026f5c858300cb966a8d5cdfa4f3534c03e0de977703263015e5e60bc2928a2060e3da8684f5442f22c4e119e4d1616c82ac1 SHA512 cb176f670e860f0fb7612d313b9fe2fe1c00d5f08de531d7ef93f42204bb0dd537e6b51728b8e068cf571e24aaa7488441e0743724c8d54357f1aeee5ca10560
diff --git a/dev-java/msv/msv-20130601.ebuild b/dev-java/msv/msv-20130601.ebuild
index 4826b3ffa6a9..a1bf53084537 100644
--- a/dev-java/msv/msv-20130601.ebuild
+++ b/dev-java/msv/msv-20130601.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ HOMEPAGE="https://msv.java.net/"
 SRC_URI="http://search.maven.org/remotecontent?filepath=net/java/dev/${PN}/${PN}-core/${MY_PV}/${PN}-core-${MY_PV}-sources.jar"
 LICENSE="BSD Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 CDEPEND="dev-java/iso-relax:0
 	dev-java/relaxng-datatype:0
diff --git a/dev-java/oracle-javamail/Manifest b/dev-java/oracle-javamail/Manifest
index c9d4aea65dca..bb140249f463 100644
--- a/dev-java/oracle-javamail/Manifest
+++ b/dev-java/oracle-javamail/Manifest
@@ -1,7 +1,7 @@
 DIST javamail-1.5.2-src.zip 1573447 BLAKE2B 0ba805e20de84c8a4457d0a03225299a458c5324dc47bccbbf9708673a63521299565e45b66eec552d0216f144505aa319ea724a867ab7de2a69acd072e1a67f SHA512 9d2ae8c38a8e7464023219dac13df95a34cab52a5ff9f19015ea0dde73a838f49ae006c9dc1538eeb978844af7ac962ce3b22d89f0f9ccda684141f7b52840bc
 DIST oracle-javamail-1.5.5.zip 1794428 BLAKE2B 6bcba7aa40ad668b8cfd55ae3b4afddcd0df51298860fb75a2e1ae805920b5a966ef031d91c7a5e0a6cd2f5a2892f4f70ae0e24c87c9623bc1a6c15df93be7a9 SHA512 20eb12e757d00ceedbf45c43ddc1b6fe1155e79766e5843fbb8fd58c3ad91305edb07351b4ff9ed411aaffe977e9e4f287ac16b88ac55541f6f4f93c1c81a58a
 DIST oracle-javamail-1.5.6.zip 1812631 BLAKE2B 9fd43058b10726db9359c4b59fd42226da329268ec4974a510940a4e7d6bd16afc3a3a73b6ee17914cd5d3577c42ddf22f29bc93e2ca185660ea03196ed2bd28 SHA512 3fde7901f5975f4a58d675d94e397bf1a169db227b138bfd684c0e2d0f6522ea1c8e2a5425b23fc08775a6824a9e9e68b2d6e6312f20c53af127f00a897363e2
-EBUILD oracle-javamail-1.5.2.ebuild 1278 BLAKE2B af3162ee07408904e2f0bad2a255f6d1709f57aa12efba988fe0df64ff6af490d4df97e2bdf77286e0cd4d7af02bb2d5a9a28b637b7bf7edf53c49020552694c SHA512 af7b7b766cdf0f87085deb22ed4622a2f73bb8ae20ae9469bd3642abe517dd8a7a8bd2847fc6a6aa432421df5cdec552932aac0bb50763946b425386f2b58496
-EBUILD oracle-javamail-1.5.5.ebuild 1293 BLAKE2B 65b6e9bb578fb3bc4693bb53fe645d9646b4a85edfdc1217dd38772ca46b823d46721d6a61443a4d04cde7ca38b67ffd8efa206a83f4e9916f978110c0ebb86a SHA512 c94902f1a3d9bbbeab1a8addf7ef5ed316c7b98cb5e4a227759c2dbeb239c3afa8503816e260b28c15d4850d6df1d0322adb090c8cb3865a5e250fbdf2897c75
-EBUILD oracle-javamail-1.5.6.ebuild 1300 BLAKE2B fe3c96316e050e318efb5b2a4e9947e7dae095460ea0ff304e7f625bde09fe40f2414926240eaa330cef65cb3267a6875b66781208f364ef64e2c74cb46d061d SHA512 4cdc24a2ba002cf05f795b3769518934f220cedc572e980443a613d0b1c93c8936798ed6f45cf8b623b17a56149ddc9023ef378a8275800b9cc77d9d50f7885e
+EBUILD oracle-javamail-1.5.2.ebuild 1256 BLAKE2B e53887a1ad16fb179215f9df91d7a911175f58f40575649c6a15a2444b504edeb5990180cba566c1494a2fbd3b08ad722fe632530c6c32c189ef7d8f9d3ae46c SHA512 38ac3b08f7dcf9530c058d1d982c851606cac3865237aafecb18df69ea6eaab4f30ba286946621d46cc546f57a4a496c5f3d037e6d339f3559060302f2a66f59
+EBUILD oracle-javamail-1.5.5.ebuild 1271 BLAKE2B 8e5cbc325d8d60505d5834797d68b68d14ed12e148d619fdef5584023209d78d3d03803f04b283e8c9ae8a97b181b51c2cc2b74e04e112b5a374dad83a96cfe1 SHA512 8072133774a6864739b1aff8e00e611b5fc3782d80d1b034c2b145d5ee6aa0af00f0e9f6f3a8e9e71ee82b8d1f1576c1080de8bbb9062c63eaddc1e260f4b6a6
+EBUILD oracle-javamail-1.5.6.ebuild 1278 BLAKE2B 575ef4c929e7f644dcda4ffe67651c04347522791b5bf05b2d522cec18465098c637f97e796ac207a3df5bf8631cbcb3298b15d8991eeda3c12eb7370531621c SHA512 49e142b1912c4497a220c8397c5fea533a9b063e46d6a6858fe2a3a219eed47bb84893d3b874af4cde65b84d1df44c60d8662a299103c98af0b9e8b58da90863
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild
index 6275061a6978..7ff17890673c 100644
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -13,7 +13,7 @@ SRC_URI="https://java.net/projects/javamail/downloads/download/source/javamail-$
 # either of these
 LICENSE="CDDL GPL-2 BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild
index 73f38b732f1f..b50794d5b058 100644
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://java.net/projects/javamail/downloads/download/source/javamail-$
 # either of these
 LICENSE="CDDL GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
index e56f6f60aed3..3a3a33a02b82 100644
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://java.net/projects/javamail/downloads/download/source/javamail-$
 # either of these
 LICENSE="CDDL GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~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=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/portletapi/Manifest b/dev-java/portletapi/Manifest
index 8030adb88ff7..df74aaa06f37 100644
--- a/dev-java/portletapi/Manifest
+++ b/dev-java/portletapi/Manifest
@@ -1,5 +1,5 @@
 DIST portletapi-1.0.tar.gz 212229 BLAKE2B b1efcb7f78d056e6c4c9ed26bd6cbedd0ebcf0e6cc164f862bf3acd6e428feb8f373b3d313aa1cd934edbe9e5af98219bdcf4d173eafb6fc4b09bc5fdd1710bc SHA512 e47da8672be075036989774c90d7a512f7354e090eab3685af90295f07c2842d37a858665a5a2aa3b378e0172c65cbc520180f89e4f08673baeaf19105c0661b
 DIST portletapi-2.0.jar 124636 BLAKE2B f885bf1d042d0eb3230ab2588aa673dfc4fb4da7a8bca577abdac0eb31e9298c76b0600c1a7266d6ec8b072e4b89cafb08c60f4f1de0f5f878bef412a168ff0f SHA512 cf02030850d746b19b85bb3aa204fa7602af47fdda70d5be4c317dea01939abce96915d08186ac876b3081cd8023687e9c4bcef6f4f9a28e8a3456eaa56c8d8f
-EBUILD portletapi-1.0-r1.ebuild 477 BLAKE2B f720db13bdcfabb0d2b8e6a37d739029d6091eaefc4735c884dafb9d4c5ef258cc403e8c196c23d4112548e174804eee0cabb189b8276dadcf2a2b1d335fc848 SHA512 0c1b36f17562560dc533bbdbe4f5822e1ac0e2488d535abec2c0a441029d5afc51ec3869c55b2615993c0369a01f9e5fdf3270044a3e9c608a50217c997e6821
+EBUILD portletapi-1.0-r1.ebuild 467 BLAKE2B 8a33918de4973ccd714db16c67f5c628b04a9c74a03424ff5ae36b4abe09af90d0b64182978cfaffd91b32b5e07fdb42d6fb6dd9c1da636479c3dd6720d9e446 SHA512 68d8b78c0c0774e0970dca3e7b3c9402587509e827ec715ee0dd89af9d3a0807861f3f973ed1728efe103900970bcada510813e4a1d6d899e66ef5bc1d8c376b
 EBUILD portletapi-2.0-r1.ebuild 764 BLAKE2B 76c0e24366b288b65655d99d7e037c5662de3ba443b21c51a4eabb19762cd3a88b8067158fc628aa8142a7fc60261f86a804349718cb75abd148cc3697d76d64 SHA512 9aef2dccde8c2d03f2b1a5f218a9901f7f8d52df1187501fa74c1c18b9517ddcda613114cf56961eb8559ae1c090ceeb99f2e8113b04ddd5f84d15a22481e1a7
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/portletapi/portletapi-1.0-r1.ebuild b/dev-java/portletapi/portletapi-1.0-r1.ebuild
index 6e17bbd0b0b6..6ddc04673e50 100644
--- a/dev-java/portletapi/portletapi-1.0-r1.ebuild
+++ b/dev-java/portletapi/portletapi-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-java/prefuse/Manifest b/dev-java/prefuse/Manifest
index fc7cbd355cda..daa8708eda51 100644
--- a/dev-java/prefuse/Manifest
+++ b/dev-java/prefuse/Manifest
@@ -1,3 +1,3 @@
 DIST prefuse-beta-20071021.zip 4334966 BLAKE2B 3fd543ee65e67a8f0aa4eb5a2bac9f1cd74d0996709907563cdcf123292506888d9f044abb06867c08f043cfaf8383785adeebc9cc1227720a764a4759c82647 SHA512 289386d4614d5f04ac3dbe0bb0be41186540e278b36089a8dfd8f1accd813b229d85a1a36fb05f15d204b77c22e6e41eefa259cff42d8f26680574c6dec7e983
-EBUILD prefuse-20071021_beta.ebuild 1084 BLAKE2B b54e6b7cc611b0def73e0117b4a834fa99c1af48118b58f490768f6f2602d763ba22a1c0a36dcd5901a16e203d153cdd58615b8fa4e2e1cd355b8ed458844a3f SHA512 95deec2580c5f9a925d9a2e8ed516f794c74c5d89948083e2bc6278e45352f7bc928c20d240630f0d9ace0d7e2ae2af031d9c50c7a21c52d1329866f8ac7cf17
+EBUILD prefuse-20071021_beta.ebuild 1074 BLAKE2B 39a4156c696041232cbfa48e6f995b7eb5da439a9c8e62951127e73f9dfa67d3811422f961d806251ea04297e5a97d52173415108addc3be02219dada339d6e9 SHA512 14b4efbe29506731e89c1e9e23fd8617077d764daecac81d228d5c6cb3c91bab6f54ed3f18f93861d5c3301e29e896d135056419ca44648c9ed40793871fd6c1
 MISC metadata.xml 463 BLAKE2B 4533a338f44bf64fa4ec9875db7e6016ad374ad8fc579724697cbf1f098d9f7b96fded2a6836a4e0923820d5b25c5f9ff73e20d6e6082a21d5b48f0f2725caf6 SHA512 b3a36d44af155a6e546a49b098a2ceeca3885716c558fec5a4e15dc9f08f0e0dc5dfa4f8c723802d58b3ef3959e6199609eb8ac5cf538cb5435f8c56a19a0a42
diff --git a/dev-java/prefuse/prefuse-20071021_beta.ebuild b/dev-java/prefuse/prefuse-20071021_beta.ebuild
index b0cee2e06355..cbfe38609155 100644
--- a/dev-java/prefuse/prefuse-20071021_beta.ebuild
+++ b/dev-java/prefuse/prefuse-20071021_beta.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/prefuse/${MY_P}.zip"
 HOMEPAGE="http://prefuse.org"
 LICENSE="BSD"
 SLOT="2006"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 
 COMMON_DEP="dev-java/lucene:1"
 
diff --git a/dev-java/proguard/Manifest b/dev-java/proguard/Manifest
index 23ebcdd041ed..d36cd92a5af9 100644
--- a/dev-java/proguard/Manifest
+++ b/dev-java/proguard/Manifest
@@ -2,8 +2,8 @@ DIST proguard4.5.tar.gz 1827325 BLAKE2B a8bc7f8527f98094c08d178b0544e44e09b3ee03
 DIST proguard4.7.tar.gz 1902321 BLAKE2B 8996135c30e38aeaf1d65ced273cc129023337e450ea5590d60c14b315fb52a1790cdb8cf3e7136ee42d0863864901caac386fac83b1d241e5e626eb2bafa96e SHA512 cbf3e5ddb11a37af169cd563ffc04e554b925e99ff4f3797626e286ac40554577f2715050b46f5d1a9599de97cb62090b39798ea0aa006273d91cf8217e9e60b
 DIST proguard4.8.tar.gz 1914047 BLAKE2B e32b9eab0b9d91fb7e565c881659582c3c90ebe3b068e79aecd62b7e5200420ef61ae4f303e654329e46627d8c746747019347baae74cf23ed791dc89e8a0197 SHA512 f06c98c784a71fa9e2c137c6bc4c062dfcf2eeaa28653b909b475226cf133fb67821128a3fb6ab0702807cd229330da8b64e810d9078d0b7510083453feffa10
 DIST proguard5.2.1.tar.gz 2160584 BLAKE2B 35cedaee26a8f8fb3ae28843f55867277817bdde28603c615ce4bea0b5fb8babf35b49ae494cde0b0496117077aa2984197bb06915f50699b5a5dc66197f2601 SHA512 7c2735860d689f9002e40e7a5304eb61f8fb8abc1da36ea62fa32541cdf2e655bb2d27814e2b8137d29a1ab02a57c57961491612ea8e735788fdea719e6239be
-EBUILD proguard-4.5.ebuild 1599 BLAKE2B 619114bcf1482b083bd94f50f175b16dbf459e4cfeb5c457ad63abda075d71820485628676925fa31f41d15a18446f9e3b03cbff936ee0d5a4c0e47ac7dcf393 SHA512 2229c1315356dd711481f5dad218cc87184658caf2cfd79f350c4c22a076567c1e94c990a7100f4c52006e309afdbdf471c98838176ddcd3c8f1d5321cbbbe35
-EBUILD proguard-4.7.ebuild 1601 BLAKE2B 4d91a31fab7eef64b0c230f2ffb25a698b06578463773840b4d53203a68a22f12a70a2ca250fc477a93f5f11e76997decf5749feeb06ec98657dbf2339a5172f SHA512 2a4edffb0e4de3322c5bb302d0a3084997ca89f75f49cea897c6ca0c22f7176c5c3653f898ac9bc1a52f6fdbbc59556f9c2ae00d34eb41b3dc7c7ff3f40d192d
-EBUILD proguard-4.8.ebuild 1595 BLAKE2B e33ec891bcf79b3dbb969690cfafe212e79e369682901d502d7f3efd68cc27c53e941a8440f97938fa8433a1bc99ce0b612186ddc632920afbb5c6100d0f91ca SHA512 cbd5029257f5e2484dfdaa279f13bbfa458084b40c74c8366c02b17da589443d60badf5f4ec8dea947ef8f7ad3236bd1da3bb41b36298a95053690cf366135e6
-EBUILD proguard-5.2.1.ebuild 1592 BLAKE2B 6a6747bcbf52c0b04eaad9a6205d2893ddf3568e36d8a533315a4b65c98a451b2a1a9985f6c90b96703a2d54d11d929f0c600830a9da5d16ac131eb90230eee8 SHA512 92b4199a3c734e1a3870d470a59d087421217bc304d07aa686e3e226c0950e8a586b08849126335d393f88b985daca1f1f1e40042d96daff73e80e618b480664
+EBUILD proguard-4.5.ebuild 1589 BLAKE2B 2e7c870d216ac7b4fc099c229c8afd0830a1efc9347917bb7f5ea0baca0224a4e35a5c11afd433cb99b3986b617e85f4ae5d7b67391afaa904e6739499088431 SHA512 62c71f50e764ffc6658d2652d8adc5022ca872206e764fba09eb5bf33b8007366c5c7a0f47de19c6fbf5941f3cebb4be29f216ff5b78889fea3bfb2695d0e0a7
+EBUILD proguard-4.7.ebuild 1591 BLAKE2B 9ae1548fa1e632e15bcae065a8bd61bca3d718e5b927ecda232af2a97d2959ffeb3ce654de588f329651b3abc82171cc500c29dc9ff1bac87080c12f6ceb55ce SHA512 468627dd892376ace80ef0d5e41bbdc3618471135c5d20b601ab73c055230c18e85d351cb47ad3adea7d560507db23e29ea437c6540cd00f99d7db5bb2918a84
+EBUILD proguard-4.8.ebuild 1585 BLAKE2B 0143f0ffec6ec400c01893cdf7c1539d83fb89bf3bad99a38124c442d0c530f8a52f047f03e4bd615ec125262d4ea11e8369d36b875ab5a65c911b85f6e3c7d1 SHA512 00feb16820b8676eb02f0876e516cb7d7ee17878ef16d561ff77e4c7c8a8adbce87fcee9d75def8c55261dbf457f96c90d3ef1e28aceb71cab98a36d4d871666
+EBUILD proguard-5.2.1.ebuild 1582 BLAKE2B f5858a345acb37507e56cc9af29ac9d4efeea6bbf61f1f7a59b4ee8205fd8b54a6790ea395efa8614ab15953ba550972030ea040e4da565ba53fe13f229cad48 SHA512 3eb6154de15044062f182a1a0b0a3d58cb2f356e4d811ce4631ebcad81b1b22f671e75fcaa2badab43dd146e23db1d5ccaffbfeb1beef5a307e9fec023cb1b09
 MISC metadata.xml 470 BLAKE2B 038b609842f58b18fded44a04304459fdbb90f1eaa90e784e8e0aa8bb22c6725a240388cc12fef4dc9dd89bb87d2b963fa8c98d09c645e76341a5357cedcf5c9 SHA512 41a6f95762fe034432e6c02a20bf37a25f27e8a3edfc8b07d4506115526865e22a594582ca1d7ddc2f22ccc8b1fea59f66edb5209cab5f0c38553dc0f70a96f9
diff --git a/dev-java/proguard/proguard-4.5.ebuild b/dev-java/proguard/proguard-4.5.ebuild
index 5591f87e982d..37a87d483852 100644
--- a/dev-java/proguard/proguard-4.5.ebuild
+++ b/dev-java/proguard/proguard-4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/proguard/${MY_P}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE="ant j2me"
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/proguard/proguard-4.7.ebuild b/dev-java/proguard/proguard-4.7.ebuild
index 439692179911..27d90c562ca3 100644
--- a/dev-java/proguard/proguard-4.7.ebuild
+++ b/dev-java/proguard/proguard-4.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/proguard/${MY_P}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
 IUSE="ant j2me"
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/proguard/proguard-4.8.ebuild b/dev-java/proguard/proguard-4.8.ebuild
index 5a91d3ffce7d..c10cdecaa146 100644
--- a/dev-java/proguard/proguard-4.8.ebuild
+++ b/dev-java/proguard/proguard-4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/proguard/${MY_P}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
 IUSE="ant j2me"
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/proguard/proguard-5.2.1.ebuild b/dev-java/proguard/proguard-5.2.1.ebuild
index c7e674619b0d..65571a4f9427 100644
--- a/dev-java/proguard/proguard-5.2.1.ebuild
+++ b/dev-java/proguard/proguard-5.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/proguard/${MY_P}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
 IUSE="ant examples"
 
 DEPEND=">=virtual/jdk-1.5"
diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest
index 0dd4d9ec0141..4fe8eb4c87fa 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-sources.jar 63731 BLAKE2B 77d117f0f76f531f9320b5eb3650db315aab838d5d79a9df8997649b498b375db3fb0c694ea8b5911512097dd2325554d7599bed51a978e38af6fa55600d7c24 SHA512 0b05620809e3830c7e12c289cd4765f96d845adabc1f09497993bd9f39852784f454eb4aff1deecb325608a5773e86fbb1f5863e0f25387805472b59b46cf965
-EBUILD qdox-1.12.1-r1.ebuild 2202 BLAKE2B c3dd7ba8fe18eb29bf0035e47107cb6b9feadc3c7f0f3dccfc932ca88f9203df4107c6c72cc6756000a50eaa74c05f0e09a32379041e59fd19ea11ffa27fe2c8 SHA512 f1fbaf2e3136f5e96dd5c0721c94116fd66d1e134e4a72fc30d3f354a4ebc7387d7ad90fb58a4e981573cdb43514a68cd9bad892d651c82aebfc290521b7473b
-EBUILD qdox-1.6.3.ebuild 1319 BLAKE2B 80f3c0e5ac83c040deb5bb26443523d4a7c2553baf7e74b67e77b23ae08af631e80b8a25ce1a08856cffca969f1d2e3944c8053957dc2d97a0f3ad008976484d SHA512 d3ae1db0c4ccf4df92c3e4bd1fa3175ef8b4a7f0b71dc3e93c5caa604a4dc63d9e1ce40ecbfa008bcf0ffac99a84e21fe7ff02dfc2f33e67490fe7a089fbd8bf
+EBUILD qdox-1.12.1-r1.ebuild 2190 BLAKE2B 6ed08cbbbfd4fbc8eb710095e310b8c2a795039db3f3da520dbe2713d043dff08710747e1bee1f6fc10f51bf3a31e0cc7428948c4d6125499c40bbfe79465c98 SHA512 bae61bdf03378a6053c40b3663a8ee4d011520366a115364b02e90b54f55074cd4639201ac0ec46aecaaee1588b8b9894ca1b5544fd74b171f2344aa614e9376
+EBUILD qdox-1.6.3.ebuild 1297 BLAKE2B f01869d2507dfb8a368dd037f5566eb0805b264ae43b1e8002fdb98cd2f3a3f751504e519429c93d13914f3af8f3db61d5b92ff8aa93f8b38562887c05bb3d7d SHA512 87ffa052cbcff5847bd0941e17e1298daf0c0f741236fade400c4adb307ce142672319e7d0c3e481d95c79eddb841defcd01c78ba52bd9bbba2c77db208cf801
 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 55d7edd511d1..f471a8ddecd7 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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 ~amd64-fbsd ~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/qdox/qdox-1.6.3.ebuild b/dev-java/qdox/qdox-1.6.3.ebuild
index 595e0e62b25a..aa32120cf256 100644
--- a/dev-java/qdox/qdox-1.6.3.ebuild
+++ b/dev-java/qdox/qdox-1.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 JAVA_PKG_IUSE="doc source"
@@ -8,7 +8,7 @@ HOMEPAGE="https://github.com/codehaus/qdox"
 SRC_URI="http://repository.codehaus.org/com/thoughtworks/${PN}/${PN}/${PV}/${P}-sources.jar"
 LICENSE="Apache-2.0"
 SLOT="1.6"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
 
 CDEPEND="dev-java/ant-core
diff --git a/dev-java/relaxng-datatype/Manifest b/dev-java/relaxng-datatype/Manifest
index 069cb13744ee..d2e235f00b73 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 786 BLAKE2B 18113cd03148bc8c26b75aeca741a00e8474d2ffddc0a44f190def179b40b630f77a81cbb00098422ef3f29e5c0cef5c77cc846641c5c50e47e78393e73f5064 SHA512 f99b1c8441c48b0da8924bf8240cdca5174fc095e4182c03101e55c8f2f34db89f4f0e24bbef0fcefb63847ed408f533aaae4d07346a604e63e82154f5db7531
+EBUILD relaxng-datatype-1.0-r2.ebuild 764 BLAKE2B 3115e7a4cbd43f7756f2a580ff63f73b5ba829bb01fc09e694c0368ec241138cc9dad7a695d43deb78a7499def4b27f33d68300894ede11f9cf101ecfb036dd8 SHA512 1d9c0a893e66ea67d1eb07d0db596390d5d15a8b2ccce89c9ca22c726de6df82810d49e15e1473dd5d3d607d652d310e6876123fe625d857482b5270b45e25d6
 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 584b53ea2e0f..e2bae382dc23 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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-fbsd ~x86-fbsd ~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/relaxngcc/Manifest b/dev-java/relaxngcc/Manifest
index 2ac049dbedf8..e2b0b2582030 100644
--- a/dev-java/relaxngcc/Manifest
+++ b/dev-java/relaxngcc/Manifest
@@ -2,5 +2,5 @@ AUX 1.12-fix-jdk-1.7-enum.patch 925 BLAKE2B 56bc32e9317027c7ff5b9a72f5bc9074fd31
 AUX build.xml-1.12-r1 1052 BLAKE2B f80d529a495fd5ab37788a3a50d03ffa6eb9f7196d6b31007d90fa1d94c7359ba8155340fef0550f7f67ab5b4f053e9920cb2941f3518097b4555dd1121d5e10 SHA512 cd0412dd263ac0e933216bdb99cdb3f45e0ff58f0c836d62a6bbaf57a3cc984980dd76ec9c7791c8719cdb56e80991ab4a5f716919570321169cfeeb8b191854
 AUX relaxngcc-1.12-SwitchBlockInfo.java.patch 509 BLAKE2B 198306ff259d830ce1db6fc2d4d38a926fb64fccdb81c07f51a64a3ef47cd4ab6258a7efa35deb1e6719dee0b5513e8b7068c786bff75b15b408d20c0a1a87e4 SHA512 d9e8fbf64b588a66a44af5a768adad5099f970a8c705898928a73704e6e809f5ba7a8d851bf4ed356dc47c0b0a0a4674583daf87e0271a7edf171e529886f815
 DIST relaxngcc-20031218.zip 2162036 BLAKE2B a5efd9941229e6dbc2d2d223e9d2799a0f56cc6010331175e16cfa2b77b886c060062fd7206bf7d1f9cbbc831a2d06efee176460ced81620ec8ceaed89334921 SHA512 df797243c095e79e9018d8f17deb3963631128718428ff325af6910e285e649f27c270b63101f2b5833ddde23814c54a662397000f433f8a32cea30917760d4b
-EBUILD relaxngcc-1.12-r3.ebuild 1394 BLAKE2B 9a0d75e373fc4008eb64621c7c3b2977200bebe567fe14d81ba6abb29ca976744eb2ae459446f8391284d7a5b6d748e779db1c84e7b4e3ba77deb7fd42ec084a SHA512 adc8a2c10004ee9343fa325ccfbf85896fddbf5abbb8c5b820b963445895f68dae80d693aa91240656a5ab3ad0dc1d8a5ef08434f4fd6ad1ac1f2761e96a29b7
+EBUILD relaxngcc-1.12-r3.ebuild 1384 BLAKE2B d64cac19e4b27abfdc3fba1642ac09335a2787aaa71134eca67ccee5a1fecb655e62f24bbf6a1b3a76639e2cd96485e06e4d47d928841824c1d0426100dc1485 SHA512 4c634f63561b9814807065ab30be9ef0e2d01877bfa088240d2070f0e5da54d566a4ad4570b285486f7be1c49a623397463691701146960b3e0d2faf5b0bc61e
 MISC metadata.xml 315 BLAKE2B d93ab01a7b525398306e5c60dfe4949a084b824f80b0099f5aa17dcc2b4d3a0997be633179e131c52972e594d5aaecb5d62bc40cb6df3a3eb606d0dd3d8a9e8e SHA512 3fd8f24dacd7aae0d04568ce951c8d9559e0c25dc52f7713136d3f4398c14873ff8420e0d12f858d3006397e9539a7278a21ec85cd549ee1aad516063738caa3
diff --git a/dev-java/relaxngcc/relaxngcc-1.12-r3.ebuild b/dev-java/relaxngcc/relaxngcc-1.12-r3.ebuild
index dacdd1feb4fb..db4dfd79d2bc 100644
--- a/dev-java/relaxngcc/relaxngcc-1.12-r3.ebuild
+++ b/dev-java/relaxngcc/relaxngcc-1.12-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_DATE}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 CDEPEND="dev-java/msv:0
diff --git a/dev-java/resin-servlet-api/Manifest b/dev-java/resin-servlet-api/Manifest
index eae72554a7f1..c6ce2d77d054 100644
--- a/dev-java/resin-servlet-api/Manifest
+++ b/dev-java/resin-servlet-api/Manifest
@@ -7,9 +7,9 @@ DIST resin-4.0.46-src.zip 40400255 BLAKE2B e31505ba82a8e87ea0b28634b3055c3a01d66
 DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 BLAKE2B df087e05a80442c44969ccd20099ad5ff5d1e6ab92886255cfa262bcce73043f07b01109e84e224dd991c43730d6c0795bf63bde3b8aaa5fa6dbf749dfbb78f5 SHA512 23ce290e97f18248e08e0b3b7ccf37f60a4b0bf2c3aa28d856384295a286b3eeb9636e299e0620c2c858f8e523806707fe1d4531070ee7ffb4037ad483e6d035
 DIST resin-gentoo-patches-3.1.12.tar.bz2 1618 BLAKE2B 672ff977f307d0abe225bdc57bed8778d0855c175532a39f8984dae39aaecb4a708f569179e76d5dbdd47df25f9ca7ae75f7880c8adc85f74a3ab52dc3ecc8fb SHA512 12dfd508765c46a9c9ca782e1b63def2989a3d2e025b3e8a7b15e5b389976aeba898e1659044a737156d953c0eaca9a4a461a9c71dc601aaaeddac8cd5da03ea
 EBUILD resin-servlet-api-3.0.25.ebuild 865 BLAKE2B 1429e7888ec44189bd47ab530b4089e034632022fcf83a61bd7c99a1e2e1eaa3107292dc7c625469c722067df315a249fa0dc24d6e8abf0c9d55760c6a0268b9 SHA512 83efdc313c63c98eb07c8a2ef130f69aff349b4e39619c08c89816933f4ee9d6aff18f8df6b97734e28069d4b36c2fdc705fedce77ef141aa3811c8bdc61743f
-EBUILD resin-servlet-api-3.1.12.ebuild 1113 BLAKE2B 03d5e20696ce0b86f21a6e0c1891278c3a369c66222dcc6ee96a608c4e76f2d1dea259205ba29785a77156f4875f4bd123aae07dd8d4dc36bedc13a7675ecaf8 SHA512 9f7237ab1f29c1d69c7e2a9675f5bc36329fba26ecf91f6541e47af4b9c7a7ef535dafc8b212254dc779eb4e314481a023c1548a15200033f4ba8e7435fae418
-EBUILD resin-servlet-api-4.0.26.ebuild 1149 BLAKE2B 77533622cb24a1a63afdf7caba6378e76fb8d08caaae6e8202a31571dbc58fbb09b369b755552194e200c049f377cc4c09b68f8419da2005cc26473d136bbb26 SHA512 65d3dfdf04d29209e444731386deabb71d3ede67e9fed1dbc4fef04fed06adc7735f502046d21d8b765ba446f1cdd24d205f6886296a06d16482de777b94b59f
-EBUILD resin-servlet-api-4.0.27.ebuild 1140 BLAKE2B 6cc1174a3606af20dd7291e944eb76394d68b313672192f7d84127e6ffd8e7501bd94011f4b941e851f0035d97b7ffc035e1c09cf56aac23a684f963abd143aa SHA512 a78f61f8f57a2de6c0a39fa48d1131f5436eb40003d13f888514de7ddc24c506729d69695861f1b37b21fded24f87dd2182787ff180fc059462846d07d73a73d
-EBUILD resin-servlet-api-4.0.44.ebuild 1140 BLAKE2B 441953b8ad8da3c3b1bc38194150fac616f318e3b669a80081085cd3c1ddaf33caff08a48a0c7b6977bfdd565586ea8e96da77c820ea0095192f8b80da1509ab SHA512 ef3ca9ae3752deea865286cce0977e91fc31d73edf2e09f5cef8acfcd710d00a7884d77d32fd7545f74822c15256084fb10a9bb9667b4c9e1409fe98ee698f1a
-EBUILD resin-servlet-api-4.0.46.ebuild 1140 BLAKE2B 441953b8ad8da3c3b1bc38194150fac616f318e3b669a80081085cd3c1ddaf33caff08a48a0c7b6977bfdd565586ea8e96da77c820ea0095192f8b80da1509ab SHA512 ef3ca9ae3752deea865286cce0977e91fc31d73edf2e09f5cef8acfcd710d00a7884d77d32fd7545f74822c15256084fb10a9bb9667b4c9e1409fe98ee698f1a
+EBUILD resin-servlet-api-3.1.12.ebuild 1103 BLAKE2B 2a26ff67220cb360c1bd7909bae7b36076ddacfac8dac56009a846af90062d5cf1339ad5b582decc7d05847e8a558e9ac2d75a6404e0f12db7cf437e91a1a227 SHA512 368faeff8853b60deef26c056c82181e182810a92786e947e7a578797d8ebde6253701e4ced228dc06edc960be31e9210b7e0cccdf6062b03f428d21468df319
+EBUILD resin-servlet-api-4.0.26.ebuild 1139 BLAKE2B 60264990c2f7ab4bd58fd509f42c3f680b372acdec7a8c02a12c3501037a4ae5d2050259bc3fdddb48af88e2ab99dfa3e49fe76759bb37c2340864b766c26daf SHA512 4e33c22526558a60581893879519735b9e75cd653968020b58e74ffbf39adb64273f7faa0bdd22520faa3c47b52418ecd3eb924363c1fa12cf55fbf45fad4757
+EBUILD resin-servlet-api-4.0.27.ebuild 1130 BLAKE2B 4640bbc6d38f768924414b83fa7e079b632d20f9084f9e7ec7b36189e377d5b8ff2032c3e27945f5003ef27d2c8dde3d7386a4ea1bd14b6dadda9e862ef671f1 SHA512 060fb6ecbec02c28f0ae3bf9aa3a12ac2368825ce8ef7dad5865e7ee2f4e7e739ad1ed28517df38d615063031f325ed5338a34581766dd5552352bfabbfb3a01
+EBUILD resin-servlet-api-4.0.44.ebuild 1130 BLAKE2B 2f6725b53f1474c6c02150b70c30f89087ded68f61f0510217203c2a8ecb5327ca5b2886e793163084d9e4839cc8cb7319912520d45b819ec0af0e2407ed68db SHA512 2dd96a756b7433887aa4f9b521c4e385a1dc1e5c887acd73525a42df41e28807ef1070e233f40081eb2d0cac9d0820a145bd95923344e549aaad8503f18e9f9c
+EBUILD resin-servlet-api-4.0.46.ebuild 1130 BLAKE2B 2f6725b53f1474c6c02150b70c30f89087ded68f61f0510217203c2a8ecb5327ca5b2886e793163084d9e4839cc8cb7319912520d45b819ec0af0e2407ed68db SHA512 2dd96a756b7433887aa4f9b521c4e385a1dc1e5c887acd73525a42df41e28807ef1070e233f40081eb2d0cac9d0820a145bd95923344e549aaad8503f18e9f9c
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-3.1.12.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-3.1.12.ebuild
index 6397acb28a97..f0f872dfd98b 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-3.1.12.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-3.1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -14,7 +14,7 @@ SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip
 
 LICENSE="GPL-2"
 SLOT="2.5"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86"
 
 IUSE=""
 
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.26.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.26.ebuild
index 96588c8a848a..e73b7d1f7ece 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.26.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -13,7 +13,7 @@ SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip"
 
 LICENSE="GPL-2"
 SLOT="3.0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86"
 
 IUSE=""
 
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
index a065f54990a3..1977b3f26abd 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip"
 
 LICENSE="GPL-2"
 SLOT="3.0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 IUSE=""
 
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.44.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.44.ebuild
index 3b3bcabcd85d..0263bbaf7018 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.44.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.44.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip"
 
 LICENSE="GPL-2"
 SLOT="3.1"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 IUSE=""
 
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46.ebuild
index 3b3bcabcd85d..0263bbaf7018 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip"
 
 LICENSE="GPL-2"
 SLOT="3.1"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 IUSE=""
 
diff --git a/dev-java/saaj/Manifest b/dev-java/saaj/Manifest
index c6d3a5a3e40c..c5adeb297292 100644
--- a/dev-java/saaj/Manifest
+++ b/dev-java/saaj/Manifest
@@ -1,4 +1,4 @@
 AUX saaj-1.3.19-java-5-bootclasspath.patch 502 BLAKE2B 6c753863bb79bfa13caf57b944e654768d77a809829196fd540619cebe72e9ecd7098164938d934dbb93619db7fee9ba6419670cc240ef0b2e367585c5e08432 SHA512 8477fac7d1a33b0ac7fc365c0eb385597cc0ae5cb65bc6ad45ebfb70a023b343adafbfbcf71cd226e14f4e282eee5654a5b0d310703aa4386b4238a4c55f0bd1
 DIST saaj-1.3.19.tar.bz2 2266558 BLAKE2B ea198273be03e8c01d66c2b088df99761eee46e264ac80987845af0fe8fb3992f5dfdd323a5e719241759c31dcc1da0d52cf4506eef1577d2e617eda0565bf29 SHA512 12a439e296117abeac5de4694f2efec74c7f2b15cd86cb8759bfba6867f68dfe6c2f5b86ac2f8884eb86dddb3221e19f6c47c976cbcedcebe28570b51280ef71
-EBUILD saaj-1.3.19-r2.ebuild 1685 BLAKE2B 6a859ed42de7f2ddd008d2ddd593118c2c069fd8eeb82a4a48f7fe543ede3a69c4a31b3f8cdc7c113f9602c728fca238454f5ef9a7e9da20eb290402da1b0c4b SHA512 9614381b2c50d876cd637762286ccb59e89763e49a151cdd0b052a342f44c5ee12e81c42983143644bcf73b1f5809beb798112b6727fcba81eb149b55b9026ad
+EBUILD saaj-1.3.19-r2.ebuild 1675 BLAKE2B 1d80a4b46e189bb79a07348ad41abae94463be2ecfdb66c6d35485e581d7c510fb2d33148fa809cf22d2acb0befdb24e9516c83910460c861713ec9517c2c6f3 SHA512 b43964117da68ae030ca47a8ac6b277732d8a0876a0c301dae90be8dbfa0fd50ca3ab9bbe30129f638555707dd7b3c67a5722b8848446cbb3ab4aff280a1967c
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/saaj/saaj-1.3.19-r2.ebuild b/dev-java/saaj/saaj-1.3.19-r2.ebuild
index e5ce1011c0eb..5fb094560cfa 100644
--- a/dev-java/saaj/saaj-1.3.19-r2.ebuild
+++ b/dev-java/saaj/saaj-1.3.19-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 
 # saaj-api only for java 5
 CDEPEND="
diff --git a/dev-java/sax/Manifest b/dev-java/sax/Manifest
index 31d9651037bd..34219d7aef4a 100644
--- a/dev-java/sax/Manifest
+++ b/dev-java/sax/Manifest
@@ -1,4 +1,4 @@
 DIST sax-2.2.1.zip 372488 BLAKE2B 27813712e81c8a42f746ac5d84f381f7d5d30b6e11988624a01616632b742ac90f834574c7c1288385b3d6720cd2f3ee0eb9df1644e7cca5eae813ef8a2f9f45 SHA512 af05c14994894f0b6cd860c1d632a1148f43cef824081357c9e4b256e66e0f36ac3cba1838f03322182339f2642b4bf68f707407fba8ee6c2f95d5b8d1267648
-EBUILD sax-2.2.1-r3.ebuild 654 BLAKE2B f30b9a8f643acde96a6039fa6ce891e3c13db3f773b28702155a389c5d6c96b324ee909bf591684e08c911949d2def82cbb6406aeb900b219fb1b63a4742f158 SHA512 6babd40896bced648113deaa9772af0711f719ba74a7e6cbd65702aab505c1516df7fcd794658c91923cbc23884ca8b333a51defe23ed3c86bae0efe9f2f446c
-EBUILD sax-2.2.1-r4.ebuild 697 BLAKE2B ca9d03fa85682d473fe5d1468d9ff835e9e380c3bff043b23d4f994cac33c865209e42295ebbd59fc791347021740c6217198d23bb1f1b89a280342a1b246a1a SHA512 4ed2c205b9ec79829535b6fcb3ec512374a1fccb5f0b196428fa14efdc5a3c3273d53ab75c711e089851dc7c5df3e93b5800b480b1877819930daa1c0e415a2a
+EBUILD sax-2.2.1-r3.ebuild 644 BLAKE2B a319b42284cddd4093a586e863c5ef05bc8b89cf9628e6679afd292b27cc6265604a5d8b62dbb9fc7bfff534f7d8ab273409f7d11b95ce67cf4f29ba3a2c4605 SHA512 f918377b9711a65b4fc89ca26d7c3910e2e1afc273d884b42ec1ec56da9acf5696a05e1920fd5a50ea8c3a74703c3d900fe3d5876bfd9d493da508ca69027a50
+EBUILD sax-2.2.1-r4.ebuild 687 BLAKE2B bbeaaebeb5e58de9ff876edb2d492c9cc90c16713b684735c5693f6719d58a36eccd4dda48cbd1751c5386f366c070e2b009bad43b7d67bac7526d0d398d977c SHA512 606d0e86d54844c9204e53a9b24e17901801db84924a18f23b053a5747ad8fd612f3b567c6cb9eadade3de0f0119bd64915d308e95e196d05123c495b9ef4e61
 MISC metadata.xml 309 BLAKE2B 9e480b093da836218b9c3c52bf91b2ac8a1c89bb750a485d662b018f18481984b850f8ed139c9f8b34677fa67e890f35af4e3009b93e92fc87e27c56fed9fca2 SHA512 f1412e1a93a748dd318a3238af4f0438d9b84762586bde5c3071e73fa0fd247e45f2e398e07f290059b487ea20866247f1df42a897b99e0001d52015d355db76
diff --git a/dev-java/sax/sax-2.2.1-r3.ebuild b/dev-java/sax/sax-2.2.1-r3.ebuild
index a458aa9f5dd1..e375b5c14a0c 100644
--- a/dev-java/sax/sax-2.2.1-r3.ebuild
+++ b/dev-java/sax/sax-2.2.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip -> ${P}.zip"
 LICENSE="public-domain"
 
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/sax/sax-2.2.1-r4.ebuild b/dev-java/sax/sax-2.2.1-r4.ebuild
index 2142cba424fd..52e3fe5c5d4c 100644
--- a/dev-java/sax/sax-2.2.1-r4.ebuild
+++ b/dev-java/sax/sax-2.2.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip -> ${P}.zip"
 LICENSE="public-domain"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 RDEPEND="
 	>=virtual/jre-1.6"
diff --git a/dev-java/saxon/Manifest b/dev-java/saxon/Manifest
index 4f13815a9550..14507e867973 100644
--- a/dev-java/saxon/Manifest
+++ b/dev-java/saxon/Manifest
@@ -3,6 +3,6 @@ AUX 9.2-edition.properties 74 BLAKE2B d468841c782fa7bf1b39cbeeac01d983a8d6891a13
 DIST saxon6-5-5.zip 3346162 BLAKE2B 63d49545d101c3b595ff3f3db6d781158b8a51862ccdc294e782ac0935010a841405fb21663bd35853042c53548991dfefa7f789be292fe8497a29253c87ee09 SHA512 2d76ab6da8fc8ca8502139f6b620d4c9e94732a520083480e3936f6bd0a9f069252a7a05df53dab49aabec505764b2ec4ca1b36022bb56df568883a0491f495a
 DIST saxonhe9-2-0-6source.zip 2942625 BLAKE2B 45f9cc12591ebb94076392b16edba52811d911c41f2f197ffe864e37c1ef478670ff276b7dc8dff316dcd2986f777b4cc2d43989e5d300510ee0edfe7e54103d SHA512 6c59c0cbed905cf561387acb54bb31f0a251432deb0edf498ec4f4d9955bbcc12d1765ace594090d3ccb0416e3e72349466e430bb4f799b51fd12ce8fc5a144e
 EBUILD saxon-6.5.5-r2.ebuild 867 BLAKE2B a5879fbeb51e113e05dfbfe4dff8088e26621278c76f83cde4b47b6744cf83e9fb94fd25f661f25e57a3f8a5d513d903f3808dfb6fb6ba79d6e450cbccb03b5a SHA512 a8a6978c47998380b6c7ec09f7102584007aedd829cd95d0ff629d2df9062c5eb46ceecff88b2bb0fa575907810fb21fa14dc1253ff0da3f9962687935f53df1
-EBUILD saxon-9.2.0.6-r1.ebuild 2197 BLAKE2B 6be759492b3a9f44f6b2bdc7a877135717879e292864bb9db59b33b2a4193d7c27cca644b283f3437a17708cf8af9dfe0fd503c09d10762150f94c7acfe24b18 SHA512 b2ec3ef58bc895f3aa42eaaa23d033e3f5186cbaf1078d931160071bdcb4fc2bbab3edcde16ece9fc341b108060d76bf96082e961ff4d9ea95c8ee7863208b9d
-EBUILD saxon-9.2.0.6.ebuild 2201 BLAKE2B 6c32255e17da02ea6c8b4d76a9a73fd065ea71ae88876ec93c7bb29f01e2734ba088e1510541d3d25459451bff2ce668ac474937da2b9987b06515df87515452 SHA512 ff42010f65d63fbdb5e584cc409dd455e956376835eb3336731781b2a39b31080d7c24d852b0b9d9c95743b3dfae067dcfe936420475884deb464922ce66b2c4
+EBUILD saxon-9.2.0.6-r1.ebuild 2187 BLAKE2B 05de676a17049541880b530f6034eeb5bd17743e13ffc65f535b8aae674cdf0f243f56eeba2a93fc0a5a367bf3bf11f87f70a1abdb1cd593fbffcb2db7426bd9 SHA512 04fd1f6c2528ff86e26f553b20cd88d9c41652bc5407184f1ca4d134d68b8a96333dca911900ddc68afb76aeede7d25c01f85709ebab4dfd04f0feba4e698c89
+EBUILD saxon-9.2.0.6.ebuild 2191 BLAKE2B a383bf6d0e8cde78e45945ec028fa2fe5ff0a21051b4a05eb325147c88adc0376b6c250339da2fbcc99a8495d3975845aa832cd22c2cb235e4747cee333ba70d SHA512 c20b14dbad9faf4306a7ac0a1ccb3c49388197521185e4d6bbc3b9bfed9535432105cb3645071ba4ca0ed2faf1a7e40b2f6cbcf1e48abf1d6e305a28fcc29f85
 MISC metadata.xml 311 BLAKE2B fdce161da5c8394b66ee6b1bcebbccd863cd5e70291afab04400c4d806afc955f803b5c5aa15601157f2784e434baf505dcbebdbff9817fe960961f8108d3b63 SHA512 2fc12b71b9e977a095610f8f784f19252d44e31442cc5d5ce513f601a2394f4bf491fc9065de88bbf45afe7b8f1ca33ea907e31aa26875f48846856f1bf51126
diff --git a/dev-java/saxon/saxon-9.2.0.6-r1.ebuild b/dev-java/saxon/saxon-9.2.0.6-r1.ebuild
index 149209c055b8..1a07be9cb9a0 100644
--- a/dev-java/saxon/saxon-9.2.0.6-r1.ebuild
+++ b/dev-java/saxon/saxon-9.2.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="3"
@@ -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 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 IUSE=""
 
diff --git a/dev-java/saxon/saxon-9.2.0.6.ebuild b/dev-java/saxon/saxon-9.2.0.6.ebuild
index 715fbbf14830..9cb4a84da3ce 100644
--- a/dev-java/saxon/saxon-9.2.0.6.ebuild
+++ b/dev-java/saxon/saxon-9.2.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="3"
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}he${MY_PV}source.zip"
 
 LICENSE="MPL-1.0"
 SLOT="9"
-KEYWORDS="amd64 ~arm ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc64 x86"
 
 IUSE=""
 
diff --git a/dev-java/saxpath/Manifest b/dev-java/saxpath/Manifest
index 9bacf1853a6e..09a9279cc730 100644
--- a/dev-java/saxpath/Manifest
+++ b/dev-java/saxpath/Manifest
@@ -1,3 +1,3 @@
 DIST saxpath-1.0.jar 36257 BLAKE2B 0b6b2c943b3b472a01109c6f6b25d8e54b5afff7c44f980f4741ccb3bb689520e5e6e49fb17e918f35212fceb69e5aa551469fb923675b9287733799134bb967 SHA512 53e7781ea3efc1e16a839c9137fe7ab683e7a9e40283f0f5aa7afc1de75c4dc366a91a93ae5f256fc24e78fd3a4dcdcde6631bfa0d926b7dd0ddacd5c240ca96
-EBUILD saxpath-1.0-r3.ebuild 556 BLAKE2B 3bb1964c99261ed88c23404d4f6e8aa7850f16b10d826446e8a6e63ddb066ed8c2a12497ef3992fdbad6e05fcdefed4bed81edb9b3bc97e37aaa7243b3efc1c8 SHA512 cadfef1cffed4433275ccd5e61624a8e63ac093c903b803d21b36c639ef98adbb1d1b5c7e170b090916b12407507825141204577695f85dbd6efe0bd0a22850b
+EBUILD saxpath-1.0-r3.ebuild 546 BLAKE2B da8def73140f1874856d1d95230813242d5a9caa0302b36e2800f4c140b21121f62bb65dc2d7a4affd84083e8ca070bfc127162eaaae7aef7f5d12af099613c1 SHA512 4561ede9c05653579428d64e2ca48ed7eef54c0a599c5dc37885b34d36a4c351becf9ad2ebfb411213356deeba17a94d4eac303f571b34acd5b13fda1bfc3564
 MISC metadata.xml 313 BLAKE2B f4d1330a2165d9293cfec36e9cd98feba4526f4b0c47694a4966aeff6cdc4d9b5021279081ed88e8b1039f04678497a7fa78aef18a86e341917a3366ecd22367 SHA512 bab31add81d5d0086ccb56af2b48076f31966c1cf671e0ab42eb055c6a28d20840f5693c2370fc03fa5768dbe95903ec18e9b0c07df357fa51a3e54da52bc835
diff --git a/dev-java/saxpath/saxpath-1.0-r3.ebuild b/dev-java/saxpath/saxpath-1.0-r3.ebuild
index b86849e3ea2b..283ee8807ff4 100644
--- a/dev-java/saxpath/saxpath-1.0-r3.ebuild
+++ b/dev-java/saxpath/saxpath-1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}-FCS/${P}-FCS-sources.j
 
 LICENSE="JDOM"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/servletapi/Manifest b/dev-java/servletapi/Manifest
index 6850ef9c8064..53e6501a819c 100644
--- a/dev-java/servletapi/Manifest
+++ b/dev-java/servletapi/Manifest
@@ -1,10 +1,10 @@
 DIST apache-tomcat-5.5.20-src.tar.gz 4796377 BLAKE2B 34950d25c969006510dcff96deded7d0f05c7fa99cde0a8e59b22a93261dd6dca56c82aa281d1476324a4c3b608d2d31ffa6c4a03506d46ba187051ea5addf1c SHA512 1efab4625067ee423cd517b565b2d368bf3e19fd5fddedcb87644bdc5fc213cc7617e62438fd8da19d9dff99e13c5d6d9185f12849f7ce42efad52ff2d4df5f5
 DIST servletapi-2.2-20021101.tar.gz 65342 BLAKE2B 03674ca65e0cc509b04a6255d5dd20d26aa5053ed54588e9ba655330c56c9c523c5b382804aee9816cb9aa2ac19cccc1ad288ed06b2af85ba535854bc72bed73 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084
 DIST servletapi-2.3-20021101.tar.gz 127874 BLAKE2B f78f8d0724e73ef4a21bbbef6a1b855c0a55c158dba2e3ed3ee7b6d48a60ce87881bbe6b38bf5098f48f1c3064bc73c072a485e550c1caf920710ecd6e27519f SHA512 a09a5e0cd7b8c557fca983646dc49284350ff9cac7a288013c6c4c7582923d1b16d6e6b68c73e74bc06fad628ab81da95e201106643b8f6564f984a9587bd03d
-EBUILD servletapi-2.2-r3.ebuild 874 BLAKE2B b6c3368581a30f5f2247ccbe25eb90954170d2a138c6cb3058c3ebaed6159acb90a49f0f0cf27f87ae0e11230d3ba2de956fb9e6671cb2461c50df0d9503bc0e SHA512 7dd16250131c84424a81bd038e86956af8c871ca12fe77b335e2d328858fd5f30f138c5f2c7a93d2b797641a8af7459e6f401b37a914927818ddd9f132f16f67
-EBUILD servletapi-2.2-r4.ebuild 892 BLAKE2B 2178343174013bb43a8825ac28ba4b92be44f3337f8fb8ba2b1996bd4c2681073f8a1c2462cdb6c9b20253e7db37667cda80dd62a084bfdafa690cc778d454f7 SHA512 e4ef54d6bb90f70f605136e6a4bbe67df9bb9d6fca348cbf0dd070e2002cd6e3a04be54dddf6998f80d8ccb785b47e677d21e3f930f12c9b3e892572d48500df
-EBUILD servletapi-2.3-r3.ebuild 755 BLAKE2B 7e67fce7bbcb034fcc55445bd97aab8f2be2dd7332085ed190b181221a44673ed01efaf05bcfdcf6cf2105c12d1a11c83c7e6254e3a2dfb102b895142f188e14 SHA512 c47fa89bab9b9c65be375b99f19fb5467907806c4363609e4b443ce7e836fdaa1a9e183c970a8c4dfae738d7c392523371b1dcca03f3b49d876bc66d15e318fc
-EBUILD servletapi-2.3-r4.ebuild 773 BLAKE2B baf73c7efe1b1f57a7f00414b38b3435dd5fcece5235f3489a82288df9424f0bb883685b28f086dfe1b86c8f8382153b928e22f26568da3fec61ba799a74d1b1 SHA512 9138e2b14e89f8207b2d3b2d59e4ab4f67ce08acb315875ef9d934a8bad3d7480e1c881e08a1a4e99655667db4f741e222063c31c7578477051cc33fbb74cdcb
-EBUILD servletapi-2.4-r5.ebuild 1261 BLAKE2B 5f8c59c80da9054cd134fd48e449f5d2786c34ee7969f3755379efe8625e8595eac46e709ddcfbf140a5a887a750cba5225b49c1a21f18a4f3e3d17592d77016 SHA512 4e00cc80f7ef0e92922ba2bfb89fa7c5225e97ef41288e0ba096078363c8c06894b343fa98d4cdc050cc7ef8a4b9e210da441992c304aaef11a7806433176966
-EBUILD servletapi-2.4-r6.ebuild 1337 BLAKE2B eb13c2dcf08df9e65bbe52ece293fb5b79210df384e25664e8a2f578f388ab24fde6527a1e7c2ec18e0a399fd44774ecbe681f644fdd4cce2c26e4cc30b66796 SHA512 4d3d77095a9d1e133e08addcf55d558c4c6572110fe9482baa98543df20f862ecf29aa06794c7d3c95cb8336e9aa3bc6a665084df85a4bdb14dd492de7052d70
+EBUILD servletapi-2.2-r3.ebuild 864 BLAKE2B 6af68942643d914aef24a5f70090ccb52f8d4c422b3a4fb68c5b0f42ab797d6e5e015a895d3a66ec35196b00809ecda3715aa841ab26f71e58acd61b85f8d122 SHA512 f9fefb8e578b800ccbef602f45c0ef01a87d25668c1dcbd267d615313869c524091cac88d8de5b5e428933e21e3f0a97b7358e693350aaa5d56aa226a39bf749
+EBUILD servletapi-2.2-r4.ebuild 882 BLAKE2B ce5fc1d8d623da6e9758bf2c4c19deca4a5e7a626f3fa3f8cb0c09ff50439917ced8565451d822646aaadbb5ed92b2a6ec824095b2c76436a1e875d87ec5ac92 SHA512 ee9c52f8a21c6b0d293e6b9cba879b33ca9922fe921ece415a58299de5bcb5640aefb3fdd1dd43d5a8f9e6459eb6c3ced9ecc4c4db19601f1c5e448c53d373f9
+EBUILD servletapi-2.3-r3.ebuild 745 BLAKE2B 91579c311f107fb2a30d9158fc52fc0ded454fb58022d47e65d65dcdfaa7e4fca0eeced52caca3c29d8db9938cb9a7b107dc42999526574532e775a1c491ea0e SHA512 735456bac660b371ac4541fe7bd5b27faf8f201aa3c115a583e9125a5aee512c5a9ef4b9bef3d58b38a08610b4a0db85e542297b3e8b54b4d9b620a7b372e2dc
+EBUILD servletapi-2.3-r4.ebuild 763 BLAKE2B a27783abbcbbd66c59dcfc110769ca283f306fdf7496257ed372ffedd360f1dec2d7474ab2270796b8c2d3851e39bfc2484fac3a2aa621aa537a57bfe81c5b09 SHA512 4dbf71fa13fa765c2ca23e2cb937ad73135ee7cedf1cf5700bc1bc7f2417a2da6b88ca9257f5994c87d4567266df4d0ae20d5776e0bf8ed2d17f0846d1982030
+EBUILD servletapi-2.4-r5.ebuild 1251 BLAKE2B 90e690d967a0e80f7da4f279dbbaf50cb204a0e77fec14b84fb3d1b3c542ad666896994bcb41edf6590a182f6fa6ac07eb145b7d979c9a263610bc55c23811a1 SHA512 2b0f188b9964a958155d29af8701b89449cde746c0c8e1e3929a825fc6e607107517210105ffd6f2eb7b4c9c460d78ef91b373f3229b613d242ea1dff95f3d26
+EBUILD servletapi-2.4-r6.ebuild 1327 BLAKE2B 36594a4bede2001aaa886bdf6ede6376ecb84c3eaf38665b0dba3e3c2ca3c005f04d1fb46d104f5a311a65bb489bdab45a026a9220d386a6821bfb268860c0a5 SHA512 4fdafcd5392d748bb9331cfdc0c9139849682a0ed246a1f5e4cf5083270f135f88e8a257fe649d86b874e4732065cc00935192c57f82492081e5446e916b60dc
 MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
diff --git a/dev-java/servletapi/servletapi-2.2-r3.ebuild b/dev-java/servletapi/servletapi-2.2-r3.ebuild
index 32c3fbd50eee..030be48d95f8 100644
--- a/dev-java/servletapi/servletapi-2.2-r3.ebuild
+++ b/dev-java/servletapi/servletapi-2.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 JAVA_PKG_IUSE="doc source"
@@ -13,7 +13,7 @@ DEPEND=">=virtual/jdk-1.4
 RDEPEND=">=virtual/jre-1.3"
 LICENSE="Apache-1.1"
 SLOT="2.2"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="doc"
 S="${WORKDIR}/jakarta-servletapi-src"
 
diff --git a/dev-java/servletapi/servletapi-2.2-r4.ebuild b/dev-java/servletapi/servletapi-2.2-r4.ebuild
index 0cbcbc065829..e1a24d421468 100644
--- a/dev-java/servletapi/servletapi-2.2-r4.ebuild
+++ b/dev-java/servletapi/servletapi-2.2-r4.ebuild
@@ -19,7 +19,7 @@ DEPEND="
 RDEPEND="
 	>=virtual/jre-1.6"
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
 LICENSE="Apache-1.1"
 SLOT="2.2"
 IUSE="doc"
diff --git a/dev-java/servletapi/servletapi-2.3-r3.ebuild b/dev-java/servletapi/servletapi-2.3-r3.ebuild
index 5f11bf552500..2acf74a7089f 100644
--- a/dev-java/servletapi/servletapi-2.3-r3.ebuild
+++ b/dev-java/servletapi/servletapi-2.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit java-pkg-2 java-ant-2
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}-20021101.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="2.3"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris"
 IUSE="doc source"
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/servletapi/servletapi-2.3-r4.ebuild b/dev-java/servletapi/servletapi-2.3-r4.ebuild
index bb0d308808e8..2c264a869899 100644
--- a/dev-java/servletapi/servletapi-2.3-r4.ebuild
+++ b/dev-java/servletapi/servletapi-2.3-r4.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Servlet API 2.3 from jakarta.apache.org"
 HOMEPAGE="https://jakarta.apache.org/"
 SRC_URI="mirror://gentoo/${P}-20021101.tar.gz"
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris"
 LICENSE="Apache-1.1"
 SLOT="2.3"
 IUSE="doc source"
diff --git a/dev-java/servletapi/servletapi-2.4-r5.ebuild b/dev-java/servletapi/servletapi-2.4-r5.ebuild
index 0537d0b2a61d..6f2a2849f2a0 100644
--- a/dev-java/servletapi/servletapi-2.4-r5.ebuild
+++ b/dev-java/servletapi/servletapi-2.4-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils java-pkg-2 java-ant-2
@@ -10,7 +10,7 @@ SRC_URI="http://archive.apache.org/dist/tomcat/tomcat-5/v${TC_VERSION}/src/apach
 
 LICENSE="Apache-1.1"
 SLOT="2.4"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc source"
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/servletapi/servletapi-2.4-r6.ebuild b/dev-java/servletapi/servletapi-2.4-r6.ebuild
index 730650e38210..13f902f52c07 100644
--- a/dev-java/servletapi/servletapi-2.4-r6.ebuild
+++ b/dev-java/servletapi/servletapi-2.4-r6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://jakarta.apache.org/"
 SRC_URI="https://archive.apache.org/dist/tomcat/tomcat-5/v${TC_VERSION}/src/apache-tomcat-${TC_VERSION}-src.tar.gz"
 
 SLOT="2.4"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 LICENSE="Apache-1.1"
 IUSE="doc source"
 
diff --git a/dev-java/sjsxp/Manifest b/dev-java/sjsxp/Manifest
index 35e764ee6184..b008c718f81e 100644
--- a/dev-java/sjsxp/Manifest
+++ b/dev-java/sjsxp/Manifest
@@ -1,3 +1,3 @@
 DIST sjsxp-1.0.1.tar.bz2 414706 BLAKE2B 622cfe0e0c0084afd048dff6bf3fc0ffe086f41036fee549059d7fa6602c682fec5815960791d726079b1f0701502a60eed8701125da44a1d0ed4a923c819d62 SHA512 0e8e8841d87400f9978b8e053f3658f14f2c1b85007bc431681c6489ae78972cd892021821b00a37ba06098ba1bdf6954a3c294cddbb69e5cdb7936f4736daa5
-EBUILD sjsxp-1.0.1-r3.ebuild 641 BLAKE2B 36e7f7dcc68624684556f0cf941fc8c30128bdcafbf6553526bdfa15c89b7b4328e2e15c638dfcb4362b5e8d614dbb1509f9f75e50c3fe2214dae53f3f1d6ffc SHA512 f528f1466ca5c58006cc6529023f687758e163bb726752e056e2b038c8b1e8804aecc39a520e3ec65e4c64a440a51c0fb96f91a48b348079d06236dd9df215ac
+EBUILD sjsxp-1.0.1-r3.ebuild 631 BLAKE2B 59cb707f90d671d1ef5fc95b7295f22e04c6991f9df25d747fe78daa9ba3aaeefc7e939d2e6cba5f067e58d8c7b836481ed451bb82197dafda42ae521b73f36d SHA512 f2a6b9780e18bf82784e6cbfcde860dad4926e5346b9430c6692c220ccbb67653bc4d6d2e386657d9de51187e9a85fdf9e4c5b280fd9a3158694ccffa3b039b2
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/sjsxp/sjsxp-1.0.1-r3.ebuild b/dev-java/sjsxp/sjsxp-1.0.1-r3.ebuild
index 0f84096e5059..b95fc5c021f3 100644
--- a/dev-java/sjsxp/sjsxp-1.0.1-r3.ebuild
+++ b/dev-java/sjsxp/sjsxp-1.0.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="bea.ri.jsr173"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 CDEPEND="dev-java/xpp3:0"
diff --git a/dev-java/stax-ex/Manifest b/dev-java/stax-ex/Manifest
index d1d490cd3995..4d9c7460713b 100644
--- a/dev-java/stax-ex/Manifest
+++ b/dev-java/stax-ex/Manifest
@@ -1,5 +1,5 @@
 DIST stax-ex-1.0-src.tar.gz 15446 BLAKE2B dbf1e1bf70ea008e03fa7382ade4213e266faa051a4803d995fb1676c607739a13904b12b3e5961c23a892076814d97dfb123dc26de67ed62ebf20fcb3facfd5 SHA512 acb58c7b182c7aced70099027af8e29b03e42e11f97104a75dfcbe8fad6f989733d67d31c203a95072f04d7e008240fdba59b5abfb6c5362268e12c138204938
 DIST stax-ex-1.7.6-sources.jar 49384 BLAKE2B dc65a16f3ad86cadeed2a2a3ac15b082a00fae910ab6fec4a6ccfae8969ed162b1a7b8f426889f03c555856b2a5d5556990306e55070c8219dd65d1ff28348bb SHA512 74bff2e094d29f63fb718c249b7e0fc004ca00e7f374af6634484d0c96ee8f1dbfd793706906e375b473b86b34e7a2c55c1d6b65a1d1b10b0125498b9365efe0
-EBUILD stax-ex-1.0-r5.ebuild 545 BLAKE2B cdc8b79f74fa73ccb3f91ca5fbb0d663721b852cb9376034ac62eeb4cc6c8d1110e15b699cab1d5665d866533c18d26db774efeeef3ae563780741ad22289b64 SHA512 1bab7129ab8a672fd16107979bf7ebef62e02c73f7ba4f47985bf772788169941a5cb5ef515940c195c9fa336162544bcc0c3d19cf25ba16801e08a18b3e5a65
-EBUILD stax-ex-1.7.6.ebuild 561 BLAKE2B 2bf6336784efbf5c20abfc3ca47b176e1409559d86b5f9a9f4bcd7742a09b46d21c89788005a963289d34c1bca249c3f349f5b0bb7cdfc02a62ec7260504158f SHA512 e33678c32d4417c3006bd8e4dc186b2bd52e7e15626d7992fbf6509cabd1fea821295b47e65e62b334b4f8dd14a0cd702542f074b1f48147e0b3841f46b7c3b9
+EBUILD stax-ex-1.0-r5.ebuild 535 BLAKE2B ed9b7da0035932c20f04e5b15b7d575cc8a9da995972776884dfae469804e3a634fd15042badb406460bac71264647d484d89026845e81f237da62c4f711cef3 SHA512 6a798dcab359f386266dd7b2f47b416d75aacb24e4b989f8e1c8a1ece04038f92e120ca90e32dec4c1c16fa8cac26fe8441da9eb9cfcfd3312659ef183b3bed5
+EBUILD stax-ex-1.7.6.ebuild 551 BLAKE2B 2ec94db653018c40c487fc0aedef62f9472a681f1b0a961a7c9032e8e7051186c0124f53a82289517f5ac143dc76e391d708707253bbb70ced68ac2b10512205 SHA512 a29bbd5b49aaedfd7110234342bf2d3392f7c694a3105b044f27f430fa858cc691339e1e70650e9ce2eb72e636fdbbade5aede54d8d8b3226c4cca116507d4e7
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/stax-ex/stax-ex-1.0-r5.ebuild b/dev-java/stax-ex/stax-ex-1.0-r5.ebuild
index 21dc794ee4e0..d0e9b1b1191e 100644
--- a/dev-java/stax-ex/stax-ex-1.0-r5.ebuild
+++ b/dev-java/stax-ex/stax-ex-1.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://stax-ex.java.net/files/documents/4480/44372/${P}-src.tar.gz"
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/stax-ex/stax-ex-1.7.6.ebuild b/dev-java/stax-ex/stax-ex-1.7.6.ebuild
index cab4dbe328d8..1d5307c0d826 100644
--- a/dev-java/stax-ex/stax-ex-1.7.6.ebuild
+++ b/dev-java/stax-ex/stax-ex-1.7.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://maven.java.net/content/groups/public/org/jvnet/${PN/-/}/${PN}/$
 
 LICENSE="CDDL GPL-2"
 SLOT="1"
-KEYWORDS="amd64 ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc64 x86"
 
 IUSE=""
 
diff --git a/dev-java/sun-dtdparser/Manifest b/dev-java/sun-dtdparser/Manifest
index cc7c73cf955c..8c30aafbdd54 100644
--- a/dev-java/sun-dtdparser/Manifest
+++ b/dev-java/sun-dtdparser/Manifest
@@ -1,3 +1,3 @@
 DIST dtd-parser-1.0-src.zip 67545 BLAKE2B a1f38085bb88625c36156e2b08b2e8bc12e1d53c5d54172914304da0678edaead7bbe44153a77c993177be58aab3c782e3e3f716056808a1367bb11130c70868 SHA512 7a8b2d27316121e33640ff51819e9edb362197b5af340a92e24b5fcd7cd885efdf3951e12cf5056670273eceffc17c3860b56d437c7cfb2fc12b47abcf82ecfa
-EBUILD sun-dtdparser-1.0.ebuild 715 BLAKE2B f06d0eefe7809abf631940be4ea6ff9a9b6001a0ec88fb4a1146f080665cf38cc4275bef19749c3138cd9d8c1c14964ac5a64db5c3dd6b9ee6bfcd0c6e00a643 SHA512 d81965808a1464bade4a27f151e9da52c16571eeb517736a0327a36edccf339472f128f15f74df12dc6090742c8217460ea277c2f3d2e668d2be1832757ad8ff
+EBUILD sun-dtdparser-1.0.ebuild 705 BLAKE2B a3be7d74e3fed860de5153a0b2f8cd6d77157f5e6e781f3395b007c88b5781f4794c688dccb3908782802ec70e102f9a8f54434e1430a4143b7fd96908060aa1 SHA512 8e0056d429e8cb583a172ab37ec226ec817bbd16555630315f4f9a91ed7df533b40b2937c228b3dfb6a5a43bab963ee0f2ef0cb63da08b9f8c8dc64b4ffb9125
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/sun-dtdparser/sun-dtdparser-1.0.ebuild b/dev-java/sun-dtdparser/sun-dtdparser-1.0.ebuild
index 90914627c53d..efdc73aa6e75 100644
--- a/dev-java/sun-dtdparser/sun-dtdparser-1.0.ebuild
+++ b/dev-java/sun-dtdparser/sun-dtdparser-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 JAVA_PKG_IUSE="doc source"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/dtd-parser-${PV}-src.zip"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 
 IUSE=""
 
diff --git a/dev-java/sun-httpserver-bin/Manifest b/dev-java/sun-httpserver-bin/Manifest
index 9a0d056ad05d..e027244a4fee 100644
--- a/dev-java/sun-httpserver-bin/Manifest
+++ b/dev-java/sun-httpserver-bin/Manifest
@@ -1,3 +1,3 @@
 DIST JAXWS2.0.1m1_source_20060817.jar 8993405 BLAKE2B 85661cb9c5c60035c0d9f506f20671d3602a2ffc22d94a608f6d926d4caa966ac7edc77decbf218254b786c41afc2a49621861592c6612688b628c7b182c64ed SHA512 55454a8270310b9778c69aad8b8ace45dc4ba3059b33ac48dcfd5d771fade2d6e4c46a5a65a522ae5cca0438f159ba84c90d8e74d54731a9c6c0caa9d84a0314
-EBUILD sun-httpserver-bin-2.0.1-r1.ebuild 743 BLAKE2B 0bd11595b0c3cabbe5c9e16c638f9b00c689169af30f50113d7a66cf2d110f37ce0036fc5f8d7beb2a0e3d44f3ace160188df6ca0862763702590f39ae087ae6 SHA512 99cda520498a098a2c01819c6e04430be8c12fd8fe1edec38db4adf63aa4fa30115d703c896467e5e85d3484dc9f8e982411719efa00f882366a75d345e0e4d8
+EBUILD sun-httpserver-bin-2.0.1-r1.ebuild 733 BLAKE2B a42a81482928e7eba3eec4c6497f7a70befdca1c4c8ced120d7617c60a5a5e7d038a7a3b9358dc14c3a45ec371ea79ae7ea5a8e16806fd9d137ed9d78ef9be3f SHA512 2c50ca6f9527aab2eaa5bb13fca39b8f4ee28111fb573294eec5cef47632de624f972d43e1e659b8842327d8a4603667a5f111948f848e8634f3cf523b50f46e
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1-r1.ebuild b/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1-r1.ebuild
index e0b35072e87a..f4d927f6dc62 100644
--- a/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1-r1.ebuild
+++ b/dev-java/sun-httpserver-bin/sun-httpserver-bin-2.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://jax-ws.dev.java.net/jax-ws-201-m1/${MY_P}"
 
 LICENSE="CDDL"
 SLOT="2"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/sun-jaf/Manifest b/dev-java/sun-jaf/Manifest
index 9129b5e3695d..3c7063a23a54 100644
--- a/dev-java/sun-jaf/Manifest
+++ b/dev-java/sun-jaf/Manifest
@@ -1,4 +1,4 @@
 DIST sun-jaf-1.1.1.tar.bz2 125305 BLAKE2B bf7676f3b47e9cf4c169a7625160604c7973d2bb8f6a087f7a7759c924efc0c24fbc6d59f03fb89dc874b2ad03e311b5029fc066fe5083c1accdc73fa9666ea6 SHA512 c7287056514324aa5feeed3d4afaf861869974dd565f7810e0161fe590f070ec894e7005ffac4dd42cf075313237027d7d7c88cbf583e28e05df361536d73001
-EBUILD sun-jaf-1.1.1-r1.ebuild 628 BLAKE2B 0bf314ed8559e7cb912e39822b5d6fad9a389e373313e5166bfdac818c4691a1f16dccbd77762989b460bf85c13e227bc7ed42acdc9be16ec85a6e7b7da3b0c2 SHA512 bf06093b19c54a0c72ca4000c215e7da868d8c55d6d408e017bca6cb7c91490f28a03b6f97e4d3ac080b17a2f207976c3c87342190caa11d1c0e0b4e20d851fe
-EBUILD sun-jaf-1.1.1.ebuild 1288 BLAKE2B 1a0c56dbfc771ef8ab6ddf770c5f7b215dbd868b5b16ed20f16d4dadd3c0b4920e066cc33a62d96d4320676d56b43aaa177443dd8ba9415db1cd0fd1ac208502 SHA512 49e16a402954e4c3e8dc678aefe4de66183c7bad460a73fbc097a8a12e37556c14a2ed3728b5a022d18556c40777b5a64399f21e10761359373d372684693b61
+EBUILD sun-jaf-1.1.1-r1.ebuild 606 BLAKE2B 917d999c4f7d9f64aaf795124219f6f4b4e61e3de2382fcb9ca89a466d8b67940b5b7daee9455c496da0479de8bdd558204166d003602469d5f639fbb88b10fc SHA512 a7c23859097d46faf220d5836e22deb737b16bd0a42efa5c33b785fa560d73bdae974159a03ab2dfa7d4fd3d04b21d789d99254306c13e14ec0f2560f1f5f6bf
+EBUILD sun-jaf-1.1.1.ebuild 1266 BLAKE2B 1a17eb9a250e2674871ef5cd4d76e38e5a19316eea75f2ef6f13544a8e94c3e0993f9908246e5a8a40a6510aa5ccbd58989579d4c514790fc6f0a780e0051cbd SHA512 355d421f1146d4b3d3e4dac18eb586b3000bf74943330a9617be9d0ce49d7a03e4c338a6708e8f44985e8d2100988be7460b13adc844575298509d198004572f
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild b/dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild
index 1f45b3b157e8..e5a06cb99e8e 100644
--- a/dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild
+++ b/dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Sun's JavaBeans Activation Framework (JAF)"
 HOMEPAGE="http://java.sun.com/products/javabeans/glasgow/jaf.html"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 LICENSE="CDDL"
 SLOT="0"
 
diff --git a/dev-java/sun-jaf/sun-jaf-1.1.1.ebuild b/dev-java/sun-jaf/sun-jaf-1.1.1.ebuild
index 8750b73d4038..cb9cb9feb240 100644
--- a/dev-java/sun-jaf/sun-jaf-1.1.1.ebuild
+++ b/dev-java/sun-jaf/sun-jaf-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 JAVA_PKG_IUSE="doc source"
@@ -21,7 +21,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source"
 
 DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/sun-jai-bin/Manifest b/dev-java/sun-jai-bin/Manifest
index 056b6d8657a3..5cede717316e 100644
--- a/dev-java/sun-jai-bin/Manifest
+++ b/dev-java/sun-jai-bin/Manifest
@@ -1,5 +1,5 @@
 DIST jai-1_1_3-lib-linux-amd64.tar.gz 3510451 BLAKE2B c16dc0e04127bf57df6390dc9d99a1e44040c0fe81ccacc88698493d3fd3483aae12d664a89bc13939655d21ce2d92b64537b073c0d1063bbf91e18129da5eb4 SHA512 5089b696baabdea9622683aa7a3569daf724fd7fa8a4f1c95073b9e96ff5c37fc55a9e3a6fe499abafe61f5f4a109770bd27172ae6711ab7b4da3de55d8b0f56
 DIST jai-1_1_3-lib-linux-i586.tar.gz 3501711 BLAKE2B eec4976124a9701367e7b61c652ed619df69fa12eb02c5288d9d1ba4845ca7e2315514fba1f75f15c8bbb90cba981972961e8d1e843a8a8ac2b000e5e4917975 SHA512 bd142eea557b68d10d26a18b6b0d04e5cb42212e98268035b1b3615d6489bbc4fa07ad141fd04fc5ae3c74f1703c9ade77130cbf8a61603b4b271e3a0e06e860
 EBUILD sun-jai-bin-1.1.3-r1.ebuild 1091 BLAKE2B 0fb2d482dc05f4195c0bbc5cf45a250223a978f5370ba472a8b3f2548fcaec6cc87edb4e52e186b5b73080f228fc8f5ffdcb3a30df2e311dd5b8fe4319cbd49f SHA512 8e6b34e3756e0c1d1e7cfab5f36908c0531b97fddae93c0a0eb213bd1589ce49f7853509666c8ec7652f4bc97c1f28413a1cde03a20dd90b865924e4aad9bb9f
-EBUILD sun-jai-bin-1.1.3.ebuild 970 BLAKE2B bfafe5971cec7806658e52af22f129e291dfbd0975ba8657f04e4de612aff9faab7972794490f62c3e84978d70c501a5b9ecf5f4d7675184a53aa4c74c759747 SHA512 3118dfdd2f5eb8e8d8dd75e27065a420642299f2d97048ea6201299daf0db89d2b5b609d039267807d24774c5cf6a42a97f71d9f1283de0abec08ddc34bc2589
+EBUILD sun-jai-bin-1.1.3.ebuild 960 BLAKE2B 955a15907752322d458ac2c82b4aa98db2f588aa35eaaf72b880d4a24f491c5ba9699b44e020ad97052ef6338ff7b821f2513f1cc374a7d2f590c998020d8a22 SHA512 48de806c171fdf8d970d770c041d1fe280a51b81f60cdd289cd42db67edd550847fec8adcb35b2493e52292203d1a83fe6fe193ad4718c13ea467772ae7fd66e
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
index 72d408be0023..261891c6e40b 100644
--- a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
+++ b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit java-pkg-2
@@ -9,7 +9,7 @@ HOMEPAGE="https://jai.dev.java.net/"
 SRC_URI="http://download.java.net/media/jai/builds/release/${MY_PV}/jai-${MY_PV}-lib-linux-i586.tar.gz"
 LICENSE="sun-bcla-jai"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86"
 DEPEND="app-arch/unzip"
 RDEPEND=">=virtual/jre-1.3"
 IUSE=""
diff --git a/dev-java/sun-jms/Manifest b/dev-java/sun-jms/Manifest
index e427f47f6ab1..ffcd581dbd4e 100644
--- a/dev-java/sun-jms/Manifest
+++ b/dev-java/sun-jms/Manifest
@@ -1,3 +1,3 @@
 DIST jms-1_1-fr-apidocs.zip 361922 BLAKE2B 75342eaeb56ba329948a226f48304e0a520e83f7284d5d8b46b981531b7f8c78283e38b2a488177349aaabb70276fd4ca09bc86993800906aea1469a6549f318 SHA512 ac2c7925b7f5bd3918f0c69a7b18dfa2a15f58243aef7cb429c0571ea218860fc146fd355c905e17310072263f64385b9010eafb1050158f42f498d7f21dfe1d
-EBUILD sun-jms-1.1-r2.ebuild 1333 BLAKE2B 22913dbfecf50c8b1926e0440ad892dbe49625600a6b4ff1458c0d404b7390985f9575a85443500de025878346306fd2056283afadc8bddf9627dc3259c50b63 SHA512 d795ca9356f9328f058211a712fd99594f12f02d68c1adb28c189bdcf70ec801f8fcf76a1d74354712fd9cddb5262a33aa3b3658a9ba0267d91eafe02cdeeef4
+EBUILD sun-jms-1.1-r2.ebuild 1323 BLAKE2B 7514fbbf789c9286d8e8ba9509b3c5aab990cb8bb111e30417c1a2d5aeb22bb6b4e7eca8f27caf2f9d41b33532d821ac9cd72a8526df77edb990b32bb306adb2 SHA512 5e490421ed502c35c7e485292f4660b2852a198357ecf0c52f48d66b84e1fe7ca3ec18bfbbee6e4ef7627ef5ee93360966f33b08862c797af75c05c35b0e9b5f
 MISC metadata.xml 420 BLAKE2B d00cdddbce707b1fbe67e796c7f62bc4f942c6f4e3c5af1aa3a643846dabded18b41b1e35d4e93cca068d2d0656fd5a88d65abfdc303cf5b6293d8fcd39be61d SHA512 60f2556340ffa7951c69e1bef1a5eda1905a02f3a1e72199c7af02225844c805fa2154ce6629b6d8bafcece22fc3d1c75349021af6932dff3ffaf952fdcb818c
diff --git a/dev-java/sun-jms/sun-jms-1.1-r2.ebuild b/dev-java/sun-jms/sun-jms-1.1-r2.ebuild
index b6aaba4b5052..e876b12718e9 100644
--- a/dev-java/sun-jms/sun-jms-1.1-r2.ebuild
+++ b/dev-java/sun-jms/sun-jms-1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit java-pkg-2
@@ -10,7 +10,7 @@ HOMEPAGE="http://java.sun.com/products/jms/"
 SRC_URI="${At}"
 LICENSE="sun-bcla-jms"
 SLOT=0
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 RDEPEND=">=virtual/jre-1.3"
 DEPEND="app-arch/unzip
diff --git a/dev-java/sun-jmx/Manifest b/dev-java/sun-jmx/Manifest
index 06f2277a938c..34a25f8e6bd1 100644
--- a/dev-java/sun-jmx/Manifest
+++ b/dev-java/sun-jmx/Manifest
@@ -1,3 +1,3 @@
 DIST jmx-1_2_1-ri.zip 1624569 BLAKE2B 7262ee10ab49d7371da988f6f636c22e7ad8cc06bd61db5490659899424465f2ed85000d176e6dc5cb7631942079fde19cde35837cda677fa463cdf53c94780c SHA512 39c933ec39f3fcc631d6d8f3aa88724bb0aa11ff62dfbac61762d07c718dff4ba1e16b1b565c7aa1ede7d616516e68d0dbe8c227db34a6d30bd8f29880c7a5d1
-EBUILD sun-jmx-1.2.1-r3.ebuild 1271 BLAKE2B 10276ed4eee14b154aba8cd2871d5851924b59ea6704135c816419934d0810595c21703d11e96196078f2a20d803a117287d80f070a3438c2e5aa1c0b8084c41 SHA512 e4017f8d59106e954b3a379fda89f1156d020b8c6f27b82205fa46aa749d05e75a38b459df241f9225aa403afab174e9e8b51e2b411d9206849a424918f5d9c4
+EBUILD sun-jmx-1.2.1-r3.ebuild 1259 BLAKE2B 18c3213f6f2a692b2c796ac8733057db4c9ca1798618355913637ba8b4fa057dbdb2bc20daf31356e0f93aaaca4d007ab1cfe6489f36461a2b0952810afdb1de SHA512 4fb11fd7227ee9cea809a9822b6d1b899dc035663a15c0a4a739087295ffcbb4425ef389103fc0d4aa305e1e90b23c338ded324ddec809094a43b1d186ba9c8e
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild b/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
index 4966ca743969..12307dbd4772 100644
--- a/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
+++ b/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -14,7 +14,7 @@ SRC_URI="${MY_P}-ri.zip"
 
 LICENSE="Oracle-BCLA-JavaSE"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/tagsoup/Manifest b/dev-java/tagsoup/Manifest
index c925ebad819e..d416e92a44b0 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 1109 BLAKE2B 7bb250acaaf20efbaa9a0c77b1a34390513d1fe092cfe0db71c27fac88778a4728ea387fdd7fc4460dd9d371c21908c234d3f83fc18808549ec5fd20ee288b23 SHA512 e8d4a3a0c13c3f63280d31fc954f4028e4b77686da2fe9887598c26551918835f007397cc56e6b8c3f6e581cd4bdfed3f758bd3dd59b412403a69037157aecc3
+EBUILD tagsoup-1.2.1.ebuild 1099 BLAKE2B c77f5066d6aaac5ad22ee09d0f714afc808d4dcbaecc9506f58568413f23a012ba531b95c034dc8d70546c03e80e06f68ae302a2341d50e29d9e3e71da66a252 SHA512 a0cb991662cb75a51a10080ea82c3aa73ffba29d05e163a80ae4f1e488dfce20ef66b6477804af1cbd48a25bb7fdc47c5f19108d86126c2537187a52a1602e79
 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 7bbcd732b623..b31f93d18bc4 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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 ~x86-fbsd ~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/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index a9b6e9274ede..f68a8f3ce1bd 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -24,24 +24,24 @@ DIST apache-tomcat-8.5.28-src.tar.gz 5128929 BLAKE2B fe862a44fe57a50502b95d6f318
 DIST apache-tomcat-9.0.4-src.tar.gz 5073991 BLAKE2B 7efffbba395d78d5ab051dd2bdb7a1491cb04159421bec17deebcb901bbca5cfec67a651f8e1fcd9a394ba3e0650fc61e7da039f0f979ae60a87f477bc4bc3b8 SHA512 bb8777f6fff861a53381b15a4196053abd9cc01e080f0511032f69eb6f57f5c6ed0eafd8a94155f19a4654bce4fad39e0fcaa2e5473cb269bceeb46a2ea43557
 DIST apache-tomcat-9.0.5-src.tar.gz 5077379 BLAKE2B db345767f6c35557054c33d789fc40b1d2071501130bec57df41bb3fdf6f8be5260c0faed317b9fe6fa40474f9de1f29c6a71039eb0b7d07fee4ee0109ac16e4 SHA512 4d0b24dcf26b94f4280382f64bcdeb74f24b69b86b1410ad40d4a0284d6787809485f7c2501b66126d778a73a5c3eb155856ac6d3b3e2a477d1742d8588c1e84
 DIST jakarta-servletapi-src.tar.gz 65342 BLAKE2B 03674ca65e0cc509b04a6255d5dd20d26aa5053ed54588e9ba655330c56c9c523c5b382804aee9816cb9aa2ac19cccc1ad288ed06b2af85ba535854bc72bed73 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084
-EBUILD tomcat-servlet-api-3.ebuild 851 BLAKE2B 9c746f46ebda7ed63c25c2374e3b56e4d09c170faf2348f20897ff5935221d5a244498eb5d535281fdbbe2323ccbbb3671c1fcd7058a288926792bb354398317 SHA512 bfd11aea2c322478caf3b70ea098c9f3fe060e094fd52a81e0bf89e47db33374ae6a13205c065da5e21571269ab678f65f1f0eb0385704a54a955a38f243cef0
-EBUILD tomcat-servlet-api-4.1.36.ebuild 984 BLAKE2B da61c35c91151f3714592e412f21e75451b0455e699a5f52d33fdf177ff10af36129cf04467c42502ce8528bac9f33bb66f867bfd8eead03b4307e0f56082ddf SHA512 7c0ea4dac09a7d916213bc78c5b3824f0b34703810d8d6ab27fe43b2310b352dcd74a1178e607d1ef3f24af424354b6d1955013b67bd6419de4d0501e1825e63
-EBUILD tomcat-servlet-api-5.5.27-r1.ebuild 1408 BLAKE2B e85fb32e1837f8118fbd06ffafaa9fb4facbc0137d6d12689ec230c4e038e502d1ddd4b843b8db3c0d5a0aa0721ff4ea73a0c3ba6db643b30e1e5cf472bf3b59 SHA512 c40b0a1b9986b2a83ababe7cfee1b86da05ffbb00fc101771bdb8a90253fd57d7f80229fe833b3b259ad0388ec7bb06d393c9e1733f9113d9b3dd42a3bc70ae8
-EBUILD tomcat-servlet-api-5.5.34.ebuild 1421 BLAKE2B f8216cf7b3933757f8d0f1a906d6704acd133b4bc3acee4b064b2189327580f06160178e85221a134ec8a66c7b6c19ba87b55f2b7602dfc0b3759ef877c10fb5 SHA512 e34b2993c265d5340c7c48df3cf1f347601e5c8426a20086141c38ed2e80de0679d671c834b25b873e69ea328490bb1427ce320ecffeb607d383c6708e4805a0
-EBUILD tomcat-servlet-api-6.0.44-r1.ebuild 963 BLAKE2B 4c535b70c79c97db06b483d23cba3d8a1a7b81700caf60a76e9340f09ee695180c67faef8eb97b4748cfb5fcdc10dca4409f052eba0e23065033081ef7c76024 SHA512 13d4039bdaacdc91a678d67592ff6bbb407fe56955122bb8a7a5ad9368e1b848dedc14b57e0b5f9b7d583b64e553ea862d2e87e53cfbe5fe01edb394f4707dc9
-EBUILD tomcat-servlet-api-6.0.45.ebuild 966 BLAKE2B 5d6a7edaee6709eb57ea31b35bc002eefe40a05ead3e7ed0af29378496a1bfe8b85aab9240641f5169a0b3efae32f4165ed76e55d778b343b1965edff6c19b4a SHA512 c934e4d59c753eaa7dfbc6edd02344fef9d682076de0bbe8e1ff7c277ec6155f025b4362160100bbe54a38505780496e4b15a93b409c4208c6a9a60d07f8cbc2
-EBUILD tomcat-servlet-api-6.0.53.ebuild 965 BLAKE2B 79ee853118429bd20b1c08f260865f01ae250e1c2ce67c4a48b31f8d5e4dd5711ec68acdd07b127a900014ecfa77a1a75bd02345c66cbc5744e1f1b535bc6990 SHA512 2ab89d11d3b6eaaeaf677e48cbae4d09e313dfac63ac9296d5a3ad3e37a93f23a548c06d3cc5fb79da73e83d32f5fd5a6c9eec899aaea36ec90873993d8d3f3c
-EBUILD tomcat-servlet-api-7.0.82.ebuild 928 BLAKE2B 1bde5610507919c8ea5926e62d9f9e8a002e28cd0158847cb12355f9a7ec3bd5ac619f4b31c742e2f0e7fa05f0291f6d8a916fa6f7a121b2620a3138af224e6c SHA512 e620d89395876f3ec079b8793561bd2290a614587fcc3d8b4b251e04b05f3c819ceeebfaa923e414b86e8d3bbf3aa33e8668cf4ee681ea5e1e50d2b68503d341
-EBUILD tomcat-servlet-api-7.0.84.ebuild 930 BLAKE2B 7e92815cb0698cc4ed6c1e735098bb7a3ccdb41a76829c7f34986e98efe838b2832e20e30f156ad1ed77dee187d2b49d0bd2c528554ffc6aa6c04c91616eb504 SHA512 5c2bda0d5c4c4752de7737533bb18a36880131bf0b02951bcbc36e822e261372897b0bbf563d1c3996d480df6917595305bd3da04bb6394a646767fb706af855
-EBUILD tomcat-servlet-api-7.0.85.ebuild 930 BLAKE2B 7e92815cb0698cc4ed6c1e735098bb7a3ccdb41a76829c7f34986e98efe838b2832e20e30f156ad1ed77dee187d2b49d0bd2c528554ffc6aa6c04c91616eb504 SHA512 5c2bda0d5c4c4752de7737533bb18a36880131bf0b02951bcbc36e822e261372897b0bbf563d1c3996d480df6917595305bd3da04bb6394a646767fb706af855
-EBUILD tomcat-servlet-api-8.0.48.ebuild 986 BLAKE2B f326eedb07b5048e2e6b0231fcf98dbfe00d2b7a6de0892e6ab30be25b74d758a389892d74897cf8f59749ec77b3f6e68fa3a0721a428e991846e4b49335727f SHA512 477f040dbdca1c4503f94b0e2cdb16e2910d117ccdf473751c3af0670525db08f004beeffeb7b12c7cfcf8d603e0ffdf3ef0323e2e0632d8253e7dc99fda1292
-EBUILD tomcat-servlet-api-8.0.49.ebuild 987 BLAKE2B 6ab9e76fa2c44b3165d9f3305d049e723ce65a7ef762751b590f8feca31b58144a1ead453bc44a47af267816b443a4138582ca53486e2dbd3f01eaba5c6b10bb SHA512 794739859244ae76ca9778fbb412f20c0de1e191be7e47de41f6eaf041b109712b545cc649f71bed9a52a68c5855dc15b951dc901a475bcd7e3b6bfda14d1ee0
-EBUILD tomcat-servlet-api-8.0.50.ebuild 987 BLAKE2B 6ab9e76fa2c44b3165d9f3305d049e723ce65a7ef762751b590f8feca31b58144a1ead453bc44a47af267816b443a4138582ca53486e2dbd3f01eaba5c6b10bb SHA512 794739859244ae76ca9778fbb412f20c0de1e191be7e47de41f6eaf041b109712b545cc649f71bed9a52a68c5855dc15b951dc901a475bcd7e3b6bfda14d1ee0
-EBUILD tomcat-servlet-api-8.5.11.ebuild 1026 BLAKE2B 491898f79d1185a9a0c0580ca30936b5ccceab95eada32b7c12ba77f802bfabc92b22c6bfb253eb2346ab0cae1264c664b4a63efee67ec4b2c66d4cf40881386 SHA512 2832c7f1e4e310ba6e220f7f69529d257e77b655a82dc1cf44e1580032773d31edffdef902c99b139bd8b52b913d7aa1578af2860d5d1967332a5f6a86dff48b
-EBUILD tomcat-servlet-api-8.5.23.ebuild 1033 BLAKE2B 6c5d35a13ac371445d39b9359cf1ac917a7d8d08692d6ea730c1d4c2a305319eac90697305d6d1bd3625478d63af74c4c62f15b78b33638d1f3a5c8d2b328ba4 SHA512 c6c829d08c1b04a737bcc0519396bd97dc52993e33bdfb550c7dcb8e2e8cedba93123e7c852f6c7100f989c9af882b2ab2d81925ce545e95172dd7c3f1a75c5c
-EBUILD tomcat-servlet-api-8.5.24.ebuild 1034 BLAKE2B 56a3a1d3f53d267dbfa60bd5f87ea5b1ca9c0e48fc500592c8be4324f9a2c3b41e9e2a32c6c1507f64559fddffee8dcb1afe86bd2ae8607add8cd2e618d4ec09 SHA512 18f7cbbcad7c7d36b101d76b136040a54ff5a3c3bb6d12de1e555cfbd9cf590fa5a9a2b6c99a66912324ca45fb36d367628b8dd302b2b5517281a6c09e6bd863
-EBUILD tomcat-servlet-api-8.5.27.ebuild 1035 BLAKE2B ddb2b494d6148f56e06c9e0e500216ae3010493f4ea2301a0ebb23c82ac568718c88fb59c76112d64229b9240b270da7c18d8f24f72a537a8ce5ca252083ae70 SHA512 5160119e3907ce6560e1e9e826a1deae7867703c4bee3fb420e5bb1bc94f8f8edcb4cc30c61738e764d44dac527c913b93b24f3551c06b1d42dffb95fbf2b757
-EBUILD tomcat-servlet-api-8.5.28.ebuild 1035 BLAKE2B ddb2b494d6148f56e06c9e0e500216ae3010493f4ea2301a0ebb23c82ac568718c88fb59c76112d64229b9240b270da7c18d8f24f72a537a8ce5ca252083ae70 SHA512 5160119e3907ce6560e1e9e826a1deae7867703c4bee3fb420e5bb1bc94f8f8edcb4cc30c61738e764d44dac527c913b93b24f3551c06b1d42dffb95fbf2b757
-EBUILD tomcat-servlet-api-9.0.4.ebuild 1030 BLAKE2B 6bda3cd784afd3e70a4919028c0d03d521f61ae31591ae6dbdde242c81d60f0b182b9b27104100998eba967aa8b20ee4bac78e4ad9d98c5e3ae177811cad305e SHA512 ea50c666f43f3ab29a11ebddc060269e0650d9f87c4d06baebd1ec71c32b0235d6e2edef90ca0c04ac17a421a63b972d691e73d5dcf9ddda5cb5f5b5d9201ccc
-EBUILD tomcat-servlet-api-9.0.5.ebuild 1030 BLAKE2B 6bda3cd784afd3e70a4919028c0d03d521f61ae31591ae6dbdde242c81d60f0b182b9b27104100998eba967aa8b20ee4bac78e4ad9d98c5e3ae177811cad305e SHA512 ea50c666f43f3ab29a11ebddc060269e0650d9f87c4d06baebd1ec71c32b0235d6e2edef90ca0c04ac17a421a63b972d691e73d5dcf9ddda5cb5f5b5d9201ccc
+EBUILD tomcat-servlet-api-3.ebuild 841 BLAKE2B f046abedec62ab2daf51ab5f0a45ea5003cd505e7e2fc10b32ba6c46c5d6c844776ac6bbca0cb7b1ff4798bc1f87af11e7c4e25a5d5397a4ea427b16660aa6db SHA512 532299ee901a84368a297a4fc033c37e3bedab95853fe1856b67f883a787ded535ecd4add05711bd57fd6e232e110ce9ed1f2ffeb462d0b8551d807610bb8ad6
+EBUILD tomcat-servlet-api-4.1.36.ebuild 974 BLAKE2B 138b53684d8e667e00e805e2069d51188dc453140d91bc58700a38b531ed1ce226db4dcf9fe6b030d85670c1b7a04640b09ada55388a7b95b22a0c69ba25b04f SHA512 5d4d397f7c77823074e4b6088792063cdd3c9edcbcdca4031916bdd05cc49bee175825d366ad6fdb6980adab29fdda8636ec2304cfb27dfd9e7b93f2d6353136
+EBUILD tomcat-servlet-api-5.5.27-r1.ebuild 1398 BLAKE2B 2c306ffe33485118261a81834212e5f6845e96c91b08d1b78324c237d8277ae0eb6f8ccfd10b9f01e10ca0513e2b17577cc50172f80181cf0d96e3be3db05990 SHA512 30c63a9daa1bd517e36b08795b120e4a9922667de60b30890aebd65479ec75d7c70d59251988ed06b3ecb4f4ccb941aeac6a518434d5c262250401558fa605a2
+EBUILD tomcat-servlet-api-5.5.34.ebuild 1411 BLAKE2B 81fe1bf1b27e5d63eb26caa9ab6e2eb99f0c8f8cce173f3567db2f6a0d9332b90978dc691143c0a3d7c31520fce2551c5566f4d66e8f373bd5e2fe2d952e87fc SHA512 866e2ab524effd6ffcfafb2ce0642cbf3ddbcef457ed9606b30a0fab2efdfda67b69eceed3bf5def631b999f654113f962c2e49de8897a85dbf1a4a049ea1046
+EBUILD tomcat-servlet-api-6.0.44-r1.ebuild 941 BLAKE2B c253c51b56d719fc6abe9cc714ef2ffbc2e4dcd8fa1ebe61b77968cb15f8d8e224300c491e445350396b67713a0474598f6c8d761361b3d49c05411f29df900f SHA512 b0a47a4631bbfcc5986ed9f61565782aed2437e169210bcae2df459adcaf6fd9727133006701650735ace3d0203235f22b845dca2791abb79c0564c8ad03c764
+EBUILD tomcat-servlet-api-6.0.45.ebuild 944 BLAKE2B ec11ffa4834b9dc0966892c0d221640ec7ef75633806394b69b0bfa79d51728ba552809cf3c462d063198982de879a2acb32be2ecf5d5dd30d5db8eae60a0b78 SHA512 a9ec48dabbf5d7668c7e23b8e891faff8be25bd3f4beae55b0e8d95cff271ab81c03f13bdd2f127fe40aacb70f4db845452f8ffd66c82f4b11604d4cbfd46141
+EBUILD tomcat-servlet-api-6.0.53.ebuild 943 BLAKE2B c7b1a81fcb5f243e1888df39fc624a11385809ae602b4af2547b8a8a04ba4b1f4baf66703e9cd16ccf380b0dabe90c93b95c282c6605db03186d180a491c94c4 SHA512 d6bcfceea13c347ef6b467c3e2b18313465717d3c855c5011f3d5a0b130bc7a6f19c1f02eb647bdc328d16ceb8582ed7f3b68ca13c60bd29861a68700bb52e02
+EBUILD tomcat-servlet-api-7.0.82.ebuild 906 BLAKE2B 2169547e97371a8532c797f02e31ad1e17b04d2f03f7ab3041dac4ac1f23e699cdea60fb5779436d259cb3fdba6c59cd083d9cf4f874e8dad3f3194919c38c6c SHA512 ea84aa02351af9a21ffdad739619e1b8bc22b0978a03f464fedd7400257ed253040c2bd89be2749f00889f009988dd4083a5ceb81a89d3d6d5e8a5b6bfc07dbb
+EBUILD tomcat-servlet-api-7.0.84.ebuild 908 BLAKE2B cfcc0e873d630eeb6f43cff3cbc8d48587563baa299e4ef8550cdcd02cf6289ba96d4f70653c0328cee35898d8b560596d13f8fae24ccff9672a2b4ee3fa7694 SHA512 f670f2f7885177a3fe36088033f143673ed1b104877daad5f6c895da7e2964301e018e5ad80b5eeb5cfa2aa2e226a99fe034dc752edb133cfed758be9bbeb7f4
+EBUILD tomcat-servlet-api-7.0.85.ebuild 908 BLAKE2B cfcc0e873d630eeb6f43cff3cbc8d48587563baa299e4ef8550cdcd02cf6289ba96d4f70653c0328cee35898d8b560596d13f8fae24ccff9672a2b4ee3fa7694 SHA512 f670f2f7885177a3fe36088033f143673ed1b104877daad5f6c895da7e2964301e018e5ad80b5eeb5cfa2aa2e226a99fe034dc752edb133cfed758be9bbeb7f4
+EBUILD tomcat-servlet-api-8.0.48.ebuild 964 BLAKE2B 1b68372c27f23b04a1c042e7f689f32ce5b9a6b29d397cc94c41eab20194489ea551d66dc69e8e1689b17ff9a158d31387677893d22ba5dd759d5bc1dc78e780 SHA512 f7cb5af08726a44158c0ffa080737c2ddbd8f14f2c29768392af2a413fa0c98e87b5f96828c569fa34241e5dbde8857fa5790dfd69c347c592ce207ca633536e
+EBUILD tomcat-servlet-api-8.0.49.ebuild 965 BLAKE2B 8137fd074339a70166e04ecbdd631dbeb32ae21804918a65d79bd30b9790c54bfc9acffae5bfc6390b86d1b230959eba5043539bc367cafc0bb7f4eb6582b33c SHA512 f4e9c7c4be07457d48d8162a2e68c12a21289cc58b509cc2cc2570bd11a60d74ff83e98c31ed09a96a12e376eb22042a21ed08319a74c21fe6b3faa663bd4f05
+EBUILD tomcat-servlet-api-8.0.50.ebuild 965 BLAKE2B 8137fd074339a70166e04ecbdd631dbeb32ae21804918a65d79bd30b9790c54bfc9acffae5bfc6390b86d1b230959eba5043539bc367cafc0bb7f4eb6582b33c SHA512 f4e9c7c4be07457d48d8162a2e68c12a21289cc58b509cc2cc2570bd11a60d74ff83e98c31ed09a96a12e376eb22042a21ed08319a74c21fe6b3faa663bd4f05
+EBUILD tomcat-servlet-api-8.5.11.ebuild 1004 BLAKE2B c60fa1af6d8f0aa830b231315a425dc5388ef69916e583387d266da060ae18a4c9d9896b5cd39d2d99788ebac2bb1e60811e70e24077fd789991c23a9fa5e4d8 SHA512 867a52e39a6a74e8504d42deb6506842f1f87f3a70b0639b89fc2073f10b16d4dd6d3a375fde1ee5a91611acd70b04c4feeb02932289e39fdbb092041a4b7d63
+EBUILD tomcat-servlet-api-8.5.23.ebuild 1011 BLAKE2B 1e3d6f70bb2d80a52db97755b123aee55a26d22c0a6c44549fb54065d09da823155295f1f4a498e92b6f8e19086bcf11af84eec68319fa94b4199fdeaacbfef5 SHA512 34ccdf6994076a8f9d25adb7b3b908e84a1b9c8ba1346b6db034d22f8ae647a3f27f2ecf2ed8167293d1ce71501bb6dac04be4a48df797308a0e4e5feb6d45d6
+EBUILD tomcat-servlet-api-8.5.24.ebuild 1012 BLAKE2B 9b0a3428cace85369df81f0396d28a6d1a616be8d47702bd8a86fdaea6f97add9ebfd005e9834b39c48ab27767a2284bc2dc9d4299c80bc6f3b249639c593d39 SHA512 5f9c4742f04f8d607e54a7abd01d4dcaacd461a0751785f5c153d8547b20a70fe6c5d243a9d4f8c8f84c7d4230c05d66f4c8041940d7e00741afa11a952619f7
+EBUILD tomcat-servlet-api-8.5.27.ebuild 1013 BLAKE2B 1500538e35d723b1f5f78eb587db6169a531ae47c8cd66a05c19fddae518b4119ac84922100e840de84ff8cb647f974b55b3374b599560b62cfb1f743dffe18c SHA512 0f8c8fea52bfd4f9ef321a258e6dde507fa99a3d5d3626be1bc4c6972d3a6e57bde977d3dbbf3e5de3e3b877fbbb2ede8857d94e5cadd420a5994e21558a16c3
+EBUILD tomcat-servlet-api-8.5.28.ebuild 1013 BLAKE2B 1500538e35d723b1f5f78eb587db6169a531ae47c8cd66a05c19fddae518b4119ac84922100e840de84ff8cb647f974b55b3374b599560b62cfb1f743dffe18c SHA512 0f8c8fea52bfd4f9ef321a258e6dde507fa99a3d5d3626be1bc4c6972d3a6e57bde977d3dbbf3e5de3e3b877fbbb2ede8857d94e5cadd420a5994e21558a16c3
+EBUILD tomcat-servlet-api-9.0.4.ebuild 1008 BLAKE2B 315c88c9c197728d0587b70a6601d9bcf96d2b8a638c6cea32a06bf0d3e12161a6bcd2484fd4552bdc0e042a2a7a604e304636bea99e5f2f6bbf2f20b2cda407 SHA512 fe215a2c4c26d54748eff5a1250b65d16c2913e0040eb7b31295de9b4be46a84b725a8c34307db9211e17c77abbd7e49725c1ecd99519964d0995eaa30711fe6
+EBUILD tomcat-servlet-api-9.0.5.ebuild 1008 BLAKE2B 315c88c9c197728d0587b70a6601d9bcf96d2b8a638c6cea32a06bf0d3e12161a6bcd2484fd4552bdc0e042a2a7a604e304636bea99e5f2f6bbf2f20b2cda407 SHA512 fe215a2c4c26d54748eff5a1250b65d16c2913e0040eb7b31295de9b4be46a84b725a8c34307db9211e17c77abbd7e49725c1ecd99519964d0995eaa30711fe6
 MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild
index e598b2041c7f..3cefbcea4c6c 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 JAVA_PKG_IUSE="doc source"
@@ -14,7 +14,7 @@ DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4"
 LICENSE="Apache-1.1"
 SLOT="2.2"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 S="${WORKDIR}/${MY_PN}"
 
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild
index 0e5528db2026..e4b85456cea1 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 JAVA_PKG_IUSE="doc source"
@@ -13,7 +13,7 @@ DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4"
 LICENSE="Apache-2.0"
 SLOT="2.3"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 S="${WORKDIR}/${MY_P}/servletapi"
 
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild
index 959d50adb8db..5fcec51d736c 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils java-pkg-2 java-ant-2 java-osgi
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-5/v${PV/_/-}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.4"
-KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc source"
 
 DEPEND=">=virtual/jdk-1.5
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild
index 092400c6f849..88034e482586 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-5/v${PV/_/-}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.4"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc source"
 
 DEPEND=">=virtual/jdk-1.5
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild
index 4aba63da9699..8ecab83cc461 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.5"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.45.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.45.ebuild
index 26121ea67adf..2fec3f8c4603 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.45.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.45.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.5"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.ebuild
index ef08f2239026..f0f2a14f33b2 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.5"
-KEYWORDS="amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.82.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.82.ebuild
index e698024957d5..8349619ca6c6 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.82.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.82.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.84.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.84.ebuild
index b0fc5f672cf2..f0304e00ca2a 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.84.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.84.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.85.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.85.ebuild
index b0fc5f672cf2..f0304e00ca2a 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.85.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.85.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.48.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.48.ebuild
index 776cd13fd833..8a7cc91eceec 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.48.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.48.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.7"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.49.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.49.ebuild
index 71c284a0ed23..be4a03387b4a 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.49.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.49.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.7"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.50.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.50.ebuild
index 71c284a0ed23..be4a03387b4a 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.50.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.50.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.7"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.11.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.11.ebuild
index f8477cac7dfe..078f1e2fc734 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.11.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.7"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.23.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.23.ebuild
index 9ac5da83d4b9..e9d9db39df04 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.23.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.7"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.24.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.24.ebuild
index dd1e671df369..06c703b27fb1 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.24.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.24.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.7"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.27.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.27.ebuild
index ee8c1d72fb55..c543bdd19c25 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.27.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.27.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.7"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.28.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.28.ebuild
index ee8c1d72fb55..c543bdd19c25 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.28.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.28.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.7"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.4.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.4.ebuild
index 16548ef959d5..f00a9f12c2d2 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.4.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.5.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.5.ebuild
index 16548ef959d5..f00a9f12c2d2 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.5.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/trove/Manifest b/dev-java/trove/Manifest
index 3032f81592ce..6064f06e6989 100644
--- a/dev-java/trove/Manifest
+++ b/dev-java/trove/Manifest
@@ -1,3 +1,3 @@
 DIST trove-3.0.2.tar.gz 5880161 BLAKE2B a3dbb6a967ad9a519bd04abbbbf9e6af483360991956ff79532462a9ad471d409744017a3b24e4a09d2377243406e5d7cd542b452da8f59a1a97b454a2f60a8c SHA512 27460a66bad6f206eaeae02453c94333456db5a9c566246d495fb4184d42de6033b66d1bf74060f799cf4298d531afeb9597b92da4e2963b43dd4ef072ee750b
-EBUILD trove-3.0.2-r3.ebuild 816 BLAKE2B ae12dfcb6783629e600349417933dc3ff9dbdf6d77c98d62ee7acba89d4e79a2109dac6dca5e82636bbe0f28c9684a03a605dcf9678cf301c8c7c0073b7c9a23 SHA512 ea9d16c26390c80596cbc6b018fd0d12f1991635a7ebd941073d9a089bdca270aecf270f0eb2871e507ebf7bf500e68605d7438a89f0c5b6b14908f8d2ba18d7
+EBUILD trove-3.0.2-r3.ebuild 804 BLAKE2B a45abfcf97789427544d1b181d6f1b1d1ae5b282ff6e4037ae7ccd4698d99e4d1d39a32521fbe7fea573b816428246c107e4684161eac702d7a947dae4702274 SHA512 fa0cea4d9739bbc1f3624de5b9032822b14c787321b6317b0ee1d078eb533fdedf053722b9800b532bdb93ec5647e28cc2d4f543d79bc228e34549516c3f9f48
 MISC metadata.xml 313 BLAKE2B 033a387e2850f70d371e4362736a66f796d8aa33ab9c46dc4d49a919533c0d9f6cf55588a58ae3d9a413cec5c98daaa65530e095dad86154d467a1749cd02b59 SHA512 8d83dca7ca9717cd91fab6805a9ec4fdab65161643d583cfe2134fbcbaea07ceb236773e88365b137a6e2fb5215c821f54955dd641d0037025b826d29ec0d2de
diff --git a/dev-java/trove/trove-3.0.2-r3.ebuild b/dev-java/trove/trove-3.0.2-r3.ebuild
index 08317df94524..2fb1f501a0cd 100644
--- a/dev-java/trove/trove-3.0.2-r3.ebuild
+++ b/dev-java/trove/trove-3.0.2-r3.ebuild
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="GNU Trove: High performance collections for Java"
 SRC_URI="mirror://sourceforge/trove4j/${P}.tar.gz"
 HOMEPAGE="http://trove4j.sourceforge.net"
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
diff --git a/dev-java/txw2-runtime/Manifest b/dev-java/txw2-runtime/Manifest
index fa63c6fa0a26..5a50ab91ca4c 100644
--- a/dev-java/txw2-runtime/Manifest
+++ b/dev-java/txw2-runtime/Manifest
@@ -1,3 +1,3 @@
 DIST txw2-20110809-sources.jar 96939 BLAKE2B 1f132eff17058b833d4b1e55930c2aa0bc5bc6a744dfa68daf83e07c9babc6a0298deff57c19e178fda6e618e0adbbd3dda98246af3cf55829348cbc239917d5 SHA512 1f0779b0c0f38a0a71f495a6167876fa7df1de7a38343717edcc50d54df45c98c47eeed30c692de68e9c9a7f217cde463288e73a6d274f732578550220c27fc8
-EBUILD txw2-runtime-20110809.ebuild 588 BLAKE2B fcfb52bb977cd8565518618d2fa39d20a86d3bcaad76947d4296647fa224e11990ea1bec061d4d67dfef59e64642d908bf381afde8f5ab6897e665474c262e07 SHA512 da8a3b1c60122a144c9b90383eaf9cd95f4893b83b722c7da1c3a51cc398722e8f48faa17795a2d37ea16f648c1ffabd0a8698a38254d32280a62ce1e40e57e4
+EBUILD txw2-runtime-20110809.ebuild 578 BLAKE2B 439f995592ae3240688c27216dd28dd15341769180d05cece561e3255f4d79a6f4ad84e9f121e667d3ad7961683c6a598ef7b172128011b47b44191aa6c4834f SHA512 5b8295c11c2fd42ba8a814963c45aab5d33273830b223db683d4be53a6daeb0f365590ae482d8081f82487b0f5ad5ccb0619ac9408eb12444ef5dd5234bf261d
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/txw2-runtime/txw2-runtime-20110809.ebuild b/dev-java/txw2-runtime/txw2-runtime-20110809.ebuild
index 331a381bf865..b3e9baf6d521 100644
--- a/dev-java/txw2-runtime/txw2-runtime-20110809.ebuild
+++ b/dev-java/txw2-runtime/txw2-runtime-20110809.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="http://central.maven.org/maven2/com/sun/xml/${MY_PN}/${MY_PN}/${PV}/${M
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/werken-xpath/Manifest b/dev-java/werken-xpath/Manifest
index 59511672038a..09ad09addb20 100644
--- a/dev-java/werken-xpath/Manifest
+++ b/dev-java/werken-xpath/Manifest
@@ -4,5 +4,5 @@ AUX werken-xpath-0.9.4_beta-jpp-compile.patch 1189 BLAKE2B ae2c82957a0651084f918
 AUX werken-xpath-0.9.4_beta-jpp-jdom.patch 3606 BLAKE2B 619f023176c841c876a7d0e7fd181b686a2d42b815ea3caa7973ed94bfe8ad5cc1264890e5032ef017aaa548b317c28d9e709101a2599ccee5bca9d5b65081e3 SHA512 de979a742d7d8f7fbcc68613ba4697fc4a4dc7d146d86712d71ae09c4e0b6f09c27361bd80743534aa5f2e864def2c5b8a09bd1d6fa2e15a852b74b73ff616c6
 AUX werken-xpath-0.9.4_beta-jpp-tests.patch 353 BLAKE2B 2b941351292a8fadb8b48ad3c3836cf9420db30fcf1a449a9d53aecd7f724ff76d7cbbf80fddd7330adbf3a7d98ac42b6ed3155a4fd266e1f01caed1fcc1163c SHA512 80adb52ad882970be6177cd1f8ea3ece8fbd3388b02b1c1766f3c5c869c42e358be9682fdd4a189225158d75d59b558ac0cfe55d8e9530de383ef86b654c99e4
 DIST werken.xpath-0.9.4-beta-src.tar.gz 1652916 BLAKE2B 4dde7f4be8c4cf401d1edb69b96d6ffffd4c3d53c75194db04a7351ee0ffd90d94bc59855d14dd45162cd2f4b29b02b373ecb4f7a00bf267ed58e2c1e7aece33 SHA512 c58878ee0b6e88651335e2be60d0afcd65fc164864e826bb209ec660e97315233b25341733a4118ed3ee003f61998d84e480706bda5be4630c599efb616b845d
-EBUILD werken-xpath-0.9.4_beta-r4.ebuild 1365 BLAKE2B 8c24a5bb9dca19d891fd15fd1501313f71bddeed5a8df8ad0d542e8dfc583f487fbc7487cf81c1a034247f5eabdf9065437d4e97feb21c79d386ba494b8142f5 SHA512 6e9fc5e7fdcb64d6177e8ae57a836c2c0ae5f0379cfe9175dd898631d1f42c6abc5ab2fcd8462c2b3b286a3f90976eee473c9f1045da4415de9fcef65bc43792
+EBUILD werken-xpath-0.9.4_beta-r4.ebuild 1355 BLAKE2B 24fbe9aa3e66fe735ce9997a07e7cd0c85001aefd1cd884cf5b30131cb59591024a799953d17b45efcdca4dd7ff5ac1212066a9ab8b2ea61359f707e7de05cda SHA512 9872d9584539c631629f213e60fae1da24d96487dba38cc6e1fa818ef585ec07767b4415f771c4890b76ad98fa06d9274adcf24744a38c06e65857d974358270
 MISC metadata.xml 318 BLAKE2B be2cb60066e3fbccd9201112d37d447b49de3fd37a9c42a287f0b7f7b7466efdbe9c179f0ced41d7af9b0119be17328a234997377dfefb481596355fa1c3838c SHA512 64e77592f9351e55f3775ec892c2d0b6967ddd0f98cac9ae4b75f023cf24be1cc3df514062ccd5d247f8202d33b71965fb09878dee0c07edfc84734cdebe11b3
diff --git a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild
index cbba64656259..904444297829 100644
--- a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild
+++ b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ SRC_URI="mirror://gentoo/${MY_P}-src.tar.gz"
 
 LICENSE="JDOM"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 
 COMMON_DEP="
 	dev-java/jdom:0
diff --git a/dev-java/wsdl4j/Manifest b/dev-java/wsdl4j/Manifest
index 7977edfcb8fd..cf45ff4f8943 100644
--- a/dev-java/wsdl4j/Manifest
+++ b/dev-java/wsdl4j/Manifest
@@ -1,5 +1,5 @@
 AUX 1.6.2-tests-sandbox.patch 548 BLAKE2B aba74bdc87f3a35b46a80e20968e926f604a2dc13bfd48569f62fc72b7c8e2bbcb5df33af712c19a548a8c9668195cc340be92fa60e21ab36b0ab0c089de1d23 SHA512 bed0bcf00856309d8f628d4a41774a112bd26c651e9fdfa00af3113d780f430e6b50213fe0f743b486aafb78f11cdd924c4dd8eef64300715a8e88c64c11368b
 DIST jwsdltck-bin-1.2.zip 599377 BLAKE2B 0f99dc93a1b22019c572fe55585ee285c72e1dabcecc5cf93fa635b12a39a43686f0ff704a0c9ea25c682a882c4580fd82cf2015a9d4417dd28bc87d0b32a670 SHA512 a8f86d9895c588d752d266413e77c2a8db241e9cf9c199909f2e9d1d1b3b1b03eaa6b5841c62b0e7a7c779089eb6721797fdb4f2db841789a6a19884bd48711b
 DIST wsdl4j-src-1.6.2.zip 172400 BLAKE2B 96fa6a9098993ba20a277004515a4cd29bae84450b86398ceb1dc7835f14f17b39e5daf87d557b4378860c9d24e5928a80bb30b2d953fdc8fcae7d97ae8454f5 SHA512 55d0b8eb6a08cecd4a48223a9f29fe6ed0e00ec4dca99f44a04882efdba448601bb7dadcaa347e32e3ff5bb9e3334503d6666ca2a6276c7bb48b80acea57b751
-EBUILD wsdl4j-1.6.2.ebuild 1381 BLAKE2B 017866ef6c86dbc6e1c3aa1cb41e2f6143970d74e9487ce2162a6262191689ce811bb7b3c47203f22d6f10061091a5219b892499e77e99010b6c2bda82701efa SHA512 b1f58c256f08867fcb121d87465b85360e1bf3df8b9b9a9a326dabbda3f37f084ebddf1f7d394199b9ed261221d9968221b1d95c9c05ae807022318d8725289b
+EBUILD wsdl4j-1.6.2.ebuild 1371 BLAKE2B ca28607dfba6645d0ededabc467f23475d360115da915403df30ecab744874dc9e7d08226669a705c22c82ec22e99efbbcd440347040fdabe40db129537f0ad5 SHA512 f339b3a0f0fa57b26d0d726f8578d95c93e2f977a3b3092f345e3bc273003519f61b40bf13bdf1122d3619ed45221219b2dec773cdbdc0a7511b021ba2ad0a47
 MISC metadata.xml 314 BLAKE2B 0148774951355ef90d4345572a6a0fecfcc8340b6fd88ed7a18f40b719844e1e9c530b0dfc4917f9b11640871642e4cae06714f7083161136efbe56b2c15caa4 SHA512 2d7d312851cbed77b5a2156bb5d157f8f8fe911ef9c4eb16b645ca4b17892a7d70a02a9d07f8c36fb92a285717c68718e798d37eb140f2391e4ab828a60110fa
diff --git a/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild b/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild
index 2f661e8a0a81..74cb113f87d8 100644
--- a/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild
+++ b/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 JAVA_PKG_IUSE="doc source test"
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.4
 	test? ( =dev-java/junit-3.8* )
diff --git a/dev-java/xalan-serializer/Manifest b/dev-java/xalan-serializer/Manifest
index 21f66ea37840..fea0314a771f 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 1209 BLAKE2B b3ae0be23035ef8652aa45e93457c3ee81c5779dc34606b9d3bb9b0980676f31c4ce04ef124bdfbb3c4c647dbdb53eb0c03759d538c882ae3bd82ac3445d05af SHA512 ff27eed7dfa82877cffa795a3fab8f36262bcbd5c8589fa61903fa639f9a5b2a78c113f63bfe278ebd3e512157185ecb95e0f78852947f9ebbc5dae822f228e5
+EBUILD xalan-serializer-2.7.2.ebuild 1187 BLAKE2B 1eaa01ed3864bd624ebd7a78461d23ed8705138ccf23d897cf4490d23210240f7e274b972ce488d1086b62a486be3c716ce72c8b0d413f40e5259fa85e2dcacd SHA512 69e2910d0284fbde84f3802ee30e179f788d43d81d2816c70b8729ddf6be3a0dc47bb3429161d32797754ffcfb64849dcfc6d8d09721f84f247cc8b8ae74c135
 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 491f657f50a4..db89ae90c1d3 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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-fbsd ~x86-fbsd ~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 39a26a586106..7881f925af05 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 1855 BLAKE2B 1146f8426d12a2af8b816e088ed86eb4f9a447b10028522001ece6a3b5ee70b3d066fde11655bfc7f7d4d7ca79d418b80bd647fc4c0eeb0ffb2df512d50ee492 SHA512 a8621bcad246f85f541b58264845a021feb075df74834c5be2baf6efeb59a03c671d96d5d6f31d527ffa2c1313212f181ee6005c60a2a3bdff86e3a9da2f056a
+EBUILD xalan-2.7.2.ebuild 1833 BLAKE2B 7a390c747ee190010b9884b7d8c70497595eb341a31b1b6e85b4fbfd6e880d6c6f670e9e6018f64647fbb781ba11f78c93d87d1c5eb708ebf55aaebcb64251c0 SHA512 eadca11ef9dcbec73a8f6a048fb518d6fbe6f8c8976ec37c71d014d7acbd640baee7a8422ab2ee7db38f280fe96019619989a109f35e75f45cc3c2fee0625018
 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 7bfef0809066..d5c0c149b9de 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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-fbsd ~x86-fbsd ~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 691584517079..242b0ad063c0 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,5 +1,5 @@
 AUX xerces-2.11.0-build.xml.patch 1685 BLAKE2B e7fe7be5efe89a5c6d19ed885e0a6ceb8acdafab6137a320b7733d37768d3ca19d301539c1e750353fb15bc4dd3739f52cd099d92479ac8bdd7a995b1356e53d SHA512 e0b1b195104d65e12a25fb6f6a39e8de5f91b1c258b8cca18fae781802e20fe0cdfe4049968ef7411a2f18aad3ac562f655dbb57b62b5b502ef8ee3a1f3f7db7
 DIST Xerces-J-src.2.11.0.tar.gz 1792762 BLAKE2B 84c82834cb0c5f97b90190378d51b438c2eac4a7a92921ed5c6ea330d3fdcfdef45c3540d181f2ac26feb58c390dc3a327fe49ef527f88b4e0f032c43c0baa43 SHA512 de2a3045f9aa87386527ab4055f1681ed85addee3a35b4fe344fc7b93e60d7db051df636c732172256ed130cf3055dc01940cd2106a8046aa06ee6e14e5b0411
 EBUILD xerces-2.11.0-r1.ebuild 1528 BLAKE2B facae44fa13b7c1fb5faf512969ed4f026d9d236d10d8a51f56f89efaa95e569cdaaf1f2257acfa31cf3e8b31aaad159428394e8166b4ba408030b85c4274258 SHA512 d5b7a351bc08e75185fca0f63298887906642b09e57172e41e7ddad0f001954ff8029c7366416b40a8a71d48d7e2e15324b276c0a2176e7db3eed33c7a158027
-EBUILD xerces-2.11.0.ebuild 1668 BLAKE2B efb7aaa9931d8966333cb12b28cba6933d4163af583472d489137894b5044a83192ddfbaeee819ba9a60680d65e97749537026b5daf2c8d2737b958bd6c8e88c SHA512 0168c64bb8b9b6186f5e2ac45ca3c49c8ff774fad5f2bbed13ce37dd96cb30312eb967c83f9d635a52f18fb3a523999922e4599cc479a5fbb8ac08551697fd59
+EBUILD xerces-2.11.0.ebuild 1646 BLAKE2B 58ea1cdd93ca0a65fd4dd1d3d8d6f52addf69f70e71bff5c4ae1226d0b9e82468dab3a9b7a9a48e9feb4e90eb84ac53a1934e288d3a37d334497ad9bdf42660e SHA512 63dbfdc7236c78028157c902f510d386b1dfedb66a32bfaed3f9a5d09c227d722b36fbad9391f1cac3881ee0f60a54755752bb6fd9323808ac47e5397fb871d1
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xerces/xerces-2.11.0.ebuild b/dev-java/xerces/xerces-2.11.0.ebuild
index 005197c35e05..ec1b7dadb09a 100644
--- a/dev-java/xerces/xerces-2.11.0.ebuild
+++ b/dev-java/xerces/xerces-2.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/j/${DIST_PN}-src.${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # they are missing from the upstream tarball"
diff --git a/dev-java/xjavac/Manifest b/dev-java/xjavac/Manifest
index 25dfc1dc36b9..7e0ec4062130 100644
--- a/dev-java/xjavac/Manifest
+++ b/dev-java/xjavac/Manifest
@@ -1,6 +1,6 @@
 AUX xjavac-20041208-build.xml 1088 BLAKE2B 45fff43f290db1e415427a3558556bfc89de78b59fbd8dc8794016c600de6cac64c1cde973925949d383f4321c8c85019e799d775a8262876e02b9692f4c5d2a SHA512 5ed5cfe711a4666d2db2dbe91ba8ac0d1dc9e95cf5be82891382632db6e4a250775aabbd38111134d82a09fa9d7d81efead52256e7511a726144689e1e389469
 DIST xjavac-2.4.0.tar.gz 2472 BLAKE2B 4693c2fa74a2951909ff6dc55638e7f3de19fecf82bcfeba0abfeaff82f941ea9d02dde3de969e850da9c5bfc98684b0a34be391d6db6c3fe12de0a734137afd SHA512 6a12c605f6f455f20981214d1ce8ed752070ae2b268e9279692a3b05921c84857636055d9c4d7b1de92bafbaa4b528f36983dc2eca0ca883a7fa340320e503a0
 DIST xjavac-20110814.tar.gz 2217 BLAKE2B 2a2faa87f958c1a089ae600798eca190c7784f5343887fd6236447e433f500bf134f9241dfd98aca4a1a0223811f9a426c0f7a3c73c4b7c4fd6c682e30561cd3 SHA512 f4c5aa437d135a8495c926387df68df8f47878e206ea8f279a7c3e8e32561dbac5a8c8002f77a2bf03863f42475cad5068e3c1031121b64b32fb4d15242c3b3e
-EBUILD xjavac-2.4.0.ebuild 687 BLAKE2B ffc2c5170b9cb0c32f9ee2a20c9026c7855dff5632cd7068a6cfc274eb7df09ce501ef9b47aaa09955bfca5cf1d97a6ba835adaede7db13ae366e841d9937976 SHA512 6b52646e16234ee987ece0ca0e2aa84790fbba7749c2f45106ad4eea9cb3186ed32c6a1c34c1ad9c762829cdb844e582b570a7fc6de687263c98f618c14b1f34
-EBUILD xjavac-20110814.ebuild 974 BLAKE2B 1bae9b4e5f83759c192e6a0598ac1bb8495b5d4a94c5fa287823cc66cb52e9d09776dd087bb9eaacc28714ccf8aba16a8db50cfa2a4a1a331fa6c1b88e43174e SHA512 2f944d2c21ae10a46e8d8780383d2e7dc5043dbd631aa0ef2b8c9d77df703ef71efa2978088ede40209744b6b2e2774df09de1d9b29e6d1091b1cd4ea267ec31
+EBUILD xjavac-2.4.0.ebuild 665 BLAKE2B e700eccc7deff99e5121184a349cb8a50e9ad364b78091e8fed10d2955a41919ff469b34539d30ad80407b41f15ac6f2ccd65fdb8899c01b8526dcae5fac9eff SHA512 a9c4908b869f9a6bf7d954e2e197e10f377a3a249c503147821a826767793ec9191fcc788408b183f85fdbcbc58a6e926b5718e5f36bcecf37c1338432d8af47
+EBUILD xjavac-20110814.ebuild 952 BLAKE2B f143d3429c9eaceb2948303ad39947d0dc2caf2a85a2c7cbb5d80b4c4e2f44c5f6b1dad864b08d57c4491794d55e4a62b60980216614692287246d701e2bd2c2 SHA512 f9323cf655ac2e5328255732a4267062757b4205f49301e76386ebb54c4b7234088c2a8961f48ca880742bb23a10ab3c97b3a84f099fe6aca15be1137c2b5981
 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 a2928dde6b81..8198e0008d8d 100644
--- a/dev-java/xjavac/xjavac-2.4.0.ebuild
+++ b/dev-java/xjavac/xjavac-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="1"
 
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~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/xjavac/xjavac-20110814.ebuild b/dev-java/xjavac/xjavac-20110814.ebuild
index 5a55a02f7b9d..9478e4db552b 100644
--- a/dev-java/xjavac/xjavac-20110814.ebuild
+++ b/dev-java/xjavac/xjavac-20110814.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -11,7 +11,7 @@ IUSE=""
 HOMEPAGE="http://cvs.apache.org/viewcvs.cgi/xml-xerces/java/tools/src/XJavac.java"
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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.4"
 RDEPEND=">=virtual/jdk-1.4
 	>=dev-java/ant-core-1.7"
diff --git a/dev-java/xml-commons-external/Manifest b/dev-java/xml-commons-external/Manifest
index c95ed526a65a..2cca0a362680 100644
--- a/dev-java/xml-commons-external/Manifest
+++ b/dev-java/xml-commons-external/Manifest
@@ -1,7 +1,7 @@
 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
 DIST xml-commons-external-1.4.01.tar.bz2 683486 BLAKE2B 4740516a09f64811a134b7de8309fe0ae803f7867b0cdf3391211297bb9d0dada6010f03f2cb5d0800f971bf1e47356ee163eeb300e49d5db1c6b7adc96f45fb SHA512 fe22afb25e17b69a5416025ea812348af83474c26dcf88613ebc7b5f1288af9a73428b3f70544907afae4ba9dacb2aa7b8e5e2375d0aa712fe9d4e672d2e02db
-EBUILD xml-commons-external-1.3.04.ebuild 1166 BLAKE2B d691d919f8363dfec9f09821d910730486ea3dd38e6795c95d2fcecf3e65f117f3a0d86c7cc85d7403f274bff3f545350ed42d4af59948331f8edb5d3da93dc2 SHA512 f5e30b83901055987f0285b6f68afe230fa9d9b55cb79c6f0bb4d5ba3edf1eea40c774606e3330c37a519188a2fc018f56b6f913605d2a0063efb898431ba925
-EBUILD xml-commons-external-1.4.01-r1.ebuild 786 BLAKE2B 63fd0493b024b0e36adb0f957e971ed5f99b34c6d023fa36f51ee9acee30cf39f4efc487d1c1ecf3e66d7cc0919ee7d4680bc73b053f6dab0111300443cb3f1a SHA512 9358a2de4547563972a2ef01e7807f64b58b2e34bd865df706bccc68b078658ac38d69acde3f1ce825ead3ba5e7d4733acd6caaeacb6cd955dde869e14e7c9fd
-EBUILD xml-commons-external-1.4.01.ebuild 1200 BLAKE2B ba6a09f1aa64a6b7b1ff67748e09cedeac151b19b08a5cc34e2fea28491beb948833f5aabdffffc3ea0f1774b18ebd62e2c924352eade149af0b84533eff1967 SHA512 638edb9a0cbe856d47c5bae56e63f93bf586f0550c4e2f90c7f5f8a8c138aa986bfc4f70e86d2ec6c3656de2583331b812e285e4ff2c75209bd88d80603e0359
+EBUILD xml-commons-external-1.3.04.ebuild 1144 BLAKE2B d3577d77d6427005664032cff36d25f003119d4a7971dd927978eef4a1cc4da35af887de41f4ce1850fb28aea92fb124e31ed009fac31549845c63d3bfe01abb SHA512 60e8b31be585d7391fda39a4d0485c909c2bb121c5a034a0eba0c37dbc8baec6c5db6ac0584826f732b3148da37f72c0a12017417095e44f0f5e2d68ad136a66
+EBUILD xml-commons-external-1.4.01-r1.ebuild 764 BLAKE2B 0575c2815534cf378e89545687c78f2a7487b2d16b9cd991ff8e8f50a8166a8b7524b9b25dfa3d1dc649d501b0971798a62b1d085cb9a2ea57ade1150e7ea351 SHA512 3e355a0090ef8ee0206e423042674215678b5aa959d6018c1aa979cb5eb50dcc72218f45395c3502173ee1c1459f07920b1213af05ba1fd07b4994ecb3f54a68
+EBUILD xml-commons-external-1.4.01.ebuild 1178 BLAKE2B 08a88f7f4dbcf15923c6d60dd353d1d85b1de862f5bd76923c0aab2387005ce1df4c6ba0e59bd8f6e931c64329f6686c150419ca46974e7fe0bc9d41b24a638d SHA512 7bc375cb06aa265abdc1e41a7f66e0a027eef4d30c1b73e5aed8dcf6471e02f2c600c137251b05be63cd2eb80e2a384fd9bd9fd219d0d0fd86ca585bad99059a
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.3.04.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.3.04.ebuild
index fbfdc64ec8f0..75fdd102a0a7 100644
--- a/dev-java/xml-commons-external/xml-commons-external-1.3.04.ebuild
+++ b/dev-java/xml-commons-external/xml-commons-external-1.3.04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 JAVA_PKG_IUSE="doc source"
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1.3"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~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=">=virtual/jdk-1.3"
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 abaa3dba7f39..864f0fd76e94 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ HOMEPAGE="http://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-fbsd ~x86-fbsd ~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-external/xml-commons-external-1.4.01.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild
index 5ac7fc5228ee..9e500334ce00 100644
--- a/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild
+++ b/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -17,7 +17,7 @@ SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1.4"
-KEYWORDS="amd64 ~arm ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source"
 
 DEPEND=">=virtual/jdk-1.3"
diff --git a/dev-java/xml-commons-resolver/Manifest b/dev-java/xml-commons-resolver/Manifest
index 41daf94b4609..09914b63f8bd 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 841 BLAKE2B 66b3bc02f6db2ef92aaca31fec1d0967a340c175df27edad7a4b6de8809ed102b4a79a29d9a544cc9d91721b2199419da35a9d9f444871b7206de031807a63f1 SHA512 fa44d9f2324f1557e577d3a8fde1827e4c4cf413cbb24b7be8a040daa97f233fd5b2fbf8290761dc92b344667bea6b2c4ee849e181084a66a777818c23c16a74
+EBUILD xml-commons-resolver-1.2-r1.ebuild 819 BLAKE2B bf72e8529e04df92e120bdc53da0469b64fe5fdfe8e3c6d3f4e2641179247fed901a99136f99ac0850323e2cbfcd36fb500d3fb031da64dab6e547a6b85d12f7 SHA512 03e429403c1e8104a090ad5af0d32391a8a80a38dd0b019a5a920c6a6db79ae56cd5277300cde55b6840c89a9841fd1c95f7ae9a07f38a0ec294f579afd0e63b
 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 37722277ad12..f70a3a4ec7f5 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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-fbsd ~x86-fbsd ~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/xmldb/Manifest b/dev-java/xmldb/Manifest
index e69b15009f97..c1933f10f66b 100644
--- a/dev-java/xmldb/Manifest
+++ b/dev-java/xmldb/Manifest
@@ -1,5 +1,5 @@
 AUX xmldb-20011111-enum.patch 618 BLAKE2B 2e75eee88aaf768cd8394e82313448c6f0d5840fe5139dc9301cbd679b8ee05521f0e85b5e47e26224a06a2a5b1f88102592558d8677a560aa74edb66a1f61ad SHA512 5c9649f72dfdcdc054f11fdfd055b46e1b0d84949cedb1c29a8beafd05056c3a0206a38e3f022dfa83262f9a4a85b0cded7e3c899e207f51b31dc47cd2f0246f
 AUX xmldb-20011111-unreachable.patch 301 BLAKE2B c5cfa08eada500432b1c0d35ba74686727b6fcd8c8675cff9b2b2833e26055bb39e2586807e8f3099d49b83de074eb15387978f247bc5d01197d7c2956564104 SHA512 5cb8ee4323596b427fd15a1c0764ebdf377c7acc5a2111c17dc24b826965d61f4e576885dcceca600eb5dd850cee9a98c48f4b3fe5272f7f9d4558834e451786
 DIST xmldb-api-11112001.tar.gz 36553 BLAKE2B 458c0d043e47580776dc9348fc650c135d14c316ca4f5722d30c753e222e5b29cc524d962daa4729bc9cfbbe0adbd5519735e6333811bf202575d375cd3971ec SHA512 20123801a57b5350ade4dc82aba5ba2492cfbbe2e0389aaba4b73cdd3a8d07981a895ec2318885358102e48644cdaa30a18996ab9315891e506506fbc25658a2
-EBUILD xmldb-20011111-r2.ebuild 980 BLAKE2B b3f54f2175b1b6f72f5ca504e2c5b3d986ded5d8c8758f40f22f7eb76e32461a85a2f336ccdde182b461e20cc9f579875784ab7bdd03db6f6304659a39948893 SHA512 58eb339a42cd6e5ec413e4ffd826444862a54be859cd02fd5da816a8bfcfb85d93934a297ac25b7b5cb2fd3860912055ad17fbdd0fb49f855f23eaa69018cc42
+EBUILD xmldb-20011111-r2.ebuild 958 BLAKE2B 2c13db66ddec83db16da9ea343a5f42143d69720afb2b0963debb603be579c9eca314964403fa9e3f883e9ec0a6897ebc020d5d8444ac15400f4a427df7d7280 SHA512 f13d0421d61030a1d2b7de2e76ac7f6883adbc3bff0aabc4f0bc9efddc879c2391bac811fd13483b102a820cc0f2e2f2e3f32b3407291592ff16014a2d7cdf08
 MISC metadata.xml 594 BLAKE2B f5ba9a86091967e5f55fa090e3b6816919bd98a6ce0fd4f0bcc3cb8a5e474867b52cda19bd30bed1f3f215235134c9e842d2bdead35dcd770becf17dde2836f9 SHA512 7ef7cbbdfb0678d0cb201cf9d941ef1c539b7141b7378e9e3dbb80caddbfe27b04ec63c0e1b775760f1a46a6c66c606183d0c83eb9d6d5f086017c9ff9cd7bab
diff --git a/dev-java/xmldb/xmldb-20011111-r2.ebuild b/dev-java/xmldb/xmldb-20011111-r2.ebuild
index 23f0175616e3..4d1a0eb41ce1 100644
--- a/dev-java/xmldb/xmldb-20011111-r2.ebuild
+++ b/dev-java/xmldb/xmldb-20011111-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/xmldb-org/${MY_P}.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 CDEPEND="
 	dev-java/xalan:0
diff --git a/dev-java/xom/Manifest b/dev-java/xom/Manifest
index 46b594718e0d..d73d586b6cee 100644
--- a/dev-java/xom/Manifest
+++ b/dev-java/xom/Manifest
@@ -2,5 +2,5 @@ AUX xom-1.2.6.patch 2096 BLAKE2B 041c55199398e37fcb4a481d7deb1c8c3fb8d980fa6ebc2
 AUX xom-strip-fallback-parser.patch 690 BLAKE2B c8135a026905fc16560be949598a48e02000aa29b3d1ddc6b40bd16ceb7ae60983ce703715f01e550fa2b643bcb1febb032387ab5431367d9dbc54079ed5f551 SHA512 e61defbc5c8da65561709be6431b0b15069759ec94de2f1f356d518b8b9d90a7ab1ccfd6db6148a3dbcc999b19c9607cd7586ef4c30f70e627968e726e953830
 DIST jaxen-1.1.6-src.tar.gz 204211 BLAKE2B 02e3ca40f3d6a41d417ae7f40b70ca74b4dff0bb254d5d7a80aeb725595564805bda795ee9d1b1c92ec3b1d59aad3a9cb82d8f2bac5ef0e66a3feca04bb63345 SHA512 84a3beb521c8729d7ad9bcb76a252e12d624614277eee9d5e844f79fcdfc58f5f49eac902256b17c0af6563d4c255249d9124a47c3b02827189a7489f3172309
 DIST xom-1.2.10.tar.gz 11717279 BLAKE2B dd66d423563abd717c0a663db3300b5baccf549f9dd71e42cc86b9c222f60faed1fc8525dbab04c27f271a3f048dcc01fbcb20da6ec6efd093e192c7a4b90685 SHA512 edaa4abbb929f4eba1ee092be7a196ba1c7a359b233a38abbf100dc519a9a6ca2b9a4947497e412f96ceaf509bbd03c0ce25b17e401b6cd0a95fc355bbdc7680
-EBUILD xom-1.2.10.ebuild 2190 BLAKE2B 4629b26895d808954f60e2ce3c1221936a44c1e5189db774b7ab6d56ffe4edfdd3eb5c3342c8c2b9f36a7a2564557118002fb72224b87ac153f54ea1b3acbbd3 SHA512 8c3cfd3bb4f18867e9a84ee9ed77ce37a7f99e2477c8d98731fbc914caed8827791d3a42f47942c722b0b9041383286083b0e3502a7c52162fc6d67c8d60c98a
+EBUILD xom-1.2.10.ebuild 2180 BLAKE2B 6d72a78523641f9bf871d64d846e7641719e31a344c63f532107b356a297c6f88d444026d237c8835a51fd48dd6ac129b201e42494ed88343a0e9c55ece7bdab SHA512 4acb2e5879b5eba4e358b39aa80980f62b663ab37bac936e91d8d338e56bd8d9364646ef845d684593550fe6c5d75d57d17274b5aaa87d84a9c0ada59dbce002
 MISC metadata.xml 407 BLAKE2B 2486554418b17502be636181d1dc619a50143016a72e05d5bef8a42c631b9f09913040bc868cefae0759075f26853c605e6a11179b20f3ca3081dd091536b56e SHA512 4ec08597d54cbea6121f240565ff7b7ee614c370357b551bebd18d31749c1863e30bc8b7935caa00051f9946cc927cd34c1bad02be07eca40c89d2c6e0e7b2f6
diff --git a/dev-java/xom/xom-1.2.10.ebuild b/dev-java/xom/xom-1.2.10.ebuild
index 9c6d566bbd20..94ce28945741 100644
--- a/dev-java/xom/xom-1.2.10.ebuild
+++ b/dev-java/xom/xom-1.2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -18,7 +18,7 @@ SRC_URI="http://cafeconleche.org/XOM/${P}.tar.gz
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~x86-fbsd ~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"
 
 COMMON_DEPEND="dev-java/xerces:2
 		dev-java/xml-commons-external:1.3
diff --git a/dev-java/xpp2/Manifest b/dev-java/xpp2/Manifest
index f9ac8e0ad02c..62eb2ae0b361 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 1740 BLAKE2B 88097b1e197087de0ec5101c5406bceb6568f058ece599efa407db19d8a51f974548b4540d6403b1d075c7dcdb8a9a50ea7c8f28e6ac62c7c1ad82bcdbba2a2a SHA512 48156f6ecdc714aab9c8d6f81d638556a56c485a05682cbbec767d452be27403fef9ef85af784b1102b54e0b467fbc607dfd19473b7de34ff5198c4ef39af85a
+EBUILD xpp2-2.1.10-r2.ebuild 1718 BLAKE2B 8ea25c2ad23d66eb7ab261fe261a16eff8c6aba449b3fc23cdae9b74124b3956e90f00d570a8cd3f82d85311f74ddfdaad1608b3db26981f885080aef8568ff5 SHA512 2e65db2bf9cb673d9a920ff2f51560a0ef54b4648c70db28bb56f5f3e406d2ca81d8c9d46e9aad30f87efcbf4ba9e147b1cea00ba2c136a5c15fe926852c9006
 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 e1e47ec2c0ce..540d963e8527 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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-fbsd ~x86-fbsd ~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 3486314022ed..eedfb0d78c70 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 702 BLAKE2B 33520d69564a5efd7c14b4dfa06c9a6f6659bd70a6bdb6f913fbc0756c4634c69bf5dfd358992777dc3e76e4b47f33c42453205736aa71ee702a2c642c64179c SHA512 4fd954bdca874f0945639c1ea234027feedff02749337afc107f6ce7b83f0a08a2f9945eae09cce4fbd26d8ddcafd561c5f56bbeddc8b692bafeb6eff2b01773
-EBUILD xpp3-1.1.4c-r4.ebuild 660 BLAKE2B 553cf8247ff4503a8e7e41e4065fb8fc936d204a554de4ed9f5a01d4fdbbbd629958897932a50218ab93826744c65bbb1679d261d7768f2ceedad3ec5315bc70 SHA512 8f8e2d7aa6bac15babfdbbb2042f2be8ec3f86edf12008e14a09197612c305858bb7421e149961d91f8302cf9b89eb633523cee07fccd815a68a4be69583088a
+EBUILD xpp3-1.1.4c-r3.ebuild 680 BLAKE2B 4fdc0c6ec0bfbf04c6f67d2df5a2497bff293d7eb1643ad1806d58bb1bd2c96b04a2666fad2e33291f70de00c77f2d14227732d262ce63d7a9eaf035684505be SHA512 b0d9e9746ecaad9b78b0ea10745781c9c5e9f653fb7f4132a63abc1cffcc58bbd719d6e1b956374ef3bfc6d2f5ccf7db4d7e85a928fc585d4bebf5cbbb3a96e0
+EBUILD xpp3-1.1.4c-r4.ebuild 638 BLAKE2B 99302a1b8637af115bce4fa8c3facd472060bc2a2d1b1f21d5df79ace49030d7614d3c347eb79b7f2acc16a20d7cd7ba56c28df4ac4e91d88e274aa491524212 SHA512 0c37fc533f9914f0bd0bb2d1c09c315df412990a3d7859782ad97cdbcc88cbb9565586f238784cf10c84f38ba62ff606d478af71922d41773fc99e1274886858
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild
index fcb5d8c88842..22e70b689bd2 100644
--- a/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild
+++ b/dev-java/xpp3/xpp3-1.1.4c-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/xpp3-1.1.4c-sources.ja
 
 LICENSE="Apache-1.1 IBM JDOM LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~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=""
 
 RDEPEND="
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r4.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r4.ebuild
index 883f01c94225..7628ee79b00f 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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-fbsd ~x86-fbsd ~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 4470f6ff65b2..da44165b0773 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 1155 BLAKE2B e96b563802e6aae4b5d7bb74fbdf11bf6c859f90b773b734188787c074027faca047dc04e5660b66eb4b6ea4dcbc443a47df6911814d4c5665ac158b8eea00e2 SHA512 bb86e411de133fa767e4da6bf12608977d32ead6e62889b31014f1f47495996401c912bfc423139054ae7e99622df870f00f3a3f9c01a56e97abb17e1ce05527
+EBUILD xsdlib-20090415.ebuild 1133 BLAKE2B 628d939f225846c81858e6919241a5bc31e18768713c183089613395e7ebe14e239b463b5ccd668f7e3594f17e41595a158f9ab62f6b67003d1d6022362beb87 SHA512 77387cf5d2ceef4fb0a8fd81861dcf3fcc08a006cacfaa9d994ca48e9e6d3288a201f82d3e7ac7f05697207c907793bde4b173cfd8ccdf05ee4647f4392b4794
 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 57ff680aa0c4..0ca67cf144de 100644
--- a/dev-java/xsdlib/xsdlib-20090415.ebuild
+++ b/dev-java/xsdlib/xsdlib-20090415.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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-fbsd ~x86-fbsd ~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="
diff --git a/dev-java/zemberek/Manifest b/dev-java/zemberek/Manifest
index ab4e9ab8f529..fa19f3872a2e 100644
--- a/dev-java/zemberek/Manifest
+++ b/dev-java/zemberek/Manifest
@@ -1,4 +1,4 @@
 AUX zemberek-2.1.1-classpathfix.patch 514 BLAKE2B 9fd8277e7ef3e81ff504d9f785385da358030a1a9109d6989aefa39efb38941688075967d7fc5f17c972766a24c5f5ae48401e94bd53110862b831b167dda285 SHA512 71ed0b82ff218fd8bc041fcf7d1fc669ad3fd3df890aaeedf2ea3f6ece5f6e484c1d4db709ecc5704d32aff934ae160285b64ef280be83849dc1fe8587c52178
 DIST zemberek-2.1.1-nolibs-src.zip 1196289 BLAKE2B c8ddc242e8f6bb63ecaff586b2a1f051ca928ab31033881dc2d76e1c9a0c2e0ac1648bbd77fa6eae6d84054b64d78495446369acd72ed97ce67cb87f4d7e305b SHA512 e97342271294504a0e9df7bbc60f68beed137311254f5cc6d7558befa106737b75b0dcb7a86033f506eda3783d98ba2788cf5da69497f18861dd8cd79bb27955
-EBUILD zemberek-2.1.1.ebuild 1808 BLAKE2B acec729c96caac43719ae387d488cc810434d2bd4a0cd35ed9ce131817848db8f16a4aa7fd7c0efb588e7bfb7a6601349ae29dacd974a327c7db6e6310666f65 SHA512 6db4da7035f148af0f629bda77910191bc65cf79b3bc769e41496fe2402024f05f6136267a24a8636f2b9173b0ebeec743bcde57cf02758da1f9bf0ce64d8d4b
+EBUILD zemberek-2.1.1.ebuild 1798 BLAKE2B 0b2765ff106474eafdde7be43d32b76dcd8d515536c9ec8d5f9a356669f011b91f88a73d3a860a0857b3d0b08c7fe2a00a43e776c05a68557a639f698a7e7959 SHA512 1a92b2a8239d750451c94e1b9ba2529dcc4177504d7a7a63e82422bfe58ad401b016e306547d4faec0963d329f45555d79dbb87620610ada6b16718596cfbc7b
 MISC metadata.xml 354 BLAKE2B 17e4ad083f477637706216dce4fca7c4e8c07866a6e28220cce3b8729837d61b13c4800366f7847d12cf4cc0eb72a9f81263514be5bcf620dee50c08d1b9bfa1 SHA512 546242cb1f76ce63ff5fd1b6a67ad35f6f16aed97f01e886b980a868d3f6bec8c8af4c003389530c6ebe3b7dd35a72b2297c6de2167c47c81bb5be627a4a8709
diff --git a/dev-java/zemberek/zemberek-2.1.1.ebuild b/dev-java/zemberek/zemberek-2.1.1.ebuild
index 104b1c3c4742..50f66f788140 100644
--- a/dev-java/zemberek/zemberek-2.1.1.ebuild
+++ b/dev-java/zemberek/zemberek-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
@@ -12,7 +12,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}-nolibs-src.zip"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc64 x86"
 LANGS="tr tk"
 
 S=${WORKDIR}/${P}-nolibs-src
author	V3n3RiX <venerix@redcorelinux.org>	2018-03-02 15:59:12 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-03-02 15:59:12 +0000
commit	06a7b5647e11a8ddf69b1c3d3ded6a8ba28b923e (patch)
tree	8d58c1f4b049da677b33209b072f2b3057268fe0 /dev-java
parent	99abbc5e5a6ecd3fc981b45646fd8cb5d320377b (diff)