summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository QA checks <repo-qa-checks@gentoo.org>2016-06-11 12:21:55 +0000
committerRepository QA checks <repo-qa-checks@gentoo.org>2016-06-11 12:21:55 +0000
commitdaa924b78f4d1c0933c066a13eca149848745fa9 (patch)
tree5e68fcfe87d5df01e7d5c1cb9d352c00751f8b8e
parent2016-06-11 12:02:09 UTC (diff)
parentnet-fs/cifs-utils: Security cleanup (bug 552634). (diff)
downloadgentoo-daa924b78f4d1c0933c066a13eca149848745fa9.tar.gz
gentoo-daa924b78f4d1c0933c066a13eca149848745fa9.tar.bz2
gentoo-daa924b78f4d1c0933c066a13eca149848745fa9.zip
Merge updates from master
-rw-r--r--app-arch/file-roller/file-roller-3.16.5.ebuild4
-rw-r--r--app-arch/gcab/gcab-0.7.ebuild2
-rw-r--r--app-crypt/libsecret/libsecret-0.18.5.ebuild2
-rw-r--r--app-doc/gnucash-docs/gnucash-docs-2.6.12.ebuild2
-rw-r--r--app-editors/ghex/ghex-3.18.1.ebuild2
-rw-r--r--app-misc/geoclue/geoclue-2.4.3.ebuild2
-rw-r--r--app-misc/tracker/tracker-1.6.2.ebuild2
-rw-r--r--app-office/glabels/glabels-3.4.0.ebuild2
-rw-r--r--app-office/gnucash/gnucash-2.6.12.ebuild2
-rw-r--r--app-office/gnumeric/gnumeric-1.12.29.ebuild2
-rw-r--r--app-text/iso-codes/iso-codes-3.68.ebuild2
-rw-r--r--dev-cpp/glibmm/glibmm-2.46.4.ebuild2
-rw-r--r--dev-cpp/gtkmm/gtkmm-3.18.1.ebuild2
-rw-r--r--dev-lang/orc/orc-0.4.25.ebuild2
-rw-r--r--dev-libs/appstream-glib/appstream-glib-0.5.15.ebuild2
-rw-r--r--dev-libs/json-glib/json-glib-1.2.0.ebuild2
-rw-r--r--dev-libs/libgusb/libgusb-0.2.9.ebuild2
-rw-r--r--dev-libs/libinput/libinput-1.3.0.ebuild2
-rw-r--r--dev-libs/libxml2/libxml2-2.9.4.ebuild2
-rw-r--r--dev-libs/libxslt/libxslt-1.1.29.ebuild2
-rw-r--r--dev-libs/link-grammar/link-grammar-5.3.7.ebuild2
-rw-r--r--dev-util/d-feet/d-feet-0.3.11.ebuild2
-rw-r--r--dev-util/dogtail/dogtail-0.9.9.ebuild2
-rw-r--r--dev-util/gtk-doc-am/gtk-doc-am-1.25.ebuild2
-rw-r--r--dev-util/gtk-doc/gtk-doc-1.25.ebuild2
-rw-r--r--dev-util/meld/meld-3.16.0.ebuild2
-rw-r--r--dev-vcs/gitg/gitg-3.18.0-r1.ebuild2
-rw-r--r--gnome-base/gdm/gdm-3.18.3.ebuild4
-rw-r--r--gnome-base/gnome-extra-apps/gnome-extra-apps-3.18.0-r1.ebuild4
-rw-r--r--gnome-base/gnome-keyring/gnome-keyring-3.18.3-r1.ebuild2
-rw-r--r--gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.3.ebuild4
-rw-r--r--gnome-base/gnome-shell/gnome-shell-3.18.5.ebuild2
-rw-r--r--gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.1.ebuild2
-rw-r--r--gnome-extra/cinnamon-session/cinnamon-session-2.8.3.ebuild2
-rw-r--r--gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.ebuild2
-rw-r--r--gnome-extra/cinnamon/cinnamon-2.8.8.ebuild2
-rw-r--r--gnome-extra/gnome-calendar/gnome-calendar-3.18.3.ebuild4
-rw-r--r--gnome-extra/gnome-documents/gnome-documents-3.18.3.ebuild4
-rw-r--r--gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.4.ebuild2
-rw-r--r--gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.18.1-r2.ebuild4
-rw-r--r--gnome-extra/gnome-user-share/gnome-user-share-3.18.1-r1.ebuild4
-rw-r--r--gnome-extra/nautilus-sendto/nautilus-sendto-3.8.3.ebuild2
-rw-r--r--gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.6.2.ebuild4
-rw-r--r--gnome-extra/nemo/nemo-2.8.7.ebuild2
-rw-r--r--mail-client/evolution/evolution-3.18.5.2.ebuild4
-rw-r--r--mail-client/geary/geary-0.11.0.ebuild2
-rw-r--r--media-gfx/eog-plugins/eog-plugins-3.16.4.ebuild2
-rw-r--r--media-gfx/gphoto2/gphoto2-2.5.10.ebuild2
-rw-r--r--media-gfx/gthumb/gthumb-3.4.3.ebuild4
-rw-r--r--media-gfx/shotwell/shotwell-0.23.1.ebuild2
-rw-r--r--media-libs/clutter-gst/clutter-gst-2.0.18.ebuild4
-rw-r--r--media-libs/clutter-gst/clutter-gst-3.0.18.ebuild4
-rw-r--r--media-libs/harfbuzz/harfbuzz-1.2.7.ebuild2
-rw-r--r--media-libs/libchamplain/libchamplain-0.12.13.ebuild4
-rw-r--r--media-libs/libgphoto2/libgphoto2-2.5.10.ebuild2
-rw-r--r--media-sound/banshee/banshee-2.6.2-r1.ebuild2
-rw-r--r--media-sound/rhythmbox/rhythmbox-3.3.1.ebuild4
-rw-r--r--media-sound/sound-juicer/sound-juicer-3.18.2.ebuild4
-rw-r--r--net-fs/cifs-utils/Manifest1
-rw-r--r--net-fs/cifs-utils/cifs-utils-6.1-r1.ebuild110
-rw-r--r--net-fs/cifs-utils/files/cifs-utils-6.1-hardcoded-path.patch44
-rw-r--r--net-im/empathy/empathy-3.12.12.ebuild2
-rw-r--r--net-im/telepathy-mission-control/telepathy-mission-control-5.16.3-r1.ebuild2
-rw-r--r--net-irc/polari/polari-3.18.1-r1.ebuild2
-rw-r--r--net-libs/farstream/farstream-0.2.8.ebuild2
-rw-r--r--net-libs/gssdp/gssdp-0.14.15.ebuild2
-rw-r--r--net-libs/gupnp/gupnp-0.20.17.ebuild2
-rw-r--r--net-libs/libdmapsharing/libdmapsharing-2.9.35.ebuild2
-rw-r--r--net-libs/libndp/libndp-1.6.ebuild2
-rw-r--r--net-libs/rest/rest-0.8.0.ebuild2
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild2
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild2
-rw-r--r--net-misc/gupnp-tools/gupnp-tools-0.8.12.ebuild2
-rw-r--r--net-misc/rygel/rygel-0.28.3.ebuild4
-rw-r--r--net-nntp/pan/pan-0.140.ebuild2
-rw-r--r--net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild4
-rw-r--r--net-wireless/gnome-bluetooth/gnome-bluetooth-3.18.3.ebuild4
-rw-r--r--sci-geosciences/geocode-glib/geocode-glib-3.18.2.ebuild2
-rw-r--r--sys-block/gparted/gparted-0.26.0.ebuild2
-rw-r--r--www-client/epiphany/epiphany-3.18.7.ebuild2
-rw-r--r--x11-libs/goffice/goffice-0.10.29.ebuild2
-rw-r--r--x11-libs/gtk+/gtk+-2.24.30.ebuild2
-rw-r--r--x11-libs/gtk+/gtk+-3.18.9.ebuild2
-rw-r--r--x11-libs/vte/vte-0.42.5.ebuild2
-rw-r--r--x11-terms/gnome-terminal/gnome-terminal-3.18.3.ebuild4
-rw-r--r--x11-wm/muffin/muffin-2.8.5.ebuild2
-rw-r--r--x11-wm/mutter/mutter-3.18.4.ebuild2
87 files changed, 104 insertions, 259 deletions
diff --git a/app-arch/file-roller/file-roller-3.16.5.ebuild b/app-arch/file-roller/file-roller-3.16.5.ebuild
index 0005443af739..3706519a20be 100644
--- a/app-arch/file-roller/file-roller-3.16.5.ebuild
+++ b/app-arch/file-roller/file-roller-3.16.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
LICENSE="GPL-2+ CC-BY-SA-3.0"
SLOT="0"
IUSE="nautilus packagekit"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
# gdk-pixbuf used extensively in the source
# cairo used in eggtreemultidnd.c
diff --git a/app-arch/gcab/gcab-0.7.ebuild b/app-arch/gcab/gcab-0.7.ebuild
index cc93f34871fa..bb6f53d34d96 100644
--- a/app-arch/gcab/gcab-0.7.ebuild
+++ b/app-arch/gcab/gcab-0.7.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/msitools"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="+introspection vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/app-crypt/libsecret/libsecret-0.18.5.ebuild b/app-crypt/libsecret/libsecret-0.18.5.ebuild
index 97859fb4b9be..3f79b7f15700 100644
--- a/app-crypt/libsecret/libsecret-0.18.5.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.5.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
IUSE="+crypt +introspection test vala"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
RDEPEND="
>=dev-libs/glib-2.38:2
diff --git a/app-doc/gnucash-docs/gnucash-docs-2.6.12.ebuild b/app-doc/gnucash-docs/gnucash-docs-2.6.12.ebuild
index 8346e76f1a68..7dfdc450b772 100644
--- a/app-doc/gnucash-docs/gnucash-docs-2.6.12.ebuild
+++ b/app-doc/gnucash-docs/gnucash-docs-2.6.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gnucash/${P}.tar.gz"
SLOT="0"
LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
IUSE="test"
RDEPEND="!<=app-office/gnucash-2.2.1"
diff --git a/app-editors/ghex/ghex-3.18.1.ebuild b/app-editors/ghex/ghex-3.18.1.ebuild
index bb9f3a165fcd..ca1b5b3fe39b 100644
--- a/app-editors/ghex/ghex-3.18.1.ebuild
+++ b/app-editors/ghex/ghex-3.18.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Ghex"
LICENSE="GPL-2+ FDL-1.1+"
SLOT="2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
diff --git a/app-misc/geoclue/geoclue-2.4.3.ebuild b/app-misc/geoclue/geoclue-2.4.3.ebuild
index d7b5aeaee6f6..229a72d223ed 100644
--- a/app-misc/geoclue/geoclue-2.4.3.ebuild
+++ b/app-misc/geoclue/geoclue-2.4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${MY_PV}/${P}.tar.x
LICENSE="LGPL-2"
SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
IUSE="+introspection +modemmanager zeroconf"
RDEPEND="
diff --git a/app-misc/tracker/tracker-1.6.2.ebuild b/app-misc/tracker/tracker-1.6.2.ebuild
index f4b891ad8988..4bdf24572c10 100644
--- a/app-misc/tracker/tracker-1.6.2.ebuild
+++ b/app-misc/tracker/tracker-1.6.2.ebuild
@@ -18,7 +18,7 @@ IUSE="cue eds elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf
gstreamer gtk iptc +iso +jpeg libav +miner-fs mp3 nautilus networkmanager
pdf playlist rss stemmer test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
REQUIRED_USE="
?? ( gstreamer ffmpeg )
diff --git a/app-office/glabels/glabels-3.4.0.ebuild b/app-office/glabels/glabels-3.4.0.ebuild
index 95f3cad53fbe..f0f7929a2bc2 100644
--- a/app-office/glabels/glabels-3.4.0.ebuild
+++ b/app-office/glabels/glabels-3.4.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.glabels.org/"
LICENSE="GPL-2 FDL-1.1 LGPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
IUSE="barcode eds"
RDEPEND="
diff --git a/app-office/gnucash/gnucash-2.6.12.ebuild b/app-office/gnucash/gnucash-2.6.12.ebuild
index 7028f9cab0a8..d022ed6ce2e4 100644
--- a/app-office/gnucash/gnucash-2.6.12.ebuild
+++ b/app-office/gnucash/gnucash-2.6.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
IUSE="chipcard debug +doc gnome-keyring hbci mysql ofx postgres python quotes sqlite"
# FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.ac)
diff --git a/app-office/gnumeric/gnumeric-1.12.29.ebuild b/app-office/gnumeric/gnumeric-1.12.29.ebuild
index ba3a957eac68..c058994b8752 100644
--- a/app-office/gnumeric/gnumeric-1.12.29.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.29.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnumeric.org/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="+introspection libgda perl python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-text/iso-codes/iso-codes-3.68.ebuild b/app-text/iso-codes/iso-codes-3.68.ebuild
index d5f1d868837b..9901701f4688 100644
--- a/app-text/iso-codes/iso-codes-3.68.ebuild
+++ b/app-text/iso-codes/iso-codes-3.68.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 ~x86-freebsd ~x86-interix ~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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/dev-cpp/glibmm/glibmm-2.46.4.ebuild b/dev-cpp/glibmm/glibmm-2.46.4.ebuild
index 5291ed6cbeab..f1b7f6077b9e 100644
--- a/dev-cpp/glibmm/glibmm-2.46.4.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.46.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtkmm.org"
LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
SLOT="2"
-KEYWORDS="alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc debug examples test"
RDEPEND="
diff --git a/dev-cpp/gtkmm/gtkmm-3.18.1.ebuild b/dev-cpp/gtkmm/gtkmm-3.18.1.ebuild
index 7c60f8a1934a..a39f9bc7b50f 100644
--- a/dev-cpp/gtkmm/gtkmm-3.18.1.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.18.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="3.0"
-KEYWORDS="alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="aqua doc examples test wayland X"
REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/dev-lang/orc/orc-0.4.25.ebuild b/dev-lang/orc/orc-0.4.25.ebuild
index e8fcb8f91bc4..687352285d19 100644
--- a/dev-lang/orc/orc-0.4.25.ebuild
+++ b/dev-lang/orc/orc-0.4.25.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
LICENSE="BSD BSD-2"
SLOT="0"
-KEYWORDS="~amd64 arm ~hppa ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~hppa ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples pax_kernel static-libs"
RDEPEND=""
diff --git a/dev-libs/appstream-glib/appstream-glib-0.5.15.ebuild b/dev-libs/appstream-glib/appstream-glib-0.5.15.ebuild
index bd26e80d8a64..8b0a7a90b8c4 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.5.15.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.5.15.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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="+introspection nls"
# FIXME: yaml is optional with --enable-dep11 but not
diff --git a/dev-libs/json-glib/json-glib-1.2.0.ebuild b/dev-libs/json-glib/json-glib-1.2.0.ebuild
index 1cb206375f92..b22ef036cae9 100644
--- a/dev-libs/json-glib/json-glib-1.2.0.ebuild
+++ b/dev-libs/json-glib/json-glib-1.2.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE="debug +introspection"
RDEPEND="
diff --git a/dev-libs/libgusb/libgusb-0.2.9.ebuild b/dev-libs/libgusb/libgusb-0.2.9.ebuild
index 0f44b20f3371..fc7b44064114 100644
--- a/dev-libs/libgusb/libgusb-0.2.9.ebuild
+++ b/dev-libs/libgusb/libgusb-0.2.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="+introspection static-libs vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libinput/libinput-1.3.0.ebuild b/dev-libs/libinput/libinput-1.3.0.ebuild
index e3df51a0e5a3..23624a444bbe 100644
--- a/dev-libs/libinput/libinput-1.3.0.ebuild
+++ b/dev-libs/libinput/libinput-1.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
LICENSE="MIT"
SLOT="0/10"
-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="input_devices_wacom test"
# Tests require write access to udev rules directory which is a no-no for live system.
# Other tests are just about logs, exported symbols and autotest of the test library.
diff --git a/dev-libs/libxml2/libxml2-2.9.4.ebuild b/dev-libs/libxml2/libxml2-2.9.4.ebuild
index 2ff65b0923ab..8970762d7a57 100644
--- a/dev-libs/libxml2/libxml2-2.9.4.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="debug examples icu ipv6 lzma python readline static-libs test"
XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
diff --git a/dev-libs/libxslt/libxslt-1.1.29.ebuild b/dev-libs/libxslt/libxslt-1.1.29.ebuild
index a82fef2b05ff..27f007494e3f 100644
--- a/dev-libs/libxslt/libxslt-1.1.29.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.29.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 ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~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 ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~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/link-grammar/link-grammar-5.3.7.ebuild b/dev-libs/link-grammar/link-grammar-5.3.7.ebuild
index 2ca6260386dc..eed3f65f84f7 100644
--- a/dev-libs/link-grammar/link-grammar-5.3.7.ebuild
+++ b/dev-libs/link-grammar/link-grammar-5.3.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="aspell +hunspell java python static-libs threads"
diff --git a/dev-util/d-feet/d-feet-0.3.11.ebuild b/dev-util/d-feet/d-feet-0.3.11.ebuild
index cf38cbf11c44..adf439303b77 100644
--- a/dev-util/d-feet/d-feet-0.3.11.ebuild
+++ b/dev-util/d-feet/d-feet-0.3.11.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/DFeet"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/dogtail/dogtail-0.9.9.ebuild b/dev-util/dogtail/dogtail-0.9.9.ebuild
index 7990654e637d..bee972f8c961 100644
--- a/dev-util/dogtail/dogtail-0.9.9.ebuild
+++ b/dev-util/dogtail/dogtail-0.9.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE=""
RDEPEND="
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.25.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.25.ebuild
index f6945c7b1db1..4f9cd7d04fcc 100644
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.25.ebuild
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.25.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtk.org/gtk-doc/"
LICENSE="GPL-2 FDL-1.1"
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 ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~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 ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND=">=dev-lang/perl-5.6"
DEPEND="${RDEPEND}
diff --git a/dev-util/gtk-doc/gtk-doc-1.25.ebuild b/dev-util/gtk-doc/gtk-doc-1.25.ebuild
index 117a2703d192..0ce931ef6f8d 100644
--- a/dev-util/gtk-doc/gtk-doc-1.25.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.25.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtk.org/gtk-doc/"
LICENSE="GPL-2 FDL-1.1"
SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="doc emacs highlight vim"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/meld/meld-3.16.0.ebuild b/dev-util/meld/meld-3.16.0.ebuild
index 79faf360b12b..c39f572db354 100644
--- a/dev-util/meld/meld-3.16.0.ebuild
+++ b/dev-util/meld/meld-3.16.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://meldmerge.org/"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="${PYTHON_DEPS}
diff --git a/dev-vcs/gitg/gitg-3.18.0-r1.ebuild b/dev-vcs/gitg/gitg-3.18.0-r1.ebuild
index 6b1af28b2579..9442b43987a5 100644
--- a/dev-vcs/gitg/gitg-3.18.0-r1.ebuild
+++ b/dev-vcs/gitg/gitg-3.18.0-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="debug glade +python"
REQUIRED_USE="python? ( ^^ ( $(python_gen_useflags '*') ) )"
diff --git a/gnome-base/gdm/gdm-3.18.3.ebuild b/gnome-base/gdm/gdm-3.18.3.ebuild
index eba3c7659649..0684ed60e328 100644
--- a/gnome-base/gdm/gdm-3.18.3.ebuild
+++ b/gnome-base/gdm/gdm-3.18.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -24,7 +24,7 @@ SLOT="0"
IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
# nspr used by smartcard extension
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.18.0-r1.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.18.0-r1.ebuild
index 4915bf9bca3a..f4dffcf22316 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.18.0-r1.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.18.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ IUSE="+games +share +shotwell +tracker"
# when unmasking for an arch
# double check none of the deps are still masked !
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
# Note to developers:
# This is a wrapper for the extra apps integrated with GNOME 3
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.18.3-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.18.3-r1.ebuild
index 58cce9777c97..bfb41eacefc3 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.18.3-r1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.18.3-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
IUSE="+caps pam selinux +ssh-agent test"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
RDEPEND="
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.3.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.3.ebuild
index 97d23a02cf33..c5f05458194f 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.3.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -20,7 +20,7 @@ REQUIRED_USE="
smartcard? ( udev )
test? ( ${PYTHON_REQUIRED_USE} )
"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
COMMON_DEPEND="
>=dev-libs/glib-2.37.7:2[dbus]
diff --git a/gnome-base/gnome-shell/gnome-shell-3.18.5.ebuild b/gnome-base/gnome-shell/gnome-shell-3.18.5.ebuild
index 0e6be494d32a..0f802892eafa 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.18.5.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.18.5.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
IUSE="+bluetooth +networkmanager +nls -openrc-force"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
# libXfixes-5.0 needed for pointer barriers
# FIXME:
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.1.ebuild
index eba8ad694cb7..6120def61986 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.1.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> $
LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
SLOT="0/4" # subslot = libcinnamon-desktop soname version
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="+introspection systemd"
COMMON_DEPEND="${PYTHON_DEPS}
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-2.8.3.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-2.8.3.ebuild
index 6ff024616a75..68c0a2dae769 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-2.8.3.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-2.8.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> $
LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="doc ipv6 systemd"
COMMON_DEPEND="
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.ebuild
index a2c8dd3b8ac2..7f3863eb2d78 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="+colord cups input_devices_wacom smartcard systemd"
# udev is non-optional since lots of plugins, not just gudev, pull it in
diff --git a/gnome-extra/cinnamon/cinnamon-2.8.8.ebuild b/gnome-extra/cinnamon/cinnamon-2.8.8.ebuild
index dd066c3da8a4..406136ec81eb 100644
--- a/gnome-extra/cinnamon/cinnamon-2.8.8.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.8.8.ebuild
@@ -29,7 +29,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
|| ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
COMMON_DEPEND="${PYTHON_DEPS}
app-accessibility/at-spi2-atk:2
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.18.3.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.18.3.ebuild
index 6161be99d601..7d6a97756b9b 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.18.3.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.18.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE=""
# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.18.3.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.18.3.ebuild
index 9bbbd353e214..a66381736773 100644
--- a/gnome-extra/gnome-documents/gnome-documents-3.18.3.ebuild
+++ b/gnome-extra/gnome-documents/gnome-documents-3.18.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
LICENSE="GPL-2+"
SLOT="0"
IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
# Need gdk-pixbuf-2.25 for gdk_pixbuf_get_pixels_with_length
COMMON_DEPEND="
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.4.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.4.ebuild
index dd09336e7265..8c325cc03633 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.4.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
LICENSE="GPL-2"
SLOT="0"
IUSE="examples"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
COMMON_DEPEND="
>=dev-libs/glib-2.26:2
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.18.1-r2.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.18.1-r2.ebuild
index 46f7e0395665..8eab46954049 100644
--- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.18.1-r2.ebuild
+++ b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.18.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,7 +17,7 @@ SLOT="0"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
# Newer pygobject needed due upstream bug #723951
COMMON_DEPEND="
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.18.1-r1.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.18.1-r1.ebuild
index a29c422bff2b..086e660ccd88 100644
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.18.1-r1.ebuild
+++ b/gnome-extra/gnome-user-share/gnome-user-share-3.18.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-user-share"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE=""
# FIXME: could libnotify be made optional ?
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.3.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.3.ebuild
index 6f57138e22ac..c8eb8043ccf4 100644
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.3.ebuild
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/nautilus-sendto/"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
RDEPEND="
diff --git a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.6.2.ebuild b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.6.2.ebuild
index 5bd4bccae48f..e2ed3a7bebc7 100644
--- a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.6.2.ebuild
+++ b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
COMMON_DEPEND="
diff --git a/gnome-extra/nemo/nemo-2.8.7.ebuild b/gnome-extra/nemo/nemo-2.8.7.ebuild
index 7d3f0e573dff..29d30dd0221a 100644
--- a/gnome-extra/nemo/nemo-2.8.7.ebuild
+++ b/gnome-extra/nemo/nemo-2.8.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="exif +introspection +nls packagekit tracker xmp"
COMMON_DEPEND="
diff --git a/mail-client/evolution/evolution-3.18.5.2.ebuild b/mail-client/evolution/evolution-3.18.5.2.ebuild
index dedc34aa55a9..27e64b0abe9d 100644
--- a/mail-client/evolution/evolution-3.18.5.2.ebuild
+++ b/mail-client/evolution/evolution-3.18.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,7 +17,7 @@ SLOT="2.0"
IUSE="+bogofilter crypt highlight ldap map spamassassin spell ssl +weather"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
# We need a graphical pinentry frontend to be able to ask for the GPG
# password from inside evolution, bug 160302
diff --git a/mail-client/geary/geary-0.11.0.ebuild b/mail-client/geary/geary-0.11.0.ebuild
index bee207219255..31b676c61684 100644
--- a/mail-client/geary/geary-0.11.0.ebuild
+++ b/mail-client/geary/geary-0.11.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Geary"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="nls"
DEPEND="
diff --git a/media-gfx/eog-plugins/eog-plugins-3.16.4.ebuild b/media-gfx/eog-plugins/eog-plugins-3.16.4.ebuild
index eba12f855332..10121aa5c4b8 100644
--- a/media-gfx/eog-plugins/eog-plugins-3.16.4.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-3.16.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="+exif +flickr map picasa +python"
REQUIRED_USE="
diff --git a/media-gfx/gphoto2/gphoto2-2.5.10.ebuild b/media-gfx/gphoto2/gphoto2-2.5.10.ebuild
index 5948f8405a9c..ffc4d25a9ce5 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.10.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="aalib exif ncurses nls readline"
# aalib -> needs libjpeg
diff --git a/media-gfx/gthumb/gthumb-3.4.3.ebuild b/media-gfx/gthumb/gthumb-3.4.3.ebuild
index ead252ef0e15..da2eece44a10 100644
--- a/media-gfx/gthumb/gthumb-3.4.3.ebuild
+++ b/media-gfx/gthumb/gthumb-3.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/gthumb"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="cdr exif gnome-keyring gstreamer http jpeg json lcms raw slideshow svg tiff test webkit webp"
COMMON_DEPEND="
diff --git a/media-gfx/shotwell/shotwell-0.23.1.ebuild b/media-gfx/shotwell/shotwell-0.23.1.ebuild
index bb7c2ab34ad1..8a2dcfdba3a1 100644
--- a/media-gfx/shotwell/shotwell-0.23.1.ebuild
+++ b/media-gfx/shotwell/shotwell-0.23.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
CORE_SUPPORTED_LANGUAGES="
diff --git a/media-libs/clutter-gst/clutter-gst-2.0.18.ebuild b/media-libs/clutter-gst/clutter-gst-2.0.18.ebuild
index 913078934398..da981388748f 100644
--- a/media-libs/clutter-gst/clutter-gst-2.0.18.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-2.0.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ DESCRIPTION="GStreamer integration library for Clutter"
LICENSE="LGPL-2.1+"
SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="examples +introspection"
# FIXME: Support for gstreamer-basevideo-0.10 (HW decoder support) is automagic
diff --git a/media-libs/clutter-gst/clutter-gst-3.0.18.ebuild b/media-libs/clutter-gst/clutter-gst-3.0.18.ebuild
index 05360180a15b..14ddbcec2ee1 100644
--- a/media-libs/clutter-gst/clutter-gst-3.0.18.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-3.0.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ DESCRIPTION="GStreamer integration library for Clutter"
LICENSE="LGPL-2.1+"
SLOT="3.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="X examples +introspection udev"
# >=cogl-1.18 provides cogl-2.0-experimental
diff --git a/media-libs/harfbuzz/harfbuzz-1.2.7.ebuild b/media-libs/harfbuzz/harfbuzz-1.2.7.ebuild
index ad02aa2ff709..bb9a5b29eceb 100644
--- a/media-libs/harfbuzz/harfbuzz-1.2.7.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.2.7.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
LICENSE="Old-MIT ISC icu"
SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
[[ ${PV} == 9999 ]] || \
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-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 ~x64-macos ~x86-macos ~x64-solaris"
IUSE="+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype"
REQUIRED_USE="introspection? ( glib )"
diff --git a/media-libs/libchamplain/libchamplain-0.12.13.ebuild b/media-libs/libchamplain/libchamplain-0.12.13.ebuild
index 9eb401a9dbb7..7d0e0ba05d28 100644
--- a/media-libs/libchamplain/libchamplain-0.12.13.ebuild
+++ b/media-libs/libchamplain/libchamplain-0.12.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libchamplain"
SLOT="0.12"
LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="debug +gtk +introspection vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.10.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.10.ebuild
index b4dffe7a1d28..cd285cd53ce0 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.10.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.10.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 ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-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-sound/banshee/banshee-2.6.2-r1.ebuild b/media-sound/banshee/banshee-2.6.2-r1.ebuild
index 2f3bc216e528..98e524a9ae64 100644
--- a/media-sound/banshee/banshee-2.6.2-r1.ebuild
+++ b/media-sound/banshee/banshee-2.6.2-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://banshee.fm/"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="+aac +cdda +bpm daap doc +encode ipod karma mtp test udev youtube"
RDEPEND="
diff --git a/media-sound/rhythmbox/rhythmbox-3.3.1.ebuild b/media-sound/rhythmbox/rhythmbox-3.3.1.ebuild
index e4f4d8f8ef2d..f734815abf36 100644
--- a/media-sound/rhythmbox/rhythmbox-3.3.1.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -26,7 +26,7 @@ REQUIRED_USE="
webkit? ( python )
"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
# Tests failing for years without upstream caring at all
# upstream bug #688745
diff --git a/media-sound/sound-juicer/sound-juicer-3.18.2.ebuild b/media-sound/sound-juicer/sound-juicer-3.18.2.ebuild
index 97b93b9bcd34..f43190a9461b 100644
--- a/media-sound/sound-juicer/sound-juicer-3.18.2.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-3.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/SoundJuicer"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="flac test vorbis"
COMMON_DEPEND="
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index 9777594a25e3..cc08b24700fc 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -1,3 +1,2 @@
-DIST cifs-utils-6.1.tar.bz2 390958 SHA256 381f1e9caccdafdcdb0efa32a4cceb77c1a96b0b58702394e4b86dac4825f3b5 SHA512 6427b74edbf56b865dee38a610c74ac5483cdc13096082cfc1e9d225a048c9b5ee0c7afb30e625a615a0e8e9f3767e33765220e27148e2c2a29d12d4129b01fd WHIRLPOOL a800a02a0729996035a331b460cb28ae5463ddecaf205d88173dc08efd7a2bee577995ebba97b36977858c8435ac3b7ec9c7ce5d193f8b30d0602f9546fed5b1
DIST cifs-utils-6.4.tar.bz2 392809 SHA256 38fc63926af435dae4ebcf4406275580a692d9fb9ee3e32170317cf2ba68e6e3 SHA512 05860ceed1e83b4f4da689d2fc1c1b48fddc0ca53ba52fc6cf26a277d6a884f5780060725c5df1401a665ac35ec5a170262ee62f61095e4a8d76348888182614 WHIRLPOOL 335262eb329860318750fcd081dc2c082f36c75a32e5e596a45b51e73b08be7ee66133c2e4e2bc3089631d3909018abd9c2f36f79d82cd9ea7f6fe2530900f72
DIST cifs-utils-6.5.tar.bz2 402158 SHA256 e2776578b8267c6dc0862897f5e10f87f10f8337fca9ca6a9118f5eb30cf49f7 SHA512 c5eea97d2be455ad676a3ff693641512d5c1d81d75eb1d7d08e4274b6844a1353b6791aa3ced4d8d656ed4a09b3c17ae80f289a90a3d429a8a94210e15f3e90e WHIRLPOOL 880b3c5762e791317140213fea008759b9d2599ddefb08319877ba6a5ced517fd6e0246050975ad01b74110b20f2233bb6cb505ecf3b2e05dca014ae378eaba5
diff --git a/net-fs/cifs-utils/cifs-utils-6.1-r1.ebuild b/net-fs/cifs-utils/cifs-utils-6.1-r1.ebuild
deleted file mode 100644
index c51ede49d294..000000000000
--- a/net-fs/cifs-utils/cifs-utils-6.1-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils linux-info multilib
-
-DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
-HOMEPAGE="http://wiki.samba.org/index.php/LinuxCIFS_utils"
-SRC_URI="ftp://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~arm-linux ~x86-linux"
-IUSE="+acl +ads +caps +caps-ng creds"
-
-DEPEND="!net-fs/mount-cifs
- !<net-fs/samba-3.6_rc1
- ads? (
- sys-apps/keyutils
- sys-libs/talloc
- virtual/krb5
- )
- caps? ( !caps-ng? ( sys-libs/libcap ) )
- caps? ( caps-ng? ( sys-libs/libcap-ng ) )
- creds? ( sys-apps/keyutils )"
-PDEPEND="${DEPEND}
- acl? ( || (
- =net-fs/samba-3.6*[winbind]
- >=net-fs/samba-4.0.0_alpha1
- ) )
-"
-
-REQUIRED_USE="acl? ( ads )"
-
-DOCS="doc/linux-cifs-client-guide.odt"
-
-pkg_setup() {
- linux-info_pkg_setup
-
- if ! linux_config_exists || ! linux_chkconfig_present CIFS; then
- ewarn "You must enable CIFS support in your kernel config, "
- ewarn "to be able to mount samba shares. You can find it at"
- ewarn
- ewarn " File systems"
- ewarn " Network File Systems"
- ewarn " CIFS support"
- ewarn
- ewarn "and recompile your kernel ..."
- fi
-}
-
-src_prepare() {
- # Do not rely on hardcoded path to systemd-ask-password, bug #478538
- epatch "${FILESDIR}/${P}-hardcoded-path.patch"
-}
-
-src_configure() {
- ROOTSBINDIR="${EPREFIX}"/sbin \
- econf \
- $(use_enable acl cifsacl cifsidmap) \
- $(use_enable ads cifsupcall) \
- $(use caps && use_with !caps-ng libcap || echo --without-libcap) \
- $(use caps && use_with caps-ng libcap-ng || echo --without-libcap-ng) \
- $(use_enable creds cifscreds)
-}
-
-src_install() {
- default
-
- # remove empty directories
- find "${ED}" -type d -print0 | xargs --null rmdir \
- --ignore-fail-on-non-empty &>/dev/null
-
- if use acl ; then
- dodir /etc/cifs-utils
- dosym /usr/$(get_libdir)/cifs-utils/idmapwb.so \
- /etc/cifs-utils/idmap-plugin
- dodir /etc/request-key.d
- echo 'create cifs.idmap * * /usr/sbin/cifs.idmap %k' \
- > "${ED}/etc/request-key.d/cifs.idmap.conf"
- fi
-
- if use ads ; then
- dodir /etc/request-key.d
- echo 'create dns_resolver * * /usr/sbin/cifs.upcall %k' \
- > "${ED}/etc/request-key.d/cifs.upcall.conf"
- fi
-}
-
-pkg_postinst() {
- # Inform about set-user-ID bit of mount.cifs
- ewarn "setuid use flag was dropped due to multiple security implications"
- ewarn "such as CVE-2009-2948, CVE-2011-3585 and CVE-2012-1586"
- ewarn "You are free to set setuid flags by yourself"
-
- # Inform about upcall usage
- if use acl ; then
- einfo "The cifs.idmap utility has been enabled by creating the"
- einfo "configuration file /etc/request-key.d/cifs.idmap.conf"
- einfo "This enables you to get and set CIFS acls."
- fi
-
- if use ads ; then
- einfo "The cifs.upcall utility has been enabled by creating the"
- einfo "configuration file /etc/request-key.d/cifs.upcall.conf"
- einfo "This enables you to mount DFS shares."
- fi
-}
diff --git a/net-fs/cifs-utils/files/cifs-utils-6.1-hardcoded-path.patch b/net-fs/cifs-utils/files/cifs-utils-6.1-hardcoded-path.patch
deleted file mode 100644
index 2c2067fa1f92..000000000000
--- a/net-fs/cifs-utils/files/cifs-utils-6.1-hardcoded-path.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 4e315f6a02a4edb259b33bcf0665eba259fee2f2 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 30 Jul 2013 10:00:26 +0200
-Subject: [PATCH] Do not rely on hardcoded path to systemd-ask-password.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-Relying on hardcoded /bin/systemd-ask-password path breaks systemd that
-install systemd-ask-password in /usr/bin. Since both paths are supposed
-to be in ${PATH} and popen() passes the command to shell, just pass
-'systemd-ask-password' and let the shell find it.
-
-Fixes: https://bugzilla.samba.org/show_bug.cgi?id=10054
-Signed-off-by: Michał Górny <mgorny@gentoo.org>
----
- mount.cifs.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mount.cifs.c b/mount.cifs.c
-index e76beee..7206dcb 100644
---- a/mount.cifs.c
-+++ b/mount.cifs.c
-@@ -1626,7 +1626,7 @@ drop_child_privs(void)
- }
-
- /*
-- * If systemd is running and /bin/systemd-ask-password --
-+ * If systemd is running and systemd-ask-password --
- * is available, then use that else fallback on getpass(..)
- *
- * Returns: @input or NULL on error
-@@ -1649,7 +1649,7 @@ get_password(const char *prompt, char *input, int capacity)
- FILE *ask_pass_fp = NULL;
-
- cmd = ret = NULL;
-- if (asprintf(&cmd, "/bin/systemd-ask-password \"%s\"", prompt) >= 0) {
-+ if (asprintf(&cmd, "systemd-ask-password \"%s\"", prompt) >= 0) {
- ask_pass_fp = popen (cmd, "re");
- free (cmd);
- }
---
-1.7.0.4
-
diff --git a/net-im/empathy/empathy-3.12.12.ebuild b/net-im/empathy/empathy-3.12.12.ebuild
index da7e005c6428..d92939aa2034 100644
--- a/net-im/empathy/empathy-3.12.12.ebuild
+++ b/net-im/empathy/empathy-3.12.12.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Empathy"
LICENSE="GPL-2 CC-BY-SA-3.0 FDL-1.3 LGPL-2.1"
SLOT="0"
IUSE="debug +geoloc gnome gnome-online-accounts +map spell test +v4l"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
# False positives caused by nested configure scripts
QA_CONFIGURE_OPTIONS=".*"
diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.3-r1.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.3-r1.ebuild
index 22fb41863fe8..9344b5edf254 100644
--- a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.3-r1.ebuild
+++ b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.3-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
IUSE="debug networkmanager" # test
RDEPEND="
diff --git a/net-irc/polari/polari-3.18.1-r1.ebuild b/net-irc/polari/polari-3.18.1-r1.ebuild
index 1ecafa93dde9..476b37d2bccd 100644
--- a/net-irc/polari/polari-3.18.1-r1.ebuild
+++ b/net-irc/polari/polari-3.18.1-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Polari"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
IUSE=""
COMMON_DEPEND="
diff --git a/net-libs/farstream/farstream-0.2.8.ebuild b/net-libs/farstream/farstream-0.2.8.ebuild
index c5b84a995283..0227acf49313 100644
--- a/net-libs/farstream/farstream-0.2.8.ebuild
+++ b/net-libs/farstream/farstream-0.2.8.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/Farstream"
SRC_URI="https://freedesktop.org/software/farstream/releases/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="+introspection test upnp"
SLOT="0.2/5" # .so version
diff --git a/net-libs/gssdp/gssdp-0.14.15.ebuild b/net-libs/gssdp/gssdp-0.14.15.ebuild
index c87436fb89c5..102b9da43bcd 100644
--- a/net-libs/gssdp/gssdp-0.14.15.ebuild
+++ b/net-libs/gssdp/gssdp-0.14.15.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
LICENSE="LGPL-2"
SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="+introspection gtk"
RDEPEND="
diff --git a/net-libs/gupnp/gupnp-0.20.17.ebuild b/net-libs/gupnp/gupnp-0.20.17.ebuild
index 6c31a9637538..2c3f64f0a35e 100644
--- a/net-libs/gupnp/gupnp-0.20.17.ebuild
+++ b/net-libs/gupnp/gupnp-0.20.17.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
LICENSE="LGPL-2"
SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="connman +introspection kernel_linux networkmanager"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/net-libs/libdmapsharing/libdmapsharing-2.9.35.ebuild b/net-libs/libdmapsharing/libdmapsharing-2.9.35.ebuild
index 324d722e0b3b..00e738ffe40e 100644
--- a/net-libs/libdmapsharing/libdmapsharing-2.9.35.ebuild
+++ b/net-libs/libdmapsharing/libdmapsharing-2.9.35.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.flyn.org/projects/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="3.0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="+introspection test"
# Vala/libgee/gtk+:2 is only used when maintainer-mode is enabled
diff --git a/net-libs/libndp/libndp-1.6.ebuild b/net-libs/libndp/libndp-1.6.ebuild
index 22d35bc5ae2c..079fbc798c74 100644
--- a/net-libs/libndp/libndp-1.6.ebuild
+++ b/net-libs/libndp/libndp-1.6.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
DEPEND=""
RDEPEND=""
diff --git a/net-libs/rest/rest-0.8.0.ebuild b/net-libs/rest/rest-0.8.0.ebuild
index 0ce1f49d9e8e..8245490331b2 100644
--- a/net-libs/rest/rest-0.8.0.ebuild
+++ b/net-libs/rest/rest-0.8.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Librest"
LICENSE="LGPL-2.1"
SLOT="0.7"
IUSE="+introspection test"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
# Coverage testing should not be enabled
RDEPEND="
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
index 12a9a114e7c3..9db8762bb611 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
LICENSE="LGPL-2+ BSD"
SLOT="2" # no usable subslot
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
IUSE="aqua coverage debug +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell +webgl +X"
# bugs 372493, 416331
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild
index 54f43e185a29..edd2a8562576 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
LICENSE="LGPL-2+ BSD"
SLOT="3/25" # soname version of libwebkit2gtk-3.0
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
IUSE="aqua coverage debug +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell wayland +webgl +X"
# bugs 372493, 416331
diff --git a/net-misc/gupnp-tools/gupnp-tools-0.8.12.ebuild b/net-misc/gupnp-tools/gupnp-tools-0.8.12.ebuild
index 7aecfa984d1c..5ed4bb0fc088 100644
--- a/net-misc/gupnp-tools/gupnp-tools-0.8.12.ebuild
+++ b/net-misc/gupnp-tools/gupnp-tools-0.8.12.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
RDEPEND="
diff --git a/net-misc/rygel/rygel-0.28.3.ebuild b/net-misc/rygel/rygel-0.28.3.ebuild
index 54a4b2209581..ae0b7c75cb6c 100644
--- a/net-misc/rygel/rygel-0.28.3.ebuild
+++ b/net-misc/rygel/rygel-0.28.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="X +introspection +sqlite tracker test transcode"
# The deps for tracker? and transcode? are just the earliest available
diff --git a/net-nntp/pan/pan-0.140.ebuild b/net-nntp/pan/pan-0.140.ebuild
index 4cc36ed183d5..5cccaf38c196 100644
--- a/net-nntp/pan/pan-0.140.ebuild
+++ b/net-nntp/pan/pan-0.140.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://pan.rebelbase.com/download/releases/${PV}/source/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="dbus gnome-keyring libnotify spell ssl"
RDEPEND="
diff --git a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild
index 884fdd5b457f..fd372d497430 100644
--- a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild
+++ b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,7 +13,7 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
#IUSE="test"
IUSE=""
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.18.3.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.18.3.ebuild
index e4819fdf8013..94c2984bc6db 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.18.3.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.18.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeBluetooth"
LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
SLOT="2/13" # subslot = libgnome-bluetooth soname version
IUSE="+introspection"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
COMMON_DEPEND="
>=dev-libs/glib-2.38:2
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.18.2.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.18.2.ebuild
index 09dcadc6b90c..b54c628c0a3d 100644
--- a/sci-geosciences/geocode-glib/geocode-glib-3.18.2.ebuild
+++ b/sci-geosciences/geocode-glib/geocode-glib-3.18.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/geocode-glib"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="+introspection test"
RDEPEND="
diff --git a/sys-block/gparted/gparted-0.26.0.ebuild b/sys-block/gparted/gparted-0.26.0.ebuild
index 6c2bc82ba2eb..7ec13b0afaf1 100644
--- a/sys-block/gparted/gparted-0.26.0.ebuild
+++ b/sys-block/gparted/gparted-0.26.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2+ FDL-1.2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~x86"
IUSE="btrfs dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 xfs"
COMMON_DEPEND="
diff --git a/www-client/epiphany/epiphany-3.18.7.ebuild b/www-client/epiphany/epiphany-3.18.7.ebuild
index c2d9673ee961..b7f251919d92 100644
--- a/www-client/epiphany/epiphany-3.18.7.ebuild
+++ b/www-client/epiphany/epiphany-3.18.7.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Web"
LICENSE="GPL-2"
SLOT="0"
IUSE="nss test"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
COMMON_DEPEND="
>=app-crypt/gcr-3.5.5:=
diff --git a/x11-libs/goffice/goffice-0.10.29.ebuild b/x11-libs/goffice/goffice-0.10.29.ebuild
index 1f36ed76e803..3ca49d37b80e 100644
--- a/x11-libs/goffice/goffice-0.10.29.ebuild
+++ b/x11-libs/goffice/goffice-0.10.29.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/goffice/"
LICENSE="GPL-2"
SLOT="0.10"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
IUSE="+introspection"
# FIXME: add lasem to tree
diff --git a/x11-libs/gtk+/gtk+-2.24.30.ebuild b/x11-libs/gtk+/gtk+-2.24.30.ebuild
index 4eca68a43fd5..8126a9c82dcf 100644
--- a/x11-libs/gtk+/gtk+-2.24.30.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.30.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
xinerama? ( !aqua )
"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~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 ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
COMMON_DEPEND="
diff --git a/x11-libs/gtk+/gtk+-3.18.9.ebuild b/x11-libs/gtk+/gtk+-3.18.9.ebuild
index 5eaa7fc0c2f0..72dce97c48bb 100644
--- a/x11-libs/gtk+/gtk+-3.18.9.ebuild
+++ b/x11-libs/gtk+/gtk+-3.18.9.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
xinerama? ( X )
"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# FIXME: introspection data is built against system installation of gtk+:3
# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
diff --git a/x11-libs/vte/vte-0.42.5.ebuild b/x11-libs/vte/vte-0.42.5.ebuild
index b17827bb5d02..de344399e297 100644
--- a/x11-libs/vte/vte-0.42.5.ebuild
+++ b/x11-libs/vte/vte-0.42.5.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 ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.40:2
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.18.3.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.18.3.ebuild
index c96f62462c73..bf28564a210c 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.18.3.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.18.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/"
LICENSE="GPL-3+"
SLOT="0"
IUSE="debug +gnome-shell +nautilus vanilla"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
# FIXME: automagic dependency on gtk+[X]
RDEPEND="
diff --git a/x11-wm/muffin/muffin-2.8.5.ebuild b/x11-wm/muffin/muffin-2.8.5.ebuild
index b41f6a20fe88..1f5fdc75986d 100644
--- a/x11-wm/muffin/muffin-2.8.5.ebuild
+++ b/x11-wm/muffin/muffin-2.8.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="GPL-2+"
SLOT="0"
IUSE="+introspection test xinerama"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
COMMON_DEPEND="
>=x11-libs/pango-1.2[X,introspection?]
diff --git a/x11-wm/mutter/mutter-3.18.4.ebuild b/x11-wm/mutter/mutter-3.18.4.ebuild
index 75eb3ab81f4d..e5e66fdc67da 100644
--- a/x11-wm/mutter/mutter-3.18.4.ebuild
+++ b/x11-wm/mutter/mutter-3.18.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/mutter/"
LICENSE="GPL-2+"
SLOT="0"
IUSE="+introspection +kms test wayland"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
# libXi-1.7.4 or newer needed per:
# https://bugzilla.gnome.org/show_bug.cgi?id=738944