gentoo resync : 21.06.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-06-21 17:50:24 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-06-21 17:50:24 +0100
commit: feb0daf81d888e9160f9f94502de09b66f2a63fd (patch)
tree: b6e5c40ce2abef3da27ed50a023153f475e0ddef /media-gfx
parent: 9452a6e87b6c2c70513bc47a2470bf9f1168920e (diff)
62 files changed, 2092 insertions, 559 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index eebb57307a89..9a9a0f638c30 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index eae2294a8b06..8d90dccb1392 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,17 +1,15 @@
 AUX darktable-2.6.2-exiv2-0.27.patch 598 BLAKE2B 724290bb5c1344c0113abde04688009b3db10f530684f3f53e0fcc935a9ebef4b3680a36cb5d005e8826ea1512f0ec505b06e404d144006848601699d33d1416 SHA512 77fc92bf8d373552fc82de1927a1708b989caf0b080c8ef279692c0b9f2e95526a70d2bf4af5f62abb68ccb733af08237f9e143773cc8a75d72dfb6ba434df6c
+AUX darktable-3.0.2_cmake-march-autodetection.patch 908 BLAKE2B aa1c0cedfe1f267332f11b9a8f38ce368af02b7e4f9751b128b7af91dcdfb066a0529ae126d41a34bc3fc66f336924f3376f270674bcc7e0912d2e23d46ec83b SHA512 da1f10e86b7b9e2a3f317d620a58ebed156a5c6e0f22f429da617cb176d1c18d6d1b6706c1444c9007ccb776bc6b951e3560214e89e95b4050899ec692b74dde
+AUX darktable-3.0.2_cmake-opencl-kernel-loop.patch 952 BLAKE2B 15839776c3b03bd5aee0e71115c7e2522dd56a773bd8ab34d1953671b336a6aca5cd9b1041327ead6d4f89aaef20ee3dad7772bc949010e1059c6be680fe17cf SHA512 cdf4ae76ebf5d90e761e187f0c5d82284e77c93c8d087352a0638ba4559fd22a6de4b0dc46e6c383ca7b196585d3cfce971909f5d911f34bbff507c5d7e8f522
+AUX darktable-3.0.2_jsonschema-automagic.patch 729 BLAKE2B fdf306a513cc78fbd2b377d55baa4631b0feb885312252a784b06477afb08f8b43b742b4acfb9da7cb52c20eecf997668ff17444020690671136e17573dc75e9 SHA512 7b2f17827ad099c476f3272d9ffc41dbd3d1e1bdea482beaddb4d654d3555677212ed50df1fd83f94e1274670baecd951878280e1a052f327fce47b12ad720e5
 AUX darktable-find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b59cc73834d734c454a7c561654bc27f052de55db6c62f454927b2c701b7f4f6c52d5d2fac0b7c230b90ef89bdc9431856bd4ae69a SHA512 93023a318158850a5bac4a1d871ea6e69a3c9f2bc57f8af47bc83bb131f96e8972c23b07945df2eddfb05bffdd950e8250da77c47d1543b776a7e9405adad020
 DIST darktable-2.6.2-gcc9.patch.tar.xz 25864 BLAKE2B 857803d4c46b47b1e06e962533c231621fa23e72dffae617bc4e078316fc22c5883df404b30e63d7ed2111078d0d7b54bfa3510524c92fa739238904e2ec17f0 SHA512 29b208fa0b04aa11a2c45312763ba471785b2d0f669c07a6092b82adc0284428d7dc9ea8ebae7bd851414f04191e6aafb434fcc127f062ef66d075208c7d49cb
 DIST darktable-2.6.2.tar.xz 3512572 BLAKE2B ee3070ac0f6b6b1c401865801631fb28397f484f30778065b7f899204813530a47ff6e752504b645f59bc29f868e1498e39f5f4e70f8259d8fecf5abc3f15cd6 SHA512 e7a90535747a8615fa2dbd1eb05f81314cc61c689a8a85fda0e2be40208ab0248e6f6ef296bb0894d3d527ed47c6cf6640538029c0c2d58a38d2d5ce10f6f5c0
-DIST darktable-2.6.3.tar.xz 3522292 BLAKE2B 7f631a4e68affa41adf538355bd6d0dc8a79c24003b56f414061f8da95f200346fc8b54274fbc256daf705b300d55a370a6d6f24e3420d6f3ba8f848e59fcb98 SHA512 4672f4f4d5fa57fb0d53d3886cd2773a6036334b85a0df29995f1a67c59d6b57534e06c8bf1666c8e294dd92db1197113bb3d625512671625c14e0abf5e2f14c
-DIST darktable-3.0.0.tar.xz 3827412 BLAKE2B c461db8dbbeb1342c2911aae3c9803d7762c10bcca434f2a9617e6b83c838db4cae2846a1e40444ec12dc48e3ea210d4d98d520e7a5731fb457b9c03d5344c5d SHA512 de154cc19281f61316363243db3e531be33ac4c4632d6277ba715884b83a3c35f1d433a0e53f5f1eb7ffe03c6fcba4629612c94f942c196807c876b421faafc6
-DIST darktable-3.0.1.tar.xz 3859720 BLAKE2B 5d3145effaaf8f6f7013575e9ae76a1e33aca3e2144d00748e9bf76057822d9fc4767b0908de923ba803c1c0ebcf83858a6ff72965e465679c2df5742d9da475 SHA512 a01830c5177512fb7b59f07a5ac594b486f854d41e7123faa0252caef52386ef3df4896f2c23a61b57a2b9b7bec33f3fd2f1fce6cea1388e1b74056a159e7ffa
 DIST darktable-3.0.2.tar.xz 3931240 BLAKE2B 5f86579a43e396c8116aba63c43e13d7312e5c3a569f9c242fe9a7882f02c5e0ebd7e4b9bbd34576eb83b3b78298038bf0d87bf4786dd19d0fa73ed30de21f67 SHA512 ee2d83f60621586f9e1be958f4b0c3d2214fbf30338837dbd07b901641c32d565cd29f814f5ff75a450495acee2383aa62ba3da3873009077704c925bab501f1
 DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce SHA512 e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
 DIST darktable-usermanual-3.0.0.pdf 16237603 BLAKE2B ff5c24bb038deb37269a84389937740fa0ff77a9fb5bef4c484cdd903e39609588f632f577ce53c690d3abb832ace451d0d9d3f563ebdb6196ae8e2dac008a01 SHA512 2523b48e2baaa71561dc119340aed3bbf2ab4481dceb0c3ca2bbb7b0cacfaab894fa4eef82b667648cd7bb049304dbda09fa1a638f7734219b672b3ea8ee0eac
 EBUILD darktable-2.6.2.ebuild 3879 BLAKE2B 58de04e0d0b727c939ece0f11a3fccf30f2cd7e81ef11e6a64a4857d2bdfe77592e2e748dc64f34bd27b20603f1a2270e1af0d78b5d280f5d8c98bc403c38e68 SHA512 176fc9b85a1c4d5c28032e435e92c59299c857731c4c1e01490ca57aca18704187e0b62c5d9b7dcca4ac760cbefdf7a00eb3b66b036902ff7c4a6e3769b27f80
-EBUILD darktable-2.6.3.ebuild 3791 BLAKE2B 261a2e330605f1fcfdd4b1bb8aaa37918d98130391e4357f5b37e56587e835a90550918f3b821166204f094180946289326be0131e91441cf465f6d30146eb76 SHA512 02c5232606639bde660acbdab7099074c1d649a65029ac730cf63845c6214dbf110e861dbdfd27a2ca4013be5280fb81372fcf701e0f16aafa042a2e8432bcef
-EBUILD darktable-3.0.0.ebuild 3758 BLAKE2B 6443b09c668cf00d481b48eefe766513b7b49d2e72bae760318668fe4cf65c0320e90e1ff903ee5f8bcd34a4157bc26975d67e38d2dfd1dc11d8b41c8ec6c8fd SHA512 13d8437dc3036ee70e4d7c41780e27a67841feed0169fbd4c774508c3a8198373b60d1b7524d470724aa8d5bf842ed49d56ac15a5a7396c9b0f8d22db0c16682
-EBUILD darktable-3.0.1.ebuild 3822 BLAKE2B 981f9d0f4732719a232064a82713150f83d50dc25ee9da208360272f9c7fe5fa4c9dfa6fa6edf2c03936d807af0e0c46ddd80d7e93ad5a8931c01ae611f13f63 SHA512 343b9312d48cc3f018e4c0a2b87be69d68d669ba847d42a2e0dcc077d6d17a3a069584d053497b7c4462c1cc4799702a0953e38494d56429d108184f3f9b11ad
-EBUILD darktable-3.0.2.ebuild 3822 BLAKE2B 981f9d0f4732719a232064a82713150f83d50dc25ee9da208360272f9c7fe5fa4c9dfa6fa6edf2c03936d807af0e0c46ddd80d7e93ad5a8931c01ae611f13f63 SHA512 343b9312d48cc3f018e4c0a2b87be69d68d669ba847d42a2e0dcc077d6d17a3a069584d053497b7c4462c1cc4799702a0953e38494d56429d108184f3f9b11ad
-EBUILD darktable-9999.ebuild 3135 BLAKE2B 885443963d545004c2d10d49e65bac9d44c22ed1d0414f57ec2dc76a85760e09f06a78ea70a77c6f36739da0c45cc39a133954bccd5ad8af2e1a4149015b7d16 SHA512 da2ac016c0a15b14417a5ee373f6470630e045485738e39bb596365a0013ae48b1d4e0b197d7825ea17faa02e435ef2cbe95dd5b5ccf672cc99eb4cac60a12a2
-MISC metadata.xml 692 BLAKE2B 71a52ed735b9bb4dc7b11a89173418c64b8f35898637519b94966c5708b474e47e24e3c9d914b67a95c0dc1db596e712ea7992912f0fc0743087b86a7abce942 SHA512 4efcb02d1b916d8ddf7bfc5a75c992b0a0785b4421337a613eb80e92e341c8e6d66b66c4cd71c791367560d3d87387fba99231d5e19cc0d755a48b720d4880e0
+EBUILD darktable-3.0.2-r1.ebuild 3881 BLAKE2B 958ebc2d6d7b8057fbd2cea57708c415f7e17967705938d5178c705db3ab52a7684dd2aedc7d80f4603530d21bca5e536518f6ce67c83e25515764c92bb6c947 SHA512 5b9836520a9039fb06c68277e5dde1f4cf394aae92dd8fdb005d8cf0f6454148eaa769477247872c94152b2c132ad6d9a068b8e984c38c94216717f4d63798d7
+EBUILD darktable-3.0.2.ebuild 3782 BLAKE2B 79f1f8dbb810a10274c40ff93ec59a74291dd7c3d9d7fad52b44b97a1b8211fb3ef314a4cb937d6886fb6ba150e7ba0c7d4244d3e6aef70bf4ea949dd8d0830e SHA512 8094322d7c29078718354d5fac8f9e9c8be01d4cddac4d30a033b42a1d5c757171e1a90e234170d81eaece1a1dc4d699850fc8ec02ed87fdcb10ee4df384cffc
+EBUILD darktable-9999.ebuild 3262 BLAKE2B aeadead1b20cd782e263b4f67f20d18255034626b9898273827baa60fb528d632ecb831b584bb0c0ed71e1226a9e32049e2bcc96b4d03c2ee5a9a725ef3858d2 SHA512 c323d686bcd203fc58833fdb89429440c801015dab82f26dfb4133e048a2f59449f6120fb6d0165177aa30a7f7c1d6acad08016286d7b989e7731a9e2f0bc4af
+MISC metadata.xml 1045 BLAKE2B 2094a1de028b4db282941604a3af2e608a4694b47d269293c09c1874594054a2457f44a94d9802eb84502c64c714a5af0499e2d2d67a71f61980906fc78acaf8 SHA512 1e0e67191daac03f5aebed02b7981a4944d4b0da4b00b8781fb79a1a362f260e51d182fdf10cf37494ab854cb7627ea4f7d279fad7191a53c0118e8d3c791166
diff --git a/media-gfx/darktable/darktable-2.6.3.ebuild b/media-gfx/darktable/darktable-2.6.3.ebuild
deleted file mode 100644
index b08753b83535..000000000000
--- a/media-gfx/darktable/darktable-2.6.3.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic pax-utils toolchain-funcs xdg
-
-DOC_PV="2.6.0"
-MY_PV="${PV/_/}"
-MY_P="${P/_/.}"
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/"
-SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-	doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
-
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LANGS=" ca cs de es fi fr hu ja nb nl pl pt-BR ru sl"
-# TODO add lua once dev-lang/lua-5.2 is unmasked
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-nls opencl openmp openexr pax_kernel webp
-${LANGS// / l10n_}"
-
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-COMMON_DEPEND="
-	dev-db/sqlite:3
-	dev-libs/json-glib
-	dev-libs/libxml2:2
-	dev-libs/pugixml:0=
-	gnome-base/librsvg:2
-	>=media-gfx/exiv2-0.25-r2:0=[xmp]
-	media-libs/lcms:2
-	>=media-libs/lensfun-0.2.3:0=
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	net-libs/libsoup:2.4
-	net-misc/curl
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/pango
-	colord? ( x11-libs/colord-gtk:0= )
-	cups? ( net-print/cups )
-	flickr? ( media-libs/flickcurl )
-	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	opencl? (
-		>=sys-devel/clang-4
-		>=sys-devel/llvm-4
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/"${PN}"-find-opencl-header.patch
-	"${FILESDIR}"/"${PN}"-2.6.2-exiv2-0.27.patch
-)
-
-S="${WORKDIR}/${P/_/~}"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse3 && append-flags -msse3
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PRINT=$(usex cups)
-		-DCUSTOM_CFLAGS=ON
-		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-		-DUSE_COLORD=$(usex colord)
-		-DUSE_FLICKR=$(usex flickr)
-		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DUSE_KWALLET=$(usex kwallet)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_LUA=OFF
-		-DUSE_MAP=$(usex geolocation)
-		-DUSE_NLS=$(usex nls)
-		-DUSE_OPENCL=$(usex opencl)
-		-DUSE_OPENEXR=$(usex openexr)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENMP=$(usex openmp)
-		-DUSE_WEBP=$(usex webp)
-	)
-	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
-
-	if use nls ; then
-		for lang in ${LANGS} ; do
-			if ! use l10n_${lang}; then
-				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
-			fi
-		done
-	fi
-
-	if use pax_kernel && use opencl ; then
-		pax-mark Cm "${ED}"/usr/bin/${PN} || die
-		eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
-		eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
-		eqawarn "must be modified and this *may* lead to breakage! If"
-		eqawarn "you suspect that ${PN} is broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "when updating from the currently stable 1.6 series,"
-	elog "please bear in mind that your edits will be preserved during this process,"
-	elog "but it will not be possible to downgrade from 2.0 to 1.6 any more."
-	echo
-	ewarn "It will not be possible to downgrade!"
-}
diff --git a/media-gfx/darktable/darktable-3.0.0.ebuild b/media-gfx/darktable/darktable-3.0.0.ebuild
deleted file mode 100644
index c91fabeb3ab2..000000000000
--- a/media-gfx/darktable/darktable-3.0.0.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic pax-utils toolchain-funcs xdg
-
-DOC_PV="2.6.0"
-MY_PV="${PV/_/}"
-MY_P="${P/_/.}"
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/"
-SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-	doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
-
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LANGS=" ca cs da de es fr he hu it ja nb nl pl ru sl"
-# TODO add lua once dev-lang/lua-5.2 is unmasked
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-nls opencl openmp openexr pax_kernel webp
-${LANGS// / l10n_}"
-
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-COMMON_DEPEND="
-	dev-db/sqlite:3
-	dev-libs/json-glib
-	dev-libs/libxml2:2
-	>=dev-libs/pugixml-1.8:0=
-	gnome-base/librsvg:2
-	>=media-gfx/exiv2-0.25-r2:0=[xmp]
-	media-libs/lcms:2
-	>=media-libs/lensfun-0.2.3:0=
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	net-libs/libsoup:2.4
-	net-misc/curl
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/pango
-	colord? ( x11-libs/colord-gtk:0= )
-	cups? ( net-print/cups )
-	flickr? ( media-libs/flickcurl )
-	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	opencl? (
-		>=sys-devel/clang-4
-		>=sys-devel/llvm-4
-	)
-	openmp? ( sys-devel/gcc[openmp,graphite] )
-"
-RDEPEND="${COMMON_DEPEND}
-	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/"${PN}"-find-opencl-header.patch
-)
-
-S="${WORKDIR}/${P/_/~}"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse3 && append-flags -msse3
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PRINT=$(usex cups)
-		-DCUSTOM_CFLAGS=ON
-		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-		-DUSE_COLORD=$(usex colord)
-		-DUSE_FLICKR=$(usex flickr)
-		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DUSE_KWALLET=$(usex kwallet)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_LUA=OFF
-		-DUSE_MAP=$(usex geolocation)
-		-DUSE_NLS=$(usex nls)
-		-DUSE_OPENCL=$(usex opencl)
-		-DUSE_OPENEXR=$(usex openexr)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENMP=$(usex openmp)
-		-DUSE_WEBP=$(usex webp)
-	)
-	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
-
-	if use nls ; then
-		for lang in ${LANGS} ; do
-			if ! use l10n_${lang}; then
-				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
-			fi
-		done
-	fi
-
-	if use pax_kernel && use opencl ; then
-		pax-mark Cm "${ED}"/usr/bin/${PN} || die
-		eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
-		eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
-		eqawarn "must be modified and this *may* lead to breakage! If"
-		eqawarn "you suspect that ${PN} is broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "when updating a major version,"
-	elog "please bear in mind that your edits will be preserved during this process,"
-	elog "but it will not be possible to downgrade any more."
-	echo
-	ewarn "It will not be possible to downgrade!"
-}
diff --git a/media-gfx/darktable/darktable-3.0.1.ebuild b/media-gfx/darktable/darktable-3.0.2-r1.ebuild
index 2c9eb9a00a34..a27d9ec520c6 100644
--- a/media-gfx/darktable/darktable-3.0.1.ebuild
+++ b/media-gfx/darktable/darktable-3.0.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake flag-o-matic pax-utils toolchain-funcs xdg
+inherit cmake flag-o-matic toolchain-funcs xdg
 
 DOC_PV="3.0.0"
 MY_PV="${PV/_/}"
@@ -20,8 +20,8 @@ KEYWORDS="~amd64 ~x86"
 LANGS=" ca cs da de es fr he hu it ja nb nl pl ru sl"
 # TODO add lua once dev-lang/lua-5.2 is unmasked
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-nls opencl openmp openexr pax_kernel webp
-${LANGS// / l10n_}"
+	lto nls opencl openmp openexr tools webp
+	${LANGS// / l10n_}"
 
 BDEPEND="
 	dev-util/intltool
@@ -63,7 +63,6 @@ DEPEND="${COMMON_DEPEND}
 		>=sys-devel/clang-4
 		>=sys-devel/llvm-4
 	)
-	openmp? ( sys-devel/gcc[openmp,graphite] )
 "
 RDEPEND="${COMMON_DEPEND}
 	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
@@ -71,13 +70,24 @@ RDEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/"${PN}"-find-opencl-header.patch
+	"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
+	"${FILESDIR}"/${PN}-3.0.2_cmake-opencl-kernel-loop.patch
+	"${FILESDIR}"/${PN}-3.0.2_jsonschema-automagic.patch
 )
 
 S="${WORKDIR}/${P/_/~}"
 
 pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# Bug #695658
