Merge updates from master

14 files changed, 16 insertions, 14 deletions

diff --git a/app-emacs/eselect-mode/eselect-mode-1.4.13.ebuild b/app-emacs/eselect-mode/eselect-mode-1.4.13.ebuild
index 587f945b7dc5..a3aba22f3b0f 100644
--- a/app-emacs/eselect-mode/eselect-mode-1.4.13.ebuild
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.13.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-text/poppler/poppler-0.74.0.ebuild b/app-text/poppler/poppler-0.74.0.ebuild
index 424168d36c47..e6ba99606608 100644
--- a/app-text/poppler/poppler-0.74.0.ebuild
+++ b/app-text/poppler/poppler-0.74.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	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"
 	SLOT="0/85"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.3.ebuild b/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.3.ebuild
index ff17017fa632..aba631cd0395 100644
--- a/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.3.ebuild
+++ b/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.3.ebuild
@@ -7,6 +7,6 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: BrainFuck source file syntax highlighting"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=716"
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~mips ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~mips ppc ppc64 x86"
 
 VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for BrainFuck source files."
diff --git a/dev-libs/libxml2/libxml2-2.9.9.ebuild b/dev-libs/libxml2/libxml2-2.9.9.ebuild
index 3a018dc7620a..c45bf9039ab9 100644
--- a/dev-libs/libxml2/libxml2-2.9.9.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.9.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~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 ~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="debug examples icu ipv6 lzma python readline static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-python/nevow/nevow-0.14.3.ebuild b/dev-python/nevow/nevow-0.14.3.ebuild
index 9c69c776d226..69e5adfab1e6 100644
--- a/dev-python/nevow/nevow-0.14.3.ebuild
+++ b/dev-python/nevow/nevow-0.14.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ia64 ppc ~ppc64 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ia64 ppc ppc64 ~sparc x86 ~x86-linux"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/media-fonts/noto-cjk/noto-cjk-20170602.ebuild b/media-fonts/noto-cjk/noto-cjk-20170602.ebuild
index c5438acb017d..a683e48968a3 100644
--- a/media-fonts/noto-cjk/noto-cjk-20170602.ebuild
+++ b/media-fonts/noto-cjk/noto-cjk-20170602.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/googlei18n/noto-cjk/archive/${COMMIT}.tar.gz -> ${P}
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 RESTRICT="binchecks strip"
diff --git a/media-fonts/noto/noto-20181024.ebuild b/media-fonts/noto/noto-20181024.ebuild
index 23a4d308153f..06ce5ae91dfe 100644
--- a/media-fonts/noto/noto-20181024.ebuild
+++ b/media-fonts/noto/noto-20181024.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/googlei18n/noto-fonts/archive/${COMMIT}.tar.gz -> ${
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ppc64 ~sparc x86"
 IUSE="cjk"
 
 RDEPEND="cjk? ( media-fonts/noto-cjk )"
diff --git a/media-libs/libcdr/libcdr-0.1.5.ebuild b/media-libs/libcdr/libcdr-0.1.5.ebuild
index aeb6e753da57..a6d334edc822 100644
--- a/media-libs/libcdr/libcdr-0.1.5.ebuild
+++ b/media-libs/libcdr/libcdr-0.1.5.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev-www.libreoffice.org/src/libcdr/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="Library parsing the Corel cdr documents"
diff --git a/net-misc/rdesktop/rdesktop-1.8.4-r1.ebuild b/net-misc/rdesktop/rdesktop-1.8.4-r1.ebuild
index e323bf8a7160..2222831fdc0e 100644
--- a/net-misc/rdesktop/rdesktop-1.8.4-r1.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.8.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr"
 
 S=${WORKDIR}/${PN}-${MY_PV}
diff --git a/sys-apps/file/file-5.36.ebuild b/sys-apps/file/file-5.36.ebuild
index ee3f15a2c3de..03fff8433d99 100644
--- a/sys-apps/file/file-5.36.ebuild
+++ b/sys-apps/file/file-5.36.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~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 ~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"
 fi
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/systemd/systemd-239-r4.ebuild b/sys-apps/systemd/systemd-239-r4.ebuild
index 2461028e29e7..b07e0ad0ed49 100644
--- a/sys-apps/systemd/systemd-239-r4.ebuild
+++ b/sys-apps/systemd/systemd-239-r4.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}/${P}.tar.gz
 		https://dev.gentoo.org/~floppym/dist/${P}-patches-2.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 fi
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
diff --git a/sys-devel/binutils/binutils-2.32.ebuild b/sys-devel/binutils/binutils-2.32.ebuild
index a4f678d5dfbb..d3c4f9a56eea 100644
--- a/sys-devel/binutils/binutils-2.32.ebuild
+++ b/sys-devel/binutils/binutils-2.32.ebuild
@@ -292,7 +292,8 @@ src_test() {
 	# bug 637066
 	filter-flags -Wall -Wreturn-type
 
-	emake -k check
+	# enable verbose test run and result logging
+	emake -k check RUNTESTFLAGS='-a -v' VERBOSE=1
 }
 
 src_install() {
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index cf4640ceaf6a..a4877ac83781 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -286,7 +286,8 @@ src_test() {
 	# bug 637066
 	filter-flags -Wall -Wreturn-type
 
-	emake -k check
+	# enable verbose test run and result logging
+	emake -k check RUNTESTFLAGS='-a -v' VERBOSE=1
 }
 
 src_install() {
diff --git a/sys-kernel/genkernel-next/genkernel-next-69.ebuild b/sys-kernel/genkernel-next/genkernel-next-69.ebuild
index 529b181df5f6..2a0367fe1990 100644
--- a/sys-kernel/genkernel-next/genkernel-next-69.ebuild
+++ b/sys-kernel/genkernel-next/genkernel-next-69.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 SRC_URI="https://github.com/Sabayon/genkernel-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 x86"
 inherit bash-completion-r1
 
 DESCRIPTION="Gentoo automatic kernel building scripts, reloaded"