From: Michał Górny <mgorny@gentoo.org>
Date: Fri, 11 Oct 2019 15:36:18 +0000 (+0200)
Subject: media-fonts: Remove *-fbsd KEYWORDS
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f32672c9afff2ca8425ed2d874889aa678d3607e;p=gentoo.git

media-fonts: Remove *-fbsd KEYWORDS

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---

diff --git a/media-fonts/alee-fonts/alee-fonts-13-r1.ebuild b/media-fonts/alee-fonts/alee-fonts-13-r1.ebuild
index 8b52886a9a34..b28110555bfc 100644
--- a/media-fonts/alee-fonts/alee-fonts-13-r1.ebuild
+++ b/media-fonts/alee-fonts/alee-fonts-13-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://turul.canonical.com/pool/main/t/ttf-alee/ttf-alee_${PV}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/aquafont/aquafont-2.7-r4.ebuild b/media-fonts/aquafont/aquafont-2.7-r4.ebuild
index 155ef7a81265..d1d9f44b0fd0 100644
--- a/media-fonts/aquafont/aquafont-2.7-r4.ebuild
+++ b/media-fonts/aquafont/aquafont-2.7-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.geocities.jp/teardrops_in_aquablue/fnt/${MY_P}.zip"
 
 LICENSE="aquafont"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="X"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild b/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild
index 05adf934127e..657d83c7c412 100644
--- a/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild
+++ b/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://aquablue.milkcafe.to/tears/font/${MY_P}.zip"
 
 LICENSE="aquafont"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild b/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild
index e8a4dc84f6a4..297eb3d825ab 100644
--- a/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild
+++ b/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/arabeyes/${MY_PN}_${PV}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="amd64 arm ia64 ppc s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ia64 ppc s390 sh sparc x86"
 
 FONT_SUFFIX="ttf"
 
diff --git a/media-fonts/arkpandora/arkpandora-2.04.ebuild b/media-fonts/arkpandora/arkpandora-2.04.ebuild
index 15a81423202c..a21a415219d8 100644
--- a/media-fonts/arkpandora/arkpandora-2.04.ebuild
+++ b/media-fonts/arkpandora/arkpandora-2.04.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tgz"
 
 LICENSE="BitstreamVera"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 FONT_S="${S}"
diff --git a/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild b/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild
index e9669cc08246..83ae795ec513 100644
--- a/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild
+++ b/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/non-gnu/chinese-fonts-truetype/gkai00mp.ttf.gz
 
 LICENSE="Arphic"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 DEPEND="media-gfx/fontforge"
diff --git a/media-fonts/artwiz-aleczapka-en/artwiz-aleczapka-en-1.3.ebuild b/media-fonts/artwiz-aleczapka-en/artwiz-aleczapka-en-1.3.ebuild
index 646d5babdda5..54c62739dd24 100644
--- a/media-fonts/artwiz-aleczapka-en/artwiz-aleczapka-en-1.3.ebuild
+++ b/media-fonts/artwiz-aleczapka-en/artwiz-aleczapka-en-1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/artwizaleczapka/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/media-fonts/artwiz-latin1/artwiz-latin1-1.1.ebuild b/media-fonts/artwiz-latin1/artwiz-latin1-1.1.ebuild
index 3d2bd7b24e39..4600923234fe 100644
--- a/media-fonts/artwiz-latin1/artwiz-latin1-1.1.ebuild
+++ b/media-fonts/artwiz-latin1/artwiz-latin1-1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/artwiz-latin1/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT=0
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 S=${WORKDIR}/artwiz-latin1
diff --git a/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild b/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild
index e69a979666be..bf383cf5b954 100644
--- a/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild
+++ b/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://kldp.net/${PN/-*}/release/865-${BDF_P}.tar.gz -> ${BDF_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="unicode"
 RESTRICT="binchecks strip"
 
diff --git a/media-fonts/cantarell/cantarell-0.101.ebuild b/media-fonts/cantarell/cantarell-0.101.ebuild
index 9f4627bcce2d..39f0ff55de62 100644
--- a/media-fonts/cantarell/cantarell-0.101.ebuild
+++ b/media-fonts/cantarell/cantarell-0.101.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/CantarellFonts"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="media-libs/fontconfig"
diff --git a/media-fonts/cantarell/cantarell-0.111.ebuild b/media-fonts/cantarell/cantarell-0.111.ebuild
index 6b7fe0e26ad0..39e8373a117b 100644
--- a/media-fonts/cantarell/cantarell-0.111.ebuild
+++ b/media-fonts/cantarell/cantarell-0.111.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/CantarellFonts"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="media-libs/fontconfig"
diff --git a/media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild b/media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild
index 0c158e0e3e2b..28ce35dbaa9a 100644
--- a/media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild
+++ b/media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="http://www.dustismo.com/fonts/Domestic_Manners.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc s390 sh sparc x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/clearsans/clearsans-1.00.ebuild b/media-fonts/clearsans/clearsans-1.00.ebuild
index 84e618b3ff87..d8195af05a17 100644
--- a/media-fonts/clearsans/clearsans-1.00.ebuild
+++ b/media-fonts/clearsans/clearsans-1.00.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://01.org/sites/default/files/downloads/clear-sans/${P}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="binchecks strip"
 
diff --git a/media-fonts/corefonts/corefonts-1-r7.ebuild b/media-fonts/corefonts/corefonts-1-r7.ebuild
index 47289fa29b14..8114f27cb079 100644
--- a/media-fonts/corefonts/corefonts-1-r7.ebuild
+++ b/media-fonts/corefonts/corefonts-1-r7.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://gentoo/EUupdate.EXE
 
 LICENSE="MSttfEULA"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="X tahoma"
 
 DEPEND="app-arch/cabextract"
diff --git a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.1-r2.ebuild b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.1-r2.ebuild
index b3625c5d0613..8bf97ee3051b 100644
--- a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.1-r2.ebuild
+++ b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.1-r2.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="Cronyx Cyrillic bitmap fonts for X"
 HOMEPAGE="http://koi8.pp.ru/frame.html?xwin.html#xwin_fonts"
 S="${WORKDIR}/cyrillic"
 SRC_URI="http://koi8.pp.ru/dist/x6rus-${PV}-bin.tgz"
-KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
 SLOT="0"
 LICENSE="freedist"
 DEPEND="x11-apps/mkfontdir"
