Merge updates from master

30 files changed, 104 insertions, 28 deletions

diff --git a/app-admin/dxf/Manifest b/app-admin/dxf/Manifest
index c57d5d4282f5..fc684bf8eca0 100644
--- a/app-admin/dxf/Manifest
+++ b/app-admin/dxf/Manifest
@@ -1 +1,2 @@
 DIST dxf-7.3.0.tar.gz 298408 BLAKE2B a8ba078d1bea8fed58df35562af678f902513f4da18123a3eabb52a707b7973358a7690d309b3b7d86fadc4086856580792177525b4e7e217da4542249e83663 SHA512 2bb16a41990f572c3352f708438e67550cc089c078296c765fcffec4ada60f40f097bfcdf4def3c57a0e6c1db31d2ab9020407b2c165509f132e51cc93af8205
+DIST dxf-7.4.0.tar.gz 300099 BLAKE2B a3d17709efed3af5be82b1bf4ebd4201101e92867f714355467d72b84d560cddcf13a9ad2b4b71553decfc664f29c7ee13f74d551092d8a3a25dc48eea9a4214 SHA512 7aaa5827c6f02bb22b4d2dae9e24aa921ecebe72fe8278d3fc84f48448c1f903c0b70c22873d2772f3da5367ecc45770b8719c4d1aa95cac146a392bd9a923d2
diff --git a/app-admin/dxf/dxf-7.4.0.ebuild b/app-admin/dxf/dxf-7.4.0.ebuild
new file mode 100644
index 000000000000..f6e0099fdfe3
--- /dev/null
+++ b/app-admin/dxf/dxf-7.4.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Docker registry v2 client in Python"
+HOMEPAGE="https://github.com/davedoesdev/dxf"
+SRC_URI="https://github.com/davedoesdev/dxf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-python/jwcrypto-0.4.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.4[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/tqdm-4.19.4[${PYTHON_USEDEP}]
+	>=dev-python/www-authenticate-0.9.2[${PYTHON_USEDEP}]"
+
+RESTRICT="test"
+# Require dockerd running
+
+python_test() {
+	emake test
+}
diff --git a/app-text/texlive-core/texlive-core-2017-r4.ebuild b/app-text/texlive-core/texlive-core-2017-r4.ebuild
index 91c57eca22d6..30f93b013f8f 100644
--- a/app-text/texlive-core/texlive-core-2017-r4.ebuild
+++ b/app-text/texlive-core/texlive-core-2017-r4.ebuild
@@ -76,7 +76,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
 done
 SRC_URI="${SRC_URI} )"
 
-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="cjk X doc source tk +luajittex xetex"
 
 TEXMF_PATH=/usr/share/texmf-dist
diff --git a/dev-perl/Geo-IP/Geo-IP-1.510.0.ebuild b/dev-perl/Geo-IP/Geo-IP-1.510.0.ebuild
index 4a2a898535e7..cb5892a60243 100644
--- a/dev-perl/Geo-IP/Geo-IP-1.510.0.ebuild
+++ b/dev-perl/Geo-IP/Geo-IP-1.510.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module multilib
 DESCRIPTION="Look up country by IP Address"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="dev-libs/geoip"
diff --git a/dev-perl/Net-Patricia/Net-Patricia-1.220.0-r1.ebuild b/dev-perl/Net-Patricia/Net-Patricia-1.220.0-r1.ebuild
index 019ea5f32b6c..023c481e5f6e 100644
--- a/dev-perl/Net-Patricia/Net-Patricia-1.220.0-r1.ebuild
+++ b/dev-perl/Net-Patricia/Net-Patricia-1.220.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Patricia Trie perl module for fast IP address lookups"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd"
 IUSE="ipv6"
 
 RDEPEND="dev-perl/Net-CIDR-Lite
