x11-misc: Remove *-fbsd KEYWORDS

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

72 files changed, 72 insertions, 72 deletions

diff --git a/x11-misc/alacarte/alacarte-3.11.91.ebuild b/x11-misc/alacarte/alacarte-3.11.91.ebuild
index 957334c13ffa..6d193c90411b 100644
--- a/x11-misc/alacarte/alacarte-3.11.91.ebuild
+++ b/x11-misc/alacarte/alacarte-3.11.91.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://git.gnome.org/browse/alacarte"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/x11-misc/apwal/apwal-0.4.5-r2.ebuild b/x11-misc/apwal/apwal-0.4.5-r2.ebuild
index 0ec395f371f8..90f5f0196d25 100644
--- a/x11-misc/apwal/apwal-0.4.5-r2.ebuild
+++ b/x11-misc/apwal/apwal-0.4.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://apwal.free.fr/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/x11-misc/bbcd/bbcd-0.3.1-r2.ebuild b/x11-misc/bbcd/bbcd-0.3.1-r2.ebuild
index 6bfbcd066254..58d5201d0f0c 100644
--- a/x11-misc/bbcd/bbcd-0.3.1-r2.ebuild
+++ b/x11-misc/bbcd/bbcd-0.3.1-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://tranber1.free.fr/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 RDEPEND="media-libs/libcdaudio
diff --git a/x11-misc/bbdate/bbdate-0.2.4-r2.ebuild b/x11-misc/bbdate/bbdate-0.2.4-r2.ebuild
index 4ec0772b332e..c1edcb8f5506 100644
--- a/x11-misc/bbdate/bbdate-0.2.4-r2.ebuild
+++ b/x11-misc/bbdate/bbdate-0.2.4-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/bbtools/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-misc/bbkeys/bbkeys-0.9.1-r1.ebuild b/x11-misc/bbkeys/bbkeys-0.9.1-r1.ebuild
index ca00b59d4ba5..1ea30179adf6 100644
--- a/x11-misc/bbkeys/bbkeys-0.9.1-r1.ebuild
+++ b/x11-misc/bbkeys/bbkeys-0.9.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 RDEPEND=">=x11-wm/blackbox-0.70.0"
diff --git a/x11-misc/bblaunch/bblaunch-0.0.3.ebuild b/x11-misc/bblaunch/bblaunch-0.0.3.ebuild
index 51d8f0de93b9..7028400502e8 100644
--- a/x11-misc/bblaunch/bblaunch-0.0.3.ebuild
+++ b/x11-misc/bblaunch/bblaunch-0.0.3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://blackboxwm.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="ppc x86 ~x86-fbsd"
+KEYWORDS="ppc x86"
 IUSE=""
 
 PATCHES=( "${FILESDIR}/${P}.patch" )
diff --git a/x11-misc/bbmail/bbmail-0.9.3-r1.ebuild b/x11-misc/bbmail/bbmail-0.9.3-r1.ebuild
index 6acd544ba6b4..68dd29947a56 100644
--- a/x11-misc/bbmail/bbmail-0.9.3-r1.ebuild
+++ b/x11-misc/bbmail/bbmail-0.9.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/bbtools/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/bbpager/bbpager-0.4.7-r1.ebuild b/x11-misc/bbpager/bbpager-0.4.7-r1.ebuild
index 34cebb7d9083..dd26ebbbdab7 100644
--- a/x11-misc/bbpager/bbpager-0.4.7-r1.ebuild
+++ b/x11-misc/bbpager/bbpager-0.4.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/bbtools/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="x11-wm/blackbox"
diff --git a/x11-misc/bbtime/bbtime-0.1.5-r1.ebuild b/x11-misc/bbtime/bbtime-0.1.5-r1.ebuild
index 0b4a858cf867..dd663336a5c4 100644
--- a/x11-misc/bbtime/bbtime-0.1.5-r1.ebuild
+++ b/x11-misc/bbtime/bbtime-0.1.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/bbtools/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-misc/cairo-clock/cairo-clock-0.3.4-r1.ebuild b/x11-misc/cairo-clock/cairo-clock-0.3.4-r1.ebuild
index 39f3d565031d..3cc8a83d4971 100644
--- a/x11-misc/cairo-clock/cairo-clock-0.3.4-r1.ebuild
+++ b/x11-misc/cairo-clock/cairo-clock-0.3.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://macslow.thepimp.net/projects/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.8
diff --git a/x11-misc/colord/colord-1.3.5.ebuild b/x11-misc/colord/colord-1.3.5.ebuild
index ced318c57eca..35e1273e8b79 100644
--- a/x11-misc/colord/colord-1.3.5.ebuild
+++ b/x11-misc/colord/colord-1.3.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0/2" # subslot = libcolord soname version
-KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 # We prefer policykit enabled by default, bug #448058
 IUSE="argyllcms examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala"