+		if tc-is-gcc; then
+			test-flags-CC -floop-block &> /dev/null || \
+				die "Please switch to a gcc version built with USE=graphite"
+		fi
+
+		if use openmp ; then
+			tc-has-openmp || die "Please switch to an openmp compatible compiler"
+		fi
 	fi
 }
 
@@ -91,8 +101,11 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DBUILD_CURVE_TOOLS=$(usex tools)
+		-DBUILD_NOISE_TOOLS=$(usex tools)
 		-DBUILD_PRINT=$(usex cups)
 		-DCUSTOM_CFLAGS=ON
+		-DRAWSPEED_ENABLE_LTO=$(usex lto)
 		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
 		-DUSE_COLORD=$(usex colord)
 		-DUSE_FLICKR=$(usex flickr)
@@ -123,23 +136,16 @@ src_install() {
 			fi
 		done
 	fi
-
-	if use pax_kernel && use opencl ; then
-		pax-mark Cm "${ED}"/usr/bin/${PN} || die
-		eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
-		eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
-		eqawarn "must be modified and this *may* lead to breakage! If"
-		eqawarn "you suspect that ${PN} is broken by this modification,"
-		eqawarn "please open a bug."
-	fi
 }
 
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	elog "when updating a major version,"
+	elog
+	elog "When updating a major version,"
 	elog "please bear in mind that your edits will be preserved during this process,"
 	elog "but it will not be possible to downgrade any more."
-	echo
+	elog
 	ewarn "It will not be possible to downgrade!"
+	ewarn
 }
diff --git a/media-gfx/darktable/darktable-3.0.2.ebuild b/media-gfx/darktable/darktable-3.0.2.ebuild
index 2c9eb9a00a34..1584653803c3 100644
--- a/media-gfx/darktable/darktable-3.0.2.ebuild
+++ b/media-gfx/darktable/darktable-3.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake flag-o-matic pax-utils toolchain-funcs xdg
+inherit cmake flag-o-matic toolchain-funcs xdg
 
 DOC_PV="3.0.0"
 MY_PV="${PV/_/}"
@@ -20,8 +20,8 @@ KEYWORDS="~amd64 ~x86"
 LANGS=" ca cs da de es fr he hu it ja nb nl pl ru sl"
 # TODO add lua once dev-lang/lua-5.2 is unmasked
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-nls opencl openmp openexr pax_kernel webp
-${LANGS// / l10n_}"
+	nls opencl openmp openexr tools webp
+	${LANGS// / l10n_}"
 
 BDEPEND="
 	dev-util/intltool
@@ -63,7 +63,6 @@ DEPEND="${COMMON_DEPEND}
 		>=sys-devel/clang-4
 		>=sys-devel/llvm-4
 	)
-	openmp? ( sys-devel/gcc[openmp,graphite] )
 "
 RDEPEND="${COMMON_DEPEND}
 	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
@@ -71,13 +70,23 @@ RDEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/"${PN}"-find-opencl-header.patch
+	"${FILESDIR}"/${PN}-3.0.2_cmake-opencl-kernel-loop.patch
+	"${FILESDIR}"/${PN}-3.0.2_jsonschema-automagic.patch
 )
 
 S="${WORKDIR}/${P/_/~}"
 
 pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# Bug #695658
+		if tc-is-gcc; then
+			test-flags-CC -floop-block &> /dev/null || \
+				die "Please switch to a gcc version built with USE=graphite"
+		fi
+
+		if use openmp ; then
+			tc-has-openmp || die "Please switch to an openmp compatible compiler"
+		fi
 	fi
 }
 
@@ -91,6 +100,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DBUILD_CURVE_TOOLS=$(usex tools)
+		-DBUILD_NOISE_TOOLS=$(usex tools)
 		-DBUILD_PRINT=$(usex cups)
 		-DCUSTOM_CFLAGS=ON
 		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
@@ -123,23 +134,16 @@ src_install() {
 			fi
 		done
 	fi
-
-	if use pax_kernel && use opencl ; then
-		pax-mark Cm "${ED}"/usr/bin/${PN} || die
-		eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
-		eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
-		eqawarn "must be modified and this *may* lead to breakage! If"
-		eqawarn "you suspect that ${PN} is broken by this modification,"
-		eqawarn "please open a bug."
-	fi
 }
 
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	elog "when updating a major version,"
+	elog
+	elog "When updating a major version,"
 	elog "please bear in mind that your edits will be preserved during this process,"
 	elog "but it will not be possible to downgrade any more."
-	echo
+	elog
 	ewarn "It will not be possible to downgrade!"
+	ewarn
 }
diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
index 111dc666f46f..422d45185bb7 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake flag-o-matic git-r3 pax-utils toolchain-funcs xdg
+inherit cmake flag-o-matic git-r3 toolchain-funcs xdg
 
 EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
 
@@ -13,13 +13,13 @@ HOMEPAGE="https://www.darktable.org/"
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
 #KEYWORDS="~amd64 ~x86"
