Merge updates from master

14 files changed, 15 insertions, 15 deletions

diff --git a/app-admin/eselect/eselect-1.4.14.ebuild b/app-admin/eselect/eselect-1.4.14.ebuild
index 61a8c2e50a68..8360ef3a15d9 100644
--- a/app-admin/eselect/eselect-1.4.14.ebuild
+++ b/app-admin/eselect/eselect-1.4.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"
 
 RDEPEND="sys-apps/sed
diff --git a/app-arch/lbzip2/lbzip2-2.5_p20181227.ebuild b/app-arch/lbzip2/lbzip2-2.5_p20181227.ebuild
index 2cd32162de5a..f6e7397fe7c2 100644
--- a/app-arch/lbzip2/lbzip2-2.5_p20181227.ebuild
+++ b/app-arch/lbzip2/lbzip2-2.5_p20181227.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug symlink"
 
 RDEPEND="symlink? ( !app-arch/pbzip2[symlink] )"
diff --git a/app-emacs/eselect-mode/eselect-mode-1.4.14.ebuild b/app-emacs/eselect-mode/eselect-mode-1.4.14.ebuild
index b342275247a8..2d8ab2ae434e 100644
--- a/app-emacs/eselect-mode/eselect-mode-1.4.14.ebuild
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.14.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${MY_P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${MY_P}/misc"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-portage/gemato/gemato-14.1.ebuild b/app-portage/gemato/gemato-14.1.ebuild
index 8c6e3937f0ac..b25839d56663 100644
--- a/app-portage/gemato/gemato-14.1.ebuild
+++ b/app-portage/gemato/gemato-14.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd"
 IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
 
 MODULE_RDEPEND="
diff --git a/dev-lang/ruby/ruby-2.4.6.ebuild b/dev-lang/ruby/ruby-2.4.6.ebuild
index 74870692e0af..5bf8c8752ca5 100644
--- a/dev-lang/ruby/ruby-2.4.6.ebuild
+++ b/dev-lang/ruby/ruby-2.4.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
 SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz"
 
 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 static-libs tk xemacs"
 
 RDEPEND="
diff --git a/dev-python/pyyaml/pyyaml-5.1.ebuild b/dev-python/pyyaml/pyyaml-5.1.ebuild
index 159b1acd28cb..b0343bb7d8e2 100644
--- a/dev-python/pyyaml/pyyaml-5.1.ebuild
+++ b/dev-python/pyyaml/pyyaml-5.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="examples libyaml"
 
 RDEPEND="libyaml? ( dev-libs/libyaml )"
diff --git a/dev-util/scons/scons-3.0.5.ebuild b/dev-util/scons/scons-3.0.5.ebuild
index ff1512a85fda..5230d5ebc37b 100644
--- a/dev-util/scons/scons-3.0.5.ebuild
+++ b/dev-util/scons/scons-3.0.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 # unresolved & unpredictable test failures
 RESTRICT="test"
diff --git a/media-gfx/argyllcms/argyllcms-2.1.1.ebuild b/media-gfx/argyllcms/argyllcms-2.1.1.ebuild
index 8e673a653b94..13a4b210e34c 100644
--- a/media-gfx/argyllcms/argyllcms-2.1.1.ebuild
+++ b/media-gfx/argyllcms/argyllcms-2.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm64 hppa ~x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/net-analyzer/netselect/netselect-0.4.ebuild b/net-analyzer/netselect/netselect-0.4.ebuild
index c46ff44b24f3..3036d512f468 100644
--- a/net-analyzer/netselect/netselect-0.4.ebuild
+++ b/net-analyzer/netselect/netselect-0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6"
 
 PATCHES=(
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
index 609d83cc93e0..3bd47736db93 100644
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sctp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( GPL-2+ LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86"
 IUSE="kernel_linux static-libs"
 
 # This is only supposed to work with Linux to begin with.
diff --git a/sci-libs/libcerf/libcerf-1.5.ebuild b/sci-libs/libcerf/libcerf-1.5.ebuild
index 30796fe4b8db..e9d718c066a8 100644
--- a/sci-libs/libcerf/libcerf-1.5.ebuild
+++ b/sci-libs/libcerf/libcerf-1.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://apps.jcns.fz-juelich.de/src/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~ppc ~ppc64 ~s390 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs test"
 
 src_configure() {
diff --git a/sys-fs/dmg2img/dmg2img-1.6.7-r1.ebuild b/sys-fs/dmg2img/dmg2img-1.6.7-r1.ebuild
index 93c306ff1a8e..95ea794b2742 100644
--- a/sys-fs/dmg2img/dmg2img-1.6.7-r1.ebuild
+++ b/sys-fs/dmg2img/dmg2img-1.6.7-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://vu1tur.eu.org/tools/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="libressl"
 
 RDEPEND="app-arch/bzip2
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild
index 0fd73d20f6c1..7701ab2f5026 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild
@@ -16,7 +16,7 @@ SLOT="3.0/3"
 IUSE="glade +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.48:2
diff --git a/x11-misc/grsync/grsync-1.2.6.ebuild b/x11-misc/grsync/grsync-1.2.6.ebuild
index 86540cbfa78e..3476502ec396 100644
--- a/x11-misc/grsync/grsync-1.2.6.ebuild
+++ b/x11-misc/grsync/grsync-1.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ DESCRIPTION="A gtk frontend to rsync"
 HOMEPAGE="http://www.opbyte.it/grsync/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE=""
 SRC_URI="http://www.opbyte.it/release/${P}.tar.gz"