diff --git a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild
index bcb39447ac75..c420a8ca405a 100644
--- a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild
+++ b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/main/x/xfonts-cronyx/${MY_P}.orig.tar.gz
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P//_/-}.orig"
diff --git a/media-fonts/culmus/culmus-0.120-r5.ebuild b/media-fonts/culmus/culmus-0.120-r5.ebuild
index 459dcc39ef6c..eaa1f5351242 100644
--- a/media-fonts/culmus/culmus-0.120-r5.ebuild
+++ b/media-fonts/culmus/culmus-0.120-r5.ebuild
@@ -36,7 +36,7 @@ SRC_URI+=" taamey? ( $(printf "http://culmus.sourceforge.net/taamim/%s.zip " ${T
 
 LICENSE="|| ( GPL-2 LICENSE-BITSTREAM ) ancient? ( MIT ) fancy? ( GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 s390 ~sh sparc x86"
 IUSE="ancient fancy fontforge taamey"
 
 FONT_CONF=( "${T}/65-culmus.conf" )
diff --git a/media-fonts/culmus/culmus-0.133.ebuild b/media-fonts/culmus/culmus-0.133.ebuild
index ff86f58b23a5..cc33ae78e598 100644
--- a/media-fonts/culmus/culmus-0.133.ebuild
+++ b/media-fonts/culmus/culmus-0.133.ebuild
@@ -36,7 +36,7 @@ SRC_URI+=" taamey? ( $(printf "http://culmus.sourceforge.net/taamim/%s.zip " ${T
 
 LICENSE="|| ( GPL-2 LICENSE-BITSTREAM ) ancient? ( MIT ) fancy? ( GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="ancient fancy fontforge taamey"
 
 FONT_CONF=( "${T}/65-culmus.conf" )
diff --git a/media-fonts/dejavu/dejavu-2.35.ebuild b/media-fonts/dejavu/dejavu-2.35.ebuild
index 12d919ff5a1f..231aff9c53c4 100644
--- a/media-fonts/dejavu/dejavu-2.35.ebuild
+++ b/media-fonts/dejavu/dejavu-2.35.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="BitstreamVera"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="fontforge"
 
 DEPEND="fontforge? ( x11-apps/mkfontscale
diff --git a/media-fonts/dejavu/dejavu-2.37.ebuild b/media-fonts/dejavu/dejavu-2.37.ebuild
index c33edd6f118f..2fbef3de226c 100644
--- a/media-fonts/dejavu/dejavu-2.37.ebuild
+++ b/media-fonts/dejavu/dejavu-2.37.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="BitstreamVera"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="fontforge"
 
 DEPEND="fontforge? (
diff --git a/media-fonts/efont-unicode/efont-unicode-0.4.2-r1.ebuild b/media-fonts/efont-unicode/efont-unicode-0.4.2-r1.ebuild
index 356aa38adb4e..2508edbe1170 100644
--- a/media-fonts/efont-unicode/efont-unicode-0.4.2-r1.ebuild
+++ b/media-fonts/efont-unicode/efont-unicode-0.4.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://openlab.jp/efont/dist/unicode-bdf/${MY_P}.tar.bz2"
 # naga10 has free-noncomm license
 LICENSE="public-domain BAEKMUK BSD MIT HPND free-noncomm"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x64-macos"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-fonts/encodings/encodings-1.0.5.ebuild b/media-fonts/encodings/encodings-1.0.5.ebuild
index 6bc36202fd69..e120cad060d2 100644
--- a/media-fonts/encodings/encodings-1.0.5.ebuild
+++ b/media-fonts/encodings/encodings-1.0.5.ebuild
@@ -9,7 +9,7 @@ inherit font xorg-2
 
 DESCRIPTION="X.Org font encodings"
 
-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 ~x64-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 ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="x11-apps/mkfontscale
diff --git a/media-fonts/essays1743/essays1743-2.100.ebuild b/media-fonts/essays1743/essays1743-2.100.ebuild
index d0e2c8e5c52d..fd5e6cac081c 100644
--- a/media-fonts/essays1743/essays1743-2.100.ebuild
+++ b/media-fonts/essays1743/essays1743-2.100.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.thibault.org/fonts/essays/${P}-1-ttf.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 OFL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~x64-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/media-fonts/farsi-fonts/farsi-fonts-0.4.ebuild b/media-fonts/farsi-fonts/farsi-fonts-0.4.ebuild
index c83abbf3f31f..e7dc251557a9 100644
--- a/media-fonts/farsi-fonts/farsi-fonts-0.4.ebuild
+++ b/media-fonts/farsi-fonts/farsi-fonts-0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.farsiweb.ir/font/farsifonts-${PV}.zip"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc s390 sh sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc s390 sh sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r1.ebuild b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r1.ebuild
index 32c80570cc4f..c036fd6743f7 100644
--- a/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r1.ebuild
+++ b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Adobe bitmap fonts"
 
-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=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r1.ebuild b/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r1.ebuild
index 32c80570cc4f..c036fd6743f7 100644
--- a/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r1.ebuild
+++ b/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Adobe bitmap fonts"
 
-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=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r1.ebuild b/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r1.ebuild
index 8b2875995fd0..0b01ab673f57 100644
--- a/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r1.ebuild
+++ b/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Adobe Utopia bitmap fonts"
 
-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=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r1.ebuild b/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r1.ebuild
index 8b2875995fd0..0b01ab673f57 100644
--- a/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r1.ebuild
+++ b/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Adobe Utopia bitmap fonts"
 
-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=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r1.ebuild b/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r1.ebuild
index 2f538d02c61b..1126e2353da2 100644
--- a/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r1.ebuild
+++ b/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r1.ebuild
@@ -6,5 +6,5 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Adobe Utopia Type 1 fonts"
 
-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=""
diff --git a/media-fonts/font-alias/font-alias-1.0.3-r1.ebuild b/media-fonts/font-alias/font-alias-1.0.3-r1.ebuild
index 805afc47057a..88d1d3218a13 100644
--- a/media-fonts/font-alias/font-alias-1.0.3-r1.ebuild
+++ b/media-fonts/font-alias/font-alias-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org font aliases"
 
-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 ~x64-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 ~x64-solaris ~x86-solaris"
 IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r1.ebuild b/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r1.ebuild
index 8025fc4836f7..8b49319c71eb 100644
--- a/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org arabic bitmap fonts"
 
-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=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r1.ebuild b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r1.ebuild
index 4ec726c9f149..20c8a1c960f9 100644
--- a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r1.ebuild
+++ b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 DESCRIPTION="X.Org Bigelow & Holmes bitmap fonts"
 
 LICENSE="public-domain" # bitmap font, not copyrightable
-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=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r1.ebuild b/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r1.ebuild
index 4ec726c9f149..20c8a1c960f9 100644
--- a/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r1.ebuild
+++ b/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 DESCRIPTION="X.Org Bigelow & Holmes bitmap fonts"
 
 LICENSE="public-domain" # bitmap font, not copyrightable
-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=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r1.ebuild b/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r1.ebuild
index 17df212ac95c..c84399d76bed 100644
--- a/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r1.ebuild
+++ b/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 DESCRIPTION="X.Org Bigelow & Holmes Lucida bitmap fonts"
 
 LICENSE="public-domain"		# bitmap font, not copyrightable
-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=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r1.ebuild b/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r1.ebuild
index 17df212ac95c..c84399d76bed 100644
--- a/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r1.ebuild
+++ b/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 DESCRIPTION="X.Org Bigelow & Holmes Lucida bitmap fonts"
 
 LICENSE="public-domain"		# bitmap font, not copyrightable
-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=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r1.ebuild b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r1.ebuild
index 6af4e42794b5..cc72f258b62b 100644
--- a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r1.ebuild
+++ b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r1.ebuild
@@ -7,5 +7,5 @@ inherit xorg-2
 DESCRIPTION="X.Org Bigelow & Holmes TrueType fonts"
 LICENSE="bh-luxi"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-macos"
 IUSE=""
diff --git a/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r1.ebuild b/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r1.ebuild
index 4711f533aec0..faff41d157cd 100644
--- a/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r1.ebuild
+++ b/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r1.ebuild
@@ -7,5 +7,5 @@ inherit xorg-2
 DESCRIPTION="X.Org Bigelow & Holmes Type 1 fonts"
 LICENSE="bh-luxi"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x64-macos"
 IUSE=""
diff --git a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r1.ebuild b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r1.ebuild
index b9020d419e67..9b356434e0ac 100644
--- a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r1.ebuild
+++ b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Bitstream bitmap fonts"
 
-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=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r1.ebuild b/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r1.ebuild
index b9020d419e67..9b356434e0ac 100644
--- a/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r1.ebuild
+++ b/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Bitstream bitmap fonts"
 
-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=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r1.ebuild b/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r1.ebuild
index fc5ab16a94db..ed7b358a6039 100644
--- a/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r1.ebuild
+++ b/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r1.ebuild
@@ -6,5 +6,5 @@ inherit xorg-2
 
 DESCRIPTION="Bitstream Speedo fonts"
 
-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=""
diff --git a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r1.ebuild b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r1.ebuild
index 90b8b64ddc97..b8449bfaae14 100644
--- a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r1.ebuild
+++ b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r1.ebuild
@@ -6,5 +6,5 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Bitstream Type 1 fonts"
 
-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/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r1.ebuild b/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r1.ebuild
index e337bc61457e..bf75a144fdda 100644
--- a/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r1.ebuild
+++ b/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Cronyx cyrillic fonts"
 
-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=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r1.ebuild b/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r1.ebuild
index dd9742e54115..d40186432d21 100644
--- a/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org cursor font"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r1.ebuild b/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r1.ebuild
index 56627462fbe3..8420e25e81d7 100644
--- a/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Daewoo fonts"
 
-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=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r1.ebuild b/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r1.ebuild
index 99355af347e7..6c98992d503e 100644
--- a/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org DEC fonts"
 
-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=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r1.ebuild b/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r1.ebuild
index 59e57eafc9a1..13a4f12c6443 100644
--- a/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r1.ebuild
+++ b/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r1.ebuild
@@ -6,5 +6,5 @@ inherit xorg-2
 
 DESCRIPTION="X.Org IBM Courier font"
 
-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=""
diff --git a/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r1.ebuild b/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r1.ebuild
index 08c4afcd25b5..91a7b9ebbb5f 100644
--- a/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org the Institute of Software, Academia Sinica (chinese) fonts"
 
-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=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r1.ebuild b/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r1.ebuild
index fafddfb6b983..93a8458ec561 100644
--- a/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="X.Org JIS (japanese) fonts"
-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=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r1.ebuild b/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r1.ebuild
index 3a04e9f5529e..ff8165f6aeaa 100644
--- a/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 DESCRIPTION="X.Org micro-misc font"
 LICENSE="public-domain"
 
-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=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r1.ebuild b/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r1.ebuild
index 223522cef475..65e63e2e1364 100644
--- a/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r1.ebuild
+++ b/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org misc-cyrillic fonts"
 
-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=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.3-r1.ebuild b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.3-r1.ebuild
index 0428a508d971..2760b862736b 100644
--- a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.3-r1.ebuild
+++ b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="Miscellaneous Ethiopic fonts"
 
-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=""
 
 FONT_OPTIONS="--with-otf-fontdir=${EPREFIX}/usr/share/fonts/OTF"
diff --git a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r1.ebuild b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r1.ebuild
index 60b85c3ec9eb..6c60f6f6fb0c 100644
--- a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r1.ebuild
+++ b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r1.ebuild
@@ -8,5 +8,5 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Syriac fonts"
 
-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/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r1.ebuild b/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r1.ebuild
index 044238341fdb..a0478266925a 100644
--- a/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r1.ebuild
+++ b/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org miscellaneous fonts"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r1.ebuild b/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r1.ebuild
index c071a16705e1..3eb618ef9535 100644
--- a/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org ClearlyU fonts"
 
-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=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r1.ebuild b/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r1.ebuild
index c97053d0e309..b8e6d26c0706 100644
--- a/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r1.ebuild
+++ b/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Schumacher fonts"
 
-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=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r1.ebuild b/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r1.ebuild
index 9e24a3b1f0b0..89e0da1f44b4 100644
--- a/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r1.ebuild
+++ b/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Screen cyrillic fonts"
 
-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=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r1.ebuild b/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r1.ebuild
index b8c0766de49e..9ff157c6bef3 100644
--- a/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Sony fonts"
 
-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=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r1.ebuild b/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r1.ebuild
index 010123af1d71..cdee730f86e9 100644
--- a/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r1.ebuild
+++ b/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Sun fonts"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-util/font-util-1.3.2-r1.ebuild b/media-fonts/font-util/font-util-1.3.2-r1.ebuild
index 007e3ae66794..e6361e5fe4ed 100644
--- a/media-fonts/font-util/font-util-1.3.2-r1.ebuild
+++ b/media-fonts/font-util/font-util-1.3.2-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/font/util.git"
 DESCRIPTION="X.Org font utilities"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r1.ebuild b/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r1.ebuild
index e1e2bd209e20..fade1862f1d9 100644
--- a/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r1.ebuild
+++ b/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Winitzki cyrillic font"
 
-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=""
 
 DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r1.ebuild b/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r1.ebuild
index 4f7bd70015f7..cfeeda45ff84 100644
--- a/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r1.ebuild
+++ b/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r1.ebuild
@@ -6,5 +6,5 @@ inherit xorg-2
 
 DESCRIPTION="X.Org XFree86 Type 1 font"
 
-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=""
diff --git a/media-fonts/free-bangla-font/free-bangla-font-0.2.ebuild b/media-fonts/free-bangla-font/free-bangla-font-0.2.ebuild
index 67e4922006d1..5353896850eb 100644
--- a/media-fonts/free-bangla-font/free-bangla-font-0.2.ebuild
+++ b/media-fonts/free-bangla-font/free-bangla-font-0.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="${SRC_BASE}/${AKAASH_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc s390 sh x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc s390 sh x86"
 IUSE=""
 
 FONT_SUFFIX="ttf TTF"
diff --git a/media-fonts/freefont/freefont-20120503.ebuild b/media-fonts/freefont/freefont-20120503.ebuild
index 51f4099c69cd..94771b0cff88 100644
--- a/media-fonts/freefont/freefont-20120503.ebuild
+++ b/media-fonts/freefont/freefont-20120503.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/freefont/${PN}-ttf-${PV}.zip
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/freefonts/freefonts-0.10-r3.ebuild b/media-fonts/freefonts/freefonts-0.10-r3.ebuild
index c96d6c9da397..7427d02579ef 100644
--- a/media-fonts/freefonts/freefonts-0.10-r3.ebuild
+++ b/media-fonts/freefonts/freefonts-0.10-r3.ebuild
@@ -8,7 +8,7 @@ inherit font
 DESCRIPTION="A Collection of Free Type1 Fonts"
 SRC_URI="mirror://gimp/fonts/${P}.tar.gz"
 HOMEPAGE="http://www.gimp.org"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 SLOT="0"
 LICENSE="freedist"
 IUSE="X"
diff --git a/media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild b/media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild
index f08ca248cd55..afe49f5f2acc 100644
--- a/media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild
+++ b/media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Japanese TrueType fonts designed for screen and print"
 HOMEPAGE="http://x-tt.sourceforge.jp/fs_fonts/"
 SRC_URI="mirror://sourceforge.jp/x-tt/7862/${MY_P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 LICENSE="public-domain"
 SLOT=0
 
diff --git a/media-fonts/hkscs-ming/hkscs-ming-1.0_pre20030919-r2.ebuild b/media-fonts/hkscs-ming/hkscs-ming-1.0_pre20030919-r2.ebuild
index 5cafb202d5fb..91452223537d 100644
--- a/media-fonts/hkscs-ming/hkscs-ming-1.0_pre20030919-r2.ebuild
+++ b/media-fonts/hkscs-ming/hkscs-ming-1.0_pre20030919-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.ogcio.gov.hk/en/business/tech_promotion/ccli/terms/doc/mandr
 
 LICENSE="HKSCS-2001"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ia64 ppc s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 arm ia64 ppc s390 sh sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/media-fonts/hunkyfonts/hunkyfonts-0.3.1.ebuild b/media-fonts/hunkyfonts/hunkyfonts-0.3.1.ebuild
index 26edec80449d..b1a013836c95 100644
--- a/media-fonts/hunkyfonts/hunkyfonts-0.3.1.ebuild
+++ b/media-fonts/hunkyfonts/hunkyfonts-0.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/hunkyfonts/${P}.tar.bz2"
 
 LICENSE="BitstreamVera public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
 IUSE=""
 
 FONT_S="${WORKDIR}/${P}/TTF"
diff --git a/media-fonts/inconsolata/inconsolata-20140821.ebuild b/media-fonts/inconsolata/inconsolata-20140821.ebuild
index 43eeae2fcb7c..172532cee460 100644
--- a/media-fonts/inconsolata/inconsolata-20140821.ebuild
+++ b/media-fonts/inconsolata/inconsolata-20140821.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.xz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/intlfonts/intlfonts-1.2.1.ebuild b/media-fonts/intlfonts/intlfonts-1.2.1.ebuild
index 8d879e2d656d..7d5465ee4446 100644
--- a/media-fonts/intlfonts/intlfonts-1.2.1.ebuild
+++ b/media-fonts/intlfonts/intlfonts-1.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 
 DEPEND="x11-apps/bdftopcf
 		x11-apps/mkfontdir"
diff --git a/media-fonts/ipaex/ipaex-002.01.ebuild b/media-fonts/ipaex/ipaex-002.01.ebuild
index da80e8d35f54..51cbef83d03d 100644
--- a/media-fonts/ipaex/ipaex-002.01.ebuild
+++ b/media-fonts/ipaex/ipaex-002.01.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://dl.ipafont.ipa.go.jp/IPAexfont/${MY_P}.zip"
 
 LICENSE="IPAfont"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 RESTRICT="binchecks strip test"
 
diff --git a/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild b/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
index eff1b88faa20..c1a4754ed835 100644
--- a/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
+++ b/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://freebsd.sin.openmirrors.asia/pub/FreeBSD/ports/local-distfiles/h
 
 LICENSE="grass-ipafonts mplus-fonts public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 s390 sh sparc x86"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/media-fonts/ja-ipafonts/ja-ipafonts-003.02-r1.ebuild b/media-fonts/ja-ipafonts/ja-ipafonts-003.02-r1.ebuild
index f1d488d422da..d8778eae89cc 100644
--- a/media-fonts/ja-ipafonts/ja-ipafonts-003.02-r1.ebuild
+++ b/media-fonts/ja-ipafonts/ja-ipafonts-003.02-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://dl.ipafont.ipa.go.jp/IPAfont/${MY_P}.zip"
 
 LICENSE="IPAfont"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 RESTRICT="binchecks strip"
 
diff --git a/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild b/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
index 467fceb0366a..0fd0be000a1e 100644
--- a/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
+++ b/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://dl.ipafont.ipa.go.jp/IPAfont/${MY_P}.zip"
 
 LICENSE="IPAfont"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 RESTRICT="binchecks strip"
 
diff --git a/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r2.ebuild b/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r2.ebuild
index f7f912173349..c20636c3f49f 100644
--- a/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r2.ebuild
+++ b/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://gentoo/jiskan16-2004-1.bdf.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
 IUSE=""
 RESTRICT="binchecks strip"
 