diff --git a/x11-misc/dmenu/dmenu-4.6.ebuild b/x11-misc/dmenu/dmenu-4.6.ebuild
index 5d02c8d814f9..1d874c2d3f67 100644
--- a/x11-misc/dmenu/dmenu-4.6.ebuild
+++ b/x11-misc/dmenu/dmenu-4.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 x86"
 IUSE="xinerama"
 
 RDEPEND="
diff --git a/x11-misc/dmenu/dmenu-4.8.ebuild b/x11-misc/dmenu/dmenu-4.8.ebuild
index 916ea5565a58..9cd1cc2ea328 100644
--- a/x11-misc/dmenu/dmenu-4.8.ebuild
+++ b/x11-misc/dmenu/dmenu-4.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 hppa ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm arm64 hppa ~ppc ~ppc64 x86"
 IUSE="xinerama"
 
 RDEPEND="
diff --git a/x11-misc/dmenu/dmenu-4.9.ebuild b/x11-misc/dmenu/dmenu-4.9.ebuild
index c8171c859d8b..29be48084efc 100644
--- a/x11-misc/dmenu/dmenu-4.9.ebuild
+++ b/x11-misc/dmenu/dmenu-4.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="xinerama"
 
 RDEPEND="
diff --git a/x11-misc/evolvotron/evolvotron-0.7.1.ebuild b/x11-misc/evolvotron/evolvotron-0.7.1.ebuild
index 3e902671da9b..dd964488f2e3 100644
--- a/x11-misc/evolvotron/evolvotron-0.7.1.ebuild
+++ b/x11-misc/evolvotron/evolvotron-0.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	dev-libs/boost:=
diff --git a/x11-misc/fbpager/fbpager-20090221-r1.ebuild b/x11-misc/fbpager/fbpager-20090221-r1.ebuild
index 844b63b2d8a8..8ab9daa7f17e 100644
--- a/x11-misc/fbpager/fbpager-20090221-r1.ebuild
+++ b/x11-misc/fbpager/fbpager-20090221-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~mips ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~mips ppc ~sparc x86"
 IUSE="+xrender"
 
 DEPEND="x11-libs/libX11
diff --git a/x11-misc/fluxter/fluxter-0.1.0.ebuild b/x11-misc/fluxter/fluxter-0.1.0.ebuild
index 302d3006b641..daadac869e34 100644
--- a/x11-misc/fluxter/fluxter-0.1.0.ebuild
+++ b/x11-misc/fluxter/fluxter-0.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.isomedia.com/homes/stevencooper/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 hppa ppc x86"
 IUSE=""
 
 DEPEND="x11-libs/libX11
diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
index 4baa9613b0c4..49ae6de71d79 100644
--- a/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
+++ b/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/gccmakedep/gccmakedep-9999.ebuild b/x11-misc/gccmakedep/gccmakedep-9999.ebuild
index 567131e90b73..f973a69d1557 100644
--- a/x11-misc/gccmakedep/gccmakedep-9999.ebuild
+++ b/x11-misc/gccmakedep/gccmakedep-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild b/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild
index 56f2c4a0bdca..0b164ecf00f6 100644
--- a/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild
+++ b/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.4:2"
diff --git a/x11-misc/genmenu/genmenu-1.1.0-r1.ebuild b/x11-misc/genmenu/genmenu-1.1.0-r1.ebuild
index e35bdf67eddd..06c91e668080 100644
--- a/x11-misc/genmenu/genmenu-1.1.0-r1.ebuild
+++ b/x11-misc/genmenu/genmenu-1.1.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://f00l.de/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND="app-shells/bash"
diff --git a/x11-misc/grsync/grsync-1.2.6.ebuild b/x11-misc/grsync/grsync-1.2.6.ebuild
index a799b0ffda98..4115d15bc3b3 100644
--- a/x11-misc/grsync/grsync-1.2.6.ebuild
+++ b/x11-misc/grsync/grsync-1.2.6.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="A gtk frontend to rsync"
 HOMEPAGE="http://www.opbyte.it/grsync/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 SRC_URI="http://www.opbyte.it/release/${P}.tar.gz"
 
