Merge updates from master

44 files changed, 91 insertions, 492 deletions

diff --git a/app-misc/trash-cli/trash-cli-0.17.1.14_p20170816.ebuild b/app-misc/trash-cli/trash-cli-0.17.1.14_p20170816.ebuild
index 769a796bf485..bf00f26060c8 100644
--- a/app-misc/trash-cli/trash-cli-0.17.1.14_p20170816.ebuild
+++ b/app-misc/trash-cli/trash-cli-0.17.1.14_p20170816.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
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/andreafrancia/${PN}/archive/${GIT_REF}.tar.gz -> ${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild b/app-office/calligra/calligra-3.1.0-r3.ebuild
index 24ca06bcb3ab..c3913bd48d1c 100644
--- a/app-office/calligra/calligra-3.1.0-r3.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r3.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 x86"
 
 CAL_FTS=( karbon sheets stage words )
 
-IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf
+IUSE="activities +charts +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf
 	phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
 
 # TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
@@ -65,6 +65,7 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	virtual/libiconv
 	activities? ( $(add_frameworks_dep kactivities) )
+	charts? ( dev-libs/kreport )
 	crypt? ( app-crypt/qca:2[qt5(+)] )
 	fontconfig? ( media-libs/fontconfig )
 	gemini? ( $(add_qt_dep qtdeclarative 'widgets') )
@@ -175,6 +176,7 @@ src_configure() {
 		-DWITH_Iconv=ON
 		-DPRODUCTSET="${myproducts[*]}"
 		$(cmake-utils_use_find_package activities KF5Activities)
+		$(cmake-utils_use_find_package charts KChart)
 		-DWITH_Qca-qt5=$(usex crypt)
 		-DWITH_Fontconfig=$(usex fontconfig)
 		$(cmake-utils_use_find_package gemini Libgit2)
diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 575f0b0a9176..d5fb30da6eb0 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -11,6 +11,7 @@
 	</maintainer>
 	<use>
 		<flag name="activities">Enable kactivities support</flag>
+		<flag name="charts">Build chartshape plugin for creating business charts with <pkg>dev-libs/kreport</pkg></flag>
 		<flag name="gemini">Enable tablet and 2:1 devices support</flag>
 		<flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag>
 		<flag name="lcms">Build colorengine plugins using <pkg>media-libs/lcms</pkg></flag>
diff --git a/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch b/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch
new file mode 100644
index 000000000000..cb56d16388f5
--- /dev/null
+++ b/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch
@@ -0,0 +1,28 @@
+From 6ba59f2f707829242ad2410803f48089062c7241 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 24 Jan 2019 23:20:09 +0100
+Subject: [PATCH] Fix build without Qt5WebKit installed
+
+---
+ skgbasegui/skgtablewithgraph.ui | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/skgbasegui/skgtablewithgraph.ui b/skgbasegui/skgtablewithgraph.ui
+index e1a3058aa..df93115f3 100644
+--- a/skgbasegui/skgtablewithgraph.ui
++++ b/skgbasegui/skgtablewithgraph.ui
+@@ -151,11 +151,6 @@
+   </layout>
+  </widget>
+  <customwidgets>
+-  <customwidget>
+-   <class>QWebView</class>
+-   <extends>QWidget</extends>
+-   <header>QtWebKitWidgets/QWebView</header>
+-  </customwidget>
+   <customwidget>
+    <class>SKGGraphicsView</class>
+    <extends>QWidget</extends>
+-- 
+2.20.1
+
diff --git a/app-office/skrooge/skrooge-2.17.0.ebuild b/app-office/skrooge/skrooge-2.17.0.ebuild
index adde622d056a..063a50e94080 100644
--- a/app-office/skrooge/skrooge-2.17.0.ebuild
+++ b/app-office/skrooge/skrooge-2.17.0.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=6
@@ -16,6 +16,8 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 IUSE="activities designer kde ofx webkit"
 
+REQUIRED_USE="test? ( designer )"
+
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcompletion)
@@ -62,7 +64,6 @@ DEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kwindowsystem)
 	dev-libs/libxslt
 	virtual/pkgconfig