diff --git a/dev-perl/Readonly/Readonly-2.50.0.ebuild b/dev-perl/Readonly/Readonly-2.50.0.ebuild
index 156fbc00b460..bf7a81ce7d06 100644
--- a/dev-perl/Readonly/Readonly-2.50.0.ebuild
+++ b/dev-perl/Readonly/Readonly-2.50.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Facility for creating read-only scalars, arrays, hashes"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-perl/Role-Tiny/Role-Tiny-2.0.6.ebuild b/dev-perl/Role-Tiny/Role-Tiny-2.0.6.ebuild
index 50a43d5a3430..2c2b66b9df51 100644
--- a/dev-perl/Role-Tiny/Role-Tiny-2.0.6.ebuild
+++ b/dev-perl/Role-Tiny/Role-Tiny-2.0.6.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Roles. Like a nouvelle cuisine portion size slice of Moose"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/SGMLSpm/SGMLSpm-1.1-r1.ebuild b/dev-perl/SGMLSpm/SGMLSpm-1.1-r1.ebuild
index af8b1b1b0c47..cdbd86ea6f6a 100644
--- a/dev-perl/SGMLSpm/SGMLSpm-1.1-r1.ebuild
+++ b/dev-perl/SGMLSpm/SGMLSpm-1.1-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="Perl library for parsing the output of nsgmls"
 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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-perl/Module-Build"