diff --git a/media-fonts/kacst-fonts/kacst-fonts-2.01.ebuild b/media-fonts/kacst-fonts/kacst-fonts-2.01.ebuild
index 8966321b7ec5..b81857a9a458 100644
--- a/media-fonts/kacst-fonts/kacst-fonts-2.01.ebuild
+++ b/media-fonts/kacst-fonts/kacst-fonts-2.01.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/arabeyes/${P//-/_}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~s390 ~sh ~sparc x86"
 IUSE=""
 
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild b/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
index 457f99f735a8..e17e46617c7e 100644
--- a/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
+++ b/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/efont/5411/${P}.tar.bz2"
 
 LICENSE="free-noncomm"
 SLOT="0"
-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"
+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"
 IUSE=""
 
 S=${WORKDIR}/${PN}-${PV:0:8}
diff --git a/media-fonts/konfont/konfont-0.1.ebuild b/media-fonts/konfont/konfont-0.1.ebuild
index 070d6c721c27..f0040e33c07d 100644
--- a/media-fonts/konfont/konfont-0.1.ebuild
+++ b/media-fonts/konfont/konfont-0.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://packages.debian.org/stable/utils/konfont"
 
 LICENSE="public-domain"
 SLOT=0
-KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild b/media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild
index c4f3ffcfa89f..371687a31729 100644
--- a/media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild
+++ b/media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://sourceforge.net/projects/xfonts/"
 LICENSE="public-domain"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${PN}-src"
diff --git a/media-fonts/lfpfonts-var/lfpfonts-var-0.84.ebuild b/media-fonts/lfpfonts-var/lfpfonts-var-0.84.ebuild
index 15d705c8237f..a84f06240eba 100644
--- a/media-fonts/lfpfonts-var/lfpfonts-var-0.84.ebuild
+++ b/media-fonts/lfpfonts-var/lfpfonts-var-0.84.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xfonts/${PN}-src-${PV}.tar.bz2"
 LICENSE="public-domain"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${PN}-src"
diff --git a/media-fonts/lohit-assamese/lohit-assamese-2.91.5.ebuild b/media-fonts/lohit-assamese/lohit-assamese-2.91.5.ebuild
index fe68268cb956..3b48d57c11de 100644
--- a/media-fonts/lohit-assamese/lohit-assamese-2.91.5.ebuild
+++ b/media-fonts/lohit-assamese/lohit-assamese-2.91.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-bengali/lohit-bengali-2.91.5.ebuild b/media-fonts/lohit-bengali/lohit-bengali-2.91.5.ebuild
index 66d5edfbc73d..297b96607b71 100644
--- a/media-fonts/lohit-bengali/lohit-bengali-2.91.5.ebuild
+++ b/media-fonts/lohit-bengali/lohit-bengali-2.91.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-devanagari/lohit-devanagari-2.95.4.ebuild b/media-fonts/lohit-devanagari/lohit-devanagari-2.95.4.ebuild
index bc842a6985a1..6f6c5d1a62f6 100644
--- a/media-fonts/lohit-devanagari/lohit-devanagari-2.95.4.ebuild
+++ b/media-fonts/lohit-devanagari/lohit-devanagari-2.95.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-fonts/lohit-fonts-2.20150220.ebuild b/media-fonts/lohit-fonts/lohit-fonts-2.20150220.ebuild
index a4ffddc7e98b..5dc0c9ae7151 100644
--- a/media-fonts/lohit-fonts/lohit-fonts-2.20150220.ebuild
+++ b/media-fonts/lohit-fonts/lohit-fonts-2.20150220.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://pagure.io/lohit"
 LICENSE="OFL-1.1"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/media-fonts/lohit-fonts/lohit-fonts-2.4.2.ebuild b/media-fonts/lohit-fonts/lohit-fonts-2.4.2.ebuild
index a3b29c8d4edd..07b6f635b177 100644
--- a/media-fonts/lohit-fonts/lohit-fonts-2.4.2.ebuild
+++ b/media-fonts/lohit-fonts/lohit-fonts-2.4.2.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 SRC_URI="https://releases.pagure.org/lohit/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DOCS="AUTHORS ChangeLog README"
diff --git a/media-fonts/lohit-gujarati/lohit-gujarati-2.92.4.ebuild b/media-fonts/lohit-gujarati/lohit-gujarati-2.92.4.ebuild
index 41736dffe01d..ae7a88f49b8e 100644
--- a/media-fonts/lohit-gujarati/lohit-gujarati-2.92.4.ebuild
+++ b/media-fonts/lohit-gujarati/lohit-gujarati-2.92.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-gurmukhi/lohit-gurmukhi-2.91.2.ebuild b/media-fonts/lohit-gurmukhi/lohit-gurmukhi-2.91.2.ebuild
index 97930edf3b53..a73bd5a63ac0 100644
--- a/media-fonts/lohit-gurmukhi/lohit-gurmukhi-2.91.2.ebuild
+++ b/media-fonts/lohit-gurmukhi/lohit-gurmukhi-2.91.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-kannada/lohit-kannada-2.5.4.ebuild b/media-fonts/lohit-kannada/lohit-kannada-2.5.4.ebuild
index 5db24becb826..d43dfb278093 100644
--- a/media-fonts/lohit-kannada/lohit-kannada-2.5.4.ebuild
+++ b/media-fonts/lohit-kannada/lohit-kannada-2.5.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-malayalam/lohit-malayalam-2.92.2.ebuild b/media-fonts/lohit-malayalam/lohit-malayalam-2.92.2.ebuild
index 884312147327..b25eece5881d 100644
--- a/media-fonts/lohit-malayalam/lohit-malayalam-2.92.2.ebuild
+++ b/media-fonts/lohit-malayalam/lohit-malayalam-2.92.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-marathi/lohit-marathi-2.94.2.ebuild b/media-fonts/lohit-marathi/lohit-marathi-2.94.2.ebuild
index b601c8ff3814..89bde8d205de 100644
--- a/media-fonts/lohit-marathi/lohit-marathi-2.94.2.ebuild
+++ b/media-fonts/lohit-marathi/lohit-marathi-2.94.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-nepali/lohit-nepali-2.94.2.ebuild b/media-fonts/lohit-nepali/lohit-nepali-2.94.2.ebuild
index 96c6b8551b9f..11608c34c15d 100644
--- a/media-fonts/lohit-nepali/lohit-nepali-2.94.2.ebuild
+++ b/media-fonts/lohit-nepali/lohit-nepali-2.94.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-odia/lohit-odia-2.91.2.ebuild b/media-fonts/lohit-odia/lohit-odia-2.91.2.ebuild
index 9378774b4db7..1c2abff4f043 100644
--- a/media-fonts/lohit-odia/lohit-odia-2.91.2.ebuild
+++ b/media-fonts/lohit-odia/lohit-odia-2.91.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-tamil-classical/lohit-tamil-classical-2.5.4.ebuild b/media-fonts/lohit-tamil-classical/lohit-tamil-classical-2.5.4.ebuild
index c387bd48ce22..ea5d977fbd88 100644
--- a/media-fonts/lohit-tamil-classical/lohit-tamil-classical-2.5.4.ebuild
+++ b/media-fonts/lohit-tamil-classical/lohit-tamil-classical-2.5.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-tamil/lohit-tamil-2.91.3.ebuild b/media-fonts/lohit-tamil/lohit-tamil-2.91.3.ebuild
index d971d4a7ee3a..de39ced3d9bf 100644
--- a/media-fonts/lohit-tamil/lohit-tamil-2.91.3.ebuild
+++ b/media-fonts/lohit-tamil/lohit-tamil-2.91.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/lohit-telugu/lohit-telugu-2.5.5.ebuild b/media-fonts/lohit-telugu/lohit-telugu-2.5.5.ebuild
index 81d9fe516574..e18dad1194e8 100644
--- a/media-fonts/lohit-telugu/lohit-telugu-2.5.5.ebuild
+++ b/media-fonts/lohit-telugu/lohit-telugu-2.5.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/lohit/${PN}-${FONT_SUFFIX}-${PV}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="!<media-fonts/lohit-fonts-2.20150220"
diff --git a/media-fonts/mathematica-fonts/mathematica-fonts-10.0.ebuild b/media-fonts/mathematica-fonts/mathematica-fonts-10.0.ebuild
index 2161ea5d8414..1055ca7025e0 100644
--- a/media-fonts/mathematica-fonts/mathematica-fonts-10.0.ebuild
+++ b/media-fonts/mathematica-fonts/mathematica-fonts-10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://support.wolfram.com/kb/data/uploads/2014/08/TrueType.zip -> ${P}
 
 LICENSE="WRI-EULA"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RESTRICT="binchecks mirror strip"
diff --git a/media-fonts/mikachan-font-otf/mikachan-font-otf-9.1-r1.ebuild b/media-fonts/mikachan-font-otf/mikachan-font-otf-9.1-r1.ebuild
index 7517f0267aa3..8ef1c6b0b225 100644
--- a/media-fonts/mikachan-font-otf/mikachan-font-otf-9.1-r1.ebuild
+++ b/media-fonts/mikachan-font-otf/mikachan-font-otf-9.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 FONT_SUFFIX="otf"
diff --git a/media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild b/media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild
index dcab31410e8e..15e62429e2c8 100644
--- a/media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild
+++ b/media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${P/-ttc/}.tar.bz2
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 FONT_S="${WORKDIR}/${P/-ttc}"
diff --git a/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r2.ebuild b/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r2.ebuild
index 62a2dc8ce53d..4150ce579921 100644
--- a/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r2.ebuild
+++ b/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge.jp/mikachan/5513/${MY_PN}-${PV}.tar.bz2
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 FONT_S="${WORKDIR}"
diff --git a/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20130617-r1.ebuild b/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20130617-r1.ebuild
index a9b375acb29c..5c6ac42ed26d 100644
--- a/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20130617-r1.ebuild
+++ b/media-fonts/mix-mplus-ipa/mix-mplus-ipa-20130617-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://sourceforge.jp/mix-mplus-ipa/59021/migmix-1m-${MY_PV}.zip
 
 LICENSE="mplus-fonts IPAfont"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/media-fonts/monafont/monafont-2.90-r2.ebuild b/media-fonts/monafont/monafont-2.90-r2.ebuild
index fe4d5382ea04..d6f100c47b5d 100644
--- a/media-fonts/monafont/monafont-2.90-r2.ebuild
+++ b/media-fonts/monafont/monafont-2.90-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE="truetype"
 
 DEPEND="x11-apps/bdftopcf
diff --git a/media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild b/media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild
index fff0e9b0377d..925a07acbc80 100644
--- a/media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild
+++ b/media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/5030/${MY_P}.tar.gz"
 
 LICENSE="mplus-fonts"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="X"
 
 DEPEND="x11-apps/mkfontdir
diff --git a/media-fonts/nepali-fonts/nepali-fonts-1-r1.ebuild b/media-fonts/nepali-fonts/nepali-fonts-1-r1.ebuild
index f3213bc6e474..523c6b8a5501 100644
--- a/media-fonts/nepali-fonts/nepali-fonts-1-r1.ebuild
+++ b/media-fonts/nepali-fonts/nepali-fonts-1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild
index 0c3aee0affb2..26357de82656 100644
--- a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild
+++ b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="Arphic"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 FONT_SUFFIX="ttf ttc"
diff --git a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2.ebuild b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2.ebuild
index b8517aac0d0d..8d6ae0c99fad 100644
--- a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2.ebuild
+++ b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="Arphic"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86"
 IUSE=""
 
 FONT_SUFFIX="ttf ttc"
diff --git a/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild b/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild
index bc3efb853d05..ecaa05f44c6d 100644
--- a/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild
+++ b/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.tsg.ne.jp/GANA/S/pcf2bdf/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc s390 sh sparc x86"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/media-fonts/ricty/ricty-3.2.0-r2.ebuild b/media-fonts/ricty/ricty-3.2.0-r2.ebuild
index 0c8d7ee3e056..40fca3d3a27a 100644
--- a/media-fonts/ricty/ricty-3.2.0-r2.ebuild
+++ b/media-fonts/ricty/ricty-3.2.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/yascentur/${MY_PN}/tarball/${PV} -> ${MY_PN}-${PV}.t
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-fonts/inconsolata
diff --git a/media-fonts/sazanami/sazanami-20040629.ebuild b/media-fonts/sazanami/sazanami-20040629.ebuild
index 1c6d06d41c6d..5ea245da4d47 100644
--- a/media-fonts/sazanami/sazanami-20040629.ebuild
+++ b/media-fonts/sazanami/sazanami-20040629.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/efont/10087/${P}.tar.bz2"
 
 LICENSE="mplus-fonts public-domain" #446166
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild b/media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild
index 14294140d151..d7b3e8a5fa07 100644
--- a/media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild
+++ b/media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.suse.com/pub/suse/i386/9.1/suse/noarch/${RPM_P}.rpm"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ~ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 S="${WORKDIR}/usr/X11R6/lib/X11/fonts/misc/sgi"
diff --git a/media-fonts/shinonome/shinonome-0.9.11.ebuild b/media-fonts/shinonome/shinonome-0.9.11.ebuild
index 4cbe5db989b0..1a05e6cfaefc 100644
--- a/media-fonts/shinonome/shinonome-0.9.11.ebuild
+++ b/media-fonts/shinonome/shinonome-0.9.11.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://openlab.jp/efont/shinonome/"
 
 LICENSE="public-domain"
 SLOT=0
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86"
 
 DEPEND="x11-apps/bdftopcf"
 RDEPEND=""
diff --git a/media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild b/media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild
index b951283c6b9b..ce058f143f01 100644
--- a/media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild
+++ b/media-fonts/sil-abyssinica/sil-abyssinica-1.500.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://software.sil.org/downloads/r/${PN/sil-/}/${MY_P}.zip"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-macos ~x86-macos"
 IUSE="doc"
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-arabicfonts/sil-arabicfonts-2.100.ebuild b/media-fonts/sil-arabicfonts/sil-arabicfonts-2.100.ebuild
index b3e2c4b22a28..c18be2cfa143 100644
--- a/media-fonts/sil-arabicfonts/sil-arabicfonts-2.100.ebuild
+++ b/media-fonts/sil-arabicfonts/sil-arabicfonts-2.100.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://software.sil.org/downloads/r/scheherazade/${MY_P1}.zip
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86"
 
 DEPEND="app-arch/unzip"
 RDEPEND=""
diff --git a/media-fonts/sil-charis/sil-charis-5.000-r1.ebuild b/media-fonts/sil-charis/sil-charis-5.000-r1.ebuild
index e5f7df65a7c7..326ae693298c 100644
--- a/media-fonts/sil-charis/sil-charis-5.000-r1.ebuild
+++ b/media-fonts/sil-charis/sil-charis-5.000-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&medi
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x64-macos"
 IUSE="compact"
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-doulos/sil-doulos-5.000-r1.ebuild b/media-fonts/sil-doulos/sil-doulos-5.000-r1.ebuild
index 28ca843c4eb8..e29647831ad7 100644
--- a/media-fonts/sil-doulos/sil-doulos-5.000-r1.ebuild
+++ b/media-fonts/sil-doulos/sil-doulos-5.000-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&medi
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-ezra/sil-ezra-2.51.ebuild b/media-fonts/sil-ezra/sil-ezra-2.51.ebuild
index 3dec8222c804..0aa20b2c137e 100644
--- a/media-fonts/sil-ezra/sil-ezra-2.51.ebuild
+++ b/media-fonts/sil-ezra/sil-ezra-2.51.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.zip"
 
 LICENSE="MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~ppc s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ~ppc s390 sh sparc x86"
 IUSE="doc"
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-galatia/sil-galatia-2.1.ebuild b/media-fonts/sil-galatia/sil-galatia-2.1.ebuild
index 276138f6d171..1b253b60cefb 100644
--- a/media-fonts/sil-galatia/sil-galatia-2.1.ebuild
+++ b/media-fonts/sil-galatia/sil-galatia-2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.zip"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild b/media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild
index 07ca20894df1..dcd7cd32b9a2 100644
--- a/media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild
+++ b/media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&medi
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="compact doc"
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild b/media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild
index 6f2bc08773f6..0372415ae3ee 100644
--- a/media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild
+++ b/media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_PN}-${PV}.zip"
 
 LICENSE="OFL"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/source-han-sans/source-han-sans-1.001.ebuild b/media-fonts/source-han-sans/source-han-sans-1.001.ebuild
