gentoo resync : 02.08.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-08-02 19:14:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-08-02 19:14:55 +0100
commit: b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch)
tree: 0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /media-gfx
parent: 121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff)
51 files changed, 919 insertions, 1152 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 137d28082554..b9856176d520 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/aewan/Manifest b/media-gfx/aewan/Manifest
index 53b25f223edf..8ccadd02a485 100644
--- a/media-gfx/aewan/Manifest
+++ b/media-gfx/aewan/Manifest
@@ -1,5 +1,5 @@
 AUX aewan-1.0.01-debug_aewl-warnings.patch 195 BLAKE2B cc28ceeb081f2feb06082ba7649ad7dd0ef69606ff11f9946f863edf74bc212593e38bdbce84d3aac93ce170bc4729b41cb668148419d7febaef24091d7b5665 SHA512 2693a0a64f458ae93b6edaaa0c930ac8a09e3af8d193e4d84577eb0ef542c01e376ea6972e411f45e1599581d225952db7f02a4ff787018f9df1bab42bf9462e
 AUX aewan-1.0.01-tinfo.patch 546 BLAKE2B 5b2ff040df207cc9b9810ea0e733d4e4113acba1473a68a4c01eb0dca15fe7125dc8bfafb36af56c20260d41060d4450127df9c27415babe94f1ff3cc29988e0 SHA512 226780e4176490798f82e8f8184c0d8a44df8958c793925bbd7ccc87a4640e8ea1a09f47a7bdb90f7b94ef6abdda55d8ec4ad2623da26c4ac6cab11838e93277
 DIST aewan-1.0.01.tar.gz 122880 BLAKE2B 396b7d6111e889ac30140b5bf7097c8d83b05c956a86fdf50651800371356862ab580e7afb1b68cc9f119339b68c786e81666cdd04f8cfc0bf02866dcaef9560 SHA512 8c7e81ed3e2c4d0848e36ed60922c920471c7bc46a7127f529be3f5a9c3c66a6e0dff06bca7b5cb21eb0a93d03ba31fd4ef07fc48e2e39f2224956801fe322f3
-EBUILD aewan-1.0.01-r1.ebuild 550 BLAKE2B 31ae2e13a5c8353186a8fc4e10da19a16adec6967db4c5e6bc44fdcec19b88bcd958bc9f9a618eba7036e3298e1583db474c52e7109eb4dd2f94f5bc052ee52e SHA512 ad3f0a5e22aa886a4db2b407e0f96c490ab9b725a462ad6fbbbe79c42d727cd4ffa46969383d7ada2744218c1232aae4551953c0f0187350dd06f48d3bcb5cd3
+EBUILD aewan-1.0.01-r1.ebuild 552 BLAKE2B ad7724ea5054f9fb2f3dfb403917dcf44fe95d2dcd61829a515cbdfa2db3b6a05bab2e3741897b9900d1bbe7724334e756285a3db4fa7f47515436e6b7aef562 SHA512 3861273877fa8a859559b0d94eaa45e4cfefff1fd4848ad46aac8c49af2102e6658283a2044a7722cf03b7e5751291b0cbf157acafb2a854d2e9a3150be55d7f
 MISC metadata.xml 547 BLAKE2B 4648d2ca6d994adbfd5279c0f4624adb1b9a345892e0e6a997b0d433ff05633e9a52d3ef164977675ed46f54e8ca0905715286f24c7ffab9864d241435195dd6 SHA512 29ea4312f9f18274b6304c2ec632289746b35f3259af821bf89c0e6be5777fc5166db06d3d4456af07e2edcfbee6afb0b75a826f9d87c38bc873a6692532a8a2
diff --git a/media-gfx/aewan/aewan-1.0.01-r1.ebuild b/media-gfx/aewan/aewan-1.0.01-r1.ebuild
index 85aeae9dc11f..b9d7e155d047 100644
--- a/media-gfx/aewan/aewan-1.0.01-r1.ebuild
+++ b/media-gfx/aewan/aewan-1.0.01-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="A curses-based ascii-art editor"
 HOMEPAGE="http://aewan.sourceforge.net/"
@@ -16,12 +16,13 @@ KEYWORDS="amd64 x86"
 DOCS=( CHANGELOG README TODO )
 
 DEPEND="sys-libs/zlib
-	>=sys-libs/ncurses-5.0"
+	>=sys-libs/ncurses-5.0:0="
 
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch \
+	default
+	eapply \
 		"${FILESDIR}/${P}-debug_aewl-warnings.patch" \
 		"${FILESDIR}/${P}-tinfo.patch"
 	eautoreconf
diff --git a/media-gfx/ahoviewer/Manifest b/media-gfx/ahoviewer/Manifest
index 8f34c86a96dc..47e74c4e5c5b 100644
--- a/media-gfx/ahoviewer/Manifest
+++ b/media-gfx/ahoviewer/Manifest
@@ -1,3 +1,3 @@
 DIST ahoviewer-1.6.5.tar.gz 227653 BLAKE2B 691a9eaa62b55d91b2d215d41ce402c39ca7490a44506a489061aaadd97fac2ac84aa1b28a7d1b4c097d69153ffe146fac105e9b086adc6b66b9f459e6b98eb5 SHA512 30309cff22008d444eec113bd5d79bdc0e9ff1bbc1b117bd3ecefabfdef79773fd17347766115bb0a192db76dbb24f30c853b27123f0a333c8625b94dc2a8775
 EBUILD ahoviewer-1.6.5.ebuild 1750 BLAKE2B 6c4d365732f480ce61f4d99b0b7a505bdc8bf8698b6698d48c8f9656bb73a3ab5548f715a165fc594be1ca6d7c920bd6a357743fe04746e02e306656527c6246 SHA512 73d6616d4ff8413091a45d867e02e373f6b6a5112ae4d8ee1278c90ac45def3649655f92871a939d5f8854d6b8a962182cd3d177f9e29249eaf0d14730b6bf12
-MISC metadata.xml 532 BLAKE2B 03de1e92365b5abb2e277362cd7e4914e798f98eba5c4f7b1d0a3bd238f1bd35357045b41d96fc979f238c746acd31f35a4557e1251c8786e20420b016648fe4 SHA512 f5a47485137a9721ad98a363167214118f92391f83c75ea66b51c87dfddc5d7585162adc20b23147c6d42781be8c830204af5552fd365d317b7572e2f4fdd260
+MISC metadata.xml 410 BLAKE2B 1344e377cacd46abde3ab09e9aebd4c35390e6f403dc856cf4f04f4f1d9bff5b51930a89f94060d183853e6c98d2dd9c0d7dc31947e5752fd015e8b2276827f5 SHA512 784da6432d4f8d0f574fe17507cf49dee620a685de39f806d5455baa9e6625629d1aa0ca735706193d4b3cdf03696328a4ebed4bc3692efcf22d899eaa5258dc
diff --git a/media-gfx/ahoviewer/metadata.xml b/media-gfx/ahoviewer/metadata.xml
index 9f11884bf0ed..4ff39418e751 100644
--- a/media-gfx/ahoviewer/metadata.xml
+++ b/media-gfx/ahoviewer/metadata.xml
@@ -2,11 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>juippis@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+    <email>juippis@gentoo.org</email>
   </maintainer>
   <use>
     <flag name="libsecret">Support password storing using libsecret</flag>
diff --git a/media-gfx/ephoto/Manifest b/media-gfx/ephoto/Manifest
index 7f4c6a124412..b8b3f6c252b0 100644
--- a/media-gfx/ephoto/Manifest
+++ b/media-gfx/ephoto/Manifest
@@ -1,3 +1,3 @@
 DIST ephoto-1.5-1.tar.xz 327004 BLAKE2B 73b6f72085c845e3bc39a70f1a5b087741ee9d2b6d0a7678af90b78dd08cd68defd7256a12e4ce2f9acab1fc93aafcfcac0f2ee689e9ef0b68f8837446fbf58d SHA512 2c56103e6018ef0252dd5efcb0996e9346c383887b6d272f4fddc0b22e0f98dc032049c8521bca6707f1a5d172abc2d6c8e037104f4aa7a5f920fd55a2fad23e
 EBUILD ephoto-1.5.ebuild 564 BLAKE2B 4de5f23ddd9eacc9b5adc740e639c32470e1d2fd2d287fd612a8794f948e5cc32bc82eb699c9f7057101923e7ba8996dbea224b019f203c7b11f6660fc1212ee SHA512 b12b92b4f309aac575f03e91a9b8fa1a8e7d61a08a0cb8235e78c72a4d0f6af9033bdbc1fd0e840396be3d13fe48495a92d12e570e4366ded35b81124df716ba
-MISC metadata.xml 1203 BLAKE2B 81c54ec20b38cfbaac1af938c254c1b4a7a4f05f930c49221e4a7069dafa072c28dac491f314043b5df20cb459e068e9082ae10f4a8f84371127d842d5033ef1 SHA512 54f5e200874bfe2a33343f147f320960be3cfcffb710ddf20e4721c446f1d3cc67a87185d4347c64ba80ecae1836cff757e2d44bd368d96c7459776b67b411d7
+MISC metadata.xml 1113 BLAKE2B 26731e35dd88df506debdf22fe037093433f03f3639a87ddff42770b63309b3c69e5a2caed1cd717043f7b353d1d6da7f2f3a7c3a2bd8bd922e86c6f6eec9784 SHA512 d044c92df38d066afc19253852fed55696aa6d4cd5d7bb227040a4d35f3a297348073834b75c177abf4a75602ebfbee525f74e5c0cb308cedff96263ad187bdf
diff --git a/media-gfx/ephoto/metadata.xml b/media-gfx/ephoto/metadata.xml
index 997099762b2c..b0fdb75d8ad2 100644
--- a/media-gfx/ephoto/metadata.xml
+++ b/media-gfx/ephoto/metadata.xml
@@ -2,11 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>juippis@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
   </maintainer>
   <longdescription>
     Ephoto is an image viewer and editor written using the Enlightenment Foundation 
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 23b7ffc9f0bf..a65aca32b15d 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,13 +1,6 @@
 AUX exiv2-0.27.0-doc.patch 1024 BLAKE2B 102557142367e36a3632c8c742e35aa820bed92b2688e7b2fc575e6bc2cc18f79c23f5492f3486146cab639c90afd0ebedd53f9807d6db0ebfc77330df28425b SHA512 4e0ad52ecfc7c23ff59b97f165ec35d721a4395357983eaa7e7913387594cf6bae354e48e9b95652fb192b2d6044ecc931228cb2e6d225605adce5165fd81687
 AUX exiv2-0.27.0-fix-pkgconfig.patch 710 BLAKE2B eb4952dc49f3a464ee2041c19de9dee404197814086bef869d99d30acb3a0eb13faa716472926c69dc0b44bdcd8d60494aa06855d9eec183fe4920e728f33cfe SHA512 2eb56a1641efbdb5abb6ed62259850f4cc9630d60c213782fc1cf44a705ca9d0fbde22eb6503c9a06dafcaf4eced4d21704442626b6e8b082457de31ae49fcf8
 AUX exiv2-0.27.0-png-broken-icc-profile.patch 1699 BLAKE2B e9d019d3d885198e9945a387325435618f200dcac5a70cc96a6151f9ba8036609162fd93a7857cb8677bb7c1d3fe250f9750b8d7e660f34e31e50e3bc15e71a1 SHA512 8cb9b1f4129161861aee384e634433e3fa82aa933804d5f63de95475f6f6658f7b2f63fca1da624ea7b634f71cde5ee0de7e0466247d687494383d001df92ace
-AUX exiv2-0.27.1-private-libs.patch 2588 BLAKE2B 1e1ea40271eb79a21d385172783ee8261e46c514884afc38ec3554ae1df35ab5eb29a171fe5cc80a83a2452ed8297cc99e26b99a57959ed9efe8b6e3857a1844 SHA512 ad09ad26dc28c12e711226dee774105ab72e23d4a27e6437e96b1da89e7741ea4ab89a48f75421587b329ce04ab0cc7d7d9d87304a1e46f40b886bc046778460
-AUX exiv2-0.27.1-restore-0.25-behaviour.patch 5405 BLAKE2B 00f857ec133a9a1276a98912c2ed10b651ba124666bf775192e4cde2fcc956261c4c8472f9d90baf6559716b18213207dc3e4e782cce3498b95abc5c74db20e8 SHA512 6351198645a5d6e3abe31bc8da85609cec16549d125e6b649c36b2632c4321bc6236f694158e5bdb85c08681a54f5d99eb86a51182cf4da7c83583e3b0ba434e
-AUX exiv2-0.27.1-system-cmakemoduledir1.patch 1649 BLAKE2B 1700401c777ce591329a26b410228373638cc76221eb965123a502862cdf8161973692c0d35365e341dd8f7b6cafc710f6c0cc37996e65f64fd06f9a0d2e4e4e SHA512 8361c1f9ac569b7fdceaa292c6fc218169a70c92878afcde60a78a71864e663f7041b5658243d6b2c724ed07e42dd40741537244b20f4f79a0868aae1781dd9b
-AUX exiv2-0.27.1-system-cmakemoduledir2.patch 1084 BLAKE2B 94cda846a2bb13d185e8b8357727030d4bee694d4d0662b08569dee6e9544fafdcedd7ba1c4dea0d46684e7188ac1d95770a22def1a9439663024884ae6c034c SHA512 033b72113ddefcadd86412367c61244406e32a38d8aa93f98cdac6b10e7bfb05a551d5360a76ebcec310ff0e09a342c86d705f2310ebd008949dacf9fa4f9f3e
-AUX exiv2-0.27.1-system-libssh-config.patch 2923 BLAKE2B c4a57cb7c22cc477c7919606380743b19521161db8c85d046c68f8f4f8f62f79b4a6b253fe524f5bec09bfd53994efe5c7984d88ab8d750ba017209fad72fed9 SHA512 7b79f69d198017201a3034c5c1729dc61a3a8f569904576fd3b3d8527abf4147985c33b14b8cf4ae7a34c5a3513cf5165cf7d21b628084554bef9039d8e0edb1
-DIST exiv2-0.27.0a-Source.tar.gz 27168207 BLAKE2B 3f5c4fbe4f41c1114c0a54433c810ed0fb28ae3fbe8258eb7a02da716b833d62a94725f839accf22600c420ace5cdbead599440d335ff694a4f123820613ecd9 SHA512 9873d6815c2a87b7cdc49e8863f72c713fe1054f2f46d2c9aaa7ca2cd42096a36c2970e6a396af9000faba32fa9ff054b9d2c5e22f3e2624669440e553239f9c
-DIST exiv2-0.27.1-Source.tar.gz 27210365 BLAKE2B 1ce9a0b26c0908b876e35b5488fc5680789eb864376b379d9bd57977d456a5c6dc5983c4a8ef3e3558ffc061c0b7cda1d1f89a1629af920de1747fd4afbdbb39 SHA512 038b51241f5bfb323eb298695b5397a7d88d5c7d7303828e5e20b3f82c3df2615cee3e7e3426ea17438ca05d5abea10984cfd41f0649ddab72df1d1415bf3529
-EBUILD exiv2-0.27.0-r2.ebuild 2540 BLAKE2B e7ff66cc180f3193b3544a80d22d3777f52c85c85d806a11aedbcedc91e9f9aa9bedada3b29da9a144fe82d48b5299c7c3c9e05af73b8b79cb648e2c19a58b9c SHA512 8446f72fe52c578742200d1ec9487b6d9981f32dce5f96ff17c0ca37b517e8f6d856b23c98d8c7f79816c697d57c5ee67d4a4f3ea087198573840f2d3a55fbc9
-EBUILD exiv2-0.27.1-r1.ebuild 2651 BLAKE2B 4160e44705636e43a586f4c21c9903086078f8177485c37fd9701ed021c5cbacf6401f1b31ea59b9b0b810eac5a242ab0976427e28c2a025f3cbdef2b0247695 SHA512 fb6b22d9e6df2d759bb3da65e1dc9c0b7dea33a14a74608f033071cbb5a01639643f4437c4c312a974093a62df119622cdf53b3f6a225d46f2b464e1e28c40b1
+DIST exiv2-0.27.2-Source.tar.gz 27591236 BLAKE2B bd10d71356e4c8a465b71f8ceac07fbf2fd6cfb287cb22774568ad35eb38200be504e297224920af50a15ab4e9da98384ff4da7c33713f5346b33738380698b0 SHA512 39eb7d920dce18b275ac66f4766c7c73f7c72ee10e3e1e43d84c611b24f48ce20a70eac6d53948914e93242a25b8b52cc4bc760ee611ddcd77481306c1f9e721
+EBUILD exiv2-0.27.2.ebuild 2441 BLAKE2B 9a856017ab543f6b2792ebb8bb1e633954c2db0197f19065999bf9b0dbbc1b8d845fe69845fa67e339662203e8dd53f9a1866d7b42262fe6f61629dd0c257f3a SHA512 4fcc8ae7c8ee1fa0359483d0ad3a701b519acbd8511bcd81af916bce9b6a68b3cb26900d52cd0ef87628aaa145091968746b0f08211f704b69bb871b3a12110a
 MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5