diff --git a/dev-perl/Socket6/Socket6-0.280.0.ebuild b/dev-perl/Socket6/Socket6-0.280.0.ebuild
index ec23d41c728c..475f5b3eea93 100644
--- a/dev-perl/Socket6/Socket6-0.280.0.ebuild
+++ b/dev-perl/Socket6/Socket6-0.280.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="IPv6 related part of the C socket.h defines and structure manipulat
 
 LICENSE="BSD"
 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 ~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 ~x86-solaris"
 IUSE=""
 
 src_unpack() {
diff --git a/dev-perl/String-CRC32/String-CRC32-1.600.0.ebuild b/dev-perl/String-CRC32/String-CRC32-1.600.0.ebuild
index 1c7a023e0d54..75f689f70355 100644
--- a/dev-perl/String-CRC32/String-CRC32-1.600.0.ebuild
+++ b/dev-perl/String-CRC32/String-CRC32-1.600.0.ebuild
@@ -11,5 +11,5 @@ DESCRIPTION="Perl interface for cyclic redundancy check generation"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
diff --git a/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.13.ebuild b/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.13.ebuild
index bad455bcff9e..cc28948438a5 100644
--- a/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.13.ebuild
+++ b/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.13.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Only use Sub::Exporter if you need it"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Sub-Quote/Sub-Quote-2.4.0.ebuild b/dev-perl/Sub-Quote/Sub-Quote-2.4.0.ebuild
index 4f625eab885f..e8684d9d5f76 100644
--- a/dev-perl/Sub-Quote/Sub-Quote-2.4.0.ebuild
+++ b/dev-perl/Sub-Quote/Sub-Quote-2.4.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Efficient generation of subroutines via string eval"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="test minimal"
 
 RDEPEND="
diff --git a/dev-perl/Sys-CPU/Sys-CPU-0.610.0-r1.ebuild b/dev-perl/Sys-CPU/Sys-CPU-0.610.0-r1.ebuild
index c1b6db52faf2..86bbd2a309ad 100644
--- a/dev-perl/Sys-CPU/Sys-CPU-0.610.0-r1.ebuild
+++ b/dev-perl/Sys-CPU/Sys-CPU-0.610.0-r1.ebuild
@@ -10,5 +10,5 @@ inherit perl-module
 DESCRIPTION="Access CPU info. number, etc on Win and UNIX"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~ppc-macos"
 IUSE=""
diff --git a/dev-perl/Sys-Hostname-Long/Sys-Hostname-Long-1.500.0-r1.ebuild b/dev-perl/Sys-Hostname-Long/Sys-Hostname-Long-1.500.0-r1.ebuild
index ac5500db715b..8760355fa8e7 100644
--- a/dev-perl/Sys-Hostname-Long/Sys-Hostname-Long-1.500.0-r1.ebuild
+++ b/dev-perl/Sys-Hostname-Long/Sys-Hostname-Long-1.500.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Try every conceivable way to get full hostname"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 src_install() {
diff --git a/dev-perl/Sys-MemInfo/Sys-MemInfo-0.990.0.ebuild b/dev-perl/Sys-MemInfo/Sys-MemInfo-0.990.0.ebuild
index 0e34fe81561f..f6e12b2536a2 100644
--- a/dev-perl/Sys-MemInfo/Sys-MemInfo-0.990.0.ebuild
+++ b/dev-perl/Sys-MemInfo/Sys-MemInfo-0.990.0.ebuild
@@ -11,5 +11,5 @@ DESCRIPTION="Memory informations"
 
 LICENSE="LGPL-2.1 ${LICENSE}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE=""
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-5.1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-5.1.ebuild
index 11b189d6c24d..637bf4e49f09 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-5.1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sparc x86 ~amd64-fbsd"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/simplejson/simplejson-3.13.2.ebuild b/dev-python/simplejson/simplejson-3.13.2.ebuild
index bae56fbc5a52..964d4d7e6517 100644
--- a/dev-python/simplejson/simplejson-3.13.2.ebuild
+++ b/dev-python/simplejson/simplejson-3.13.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT AFL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/simplejson/simplejson-3.15.0.ebuild b/dev-python/simplejson/simplejson-3.15.0.ebuild
index df7af5af1964..9004215f6c28 100644
--- a/dev-python/simplejson/simplejson-3.15.0.ebuild
+++ b/dev-python/simplejson/simplejson-3.15.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-ruby/instantiator/instantiator-0.0.7.ebuild b/dev-ruby/instantiator/instantiator-0.0.7.ebuild
index e9b004c8f8fb..113b508844ab 100644
--- a/dev-ruby/instantiator/instantiator-0.0.7.ebuild
+++ b/dev-ruby/instantiator/instantiator-0.0.7.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/floehopper/introspection"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/blankslate:*"
diff --git a/dev-ruby/introspection/introspection-0.0.4.ebuild b/dev-ruby/introspection/introspection-0.0.4.ebuild
index 02cedee13c23..3cf0c087661b 100644
--- a/dev-ruby/introspection/introspection-0.0.4.ebuild
+++ b/dev-ruby/introspection/introspection-0.0.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://jamesmead.org/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/metaclass-0.0.1"
diff --git a/dev-ruby/mocha/mocha-1.4.0.ebuild b/dev-ruby/mocha/mocha-1.4.0.ebuild
index e34a7ae12d24..81512470babd 100644
--- a/dev-ruby/mocha/mocha-1.4.0.ebuild
+++ b/dev-ruby/mocha/mocha-1.4.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://gofreerange.com/mocha/docs/"
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/pg/pg-0.21.0.ebuild b/dev-ruby/pg/pg-0.21.0.ebuild
index 0121b1f24c8d..bfe07cb527f7 100644
--- a/dev-ruby/pg/pg-0.21.0.ebuild
+++ b/dev-ruby/pg/pg-0.21.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://bitbucket.org/ged/ruby-pg/"
 
 LICENSE="|| ( GPL-2 Ruby )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 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 ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND+=" dev-db/postgresql:*"
diff --git a/dev-ruby/sqlite3/sqlite3-1.3.13.ebuild b/dev-ruby/sqlite3/sqlite3-1.3.13.ebuild
index 1b27145c446e..0d0730790f93 100644
--- a/dev-ruby/sqlite3/sqlite3-1.3.13.ebuild
+++ b/dev-ruby/sqlite3/sqlite3-1.3.13.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="An extension library to access a SQLite database from Ruby"
 HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
 LICENSE="BSD"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
index 58874eba2a3e..3ac6a4523aba 100644
--- a/dev-util/goland/Manifest
+++ b/dev-util/goland/Manifest
@@ -1,3 +1,4 @@
 DIST goland-2018.1.3.tar.gz 221579069 BLAKE2B 16ead14bc3401fe7b031576eb9581613cac1352b42933acc83af77946376017b6658fb04b556b028a6f89f86a65b60290e1f6f9b5febe2dc10c85b5c6004879f SHA512 24f1c384139276301a27a9df1056560f3ee89ef9817690c00626eb0522fed8a58ded3bd3632aeac8f25855dd2c031c40f937761625f6545504eb2f3e7d0d509b
 DIST goland-2018.1.4.tar.gz 217585781 BLAKE2B f4bdd554003b2397911cb767ffba558fcf06ab9cfd20c0017579cf82c6af93681e16c23db82c3cf0b47c4bb6a2c37c564be5ee9d6400cf91cb3a0938309166d5 SHA512 972c15d6636728e214b355ce4ce7174d08e0e842c6ca4e4385fbc4330930a2fae3a964b1b3753c38fe77ac2b8073fd7366fd0085d00fcf05b832c985d6243325
 DIST goland-2018.1.5.tar.gz 217591227 BLAKE2B 7a45497f8706c77bb8e729b1e6affc88e1b9230a396738bad235d55bb40ed5a728bc674d210b04eedcc4b144f60ac91f6216ed010940257227cefcb167b81aaf SHA512 cf861bed38f0678f9734632d988c37cc1bd5c596fb23dfd3f9d60642f82c5f356809de116a138888638ebd7f464201d0ea780e694f9f5c5c66d3245a2b15f484
+DIST goland-2018.2.tar.gz 236750402 BLAKE2B 54df8b09f4ae59323c4b8aa06d41a23753399d36fbdf34a0ecbb159d00fb5a6cf29fd4aeeaee9d853b54d2ceaa8f99ad5560128b4e50b4ad2720a2db81df7dc3 SHA512 f1c7ddb94bb918b9668d444e285f4ff82b45c9aa1e24e848f32bc219b2dd48a939d52f6c5c749fc76bfdd3f58e2f2a72ca2275a9291a7a5a5a3c6a30c4780420
diff --git a/dev-util/goland/goland-2018.2.ebuild b/dev-util/goland/goland-2018.2.ebuild
new file mode 100644
index 000000000000..d46b730ae466
--- /dev/null
+++ b/dev-util/goland/goland-2018.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+SLOT=0
+
+SRC_URI="http://download.jetbrains.com/go/${P}.tar.gz"
+DESCRIPTION="Golang IDE by JetBrains"
+HOMEPAGE="http://www.jetbrains.com/go"
+
+KEYWORDS="~amd64"
+LICENSE="IDEA
+	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
+
+QA_PREBUILT="opt/${P}/*"
+
+S=${WORKDIR}/GoLand-${PV}
+
+RDEPEND="dev-lang/go"
+
+src_prepare() {
+	default
+	if ! use arm; then
+		rm -rf bin/fsnotifier-arm || die
+	fi
+}
+
+src_install() {
+	local dir="/opt/${P}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{${PN}.sh,fsnotifier{,64}}
+
+	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
+	newicon "bin/${PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "gogland" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
diff --git a/media-libs/sdl-pango/sdl-pango-0.1.2-r1.ebuild b/media-libs/sdl-pango/sdl-pango-0.1.2-r1.ebuild
index 676c024261df..9cbf1d95e009 100644
--- a/media-libs/sdl-pango/sdl-pango-0.1.2-r1.ebuild
+++ b/media-libs/sdl-pango/sdl-pango-0.1.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sdlpango/SDL_Pango-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~ppc sparc x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc sparc x86"
 IUSE="static-libs"
 
 RDEPEND="x11-libs/pango
diff --git a/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild b/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild
index 8cdb7daeefda..760c88ca1214 100644
--- a/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
 LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 
 # +alsa-plugin as discussed in bug #519530
 IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
index 4f1dfbf19fae..9b92deb1bff7 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 
diff --git a/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild b/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild
index 09c50099a4ef..8538a223d36c 100644
--- a/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mcabber/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ~ppc ppc64 sparc x86 ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~ppc-macos"
 
 IUSE="asyncns ssl openssl static-libs test"
 
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
index 8b38831cc276..90affa089f3c 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="X debug +introspection jpeg jpeg2k tiff test"
 
 # Remove SRC_URI when gnome bug #795069 is fixed