[gentoo-commits] repo/gentoo:master commit in: net-libs/mbedtls/, net-libs/openpgm/, net-libs/miniupnpc/, net-libs/libnet/, ...

[Michał Górny]

commit:     81d737608c1f18b6acb0a0b6103b9801b8676cf3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 11 15:36:47 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct 11 15:36:47 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81d73760

net-libs: Remove *-fbsd KEYWORDS

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

 net-libs/c-client/c-client-2007f-r6.ebuild                          | 2 +-
 net-libs/courier-authlib/courier-authlib-0.65.0-r3.ebuild           | 2 +-
 net-libs/courier-authlib/courier-authlib-0.66.4.ebuild              | 2 +-
 net-libs/courier-authlib/courier-authlib-0.67.0.ebuild              | 2 +-
 net-libs/courier-authlib/courier-authlib-0.68.0-r1.ebuild           | 2 +-
 net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild           | 2 +-
 net-libs/glib-networking/glib-networking-2.58.0.ebuild              | 2 +-
 net-libs/glib-networking/glib-networking-2.60.3.ebuild              | 2 +-
 net-libs/gnet/gnet-2.0.8-r2.ebuild                                  | 2 +-
 net-libs/gnutls/gnutls-3.6.7.ebuild                                 | 2 +-
 net-libs/gnutls/gnutls-3.6.9.ebuild                                 | 2 +-
 net-libs/gssdp/gssdp-1.0.3.ebuild                                   | 2 +-
 net-libs/gtk-vnc/gtk-vnc-0.9.0.ebuild                               | 2 +-
 net-libs/ldns/ldns-1.7.0-r2.ebuild                                  | 2 +-
 net-libs/ldns/ldns-1.7.1-r1.ebuild                                  | 2 +-
 net-libs/ldns/ldns-1.7.1.ebuild                                     | 2 +-
 net-libs/libasyncns/libasyncns-0.8-r4.ebuild                        | 2 +-
 net-libs/libetpan/libetpan-1.9.3.ebuild                             | 2 +-
 net-libs/libgadu/libgadu-1.11.4.ebuild                              | 2 +-
 net-libs/libgadu/libgadu-1.12.2.ebuild                              | 2 +-
 net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild                          | 2 +-
 net-libs/liblockfile/liblockfile-1.09.ebuild                        | 2 +-
 net-libs/liblockfile/liblockfile-1.16.ebuild                        | 2 +-
 net-libs/libnatpmp/libnatpmp-20130911.ebuild                        | 2 +-
 net-libs/libnatpmp/libnatpmp-20140401-r1.ebuild                     | 2 +-
 net-libs/libnatpmp/libnatpmp-20150609.ebuild                        | 2 +-
 net-libs/libnet/libnet-1.0.2a-r5.ebuild                             | 2 +-
 net-libs/libnet/libnet-1.0.2a-r6.ebuild                             | 2 +-
 net-libs/libnet/libnet-1.2_rc3-r1.ebuild                            | 2 +-
 net-libs/libnet/libnet-1.2_rc4.ebuild                               | 2 +-
 net-libs/libntlm/libntlm-1.4.ebuild                                 | 2 +-
 net-libs/libotr/libotr-4.1.1.ebuild                                 | 2 +-
 net-libs/libpcap/libpcap-1.8.1-r2.ebuild                            | 2 +-
 net-libs/libpcap/libpcap-1.8.1.ebuild                               | 2 +-
 net-libs/libpcap/libpcap-1.9.0-r1.ebuild                            | 2 +-
 net-libs/libpcap/libpcap-1.9.0.ebuild                               | 2 +-
 net-libs/libpcap/libpcap-1.9.1.ebuild                               | 2 +-
 net-libs/libproxy/libproxy-0.4.13-r2.ebuild                         | 2 +-
 net-libs/libsmi/libsmi-0.4.8-r1.ebuild                              | 2 +-
 net-libs/libsmi/libsmi-0.5.0.ebuild                                 | 2 +-
 net-libs/libsoup/libsoup-2.58.2.ebuild                              | 2 +-
 net-libs/libsoup/libsoup-2.62.3.ebuild                              | 2 +-
 net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild                            | 2 +-
 net-libs/libsrtp/libsrtp-1.6.0.ebuild                               | 2 +-
 net-libs/libsrtp/libsrtp-2.2.0.ebuild                               | 2 +-
 net-libs/libssh/libssh-0.9.0.ebuild                                 | 2 +-
 net-libs/libssh/libssh-9999.ebuild                                  | 2 +-
 net-libs/libssh2/libssh2-1.8.0-r1.ebuild                            | 2 +-
 net-libs/libssh2/libssh2-1.8.0-r2.ebuild                            | 2 +-
 net-libs/libssh2/libssh2-1.8.2.ebuild                               | 2 +-
 net-libs/libssh2/libssh2-1.9.0-r1.ebuild                            | 2 +-
 net-libs/libssh2/libssh2-1.9.0.ebuild                               | 2 +-
 net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10-r1.ebuild | 2 +-
 net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10.ebuild    | 2 +-
 net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12-r1.ebuild | 2 +-
 net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12.ebuild    | 2 +-
 net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13-r1.ebuild | 2 +-
 net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13.ebuild    | 2 +-
 net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0-r1.ebuild  | 2 +-
 net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0.ebuild     | 2 +-
 net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1-r1.ebuild  | 2 +-
 net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1.ebuild     | 2 +-
 net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.2-r1.ebuild  | 2 +-
 net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.2.ebuild     | 2 +-
 net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild                     | 2 +-
 net-libs/libtorrent/libtorrent-0.13.7.ebuild                        | 2 +-
 net-libs/libtorrent/libtorrent-0.13.8.ebuild                        | 2 +-
 net-libs/libupnp/libupnp-1.6.21.ebuild                              | 2 +-
 net-libs/libupnp/libupnp-1.6.25.ebuild                              | 2 +-
 net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild                 | 2 +-
 net-libs/mbedtls/mbedtls-2.10.0.ebuild                              | 2 +-
 net-libs/mbedtls/mbedtls-2.12.0.ebuild                              | 2 +-
 net-libs/mbedtls/mbedtls-2.16.3.ebuild                              | 2 +-
 net-libs/mbedtls/mbedtls-2.17.0.ebuild                              | 2 +-
 net-libs/miniupnpc/miniupnpc-2.1.20190625.ebuild                    | 2 +-
 net-libs/miniupnpc/miniupnpc-2.1.20190824.ebuild                    | 2 +-
 net-libs/neon/neon-0.30.2.ebuild                                    | 2 +-
 net-libs/nghttp2/nghttp2-1.39.2.ebuild                              | 2 +-
 net-libs/nghttp2/nghttp2-9999.ebuild                                | 2 +-
 net-libs/openpgm/openpgm-5.1.118-r1.ebuild                          | 2 +-
 net-libs/openpgm/openpgm-5.2.122.ebuild                             | 2 +-
 net-libs/openslp/openslp-1.2.1-r3.ebuild                            | 2 +-
 net-libs/openslp/openslp-2.0.0-r4.ebuild                            | 2 +-
 net-libs/openslp/openslp-2.0.0-r5.ebuild                            | 2 +-
 net-libs/ortp/ortp-0.23.0-r1.ebuild                                 | 2 +-
 net-libs/serf/serf-1.3.8-r1.ebuild                                  | 2 +-
 net-libs/serf/serf-1.3.8.ebuild                                     | 2 +-
 net-libs/serf/serf-1.3.9.ebuild                                     | 2 +-
 net-libs/srt/srt-1.3.2.ebuild                                       | 2 +-
 net-libs/srt/srt-9999.ebuild                                        | 2 +-
 net-libs/stem/stem-1.5.4.ebuild                                     | 2 +-
 net-libs/stem/stem-1.6.0.ebuild                                     | 2 +-
 net-libs/stem/stem-1.7.0.ebuild                                     | 2 +-
 net-libs/stem/stem-1.7.1.ebuild                                     | 2 +-
 net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild                | 2 +-
 net-libs/udns/udns-0.4.ebuild                                       | 2 +-
 net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild                        | 2 +-
 net-libs/zeromq/zeromq-2.2.0.ebuild                                 | 2 +-
 98 files changed, 98 insertions(+), 98 deletions(-)

diff --git a/net-libs/c-client/c-client-2007f-r6.ebuild b/net-libs/c-client/c-client-2007f-r6.ebuild
index b46fffc10c6..46091dce439 100644
--- a/net-libs/c-client/c-client-2007f-r6.ebuild
+++ b/net-libs/c-client/c-client-2007f-r6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z
 
 LICENSE="Apache-2.0"
 SLOT="0"
-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="doc +ipv6 kerberos kernel_linux kernel_FreeBSD libressl pam ssl static-libs topal chappa"
 
 RDEPEND="

diff --git a/net-libs/courier-authlib/courier-authlib-0.65.0-r3.ebuild b/net-libs/courier-authlib/courier-authlib-0.65.0-r3.ebuild
index 2095ea50118..6fc87e62f91 100644
--- a/net-libs/courier-authlib/courier-authlib-0.65.0-r3.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.65.0-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=4
 inherit autotools eutils flag-o-matic multilib user
 
-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"
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"

diff --git a/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild b/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
index d4ce92e9f4c..5a020599079 100644
--- a/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils flag-o-matic multilib user
 
-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"
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"

diff --git a/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild b/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild
index 479e13180b5..ce05cfe302c 100644
--- a/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 inherit flag-o-matic
 
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"

diff --git a/net-libs/courier-authlib/courier-authlib-0.68.0-r1.ebuild b/net-libs/courier-authlib/courier-authlib-0.68.0-r1.ebuild
index 80cd19e2ee7..b7b6d1e342f 100644
--- a/net-libs/courier-authlib/courier-authlib-0.68.0-r1.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.68.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 inherit flag-o-matic
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"

diff --git a/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild b/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild
index 2024a651e4d..8f1800c094e 100644
--- a/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 inherit flag-o-matic
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"

diff --git a/net-libs/glib-networking/glib-networking-2.58.0.ebuild b/net-libs/glib-networking/glib-networking-2.58.0.ebuild
index 3c2e24b0db5..e66b3ddb0b5 100644
--- a/net-libs/glib-networking/glib-networking-2.58.0.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.58.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl test"
-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 ~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"
 
 RDEPEND="
 	>=dev-libs/glib-2.55.1:2[${MULTILIB_USEDEP}]

