summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-arch/libarchive/libarchive-3.2.2-r1.ebuild2
-rw-r--r--app-backup/bacula/bacula-7.4.4-r2.ebuild2
-rw-r--r--app-crypt/gnupg/gnupg-2.1.15.ebuild2
-rw-r--r--app-editors/nvi/nvi-1.81.6-r7.ebuild2
-rw-r--r--app-mobilephone/gnokii/gnokii-0.6.31-r1.ebuild2
-rw-r--r--app-portage/eix/eix-0.32.4.ebuild2
-rw-r--r--app-shells/push/push-2.0.ebuild2
-rw-r--r--app-shells/quoter/quoter-3.0_p2.ebuild2
-rw-r--r--app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r1.ebuild2
-rw-r--r--app-text/ghostscript-gpl/ghostscript-gpl-9.20-r1.ebuild2
-rw-r--r--app-text/iso-codes/iso-codes-3.74.ebuild2
-rw-r--r--app-text/rarian/rarian-0.8.1-r3.ebuild2
-rw-r--r--dev-db/mariadb/mariadb-10.0.29.ebuild2
-rw-r--r--dev-db/phpmyadmin/phpmyadmin-4.6.6.ebuild2
-rw-r--r--dev-games/physfs/physfs-2.0.3-r2.ebuild2
-rw-r--r--dev-lang/php/php-5.6.30.ebuild2
-rw-r--r--dev-libs/appstream-glib/appstream-glib-0.6.7.ebuild2
-rw-r--r--dev-libs/gjs/gjs-1.46.0.ebuild2
-rw-r--r--dev-libs/gmime/gmime-2.6.23.ebuild2
-rw-r--r--dev-libs/hiredis/hiredis-0.13.3.ebuild2
-rw-r--r--dev-libs/libgdata/libgdata-0.17.6.ebuild2
-rw-r--r--dev-libs/libgee/libgee-0.18.1.ebuild2
-rw-r--r--dev-libs/libmoe/libmoe-1.5.8-r3.ebuild2
-rw-r--r--dev-libs/librep/librep-0.92.6.ebuild2
-rw-r--r--dev-libs/libunique/libunique-1.1.6-r2.ebuild2
-rw-r--r--dev-libs/libunique/libunique-3.0.2-r1.ebuild2
-rw-r--r--dev-libs/libxslt/libxslt-1.1.29-r1.ebuild2
-rw-r--r--dev-libs/openssl/openssl-1.0.2k.ebuild2
-rw-r--r--dev-perl/Net-SSLeay/Net-SSLeay-1.800.0.ebuild2
-rw-r--r--dev-perl/Params-Validate/Params-Validate-1.220.0.ebuild2
-rw-r--r--dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild2
-rw-r--r--dev-php/pecl-event/pecl-event-2.2.1.ebuild2
-rw-r--r--dev-python/alabaster/alabaster-0.7.9.ebuild2
-rw-r--r--dev-python/attrs/attrs-16.3.0-r1.ebuild2
-rw-r--r--dev-python/hiredis/hiredis-0.2.0.ebuild2
-rw-r--r--dev-python/hypothesis/hypothesis-3.6.0-r1.ebuild2
-rw-r--r--dev-python/m2crypto/m2crypto-0.24.0.ebuild2
-rw-r--r--dev-ruby/archive-tar-minitar/archive-tar-minitar-0.6.1.ebuild2
-rw-r--r--dev-tex/hevea/hevea-2.29.ebuild2
-rw-r--r--dev-util/cmake/cmake-3.7.2.ebuild2
-rw-r--r--dev-util/gtk-builder-convert/gtk-builder-convert-2.24.31-r1.ebuild2
-rw-r--r--gnome-base/dconf/dconf-0.26.0-r1.ebuild2
-rw-r--r--gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild2
-rw-r--r--gnome-base/libgnomeprintui/libgnomeprintui-2.18.6-r2.ebuild2
-rw-r--r--gnome-base/libgtop/libgtop-2.34.2.ebuild2
-rw-r--r--gnome-extra/gucharmap/gucharmap-9.0.2.ebuild2
-rw-r--r--media-libs/gd/gd-2.2.4.ebuild2
-rw-r--r--media-libs/leptonica/leptonica-1.74.1.ebuild2
-rw-r--r--media-libs/libgphoto2/libgphoto2-2.5.12.ebuild2
-rw-r--r--media-libs/musicbrainz/musicbrainz-5.1.0.ebuild2
-rw-r--r--media-sound/moc/moc-2.5.2.ebuild2
-rw-r--r--media-sound/pulseaudio/pulseaudio-10.0.ebuild2
-rw-r--r--media-sound/wavpack/wavpack-5.1.0.ebuild2
-rw-r--r--media-video/gpac/gpac-0.6.1-r2.ebuild4
-rw-r--r--net-analyzer/tcpdump/tcpdump-4.9.0.ebuild2
-rw-r--r--net-dns/bind-tools/bind-tools-9.11.0_p3.ebuild2
-rw-r--r--net-dns/bind/bind-9.11.0_p3.ebuild2
-rw-r--r--net-dns/dnssec-root/dnssec-root-20150403.ebuild2
-rw-r--r--net-ftp/atftp/atftp-0.7-r5.ebuild2
-rw-r--r--net-ftp/lftp/lftp-4.7.5.ebuild2
-rw-r--r--net-im/mcabber/mcabber-1.0.5.ebuild2
-rw-r--r--net-im/pork/pork-0.99.8.1-r1.ebuild2
-rw-r--r--net-misc/quagga/quagga-1.1.1.ebuild2
-rw-r--r--net-misc/tigervnc/tigervnc-1.7.1.ebuild2
-rw-r--r--net-print/gutenprint/gutenprint-5.2.12.ebuild2
-rw-r--r--sys-apps/grep/grep-2.27-r1.ebuild2
-rw-r--r--sys-apps/sandbox/sandbox-2.10-r3.ebuild2
-rw-r--r--sys-auth/skey/skey-1.1.5-r11.ebuild2
-rw-r--r--sys-fs/ntfs3g/ntfs3g-2016.2.22-r2.ebuild2
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-4.9.6-r1.ebuild2
-rw-r--r--www-client/lynx/lynx-2.8.9_pre11.ebuild2
-rw-r--r--x11-libs/gtk+/gtk+-2.24.31-r1.ebuild2
-rw-r--r--x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild2
-rw-r--r--x11-libs/vte/vte-0.28.2-r208.ebuild2
-rw-r--r--x11-libs/vte/vte-0.44.3.ebuild2
-rw-r--r--x11-themes/gnome-themes-standard/gnome-themes-standard-3.20.2-r1.ebuild2
-rw-r--r--x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.20.2.ebuild2
77 files changed, 78 insertions, 78 deletions
diff --git a/app-arch/libarchive/libarchive-3.2.2-r1.ebuild b/app-arch/libarchive/libarchive-3.2.2-r1.ebuild
index f12f26300160..e11a94a8f255 100644
--- a/app-arch/libarchive/libarchive-3.2.2-r1.ebuild
+++ b/app-arch/libarchive/libarchive-3.2.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz"
LICENSE="BSD BSD-2 BSD-4 public-domain"
SLOT="0/13"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib"
RDEPEND="
diff --git a/app-backup/bacula/bacula-7.4.4-r2.ebuild b/app-backup/bacula/bacula-7.4.4-r2.ebuild
index dcb1f0f80a02..ec383bdc2223 100644
--- a/app-backup/bacula/bacula-7.4.4-r2.ebuild
+++ b/app-backup/bacula/bacula-7.4.4-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
LICENSE="AGPL-3"
SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 libressl logwatch mysql postgres qt4 readline +sqlite ssl static tcpd vim-syntax X"
DEPEND="
diff --git a/app-crypt/gnupg/gnupg-2.1.15.ebuild b/app-crypt/gnupg/gnupg-2.1.15.ebuild
index 260146bd6f4e..5aa18ea79283 100644
--- a/app-crypt/gnupg/gnupg-2.1.15.ebuild
+++ b/app-crypt/gnupg/gnupg-2.1.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 doc +gnutls ldap nls readline selinux smartcard tofu tools usb"
COMMON_DEPEND_LIBS="
diff --git a/app-editors/nvi/nvi-1.81.6-r7.ebuild b/app-editors/nvi/nvi-1.81.6-r7.ebuild
index 90fc606e44a5..50e84560afe0 100644
--- a/app-editors/nvi/nvi-1.81.6-r7.ebuild
+++ b/app-editors/nvi/nvi-1.81.6-r7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://garage.linux.student.kuleuven.be/~skimo/nvi/devel/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 sparc x86"
IUSE="perl tcl unicode"
CDEPEND=">=sys-libs/db-4.2.52_p5:=
diff --git a/app-mobilephone/gnokii/gnokii-0.6.31-r1.ebuild b/app-mobilephone/gnokii/gnokii-0.6.31-r1.ebuild
index 0f9107abfa90..f8daa1f9efd9 100644
--- a/app-mobilephone/gnokii/gnokii-0.6.31-r1.ebuild
+++ b/app-mobilephone/gnokii/gnokii-0.6.31-r1.ebuild
@@ -14,7 +14,7 @@ if [[ $PV == *9999 ]]; then
inherit git-r3
else
SRC_URI="http://www.gnokii.org/download/${PN}/${P}.tar.bz2"
- KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+ KEYWORDS="amd64 ~hppa ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
fi
DESCRIPTION="User space driver and tools for use with mobile phones"
diff --git a/app-portage/eix/eix-0.32.4.ebuild b/app-portage/eix/eix-0.32.4.ebuild
index da021c97888d..6faf1541dfc5 100644
--- a/app-portage/eix/eix-0.32.4.ebuild
+++ b/app-portage/eix/eix-0.32.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${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 ~amd64-fbsd ~sparc-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 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc nls sqlite"
BOTHDEPEND="nls? ( virtual/libintl )
diff --git a/app-shells/push/push-2.0.ebuild b/app-shells/push/push-2.0.ebuild
index 305f26d505a0..de6d7c8b6b8e 100644
--- a/app-shells/push/push-2.0.ebuild
+++ b/app-shells/push/push-2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE=""
src_install() {
diff --git a/app-shells/quoter/quoter-3.0_p2.ebuild b/app-shells/quoter/quoter-3.0_p2.ebuild
index 822a6e82ff92..aa166df36bdf 100644
--- a/app-shells/quoter/quoter-3.0_p2.ebuild
+++ b/app-shells/quoter/quoter-3.0_p2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE=""
src_install() {
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r1.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r1.ebuild
index cd92bf0ef490..7a5f6d08e811 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r1.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="ruby"
RDEPEND=">=app-text/build-docbook-catalog-1.1
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.20-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.20-r1.ebuild
index b6f6a7f0351d..fc1c57a5acad 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.20-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.20-r1.ebuild
@@ -32,7 +32,7 @@ SRC_URI="
LICENSE="AGPL-3 CPL-1.0"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
# IUSE="cups dbus djvu gtk idn l10n_de static-libs tiff X"
IUSE="cups dbus gtk idn l10n_de static-libs tiff X"
# RESTRICT="djvu? ( bindist )"
diff --git a/app-text/iso-codes/iso-codes-3.74.ebuild b/app-text/iso-codes/iso-codes-3.74.ebuild
index 5bdd7a964a59..e505d7ae4d5f 100644
--- a/app-text/iso-codes/iso-codes-3.74.ebuild
+++ b/app-text/iso-codes/iso-codes-3.74.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/app-text/rarian/rarian-0.8.1-r3.ebuild b/app-text/rarian/rarian-0.8.1-r3.ebuild
index 02831fa334b1..99d4f8cf94bc 100644
--- a/app-text/rarian/rarian-0.8.1-r3.ebuild
+++ b/app-text/rarian/rarian-0.8.1-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://${PN}.freedesktop.org/Releases/${P}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND="
diff --git a/dev-db/mariadb/mariadb-10.0.29.ebuild b/dev-db/mariadb/mariadb-10.0.29.ebuild
index 62a9e0e788f8..7f20caac51f0 100644
--- a/dev-db/mariadb/mariadb-10.0.29.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.29.ebuild
@@ -20,7 +20,7 @@ RESTRICT="!bindist? ( bindist )"
REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
PATCHES=(
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.6.6.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.6.6.ebuild
index 5b0fe0b7b051..5a8219e07f85 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.6.6.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.6.6.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.phpmyadmin.net/"
SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
IUSE="setup"
RDEPEND="
diff --git a/dev-games/physfs/physfs-2.0.3-r2.ebuild b/dev-games/physfs/physfs-2.0.3-r2.ebuild
index 06baa02b138f..0504006cfa68 100644
--- a/dev-games/physfs/physfs-2.0.3-r2.ebuild
+++ b/dev-games/physfs/physfs-2.0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://icculus.org/physfs/downloads/${P}.tar.bz2"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ppc ~ppc64 sparc x86 ~x86-fbsd"
IUSE="doc grp hog mvl qpak static-libs wad +zip"
RDEPEND=""
diff --git a/dev-lang/php/php-5.6.30.ebuild b/dev-lang/php/php-5.6.30.ebuild
index 15f6ff3903d3..98df947f2c96 100644
--- a/dev-lang/php/php-5.6.30.ebuild
+++ b/dev-lang/php/php-5.6.30.ebuild
@@ -19,7 +19,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
# We can build the following SAPIs in the given order
SAPIS="embed cli cgi fpm apache2"
diff --git a/dev-libs/appstream-glib/appstream-glib-0.6.7.ebuild b/dev-libs/appstream-glib/appstream-glib-0.6.7.ebuild
index 7feb25923511..1befdebde644 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.6.7.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.6.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0/8" # soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
IUSE="+introspection nls stemmer"
RDEPEND="
diff --git a/dev-libs/gjs/gjs-1.46.0.ebuild b/dev-libs/gjs/gjs-1.46.0.ebuild
index 4bf979a56140..a9e169f31bea 100644
--- a/dev-libs/gjs/gjs-1.46.0.ebuild
+++ b/dev-libs/gjs/gjs-1.46.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
SLOT="0"
IUSE="+cairo examples gtk test"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 sparc x86"
RDEPEND="
>=dev-libs/glib-2.36:2
diff --git a/dev-libs/gmime/gmime-2.6.23.ebuild b/dev-libs/gmime/gmime-2.6.23.ebuild
index 3d3e387455f5..32158233cc0f 100644
--- a/dev-libs/gmime/gmime-2.6.23.ebuild
+++ b/dev-libs/gmime/gmime-2.6.23.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime
SLOT="2.6"
LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="doc mono smime static-libs vala"
RDEPEND="
diff --git a/dev-libs/hiredis/hiredis-0.13.3.ebuild b/dev-libs/hiredis/hiredis-0.13.3.ebuild
index a64ab1a28f5d..9f7c98f3bec1 100644
--- a/dev-libs/hiredis/hiredis-0.13.3.ebuild
+++ b/dev-libs/hiredis/hiredis-0.13.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0/0.13"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x64-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-solaris"
IUSE="examples static-libs test"
DEPEND="test? ( dev-db/redis )"
diff --git a/dev-libs/libgdata/libgdata-0.17.6.ebuild b/dev-libs/libgdata/libgdata-0.17.6.ebuild
index f00426b7122e..13ad470f78a6 100644
--- a/dev-libs/libgdata/libgdata-0.17.6.ebuild
+++ b/dev-libs/libgdata/libgdata-0.17.6.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
vala? ( introspection )
"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
# configure checks for gtk:3, but only uses it for demos which are not installed
RDEPEND="
diff --git a/dev-libs/libgee/libgee-0.18.1.ebuild b/dev-libs/libgee/libgee-0.18.1.ebuild
index 8b741dddfd41..966a3ef3cd26 100644
--- a/dev-libs/libgee/libgee-0.18.1.ebuild
+++ b/dev-libs/libgee/libgee-0.18.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgee"
LICENSE="LGPL-2.1+"
SLOT="0.8/2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh sparc x86 ~x86-linux"
IUSE="+introspection"
# FIXME: add doc support, requires valadoc
diff --git a/dev-libs/libmoe/libmoe-1.5.8-r3.ebuild b/dev-libs/libmoe/libmoe-1.5.8-r3.ebuild
index ac3021b7e448..1ae73a2c006d 100644
--- a/dev-libs/libmoe/libmoe-1.5.8-r3.ebuild
+++ b/dev-libs/libmoe/libmoe-1.5.8-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://pub.ks-and-ks.ne.jp/prog/pub/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
IUSE=""
RDEPEND="dev-lang/perl"
diff --git a/dev-libs/librep/librep-0.92.6.ebuild b/dev-libs/librep/librep-0.92.6.ebuild
index 1302727868e7..bd944cfb032d 100644
--- a/dev-libs/librep/librep-0.92.6.ebuild
+++ b/dev-libs/librep/librep-0.92.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://download.tuxfamily.org/librep/${PN}_${PV}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~ia64 ppc ~ppc64 sparc x86 ~x86-fbsd"
IUSE="emacs readline"
RDEPEND="
diff --git a/dev-libs/libunique/libunique-1.1.6-r2.ebuild b/dev-libs/libunique/libunique-1.1.6-r2.ebuild
index 2772c5c67987..6fcb8f58c92a 100644
--- a/dev-libs/libunique/libunique-1.1.6-r2.ebuild
+++ b/dev-libs/libunique/libunique-1.1.6-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Attic/LibUnique"
LICENSE="LGPL-2.1"
SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="debug dbus +introspection"
RDEPEND="
diff --git a/dev-libs/libunique/libunique-3.0.2-r1.ebuild b/dev-libs/libunique/libunique-3.0.2-r1.ebuild
index 021a6df5ee7a..4b24c49597fc 100644
--- a/dev-libs/libunique/libunique-3.0.2-r1.ebuild
+++ b/dev-libs/libunique/libunique-3.0.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Attic/LibUnique"
LICENSE="LGPL-2.1"
SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="debug +introspection"
RDEPEND="
diff --git a/dev-libs/libxslt/libxslt-1.1.29-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.29-r1.ebuild
index 0c3753f84857..2c55741877f4 100644
--- a/dev-libs/libxslt/libxslt-1.1.29-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.29-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="crypt debug examples python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/openssl/openssl-1.0.2k.ebuild b/dev-libs/openssl/openssl-1.0.2k.ebuild
index 280924dc16ed..725728977b6c 100644
--- a/dev-libs/openssl/openssl-1.0.2k.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2k.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
LICENSE="openssl"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
RESTRICT="!bindist? ( bindist )"
diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.800.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.800.0.ebuild
index 9cb44665c661..22e8dbcb277e 100644
--- a/dev-perl/Net-SSLeay/Net-SSLeay-1.800.0.ebuild
+++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.800.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Perl extension for using OpenSSL"
LICENSE="openssl"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="libressl test minimal examples"
RDEPEND="
diff --git a/dev-perl/Params-Validate/Params-Validate-1.220.0.ebuild b/dev-perl/Params-Validate/Params-Validate-1.220.0.ebuild
index 7c53b24cff91..2c04144b60a1 100644
--- a/dev-perl/Params-Validate/Params-Validate-1.220.0.ebuild
+++ b/dev-perl/Params-Validate/Params-Validate-1.220.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Flexible system for validation of method/function call parameters"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild
index dbb9203a56f6..460160eaf0cd 100644
--- a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild
+++ b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://pear.php.net/package/${MY_PN}"
SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
IUSE=""
DEPEND=""
diff --git a/dev-php/pecl-event/pecl-event-2.2.1.ebuild b/dev-php/pecl-event/pecl-event-2.2.1.ebuild
index 127765762347..de790a9b4b5c 100644
--- a/dev-php/pecl-event/pecl-event-2.2.1.ebuild
+++ b/dev-php/pecl-event/pecl-event-2.2.1.ebuild
@@ -13,7 +13,7 @@ USE_PHP="php5-6 php7-0 php7-1"
inherit php-ext-pecl-r3
-KEYWORDS="amd64 ~ia64 ~x86"
+KEYWORDS="amd64 ~ia64 x86"
LICENSE="PHP-3.01"
DESCRIPTION="PHP wrapper for libevent2"
diff --git a/dev-python/alabaster/alabaster-0.7.9.ebuild b/dev-python/alabaster/alabaster-0.7.9.ebuild
index 5fe051eb9878..87cf9cc28be6 100644
--- a/dev-python/alabaster/alabaster-0.7.9.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.9.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/bitprophet/alabaster"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
SLOT="0"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/attrs/attrs-16.3.0-r1.ebuild b/dev-python/attrs/attrs-16.3.0-r1.ebuild
index 44ac9c465799..17beb8bcc27b 100644
--- a/dev-python/attrs/attrs-16.3.0-r1.ebuild
+++ b/dev-python/attrs/attrs-16.3.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/dev-python/hiredis/hiredis-0.2.0.ebuild b/dev-python/hiredis/hiredis-0.2.0.ebuild
index 52aad850875e..c5118cb43ea8 100644
--- a/dev-python/hiredis/hiredis-0.2.0.ebuild
+++ b/dev-python/hiredis/hiredis-0.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND=">=dev-libs/hiredis-0.13.1"
diff --git a/dev-python/hypothesis/hypothesis-3.6.0-r1.ebuild b/dev-python/hypothesis/hypothesis-3.6.0-r1.ebuild
index 9db8104f0538..de92618af096 100644
--- a/dev-python/hypothesis/hypothesis-3.6.0-r1.ebuild
+++ b/dev-python/hypothesis/hypothesis-3.6.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86"
IUSE=""
RDEPEND="$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*')"
diff --git a/dev-python/m2crypto/m2crypto-0.24.0.ebuild b/dev-python/m2crypto/m2crypto-0.24.0.ebuild
index a0b92178d599..359987dece2d 100644
--- a/dev-python/m2crypto/m2crypto-0.24.0.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.24.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.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-macos"
+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"
IUSE="libressl"
RDEPEND="
diff --git a/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.6.1.ebuild b/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.6.1.ebuild
index b56abe91cdc6..ff87c6fa9e90 100644
--- a/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.6.1.ebuild
+++ b/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.6.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://rubygems/minitar-${PV}.gem"
LICENSE="|| ( BSD-2 Ruby )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 )"
diff --git a/dev-tex/hevea/hevea-2.29.ebuild b/dev-tex/hevea/hevea-2.29.ebuild
index 6a2aabeddba2..608e6a69ccd5 100644
--- a/dev-tex/hevea/hevea-2.29.ebuild
+++ b/dev-tex/hevea/hevea-2.29.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://hevea.inria.fr/distri/${P}.tar.gz"
LICENSE="QPL"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~ppc ~ppc64 sparc x86"
DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]"
RDEPEND="${DEPEND}
diff --git a/dev-util/cmake/cmake-3.7.2.ebuild b/dev-util/cmake/cmake-3.7.2.ebuild
index af9d18c67179..5bada152ddf4 100644
--- a/dev-util/cmake/cmake-3.7.2.ebuild
+++ b/dev-util/cmake/cmake-3.7.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.
LICENSE="CMake"
SLOT="0"
[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs system-jsoncpp ncurses qt5"
RDEPEND="
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.31-r1.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.31-r1.ebuild
index cae805159cb1..cb0f182ab410 100644
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.31-r1.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.31-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gtk.org/"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/gnome-base/dconf/dconf-0.26.0-r1.ebuild b/gnome-base/dconf/dconf-0.26.0-r1.ebuild
index 196dbf0ac240..223449be6a21 100644
--- a/gnome-base/dconf/dconf-0.26.0-r1.ebuild
+++ b/gnome-base/dconf/dconf-0.26.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/action/show/Projects/dconf"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
IUSE=""
RDEPEND="
diff --git a/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild b/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
index de3a938ad8f4..3ea11a4fb370 100644
--- a/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
+++ b/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-common"
LICENSE="GPL-3"
SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+autoconf-archive"
RDEPEND=""
diff --git a/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6-r2.ebuild b/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6-r2.ebuild
index d475dcdfd9bf..44f67e9f7633 100644
--- a/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6-r2.ebuild
+++ b/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gnome.org/"
LICENSE="GPL-2 LGPL-2.1"
SLOT="2.2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/gnome-base/libgtop/libgtop-2.34.2.ebuild b/gnome-base/libgtop/libgtop-2.34.2.ebuild
index 61428befe786..1fe84cbe5dac 100644
--- a/gnome-base/libgtop/libgtop-2.34.2.ebuild
+++ b/gnome-base/libgtop/libgtop-2.34.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgtop"
LICENSE="GPL-2"
SLOT="2/10" # libgtop soname version
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd"
IUSE="+introspection"
RDEPEND="
diff --git a/gnome-extra/gucharmap/gucharmap-9.0.2.ebuild b/gnome-extra/gucharmap/gucharmap-9.0.2.ebuild
index 51b5dedd74fc..f7637654dd7d 100644
--- a/gnome-extra/gucharmap/gucharmap-9.0.2.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-9.0.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
LICENSE="GPL-3"
SLOT="2.90"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd"
IUSE="debug +introspection test vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/media-libs/gd/gd-2.2.4.ebuild b/media-libs/gd/gd-2.2.4.ebuild
index c7ef622c5069..9f0cfc57d487 100644
--- a/media-libs/gd/gd-2.2.4.ebuild
+++ b/media-libs/gd/gd-2.2.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
LICENSE="gd IJG HPND BSD"
SLOT="2/3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="fontconfig jpeg png static-libs tiff truetype webp xpm zlib"
# fontconfig has prefixed font paths, details see bug #518970
diff --git a/media-libs/leptonica/leptonica-1.74.1.ebuild b/media-libs/leptonica/leptonica-1.74.1.ebuild
index 0b80d54eda96..74fac9205c9d 100644
--- a/media-libs/leptonica/leptonica-1.74.1.ebuild
+++ b/media-libs/leptonica/leptonica-1.74.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.leptonica.org/"
SRC_URI="http://www.leptonica.org/source/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0/5"
-KEYWORDS="alpha amd64 ~arm ~mips ppc ~ppc64 ~sparc x86 ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm ~mips ppc ~ppc64 sparc x86 ~ppc-macos"
IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
# N.B. Tests need some features enabled:
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.12.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.12.ebuild
index 7bd2e00760c2..1f8f6d0200a4 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.12.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.12.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
# FIXME: should we also bump for libgphoto2_port.so soname version?
SLOT="0/6" # libgphoto2.so soname version
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="doc examples exif gd jpeg nls serial"
# By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild b/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild
index a0996b9d3154..72c3ac889a70 100644
--- a/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild
+++ b/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/metabrainz/lib${PN}/releases/download/release-${PV}/
LICENSE="LGPL-2.1"
SLOT="5/1" # soname of libmusicbrainz5.so
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="examples test"
RDEPEND="
diff --git a/media-sound/moc/moc-2.5.2.ebuild b/media-sound/moc/moc-2.5.2.ebuild
index 91275c89b8e3..f6bf57555b7d 100644
--- a/media-sound/moc/moc-2.5.2.ebuild
+++ b/media-sound/moc/moc-2.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.daper.net/pub/soft/moc/stable/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 sparc x86"
IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack
oss sid sndfile speex timidity tremor +unicode vorbis wavpack"
diff --git a/media-sound/pulseaudio/pulseaudio-10.0.ebuild b/media-sound/pulseaudio/pulseaudio-10.0.ebuild
index 4dca8db13e06..74e880f004c8 100644
--- a/media-sound/pulseaudio/pulseaudio-10.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-10.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
# +alsa-plugin as discussed in bug #519530
IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
diff --git a/media-sound/wavpack/wavpack-5.1.0.ebuild b/media-sound/wavpack/wavpack-5.1.0.ebuild
index 51205b40a0a6..9aff053e50f4 100644
--- a/media-sound/wavpack/wavpack-5.1.0.ebuild
+++ b/media-sound/wavpack/wavpack-5.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.wavpack.com/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="static-libs"
RDEPEND=">=virtual/libiconv-0-r1
diff --git a/media-video/gpac/gpac-0.6.1-r2.ebuild b/media-video/gpac/gpac-0.6.1-r2.ebuild
index 25fd7172a3c9..ebfdae4d0c4e 100644
--- a/media-video/gpac/gpac-0.6.1-r2.ebuild
+++ b/media-video/gpac/gpac-0.6.1-r2.ebuild
@@ -7,10 +7,10 @@ EAPI=6
if [[ ${PV} == *9999 ]] ; then
SCM="git-r3"
EGIT_REPO_URI="https://github.com/gpac/gpac"
- KEYWORDS="alpha amd64 ppc x86"
+ KEYWORDS="alpha amd64 ppc sparc x86"
else
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="alpha amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+ KEYWORDS="alpha amd64 ppc ~ppc64 sparc x86 ~x86-fbsd"
fi
inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.0.ebuild
index 7a1913cf0cf8..2f9f73a8a272 100644
--- a/net-analyzer/tcpdump/tcpdump-4.9.0.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.9.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
IUSE="+drop-root libressl smi ssl samba suid test"
RDEPEND="
diff --git a/net-dns/bind-tools/bind-tools-9.11.0_p3.ebuild b/net-dns/bind-tools/bind-tools-9.11.0_p3.ebuild
index be0701a94ce2..5dfb9524156f 100644
--- a/net-dns/bind-tools/bind-tools-9.11.0_p3.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.11.0_p3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz"
LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
SLOT="0"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml"
# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
diff --git a/net-dns/bind/bind-9.11.0_p3.ebuild b/net-dns/bind/bind-9.11.0_p3.ebuild
index 5d39a91ec0a6..091fe820e0cd 100644
--- a/net-dns/bind/bind-9.11.0_p3.ebuild
+++ b/net-dns/bind/bind-9.11.0_p3.ebuild
@@ -39,7 +39,7 @@ SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# -berkdb by default re bug 602682
IUSE="-berkdb +caps dlz dnstap doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6
json ldap libressl lmdb mysql nslint odbc postgres python rpz seccomp selinux ssl static-libs
diff --git a/net-dns/dnssec-root/dnssec-root-20150403.ebuild b/net-dns/dnssec-root/dnssec-root-20150403.ebuild
index 431a48cc04af..8c6e2c5b085e 100644
--- a/net-dns/dnssec-root/dnssec-root-20150403.ebuild
+++ b/net-dns/dnssec-root/dnssec-root-20150403.ebuild
@@ -24,7 +24,7 @@ SRC_URI="http://data.iana.org/root-anchors/root-anchors.xml -> root-anchors-${DA
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-macos"
IUSE="test"
RDEPEND=""
diff --git a/net-ftp/atftp/atftp-0.7-r5.ebuild b/net-ftp/atftp/atftp-0.7-r5.ebuild
index 8a97d7eaf7fb..e7407d809766 100644
--- a/net-ftp/atftp/atftp-0.7-r5.ebuild
+++ b/net-ftp/atftp/atftp-0.7-r5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.mamalinux.com/pub/atftp/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~s390 sparc x86"
IUSE="selinux tcpd readline pcre"
DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-ftp/lftp/lftp-4.7.5.ebuild b/net-ftp/lftp/lftp-4.7.5.ebuild
index 3d2046f9fc85..932fd01b57b6 100644
--- a/net-ftp/lftp/lftp-4.7.5.ebuild
+++ b/net-ftp/lftp/lftp-4.7.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}ftp/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~sparc-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 sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file"
LFTP_LINGUAS=( cs de es fr it ja ko pl pt_BR ru uk zh_CN zh_HK zh_TW )
diff --git a/net-im/mcabber/mcabber-1.0.5.ebuild b/net-im/mcabber/mcabber-1.0.5.ebuild
index f700280a0a30..5731da05d54f 100644
--- a/net-im/mcabber/mcabber-1.0.5.ebuild
+++ b/net-im/mcabber/mcabber-1.0.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://mcabber.com/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="aspell crypt idn modules otr spell ssl vim-syntax"
diff --git a/net-im/pork/pork-0.99.8.1-r1.ebuild b/net-im/pork/pork-0.99.8.1-r1.ebuild
index a1d73e032ddf..5a5edbe4f510 100644
--- a/net-im/pork/pork-0.99.8.1-r1.ebuild
+++ b/net-im/pork/pork-0.99.8.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="perl"
RDEPEND="
diff --git a/net-misc/quagga/quagga-1.1.1.ebuild b/net-misc/quagga/quagga-1.1.1.ebuild
index 3b3a26d69ac5..95eb9b04aa40 100644
--- a/net-misc/quagga/quagga-1.1.1.ebuild
+++ b/net-misc/quagga/quagga-1.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ~s390 ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ppc ~s390 sparc x86"
IUSE="bgpclassless caps doc elibc_glibc ipv6 multipath ospfapi pam protobuf +readline snmp tcp-zebra"
diff --git a/net-misc/tigervnc/tigervnc-1.7.1.ebuild b/net-misc/tigervnc/tigervnc-1.7.1.ebuild
index 9a60f1ee889e..74e1d5aecde0 100644
--- a/net-misc/tigervnc/tigervnc-1.7.1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.7.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86"
IUSE="+drm gnutls java +opengl pam server +xorgmodule"
CDEPEND="virtual/jpeg:0
diff --git a/net-print/gutenprint/gutenprint-5.2.12.ebuild b/net-print/gutenprint/gutenprint-5.2.12.ebuild
index 3b3fe7561d0a..52c9a42d28c6 100644
--- a/net-print/gutenprint/gutenprint-5.2.12.ebuild
+++ b/net-print/gutenprint/gutenprint-5.2.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/gimp-print/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
IUSE="cups gimp gtk nls readline ppds static-libs"
REQUIRED_USE="gimp? ( gtk )"
diff --git a/sys-apps/grep/grep-2.27-r1.ebuild b/sys-apps/grep/grep-2.27-r1.ebuild
index aa7d15f97ddf..ac8cb37a1c7c 100644
--- a/sys-apps/grep/grep-2.27-r1.ebuild
+++ b/sys-apps/grep/grep-2.27-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls pcre static"
LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
diff --git a/sys-apps/sandbox/sandbox-2.10-r3.ebuild b/sys-apps/sandbox/sandbox-2.10-r3.ebuild
index 32668d8ad4f9..c6a46bbf07c2 100644
--- a/sys-apps/sandbox/sandbox-2.10-r3.ebuild
+++ b/sys-apps/sandbox/sandbox-2.10-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
IUSE=""
DEPEND="app-arch/xz-utils
diff --git a/sys-auth/skey/skey-1.1.5-r11.ebuild b/sys-auth/skey/skey-1.1.5-r11.ebuild
index 6b80c69f81c7..8b80f4bb9a13 100644
--- a/sys-auth/skey/skey-1.1.5-r11.ebuild
+++ b/sys-auth/skey/skey-1.1.5-r11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
LICENSE="BSD MIT RSA BEER-WARE"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
IUSE="static-libs"
DEPEND="dev-lang/perl
diff --git a/sys-fs/ntfs3g/ntfs3g-2016.2.22-r2.ebuild b/sys-fs/ntfs3g/ntfs3g-2016.2.22-r2.ebuild
index b9e26a5b903d..93271bfc2850 100644
--- a/sys-fs/ntfs3g/ntfs3g-2016.2.22-r2.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2016.2.22-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
LICENSE="GPL-2"
# The subslot matches the SONAME major #.
SLOT="0/87"
-KEYWORDS="alpha amd64 arm ppc ~ppc64 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ppc ~ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
IUSE="acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr"
RDEPEND="!<sys-apps/util-linux-2.20.1-r2
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.6-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.6-r1.ebuild
index acfdd80250c6..b6ed73ab82a0 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.6-r1.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.6-r1.ebuild
@@ -11,7 +11,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/www-client/lynx/lynx-2.8.9_pre11.ebuild b/www-client/lynx/lynx-2.8.9_pre11.ebuild
index 4153c6f29234..0bf5a8fd9a8a 100644
--- a/www-client/lynx/lynx-2.8.9_pre11.ebuild
+++ b/www-client/lynx/lynx-2.8.9_pre11.ebuild
@@ -22,7 +22,7 @@ SRC_URI="http://invisible-mirror.net/archives/lynx/tarballs/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode libressl"
RDEPEND="
diff --git a/x11-libs/gtk+/gtk+-2.24.31-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.31-r1.ebuild
index 9ba142af651a..451b99ef1423 100644
--- a/x11-libs/gtk+/gtk+-2.24.31-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.31-r1.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
xinerama? ( !aqua )
"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Upstream wants us to do their job:
# https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1
diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
index 3124da8a551b..eb59bf17a71b 100644
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/vte/vte-0.28.2-r208.ebuild b/x11-libs/vte/vte-0.28.2-r208.ebuild
index 9d85bd216e21..976c852a233a 100644
--- a/x11-libs/vte/vte-0.28.2-r208.ebuild
+++ b/x11-libs/vte/vte-0.28.2-r208.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE="debug +introspection python"
RDEPEND="
diff --git a/x11-libs/vte/vte-0.44.3.ebuild b/x11-libs/vte/vte-0.44.3.ebuild
index e0e78a519652..94faea85beeb 100644
--- a/x11-libs/vte/vte-0.44.3.ebuild
+++ b/x11-libs/vte/vte-0.44.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
LICENSE="LGPL-2+"
SLOT="2.91"
IUSE="+crypt debug glade +introspection vala"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.40:2
diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.20.2-r1.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.20.2-r1.ebuild
index 81dc37c4c7af..18e117546ad0 100644
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.20.2-r1.ebuild
+++ b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.20.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-themes-standard/"
LICENSE="LGPL-2.1+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
# Depend on gsettings-desktop-schemas-3.4 to make sure 3.2 users don't lose
# their default background image
diff --git a/x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.20.2.ebuild b/x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.20.2.ebuild
index 0893a8b2c23c..29ebcb118d40 100644
--- a/x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.20.2.ebuild
+++ b/x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.20.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-themes-standard/"
LICENSE="LGPL-2.1+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
COMMON_DEPEND="
>=x11-libs/gtk+-2.24.15:2[${MULTILIB_USEDEP}]