diff --git a/x11-misc/grun/grun-0.9.3-r1.ebuild b/x11-misc/grun/grun-0.9.3-r1.ebuild
index ff8bab19f5b6..46abc996d141 100644
--- a/x11-misc/grun/grun-0.9.3-r1.ebuild
+++ b/x11-misc/grun/grun-0.9.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://grun.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/x11-misc/gxmessage/gxmessage-2.20.3.ebuild b/x11-misc/gxmessage/gxmessage-2.20.3.ebuild
index b8496ea3c9cb..3de3cbc42142 100644
--- a/x11-misc/gxmessage/gxmessage-2.20.3.ebuild
+++ b/x11-misc/gxmessage/gxmessage-2.20.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.20:2"
diff --git a/x11-misc/gxmessage/gxmessage-3.4.3.ebuild b/x11-misc/gxmessage/gxmessage-3.4.3.ebuild
index d06b773c8c53..48f933861c53 100644
--- a/x11-misc/gxmessage/gxmessage-3.4.3.ebuild
+++ b/x11-misc/gxmessage/gxmessage-3.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/habak/habak-0.2.5-r2.ebuild b/x11-misc/habak/habak-0.2.5-r2.ebuild
index d7fbf4a80f4f..0fe95e372ed3 100644
--- a/x11-misc/habak/habak-0.2.5-r2.ebuild
+++ b/x11-misc/habak/habak-0.2.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.gna.org/fvwm-crystal/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="media-libs/imlib2[X]
diff --git a/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
index 568bb39727f9..e44c11d26098 100644
--- a/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
+++ b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://tango.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-perl/XML-Simple-2
diff --git a/x11-misc/imake/imake-1.0.8.ebuild b/x11-misc/imake/imake-1.0.8.ebuild
index 3114c42dca1d..01a81c36cb19 100644
--- a/x11-misc/imake/imake-1.0.8.ebuild
+++ b/x11-misc/imake/imake-1.0.8.ebuild
@@ -7,7 +7,7 @@ XORG_STATIC=no
 inherit xorg-3
 
 DESCRIPTION="C preprocessor interface to the make utility"
-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=""
 
 RDEPEND="x11-misc/xorg-cf-files"
diff --git a/x11-misc/makedepend/makedepend-1.0.6.ebuild b/x11-misc/makedepend/makedepend-1.0.6.ebuild
index 7a08a112104e..2b5e681677d1 100644
--- a/x11-misc/makedepend/makedepend-1.0.6.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.6.ebuild
@@ -6,7 +6,7 @@ XORG_STATIC=no
 inherit xorg-3
 
 DESCRIPTION="create dependencies in makefiles"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-misc/menumaker/menumaker-0.99.10.ebuild b/x11-misc/menumaker/menumaker-0.99.10.ebuild
index a3ee47cd857d..c2950bbcf4ae 100644
--- a/x11-misc/menumaker/menumaker-0.99.10.ebuild
+++ b/x11-misc/menumaker/menumaker-0.99.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86"
 
 IUSE="doc"
 
diff --git a/x11-misc/menumaker/menumaker-0.99.11.ebuild b/x11-misc/menumaker/menumaker-0.99.11.ebuild
index ab1ac978b110..14d2b4ab3443 100644
--- a/x11-misc/menumaker/menumaker-0.99.11.ebuild
+++ b/x11-misc/menumaker/menumaker-0.99.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE="doc"
 
diff --git a/x11-misc/netwmpager/netwmpager-2.05.ebuild b/x11-misc/netwmpager/netwmpager-2.05.ebuild
index 88a563c5bce6..027b1dcf1cbf 100644
--- a/x11-misc/netwmpager/netwmpager-2.05.ebuild
+++ b/x11-misc/netwmpager/netwmpager-2.05.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild b/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild
index 690247f940f8..320c2bac021a 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild b/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild
index d05dfce74b96..d39b268759da 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild b/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
index 07a5e708c20e..96e4bd4b1523 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/obconf/obconf-2.0.4.ebuild b/x11-misc/obconf/obconf-2.0.4.ebuild
index 783341609823..1db86b9bcd5e 100644
--- a/x11-misc/obconf/obconf-2.0.4.ebuild
+++ b/x11-misc/obconf/obconf-2.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://openbox.org/dist/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-linux"
 IUSE="nls"
 
 RDEPEND="gnome-base/libglade:2.0