index 08b0d686a634..8ec6f586e158 100644
--- a/media-fonts/source-han-sans/source-han-sans-1.001.ebuild
+++ b/media-fonts/source-han-sans/source-han-sans-1.001.ebuild
@@ -17,7 +17,7 @@ SRC_URI="l10n_ja? ( https://dev.gentoo.org/~jstein/dist/${PN}-ja-${PV}.tar.xz )
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x64-macos"
 IUSE="l10n_ja l10n_ko +l10n_zh-CN l10n_zh-TW"
 REQUIRED_USE="|| ( l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW )"
 
diff --git a/media-fonts/source-han-sans/source-han-sans-1.004.ebuild b/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
index 4ab248414568..a24712f8e941 100644
--- a/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
+++ b/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x64-macos"
 IUSE="l10n_ja l10n_ko +l10n_zh-CN l10n_zh-TW"
 REQUIRED_USE="|| ( l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW )"
 
diff --git a/media-fonts/source-pro/source-pro-20141211.ebuild b/media-fonts/source-pro/source-pro-20141211.ebuild
index 734d5c39d580..65ecfc88a7a6 100644
--- a/media-fonts/source-pro/source-pro-20141211.ebuild
+++ b/media-fonts/source-pro/source-pro-20141211.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/adobe-fonts/source-sans-pro/archive/${SANSV}.tar.gz
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x64-macos"
 IUSE="cjk"
 
 RDEPEND="media-libs/fontconfig