diff --git a/net-libs/glib-networking/glib-networking-2.60.3.ebuild b/net-libs/glib-networking/glib-networking-2.60.3.ebuild
index 3e42d46ebe0..c8650eaef36 100644
--- a/net-libs/glib-networking/glib-networking-2.60.3.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.60.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl test"
-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 ~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"
 
 RDEPEND="
 	>=dev-libs/glib-2.55.1:2[${MULTILIB_USEDEP}]

diff --git a/net-libs/gnet/gnet-2.0.8-r2.ebuild b/net-libs/gnet/gnet-2.0.8-r2.ebuild
index 2f980c56423..28be75c5683 100644
--- a/net-libs/gnet/gnet-2.0.8-r2.ebuild
+++ b/net-libs/gnet/gnet-2.0.8-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GNetLibrary"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 
 # FIXME: automagic use of valgrind

diff --git a/net-libs/gnutls/gnutls-3.6.7.ebuild b/net-libs/gnutls/gnutls-3.6.7.ebuild
index f4e177f5f37..c9fd2245dd6 100644
--- a/net-libs/gnutls/gnutls-3.6.7.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3 LGPL-2.1+"
 SLOT="0/30" # libgnutls.so number
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~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 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
 
 REQUIRED_USE="

diff --git a/net-libs/gnutls/gnutls-3.6.9.ebuild b/net-libs/gnutls/gnutls-3.6.9.ebuild
index a70df5748a1..04d15d72385 100644
--- a/net-libs/gnutls/gnutls-3.6.9.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3 LGPL-2.1+"
 SLOT="0/30" # libgnutls.so number
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
 
 REQUIRED_USE="

diff --git a/net-libs/gssdp/gssdp-1.0.3.ebuild b/net-libs/gssdp/gssdp-1.0.3.ebuild
index e293cf95d39..c098ed4321f 100644
--- a/net-libs/gssdp/gssdp-1.0.3.ebuild
+++ b/net-libs/gssdp/gssdp-1.0.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
 
 LICENSE="LGPL-2"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ppc64 ~sparc x86"
 IUSE="+introspection gtk"
 
 RDEPEND="

diff --git a/net-libs/gtk-vnc/gtk-vnc-0.9.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.9.0.ebuild
index fee5a8ee585..d60e56b36ee 100644
--- a/net-libs/gtk-vnc/gtk-vnc-0.9.0.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-0.9.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="examples +introspection pulseaudio sasl +vala"
 REQUIRED_USE="
 	vala? ( introspection )

diff --git a/net-libs/ldns/ldns-1.7.0-r2.ebuild b/net-libs/ldns/ldns-1.7.0-r2.ebuild
index bc6972bb668..be44e801681 100644
--- a/net-libs/ldns/ldns-1.7.0-r2.ebuild
+++ b/net-libs/ldns/ldns-1.7.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+dane doc +ecdsa gost libressl python static-libs vim-syntax"
 
 # configure will die if ecdsa is enabled and ssl is not

diff --git a/net-libs/ldns/ldns-1.7.1-r1.ebuild b/net-libs/ldns/ldns-1.7.1-r1.ebuild
index 071708308e4..119fd33b225 100644
--- a/net-libs/ldns/ldns-1.7.1-r1.ebuild
+++ b/net-libs/ldns/ldns-1.7.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+dane doc +ecdsa ed25519 ed448 gost libressl python static-libs vim-syntax"
 
 # configure will die if ecdsa is enabled and ssl is not

diff --git a/net-libs/ldns/ldns-1.7.1.ebuild b/net-libs/ldns/ldns-1.7.1.ebuild
index a9377702763..dc73bf8b91f 100644
--- a/net-libs/ldns/ldns-1.7.1.ebuild
+++ b/net-libs/ldns/ldns-1.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+dane doc +ecdsa ed25519 ed448 gost libressl python static-libs vim-syntax"
 
 # configure will die if ecdsa is enabled and ssl is not

diff --git a/net-libs/libasyncns/libasyncns-0.8-r4.ebuild b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
index f3eda0c2fec..6765072f31a 100644
--- a/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
+++ b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://0pointer.de/lennart/projects/libasyncns/${P}.tar.gz"
 SLOT="0"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc debug"
 

diff --git a/net-libs/libetpan/libetpan-1.9.3.ebuild b/net-libs/libetpan/libetpan-1.9.3.ebuild
index e2b6c80ffef..acac8681ac9 100644
--- a/net-libs/libetpan/libetpan-1.9.3.ebuild
+++ b/net-libs/libetpan/libetpan-1.9.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="berkdb gnutls ipv6 liblockfile libressl lmdb sasl ssl static-libs"
 
 # BerkDB is only supported up to version 6.0

diff --git a/net-libs/libgadu/libgadu-1.11.4.ebuild b/net-libs/libgadu/libgadu-1.11.4.ebuild
index e269958d970..1e153cd06f8 100644
--- a/net-libs/libgadu/libgadu-1.11.4.ebuild
+++ b/net-libs/libgadu/libgadu-1.11.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 RESTRICT="test"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
 IUSE="doc gnutls ssl static-libs threads"
 

