Merge updates from master

39 files changed, 49 insertions, 53 deletions

diff --git a/app-emacs/ruby-mode/ruby-mode-2.3.0.ebuild b/app-emacs/ruby-mode/ruby-mode-2.3.0.ebuild
index 294227185d71..51c841f5ec57 100644
--- a/app-emacs/ruby-mode/ruby-mode-2.3.0.ebuild
+++ b/app-emacs/ruby-mode/ruby-mode-2.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://ruby/ruby-${PV}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 S="${WORKDIR}/ruby-${PV}/misc"
 DOCS="README"
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.32.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.1.32.ebuild
index 78890b53d45e..dd3165781272 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.32.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.1.32.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
 
 LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.32.120294.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.32.120294.ebuild
index 767415165270..c0b989d91810 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.32.120294.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.32.120294.ebuild
@@ -34,7 +34,7 @@ SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_am
 
 LICENSE="GPL-2 PUEL"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
 RESTRICT="mirror"
 
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.32.120294.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.32.120294.ebuild
index c1a50be17a27..adb086974170 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.32.120294.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.32.120294.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpac
 
 LICENSE="PUEL"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="mirror strip"
 
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.32.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.32.ebuild
index fa09607a1819..6e4ec727e56f 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.32.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.32.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X"
 
 RDEPEND="X? ( x11-apps/xrandr
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.32.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.32.ebuild
index dedd001c9bfa..065ee9010815 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.32.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.32.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="pax_kernel"
 
 RDEPEND="!=app-emulation/virtualbox-9999"
diff --git a/app-emulation/virtualbox/virtualbox-5.1.32.ebuild b/app-emulation/virtualbox/virtualbox-5.1.32.ebuild
index 68d1ed27e21b..8c962fe7c1ff 100644
--- a/app-emulation/virtualbox/virtualbox-5.1.32.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.1.32.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa debug doc headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
 
 RDEPEND="!app-emulation/virtualbox-bin
diff --git a/app-eselect/eselect-repository/eselect-repository-2.ebuild b/app-eselect/eselect-repository/eselect-repository-2.ebuild
index 54b33e1a1bd0..2037c5133900 100644
--- a/app-eselect/eselect-repository/eselect-repository-2.ebuild
+++ b/app-eselect/eselect-repository/eselect-repository-2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz -> $
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild
index e012e78a7e2e..501beaaf0318 100644
--- a/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild
+++ b/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-${PVR}.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.0.2"
diff --git a/app-portage/repoman/repoman-2.3.6.ebuild b/app-portage/repoman/repoman-2.3.6.ebuild
index af99f99a4bcc..3f19d5d83782 100644
--- a/app-portage/repoman/repoman-2.3.6.ebuild
+++ b/app-portage/repoman/repoman-2.3.6.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	S="${WORKDIR}/${P}/repoman"
 else
 	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
diff --git a/app-text/djview/djview-4.10.6-r1.ebuild b/app-text/djview/djview-4.10.6-r1.ebuild
index a4e14722f74e..9e117d213070 100644
--- a/app-text/djview/djview-4.10.6-r1.ebuild
+++ b/app-text/djview/djview-4.10.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/djvu/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ppc ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ppc ppc64 x86"
 IUSE="debug nsplugin"
 
 RDEPEND="
diff --git a/app-text/qpdf/qpdf-7.0.0.ebuild b/app-text/qpdf/qpdf-7.0.0.ebuild
index 1a93659f16ff..67e48a5ec7ca 100644
--- a/app-text/qpdf/qpdf-7.0.0.ebuild
+++ b/app-text/qpdf/qpdf-7.0.0.ebuild
@@ -12,7 +12,7 @@ LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/18"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
 IUSE="doc examples perl static-libs test"
 
 CDEPEND="
diff --git a/dev-db/pgbouncer/pgbouncer-1.8.1.ebuild b/dev-db/pgbouncer/pgbouncer-1.8.1.ebuild
index 69a361cbeaeb..419a56611be5 100644
--- a/dev-db/pgbouncer/pgbouncer-1.8.1.ebuild
+++ b/dev-db/pgbouncer/pgbouncer-1.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,7 +10,7 @@ HOMEPAGE="https://pgbouncer.github.io"
 SRC_URI="https://pgbouncer.github.io/downloads/files/${PV}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+c-ares debug doc pam ssl -udns"
 
 # At-most-one-of, one can be enabled but not both