diff --git a/media-fonts/source-pro/source-pro-20160608.ebuild b/media-fonts/source-pro/source-pro-20160608.ebuild
index d3bc5fd415c1..998049146066 100644
--- a/media-fonts/source-pro/source-pro-20160608.ebuild
+++ b/media-fonts/source-pro/source-pro-20160608.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/adobe-fonts/source-sans-pro/archive/${SANSV}.tar.gz
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x64-macos"
 IUSE="cjk"
 
 RDEPEND="media-libs/fontconfig
diff --git a/media-fonts/source-pro/source-pro-20170111.ebuild b/media-fonts/source-pro/source-pro-20170111.ebuild
index cf4b216d2bb1..234d165aa57e 100644
--- a/media-fonts/source-pro/source-pro-20170111.ebuild
+++ b/media-fonts/source-pro/source-pro-20170111.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/adobe-fonts/source-sans-pro/archive/${SANSV}.tar.gz
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x64-macos"
 IUSE="cjk"
 
 RDEPEND="media-libs/fontconfig
diff --git a/media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild b/media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild
index 09a62a883adc..96b3e26dd736 100644
--- a/media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild
+++ b/media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86"
 
 DEPEND="app-arch/unzip"
 RDEPEND=""
diff --git a/media-fonts/terminus-font/terminus-font-4.46.ebuild b/media-fonts/terminus-font/terminus-font-4.46.ebuild
index 2ec48a03373b..b3e178148461 100644
--- a/media-fonts/terminus-font/terminus-font-4.46.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.46.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="OFL-1.1 GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote
 	ru-dv +ru-g ru-i ru-k"
 
diff --git a/media-fonts/terminus-font/terminus-font-4.47.ebuild b/media-fonts/terminus-font/terminus-font-4.47.ebuild
index 989749e2e555..d82100c3b33e 100644
--- a/media-fonts/terminus-font/terminus-font-4.47.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.47.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="OFL-1.1 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote
 	ru-dv +ru-g ru-i ru-k"
 
diff --git a/media-fonts/terminus-font/terminus-font-4.48.ebuild b/media-fonts/terminus-font/terminus-font-4.48.ebuild
index 989749e2e555..d82100c3b33e 100644
--- a/media-fonts/terminus-font/terminus-font-4.48.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.48.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="OFL-1.1 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote
 	ru-dv +ru-g ru-i ru-k"
 
diff --git a/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild b/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild
index 5cf87bbc624c..7cccd401498a 100644
--- a/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild
+++ b/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.zip"
 
 LICENSE="bakoma"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/ttf-bitstream-vera/ttf-bitstream-vera-1.10-r3.ebuild b/media-fonts/ttf-bitstream-vera/ttf-bitstream-vera-1.10-r3.ebuild
index f0815fd143e3..430ad8c7745e 100644
--- a/media-fonts/ttf-bitstream-vera/ttf-bitstream-vera-1.10-r3.ebuild
+++ b/media-fonts/ttf-bitstream-vera/ttf-bitstream-vera-1.10-r3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnome.org/fonts/"
 LICENSE="BitstreamVera"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/unfonts-extra/unfonts-extra-1.0.2_pre080608-r1.ebuild b/media-fonts/unfonts-extra/unfonts-extra-1.0.2_pre080608-r1.ebuild
