Merge updates from master

13 files changed, 16 insertions, 16 deletions

diff --git a/dev-db/pgadmin4/pgadmin4-4.5.ebuild b/dev-db/pgadmin4/pgadmin4-4.5.ebuild
index 31cf045d0bf6..3f48da3553ff 100644
--- a/dev-db/pgadmin4/pgadmin4-4.5.ebuild
+++ b/dev-db/pgadmin4/pgadmin4-4.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.pgadmin.org/"
 SRC_URI="mirror://postgresql/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
 
 LICENSE="POSTGRESQL"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.12.0-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.12.0-r1.ebuild
index c5065d63effb..f9e6e4e604e1 100644
--- a/dev-java/icedtea-bin/icedtea-bin-3.12.0-r1.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-3.12.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 # Don't block arm. See bug #600134.
 #MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
-KEYWORDS="-* ~amd64 ~arm  ~arm64 ~ppc64 ~x86"
+KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 inherit java-vm-2 multilib-build toolchain-funcs
 
diff --git a/dev-python/sshtunnel/sshtunnel-0.1.4-r2.ebuild b/dev-python/sshtunnel/sshtunnel-0.1.4-r2.ebuild
index a4575517e241..35fbce53ebc4 100644
--- a/dev-python/sshtunnel/sshtunnel-0.1.4-r2.ebuild
+++ b/dev-python/sshtunnel/sshtunnel-0.1.4-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Pure python SSH tunnels"
 HOMEPAGE="https://pypi.python.org/pypi/sshtunnel"
 SRC_URI="mirror://pypi/s/sshtunnel/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/dev-vcs/fossil/fossil-2.8.ebuild b/dev-vcs/fossil/fossil-2.8.ebuild
index 3f37e14e3a8b..128b8e80210a 100644
--- a/dev-vcs/fossil/fossil-2.8.ebuild
+++ b/dev-vcs/fossil/fossil-2.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.fossil-scm.org/index.html/uv/fossil-src-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="debug fusefs json -legacy-mv-rm -miniz system-sqlite +ssl static
 	  tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks"
 
diff --git a/media-fonts/fontawesome/fontawesome-5.1.0.ebuild b/media-fonts/fontawesome/fontawesome-5.1.0.ebuild
index 100a4721304d..e37b4cd67c34 100644
--- a/media-fonts/fontawesome/fontawesome-5.1.0.ebuild
+++ b/media-fonts/fontawesome/fontawesome-5.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/FortAwesome/${MY_PN}/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="CC-BY-3.0 OFL-1.1"
 SLOT="0/5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="+otf +ttf"
 
 REQUIRED_USE="|| ( otf ttf )"
diff --git a/net-analyzer/mrtg/mrtg-2.17.7.ebuild b/net-analyzer/mrtg/mrtg-2.17.7.ebuild
index 926ed585809a..7d169831c6c4 100644
--- a/net-analyzer/mrtg/mrtg-2.17.7.ebuild
+++ b/net-analyzer/mrtg/mrtg-2.17.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="selinux"
 
 DEPEND="