diff --git a/dev-db/pspg/pspg-0.8.0.ebuild b/dev-db/pspg/pspg-0.8.0.ebuild
index 41c42740c924..d9846d4a7335 100644
--- a/dev-db/pspg/pspg-0.8.0.ebuild
+++ b/dev-db/pspg/pspg-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="sys-libs/ncurses:*"
diff --git a/dev-db/psqlodbc/psqlodbc-10.00.0000.ebuild b/dev-db/psqlodbc/psqlodbc-10.00.0000.ebuild
index f85303f96164..2f5a480ab1fb 100644
--- a/dev-db/psqlodbc/psqlodbc-10.00.0000.ebuild
+++ b/dev-db/psqlodbc/psqlodbc-10.00.0000.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.postgresql.org/"
 SRC_URI="mirror://postgresql/odbc/versions/src/${P}.tar.gz"
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc iodbc ssl threads"
 
 DEPEND="dev-db/postgresql:*[ssl?]
diff --git a/dev-lang/ruby/ruby-2.3.6.ebuild b/dev-lang/ruby/ruby-2.3.6.ebuild
index 84da980b2084..eeae9710cba1 100644
--- a/dev-lang/ruby/ruby-2.3.6.ebuild
+++ b/dev-lang/ruby/ruby-2.3.6.ebuild
@@ -30,7 +30,7 @@ SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz
 		 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
 
 RDEPEND="
diff --git a/dev-libs/libical/libical-2.0.0-r3.ebuild b/dev-libs/libical/libical-2.0.0-r3.ebuild
index da3b08aa3c72..cf29f803fd10 100644
--- a/dev-libs/libical/libical-2.0.0-r3.ebuild
+++ b/dev-libs/libical/libical-2.0.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( MPL-1.0 LGPL-2.1 )"
 SLOT="0/2"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc examples static-libs"
 
 # The GOBJECT_INTROSPECTION build is broken, and upstream has given up
diff --git a/dev-libs/libpipeline/libpipeline-1.4.2.ebuild b/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
index 768ef83c240f..4763b1ffedb0 100644
--- a/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs test"
 
 DEPEND="virtual/pkgconfig
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.0.2.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.0.2.ebuild
index 09bc4c5f7cee..8c69c49116ff 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.0.2.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.0.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/yuki24/did_you_mean"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/net-telnet/net-telnet-0.1.1-r1.ebuild b/dev-ruby/net-telnet/net-telnet-0.1.1-r1.ebuild
index 4af31427d5c4..0fb7732e8237 100644
--- a/dev-ruby/net-telnet/net-telnet-0.1.1-r1.ebuild
+++ b/dev-ruby/net-telnet/net-telnet-0.1.1-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/ruby/net-telnet/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/racc/racc-1.4.14.ebuild b/dev-ruby/racc/racc-1.4.14.ebuild
index a3b38186497a..b704fdeb1495 100644
--- a/dev-ruby/racc/racc-1.4.14.ebuild
+++ b/dev-ruby/racc/racc-1.4.14.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/tenderlove/racc"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_bdepend "dev-ruby/rake
diff --git a/dev-ruby/rdoc/rdoc-4.3.0.ebuild b/dev-ruby/rdoc/rdoc-4.3.0.ebuild
index 23748ae36d77..63012b59ec6d 100644
--- a/dev-ruby/rdoc/rdoc-4.3.0.ebuild
+++ b/dev-ruby/rdoc/rdoc-4.3.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/rdoc/rdoc/"
 
 LICENSE="Ruby MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/yard/yard-0.9.11.ebuild b/dev-ruby/yard/yard-0.9.11.ebuild
index 313157ab8cd6..37f1408ab94c 100644
--- a/dev-ruby/yard/yard-0.9.11.ebuild
+++ b/dev-ruby/yard/yard-0.9.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )"
diff --git a/media-gfx/inkscape/inkscape-0.92.2.ebuild b/media-gfx/inkscape/inkscape-0.92.2.ebuild
index b64b94f2b343..5aee47f5f692 100644
--- a/media-gfx/inkscape/inkscape-0.92.2.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.2.ebuild
@@ -16,7 +16,7 @@ https://dev.gentoo.org/~jstein/dist/inkscape-0.92.1-poppler.patch"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg"
 
diff --git a/media-gfx/scour/scour-0.36.ebuild b/media-gfx/scour/scour-0.36.ebuild
index a70ee93ef476..2bf29d55e2ca 100644
--- a/media-gfx/scour/scour-0.36.ebuild
+++ b/media-gfx/scour/scour-0.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/scour-project/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/media-libs/openal/openal-1.18.2-r1.ebuild b/media-libs/openal/openal-1.18.2-r1.ebuild
index fa00593534f4..4ec48c899f8a 100644
--- a/media-libs/openal/openal-1.18.2-r1.ebuild
+++ b/media-libs/openal/openal-1.18.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://kcat.strangesoft.net/openal-releases/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="
 	alsa coreaudio debug jack oss portaudio pulseaudio qt5
 	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild
index 0ec5707e0aa6..0a8509a3a0bd 100644
--- a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="http://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_bin_${BIN_PV}.
 LICENSE="GPL-2
 	texturemate? ( CC-BY-3.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libav openclipart texturemate"
 
 RDEPEND="
diff --git a/net-misc/nx/nx-3.5.0.33.ebuild b/net-misc/nx/nx-3.5.0.33.ebuild
index 7a8bdd99cf2a..167512cc9773 100644
--- a/net-misc/nx/nx-3.5.0.33.ebuild
+++ b/net-misc/nx/nx-3.5.0.33.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://code.x2go.org/releases/source/nx-libs/nx-libs-${PV}-full.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="elibc_glibc"
 
 RDEPEND="media-libs/freetype:2
diff --git a/net-misc/whois/whois-5.2.20.ebuild b/net-misc/whois/whois-5.2.20.ebuild
index b9d8673f4dc0..0e5fcb064c5e 100644
--- a/net-misc/whois/whois-5.2.20.ebuild
+++ b/net-misc/whois/whois-5.2.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="iconv idn nls"
 RESTRICT="test" #59327
 
diff --git a/net-misc/x2goclient/x2goclient-4.1.1.0.ebuild b/net-misc/x2goclient/x2goclient-4.1.1.0.ebuild
index 53df37c70e2c..e335afabf01c 100644
--- a/net-misc/x2goclient/x2goclient-4.1.1.0.ebuild
+++ b/net-misc/x2goclient/x2goclient-4.1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="ldap"
 
 COMMON_DEPEND="dev-qt/qtcore:5
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.22.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.22.ebuild
index d64c4f2f058c..356aff263d23 100644
--- a/net-misc/x2goserver/x2goserver-4.0.1.22.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.0.1.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+fuse postgres +sqlite"
 
 REQUIRED_USE="|| ( postgres sqlite )"
diff --git a/net-print/cups-filters/cups-filters-1.17.9.ebuild b/net-print/cups-filters/cups-filters-1.17.9.ebuild
index a839fdb4414f..993ffa3ca29a 100644
--- a/net-print/cups-filters/cups-filters-1.17.9.ebuild
+++ b/net-print/cups-filters/cups-filters-1.17.9.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
 else
 	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~m68k-mint"
 fi
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index 6639125e6f26..118c3436da94 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -4,10 +4,6 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
-# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
-# Temporary mask to support stable bug 639476
-ruby_targets_ruby23
-
 # Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
 # Not yet stable.
 elogind
diff --git a/sci-calculators/speedcrunch/speedcrunch-0.12.0.ebuild b/sci-calculators/speedcrunch/speedcrunch-0.12.0.ebuild
index 0174aa0d6936..da111d97a3b6 100644
--- a/sci-calculators/speedcrunch/speedcrunch-0.12.0.ebuild
+++ b/sci-calculators/speedcrunch/speedcrunch-0.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="https://bitbucket.org/heldercorreia/${PN}/get/release-${PV}.tar.gz -> $
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc ${PLOCALES[@]/#/l10n_}"
 
 DEPEND="
diff --git a/sys-apps/kbd/kbd-2.0.4.ebuild b/sys-apps/kbd/kbd-2.0.4.ebuild
index d1af17e39a9e..2e18b81b94ff 100644
--- a/sys-apps/kbd/kbd-2.0.4.ebuild
+++ b/sys-apps/kbd/kbd-2.0.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
-	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"
 fi
 
 inherit eutils ${SCM}
diff --git a/sys-fs/encfs/encfs-1.9.2.ebuild b/sys-fs/encfs/encfs-1.9.2.ebuild
index 01426e04c93a..b2180d316cd9 100644
--- a/sys-fs/encfs/encfs-1.9.2.ebuild
+++ b/sys-fs/encfs/encfs-1.9.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vgough/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~x86"
 IUSE="libressl nls"
 
 RDEPEND="
diff --git a/sys-fs/udev/udev-236.ebuild b/sys-fs/udev/udev-236.ebuild
index ec6201a5a68d..0f1b95717f94 100644
--- a/sys-fs/udev/udev-236.ebuild
+++ b/sys-fs/udev/udev-236.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
-	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"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.32.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.32.ebuild
index be6e395ae7c5..451c6f821b90 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.32.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.32.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dri"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/x11-misc/screengrab/screengrab-1.97.ebuild b/x11-misc/screengrab/screengrab-1.97.ebuild
index e2d42076a371..6e9bf5da14d2 100644
--- a/x11-misc/screengrab/screengrab-1.97.ebuild
+++ b/x11-misc/screengrab/screengrab-1.97.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/QtDesktop/screengrab/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="