index 542c8a2f39aa..0b241ee71c4a 100644
--- a/media-fonts/unfonts-extra/unfonts-extra-1.0.2_pre080608-r1.ebuild
+++ b/media-fonts/unfonts-extra/unfonts-extra-1.0.2_pre080608-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/un-fonts-extra-${MY_PV}-r1.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild b/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild
index a2cb79753e87..dc3701816864 100644
--- a/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild
+++ b/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/un-fonts-core-${MY_PV}-r1.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/unifont/unifont-10.0.04.ebuild b/media-fonts/unifont/unifont-10.0.04.ebuild
index 73cdd4ba54e9..c7f38721c874 100644
--- a/media-fonts/unifont/unifont-10.0.04.ebuild
+++ b/media-fonts/unifont/unifont-10.0.04.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="fontforge utils"
 
 DEPEND="
diff --git a/media-fonts/unifont/unifont-10.0.05.ebuild b/media-fonts/unifont/unifont-10.0.05.ebuild
index 73cdd4ba54e9..c7f38721c874 100644
--- a/media-fonts/unifont/unifont-10.0.05.ebuild
+++ b/media-fonts/unifont/unifont-10.0.05.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="fontforge utils"
 
 DEPEND="
diff --git a/media-fonts/unifont/unifont-10.0.06.ebuild b/media-fonts/unifont/unifont-10.0.06.ebuild
index e084b87ee295..e204ab76d11c 100644
--- a/media-fonts/unifont/unifont-10.0.06.ebuild
+++ b/media-fonts/unifont/unifont-10.0.06.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="fontforge utils"
 
 DEPEND="
diff --git a/media-fonts/unifont/unifont-11.0.02.ebuild b/media-fonts/unifont/unifont-11.0.02.ebuild
index 54818db00cf6..09349057d2fa 100644
--- a/media-fonts/unifont/unifont-11.0.02.ebuild
+++ b/media-fonts/unifont/unifont-11.0.02.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="fontforge utils"
 
 DEPEND="
diff --git a/media-fonts/unifont/unifont-9.0.06.ebuild b/media-fonts/unifont/unifont-9.0.06.ebuild
index 9de087f46b3e..15a35aca4b72 100644
--- a/media-fonts/unifont/unifont-9.0.06.ebuild
+++ b/media-fonts/unifont/unifont-9.0.06.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="fontforge utils"
 
 DEPEND="
diff --git a/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild b/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild
index 82c60c5d4025..3e98c730fec2 100644
--- a/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild
+++ b/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild
@@ -31,7 +31,7 @@ DESCRIPTION="free good quality fonts gpl'd by URW++"
 HOMEPAGE="http://www.urwpp.de/"
 SRC_URI="mirror://gentoo/${PN}-${MY_PV}.fc13.src.rpm"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild b/media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild
index e514104c2bc0..51b90e1532f3 100644
--- a/media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild
+++ b/media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/vntex/urwvn-ttf/${MY_P}-ttf.tar.bz2"
 
 LICENSE="GPL-2 Aladdin" # see bug #434262
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}-ttf"
diff --git a/media-fonts/vc-fonts/vc-fonts-20020207-r2.ebuild b/media-fonts/vc-fonts/vc-fonts-20020207-r2.ebuild
index 32652ae0e51c..2ac1d4fc9943 100644
--- a/media-fonts/vc-fonts/vc-fonts-20020207-r2.ebuild
+++ b/media-fonts/vc-fonts/vc-fonts-20020207-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://vico.kleinplanet.de/files/${P}.tar.bz2
 		mirror://gentoo/bleed3.bdf.gz"
 HOMEPAGE="http://vico.kleinplanet.de/"
 
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86"
 LICENSE="GPL-2"
 SLOT=0
 IUSE=""
diff --git a/media-fonts/vlgothic/vlgothic-20110722.ebuild b/media-fonts/vlgothic/vlgothic-20110722.ebuild
index 25a17e9f156f..15d9b83c3142 100644
--- a/media-fonts/vlgothic/vlgothic-20110722.ebuild
+++ b/media-fonts/vlgothic/vlgothic-20110722.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/vlgothic/52711/VLGothic-${PV}.tar.bz2"
 # sazanami -> BSD-2
 LICENSE="vlgothic mplus-fonts BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/VLGothic"
diff --git a/media-fonts/vlgothic/vlgothic-20141206.ebuild b/media-fonts/vlgothic/vlgothic-20141206.ebuild
index 39a185621749..d41bfc2fafdd 100644
--- a/media-fonts/vlgothic/vlgothic-20141206.ebuild
+++ b/media-fonts/vlgothic/vlgothic-20141206.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/62375/${MY_PN}-${PV}.tar.bz2"
 # sazanami -> BSD-2
 LICENSE="vlgothic mplus-fonts BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}"
diff --git a/media-fonts/vollkorn/vollkorn-2.1.ebuild b/media-fonts/vollkorn/vollkorn-2.1.ebuild
index fb0ce28b9cc9..4be7e54553b6 100644
--- a/media-fonts/vollkorn/vollkorn-2.1.ebuild
+++ b/media-fonts/vollkorn/vollkorn-2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://friedrichalthausen.de/Vollkorn-${PV}.zip"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/media-fonts/wqy-bitmapfont/wqy-bitmapfont-1.0.0_rc1.ebuild b/media-fonts/wqy-bitmapfont/wqy-bitmapfont-1.0.0_rc1.ebuild
index 78e1d2da34fd..031d261e8dd0 100644
--- a/media-fonts/wqy-bitmapfont/wqy-bitmapfont-1.0.0_rc1.ebuild
+++ b/media-fonts/wqy-bitmapfont/wqy-bitmapfont-1.0.0_rc1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/wqy/${MY_PN}-pcf-${PV/_rc/-RC}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ~s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/media-fonts/wqy-zenhei/wqy-zenhei-0.9.46.ebuild b/media-fonts/wqy-zenhei/wqy-zenhei-0.9.46.ebuild
index 1ffc48121423..f67cd84ea337 100644
--- a/media-fonts/wqy-zenhei/wqy-zenhei-0.9.46.ebuild
+++ b/media-fonts/wqy-zenhei/wqy-zenhei-0.9.46.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/wqy/${PN}-snapshot/${PV}-May/${P}-May.tar.
 
 LICENSE="GPL-2-with-font-exception"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE=""
 
 S="${WORKDIR}/${PN}"
diff --git a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild
index fa902fead1a6..1f561ed25693 100644
--- a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild
+++ b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.pobox.com/~jmknoble/fonts/${MY_P}.tar.gz"
 HOMEPAGE="http://www.jmknoble.net/fonts/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
 IUSE=""
 
 DEPEND="x11-misc/imake
diff --git a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
index b539d05e352a..bbb83bf52277 100644
--- a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
+++ b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.pobox.com/~jmknoble/fonts/${MY_P}.tar.gz"
 HOMEPAGE="http://www.jmknoble.net/fonts/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 DEPEND="x11-misc/imake
diff --git a/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild b/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
index c332b898655b..fcc568527812 100644
--- a/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
+++ b/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://freebsd.sinica.edu.tw/"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
 IUSE=""
 
 # Only installs fonts