diff --git a/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild b/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild
index eeba60bf8e9d..c82a66d4e62c 100644
--- a/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild
+++ b/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~gyakovlev/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="
diff --git a/sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild b/sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild
index 7d27db3cc7ae..28725920c261 100644
--- a/sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild
+++ b/sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
 LICENSE="GPL-3 LGPL-2.1"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE="pam pskc test"
 
 RDEPEND="
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 2aaa143e9df7..5523b2cfa62b 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -2,4 +2,4 @@ DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 1bd62b186564e0b902480d66f623074f8d2
 DIST cryptsetup-2.0.5.tar.xz 10476304 BLAKE2B cf1e335fce48a7bf835b2008dfc0a96ef35d344e2c9f6a0a5a2ff45644f9015311e99b8f9e05b0b23cad69d74f91dd1b7cdd766560fb6504e7453d6e46bea186 SHA512 bac3f5fde1be02d325c097f85e77aef44ce764c1bca7f0554cedd69b9444e5a5529f11b9ae74d36dc1977e88e11422a58dfa17e48559eac7f5e6c4ce332409ae
 DIST cryptsetup-2.0.6.tar.xz 10621424 BLAKE2B ecda2cb3c0a8a46b69519ab9ea9a1ece44fb21602cbce0751e52a16e5e493c7772fdc62c1151b95a783a847d9afd5a64f64bcac6673acba4bb90a417047c93cb SHA512 1fdb9068fe2b5825cef65323a9b788b5e043c1000e614e47e2b21ab3969e416653580aba639755ba936718ad612b986768029df5e07f3fa191db2bf29d2501ef
 DIST cryptsetup-2.1.0.tar.xz 10662576 BLAKE2B c79b24c986d5925aed31eddf8f271c3d0f12c89b3f99f953cfa39fe0d9dca2ab3dd2f6ea22141aca0148d6d533d197378b011561075ca26a14ca2e90500a1689 SHA512 f1b68e4d9d0ca2361fe9bdd51c60630dd4ab7a689b7be7756edf4dee12929d2356dd0658c9b940ffe27c033ef289efaf49daf21d250d37fdfa15394b5d821928
-DIST cryptsetup-2.2.0-rc0.tar.xz 10710468 BLAKE2B a65da89995c548af6de116b300dfde120f84e5e08e037f9b7d0b34d024ce4d1f1ab7599cedd45975a100fca90967ccc9a085023e2d453951816ce51cad0ca8e7 SHA512 ef168ee8757b7f9f6e7ffd5c310f2699ad4461c9886583b9a610f06c67996d688db060913c053da2f1f17090caaa07425ea735b7fcae50b2e1f32aa62f48e1a1
+DIST cryptsetup-2.2.0-rc1.tar.xz 10720888 BLAKE2B 6a8ee7d3ffa8d536627ba1be19e013ecfcdab793492ec59db676f0d017450be6cad8686337a7e341dac69ffd5f8f686e1262ff5b6e4b54f18d9c2e1e816b171b SHA512 a9875d3e20a99377ed3065ac9a4079968766b7774b2ea67226591f992932168278752dc762ef9843077e75da004f58e362327deb0981efbb0ce0928216aea2da
diff --git a/sys-fs/cryptsetup/cryptsetup-2.2.0_rc0.ebuild b/sys-fs/cryptsetup/cryptsetup-2.2.0_rc1.ebuild
index e0142bdc5218..e0142bdc5218 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.2.0_rc0.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.2.0_rc1.ebuild
diff --git a/sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild b/sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild
index 195bc8335867..76ec7392c686 100644
--- a/sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild
+++ b/sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 
 S=${WORKDIR}/${P/_p*}.orig
 PATCHES=(
diff --git a/sys-process/numad/numad-0.5-r3.ebuild b/sys-process/numad/numad-0.5-r3.ebuild
index 9c3e8ee12be6..c399de77cbd5 100644
--- a/sys-process/numad/numad-0.5-r3.ebuild
+++ b/sys-process/numad/numad-0.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]]; then
 else
 	EGIT_COMMIT="334278ff3d774d105939743436d7378a189e8693"
 	SRC_URI="mirror://gentoo/numad-0.5-${EGIT_COMMIT:0:7}.tar.bz2"
-	KEYWORDS="~amd64 -arm ~arm64 -s390 ~x86"
+	KEYWORDS="amd64 -arm ~arm64 -s390 ~x86"
 	S="${WORKDIR}/${PN}-${EGIT_COMMIT:0:7}"
 fi
 
diff --git a/x11-apps/luit/luit-20190106.ebuild b/x11-apps/luit/luit-20190106.ebuild
index fa9a58b97cc3..1f3a79ef2569 100644
--- a/x11-apps/luit/luit-20190106.ebuild
+++ b/x11-apps/luit/luit-20190106.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://invisible-mirror.net/archives/${PN}/${P}.tgz"
 
 LICENSE="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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-libs/zlib