diff --git a/media-gfx/exiv2/exiv2-0.27.1-r1.ebuild b/media-gfx/exiv2/exiv2-0.27.1-r1.ebuild
deleted file mode 100644
index 8ffcb2c29e98..000000000000
--- a/media-gfx/exiv2/exiv2-0.27.1-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
-	inherit git-r3
-else
-	SRC_URI="https://exiv2.org/builds/${P}-Source.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-fi
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
-HOMEPAGE="https://www.exiv2.org/"
-
-LICENSE="GPL-2"
-SLOT="0/27"
-IUSE="doc examples nls +png webready +xmp"
-
-BDEPEND="
-	doc? (
-		${PYTHON_DEPS}
-		app-doc/doxygen
-		dev-libs/libxslt
-		media-gfx/graphviz
-		virtual/pkgconfig
-	)
-	nls? ( sys-devel/gettext )
-"
-DEPEND="
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	png? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-	webready? (
-		net-libs/libssh[${MULTILIB_USEDEP}]
-		net-misc/curl[${MULTILIB_USEDEP}]
-	)
-	xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md doc/ChangeLog doc/cmd.txt )
-
-S="${S}-Source"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-system-cmakemoduledir{1,2}.patch
-	"${FILESDIR}"/${P}-private-libs.patch
-	"${FILESDIR}"/${P}-restore-0.25-behaviour.patch
-	"${FILESDIR}"/${P}-system-libssh-config.patch
-)
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# FIXME @upstream:
-	einfo "Converting doc/cmd.txt to UTF-8"
-	iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
-	mv -f doc/cmd.txt.tmp doc/cmd.txt || die
-
-	cmake-utils_src_prepare
-
-	sed -e "/^include.*compilerFlags/s/^/#DONT /" -i CMakeLists.txt || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DEXIV2_BUILD_SAMPLES=NO
-		-DEXIV2_BUILD_PO=$(usex nls)
-		-DEXIV2_ENABLE_NLS=$(usex nls)
-		-DEXIV2_ENABLE_PNG=$(usex png)
-		-DEXIV2_ENABLE_CURL=$(usex webready)
-		-DEXIV2_ENABLE_SSH=$(usex webready)
-		-DEXIV2_ENABLE_WEBREADY=$(usex webready)
-		-DEXIV2_ENABLE_XMP=$(usex xmp)
-		$(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO)
-		$(multilib_is_native_abi && echo -DEXIV2_BUILD_DOC=$(usex doc))
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	if multilib_is_native_abi; then
-		use doc && eninja doc
-	fi
-}
-
-multilib_src_install_all() {
-	use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
-
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc samples/*.cpp
-	fi
-}
diff --git a/media-gfx/exiv2/exiv2-0.27.0-r2.ebuild b/media-gfx/exiv2/exiv2-0.27.2.ebuild
index 7e01fd86c671..ce61026aa726 100644
--- a/media-gfx/exiv2/exiv2-0.27.0-r2.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.2.ebuild
@@ -7,7 +7,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
 	inherit git-r3
 else
-	SRC_URI="http://exiv2.dyndns.org/builds/${P}a-Source.tar.gz"
+	SRC_URI="https://exiv2.org/builds/${P}-Source.tar.gz"
 	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 fi
 
@@ -21,17 +21,7 @@ LICENSE="GPL-2"
 SLOT="0/27"
 IUSE="doc examples nls +png webready +xmp"
 
-RDEPEND="
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	png? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-	webready? (
-		net-libs/libssh[${MULTILIB_USEDEP}]
-		net-misc/curl[${MULTILIB_USEDEP}]
-	)
-	xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
+BDEPEND="
 	doc? (
 		${PYTHON_DEPS}
 		app-doc/doxygen
@@ -41,17 +31,22 @@ DEPEND="${RDEPEND}
 	)
 	nls? ( sys-devel/gettext )
 "
+DEPEND="
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+	png? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	webready? (
+		net-libs/libssh[${MULTILIB_USEDEP}]
+		net-misc/curl[${MULTILIB_USEDEP}]
+	)
+	xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
 
 DOCS=( README.md doc/ChangeLog doc/cmd.txt )
 
 S="${S}-Source"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-png-broken-icc-profile.patch # pending upstream
-	"${FILESDIR}"/${P}-fix-pkgconfig.patch # bug 675240
-	"${FILESDIR}"/${P}-doc.patch # bug 675740
-)
-
 pkg_setup() {
 	use doc && python-any-r1_pkg_setup
 }
@@ -63,6 +58,8 @@ src_prepare() {
 	mv -f doc/cmd.txt.tmp doc/cmd.txt || die
 
 	cmake-utils_src_prepare
+
+	sed -e "/^include.*compilerFlags/s/^/#DONT /" -i CMakeLists.txt || die
 }
 
 multilib_src_configure() {
@@ -77,7 +74,7 @@ multilib_src_configure() {
 		-DEXIV2_ENABLE_XMP=$(usex xmp)
 		$(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO)
 		$(multilib_is_native_abi && echo -DEXIV2_BUILD_DOC=$(usex doc))
-		-DCMAKE_INSTALL_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
 	)
 
 	cmake-utils_src_configure
diff --git a/media-gfx/exiv2/files/exiv2-0.27.1-private-libs.patch b/media-gfx/exiv2/files/exiv2-0.27.1-private-libs.patch
deleted file mode 100644
index c99a19098ae5..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.27.1-private-libs.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From f05d100579effd7459fd0715b26239d4cd2c9bcc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com>
-Date: Sat, 4 May 2019 16:14:15 +0200
-Subject: [PATCH] CURL lib and include directories private for exiv2lib
-
-(cherry picked from commit 5d64a0b11c5a45dd9d58c56e946301f3f98942a7)
----
- samples/CMakeLists.txt | 14 ++++++++++++++
- src/CMakeLists.txt     | 10 +++++-----
- 2 files changed, 19 insertions(+), 5 deletions(-)
-
-diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
-index a82403e3b..c3f4722df 100644
---- a/samples/CMakeLists.txt
-+++ b/samples/CMakeLists.txt
-@@ -96,6 +96,20 @@ endif()
- add_executable(conntest conntest.cpp)
- list(APPEND APPLICATIONS conntest)
- 
-+if (EXIV2_ENABLE_WEBREADY)
-+    if( EXIV2_ENABLE_CURL )
-+        target_include_directories(conntest SYSTEM PRIVATE ${CURL_INCLUDE_DIR} )
-+        target_link_libraries(conntest PRIVATE ${CURL_LIBRARIES})
-+        if (USING_CONAN)
-+            target_compile_definitions(conntest PRIVATE ${CONAN_COMPILE_DEFINITIONS_LIBCURL})
-+            target_link_libraries(conntest PRIVATE ${CONAN_EXE_LINKER_FLAGS_LIBCURL})
-+            if (NOT APPLE)
-+                target_link_libraries(conntest PRIVATE CONAN_PKG::OpenSSL)
-+            endif()
-+        endif()
-+    endif()
-+endif()
-+
- # ******************************************************************************
- # remotetest application
- add_executable(remotetest remotetest.cpp)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 976327775..d0e989d26 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -179,13 +179,13 @@ if (EXIV2_ENABLE_WEBREADY)
-     endif()
- 
-     if( EXIV2_ENABLE_CURL )
--        target_include_directories(exiv2lib SYSTEM PUBLIC ${CURL_INCLUDE_DIR} )
--        target_link_libraries(exiv2lib PUBLIC ${CURL_LIBRARIES})
-+        target_include_directories(exiv2lib SYSTEM PRIVATE ${CURL_INCLUDE_DIR} )
-+        target_link_libraries(exiv2lib PRIVATE ${CURL_LIBRARIES})
-         if (USING_CONAN)
--            target_compile_definitions(exiv2lib PUBLIC ${CONAN_COMPILE_DEFINITIONS_LIBCURL})
--            target_link_libraries(exiv2lib PUBLIC ${CONAN_EXE_LINKER_FLAGS_LIBCURL})
-+            target_compile_definitions(exiv2lib PRIVATE ${CONAN_COMPILE_DEFINITIONS_LIBCURL})
-+            target_link_libraries(exiv2lib PRIVATE ${CONAN_EXE_LINKER_FLAGS_LIBCURL})
-             if (NOT APPLE)
--                target_link_libraries(exiv2lib PUBLIC CONAN_PKG::OpenSSL)
-+                target_link_libraries(exiv2lib PRIVATE CONAN_PKG::OpenSSL)
-             endif()
-         endif()
-     endif()
diff --git a/media-gfx/exiv2/files/exiv2-0.27.1-restore-0.25-behaviour.patch b/media-gfx/exiv2/files/exiv2-0.27.1-restore-0.25-behaviour.patch
deleted file mode 100644
index 2aa4d3a826f3..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.27.1-restore-0.25-behaviour.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From db870755b928cca7411a092ce12292afe9c4fa36 Mon Sep 17 00:00:00 2001
-From: clanmills <robin@clanmills.com>
-Date: Thu, 9 May 2019 11:26:29 +0100
-Subject: [PATCH] fix #818.  Restore 0.25 behaviour of `$ exiv2 -g image ...`
- to apply grep to keys.
-
----
- src/actions.cpp                         |  2 +-
- src/exiv2.1                             | 50 +++++++++++++++++--------
- tests/bugfixes/github/test_issue_818.py | 32 ++++++++++++++++
- 3 files changed, 67 insertions(+), 17 deletions(-)
- create mode 100644 tests/bugfixes/github/test_issue_818.py
-
-diff --git a/src/actions.cpp b/src/actions.cpp
-index 34a7a80d5..68260186d 100644
---- a/src/actions.cpp
-+++ b/src/actions.cpp
-@@ -243,7 +243,7 @@ namespace Action {
-             int rc = 0;
-             Exiv2::PrintStructureOption option = Exiv2::kpsNone ;
-             switch (Params::instance().printMode_) {
--                case Params::pmSummary:   rc = printSummary();     break;
-+                case Params::pmSummary:   rc = Params::instance().greps_.empty() ? printSummary() : printList(); break;
-                 case Params::pmList:      rc = printList();        break;
-                 case Params::pmComment:   rc = printComment();     break;
-                 case Params::pmPreview:   rc = printPreviewList(); break;
-diff --git a/src/exiv2.1 b/src/exiv2.1
-index 4f6f3b51b..048f09af7 100644
---- a/src/exiv2.1
-+++ b/src/exiv2.1
-@@ -2,7 +2,7 @@
- .\" First parameter, NAME, should be all caps
- .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
- .\" other parameters are allowed: see man(7), man(1)
--.TH EXIV2 1 "Apr 25, 2019"
-+.TH EXIV2 1 "May 8, 2019"
- .\" Please adjust this date whenever revising the manpage.
- .\"
- .\" Some roff macros, for reference:
-@@ -222,19 +222,30 @@ Show unknown tags (default is to suppress tags which don't have a name).
- Only keys which match the given key (grep).
- .br
- Multiple \fB\-g\fP options
--can be used to grep info for several keys. Example:
-+can be used to filter info to less keys. Example:
- exiv2 -v -V -g webready -g time.
-+The default exiv2 command prints a "summary report" which is quite short.  When you use -g without a -pmod option, you do not get a summary report and in effect you get -g pattern -pa image ...
- 
- .nf
--exiv2 \-g Date \-pt R.jpg
--Exif.Image.DateTime           Ascii      20  2012:08:07 16:01:05
--Exif.Photo.DateTimeOriginal   Ascii      20  2011:09:18 16:25:48
--Exif.Photo.DateTimeDigitized  Ascii      20  2011:09:18 16:25:48
-+$ bin/exiv2 -g Date http://clanmills.com/Stonehenge.jpg
-+Exif.Image.DateTime                 Ascii    20  2015:07:16 20:25:28
-+Exif.Photo.DateTimeOriginal         Ascii    20  2015:07:16 15:38:54
-+Exif.Photo.DateTimeDigitized        Ascii    20  2015:07:16 15:38:54
-+Exif.NikonWt.DateDisplayFormat      Byte      1  Y/M/D
-+Exif.GPSInfo.GPSDateStamp           Ascii    11  2015:07:16
-+Xmp.xmp.ModifyDate                  XmpText  25  2015-07-16T20:25:28+01:00
- 
- .fi
---g (--grep) is only applied to keys.  It is not generally applied to all output such as the default -ps report.
-+You may use -pmod filters to further filter output.  For example:
-+.nf
-+
-+$ bin/exiv2 -px -g Date http://clanmills.com/Stonehenge.jpg
-+Xmp.xmp.ModifyDate                           XmpText    25  2015-07-16T20:25:28+01:00
- 
--The key may finish with the optional modifier /i to indicated case insensitive.
-+.fi
-+The option -g (--grep) applies to keys and not values.
-+
-+The key may finish with the optional modifier /i to indicate case insensitive.
- .TP
- .B \-K \fIkey\fP
- Only report data for given key.
-@@ -243,8 +254,8 @@ Multiple \fB\-K\fP options can be used to report more than a single key.
- 
- .nf
- exiv2 \-K Exif.Photo.DateTimeDigitized -K Exif.Photo.DateTimeOriginal \-pt R.jpg
--Exif.Photo.DateTimeOriginal   Ascii      20  2011:09:18 16:25:48
--Exif.Photo.DateTimeDigitized  Ascii      20  2011:09:18 16:25:48
-+Exif.Photo.DateTimeOriginal   Ascii    20  2011:09:18 16:25:48
-+Exif.Photo.DateTimeDigitized  Ascii    20  2011:09:18 16:25:48
- .fi
- .TP
- .B \-n \fIenc\fP
-@@ -594,17 +605,24 @@ You obtain the lensID for your camera with the command:
- .nf
- .sp 1
- $ exiv2 -pv --grep lens/i http://clanmills.com/Stonehenge.jpg
--0x0083 Nikon3       LensType                    Byte        1  14
--0x0084 Nikon3       Lens                        Rational    4  180/10 2500/10 35/10 63/10
--0x008b Nikon3       LensFStops                  Undefined   4  55 1 12 0
--0x000c NikonLd3     LensIDNumber                Byte        1  146 <--- This number
--0x000d NikonLd3     LensFStops                  Byte        1  55
-+0x0083 Nikon3       LensType           Byte       1  14
-+0x0084 Nikon3       Lens               Rational   4  180/10 2500/10 35/10 63/10
-+0x008b Nikon3       LensFStops         Undefined  4  55 1 12 0
-+0x000c NikonLd3     LensIDNumber       Byte       1  146 <--- This number
-+0x000d NikonLd3     LensFStops         Byte       1  55
- .br
- .ne 40
- .SH EXAMPLES
- .TP
- exiv2 *.jpg
--Prints a summary of the Exif information for all JPEG files in the directory.
-+Prints a summary of the Exif information for all JPEG files in the directory.  The summary report is rather brief and presentation does not use the Family.Group.Tag convention.
-+
-+If you use --grep pattern, the default becomes -pa.  See -g/grep above.
-+
-+.nf
-+$ exiv2 -g Date http://clanmills.com/Stonehenge.jpg
-+
-+.fi
- .TP
- exiv2 \-pi image.jpg
- Prints the IPTC metadata of the image.
diff --git a/media-gfx/exiv2/files/exiv2-0.27.1-system-cmakemoduledir1.patch b/media-gfx/exiv2/files/exiv2-0.27.1-system-cmakemoduledir1.patch
deleted file mode 100644
index 77a68437502e..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.27.1-system-cmakemoduledir1.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 78676b2a025023ab3de2d094e0798ed64ef7df97 Mon Sep 17 00:00:00 2001
-From: Robin Mills <robin@clanmills.com>
-Date: Sat, 27 Apr 2019 11:18:22 +0100
-Subject: [PATCH] Fix #798
-
----
- README.md                      |  2 +-
- releasenotes/CYGWIN/ReadMe.txt | 17 +----------------
- releasenotes/Darwin/ReadMe.txt |  6 ++----
- releasenotes/Linux/ReadMe.txt  |  2 +-
- releasenotes/MinGW/ReadMe.txt  |  2 +-
- releasenotes/msvc/ReadMe.txt   |  2 +-
- src/CMakeLists.txt             |  2 +-
- 7 files changed, 8 insertions(+), 25 deletions(-)
-
-diff --git a/README.md b/README.md
-index 6e9f50a94..92cca39e6 100644
---- a/README.md
-+++ b/README.md
-@@ -189,7 +189,7 @@ project(exifprint VERSION 0.0.1 LANGUAGES CXX)
- set(CMAKE_CXX_STANDARD 11)
- set(CMAKE_CXX_EXTENSIONS OFF)
- 
--find_package(exiv2 REQUIRED CONFIG NAMES exiv2)    # search ${CMAKE_INSTALL_PREFIX}/lib/exiv2/cmake/
-+find_package(exiv2 REQUIRED CONFIG NAMES exiv2)    # search ${CMAKE_INSTALL_PREFIX}/lib/cmake/exiv2
- add_executable(exifprint ../samples/exifprint.cpp) # compile this
- target_link_libraries(exifprint exiv2lib)          # link exiv2lib
- 
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 340870048..976327775 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -239,7 +239,7 @@ install(FILES
-     ${CMAKE_BINARY_DIR}/exiv2lib_export.h
-     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/exiv2)
- 
--install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake")
-+install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2")
- 
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake")
- 
diff --git a/media-gfx/exiv2/files/exiv2-0.27.1-system-cmakemoduledir2.patch b/media-gfx/exiv2/files/exiv2-0.27.1-system-cmakemoduledir2.patch
deleted file mode 100644
index 1770449564a2..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.27.1-system-cmakemoduledir2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 6819f2ac456c57291f94cc1f4db13ce134eed468 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 23 Jun 2019 19:32:29 +0200
-Subject: [PATCH] Fix install path of exiv2ConfigVersion.cmake
-
-This seems to have been caused by duplicate work between master branch
-and 0.27-maintenance branch, as commit 3b48249eeb350301dfb3efa3ba6f7d7b162455be
-had already got that right.
----
- src/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 1d0ccee4..05ce4e14 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -245,7 +245,7 @@ install(FILES
- 
- install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2")
- 
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake")
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2")
- 
- # ******************************************************************************
- # exiv2 application
--- 
-2.22.0
-
diff --git a/media-gfx/exiv2/files/exiv2-0.27.1-system-libssh-config.patch b/media-gfx/exiv2/files/exiv2-0.27.1-system-libssh-config.patch
deleted file mode 100644
index 555314ae9329..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.27.1-system-libssh-config.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From e85ce17fc91e11eff26c6f5a89125505b7db5fd3 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 23 Jun 2019 19:50:01 +0200
-Subject: [PATCH 1/2] Switch to libssh's own libssh-config.cmake
-
-This is provided by libssh since 2013.
----
- cmake/findDependencies.cmake | 2 +-
- src/CMakeLists.txt           | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake
-index 12d47525..52760185 100644
---- a/cmake/findDependencies.cmake
-+++ b/cmake/findDependencies.cmake
-@@ -20,7 +20,7 @@ if( EXIV2_ENABLE_WEBREADY )
-     endif()
- 
-     if( EXIV2_ENABLE_SSH )
--        find_package( SSH REQUIRED)
-+        find_package(libssh CONFIG REQUIRED)
-     endif( )
- endif( )
- 
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 1d0ccee4..b532fc7b 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -174,8 +174,8 @@ target_include_directories(exiv2lib_int PUBLIC
- if (EXIV2_ENABLE_WEBREADY)
- 
-     if( EXIV2_ENABLE_SSH )
--        target_include_directories(exiv2lib SYSTEM PUBLIC ${SSH_INCLUDE_DIR} )
--        target_link_libraries( exiv2lib PUBLIC ${SSH_LIBRARIES})
-+        target_include_directories(exiv2lib SYSTEM PUBLIC ${LIBSSH_INCLUDE_DIR})
-+        target_link_libraries(exiv2lib PUBLIC ${LIBSSH_LIBRARIES})
-     endif()
- 
-     if( EXIV2_ENABLE_CURL )
--- 
-2.22.0
-
-
-From 89d8160a410c2c526ad021fd456accc709cae520 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 23 Jun 2019 19:50:44 +0200
-Subject: [PATCH 2/2] Drop now obsolete FindSSH.cmake
-
----
- cmake/FindSSH.cmake | 31 -------------------------------
- 1 file changed, 31 deletions(-)
- delete mode 100644 cmake/FindSSH.cmake
-
-diff --git a/cmake/FindSSH.cmake b/cmake/FindSSH.cmake
-deleted file mode 100644
-index 2a6fa378..00000000
---- a/cmake/FindSSH.cmake
-+++ /dev/null
-@@ -1,31 +0,0 @@
--# - Find libssh
--# Find the native SSH headers and libraries.
--#
--#  SSH_INCLUDE_DIRS - where to find libssh.h, etc.
--#  SSH_LIBRARIES    - List of libraries when using libssh.
--#  SSH_FOUND        - True if libssh found.
--#
--# Redistribution and use is allowed according to the terms of the BSD license.
--# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
--
--# Look for the header file.
--FIND_PATH(SSH_INCLUDE_DIR NAMES libssh/libssh.h)
--
--# Look for the library.
--FIND_LIBRARY(SSH_LIBRARY NAMES ssh libssh)
--
--# handle the QUIETLY and REQUIRED arguments and set SSH_FOUND to TRUE if 
--# all listed variables are TRUE
--INCLUDE(FindPackageHandleStandardArgs)
--FIND_PACKAGE_HANDLE_STANDARD_ARGS(SSH DEFAULT_MSG SSH_LIBRARY SSH_INCLUDE_DIR)
--
--# Copy the results to the output variables.
--IF(SSH_FOUND)
--  SET(SSH_LIBRARIES ${SSH_LIBRARY})
--  SET(SSH_INCLUDE_DIRS ${SSH_INCLUDE_DIR})
--ELSE(SSH_FOUND)
--  SET(SSH_LIBRARIES)
--  SET(SSH_INCLUDE_DIRS)
--ENDIF(SSH_FOUND)
--
--MARK_AS_ADVANCED(SSH_INCLUDE_DIR SSH_LIBRARY)
--- 
-2.22.0
-
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index ed385d371ebd..a31f41a92635 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -2,8 +2,10 @@ AUX feh-2.6.2-debug-cflags.patch 197 BLAKE2B a5a9b2c2ac22869401303706b92a10474d0
 AUX feh-3.2-debug-cflags.patch 193 BLAKE2B 298f65a8f9142167d1cd2cfce0bc61ad9d7d4a5519ab8e78d1259ea60b5566376f8d9ddba660db65ef5e229bdc0ff254d9aab2284d8929ea0ac171da44f8c44d SHA512 336d23b767c5c3da9b94a1e6759129c242caf70a611b2410816a562d90720e3abab6a3444ce06975d62b4ebbe8e54c70942800516c7575cc6d5e13ce69679884
 DIST feh-3.1.1.tar.bz2 2109534 BLAKE2B ea02ab09791ef61a9ac5db84b5a0f69ddc76f994343660cf4072a41769a59ddd2936e0f047eeed26be0b3676711b1e440c0483325e6bb621205788ebe13c1fca SHA512 cbdf6e36831a750a6bdb9f1a5735c814662b5274d9c453392de88b98926b539cc54e2041fc0cd2a393762f14ec24b81435de6d506d9efc1ee4c7d80105aa6243
 DIST feh-3.1.3.tar.bz2 2110285 BLAKE2B ee42b766eccf7e4661a47bd6c748b2e0cc6345fb9c08de425b0f4ef87c7fb383dd20140fb2c8b2fc540b70a6c01bb612b48aa76fc1f47a117f2503257bf3b403 SHA512 dc4960706e4134bbe6c34036a9c9b7cd98eb8935e13e2354504664a1599d4af193c6b977433a40c7e3638b2b3e2928960e0c755b04f7c48076ef15445f792583
+DIST feh-3.2.1.tar.bz2 2112281 BLAKE2B 2918d2714f0557e1b67284709bce22c5e14d8f7f545ca33c16ec7928273edf18c9be48a685c3e9a032170bf2b7e572a4b78664f37b2a16c5ae5829b3cc55ca76 SHA512 11a136990f7d02409501f10553659c64ad5d18d4bfaa4e5cfdeb7a2f53ffdb8bd9b8347796c65e75c49615ac4c12bc81bf3a58325f778cb5e0c1608181d7b53a
 DIST feh-3.2.tar.bz2 2111743 BLAKE2B 2fd9838845bb86cc17d99650ac595c2b9f573be30d6ea86512a37a2f0439b10d6fe0b6bc028b81d03219530db2c0c58b1e6642834c32a621b191a310d53c7499 SHA512 f87d07edb9aa098a6c71b37306c42fdfe2b9cdb8cafcd72dd04f82b5a79da47c4e55979a0a8365fe22681f857215120009c84cde34b6f36e599522a2c4af6f70
 EBUILD feh-3.1.1.ebuild 1497 BLAKE2B f6e2659966cface0e1f154b219101caf560c075699545d52611e5c5f4f49fa8caafe9b96a06e7a8b06712cf5023feef0433fea82c377a08b737c41fb70dded2d SHA512 73681572193a12dfdb2c7bbb8bd99a29ebfda1ef01be4664ca7664afa00e8633ddaeb0a7929859882f9c0f8cf8a10b09c40efcd0fa9fdb1b877d49e4acdd18e9
 EBUILD feh-3.1.3.ebuild 1501 BLAKE2B 1e2bfdded6414e79a76ba2365246e9baf5d525b999e0a3f61a692b1724b3d2455567e924b6c2c675519c78d1ad3845479429e149328140854f02d78f9d9d9932 SHA512 702a19de9be1bb591d2daadd4285bd9a942de5ebda401de2f62ca03984ee0f68bc437689b405c35aa405e641638e98ef8c9d765b6f8c107a7e19d9c2181bc764
+EBUILD feh-3.2.1.ebuild 1499 BLAKE2B 489e7f623f23880664087c68d4b25eb5e9b4330074e64c30a2f01e2964aa36e4deb3f5ef1004665efb0f3e70340822ffac01a62732cf938a3595b33722bf8007 SHA512 9cf8fdc24b77d0d4b12ef3747d832c2d845c96bf66e0de6c452b315f81c99985ae1f12d6f1f8f1bcf96c9a36cac0549e9cbd642b34450d7196331a6160919b52
 EBUILD feh-3.2.ebuild 1494 BLAKE2B af02b7ba7319db9101fd13ed9e3bf797b11aff36591802cd7a3bf3a6f32b728ed392d6e9ae579a2f7e0fec94709e6ba0da9885c205ef56610b8e0cab070a22d9 SHA512 17ec2bf6d4ae373e9dcf32d2235e2cd3d5149c9e363c71da207c27076073d9f8c6140f8b0538165e96d9cd7cc284fb012c3047a4902e5349af9fdf2e45104d41
 MISC metadata.xml 358 BLAKE2B 602fb8b872f5f209abd20adbb141035c0d0396a7712839c950cfa19e78201c0c39e88fa5e8bebc6224459bb8e328e732ff30db848f6c84510f91830951f2087c SHA512 51fad9cc41f31b03f42e0ac4254ea05a848df755091cdd47ee4ce73f7189acd83e8956c230329ea0053d1f794b529e498525f6ce282a947c9809c4954a5b9a19
diff --git a/media-gfx/feh/feh-3.2.1.ebuild b/media-gfx/feh/feh-3.2.1.ebuild
new file mode 100644
index 000000000000..c7cdfa51f1d6
--- /dev/null
+++ b/media-gfx/feh/feh-3.2.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs gnome2-utils xdg-utils
+
+DESCRIPTION="A fast, lightweight imageviewer using imlib2"
+HOMEPAGE="https://feh.finalrewind.org/"
+SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
+
+LICENSE="feh"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug curl exif test xinerama"
+
+COMMON_DEPEND="media-libs/imlib2[X]
+	>=media-libs/libpng-1.2:0=
+	x11-libs/libX11
+	curl? ( net-misc/curl )
+	exif? ( media-libs/libexif )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+	virtual/jpeg:0"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXt
+	test? (
+		>=dev-lang/perl-5.10
+		dev-perl/Test-Command
+		media-libs/imlib2[gif,jpeg,png]
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch )
+
+pkg_setup() {
+	use_feh() { usex $1 1 0; }
+
+	fehopts=(
+		DESTDIR="${D}"
+		PREFIX="${EPREFIX}"/usr
+		doc_dir='${main_dir}'/share/doc/${PF}
+		example_dir='${main_dir}'/share/doc/${PF}/examples
+		curl=$(use_feh curl)
+		debug=$(use_feh debug)
+		xinerama=$(use_feh xinerama)
+		exif=$(use_feh exif)
+	)
+}
+
+src_compile() {
+	tc-export CC
+	emake "${fehopts[@]}"
+}
+
+src_install() {
+	emake "${fehopts[@]}" install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 95b87a9f6397..e488afff7d1e 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,5 +1,7 @@
 AUX geeqie-1.4-exiv2-0.27.patch 2052 BLAKE2B db7bb4d2631d566e4c9dbc89cad262cfb173df96b92ea83a690bdcdbbb7d3c873e9e5bd5a581c45b3a4af42c3c7711c65080e1822eaa31be97632b57d4e34713 SHA512 b8108f9a77022f1a0d1354883d1f7a1981a8079e675e765aa67fac16606ed42ecc169ad5cb8a6baf86e919d6ddf018ed54bf5950b9601d2cd1ff647f7fa47bca
 DIST geeqie-1.4.tar.xz 35881152 BLAKE2B 2932ac379abaee2b742b66daff544f29d7bf0aac82ff97f92e10ac7902ad874badcbb143f562c665d94f6297331090d0746373979a745f338a738078b72538a4 SHA512 a88b6dcf30847e38c109f5bc6436d93f6b4e1336a094c6b8a45db117830117120bf58f390afcd8a4b7aaf2934f995c3f75ac33a7faf56bfc2bcc9bd4eebfb205
+DIST geeqie-1.5.tar.xz 1585780 BLAKE2B 6dc0a30c26f25988cbd3fa81a916642504e9f6f280b03d78c820cbf5b453d8a392d3c8da8d482de24b3c39e7e9ba0663879d651c60a8061b8034d2c526007944 SHA512 2b87d543d8d77a4fec331fd1b73ca2038912362fc1f94c9b0f163dcc7c2dd58118e175c5540aecafb0581708ea5c2a5a321dde09f644e2322bd4ca5c0284b722
 EBUILD geeqie-1.4-r1.ebuild 2396 BLAKE2B 4fe4b8aee881eb138f5b8bf2a7199c18858d45586220c549173d13d8ab5e200b143e8aca3ab623bb9e507419d6b5e5027c63a47d72d4606355a3e9adc03381ea SHA512 5b4b13476620aeee811cd06f357c2fc49a1e732f68a0508715ba113b02688440738edb4799f53adf2a79c713e22c3ed19ef376981b2aed9be884bedd70880bf0
+EBUILD geeqie-1.5.ebuild 2277 BLAKE2B da3871fd0cf5af559c1443bb711c2b4a2b78402c4b7b1310930dafdeb41775adfee11862471bbb829531901d5f0bc518de56933880507d6de1aebf713163e2f4 SHA512 b1106f2714c659432ccf384671bd15a0f39cf5bd5d1a883088a15f0bac57ca2749184ed795103d21e6ff48e45818c6330b91702724deb37cb06033cd36f8c87b
 EBUILD geeqie-9999.ebuild 2269 BLAKE2B 719319e9805f58a4f1dfaea869c911f1ade15e762ba46add49975f17b38a6e3909b74e0db223082c06ae55c0aa655389ab5a10e75d4d1dc85552e55105fe29d0 SHA512 8435b9882a9a767af7592bfb59e32d47f0f01e932eac23f920bf0933ae1ae3044302205dd6902fe490c6f995d669b1eaf62b141cc66538444bd5d57d39d896b4
 MISC metadata.xml 923 BLAKE2B 49de6dd7b0380b1cc74ccabbc8f84e2c55144b80612e04c4e55c82d052027882cc293a70a52f857bded73246ccbb5351df53dc1e1e08b8c2c08e630bc24f9882 SHA512 752280a5fefc097c5ca8b1fc2e9f05220aa809e45484560edca7baa68d95b0d91fa14973c321aefcdb76052dc02e405e2fb4a32e6322f04cd8223afaa6734d58
diff --git a/media-gfx/geeqie/geeqie-1.5.ebuild b/media-gfx/geeqie/geeqie-1.5.ebuild
new file mode 100644
index 000000000000..5323596a4a94
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-1.5.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg-utils
+
+DESCRIPTION="A lightweight GTK image viewer forked from GQview"
+HOMEPAGE="http://www.geeqie.org"
+SRC_URI="http://www.geeqie.org/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map nls pdf tiff xmp"
+
+RDEPEND="
+	virtual/libintl
+	doc? ( app-text/gnome-doc-utils )
+	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
+	gpu-accel? ( media-libs/clutter-gtk )
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( x11-libs/gtk+:2 )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	lirc? ( app-misc/lirc )
+	lua? ( >=dev-lang/lua-5.1:= )
+	map? ( media-libs/libchamplain:0.12 )
+	pdf? ( >=app-text/poppler-0.62[cairo] )
+	tiff? ( media-libs/tiff:0 )
+	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
+	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+REQUIRED_USE="gpu-accel? ( gtk3 )
+	map? ( gpu-accel )"
+
+src_prepare() {
+	default
+
+	# Remove -Werror (gcc changes may add new warnings)
+	sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="--disable-dependency-tracking
+		--with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable debug debug-log)
+		$(use_enable ffmpegthumbnailer)
+		$(use_enable gpu-accel)
+		$(use_enable gtk3)
+		$(use_enable jpeg)
+		$(use_enable lcms)
+		$(use_enable lua)
+		$(use_enable lirc)
+		$(use_enable map)
+		$(use_enable nls)
+		$(use_enable pdf)
+		$(use_enable tiff)"
+
+	if use exif || use xmp; then
+		myconf="${myconf} --enable-exiv2"
+	else
+		myconf="${myconf} --disable-exiv2"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	rm -f "${D}/usr/share/doc/${PF}/COPYING"
+	# Application needs access to the uncompressed file
+	docompress -x /usr/share/doc/${PF}/README.md
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	elog "Some plugins may require additional packages"
+	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
+	elog "- RAW images plugin: media-gfx/ufraw"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index e11797f283d8..17b51fa580b0 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -16,7 +16,7 @@ DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b755
 DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
 EBUILD gimp-2.10.10-r1.ebuild 6019 BLAKE2B 95f0b465a05852fa14ee4ec2ba24cd9e950a3f8ca177934ad44a557612eb05401c83bb178d76d82993fce4fd4d44ff07ba6c49b67c1474a42a1ead89aa4303e7 SHA512 67daa7288ced9a24f25be60b66774a3a62c9b65625b00b7928a3de80dec36e1bd951614e32c55df47a1f48a7a5997961b435f96a95b0afd17b37e8a3d3ff8f68
 EBUILD gimp-2.10.12.ebuild 6019 BLAKE2B aa9cfa85ba3ac683e7ca56565f15faf6487fc59824ab6d7127b86f10e93277e14fda86aee22cdb81c4f864c0cf8158df13257519f323ab5e96deed817f7b2805 SHA512 43865076a7ce5fe24c732fd95d3e12ca70b712fd0b87a8a96c0377eb73a5ae395b4407c5edfdf69923d9d71ec6db1b3093476ac07d96ef5d6a183787208859ae
-EBUILD gimp-2.10.8-r1.ebuild 6097 BLAKE2B 463588fa18c1769f9b6ef9ece9f52a3fc6b0a09c1dc8fe16d565a7f1d7ff81a4a77af44d4e6c3c1f254461d4f788ed07bcedc0094d1e61dc1962dd34b1d49e9a SHA512 1cfd53bf7073c86ebe7e8104a8192291c04c8c693b4200c92a922bb71cdf2f67ae0953a6ff075574a67813b6ccbc4c96d063bbc0859bf1ae0c1de16cb995ae71
+EBUILD gimp-2.10.8-r1.ebuild 6103 BLAKE2B 6425ca47c627119df035049ad207952a63a73db746d5a0555c039db4005eeb50c43751957eacbf47e75ec7ecd2d76a07194241fff733126bc9c0a13eb9bb94f2 SHA512 ff9dc9525d10911d121e44e8c613497771d74f7f271642f58a8c2381c41aae1ef3dc8430161035f551db1a570ee59859a94ed23816d21f9f5a4f405de0b2844c
 EBUILD gimp-2.8.22-r1.ebuild 5175 BLAKE2B 01d76aae6190f14fdc12ad47a22109610a6622b0ee45e2d00ad352ff2a5e1f5b37ee36f15e6bf270cb842ce7f87ec13e92ce386ac908628115a8453706e95bc2 SHA512 f34e4a3d1e7ae474e07b985e5a0c9162bbdb6beec2e65473e0bb421d188e5fae37fe5a2618b9479511b625e3798f29e500f82d0e392b0b820257ebc542cf281c
 EBUILD gimp-2.9.8-r1.ebuild 5712 BLAKE2B f09f553f5d7eb8e8df0af0a316d2d98e9b0a32a204bb43c563927eae5a6dcb3bb4f5ff882bc05ce6ef3f8914939be6296683c382af45bcab877889042c96bc66 SHA512 7474ecdd5a1c785684b79c0007d77f45e475d7220f74960c48e686e7f6b15d82145b154caa802e2774eb34b46b03c5c4a1fc43a8ebc3716fb5f836be4d412886
 EBUILD gimp-9999.ebuild 6006 BLAKE2B 32d782ef463075d2d38662dfba2b04efc4ca2cffa68daecac66cafd496d7466ee5c16ca0dd6ef23b2907562d2297b55265588773745630810e34baca105f7dae SHA512 662bf161d64551f1ce1727ea7be016cb6bbd4ab354c1b3734c87eb3f18d41255158f68cf17a55094791542ea41b6a05537f4ace9f1ba326e919ff02b827e9479
diff --git a/media-gfx/gimp/gimp-2.10.8-r1.ebuild b/media-gfx/gimp/gimp-2.10.8-r1.ebuild
index f324c16ed1aa..51958b923c8d 100644
--- a/media-gfx/gimp/gimp-2.10.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.8-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 arm64 x86"
 
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
 IUSE="alsa aalib altivec aqua debug doc openexr gnome heif postscript jpeg2k cpu_flags_x86_mmx mng python cpu_flags_x86_sse udev unwind vector-icons webp wmf xpm"
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index 19fbbaf73b3a..742391786214 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -1,7 +1,7 @@
 DIST gscan2pdf-1.8.11.tar.xz 409212 BLAKE2B 37cb716f13818eaffc39c210b810b845368cc5e323569e8f9d5603b5b412c4182520798321358e4c21339fdbd5f15026a0acd6421a49e7db79ecca86633c3ab0 SHA512 1ea09b8768771be4a1700cb8a6523d5f74fcbf0ebe459d97796032b56f896fd0c50e5ca1ed4c96aedef7e61f6952a92986153cc70173dd5ad91ccfb72461c565
-DIST gscan2pdf-2.5.1.tar.xz 440484 BLAKE2B 375434ee633f895da29d69672faa6da5247e6f45e25b7fe1111394c03c2a6a6e482973365733a7d123c2a94ef40d2d7ce8666b5c632a6465f31ef09f237100fa SHA512 677f9081fb4f6ecd064f965399be20802e10f470d40ef00da5afd6de37ed9914c856fe01e28daedf900e8c8bd75a798f1579a7970509fc789382bbe2b1923804
 DIST gscan2pdf-2.5.3.tar.xz 447188 BLAKE2B e34441c4680fbe2a03bafb12c754df143c800ca6aa56c33623ff5e26fc86d08e120794d84c1e33aa25d76498138098249ace4a7f79023fc1ff97372dcf7e76a7 SHA512 d8f798eadc3c2fbc8a1553bbf542f2636861aba793ab61b66449938bbe115d5e765e018f6afdcd7280b34ccadeb77febda924334f35cf5b7459f93f93c58e782
+DIST gscan2pdf-2.5.5.tar.xz 450016 BLAKE2B b5f4da6d4c5076f67a45312d5ec2ee0ac1c5420a97df963c3e03e9651f853e7423ffcc5d7fa22b18398c54cca1e8164e73989b52fac0e628898c2ef4271452c7 SHA512 924987a852fceeb04823cf70af08fa0652b436ebe108e5fba4379e7879277c891f4132e27df72e9ac5edbb5e7e105efc18923df1a80d5a44df48e293765b69c4
 EBUILD gscan2pdf-1.8.11.ebuild 1731 BLAKE2B 0b0f7cdfef98e666e20e44882584e0636e490429186e441d87f965e74071f5076693896e17e68184319dfaf3a1fd4487140209ef3b49603c9496cc936516333d SHA512 b94b73d3396208a8c67c2aad407815329501717c364d60189b21d96f652846e554d59a2a36f4b58383d7f49ab728d4fe251bce9ab1944befb667a9e0c09237b3
-EBUILD gscan2pdf-2.5.1.ebuild 1609 BLAKE2B 0804b57945439bc55cc55d2b73b56cc4a892f9f72555ee74c0f1fe5203e0ac452659e1988dd55e59eee4f1791fd05e2d408b8f4b0ac7a2e77aea3f353ef0ee19 SHA512 7173ce075f21c158db8d964144073028275e6cea2346bf6275c4ca4a34a6e6a59f7da110f71ce988a5e033e92c5f0eedbb4661f2539613111891abd363845bb4
 EBUILD gscan2pdf-2.5.3.ebuild 2240 BLAKE2B 1e7091ea3be2653e55f1dcc27f5303ee63d6054e74b02b1257c85a6b2bdc3ab6e9250a78245f53b987397b3c4dd854cfe0519d4916321199d26c1278992025dc SHA512 1a6ae1f8dc0f7752161b08e5cf1e407a8c7b598263c7f256be160a21aa757d904fbab90ae9280b6ad846a932580a453489c3d0ab9fbfa0f2a777861b8fbf6a98
+EBUILD gscan2pdf-2.5.5.ebuild 2240 BLAKE2B 1e7091ea3be2653e55f1dcc27f5303ee63d6054e74b02b1257c85a6b2bdc3ab6e9250a78245f53b987397b3c4dd854cfe0519d4916321199d26c1278992025dc SHA512 1a6ae1f8dc0f7752161b08e5cf1e407a8c7b598263c7f256be160a21aa757d904fbab90ae9280b6ad846a932580a453489c3d0ab9fbfa0f2a777861b8fbf6a98
 MISC metadata.xml 439 BLAKE2B 835480b0d68a079941e94f2646d0136dfb8a8e750e0279f8a5a2e23e6690242582ffe660798f5e80ebfb4378a576aa5715332b53230555866391a99ec28f54ff SHA512 af1cc05ac693899586df81036d2fa11af187edbb3c9449862298ba05efd0dbd0c4c5b008a1a21328c1f9a27a690671bd7a9967d2e457efb31561044e45984401
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.5.1.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.5.5.ebuild
index d19c0627489d..9c77f58fad76 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.5.1.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.5.5.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=6
 
-inherit eutils perl-module
+DIST_TEST="do"
+
+inherit eutils perl-module virtualx
 
 DESCRIPTION="Scan documents, perform OCR, produce PDFs and DjVus"
 HOMEPAGE="http://gscan2pdf.sourceforge.net/"
@@ -12,9 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-
-# OCR tests fail with tesseract[opencl], not fixed by addpredict
-RESTRICT="test"
+IUSE="test"
 
 RDEPEND="
 	dev-perl/Config-General
@@ -46,6 +46,22 @@ RDEPEND="
 	media-gfx/sane-backends
 	media-libs/tiff"
 
+DEPEND="test? (
+		${RDEPEND}
+		dev-perl/Sub-Override
+		media-libs/fontconfig
+
+		app-text/djvu[tiff]
+		app-text/poppler[utils]
+		app-text/tesseract[-opencl,osd,tiff]
+		app-text/unpaper
+		media-gfx/imagemagick[djvu,png,tiff,perl]
+		media-gfx/sane-backends[sane_backends_test]
+		media-gfx/sane-frontends
+	)"
+
+PERL_RM_FILES=( t/{90_MANIFEST,91_critic,99_pod}.t )
+
 mydoc="History"
 
 pkg_postinst() {
@@ -57,3 +73,15 @@ pkg_postinst() {
 	optfeature "automatic document feeder support" media-gfx/sane-frontends
 	optfeature "sending PDFs as email attachments" x11-misc/xdg-utils
 }
+
+src_test(){
+	local confdir="${HOME}/.config/ImageMagick"
+	mkdir -p "${confdir}" || die
+	cat > "${confdir}/policy.xml" <<-EOT || die
+		<policymap>
+			<policy domain="coder" rights="read|write" pattern="PDF" />
+			<policy domain="coder" rights="read" pattern="PS" />
+		</policymap>
+	EOT
+	virtx perl-module_src_test
+}
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index e60ba2309583..f962f5f8316f 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,10 +1,12 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
 DIST ImageMagick-6.9.10-50.tar.xz 8941584 BLAKE2B dcbbe4b0c25c281168088dd5b62a9d882088b9b57fc4127c6d233b049011ae3ede43e2629734fbd1ae2b21cd13f64690e6f6a3ea81a1e08736fbc1a29a5bccf9 SHA512 f288eb8ce40aafb3d099ae5ec10403902934d02440256ed2012f0b13456b237c3a903f92764b02378c27005fd65ad1251ff1663fce825890721fa93b18ad515d
+DIST ImageMagick-6.9.10-56.tar.xz 8950748 BLAKE2B 5d1b4ad20ec3aa6f89aedf08ac91266be218464cd998ca950623c1a23954968f84b21bfc140c1a1dfdcd68c8420ddcd39f76cd31d3872d43bf631b5782980665 SHA512 e5d1dd4da8b361858ff2d7a4c7956280bd55053022c7b0ad27fac4a70e9d2cafb75299e7970e1b2091b83b3bedd2355d5752e9bff6999f9272619a92a8892c0f
 DIST ImageMagick-7.0.8-50.tar.xz 9453076 BLAKE2B a137fb353d32ce6914b5033ea4c02bc81cb1eb82c1dbb6d449f20e19b23ec1eeef628e27c497cb9eb5e7a23f9d4f9f2152e3c6e64dfb5c6f793358c174286e27 SHA512 78cee7463610b256b899cc9474924cefe2dc36ab238025c54688563c3e1aa4b86ebc739f22fb349ab8914b7ac0dc6c5073cca168b9cfc371fb4bbd7e3f51cfbc
-DIST ImageMagick-7.0.8-51.tar.xz 9460120 BLAKE2B 4d1e3cc750c8d336a8af3949b0e8f725529d20fafe27f9786be872c7f98e50ef4a8701e1aa2aa84811ea9669e7b9fb7d09d2d86de90ad807f740049698d5f625 SHA512 a60171e9841667ceb82187fae9b4044f77d01fbd67eca7cc27d80dc9d1388a53718c52b25f0b339236d744ba4c23736778b56f5ec0d4b06982fb95bf7977d9ae
+DIST ImageMagick-7.0.8-56.tar.xz 9465124 BLAKE2B c31c66ae84e9bb91fc744673c07d12300a5e5a07729eaee9654e988efc46cc9d5321e6906325fe9fcfbeb81785a74a52e6059d2983c280b86d0ad305c0818b9d SHA512 22651b0f5b0b0821b7ae74a10671590d8ecfddcc95b60bf056ef7a7cbeab37beedaf49d0bcf97cb0ac2f1ec564192c15c7820c9593db965b4b192338abdaf5dc
 EBUILD imagemagick-6.9.10.50.ebuild 6883 BLAKE2B 1f0a8acce9f7c79171822ba87d131aa0457f1d9afa6621a29972b77958f9abc6150b8ce756065e9e51b2c399c78115393ab04c56b35074c2ff42cddb00f95c15 SHA512 b96f189b6b59ce49628ddc311fef7a7c21c8e81aa268b4958a71b832ecc329c6ce0ffd858f9b0d036c3f5d3de43926d2d2486c0313177362278b999b2ea91fa8
+EBUILD imagemagick-6.9.10.56.ebuild 6892 BLAKE2B 9a7579489c9e2ccd38b3ae9f91393680f13ebe29745ee90fef5e8a72059a731da47a8d8f0394621baf2261d9e848166783738c3fd881372630ce8bb82fd67de8 SHA512 83f54f846c25d858c8a093f5058b764690c1b15d69c09519ee492f0ec4d13555c191991f241fe75a5438fd421d6bc036b655d8d0febfba575897db979cd157bf
 EBUILD imagemagick-7.0.8.50.ebuild 7150 BLAKE2B 52a9342ec82c516f5bc3339c4f41f016448950bc7dd486babdc57d1a62ecc005dd0937073ebad7a4e170f050c11ed7ca4dca9ce39cd18d6498807259eeea643b SHA512 e9f3ab662260bc535d27a6d7166a52d8e29bd999923fa6995b2ffd3b5161de41e62d9e3774bfbdded2bc447b8c0087ed597a0c6a0a79954e06478d3113418a1f
-EBUILD imagemagick-7.0.8.51.ebuild 7160 BLAKE2B 276ed8dc19455db44ec6a14244f07070e5b9a8a6158e0d06ef2ab0ab4541e607244c216a7ffbaefcf166439edf4a00aab2a5f826a4fc917dade1f710f47b66cb SHA512 5c6f6ce5a3801c56b550c78f8ca5a1a2f812ea39db7fcd9eb65fa6e9130d3035102eef379e9fe5617ec62910ebff039fde9ce9f02eac96a62431d18b5b954245
+EBUILD imagemagick-7.0.8.56.ebuild 7160 BLAKE2B 276ed8dc19455db44ec6a14244f07070e5b9a8a6158e0d06ef2ab0ab4541e607244c216a7ffbaefcf166439edf4a00aab2a5f826a4fc917dade1f710f47b66cb SHA512 5c6f6ce5a3801c56b550c78f8ca5a1a2f812ea39db7fcd9eb65fa6e9130d3035102eef379e9fe5617ec62910ebff039fde9ce9f02eac96a62431d18b5b954245
 EBUILD imagemagick-9999.ebuild 7160 BLAKE2B 2435e94755e6e1a9d6ee4cab669b8564daaa06e7c75024463cf5df4f851f695afd2afdfb84930ff8886ceef6bed578365d7489d7febd877064621c4dd541f74b SHA512 c65b9cb286317eafefb96c63984f25850c835a81eb04fe452d8bd22bacded153c460716c06a2f924b7595925ecbb417ea809d737aa291bc174c125d97dc7cbba
 MISC metadata.xml 1015 BLAKE2B 3fbe479f30575b11fa9e78de7bb00c231370aa4b2ca3b0e16924710189013ab91199db8c8cb7cff4611a2924c7fa01e4a43bfd9f7f61cfe45a4de3a254d4c8e2 SHA512 bf1479f91de5f8248c4a86d98017a332ab3d5eb153bb896ca1a39fce2fbff4e8248df92025987f6bfaf7e0d36677c167177c9c21969f1f0b8c2e0a53197efece
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.56.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.56.ebuild
new file mode 100644
index 000000000000..b09291336ccb
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.56.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+MY_PV="$(ver_rs 3 '-')"
+MY_P="ImageMagick-${MY_PV}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local mesa_cards ati_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.51.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.56.ebuild
index 69c412db11b7..69c412db11b7 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.8.51.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.56.ebuild
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 633b8346547f..34db3a93bc5f 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -4,11 +4,7 @@ AUX inkscape-0.91_pre3-exif.patch 321 BLAKE2B 36f9d7ce19c1716b56800431ac095f047c
 AUX inkscape-0.91_pre3-sk-man.patch 362 BLAKE2B adfe363332dcf46297d01feb986ffaf4e5fe2f2db88c5d7e663e477736a56f226183caa90ca2b421f064ce42e5e7b4e81419026681987aa85040f4379c74511d SHA512 5b4b6fd927b88fbf5d113da7fbd70a5d39a7926849b7e0118bbade0218e8429e751d977e0630894ba7f024d1628c4ff9e54c9a0a4ed6b9b87315e200b04bd8ab
 AUX inkscape-0.92.1-automagic.patch 5421 BLAKE2B 0885e9f785b7884e10659c1f8aace9a843113b5d1c059251c75297ef828eb7c704815798c861e03060c89c02e36cb45edf566065234d330c1757e8f2bcc89688 SHA512 c6bc791c8e0a4302f2b21c1ad4d39e8e880017f4cdcf8b23d7749498a0f0a1d2460abeab3216e9eeb6b87a300e17451ace86c738c58a174e92946cb280ef43b9
 AUX inkscape-0.92.1-desktop.patch 919 BLAKE2B c9952613e8d8dca1cd11146afd4d8db210be0f65f61b1a674cf5443dfaed3422e7082667cb93e183589d1e840ac3b55c7e70d03f44c0302b8c7db8ae621a976d SHA512 0000e5c6bd83e7d3994712d5a9f7369b2ecb7a15ba8371bfc9e2646b33293334eff987ffc360c2753025d0561395368024587d71ffc015f5a0e8c39077fd45b2
-AUX inkscape-0.92.3-freetype_pkgconfig.patch 948 BLAKE2B 4a21ed3ef6c002a6fd756b31989d531f94f0bbf2c9bad2ac5fdb453f8a1a5c169e71d7ef5d71ca55072f76fd31646589a62c06b5d44809f6ef873cbe1edca1f9 SHA512 95a265b0e7e9fda74a9bcf31eb6d23afead4c71567126ca893b75c0dcc87f5b03e38c30e2917b4278dbf4fcaf35c2b3fe7a1b509a43b19212c814a2a2b9de53d
 AUX inkscape-0.92.4-poppler-0.76.0.patch 1579 BLAKE2B c8c578dc3c6f0d79403bc0716bb6875544fbf19c98e721294cf9e5f58d9c89c1b8414dd58975846100c4ae5c21eba8e7e4797c037300ce05d741d9245a0dc59c SHA512 2f45e16aba67f4d1498cf012ac6198ec2bb977b9e39b3d4e2d14a216d86b1d407ff7ea5a889b58b5e800c129c0f99ec8bbc0a42dd7d41578d94ae1ab59208698
-DIST inkscape-0.92.3-poppler-patches-1.tar.xz 7000 BLAKE2B a7658d592806df7580ab587c677907588678222f53bc8305b9adf399b8237e8ac3e169a22a39e33a50f5e517ea4122d736134dfaf5bd675fb34e5c168eb42e30 SHA512 8254d5cc0651bc6ed389f4610aac5ed9451b8c662e82b5c0f9aa221be748f4cd2075a41234c2516a98159cbd3e23c9ada3d519edbe69f05bab418d2fb1af2ffa
-DIST inkscape-0.92.3.tar.bz2 31606442 BLAKE2B bc90dc160ca059395a2951b7b2daeb8730753c551f78e6af88b51b41322a438256499f754fb6b07946d77b80e1ddfe5514944f9b5cbb19d2bfdecb8625328db0 SHA512 af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687
 DIST inkscape-0.92.4.tar.bz2 31929728 BLAKE2B 892bf4ed913019b27a9b8897e3ae32c44152163ded0eb345d59915ffdc9818d29f210de3294ef1b05601141185b5e3b10779778551b860f31e7df5c659492c77 SHA512 b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120
-EBUILD inkscape-0.92.3-r1.ebuild 4183 BLAKE2B 074d57b407abdc33e616d7d6229b9b7db12fc6ed6c5278797bd62296403815d6900081c5fd5adaf20ba4a12bdaf083314531ecb8f10212f51e9ae8293d113ada SHA512 09ec9080cc60458b98deaeda24ec08b27200db024f3f34270264576b4edb9d3a6beb241de0c0a2ff5d019e072538c7279385b0a242dae007d41395de5032a6c9
-EBUILD inkscape-0.92.4.ebuild 3664 BLAKE2B 71b85c0baccac8ab4253f693d6378dd81c3f20b27da87374df8e8bad81cf9eff8f94ecce5571748cb2a29e2c156b3287b547bb46a24ebc40cb3f595b34ddcade SHA512 eea1b821ec3c5bb766465d6c97615c17692dd0a18d52a3f3fc7e3ab087230e39c1708ba17d4f84e5c447f8f78b02d54aaa04b5c0ef48773c1d9bf03cce2a545f
+EBUILD inkscape-0.92.4.ebuild 3705 BLAKE2B 5a68cfa5f3e7c9aa88fdd838d09ce1cf50c5a36942b3bd11a31327727118b9bd4b765a9aecf8f4c2aad15f1359c2c6bcf7a11b9c1044f84424d166db7b262b72 SHA512 0085ceac1b06eddeb5b42b38290ec4d6c5dde0137ff21d8a764343520cb5ec61729b9425f6bc32be72cc3c5034edbd29a1e0d218379ec354636858dd3f9da0c5
 MISC metadata.xml 812 BLAKE2B 9b06a44ec7ded4b7b4618813bb4b2b5deed3bbc45fd43cffcf435594f3141943a45e592bf2947b00895f0f40d40b0fbe51109daa63f73f3276f50afec620d9fa SHA512 dbe4bb2e918a4c8a20c9a273cef29976d8cfe74e6c2ae1ba8cb77f592c885e8353b7bc3ca8f529e00629f6a0ac7627877cdef68fe07472fc1f417abba5d0268b
diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch b/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch
deleted file mode 100644
index d00c23d8addc..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 62ed18b4d99e690298cc1984b6f2df2363d165fe Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Fri, 18 May 2018 07:55:38 +0200
-Subject: [PATCH] Use pkg-config to find freetype
-
-As of freetype-2.9.1 the freetype-config file no longer gets installed
-by default.
----
- configure.ac | 9 +++------
- 1 file changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 12a081612b..1b75e23670 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -252,12 +252,9 @@ AC_CHECK_FUNCS([mallinfo], [
- 			 [#include <malloc.h>])
- ])
- 
--AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
--if test "x$FREETYPE_CONFIG" = "xno"; then
--	AC_MSG_ERROR([Cannot find freetype-config])
--fi
--FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
--FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
-+PKG_CHECK_MODULES(FREETYPE, freetype2,,
-+	AC_MSG_ERROR([Cannot find freetype])
-+)
- AC_SUBST(FREETYPE_CFLAGS)
- AC_SUBST(FREETYPE_LIBS)
- 
--- 
-2.17.0
-
diff --git a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
deleted file mode 100644
index 7e552f52df9d..000000000000
--- a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1
-
-MY_P="${P/_/}"
-
-DESCRIPTION="SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2
-	https://dev.gentoo.org/~asturm/distfiles/${P}-poppler-patches-1.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
-IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
-IUSE+=" lcms nls spell static-libs visio wpg"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/poppler-0.26.0:=[cairo]
-	>=dev-cpp/glibmm-2.54.1
-	>=dev-cpp/gtkmm-2.18.0:2.4
-	>=dev-cpp/cairomm-1.9.8
-	>=dev-libs/boehm-gc-7.1:=
-	>=dev-libs/glib-2.28
-	>=dev-libs/libsigc++-2.0.12
-	>=dev-libs/libxml2-2.6.20
-	>=dev-libs/libxslt-1.0.15
-	dev-libs/popt
-	dev-python/lxml[${PYTHON_USEDEP}]
-	media-gfx/potrace
-	media-gfx/scour[${PYTHON_USEDEP}]
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:0
-	sci-libs/gsl:=
-	x11-libs/libX11
-	>=x11-libs/gtk+-2.10.7:2
-	>=x11-libs/pango-1.24
-	cdr? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libcdr
-	)
-	dbus? ( dev-libs/dbus-glib )
-	exif? ( media-libs/libexif )
-	gnome? ( >=gnome-base/gnome-vfs-2.0 )
-	imagemagick? ( media-gfx/imagemagick:=[cxx] )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	spell? (
-		app-text/aspell
-		app-text/gtkspell:2
-	)
-	visio? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	wpg? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-"
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-gfx/uniconvertor
-	dia? ( app-office/dia )
-	latex? (
-		media-gfx/pstoedit[plotutils]
-		app-text/dvipsk
-		app-text/texlive-core
-	)
-	postscript? ( app-text/ghostscript-gpl )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.36
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.92.1-automagic.patch"
-	"${FILESDIR}/${PN}-0.91_pre3-cppflags.patch"
-	"${FILESDIR}/${PN}-0.92.1-desktop.patch"
-	"${FILESDIR}/${PN}-0.91_pre3-exif.patch"
-	"${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
-	"${FILESDIR}/${PN}-0.48.4-epython.patch"
-	"${FILESDIR}/${PN}-0.92.3-freetype_pkgconfig.patch"
-	"${WORKDIR}/${PN}-0.92.3-poppler-0.64.patch"
-	"${WORKDIR}/${PN}-0.92.3-poppler-0.65.patch"
-	"${WORKDIR}/${PN}-0.92.3-poppler-0.64-2.patch"
-	"${WORKDIR}/${PN}-0.92.3-poppler-0.69.patch"
-	"${WORKDIR}/${PN}-0.92.3-poppler-0.71.patch"
-	"${WORKDIR}/${PN}-0.92.3-poppler-0.72.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="test"
-
-pkg_pretend() {
-	if use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i "s#@EPYTHON@#${EPYTHON}#" \
-		src/extension/implementation/script.cpp || die
-
-	eautoreconf
-
-	# bug 421111
-	python_fix_shebang share/extensions
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable nls)
-		$(use_enable openmp)
-		$(use_enable exif)
-		$(use_enable jpeg)
-		$(use_enable lcms)
-		--enable-poppler-cairo
-		$(use_enable wpg)
-		$(use_enable visio)
-		$(use_enable cdr)
-		$(use_enable dbus dbusapi)
-		$(use_enable imagemagick magick)
-		$(use_with gnome gnome-vfs)
-		$(use_with inkjar)
-		$(use_with spell gtkspell)
-		$(use_with spell aspell)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name "*.la" -delete || die
-	python_optimize "${ED%/}"/usr/share/${PN}/extensions
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/inkscape/inkscape-0.92.4.ebuild b/media-gfx/inkscape/inkscape-0.92.4.ebuild
index f0122c56aa5f..08369700fb96 100644
--- a/media-gfx/inkscape/inkscape-0.92.4.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
 IUSE+=" lcms nls spell static-libs visio wpg"
 
@@ -148,6 +148,7 @@ src_configure() {
 }
 
 src_compile() {
+	emake -C src helper/sp-marshal.h #686304
 	emake AR="$(tc-getAR)"
 }
 
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index ffa70b71cfd1..44465f69709e 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,9 +1,9 @@
 AUX krita-4.0.3-tests-optional.patch 10001 BLAKE2B d31e7e89c745642e6cf5fec9f464122954bc050104f1f3dacff2001b8a594a376cd9a61243ca3e6eafc842c68a63c8d1a3b5dc75e737ff8ef8b0e2f1f08d61a2 SHA512 753af31735cd9df6d17e9323fa6699b2b27b60f58d0597e84a30f749c97c7a0595b3719e94235a34e3e51a90b0f6c183e4864ea6a0c5e5f70f27c41e3da0ffdb
 AUX krita-4.1.8-fix-pre-5.12-tablet-support.patch 1794 BLAKE2B d67cfe9a758e26416abf1150a4b25f81b5befb8ffb254daf0c25b4b189ba0aefe9a3256eb83013d80919e21f77f7880fa7856a05ef5c995dfc73d079753e2c38 SHA512 c4048d8fe560508f04df785a012db99a5e6a2d4ca5b1d8e774a307cdb99f62de4969b04a58586c771a174dadf6dedafaa70568e8b6342612fbe52be32db257cb
 AUX krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch 1591 BLAKE2B d11c8b3a7f5a70c40fe5c0f19bcb06c9a2b047e651a27ce3de9e8ecc41287171b50566b481a8ca49b7625aae1ffd0db0a507b1ad7928b6c959de15ec7b7c2dc5 SHA512 3d1d9c09abb2b72d6d7ef5061e7fdb4ca98a4d7f7d1356833fa518da6bce52f9959532f0417b7e30a305ef052acc59dd2b27ef71e1de5fa138fe4f107528517a
-AUX krita-4.2.2-tests-optional.patch 12503 BLAKE2B 31b96b377e217dd9e7f8dd25e45487fc7bf0bf4883ffb15d965c0fbdf0a660baf0229024e236cd50ec8533ab85b89cb0c78c4a78f210801be87a43c0ecee4701 SHA512 a4f64e008e07974dbc343a90e8ec181121b14b7d000dfb5bb167b49871b2c31e1d74786409240d2bfbbdeebb89f8b29d2e8cd61df0761a523e61e8a6115ea9fe
+AUX krita-4.2.4-tests-optional.patch 12292 BLAKE2B a30463dcc6e02e877b308c4add529f0657d96ace7a13ba7424f4cdf260f3b636d03b2bac224d6239253393650163b622ac54d8d81bbdced2fb153bf216b5fb2d SHA512 1d5045b35981822bc16c4b23e573a299a8325353c8be347c56a4e2fc4e3cd9e937e8eb253f9c6cdc0197a3db7989b822fb41274afe3cd506b9c907daf1867df3
 DIST krita-4.1.8.tar.gz 244065767 BLAKE2B ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157 SHA512 d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
-DIST krita-4.2.3.tar.gz 246136588 BLAKE2B 1d7a371f7aeb8cf3747adcd4ab681b0ecf849e64ace16b456e9c2b8ed5fd958be895fd64c623931e47ae81bdf35b3e54161ecb204501f48c97b35ac2dcb8ac59 SHA512 6493740183b360a939d85cc7bc646cb173dc923a3dc63966d0f178bf308675ffead01d3bfefeeffb376f5efd7d90ee7f271b3ff412787123113dd125cc022ab5
+DIST krita-4.2.4.tar.gz 246227960 BLAKE2B 94513a835526ee79c0747ed8c6004666b549d7070c02ad82800555282f319e5aa4dc1f35dafc6b4179284b244c8c80367b453548f5c8cd585154259a0512222a SHA512 c778653f8e72724d16322405fffdff5b82418c5a19021ccbada6a15389afd58f9d9017bc562eb5d91b0d4e10587bca1e616fc7ecc9ec7dbf82fae5247b81ea5e
 EBUILD krita-4.1.8-r1.ebuild 3390 BLAKE2B 4cb6c211221e5a0e13ce674b7a10c984539a5e5f529a533d6e56f1facfe591e7d1b57707a84c8d87266221cb5445ad7fd15b57954d3a67b114c46c90329730a8 SHA512 14e135e8d6451489127ca1653179de82d7460d182ad6a18bd4fbabd81d16851fcaa783d06be2bbc8cef9ea435f90f5a3f799cf87a338888188acb26ee9b3564a
-EBUILD krita-4.2.3.ebuild 3154 BLAKE2B e06830f14cbfff0d24ef927bc345aefda68a3d02faae654650eec386e1ba62617aaca4575de60e4cc676607c7586b101601554d0d421bed300e02d048fffa3fa SHA512 e9018a4fe54361dd2f36f3da008054b5207760e4ad2327c55dd4113e3924f7fa704b2fb1c12c44fabf46596e88cadc9a915cdee50fc24d97cda1db8bbeabb0bc
+EBUILD krita-4.2.4.ebuild 3127 BLAKE2B 559b3bb5a826cfc5e726c707c373bea713f7d89f811b373e53972782d436528974803957503e76197a2fb94526a3ae0ba6812017341aa81c3c65e80027a926d4 SHA512 f213a2a2b76c6374f550fbf933fa0317a11de9e94a1a522e9dadca8b345c1d3c92059dc77dc923ce6093c1cb96968036298cdfe46e5496233f959f57177aac29
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/files/krita-4.2.2-tests-optional.patch b/media-gfx/krita/files/krita-4.2.2-tests-optional.patch
deleted file mode 100644
index 2df715be04f6..000000000000
--- a/media-gfx/krita/files/krita-4.2.2-tests-optional.patch
+++ /dev/null
@@ -1,405 +0,0 @@
---- a/plugins/filters/CMakeLists.txt	2019-06-27 18:48:55.049823682 +0200
-+++ b/plugins/filters/CMakeLists.txt	2019-06-27 18:48:55.056823729 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- add_subdirectory( blur )
- add_subdirectory( colors )
- add_subdirectory( colorsfilters )
---- a/plugins/filters/unsharp/CMakeLists.txt	2019-06-27 18:48:55.063823776 +0200
-+++ b/plugins/filters/unsharp/CMakeLists.txt	2019-06-27 18:48:55.069823817 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- set(kritaunsharpfilter_SOURCES
-     unsharp.cpp
---- a/plugins/paintops/defaultpaintops/CMakeLists.txt	2019-06-27 18:48:55.077823871 +0200
-+++ b/plugins/paintops/defaultpaintops/CMakeLists.txt	2019-06-27 18:48:55.084823918 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(brush/tests)
-+endif()
- 
- include_directories(brush
-                     duplicate
---- a/plugins/paintops/libpaintop/CMakeLists.txt	2019-06-27 18:48:55.092823972 +0200
-+++ b/plugins/paintops/libpaintop/CMakeLists.txt	2019-06-27 18:48:55.098824013 +0200
-@@ -104,4 +104,6 @@
- install(TARGETS kritalibpaintop  ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/plugins/dockers/lut/CMakeLists.txt	2019-06-27 18:48:55.105824060 +0200
-+++ b/plugins/dockers/lut/CMakeLists.txt	2019-06-27 18:48:55.112824107 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories(SYSTEM
-     ${OCIO_INCLUDE_DIR}
---- a/plugins/dockers/animation/CMakeLists.txt	2019-06-27 18:48:55.120824161 +0200
-+++ b/plugins/dockers/animation/CMakeLists.txt	2019-06-27 18:48:55.124824188 +0200
-@@ -1,5 +1,7 @@
- if (NOT WIN32 AND NOT APPLE)
--    add_subdirectory(tests)
-+    if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif()
- 
- set(KRITA_ANIMATIONDOCKER_SOURCES
---- a/plugins/extensions/qmic/CMakeLists.txt	2019-06-27 18:48:55.132824242 +0200
-+++ b/plugins/extensions/qmic/CMakeLists.txt	2019-06-27 18:48:55.136824270 +0200
-@@ -20,4 +20,6 @@
- target_link_libraries(kritaqmic kritaui)
- install(TARGETS kritaqmic  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/plugins/tools/basictools/CMakeLists.txt	2019-06-27 18:48:55.141824303 +0200
-+++ b/plugins/tools/basictools/CMakeLists.txt	2019-06-27 18:48:55.146824337 +0200
-@@ -1,5 +1,7 @@
- if (NOT APPLE)
--    add_subdirectory(tests)
-+    if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif ()
- 
- set(kritadefaulttools_SOURCES
---- a/plugins/tools/tool_transform2/CMakeLists.txt	2019-06-27 18:48:55.151824371 +0200
-+++ b/plugins/tools/tool_transform2/CMakeLists.txt	2019-06-27 18:48:55.155824398 +0200
-@@ -1,5 +1,7 @@
- if (NOT WIN32 AND NOT APPLE)
--    add_subdirectory(tests)
-+    if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif()
- 
- set(kritatooltransform_SOURCES
---- a/plugins/impex/ppm/CMakeLists.txt	2019-06-27 18:48:55.163824452 +0200
-+++ b/plugins/impex/ppm/CMakeLists.txt	2019-06-27 18:48:55.169824492 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
- 
---- a/plugins/impex/svg/CMakeLists.txt	2019-06-27 18:48:55.175824533 +0200
-+++ b/plugins/impex/svg/CMakeLists.txt	2019-06-27 18:48:55.180824567 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritasvgimport_SOURCES
-     kis_svg_import.cc
---- a/plugins/impex/brush/CMakeLists.txt	2019-06-27 18:48:55.186824607 +0200
-+++ b/plugins/impex/brush/CMakeLists.txt	2019-06-27 18:48:55.190824634 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritabrushexport_PART_SRCS
-     kis_brush_export.cpp
---- a/plugins/impex/psd/CMakeLists.txt	2019-06-27 18:48:55.195824668 +0200
-+++ b/plugins/impex/psd/CMakeLists.txt	2019-06-27 18:48:55.199824695 +0200
-@@ -1,5 +1,7 @@
- if (NOT MSVC AND NOT APPLE)
--    add_subdirectory(tests)
-+    if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif()
- 
- configure_file(config_psd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_psd.h)
---- a/plugins/impex/tga/CMakeLists.txt	2019-06-27 18:48:55.206824742 +0200
-+++ b/plugins/impex/tga/CMakeLists.txt	2019-06-27 18:48:55.210824769 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritatgaexport_SOURCES
-     kis_tga_export.cpp
---- a/plugins/impex/libkra/CMakeLists.txt	2019-06-27 18:48:55.216824810 +0200
-+++ b/plugins/impex/libkra/CMakeLists.txt	2019-06-27 18:48:55.221824844 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritalibkra_LIB_SRCS
-     kis_colorize_dom_utils.cpp
---- a/plugins/impex/jpeg/CMakeLists.txt	2019-06-27 18:48:55.228824891 +0200
-+++ b/plugins/impex/jpeg/CMakeLists.txt	2019-06-27 18:48:55.233824924 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms")
- 
---- a/plugins/impex/gif/CMakeLists.txt	2019-06-27 18:48:55.239824965 +0200
-+++ b/plugins/impex/gif/CMakeLists.txt	2019-06-27 18:48:55.243824992 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritagifexport_SOURCES
-     kis_gif_export.cpp
---- a/plugins/impex/exr/CMakeLists.txt	2019-06-27 18:48:55.248825026 +0200
-+++ b/plugins/impex/exr/CMakeLists.txt	2019-06-27 18:48:55.253825060 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} )
- 
---- a/plugins/impex/xcf/CMakeLists.txt	2019-06-27 18:48:55.260825107 +0200
-+++ b/plugins/impex/xcf/CMakeLists.txt	2019-06-27 18:48:55.268825160 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(XCFTOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/xcftools")
- 
---- a/plugins/impex/tiff/CMakeLists.txt	2019-06-27 18:48:55.277825221 +0200
-+++ b/plugins/impex/tiff/CMakeLists.txt	2019-06-27 18:48:55.283825262 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(libkritatiffconverter_LIB_SRCS
-     kis_tiff_converter.cc
---- a/plugins/impex/ora/CMakeLists.txt	2019-06-27 18:48:55.290825310 +0200
-+++ b/plugins/impex/ora/CMakeLists.txt	2019-06-27 18:48:55.295825343 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(libkritaconverter_LIB_SRCS
-     ora_converter.cpp
---- a/plugins/impex/heif/CMakeLists.txt	2019-06-27 18:48:55.302825391 +0200
-+++ b/plugins/impex/heif/CMakeLists.txt	2019-06-27 18:48:55.309825438 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HEIF_CFLAGS}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${HEIF_CFLAGS}")
---- a/plugins/impex/pdf/CMakeLists.txt	2019-06-27 18:48:55.317825492 +0200
-+++ b/plugins/impex/pdf/CMakeLists.txt	2019-06-27 18:48:55.322825526 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritapdfimport_SOURCES kis_pdf_import.cpp kis_pdf_import_widget.cpp )
- 
---- a/plugins/impex/csv/CMakeLists.txt	2019-06-27 18:48:55.332825593 +0200
-+++ b/plugins/impex/csv/CMakeLists.txt	2019-06-27 18:48:55.339825640 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- # import
- 
---- a/plugins/impex/heightmap/CMakeLists.txt	2019-06-27 18:48:55.347825694 +0200
-+++ b/plugins/impex/heightmap/CMakeLists.txt	2019-06-27 18:48:55.352825728 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
- 
---- a/plugins/impex/raw/CMakeLists.txt	2019-06-27 18:48:55.359825775 +0200
-+++ b/plugins/impex/raw/CMakeLists.txt	2019-06-27 18:48:55.365825816 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- if(OPENEXR_FOUND)
- 	include_directories(${OPENEXR_INCLUDE_DIR})
---- a/plugins/impex/qimageio/CMakeLists.txt	2019-06-27 18:48:55.371825857 +0200
-+++ b/plugins/impex/qimageio/CMakeLists.txt	2019-06-27 18:48:55.376825890 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritaqimageioexport_SOURCES
-     kis_qimageio_export.cpp
---- a/plugins/impex/qml/CMakeLists.txt	2019-06-27 18:48:55.383825938 +0200
-+++ b/plugins/impex/qml/CMakeLists.txt	2019-06-27 18:48:55.389825978 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritaqmlexport_SOURCES
-     qml_converter.cc
---- a/plugins/impex/png/CMakeLists.txt	2019-06-27 18:48:55.396826025 +0200
-+++ b/plugins/impex/png/CMakeLists.txt	2019-06-27 18:48:55.401826059 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritapngimport_SOURCES
-     kis_png_import.cc
---- a/plugins/color/lcms2engine/CMakeLists.txt	2019-06-27 18:48:55.408826106 +0200
-+++ b/plugins/color/lcms2engine/CMakeLists.txt	2019-06-27 18:48:55.412826133 +0200
-@@ -1,6 +1,8 @@
- project( lcmsengine )
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories(SYSTEM
-     ${LCMS2_INCLUDE_DIR}
---- a/libs/brush/CMakeLists.txt	2019-06-27 18:48:55.417826167 +0200
-+++ b/libs/brush/CMakeLists.txt	2019-06-27 18:48:55.421826194 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- include_directories(SYSTEM
-     ${EIGEN3_INCLUDE_DIR}
---- a/libs/global/CMakeLists.txt	2019-06-27 18:48:55.426826228 +0200
-+++ b/libs/global/CMakeLists.txt	2019-06-27 18:48:55.430826255 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- include(CheckFunctionExists)
- check_function_exists(backtrace HAVE_BACKTRACE)
---- a/libs/image/CMakeLists.txt	2019-06-27 18:48:55.435826289 +0200
-+++ b/libs/image/CMakeLists.txt	2019-06-27 18:48:55.438826309 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- add_subdirectory( tiles3 )
- 
---- a/libs/image/tiles3/CMakeLists.txt	2019-06-27 18:48:55.444826350 +0200
-+++ b/libs/image/tiles3/CMakeLists.txt	2019-06-27 18:48:55.447826370 +0200
-@@ -1 +1,3 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/libs/odf/CMakeLists.txt	2019-06-27 18:48:55.452826404 +0200
-+++ b/libs/odf/CMakeLists.txt	2019-06-27 18:48:55.456826430 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- set(kritaodf_LIB_SRCS
-     KoOdf.cpp
---- a/libs/metadata/CMakeLists.txt	2019-06-27 18:48:55.461826464 +0200
-+++ b/libs/metadata/CMakeLists.txt	2019-06-27 18:48:55.465826491 +0200
-@@ -29,4 +29,6 @@
- 
- install(TARGETS kritametadata  ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/libs/store/CMakeLists.txt	2019-06-27 18:48:55.470826525 +0200
-+++ b/libs/store/CMakeLists.txt	2019-06-27 18:48:55.473826545 +0200
-@@ -1,6 +1,8 @@
- include_directories(${QUAZIP_INCLUDE_DIRS})
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritastore_LIB_SRCS
-     KoDirectoryStore.cpp
---- a/libs/libkis/CMakeLists.txt	2019-06-27 18:48:55.478826579 +0200
-+++ b/libs/libkis/CMakeLists.txt	2019-06-27 18:48:55.482826605 +0200
-@@ -47,4 +47,6 @@
- install(TARGETS kritalibkis  ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/libs/widgetutils/CMakeLists.txt	2019-06-27 18:48:55.487826640 +0200
-+++ b/libs/widgetutils/CMakeLists.txt	2019-06-27 18:48:55.491826667 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- configure_file(xmlgui/config-xmlgui.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xmlgui.h )
- 
---- a/libs/widgets/CMakeLists.txt	2019-06-27 18:48:55.496826701 +0200
-+++ b/libs/widgets/CMakeLists.txt	2019-06-27 18:48:55.500826727 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
- 
---- a/libs/flake/CMakeLists.txt	2019-06-27 18:48:55.505826761 +0200
-+++ b/libs/flake/CMakeLists.txt	2019-06-27 18:48:55.510826795 +0200
-@@ -9,7 +9,9 @@
- )
- 
- add_subdirectory(styles)
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritaflake_SRCS
-     KoGradientHelper.cpp
---- a/libs/ui/CMakeLists.txt	2019-06-27 18:48:55.516826836 +0200
-+++ b/libs/ui/CMakeLists.txt	2019-06-27 18:48:55.520826863 +0200
-@@ -7,7 +7,9 @@
-     ${OCIO_INCLUDE_DIR}
- )
- 
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- if (APPLE)
-     find_library(FOUNDATION_LIBRARY Foundation)
---- a/libs/pigment/CMakeLists.txt	2019-06-27 18:48:55.526826903 +0200
-+++ b/libs/pigment/CMakeLists.txt	2019-06-27 18:48:55.530826930 +0200
-@@ -31,7 +31,9 @@
-     message("${__per_arch_factory_objs}")
- endif()
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- add_subdirectory(benchmarks)
- 
- set(kritapigment_SRCS
diff --git a/media-gfx/krita/files/krita-4.2.4-tests-optional.patch b/media-gfx/krita/files/krita-4.2.4-tests-optional.patch
new file mode 100644
index 000000000000..2f13c999b67e
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.2.4-tests-optional.patch
@@ -0,0 +1,399 @@
+--- a/plugins/filters/CMakeLists.txt	2019-07-31 11:22:19.572862843 +0200
++++ b/plugins/filters/CMakeLists.txt	2019-07-31 11:22:19.576862870 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ add_subdirectory( blur )
+ add_subdirectory( colors )
+ add_subdirectory( colorsfilters )
+--- a/plugins/filters/unsharp/CMakeLists.txt	2019-07-31 11:22:19.582862912 +0200
++++ b/plugins/filters/unsharp/CMakeLists.txt	2019-07-31 11:22:19.587862947 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ set(kritaunsharpfilter_SOURCES
+     unsharp.cpp
+--- a/plugins/paintops/defaultpaintops/CMakeLists.txt	2019-07-31 11:22:19.592862983 +0200
++++ b/plugins/paintops/defaultpaintops/CMakeLists.txt	2019-07-31 11:22:19.595863003 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(brush/tests)
++endif()
+ 
+ include_directories(brush
+                     duplicate
+--- a/plugins/paintops/libpaintop/CMakeLists.txt	2019-07-31 11:22:19.600863038 +0200
++++ b/plugins/paintops/libpaintop/CMakeLists.txt	2019-07-31 11:22:19.603863060 +0200
+@@ -104,4 +104,6 @@
+ install(TARGETS kritalibpaintop  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/plugins/dockers/lut/CMakeLists.txt	2019-07-31 11:22:19.608863094 +0200
++++ b/plugins/dockers/lut/CMakeLists.txt	2019-07-31 11:22:19.613863129 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories(SYSTEM
+     ${OCIO_INCLUDE_DIR}
+--- a/plugins/dockers/animation/CMakeLists.txt	2019-07-31 11:22:19.619863171 +0200
++++ b/plugins/dockers/animation/CMakeLists.txt	2019-07-31 11:22:19.624863206 +0200
+@@ -1,5 +1,7 @@
+ if (NOT WIN32 AND NOT APPLE)
+-    add_subdirectory(tests)
++    if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif()
+ 
+ set(KRITA_ANIMATIONDOCKER_SOURCES
+--- a/plugins/extensions/qmic/CMakeLists.txt	2019-07-31 11:22:19.630863248 +0200
++++ b/plugins/extensions/qmic/CMakeLists.txt	2019-07-31 11:22:19.635863283 +0200
+@@ -20,4 +20,6 @@
+ target_link_libraries(kritaqmic kritaui)
+ install(TARGETS kritaqmic  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/plugins/tools/basictools/CMakeLists.txt	2019-07-31 11:22:19.641863325 +0200
++++ b/plugins/tools/basictools/CMakeLists.txt	2019-07-31 11:22:19.645863353 +0200
+@@ -1,5 +1,7 @@
+ if (NOT APPLE)
+-    add_subdirectory(tests)
++    if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif ()
+ 
+ set(kritadefaulttools_SOURCES
+--- a/plugins/tools/tool_transform2/CMakeLists.txt	2019-07-31 11:22:19.650863388 +0200
++++ b/plugins/tools/tool_transform2/CMakeLists.txt	2019-07-31 11:22:19.653863409 +0200
+@@ -1,5 +1,7 @@
+ if (NOT WIN32 AND NOT APPLE)
+-    add_subdirectory(tests)
++    if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif()
+ 
+ set(kritatooltransform_SOURCES
+--- a/plugins/impex/svg/CMakeLists.txt	2019-07-31 11:22:19.658863444 +0200
++++ b/plugins/impex/svg/CMakeLists.txt	2019-07-31 11:22:19.662863472 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritasvgimport_SOURCES
+     kis_svg_import.cc
+--- a/plugins/impex/brush/CMakeLists.txt	2019-07-31 11:22:19.668863514 +0200
++++ b/plugins/impex/brush/CMakeLists.txt	2019-07-31 11:22:19.672863542 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritabrushexport_PART_SRCS
+     kis_brush_export.cpp
+--- a/plugins/impex/psd/CMakeLists.txt	2019-07-31 11:22:19.678863584 +0200
++++ b/plugins/impex/psd/CMakeLists.txt	2019-07-31 11:22:19.684863626 +0200
+@@ -1,5 +1,7 @@
+ if (NOT MSVC AND NOT APPLE)
+-    add_subdirectory(tests)
++    if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif()
+ 
+ configure_file(config_psd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_psd.h)
+--- a/plugins/impex/tga/CMakeLists.txt	2019-07-31 11:22:19.690863668 +0200
++++ b/plugins/impex/tga/CMakeLists.txt	2019-07-31 11:22:19.695863703 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritatgaexport_SOURCES
+     kis_tga_export.cpp
+--- a/plugins/impex/libkra/CMakeLists.txt	2019-07-31 11:22:19.700863738 +0200
++++ b/plugins/impex/libkra/CMakeLists.txt	2019-07-31 11:22:19.704863766 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritalibkra_LIB_SRCS
+     kis_colorize_dom_utils.cpp
+--- a/plugins/impex/jpeg/CMakeLists.txt	2019-07-31 11:22:19.709863801 +0200
++++ b/plugins/impex/jpeg/CMakeLists.txt	2019-07-31 11:22:19.713863829 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms")
+ 
+--- a/plugins/impex/gif/CMakeLists.txt	2019-07-31 11:22:19.720863878 +0200
++++ b/plugins/impex/gif/CMakeLists.txt	2019-07-31 11:22:19.726863920 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritagifexport_SOURCES
+     kis_gif_export.cpp
+--- a/plugins/impex/exr/CMakeLists.txt	2019-07-31 11:22:19.732863962 +0200
++++ b/plugins/impex/exr/CMakeLists.txt	2019-07-31 11:22:19.736863990 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} )
+ 
+--- a/plugins/impex/xcf/CMakeLists.txt	2019-07-31 11:22:19.740864018 +0200
++++ b/plugins/impex/xcf/CMakeLists.txt	2019-07-31 11:22:19.744864046 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(XCFTOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/xcftools")
+ 
+--- a/plugins/impex/tiff/CMakeLists.txt	2019-07-31 11:22:19.750864088 +0200
++++ b/plugins/impex/tiff/CMakeLists.txt	2019-07-31 11:22:19.755864123 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(libkritatiffconverter_LIB_SRCS
+     kis_tiff_converter.cc
+--- a/plugins/impex/ora/CMakeLists.txt	2019-07-31 11:22:19.762864172 +0200
++++ b/plugins/impex/ora/CMakeLists.txt	2019-07-31 11:22:19.767864207 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(libkritaconverter_LIB_SRCS
+     ora_converter.cpp
+--- a/plugins/impex/heif/CMakeLists.txt	2019-07-31 11:22:19.774864256 +0200
++++ b/plugins/impex/heif/CMakeLists.txt	2019-07-31 11:22:19.778864284 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HEIF_CFLAGS}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${HEIF_CFLAGS}")
+--- a/plugins/impex/pdf/CMakeLists.txt	2019-07-31 11:22:19.783864319 +0200
++++ b/plugins/impex/pdf/CMakeLists.txt	2019-07-31 11:22:19.788864354 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritapdfimport_SOURCES kis_pdf_import.cpp kis_pdf_import_widget.cpp )
+ 
+--- a/plugins/impex/csv/CMakeLists.txt	2019-07-31 11:22:19.796864410 +0200
++++ b/plugins/impex/csv/CMakeLists.txt	2019-07-31 11:22:19.803864459 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ # import
+ 
+--- a/plugins/impex/heightmap/CMakeLists.txt	2019-07-31 11:22:19.810864508 +0200
++++ b/plugins/impex/heightmap/CMakeLists.txt	2019-07-31 11:22:19.819864571 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
+ 
+--- a/plugins/impex/raw/CMakeLists.txt	2019-07-31 11:22:19.826864620 +0200
++++ b/plugins/impex/raw/CMakeLists.txt	2019-07-31 11:22:19.830864648 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ if(OPENEXR_FOUND)
+ 	include_directories(${OPENEXR_INCLUDE_DIR})
+--- a/plugins/impex/qimageio/CMakeLists.txt	2019-07-31 11:22:19.837864697 +0200
++++ b/plugins/impex/qimageio/CMakeLists.txt	2019-07-31 11:22:19.844864746 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritaqimageioexport_SOURCES
+     kis_qimageio_export.cpp
+--- a/plugins/impex/qml/CMakeLists.txt	2019-07-31 11:22:19.851864795 +0200
++++ b/plugins/impex/qml/CMakeLists.txt	2019-07-31 11:22:19.856864830 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritaqmlexport_SOURCES
+     qml_converter.cc
+--- a/plugins/impex/png/CMakeLists.txt	2019-07-31 11:22:19.862864872 +0200
++++ b/plugins/impex/png/CMakeLists.txt	2019-07-31 11:22:19.867864907 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritapngimport_SOURCES
+     kis_png_import.cc
+--- a/plugins/color/lcms2engine/CMakeLists.txt	2019-07-31 11:22:19.872864942 +0200
++++ b/plugins/color/lcms2engine/CMakeLists.txt	2019-07-31 11:22:19.876864969 +0200
+@@ -1,6 +1,8 @@
+ project( lcmsengine )
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories(SYSTEM
+     ${LCMS2_INCLUDE_DIR}
+--- a/libs/brush/CMakeLists.txt	2019-07-31 11:22:19.881865005 +0200
++++ b/libs/brush/CMakeLists.txt	2019-07-31 11:22:19.885865033 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ include_directories(SYSTEM
+     ${EIGEN3_INCLUDE_DIR}
+--- a/libs/global/CMakeLists.txt	2019-07-31 11:22:19.890865068 +0200
++++ b/libs/global/CMakeLists.txt	2019-07-31 11:22:19.896865110 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ include(CheckFunctionExists)
+ check_function_exists(backtrace HAVE_BACKTRACE)
+--- a/libs/image/CMakeLists.txt	2019-07-31 11:22:19.902865151 +0200
++++ b/libs/image/CMakeLists.txt	2019-07-31 11:22:19.908865194 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ add_subdirectory( tiles3 )
+ 
+--- a/libs/image/tiles3/CMakeLists.txt	2019-07-31 11:22:19.913865228 +0200
++++ b/libs/image/tiles3/CMakeLists.txt	2019-07-31 11:22:19.917865256 +0200
+@@ -1 +1,3 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/libs/odf/CMakeLists.txt	2019-07-31 11:22:19.922865291 +0200
++++ b/libs/odf/CMakeLists.txt	2019-07-31 11:22:19.926865319 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ set(kritaodf_LIB_SRCS
+     KoOdf.cpp
+--- a/libs/metadata/CMakeLists.txt	2019-07-31 11:22:19.930865347 +0200
++++ b/libs/metadata/CMakeLists.txt	2019-07-31 11:22:19.934865376 +0200
+@@ -29,4 +29,6 @@
+ 
+ install(TARGETS kritametadata  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/libs/store/CMakeLists.txt	2019-07-31 11:22:19.940865418 +0200
++++ b/libs/store/CMakeLists.txt	2019-07-31 11:22:19.944865445 +0200
+@@ -1,6 +1,8 @@
+ include_directories(${QUAZIP_INCLUDE_DIRS})
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritastore_LIB_SRCS
+     KoDirectoryStore.cpp
+--- a/libs/libkis/CMakeLists.txt	2019-07-31 11:22:19.951865495 +0200
++++ b/libs/libkis/CMakeLists.txt	2019-07-31 11:22:19.958865544 +0200
+@@ -47,4 +47,6 @@
+ install(TARGETS kritalibkis  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/libs/widgetutils/CMakeLists.txt	2019-07-31 11:22:19.968865614 +0200
++++ b/libs/widgetutils/CMakeLists.txt	2019-07-31 11:22:19.981865705 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ configure_file(xmlgui/config-xmlgui.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xmlgui.h )
+ 
+--- a/libs/widgets/CMakeLists.txt	2019-07-31 11:22:19.992865782 +0200
++++ b/libs/widgets/CMakeLists.txt	2019-07-31 11:22:20.000865837 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ 
+--- a/libs/flake/CMakeLists.txt	2019-07-31 11:22:20.010865908 +0200
++++ b/libs/flake/CMakeLists.txt	2019-07-31 11:22:20.017865956 +0200
+@@ -9,8 +9,12 @@
+ )
+ 
+ add_subdirectory(styles)
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
++if(BUILD_TESTING)
+ add_subdirectory(resources/tests)
++endif()
+ 
+ set(kritaflake_SRCS
+     KoGradientHelper.cpp
+--- a/libs/ui/CMakeLists.txt	2019-07-31 11:22:20.029866040 +0200
++++ b/libs/ui/CMakeLists.txt	2019-07-31 11:22:20.039866111 +0200
+@@ -7,7 +7,9 @@
+     ${OCIO_INCLUDE_DIR}
+ )
+ 
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ if (APPLE)
+     find_library(FOUNDATION_LIBRARY Foundation)
+--- a/libs/pigment/CMakeLists.txt	2019-07-31 11:22:20.050866188 +0200
++++ b/libs/pigment/CMakeLists.txt	2019-07-31 11:22:20.057866236 +0200
+@@ -31,7 +31,9 @@
+     message("${__per_arch_factory_objs}")
+ endif()
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ add_subdirectory(benchmarks)
+ 
+ set(kritapigment_SRCS
diff --git a/media-gfx/krita/krita-4.2.3.ebuild b/media-gfx/krita/krita-4.2.4.ebuild
index b1daa80676c2..62966b4d812b 100644
--- a/media-gfx/krita/krita-4.2.3.ebuild
+++ b/media-gfx/krita/krita-4.2.4.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 KDE_TEST="forceoptional"
-QT_MINIMAL="5.12.3"
 VIRTUALX_REQUIRED="test"
 PYTHON_COMPAT=( python3_{5,6,7} )
 inherit kde5 python-single-r1
@@ -87,7 +86,7 @@ RDEPEND="${COMMON_DEPEND}
 # bug 630508
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}"/${PN}-4.2.2-tests-optional.patch )
+PATCHES=( "${FILESDIR}"/${P}-tests-optional.patch )
 
 pkg_setup() {
 	python-single-r1_pkg_setup
diff --git a/media-gfx/kuickshow/Manifest b/media-gfx/kuickshow/Manifest
index 72c4cb87fda6..922e58e693c7 100644
--- a/media-gfx/kuickshow/Manifest
+++ b/media-gfx/kuickshow/Manifest
@@ -1,4 +1,4 @@
 AUX kuickshow-0.10.0-handbook-fix.patch 331 BLAKE2B f3ec13cfa1d64906be0d468cac32c240edb06b9d33213decbf046c361ccfbbbe450099445c62054bd2414e5625349d65a612935738420ea4fdb59085eddde5a3 SHA512 e7101a76a597494378f354e110e3c8d660b825174e5fab14b480ac19ff46cd29e3bf3e2f34718530efa5280dade0e6641062ea3a523b535cc841f31486c0f4f9
 DIST kuickshow-0.10.0-r1.tar.xz 879364 BLAKE2B 43ef0306988a4154bfdf33e1b5858d3985cdb9134adf5a657854ac14ad0a12ec13265e287b479baa5096f5eaa1b35515cb6d44a51a83eaf1c19f3401541f2c42 SHA512 d65082959d784884fb4411c3e3f6145606bc3f02d7a8c63421d216e8ae6da89dcb5e57ba0ab88b5a1cd31368ff111700cc58f98b74a1e481e6109173d253fd29
-EBUILD kuickshow-0.10.0-r1.ebuild 1066 BLAKE2B 9d90e74bafdb6bbca5b742dc322d2dfc9ce360f8f507d3beb8c4ba8c8187a316fce9d804c721a6a0b4227742ce8661158fab3fbaecbe8bade34761381e0dd0b8 SHA512 41564fd6221f9a878837d6df435b7e8330c9484948f7575a4377aa8cca7848146a1fa409fcfbf9c3e6582e58679845cab7c74c842562bdb2caa3317498592bc1
+EBUILD kuickshow-0.10.0-r2.ebuild 1024 BLAKE2B cd9df9f23b5ecd1a963304c9975d29b39d5eae57eac71be0852bc7f38d2e724be835db0092e79be4daff9c07ec5dc7b80146fe1e7c33ca7ac90f5ccbd2149ecf SHA512 d8573433c56b53857fbf8457070613d7c6ee3ee986c8c196f2ba0d5283cb8039d42da3d1fb09f6f4df74efc7cb591a00a88aa5a782604a44f5f3540e9469125c
 MISC metadata.xml 368 BLAKE2B 2e35a817f35b6cd1371efcbc8c9f178d378d9951a7f72068020fb27e5aeb7de5e903e20c65355780ab66ba08c0655b16fdbf48aa8f02cba8a66cf706c813b730 SHA512 9396698295f746c83f4fe1cc56396093feedb617a0a8cd1fa750b9f3099d9db014329d021af1021b0a22e73a3a8190b10ba5b80c0e753ea526094382e7495d20
diff --git a/media-gfx/kuickshow/kuickshow-0.10.0-r1.ebuild b/media-gfx/kuickshow/kuickshow-0.10.0-r2.ebuild
index e29430931ed7..bc642ba5f883 100644
--- a/media-gfx/kuickshow/kuickshow-0.10.0-r1.ebuild
+++ b/media-gfx/kuickshow/kuickshow-0.10.0-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5
@@ -19,7 +19,6 @@ DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kinit)
diff --git a/media-gfx/mypaint-brushes/Manifest b/media-gfx/mypaint-brushes/Manifest
index 22498c4bbb41..56ff6399e855 100644
--- a/media-gfx/mypaint-brushes/Manifest
+++ b/media-gfx/mypaint-brushes/Manifest
@@ -1,3 +1,3 @@
 DIST mypaint-brushes-1.3.0.tar.gz 2447093 BLAKE2B 26fc22ef7669f5d88b1cb2bbc4562baffe257c112baf4a782f5045becd17a0bea577f79f290ae51b38cb3030478ea9d2e251033cc95101caacc823d139fe4ce1 SHA512 f8e0050cd700358d75cd25e40acd73905e2a53f21c6177cf67e8012aa4fbba8dc445109f07601c3846f95532a40feff4441081c0aa4e958049fc0ed8008fb414
-EBUILD mypaint-brushes-1.3.0-r1.ebuild 523 BLAKE2B df17567c715af5a9cf4ba9f0f65d69e72074c30648f9805cd8e39936c7c0d04c9b21928dfaf322dd843aa1cd64fc60700717c157f702ce88cdbcffbf94904d00 SHA512 18ccf11a117e293494ca85c261d173b6d495881d47992e2b529388a6a5e9d981d433e19b21a376fa82b343c664b023b7f7566145b3674205cc2facaa2f0fa24c
+EBUILD mypaint-brushes-1.3.0-r1.ebuild 529 BLAKE2B 9af6371367e26d41172a7f88dcf9135c726772989260448b97fb5a10a038164a0c2083b8e32253fe1300b5c1d39f8ab02bef32ac1d0c2bf0e7ceb7c47f1e6276 SHA512 4a3f706de354ef2a33b465a729fce1d16db19358626ee6d0d8e8093dbde9e2ab756fbd79d6133547a8c32d56bca54cc5c222bca575617d648d9c8b447d98a998
 MISC metadata.xml 216 BLAKE2B a7f17874d9514cafd0bbab739d143a00ac66ad8446bce8e05932d122c1631d29ad8077c2bcda021bc92b7e89b77c03d55e8997cf250f3bb55f8a1aca046bb2a7 SHA512 1de1c9f4b223876125a0321126f2d7b1b564a113d24ae86b380c4d67bdf58ed4f2ae1a1f5d686211ccf4851eea8e970c20109977abbc79d0cd855164b6474e23
diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
index 3a39bb582fd6..96c9e1aba159 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Jehan/mypaint-brushes/archive/v1.3.0.tar.gz -> ${P}.
 
 LICENSE="CC0-1.0"
 SLOT="1.0"  # due to pkgconfig name "mypaint-brushes-1.0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink
diff --git a/media-gfx/optipng/Manifest b/media-gfx/optipng/Manifest
index 1a2e413710e3..b361ab1a39d5 100644
--- a/media-gfx/optipng/Manifest
+++ b/media-gfx/optipng/Manifest
@@ -3,6 +3,6 @@ AUX optipng-0.7.6-cve-2017-1000229.patch 903 BLAKE2B d193e4c62813e40b653699d17b4
 AUX optipng-0.7.6-cve-2017-16938.patch 878 BLAKE2B 8ad045b58d4e9072576b50c2f3b2052bc9e877ccfa367a039af27071a999deeadc48c418c5b5b5911022c08a212abb96f486dcf3860da7d74ae2a0978f82de9c SHA512 ea3e0e4823b6acb88f06cb56934147c147b98776f501c09a170f05a0b94355dd08539bb2c3ee69d47293028770df6134c3c648d091e14d5362f360961ee9c468
 DIST optipng-0.7.6.tar.gz 2202237 BLAKE2B f113027ff12f2fc97bd4dc43b8e62f5af8f86e251b43c0f86ffbd59366b329d1fc2a58103aa349cb18fb0c9d2e5f051517439c02aeb44ee435c6fff0c75efb7a SHA512 d31d7494c23413d87b601a706cc2faf82923156a818da66e0bfad11741aed065db8f1b0c088d2abd66899ac192408c05f594295ded2684c4549c5f03b140a184
 DIST optipng-0.7.7.tar.gz 2329555 BLAKE2B af3e1c806522282ccbf9325c0b49f61a30d24b8e2db2dd8ec316a312d0dea595cbb6e8b5b38ef5ea90f1efe14244b81f85f88e11e7334fdd4b91b43b6dae8e7d SHA512 c33b7650143ab39944d2c066e07e10273c37024c5bfe7c00475bfb513af96afa081ff388164845d426d3bce624c0282dee574fa150e963f18d3683d821030280
-EBUILD optipng-0.7.6-r2.ebuild 1418 BLAKE2B 01607a670df74745d7b553a9893e2f27edea8fccfcec222040bb0e3d6fef6595979e82867f3d01145262f89ecd2246aaa5e7d4224e7f590208626047587814b3 SHA512 55936ab0aa173ba316e322a4a11d036dfa63ff198c8d694cbef1f4acbce6e4b86a65d06f9af336a58f2b61f8346292868aa219a876ae2f022e3924c31aeb72f0
-EBUILD optipng-0.7.7.ebuild 1294 BLAKE2B 82119e3513a19c807a231059ae09a974642a946ee2ebe562fc6e4d04eaded1f3f488a513574d81806bc640e73677be46a71cb13b9cea467f5c308a9c4a6ae7a3 SHA512 b9c36d48675575cd3ed27c0a604302b0e0223fe4647d6436e3e706a96f085159ef434d7a29776b6d55193fa7eb92f18fc6696145da2a630eebccad6555f0902d
+EBUILD optipng-0.7.6-r2.ebuild 1421 BLAKE2B 70322d5447186354a43c2a0efe46fae53b6fae7ab0a7e47436d179c745857d9792c392a39a7a391319dcb83b26fd2e3a49ef746d7bfff4b412f0468e80b93a9d SHA512 f1805005c8dce16e50786721b84ff80609917edb0167423c253f608b250fa06540f4f524a41d2558ddb4f6a3f5791dac24d0b21d5e1b523fbc6f7fc8ba04aab8
+EBUILD optipng-0.7.7.ebuild 1293 BLAKE2B 1a16a8809a13617412e763106536811c5231f0582ed3b448793884070aec5c37510132d1dc47c322b7837fccb46388ea18fbb932f91a13f203feb947a2e0d12c SHA512 f2c8fc7225ca4fda3e347ed2db2032d0d18942577826b4bfc0d5b29a50e6df54ebf907b5608096a7275bbc0c773ee394772d6c9913e25fdf6a1172c4c314c8f6
 MISC metadata.xml 326 BLAKE2B aa1da3dfcfd0faa4d1bcc901659c15b3ce974eace4d7b1317c7fcfdac13939ca4e0ed9d58eb46e7921caefe63475fcffe3193ad138506c9e16b0d8d9abb73bb8 SHA512 57810d8957812cf02573aff451fb8248944bd100beaa06412deb4b5622161fca2ee466ad80050d68e94acf5e2e7963c6fa657416996c0503da6ac88f1f00efdb
diff --git a/media-gfx/optipng/optipng-0.7.6-r2.ebuild b/media-gfx/optipng/optipng-0.7.6-r2.ebuild
index 8bcd3333a037..19129f893305 100644
--- a/media-gfx/optipng/optipng-0.7.6-r2.ebuild
+++ b/media-gfx/optipng/optipng-0.7.6-r2.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/zlib
diff --git a/media-gfx/optipng/optipng-0.7.7.ebuild b/media-gfx/optipng/optipng-0.7.7.ebuild
index a2b4dcd7be71..5f5144487284 100644
--- a/media-gfx/optipng/optipng-0.7.7.ebuild
+++ b/media-gfx/optipng/optipng-0.7.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/zlib
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index 9f44eea6f64c..7233e28df9f8 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -6,6 +6,6 @@ AUX povray-3.7.0.0-user-conf.patch 1491 BLAKE2B ee99672c70a5d7e12048acbfc50a3ef4
 AUX povray-3.7.0_rc6-darwin-defaults.patch 920 BLAKE2B 9cffcda18626cfdbea9a6b00ae99ee300d6b29a79e22229e35d116070b4a1ac1fbb4869242a043155a4fa189f701e6bc318cd3ba8fbc743d497db26c763926c8 SHA512 17ae635430f0d57157c9915ce5b25a88afcb34f6dd9552b27a42b32d638fdfbcb8b4e41ec89b52048db9d054812535b7b41f328ffe4554e719e4a3de21cbfdee
 DIST povray-3.7.0.0.tar.gz 38191521 BLAKE2B 5d936bdcdf9910ede2247cfa5e3881211da00762ac4bc08225dc6b53addc9e09546de9493e642b5d41228d81a50a4bcfbb5e606eb8bd9a224bb1afc5fc82db6e SHA512 82e3dbcd58b7ae921fe3b953815ca4dbbfb22eda434554baee4accabd1455b18cb511061f1cf9cf93128fab0a042df374fe2f68186d78c19853a465bd4bcbe10
 DIST povray-3.7.0.0_p20160914-fix-c++14.patch.bz2 12876 BLAKE2B b1c458764f04a57420a4562e9faacae4ae955c3d9ce4343ffd49176bb575f63830fcd58d0777dea22b975df118aa14e2bdd91509758d33d659daa3fbbaba5880 SHA512 3329da12a822762559445e208a746ff208c39f7b63e27ba84a390074bb52a105c9a2f66180e58c5157795bb16346e11b5b05efaf077ee0d8246179975a692b04
-EBUILD povray-3.7.0.0-r1.ebuild 4513 BLAKE2B bca3975cbff9e41c8c5f560f554f0f64bff7d0d5a14eb27185e960ba56ee04cc4ff9fa779aa4aac40bb4a4548edaa267b34669c856abfa015a234526bdd13bee SHA512 deb99cdee185fe98d00c744ace38dc434188050bf38b2f62b2320cf3a0fcfea670b64c4ce8f28020354f9412276721906fb9704828aeaa6de3b48362eae8ed50
+EBUILD povray-3.7.0.0-r1.ebuild 4610 BLAKE2B d685d139c0a68deb3079a7b573f4086d6fd53383ff08bf7ba8044149aaae799245ed8b2a72386949f0bb853228d0dbd3879e185e5ec1683de633b5d712908f37 SHA512 b4fc9a89a08f471dfeb5692e10644f38b4a305f14b77cb53e307e8d5cffc38afea0c4b09079236e08f6752761ad5d45be6450794fa7cc30ef7dee62596e95105
 EBUILD povray-3.7.0.0.ebuild 4392 BLAKE2B 7889135b1482356090f1073d4680e17905335c7586f20d47d8dc29c375e802c3440786ede36715e3f873c70d2ff61f30fff0ab2125024aaa12dfe36b99b871d1 SHA512 c74582d9f9534c9b1c3976e2c7bb5d61a4e24afcdf4ffe08ea2626125e96a5549805d0ab5fca60410da4842e446932dcacea2d628391282f8c6dc06980c56a5c
 MISC metadata.xml 504 BLAKE2B f0b8ba895e8949a452dc4ddac0f3e78513b3c91107131d288e9e4ea7d1dd406622ac8a3ddeacd0b3df039ce95ab6f3dd339b80bf91f48ea99ab6d5c74a6cb4d8 SHA512 e2146892acd26bd3fc03fe1733f67073a1db1106f568ac886548b7c3e4fef508d1f3a619d74b8573696f007ae764d26e1f8556c3dbb03b9434b71258f0bcbb00
diff --git a/media-gfx/povray/povray-3.7.0.0-r1.ebuild b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
index 2b48c77734e6..25d38e4a1bca 100644
--- a/media-gfx/povray/povray-3.7.0.0-r1.ebuild
+++ b/media-gfx/povray/povray-3.7.0.0-r1.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
@@ -67,12 +67,14 @@ src_prepare() {
 
 	rm -rf libraries || die
 
-	# Change some destination directories that cannot be adjusted via configure
+	# Change some directories that cannot be adjusted via configure
 	sed \
 		-e 's:${povsysconfdir}/$PACKAGE/$VERSION_BASE:${povsysconfdir}/'${PN}':g' \
 		-e 's:${povdatadir}/$PACKAGE-$VERSION_BASE:${povdatadir}/'${PN}':g' \
 		-e 's:${povdatadir}/doc/$PACKAGE-$VERSION_BASE:${povdatadir}/doc/'${PF}':g' \
 		-e 's:BOOST_THREAD_LIBS $LIBS:BOOST_THREAD_LIBS $LIBS -lboost_date_time:g' \
+		-e 's:"/usr/include":"'${EPREFIX}'/usr/include":' \
+		-e 's:"/usr/lib":"'${EPREFIX}'/usr/'$(get_libdir)'":' \
 		-i configure.ac || die
 
 	sed \
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 5a23145c3d72..f653d227c5aa 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -10,5 +10,5 @@ AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b
 AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9 SHA512 a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093
 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965
 DIST sane-backends-1.0.27.tar.gz 6430188 BLAKE2B 90f910311e31a436eaa0ca0fedd998aac3331f89a346f31613776ebc860a10cc37055fd15db8de8d743498914ea0c16e4153dbaa101380eb6e36857d730c3456 SHA512 c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5
-EBUILD sane-backends-1.0.27-r3.ebuild 8134 BLAKE2B a771fe78d1f77d7230929c81701abce57b455ce9da91df4f4b17e111e10fbe6a9135b6cc2a3bdd10382e49c53af2342e0082c7cd7e6428d40658288666938658 SHA512 dca0a98e48802811198dbaa6b12288364a1cd9f42542af9cfbeb52d1f0c5ff4127ec02a7c524094964dc74737e2eb4ba4af04128abcf7a9dcdbb3809a6c9ef21
+EBUILD sane-backends-1.0.27-r3.ebuild 8133 BLAKE2B f7854db7ed404b086ed600e0435c9bc53227b5b34d237f3b883363bd938cce12893f90432e76446249ff3ba00fad67eed9dd2282b01142439e0c6c6ba8d0483b SHA512 70890882acefc387de8988f51a2d09fc1b90794032016bea46ab0f6c624e7161dfa4fa6904bcbb22748a8c7a368058fd319d9058d37b1c1290672a177b86091d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
index 597f5de44373..ee30f55eb01a 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
@@ -122,7 +122,7 @@ SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz"
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 34765c43a3b9..ae9e7684b6d0 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,3 +1,3 @@
 DIST shotwell-0.30.2.tar.xz 6461648 BLAKE2B d54f34c05dcb092149129977bf59f0434ec4082929e3c87d9b4e774f85b47d73ecce1e80a6a29965194e9791eecb018405b43f082fb8b334c8d012f06a00b817 SHA512 ee74b9d3fbc5b2a5ca87cbc351fa99f6afaec4ce717166f55d79f41f1b039c272ed9028eb3919874f086f934197806738a54f428e790bca50dd8c9af61c21c36
-EBUILD shotwell-0.30.2.ebuild 1782 BLAKE2B b828d36afa8651eaf3aac2bef84a35d17a1254cf4f58616e81055bc1e5da313f6cdf712a71a9490d1cb9db5ca7a7c251355931d770dd0bc347441f15f45b66d9 SHA512 eecf747b03d04d0b8fcee5be53191a449a48cd3e4f0b8e46a627ba48b3fa5d779314249af4f222eeda1d691352e3622ba2591c80e9c2d1774acbbbc41de40235
+EBUILD shotwell-0.30.2.ebuild 1810 BLAKE2B 8bb8b28982edaf98722d1f49311e537aca0c27650c37af33aea7dd6c07658f15e88b6829480196e4b918e50ceb70c62ac1b1724fdd97cb90ea6c2814071ecbac SHA512 b7d9098bd1f37c4e86f7feab906ec4bed32c245972fa5bb6c359c529930cd295c7eb282cbf9871cbc03391520022a28d089e83e4bf14f1af5da6f4020790f563
 MISC metadata.xml 915 BLAKE2B 7f83fe936f9a575c6dd12b014007cd97c5a8ada9aa5e55ddeaddefa4eb05d724a068c81d2f6f41c5b1bae01ed2c4326eb5eba5d4bdccf48619edeb43a8eaabfd SHA512 1b226f7fabfd7f5ee4d82b28ce2998273225319b055c01509cc5e493fdc037941c0edd0099df5dada00228fb225bf5e35d0035d3cd244890ad0cbd929b84d214
diff --git a/media-gfx/shotwell/shotwell-0.30.2.ebuild b/media-gfx/shotwell/shotwell-0.30.2.ebuild
index c985cea9a6ba..ee9640e9a572 100644
--- a/media-gfx/shotwell/shotwell-0.30.2.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 VALA_MIN_API_VERSION="0.40"
+VALA_MAX_API_VERSION="0.42"
 
 inherit gnome.org gnome2-utils meson vala xdg
 
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index ef19ea700574..45246ee02049 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,6 +1,6 @@
 AUX 3.26-add-control-optional-deps.patch 2773 BLAKE2B e6c3faa98ecda13c926752defef389fd155f615df2010d8499aba7870b929f520662f5c718f457edd5f14f68c26d63ab58a5ee1a583af9f5721d4cf4141385a8 SHA512 e786172609ca64afa85663077794cb146edf7f59bd6187bc253d2ab682f5cf244f5238df18648641f7450ce6add97f2db1adfa11b52a3ba5e29c16356e9fac08
 DIST simple-scan-3.30.2.tar.xz 512540 BLAKE2B 908af68fbd297e2cc0c0c5440166ebc706f6c0a1a88948e9cdfe30a2e9e548125b31e6a00684a8a0db8e4c37c9d0930765b74e2ba9e1d540e4ae705cfd404349 SHA512 3a4d19bd36a88124ba43d388807afd1d6a51fc691ed83570a095e3b9719b5db5f3eb457a41bc8e36f2f1bf25ff4ab83edc150d4cdddd0d528e9280ea2da6cdb6
 DIST simple-scan-3.32.2.tar.xz 790800 BLAKE2B 98e502cbc280285dbe20a0c843d5f8d8b38707e973f2ba6aba2ccef9d739165371f5f30d7d6658853c5a6a280ba2919a98acd02b4757b4e881f96d5a7b53449b SHA512 10322ae72461efe43a4e230443c3aca24aff6f0cab07750c6eab9ebb718889e51d8c77ff722c337f333a8952ac84f69d03ad88eedfd4432ef11f7c7493170e14
-EBUILD simple-scan-3.30.2.ebuild 1383 BLAKE2B 76b6cc19646c33c5b05720430990568ee30e707c4a88cc78b8c38a4fbe7f6111263c102dbcc5ea64009a6af2e4fa5abaf8b41fc71c1054f021d9f51530c45b0e SHA512 4b148cda38532b523f8b7f1eefa4183e7d1bb6801e895a774b62fe57b83cfc39f10cd0037b5c5a6a656851dbca352b02e854adc9817530c81b659ee122b8e06c
+EBUILD simple-scan-3.30.2.ebuild 1411 BLAKE2B 336efc46f57cc33f3522ea53a381a40aae08389ab0902d93b23ed5055bd648bf68d1b747e1d8df525f34da59fde2973e2a87f3aef8d4449c4e1d51b6036fc967 SHA512 c45ea9e8396fd2f216e0c7479691f43d6a8aad37a23ce260ec9974a991e30bc4d7d8a781970948fc87047e317f01a952a5fe4e5506562012b71d5e209479724f
 EBUILD simple-scan-3.32.2.ebuild 1385 BLAKE2B 0f406f83606d4203dd0d7785b5330db5a0cf7d5a6c00d7a86b8d5768388d8de0016100184ce6afbd95e0e4ab9e598b8d635a8abbcad00024bf7dabe491dc9799 SHA512 6176fa51739f6975a17a0e7147a152464566d3192bc7414e6239351189674768a5d83bb80575f38968e8cc57266a028947c1e10a38c16697736853023e1449b0
 MISC metadata.xml 718 BLAKE2B 46e5929721e967a667f32a8993903b635599ae06c5b5179edf0579070b2b393f750a044bc280519b820f336843d1b98a795f73ef9500a27951a64b61794901e5 SHA512 82244c0dc32c4ded72048a387cee5f350a66148ecaa12a941e4a86d9d9079f1769f1f240ee564c7f991f9d53c050e9fd3e9113024fc8831a6766ec3d88b665ca
diff --git a/media-gfx/simple-scan/simple-scan-3.30.2.ebuild b/media-gfx/simple-scan/simple-scan-3.30.2.ebuild
index d142269fcf07..91eb231311d1 100644
--- a/media-gfx/simple-scan/simple-scan-3.30.2.ebuild
+++ b/media-gfx/simple-scan/simple-scan-3.30.2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 VALA_MIN_API_VERSION="0.34"
+VALA_MAX_API_VERSION="0.42"
 inherit gnome.org gnome2-utils meson vala xdg
 
 DESCRIPTION="Simple document scanning utility"
diff --git a/media-gfx/springgraph/Manifest b/media-gfx/springgraph/Manifest
index 56de24b5849f..38116df68fe1 100644
--- a/media-gfx/springgraph/Manifest
+++ b/media-gfx/springgraph/Manifest
@@ -1,4 +1,4 @@
 DIST springgraph.pl.88 29818 BLAKE2B d203bce543b0d6d8bd8519a24c3592a852971fb18219b0b34dd207724ed1db2859befcd6f69d7b00e2c6492fdabd5a8edf75bee634682f0a56a5361c9e832651 SHA512 51d7a840778478498c23d61af7e0ef0bd795953110850d0a1ec403146ce843c6eb5efa5c0c55d84a9995aecadf7657bc253dbf5a72354207d38a6e269b2f1325
 DIST springgraph_0.82-5.diff.gz 3110 BLAKE2B 8459ffffe80cba463e95677ed264030ff150375bf2a163c081e719274b0f92cba27e5d8e5bc80923e433f332ee58773a7cbd053fc9680676193e7b852b4803bb SHA512 dcfc214c116cc8040b7eedf9a4864e84bc7c0b1f036fafb6322d9433564762135d1e845bb75891a380907059f7ebba7ed72efafb733a83a517f14af327d32e9b
-EBUILD springgraph-88.ebuild 894 BLAKE2B 186bb3fb4be074d0ffe04aad45c178c68bfeb4072c4a92ebabfe8d9b30f029c6bb8e917f343fbc576ec6b564447c724dda0c1024ae035edcb4004497e658977e SHA512 f2238d0f7cd754cad397efb1de8ffc29e7d6fff24affbdba59a19e0809680dc63922efbd8a97073504899d49c8f8832f8131fb148db334ce282dfe76ae6c210a
+EBUILD springgraph-88.ebuild 901 BLAKE2B f06389a12f1b54ef4f8804ce93a5ae8a9668eddbb568891e766cb4963a1e57f1c1f0d0514b664c32dd402d61b330baf427f2a9e80d5ac4cf236be3bc17a5bdeb SHA512 51bd108b211d07c3f083a88a25420b7e3deecc9f0f40dd040a0412aac6b259084d9ef8dca37f41295a66bb73514de393fa254fbd2772457c138d2d53527ed7ac
 MISC metadata.xml 709 BLAKE2B 73334cd9360f91db9fd8a0064edcce559dcd700771b8bc1a1f73c013bd71f56a9c6aea18bd30e2d908fff63c2bca27389c11a81edff03879342db8efac191be3 SHA512 f0dca73c130603698093f900d702c6d9d8fbc6bdde5cb95369d24f0dca7b5f35ff68d773b8056b5cf7f0f8f3bd41b5a55bbd68e4323f32d4d6a74eaaba4d72f5
diff --git a/media-gfx/springgraph/springgraph-88.ebuild b/media-gfx/springgraph/springgraph-88.ebuild
index 8b15f006c874..31742ab52d12 100644
--- a/media-gfx/springgraph/springgraph-88.ebuild
+++ b/media-gfx/springgraph/springgraph-88.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.chaosreigns.com/code/springgraph/dl/${PN}.pl.${PV}
 		 mirror://debian/pool/main/${PN:0:1}/${PN}/${SRC_DEBIAN_PATCH}"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND=""
 RDEPEND="dev-perl/GD"
author	V3n3RiX <venerix@redcorelinux.org>	2019-08-02 19:14:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-08-02 19:14:55 +0100
commit	b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch)
tree	0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /media-gfx
parent	121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff)