app-dicts: Remove *-fbsd KEYWORDS

Signed-off-by: Michał Górny <mgorny@gentoo.org>
author: Michał Górny <mgorny@gentoo.org> 2019-10-11 17:32:32 +0200
committer: Michał Górny <mgorny@gentoo.org> 2019-10-11 17:32:32 +0200
commit: bcb2ba495e8850dac21085d4ec08857ce73958d5 (patch)
tree: d1615aa5b1bab56c2390f741431dfcae548d136b /app-dicts
parent: app-crypt: Remove *-fbsd KEYWORDS (diff)
download: gentoo-bcb2ba495e8850dac21085d4ec08857ce73958d5.tar.gz
gentoo-bcb2ba495e8850dac21085d4ec08857ce73958d5.tar.bz2
gentoo-bcb2ba495e8850dac21085d4ec08857ce73958d5.zip
263 files changed, 263 insertions, 263 deletions
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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/myspell-ru-20060316.ebuild b/app-dicts/myspell-ru/myspell-ru-20060316.ebuild
index fc7df366c8f9..37936c04a7c3 100644
--- a/app-dicts/myspell-ru/myspell-ru-20060316.ebuild
+++ b/app-dicts/myspell-ru/myspell-ru-20060316.ebuild
@@ -22,4 +22,4 @@ 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"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux"
diff --git a/app-dicts/myspell-ru/myspell-ru-20150711-r1.ebuild b/app-dicts/myspell-ru/myspell-ru-20150711-r1.ebuild
index cb0e268cf3b0..73e6c5e1f2bf 100644
--- a/app-dicts/myspell-ru/myspell-ru-20150711-r1.ebuild
+++ b/app-dicts/myspell-ru/myspell-ru-20150711-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="http://extensions.libreoffice.org/${EXT}/${DICT}/releases/${MY_PV}/${MY
 
 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_install() {
 	myspell-r2_src_install
diff --git a/app-dicts/myspell-ru/myspell-ru-20150711-r2.ebuild b/app-dicts/myspell-ru/myspell-ru-20150711-r2.ebuild
index c17f08a5a8c0..64631d5e2f0b 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
index e1bbe39d25e7..d9e06a05afd8 100644
--- a/app-dicts/myspell-ru/myspell-ru-20150711.ebuild
+++ b/app-dicts/myspell-ru/myspell-ru-20150711.ebuild
@@ -22,4 +22,4 @@ SRC_URI="http://extensions.libreoffice.org/${EXT}/${DICT}/releases/${MY_PV}/${MY
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux"
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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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"
author	Michał Górny <mgorny@gentoo.org>	2019-10-11 17:32:32 +0200
committer	Michał Górny <mgorny@gentoo.org>	2019-10-11 17:32:32 +0200
commit	bcb2ba495e8850dac21085d4ec08857ce73958d5 (patch)
tree	d1615aa5b1bab56c2390f741431dfcae548d136b /app-dicts
parent	app-crypt: Remove *-fbsd KEYWORDS (diff)
download	gentoo-bcb2ba495e8850dac21085d4ec08857ce73958d5.tar.gz gentoo-bcb2ba495e8850dac21085d4ec08857ce73958d5.tar.bz2 gentoo-bcb2ba495e8850dac21085d4ec08857ce73958d5.zip