-LANGS=" ca cs da de es fr he hu it ja nl pl ru sk sl sv uk"
+LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW"
 # TODO add lua once dev-lang/lua-5.2 is unmasked
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-nls opencl openmp openexr pax_kernel webp
-${LANGS// / l10n_}"
+	lto nls opencl openmp openexr tools webp
+	${LANGS// / l10n_}"
 
-BDEPEND="
+BDEPEND=">=dev-python/jsonschema-3.2.0
 	dev-util/intltool
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
@@ -28,7 +28,7 @@ COMMON_DEPEND="
 	dev-db/sqlite:3
 	dev-libs/json-glib
 	dev-libs/libxml2:2
-	dev-libs/pugixml:0=
+	>=dev-libs/pugixml-1.8:0=
 	gnome-base/librsvg:2
 	>=media-gfx/exiv2-0.25-r2:0=[xmp]
 	media-libs/lcms:2
@@ -40,7 +40,7 @@ COMMON_DEPEND="
 	sys-libs/zlib:=
 	virtual/jpeg:0
 	x11-libs/cairo
-	>=x11-libs/gtk+-3.14:3
+	>=x11-libs/gtk+-3.22:3
 	x11-libs/pango
 	colord? ( x11-libs/colord-gtk:0= )
 	cups? ( net-print/cups )
@@ -64,22 +64,39 @@ RDEPEND="${COMMON_DEPEND}
 	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
 "
 
+PATCHES=(
+	"${FILESDIR}"/"${PN}"-find-opencl-header.patch
+)
+
 pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# Bug #695658
+		if tc-is-gcc; then
+			test-flags-CC -floop-block &> /dev/null || \
+				die "Please switch to a gcc version built with USE=graphite"
+		fi
+
+		if use openmp ; then
+			tc-has-openmp || die "Please switch to an openmp compatible compiler"
+		fi
 	fi
 }
 
 src_prepare() {
 	use cpu_flags_x86_sse3 && append-flags -msse3
 
+	sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
+
 	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_PRINT=$(usex cups)
+		-DBUILD_CURVE_TOOLS=$(usex tools)
+		-DBUILD_NOISE_TOOLS=$(usex tools)
 		-DCUSTOM_CFLAGS=ON
+		-DRAWSPEED_ENABLE_LTO=$(usex lto)
 		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
 		-DUSE_COLORD=$(usex colord)
 		-DUSE_FLICKR=$(usex flickr)
@@ -110,13 +127,4 @@ src_install() {
 			fi
 		done
 	fi
-
-	if use pax_kernel && use opencl ; then
-		pax-mark Cm "${ED}"/usr/bin/${PN} || die
-		eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
-		eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
-		eqawarn "must be modified and this *may* lead to breakage! If"
-		eqawarn "you suspect that ${PN} is broken by this modification,"
-		eqawarn "please open a bug."
-	fi
 }
diff --git a/media-gfx/darktable/files/darktable-3.0.2_cmake-march-autodetection.patch b/media-gfx/darktable/files/darktable-3.0.2_cmake-march-autodetection.patch
new file mode 100644
index 000000000000..8ad4f0e9329f
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-3.0.2_cmake-march-autodetection.patch
@@ -0,0 +1,26 @@
+Darktable and RawSpeed upstream support two build modes: if BINARY_PACKAGE_BUILD==1
+they pass -mtune=generic to the compiler, otherwise they use -march=native.
+In either case, these options override externally set CFLAGS.
+
+Disable this behaviour so that the users' settings provided to the ebuild by Portage
+are respected.
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -521,7 +521,7 @@
+     set(DT_REQ_INSTRUCTIONS "-msse2")
+   endif()
+ 
+-  include(march-mtune)
++  set(MARCH "")
+ 
+   #if(NOT BUILD_SSE2_CODEPATHS)
+   #  set(MARCH "${MARCH} -mno-sse2 -D__DISABLE_SSE2__ -U__SSE2__ -D__DISABLE_SSE__ -U__SSE__")
+--- a/src/external/rawspeed/cmake/compiler-flags.cmake
++++ b/src/external/rawspeed/cmake/compiler-flags.cmake
+@@ -1,5 +1,4 @@
+ include(CheckCXXCompilerFlag)
+-include(CpuMarch)
+ include(CheckCXXCompilerFlagAndEnableIt)
+ 
+ # yes, need to keep both the CMAKE_CXX_FLAGS and CMAKE_CXX_STANDARD.
diff --git a/media-gfx/darktable/files/darktable-3.0.2_cmake-opencl-kernel-loop.patch b/media-gfx/darktable/files/darktable-3.0.2_cmake-opencl-kernel-loop.patch
new file mode 100644
index 000000000000..c1fd701fb9a4
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-3.0.2_cmake-opencl-kernel-loop.patch
@@ -0,0 +1,28 @@
+From 767d48e0f60e7f858e8b31a88dd8cc1258e7ee9e Mon Sep 17 00:00:00 2001
+From: Marcus Haehnel <marcus@mh-development.info>
+Date: Sat, 21 Mar 2020 09:14:45 +0100
+Subject: [PATCH] Fix invalid CMake syntax
+
+The syntax of the foreach statement in data/kernels/CMakeLists.txt
+was invalid. This lead to errors when running cmake.
+
+Use correct syntax to make the build work.
+---
+ data/kernels/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/kernels/CMakeLists.txt b/data/kernels/CMakeLists.txt
+index ce947bef9c..f605c18b7e 100644
+--- a/data/kernels/CMakeLists.txt
++++ b/data/kernels/CMakeLists.txt
+@@ -31,8 +31,8 @@ macro (testcompile_opencl_kernel IN)
+ endmacro (testcompile_opencl_kernel)
+ 
+ if (TESTBUILD_OPENCL_PROGRAMS)
+-  foreach(IN ${DT_OPENCL_KERNELS})
+-    testcompile_opencl_kernel(${IN})
++  foreach(KERNEL IN ITEMS ${DT_OPENCL_KERNELS})
++    testcompile_opencl_kernel(${KERNEL})
+   endforeach()
+ endif()
+ 
diff --git a/media-gfx/darktable/files/darktable-3.0.2_jsonschema-automagic.patch b/media-gfx/darktable/files/darktable-3.0.2_jsonschema-automagic.patch
new file mode 100644
index 000000000000..1aa0aec5163f
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-3.0.2_jsonschema-automagic.patch
@@ -0,0 +1,19 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -319,15 +319,7 @@
+   message(STATUS "Test-compilation of OpenCL programs is disabled.")
+ endif()
+ 
+-# we need jsonschema to check noiseprofiles.json
+-find_program(jsonschema_BIN jsonschema)
+-if(${jsonschema_BIN} STREQUAL "jsonschema_BIN-NOTFOUND")
+-  message(STATUS "Missing jsonschema, problems in noiseprofiles.json might go unnoticed")
+-  set(VALIDATE_JSON 0)
+-else(${jsonschema_BIN} STREQUAL "jsonschema_BIN-NOTFOUND")
+-  message(STATUS "Found jsonschema")
+-  set(VALIDATE_JSON 1)
+-endif(${jsonschema_BIN} STREQUAL "jsonschema_BIN-NOTFOUND")
++set(VALIDATE_JSON 0)
+ 
+ # we need an xslt interpreter to generate preferences_gen.h and darktablerc
+ find_program(Xsltproc_BIN xsltproc)
diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index 21e610fbc04d..08c6f2bb31f8 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -1,13 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>maekke@gentoo.org</email>
+		<name>Markus Meier</name>
+	</maintainer>
 	<use>
 		<flag name="flickr">Add support for uploading photos to flickr</flag>
 		<flag name="geolocation">Enable geotagging support</flag>
 		<flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
+		<flag name="lto">Enable link-time optimisations in the RawSpeed library</flag>
 		<flag name="opencl">Enable opencl support</flag>
 		<flag name="pax_kernel">Triggers paxmarking of main darktable binary</flag>
+		<flag name="tools">Install tools for generating base curves and noise profiles</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">darktable-org/darktable</remote-id>
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 650ea0f6934e..bdc918a075af 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,7 +1,6 @@
 AUX digikam-6.3.0-cmake.patch 2038 BLAKE2B 73c6c7d008c3b76f9347f4192d435e10aa3607abf62436372ef131ac034ef538c1baa8d0d03e6b587b771fb766fa3286c649a6ffc7640a2f21e292b1e524cab6 SHA512 c8e6d2fd6c18d8c8e8733dffd1e0e2fb66b8bf3496aa6f767a4c633a56733c85bc53bdceaf689e84beca672a5013a02349cfca73d9f1e89a99252c7bac526a4d
-AUX digikam-7.0.0_beta3-qt-5.15.patch 1796 BLAKE2B 14ae2f4b83063ec5be0a14ea7969266d36c8229a7ad5e6070976d34557165c4b3672cbcf340c256b8025ea57de91540835413736f233aab76a022fad8a8198a1 SHA512 eed37b8596b23cb22ca4d994f30258b2056ef074db38e1b740c01c726faee5021367b56bf50c768b727c56be8b4a23b7731d20a807b437d1d6e6dae8eafb75c2
 DIST digikam-6.4.0.tar.xz 340146992 BLAKE2B ca1bc8b0d165f9774354d8489a11d46d8d7467edd3c1e90fd3a96024c4b7cd23bfd5c813251183bcca6d4beac9bffeb9d921beaa9a3752f75f1918796aacd719 SHA512 b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c699399994199b848757f0497ad25a7805e42
-DIST digikam-7.0.0-beta3.tar.xz 571307796 BLAKE2B fb0d82557c3a747f8a4b0a188f9ae7a0f06590ed59eed1418647b73a21c59334473dc0c33018db7f27572e574ac56a202a36a47a26c4b5b589a7f54c1987d2a5 SHA512 da25e1a2ab7c426f9f437c4ed81c334f435fcabf6d388f083bc5192cca9df8114961451adbe8d4e86df319a0a7ae125fb527ce406fce349632b59912777a1f69
+DIST digikam-7.0.0-rc.tar.xz 566061948 BLAKE2B 0f167387c7110223764f203c829079eb677de0251f440b65d7dbc9c6b6e49a77d7e7bdd44d3f578338b7a06a3a7f694402b7a406537075c4cc32a3abb59cf159 SHA512 fbfb3b91038fa76b3f699304318f91e429f6ac51424f9895d48cf30b5319029a8e2b3791adba56b444329916d51fae5a8adc8f6aedbeae36fd165e781742119e
 EBUILD digikam-6.4.0-r1.ebuild 4310 BLAKE2B 9c69ad526cedaac830105b620f2ee096504ca4e78c4ee4a6db60ac1398602be51bf1fe38a5b5dc338af2ae87ea041c93f3d1861352303c709121673034962133 SHA512 02d6beb8875c218acfe8f42d7c08715b53282b6d9a57949c8eb70176be6680a5b752719087f26b4cfa6bcae47e055c37db62d55cbec80ee6ddb4539ef2423b98
-EBUILD digikam-7.0.0_beta3.ebuild 4251 BLAKE2B 35af6caa153eef7396deb5124b98501c9aaeb0bab75b78471aeb84e55dd28420aa75ae87d0889b3939d5d5d251c50d3be624d462cf02cf24208a65f02ad70919 SHA512 6cf34189e4fa90ed110fd7e13739c2febccf222e59a5574b679d05705cd11794f14f63d23314bc0904d5bc1ed0266dc9701150f0a24301b7863ad3c1b0acc9ff
+EBUILD digikam-7.0.0_rc.ebuild 4084 BLAKE2B fab6cca649fa9ff160e754ec45a5c70a45139c92fc79d8b740c2e24250931a43d6a304c506445db8c4ae1cac3958dce5634ba2cca43719373a0f62617b6b5523 SHA512 3bb5113b79604ae17fdfeee9fffa730dbbb06e884033c9ecb7ab9d23bcc1e30f70d5cabf9d8535503170d953be6abefe21c59f9409aa33dd3946eccd656ba600
 MISC metadata.xml 1368 BLAKE2B 5dec50abba4f748e1f8eb465807c719f4b81759277241169d9e721749a1ba807425f7d46e9feb1edb4dcf3b4dd00b40bfbb353fe479e29c8a1878ad1fbfb5082 SHA512 4cd1ada9c4274338e49a692095d80b572c309bd34c838e2663a18ec1e7230de87e27087febfedde46a0f6af19f1a3f440335750375117d20eacd0c756db8b2f8
diff --git a/media-gfx/digikam/digikam-7.0.0_beta3.ebuild b/media-gfx/digikam/digikam-7.0.0_rc.ebuild
index 3659f26f6ff2..742181ff7bbb 100644
--- a/media-gfx/digikam/digikam-7.0.0_beta3.ebuild
+++ b/media-gfx/digikam/digikam-7.0.0_rc.ebuild
@@ -8,12 +8,11 @@ QTMIN=5.12.3
 inherit ecm kde.org toolchain-funcs
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	MY_PV=${PV/_/-}
-	MY_P=${PN}-${MY_PV}
-	if [[ ${PV} =~ beta[0-9]$ ]]; then
+	MY_P=${PN}-${PV/_/-}
+	if [[ ${PV} =~ rc[0-9]*$ ]]; then
 		SRC_URI="mirror://kde/unstable/${PN}/"
 	else
-		SRC_URI="mirror://kde/unstable/${PN}/${PV}/"
+		SRC_URI="mirror://kde/stable/${PN}/${PV}/"
 	fi
 	SRC_URI+="${MY_P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
@@ -25,7 +24,7 @@ HOMEPAGE="https://www.digikam.org/"
 
 LICENSE="GPL-2"
 SLOT="5"
-IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
+IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop webkit X"
 
 BDEPEND="
 	>=dev-util/cmake-3.14.3
@@ -91,7 +90,6 @@ COMMON_DEPEND="
 	panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
 	scanner? ( >=kde-apps/libksane-19.04.3:5 )
 	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
-	vkontakte? ( net-libs/libkvkontakte:5 )
 	!webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
 	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
 	X? (
@@ -108,8 +106,6 @@ RDEPEND="${COMMON_DEPEND}
 	panorama? ( media-gfx/hugin )
 "
 
-PATCHES=( "${FILESDIR}"/${P}-qt-5.15.patch )
-
 RESTRICT+=" test"
 # bug 366505
 
@@ -144,7 +140,6 @@ src_configure() {
 		$(cmake_use_find_package panorama KF5ThreadWeaver)
 		$(cmake_use_find_package scanner KF5Sane)
 		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake_use_find_package vkontakte KF5Vkontakte)
 		-DENABLE_QWEBENGINE=$(usex !webkit)
 		$(cmake_use_find_package X X11)
 	)
diff --git a/media-gfx/digikam/files/digikam-7.0.0_beta3-qt-5.15.patch b/media-gfx/digikam/files/digikam-7.0.0_beta3-qt-5.15.patch
deleted file mode 100644
index fe865eb73af3..000000000000
--- a/media-gfx/digikam/files/digikam-7.0.0_beta3-qt-5.15.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 10fd663f43148fc96ed3afeecf70de15cadd0f8a Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 19 Apr 2020 09:55:03 +0200
-Subject: [PATCH] Fix build with Qt 5.15.0
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- .../dplugins/generic/view/presentation/opengl/presentationgl.cpp | 1 +
- core/libs/dimg/filters/curves/curveswidget.cpp                   | 1 +
- core/libs/dimg/filters/levels/histogrampainter.cpp               | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
-index b37699436e..6a4f173ab0 100644
---- a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
-+++ b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
-@@ -44,6 +44,7 @@
- #include <QMatrix>
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPixmap>
- #include <QTimer>
- #include <QWheelEvent>
-diff --git a/core/libs/dimg/filters/curves/curveswidget.cpp b/core/libs/dimg/filters/curves/curveswidget.cpp
-index cccccbd156..d0beef9bf2 100644
---- a/core/libs/dimg/filters/curves/curveswidget.cpp
-+++ b/core/libs/dimg/filters/curves/curveswidget.cpp
-@@ -40,6 +40,7 @@
- #include <QColor>
- #include <QFont>
- #include <QFontMetrics>
-+#include <QPainterPath>
- #include <QPaintEvent>
- #include <QMouseEvent>
- 
-diff --git a/core/libs/dimg/filters/levels/histogrampainter.cpp b/core/libs/dimg/filters/levels/histogrampainter.cpp
-index 241d5fc4c8..f11ad4b560 100644
---- a/core/libs/dimg/filters/levels/histogrampainter.cpp
-+++ b/core/libs/dimg/filters/levels/histogrampainter.cpp
-@@ -30,6 +30,7 @@
- // Qt includes
- 
- #include <QPainter>
-+#include <QPainterPath>
- 
- // KDE includes
- 
--- 
-2.26.1
-
diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
index 0a61f5eaca35..ee36b2e2c817 100644
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -2,4 +2,4 @@ AUX enblend-4.2-doc-install-dir-fix.patch 2705 BLAKE2B a5bfb43521095bc088aef980f
 AUX enblend-4.2.0_p20161007-cmake.patch 477 BLAKE2B 9a27d95e78cc611c723824a300dbc3eaeb7c2ffe6bcacb19baeb8a24180450f2912310ae9584f450899ececca11636304d36631f8c57f6d4b7c2450043d6f147 SHA512 5b79944beabd97f71f05657ce17e31d9eab60506dfce27fefc3a8f9a10c92f33b1b4fa1411c6d1a33d23819a4020a50f130b9083fecaf3e1a072fda71e5f9ff0
 DIST enblend-4.2.0_p20161007.tar.xz 494060 BLAKE2B 8842dd70a1400a27170794246cb5c89d60b6798373e3a9d63e88738ad569e1174cb4303ccb5a2bc79846651e982e05f8cb9ac3e09b83ee33958b6ccf043ebda9 SHA512 ede037f19a7c3b358f533ecfb235f70824261eaf189d0bdcde6f9cedaa5952be2a6940884e688418b725cb3a67fc1b7d366483a76b7c62326ca857b8efe3a3f3
 EBUILD enblend-4.2.0_p20161007-r1.ebuild 1757 BLAKE2B ba4703076454bc019231877a83feae0971bf755f2d54c4c893731d3bbc0fac47f391cb096a2b0e76c3b8d267c6a36c5977d47160b181c4842cd7e4f8a8b9f99b SHA512 344602f430cfeef0f6cc4998dea06282764dc52eda552bc612dd46dce4b4ae137b0e166c017f9acc8afaececdde53e6d279cba62d19b1ce27d3bf326f0959dba
-MISC metadata.xml 331 BLAKE2B 250d878bfbdc95130e185aac19702f35eb370c030b82b012a2dd19206438bf7f7395371304bbe24a2f30a05d86c1613a5fc38f60baaeb019808204d2f119d649 SHA512 539a494eb3a8df413fc4e2e516f68b06f6f1e13e87157c65acabddd076876c2d1f9175f0115dc9a816c5133f15e55d133a8d0924fed3254811f3e407b1059531
+MISC metadata.xml 437 BLAKE2B 38a5768a400aafc32f2dd5412d889578950c3b2443487ad3c82388624c343f42d19034f7476d22f0b036d8b801610ec7b80aaf9d68367146c25ab8af60154a8b SHA512 937c99056596c0c809eaae348f68a42b8e666a5566f10fd639be559ea0b5f9678369efd191aeec42cd1ff26cce72aef8b56e3ea05fb2ca9df10b3a1f8fb04b4c
diff --git a/media-gfx/enblend/metadata.xml b/media-gfx/enblend/metadata.xml
index 7d07b118073d..422145a617bd 100644
--- a/media-gfx/enblend/metadata.xml
+++ b/media-gfx/enblend/metadata.xml
@@ -5,6 +5,10 @@
 		<email>dilfridge@gentoo.org</email>
 		<name>Andreas K. Huettel</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>maekke@gentoo.org</email>
+		<name>Markus Meier</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">enblend</remote-id>
 	</upstream>
diff --git a/media-gfx/exif/Manifest b/media-gfx/exif/Manifest
index f5fbadc6c665..e931ffdba10b 100644
--- a/media-gfx/exif/Manifest
+++ b/media-gfx/exif/Manifest
@@ -1,3 +1,5 @@
 DIST exif-0.6.21.tar.bz2 387531 BLAKE2B 494d4910af2e8f740aeebdeeaf8dec5ae638d3e78339c55d5acc38879ab4837164d2ef407bd07a2e36a00df15d53b132bb027e2e97e79c229c589819af3b7f7b SHA512 73b5b7df08462a6a084a8fb973c39197f5d64ed753a97cb2f94a4acf815fdf0313214c2c8e44a46a24a1f6304fdaa68a579b4a2e246cc095f6e9588e93368cdc
+DIST exif-0.6.22.tar.gz 569665 BLAKE2B 556927fca99416ff174c0c4403337f2f8b85cb14472d920a48a9598d8b7e3be6b800b0b37a764cd89fb45b62376a05ef1f0ae6b260a076f0949aadf8a441a2eb SHA512 b194bacb28ff2b910014edce732f97a875852abd486ce62bcf9274eb0ed668a0ee9c954cf60455191969aacb48d3d4d3172958a183b29f050c0bf8d55de14e7d
 EBUILD exif-0.6.21.ebuild 579 BLAKE2B 101f7246e7433ce0bd236426fe87ce1487c869163fc8371292360bf2dd04dd828ee1f84a95bfa29bc0ba8a66cddd44a3c24a4ed6961f8ece531a424fb744605d SHA512 3f1d1ac107570a81238d834852cc9b15fa98aa8a0e274aeb74ae6fb9a2f5b535e4d44ac382f0c4d9a464e99bb934faa9864e444edfea845b3301ac1677ca7520
+EBUILD exif-0.6.22.ebuild 666 BLAKE2B c11d6e590dda2e7c0f98c5f3c158d4dcf5a1548b7178992690758950a59cbb63f4501db1bb1c1e629181f979bfcdfc10f36d7a0e648c7abf6cced91759466d14 SHA512 0d9aafcbea0c99a8e6c1a02052edc6499fd6c935acb35263a85e7d015ba6549b42567a97a10360915f82efbcec3e419a834e8496cb174887c0e177722d10643d
 MISC metadata.xml 249 BLAKE2B d224cb8e5d2c5fce97a3b2e5ddd58eaf63652fbd198148263043184bb34e3ecfa58af4a54fcb3e8c388ba4a8c71f6882b9ff214f3f366d5333093e1e6b0d8394 SHA512 7721d48e6ecfe8212f06808ec8cb7cc6f9d3db63c71a3c348f9f1d7db9cc18d74ad70c474861631c08df354c7a57d37bd0cee1e4a0ee62e83296a35c90af0b7f
diff --git a/media-gfx/exif/exif-0.6.22.ebuild b/media-gfx/exif/exif-0.6.22.ebuild
new file mode 100644
index 000000000000..01a292a9d047
--- /dev/null
+++ b/media-gfx/exif/exif-0.6.22.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Small CLI util to show EXIF infos hidden in JPEG files"
+HOMEPAGE="https://libexif.github.io/ https://github.com/libexif/exif"
+SRC_URI="https://github.com/lib${PN}/${PN}/releases/download/${PN}-${PV//./_}-release/${P}.tar.gz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="nls"
+
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+DEPEND="
+	dev-libs/popt
+	>=media-libs/libexif-${PV}
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf $(use_enable nls)
+}
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 3b87787dc45e..b1c2b6842c52 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -2,7 +2,6 @@ AUX 20200314-MacServiceReadFDs.patch 1053 BLAKE2B 733c1e217681b7f5f6cf776835f142
 AUX 20200314-big-endian.patch 11856 BLAKE2B ae107bec5156a60605d19588b61ce9b7869a41ce148f3da16b7f69a3c298667c224d0cd22796aa447ef71118ee0b6c0cb8682f71d483de4806cd4640cefcb86f SHA512 d15dd1dcc5d3ca6d798954b31ce2dbc943536bbbcd158eb3ac95c9643fa0dee4c0357aa954298ef8d270be13c0f012d424d9c5f34d865dd9dd33ff7f189d257f
 AUX 20200314-stylemap.patch 869 BLAKE2B a5907efaa1357f5b445eadfa951d9558de78eb1f8eb271cac15318a6d1e7d95c4d56918ca41307c9ff74ab05bf3cc373a5189ccaa5c76282b2c0c5d6834bfaba SHA512 1f0e363d42606fb506dd6f747ac250cce6ab4b5bf49400095cab9fd48b68232a8d58325147d2e1f7ca223093d36edf020f70f383bb0bf24f3a2f2fc3b35fb747
 AUX 20200314-tilepath.patch 1142 BLAKE2B 61aa804682a5e486c2f131fd9d81fc5d29ca946f18d9d11a323d4c49cfa8c9404b846e2afb6ac4dbf00af78133f27819f72f678298c3abfaeecd576877ac1ed4 SHA512 2cbd0ac47c211ceda2e2e4d6b62a69432e084ec664d58ff5e259f2d1eee9b70b64610d4a428d5f86305c8427c21dd6a00944a86a995c8cc5f9aed63df4aa5a31
-AUX CVE-2020-5395.patch 3073 BLAKE2B 15fa97a633e2c218f512a7d1202555e2465bad9adf0661bcc314a940d691520ba897ed6d76ff2b80111f3c016d71717ec4170196ce2177f3e6478b26f63e76ca SHA512 7dcdd6c4e8eb433de32fe76c2a1832ba9b318c5889ce03325516fa8d3ce63043a89e740758cf75b10626bac43352292e11ba0fdf31725ecff5b9d3065265ac3b
 AUX fontforge-doc-no-warn-error.patch 834 BLAKE2B c8bd1cfcf320b7831cc64d67d8de52b37e2f37bbac91d5df709d23e144ae33ec02907606348185eac7030f5151719e0023c0d9fda5395334a15c56f7174151c4 SHA512 6055f1696f1910e81ab1b84b48d336c1a097b53618a3a960e8ce2aeb57e05ad364848d48082b792cd4d5cc85fc95947cddd2e04e7a98c5ceb6f9ced14bd4e674
 DIST fontforge-20200314.tar.xz 13850076 BLAKE2B 5e6ae3b7940a5b3b08811abdfc9d151f231e6d457b219eb0c666e1b831db815b696f345eda0d4d423b7e340f56fca67205734ae19903b3815381080d34b5e95c SHA512 09f5dc93f87ca63668d72d108690604489d6b3cec7eedff1c07ad6d1ce5eae442ab60e79e71ae8b99e9808f3551011788025a86ffc3a9738518d99761d849975
 EBUILD fontforge-20200314.ebuild 3027 BLAKE2B 6279419e6cc43c67c7089acf6585563c3be3bbe67447129cc6e480d76ace2091f7430c6ae2353bc17df3e8ad70a6dfc0a26c2757fddbfa463c21e4eb2055852a SHA512 f86153004126af75d1c752139caa0cd0a9af482dcc032d28844cba7d038fced7e7cab7c3964a8583daa94ce5ccb2eca12444e9aa539563587caa4149b600d522
diff --git a/media-gfx/fontforge/files/CVE-2020-5395.patch b/media-gfx/fontforge/files/CVE-2020-5395.patch
deleted file mode 100644
index 51b524503764..000000000000
--- a/media-gfx/fontforge/files/CVE-2020-5395.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 048a91e2682c1a8936ae34dbc7bd70291ec05410 Mon Sep 17 00:00:00 2001
-From: Skef Iterum <unknown>
-Date: Mon, 6 Jan 2020 03:05:06 -0800
-Subject: [PATCH] Fix for #4084 Use-after-free (heap) in the
- SFD_GetFontMetaData() function Fix for #4086 NULL pointer dereference in the
- SFDGetSpiros() function Fix for #4088 NULL pointer dereference in the
- SFD_AssignLookups() function Add empty sf->fontname string if it isn't set,
- fixing #4089 #4090 and many   other potential issues (many downstream calls
- to strlen() on the value).
-
----
- fontforge/sfd.c  | 19 ++++++++++++++-----
- fontforge/sfd1.c |  2 +-
- 2 files changed, 15 insertions(+), 6 deletions(-)
-
-diff --git a/fontforge/sfd.c b/fontforge/sfd.c
-index 731be201e0..e8ca39ba83 100644
---- a/fontforge/sfd.c
-+++ b/fontforge/sfd.c
-@@ -4032,13 +4032,16 @@ static void SFDGetSpiros(FILE *sfd,SplineSet *cur) {
-     while ( fscanf(sfd,"%lg %lg %c", &cp.x, &cp.y, &cp.ty )==3 ) {
- 	if ( cur!=NULL ) {
- 	    if ( cur->spiro_cnt>=cur->spiro_max )
--		cur->spiros = realloc(cur->spiros,(cur->spiro_max+=10)*sizeof(spiro_cp));
-+		cur->spiros = realloc(cur->spiros,
-+		                      (cur->spiro_max+=10)*sizeof(spiro_cp));
- 	    cur->spiros[cur->spiro_cnt++] = cp;
- 	}
-     }
--    if ( cur!=NULL && (cur->spiros[cur->spiro_cnt-1].ty&0x7f)!=SPIRO_END ) {
-+    if (    cur!=NULL && cur->spiro_cnt>0
-+         && (cur->spiros[cur->spiro_cnt-1].ty&0x7f)!=SPIRO_END ) {
- 	if ( cur->spiro_cnt>=cur->spiro_max )
--	    cur->spiros = realloc(cur->spiros,(cur->spiro_max+=1)*sizeof(spiro_cp));
-+	    cur->spiros = realloc(cur->spiros,
-+	                          (cur->spiro_max+=1)*sizeof(spiro_cp));
- 	memset(&cur->spiros[cur->spiro_cnt],0,sizeof(spiro_cp));
- 	cur->spiros[cur->spiro_cnt++].ty = SPIRO_END;
-     }
-@@ -7992,10 +7995,12 @@ bool SFD_GetFontMetaData( FILE *sfd,
-     else if ( strmatch(tok,"LayerCount:")==0 )
-     {
- 	d->had_layer_cnt = true;
--	getint(sfd,&sf->layer_cnt);
--	if ( sf->layer_cnt>2 ) {
-+	int layer_cnt_tmp;
-+	getint(sfd,&layer_cnt_tmp);
-+	if ( layer_cnt_tmp>2 ) {
- 	    sf->layers = realloc(sf->layers,sf->layer_cnt*sizeof(LayerInfo));
- 	    memset(sf->layers+2,0,(sf->layer_cnt-2)*sizeof(LayerInfo));
-+	    sf->layer_cnt = layer_cnt_tmp;
- 	}
-     }
-     else if ( strmatch(tok,"Layer:")==0 )
-@@ -8948,6 +8953,10 @@ exit( 1 );
- 	}
-     }
- 
-+    // Many downstream functions assume this isn't NULL (use strlen, etc.)
-+    if ( sf->fontname==NULL)
-+	sf->fontname = copy("");
-+
-     if ( fromdir )
- 	sf = SFD_FigureDirType(sf,tok,dirname,enc,remap,had_layer_cnt);
-     else if ( sf->subfontcnt!=0 ) {
-diff --git a/fontforge/sfd1.c b/fontforge/sfd1.c
-index cf931059d0..b42f832678 100644
---- a/fontforge/sfd1.c
-+++ b/fontforge/sfd1.c
-@@ -674,7 +674,7 @@ void SFD_AssignLookups(SplineFont1 *sf) {
- 
-     /* Fix up some gunk from really old versions of the sfd format */
-     SFDCleanupAnchorClasses(&sf->sf);
--    if ( sf->sf.uni_interp==ui_unset )
-+    if ( sf->sf.uni_interp==ui_unset && sf->sf.map!=NULL )
- 	sf->sf.uni_interp = interp_from_encoding(sf->sf.map->enc,ui_none);
- 
-     /* Fixup for an old bug */
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index bdbabb7027a0..5aad2e1930e6 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,6 +1,10 @@
 AUX graphicsmagick-1.3.19-flags.patch 1800 BLAKE2B 50f4f0de0cb3842fb84e136038bc0c9714a776868303bda17af26cca8f3c4160d7f9060d0a8a116ad30a17b416ddd2963da0e66d4ca76fdc351507c51ae30998 SHA512 fa1bdbe718ae8ae49a58f6fc1728f1bb6b869a907f77e41eec92c452f86e05cf821548409f2a5d55dcdb38b8a80d7ef2b1d37d2111c3fd5088a118626479ad2c
 AUX graphicsmagick-1.3.19-perl.patch 491 BLAKE2B 6a6465162d9a4d7d09b1edb425cc7114cd4e0fc65e48f15c8c2a854fe835fd1fe94c56611c6d2744d9e26884c57b1f67353bfd32abe2f25a145dd7abbf5479f0 SHA512 da114b891ec923253048d90ee14f136742072bcb70e512e8d2838bbcac57b5fe6ea580cdccfd1bba5156777623c43e946ce2a8661f88612d4c24849bef0fb865
+AUX graphicsmagick-1.3.35-CVE-2020-12672.patch 2753 BLAKE2B 864a77b650f5cec350d83bc5eec289736171a141e8609c41d4c66f49a58b2d332cb2ab343f557879a547e6a291665d16c5707ab7573bf48263a838ba24940475 SHA512 57387a3f1e2e07fdf4617b0fc73106b4f00fe1a7dc0d88919b39490213d42180a4617653b48e54749f7d2807dca4d1b052f14389c30b7a059f841c012ca2b1a6
+AUX graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch 988 BLAKE2B 4906fffe43150ef209c4d2f87d433cf78cd5e3c03a9db22426e3c3455028a5ff63c189ace1f46f47e1fa04fe8d78388b76dcabc288a9a75e57b7ebbb68f8c90d SHA512 95776534891eed617b09873fd70af020c6d6370a6765ba7aaf8185268e8b73b774ce2aeb1b284641fb12260ca0047c4543b17a18ed4ef28db725b75f988c7215
+AUX graphicsmagick-1.3.35-oss-fuzz-23042.patch 1350 BLAKE2B 415bd540a7aa194235ce1e6482035dd9b8ee4d4f5192f4d898e178875d453fd8b481efcbe139db602d411f788e3067a95106ba128ab14af63d3848f92c035405 SHA512 d345b54570e3396db81f0f60980633e139f90a54b579ad953a36aa5e16c1edfe7a5186b4e2d5a2e02f759544b372981278b06d2b688324e6b091c841a5bae133
 DIST GraphicsMagick-1.3.35.tar.xz 5543224 BLAKE2B 8a284d85341c10939fdece5c565d5b881276afb9b4c5dfb2221b780a01b99f78ee62761722c372baf9155c63f7ef176b67310aeedcab0368f4f26f5b0150bcce SHA512 baae92089d52147ef961f93495abc8a9d8b1a963af61d87a650c1ab105d46816aa38c83f654edcb5a0e1b7f07ccc06eaeaa443b9bde3a63a0b9bfb45f3ae144c
+EBUILD graphicsmagick-1.3.35-r1.ebuild 3223 BLAKE2B 2e61401a1673a4a093eb8cefb1bb95b26ddffe581cf808a0e7927cb62a5cf41ef4e74e68ae3b4dcc03850ee2992e2470631907a1e87b9df6ecb15b892f28980e SHA512 13e27a919eb6e2d04837015e6641eb3d8041772b033f3e1e38833a7b875237ea8c6acda2d1e7dacb126005383c4d96e03370c0be4d0b92f93073552787689419
 EBUILD graphicsmagick-1.3.35.ebuild 3085 BLAKE2B c0e6b0a3eae4087a3aa5130866629037ddeae03fb63dc0914b117ac9f7345f1f18c0ba2e41a9fe06fc80fe206013636f75d1a44c62e300487763bab2ed8f58ad SHA512 eeab4b3a5b8a8ffc5ee810125d5161b18339f06e10883a692592b9ec1f7c4296de9a56459f57f033d378a8638da4d8b30f1d04c5d16cff9d108ff99c8e2dc763
 EBUILD graphicsmagick-9999.ebuild 3079 BLAKE2B 5683335f38a7d90554e705f65bc84ea44643bd6c18b5d7f48f2608d949efc4ecd8f562a6f7f989ee0dbc4e208efbc4a1190154f88baf69c89ad17da1d70ad5ae SHA512 13f6d72eb95a1be93d70d685fc3296885c7084536a951e9158e989169e5e5768c98591af22b0221bcb951ce4b4bbdeb90b21b93f3fa8589026316880d1dbe8cd
 MISC metadata.xml 1057 BLAKE2B ced303553eccbba9ae91f30b3700b331149127c5a17a66bb166bff4139600cf208f3b15f8fa6fdb02594f3278ce7acd2bf6972df42c04dcb4f695710bb3870bf SHA512 9ac680de061b6dc0acd0d3a31587e0b53d3d7bcea7425909a3a4ef074fa0e32a999ecb1f48a64bb2ab55249fb5bbdc72974681fb26a879c4e5a4c9f3a04d0e82
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-CVE-2020-12672.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-CVE-2020-12672.patch
new file mode 100644
index 000000000000..b314ea288e43
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-CVE-2020-12672.patch
@@ -0,0 +1,67 @@
+diff -r 4917a4242fc0 -r 50395430a371 coders/png.c
+--- a/coders/png.c	Fri May 01 13:49:13 2020 -0500
++++ b/coders/png.c	Sat May 30 10:18:16 2020 -0500
+@@ -5304,7 +5304,7 @@
+               if (logging)
+                 (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+                                       "MAGN chunk (%lu bytes): "
+-                                      "First_magnified_object_id=%u, Last_magnified_object_id=%u, "
++                                      "First_magnified_object_id=%u, Las t_magnified_object_id=%u, "
+                                       "MB=%u, ML=%u, MR=%u, MT=%u, MX=%u, MY=%u, "
+                                       "X_method=%u, Y_method=%u",
+                                       length,
+@@ -5679,6 +5679,8 @@
+           /*
+             If magnifying and a supported method is requested then
+             magnify the image.
++
++            http://www.libpng.org/pub/mng/spec/mng-1.0-20010209-pdg.html#mng-MAGN
+           */
+           if (((mng_info->magn_methx > 0) && (mng_info->magn_methx <= 5)) &&
+               ((mng_info->magn_methy > 0) && (mng_info->magn_methy <= 5)))
+@@ -5689,7 +5691,28 @@
+ 
+               if (logging)
+                 (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+-                                      "  Processing MNG MAGN chunk");
++                                      "  Processing MNG MAGN chunk: MB=%u, ML=%u,"
++                                      " MR=%u, MT=%u, MX=%u, MY=%u,"
++                                      " X_method=%u, Y_method=%u",
++                                      mng_info->magn_mb,mng_info->magn_ml,
++                                      mng_info->magn_mr,mng_info->magn_mt,
++                                      mng_info->magn_mx,mng_info->magn_my,
++                                      mng_info->magn_methx,
++                                      mng_info->magn_methy);
++
++              /*
++                If the image width is 1, then X magnification is done
++                by simple pixel replication.
++              */
++              if (image->columns == 1)
++                  mng_info->magn_methx = 1;
++
++              /*
++                If the image height is 1, then Y magnification is done
++                by simple pixel replication.
++              */
++              if (image->rows == 1)
++                  mng_info->magn_methy = 1;
+ 
+               if (mng_info->magn_methx == 1)
+                 {
+@@ -5734,12 +5757,10 @@
+                   Image
+                     *large_image;
+ 
+-                  int
+-                    yy;
+-
+                   long
+                     m,
+-                    y;
++                    y,
++                    yy;
+ 
+                   register long
+                     x;
+
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch
new file mode 100644
index 000000000000..c7921dd2e699
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch
@@ -0,0 +1,38 @@
+diff -r 50395430a371 -r 83b4d2b4b873 coders/wpg.c
+--- a/coders/wpg.c	Sat May 30 10:18:16 2020 -0500
++++ b/coders/wpg.c	Sat May 30 17:33:51 2020 -0500
+@@ -403,7 +403,7 @@
+   x++; \
+   if((long) x>=ldblk) \
+   { \
+-    if(InsertRow(BImgBuff,y,image,bpp)==MagickFail) RetVal=-6; \
++    if(InsertRow(BImgBuff,y,image,bpp)==MagickFail) { RetVal=-6; goto unpack_wpg_raser_error; } \
+     x=0; \
+     y++; \
+     if(y>=image->rows) break; \
+@@ -537,6 +537,7 @@
+         }
+       }
+     }
++unpack_wpg_raser_error:;
+   MagickFreeMemory(BImgBuff);
+   return(RetVal);
+ }
+@@ -552,7 +553,7 @@
+   x++; \
+   if((long) x >= ldblk) \
+   { \
+-    if(InsertRow(BImgBuff,(long) y,image,bpp)==MagickFail) RetVal=-6; \
++    if(InsertRow(BImgBuff,(long) y,image,bpp)==MagickFail) { RetVal=-6; goto unpack_wpg2_error; } \
+     x=0; \
+     y++; \
+     XorMe = 0; \
+@@ -729,6 +730,7 @@
+             }
+         }
+     }
++unpack_wpg2_error:;
+   FreeUnpackWPG2RasterAllocs(BImgBuff,UpImgBuff);
+   return(RetVal);
+ }
+
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-23042.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-23042.patch
new file mode 100644
index 000000000000..197a230a3401
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-23042.patch
@@ -0,0 +1,42 @@
+diff -r 24ed4812e580 -r b0aa53a5f970 coders/wpg.c
+--- a/coders/wpg.c	Tue Jun 02 07:45:45 2020 -0500
++++ b/coders/wpg.c	Sat Jun 06 14:12:18 2020 -0500
+@@ -413,9 +413,12 @@
+ 
+ /** Call this function to ensure that all data matrix is filled with something. This function
+  * is used only to error recovery. */
+-static void ZeroFillMissingData(unsigned char *BImgBuff,unsigned long x, unsigned long y, Image *image,
+-                                int bpp, long ldblk)
++static MagickPassFail ZeroFillMissingData(unsigned char *BImgBuff,unsigned long x, unsigned long y, Image *image,
++                                          int bpp, long ldblk)
+ {
++  MagickPassFail
++    status = MagickPass;
++
+   while(y<image->rows && image->exception.severity!=UndefinedException)
+   {
+     if((long) x<ldblk) 
+@@ -427,9 +430,13 @@
+         x = 0;		/* Next pass will need to clear whole row */
+     }
+     if(InsertRow(BImgBuff,y,image,bpp) == MagickFail)
+-      break;
++      {
++        status = MagickFail;
++        break;
++      }
+     y++;
+   }
++  return status;
+ }
+ 
+ 
+@@ -528,7 +535,6 @@
+                 }
+               if(InsertRow(BImgBuff,y,image,bpp)==MagickFail)
+                 { 
+-                  ZeroFillMissingData(BImgBuff,x,y,image,bpp,ldblk);
+                   MagickFreeMemory(BImgBuff);
+                   return(-6);
+                 }
+
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild
new file mode 100644
index 000000000000..39851a6496d1
--- /dev/null
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools toolchain-funcs
+
+MY_P=${P/graphicsm/GraphicsM}
+
+DESCRIPTION="Collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.graphicsmagick.org/"
+LICENSE="MIT"
+SLOT="0/${PV%.*}"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit mercurial
+	EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
+else
+	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+IUSE="bzip2 +cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp
+	perl png postscript q16 q32 static-libs svg threads tiff truetype
+	webp wmf X zlib"
+
+RDEPEND="dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	fpx? ( media-libs/libfpx )
+	imagemagick? ( !media-gfx/imagemagick )
+	jbig? ( media-libs/jbigkit )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	lzma? ( app-arch/xz-utils )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	svg? ( dev-libs/libxml2 )
+	tiff? ( media-libs/tiff:0 )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libSM
+		x11-libs/libXext
+		)
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.19-flags.patch
+	"${FILESDIR}"/${PN}-1.3.19-perl.patch
+	"${FILESDIR}"/${P}-CVE-2020-12672.patch
+	"${FILESDIR}"/${P}-oss-fuzz-20045-20318-21956.patch
+	"${FILESDIR}"/${P}-oss-fuzz-23042.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local depth=8
+	use q16 && depth=16
+	use q32 && depth=32
+
+	local openmp=disable
+	if use openmp && tc-has-openmp; then
+		openmp=enable
+	fi
+
+	local myeconfargs=(
+		--${openmp}-openmp
+		--enable-largefile
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable debug prof)
+		$(use_enable debug gcov)
+		$(use_enable imagemagick magick-compat)
+		$(use_with threads)
+		$(use_with modules)
+		--with-quantum-depth=${depth}
+		--without-frozenpaths
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options=INSTALLDIRS=vendor
+		$(use_with bzip2 bzlib)
+		$(use_with postscript dps)
+		$(use_with fpx)
+		$(use_with jbig)
+		$(use_with webp)
+		$(use_with jpeg)
+		--without-jp2
+		$(use_with lcms lcms2)
+		$(use_with lzma)
+		$(use_with png)
+		$(use_with tiff)
+		$(use_with truetype ttf)
+		$(use_with wmf)
+		--with-fontpath="${EPREFIX}"/usr/share/fonts
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		--with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts
+		$(use_with svg xml)
+		$(use_with zlib)
+		$(use_with X x)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+	use perl && emake perl-build
+}
+
+src_test() {
+	unset DISPLAY # some perl tests fail when DISPLAY is set
+	default
+}
+
+src_install() {
+	default
+
+	if use perl; then
+		emake -C PerlMagick DESTDIR="${D}" install
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die
+}
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 7934394baf36..6c4d860e986b 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,6 +1,7 @@
+AUX dotty_change_button.patch 964 BLAKE2B d59c14fbcd967f28da141037f77ba57241c553f647af3f9bb0996c622b3728f294628279926f012cca4d4381a2ca17af6e4566727afba6568df7ff4a98c5bfbd SHA512 841c4c1eb820a9065f8530e7a5bca3743aaf808705177776b45100fbbeb73899c5c765feb14026866b42b7d5ee2b62de1cac5398edb01ef447451a529e350b3b
 AUX graphviz-2.34.0-Xaw-configure.patch 2445 BLAKE2B fc1b3820fd72821ac431f5d93d0b4b0c8f596ca9d2c2f516961f5baab9fd54ba870df75434d2ed59fd9034bb7e2ce38c00faef9c12a79c7ec4da2d5e416d7117 SHA512 473d2ed9070329512cbc26929267b25fb8d7726e21ed01d2921d4d8ac13b8ffaf166f07229fa7409192cfa14fabb0cf68b299bb3331b3cc953ae5363274fd15c
 DIST graphviz-2.42.3.tar.gz 26246717 BLAKE2B 71c61dcd056c9a2e2655c3be995d1da17b3af0d3374e74400fc38da11ab81849f7b5e528f99fc2046294958a4bab0a411ab204e434360f316a5367403472e8a1 SHA512 e03ca6da0ddb1162bd179d159d7dbb379d55012d63bb922aa800260fce52b65beb1a9b5ca1a5199ad3537201b0b4841efc9facee6e03065c6bd02e840f8a29c9
 DIST graphviz-2.44.0.tar.gz 32903746 BLAKE2B 05def6b50366900fe84b8d72b802461d33624444f00d1c648801da81708dcdf7dc601f95561d8f7dc8e745eef61326cb9a234a0db1bc45c8a7d7d46e552c373b SHA512 9fd54a5c7b0d8cf3e1bf7e80409b57022182b6bfe3f57a06a219d6d29684962ac935fc76d1e7420ba88b1ffc2ab5b967cc4617e56f810818f99801d31981a752
-EBUILD graphviz-2.42.3.ebuild 7798 BLAKE2B 79de7e36c68de4af5d34874b2ede59919b79a8a18c5044043640d87e48dc1d848b9b29ae48a4b0daa66b4a0a8e9f3f054e80d256d9988c0d4b21d975620f2642 SHA512 7946ea0e9866689cc6604612fe2f7eacc454d336366925599d0742fa73c0da5cca6235ab18187bfe4018891b795eca442bd8a9412be1611a1ee15e9ecc408bad
-EBUILD graphviz-2.44.0.ebuild 7805 BLAKE2B a31064d464e96e6fd312740a32094547ffe7d84e5081546f5d981707ae26240d81060b927e504a5876a0760213194b3283514a1eaedfc6681e5b6c0f089a291d SHA512 7d21d12a1fb81d2366d613c4a84054e163a43a0c6d08a6490e598443b4f4dbf6aab091673ca311f4f0bc97d2d4f382dccfa918cd76ef3dd3ae182189e6eaa4e7
+EBUILD graphviz-2.42.3.ebuild 7841 BLAKE2B 3b0d6df9929c253cfca54cb76b504b12e1f74001486fc364da7ae83e3c5ff86a8066af3d62e859f083a418da107a24fb4be4d93df61d6b2fd6b3d8aaae7f8233 SHA512 20240f0f3e8cb2c0e6384b5f6eaf43066552ea267a61b14c9e4c283da2c0e485ab2b2df21768b5cbea2c0ae7eb1d4210b70f2c33f6b7b1d5afead4a7bce781eb
+EBUILD graphviz-2.44.0.ebuild 7848 BLAKE2B bf6deda1a51544782dbbfa20ae6d68f3ff84b13d5faa41b49c7d992bef941166ac8a6864ed27bb9034ddcdb83c4a02d7f3e00e1e51bd8e8be6a196ea2b4d6b58 SHA512 a4b34d28d1615b19c9cdbb9ec8ea7b4b333729eebed03bfc6764f3f5214564558672a9907b21d10c4b3a9f581bdd1df25ccd3aad1f710fb082da67ed0f6ea243
 MISC metadata.xml 2304 BLAKE2B 702643020c9a91f60460e6f6f63cb5ba6389b4307a454a47b24daba75e2ae104e8e93f3d4913a6007749a1d0e70157608b03b9b7d29ae422685e82aaabc3bfc4 SHA512 bc27ff36b8aaf76c265878095f74319314534bc28589b79e0bf4f3fed27ed965e172c1a8279a58f570b799961abb9c87281c3242dda950e936223999fa150e03