-	x11-misc/shared-mime-info
 	designer? (
 		$(add_frameworks_dep kdesignerplugin)
 		$(add_qt_dep designer)
@@ -73,11 +74,14 @@ RDEPEND="${COMMON_DEPEND}
 	$(add_qt_dep qtquickcontrols)
 "
 
-REQUIRED_USE="test? ( designer )"
-
 # hangs + installs files
 RESTRICT+=" test"
 
+src_prepare() {
+	use webkit || eapply "${FILESDIR}"/${P}-noqtwebkit.patch # bug 676196
+	kde5_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DSKG_BUILD_TEST=$(usex test)
diff --git a/app-portage/pfl/pfl-3.0-r2.ebuild b/app-portage/pfl/pfl-3.0-r2.ebuild
index 1b73209d5f08..499ba16f765a 100644
--- a/app-portage/pfl/pfl-3.0-r2.ebuild
+++ b/app-portage/pfl/pfl-3.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://files.portagefilelist.de/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm hppa ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+network-cron"
 
 DEPEND=""
diff --git a/app-portage/portage-utils/portage-utils-0.74.ebuild b/app-portage/portage-utils/portage-utils-0.74.ebuild
index 24645da7fdcb..cb0eabec9f42 100644
--- a/app-portage/portage-utils/portage-utils-0.74.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.74.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-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="nls static"
 
 RDEPEND="dev-libs/iniparser:0"
diff --git a/dev-cpp/eigen/eigen-3.3.7.ebuild b/dev-cpp/eigen/eigen-3.3.7.ebuild
index dff5c3ac13ce..4e4ce83d41a4 100644
--- a/dev-cpp/eigen/eigen-3.3.7.ebuild
+++ b/dev-cpp/eigen/eigen-3.3.7.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=6
@@ -12,7 +12,7 @@ SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="MPL-2.0"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="altivec c++11 cuda debug doc neon openmp test" #zvector vsx
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/pgpool2/pgpool2-3.7.7.ebuild b/dev-db/pgpool2/pgpool2-3.7.7.ebuild
index 59df68c3ad24..ddf55c788d55 100644
--- a/dev-db/pgpool2/pgpool2-3.7.7.ebuild
+++ b/dev-db/pgpool2/pgpool2-3.7.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 IUSE="doc libressl memcached pam ssl static-libs"
 
diff --git a/dev-db/pgpool2/pgpool2-4.0.2.ebuild b/dev-db/pgpool2/pgpool2-4.0.2.ebuild
index 6bfa9756868e..ef41b7cf7e24 100644
--- a/dev-db/pgpool2/pgpool2-4.0.2.ebuild
+++ b/dev-db/pgpool2/pgpool2-4.0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 IUSE="doc libressl memcached pam ssl static-libs"
 
diff --git a/dev-db/postgis/postgis-2.4.6.ebuild b/dev-db/postgis/postgis-2.4.6.ebuild
index c78f3e5ac27d..4c1fdf889a99 100644
--- a/dev-db/postgis/postgis-2.4.6.ebuild
+++ b/dev-db/postgis/postgis-2.4.6.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="6"
@@ -17,7 +17,7 @@ HOMEPAGE="http://postgis.net"
 SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="address-standardizer doc gtk static-libs mapbox test topology"
 
 RDEPEND="
diff --git a/dev-db/postgis/postgis-2.5.1-r1.ebuild b/dev-db/postgis/postgis-2.5.1-r1.ebuild
index 23608a5b3b00..910b9060e6fe 100644
--- a/dev-db/postgis/postgis-2.5.1-r1.ebuild
+++ b/dev-db/postgis/postgis-2.5.1-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://postgis.net"
 SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="address-standardizer doc gtk static-libs mapbox test topology"
 
 RDEPEND="
diff --git a/dev-db/postgresql/postgresql-11.1.ebuild b/dev-db/postgresql/postgresql-11.1.ebuild
index e5e3465aa45a..975cc54129a5 100644
--- a/dev-db/postgresql/postgresql-11.1.ebuild
+++ b/dev-db/postgresql/postgresql-11.1.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-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=$(get_major_version)
 
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild
index 3bcad1957c5e..f11f44490052 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.202.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit desktop gnome2-utils java-vm-2 prefix versionator
 
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="-* ~amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
 
 if [[ "$(get_version_component_range 4)" == 0 ]] ; then
 	S_PV="$(get_version_component_range 1-3)"
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.202.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.202.ebuild
index 0301c67934ad..4a38c8f94746 100644
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.202.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.202.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit desktop gnome2-utils java-vm-2 prefix versionator
 
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
 
 if [[ "$(get_version_component_range 4)" == 0 ]] ; then
 	S_PV="$(get_version_component_range 1-3)"
diff --git a/dev-lang/nasm/nasm-2.14.02.ebuild b/dev-lang/nasm/nasm-2.14.02.ebuild
index 6b8de70a92c6..ebe185b58e18 100644
--- a/dev-lang/nasm/nasm-2.14.02.ebuild
+++ b/dev-lang/nasm/nasm-2.14.02.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~ia64 x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-libs/json-c/json-c-0.13.1-r1.ebuild b/dev-libs/json-c/json-c-0.13.1-r1.ebuild
index 65bedbca4514..bb30f3f25f2c 100644
--- a/dev-libs/json-c/json-c-0.13.1-r1.ebuild
+++ b/dev-libs/json-c/json-c-0.13.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc static-libs"
 
 src_prepare() {
diff --git a/dev-libs/libburn/libburn-1.5.0.ebuild b/dev-libs/libburn/libburn-1.5.0.ebuild
index 02e29cc5523d..931d02863693 100644
--- a/dev-libs/libburn/libburn-1.5.0.ebuild
+++ b/dev-libs/libburn/libburn-1.5.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 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="debug static-libs"
 
 BDEPEND="
diff --git a/dev-libs/libevdev/libevdev-1.6.0.ebuild b/dev-libs/libevdev/libevdev-1.6.0.ebuild
index 78c02e98f14c..89e403e8f427 100644
--- a/dev-libs/libevdev/libevdev-1.6.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.6.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	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"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libical/libical-3.0.4.ebuild b/dev-libs/libical/libical-3.0.4.ebuild
index d38481874cc6..b989b6e001c5 100644
--- a/dev-libs/libical/libical-3.0.4.ebuild
+++ b/dev-libs/libical/libical-3.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0/3"
-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="berkdb doc examples static-libs test"
 
 # TODO: disabled until useful
diff --git a/dev-libs/libisoburn/libisoburn-1.5.0.ebuild b/dev-libs/libisoburn/libisoburn-1.5.0.ebuild
index 3b2a6b38d880..104c4f19e764 100644
--- a/dev-libs/libisoburn/libisoburn-1.5.0.ebuild
+++ b/dev-libs/libisoburn/libisoburn-1.5.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3"
 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="acl debug external-filters external-filters-setuid frontend-optional
 	launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib"
 
diff --git a/dev-libs/libisofs/libisofs-1.5.0.ebuild b/dev-libs/libisofs/libisofs-1.5.0.ebuild
index 077a9b567fe5..4c4ad396d97d 100644
--- a/dev-libs/libisofs/libisofs-1.5.0.ebuild
+++ b/dev-libs/libisofs/libisofs-1.5.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 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="acl debug static-libs verbose-debug xattr zlib"
 
 BDEPEND="
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.17.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.17.ebuild
index a738ce710dc0..b6d840ece807 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.17.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.17.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://wayland.freedesktop.org/"
 
 if [[ $PV != 9999* ]]; then
 	SRC_URI="https://wayland.freedesktop.org/releases/${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
 
 LICENSE="MIT"
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.5.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.5.ebuild
index d9cfbfde0bf5..67ea4e4bba0e 100644
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.5.ebuild
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://pear.php.net/package/${MY_PN}"
 SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 # bzip2 and zlib are needed for compressed tarballs, and there's one
diff --git a/dev-python/bleach/bleach-3.0.2.ebuild b/dev-python/bleach/bleach-3.0.2.ebuild
index 5f76613c2eb4..85cf2d90f2a0 100644
--- a/dev-python/bleach/bleach-3.0.2.ebuild
+++ b/dev-python/bleach/bleach-3.0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-ruby/rubyzip/rubyzip-1.2.2.ebuild b/dev-ruby/rubyzip/rubyzip-1.2.2.ebuild
index cbd1bdb88377..0b809868dc57 100644
--- a/dev-ruby/rubyzip/rubyzip-1.2.2.ebuild
+++ b/dev-ruby/rubyzip/rubyzip-1.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rubyzip/rubyzip/archive/v${PV}.tar.gz -> ${P}-git.tg
 
 LICENSE="Ruby"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/kde-misc/tellico/tellico-3.1.4.ebuild b/kde-misc/tellico/tellico-3.1.4.ebuild
index c0ca9f407312..14a4c066ed22 100644
--- a/kde-misc/tellico/tellico-3.1.4.ebuild
+++ b/kde-misc/tellico/tellico-3.1.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://tellico-project.org/"
 SRC_URI="http://tellico-project.org/files/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
 
 RDEPEND="
diff --git a/media-gfx/gthumb/gthumb-3.6.2.ebuild b/media-gfx/gthumb/gthumb-3.6.2.ebuild
index fa3de15b5f1b..26d6763e6c15 100644
--- a/media-gfx/gthumb/gthumb-3.6.2.ebuild
+++ b/media-gfx/gthumb/gthumb-3.6.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/gthumb"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="cdr colord debug exif gnome-keyring gstreamer http jpeg json lcms raw slideshow svg tiff test webkit webp"
 
 RDEPEND="
diff --git a/media-gfx/photoqt/files/photoqt-1.7.1-exiv2-0.27.patch b/media-gfx/photoqt/files/photoqt-1.7.1-exiv2-0.27.patch
index d2b264e01750..48734ce70593 100644
--- a/media-gfx/photoqt/files/photoqt-1.7.1-exiv2-0.27.patch
+++ b/media-gfx/photoqt/files/photoqt-1.7.1-exiv2-0.27.patch
@@ -1,448 +1,9 @@
-From 66b2c16c0dec865db9c3d1720385625d22fbf021 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sat, 19 Jan 2019 23:17:32 +0100
-Subject: [PATCH 1/4] Simplify CMakeLists.txt using FeatureSummary
-
----
- CMakeLists.txt | 192 +++++++++++++++++++------------------------------
- 1 file changed, 75 insertions(+), 117 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9af47a75..1ffe7ff3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,6 +52,8 @@ include(CMake/ListFilesResources.cmake)
- #### OPTIONS THAT CAN BE SET BY THE USER ####
- #############################################
- 
-+include(FeatureSummary)
-+
- option(RAW "Use libraw library" ON)
- option(EXIV2 "Use exiv2 library" ON)
- option(GM "Use graphicsmagick library" ON)
-@@ -65,35 +67,37 @@ option(TESTING "Enable some tests" OFF)
- #### FIND REQUIRED PACKAGES ####
- ################################
- 
-+find_package(Qt5 COMPONENTS Core Quick Svg Sql Xml LinguistTools REQUIRED)
-+
- if(WIN32)
--    find_package(Qt5 COMPONENTS Core Quick Svg Sql Xml LinguistTools WinExtras REQUIRED)
--elseif(NOT WIN32)
--    find_package(Qt5 COMPONENTS Core Quick Svg Sql Xml LinguistTools REQUIRED)
--endif(WIN32)
-+    find_package(Qt5WinExtras REQUIRED)
-+endif()
- 
- set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake" ${CMAKE_MODULE_PATH})
-+
-+find_package(LibArchive REQUIRED)
-+
- if(GM)
--    find_package(Magick)
--endif(GM)
-+    find_package(Magick REQUIRED)
-+endif()
- if(EXIV2)
--    find_package(Exiv2)
--endif(EXIV2)
-+    find_package(Exiv2 REQUIRED)
-+endif()
- if(RAW)
--    find_package(LibRaw)
--endif(RAW)
-+    find_package(LibRaw REQUIRED)
-+endif()
- if(FREEIMAGE)
--    find_package(FreeImage)
--endif(FREEIMAGE)
--find_package(LibArchive)
-+    find_package(FreeImage REQUIRED)
-+endif()
- 
- find_package(ECM REQUIRED NO_MODULE)
- set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_MODULE_PATH}")
- if(POPPLER)
--    find_package(Poppler COMPONENTS Qt5)
--endif(POPPLER)
-+    find_package(Poppler COMPONENTS Qt5 REQUIRED)
-+endif()
- if(DEVIL)
--    find_package(DevIL)
--endif(DEVIL)
-+    find_package(DevIL REQUIRED)
-+endif()
- 
- ####################################
- #### TRANSLATIONS AND RESOURCES ####
-@@ -137,14 +141,14 @@ add_definitions(-DSIMPLECRYPTKEY="${CRYPTKEY}")
- #### Add the executeable ####
- #############################
- 
-+add_executable(${PROJECT_NAME} ${photoqt_SOURCES} ${photoqt_QML} ${RESOURCES})
-+target_link_libraries(${PROJECT_NAME} Qt5::Quick Qt5::Sql Qt5::Svg Qt5::Core Qt5::Xml)
-+
- # on windows we add application icons
- if(WIN32)
--    add_executable(${PROJECT_NAME} WIN32 ${photoqt_SOURCES} ${photoqt_QML} ${RESOURCES} windowsicons.rc)
--    target_link_libraries(${PROJECT_NAME} Qt5::Quick Qt5::Sql Qt5::Svg Qt5::Core Qt5::Xml Qt5::WinExtras)
--elseif(NOT WIN32)
--    add_executable(${PROJECT_NAME} ${photoqt_SOURCES} ${photoqt_QML} ${RESOURCES})
--    target_link_libraries(${PROJECT_NAME} Qt5::Quick Qt5::Sql Qt5::Svg Qt5::Core Qt5::Xml)
--endif(WIN32)
-+    add_executable(${PROJECT_NAME} WIN32 windowsicons.rc)
-+    target_link_libraries(${PROJECT_NAME} Qt5::WinExtras)
-+endif()
- 
- 
- ########################
-@@ -171,7 +175,7 @@ if(TESTING)
-     # And inform the user
-     message("** TESTING ENABLED")
- 
--endif(TESTING)
-+endif()
- 
- 
- ##############################################
-@@ -186,112 +190,65 @@ composeDesktopFile()
- #### CUSTOM OPTIONS ####
- ########################
- 
--if(NOT ${LibArchive_FOUND})
--    message(FATAL_ERROR "** Unable to locate LibArchive... is it installed?")
--elseif(${LibArchive_FOUND})
--    include_directories(${LibArchive_INCLUDE_DIRS})
--    target_link_libraries(${PROJECT_NAME} ${LibArchive_LIBRARIES})
--    message("** Found LibArchive " ${LibArchive_VERSION})
--endif(NOT ${LibArchive_FOUND})
-+include_directories(${LibArchive_INCLUDE_DIRS})
-+target_link_libraries(${PROJECT_NAME} ${LibArchive_LIBRARIES})
- 
- if(POPPLER)
--    if(NOT ${Poppler_FOUND})
--        message(FATAL_ERROR "** Unable to locate Poppler... is it installed?")
--    elseif(${Poppler_FOUND})
--        include_directories(${Poppler_INCLUDE_DIRS})
--        target_link_libraries(${PROJECT_NAME} ${Poppler_LIBRARIES})
--        message("** Poppler enabled")
--        add_definitions(-DPOPPLER)
--    endif(NOT ${Poppler_FOUND})
--elseif(NOT POPPLER)
--    message("** Poppler DISABLED")
--endif(POPPLER)
-+    include_directories(${Poppler_INCLUDE_DIRS})
-+    target_link_libraries(${PROJECT_NAME} ${Poppler_LIBRARIES})
-+    add_definitions(-DPOPPLER)
-+endif()
- 
- if(DEVIL)
--    if(NOT ${IL_FOUND})
--        message(FATAL_ERROR "** Unable to locate DevIL... is it installed?")
--    elseif(${IL_FOUND})
--        include_directories(${IL_INCLUDE_DIR})
--        target_link_libraries(${PROJECT_NAME} ${IL_LIBRARIES})
--        message("** DevIL enabled")
--        add_definitions(-DDEVIL)
--    endif(NOT ${IL_FOUND})
--elseif(NOT DEVIL)
--    message("** DevIL DISABLED")
--endif(DEVIL)
-+    include_directories(${IL_INCLUDE_DIR})
-+    target_link_libraries(${PROJECT_NAME} ${IL_LIBRARIES})
-+    add_definitions(-DDEVIL)
-+endif()
- 
- if(FREEIMAGE)
--    if(NOT ${FREEIMAGE_FOUND})
--        message(FATAL_ERROR "** Unable to locate FreeImage... is it installed?")
--    elseif(${FREEIMAGE_FOUND})
--        include_directories(${FREEIMAGE_INCLUDE_DIRS})
--        target_link_libraries(${PROJECT_NAME} ${FREEIMAGE_LIBRARIES})
--        message("** FreeImage enabled")
--        add_definitions(-DFREEIMAGE)
--    endif(NOT ${FREEIMAGE_FOUND})
--elseif(NOT FREEIMAGE)
--    message("** FreeImage DISABLED")
--endif(FREEIMAGE)
-+    include_directories(${FREEIMAGE_INCLUDE_DIRS})
-+    target_link_libraries(${PROJECT_NAME} ${FREEIMAGE_LIBRARIES})
-+    add_definitions(-DFREEIMAGE)
-+endif()
- 
- if(RAW)
--    if(NOT ${LIBRAW_FOUND})
--        message(FATAL_ERROR "** Unable to locate LibRaw... is it installed?")
--    elseif(${LIBRAW_FOUND})
--        include_directories(${LIBRAW_INCLUDE_DIR})
--        target_link_libraries(${PROJECT_NAME} "raw")
--        message("** LibRaw enabled")
--        add_definitions(-DRAW)
--    endif(NOT ${LIBRAW_FOUND})
--elseif(NOT RAW)
--    message("** LibRaw DISABLED")
--endif(RAW)
-+    include_directories(${LIBRAW_INCLUDE_DIR})
-+    target_link_libraries(${PROJECT_NAME} "raw")
-+    add_definitions(-DRAW)
-+endif()
- 
- if(EXIV2)
--    if(NOT ${EXIV2_FOUND})
--        message(FATAL_ERROR "** Unable to locate Exiv2... is it installed?")
--    elseif(${EXIV2_FOUND})
--        include_directories(${EXIV2_INCLUDE_DIR})
--        target_link_libraries(${PROJECT_NAME} "exiv2")
-+    include_directories(${EXIV2_INCLUDE_DIR})
-+    target_link_libraries(${PROJECT_NAME} "exiv2")
-+    if(TESTING)
-+        target_link_libraries(${PROJECT_TEST_NAME} "exiv2")
-+    endif()
-+    if(WIN32)
-+        target_link_libraries(${PROJECT_NAME} "expat")
-+        target_link_libraries(${PROJECT_NAME} "ws2_32")
-+        target_link_libraries(${PROJECT_NAME} "wsock32")
-+        target_link_libraries(${PROJECT_NAME} "z")
-+        target_link_libraries(${PROJECT_NAME} "intl")
-+        target_link_libraries(${PROJECT_NAME} "iconv")
-+        target_link_libraries(${PROJECT_NAME} "psapi")
-         if(TESTING)
--            target_link_libraries(${PROJECT_TEST_NAME} "exiv2")
--        endif(TESTING)
--        if(WIN32)
--            target_link_libraries(${PROJECT_NAME} "expat")
--            target_link_libraries(${PROJECT_NAME} "ws2_32")
--            target_link_libraries(${PROJECT_NAME} "wsock32")
--            target_link_libraries(${PROJECT_NAME} "z")
--            target_link_libraries(${PROJECT_NAME} "intl")
--            target_link_libraries(${PROJECT_NAME} "iconv")
--            target_link_libraries(${PROJECT_NAME} "psapi")
--            if(TESTING)
--                target_link_libraries(${PROJECT_TEST_NAME} "expat")
--                target_link_libraries(${PROJECT_TEST_NAME} "ws2_32")
--                target_link_libraries(${PROJECT_TEST_NAME} "wsock32")
--                target_link_libraries(${PROJECT_TEST_NAME} "z")
--                target_link_libraries(${PROJECT_TEST_NAME} "intl")
--                target_link_libraries(${PROJECT_TEST_NAME} "iconv")
--                target_link_libraries(${PROJECT_TEST_NAME} "psapi")
--            endif(TESTING)
--        endif(WIN32)
--        add_definitions(-DEXIV2)
--        message("** Exiv2 enabled")
--    endif(NOT ${EXIV2_FOUND})
--elseif(NOT EXIV2)
--        message("** Exiv2 DISABLED")
--endif(EXIV2)
-+            target_link_libraries(${PROJECT_TEST_NAME} "expat")
-+            target_link_libraries(${PROJECT_TEST_NAME} "ws2_32")
-+            target_link_libraries(${PROJECT_TEST_NAME} "wsock32")
-+            target_link_libraries(${PROJECT_TEST_NAME} "z")
-+            target_link_libraries(${PROJECT_TEST_NAME} "intl")
-+            target_link_libraries(${PROJECT_TEST_NAME} "iconv")
-+            target_link_libraries(${PROJECT_TEST_NAME} "psapi")
-+        endif()
-+    endif()
-+    add_definitions(-DEXIV2)
-+endif()
- 
- if(GM)
--    if(NOT ${MAGICK++_FOUND})
--        message(FATAL_ERROR "** Unable to locate GraphicsMagick... is it installed?")
--    elseif(${MAGICK++_FOUND})
--        include_directories(${MAGICK++_INCLUDE_DIR})
--        target_link_libraries(${PROJECT_NAME} "GraphicsMagick++")
--        add_definitions(-DGM)
--        message("** Graphicsmagick enabled")
--    endif(NOT ${MAGICK++_FOUND})
--elseif(NOT GM)
--    message("** Graphicsmagick DISABLED")
--endif(GM)
-+    include_directories(${MAGICK++_INCLUDE_DIR})
-+    target_link_libraries(${PROJECT_NAME} "GraphicsMagick++")
-+    add_definitions(-DGM)
-+endif()
- 
- 
- #######################
-@@ -339,6 +296,7 @@ if(UNIX)
-     )
- endif(UNIX)
- 
-+feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
- 
- 
- ##########################
--- 
-2.20.1
-
-
-From b58268b06eb62de70da3ac751870114b07cd79e3 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 20 Jan 2019 17:49:09 +0100
-Subject: [PATCH 2/4] Switch to FindLibExiv2 from ECM 5.54.0
-
-Fixes detection of exiv2.
----
- CMake/FindLibExiv2.cmake | 115 +++++++++++++++++++++++++++++++++++++++
- CMakeLists.txt           |   7 +--
- create mode 100644 CMake/FindLibExiv2.cmake
-
-diff --git a/CMake/FindLibExiv2.cmake b/CMake/FindLibExiv2.cmake
-new file mode 100644
-index 00000000..935cee2c
---- /dev/null
-+++ b/CMake/FindLibExiv2.cmake
-@@ -0,0 +1,115 @@
-+#.rst:
-+# FindLibExiv2
-+# ------------
-+#
-+# Try to find the Exiv2 library.
-+#
-+# This will define the following variables:
-+#
-+# ``LibExiv2_FOUND``
-+#     System has LibExiv2.
-+#
-+# ``LibExiv2_VERSION``
-+#     The version of LibExiv2.
-+#
-+# ``LibExiv2_INCLUDE_DIRS``
-+#     This should be passed to target_include_directories() if
-+#     the target is not used for linking.
-+#
-+# ``LibExiv2_LIBRARIES``
-+#     The LibExiv2 library.
-+#     This can be passed to target_link_libraries() instead of
-+#     the ``LibExiv2::LibExiv2`` target
-+#
-+# If ``LibExiv2_FOUND`` is TRUE, the following imported target
-+# will be available:
-+#
-+# ``LibExiv2::LibExiv2``
-+#     The Exiv2 library
-+#
-+# Since 5.53.0.
-+#
-+#=============================================================================
-+# Copyright (c) 2018, Christophe Giboudeaux, <christophe@krop.fr>
-+# Copyright (c) 2010, Alexander Neundorf, <neundorf@kde.org>
-+# Copyright (c) 2008, Gilles Caulier, <caulier.gilles@gmail.com>
-+#
-+#
-+# Redistribution and use in source and binary forms, with or without
-+# modification, are permitted provided that the following conditions
-+# are met:
-+#
-+# 1. Redistributions of source code must retain the copyright
-+#    notice, this list of conditions and the following disclaimer.
-+# 2. Redistributions in binary form must reproduce the copyright
-+#    notice, this list of conditions and the following disclaimer in the
-+#    documentation and/or other materials provided with the distribution.
-+# 3. The name of the author may not be used to endorse or promote products
-+#    derived from this software without specific prior written permission.
-+#
-+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+#=============================================================================
-+
-+find_package(PkgConfig QUIET)
-+pkg_check_modules(PC_EXIV2 QUIET exiv2)
-+
-+find_path(LibExiv2_INCLUDE_DIRS NAMES exiv2/exif.hpp
-+    HINTS ${PC_EXIV2_INCLUDEDIR}
-+)
-+
-+find_library(LibExiv2_LIBRARIES NAMES exiv2 libexiv2
-+    HINTS ${PC_EXIV2_LIBRARY_DIRS}
-+)
-+
-+set(LibExiv2_VERSION ${PC_EXIV2_VERSION})
-+
-+if(NOT LibExiv2_VERSION AND DEFINED LibExiv2_INCLUDE_DIRS)
-+    # With exiv >= 0.27, the version #defines are in exv_conf.h instead of version.hpp
-+    foreach(_exiv2_version_file "version.hpp" "exv_conf.h")
-+        if(EXISTS "${LibExiv2_INCLUDE_DIRS}/exiv2/${_exiv2_version_file}")
-+            file(READ "${LibExiv2_INCLUDE_DIRS}/exiv2/${_exiv2_version_file}" _exiv_version_file_content)
-+            string(REGEX MATCH "#define EXIV2_MAJOR_VERSION[ ]+\\([0-9]+\\)" EXIV2_MAJOR_VERSION_MATCH ${_exiv_version_file_content})
-+            string(REGEX MATCH "#define EXIV2_MINOR_VERSION[ ]+\\([0-9]+\\)" EXIV2_MINOR_VERSION_MATCH ${_exiv_version_file_content})
-+            string(REGEX MATCH "#define EXIV2_PATCH_VERSION[ ]+\\([0-9]+\\)" EXIV2_PATCH_VERSION_MATCH ${_exiv_version_file_content})
-+            if(EXIV2_MAJOR_VERSION_MATCH)
-+                string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+\\((.*)\\)" "\\1" EXIV2_MAJOR_VERSION ${EXIV2_MAJOR_VERSION_MATCH})
-+                string(REGEX REPLACE ".*_MINOR_VERSION[ ]+\\((.*)\\)" "\\1" EXIV2_MINOR_VERSION ${EXIV2_MINOR_VERSION_MATCH})
-+                string(REGEX REPLACE ".*_PATCH_VERSION[ ]+\\((.*)\\)" "\\1"  EXIV2_PATCH_VERSION  ${EXIV2_PATCH_VERSION_MATCH})
-+            endif()
-+        endif()
-+    endforeach()
-+
-+    set(LibExiv2_VERSION "${EXIV2_MAJOR_VERSION}.${EXIV2_MINOR_VERSION}.${EXIV2_PATCH_VERSION}")
-+endif()
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(LibExiv2
-+    FOUND_VAR LibExiv2_FOUND
-+    REQUIRED_VARS  LibExiv2_LIBRARIES LibExiv2_INCLUDE_DIRS
-+    VERSION_VAR  LibExiv2_VERSION
-+)
-+
-+mark_as_advanced(LibExiv2_INCLUDE_DIRS LibExiv2_LIBRARIES)
-+
-+if(LibExiv2_FOUND AND NOT TARGET LibExiv2::LibExiv2)
-+    add_library(LibExiv2::LibExiv2 UNKNOWN IMPORTED)
-+    set_target_properties(LibExiv2::LibExiv2 PROPERTIES
-+        IMPORTED_LOCATION "${LibExiv2_LIBRARIES}"
-+        INTERFACE_INCLUDE_DIRECTORIES "${LibExiv2_INCLUDE_DIRS}"
-+    )
-+endif()
-+
-+include(FeatureSummary)
-+set_package_properties(LibExiv2 PROPERTIES
-+    URL "http://www.exiv2.org"
-+    DESCRIPTION "Image metadata support"
-+)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1ffe7ff3..b96b21db 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -81,7 +81,7 @@ if(GM)
-     find_package(Magick REQUIRED)
- endif()
- if(EXIV2)
--    find_package(Exiv2 REQUIRED)
-+    find_package(LibExiv2 REQUIRED)
- endif()
- if(RAW)
-     find_package(LibRaw REQUIRED)
-@@ -218,10 +218,9 @@ if(RAW)
- endif()
- 
- if(EXIV2)
--    include_directories(${EXIV2_INCLUDE_DIR})
--    target_link_libraries(${PROJECT_NAME} "exiv2")
-+    target_link_libraries(${PROJECT_NAME} LibExiv2::LibExiv2)
-     if(TESTING)
--        target_link_libraries(${PROJECT_TEST_NAME} "exiv2")
-+        target_link_libraries(${PROJECT_TEST_NAME} LibExiv2::LibExiv2)
-     endif()
-     if(WIN32)
-         target_link_libraries(${PROJECT_NAME} "expat")
--- 
-2.20.1
-
-
-From f2a675ea5496febae1daee229ad132086dec24bc Mon Sep 17 00:00:00 2001
+From c6fd41478e818f3a651d40f96cab3d790e1c09a4 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
 Date: Sun, 20 Jan 2019 18:25:45 +0100
-Subject: [PATCH 3/4] Fix build with exiv2-0.27
+Subject: [PATCH] Fix build with exiv2-0.27
 
+Fixes https://gitlab.com/luspi/photoqt/issues/64
 ---
  cplusplus/scripts/getanddostuff/manipulation.h | 3 +--
  cplusplus/scripts/getmetadata.cpp              | 4 ++--
@@ -538,4 +99,4 @@ index 1908ba0a..59686cc1 100644
  
  class ManagePeopleTags : public QObject {
 -- 
-2.20.1
+2.18.1
diff --git a/media-gfx/photoqt/photoqt-1.7.1-r1.ebuild b/media-gfx/photoqt/photoqt-1.7.1-r1.ebuild
index cd6204862f01..101227968331 100644
--- a/media-gfx/photoqt/photoqt-1.7.1-r1.ebuild
+++ b/media-gfx/photoqt/photoqt-1.7.1-r1.ebuild
@@ -41,7 +41,10 @@ DEPEND="${RDEPEND}
 	kde-frameworks/extra-cmake-modules:5
 "
 
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-cmake.patch"
+	"${FILESDIR}/${P}-exiv2-0.27.patch" # bugs 675714, 676194
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild
index 470e88f0a684..b67ad27f6923 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
 IUSE="ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will
diff --git a/net-dns/bind/bind-9.11.4_p2.ebuild b/net-dns/bind/bind-9.11.4_p2.ebuild
index a760560b9115..0fb30791db38 100644
--- a/net-dns/bind/bind-9.11.4_p2.ebuild
+++ b/net-dns/bind/bind-9.11.4_p2.ebuild
@@ -38,7 +38,7 @@ SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${P}.tar.
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~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 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # -berkdb by default re bug 602682
 IUSE="-berkdb +caps dlz dnstap doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6
 json ldap libressl lmdb mysql odbc postgres python rpz seccomp selinux ssl static-libs
diff --git a/net-libs/signon-ui/signon-ui-0.15_p20171022.ebuild b/net-libs/signon-ui/signon-ui-0.15_p20171022.ebuild
index 77124a8d3ecf..0d93db609583 100644
--- a/net-libs/signon-ui/signon-ui-0.15_p20171022.ebuild
+++ b/net-libs/signon-ui/signon-ui-0.15_p20171022.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/${COMMIT}/${PN}-${COMMI
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 BDEPEND="test? ( dev-qt/qttest:5 )"
diff --git a/sys-apps/coreutils/coreutils-8.30.ebuild b/sys-apps/coreutils/coreutils-8.30.ebuild
index 31b1c333ff23..330af6ad0d49 100644
--- a/sys-apps/coreutils/coreutils-8.30.ebuild
+++ b/sys-apps/coreutils/coreutils-8.30.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-linux"
 IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test userland_BSD vanilla xattr"
 
 LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
diff --git a/sys-devel/autogen/autogen-5.18.16.ebuild b/sys-devel/autogen/autogen-5.18.16.ebuild
index 82933d1636bf..fac3fc1f236e 100644
--- a/sys-devel/autogen/autogen-5.18.16.ebuild
+++ b/sys-devel/autogen/autogen-5.18.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="libopts static-libs"
 
 RDEPEND=">=dev-scheme/guile-2.0:=
diff --git a/sys-fs/fatsort/fatsort-1.5.0.ebuild b/sys-fs/fatsort/fatsort-1.5.0.ebuild
index 55682645fa1e..22a43954300a 100644
--- a/sys-fs/fatsort/fatsort-1.5.0.ebuild
+++ b/sys-fs/fatsort/fatsort-1.5.0.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
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/sys-process/audit/audit-2.8.4.ebuild b/sys-process/audit/audit-2.8.4.ebuild
index 5b5277376cfe..d5b448720349 100644
--- a/sys-process/audit/audit-2.8.4.ebuild
+++ b/sys-process/audit/audit-2.8.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-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="gssapi ldap python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # Testcases are pretty useless as they are built for RedHat users/groups and kernels.
diff --git a/x11-apps/xcursorgen/xcursorgen-1.0.7.ebuild b/x11-apps/xcursorgen/xcursorgen-1.0.7.ebuild
index eea7e1e3e9d5..02f9d31c1b9e 100644
--- a/x11-apps/xcursorgen/xcursorgen-1.0.7.ebuild
+++ b/x11-apps/xcursorgen/xcursorgen-1.0.7.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="create an X cursor file from a collection of PNG images"
 
-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=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xinit/xinit-1.4.0-r1.ebuild b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
index 5eaac0fd90a4..3cccf1c55081 100644
--- a/x11-apps/xinit/xinit-1.4.0-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+minimal"
 
 RDEPEND="
diff --git a/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.0.ebuild b/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.0.ebuild
index 7f6c3f9ec8a3..b84a627f48fc 100644
--- a/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.0.ebuild
+++ b/x11-drivers/xf86-video-mga/xf86-video-mga-2.0.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 DESCRIPTION="Matrox video driver"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 src_configure() {
 	XORG_CONFIGURE_OPTIONS="$(use_enable dri)"
diff --git a/x11-libs/cairo/cairo-1.16.0-r2.ebuild b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
index 31430c1f1f3d..68bdb8a0bce3 100644
--- a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-	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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/pixman/pixman-0.36.0.ebuild b/x11-libs/pixman/pixman-0.36.0.ebuild
index d99cc7d5d465..c0be981ce632 100644
--- a/x11-libs/pixman/pixman-0.36.0.ebuild
+++ b/x11-libs/pixman/pixman-0.36.0.ebuild
@@ -9,7 +9,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/pixman/pixman.git"
 DESCRIPTION="Low-level pixel manipulation routines"
 
 if [[ $PV != 9999* ]]; then
-	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 ~x86-winnt"
+	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 ~x86-winnt"
 fi
 
 IUSE="altivec loongson2f cpu_flags_arm_iwmmxt cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
diff --git a/x11-misc/xtermcontrol/xtermcontrol-3.6.ebuild b/x11-misc/xtermcontrol/xtermcontrol-3.6.ebuild
index 18ff93b92b86..5fe0fde095e0 100644
--- a/x11-misc/xtermcontrol/xtermcontrol-3.6.ebuild
+++ b/x11-misc/xtermcontrol/xtermcontrol-3.6.ebuild
@@ -9,5 +9,5 @@ SRC_URI="https://www.thrysoee.dk/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ~ppc sparc ~x86"
+KEYWORDS="~alpha amd64 ia64 ~ppc sparc x86"
 IUSE=""
diff --git a/x11-terms/guake/guake-3.3.2.ebuild b/x11-terms/guake/guake-3.3.2.ebuild
index 05bbf86cd8e2..ab4c70893f9d 100644
--- a/x11-terms/guake/guake-3.3.2.ebuild
+++ b/x11-terms/guake/guake-3.3.2.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/G/${PN^}/${P^}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 IUSE="utempter"
 
 RDEPEND="