gentoo resync : 13.10.2019

519 files changed, 520 insertions, 608 deletions

diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index d68b22c88134..d162ec7c45cd 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/aspell-af/Manifest b/app-dicts/aspell-af/Manifest
index 58bdbd86d098..8b0387b6a6af 100644
--- a/app-dicts/aspell-af/Manifest
+++ b/app-dicts/aspell-af/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-af-0.50-0.tar.bz2 256111 BLAKE2B d2f5cfb6d1e3f71319283d1487bb27765daead18a9b709cb9dd0b58b0f1579649cae3d1b59e4cb28c470b1924bf670e3c89f75a1abe7fa02fd4ad779750647f3 SHA512 8ca7b892745bebe5dfda1319141c5efc53fbad1444066d585cc2d6479c51c85c31307a6977a0647b0c4add4a5b7baa9adb370996e25db4e1c98f1c10991fd649
-EBUILD aspell-af-0.50.0.ebuild 290 BLAKE2B 0cc7831c6f63fe271a672ab1259fe47b953047e2d3574632e0e80a8a4e5b1c2db6f78e4201243853aec82c6812bff13807f47b9b19907b9631e2cc659af02846 SHA512 68778412af8cfce9460f9d9a9daeae4bbbd0ff9d2fb8929ab7149e7a80e63e49cbe632d5263d5d209855139cee9180b13f06fc4261a3cbce285210ef73cc86f0
+EBUILD aspell-af-0.50.0.ebuild 268 BLAKE2B 9936d848c767dcb63b2152ff344f82a0f7713fa3de594fa58c5fb9185165fae6c0bf861c7f8cc4477a803cbb3fbcdc994f1b7c3f7c130ce471984f60e62ef4cf SHA512 4137f31426ba78c4569a596b8f070730bae9e720703eb6de43d80e1aaed31d3ebfb0acfcf730910c3c00c028f5a4035b7d6dd879247de5fc36e9b2df6a4574a2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-af/aspell-af-0.50.0.ebuild b/app-dicts/aspell-af/aspell-af-0.50.0.ebuild
index 70171ddce8b3..42dff10833e9 100644
--- a/app-dicts/aspell-af/aspell-af-0.50.0.ebuild
+++ b/app-dicts/aspell-af/aspell-af-0.50.0.ebuild
@@ -8,5 +8,5 @@ ASPELL_LANG="Afrikaans"
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
diff --git a/app-dicts/aspell-be/Manifest b/app-dicts/aspell-be/Manifest
index 31dda9bba2cf..0a6e06a5d3ce 100644
--- a/app-dicts/aspell-be/Manifest
+++ b/app-dicts/aspell-be/Manifest
@@ -1,4 +1,4 @@
 AUX aspell5-be-0.01-official.patch 506 BLAKE2B 0172ae29930012aee31b25a227765dd01d7656a0c27b2dc62d306e5e4693682123ab081878fa8a78b87f4dcfa9355bfb62e6874a7ce111847e84c448ca7a9b66 SHA512 adf3b65dfae9de761d6971e2894abe3d97b30bc8185e2039128e501fa097dcbccb140e740cec2bfcde3d47b010f5bcc359f8b78ff31eed7d3da0b6edfc265c22
 DIST aspell5-be-0.01.tar.bz2 653405 BLAKE2B 7a7acadf75a754fd389b1bda94c5a437ba04db01beaaeea8a2cb2a3eba276150f680983e8292d5b80f3d5134501bfefad8538d96d2a459eeb698f0cd5f2a77a0 SHA512 320334c9944c44c9a61d24798ecd7603c4dc9fee99035d48d19759ecf2c1ac8ae21a0afde050d6527566e2404c1df4f75e313cec598b7faa93506142ea3c1022
-EBUILD aspell-be-0.01-r1.ebuild 503 BLAKE2B 0471cb79590491fcc0cb51b31771e357426c26a6cc3145d51c172c322d83cb16d07ba0588bcf3680dda678241ce8303580a72f3d35099de530c3f906f4c920d5 SHA512 3ed14f5e66cd69655bc8aa12b0aaade05f348e560c66b769a34161a2d1c12b1b96459249bf301dc9d4151a125491b4d26bf430f42f9135f9eeed5d8e8b41b540
+EBUILD aspell-be-0.01-r1.ebuild 481 BLAKE2B da7e4798d75e9fd17744f527ac0d084254ab75d83b7a2206d78481051a97e47bd309242d23360f6e1ce4e7b6062d32e48aa5ed39c72565448ece5e28d1f8085e SHA512 c81fbf898e02086bd7387161a95ad61e2a4fecfdf49b5cfed5e19c6c47f6636b5ca4390e2f60e3706c219ea949f4fa01639bd3e8b42367e5d36b0d00d21c9b34
 MISC metadata.xml 244 BLAKE2B c544a3cb01d4997c270248b3f9a06d9d45d0d4196e2215301b17404870dabfeecdd7f42a3dadb25015e039e759fe59d90c3ab59b5b8baf076fbcab236564003b SHA512 4ef4e5c63d3c90792ac5dfa5465831bb960292260a8b93401b6087fa7f31f8ea0e47cba61beb73df46b8e8cc40676c3e4bcd8e43b8333ff5415cedd03c7b74e4
diff --git a/app-dicts/aspell-be/aspell-be-0.01-r1.ebuild b/app-dicts/aspell-be/aspell-be-0.01-r1.ebuild
index 6c7bd095027a..f7587b3c68f9 100644
--- a/app-dicts/aspell-be/aspell-be-0.01-r1.ebuild
+++ b/app-dicts/aspell-be/aspell-be-0.01-r1.ebuild
@@ -10,7 +10,7 @@ inherit aspell-dict-r1
 SRC_URI="mirror://gnu/aspell/dict/be/aspell5-be-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="classic"
 
 S="${WORKDIR}/aspell5-be-${PV}"
diff --git a/app-dicts/aspell-bg/Manifest b/app-dicts/aspell-bg/Manifest
index 7d8dad8b2079..5c6c965697a1 100644
--- a/app-dicts/aspell-bg/Manifest
+++ b/app-dicts/aspell-bg/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-bg-4.1-0.tar.bz2 138940 BLAKE2B 5a694e3ffc89bb6f3254c269cb73730bf725a39661a1418f54ca85f845292b6fd7aec948df38bb4fe954946be65adfb162112cdf68b5808c017af75188bbfa54 SHA512 73ba292e9e78be21a9bd32d802a3f87b5b8200b64fcdc6e8bb47c834eb9dfd855a3397e8deb83e7879dc0dab7b118ae117832032fb9a450976c929bf12926881
-EBUILD aspell-bg-4.1.0.ebuild 307 BLAKE2B bbbea0fcddcb485609f49498d6e1d1da541d4ff9b2ff5ed2196facc90bdaf85e3221a6d17e36539014f92f67ac4f161682df635476d880cb2674c35cdda3b9b3 SHA512 6f107d0f4540867ac51669149bf8a34ad316ec87dd0eaf24b97b8ef9d01fb99a70fec832844168250be63b65ee3aa946ba1b97f6ba65ab8db35e8c2dc9bf48a4
+EBUILD aspell-bg-4.1.0.ebuild 285 BLAKE2B 7bbb404c0c99c874187defe13f4b08abec6e4c0a242df4514457433f596d0e045e9ee92eb1bd2db64d86f568c7acdd79902be592b684f9af07dbb2025b203689 SHA512 d69a701c94de0110fdf26be7afa186e8da6a6a23a9ecdda79ef8e707e5c2105d8a24ba1c79196687097a63300b4f4ff3150dba7cce3ef48283f0a3b4bb79c0e9
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-bg/aspell-bg-4.1.0.ebuild b/app-dicts/aspell-bg/aspell-bg-4.1.0.ebuild
index 9257c4057983..6168441b8944 100644
--- a/app-dicts/aspell-bg/aspell-bg-4.1.0.ebuild
+++ b/app-dicts/aspell-bg/aspell-bg-4.1.0.ebuild
@@ -9,5 +9,5 @@ ASPELL_VERSION=6
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
diff --git a/app-dicts/aspell-br/Manifest b/app-dicts/aspell-br/Manifest
index 59404221bfc4..66b9303cbb81 100644
--- a/app-dicts/aspell-br/Manifest
+++ b/app-dicts/aspell-br/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-br-0.50-2.tar.bz2 68055 BLAKE2B f301543386e81bb14a48c22f35897ae9cce296719a501ffab92b733766f5078b86dc1f70ea1eafe851e569e909b73d2c7ef473647f8a4be7bae35e75a9e7ff76 SHA512 02f2ce7a350adb87a0f32dd4748f067230a0f3faf195f8c7237bc0520cc0a7aa6475f96de933ae650611f8b9a41deaaeb57c2228ed95950a41e5defccba9e67c
-EBUILD aspell-br-0.50.2.ebuild 287 BLAKE2B 37d47ff263d891d46a52f9c06d129608126f51dae28d91ed5f1b1ce14a89e86b9cb7a5bce1aaa74eb1502e5e14b352e0001a78d6fc7946b08139a7a7d7bc9aff SHA512 9adedd1ffddf3983671b4d6ce13a85a87ad4ad82eaa9d1f9ec7a3280d928ad89778e83b01d4fadde1bb37255d6a1f79c816c7360dec6d1416d429ed1ba8fc97c
+EBUILD aspell-br-0.50.2.ebuild 265 BLAKE2B 98531c6ca77d1c6ab357c0957ccf4bbedea7dc75ed3e35d0883b308015c6a648b31208f498fff3333ce5c807ab4f3c9041569411fbfd43efff143cb30f9c76f4 SHA512 0d8caa7a2cf86d28694525197ba558f3abe5f6125aed08e544fe7179dc052e24bd90bb689553f93e5b3758087aaf56bfb20ec228b83d4a4de3e7def86ee54f4b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-br/aspell-br-0.50.2.ebuild b/app-dicts/aspell-br/aspell-br-0.50.2.ebuild
index 378af6d0d6ff..f65a860c5ae1 100644
--- a/app-dicts/aspell-br/aspell-br-0.50.2.ebuild
+++ b/app-dicts/aspell-br/aspell-br-0.50.2.ebuild
@@ -8,5 +8,5 @@ ASPELL_LANG="Breton"
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
diff --git a/app-dicts/aspell-ca/Manifest b/app-dicts/aspell-ca/Manifest
index ae933fc0d3f9..2ba7f30d742c 100644
--- a/app-dicts/aspell-ca/Manifest
+++ b/app-dicts/aspell-ca/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-ca-2.1.5-1.tar.bz2 227561 BLAKE2B a7b26408eb583ca56967508f00d9c617e6e4bec364f6c807813d5f6485c549b9b62f02ea5464c32c3b3a84477d8fb6e768c11fda7d262b56ff0b24d57e19fde0 SHA512 9f3baef829948a4979c03dcc380caf3fa249912fa94d375a41df4d34d62ffdbf781a777eb437d101bdf99873e9d515a4d27ebef08f71ff435f07e845194c9f0a
-EBUILD aspell-ca-2.1.5.1.ebuild 305 BLAKE2B fd1f36fa832b210cb252aed6dff281497a27feae639603dafe6b64ab08a840286c9209d297a32e04cc9421bc4440517d99a1c10abb89b3b8070bf32fbcd43922 SHA512 41335f879445f9850dee6802aa98f80adc3e1d1a9385b592199ba1ce9cb631867680ae504fa63dab0c5ab54140b538e08b8fab8375434b00b04f31bf58b00064
+EBUILD aspell-ca-2.1.5.1.ebuild 283 BLAKE2B 3dbf9c31c6a7df7860c4e1ec7127b0e20c795afcf0f37cc2d7cc80566643d30b8861e51976d2ce68eae15da7a153f8f6fef445bfc42486b5a1574cd1f13fef9a SHA512 6e996adab3eee676bc439eb180374da8c37ac41b7fb1daa0ba57ee4840643b4cce2ca151954b2c31bb8f19e8cf8ed20deb85d92ebc6024c7b75ffa788eb2afaf
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-ca/aspell-ca-2.1.5.1.ebuild b/app-dicts/aspell-ca/aspell-ca-2.1.5.1.ebuild
index ccf6bcc44ed6..2d06254c4fa2 100644
--- a/app-dicts/aspell-ca/aspell-ca-2.1.5.1.ebuild
+++ b/app-dicts/aspell-ca/aspell-ca-2.1.5.1.ebuild
@@ -9,5 +9,5 @@ ASPELL_VERSION=6
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
diff --git a/app-dicts/aspell-cs/Manifest b/app-dicts/aspell-cs/Manifest
index 39766c6e8e52..4994eb83e090 100644
--- a/app-dicts/aspell-cs/Manifest
+++ b/app-dicts/aspell-cs/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-cs-20040614-1.tar.bz2 451507 BLAKE2B 7a7c910fd52d15f9513e30db5ed6ed7116d92ce02c401d8f11222e64c1ca6aa332cab3152b3b27904bd59fb542e957517b52f2bae1878c17652a17f575d3e6bf SHA512 b4d3e46907a00c7de4d19766dc29f089ec119b736de1340ff5f56be9d0a1c8c90fa2b156173f312c13c589750ec7551e79bd7aa092d31fa6d5f05ed0b4b12c9a
-EBUILD aspell-cs-0.60.20040614.ebuild 410 BLAKE2B a0e80449f19142cb15a3d40003f4929784405609f2cf43b80071f16ed49efd8afb7a0e486f79ae5324d8b60f1a27f40813ace165e724e9b3f73de55f290df937 SHA512 0d5a9a63945f67ba2295845dfb14172d167f4f7e4121b1435b7ead2b8cdf74c2983b8db158500ce10887e51ef41a28d34cf56ac7fb4e943fe9839391d1c408df
+EBUILD aspell-cs-0.60.20040614.ebuild 388 BLAKE2B 029caddcb9064e6180a5b94a1013168a93ba4af1208411f859fcad758dec724c5fac163486d76e303db1df09e4da090b6b00ae82ea6e84e3f154abd03668a902 SHA512 03b1cad4fb6c16b386c39b43759256cb6687944f9792fbd7c99d382a997bd4d22d0def0fa9461f07ce710d8edb9ceac711b8bf358a4c108b6cb4128c873445b1
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-cs/aspell-cs-0.60.20040614.ebuild b/app-dicts/aspell-cs/aspell-cs-0.60.20040614.ebuild
index e7c46395c2f7..79d85a1ef816 100644
--- a/app-dicts/aspell-cs/aspell-cs-0.60.20040614.ebuild
+++ b/app-dicts/aspell-cs/aspell-cs-0.60.20040614.ebuild
@@ -13,7 +13,7 @@ MY_P="aspell6-cs-20040614-1"
 SRC_URI="mirror://gnu/aspell/dict/cs/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-cy/Manifest b/app-dicts/aspell-cy/Manifest
index 93149c25c0e4..8b9bc268b918 100644
--- a/app-dicts/aspell-cy/Manifest
+++ b/app-dicts/aspell-cy/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-cy-0.50-3.tar.bz2 117652 BLAKE2B 68abfa88829f8574229bbe35626bc3c7df7789e063abe9c70c054212bbf159ae704f4a0204d63e362d49582c2300d0e2453d486c7bba039c8141f93232a38045 SHA512 feb68ea9749788a45725a5bc706ea2c24e73bada4fbce907bbe3b884d16875458516dd53fe7f5d62179cafe40117416f7068c1e6e0292353447c2ed7a494ad6b
-EBUILD aspell-cy-0.50.3.ebuild 286 BLAKE2B f171fa4ef79cd378ff891d039f35f6d1334f22d47d198a0c8ff0245ec1610daea57e0d215a97ccd494d839e37eaeddbcca1fa26c5ec66b9124878166a824fdcc SHA512 78d0db036196663a6eb174814108f5f64d0164b21b49befc1a2e31b5d2acb3115d5e46ec29ea5a10ce9afa4add03d0378fb3c68af174b84c7b1104c42161c32b
+EBUILD aspell-cy-0.50.3.ebuild 264 BLAKE2B add75ad9134dea4df896c6d97f3530ed32e8030083b552f391b965a001bb97561ed9351ab1bf5a8576231103961df72d3a0510846ec6229b75af08c0955ffc6a SHA512 a08021f0dce47a5fdeda071f2aee980623fe96328e7fbb7e40de5ac3845cec45de39f94e61cd49ed37c17c2970a38f3b6f9010d1647926cdd4808b9c75bce0fe
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-cy/aspell-cy-0.50.3.ebuild b/app-dicts/aspell-cy/aspell-cy-0.50.3.ebuild
index 980ee2eef3cb..68d24abca60f 100644
--- a/app-dicts/aspell-cy/aspell-cy-0.50.3.ebuild
+++ b/app-dicts/aspell-cy/aspell-cy-0.50.3.ebuild
@@ -8,5 +8,5 @@ ASPELL_LANG="Welsh"
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
diff --git a/app-dicts/aspell-da/Manifest b/app-dicts/aspell-da/Manifest
index 14cd55b84ef6..d119acbe20a5 100644
--- a/app-dicts/aspell-da/Manifest
+++ b/app-dicts/aspell-da/Manifest
@@ -1,3 +1,3 @@
 DIST new_aspell-da-1.7.42.tar.bz2 235483 BLAKE2B 0d5ac9c7457b460410734a36e376387d9aaa4444771dcafb85c80b0d2ca4441b906ef485d5016e9d51985147b9759c4677664c01dd9d68c340ba947efac0d932 SHA512 97d3bc95800d5115ce640a3939bf6c94998f1090f1484da3ffb1104318200ca3650d2b32120c36030b87b4b929b95b8f764f6f51dee66ee916700318f6b4e755
-EBUILD aspell-da-1.7.42.ebuild 415 BLAKE2B 49bdaa40503e96ae86dfb77d1215541a9bf50bd985c9d12ba14ea00e5f220820ff5a2a4c3bd7f7694e846b42df983db6b773835dd0fda10cbc306bb8e88da122 SHA512 d2d923d8d5f39ea3017d9d14c256a069a64f7ec4e5ec32ebc105bfb3155ebc4da1019455d8c3aeb96d3818251908b53015b3d42ee56bf5e848779bf96f0ea2ac
+EBUILD aspell-da-1.7.42.ebuild 393 BLAKE2B e3fa90047daebe72db4e4bac3ee36c662f511c9b976e4ff44216a3c539b753fa093dda27da8a91458ba4137edfcedc46cbb7549cd214d57905b76af85ef083c1 SHA512 6591d544324c5818ffc8ebdfa3a394ef0c8571628eabbba523b0d923c592061e1b98100877f5ca1ed7555dc8ff12b3a62cf2f650a5db16969bfd0ed96ed8dfdf
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-da/aspell-da-1.7.42.ebuild b/app-dicts/aspell-da/aspell-da-1.7.42.ebuild
index b370b536b3b6..d47e1ab6523e 100644
--- a/app-dicts/aspell-da/aspell-da-1.7.42.ebuild
+++ b/app-dicts/aspell-da/aspell-da-1.7.42.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://da.speling.org"
 SRC_URI="https://da.speling.org/filer/new_${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-macos"
 IUSE=""
 
 S="${WORKDIR}/new_${P}"
diff --git a/app-dicts/aspell-de-alt/Manifest b/app-dicts/aspell-de-alt/Manifest
index cd165ce27e46..966bfc614ecc 100644
--- a/app-dicts/aspell-de-alt/Manifest
+++ b/app-dicts/aspell-de-alt/Manifest
@@ -1,4 +1,4 @@
 AUX aspell-de-alt-2.1.1-dict-name.patch 1843 BLAKE2B c465d3ff766ea3749011a7ea0a502284e1ba31112cb21149edbf7a909cc4e45bced0ee165649117038a1072cd7d5165d89f9ed17237fbf1ea0b4942a0e54bd45 SHA512 2ad6133fd907cfacb1d33dad879c0b101869b9ec67f33d3689052c5f25a35244fb98e19ea6105f5c8f000ef3412fcc567f1a242decf7eee0ff29784d22d040a0
 DIST aspell6-de-alt-2.1-1.tar.bz2 247116 BLAKE2B 45428b341fd7d2cdf098d6d85956b8e41794ad7a725cd7f3c703bcdb9995c6c18f89e78f06ddc14b7c570b21eea4d72e944ba293b2272d8c5d5a2a5447427327 SHA512 823324bc299e9adbbe5308681a5f74ee2a76a32816e8abc9d19c3da0c4eae756eaf1a3c76e2d75449b51010854ab869379073b1fe377e505662187d6c38230b4
-EBUILD aspell-de-alt-2.1.1-r1.ebuild 471 BLAKE2B 671e2dd1de99807be1cbd2cf9deb8946fbe76d13c12ad8bad44b1e20370d5d877d363584101c2a8f0b7494215ec7a96841c76d9fe9e4b82d35aaf0539d11ae87 SHA512 78becb3c4130e6c5429d7ac41df589f946bb7db4acd832a16f75435719f86bd251ff427436cf18a42773b9c5e6fe81edb8648c6ea867443dba1868e8eaff9637
+EBUILD aspell-de-alt-2.1.1-r1.ebuild 449 BLAKE2B 893936c9da4deab531840f0a561c7d5608e9c18c039c44b7429595a369d440091d3e055f6d3f418cbb42366145ca3ee7a9ab7c4721080dbdc78ea36403664ac6 SHA512 815613ddef67746690cec8687468ea6e9213e23d77eb229be66aa67993db7ce39ed4f0aee9b9975f6e2abf914ea01e1327d323ba084725e0e78d53b75e217ee1
 MISC metadata.xml 212 BLAKE2B ecb53eb3efac6ceef048d345601c5ca0430e2f62d6409dc2a18494ee188f792d4763892816f197418d2e9a6d04452091a0c69d83afc207b366fca816632209ee SHA512 3919b8b096abf61c7edaa6a76898603b6ca2e206e2eccd27c671957a9d085bc2591a2fb4839a85ef2a51dcbf887bb2c752d4b38e82ea19c48dfd6d99b67954fa
diff --git a/app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r1.ebuild b/app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r1.ebuild
index c7be8c0f2951..b4df2cfd48e0 100644
--- a/app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r1.ebuild
+++ b/app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r1.ebuild
@@ -9,7 +9,7 @@ ASPELL_VERSION=6
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 PATCHES=( "${FILESDIR}/${P}-dict-name.patch" )
diff --git a/app-dicts/aspell-de/Manifest b/app-dicts/aspell-de/Manifest
index f61eea430d6c..f33b11c0ebf3 100644
--- a/app-dicts/aspell-de/Manifest
+++ b/app-dicts/aspell-de/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-de-20030222-1.tar.bz2 274407 BLAKE2B ed69c0a3c1e63599d99a811b7b2d54c5dc4699f776d4c97fb5d295250df64e6189378c2bdadf8ce1b38a5a49046020b220e528ae69f20be01af5f771dba3bc37 SHA512 2005b56938565b11b761ace31006c1accfd32d401685cc5676cc4d85406bedda81b1df062949359f1bd6972073d3713204d87c7f81d9535fa956cdf130dd8db6
-EBUILD aspell-de-0.60_pre20030222.ebuild 472 BLAKE2B df513963e70faf6733e6b671ded7eadc1090da9d727695958f035e0d5c77bfd141f07669848b8474145e605ec94687dd5540910ceed46b31729f4c31b84649b6 SHA512 c4448e9920bb9b9a6d15daad39e89da4057812ee7ebee2341d72fd9aed87f7569b50239c538509ae1c6ad4062e5ae43a94108577792f8702d5d250804ac5b551
+EBUILD aspell-de-0.60_pre20030222.ebuild 450 BLAKE2B a9504ba42d39fb2e19cc306300617c691603a1bb785c9c483982efb2f7494ee5c5d672e6080f87f88fb6e4d17dc4b87802a290064da39ccd640981bb1c7b0de7 SHA512 d4858f896c9d65aff4c0bb6a7679714b9d13f7edbc727d33a37493f90e75c941d8c3b8291909d4916a24efc57a955603f22d3db7d5d5a7de0b2d94664600b049
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-de/aspell-de-0.60_pre20030222.ebuild b/app-dicts/aspell-de/aspell-de-0.60_pre20030222.ebuild
index 974d1f546b87..ac65ea4f3bfc 100644
--- a/app-dicts/aspell-de/aspell-de-0.60_pre20030222.ebuild
+++ b/app-dicts/aspell-de/aspell-de-0.60_pre20030222.ebuild
@@ -13,7 +13,7 @@ MY_P=aspell6-de-20030222-1
 SRC_URI="mirror://gnu/aspell/dict/de/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-el/Manifest b/app-dicts/aspell-el/Manifest
index a2af54b33e0d..b9e198263238 100644
--- a/app-dicts/aspell-el/Manifest
+++ b/app-dicts/aspell-el/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-el-0.50-3.tar.bz2 328225 BLAKE2B c032ad4c549cd2ff4d3dbc2cd142f6405d339bccb4040034ca225203666da8eb7c9b153a9ee58472dba6c3de5dd9e10dc338c4e46fa27e7cae3225ea8bc0b79c SHA512 405a21dc3e6ad04ea7a6b3ff69fb77382cc8f20b95e9c1788ec77a38ad1d4eafabc3a5e996a68cd5a2a385927244a2cf81cc5dcc68a1c7d42fc31a95d9068cfc
-EBUILD aspell-el-0.50.3.ebuild 286 BLAKE2B aafa354eb972ebd3878598a543936113d113651eacce45fb9319c7978762b1dec0c00a71968f4a7d54afc231191455424a82941cf9905331ce7b1a517f45aebe SHA512 6fcfe12b4ead85d915b8c27b2b274e8db7ea8deeac709a54037e0db6dc04c9411217a678377ea505a545cb92c5e65b4f4f52c401aae8e4ecdab6e1b04ad08e61
+EBUILD aspell-el-0.50.3.ebuild 264 BLAKE2B 34e9ae3cffcb460908d6f686bfce854dafc7fe9ed05d26c0c60645c3aa959c6863055e2600d6821d84af7f9dc5456a91e494f1a936879283ec091ce678167856 SHA512 5cc5dd1b24c37808e32625e928cff015dcdb6981b473e515c0538238b1f0226bf4d6dcbc9663312a47b51d8be62a252be733c0ddf89d3a52112693a06ef10390
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-el/aspell-el-0.50.3.ebuild b/app-dicts/aspell-el/aspell-el-0.50.3.ebuild
index 2570e6c28646..99426d666ad2 100644
--- a/app-dicts/aspell-el/aspell-el-0.50.3.ebuild
+++ b/app-dicts/aspell-el/aspell-el-0.50.3.ebuild
@@ -8,5 +8,5 @@ ASPELL_LANG="Greek"
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
diff --git a/app-dicts/aspell-en/Manifest b/app-dicts/aspell-en/Manifest
index dffe18ced5bb..e4817d17306d 100644
--- a/app-dicts/aspell-en/Manifest
+++ b/app-dicts/aspell-en/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-en-2018.04.16-0.tar.bz2 185332 BLAKE2B 98b3d39463a26473450778d3f3763eb11739deb1d5d28db5f7bc0ef4dbfa977435fc0721d26a39ce2bfed9564985a62fd199ec2ba59154a327b6429109966d6e SHA512 70447f5f11a6a2d96e58376ac06e78add59e4eb237ca40ed0752f481dabe1a6e9e227fd20ba95a5612de1bb4357cd65760a31c94efe66f8499b9ed031e9846c2
-EBUILD aspell-en-2018.04.16.0.ebuild 614 BLAKE2B ed9975ebea04cdb7044b72e8cf9950bcb680e71d652d81cf2ff1fecf6a76eed3cc2c3aff89dd12fd1a2d66ae7654488261b3efa8b5b0f8e0077454bf02bad662 SHA512 be52fdc5832da043ba4de21b9e18b3756b42d6e499f025580a7dd54e2c466b82d9f70e21c74c230abc6ede0479430fd253239ab74ae511e9303020e763755d6b
+EBUILD aspell-en-2018.04.16.0.ebuild 592 BLAKE2B 59bb10a238d0106f88457b13b0d939728d5dc26685c6fe1e359f720ce7cf90b5c208ed92947dbad8f46191f5ab585474cbe5db1a289abf007476eb7436297d18 SHA512 86acbf90d6355c728df0ee99de639c6fe682ffcb4cf8ffac20a55e3df5af7dc05e55d4d5672b5361304cf06164b45f771d36598af8d144e3a5452d415aff15e0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-en/aspell-en-2018.04.16.0.ebuild b/app-dicts/aspell-en/aspell-en-2018.04.16.0.ebuild
index 0c7067c454e3..53b33143f1df 100644
--- a/app-dicts/aspell-en/aspell-en-2018.04.16.0.ebuild
+++ b/app-dicts/aspell-en/aspell-en-2018.04.16.0.ebuild
@@ -11,5 +11,5 @@ inherit aspell-dict-r1 versionator
 SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${PN%-*}${ASPELL_VERSION}-${PN#*-}-$(replace_version_separator 3 '-').tar.bz2"
 
 LICENSE="myspell-en_CA-KevinAtkinson public-domain Princeton Ispell"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
diff --git a/app-dicts/aspell-eo/Manifest b/app-dicts/aspell-eo/Manifest
index 4fe5d63b3b61..4e01d7cd6f0d 100644
--- a/app-dicts/aspell-eo/Manifest
+++ b/app-dicts/aspell-eo/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-eo-2.1.20000225a-2.tar.bz2 71591 BLAKE2B 3e8624857ae9c7a1256849dfe65a2b5a9de396516973b3e00075d5bdc507598b414ad745df41e2f8b746aeb43d0296186dd1b8163af84a0bb709ac5a2847cab9 SHA512 172ff88745e36abccf47ed8526868e3c2fd1f41c6da15893e723ef70bb29fc0e4b4e614f1eae8b3db8206f971f9a9cd9ec627fce2dae611804a276118367dfda
-EBUILD aspell-eo-2.1.20000225.2.ebuild 471 BLAKE2B 1c929d89116418a8959acfe35c38ce9f0326ab17d5a7777e6a8c0cfcf56217face87236c9c908fd195f8d045cf1771c6feb5fda729315c92ceb9bc3c48d36198 SHA512 7285ba3e2fbdd7b981422498d1ef74fd11e7a6cf4d243e2bf9121b132537e30275c1692fa419dc97a5632157cbdf0c797e2b454ad07ef6a9ff46caa909d6d9b8
+EBUILD aspell-eo-2.1.20000225.2.ebuild 449 BLAKE2B 5202b430f8419afd6245e7d55142e51c5aa650a062c76cab8de54856f97f01930fc89fdbb42eba8db2759b606ae264cf2798549bf45898491cb6ed6d5709737c SHA512 6ccd493f95ca7038defd6ebc7b4b1571f3b21dfaef29743fe4340d858fd749f74fdd484d1074411e84febdaf1658051b1912de1c29cb075c31b5f917e71ce1e0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2.ebuild b/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2.ebuild
index 1e0e36838d01..b6594b2efbbf 100644
--- a/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2.ebuild
+++ b/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2.ebuild
@@ -14,7 +14,7 @@ MY_P=aspell${ASPELL_VERSION}-${MY_P/aspell-/}
 SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-es/Manifest b/app-dicts/aspell-es/Manifest
index 7c6a746e5b54..55364a8388e7 100644
--- a/app-dicts/aspell-es/Manifest
+++ b/app-dicts/aspell-es/Manifest
@@ -1,5 +1,5 @@
 DIST aspell6-es-1.11-2.tar.bz2 154787 BLAKE2B cc035b4f9c6b12c90b7112ad414ee3f28c00554179e9e88d79ceb06e14edbb891a3d2f7d2b3a70945651ceccecc4250e8e1f187cb75e1f6bdbe653e278a54140 SHA512 5d0159f24d6bff43db682a4beb25e82dd362c205acf7c9e0d728808c0e54a8a566befe26316f384099c72e6c429713f8ad7d2dc66a8f04a15e1d5a9cfe2290d8
 DIST aspell6-es-1.9a-1.tar.bz2 132542 BLAKE2B df33c5c38633573b1616c480c2df4b53bd1b6afc6d749f558c22d56482df9977cc5aa366a0e9a7b5b1bdfc12b92bf4e38957e23b3bf8dca38b0dfe00824ff365 SHA512 7ea228104231a4af395787da41eb14f27b6b864f1512c9ccb72b5f19b4327a0e4ccc37fdc31085b33da83a0b3b45bfe608f0a1361da8297dff2bcd96096f4c06
-EBUILD aspell-es-1.11_p2.ebuild 437 BLAKE2B ede32a69020c2a6fe409fd78caa2a7ae9adb7e1e269b95fd2278c775e3ea9792ff20c70b415f69a8057a1a571a84ad212df3eccddab56cdee9312d46af983661 SHA512 d2264738ea4e0bd1177ca22d1d8c3d3ed875d5f978c606e131114e73b10a4be31e137e10cec5034095046cdc99f54a2a2ef308fceab9b4e17a5251247b12bcd2
-EBUILD aspell-es-1.9a.ebuild 432 BLAKE2B 27a68be2a7669a73a58845728a48bed6912e9478840cbfa1b8855a3231a25515a3e4672df5f7092a4e94169c504261cd3fb0f55e26ec86bdad38b425dcc81c55 SHA512 e5cfd21d6da9b2dcd1f8f00baf31caeaaa05c48ec5b1045c903aff98459b990d62b603108332dc8aea0a82f01096e218ec7e46168a95909c80b17f31121d4806
+EBUILD aspell-es-1.11_p2.ebuild 415 BLAKE2B cdbe8a841ac450b33c1f2db521f446a1b8827f81d2e2d4eee1ccbf9f3f74a65143f9f5ec28b793f6a3362cfdc618fa385920e44c56f6a4263806024e2c006127 SHA512 994b4eb6ec0ca37353163ac692f01a5d143599326dade17c7281133e2ba2a06d0a26a86268fe235f586e4bcf9cde099179a23ab991d97056cf3a4cd82085b905
+EBUILD aspell-es-1.9a.ebuild 410 BLAKE2B cfc60a4098fbd713816094dae780ad655abb96c29c6ae2066c264d996617c942fdeb0a27bd2296dbabd8dd3ac2a98ce8bcfba19566c1999d9c54202cfcacf40c SHA512 764fad585b96871cc4890840b8ff775506e8d927e25984fb1b91fdc74b487b309bc3f05389a1d1defe918a3252703ee9f7029dfeb78f19053cc83e5c256f2068
 MISC metadata.xml 383 BLAKE2B fc5887f858a28f6028f855b82b42bf708cda98cddea47a27a7532ce46a25385ea267d1bb02dfa77f6b83ce5bb8679e2d8e46ea31a6541e91da9185ed4c842d33 SHA512 eb033213ad8991813d7e7e3ab325e7b2ab864d3048ec2eda19a84c085d4c83f2b7038bade40ec89c5998510f9c04b5a2c800f582dfe3e4d9f3d10d0d54d4b318
diff --git a/app-dicts/aspell-es/aspell-es-1.11_p2.ebuild b/app-dicts/aspell-es/aspell-es-1.11_p2.ebuild
index ae8ee3eed75a..ca93de3f82dc 100644
--- a/app-dicts/aspell-es/aspell-es-1.11_p2.ebuild
+++ b/app-dicts/aspell-es/aspell-es-1.11_p2.ebuild
@@ -12,7 +12,7 @@ MY_P=aspell6-es-${PV/_p/-}
 SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-es/aspell-es-1.9a.ebuild b/app-dicts/aspell-es/aspell-es-1.9a.ebuild
index d8ae5c99c2ff..0da5f8ec7491 100644
--- a/app-dicts/aspell-es/aspell-es-1.9a.ebuild
+++ b/app-dicts/aspell-es/aspell-es-1.9a.ebuild
@@ -13,7 +13,7 @@ MY_P="${P/aspell/aspell6}-1"
 SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-et/Manifest b/app-dicts/aspell-et/Manifest
index 946ac11eac4e..53b9520d538c 100644
--- a/app-dicts/aspell-et/Manifest
+++ b/app-dicts/aspell-et/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-et-0.1.21-1.tar.bz2 338155 BLAKE2B fb6c1ebe5d63d88d85935675c6f78ae8dc55cc4e0dda2f18370813049042fdd356343b8d98faebe788732c1ae199b851afcfea30e8734e3167bb00579ec08551 SHA512 b3ed1249dbbb3caf12047407d85a3397f5e9561a59d71e33d6f29f18b9a83baa3f3c8d5a02a22cf0861212ff7b3ea1d33e38a943352e70be3703e0c42ff739ae
-EBUILD aspell-et-0.1.21.1.ebuild 306 BLAKE2B 0fdf5f2c4bd89ae63a70e860252ac7e9e4b7a59c8a5f37122a4b1f56e9ba0d96910f05ed03238c8528bc86c05d743a21fb5570440736f9603387f3ae33042d8e SHA512 78eb1961baa26d640f1122a343fad52d1a965643a431e6dff059123a3bfa299553d5a181d87d1fb742f53cd24d9529aa743f540d18b5dca92881b40e7d3ef593
+EBUILD aspell-et-0.1.21.1.ebuild 284 BLAKE2B 6a6ca1951af41f8cae5c50ccb69253c899859f9f9fe7ee8b4650c3aa3198530641b5ef7a8750abce57e69fde9c4521ad200a30c55133b44414b2dc5ee5afdff6 SHA512 dfce1917dd344795d05a3de1870685ee0fd3b0c68ccb59490f36e3725b5ea4381918a34bd2c7e8d096f5be1d4ea07a567d9b3784481befa83fdea291906d10d2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-et/aspell-et-0.1.21.1.ebuild b/app-dicts/aspell-et/aspell-et-0.1.21.1.ebuild
index bea90e878f2c..e00b726fc01e 100644
--- a/app-dicts/aspell-et/aspell-et-0.1.21.1.ebuild
+++ b/app-dicts/aspell-et/aspell-et-0.1.21.1.ebuild
@@ -9,5 +9,5 @@ ASPELL_VERSION=6
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
diff --git a/app-dicts/aspell-fi/Manifest b/app-dicts/aspell-fi/Manifest
index b4a4ad2c47ba..463e56644c12 100644
--- a/app-dicts/aspell-fi/Manifest
+++ b/app-dicts/aspell-fi/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-fi-0.7-0.tar.bz2 209249 BLAKE2B 89b5e385f618a1aabbe0b3e688bd21cad1d15ff9945f61048d72a8d59dbe7551c6314de16dc34249370432459483b7badeae606dc48380d345aa977136c0a4ab SHA512 d1f27bc8e36033cba6ddaa978f2facfe8d134ab70124ec80d5397dba2b533b512755312feaf2afa838f68e4449479953a8b951264fbbfc28cdfd9457f67f67f7
-EBUILD aspell-fi-0.7.0.ebuild 305 BLAKE2B 2ca232bde68153824c79cac41aaf020803216d0ac4b912c23843f1b242aa6463ee3669ef2cd0d7de6662dab7a8b51f851e4fc4f6893d76d25ba1c609ddecfd66 SHA512 bf0ef13d84307105b42e259f1efefc14c4ab487522e3fd50d46cc23051144be96366ab277f257c29059982053ec67899a2f31b7a5884d4c53980ad9b6c0a827f
+EBUILD aspell-fi-0.7.0.ebuild 283 BLAKE2B f27a870ab8d4afeafa12d25b85e77571570ef9226a00daa1d2ed1d286ef04ededb4cab1291e7f74c01b48da50ef86bee91b02e6fbd33c4eae7d771f0e0e290f3 SHA512 c0e9238637f940863592bdc8e93067c916083a2ad7f17e19c71c826d14200e612209dd9433483eec9e4d27e91db3690d0e0ce127588f5b7b0182d535ab8263bb
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-fi/aspell-fi-0.7.0.ebuild b/app-dicts/aspell-fi/aspell-fi-0.7.0.ebuild
index a58fc781bd2d..bb359b3bff44 100644
--- a/app-dicts/aspell-fi/aspell-fi-0.7.0.ebuild
+++ b/app-dicts/aspell-fi/aspell-fi-0.7.0.ebuild
@@ -9,5 +9,5 @@ ASPELL_VERSION=6
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
diff --git a/app-dicts/aspell-fo/Manifest b/app-dicts/aspell-fo/Manifest
index e81f17d37664..1c4743c1c053 100644
--- a/app-dicts/aspell-fo/Manifest
+++ b/app-dicts/aspell-fo/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-fo-0.51-0.tar.bz2 161169 BLAKE2B 2d607954fdd15c07c425b6d53bd10e0226193f45fcadf56b4eba1cea81bfb569519e71295a54058164eb8762fb5e9db8846410a01b009278393e78ee94081fe7 SHA512 8177e302816f0ddf05653656d07489be02dd5d12eb178f5e627034030f38e9b612f41a49fe4a1c092bfc3d6edc4dfcb0ec8326005251a3b36f80e1ca234d4c28
-EBUILD aspell-fo-0.51.0.ebuild 288 BLAKE2B 25eb8ed9f013a98a924146bd0e6a23500668f7ad3921174e90470ba0ca9e9317eaee3ddfca86a23009a35173c4566d742c42979ea4171194a7fca3d50e25e8a0 SHA512 12f1259b04f4de6c7ea3603797cf11611af5279e8db07c39244c7ce2928a62d62e9d1b14b8ed5af35a740a25a8228e371a0165a0fb44a6087fbae84512e98b4b
+EBUILD aspell-fo-0.51.0.ebuild 266 BLAKE2B e311056e6ec6c37fbe490c179260ba2d3549c223e23c113a3791efcbd4cd27d6ed0d344ea162520dfe322cda16024a2297b3170cec82a54407e5a3d12a1aee3e SHA512 15a65df4ab0ea2f703f357d8512585ca79bd63e360a7d8ba251d8b614576cca3aecf72aad5a1fb1e14189519a7d7691b136908d331bf133c25378adc408ca3f4
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-fo/aspell-fo-0.51.0.ebuild b/app-dicts/aspell-fo/aspell-fo-0.51.0.ebuild
index 4747627b108a..bb8bcd29518f 100644
--- a/app-dicts/aspell-fo/aspell-fo-0.51.0.ebuild
+++ b/app-dicts/aspell-fo/aspell-fo-0.51.0.ebuild
@@ -8,5 +8,5 @@ ASPELL_LANG="Faroese"
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
diff --git a/app-dicts/aspell-fr/Manifest b/app-dicts/aspell-fr/Manifest
index c9698ae4897e..c082df8bf3a4 100644
--- a/app-dicts/aspell-fr/Manifest
+++ b/app-dicts/aspell-fr/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-fr-0.50-3.tar.bz2 283086 BLAKE2B 674199a56d676ab65c414741e669b099a0f08f2010f3981caf30daff6726e516586aa771190eebf83570093c28a8732761a9166f587a933860a037f1dd561e0e SHA512 bb5d1faada9283521096a19a8f5abada2a19cc02717f6dde57846ef46a4df253113b10a2bb72d2b0e32e4a3ab24b541a5acd9f4595b908d2f6cd2fc448d8bc3b
-EBUILD aspell-fr-0.60.ebuild 549 BLAKE2B 7b8ceba2ed418bc04e26bf47aa95c1067b0119bc83b4186550ac1748288dd660133594feadc4a2b398b4a26146c7eac316dccf648c7408a9057845ec27832c87 SHA512 a7206052d575054ee376303da3bbee7bade06115fdd51a98b316ecf678ea349a99fdf0e90e174d35dcace6379c3cd456242a1ac6f343768b453e9327a7cb2a5b
+EBUILD aspell-fr-0.60.ebuild 527 BLAKE2B dbc16e0c7b1cf21b1ad4d8d70bfdd424bf6652e5f846a0a7ee2d7697beaa9429fdd7a65a88223aa737e322b0f2f16e84fd2df45b119bf389bfbc1cfc0589eafb SHA512 32568cc723733c1fc1d459ba8402735f587ecf91139d6bbcd67ca9412f535d5bd70eb1378e8454d3d7b6d2d2e6ecc8b6818f640741e8ca013675362d5cef742c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-fr/aspell-fr-0.60.ebuild b/app-dicts/aspell-fr/aspell-fr-0.60.ebuild
index ac3fae0d78db..9e657bca529b 100644
--- a/app-dicts/aspell-fr/aspell-fr-0.60.ebuild
+++ b/app-dicts/aspell-fr/aspell-fr-0.60.ebuild
@@ -16,7 +16,7 @@ MY_P="aspell-fr-0.50-3"
 SRC_URI="mirror://gnu/aspell/dict/fr/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-macos"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-ga/Manifest b/app-dicts/aspell-ga/Manifest
index 754b8ab91a88..d9eb4ffc6ecf 100644
--- a/app-dicts/aspell-ga/Manifest
+++ b/app-dicts/aspell-ga/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-ga-0.50-4.tar.bz2 394776 BLAKE2B d065dff80c1405d48e39d22e7f8ca789a264763b1caa978a1dfa568b7d5d4c2382bbf5e1cf3626905a9c1bda37bb9389868fc944027eaad4e47b31a452668fef SHA512 631d4e8a6088633be3863e04818b576af861bfbdb90b1641f792c74ca1f61a7d71b1167ae5585245767d628a44e215c2804dd4c2b050c279ee892810203fae0a
-EBUILD aspell-ga-0.50.4.ebuild 286 BLAKE2B eb354c5593df835a5ce66dadf6a6c0aa609d4fc958e444d7efb3197e1068dad7b39cecfb79cc6f1441132de8511c8e922c268919bbf37a7e16815a16fbdd0b4e SHA512 cceddc18c1642917bd42891b7ac4bfc70fbae86085cd26916a50943a931997cff9169fc5e5770217ec82bc50f084f43f597eeeb0c4547f3a015b246edb881cc1
+EBUILD aspell-ga-0.50.4.ebuild 264 BLAKE2B 9eb42a7aa6ea163b6d80664a989e1f3c3530d217f0d7be46d7c5359e9bc5e579c2549332f793ace34508dd9bd7b9ca6d5241aa63d75f3d7c13c682f2e7e1f697 SHA512 31109398304967dba20f27d4178a5e585f61aab4c040222b4f5d4267a5425461529e0d70fccdd8c63f59738325548c5ce48badf34d6b534762d2d1daf2d361f3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-ga/aspell-ga-0.50.4.ebuild b/app-dicts/aspell-ga/aspell-ga-0.50.4.ebuild
index 3b5727911b9e..45c6125881c6 100644
--- a/app-dicts/aspell-ga/aspell-ga-0.50.4.ebuild
+++ b/app-dicts/aspell-ga/aspell-ga-0.50.4.ebuild
@@ -8,5 +8,5 @@ ASPELL_LANG="Irish"
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
diff --git a/app-dicts/aspell-gl/Manifest b/app-dicts/aspell-gl/Manifest
index bd7f0a6911e6..8a6be393f80d 100644
--- a/app-dicts/aspell-gl/Manifest
+++ b/app-dicts/aspell-gl/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-gl-0.5a-2.tar.bz2 80043 BLAKE2B 9c2c4601695e5fa5b64d0047e942f797bd37e2c2245421cb3a236a52fd64ba3524e1131c6e0e1deca777cb793d03e786ad4ad8804eadafe3bc17adf779f4b074 SHA512 9c8aae22d23e1cce9c5c94844c35ec3eaa5b76e5049712b714993e7c628a0b8ee250de2ad1b646a6ecffe32ebc0e4f0009a4db041b6f8bde5d021cf71c5cd714
-EBUILD aspell-gl-0.5.2.ebuild 470 BLAKE2B cb69701f6c3f9ff3902b0c9a0d4d3d5997f18e32aca3787871feb9ce923d234f8717411daafc896876230edabaaa0cdffc87f74a7c7e710183af08c591b8f65d SHA512 df12f59b72fe6d5906e66971c7f94f66cb3054bb92ace510b55d439fb48d888a6b280c6fce76feeaaf94e79fe8978cfa2cb3d5b25dcb096349914804afbb7b77
+EBUILD aspell-gl-0.5.2.ebuild 448 BLAKE2B bcbd43eeee02231e7b930c09e7974f9b593a99d044538345a052358e8d127c1e4e5be6aaa6cfe0b7980d22f3c03de9cafc74a991396845cf879a9834b918b335 SHA512 4d96fdcabf45005a459e1ef20e48bb36019a04ea5a0973dbe8977a08bbac75479a93b11d9071206612bc1b949ada493640baf0643fb774d1f67b640ec55346c8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-gl/aspell-gl-0.5.2.ebuild b/app-dicts/aspell-gl/aspell-gl-0.5.2.ebuild
index d1ba0f5239a8..fe0b635a18d3 100644
--- a/app-dicts/aspell-gl/aspell-gl-0.5.2.ebuild
+++ b/app-dicts/aspell-gl/aspell-gl-0.5.2.ebuild
@@ -14,7 +14,7 @@ MY_P=aspell${ASPELL_VERSION}-${MY_P/aspell-/}
 SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-he/Manifest b/app-dicts/aspell-he/Manifest
index c9a23ad4a40d..570785e5aa3c 100644
--- a/app-dicts/aspell-he/Manifest
+++ b/app-dicts/aspell-he/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-he-1.0-0.tar.bz2 122781 BLAKE2B 24df4f12d3dda89e6654bccdfb4290baa883ea21f761046129a4baede917f2861b829dff93349b9ab441b5c2ef556702a0ebfcdf682a8e7ab00c746e2f9d9e1f SHA512 4db335c1566432ac8e18bace1f1ab892e47765b9dfb342f981b52637ee6768f592b7d9793c229e7f67f7f4770e6ef4abb9b2dd66da0feef9cc42bfd316adad88
-EBUILD aspell-he-1.0.0.ebuild 304 BLAKE2B d2812fba6de724fcd0168d75c3440cd92a161db2d7cd438d730cb2685db7172de71e00527a1eb8212a356720361aa787683ebaf6c65795ad8fb97f0c590b14d9 SHA512 4bf0bec3b9ebb8fd1360d19173cf4e3cc96eecf57fc1745823dd947ae219df94ae7f46d569947127db3218ee1ecb5578c09ff677ab304610e4829134bf8bd266
+EBUILD aspell-he-1.0.0.ebuild 282 BLAKE2B a323bf912799b0fade144b3440ef42aa0bdcb282d3354529be35621cbfef4f90a253e6a9e2bb1b7fbb96ad9043819e855f71fc25b1c0d94dc269a613dba006bb SHA512 5fd6819b0ca1d89993e91da23a0cd96f5bf416107887572a242866e275047ef5cd7f86a5645af0ac6672ea64e772b3105b26ac748161d1bbf194f78de87f2cb7
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-he/aspell-he-1.0.0.ebuild b/app-dicts/aspell-he/aspell-he-1.0.0.ebuild
index 6a8cea211a53..d56b14ea7ff0 100644
--- a/app-dicts/aspell-he/aspell-he-1.0.0.ebuild
+++ b/app-dicts/aspell-he/aspell-he-1.0.0.ebuild
@@ -9,5 +9,5 @@ ASPELL_VERSION=6
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
diff --git a/app-dicts/aspell-hr/Manifest b/app-dicts/aspell-hr/Manifest
index 20592f5acac3..e81fa405c79b 100644
--- a/app-dicts/aspell-hr/Manifest
+++ b/app-dicts/aspell-hr/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-hr-0.51-0.tar.bz2 208118 BLAKE2B 34328a99833dbbdb1e14e5d66c3870a576fd137d38711fbc1c57738057433d1eb7a996dd32ae87942d8bf1c3efd4dbf669d4d5ddc83764caecb8ce36fc2afd3f SHA512 d6d891f3e55252fdbc5e0534c623cc42311c25cd1219351ce8a8160c3c3c49a6f219706e02f2c1c27174ef77c64e17f8cc25844befb17a43802b0a09ab42b1ad
-EBUILD aspell-hr-0.51.0.ebuild 289 BLAKE2B f1ababf2ae93a92296b51a6b3ace7618a6c919b4ec3a3daa7447903adece34c9909a24cc3c826cc4f52fef9622a44522aae6fd55770cc662330d696fb3b190ff SHA512 725b3ed771846219dd433e0f8d1267c5901d61765747752d13178686ac9c36f839ce99bafef273505197731b013a5f77d8218d029bb1c8d30624ba51b8937abe
+EBUILD aspell-hr-0.51.0.ebuild 267 BLAKE2B 4a83a6a517aa53598c3f24c1d4dceea037b8ecbcb034e67ee3fa959f7c6808477bf6a7759372e57c2397c88254dc983372888d43b4c2a87a27d6993c8e91b8b9 SHA512 dc86a8ff9397bb29cefca14381c55445283a48807c0a64f0250cedecaad00783e9797943c44fdfcb379429b3e4e1f05c5399078dfd2eb7aced74de29578d0081
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-hr/aspell-hr-0.51.0.ebuild b/app-dicts/aspell-hr/aspell-hr-0.51.0.ebuild
index 676c9d67aae6..e553fe4c7713 100644
--- a/app-dicts/aspell-hr/aspell-hr-0.51.0.ebuild
+++ b/app-dicts/aspell-hr/aspell-hr-0.51.0.ebuild
@@ -8,5 +8,5 @@ ASPELL_LANG="Croatian"
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
diff --git a/app-dicts/aspell-hu/Manifest b/app-dicts/aspell-hu/Manifest
index 54315c4c1935..cda004313e6a 100644
--- a/app-dicts/aspell-hu/Manifest
+++ b/app-dicts/aspell-hu/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-hu-0.99.4.2-0.tar.bz2 375949 BLAKE2B 933844253b8280d01e4f37f141e566548b3eecfdb16a2fcfeb026698d64667faedeae512d582b7ceb900753c5e2b1fba6b474bb4d85e598c432d0ac0010a9d31 SHA512 95922401f2a8aeac61b117c464b4b83b8101fbe1e0ee758b3284a67c188348db55d900c2898eaa8639ee2db99c3b27e85f9677fc6a4d54caae57dd72101cb320
-EBUILD aspell-hu-0.99.4.2.ebuild 414 BLAKE2B 06a8263afd7c92ade713fa393888f40a7ec8aa4b95c60b08183db9e79926c4463d6951a9ebbc90906c23b0c5aacaf8ce2cc7e15b1791ea1af91ff61fa418c90b SHA512 8c0fb7a270b3ecec1fe1797f2d89e952a422b405921ca73be9cf1d687b2a7f7cea2ed14a8ea24f68e2e4fe3bf640de95caf110589172b72a493d7eab0f3d5641
+EBUILD aspell-hu-0.99.4.2.ebuild 392 BLAKE2B 8b6932715f94c95aad8ae16f1d789c1f35d2f43b981f2de3159f0d2bce9a7e9f142fe4c90fca2786e24168322a1274a75b2c12e50cd77af6a7e42919c37a0134 SHA512 90129e71ad73622f626369aea019ee55404174b1c528ec2047f6d92c8dd06bdcdc2902d55cdecea99ffe0dbf30bc496ac15ac98454621afb15b0f030c14541aa
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-hu/aspell-hu-0.99.4.2.ebuild b/app-dicts/aspell-hu/aspell-hu-0.99.4.2.ebuild
index dfa366ee5b42..e44b4915dcfe 100644
--- a/app-dicts/aspell-hu/aspell-hu-0.99.4.2.ebuild
+++ b/app-dicts/aspell-hu/aspell-hu-0.99.4.2.ebuild
@@ -13,7 +13,7 @@ MY_P="aspell6-hu-0.99.4.2-0"
 SRC_URI="mirror://gnu/aspell/dict/hu/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-dicts/aspell-hy/Manifest b/app-dicts/aspell-hy/Manifest
index 09a74519b303..8248302228a2 100644
--- a/app-dicts/aspell-hy/Manifest
+++ b/app-dicts/aspell-hy/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-hy-0.10.0-0.tar.bz2 191872 BLAKE2B bb74a82446b35a487bf61c27349e9c8c047bf9f9e12cb48b884b7aeb19eee4df7c7e4efb86292338540ae23d4081caf88b63409f06617e6a6da82e9bf7648957 SHA512 b2157c1d04e4d4726851fe4cda91fcc3cf0dba8d5cfaaea74deed77d9c5f94473e13784526f884ba483789a098dd3efee936c456606913a731a165ec3eb145a3
-EBUILD aspell-hy-0.10.0.ebuild 409 BLAKE2B c3ff250274564e5594bf7ebe17adb6ffe2b20dd5e2cfc3c069a1982cd29bc164ae3a451b6c7f9cad535c74219371ee797391f570626b2cc6442be80d419cc773 SHA512 d13c205b423a0ab13fc133906080bf7820d21d37d286eb322522ef2a4243e8ac43c59dcc74a680f2d91d40cc67970dfefed3f32a6dcb56970035e8499c7f55c7
+EBUILD aspell-hy-0.10.0.ebuild 387 BLAKE2B 6ea5dafcf61252a9c0c9d8bd49b89dd6154ad1870ab3ba1f60e99eb1ff4f5ecb51d74ec43a4d40d95c90f54f24e3cae1e89f498072f4f70e7a7b923ca9b03012 SHA512 a02edfcadb7c7374e72f7a98a6c7d9e06a386d01c0b92ebb2dff7f5ef66cc695e3292a8aae2e4114927697e8cd3efa3d8d2f41be3dd4cc1e36361ca78158ca6e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-hy/aspell-hy-0.10.0.ebuild b/app-dicts/aspell-hy/aspell-hy-0.10.0.ebuild
index 8fbf57acfbed..dbeac813fc12 100644
--- a/app-dicts/aspell-hy/aspell-hy-0.10.0.ebuild
+++ b/app-dicts/aspell-hy/aspell-hy-0.10.0.ebuild
@@ -13,7 +13,7 @@ MY_P=aspell6-hy-0.10.0-0
 SRC_URI="mirror://gnu/aspell/dict/hy/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-dicts/aspell-is/Manifest b/app-dicts/aspell-is/Manifest
index 3f265771b0a3..eeafc49d3c85 100644
--- a/app-dicts/aspell-is/Manifest
+++ b/app-dicts/aspell-is/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-is-0.51.1-0.tar.bz2 323850 BLAKE2B d3d15c594380ae173f94862eedaee8255a0d98f5e6552ea24fffbf0400d88a858d6d9eb56b35a314b3ae9440929eb525c41ea57f99c43dff0032da68ab8ebf95 SHA512 b96aeb407c1de700a20ca18bbd9e1bc1a4c086379ef7fbd0467178d11b9ed70e547a81a4659619e7385f89926638cb2a5e807cc701b444a7bf0d246905795bf2
-EBUILD aspell-is-0.51.1.0.ebuild 290 BLAKE2B bd18c4b39893ba4607c4cc4704708be57cf75af4c9ba45ec2367671008c8098c058afcfab4f012f43866f59607d8535b7bde64dbeb91b677452e02b32145095d SHA512 802a39ee9a9597b1b16f875e90fdb59fc907b7972ad791e2f9be46d3112c9ae2f448899a07476e7602640c96e231f0c97ee48bcd044e1a3a68a911a659bcb224
+EBUILD aspell-is-0.51.1.0.ebuild 268 BLAKE2B 31b9c7d26d339ca78695f459ae6a57cde573c2c8ca690a4bd84414b49e0c21e41045a3edb2fcd2ea2a2308e7c6fd316762f1c6ae63a2e0827e4062459f6c79df SHA512 48f77e171e1fd8c37c72a9a7a5b2132b9510fd696b08b158e7dd9a9c087091205e1362102f77a123c786fa2ae4a6eb61abdf1b59f3f3ff86c0dec8403ed52778
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-is/aspell-is-0.51.1.0.ebuild b/app-dicts/aspell-is/aspell-is-0.51.1.0.ebuild
index b4cb76774491..a915319fa23f 100644
--- a/app-dicts/aspell-is/aspell-is-0.51.1.0.ebuild
+++ b/app-dicts/aspell-is/aspell-is-0.51.1.0.ebuild
@@ -8,5 +8,5 @@ ASPELL_LANG="Icelandic"
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
diff --git a/app-dicts/aspell-it/Manifest b/app-dicts/aspell-it/Manifest
index 5137a5119af9..86e268e94e3b 100644
--- a/app-dicts/aspell-it/Manifest
+++ b/app-dicts/aspell-it/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-it-2.4-20070901-0.tar.bz2 261419 BLAKE2B d377690df133647c8345eed4178d91c03a2a6813f444833ae5c78a0960577fa2d8d259a5b04e053770e2df832260ae817c387ddd814593fe2e6ddf5f95eb50a1 SHA512 6a5014880e51103e70d57a6b01e2d4bb5d51ae939f72ee9270b46891804203399c817dd73c3a0b91c004744a4e66a1a5b402d19be0a53db952152cdd3c1741e9
-EBUILD aspell-it-2.4.20070901.ebuild 454 BLAKE2B e05e4ff0c53a08beacb50a1814c6c0c69f46fc23714830c7dbc3c45016616dfbb3975bf36c91918376300a383b6424e17fdfb2ceb11a6a9a3ce2bc85daa0bb7d SHA512 ba11b476c1ebd6b6f8a6a29c99a8df66ffb3eff6db2e8432198e784023685ee48f37055812f81c12c1a609e766d7aae46498d479140a88f842885b243979d493
+EBUILD aspell-it-2.4.20070901.ebuild 432 BLAKE2B 66e7b0d0af0b17bf868462e3140c3f6aae78ba188d89c5827a6f2441d05829e031935e459324447dfb8d1cdca21af9a65fce5b37c87dc0c4099f8d4b9847f151 SHA512 7bd227f57705eb47c12216e43a0d9c77ad2b0170af8de45c5eee70787fec614faa112c1a4e5933d6590df4b15d4eeccc6a9deb3bf3f60c74286e6cc2393dc5c3
 MISC metadata.xml 248 BLAKE2B 2c1fcd90482f1cfffb25b908862709cebdefed604a40a5611ebd3e8831829c1b07aab4911cb5962aa9bc0587832d8a01ed43558a6fad30feed29b9ae0ff97161 SHA512 1d44fa5baaf032845df65374a83f1eb1459100ced59d260a19456fff81ce7dc1c074cd34b1ad37b172af7cdee476fe0de39aa3a280e311816dd8bdd9c98a61ad
diff --git a/app-dicts/aspell-it/aspell-it-2.4.20070901.ebuild b/app-dicts/aspell-it/aspell-it-2.4.20070901.ebuild
index 2485651593dd..d4ee461675c0 100644
--- a/app-dicts/aspell-it/aspell-it-2.4.20070901.ebuild
+++ b/app-dicts/aspell-it/aspell-it-2.4.20070901.ebuild
@@ -13,7 +13,7 @@ MY_P="aspell${ASPELL_VERSION}-${PN#aspell-}-${PV%.*}-${PV##*.}-0"
 SRC_URI="mirror://sourceforge/linguistico/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-la/Manifest b/app-dicts/aspell-la/Manifest
index 525489742378..ecb034cc837f 100644
--- a/app-dicts/aspell-la/Manifest
+++ b/app-dicts/aspell-la/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-la-20020503-0.tar.bz2 42722 BLAKE2B 344e4cbf586e93894be20dff7ba44f79d775abe27b3ae3624fbdbc0d4f22c916b6e518bfd0c1d37d69e09d8b9acc50a32622013ecbda5d7ca2ebaadc07358ee6 SHA512 b167541050546edfdb6148f06952eb07f67c8a5115d40ea777d566b722d4476147e986de06ebc8ffdfdadf1f201e3c1b5f000527ca489da96e2b3f764e487e5f
-EBUILD aspell-la-6.0.20020503.0.ebuild 410 BLAKE2B d6b91f75691baf91c32fb7c70590f83b1b9e5d91169deafeab3cd3690034622ca9f575f8b717929e3835d75d81a156f03a9a490941917993089013d6181bc51d SHA512 d360900aee10ad08fb40f6a477a9c716c5a8d5ecf5e38f56cdf2c6f918d2090759772f7f99e0c05497dd408e95aa594567fd84bb3114eb5fcc520e7558968f11
+EBUILD aspell-la-6.0.20020503.0.ebuild 388 BLAKE2B c430451ad4990e796cfd9ebc0cdfb3426d5fe2b85bd169469247b25f680be8c43a9e6139c33b1e65c83913b3d59933e664ab5686eda4c6859111d7b2e7075133 SHA512 4a5f0fbb158b0698ff24f28a0cdb9c23853109a0151bde859bb119c6cfb1e8f5616a7e640a8c1b9c3f6850b2431bcf3ce1303048e5e1a41fafe1ef431e6d3095
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-la/aspell-la-6.0.20020503.0.ebuild b/app-dicts/aspell-la/aspell-la-6.0.20020503.0.ebuild
index 0f8f61aa73f0..c2f9979460ee 100644
--- a/app-dicts/aspell-la/aspell-la-6.0.20020503.0.ebuild
+++ b/app-dicts/aspell-la/aspell-la-6.0.20020503.0.ebuild
@@ -13,7 +13,7 @@ MY_P="aspell6-la-20020503-0"
 SRC_URI="mirror://gnu/aspell/dict/la/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-lt/Manifest b/app-dicts/aspell-lt/Manifest
index 5c85961ffbdc..1720097ab8d7 100644
--- a/app-dicts/aspell-lt/Manifest
+++ b/app-dicts/aspell-lt/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-lt-1.0-1.tar.bz2 155409 BLAKE2B 5beb2cad8c018dcb5b06701ec467464ea2b472c9cebaba966c0c495899de11c0b1fac29cf3d359cc1b8bf85fc890172dcd476206ac7b5b6eec99a619055ad34f SHA512 478acf95f4a7f7a705ddf481650a35f565b200886eb6b42bfcaa4669021b43a99e1f06ca3459d60afbf4cc0b3d111e9394308bc1fc6ec2ac920c9e7aa7f42b31
-EBUILD aspell-lt-1.0.1.ebuild 412 BLAKE2B a9b6160520ec2cd4a252f6b5743d1dcf3fe8de09d076aa986eda8de7936a23680eddad0c6939ed0dbb964b98194fab2c40d1a652b48284f053ec78ba10f126b9 SHA512 60a6d761a90363368373c8157157c1ac41187daf92e67caf357c5a04a34f9f39f91a60e5b2999e1fb7d80701a81f1b74a71f67f4d9ac8904c5ed80c313c4b2a7
+EBUILD aspell-lt-1.0.1.ebuild 390 BLAKE2B ddc81d7a143bdcf29256a3a3925eb958dd7a170ab2c3b5e746633c57d2ce71ccd395d79ec35d35cc3b5efcfab7f73fb283437fb6950393f19266187b8d0917e1 SHA512 bddfddc41cc1c8fbff8166eb3b27943e361f702078a4f5b31a5a190a9fa12091a67fe19cdc1dee69f80635d1c883e7bda2f1e52320cb78bd321bddc4c96ab6d4
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-lt/aspell-lt-1.0.1.ebuild b/app-dicts/aspell-lt/aspell-lt-1.0.1.ebuild
index c9bf4d9a46e4..d16bdea9873d 100644
--- a/app-dicts/aspell-lt/aspell-lt-1.0.1.ebuild
+++ b/app-dicts/aspell-lt/aspell-lt-1.0.1.ebuild
@@ -13,7 +13,7 @@ MY_P="aspell6-lt-1.0-1"
 SRC_URI="mirror://gnu/aspell/dict/lt/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-dicts/aspell-nl/Manifest b/app-dicts/aspell-nl/Manifest
index e7af4e1eb110..471dbdf3ba07 100644
--- a/app-dicts/aspell-nl/Manifest
+++ b/app-dicts/aspell-nl/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-nl-0.50-2.tar.bz2 428365 BLAKE2B 91bd81eb0925994961c8f11b28b74a87ec4dd4d0b03db4f6e4510329f3da9db7d50b93398f3bfbca0a33b67e8ba3871ff868562bc95028b40d8efcae2d995e99 SHA512 bee6218b476f8655fa325940ba5ea1035ff483b5b47b9b547f60fd63786e8ff08daa03a30dd0ccd988c2f01827bb06075021e1a1fa79c640db82e72a3ccd3152
-EBUILD aspell-nl-0.50.2.ebuild 350 BLAKE2B d2e45e87f0fc13276b95377702b3650f506ad78ccb6409d0eceef3bf6821b9b8b367c4f095c783f1e2316cdf0e7b169906201ce03f9d07130eb402ec166da808 SHA512 5b6b7d7bf63b033595a14b02732af02847692823976a6adc3c992b1908bbcdfe897b81546adfbebc6b8ed405ce25aafb88aee6e930a990ab19aa0dd608c1dc71
+EBUILD aspell-nl-0.50.2.ebuild 328 BLAKE2B 02d9759411124fd4b44e7fad51df1dd0c86e607b2723157f35ea3d46cc5459a92de32bc973c59acdd94a88961dddc5fa8c78fb741ba97fa0696fc5037b650b32 SHA512 79679ff8438f175295c23fb72cbc245b1555ed7f28da030f608b4b46fba46d3380ff6e257b6e9f3f68e853221844c4d3f7090323519ac5475b9ed75d8bc5d516
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-nl/aspell-nl-0.50.2.ebuild b/app-dicts/aspell-nl/aspell-nl-0.50.2.ebuild
index 07034805c4c1..0d803b1e7ff1 100644
--- a/app-dicts/aspell-nl/aspell-nl-0.50.2.ebuild
+++ b/app-dicts/aspell-nl/aspell-nl-0.50.2.ebuild
@@ -8,5 +8,5 @@ ASPELL_LANG="Dutch"
 inherit aspell-dict-r1
 
 LICENSE="freedist"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
diff --git a/app-dicts/aspell-no/Manifest b/app-dicts/aspell-no/Manifest
index de1f015a1624..dbfc565b75b8 100644
--- a/app-dicts/aspell-no/Manifest
+++ b/app-dicts/aspell-no/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-no-0.50-2.tar.bz2 286696 BLAKE2B f5719a12cc3f139c53cd7cc5a9a0ca6841ed12e4ed3c5c000100c7b196dc896c1bf5c5514224f9fa5cf269f65e88e9858b9348db888b77661e51bf6c0e5b35c6 SHA512 b07bf649ffce60a5dfa1e771fa0669d246afcc192155be027ad4db7eaba8e5ebce4456d83cec2100020938cda87d5e194c68039df9d4fa726013de4b6d5f5e4a
-EBUILD aspell-no-0.50.2.ebuild 290 BLAKE2B c5dbf91c0c393fcd2a686418610ba4b95651c61370960da3f741d79db014e310eda095f6d77127153df2f67776f2ebc6035924a8494d1366446c3fa8b051129f SHA512 c0c97c52643c482b35dd0b7916d74d15eab869635f89b5f3a551717c5a9c1834cc7c1f723d3dce41946df3ed6bd5f4c06292163cbf2f1fc96c6da1731698e670
+EBUILD aspell-no-0.50.2.ebuild 268 BLAKE2B 8f031895f335c642c0da99ab5f1ce736737346dfdcb5e4bcad2cf4ea9cf537f4db39e27e2e3078b390537a9a78ff04d5ec9563491e55fc9bbbcff493066a335e SHA512 9dae065d3bf9a75217423e57299a174b824beee899d93ef42e86b84a773621a45ab823e9ddb8e9dc1475b0df77307e0073141297277ec8f49d65c689f795573a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-no/aspell-no-0.50.2.ebuild b/app-dicts/aspell-no/aspell-no-0.50.2.ebuild
index a7511f174e5e..2a60407b55a5 100644
--- a/app-dicts/aspell-no/aspell-no-0.50.2.ebuild
+++ b/app-dicts/aspell-no/aspell-no-0.50.2.ebuild
@@ -8,5 +8,5 @@ ASPELL_LANG="Norwegian"
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
diff --git a/app-dicts/aspell-pl/Manifest b/app-dicts/aspell-pl/Manifest
index a4418410aa27..49983c225aa0 100644
--- a/app-dicts/aspell-pl/Manifest
+++ b/app-dicts/aspell-pl/Manifest
@@ -1,3 +1,3 @@
 DIST sjp-aspell6-pl-6.0_20120418-0.tar.bz2 579320 BLAKE2B d338a7b6cc804604e80cab20cf3b6c6d219377a7c4de4d513626e6b787b8aa32e4ab2a7925ea9bc1d0b224fc6770755e3c6ef3440a34c8adb187352b7e106c06 SHA512 58f6734d035f0b4831a7de48f4f0dc2394206e287cdefec95849a8a46f3bf2303f81228f24b52ace0a4f444cad2f354b30bb3598f3ff1930c17a4d54d808fe9e
-EBUILD aspell-pl-6.0.20120418.0.ebuild 534 BLAKE2B 9315e2e8257a872a9e76bb6e14771ae8de0d20adc9d37b9ec6f2d1b620ddc05c9b7672f04d7fdafd169f2db4c99693bf4058ea7a35ecc73abbf8dcbdcb6f7caf SHA512 07f4acfd0e5056c1e3c0a34488462a18c2f5c59e339193181aabc7c5147bbb17322c6a68f119dfeb227c7466507f420685f9bd45a83da8b1c58f79f71b8ecd92
+EBUILD aspell-pl-6.0.20120418.0.ebuild 512 BLAKE2B c33dd6184a60be332505a2c6222a09578bf4addfe947556790b8f9453814e0bc95e4516831af35a810cc9800ef5cde0612c6e104648cc170f614764c481e5d40 SHA512 f2b3acd53dcbae5ae03b5f4ba3d7943c5f9cb77df2b906a86cab66cbd332cafecd2fda6becc34e77cc0f579c5ca8c639ba3c937c3fa7d40d310b475a921c4fad
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-pl/aspell-pl-6.0.20120418.0.ebuild b/app-dicts/aspell-pl/aspell-pl-6.0.20120418.0.ebuild
index 8be4e2298261..065763de9841 100644
--- a/app-dicts/aspell-pl/aspell-pl-6.0.20120418.0.ebuild
+++ b/app-dicts/aspell-pl/aspell-pl-6.0.20120418.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.sjp.pl/slownik/"
 SRC_URI="http://www.sjp.pl/slownik/ort/sjp-${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-dicts/aspell-pt-br/Manifest b/app-dicts/aspell-pt-br/Manifest
index a277ac0774a8..ea060f0317b0 100644
--- a/app-dicts/aspell-pt-br/Manifest
+++ b/app-dicts/aspell-pt-br/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-pt_BR-20090702-0.tar.bz2 865676 BLAKE2B dd98250d378b15f321850e88de4a464ffa5e00183fda06990be9132406be268bf5144d4d500836df0e6f1d8f1601d8a38f3ed96ca00f3d9bacb5398dbfa9a945 SHA512 4c2606dad177881db7b7996c707a8d5a087fc9ec6ac46fac08b2bbb9c7acb51c7f0b3cb936f46257d03dd8e4e7a23b0244331db68a8208f5b7625d79ea6522d1
-EBUILD aspell-pt-br-6.0.20090702.ebuild 497 BLAKE2B 1cd8f64a04c2d7b71e1b255c111ea3d839557c59765b7a1dc0e7c4caf42089355d519d2fbc126e3dd5dc36c4bf1c7dba429180bc3371ac09b6eb4ac97f0796b7 SHA512 280f630aa590e4659aa5b5dde115bb9ff57dc8033d339007637deb9d7a5a07f9a44bb65ed446a17af04f46bb3dfab9665cafd8d58a94db359cc8f521df7255fc
+EBUILD aspell-pt-br-6.0.20090702.ebuild 475 BLAKE2B 2e37571500852b2ff949eb9f9ed440a04ab53d6ce5b34e67b8a50c188dc4bb46a2e3a3580f51947352f4ffa62a679e693fc687769f88a0450e8b43109e029b91 SHA512 ba510ace19a4e16187e342714ac889e8138b84e22d9a6a553119095585705204ef458b3e32253a57d1da9b3b36dcb6825bed59ef67dbd5c5b273991b784348c8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20090702.ebuild b/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20090702.ebuild
index 57c7a0648628..c3118eb862f6 100644
--- a/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20090702.ebuild
+++ b/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20090702.ebuild
@@ -13,7 +13,7 @@ MY_P="aspell6-pt_BR-20090702-0"
 SRC_URI="mirror://gnu/aspell/dict/pt_BR/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-pt/Manifest b/app-dicts/aspell-pt/Manifest
index b26f7dbe5a74..d8ed2c0aac4a 100644
--- a/app-dicts/aspell-pt/Manifest
+++ b/app-dicts/aspell-pt/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-pt-0.50-2.tar.bz2 201341 BLAKE2B ad924c197e7e72ea5be7a8f779fd7b144ac23e69ab6f089c338485c9fc4f5624a814b0f0f85d030647fe22e9390f03b873a05bd1cb26997986c30b5af0b10ef4 SHA512 21f115eae4507ca6e8c726476ba40910886e2ed17161cddbe493b2fe1c55a30703f033f8062eb0b9543d85541aa15e9ecab508cb3bb7403881315ecdb0bc55cd
-EBUILD aspell-pt-0.50.2-r1.ebuild 465 BLAKE2B 6bfed60d636dcc7f5a6b21cef02e93b7ad1de79a379af98ed2cae3d080d54d3d453cb7a19f34bf1661b139773dc13d1221c4307dc0ce3e0c9d5b9a7fbcb6e61d SHA512 5ea7cdc84145d0fa7d89fe73d0ffbcd327cd5eaf2df878dd89b2a26219d1e59849b171301d230af34cfc20882fdef885aa11640553832452ebbbc5decd0f0947
+EBUILD aspell-pt-0.50.2-r1.ebuild 443 BLAKE2B d76df1b6d86ab57b42fb777e514bc42579c0fd7b3b5ad50ce931293cf0cdabb6d921735200e20e81629eb7cf056d23a56bf19bd4544bfe24eeb86efcb6c31d7e SHA512 8d4c9830ff8087bfd39692b5632a8b6d68ef049fe7478d391dcad84b460f6c5cc4806d06488d69de8f8e5e9da1b2061f76d2b5df4200a5351309a5c1d1fcc42d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-pt/aspell-pt-0.50.2-r1.ebuild b/app-dicts/aspell-pt/aspell-pt-0.50.2-r1.ebuild
index 75c2cc3ff83d..55421c90df35 100644
--- a/app-dicts/aspell-pt/aspell-pt-0.50.2-r1.ebuild
+++ b/app-dicts/aspell-pt/aspell-pt-0.50.2-r1.ebuild
@@ -9,7 +9,7 @@ inherit aspell-dict-r1
 
 LICENSE="GPL-2"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 src_install() {
diff --git a/app-dicts/aspell-ro/Manifest b/app-dicts/aspell-ro/Manifest
index 3f4f25a677ca..8d44f980bc86 100644
--- a/app-dicts/aspell-ro/Manifest
+++ b/app-dicts/aspell-ro/Manifest
@@ -1,3 +1,3 @@
 DIST aspell5-ro-3.3-2.tar.bz2 444966 BLAKE2B 078a10fd3cdcc0771f48cfcaa606c626328becdb98ad8d53b31d2b08dd32d532caa5edcb1649900e29fddb81d960c35e6b6af74aa8e20b15c2f6dd3bf48b8957 SHA512 0027334b6201e24b038d78d5b01b8495a661dc41df44b099b6c27156d11f33c26db1dd7bc9dbf45263695820b20da3891da58a30584f5e285579dec199b5acd3
-EBUILD aspell-ro-3.3.2.ebuild 368 BLAKE2B 182c0cbd37855814b31e7e350294cd349c2894bde8b13b2a7215aeea794647589fb8084375f85d68e0a3a31dea4fea2c839315e08d873de79cdea8c30af92c56 SHA512 aa7a343a0673616524ddfd8ae5d8ae1450230e3f2dce018a43e78445f0db071a2120bcb346d8a9ee122f3eb1f3f4d8af9f8969c3c4c85d8f4919441202423939
+EBUILD aspell-ro-3.3.2.ebuild 346 BLAKE2B 103d66ca3997161211d7268db459b3328f836306010f3211dd03c909ac8b770cf26327fd85d3f537dc5be40e3c2dedc9c3b515ca5090e56028922a6fb215436c SHA512 d58dd9eee7e297df26e58f645bdc707432e48a287059c598f9ff4cf6224b893fd6ca2e4247d1a62c582a6ded4d21541a0c6e8f00c2880d4799759958ccdbaf29
 MISC metadata.xml 244 BLAKE2B cd51ca64142dd29c7b2538142821322696100f916c76acf1472a3fe8a955786d3ec5ae1cc5bbed2daf2fa40cb2239901d25b7c3059bc14aa1571796ca35b9f06 SHA512 ab747cf65f0d06ab770b00b35ac0da826824bfe088c30dc729ec32d3e1c3dd2d00f9d701a351fdb1ba1c02a16706076bcd920e2fea34758c7352320e186054c5
diff --git a/app-dicts/aspell-ro/aspell-ro-3.3.2.ebuild b/app-dicts/aspell-ro/aspell-ro-3.3.2.ebuild
index 46ac5c7ec9f7..2aeb457f2223 100644
--- a/app-dicts/aspell-ro/aspell-ro-3.3.2.ebuild
+++ b/app-dicts/aspell-ro/aspell-ro-3.3.2.ebuild
@@ -11,5 +11,5 @@ inherit aspell-dict-r1
 HOMEPAGE="http://aspell.net http://rospell.sourceforge.net/"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
diff --git a/app-dicts/aspell-ru/Manifest b/app-dicts/aspell-ru/Manifest
index c0aa19cf4c65..559879f05db0 100644
--- a/app-dicts/aspell-ru/Manifest
+++ b/app-dicts/aspell-ru/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-ru-0.99f7-1.tar.bz2 427312 BLAKE2B e039744dff54dbad3dacafd63f5e4874b119b01da57929f403d535958b80b33e90a5429fdcfcc3d2fff2beb0e97e67fa0bd8af03c6a1ca2980d7c7718843c0e6 SHA512 789fe15f5502b54008a41f2afb5635dcb7bb0a36e61b300ee48b2429c339793f5c4808d6063f13f1f8455ce251912433890e7d01ca59d8b0924ecd2987ceb430
-EBUILD aspell-ru-0.99.1-r1.ebuild 589 BLAKE2B be1a4d239057cf2639b604ce9af93066214f96bf1faede2b200c377c159582d741ef3c2512a98e570449ccc5da9628765a5c5add17e7516fc4a73ad638df466f SHA512 501e8b66c7ae4b44bbbd25e25eb7b88405cd91e7801b66ab6dca34f544e40f83bcfc0836dd62cbff1f244c51d41d8b7f55749b5d22d411fd9c49f7540520bd86
+EBUILD aspell-ru-0.99.1-r1.ebuild 567 BLAKE2B 6dd48f82e4b6a2354b9afc9ebdfe56e56bf11bbff6b6da29bce75db4b7c0bb029cd4a8a7b3bef1472935b6335513aa661fdccd8a24f6ae80c5e3a0cb81560932 SHA512 17b3f8452d0114b99844bf5913ee05470d39dc4a6abcb1a9c4a93a2e844fc5f9e1c8c0e23bfe026ea982d204df60cf4aaada5130fe80693b67144cd0c62d6acd
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild b/app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild
index 4fb8b37ff70b..9f5a4ac01205 100644
--- a/app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild
+++ b/app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild
@@ -14,7 +14,7 @@ MY_P="aspell6-ru-0.99f7-1"
 SRC_URI="mirror://gnu/aspell/dict/ru/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-sk/Manifest b/app-dicts/aspell-sk/Manifest
index e9dcb22cefe5..abf5122ab51a 100644
--- a/app-dicts/aspell-sk/Manifest
+++ b/app-dicts/aspell-sk/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-sk-2.01-2.tar.bz2 338933 BLAKE2B b306850bb72e8bb60dec32853afe6e7cd0796f92730e54ba25c6051c65ba5e53e1d5dcb091866adc3dd90d8013863b419d1c98f4e474f6b29754da326eb5a72f SHA512 020de459d4ff9c6e0c88428d43c9feea346bf8fadb9fa1233e9e54471ee23f970524a9a47cc6a45d04d6857387c9d9d1ecc1af2062325298354ee6c2d9c314b4
-EBUILD aspell-sk-2.01.2.ebuild 304 BLAKE2B f424c7cff5becc2133a4fc9a3609ccf459c7620c91f4292b59f06df95d67ab373ac27fdd077b5f2ea2342dad052296746ad60af7a0d2fdfcd4375a051e55aa6a SHA512 9bf539be0b965ebea63e588e6413a066200c2aca6f32795f52db17c1d10a358fc2d5e6eca737391406fc6051b85c176b914ec4eae9fa1b3db71717100bbc136a
+EBUILD aspell-sk-2.01.2.ebuild 282 BLAKE2B e99ae2381aca83493a0f35b89cbdec521e494b91b44ff55ba050241927f5d57e2cfebe58df31e0c8d7c15ff4882257f65f1eba774891ed004fe386d121fc6c2d SHA512 c3660a009311837f9820df8277fea5e04906bf1640a7e67377b26235466cc058729fd50f0f3870e6e356f8d47c9ebd3ef10bf618ae0751ab4721026ff7ddc535
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-sk/aspell-sk-2.01.2.ebuild b/app-dicts/aspell-sk/aspell-sk-2.01.2.ebuild
index 0fffeeb34e50..9d9135863b17 100644
--- a/app-dicts/aspell-sk/aspell-sk-2.01.2.ebuild
+++ b/app-dicts/aspell-sk/aspell-sk-2.01.2.ebuild
@@ -9,5 +9,5 @@ ASPELL_VERSION=6
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
diff --git a/app-dicts/aspell-sl/Manifest b/app-dicts/aspell-sl/Manifest
index f075e3591272..f82d7af279f7 100644
--- a/app-dicts/aspell-sl/Manifest
+++ b/app-dicts/aspell-sl/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-sl-0.50-0.tar.bz2 215463 BLAKE2B d3583a18cd10d81a443938e8c1430061ad004c964fe84eb79cd721006eee7ae4c422130d8dbee6cbd588ebbec33fc766a0d19eaaa4fc4b5ef60357b6d96fb188 SHA512 17b74bd3c6d7fbda0b4f6d14ee529f47f39c349642593312c160eb4e7eb6eb40f704e9c34e6fb33ef9e829b861e92a224196f55326fa4d02197d12912fd4b44f
-EBUILD aspell-sl-0.50.0.ebuild 290 BLAKE2B b1a712eb59a761b129eb9e87a7b6de62d9b317682926ab014e68584e5567ef1ebe43e53054991eed643d928ee2cd22e3096602ae82e9d7f73a876db23a8ccf76 SHA512 c144ef9b9f2059eb5d34ca20910ad89db870f2ac5dbf39320057a851cec97d39acdf73e0a4f308d2fe02968a35876f5f022f1505acb0d986c252d930de31cbaf
+EBUILD aspell-sl-0.50.0.ebuild 268 BLAKE2B d573c0a6187dabe710bfd0781cf328af8c44d68dbfe3d12e63a4806389c449c47f2de56307a9ae0448a5a472ae988d5764762cd0d5e5b6c553bbbd5b7513d9fc SHA512 9ddc8845e1105ad930539b93fdd904f9bd1e16040b5e206a03d5d011e8c200c609d4ddd93ac85d25db9b7486f281d2da79034ed341eb23e0b061d88d99e425fb
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-sl/aspell-sl-0.50.0.ebuild b/app-dicts/aspell-sl/aspell-sl-0.50.0.ebuild
index f81c0cfd755d..c27ccdb446ff 100644
--- a/app-dicts/aspell-sl/aspell-sl-0.50.0.ebuild
+++ b/app-dicts/aspell-sl/aspell-sl-0.50.0.ebuild
@@ -8,5 +8,5 @@ ASPELL_LANG="Slovenian"
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
diff --git a/app-dicts/aspell-sr/Manifest b/app-dicts/aspell-sr/Manifest
index 9325ff62b666..e4884432d822 100644
--- a/app-dicts/aspell-sr/Manifest
+++ b/app-dicts/aspell-sr/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-sr-0.02.tar.bz2 574923 BLAKE2B 3fa85bb2a24716a51c33447fa15fdc833059d49db62f36d7f11dc21baa926c2918c869d5e7052f6d729c038af1aa1e12f47c6476349b6f34989c6fbbbe3ce34c SHA512 3334d98779c9eff74ca85e5168e51375e38f831ff3f2b9164d0773cf220bd9ca0076d282086bed6258c643cfae70124d985931982db6c885b8d53fc35fb0c395
-EBUILD aspell-sr-0.60.ebuild 405 BLAKE2B 07533d25eb998c99e291508fb7dc5811d15298c7c74b629d3c80290a28f86f61908b6647e39ee246f80542109594415211ba5a599e2cf7e364d468a2f5f70f16 SHA512 4ae8d9673940d9e861927d7137db23c5e20eb98f51f272758b03081a0c9800024838ee27d65e6742ed03edbd65a5865343d9556808199f1a89e3e4fc5a1d3b00
+EBUILD aspell-sr-0.60.ebuild 383 BLAKE2B 0db266913839223978431f5117b05e85dd76a047b94a8916d15de4f99d9d1bd5fc48bd896cc7f252d05cefbda9f0ecae804ba8db26b0fcdaf49513d861ddbf18 SHA512 dec0e14f114b8990336c12dace344fc3481749bda9332be0751935cc01f318577d66ac7280bf83194b40a5a28833cd212510345ba8e83d8497bef4e3ba4984b8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-sr/aspell-sr-0.60.ebuild b/app-dicts/aspell-sr/aspell-sr-0.60.ebuild
index 13578215882b..18a1f40ef2e1 100644
--- a/app-dicts/aspell-sr/aspell-sr-0.60.ebuild
+++ b/app-dicts/aspell-sr/aspell-sr-0.60.ebuild
@@ -13,7 +13,7 @@ MY_P="aspell6-sr-0.02"
 SRC_URI="http://srpski.org/aspell/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-dicts/aspell-sv/Manifest b/app-dicts/aspell-sv/Manifest
index 9bfcc244c157..253646a0d0c3 100644
--- a/app-dicts/aspell-sv/Manifest
+++ b/app-dicts/aspell-sv/Manifest
@@ -1,3 +1,3 @@
 DIST aspell-sv-0.51-0.tar.bz2 93942 BLAKE2B d089e13e67849ef5fe51b7c7cae1c8e35e47363358842349118fec3685f987d3e87301942d16f95df914f39d1d7594f2f257596812c20cfaf1e728a2a1d12df8 SHA512 f995f3ae1a1380a5dbb171786c2cf3d46670c4bc012792a1d241ff0f3de61046766583e3704c57618eb0690aa0e915b64130114420358a3f46b5b59a37d45e5c
-EBUILD aspell-sv-0.51.0.ebuild 349 BLAKE2B f594e0ad8f17a708de940c8f659f222d2f1bc510fecb2459ab3054bb779e61e4dba2d886590d9916753978bc14bea1a5fe94ade251aba47963f2b968d3cf8be7 SHA512 c4eac20dedae804568d746eea2ad6732279938772720b25e9ce6766d5736d73fd0b94e4693c40c6ca71a533cba84423b96f96a5090fcb2332817f0ed98901eb0
+EBUILD aspell-sv-0.51.0.ebuild 327 BLAKE2B 6a68bc43fc99c09e4032b5d8ca613e33345087603b3a87622279285935748eadbcaac71b2c223dc9fa3ca622788461f6b156a9a6e77d05d39186ab051276251e SHA512 07b615bf3392f86977bc8dbba3faa51b894a7b2c9a76eb84a7c750eb0ea95e7b6242568f91c840021b2d3d60b1f15b4ad802d0110ca0cc71d5c9685dec7321f1
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-sv/aspell-sv-0.51.0.ebuild b/app-dicts/aspell-sv/aspell-sv-0.51.0.ebuild
index 68a26571b758..555be64f3ee6 100644
--- a/app-dicts/aspell-sv/aspell-sv-0.51.0.ebuild
+++ b/app-dicts/aspell-sv/aspell-sv-0.51.0.ebuild
@@ -8,5 +8,5 @@ ASPELL_LANG="Swedish"
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
diff --git a/app-dicts/aspell-uk/Manifest b/app-dicts/aspell-uk/Manifest
index 2f94c2a93527..bc3f40a73acf 100644
--- a/app-dicts/aspell-uk/Manifest
+++ b/app-dicts/aspell-uk/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-uk-1.4.0-0.tar.bz2 226767 BLAKE2B c91ef5132126b477a827b576005ede885932226659c96192a7a176f36db952c802550939dd659bd1b341442acfbd840a8811202a44f054070e9eb3d31ec8bb0f SHA512 2e66465d17695dd3147241f13d611571f8a80a15886c69728d2f34019fb4834e56e4c0834d9e898927522b54d75f78a32dd3435b2c16eb86cf9cfa11070f0799
-EBUILD aspell-uk-1.4.0.0.ebuild 316 BLAKE2B 05eec494878d13dd38c509fba39cd24944f4bf3904bdb2c511919361c5d797fe78180bb5af7c52a907eb621ae22e08c8f10ff6e20dbdb6a1f611520d9e479d64 SHA512 0bb97e909df7b904f8fcf46f1414f271f1c82a2156080eda1077bc2a0472331fce4f22dd53035f8f1b934493d8b15936974ee4c0b744c58754fbf7d355e52642
+EBUILD aspell-uk-1.4.0.0.ebuild 294 BLAKE2B 6016541332ae9d78921766937604432514199f27d9af5c08b75b1124b78a3c7074b5152c0a724f1f97430f2f13bf7979203e40eb7a7c9bd275801358ffbc1d08 SHA512 f7155388c63b8de5085e3c31c5124e2f42f33a7aabadf9c71eee8f454d7cd2d3dcb8ddabcb59ac12987f87cc479525814e343d352ceda4b5fcfa5ab4ceb946f0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-uk/aspell-uk-1.4.0.0.ebuild b/app-dicts/aspell-uk/aspell-uk-1.4.0.0.ebuild
index 0040f8ee1c0e..a9b2a3c59599 100644
--- a/app-dicts/aspell-uk/aspell-uk-1.4.0.0.ebuild
+++ b/app-dicts/aspell-uk/aspell-uk-1.4.0.0.ebuild
@@ -9,5 +9,5 @@ ASPELL_VERSION=6
 inherit aspell-dict-r1
 
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
diff --git a/app-dicts/aspell-vi/Manifest b/app-dicts/aspell-vi/Manifest
index 0946ea0cdc7c..6e435d89b88e 100644
--- a/app-dicts/aspell-vi/Manifest
+++ b/app-dicts/aspell-vi/Manifest
@@ -1,3 +1,3 @@
 DIST aspell6-vi-0.01.1-1.tar.bz2 30843 BLAKE2B 73bc289d65bd76d29bfb1db25ba9e2a8845997e10eea26d98989d7d3b3d8c78715e797ee6a726a02632150b744dbead32392199886e2d4f2732a77e686b9627c SHA512 d6b0a85ea3edf3193327f6df1b9c24947663fe711f060f10122e2c60aea2717d70277fd516fa685d9886c725baeebfc72d3f33e240ee8d182be669da716bb5c5
-EBUILD aspell-vi-0.01.1.1.ebuild 308 BLAKE2B 7481a1a7b5bb327c36a927bd247ea02610534762d770a1d64a39f002b10fc541aa842ccae6e10ca5f96bfc4157044ab7b7cd7b346f098637a93d72b966b8cbe0 SHA512 2142ea27ff1c17eee96685cf4f4fddf0632907c4573f5a39fd27f36cbf2161b57e9dca3bdcd621bade4ecc07f4342ce8afb82b5627f787e25f1deb1b5212f586
+EBUILD aspell-vi-0.01.1.1.ebuild 286 BLAKE2B 4c9bcf3dbe5c784d5bde87b9ff61ad5778fcca811b3303d5c672deacd1ac074e1c0d1cc364a98e4661d37c0cc41ff4f51d889ab0ab5c199f83c9e295b9f129ee SHA512 b3517d8684c448d14605df349814a8b941abdb7006ef5fa82006c90878030b462d309eb0ccd775196af3260720ce69e590a913ff24ff7a21e07da0d87be91230
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-vi/aspell-vi-0.01.1.1.ebuild b/app-dicts/aspell-vi/aspell-vi-0.01.1.1.ebuild
index 4c3c99b03eaf..c47325651577 100644
--- a/app-dicts/aspell-vi/aspell-vi-0.01.1.1.ebuild
+++ b/app-dicts/aspell-vi/aspell-vi-0.01.1.1.ebuild
@@ -9,5 +9,5 @@ ASPELL_VERSION=6
 inherit aspell-dict-r1
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
diff --git a/app-dicts/gnome-dictionary/Manifest b/app-dicts/gnome-dictionary/Manifest
index e38fcfa8bd48..bba2ed1ce9ea 100644
--- a/app-dicts/gnome-dictionary/Manifest
+++ b/app-dicts/gnome-dictionary/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-dictionary-3.26.1.tar.xz 662048 BLAKE2B 3b77d3632629f8502476f029ab9ba3c66225cd619992e185b1403adfeba718b7e0fa0f32762eb086c1e9ef80a08cf79cd872e2ca3026b8cb3975954077c5f7c1 SHA512 da7169795740295c13f02143f5263603f0f6c621e96cecf88a4ee089114399d59f083987bc4571821467da64dc43f00bebbe4ea66b46a035088f85d35d6aee27
-EBUILD gnome-dictionary-3.26.1.ebuild 1021 BLAKE2B 76145dc3d2bce91c3b9e4f550da49131c29c14b24533d0f5abf839079c16589fc22b052f540cc30daaf1621a80b561683b96fed956a634c15f73ce751f5ac932 SHA512 e21c151b0700a995b21feb123195b26b3e30fb601edc9ee8ef61d258808d2bbc8da13d100806562a8741b2de4b52dfe10b0dfc7bb33d21c5896e173ea44d03ab
+EBUILD gnome-dictionary-3.26.1.ebuild 1011 BLAKE2B 5100b5955ca2d595f457958caf21d6f40e09ce84906ef5c34d1e03d0370d3361cbe9067c44212a5adeaf124c720571bcd2404afbed8a9382bf62414b39800522 SHA512 4c4e28af9b762ce5dd000318a9ffb22591610439d2d947d3b343a489f958c86845fe35c7b92124b1a854f97fba4be70e4cb4899df4be9436d654ba38f4b58210
 MISC metadata.xml 316 BLAKE2B 61e50cf64e718dff6380a8840d59f5679e8f084efadcda41cfb45af74177d1121af1db7485fe57690090b0d1deaceaf9d53733fe39447827643c1785b4c68f3d SHA512 c46d3611dc1954a3229a98892c23aa1ebbc74c572dc5562660fce3390cfb74252515ee3a3048418c855c8165a5cea8e5df1fc10c94f81915eac400d7c58850aa
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-3.26.1.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-3.26.1.ebuild
index cc3842fba673..7eaaec15cf35 100644
--- a/app-dicts/gnome-dictionary/gnome-dictionary-3.26.1.ebuild
+++ b/app-dicts/gnome-dictionary/gnome-dictionary-3.26.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Dictionary"
 LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
 SLOT="0" # does not provide a public libgdict-1.0.so anymore
 IUSE="ipv6"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.42:2
diff --git a/app-dicts/kasumi/Manifest b/app-dicts/kasumi/Manifest
index 73bdc03dbed9..bcd0dff2ad41 100644
--- a/app-dicts/kasumi/Manifest
+++ b/app-dicts/kasumi/Manifest
@@ -1,4 +1,4 @@
 AUX kasumi-desktop.patch 368 BLAKE2B 2d54d40cf569f3bad3552fc7461fcda4be17245937b14ac183d035410698a15efa1e2d1280055b2d21cee14e3dafa48c5c27a94f525e6948f37c7eea20193c5a SHA512 c45d95fe9d39b79fda38715ac00567b1993584f47b1e6040d7ec3c93f913d0d61f2667e07d3fcf6335e7ecf5f8978627b42f639caacf5da7a1e89d25faa8b35d
 DIST kasumi-2.5.tar.gz 279587 BLAKE2B 3f2b807f76bfe1915ef978b18cf3f26efc8f64c903bc0e271f0875c1f7d5611307e2587093f2f289d9ade95370725fb13d16253ae7dfa6a063c525b727f7bd15 SHA512 066dda59d84b456c514a896b376bfc6df8ac64404f06fbfa8c369381acb6d260b1f22874885be2eab844f8f3776b944a5c700a966464ebef74d82c28bc97f970
-EBUILD kasumi-2.5-r1.ebuild 589 BLAKE2B d76a28c455ee16fa2f646cccd3f5f283abd136b1f3a3dcff0564495659ee707d609fd4f76543420b1e7ca6d6b99542f0003f26d84048be31485cde37674e6d75 SHA512 f32f4f42c15704a5a745e044a0bf818eb0bcfdca793c9c2e430beb72974c393bff818b99b86715fbd923ab4d94d5b960dd13a75449566679d7d3dc849b5cca8e
+EBUILD kasumi-2.5-r1.ebuild 579 BLAKE2B 24d19a6d0f4c0af799f76fa1993bdc88e82447e282ef59ae5b760b46755d4c10ffb61374ccf27b32dae181e94ee067b8cce17f096b72b597f0be5e7250399ccf SHA512 b44f4b41534cd0ff5329b7ee75df10b71212cdcaa74a3f3f31c60ca53fda2ff2043ee2afa71997030e145681a8fb2c845ac5a77a146c81bbde62e6d2bdf5fb8d
 MISC metadata.xml 323 BLAKE2B 7b24481a26431b43922ac5dbb7baa6e36179920e3f80c33c05aa76ee7773a5dd709585bb0a7cab12c3a5208da9717bc9caadb962f7937c3722c681e470750722 SHA512 b6a8ed90fab75456464706096931ee1cd739b0019ccd9fb25c1e863ab0d95365a54feaa30e7c37158edb5062e07564d1839f89f4adbf641cd4815deb717c01c2
diff --git a/app-dicts/kasumi/kasumi-2.5-r1.ebuild b/app-dicts/kasumi/kasumi-2.5-r1.ebuild
index c0b6a4f5f4a8..951c12ae1ff3 100644
--- a/app-dicts/kasumi/kasumi-2.5-r1.ebuild
+++ b/app-dicts/kasumi/kasumi-2.5-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/41436/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE="nls"
 
 RDEPEND="app-i18n/anthy
diff --git a/app-dicts/mecab-ipadic/Manifest b/app-dicts/mecab-ipadic/Manifest
index 736a4ac24b27..83ca3cd422f3 100644
--- a/app-dicts/mecab-ipadic/Manifest
+++ b/app-dicts/mecab-ipadic/Manifest
@@ -1,3 +1,3 @@
 DIST mecab-ipadic-2.7.0-20070801.tar.gz 12208105 BLAKE2B 448aed0389a18be5cb8161c600827190353b884cbbce4b86b122098b9ce15a2d838da93b37c608bf66dcbac7ec84c11aef1b87ba7907d1a4cf5bcfcf4a491da1 SHA512 35ea662cb62f1967849f7ed5781bd6dafef0fe20d63e88d9a0057666e57ed23d5a0e6fb8d0701a0cc4da43a1050c1b02463bb862decc71c36b7fc2acdc158d86
-EBUILD mecab-ipadic-2.7.0.20070801.ebuild 530 BLAKE2B 420208001e695ac6adb3cb01a4f61915c7480c3b338b080ba2b836229e4ea64915082686485340801eaa8dc9faf3424dc6d880b9537ca64b4ceb8598fb33c89d SHA512 ee75999b93cbe0219c31b0a9781d52dfba47e968336c0aab718b764e5c4523d6ef3dc95e7499f5cada5b9d308f96fef639f4842860ae78b3b1761838cce1bbdc
+EBUILD mecab-ipadic-2.7.0.20070801.ebuild 508 BLAKE2B 9ce77b8b9860df2a4b3d0363de7a7285afd11d280e6ceae3643a4c3b47ad441d4aa064f025c577e08d31d9c749160c2b2bf61d9a877b2a3cc6d6a174608fad15 SHA512 144875ee763cb3cb9412fd9d9d206395a2e790b23c00cc8eb5ed585d918a658abc34c3b2a29084519e42d490e572675f60e2e7d349adbccb114deb3a2408ac05
 MISC metadata.xml 412 BLAKE2B ca6440887d39a7ded3f9d000ec965344164f69dfdf0e98bd070cdc531804d7c94d74fe9a6a3ead7876fd9bf39eacbe5649b3e5357b1083f30d78ac51fd0a7afa SHA512 78feb6a8557ee197f02071540a3c6836cebec69cffc3d32a22f8563008614da66a6b26fafa0dae24b0c21cb7492e203c096f67c5482d1ffe617098b0db0670e0
diff --git a/app-dicts/mecab-ipadic/mecab-ipadic-2.7.0.20070801.ebuild b/app-dicts/mecab-ipadic/mecab-ipadic-2.7.0.20070801.ebuild
index 6cbb2754ca26..91183c750f0f 100644
--- a/app-dicts/mecab-ipadic/mecab-ipadic-2.7.0.20070801.ebuild
+++ b/app-dicts/mecab-ipadic/mecab-ipadic-2.7.0.20070801.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN%-*}/${MY_P}.tar.gz"
 
 LICENSE="ipadic"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
 IUSE="unicode"
 
 DEPEND="app-text/mecab[unicode=]"
diff --git a/app-dicts/myspell-af/Manifest b/app-dicts/myspell-af/Manifest
index 53b937f958d9..b615c57d015a 100644
--- a/app-dicts/myspell-af/Manifest
+++ b/app-dicts/myspell-af/Manifest
@@ -1,3 +1,3 @@
 DIST dict-af.oxt 1668991 BLAKE2B e0d45644c466041a8758164bb80f9b9e333e7a62c401d32f456e60aebd75de0fe98f919e02a856a17ed9ccdb011bd0f564946e5c32cdf764e7f7c47eda425fe8 SHA512 40a479af0371b9ea0342ea9faf5c74c4ff33eaf1207187a00bcefcee42e71f4ece59701d91e86172f1d941a7074da6ff2931d4085dec354b93e1c4be20a9f725
-EBUILD myspell-af-20080701.ebuild 554 BLAKE2B d387e776aafd3a38b34acd01e1550a04b68bd0a8cf6a194d7e27dd6511736092b183492731b89fe7f25ce106e41a6982fd54ea77821217263b9097ba5ccf7ca2 SHA512 2b556dfac566036da446f13df0bca25cffb3e10b1db35117d8af67afac5498c8e26e637aa578c4c77007001156afc287bda73fa400c2a9caa21a1ed58d0bc881
+EBUILD myspell-af-20080701.ebuild 532 BLAKE2B e0563ef5a97ff36c09e45106667732849cfeee8c72e4d77df99b0f146fa49cb9a649adba09d37a72c908c35e207438ecf53c6ce730aaea2f63b2b61d638b12d1 SHA512 3d057aec9137a663d317decca474683eba5fbfa6d3ce08ca738f3a4f86361f930e8bd35d9f0a87fc7656da993f4e8aca05c0191b4a76e849c65f381fce2b356f
 MISC metadata.xml 251 BLAKE2B c3fd5444bf91aeb5fca487fd3f35d92e951cba5581257ac67bad06e898b67385cde86db9395f03734daf6fa65f76a3217d86e8745c62d0ceef001aa2a62749b5 SHA512 8efa4d577315623dc1527c04418d7e142f1583cec26341ce4b49f21e4cec496f5db3ecb782db80910c9a2df0a7df94af5d22361e458c01cd8dd79bd593292220
diff --git a/app-dicts/myspell-af/myspell-af-20080701.ebuild b/app-dicts/myspell-af/myspell-af-20080701.ebuild
index 6f9d90af5dd4..2a0eb7fbd14a 100644
--- a/app-dicts/myspell-af/myspell-af-20080701.ebuild
+++ b/app-dicts/myspell-af/myspell-af-20080701.ebuild
@@ -23,5 +23,5 @@ SRC_URI="mirror://sourceforge/aoo-extensions/1109/0/dict-af.oxt"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
diff --git a/app-dicts/myspell-bg/Manifest b/app-dicts/myspell-bg/Manifest
index 630032973312..c0fb0a933d1f 100644
--- a/app-dicts/myspell-bg/Manifest
+++ b/app-dicts/myspell-bg/Manifest
@@ -1,3 +1,3 @@
 DIST OOo-full-pack-bg-4.3.zip 1360735 BLAKE2B a1f7920364efe085717a16992cbd4d0ab0aaa3b751b1364aaaa652265563369ef1cd13978afe9f6a221f17ff02595acbc36edfd9e6a19a67bcd4b195d40566c3 SHA512 1c4acf0c8377c6ec3f0dd26c84a5232be88b1fecabcb08dfae4f45bf819c770427731cbf1b01d65d3a182cccc3d0bcaabf3ab85735221e2ff09fc47bd66341d7
-EBUILD myspell-bg-4.3.ebuild 755 BLAKE2B c63129624c8cb9060c46b82e296bd3efa6da31a73765cd1f932fe48553083969a161b0570b13f590596a010578237085f837b4c892a89557e407fa4030c85611 SHA512 403c184b4709b6bcd882281e44560583434e98cc6742e85d41df91a2effc5bfe16790cef149f1c38d0b7b9afa5e5a5cee38b4e11b1648b01c78b39b5b5730048
+EBUILD myspell-bg-4.3.ebuild 733 BLAKE2B ab9369aa33f5feec047c072324e9f334436119c418fbae701596eeba598c83c57e53e4d6f78e948d20b4da7d8097eaceedf9d9c48a89a36e94dc27e56942ffc1 SHA512 d35939a43c524e4ef01af2addf5a875866dbc6449b3b57603013a7ee4e6af409a8e1192d15be66ea45416f0a2eeb0b9e00d3d31af11900234b34ae0ff2d3e61d
 MISC metadata.xml 245 BLAKE2B af884440fd3655c1aa95b71b946a07820486fb90858dcf4fa1bd213017822d302f74b3118b2a52d5de088d22d9f024e7ac9ef4b306fb64ed160b0e711f6460ac SHA512 fe73d9e659f1a766a2b2f1a80c8a06bfee27b14a613af8d9fb33e5c9ac69d3c26b71f7a151e3a4ccd443bb75489b4d1c3bf979fe08cf84c274d44af843e8b63e
diff --git a/app-dicts/myspell-bg/myspell-bg-4.3.ebuild b/app-dicts/myspell-bg/myspell-bg-4.3.ebuild
index d88de27f14a3..dfaa08b9c9f9 100644
--- a/app-dicts/myspell-bg/myspell-bg-4.3.ebuild
+++ b/app-dicts/myspell-bg/myspell-bg-4.3.ebuild
@@ -27,7 +27,7 @@ SRC_URI="mirror://sourceforge/bgoffice/${MY_P}.zip"
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-dicts/myspell-ca/Manifest b/app-dicts/myspell-ca/Manifest
index 8a6ac855b892..64e3bd33fe51 100644
--- a/app-dicts/myspell-ca/Manifest
+++ b/app-dicts/myspell-ca/Manifest
@@ -1,3 +1,3 @@
 DIST myspell-ca-2.3.0.oxt 441719 BLAKE2B 4f58648eac1f77a6e1e2cc571a2528d474c961ce15cab00b822638937bfe450330f4decc8744284b66e5e2b5d58ccf2b03110303d86286e1aa5e7508fd2362a8 SHA512 77513fa6b2d819963bc03aece59aeb2fe6df7674c0fea4fa9a406e6c27efdfbca3ebfc4b36aca4275d79f09678ab58a56c3d6470a815a2192b2ffc4e01c779bf
-EBUILD myspell-ca-2.3.0.ebuild 827 BLAKE2B 80b7a8009a8011dc9d9111634205ea60f09c29b76801f9d94f8e7841b1d65e10071e9799f2ef7cc7b62812bda86591bf0f9fe4eb3e00603d7e58dd6d664c669d SHA512 776f3839e22b2255b02bfb19df48024c22d522572ee7a1c35706a2e7a13ea57a92bb7b89b1411cd82d7020341ff845693c75950685139f589754169a0f3e99e9
+EBUILD myspell-ca-2.3.0.ebuild 805 BLAKE2B 454bb51d0ff70fe6ec22201b71e226d29afd08a1086c7ca8daa5adb056da04d5062ba69af45d00f7ffa72c36a9a75b449b6c532c8ecd7c020932a4fb4e59fcfd SHA512 64d8ef7486f23e1611fcbe522f6f5ee8b1483fce3dfb2c26aa1927ad47a8690003610d3664ef680f160f0570a4dd584954e18ce87cb13f1c5b2a49e61b9b0966
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-ca/myspell-ca-2.3.0.ebuild b/app-dicts/myspell-ca/myspell-ca-2.3.0.ebuild
index f4a858edd280..695140b42e48 100644
--- a/app-dicts/myspell-ca/myspell-ca-2.3.0.ebuild
+++ b/app-dicts/myspell-ca/myspell-ca-2.3.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="http://www.softcatala.org/diccionaris/actualitzacions/OOo/catalan.oxt -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/app-dicts/myspell-cs/Manifest b/app-dicts/myspell-cs/Manifest
index 526d2fe1481a..55f9e9b21e30 100644
--- a/app-dicts/myspell-cs/Manifest
+++ b/app-dicts/myspell-cs/Manifest
@@ -1,3 +1,3 @@
 DIST myspell-cs-20110224.zip 1440618 BLAKE2B d90ae82b86ac0e01bc8a5b43bfcb5f7c95f216d5781dd050d798b942291c345966f7f535d74cbd17e5b42a387d0b2c7a7ed02a23bfe93c9bbb2fd0bcf5c192cd SHA512 9f2ed5e10771c00635f382c676b2f9184374b4c20a7d2262d3c441feae4d9dcddbd611cdaf74cb035c76c969d73d913d6116d9c1a4ab0a7a754bfbd8253c1ca5
-EBUILD myspell-cs-20110224.ebuild 590 BLAKE2B e7f8685cf864a6c9f7ac81cf296879a73bdef8a68171255012f2a0484d1e8e9274ca7cd4d411bef2e9487d1ac8a471da8b71faafd0472ba08d5c0775dae43659 SHA512 1741994784f2d8cb6ebe37f40a10aa86db7ddebedd73e8fb9a175ce9d12b29fc8947f7411ff40121e31570c1680373d1195c0cc973b16c7265cc98c5da32c605
+EBUILD myspell-cs-20110224.ebuild 568 BLAKE2B 2fc65fa757d19e9d82026254129b90292d9df82c102b918d9b63b614107ce4134b2fab7717dc6629e705051cba0bd2ca35b71400a1786da4fddbe71acb330b06 SHA512 a1d153c8e8d3d395af31a6d3ae055c793ef9f2833f32aa0d289ca62e4bb391fcba7c8e43570f24c4beba4141d834f290adae56f0ea9b40bba221832ce8003e3d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-cs/myspell-cs-20110224.ebuild b/app-dicts/myspell-cs/myspell-cs-20110224.ebuild
index e78b30190222..a8ef0289dd20 100644
--- a/app-dicts/myspell-cs/myspell-cs-20110224.ebuild
+++ b/app-dicts/myspell-cs/myspell-cs-20110224.ebuild
@@ -25,5 +25,5 @@ SRC_URI="http://www.liberix.cz/doplnky/slovniky/ooo/dict-cs-2.oxt -> ${P}.zip"
 
 LICENSE="GPL-2 MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
diff --git a/app-dicts/myspell-cy/Manifest b/app-dicts/myspell-cy/Manifest
index 0f1bd59bde72..a703177b5e21 100644
--- a/app-dicts/myspell-cy/Manifest
+++ b/app-dicts/myspell-cy/Manifest
@@ -1,3 +1,3 @@
 DIST myspell-cy-20130708.oxt 691468 BLAKE2B 09476ee1d5c945563957e9115613b4fd8e04018127ec4b1dadb776b23674a87ecaededb2ea3d420ff3ff10639d381bb97fe287ab3fd0474c9c5b505a1eb599d5 SHA512 3faa794d0fb62a3f9545afb9740d217b24357be1769082beb8d3fec54fcf5eee9e7ec5b54a316b10e48135db48406d814bdfa3f0448e3c527772fb4e69f17edd
-EBUILD myspell-cy-20130708.ebuild 675 BLAKE2B 0e2bec135e7f132772a9b9b6095542366bad6eec4ee722845ae8aa8d902575e30e61f99df31da4366f78db65b46f3bd1c2d785f8d549851ba1b9ae2a63382799 SHA512 fbc9390a393aa1c871c4904f5338979a4696fb62a763507ae63f7571fc3ee539950cff0fa6e0cc851a7e29f15f801231940d77b20cee7c831e67494847df0dc6
+EBUILD myspell-cy-20130708.ebuild 653 BLAKE2B 23e270b000d8d7b450de3f9491ccb6b6c659dfbb7e0d8d73fc9f289821e7d1b103c825497e922e9156887b173861eaee9e3c08abc4de46eca7447da4e02d9f06 SHA512 8b905616ff4963c7de4e15a1dfe7c5e8b8b7db1a73189636eb10962776b206aa805dd54e88ebf97d82672220ac33a3cd3e5bb4e6bb98614c4332a4cc52c9d59f
 MISC metadata.xml 251 BLAKE2B 928eca9aec48183d696373da08b57694ab299774b0be0d2f98fdff84edb3485e9d50ea98695fcdff577b9b72a87e4c47f0d169cafe64f7a84d2962ad0b68b266 SHA512 b89fc6e0fc9b26b3f92f879713d50a150a05549e97ca8125e54e19b00910b5c54269fb59cb822db6a48ec3bbe028f837b34b3fa29e53b11cdd0fdb7a336f8ba6
diff --git a/app-dicts/myspell-cy/myspell-cy-20130708.ebuild b/app-dicts/myspell-cy/myspell-cy-20130708.ebuild
index 9a9ad7445506..35ae51971030 100644
--- a/app-dicts/myspell-cy/myspell-cy-20130708.ebuild
+++ b/app-dicts/myspell-cy/myspell-cy-20130708.ebuild
@@ -22,5 +22,5 @@ SRC_URI="mirror://sourceforge/aoo-extensions/geiriadur-cy.oxt -> ${P}.oxt"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
diff --git a/app-dicts/myspell-da/Manifest b/app-dicts/myspell-da/Manifest
index 60f20cfbd6d0..4fa71d195d5c 100644
--- a/app-dicts/myspell-da/Manifest
+++ b/app-dicts/myspell-da/Manifest
@@ -1,3 +1,3 @@
 DIST dict-da-2-3.oxt 1861736 BLAKE2B 18c22f55012a9701cff1ecadc53dece7cdc2e59619c1704159343960951096c49ab970bb248d844eaf24379053ea7ac35bd89b4741aa54cfb4b711e99320b256 SHA512 28428096ba6d79801fdf47a61bedc06c9ee2d667ae32307bd57f9b7cdc1cb06e84ac2bd78fba11c87dd35dc88d78c5e0f81588e5145267577ca0992b35ea301a
-EBUILD myspell-da-2.3.ebuild 814 BLAKE2B 8945b5869e46a55d767cdcb86b438932897921ce734900e84eea4c4cb654f42661714273cf0bdf856b861aecb1f84c2cb56e55610dadb7e35bbd7bdd060305fc SHA512 86f6b518d9323a2bc45814e6dedb8b9d296484a2bd0681a9c3ea8f7fdd4fd47f4e31586e7c9638688de500e832386f85b12a361825c54bb1997575865bd4e16b
+EBUILD myspell-da-2.3.ebuild 792 BLAKE2B ca0801f1d9c9bd2ca2c8ecc410a71556d6082da8abb0d8e1ddd6fc48b06243b3234557447c29e0009ca3b554cd2bd341806a015f24e10b90738774a709d96ef7 SHA512 eed19b3d9f862efc7780cbcf54dbc054229240fcc29b493041993324df5e7fa61cbfa879c5b68330c822490e17ef5e2da1ebdca86a9ecdfc8dc584fde39e745e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-da/myspell-da-2.3.ebuild b/app-dicts/myspell-da/myspell-da-2.3.ebuild
index 1e87df274ca4..75d9a45ec189 100644
--- a/app-dicts/myspell-da/myspell-da-2.3.ebuild
+++ b/app-dicts/myspell-da/myspell-da-2.3.ebuild
@@ -24,5 +24,5 @@ SRC_URI="https://extensions.libreoffice.org/extensions/stavekontrolden-danish-di
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
diff --git a/app-dicts/myspell-de/Manifest b/app-dicts/myspell-de/Manifest
index e06a23ddaf81..2c5fcf7bfbbc 100644
--- a/app-dicts/myspell-de/Manifest
+++ b/app-dicts/myspell-de/Manifest
@@ -1,5 +1,5 @@
 DIST dict-de_AT-frami_2017-01-12.oxt 9238814 BLAKE2B 441105b907bd47dbe7d45e30a8a2711206432aba90d3c986e1706f96b8b0617047fcdde1b5bc4bc67ad659b782721c05c83931d6d5ba7105566715f4c2b566bd SHA512 e3364d6fb5dc7d6995c75631bf913db0afc03570fa20ae2480b98aa41afa4d3ae1ff9b0b5e1f64c097366b346e151d85159b9d574087a2ab7f8230284d4aa655
 DIST dict-de_CH-frami_2017-01-12.oxt 9225630 BLAKE2B 7edc2349a7dff64c314881f305216c1d010f601bb99f7a2341b9dbc2c73979d6c219509ce5513e6134a2b18157461664cbef98e219797a423794bfe65741b5c7 SHA512 3f3e725e522f1fb9571f22108ae8d9a199071327b38c3a82d046a2737e5e5a34a4def52bc3d168979ccd0b800750c98af704fcac43735134b67d4dba8bd9f278
 DIST dict-de_DE-frami_2017-01-12.oxt 9238776 BLAKE2B 47ac0b5115aa6d4c5151d039e1285de1681feee879fdf734caa365b030b02f02c705201208f0ef0f99df718dbedcbea2eef0d2b0492c03e7fb3f2853c20dcc80 SHA512 f44d30c875335f52674ea91557c716eb2c9917e7bd170372c8994d8d58e948ef2b68f004d93f175173ffad4a17a1920c69eaffe915668e0c4dc5fee7f8abcc6e
-EBUILD myspell-de-2017.01.12.ebuild 1458 BLAKE2B f9358fcf48c453b536aec662dc6084c67fbab83ef9ae4d5e18f7fc3feb8529a56a798a1f3d614ae2017e526b020312866f6229dfee950135a2f2621014108761 SHA512 3e4667834a00907e3dd37282e1edeb95addcf7b00d855971447de748376e51ec6a473a2e33b359c86ca049577bb35f3f35f4d133070e080bb9bb6cd38318cd41
+EBUILD myspell-de-2017.01.12.ebuild 1436 BLAKE2B c390546dd90c6c52292141438df648a5fbaa954c91aaced9eebe4743917e9929e461898b6c0d583eab7d6b17743304e2a7707526ada5dc67fafa409c86244a97 SHA512 4a0e04fe8e3bf38a8e2ea44d46c20f47e4305f923dc8e763c7a7c83f6bfb8a86ccb00f392fac94650fbc202d79f385624af0ee190d1fa35344945dafd82c139f
 MISC metadata.xml 733 BLAKE2B 3fb6dae837e40035e2c2db3b49772a7ae7d4d48acf91feef11cb099d7af5900e081e72264709394d0371715755c3944867c43fdca080a7a54f87f38b83bbd2df SHA512 946f116da1ba091533fdc8837586692566f522d5d12e778aa149619b71003c754338bbf8b4e4e126c625e240339823272be96f2270082820d07786ff5ab35024
diff --git a/app-dicts/myspell-de/myspell-de-2017.01.12.ebuild b/app-dicts/myspell-de/myspell-de-2017.01.12.ebuild
index af7545bc18f8..3c553b9dc6af 100644
--- a/app-dicts/myspell-de/myspell-de-2017.01.12.ebuild
+++ b/app-dicts/myspell-de/myspell-de-2017.01.12.ebuild
@@ -45,7 +45,7 @@ SRC_URI="
 
 LICENSE="GPL-3 GPL-2 LGPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 
 src_prepare() {
 	# fixing file names
diff --git a/app-dicts/myspell-de_1901/Manifest b/app-dicts/myspell-de_1901/Manifest
index b68e313f12bb..c3760da7be78 100644
--- a/app-dicts/myspell-de_1901/Manifest
+++ b/app-dicts/myspell-de_1901/Manifest
@@ -1,3 +1,3 @@
 DIST dict-de_de-1901_oldspell_2016-04-03.oxt 8197279 BLAKE2B 5f930ee3d727ad7e6ce37ca1062a200b09d3a922a446dde201c192842c898e5754b7405cf92dd58f9981bb4445d7223131f30f336a39d1c84001f8a61cd08eca SHA512 af6a353e52505895e4084378d91578956452d7db402a14073e6b2387d7b5377bcf652414bf90e113d976f24e082adf138ba138d54fa321c55bcb2c4d93c83cdc
-EBUILD myspell-de_1901-20160403.ebuild 1297 BLAKE2B f1c9c78750f4e46717402aba444116db1c04624bfef5ccd32e4cbf06b2e2b77ef319401c0dfc4f62904045a7ca6b962f5b584d6432bd93eaa02917348ddf3ebd SHA512 53db5946120fd3fde944492f95d879c21007b21f9bf0ab62ef640c9734d78ae77d14b87090f2e7f167bd64e872ccf9651c7e66d5dabcb5407b980180e006ba40
+EBUILD myspell-de_1901-20160403.ebuild 1275 BLAKE2B 3d33457da003047aefb3abec057eebc70b359f551d528d62d8a1ded6fe10172df0f655939d483448093f3762392aa6d7abf33df89cd4345a7d62dac458316b76 SHA512 7451e1f69de9d01c790c13e5837ef3a5488643c8ac095cc1721c888d8e9765f16be41c828bf485328c685a7b7b7547c83ea87481b16e6890457df1f542d77fc9
 MISC metadata.xml 306 BLAKE2B 8640f4712e7722fe1f5bbc3438553f6edb19f0902777ab739303e54f0563fdbd44b6370e06bf065f4dbadb96638fb013fb87851305983a6f19d88af6222b9b7a SHA512 48f580db3509626b7c45b9025b9f80405e6585d29dfb63c8dc9035c1ca8e55aa5fd55ee70ba4e675ed8bd1e5a15369bb9ed0236accbdad618c7b9df33c2d642f
diff --git a/app-dicts/myspell-de_1901/myspell-de_1901-20160403.ebuild b/app-dicts/myspell-de_1901/myspell-de_1901-20160403.ebuild
index 2a7d110699ac..0c0ae23cb07e 100644
--- a/app-dicts/myspell-de_1901/myspell-de_1901-20160403.ebuild
+++ b/app-dicts/myspell-de_1901/myspell-de_1901-20160403.ebuild
@@ -25,7 +25,7 @@ SRC_URI="mirror://sourceforge/project/aoo-extensions/1057/8/dict-de_de-1901_olds
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 
 src_prepare() {
 	default
diff --git a/app-dicts/myspell-el/Manifest b/app-dicts/myspell-el/Manifest
index 62d76b6c26be..f125a5275d64 100644
--- a/app-dicts/myspell-el/Manifest
+++ b/app-dicts/myspell-el/Manifest
@@ -1,4 +1,4 @@
 DIST el_GR-0.9.zip 2120747 BLAKE2B 5fe5030227b3f65bf04a7ecf055c5159120badae250ef8c718836e6115238b12391f82a656767313338ece98bce91e099d6f12f7e9e9f2f202dbdd6a14bfb6ba SHA512 8eb9d951bab3caf09f53e7ee98ff155ade8d9198533264ebdd53b413e38d9b84e5101938c1abb3e220e0764c98186fb2f5480be50e98e7effb7bcc8c961eaa49
 DIST hyph_el.zip 2224 BLAKE2B eb5c5ba1b856a9edc5bb78b583af442ccdacc3d7270b1e1d61081382b195fcc3637ef83a4e35eff79146a21360353145128adabfb494976a6998f1dbccfd062d SHA512 259a1ad3b4f38cf6aa67027cd3354488b298375450ed99b07e4ea8d355e90211caabfc40ce71af73e5d354348541bf8a486aecced23f75a4fe9abb8f6c2ac3c3
-EBUILD myspell-el-0.9.ebuild 591 BLAKE2B f025d8c695f62ac929ad4a04204bdb2382c019fcfdfb9f19330bd52a817733b2ad47c0bf70a4731f4b2777c01877feb8c1316a6495edd0e29b1027935682b4f1 SHA512 2ed2950bde33cec9c5b651ba38e7f4a4c2e7bde41f6d66538fb3f469f55ac2def1c2343e7b0ce1320467934cb70d604424303d38756085d59b7cafd25373e1be
+EBUILD myspell-el-0.9.ebuild 569 BLAKE2B bbd2e8e6cb97ef194521a7812851b0def4a27771c282e1f79508ee577807acd348f509ea60b988b2359873cfa50605f7d4f6ffe30af1074bbfcae775422bc4db SHA512 c801f2d8d6235a0f0132c6056070b6c1775a5f85ef358c94b097dcff63d326a642eddafa3e70822a5b112d51c64a6ed63c752fb09e88a104a136366880113386
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-dicts/myspell-el/myspell-el-0.9.ebuild b/app-dicts/myspell-el/myspell-el-0.9.ebuild
index 09521b9262bc..61967c95ade9 100644
--- a/app-dicts/myspell-el/myspell-el-0.9.ebuild
+++ b/app-dicts/myspell-el/myspell-el-0.9.ebuild
@@ -23,5 +23,5 @@ SRC_URI="http://elspell.math.upatras.gr/files/ooffice/el_GR-${PV}.zip http://els
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
diff --git a/app-dicts/myspell-en/Manifest b/app-dicts/myspell-en/Manifest
index c51c6c1e8442..dd0e99d9296a 100644
--- a/app-dicts/myspell-en/Manifest
+++ b/app-dicts/myspell-en/Manifest
@@ -1,8 +1,8 @@
 DIST dict-en-20170101.oxt 5960816 BLAKE2B 65505ed6e8323f28377728ac29e550cf151688517b83209b055966be4e7e14465aacc1d1677d22bc005089d7623e78e63bf91dcdffcde3a790532dba87b54615 SHA512 fae05d3e4bdc9bbd5dda6eb2c0de2f5d0860973e75fe0931bcb0d0e0a5015fb6042beec7f811bee0011f519d13d0f3b52b09fbd906a75340bf311177885ccc1d
 DIST dict-en-20181101.oxt 6052772 BLAKE2B 46825cb406406a3d64e8495f047ae81d6b693e6ff5cd89152a9c829a80d7be1920dfb3572a84aedb2e8f8e5c767aa49ed7e71ab330aca83b3936133699f1098a SHA512 1f351b97c4fc907c5751a35b6665b6d91b1157b6a952a378f565989249b1900395f08f0204407a21b0bcb999fe695c14707c4744f5da32d521ee8d75f73c89f9
 DIST dict-en-20190101.oxt 6058651 BLAKE2B 617ded8d7df6e62767083be7b0651e1bd1e039f78ebb67e8371228805519195dd5acd4ca7d415a29b68697a369d070eafa5545d1b8bbcbab58774db61f03e8e5 SHA512 06e6a21b524c378041655cc44e04f26a35b16e1606a478c0702b96fcbeb86180593fc02d00cae8e05700ead0bd6568239434e8d3d733937587e7b009245dfe4c
-EBUILD myspell-en-20170101.ebuild 930 BLAKE2B 05df7aead57950f6ce4e9894664cf1f6f440aa7a6e42022e69c2b37a8fa390fe5611e53ad00a8c0530a7967ede6c59d6f090e73a06c527271d06f03f53bb95c5 SHA512 c064e21034ae2c29a988aa09d7b8561a4ae710ef604d4c08b62cbf5ccf582e124d990ae6d7fd33282740f403990d461424cfe0637b36adb3558643ce3660fb47
-EBUILD myspell-en-20181101.ebuild 1500 BLAKE2B 75022e84c8c83aa82e7da8250d9c92000ffa706fd5b5a11a6531230e1c620f68aeb2d1c6ca94468b78b5e707824215ccfeac1840c64b40ad06d6f528b52c933a SHA512 a60392b59c172dcb92fb3c102dfcb145840fb5b1c582698cbf0c82f468c315e12ec00bdbf0484b53529e98af9ae910843e8aa3d6dace29aeec98fdebae6af81d
-EBUILD myspell-en-20190101-r1.ebuild 1573 BLAKE2B 2a3881bc3bc2194016e83293270c2e685e4f944613168fe0033e3a307d7880eed58c69369d017e53109bbadc5c4e0ffa294bd40503d015d09293849911b84b95 SHA512 6ab6ff5616cca4749302b728772283b1b66f0d4ad6c818a723eaac73969901ee92333aab9d0de88808194c82eae76ae7acbdfdd6e26916c033afbcc24bc04e40
-EBUILD myspell-en-20190101.ebuild 1499 BLAKE2B af5d0aca32442990e891a11bf6a4eba3e4bb33441083543fe6d9b4b0a03df55e5e3c8193c68e4f5ac2b34cec76e0305babe75bef92ab4846a4d8e8c9c912d06c SHA512 c03b6ba8e0b0ed1d98231dc104cf21028fb2c88ce1411e98ba5baebb220f8c75d65f4a1e931e248794fe79006433764c2ca8781ca79b0fe6d96895fe5ad63118
+EBUILD myspell-en-20170101.ebuild 908 BLAKE2B f9dc0e3317a57d326613bbe193abfdf452617921ddd68773a1fa5096a95936b5a7a29951babf36f725e0ded6f0f14944735dd7a6a5d89211a22e492373e219ec SHA512 a1c7fcfc9b5e49a25495b32cf39131f5d57b8ba518d67991863ba0178931d1f39a7db845fd0d35ab152145602f5183fb9b4d6ee9a9b682f72e432aba017b1f78
+EBUILD myspell-en-20181101.ebuild 1478 BLAKE2B 6a6eb1ad5288c920d715d8cec55f4083785a2662d15712ce17f32cce9ea0e035dfe808b292614b152f9ba7a366601a653412d5109a99036f28cace7b52b3e98c SHA512 d1a9753d68dfe4f95ad45ee880eb381333109fabdf89a4320f622751f5362e2f822b62f40c611f7321b9022b468e3d51563ba567b05aaa8e459d8a66cd25479e
+EBUILD myspell-en-20190101-r1.ebuild 1551 BLAKE2B eb78f43e80cd89c4222dfd6d2de5811f7149950e65d3cc4a44dd1624a27e80490a41b837a30cc18009340f1119869be869255f720e015e83deec25de0e7bcce0 SHA512 18f116b53ea605975160f547ea7b37cec142766d738e7c6bfc5c7e0723c84abb78a0f8ae3cb46a757ec9af4081c891218e60607d748623aa62626a837efb46e4
+EBUILD myspell-en-20190101.ebuild 1477 BLAKE2B dd59a6b26023fd69bb52249501f68cf694b24ee9beab99819237ff6dd6d762a603f0c442d19c1ec66a7836265a07d3c6014b28c5779dd696316ed01917c83c24 SHA512 d7abeabf80d00a5ca98a74b0203159d734b45cb382cf115154ed49c497fedc08dbb62855a1f9ae2b5c97de900e94769bdf9aad6fccd808543dadec7a9f70ce1b
 MISC metadata.xml 367 BLAKE2B ba1f5365b9b1585d0ed0513fd8a7f3aef4cbdcced1257cdb3e0cd167845f04cc248160164f367f0268c4388ebbc618a85bc248355be0cdcfd3bb827875bf6cdb SHA512 b6022494b82fa7956d3f6320d170fff6433ccfb601c9107cb5f9a0a8419d3bfde4c2dc3eded7f0e6a8503ffb142d144d8cf983dd73cc7bdebeb9ab687efdd9e2
diff --git a/app-dicts/myspell-en/myspell-en-20170101.ebuild b/app-dicts/myspell-en/myspell-en-20170101.ebuild
index 971a5a8d437a..fba66a088656 100644
--- a/app-dicts/myspell-en/myspell-en-20170101.ebuild
+++ b/app-dicts/myspell-en/myspell-en-20170101.ebuild
@@ -35,5 +35,5 @@ SRC_URI="https://extensions.libreoffice.org/extensions/english-dictionaries/${MY
 
 LICENSE="GPL-2 LGPL-2.1 Princeton myspell-en_CA-KevinAtkinson"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
diff --git a/app-dicts/myspell-en/myspell-en-20181101.ebuild b/app-dicts/myspell-en/myspell-en-20181101.ebuild
index 932b93b49c69..0524d4def045 100644
--- a/app-dicts/myspell-en/myspell-en-20181101.ebuild
+++ b/app-dicts/myspell-en/myspell-en-20181101.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://extensions.libreoffice.org/extensions/english-dictionaries/${MY
 
 LICENSE="BSD MIT LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 PLOCALES=( "en" "en-AU" "en-CA" "en-GB" "en-US" "en-ZA" )
diff --git a/app-dicts/myspell-en/myspell-en-20190101-r1.ebuild b/app-dicts/myspell-en/myspell-en-20190101-r1.ebuild
index 5ff42d18e24d..291f8e29fb6a 100644
--- a/app-dicts/myspell-en/myspell-en-20190101-r1.ebuild
+++ b/app-dicts/myspell-en/myspell-en-20190101-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://extensions.libreoffice.org/extensions/english-dictionaries/${MY
 
 LICENSE="BSD MIT LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 PLOCALES=( "en" "en-AU" "en-CA" "en-GB" "en-US" "en-ZA" )
diff --git a/app-dicts/myspell-en/myspell-en-20190101.ebuild b/app-dicts/myspell-en/myspell-en-20190101.ebuild
index d71c0aee1b26..41f04a62a31a 100644
--- a/app-dicts/myspell-en/myspell-en-20190101.ebuild
+++ b/app-dicts/myspell-en/myspell-en-20190101.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://extensions.libreoffice.org/extensions/english-dictionaries/${MY
 
 LICENSE="BSD MIT LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 PLOCALES=( "en" "en-AU" "en-CA" "en-GB" "en-US" "en-ZA" )
diff --git a/app-dicts/myspell-eo/Manifest b/app-dicts/myspell-eo/Manifest
index 2c0eb72c3a7b..97dc54054e8a 100644
--- a/app-dicts/myspell-eo/Manifest
+++ b/app-dicts/myspell-eo/Manifest
@@ -1,3 +1,3 @@
 DIST myspell-eo-1.0.oxt 186407 BLAKE2B 9bf51c6fa343d5417811580f0db36d5d5c5d37b6939ee545a87ef1b3f661fa5268ff92dafddb8ff9b4ad7512c5d578bfa20c6bcf276c5a00d90cdbd67ee7197c SHA512 b5cf3a14672fb0e6b810e5b4d811f430b3c3cc38cf09a0083b7e26471597c6df055242349a2a239607621301f71527e8bf225dc03de727c5863e7b7b1c821824
-EBUILD myspell-eo-1.0-r1.ebuild 695 BLAKE2B b9412b54f7bbf955ad1d20338a353a4867302ad85673a5e7ffd8841e300cb03396a999544e3ab0be358dd4a2a3916b40a6c12d4291f0c286208779c2207e6ea7 SHA512 07304001936c1a0c05a5444e4267906fa134af29f46db03b104b09c73ab802785702d0c15215822f433e88cdabb022452529fc2b541e135985c97baa145ed179
+EBUILD myspell-eo-1.0-r1.ebuild 673 BLAKE2B 8c19549534ad5236add7b1dd8f6c665091f9c20975b4defe0031778ffd0c344f991cb862fff68fe277cfed64023bead1a92d59757bc854916ee94b1385ab6a4d SHA512 990409561388d5038e86d127dba1d947fd78241d830f96b0f30b51510f98915ca534fb32979b806e2180dd6424781649c1c199f0a13ed84f0390865e82ab8972
 MISC metadata.xml 251 BLAKE2B c3fd5444bf91aeb5fca487fd3f35d92e951cba5581257ac67bad06e898b67385cde86db9395f03734daf6fa65f76a3217d86e8745c62d0ceef001aa2a62749b5 SHA512 8efa4d577315623dc1527c04418d7e142f1583cec26341ce4b49f21e4cec496f5db3ecb782db80910c9a2df0a7df94af5d22361e458c01cd8dd79bd593292220
diff --git a/app-dicts/myspell-eo/myspell-eo-1.0-r1.ebuild b/app-dicts/myspell-eo/myspell-eo-1.0-r1.ebuild
index 4255fee546a7..8896c8927f72 100644
--- a/app-dicts/myspell-eo/myspell-eo-1.0-r1.ebuild
+++ b/app-dicts/myspell-eo/myspell-eo-1.0-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/aoo-extensions/3377/1/${PV}-dev.oxt -> ${P}.oxt"
 
 LICENSE="GPL-2 LGPL-3 MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/app-dicts/myspell-es/Manifest b/app-dicts/myspell-es/Manifest
index 96101d73830a..93149da2df35 100644
--- a/app-dicts/myspell-es/Manifest
+++ b/app-dicts/myspell-es/Manifest
@@ -42,6 +42,6 @@ DIST es_UY-0.7.oxt 1435883 BLAKE2B 3880e74f3184887c5b73b10188e8bbad87501d9001a06
 DIST es_UY-2.3.oxt 1411016 BLAKE2B 51dc5d52b13ea15432669c7bc518ecea0e9c26df0245449c8f17e9a4b3d5b4b14c87052827fc96c7780b21f6597c08c36551316d705d84dfaf90d7ec4c7aadbb SHA512 a6f19361afb5bea47ba823c69ad57577f311ba78c7e43dcc3216aece1e7baf84a8b4490f13c582d5b1f1f3fdb16b48850d1d7adc882f2d3b5b39af65caf86ac7
 DIST es_VE-0.7.oxt 1435033 BLAKE2B 4b0c3bf2d0b4aed3db2d2cd2a895692a9e3ffec16d0f91795f2f8f462f22783bd4240359670ce0f0e35383d0b0ff1f78c3be130134604de6c9b3515f63b599ca SHA512 e70ab6b64931dd0f572625564295844d471e68d0e6d38dba5e2c27646d5caf416a412f179e31ac647ace9fcc673a40727abd1375c1edd69d80246b4888380969
 DIST es_VE-2.3.oxt 1411856 BLAKE2B d746113298bce3db8c8c4d4ee8caf369f809ef73971612fc207470ba1ebfc67521235e855fa6243d2b6850184f273723c7d83a0b8d22293c3abd9fb550826ff2 SHA512 4d10b818e4d00f60f07f9f64d519b02f549298cfb1da6a344504cd8953fb54793607c662ff2f0505dfa9924e1d1ba45c1ef6d2d6bc4cf2d37d3d1bef99078569
-EBUILD myspell-es-0.7.ebuild 1237 BLAKE2B 8a567e251f9bda7d627937e7658e583a08f43f6a6c227fd04411b33d2ead5c9bd55ce59dc45bb1f562129041c3ac184e4345541cc9c664f4121e4a70436e38af SHA512 86867d2ed2f2d94db05b12ee42c7432f73f43371068fca4654845ee197fbdc2dabfb8b51479e3a6e1e2f6f4a44be05b37eeaa21fa2566876cf85c778e0bc4b83
-EBUILD myspell-es-2.3.ebuild 977 BLAKE2B 8594ad7efadf4658f3cd0419e83090a0aeed6c27d9a28247bfb6d143a175c737f321388dd786f08853ef2cf43fdea82625e77b7e0cf084459591eb61d8b80e21 SHA512 01255e69248195b87db84af72bba978fa7e51b7e13944e20ca3281a2dbd2a05f4162dd21f716d5d82f235a23a8215b9888311ec85f2aa35521e27c311f84c109
+EBUILD myspell-es-0.7.ebuild 1215 BLAKE2B af4b7a0aa6a364cef9069e926732e18a917bdb93353da7e320355965b4e6f39a97e4778bc3f6c29075ba8f9a204a1dad5ca7d9488cecb0e0daf4b0c6d3968639 SHA512 a6e552308667da0e9f994c5cd08e63e5ad717f84c6974da86444acc8cbbb8ffa26063ab51a1adf5e3d00981c81c547f77de648e1bf48fc1cdbc56cdac5836b51
+EBUILD myspell-es-2.3.ebuild 955 BLAKE2B 44b22df250b66c832b6fae5bd790053b6eacb07fe3c599322de8713e8630eb2c088458cc0405ce81b332a5f8a6d16aefa77809558c72d9fb95eac979010ef3fa SHA512 57db40abe357335c9861eb344009dbc8512419635a6c5e24e3d7caa55cee47dc2c9d855ab9fab5ddeb4c4c7bdf9aecd96c3bf54619792b9fd5c0857b9c7eef0f
 MISC metadata.xml 365 BLAKE2B 36efea9be90b8f961b59106b4b60a02fa787ed84f639c68101d093a825d10dfb7ec0e46a14bc47cf6d7b271e039f7c3d7103dcc2bafa60a4a69e185e8f9c8908 SHA512 728f0f7cc5ff04ddf7724efdabc86b7e767dfe5e4383a266547360f712a583664355ee5e528366d42300c2837fb5134cb4708c80dec10014bb9fb69929418e51
diff --git a/app-dicts/myspell-es/myspell-es-0.7.ebuild b/app-dicts/myspell-es/myspell-es-0.7.ebuild
index b71e7e0cc087..09f8db5a89e1 100644
--- a/app-dicts/myspell-es/myspell-es-0.7.ebuild
+++ b/app-dicts/myspell-es/myspell-es-0.7.ebuild
@@ -39,7 +39,7 @@ DESCRIPTION="Spanish dictionaries for myspell/hunspell"
 HOMEPAGE="http://rla-es.forja.rediris.es/"
 LICENSE="GPL-3 LGPL-3 MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/app-dicts/myspell-es/myspell-es-2.3.ebuild b/app-dicts/myspell-es/myspell-es-2.3.ebuild
index b1661aa974a0..648c8b1064f8 100644
--- a/app-dicts/myspell-es/myspell-es-2.3.ebuild
+++ b/app-dicts/myspell-es/myspell-es-2.3.ebuild
@@ -34,7 +34,7 @@ DESCRIPTION="Spanish dictionaries for myspell/hunspell"
 HOMEPAGE="https://github.com/sbosio/rla-es"
 LICENSE="GPL-3 LGPL-3 MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/app-dicts/myspell-et/Manifest b/app-dicts/myspell-et/Manifest
index de92b0945f3b..d22779792807 100644
--- a/app-dicts/myspell-et/Manifest
+++ b/app-dicts/myspell-et/Manifest
@@ -1,3 +1,3 @@
 DIST ispell-et_20030606.tar.gz 3421339 BLAKE2B 75b68d38cf8d3f563774445545fa95139f58d1917bab778d127bd0b7fe4c32eb2b8dbc7dcde7dccc3e8f02b3827bf19978302bba19ecb7068c32e7c1177b6f8d SHA512 f8ec8e5dd38a0e8c0682b79f5207a8d707ff48ba7950387e4c20a4d08f8c8525b511b6ba79ad8445e0ebe9e0ea2f91e15409f3ab64305480fb64ece056dbea67
-EBUILD myspell-et-20030606.ebuild 688 BLAKE2B ce5c83b7dbf95a822788afd865d54fdb885a469577795397fc8a4aa2c15418dbb23a37a4c49ba889e4c12aed245b7773855cf525f577e9b8761600b34f6f4eec SHA512 a06319e07ed80fb5f4c780b1e22b2b29ba4fe51b73090d8482a445d9aec17f4b3dd2a536751a4223e531e620da30c3b9312038586fc7973d24ba3a746948d4d9
+EBUILD myspell-et-20030606.ebuild 666 BLAKE2B a5f48c5abec915d88db89000e60e029b829e352b4a3dbb1ad2b90092cf2c75632f25a9d5cfd7320c60fe8b86a2fa2b3347649e1d52d3b24c84764f9b8502d50a SHA512 3b3b27534e1ea071e4f949af87b273f1ba34a384106936d79faf9c7abfa17c9edb57c559ff41180202126fd63e25717cf2f3ebb227622433321025bba70fce28
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-et/myspell-et-20030606.ebuild b/app-dicts/myspell-et/myspell-et-20030606.ebuild
index c652d8fce5db..8486cf6efdb9 100644
--- a/app-dicts/myspell-et/myspell-et-20030606.ebuild
+++ b/app-dicts/myspell-et/myspell-et-20030606.ebuild
@@ -23,7 +23,7 @@ SRC_URI="http://www.meso.ee/~jjpp/speller/ispell-et_${PV}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
 
 S="${WORKDIR}/ispell-et-${PV}"
diff --git a/app-dicts/myspell-fo/Manifest b/app-dicts/myspell-fo/Manifest
index e9b7b3ac3640..915e2643a0a0 100644
--- a/app-dicts/myspell-fo/Manifest
+++ b/app-dicts/myspell-fo/Manifest
@@ -1,4 +1,4 @@
 DIST hyph_fo_FO-20040420a.zip 16430 BLAKE2B 4cfecb7de08575c7d35302b3c81c5e8b729f0dcecb3325e9ffb1c07a4477258317f00d991715534f50ba26585945a39db7b58ffc8115f85d23c74e534ef09269 SHA512 c1cf2593668558c44ab7cbb8fb3ce915cf59eec25a07de9834ef24d2783e56beea708d6666975059b2f33807279d0085d4910145f4bd410b4c736a0a7620f187
 DIST myspell-fo-0.4.2.tar.bz2 1395379 BLAKE2B a4709f50cbec7c642025100e4e2111c0935b566cd93b1747aa0c73e1fa8d5e64554236be9948731f26cbb998ff7df5212fcd7a97320bb81dc9b9f4185559e3fd SHA512 7f5622a6acdd948d884ed445ee34ec0cc9596b92628bd3bfc4f32bf5e27d88ec4684e800a6cc4c1add73d0f32050b87d0ad2f1a1a97739fc113edb977c2c296a
-EBUILD myspell-fo-0.4.2.ebuild 588 BLAKE2B 92a78176c2746ba7917cc8e84c2da4975e902df60775b8d39dd095c2fbfbfb6c7c4a3eb66daef68fd1add2c19ee134ca60db6d0c12c1a2f07757eb9d07256388 SHA512 29fea7f42b61b9dc25782224861c868975393d51e132b2f201ca934ea69bd931fadab2a5dec24567216397d4bc9967aab0d738e04029948e260a143832cf408e
+EBUILD myspell-fo-0.4.2.ebuild 566 BLAKE2B e8bcce3737fbc44bce52a4f4fbeb31a78c378e0bfb51533553be3c4c3a765b4ea291b3268ebeaf332e7d8c056b8dcda516dcf54e1457347616e8d7588654afe2 SHA512 274bcf1668f9c7af1d3547bf73008829ba92bf53e0c8ab17040d795abffbd2d27145bd0f55251e3da939ceaf111d522c11e99478d2f2a9809a675fb8150b2c13
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-fo/myspell-fo-0.4.2.ebuild b/app-dicts/myspell-fo/myspell-fo-0.4.2.ebuild
index 3df52c661836..fc5d17a9a3b3 100644
--- a/app-dicts/myspell-fo/myspell-fo-0.4.2.ebuild
+++ b/app-dicts/myspell-fo/myspell-fo-0.4.2.ebuild
@@ -26,5 +26,5 @@ SRC_URI="
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
diff --git a/app-dicts/myspell-fr/Manifest b/app-dicts/myspell-fr/Manifest
index 0c8c0908e246..fec1437caad2 100644
--- a/app-dicts/myspell-fr/Manifest
+++ b/app-dicts/myspell-fr/Manifest
@@ -2,5 +2,5 @@ DIST ooo-dictionnaire-fr-classique-reforme1990-v4.5.oxt 2271004 BLAKE2B 80c5c43a
 DIST ooo-dictionnaire-fr-classique-v4.5.oxt 2251909 BLAKE2B 3ea0901efcee126b2702efebe279cb32b0e496d6b92b8e2a9dd16671bd999b6357086faf99ced6db5f4babe726ee933f3f85858c84a80c8b656b945b23d2aaa7 SHA512 f45b1e12b24e2ef2a9e3944b310631ee5c52ef7cd94a9d2d461ec91b320b40e6d380db7820d386ad75627873b6033e80451b2371f0a42817ead77ce5f03edf77
 DIST ooo-dictionnaire-fr-moderne-v4.5.oxt 2248032 BLAKE2B 4e935186b621810f468e6915e61c7389aa95f8d8e00d8960bd1a9cb8622521669c6147c0b535fffa85a36abb9fcb739a45c00bd9036e5d019953c5b7d13321d5 SHA512 b493f0c57d3d48b93a2c0d9fbd065728ed011c68d11286def203a0b798fe02381acdb2927805475c69c1ff7d0a7ff53469e84581c4724dd57bf0211d85c52655
 DIST ooo-dictionnaire-fr-reforme1990-v4.5.oxt 2255388 BLAKE2B d804bb80698f1ffb8b77dc8c3efa0841437de1389a7fda870fbb4a71914c42055153ff92629481b3e669bec2fa00258b43ff3d92acf08335e11559bb5dec6fae SHA512 39630fb67ecd4afd528a8c255c405945d866e57fb2becc0e79b6c16ec0e0510101d106c0342dd43f26befd3dd0ca3e4094360aaa0d91a090ecdea49158383ed5
-EBUILD myspell-fr-4.5-r1.ebuild 1649 BLAKE2B e27538a21e4e4b1e330a54e8d19b36a4e4c52ec6a41f9c514a228014789346af7cf51bfb463f41c2895ad7fa1c0d98e71bb0af699bb28da78bf8d1635bf3b07c SHA512 fb92a08b07083a0cda8f1bb37aba1d22e388bfb1c333cd0176d60e831358bf5b0f96d6e23d9ebbad6e5fb0667a2b25e3441a848a26f6b029d7088e66570e9423
+EBUILD myspell-fr-4.5-r1.ebuild 1627 BLAKE2B 6b3e53b1e87ef8f4df59a42d8b47a7580189db70493866098d9bf0189922507429fb85b904208992c46469ab66a81c9188e3fc366f2b0390628ae144c14d6260 SHA512 7216b592119f6df780b1d797138ebd82d0eeba68c176a515b73d7c064d59ea5f325e50fbf29138222576e3d1d1d6b46ed4b3c9379ca9d3e0280151a8cc2aa691
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-fr/myspell-fr-4.5-r1.ebuild b/app-dicts/myspell-fr/myspell-fr-4.5-r1.ebuild
index bd227f42483f..9029c3d831b6 100644
--- a/app-dicts/myspell-fr/myspell-fr-4.5-r1.ebuild
+++ b/app-dicts/myspell-fr/myspell-fr-4.5-r1.ebuild
@@ -36,7 +36,7 @@ SRC_URI="
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-linux ~x86-macos"
 IUSE=""
 
 src_prepare() {
diff --git a/app-dicts/myspell-ga/Manifest b/app-dicts/myspell-ga/Manifest
index 54ed0fd7b748..52bec8fc7a7c 100644
--- a/app-dicts/myspell-ga/Manifest
+++ b/app-dicts/myspell-ga/Manifest
@@ -1,3 +1,3 @@
 DIST myspell-ga-20160213.oxt 8475451 BLAKE2B f8fbd0c763df5022142ec824eb7771ee14d0091a9defc5578b5cc830e02d646f031907fd970f69320a8668465c9aa50aa978d05d293fe8c4be24e553052340ec SHA512 bf1d17c8edd174a84c853489a6404da51a21fd47e7abbbd6f1bac98753a6327c6ada7213ffb0fa6bf5ecd62510e8119e35697ae868db00b2086503a801895d0b
-EBUILD myspell-ga-20160213.ebuild 654 BLAKE2B 5eea0c53974aa0f453ecec0e71ddaf84aab6fa1028f1af62d0065774d56f6a218d1435ed37933f723f491bedd55fb09360c5a49e5e54e3e4c2ef52db05874963 SHA512 3019ce6937b97ef8a18aa8688e2827140c05df5609e2b5dc371d2d2d2596b8268c14eab8642c2d9359b8a1fc02814bc642c009b6b05fc5e3b539fa4da57a1851
+EBUILD myspell-ga-20160213.ebuild 632 BLAKE2B afa5aa0dd7720e2ff2cbddca3d1a65671cea7eb176f3fe8f0eb633112a32ddf57e94a4854b16a4109b5d2ef6f94d167de2646880b4a8aeec7709d120e6254735 SHA512 2487da9f7daf7396241c4ce5c6f27734fb091783be952fffda5f66eaca4f278eadbcad4e23539f920233361fca5ebf60ee0714fa97041a686edc8239d8b006ef
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-ga/myspell-ga-20160213.ebuild b/app-dicts/myspell-ga/myspell-ga-20160213.ebuild
index 300e5b2823fe..fe963efc78d3 100644
--- a/app-dicts/myspell-ga/myspell-ga-20160213.ebuild
+++ b/app-dicts/myspell-ga/myspell-ga-20160213.ebuild
@@ -25,5 +25,5 @@ SRC_URI="mirror://sourceforge/aoo-extensions/focloiri-gaeilge-4.8.oxt -> ${P}.ox
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86"
 IUSE=""
diff --git a/app-dicts/myspell-gl/Manifest b/app-dicts/myspell-gl/Manifest
index 81df1b4dd625..a062be4967af 100644
--- a/app-dicts/myspell-gl/Manifest
+++ b/app-dicts/myspell-gl/Manifest
@@ -1,3 +1,3 @@
 DIST myspell-gl-20131013.oxt 771221 BLAKE2B cee0815ae69d00334cca4341ed5c694c3d8f97a3904f5427b7deb94d706947e536adc890b2bfbff41c666b8ae6c5c277edc4843f4c4ef4131548145a42b2313d SHA512 ae13d7137e6b8e51570bcbeba00f73d9887a24556c2409249a39858d385168a03aff3ec2cf3222cad50686a4169debbe310a05ce3bd40aaab408de3ed01885ee
-EBUILD myspell-gl-20131013.ebuild 641 BLAKE2B 883ed7ae1787d4f8c7c4ddca628ad0cb09196e21b005aac7406964a381daa953d3b266724dc502bba61b96827162bf0b02818ea2ef4636c2adf50556450c98bc SHA512 f9544fd094e662722f9309da612b661d839127fab82d3e419296cfd1e1311e1138ef3b60c04b5addab6e8cacaa5db51b27c9cab4e57ee17d3472c150b35c757b
+EBUILD myspell-gl-20131013.ebuild 619 BLAKE2B af7d085770a96202c794a6018fce4f94976504f39e266522caa749f349f5acc4acc31a94a99f40a866f91aedc135c5eb13f614528c9df6b10b4a801e960e360e SHA512 1181699d1d2b1e0ed143cbb7c1952868d8bbbfab1f18fefe268cd952536a3489e1c6f7de80f841ed78f587cd0ad8d82f866ec88e67f1f4266c608e0cd9f24bc0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-gl/myspell-gl-20131013.ebuild b/app-dicts/myspell-gl/myspell-gl-20131013.ebuild
index 7949dbad2c11..640dd06a55ae 100644
--- a/app-dicts/myspell-gl/myspell-gl-20131013.ebuild
+++ b/app-dicts/myspell-gl/myspell-gl-20131013.ebuild
@@ -25,5 +25,5 @@ HOMEPAGE="https://extensions.openoffice.org/en/project/corrector-ortografico-hun
 SRC_URI="mirror://sourceforge/aoo-extensions/hunspell-gl-13.10.oxt -> ${P}.oxt"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86"
 IUSE=""
diff --git a/app-dicts/myspell-he/Manifest b/app-dicts/myspell-he/Manifest
index c7fbaa548f3f..4c6336497544 100644
--- a/app-dicts/myspell-he/Manifest
+++ b/app-dicts/myspell-he/Manifest
@@ -1,3 +1,3 @@
 DIST dict-he-2012-08-15.oxt 882585 BLAKE2B 3cc76818f6f7cfb0cef72b5d944c2024ba7b3daa031b940965a850f0652f664a78039f29d8d7cc97a3b2dde0b67f203a5b6c6dcb80b2007de569f8524c6a2fa8 SHA512 418feb49dba0ec97b63c44909ca8d2192c4c78ed59b9440d3962d6e2095db11f03c3598533c8fecd9cf46f098e96008b8cc298172ab08cc6b24b7df5623438c7
-EBUILD myspell-he-2012.08.15.ebuild 633 BLAKE2B a9d71d81b6bcbfa9ba8149318224ea75e6298d9c8044baff17212226e373675289f119094bea8fcab366237f98c81f9a0fef36e547731a25f395bf5daf2d3a58 SHA512 5ddb4c4f497f0420a65d9dd4b35cfe5151ebfd2672c8dc2e8bc4f1a9f4d4be47aeb35c9241dc50076a7a74335c28fd4fdaa90bb7c6110bb0fb3c567941a1e473
+EBUILD myspell-he-2012.08.15.ebuild 611 BLAKE2B dd357041283888bc3dfc4b154b9dc89c8af4e168b67524c97aa0c54ab284ab41dfbb085605f1df9478d20bbb95dbed3cf113ebcd0b4602c730f704c2738f9b77 SHA512 edf0a968c4480911580b9ed021d9274927ae3a0296872a0920a747b16f235e74d5ed1634402bda8006726ceb88da647d0a2623daded620adc31a84caa00aaea2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-he/myspell-he-2012.08.15.ebuild b/app-dicts/myspell-he/myspell-he-2012.08.15.ebuild
index f3ca760ed115..affd0d238807 100644
--- a/app-dicts/myspell-he/myspell-he-2012.08.15.ebuild
+++ b/app-dicts/myspell-he/myspell-he-2012.08.15.ebuild
@@ -22,5 +22,5 @@ SRC_URI="https://extensions.libreoffice.org/extensions/hebrew-he-spell-check-dic
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
diff --git a/app-dicts/myspell-hr/Manifest b/app-dicts/myspell-hr/Manifest
index d5f9491e4b1c..2e80510a33a3 100644
--- a/app-dicts/myspell-hr/Manifest
+++ b/app-dicts/myspell-hr/Manifest
@@ -1,3 +1,3 @@
 DIST myspell-hr-20080813.oxt 1808648 BLAKE2B f7944c0cfeb02c82dfeb82ceabd241dc192c1b16696b80d5e09aac2235d7d64e7a8184d52159678989e2f9fabb088d3d1ca2e4bf9915262ab6973e1680d48e0f SHA512 178a9e51ade7e54b5e32c9b0cb10bbb6e8da1913456d660f79a991f97c59aa965c2b17912f1910adfd6b8e47aaeb94ad9066bfad2e7ad038c0b739c57bd5c18a
-EBUILD myspell-hr-20080813.ebuild 587 BLAKE2B a7c63576325e0afca820a2d73fa46103e60e6cb744c3c7a3fabb78b30656232d375517241b0cb7df58ef50188e20cf0498872aecee0994d5562bcd8f6f070a72 SHA512 3c70254243a7dcc343b9053a005ab3548e3997e2f7a232ddfb9edf42c280f1ca715c44c1e67d8d96f22d9d3d858b415031c4069fd9c8b875759f31947fbf4724
+EBUILD myspell-hr-20080813.ebuild 565 BLAKE2B 3a637d8a7d4d10485db29776cbe40de389b395d10a8de656c84a7318be2326b46b1ce904a39b44deae07c0433e1a9ac135b167ea0e38166b1c257c37facb8c28 SHA512 c98ae9046ca62c455936d65bae5d39c3bd34c66ad6181d58f61d7943e7e539f8c2376f95b42ecaf3af318ea819d08a28fa7ca45de7faa4e3c61f46fac597a3eb
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-hr/myspell-hr-20080813.ebuild b/app-dicts/myspell-hr/myspell-hr-20080813.ebuild
index a0e5b6f92200..002ebba81cdb 100644
--- a/app-dicts/myspell-hr/myspell-hr-20080813.ebuild
+++ b/app-dicts/myspell-hr/myspell-hr-20080813.ebuild
@@ -23,5 +23,5 @@ HOMEPAGE="https://extensions.openoffice.org/en/project/croatian-dictionary-and-h
 SRC_URI="mirror://sourceforge/aoo-extensions/dict-hr.oxt -> ${P}.oxt"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86"
 IUSE=""
diff --git a/app-dicts/myspell-hu/Manifest b/app-dicts/myspell-hu/Manifest
index 6089a1d8f694..058a0f083e9d 100644
--- a/app-dicts/myspell-hu/Manifest
+++ b/app-dicts/myspell-hu/Manifest
@@ -1,5 +1,5 @@
 DIST LibO_3.6.0.4_Linux_x86_langpack-rpm_hu.tar.gz 3764761 BLAKE2B f85c0dcad7dcbcd0a644720a4a0fb48098918be5cb38bc4168134c4db29002449763b864449299a099e15b91a7bc42f7d0e726a6bef945862eceb8cf5e13a48e SHA512 088a2c898299b61ff10f9397f68aba404bac4de7ead1880088dd16f841b7b403059a82bde7a5e719dda772e494f02d014255782f8e5c43c7a8eb2c07358c66bf
 DIST hu_HU-1.6.1.tar.gz 730641 BLAKE2B 53d08ee9aa073e4a2b5810a90b1a4a8ec42f95b507f0b9c3f1ac401cac39d4d667f18886745352ced180441f231651829bf8480a7a98b336c53cd1fb61337f8d SHA512 7ae1f99b16b714158c33b41ee5c7a3aaeb84bf59a1d1c13a02b0ba30972bfd2b3dd0d04a28997f0f5a97943a89d3cf9f0da55fb219ce24917ae1e3aed0a5484f
 DIST huhyphn_v20110815_LibO.tar.gz 545413 BLAKE2B b65bc84c01a5a34a1650e6fb6d491f71afd8486e9b8f49b4d3d41850f6e2086518ac7360287f376015551e7897033bada50435d67d81e26015cc57dfda05e08e SHA512 147d3d74c5d7278075bdf3734492662c723970630da10e5b1520f960d3f3d89916cd674d44f3b27ccf8e9b81031a75bbf6311614a296f76a39b1de576ad34b10
-EBUILD myspell-hu-1.6.1.ebuild 1248 BLAKE2B bfd8d5894517d1540e4f96dff5074a8852650530f98b15b487c5756e627e14179a4d8782294eea3cf3a2f5bc0d454aa84f472732805c5396860e7c7ad78b2059 SHA512 83601cc3c7aebb553b20ff7e44ac36e312cb4a67a45cd33e4a61c79519ce207aa16b03896604b69a59771bca8873873874a6ba269b829f9303f6c2bc7be22864
+EBUILD myspell-hu-1.6.1.ebuild 1226 BLAKE2B 97071a55b6b3fb0c795ddfa761770fbb4863241eab925bfa87deaffc09c5cce6365fc5f7f16fde146d825ad23d4af821ca7b3add1d0bcc0afde9d6fa9fb2116d SHA512 25ec839877e831f6e6c7f5ccc904a3161d6c4c1f13c093626d1b9a324349e35bdc9c4756d370ffe64f0d7cca01a5f15f646f7d87ed6364f98976a72f7e84b40e
 MISC metadata.xml 249 BLAKE2B 30ee4deacf37c3f6ecf1758e662b80b27d84029d4f4470c71b18bf59348d8895a2952c17479b4bff26059a321d4e5c7da4a36c21c61559fc1101902fabd65b6c SHA512 299dc08d560c23938a5edb4e218464570a497f42c75e2fc3023ac49704b53a3e66ead8b2f69a081209c06f8ef3df847b029ecf0611d0708030416ec22937a029
diff --git a/app-dicts/myspell-hu/myspell-hu-1.6.1.ebuild b/app-dicts/myspell-hu/myspell-hu-1.6.1.ebuild
index 65ba20703f65..f4178dfb3f18 100644
--- a/app-dicts/myspell-hu/myspell-hu-1.6.1.ebuild
+++ b/app-dicts/myspell-hu/myspell-hu-1.6.1.ebuild
@@ -32,7 +32,7 @@ SRC_URI="
 
 LICENSE="GPL-3 GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
 
 src_unpack() {
diff --git a/app-dicts/myspell-ia/Manifest b/app-dicts/myspell-ia/Manifest
index b0ec6fdce325..f884bdd3d8d1 100644
--- a/app-dicts/myspell-ia/Manifest
+++ b/app-dicts/myspell-ia/Manifest
@@ -1,3 +1,3 @@
 DIST myspell-ia-20140518.oxt 224790 BLAKE2B a35c1beb10858ef259f11766dda60b6311a25532e11c983cb75f6bcf9bd4bd21af34b9372ae1e9fc1f64228c3155433868d0388350b10ff47c096f4e11126a1c SHA512 12f0bb5f14f1a7931f04143a670782b5c4764dbf2540da144cd6f1343cd06eba030007108a399f550daaf1f2161831e8f20a7db363d6857639a23a03e644bc4b
-EBUILD myspell-ia-20140518.ebuild 649 BLAKE2B 223ab81774f201698ab75ab69e631035f7aec6205ffb9efb7b16e6af1cfe67857d9a5a58d7e257ce8c4af373cb733503c9156ca80bff7538102c3039f50c23fc SHA512 c4d6922b3621bc0fbbb7c00ca5a3f25ff8cf95ab9f26bfb2262b24851dcc1e137e91bbb0dd7a46b7199f63fc86f00fee5dd2a5a0b438d604434339b75d3c6ea9
+EBUILD myspell-ia-20140518.ebuild 627 BLAKE2B 494f70b8d2d863dedec4d060e035668862d5cf57c6bd0c6a262806b48eb5005b0153c05836eb1e72cbe552db7ff85c69ef36ee00ddd825cb88f81e78522e0804 SHA512 e32899f59c8b6d7907088499a7e6445a224a36f0549f056179b12bb0bd2415c3371f594ed9be7e30d19f36b5429279795a0e4d8addee9129fd5c960c14489e2a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-ia/myspell-ia-20140518.ebuild b/app-dicts/myspell-ia/myspell-ia-20140518.ebuild
index a8705114d3d9..93e8255d6d95 100644
--- a/app-dicts/myspell-ia/myspell-ia-20140518.ebuild
+++ b/app-dicts/myspell-ia/myspell-ia-20140518.ebuild
@@ -25,5 +25,5 @@ HOMEPAGE="https://extensions.openoffice.org/en/project/interlingua-dictionario-o
 SRC_URI="mirror://sourceforge/aoo-extensions/dict-ia-${MY_PV}.oxt -> ${P}.oxt"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86"
 IUSE=""
diff --git a/app-dicts/myspell-id/Manifest b/app-dicts/myspell-id/Manifest
index 834a20efe578..78729eb32a20 100644
--- a/app-dicts/myspell-id/Manifest
+++ b/app-dicts/myspell-id/Manifest
@@ -1,3 +1,3 @@
 DIST myspell-id-2.0.oxt 135667 BLAKE2B 86de36a18c9bd52d68c0115b1d5d2ba6906f508c7db2dd521ea1c42c1de989304b35ff1bd47b86ebf80ad1ceba037e25ad3b11fd02cf620ab1d0fbf84bbdf16d SHA512 43d5e0ba4d582528d15d0f533d7bc1ef89023d1155cf5959d3df9fbaf7a1fc48c35402b774e1b8aa7475edbe5ddb2fefebbef596c3cfd73021215ac210bc47df
-EBUILD myspell-id-2.0.ebuild 679 BLAKE2B 21d7f87791635a6c5c8f4a4d0bc3d4c2923617067ea7abb7be879f54b0a33eccd6555a77a4ae357ca187bebacb8fed05ca2b65fda323e42f4494a489ccbfcf0c SHA512 8ed435ddc6b4a67c79622524a3bd0d9668ec3aba3a507d68f574c602b6109bc66e2ddb295347b5ef3327e37977eb7543c4a6f257427eed114ef006bae62fd35c
+EBUILD myspell-id-2.0.ebuild 657 BLAKE2B e7506eacfa5e6bbde3cebcb31d0b771fb01058bf84ffdeac5b32b6f5d70795a54600dbd2cae3ee0e5c08aaacb814e6d7d90ba92e09f690c1e037f847f3019e12 SHA512 6b26374a93de03149bdb6b3d7652f45c2ff4f2ae91b83d226f776105e6977bea19cdd79d50e3a64e10e489ab4f2b6e9fb0a9ff9759001665bbdc05fc82fee70b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-id/myspell-id-2.0.ebuild b/app-dicts/myspell-id/myspell-id-2.0.ebuild
index b5d4258641a4..89d4d57afad1 100644
--- a/app-dicts/myspell-id/myspell-id-2.0.ebuild
+++ b/app-dicts/myspell-id/myspell-id-2.0.ebuild
@@ -23,5 +23,5 @@ SRC_URI="http://extensions.libreoffice.org/extension-center/indonesian-dictionar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
diff --git a/app-dicts/myspell-is/Manifest b/app-dicts/myspell-is/Manifest
index a35d3e5e8346..3e749190e23c 100644
--- a/app-dicts/myspell-is/Manifest
+++ b/app-dicts/myspell-is/Manifest
@@ -1,3 +1,3 @@
 DIST hunspell-is-2012.09.01.oxt 678230 BLAKE2B f8a4fa14c1cc9c89213a236d38fbd6b3621fbbaa4803eb3bb70761ec387cddc0404546c3b9ee719c104c0321f5736394506993e153e0b575b790376d2081818f SHA512 39af86809f735e5f0698b060d514bc2d9d53cc4ec7ef4edb6edbd92674af337ea48fc69bfaddb2dc2532be74ae5a079068cd691212042bac70a622d1f02eebe6
-EBUILD myspell-is-2012.09.01.ebuild 669 BLAKE2B 5a81cf04f399f69cbc6f284d37f9adfd0e6f4b397bb252e390a342c4adb66ba283d59858605274c6ffc2ec6b8e3b35c39257b5c0e4c2c3a5aaf8b7c009733e14 SHA512 2f27a5cc22552a7d06128f74c05bc42663d6b63c908edc3b2509288b7001796f3bb3f6c2ac2f23b8f11497e3e53df5dab6e77bb324702288eed34de264a91ed8
+EBUILD myspell-is-2012.09.01.ebuild 647 BLAKE2B 1cbee17f78038363a733563dee0bb1f6a67eafc823be37faccf36881861574eb2268ab803708d23b822328632ce151d1303f34b932f1c5cafcd95c3fa07260a3 SHA512 b7859244d3ae936fcad2c975bad7b92ab9e3e728e97a8e58cb3a4c28a1ee27a11681768a7d41af2a44e372a49e4723b521161a811477aa073335bc338ec62fa9
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-is/myspell-is-2012.09.01.ebuild b/app-dicts/myspell-is/myspell-is-2012.09.01.ebuild
index e11f3a07345d..f0cd0f223a92 100644
--- a/app-dicts/myspell-is/myspell-is-2012.09.01.ebuild
+++ b/app-dicts/myspell-is/myspell-is-2012.09.01.ebuild
@@ -22,5 +22,5 @@ SRC_URI="http://extensions.libreoffice.org/extension-center/hunspell-is-the-icel
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
diff --git a/app-dicts/myspell-it/Manifest b/app-dicts/myspell-it/Manifest
index 461e34a4c2b8..347f922c79ec 100644
--- a/app-dicts/myspell-it/Manifest
+++ b/app-dicts/myspell-it/Manifest
@@ -1,3 +1,3 @@
 DIST Dizionari.IT_20081129.oxt 1433036 BLAKE2B 0e0aa03fafa34957a00b054070de67aec3f742d4cf177c6185c8a6b8a4005ea94f4041fb2e29a0ab7fa87a7d04c5f2148f98bd446e196470104ccf1b3ad97a0c SHA512 f0576f62448d368680545a66bf99d3d44c75562a0b5bc72c9020cef707c5543182ea1f45934826970b9e3ea588b9f2e29686cd08f7b8fdddcfdbd067e6536071
-EBUILD myspell-it-20081129-r1.ebuild 788 BLAKE2B 73b0fc01a93ebfdb5969e7b7e14e8a082a80f7d3ea6201e101cb11bfecaa1031db948a7dbe04411f66d606ba608a6dc64b7f09e2742f00811c758f9ac5367fb2 SHA512 c88c2bbdcb2c18e5166ade06f96b973a4e3f2a289415a124497e4dd6d9f34e714b4b371e6b55a9d4ef4127a614014d6bd18e27c0d2b9f6472cd55b9a32a6ad36
+EBUILD myspell-it-20081129-r1.ebuild 766 BLAKE2B e25d0eae13715a8f54c11971f6a692d322657caad6b56aee28ca1d1345cd14fa11118e3d2eb8a2c204f15708f349fd40d5fd25edddc510f2e45302551f831433 SHA512 84937b3d6f2d4a25ce46bea2ce0d3a73e27f369853e21a02e5a1bccae55eba1ce6849211722ceb65a431fe74ddba5c2d76dfb747b768e52bf1030d94b82e4441
 MISC metadata.xml 248 BLAKE2B 2c1fcd90482f1cfffb25b908862709cebdefed604a40a5611ebd3e8831829c1b07aab4911cb5962aa9bc0587832d8a01ed43558a6fad30feed29b9ae0ff97161 SHA512 1d44fa5baaf032845df65374a83f1eb1459100ced59d260a19456fff81ce7dc1c074cd34b1ad37b172af7cdee476fe0de39aa3a280e311816dd8bdd9c98a61ad
diff --git a/app-dicts/myspell-it/myspell-it-20081129-r1.ebuild b/app-dicts/myspell-it/myspell-it-20081129-r1.ebuild
index a25648ed5c99..3b7033469216 100644
--- a/app-dicts/myspell-it/myspell-it-20081129-r1.ebuild
+++ b/app-dicts/myspell-it/myspell-it-20081129-r1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="mirror://sourceforge/linguistico/Dizionari.IT_${PV}.oxt"
 
 LICENSE="AGPL-3 GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/app-dicts/myspell-kk/Manifest b/app-dicts/myspell-kk/Manifest
index 5fe1557b71c9..d208b7863093 100644
--- a/app-dicts/myspell-kk/Manifest
+++ b/app-dicts/myspell-kk/Manifest
@@ -1,3 +1,3 @@
 DIST myspell-kk-1.1.2.tar.gz 310307 BLAKE2B b760b807c1dd6814ac89a8b0aa99cac4c28948e43d389d26627967cadb0de76173e09a53e21c1c96713ef3f4d234a594471b512d4481f2e686fc95259a243cdd SHA512 1373f7af6767a9d81b3fd03207775999eb4be7757ccbe26a849f9b3c47d7dbf0b4e8cfd3e4e6436b45478ab01dc23f7d255c2a9f7100193c6b9b3b0f7935d751
-EBUILD myspell-kk-1.1.2.ebuild 610 BLAKE2B fe3c0a34acf4721812b7a46fcb204931ee1597edde3b7d85d23afe2cd582b44ed021812e3c29e7f375bf6aff8af5c037fac6bc20fef07fc68e372e76f9709661 SHA512 1856214a25855cd9c63dfd37591e07bc442e141430431ef62b5a21a546c673cdf3ecae43779f094f199350ef16932c46c882db11580a71b487e1afa668357e0c
+EBUILD myspell-kk-1.1.2.ebuild 588 BLAKE2B 080ecccd9bdffc94f8d0ed8ecf75c23297decb65994efefa4cf74da72a8ef80c835f9c8560d9624eff42732f75c46453eca3a02bea03c763a8ecf03c6a27f331 SHA512 f3906d277ce8397c7676cce43d6d4ad35566dd58bb5e57a5a6eb4d533da191c672db8d4aee92f22d5ca1833ac840b929dd65f3eb68ad0600fb2bafce77cd983e
 MISC metadata.xml 449 BLAKE2B 84aa1da65f19ac5da191ea172992d27e489f6d0cc5725b0fe60c212a78bdc8dd0bc97fad7b2e9c4916255fbc6275646011b3a10bd75fa9e1c0e02f7c86562ce3 SHA512 867a4fb1664a64beaa720c06f0ae026d533ad2eefa208007bdc0a37846b687aa510c86e34f5b376d386711e17400dd62f0b6f06751cadc5cba9898cc7d4f1188
diff --git a/app-dicts/myspell-kk/myspell-kk-1.1.2.ebuild b/app-dicts/myspell-kk/myspell-kk-1.1.2.ebuild
index 0ed8b6be01f2..f223283f085b 100644
--- a/app-dicts/myspell-kk/myspell-kk-1.1.2.ebuild
+++ b/app-dicts/myspell-kk/myspell-kk-1.1.2.ebuild
@@ -20,6 +20,6 @@ SRC_URI="https://github.com/kergalym/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 
 S="${WORKDIR}/${P}" # override eclass assignment
diff --git a/app-dicts/myspell-km/Manifest b/app-dicts/myspell-km/Manifest
index 203cef66a362..2e9c2926baa5 100644
--- a/app-dicts/myspell-km/Manifest
+++ b/app-dicts/myspell-km/Manifest
@@ -1,3 +1,3 @@
 DIST sbbic-khmer-spelling-checker-1.6.oxt 355760 BLAKE2B f9b87b3ab40204cb756440b0d705156c9b7d7d2220db9a1baba8b3c5247b6cee76c7326e7e5f69d6f7f2ae926b0e865fd7dc2f1c38db40608ddaee5159f407b2 SHA512 0cbe28a5b9c1c7aebe8cb14ab76115dd3d08c75f20200bd0685d05b5d462b2c53b3e658b150d58a44dcf1589df99eb92a68aae3f5d5afb63591ae19a338230b8
-EBUILD myspell-km-1.6.ebuild 647 BLAKE2B 6d445a2c582a1254316741b5d709b6d3162a2dc2880bc6fa00d599271ec0ff712ada807c13ab39c5885313a02b38d7c236422afbb42f16302d8fe00894d732e6 SHA512 add92691063d8705c56013cdb1442c13587b6729aaca79d21d00755cd6dd1aa58446213310d17ddf9418a3bfdee759fe24cbc1d597190cea27bd51d36a8e7e81
+EBUILD myspell-km-1.6.ebuild 625 BLAKE2B e9256ebd582bab6b0924cc08ff4354e0edd298a61ca1181f2e8303339d0fab74492e3301894cdbde1cc5eef98d2199697bef3ce695116718327910b4712c3a46 SHA512 aa0243d3f33421378d54b24be6706276d01b4b0bd03e766b1b191679ba39ed4acddca7cf2bda04869db30d2420cb34545cd7ac1925e3ed556dcd36c777180891
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-km/myspell-km-1.6.ebuild b/app-dicts/myspell-km/myspell-km-1.6.ebuild
index ab770b635b01..dd8875a2df51 100644
--- a/app-dicts/myspell-km/myspell-km-1.6.ebuild
+++ b/app-dicts/myspell-km/myspell-km-1.6.ebuild
@@ -22,5 +22,5 @@ SRC_URI="http://extensions.libreoffice.org/extension-center/khmer-spelling-check
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
diff --git a/app-dicts/myspell-ku/Manifest b/app-dicts/myspell-ku/Manifest
index 6c270b2db31e..a2fa6c66e2e1 100644
--- a/app-dicts/myspell-ku/Manifest
+++ b/app-dicts/myspell-ku/Manifest
@@ -1,3 +1,3 @@
 DIST ku_TR-021.zip 42128 BLAKE2B c53a982eafd0e55e78eb7f37339e652070129c32065807fcdee8a83fcc1246adbf5053fb3c45adecfccd8e12da2dc149924b1803695be5a32816fdbefc09f5d4 SHA512 2f9eb5bfb6532ba603451061cbabc9859930eb0cb8549ef409b5e92767d5dfdcfff1cae81e7d8ed59a888e4babe730e661c82a2d51bf40c74392f64a7572a194
-EBUILD myspell-ku-0.21.ebuild 540 BLAKE2B 410ece691f746d2ea73c166167c36d9cc817e940e1f1041a304c4d586c28bc1b305b3ee4685c66c8eb2dd93f1147af0723274ad2254e6ba273a472c2d7cc2fe0 SHA512 d80c43237692227d0c8ffb41d6731c6bd632ff69e503bc033bf3416735276eefcf46a315e08f418a55a911f483a280ec92153ea547a1424e40213d1c26028d47
+EBUILD myspell-ku-0.21.ebuild 518 BLAKE2B c68efd12e879a9e7e218662dd0a1149a25163d055b358746e4fc10bc5e7e93695482564a8aeab7556f9db2daa7c74a941534de33b89cf867085711dc235f2484 SHA512 805dbe190ed4d8239a01d7a6baf5e0ea5a7b08cc7c7954ea73f1e916257db0525bbae07e39cba2016cc9c80ccd14a5e652a0dd9a4d81db4d01ffb7cc3ae01bb6
 MISC metadata.xml 251 BLAKE2B 481d3df677e0d401d036acc39e6a9a880fd6aac1ecaec623041a9202502ec9926021f10968b23df10f807d79e538eb71542e61dc3c3a7103280dead23120e6f9 SHA512 065a583724711930f3f184e5a94a08e3d1fd3ac7b3a70e213605f2b5888cae66426f3172fb8733a02166883e3ac5b713fc07eb3745af403f2b3339b3162b7578
diff --git a/app-dicts/myspell-ku/myspell-ku-0.21.ebuild b/app-dicts/myspell-ku/myspell-ku-0.21.ebuild
index 3fcc101f166f..e3362928aa8c 100644
--- a/app-dicts/myspell-ku/myspell-ku-0.21.ebuild
+++ b/app-dicts/myspell-ku/myspell-ku-0.21.ebuild
@@ -22,5 +22,5 @@ SRC_URI="mirror://sourceforge/myspellkurdish/ku_TR-${PV/./}.zip"
 
 LICENSE="GPL-3 LGPL-3 MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
diff --git a/app-dicts/myspell-lt/Manifest b/app-dicts/myspell-lt/Manifest
index 3f827cb15682..286017dd13e2 100644
--- a/app-dicts/myspell-lt/Manifest
+++ b/app-dicts/myspell-lt/Manifest
@@ -1,3 +1,3 @@
 DIST myspell-lt-1.3.zip 339657 BLAKE2B 9549d1968d3b60a2b712360dab35fe696369afbdb34097eb7484ea0497b67becb43592878cec5e64691e0069babc9d56817b4d170dbb1ef092d50de64b076420 SHA512 e18f22efb665e3c4cfe0398bafc9e0626c4322009e4b056f3f5cb074778af851bd463be05c55e1bb0bfbc1a04d06d022a3aa37c89e7efac2aa38b525ab415cf2
-EBUILD myspell-lt-1.3.ebuild 534 BLAKE2B 510b89265b2652364be255443af9b10782e51cd481edfde07bfc39e5e9aba95a46dda1c89b2fc1ab4d4ced7ce37abb4ca7bc4ed0a23ccdacda7110eea50042b2 SHA512 cea571f3ac6c9a0158f215c4658df0101a15a9b6fca5bdecdc5e953029b6f2af7af1404c34b36715755dd7f270afe9c59341bcce20728f04910da169156a4e17
+EBUILD myspell-lt-1.3.ebuild 512 BLAKE2B d5a305d27115bbfd3662049afbfec2ddf9758eb7540105c47ce8a86a147fb5af591d4415116a7ce8de14d7e86ce39f4890e867255ffb4a122cd85c60a5824312 SHA512 d157bea54e984f293825115b7f9fb8bf3a0a4cb0e10e86a50da13c1cbdd13f3e4cb7ccc3221f79ad489cbc2d7747a5dc63630b9a579a7f0144e5be3faa6d3fdb
 MISC metadata.xml 244 BLAKE2B 1d2da72e348a40f2390d722aa2a081d633bb3f7c4269f9780eb6e092cc124abfe030e29f18ab119fd7df4c52cb2caee07d6d536bec2e9b84cd254bbddb28ed08 SHA512 e07e0b634f9300d3256fc47c9425afff7bbc9241f235830401002d55ce701e1bdfa1a45dd56c4c81307040560900a1768da3c82f0242c3b1d949446f259efa51
diff --git a/app-dicts/myspell-lt/myspell-lt-1.3.ebuild b/app-dicts/myspell-lt/myspell-lt-1.3.ebuild
index 8a222f6d245e..437ef07afb6b 100644
--- a/app-dicts/myspell-lt/myspell-lt-1.3.ebuild
+++ b/app-dicts/myspell-lt/myspell-lt-1.3.ebuild
@@ -22,5 +22,5 @@ SRC_URI="https://launchpad.net/ispell-lt/main/${PV}/+download/${P}.zip"
 
 LICENSE="BSD LPPL-1.3b"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
diff --git a/app-dicts/myspell-lv/Manifest b/app-dicts/myspell-lv/Manifest
index 09a8cb7044eb..d57279cb2b27 100644
--- a/app-dicts/myspell-lv/Manifest
+++ b/app-dicts/myspell-lv/Manifest
@@ -1,3 +1,3 @@
 DIST myspell-lv-1.3.0.zip 374356 BLAKE2B 6924d09c4a7f70e840dce48a0d5e7807bd3210a13d79c3c7daa6de89cf58acf9d38099b03f1c0bf0420144fd867d2b737167e248457cf4bccad505bc46c00e66 SHA512 fbb53475870cd0200403e75ea3f84c8534b4fac349093515821e98a8e1f3bd839fdec0543a2e4ded1bacab93052babbf8ffbee4742d291bfc91f2d768b4ac445
-EBUILD myspell-lv-1.3.0.ebuild 651 BLAKE2B ab969ac173f88489b80aa043c99cbb4521c42ed0156f6a95b4718bb3c247e5703182201df46d5c9ba88e8cbbc2e663e1d697f009ad8910e013b806e2bd503622 SHA512 e72a6899f778c28dda21d976f0c8397bb99ab71f80daed20d6cbe002334f728626c80b798be39aa1af8ed1b9435fa8b83b721dd9e984c3014185713a6185c264
+EBUILD myspell-lv-1.3.0.ebuild 629 BLAKE2B a9d9153f6ac8f0f7dc8d542e0bd5d8a520630be87186c9d19ca1b970b10abfb8c648b57eef39d2523210d92f6caefc1646e1deb2ac921522215669885c8ac342 SHA512 85fdd0e6cf6c03de8af743c03a595f983aa71b41a5970ab8027be58bc37ec1c4881c050af5aee7d2ac1717a2b7d51ce7b0c8d0e42c2a32c7d9c532b6e95e7a6e
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-dicts/myspell-lv/myspell-lv-1.3.0.ebuild b/app-dicts/myspell-lv/myspell-lv-1.3.0.ebuild
index 1861214900a2..6af7c408736a 100644
--- a/app-dicts/myspell-lv/myspell-lv-1.3.0.ebuild
+++ b/app-dicts/myspell-lv/myspell-lv-1.3.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="http://dict.dv.lv/download/lv_LV-${PV}.zip -> ${P}.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/app-dicts/myspell-mi/Manifest b/app-dicts/myspell-mi/Manifest
index 75a7481f2510..01c855c26e7f 100644
--- a/app-dicts/myspell-mi/Manifest
+++ b/app-dicts/myspell-mi/Manifest
@@ -1,3 +1,3 @@
 DIST myspell-mi_NZ-20060316.zip 78777 BLAKE2B 4e694d2ee35c86d677ec9abef3346e4c47364c80ae327178cab8556a514dc810f71af589349e5730367a9ac952165fe634545d426f8352bbe99096d22cf33e83 SHA512 391f70bbd7d66ede4c8df7f7d5544bc7f40c3e97b80b509ce887e74770f9183ca98475715dbf9e6ceecb3445d1d3c5c1de35d1ea540e13a3a17eef690c91925d
-EBUILD myspell-mi-20060316-r1.ebuild 513 BLAKE2B e1dcbf3b5a9c93471ea25e5abee5a967ce206bfb6a36cf5fa8cea5d7f739805332d2af942cdb9d5ae0a3d49816ae5997bcaca7fd505ae7370dfa506fbe6846eb SHA512 4686cbdcad8426dfdf6bdb9a2b362eb8943fa9333ced38062ada5d08a5be5486ef527c528e308649388ff1d9d6282f7d221dae71217c25369005cd609b1e7178
+EBUILD myspell-mi-20060316-r1.ebuild 491 BLAKE2B 21526967e540a8d6244bf8218d2d6139121ca664dcbb7689682ec6625b1ca7d7d6d0bdf93c4d4cfa9ee9150f4f07a6e7eea31471a1b0f1908f24974424721c62 SHA512 6fc7bd218bd5cd22033312f7adb5ef28002c8d065006e48cd4e5626bf1afed5dad75f9a0ed6332bf78fbd13b5d54f33fddd7182f92809822630e724e08c79c6f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-mi/myspell-mi-20060316-r1.ebuild b/app-dicts/myspell-mi/myspell-mi-20060316-r1.ebuild
index 952437c4f06b..3d80619495bc 100644
--- a/app-dicts/myspell-mi/myspell-mi-20060316-r1.ebuild
+++ b/app-dicts/myspell-mi/myspell-mi-20060316-r1.ebuild
@@ -22,5 +22,5 @@ HOMEPAGE="http://lingucomponent.openoffice.org/"
 SRC_URI="https://dev.gentoo.org/~jstein/dist/myspell-mi_NZ-${PV}.zip"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86"
 IUSE=""
diff --git a/app-dicts/myspell-mk/Manifest b/app-dicts/myspell-mk/Manifest
index 84b488a8e06c..8899933d6b0e 100644
--- a/app-dicts/myspell-mk/Manifest
+++ b/app-dicts/myspell-mk/Manifest
@@ -1,3 +1,3 @@
 DIST myspell-mk-20091211.oxt 488927 BLAKE2B ef9f9178729dc1af3968583c96e96ca322f609cff91c5c9ae2b6b852e6d3bf5dc71d539eedbe3c88cb3e9028efe18442822746aa7d2dc134000d26ee17034b61 SHA512 7dab57512c208e705b122100b20fd93587d42dac95d9fa701477b5940d715964e6aa71b20abcf6b16eb4f7706d0c0026f1b01815f63b1b85b0a2e0ce0ac40376
-EBUILD myspell-mk-20091211.ebuild 561 BLAKE2B 36e1e6cc2c599e7bf9fe94cfbab60079e0bb6c7a2501adddcc10f33494a413b390454a7150bce15d63d31026813e6a3454b20a1a926de1bab6ce1452a5b75510 SHA512 44b742bc899fe2f521b6531f5d4f2ee6a789a42e325ef5c3329d4b639d421f44883e6a8d88fcd5ce2deb92be6ccff4361cc3b078f2f88c4310c7186220e8b97b
+EBUILD myspell-mk-20091211.ebuild 539 BLAKE2B 47a8d872841fab4528b08dbc3f10adaa1a34ed1681078222f39bad32440fd139dc8e2315a7c2cbcca5dcd5b146ea6bd591da317c01f7be3dfb78c88e418579e9 SHA512 16373d080f95286d8b5fb074a7a7017ddb596cdb66c9b23f3fd92e16f6ed2c3770292e2c7a4c37d6073ccadc6d0896960b21cf264c70959716aa2cb6c609c37c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-mk/myspell-mk-20091211.ebuild b/app-dicts/myspell-mk/myspell-mk-20091211.ebuild
index 2d84fa2acbc6..8f2b6ec0c78f 100644
--- a/app-dicts/myspell-mk/myspell-mk-20091211.ebuild
+++ b/app-dicts/myspell-mk/myspell-mk-20091211.ebuild
@@ -22,5 +22,5 @@ HOMEPAGE="https://extensions.openoffice.org/en/project/macedonian-spellchecker-d
 SRC_URI="mirror://sourceforge/aoo-extensions/dict-mk.oxt -> ${P}.oxt"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86"
 IUSE=""
diff --git a/app-dicts/myspell-ms/Manifest b/app-dicts/myspell-ms/Manifest
index 5ac2dbe5dd5c..e05da1ca6d26 100644
--- a/app-dicts/myspell-ms/Manifest
+++ b/app-dicts/myspell-ms/Manifest
@@ -1,3 +1,3 @@
 DIST myspell-ms-20100407.oxt 79342 BLAKE2B dd66ab939c604003bf7cdd582ac02367a214c20f7314703d375c954e33a3cd8a00366eba66d11af97859ec756d2b3453edf09d3db5d8d90bba56b1681535c9f1 SHA512 9773766c8d2a0bee3d9f055b18449432dff4cf08417cece77fa76b016961f85073efe87baec13cea26c505a7438dbea60ae91909dacbd73c254606ea012a96dd
-EBUILD myspell-ms-20100407.ebuild 560 BLAKE2B 9eb3565be0b5d3ab4d9e8bc55c99156c7e5014d9375edd958b292cea761136bef615393884eea6b51cd2b279db9f345169fbec41b6a006b654b209f2bd58e5ae SHA512 c525fa624e7d5c65b509d23fed2a123e0906b9dc28fe569e5472550f7690d8f927c3e38b16c6697093fb63e252d2490f26051b9d7a9ca3b77ece65192aaa3c22
+EBUILD myspell-ms-20100407.ebuild 538 BLAKE2B efc047cbc6d5538ee49688824ee013cfff1d62040ccd7e7846c3c911a00e5c05021f85de75d878918f17c31234bbdde3fd2c91f44146e663391d93246496ea2e SHA512 4c2871fa8cc711bfef215ea6e1b845f1c456a243f1c643b6396f38674e77df28ede0d960e297b5f64c647eae9179b7321a25a73ed228e44214312e6926c9b9a3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-ms/myspell-ms-20100407.ebuild b/app-dicts/myspell-ms/myspell-ms-20100407.ebuild
index 8c5245549eb0..12b73fb3ff44 100644
--- a/app-dicts/myspell-ms/myspell-ms-20100407.ebuild
+++ b/app-dicts/myspell-ms/myspell-ms-20100407.ebuild
@@ -22,5 +22,5 @@ HOMEPAGE="https://extensions.openoffice.org/en/project/kamus-bahasa-malaysia-mal
 SRC_URI="mirror://sourceforge/aoo-extensions/ms_my.oxt -> ${P}.oxt"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86"
 IUSE=""
diff --git a/app-dicts/myspell-nb/Manifest b/app-dicts/myspell-nb/Manifest
index eb6686d297b6..a398fffcef49 100644
--- a/app-dicts/myspell-nb/Manifest
+++ b/app-dicts/myspell-nb/Manifest
@@ -1,3 +1,3 @@
 DIST no_NO-pack2-2.0.10.zip 3221701 BLAKE2B b064fa40f9ee6429d5309040270f9c5dea655a0f6810d2ed876345a031a12b7d6318ff4e7b9ff32b7ea4f3b4aea7d6679bd7d971bdbf5557dd9edfee28327211 SHA512 af7ee5c465035aa419c60ef8621d6697e86e5fbed39737e86565bb3fe4851ee35d57f832e56ef0d27ce9b26682d5b32ef2213dd6c3323074cde2784fb236298c
-EBUILD myspell-nb-2.0.10.ebuild 686 BLAKE2B 088779aa3b1458546a7abc41cdb5383c0499a519a212c6ed8915750e96035c8dd3ab7a13c89ff4628e9026ec1c4b0e27e353049cfba9f901a7c4128e1ebe6a08 SHA512 cf27fbabbb5ac5e75511ae86d1c2305703ad8eeb3492b8e92affe9043d68fc0a7641e7eb0afc075c021eeadf8994c75c85a7972a0cd82815c5c32bbeb2ef9438
+EBUILD myspell-nb-2.0.10.ebuild 664 BLAKE2B 5cf94fdc3e24130834f35fc11aeab371826584b3ddf1e70f228f5aee22f64f7d077a5e2f04ac3c7f5bde6dbbc47994f565dd9744d2276b22a229ce3006027b21 SHA512 0b7012b5a352de9e5f1b1583ed0f6681374f259dbcf14d7cd32b0e89aa6dcdb13e3ce452d402ed7d5b72fa8d976f055e5d9e3739d02322d507f8550e189badd8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-nb/myspell-nb-2.0.10.ebuild b/app-dicts/myspell-nb/myspell-nb-2.0.10.ebuild
index 44952b2440cf..d1adf94a3fb1 100644
--- a/app-dicts/myspell-nb/myspell-nb-2.0.10.ebuild
+++ b/app-dicts/myspell-nb/myspell-nb-2.0.10.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://alioth.debian.org/frs/download.php/2357/no_NO-pack2-${PV}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
 
 src_unpack() {
diff --git a/app-dicts/myspell-nl/Manifest b/app-dicts/myspell-nl/Manifest
index b59525179957..e9784aa6c10e 100644
--- a/app-dicts/myspell-nl/Manifest
+++ b/app-dicts/myspell-nl/Manifest
@@ -1,4 +1,4 @@
 DIST myspell-nl-2.10g.oxt 868845 BLAKE2B cace4a9750e9e7680c48a414065be3897afd29c3f6908c95021e92ebe050784bc7c7379f0a3ff74fc34c6ee6bb1b3499636c77dc60c757520c6d725735a2547a SHA512 070ef6a5d63a2fb9806f7bbbb1459e40097bbcb5c8ab9babb9195844e387847e2295890b149c0a90aba19e4fced7f3d90d338ba976614fc73c5c367bbc9cf4d4
 DIST myspell-nl-2.10g_thes.oxt 1956026 BLAKE2B cc8a79e746def1f6f1026a77890472005f6ad81a1addf1e86936848b07aa1aa31692151e1f7427f792d0c04d1854ff9a6b56abb755cbbc78e0c4dd1e03e378df SHA512 2a13b97ffee1fb98ba29f74595ff9e29a89f294d82efd2da2e89983ff5a21852a1222bee9a4684dd5df621e1dc5621853e1d87cbf0fca311c8eb9e267598eee0
-EBUILD myspell-nl-2.10g-r1.ebuild 1090 BLAKE2B c9b94b4050ad5061785a5cbae39cf19a051de2e4daa05026da141a777e1ee840fbad04e1014c79b0d67e9c3e56134f3ce011999f4493cecec6daca0ee4d50400 SHA512 1f7a2219d45a5c215d7947dcfc0f320c0289b6ee2ebc2c9da905b280d6bd3d1400cbda7d1fea18b9013e9bb5b4c1ac11a4707460041569a8bca14de072b67447
+EBUILD myspell-nl-2.10g-r1.ebuild 1068 BLAKE2B 07b5a5187b01c547b9c440abf07dc640087942e8b3dfbc88e53731a34576d207392fce62869d6412cac2f0cd2df8d3f0f43c10677779d2b3647bf789aff829ba SHA512 9f18303300f7113147bec62b6fb9a851244a9c813b11a7b6ceabd381ec22fbaa65a0fff7a0b33bd38a25afda403ae78011209d58996693625bafd193c47fe8a1
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-nl/myspell-nl-2.10g-r1.ebuild b/app-dicts/myspell-nl/myspell-nl-2.10g-r1.ebuild
index bcbca840a4d9..d37a036b02b7 100644
--- a/app-dicts/myspell-nl/myspell-nl-2.10g-r1.ebuild
+++ b/app-dicts/myspell-nl/myspell-nl-2.10g-r1.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
 
 LICENSE="BSD-2 CC-BY-3.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/app-dicts/myspell-nn/Manifest b/app-dicts/myspell-nn/Manifest
index 7c92fafdf040..4860ecf08e44 100644
--- a/app-dicts/myspell-nn/Manifest
+++ b/app-dicts/myspell-nn/Manifest
@@ -1,3 +1,3 @@
 DIST no_NO-pack2-2.0.10.zip 3221701 BLAKE2B b064fa40f9ee6429d5309040270f9c5dea655a0f6810d2ed876345a031a12b7d6318ff4e7b9ff32b7ea4f3b4aea7d6679bd7d971bdbf5557dd9edfee28327211 SHA512 af7ee5c465035aa419c60ef8621d6697e86e5fbed39737e86565bb3fe4851ee35d57f832e56ef0d27ce9b26682d5b32ef2213dd6c3323074cde2784fb236298c
-EBUILD myspell-nn-2.0.10.ebuild 677 BLAKE2B 64989883d360f65e5481298282b915ed6ec1e56c7797a0b1df0786141843e20044580757c8319372aab2a06ec5efcc32698a55b2336cfca43fb91b6886a46371 SHA512 0b66f707df87810b9a9e7612fdc3efbbd794ab4c260906e0b8432876f63c52f169daad26470aaec34fd9e06e6127af681f14affe19ad9dafebc41160928317ad
+EBUILD myspell-nn-2.0.10.ebuild 655 BLAKE2B 13feffc55956b9bd10b6198ad8f3441a446988a9009214109f9cf725f939f07fd92b134a5a7f12d8478f33639c79d7e23a71993a7f839d567ade3be273861130 SHA512 f55d76f88be49d47a2ef7119081a3d7c425383c9115e2e838fe104770e1e1138736551b235c5efbe82eaf4f5f6753a78237b17ac9c65f4d9888818e93a7a93ce
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-nn/myspell-nn-2.0.10.ebuild b/app-dicts/myspell-nn/myspell-nn-2.0.10.ebuild
index 5a277b5e8f7b..9fcbafbf6c3b 100644
--- a/app-dicts/myspell-nn/myspell-nn-2.0.10.ebuild
+++ b/app-dicts/myspell-nn/myspell-nn-2.0.10.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://alioth.debian.org/frs/download.php/2357/no_NO-pack2-${PV}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
 
 src_unpack() {
diff --git a/app-dicts/myspell-pl/Manifest b/app-dicts/myspell-pl/Manifest
index 1b8140b881f5..bbfc73ffb65e 100644
--- a/app-dicts/myspell-pl/Manifest
+++ b/app-dicts/myspell-pl/Manifest
@@ -1,5 +1,5 @@
 DIST myspell-pl-20130306-hyph.zip 14013 BLAKE2B aef123b7936d2e15b632955b56e3ab7d7043185d3e236c43f65dd626ee65986662beb8ab65eb25c23a631acc2e5b2af6ae8c3a75117b7e933101fc121a68ecd2 SHA512 931c9fb2e58b0c5d65edc19a7f4bde7e0ccef496d76466944c8b0e249506370145d21c10d9209b6703dddd58887651ac8a2cc7579a1aab8deeed0ccac2908605
 DIST myspell-pl-20130306-thes.zip 1576689 BLAKE2B ebd21dcf7670821d6fa4db4a7d5448cccf8b6e0094e5e8c91a962fc44f5fb14c30e219c8555d2ddb9155c1f36521c939057e18d84f2a399203e504fd738b6ea3 SHA512 c9f5c9c0e5acb0f079c99120ec517d37d39155af22c727bcd9b3af987afc9e217ae0d84539e491246c6a4bfcd2667b556b141ff7003df06927ce873f4572aca2
 DIST sjp-myspell-pl-20130306.zip 1126237 BLAKE2B e627de2424dbbe0ea20750d41ebb809cc95b237e8a635e6a31d0a149dc67cf3747d6561055210deddcdda35ba09775d7d140996fbc11a174cb2e4e0fc7fac172 SHA512 1cd53dfe956be6ab23f10c95a28a7589c4859fb41a217b643870c2662e68bf94c96be421f0437ca196fbdce4ca4bc60696e07a1d783a238c544b35cec7f25ec5
-EBUILD myspell-pl-20130306.ebuild 1003 BLAKE2B 8efa7e163ee4cfacc5d124970fb1f4522d48a60982dc8c6a8bef8e4731c309511a7baeadc4fa6e0498e3a76eb8e91e6896320eb2f63407c8e4460a22adbf0678 SHA512 bb6174b735988748f2f8ebd5080d8ae524bded4a3b59c21a290705cd43aaf61b4736712b61d1328e7d724f82e79ad12b3307f093aec1377d2a2c6703c6558fa6
+EBUILD myspell-pl-20130306.ebuild 981 BLAKE2B ba03f8db48dd99f195e06bf1263892f3f0e03a17de920a81d9479b4855dae6c6fd6d408cf8e2388164f823bf75712f698575531bdfdddbc28a059aa892410329 SHA512 f5e04b977a8839166aed895191c186041e419a7ccc81870a02bc8ebece47987636b493bb210f015bc7dc55578e37a50495ab45e85ef18f7d804b34a4bce21d1c
 MISC metadata.xml 245 BLAKE2B a2cb964a56e337421895ef1898f907e27fc87cfc5052a075d2937155c9f95424e553f22dbbfc80e1f1688451575c6e04a160d73c5704e942b48d6b968fc967a0 SHA512 1eb2f8e5640bf08d3a88088e524ca87629b75899bf0c3c81edc984ed0249416ac3d79ba9baed4662ae9acad4e2c0b534b8e89ec94600c1637821cbef55fbb616
diff --git a/app-dicts/myspell-pl/myspell-pl-20130306.ebuild b/app-dicts/myspell-pl/myspell-pl-20130306.ebuild
index 2c813028d237..5905f3f41803 100644
--- a/app-dicts/myspell-pl/myspell-pl-20130306.ebuild
+++ b/app-dicts/myspell-pl/myspell-pl-20130306.ebuild
@@ -34,7 +34,7 @@ SRC_URI="
 "
 LICENSE="CC-SA-1.0 LGPL-3 GPL-3 MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
 
 src_unpack() {
diff --git a/app-dicts/myspell-pt-br/Manifest b/app-dicts/myspell-pt-br/Manifest
index 0dda81636117..46696bbaaadb 100644
--- a/app-dicts/myspell-pt-br/Manifest
+++ b/app-dicts/myspell-pt-br/Manifest
@@ -1,4 +1,4 @@
 DIST VeroptBRV300AOG.oxt 1834826 BLAKE2B 479c26994a35bf3083e713f469dcdb5f5224150654e6b05b99e1bbec67be0cc5fd8a8ef774ca1807a08cfb79113836ce09db4194660f49528cbaa67dc0475e27 SHA512 1211af8aba9d9d9eae2ec9885a922d2ad70097d55c3628080754e00f30d46c061eb3eead634c7c4729837c96d722a6f3b615fd85f12b57afe417151c0e332351
 DIST myspell-pt-br-3.0.0-thes.oxt 4561516 BLAKE2B 5016f8ffdb64ae3d6545fd723b502c6bccf6d95f88faa8f1ff41c32033046b25ff00e56bf09eeb70fa03ce5bcfd86a75b5602eaa9219f01495a7171861c7bf67 SHA512 194e8b547ca65a1b7d3c8fbffe6674f539e116840dc546e3ebba03a58d67d6ae649d0387f1addcc05e8df1a80f7941b036580acaa984df016b1ba55c7597a260
-EBUILD myspell-pt-br-3.0.0.ebuild 700 BLAKE2B 3f7bc1fabee1d806290a07bb53954ee2d9018ec45736faef73631502da02ba3a06e4ab7d235a39e9dc8e4858b71cf1aff8461f19544edaedd472c16c08266ade SHA512 fca7be631d2c1ab530d75c16d65798aae96b6a3d46fe97c43d7afe713763852fbc286c4ee339050410011eedb5d370f98e2764318b9a613e4f4fcc2e1d1c27b0
+EBUILD myspell-pt-br-3.0.0.ebuild 678 BLAKE2B 11cd744faeaa7b35138879ef3c634ffbd79c70827b71b8669100127d2c19aa3dc7c7b38612e36a42a12dd193fe36023dc5a49a0aeffc65299180bb56399db251 SHA512 d880039dad5997171628decb7f2ce7a99f513110b79c5591782ea1e9b7d4e226a490ff28a6839d0942d6fd23d328a06f6aa7ffd41e9322680fd783ea8962f7de
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-pt-br/myspell-pt-br-3.0.0.ebuild b/app-dicts/myspell-pt-br/myspell-pt-br-3.0.0.ebuild
index 08fb46ffc425..cc7242376086 100644
--- a/app-dicts/myspell-pt-br/myspell-pt-br-3.0.0.ebuild
+++ b/app-dicts/myspell-pt-br/myspell-pt-br-3.0.0.ebuild
@@ -28,5 +28,5 @@ SRC_URI="
 
 LICENSE="LGPL-3 MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
diff --git a/app-dicts/myspell-pt/Manifest b/app-dicts/myspell-pt/Manifest
index 7717112aecbc..0d9812bc751f 100644
--- a/app-dicts/myspell-pt/Manifest
+++ b/app-dicts/myspell-pt/Manifest
@@ -1,4 +1,4 @@
 DIST oo3x-pt-PT-preao.oxt 556799 BLAKE2B 60d8872af24f05469f6ff333da730c177696635f380282c27a0c71d577df29d871204220b7ac80ba8fbfd6a9431086aa75d9c10aa4965658be05b11656228b23 SHA512 41087a2371a1ac55075eb4891df57f22e272d89b85d800ecab2bbb2cc41f1f603c1bcc518dc2ecfb6653976177f25237f4f1aa790d66ec2947b62c1604d3935b
 DIST oo3x-pt-PT.oxt 556415 BLAKE2B 699cc5b92b19f6da8dcd29dbe54a6e399835a68f55ea691081d560d35977de715634b51356ed53960b6d464a6443db6a4caaff9c09cd4d21f337a1aa1134390d SHA512 1485efe050c90a0d23243a333ec886a47b46ee148096e0f19c2232768ab09ad3bc055dc01813a00593eadb754125ebd9662ce81a3489898cf700536c517c20ad
-EBUILD myspell-pt-20120420.ebuild 834 BLAKE2B 0bcbe8de6ce0097edfa85dfa9119af51db8f513280a0ac23e8305c35d9833aadd597fcb0ee1d4089eccf4911e73f7f6db00abf858ac578d5d12ff16588c97677 SHA512 dcec305bfd5f700aae5c1b8dd6d60b8c71e8c687cbe7cc05ec24e33752ef33dc4742cba1af15846d40ceea08e0e3bda483610df383cf6d2854ccd8a02026e8d4
+EBUILD myspell-pt-20120420.ebuild 812 BLAKE2B 254d4ce41e3e34ad844e1a3bdf0bc299725602b413b6ec791ee2c2e0cdc750fb3f41df30ef072ae67ca82f65eecdec7f24177601dd51a07d12290963808e6b1a SHA512 247a79264fc4577192cc64fb21b10d1049fd38b0e5073d2443e0066229b497b5ecddda3aa9b31dbe2ffa6bdb148ef247112978914fe4e165fd8611adc61a3a52
 MISC metadata.xml 266 BLAKE2B 19a1631103d51c752aafab8b232fef81fb6b29d5f740ecd65221f2d4da42bbb7151790c26611be36baad354ebc6c15181b2665b029308c5a8467c88e9fa746d3 SHA512 a99c72a9c9892ccce74ffafd630ae1d90ad4b40716a4da60a03c3aa70a5e65be0c0a154aac664de81ba14b28ef1d9b0e2c0d2b6056b26e6941974fdc740b67ff
diff --git a/app-dicts/myspell-pt/myspell-pt-20120420.ebuild b/app-dicts/myspell-pt/myspell-pt-20120420.ebuild
index 2caea83d2e80..c5dfcff2eaef 100644
--- a/app-dicts/myspell-pt/myspell-pt-20120420.ebuild
+++ b/app-dicts/myspell-pt/myspell-pt-20120420.ebuild
@@ -31,5 +31,5 @@ SRC_URI="
 
 LICENSE="GPL-2 MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE="+preao"
diff --git a/app-dicts/myspell-ro/Manifest b/app-dicts/myspell-ro/Manifest
index 5375e79f64a0..e693898d52ac 100644
--- a/app-dicts/myspell-ro/Manifest
+++ b/app-dicts/myspell-ro/Manifest
@@ -1,5 +1,5 @@
 DIST hyph_ro_RO.3.3.10.zip 18504 BLAKE2B c221026e723aa2f414bbebe720744d847b1dd6600dc4a15ade331d47d81a652b0e4961be60a789528aa78c7b2e44522f1f27b862b35bd54e041fb5b1abc10e6e SHA512 0901b514a5dd287f87e53c50b59df3fe61ef8e169ab1baee48d65f18bf8f400d2437539f1ae12f8afbc691e13650b0fd2367c466d30096d46d90d0d5d926206a
 DIST ro_RO.3.3.10.zip 1216442 BLAKE2B d4b6df9feae759e1bc667f7463e0905643227af5eb0935338f7b1dc0d8ecfdc43b685b4091daf1769b4f4646303bba7ad0e10ab5c4b5c15f2e54180881332d4a SHA512 192d53fc087fb96306c46092a2b5cac9c28528f741c686d3b5e80c11c7bfdd16e1e406cfc1c32a99d72e2db01722e539b28c716379f38a3703e6954c8f9f2170
 DIST th_ro_RO.3.3.zip 1235156 BLAKE2B 7231c3d324b352dc419634952e932882eb1f825a2dfecaae4428c5fb45346db2af3a38a652b2bcdd2ae0a53f2dc98524c57fe2c78cdd79e48b4cc64955c3a820 SHA512 6204706c2b325a08ac31205e0c6834e1720a7bab9231859e3ae33d58e516607a338631c6a8cb52fe79ffc79297529e8b2a509c28df6e45766a56054a54d180e4
-EBUILD myspell-ro-3.3.10.ebuild 663 BLAKE2B 7c2adb565a9e1b3b0ea393d6c3d65410b1cf34e555e96ef16ce41838f0f3bcd3fdb0d641b07d3ed0b719e3c8c1a904a68829ed80449a04ab804d385e761de131 SHA512 7598abc7cb963a13f8ff0b784f583b37ee44ec3af7e0a358ebf5b6e7ff05d5b9e4fae053ec3d6fd0885ad9ecc05e0185d296473f3541281fd30ceff81f30f4c0
+EBUILD myspell-ro-3.3.10.ebuild 641 BLAKE2B ad7282d254d3d1384728aca227a079b64e2ee2a552766ec9790346407410352564020b0500fec381221d1fd2abb182cb583fcbab3fca7d3ba20919991dacb8ea SHA512 1003bc58d37cafb583edf8d1e59366c4c6255d8cbcb8f720c3811160a4292947e922839d35a5206471b47131b704d712da7d158ceda327f179cd12ebd1e8b8c3
 MISC metadata.xml 244 BLAKE2B cd51ca64142dd29c7b2538142821322696100f916c76acf1472a3fe8a955786d3ec5ae1cc5bbed2daf2fa40cb2239901d25b7c3059bc14aa1571796ca35b9f06 SHA512 ab747cf65f0d06ab770b00b35ac0da826824bfe088c30dc729ec32d3e1c3dd2d00f9d701a351fdb1ba1c02a16706076bcd920e2fea34758c7352320e186054c5
diff --git a/app-dicts/myspell-ro/myspell-ro-3.3.10.ebuild b/app-dicts/myspell-ro/myspell-ro-3.3.10.ebuild
index 94d8408cd7dc..f28be1477773 100644
--- a/app-dicts/myspell-ro/myspell-ro-3.3.10.ebuild
+++ b/app-dicts/myspell-ro/myspell-ro-3.3.10.ebuild
@@ -29,5 +29,5 @@ SRC_URI="
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
diff --git a/app-dicts/myspell-ru/Manifest b/app-dicts/myspell-ru/Manifest
index 66d90e59cb4d..2db2bff80a60 100644
--- a/app-dicts/myspell-ru/Manifest
+++ b/app-dicts/myspell-ru/Manifest
@@ -1,10 +1,3 @@
 DIST dict_pack_ru-aot-0-4-0.oxt 1509261 BLAKE2B bdda8be3d0a9266285215ffaa4ad8916312c7904266ed34dffc832b4761887d7d316793c5b0863fdb4cf95808b7afaa24914598c1cdd839e3e073f08aee1fab6 SHA512 00e63f5abcfbb2fecd72dc2a2b80dc5ebb4d16aac909b2f63670235edadd0d22a5ed3ae0508bfdb273a85f32ee60df4e84dc620fa1a44f42543848b71a9d1b01
-DIST myspell-hyph_ru_RU-20060316.zip 11089 BLAKE2B 71154cc8e7386e1749b66a13ec3ea15fb9d853829adc91f27f8b72ff4111bd2d951e5e1ea7989e609c06ff46b64c18c8ef0f50562a173b43de997348152d6270 SHA512 4538a4fbdd61adafe321258fb4a9b1896d10747adf8203bd3a5eaa40ee15a9d5d3d8304a19a644f676a1224ac36f5d47ae7a10cbcae22ccbd2f8af49bf5e92ac
-DIST myspell-ru_RU-20060316.zip 467216 BLAKE2B 48371a17d9c200de59773a04bcc4a757b0cdac968d178a1e1605da1ddcb2c4b0501eb48752fe22104c56be0a67e75ae631da097af4160b6bff350933ee77e5e4 SHA512 2a1d62cd79d58ca093f477006e436e728ff2cf063c3b0e1ce127a0c83835afe7fce7846e9ec3577e848c9d911565b4fdff8475508bbbe29f2d9523fe0a858617
-DIST myspell-ru_RU_ye-20060316.zip 984889 BLAKE2B 9dffaa2479e2307964ae0227b07af16bc26ae6f6459be91daa20825b60d1c9b80332cee2ace8f97c503975bd3e9937936df3b07e4bdacd5ba093e542ef68ea58 SHA512 5d1e39166b8666ee2be599cd74872a80b34bba11ff389ca74919a0b2fca7f7e66dfd71188b97f08686161e5af54164b82d0fe86c9097c3aaad6c22432f867e19
-DIST myspell-ru_RU_yo-20060316.zip 470326 BLAKE2B 4538db16a39dc2c7607d1bb3a1150c1021b5d567f11695d838abffb2896124ba0a207761f1044d541af1613383554927a3128d025083430e53b8fdea54c28c38 SHA512 4a4a85d9dff96de6fbc9b78c74f22fafae3abe143ababed7041df3b06bda3127c6fc44631cc2bfa33f4672b06db2871cf3062acb8355524b926716f1db639b19
-EBUILD myspell-ru-20060316.ebuild 688 BLAKE2B 72c7b4e51a423d5b1b60dda71f6b424c0892e93eeed287901c4fc18b00fb1bcd2b783de192035fa9d91e4093f5034154ae962b39633dcc00aa2c767f09031aa3 SHA512 aea38dbfdb4f0e7d116dd4750ffc8af1a7ac3fee7c11b0d8173a9f65e585bc8c424dcdbcfe09dc4d976d8d40b8c7880984173d44aeb43c5106c5c8e17dd863f6
-EBUILD myspell-ru-20150711-r1.ebuild 934 BLAKE2B f88c7a020b75261f71285d6de7ac1f3609235680bf99426f1b618f5de28897e9cafeeceb253f15798ab657885feba21ca8a5d4759bf0e9289530f2c593928c1c SHA512 4ef4d289ffe1fb3763b84b24e48cf329892c813bbd646f0e899b60ae2d2b901c4d97337f3fcf2d6a817471b33092547fb493254aa5a4290de40e74f72e158c2d
-EBUILD myspell-ru-20150711-r2.ebuild 858 BLAKE2B c1359e465c407f741d080678e11ab42a103e63dcdabc46b39ccee0f915e8301c43ba3819945bdf2ad03f06fd3ee6b098d669eba37d30a7d9da2f52f31c065cd8 SHA512 60b293d25cf094a1d0072da8597866cb89e905b6a09c3610b41a966193cec2f0a57809cd67431231167e673c665f2c772177bb53916a9fdf4b3fed6f80e4ce1b
-EBUILD myspell-ru-20150711.ebuild 753 BLAKE2B c3d0a699c6ce550fb84402956543072b1fb670cb26c2a1a56419d30c13211bb60326dba1e7b8e8c9f0655c29760df8dc80adb7057b4e3f6979a0bebbbfeaba81 SHA512 3faac5b08b42c3732af5950eaec8d9c1b005a3f548a11852dd6fcc34a5cb50f52f62b3d37694daa2237ca1ad950111eb550c2a1ed26851aa2548b5129e2702df
+EBUILD myspell-ru-20150711-r2.ebuild 826 BLAKE2B 03172d430d5c5b0146e9e1a217ae7192e94c86db1361a46c630b7424733683ed1c58937764d8922ab1d0f4207075e37062a57fa2cb6390145449dec2fd8a8e48 SHA512 f05fcfa00b163486fbe7d2a5b131e20744c1ce3a0799cdb0cad313f0b54a304cb818494886ba1b7e9549deca42fc6878fe234b3a6b028aa169c41d35a56035af
 MISC metadata.xml 379 BLAKE2B f35e408ff77d8701d7a57652c11b991b9c44c6e49bf9047ae732ec5cba0ceba6003a1fe35ab295700b6a144ec112fa55361fd4c9b1779925ef0dd783c3253058 SHA512 07e5293f5bd387c07b78f995d74e4839bb34bb18b38337cf46f866381961f4812e7bd6dda51d185efa281dae08d0a166b0d909eed2bfb60f235cfea2ae54b139
diff --git a/app-dicts/myspell-ru/myspell-ru-20060316.ebuild b/app-dicts/myspell-ru/myspell-ru-20060316.ebuild
deleted file mode 100644
index fc7df366c8f9..000000000000
--- a/app-dicts/myspell-ru/myspell-ru-20060316.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MYSPELL_SPELLING_DICTIONARIES=(
-"ru,RU,ru_RU,Russian (Russia),ru_RU.zip"
-"ru,RU,ru_RU_ie,Russian_ye (Russia),ru_RU_ye.zip"
-"ru,RU,ru_RU_yo,Russian_yo (Russia),ru_RU_yo.zip"
-)
-
-MYSPELL_HYPHENATION_DICTIONARIES=(
-"ru,RU,hyph_ru_RU,Russian (Russia),hyph_ru_RU.zip"
-)
-
-MYSPELL_THESAURUS_DICTIONARIES=(
-)
-
-inherit myspell
-
-DESCRIPTION="Russian dictionaries for myspell/hunspell"
-LICENSE="LGPL-2.1 myspell-ru_RU-AlexanderLebedev"
-HOMEPAGE="http://lingucomponent.openoffice.org/"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
diff --git a/app-dicts/myspell-ru/myspell-ru-20150711-r1.ebuild b/app-dicts/myspell-ru/myspell-ru-20150711-r1.ebuild
deleted file mode 100644
index cb0e268cf3b0..000000000000
--- a/app-dicts/myspell-ru/myspell-ru-20150711-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MYSPELL_DICT=( russian-aot.{dic,aff} )
-
-MYSPELL_HYPH=( hyph_ru_RU.dic )
-
-MYSPELL_THES=( ru_th_aot.{dat,idx} )
-
-inherit myspell-r2
-
-EXT="extension-center"
-DICT="russian-dictionary-pack"
-MY_PN="dict_pack_ru-aot"
-MY_PV="0.4.0"
-
-DESCRIPTION="Russian spellcheck dictionary based on works of AOT group for myspell/hunspell"
-HOMEPAGE="http://extensions.libreoffice.org/extension-center/russian-dictionary-pack"
-SRC_URI="http://extensions.libreoffice.org/${EXT}/${DICT}/releases/${MY_PV}/${MY_PN}-0-4-0.oxt"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
-
-src_install() {
-	myspell-r2_src_install
-	dosym ../hunspell/russian-aot.dic /usr/share/myspell/ru_RU.dic
-	dosym ../hunspell/russian-aot.aff /usr/share/myspell/ru_RU.aff
-}
diff --git a/app-dicts/myspell-ru/myspell-ru-20150711-r2.ebuild b/app-dicts/myspell-ru/myspell-ru-20150711-r2.ebuild
index 2b758e568cc6..89c6fdf04988 100644
--- a/app-dicts/myspell-ru/myspell-ru-20150711-r2.ebuild
+++ b/app-dicts/myspell-ru/myspell-ru-20150711-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://extensions.libreoffice.org/${EXT}/${DICT}/${MY_PV}/@@download/f
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux"
 
 src_prepare() {
 	default
diff --git a/app-dicts/myspell-ru/myspell-ru-20150711.ebuild b/app-dicts/myspell-ru/myspell-ru-20150711.ebuild
deleted file mode 100644
index e1bbe39d25e7..000000000000
--- a/app-dicts/myspell-ru/myspell-ru-20150711.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MYSPELL_DICT=( russian-aot.{dic,aff} )
-
-MYSPELL_HYPH=( hyph_ru_RU.dic )
-
-MYSPELL_THES=( ru_th_aot.{dat,idx} )
-
-inherit myspell-r2
-
-EXT="extension-center"
-DICT="russian-dictionary-pack"
-MY_PN="dict_pack_ru-aot"
-MY_PV="0.4.0"
-
-DESCRIPTION="Russian spellcheck dictionary based on works of AOT group for myspell/hunspell"
-HOMEPAGE="http://extensions.libreoffice.org/extension-center/russian-dictionary-pack"
-SRC_URI="http://extensions.libreoffice.org/${EXT}/${DICT}/releases/${MY_PV}/${MY_PN}-0-4-0.oxt"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
diff --git a/app-dicts/myspell-sk/Manifest b/app-dicts/myspell-sk/Manifest
index 8b0a262e9df5..f2465a7456a7 100644
--- a/app-dicts/myspell-sk/Manifest
+++ b/app-dicts/myspell-sk/Manifest
@@ -1,3 +1,3 @@
 DIST myspell-sk-20110224.zip 1351228 BLAKE2B c2f5862083d541e9d9d0f169150e06a120c527cb63b19d1275095c47d1205424eaa48f1567eba381098523f317fca6dc6704b2b62355e2d44e179ee4aed78cfe SHA512 853790825816b3c2ad547c072f38d4441dc35fe6435d602de3741cae6a2ba4890e42fefe38dfda8f7bcfc2db61461a1a4220faee0edaf06c51875a1516fedf1b
-EBUILD myspell-sk-20110224.ebuild 636 BLAKE2B c1f293e5a3cc95382c8ef500996cc742e8f17c3b1c8b41d828d8347cbfee8b873ff18ff0d9b194b54e582b1e7af4cebefc236131de7cc862a1d1bffd14c0c2c8 SHA512 98c4324579b0d76b8f779f9e0c2c8ba4c05ea9529bd257ecd02bfe213b68e6dbd4942e6f20eb3f3f16b1653d1ec5192c144b77e86871ddbede6247d841279b95
+EBUILD myspell-sk-20110224.ebuild 614 BLAKE2B 7fb26d28eebbd4e23b7e64256c8188719c3a940ff81cee8db03abee175de604acee77f500ade041ecceaa768dddd106a45dcb4fd0b663d6cc9d4fde3b9f3a103 SHA512 3a4393a4cb2d24d4eb351beb0a1cd0f9e4ec998c37de147836291330749ce70f56b6a81225b2bfb42675d2c97d675eb35e9364d4ce44118bdcdeea76f646045f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-sk/myspell-sk-20110224.ebuild b/app-dicts/myspell-sk/myspell-sk-20110224.ebuild
index 0a229dc7f9b3..f4490b831e0e 100644
--- a/app-dicts/myspell-sk/myspell-sk-20110224.ebuild
+++ b/app-dicts/myspell-sk/myspell-sk-20110224.ebuild
@@ -25,5 +25,5 @@ SRC_URI="http://www.liberix.cz/doplnky/slovniky/ooo/dict-sk.oxt -> ${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
diff --git a/app-dicts/myspell-sl/Manifest b/app-dicts/myspell-sl/Manifest
index ca70644c64cd..fb91ba8a2fae 100644
--- a/app-dicts/myspell-sl/Manifest
+++ b/app-dicts/myspell-sl/Manifest
@@ -1,3 +1,3 @@
 DIST pack-sl.oxt 1506739 BLAKE2B 801c7dd557c534c3b83e1360a765555b146eb23387a12e8ec779f9f4878760b9a87115ab97d6eb667bdde72bc367ee4c59d28fc2492cff764b5b44d33244c94f SHA512 7309e1f9e5c42ed41c660a195421b5dbfc9995c4970641c9da087d0f4f44126c5a98ddeaaae13f7ba563314cfaf981c8216c45d80fae2fda1d7c49fd943c32ee
-EBUILD myspell-sl-2012.01.04.ebuild 667 BLAKE2B bc3e2f71b994229ce570914e45d9295c97ae0e137dce51f8c7b9f02c3cbbbf2fab9e30a17095861fd1eeaba491d15709cbae224fd318b1ad2622b616d1043e2d SHA512 0bc08d9f24127206a2b6fd6049e32e682edc729ce7e837666c9cb530634b5057bca7a0aeee7fcf35bb2af9b3eec7fbdab5b040bd7574b6ebc0516517d2f2f846
+EBUILD myspell-sl-2012.01.04.ebuild 645 BLAKE2B ff0a2418c944e40794144874581a11b57aa1d9f7b774c696588fb6c32025629b05db951fa25e64aefe6b5a098b1be221a3c7f0855271622ee049fd576d691a9c SHA512 413816950b7df49dce4ad55b3cbbfafdcedfade746e99fe3b82175242ae2ac148c11b99a720d358a83718770f3a62634105fa79347cd3fd12c13126715f21aa2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-sl/myspell-sl-2012.01.04.ebuild b/app-dicts/myspell-sl/myspell-sl-2012.01.04.ebuild
index 4dc59f481ce8..2950f99d3460 100644
--- a/app-dicts/myspell-sl/myspell-sl-2012.01.04.ebuild
+++ b/app-dicts/myspell-sl/myspell-sl-2012.01.04.ebuild
@@ -25,5 +25,5 @@ SRC_URI="http://extensions.libreoffice.org/extension-center/slovenian-dictionary
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
diff --git a/app-dicts/myspell-sq/Manifest b/app-dicts/myspell-sq/Manifest
index e02c418e8417..66bd6de9bd3d 100644
--- a/app-dicts/myspell-sq/Manifest
+++ b/app-dicts/myspell-sq/Manifest
@@ -1,3 +1,3 @@
 DIST myspell-sq_AL-1.6.4.zip 666207 BLAKE2B 8f6eaadf9f3ee3bbc28d1300f6d3d6a917f3dd9d7cb9b8b26a2f1b47b3564c56c12c240ce123da241bbc82d9b0c9484003b5920e5e5d8927403548590ca7aaa4 SHA512 4db1e2cae0c308973166e977d3c5c78ba02f0466bb60bd0d3971c84933274510442f8cfb22eeb6d47fd33e8dfb30e70ce11adc1114da1548a1a3b68f19619930
-EBUILD myspell-sq-1.6.4.ebuild 570 BLAKE2B 5fede377cf15da948cce2efd5ae7761ee91a6355079ef3104df9a15bb6569e1a7a1a912edb61c983726f1c21135a5118731cfd348062a6babad1aa711bcfab13 SHA512 d8207290edf23fcd0842355bf7e1eb8db5b1de0011ca40732baa1441b73448d561f6943bd848bda8b318cbd4622e0f92ee402b077e5883d9b670643d3537566e
+EBUILD myspell-sq-1.6.4.ebuild 548 BLAKE2B 46c7ce511101ef7de22e5c907bce9cbb6af97322dc4b9741016d3f0120c894eb6b8e093123106581cb2e677f2a7230a4f0101c79c06346a440bcdab851c06e95 SHA512 351b2799e9e2d87f4771a496be8b15c9fecd6b0c2e40d26e7915604a2f0bfa28423bdf55ca51896f6af5e05d0dbd6d4de725f67f025e8152967c6c6d17429316
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-sq/myspell-sq-1.6.4.ebuild b/app-dicts/myspell-sq/myspell-sq-1.6.4.ebuild
index 226fb1822652..9adddb968640 100644
--- a/app-dicts/myspell-sq/myspell-sq-1.6.4.ebuild
+++ b/app-dicts/myspell-sq/myspell-sq-1.6.4.ebuild
@@ -22,7 +22,7 @@ SRC_URI="http://www.shkenca.org/shkarkime/${PN}_AL-${PV}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${PN}_AL-${PV}"
diff --git a/app-dicts/myspell-sv/Manifest b/app-dicts/myspell-sv/Manifest
index 0ede026e389c..b3b4539732f3 100644
--- a/app-dicts/myspell-sv/Manifest
+++ b/app-dicts/myspell-sv/Manifest
@@ -1,5 +1,5 @@
 DIST myspell-sv-2.14-hyph.oxt 44382 BLAKE2B 2f25cd604c79d51549d47110d06e8877431bd9be521a57e7eeb172817d32b2f11b07e6c1c212c4f6f9d49ce7a4d3b54ecdb18bbab41a7cd26bc3c8de9a553fc1 SHA512 0f71809d2d401bb917037bb50a2fa88ffe825cac081cb14e9378ffeebc447144b733a9d4fd99cc5bc1f1a37835cc880210512ccc79341a4ba8c6cb5dcc38fc40
 DIST myspell-sv-2.14-thes.oxt 306542 BLAKE2B 0a5ebf5577e6fb8c492b13529ea904d1aceded3814e97f79e8581c55122cc647e4a32ce2bba148b123f97612aef156c5b6f425e8940d1cf80b808c259eef6fd5 SHA512 e637dc92bfc9bc86ccf10710fac1b036a99b0abc2888d30ea7dbdaca1c3cbec57fd7a184648d922b120a26f7c151b7cc043f783fb35b7e121ae22458f0a72103
 DIST ooo_swedish_dict_2.14.oxt 1288382 BLAKE2B 54a46792386e794dc836e0178929cdad75e29007ac981aaeeeb74da996d765ff8d737796568576662431c95899824d6460f099c6814fed673844ba295967627b SHA512 77ab715ccb66c7e14ed84189dd0847c809824a3cf0881ee39d08f6d4ef89eccfeafcdbde1759bfa8224650b1907760d9a48f40e464211ae12593ed5525d6372b
-EBUILD myspell-sv-2.14.ebuild 1190 BLAKE2B 950e5fe9569039378c287b5c796d8aaa66488a822b2133db1bdac19d5124e190ffcb8678366f56c81c298103246dd0960c3540e1ba4b08739a5a5b630bce9295 SHA512 7770633bffe9b9b51d26a94d4aac677fc67b2e0489aa0b1e015caaae1c52b20ccf07413cbd0b3a5566b19cc2a04ec6b8a525d039c4febf36337ce6404b298853
+EBUILD myspell-sv-2.14.ebuild 1168 BLAKE2B a3506d07f36330dc21d8df3153e4dc459faaf7a80039eb346a5882fef6b5bb0a686ef93289c2563565bac0fee11307fb861fc01e93496545c1169f5d2c8a9ea1 SHA512 ae3c57642b95fddfca6d85531e1e487cd2c52e4b9d9f06b98dacf9224471e9ede060d81e658f00d6cacd7fadf97ad1e853785a92ac1b68606e585ef68bb657fa
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-sv/myspell-sv-2.14.ebuild b/app-dicts/myspell-sv/myspell-sv-2.14.ebuild
index f1bb2e4edf93..96c6bc16e809 100644
--- a/app-dicts/myspell-sv/myspell-sv-2.14.ebuild
+++ b/app-dicts/myspell-sv/myspell-sv-2.14.ebuild
@@ -35,5 +35,5 @@ SRC_URI="
 
 LICENSE="CC-BY-SA-3.0 GPL-2 LGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
diff --git a/app-dicts/myspell-sw/Manifest b/app-dicts/myspell-sw/Manifest
index 9216c00e966e..0f96d866cac2 100644
--- a/app-dicts/myspell-sw/Manifest
+++ b/app-dicts/myspell-sw/Manifest
@@ -1,3 +1,3 @@
 DIST myspell-sw-20110106.oxt 423064 BLAKE2B 32e74434714c62b4f5248775ac0ca0262d774a339c84899c822d0099ba1d90830620f748796d246373b566f5b1bbeddbb0b46fd3cf5d9c02168e2f0c18263dbf SHA512 734e760fb3ed95905f7ececc38ad3d4d87f77d5a953e5427d6d242ec73567a35311fea26d1298edb5d1650d6e07a6859c82bff8a6f309d226307873067cc7e98
-EBUILD myspell-sw-20110106.ebuild 574 BLAKE2B 4deba465b1e5b83cdb944a17829cf424265afacea8f37e4d2e6960a6a853abf74a49d8a3900bd9e470fa36b9eccf9297ee2de77902ffc0dc5979d273fc5dd65f SHA512 3ebf0c88f05380e3ab9b2fa7442d73ce66cef6f2c0563888e9af2a18a7cea96aea19a891ba3237f06f1af69141c692ec0dc4c4d6b51cdbe58360eaaf014f4c4c
+EBUILD myspell-sw-20110106.ebuild 552 BLAKE2B 0b219238dcd2d0d1e65bf59c7cf54bbbe9e9c5f5515f30154c31cc33942e585c0fe4646b8d5770d34e7602d09805443aa5ac7f49643b1ee580b99ae1ddf622de SHA512 8ade5b6aa25268bff91ff3d3e8a1f57b9dd5536854619896986956fd3a8246d954c354c2bd987eeabfca96bc3e23942255627925a5090f47b9bf57170e88a5b5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-sw/myspell-sw-20110106.ebuild b/app-dicts/myspell-sw/myspell-sw-20110106.ebuild
index c0c07af2402d..fd20acbc2f7a 100644
--- a/app-dicts/myspell-sw/myspell-sw-20110106.ebuild
+++ b/app-dicts/myspell-sw/myspell-sw-20110106.ebuild
@@ -24,5 +24,5 @@ HOMEPAGE="https://extensions.openoffice.org/en/project/swahili-dictionary"
 SRC_URI="mirror://sourceforge/aoo-extensions/dicts.sw.oxt -> ${P}.oxt"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86"
 IUSE=""
diff --git a/app-dicts/myspell-tn/Manifest b/app-dicts/myspell-tn/Manifest
index 076463fb4026..499be82ce635 100644
--- a/app-dicts/myspell-tn/Manifest
+++ b/app-dicts/myspell-tn/Manifest
@@ -1,3 +1,3 @@
 DIST myspell-tn_ZA-20060316.zip 17125 BLAKE2B 74832b044863dd74c4b486d7ad57aec20c3caa32dc87ccecade5b3e19c2ad9fdfd2fd76525eb174e473db7c29c2c71f934f158adb8f40314e5b6d8967b61d869 SHA512 5cf59152ff423686e736356525fd3b35059158b410e8229ea7707597b99b0f5933b4a03f5ba9f851d77d02b7ef06d72b3dd37f690064f1d2d3902c459d0be50d
-EBUILD myspell-tn-20060316.ebuild 498 BLAKE2B e9d2376768d7f69a5f1e49839cbf1ede71f3a160c70c07e9972db16864ca0341f0711e889e97d5ada7f2283f1841419af8254db71a66b1b13ff30a8effe16759 SHA512 4422d6fe7a31012fdcfac66ce4611a6434332cf7c4ca3938166e9be650cbfeb6e14b500d57cb944fce084c5c624d17f90bd2c9fa6e4672d0c1105912cc565041
+EBUILD myspell-tn-20060316.ebuild 476 BLAKE2B f4c89257f86af562241802e71fc583d5d4d60d5951813d521b827f94f177ba01378eefd2b8c60340dd9e8c0ad608931f97a4292e990d2d7595cd6372215596e6 SHA512 b87ececeb3fc2e6e5b1fa94c25ac6df9abc459757fd21e3432dc3ff2cddd5e924e57b170e8efd58e5167b47787f9037c46dc55bdf95c83d8c86e8895ca5c3c7f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-tn/myspell-tn-20060316.ebuild b/app-dicts/myspell-tn/myspell-tn-20060316.ebuild
index 548457619866..6811144d73ac 100644
--- a/app-dicts/myspell-tn/myspell-tn-20060316.ebuild
+++ b/app-dicts/myspell-tn/myspell-tn-20060316.ebuild
@@ -19,4 +19,4 @@ DESCRIPTION="Setswana dictionaries for myspell/hunspell"
 LICENSE="GPL-2"
 HOMEPAGE="http://lingucomponent.openoffice.org/"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86"
diff --git a/app-dicts/myspell-uk/Manifest b/app-dicts/myspell-uk/Manifest
index 398501a7b048..b605270aaefa 100644
--- a/app-dicts/myspell-uk/Manifest
+++ b/app-dicts/myspell-uk/Manifest
@@ -1,3 +1,3 @@
 DIST dict-uk_ua-1.6.5.oxt 854246 BLAKE2B f8fba14ad3a57279993dc7f98b0084ba9a1f30054ce88747dfe817e3873394643b5365c2bcf9640065ba30263946580f6d510fc22c6cdcd7df6583ce01de2d91 SHA512 e1b74e299909af291e40674a6b783eacd289b16c7419e3311ea153c47520e06db70ff45a497db6d3f1cbe44bff10260e9fa6c7382d7a87e3efb2211ce1cb5ce8
-EBUILD myspell-uk-1.6.5.ebuild 714 BLAKE2B cbb2e24ac589f8e2457691e33cad561b2fb291211fa403e418af719240d4438c014db15720814b4d5427e62ea2c48e22c1720b0b8294ecc0dd5ad9857628cc1d SHA512 2e29ec6c6d7a66a99773cdc22904187538d60eae84a99c5548ac8ee6057207d66adad71dc291f8a8ec5c9f73bce1b082e38846126da3f2f00d9f9904ec2383bf
+EBUILD myspell-uk-1.6.5.ebuild 692 BLAKE2B ff29ec0b7fd5b0f5c87a360a96f40bad331693edf51f2a0c5701a87bd438d18e135caeaadf7a4ac31d140cd803ab1ba926f36f67c186536545e984a560538dc7 SHA512 ed322e929f9696b8a134a85d324c5f85f7b4bfe20bc742ebbdb716a4770657c5c1ddf3e2eb5299c1ca1e617fb54793c1e1b85835b70eb332e8e1bfe4187b021b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-uk/myspell-uk-1.6.5.ebuild b/app-dicts/myspell-uk/myspell-uk-1.6.5.ebuild
index a60e934a7c1b..e5eec2f4f35c 100644
--- a/app-dicts/myspell-uk/myspell-uk-1.6.5.ebuild
+++ b/app-dicts/myspell-uk/myspell-uk-1.6.5.ebuild
@@ -25,5 +25,5 @@ SRC_URI="http://extensions.libreoffice.org/extension-center/ukrainian-spelling-d
 
 LICENSE="GPL-3 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
diff --git a/app-dicts/myspell-zu/Manifest b/app-dicts/myspell-zu/Manifest
index 1cc47c79d495..cbe92646fd50 100644
--- a/app-dicts/myspell-zu/Manifest
+++ b/app-dicts/myspell-zu/Manifest
@@ -1,3 +1,3 @@
 DIST myspell-zu-20100126.oxt 393165 BLAKE2B 0c31ab3746ffece8546415e051641c26f14cac80306e5326cd6616e953c34d810a6b3b9a44860450da720975e6e73bf0b1cc0661b92f95c3005ebdf8dabde3a9 SHA512 0eeafbcfff3459ec65d0fcd3b845d0cf7b1deecc1ce1364fb45cab092b17986971a3518190355e6ce863514df4bf822804cd9006fd40c0bd03eb5ad6129c3b8e
-EBUILD myspell-zu-20100126.ebuild 588 BLAKE2B c45165b1ca67d8bed681f2268515fd2b5a446e7171a77ffc306662b48f877842c2b7dd0bba49c80d8c994bf2e4b5c7b83fceac04cc66461b0197f29ff93655eb SHA512 96b5dd3edbd6f9ae50aed8c3809f8f48b0cb32c7babf996921e6ba055a0ba6c81ac84db448ce9f864706c126ab2adefe3fb24e0b34395c71ac29a22c84662d81
+EBUILD myspell-zu-20100126.ebuild 566 BLAKE2B a1deb31e46a71077096fef36e6859c9d1c4e8ff3fe410a3035c8a3d27e56e7e76bbb98ec10c9f81ef13de2bf8616c3056b4759c25a2717422b4c95df456b34ac SHA512 96dd0ae185b765cbcaa889e71f935aa6e825a68f9ca289b83e18b1d1e76320f039eccb34b4b61185d8a74187c50af55bd587a714ac3d70704b5998b749ae765c
 MISC metadata.xml 246 BLAKE2B 4a746dc47f5e6f3ffcbaf1d8f66266a27edb57410ef7bc86230a8228e3ebb290202764649625f2e4e5cdd9b8308614714f9737a3225b42647237297194afbb2f SHA512 24064c771ba24adfc07416caded3b3863dc6f735e1c218fba431c289374755536e7664d021be8865fad9cd6508a824a82f4099ef93b84c93db4a32c1ce788a6f
diff --git a/app-dicts/myspell-zu/myspell-zu-20100126.ebuild b/app-dicts/myspell-zu/myspell-zu-20100126.ebuild
index dec6018e678b..aa32de71d9dd 100644
--- a/app-dicts/myspell-zu/myspell-zu-20100126.ebuild
+++ b/app-dicts/myspell-zu/myspell-zu-20100126.ebuild
@@ -24,5 +24,5 @@ HOMEPAGE="https://extensions.openoffice.org/en/project/zulu-spell-checker"
 SRC_URI="mirror://sourceforge/aoo-extensions/dict-zu_za-${MY_PV}.oxt -> ${P}.oxt"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86"
 IUSE=""
diff --git a/app-dicts/sword-ab/Manifest b/app-dicts/sword-ab/Manifest
index 94c1ad6215f1..7b3a86603e07 100644
--- a/app-dicts/sword-ab/Manifest
+++ b/app-dicts/sword-ab/Manifest
@@ -1,3 +1,3 @@
 DIST AB-1.3.zip 1203602 BLAKE2B 632fcb2ebd5385ad1f6b5c172d209c02ad50fbc2b9416bf663adeaf05638cd7a3701221c279b3a9d372dcf9924d6a1c7fdaab5a3c006c6fae2fe93cf5b74c5b9 SHA512 3c8c3485c4648f8c46f264d5e28ee1bbecf7654a1c1f146518ae82051ded56928eabc0578f8ab9cd45becfd89e5d4497be545187a00b6dac6de5eb45e8b540ab
-EBUILD sword-ab-1.3.ebuild 317 BLAKE2B 6fe0a5a03e032a2e4fc51578aa1f49d8e10dbfc74fd5291f2f6785ff64aa7b6b63f36a2c7487fa1d3f20042d65513e3b6f72ca8048b13668af118e89641c9d26 SHA512 413b9c23f4ef74104aa9435eba80f0e99f961825fb1f5332a466c25fbd195ccc86a956eb200a790d53bf6f413c13730b8fd30e3a94fd099a5ad2557c26b7c11d
+EBUILD sword-ab-1.3.ebuild 307 BLAKE2B 796299a11f120e4504b10723a8b50f1cdbc3bfaf2e093f83211e53d054405d2e4200c547189589b439b2ab15fccf49154df52ddb5c5ee188f7fe800cf950fb77 SHA512 59387d3ef0cf50fcbc2c945ba357f83e6349ee00bf4be4bf96fd70b3fdadc802c5d486fa563fd4708712cf3196c205ca55d895dc9b3bb59efe1255d0f69b5ef5
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-ab/sword-ab-1.3.ebuild b/app-dicts/sword-ab/sword-ab-1.3.ebuild
index 9e3721d96e9d..fcff491ac783 100644
--- a/app-dicts/sword-ab/sword-ab-1.3.ebuild
+++ b/app-dicts/sword-ab/sword-ab-1.3.ebuild
@@ -10,4 +10,4 @@ inherit sword-module
 DESCRIPTION="The Apostle's Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=AB"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-abbott/Manifest b/app-dicts/sword-abbott/Manifest
index 74d757953ede..fa5935db47f8 100644
--- a/app-dicts/sword-abbott/Manifest
+++ b/app-dicts/sword-abbott/Manifest
@@ -1,3 +1,3 @@
 DIST Abbott-1.1.zip 435868 BLAKE2B 905e0a08b27a28f2de227738a3c2b48818c39cc4b5115c48ffaacdd817435ebd003cd71c0e011d18437a8a87277c2d352a4e344474b5b66de1d19133b975b9a4 SHA512 999fa69c552296140c6bb4309848b61c53e7cd96543b07d13b43bdf7250b55f33363961105058378fb4979a52e928fe2c1e0e6ff7655839fda0cd1fbc2a12fae
-EBUILD sword-abbott-1.1.ebuild 336 BLAKE2B 8abdbb4f11012a980ea10aa9df37c8cd036ea3c592e0a84da901c739072f31fa9cdac8d7117ad9d936b2aaa6a55df99821ef3336b459c4f03a99baf4f81e86b9 SHA512 f3e03c3b4a970a6546586be6115b0f37050c73e610fd8218c55f1a76f6f48113a4d3067548be0098b48a08dbcf5fa30fe5df316dcefa9073a70311eded5a7df3
+EBUILD sword-abbott-1.1.ebuild 326 BLAKE2B cf5cb34ab580e9bd9804cade2656794f689076154e48a58a45d893f73542746438d80723825296981df4be14e1a12a4f9e4b162ac1bb274e7809c7f6b4fbe53c SHA512 deb2bca30b30bc7044a622697f0891ac9847d6e36d500bdedb56f74467c7c15d5b5dae3cb5fa46a67a8718e96c2f28a03e9d7bbb127f48d982ef4b72a1cb9ce5
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-abbott/sword-abbott-1.1.ebuild b/app-dicts/sword-abbott/sword-abbott-1.1.ebuild
index 2cf857b5b306..cf33f92c38a6 100644
--- a/app-dicts/sword-abbott/sword-abbott-1.1.ebuild
+++ b/app-dicts/sword-abbott/sword-abbott-1.1.ebuild
@@ -10,4 +10,4 @@ inherit sword-module
 DESCRIPTION="Illustrated New Testament"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Abbott"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-abs_essay_goodsam_swb/Manifest b/app-dicts/sword-abs_essay_goodsam_swb/Manifest
index 00ad0692d644..67fa244a18a1 100644
--- a/app-dicts/sword-abs_essay_goodsam_swb/Manifest
+++ b/app-dicts/sword-abs_essay_goodsam_swb/Manifest
@@ -1,3 +1,3 @@
 DIST ABS_Essay_GoodSam_SWB-1.0.zip 9496 BLAKE2B 467ea43797c3aec9f7130b26bca1e3a7ec354c0dcafc66f6bdc34bd1f3a02b22f2acf954ae5a4e71bb19418d26766ddd401f073ec461a092404178317b7b195f SHA512 02489c6202b07da34ed6c503d8753f72f98e6d267d793f2506ae1d607223d5d1309d24c2c3d634cfdd8ab70611bd57323330aa103c956975309d8ab96851ae80
-EBUILD sword-abs_essay_goodsam_swb-1.0.ebuild 416 BLAKE2B 989f73f09e875184135222d9c66e02a2d11aa5a5c74b7efa714f3428ac75388a8920f7201845ebbe6bfd8a8ee919273483aba56f458fef33ec0481bdcf200ac7 SHA512 4366d99b786e87bfe456d019337ead0c69ad6eb5a8ee13e96c7176f2b41995830a52202991f52b86c4914f4f520d217927ef8d43ffc584b2838028f3a2570665
+EBUILD sword-abs_essay_goodsam_swb-1.0.ebuild 406 BLAKE2B 8f525e197b57f2f1fae889fc2e1f6a549efc757d6d3a31d7c9fb937da7315dc9dbc047efd256bfca75f9b1149c4daadc11d8bc545a12b18e9289146bc85183d8 SHA512 7d3660f69a879f635225d38c651664bbc966a5e48bc92315d1ade13cab5564a816566622ae25f8c37dbcb12ebe85e9f26e9c6af20f9e8697fbf6e52870f41e81
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-abs_essay_goodsam_swb/sword-abs_essay_goodsam_swb-1.0.ebuild b/app-dicts/sword-abs_essay_goodsam_swb/sword-abs_essay_goodsam_swb-1.0.ebuild
index 6f3b8b21a939..08d777173a61 100644
--- a/app-dicts/sword-abs_essay_goodsam_swb/sword-abs_essay_goodsam_swb-1.0.ebuild
+++ b/app-dicts/sword-abs_essay_goodsam_swb/sword-abs_essay_goodsam_swb-1.0.ebuild
@@ -10,4 +10,4 @@ inherit sword-module
 DESCRIPTION="Essays on The Good Samaritan: Violence on the Road, Social World of Bandits"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ABS_Essay_GoodSam_SWB"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-acv/Manifest b/app-dicts/sword-acv/Manifest
index de3ccfb909e1..ac5a7ca445c9 100644
--- a/app-dicts/sword-acv/Manifest
+++ b/app-dicts/sword-acv/Manifest
@@ -1,3 +1,3 @@
 DIST ACV-2.0.zip 1396326 BLAKE2B 0aaf48548d4b6f7597b1d5339183d47ac35711a875dde8c42aeefe9345a2b7c19efa5ae58422f1feac93e98c521f4c4f09331f70f0e3d8f07b30fbb2c0ddf8a9 SHA512 913597446f8efda893bc27267a17c9de393d4dc6b6d865abc2d8c99f5b20f4bfc0b1107cd7d81a03c3c192bd8166ec5135d3e5eb9bfaf76998bc797eddf70dca
-EBUILD sword-acv-2.0.ebuild 326 BLAKE2B 0c7e170d40b44f83b3944107867c69d3ea47f02316a2e8aee384a423097895aa998573b291ce19084b41781145a988d3097f7ca59b1a69f0cae39654fce091f2 SHA512 f59b994865cfbdc9ccfc4f9412248675261009832af843a444743fa2e636e1a8eeee796920371c7ec5b2043bf6241efa14c759a2fec27c5dc07c428b4243a497
+EBUILD sword-acv-2.0.ebuild 316 BLAKE2B 7071d1981a30174ca312464ad55ad1536d2ee4ada9e81e08d6346dcc0815d2787bc18f58c5bd8c6999fe3d80f732efdab3612824a1dfa5278c16bc9e7a057f93 SHA512 ce2ba547df5d677a8ec12e9bbe1b9708ca66651ff3fd0dc0ac61f185668c3cb25eac6c3e1d22b3899b79bdc35c8a5f6364f1dd29ea93bd7b2c85c3cbe1c37f03
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-acv/sword-acv-2.0.ebuild b/app-dicts/sword-acv/sword-acv-2.0.ebuild
index 81afb0950738..935c98769396 100644
--- a/app-dicts/sword-acv/sword-acv-2.0.ebuild
+++ b/app-dicts/sword-acv/sword-acv-2.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="A Conservative Version"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ACV"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-afr1953/Manifest b/app-dicts/sword-afr1953/Manifest
index 91939315120e..af030238808b 100644
--- a/app-dicts/sword-afr1953/Manifest
+++ b/app-dicts/sword-afr1953/Manifest
@@ -1,3 +1,3 @@
 DIST Afr1953-1.2.zip 1447644 BLAKE2B fd740c4cb374c4a60fffc2ce478823a0d716d5db94bb3a14c0fa99367b9316ebd0402b64e40f70d0acff94e0fe7d36e851f348940ca8d2222d2e52ea1de6268c SHA512 fa41822db6a05728d676fbe6bf5d0a81ba3863ac07aaf1c5dd535df025783cb5d6ce8f32924027110dedf41f16e7dfaea5004f49936ede472697645b87caffb3
-EBUILD sword-afr1953-1.2.ebuild 322 BLAKE2B 4062f4a483c2601f8cbbd0de9bfffbc9a9b9c2fbaf7f64c5864bae812194035f92194421bb2a982bc04960d19871152d7a68a5126ae3297bf3b42d2cb9bae308 SHA512 29c827ed490887b2b71fc82b16b78df5bb6d9566a4a4a0d4acc3393b79d646a32c37c90bb5640d6c03928706a7476a1cbbdabe32f84f3a410d5bba9d1049d45c
+EBUILD sword-afr1953-1.2.ebuild 312 BLAKE2B 439f15e16b07d41390fd62a1e621b63cad282d15628b7d644bcd56e862a8a4da282c4427d512852cc00689c10fa003e61d81a06e3cf1fea6ef309fa5f833c7fb SHA512 6aba821939ecd2b32ae5846e324a5b69c14962b546f719a01a003b39b5670207e6f9f8730fda0ec24329b00232151446f2115b4f4d61af2b985e607558fca66c
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-afr1953/sword-afr1953-1.2.ebuild b/app-dicts/sword-afr1953/sword-afr1953-1.2.ebuild
index cd7c4ef19434..18d7a7ec2840 100644
--- a/app-dicts/sword-afr1953/sword-afr1953-1.2.ebuild
+++ b/app-dicts/sword-afr1953/sword-afr1953-1.2.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Afrikaans Bybel"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Afr1953"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-akjv/Manifest b/app-dicts/sword-akjv/Manifest
index da63c758dbd0..254c005a8a5f 100644
--- a/app-dicts/sword-akjv/Manifest
+++ b/app-dicts/sword-akjv/Manifest
@@ -1,3 +1,3 @@
 DIST AKJV-1.4.zip 1402903 BLAKE2B 726e61e4fd3b9eace74627c5dfbd38424b0472e127c3ec762b6cd3f587bccfbd690330245b3a8b2ca12cdc47c9ccdaf6fc5d710bab9ff963d9fd9c5b3e641580 SHA512 6f9ac42e6b768d356520384dd063f4deef409e15380e7b17c94e0870717c4b37881e17b4fe5eef62a55b71092fd37507a4f0b3a42149757756896b3fb021612c
-EBUILD sword-akjv-1.4.ebuild 333 BLAKE2B f9c511834e533cf4d1808aeea2fd191d417707aab10ca574b2bcf543924be828725694ae822e703128a0a9e909bfc7b96991cc32b95aef9c6e81c59b970b0655 SHA512 e388e738f2269650217df208f0b43f8bc335301dd8952069e3f1d19795ba02796abde6fe1874d5fa4bcfffe2bbdeb1b5bfe375518f2d6369e098b68dcc21ba9d
+EBUILD sword-akjv-1.4.ebuild 323 BLAKE2B 63ea4a9fc3bf1d41c64826b014304eeae62099bf89dc85f320b769ad0039bfb1fe5f7cf97412d954e9182bfbe3568000eca6e5314543e1eea9d35928bcb67325 SHA512 26bf1ede87eb3437ed5c3da8740ff959cfd06d15ee3341e7d687f29c775d4a7ae53db42d7ce9fbd3275c8226a066646cea8892ba36b09269bbacb850edeeb552
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-akjv/sword-akjv-1.4.ebuild b/app-dicts/sword-akjv/sword-akjv-1.4.ebuild
index c757428466ec..1c592fd0abf8 100644
--- a/app-dicts/sword-akjv/sword-akjv-1.4.ebuild
+++ b/app-dicts/sword-akjv/sword-akjv-1.4.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="American King James Version"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=AKJV"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-alb/Manifest b/app-dicts/sword-alb/Manifest
index 8b016a623d69..b5d97950d8dc 100644
--- a/app-dicts/sword-alb/Manifest
+++ b/app-dicts/sword-alb/Manifest
@@ -1,3 +1,3 @@
 DIST Alb-1.2.zip 1544025 BLAKE2B ea32989c2b6ee560891a248327bca8ba01d2db772cab085574a95c894c7c9c0eae8ba5d6b5917fce0a9c24e32fe5c0b87096a4219a0eebf8152976b7da4d130e SHA512 49cb89bf807cdacc006e66089be9ec74746f007c2143d3efe44d34b1d9d56bf8f2657f1fff1cef512430ca7fbf2fddadb5346b666756b54fcdd871b550915977
-EBUILD sword-alb-1.2.ebuild 313 BLAKE2B 29ecb40cdb847eda0cc5b769c1e103ae6182c59bd4849f4d7d8d364afcc480736e030fd6b6113f34e68626215223d2d6e7920e37d43679284fb41abb952be01a SHA512 8a396259df8109b3845d8d16d80c3c813e49925dea06116d7466c08898fa62c9311e796a3462d406bf340748720bfa6fe518093d77470c02ff44e7520efdb333
+EBUILD sword-alb-1.2.ebuild 303 BLAKE2B 1f3ce3abd6a638d4fd3bc21555a924e1f870e5f572244c03eaef9829d7751c28d80bd4e1fd26d394ea49b9218687d01afabdee3670346d051688e3af545fcb31 SHA512 52e57632a23cea4fd8026760a3bf0d198a929f591976c56fbfa79973ed71b3c8c72e62f5a59d76a73bad3d8eb3387b5b7983f6c94482cb938b6f92f924a1a8e2
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-alb/sword-alb-1.2.ebuild b/app-dicts/sword-alb/sword-alb-1.2.ebuild
index 1259bf6fb718..682e7eb5863a 100644
--- a/app-dicts/sword-alb/sword-alb-1.2.ebuild
+++ b/app-dicts/sword-alb/sword-alb-1.2.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Albanian Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Alb"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-aleppo/Manifest b/app-dicts/sword-aleppo/Manifest
index 45dc7153144e..361b27d65e28 100644
--- a/app-dicts/sword-aleppo/Manifest
+++ b/app-dicts/sword-aleppo/Manifest
@@ -1,3 +1,3 @@
 DIST Aleppo-1.1.zip 868170 BLAKE2B 133eb51afd1c7038e6d08969106fb1cff3b0210cd7470bc7c3b03593f2a561025db9af3259c94fae078429df0188763f3f0349c9a0d31473e8743cbb7f6cc491 SHA512 566cd9d7e533cd6653f39f2965c1750c9096db98ef9dbb151882f0f60396d60cd3f01e60f84a6c5b25d6af34f7d7d255cc6dfd9bb53223a542dd7d71704c9b08
-EBUILD sword-aleppo-1.1.ebuild 317 BLAKE2B e9b742756ad89c01d8354c027063cacdf8591a2fb956ef9af45d4fb566fab0ec233c91ff755eccbfb865d2621c9c3a7b91123be6dfd6177b64ce237f32853d66 SHA512 1123336352a72ae306ea83e412fe6e054f6d7186e08fd7c8d5eb318ec2e373b76809e6fb6678fcbd5ba48f8ec2058c8f3bc02e5981fd171a64767b9a3d5a1dc0
+EBUILD sword-aleppo-1.1.ebuild 307 BLAKE2B 5e5b8ea696f92c0c0f1611abe1ae656ba6738e85e80f54e0039b3183803f916ab6f0e103d79aa1cc8411ebca266f5d9f7d6c333d2b4e7af8e0ec7d5fd3dc98f1 SHA512 156b928fe69a084d4af869f5d39d8ab2217696da5e4831aad964aff8293df60a714f6047cadb2f67baae0195c5478516b806edfeb5e810c39ff68f5d989ae5d4
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-aleppo/sword-aleppo-1.1.ebuild b/app-dicts/sword-aleppo/sword-aleppo-1.1.ebuild
index 79ed21790437..b831a369a3ce 100644
--- a/app-dicts/sword-aleppo/sword-aleppo-1.1.ebuild
+++ b/app-dicts/sword-aleppo/sword-aleppo-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Aleppo Codex"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Aleppo"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-amtract/Manifest b/app-dicts/sword-amtract/Manifest
index ecc198f8f36c..9ed91b82342b 100644
--- a/app-dicts/sword-amtract/Manifest
+++ b/app-dicts/sword-amtract/Manifest
@@ -1,3 +1,3 @@
 DIST AmTract-1.1.zip 758636 BLAKE2B 51ee5834e2082cf9b904e67add17b6547060084a8bf8817143e11f5c0567d99344259ff3c578d6252cbd61bbb2fc1e01210e4fa4d267de627845ad6e3382ff92 SHA512 5575030e76ec32261da220618dbf157213e0b7c630479b2d9966d9eb992f863b777bd38e3ef3502c01cd62fa84df85a7b0e35a4854e2366cb4aa088425602641
-EBUILD sword-amtract-1.1.ebuild 351 BLAKE2B b1ccf8cd968d2c06778eee11a26a63c63c5eb857fb9459562952db2d9d0e53d23ef9aabbf634ba259117bf2c06ffd34b0ac7c0b487ca692c25363c020dd3fa48 SHA512 de438cb7adf2d162bb0c990b3380306d2b9c1e49d595b10d162ccb085591fccdcd6be0149ce7f2f3d3629141ed1622a254e3ee7eea3229d369b5111228b012c7
+EBUILD sword-amtract-1.1.ebuild 341 BLAKE2B 55ccee98a7124f89862b1aed21c61e7d87aafcba5aa1f82b623c6504e21c85fe6a8d4ad6484694b865f25cc8b3becba5e21325c7e31188603a87bed8786af12c SHA512 3bf3ada1f22cd8db02c581a37fb632d79e170e294a539676df962cc2bf6d39486a7042ee776309b0ed776966939dbf41ec53a8939bf339e5ca27082ff6f0cd1d
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-amtract/sword-amtract-1.1.ebuild b/app-dicts/sword-amtract/sword-amtract-1.1.ebuild
index 044a5333b85b..9d2a8990e664 100644
--- a/app-dicts/sword-amtract/sword-amtract-1.1.ebuild
+++ b/app-dicts/sword-amtract/sword-amtract-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="American Tract Society Bible Dictionary"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=AmTract"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-arasvd/Manifest b/app-dicts/sword-arasvd/Manifest
index d662d924b7a8..7bc7fcbb744c 100644
--- a/app-dicts/sword-arasvd/Manifest
+++ b/app-dicts/sword-arasvd/Manifest
@@ -1,3 +1,3 @@
 DIST AraSVD-1.1.zip 1306354 BLAKE2B 571e38b2003243be7c72d9acee84bc550f87e21fa2c8e131596557774f2d2fe842ec695d778cf771507d83749f0a6cab7f0f8e9515429749076b8ef07816ef66 SHA512 928371a99b7d543a512b3adb3af70788ccdfddb174fd0a3267a0e724623658c3c04b15ef9e91389c5b9d21e0f34b1f1584234390a7bc74c90ee14625b711d250
-EBUILD sword-arasvd-1.1.ebuild 361 BLAKE2B 943904c87df38fa76f9dcce8140678f9edfa4763714faaecb7284f48773a651286d5c8c364def3c3b6ed95954dc49d5cc73492d83d8d5f9063a7ea8a62145b95 SHA512 460b785796a362542b3765f67b77566c0f6d386cb4c0b03b5281fef63abf216438be9e1c11f9724457dd2677e10ea81f63f5e9e58b9713a55aa1fba09dff8f89
+EBUILD sword-arasvd-1.1.ebuild 351 BLAKE2B 71a7a3d2d5e59052704af4dad7892edc410bb4fce34a82c614b4e0eb513faa6991f6259b26eca3dfc146b28380a3064239593b7d5192ba00950f2dd015495163 SHA512 b07d8c3e8f51297f8266fe44a9d52c24b24d07c8ee0cb39fe6119afb8b8d231565248d417f9f64cc13e30bbca31c2490fdec5692fe937bc8c112d26d52a28d09
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-arasvd/sword-arasvd-1.1.ebuild b/app-dicts/sword-arasvd/sword-arasvd-1.1.ebuild
index c7ae38dba4b8..73384df53c40 100644
--- a/app-dicts/sword-arasvd/sword-arasvd-1.1.ebuild
+++ b/app-dicts/sword-arasvd/sword-arasvd-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Smith and van Dyck's al-Kitab al-Muqaddas (Arabic Bible)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=AraSVD"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-armeastern/Manifest b/app-dicts/sword-armeastern/Manifest
index 88e7567dfde3..74680ce2e9fe 100644
--- a/app-dicts/sword-armeastern/Manifest
+++ b/app-dicts/sword-armeastern/Manifest
@@ -1,3 +1,3 @@
 DIST ArmEastern-1.1.zip 334965 BLAKE2B b193bfa9f3f3472f1fd390c3aba61f7299d5d1dcc1a70eb5f88b4eae3bff68adca7302cfb1834c6fb8b95086e38651faa512f085201ad56f486e2cc71738ab4a SHA512 fb481aae1c58e5a4327afdac3f8134678f4e55488dfafa2976d2f77960c742bc371d86575a3d14ce703dae65523392d854baf1c48f186b8dad22e4e6088db860
-EBUILD sword-armeastern-1.1.ebuild 335 BLAKE2B 20079ad3f25d12ebbe6482f502509b806272a6bfc1edc43b41d41fb2d4d3bfc7af2257b7e04cd206f204bc7d5a94684265c168dfcadce6337b117e6de0863a47 SHA512 8f20534dc990095cbc19b1bcf5c5c4077eff465080b6b80be410b828a8b12920c6f0708840bfe8e0d579dda7bf3c84debac9d9675b5b3a7028fdf7ecf4045b9e
+EBUILD sword-armeastern-1.1.ebuild 325 BLAKE2B 50f21f7b6a8f242c89bf12dc25805c912a706a5e37a67cf1c5f6d9fa72f1f6d039b744fe1487111a37e295d708b9e0ada78a2a75d98b6fb0f7ad0dcf3a60c90b SHA512 48a295698564799c271961b0d32fd28d117987e7ef37ee8539e62e88508b8d6d50da004a57e7502f672b9f14074ec5439ca52ab2d1275e544e6d9f80e0f0b54c
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-armeastern/sword-armeastern-1.1.ebuild b/app-dicts/sword-armeastern/sword-armeastern-1.1.ebuild
index d2d5d9f3958b..1394c2c1ec58 100644
--- a/app-dicts/sword-armeastern/sword-armeastern-1.1.ebuild
+++ b/app-dicts/sword-armeastern/sword-armeastern-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Eastern Armenian Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ArmEastern"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-armwestern/Manifest b/app-dicts/sword-armwestern/Manifest
index 16f6f625d0f3..ce2656f34747 100644
--- a/app-dicts/sword-armwestern/Manifest
+++ b/app-dicts/sword-armwestern/Manifest
@@ -1,3 +1,3 @@
 DIST ArmWestern-1.1.zip 428727 BLAKE2B c10066c0da1692b2b009f3b2e28c2445cbc949edb8c8c46c732a916118e5373f4070ec042b9c6db3911db2856d4b431fb15893dfc22fdc565d3a6c08259b984a SHA512 85fc4ba42c10da39103096afde9226ea206e52e69510ef3643acf54721233724c04e8185e32bd9663f62a33c8f1b70dc2a6d123f63f0679604aa58122db1fe46
-EBUILD sword-armwestern-1.1.ebuild 337 BLAKE2B 36ec6b0d5b6c6bbe6e9bf326bf90751796bf8e9c8744ac09e26d92a38231466c54fd761522e7c2dbca1342fe49759a66c2a6f2a27f4958f1b75a3f8d0164fdc8 SHA512 3a3d3a2e7e2744662a54a6c8fe7e4280ffb2b15f9c9f782eddeedef8e20740b1313211606fe076cfee726fef0532003bec42b42f8bd5e25e61b4a39431fa2a5d
+EBUILD sword-armwestern-1.1.ebuild 327 BLAKE2B c58376bd6dd9f22d8fcce16ba7db98f4825474a7ad81b9c830e175325bbb2ca8368fd2e26bbbcc1de8f8e1cfc435d44a8fecc40e4cedd8de00723858e63d38b0 SHA512 5f309d968f84be74b62c1eb90d9661c3c140a942bc18d5f28d8e45a5557a3337ecdcaea11841788062aca9858e9325de0452cb2cb1c687eae0c88191c3d2845d
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-armwestern/sword-armwestern-1.1.ebuild b/app-dicts/sword-armwestern/sword-armwestern-1.1.ebuild
index 0318f09455ba..f9a0f4584e0e 100644
--- a/app-dicts/sword-armwestern/sword-armwestern-1.1.ebuild
+++ b/app-dicts/sword-armwestern/sword-armwestern-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="1853 Western Armenian NT"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ArmWestern"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-asv/Manifest b/app-dicts/sword-asv/Manifest
index 2cd588d52af8..7e40ccaa281f 100644
--- a/app-dicts/sword-asv/Manifest
+++ b/app-dicts/sword-asv/Manifest
@@ -1,3 +1,3 @@
 DIST ASV-1.3.zip 1579461 BLAKE2B 9c0564aa98936f6b0b44f5ef75af23da0a64f50430832ed707ad6e076e5f463bb14afaae93933cc66933289c8388c336ec01a79562ec4e6ca0105042e2b0de42 SHA512 3f1275dd4e95e61f5f2d0da7721a1ab2efd66f2bf8b72a34365a187b6a467be64a006f6769b5e562be7aa6499ab7c41954ffa90976ec81687de5d8e485d43bf9
-EBUILD sword-asv-1.3.ebuild 336 BLAKE2B d5e7987338c5924098d9813c650029b5163044b20cbac6b715c5dc0e3d7acb7f5c641be2197204157d32498757d250676a863b8b1ff19f4fb684432f6fb658e8 SHA512 01967dc5192153912325ae07fa9845b52da0a8483533ad3e99cb5e3ea359074507b52fea69b89bde963a33e8bd93b31aa064607499b9e6549e9a06daca2207b1
+EBUILD sword-asv-1.3.ebuild 326 BLAKE2B 89bb66d209d3aaa88f3c758de057d4844f1d0945cadf14aa829c127dacc627e2a21def3e8c993c2768894ec67a99f47bf1508831a942c340a73268803ce55bba SHA512 00642cdfeebb2fb1defd38067936c332791daa38b75d9f7fdb25b7c26d95dbbad0d57dbdcdd979c0d563149a44c01ed6ee45d858529194bfb0e7f2a8a1f96829
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-asv/sword-asv-1.3.ebuild b/app-dicts/sword-asv/sword-asv-1.3.ebuild
index 0f3abbdaae23..9d8c564b927e 100644
--- a/app-dicts/sword-asv/sword-asv-1.3.ebuild
+++ b/app-dicts/sword-asv/sword-asv-1.3.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="American Standard Version (1901)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ASV"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-barnes/Manifest b/app-dicts/sword-barnes/Manifest
index ccf991fbac93..a5382748f935 100644
--- a/app-dicts/sword-barnes/Manifest
+++ b/app-dicts/sword-barnes/Manifest
@@ -1,3 +1,3 @@
 DIST Barnes-1.1.zip 5812838 BLAKE2B d3fce355f092035d389552e3269c6de0ef90cd0a1f14d009c0291efdb1041f9826f086a4afa9e6ff40a7aac6246a30535e3ea74421516c68fda0351c08fc6606 SHA512 5b63b6bcfc8cbd2513cb79c0a77d61cad7f963184eeabc7d1beb9036aeae4c60d91c109e4632c1b54bd8acf84bbff8d5160d12ae29d618c2eb17b249d4d567d3
-EBUILD sword-barnes-1.1.ebuild 337 BLAKE2B 7d082e81f34e92a34d1db89f9f61a9a907faa92766cee0fe6250bb15051c122b0820ac91a08314d3056d08165836f5c474e5e182c6a6ef6bc5f83adcef3fb663 SHA512 335f39cdfad6939c6bec6c8652b2d54a16b302ef16c6afc0e8eda19a084c911929878c206c4f510ae264a3c97a8c3c82614490d095d857a9260d1c270a9bbc90
+EBUILD sword-barnes-1.1.ebuild 327 BLAKE2B 73ae6d3bb00545b51454799df2d15c0fbd7b69f14a8e43bb4592ee9b900a3013c9949ad368c4ea68b1cd32c6cb3ebcdbda845a94c146160f2323208556be822b SHA512 6028385cb3cf79fd0f9ce22199e24ef7a26c49e9d425d5cb9bf11eabfe3ae3c7e647d38ed26b4d2c01532e02bd2f9b9822222e87aa38998b4ce2b7b9bc5138ad
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-barnes/sword-barnes-1.1.ebuild b/app-dicts/sword-barnes/sword-barnes-1.1.ebuild
index d7052bd12088..17e3852c0b7b 100644
--- a/app-dicts/sword-barnes/sword-barnes-1.1.ebuild
+++ b/app-dicts/sword-barnes/sword-barnes-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Barnes' New Testament Notes"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Barnes"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-bashautin/Manifest b/app-dicts/sword-bashautin/Manifest
index 2ba69099fb5d..31a858aef85e 100644
--- a/app-dicts/sword-bashautin/Manifest
+++ b/app-dicts/sword-bashautin/Manifest
@@ -1,3 +1,3 @@
 DIST BasHautin-1.5.zip 426714 BLAKE2B 8248a2e8ed16f8eda784a590584bb1516bfcc4f24172b2cdf05a5464efd46f064cc5469dd01f5b879c39d9f534d190b82edc64f77c6204e402b0372057497cd0 SHA512 a0266465dfc0c945398075cea549fd17601ee8d38f4d319b035c6a8425e1222c4e6cca46ccc52d6769c368eb4aaa592cea4ba2b60279e2ebeb64c8f4b834e5ff
-EBUILD sword-bashautin-1.5.ebuild 343 BLAKE2B ea39f5641976114c9e1913621cd368d0a3db5c794e466583fc50bda631b3b0d19942caf7fee03f7067fdf0dc7e4e146dcb794dcf4f278d310036aa8bb7e07078 SHA512 a78cdbceb3059cf42bb1e36d834ae59c5f4de4d0b56caa7f3c79b8b6f16c25337331d3f37b3a1b3babc616cd9150620fe8fc9b660c829e93704fe6cecdc86e49
+EBUILD sword-bashautin-1.5.ebuild 333 BLAKE2B 476196efa2f0ab6c52f4805fcf4c755f7168a90e35d0a72fe6e90ce3d65a828f7f5768852314bd30d17ff7d14b5bc3203a93bf991c0a0ef7806808df400ac1e2 SHA512 b3e9b8f526af455ff990137a0169cf15fa29af268e6228ef9c22f6836a4dbb20d2da5c845ec201c55d99abe7dd7c3fb1e0097cebea780c2b7fc550c236d08787
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-bashautin/sword-bashautin-1.5.ebuild b/app-dicts/sword-bashautin/sword-bashautin-1.5.ebuild
index e2d53bcd0a34..dcf45e264a85 100644
--- a/app-dicts/sword-bashautin/sword-bashautin-1.5.ebuild
+++ b/app-dicts/sword-bashautin/sword-bashautin-1.5.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="1571 Navarro-Labourdin Basque NT"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=BasHautin"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-bbe/Manifest b/app-dicts/sword-bbe/Manifest
index 4e8de4e90c47..0374e1aad5d2 100644
--- a/app-dicts/sword-bbe/Manifest
+++ b/app-dicts/sword-bbe/Manifest
@@ -1,3 +1,3 @@
 DIST BBE-1.3.zip 1391875 BLAKE2B cb7eeffa00a47160fe929cfff000d942cd9062bd0bce26a928a9b7330ea2d18a3a3436c036b5b8f65f0a17eeb052e34ec10d5429b4f058aaf109c3b20a58ec19 SHA512 9df323ea99b5b116937c22e1ae5b2b863220c52a7d488096968d63dd8b937a99a60691462f5604f3d22133058ce5744bf227d35421501362791043f520f34b3b
-EBUILD sword-bbe-1.3.ebuild 338 BLAKE2B 49bf580c8dc228bc8d9d516ebe259070a9994a11cad12c45d626b652ed62ca19094d6012e3f777579294fd467cd502138cb5037e2d2750b5232975f370aed955 SHA512 49ce9c2ed027750d3c67e811e820b4616ed0c854f619787b8b85b594370ef1c9a028cb69b8ceec6d1ae194dba949134c946b951c2e5306ba3e6e4fbea7878924
+EBUILD sword-bbe-1.3.ebuild 328 BLAKE2B 0e255ee43d365da6a75381530c167b1f5d3f36e2837aa3b4ee55d970650433f0a8d58e2ea8bfaebfb6c34c698eedb46f8dca4f6fc19332af39494e9d2c91e38f SHA512 89b9d14b66b3f929b1c5bc51a41ff54c2c3f868873fb83393415fad69b4ce6469c2b94472142bced7fc6c6e279237fc0f1a445a49fec4c6e42ee0708b0b67f90
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-bbe/sword-bbe-1.3.ebuild b/app-dicts/sword-bbe/sword-bbe-1.3.ebuild
index 00406c2cfb99..97221db40ad2 100644
--- a/app-dicts/sword-bbe/sword-bbe-1.3.ebuild
+++ b/app-dicts/sword-bbe/sword-bbe-1.3.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Bible in Basic English (1949/1964)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=BBE"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-br_en/Manifest b/app-dicts/sword-br_en/Manifest
index 819af349f7bb..32c32f43b6f9 100644
--- a/app-dicts/sword-br_en/Manifest
+++ b/app-dicts/sword-br_en/Manifest
@@ -1,3 +1,3 @@
 DIST br_en-1.1.zip 7001 BLAKE2B 12221b0721a6130f064775da5349fca06a07f0177e29a446759d9e6f19b6f0c5718b2dd8b96ae798d03b38f84c35178b0422497b3e8417050332d3e60f5d66fc SHA512 8f0ae9d5a34c081bea90517fd6754e219ce5368fe2afcb6ed33040aff815042c8cd53d536eb4edea38ed0444de7f8fded9fe5f43036a1dd0149ef8258255ac8c
-EBUILD sword-br_en-1.1.ebuild 334 BLAKE2B 6bb029ed1b25f4ea41ee269402a0e6fd69dcaa0c692a7f8e0c36977230fc8677c82ecf2db593ec712e5d50d4eee8e4f3f64e2a44b4624168b6d89f85a6649a96 SHA512 441eee05218cabdbb4d444d220f99573606dc3a523046122a447e3cd1b26407456cedbfb00b92ceeccdf08aac91a0903c8250b2fad3587f5647cdc1144e8c4ab
+EBUILD sword-br_en-1.1.ebuild 324 BLAKE2B 926bdb30546a009352b644108ec710d412f1322e76eb5ce563a497057853a1d279781be40e002601af61281807f82e4ac2758b411c5b07fa8e41f6329cda199e SHA512 ab061d3cfe0f5e1e4d4e7ce2bf41b4f5cdb327c5ae8e6ec092589b76464d12680a923c5b737269acd5143abd09bbe20dde3e2b3dd4cff9e18786a45541b7198a
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-br_en/sword-br_en-1.1.ebuild b/app-dicts/sword-br_en/sword-br_en-1.1.ebuild
index cb6440a5d742..72e29c7ab56b 100644
--- a/app-dicts/sword-br_en/sword-br_en-1.1.ebuild
+++ b/app-dicts/sword-br_en/sword-br_en-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Breton to English Glossary"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=br_en"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-bulcarigradnt/Manifest b/app-dicts/sword-bulcarigradnt/Manifest
index 0823339c0550..2b816f11bcd2 100644
--- a/app-dicts/sword-bulcarigradnt/Manifest
+++ b/app-dicts/sword-bulcarigradnt/Manifest
@@ -1,3 +1,3 @@
 DIST BulCarigradNT-1.0.zip 455451 BLAKE2B 48d2dda299b34cd3fd9e7c46b764776c8d5e2049811cf341a2279fe55a234f07ec41ac4e0bb21e31646c5f4801fda655845c2fccc44faa13219050dff2fc99db SHA512 78aceed97c425d4dc10ac13c4f1a7fbc4d3bddc63dcc56a35b0be50e455637bb330cfdf723bb353cbeb0988bef73c6bc982712154091d553cc66473834e1939a
-EBUILD sword-bulcarigradnt-1.0.ebuild 382 BLAKE2B f3f8080e8da628abaa5b5de78ec58cf750afedfc8fdf40587c2a64096e6422cbc6c39b6788f26fcd43015893b6d3549e6bc5ac356abb581459b0c3b3f9cc0f5c SHA512 a0836a082ec6cffdbe9d0aeff29e2ad3a5f61d47b3d71a57256aa325ec852707ed93ebb522413462f929cd616be54288240b3879b68bb3dfcdf8603c86528b45
+EBUILD sword-bulcarigradnt-1.0.ebuild 372 BLAKE2B 10b2796c20f9a81327656f7f725778f85ceed5e90f002a58a1b2e78d2b7add87269052a18e3ee54338c8c66a3ba20fea232aeca900fc2465a5585e81fc45f790 SHA512 01382a71bdf48c59735a68d64eb64d7789d8e0a8b9ebe4544747eee2831a135a65682378c833255293c74a4c4f646c96e17e994e726cab68b952ff1160583fac
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-bulcarigradnt/sword-bulcarigradnt-1.0.ebuild b/app-dicts/sword-bulcarigradnt/sword-bulcarigradnt-1.0.ebuild
index 4de3b8f15cf0..ce80da32ab32 100644
--- a/app-dicts/sword-bulcarigradnt/sword-bulcarigradnt-1.0.ebuild
+++ b/app-dicts/sword-bulcarigradnt/sword-bulcarigradnt-1.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Bulgarian New Testament from 1914, known as 'Tsarigrad Edition'"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=BulCarigradNT"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-bulveren/Manifest b/app-dicts/sword-bulveren/Manifest
index 926c2cb62897..b166398a0e43 100644
--- a/app-dicts/sword-bulveren/Manifest
+++ b/app-dicts/sword-bulveren/Manifest
@@ -1,3 +1,3 @@
 DIST BulVeren-1.0.zip 1827256 BLAKE2B c376e621ae066f3e29ffbfb1f9645e7e6ddd45b915cc38a4bd453f9200915bff4703fa2e3e8d241a0bd10441c9411bedeea6c9fb2c64ca4cc657c3d36ece850c SHA512 87f7499a27c155e9e4717849d26cf394ccb1f19943e8d7c8ba224ed8a3681a773bb38e6bfab7912138d451126f02626b46ea2265d810ca459110557aecf9518f
-EBUILD sword-bulveren-1.0.ebuild 335 BLAKE2B 4bfed76dcd83b215ec8cac171a62fb650b565cbc9231144438c520d3b94b7df09b8cdece0a4495451667578e4b679a1bc7ffc40e90f0a8088c99032e273b1a3b SHA512 e9cecab0a1aacdcf80a02b4b9525d3ab46d7dd9c40b79327caa3f91d19105eca9a82b56f6b435d355e5278feacc9ddf21b10e23a9255ccc731bcc5d5307e4a8a
+EBUILD sword-bulveren-1.0.ebuild 325 BLAKE2B 244e9524e121442e02b22af9bf3d02c467a4aefd141077c9a181e656640e285ce70a879beabf3fdb47b9facda78f108acb7a732560db14de64972b7c7b45ffd4 SHA512 6bb1627449853b2412e5287a72495949a6bf148c9547435883922c6f0dbfe7e5a12ad2a2864290fafa207a3447f3b277831b1371d21d3b4c660bd20be6100c28
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-bulveren/sword-bulveren-1.0.ebuild b/app-dicts/sword-bulveren/sword-bulveren-1.0.ebuild
index 40f18028dbc6..60bde39dc185 100644
--- a/app-dicts/sword-bulveren/sword-bulveren-1.0.ebuild
+++ b/app-dicts/sword-bulveren/sword-bulveren-1.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Veren's Contemporary Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=BulVeren"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-burjudson/Manifest b/app-dicts/sword-burjudson/Manifest
index eeb1040013fd..e3daf4ea4979 100644
--- a/app-dicts/sword-burjudson/Manifest
+++ b/app-dicts/sword-burjudson/Manifest
@@ -1,3 +1,3 @@
 DIST BurJudson-1.1.zip 1990168 BLAKE2B f2073a2bdf41df690c5224a25ce8d2ce86bc1a896b5355de8bb1a7486bb0f06c807e23ebf04da16ff734c1a0f4a31e214740b4e3ce5fff31f6253dc0df7b7ca3 SHA512 49e3d9fcf0d12ed5923f81c4fd5d6e0c34b066d992ac9944617fb8dfc734e493f78a60d18966b86557b9477c5d5d5fde17699b5b1bcc8d0ed8dfad20677fdcae
-EBUILD sword-burjudson-1.1.ebuild 336 BLAKE2B 9b905cf1a4900835619453423f72acc81270ccfaab338f796af9029748965dc7eef7dc6339e441c598c3d59e19a02de6d4d7542bc278eef9e9b66d32213c81ac SHA512 b41f9e7a7bc5a0d2be61ef8a4cd057cc870dd150851b7787d707efe7a5ae438ff078a64f68674780fe92196d1c203ae16805548418ea83739f067e9ea9efeb3f
+EBUILD sword-burjudson-1.1.ebuild 326 BLAKE2B 06d21786a8487077876c19d8bd976470a84f294179c9668a7f7172a22b9a867e6c0ab8d25d7b4d662f48447d1be438b192c2747aad3c281a4963394f544da5a4 SHA512 710365a01473fdd8c1d1dfcb16b973284ffca29e191b431e504f51edbae0acd1dfba1cf586f3b0f9017018e0e03fa5149b5f531c033ca395da92b481fd4102ba
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-burjudson/sword-burjudson-1.1.ebuild b/app-dicts/sword-burjudson/sword-burjudson-1.1.ebuild
index a5e6e13259c1..c54a383e1a5c 100644
--- a/app-dicts/sword-burjudson/sword-burjudson-1.1.ebuild
+++ b/app-dicts/sword-burjudson/sword-burjudson-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="1835 Judson Burmese Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=BurJudson"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-bwe/Manifest b/app-dicts/sword-bwe/Manifest
index 6b3969cc71b1..a696cdc6e6a4 100644
--- a/app-dicts/sword-bwe/Manifest
+++ b/app-dicts/sword-bwe/Manifest
@@ -1,3 +1,3 @@
 DIST BWE-1.0.zip 368050 BLAKE2B 81e7509e137186dac9680f6a8801baf25439484342f0932b47138991155bc3393c852526047c336c93362d4a5af998b7fdbb402929c95a2a2a1a91fe716cc70b SHA512 80b1122b837e8d987378ceed402b145ab859d979fba25e6017d414a1f3f6ad20562d903a676c5883b0465518b7ab4813aa7a0b546a32ee30590d82d68e78f2ff
-EBUILD sword-bwe-1.0.ebuild 325 BLAKE2B 1d9e262e906002923b00f61f8a41e8f420beeca16ef2b875c254974a5822c9875e55b8a42e387efdfe7e2501abecd275511a2f56a3e6f4e3fe14725ad4d2e702 SHA512 64d9149d1710234fd2f1a2e169ada88177736ed41b03f7248bbaa045512d41f778a361d174fee5deb70902105c514b75b15aff43c7a753737336954e14487a2f
+EBUILD sword-bwe-1.0.ebuild 315 BLAKE2B beb5800b5381b6b436b62bba822bf0ae92df59ba72dace347541b2750b56b1d97efa828a517874b02f76c9a32e1186b23cb89ae94049556a75a8ba33f4532b23 SHA512 e7fd43aacbd75a5d2770b145a4a85936d218603c10307d0ef5f419feb8d6bf48db4f87b497fd21e71e41ab1d83e1867bd54a681e283fc8e59a742985284c391f
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-bwe/sword-bwe-1.0.ebuild b/app-dicts/sword-bwe/sword-bwe-1.0.ebuild
index bb8db4d983a2..6031c51b42e4 100644
--- a/app-dicts/sword-bwe/sword-bwe-1.0.ebuild
+++ b/app-dicts/sword-bwe/sword-bwe-1.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Bible in Worldwide English"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=BWE"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-byz/Manifest b/app-dicts/sword-byz/Manifest
index 5b3bea909b2e..bcbab35c4936 100644
--- a/app-dicts/sword-byz/Manifest
+++ b/app-dicts/sword-byz/Manifest
@@ -1,3 +1,3 @@
 DIST Byz-1.10.zip 1263944 BLAKE2B ba0985666992db19bdac5d7960686d6ffd06fdc37d1444b5949e073e45d25dcf1f99ede807a9f5e9ed02fde7d412a9f06835557d8ca7a2097f83df5cdd5a082c SHA512 e47ed94aa465932191903f8199ab119ca6075807cf2c693c04cfecf27b2b128d3f757c57929151e16f8e014ffcb8ef303702642b8863100fd49e6a54120a3727
-EBUILD sword-byz-1.10.ebuild 329 BLAKE2B ee47b586baebfa64de795123f6856ef0aaaf890dbbabfaf92bf3ef663f4c91317862899da48460b5bb32b47911baa67a321619896b37251eb76a966db27db91a SHA512 390e3e148c23dc79c4f784943a05b7fcb29a8bc239a46f702d2a4569cf016ca968bf8839f3c6a44351ff6a5cd2e1f23003f13a993f69584b7b0d8b96d7bb5466
+EBUILD sword-byz-1.10.ebuild 319 BLAKE2B faef8a41a9eb571c3d2fa23b0dc64aa177ca5230c42504729f3ef2b01d39b4d2f260044ae6a93716b3cac88332f3f8e338a8a437f37208166b9c3d2e6e517a15 SHA512 232f19978e08039b208b82e359e973ab807ff4d5511dc34a08b77097c044e0fafaf9e28d360ffcea18dcf1c782b688ff5f26ef965e2bdc8adbab3bc9e3c08c16
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-byz/sword-byz-1.10.ebuild b/app-dicts/sword-byz/sword-byz-1.10.ebuild
index fbe57abfa51a..e55491eef143 100644
--- a/app-dicts/sword-byz/sword-byz-1.10.ebuild
+++ b/app-dicts/sword-byz/sword-byz-1.10.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Byzantine/Majority Text (2000)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Byz"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-cbc/Manifest b/app-dicts/sword-cbc/Manifest
index e370162995d8..347e1d1a7401 100644
--- a/app-dicts/sword-cbc/Manifest
+++ b/app-dicts/sword-cbc/Manifest
@@ -1,3 +1,3 @@
 DIST CBC-1.1.zip 133815 BLAKE2B 8c281751fdc2c4d82713c0e03c7c24127f81f378802b3c01ed4d715b6b180d4053cf1e8710c405012d2b4d2ac5044dd4fed1fd6834e99483b5748decd2fde512 SHA512 3990ca230a0d700e24b2639ab7fa4c97ccc6a382eb810f48c8c6334424384ae91bf97a299c00ba041db8daa82f5481c89cb425d34d84dd4fb298dc29e3f50b78
-EBUILD sword-cbc-1.1.ebuild 333 BLAKE2B 5ec94f1642408f9092a7b4099cdaeebd205bf85d5c2d58d254cf540fb3d7e5d654fb1e2b4d34e550d7080def8b1bb9addddedda2217d904fd382ced2c16e089a SHA512 0adb484bb0ab7bc08d7f9168512736314a2f39e39a38d243b34628621d94488557d7c6e9a493984127b91a2567c14d738ff7bcd2e437db67460b7c1b33c70d2e
+EBUILD sword-cbc-1.1.ebuild 323 BLAKE2B f51508b9db20f72cd7fa9ded122d10cb76b7597f9f22cbef87bb962ac3b3a107d48787caa0e6fdd976492b83f3a471d760f3a6e4a2452a8d0cd83001292c92b4 SHA512 8178103adbe7a18174c915c85140ed2df80d582a33ed57f962869acd090971f0a948151b755fc647339410e6c6ee815dc3e34acd231c03c0d56e71a0dd1f7c04
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-cbc/sword-cbc-1.1.ebuild b/app-dicts/sword-cbc/sword-cbc-1.1.ebuild
index afa14e92d4b4..cc05360ec654 100644
--- a/app-dicts/sword-cbc/sword-cbc-1.1.ebuild
+++ b/app-dicts/sword-cbc/sword-cbc-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Condensed Biblical Cyclopedia"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=CBC"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-chamorro/Manifest b/app-dicts/sword-chamorro/Manifest
index 82c08131ff5b..44490a5285ff 100644
--- a/app-dicts/sword-chamorro/Manifest
+++ b/app-dicts/sword-chamorro/Manifest
@@ -1,3 +1,3 @@
 DIST Chamorro-2.7.zip 287951 BLAKE2B e493f8f1de66b78b5be96855256e36a10e9c51d75cd01412622ed18e2cec15306676c38051571abe7c3f129f233e01b0f4876ba742641addcbe58673e0593b55 SHA512 98aa82f8986b3010b4543dd86ed95902b4ab4a83397f3f1dc8fce5fdf069ef0a20259a3b52b35c08028293aa2a81b8087ce1f3ec38e3f8f08d1ca74d06bd48c6
-EBUILD sword-chamorro-2.7.ebuild 333 BLAKE2B 52a75889cd59ff6a84213ba24f78b65c318f98d51b46f3f4372c344d61682d356d6486d8ff480fe74baedea3ba6c963a663232264373afadbfeba4aab0b475e6 SHA512 98b47cdc6b9f822e38174d5d7887dfa2d768eca9b98a7b6e792623045014ad42ec95d30adfd9b6757e2f66d23f7494cd66129a25078abf1aac72dad5e422d736
+EBUILD sword-chamorro-2.7.ebuild 323 BLAKE2B 3198c90b7ad91f7bc69d127d65ee8c756b94b42ad3548666d1c86ab559a6da4ec3c2a183c521707630266e5e47eaaac17ae10f00a8e58d6f565522a9e9a05024 SHA512 78bd7bdd1075d406214358f0593d8b9ff13e151bf91f239a5aafbc8c3fd4cce8f53f8d69353d606aa393d9b5467a3eeb29e67e1ddb2c266e6c2f060a348e9a26
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-chamorro/sword-chamorro-2.7.ebuild b/app-dicts/sword-chamorro/sword-chamorro-2.7.ebuild
index 658e6a064342..3993c7ddc3d8 100644
--- a/app-dicts/sword-chamorro/sword-chamorro-2.7.ebuild
+++ b/app-dicts/sword-chamorro/sword-chamorro-2.7.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Chamorro: Y Santa Biblia"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Chamorro"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-chincvs/Manifest b/app-dicts/sword-chincvs/Manifest
index 0f16d270a1b6..107cf1910a52 100644
--- a/app-dicts/sword-chincvs/Manifest
+++ b/app-dicts/sword-chincvs/Manifest
@@ -1,3 +1,3 @@
 DIST ChiNCVs-1.0.zip 1481069 BLAKE2B d42704b900f65aa805a49218b3cd27cbca4e72ce1885f5cad2f139542e0dea6d7671670e419baff054aa84f6a268d1e1f7dc44744619de604d2516b7af2584c7 SHA512 1cdeaaea9cb475ac73f5e6104f2baed09a3e7c003bd8e471f025eaab98dea30400cdb1619bb51db1c7065a192dcbe86fe99cda8145c9ff770f321273f24d4d2f
-EBUILD sword-chincvs-1.0.ebuild 337 BLAKE2B 49c37edc5ac6778862c0f7c335e376f9bda29ca7dc7e36d024c4b1ac96fc57c4a2c3f5976243444375cb92d5942a2c03b0934cc721c8d69dfad1fc38fbed41e3 SHA512 5029fc7fd3bd7f4952b0772e853d089e6eb2c46f6b2a8f7a20a02089ad68be655a7468383c3bb37696ea1e73d35a2f4a84db955d984b6a7ca84f8a896bbf3b78
+EBUILD sword-chincvs-1.0.ebuild 327 BLAKE2B 7b6be482602e1b6d292d2b8ef8fc4c977bf72a2d6ac4550578afbba2f41cc92783d7e3cf96229d38af0bf594cddfe5390e124e9bc88ca16ece577a6f7e72a55b SHA512 e0bd60964496d3dcd4ad61c33c35f410287171730db34740248b0b1305ada0c950d096b57ca38457735dcd4367ba4a2184c92c6a2965dac5ea430493fa4b22ee
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-chincvs/sword-chincvs-1.0.ebuild b/app-dicts/sword-chincvs/sword-chincvs-1.0.ebuild
index 0d2b23af8643..f144682881b1 100644
--- a/app-dicts/sword-chincvs/sword-chincvs-1.0.ebuild
+++ b/app-dicts/sword-chincvs/sword-chincvs-1.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="New Chinese Version Simplified"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiNCVs"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-chincvt/Manifest b/app-dicts/sword-chincvt/Manifest
index 881b93a32379..60cf7d8743c9 100644
--- a/app-dicts/sword-chincvt/Manifest
+++ b/app-dicts/sword-chincvt/Manifest
@@ -1,3 +1,3 @@
 DIST ChiNCVt-1.0.zip 1481302 BLAKE2B 3e1c1892a38ca0ddfc4aed197993bc48d2c49e43bf59903f9e0a1780f0a22d3d12ef368a3987c940f389a0af83f4a3d2b760842ecd1c9e19acf78e18f5727121 SHA512 32e320c251e36b9cda9fa9a698d9de146ea0696e4d5bf6f9ed49239e59129aec92318bfa02b9d70112488bc6a2a0a6901cb68c329cb39021daee78f82318cf69
-EBUILD sword-chincvt-1.0.ebuild 338 BLAKE2B 9f6f1f3b9952c2c605b8694f96c1b74cda7911593bde50ff91328adbe33bb10337ff247d242dcc192568ad69f64cf7542de38dc7299ec21f282c18b9c3a1f5d3 SHA512 a6f0cb57a8b66567d170dc7a228543a301c831434ae15db4b2977af199bb6d30a6da5ef05d1219d4093375f0d3eeefa26853cc3d8319dfc9ee3e87857f6925db
+EBUILD sword-chincvt-1.0.ebuild 328 BLAKE2B 8208c84a657e566b9483534812191f786440a73c9169b9d02cc9033f37ee3aaa7ec2f901c0a4186f5fb0ae2ff1f1ce2551b7f13c5084e520a9c1f7508dbdb7d1 SHA512 7ede46058ddf0a8df54bfcb2ac801fa9f3ebd9250ca55bf09722802f997a75ea736ec250e58e2cfc3f737172a8c61acc9037e48471bad6e33b5e3350b4d356d2
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-chincvt/sword-chincvt-1.0.ebuild b/app-dicts/sword-chincvt/sword-chincvt-1.0.ebuild
index f3792e3beb56..3a7ecbd96d09 100644
--- a/app-dicts/sword-chincvt/sword-chincvt-1.0.ebuild
+++ b/app-dicts/sword-chincvt/sword-chincvt-1.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="New Chinese Version Traditional"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiNCVt"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-chiun/Manifest b/app-dicts/sword-chiun/Manifest
index 269d13e12ff7..04e647c075f8 100644
--- a/app-dicts/sword-chiun/Manifest
+++ b/app-dicts/sword-chiun/Manifest
@@ -1,3 +1,3 @@
 DIST ChiUn-2.0.zip 2244478 BLAKE2B 09fa738e82b8b3845a830cc1798be749a05490bbe3b3e3936d073f15089e5b0c6b9568c56b03b3878ba2458109f5d38ecc0de40fd78dad2cd86d797467fca16d SHA512 ab8f0b04eda087b8589ef1ccd3c843ccd66ba4f96faa31e71b129ac010e3aedcf12bab387d2dce991c88ee78f11b5ca5525c6f458ea15bee48f12059926dbd7e
-EBUILD sword-chiun-2.0.ebuild 336 BLAKE2B 84fa3e9f774f24739a4994e845365749e484c41a531f552ce7c501918dd533b6e13f097401affd99f2a7e970e3be7105383bdc48c822ce998f977a985c545b6b SHA512 47e90a00142da5bb63c34c057acb3a3b81eb956d9ddb58fb72034e50b58114b76d92cb1fb2dd23380c01a646f6e94767f461b1f002123fb21f8690bd8d1b8922
+EBUILD sword-chiun-2.0.ebuild 326 BLAKE2B cbe2eb97ffdb8e376191feb50cb7d7f1f618f70556344e3f50a2b9ca220887858b63a6861720d2702208673e05a4f7a2d518261fbd9c677caa9a3c8d0ab5bca1 SHA512 b1d63ff1bf3ee541cddbf45cddb82ec523b440aaa4a3efad2eadaf22f9b93cd721800282b236246612b663986aae739be4eb89857bd656b34169c271a513c09c
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-chiun/sword-chiun-2.0.ebuild b/app-dicts/sword-chiun/sword-chiun-2.0.ebuild
index f748e5e692e4..29e2a57f353f 100644
--- a/app-dicts/sword-chiun/sword-chiun-2.0.ebuild
+++ b/app-dicts/sword-chiun/sword-chiun-2.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Chinese Union Version Traditional"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiUn"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-chiuns/Manifest b/app-dicts/sword-chiuns/Manifest
index 65e3777e2656..6e6c3606b587 100644
--- a/app-dicts/sword-chiuns/Manifest
+++ b/app-dicts/sword-chiuns/Manifest
@@ -1,3 +1,3 @@
 DIST ChiUns-2.0.zip 2241348 BLAKE2B fb9133899c38d552185a492f081f99d959082359020419e8e6292e6d9f9930678363790e3aa23bb474ca6044a2fbf522e9f3e5ea253bcab1d8cd509f34786e45 SHA512 ed11e0006ca6aed353a4691d1ba37885db4953dbc5593a9d41159136a3e55711e1da65536d3b9e9718b0c661b46fb058f4eaf1419168d3b6bfa0d716564192d0
-EBUILD sword-chiuns-2.0.ebuild 337 BLAKE2B 4e2b310d8e4750b5f3d7440622a25c06e00d0f277a735a79c064fcf0eb44554e62e86c835a336c34ec347b5b03d898b86e528f18009b0dc87ce0cfa6982ae69d SHA512 94e08deb746386511597640988cceea01218c30e22f93552e3a9be60b450623134759896bdbe899415fa926cee33d45573328eb8ec133a899193c7d25c032adb
+EBUILD sword-chiuns-2.0.ebuild 327 BLAKE2B a11f5ce9a151ea09f517168dbee8355bcc60566604f6e329fc7ebbba4e7012f30e0158c49a4c149313ea4dcc101ae0882ba7dcb322d9f7e33dc2d2b5b1f77c0d SHA512 123d66b21e0da6e939865d35bbe5a21c27542de6183bc6aebff896deab180b8c2aae09815112f081741c564be0d5d0fe3c0f239e1e1511a94ac7a41c5f24a5dc
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-chiuns/sword-chiuns-2.0.ebuild b/app-dicts/sword-chiuns/sword-chiuns-2.0.ebuild
index 7af863e99d4a..da469e99212a 100644
--- a/app-dicts/sword-chiuns/sword-chiuns-2.0.ebuild
+++ b/app-dicts/sword-chiuns/sword-chiuns-2.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Chinese Union Version Simplified"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiUns"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-clarke/Manifest b/app-dicts/sword-clarke/Manifest
index 593c2f8b5047..1a0d3e1e588e 100644
--- a/app-dicts/sword-clarke/Manifest
+++ b/app-dicts/sword-clarke/Manifest
@@ -1,3 +1,3 @@
 DIST Clarke-1.0.zip 9722167 BLAKE2B 2b07fe56d1d188c79d7f4f04707f8ec57f4e062ce3f5822e04e9df7d1cbd1c1aa2803bbcfc83e6b9625ca8e351c9690fb8a78cde4600aea066db72d1e732698b SHA512 f383e897a16a3c2b68d62145a2952cfee1b0fdfea8848d7973ab5b453aaa4706beaaae9ac457bbd512cd8c45a7514b312563b408a238447e6f69d16f8664c849
-EBUILD sword-clarke-1.0.ebuild 347 BLAKE2B f1b927bd7c1de74a5373acbe93857a86c909912b8b3c28070c399ce9af9141bba047ed4f49b2389b5d2f213dd10ee3d80d8af71f114a2faa9ab6f64d236a5599 SHA512 f9e8977ddecbd81ea2f960252794d46542542c6261211e0ce174eeec277a1651afc3748da5edeb26f6e6f8ed9dc66ecc703430d8ea7444f6cd593bd8d19c3017
+EBUILD sword-clarke-1.0.ebuild 337 BLAKE2B 7781dea45a622015c5d6a4d36d03493f4259ce7349f3bc26b35842cb0cd5a181fab7a9956208afe9e447806dacd4dbc96bbb81c8bec24daea327302e8de286f2 SHA512 8088d85cb1908b8d90713571bd9b7c3a533425925b38569efe8815540378e7a49dc4ef3a1312537de88ffadd85cabd2978a4c6ff2349727b2bc3d1d9766fe163
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-clarke/sword-clarke-1.0.ebuild b/app-dicts/sword-clarke/sword-clarke-1.0.ebuild
index cc0db3bc0d31..201510764281 100644
--- a/app-dicts/sword-clarke/sword-clarke-1.0.ebuild
+++ b/app-dicts/sword-clarke/sword-clarke-1.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Adam Clarke's Commentary on the Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Clarke"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-common/Manifest b/app-dicts/sword-common/Manifest
index e5f66b479f75..9ebbbf550061 100644
--- a/app-dicts/sword-common/Manifest
+++ b/app-dicts/sword-common/Manifest
@@ -1,3 +1,3 @@
 DIST Common-1.3.zip 357456 BLAKE2B f96fc2ae120775c90d3b9fb7347fdf99770cce37fc8561f494c2b2d7da614a88c09f807d4b24a8f2e81645eb967660e2251e38bd5978ce1d660dc77d2b165e84 SHA512 b92d4c346883ca45d703208c5e3b70390a6a012e5d62fadc3fe937dd00b90e56eac4b0d7f845c008054d2ca3f7fafa12e90742b774633d0c0f951eed09960cc7
-EBUILD sword-common-1.3.ebuild 342 BLAKE2B 92fdf705091fe1f24daf17a1d9fe6f8423e1aafd9ca1d1073e96aec06e9ccd81103d1eea86d63e2cb578608eb4ffa3abab84bdabe31fe5d4e48c05f19bd7ade0 SHA512 822901bf69efb112bd4e431453119200a37beb01d834da3679ae4a9fc6b74485c602ec1a1581391951b1e098661eb4025f88fdd3080a3c21dc7d7a36646b9646
+EBUILD sword-common-1.3.ebuild 332 BLAKE2B 596f6dcc9aaa008565ef91d6553e9fac941005082e3c3ca0309bd356903643581e4ebc3259b1df93b014e3472af9255af1affaebd614329af713dd595e78b26d SHA512 60a4c99e5dc3533f2c17803791db99f49543390786228b1fff1f4c648bc883961422f83434addd285d9dcad9916f979a8cde7c5e93b09adfe14d7a0d36c87834
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-common/sword-common-1.3.ebuild b/app-dicts/sword-common/sword-common-1.3.ebuild
index 262dcf423203..76f1759c4a56 100644
--- a/app-dicts/sword-common/sword-common-1.3.ebuild
+++ b/app-dicts/sword-common/sword-common-1.3.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="The Common Edition: New Testament"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Common"
 LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-cro/Manifest b/app-dicts/sword-cro/Manifest
index 54045548a339..773e17f60900 100644
--- a/app-dicts/sword-cro/Manifest
+++ b/app-dicts/sword-cro/Manifest
@@ -1,3 +1,3 @@
 DIST Cro-1.0.zip 1466438 BLAKE2B 09b11d4369474f55bad69ef40fee11b902995f8d08af21cf1ec03c79045e5070ecc9f2e03d9fd68573490d64b191c70b3aece05f16f449c1d88c2185903b0b07 SHA512 7814ad640be617451aeaaac04441d3231fab27b6298e86e4fbd1e99f70a4be95419ab89dd5fde283969ea2c91192e2051eedb5d5191fc35425df0cd072e0a5da
-EBUILD sword-cro-1.0.ebuild 313 BLAKE2B 31f020d1f843d318879717c3feb50ca33f2dbd9299deb3bec39ab271b2cba4a4c95c2da1375a47ac747f6e9e25dc565560fd41502312dd5d53f72697545c56e8 SHA512 92d38b74fab9e237b13d389d14e0a3512929017f100c7d393a9dae8ea6257c9a4d7afc917f1e2db3866b6fd0da1c471f806da849ea715b24e14ed73cac8d0028
+EBUILD sword-cro-1.0.ebuild 303 BLAKE2B 74f7e0762137a641a1f78bdeaa13b8f514483589bd15d3e1d9f0f1c34f08a66470482e2653804819dac0d43dd28a6a47868cbb1949e830233fa245e8dd32cee3 SHA512 3a282bedf4694507d4a02caf235900a6691e93a1039831f11bffc178a466b62c9028afa19e04e8723129b5841e91b7fcbda8ac72122a3b4d75ce5fd6d0089928
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-cro/sword-cro-1.0.ebuild b/app-dicts/sword-cro/sword-cro-1.0.ebuild
index da3f3d2d928d..2b8bc97a28f0 100644
--- a/app-dicts/sword-cro/sword-cro-1.0.ebuild
+++ b/app-dicts/sword-cro/sword-cro-1.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Croatian Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Cro"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-czebkr/Manifest b/app-dicts/sword-czebkr/Manifest
index e014bb430d32..112390c2891e 100644
--- a/app-dicts/sword-czebkr/Manifest
+++ b/app-dicts/sword-czebkr/Manifest
@@ -1,3 +1,3 @@
 DIST CzeBKR-1.1.zip 1534887 BLAKE2B d701614bab254e2d162569f060ba8ff24a15c8a9a8fb34c8c165186d8f88064ac29246fc5b13ef7b816a7d0e2d6fc54c27404bd7c1830e544a5fecad80c2c3a3 SHA512 b2b2b4ba6643c59a81e2491b277d10034d53864c258bfad78b03fb9a90f1f89e5fab62b36cb7441e09ecb046eaa9678823bace2f48b959bf6388b9ff0c684b88
-EBUILD sword-czebkr-1.1.ebuild 325 BLAKE2B e822449a61975ac5334f10947beea552fd6c3c3ffdfb3e2852ff92a481e83b9561b90a3dabb6b24b3439657eed43515b530ee8109a6d23fbb31981fb023ba7f7 SHA512 1234be1f071c2bea8fe4db2e3d9abdfe5cea3264d75037b4b4ce95668dd1b46ee575d0f0994777dbd64a444f86104c4430bf47db0341644ef20be2fba40a481f
+EBUILD sword-czebkr-1.1.ebuild 315 BLAKE2B 1a364030ee675d1da62f894c4bef99728facb62dc71016bf0cc1e7c438f7c52cd74a1854af6f87670d10b3da2bf9e9207a3b2c10abfeb01deb390687712b3741 SHA512 1649a0b65edb0ea731e1d33f5bd75eb56fa20dc3c5f8d924c535fc373b8a05dfeabd314546fdeb67858f1248aca6c8314289cc876c11549e4f509d8c0acffd3c
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-czebkr/sword-czebkr-1.1.ebuild b/app-dicts/sword-czebkr/sword-czebkr-1.1.ebuild
index 7211b0cbff9c..a6be6b57f90d 100644
--- a/app-dicts/sword-czebkr/sword-czebkr-1.1.ebuild
+++ b/app-dicts/sword-czebkr/sword-czebkr-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Czech Bible Kralicka"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=CzeBKR"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-czecep/Manifest b/app-dicts/sword-czecep/Manifest
index fb6ff60f261f..1322ec45d7aa 100644
--- a/app-dicts/sword-czecep/Manifest
+++ b/app-dicts/sword-czecep/Manifest
@@ -1,3 +1,3 @@
 DIST CzeCEP-1.4.zip 1519391 BLAKE2B 57815835904c9108c8eab0a607d7f97f004e2a83f70433240579c52e3d2ea74ab5f496f183ba2426c690a59159762848b5962ceaecfdf503e25646a7dd4d8d56 SHA512 7ff886d15050bb79c5832f863ffb6e39850b107aedaa0ce0826dba41df393c0c86eedcb632f60b905f14929826dd27606c98eb638a2f57332e331d9563afbf1b
-EBUILD sword-czecep-1.4.ebuild 335 BLAKE2B 3a78c52d79a6e7f615707b2d25b029fd5f4a82f6574fd95b1800bab4dbb5ff9d1e0056f97e9d446f1ce3a32245081e98912cb72ce37eb018b0be31af49fb31d2 SHA512 5c9d37576facbf0bf22d57f18a5ccfec7498b9cf9ce89d72395ef7139560896b4edc57324d9b761b28c76935f3bf9acba239609fb9c26eb4abf019810dd80b07
+EBUILD sword-czecep-1.4.ebuild 325 BLAKE2B 6cecf143302afbfc6c63cdf10b5f8437bcd56de013aa7e0d9915ef33d92963addcdc815d20ce1a078aeb248bf58c3fa98fccd208737b33b667bc849e04dceeb9 SHA512 9e75731326cf41a77f29a90e8f9246a202bc6de48fd36803965c6e798cb3b605bad88cb7299ccf9f3605ec2ddcb0ab6b2d32733f5040bdfb2dc8174c12717690
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-czecep/sword-czecep-1.4.ebuild b/app-dicts/sword-czecep/sword-czecep-1.4.ebuild
index 1a876a6058a9..f2d268e7e721 100644
--- a/app-dicts/sword-czecep/sword-czecep-1.4.ebuild
+++ b/app-dicts/sword-czecep/sword-czecep-1.4.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Czech Ekumenicky Cesky preklad"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=CzeCEP"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-czekms/Manifest b/app-dicts/sword-czekms/Manifest
index e1b98603cdb7..da0ce0c9fe72 100644
--- a/app-dicts/sword-czekms/Manifest
+++ b/app-dicts/sword-czekms/Manifest
@@ -1,3 +1,3 @@
 DIST CzeKMS-1.4.zip 376709 BLAKE2B bf3f3e145f7843c20f3eec8b5ee857031d256f791f4e7acbba5f225f9e4eef93a5841a61ba68ee732c141f7747c50fb2615ec5cafac95a14a185076e4869ccfc SHA512 506389690981378474a2de660fc2aa204d0f24200aacb740f53acf77fad1fdbd5f9f1b0e1ea119a4c4969382d2e12bf7f6f05353c9dff047c0cbaf40102c247c
-EBUILD sword-czekms-1.4.ebuild 335 BLAKE2B b735b3fa2a4d423e215e434d6b5e3fc9f889ba95a38a974f721b87e50cd4c87ff3ff87b1953818541967eccfbe1766017ff20dd84a85f71f958c6aa1df590dd0 SHA512 1e6538e847574e8b69098af4c1100f6f6deba68d4e07c998869dba1f6a071ffbfad9bcf7a0d331156d6bcb93b14459ea849a67ddc4bb1a72c7986aa7f065e7b3
+EBUILD sword-czekms-1.4.ebuild 325 BLAKE2B c92ce94d11b539cc8119bb16c44467e9126b5c440eea1b657ec383028962741441bbe75a2803a4baab31b9e27b2774e14442ae697b2891c7854bb5ba2e42701c SHA512 6f155a943211955e018da7783c4e9e13c103acc706ab667629a1d89ba6cd059f635af3eaafa1dc73873665967927724e21669541e045d4b9c23d996212d4f67f
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-czekms/sword-czekms-1.4.ebuild b/app-dicts/sword-czekms/sword-czekms-1.4.ebuild
index cd15c1d8ffe5..84ebaa6e531f 100644
--- a/app-dicts/sword-czekms/sword-czekms-1.4.ebuild
+++ b/app-dicts/sword-czekms/sword-czekms-1.4.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Czech Preklad KMS Nova smlouva"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=CzeKMS"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-czenkb/Manifest b/app-dicts/sword-czenkb/Manifest
index 38a9f821e197..54dcaf720419 100644
--- a/app-dicts/sword-czenkb/Manifest
+++ b/app-dicts/sword-czenkb/Manifest
@@ -1,3 +1,3 @@
 DIST CzeNKB-1.1.zip 385230 BLAKE2B bbe2557734a66a9c67a92636ed49a15a25a6e1700b7339ecf2234457351275f40e632efa6e38cbe267afbd29ee93c4f4a0fe74bebad61e68b9c81b6af3ed29f3 SHA512 1015d1f71e15174c15c7e485c314f00b8a3d24ac25a268c33d24287b1ef32f240403bc6bacba646018c377e1aea9e2901725c96fdc27cd820946ba5e36b37ec4
-EBUILD sword-czenkb-1.1.ebuild 330 BLAKE2B c5632add87aceb5d0ee45838e9ada3852281a48f615a32023d6fb75fbaee5a6fdda2d8ef8a5354d264a76e9804df1a2869e65f6926e40d9cb23385ab40af57ec SHA512 f23e6be5e49989cbf3a20bb2fb3a9a8f80c352538d0b41cd95ede6c62925e94ef03233e6564d73b740e7daea2e485e467e35735300d998201aa40b671e8d6287
+EBUILD sword-czenkb-1.1.ebuild 320 BLAKE2B 6df3f01e8ea5e24cd621ac8ebd2708f8e799396f7d4961930067e48afda3393c2516418689ef9c761c972b9f277c7591b846f62ab227d415025bf21499b0348d SHA512 2e559ba4f10afb10b7ec9281e1977940ced2f6257cc4bcac3aaa12144f42703cb3006619d3a2d6561df91569664cca627085da9c081c8d3f217e207e72216de1
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-czenkb/sword-czenkb-1.1.ebuild b/app-dicts/sword-czenkb/sword-czenkb-1.1.ebuild
index a4ae18c8967e..d6c8a9d58ec3 100644
--- a/app-dicts/sword-czenkb/sword-czenkb-1.1.ebuild
+++ b/app-dicts/sword-czenkb/sword-czenkb-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Czech Nova kralicka Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=CzeNKB"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-daily/Manifest b/app-dicts/sword-daily/Manifest
index a5888637faad..cad7105d2206 100644
--- a/app-dicts/sword-daily/Manifest
+++ b/app-dicts/sword-daily/Manifest
@@ -1,3 +1,3 @@
 DIST Daily-1.0.zip 312387 BLAKE2B 46977f7d270031620447d833e2f20ea8af93c678c77bb3bd570b321f0430219d55423c7163286413ed8e10d90ef1ccca8e99a5c90fd79bcfe70da2e684860e22 SHA512 ab11a1e8918796d34ffadc90b4b0782c5ef021535de135817eae05b32f1271430d2bef02465e96c6def5926c67c0cca5e8f009591e33a2a718a10b7a9ce4983d
-EBUILD sword-daily-1.0.ebuild 356 BLAKE2B 324b3b8dd9a0f513f0c004bf23d10f8b825a378610ef447ee93d5f5eef4c6cbb219209d39cabe9d429699c5a34021119e88a2b249392b340d55d1a8161a9bb69 SHA512 cf69a1827f15c340579bef33453ca7db49d10c09506199430d8f6a589683910fde04beb3a2cdc3175ba3d6761e5e52098276ebe21d72fd48e9c32e1805205386
+EBUILD sword-daily-1.0.ebuild 346 BLAKE2B 7f76dda6ccad191d8b7668f18b8de78bfe03c70dccc5c6fdb3983d9376ea0e021f7040e38bd4543f0a2483357f9f19032daa0a9b6427d2be52187f28e99d0b04 SHA512 945032d6f6bd193421fd9e87c52cc854512c676bc2294d80807c05bc0dc4114a83a6b94913506840d9d03bb67f26f4b535fbf7428ff8eb7c97c84dd1dfec4349
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-daily/sword-daily-1.0.ebuild b/app-dicts/sword-daily/sword-daily-1.0.ebuild
index cc392f36129c..275b0e5a1134 100644
--- a/app-dicts/sword-daily/sword-daily-1.0.ebuild
+++ b/app-dicts/sword-daily/sword-daily-1.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Jonathan Bagster's Daily Light on the Daily Path"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Daily"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-dan/Manifest b/app-dicts/sword-dan/Manifest
index a7a0c1c4e2d0..1ee4e4aecab6 100644
--- a/app-dicts/sword-dan/Manifest
+++ b/app-dicts/sword-dan/Manifest
@@ -1,3 +1,3 @@
 DIST Dan-2.1.zip 1396887 BLAKE2B 374aaf90a3eee5d0a5c00c5e894421caadf5488bca04c171beb87f4ed51d7833da3e7c3ea0cc0b67696b5c31305d4425fed8b06c55d5ad475a0855a1aa323544 SHA512 e9b3553e4dc0aa4d668b005eb0dbca08a435a2775c5449d2e54e60f44abac3ebfb54de8eca9dee77c740d545e2d732f6b2044d297a384d8538ba53ed4cd24c83
-EBUILD sword-dan-2.1.ebuild 316 BLAKE2B 7968df38d6cf1f05a8a03d367926b9746720737df6cf867e4bc0b9a3465847b7b68586aa70d45ef06c25fb71d5b72303358dd2f66ca4b19a391b519f3ede8e2a SHA512 40b34bbeb3f0ba5aeae7d5bbb0e4ff3fde72aaeff865708332c9ca575034fd179ad9f7cc778226ea7c12b38e4458a56135772ad0c17d560e0bdfec2a0c392f69
+EBUILD sword-dan-2.1.ebuild 306 BLAKE2B 21b865f5a39275894978a197b64f98daf26651a580e97933d5ffe7c200d843044fd07f454a8cf07e686a60ae7cf3a7596d4ad44789d843d0a41f8cfc89bc314c SHA512 8b2394e119182fa3924496a38431c88cb7cd211c2638fa40ce286105db01154002ff2cde19bcca0a53d87787fa6e298960c49b15bc6a1d99d3ad30ea34852846
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-dan/sword-dan-2.1.ebuild b/app-dicts/sword-dan/sword-dan-2.1.ebuild
index 2c5c89235556..1508a4a76be0 100644
--- a/app-dicts/sword-dan/sword-dan-2.1.ebuild
+++ b/app-dicts/sword-dan/sword-dan-2.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Danske Bibel"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Dan"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-darby/Manifest b/app-dicts/sword-darby/Manifest
index 050f646e2913..55d7922986f2 100644
--- a/app-dicts/sword-darby/Manifest
+++ b/app-dicts/sword-darby/Manifest
@@ -1,3 +1,3 @@
 DIST Darby-1.1.zip 1437387 BLAKE2B 9ad092707b159faf159b0f0570b01511740bc250f8a2267bc21b9c32374d0e01f6648796b0118f5b5195fa3d51788e2dce6bb79c63a65c48fa544ae2bdccf727 SHA512 3b0a053f43d6752830b60f1ccd9cd244774223ab6356c8f1e77859b1cebcda0cd5b1186e1db5f06c5e9e6dac96806fd9abd4f2a473537b7bbc461bd3b22b8365
-EBUILD sword-darby-1.1.ebuild 326 BLAKE2B 0b710674cdae7a3ae3d35e780c4636ad67c08843670b8980b2ea91725aa19e545fa28598edaa640231c3bd569f3623869c78d6c5176d9c212c745ce266db3ce2 SHA512 e8ca6d86b8a07115110472d514d70924f9c119963e1d690a109754592dc0dfb1a54e100a51b0da73047265cb3ca5e393279c70163a8f9d3b0a9d8fd1f1149066
+EBUILD sword-darby-1.1.ebuild 316 BLAKE2B 95a3c625ca5119671f7745204bf363fba346aa6aafb9ead799616e0dbb7372b421c4cb0ce97eab48b35d428f78343e54374974c70753bb7e61c0a48aeb23f1f5 SHA512 1a76fb2c7a08ab1f1b096e1d25cbfadff43ea5c46b6ecdeb7da8f176932dec4791bd45513b5b4f45e246d7c9cdd0c35df86a38773ce84dfb7188685545be4c24
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-darby/sword-darby-1.1.ebuild b/app-dicts/sword-darby/sword-darby-1.1.ebuild
index edc5e5454073..35dd98f85dbc 100644
--- a/app-dicts/sword-darby/sword-darby-1.1.ebuild
+++ b/app-dicts/sword-darby/sword-darby-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Darby Bible (1889)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Darby"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-dbd/Manifest b/app-dicts/sword-dbd/Manifest
index d9744c39ac07..8c021beb727a 100644
--- a/app-dicts/sword-dbd/Manifest
+++ b/app-dicts/sword-dbd/Manifest
@@ -1,3 +1,3 @@
 DIST DBD-1.1.zip 356984 BLAKE2B f1720bb96f39d26175423bf7103a09ceae994567ddd3552a24b7c622806d15e05f0754fc29faac76fb5545d12a8cae9241ffb749051a953ee1494f2a9764868d SHA512 c190e7b3d0ac13b72107f0f4a177d38a4cda3fe6b9c62dbc9ecbce68d711e7ffb61a805ba8c77cf9fbe917d54da1e73e1a9174970b0848b79e05a8d299d000a9
-EBUILD sword-dbd-1.1.ebuild 333 BLAKE2B cccaffaf5dc109577cbb4e332218a871f84830a285b5b03debb6863c41c8741564f1664a11113efe915f18f38351c0df16aaf9b663d492abca533ff329b4f509 SHA512 f28706df1c0f4abf243378798475c08a211c66e7f4849ebe9ce38404e5820063f7bf00a4e907856a9605f846f60221a52ca1e3a93e3a69e74663c6728fea2c29
+EBUILD sword-dbd-1.1.ebuild 323 BLAKE2B fcee72b529b0dec550852e022d66cb9d06bd526a05493a5ac12ffc1992c62c1cf6df521abf86c0d4a0887ba32c1c61f5ad94216a37b73d927deeae4e71a4b8f9 SHA512 492109f526e3092f5bc9f65187388259c4612a3badef5c467497079b7d8654ce1df206177105a1f97fbf20abb4815f0bc322ced73f6813227ea3c756493637a0
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-dbd/sword-dbd-1.1.ebuild b/app-dicts/sword-dbd/sword-dbd-1.1.ebuild
index 54df1583166e..354fc2002eab 100644
--- a/app-dicts/sword-dbd/sword-dbd-1.1.ebuild
+++ b/app-dicts/sword-dbd/sword-dbd-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Day By Day By Grace - Bob Hoekstra"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=DBD"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-diaglott/Manifest b/app-dicts/sword-diaglott/Manifest
index 1afb356a8496..382cf684f6c1 100644
--- a/app-dicts/sword-diaglott/Manifest
+++ b/app-dicts/sword-diaglott/Manifest
@@ -1,3 +1,3 @@
 DIST Diaglott-1.1.zip 364870 BLAKE2B e932e6f77d437e05fadabc2d1c9f53a3de03d0d3f57e1fc734a08d4c2a13ea8e0b994f91cf2c0d74c5e5b9881f7aef79b465bdf428be5551fa66776bf872e793 SHA512 f992bcc200b1bb86e03fd0bf209cbca70466a2bd1001df3063048d3dbb38c16cf70a5657ca6146664e21fa09bc383255ee1923de2287207116797554fa484c34
-EBUILD sword-diaglott-1.1.ebuild 335 BLAKE2B 69ec26acd804f0e3eaf446ab3b5cc6318da9ebcbdad9462df92920089403df4dcae294dce011b752b68ddb512632cd6760d4ad27e405f2b168999b47615ef89c SHA512 e1760641e7ce6dbe83c78a99bd1e31ac9cbb10811384652343dc8326d2cfb6ac2d0dda48791069c0122abd332366dd4f6e7910da2f7ea27e2f4a3394287329d8
+EBUILD sword-diaglott-1.1.ebuild 325 BLAKE2B c35e7694330dc3b06f4f155169fbc6bd984b68e0c881c2f621faebeb32cdfa53ae99b2429efe49112480a8c4ecfcaa62b4dbe1b73d8b704d1e1a86f2ec7ea6a3 SHA512 d6afb40d670f9527d5875cefa8349e6f9516589e4fa60e0a1b568d7a790f34bf3a9fa283bf8d58641a41e0af8448ccdf51c63dff898e5160fee0f8c6818aecee
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-diaglott/sword-diaglott-1.1.ebuild b/app-dicts/sword-diaglott/sword-diaglott-1.1.ebuild
index 2f4b0e4e70bb..82cbd353024f 100644
--- a/app-dicts/sword-diaglott/sword-diaglott-1.1.ebuild
+++ b/app-dicts/sword-diaglott/sword-diaglott-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="The Emphatic Diaglott"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Diaglott"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-drc/Manifest b/app-dicts/sword-drc/Manifest
index 085c4368a2e7..309bfd673e26 100644
--- a/app-dicts/sword-drc/Manifest
+++ b/app-dicts/sword-drc/Manifest
@@ -1,3 +1,3 @@
 DIST DRC-1.1.zip 1424819 BLAKE2B 43f0e506e83f43cbc46420538810ba4844491558147cc4654b2fc1f5eb95faaa99d47d666fe6e6a9f2b77548c3ca8846d17d941f2661670e032738e258f2a3c0 SHA512 61c5ac8b30a9ef57f46129e91854f69203e06b38fdbeab22c020ac00b7024a27143af27ec33f9d23b68d6e824747784995bf929d389728b7fca7e5f87da81bf7
-EBUILD sword-drc-1.1.ebuild 337 BLAKE2B ea8bac5893c1567e79d0bd04ddccd12895567df01bc755e6e3912f982d8dc41683e9da6d9299800eae0ab1f54e441da19dd41b80b4034e951812bda19ec5d253 SHA512 1a97485ab4a203b48a97eb2a1e72e036c15f9b54abeb47bf6392ca4981e1d6cc46cfb0caa6378424b9b0ea172314af1cc67e07e446f9f5df2d4277f8ff3aa9a5
+EBUILD sword-drc-1.1.ebuild 327 BLAKE2B 35e3294e64dcd70ebeefb91174eb7bfaf55c6541a95e826fcaa03319ac2930137e4f9855d5db654f2730c7e269550679ddc3f7a6de3698f9f95870836c1bb2de SHA512 fa8ac827b962c43f6e7fe7a0910514590a0030ec012be5006b71c26a2d83bb2b29e53849fc08045d5d278df6e60671c5e355ef7cef3c6ab3f4d3bde18aade3eb
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-drc/sword-drc-1.1.ebuild b/app-dicts/sword-drc/sword-drc-1.1.ebuild
index 444b87341383..48959b13e77d 100644
--- a/app-dicts/sword-drc/sword-drc-1.1.ebuild
+++ b/app-dicts/sword-drc/sword-drc-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Douay-Rheims Bible, Challoner Revision"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=DRC"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-dtn/Manifest b/app-dicts/sword-dtn/Manifest
index 319621d5541a..108bbe5a0814 100644
--- a/app-dicts/sword-dtn/Manifest
+++ b/app-dicts/sword-dtn/Manifest
@@ -1,3 +1,3 @@
 DIST DTN-1.0.zip 332136 BLAKE2B de4b3b2c16ec4465d434d3525a23983e583b89167b2406459c83fb7ca94dc2ea52f42822a79e36c82692264be03666d9525a96fe4f089856f8c4a23baa32a75b SHA512 589dc962404483f366ab293c00cb8f7a6144db222b16ebe3df24e87e553ed607b74d14150f44dfacf4798732633c3580c8b73a68c9642d689acedb856019d491
-EBUILD sword-dtn-1.0.ebuild 327 BLAKE2B 7da60ac8823ade3b3e69e59e22dfbafea8e0fc67f01ec928731f75b5d694090fd9e76bc79876f57d0ea30b203eb85bc6c1c58ab322d6fa64e0eaeaf572aa27f6 SHA512 d804a996be8c1f8b173c5dd7b08210fa877b19338d293b43dbb3aadabff44ec1a46fce2a912d06e94f4e5a5fe0eb34e57226293c39d077de6a5777cd7a35d70c
+EBUILD sword-dtn-1.0.ebuild 317 BLAKE2B 7fba2025bd8fb0efd87db83286e86491ae189b80c004969b6dcd2d5f2edb8c3622217f9e1c88e33da064e8b8262f58a9ee9901f755ee0b4fae2b793f009243fb SHA512 eea7550b337ac4d69da26f6993e2b244350e1ec896e9c4ebe128fc120116913607aad7e8191c84de82c51fce8c09ad58121641252d0c1354633bdfe7a4d251df
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-dtn/sword-dtn-1.0.ebuild b/app-dicts/sword-dtn/sword-dtn-1.0.ebuild
index 1f676e980e84..bf0023790e7b 100644
--- a/app-dicts/sword-dtn/sword-dtn-1.0.ebuild
+++ b/app-dicts/sword-dtn/sword-dtn-1.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Darby Translation Notes"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=DTN"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-dutkant/Manifest b/app-dicts/sword-dutkant/Manifest
index ca17e2aca19e..b1e702a91f76 100644
--- a/app-dicts/sword-dutkant/Manifest
+++ b/app-dicts/sword-dutkant/Manifest
@@ -1,3 +1,3 @@
 DIST DutKant-1.1.zip 4741315 BLAKE2B 1902d1e83d5c99620e1de25741b8a1e00c29f91fb50007470c48123939f0dd58b81caa918017dc4de699c2acfb7925187e17cbe3c9202ed000acbcef2e6521f7 SHA512 9a9076939aa9c14af2e1f9c3d98acc2225444465b3c2323c8d3930e02e21c80e573d8d874e3e51878125436411d0ae580f1cb1784166e9ae50d5ff2d81a9a830
-EBUILD sword-dutkant-1.1.ebuild 342 BLAKE2B 49707aac120872264546053ca1cfa7661d8eada28d246fb4229a66c2bc13547685a1167569800c67e5ecb9c116afb7f502f8287a2af8f3eee37f3f136da1f576 SHA512 8493c26f347bdda352b2f84a2581057ac8fdb33d839ba7b14d703eb6d8619ba78201dea1ce8c34fc1263b1dc4ab4dbefdb2c43f72e0da44412791e34ef6c38b6
+EBUILD sword-dutkant-1.1.ebuild 332 BLAKE2B f5e50ff775cdf0e5a88accc775b21f25b2a9c496c62846a763a6fc60618b203b1292f361f3c901691fcb3570eba880c4d23da6e8b7ce5cacddfa10f95771407d SHA512 4cb1094b9a4aa9b4eb650b641ec930ce9de5dbc11b7cf3def725ca074dff1aa7191155a377fef60ce51ea850fb0a68ef27854f9bf8baa009459946322d1f492f
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-dutkant/sword-dutkant-1.1.ebuild b/app-dicts/sword-dutkant/sword-dutkant-1.1.ebuild
index ec41f49933a5..7f0af55945a2 100644
--- a/app-dicts/sword-dutkant/sword-dutkant-1.1.ebuild
+++ b/app-dicts/sword-dutkant/sword-dutkant-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Kanttekeningen Statenvertaling"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=DutKant"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-dutsvv/Manifest b/app-dicts/sword-dutsvv/Manifest
index e93edfc1f741..4d8a6c4f0ba8 100644
--- a/app-dicts/sword-dutsvv/Manifest
+++ b/app-dicts/sword-dutsvv/Manifest
@@ -1,3 +1,3 @@
 DIST DutSVV-1.5.zip 1534052 BLAKE2B 35721a18962cda6b91627be29946ebb34751cf73b8825213c77c213e7e54c95b4c2b72a4a72dc0c83773fd0ba1abc8dfc7f112244c8f2ecec5cce63baf38ee20 SHA512 d974f707b30b35fb18b31146298a631a88103267bc75a584e93d3cf27879ace97c4229717e95fed9a382e49efe1434028f417fa614ec0a8c8ca8fe8d72bf5388
-EBUILD sword-dutsvv-1.5.ebuild 326 BLAKE2B 2f657c9570e4f633c542be906cf2595f970342fcbbf71973d6058b1204cd687a7570b024e0ce16d0a648ef80bd0d2be2f07ece825e3ff64ba28ab22749bc17e4 SHA512 8bc8bc3b142873f9cbb21214e3d2f313ffb86fba57654ddbd7c41beb9d51310a833b99b7cf58806553565d1702be4e62acdca92e9650dfc1854dc9ff958d58d0
+EBUILD sword-dutsvv-1.5.ebuild 316 BLAKE2B 36f7e8d05d77d4529f11a62ed3d4266504da6a9d6779a145570e7e14717a3fd0064a0f8194e1e955a5d6b2b735ab4adaa5fe7a35fb1b44dd1acc987e36892652 SHA512 7ab830e68358e0dcb2edaff011c8e7b3d8b69c95cfcfd56a5ac534f24195755958ea39768fa008379cebcda6718414e612af34acc5159e3731d335b0855e21ec
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-dutsvv/sword-dutsvv-1.5.ebuild b/app-dicts/sword-dutsvv/sword-dutsvv-1.5.ebuild
index 43c45e8132d8..9ca5d3a56cab 100644
--- a/app-dicts/sword-dutsvv/sword-dutsvv-1.5.ebuild
+++ b/app-dicts/sword-dutsvv/sword-dutsvv-1.5.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Dutch Statenvertaling"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=DutSVV"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-easton/Manifest b/app-dicts/sword-easton/Manifest
index 8041b5c672b2..07a3a55072fb 100644
--- a/app-dicts/sword-easton/Manifest
+++ b/app-dicts/sword-easton/Manifest
@@ -1,3 +1,3 @@
 DIST Easton-1.2.zip 1062020 BLAKE2B 20df61304d2da4a4aff3abbf7eac730f0c3c77aef59bee0f265d79120607daf0b36915821eb250041eef7c360ce0fc0971d83f3adc7f779aa7ed4fb77cc09975 SHA512 d0a9df9aac4b61f79511307943c847ddcf7eb5ebb718ec516579e68e647ad9f70973f8c32a3e27edbce228082b8663420f381cbe1fa8de724a4dddf56f0a69df
-EBUILD sword-easton-1.2.ebuild 335 BLAKE2B e030d52b486bcd65f41fdc13e46d4dbbbd830e2dcb18e3b4df8a9a7c10c279f8b68114bd07c959fae158cc0a1f6ceac7ac279d4d0b31605be94c15ea3b93a2d1 SHA512 cf4aef2e877549db350cf0bec6f2033142237d3d07801add9044baef881b25a78184d96ba07cf687b411e6a678be364498dcdc97bc97b74ebc15bb1558352f4a
+EBUILD sword-easton-1.2.ebuild 325 BLAKE2B 4094626751adeb41e657c445e89aaba6b009d8025fdaa56971153f71dc9dcb3d3705205dee233157e8a0baddb53ae7e0c3bfb51479d217d25adcfeaa848061ef SHA512 5bb7f186636f92f7e722bf1fede64838e35ceaaa58c733bbb6bbb57a7890990356fb371ef7f5907a7ed6f72cbe9401fb69bbbdf1996fb261c0418a23946207c1
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-easton/sword-easton-1.2.ebuild b/app-dicts/sword-easton/sword-easton-1.2.ebuild
index ba6738461e86..34ce644910dc 100644
--- a/app-dicts/sword-easton/sword-easton-1.2.ebuild
+++ b/app-dicts/sword-easton/sword-easton-1.2.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Easton's Bible Dictionary"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Easton"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-emtv/Manifest b/app-dicts/sword-emtv/Manifest
index b8c4594b6c3c..cfc428320928 100644
--- a/app-dicts/sword-emtv/Manifest
+++ b/app-dicts/sword-emtv/Manifest
@@ -1,3 +1,3 @@
 DIST EMTV-1.3.zip 486673 BLAKE2B ab6a4395cbfe344c650a6be7dd1e4c57e60867095520d081778e95eeb89e91a025fa16a5b20d05271528edb096d14f0d8bb46d167a28fe7564c65cb314fa58cc SHA512 ce8e0557f526b6ed383105e19fb101fb96919ddf97061542bccca92605ab8e5538223dd72301e82c3429846715be2dfe1e03b47f9218d7ca576f3109358010e4
-EBUILD sword-emtv-1.3.ebuild 330 BLAKE2B 895e3780e46f8916a27346ce0c034db8732ba2209df67963806fe3b721c4066418635215f8d0047bb0d97d3e52d7209c509a9e484664709fc7ed3c64f9c57c95 SHA512 07776d3d72456c09fa7b599f7d940eefd8cafb4dd0526f03ac45d5e593cc02efc8800c9ef28e294ca333b91b1790c36d2aac37532ec33f2d80be3657b465ea88
+EBUILD sword-emtv-1.3.ebuild 320 BLAKE2B 3690eae858435bf9a530946fc42f841aaebdee8f901b3dba22a9576c4c3c8d6692c971a8e6625acb55c7708167c98e9b67fa800545299e7b9b3690d808f46d3b SHA512 de84dedc992a786c2dbcf45e020e74d7819e9b190a6dcaaec15a40384aa02b1e1a079ed2390b5d448853fab5a4d05732eb3c6ec188e027c6372f63ea84ee606e
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-emtv/sword-emtv-1.3.ebuild b/app-dicts/sword-emtv/sword-emtv-1.3.ebuild
index 95aac9657362..1d7ec772d66e 100644
--- a/app-dicts/sword-emtv/sword-emtv-1.3.ebuild
+++ b/app-dicts/sword-emtv/sword-emtv-1.3.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="English Majority Text Version"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=EMTV"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-esperanto/Manifest b/app-dicts/sword-esperanto/Manifest
index a2d4e32715f6..c3a4ddfa81b1 100644
--- a/app-dicts/sword-esperanto/Manifest
+++ b/app-dicts/sword-esperanto/Manifest
@@ -1,3 +1,3 @@
 DIST Esperanto-1.6.zip 1391055 BLAKE2B e8871451bd2b67fca767ffcdfadac43aa2c568a5b05868b3c7078163bbcd1c0e808c261d291c561b7730f8762bd83b8ceba2ad497af781fe3c1326de0e1e766e SHA512 783e864df719e251b62c4f4a21f3baa9255f71d59dec8dee3074848ac33f93a0c26ee34f53af4c382978340ec32d6ee180d3403c11ce8682176b4820916cbd06
-EBUILD sword-esperanto-1.6.ebuild 326 BLAKE2B 99c9470f17f61dee14cc0026bcb7a0effcf67e5583f7ed6e17c4535a3d55b7f94bcc6d8bba3ec2141a8f29b0b36edaf7cf95ecd413d37f04e197dd485a89b16c SHA512 fde0728e10812076d3cfd63c98799c81a6a9038fb9b2adef2d6f266a2b5f0f6a40fd735866b08083ff7d46a5b4f70f0abf5a5f0869359691844992939d821128
+EBUILD sword-esperanto-1.6.ebuild 316 BLAKE2B 7a81195745aedfff55829fc0974dc3667b2160f5c4754741e3e1f8048002cd21140ddfe9561f237f6fd60739d1b4bda7c052553502f0347ff2fa5a4d6a729016 SHA512 c3f08da60c44d86612fd0dd6e6311d06517bb7ae52414290aa77b69298991d7dd6548d6a05547eddabb8e991a1bd437a55206f2af7f252f42bb05e2263b0ff77
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-esperanto/sword-esperanto-1.6.ebuild b/app-dicts/sword-esperanto/sword-esperanto-1.6.ebuild
index 3c0460fcfe7a..e9e4fb058d26 100644
--- a/app-dicts/sword-esperanto/sword-esperanto-1.6.ebuild
+++ b/app-dicts/sword-esperanto/sword-esperanto-1.6.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Esperanto Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Esperanto"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-est/Manifest b/app-dicts/sword-est/Manifest
index ef7e64096f67..cd5416833d9b 100644
--- a/app-dicts/sword-est/Manifest
+++ b/app-dicts/sword-est/Manifest
@@ -1,3 +1,3 @@
 DIST Est-1.1.zip 432871 BLAKE2B d23b6d61a67881ede7edf14637016073b8f0f3e8e1fe72a4fc8cd7833d66ab59865bad77ba7c55130da88f0cf0907b075a611bea9364964ef0361ca4bc33b252 SHA512 17c54578124884d143609098c641fb07b82937cb74515e4afe14c6e5006532406f84bc84c541c1d596d714127ff35074930491b0a8900f27ec9d9f848f14f4f9
-EBUILD sword-est-1.1.ebuild 313 BLAKE2B 6387fa56b7a75b017567de03e93ee4e6bd9bff48b21d01922c9b79b5410d61545e759a7e0b065830762bea2906b63ca57048af79d7f4c67fa15547170f18f4c7 SHA512 546114195fa4854bccbda1742d52ff1c5d15d73945613d063cf2442e12714dfe24a35ba341215161be1b24570f154e33f66a5a455ae8152658b941046314ccb4
+EBUILD sword-est-1.1.ebuild 303 BLAKE2B d658e3f47508ee4b06d42e4a84d018fc872ec0d4afe69047303d9038652d135f597a203c13004f1b08c24d8900bbf3f417a94d7dd10dd423c8ddf40dd3331734 SHA512 f98c5a7160fd654bcbc6a4cfb3a885212b3772f2192e346d02967400fb1a209ca2b08f569e4b93dabddf757329ebf96533b971da4c3adc4f223866c00ff31c21
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-est/sword-est-1.1.ebuild b/app-dicts/sword-est/sword-est-1.1.ebuild
index 3c80a282466d..177ff743d65b 100644
--- a/app-dicts/sword-est/sword-est-1.1.ebuild
+++ b/app-dicts/sword-est/sword-est-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Estonian Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Est"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-family/Manifest b/app-dicts/sword-family/Manifest
index 9e6feac3ee47..ea875e156f5e 100644
--- a/app-dicts/sword-family/Manifest
+++ b/app-dicts/sword-family/Manifest
@@ -1,3 +1,3 @@
 DIST Family-1.1.zip 561669 BLAKE2B 46d1a6b028ae3299ef500eab80850dd05153772bcd55789ce8641178dc5e80c99197cabf0127a3c4bc0552f072911c3498f13a28e3a75d343b99b6d700a7552b SHA512 d6de98ddd7c2c79f0eebc0828bb2bd4115e47c6a06eba1b5c1cf55ff4074c7296fa7cb00361bea8c99fe820f3af7fceeab6340cb3ee58c7fd1cf897a448dbc78
-EBUILD sword-family-1.1.ebuild 323 BLAKE2B 82d3d3a74b32c291a05c09fb7d7fd6dd9b5b2be4ea014fa1799597fce16e3c59cb420db2d789861be8a14c7c5e496dacd1e6a6aa5ad12a6e525169cdfb9bf70a SHA512 6e6875c69e775edbaea5e04a43940d3e2ea53ca7b273add37e1b1f292f8298206c10c04023f51fa7b6e108271514584cdaf3da1fca8baac0ed6309f7a93d59e5
+EBUILD sword-family-1.1.ebuild 313 BLAKE2B a3665000397ebee343aefaf147a1f686358dbf7a179cfe898f263bdaa99c9af39f36fe4ec2fd5149548914cfb2526ab91cd46829f80efdb90d74bf7ffd6e06fb SHA512 7340e66de9cab483e8fd2ab36d2c5b53328c17dbae90b5b563dfc1be355fe4d5bc73dcbb6264d5690d0438d38918c141a95f4fd7a945b0a262db36d7b3b62f84
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-family/sword-family-1.1.ebuild b/app-dicts/sword-family/sword-family-1.1.ebuild
index 7318c4d7b3a6..06b114d6d48b 100644
--- a/app-dicts/sword-family/sword-family-1.1.ebuild
+++ b/app-dicts/sword-family/sword-family-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Family Bible Notes"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Family"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-farsiopv/Manifest b/app-dicts/sword-farsiopv/Manifest
index ae5807bac0da..09259906a8b1 100644
--- a/app-dicts/sword-farsiopv/Manifest
+++ b/app-dicts/sword-farsiopv/Manifest
@@ -1,3 +1,3 @@
 DIST FarsiOPV-1.0.zip 1592646 BLAKE2B 38a667f4b2a97594dade22939f78106e8e1f32f13f7be7deb788a8529bbdda9db46b69e1a568d8ffd96f5cf4a3155a0370f5be9c9fdd10a53196c79b2badfa5f SHA512 41c84bbff9bb0959963d1701dfd8a8f8420d9525cb1ca2bca793145ee8db0fcacd72b6eb1a50849d2a8e712de108c4d065638a64c0f458cb4463f2f6779fbfc4
-EBUILD sword-farsiopv-1.0.ebuild 349 BLAKE2B cc2970c272daab4d52ce083d22750d8553e89bab68d5fa0140d288a21d475a6bd1387cb7568bee793a318bdbc7034b816eb8f6953bc41533007294fdf1054018 SHA512 88f96ea6962c7dd34e3b3d93009707d738f2df2d58d769bc744cdaacf888a203b5dfffce6c05622ed3ecb9ec6b5fe32ab3a789b290eb94f904d47dca8da00bcb
+EBUILD sword-farsiopv-1.0.ebuild 339 BLAKE2B 84559c4582545587087b23c58751abfca3bf34ca964c1e5fbcf53281e9e8213447e41e47f9646ce3cdfc1696b7e480d72bcaba9ef768e761c8d94fa1815cf38e SHA512 17ab8b6e0a6ae4bf53f3781c9861140b5f49bc1ea77e32a946a270041771ba1de896ac97e2e4b16bd9b5d46ebc1f3f40db565d7355a5341aa063a21e5fad71a4
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-farsiopv/sword-farsiopv-1.0.ebuild b/app-dicts/sword-farsiopv/sword-farsiopv-1.0.ebuild
index b20186ed8ed5..18b99133b75a 100644
--- a/app-dicts/sword-farsiopv/sword-farsiopv-1.0.ebuild
+++ b/app-dicts/sword-farsiopv/sword-farsiopv-1.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Persian Holy Bible (Tarjumeh-ye Ghadeem)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=FarsiOPV"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-finbiblia/Manifest b/app-dicts/sword-finbiblia/Manifest
index cbdfe5272964..e1a97cdfa8a8 100644
--- a/app-dicts/sword-finbiblia/Manifest
+++ b/app-dicts/sword-finbiblia/Manifest
@@ -1,3 +1,3 @@
 DIST FinBiblia-1.1.zip 1484005 BLAKE2B 57ff18669847b161a35ac377983cf6fc18df3a724395e160b0563de50d5e21cce8cfb749ea622554690b195c0e51b623d31caa50eefbfcb2cffe01e3a1ee98e1 SHA512 dd6c384651b3f526e54b1da097205c5ea8c74a697c5b7fa0cbdf2d4d771b140468bc2823bbe886544c484f8f0135162b49fe7184ec1eb4476d1f05f5c834d6db
-EBUILD sword-finbiblia-1.1.ebuild 337 BLAKE2B c3fe0bbfcea5e470395d56a8dd5f1d1d04a62829d4505347d547b78100fc0eb3015a5e9cbead92577340493f9cb0fdb78e5214fc3ab1ceb1110123903f15363c SHA512 86f3a76149af4ba126a58340c0319a6b23a0f79d75d62f3da60b752d3b337e4400c4a5464669556f84cafae9131b53e3202a7c6f2e622fd54d589fd223b4873a
+EBUILD sword-finbiblia-1.1.ebuild 327 BLAKE2B 818d3ecb1629b01303318413bbfb77b4cf9df82dbe94b13e3c2bf3905c823fb944f536446422937d967ea535aba8811b9676c640e249c546a86a6f4cf935252e SHA512 9136b2047d5c752c6d3b985c742f7d0872523daac108d565341bfbb5161c63bb6451234985ee8fea3904d0cafc2defe568a7e9a7ee156e74732f8373c3880613
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-finbiblia/sword-finbiblia-1.1.ebuild b/app-dicts/sword-finbiblia/sword-finbiblia-1.1.ebuild
index 16754d9862d7..4fed5bb7dac9 100644
--- a/app-dicts/sword-finbiblia/sword-finbiblia-1.1.ebuild
+++ b/app-dicts/sword-finbiblia/sword-finbiblia-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Finnish Biblia (1776)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=FinBiblia"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-finney/Manifest b/app-dicts/sword-finney/Manifest
index 061f5db6e8d6..4a86b9dfe09c 100644
--- a/app-dicts/sword-finney/Manifest
+++ b/app-dicts/sword-finney/Manifest
@@ -1,3 +1,3 @@
 DIST Finney-1.1.zip 277924 BLAKE2B 0f1193447f566a200a601205472e37c6979d241e2fc1de0c470efb9a391925ef7003c2532c7e0b5ff50d41eff923e5a430e837a1b085e84c61ab84310d3277a4 SHA512 a2bc30067f5f5d157d3fbd27cb7e9f02dbe8ed6cac4a59006afbda77dbd1c77104f7561b39f5de0dbffed29b3e9eebc3f3adc43e5f7e7a332f4d2615b965567b
-EBUILD sword-finney-1.1.ebuild 367 BLAKE2B fbc1eb71f3910123b5fd9f289e1dd8df88773906f3956b8b0df67dcd9abcbd695ec702fe2ce55c7b6801202e071a7f907c2e789728ad6cd192f541abb47bd62a SHA512 393e0a6940d469fa26f3beb48a2f25016979ad29fb3dfa5925f9be40d3904b7c36eef9c9215f65510c93964d62e470aa410246ce09e943fd39b4a9cb918cf06f
+EBUILD sword-finney-1.1.ebuild 357 BLAKE2B f20ee82a77739d44f8c3bbc0debd2424a475379176b9a17b9ad803cd0d9fbd1d99ec9ccb29d75985f9e5a4345a818b076857157cd69b4189b3caf4fd66971a17 SHA512 3c6f4566a154951b4f0a919eb4df383a75bd0bb9e7b6c59f8df62febe4391d9d06f2137aeb9befe4c39c292d580486fb4324abd61a7171da6d66892c3cd69ade
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-finney/sword-finney-1.1.ebuild b/app-dicts/sword-finney/sword-finney-1.1.ebuild
index 15122faec0b9..aeb038bc606a 100644
--- a/app-dicts/sword-finney/sword-finney-1.1.ebuild
+++ b/app-dicts/sword-finney/sword-finney-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Sermons on Gospel Themes by Charles G. Finney (1792-1875)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Finney"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-finpr/Manifest b/app-dicts/sword-finpr/Manifest
index 4f55eb6ddef7..8d4200ae240d 100644
--- a/app-dicts/sword-finpr/Manifest
+++ b/app-dicts/sword-finpr/Manifest
@@ -1,3 +1,3 @@
 DIST FinPR-1.2.zip 1514588 BLAKE2B 6858560320280b3d9e043ba7b8778dbcb52c0e9bc0e8aa998c1f999fa729ae80a2d088279b3bb50a27d83bb9a1ef060a4f117130206d35ba336a8f2fdc87d35c SHA512 f0cf531a1f27275e597cfb62a19ea2e88b0098366dc5d1bad564e1bce77a47e41f2806c66e226e3dde877a505a7a7e490bbc76f3a9335b270e04120d65c4cbae
-EBUILD sword-finpr-1.2.ebuild 341 BLAKE2B 53b7c1865ee4e084a9497c58489d6d0abc031bc33764cb6d729aeec9080d44ae9c57b0044e054a00c547626a894d26462e64b3ca03d425a10792eb505ff10a3d SHA512 8ef62fd1a30b4e01ceddf8c262ad92844da9b7e842d462c5c0afeace71eef5fb75cdb561980af4103edb94b77ca956cade04950486149db52a53862f423a7b7e
+EBUILD sword-finpr-1.2.ebuild 331 BLAKE2B d0a12cf547bd76b6828cfbf83c84d773f6ced0019e3e7e1035a7af51415e6c3ea8ff6eac52509ba2c9ae82653e75e076a1d1ec30f711109166e9b29e60ffd290 SHA512 f4f89374c2f7627c832dc38084fef50118f43182ac4b924b4227ed5033fa9ac6694a0acd161d4fc57e927f64afad9d3623d0ecc350aabc6187f33477549a57cb
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-finpr/sword-finpr-1.2.ebuild b/app-dicts/sword-finpr/sword-finpr-1.2.ebuild
index 23e7c5453ac3..54398ef0fe8f 100644
--- a/app-dicts/sword-finpr/sword-finpr-1.2.ebuild
+++ b/app-dicts/sword-finpr/sword-finpr-1.2.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Finnish Pyh, Raamattu (1933/1938)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=FinPR"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-finpr92/Manifest b/app-dicts/sword-finpr92/Manifest
index 6529224504e6..fade73526bec 100644
--- a/app-dicts/sword-finpr92/Manifest
+++ b/app-dicts/sword-finpr92/Manifest
@@ -1,3 +1,3 @@
 DIST FinPR92-1.1.zip 1581196 BLAKE2B aa698c5e387d95b10f07fa4b2e47d1bac4f7d8572e227e1042eea08238cbf78cd11b7af9c240456ea5f3b97f9e93a42c543be758df415c8454221c8d053114fa SHA512 9287599c769b7133c9217f17402e51a5b6ef34615bcba79e56e8415ec65a26761594f2ed6eb14dc486a1a7c129bf720d39a6c7a4f792f01d1dc1edb1c85fda9f
-EBUILD sword-finpr92-1.1.ebuild 335 BLAKE2B 49631b307bd868121a073a4cd81be975efad72cebc5181b96ec86ba3af647da0ece1bdedbdd5c331ede4a9d9dfacaecf8a0eff86e4be046db58b30a1e6896778 SHA512 b116a1161fd19fde024304375533466ac500023eec156a6aa894d14bfea8449777546d1e72de4a85cb18fb3914e83b6ff60a55ba0f2b3fe1daed5716e8d79d99
+EBUILD sword-finpr92-1.1.ebuild 325 BLAKE2B bf903f11b331a4d1ceae62a80d89c7adf03f760128389a2732cf5f797e3d950360ee0ed75f7024c53d04dcb4504852cafe8a95658730d22e032c2f710c2f0a38 SHA512 4264b5a5ed247f27d0329309d95e4eab1b619eb5572c530aa1145ee01cdf9bc5fbe9965735f1d371ad9b64b4ff519e5b8cb9e1a8040c359fd3edd34544a30292
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-finpr92/sword-finpr92-1.1.ebuild b/app-dicts/sword-finpr92/sword-finpr92-1.1.ebuild
index c2516064c776..acf9e22023fd 100644
--- a/app-dicts/sword-finpr92/sword-finpr92-1.1.ebuild
+++ b/app-dicts/sword-finpr92/sword-finpr92-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Finnish Pyh, Raamattu (1992)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=FinPR92"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-frebbb/Manifest b/app-dicts/sword-frebbb/Manifest
index 96f647f61d23..bc86a217ad99 100644
--- a/app-dicts/sword-frebbb/Manifest
+++ b/app-dicts/sword-frebbb/Manifest
@@ -1,3 +1,3 @@
 DIST FreBBB-1.1.zip 1535395 BLAKE2B 8a9a9d1b60488064e862c58bbd393c2faed1ac3e65f59512fe76fcb8ff7024550575b7d1b429975ec5fcea719231423907cfda2f41765e6429c63f8036cdc42f SHA512 d97227362dad68a40006b07e717abc3aaffdded14bdd950f17ffc42abb20bf6645e2e6e1adb92b372d62edc4218c43ccecdb16c221c60d29a5490d55c29e0066
-EBUILD sword-frebbb-1.1.ebuild 337 BLAKE2B a131e91accc3cb7d7f3a71ca9436818d5369e42ae4941f54ed531b08c674ab80dbfc49e2ec6022f75503f93dd79dd3a1762d445cca5f71ea2c4f904671f65fa2 SHA512 e4ac1b15c3a17e47935833195427e49ee79616e6d7dcd3f5b2bfd8eeeb212fdf019c956e113e02d3824c249022129398ed6f4274f209378adfad13a609c7cb66
+EBUILD sword-frebbb-1.1.ebuild 327 BLAKE2B 90ed621a092c3d7c596425a1b01feffdc2e91e30464f644edaf32f264bed709ec7d5bd986c6efe8f8ad84098018cf62ca399f03a9d8fb37d561b8c5f6fcb5066 SHA512 e70de41d1a266bb690ea2b3630c64a836264170b85e0c7c047882048556c485041938d5b156b01397b6f5884cf158a24ecf42f861f1eb3bad26a016d224f6937
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-frebbb/sword-frebbb-1.1.ebuild b/app-dicts/sword-frebbb/sword-frebbb-1.1.ebuild
index 4fbec4504dba..b41d189b94ce 100644
--- a/app-dicts/sword-frebbb/sword-frebbb-1.1.ebuild
+++ b/app-dicts/sword-frebbb/sword-frebbb-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="French Bible Bovet Bonnet (1900)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=FreBBB"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-frecrampon/Manifest b/app-dicts/sword-frecrampon/Manifest
index 92dffb29b6e7..18fdb08bbba0 100644
--- a/app-dicts/sword-frecrampon/Manifest
+++ b/app-dicts/sword-frecrampon/Manifest
@@ -1,3 +1,3 @@
 DIST FreCrampon-1.1.zip 1572977 BLAKE2B 81d710ba5404bc52306c25d714bc7dafce8f8d5d1f71e67a886f1a2322962c6dc3e4b13e62e198637622bafa163e1ca29c033a5d12374ab5ad7ca3d2d7165dfc SHA512 41853b727ed3807527135c83b3f1b9c0e7284cd74cf4bb7841d30712eac4405063b98c1d92cf31d97998982ac5a7b659e77e65d150e31bf017b3290be1e9f20a
-EBUILD sword-frecrampon-1.1.ebuild 343 BLAKE2B f8b7c126213b1f354b0b06f86f8abdae691343d87997f190618c30c92d34a92a7bc34744a131244280c52c225ca9076597d74c3bfe3c3ff3e9d414f0f6d82ff5 SHA512 6b7c4e1b417c8d63b244387cdb903d9c243e7bc0f6f43db3ae684e89efbc8b6761315d95d080ff8eb2a26d13752a22df961aac46da98f4425c0b1d572736f31b
+EBUILD sword-frecrampon-1.1.ebuild 333 BLAKE2B 610fc9cab27cf927aaf07e20d55c4a87c1a10e0be9168d0368841ca85a0a979bb8be6c608d1bff8920a0f1a210dbc2bf8d0197945f9dd5bb4e5458618de61213 SHA512 eec84d7ad28e4b707360b56b109f6f23f83cd017270336a321ebf6f7c822feaa418a5ab745cb790846b2bf90b8d413dad86adddf551722257866045ed992851d
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-frecrampon/sword-frecrampon-1.1.ebuild b/app-dicts/sword-frecrampon/sword-frecrampon-1.1.ebuild
index 54f0d63e1ba2..7ba5657b775b 100644
--- a/app-dicts/sword-frecrampon/sword-frecrampon-1.1.ebuild
+++ b/app-dicts/sword-frecrampon/sword-frecrampon-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="La Bible Augustin Crampon 1923"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=FreCrampon"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-frecrl/Manifest b/app-dicts/sword-frecrl/Manifest
index e6c16bd45877..42106c21bed4 100644
--- a/app-dicts/sword-frecrl/Manifest
+++ b/app-dicts/sword-frecrl/Manifest
@@ -1,3 +1,3 @@
 DIST FreCrl-1.2.zip 1464601 BLAKE2B 884967a2a870392f6a225bd1625354a2e4d10004d7b5986be54a102d30af797676be6f080a612caa4b1b804bd724429569ed4b11e07a24411a71ef15e068e66b SHA512 3d792c230dbbf21193b7b8b908bdcd5194c487f10450de220360461b73ab0bf85c2a4b05df89f43bc25ca0adb14386c2b8308c7937b99c8cb27d2d231e113dbb
-EBUILD sword-frecrl-1.2.ebuild 334 BLAKE2B 7726ddc3c81967774cc73b2d1a926a5389cbdd08889bbb4e0941c67f66d0e5e9388ddf557105318205861bd4ec102b5197d108d1b4351669d23f9b7460c97850 SHA512 c35fe49a3560a2b6138e3a67567b2d70b973ddc79021c17e31cfce10d99848e2318232656c23f359b66a9814c52f95e65965685c6ba4ca66490aead666f8e650
+EBUILD sword-frecrl-1.2.ebuild 324 BLAKE2B a9b652bf51c77a577a4f4eeff33e14c04cf7e81a27894f72a45344eae6d0856cf369a11d97691ca6770359426c7f7bf3f8ba03ee4bb3749576f11d930ff928ec SHA512 6d7d731ae42259bcc34475e0f9c6abdfb4a7e84f03ddd1fd93b61a8297c41947ce29cd23211b5a0691c2ff9aee636e8e39cc9a7bd37ea3b4db0f7fbfd49342bc
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-frecrl/sword-frecrl-1.2.ebuild b/app-dicts/sword-frecrl/sword-frecrl-1.2.ebuild
index f18693556d5b..12959e436b73 100644
--- a/app-dicts/sword-frecrl/sword-frecrl-1.2.ebuild
+++ b/app-dicts/sword-frecrl/sword-frecrl-1.2.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="French Haitian Creole Version"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=FreCrl"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-frelsg/Manifest b/app-dicts/sword-frelsg/Manifest
index bbd9258a0a1c..5a8734702b1f 100644
--- a/app-dicts/sword-frelsg/Manifest
+++ b/app-dicts/sword-frelsg/Manifest
@@ -1,3 +1,3 @@
 DIST FreLSG-1.3.zip 2317480 BLAKE2B 7aec1088410e12ea7627c045079765bb76b01c2f56237c24c59a3156a69a63f765d4caaa9a021f57ac886bf0dbfd4dca9c27ee9f2d76ec8bf0a69b93bbd0427a SHA512 3ace5e302caf20a91c3f0e1565a97f44e0a440f28d23b8f5fee2af8623094b17a52f8e5bf083c40f418aa65fb5c1464eedaea40a965f7b243780730c2ba2fba7
-EBUILD sword-frelsg-1.3.ebuild 331 BLAKE2B ecbac7cf6de9edc20b810b79181b1421fd4532292263fe67914816c6fa9b7b08ec61b5836f1e8a59b65a974c79368a6baebc6d105cafdf31c5c7f7c9ee10d1a1 SHA512 a8ae2dee709c24942033c9956ea58bca267c9860e18903d3c8a1e78d2c0fa38b4de9a6b0b8020457de620fd3ee9cd88ecf9a06eee5174bf729900d8ca15f3569
+EBUILD sword-frelsg-1.3.ebuild 321 BLAKE2B 5450cf22645f254683318fb962235b8c4da584dbedda543d1b656ef886c9d7a8770217ab40e2fe2400455db3608f91f69e81fc78be3c0577eb68e25bc04a9a87 SHA512 10349811d473309e2830a4a4f71aa897c7f5557e46ff9a11b960a0db003f05b1bc796593c7dc77168371e3e9616a68b7a21ffcdf8867be6860225cdbe5e93f57
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-frelsg/sword-frelsg-1.3.ebuild b/app-dicts/sword-frelsg/sword-frelsg-1.3.ebuild
index 09ed60ea47f0..447856987481 100644
--- a/app-dicts/sword-frelsg/sword-frelsg-1.3.ebuild
+++ b/app-dicts/sword-frelsg/sword-frelsg-1.3.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="French Louis Segond (1910)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=FreLSG"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-fremartin/Manifest b/app-dicts/sword-fremartin/Manifest
index 30601a741656..3b3297cd90ee 100644
--- a/app-dicts/sword-fremartin/Manifest
+++ b/app-dicts/sword-fremartin/Manifest
@@ -1,3 +1,3 @@
 DIST FreMartin-1.2.zip 1665126 BLAKE2B 75a71ccb6d0ede290a77dbb17b99546e3ce6bf825e0592293fae553fbf01edfd7c38705a1ee63ee60823aa1b8ac8e2670522c2d520e594de12cc184a454fe7dd SHA512 76a53edf0cce3976eb56fbee4c60e33ec53c7b4cd71c582e62d81b503d419188b804774c957c54f637b7c551e584dc611c0e123f66f51476328c8d5be3591f1a
-EBUILD sword-fremartin-1.2.ebuild 337 BLAKE2B 6d9a4a996b71f31c9761816a1d47df7132153e19636e30d067795b0550539790ccca668599209cca80105b5ccf181f6d78d312a2ddf32483bf1483bccfd75732 SHA512 2ed772a7b034ea6f3b16aad7961e786dc4d01afa74f6dc9090fe86366211c6d3570f49953aef5c2694e2f6cbdc6cfca921614b695f2a72c2f2421a6e88acee6f
+EBUILD sword-fremartin-1.2.ebuild 327 BLAKE2B a4da671242d564a6ff534132adc323fc15eb380d01c771a45564f23c5fbf82f38383f912d069d3a9f44c403c6494ea4b9d964fe363b6dd15b83bfd62a0e5a796 SHA512 8ef7694d941204e6f5a4912d8a645c3975d0fc0496a07abf011457bbeec6629d0b5bcfe4c6b5406b13bc62321cf1c4f28b28bcd3827e2c2cc6072f3975e8361d
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-fremartin/sword-fremartin-1.2.ebuild b/app-dicts/sword-fremartin/sword-fremartin-1.2.ebuild
index 534b1e2918b9..9128c370da9a 100644
--- a/app-dicts/sword-fremartin/sword-fremartin-1.2.ebuild
+++ b/app-dicts/sword-fremartin/sword-fremartin-1.2.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="French Bible Martin (1744)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=FreMartin"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-fresegond/Manifest b/app-dicts/sword-fresegond/Manifest
index 7cabf21cb2aa..f38d412d1b30 100644
--- a/app-dicts/sword-fresegond/Manifest
+++ b/app-dicts/sword-fresegond/Manifest
@@ -1,3 +1,3 @@
 DIST FreSegond-1.6.zip 1501591 BLAKE2B 89b7654daa8bae515d5ab79cd5f5363ff81433210e8db05abb5014e1c0fff094ac34ea5da50ac183182d7ef7e472abd2edfc16507df903a4e4800e5e8cbae0f0 SHA512 9e9eced08926b8d4abe44c5dba0d5d664c4b7581dddf1c6f650319935b28f7993bf4c3cf4a8532fd376d75db463b3275a04869a108e4a9d68a7b30a2ad5c6cc5
-EBUILD sword-fresegond-1.6.ebuild 351 BLAKE2B c60ebd8df0acac04eb76c933d7afdc02a97ab0d04ae7e1f64fd876f4e64a612bc63f1da94c5fe9d01d17b19bb9fb0be046ee0347cf2b5d0e4fcaea4e4f3ec009 SHA512 3c3abac702e8313959c6d225f12801354294e74ca732a80fd63929a7c5acfa80c37b5ec05ae2853669861506ee43adcd7a40d3cc19d6ca55e7aa3ad3c826c2eb
+EBUILD sword-fresegond-1.6.ebuild 341 BLAKE2B fe55b3fbf60cf2867eea565048a75443710e077edfd1e3fc0b5fe78b4b1b1c6f71923b92916da772c33ce6f50fa49f41eb84a70d544633376f01dd8b5d9bbe10 SHA512 22ba9a6b3557662b4c9c8effdb0b5d5f3cf95f7c65e0027b14d35ecb72191309e341733817c9e613d7f3a0bef93b682d034655e2cb1ceb595c8f7b33b8e82702
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-fresegond/sword-fresegond-1.6.ebuild b/app-dicts/sword-fresegond/sword-fresegond-1.6.ebuild
index 785537e6f67b..b0aca87bff33 100644
--- a/app-dicts/sword-fresegond/sword-fresegond-1.6.ebuild
+++ b/app-dicts/sword-fresegond/sword-fresegond-1.6.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="French Traduction de Louis Segond (1910)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=FreSegond"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-geneva/Manifest b/app-dicts/sword-geneva/Manifest
index d29e4b7b01fe..db2fc814f947 100644
--- a/app-dicts/sword-geneva/Manifest
+++ b/app-dicts/sword-geneva/Manifest
@@ -1,3 +1,3 @@
 DIST Geneva-1.1.zip 1680206 BLAKE2B 1f4ab1f61b12a4fe9f7382be9445799e292f89cf61252688c79d5d09227927317f21cb6d722a63de51cdca32126522cd24a32727939410207de9b9a76b6c2110 SHA512 9bcc2760f6e7a620a6b625f7a01166510daed7bb0b5ec9cddb534f4d2c8b4cc95e15543e725346ca43b66d3e032be72da43dfdc078c8c7579e4f58dd66aaafd9
-EBUILD sword-geneva-1.1.ebuild 335 BLAKE2B 048e65444a38c81ca692e58b964bf7a5d86d1c8dcfcc17a2a5e9dce8546fa814a8c147fbfe41615e4c9f1e2f920a2dbf0cfb0df0f8af6b9983dbde2fb1cce57e SHA512 7108797aa313a13cbd047f5aab22e092162b5a29ab30ad2e9b1d8c46e88092167c2bac31ef5b08f62c7a7daf10bfc0bb757c3a56a3085da7632fd50650c9aeb5
+EBUILD sword-geneva-1.1.ebuild 325 BLAKE2B 25ec26c79224fa8fae2430dd056dcf31a6cef5aabcb4cac4b539f2ec188c5fb4331b7e8af7ccca7684789b43c1eb02e2620d30a46c9a714fc61aa8f6bf4c679b SHA512 a504f7b41278ea014e60f3eaaf3f1a4ec8fd2e71513408315fed14ac11e5ef0b573d8f297f00f7b973e4aa774eeab9de1b2f87a06d884377d7a2e9cb33800ac8
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-geneva/sword-geneva-1.1.ebuild b/app-dicts/sword-geneva/sword-geneva-1.1.ebuild
index c1fab580b060..81f93f79ebe3 100644
--- a/app-dicts/sword-geneva/sword-geneva-1.1.ebuild
+++ b/app-dicts/sword-geneva/sword-geneva-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Geneva Bible Translation Notes"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Geneva"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-geneva1599/Manifest b/app-dicts/sword-geneva1599/Manifest
index 3fdd8c7ca4d0..60f3351c5f4e 100644
--- a/app-dicts/sword-geneva1599/Manifest
+++ b/app-dicts/sword-geneva1599/Manifest
@@ -1,3 +1,3 @@
 DIST Geneva1599-1.1.zip 1449107 BLAKE2B fb316611c5b8af0f702615197d3532a463930331b27d581f28b4863b92be65961542ea06b004a968fa066bfc60a28f5d84108fc5cb9cd21e5df92256f044132a SHA512 d89e8616ff06c9f6c1c39ecb7542568e9b3bcdc3c7de1aa38a6ea53a3eb87a9279b1a05f6804c2f3f00e5b47e68be6b01a8a768eac52b21f3c5a99fefe3ab8d5
-EBUILD sword-geneva1599-1.1.ebuild 332 BLAKE2B f25417d5180f53dd5aaefb0f9ffb46779ae165b65e15418345c0c19e12cc1d2b48453bf7b049377b274441fb1c01cd91b1cda52be8b723d7f3dec4bff7cc3fad SHA512 d4967d1f3b815b53669a01f739e07896fdc894c4da622fd301a22791fe58196e66107e43bc383bf4bc8e30f98c77caa7c17dbec1565c4c18862464a1a580a9f3
+EBUILD sword-geneva1599-1.1.ebuild 322 BLAKE2B 3682f389629990ae202c899857a1450382d52faba40586766c544fa8b9a84205b51fd27e4d65a5f7cf255315504ad2b6d3ec60cb98898f9292c64b57c4b669b6 SHA512 97f6cbe54847255aca2108a1d2e49586468941d8ef2ecf8bf314d080c503eafbc5051307258b58412631c370ffb198f2e4627667ca3d5c45d92b47ae30344544
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-geneva1599/sword-geneva1599-1.1.ebuild b/app-dicts/sword-geneva1599/sword-geneva1599-1.1.ebuild
index fdb100538074..151f395df085 100644
--- a/app-dicts/sword-geneva1599/sword-geneva1599-1.1.ebuild
+++ b/app-dicts/sword-geneva1599/sword-geneva1599-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Geneva Bible (1599)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Geneva1599"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-gerelb1871/Manifest b/app-dicts/sword-gerelb1871/Manifest
index 6ee9600cdd62..fbdc2ea1ae6e 100644
--- a/app-dicts/sword-gerelb1871/Manifest
+++ b/app-dicts/sword-gerelb1871/Manifest
@@ -1,3 +1,3 @@
 DIST GerElb1871-1.1.zip 1733446 BLAKE2B 19f682151450fd65cee999aa2c9cc5f9a66fb4923755c11bab819dbf1ef11aa4d969f2c233020892bd8e8f3ba9a645eed88d70f0db40bc5a5f1651992b6d2260 SHA512 293d97bebf074de8cfad1b1cc0d62c47d29378b07c91ece870ab6a0c235a8c36572324d181a014c0b1ce46d56f67935bb17724a5ac4e9b7cf95aa0219a411d1c
-EBUILD sword-gerelb1871-1.1.ebuild 338 BLAKE2B affbc7e387efeb489a2504669345ff1af18e3f51a8addfa52464d488d493a6a168ecdc765923d334303f23a226c67d0da2235414949d64abbfc1fb1e14d7db22 SHA512 b5a8f6ec9224ae13925e13e9440f7bafef89efb180e6eea62804805cf560da70dc60bec178b945ba08b1d474843f93be1daa274d2f94874b1e8b3b03581c5079
+EBUILD sword-gerelb1871-1.1.ebuild 328 BLAKE2B 20e0e5645387b849cd93a94ea3c1c04cd4c4b0432e03dc64e6d11e02f77873a7163c9320bb48a306075f12ef7d58d894e61f43ca4c933a86ec80fb96dc10646f SHA512 c7547e47c5193dcba85f793cf439dee3d80512f3d40370dbf0fa0dbdcfd0bcd89bf237a6c1ebf77ebd8291ab7dc1664b3009d2f4e97b3a426ca83e3c2c83bd81
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-gerelb1871/sword-gerelb1871-1.1.ebuild b/app-dicts/sword-gerelb1871/sword-gerelb1871-1.1.ebuild
index 26d20b84ab59..e8aabd8428c7 100644
--- a/app-dicts/sword-gerelb1871/sword-gerelb1871-1.1.ebuild
+++ b/app-dicts/sword-gerelb1871/sword-gerelb1871-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="German Elberfelder (1871)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=GerElb1871"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-gerelb1905/Manifest b/app-dicts/sword-gerelb1905/Manifest
index 7b15d7539bf6..1c8ec7658147 100644
--- a/app-dicts/sword-gerelb1905/Manifest
+++ b/app-dicts/sword-gerelb1905/Manifest
@@ -1,3 +1,3 @@
 DIST GerElb1905-1.5.zip 1538434 BLAKE2B a4ade05700e585e284eba30b7f57e79247b4db3ffe41fb10e5601d75a98a3a0ada8c53b823364a76d4095250a3e9331e9bb378f816e11f1d519930ff4b1fa7e0 SHA512 da125670e2429a773b56ebd128a5daad6a101f7d5d9065c84e0e64ee96b0ea358807a047bb27aeae650dfba315bb5006492db8ce940c1b1afbefe2e4fc8e0820
-EBUILD sword-gerelb1905-1.5.ebuild 357 BLAKE2B e12551a5ea03a95f1943a6f53037c8e2b272f199d349a6ca6476251586906b1ab37de49e10037b58f428f3f8c4608b435c5cc99fe80344f2df0030c312bd2c40 SHA512 f8f35a408820d6080e40b5e58cc3342ccd6ec77b057de4582a16c9634dcb43593c46fca77506ce77b778fda7407b6d55e1dc9803421e1c45c5a4e450ff780a9e
+EBUILD sword-gerelb1905-1.5.ebuild 347 BLAKE2B 4073e2ec18b3b68383367857aa0775790579e4efe57be939dff05fe0b082e034ed32d0afa65db5a2d6443be926b4ca239a4eda7f02e20e4b2144fcc4c02aa7a4 SHA512 27ad1058bb530630cb815645b74b429c9656b6e42804fa881cfcb96f63c63da98c7e222a85db5c139e960eb32eb40193c4e7f0dcab44d7c02d8dc497f4219270
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-gerelb1905/sword-gerelb1905-1.5.ebuild b/app-dicts/sword-gerelb1905/sword-gerelb1905-1.5.ebuild
index 2c84870e463c..e39d27af2aeb 100644
--- a/app-dicts/sword-gerelb1905/sword-gerelb1905-1.5.ebuild
+++ b/app-dicts/sword-gerelb1905/sword-gerelb1905-1.5.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="German Darby Unrevidierte Elberfelder (1905)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=GerElb1905"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-gerlut1545/Manifest b/app-dicts/sword-gerlut1545/Manifest
index 00c9ad980aa7..61a7b9365c62 100644
--- a/app-dicts/sword-gerlut1545/Manifest
+++ b/app-dicts/sword-gerlut1545/Manifest
@@ -1,3 +1,3 @@
 DIST GerLut1545-1.2.zip 1463147 BLAKE2B 42c144540398634c71731e5277d167c0fe66fbcfd41e198c57709cd7883b3318b862804c061ece2847926d0b72eb18b29c176184be7211e0e502ddb99ecaf844 SHA512 bc58a7661f68936ee035bf89c580da7ee9f0ea678f81f859956f0c7074df39894a91bee4e5032db8d1e6bf4c05744de876e4890b9a85ca8f18a4c33144103fed
-EBUILD sword-gerlut1545-1.2.ebuild 365 BLAKE2B dbab375eb30c34356c94a1244331001cfeac014e6a0078272e737570c8f1a35329e179b8181139865423dc4811a6e95ee13a9c204fd8756a40d21dc5f553bbf0 SHA512 2c584e8d4f1925ddfe39284596bf04ebef51aa45ca5db4af48bf190d3f6a268f1575b5144bc7289bcff10ab7730ab34db0e6a1595e0bf5a32ff180c012ca5139
+EBUILD sword-gerlut1545-1.2.ebuild 355 BLAKE2B 95d372ef7008baa83b4d03d0119e9a4c611bd61ef777daa6e803e87bb007445a6f0d51d0ff39ce77e88142186abad5d11ad9956a830ab535a467769ecf213d3c SHA512 c72f0a4c1850a7e08ca86da99abcead5783fbd16bf993d86bdf5b79623d9b40fd002e34549ca994c7d488fb1cdff068dcef2a04421f5be2b4b9cb9a6fd349cf0
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-gerlut1545/sword-gerlut1545-1.2.ebuild b/app-dicts/sword-gerlut1545/sword-gerlut1545-1.2.ebuild
index 8419707c1a3d..698fcbb69fbf 100644
--- a/app-dicts/sword-gerlut1545/sword-gerlut1545-1.2.ebuild
+++ b/app-dicts/sword-gerlut1545/sword-gerlut1545-1.2.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="German Unrevidierte Luther Ubersetzung von 1545"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=GerLut1545"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-gersch/Manifest b/app-dicts/sword-gersch/Manifest
index 596516d45560..69c6a61d9129 100644
--- a/app-dicts/sword-gersch/Manifest
+++ b/app-dicts/sword-gersch/Manifest
@@ -1,3 +1,3 @@
 DIST GerSch-1.1.zip 1573735 BLAKE2B d94aea6674c5c4cd7c59803b14c547abe6fd3c877b8cd2e71460b0358068a1516691f80ab783b9d3bad67a2b426ea169eeab1f7b3a92eacd5f82d453c0154b3e SHA512 483647dc8c7b2d691cc18ff58de6709894e04b50a6d9971bf8c2e5924677a73cd0fd4b7131793b9530cbeef6fb7e4456e1161d6861a1e500f9734c3f2160c396
-EBUILD sword-gersch-1.1.ebuild 335 BLAKE2B ae084fe870ae18ae4ef01e28c182f1f13682ded916a8cef24262b5b79be8742ca63f12679d17be8edfc9255b1ffe842f7853695e6ae606b4aacc3d233f55e75b SHA512 578815357036003d65a39353c0cecfbec8b14893d084e8c016e11a6458cc665c3b480343ac7ea7999a7b0e0124fc523e2ae3566a949cdf480bce1df214690d12
+EBUILD sword-gersch-1.1.ebuild 325 BLAKE2B 1a5eb9d6176b3e737712033f42932978b39ef6674253ff9ea43a5409f031521930a6628f5344b35b1daaa5466b82b189a34357d278294c3b5bd179e37606bfc9 SHA512 c3515972472f03b60b3a4dd159983aa19ccd84fc708584f8eadcda1667b2cd33a578b254e19f6de2dccd176de6438671a8f4b71e0ba0905f6cfb18703f2d24b5
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-gersch/sword-gersch-1.1.ebuild b/app-dicts/sword-gersch/sword-gersch-1.1.ebuild
index 5f4b693a892e..4ab8a15ed1e4 100644
--- a/app-dicts/sword-gersch/sword-gersch-1.1.ebuild
+++ b/app-dicts/sword-gersch/sword-gersch-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="German Schlachter Bibel (1951)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=GerSch"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-greekhebrew/Manifest b/app-dicts/sword-greekhebrew/Manifest
index c9962bcaced6..e996828ac5e7 100644
--- a/app-dicts/sword-greekhebrew/Manifest
+++ b/app-dicts/sword-greekhebrew/Manifest
@@ -1,3 +1,3 @@
 DIST GreekHebrew-1.1.zip 127968 BLAKE2B 2af9aab6088b5179037500dcda5d28097e1a3e86708229363f18fa3152a8c8e3c08521861f77260d7f43f195c627195ba0205ed723d3e998c25df9baace8ba3a SHA512 60a816327cdbc392a73d47b9daf04908951a37f12840ade179e83970ca464ae725fd32690132273e6fd3a0c4f88aa17b180559c6947caeb649246cf7f1e62a27
-EBUILD sword-greekhebrew-1.1.ebuild 365 BLAKE2B c7da95792087f2c0183da752457d81b59b83c6078a49c2064aa0ba362e25089bf6aad0a038707108104a52f6f836973f09594fc864a975ec66832f0189e4228a SHA512 bfbc237bee786e8452d0ec7396d8df53378cfbfa7388a0dd64ef8f157c929935cd40fe3823fbd0da3eb21441585d1c86f14e8b0d9758b84f59b9eaed62966433
+EBUILD sword-greekhebrew-1.1.ebuild 355 BLAKE2B e87f6a69c94fa8a9d58e7202908c441e703f2e91e02d521c8c64af6d09afd94e5f35e678bb0405e64e41ebc2f941eb7c1ff34a5675f9a7c40d276fbc8042ed51 SHA512 c1175e5b3a6328a22bc51467e55fe8299b3594b2910a0c41083d975d7dfcd0b03de9b1321633b60bf43723fc19a4ba2cb0fd50f41ca64086808ae4aef3a919a6
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-greekhebrew/sword-greekhebrew-1.1.ebuild b/app-dicts/sword-greekhebrew/sword-greekhebrew-1.1.ebuild
index 94025c39a2f9..e65ca7ccfbf1 100644
--- a/app-dicts/sword-greekhebrew/sword-greekhebrew-1.1.ebuild
+++ b/app-dicts/sword-greekhebrew/sword-greekhebrew-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Greek to Hebrew Dictionary of Septuagint Words"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=GreekHebrew"
 LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-hebmodern/Manifest b/app-dicts/sword-hebmodern/Manifest
index 2510cb066ae8..3819c318280d 100644
--- a/app-dicts/sword-hebmodern/Manifest
+++ b/app-dicts/sword-hebmodern/Manifest
@@ -1,3 +1,3 @@
 DIST HebModern-1.1.zip 1118288 BLAKE2B e25af40c06afb973336aa9b31f2afa5d94d4281d1cf4dee78b125a70f924c56d388b7e05947100347f7cdb8a5b82f46270773a4a172a6e5c2f8ec2bc9c9b2c81 SHA512 84449dcab4c27e7757f79e71e2097acf62ed60e4df0ed0a3a6561b069e9ed5214dcb8040b4b79d79a1b01b6bdc33b44ad5055f520383e2eb38dfa25fefb73e9c
-EBUILD sword-hebmodern-1.1.ebuild 334 BLAKE2B 345d436fde0e6c776389969c8da175e2fa76f4c4ea34107b3190083925635a7af82e1d9ce9b726914bd0f9f142579d76de8c477fb290894b0dc4ad24fe4e304a SHA512 be8efd2cd2fb01baedb3e1168fb8ce6f53f05826b0270fc5d2b52d0adba1e6626a5f006a112b9eab7bc0dd4086f82303f944eb65279af9bf5fec81e55feeedf5
+EBUILD sword-hebmodern-1.1.ebuild 324 BLAKE2B d48e7570610123004a8fcfd472064b8b9c1cb1bbf312048cd05cbcaa7af6f0b814a32db262d4e7975cd4b55a5f412f62d04d4f3836e4cbe586eec88cedf153bb SHA512 4e6c2a194d1f60b6f72aabed9a717f114f615cd757badd03d1b007bc85ac762e78be19374769e81344d0101bfc8918480b5b66859db78ccb511ab8aa70fecc9a
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-hebmodern/sword-hebmodern-1.1.ebuild b/app-dicts/sword-hebmodern/sword-hebmodern-1.1.ebuild
index aee24e2e2c73..04ea33d6a943 100644
--- a/app-dicts/sword-hebmodern/sword-hebmodern-1.1.ebuild
+++ b/app-dicts/sword-hebmodern/sword-hebmodern-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Modern Hebrew Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=HebModern"
 LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-hebrewgreek/Manifest b/app-dicts/sword-hebrewgreek/Manifest
index ca354a6d2a22..58ab82a83a23 100644
--- a/app-dicts/sword-hebrewgreek/Manifest
+++ b/app-dicts/sword-hebrewgreek/Manifest
@@ -1,3 +1,3 @@
 DIST HebrewGreek-1.1.zip 144581 BLAKE2B 527607281375e34ed876a055dc88d40d1ec757fb87cbb928abdd153220794764d3cf441a60f54e1424602e8261ae8f9a9479ce34c507afad2e6b204cfc27dd4a SHA512 bc9e55d5f980329b6e47bafe544f00435db8168400f8fc74c8d21d135deb895d30d582a35a32ac6185ec5ec307b016c000c88b9576fbc954eabc9ee9cdf78503
-EBUILD sword-hebrewgreek-1.1.ebuild 365 BLAKE2B 6abe7d2179c7019ef4898a9a97a6f87d4f7cd829ca8a59caf9140b0822c59b8b6a76f15c4b03b71e00364486f8a205e2e296c462d1ce29396540083e844e03ee SHA512 babb0b08c2e8d83e5dc6e71a982bd135a71b879493a03d82709c6322f27a4930051979ff51e9e518423431f2f1f8362402f18395146e806f47019ef0f9a193ab
+EBUILD sword-hebrewgreek-1.1.ebuild 355 BLAKE2B d0cb1e5ba68239fad0fba059e06de513731e18c4cff107c818dc997c9dec997ead8101632c28bb2b3cb274f5e69f47589eb137c7aa61b475eb27b1ae1fa27ef4 SHA512 2c7700419b88da19ab08ad557b8b47f33179db822adcef957de6070ad0a16ec98035197e9b1088d9edb1246fa24d38cf8b3fba76eeae473d2babdc6479fceb10
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-hebrewgreek/sword-hebrewgreek-1.1.ebuild b/app-dicts/sword-hebrewgreek/sword-hebrewgreek-1.1.ebuild
index 475aae656498..a5bc85f363d8 100644
--- a/app-dicts/sword-hebrewgreek/sword-hebrewgreek-1.1.ebuild
+++ b/app-dicts/sword-hebrewgreek/sword-hebrewgreek-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Hebrew to Greek Dictionary of Septuagint Words"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=HebrewGreek"
 LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-heretics/Manifest b/app-dicts/sword-heretics/Manifest
index 73bdcbd448b9..303a8c392df6 100644
--- a/app-dicts/sword-heretics/Manifest
+++ b/app-dicts/sword-heretics/Manifest
@@ -1,3 +1,3 @@
 DIST Heretics-1.1.zip 132755 BLAKE2B a7c91bd2caa83bc48b7ef8bc453a667cacca3599f607077bf7f2a26e3beecb2b2c78053a915c64c3bb90ba8a1791929d9ef96367fe37dc18f6b84cbc9ac434f8 SHA512 46769cf1b3f66277be54a8e7b315472ea34d5ec2bfc529062fb6b9495ffb9e5bd7bf12e1d24109b6fa87f8762c63ed01152179ab2a822c8965f5a867192fe020
-EBUILD sword-heretics-1.1.ebuild 359 BLAKE2B 5a12f5a5e15873d65b7af692ca19eea0cc80133b60a9ba1e2cf04869f477ee11f564c83b482090c9c328604eb927ae2f34c17be76a7f542b1baf5552e39bc53e SHA512 cc90ffc6afa4e7c9b19c6c1388071e86f054fd0441fb190caed2fde6ca8d44098d3b50eeb4c6dffe40f6eb20e40580e9a5735973b9a3cbabc6252e5a76c27ba3
+EBUILD sword-heretics-1.1.ebuild 349 BLAKE2B c1958ee257ee1d9ede23b0ba8f059488f0468f432a108e274abe6a925e7c36043c6fc07fccf8043b2ed284d32877aaaf2631bf6059efcd2bc613a192bfd41af5 SHA512 535dc65689eb4f96dedad95f9f4a22a2f917a105433ccd3a68c94975c9eb15144d6d2294efd7949c7d91744177a5990d8eba4806002e42c7b2d938e240888c75
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-heretics/sword-heretics-1.1.ebuild b/app-dicts/sword-heretics/sword-heretics-1.1.ebuild
index d24599fe45b6..8a7618939668 100644
--- a/app-dicts/sword-heretics/sword-heretics-1.1.ebuild
+++ b/app-dicts/sword-heretics/sword-heretics-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Heretics by Gilbert K. Chesterton (1874-1936)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Heretics"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-hitchcock/Manifest b/app-dicts/sword-hitchcock/Manifest
index 79bdab3bef47..6e866ab38b0b 100644
--- a/app-dicts/sword-hitchcock/Manifest
+++ b/app-dicts/sword-hitchcock/Manifest
@@ -1,3 +1,3 @@
 DIST Hitchcock-1.3.zip 44959 BLAKE2B 1233a3cdaccbe865ccef9f94ada8cfc1b399df7ece16cfc7848cdc5495cbe498ef1c130d43ab19d3c33ef9d6fca11ef303a6312a4b0ec24a53dede697e12ef90 SHA512 3900ee254025fcbeb38cb43548b8c0172bb390706c73370a0a0d15c1786f8b5285f2921822fde2b43e3cd8c5600a7414d0eb81571ffd09496e908721fac1b069
-EBUILD sword-hitchcock-1.3.ebuild 339 BLAKE2B d43bc38800e5ece213584d5d88257518d85a4fc5bef184bf8a0a7eb8166f5e469eeb680df7b57ca27854321f76305b1f28f76147b3b02fc2ca8945e1668cb7e1 SHA512 05ca637121393e0570a95c1fd18070b4816211c7784ecc02b09457f7333bc9ad8fb4085529cf3accb9fa55551ad70653949b5ca301c7eddd183783185b255a4f
+EBUILD sword-hitchcock-1.3.ebuild 329 BLAKE2B c7c65917cf7edc98a94176136b5337d7477ba792586d495b13fb7597ef83c108e4c2bf92817c327ce98cbb351e1eae827d6e9af8d844a16dc9639beb8f936d3f SHA512 6b96631d3efdb470a7f819bc9b7d407f8d7a513280271a8e227753eecd52d8fed2f0b108afef3ee66dbb21e252c50aa7b2f1fdaedca1ca8b2976111078bdbb13
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-hitchcock/sword-hitchcock-1.3.ebuild b/app-dicts/sword-hitchcock/sword-hitchcock-1.3.ebuild
index b985e59b2dce..ec8037b0ea79 100644
--- a/app-dicts/sword-hitchcock/sword-hitchcock-1.3.ebuild
+++ b/app-dicts/sword-hitchcock/sword-hitchcock-1.3.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Hitchcock's Bible Names"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Hitchcock"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-hnv/Manifest b/app-dicts/sword-hnv/Manifest
index 97bca9ca66c3..e86715773063 100644
--- a/app-dicts/sword-hnv/Manifest
+++ b/app-dicts/sword-hnv/Manifest
@@ -1,3 +1,3 @@
 DIST HNV-1.8.zip 1515718 BLAKE2B c9765df4ba8b580df2aaada66a88dbaba42b462e616ef6a690a5c8b812d01e981a4b001566a40a6c5a12215356a676d94bcb2091f3b216d585d9e510acbbb0b4 SHA512 49bc4713c82de8bc51823a2f2b55bb331a14e6a673781e1534216209754d7b754b1c71b9b9e9e8984ca9c27a1c17a020bad5852c7de714916f729fcc6d693b73
-EBUILD sword-hnv-1.8.ebuild 351 BLAKE2B 32fea65261bbb504e1602a52898050f74eb74e0d4e52f4f38321b307c272a6c0499e6420bf1970e04a4611f9d5109147a1cf2fc6b8fa6f914b7758f6ca4ab068 SHA512 185d722a2b2aa27039598d07d78e2dd920e9834d0bd9e43b204a25e9e4ef675a4d88dbc8827ae90aecc9fae4384aa69ae347d35e673d905a437987f255305179
+EBUILD sword-hnv-1.8.ebuild 341 BLAKE2B dbed963493d58862efcab91d2add465686cac5bc5f294fd29191e853abfab03b09aee1455c319eacb7e46d1492884ceb38dc95851888891a1951d4d3a7b4282e SHA512 614d8d7024ac8728c4d845c59bff8794d0a6f06c9f36e1cf86fc8690404ea7081ba18c2cc0ebfc406b2e2464821c20736587bb2cfd451ec07500d1a764a43470
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-hnv/sword-hnv-1.8.ebuild b/app-dicts/sword-hnv/sword-hnv-1.8.ebuild
index 3a0ae42897c6..9971a0383b81 100644
--- a/app-dicts/sword-hnv/sword-hnv-1.8.ebuild
+++ b/app-dicts/sword-hnv/sword-hnv-1.8.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Hebrew Names Version of the World English Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=HNV"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-hunkar/Manifest b/app-dicts/sword-hunkar/Manifest
index 80594e4eb654..3706679cd9e9 100644
--- a/app-dicts/sword-hunkar/Manifest
+++ b/app-dicts/sword-hunkar/Manifest
@@ -1,3 +1,3 @@
 DIST HunKar-1.7.zip 1632910 BLAKE2B a868a63d84cccbdc4cb6ee2acd448a7331765005ad3e229310140fb37b0763b7fb08278c37bb47120443145cf31498bf44615059b50a34800d90fef439ba91cb SHA512 f4cc7adf551f650ac50153a6070770917945c20f97e8ce5f13acdd3ecbd3effc1c522a79792a6915101cc8c8ae4e91c62c68fbeb793a7787b89aff6b75e6203e
-EBUILD sword-hunkar-1.7.ebuild 321 BLAKE2B 1e5ac2c98138aedbca5b039090e77b0907d5b6b8af0457e400b0102e7f28a37c4d512d9a281da6f742f2e7416843bea3f22a5f65b4be0a283611df3f9a1e9341 SHA512 ed4946581dd4eeb9165ee72881116892ffd2dcb6482b1d8c1ca7fe0b34efc62ed5ff8d26a4ce0503c79ba47ca85eef4e9e283d34c478ed3842088761625decfd
+EBUILD sword-hunkar-1.7.ebuild 311 BLAKE2B a8601c1403d02bf6e46ee9d81f2cee2c6fefb31105174b8945bbd441e4fefa7a7b57515096062fbede993eaefe07181c7c046c93608c6a421bf919608b603538 SHA512 71b24481eb8bdcc9cecee16a6df10ee4d240f6b6a9f184d2dbe48e4a46dae8d0c7bdc12bfc8839f789822903ce56fd282b3fdac18355c365dfe5e628620ced33
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-hunkar/sword-hunkar-1.7.ebuild b/app-dicts/sword-hunkar/sword-hunkar-1.7.ebuild
index 6b533f29ee5b..0ccea24217ef 100644
--- a/app-dicts/sword-hunkar/sword-hunkar-1.7.ebuild
+++ b/app-dicts/sword-hunkar/sword-hunkar-1.7.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Hungarian Karoli"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=HunKar"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-hunuj/Manifest b/app-dicts/sword-hunuj/Manifest
index f761de0fd5d2..703bb2c9693e 100644
--- a/app-dicts/sword-hunuj/Manifest
+++ b/app-dicts/sword-hunuj/Manifest
@@ -1,3 +1,3 @@
 DIST HunUj-1.2.zip 1775652 BLAKE2B 3f53a68b3fca71bed309a2cfd244f24d82f39ec24418872f92252166adb56f4a0195bd5cd1b0d8b95b9bd8d6b24fb6f1e7b58da39d097a01c8ca3e60936e23fb SHA512 87c51f9b275c078a30c84caa03643c24c9d7e42590626f2ee94b8e791adca7a618adff925322aba2abe263384257bade86ee8fb19373feafd11b4fbd6c9ec897
-EBUILD sword-hunuj-1.2.ebuild 355 BLAKE2B 53fc44030158ed436c0218c9184989362ab4d7be6ba1fcf8f0ba117446b1abb97f9e382732956a611529683e66971a528a6e10c80b4c162a2262d323dd6834c6 SHA512 e102952826d5f2e6cca3a1ea888ef976cce43213b8038bc83c06d5ca1d76c93d6392bcdd39b8584baf7b8c4821687ee31c198acea6c5260b7497aa2065357821
+EBUILD sword-hunuj-1.2.ebuild 345 BLAKE2B 342549ffc903818d74bc684c2e7483e7735b27e551fc567bc1fc88a3e377a2e739fd6b2bd01f5a1f7c7ded65e9c1b18e481530c6ea4c1cd4e24c6315e0914007 SHA512 90e4d519b99a714e56875c6b7e95c63efddaeccd33bb29a260b88727ccfcc02915b38cfc960cbbac8e8083b62b233579006931b818121513fbde5604c9ede798
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-hunuj/sword-hunuj-1.2.ebuild b/app-dicts/sword-hunuj/sword-hunuj-1.2.ebuild
index 1e184ba758da..c78d7d14cf8f 100644
--- a/app-dicts/sword-hunuj/sword-hunuj-1.2.ebuild
+++ b/app-dicts/sword-hunuj/sword-hunuj-1.2.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="New Translation Bible of the Hungarian Bible Society"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=HunUj"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-icelandic/Manifest b/app-dicts/sword-icelandic/Manifest
index c7339f2a0e9a..68ddfb3104e6 100644
--- a/app-dicts/sword-icelandic/Manifest
+++ b/app-dicts/sword-icelandic/Manifest
@@ -1,3 +1,3 @@
 DIST Icelandic-1.1.zip 1513390 BLAKE2B 7c64a6b120af6d2c14acf604bf014671d4dc65e11d2cd0882c1ce8169d280369a551d80b5c217ac76a76c58dbb82b1d5769aa6f7d681fe3df35f3d3cff87bcf7 SHA512 db973262bd6e98a7a32a674f9424dca1389c6f57d7e5917b2ea2cb8e9eda4f026ac6290c0e2ade8ec803350249723d492400eed1491885bbcf10bbb32f7e209f
-EBUILD sword-icelandic-1.1.ebuild 326 BLAKE2B a5774fe6f4f17f3824f0e43337dfe12cac6cfa3f3d17d94c7b060d4e8f2def29319ca8f1828ebc312bb100c7738b728bb45d4ecd8b9de2d3f87b36e2f5ca2cd7 SHA512 6f18ce7f6f18b6f59e82f58be9f8a93b664a3973e1e01b15cf6324118953c6d1c5b8a77f844f63569807fac58e199173aa215ff840fba95f27819e251a7970c2
+EBUILD sword-icelandic-1.1.ebuild 316 BLAKE2B 372f1941763bf8b48bb58556c1fdf484f1873f1d88d90c8cdffd3b2cfe2ae5514771828c9b57ee33fdc1259eb4f5f9a306f61b117b6b703d0113217dae78273e SHA512 187455558e1ef178662ce9f33225580902070d50611b8ee0c48a06be1adb8641075e45011097ca75a9062880324bb1719177278bd1489c5912451a93e3276512
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-icelandic/sword-icelandic-1.1.ebuild b/app-dicts/sword-icelandic/sword-icelandic-1.1.ebuild
index 4c2a674ac86c..1d5a35c0972e 100644
--- a/app-dicts/sword-icelandic/sword-icelandic-1.1.ebuild
+++ b/app-dicts/sword-icelandic/sword-icelandic-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Icelandic Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Icelandic"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-institutes/Manifest b/app-dicts/sword-institutes/Manifest
index f88ffdfa0db3..85b16648e850 100644
--- a/app-dicts/sword-institutes/Manifest
+++ b/app-dicts/sword-institutes/Manifest
@@ -1,3 +1,3 @@
 DIST Institutes-1.2.zip 1417954 BLAKE2B ba9d3e4f235ff1a34e37cb49e36547bf9262bce6b5911ccb7b0ecd1110cf7dd8c26dee8dbf47ccb4aa538f3e3718e13c12f9b7dadc5053c292256fc48efaea01 SHA512 dad9fe61bc84a0761e2104695658be7661613e3237e65ad190d425452b189d8614adaf785f9df86ec2d26b57ccf9854c1f482acd8367bd8c29d7c88e8e9b5e12
-EBUILD sword-institutes-1.2.ebuild 337 BLAKE2B 7b0cca8c231afd4267e9ae3694a6ac1e98e908cafa45acb1268f294a68bcabab619e7ffd4ed9094aebbe7b4400ea29df89461be6671d230a549d26a803c46da4 SHA512 73dfcece7b4df285575c3306c4c1ae2fa3a348fe73cc3e050b713ba141233e9f6be2a242b05169cd4eabff88eae5758764c3b00cb8091b289c08a381ad1923d1
+EBUILD sword-institutes-1.2.ebuild 327 BLAKE2B 68446b947f511cce59a3ca6757e22d264195bff0876c42f1d3ed0e26cceec28939063c74fe6cb788e14159aedfbe1ff915f08d2130fc61767306d1e9b36899f7 SHA512 57554939312d37cda30d7900b4ab07a47526e79da08325a404460501e251035bb135096f66f115e08e6bee59d1ba2fceedf19c5b4b32351c8093a117a61a92b3
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-institutes/sword-institutes-1.2.ebuild b/app-dicts/sword-institutes/sword-institutes-1.2.ebuild
index 91633c56ef5c..93bada6faf73 100644
--- a/app-dicts/sword-institutes/sword-institutes-1.2.ebuild
+++ b/app-dicts/sword-institutes/sword-institutes-1.2.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Calvin's Institutes"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Institutes"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-isbe/Manifest b/app-dicts/sword-isbe/Manifest
index 1e7f94cca50d..8c087d958109 100644
--- a/app-dicts/sword-isbe/Manifest
+++ b/app-dicts/sword-isbe/Manifest
@@ -1,3 +1,3 @@
 DIST ISBE-1.6.zip 9318385 BLAKE2B 63816e7ef6ea2e4612c4ee792c2601c12803111f379f2a1daf4735639cbc7b92e3aeb27a2a24eb0946e877dcef9fddd0076d0752ba8273adecde61c35225b592 SHA512 6771eea36f78b42f3c0488cd52a4691658f4dbb295667b0abbf09ffc7cb3022bafc9fb080d3b487c19fbd01c87ef1f16bc35b12d1822f3185c6c05b89bd7326d
-EBUILD sword-isbe-1.6.ebuild 347 BLAKE2B c57499f22e5263d070623f186858b00c8a11becf27d99a90a38f3066acae646ed6f7733f0e8e1ef15cd74e308b46db2c1124cad4d7562ae798721e38e1262a0a SHA512 f0262fbe0fbe40e15ae74ef2aa1b4df6ff2edcb6c16bc45ff42025305ef162ec35621b0cdd44f2503d9a8c45bef310262f94e71eab86c47d74e7b072d2d02845
+EBUILD sword-isbe-1.6.ebuild 337 BLAKE2B 910bc9c567606938ed74e0342932038abd4f3b36b1f80a333a524e2f8d23489b546acead592a1764f820c1c528692d885aed98b19bae690903ff0c23d6dff371 SHA512 4177dc930fc3e8d62e3654519b2b69482807772a486b0569efcbf6056cd1df6295625af0a72a5f3c9c4b78ca30c92ca503abe02f691f9a105ef8bd8e571b0783
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-isbe/sword-isbe-1.6.ebuild b/app-dicts/sword-isbe/sword-isbe-1.6.ebuild
index 952af4c62392..5f4d09df2595 100644
--- a/app-dicts/sword-isbe/sword-isbe-1.6.ebuild
+++ b/app-dicts/sword-isbe/sword-isbe-1.6.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="International Standard Bible Encyclopedia"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ISBE"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-isv/Manifest b/app-dicts/sword-isv/Manifest
index 46b1b8280f45..7fd2873c04ee 100644
--- a/app-dicts/sword-isv/Manifest
+++ b/app-dicts/sword-isv/Manifest
@@ -1,3 +1,3 @@
 DIST ISV-1.5.zip 532601 BLAKE2B 17bba89e7ab93def19ee5f489ab8748eda3c39e7cf779450796c12a3e737949b5dfbfb7c08df9739dfad7279e8e8a896cac0b4227cfa178819652f7add49afcc SHA512 ed0e0fd073f19f8286cd27b7041884ba401374e9a858ce132a2db4c2e9e98d6866d1c0cc368c798b80d25a303167fb4c843db649ec567e94b0a31b10a3da48c6
-EBUILD sword-isv-1.5.ebuild 329 BLAKE2B 422d0525165cf1d22f8b1a5cebcd659fe130fe22b3039d04f3b71750a932ed57b8aae2a19aa04ef4275ded386afb86fa19cd99c655be4cb52ae2f2b2fc663ea8 SHA512 35cb11ef734325414b6e6ef7cf2bbe12991d6856b5ab4aabab36dc485fbfda216a89e870841adb2fecb35ca1396ddf5d0e2d059db242f8e5e815684a604d14d6
+EBUILD sword-isv-1.5.ebuild 319 BLAKE2B 9aa09313ace249cb5fe9365d73378a70afb839820bcbf3aad7b5e0c8d92dfe5f5f8afc1f47780fcba3a798487bd56c8a3699df0b5824c0d4ec15356cc3193028 SHA512 874b66a7e8381e4b69a54578a96071ed05854ee4123cced49fcb47e401994fe62dd15fe28dfc78996825e678c8915a012741b5f2c55df281dd6673468d0c80d8
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-isv/sword-isv-1.5.ebuild b/app-dicts/sword-isv/sword-isv-1.5.ebuild
index 11c8c32d91d9..646eac2588d6 100644
--- a/app-dicts/sword-isv/sword-isv-1.5.ebuild
+++ b/app-dicts/sword-isv/sword-isv-1.5.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="International Standard Version"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ISV"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-itadio/Manifest b/app-dicts/sword-itadio/Manifest
index a7dddc4a8714..8fe3caf19153 100644
--- a/app-dicts/sword-itadio/Manifest
+++ b/app-dicts/sword-itadio/Manifest
@@ -1,3 +1,3 @@
 DIST ItaDio-1.0.zip 1530887 BLAKE2B caef079a979f10dcefc5b3b63f4d3c2455dbcf89241b6afd8186306120f30ed9da51212739d765b98c354038b115be15e3074f6960927762f89a7b5d2cea0868 SHA512 7e2338fa743cd98437015bbd0c52df27999bc70563d7b923b2d23eb60e6f18baa5e272170838662c4f4c20c0d6bb97e4eef4f2460bbedd400ba4be1467ce59a8
-EBUILD sword-itadio-1.0.ebuild 341 BLAKE2B 89c93e34e0246b1a7a0ce0d36a29aa3de81ce544a31e5339d3ae0b16b2ae399631ebe45c2c5f906aebe8dcdd6ada9ddf7d42f474664aa87f413e208d8c1bb14e SHA512 a8d5bf88efef714bad64fe4c1f7455ab27d545e7dd1b86cf65d632d723c56b5fe4111c032495d710f6f776584202db551e513de958dbcadff8fc7dbcbf6ba0d9
+EBUILD sword-itadio-1.0.ebuild 331 BLAKE2B 3f1288bb326f151d0a4da3bafff74ba75c5372c43618432e24ca921f62b32fa7bbb9a8358edced1a4d9b6a27536874f126ebc74162c183d4e35048ae6ef4843b SHA512 065e933dcbc5e6e975735aaf051f39319f38cc96e6c8a0c5803e4a0cb64dc2a5ebcbc89150f6b58970ede4c2d1deabdd698071c9b29a87cb0119e328d8ee6366
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-itadio/sword-itadio-1.0.ebuild b/app-dicts/sword-itadio/sword-itadio-1.0.ebuild
index 619ab890c929..0b42bbddc98c 100644
--- a/app-dicts/sword-itadio/sword-itadio-1.0.ebuild
+++ b/app-dicts/sword-itadio/sword-itadio-1.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Italian Giovanni Diodati Bibbia 1649"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ItaDio"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-itarive/Manifest b/app-dicts/sword-itarive/Manifest
index 453eece0aa07..88a1d92ea02d 100644
--- a/app-dicts/sword-itarive/Manifest
+++ b/app-dicts/sword-itarive/Manifest
@@ -1,3 +1,3 @@
 DIST ItaRive-1.0.zip 1528624 BLAKE2B a1dabd9a299b89b2b4bbc1449a807de407610b50c893abf8ae6945322171b23b1247557735f54f281dc7b6dd4a2589a6a492f2dc5c98f9eec35931ae04e2f197 SHA512 8dbbd97f4a35ec5493dc335ff280ae18054c539d5fe30096b857dd61ab566768f945176c013d57658851826d3874ae944fde111d4c9e89c875dfc55dbd569dc6
-EBUILD sword-itarive-1.0.ebuild 337 BLAKE2B 64c4c14f242bc7f163267d66254a26bf7e1e7c2e3310dec357ba5e655b84677054a91f546a82c8661cfdbffa9c5e996f7f51685265f4ddd00e744def89f07f37 SHA512 9d3972d9768be392e2492b16cdefcb2394b82a7417b39eec475a67f5922c6e59ec740c72d5d850da6d6d737621c2b4b992de61b67eeb256d82778a296379520c
+EBUILD sword-itarive-1.0.ebuild 327 BLAKE2B d0b2a68eed87393daa609d4bb15865c331900e0af3ea53b03dcb54f90435613f829709a52bbf9071f20fd3c7fe3f9f0f95732967a451b20757e79aa71adbf380 SHA512 c711516f67fb625aeda86a73b8b910514bdaae070859980a10a81f435220452d2c3ea310b0d557f2bc3ff23cae761f35dbe21ef97e7fe11d3140224f1d048ff9
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-itarive/sword-itarive-1.0.ebuild b/app-dicts/sword-itarive/sword-itarive-1.0.ebuild
index cb59e8a12513..98542cb9e49e 100644
--- a/app-dicts/sword-itarive/sword-itarive-1.0.ebuild
+++ b/app-dicts/sword-itarive/sword-itarive-1.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Italian Riveduta Bibbia (1927)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ItaRive"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-jfb/Manifest b/app-dicts/sword-jfb/Manifest
index 89536abe1672..1ddc435cdd23 100644
--- a/app-dicts/sword-jfb/Manifest
+++ b/app-dicts/sword-jfb/Manifest
@@ -1,3 +1,3 @@
 DIST JFB-2.2.zip 5949350 BLAKE2B 4c8b2a0732f226fa602beee9d7e241e94f466e3389bfa5da46c97c8a2ff350e75a8481086c72b27660d1cd11bfc03343af2d784d837b6332867856a045e13528 SHA512 adacd2ad40e1a7fdb2d57b7665e675df201dc8de0ea6c3b352dc094e6a54c846efdecd33d54fe480fb1fe08d43df54d28f929ca0a191aa86214475b151c99007
-EBUILD sword-jfb-2.2.ebuild 343 BLAKE2B 74690a2ddb8a149f0c6d1d30fd9ea7be0c69193c89802acccea33385b023d2b926b80cdbce7e64a6a279b5aa9b9f201bd6a879c8e6685a34800cbb0945b4a03a SHA512 882e7700324e0c68dda7cd8120e4c4c4aadebadd00da26ff6a377d7090b93ac855e38af38367fbcac5d5acf2df9992729cbdfe58b24ed824bf4379f970545d9d
+EBUILD sword-jfb-2.2.ebuild 333 BLAKE2B ab083d8dbd9baf9882a98359769c16663ec64c864f028e6c69a487ec1b8dbde4847d34a971da33742bf338141c203d004a995f914f69954abb531d246d52c5ad SHA512 3465be0dc847facb74053ba9ba0642f93be896992322f20c196adb102496d9451a57d2ca6d65ef04c813cbc638622d13a709c24e312c2acdead2517946af43bd
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-jfb/sword-jfb-2.2.ebuild b/app-dicts/sword-jfb/sword-jfb-2.2.ebuild
index 116520117d3e..1f368005adce 100644
--- a/app-dicts/sword-jfb/sword-jfb-2.2.ebuild
+++ b/app-dicts/sword-jfb/sword-jfb-2.2.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Jamieson Fausset Brown Bible Commentary"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=JFB"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-josephus/Manifest b/app-dicts/sword-josephus/Manifest
index 02fafbfd2c08..2bb2a5303b60 100644
--- a/app-dicts/sword-josephus/Manifest
+++ b/app-dicts/sword-josephus/Manifest
@@ -1,3 +1,3 @@
 DIST Josephus-1.1.zip 1633099 BLAKE2B 5e1a5d7e887e13729534f61e41a64cfd0e25f8e1574c6f677122c707885d1acdfd4c34b3edfec5420fef47d4f97b7fcec48fbcabe27a894cdd4b24f2b1087978 SHA512 9f8b4f29cc16d966f71fbe65c583eb7b69e5635f5bafbb7a9b3998d70240807513e9ff0f5f2752dc45bc137f65f74bcf539dda4b97ac83ced41a3b1b2e8c2d2c
-EBUILD sword-josephus-1.1.ebuild 342 BLAKE2B 72663b3fc0a65341db51138eed70b0a1d7ca1d9e5a0e040be469ed51f91f82f575296694c770f0b6b82e4a5203ed036889385de50c826008ff532b41b6b18bbd SHA512 5685bc9a085b841066e5e8a15810683514ffc3c10975583ca3feb79b0062f629fc9e1fc0c77ea173c1cd0e109602d8b0e57d52c2b8d429b792989c89785b7d70
+EBUILD sword-josephus-1.1.ebuild 332 BLAKE2B a3cd6420cb1c865b9f686395e18189bbf3153cdfbad2ac13469e78ca256f2db2d0c7a8e42c30c32855a0a62df65d45e98d7a64c03fd6e27d4e216e47b365b770 SHA512 df69f658845515e5447f6fabb82560959e18b85d8dd2772a307ec03567a6ee850158b6cf8d0c5f5eee775c1c2ab9bafa938f0c88d630051431b67aab60b129f1
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-josephus/sword-josephus-1.1.ebuild b/app-dicts/sword-josephus/sword-josephus-1.1.ebuild
index 1266fb6991c0..70911fc4a11b 100644
--- a/app-dicts/sword-josephus/sword-josephus-1.1.ebuild
+++ b/app-dicts/sword-josephus/sword-josephus-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Josephus: The Complete Works"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Josephus"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-jps/Manifest b/app-dicts/sword-jps/Manifest
index b99209694e0c..71398c9d0c17 100644
--- a/app-dicts/sword-jps/Manifest
+++ b/app-dicts/sword-jps/Manifest
@@ -1,3 +1,3 @@
 DIST JPS-1.2.zip 1086344 BLAKE2B 0d9875acda95a2fc204b9b21ee8828c89bf3d915f7d65543eef27f4ab17d3aa9ba3deb9b909601a6e4ba92aeb4a4e6fa7e9299cbdd4ac323e3692370206ffbb3 SHA512 fcc9dc8b552aa5074aab74086d2e3dd8f12b5419d1d9208bb3ea4bc86117bac5d69e3d3ef118d507317aa076ae1480774973d30904234cc6d478822b324c1844
-EBUILD sword-jps-1.2.ebuild 344 BLAKE2B 3116d4b0c5a3ec42baad13594bf588730857c3cf1890491f168abdab99d584b09f786be56005c0fac82e57425eb9922bd6adc2356755f4ec6effd10265a38a5c SHA512 d4fd91c7d09cf377856e15e8fb63d6dc4f5788d8f10a4ba7ee7f94b08d212a6a663a246847095db228a1b5d80973b77c1d22b886a8461017db8214d47f2ec0ae
+EBUILD sword-jps-1.2.ebuild 334 BLAKE2B 8507db865e486f25b26e8cab621908c2c5b48e2abf52ed93acb9d23442ebcbddeec09344f17cb0fc046f153b8a60f8f8faaa719e0e6ead34d187865d173ca06a SHA512 ad0967a728e136132c4716bc8de0932edc73378339880fa44e9d3294b98756c4ff78ff9e36cdd2887f492e0d9a921ad1bb632fcf6860eabec301f41bf6e68822
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-jps/sword-jps-1.2.ebuild b/app-dicts/sword-jps/sword-jps-1.2.ebuild
index 50d8ff7327ce..e7bc42dec645 100644
--- a/app-dicts/sword-jps/sword-jps-1.2.ebuild
+++ b/app-dicts/sword-jps/sword-jps-1.2.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Jewish Publication Society Old Testament"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=JPS"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-jst/Manifest b/app-dicts/sword-jst/Manifest
index b9aac8427c23..dab75b6f3d30 100644
--- a/app-dicts/sword-jst/Manifest
+++ b/app-dicts/sword-jst/Manifest
@@ -1,3 +1,3 @@
 DIST JST-1.1.zip 1446738 BLAKE2B ad5bd12e82d6aec2bcac4f2052852bbf619b08e9fe135750b0eb6b1fcab31f8acf2227f24a7b2f998eb8b9f9991def6c052619db75b85de251cae1a8f53c692c SHA512 0fe3fdae23d95dcaab3ff7b3a6c7768d4f98e15c2771584bd501e35738f8b1d164c1706ee5d5da0ecc6c62ec955fd23dcd9cb7df55671685cc0d640abd7bed11
-EBUILD sword-jst-1.1.ebuild 328 BLAKE2B 3c5d179b72ae45a0bd1f2098dc06ab8edca6de4acd801445e92587138d5b1f6af6db2cfe6e1367623dc111c8e23732492fc2c54122b13aaf164b0b866e73e3bd SHA512 c2f9fa26c7fc9e5bd6d0f62ee3294c7097156f884435d69c3e6e2b6de6cd4b381a83dbaf148f65d44b7da9f5db452a3a845569904bc4bae39900df0cd66f191b
+EBUILD sword-jst-1.1.ebuild 318 BLAKE2B 14ef2a0505a44742ab7806a8104b3b09ba7a5052f979cf68a7cf54797f04bc86b2abfbdb3269cd5968fab959b3b18d1e9d5f372bd1864b8202454c90b8ed8f58 SHA512 40ed18e4c60027e145d46d5f0c3be57761ee30cf9fd298817716a2c64f60458cf80004c7229746ea46830f281b77fe0df23c493dd292d3c33ecf95bd683698bd
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-jst/sword-jst-1.1.ebuild b/app-dicts/sword-jst/sword-jst-1.1.ebuild
index 1e1d80522c23..6ebb12e7a101 100644
--- a/app-dicts/sword-jst/sword-jst-1.1.ebuild
+++ b/app-dicts/sword-jst/sword-jst-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Joseph Smith Translation"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=JST"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-jubilee2000/Manifest b/app-dicts/sword-jubilee2000/Manifest
index c138058e4a4e..e5e6d6ccb6d9 100644
--- a/app-dicts/sword-jubilee2000/Manifest
+++ b/app-dicts/sword-jubilee2000/Manifest
@@ -1,3 +1,3 @@
 DIST Jubilee2000-1.1.zip 1457787 BLAKE2B 95c846f65b30e053fd4c686577359db7af796a72e7e44b596a463db02eb9e09bc4c4982e5e9ad3fcdc4332514a8e4ecb4046afe7f64cc51aa34beae1a2ff269a SHA512 d8efc7bbf96873bfdbcce77e4747c716cccbea9a47b85260242f114d23763c9c92c1ace50a987ba9c908e92a2379b89f34a057082bb1d1cb6e9718ad3c944927
-EBUILD sword-jubilee2000-1.1.ebuild 345 BLAKE2B ebe986d509dc86d7a7346f7c121178c855f046df6379fbbaa5815d9401314f7070622f126b1f293901fac57172bdd86a4f727165cf748a7af104c2da3d01d1ed SHA512 390031bd2fa2d582f7dc2706b831c5204c431f0c2101dccac97092d8924d7396afd286c6117cbb635b6c2219a88c0a3973e126aaca47640da4938aa4ebcb9f2b
+EBUILD sword-jubilee2000-1.1.ebuild 335 BLAKE2B b8d1c1581cfaf3473f630a3a542fbe4d1b9d7267175faa3167505f60b11c37109c5b15b9884ce4e1f191267ca5d290ddacf03554392a12a1ee6a1639e5f1cf0a SHA512 0381c0c2829119f0de46cff72402ed4e52c015785e55aacffc28a40ae1bc9f53d4d9ff53f3052de78b348f176cc2fbc028aeae691acdc40b7d081aafc18af070
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-jubilee2000/sword-jubilee2000-1.1.ebuild b/app-dicts/sword-jubilee2000/sword-jubilee2000-1.1.ebuild
index c796843a03a4..04b09969de54 100644
--- a/app-dicts/sword-jubilee2000/sword-jubilee2000-1.1.ebuild
+++ b/app-dicts/sword-jubilee2000/sword-jubilee2000-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="English Jubilee 2000 Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Jubilee2000"
 LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-kekchi/Manifest b/app-dicts/sword-kekchi/Manifest
index 4b191996baea..f3f5e55c81ab 100644
--- a/app-dicts/sword-kekchi/Manifest
+++ b/app-dicts/sword-kekchi/Manifest
@@ -1,3 +1,3 @@
 DIST Kekchi-1.5.zip 1676116 BLAKE2B b15c9b40738e306d06837b07823e5bf95bc7355fdeb858af2c6b4aa89c1b474fb40b9c58c14688b1bff90176a03fc0a781a3112fcc3b049f4216115e20911ed9 SHA512 e45f32509e478b9ab2c71cd0abd532784c879608f83602eef548e93d4af868e598ff342fbe4a53100991050fefb06ac570a1389f0849cb27dbbedc957241573f
-EBUILD sword-kekchi-1.5.ebuild 321 BLAKE2B 8d0c778b9a02e8e16c220cd462c456d6a53e1b6a94570ce5e521ba02c6e8623d5499102b8fc2bf5e89348ab0f84f85eca332762de2852b0e549ba4af63aa45f5 SHA512 5230bdbdb01ea8f49139542f706f4713fe43ae8700816bc3af653ed8c4db6ae7ef2fe76ebd0a1b46516ceb71e7d68229d3423e54a483b084602993ad14ba718d
+EBUILD sword-kekchi-1.5.ebuild 311 BLAKE2B aaee011d14c965f4fa31f6e3aeaaf8c894c2f0f4ff97250bf16b33fb66f9a59fc99c2d82016455d6ac23e3ae563b61ac150fb51f0f03e66b0384e00e98050138 SHA512 dd565b97ec362c3ec21e84f1b27a6d9acd922e4e25df562f81b90d71c1f276eeacad31a9bec8e7d8c42ae595fbfedd4cc8f14bddcd0880ed532e1e0b5a7b08c6
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-kekchi/sword-kekchi-1.5.ebuild b/app-dicts/sword-kekchi/sword-kekchi-1.5.ebuild
index afc4c38844b7..601bb0d80f9d 100644
--- a/app-dicts/sword-kekchi/sword-kekchi-1.5.ebuild
+++ b/app-dicts/sword-kekchi/sword-kekchi-1.5.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Kekchi Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Kekchi"
 LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-kjv/Manifest b/app-dicts/sword-kjv/Manifest
index 88ec273d006c..e087fca02a39 100644
--- a/app-dicts/sword-kjv/Manifest
+++ b/app-dicts/sword-kjv/Manifest
@@ -1,3 +1,3 @@
 DIST KJV-2.3.zip 3641094 BLAKE2B cdcd9efa60675075e3578efe5684d7fa7756c6940a365bc623433c370d2a1acd5d4547f7f37d74f92e9a6d7a15587f067e3bb52f4d1496f4be44ff34e2203ed0 SHA512 2d635ef0824994e9fc70e1a8c03323eb346af00b7e4b2351825451a5b045f3e9977c385ce3a3c82bfc1ef9009247aca082a3f755ca781ce71c2591899d410af2
-EBUILD sword-kjv-2.3.ebuild 360 BLAKE2B 47ee63c68ae66d9d04d5b5087c3c5b7ed740814fb25ed1776a91e8d5625f6114ae40a5b3a61622053563140af6c0e5c7d888909dc031a65334410b05febd45e1 SHA512 1788d960eef0bf4d6fd70a8b9836a622789c2fc8766b2b6627c9b8fce4178ce961e9a1c7cace5fe83d880aeb1c4b35095444cf19113580f17cfd24b71ae5f87b
+EBUILD sword-kjv-2.3.ebuild 350 BLAKE2B 77a4bc4adbbe51240e1b9e8c438604b61d25cc7392938228b3520a47def7f4140858f523474640cb09e0d0b9f4887d4858cd94beb0ae2ca3ab0a0107dab51882 SHA512 5a5b92e2396a836ad7cffc25673d20f2681cc576cbef7b2ddbdd051d40f58ba8df80fd5663ad1a1f2f9cd55383ed7041952918e5c4ad0ff32c56017905fc6f7b
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-kjv/sword-kjv-2.3.ebuild b/app-dicts/sword-kjv/sword-kjv-2.3.ebuild
index 5c61de04a92f..0a8c2ebc7ee3 100644
--- a/app-dicts/sword-kjv/sword-kjv-2.3.ebuild
+++ b/app-dicts/sword-kjv/sword-kjv-2.3.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="King James Version (1769) with Strongs Numbers and Morphology"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=KJV"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-kjvd/Manifest b/app-dicts/sword-kjvd/Manifest
index 0d45893945f6..725ab1f2313f 100644
--- a/app-dicts/sword-kjvd/Manifest
+++ b/app-dicts/sword-kjvd/Manifest
@@ -1,3 +1,3 @@
 DIST KJVD-1.1.zip 102890 BLAKE2B 70f9bc653e77209f32983564ab5386101c6d1b60b157b76271cb19dbd9bd709f11878a89319ac9a178151352995565688a82f4689ddcf326c76f4aa78cc2850b SHA512 80f761b4ea83af42d36a46df92002de100ba37cade66d8c06528d0a5a52ac8a029e0add06433887c256771323324393e9bd18e9b1e043768e878a818cc17b9fb
-EBUILD sword-kjvd-1.1.ebuild 327 BLAKE2B 9467a6c6d2e1e02b57825b004d61871957263a2e31c95f9337ff7bce425d349314bed465e99899ce14c1d5092ff413a7d76d16443b9f5635eb52d358ca9551e3 SHA512 20d2bd284420838b9b082e289be0a555979c4eb2a71bd3cd8078e01434b2fd324a6ed0fca672368edd4b5009e3a5fe0882c014d2907fca9ca7d42c4527e78e13
+EBUILD sword-kjvd-1.1.ebuild 317 BLAKE2B d9693eb26cf26102db6956e0452a516abe11d612a78650ee59cd639ee070dc7a784f008118afd9304976fd47c2fe781ccbee4810a77b8460339f73275b957e67 SHA512 6e1667196a77f86f567ac4e11fd320e314f5d7bd8c0ae090983c4aa883e3c0cc5d9bb890579587d9320e520372007ac8958292b0cffa23606f5f2b4219b18b43
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-kjvd/sword-kjvd-1.1.ebuild b/app-dicts/sword-kjvd/sword-kjvd-1.1.ebuild
index d33229795642..a0bbcfc4bcff 100644
--- a/app-dicts/sword-kjvd/sword-kjvd-1.1.ebuild
+++ b/app-dicts/sword-kjvd/sword-kjvd-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="King James Dictionary"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=KJVD"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-klv/Manifest b/app-dicts/sword-klv/Manifest
index f0c20148ce6a..1e2920dec251 100644
--- a/app-dicts/sword-klv/Manifest
+++ b/app-dicts/sword-klv/Manifest
@@ -1,3 +1,3 @@
 DIST KLV-2.2.zip 1519608 BLAKE2B 4026a94af8ecd4196f69690460b34e49ae9b0ae131865ba7841d913fe5a8c76316f9ea2faf0fda8b4a783bddb2ee30494de3e56cbbea54718cd19db00ad72648 SHA512 2c5f3a366363bab66d008e1b774143c9d55d704dcd67db11c46eeaae99d4bb68a2c70e25dd5698bec83d1b82e039e790a525db7d775e5adc8b823c717c422740
-EBUILD sword-klv-2.2.ebuild 355 BLAKE2B f3fe713c7dd84bfee6fde7090c6cf5636ca943c551c4103d3eb3359e3efb08f70d5fe961eb9f3feb7eb91f5cca30ed7ec4609d3ba09f706cb2fbd721ed08976c SHA512 5c7a7cdf151916577284b25843bdaa84f2ae67952e06b4645830658c87774eb2c1fe00a1ee034009afe52b68b02164fa405dca878a2db353522b6887bf43cf2f
+EBUILD sword-klv-2.2.ebuild 345 BLAKE2B 8651f7f4b450a718dbb0b8d8ca73ed5c0095ac416b1a5820efdfdbed447238fb44ebf283d57b75042c0bf7a062d8a75ae64e418035013a389874bc38035c281f SHA512 a669e0ef2cb7843430dd0faf9bd4212cc7b613e0a87097233988c20c2231f36a4ced58cf14d527bff648d602731dbe925811cf34e3d772e67ede82dc22499f0a
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-klv/sword-klv-2.2.ebuild b/app-dicts/sword-klv/sword-klv-2.2.ebuild
index 9a49ac215028..c634ae479da0 100644
--- a/app-dicts/sword-klv/sword-klv-2.2.ebuild
+++ b/app-dicts/sword-klv/sword-klv-2.2.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Klingon Language Version of the World English Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=KLV"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-klven_iklingon/Manifest b/app-dicts/sword-klven_iklingon/Manifest
index 76481894b166..465a5f4bdb85 100644
--- a/app-dicts/sword-klven_iklingon/Manifest
+++ b/app-dicts/sword-klven_iklingon/Manifest
@@ -1,3 +1,3 @@
 DIST KLVen_iklingon-2.1.zip 10484 BLAKE2B cbce36ac41f695efbdb89fe360ee69a4f8d676af4e9d03ea68be2d8360827d8135db1bf8d2641759a1ca88fb57d74fb5fb2a6c29af827e3bb1504136702f80a2 SHA512 7a6422d96e4524efd8f12acb9ae52ac561283db040ecae4127ab43c124b4e26bce584d243ce76d3eb644c3365422308b3087e36e2c59fef66953d8c392c3f53e
-EBUILD sword-klven_iklingon-2.1.ebuild 385 BLAKE2B f527620ca6f993a72d3211971baf69d36318e10feb99cd8e0997c1e8296bd7611b46f295f3696b91909d36fe00e2e3900bd53aa0140fafe158929a873b3647c0 SHA512 654cded2baf8e45b0aae59fbdeb6bef8aa8d3698c1c93ffaa4fe45f36eadc9723f7f414cc7c475247eba13106212657ea1dcb8fa19c5c44c3d6829f6dbbe015c
+EBUILD sword-klven_iklingon-2.1.ebuild 375 BLAKE2B 6783f28fc7b3a5060e26a7ea8b1cf91d45092a2693eb1649d772a1b6d553633b6a28b935bfb2c213cda86d16c1934cad3ee7e5136962c22bd11b1aff70160d6b SHA512 668c10038d1956d01cc2e820b50c65ea404eeed25126dfc7a4681bdc85856bac66c91d2ceb7f89450fc4ad224416b363665a4bcbe6e8a67be5f8ec2fcb6024e7
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-klven_iklingon/sword-klven_iklingon-2.1.ebuild b/app-dicts/sword-klven_iklingon/sword-klven_iklingon-2.1.ebuild
index f33db831bd5c..8eb3c40ff519 100644
--- a/app-dicts/sword-klven_iklingon/sword-klven_iklingon-2.1.ebuild
+++ b/app-dicts/sword-klven_iklingon/sword-klven_iklingon-2.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Klingon Language Version English to Klingon mapping lexicon"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=KLVen_iklingon"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-klviklingon_en/Manifest b/app-dicts/sword-klviklingon_en/Manifest
index 4578ce7a2d21..1b9df9e212a7 100644
--- a/app-dicts/sword-klviklingon_en/Manifest
+++ b/app-dicts/sword-klviklingon_en/Manifest
@@ -1,3 +1,3 @@
 DIST KLViklingon_en-2.1.zip 9892 BLAKE2B a38c7eb5cf290761d8ccfca9719af60d7a8dd955817bfa47d8a423f39ae4d9edb22fa3b486ba1cc506ada15031cb998434f2cb754712922eb570a6a681fe9ff8 SHA512 4e45c5f0e3b2c7b7dadf08141e65e1bc8130ce9c75c56752b9d3216d2dbfaf249e774565d617473754acf4ecd20bacbea4d0789366cbbff15e3c688b18b2d795
-EBUILD sword-klviklingon_en-2.1.ebuild 386 BLAKE2B 834b153b5e418c21fa68c322be375a82023ce35048451304217ea8282da54fd532a235b20afa353544f69ca13e5094ed6477281b4553a195907b5684b44cb8fa SHA512 6ae20b1d562238ab7e3711705a8ee8639d54b8e904941641bfe65883fb760a8655787c6ed64be0191ae8f229cd37c3983e62afb92a925eb274cad3c750043041
+EBUILD sword-klviklingon_en-2.1.ebuild 376 BLAKE2B 3e03fc3e3a41ebc4512440aa4f08f85dfd87fdc113897a2f25ed354fb6f4914aa5207cfff1916d0bd65d9b8633eefdbd43c1bdd1c1ad4ceb46309714fb795758 SHA512 1611e328e7bafea6e3b36b78c3c2b001ae264d184960142a8b7679371b3012bd3b9a1762153817caa340c7f6ef325d06a15ca33a24c068f58269775836d47185
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-klviklingon_en/sword-klviklingon_en-2.1.ebuild b/app-dicts/sword-klviklingon_en/sword-klviklingon_en-2.1.ebuild
index 70cf8f3b2939..1e0993e39a7d 100644
--- a/app-dicts/sword-klviklingon_en/sword-klviklingon_en-2.1.ebuild
+++ b/app-dicts/sword-klviklingon_en/sword-klviklingon_en-2.1.ebuild
@@ -10,4 +10,4 @@ inherit sword-module
 DESCRIPTION="Klingon Language Version Klingon to English mapping lexicon"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=KLViklingon_en"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-korean/Manifest b/app-dicts/sword-korean/Manifest
index 0b291cf676ec..b6274caea582 100644
--- a/app-dicts/sword-korean/Manifest
+++ b/app-dicts/sword-korean/Manifest
@@ -1,3 +1,3 @@
 DIST Korean-1.1.zip 1431342 BLAKE2B beb4eca2d2cbfd95aae113c939003acb835f82689c9a0cbd0732a77ae1e6e3d96cebe540b8ba8f89415d7ee7b6caf64d5e6ae66bec030ce3b566b282f4ac8409 SHA512 5f6eb7459743d37165efdd5c6e042c02fdbb5fa041cb95b748312f5e19045a085ac3439329f4975847e3f93fb3118ca4a49706d9d57166780c3ee19596b73d71
-EBUILD sword-korean-1.1.ebuild 317 BLAKE2B 5544e891336a4c579adde5c5598fa02d91941d73f06c4db4827b1afdb8525d212797e858bfc743422e349f58f95c80c4646b8f4be88ef5c977c15982b9242898 SHA512 cd8c79bd692ede1e274cbbd8101fae946536c26b957c939a288b4a3a77528d3b06b556af3d76df39592f4575bd673eeeb6519a0f24fb71376e6a5595c4de079c
+EBUILD sword-korean-1.1.ebuild 307 BLAKE2B 539f4015d7cedae852ced727175c69a54b685eb2d95234889f82d366ebffc1ac0b67d2748abda522bd509aabed0edbb833a470be22ed5a66b5656d0d35e7be1f SHA512 72eeec87f205320fb7cfe71a442b7b0cd997f836e0bbd91585597818c702e11f13f9d36a4ee671e5564789b077b9c0e9d5a0634dfefe018898ab94af4ac28859
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-korean/sword-korean-1.1.ebuild b/app-dicts/sword-korean/sword-korean-1.1.ebuild
index 2561259de88d..229851915e2a 100644
--- a/app-dicts/sword-korean/sword-korean-1.1.ebuild
+++ b/app-dicts/sword-korean/sword-korean-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Korean Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Korean"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-la_en/Manifest b/app-dicts/sword-la_en/Manifest
index 64346533fd71..683c435f94ee 100644
--- a/app-dicts/sword-la_en/Manifest
+++ b/app-dicts/sword-la_en/Manifest
@@ -1,3 +1,3 @@
 DIST la_en-1.1.zip 104195 BLAKE2B c279d01378d08dbac2f9b588a8bdd7b066eb29090ade3080f79ae4563f97f28166cd7c5f6ad5b735771d1e350b4447c2ce5f747cfc5faf9a7bcb3d490dc588ed SHA512 ebb6345983a533264890b908b22d54b72d1d490f0b37329d1bb202231e3542a848177c78a0c4a1cf06a523a6cdb5cc08fee386901187726419ea7a127c468830
-EBUILD sword-la_en-1.1.ebuild 333 BLAKE2B b8b561e024e8a7656b42bd35fd1dba72bbdcbb9c298187a10cf38f641671089bcec746718a7fac6a440f8dcadf2839af1a0ad20b6a344a1c6a008a8f63c40010 SHA512 65e5b8c8e189301bbce949fc24e1825149dd98f36c817e387cd87c020c9979328b4755bc7e2ad5aa53be184ae7a81545f18b1cf3c0bd408128ad07d368884270
+EBUILD sword-la_en-1.1.ebuild 323 BLAKE2B e18d857ed736e79524838e54ff0b5ab9c38ef8a1f385603084f7fc23374619a16d6abe9d97099f8c9ce858737f7882d61b6f643dedc9d5d50f9f13f5d39e4d3a SHA512 5458a4ace0502cf0fca4c7a6f900dcdfa655b7fb119c1ba22edbf96173bfbe6b9ea80a9a73b9b335b0cd8637a55dffd2f4b0e0370f2da03bebb3452fd4ecc8d8
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-la_en/sword-la_en-1.1.ebuild b/app-dicts/sword-la_en/sword-la_en-1.1.ebuild
index cbaf8ce8c12e..67522d242ca0 100644
--- a/app-dicts/sword-la_en/sword-la_en-1.1.ebuild
+++ b/app-dicts/sword-la_en/sword-la_en-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Latin to English Glossary"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=la_en"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-latvian/Manifest b/app-dicts/sword-latvian/Manifest
index 9a54f6f35532..6652cc787cb1 100644
--- a/app-dicts/sword-latvian/Manifest
+++ b/app-dicts/sword-latvian/Manifest
@@ -1,3 +1,3 @@
 DIST Latvian-1.1.zip 348255 BLAKE2B 6ef050e9b1ba9e6079b1ffb1397063557f62f5921454b38c2a8eb774c86212ae215e0e32db26ccf282b47901fd0eb2d4abd455a11f642d59a8dcfee9710d8989 SHA512 bf2246661bd30c378bfece88127bc83328ad549a3e3f183574f19a408a11d0a3b115b47f3f274057d88d207eea4e76c8c8101014715b891b88a4304bd573121f
-EBUILD sword-latvian-1.1.ebuild 328 BLAKE2B 698685f36d7b6d177c2270337fd7d7acb6986553e4ba9702b477a96fd8bb6a83494c3d92c101c67663be42f9c719cc321890de57ef2252b103673a824ad1c4e7 SHA512 b5f287ce378ccff070ffa70ea779004565e911651381e47dd4dd00f7fe8df1960854732f5094aa1581cc2854faadf990ea4c6fdfdb41107100f07cf7cdce5c08
+EBUILD sword-latvian-1.1.ebuild 318 BLAKE2B 35feb17de0086c76ecd35ed0392cd21870c2b4c679471996f5945ba9977cb13c377e13539320e4229f3d08b4eaea65ee77f05e1db77c17b93a04829b7e4e1a29 SHA512 5140706dd89d7c20a81d0bc3b9b9967801d771fa71a24b8f54e084271aef7f7dc68aaad6a4e74f679ec34631d8a6a0498d774962cb32fd5c6235ee52e1edd076
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-latvian/sword-latvian-1.1.ebuild b/app-dicts/sword-latvian/sword-latvian-1.1.ebuild
index 1a25f2cd8e28..2b9332d80c6e 100644
--- a/app-dicts/sword-latvian/sword-latvian-1.1.ebuild
+++ b/app-dicts/sword-latvian/sword-latvian-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Latvian New Testament"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Latvian"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-lightfoot/Manifest b/app-dicts/sword-lightfoot/Manifest
index 889bcf22a42e..d03d646a3b89 100644
--- a/app-dicts/sword-lightfoot/Manifest
+++ b/app-dicts/sword-lightfoot/Manifest
@@ -1,3 +1,3 @@
 DIST Lightfoot-1.0.zip 644888 BLAKE2B 78ee5fa9de454fe525a75813a6e035bdca26b3df119fff68a169bc42b90c4211ad7b5f273d01f8b56c08c4c422e87ac0f734c43772a1d4e076210b797ffbe161 SHA512 87446451899e6a24198ddbf716a8d4114ccc76d0f68a62dd131c546386cd8deba916f9a47c3fdd6820d2b0669423fdb7eb666878031b91cc36f068305b7c63cb
-EBUILD sword-lightfoot-1.0.ebuild 341 BLAKE2B 0d087781817232afd7b66cf17c85ec0f6cc8ccb5394b2d29ffc6bf627d2eaf5cb96d2d2f74b9f7ca7ebf433a0b6efd4799b6480f78891712117e7ab67da19e6a SHA512 ac12a2fd002e10fc4efe1e8c7df06c8f05e2f21e5335eda55fd761d30ea1c9d8591aa6d41f36b26d92a1452dbcca5202c6d03d6c743d5f1844a38fa6c41dd263
+EBUILD sword-lightfoot-1.0.ebuild 331 BLAKE2B f836aef23744c7a68f9c3316733fc208707d99e7a83441d9d059c3fe181720c2d2a0445d80fcd82594a057d16338d6039a12aed2acbc3ac77bb812d32dda72a9 SHA512 effad5b2dda91fb19116a5271a2f4f2016871b784f83d574db299d416ef9c74f3bd4483ade9367c808c569c1162f691310fd56f792899728d7c4be4fa6321107
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-lightfoot/sword-lightfoot-1.0.ebuild b/app-dicts/sword-lightfoot/sword-lightfoot-1.0.ebuild
index 15c519752cb8..113bed7da962 100644
--- a/app-dicts/sword-lightfoot/sword-lightfoot-1.0.ebuild
+++ b/app-dicts/sword-lightfoot/sword-lightfoot-1.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="John Lightfoot Commentary"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Lightfoot"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-litv/Manifest b/app-dicts/sword-litv/Manifest
index e2a4cd04a73e..5f106fead6e0 100644
--- a/app-dicts/sword-litv/Manifest
+++ b/app-dicts/sword-litv/Manifest
@@ -1,3 +1,3 @@
 DIST LITV-1.3.zip 1435344 BLAKE2B c60241f414a5cc9b747029d65dd79fae0634cf616f5a0af5d0213b9ba171b5677870bf52b4a529b3d59c1193783551f465efd72ff22cee35005e0f59d92fb943 SHA512 9aea030c96277bc591dac7bb45230c2ea006dbd241b2ada7be086a350ab0c5de8face5153c99d46ed35ecb00956f327cb1c7db0ed6f6d4c8ae0334085e6974b2
-EBUILD sword-litv-1.3.ebuild 328 BLAKE2B 2d22f1b5d2d945232d496e0e5b341f38aac3e31155068fa862432563626c9d96f780115ac8fc4136a303d1893c49107502e19985efd2dca2de8fd6b0ec05ee00 SHA512 65cd8199faac63586d4451fba42e7dee87851fe5e87d79fef6bb47f19a0ea72e055f18b88181d17e625f3f97bc6949b0bd7e7a21460582475bd3bcfd1e1709c9
+EBUILD sword-litv-1.3.ebuild 318 BLAKE2B e59812e2f43506e2a4709d18dfb03ae08aa744306e7b9cdf9fe4f6c104f3a0c80804ddb745895d362db42adce2edd33c5b723012ddb584049e3a3e5cf4ae5cce SHA512 e99985681f9a82a3a9a573533b5bd4a5a42f758ea10ae5a14b1c2fa1916c4ca0e6756f37aa621472731cda9214ad2c20cab777cd0790f24c76c84a7783ba6450
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-litv/sword-litv-1.3.ebuild b/app-dicts/sword-litv/sword-litv-1.3.ebuild
index aa990cef7331..4f150b5f3c1b 100644
--- a/app-dicts/sword-litv/sword-litv-1.3.ebuild
+++ b/app-dicts/sword-litv/sword-litv-1.3.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Green's Literal Translation"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=LITV"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-luther/Manifest b/app-dicts/sword-luther/Manifest
index 839699831940..440cccc75488 100644
--- a/app-dicts/sword-luther/Manifest
+++ b/app-dicts/sword-luther/Manifest
@@ -1,3 +1,3 @@
 DIST Luther-1.1.zip 3041937 BLAKE2B f2764b8e4c1447a9b7dc5ccbd717990bca9442cebdda71b408786fc141148a77c5a62055ca9a7df493d9e8f55b1e98bd57222c5883fc0c1a5df6a46c1b0c2867 SHA512 8054679c205f2d498cc3677d7cb71e461a6640f414863077d4680de1474a55b85ca4f1b74aadff4f91b671c4709d7a84ea348d57a57c87ee8b39b1bf75df7c4f
-EBUILD sword-luther-1.1.ebuild 342 BLAKE2B 392047a61b28c3603c52bd07b4dc75d12692080e441ccc35093d30f8fb1374c41f542bb25770a47d4a08766e7553b5dd647f2970e614929a9d84d53c79180ac6 SHA512 010c39639bf0bc9d3405b8b4c748ec1448add80141ca84acf1b78e1bd0d1ef3390ee4cb12664e14d371cbc16f5d4f971dcc011365e258237b20178a00f4bb089
+EBUILD sword-luther-1.1.ebuild 332 BLAKE2B 8ceebc679c3920e544a5b2ffec8de6238e98978a04848e160f441e9ead44b2b7af00fdff955d91804d302e1ea96d3814c2478ef3b2d9ec2025fffb8f74655e66 SHA512 93726fd218104a40e2767995d881dde215aa52d2e058aed84060b920a0cdff2b4bb4f151000d9581da23f802aa403bf39d531592a9f48aad7f0b4e400985a6b8
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-luther/sword-luther-1.1.ebuild b/app-dicts/sword-luther/sword-luther-1.1.ebuild
index bb244c39b0d8..d660ca9bc0bd 100644
--- a/app-dicts/sword-luther/sword-luther-1.1.ebuild
+++ b/app-dicts/sword-luther/sword-luther-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Luther's Commentary on Galatians"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Luther"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-mak/Manifest b/app-dicts/sword-mak/Manifest
index 6984f257eb04..6039d26768b7 100644
--- a/app-dicts/sword-mak/Manifest
+++ b/app-dicts/sword-mak/Manifest
@@ -1,3 +1,3 @@
 DIST MAK-1.0.zip 365363 BLAKE2B 06609b47fdf89b4c1f22df60b8b73ecc7f9935af0a5b45476a8e805256e8dbf11b7e335410d392ef226c19a97fab249648d65496923d743b5c9ebbc5dc318529 SHA512 42bbcefda76fde6638c0951cee412b68ad2d1e3b39519f2c749f77fe8a65a6ddd4a0cd7f41e951c8091ae7120cd86f261ae39602cebc13153ce72fdc1f4b5fd2
-EBUILD sword-mak-1.0.ebuild 330 BLAKE2B d86cb0cf1c6b31a2a84f9c659ff61020c6a66f66409ae23629b253e5ef8605ee4d25525a57728a00737a6bb29bde20aa427896857693699194febb9285a7b6bb SHA512 54b7df5e777a99995cad19776303b8a8a6c72003b0418c42a59b020364d2040b9cfce69dd775f93ea372415f5478e2ec4a006ac446391edd0b1c989d068b210d
+EBUILD sword-mak-1.0.ebuild 320 BLAKE2B 268416991cebf1f5717d7cedfd6191e741cc065bece111b84e2d99b8d3d50086e280be23b931591fe45736569ab52b68acc45fa0646ce8ded5230a6188443cb1 SHA512 a7212a54fbe550e95099e2bc229043204b729f98aa1233ae28dd79c68f641bb9ad93dd517cbcc6a31fe1a9f53d7463472fc404c8b39b5bd16893b5df7f55565e
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-mak/sword-mak-1.0.ebuild b/app-dicts/sword-mak/sword-mak-1.0.ebuild
index 93583742f6d4..a181c1fed378 100644
--- a/app-dicts/sword-mak/sword-mak-1.0.ebuild
+++ b/app-dicts/sword-mak/sword-mak-1.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Matthias Ansorgs Kommentar"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=MAK"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-manxgaelic/Manifest b/app-dicts/sword-manxgaelic/Manifest
index aabddd3b1605..1eb46a066d00 100644
--- a/app-dicts/sword-manxgaelic/Manifest
+++ b/app-dicts/sword-manxgaelic/Manifest
@@ -1,3 +1,3 @@
 DIST ManxGaelic-1.1.zip 152306 BLAKE2B d38d790aa31e6d7f936c409d232bf0009bdb45c6e2a4dcc8dc0f15365e00adc56dfb3aab047b28bcfe1f2b9f525ebcc45c7c9229ed917e17b359e30ee9fcb80a SHA512 1d164c71bb04c57ec9347552904f46863d1596f56819217fbe20aa1a359d386224d02ddf4867fb412b932ab6ec2841f77b623f4bd6fd74f8a4b95ea0e108413b
-EBUILD sword-manxgaelic-1.1.ebuild 343 BLAKE2B 99c788c8f048b5b39cb1b0308f223fec7df25e9824c65e18f91400625687355feac8ef02109ff442655fe159ae54607081a2d43dc87e0ae717651b27983d9f38 SHA512 00900ee6b0c2293242c7aaf715f05f5645a7d7fcedac73c6c1328fec2cab7b30e5fb17d8032ce07dc3590ed86e24ae38ed90fd21e8430e3e27bcc292ecf5cbfa
+EBUILD sword-manxgaelic-1.1.ebuild 333 BLAKE2B 10f4ba0dc7773146705c31bed72bb65fb4e37ac091aeeb977836e3f1a9a382b02e2c86b05b8f6fbdc16b7442d94b79313170618f291ee35225859df775d59b34 SHA512 f4e4f8a8c0ea5df30aa6b017a57952fabc2fff8b51872f578fb66a70fe2619bc960981ca6dbb649baf6ee8552f36f19d77edfb2e704ecbf74c92c407eebe5cb7
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-manxgaelic/sword-manxgaelic-1.1.ebuild b/app-dicts/sword-manxgaelic/sword-manxgaelic-1.1.ebuild
index ba60b92ce138..63f7dcf4c2e5 100644
--- a/app-dicts/sword-manxgaelic/sword-manxgaelic-1.1.ebuild
+++ b/app-dicts/sword-manxgaelic/sword-manxgaelic-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Manx Gaelic Scripture Portions"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ManxGaelic"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-maori/Manifest b/app-dicts/sword-maori/Manifest
index a1fb5fce4217..7752ebdf0981 100644
--- a/app-dicts/sword-maori/Manifest
+++ b/app-dicts/sword-maori/Manifest
@@ -1,3 +1,3 @@
 DIST Maori-1.1.zip 1397366 BLAKE2B da8e3f0cdbb27d2e83558cad74b73c352bf518e4f01ff10dd6c1a58ca2efc2697d5ae2898ff0161dd38bb1f0a9e1bcde0ee411f81a5de3a53fbf205a7400e38d SHA512 366d56a8742262111abcce59b20862428c67269ad0af8acd38d0a847271a220cabb177949dd1df60942c2b606d0011f0340f12aa6489a3d6d12b641d71db1bc5
-EBUILD sword-maori-1.1.ebuild 314 BLAKE2B 192fca565e5c618c156441f3c1a9dc5246d2db85ba455ebec08cd2befa78a10fc021b18f3a762812e8101fde7cf8d4812a3c31142af9c1788fabe17e74489179 SHA512 1d9d6016f6033b4a58d5b4f6cd56245d669c76b172d22534dd668f0296a0a43d2d5199b587fbc98c8df272aa89ed86c1a05b2ccdf95cccda81eab167a16a5188
+EBUILD sword-maori-1.1.ebuild 304 BLAKE2B fe76db4c928e7dc313d24dc91d5d127ebf68a4dbda081ab4219c7bf019cb821990201052ded1d75dba138e405c1bb96a893084704f56b03a4e4455d4887de37c SHA512 e1e7006667bde2384be06f8fead3a21ad309fc16ce6cd75f50de3c560a098cd7ab0c892d65d5bb8cfcdcc9d166f9e8fa32e160d89b37ca011980e8e1674b986d
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-maori/sword-maori-1.1.ebuild b/app-dicts/sword-maori/sword-maori-1.1.ebuild
index 7ce01ee78747..e0b26bc3a293 100644
--- a/app-dicts/sword-maori/sword-maori-1.1.ebuild
+++ b/app-dicts/sword-maori/sword-maori-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Maori Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Maori"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-mhc/Manifest b/app-dicts/sword-mhc/Manifest
index d18a345e01bb..2d04a4192212 100644
--- a/app-dicts/sword-mhc/Manifest
+++ b/app-dicts/sword-mhc/Manifest
@@ -1,3 +1,3 @@
 DIST MHC-1.6.zip 15828741 BLAKE2B 96560c963e870ee3de18263328a1df3a50697aedf858250f321414d18bed37efdebc2547ca7fd7702ae9c2427174ee132795a13af33cba1ddff778814680d9e0 SHA512 f14f59588f76a0d4b463190bdd3ff8b3e2e16b2252999c83a2e3f0d3442019c4e52730234a5a748b19fdd5e888cb509b0555b1f95ade0562199b081c6977646a
-EBUILD sword-mhc-1.6.ebuild 358 BLAKE2B a2ebd0bc8bd1b46960a81284740b06ea9661fe695ba65d0cf87fd4700fe4d1450f42a039b09efc9a7638f5e2885828f16a8608f18ec91a1322a14a9fa50d14fa SHA512 be79dc6fba5da3092f7afd2b9b937547a18b3cd1f648240d30ba0f60e412434aafd1035498a77833063ebbf298ecd46d0c1c364f8c6ba8d78866986e22638732
+EBUILD sword-mhc-1.6.ebuild 348 BLAKE2B 89a7d82fcd76c3140514c245c6f9a559831ca7a69bee539f2d67ef5a776165c48c1f7818a31e74a2aceef791f2b6e40c1bb609b388fe965ce43c16f3e449abc9 SHA512 c2fd29012a156a9c4241ea0325909f339259715c0e0c9ba37e4d72c41bc0b2abc319f5b65d3a8835636f930e8863626379a411b0ade882d06ac243659afc26c6
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-mhc/sword-mhc-1.6.ebuild b/app-dicts/sword-mhc/sword-mhc-1.6.ebuild
index 6b2bee15c6a0..89792a83782e 100644
--- a/app-dicts/sword-mhc/sword-mhc-1.6.ebuild
+++ b/app-dicts/sword-mhc/sword-mhc-1.6.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Matthew Henry's Complete Commentary on the Whole Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=MHC"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-mhcc/Manifest b/app-dicts/sword-mhcc/Manifest
index 99b1f9667603..3ae9aa15a70e 100644
--- a/app-dicts/sword-mhcc/Manifest
+++ b/app-dicts/sword-mhcc/Manifest
@@ -1,3 +1,3 @@
 DIST MHCC-1.1.zip 1457031 BLAKE2B 8c796089ddda8c442bc853b024853405fe062fca44c26fac77a77f394c64436e3ac7b806dd0223785255ebca3c9c3ade4c564cfeee6d8943ea36260935ff908a SHA512 de427b7fc70d66f47105cbd84286ac7ce6b0270fbb06ab1fdc829ad99c06de380ee198a52cbdfa56b4c50e7ccd8d57f41228accf42ffcfd2d3d614997b807109
-EBUILD sword-mhcc-1.1.ebuild 359 BLAKE2B 53f8eac9d73568c1c198da9ad57289dd15c1653dac98e5ab33631f790b16575cb16030b2e866e095e08ff2a0f97512e6e596fdfe23c458cc62b504d3bea84ef7 SHA512 dc546929ad3c21e61af2a803415707f587e290a9855ca98147733050c81828b289977d606fb100ac94c40edd9609b54849f6e2926dd8b678744ebd8529ac09f1
+EBUILD sword-mhcc-1.1.ebuild 349 BLAKE2B b4d04a6478ec7534a130be7af02bdb808f1890c3a63bf3dea013a1d013417b83285a154bce944dc436006d6616cd1e09a17c957092a7093d953c3e0d6be08c27 SHA512 2d432e87f818dc6ab875a437c80859536d076ecd8af2e184b844a5651fc90d9cd41ac2f1632e0203d236d4a3bd85a49a59fa0e4dd93daa044fa62d7598078396
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-mhcc/sword-mhcc-1.1.ebuild b/app-dicts/sword-mhcc/sword-mhcc-1.1.ebuild
index 5a80aae6eff9..524de381f25a 100644
--- a/app-dicts/sword-mhcc/sword-mhcc-1.1.ebuild
+++ b/app-dicts/sword-mhcc/sword-mhcc-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Matthew Henry's Concise Commentary on the Whole Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=MHCC"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-mkjv/Manifest b/app-dicts/sword-mkjv/Manifest
index 592324d27cf8..eac53a4e962c 100644
--- a/app-dicts/sword-mkjv/Manifest
+++ b/app-dicts/sword-mkjv/Manifest
@@ -1,3 +1,3 @@
 DIST MKJV-1.3.zip 1429038 BLAKE2B 50b781f6d6cf9a792eb353c8022a454a3da3cfe0e14facc4fda53f6e4b619f0f07e341258bcd258f9b3291ea7e67542f23c82ff1b9b08950272b80bf41f2b5d5 SHA512 2a6efa4f270cb783e122a73f1c66795237edd73da030b00654ae2e4ad43dc11ed4b9c59fbc0f64a9c3528bbc5f87ecdab207b24406a77714c7fd642e9e0613b4
-EBUILD sword-mkjv-1.3.ebuild 334 BLAKE2B 3ee137e24275394a13f44f8a244487afd9fb0f5db254260a1c39d3a9f3104a1be07f9ae3cc19a27b12bac7db84c27b7f5072d13aec1f1280b73da4171eb4ce43 SHA512 3896f105fc572e3ad818f12f1592f1dde8acaf21c46daa3f4e1600a1aafbcef8caf8472c22038afb97251d620671e293c05ecad22e1aa519e06011db03594013
+EBUILD sword-mkjv-1.3.ebuild 324 BLAKE2B e5d651f2de04ebd8b61592328e376aa0d0dfb82f534864ac2dc4c7f86931d8546592b5b0e9fb6f924a94ec9f6ad756fe80fa1c1c5f86360ab7c0d396ffd650c2 SHA512 e0bc6cddeb94c8ea5c8bf993f25efd115b97dc446d887ac02c350ee9c70ba5c4388fc537ee92da19c68a8380a4cc8e67e72751b55dd6c41a2c1add0dd5d3aafd
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-mkjv/sword-mkjv-1.3.ebuild b/app-dicts/sword-mkjv/sword-mkjv-1.3.ebuild
index 706b9190385c..983ef93197b0 100644
--- a/app-dicts/sword-mkjv/sword-mkjv-1.3.ebuild
+++ b/app-dicts/sword-mkjv/sword-mkjv-1.3.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Green's Modern King James Version"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=MKJV"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-montgomery/Manifest b/app-dicts/sword-montgomery/Manifest
index c0c560d84bf9..f0763a39a705 100644
--- a/app-dicts/sword-montgomery/Manifest
+++ b/app-dicts/sword-montgomery/Manifest
@@ -1,3 +1,3 @@
 DIST Montgomery-1.3.zip 385461 BLAKE2B 945090c8a527c97aee35b05c2c640ab85f1a44f3f77bbba75e6fd091c256185e77c02fbeb27c502ccb07ce3124d3210c2acf6b1dc9eab64ec21e39bdb17c281d SHA512 29b434a1904c37d80b4d7f9da23f0fdc680b77341753bb35a3ad3e0c687683f1ee6cb2516b56761cec61366a606847784aa6336df6cff2e930b36726427f1b43
-EBUILD sword-montgomery-1.3.ebuild 337 BLAKE2B bd01ee847db0a087c1d00f4274fb94ced3db209e2ff1492ca8e9de1e32e6cc9c0594e2514c5d12f43e21ea481b3afa9e68845d333d5a58bd03d31c154d2b343b SHA512 55559dbbc8840f5f345cc776d25a793823d7026ce3ca0e36b826bb04fd260ad65da53749107d58b34e5df499a905ad38105d369df34986ec0643be8ed5e96800
+EBUILD sword-montgomery-1.3.ebuild 327 BLAKE2B 6d549f320c873e386b6b97b317ccc20eb0e02fc370987b6cf324fbad1179924e3848f0812875d314f6b26b0c8eb253294da5c20c7a34438ec2e3cdfa9bada309 SHA512 a0626e2d07effac3f7e4055050b07aebfa21ce862f79d2327718d5518932605152c49d6e41b63d575e265dc602d16d50455ea89ee9e4c4655b1ae50c69f663ce
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-montgomery/sword-montgomery-1.3.ebuild b/app-dicts/sword-montgomery/sword-montgomery-1.3.ebuild
index 41687518a816..b33ad2e6481c 100644
--- a/app-dicts/sword-montgomery/sword-montgomery-1.3.ebuild
+++ b/app-dicts/sword-montgomery/sword-montgomery-1.3.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Montgomery New Testament"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Montgomery"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-murdock/Manifest b/app-dicts/sword-murdock/Manifest
index 79a4a91a4c76..bfb22dc3a11c 100644
--- a/app-dicts/sword-murdock/Manifest
+++ b/app-dicts/sword-murdock/Manifest
@@ -1,3 +1,3 @@
 DIST Murdock-1.2.zip 396395 BLAKE2B 9b14f7879a1754f1addb1e85024a873a084d560a2179e21124d59cd8ae5eb16fdb972241fd3c2eb786c3c17e81a9a64d6605459c96c631f5092c1d23ca3fb21c SHA512 a6d06a5157c6ebcb0b3d7689e76b5d04765a602f334b937d65260a4ed89cd92b316f0d792071a574364a501b55a449f9bb1af123abd05a49f2af7d87dddc5d02
-EBUILD sword-murdock-1.2.ebuild 357 BLAKE2B 770819d21b6b24bc559e00dec3ab96105307a822689ec53310e38404ffb0342b715a356c20b8ce9d5f0401b49875bba4722337c329920aae35977f91f91960fa SHA512 f8581c079a4d568c3b082f24b7eb9ef805d36eebca451c8f6acb0d6300a887aa306392c08636d7edcdbdd1111eba80abbc4bb3e4910d4da3e788cb8d7639a918
+EBUILD sword-murdock-1.2.ebuild 347 BLAKE2B e8ec8b2275b8e5182477f8bb7091d383fefb72610bb8c0d3e6d2b9f32bf330193bd6367432bda458f33978e39d5e674a1495623eac6a223d5fdaf3cba364030e SHA512 2510fb06a765e9ff4031cee68f72b2bc3cce99e2dd2afec67317abed59f27622d3b59363a51d632b4faa9dd995fa4166a824a0d1c45be1234c705e7e13465776
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-murdock/sword-murdock-1.2.ebuild b/app-dicts/sword-murdock/sword-murdock-1.2.ebuild
index b4932f56ebda..6982de32947b 100644
--- a/app-dicts/sword-murdock/sword-murdock-1.2.ebuild
+++ b/app-dicts/sword-murdock/sword-murdock-1.2.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="James Murdock's Translation of the Syriac Peshitta"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Murdock"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-nave/Manifest b/app-dicts/sword-nave/Manifest
index 3b5534f3c848..ff9196db6743 100644
--- a/app-dicts/sword-nave/Manifest
+++ b/app-dicts/sword-nave/Manifest
@@ -1,3 +1,3 @@
 DIST Nave-1.1.zip 662427 BLAKE2B 6ef9c8b76812cf216bb1fc62b69419c3d181baad08fb95a57a012dd3e73aa605ea4c9e7651eeb561cb4be0b1fc81151ebbbe943a60cca43eede73f88ff67d7a2 SHA512 ed8aa568ff19ebf51d1e62697c8d74f5fc808fe27f2027d7772edfc7893722fa8ab63af6b0a0d2e20679fe856277d776a33ed72410f62bfa880ea322f3ed037e
-EBUILD sword-nave-1.1.ebuild 326 BLAKE2B 6b82bbad7e97222365079ba024977d7759d1a9279ffa1e06aa1e39c9752b60b8d62242f77fa5222f6511661732ca04e0fd9c138b09da6fa86ee910f843a59938 SHA512 0529511df9066e58154d1702a9dd82bec3df8aa079b332fe2fa8fcc720253808b3886eba974405030cefa79a47a9a20bd97bb500cda741937ad137d848f39547
+EBUILD sword-nave-1.1.ebuild 316 BLAKE2B 5a096fbb15b681283329819b5911dd86e88c27806f03112ca5d04f061d02200f91884b869127543a94666f1051c80ab9375c8a14f2483c6b90c485fd54800337 SHA512 b8ebaaef51d5b9eacf4a7322ed0d0f97d8ec2363353a5341b3fbe01e9b9650e6c863bd772a3898bb27d55a7cad81ca23455a2514d1f94973e83cf4cfe003135b
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-nave/sword-nave-1.1.ebuild b/app-dicts/sword-nave/sword-nave-1.1.ebuild
index 701e4296095e..6f1ffcad34b3 100644
--- a/app-dicts/sword-nave/sword-nave-1.1.ebuild
+++ b/app-dicts/sword-nave/sword-nave-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Nave's Topical Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Nave"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-norsk/Manifest b/app-dicts/sword-norsk/Manifest
index 77b06de876c1..998a66b6890a 100644
--- a/app-dicts/sword-norsk/Manifest
+++ b/app-dicts/sword-norsk/Manifest
@@ -1,3 +1,3 @@
 DIST Norsk-1.5.zip 1418861 BLAKE2B e915b99acbc957b07a1a562c4eb6fee50e9ac3f5a81564676b18693ab43ef494c355e9a150955d0ec3d83df9618dda41e94e4691b80200d0d159d89ead79fe77 SHA512 8244cffd408f286d6b7cac59b1f40d208aabc50b1728c993bc95dab0808b0d866f30710b13b63dd70cc1e8f36cb6fd4a8ba787688b4eb632784139cf25542c43
-EBUILD sword-norsk-1.5.ebuild 326 BLAKE2B 52b865757b0c314bfde3268710858f3d61973b38bbbc20f2c16c9055d6281749c71024100c30489915b3aa532642ba4756881d67f75f6dcd1eb72dba1f0b191b SHA512 2b0aec2216400c2b674beb3043d415455479c6f4f33d9e5f2cb9bf6e61b6d176f45e59f0c79a14ab50d3fc539517edc29d583060b8824cfc4fc381aa27e909f8
+EBUILD sword-norsk-1.5.ebuild 316 BLAKE2B 20d0b4fb3cf330570ef47fbdd485f662d53672ba6116fcadd19782e1c6be761a16134709c4cf44ae9287bf74b9ad9740ecc98d8cffd96fef5155fcdb0f1b1d6c SHA512 330f792e09ad69af902659a33f1213c1a7a7a819f187f3189e07c66ff8472b6f3e1c5bc9350b455670e1b85b2b9b375c1d5a0363942b495e6c04ff3e00cd8801
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-norsk/sword-norsk-1.5.ebuild b/app-dicts/sword-norsk/sword-norsk-1.5.ebuild
index e4a1b9d6beb4..67c1d093fb51 100644
--- a/app-dicts/sword-norsk/sword-norsk-1.5.ebuild
+++ b/app-dicts/sword-norsk/sword-norsk-1.5.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Den Norske Bibelen"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Norsk"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-orthodoxy/Manifest b/app-dicts/sword-orthodoxy/Manifest
index b15b8d2468fc..48f4036730bb 100644
--- a/app-dicts/sword-orthodoxy/Manifest
+++ b/app-dicts/sword-orthodoxy/Manifest
@@ -1,3 +1,3 @@
 DIST Orthodoxy-1.0.zip 130248 BLAKE2B 1da096a0c35c12e83bbd33daf0ee6ad0a4410b316a53e8aeda32f95fe36a7a385b85784a1b127bec0aa1eea8b0a409802aff62dbb32b4ee461a0e24b5501e620 SHA512 64f411ec2bfc44ddedc47281a52e9ede255c6cf67ad90b8f98d1047bd9db295f7974f196f25da728179926b147cac3f2303f55760daab97dc5f7aee56cb33116
-EBUILD sword-orthodoxy-1.0.ebuild 362 BLAKE2B 8c7cfcf88ff0e26e21174d1895aec52452d36fcaad195e3ce412ea761d38c448053f5ff2882cf260abbcdefc318fb08d719b6a85fd394487a844d23918e7e427 SHA512 f1e07b54d21001af86e5ec9041f83efc9c352d62fc3f220f3a8d67a8f39a9b93db128a3386e8ec55a4d96736882ae0ad879aa014184655a2cad7190e800247c5
+EBUILD sword-orthodoxy-1.0.ebuild 352 BLAKE2B 4aa83838307fb57797c9014229ef8a2327612d6bf19bf8f901947cc88c0b68c1a2bbd146b6c4e2020089b78035285349dc895470b0f7b962e4b57a0b09f1d717 SHA512 9030da6ec9357b8419d92a642d9ceac32bf977435d02c0fedd6b6640a7a0ff46e9ce345ad91bbc9833f0476b6c221fc3160dd74df7ea242806a278bc4e4f42c9
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-orthodoxy/sword-orthodoxy-1.0.ebuild b/app-dicts/sword-orthodoxy/sword-orthodoxy-1.0.ebuild
index 2ac782bd2c46..8995a9d06430 100644
--- a/app-dicts/sword-orthodoxy/sword-orthodoxy-1.0.ebuild
+++ b/app-dicts/sword-orthodoxy/sword-orthodoxy-1.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Orthodoxy by Gilbert K. Chesterton (1874-1936)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Orthodoxy"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-packard/Manifest b/app-dicts/sword-packard/Manifest
index d83b44271159..6d92e5348022 100644
--- a/app-dicts/sword-packard/Manifest
+++ b/app-dicts/sword-packard/Manifest
@@ -1,3 +1,3 @@
 DIST Packard-1.2.zip 27893 BLAKE2B 7722b24e15080e932da5852fdc73ffaa77db6bb2a5435ca1b1a185eb83c67332e7bc44b6d00c975b78f114f16b990f0d30c8705ef0b20e85e65357283bbf61fc SHA512 b1e93cbcc385856cfc0bb98d223fbc2e47c800e9ab1b50ac64d9ccdc792ca8d61ba4000811fa5de64970766a44996a69b87c9825d79aa539af34857da0ee82c4
-EBUILD sword-packard-1.2.ebuild 350 BLAKE2B 4b078336f4ec4822116a898ce7619b7d2e5ed211701ce9a2bb987aecd6f9e0de553beaa8458a75858e0aa75706e348dbcbda435d1266b9a2775c66c22635f1e8 SHA512 414607ba4315117aecac9bc4694ea00b5e3099e5cff7c26b13a867e26d851da85d00efd757ed1426cf4bd29991d8610daed52d91ca9d0ec6b346acc34e52cccf
+EBUILD sword-packard-1.2.ebuild 340 BLAKE2B 0c473769a3baed0a457eb74ad3f55fe070a0115f1bff729d04dbe6b713219a42dfdbe05c9ccae561c79dfe0bae49c8a062329c8df65691842edc63222da53083 SHA512 ffde96977d380c9ec9594ab915a3831110d4f8dd900ca8cc98c611aa2e2eeb7f508cf6cc503d2d8b456c3b555d3d43f35d7a04204563b652c1ef4d3076564d79
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-packard/sword-packard-1.2.ebuild b/app-dicts/sword-packard/sword-packard-1.2.ebuild
index 37c6bc431644..6c66a4c486b2 100644
--- a/app-dicts/sword-packard/sword-packard-1.2.ebuild
+++ b/app-dicts/sword-packard/sword-packard-1.2.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Packard's Morphological Analysis Codes"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Packard"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-personal/Manifest b/app-dicts/sword-personal/Manifest
index 4cd7ad37e55c..a77124d6d5ba 100644
--- a/app-dicts/sword-personal/Manifest
+++ b/app-dicts/sword-personal/Manifest
@@ -1,3 +1,3 @@
 DIST Personal-1.0.zip 41316 BLAKE2B 1ef0fef2e3fffad81a6638105f6a0e487d03c1c288fb7753b1d03aa7b67a110e119d821ab70e3243d79fe3f6750c66675c95ce40f6ff37296ece8800242b80fc SHA512 514c61c70493015698752f1c4adcd1030bd87e7457843e50d8ba5583a6cbbabc87a54cb97285de03aa36112dfc689769e867f1ef40d61ef43255a429653b2acd
-EBUILD sword-personal-1.0.ebuild 333 BLAKE2B eefc3f6c600ab56b2d9b5c7d05a783ccf09937d2d06fed198b668f97787e4da9c97920a3b78c0c7d76ceaa219519f0b5233138f319393a69c71678356c7e110f SHA512 a97d70899fd33e95805fd5f5eee0277e5e9f3e872b4a2ec463739c57eafbfa6df6eaeb12a23a68c4cd2abac16b62159595799a96c934d61635a2d2e6ec714e49
+EBUILD sword-personal-1.0.ebuild 323 BLAKE2B cf371dc485891b3c8e2ba7cb6c9cbd8bf987bd24699c53dc5c0c5eae0e9bfce059623ed3dfa8a0bf1a92170d2d512944b370ea22271f8a065a5dcc708d623e88 SHA512 940dcc52edf955e63e0317baa7327c77a241931f55a1ddb68e861b09629c4152043beac495cdf345b64a76fd97da40d04df877c80d83895f01ac8347fb4cecc5
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-personal/sword-personal-1.0.ebuild b/app-dicts/sword-personal/sword-personal-1.0.ebuild
index 7c0b704c859f..b45030f0823a 100644
--- a/app-dicts/sword-personal/sword-personal-1.0.ebuild
+++ b/app-dicts/sword-personal/sword-personal-1.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Personal Commentary"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Personal"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-peshitta/Manifest b/app-dicts/sword-peshitta/Manifest
index 0ab1ae050fe5..fa79e931efc1 100644
--- a/app-dicts/sword-peshitta/Manifest
+++ b/app-dicts/sword-peshitta/Manifest
@@ -1,3 +1,3 @@
 DIST Peshitta-1.1.zip 308669 BLAKE2B 7a66088615c3180f45300d2ed7ede4dd1b26d0e6c542981b002e8f18982afdbb74463bb37df88cc7b483ca95dd3584364d0953aea44e25cdd3964018ea5a3a8e SHA512 0d25a25c65421f5538be69991d56c0cad3ac749dc3e85dd4004b029827a3d6796c5e713975c2af88820f97d672925443ebe05ca61c0f2f379f6dc3dd4271b5b0
-EBUILD sword-peshitta-1.1.ebuild 329 BLAKE2B 66233c4d7a27bf79c0609937efa27d4888ec89c5c31f98e8ad311a5e3588238b5d68515a32aabaae9443fff15cf30ae451eff171fb73c0834c674b6410abfd48 SHA512 3bcae62f7f2929c16327f6aff5d31558d9648e549a7151bb526fa277959e3caabcc382b7810e6d67f9a61b2fdda2acafd1fb0c08e5f5f80dbcf8248620aadca8
+EBUILD sword-peshitta-1.1.ebuild 319 BLAKE2B 3107e02a634f9f2dbe50635c072b516e0e33b59fb5e597b89ea2e687435c18d1aabbf09688b0d0eef6745ca6e757b208c6419c3d785844bddea6e81e06fe68e6 SHA512 124a6b49f5f731ff6c55d45f05fd9e52e61ee1bc52887eec5eacc455b712cc7535b417f4ed64d1e40fade8dde5d17626ce9bff2aef8c3b86bf5ab445ddd0ee1d
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-peshitta/sword-peshitta-1.1.ebuild b/app-dicts/sword-peshitta/sword-peshitta-1.1.ebuild
index c374aef3e4a5..6a1400e1562b 100644
--- a/app-dicts/sword-peshitta/sword-peshitta-1.1.ebuild
+++ b/app-dicts/sword-peshitta/sword-peshitta-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Syriac Peshitta"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Peshitta"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-pilgrim/Manifest b/app-dicts/sword-pilgrim/Manifest
index 206b27f7ec63..ef79d0d51ede 100644
--- a/app-dicts/sword-pilgrim/Manifest
+++ b/app-dicts/sword-pilgrim/Manifest
@@ -1,3 +1,3 @@
 DIST Pilgrim-1.0.zip 217617 BLAKE2B 26fe745917c62836105d3368a2289523d6be07a85dbce5173ced89afced018fcb41062aeced697d5e0586ceb6a5b450385a007f735d171f5bded2f5f9b80667c SHA512 15d31dbd20ee66ac661f16bf04c41a4fa2f7110c310914d38a80e0e879d8a86a2731056be3e465d416bd6ea5e07c19742f3079eb1245bec08a744527e3e48b56
-EBUILD sword-pilgrim-1.0.ebuild 361 BLAKE2B 7c061d22841dcfd97bd96198cd8b326e353fb946d45b8120e1688c1a3aa63fa2100c040d86f5eaf895ab14c523b721ae1b948c20a59bf1aa186afdd6c98513a0 SHA512 69dff8bbc8ac088815c7dd93a81eaad2ab6b7af78d0371a6d8c94e23ca7fce79010ac941f2cd9aafb5dc239dd1625927b6ef02671f6f434164051efd8708b359
+EBUILD sword-pilgrim-1.0.ebuild 351 BLAKE2B d9fb440adb9b3756316cd6e55723ddfefc79c1c7679f875beebb30ead83f55303d169052d3386f36b4f49c12ec956e71d911e9f681476ec4b77fc921b8b9d125 SHA512 a73a7b2a201b5fbe396934473b034b909ab5dd3b9646a59493538a72647afda9743c51e3c15094bd7f0bf17129cc77e83cb8ed3363b92fac1171268e946b2994
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-pilgrim/sword-pilgrim-1.0.ebuild b/app-dicts/sword-pilgrim/sword-pilgrim-1.0.ebuild
index 897efb929268..9dda23ad8a94 100644
--- a/app-dicts/sword-pilgrim/sword-pilgrim-1.0.ebuild
+++ b/app-dicts/sword-pilgrim/sword-pilgrim-1.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="The Pilgrim's Progress by John Bunyan (1628-1688)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Pilgrim"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-pnt/Manifest b/app-dicts/sword-pnt/Manifest
index b31f08356919..db060c33b051 100644
--- a/app-dicts/sword-pnt/Manifest
+++ b/app-dicts/sword-pnt/Manifest
@@ -1,3 +1,3 @@
 DIST PNT-1.1.zip 871337 BLAKE2B c5e71dacaf6560c27966d9889ba4a24c95e1fc83dcb85707faa395fea1204cba2c971db9afa9baa2b2ef958e89b76c8ec4068aac02dd736696e41dbd4b4ed5ba SHA512 22bf6934d126f83b2ddbf3a585373adf55dc6d582ed223ded3d52b2c957fec644874273c8c1d2d6ffb09c671485df8bc2e8b9d388ef49a70c772ffc2c2ff5ca3
-EBUILD sword-pnt-1.1.ebuild 330 BLAKE2B 19ef822cc44327b7e98f2759be05bf79455e53cc4a3f0b72304aecc93f00aef121bf884bc933edde272b8c09137751417a28c589e1167a2922df124897b60edc SHA512 238510f70a98dae8a999d95886be61e5ffd021a7174bb15bb963799a1dec6e1f05ad8b7c759e934ca66c7fd71470cc9ded8411f825ba1a1a954955f770899371
+EBUILD sword-pnt-1.1.ebuild 320 BLAKE2B f01268e5ce45b737d9ec6f62363fbccf2738b81a7581732abb8714fc023e3042ea51a44a945fed2914f8ca05d8527951c1896ff17cc6115a9ffc394141255d56 SHA512 38491a8a87f66b7d0a25f13a20d4509c728ad540a71445652c26aca7c0518048fc415506841db71ab93d79b07f8369f9af08f843e0734043dc1146a554d682c9
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-pnt/sword-pnt-1.1.ebuild b/app-dicts/sword-pnt/sword-pnt-1.1.ebuild
index 10181e4deee3..98079d481da9 100644
--- a/app-dicts/sword-pnt/sword-pnt-1.1.ebuild
+++ b/app-dicts/sword-pnt/sword-pnt-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="The People's New Testament"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=PNT"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-practice/Manifest b/app-dicts/sword-practice/Manifest
index 8d65e756d942..2d96a871dea1 100644
--- a/app-dicts/sword-practice/Manifest
+++ b/app-dicts/sword-practice/Manifest
@@ -1,3 +1,3 @@
 DIST Practice-1.0.zip 24766 BLAKE2B 841ee1130900e89f7324c51782fa89d2d1039b7509fa5690d2ce0dcaca370c33cd6ff921095d00d0650627cc952a96491968353a8da2df237a2cc184c58436ce SHA512 fa41824d0534df638920657cf2608d8fb5997036090bd662e6b2cc79085d9d9efd351aa842f86609c90f78f15651c450819564fa01117e98049bd1fe81c4a9e6
-EBUILD sword-practice-1.0.ebuild 377 BLAKE2B 5b64645d9767d4cbebfc10dab2570980c9a3ae93b577203c8bba13d3e59e841e1b40bf478b59cd908ee1aa8cf41c37015283014ea05a8993a54e54503eea3ca1 SHA512 d3eac37b2f78f024c8811c84137c22d4435805d0b851f349e5a933893e4a35f69f2c66c93c3eed25adb02270f34159f7e163ca185f8926a55664d2b9c513f4e0
+EBUILD sword-practice-1.0.ebuild 367 BLAKE2B 2370253f91c11655f971ecc2a593dd71fda21c527809302e882222b61adeb5359989e1502e2442fd817dd2b42db32ed7bb74adc4c536871591cbba17f5817d51 SHA512 2026e4af8ac7a5a3120f73f8878b80bfe578a1c20f8c58d8084f91aecd4e2354a808ad1f782a46e32c5b3f3f7743219aa5057c7de308c9a3235b703953730382
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-practice/sword-practice-1.0.ebuild b/app-dicts/sword-practice/sword-practice-1.0.ebuild
index e638e41bf038..41cab547082b 100644
--- a/app-dicts/sword-practice/sword-practice-1.0.ebuild
+++ b/app-dicts/sword-practice/sword-practice-1.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="The Practice of the Presence of God: The Best Rule of Holy Life"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Practice"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-rkjnt/Manifest b/app-dicts/sword-rkjnt/Manifest
index 44339cafeefd..b6170132d694 100644
--- a/app-dicts/sword-rkjnt/Manifest
+++ b/app-dicts/sword-rkjnt/Manifest
@@ -1,3 +1,3 @@
 DIST RKJNT-1.0.zip 354676 BLAKE2B 7243eccb792f63312db64cbc36d22da0ee10e2bb952ad6029f0cfebba868a733931ac93cdc87d4ec0ea0685b41814ba5cb7b6c8b82e7af6b39436b03229026e2 SHA512 b33cc6c420740d7dba7d6638bad5275c636f06f561c19bd67bb7b3d004059528e06383cebd63baccced3dbea9ee1879671c432249187dccd5fc1ae987b227218
-EBUILD sword-rkjnt-1.0.ebuild 340 BLAKE2B 2cbb5de0ae6f85da68ea1ed530ca47de7fa247e11f6ad0184e938ffc589253e580db61f580547ca87523680eedf1bcc85461a061084eaff170aef48aa2c6ab62 SHA512 40a71d7063d00da44097f20d3708bf20e76d95c143f35b43d43575b33807e9ed5e06e823eb2b396488b7601cdb065d871c1bc101372f222a9e51f46bbcd8fc74
+EBUILD sword-rkjnt-1.0.ebuild 330 BLAKE2B b6efcb6e600869f399c9985dd6c0a50a0f8769f2235a2a62a84775d8203b6a830e7c34d53665acb69741f14d7a9b1e1f5023cce7922c2de58331f434cf6d1515 SHA512 e27e80e0141c5fdf7e458568c8cc3bce505a7ab73fc3b27f8a618fba4e36d2e0be6aeb53d6ed7233f91263b2411975c3ce8247ab76848fe323e0ba5909c50d91
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-rkjnt/sword-rkjnt-1.0.ebuild b/app-dicts/sword-rkjnt/sword-rkjnt-1.0.ebuild
index b0df94c0845f..3057c3dfbfbb 100644
--- a/app-dicts/sword-rkjnt/sword-rkjnt-1.0.ebuild
+++ b/app-dicts/sword-rkjnt/sword-rkjnt-1.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Revised King James New Testament"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=RKJNT"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-rnkjv/Manifest b/app-dicts/sword-rnkjv/Manifest
index 72c4b1d6f185..1c967f4d0e02 100644
--- a/app-dicts/sword-rnkjv/Manifest
+++ b/app-dicts/sword-rnkjv/Manifest
@@ -1,3 +1,3 @@
 DIST RNKJV-1.5.zip 1471699 BLAKE2B 24490b0e82393cbe7daef77cf23f3327ee5dac9372f2126324a18df9373357e09dc827f63bc763dfad0dabacbe9dd70976b84b00c7acd7ee5f5e52afa9209c4e SHA512 7d160f0cef81770083ebfc573f2c41ba54fb3b07b944336a7e69bbef848e84678c115f0790ddb3a91a216906a371d6b7069d1470fe30039e9b94ef6c59dad6d7
-EBUILD sword-rnkjv-1.5.ebuild 335 BLAKE2B eb1de04ad601c2bffc8f84872ecaa34c026937a923b3c7959966b55833c2bb384746711604dd6678ffe70322237d2d019f9f442c474a7d0ec2cc2a4580721194 SHA512 e5297ce9892cb124794af0a8a94cef432bf45324702a53faa1ac3efa279c50cd6e91221e55afe33a738b3bc8299e4d04d8f31aac5a90a090bb825cf98147293a
+EBUILD sword-rnkjv-1.5.ebuild 325 BLAKE2B 2b4489241dc4b6cb757007ff0316c1806d0744bca935e9eab37964144e0d5a1bf6443ed61fb5ceda3874df5545ad5b701c10bb2c89a12117dbb8da509bbc62c3 SHA512 6bddb21c73b65d2ea1ada1106b5cf436ad6b5975bcec2ccc60bec5b9033377ca5a8852ca135beb2c0d0f1f5c7b849e2e557c360a5b77f8825b8de41855376dce
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-rnkjv/sword-rnkjv-1.5.ebuild b/app-dicts/sword-rnkjv/sword-rnkjv-1.5.ebuild
index 8766dbd8353b..1493098729c0 100644
--- a/app-dicts/sword-rnkjv/sword-rnkjv-1.5.ebuild
+++ b/app-dicts/sword-rnkjv/sword-rnkjv-1.5.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Restored Name King James Version"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=RNKJV"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-robinson/Manifest b/app-dicts/sword-robinson/Manifest
index 9dd4cd3699db..63927e0b0eab 100644
--- a/app-dicts/sword-robinson/Manifest
+++ b/app-dicts/sword-robinson/Manifest
@@ -1,3 +1,3 @@
 DIST Robinson-2.0.zip 31613 BLAKE2B 422a0d2a38628130e09441c18ea0b1f33cf0249a19d8073dc17dbce70e449cdc664d2808057ce5da6448ce2a62b23a720ba32c9ce423e191367e0b19adfe71d7 SHA512 c9921b605b5c429a7ded38141620874bae5a222f8aa7b0afd5c1b4000b66d0a5010c18a87c2a8d450dfc8f0e27360f47a8670e78633f8aa7fdbe698c4e5a991d
-EBUILD sword-robinson-2.0.ebuild 353 BLAKE2B 63f10a62bc22169942f1ca08c1b0428ca2663d419d495502bbed874a972bb34f037be7bbcf99a09d81c799da173c8626c4eb1a2ddda27a3e4be184d01ef503ba SHA512 02c3a851d301d83ebdd6fdc8fba0b95cbd6a1155fe47ef2b82f935612e9eec843d7aef3acb589c1ac3c7a7c29de1e1c5254b9296a1f7a209405fc57327775f0c
+EBUILD sword-robinson-2.0.ebuild 343 BLAKE2B 7eebc235717644c663921956ff03311eb10e34f6e7a3088c884e4bf205f21c74ffa04130446cf771c4f5014a8975fb6155ec5350dd8492d68c4d00fbc25dc162 SHA512 2715134f0e7e6ee6242fd414241fce5197572b900f07efca970ffb59a1f840183ae763a09287ffdcb2908e935bf995df44bb42fe8e8de6bc332e626fa2a5faed
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-robinson/sword-robinson-2.0.ebuild b/app-dicts/sword-robinson/sword-robinson-2.0.ebuild
index 9d2e5ab9c6d0..dbcd04594a1f 100644
--- a/app-dicts/sword-robinson/sword-robinson-2.0.ebuild
+++ b/app-dicts/sword-robinson/sword-robinson-2.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Robinson's Morphological Analysis Codes"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Robinson"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-romcor/Manifest b/app-dicts/sword-romcor/Manifest
index da613b6a311f..47442d5a42c2 100644
--- a/app-dicts/sword-romcor/Manifest
+++ b/app-dicts/sword-romcor/Manifest
@@ -1,3 +1,3 @@
 DIST RomCor-1.2.zip 1515933 BLAKE2B f4f7f375b2f597c050cad704de22d875b8979e4047d2225ef3dcf186a907d628a5256c3dafb53042c783f938ce8acd69a7b5f19b36ad1f17592e35d2ed303136 SHA512 fec3b7b3d5c2be28544a3a599a826417ad549ca7ee21fce5870566cc20c00b0445f9d4f9024ca1c0886de382cc63066cb3f53f9d9e388ed6e1f1013070f2a4a5
-EBUILD sword-romcor-1.2.ebuild 332 BLAKE2B c00a6047ead648c22f7922175fbd8c458623830cf2130417885d4c103f9df9f91c2b5f4de60827b0103c3566f2f7b9e317c77d3c903a08ff1629393a1f166f98 SHA512 2009a7c06aeb65f61584c200a87f8ccb4d22779630311beed38f8cd190e226f4e23e5f6ada04ec6ad475db05b30c0db9e419003f35aa9cc4a62e161212d8c993
+EBUILD sword-romcor-1.2.ebuild 322 BLAKE2B 91252e8c778b4072b0be948988f3e50fb31f7c56f96d9ea0da41b0e8e51484534fe80df513695410271ca1726c2d181f252b97aed32ec8736693015d8fff3a4c SHA512 74546b993d1c28ff9ccaec648335671df21be536336387adc167dbb44d1fe40bab5b5443252dfc9991c257a412299a1aa59cd20149a99c1abd6fbdffeda2bad9
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-romcor/sword-romcor-1.2.ebuild b/app-dicts/sword-romcor/sword-romcor-1.2.ebuild
index e661c0372922..2970f04a208c 100644
--- a/app-dicts/sword-romcor/sword-romcor-1.2.ebuild
+++ b/app-dicts/sword-romcor/sword-romcor-1.2.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Romanian Cornilescu Version"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=RomCor"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-rotherham/Manifest b/app-dicts/sword-rotherham/Manifest
index 9699b901c605..df2c22e60f3f 100644
--- a/app-dicts/sword-rotherham/Manifest
+++ b/app-dicts/sword-rotherham/Manifest
@@ -1,3 +1,3 @@
 DIST Rotherham-1.6.zip 1579317 BLAKE2B d1d1bb11fd28a55c39dd211c5f15387d9512ef33bf95eec226e634d1a2bc59aff6fa024993c1e93409d1dc8b3ef07cb233527a88da5a5aa699cfb1d4d019151d SHA512 6a5122884fade9bfa8ce4430a35da5cf0593cafd1d6ed380b9c6455ea6033345d06a99e770cf1d823b3f88dc294550b52063ebc660bad10f1c8211675ac424e6
-EBUILD sword-rotherham-1.6.ebuild 355 BLAKE2B 6d81ec295249a3478d1d71fcc8afb33f478e5dc25d6b38f5927a80039b06d618449e322f4a5ed4249af76e145829b736ce73dfdb4b976542240f44ec3bf69adb SHA512 1c7f4b6f02464283cddc538976f6dff948ad2db3a61a5a62504e246a34cd6647b7771c94368a7fe3210ea242d2f01a5a32ef424e991177ef200b1ebe9c890eb8
+EBUILD sword-rotherham-1.6.ebuild 345 BLAKE2B a29c0d216b9a5129a0f8e4d07a60df9102cdf8bc627cceb7fdb6ebc324129a6b1271730bda5fce51b9cb038bbb4fc97a5c21399d2adaa9b4dd23b4aa064f358e SHA512 3e4057582a5a81925ee674869a6bce85ea85b7336bf620a874d003985f89d20fe561c99785ab5d5bd952e23a8e218af07c22a8c90ff00c11679413841bd70718
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-rotherham/sword-rotherham-1.6.ebuild b/app-dicts/sword-rotherham/sword-rotherham-1.6.ebuild
index ef0e1cde8414..fb821c602b25 100644
--- a/app-dicts/sword-rotherham/sword-rotherham-1.6.ebuild
+++ b/app-dicts/sword-rotherham/sword-rotherham-1.6.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="The Emphasized Bible by J. B. Rotherham"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Rotherham"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-rst/Manifest b/app-dicts/sword-rst/Manifest
index 414f3ee9b909..4670016f58b1 100644
--- a/app-dicts/sword-rst/Manifest
+++ b/app-dicts/sword-rst/Manifest
@@ -1,3 +1,3 @@
 DIST RST-1.6.zip 5813471 BLAKE2B 498c36b5551829e359dc25c6ef2b2e1296bf23f2375bd8f602750d8a5e063b7fb883b206de70624d0614794882afcbc702404d9ae779c89f322346f06bd2601e SHA512 0d66eee67f2a4fe3db06ded456a6e97812de349546b33821708f93a1072a85ed19b3e2792a5daba3dd38d2bb17246abb8b9ac1b0154e68afbd52fb049bf80385
-EBUILD sword-rst-1.6.ebuild 326 BLAKE2B add9b15f08e62b5dcdc49f17309c282cbd668dc49e02c3ecf122b2dcbebcd7cf2152f18fe53414ade97800c09604c9a253b8b316f113d0dd7fef89d2e2b94482 SHA512 f5de2665732a7bc2858cb21a8131a4de4fb35a00888438769eec10d34cc5de1cfe47c46a6e0ffa21207fbbdf366582acfbda3fb30dde5148ca9ac133f13c553e
+EBUILD sword-rst-1.6.ebuild 316 BLAKE2B 373e52138f62a5b089b234aa8ed98dd78035f94ad70cdbcf3b0f9be268cea9a4b2bc7ed04c5092e6c2d81f591adb8d3e6f7b1f029351efea35a3e99e67c61cb9 SHA512 515b54790cac62e0e1aeac5c21cd8e60e700177f9c24cf4a220c932dd851efa20dc149749bb506de26e8e3aacb003b6e7477fdbee8fa746588bfc28993f96833
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-rst/sword-rst-1.6.ebuild b/app-dicts/sword-rst/sword-rst-1.6.ebuild
index 7f2909dbf44e..b0d3c1cb25a8 100644
--- a/app-dicts/sword-rst/sword-rst-1.6.ebuild
+++ b/app-dicts/sword-rst/sword-rst-1.6.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Russian Synodal Translation"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=RST"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-rusmakarij/Manifest b/app-dicts/sword-rusmakarij/Manifest
index 2cae2694a088..e7bf4deab488 100644
--- a/app-dicts/sword-rusmakarij/Manifest
+++ b/app-dicts/sword-rusmakarij/Manifest
@@ -1,3 +1,3 @@
 DIST RusMakarij-1.1.zip 308240 BLAKE2B e3b4a6aebec982e27d7da3af7d378cfbe3657e8796eedcc6c4551e425fef647acf284d86b227c1c3cda7df8728025d188793d9432101b60a434fde3195419c3c SHA512 88446e27cf2a8a4533a55692a0bdf4b8560be8124190a85f39a460b09927f8150ff773ea81c3429528f8012f6369ab8e4de4f1cabc2a9836f2a3376d9288e000
-EBUILD sword-rusmakarij-1.1.ebuild 347 BLAKE2B 44d57fdfb0dfb7473a51aee78d0600d23b56641a80de61399067f628942bbb6733ac84bd12f0a43d13fd43040e9b75e253eb02c6bfa2ada7e17729af043644e0 SHA512 30e62aaf50c5bf1c439f41c6092c6297f03b8c2e85cbe12361e257956f8a342c7d91f3ad4ec3b74e8f426580677935d2538a114586c98979198589bf0c50bd0f
+EBUILD sword-rusmakarij-1.1.ebuild 337 BLAKE2B c64a6052aa921bcd50e4b6aa85b73fbac660b4ac33e86628e6da3a0a0180dd47337180a6f8f7fcb40d2f6c2d83e6db0ede25ba3c3668424fd4caa8fc6254dc6a SHA512 a74806e2c489c71287f841f519e19f43aeff5adf16e30ad9fb0ac8c72775c249d3cae060ae41801c80f0a2a8544383bcd6416086c4300a312a6523789dbce60e
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-rusmakarij/sword-rusmakarij-1.1.ebuild b/app-dicts/sword-rusmakarij/sword-rusmakarij-1.1.ebuild
index 99f3d8afaaba..bad6452585a8 100644
--- a/app-dicts/sword-rusmakarij/sword-rusmakarij-1.1.ebuild
+++ b/app-dicts/sword-rusmakarij/sword-rusmakarij-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="The Pentateuch of Moses in Russian"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=RusMakarij"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-rwebster/Manifest b/app-dicts/sword-rwebster/Manifest
index 2cc07770d8b0..be157046810c 100644
--- a/app-dicts/sword-rwebster/Manifest
+++ b/app-dicts/sword-rwebster/Manifest
@@ -1,3 +1,3 @@
 DIST RWebster-1.3.zip 2317707 BLAKE2B 904a6cc65e283c5f29c1e078050748a78cd06cf1c4f5617413aa2f9ea72cefb2b67359d187969855c70853fa9ae81bc7ca434a7784cb73f1855e4f8df655d879 SHA512 21686879638c7bb577c561eb14be30d3decf794996b5ffe2925cf1b0c66d7a6cb775dd08e307f6815b54ff8147e49c8f3fee32b18bb446486c6cc3d636025495
-EBUILD sword-rwebster-1.3.ebuild 339 BLAKE2B 5cda714aad81282544c832eb902e6a0dbfa7651b7a3c56afdeb133e650f0b4e5c1ff4b9ceda4779d2e154646c9508698cd3357b76340289b23a9d7be3e8f9ed8 SHA512 167a4218d9f5efac1aa0e8e70a46433ebb4287427b9645e1d0c72bb306c579258a3b807d2573e990888cd6a3ab9c023d924ec9c423df53166fba8956200d91f2
+EBUILD sword-rwebster-1.3.ebuild 329 BLAKE2B c566e918949e6b5cb4324dde5e3c44e3f508918e7d731fd165ce1d6679169ce7c115b96c67cd650351955c20588292890d4634aecde2fc5c475359fd74370f80 SHA512 c03c0611e2644418b1a83e31024071abbfe5c2c5111ef76c7d829e0b6b193d1fbcefab647af805f1b2ae90c16e20426adcc233d22b985d887bb37c96a254fd93
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-rwebster/sword-rwebster-1.3.ebuild b/app-dicts/sword-rwebster/sword-rwebster-1.3.ebuild
index dac403af0aa5..074fe30f5a98 100644
--- a/app-dicts/sword-rwebster/sword-rwebster-1.3.ebuild
+++ b/app-dicts/sword-rwebster/sword-rwebster-1.3.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Revised Webster Version (1833)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=RWebster"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-rwp/Manifest b/app-dicts/sword-rwp/Manifest
index eb1fed850e88..c75c0581bf9a 100644
--- a/app-dicts/sword-rwp/Manifest
+++ b/app-dicts/sword-rwp/Manifest
@@ -1,3 +1,3 @@
 DIST RWP-1.9.zip 2728649 BLAKE2B fb56c04304799784f55a71a11ee3dde448eaaa7c6294c13d4c3043ca156ba34326913f90b329801de70ebc715cccc01b74d064db0d6cc34d19f70f6ba9864bf3 SHA512 b3e8cbc5fb01e98776bac4c0ee7744eede1c7a1a9a41dfc72f53b55c3169b729f065e317107fb7e8ef4a2bc2b79c0fabeff1adb1b89150fd12f7d5ae22d7cc7b
-EBUILD sword-rwp-1.9.ebuild 342 BLAKE2B 0350ff6464bf2961691608713ad8f46e9f6067838df8e81b08060c04234c3f6b3f718c6895c2e27eaa33c0fec453b69af90e6fc2417614629a9e8eca114c84d3 SHA512 17756bba9d0392980643efdb6a16d95d3286b8c1cc03a7a16858bb057479106a1cda913d7bbfe969a463d197f8cfac7c496d4eda77e9b17de952dcb7cc60bba7
+EBUILD sword-rwp-1.9.ebuild 332 BLAKE2B 0a81407f0f6dd05bd34e10d629ebfea12a6b888bada64cbe2ba58634f69c7fbacb28c28aaea1d9000956ef34b8cdc2340f616203fd24d03ecd28a618209a39f5 SHA512 c0da71b17de77f770027586a62748833018fb1267871d69b98aca9a38e938cc68d8c31b04dc7bfbb4ea47b12b26fa1b0a4bc1b7f2f735875709cf28fe62f38c7
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-rwp/sword-rwp-1.9.ebuild b/app-dicts/sword-rwp/sword-rwp-1.9.ebuild
index 74792e5a4ef6..ef61772f9b4b 100644
--- a/app-dicts/sword-rwp/sword-rwp-1.9.ebuild
+++ b/app-dicts/sword-rwp/sword-rwp-1.9.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Robertson's Word Pictures"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=RWP"
 LICENSE="public-domain free-noncomm"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-saoa/Manifest b/app-dicts/sword-saoa/Manifest
index 357f2d9a9e10..59f344742849 100644
--- a/app-dicts/sword-saoa/Manifest
+++ b/app-dicts/sword-saoa/Manifest
@@ -1,3 +1,3 @@
 DIST SAOA-1.0.zip 37734 BLAKE2B ce13584b014e7e169720b74feae3e9a8964f5e27c55607465bdc81e300d3ba0d3a726a1dcad01b79d5cb79f601c521047bc77059c7e0487c31f2fc9d73019151 SHA512 dea46677df4e2bd782afe533f55fcd48bfe758a243daead261c4becb74f43f1b3a03285d1602a60f02975b4d6ebf2f078ef13ee6b75cbe5362cb6f2a212ac5a1
-EBUILD sword-saoa-1.0.ebuild 335 BLAKE2B 558fdd31fb767d50a434de1bf128199fde66fa5b112e87e5b102b69664b69e086672ba5b5a958c4cc6854daf96dd97c5344f926007ea42ce4d490a14a23c6525 SHA512 62d75a1f0a0c5ea7c1bb3b63aa4f0fb2ce2ff123f449f761b55568b8297791c583a8b7a508af150b4c3ea059709606c6e9fc4c00896c7bec59e955302adb1a9e
+EBUILD sword-saoa-1.0.ebuild 325 BLAKE2B ec67954359e538977e02c900f0768ffda328850a3fb1e6ac58353c6729c17a3406f1cd01710c5b5641122884167217f7d6b8d1ccb378d4788f26e584fcc45a74 SHA512 cfb976dcd4ffbd11500faec539f9d71a754ae504d22e423f50a1a8bfb40da8e6ac8a5e5fba81fbc0ad09767931d82f1eec6fef2c47e10edcc29f88b8b07d3570
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-saoa/sword-saoa-1.0.ebuild b/app-dicts/sword-saoa/sword-saoa-1.0.ebuild
index c7bb917408ec..23ed6947991f 100644
--- a/app-dicts/sword-saoa/sword-saoa-1.0.ebuild
+++ b/app-dicts/sword-saoa/sword-saoa-1.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Scripture Alphabet Of Animals"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=SAOA"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-scofield/Manifest b/app-dicts/sword-scofield/Manifest
index e2ec50425f90..53cd5636828a 100644
--- a/app-dicts/sword-scofield/Manifest
+++ b/app-dicts/sword-scofield/Manifest
@@ -1,3 +1,3 @@
 DIST Scofield-1.0.zip 404670 BLAKE2B 00e9633956f7ff4b96bf4333c374bd587ed90895249334cae2a7ae2326b7ed8bf03247f7b7667e1fe9741bc8777a105bd17f05f64ddf02536c597eb978ed2988 SHA512 ef2c233354d04abd354711c6dd0ed4c1f59a18c68c23c3d09cd3bf24fd0f78f5525dc8d0c569168159d60fb8fb2d0bd370f4f3411f671f99943e5350fc8d0078
-EBUILD sword-scofield-1.0.ebuild 352 BLAKE2B 3f3b239ed6847be1fea4b303f66d89c3c589fc49b5246a2781107274a351273fcb721198d0ba907fb6261bdb9214a0c7266da6a986b15bc0de70c70e99182480 SHA512 d300d92652d4b601a036de9a423077d137d0bea2998c30ed8dcdb840e828f0a156bc4d6d46c08ad79f0a327a706d627a1a0eef519f07765aed5737929b838c76
+EBUILD sword-scofield-1.0.ebuild 342 BLAKE2B 003dbe065e558919afe9cbda7cca9f5d2b3b0d9657eefdbdaf9f9cf6ee76b9e663bfcab83f3aa48c546f4e4293cb27cca3944ae58705621f976733fe8f811a3c SHA512 aa86f72e9e39e13bfa5cceba80ba8121b5226c112b52e06e8958761072e908a7e006034e6b67ce829b5623305501404a99b20ba9b46edb15111b2873867e026c
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-scofield/sword-scofield-1.0.ebuild b/app-dicts/sword-scofield/sword-scofield-1.0.ebuild
index 2db7885ee985..49e873a45a19 100644
--- a/app-dicts/sword-scofield/sword-scofield-1.0.ebuild
+++ b/app-dicts/sword-scofield/sword-scofield-1.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Scofield Reference Notes, 1917 Edition"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Scofield"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-scotsgaelic/Manifest b/app-dicts/sword-scotsgaelic/Manifest
index 5a3768a9f4e7..e5db8b3ca9d6 100644
--- a/app-dicts/sword-scotsgaelic/Manifest
+++ b/app-dicts/sword-scotsgaelic/Manifest
@@ -1,3 +1,3 @@
 DIST ScotsGaelic-1.2.zip 34708 BLAKE2B 654e551cc009a703418ec0c7668d3ecd7d94ed2b1100338b0da8475a6a32e177f91c122e7e14d6048121868cb411febb68cfccccd9cbf4538e1cd7b1bb29cf6f SHA512 2b0114b9e98352f11ac0672e334bde5dbfe5441cfcf62f07b806674043270084ca72d582b4e2ad95b4f287d16c71a1fb0603e1e313ef8e37f2237e5fd10c4295
-EBUILD sword-scotsgaelic-1.2.ebuild 342 BLAKE2B 548d41ce478c66dff2fae33bc6230703a6d50395fc2182b945de0514151b4303b13f14b16685950f2619e0f69246234090ea21e2c8151ce076120c4ac19bff85 SHA512 4d66859ec95d11a57ab6a90633063b841c4b78cc89896846594e68737e8763c8843fa83b5955b6c207528fe1a80f21caad5a8a7d49227696345473879bc8e96e
+EBUILD sword-scotsgaelic-1.2.ebuild 332 BLAKE2B 3a6e9ab475c5ad3d5f3cebd59e534567d7141fb07339587d8f98d2cf1b0201f1a3c2c19a69684f1bda235c642dc823a7bd4f598bcd8f0fc9d59bcaa9349e0084 SHA512 9b3b1224f07eeaf466798a3046cb800aac3550c171270638e2624288e9e332e809a51dd8df696db1cd148205b79c19f072e8dccceff3c32ec4f7308c2fb4d449
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-scotsgaelic/sword-scotsgaelic-1.2.ebuild b/app-dicts/sword-scotsgaelic/sword-scotsgaelic-1.2.ebuild
index 0151d6552e58..16301fa7d4d0 100644
--- a/app-dicts/sword-scotsgaelic/sword-scotsgaelic-1.2.ebuild
+++ b/app-dicts/sword-scotsgaelic/sword-scotsgaelic-1.2.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Scots Gaelic Gospel of Mark"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ScotsGaelic"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-sme/Manifest b/app-dicts/sword-sme/Manifest
index 5c56d5e08123..9039c2f7b9fa 100644
--- a/app-dicts/sword-sme/Manifest
+++ b/app-dicts/sword-sme/Manifest
@@ -1,3 +1,3 @@
 DIST SME-1.7.zip 588738 BLAKE2B 67bd2bdc21498265e911ef0cc6f6806a8a7ebb1dbc2ab8ff543881e584b9eecc801fc603f28e33e7990b599774ed6e5e5fb5bba836924a9b6f88d606765e95f5 SHA512 f40f7b04275b90ec74e3bbd91e1b3a139960e3a589c4ccd4a2b427474128410df08dff68284ee7fa0c74ad4f02b01e0b00da16533337063667dbcfbfd7a94368
-EBUILD sword-sme-1.7.ebuild 355 BLAKE2B 416cc123f439cb0d421325108031b47c03943dc24cba0e58cb33fac3884f96abb973928ae012d58ca8f929df31b87ffcdc6724c82b34a6abed64f1489a8a5c4e SHA512 da779e8f9c7d39c8638fd5f2e879f6003355517c1eb6948d23b4b87e42b592dc223112514f65641c32adfed9acfd0239d402aeb4e661aa084fc96453477aebe7
+EBUILD sword-sme-1.7.ebuild 345 BLAKE2B c2720038e26c8716d765ef08f9e7537d18129ab340b318d04d51125ed9d2747b47a738360db8512331663c096f5484e600621d1f0d4562eaabe3e91a70fbc74c SHA512 96250ff738acf27f8519de8baff8545f5c53730b34d924bed3b90c844016a55009fc2050f29b3eb1aa1077e7ecb9ec487304200c2c0ff7d51cce08ab190ebff3
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-sme/sword-sme-1.7.ebuild b/app-dicts/sword-sme/sword-sme-1.7.ebuild
index 17459f21a8ad..e5ad823ce86f 100644
--- a/app-dicts/sword-sme/sword-sme-1.7.ebuild
+++ b/app-dicts/sword-sme/sword-sme-1.7.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="C. H. Spurgeon's Morning and Evening: Daily Readins"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=SME"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-smith/Manifest b/app-dicts/sword-smith/Manifest
index 1cbf45db7335..c03465f0b239 100644
--- a/app-dicts/sword-smith/Manifest
+++ b/app-dicts/sword-smith/Manifest
@@ -1,3 +1,3 @@
 DIST Smith-1.3.zip 1209276 BLAKE2B da3a00002eba8ec23dd81812206d65f502f3bc437d167ab12b0b8e7b6f520eba67e1b4e26f824dd0866c93d9d363ffb9ddee2d064ddd59bb7c2d00de2cabff33 SHA512 a6bc89fcb3ca1e5561e03c38d84d46433fb4d3e5766ec0bc8651c4898e057a6437c6c5816bd472a21a5f1a8f1f2d06eb4d442183903dec584ba15fbfe62d600d
-EBUILD sword-smith-1.3.ebuild 332 BLAKE2B bccccf58f5e6a20291ad0f7f9ce2a71eed3c5175f8724f214eb76e3397fc22514bc30271e20518d9fb6cc8196bb93f1ecdf64a5e54411fd4d93b339e5072a88c SHA512 1293caa7882f24026bc60da099f1b6f0729b5dd2fe8289e95898cdd6e68298c981b89a33134c9c5cad8893a7d1ea57bd9c797957d854cb794f897915365b3a38
+EBUILD sword-smith-1.3.ebuild 322 BLAKE2B fc261976711b856e8567102dd0f440e08d0d4a4184886a736776873350879348b915be5e8e14f470d7a4fe45a9514566bf0bf30faed19c571945f9a49bf6ca4c SHA512 cc24a975686666a1a85475a41f2c9f036a0511b7ba56fe186ca869d8f49bb5813aa3393bd0288ed1cbfb2eeadfe91a79d5bdf9df490ab7c2715c11fa33a426f1
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-smith/sword-smith-1.3.ebuild b/app-dicts/sword-smith/sword-smith-1.3.ebuild
index d63d2e6c3911..4db40589206b 100644
--- a/app-dicts/sword-smith/sword-smith-1.3.ebuild
+++ b/app-dicts/sword-smith/sword-smith-1.3.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Smith's Bible Dictionary"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Smith"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-sparv/Manifest b/app-dicts/sword-sparv/Manifest
index 364286c4c8e9..876ff491e6eb 100644
--- a/app-dicts/sword-sparv/Manifest
+++ b/app-dicts/sword-sparv/Manifest
@@ -1,3 +1,3 @@
 DIST SpaRV-1.5.zip 1469089 BLAKE2B baec9ee474723ff6ff8c9ae7c8c31c6dcd7d6e055f149a93d9cb73bd0d469e2ac31c7c2290a3fccea317679d6263a900d5a4a487f1a06d32e5da84cbf0451f2c SHA512 99fbd0021e1e3a335068f786631bd173d7bc8f21430f7f04bba08e27f9734e0cbbedbcc7c6971368d0e009f1e2fd82536201fce686f9e4bb77d1e44fb3caad1c
-EBUILD sword-sparv-1.5.ebuild 323 BLAKE2B a93bf8435a474406622e42a8748c9e4f13f6d92b3a35ef3d265226b45171ed432ca74dfacea3a760d4d5d75a426ac4a787a549153ee3d7494463fde49f7799cb SHA512 689d1c240e4767c9cb43cf690b3dbe8f5251dff555d5b7320340f3d2d4620322237d79ec8fe0804d85cb7f5b08dcc8a874637c69753224cf9d1e81c1a6c88b25
+EBUILD sword-sparv-1.5.ebuild 313 BLAKE2B 52a3a5e0e2a33f3387f6e30f723ab8aa514872194b00e47d2dd59a74f46896b25270342c8c3328999d1494ab25998b8756bc127c8e165c1bdda0624769cb3dd8 SHA512 95a0228abf26f70bf12d6a3e2a74655cd6bd9f2cba1b0a875f8975999b9b70a87cc9e9ae3073485a0474b61edc96ca7e8e16d75a1771ba47fa7f8a26c1036172
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-sparv/sword-sparv-1.5.ebuild b/app-dicts/sword-sparv/sword-sparv-1.5.ebuild
index 493c5f604af2..c0aa849ab1b4 100644
--- a/app-dicts/sword-sparv/sword-sparv-1.5.ebuild
+++ b/app-dicts/sword-sparv/sword-sparv-1.5.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Spanish Reina-Valera"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaRV"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-sparvg2004/Manifest b/app-dicts/sword-sparvg2004/Manifest
index f879638b7e78..1a4f9f899881 100644
--- a/app-dicts/sword-sparvg2004/Manifest
+++ b/app-dicts/sword-sparvg2004/Manifest
@@ -1,3 +1,3 @@
 DIST SpaRVG2004-1.0.zip 1467411 BLAKE2B 8012a8b9e81d9b20a63eae2174aed7cea9575e797db3099ca6ad4fcb0951742cc2960e372d703c94ad4b816f97299b2a0fcaa2f38eb84c65b7fd3c8015a68b2b SHA512 b799409fb5fe137db5f5f40869c26a1d51353209bae442ff48b2958e51b4d989db03ffef60a37da6c68875b8693d788df60928ec0632e9513652d99b899e420b
-EBUILD sword-sparvg2004-1.0.ebuild 352 BLAKE2B 76761f21afacb98d6ac63d8917052a6798784a5d338d9eb8feab37c5b57dad7b75901f893c8f08c5debb0b3c0adb068bfd9fa8f859e9f729f7a064c693d3e034 SHA512 419a7dfe1340b6a9029cea42382c679f7b32542b2d36a5f83b1b98a740d77cc4041956ff063c09f6b8aaa44c0467d16cf0e056b97c20b1335941e1c79c8f8b84
+EBUILD sword-sparvg2004-1.0.ebuild 342 BLAKE2B d7546d643b9688a151fa7f400ce6187bd5237c2b2ec752ace9e4c2947c868e271ff531eaf03fd3669afec81ad16fb379d4152575b42513fec3ffa929e844e0f9 SHA512 560c3bcd169301c22a9a6033ae70b0adc6c138a8729a825678fc560e48d2cc66fc8be46f40616c12cc9a8402c5625d199bbc42bebe167da6687cbc85280a8304
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-sparvg2004/sword-sparvg2004-1.0.ebuild b/app-dicts/sword-sparvg2004/sword-sparvg2004-1.0.ebuild
index 1878a0578350..1370c9031075 100644
--- a/app-dicts/sword-sparvg2004/sword-sparvg2004-1.0.ebuild
+++ b/app-dicts/sword-sparvg2004/sword-sparvg2004-1.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Spanish Reina Valera Gomez 2004"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaRVG2004"
 LICENSE="sword-sparvg2004"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-spasev/Manifest b/app-dicts/sword-spasev/Manifest
index d100a183b1ac..85e680700125 100644
--- a/app-dicts/sword-spasev/Manifest
+++ b/app-dicts/sword-spasev/Manifest
@@ -1,3 +1,3 @@
 DIST SpaSEV-1.1.zip 1449569 BLAKE2B 2be47bbdd3f95ea4b18f26dc06a9234ca55e17655c3424ae81345301f3a15d074ac322c87e33e5eac62a96e80aba3b0e018979979d92e15f3f5916cbe865a857 SHA512 e2669082909ce00550928dee3be01655efb5830c42741cf9d4611096d0c4a575ccca6a4beac6b474fba7ed5b3676aaf0d166ceaad3af1e0633aa0183008a6d92
-EBUILD sword-spasev-1.1.ebuild 355 BLAKE2B 26a470875fd39bbd1f0364847c8b2dbac054b578f2a5b11ea475783f77a268972c7bcac9d0d5d082dcd7ae4247d0456c54a6da36be56ef6a7681e25f1bf74cf9 SHA512 1ac15079145fc90624fe9d042c7eb040c96e6cf4912084b7309798160a27eaa757f0710f22047839d3aaed3c506562c79a9e656e409bd81e24c8f65ae30e61d2
+EBUILD sword-spasev-1.1.ebuild 345 BLAKE2B 3040f340b9ca9b92141145288e68f21cbf7887e8db685dcab27b45ed71bc5ca53bad5075546e2e3f090df92659458700992a8ce148a1d12dda8b27665dc77778 SHA512 f94f97ceebde08b98c42f3b1f2a1eca742aea0aa3179ee3022cd8d0dc0921f4d4cddff8a9935295ad0879d1c9d90ece7f6718e8908695cd79cca1b0130552e2c
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-spasev/sword-spasev-1.1.ebuild b/app-dicts/sword-spasev/sword-spasev-1.1.ebuild
index a50c944f924c..53197692a33e 100644
--- a/app-dicts/sword-spasev/sword-spasev-1.1.ebuild
+++ b/app-dicts/sword-spasev/sword-spasev-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Spanish Sagradas Escrituras Version Antigua (1569)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaSEV"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-spavnt/Manifest b/app-dicts/sword-spavnt/Manifest
index ee47d29c33a5..fe6f2222ff09 100644
--- a/app-dicts/sword-spavnt/Manifest
+++ b/app-dicts/sword-spavnt/Manifest
@@ -1,3 +1,3 @@
 DIST SpaVNT-1.2.zip 367883 BLAKE2B 1efcfee3c84064b0c73e428650051c973cc45dd0663f185305a05151e41b14f8b3483a91521ce77919aeb7b71c17a6490045b8e31447ff4032a10f228805df4f SHA512 5dc5449963060216dac25bcd947ee50b3141e512e608868f427ef09001e82b5bd55a457e494a29e38cf73580ab2e188cf674fe4a4a26b4308be092c7faf2cd24
-EBUILD sword-spavnt-1.2.ebuild 340 BLAKE2B 65a573b6e9c344a192410f36ce9e04c6d0102ee14fad9b4f7a4d69af787d2181e3b04270652084343dfef95e9e05a97daee9de40790b0fdad6f90f86b7f83b14 SHA512 493372ae7a0a85de8c9c6c454abffd83fd29a9f2a191d58f704c3789e2d32633012e8a3dc1b5adabee3d40e0905bc87c2d265a4fa5261e10ad0392dc1fa040c8
+EBUILD sword-spavnt-1.2.ebuild 330 BLAKE2B ebf900ceb47968b84eee5a8072959f4a5fd82c624d9ea98496af1e5e0763fabdd2b65490bc05799c843fc08b11faedaa4254d73cc1e58d6928dff421d28dbd19 SHA512 c5b44c04aad6ea1b4948bfc85643426b7967b977cd81f4df87a551f41503c007af54c400bea4ce77816ce52880d8d9ccf12eb35231cf66c11664b8151b400164
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-spavnt/sword-spavnt-1.2.ebuild b/app-dicts/sword-spavnt/sword-spavnt-1.2.ebuild
index 0f81c0c121b6..2c770c22ef0f 100644
--- a/app-dicts/sword-spavnt/sword-spavnt-1.2.ebuild
+++ b/app-dicts/sword-spavnt/sword-spavnt-1.2.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Spanish Valera New Testament (1858)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaVNT"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-spurious/Manifest b/app-dicts/sword-spurious/Manifest
index 52b68b68446b..f4bcdf48b009 100644
--- a/app-dicts/sword-spurious/Manifest
+++ b/app-dicts/sword-spurious/Manifest
@@ -1,3 +1,3 @@
 DIST Spurious-1.0.zip 4825 BLAKE2B c17b5a54b94a45936bbc8a7f56206f3b08aed046095f1e6e4888072e5bd4e649c9476afc97b84b6acb0a276fb04fb1d8140a6bf46debc280baedffcbaf2f8503 SHA512 08c33a3a5d6a7d0fd04bf22ac2666426cbff347289cbb707644ca77fbe279c8029a37e798315b50db632dce7aa4abd5dc7335bc2a483ea3452473e198fe59260
-EBUILD sword-spurious-1.0.ebuild 356 BLAKE2B b580e4eb7c5f20f62d167398de28c5ce1a6164e67b93cd94f4cc11e93d7f52dbdc0a9658aa04ee3a854fa275672f8bae6c01b56b6b29669a3d0841922c69057e SHA512 3dda118c3880d137ccc1c77d5d50c63fe247b2b866422ddd8d4e9d788cf8f9180d9109c269a9dc78d265ce8b8b934d74cf72f63567d6aa5767309503a0a3643d
+EBUILD sword-spurious-1.0.ebuild 346 BLAKE2B 9db719a996ca5b7302945ff384c8558e5bdef76f2e5614ececb0ee4360df010e914388fb6f679c3d7dd6de86757b33cba6ee5495ee91ec106abfd85cddb8d8db SHA512 76108289b666a0cf4de76ee72ef35a1c833623e633dcb4013a48ddf9e664d6b7c576db09144183a80373ae44ad1bd6de71e9017fa257c42e5d6facda6a77e78d
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-spurious/sword-spurious-1.0.ebuild b/app-dicts/sword-spurious/sword-spurious-1.0.ebuild
index 1517622f6b20..a69140120118 100644
--- a/app-dicts/sword-spurious/sword-spurious-1.0.ebuild
+++ b/app-dicts/sword-spurious/sword-spurious-1.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Tischendorf's Spurious Passages of the GNT"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Spurious"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-strongsgreek/Manifest b/app-dicts/sword-strongsgreek/Manifest
index eb016781d8dd..d8f555ec162f 100644
--- a/app-dicts/sword-strongsgreek/Manifest
+++ b/app-dicts/sword-strongsgreek/Manifest
@@ -1,3 +1,3 @@
 DIST StrongsGreek-1.2.zip 356388 BLAKE2B ff7947f2aaebc9bb925c9a2ac07950db39d34399fec5fded4ca8f726492b20d30d68e767fe70fa0e89662d76377f289c9a956203b984ce5c6b90b9b7710335d1 SHA512 0a8451f70d9cfed8fcec8ada100274d07080de448c9d7593fbacf3c3f12c471865213555a8678918730d32ca7d93ec5bcd86923c68e384bf1bdd43a88c87e545
-EBUILD sword-strongsgreek-1.2.ebuild 348 BLAKE2B f0b1b0cd4fd534a92781143f3dd586451d618476716d5dd7e130db43256500c86b5c0eee802edc70f65bda0a3f8d60d1874ff44955df2d3fabe2cf20d2923197 SHA512 141462612b8d01e924ad504844dc10dc187c089a8fb3c2ac3396514835db2af068bd75533ba082bebdbd713bca9071569dc991370b0e99a09fe4aed00d147ff2
+EBUILD sword-strongsgreek-1.2.ebuild 338 BLAKE2B 41dc37ddb868229f079c5a9cb558ab0039fad29b9d05fe59aad78d2e63e0f3b6364f30c5d59373cb0b53b4defbab23e776173972be1bb0c3b53f8cfb7087b5dc SHA512 dcb9fc54e71a045593afbf2e7b08986a255522d2d83418ae9b56ec75a619511973e3c1729ce959126dd292123bce5cc5cab6b7d1b95ba3ec9e92e2db959267d0
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-strongsgreek/sword-strongsgreek-1.2.ebuild b/app-dicts/sword-strongsgreek/sword-strongsgreek-1.2.ebuild
index 77884767f8bc..808583a6639e 100644
--- a/app-dicts/sword-strongsgreek/sword-strongsgreek-1.2.ebuild
+++ b/app-dicts/sword-strongsgreek/sword-strongsgreek-1.2.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Strong's Greek Bible Dictionary"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=StrongsGreek"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-strongshebrew/Manifest b/app-dicts/sword-strongshebrew/Manifest
index 8d6ee1aadbdc..81226242f296 100644
--- a/app-dicts/sword-strongshebrew/Manifest
+++ b/app-dicts/sword-strongshebrew/Manifest
@@ -1,3 +1,3 @@
 DIST StrongsHebrew-1.2.zip 532334 BLAKE2B 835ea32b57fa78071676161137e95afe5d6a480cab72cc47e83820370189b08e936e12673022bbf129e391074689945615d1fdafb8a582c4f914066f2ec1bbaa SHA512 c32917ddc876403fb696aed492963b0325e64cb234cfd3f657f1436ca0cb1fa9b8aab09f8ac20da13d7e46135048a6d08ff2fda097a159fa5f5cfe65d96a434f
-EBUILD sword-strongshebrew-1.2.ebuild 356 BLAKE2B f49b9f54baeb4c30ffee3b3f582d251079b5b9761ad60082b9c7779b6fe3ee93c3b82f35ff8e6fd43eb23bdddd76eb5434af0f40aabc6c6762e3ef70394bf2cb SHA512 3cc683d3a651ce2a18bfbf187fd652ad64c186df79731849ab75b9f3fb24d508ce5d8ae8ee155a32cd227d9545164a3173a6f615dca7ad1ca2d8637ee0757804
+EBUILD sword-strongshebrew-1.2.ebuild 346 BLAKE2B 69eac8b1e76976b0056ec8befff74f8ca094f0ad97a1d2d610465ed0b4c09ff334b5e3626d1a6c42c0a5fd8d6eecb81555086deeb151f370d35739e435803e61 SHA512 39c89e58f42746b97433be0337df1afbf675dc6d81a7b3d682c17716a9fe81d61e2445069e6f1b4313c7937f7eb6c75e4112f47e6d5831cc039e98516f424987
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-strongshebrew/sword-strongshebrew-1.2.ebuild b/app-dicts/sword-strongshebrew/sword-strongshebrew-1.2.ebuild
index 1cde414397ee..57fed0588e00 100644
--- a/app-dicts/sword-strongshebrew/sword-strongshebrew-1.2.ebuild
+++ b/app-dicts/sword-strongshebrew/sword-strongshebrew-1.2.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Strong's Hebrew Bible Dictionary"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=StrongsHebrew"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-swahili/Manifest b/app-dicts/sword-swahili/Manifest
index 27db65153876..a47096e5a08d 100644
--- a/app-dicts/sword-swahili/Manifest
+++ b/app-dicts/sword-swahili/Manifest
@@ -1,3 +1,3 @@
 DIST Swahili-1.1.zip 365719 BLAKE2B dcb4ea202a0a622464f7c3ff2ea49822deb10f9976f65817f6eeae1bb2a6b8abb112cc54afc0aacdebb56329a0866d417dd78109947150e86b26f407c3aa35f8 SHA512 0508324f47224bbe28a6214d98916ca6f3e0213287e119934d80c71c3891c95e8a99bcabf6f3395d28992262c6ae09ff6ae7440dde3c48c4b896958f31417380
-EBUILD sword-swahili-1.1.ebuild 333 BLAKE2B 970e14fd1edf867cc18078cbcbd2c9e2a9a3081ad7cb3d2b8cfbda72b790231a76b300b118192f457871dc18ae1ff0e1648eb940463c652b91e261b976f99159 SHA512 967cbe238458c4ddadf7f19b0e51dd76b079a6e19a90edcdf76f0f1318a0b1aafc84b9348068c421ae4e1769bb76d16d933d63c5f59b34a3188e98d204f612b8
+EBUILD sword-swahili-1.1.ebuild 323 BLAKE2B d9d316d6da5775fe8fba0e0d52ea8d776ddd131e51c6e0bff022e3b5be771afae26e4432401fe16bc0ea9b7fb6663cca9f5082a4da18ec23e4bc2b8679e7da49 SHA512 4836bdb5697ed865cbfdf65ba1baa62798105f4bf0f7c55227c3f3cc3876e081ad88e65f87798fb5e09bd80e51ae133fd2e966ee5fef11febd0ca9436ce16f76
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-swahili/sword-swahili-1.1.ebuild b/app-dicts/sword-swahili/sword-swahili-1.1.ebuild
index 45289722830a..62b7aaa90a2f 100644
--- a/app-dicts/sword-swahili/sword-swahili-1.1.ebuild
+++ b/app-dicts/sword-swahili/sword-swahili-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Swahili New Testament"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Swahili"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-tagalog/Manifest b/app-dicts/sword-tagalog/Manifest
index c84f152cb4e7..3370f538707e 100644
--- a/app-dicts/sword-tagalog/Manifest
+++ b/app-dicts/sword-tagalog/Manifest
@@ -1,3 +1,3 @@
 DIST Tagalog-1.1.zip 43336 BLAKE2B 187fc284faa69f525ed82327d02d1797b7d82465b911e79dbaadf70238871afeb335868f5572b70191049e51c2a4c2def2b9710bcb057f17565c6f0825a4107f SHA512 9208073f7547ecb7dcda2d6a9016a8ff75a2fcc5827b4992c1d2a9b918a6a62e697a1bbd783d0a559e71a7b544eb2f73ef66261b6b6d288420dc9a97d932f9b9
-EBUILD sword-tagalog-1.1.ebuild 334 BLAKE2B cd1d880c88541e74b4a9dec360fcb26149952325a42b268314a39b1d0765adcb67013308fddef28895266a30d60de9de18558fd9fe32f8c2434850803ab455f8 SHA512 315d3c08dada5ba1212696ca03cc0e598d2badb4ae27578c6e4624c43e8990dca70c9b29eba492f6e9530f2c76e4441c855be031c20090994b9c8cd2e20505ac
+EBUILD sword-tagalog-1.1.ebuild 324 BLAKE2B 00e1b1baaf85a03847ba1dee654b42b762b7766670949af90702b7b92e95140b1b55b60eb5c7c07b2585c9963f47cfe4a4ce8505c12aafd2a6e31189ea0817fa SHA512 288e058eeaaf9502480a40a8db9e0321d412939245f4ef23bd8471de9f459397d07414a3dc32a1ae1e59f447e0b4e78f0007f4a3bd29b46b2a028ad8fbd6c2a5
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-tagalog/sword-tagalog-1.1.ebuild b/app-dicts/sword-tagalog/sword-tagalog-1.1.ebuild
index 29903217e0a6..342bc215253c 100644
--- a/app-dicts/sword-tagalog/sword-tagalog-1.1.ebuild
+++ b/app-dicts/sword-tagalog/sword-tagalog-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Tagalog (John & James)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Tagalog"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-tcr/Manifest b/app-dicts/sword-tcr/Manifest
index 733d7c1b3ebd..ef4b1051ddda 100644
--- a/app-dicts/sword-tcr/Manifest
+++ b/app-dicts/sword-tcr/Manifest
@@ -1,3 +1,3 @@
 DIST TCR-1.1.zip 270366 BLAKE2B 3419c5f47b93bf6c28ba94f1a80fd0b0262e512be3e651b3b605ddaa96eca0a0990c6cfb644d0fe827d48acf4aea0ec92353f529a1dae56339e2915188b10bd9 SHA512 c95faa93654751ab5c133e906ba7f8ebda3125c30dfa381551c04ba521bda898d3b2cdf43c969bba436ffef60c9922d6fd1486032bddc9a5f39409ce35b1b5d0
-EBUILD sword-tcr-1.1.ebuild 325 BLAKE2B 01e598af3ebe6cce976afe518af492cff61c18ed17d3914e9ddd8abcf7e7ce84c6fd009f23b2828c3e22d183fd6aceb34b4e9a8efd2e3b6ceeb7940110cc2e00 SHA512 e61a7ec555fa8a99bbb610ac81720889cdda9ff13c19314d7961f8ff92e96f88a0d23d35fb43dae5171cf16fa980d00dae1cd535fc608df9e0fa5ff75b08134c
+EBUILD sword-tcr-1.1.ebuild 315 BLAKE2B 006d488434f82fbaa96547d9a190abbfea08a41bdf5a3be6b1fb31d219244e565246bf9c4e6fa55fc5da4f174d6b32e500398552861940876584c0771a3aaeec SHA512 7a488547ae90708e3bab6f652cdbf5a2905fd050b4df192bf4d4ae3fabdfac8079e675d7f48bf007cbf0db1190412da2cb592386f512e9182a5e0b413a2c09be
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-tcr/sword-tcr-1.1.ebuild b/app-dicts/sword-tcr/sword-tcr-1.1.ebuild
index a2bb52020ba4..feab12c79e7b 100644
--- a/app-dicts/sword-tcr/sword-tcr-1.1.ebuild
+++ b/app-dicts/sword-tcr/sword-tcr-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Thompson Chain Topics"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=TCR"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-tdavid/Manifest b/app-dicts/sword-tdavid/Manifest
index 04837de33a2c..114650402e7f 100644
--- a/app-dicts/sword-tdavid/Manifest
+++ b/app-dicts/sword-tdavid/Manifest
@@ -1,3 +1,3 @@
 DIST TDavid-1.1.zip 4845476 BLAKE2B 82dbe176461852fd360ef526de4628f60a63a5f4160f884d917e216b7e9e9d4f409e03214dd4826581d54871b0da98023902b99ee513db20e213c52fa3e6a8f8 SHA512 d4aa18e30062a8af57bc70ffcbcd382ef0a83d09bff612b737faec371e831b418f6a2c15a78665a2a1cf76f7c0848c047d2a09543adf981f06b2d36daff1293b
-EBUILD sword-tdavid-1.1.ebuild 344 BLAKE2B b3071619fc1a4a8a3a439b9a330bd5349fa966ddfc5c51fafd9b50e5567679542858a2f8b68aafb08746d061409c61f9ea9e1cb8f3149024332617fe911d206a SHA512 999c00e3d06fff35d8bf24be65a15564a5e4535ff909e4802e0ea1b2c0fe1a44eae0429f0e596b33a4bae8d29196a1fc54b508fcaf76478c81a2e0b4c4f0f13e
+EBUILD sword-tdavid-1.1.ebuild 334 BLAKE2B f2557d53b22d51d3fbdaa9a7e0ce3dc1d226fa29d926969de3506faf954a907576a077ec2cd6122b28bb6da333d7cc383c6f3d562ef94e053ca20bdb180236d2 SHA512 77362860912520c8378e779fe0805e7d98a515aaff1e2b3dc3329e9b21545a7dd60341c93f85d3f5ad1b78867de7baace2514d307fb4ca19a42c1c47cc8f7ad6
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-tdavid/sword-tdavid-1.1.ebuild b/app-dicts/sword-tdavid/sword-tdavid-1.1.ebuild
index a00d0d843b05..3487c145db69 100644
--- a/app-dicts/sword-tdavid/sword-tdavid-1.1.ebuild
+++ b/app-dicts/sword-tdavid/sword-tdavid-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="C. H. Spurgeon's Treasury of David"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=TDavid"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-tfg/Manifest b/app-dicts/sword-tfg/Manifest
index 28d4e1eee1b6..59fac77b8d12 100644
--- a/app-dicts/sword-tfg/Manifest
+++ b/app-dicts/sword-tfg/Manifest
@@ -1,3 +1,3 @@
 DIST TFG-1.5.zip 1031265 BLAKE2B 313a55b5e0f4aebfd58354ff9ceb0e78428f62d966d45eba4a045f5c857c6a3d008a60fe1423c9baf26d97264c086a6a081c9a9146606811f0d23b3a3088f76d SHA512 9377a6467192e23f97f12b7e7139a731c3a08bebd723e8f38f22099f9d4ee4b21de77ae72a1477d21ddb7cdf4238f94c1303bd10589b7142d69eed829ac4d299
-EBUILD sword-tfg-1.5.ebuild 358 BLAKE2B d11ca2109b8bfce2338aa4a59082f25ff39f1a9388aaf56282b7a4629177d130458b0eed593559d3ee8c623a84add601ffe6c93141623762d115bb6245f43ba2 SHA512 2318e09d6a0db30ba167a013bf389b39767152007b6eda484c8d6fa330887a9d73968e1e4e50b6b8b27bef0396df68211e7f83eb56a461c124fe2ffb78b4736f
+EBUILD sword-tfg-1.5.ebuild 348 BLAKE2B 0b0dcc353d8702a76426ee83df70021ea61bcfd21a076a3eb5085307475a66f68e87a6ac0892237b13db05abab12a1ef98c1291dbe674173ea97799d1d5a69c8 SHA512 4bb8ff6e68ad3e67e975da2063e7a3d6c862a954044b1239e76c9a1d4bf0263e3aa62085c8291a02e889c22eedd07e2e60bf103adb0c5d320787d5bd9b7042d9
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-tfg/sword-tfg-1.5.ebuild b/app-dicts/sword-tfg/sword-tfg-1.5.ebuild
index 80fcc82a6dda..daaf37fa2e27 100644
--- a/app-dicts/sword-tfg/sword-tfg-1.5.ebuild
+++ b/app-dicts/sword-tfg/sword-tfg-1.5.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="The Fourfold Gospel and Commentary on Acts of Apostles"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=TFG"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-tisch/Manifest b/app-dicts/sword-tisch/Manifest
index b0b55b2a528d..a9b5f1af127b 100644
--- a/app-dicts/sword-tisch/Manifest
+++ b/app-dicts/sword-tisch/Manifest
@@ -1,3 +1,3 @@
 DIST Tisch-1.3.zip 394774 BLAKE2B 6339167ed661c75120dcbd8608c2aa77535ca8f2c8f582754cc28a5f50016789efc6903791630a3160313899418c6bc00084fc7660bcae7529964a4955e4b7e7 SHA512 0c6e83f9c392fb32c23660012e23229d15be079808679c3bd2d8985bba06af22ecd8297e796e095c0590f8b4894c9900f3daabb4061562ab62d4516878eb556a
-EBUILD sword-tisch-1.3.ebuild 340 BLAKE2B 78cd61c89e90619ab084abaa6a32397e4073d71ae8f38ecfa4f4057e46a38c8e05540316afab8dca64656fa48cde523d28d11eb6ea8b4103a57e0987201e3566 SHA512 3e840b24f6b6fa434b033d74d5fb79ad8d8b4bd4660e0bd9932cdc8fab0450842df40f383d8a4e2df67b4c80ef46db60d02c3796eafeafca35f31daa3c366163
+EBUILD sword-tisch-1.3.ebuild 330 BLAKE2B 82bbd64dee1c5fd76efc78983ea45cf16b4dffea0e2050ef8d882484e44d070c40cc9f524456945f4aa9cd3961d986c676a6e542c9777c279066f51e95560530 SHA512 523ebeec0259dc3c738e97277363292d5cef56b1596c36029ab058b5bfe280bdb7f7cfedc06fc08ae1f7ac1c2bd1c684c30b8794eefda351cb2922f52b28e448
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-tisch/sword-tisch-1.3.ebuild b/app-dicts/sword-tisch/sword-tisch-1.3.ebuild
index 6220a663cc2d..a577ce89a45c 100644
--- a/app-dicts/sword-tisch/sword-tisch-1.3.ebuild
+++ b/app-dicts/sword-tisch/sword-tisch-1.3.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Tischendorf's Eighth Edition GNT"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Tisch"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-torrey/Manifest b/app-dicts/sword-torrey/Manifest
index ea670d4b1ed2..5be330c26e88 100644
--- a/app-dicts/sword-torrey/Manifest
+++ b/app-dicts/sword-torrey/Manifest
@@ -1,3 +1,3 @@
 DIST Torrey-1.3.zip 422449 BLAKE2B aff495007ac023915cc177d982604a92ad062346b23ebe0b3f58228e648a635a2ad840c70d0866742dd77cb0cfc39ce7ebcb7e0f204766ed737ba428c58386e2 SHA512 581327653b08bc712104ea2645c8a2f80abb551c9455390623e8afa4aae48061dde7b1897c6e0322da5561ec354798d5923c25a26bc9c6f81191d13c9bf4dc33
-EBUILD sword-torrey-1.3.ebuild 345 BLAKE2B b6863f96746fe356a3b4d19a033314c355a058cf3b990bf95040d7ebb2daa1e3f3bd88faa39d05c4ead668f07be5f0805deef372682d0cc601058444e27a2295 SHA512 57e3d78dc406e277e99a5cb0728371333a761ef39d97354b4eb8172675910dce47c9f03320515e6407f97b878376374d0572674e3093cbb1c8d607de2f7917fe
+EBUILD sword-torrey-1.3.ebuild 335 BLAKE2B df44320c6747d5bd2293d271e186a8e61abb001812f38a6112f652a8d820212b40a5d173657e99dd9a7da91a90cb34614930f30bcec2bd2b55af00ecff5d4142 SHA512 9ae585f6250dd92b73c9330e9102e76065be1004980ea8a492fda211b96145ea7d8f0ac136a8bec1c2176f1d35846416f61231e62954ed663b607f212e62591e
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-torrey/sword-torrey-1.3.ebuild b/app-dicts/sword-torrey/sword-torrey-1.3.ebuild
index 336cccbee82d..a8ae97c963c1 100644
--- a/app-dicts/sword-torrey/sword-torrey-1.3.ebuild
+++ b/app-dicts/sword-torrey/sword-torrey-1.3.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="R. A. Torrey's New Topical Textbook"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Torrey"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-tr/Manifest b/app-dicts/sword-tr/Manifest
index e65c46053497..810e087d3ad1 100644
--- a/app-dicts/sword-tr/Manifest
+++ b/app-dicts/sword-tr/Manifest
@@ -1,3 +1,3 @@
 DIST TR-1.2.zip 1273411 BLAKE2B 6e1705522b53d76ef35f45e7e6159342138f34e9c855da64bc4add705a67aac7431035f93f7717d437214b4c9418b4516c2d9fbf347eafd9f0e03e3a5f12f0f8 SHA512 0bae1092a1afadd2a3d7d65cd1d981be4bcca4e6e4e3f6323a9abd337e006d65893a9735e013a906c63a94473ca4028eeecfe26b16942d4fb1a128c8540684f1
-EBUILD sword-tr-1.2.ebuild 324 BLAKE2B 971d217a8fdcf9d3bc3b70fb0a29aa580c7f948a571e5987c327f82ba7e0b29de096bca1a905cbf447ecf34c67ec9a91f9cf41956b5117b7930dd60de7432b7e SHA512 5af460f70c90a04359a47735316d8bf91fc0af4c0fb812fdbf8daac0ea64e4d5ca505c21d23f091579c8f3830cac466a3aacd682141c0f61326130ba12a77194
+EBUILD sword-tr-1.2.ebuild 314 BLAKE2B 0b2623b53dd128730c8a58425ba92e7765f7c6f8e17919547b68e26af67dc8de29dd1d1683603fb1fdfa8d13da736ff7144e59da9aa883655e0207b3c9978b5d SHA512 78559e72812a58c000ce9ea5b4f25fc595101eaac65986aa8b6d4ed7e7fd7d0505a62cf792ef772bd096d0f1408579b010a5e9c002afd8627a1377be17b5a163
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-tr/sword-tr-1.2.ebuild b/app-dicts/sword-tr/sword-tr-1.2.ebuild
index ddaefdb01c23..85d55016ae2e 100644
--- a/app-dicts/sword-tr/sword-tr-1.2.ebuild
+++ b/app-dicts/sword-tr/sword-tr-1.2.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Textus Receptus (1550/1894)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=TR"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-tsk/Manifest b/app-dicts/sword-tsk/Manifest
index c0c4b3cbf40d..92eea3eb91a3 100644
--- a/app-dicts/sword-tsk/Manifest
+++ b/app-dicts/sword-tsk/Manifest
@@ -1,3 +1,3 @@
 DIST TSK-1.4.zip 2643723 BLAKE2B bf4dc47a09c615d2a2d92505ac3fa454a3282487386babd92a98b154461fd72f3b17dfd6b6b80d3497a5a8a698cdeab2e932165a181cbce2d2dba87524810ced SHA512 ed70671352204e9bbb32ba7f277546303152d543c931be07a628faad8f49a178c7c320a11f10dfc36786d6f93aaeb0d2b077a68315648563253886075f01872b
-EBUILD sword-tsk-1.4.ebuild 335 BLAKE2B e027b428d2e49552376057c7405ab51a5942fdb9cf96a3f49de4bb3421e7d1d6ce9af0efa03002a11039ad10cf23c7eacbf6ae917e0d1eabd0f3b3adafb63274 SHA512 3c49ac77ff70c87b7e05e7c864c40e526a6cfef752618785aeb179d6a545798dc77d8e6fda3f89a2bde48bdc746d32b5a05708d770693108aea1127e4cdc545f
+EBUILD sword-tsk-1.4.ebuild 325 BLAKE2B 426f1f8136d00417f730ab87cf7804f44012b82db30b1cd8316d091a7918f447e5af37dd620c0821ece37c7ea64c7e0dc1112670ec59c334cfac87ff2350fe60 SHA512 7c082038ce0b97b7cf78057046c26f8fb2ec36a28b0dc2ba7242ec52ad4a0289374327c186a2b6b927b7e19929c8b8f9b06711d550dfeeba9ed9aa7cc769216e
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-tsk/sword-tsk-1.4.ebuild b/app-dicts/sword-tsk/sword-tsk-1.4.ebuild
index 972ca001c6b0..214b789ce5e5 100644
--- a/app-dicts/sword-tsk/sword-tsk-1.4.ebuild
+++ b/app-dicts/sword-tsk/sword-tsk-1.4.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Treasury of Scripture Knowledge"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=TSK"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-twenty/Manifest b/app-dicts/sword-twenty/Manifest
index eacd9132b8c8..892f49a05434 100644
--- a/app-dicts/sword-twenty/Manifest
+++ b/app-dicts/sword-twenty/Manifest
@@ -1,3 +1,3 @@
 DIST Twenty-1.1.zip 395147 BLAKE2B 7b5b798b4d9daf398530b7b791e1b04303d0e75be41ef19477567c02836151b1f76afb7cd12a701c85d0123f4ae854443b6599635fa0a37d44ba600d9de38779 SHA512 5a2449facec4426a60ea6ecfd87328930306e87e6221b0363128ede632e820629fc8aaa28c56e6f82c74a86ef23c47126709fc68ce9ccc1ea6f12e160ebe81bc
-EBUILD sword-twenty-1.1.ebuild 336 BLAKE2B 2a3cc36d474fe65836695510c32605e28db36ea9b845283a535fc56a55b03c9ff88d8b3de978d7f45462031fd0dbb199131158007ae5090bf02a5bb62e1eaeca SHA512 1287cf03677978addeacb6f4f6e47a085d9aaf7c6d242eb06e456adaf70fe58a9348b877498356be37d74f811dabce004ed9a84993dc141a7f8c15543b0b552e
+EBUILD sword-twenty-1.1.ebuild 326 BLAKE2B 66db9496478970c127c9813d979d97dedf9b691f7a309d5138819ddac9f5fb4e46e6c308aa95eef76c211f51e6c50554491c27bf2c5cb0abd7a5ad265fff9558 SHA512 2802a0c36e5bf8bbe1d04c7bdda2a84709b9c7ffabe553f893dcb1faa4cf049ae897b3ae4a9a57a1746b53124a7333ad88d7cd740251bc42e5fbee86ee9c0e8d
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-twenty/sword-twenty-1.1.ebuild b/app-dicts/sword-twenty/sword-twenty-1.1.ebuild
index a87a19327afe..54fdb9f9a4c4 100644
--- a/app-dicts/sword-twenty/sword-twenty-1.1.ebuild
+++ b/app-dicts/sword-twenty/sword-twenty-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Twentieth Century New Testament"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Twenty"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-tyndale/Manifest b/app-dicts/sword-tyndale/Manifest
index 72585d3998de..dc594e6713d4 100644
--- a/app-dicts/sword-tyndale/Manifest
+++ b/app-dicts/sword-tyndale/Manifest
@@ -1,3 +1,3 @@
 DIST Tyndale-1.0.zip 351631 BLAKE2B e0565795f757ee9b963c545ec206806ff1596da95a2b1ba08974745aa456acebf21c50af924c06f7e177f459d6f1b07124f9943a132a4193a76a0da2e0779e99 SHA512 9318a0997e3199f1b74f26521209e591ea945af1ac3c0652df18688186b990fddc55812807275b2ee55f42a867f9b7593032191fbdbbfce8b663bd75de1a08e4
-EBUILD sword-tyndale-1.0.ebuild 340 BLAKE2B 19d920ecb7054a6c5c2152d1cea98a2cb0405520585560dac98a8273003fbb8c709129be6489aa83d054eb954ffc1b669deb7574ce0df0f59e5c7e890a64fb7b SHA512 59788d59e02ac18c37d69c54384386d4c8cb94cb255e9963ed8cfb8af0c2b5e81e37b8398b3a01d0e3ae40c70b2ad59c06833bff6837ece1978b07ac8c065f7f
+EBUILD sword-tyndale-1.0.ebuild 330 BLAKE2B da109a46c18cdcf28fcb7d5358c7e761cecc642c8026310f7b762cd34e9562ba9ded35bf63847f9addbc298162b28bc9534ee52be706ad1a51e360f1a0dcadd8 SHA512 85c623b610cdaf429b77fc96d9d280301605b059a547e8ac6d5f1e17a00a957afe0df30dde2f1116145e9f50349a56303816683dcb38a8074c22c852e8f816f4
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-tyndale/sword-tyndale-1.0.ebuild b/app-dicts/sword-tyndale/sword-tyndale-1.0.ebuild
index 5ce95956483c..1597ebd90e14 100644
--- a/app-dicts/sword-tyndale/sword-tyndale-1.0.ebuild
+++ b/app-dicts/sword-tyndale/sword-tyndale-1.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="William Tyndale Bible (1525/1530)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Tyndale"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-ukjv/Manifest b/app-dicts/sword-ukjv/Manifest
index 6b1ff09c24d5..ef7b4b61de0a 100644
--- a/app-dicts/sword-ukjv/Manifest
+++ b/app-dicts/sword-ukjv/Manifest
@@ -1,3 +1,3 @@
 DIST UKJV-1.1.zip 1584221 BLAKE2B cd9dd0cef2416ca4a871807d71de5096f9fecb42cfdfd228f09ec1fd05f7c193cd972e67f6c5d3bc8b981d082c88aaa3d535ccf3c82045127c574896a2a2fc14 SHA512 1869a1b165d187bf0f1a11dd1ee032553576dcb7cd0f13707e6aa1956e0b9122b404751cded28be5d4a23c62420bdafeeb0c4af7426f5142a74246f28337614e
-EBUILD sword-ukjv-1.1.ebuild 327 BLAKE2B 4f8b377e6918de63609c968e08bcf935244c9848b9d69fd2f9e94f75a80b88dcc817b970cc2d531a6e797d8d3a70ee7c787ff159cd3af61b12b0451eb6e48454 SHA512 1b3cc8bc1e82abbd53bbef1881593fad32b0ad3bbb7a82e0cf1bceec09e2dddb3d6bc017cab151ae369edfcb2788b84218b7daf30593a870597dcca5fd4ed472
+EBUILD sword-ukjv-1.1.ebuild 317 BLAKE2B 7034a207f56da424dda2ebdc70d3a0212fb3258219bfac3f45a83526d7a9bbe59eb4e2f5f6e368a0d46d7b45dc7b030410e0293de0d1c0eaa0a76c35ac408518 SHA512 a2143548c79466784d2ec728bb2f699246a6fae3f1c36dc47af67edb7eba7feef5de4ec8196d135d842c2139a00d411bc1b0db112052259ee917c465c6baf558
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-ukjv/sword-ukjv-1.1.ebuild b/app-dicts/sword-ukjv/sword-ukjv-1.1.ebuild
index 60463c811c52..b58f000261b3 100644
--- a/app-dicts/sword-ukjv/sword-ukjv-1.1.ebuild
+++ b/app-dicts/sword-ukjv/sword-ukjv-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Updated King James Version"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=UKJV"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-ukrainian/Manifest b/app-dicts/sword-ukrainian/Manifest
index 0708b75ed57e..a246ec224a73 100644
--- a/app-dicts/sword-ukrainian/Manifest
+++ b/app-dicts/sword-ukrainian/Manifest
@@ -1,3 +1,3 @@
 DIST Ukrainian-1.3.zip 1719068 BLAKE2B 28370fb5295cd686810a42a5dde13060bec4ab9ec7e4d44016115db2b2ef1650d1a092d0d34a69a44783de3890311aa5d46e85497ddfb300dc0f000caa0b8cc5 SHA512 de2f5ce9096a6d7f33a38a88976db064a318960000c0e1540c3857c872ca5d902e8cca354014ec83167e9d7b1c89c468dff5359635b1e72b70366ab1b5e61c15
-EBUILD sword-ukrainian-1.3.ebuild 331 BLAKE2B 8e6d928159842e8a2564a27a88c173dc08da75327abda7a66c965869925b07703365669fcd9423052232a4461b774d6c7e55152c116e9746ce98b00e6ed3c986 SHA512 b1a590c262f7027e8aa5048b61d380c3a29c6f37c83bff05b7f90246d9e4aa2cb599eed95b8e94cd0e5b4c460508a59e0d7522700bf6555092dea17f0624f610
+EBUILD sword-ukrainian-1.3.ebuild 321 BLAKE2B d1457b4dfbe3c8bee64604bd15787f9d0d9992f2c74791e685dcf8c91d711218fc77b3d97fed620d64e0ebb933f46fe3072220873b659b33e188fbd618415a2f SHA512 9c5a5f5b24990db99bdf8abfa73629206aff63006b34d71dc14a8631cd4e267593b41bcfe0396d537403116ce36a285a4f332ae934d9a8aa253c2155194f0686
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-ukrainian/sword-ukrainian-1.3.ebuild b/app-dicts/sword-ukrainian/sword-ukrainian-1.3.ebuild
index 154cda3b8605..a3e8bbb8f6e5 100644
--- a/app-dicts/sword-ukrainian/sword-ukrainian-1.3.ebuild
+++ b/app-dicts/sword-ukrainian/sword-ukrainian-1.3.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Ukrainian Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Ukrainian"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-uma/Manifest b/app-dicts/sword-uma/Manifest
index 56f2182e97ec..c1e013347ec2 100644
--- a/app-dicts/sword-uma/Manifest
+++ b/app-dicts/sword-uma/Manifest
@@ -1,3 +1,3 @@
 DIST Uma-1.2.zip 431726 BLAKE2B 23b8531a7b42699b8a48c04209557c75401d5256ba13528d5034796e0b20d57fadcdb8ad80c777b94f132eaeac7291dd5f8658942922efa6d7a0764ff72be3ea SHA512 b9ff117f0064e8d2a4175c9e53039048db8d07ac9d512f07c746231c705b461c7859bdf4f5d0162d7ca6bc314ff8590ab5eca498826d524c5be3d9b76e1ac3bd
-EBUILD sword-uma-1.2.ebuild 320 BLAKE2B d34beb519cdf1b6b59d0f6728c8dae526c6df1fa734146fc320450c80dec7e749fcfe0006725fb8425ddace2fa82f43b2d3a0e85b110a1d9ca39c1689fa37626 SHA512 f6e485bc648361a68ca2116bf240ce475783afc8a829751a8f052105bb985f7e1b62f7b6cc30ca0b7a3f656d5a509acc2f10dbc27acc8b10655d66c0e3672b75
+EBUILD sword-uma-1.2.ebuild 310 BLAKE2B 08fa92a7f743088b577b9f8fcceb727b8cb1f8568fe37ec8cc4589ffe80c45e9cd88c03847988261a1d8c98720f4c7fada0fed09d48141a4d848b4f58adc7a56 SHA512 98497ec741ffec6ca3f45096694378d36c4d9d8b0b1e969dab82a06560784aec416b1f763243ca965cfd50fbe99931634285171ad4c3067e49a9cc2a19ef6343
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-uma/sword-uma-1.2.ebuild b/app-dicts/sword-uma/sword-uma-1.2.ebuild
index 4b1ccda9d03d..f51a8a1b4e2f 100644
--- a/app-dicts/sword-uma/sword-uma-1.2.ebuild
+++ b/app-dicts/sword-uma/sword-uma-1.2.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Uma New Testament"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Uma"
 LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-umgreek/Manifest b/app-dicts/sword-umgreek/Manifest
index 7ca7ed6f12ca..7cb020e802d7 100644
--- a/app-dicts/sword-umgreek/Manifest
+++ b/app-dicts/sword-umgreek/Manifest
@@ -1,3 +1,3 @@
 DIST UMGreek-1.6.zip 1783059 BLAKE2B 1ee00187b3fffe640638106759bc99d648f9001d7938e872a30a2c7d90a12e87b1e9fff13b631e4a153821c7f32fd412d54de147978ac54f10be80908b5d63fa SHA512 29b400bb59fa17710c7fd302568c31692e46b099276f0aa53b0636daa0819cc4a8e50db99c5cbbb09290cea8ffde2f7a95d0ccf12c6c7646f898260e4c8f2047
-EBUILD sword-umgreek-1.6.ebuild 335 BLAKE2B 65a8975920e40ff9a1f4cd3112922aa9cfd19d9197e43ff3fa95a5893b1a3d944c4e5f43f96c399eeb2c6017746b7abb274a6c97acd6d1ef0954d6dde30179f8 SHA512 52822f5bea087f2a6695ef4f147dfcc2e8f16876475fbbe05b58bf5b132a9770f821a38eeb7dcc878d0ebdf2f4a3dd006ccb83fb94d1c3b6bc57e52c9c878912
+EBUILD sword-umgreek-1.6.ebuild 325 BLAKE2B 1b3ca0e91ebb75d3d4ca9145accf73a074d771d0305a1a6d1dfab5eb236c4af79c9247cd5e386abd86aef9021803122b0a5bd896fcffa163d910bc88d95ba0f0 SHA512 77be6c4e961a863bc779477477e7bdcf89c2fa279fc56ffb6fe1b89ef8f2262c33d8ef5a05008dd05db0e2152c11e99a97ee09d484bbad20d31cacd6eb14187a
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-umgreek/sword-umgreek-1.6.ebuild b/app-dicts/sword-umgreek/sword-umgreek-1.6.ebuild
index ffe3bae29310..84736cab38ef 100644
--- a/app-dicts/sword-umgreek/sword-umgreek-1.6.ebuild
+++ b/app-dicts/sword-umgreek/sword-umgreek-1.6.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Unaccented Modern Greek Text"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=UMGreek"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-vulgate/Manifest b/app-dicts/sword-vulgate/Manifest
index a5af58b295bd..23e0d7bfb2cd 100644
--- a/app-dicts/sword-vulgate/Manifest
+++ b/app-dicts/sword-vulgate/Manifest
@@ -1,3 +1,3 @@
 DIST Vulgate-1.1.zip 1316533 BLAKE2B 9290df97a3a324bf05201e447765ca798c89928b9eabe6082fece09992090fd0d1ba18725228c2143326d87c80063aa8e761677ef1d6bb7dd9ad3da93ec14a7e SHA512 d4c51461ac09c4902c395c7f37fd45532dc071b7df787a0e1a7142d7d783abe50b25423ae867f4ad2665d15397e74bfb56b5d395be3f28f9dd5647f4eac6df09
-EBUILD sword-vulgate-1.1.ebuild 320 BLAKE2B 4ffd2a80ff50d6b9002362ea9e518d2b96111f8fc589cc8817e4ee18b69da4500e4b852bf61d319313c1304056e168cb64360e151672f07aad5049b9acdf4779 SHA512 ae885704a92e42c689dd2f65c538db55b2073e9990a23b6f2fdf038c30e8113e2545765b97c9f466703ec1eddc8550369cd3d94c279bf4f47baa579affbe71bd
+EBUILD sword-vulgate-1.1.ebuild 310 BLAKE2B 4aea16709f6fc552efbe4f9635f4950ae35cf1c555307602f9d5b8e4d1457716f1d1bd92c6bef62c644e6dd8b4ec930b6499a4ccd3acaf11baeb919889a76da9 SHA512 1ca12f45d9dce4af26039218863f8705e4f90354b7e6b1b3fddb5b599508fc30f5d7d3ab5a9c66fde4dd33ce3e7942d24363977d579c759d1653ee3beb654ac1
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-vulgate/sword-vulgate-1.1.ebuild b/app-dicts/sword-vulgate/sword-vulgate-1.1.ebuild
index f611a9d77986..60b8b2f643cb 100644
--- a/app-dicts/sword-vulgate/sword-vulgate-1.1.ebuild
+++ b/app-dicts/sword-vulgate/sword-vulgate-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Latin Vulgate"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Vulgate"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-vulgate_hebps/Manifest b/app-dicts/sword-vulgate_hebps/Manifest
index 788b230baede..444b42dc4b3f 100644
--- a/app-dicts/sword-vulgate_hebps/Manifest
+++ b/app-dicts/sword-vulgate_hebps/Manifest
@@ -1,3 +1,3 @@
 DIST Vulgate_HebPs-1.1.zip 79573 BLAKE2B ae7b4f8a83fa632b3054024b2e10b0b167837f312389e98738f6193525f09d64445cfabc280e0c21a1f8c65d9bc331ba05954193e9426e61d73ece2319d3a523 SHA512 3b07164f867d26baac1aac311371206abfeaac17f8e680456eec6be0cf458c1172e1d31a7b2a17dceb4c44bfdad183fd2a9b46aec61488cf28f78ce0f97073de
-EBUILD sword-vulgate_hebps-1.1.ebuild 351 BLAKE2B 723fa6b0511f143b0282f987c5d02e7416e8133e41206bbb32c31f8c1c3e5e4f2f4be8b5727e983fe21fc7e0609b6e88c97637d6296f47d1cdeda32f8813eb8b SHA512 52653394a0aa192c0f33785623b69b0d32f9949532284c51f09bcbe68afd9fef13059cb640f0951c99727342693684c42726ebfce160506441436f1ba76a6ef6
+EBUILD sword-vulgate_hebps-1.1.ebuild 341 BLAKE2B e80c81e7279970e922b5f1ceeb982a82a8336317ca9d5767d07833fae6e552c398201e89d014c3bbb911c60360ba73648a9f7bc3d51d59922cd1883988adbfe3 SHA512 a46bac8b925bd9dddaeb3ad25e776c0dcdba1324e58a0d433c9bcbdffa4cace9eb77050470e036bd75c7dabe928986f2ceba716c64f99829896ee3536e565f5e
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-vulgate_hebps/sword-vulgate_hebps-1.1.ebuild b/app-dicts/sword-vulgate_hebps/sword-vulgate_hebps-1.1.ebuild
index b5616129a136..6ad997ddd0c4 100644
--- a/app-dicts/sword-vulgate_hebps/sword-vulgate_hebps-1.1.ebuild
+++ b/app-dicts/sword-vulgate_hebps/sword-vulgate_hebps-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Latin Vulgate Psalms from Hebrew"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Vulgate_HebPs"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-web/Manifest b/app-dicts/sword-web/Manifest
index 2a5716c5bc2b..741a2637c430 100644
--- a/app-dicts/sword-web/Manifest
+++ b/app-dicts/sword-web/Manifest
@@ -1,3 +1,3 @@
 DIST WEB-1.8.zip 1520597 BLAKE2B 193888d73c8ce68cdec8ad6a5c2becb754d44fe212b29528bb6450e4dcb6c15061fc2c79fa33bfe048f21ab12789306b279a694f3255b7f9495240b9c1b0ea12 SHA512 1abccad5f98c49152195cf3a31ae80a19d88d49dd7bec292afc7c22a1e04e1f8bdca9dbcd2f5572354a05fe5cf951718cdb9173af1ee5e822a09ba8512759e20
-EBUILD sword-web-1.8.ebuild 323 BLAKE2B d295bce11a9215a75bfed5fc6afd96c59b9469ee1a7cf600a70aedea58585ab05632ec006f6ef9e5f81f07931956c3714960e58a968caf8ee2fcbf9132c058c2 SHA512 8a0d7256ed3b2b1ec7cd643a3511ce9dc976b77066846222a629354258a7f67fd7707dfe33370198d289e8515a95d3a955f2686f3547f26e9f5b120b986b0bcb
+EBUILD sword-web-1.8.ebuild 313 BLAKE2B b2b01708b8da589e172e5e148d5cbe0886614a128f9e4a974b41c888cfac4d7a70af19e656e997d47b8e780c22be52a4ab814b546fe3b3c0a0c2f367200b5560 SHA512 04c956406f5d927f37f14125599a70b122a7620167e2034ca0fa664f37fdbbd3df7d05e30baac4281fa862e68fe09ecf5e0e9f1c667f5796e9eaf1c2028b801a
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-web/sword-web-1.8.ebuild b/app-dicts/sword-web/sword-web-1.8.ebuild
index 86a91958e42d..0ee59dcb4e54 100644
--- a/app-dicts/sword-web/sword-web-1.8.ebuild
+++ b/app-dicts/sword-web/sword-web-1.8.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="World English Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=WEB"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-webster/Manifest b/app-dicts/sword-webster/Manifest
index 2c16645ee717..4cb0934364f4 100644
--- a/app-dicts/sword-webster/Manifest
+++ b/app-dicts/sword-webster/Manifest
@@ -1,3 +1,3 @@
 DIST Webster-1.2.zip 1481353 BLAKE2B d88881b42fa878f70a807541f2942917a1054baa0342512ccbf7e460bcf39e37e792d0f007646c2853971a660fe1c0ce0ee3420f27ee6da12f8300ea868cb89a SHA512 a02b6e192b7c82f5ab6015a3c77743b40a930af6e4dddec634a8f6b8099c8b5c6d9915ebb035adf5540bd7834e70b1168468a8259edc688e50d13d5fca9267ee
-EBUILD sword-webster-1.2.ebuild 325 BLAKE2B 8f8626555d433e38ad888b831d6ba7356028f5b44ebc22dd8f6d4c3fd44a92d380e9fadebaf05b9032d12477a4aa461bd08e7f6e6ba1a166e0b0ab7813606461 SHA512 a63269e412a485bfcbebff919e22e5d7bc7fa8fe32f38e7b59a1d68f66579ed24dd30752723128bdff31c91a0b7863b6c6c694ddc3f530e1308f604a3f10fd7a
+EBUILD sword-webster-1.2.ebuild 315 BLAKE2B 12dcb02fa767c5bd1aa8da7d464f2583443763dd510697a56714b0d0425a9a6631c1998ec1cfa64e54938d8e35727d9ceb8bee424a7daf52d36834bc79d5e203 SHA512 fac7db973ce0ebfb24e5ed6c7a8882ea6ef9cffb611091ef8ca4eb0755851e3d10c5aa05e2ed24060c60ae3516c3da16861ac5a75c082f1f5f8b3853c5f5e896
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-webster/sword-webster-1.2.ebuild b/app-dicts/sword-webster/sword-webster-1.2.ebuild
index 167c5fac538a..a9876ccc6e80 100644
--- a/app-dicts/sword-webster/sword-webster-1.2.ebuild
+++ b/app-dicts/sword-webster/sword-webster-1.2.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Webster Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Webster"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-webstersdict/Manifest b/app-dicts/sword-webstersdict/Manifest
index a3abeec48244..468f7ff773c4 100644
--- a/app-dicts/sword-webstersdict/Manifest
+++ b/app-dicts/sword-webstersdict/Manifest
@@ -1,3 +1,3 @@
 DIST WebstersDict-1.1.zip 14486502 BLAKE2B 00c443e688693dc8656ffba6d323ff79573ae8a6d234b571b294f63d42bd95815048aac36a5b826dc07d14ceae49f3239608f8de527b98920c5202f75adc7586 SHA512 a9d5635c1440ff2c284f74d0710babcf78a2d6bcb8bf4d40cc5100d053af0bda461b53ce9e76db4141f7a8d04fd5b321ac5897730054b0526cd20f10416ce9be
-EBUILD sword-webstersdict-1.1.ebuild 390 BLAKE2B e6ea43bd3939b9aa52b6b3d7e6ba436d469fc566f9f7f08cf7b11925dc1bc5c524441d48ed8bbde7f871a5cda2c153f2067b6f634430a84404b832e90bab0011 SHA512 fa7a693e3f7c32228a7b43ea55efed8ee221e6165137041cf7ccf16d85f38253fd63ec4357766a387d3b26bbc68be81b457cf47611210cbdd22f9efa6dc1c2a8
+EBUILD sword-webstersdict-1.1.ebuild 380 BLAKE2B 2843fa37a7196100010aede4140096a4e1a686954bcea90902d45bdcf603bf0994eaf478b479cfb105ed33c817018c584b8ec9cc8e278e051bba24508a5fbae7 SHA512 c23ca00b78ab41b91c361c7ac3f1bbd5695afe80ed610d94a0bb5681e4db9f77505e97f83ffc16f377608de4758ebbc10c86992c1cc6ace1385a4834b130c642
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-webstersdict/sword-webstersdict-1.1.ebuild b/app-dicts/sword-webstersdict/sword-webstersdict-1.1.ebuild
index 7764ed59866b..ccd53610aa52 100644
--- a/app-dicts/sword-webstersdict/sword-webstersdict-1.1.ebuild
+++ b/app-dicts/sword-webstersdict/sword-webstersdict-1.1.ebuild
@@ -10,4 +10,4 @@ DESCRIPTION="Webster's Revised Unabridged Dictionary of the English Language
 1913"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=WebstersDict"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-wesley/Manifest b/app-dicts/sword-wesley/Manifest
index d1645214ad67..0d14153aa737 100644
--- a/app-dicts/sword-wesley/Manifest
+++ b/app-dicts/sword-wesley/Manifest
@@ -1,3 +1,3 @@
 DIST Wesley-1.1.zip 1895926 BLAKE2B 8d2d0c3bd41186941717dd8b8e71c092b4bd3d7f6eff1b53d663445cb065d3ead4c0bd5b74a171815062059a72b1565f6a332e20d85430df42b9204adeecf5a2 SHA512 0ed6138ab9c21c400beea6b44ef60cfb10960963760e6fa2a90c95ecd03621ce6548c8f846eb4454c5a9bf30e63684ea1e10ec36538935df8c05db69ec26b9cc
-EBUILD sword-wesley-1.1.ebuild 342 BLAKE2B 6dd13172c90c8c271907f9faab6c8998d024c98263f17c6609dabfcb39733f6c9e2e64028d14bd79c676fe69bec3c263c1d6a378a82ea2b33300d86482305154 SHA512 86669fe2a3a8fe285146fe04a04e0c246b80ee81125e9ef142c3891561dda3fd4972e028385b4eadb21b11d8aaf5c983bba6ab02520fc95b1c019820d4b0ba94
+EBUILD sword-wesley-1.1.ebuild 332 BLAKE2B fc7616a847a29cdc4a3075035f375fff7e3de383f529e4e0737fa43e06d9aee6cf4a9c288e21dd54e3869bff221205f4c7468b45f62d58939cb075a0946ed15e SHA512 5d8d6916e33929b81b30d20ae6b4508285302e9ec7c3162ab511e924d7bd77198f6b52f88ab4636754ae62dead55822568d192e3b6b49bd757f207412b281538
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-wesley/sword-wesley-1.1.ebuild b/app-dicts/sword-wesley/sword-wesley-1.1.ebuild
index c4963bba8d60..01d89a2276cd 100644
--- a/app-dicts/sword-wesley/sword-wesley-1.1.ebuild
+++ b/app-dicts/sword-wesley/sword-wesley-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="John Wesley's Notes on the Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Wesley"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-weymouth/Manifest b/app-dicts/sword-weymouth/Manifest
index 108c68b6c1a5..25b7b9ca4f46 100644
--- a/app-dicts/sword-weymouth/Manifest
+++ b/app-dicts/sword-weymouth/Manifest
@@ -1,3 +1,3 @@
 DIST Weymouth-1.1.zip 419204 BLAKE2B 7061d31a81c0e3c760592145366508290f26f14ba12a2ab4b3673603c0e321f77cbf5c051db2a20d4b5552fb47836eaa6c0ca1a35cdd293660b7c0d734d39e1f SHA512 893174d721386169c26734bce4fe4454323f8b0a64405483b79f0ca0488bbf7f93781a56e829c6211cdda75537e65ab0e449ea04d9ece5f413c13c9918463014
-EBUILD sword-weymouth-1.1.ebuild 332 BLAKE2B 2c83795fed941a3d13217cda7d5cf4af18e8086cf87f1f4a7e4c956147a950b9c99053448264d357ad8a0a3ba739de040bb8dbcd33ceae45cc9b849f83b8d770 SHA512 a57069b0f8ab58bc1edbf6ff613d33b6567f473cc7cb7208357be1b2a0bfd516690a0acb8bd6844d519e3e62691cb953065f93ba5a60b940d4dea2a98fc68e3f
+EBUILD sword-weymouth-1.1.ebuild 322 BLAKE2B 11939c1ae50213766cadf442b9d93092335fb4ed63feca6340469284b5a158cd11f812e4f22794986981f3e8bc96a479f3a46f41ff7b2978b8d0fc71eadb4a03 SHA512 5bbf26bc75bc2faac4fabfce9789ed8f2b7e7911201696246c5d3cbb6f8a6836733987486552ab52af08e17677dff31793df3b6c821d9b8d43c8cbc90b5bb323
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-weymouth/sword-weymouth-1.1.ebuild b/app-dicts/sword-weymouth/sword-weymouth-1.1.ebuild
index 284cef336870..709916a1a764 100644
--- a/app-dicts/sword-weymouth/sword-weymouth-1.1.ebuild
+++ b/app-dicts/sword-weymouth/sword-weymouth-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Weymouth NT (1912)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Weymouth"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-whnu/Manifest b/app-dicts/sword-whnu/Manifest
index f114a2349805..adea441be5bf 100644
--- a/app-dicts/sword-whnu/Manifest
+++ b/app-dicts/sword-whnu/Manifest
@@ -1,3 +1,3 @@
 DIST WHNU-1.10.zip 1281295 BLAKE2B 46e097d1c5de75565f1af3291bf47c8deb915da8338a56ef302dfa53c62780886e595210309b349da1e849301065836d7f737c23570794b8c67898b49b9e9ffc SHA512 c241ef99837c0e09e9b5192b134b2d61bc2fa6bbe8dd06661ec56fc7a9bc236adffe4fdad894db966884296f254858d92dc7b0bfcede19d902becf54dc1a6949
-EBUILD sword-whnu-1.10.ebuild 345 BLAKE2B 725adfcb1278e77dd9e6947f889afafaafffe2e174311472ce63a46b2ba5d9c780f1f622e3f48d1fe031f229419df779228a531efe029d9ff47e2c168d89eb90 SHA512 ecedbd3d55677f84b4264cabc436adb36ae159590481d770a07900e9e06844c494abe22dce0b6916ec57bc9cfd2c9b93b322d5794b0dd44a328ebabbd1695b0e
+EBUILD sword-whnu-1.10.ebuild 335 BLAKE2B d7447ebbf7a4d96b125ea7a29feb895d70350da27cdaa386435c7599bad23bae98bf9aae465318dde1ceae6114a0685f8d2c8c27a912f65fa65fce7aad860191 SHA512 85525e6d8a6ee6f1cc7c7b5c9acdd205a4e166dfc354864feebc93ad39f64d50953ee5e423ee60d275d56bcf3fb80845b7846e448b4430c8e12026ca7a6b5f89
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-whnu/sword-whnu-1.10.ebuild b/app-dicts/sword-whnu/sword-whnu-1.10.ebuild
index 1ca976c4dd36..f983efead6b0 100644
--- a/app-dicts/sword-whnu/sword-whnu-1.10.ebuild
+++ b/app-dicts/sword-whnu/sword-whnu-1.10.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Westcott-Hort with NA27/UBS4 variants (1881)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=WHNU"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-wlc/Manifest b/app-dicts/sword-wlc/Manifest
index f69c2392a8c9..8c643cb904e8 100644
--- a/app-dicts/sword-wlc/Manifest
+++ b/app-dicts/sword-wlc/Manifest
@@ -1,3 +1,3 @@
 DIST WLC-1.4.zip 2017282 BLAKE2B faccf4c8cacdbe60fe8bbfbef254ff2b5e5469c78b0390d6a6f1d2b1b45ec171d1dfc6055aae200c811d384c8683abc2f33d663cc40bb42510ae31d23c3df75e SHA512 71c45b2d5d30fb50ceda827464fe5d50350827b37b23b439341f61895f759de86edd1d77ffa26fc6e3acf0cf7759e7ae28645c360a2b14deeb9442e51aa9184a
-EBUILD sword-wlc-1.4.ebuild 326 BLAKE2B 382d538da54a35e8f182e2aee77e6dde9410dcf0f605636ef396992760b27017172913f0ed1068aeed55da7290d0ada02594868ea35b74a54239ed120e0a7c53 SHA512 eb0c6ff8b87747d89ff1947aa42f280f2fa6cc2f940099cf4106e44b7ec610b8c5ae7c2e25d541a8e631a3c9e835bb47d42cfba863041638ece1b66c2bf9c484
+EBUILD sword-wlc-1.4.ebuild 316 BLAKE2B 188f1256e39fd5ef1333db8b2a2f21f79f6a711b284db42d2579240d5031e3b21c6c26b8cdb999723fb42eee038dab57e90f2e9365ae62cb2a821a6c5172abcd SHA512 9d2150021ce9ef1d58457fb94e25cce63c4a4be4ab092a94276f6b388fd79e6ac253f3d3537936831f38d408db9b54ed62e52f6111b92f1a6161da5618cbb9aa
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-wlc/sword-wlc-1.4.ebuild b/app-dicts/sword-wlc/sword-wlc-1.4.ebuild
index 10d01d2ec290..f5a24d3d1a55 100644
--- a/app-dicts/sword-wlc/sword-wlc-1.4.ebuild
+++ b/app-dicts/sword-wlc/sword-wlc-1.4.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Westminster Leningrad Codex"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=WLC"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-wulfila/Manifest b/app-dicts/sword-wulfila/Manifest
index 5761546cf8c4..8617a0d8f915 100644
--- a/app-dicts/sword-wulfila/Manifest
+++ b/app-dicts/sword-wulfila/Manifest
@@ -1,3 +1,3 @@
 DIST Wulfila-1.0.zip 238923 BLAKE2B 3c496bc16881ecd1164678bc6cf4bcbc8bc2185af1cea961138e01fead350d31e076047d846d0b1ef23971ae934cc2f292c69bf454e0254fe41321817f5d553f SHA512 fcec30f54bdd95c77d2737f270909354fc1500196dd05d6a8aa02bf4b1b6ba61eef946ebbe523b90b1d5fb2c77ddd6f9b1e101949b7050bc4068cd9e2a9f8067
-EBUILD sword-wulfila-1.0.ebuild 334 BLAKE2B d38d8e7a4143861e2169a583fc0a148ca5bfa653871762f1a7c999570de76533a4fe1c763b842f48f7b9bd6818a195c0e86bdd514f4165ea7a7f17693de4f3af SHA512 e4177cd99929a639f96839ff77cfd41b2f29c2ad1afd3220fcfbb38f987a3e6b336d97ed32409d6f8832260a048444330c8376153b44155a3d6892cde3926e11
+EBUILD sword-wulfila-1.0.ebuild 324 BLAKE2B ff7bd5273aa522a9d26257da4d5767b1f7c52b885547167ac9e7d3842ed02f571263cb5269f91bc151f2b3e63b7850f3c63f75961f7a377ac9006f551f44e81f SHA512 1562181d2d9b6b7afece2ad1067244b80a89d6879bdef1b18a290ea0bbedbbdf8d841ab9293c2623873efba74a981933a76d862ddabb2618a5d177aa4831d961
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-wulfila/sword-wulfila-1.0.ebuild b/app-dicts/sword-wulfila/sword-wulfila-1.0.ebuild
index 810bd306e5bb..918421ec8833 100644
--- a/app-dicts/sword-wulfila/sword-wulfila-1.0.ebuild
+++ b/app-dicts/sword-wulfila/sword-wulfila-1.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Bishop Wulfila Gothic Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Wulfila"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-wycliffe/Manifest b/app-dicts/sword-wycliffe/Manifest
index ee2627e20eb7..a9125188498d 100644
--- a/app-dicts/sword-wycliffe/Manifest
+++ b/app-dicts/sword-wycliffe/Manifest
@@ -1,3 +1,3 @@
 DIST Wycliffe-1.0.zip 421695 BLAKE2B d73da0fdef44c07265361d595a9c5d1464a3e3cc63d8857347f4aebd93b8d8ef73b9472af3b56ff9aa45ff250342556cfac82501085d31955880dad655faf70a SHA512 b67518357da85f64822f0ebd9a70a1f8a59363701d26ac808e3c745ec40eb3fb092848acad41ef2757d3de27ad06815ebd2a865ae991e563f07283e41e7fc9c4
-EBUILD sword-wycliffe-1.0.ebuild 335 BLAKE2B 401309fca768ba6381a55aa86fce4dfea051b64ab7c81165ba99e9bf86624ecec2b3c25c9f491eca5e4fe5d2e56795292629c62d7338e2d6bd352ab1b72eb41c SHA512 6f956e65cafd08be4960c088cd1607ca2fcea4e849332e7a17816740f10ec1765225071144cb6a119a275032c2358bba9e5abab6faf3eb59d56148e5970a34dc
+EBUILD sword-wycliffe-1.0.ebuild 325 BLAKE2B 17749b1ee6b73edd0c29a8b8453762ea5531f03aa14cf6bfeb4b2426a7c8fc88b1e1651d7e76b637a006d7dd7cb6d9d23a766479325e5cf568ab37271778f689 SHA512 61a96f0887035473e0313c258aa49aabe9f49fb4cb9101f72439c32fa861fc27e4216befbc65cd66820db353a858723180b960db2b2c8715aae1e43c64a4ecfc
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-wycliffe/sword-wycliffe-1.0.ebuild b/app-dicts/sword-wycliffe/sword-wycliffe-1.0.ebuild
index cf7c6e170c0e..62ead1fb0502 100644
--- a/app-dicts/sword-wycliffe/sword-wycliffe-1.0.ebuild
+++ b/app-dicts/sword-wycliffe/sword-wycliffe-1.0.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="John Wycliffe Bible (1395)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Wycliffe"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-xhosa/Manifest b/app-dicts/sword-xhosa/Manifest
index 00d55e948018..9f70e7095c8a 100644
--- a/app-dicts/sword-xhosa/Manifest
+++ b/app-dicts/sword-xhosa/Manifest
@@ -1,3 +1,3 @@
 DIST Xhosa-1.1.zip 1428206 BLAKE2B 33820e755e4696bdba0972254ec6d2cea0c86bc7b9b52f0c5cfa180d217f328f07e42cc7e0c0be815c4bb5589108995574af9b0d3ea8dcfcf4a1493e5defb183 SHA512 3e3e0264417009e08751cee3e5d48292365b74e1af4c0a611d54b7e20a15d4d2fbf2d31ae56d49b135c5684d67fabf7d5e6e2948315df97fa07dae70c621a785
-EBUILD sword-xhosa-1.1.ebuild 319 BLAKE2B 77a7d3bfb104e6c50e7a2004e084415ecad397a0b75b1473c1c12f59d2e062f9ae408959a0ae5751bcabc625b66d9f18e9b3ce66fe5f01754ed4ceb7dec7f638 SHA512 fa5038e43e2210436c9f9813f4037c902494007d1592fc28e9ca254898d5daa0b050ea47bd0f64e9702d6ad207e7a05b3afae0e8eab76d71374546db00dafc63
+EBUILD sword-xhosa-1.1.ebuild 309 BLAKE2B ecf1fdf2499c269a1e2c109e8f4fe20dd59d0044d2bb9f91a36a8312539f214ecb61b7af548ed5625b99e81fe7abf0d535d658bda5ee582c03ba3d8827caf67a SHA512 a9113b9ad09b3fb6720fe4c363cb8348d7f4b5a1f584b256cbd05bd11a5f7269b1d7ac51e8496001ad6aed615a2bf36a863ed6fe2d97b4b4b3b3e46820645a56
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-xhosa/sword-xhosa-1.1.ebuild b/app-dicts/sword-xhosa/sword-xhosa-1.1.ebuild
index 0207f4e97648..8d5d459b1abd 100644
--- a/app-dicts/sword-xhosa/sword-xhosa-1.1.ebuild
+++ b/app-dicts/sword-xhosa/sword-xhosa-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Xhosa Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Xhosa"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-ylt/Manifest b/app-dicts/sword-ylt/Manifest
index a5a9b7940e1b..ac847d738a3c 100644
--- a/app-dicts/sword-ylt/Manifest
+++ b/app-dicts/sword-ylt/Manifest
@@ -1,3 +1,3 @@
 DIST YLT-1.1.zip 1430863 BLAKE2B e2d6c04c8e83f84f2f0f89599237a958abb09b9a117852b0e92c9d685de26ff61d3416f81ed857e104712cee81d5b20676bad124778d5a8a7f0cc8f63b62032a SHA512 6ff2b321082eb9112df8978e80b68baafc63209d2d6b13432f0b221fedfac5d8c50b6f15261e41b0e3f04634cc286574efec81cae1a5ae0c116f30b8fba9b47e
-EBUILD sword-ylt-1.1.ebuild 333 BLAKE2B 14a868a6a61a5a071aa26031425e79e132521f0140012110ad4825a3f53de92e3a70eebdc54a3d81a58d12fff2e87bd267df4787ae7da25c7df0d5caca904bfa SHA512 35481744eb43df991f9427f6fcfb9447bdae802f96d026df96ec064235973e108b051e9a1ec7ed2135dc56b29fd90bbcb63454c20f892a09b08bf796d45bc8a1
+EBUILD sword-ylt-1.1.ebuild 323 BLAKE2B 7e85244ce3ff26cd5fbb105f8d463c9bcaee5f55ba9cb8078ebfd54f40616720650b3975faa0021daf3c0ff49cb1cc7668ad3ff109b1d0bcd1546620f55d0120 SHA512 d43ff31b1e670383ad744ea0957177c71930c3f36ae01ee5dcab53e2211e13e8dc12dc83cd774d45e4a3aa885a5b6f70deea6abdfd99356bf1df1c801f665636
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-ylt/sword-ylt-1.1.ebuild b/app-dicts/sword-ylt/sword-ylt-1.1.ebuild
index a68e2f54eab2..4e91ee65f3a5 100644
--- a/app-dicts/sword-ylt/sword-ylt-1.1.ebuild
+++ b/app-dicts/sword-ylt/sword-ylt-1.1.ebuild
@@ -9,4 +9,4 @@ inherit sword-module
 DESCRIPTION="Young's Literal Translation (1898)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=YLT"
 LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"