diff --git a/media-gfx/graphviz/files/dotty_change_button.patch b/media-gfx/graphviz/files/dotty_change_button.patch
new file mode 100644
index 000000000000..8c5f34a2e128
--- /dev/null
+++ b/media-gfx/graphviz/files/dotty_change_button.patch
@@ -0,0 +1,22 @@
+diff --git a/cmd/dotty/dotty_ui.lefty b/cmd/dotty/dotty_ui.lefty
+index a8c9116..a708c61 100644
+--- a/cmd/dotty/dotty_ui.lefty
++++ b/cmd/dotty/dotty_ui.lefty
+@@ -342,7 +342,7 @@ dotty.protovt.normal.uifuncs = [
+         else
+             gt.insertedge (gt, data.pobj, null, data.obj, null, null, 1);
+     };
+-    'rightdown' = function (data) {
++    'rightup' = function (data) {
+         local vt, gt, menu, i;
+ 
+         vt = dotty.views[data.widget];
+@@ -447,7 +447,7 @@ dotty.protovt.birdseye.uifuncs = [
+     'middledown' = dotty.protovt.normal.uifuncs.middledown;
+     'middlemove' = dotty.protovt.normal.uifuncs.middlemove;
+     'middleup' = dotty.protovt.normal.uifuncs.middleup;
+-    'rightdown' = dotty.protovt.normal.uifuncs.rightdown;
++    'rightup' = dotty.protovt.normal.uifuncs.rightup;
+     'keyup' = dotty.protovt.normal.uifuncs.keyup;
+     'redraw' = dotty.protovt.normal.uifuncs.redraw;
+     'closeview' = dotty.protovt.normal.uifuncs.closeview;
diff --git a/media-gfx/graphviz/graphviz-2.42.3.ebuild b/media-gfx/graphviz/graphviz-2.42.3.ebuild
index f27ec198047d..25cc03cc6575 100644
--- a/media-gfx/graphviz/graphviz-2.42.3.ebuild
+++ b/media-gfx/graphviz/graphviz-2.42.3.ebuild
@@ -143,7 +143,8 @@ DEPEND="${RDEPEND}
 #   sci-libs/gts, x11-libs/gtk.  Also needs 'gtk','glade','glut','gts' and 'png'
 #   with flags enabled at configure time
 
-PATCHES=( "${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch
+	  "${FILESDIR}"/dotty_change_button.patch )
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
diff --git a/media-gfx/graphviz/graphviz-2.44.0.ebuild b/media-gfx/graphviz/graphviz-2.44.0.ebuild
index cc960e3dcb41..25929d6e9b8b 100644
--- a/media-gfx/graphviz/graphviz-2.44.0.ebuild
+++ b/media-gfx/graphviz/graphviz-2.44.0.ebuild
@@ -143,7 +143,8 @@ DEPEND="${RDEPEND}
 #   sci-libs/gts, x11-libs/gtk.  Also needs 'gtk','glade','glut','gts' and 'png'
 #   with flags enabled at configure time
 
-PATCHES=( "${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch
+	  "${FILESDIR}"/dotty_change_button.patch )
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 6f243ddc0262..d60e15871b9c 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,4 +1,4 @@
 DIST hugin-2019.2.0.tar.bz2 10335030 BLAKE2B 4fbcb974eea01dbd8d722f64b5cadfd1b3fe101e5e7849d069c531e55e1ea71c226bcb1550b59374bbe8adf111b7c0bc5e48c14f45bdb685486cbeccde5add70 SHA512 2ddfe7468a474c385ef66a88c3a5a2491183765ae431e5044f504d2e95ec3cb99c0b97b98dda282ba7950f6f2001f46b2f2ea39b9025718c2a329dea967685c1
 EBUILD hugin-2019.2.0.ebuild 2185 BLAKE2B 25b087eccf301e5540e6e897161e7c1ccbe907a26b22feefd31a40357602c5f9c61f41e41b033958d0df171c2df04c4e49ee4061f9d0e5db002f2f8ed46c1edf SHA512 89c7d596a4fef47dc3d144ae30a4cce0745391b05760108d6755717413a76bc6bf5d790ec50b0af01a88ced13ce1467d4cc311a24c877c9584df14ad712545b0
 EBUILD hugin-9999.ebuild 2058 BLAKE2B d7f7ab9b065dcc31cc85033a044b3e8da912779069709e2c1c02c3958744896c9c84cfb2bbf9c802b444e92ce6f6cd86d402254d3b2e5eb5f2b2b766eef069e0 SHA512 65ead2eab2416af88e8529704ee0c936901d3512558e1433eaff5ec3b3db5ba8659b2f72fd4613cc305afb9461003841ce7e3c04b8bbd201c8842ab7ddb5c5c7
-MISC metadata.xml 440 BLAKE2B edd9beb71ad5ca4b9f911d5fee827b76ff0ea05f3c4397f30b88dc295e49413bb81b33d716a8345d71da556de1f468642b8ee1aa2b34e9f6e0a7280199452a71 SHA512 19ff0167fc23b4372e57925085286be3170a442f5952f5ac4b10a6ff7426923e4b7653bb679416ddcc0df5846b602a0b13420984790de347bcd4e3edd9def932
+MISC metadata.xml 546 BLAKE2B efad9c27562890b23594411333a0ef827b7e54acde132ffdec4f664eae37fb3ab270950ef650e6caaea4bd3b69a7bed469e794dce51d59850cd06ff844e08836 SHA512 0d096754e2f6ef1468e6bdf7464e6f5cc1de06f20136b68be7aaf199cd78a10e4213678d875ff61d829f692dbd5b0728d50bb35eefb1de6af4e5e0fd7d91d350
diff --git a/media-gfx/hugin/metadata.xml b/media-gfx/hugin/metadata.xml
index ffcd4b4177df..4b6e44910c05 100644
--- a/media-gfx/hugin/metadata.xml
+++ b/media-gfx/hugin/metadata.xml
@@ -5,6 +5,10 @@
 		<email>dilfridge@gentoo.org</email>
 		<name>Andreas K. Huettel</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>maekke@gentoo.org</email>
+		<name>Markus Meier</name>
+	</maintainer>
 	<use>
 		<flag name="sift">automatically align images with <pkg>media-gfx/autopano-sift-C</pkg></flag>
 	</use>
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 0a032fb95b35..ce90e9c22385 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,13 +1,17 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
 DIST ImageMagick-6.9.11-16.tar.xz 9075792 BLAKE2B 7cfa4a071ee09b9658e302db963cdcc393395305bd96d04ddc5ce7941bd3b26fec74206525ffb1d93a423a970ee91dcd308041c8cb407c783195dc98a337db5c SHA512 ae4c56afdde8d62f80cfc32e208595f50b4e1d3cdfffbf1f18a5ad1f715998bcc917fe595369cda216d13ebd7121c060376a3ed6c0558dcd508f0142b108e2ff
+DIST ImageMagick-6.9.11-19.tar.xz 9076632 BLAKE2B fb6e954052e4dc9b5db80fcb3868e627f3cbe5d9ccb02425fe3838dfef4deb1132360a30b561de28bf7d2051bc7c01ad5c4ebc0266b48f1d48d7af5ecae4b5e2 SHA512 fe8e7399b377c84155d3ad3c3963d58b8704233d9c858ff92ba1837e6e1f5d86846153660cc0973b8cd27917e4c8b4834874c510f00505142cd8165ae3e3526d
 DIST ImageMagick-6.9.11-9.tar.xz 9069640 BLAKE2B ab39f4723e4bc843a504ce29a840d24a0497d00ebaaf8a10589813d7bf13f5ef3774e9989dd38d667e1a9ad3dbc5357ca4a53533b5ef338781409c0b3bdde01a SHA512 8f8e6cdbbc4ff367304d29d3098dc208ac17e8037e31426e5e24d918ab13a292660e2944cb830fa814f297b69f8b2d693ac33b94f5ee4b8406cf52605ee00586
 DIST ImageMagick-7.0.10-16.tar.xz 9694880 BLAKE2B 6d0e0baeb99d9815255f10d04176b816694afb9d7e2169af60401eb57b13bc2dbf1223b1b3de6b67c2ed9f1581983801bfec017dee6f4b73319b68d0e16366fb SHA512 e1ba52cde03b1230789a9e538ea93bd8b0713b418cf268ab3c3be0c0da4b6144ff47479e554c27a9348d56b5e94a181944474f77568f502cf31885d871f2ea5e
+DIST ImageMagick-7.0.10-19.tar.xz 9685552 BLAKE2B e3d6ca1e16ad4bc346153372f1122731a750876650cdb705985ef29ef30c5ceb7f2f473ff2734a38c50e2e531094a08526678cfe1e8f58eef79d30ea18c363bf SHA512 ed577e48ca88d37c01d7e889fa1364af3398e94864b393fcc70711a3317c34adababe5ac0ea7995bd23e10aac554522ed69d290c4c11b946e8a0de86c6365e84
 DIST ImageMagick-7.0.10-9.tar.xz 9681168 BLAKE2B 0a26df054f6799dcc0cc576dc3d3e30689d3311ce658b220f4575d6ddf31063e8e9b1de57d5065171480dad5ae4f3a0bdde0d5ef7a5a7cdd267f2e76a210f30c SHA512 db19b39c41e3401ce454016a14c83d1188d38d7e4a31848c29344bd86ef14d4250208bcfb4b9e519f7d2d193a61724d980ce39e9d6e2388c872281e9383e2f54
 EBUILD imagemagick-6.9.11.16.ebuild 7056 BLAKE2B 31393b291f0d6bec7dc70d794b1a84039d54c1a12b7b4417caacea9bb2dc693a91d00273243a6450c1e7b7044e6b4c66a5fa8ccf28d1634d610a767775dd566a SHA512 72e95675a0102e46604bc1161c687465d2b2acf58a7096dd0637e2b9bdbc4a53ce2fb3490e6d32fd00ce5767540abe39b03a93c187f33b0c6c21f5c96a897d49
+EBUILD imagemagick-6.9.11.19.ebuild 7056 BLAKE2B 31393b291f0d6bec7dc70d794b1a84039d54c1a12b7b4417caacea9bb2dc693a91d00273243a6450c1e7b7044e6b4c66a5fa8ccf28d1634d610a767775dd566a SHA512 72e95675a0102e46604bc1161c687465d2b2acf58a7096dd0637e2b9bdbc4a53ce2fb3490e6d32fd00ce5767540abe39b03a93c187f33b0c6c21f5c96a897d49
 EBUILD imagemagick-6.9.11.9.ebuild 7049 BLAKE2B a55cac8280b047983a972159734711175d78840a6d29c75ed38366fc07aa4be312c75f523ef4185318f9734df496373e36b0c3170cd89e0859d282935ef3b566 SHA512 524f10eb990b5a5df4af8d0c39e6cf00d30f6d3bda40c0f609a16825d23b2b1b18d5ea10413df97aca1c6a26b0ac05d06c7c902f8a7c0ded4c33106b05566d2b
 EBUILD imagemagick-7.0.10.16-r2.ebuild 7220 BLAKE2B 12b0db73d15e5d9b5af68912ae1b2907919cc875d73536c261477534fa17363fb8f75b2d63501ab6f844eb9e976893107513968d9e89ccce9d3490cfe93389db SHA512 19ce4536488e465e744a5da210566112de83a6d2df48a1cf9cc44c32a2e9d4ab3a65909ce17ac47e0dc29ccb734a5b52e81f6585dc015a3ad89faa3d72667747
 EBUILD imagemagick-7.0.10.16.ebuild 7332 BLAKE2B 9af4bd9448c7e96550c356a964f988a2c785bb7f6714508a036968c3b229e91af2f2ef247366ac6e012477adada079fef7064fec1d4a29b4d9d0f9ad03d648f8 SHA512 03641bc41782f7de1c9b264697d159ed990c2e1aa18fe836391f1be86df3bb3f9a50c7f327730b6ff9ef50ca997636c72e2e03b21c0fa12a50dd68fb45ce9f00
+EBUILD imagemagick-7.0.10.19.ebuild 7220 BLAKE2B 12b0db73d15e5d9b5af68912ae1b2907919cc875d73536c261477534fa17363fb8f75b2d63501ab6f844eb9e976893107513968d9e89ccce9d3490cfe93389db SHA512 19ce4536488e465e744a5da210566112de83a6d2df48a1cf9cc44c32a2e9d4ab3a65909ce17ac47e0dc29ccb734a5b52e81f6585dc015a3ad89faa3d72667747
 EBUILD imagemagick-7.0.10.9.ebuild 7324 BLAKE2B 1d67b3846e05b04487a5e9f154de9d8d19afb024fc11d8c117ed4d2bdba8124414dc348b93c3c012ec6884a03e77e8e2f06bc90c448767998ff38486a92dd179 SHA512 a5df77b164a1c6ac1c6867d39afea790c3f69ff021a312abeb5d6476316d2e78caf1081235242559af1297fdb14a4add48514dd3bf611778123026fd7bc2e8bc
-EBUILD imagemagick-9999.ebuild 7332 BLAKE2B 9af4bd9448c7e96550c356a964f988a2c785bb7f6714508a036968c3b229e91af2f2ef247366ac6e012477adada079fef7064fec1d4a29b4d9d0f9ad03d648f8 SHA512 03641bc41782f7de1c9b264697d159ed990c2e1aa18fe836391f1be86df3bb3f9a50c7f327730b6ff9ef50ca997636c72e2e03b21c0fa12a50dd68fb45ce9f00
+EBUILD imagemagick-9999.ebuild 7220 BLAKE2B 12b0db73d15e5d9b5af68912ae1b2907919cc875d73536c261477534fa17363fb8f75b2d63501ab6f844eb9e976893107513968d9e89ccce9d3490cfe93389db SHA512 19ce4536488e465e744a5da210566112de83a6d2df48a1cf9cc44c32a2e9d4ab3a65909ce17ac47e0dc29ccb734a5b52e81f6585dc015a3ad89faa3d72667747
 MISC metadata.xml 1106 BLAKE2B e77cabff89df6b98687290ef0ee06d85111a7ddca6f5e1e31f820e6d186a6510c2afd0b85ba31004f102fd7f7b88f46af101f4ba45011aac75afa40b0a714857 SHA512 68a5f9a80b1e3f2e3004252703f9b3176d7c59880a2724ae431fdfd97e8f2adcd7ff7ad2cd8ea8bd35645a3b559052f2c38713647ce7ae889ff1a6061e6b2d92
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.19.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.19.ebuild
new file mode 100644
index 000000000000..02b0c9655fe7
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.19.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2020 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://imagemagick/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/6.9.11"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~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"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+RESTRICT="perl? ( userpriv )
+	!test? ( test )"
+
+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
+		media-gfx/potrace
+		)
+	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 )"
+
+S="${WORKDIR}/${MY_P}"
+#S="${WORKDIR}/ImageMagick6-${MY_PV}"
+
+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:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	rm "${ED}"/usr/$(get_libdir)/*.la || die
+
+	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.10.19.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.19.ebuild
new file mode 100644
index 000000000000..eb7593072ecd
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.19.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+SLOT="0/7.0.10"
+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="!test? ( test )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	svg? ( xml )
+	test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+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
+		media-gfx/potrace
+		)
+	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]
+	X? ( x11-base/xorg-proto )"
+
+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 ati_cards mesa_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)
+		--without-jxl
+		$(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=()
+	if [[ ${PV} == "9999" ]] ; then
+		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+	else
+		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	fi
+	IM_COMMANDS+=( "magick -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:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	rm "${ED}"/usr/$(get_libdir)/*.la || die
+
+	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 "7.0.8.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-7"
+		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-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index 4d2561accf79..eb7593072ecd 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
@@ -25,6 +25,7 @@ IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="corefonts? ( truetype )
+	svg? ( xml )
 	test? ( corefonts )"
 
 RESTRICT="!test? ( test )"
diff --git a/media-gfx/img2pdf/Manifest b/media-gfx/img2pdf/Manifest
index 8c26a41421d5..ca96b88df798 100644
--- a/media-gfx/img2pdf/Manifest
+++ b/media-gfx/img2pdf/Manifest
@@ -1,5 +1,7 @@
 DIST img2pdf-0.3.3.tar.gz 80523 BLAKE2B 39e372f1ab82d9f521cf2c512b173680afe6463dd041283b336af49c41b12d12261fe5947ad9f03d489b7898d3c8d161faedb2b3366cb75bd1bc0666f905f60c SHA512 234e0031d75727d2f5d2b82603bb447d9101ace81e604b6d5eb358d0b4681e209dbd737775b90b44096cf84239aac9e87e2369e0c6112a17f24ccbf10a20cdd5
 DIST img2pdf-0.3.4.tar.gz 83729 BLAKE2B c595ca7eebfcb91cfe076822836ce07ec0036a510645aae54e495798765df91cddf5de292245c623b2e23918d7862271cdca5d7b8dd76573dc40d8ba7807865a SHA512 0e81e3ee06c62f0ee732b87776f6bc2d066ebce6c23dbcb85b2497518ba43fa3813b3e15f0c476c1203ae6d2b1f4f3e2f1b70215033dddb889fafd75b3671420
+DIST img2pdf-0.3.6.tar.gz 91006 BLAKE2B ad89b42be4613c30383770f336b07773bf13e87061fca61eb7d5e25d6489662fc2bae94d9a6d61d531a77f41b9e94492d0db1f32570f6d471fa9f8cb0816630d SHA512 2a9d31b9de52123941fd650123a483f4dc0757edda304da994353b5f3167bddbb25fa1ed8fededcf859c5d07b65b9c2d5185000949002a68dcae1e7bf0f1547d
 EBUILD img2pdf-0.3.3.ebuild 645 BLAKE2B 392a638abfd8bf09cfe7681998d3f9e9ccae7bbae5e42730226f44194a2e0fc68e77f3c73e30c9b060aaf50f96511a46959aca430fd6fde3a830c5c568e78f45 SHA512 35eed7c8bad2ccaa50b4128b6e8d5107a7dbd0411e475bb30c223a06b8018dc059aadc8db8cdd6101233f686468b7ae20a91db9e1c5a9cbc6db343d99bc0d01a
 EBUILD img2pdf-0.3.4.ebuild 603 BLAKE2B 37166fe22d5a8c141c9d4163856cb88ee0df95d1760806e6f7e9b2aafc3ad61ce9a0797fc0a965942e6cd90aebf0b4caeacd42ea2406e8580459968dee2d3257 SHA512 74e5f31989e22b71f9238b03c0c0b756d42410cc25f7e28f9e3a0b6d3047656f94cd005930bd4811db0a912744cc1af87e6f1035c2391ef0db9b368e597af943
+EBUILD img2pdf-0.3.6.ebuild 563 BLAKE2B 37031fdbc0276e3e64bb865377a717334892f926a1bf97ef320b0bf8b7b894e8a3a1a86c7b90ab30e11683712ea10a0ba545dfb2b2dff67f5f78c1852518a14f SHA512 c4f94db0ce5e98bcdb0eab1b72eb4b04c3a8061f5cf82bcb8520b5eeef8a2d98dc98a81420e73b5323688d036fc00471d20c5897532c1bca54d34f416ef12471
 MISC metadata.xml 1120 BLAKE2B df864ac9c560f0e55a889701014713ecc210b15b094ad729b94bfbe29fcadbf6d31f37d4b2761a538fa6e4a9617a0b030f487b2e2d5c3b347d834a2c287f07ec SHA512 825a15bf571a32a1b458a4d731fdc578ac024f8a067ff61e9cdd85066fcae5f92bb48a3fcb4bf0e78c5b01f5d4550b6a3b7bd6c1951f7e7264fb4c8078c216e2
diff --git a/media-gfx/img2pdf/img2pdf-0.3.6.ebuild b/media-gfx/img2pdf/img2pdf-0.3.6.ebuild
new file mode 100644
index 000000000000..612d1425962d
--- /dev/null
+++ b/media-gfx/img2pdf/img2pdf-0.3.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Losslessly convert raster images to PDF"
+HOMEPAGE="https://gitlab.mister-muffin.de/josch/img2pdf"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="test? ( dev-python/pillow[${PYTHON_USEDEP},tiff,zlib] )"
+RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index e199bf47ac5b..8f672481b618 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,5 +1,8 @@
 AUX krita-4.2.4-tests-optional.patch 12292 BLAKE2B a30463dcc6e02e877b308c4add529f0657d96ace7a13ba7424f4cdf260f3b636d03b2bac224d6239253393650163b622ac54d8d81bbdced2fb153bf216b5fb2d SHA512 1d5045b35981822bc16c4b23e573a299a8325353c8be347c56a4e2fc4e3cd9e937e8eb253f9c6cdc0197a3db7989b822fb41274afe3cd506b9c907daf1867df3
+AUX krita-4.3.0-tests-optional.patch 16252 BLAKE2B 17c329e534f0591a63429416d6a9718948e4052160e318ff7f79ea1b7ff2e4e0135c0bbc2b3eff8aa843895c0e1ddb84722c0dff8c3e3eddc942f2a809129634 SHA512 e38428b2ac55516312cb6d01b1b17cc255d21fe7a57d5f36ca4eebf8023624af91b31c25a19f04d829f2dfee5896b5bb5275ecbf5ae61423951024501f690927
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
 DIST krita-4.2.9.tar.xz 170082028 BLAKE2B dafe300a1ef56a743272ce5936a0640949b7cfd37322e30e8a7ef17c4e51bf9dc8175d1443f9943836a229933ecb9a5d28249b8c90155165f3f0ee800e3cfa66 SHA512 66eef3d1b5647e62551276662ef4332f15abc022f1032f27a2ad695a8d2dc5fa758146492a9da2b8cbd4a52e47c576473029d2aa9728dea3bec869b8173f08c0
+DIST krita-4.3.0.tar.xz 166246720 BLAKE2B 74a6e02968a2abdeb59ca2702f0a4a7be23473657667b14592ad08b81d25d9e4815fb5d206a23f33a82268974e9369450525c53b43fef46831ad4c501c34546c SHA512 5633a6ccacc140b119082f14fe792b1219b8065304fccc55a84a2373a46cb036ad40f718beb8719e1f664e35d679b18e86f5f3db8685166a187d8cf3a77722f4
 EBUILD krita-4.2.9.ebuild 3244 BLAKE2B 258e95d2a887e08bf8f57a35fd2a862a409d298f7638ba8c8f3a514ea4620a33ed17f3f390de944d286c2af96333e7ded6a061ce0488ee6fe2a6a8201bbf391f SHA512 3c01812b04489bbd292db164ff55244d237a54e707f43c756d4b2811beded4cb69aee065baa80bf20c67d319d97cdecf3d6a5f50fb761f377fe5cb38c583c034
+EBUILD krita-4.3.0.ebuild 3375 BLAKE2B a31a068f53e926e2763cb59d53f7a3a73dd6778fd8c66943c857657b8fac05eb2157e04cb835fd226ed939e6793554883e48cc9b6db7505d3570cecbf542d221 SHA512 352fbd63af6e738fad0654a886181bd22525c4d5c9e34681cce52476aef7b5c62eb88f12dba85c20ddcc24f6d08478f5102c62e7614e5de15a7a17a9841ffbdd
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/files/krita-4.3.0-tests-optional.patch b/media-gfx/krita/files/krita-4.3.0-tests-optional.patch
new file mode 100644
index 000000000000..b58dcf1f4a87
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.3.0-tests-optional.patch
@@ -0,0 +1,536 @@
+From 3c9fe10e25e94bdb1eb5e7b07ac2696635fdc5a3 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 17 Jun 2020 20:18:28 +0200
+Subject: [PATCH] Don't build tests when testing not requested
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+
+diff --git a/libs/brush/CMakeLists.txt b/libs/brush/CMakeLists.txt
+index 536b1a4ac5..7d8435eec4 100644
+--- a/libs/brush/CMakeLists.txt
++++ b/libs/brush/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory( tests )
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ include_directories(SYSTEM
+     ${EIGEN3_INCLUDE_DIR}
+diff --git a/libs/flake/CMakeLists.txt b/libs/flake/CMakeLists.txt
+index cbdac265d2..1a50c1620a 100644
+--- a/libs/flake/CMakeLists.txt
++++ b/libs/flake/CMakeLists.txt
+@@ -9,8 +9,10 @@ include_directories(
+ )
+ 
+ add_subdirectory(styles)
+-add_subdirectory(tests)
+-add_subdirectory(resources/tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++    add_subdirectory(resources/tests)
++endif()
+ 
+ set(kritaflake_SRCS
+     KoGradientHelper.cpp
+diff --git a/libs/global/CMakeLists.txt b/libs/global/CMakeLists.txt
+index e8162c5e46..f6ea6bc840 100644
+--- a/libs/global/CMakeLists.txt
++++ b/libs/global/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory( tests )
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ include(CheckFunctionExists)
+ check_function_exists(backtrace HAVE_BACKTRACE)
+diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
+index 810dee2f16..44c72ba2d5 100644
+--- a/libs/image/CMakeLists.txt
++++ b/libs/image/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory( tests )
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ add_subdirectory( tiles3 )
+ 
+diff --git a/libs/image/tiles3/CMakeLists.txt b/libs/image/tiles3/CMakeLists.txt
+index 88c0516360..01f2383ddb 100644
+--- a/libs/image/tiles3/CMakeLists.txt
++++ b/libs/image/tiles3/CMakeLists.txt
+@@ -1 +1,3 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+diff --git a/libs/libkis/CMakeLists.txt b/libs/libkis/CMakeLists.txt
+index 958104aaaf..3b8a33eadc 100644
+--- a/libs/libkis/CMakeLists.txt
++++ b/libs/libkis/CMakeLists.txt
+@@ -48,4 +48,6 @@ set_target_properties(kritalibkis PROPERTIES
+ install(TARGETS kritalibkis  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+ 
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+diff --git a/libs/metadata/CMakeLists.txt b/libs/metadata/CMakeLists.txt
+index d33aff38fc..abdc2f7a36 100644
+--- a/libs/metadata/CMakeLists.txt
++++ b/libs/metadata/CMakeLists.txt
+@@ -29,4 +29,6 @@ set_target_properties(kritametadata PROPERTIES
+ 
+ install(TARGETS kritametadata  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+diff --git a/libs/odf/CMakeLists.txt b/libs/odf/CMakeLists.txt
+index 6acbf4d1a5..50e60b55d8 100644
+--- a/libs/odf/CMakeLists.txt
++++ b/libs/odf/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory( tests )
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ set(kritaodf_LIB_SRCS
+     KoOdf.cpp
+diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
+index 7e38c6cb00..60879fcea2 100644
+--- a/libs/pigment/CMakeLists.txt
++++ b/libs/pigment/CMakeLists.txt
+@@ -33,8 +33,10 @@ else()
+     set(__per_arch_alpha_applicator_factory_objs KoAlphaMaskApplicatorFactoryImpl.cpp)
+ endif()
+ 
+-add_subdirectory(tests)
+-add_subdirectory(benchmarks)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++    add_subdirectory(benchmarks)
++endif()
+ 
+ set(kritapigment_SRCS
+     DebugPigment.cpp
+diff --git a/libs/store/CMakeLists.txt b/libs/store/CMakeLists.txt
+index b7c42996bd..30f9d5c5c6 100644
+--- a/libs/store/CMakeLists.txt
++++ b/libs/store/CMakeLists.txt
+@@ -1,6 +1,8 @@
+ include_directories(${QUAZIP_INCLUDE_DIRS})
+ 
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ set(kritastore_LIB_SRCS
+     KoDirectoryStore.cpp
+diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.txt
+index d273bf548a..d180fd8970 100644
+--- a/libs/ui/CMakeLists.txt
++++ b/libs/ui/CMakeLists.txt
+@@ -13,7 +13,9 @@ if (ANDROID)
+     include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
+ endif()
+ 
+-add_subdirectory( tests )
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ if (APPLE)
+     find_library(FOUNDATION_LIBRARY Foundation)
+diff --git a/libs/widgets/CMakeLists.txt b/libs/widgets/CMakeLists.txt
+index 75eded9db1..c0093cfd3a 100644
+--- a/libs/widgets/CMakeLists.txt
++++ b/libs/widgets/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory( tests )
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ 
+diff --git a/libs/widgetutils/CMakeLists.txt b/libs/widgetutils/CMakeLists.txt
+index c62eeafb79..c33b16dd91 100644
+--- a/libs/widgetutils/CMakeLists.txt
++++ b/libs/widgetutils/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ configure_file(xmlgui/config-xmlgui.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xmlgui.h )
+ 
+diff --git a/plugins/color/lcms2engine/CMakeLists.txt b/plugins/color/lcms2engine/CMakeLists.txt
+index e14de2ba7c..8c56372cb3 100644
+--- a/plugins/color/lcms2engine/CMakeLists.txt
++++ b/plugins/color/lcms2engine/CMakeLists.txt
+@@ -1,6 +1,8 @@
+ project( lcmsengine )
+ 
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ include_directories(SYSTEM
+     ${LCMS2_INCLUDE_DIR}
+diff --git a/plugins/dockers/animation/CMakeLists.txt b/plugins/dockers/animation/CMakeLists.txt
+index a0b4b4beb4..b3de3f2749 100644
+--- a/plugins/dockers/animation/CMakeLists.txt
++++ b/plugins/dockers/animation/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-if (NOT WIN32 AND NOT APPLE)
++if(BUILD_TESTING AND NOT WIN32 AND NOT APPLE)
+     add_subdirectory(tests)
+ endif()
+ 
+diff --git a/plugins/dockers/lut/CMakeLists.txt b/plugins/dockers/lut/CMakeLists.txt
+index 01844be146..6745db73e6 100644
+--- a/plugins/dockers/lut/CMakeLists.txt
++++ b/plugins/dockers/lut/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ include_directories(SYSTEM
+     ${OCIO_INCLUDE_DIR}
+diff --git a/plugins/extensions/qmic/CMakeLists.txt b/plugins/extensions/qmic/CMakeLists.txt
+index afd390b726..f5766c1b50 100644
+--- a/plugins/extensions/qmic/CMakeLists.txt
++++ b/plugins/extensions/qmic/CMakeLists.txt
+@@ -20,4 +20,6 @@ add_library(kritaqmic MODULE ${kritaqmic_SOURCES})
+ target_link_libraries(kritaqmic kritaui)
+ install(TARGETS kritaqmic  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
+ 
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+diff --git a/plugins/filters/CMakeLists.txt b/plugins/filters/CMakeLists.txt
+index 63a5de64e9..f8b4467926 100644
+--- a/plugins/filters/CMakeLists.txt
++++ b/plugins/filters/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory( tests )
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ add_subdirectory( blur )
+ add_subdirectory( colors )
+ add_subdirectory( colorsfilters )
+diff --git a/plugins/filters/unsharp/CMakeLists.txt b/plugins/filters/unsharp/CMakeLists.txt
+index e63725abb1..5a61b5f89c 100644
+--- a/plugins/filters/unsharp/CMakeLists.txt
++++ b/plugins/filters/unsharp/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory( tests )
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ set(kritaunsharpfilter_SOURCES
+     unsharp.cpp
+diff --git a/plugins/impex/brush/CMakeLists.txt b/plugins/impex/brush/CMakeLists.txt
+index b0343eddd4..ef7c617a40 100644
+--- a/plugins/impex/brush/CMakeLists.txt
++++ b/plugins/impex/brush/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ set(kritabrushexport_PART_SRCS
+     kis_brush_export.cpp
+diff --git a/plugins/impex/csv/CMakeLists.txt b/plugins/impex/csv/CMakeLists.txt
+index 60eba64463..cf6e6ac9bd 100644
+--- a/plugins/impex/csv/CMakeLists.txt
++++ b/plugins/impex/csv/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ # import
+ 
+diff --git a/plugins/impex/exr/CMakeLists.txt b/plugins/impex/exr/CMakeLists.txt
+index aa39a91879..c80833941f 100644
+--- a/plugins/impex/exr/CMakeLists.txt
++++ b/plugins/impex/exr/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ include_directories(SYSTEM ${OPENEXR_INCLUDE_DIRS} )
+ 
+diff --git a/plugins/impex/gif/CMakeLists.txt b/plugins/impex/gif/CMakeLists.txt
+index bb7f582b6c..b95c9d3d07 100644
+--- a/plugins/impex/gif/CMakeLists.txt
++++ b/plugins/impex/gif/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ set(kritagifexport_SOURCES
+     kis_gif_export.cpp
+diff --git a/plugins/impex/heif/CMakeLists.txt b/plugins/impex/heif/CMakeLists.txt
+index d25f3e1704..a7f663b13f 100644
+--- a/plugins/impex/heif/CMakeLists.txt
++++ b/plugins/impex/heif/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++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}")
+diff --git a/plugins/impex/heightmap/CMakeLists.txt b/plugins/impex/heightmap/CMakeLists.txt
+index a8b03308d9..04e0f1000a 100644
+--- a/plugins/impex/heightmap/CMakeLists.txt
++++ b/plugins/impex/heightmap/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
+ 
+diff --git a/plugins/impex/jp2/CMakeLists.txt b/plugins/impex/jp2/CMakeLists.txt
+index c9393f6cfa..b4333025aa 100644
+--- a/plugins/impex/jp2/CMakeLists.txt
++++ b/plugins/impex/jp2/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenJPEG_CFLAGS}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenJPEG_CFLAGS}")
+diff --git a/plugins/impex/jpeg/CMakeLists.txt b/plugins/impex/jpeg/CMakeLists.txt
+index 50edb05c96..eaa90964a7 100644
+--- a/plugins/impex/jpeg/CMakeLists.txt
++++ b/plugins/impex/jpeg/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms")
+ 
+diff --git a/plugins/impex/libkra/CMakeLists.txt b/plugins/impex/libkra/CMakeLists.txt
+index 2b840c1e8a..88d849172f 100644
+--- a/plugins/impex/libkra/CMakeLists.txt
++++ b/plugins/impex/libkra/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ set(kritalibkra_LIB_SRCS
+     kis_colorize_dom_utils.cpp
+diff --git a/plugins/impex/ora/CMakeLists.txt b/plugins/impex/ora/CMakeLists.txt
+index a476f422b4..0f4e563505 100644
+--- a/plugins/impex/ora/CMakeLists.txt
++++ b/plugins/impex/ora/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ set(libkritaconverter_LIB_SRCS
+     ora_converter.cpp
+diff --git a/plugins/impex/pdf/CMakeLists.txt b/plugins/impex/pdf/CMakeLists.txt
+index 320da291a4..c423ff4214 100644
+--- a/plugins/impex/pdf/CMakeLists.txt
++++ b/plugins/impex/pdf/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ set(kritapdfimport_SOURCES kis_pdf_import.cpp kis_pdf_import_widget.cpp )
+ 
+diff --git a/plugins/impex/png/CMakeLists.txt b/plugins/impex/png/CMakeLists.txt
+index d567e8059e..6d3815f06f 100644
+--- a/plugins/impex/png/CMakeLists.txt
++++ b/plugins/impex/png/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ set(kritapngimport_SOURCES
+     kis_png_import.cc
+diff --git a/plugins/impex/psd/CMakeLists.txt b/plugins/impex/psd/CMakeLists.txt
+index 4112536da2..f81598d01d 100644
+--- a/plugins/impex/psd/CMakeLists.txt
++++ b/plugins/impex/psd/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-if (NOT MSVC AND NOT APPLE)
++if(BUILD_TESTING AND NOT MSVC AND NOT APPLE)
+     add_subdirectory(tests)
+ endif()
+ 
+diff --git a/plugins/impex/qimageio/CMakeLists.txt b/plugins/impex/qimageio/CMakeLists.txt
+index c916af4870..f1a068e9c2 100644
+--- a/plugins/impex/qimageio/CMakeLists.txt
++++ b/plugins/impex/qimageio/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ set(kritaqimageioexport_SOURCES
+     kis_qimageio_export.cpp
+diff --git a/plugins/impex/qml/CMakeLists.txt b/plugins/impex/qml/CMakeLists.txt
+index e53156905a..1dff196ac5 100644
+--- a/plugins/impex/qml/CMakeLists.txt
++++ b/plugins/impex/qml/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ set(kritaqmlexport_SOURCES
+     qml_converter.cc
+diff --git a/plugins/impex/raw/CMakeLists.txt b/plugins/impex/raw/CMakeLists.txt
+index 71cb5b355c..70241a8903 100644
+--- a/plugins/impex/raw/CMakeLists.txt
++++ b/plugins/impex/raw/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ if(OPENEXR_FOUND)
+ 	include_directories(${OPENEXR_INCLUDE_DIRS})
+diff --git a/plugins/impex/svg/CMakeLists.txt b/plugins/impex/svg/CMakeLists.txt
+index 8f803a2783..6642112c11 100644
+--- a/plugins/impex/svg/CMakeLists.txt
++++ b/plugins/impex/svg/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ set(kritasvgimport_SOURCES
+     kis_svg_import.cc
+diff --git a/plugins/impex/tga/CMakeLists.txt b/plugins/impex/tga/CMakeLists.txt
+index b7fe804897..79c2aff4d4 100644
+--- a/plugins/impex/tga/CMakeLists.txt
++++ b/plugins/impex/tga/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ set(kritatgaexport_SOURCES
+     kis_tga_export.cpp
+diff --git a/plugins/impex/tiff/CMakeLists.txt b/plugins/impex/tiff/CMakeLists.txt
+index 8e57566510..0ee181c9bc 100644
+--- a/plugins/impex/tiff/CMakeLists.txt
++++ b/plugins/impex/tiff/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ set(libkritatiffconverter_LIB_SRCS
+     kis_tiff_converter.cc
+diff --git a/plugins/impex/xcf/CMakeLists.txt b/plugins/impex/xcf/CMakeLists.txt
+index d76985be87..a754b686ba 100644
+--- a/plugins/impex/xcf/CMakeLists.txt
++++ b/plugins/impex/xcf/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ set(XCFTOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/xcftools")
+ 
+diff --git a/plugins/paintops/defaultpaintops/CMakeLists.txt b/plugins/paintops/defaultpaintops/CMakeLists.txt
+index 68ac300940..35cd140838 100644
+--- a/plugins/paintops/defaultpaintops/CMakeLists.txt
++++ b/plugins/paintops/defaultpaintops/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(brush/tests)
++if(BUILD_TESTING)
++    add_subdirectory(brush/tests)
++endif()
+ 
+ include_directories(brush
+                     duplicate
+diff --git a/plugins/paintops/libpaintop/CMakeLists.txt b/plugins/paintops/libpaintop/CMakeLists.txt
+index 4d6d831760..59ca6657ca 100644
+--- a/plugins/paintops/libpaintop/CMakeLists.txt
++++ b/plugins/paintops/libpaintop/CMakeLists.txt
+@@ -103,5 +103,6 @@ set_target_properties(kritalibpaintop PROPERTIES
+ 
+ install(TARGETS kritalibpaintop  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+-
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+diff --git a/plugins/tools/basictools/CMakeLists.txt b/plugins/tools/basictools/CMakeLists.txt
+index 9d725a7c7a..0221e604be 100644
+--- a/plugins/tools/basictools/CMakeLists.txt
++++ b/plugins/tools/basictools/CMakeLists.txt
+@@ -1,6 +1,6 @@
+-if (NOT APPLE)
++if(BUILD_TESTING AND NOT APPLE)
+     add_subdirectory(tests)
+-endif ()
++endif()
+ 
+ set(kritadefaulttools_SOURCES
+     default_tools.cc
+diff --git a/plugins/tools/tool_transform2/CMakeLists.txt b/plugins/tools/tool_transform2/CMakeLists.txt
+index e90230c48e..2cf727a991 100644
+--- a/plugins/tools/tool_transform2/CMakeLists.txt
++++ b/plugins/tools/tool_transform2/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-if (NOT WIN32 AND NOT APPLE)
++if(BUILD_TESTING AND NOT WIN32 AND NOT APPLE)
+     add_subdirectory(tests)
+ endif()
+ 
+-- 
+2.27.0
+
diff --git a/media-gfx/krita/krita-4.3.0.ebuild b/media-gfx/krita/krita-4.3.0.ebuild
new file mode 100644
index 000000000000..55f079f74824
--- /dev/null
+++ b/media-gfx/krita/krita-4.3.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PYTHON_COMPAT=( python3_{7,8,9} )
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
+		https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://kde.org/applications/graphics/org.kde.krita https://krita.org/en/"
+
+LICENSE="GPL-3"
+SLOT="5"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-cpp/eigen:3
+	dev-lang/perl
+	sys-devel/gettext
+"
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=
+	dev-libs/quazip
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	media-gfx/exiv2:=
+	media-libs/lcms
+	media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXi
+	color-management? ( media-libs/opencolorio )
+	fftw? ( sci-libs/fftw:3.0= )
+	gif? ( media-libs/giflib )
+	gsl? ( sci-libs/gsl:= )
+	jpeg? ( virtual/jpeg:0 )
+	heif? ( media-libs/libheif:= )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr
+	)
+	pdf? ( app-text/poppler[qt5] )
+	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
+	raw? ( media-libs/libraw:= )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${RDEPEND}
+	vc? ( >=dev-libs/vc-1.1.0 )
+"
+
+# bug 630508
+RESTRICT+=" test"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tests-optional.patch
+	"${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_prepare() {
+	ecm_src_prepare
+	sed -e "/CMAKE_CXX_STANDARD/s/11/14/" -i CMakeLists.txt || die
+}
+
+src_configure() {
+	# Prevent sandbox violation from FindPyQt5.py module
+	# See Gentoo-bug 655918
+	addpredict /dev/dri
+
+	local mycmakeargs=(
+		$(cmake_use_find_package color-management OCIO)
+		$(cmake_use_find_package fftw FFTW3)
+		$(cmake_use_find_package gif GIF)
+		$(cmake_use_find_package gsl GSL)
+		$(cmake_use_find_package heif HEIF)
+		$(cmake_use_find_package jpeg JPEG)
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package qtmedia Qt5Multimedia)
+		$(cmake_use_find_package raw LibRaw)
+		$(cmake_use_find_package tiff TIFF)
+		$(cmake_use_find_package vc Vc)
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index 0b6332fca219..238b2ded9641 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -1,3 +1,4 @@
+AUX mypaint-1.2.1-json-c-boolean-defs.patch 1189 BLAKE2B 7cc9728fbe01195b0c95bd844592d4fbae29a7a26758d242933ed712b940d8a893cd41bd2987952e2a817208efbffd779e9c39d4dde42d809a1e11de06a234fa SHA512 8e5815c281a6c63c7818f378d0e75a94860dd24ea69e9fff8e5951b05c407f12e2e19fefeaa559476a4dab46c88eab8821eff061e8c8eadd1f3ce150e42563c2
 DIST mypaint-1.2.1.tar.xz 37897196 BLAKE2B 2d8f6b03f710febae1c2d617a6e542543786be384585ae8a973604da2eba8a0fb770d185aa3d2dfc6f794adf29ffb9c217356a96ab27d677ebb57816f62fae9c SHA512 1783765e495b9535669a83a29d27ba684e6201fdfe0875bdd2c167b1dab8af05993b19025767fe0b2770ed9e578e4709f75d8a4820ac945812cba85609f9eb9b
-EBUILD mypaint-1.2.1-r5.ebuild 1958 BLAKE2B 23392b56efece4806587d51024cd0338f31db243e171aa8e0ea99cbde9b84fe726e7fc6b9fea0221c25deafca74196cf387a50dd549542bfe415ed1aceef93b6 SHA512 034c0036442e5edf4ec1b97593e98b4569d6f3cc48398c13c67dd7b85634c89c8b73027af91977d25545236d490ac027bc9badf28754e0178d94fba29dee3478
+EBUILD mypaint-1.2.1-r5.ebuild 2016 BLAKE2B 0a00318c334adc4c97021ca1e52cb089075b1db667f0ad431fcf758345756d7d3558e50a353c8578d5749172ea4bbe396a99041c026cecce6174cb7cc6e4caf3 SHA512 5b1a703cf2efb5e0d729315ea092c58954975dedc177472467f03726956211b34744018cb3ef730f4b5a8ff2053f30218f838609ef225dd05eab21f5d8a683d8
 MISC metadata.xml 247 BLAKE2B 3a8d267e6befd2f46c41982b7196470f32b4fcf5dc6a42ead10b13e81bdcb7975ea998a51d0deb2c3c1a49f00b5f9216d8e43ad7e6dd0aea0f3352b19532d0a0 SHA512 21b957bb801d29dfed1d0aeceac553c9ba039a7fe94ebf899e7ab5c3316bbad116c7bd63a07ccbbb8277d2ce19f27b964499d2ccd942028290519e465e989dbb
diff --git a/media-gfx/mypaint/files/mypaint-1.2.1-json-c-boolean-defs.patch b/media-gfx/mypaint/files/mypaint-1.2.1-json-c-boolean-defs.patch
new file mode 100644
index 000000000000..caa2df4de6ee
--- /dev/null
+++ b/media-gfx/mypaint/files/mypaint-1.2.1-json-c-boolean-defs.patch
@@ -0,0 +1,34 @@
+commit a2b3f56b347c1897454eac1b5bdfe9d228302b80
+Author: Jehan <jehan@girinstud.io>
+Date:   Sat Jan 26 12:50:31 2019 +0100
+
+    Boolean #define-s removed from json-c in 2017.
+    
+    We don't need to #undef TRUE and FALSE before including json.h as this
+    redefinition has been removed in upstream json-c.
+    See json-c commit 0992aac61f8b087efd7094e9ac2b84fa9c040fcd.
+    
+    Note that it still works even if using an older json-c since the
+    original code was alreadying #undef-ing these 2 values before redefining
+    them. So that was anyway useless code and this change should work both
+    with old or new json-c.
+    
+    Note: the previous code was still working fine when building on Linux,
+    but not when cross-compiling on Windows. But this is the correct fix
+    anyway.
+    
+    (cherry picked from commit f4fd97445d3b6843af57ff8ba5f02cbdeb3942e9)
+
+diff --git a/brushlib/mypaint-brush.c b/mypaint-brush.c
+index 4759d11..7a1380c 100644
+--- a/brushlib/mypaint-brush.c
++++ b/brushlib/mypaint-brush.c
+@@ -35,9 +35,6 @@
+ #include "rng-double.h"
+ 
+ #ifdef HAVE_JSON_C
+-// Allow the C99 define from json.h
+-#undef TRUE
+-#undef FALSE
+ #include <json.h>
+ #endif // HAVE_JSON_C
diff --git a/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild b/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild
index ed192d39fbdb..4c5a1859342c 100644
--- a/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild
+++ b/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild
@@ -41,6 +41,9 @@ DEPEND="${RDEPEND}
 	dev-lang/swig
 	virtual/pkgconfig
 "
+PATCHES=(
+	"${FILESDIR}/${P}-json-c-boolean-defs.patch"
+)
 
 pkg_setup() {
 	python-single-r1_pkg_setup
diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 71fd8c57c6f3..e255c62281f5 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,4 +1,7 @@
 AUX nomacs-3.12-gcc9.patch 1098 BLAKE2B 70e4900d2670b9e4ca9f6ae12f4720a0bc25eabdf0ba09729801428cd6f12d5655db15c3ee3a9c2e5c6f5ae5cac6cf77fd6d1730a39ceda8a713a32f989bed8e SHA512 d653c666345f50c83f199aaeec61e4e481124787f5dad53d89ed06f920e0f20beebb4a56e550665c61af3b1718d6fb24092f98b7f0d99e6ab6eb98d5995093be
 DIST nomacs-3.12.tar.gz 1736648 BLAKE2B 533e18dec4be5d945213ccd629262a2cbae1eba93599f43be0a98d32d0b54d9caad7d963809f2fc9bb5c1ba682a39f44763b5d04e50c6e86658f6cd84324f3d2 SHA512 4508354d48a6115cd40f701cc90cbbcb84490e99eaac0295db48f6fea99550d5e2b3e7365128d0c9cc4eeb621906f55e275603d84cb8b6bb164d0b5e2e192119
+DIST nomacs-3.14.2.tar.gz 2169504 BLAKE2B 6050ddba3ddbdeb7d1fbd29831d5dfbee066b61398ef46be4145a287d565eb2d55d59f47bc9e9e34a10379f8e0e676ca1f5373389a0d35c27fe85cff5da3fded SHA512 58104c85078bdbff7f65625658bb01b152631470eea93a43494eed55ae5e2441b7bcf3ed6c8f1aef07831bc99c80af94467fcc0e15dc1d282ef313bfcb3c81e9
+DIST nomacs-plugins-3.14.tar.gz 514472 BLAKE2B fe8e1608c0a0ed502ea82efe80a9cfab3a9aff3ca7e8cbecfcb199377d137f5c19ad176940ef1f1109938634af3548008da1311339e6da78b8b5b983102bebb6 SHA512 c0bca87e50b7b91d80a9d6afd95eeb1d6730b17b9a28ad4109514b36c42781b3f67b25f68f48c0953110d1e02bb03762e813af9c1ec2851c072b4aea74969cbd
 EBUILD nomacs-3.12.ebuild 1303 BLAKE2B 8d57bf7614e38a998b4e06e58d6fb8579b71308d1b16b19672316db92e8b41d7895fbabb9817a29436e6d692b5e6f6b9d97f0b0d0fe36361e294613c001f3bf8 SHA512 295dd7047ffee76e074411f26dbdd8f8288ff667cedd104cf3192ac8d196fdb12274c377a7c53cf97dca201674865eb9f66300d49054fcf3289d33f00255e8c2
-MISC metadata.xml 531 BLAKE2B fc54042c41205b0a44c1b2dcd266e1311b306ee928149b3806e16260be85a65bf0da0716706653f82ff3dc83351fca6a68ca47930a08f3d170d00416515e2eac SHA512 ac9d022d7b0883217b77513e6d913ed816e414402cd4028428f6b239d97c8f5eaab48d709821675529af8a5a3d945105997235dcb63b826fd669f1b5fb2660a4
+EBUILD nomacs-3.14.2.ebuild 1930 BLAKE2B ff33cf895e5dbe243344a2b74d1fa744eaa85ec878181a15f048ec664827b2dc8a0af93fe780350cf86fea5474f3e8e567b5dae36908fada0681098b577f824f SHA512 7b42c86df5921bca0d95d5497742b805743a981e4772940de69a6a528353d51ff30c0472f6f4a960ce808c62235e5a8b74c7e4f75e36321e4c4864b39cf69d1b
+MISC metadata.xml 575 BLAKE2B cfd30ae66e512ded8e2a2c9fe4cd1643802d4604c7e6cbbeda71961366ba7231a2424e56ed269dfa7c7216346690a960cda65a4a1d956e6a842f8a5a8eb86ef2 SHA512 067aee95572e8ce05d9cd31fd21cac89469a785772abf1086ba532c00c042aff074aeef62faced8b4de46bf3ec210c35d3b213f06c5ca6f1fcf2090096c3bc57
diff --git a/media-gfx/nomacs/metadata.xml b/media-gfx/nomacs/metadata.xml
index b27b6fcfc0e4..17d5f3794443 100644
--- a/media-gfx/nomacs/metadata.xml
+++ b/media-gfx/nomacs/metadata.xml
@@ -12,5 +12,6 @@
 	</upstream>
 	<use>
 		<flag name="opencv">Build support for <pkg>media-libs/opencv</pkg></flag>
+		<flag name="plugins">Build plugins</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/nomacs/nomacs-3.14.2.ebuild b/media-gfx/nomacs/nomacs-3.14.2.ebuild
new file mode 100644
index 000000000000..ff12e28b2c9e
--- /dev/null
+++ b/media-gfx/nomacs/nomacs-3.14.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+PLUGIN_PKG="${PN}-plugins-$(ver_cut 1-2)"
+
+DESCRIPTION="Qt-based image viewer"
+HOMEPAGE="https://nomacs.org/"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	plugins? ( https://github.com/${PN}/${PN}-plugins/archive/$(ver_cut 1-2).tar.gz -> ${PLUGIN_PKG}.tar.gz )
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="+jpeg +opencv plugins raw tiff zip"
+
+REQUIRED_USE="
+	raw? ( opencv )
+	tiff? ( opencv )
+"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[jpeg?]
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-gfx/exiv2:=
+	opencv? ( >=media-libs/opencv-3.4:= )
+	raw? ( media-libs/libraw:= )
+	tiff? (
+		dev-qt/qtimageformats:5
+		media-libs/tiff
+	)
+	zip? ( dev-libs/quazip )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P}/ImageLounge"
+
+DOCS=( src/changelog.txt )
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	if use plugins ; then
+		unpack "${PLUGIN_PKG}.tar.gz"
+		mv "${PLUGIN_PKG}" "${S}/plugins" || die
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	if use plugins ; then
+		# Fix nomacs-plugins installation and search library directory
+		sed -i "s:lib/nomacs-plugins:$(get_libdir)/nomacs-plugins:" "${S}/plugins/cmake/Utils.cmake" || die
+		sed -i "s:lib/nomacs-plugins:$(get_libdir)/nomacs-plugins:" "${S}/src/DkCore/DkPluginManager.cpp" || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CODE_COV=OFF
+		-DUSE_SYSTEM_QUAZIP=ON
+		-DENABLE_TRANSLATIONS=ON
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_PLUGINS=$(usex plugins)
+		-DENABLE_RAW=$(usex raw)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_QUAZIP=$(usex zip)
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/pencil/Manifest b/media-gfx/pencil/Manifest
index 7fd14af266cf..2e36954f7975 100644
--- a/media-gfx/pencil/Manifest
+++ b/media-gfx/pencil/Manifest
@@ -1,3 +1,5 @@
+AUX pencil-0.6.4-fixes-for-qt-5.15.0.patch 823 BLAKE2B ea39062880493e22b5c58c3864581a37a3db38e171a065230fc18cbe79e79db420992aec838972d99ac2b0a3a23a47035ffd6df7644d0fda4daae136fa1e158c SHA512 93138586a3e6f353712a2f3e0ff4abdd88e2224d996b3069fbe11f3b4cde2ecadec21a33b7ac5ac2de7a49727332e6155cb09154e179bc42e870aaba375eb0db
 DIST pencil-0.6.4.tar.gz 3397891 BLAKE2B cb3fc754cd9abc2944fd184ea61b057a784a5b9e3c42724ef50b117a933cad0b72456a32e849c2de3ae6a7eb8bc6bdeee3ed751e8a6c8c68a74130d03ba6f1de SHA512 da28bd6bcdb0336c81e0735bec261373cd1e5db06feb012d4bba098c9df2ebea6f5b763e9c5e5e17c1518efdd6b9cde634ecf2152b49c25cde6c93da63e6fde8
+EBUILD pencil-0.6.4-r1.ebuild 1245 BLAKE2B 64ac22d27b4b39ed72aea5c885c4328f3078d3d1e278fae29547354274303da49deeb655081e1db182829cd6e1952e8a33cdc77ff0c1259bdf988bec195aa0c0 SHA512 ab3ee1d4ec5f3f7aa1b3356807564805bec48a3cb937b557e316364f5c52d379a590df3502f0224f350116d4c597bb5bb5ddc5575e8a43fb300d7f56bf457966
 EBUILD pencil-0.6.4.ebuild 1179 BLAKE2B 0527c9a25c2a5ece6d99a9032d1e9760170a3d479d812cd1704946d28805baf6cac08aead03e211d2f583387081dcd911e92bf5719495044ecb460d72c5cfbf5 SHA512 38f900e8f322fe4b4dd20fc0e12e466f35824b52aa5e98577db97eb297c8afdfe9182cc8edec1b2b85ee478c43dbb5ea6e739985665be398402a37219c302a01
 MISC metadata.xml 328 BLAKE2B d37566524ba0b352bca868e5a9db91ac4faf995bc4f9fca49be83be786c8e7b3ba305a10fcc1aea71b610a1442fa1b398ca549b9fcfccf0275c958d99e9d1279 SHA512 4e393e069c386f40fd7f817af383e3ee77d2f4592059a2b3cb54f68eae45eb665db9873971a29d94612dea0c8022bc0a3c2a01bac19e62d774739d3b666aac3e
diff --git a/media-gfx/pencil/files/pencil-0.6.4-fixes-for-qt-5.15.0.patch b/media-gfx/pencil/files/pencil-0.6.4-fixes-for-qt-5.15.0.patch
new file mode 100644
index 000000000000..cbbaf2b20658
--- /dev/null
+++ b/media-gfx/pencil/files/pencil-0.6.4-fixes-for-qt-5.15.0.patch
@@ -0,0 +1,30 @@
+--- a/core_lib/src/graphics/bitmap/bitmapimage.cpp
++++ b/core_lib/src/graphics/bitmap/bitmapimage.cpp
+@@ -20,6 +20,7 @@ GNU General Public License for more details.
+ #include <QDebug>
+ #include <QtMath>
+ #include <QFile>
++#include <QPainterPath>
+ #include "util.h"
+ 
+ BitmapImage::BitmapImage()
+--- a/core_lib/src/graphics/vector/beziercurve.cpp
++++ b/core_lib/src/graphics/vector/beziercurve.cpp
+@@ -22,6 +22,7 @@ GNU General Public License for more details.
+
+ #include <cmath>
+ #include <QList>
++#include <QPainterPath>
+ #include "object.h"
+ #include "pencilerror.h"
+ 
+--- a/core_lib/src/managers/viewmanager.cpp
++++ b/core_lib/src/managers/viewmanager.cpp
+@@ -15,6 +15,7 @@ GNU General Public License for more details.
+ 
+ */
+ 
++#include <QPainterPath>
+ #include "viewmanager.h"
+ #include "editor.h"
+ #include "object.h"
diff --git a/media-gfx/pencil/pencil-0.6.4-r1.ebuild b/media-gfx/pencil/pencil-0.6.4-r1.ebuild
new file mode 100644
index 000000000000..e5623d010010
--- /dev/null
+++ b/media-gfx/pencil/pencil-0.6.4-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils xdg-utils
+
+DESCRIPTION="2D animation and drawing program based on Qt5"
+HOMEPAGE="https://www.pencil2d.org/"
+SRC_URI="https://github.com/pencil2d/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=( "${FILESDIR}"/pencil-0.6.4-fixes-for-qt-5.15.0.patch )
+
+src_prepare() {
+	default
+	sed -e "/^QT/s/xmlpatterns //" \
+		-i core_lib/core_lib.pro tests/tests.pro || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	einstalldocs
+
+	# install target not yet provided
+	# emake INSTALL_ROOT="${D}" install
+	newbin bin/pencil2d ${PN}
+
+	newicon app/data/icons/icon.png ${PN}.png
+	make_desktop_entry ${PN} pencil2d ${PN} Graphics
+
+	insinto /usr/share/mime/packages/
+	doins app/data/pencil2d.xml
+
+	# TODO: Install l10n files
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/pngcrush/Manifest b/media-gfx/pngcrush/Manifest
index 9ca230751f30..52e456bf34e0 100644
--- a/media-gfx/pngcrush/Manifest
+++ b/media-gfx/pngcrush/Manifest
@@ -1,4 +1,4 @@
 DIST pngcrush-1.8.13-nolib.tar.xz 66104 BLAKE2B dad0bce2e8f2a135d085343da98ebecfb78a6b05019d43be1b0b1f940ce23ffa980bcb08e8948b6b8cc3efc04bc6ae92a0b9cf8ea8183e27eebfae4c6c48e31e SHA512 c073d573e9b13b72fa39b178271ce65d1a19fef35943ef0a9e6121a5c66d9db212aaad38ab777c5b44e20a107eb677003acbdb4a354bcb2dc40f535a97d9df0e
 DIST pngcrush-1.8.13.tar.xz 404564 BLAKE2B 6e3e9556b40f5616a488cd4d0fbbe788b31d965b748222383741e9dc0c8fe7c12880b2d2a39ef35aa41adbab1fa9f49e7272dadfbe74cc712a7b810a9787d9af SHA512 5fdb7913ec8c90af63d68477f4031c9008dac0d7f4bfd7bd47e971d218e3ef8b0e1a8bf6ba0f5d2cc4c2682c9297efb4f738b11538ad306eee5d01277ce3f628
 EBUILD pngcrush-1.8.13.ebuild 855 BLAKE2B 46788be2557cc7cd96c41f5bf54f40bef735ef0b04dba1abb0c0c834d9ec90f484d6e8404d04616ac3649fad7e43a1bc540b724af70dbb0436e8957cdaea043e SHA512 7fb3990a501ef008f37824318e4b92899857cc77429bb805ca5385b13cefacf76402a19b7c5d306b87e3a91eb6e6f5da6622e3fbafb591e35b1b0582e3f0044e
-MISC metadata.xml 527 BLAKE2B 171fb4d76df288f8bae876b4b19900a0c60e7dbcf6233cea7385eb96d13a531efacaedbbfd6a5fd2709b3391dddaeff2eb4c97a1ff02b300a5b628eca5502f3c SHA512 659e4b683a9ba43dcc06d8471b74d6c0690bf661898405e722e5ba98620ce354a9ef1e642cee5ed5bd77b180254cef9e29a03c8e42f94058548c39c2116652a2
+MISC metadata.xml 584 BLAKE2B c72f94d85607da1692a3cbde638df27677ed0e5a6ed3db8ac8df0254625e888ccb3bd5a4d412e83388f4be904dad5aeb950acfcc783ec7c18efbcb81080b9ab6 SHA512 d688f54bfe67a570b86fa61bca6ca93330a2cace31dddf619aabbbd72ec5d81fe3303c9837f01e79ed9bdf3e4f8a2bbc997ae968c33df7cf0a0985914cee2de1
diff --git a/media-gfx/pngcrush/metadata.xml b/media-gfx/pngcrush/metadata.xml
index 293c80b945eb..5081ca62df6c 100644
--- a/media-gfx/pngcrush/metadata.xml
+++ b/media-gfx/pngcrush/metadata.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <maintainer status="active">
-      <email>glennrp@gmail.com</email>
-      <name>Glenn Randers-Pehrson</name>
-    </maintainer>
-    <bugs-to>https://sourceforge.net/p/pmt/bugs/</bugs-to>
-    <remote-id type="sourceforge">pmt</remote-id>
-  </upstream>
-  <use>
-    <flag name="system-libs">Use libpng and libz provided by system</flag>
-  </use>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>glennrp@gmail.com</email>
+			<name>Glenn Randers-Pehrson</name>
+		</maintainer>
+		<bugs-to>https://sourceforge.net/p/pmt/bugs/</bugs-to>
+		<remote-id type="sourceforge">pmt</remote-id>
+	</upstream>
+	<use>
+		<flag name="system-libs">Use libpng and libz provided by system</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-gfx/pngquant/Manifest b/media-gfx/pngquant/Manifest
index 33fdb03b95a8..4aa8bcd32389 100644
--- a/media-gfx/pngquant/Manifest
+++ b/media-gfx/pngquant/Manifest
@@ -2,5 +2,5 @@ AUX pngquant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1070f9
 DIST pngquant-2.12.3-src.tar.gz 143572 BLAKE2B 6f4cc9f36c9148f36734d9afa3765e206c09e833064cff5d98494d0d71610e857d7c605bc5673eb9fd5b38029ade60c9c1ffc18e745a3dfe5dbde6d39a81d0c7 SHA512 cf39f56750a49b2818fb86b168845e54f3797b664c3f49535ee93a3dc899299192a692039396ffcddc5988d040a778006c5f701f8bcd9f5c73583a47b711b01c
 DIST pngquant-2.12.6.tar.gz 69074 BLAKE2B 3573d54d94b0085de9ffd4dd34a8fd46c49a1e02d0a6419271c17bc7ac7ab6c05d811336a3a8a8ab21d4dea774c93ee1baae141b42c255838fb1eef9cdb1a871 SHA512 8ffff346df67edf1000c71b6d26371826bc4d236b3f57ef1ec73b3b61668cff9c3ca7d541417c39bc6c89e00176c91eb28867b7a91945ac84292ca0ac54984e9
 EBUILD pngquant-2.12.3.ebuild 1169 BLAKE2B 56452f5fa0d76b47151583ef5c4684781eeee2ad12736845790af6ac1a1bb06516c692156a54aa08bcafe5d9df3f5175e3be34e9564e79970ca43cb65428275f SHA512 648727074119405019a00eb3f252ff86e0157874821f3fb9e6025183937cb4639a8b15c19974ee31bb27313cf791a45c8569490e885f0a92b88b1b2d62eada44
-EBUILD pngquant-2.12.6.ebuild 1327 BLAKE2B 474a665e2ab43efc9904450c28edf79f875b49c528555bb7ffd1cc713ffcb0bbd6de56a9279c166435895504df93889e06205500efbc43071c5edbcd7ca4ead4 SHA512 3f8c497cf9963ea3fef36e5ee03c5fde950e80ff0c6819e5a0801625f1276166c7161d055ab3394d5174eea215f19af87a60d5583c64783d35787b6f520a0514
+EBUILD pngquant-2.12.6.ebuild 1329 BLAKE2B 0dacb67b6294e461c2b8f098c1064a580e9c47f66de1bf7d38bb346c69aff6cf8b62e87908b2fd908f31385ebc5559549963d9eca8a5954257656d0d7b8dba1e SHA512 b07dc65fb7e5a6cefeff41c6ae48906cac8ff1a548d67309d4f35f38da9033af1111d2dc47d448acf9741d39e6af53c8e28b24d1599d6a8ff3bd0f945a5dfa44
 MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
diff --git a/media-gfx/pngquant/pngquant-2.12.6.ebuild b/media-gfx/pngquant/pngquant-2.12.6.ebuild
index a3698ccb13ac..2fed8ebcbef0 100644
--- a/media-gfx/pngquant/pngquant-2.12.6.ebuild
+++ b/media-gfx/pngquant/pngquant-2.12.6.ebuild
@@ -12,7 +12,9 @@ SRC_URI="https://github.com/kornelski/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3 HPND rwpng"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
 IUSE="cpu_flags_x86_sse2 debug lcms openmp test"
+REQUIRED_USE="test? ( lcms )"
 
 RDEPEND="
 	media-libs/libpng:0=
@@ -21,7 +23,6 @@ RDEPEND="
 	lcms? ( media-libs/lcms:2 )
 "
 DEPEND="${RDEPEND}
-	test? ( media-libs/lcms:2 )
 	virtual/pkgconfig
 "
 
diff --git a/media-gfx/qimgv/Manifest b/media-gfx/qimgv/Manifest
index 548c02a59502..a44de7ca2170 100644
--- a/media-gfx/qimgv/Manifest
+++ b/media-gfx/qimgv/Manifest
@@ -1,4 +1,3 @@
 DIST qimgv-0.8.8.tar.gz 460682 BLAKE2B fb701fbb336bf8e51751f677f7fddfd7eb0e1b770697ee510c0008a3ebddb0a3948d5a3f6f57a676dfa3117ca03b908cc3f88bcaec16a07000108279bd5fed80 SHA512 376f79eba2a625eb0f622494ce7ba98e1182b43cc6d7e268382c794a74d2772bd17083ac9ae45fcafc5eeb0665ef06ab34bdbeee8401a35bd0652744c576e131
 EBUILD qimgv-0.8.8.ebuild 1126 BLAKE2B ac635b6d46d4d63c8afb846fc248ef15c29e607cc2a5a85d7236cf5e4a186a4a2ac610e60fa3dd7fd108f9d6f7de8622b72d3a0d40e315704ef7e696bc3416b8 SHA512 7ba8910b8dc806e176596f2f2ab19ab24b066d94661ad2b466c6cb3d65bc20d982335172eb7ff0642dec26d065f4bd0399c973d3740c8bbb19c272d6289106c0
-EBUILD qimgv-9999.ebuild 696 BLAKE2B 4341560b05ddf294b877cd659b3647e5409e55bb39b34161106bec650c451ae46a2398a0a0d78580b1db0f27582b409162e1c199023891df764d77c123809586 SHA512 cb1d5e0eaff96f45f4cb63d50f75033a035ea0687fc801f921b0ca0c63a6812331c3efa17fd957fd07564f8d2a340530bfd4114851dab827b94830dfd09f6670
 MISC metadata.xml 453 BLAKE2B ca83aa2e239dbd9bfca29a20d99b8d352392db1f17fd77497d6eb6266e19e300a30c5544508a479ee6832a6ef1211ff5df08787b726839e5ad39fdd21f8ab5d7 SHA512 ca30cade161d874f67a0aa2fdc6084bce465920bbbca9cde599f6b879dfd6801426d6603e02bb9f34f1ac1f00acba896279f231b49bcc9cd3f0355ff4bb310d9
diff --git a/media-gfx/qimgv/qimgv-9999.ebuild b/media-gfx/qimgv/qimgv-9999.ebuild
deleted file mode 100644
index a5955797418a..000000000000
--- a/media-gfx/qimgv/qimgv-9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit git-r3 cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="A cross-platform image viewer with webm support. Written in qt5."
-HOMEPAGE="https://github.com/easymodo/qimgv"
-
-EGIT_REPO_URI="https://github.com/easymodo/qimgv.git"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	media-video/mpv[libmpv]
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 732394b3fa9a..5d33c27ebd1c 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 8128 BLAKE2B 7c6fbc94b1ccb9ccb4c6a8bb861552276422ebcf5638728794032b459cfb662f8dc20c52b4f484ad9a7eb06fba0b00e15cbfdbaa008bce7ada23008feee05e8d SHA512 23968aee0b01d5d87e57b834ecfaa9ca709a63cdfc4c62f367a484868188ddeae3f88f6a325cd33bb2f0a2f9ee3a35fbdcc8c9e2748a2505095786a1be53ae24
+EBUILD sane-backends-1.0.27-r3.ebuild 8101 BLAKE2B e6ff1e73fad9d33c8b9d4a475de311b5ddf60a66fe2604f6c8573bfd593688292a84ac554dc06d0c9d1181f443f31e0e9fc6e6e520a0e76fe62f373129f92388 SHA512 1434b237b354d84eecfab48624805dcbd8dcaaf42e5315ca25c980942551a2cb0cae39453907982d96ffe2a4042def9eb7d44b9ad768750aa35d65a18057c06c
 MISC metadata.xml 266 BLAKE2B c76ad15982ba5b341a41155c75a5fda95a99ef658ed972c452bfb7b0968aafe33f83cc5bd0f2effb1c2b4f9721a8f61987f2fb7906855b3869e7787226f2b385 SHA512 67d43b02a8c1aab418ca79b30d88af0e78f9df9b95c93887cfed5976290e714409e7dc400f09170d7e7844a411aa3e3202f49f31f39b7f580a8c0b6f3d4db659
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 c75226331a14..b2767d69d408 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
@@ -149,7 +149,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	v4l? ( sys-kernel/linux-headers )
 	>=sys-devel/gettext-0.18.1
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 "
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 117fe707463a..682352083089 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -2,5 +2,5 @@ AUX 3.26-add-control-optional-deps.patch 2773 BLAKE2B e6c3faa98ecda13c926752defe
 DIST simple-scan-3.34.4.tar.xz 795228 BLAKE2B b6f185bfbc1954ae2573fd1dcfa54f67e26290654c1019bfd34c229235e27cfc1eb40de0e6d5249f97b73c57745e1133fbd6fd1c3f9bdedb795b61068d5ed25d SHA512 b16b653e0a8ce399ecbdb88c4663d7780793518809eb73681c9c6281b9cde784167090c41720b21c184b9fdece28b07ba61fe8a97f10d792cc7326a458741ba4
 DIST simple-scan-3.34.6.tar.xz 801064 BLAKE2B 94c6bc386c2d7701bd13067e384eb294ce145d2e02d66e366e76a2c85fb5e3ac4e9bae0efa37fe13d3fc857b57c1730bf01961f7968d6744a4ea4dc47308cb23 SHA512 7b2d0eab13f08d4110d2143c4572e249297891e3868e6eb178a7a765b2d56960820931fbda538ede318014c578871657aa0e27518d184f861efc18ad4fdd900c
 EBUILD simple-scan-3.34.4.ebuild 1322 BLAKE2B b6359d130e933254fa3e5350ebb2ac562d4682f5c1af219f07321202e3deab61adf6dc9cd34e1dbbc3a04b0211ed091273e494692fadceca6a52bfebd1383c04 SHA512 16e305af51c31b4f775de7b4afe58cbe7ca51622dfa073c890a3e179b83a5f5853d333042aad26a738fbb19253621cc347e7b8a0984717fa2d04629443a9d219
-EBUILD simple-scan-3.34.6.ebuild 1324 BLAKE2B 61b1cd39eae6762f0cbee289d0b4ee56cb36633fc968fcfc80dad7b99163d19b2e0c0314716c957ae845a56e59ba81df78d68852b7d7ca933c7d22236fb71982 SHA512 dc4b204b412c840749383273bb7c8c3fb4bc4e44d53b8d3e2332b603a372476bf0bbce9780d13a5d5e07e3dc3e9c10145a7be1e08ac22dd44d53ef07a6fe0066
+EBUILD simple-scan-3.34.6.ebuild 1329 BLAKE2B 21944ee06e8464b55a1ff8240f6e0c8816fb736093614b698ba7a964e013214aec8c3c010867dc7c3d5ac6688d8a21cb2d0a457dcbfd033d0e41bc203551d908 SHA512 accbc4335878c4c83b2e9dd98821fd5594683456750f3f169d38c261f6c4410f9b09856cd2c78d84df50787f1aa70446704f5ef567a145a252569b2d7af19362
 MISC metadata.xml 616 BLAKE2B 576d986402f8cc708eae60f661640808751747c764d5fe729dd014f33758e0b484a2b80a214d9a3d1ed4bce7e455e34803a62048240e5de8e203184446cdc0df SHA512 6377cb9c20b1ce2db22ba959d386e4389939b72503d87da956d659144b8a6f8b521abdd19dd4c82ac0cb32e260ce6633b75136a353f63b86593f5e1f12394d47
diff --git a/media-gfx/simple-scan/simple-scan-3.34.6.ebuild b/media-gfx/simple-scan/simple-scan-3.34.6.ebuild
index a2e99a48eaa5..a7a3d720bbeb 100644
--- a/media-gfx/simple-scan/simple-scan-3.34.6.ebuild
+++ b/media-gfx/simple-scan/simple-scan-3.34.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="colord webp"
 
 DEPEND="
diff --git a/media-gfx/viewnior/Manifest b/media-gfx/viewnior/Manifest
index 5a405504b736..9745befdc6f4 100644
--- a/media-gfx/viewnior/Manifest
+++ b/media-gfx/viewnior/Manifest
@@ -1,6 +1,8 @@
 AUX 0.17-Replace-calls-to-getenv-with-g_getenv.patch 1182 BLAKE2B 37a7f395e35a8ac3edbfd3b8d057275c1981347c6e5018c8bca29322ebc33a32b16e0880bddcd394cb9da4315eb26592f9342d8cf58c88f1a29f902e858d8f97 SHA512 190f6b1fd7f4640022274207254be0967718c3d602bc521557a3e4eed6afca274bf650cf9e06ed4ec9a0527eca6b45c39c4b8e1091064b8408dac8033ca07c9d
+AUX viewnior-0.17-update_metadata_location.patch 1260 BLAKE2B c3b522f56bcc039978e559f3f0bc4095f5b7750c5d3b54ada39c43631275b0e619a0aed04cabe6a6ca7c0237bed687f46db0eff226f6ab8a6184b08783e09628 SHA512 6ce85095c0cbecfa4d2e9da1a9fa76aec0ef38a585d9aa588403fe9afb76b3faf041144b050e56ad6ec87769cf164c4d7f854003a09d7e21919205903f0f0c2e
 DIST viewnior-1.6.tar.gz 168966 BLAKE2B 1a04ec6ee4e05da8d0721115826d2550c7d24b4299c105eb6de7ec3fe74b350b49605dbe5246a5acd93562fd904923053ab99a5741b929abd99ace8b2ad148cc SHA512 4b150078573bfd3b8c5863d73087a51cd3b7ed5781e26c842fab44eec3e67ea9aea3feba064538578878df1ccb386525a6a84362dae7f92315fb7de735ace617
 DIST viewnior-1.7.tar.gz 165719 BLAKE2B 906ab0b632fcc102ac62dd77d6742c2121c46cd92adc0dfe9ba772bf697eff356519dbb6219016a6470903c855aa4c9081f0d61ca1607d8d1b6d8e03236a19bc SHA512 5ba17d7b5ceeffa65b04213f179c1439b09ac44e412e0750dde159b118a714f28d3a290509a402b234e4e7ba5b185fc73eef65d418598f344911e4e2c1373fe5
 EBUILD viewnior-1.6.ebuild 932 BLAKE2B 421cec0425ef6008090cdea7df88f90c45641f0a26355fcedaaf86c9f11f797cdcdcded489c233ca128ed87dd0863f1965013899c6421584f44d6d7e1dbb5d18 SHA512 847f9cd4e8c24460e77df21e99899507f2adf634fdc605bf3884ba0ba317b84e468218ce5f0b46a6d96b8b6c94966c0dd0b170d330cd22ba2c4069bcd4529303
 EBUILD viewnior-1.7-r1.ebuild 1279 BLAKE2B 4302bd5b94b27ff3e5b0f8db78a3f5e7fc092a7f861c3edec053f050368b136b44d19ae151331c4f4a7c915d56c5609fda2099c075fb2e3a944e7ecd598b7a35 SHA512 c974ab91c7110447b9d51a2e6a0481730452bfd8d3d0090ea6b631df0e890a3e0fbfb280e6836a28e01c1f26ecaf36b67ee848d9842bd1268e8f9e9949f3f2c9
+EBUILD viewnior-1.7-r2.ebuild 1162 BLAKE2B 0be864a12245dafbcb199f774478a17ea23715f9b160bdfc3ae2b498a9bc7849ab3ecf8f5588cccd23aabce0a3bebb5ead3526a5cf713fb32152f46e4f16f0cb SHA512 3533cd649c5619a44679a2316a67862812706eb625b6ed19b0435e077e312836e8ce63aa6732e3e818417f2a6201864d1dc8de0d8a4b0313643c04846ceeb0d7
 MISC metadata.xml 522 BLAKE2B 3f08e8b96d95c32bc0c2265afa2b580b92258060f4964c9f595da738fe96814406f8d8cc67965b985b714abded06d848df43bbd9fb72641b1123bbe1fd6f348a SHA512 94a9310a1eb358b2468caf0c21a5d799b81049483443b87e0fd4abe644295390f1703ec1b7a58562db89b353632f682f555cec64f41969e3a3e90017cb5913da
diff --git a/media-gfx/viewnior/files/viewnior-0.17-update_metadata_location.patch b/media-gfx/viewnior/files/viewnior-0.17-update_metadata_location.patch
new file mode 100644
index 000000000000..492186059d91
--- /dev/null
+++ b/media-gfx/viewnior/files/viewnior-0.17-update_metadata_location.patch
@@ -0,0 +1,42 @@
+From f338c37881a860952aa10cc437bc72fa0b49a823 Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Thu, 21 May 2020 20:07:45 +0200
+Subject: [PATCH] Rename appdata.xml to metainfo.xml and change install dir.
+
+The new name is used since AppStream 0.9.8 (2016-08-10) and the new
+location is used since AppStream 0.9.4 (2016-04-18).
+---
+ data/meson.build                                     | 6 +++---
+ data/{viewnior.appdata.xml => viewnior.metainfo.xml} | 0
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+ rename data/{viewnior.appdata.xml => viewnior.metainfo.xml} (100%)
+
+diff --git a/data/meson.build b/data/meson.build
+index 55070fc..05d734e 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -17,8 +17,8 @@ install_data(
+ )
+ 
+ install_data(
+-  'viewnior.appdata.xml',
+-  install_dir: join_paths(datadir, 'appdata')
++  'viewnior.metainfo.xml',
++  install_dir: join_paths(datadir, 'metainfo')
+ )
+ 
+ desktop = i18n.merge_file(
+@@ -39,4 +39,4 @@ if desktop_file_validate.found()
+       desktop.full_path()
+     ]
+   )
+-endif
+\ No newline at end of file
++endif
+diff --git a/data/viewnior.appdata.xml b/data/viewnior.metainfo.xml
+similarity index 100%
+rename from data/viewnior.appdata.xml
+rename to data/viewnior.metainfo.xml
+-- 
+2.26.2
+
diff --git a/media-gfx/viewnior/viewnior-1.7-r2.ebuild b/media-gfx/viewnior/viewnior-1.7-r2.ebuild
new file mode 100644
index 000000000000..60e6b46a431e
--- /dev/null
+++ b/media-gfx/viewnior/viewnior-1.7-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg
+
+DESCRIPTION="Fast and simple image viewer"
+HOMEPAGE="
+	https://siyanpanayotov.com/project/viewnior/
+	https://github.com/hellosiyan/Viewnior
+"
+SRC_URI="https://github.com/hellosiyan/${PN^}/archive/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	media-gfx/exiv2:0=
+	x11-libs/gtk+:2
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${PN^}-${P}"
+
+PATCHES=(
+	"${FILESDIR}/0.17-Replace-calls-to-getenv-with-g_getenv.patch"
+	"${FILESDIR}/viewnior-0.17-update_metadata_location.patch"
+)
+
+src_prepare() {
+	xdg_src_prepare
+
+	# That script would update icon cache and desktop database.
+	sed -i "s/meson.add_install_script('meson_post_install.py')//" meson.build \
+		|| die 'Failed to remove post-install-script invocation from meson.build'
+	# Don't let meson compress the manpage.
+	sed -i "s/subdir('man')//" meson.build \
+		|| die 'Failed to remove manpage compression from meson.build'
+}
+
+src_install() {
+	meson_src_install
+	doman man/viewnior.1
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-06-21 17:50:24 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-06-21 17:50:24 +0100
commit	feb0daf81d888e9160f9f94502de09b66f2a63fd (patch)
tree	b6e5c40ce2abef3da27ed50a023153f475e0ddef /media-gfx
parent	9452a6e87b6c2c70513bc47a2470bf9f1168920e (diff)