diff --git a/x11-misc/obmenu/obmenu-1.0-r1.ebuild b/x11-misc/obmenu/obmenu-1.0-r1.ebuild
index 939832fa0877..b595f0e3ad72 100644
--- a/x11-misc/obmenu/obmenu-1.0-r1.ebuild
+++ b/x11-misc/obmenu/obmenu-1.0-r1.ebuild
@@ -11,6 +11,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="dev-python/pygtk"
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild
index 229204b90d27..a6b8f274a815 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://people.freedesktop.org/~hadess/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-libs/glib-2
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
index 6d7292882049..bb690b733ed8 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://people.freedesktop.org/~hadess/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-libs/glib-2
diff --git a/x11-misc/slim/slim-1.3.6-r5.ebuild b/x11-misc/slim/slim-1.3.6-r5.ebuild
index 79f4540da207..a26c53c0e523 100644
--- a/x11-misc/slim/slim-1.3.6-r5.ebuild
+++ b/x11-misc/slim/slim-1.3.6-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86"
 IUSE="branding pam consolekit"
 REQUIRED_USE="consolekit? ( pam )"
 
diff --git a/x11-misc/slim/slim-9999.ebuild b/x11-misc/slim/slim-9999.ebuild
index 42f6d06b502f..39f4a426208f 100644
--- a/x11-misc/slim/slim-9999.ebuild
+++ b/x11-misc/slim/slim-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Simple Login Manager"
diff --git a/x11-misc/slock/slock-1.4.ebuild b/x11-misc/slock/slock-1.4.ebuild
index 8f6a2d972ac3..a8d677de1b6d 100644
--- a/x11-misc/slock/slock-1.4.ebuild
+++ b/x11-misc/slock/slock-1.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 hppa x86 ~x86-fbsd"
+KEYWORDS="amd64 hppa x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/synergy/synergy-1.9.1.ebuild b/x11-misc/synergy/synergy-1.9.1.ebuild
index 63e9799f3bab..4ea9dcfb6a03 100644
--- a/x11-misc/synergy/synergy-1.9.1.ebuild
+++ b/x11-misc/synergy/synergy-1.9.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="libressl qt5"
 RESTRICT="test"
 
diff --git a/x11-misc/synergy/synergy-2.0.0.ebuild b/x11-misc/synergy/synergy-2.0.0.ebuild
index 24579a8395f3..0177ac90cb2a 100644
--- a/x11-misc/synergy/synergy-2.0.0.ebuild
+++ b/x11-misc/synergy/synergy-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="libressl"
 
 S=${WORKDIR}/${PN}-core-${PV}-stable
diff --git a/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild b/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
index b2e610558164..b70d210e8079 100644
--- a/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
+++ b/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-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=""
 
 # there is nothing to compile for this package, all its contents are produced by
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild
index 7ddfb82395ea..9a8042ec4c5b 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="crypt fbcon libressl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
 
 COMMON_DEPEND="
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild
index 752f08e414d2..bc16d70cde2d 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild b/x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild
index 4283d2e664b0..fe9f53d5bb50 100644
--- a/x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild
+++ b/x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.nongnu.org/xbindkeys/xbindkeys.html"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="guile tk"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
index 78bfa94205cb..146b4687763b 100644
--- a/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
+++ b/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/data/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild b/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild
index cce03ac2a410..97f2790918e1 100644
--- a/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild
+++ b/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://daemon.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/${P}+i1
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ppc ppc64 x86"
 IUSE="motif"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-misc/xclip/xclip-0.13.ebuild b/x11-misc/xclip/xclip-0.13.ebuild