diff --git a/net-libs/libgadu/libgadu-1.12.2.ebuild b/net-libs/libgadu/libgadu-1.12.2.ebuild
index 0f59edce2af..f4c3aec40de 100644
--- a/net-libs/libgadu/libgadu-1.12.2.ebuild
+++ b/net-libs/libgadu/libgadu-1.12.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://toxygen.net/libgadu/"
 SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
 IUSE="doc gnutls ssl static-libs test threads"
 

diff --git a/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild b/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
index 76c3906bfd6..93845f3adaf 100644
--- a/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/gsasl/"
 SRC_URI="mirror://gnu/${PN/lib}/${P}.tar.gz"
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="idn gcrypt kerberos nls ntlm static-libs"
 DEPEND="
 	gcrypt? ( dev-libs/libgcrypt:0 )

diff --git a/net-libs/liblockfile/liblockfile-1.09.ebuild b/net-libs/liblockfile/liblockfile-1.09.ebuild
index 2e9ea14533d..c2e69373adb 100644
--- a/net-libs/liblockfile/liblockfile-1.09.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.09.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="LGPL-2"
 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 ~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 ~x86-solaris"
 IUSE=""
 
 pkg_setup() {

diff --git a/net-libs/liblockfile/liblockfile-1.16.ebuild b/net-libs/liblockfile/liblockfile-1.16.ebuild
index d09b6e189d0..7dd77e302bb 100644
--- a/net-libs/liblockfile/liblockfile-1.16.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/miquels/liblockfile/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="acct-group/mail"

diff --git a/net-libs/libnatpmp/libnatpmp-20130911.ebuild b/net-libs/libnatpmp/libnatpmp-20130911.ebuild
index 465682c0de6..87dec82d0ac 100644
--- a/net-libs/libnatpmp/libnatpmp-20130911.ebuild
+++ b/net-libs/libnatpmp/libnatpmp-20130911.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~sparc x86"
 IUSE="static-libs"
 
 src_prepare() {

diff --git a/net-libs/libnatpmp/libnatpmp-20140401-r1.ebuild b/net-libs/libnatpmp/libnatpmp-20140401-r1.ebuild
index 4dea416d72b..3b9b7619953 100644
--- a/net-libs/libnatpmp/libnatpmp-20140401-r1.ebuild
+++ b/net-libs/libnatpmp/libnatpmp-20140401-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs"
 
 src_prepare() {

diff --git a/net-libs/libnatpmp/libnatpmp-20150609.ebuild b/net-libs/libnatpmp/libnatpmp-20150609.ebuild
index f0b0e91989d..95c1b853efb 100644
--- a/net-libs/libnatpmp/libnatpmp-20150609.ebuild
+++ b/net-libs/libnatpmp/libnatpmp-20150609.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs"
 
 src_prepare() {

diff --git a/net-libs/libnet/libnet-1.0.2a-r5.ebuild b/net-libs/libnet/libnet-1.0.2a-r5.ebuild
index cef3b46b4cf..d0a9ef24bb0 100644
--- a/net-libs/libnet/libnet-1.0.2a-r5.ebuild
+++ b/net-libs/libnet/libnet-1.0.2a-r5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.packetfactory.net/libnet/dist/deprecated/${P}.tar.gz"
 
 LICENSE="BSD BSD-2 HPND"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
 IUSE=""
 
 S=${WORKDIR}/Libnet-${PV}

diff --git a/net-libs/libnet/libnet-1.0.2a-r6.ebuild b/net-libs/libnet/libnet-1.0.2a-r6.ebuild
index adba36bff7d..850469f7609 100644
--- a/net-libs/libnet/libnet-1.0.2a-r6.ebuild
+++ b/net-libs/libnet/libnet-1.0.2a-r6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.packetfactory.net/libnet/dist/deprecated/${P}.tar.gz"
 
 LICENSE="BSD BSD-2 HPND"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.2a-gcc33-fix.patch

diff --git a/net-libs/libnet/libnet-1.2_rc3-r1.ebuild b/net-libs/libnet/libnet-1.2_rc3-r1.ebuild
index 1f0dd9180d5..40c3c26cfb6 100644
--- a/net-libs/libnet/libnet-1.2_rc3-r1.ebuild
+++ b/net-libs/libnet/libnet-1.2_rc3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/project/${PN}-dev/${P/_/-}.tar.gz"
 
 LICENSE="BSD BSD-2 HPND"
 SLOT="1.1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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="doc static-libs"
 
 DOCS=(

diff --git a/net-libs/libnet/libnet-1.2_rc4.ebuild b/net-libs/libnet/libnet-1.2_rc4.ebuild
index e4c9ab48021..8a6dcf74cdc 100644
--- a/net-libs/libnet/libnet-1.2_rc4.ebuild
+++ b/net-libs/libnet/libnet-1.2_rc4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV/_/-}/${P/_/-}.ta
 
 LICENSE="BSD BSD-2 HPND"
 SLOT="1.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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="static-libs"
 
 DOCS=(

diff --git a/net-libs/libntlm/libntlm-1.4.ebuild b/net-libs/libntlm/libntlm-1.4.ebuild
index b3a65b533db..063db00f1de 100644
--- a/net-libs/libntlm/libntlm-1.4.ebuild
+++ b/net-libs/libntlm/libntlm-1.4.ebuild
@@ -10,5 +10,5 @@ SRC_URI="http://www.nongnu.org/${PN}/releases/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux"
 IUSE="static-libs"

diff --git a/net-libs/libotr/libotr-4.1.1.ebuild b/net-libs/libotr/libotr-4.1.1.ebuild
index 602159f6feb..ed4e3b66ff8 100644
--- a/net-libs/libotr/libotr-4.1.1.ebuild
+++ b/net-libs/libotr/libotr-4.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://otr.cypherpunks.ca/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-libs/libgcrypt-1.2:0

diff --git a/net-libs/libpcap/libpcap-1.8.1-r2.ebuild b/net-libs/libpcap/libpcap-1.8.1-r2.ebuild
index b0d49fb392f..92a37da429b 100644
--- a/net-libs/libpcap/libpcap-1.8.1-r2.ebuild
+++ b/net-libs/libpcap/libpcap-1.8.1-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 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 ~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 ~x86-solaris"
 IUSE="bluetooth dbus netlink static-libs usb"
 
 RDEPEND="

diff --git a/net-libs/libpcap/libpcap-1.8.1.ebuild b/net-libs/libpcap/libpcap-1.8.1.ebuild
index 36c6535f5ff..9fc1dee0199 100644
--- a/net-libs/libpcap/libpcap-1.8.1.ebuild
+++ b/net-libs/libpcap/libpcap-1.8.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 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 ~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 ~x86-solaris"
 IUSE="bluetooth dbus netlink static-libs usb"
 
 RDEPEND="

diff --git a/net-libs/libpcap/libpcap-1.9.0-r1.ebuild b/net-libs/libpcap/libpcap-1.9.0-r1.ebuild
index 42f6c721913..4fcee8fb7f7 100644
--- a/net-libs/libpcap/libpcap-1.9.0-r1.ebuild
+++ b/net-libs/libpcap/libpcap-1.9.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="bluetooth dbus netlink static-libs usb"
 
 RDEPEND="

diff --git a/net-libs/libpcap/libpcap-1.9.0.ebuild b/net-libs/libpcap/libpcap-1.9.0.ebuild
index c774a53f74f..2aec97348ef 100644
--- a/net-libs/libpcap/libpcap-1.9.0.ebuild
+++ b/net-libs/libpcap/libpcap-1.9.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="bluetooth dbus netlink static-libs usb"
 
 RDEPEND="

diff --git a/net-libs/libpcap/libpcap-1.9.1.ebuild b/net-libs/libpcap/libpcap-1.9.1.ebuild
index 8cb9ffc8ec4..f3cfd333906 100644
--- a/net-libs/libpcap/libpcap-1.9.1.ebuild
+++ b/net-libs/libpcap/libpcap-1.9.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="bluetooth dbus netlink static-libs usb"
 
 RDEPEND="

diff --git a/net-libs/libproxy/libproxy-0.4.13-r2.ebuild b/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
index 90958fa5832..d18c96c3686 100644
--- a/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.g
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~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 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="gnome kde mono networkmanager perl python spidermonkey test webkit"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

diff --git a/net-libs/libsmi/libsmi-0.4.8-r1.ebuild b/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
index 0951b2afd46..d1617782987 100644
--- a/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
+++ b/net-libs/libsmi/libsmi-0.4.8-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.ibr.cs.tu-bs.de/projects/libsmi/"
 
 LICENSE="BSD"
 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="static-libs"
 
 src_prepare() {

diff --git a/net-libs/libsmi/libsmi-0.5.0.ebuild b/net-libs/libsmi/libsmi-0.5.0.ebuild
index 43b190287d6..086a1135f94 100644
--- a/net-libs/libsmi/libsmi-0.5.0.ebuild
+++ b/net-libs/libsmi/libsmi-0.5.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/download/${P}.tar.gz"
 
 LICENSE="BSD"
 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="static-libs"
 
 src_configure() {

diff --git a/net-libs/libsoup/libsoup-2.58.2.ebuild b/net-libs/libsoup/libsoup-2.58.2.ebuild
index fa7ceaf700c..9ba2ab06bf4 100644
--- a/net-libs/libsoup/libsoup-2.58.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.58.2.ebuild
@@ -17,7 +17,7 @@ SLOT="2.4"
 IUSE="debug gssapi +introspection samba ssl test vala"
 REQUIRED_USE="vala? ( introspection )"
 
-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 ~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"
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]

diff --git a/net-libs/libsoup/libsoup-2.62.3.ebuild b/net-libs/libsoup/libsoup-2.62.3.ebuild
index 6e215a497f5..c9496ad3a96 100644
--- a/net-libs/libsoup/libsoup-2.62.3.ebuild
+++ b/net-libs/libsoup/libsoup-2.62.3.ebuild
@@ -17,7 +17,7 @@ SLOT="2.4"
 IUSE="debug gssapi +introspection samba ssl test +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-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 ~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"
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]

diff --git a/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild b/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
index 7d7450589b9..2e2ba01a7d5 100644
--- a/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
+++ b/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="aesicm console debug doc libressl openssl static-libs syslog test"
 
 RDEPEND="

diff --git a/net-libs/libsrtp/libsrtp-1.6.0.ebuild b/net-libs/libsrtp/libsrtp-1.6.0.ebuild
index 965678f8550..edb47966874 100644
--- a/net-libs/libsrtp/libsrtp-1.6.0.ebuild
+++ b/net-libs/libsrtp/libsrtp-1.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="aesicm console debug doc libressl openssl static-libs syslog test"
 
 RDEPEND="

diff --git a/net-libs/libsrtp/libsrtp-2.2.0.ebuild b/net-libs/libsrtp/libsrtp-2.2.0.ebuild
index 16600b47f15..51e278112f1 100644
--- a/net-libs/libsrtp/libsrtp-2.2.0.ebuild
+++ b/net-libs/libsrtp/libsrtp-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="aesicm console debug doc libressl openssl static-libs syslog test"
 
 RDEPEND="

diff --git a/net-libs/libssh/libssh-0.9.0.ebuild b/net-libs/libssh/libssh-0.9.0.ebuild
index 164aae6d0c1..133fe08bc32 100644
--- a/net-libs/libssh/libssh-0.9.0.ebuild
+++ b/net-libs/libssh/libssh-0.9.0.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
 else
 	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"

diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index c6953a5d267..7731aab2388 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
 else
 	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"

diff --git a/net-libs/libssh2/libssh2-1.8.0-r1.ebuild b/net-libs/libssh2/libssh2-1.8.0-r1.ebuild
index 3a4f0b2a6fe..2cbb730d3d7 100644
--- a/net-libs/libssh2/libssh2-1.8.0-r1.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 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-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl static-libs test zlib"
 
 RDEPEND="

diff --git a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
index 7eb5156df2c..4a971721dd1 100644
--- a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 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-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"

diff --git a/net-libs/libssh2/libssh2-1.8.2.ebuild b/net-libs/libssh2/libssh2-1.8.2.ebuild
index dff5f96118b..4c8055cf027 100644
--- a/net-libs/libssh2/libssh2-1.8.2.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 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-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"

diff --git a/net-libs/libssh2/libssh2-1.9.0-r1.ebuild b/net-libs/libssh2/libssh2-1.9.0-r1.ebuild
index 92f1a88bf9c..a5602949511 100644
--- a/net-libs/libssh2/libssh2-1.9.0-r1.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 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-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"

diff --git a/net-libs/libssh2/libssh2-1.9.0.ebuild b/net-libs/libssh2/libssh2-1.9.0.ebuild
index 528f7488e0e..73a2130ed83 100644
--- a/net-libs/libssh2/libssh2-1.9.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 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-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"

diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10-r1.ebuild
index a7ab404f72d..bad9c6cc435 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10-r1.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_
 
 LICENSE="BSD"
 SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10.ebuild
index 1b537d16462..de5e91692fd 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.10.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_
 
 LICENSE="BSD"
 SLOT="0/9"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12-r1.ebuild
index 059738663d7..083a26319c0 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12-r1.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent_${MY_
 
 LICENSE="BSD"
 SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12.ebuild
index 273b0b56ad1..d047b646998 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.12.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent_${MY_
 
 LICENSE="BSD"
 SLOT="0/9"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13-r1.ebuild
index 06859532944..7608777a633 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13-r1.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_
 
 LICENSE="BSD"
 SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13.ebuild
index 6350d626031..8cc6099b395 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.13.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_
 
 LICENSE="BSD"
 SLOT="0/9"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0-r1.ebuild
index cfc2625b7fe..3b05cd5c1a8 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0-r1.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0.ebuild
index a182fa18ab3..d00acbe4f8e 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1-r1.ebuild
index 5cefc809850..fb3f58e2f21 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1-r1.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1.ebuild
index 2de04027aa5..9f40198c2dd 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.2-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.2-r1.ebuild
index c6f7df58728..3bb5a10e01a 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.2-r1.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.2-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.2.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.2.ebuild
index 2de04027aa5..9f40198c2dd 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.2.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

diff --git a/net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild b/net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild
index 4e548ed6ecd..e3689c3874f 100644
--- a/net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.13.7-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # subslot.
 SLOT="0"
 
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="debug libressl ssl test"
 
 RDEPEND="

diff --git a/net-libs/libtorrent/libtorrent-0.13.7.ebuild b/net-libs/libtorrent/libtorrent-0.13.7.ebuild
index f03f53a8898..15f6eec5b6e 100644
--- a/net-libs/libtorrent/libtorrent-0.13.7.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.13.7.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # subslot.
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="debug libressl ssl test"
 
 RDEPEND="

diff --git a/net-libs/libtorrent/libtorrent-0.13.8.ebuild b/net-libs/libtorrent/libtorrent-0.13.8.ebuild
index e461b0222d6..b1bfdde599a 100644
--- a/net-libs/libtorrent/libtorrent-0.13.8.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.13.8.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # subslot.
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="debug libressl ssl test"
 
 RDEPEND="

diff --git a/net-libs/libupnp/libupnp-1.6.21.ebuild b/net-libs/libupnp/libupnp-1.6.21.ebuild
index ddf0f1a6bb2..cf6b5e8cc2d 100644
--- a/net-libs/libupnp/libupnp-1.6.21.ebuild
+++ b/net-libs/libupnp/libupnp-1.6.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pupnp/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux"
 IUSE="debug doc ipv6 static-libs"
 
 DOCS="NEWS README ChangeLog"

diff --git a/net-libs/libupnp/libupnp-1.6.25.ebuild b/net-libs/libupnp/libupnp-1.6.25.ebuild
index 165473d3a93..142a610e5c2 100644
--- a/net-libs/libupnp/libupnp-1.6.25.ebuild
+++ b/net-libs/libupnp/libupnp-1.6.25.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pupnp/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE="debug doc ipv6 static-libs"
 
 DOCS="NEWS ChangeLog"

diff --git a/net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild b/net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild
index 13a8e923f07..e25b35dcf37 100644
--- a/net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/LibVNC/${PN}/archive/${MY_P}.tar.gz"
 LICENSE="GPL-2+ LGPL-2.1+ BSD MIT"
 # no sub slot wanted (yet), see #578958
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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="+24bpp gcrypt gnutls ipv6 +jpeg libressl lzo +png sasl ssl systemd +threads +zlib"
 # https://bugs.gentoo.org/690202
 # https://bugs.gentoo.org/435326

diff --git a/net-libs/mbedtls/mbedtls-2.10.0.ebuild b/net-libs/mbedtls/mbedtls-2.10.0.ebuild
index caf219ae882..9b8c96be848 100644
--- a/net-libs/mbedtls/mbedtls-2.10.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.10.0.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/10" # slot for libmbedtls.so
-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="cpu_flags_x86_sse2 doc havege libressl programs test threads zlib"
 
 RDEPEND="

diff --git a/net-libs/mbedtls/mbedtls-2.12.0.ebuild b/net-libs/mbedtls/mbedtls-2.12.0.ebuild
index 9b2bfed227c..c660faa6c35 100644
--- a/net-libs/mbedtls/mbedtls-2.12.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.12.0.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/11" # slot for libmbedtls.so
-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="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
 
 RDEPEND="

diff --git a/net-libs/mbedtls/mbedtls-2.16.3.ebuild b/net-libs/mbedtls/mbedtls-2.16.3.ebuild
index a5b2310cf89..347aeef76fc 100644
--- a/net-libs/mbedtls/mbedtls-2.16.3.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.16.3.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/12" # slot for libmbedtls.so
-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="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
 
 RDEPEND="

diff --git a/net-libs/mbedtls/mbedtls-2.17.0.ebuild b/net-libs/mbedtls/mbedtls-2.17.0.ebuild
index a5b2310cf89..347aeef76fc 100644
--- a/net-libs/mbedtls/mbedtls-2.17.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.17.0.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/12" # slot for libmbedtls.so
-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="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
 
 RDEPEND="

diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20190625.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20190625.ebuild
index ec25ddae0e6..ed9a29ff0b0 100644
--- a/net-libs/miniupnpc/miniupnpc-2.1.20190625.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.1.20190625.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""

diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20190824.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20190824.ebuild
index daca7228030..cc591323e33 100644
--- a/net-libs/miniupnpc/miniupnpc-2.1.20190824.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.1.20190824.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""

diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild
index 43d84694432..f227074a176 100644
--- a/net-libs/neon/neon-0.30.2.ebuild
+++ b/net-libs/neon/neon-0.30.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://webdav.org/neon/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/27"
-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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"
 RESTRICT="test"
 

diff --git a/net-libs/nghttp2/nghttp2-1.39.2.ebuild b/net-libs/nghttp2/nghttp2-1.39.2.ebuild
index 2142ab3bd2e..83f29809404 100644
--- a/net-libs/nghttp2/nghttp2-1.39.2.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.39.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 fi
 
 DESCRIPTION="HTTP/2 C Library"

diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
index 92ac11a357a..6750a2a20d7 100644
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
 DESCRIPTION="HTTP/2 C Library"

diff --git a/net-libs/openpgm/openpgm-5.1.118-r1.ebuild b/net-libs/openpgm/openpgm-5.1.118-r1.ebuild
index 4fed6c8c659..b4fb79c7dc7 100644
--- a/net-libs/openpgm/openpgm-5.1.118-r1.ebuild
+++ b/net-libs/openpgm/openpgm-5.1.118-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/steve-o/${PN}/archive/release-${MY_PV}.tar.gz -> ${P
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 arm hppa ppc ppc64 x86"
 IUSE="static-libs"
 
 DEPEND="${PYTHON_DEPS}"

diff --git a/net-libs/openpgm/openpgm-5.2.122.ebuild b/net-libs/openpgm/openpgm-5.2.122.ebuild
index b77b082298e..43058f88b4f 100644
--- a/net-libs/openpgm/openpgm-5.2.122.ebuild
+++ b/net-libs/openpgm/openpgm-5.2.122.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/steve-o/${PN}/archive/release-${MY_PV}.tar.gz -> ${P
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 DEPEND="${PYTHON_DEPS}"

diff --git a/net-libs/openslp/openslp-1.2.1-r3.ebuild b/net-libs/openslp/openslp-1.2.1-r3.ebuild
index ff2edc930e6..db091b2a3ce 100644
--- a/net-libs/openslp/openslp-1.2.1-r3.ebuild
+++ b/net-libs/openslp/openslp-1.2.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 RESTRICT="test"
 

diff --git a/net-libs/openslp/openslp-2.0.0-r4.ebuild b/net-libs/openslp/openslp-2.0.0-r4.ebuild
index 44b330d8ce9..cadea63285d 100644
--- a/net-libs/openslp/openslp-2.0.0-r4.ebuild
+++ b/net-libs/openslp/openslp-2.0.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="libressl"
 RESTRICT="test"
 

diff --git a/net-libs/openslp/openslp-2.0.0-r5.ebuild b/net-libs/openslp/openslp-2.0.0-r5.ebuild
index 6178fcf4390..c9a5e673bd4 100644
--- a/net-libs/openslp/openslp-2.0.0-r5.ebuild
+++ b/net-libs/openslp/openslp-2.0.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="libressl"
 RESTRICT="test"
 

diff --git a/net-libs/ortp/ortp-0.23.0-r1.ebuild b/net-libs/ortp/ortp-0.23.0-r1.ebuild
index a935eef5e2a..ac7c45d90aa 100644
--- a/net-libs/ortp/ortp-0.23.0-r1.ebuild
+++ b/net-libs/ortp/ortp-0.23.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://nongnu/linphone/${PN}/sources/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/9"
-KEYWORDS="alpha amd64 arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm64 ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples ipv6 libressl minimal ntp-timestamp ssl srtp"
 
 RDEPEND="

diff --git a/net-libs/serf/serf-1.3.8-r1.ebuild b/net-libs/serf/serf-1.3.8-r1.ebuild
index 4b6c23a4a04..80540344298 100644
--- a/net-libs/serf/serf-1.3.8-r1.ebuild
+++ b/net-libs/serf/serf-1.3.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-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 ~x64-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 ~x64-solaris"
 IUSE="kerberos static-libs libressl"
 RESTRICT="test"
 

diff --git a/net-libs/serf/serf-1.3.8.ebuild b/net-libs/serf/serf-1.3.8.ebuild
index b0d5faed2f3..1f89a3bdc64 100644
--- a/net-libs/serf/serf-1.3.8.ebuild
+++ b/net-libs/serf/serf-1.3.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="kerberos"
 RESTRICT="test"
 

diff --git a/net-libs/serf/serf-1.3.9.ebuild b/net-libs/serf/serf-1.3.9.ebuild
index 32cf476c801..631439a23f7 100644
--- a/net-libs/serf/serf-1.3.9.ebuild
+++ b/net-libs/serf/serf-1.3.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-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 ~x64-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 ~x64-solaris"
 IUSE="kerberos static-libs libressl"
 RESTRICT="test"
 

diff --git a/net-libs/srt/srt-1.3.2.ebuild b/net-libs/srt/srt-1.3.2.ebuild
index f329f489083..e1a8cecd0f1 100644
--- a/net-libs/srt/srt-1.3.2.ebuild
+++ b/net-libs/srt/srt-1.3.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="LGPL-2.1"

diff --git a/net-libs/srt/srt-9999.ebuild b/net-libs/srt/srt-9999.ebuild
index 10750221932..f5e557bab10 100644
--- a/net-libs/srt/srt-9999.ebuild
+++ b/net-libs/srt/srt-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="LGPL-2.1"

diff --git a/net-libs/stem/stem-1.5.4.ebuild b/net-libs/stem/stem-1.5.4.ebuild
index 5387c107ba2..712f914398c 100644
--- a/net-libs/stem/stem-1.5.4.ebuild
+++ b/net-libs/stem/stem-1.5.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}]

diff --git a/net-libs/stem/stem-1.6.0.ebuild b/net-libs/stem/stem-1.6.0.ebuild
index 5387c107ba2..712f914398c 100644
--- a/net-libs/stem/stem-1.6.0.ebuild
+++ b/net-libs/stem/stem-1.6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}]

diff --git a/net-libs/stem/stem-1.7.0.ebuild b/net-libs/stem/stem-1.7.0.ebuild
index 5e021eb49a6..8c048a3057d 100644
--- a/net-libs/stem/stem-1.7.0.ebuild
+++ b/net-libs/stem/stem-1.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}]

diff --git a/net-libs/stem/stem-1.7.1.ebuild b/net-libs/stem/stem-1.7.1.ebuild
index 5e021eb49a6..8c048a3057d 100644
--- a/net-libs/stem/stem-1.7.1.ebuild
+++ b/net-libs/stem/stem-1.7.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}]

diff --git a/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild
index ef22c6ee2be..3469dd10c54 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="debug +introspection +vala"
 REQUIRED_USE="

diff --git a/net-libs/udns/udns-0.4.ebuild b/net-libs/udns/udns-0.4.ebuild
index 4702098a5cb..f19b2595dc0 100644
--- a/net-libs/udns/udns-0.4.ebuild
+++ b/net-libs/udns/udns-0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.corpit.ru/mjt/udns/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 sparc x86"
 IUSE="ipv6 static +tools"
 
 # Yes, this doesn't depend on any other library beside "system" set

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
index c8444e26f61..f8ed8e6fec9 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
 

diff --git a/net-libs/zeromq/zeromq-2.2.0.ebuild b/net-libs/zeromq/zeromq-2.2.0.ebuild
index 30d5fa3b374..3aa9e3dd962 100644
--- a/net-libs/zeromq/zeromq-2.2.0.ebuild
+++ b/net-libs/zeromq/zeromq-2.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.zeromq.org/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="pgm test static-libs"
 
 RDEPEND="!net-libs/cppzmq"