summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-crypt/ccrypt/ccrypt-1.10.ebuild2
-rw-r--r--app-editors/nvi/nvi-1.81.6-r7.ebuild2
-rw-r--r--app-emulation/xen-tools/xen-tools-4.7.1-r6.ebuild4
-rw-r--r--dev-go/coveraggregator/Manifest1
-rw-r--r--dev-go/coveraggregator/coveraggregator-0_pre20170216.ebuild23
-rw-r--r--dev-go/coveraggregator/metadata.xml10
-rw-r--r--dev-lang/xsb/xsb-3.6.0.ebuild2
-rw-r--r--dev-libs/hiredis/hiredis-0.13.3.ebuild2
-rw-r--r--dev-ml/cppo/cppo-1.4.1.ebuild2
-rw-r--r--dev-ml/extlib/extlib-1.7.1.ebuild2
-rw-r--r--dev-python/gst-python/gst-python-1.10.3.ebuild2
-rw-r--r--dev-tex/hevea/hevea-2.29.ebuild2
-rw-r--r--kde-plasma/plasma-desktop/plasma-desktop-5.8.5-r2.ebuild2
-rw-r--r--media-libs/gst-plugins-bad/gst-plugins-bad-1.10.3.ebuild2
-rw-r--r--media-libs/gst-plugins-base/gst-plugins-base-1.10.3.ebuild2
-rw-r--r--media-libs/gst-plugins-good/gst-plugins-good-1.10.3.ebuild2
-rw-r--r--media-libs/gst-plugins-ugly/gst-plugins-ugly-1.10.3.ebuild2
-rw-r--r--media-libs/gst-rtsp-server/gst-rtsp-server-1.10.3.ebuild2
-rw-r--r--media-libs/gstreamer-editing-services/gstreamer-editing-services-1.10.3.ebuild2
-rw-r--r--media-libs/gstreamer/gstreamer-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-amr/gst-plugins-amr-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-dash/gst-plugins-dash-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-dts/gst-plugins-dts-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-dv/gst-plugins-dv-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-faac/gst-plugins-faac-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-faad/gst-plugins-faad-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-flac/gst-plugins-flac-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-hls/gst-plugins-hls-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-jack/gst-plugins-jack-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-lame/gst-plugins-lame-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-libav/gst-plugins-libav-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-mad/gst-plugins-mad-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-meta/gst-plugins-meta-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-neon/gst-plugins-neon-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-opus/gst-plugins-opus-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-oss/gst-plugins-oss-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-soup/gst-plugins-soup-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-speex/gst-plugins-speex-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-x264/gst-plugins-x264-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-x265/gst-plugins-x265-1.10.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.10.3.ebuild2
-rw-r--r--media-sound/moc/moc-2.5.2.ebuild2
-rw-r--r--sci-geosciences/josm/josm-10966.ebuild2
81 files changed, 113 insertions, 79 deletions
diff --git a/app-crypt/ccrypt/ccrypt-1.10.ebuild b/app-crypt/ccrypt/ccrypt-1.10.ebuild
index 209d0f173821..0e9c0c55e88a 100644
--- a/app-crypt/ccrypt/ccrypt-1.10.ebuild
+++ b/app-crypt/ccrypt/ccrypt-1.10.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://ccrypt.sourceforge.net"
SRC_URI="http://ccrypt.sourceforge.net/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
DOCS=(
diff --git a/app-editors/nvi/nvi-1.81.6-r7.ebuild b/app-editors/nvi/nvi-1.81.6-r7.ebuild
index 434f2449d10f..90fc606e44a5 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-emulation/xen-tools/xen-tools-4.7.1-r6.ebuild b/app-emulation/xen-tools/xen-tools-4.7.1-r6.ebuild
index 3ea89ad34684..c7291470ef4a 100644
--- a/app-emulation/xen-tools/xen-tools-4.7.1-r6.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.7.1-r6.ebuild
@@ -14,12 +14,12 @@ MAJOR_V="$(get_version_component_range 1-2)"
if [[ $PV == *9999 ]]; then
inherit git-r3
- KEYWORDS="amd64"
+ KEYWORDS="amd64 x86"
REPO="xen.git"
EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
S="${WORKDIR}/${REPO}"
else
- KEYWORDS="amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
UPSTREAM_VER=0
SECURITY_VER=21
# xen-tools's gentoo patches tarball
diff --git a/dev-go/coveraggregator/Manifest b/dev-go/coveraggregator/Manifest
new file mode 100644
index 000000000000..f7b4666979bb
--- /dev/null
+++ b/dev-go/coveraggregator/Manifest
@@ -0,0 +1 @@
+DIST coveraggregator-0_pre20170216.tar.gz 2394 SHA256 3381e0709ae4c4436e8b1edbf134247250b1db265702daf2815ed0ab05d467fa SHA512 07eae44813ebce3d06e103a97ae972823880d58392a9520b1ef6a1dbf44aad4ca5bf572a6eee37a69a2a2c215fbd70587d95f181bba2c0bd7f041385ce169a7a WHIRLPOOL 604fa368914d9bec9ed7d9cf6c4d8471e17a7832b08a8442ae477b901825d8eab824ddaf3bbea7328157bf12d02941667f56b5dd79e72e7653a857829dea5747
diff --git a/dev-go/coveraggregator/coveraggregator-0_pre20170216.ebuild b/dev-go/coveraggregator/coveraggregator-0_pre20170216.ebuild
new file mode 100644
index 000000000000..ddbc29fb2ba9
--- /dev/null
+++ b/dev-go/coveraggregator/coveraggregator-0_pre20170216.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+EGO_PN=github.com/chouquette/${PN}
+HOMEPAGE="https://${EGO_PN}"
+EGIT_COMMIT="af12d4d73479a1b49a16bbed8e5c182999dd62be"
+SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Cover profile aggregator for golang"
+LICENSE="WTFPL-2"
+SLOT="0"
+IUSE=""
+DEPEND="dev-go/go-tools:="
+RDEPEND=""
+
+src_install() {
+ dobin ${PN}
+ dodoc src/${EGO_PN}/README.md
+}
diff --git a/dev-go/coveraggregator/metadata.xml b/dev-go/coveraggregator/metadata.xml
new file mode 100644
index 000000000000..bf0fe7cba618
--- /dev/null
+++ b/dev-go/coveraggregator/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>zmedico@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">chouquette/coveraggregator</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-lang/xsb/xsb-3.6.0.ebuild b/dev-lang/xsb/xsb-3.6.0.ebuild
index 6573b263511f..b130162362c1 100644
--- a/dev-lang/xsb/xsb-3.6.0.ebuild
+++ b/dev-lang/xsb/xsb-3.6.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://xsb.sourceforge.net/downloads/${MY_P}.tar.gz
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="curl debug iodbc java mysql odbc pcre threads xml"
RDEPEND="curl? ( net-misc/curl )
diff --git a/dev-libs/hiredis/hiredis-0.13.3.ebuild b/dev-libs/hiredis/hiredis-0.13.3.ebuild
index e9478788079e..a64ab1a28f5d 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-ml/cppo/cppo-1.4.1.ebuild b/dev-ml/cppo/cppo-1.4.1.ebuild
index 6084171c9069..d460ede5c79a 100644
--- a/dev-ml/cppo/cppo-1.4.1.ebuild
+++ b/dev-ml/cppo/cppo-1.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mjambon/cppo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
SLOT="0/${PV}"
LICENSE="BSD"
-KEYWORDS="amd64"
+KEYWORDS="amd64 x86"
IUSE="examples"
diff --git a/dev-ml/extlib/extlib-1.7.1.ebuild b/dev-ml/extlib/extlib-1.7.1.ebuild
index 24d62866a367..4549eeed797e 100644
--- a/dev-ml/extlib/extlib-1.7.1.ebuild
+++ b/dev-ml/extlib/extlib-1.7.1.ebuild
@@ -16,7 +16,7 @@ DEPEND="
"
RDEPEND="${DEPEND}"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="doc +ocamlopt"
S="${WORKDIR}/ocaml-${P}"
diff --git a/dev-python/gst-python/gst-python-1.10.3.ebuild b/dev-python/gst-python/gst-python-1.10.3.ebuild
index 4e6f5c73db67..0d07eb7ceb0f 100644
--- a/dev-python/gst-python/gst-python-1.10.3.ebuild
+++ b/dev-python/gst-python/gst-python-1.10.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
LICENSE="LGPL-2"
SLOT="1.0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-tex/hevea/hevea-2.29.ebuild b/dev-tex/hevea/hevea-2.29.ebuild
index 23e2b7aeeaaa..6a2aabeddba2 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/kde-plasma/plasma-desktop/plasma-desktop-5.8.5-r2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.8.5-r2.ebuild
index 67cfbfcdf0a5..099562039d4a 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.8.5-r2.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.8.5-r2.ebuild
@@ -10,7 +10,7 @@ VIRTUALX_REQUIRED="test"
inherit kde5
DESCRIPTION="KDE Plasma desktop"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="+fontconfig gtk2 gtk3 +input_devices_evdev input_devices_synaptics ibus
legacy-systray packagekit pulseaudio +qt4 scim +semantic-desktop"
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.10.3.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.10.3.ebuild
index 05dc94fa2ecb..2f04693d15c0 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.10.3.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.10.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Less plugins for GStreamer"
HOMEPAGE="https://gstreamer.freedesktop.org/"
LICENSE="LGPL-2"
-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="X bzip2 egl gles2 gtk +introspection opengl +orc vcd vnc wayland"
REQUIRED_USE="
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.10.3.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.10.3.ebuild
index c0cba479a5d5..665665d511f8 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.10.3.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.10.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
HOMEPAGE="https://gstreamer.freedesktop.org/"
LICENSE="GPL-2+ LGPL-2+"
-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 ~sparc-solaris ~x64-solaris ~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 ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="alsa +introspection ivorbis +ogg +orc +pango theora +vorbis X"
REQUIRED_USE="
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.10.3.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.10.3.ebuild
index 5367c1544348..1a1823b468f7 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.10.3.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.10.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Basepack of plugins for GStreamer"
HOMEPAGE="https://gstreamer.freedesktop.org/"
LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="+orc"
RDEPEND="
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.10.3.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.10.3.ebuild
index f22c8464cd98..9728eec31390 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.10.3.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.10.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
HOMEPAGE="https://gstreamer.freedesktop.org/"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="+orc"
RDEPEND="
diff --git a/media-libs/gst-rtsp-server/gst-rtsp-server-1.10.3.ebuild b/media-libs/gst-rtsp-server/gst-rtsp-server-1.10.3.ebuild
index 466f2582ea78..d34d2538251c 100644
--- a/media-libs/gst-rtsp-server/gst-rtsp-server-1.10.3.ebuild
+++ b/media-libs/gst-rtsp-server/gst-rtsp-server-1.10.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="A GStreamer based RTSP server"
HOMEPAGE="https://people.freedesktop.org/~wtay/"
LICENSE="LGPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="examples +introspection static-libs test"
# FIXME: check should depend on USE=test but check is losy
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.10.3.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.10.3.ebuild
index 7e7589bd8fc5..db9b9e4f0a08 100644
--- a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.10.3.ebuild
+++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.10.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
LICENSE="LGPL-2+"
SLOT="1.0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+introspection"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/media-libs/gstreamer/gstreamer-1.10.3.ebuild b/media-libs/gstreamer/gstreamer-1.10.3.ebuild
index 5402422fc338..27781c68f2af 100644
--- a/media-libs/gstreamer/gstreamer-1.10.3.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.10.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
LICENSE="LGPL-2+"
SLOT="1.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 ~sparc-solaris ~x64-solaris ~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 ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+caps +introspection nls +orc test unwind"
RDEPEND="
diff --git a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.10.3.ebuild b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.10.3.ebuild
index c199493c2858..2deb7c6b7c29 100644
--- a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-ugly
inherit gstreamer
DESCRIPTION="ATSC A/52 audio decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="+orc"
RDEPEND="
diff --git a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.10.3.ebuild b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.10.3.ebuild
index f7698e7c6111..192d3389ad19 100644
--- a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.10.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="AMRNB encoder/decoder and AMRWB decoder plugin for GStreamer"
HOMEPAGE="https://gstreamer.freedesktop.org/"
LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND=">=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.10.3.ebuild b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.10.3.ebuild
index e7dff8babfbf..be1f75247e39 100644
--- a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="ASS/SSA rendering with effects support plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
IUSE=""
RDEPEND=">=media-libs/libass-0.10.2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.10.3.ebuild b/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.10.3.ebuild
index cd54ddec762c..9b486912379b 100644
--- a/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="AVDTP source/sink and A2DP sink plugin for GStreamer"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.10.3.ebuild b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.10.3.ebuild
index f5f4faa000ce..237044b66352 100644
--- a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-ugly
inherit gstreamer
DESCRIPTION="CD Audio Source (cdda) plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND=">=dev-libs/libcdio-0.90-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.10.3.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.10.3.ebuild
index d150b011b339..c4b18efb9291 100644
--- a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-base
inherit gstreamer
DESCRIPTION="CD Audio Source (cdda) plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE=""
RDEPEND=">=media-sound/cdparanoia-3.10.2-r6[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.10.3.ebuild b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.10.3.ebuild
index 980979398012..0d5cb8825caf 100644
--- a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="MPEG-DASH plugin for GStreamer"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.10.3.ebuild b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.10.3.ebuild
index 41cf3f2312fb..c98dcd9b4ee5 100644
--- a/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="DTLS encoder/decoder with SRTP support plugin for GStreamer"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="libressl"
RDEPEND="
diff --git a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.10.3.ebuild b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.10.3.ebuild
index 72f88544c091..5d30b664b0cc 100644
--- a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="DTS audio decoder plugin for Gstreamer"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd"
IUSE="+orc"
RDEPEND="
diff --git a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.10.3.ebuild b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.10.3.ebuild
index 42a060892c3f..be936ac274f6 100644
--- a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="DV demuxer and decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
IUSE=""
RDEPEND=">=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.10.3.ebuild b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.10.3.ebuild
index be4af9e02e1a..de535c238b95 100644
--- a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPION="DVB device capture plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm ~ppc ~ppc64 x86"
IUSE=""
RDEPEND=""
diff --git a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.10.3.ebuild b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.10.3.ebuild
index 4cc496a3a1a2..05c63d8124f5 100644
--- a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-ugly
inherit gstreamer
DESCRIPTION="DVD read plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND=">=media-libs/libdvdread-4.2.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.10.3.ebuild b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.10.3.ebuild
index a002396edfdb..fa2c5ce201e9 100644
--- a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="AAC audio encoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE=""
RDEPEND=">=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.10.3.ebuild b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.10.3.ebuild
index 6ffe4ab72b69..2fe6b5f4c300 100644
--- a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="AAC audio decoder plugin."
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND=">=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.10.3.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.10.3.ebuild
index c0038ccdb219..4400f35f75d1 100644
--- a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="FLAC encoder/decoder/tagger plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND=">=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.10.3.ebuild b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.10.3.ebuild
index 81f49f7572f4..ce6be22366c3 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPION="Image decoder, overlay and sink plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND=">=x11-libs/gdk-pixbuf-2.30.7:2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.10.3.ebuild b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.10.3.ebuild
index 5248f42c5952..7f9a2eed836d 100644
--- a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="HTTP live streaming plugin for GStreamer"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.10.3.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.10.3.ebuild
index 01b24fd7337c..857619f09ad7 100644
--- a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPION="JACK audio server source/sink plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
IUSE=""
RDEPEND="virtual/jack[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.10.3.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.10.3.ebuild
index dfdc75e058ee..67398aff5fe5 100644
--- a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="JPEG image encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE=""
RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.10.3.ebuild b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.10.3.ebuild
index 11b51c2f346b..be90df8a71b3 100644
--- a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-ugly
inherit gstreamer
DESCRIPTION="MP3 encoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND=">=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.10.3.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.10.3.ebuild
index 43246e71240f..602b6f1bc42a 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.10.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
LICENSE="GPL-2"
SLOT="1.0"
-KEYWORDS="amd64 ~hppa ~mips ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~hppa ~mips x86 ~amd64-fbsd ~x86-fbsd"
IUSE="libav +orc"
# XXX: bzip2/lzma are automagic
diff --git a/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.10.3.ebuild b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.10.3.ebuild
index 715ff776de5a..bf6c0dbcb14c 100644
--- a/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="H.265 decoder plugin for GStreamer"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.10.3.ebuild b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.10.3.ebuild
index ace23d13f110..0571d3463c5d 100644
--- a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="Microsoft Multi Media Server source plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
IUSE=""
RDEPEND=">=media-libs/libmms-0.6.2-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.10.3.ebuild b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.10.3.ebuild
index 637f5145f1bd..021657fd13c8 100644
--- a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="PNG image encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86"
IUSE=""
RDEPEND=">=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.10.3.ebuild b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.10.3.ebuild
index 54585892cdfe..1731d0b25330 100644
--- a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-base
inherit gstreamer
DESCRIPTION="Visualization elements for GStreamer"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
IUSE=""
RDEPEND="
diff --git a/media-plugins/gst-plugins-mad/gst-plugins-mad-1.10.3.ebuild b/media-plugins/gst-plugins-mad/gst-plugins-mad-1.10.3.ebuild
index 62c482923622..a771e67f84a6 100644
--- a/media-plugins/gst-plugins-mad/gst-plugins-mad-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-mad/gst-plugins-mad-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-ugly
inherit gstreamer
DESCRIPTION="MP3 decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.10.3.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.10.3.ebuild
index 1f388705b535..808c736295e9 100644
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.10.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gentoo.org"
LICENSE="metapackage"
SLOT="1.0"
-KEYWORDS="amd64 ~hppa ~sh ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~hppa ~sh x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264"
REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
diff --git a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.10.3.ebuild b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.10.3.ebuild
index dbd9893bd519..d92ccfaa4bea 100644
--- a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="MOD audio decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 x86"
IUSE=""
RDEPEND=">=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.10.3.ebuild b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.10.3.ebuild
index 4f45b80874ce..c329405fd425 100644
--- a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-ugly
inherit gstreamer
DESCRIPTION="MPEG2 decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=media-libs/libmpeg2-0.5.1-r2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.10.3.ebuild b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.10.3.ebuild
index 28e09f661f9b..4556917ac63e 100644
--- a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="MPEG-1/2 video encoding plugin for GStreamer"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.10.3.ebuild b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.10.3.ebuild
index 5b53be53fce7..ad6d62502897 100644
--- a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="MPEG/DVD/SVCD/VCD video/audio multiplexing plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
IUSE=""
RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.10.3.ebuild b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.10.3.ebuild
index 9f086781c003..28c332952578 100644
--- a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="HTTP client source plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86"
IUSE=""
RDEPEND=">=net-libs/neon-0.30.0[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.10.3.ebuild b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.10.3.ebuild
index 2f16118039e7..3026a503fc67 100644
--- a/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="MusicIP audio fingerprinting plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=media-libs/libofa-0.9.3-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.10.3.ebuild b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.10.3.ebuild
index dd266bf62786..88e174fd3c0c 100644
--- a/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="H.264 encoder/decoder plugin for GStreamer."
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.10.3.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.10.3.ebuild
index 5d374ff50c7d..1717536074e8 100644
--- a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-base
inherit gstreamer
DESCRIPTION="Opus audio parser plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
IUSE=""
COMMON_DEPEND=">=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.10.3.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.10.3.ebuild
index 10cf5f418b30..a414a0c22d47 100644
--- a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="OSS (Open Sound System) support plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND=""
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.10.3.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.10.3.ebuild
index de318a559599..5edfccbdb50c 100644
--- a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="PulseAudio sound server plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
IUSE=""
RDEPEND="
diff --git a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.10.3.ebuild b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.10.3.ebuild
index d0302d756719..4c02fe556cea 100644
--- a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="Fiwewire DV/HDV capture plugin for GStreamer"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE=""
RDEPEND="
diff --git a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.10.3.ebuild b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.10.3.ebuild
index a175e17218cc..7475d11ca570 100644
--- a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="DVD playback support plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
IUSE=""
RDEPEND="
diff --git a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.10.3.ebuild b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.10.3.ebuild
index 7dfd6a41adfa..3b13a87df614 100644
--- a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="RTMP source/sink plugin for GStreamer"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND=">=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.10.3.ebuild b/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.10.3.ebuild
index ff76a2687fce..821e5ba11c97 100644
--- a/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="Dirac encoder/decoder plugin for GStreamer"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND=">=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.10.3.ebuild b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.10.3.ebuild
index 0fbcb223daef..1f87f701e5ad 100644
--- a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="Icecast server sink plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86"
IUSE=""
RDEPEND=">=media-libs/libshout-2.3.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.10.3.ebuild b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.10.3.ebuild
index c29bb6357e20..4022cc8b40da 100644
--- a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-ugly
inherit gstreamer
DESCRIPTION="Sid decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
IUSE=""
RDEPEND=">=media-libs/libsidplay-1.36.59-r1:1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.10.3.ebuild b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.10.3.ebuild
index 203b0dcfb070..b13a897e1786 100644
--- a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="Smooth Streaming plugin for GStreamer"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.10.3.ebuild b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.10.3.ebuild
index 4d234636d4f4..7926e0087174 100644
--- a/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="Beats-per-minute detection and pitch controlling plugin for GStreamer"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND=">=media-libs/libsoundtouch-1.7.1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.10.3.ebuild b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.10.3.ebuild
index 52ca22e17fb6..82f90c82ec40 100644
--- a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="HTTP client source/sink plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
IUSE=""
RDEPEND=">=net-libs/libsoup-2.48:2.4[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.10.3.ebuild b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.10.3.ebuild
index 5b1633cc80ae..c60f31f737b6 100644
--- a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="Speex encoder/decoder plugin for GStreamer"
-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=""
RDEPEND=">=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.10.3.ebuild b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.10.3.ebuild
index e119eeb7d353..49d6b38a35cb 100644
--- a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="ID3v2/APEv2 tagger plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND=">=media-libs/taglib-1.9.1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.10.3.ebuild b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.10.3.ebuild
index bfadf0eaffd4..604f591bf982 100644
--- a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-ugly
inherit gstreamer
DESCRIPTION="MPEG2 encoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE=""
RDEPEND=">=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.10.3.ebuild b/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.10.3.ebuild
index 5149d0a33db2..e0e2b7542d73 100644
--- a/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="UVC compliant H264 encoding cameras plugin for GStreamer"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.10.3.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.10.3.ebuild
index 254348bb0584..46858699cb6f 100644
--- a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPION="V4L2 source/sink plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="udev"
RDEPEND="
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.10.3.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.10.3.ebuild
index 85d5834f8967..4544a5d642e4 100644
--- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.10.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="1.0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+drm egl opengl wayland +X"
REQUIRED_USE="|| ( drm opengl wayland X )"
diff --git a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.10.3.ebuild b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.10.3.ebuild
index 31a85801974b..ecb5934e64e0 100644
--- a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="AAC encoder plugin for GStreamer"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND=">=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.10.3.ebuild b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.10.3.ebuild
index b9835ab63a7f..b719bfad3718 100644
--- a/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="AMR-WB audio encoder plugin for GStreamer"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND=">=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.10.3.ebuild b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.10.3.ebuild
index 0efd2a681966..3f4712f10462 100644
--- a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="VP8/VP9 video encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
IUSE=""
# VP9 is under experimental, do not enable it now
diff --git a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.10.3.ebuild b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.10.3.ebuild
index cb96548f14fa..4ebbb1248061 100644
--- a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="Wavpack audio encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
IUSE=""
RDEPEND=">=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.10.3.ebuild b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.10.3.ebuild
index da8cad455199..3ee58ad0275e 100644
--- a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-ugly
inherit gstreamer
DESCRIPTION="H.264 encoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
IUSE=""
# 20111220 ensures us X264_BUILD >= 120
diff --git a/media-plugins/gst-plugins-x265/gst-plugins-x265-1.10.3.ebuild b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.10.3.ebuild
index 485dfae93a7d..0110c97c5cca 100644
--- a/media-plugins/gst-plugins-x265/gst-plugins-x265-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE="gst-plugins-bad"
inherit gstreamer
DESCRIPTION="H.265 encoder plugin for GStreamer"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.10.3.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.10.3.ebuild
index d1c66719ffc6..e9ed46bc6dcd 100644
--- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.10.3.ebuild
+++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.10.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="X11 video capture stream plugin for GStreamer"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE=""
RDEPEND="
diff --git a/media-sound/moc/moc-2.5.2.ebuild b/media-sound/moc/moc-2.5.2.ebuild
index a8c0d43425ff..91275c89b8e3 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/sci-geosciences/josm/josm-10966.ebuild b/sci-geosciences/josm/josm-10966.ebuild
index 0af8972c2b67..82473a27e567 100644
--- a/sci-geosciences/josm/josm-10966.ebuild
+++ b/sci-geosciences/josm/josm-10966.ebuild
@@ -26,7 +26,7 @@ SLOT="0"
# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
[[ ${PV} == "9999" ]] || \
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
DEPEND=">=virtual/jdk-1.8"
RDEPEND=">=virtual/jre-1.8"