index 8faeb8b5ff9e..026629726c6e 100644
--- a/x11-misc/xclip/xclip-0.13.ebuild
+++ b/x11-misc/xclip/xclip-0.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/astrand/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/xdaliclock/xdaliclock-2.43.ebuild b/x11-misc/xdaliclock/xdaliclock-2.43.ebuild
index b10623d13aa6..abce1ab9418f 100644
--- a/x11-misc/xdaliclock/xdaliclock-2.43.ebuild
+++ b/x11-misc/xdaliclock/xdaliclock-2.43.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.jwz.org/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/xdaliclock/xdaliclock-2.44.ebuild b/x11-misc/xdaliclock/xdaliclock-2.44.ebuild
index c7df038b41b2..921988dc2b9a 100644
--- a/x11-misc/xdaliclock/xdaliclock-2.44.ebuild
+++ b/x11-misc/xdaliclock/xdaliclock-2.44.ebuild
@@ -9,7 +9,7 @@ SRC_URI="${HOMEPAGE}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
index fd618207d99d..0eaccb82918f 100644
--- a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
+++ b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-user-dirs"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
index 74943da43461..390f308666a4 100644
--- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
+++ b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://user-dirs.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="gtk"
 
 RDEPEND=""
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild
index 78ef40a63faa..ddf9215344fc 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://portland.freedesktop.org/download/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc +perl"
 
 RDEPEND="dev-util/desktop-file-utils
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
index c34ecf7d6812..b4745c6017ae 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://portland.freedesktop.org/download/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/x11-misc/xdiskusage/xdiskusage-1.51.ebuild b/x11-misc/xdiskusage/xdiskusage-1.51.ebuild
index 12e04ceab445..9cb3de113c7d 100644
--- a/x11-misc/xdiskusage/xdiskusage-1.51.ebuild
+++ b/x11-misc/xdiskusage/xdiskusage-1.51.ebuild
@@ -9,7 +9,7 @@ SRC_URI="${HOMEPAGE}${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	>=x11-libs/fltk-1.3:1
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.27.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.27.ebuild
index 357968640e39..29052cada6c0 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.27.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.27.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-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 ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index 75abe63eb007..d2d56f95cc31 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-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 ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/xmountains/xmountains-2.9-r1.ebuild b/x11-misc/xmountains/xmountains-2.9-r1.ebuild
index a77dfe86d278..712987fe73bd 100644
--- a/x11-misc/xmountains/xmountains-2.9-r1.ebuild
+++ b/x11-misc/xmountains/xmountains-2.9-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.epcc.ed.ac.uk/~spb/${PN}/${MY_P}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
index 20085e5fd1ba..f9404180f913 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
 
 LICENSE="MIT"
 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"
+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=""
 
 BDEPEND="
diff --git a/x11-misc/xpad/xpad-4.2.ebuild b/x11-misc/xpad/xpad-4.2.ebuild
index af7665499c64..3396c56dfc1c 100644
--- a/x11-misc/xpad/xpad-4.2.ebuild
+++ b/x11-misc/xpad/xpad-4.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/xpad/xpad-5.3.0.ebuild b/x11-misc/xpad/xpad-5.3.0.ebuild
index 683c0124fb09..7bf9ed46b966 100644
--- a/x11-misc/xpad/xpad-5.3.0.ebuild
+++ b/x11-misc/xpad/xpad-5.3.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.56:2
diff --git a/x11-misc/xpad/xpad-5.4.0.ebuild b/x11-misc/xpad/xpad-5.4.0.ebuild
index d71f4db47e6c..8f36edf945ac 100644
--- a/x11-misc/xpad/xpad-5.4.0.ebuild
+++ b/x11-misc/xpad/xpad-5.4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.56:2
diff --git a/x11-misc/xrestop/xrestop-0.4.ebuild b/x11-misc/xrestop/xrestop-0.4.ebuild
index 3cf2f929a6e2..3e4efec61250 100644
--- a/x11-misc/xrestop/xrestop-0.4.ebuild
+++ b/x11-misc/xrestop/xrestop-0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://projects.o-hand.com/sources/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
index 6c9b0653377f..d913e07eb4d0 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xscreensaver/xscreensaver-5.42.ebuild b/x11-misc/xscreensaver/xscreensaver-5.42.ebuild
index 9a77361bdd1e..d8f2b7352591 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.42.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.42.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild
index b28860a3b225..3c34928a227c 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xsnow/xsnow-1.42-r2.ebuild b/x11-misc/xsnow/xsnow-1.42-r2.ebuild
index e9d9084f1313..eb75c118fa4c 100644
--- a/x11-misc/xsnow/xsnow-1.42-r2.ebuild
+++ b/x11-misc/xsnow/xsnow-1.42-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}${P}.tar.gz"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/xsri/xsri-2.1.0-r3.ebuild b/x11-misc/xsri/xsri-2.1.0-r3.ebuild
index 679a28444897..d0b56abeec3b 100644
--- a/x11-misc/xsri/xsri-2.1.0-r3.ebuild
+++ b/x11-misc/xsri/xsri-2.1.0-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.fedoraproject.org/pub/fedora/linux/releases/15/Everythi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
diff --git a/x11-misc/xwrits/xwrits-2.26-r1.ebuild b/x11-misc/xwrits/xwrits-2.26-r1.ebuild
index d25703bca7fd..5e94357dfc64 100644
--- a/x11-misc/xwrits/xwrits-2.26-r1.ebuild
+++ b/x11-misc/xwrits/xwrits-2.26-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.lcdf.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11