gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /media-gfx
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
206 files changed, 2316 insertions, 2254 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index e2f0edcbc732..b149f93f73f7 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 7bf73a696c4a..d1c1bdf5d67d 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -13,6 +13,6 @@ AUX alembic-1.7.9-prman.patch 822 BLAKE2B ed5faf9b8e4eb165b82a5001b129403ce0afcb
 AUX alembic-FindIlmBase-pkgconfig.patch 971 BLAKE2B 946766bceb152a1673737af5158be9f5efce812a70adfe36bf5642f150d2576f14c22670cc1bbf9027834c69ac661ca30d27f06f9fbf73f656dd883ce38a381f SHA512 4f5fa5a33c8fb4edcb3c0a5d0290a912015c0e02ecd6340e5dced1f658302034148a1050aee1dcbf3d7d89f11c5e9ea07637c659414951152dd49081c70560c7
 DIST alembic-1.7.11.tar.gz 826833 BLAKE2B ea2ee92cefcc92d3658b8c71351ec0f72bd1fb5d5b6c771ceebe81b1db61a280420f480cd3612f44bc134cccb388954be89baba9dc6e5973e102bc55d65cd974 SHA512 94b9c218a2fe6e2e24205aff4a2f6bab784851c2aa15592fb60ea91f0e8038b0c0656a118f3a5cba0d3de8917dd90b74d0e2d1c4ac034b9ee3f5d0741d9f6b70
 DIST alembic-1.7.9.tar.gz 813379 BLAKE2B 599edeb5ad805656755b3e150fba56182d1d60673951b0c1702b3e3e82d9499ec4fcb938303103c27f84458f61ab8de4b872eaa322380ae7713e3b4cd3831af7 SHA512 8025c20525ffbd5bdc9dd5a33ad8238e49f063d244ab9d112e7d1ddb7ee7cf9b36ceb74cb45d658ce22d3033552c89bddf6b818cf466ea46aa1a70a41fdeddb2
-EBUILD alembic-1.7.11.ebuild 3146 BLAKE2B b10879c542287839d80356ea5890eb6e16b28a66208812ff9bd3984218dd0bf06cca58f30b807d20634b30efa06e12befd135694bf0e4684b2bef83b0a1b6236 SHA512 2ef89d05137cc421563bb381ebacf56b967d207d2b742154c1c60d45ad3d23ac8d538947d1d7f07d41d933fd5253f5fdaf39f11344b9203522e25289424c04c1
+EBUILD alembic-1.7.11.ebuild 3116 BLAKE2B 4e99e8f09a6dbb375e9625bfd741b041c5eeb025719f976184b0fcc38de33e85760bb361f49749271cc72cc54e1fb28f061a0ae4a2768aa7bf72d57f1ba34a67 SHA512 fdccd1f49994b8dece041f51c3025a6e65df979f4c92e3ccff2857e553cf2fefe02d928a3472494c79190bdd8db49eb2ffb6224c851b8e96cf2ba70c2d2c215b
 EBUILD alembic-1.7.9.ebuild 3042 BLAKE2B 34e36d9afba3d755b7bb9b93d3c05752cb59b1e9243e8c65400b8ed720ae0d506611508ca4b77bbc6f6d9454f658781351da5f3da3f65ddeac703aeb20de741a SHA512 9432e74649534ae0ce54a8879168b1ae2fac5f33b082fd01c164b42adcb9da93efcbd3e806e7ea226c5a432d380b763b23cb6bc012bbd18e20b77e19ed36c91a
 MISC metadata.xml 1343 BLAKE2B b0e902df8e5f04bcbe4e784abe396b926db2de2347560181ab77ee60da7cec55ab10aafda38623109681240992b8b43208fc65fe72fc8dd66cf6ebf09defc085 SHA512 af9abd189b8c15b53b60b818a7ce419b812092ba1725ebfa4d3267c5d2f67018c7f3cc06bc24fe9af614fb420b4f8176585a53920378521779c4ca52c39c22cc
diff --git a/media-gfx/alembic/alembic-1.7.11.ebuild b/media-gfx/alembic/alembic-1.7.11.ebuild
index a306c9ea3d73..eaf86523653f 100644
--- a/media-gfx/alembic/alembic-1.7.11.ebuild
+++ b/media-gfx/alembic/alembic-1.7.11.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils multiprocessing python-single-r1
+inherit cmake multiprocessing python-single-r1
 
 DESCRIPTION="Open framework for storing and sharing scene data"
 HOMEPAGE="https://www.alembic.io/"
@@ -50,7 +50,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	if use doc; then
 		doxygen -u Doxyfile || die "Failed to update Doxyfile"
 		sed -i -e 's|DOT_NUM_THREADS[ \t]*= 0|DOT_NUM_THREADS = '$(makeopts_jobs)'|' Doxyfile || die "Failed to change dot threads"
@@ -73,11 +73,11 @@ src_configure() {
 		-DUSE_PYALEMBIC=$(usex python)
 		-DUSE_TESTS=$(usex test)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	if use doc; then
 		doxygen Doxyfile || die "Failed to build documentation"
 	fi
@@ -85,7 +85,7 @@ src_compile() {
 
 src_install() {
 	use doc && local HTML_DOCS=( doc/html/. )
-	cmake-utils_src_install
+	cmake_src_install
 }
 
 pkg_postinst() {
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 02be1684148f..d96c593ff3a2 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -1,17 +1,11 @@
 AUX 64asymptote-gentoo.el 337 BLAKE2B 56b028184573dd8db6babd90ae45838b9788671134d625df5960744b71b377db3cacf1dd4fc78d9800ffdf4e83a2413b7e87680ab0fcf45c31ecad9dc538388a SHA512 c8c74d5464f500e9bc3ca2fd89065e4f68a834c1b82a444820efd70abf9d2bd7c52ecbecd7ea5fad916259512acf4aedf8aed803a707733121211e59ef300c86
 AUX asy-ftd.vim 60 BLAKE2B 2ef690e6c1906378872aff97ed956b0c8fd1cf2e492787edd3bbd928d50724eec7b5b65f2b1b70c83e520b849c1cfe1539dcc7aabb0f8ba38b448ef58f36b802 SHA512 f4b62341f1482386d3e402f9d70a0f6b4c103a412a63dd8947aa45a5d43f12970902615b6c13e8cd8123f1cd44bf72e4204118d3bcfa7969fce078924bf150fd
-AUX asymptote-2.41-configure-ac.patch 475 BLAKE2B fbc6e09ab9bfba21bd0deb6cf12514307b826b9f85d42b44b427667f57db63bcbd4ca64cda502da2ed1110bd133968e2e95e0289b1179d126fcc7c4a1e55e79e SHA512 39403fbd218ca5a6c3a565e6f1955467c8e11296c69acfe529aca5566e03bfee395c360746288fe09d768c2cabd46faaa6efcb7e57595f0dc784b4ef2e0c416a
-AUX asymptote-2.41-info.patch 436 BLAKE2B 71987cc6fa4df197bed0dca7d4df27058ce28732cf8aea6a58f9bbd83e378757569bc39aa6fe0ff14f5dfbf7044e4f4ad27014814c318bb7a4993f9aafac761e SHA512 7d3ae35b2eb2b226ae3b7326d2e7d50524402d49be90303035a2872b5a109bb104f53376b9da681cc8d6922ddadec6a606540842745109edd3b55ce50725a6fb
-AUX asymptote-2.41-perl-5.26.patch 400 BLAKE2B 68d346f18f4021ac486dc06dd9dde7e118acb3050284e5aac8a5ef33baaed43a06bacbaaa0a75b0a49a7b8d03f7af65c8daf759d7a9e13b152ad6f7946a7a5df SHA512 bb333f4f42063be1c4a19d4cfd4209ac7b7d3c4318a5c3634581d63af2183cc27918b80e47148b1cbc256049b38cb85982ef7e00f7f021be3e714adabf15c87b
-AUX asymptote-2.41-xdg-utils.patch 744 BLAKE2B 9e36f5f04c7be761abb026fd894417ff5b7a90f46d2af14392d5a9e6fa6e666703892379954dd45044953519f59a235858b3ca91a84c9056d147591544bca09e SHA512 370fb078d926185ab7e10cbbc8afc4bfe0829e682fe89729a5d41bb3bda5dda96711f1fdcb99b9da69606563ce120383e5a1211372f3d8dd54ea3ddfc0838d7f
 AUX asymptote-2.60-info.patch 436 BLAKE2B 7e0848a620289fc5c5913a8e09c7f19bf08fcc28533b3326045b5c09cbc116de74f5d18984d410834ab175d7b8d21de8b70f3dc45058da02e6eada0839382315 SHA512 d2ff074572997bf2eafd49c41ea730a1a87c3bf9e18968a129ba94e741f2d673eb27aabdb43ae706b0296d9cbf2f000fa46c4ad119629b070d4f51295f9cff5b
 AUX asymptote-2.60-xdg-utils.patch 752 BLAKE2B 1723819dea49747cb995df9d9beef9878cbbc0379bfeed75cf52e5bc1ccc1a536d088e6f01770330bef2d86156b2699f1a6c9aa1c7ce0655689226f99fc99dfd SHA512 0e82e39cf26e6ccbfab9d9410f5ee7ab7574744036208fb742c3e894db33fd7f2bbb85ccea5f04068d7658eef1eddafdb6d1a505a80a2f38121c47c77184f176
 AUX asymptote-2.61-info.patch 436 BLAKE2B 34787bb4afb276074a16bbf36bf31ed71a1fd213d96f6124f4552497901c6b315009b33da74dbd554806089ce2ca1a35d3efbb4ce6388e4e05339c4ed36ab688 SHA512 4ec89ac4ddd7eb1b4b1757453000b88f509323f20995631e82a2923cd275d4ba3f7ffabef8293da943ab2ecf406e20e239ef7d2c956d6c441b287ae79e34da20
 AUX asymptote-2.61-xdg-utils.patch 752 BLAKE2B e73ad1bdda49fe95f494815571b21c7987e256450885077b89bb1dc6e192fb0cb5389dcbc1864750f6a3b6bb2762056df3c3ccea01edc42ca8f5cb435d1fc4f8 SHA512 a967c529c9e487fea3fedc46cfde81347aca98e470f7bae17879f4ca7c661ea658e764dfb352c73dc0860e152d5a0969e4ced034e1bbbd59f78d495365ce5f70
-DIST asymptote-2.41.src.tgz 3516426 BLAKE2B d4623609be58566e32de82c5c47f635ed737459fa27cd2da0622d639cd8207fc69988a7ecbf82993b051435fbf223c1f1178d213aea258a2b57fd3a698eee9cb SHA512 93f737a44b085c2290c4553c765cf49679820e6623bc5b6d0229818409868876275d6f0571abeb76033955fa95ee594e37d10c9901c54755b085e36760fd96cb
 DIST asymptote-2.60.src.tgz 4650347 BLAKE2B d969e4716a2493ae926ea1f58d0b247986e49a6a1902fb94859a45177ece4f149f5875cf788eace1c27c968652c49b2ace7b98aba02380cf8e1e3d4231560476 SHA512 a0653b9647d8c2a77656ea82faf8b69d28a43cf5ac61cfa9c6c62e2c51b4939e83202b95056495d10bee86a81e48b765ed4604a4d882a47a36b1dd6d5f9ad96b
 DIST asymptote-2.61.src.tgz 4623504 BLAKE2B 8432f07ce21f630c5bdae609650c0bb2bcd237a121df68030dc19d1cae986f0bfa56dd0e241570809f9fcb202440e8b9b3c6d47a22eeaabe3eb9523360a166ca SHA512 34bb610360b4536da70ca9edf1e069ebbf0c9225948b92b3d59ea25e8684587364fa7bbb03909ba02617e6ee81d41a2e530c9ed639141e4cda42096143cab5f7
-EBUILD asymptote-2.41-r1.ebuild 4699 BLAKE2B 59a57de3618882d0d6068980358ad0a6477eee4359e9284051a94d3a045a8853292f21cf299869035ca329120fea658494f8189e9871c1fd5af45959d7f520c8 SHA512 08918fb1af35f5d3729257fc274ef19c8c37518c65b3dbe5833c0039fa8b751bb86613a4c7b93f48d78e695195645c5623f940a91505a4ba8fc21e272d769448
-EBUILD asymptote-2.60.ebuild 4560 BLAKE2B e051d01f655a987b8d95a7e8ecaeb531504d2294a3f1c896e4a8956f4df2efec3e1f48d2d9016b308e50dc3737a1b8c554f6e7612da4339a9cef6128df2b9d62 SHA512 15855d03cbd9510b6bcf72cf1edf1b8e5d5f514169fcadc21e76f4d0f81c8bed00f2062ccfb854f302d6213548864b5b013a706276e6d779001a3d380b142ff2
-EBUILD asymptote-2.61.ebuild 4560 BLAKE2B e051d01f655a987b8d95a7e8ecaeb531504d2294a3f1c896e4a8956f4df2efec3e1f48d2d9016b308e50dc3737a1b8c554f6e7612da4339a9cef6128df2b9d62 SHA512 15855d03cbd9510b6bcf72cf1edf1b8e5d5f514169fcadc21e76f4d0f81c8bed00f2062ccfb854f302d6213548864b5b013a706276e6d779001a3d380b142ff2
+EBUILD asymptote-2.60.ebuild 4571 BLAKE2B 4cdc3585c7680d97a6aabc8190c0e06a78a5f1d962cda7b483ee7a9ae7976f3ed12b9f5d4b50a3753d6a70f327bc548c783d41af3a624640b3ca71e158d6ee9c SHA512 c3a1e17e3dbbd9c3068d87fbd352401b87ba4d72b90cfc93f87251fe8d551692807a1a46b5515ce71486aa1305207566d99ff3e0b63e3957f7e5987f55af53de
+EBUILD asymptote-2.61.ebuild 4635 BLAKE2B 8ac6b425bb7e0431520646a192dea5ddbd8744b9286a48148ed5528e2ba17ee4c95fcb34e8981be3d2f1b9c0ad437188d8dc4caea75b1a9368aba46a0155d5d6 SHA512 22dfd6b7ec9da554e6b3b621de3157122bc47f48fe2c1ca4b9b3d531e31e294335a55e262a0b4863cfb7d5ad0916505ae54720aa068402639810208ed77b490a
 MISC metadata.xml 1105 BLAKE2B 4b7d588a861ed68910f0d5a7b7f5691b3e97b6cf4514c3544c8610c77340797354575b49b70980320e55ecf5ea8188bbe8f6cc8fce55d18dc466f1d0fd83ade3 SHA512 f115ea831900270542ffe545260eda1ed51d321eca5aa7772f336bcc0e0c6471be3cbde2991c3e48ea5b3fbf51b8541b13de850406af15e42c992da0f2ed08ee
diff --git a/media-gfx/asymptote/asymptote-2.41-r1.ebuild b/media-gfx/asymptote/asymptote-2.41-r1.ebuild
deleted file mode 100644
index a9cac4411335..000000000000
--- a/media-gfx/asymptote/asymptote-2.41-r1.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools elisp-common latex-package multilib python-single-r1
-
-DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
-HOMEPAGE="http://asymptote.sourceforge.net/"
-SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	offscreen? ( opengl )"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.4-r5:0=
-	>=sys-libs/readline-4.3-r5:0=
-	imagemagick? ( media-gfx/imagemagick[png] )
-	opengl? ( >=media-libs/mesa-8[X(+)] )
-	offscreen? ( media-libs/mesa[osmesa] )
-	svg? ( app-text/dvisvgm )
-	sigsegv? ( dev-libs/libsigsegv )
-	boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] )
-	fftw? ( >=sci-libs/fftw-3.0.1 )
-	gsl? ( sci-libs/gsl )
-	python? ( ${PYTHON_DEPS} )
-	X? (
-		${PYTHON_DEPS}
-		x11-misc/xdg-utils
-		dev-python/pillow[tk,${PYTHON_USEDEP}]
-		)
-	latex? (
-		virtual/latex-base
-		>=dev-texlive/texlive-latexextra-2013
-		)
-	emacs? ( virtual/emacs )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-lang/perl
-		media-gfx/imagemagick[png]
-		virtual/texi2dvi
-		virtual/latex-base
-		app-text/ghostscript-gpl )
-	test? ( app-text/ghostscript-gpl )"
-
-TEXMF=/usr/share/texmf-site
-
-PATCHES=(
-	# gc.h -> gc/gc.h
-	"${FILESDIR}/${P}-configure-ac.patch"
-
-	# Changing pdf, ps, image viewers to xdg-open
-	"${FILESDIR}/${P}-xdg-utils.patch"
-
-	# Bug #322473
-	"${FILESDIR}/${P}-info.patch"
-
-	# Bug #635984 - perl-5.26 no longer has . in @INC
-	"${FILESDIR}/${P}-perl-5.26.patch"
-)
-
-pkg_setup() {
-	(use python || use X) && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \
-		-i configure.ac \
-		|| die "sed configure.ac failed"
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# for the CPPFLAGS see
-	# https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349
-	econf \
-		CPPFLAGS=-DHAVE_SYS_TYPES_H \
-		CFLAGS="${CXXFLAGS}" \
-		--disable-gc-debug \
-		$(use_enable boehm-gc gc system) \
-		$(use_enable fftw) \
-		$(use_enable gsl) \
-		$(use_enable opengl gl) \
-		$(use_enable offscreen) \
-		$(use_enable sigsegv)
-}
-
-src_compile() {
-	default
-
-	cd doc || die
-	emake asy.1
-	if use doc; then
-		# info
-		einfo "Making info"
-		emake ${PN}.info
-		cd FAQ || die
-		emake
-		cd .. || die
-		# pdf
-		einfo "Making pdf docs"
-		export VARTEXFONTS="${T}"/fonts
-		# see bug #260606
-		emake -j1 asymptote.pdf
-		emake CAD.pdf
-	fi
-	cd .. || die
-
-	if use emacs; then
-		einfo "Compiling emacs lisp files"
-		elisp-compile base/*.el
-	fi
-}
-
-src_install() {
-	# the program
-	dobin asy
-
-	# .asy files
-	insinto /usr/share/${PN}
-	doins base/*.asy
-
-	# documentation
-	dodoc BUGS ChangeLog README ReleaseNotes TODO
-	doman doc/asy.1
-
-	# X GUI
-	if use X; then
-		python_scriptinto /usr/share/${PN}/GUI
-		python_doscript GUI/*.py
-		dosym /usr/share/${PN}/GUI/xasy.py /usr/bin/xasy
-		doman doc/xasy.1x
-	fi
-
-	# examples
-	if use examples; then
-		insinto /usr/share/${PN}/examples
-		doins \
-			examples/*.asy \
-			examples/*.eps \
-			doc/*.asy \
-			doc/*.csv \
-			doc/*.dat \
-			doc/extra/*.asy
-		use X && doins GUI/*.asy
-
-		insinto /usr/share/${PN}/examples/animations
-		doins examples/animations/*.asy
-	fi
-
-	# LaTeX style
-	if use latex; then
-		cd doc || die
-		insinto "${TEXMF}"/tex/latex/${PN}
-		doins ${PN}.sty asycolors.sty
-		if use examples; then
-			insinto /usr/share/${PN}/examples
-			doins latexusage.tex
-		fi
-		cd .. || die
-	fi
-
-	# asymptote.py
-	use python && python_domodule base/${PN}.py
-
-	# emacs mode
-	if use emacs; then
-		elisp-install ${PN} base/*.el base/*.elc
-		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
-	fi
-
-	# vim syntax
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins base/asy.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}"/asy-ftd.vim
-	fi
-
-	# extra documentation
-	if use doc; then
-		cd doc || die
-		doinfo ${PN}.info*
-		cd FAQ || die
-		dodoc asy-faq.ascii
-		doinfo asy-faq.info
-		insinto /usr/share/doc/${PF}/html/FAQ
-		doins asy-faq.html/*
-		cd .. || die
-		insinto /usr/share/doc/${PF}
-		doins ${PN}.pdf CAD.pdf
-	fi
-}
-
-pkg_postinst() {
-	use latex && latex-package_rehash
-	use emacs && elisp-site-regen
-
-	elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
-	elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer'
-}
-
-pkg_postrm() {
-	use latex && latex-package_rehash
-	use emacs && elisp-site-regen
-}
diff --git a/media-gfx/asymptote/asymptote-2.60.ebuild b/media-gfx/asymptote/asymptote-2.60.ebuild
index bef7be52b544..9d8d5d64326c 100644
--- a/media-gfx/asymptote/asymptote-2.60.ebuild
+++ b/media-gfx/asymptote/asymptote-2.60.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=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools elisp-common latex-package multilib python-r1
 
@@ -45,7 +45,7 @@ RDEPEND="
 		virtual/latex-base
 		>=dev-texlive/texlive-latexextra-2013
 		)
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 DEPEND="${RDEPEND}
 	doc? (
diff --git a/media-gfx/asymptote/asymptote-2.61.ebuild b/media-gfx/asymptote/asymptote-2.61.ebuild
index bef7be52b544..bd19e8e0995d 100644
--- a/media-gfx/asymptote/asymptote-2.61.ebuild
+++ b/media-gfx/asymptote/asymptote-2.61.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=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools elisp-common latex-package multilib python-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X"
 RESTRICT="!test? ( test )"
 
@@ -45,7 +45,7 @@ RDEPEND="
 		virtual/latex-base
 		>=dev-texlive/texlive-latexextra-2013
 		)
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 DEPEND="${RDEPEND}
 	doc? (
@@ -143,7 +143,6 @@ src_install() {
 		insinto /usr/share/${PN}/examples
 		doins \
 			examples/*.asy \
-			examples/*.eps \
 			doc/*.asy \
 			doc/*.csv \
 			doc/*.dat \
@@ -160,6 +159,8 @@ src_install() {
 		if use examples; then
 			insinto /usr/share/${PN}/examples
 			doins latexusage.tex
+			insinto /usr/share/${PN}/examples/animations
+			doins ../examples/animations/*.tex
 		fi
 		cd .. || die
 	fi
diff --git a/media-gfx/asymptote/files/asymptote-2.41-configure-ac.patch b/media-gfx/asymptote/files/asymptote-2.41-configure-ac.patch
deleted file mode 100644
index 984ec7c2e951..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.41-configure-ac.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: asymptote-2.41/configure.ac
-===================================================================
---- asymptote-2.41.orig/configure.ac
-+++ asymptote-2.41/configure.ac
-@@ -159,7 +159,7 @@ if test "x$ac_cv_use_gc" != "xno" ; then
-       fi
-       CPPFLAGS_SAVE=$CPPFLAGS
-       CPPFLAGS=$CPPFLAGS" $INCL"
--      AC_CHECK_HEADER(gc.h,
-+      AC_CHECK_HEADER([gc/gc.h],
- 	AC_CHECK_LIB([gc],[GC_malloc],[
- 	  LIBS=$LIBS"-lgc "
- 	  AC_MSG_NOTICE([enabling system $GCNAME])],[
diff --git a/media-gfx/asymptote/files/asymptote-2.41-info.patch b/media-gfx/asymptote/files/asymptote-2.41-info.patch
deleted file mode 100644
index f1dc4309aa8c..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.41-info.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: asymptote-2.41/doc/asymptote.texi
-===================================================================
---- asymptote-2.41.orig/doc/asymptote.texi
-+++ asymptote-2.41/doc/asymptote.texi
-@@ -21,7 +21,7 @@ file LICENSE in the top-level source dir
-      
- @dircategory Languages
- @direntry
--* asymptote: (asymptote/asymptote). Vector graphics language.
-+* asymptote: (asymptote). Vector graphics language.
- @end direntry
- 
- @titlepage
diff --git a/media-gfx/asymptote/files/asymptote-2.41-perl-5.26.patch b/media-gfx/asymptote/files/asymptote-2.41-perl-5.26.patch
deleted file mode 100644
index 54499b74e6cb..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.41-perl-5.26.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -r -U2 asymptote-2.41.orig/doc/FAQ/bfnnconv.pl asymptote-2.41/doc/FAQ/bfnnconv.pl
---- asymptote-2.41.orig/doc/FAQ/bfnnconv.pl	2017-03-22 14:56:46.000000000 +0700
-+++ asymptote-2.41/doc/FAQ/bfnnconv.pl	2017-10-31 23:44:05.511045390 +0700
-@@ -62,5 +62,5 @@
- open(U,">$prefix.xrefdb-new");
- 
--for $x (@outputs) { require("m-$x.pl"); }
-+for $x (@outputs) { require("./m-$x.pl"); }
- 
- &call('init');
diff --git a/media-gfx/asymptote/files/asymptote-2.41-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.41-xdg-utils.patch
deleted file mode 100644
index 7f9b33440352..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.41-xdg-utils.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: asymptote-2.41/settings.cc
-===================================================================
---- asymptote-2.41.orig/settings.cc
-+++ asymptote-2.41/settings.cc
-@@ -91,15 +91,15 @@ bool msdos=false;
- string HOME="HOME";
- string docdir=ASYMPTOTE_DOCDIR;
- const char pathSeparator=':';
--string defaultPSViewer="gv";
-+string defaultPSViewer="xdg-open";
- #ifdef __APPLE__
- string defaultPDFViewer="open";
- #else  
--string defaultPDFViewer="acroread";
-+string defaultPDFViewer="xdg-open";
- #endif  
- string defaultGhostscript="gs";
- string defaultGhostscriptLibrary="/usr/lib/libgs.so";
--string defaultDisplay="display";
-+string defaultDisplay="xdg-open";
- string defaultAnimate="animate";
- void queryRegistry() {}
- const string dirsep="/";
diff --git a/media-gfx/birdfont/Manifest b/media-gfx/birdfont/Manifest
index e47da0f81483..35c5aac72f42 100644
--- a/media-gfx/birdfont/Manifest
+++ b/media-gfx/birdfont/Manifest
@@ -1,3 +1,3 @@
 DIST birdfont-2.18.3.tar.xz 2333612 BLAKE2B bf1b92bd17b0d9970d091fcbbaadb5a027da35bee57cb9e11611959bf8ca09b08d582aa3e6a950a0b1b26688a8fbb3987197bfabb6156097da6a1343426dc051 SHA512 c86fff4e40ecfc571e3880cfa99f6adf518daae5476ea1b2a78bab031bc832bc5c8d58ecc928eda4922134fd3ceca312b80cbb8cf2fd35ecb8dc7656addb854e
-EBUILD birdfont-2.18.3.ebuild 1827 BLAKE2B da95f500edf7d328e6ceb88336a3f5518e2171b59624ff96573c0b54cf36fb29ccb42bce719b5037a490c70ffb8a2c4b07920a47d375cf8c6fe193bf68bf1076 SHA512 d36c4578e918d75e734752e06b5ccd4e41b1dbe3a94a2de3b0c9c72fb16f50cef7f6df276f089d09a66ef8d6631b10a029dd6a466c5e4ad1e57e58d4ef249a9a
+EBUILD birdfont-2.18.3.ebuild 1820 BLAKE2B 1c2ec7495d671e92344771f2e796d73f04daa8426f858ddf02a0c05deb2392ec2bba98606dc2414e43c37c78e6c2b4d13bb03e9b560b084c23281defe1a1fc62 SHA512 980ce17734d809e00a7e39eecef4ad38dd65fe2c5268d5139f787b0f52d419513cda3edd9fe851d64b2093b3431f6b25c35bb435330590560fdd803c3421757d
 MISC metadata.xml 352 BLAKE2B a73cbe4b01dfc96aa631fc89a7bbc140d85eeb4e8757965a35a6d5cfcbd74d72499ecdeddabe963a972b9411c83c0099faf88dcef61df8cf1c9dc1b33af051a6 SHA512 ef910c9c78ad31aff97b15546e892bfa52a18ca9ccbf2b325c96c60f440fa09d5535ea2455e42dba2a11983b4e8b7eb7c3881c47fa6d43df6a22ac4d01535adc
diff --git a/media-gfx/birdfont/birdfont-2.18.3.ebuild b/media-gfx/birdfont/birdfont-2.18.3.ebuild
index b74ee9b80fc7..e1ed19434590 100644
--- a/media-gfx/birdfont/birdfont-2.18.3.ebuild
+++ b/media-gfx/birdfont/birdfont-2.18.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PLOCALES="cs de it nl pt_BR sv"
 
 inherit python-any-r1 vala l10n toolchain-funcs multiprocessing
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 41b4bee28cd7..b0cb5b71fd6a 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -3,5 +3,5 @@ AUX blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch 1265 BLAKE2B bff3ae
 AUX blender-2.79b-gcc-8.patch 1259 BLAKE2B 7d204a953c71e656fb309e0560e2de03a9316a95e67a76ecdeb303fadeeca14338ba823d6780a50b62bf4686477a962030b42b15ceae12d48ab21034b0358cc1 SHA512 df0a6a0543a7feac22e6082652792e59ce675dcea99a821c480d5c13e42e9df4d7ab43c71d296a22dd195771714e630757b1e220177d3713f409ea21e9251504
 AUX blender-fix-install-rules.patch 518 BLAKE2B 178929de7adb1b4a0063134da93248af8c2c42fe0d3e9730833272b4fe8387075ce592ee65668cc9862a1ad10c9857a31b3f1c0614c9e69f937998ccb5c86a17 SHA512 5343f0e9e6bba2d15a38cb5db95a1aeff0a704c0762e558b9b74d88dd58e2fb5077289f0d8f25a61fa092d083f7db916d27c4642dfd7cf84d4c989258c3253ec
 DIST blender-2.79b.tar.gz 50204270 BLAKE2B 78bda294df783ee9bcbcf32f9a112737b2947da5146fd4351b8b36d81c6630ed0ea302b2fb539642cfbdcc4b64df35af5c8545a3bbf50b1cf87dcf3a60eb4ac0 SHA512 2db21ace446168dd683cdb5aad9dec001f8888ae4e9603a04ddb44fb78489ded827deb07e83712b0f1118a0e7bf66f2a5d935dc4ebb3a6703d72672ff414367f
-EBUILD blender-2.79b-r1.ebuild 8230 BLAKE2B 120ef289db6200c4eb72213d2bd898b505ad3c505d89a6b0141090121916d11a88abda9ded45be0cb84473cf4aa5ba6b8b448f9cf287830db05b9cbdfca32896 SHA512 416525de3c2d9f3e0a815f209a44acd962e8ae1f2f9bec5ffa082d81ceadd21c98dc62b698973e5328ac5f5066c5fc67b60eaf620ff58ff7fdbfce10ebd1ed03
+EBUILD blender-2.79b-r1.ebuild 8224 BLAKE2B bb325cfee1c3a4ac320a1593489bd9abb5927cc9424b34e048b504e6766cbde7112235f0cd5a4d3259a5840f5cacac040aabbc16c17b463617182da0e2f9bac6 SHA512 cd9fd8fdfb9494da34fc832e553fcba803ab532ad78795134073b20d2640e315a87dac800ddb4cbdf97a94df208f09952015983439aefd29aabf9ff023d47a0b
 MISC metadata.xml 2628 BLAKE2B b6ac04e033bd54bf3b6918737289e0a12ece3f87543b033ff85748934b6cecdb0cf8084a3c0e7fd766965b6defa4a402980244bec1a0ed2772ffbd12bfe96a8f SHA512 a47e7a85cc98bf0befad9b5ef5ad75276a6649bb5949367294177f19ae763a3dd0eae1ce8d179463c18c33533c37c283c7beabe08fe27d861bd54eb761675e35
diff --git a/media-gfx/blender/blender-2.79b-r1.ebuild b/media-gfx/blender/blender-2.79b-r1.ebuild
index a84c696b9b17..22c4be8b581b 100644
--- a/media-gfx/blender/blender-2.79b-r1.ebuild
+++ b/media-gfx/blender/blender-2.79b-r1.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=6
 
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit check-reqs cmake-utils xdg-utils flag-o-matic xdg-utils \
 	pax-utils python-single-r1 toolchain-funcs eapi7-ver
diff --git a/media-gfx/cairosvg/Manifest b/media-gfx/cairosvg/Manifest
index 89a23cc407fe..445880814ac9 100644
--- a/media-gfx/cairosvg/Manifest
+++ b/media-gfx/cairosvg/Manifest
@@ -1,5 +1,5 @@
 DIST CairoSVG-1.0.22.tar.gz 30896 BLAKE2B b1a4950a67159663bbc72189e57ce36bf2506733b4ff63319178540d242aafd29eb7f5c3993119a5034d3eb77df1dfdd8fed9c53966df13510fe910cbcbb8c43 SHA512 5f4ea7b80947092620827e454182af7332082a8c84fddc035f75ed19c09b4a9027d6bfd5c96e5f388150833788a71ab8fb77a1ffdd963b8106f07b1908a0c8f6
 DIST CairoSVG-2.0.3.tar.gz 39371 BLAKE2B a04e3e3d311167cef84063fd3eabc4ffa7c206c5c6fc8016283874411c344c686c441a3149631eccb38b610bb86a2ec3c193eec869b8802ddba1dac92c612215 SHA512 b7ad7be9bd06059392f2004e7cd5c1df1667dbae78482c68d681990a8b3a4141a9c4b72aa4af5075a87ac6a1a4ddf8311d991512be98128b21b87d4355c1bd3d
-EBUILD cairosvg-1.0.22.ebuild 712 BLAKE2B 26c16f78305f3b225aa42fc646b405a7c9b8a6f77970bb68ee3fbc13de5e89efa716359d5d5f94a28b1821077ffb81b71b1723b4a5e2609a57e54bb5e5e70b9f SHA512 6d664bfc3c8376af7e3d3b7f40b492a12acb3a96be9f30e3aadca9cde7b7ae95987191a19d15884703888d5a43368c727fb7bc4ebfc4fd946e8f716cf19c45af
-EBUILD cairosvg-2.0.3.ebuild 708 BLAKE2B 6f4ebd76feb149363726541b92fb8ae460e4221bca9e8ad21a66c6d900910a4b268f00696e312b492293fb4e688c767b84558641bbb9c7177acc31b16986c801 SHA512 165ef3557e7e47a8a3c179c7b5d67a33e8fe3b8528745518a37bb5909c8d8f2dbce80a4bd27f9516ef6004cd5aeac966c9906ff7a37ab9bb2e116156ab4a279e
+EBUILD cairosvg-1.0.22.ebuild 708 BLAKE2B 0c4ae60144019c0dcb7230ca9e9c864fce160bc173a9af147329888d0c1b719e5e8b55ca6a6881b35e96063266903c0f280da85572cdf72c481e0a8d613904e5 SHA512 deb1c685e2c91a284ab591bb5ac4f4a00265564cb945d060273c9b8bddcff7d454b0557d33976119465798352ded1996bcdb6fbeb0338d328d46a82a63db26c4
+EBUILD cairosvg-2.0.3.ebuild 704 BLAKE2B 0479aad627b2da3bdc0b844d33b16bb809b96c8951b781925e68e35c9963a169a42436cebb0ec7e65479a64502c80b78365d888edff92244f6796e3ea9b8b957 SHA512 5f246219d9e86b2125f72db028904c0d92648fd5b20dc144f500418c78d789cf9ee7a8369af2908d251e37c3795b1b398155b4aeb55d9409cbb1aa2e8ff59ae9
 MISC metadata.xml 340 BLAKE2B 98ccd93460bbb405ae591ba8d5d216fcf57d07247bd2f03698b158eadaabf79d510393b32e7827f2d4a2e859e64f0ff3262ba4b6086baf5a0d893d942d516915 SHA512 48eddade88ce54234da4c04edc349a80d162f88ad6c96ee30b9434e792fe174654990efedabbe3927b78f54400c7aa61dcc8acd1776772d6e5bb31626cd31e4d
diff --git a/media-gfx/cairosvg/cairosvg-1.0.22.ebuild b/media-gfx/cairosvg/cairosvg-1.0.22.ebuild
index f3d8348892d8..b51ea3c8cc8a 100644
--- a/media-gfx/cairosvg/cairosvg-1.0.22.ebuild
+++ b/media-gfx/cairosvg/cairosvg-1.0.22.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=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/media-gfx/cairosvg/cairosvg-2.0.3.ebuild b/media-gfx/cairosvg/cairosvg-2.0.3.ebuild
index bd2d1bcd1d2b..a65f0571ab2c 100644
--- a/media-gfx/cairosvg/cairosvg-2.0.3.ebuild
+++ b/media-gfx/cairosvg/cairosvg-2.0.3.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=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 7b29e00ff00b..11fa4870e6e6 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -4,8 +4,8 @@ DIST cura-3.4.1.tar.gz 21720836 BLAKE2B 228ad51d189f83d2a34c2af7a6edcbe468bc32ee
 DIST cura-3.6.0.tar.gz 23388945 BLAKE2B bd2f2e688306e7ef060141abae22c858e9fbb9385e49110079b48e69955c3f6630f8f69ad67fdf2d9e5c1ac0c969cd2d2f416642fc61a63867f79f88985c5c86 SHA512 b56e5575cb0eb15d759999dcd2f4c33873a0a57805a8ba0ec7860811a2137658a656216c969c6e3316d65fbd5e43f2def10a6385ccbf4fc306d15098569ef279
 DIST cura-4.2.1.tar.gz 29288696 BLAKE2B 1332030e63d7056dcb8dd680208b0da8dd33e5c7809957779849bac808fccad9a222505ddbe80d4071474d10ace842aa4459f14560198a9f3eebb5be53f923e1 SHA512 4f47f3f5597d1a56d88207eacacece49edb766c75ae18ddc9fb8689b76c16fd4decc9c8af7cab485aac3c9cffe13095aaad34e1c60634249ae2923ead771ac52
 DIST cura-4.3.0.tar.gz 30433646 BLAKE2B 8490d703cfd4ad07fd5b30d5f776d978baa17ad8751dad53870714596998becebc85cc2fe49fa05eab37b95106315ace97eaa0bbed65b488b522ebbbcba488dc SHA512 3f4ae11e4e28b151e9587c197f814bc97bc225fb2819f4dabaab392ef9896bb119d6fab0df48c9eb4a390a815815d27045eefa933e2e4a9d53331db8d79ea815
-EBUILD cura-3.4.1.ebuild 1678 BLAKE2B 5c05b4777d95bf1427f4314e7cd6790a0879ce55da89a8b04cc2a7a991f55cdd1b6fd61f454a59986e743ff7209cb8437382b92ac689245687b82da155c71ea9 SHA512 25c727be6b867f5af5baadc1718ea3492aa80679a0bb5331794fb8ea19af10af6e2da5d6a7908d9e8e0ba4aca2d9cda46baf2c2abd5c5bbe5fef95933ac2ecdb
-EBUILD cura-3.6.0.ebuild 1675 BLAKE2B 2ba6d31604abc1bd1a6e9f128b0d892c7dc12b0ad65210a8d504104fff2662d28a2f0df5d4825826e53b7b88ce78ef9c690fe64cd866f7db2741e4d7432c11e1 SHA512 43e21fbf81985e482fbccab4d679bc5d3e2539f7b6b2cf585ad4cb7b207246efa3fdca59a0ef2d2a999c6491c071deafe418a0c9de372a9df9a9e15791c5f840
-EBUILD cura-4.2.1.ebuild 1385 BLAKE2B c1f6c35fac146da9338befb41a4d7cd71b3ff20df9a1a18f742671393b782384639612997c84167ef3b8327b08dd06fe83be7eb3e880d57396cb375787db0f78 SHA512 8dfb2a1fcb402f797aa760453b25cec10d4fe6fc0e9b6295c57248f0f61949d9a56e3b2aacdeaff4a4cef8e02f432baf519a7130088d2c9f1b3b194d69d1fdc6
-EBUILD cura-4.3.0.ebuild 1385 BLAKE2B c1f6c35fac146da9338befb41a4d7cd71b3ff20df9a1a18f742671393b782384639612997c84167ef3b8327b08dd06fe83be7eb3e880d57396cb375787db0f78 SHA512 8dfb2a1fcb402f797aa760453b25cec10d4fe6fc0e9b6295c57248f0f61949d9a56e3b2aacdeaff4a4cef8e02f432baf519a7130088d2c9f1b3b194d69d1fdc6
+EBUILD cura-3.4.1.ebuild 1671 BLAKE2B 9e148352819851202d42db7270f90158fdd4aa4c8bddb1aa2769769b26decbdbdf3e67d0432f5e017ce0a6ae48f7c07f45cf2cecb4b8c32d67c41490abd120b8 SHA512 a81c643600777b216bf4218857db59afded1e98ccbbdae5c3489b42242dc304246461a9815a2b8eb99c2b5e283b5cec52b61347dbb16a0207ff7183f518ba3f1
+EBUILD cura-3.6.0.ebuild 1671 BLAKE2B 9e148352819851202d42db7270f90158fdd4aa4c8bddb1aa2769769b26decbdbdf3e67d0432f5e017ce0a6ae48f7c07f45cf2cecb4b8c32d67c41490abd120b8 SHA512 a81c643600777b216bf4218857db59afded1e98ccbbdae5c3489b42242dc304246461a9815a2b8eb99c2b5e283b5cec52b61347dbb16a0207ff7183f518ba3f1
+EBUILD cura-4.2.1.ebuild 1357 BLAKE2B e74b46ee6de460b1ae0e5880326f2a1fd0f9d60eb619f62f1053d2b86daa62a5cc0997e41a3469859e87a0651196a91d91d10488a7435eb53afdf1065cb77153 SHA512 2775f01ceda5ca6fc7f30b3a6e18d90c3243a14eb1bd7e4be900b2a8b75611acb2ca5c8d29b1054734d760dac7094258b5d52ef79ef1886a808d414b4ab5038a
+EBUILD cura-4.3.0.ebuild 1357 BLAKE2B e74b46ee6de460b1ae0e5880326f2a1fd0f9d60eb619f62f1053d2b86daa62a5cc0997e41a3469859e87a0651196a91d91d10488a7435eb53afdf1065cb77153 SHA512 2775f01ceda5ca6fc7f30b3a6e18d90c3243a14eb1bd7e4be900b2a8b75611acb2ca5c8d29b1054734d760dac7094258b5d52ef79ef1886a808d414b4ab5038a
 MISC metadata.xml 924 BLAKE2B 98684c30170538865b264d21a025a558b66ef0f5b46dd4cc291dacd71367cf775135d66fc379bf6bf0edfacab6e33c939a750fdcc8f036cedb7d9daf5b442072 SHA512 b09e1e1251f3171721bea6ea7ace38beed877525b1a83282035bb34fa871123c0995674d899a486b3ff67ac34429cabc12f9e90ffd1b1e3f60257389a900e483
diff --git a/media-gfx/cura/cura-3.4.1.ebuild b/media-gfx/cura/cura-3.4.1.ebuild
index d913218b642b..16ebf84a070c 100644
--- a/media-gfx/cura/cura-3.4.1.ebuild
+++ b/media-gfx/cura/cura-3.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit cmake-utils fdo-mime gnome2-utils python-single-r1
 
 MY_PN=Cura
diff --git a/media-gfx/cura/cura-3.6.0.ebuild b/media-gfx/cura/cura-3.6.0.ebuild
index 379309b70d65..16ebf84a070c 100644
--- a/media-gfx/cura/cura-3.6.0.ebuild
+++ b/media-gfx/cura/cura-3.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit cmake-utils fdo-mime gnome2-utils python-single-r1
 
 MY_PN=Cura
diff --git a/media-gfx/cura/cura-4.2.1.ebuild b/media-gfx/cura/cura-4.2.1.ebuild
index aed51febac2c..ba1e9563f25e 100644
--- a/media-gfx/cura/cura-4.2.1.ebuild
+++ b/media-gfx/cura/cura-4.2.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
-inherit cmake-utils desktop python-single-r1 xdg
+PYTHON_COMPAT=( python3_6 )
+inherit cmake desktop python-single-r1 xdg
 
 MY_PN=Cura
 
@@ -36,18 +36,18 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_prepare() {
 	sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	doicon icons/*.png
 	python_optimize "${D}${get_libdir}"
 }
diff --git a/media-gfx/cura/cura-4.3.0.ebuild b/media-gfx/cura/cura-4.3.0.ebuild
index aed51febac2c..ba1e9563f25e 100644
--- a/media-gfx/cura/cura-4.3.0.ebuild
+++ b/media-gfx/cura/cura-4.3.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
-inherit cmake-utils desktop python-single-r1 xdg
+PYTHON_COMPAT=( python3_6 )
+inherit cmake desktop python-single-r1 xdg
 
 MY_PN=Cura
 
@@ -36,18 +36,18 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_prepare() {
 	sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	doicon icons/*.png
 	python_optimize "${D}${get_libdir}"
 }
diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest
index ea8fe61007a5..0083ca12d560 100644
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@@ -4,6 +4,6 @@ DIST curaengine-4.2.0.tar.gz 1654657 BLAKE2B c11f77a126e49c1c63550accd42c3616ab6
 DIST curaengine-4.3.0.tar.gz 1656780 BLAKE2B 9b93e3f294a8a67c2cd4f2d4462a4047e6860e0c391e7ff550b24c498faa82fd2af4fd044845f00f93fb01d38ca3fa1511bfe65a7456b5a6e0b919821be5ab8f SHA512 60ca0ce586c0cf5f1516f803b2a05a20299ef8193f065acd6e11a0054903189225f9c60be1b536ffe5a9a22652097acd3a4aae2833920a468071b78f213f7572
 EBUILD curaengine-3.4.1.ebuild 902 BLAKE2B 5216cfc20c7b68f326828fcab00d1d116dc6ad3f2f4a5b158d6e22a91b4cd7a5081bdaed05ab9fb18c8d135460f1396c0559a1edaecc3c6c94e143e876d6ed0d SHA512 dd985e6460373739dd368b5fb31c35f3fce4a403d64f77db968e32a0186eb1ad0a723b71ea7c67e7d71581012c529bff023ba7ff49e5324883c30b970a55a71d
 EBUILD curaengine-3.6.0.ebuild 902 BLAKE2B 5216cfc20c7b68f326828fcab00d1d116dc6ad3f2f4a5b158d6e22a91b4cd7a5081bdaed05ab9fb18c8d135460f1396c0559a1edaecc3c6c94e143e876d6ed0d SHA512 dd985e6460373739dd368b5fb31c35f3fce4a403d64f77db968e32a0186eb1ad0a723b71ea7c67e7d71581012c529bff023ba7ff49e5324883c30b970a55a71d
-EBUILD curaengine-4.2.0.ebuild 1534 BLAKE2B fe0a144d44cb815494771c2eb1781fdc11ca3e686c49ed6ffecfb5338341b3d2cf4f315104f8bff919f7652a48238621db65b36ad88292b15e3e3ed10229b209 SHA512 b5bb40937b354d9141be8c47e38a82c1be9fefefe497add0829549a91286e3d238c3d9ce242475d739e0c755637fa436e04007abbc46993e74fe93c9f3a4244e
-EBUILD curaengine-4.3.0.ebuild 973 BLAKE2B 42b34ff73efbe37cad3cec8abef6bd5c0f0f2026de3072aedc7d79164fa1e76691898a4e3404252378383460fde7cbcd27146c1b597c0f3f4bc37a803f6a2ba7 SHA512 a4b546a8431b6c358e84aaa6bb8f21db753f31ebb2313cb2a179bdebbc6c545dfe1e4ef3b0de6ee501126075b57ab2a60f71601efd8f9b884bafd913eeb29094
+EBUILD curaengine-4.2.0.ebuild 1513 BLAKE2B 3127bc6c0fcace2d6dbe09110981ea46b231d619db892b52cb00ff05d35f43e6e3e9ba24f19b37c5869b53e919777719004d456e9d2da2700fa4ac07d66ac158 SHA512 65f8d5ab2e3fafa67169b1864cbd2fdb1b19d4d8274a7fa69ecb7da3ad3a69c92204d4805254c9c665193533c60a37996ef0b065f2c45d78370ea361f2ccec3a
+EBUILD curaengine-4.3.0.ebuild 951 BLAKE2B 375377c9f6215589eda96dccd38cc0332e46403966e9a63928317419f6da410d7efb0595efa021c91bd7aa4aa18f4e8a56fe39cf365620911b7eb45d3b161c42 SHA512 92151a605f442ff93f976eb73ceead43a645490838440679a5ee783f76532a05c6ed1a336d9335753d0a13942c67c6996a81c65f30cb680e8663b145365e3f62
 MISC metadata.xml 862 BLAKE2B 233eef15a865c598451d8a6100a8dc99f4c9a4c4ae4f8692a473ad2b8de5c2bc5216052b2bbf698e98f1c7f8156512084beaebc6148b9bc333d5c09d9bfda3ba SHA512 92e4cf75b949ac201537780bc5acf295720da8a342f6d882e2ca3b36aaa5691a3df31e6cf79e44b25f88d2f1177a1b6227165cbe8b9da8762b35560927239382
diff --git a/media-gfx/curaengine/curaengine-4.2.0.ebuild b/media-gfx/curaengine/curaengine-4.2.0.ebuild
index 8fc2576a3f8f..775c51f9f076 100644
--- a/media-gfx/curaengine/curaengine-4.2.0.ebuild
+++ b/media-gfx/curaengine/curaengine-4.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils toolchain-funcs
+inherit cmake toolchain-funcs
 
 MY_PN="CuraEngine"
 
@@ -45,11 +45,11 @@ pkg_pretend() {
 
 src_configure() {
 	local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_make
+	cmake_build
 	if use doc; then
 		doxygen
 		mv docs/html . || die
diff --git a/media-gfx/curaengine/curaengine-4.3.0.ebuild b/media-gfx/curaengine/curaengine-4.3.0.ebuild
index 4fd3aedee744..3e767bdc29ba 100644
--- a/media-gfx/curaengine/curaengine-4.3.0.ebuild
+++ b/media-gfx/curaengine/curaengine-4.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils toolchain-funcs
+inherit cmake toolchain-funcs
 
 MY_PN="CuraEngine"
 
@@ -31,13 +31,13 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_configure() {
 	local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_make
+	cmake_build
 	if use doc; then
-		doxygen || die
+		doxygen || die
 		mv docs/html . || die
 		find html -name '*.md5' -or -name '*.map' -delete || die
 		DOCS+=( html )
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 365220ac0454..b37370a0b089 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -2,7 +2,11 @@ AUX darktable-2.6.2-exiv2-0.27.patch 598 BLAKE2B 724290bb5c1344c0113abde04688009
 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-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce SHA512 e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
-EBUILD darktable-2.6.2.ebuild 3903 BLAKE2B fa5ea98fddb97b15bccf9ac959881ccdddbad882220f038d4aad2ac4cd9c1acd63cd5e84329788bdbe9f37f2ab82542450dd7c2e12594124ce42162881bcb51d SHA512 56eaae54bce4f882053bfaa3d93008e274b6766aa1983d48a6ef8f159eac092866c90e7886adaa386e7a92d8dbef4bed643086ed8ea01ac8b5481b3666943660
-EBUILD darktable-9999.ebuild 3159 BLAKE2B 3baf702f5ac1c0bbab2797e3ff2fdf63477b5f0050d2f23fe1bbf8090021ba30c68a491f34dffc18b5034d5d24fe3cc0625bc52a87062605e9e9dcdda55c7af8 SHA512 e5baeaa66d89d7a05b584a8d3b7d035b4a3c8f143a2d51cc800f7b3769ab9d71f85f171d362cb20ac64f79d538f1ef5bf428e216733928695ba3e0a0d4b87e3c
+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-9999.ebuild 3135 BLAKE2B 885443963d545004c2d10d49e65bac9d44c22ed1d0414f57ec2dc76a85760e09f06a78ea70a77c6f36739da0c45cc39a133954bccd5ad8af2e1a4149015b7d16 SHA512 da2ac016c0a15b14417a5ee373f6470630e045485738e39bb596365a0013ae48b1d4e0b197d7825ea17faa02e435ef2cbe95dd5b5ccf672cc99eb4cac60a12a2
 MISC metadata.xml 784 BLAKE2B 7e7f55f709fa5d7da777b272232cece75e55e2754701f759630afe0857f971341fa0d4b2b1a6c96391b3de2bd94966ccb0ed6e8fb17089de71f34418ed397cba SHA512 ae9a9f28be76a93c0b5c90892489c0e8397ea84f043fa03787e6ad774b8c79c834059fd5e55d6f46e63bd9a9411218585e99e59acef7e21493ff4543bb0210c4
diff --git a/media-gfx/darktable/darktable-2.6.2.ebuild b/media-gfx/darktable/darktable-2.6.2.ebuild
index 45b7d5db3eff..ee670e718387 100644
--- a/media-gfx/darktable/darktable-2.6.2.ebuild
+++ b/media-gfx/darktable/darktable-2.6.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils flag-o-matic pax-utils toolchain-funcs xdg
+inherit cmake flag-o-matic pax-utils toolchain-funcs xdg
 
 DOC_PV="2.6.0"
 MY_PV="${PV/_/}"
@@ -86,7 +86,7 @@ pkg_pretend() {
 src_prepare() {
 	use cpu_flags_x86_sse3 && append-flags -msse3
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -109,11 +109,11 @@ src_configure() {
 		-DUSE_WEBP=$(usex webp)
 	)
 	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
 
 	if use nls ; then
diff --git a/media-gfx/darktable/darktable-2.6.3.ebuild b/media-gfx/darktable/darktable-2.6.3.ebuild
new file mode 100644
index 000000000000..b08753b83535
--- /dev/null
+++ b/media-gfx/darktable/darktable-2.6.3.ebuild
@@ -0,0 +1,143 @@
+# 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
new file mode 100644
index 000000000000..c91fabeb3ab2
--- /dev/null
+++ b/media-gfx/darktable/darktable-3.0.0.ebuild
@@ -0,0 +1,143 @@
+# 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-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
index 6357db9016d5..111dc666f46f 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils flag-o-matic git-r3 pax-utils toolchain-funcs xdg
+inherit cmake flag-o-matic git-r3 pax-utils toolchain-funcs xdg
 
 EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
 
@@ -73,7 +73,7 @@ pkg_pretend() {
 src_prepare() {
 	use cpu_flags_x86_sse3 && append-flags -msse3
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -96,11 +96,11 @@ src_configure() {
 		-DUSE_WEBP=$(usex webp)
 	)
 	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
 
 	if use nls ; then
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 04c8ced7704d..8a11dd151689 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,5 +1,7 @@
 AUX digikam-6.3.0-cmake.patch 2038 BLAKE2B 73c6c7d008c3b76f9347f4192d435e10aa3607abf62436372ef131ac034ef538c1baa8d0d03e6b587b771fb766fa3286c649a6ffc7640a2f21e292b1e524cab6 SHA512 c8e6d2fd6c18d8c8e8733dffd1e0e2fb66b8bf3496aa6f767a4c633a56733c85bc53bdceaf689e84beca672a5013a02349cfca73d9f1e89a99252c7bac526a4d
 AUX digikam-6.3.0-googlephoto-import-crash.patch 2815 BLAKE2B e39efa7815aef3f7b165e0915610e54af188479af3bef140717d5d903e557bb0da49fa493e06df9a76b9695df7ebe84cbf6132674209f45476da0a1d4752ceb7 SHA512 523dc9add1ee5b9ffb675c1983e8f54624b7537dbec567a60661fdd58b045978f2a794a47093f5a3d268e4aa159a8064cd6b261798bf19cfeb5241fd5ce4cdb8
 DIST digikam-6.3.0.tar.xz 335641824 BLAKE2B 1ecddeee653d6b97570aa3616c6dd0a951210983400fe8aca19ee9e01aef29820f0ab32e3cbc2e92e833868f0f652c5bdd0809324437b6fa778dfdaf04ea3c83 SHA512 9463d7a8351acae32e2fa77c96026d1cb60e56fcc20ad2b71ac7461ff1e5e2e02ca0ef8a12e4d5ae2324aa66e185cdf5b237d6330f4741691876977e773511ce
-EBUILD digikam-6.3.0-r1.ebuild 4255 BLAKE2B fcdff7cb0211901c20caf4197a09f0a58e6956c4bc6006a688106283f84b78fe0892c4050f9a33bb2b3bd8e577d2315f94a23e2f28e86b232193e3de5cf8769c SHA512 3444df820862f4c76b9c16e3073eabf27f3dfe9266469ce377fe51264d77de4de51555eeb9ad5c6e32f0ace1deb901d3a1d8cb1df7322b5ce1bd505684bd778a
-MISC metadata.xml 1256 BLAKE2B c3899279a6382ac2b2a12f5b94938db2324093bd63e0db8e3f82bb56ea9944d4369b793f7fa039c2c08af1887e4cc51d58f4e89a57c81b18cb5f896ef4cd0a5c SHA512 9b220b4271d0cb7b9fd5549fec165c4bc20c250cc66ce14ecb3cb16d0eb8355f35d0e585d9d800ed70437b3cd5434bcacc7dfd783f2a5683dbe1b1b3ce48356f
+DIST digikam-6.4.0.tar.xz 340146992 BLAKE2B ca1bc8b0d165f9774354d8489a11d46d8d7467edd3c1e90fd3a96024c4b7cd23bfd5c813251183bcca6d4beac9bffeb9d921beaa9a3752f75f1918796aacd719 SHA512 b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c699399994199b848757f0497ad25a7805e42
+EBUILD digikam-6.3.0-r1.ebuild 4183 BLAKE2B 0c6db20f59f6c2797a05b63483f81e6e741ff41b1b2ff058fd48a8b6fe6c511765cef05a314b942aed178170ecf806228395c55210b2c7732211a794b1bb3d9b SHA512 bb06b989309c24de79b3eb713767ae41b5654297a53d90d74275ad11b2cbcc0fdb2e79bece5f05cd891be3e4ad36f850e7555ca155171ead6ffbe299bc83a5ef
+EBUILD digikam-6.4.0.ebuild 4355 BLAKE2B 2feed71db7ae7b89f76e91b3d1e94640037522f0bf1fe536abd891e40cda9aa695721eb401fc2f568311bcfd86a7dee16b7a1bfd811896e2ec7ff8791f2e471a SHA512 46d92805507617800d7885238f1754579891483015cf19ac2fe7dcb37c90cc0e263551e70490fcbe16c281418451e7fa7152789a97836e99446c99dca1a1b451
+MISC metadata.xml 1368 BLAKE2B 5dec50abba4f748e1f8eb465807c719f4b81759277241169d9e721749a1ba807425f7d46e9feb1edb4dcf3b4dd00b40bfbb353fe479e29c8a1878ad1fbfb5082 SHA512 4cd1ada9c4274338e49a692095d80b572c309bd34c838e2663a18ec1e7230de87e27087febfedde46a0f6af19f1a3f440335750375117d20eacd0c756db8b2f8
diff --git a/media-gfx/digikam/digikam-6.3.0-r1.ebuild b/media-gfx/digikam/digikam-6.3.0-r1.ebuild
index 8b30b380b54e..7a9327fbcb30 100644
--- a/media-gfx/digikam/digikam-6.3.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-6.3.0-r1.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-CMAKE_MIN_VERSION=3.14.3
 inherit kde5 toolchain-funcs
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
@@ -23,6 +22,7 @@ LICENSE="GPL-2"
 IUSE="addressbook calendar dnn +imagemagick gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
 
 BDEPEND="
+	>=dev-util/cmake-3.14.3
 	sys-devel/gettext
 	panorama? (
 		sys-devel/bison
@@ -134,23 +134,23 @@ src_configure() {
 		-DENABLE_APPSTYLES=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
 		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
-		$(cmake-utils_use_find_package calendar KF5CalendarCore)
+		$(cmake_use_find_package calendar KF5CalendarCore)
 		-DENABLE_FACESENGINE_DNN=$(usex dnn)
-		$(cmake-utils_use_find_package gphoto2 Gphoto2)
-		$(cmake-utils_use_find_package imagemagick ImageMagick)
-		$(cmake-utils_use_find_package lensfun LensFun)
-		$(cmake-utils_use_find_package marble Marble)
+		$(cmake_use_find_package gphoto2 Gphoto2)
+		$(cmake_use_find_package imagemagick ImageMagick)
+		$(cmake_use_find_package lensfun LensFun)
+		$(cmake_use_find_package marble Marble)
 		-DENABLE_MEDIAPLAYER=$(usex mediaplayer)
-		$(cmake-utils_use_find_package mediaplayer QtAV)
+		$(cmake_use_find_package mediaplayer QtAV)
 		-DENABLE_MYSQLSUPPORT=$(usex mysql)
 		-DENABLE_INTERNALMYSQL=$(usex mysql)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		$(cmake-utils_use_find_package panorama KF5ThreadWeaver)
-		$(cmake-utils_use_find_package scanner KF5Sane)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake-utils_use_find_package vkontakte KF5Vkontakte)
+		$(cmake_use_find_package opengl OpenGL)
+		$(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-utils_use_find_package X X11)
+		$(cmake_use_find_package X X11)
 	)
 
 	kde5_src_configure
diff --git a/media-gfx/digikam/digikam-6.4.0.ebuild b/media-gfx/digikam/digikam-6.4.0.ebuild
new file mode 100644
index 000000000000..9ee9030d8c61
--- /dev/null
+++ b/media-gfx/digikam/digikam-6.4.0.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org toolchain-funcs
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-${MY_PV}
+	SRC_BRANCH=stable
+	[[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
+	SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${PV}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Digital photo management application"
+HOMEPAGE="https://www.digikam.org/"
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="addressbook calendar dnn heif +imagemagick gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
+
+BDEPEND="
+	>=dev-util/cmake-3.14.3
+	sys-devel/gettext
+	panorama? (
+		sys-devel/bison
+		sys-devel/flex
+	)
+"
+COMMON_DEPEND="
+	dev-libs/expat
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[-gles2]
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[mysql?]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=media-gfx/exiv2-0.27:=
+	media-libs/lcms:2
+	media-libs/liblqr
+	media-libs/libpng:0=
+	>=media-libs/opencv-3.1.0:=
+	media-libs/tiff:0
+	virtual/jpeg:0
+	addressbook? (
+		>=kde-apps/akonadi-contacts-19.04.3:5
+		>=kde-frameworks/kcontacts-${KFMIN}:5
+	)
+	calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 )
+	dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contribdnn] )
+	gphoto2? ( media-libs/libgphoto2:= )
+	heif? ( media-libs/x265:= )
+	imagemagick? ( media-gfx/imagemagick:= )
+	lensfun? ( media-libs/lensfun )
+	marble? (
+		>=dev-qt/qtconcurrent-${QTMIN}:5
+		>=kde-apps/marble-19.04.3:5
+		>=kde-frameworks/kbookmarks-${KFMIN}:5
+	)
+	mediaplayer? (
+		media-libs/qtav[opengl]
+		!libav? ( media-video/ffmpeg:= )
+		libav? ( media-video/libav:= )
+	)
+	opengl? (
+		>=dev-qt/qtopengl-${QTMIN}:5
+		virtual/opengl
+	)
+	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? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+	dev-libs/boost[threads]
+"
+RDEPEND="${COMMON_DEPEND}
+	mysql? ( virtual/mysql[server] )
+	panorama? ( media-gfx/hugin )
+"
+
+RESTRICT+=" test"
+# bug 366505
+
+PATCHES=( "${FILESDIR}/${PN}-6.3.0-cmake.patch" )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	ecm_pkg_pretend
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	ecm_pkg_setup
+}
+
+# FIXME: Unbundle libraw (libs/rawengine/libraw)
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=OFF # bug 698192
+		-DENABLE_APPSTYLES=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
+		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
+		$(cmake_use_find_package calendar KF5CalendarCore)
+		-DENABLE_FACESENGINE_DNN=$(usex dnn)
+		$(cmake_use_find_package gphoto2 Gphoto2)
+		$(cmake_use_find_package heif X265)
+		$(cmake_use_find_package imagemagick ImageMagick)
+		$(cmake_use_find_package lensfun LensFun)
+		$(cmake_use_find_package marble Marble)
+		-DENABLE_MEDIAPLAYER=$(usex mediaplayer)
+		$(cmake_use_find_package mediaplayer QtAV)
+		-DENABLE_MYSQLSUPPORT=$(usex mysql)
+		-DENABLE_INTERNALMYSQL=$(usex mysql)
+		$(cmake_use_find_package opengl OpenGL)
+		$(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)
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index 3f8f9d04dcfd..5843335b3898 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -11,6 +11,7 @@
 	<use>
 		<flag name="addressbook">Enable akonadi contact integration</flag>
 		<flag name="dnn">Build neural network faces engine module</flag>
+		<flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF files using <pkg>media-libs/x265</pkg></flag>
 		<flag name="imagemagick">Enable support for additional image formats such as XCF, FITS, HEIC etc.</flag>
 		<flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg></flag>
 		<flag name="marble">Enable support for geolocation using <pkg>kde-apps/marble</pkg></flag>
diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
index bb450e70049a..df79453b8c47 100644
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -1,5 +1,5 @@
 AUX enblend-4.2-doc-install-dir-fix.patch 2705 BLAKE2B a5bfb43521095bc088aef980f849cfb9cb2e7e9ae2a10b2fcd4b56cd7b27888047567c3b95b40e3a8feefe7ee9209db49688800986cc895731e0949acd3bae1c SHA512 a22730295c44da4f9feb3d541b17f298adf98f0328cf01d6a85206087c782e1aebac6509968d1a5433efb5fc3d72e48301ec3d5a2516f01c1f6d923d5032ab03
 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 1781 BLAKE2B 808148c7ce0e93683ed04bad57d4199acf0e362b96ac53761131c59eb84eb605c5defa25ac0a4cc089a1f51ca7886147fdb889dfd621d97f22a189ac99b4c05b SHA512 1e184f985dae258c7fd9f16138f0b9704daeac52f401a12f66286107dad7e4ca83772de5641e7fb6dcfa32525e687947344386bef257e00d6ee2b4c7789660dc
+EBUILD enblend-4.2.0_p20161007-r1.ebuild 1757 BLAKE2B ba4703076454bc019231877a83feae0971bf755f2d54c4c893731d3bbc0fac47f391cb096a2b0e76c3b8d267c6a36c5977d47160b181c4842cd7e4f8a8b9f99b SHA512 344602f430cfeef0f6cc4998dea06282764dc52eda552bc612dd46dce4b4ae137b0e166c017f9acc8afaececdde53e6d279cba62d19b1ce27d3bf326f0959dba
 MISC metadata.xml 336 BLAKE2B ca7263a1856bc0a6de0a9085fcaa0df5745cda2f678c36984fc2bf11218207214dbad308c39811213d7ce5d376228bc87a60adbfd4fee8f02b2119af0ebac207 SHA512 ac71d3806312b434087a0ce55eadd3db06091e11a195fe90da48570bdb4ad47bf50c864ae2b82e25acb08b6ce78ebc6dc8b33bdd064ee449efcb0995806f2eca
diff --git a/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild b/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
index 51f0c069d6ee..9049ae5c5e7b 100644
--- a/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
+++ b/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Image Blending with Multiresolution Splines"
 HOMEPAGE="http://enblend.sourceforge.net/"
@@ -52,7 +52,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -i -e "s:share/doc/enblend:share/doc/${PF}:" doc/CMakeLists.txt || die
 }
@@ -70,7 +70,7 @@ src_configure() {
 		-DINSTALL_PDF_DOC=ON
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
@@ -81,5 +81,5 @@ src_compile() {
 	export VARTEXFONTS="${T}/fonts"
 
 	# forcing -j1 as every parallel compilation process needs about 1 GB RAM.
-	cmake-utils_src_compile -j1
+	cmake_src_compile -j1
 }
diff --git a/media-gfx/entangle/Manifest b/media-gfx/entangle/Manifest
index 11fb2b46abcc..db11534e9c12 100644
--- a/media-gfx/entangle/Manifest
+++ b/media-gfx/entangle/Manifest
@@ -1,5 +1,3 @@
-DIST entangle-0.6.0.tar.gz 906858 BLAKE2B 18a35ef7e077f5929846127e06bff2d07b61c5409d2957b421d8ec5466f29483b6fc7d5567cd057e2b44ef4147ed962e267e7e5509ef6640582b5d291a7f79f3 SHA512 f96718f01286eb0dbf1fafd4d51258bda876a5b22a6167173f0f60b4fe00683baff3d4c8f9866a5dc1eec493e2b25fd932794a63a8a8d102cb220b1d6ea8e960
 DIST entangle-2.0.tar.xz 501912 BLAKE2B b7e1c393dc95d66bf4389c607c0eb6eb70161ceb2c845135c7c99313a1ec13388c6b00fd6ed7f38ad6f9f18d8c97eba0aadab7964d1be8ec03373e5598374796 SHA512 be8b75c5dd0bdd7cd380f35b5d46d7be9f7caa2be257ce954cf9516ebd5601071ac8b50838f9c40470b6e3e5f95083c3671af68ac43eb345a60d674636a0fe86
-EBUILD entangle-0.6.0.ebuild 989 BLAKE2B f122100e8892a4ee256e0e2cda1b3c243a20c68058b6778ebb20509b53395998cd8b6c273131289690408f28b1bc04767a023dbfce404eecf6cb9272eca7cd5e SHA512 cc78f9327578e7ef13d29d0547bb76144f4d4a4b2698a7457014441a044dd2afbf1dbf157185cd9c681a7d486935369c099fcc2a04e8ce871892f4a1b34e5d2b
-EBUILD entangle-2.0.ebuild 1402 BLAKE2B 0a8e798f96b75d095ef95dfb313fb7980bc84d964f5bc630352d5d09cfbdf76207f8bf0dcb4c1e8bac4ba2f24b7a133ea0462de946a4a14455eda28819f93fc9 SHA512 38073a2dd304e40a10d4be4f2f06651632268eac42645ccd323d65ec5882da1bf3239bff5250b395dcfa0be7bf51d24e71bc0953ad7e003ed75f952df4635c50
+EBUILD entangle-2.0.ebuild 1400 BLAKE2B 75268e384d7d12a4521b79032571366c6fb14ba04bcfc10ec0ea2164f5a043936aa2ef727a54d1e80c6e8e4f30171eb2cf886013c0b4ef16655f0269716e79b1 SHA512 ed8528f959d585ee1619eefe1bbcddf100be7508ffbb794e921bd23222ec5f6198ef7a03774f9fea6030752f00c931a7000e642bc83f820251083af18836c38e
 MISC metadata.xml 446 BLAKE2B 1c466f17b5df47045169784918723e953945eaad2eb5879cde6f099feec4cb419e867f77879927933fe3daec259184a361f464b968b19bdf3463b01b7371589d SHA512 555966a8638a027288abdc7ba6d625c15c18792c3401d399a12dc256ec75f14882fce3e70596a3f3e2ed6729e471af04b14d520b8e2e70206a172f98b9967dae
diff --git a/media-gfx/entangle/entangle-0.6.0.ebuild b/media-gfx/entangle/entangle-0.6.0.ebuild
deleted file mode 100644
index 70933e3d62fe..000000000000
--- a/media-gfx/entangle/entangle-0.6.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit gnome2 eutils
-
-DESCRIPTION="Tethered Camera Control & Capture"
-HOMEPAGE="http://entangle-photo.org/"
-SRC_URI="http://entangle-photo.org/download/sources/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=dev-libs/glib-2.26:2
-	>=x11-libs/gdk-pixbuf-2.12.0:2
-	>=x11-libs/gtk+-3.3.18:3[introspection]
-	dev-libs/libgudev:=
-	>=dev-libs/dbus-glib-0.60
-	>=dev-libs/gobject-introspection-0.9.3
-	>=media-libs/libgphoto2-2.4.11:=
-	media-libs/lcms:2
-	>=dev-libs/libpeas-1.2.0[gtk]
-	>=media-libs/gexiv2-0.4[introspection]
-	>=x11-libs/libXext-1.3.0
-	>=x11-themes/gnome-icon-theme-symbolic-3.0.0
-	>=media-libs/libraw-0.9.0"
-RDEPEND="${DEPEND}"
-DEPEND+="
-	virtual/pkgconfig"
-
-G2CONF+="
-	--disable-maintainer-mode
-	--docdir=/usr/share/doc/${PF}
-	--htmldir=/usr/share/doc/${PF}/html
-	--disable-werror
-	--disable-static"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
diff --git a/media-gfx/entangle/entangle-2.0.ebuild b/media-gfx/entangle/entangle-2.0.ebuild
index 00fd3649f7ac..a8563923bc55 100644
--- a/media-gfx/entangle/entangle-2.0.ebuild
+++ b/media-gfx/entangle/entangle-2.0.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
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit gnome2-utils meson python-single-r1 xdg-utils
 
 DESCRIPTION="Tethered Camera Control & Capture"
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index 31875754ce21..9be5d3fd420b 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,5 +1,3 @@
-DIST eog-plugins-3.26.3.tar.xz 470712 BLAKE2B cd5845481006b681555f35d1f353ed624baa83fc8fc45bb889b2418f31a776bf9e08e270f911f61f431123825a5b96fa684f72e378ddd0ad1107ff44a5c98519 SHA512 5ea0bbf692fa71fa77b0b78307cceee067c95e80c2e69e173990c1154df8014912f24f8d023eda79da56b7c1bdf0870e5e92b968a68c4961af3fc1382d4f468c
 DIST eog-plugins-3.26.4.tar.xz 477772 BLAKE2B 104ddf58d33e5513349839312fef820af20d7a3e64a3a8cbd7d964d8250564d6cd62c58cf95fb5359ab95eac8fe2b83ed051e6f3dc8144a8884ec72c74a12622 SHA512 95f2cf2c6ed84b4801517a708f18e1cd673f814d849029a41491f3719512d6a3a2cb5cb11898a7f972f8b674c682245c99964ba2da19b285ed175b720d5396e8
-EBUILD eog-plugins-3.26.3.ebuild 1643 BLAKE2B 2a215a9e8543aa1375f76010b86549570cb94dfad3456b32edbc34331c11edae91863ab578e14a8a01f542d5ba81f08afa179e5a14e7d1a5dc095c1e6f60d79e SHA512 804238ae08418988ca0d9c081856534102df03be217c79f6a159b4fff33d85bbeadd055dbae6b6a73056e133c461def676e2e41ad34e6d301fd86525f102b5e7
-EBUILD eog-plugins-3.26.4.ebuild 1645 BLAKE2B 2506b95724c7c841148a3119fddcde8bf694d38e069b49f0c99f6cfca91ceb02f9ed4f3a86d1ffa8d201c1e59ac656155aa32570f413e7e1d5c5ece1a3f57810 SHA512 528dc1f6b0581f0cab4d515e9495cb702905b522b90c9ecec8610d150ca1476096843c502f3599e314fb2e796fb5d9be35d38e36442ea3f028b15d0f247926e9
+EBUILD eog-plugins-3.26.4.ebuild 1643 BLAKE2B d9b11d153fe0bf64b28ebecd99f8953dab21764cc608dd0b6f5b2fbc7951d06145875fcc5ea578299d3d92fe7413889de1b1aad472ee24500fa2ba611086bdec SHA512 795624595a121dc071196915473919f2b9c2af1272e60f17bd05ef5cc263345cfabb68eb1bcb37eb34676353265eb939836b2ba1c9a8d345e2dfcc51dbec6881
 MISC metadata.xml 428 BLAKE2B b10706bb7638538d5ce63c9787e7a1730e01c8383f2d2a093e38184b031933d2b3749241aa2f3254be4c84fac104bb8ec72940cdf8cd5a9f7bc0944541b015c6 SHA512 9684f07846ce7e49ad82843c2b8b7ac5c9d7124bddb07778292d6810162e89a3d41e7ca426f331e4bae6ecfbe53f71409b35418affba6382e874c78b64ed102f
diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.3.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.3.ebuild
deleted file mode 100644
index b37c5733944f..000000000000
--- a/media-gfx/eog-plugins/eog-plugins-3.26.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Eye of GNOME plugins"
-HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="+exif map picasa +python"
-REQUIRED_USE="
-	map? ( exif )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libpeas-0.7.4:=
-	>=media-gfx/eog-3.15.90
-	>=x11-libs/gtk+-3.14:3
-	exif? ( >=media-libs/libexif-0.6.16 )
-	map? (
-		media-libs/libchamplain:0.12[gtk]
-		>=media-libs/clutter-1.9.4:1.0
-		>=media-libs/clutter-gtk-1.1.2:1.0 )
-	picasa? ( >=dev-libs/libgdata-0.9.1:= )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-libs/glib-2.32:2[dbus]
-		dev-libs/libpeas:=[gtk,python,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		gnome-base/gsettings-desktop-schemas
-		media-gfx/eog[introspection]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection] )
-"
-# libxml2 required for glib-compile-resources
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local plugins="fit-to-width,send-by-mail,hide-titlebar,light-theme"
-	use exif && plugins="${plugins},exif-display"
-	use map && plugins="${plugins},map"
-	use picasa && plugins="${plugins},postasa"
-	use python && plugins="${plugins},slideshowshuffle,pythonconsole,fullscreenbg,export-to-folder,maximize-windows"
-	gnome2_src_configure \
-		$(use_enable python) \
-		--with-plugins=${plugins}
-}
diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.4.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.4.ebuild
index 267d2dfd4e31..c686fd3f919f 100644
--- a/media-gfx/eog-plugins/eog-plugins-3.26.4.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-3.26.4.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=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit gnome2 python-single-r1
 
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 163ad184476d..af574e61a168 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,5 +1,3 @@
-DIST eog-3.28.4.tar.xz 5732396 BLAKE2B 9adf7e6793add9298dd879a0fe5ea7c736854d3a40473b2def84851a1e5a78ef84316b20b172c85c85f070278a51b06c1019aef1e5e9c5f31a87243c9229a579 SHA512 57ccb6269b2829a0606cbae08fc376bcd13028d3affe03d76c929a95faf9106dfd497872a12019158aeff5e8e101640d912cae0cece435121319820df7262c00
 DIST eog-3.32.2.tar.xz 4601712 BLAKE2B 84803acf2e2c2cb7451b357d18c7553854dd9a440ee8f951db479641ebf7fe49d8b8185124301c8b272db22d424c31197146e58d0907248cb87aa822441184d6 SHA512 c1093db4bce6bfde758a42fddc7ce7437d2adf3aa44a633b253ca3cb75c910e8862a323d182394696c617cb92114919dc576b992e7a65aa5fefb504062382d81
-EBUILD eog-3.28.4.ebuild 1545 BLAKE2B 99d8a1146eda116127f92d61fa32156f6b771de5d10882b3911a7a7e8ff975373bbfd7f12c705f5034a4de39fc3075a39f01480e5a4ab3ff435ca1fcf48f3b86 SHA512 2f1515802ca565104be4193276bff4f787072e08765feaed378cdeb91c5e911707a53ab61cca383770ead610477798e6d8f6ed1e09fbdf4cf5c33cf2bab143ca
 EBUILD eog-3.32.2.ebuild 1556 BLAKE2B 4a6f2ce822682b8fb164e7b95a26a16fe6bd9f1d09ac21d70a38942673370aa4b3e5007f3b41c37be9badb97f4f2080a1e8e82f0de3ee816ec7300f92d55b957 SHA512 e988399d2027b41da66b5004c9e879238799b24b12e3581229c995b39b51b7c78322a7734f1688f1b8c87f231e339d6cba8507778bd6d9ad18796b3a2e1bd5f1
 MISC metadata.xml 481 BLAKE2B 2c12b594b9a5b1e4ce3983131d1911f62026c5186d8f5c5af13842cfedfa4d20abdc5ee82e11db3a2e1b45e2b8d4d95fa1a62e668936956e8453b166daff00b4 SHA512 141ec1d6923697f744de806804279b602120ce3d5494257de36b8c8b71185d101692f2e438d7ba0e4a4c946d0aaba068117f16c8344abe891e0ddd4f768ded26
diff --git a/media-gfx/eog/eog-3.28.4.ebuild b/media-gfx/eog/eog-3.28.4.ebuild
deleted file mode 100644
index cc1f6224d4e6..000000000000
--- a/media-gfx/eog/eog-3.28.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="The Eye of GNOME image viewer"
-HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
-
-LICENSE="GPL-2+"
-SLOT="1"
-
-IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
-REQUIRED_USE="exif? ( jpeg )"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.53.4:2
-	>=dev-libs/libpeas-0.7.4:=[gtk]
-	>=gnome-base/gnome-desktop-2.91.2:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=x11-misc/shared-mime-info-0.20
-	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
-	>=x11-libs/gtk+-3.22.0:3[introspection,X]
-	sys-libs/zlib
-
-	exif? ( >=media-libs/libexif-0.6.14 )
-	lcms? ( media-libs/lcms:2 )
-	xmp? ( media-libs/exempi:2 )
-	jpeg? ( virtual/jpeg:0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	svg? ( >=gnome-base/librsvg-2.36.2:2 )
-
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-	gtk-doc? ( >=dev-util/gtk-doc-1.16
-		app-text/docbook-xml-dtd:4.1.2 )
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use exif libexif)
-		$(meson_use lcms cms)
-		$(meson_use xmp)
-		$(meson_use jpeg libjpeg)
-		$(meson_use svg librsvg)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-		-Dinstalled_tests=false
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index efe7c4f86e19..2153b1a62a1e 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,4 +1,4 @@
 AUX exiv2-0.27.2-libssh-0.9.2.patch 2035 BLAKE2B aeb9be311217b80a347d76a7df14ec11fc2018626cf7e9a813865dffd76038db10432fc2c898c0c26bdb3f1556cd34c0f8e4a25b189bc32733a3b4e018b241bf SHA512 25b4ca539585ddc2f4a11fc24ba49e799689d361f5f99f5552e99bd81179c95968affc4a42acd9ac0ba56f237f29ec53970a134b4dce44274a6044638d5bd78e
 DIST exiv2-0.27.2-Source.tar.gz 27591236 BLAKE2B bd10d71356e4c8a465b71f8ceac07fbf2fd6cfb287cb22774568ad35eb38200be504e297224920af50a15ab4e9da98384ff4da7c33713f5346b33738380698b0 SHA512 39eb7d920dce18b275ac66f4766c7c73f7c72ee10e3e1e43d84c611b24f48ce20a70eac6d53948914e93242a25b8b52cc4bc760ee611ddcd77481306c1f9e721
-EBUILD exiv2-0.27.2.ebuild 2470 BLAKE2B 4d36580d8a6b1704243b8e6170d1cc3b4fee7dc467ab0c91b61ba05081f9aabe43d1a3541e06dce226f952b39703037a071c6f2a44ec9f0ae779baa04cf220df SHA512 a551131d8b386c74367bdcb681bd998202e69a89c1a58fc67980dc8976cc22aca27b77b6358b68c5f9f35795f26100bc6459aa24c4cbb088356c6f7278dff274
+EBUILD exiv2-0.27.2.ebuild 2469 BLAKE2B 4117d560f3b7cfe77ff46d1a045fbb198c80f8ada7c02968369165843c8a545d04bf81be8f341559295930034f21b08dde529250617df62b586c8d4e5b13a1db SHA512 cfea38ad347adf6dca0e071cfbfc6f7c4d76e0799ae03dfe85d2250b3133e305d2031cb017e42f7458af629cf4f7dc2ebcd7337334548e4e9af9b9f176cfb97b
 MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5
diff --git a/media-gfx/exiv2/exiv2-0.27.2.ebuild b/media-gfx/exiv2/exiv2-0.27.2.ebuild
index 3d6060c5535e..276e0c2eff31 100644
--- a/media-gfx/exiv2/exiv2-0.27.2.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,8 @@ else
 	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 fi
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit cmake-multilib python-any-r1
 
 DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
@@ -59,7 +60,7 @@ src_prepare() {
 	iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
 	mv -f doc/cmd.txt.tmp doc/cmd.txt || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -e "/^include.*compilerFlags/s/^/#DONT /" -i CMakeLists.txt || die
 }
@@ -79,11 +80,11 @@ multilib_src_configure() {
 		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	if multilib_is_native_abi; then
 		use doc && eninja doc
diff --git a/media-gfx/fdm-materials/Manifest b/media-gfx/fdm-materials/Manifest
index 2ad973ce369c..a67b6c9efd53 100644
--- a/media-gfx/fdm-materials/Manifest
+++ b/media-gfx/fdm-materials/Manifest
@@ -4,6 +4,6 @@ DIST fdm-materials-4.2.0.tar.gz 29011 BLAKE2B cd167506070e5609b0e464cb547271008b
 DIST fdm-materials-4.3.0.tar.gz 33208 BLAKE2B 5505a885e03130757134557525e30ecda7091d3238aa5be753065c8bf81dd08914acf22ba85b95f3c78818bf5defedf97ea083d22f1886fc5113d692d70b14e6 SHA512 420accb4ff3eba754e96ceecda4980f121cab22ca3aeefe0781be47cce2ed64cd93df2a2bd974ea611e71ea45a944692e7b27bfbb6f9b0e9dd971e7621e4ff58
 EBUILD fdm-materials-3.4.1.ebuild 427 BLAKE2B f0c2ffd1704db661214fadee859f5ecb9a1653c7921649d5f75a7d90d1c22a5441cc614fc664943b4e2b1805d6d2a9e38a48c1ec6de8f029ff3df78ffed6587b SHA512 3ddb73a72ae39f3061c813f367cc5088b11617fde22acb7c77d43977174b4f00b156e1cf923ebe231c3a261e3684e9bbfecdc7bb9f08c08de3398a83b8c7ac44
 EBUILD fdm-materials-3.6.0.ebuild 424 BLAKE2B 86abac9f2f32f709c5e2dde549df6758108d22945a55fff32f4be6c2bf3842c210af686f00a6c403f0ae13611062e300cb4e235d4bd8fd25c0cf281fcda31f7e SHA512 aaaf876fe1c373061e94067ba1c89af62fb4836c44c7115c55d7684f01be6f11653850b94b029fdc56e70fc861eb44325aa946feac81d1ac0f06c3d48d8a7264
-EBUILD fdm-materials-4.2.0.ebuild 424 BLAKE2B 8caa956e8d16c27729c9f36acacdeba194635770824e8f110ff642b38bd7d37b958fa197aed9cd991c71f5fd696597329f872771a403c5df3715917465bdf1ac SHA512 9815bdcb1df46f6b37ef20761bfe9e8b9a954773072ac9eb316bc34e3320ca8bc3714d42c7de06bbba6ec9a45c0476187701943de93e3e275cedd6bad97c08f2
-EBUILD fdm-materials-4.3.0.ebuild 424 BLAKE2B 8caa956e8d16c27729c9f36acacdeba194635770824e8f110ff642b38bd7d37b958fa197aed9cd991c71f5fd696597329f872771a403c5df3715917465bdf1ac SHA512 9815bdcb1df46f6b37ef20761bfe9e8b9a954773072ac9eb316bc34e3320ca8bc3714d42c7de06bbba6ec9a45c0476187701943de93e3e275cedd6bad97c08f2
+EBUILD fdm-materials-4.2.0.ebuild 418 BLAKE2B 7442d31ef7f748c4eb2c9ee7bb62fc4808af71767f4630099b7720f81e5d316db39a63d5dbeee6513a8d190b558aaa5409fcfc288715c418352ab8df4903eccf SHA512 8b4ffda0f21307c4c25066fc3bdb92c4e275df225e5c07281cc4c9c3966ccc03231917f19694e1c3ec0c5bdf7365cd689c6f6ddbeb41eb2af6cbb7aee7cf5c78
+EBUILD fdm-materials-4.3.0.ebuild 418 BLAKE2B 7442d31ef7f748c4eb2c9ee7bb62fc4808af71767f4630099b7720f81e5d316db39a63d5dbeee6513a8d190b558aaa5409fcfc288715c418352ab8df4903eccf SHA512 8b4ffda0f21307c4c25066fc3bdb92c4e275df225e5c07281cc4c9c3966ccc03231917f19694e1c3ec0c5bdf7365cd689c6f6ddbeb41eb2af6cbb7aee7cf5c78
 MISC metadata.xml 865 BLAKE2B faf20efb80033c67c5b6cacbb3679368e6f7e8a63587aebb6a5e1569a2594620d3b657f14baee3bc39046993a0e285ccd3a02e888bd19bd885735f5a731b16fc SHA512 a083d711722c5896ebe0b9f2f8d5084e3e8fb2456c8b201eb2aae775c2e6a0b8a596a6e37f8b0e2015ed0e5095b05331257f916a77ca4df739af82d9a3802738
diff --git a/media-gfx/fdm-materials/fdm-materials-4.2.0.ebuild b/media-gfx/fdm-materials/fdm-materials-4.2.0.ebuild
index e2cea43f6d83..54cf788eca53 100644
--- a/media-gfx/fdm-materials/fdm-materials-4.2.0.ebuild
+++ b/media-gfx/fdm-materials/fdm-materials-4.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 MY_PN="fdm_materials"
 
diff --git a/media-gfx/fdm-materials/fdm-materials-4.3.0.ebuild b/media-gfx/fdm-materials/fdm-materials-4.3.0.ebuild
index e2cea43f6d83..54cf788eca53 100644
--- a/media-gfx/fdm-materials/fdm-materials-4.3.0.ebuild
+++ b/media-gfx/fdm-materials/fdm-materials-4.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 MY_PN="fdm_materials"
 
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index b7ef0e3bc513..e20fc3aca713 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -1,4 +1,6 @@
 AUX feh-3.2-debug-cflags.patch 193 BLAKE2B 298f65a8f9142167d1cd2cfce0bc61ad9d7d4a5519ab8e78d1259ea60b5566376f8d9ddba660db65ef5e229bdc0ff254d9aab2284d8929ea0ac171da44f8c44d SHA512 336d23b767c5c3da9b94a1e6759129c242caf70a611b2410816a562d90720e3abab6a3444ce06975d62b4ebbe8e54c70942800516c7575cc6d5e13ce69679884
 DIST feh-3.2.1.tar.bz2 2112281 BLAKE2B 2918d2714f0557e1b67284709bce22c5e14d8f7f545ca33c16ec7928273edf18c9be48a685c3e9a032170bf2b7e572a4b78664f37b2a16c5ae5829b3cc55ca76 SHA512 11a136990f7d02409501f10553659c64ad5d18d4bfaa4e5cfdeb7a2f53ffdb8bd9b8347796c65e75c49615ac4c12bc81bf3a58325f778cb5e0c1608181d7b53a
+DIST feh-3.3.tar.bz2 2112880 BLAKE2B 56042367c0acce966e115e77f3afa1acd3f942a956bc453de364bcd17d90393ad2868039a5793af64826cd50322e4ef5f9f2b9678f982c7c85b025ed208f8bb8 SHA512 0372115a8f2df77cdfc0fc1b24479e72d9be1f24127c787909ef671075b199b8d5f873200ce202f51705991cf3c5f5cc71ef8f47294fe520e3a9acc5cb7582a9
 EBUILD feh-3.2.1.ebuild 1522 BLAKE2B 79c8a59656764fc43e28f15616dc26ffd40b81b1417d885e5c1b89e32a6ff854c7b6af763acddd0897ce58bf0231eb7250319090c48fa282f14218dfb477edd2 SHA512 6e4ef3a5b5a962510bbce7957b09b11d46111ffd10593159d965bd86e09c7da7800175459b8cdc553a58ac616d146a7752253cf72afd6be003cf93be81eb5409
+EBUILD feh-3.3.ebuild 1526 BLAKE2B 15dabb54b5433f46af59e105bb236c8eee767742db5752ab980411e716b8f5243d632f256192d3d933d67bbc30d68d73fef5fe60122a060c40594bc83b10a250 SHA512 0557f644d86c41cdd21e8e3db16f29f7b45d2872bed6f6fe6a5867e54cf8ee86605da7c1aa1ec0ea6614741ae842a44f56d14c4ce38d1a140f4a1d337b215ab0
 MISC metadata.xml 358 BLAKE2B 602fb8b872f5f209abd20adbb141035c0d0396a7712839c950cfa19e78201c0c39e88fa5e8bebc6224459bb8e328e732ff30db848f6c84510f91830951f2087c SHA512 51fad9cc41f31b03f42e0ac4254ea05a848df755091cdd47ee4ce73f7189acd83e8956c230329ea0053d1f794b529e498525f6ce282a947c9809c4954a5b9a19
diff --git a/media-gfx/feh/feh-3.3.ebuild b/media-gfx/feh/feh-3.3.ebuild
new file mode 100644
index 000000000000..ad37f294e684
--- /dev/null
+++ b/media-gfx/feh/feh-3.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs gnome2-utils xdg-utils
+
+DESCRIPTION="A fast, lightweight imageviewer using imlib2"
+HOMEPAGE="https://feh.finalrewind.org/"
+SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
+
+LICENSE="feh"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug curl exif test xinerama"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="media-libs/imlib2[X]
+	>=media-libs/libpng-1.2:0=
+	x11-libs/libX11
+	curl? ( net-misc/curl )
+	exif? ( media-libs/libexif )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+	virtual/jpeg:0"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXt
+	test? (
+		>=dev-lang/perl-5.10
+		dev-perl/Test-Command
+		media-libs/imlib2[gif,jpeg,png]
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch )
+
+pkg_setup() {
+	use_feh() { usex $1 1 0; }
+
+	fehopts=(
+		DESTDIR="${D}"
+		PREFIX="${EPREFIX}"/usr
+		doc_dir='${main_dir}'/share/doc/${PF}
+		example_dir='${main_dir}'/share/doc/${PF}/examples
+		curl=$(use_feh curl)
+		debug=$(use_feh debug)
+		xinerama=$(use_feh xinerama)
+		exif=$(use_feh exif)
+	)
+}
+
+src_compile() {
+	tc-export CC
+	emake "${fehopts[@]}"
+}
+
+src_install() {
+	emake "${fehopts[@]}" install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 28cb9712db9d..63066190db28 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -5,6 +5,6 @@ AUX 20170731-tilepath.patch 411 BLAKE2B 39ef99a26b85fc25d6c0b778a6b0ddfdb2c366b6
 AUX 20190317-gdk_init.patch 1391 BLAKE2B 6b4294e24d1bef0300344d2c11ef59d7d3f22d83ba7e8cc3e981db827dde7c30f234be35c017cc8c854ae090aa1f3e177af2c4bc511365fdbdb2e8c40402dda9 SHA512 3976f2a860f6c6aaec8e1532ede9fde7beff3ae98ca8e0cf87b33b7165f158ae676c751a7cb3e7897f1dff3f03c041d4ee6bd06e68904973b5bc5acdee5bede5
 DIST fontforge-20190317.tar.gz 22762120 BLAKE2B 5cb85d2fb9a2a08fe64548f2667c026e916dd0239d17d8f8d7d2fe8ecb51f2106cf3dc6e6298014c0deadffbfe91925327b483ed4750a171fb621aea8bdee60b SHA512 55f9b0f7cafb1aa5a1461dbf39b52ca6b69a2baa6b761c8c28f86a0bb99e090d9ecc981294f51dadd9297b5ebd3036f01cb4f17b9a97a737eb567b4ae6522f20
 DIST fontforge-dist-20170731.tar.xz 13985256 BLAKE2B 7bc49a3b7747de419e4fafb445062873cf9bf56aa73fd7499509b787a1c0fd6c47b0b5d7bfeb2a69d9237f9f66f989af968b0d00e9d5e57030906394f042f29c SHA512 26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11
-EBUILD fontforge-20170731-r4.ebuild 2820 BLAKE2B 1a7579b71c5622bed288f345a328f8b01d6056a8cf2874415c82722e221e6300c3c97588040876d501ba818a7f9b368c2cb70592b1081d16291c52c9daaf2e8f SHA512 ed81344faca372bb074e2314a33cf6bd3d0ac1a997bc13f8150f9664d74fb6222c7024161cdd40bb0e5f0b604c1a4139d6792700d52eaf801810b65b5cc09236
-EBUILD fontforge-20190317-r2.ebuild 2740 BLAKE2B 087c06586fb423178fa736d4c1546876461a2cc996731f24449b9a7f4b275ea4727ec473a0ee5ae8a8e8a3c42516ac0ca90fd865090d3f4d0d7171ca895a5913 SHA512 13759b08a9d99c6442dfe21ea14e557d9d5f38793a8f03cc8898052eb10f2f3c06a661c9fd738493b63eb2979af1dc50b535bd500f0553a07cc93f6fadc86ff2
+EBUILD fontforge-20170731-r4.ebuild 2816 BLAKE2B c18269a507266fb08279df3c4d367100dfdc87e9b875fd559fd4563f9c559c63e9c4f3fc5d92c4d2bc7fd80be26bcbfbf924c25372fb2c35688145eb12b0794e SHA512 e685d7c7509376817a57d623fc1373d8510f5aebbfe226cf1e3f5863d363162e837c2c3616686ee2911a38294cd16c81d1a9e85779711cc9d4089add0288ee96
+EBUILD fontforge-20190317-r2.ebuild 2738 BLAKE2B f5f392434e2b2660f94dc431618dc83834566f3799eb4450b5e4f9aa4e529c3a25bfd35b048fe654bb78ad98a9d9fb34fc7755fbb312060b8203812fdf600c55 SHA512 43c193bc4295b3152743a2efd22b89324a29e49fa22debea90869f7233d6b88b7c678fbc4357096c808f6800b964a3c3bac1af26808fb0343b69c983ffbc3f9e
 MISC metadata.xml 908 BLAKE2B 57e840cbf69ebd2780ecaf5a3009905b782223a16339beae90acf1c087a185944e33fe952b477184244cb3f5f313fcce32a561ce903d751de457b77f4a90cd74 SHA512 973d4967be4eb7aad087ce977a4d94945a8894138604e8d37257dac97f74e98f7fb9a7cad7e7f46abb4c8c39dcb4bd79e9ad26f96838ad39ac1894e154834d28
diff --git a/media-gfx/fontforge/fontforge-20170731-r4.ebuild b/media-gfx/fontforge/fontforge-20170731-r4.ebuild
index c0e1cbb97955..0aef5976173a 100644
--- a/media-gfx/fontforge/fontforge-20170731-r4.ebuild
+++ b/media-gfx/fontforge/fontforge-20170731-r4.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=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit gnome2-utils python-single-r1 xdg-utils
 
diff --git a/media-gfx/fontforge/fontforge-20190317-r2.ebuild b/media-gfx/fontforge/fontforge-20190317-r2.ebuild
index 6177f860fd33..210cb2b03cc9 100644
--- a/media-gfx/fontforge/fontforge-20190317-r2.ebuild
+++ b/media-gfx/fontforge/fontforge-20190317-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2004-2019 Gentoo Authors
+# Copyright 2004-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit python-single-r1 xdg
 
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 33ad5a41a80c..dd3cd4c9d8c2 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -16,11 +16,11 @@ DIST gimp-2.10.14.tar.bz2 32786424 BLAKE2B f1254ab0742cf0190f4e50f001d8120fe655b
 DIST gimp-2.10.8.tar.bz2 31954568 BLAKE2B 11f88b1068fa1fe216a54bed27b26b94c3fdb2cbc67e1e444df74a080d00b678f8c81897a6c5fb5956fa107842b0a853ada44d15d51c2e58db7435ddd0f8e999 SHA512 b458dd710b786152f95a8e48a0727b71cac549fccb31ac9e1e6ac3c617652079773ce7076401f8ade750ed38bdc78dfdec3317423f4c4e9c931f78002bd7454e
 DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6
 DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
-EBUILD gimp-2.10.10-r1.ebuild 5721 BLAKE2B d1f1001c4e61a2662f01e78dd51d3cfd257ac7998839ab1d373fd4865cd5c8ea0f2b01a607ed265279712886932c03cf0bb453c29e8cef7b8b31d146617c0b1d SHA512 4d8d2a2f1b417534fa1783a8a137a8b53c1acb64d0e72c1a0659199d8d6050661784d4c611d908ed83d00fb0cb269e251d5b69223707e4ac5d61842f941a06ab
-EBUILD gimp-2.10.12.ebuild 5721 BLAKE2B 1e46bca7e17c7ad3281ceed4ed6e9696d37b68c115b3dd22af7b8b06b34562b48bdaa18718b32f39dcf1f36348cc734c72c0e32af1495fb7c5eae6957951d05f SHA512 9c8886d90acc7ae3bf4f3e70bf27d30485fdf38a90e611e56e925bd1850784c802250bc9b5575ba0a182ead869656e45086672202ebaa6c069b445d3947ecb31
-EBUILD gimp-2.10.14.ebuild 5719 BLAKE2B 16acdf866f51f88dd9cfffb03aea7e6a4af4b91aee2f98333a17ffd0eff30d99a25e8a0c2b94b15721ec408015f6b3c6f7b11b714ed31a2356ad398e13e7a3c2 SHA512 2e73e99e77cb7a2dcd5a403294a84f142e93f5f500191aa843cbfafe5de4a98a8d78170ba4281768e21f70d70ded4b955460c55c453b739947516cd13a2d109d
+EBUILD gimp-2.10.10-r1.ebuild 6074 BLAKE2B 75682eecedbf6211a78718f5c5856b09c783d28c151e00d82ef328365eb3585109af7b08629a11612e9d56630f8008a08ecf8b09a9c721ea0669fd4a46f9a068 SHA512 d453c6937229ab503c753cadbfc96f8d895f9ddfa8a7facb80d06d2c217a448d21595bc06369b174da2cc7a2c22cf75430e12d2196b4a2aa05a9cb7e58a6bbb7
+EBUILD gimp-2.10.12.ebuild 6074 BLAKE2B df3879b253aa768e86be41bcedafa185d52e25f74cfe6534b3d67670f479062cd0ba101573a0005d6201be0d3190019e74be11beb92753bd82bbd8e0fb5eac8c SHA512 c82794178786e30b3b2a6ad08c4705e9be546885ab00df5b3e218cccca16f3cc7e4a01d722bc0b79f9d6d0217841e1c3a49a54ff77aab9faf926f8a1fab6ff2a
+EBUILD gimp-2.10.14.ebuild 6079 BLAKE2B 9c91ee0cf92a3ed1be7626c12d6be81a7f1b3f4ebb3174cb26d6cbff627e28c7be34d8315357fd9f3b03f618e3019fd1f8c5e8be3b3a86a89cc48ff1218e0fd8 SHA512 2a52f0a331da2073dff070ab0367758f5787cf8d9a7ea3b267bea3c95ba4d4d4ac1635f592efd128db56daadd0eb625548ea951d8cff49cbc6945a2dcacc3701
 EBUILD gimp-2.10.8-r1.ebuild 6104 BLAKE2B bec6521e91558be2f2282baf131598c519f92c93267f687dedcac78fe70d27851c09307eb438009d35f9307c2ae78a77411cb6238cdde84b0ace9165399308cd SHA512 20f59e5aa3a8d5424b65ed9f947123feee6723dd16f946991022b17ac964be37c6aa0a71022928293fc51c542f3a3ad24ad3432fc6680d7214393d87d5159db2
 EBUILD gimp-2.8.22-r1.ebuild 5124 BLAKE2B b2fb64d49da0796f6eb2245eceade1ea5b5e2c5da2af918dba9c87a0fa4cb7f4c6dbe7688a6d7fe08b085c569413c06ffd4d22bf1cfa3a9f8c00277f634a11ac SHA512 e8cec3990a151e13c606498f5ebc4e685a28d5fb10919ec6bbb71b1f60d814b13722530f8737aff9e18065093800b8ebbe56d5f3844555accc475d2b74acf18d
-EBUILD gimp-2.9.8-r1.ebuild 5661 BLAKE2B 0617f1c469d09aa5df2884bf54db4338a2ff851a301a3ee7b2daf229c1308aa4818b9693b3f757f23052a857eb6a584d37fbe98e4b2390687dbfb83740c2bb95 SHA512 a10f751e97fd8a1b8e3fb1cc8d4fda72f040aa6631ed22f72c10c29b3b57954fc062518572715643fb7da61bfd501bf0dc6226db49130e3efdb8cb4afe610eed
-EBUILD gimp-9999.ebuild 6548 BLAKE2B b53fac4d6a5228fa21d39a2af406ec66dea3c0cde5dbb82a98bf7a6d189e7544700aeddfa4e27a2bd9a35c021e12650675e6d0f7c47dc747315d52f94b488da4 SHA512 e0405c9423550f387f0b3494ab3a1324a548406be8e633c03b45066902aeabb22869d89d6cb349c27031ff6ddf7ccd55d756c43f6e4a3204a0734b863d571e56
+EBUILD gimp-2.9.8-r1.ebuild 6042 BLAKE2B 0190f744da671d8b8d89e2596100c2ac2268adb1d278ef3106d89863c6d501c60c1e6a5cc7cb6c831aff43224e23c1c0a818cf5102afc28da637262e51798e44 SHA512 0a5a0aa970e83d5603223e7dd6a989098a150807183626bd45f03a68eb553fe3cb85a999262adfb60ea417a43e7b45f2f2379f746b019216347b52a9497f2a07
+EBUILD gimp-9999.ebuild 6084 BLAKE2B dbcbaa20a582a88853ecc3cd568aa02b61cd452fece8253e49864a274ba0186ba8496eae39135b28837cb39901d086688e0f769bfb31e236853b01e3584bffe7 SHA512 fbcd4aae7506bf712fcc48cc4496ebd48422af4908eddb128c334edf93480f22ecd5400a2cc0990532c9472f2de162b251854165f92ea1aa0839fdc189ec6a59
 MISC metadata.xml 628 BLAKE2B f1326f51db692d6e64d1bb7b44dfada65799d7ab94279771e6bd729189145a8a4bbe7a83c776bfc46acf682ad9f34c84598d25fb0a3606aabfa30383b35a9694 SHA512 cec60cde9763bdb9012fec754b95018f09da5cf7ff2f577206417651df5c18251dd5c58b1e32fb45e7c2121e06c0a5b7dc86d08b9511da4cf103bcf2fa1b6e52
diff --git a/media-gfx/gimp/gimp-2.10.10-r1.ebuild b/media-gfx/gimp/gimp-2.10.10-r1.ebuild
index ff1bb96d42f1..f3976c3f12b0 100644
--- a/media-gfx/gimp/gimp-2.10.10-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -101,6 +101,10 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Disable system CFLAGS suppressing on SSE{2,4.1} support tests by addition of {SSE2,SSE4_1}_EXTRA_CFLAGS: bug #702554
+	sed -i -e 's:\$intrinsics_save_CFLAGS \$SSE2_EXTRA_CFLAGS:\$SSE2_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' \
+		-e 's:\$intrinsics_save_CFLAGS \$SSE4_1_EXTRA_CFLAGS:\$SSE4_1_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' configure.ac || die
+
 	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
 	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
 
diff --git a/media-gfx/gimp/gimp-2.10.12.ebuild b/media-gfx/gimp/gimp-2.10.12.ebuild
index b3c8a9550e9a..3b13abe136af 100644
--- a/media-gfx/gimp/gimp-2.10.12.ebuild
+++ b/media-gfx/gimp/gimp-2.10.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -101,6 +101,10 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Disable system CFLAGS suppressing on SSE{2,4.1} support tests by addition of {SSE2,SSE4_1}_EXTRA_CFLAGS: bug #702554
+	sed -i -e 's:\$intrinsics_save_CFLAGS \$SSE2_EXTRA_CFLAGS:\$SSE2_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' \
+		-e 's:\$intrinsics_save_CFLAGS \$SSE4_1_EXTRA_CFLAGS:\$SSE4_1_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' configure.ac || die
+
 	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
 	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
 
diff --git a/media-gfx/gimp/gimp-2.10.14.ebuild b/media-gfx/gimp/gimp-2.10.14.ebuild
index 0217d66c15c3..59020299a272 100644
--- a/media-gfx/gimp/gimp-2.10.14.ebuild
+++ b/media-gfx/gimp/gimp-2.10.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 IUSE="aalib alsa altivec aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_x86_mmx cpu_flags_x86_sse"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -101,6 +101,10 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Disable system CFLAGS suppressing on SSE{2,4.1} support tests by addition of {SSE2,SSE4_1}_EXTRA_CFLAGS: bug #702554
+	sed -i -e 's:\$intrinsics_save_CFLAGS \$SSE2_EXTRA_CFLAGS:\$SSE2_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' \
+		-e 's:\$intrinsics_save_CFLAGS \$SSE4_1_EXTRA_CFLAGS:\$SSE4_1_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' configure.ac || die
+
 	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
 	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
 
diff --git a/media-gfx/gimp/gimp-2.9.8-r1.ebuild b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
index 162fd88fc46e..fc0e9d31d199 100644
--- a/media-gfx/gimp/gimp-2.9.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
 IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND=">=dev-libs/glib-2.40.0:2
 	>=dev-libs/atk-2.2.0
 	>=x11-libs/gtk+-2.24.10:2
@@ -94,6 +96,10 @@ PATCHES=(
 )
 
 src_prepare() {
+	# Disable system CFLAGS suppressing on SSE{2,4.1} support tests by addition of {SSE2,SSE4_1}_EXTRA_CFLAGS: bug #702554
+	sed -i -e 's:\$intrinsics_save_CFLAGS \$SSE2_EXTRA_CFLAGS:\$SSE2_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' \
+		-e 's:\$intrinsics_save_CFLAGS \$SSE4_1_EXTRA_CFLAGS:\$SSE4_1_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' configure.ac || die
+
 	gnome2_src_prepare
 
 	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index fb68f61b9b4d..6155d061b952 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -2,15 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PLOCALES="am ar ast az be bg br bs ca ca@valencia cs csb da de dz el en_CA en_GB eo
-	es et eu fa fi fr ga gd gl gu he hi hr hu id is it ja ka kk km kn ko ky
-	lt lv mk ml mr ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl
-	sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
 
 PYTHON_COMPAT=( python3_{6,7} )
 GNOME2_EAUTORECONF=yes
 
-inherit autotools git-r3 gnome2 l10n python-single-r1 virtualx
+inherit autotools git-r3 gnome2 python-single-r1 virtualx
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/"
@@ -124,10 +120,6 @@ src_prepare() {
 		echo "EXTRA_DIST = missing-gtk-doc" > gtk-doc.make
 	fi
 
-	# Remove disabled locales
-	_rm_locale() { sed -i -e "/${1}/d" po/LINGUAS || die "Failed to remove disabled locales"; }
-	l10n_for_each_disabled_locale_do _rm_locale
-
 	gnome2_src_prepare  # calls eautoreconf
 
 	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 6bcaf7610a17..770158b20319 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,10 +1,7 @@
 AUX gmic-2.4.3-curl.patch 2527 BLAKE2B 8bb6a9fb4aff5a1ae19437f93ec4336d87ab61f334a56c1d2083b0a8c02c37697795ea82f37d4caaf23edb37111d201db75315169a12f256571ad081f60b9890 SHA512 1c5cef3879749ab9a62e52ae5ac1c26ab60ff4b323352af9e7fb0f55b3ca7804290d03bd63dcaedb68c3d6fe43da332681a1eeb84543a1ac30163169ccee6368
-AUX gmic-2.6.7-qt-cmake.patch 1765 BLAKE2B ca0f8cd00d2c89f1868a853b18107de20c6fbc192826b1aad2edb3f20bc7619db8cde701e402f0a5e059b0ec54d0a124314d04eb91cdf1992b42d177635c5d72 SHA512 2c6a092cf0ec7e5c613fb673a6008398e470fa018e781cbfa860de6acccd0eb2472d5d787acef29b67176f95b837320db3a9f51726a97c525d21e3e4a3ea5dc0
 AUX gmic-2.7.1-qt-cmake.patch 1005 BLAKE2B 2b7e5f60788db611859b803cebd5e6e44ee7fac791d97e37fc22290e813c43b7b5d93e8725da2648c19999234f650399eb5fa7c973932f9bb1407fb88a955f58 SHA512 05fd4675cc1b65e4e504ae4c9913566b59b4c69467775a73734f01f9af842b87696c244203e9be75ef26876c452b34edfdfe1ed201ee6cdc934b2ea786c45a86
-DIST gmic_2.7.0.tar.gz 5823828 BLAKE2B 5a59e247ca5eb5f1aad841597fb008d9816e3c968224b8f59e51bc443218292601f8b5eea76353429677eb3ddc3fcf8f8ff28eaedd3a8ec66d84ebeb825fe7d3 SHA512 8269540253774061b108b309463dfbadb76b925e36f5d62be59020fef4178fc83b79a221f32104880b51cd9d7aef67a698beb648c6e544e4e58b88796e46a0c4
-DIST gmic_2.7.1.tar.gz 5843308 BLAKE2B 8a348d9444ba0879816a438161c130e9fc706178f93c6a1202586209f2d3779dfce48d2bd3147b47dec9614e4a3687108913b45e6c91afc8bc6266aabee26012 SHA512 9a2f8536217ba449207022bb1dfc92d3826bea80f8e7a048880c5c4451070e7a09b21c0c17199941284040b8f3661dc93737d0f67975c58b6a7015038c49465e
-DIST gmic_2.7.2.tar.gz 5848157 BLAKE2B 192eb02c1079072064d67d4cc834e8d674b55e0ce663501775ca2d31a4627129d9c1075d217800049e150c3dc7b6059c2521be1a594034df04beef416c6d888a SHA512 d8e26720d30235d613a618ce01615bd82fe0caf73979e5797865a459d7d7f877169111da98db88bfff62d0383e0301789aae7d3449ca9869d43847c6a5cbd7fb
-EBUILD gmic-2.7.0.ebuild 4397 BLAKE2B da553fd50d27145cdc0fbfac7633e6c3e1c3421e36e59eff0b3635a5ee149d460ab3afa47e094d62ef73231b21f8e3578b43ce829e30d08545c6792bea0a279e SHA512 23b26101bb327a78d2ae907d0de5600835861024bffc0cd75b77e9a571daab212d12812b995f72e213967320d797ed4bab2484ff7f63bf931a6cc24fc86a9a04
-EBUILD gmic-2.7.1.ebuild 4397 BLAKE2B 4cab4b7f8ac92099459cc9c5830cb9adde000943474c3fc246639cce86fae71750a44145ddccb98af24848d047806cd4988d74ba2fa704e09adaeccafdf60726 SHA512 142736b44fe0df5ea579fa8bdf3ad973d6e7c40887c9e47fd06ce7dc5071f980368fdfae8a6c0d50d39bd1654867c47b15688d47a131eeb68f08eb516dc659cf
-EBUILD gmic-2.7.2.ebuild 4397 BLAKE2B 4cab4b7f8ac92099459cc9c5830cb9adde000943474c3fc246639cce86fae71750a44145ddccb98af24848d047806cd4988d74ba2fa704e09adaeccafdf60726 SHA512 142736b44fe0df5ea579fa8bdf3ad973d6e7c40887c9e47fd06ce7dc5071f980368fdfae8a6c0d50d39bd1654867c47b15688d47a131eeb68f08eb516dc659cf
+DIST gmic_2.8.1.tar.gz 5995556 BLAKE2B 3f3c35290d18c927745b4b527f5297a9c3beb109a34b7e8b70dcff064f2587e022616e0fe5063d79e94b8fbd0ce3f70b6b5417ebaa0f0cc0f61891d79330afa9 SHA512 0f9ae9454c6f053026cdace43b24e32183f384d79099bc654c3b154647d24ef6541b1fae62cb17e27e527fb51ed8cef03a46490af3ace1551646fc8b3cd64eb9
+DIST gmic_2.8.2.tar.gz 6170087 BLAKE2B 36bea32531fef3694c4bf295603c2327dba2391f8cb868393d01a86dd9dcc52a127584e8eaeeba79425aceb07fd3ee31e0383a182eb0956daa920122463c4a08 SHA512 80fbba0dd1f02fe23986f57190e6e4bb0df31ac8b4084ddcfa088fcf352b44484ada47704b42c9cd27f52a55e42247447c73181c0a84a4f0e54f064e9fc9ca9a
+EBUILD gmic-2.8.1.ebuild 4382 BLAKE2B 3c4b3090d853dfb3e2e808a3924ccecb74777d78a92bbfeaacade60d18c9deaba13b9382604bd314ef6105e6dd35e76914e6abf193a2b5db54a82bd3d5ce6f9d SHA512 377d9dadf36f7f20256f30f798e5968c0f4fc83fd5844871748c5acfb7a041e73019435ccd0fa524a5f9d0600439c0484c951c0df52a8de32f145f8aac76da7a
+EBUILD gmic-2.8.2.ebuild 4264 BLAKE2B 3d4e56ac83bfe31ffcc595e4fd0e9b509bec3b940d12378d016764b69b22333797bcfb206e69f6c1ec58a7763c04f9197faac87ed6fba33d6f46701892553645 SHA512 ea99f26dee139a974d0f7c878abcb0dec9edf45bcf538371edb8e0e4c011a2665b9dab4320972cceb4e3276bf183737d4573bedb17e8aeb6703eb6977b4e44c4
 MISC metadata.xml 547 BLAKE2B 0da3088e531217099bf3f690059d3725ba3c62ad9337dfbf3817584f95594a328b647b0a81eb4d58c2cbc030026bf2aa94e01c817b04072aea1caee435f6ef9f SHA512 e58e976f8e80eea8e3620888858d6386e5d922c842e08c39f7ad611a5fc96e5fb85e39864bc0e805dd20a2c19e02b9fb8d1a5eaaa470075ed73759dcdcd4fbee
diff --git a/media-gfx/gmic/files/gmic-2.6.7-qt-cmake.patch b/media-gfx/gmic/files/gmic-2.6.7-qt-cmake.patch
deleted file mode 100644
index e268558a95eb..000000000000
--- a/media-gfx/gmic/files/gmic-2.6.7-qt-cmake.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Fix linking with fftw when thread support is enabled and fix source code file
-name typo.
-
---- gmic-qt/CMakeLists.txt
-+++ gmic-qt/CMakeLists.txt
-@@ -13,6 +13,7 @@
- set(CMAKE_AUTOUIC OFF)
- set(CMAKE_AUTORCC ON)
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
-+set(EXTRA_LIBRARIES)
- 
- set (GMIC_QT_HOST "gimp" CACHE STRING "Define for which host qmic-qt will be built: gimp, krita or none.")
- if (${GMIC_QT_HOST} STREQUAL "none")
-@@ -143,8 +144,13 @@
- #
- find_package(FFTW3 REQUIRED)
- add_definitions(-Dcimg_use_fftw3 )
--add_definitions(-Dcimg_use_fftw3_singlethread )
- include_directories(${FFTW3_INCLUDE_DIR})
-+find_library(FFTW3_THREADS_LIB fftw3_threads PATHS ${FFTW3_LIBRARY_DIRS})
-+if(FFTW3_THREADS_LIB STREQUAL "FFTW3_THREADS_LIB-NOTFOUND")
-+    add_definitions(-Dcimg_use_fftw3_singlethread)
-+else()
-+    list(APPEND EXTRA_LIBRARIES "-lfftw3_threads")
-+endif()
- 
- #
- # CURL
-@@ -185,6 +191,7 @@
-         ${PNG_LIBRARIES}
-         ${FFTW3_LIBRARIES}
-         ${ZLIB_LIBRARIES}
-+        ${EXTRA_LIBRARIES}
- )
- 
- if (CURL_FOUND)
-@@ -278,7 +285,7 @@
-   src/FilterParameters/ChoiceParameter.h
-   src/FilterParameters/ColorParameter.h
-   src/FilterParameters/ConstParameter.h
--  src/FilterParameters/CustomDoubleSpinbox.h
-+  src/FilterParameters/CustomDoubleSpinBox.h
-   src/FilterParameters/FileParameter.h
-   src/FilterParameters/FilterParametersWidget.h
-   src/FilterParameters/FloatParameter.h
-@@ -350,7 +357,7 @@
-   src/FilterParameters/ChoiceParameter.cpp
-   src/FilterParameters/ColorParameter.cpp
-   src/FilterParameters/ConstParameter.cpp
--  src/FilterParameters/CustomDoubleSpinbox.cpp
-+  src/FilterParameters/CustomDoubleSpinBox.cpp
-   src/FilterParameters/FileParameter.cpp
-   src/FilterParameters/FilterParametersWidget.cpp
-   src/FilterParameters/FloatParameter.cpp
diff --git a/media-gfx/gmic/gmic-2.7.2.ebuild b/media-gfx/gmic/gmic-2.7.2.ebuild
deleted file mode 100644
index bd8a5d1a186b..000000000000
--- a/media-gfx/gmic/gmic-2.7.2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-CMAKE_MIN_VERSION=3.9
-
-inherit cmake-utils bash-completion-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
-REQUIRED_USE="
-	|| ( cli gimp krita qt5 )
-	gimp? ( png zlib fftw X )
-	krita? ( png zlib fftw X )
-	qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		>=media-gfx/gimp-2.8.0
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:0= )
-	jpeg? ( virtual/jpeg:0 )
-	krita? ( ${QT_DEPEND} )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
-	openexr? (
-		media-libs/ilmbase:0=
-		media-libs/openexr:0=
-	)
-	png? ( media-libs/libpng:0= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	gimp? ( dev-qt/linguist-tools )
-	krita? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
-"
-BDEPEND="virtual/pkgconfig"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	if ! test-flag-CXX -std=c++11 ; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-src_prepare() {
-	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
-	cmake-utils_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use gimp || use krita || use qt5; then
-		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
-		local S="${S}/gmic-qt"
-		PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch )
-		cmake-utils_src_prepare
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DBUILD_BASH_COMPLETION=$(usex cli)
-		-DCUSTOM_CFLAGS=ON
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_DYNAMIC_LINKING=ON
-	)
-
-	cmake-utils_src_configure
-
-	# configure gmic-qt frontends
-	local CMAKE_USE_DIR="${S}/gmic-qt"
-	mycmakeargs=(
-		-DENABLE_DYNAMIC_LINKING=ON
-		-DENABLE_CURL=$(usex curl)
-		-DGMIC_LIB_PATH="${BUILD_DIR}"
-		-DGMIC_PATH="${S}/src"
-	)
-
-	if use gimp; then
-		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
-	fi
-
-	if use krita; then
-		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
-	fi
-
-	if use qt5; then
-		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	# build gmic-qt frontends
-	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README
-	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
-
-	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
-	insinto "${PLUGINDIR}"
-	doins resources/gmic_cluts.gmz
-
-	# install gmic-qt frontends
-	if use gimp; then
-		exeinto "${PLUGINDIR}"
-		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
-	fi
-	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
-	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}
diff --git a/media-gfx/gmic/gmic-2.7.1.ebuild b/media-gfx/gmic/gmic-2.8.1.ebuild
index bd8a5d1a186b..4c6884de7863 100644
--- a/media-gfx/gmic/gmic-2.7.1.ebuild
+++ b/media-gfx/gmic/gmic-2.8.1.ebuild
@@ -1,12 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_BUILD_TYPE=Release
-CMAKE_MIN_VERSION=3.9
-
-inherit cmake-utils bash-completion-r1
+inherit cmake bash-completion-r1
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
@@ -81,14 +79,16 @@ pkg_pretend() {
 
 src_prepare() {
 	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
 
 	if use gimp || use krita || use qt5; then
+		# respect user flags
 		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
 		local S="${S}/gmic-qt"
+		# fix linking with fftw when thread support is enabled
 		PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch )
-		cmake-utils_src_prepare
+		cmake_src_prepare
 	fi
 }
 
@@ -115,7 +115,7 @@ src_configure() {
 		-DENABLE_DYNAMIC_LINKING=ON
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 
 	# configure gmic-qt frontends
 	local CMAKE_USE_DIR="${S}/gmic-qt"
@@ -128,32 +128,32 @@ src_configure() {
 
 	if use gimp; then
 		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
 	fi
 
 	if use krita; then
 		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
+		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
 	fi
 
 	if use qt5; then
 		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
 	fi
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	# build gmic-qt frontends
 	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	dodoc README
 	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
 
diff --git a/media-gfx/gmic/gmic-2.7.0.ebuild b/media-gfx/gmic/gmic-2.8.2.ebuild
index d4bacf387446..b9efdacb34d0 100644
--- a/media-gfx/gmic/gmic-2.7.0.ebuild
+++ b/media-gfx/gmic/gmic-2.8.2.ebuild
@@ -1,12 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_BUILD_TYPE=Release
-CMAKE_MIN_VERSION=3.9
-
-inherit cmake-utils bash-completion-r1
+inherit cmake bash-completion-r1
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
@@ -80,15 +78,16 @@ pkg_pretend() {
 }
 
 src_prepare() {
-	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
 
 	if use gimp || use krita || use qt5; then
-		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
+		# respect user flags
+		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
+			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
+			-i gmic-qt/CMakeLists.txt || die
 		local S="${S}/gmic-qt"
-		PATCHES=( "${FILESDIR}"/${PN}-2.6.7-qt-cmake.patch )
-		cmake-utils_src_prepare
+		cmake_src_prepare
 	fi
 }
 
@@ -115,7 +114,7 @@ src_configure() {
 		-DENABLE_DYNAMIC_LINKING=ON
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 
 	# configure gmic-qt frontends
 	local CMAKE_USE_DIR="${S}/gmic-qt"
@@ -128,32 +127,32 @@ src_configure() {
 
 	if use gimp; then
 		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
 	fi
 
 	if use krita; then
 		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
+		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
 	fi
 
 	if use qt5; then
 		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
 	fi
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	# build gmic-qt frontends
 	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	dodoc README
 	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
 
diff --git a/media-gfx/gnofract4d/Manifest b/media-gfx/gnofract4d/Manifest
index ea0f682106f3..e80f91a5d352 100644
--- a/media-gfx/gnofract4d/Manifest
+++ b/media-gfx/gnofract4d/Manifest
@@ -2,6 +2,8 @@ AUX gnofract4d-3.14-desktop.patch 479 BLAKE2B cfb56a81893b0bc1d9ea1fe119e75ab432
 AUX gnofract4d-3.14-manual.patch 914 BLAKE2B 20be2e073ba3fb8fe06647b091e152a5d29119fe25c88fdd9dba3ad1dbbc0330b2fa15b84348e17601c39bc6c5c1cd9316f5f165889959fbe46731c79b469a66 SHA512 591858a7ba5e28e24cb170b5a6d24b98fd060ca79257542f9b3bcbe26d476ae2331ffa991c5d1726d352223198077e61339277b05e65ef0975944694f74a46ce
 DIST gnofract4d-3.14.1.tar.gz 4660808 BLAKE2B f5125be0414b847f506686734e9234c3d88732be6f7cd0feb9cbe759d6e0584f8ce143d64de17a5fcca9b28d75ae922e00993140f0ccb793d10faadb3221b990 SHA512 bcec1d12c589cdee2f0da5555a075db511debd21d4536db66793f6a28be35656258daffd8cbaaff4b5af041b18ca77c94d910ec4d0c7e14960412c580fd56725
 DIST gnofract4d-3.14.tar.gz 862499 BLAKE2B dcca058b6a625b4d2f0153f896ed029b27b8e6135a310942c4b58bf5a6396977f5ca065061918e99034b6303a5634c5288cac90c887a8dfa87286d24f9f1d04f SHA512 cf3614f60a43f7ab20208fb1a62d3823495c84060d177d2926bad20a475e661d7ec45a7bc14e826229656027fe7c0f68aac093b6b0dc7912e84d8d8ec8ff81e5
+DIST gnofract4d-4.0.1_p1.tar.gz 7638038 BLAKE2B c12bade5f219d2d41dc50569c0df315273b0c2a0a6a40543f48f3e4cb766512ed18b979463574db65ac443b1a8dffbcc1f3c9dc04d7c6b89881fdfcfce95c41c SHA512 d7f3a081b3681866d2da911eedab6ec74f22f36d5175a85f93751519e96971cf147b99ddcda32c597283b39e9da4f0fc6a8843331334a18efa3bf459cfd00af5
 EBUILD gnofract4d-3.14-r1.ebuild 838 BLAKE2B faf89e7b8110f981fc500a83b10985e71bd60320a3ae1ff4048d9ecef5866399369e13c35904df5d0474afceab7e29c16d69322aac55bf0a7b12500ca97fc6f5 SHA512 639bbddf911d9314e99142e4f55ab968b0898293d8ddeabd286010faa9304a35cb280f39790028360b78e64c8722581239913b37e15e196631a5011b9fb6950a
 EBUILD gnofract4d-3.14.1.ebuild 1142 BLAKE2B b6ff0697afc901a6e4ce549f2c5a6012a191ccec2b36c26e9ca428e753f422e9759a87b3dad612d715f2f4647eb46a63c2ebf6855c077765c8f4f88b7f00ef06 SHA512 63e621da4294d0b18023ff8f6df66d657ca1fff0af0156d226f19ceaa675f75640798b0c5dca34ce9da19769fe355dbe5268b6fc61bbde26236e7b651bfc9ad5
-MISC metadata.xml 397 BLAKE2B 0df3e1527627657309017673cc4557df01f71016eec2b6daaa16aee959534600be9a9292e966783ed9e14bf076ae57de0904a901c9f9e80a9bedf4ec7e113ec7 SHA512 9f2efdbbb8eefe3d2d7b42287f233db308e24b9ef825522e650b98857de963171870460a1a5c8ad2e9f65272db6bd176a552587e38d877fcad2afd6be2b0e6e6
+EBUILD gnofract4d-4.0.1_p1.ebuild 1594 BLAKE2B 58cb658e2ac1c385f8911be5ed2013bda5cd350f7a722a9b08a7ea1822e68c38fb62f356e6c97dc9898bda17f3ed59a436ea0b14b5ba5581c1c68e8ba583d9a2 SHA512 afe8f5ea63a47fd5405d58215c1785f78a18ef51b5de2fd6bd6fc24c2901e6ff918872b6341f7b95f10cbba042345ba33aec82ac7045293023da3f1568cb4d32
+MISC metadata.xml 403 BLAKE2B f0bfac9f73e6c64e4535ff9dd389bd65bd622ba3aa0b64d52ef1f3b96a5cf0fbc4913c311b3e227fd9ac91c18f3d78aa9ae085c7610b06e768a39f6f5993121e SHA512 ed69568f628be6a938f2f2cd9a7a2610b881f437ec57eb12baf803b00ddb5f62e7d562a1743eaff5a3fc8d083802cac05ed965aa0d473846e94aa526e66babb4
diff --git a/media-gfx/gnofract4d/gnofract4d-4.0.1_p1.ebuild b/media-gfx/gnofract4d/gnofract4d-4.0.1_p1.ebuild
new file mode 100644
index 000000000000..b87c0d129ea5
--- /dev/null
+++ b/media-gfx/gnofract4d/gnofract4d-4.0.1_p1.ebuild
@@ -0,0 +1,70 @@
+# 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_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 eutils virtualx xdg
+
+COMMIT=bd600c20921afff7b02fc0a76ab79242ebd0896d
+
+DESCRIPTION="A program for drawing beautiful mathematically-based images known as fractals"
+HOMEPAGE="http://edyoung.github.io/gnofract4d/"
+SRC_URI="https://github.com/edyoung/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+doc"
+REQUIRED_USE="test? ( doc )"
+
+COMMON_DEPEND="
+	media-libs/libpng:0=
+	virtual/jpeg:0"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]"
+BDEPEND="virtual/pkgconfig"
+DEPEND="${COMMON_DEPEND}
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		dev-python/pygobject[${PYTHON_USEDEP}]
+		dev-libs/libxslt
+		x11-libs/gtk+:3[introspection]
+	)"
+
+distutils_enable_tests pytest
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_prepare() {
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	virtx pytest fract4d fract4dgui test.py || die
+}
+
+python_compile_all() {
+	if use doc; then
+		ln -s "${BUILD_DIR}"/lib/fract4d/*.so fract4d/ || die
+		"${EPYTHON}" createdocs.py || die
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	rm -r "${ED}"/usr/share/doc/${PN} || die
+	if ! use doc; then
+		rm -r "${ED}"/usr/share/gnome/help/${PN} || die
+	fi
+}
+
+pkg_postinst() {
+	elog "Optional missing features:"
+	optfeature "creating videos" media-video/ffmpeg[vpx,zlib]
+}
diff --git a/media-gfx/gnofract4d/metadata.xml b/media-gfx/gnofract4d/metadata.xml
index fb2b6be847f0..38cc24b2d952 100644
--- a/media-gfx/gnofract4d/metadata.xml
+++ b/media-gfx/gnofract4d/metadata.xml
@@ -6,7 +6,9 @@
 		<name>Gentoo Graphics Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">gnofract4d</remote-id>
 		<remote-id type="github">edyoung/gnofract4d</remote-id>
 	</upstream>
+	<use>
+		<flag name="doc">Install user manual</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest
index cbeccb58db63..ff3819f8effc 100644
--- a/media-gfx/gnome-font-viewer/Manifest
+++ b/media-gfx/gnome-font-viewer/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-font-viewer-3.30.0.tar.xz 139076 BLAKE2B 0c84b4e8550df6689f69da1f8b968d436721ba3a9cd97fd7f8f71ad7316af8146d368b65b0702bb7c25c4fd210cf8fb9634620b129505cb3f4f78e3e450c3718 SHA512 9ba3dffdd0152c9a1380b39f4f96de7e7d0281c675c0821d4c0be27b7aab9f23d3ca7497b70dcf47807be5cc7fcf252877e5cd0009f6cf1ec231d429477fe600
 DIST gnome-font-viewer-3.32.0.tar.xz 153852 BLAKE2B b79279e57b2ce4310acf3d1164da68b9408518456f72d28aae09092c53f9ab5cc6e1754b06c6ed147fdb842f76a3e0e4ad2bd7f5ddad5773091b28eae9811d78 SHA512 16b000b16b3e3e996dd83ef7f2a2f6877f6d367c6fd69f26f385dd13cc87a7690cd85e8895008fc7c5ca32ad4a15b763fe918ddc08aaf042f65087289b126681
-EBUILD gnome-font-viewer-3.30.0.ebuild 665 BLAKE2B c46f27c81e9599e0ce966258779ed13f9195a64debf1aacf2a415639968b09847ef95ad000ea81d4703e54517b6089518fd4d097e66318d5f41421768ca6b8a6 SHA512 d96e5a23228559ab472fece42eeca29e9d548b105e4714e409f88ebebf84bbb5e9c867fb02e3e97d88dc14df50bea908d9f9e7b230beddac1cdb7d13bae51fbe
 EBUILD gnome-font-viewer-3.32.0.ebuild 665 BLAKE2B c46f27c81e9599e0ce966258779ed13f9195a64debf1aacf2a415639968b09847ef95ad000ea81d4703e54517b6089518fd4d097e66318d5f41421768ca6b8a6 SHA512 d96e5a23228559ab472fece42eeca29e9d548b105e4714e409f88ebebf84bbb5e9c867fb02e3e97d88dc14df50bea908d9f9e7b230beddac1cdb7d13bae51fbe
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.30.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.30.0.ebuild
deleted file mode 100644
index eb3984b87024..000000000000
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.30.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome.org meson xdg
-
-DESCRIPTION="Font viewer utility for GNOME"
-HOMEPAGE="https://git.gnome.org/browse/gnome-font-viewer"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-libs/glib-2.35.1:2
-	>=x11-libs/gtk+-3.20:3
-	>=media-libs/harfbuzz-0.9.9
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	gnome-base/gnome-desktop:3=
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index 3c61749610da..a42fb695c9a0 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-photos-3.30.1.tar.xz 1118728 BLAKE2B b3de35fb9c2ae7b731cf76a7b02b689997e3cf063037c49a51dbdf8bb37d9217c9bd5380bc872b984eca4e53c5996eb6370f3acc82a90e56dabe9d47999d5578 SHA512 4fa386c3d93f2b15468601e56bfcbdcc83a9e78ed5c4d0a1e51e9adf4ba313bb69e07aae52404026546dd68584e355c5e5100fc12f95fe078ccf2d6160a0a24b
 DIST gnome-photos-3.32.1.tar.xz 632688 BLAKE2B 9fa7307d1571f6c4e07d6c9700fd947e4a0ff26f8308f7b1871da817e5d80b19861d3c94a1b8ffe0daa820862ad064075641c8eb42ad66134e7c554696448932 SHA512 31a52b93c27ee603ddb314998d663d02c1cfdbc33214d2d9f977f7b66f4fc131a52cd17b274efcfb80f2fb17d7b469157e99a783cbfe76e0b872a2a75363b208
-EBUILD gnome-photos-3.30.1-r1.ebuild 1976 BLAKE2B 943d102726da0a7dc85f9f027e0b426d59039bdf19e492fc5cebedaaa9df99ba7ad8fbe52d670f89172f59d34d1aa59a7b54cfcd95ed09472dbbb22ec4a7bf82 SHA512 bb52b6e8d2675b7eb5390d9e316ae3a68a34fdebde3a6261c9bc445ce8a3a7581a47b5d261285233f502b9dd016805b62bf5695050d097a2d9240b2768d48b21
-EBUILD gnome-photos-3.32.1.ebuild 2303 BLAKE2B 29e853fb84511cbf9da793dbf84df5400a953a725f9e76d1d4aacecce52d39786cc8282f45cd7c83312a9155c4cafec7fc2263ec5c2f632048629b95f067e5ab SHA512 1be09542f8f9e189078968daa14367e9813e112989509fff9d15488b650cd89ecd3483344c5a6098706e9506ed05c4577c357e733bae22f8da9df875849512fb
+EBUILD gnome-photos-3.32.1.ebuild 2299 BLAKE2B 48d413458167c1804b93de5c5f31a994062c171cc25532adab60bc93dcf8cf9a9e2ce921336574c7c116e1dbcafbdbcb78d12e794e4b3f6f3ae8a3c947284256 SHA512 3b3d34b0a1ddb9e97bd2c57fc53427331edc00621449f134d5b7bd1817305085695b1b4d75dbbd13db50e8ad587f10b3d46aa80de12826a1aef4708d67952b23
 MISC metadata.xml 992 BLAKE2B beda29ca65d25e5d68c014fbb70fb539cf17b55d64255d6d74305d710f3979b5156eda764d75992f057416f5eb96af899b988633dd8444fcf22c6a5f73fe9b9b SHA512 3c47be6c01072a0b4845dd42b6d3561d340eb703bd9cb5c727ec24b653ab76eee38e35ba63c4cd71b93514ab0cb8bd75663febeed1901cccedfd30f223e870df
diff --git a/media-gfx/gnome-photos/gnome-photos-3.30.1-r1.ebuild b/media-gfx/gnome-photos/gnome-photos-3.30.1-r1.ebuild
deleted file mode 100644
index e08ff3b0ea8b..000000000000
--- a/media-gfx/gnome-photos/gnome-photos-3.30.1-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 virtualx
-
-DESCRIPTION="Access, organize and share your photos on GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
-
-LICENSE="GPL-3+ LGPL-2+ CC0-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="flickr test upnp-av"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=app-misc/tracker-2.0:0/2.0
-	>=dev-libs/glib-2.44:2
-	>=dev-libs/libdazzle-3.26.0
-	gnome-base/gsettings-desktop-schemas
-	>=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts]
-	media-libs/babl
-	>=media-libs/gegl-0.4.0:0.4[cairo,raw]
-	>=media-libs/gexiv2-0.10.8
-	>=media-libs/grilo-0.3.5:0.3=
-	>=media-libs/libpng-1.6:0=
-	>=net-libs/gnome-online-accounts-3.8:=
-	>=net-libs/libgfbgraph-0.2.1:0.2
-	sci-geosciences/geocode-glib
-	>=x11-libs/cairo-1.14
-	>=x11-libs/gdk-pixbuf-2.32:2
-	>=x11-libs/gtk+-3.22.16:3
-	virtual/jpeg:0
-"
-# gnome-online-miners is also used for google, facebook, DLNA - not only flickr
-# but out of all the grilo-plugins, only upnp-av and flickr get used, which have USE flags here,
-# so don't pull it always, but only if either USE flag is enabled
-RDEPEND="${COMMON_DEPEND}
-	net-misc/gnome-online-miners[flickr?]
-	upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] )
-	flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/appstream-glib
-	dev-util/desktop-file-utils
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
-" # app-text/yelp-tools needed for eautoreconf; otherwise just itstool
-RDEPEND="${RDEPEND}
-	>=app-misc/tracker-miners-2
-"
-
-python_check_deps() {
-	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable test dogtail)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/media-gfx/gnome-photos/gnome-photos-3.32.1.ebuild b/media-gfx/gnome-photos/gnome-photos-3.32.1.ebuild
index 8a814d5bc75a..d70065133cfd 100644
--- a/media-gfx/gnome-photos/gnome-photos-3.32.1.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-3.32.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg
 
diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest
index 1eccce76d6c1..54b662f907a2 100644
--- a/media-gfx/gnome-screenshot/Manifest
+++ b/media-gfx/gnome-screenshot/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-screenshot-3.30.0.tar.xz 225244 BLAKE2B 69c75bb8e3d18578317343b549d4ad837b6e58420c6b49efbc01338697bc2251032d9158e658c9f4ae4e086a1c117eac818c18b6ed95d031c2b60c2ba62a56b6 SHA512 a42ff4f14bbb3a3feb438ee64f1dff3d3a792a6585fef92fde8546b9c3fc07013e8bd2ef42ddc880f2529cbc4241a50d441d4de2a4b26923036f1724aabafdba
 DIST gnome-screenshot-3.32.0.tar.xz 228876 BLAKE2B a7f742cf67815428da3013db23d36b34f52bf99c3d77002cac9243d2f5c5c5c1828cb92a34e0541d18c57f357d39f876a815d7caa432f92704c749a431faae95 SHA512 2747f3cc6ff6df6db6d64c9c13f7d7e3c0bf738cdace2850869c1158d23d02dd03b55e6704c9540f1e5b789626ea07741a0030ce3b06dd70c09f2fb2afa79c61
-EBUILD gnome-screenshot-3.30.0.ebuild 1236 BLAKE2B f051edbcf5eda8f5a730da5971708e5e19fd2fd3ba43529986c06e31e35f2563bb98f230318ecdfaee0606fd3287dfea7c86305c5ac587c7634a8b922e57cf41 SHA512 276749c60a4e8f84322fdb3100f6a499aaabc7f38f3c00a4b8ccba3894e246b125087856c3b2a6aea93c06736a3d5d670907491561d721d41753bbdfd9185dbf
 EBUILD gnome-screenshot-3.32.0.ebuild 1208 BLAKE2B f231ccd7901bf917986d1e9ca02e6d47421896bc6ae96a548166a1fcfe91344bdd307f2ab122625d3725c34ac367508dfea098cccd49a570fe90cc62731bb719 SHA512 acff8007646b7d67f69eea78a2037ea71e235288a337930d80f4aa8f886b8b8d5a96634450ddd3e3db8daa47798591f29ca1673b12546ca31d8909476af4ef6a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild
deleted file mode 100644
index fdc92ad3410a..000000000000
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.30.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
-
-DESCRIPTION="Screenshot utility for GNOME"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
-
-# libcanberra 0.26-r2 is needed for gtk+:3 fixes
-COMMON_DEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
-	>=dev-libs/glib-2.35.1:2[dbus]
-	>=x11-libs/gtk+-3.0.3:3
-	>=media-libs/libcanberra-0.26-r2[gtk3]
-"
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gsettings-desktop-schemas-0.1.0
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-DOC_CONTENTS="${P} saves screenshots in ~/Pictures/ and defaults to
-	non-interactive mode when launched from a terminal. If you want to choose
-	where to save the screenshot, run 'gnome-screenshot --interactive'"
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/gnuclad/Manifest b/media-gfx/gnuclad/Manifest
index 66452d55a8be..f65b0c633738 100644
--- a/media-gfx/gnuclad/Manifest
+++ b/media-gfx/gnuclad/Manifest
@@ -1,4 +1,4 @@
 AUX gnuclad-0.2.4-werror.patch 391 BLAKE2B 976bcc89bf56580acf13de66f1b540f06be7b0b6176c23cb9ff18bb3549737a417c26754286ec18593ba5c12e2d2ae87f4b02d08a94c7ee802bac2caa7b1914f SHA512 fc3680bec6a41d5f6b948d59990916add09654fca38e2193e34174838a24a439d9d8123f15dc2b2aa30a1cbc763bdc2025e1bfcdf3b1a1a112b6f8d8d5454b26
 DIST gnuclad-0.2.4.tar.gz 287763 BLAKE2B e70a16b6e2d032cfc0d79b7ec68386e1e70c98d4c30cd046157d4bac42fd9f91ad56fe18bc78a2380055ff952227572016381a5a6bbb88a74f6eb9e187d5d39e SHA512 881b1feab8cb7458223987c5a36359e31e7e00e94d60cd0002c289930b99236947aadbea40f96aaa6aa4b5d7953278bf581edbd6df3cb660bca1505950e66b67
-EBUILD gnuclad-0.2.4.ebuild 595 BLAKE2B 7e79cb7d7ba1d948237c2b07539d4e349bff90ccf16280b9fd9e1085a24b0ca09333f6415bd72f5ef4037172a56373d348472210ee8b337a9e77505dab10d63a SHA512 31421ec8edcaea0289e0f75f42b4d3a25ea5b59b854b2ee2d07728d16a5fe74daa00efed1f6bcfdf4b7baa2b13481f55f8f2bb699cf85557575f3b4867bb2702
+EBUILD gnuclad-0.2.4.ebuild 594 BLAKE2B ec2072f392436c07d1f2cca4c8aeb4aa8c61d5f62c9426d95d21df35fc3ad78c3250a782240607007af071d248fe5ba3b6d9e78876ed72e5cb07b01c7b355db1 SHA512 080ffef8684b3147e9977bcd0a192515cca30b9779b9d0bd4f7893caf7c14f2ef2510d1f01c2f62c7cb14d72ce7a8fef2e1f074e06db883f830a339d0a6badab
 MISC metadata.xml 339 BLAKE2B 289743dbfe86bb16fbf2b479b1c5c2767b99019f2f43da5d0ceae35cb561dc33fabb728ceb4d709ab8965a1f6b0b51fe63c5dacc68166e8fab41b3b89a458af0 SHA512 a7b03367e25abd644a51dd72a7d21f3cfd571662233afc1094434373865ed01e2865b16f7e02f313448be372306be2ec842ea03e5015d68657b2c926fa365628
diff --git a/media-gfx/gnuclad/gnuclad-0.2.4.ebuild b/media-gfx/gnuclad/gnuclad-0.2.4.ebuild
index 9d9826b28d99..198306e40753 100644
--- a/media-gfx/gnuclad/gnuclad-0.2.4.ebuild
+++ b/media-gfx/gnuclad/gnuclad-0.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://launchpad.net/gnuclad/trunk/0.2/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="examples"
 
 DEPEND=""
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 57d188d9892f..1d1d66e8d752 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -1,6 +1,4 @@
 AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3bcaf0af3e6b29a0269581390f64950e42e41280e482fc9cfda9bfe24ef166eb6c24d21377a15fca4264fec69d902d8ba18810bdb01 SHA512 26ab6dda13d758a5e4237c8b5d207d3c5111afbb11b2c3984cd742913c3c7932559b23b5ea9f774f1c6373eb0f761a9400dccc95876740b3cd06c44084a10965
-DIST graphite2-1.3.10.tgz 3889647 BLAKE2B c6db80950ed5f81d5ecf77003e23e6545c2824948bdc04aa3111747c0eb1ef074b09fe4c3ec20b68b00f75958ea39c5945a7fbe2fecde55ff32d22e517c91156 SHA512 d6d578feaa2d9304dc9bcd3926958070b8c23b27437a9fcb801e08e62f33a5549b7a6aa9636c7f8eb80a2a2c6d5cac97d58050fb30fd102b9fd0f8c558f4252b
 DIST graphite2-1.3.13.tgz 6664757 BLAKE2B 3faad44f7ba5e0729f722fd4589c5f6a4c53cffc2bb93615c8220d03c759dedf05924b1f56cafcf1c28e0a4b50fba0d319da30572fffde4baab6bc240528a0d3 SHA512 44ac2f353c1a795a55c78b4ff72df35a3a5a94700356c0eefe105d66cd499ac93f9cfd5ab7b3ea842b575156cb8df19e0b57ff8b9dbaee8a576319ff5889c131
-EBUILD graphite2-1.3.10.ebuild 2501 BLAKE2B 636ff39993801a16ba340cb932da05c3c8837f8fa5df259eaaa7d41525a1e9e46499c2e067f746d43d2f573924a455031f90c993e1f79ed5da661f606b811afe SHA512 8de1cde1422d657a472c584802384a8d1cc7bd44f74078921c684c4b6b36cba5d14527bf6d61810e8adbe107080e5c21e76c8254f5efa119fce17c02092163b1
-EBUILD graphite2-1.3.13.ebuild 2670 BLAKE2B e51fbf26d3c4e8f367811eed90251cfb22d7d4e0a686d681f3d32cd71693fd10c27801aaa8ec61c2147adaa52bd42c341251aad5c614af04cc708469e2139c3f SHA512 d53d7ea6700e365b24263f7358e39f8e9943fa35b052048843b9610cc1a730e92fc76ceebdf5eb9cb47d9fce0e729d6f34220355515d386867daf78dc58fc54f
+EBUILD graphite2-1.3.13.ebuild 2663 BLAKE2B aec1ec8ebcff5ed41a50fa62bf1754297c544df79ec28a0ddc45233ea614f4d9050c4d13f9499bf1fcff8249b0d139c640b6471d4fc047bbe01affb6cb7c9277 SHA512 09cee62a4b873f485b6b473c01ee482ebfa7541129da656929a251dbde58135936c671aa16b02f87c81b6e8aad2aad21e1a58aafe12fcfaf60b6210c47750f0d
 MISC metadata.xml 336 BLAKE2B 7069f4f7bb9ecd39581528f3f6b072d2ebf2c32b24224b9ca5b69b138490e764b740768334954f5cfc25819cab55a50fbd0933dc77fb3397886aacfd105f0853 SHA512 ac8ae39ab005c1562818a97b64bfef48ab64e2a1993aa3eef4ee4b3066b32d9211787df1273e20cb767839e42364ed72b3e99c51bb65f0c88937564d5dbb5380
diff --git a/media-gfx/graphite2/graphite2-1.3.10.ebuild b/media-gfx/graphite2/graphite2-1.3.10.ebuild
deleted file mode 100644
index 54c11d8e1d90..000000000000
--- a/media-gfx/graphite2/graphite2-1.3.10.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-GENTOO_DEPEND_ON_PERL="no"
-inherit eutils perl-module python-any-r1 cmake-multilib
-
-DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems"
-HOMEPAGE="http://graphite.sil.org/"
-SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="perl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	perl? ( dev-lang/perl:= )
-"
-DEPEND="${RDEPEND}
-	perl? (
-		dev-perl/Module-Build
-		dev-perl/Locale-Maketext-Lexicon
-		)
-	test? (
-		dev-libs/glib:2
-		media-libs/fontconfig
-		$(python_gen_any_dep '
-			dev-python/fonttools[${PYTHON_USEDEP}]
-		')
-		${PYTHON_DEPS}
-		perl? ( virtual/perl-Test-Simple )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.5-includes-libs-perl.patch"
-)
-
-pkg_setup() {
-	use perl && perl_set_version
-	use test && python-any-r1_pkg_setup
-}
-
-python_check_deps() {
-	has_version "dev-python/fonttools[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# make tests optional
-	if ! use test; then
-		sed -i \
-			-e '/tests/d' \
-			CMakeLists.txt || die
-	fi
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"-DVM_MACHINE_TYPE=direct"
-		# https://sourceforge.net/p/silgraphite/bugs/49/
-		$([[ ${CHOST} == powerpc*-apple* ]] && \
-			echo "-DGRAPHITE2_NSEGCACHE:BOOL=ON")
-	)
-
-	cmake-utils_src_configure
-
-	# fix perl linking
-	if multilib_is_native_abi && use perl; then
-		# we rely on the fact that cmake-utils_src_configure sets BUILD_DIR
-		sed -i \
-			-e "s:@BUILD_DIR@:\"${BUILD_DIR}/src\":" \
-			"${S}"/contrib/perl/Build.PL || die
-	fi
-}
-
-src_compile() {
-	cmake-multilib_src_compile
-	if use perl; then
-		cd contrib/perl || die
-		perl-module_src_configure
-		perl-module_src_compile
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		cmake-utils_src_test
-	else
-		einfo Cannot test since python is not multilib.
-	fi
-}
-
-src_test() {
-	cmake-multilib_src_test
-	if use perl; then
-		# Perl tests fail due to missing POD coverage...
-		perl_rm_files "contrib/perl/t/pod.t" "contrib/perl/t/pod-coverage.t"
-		cd contrib/perl || die
-		perl-module_src_test
-	fi
-}
-
-src_install() {
-	cmake-multilib_src_install
-	if use perl; then
-		cd contrib/perl || die
-		perl-module_src_install
-		perl_delete_localpod
-	fi
-
-	prune_libtool_files --all
-}
diff --git a/media-gfx/graphite2/graphite2-1.3.13.ebuild b/media-gfx/graphite2/graphite2-1.3.13.ebuild
index cc89c7d3d94c..a297b8ce652c 100644
--- a/media-gfx/graphite2/graphite2-1.3.13.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.13.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
 
+CMAKE_ECLASS=cmake
 GENTOO_DEPEND_ON_PERL="no"
 inherit perl-module python-any-r1 cmake-multilib
 
@@ -14,7 +15,7 @@ SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="perl test"
 RESTRICT="!test? ( test )"
 
@@ -47,7 +48,7 @@ python_check_deps() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# make tests optional
 	if ! use test; then
@@ -65,11 +66,11 @@ multilib_src_configure() {
 		-DGRAPHITE2_NSEGCACHE:BOOL=ON
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 
 	# fix perl linking
 	if multilib_is_native_abi && use perl; then
-		# we rely on the fact that cmake-utils_src_configure sets BUILD_DIR
+		# we rely on the fact that cmake_src_configure sets BUILD_DIR
 		sed -e "s:@BUILD_DIR@:\"${BUILD_DIR}/src\":" \
 			-i "${S}"/contrib/perl/Build.PL || die
 	fi
@@ -86,7 +87,7 @@ src_compile() {
 
 multilib_src_test() {
 	if multilib_is_native_abi; then
-		cmake-utils_src_test
+		cmake_src_test
 	else
 		einfo "Cannot test since python is not multilib."
 	fi
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 12dacc76d7e1..f0c8a3eb1bd7 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,8 +1,4 @@
 AUX graphviz-2.34.0-Xaw-configure.patch 2445 BLAKE2B fc1b3820fd72821ac431f5d93d0b4b0c8f596ca9d2c2f516961f5baab9fd54ba870df75434d2ed59fd9034bb7e2ce38c00faef9c12a79c7ec4da2d5e416d7117 SHA512 473d2ed9070329512cbc26929267b25fb8d7726e21ed01d2921d4d8ac13b8ffaf166f07229fa7409192cfa14fabb0cf68b299bb3331b3cc953ae5363274fd15c
-AUX graphviz-2.42.1-libgv_python.patch 621 BLAKE2B fa1d3e0f37870c46d8e6266ac812691f2f2bc8a0cdfaa6e4183da2f46714f8621d14578cc8f4dbf7a96e276f272822dd447d61145133d5d47a9c6ae686e24439 SHA512 637c344698cbfd7f698f5615fd04644bb5b704761dccaf9abd4fa98b9b60e1572cd3f2b8af4ae46ce3aa7b57cd1a633b781d1642d4ee0c97c5812f38719f8a37
-AUX graphviz-2.42.1-math.patch 843 BLAKE2B 3ceeeec968dd45478f4bb07d819cb5a4b5a215c36728dd9212db9a81841ad4ffcc1c02a56b850fb9cfde0de3689eb595eb1f73feb97c11e77d0fdfea5e708127 SHA512 17494f6795b4ed8cdef8652089132243808acd76fe970a6297cb93907cd15ad91460dbffd5ab3251d8c84a4e0ca0ec4cc96268682ef93f4b5f6b1dc88bb0b64d
-DIST graphviz-2.42.1.tar.gz 25543401 BLAKE2B e64044923a823f6fbe91b498b04fffe3e5b6803c55c5ce29a60b16a38d97260061b013e8bd13bc99f360d035c840f18a01301b29ca1cb73c4be87843f18c45fc SHA512 ac263df086eea6faf682f493756b79a0af8bae3f515cd8c09238e89f295226baf743a3fd22d977ef6f223388769ef11241dfb2fdb6087305ce4fdd3fa8ed2f78
 DIST graphviz-2.42.3.tar.gz 26246717 BLAKE2B 71c61dcd056c9a2e2655c3be995d1da17b3af0d3374e74400fc38da11ab81849f7b5e528f99fc2046294958a4bab0a411ab204e434360f316a5367403472e8a1 SHA512 e03ca6da0ddb1162bd179d159d7dbb379d55012d63bb922aa800260fce52b65beb1a9b5ca1a5199ad3537201b0b4841efc9facee6e03065c6bd02e840f8a29c9
-EBUILD graphviz-2.42.1-r1.ebuild 7935 BLAKE2B 1ac923f722297c1c12e5a8c38ced5b5568c76267be5be645503f64cc3977d1b352083edbeda259a05aad67ace7268906e55d3103c4aa456b27d6ce2cc66c9acb SHA512 7b122f160d5e886a4bd9a5844040eff974d5f86774fabd6938cebe85f01a40f49799fc64ba2708b7d8f8885a2efd506a9e6d401908d5ac970fc2ebc2ade46cb3
-EBUILD graphviz-2.42.3.ebuild 7823 BLAKE2B b10b894caa51995e558f5c28c3d247ba54055d9c82133f57a4d708d84255bcb7b212c71a712a29f1c732fed7506c8cbef0d21ef55b73ca36b419a72f6ffccd21 SHA512 8652c04572d91396521bad94323d72433a4a7a82d6f0084f2efd937517d76e7e735b9050abb03344dc8f319940fdfc29f5f1b6160400c3902fd09e989bdb1107
+EBUILD graphviz-2.42.3.ebuild 7810 BLAKE2B fbd88ab7469d3c742d6683109f4dbe899cac7a40dc696d003f412b26eb3bea617abe7e32ebf8ef34d8278c6954a91143cc3fc823ca8d7c91a8ab59498eb4bdf4 SHA512 ba906c822d7b6cdd7826805a9d49fc27d032055c8923892e2d1a9f7f8223ee07170fd95f1c6e10506909c0a33bcba8e58938d6ba5f666ab2fa220ee1b587d549
 MISC metadata.xml 2211 BLAKE2B 1c39235c1d8c2efce0596cda2d20bf1cf2e81643068f68215f31462b6320f7f31533877630aa3c2b2bc9a7f7856f7b27354a97bb2c61d7e63a6de86f569ed192 SHA512 f7689fe65e46905d48fb2e45c3ad2a1e8f4fcb572515fdd7dfa26cdd21ed1eaf52d8ecaab9c297f5e8df69a205337b8526e0304ddbdb8c4b3e82cb1e428a1e71
diff --git a/media-gfx/graphviz/files/graphviz-2.42.1-libgv_python.patch b/media-gfx/graphviz/files/graphviz-2.42.1-libgv_python.patch
deleted file mode 100644
index 426ebbe14a3d..000000000000
--- a/media-gfx/graphviz/files/graphviz-2.42.1-libgv_python.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/tclpkg/gv/Makefile.am
-+++ b/tclpkg/gv/Makefile.am
-@@ -430,10 +430,10 @@
- 	(cd $(DESTDIR)$(pkgpythondir); rm -f _gv.so; $(LN_S) libgv_python.so _gv.so;)
- endif
- if WITH_PYTHON2
--	(cd $(DESTDIR)$(pkgpython2dir); rm -f _gv.so; $(LN_S) libgv_python.so _gv.so;)
-+	(cd $(DESTDIR)$(pkgpython2dir); rm -f _gv.so; $(LN_S) libgv_python2.so _gv.so;)
- endif
- if WITH_PYTHON3
--	(cd $(DESTDIR)$(pkgpython3dir); rm -f _gv.so; $(LN_S) libgv_python.so _gv.so;)
-+	(cd $(DESTDIR)$(pkgpython3dir); rm -f _gv.so; $(LN_S) libgv_python3.so _gv.so;)
- endif
- if WITH_R
- 	(cd $(DESTDIR)$(pkgRdir);   rm -f gv.so;  $(LN_S) libgv_R.so gv.so;)
diff --git a/media-gfx/graphviz/files/graphviz-2.42.1-math.patch b/media-gfx/graphviz/files/graphviz-2.42.1-math.patch
deleted file mode 100644
index 59b84817a99b..000000000000
--- a/media-gfx/graphviz/files/graphviz-2.42.1-math.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/lib/sfio/sfdlen.c b/lib/sfio/sfdlen.c
-index 2b4f8b0a3..3b2c75066 100644
---- a/lib/sfio/sfdlen.c
-+++ b/lib/sfio/sfdlen.c
-@@ -13,6 +13,8 @@
- 
- #include	"sfhdr.h"
- 
-+#include <math.h>
-+
- /*	Return the length of a double value if coded in a portable format
- **
- **	Written by Kiem-Phong Vo
-diff --git a/lib/sfio/sfgetd.c b/lib/sfio/sfgetd.c
-index 535b2cb9a..607681e60 100644
---- a/lib/sfio/sfgetd.c
-+++ b/lib/sfio/sfgetd.c
-@@ -13,6 +13,8 @@
- 
- #include	"sfhdr.h"
- 
-+#include <math.h>
-+
- /*	Read a portably coded double value
- **
- **	Written by Kiem-Phong Vo
-diff --git a/lib/sfio/sfputd.c b/lib/sfio/sfputd.c
-index 64ab9eaf3..a2dbd225c 100644
---- a/lib/sfio/sfputd.c
-+++ b/lib/sfio/sfputd.c
-@@ -14,6 +14,7 @@
- #include	"sfhdr.h"
- 
- #include <float.h>
-+#include <math.h>
- 
- /*	Write out a floating point value in a portable format
- **
diff --git a/media-gfx/graphviz/graphviz-2.42.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.42.1-r1.ebuild
deleted file mode 100644
index 4dac9f5771e0..000000000000
--- a/media-gfx/graphviz/graphviz-2.42.1-r1.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils
-
-DESCRIPTION="Open Source Graph Visualization Software"
-HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/"
-SRC_URI="https://www2.graphviz.org/Packages/stable/portable_source/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD"
-
-REQUIRED_USE="
-	!cairo? ( !X !gtk !postscript !lasi )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Requires ksh, tests against installed package, missing files and directory
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=dev-libs/expat-2
-	>=dev-libs/glib-2.11.1:2
-	dev-libs/libltdl:0
-	>=media-libs/fontconfig-2.3.95
-	>=media-libs/freetype-2.1.10
-	>=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib]
-	>=media-libs/libpng-1.2:0=
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/libiconv
-	cairo?	(
-		>=x11-libs/cairo-1.1.10[svg]
-		>=x11-libs/pango-1.12
-	)
-	devil?	( media-libs/devil[png,jpeg] )
-	gtk?	( x11-libs/gtk+:2 )
-	gts?	( sci-libs/gts )
-	lasi?	( media-libs/lasi )
-	pdf?	( app-text/poppler )
-	perl?	( dev-lang/perl:= )
-	postscript? ( app-text/ghostscript-gpl )
-	python?	( ${PYTHON_DEPS} )
-	qt5?	(
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-	)
-	ruby?	( dev-lang/ruby:* )
-	svg?	( gnome-base/librsvg )
-	tcl?	( >=dev-lang/tcl-8.3:0= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXaw
-		x11-libs/libXmu
-		x11-libs/libXpm
-		x11-libs/libXt
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	sys-devel/libtool
-	virtual/pkgconfig
-	guile?	( dev-lang/swig dev-scheme/guile )
-	java?	( dev-lang/swig >=virtual/jdk-1.5 )
-	nls?	( >=sys-devel/gettext-0.14.5 )
-	perl?	( dev-lang/swig )
-	python?	( dev-lang/swig )
-	ruby?	( dev-lang/swig )
-	tcl?	( dev-lang/swig )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<=sci-chemistry/cluster-1.3.081231
-"
-
-# Dependency description / Maintainer-Info:
-
-# Rendering is done via the following plugins (/plugins):
-# - core, dot_layout, neato_layout, gd , dot
-#   the ones which are always compiled in, depend on zlib, gd
-# - gtk
-#   Directly depends on gtk-2.
-#   needs 'pangocairo' enabled in graphviz configuration
-#   gtk-2 depends on pango, cairo and libX11 directly.
-# - gdk-pixbuf
-#   Disabled, GTK-1 junk.
-# - glitz
-#   Disabled, no particular reason
-#   needs 'pangocairo' enabled in graphviz configuration
-# - ming
-#   flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
-#   incomplete.
-# - cairo/pango:
-#   Needs pango for text layout, uses cairo methods to draw stuff
-# - xlib:
-#   needs cairo+pango,
-#   can make use of gnomeui and inotify support (??? unsure),
-#   needs libXaw for UI
-#   UI also links directly against libX11, libXmu, and libXt
-#   and uses libXpm if available so we make sure it always is
-
-# There can be swig-generated bindings for the following languages (/tclpkg/gv):
-# - c-sharp (disabled)
-# - scheme (enabled via guile) ... no longer broken on ~x86
-# - go (disabled)
-# - io (disabled)
-# - java (enabled via java) *2
-# - lua (enabled via lua)
-# - ocaml (enabled via ocaml)
-# - perl (enabled via perl) *1
-# - php (enabled via php) *2
-# - python (enabled via python) *1
-# - ruby (enabled via ruby) *1
-# - tcl (enabled via tcl)
-# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
-# *2 = Those bindings don't build because the paths for the headers/libs aren't
-#      detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
-
-# There are several other tools in /tclpkg:
-# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
-# tkspline, tkstubs ; enabled with: --with-tk
-
-# And the commands (/cmd):
-# - dot, dotty, gvedit, gvpr, lefty, lneato, smyrna, tools/* :)
-#   sci-libs/gts can be used for some of these
-# - lefty:
-#   needs Xaw and X to build
-# - gvedit (via 'qt5'):
-#   based on ./configure it needs qt-core and qt-gui only
-# - smyrna : experimental opengl front-end (via 'smyrna')
-#   currently disabled -- it segfaults a lot
-#   needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
-#   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
-	"${FILESDIR}"/${P}-libgv_python.patch
-	"${FILESDIR}"/${P}-math.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# ToDo: Do the same thing for examples and/or
-	#       write a patch for a configuration-option
-	#       and send it to upstream
-	# note - the longer sed expression removes multi-line assignments that are extended via '\'
-	if ! use doc ; then
-		find . -iname Makefile.am \
-			| xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \
-				-e '/^\(html\|pdf\)_DATA/d' || die
-	fi
-
-	# This is an old version of libtool
-	# use the ./configure option to exclude its use, and
-	# delete the dir since we don't need to eautoreconf it
-	rm -r libltdl || die
-
-	# Nuke the dead symlinks for the bindings
-	sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die
-
-	# replace the whitespace with tabs
-	sed -i -e 's:  :\t:g' doc/info/Makefile.am || die
-
-	# use correct version of qmake. bug #567236
-	sed -i -e "/AC_CHECK_PROGS(QMAKE/a AC_SUBST(QMAKE,$(qt5_get_bindir)/qmake)" configure.ac || die
-
-	# workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
-	use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
-
-	use java && append-cppflags $(java-pkg_get-jni-cflags)
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--enable-ltdl
-		$(use_with cairo pangocairo)
-		$(use_with devil)
-		$(use_enable gdk-pixbuf)
-		$(use_with gtk)
-		$(use_with gts)
-		$(use_with qt5 qt)
-		$(use_with lasi)
-		$(use_with pdf poppler)
-		$(use_with postscript ghostscript)
-		$(use_enable static-libs static)
-		$(use_with svg rsvg)
-		$(use_with X x)
-		$(use_with X xaw)
-		$(use_with X lefty)
-		--with-digcola
-		--with-fontconfig
-		--with-freetype2
-		--with-ipsepcola
-		--with-libgd
-		--with-sfdp
-		--without-ming
-		# new/experimental features, to be tested, disable for now
-		--with-cgraph
-		--without-glitz
-		--without-ipsepcola
-		--without-smyrna
-		--without-visio
-		# Bindings:
-		$(use_enable guile)
-		$(use_enable java)
-		$(use_enable perl)
-		$(use_enable python python2)
-		$(use_enable python python3)
-		$(use_enable ruby)
-		$(use_enable tcl)
-		--disable-go
-		--disable-io
-		--disable-lua
-		--disable-ocaml
-		--disable-php
-		--disable-python
-		--disable-r
-		--disable-sharp
-		# libtool file collision, bug #276609
-		--without-included-ltdl
-		--disable-ltdl-install
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
-
-	emake DESTDIR="${D}" \
-		txtdir="${EPREFIX}"/usr/share/doc/${PF} \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \
-		pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
-		pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
-		install
-
-	if ! use examples; then
-		rm -rf "${ED}"/usr/share/graphviz/demo || die
-	fi
-
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	einstalldocs
-
-	use python && python_optimize \
-		"${D}$(python_get_sitedir)" \
-		"${D}/usr/$(get_libdir)/graphviz/python2" \
-		"${D}/usr/$(get_libdir)/graphviz/python3"
-}
-
-pkg_postinst() {
-	# This actually works if --enable-ltdl is passed
-	# to configure
-	dot -c || die
-}
-
-pkg_postrm() {
-	# Remove cruft, bug #547344
-	rm -rf "${EROOT}"usr/$(get_libdir)/graphviz/config{,6} || die
-}
diff --git a/media-gfx/graphviz/graphviz-2.42.3.ebuild b/media-gfx/graphviz/graphviz-2.42.3.ebuild
index 67b51ca4f754..b833f8b72908 100644
--- a/media-gfx/graphviz/graphviz-2.42.3.ebuild
+++ b/media-gfx/graphviz/graphviz-2.42.3.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
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils
 
 DESCRIPTION="Open Source Graph Visualization Software"
@@ -12,7 +12,7 @@ SRC_URI="https://www2.graphviz.org/Packages/stable/portable_source/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD"
 
 REQUIRED_USE="
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index 9bccbe3ed0d4..9619dc8be0be 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -1,7 +1,7 @@
 DIST gscan2pdf-1.8.11.tar.xz 409212 BLAKE2B 37cb716f13818eaffc39c210b810b845368cc5e323569e8f9d5603b5b412c4182520798321358e4c21339fdbd5f15026a0acd6421a49e7db79ecca86633c3ab0 SHA512 1ea09b8768771be4a1700cb8a6523d5f74fcbf0ebe459d97796032b56f896fd0c50e5ca1ed4c96aedef7e61f6952a92986153cc70173dd5ad91ccfb72461c565
-DIST gscan2pdf-2.6.1.tar.xz 457976 BLAKE2B ae7fb7164c1270ff049dde87eb3bc7bc54f4c7d67a12a36f3b22831f6b77117645d5491c41f97879c428ce28d48271be8aee93e1ac96e3c3d9c064a7963abaaa SHA512 694f1d24b96a60960084e3963073e39fcd01461e9e5f2dc2e71d6821f0a3985dc04810c0404b5a21cb11aaa4adbf5747a3c942d07d259bb9028f078f3147cc85
 DIST gscan2pdf-2.6.2.tar.xz 458920 BLAKE2B e8c54654c10adae7d66844e3814025f8c934df935c315e48b6a2a34810b06b47d22208af22da04d872b2ac9737f5f5cba72d42fb2de92f1fa8110dbe64ba71ba SHA512 7b0bba012eab6edcaede2a2163935947ab9c71b21abb4cde8456f958537f84435a274a0ae6fb3827afd835f376d462ab5402e772307034936ec2b24889ecaec2
+DIST gscan2pdf-2.6.3.tar.xz 459276 BLAKE2B 395260a2034e9ac782c4c6104af5dc24561d271b45a359762cef990fce9f8343c6dc3c863ad66fc0ba56991df20945384edb695e3d94fa5fcc58c78ad039d380 SHA512 77478e7d35a90fd737a28f302bac214d3946cd5f0ce93f8d22b3485a6d1150ff2834433d028487fea4433a36a532714b4f47e8fbba3307c178fc161a0adbdbb0
 EBUILD gscan2pdf-1.8.11.ebuild 1731 BLAKE2B 0b0f7cdfef98e666e20e44882584e0636e490429186e441d87f965e74071f5076693896e17e68184319dfaf3a1fd4487140209ef3b49603c9496cc936516333d SHA512 b94b73d3396208a8c67c2aad407815329501717c364d60189b21d96f652846e554d59a2a36f4b58383d7f49ab728d4fe251bce9ab1944befb667a9e0c09237b3
-EBUILD gscan2pdf-2.6.1.ebuild 2318 BLAKE2B cb72ecd97b6eec1ca9b2a0be67aa0a9cbf20c1367791b65b57d22f3568d4632e5ef1285cb72d8cc30e5a2e438d4134cdd16cf9ce65f47bca0a0f0d1e34e9c6d0 SHA512 1a80ea580d566d981c28fb9f2fba632a964b01be736b9a68cf253ec96781f98bc0e11f5555018d50bbb65023f51bebf5c33b350bae5bf3974e4d007fc344871a
 EBUILD gscan2pdf-2.6.2.ebuild 2318 BLAKE2B cb72ecd97b6eec1ca9b2a0be67aa0a9cbf20c1367791b65b57d22f3568d4632e5ef1285cb72d8cc30e5a2e438d4134cdd16cf9ce65f47bca0a0f0d1e34e9c6d0 SHA512 1a80ea580d566d981c28fb9f2fba632a964b01be736b9a68cf253ec96781f98bc0e11f5555018d50bbb65023f51bebf5c33b350bae5bf3974e4d007fc344871a
+EBUILD gscan2pdf-2.6.3.ebuild 2318 BLAKE2B f0b8c7ddcfd7fb1033b4214b3cf49ebf440e50c517ae212c24ce5b9ac055526d356e09ce3dc5df0dd1f7745bc80e7791e1a9ec8f13d188c9be08fcd0e98239d8 SHA512 404b6aceff7b758f2f6ae45c8187564e242f3d24e69db2012c155e4bf17a18a95202c9a3f1f3fc1aa5bff04bb6b0a27701cbb3e636e9a37d98d03f5a90092904
 MISC metadata.xml 439 BLAKE2B 835480b0d68a079941e94f2646d0136dfb8a8e750e0279f8a5a2e23e6690242582ffe660798f5e80ebfb4378a576aa5715332b53230555866391a99ec28f54ff SHA512 af1cc05ac693899586df81036d2fa11af187edbb3c9449862298ba05efd0dbd0c4c5b008a1a21328c1f9a27a690671bd7a9967d2e457efb31561044e45984401
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.6.1.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.6.3.ebuild
index 2c4c4ca4eca1..0029080be8df 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.6.1.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 9e2ac510cfb6..84b0349e45bb 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,5 +1,7 @@
 AUX hugin-2019.0.0-exiv2-0.27.1.patch 998 BLAKE2B fd072b1bfb995f3e63ca78b0ad288c6012e6256d8c268fde7b9d3e1fb346544d34807394ac45b244329d96d6e75347c7e06b8cffa44258dd9b59378f56ead112 SHA512 9127921810b9a3cbc7aa216cb961cf5d8eef04ab5beb6baef94851d25e32314dd0565e507e3e57d2d560b6079afcf54e16330935334835fe664842d337732643
 DIST hugin-2019.0.0.tar.bz2 10297887 BLAKE2B 59c4df340f01dc7fa72c08b575fe2449ac40b96ac2e925aaef0d7804df54db25df7b5901cb25a5da4d8e78c93c668081d535517c275cd1ccb40f5159e1c725e5 SHA512 49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5
-EBUILD hugin-2019.0.0.ebuild 2217 BLAKE2B 3a6bf11afcb1d5a70d48facc30faf58e86e6383389fc6066060b82cf27aa9f16f972ea9ec84021ec9bb2163b9f1b3978b4d8df7c376e4c4214b18d8498544180 SHA512 b595aa2b5912850ad5a779ee83465d313c25cf86b9393e7f322bbd728efb89e31c62acf6626826b4a6e4f262864030fefd777f6c6a106fb7eb116b946448c07a
-EBUILD hugin-9999.ebuild 2066 BLAKE2B e4f553556bdc38e2b64851510634e565833ee6f2a1e23cfcaa64a2b980249e4caf0daa9834b788e008377fdd289238498c04ffaecdeb6ca473b14a4eb225597a SHA512 d3f9f892292f6596c690a7cbb804fdb30abd800da6c924ea28ae601e3b98dae1d942aa41612570dc3fc4f5e0b65b48bd2bf133e698b3f356c9c57faf3f6fc30a
+DIST hugin-2019.2.0.tar.bz2 10335030 BLAKE2B 4fbcb974eea01dbd8d722f64b5cadfd1b3fe101e5e7849d069c531e55e1ea71c226bcb1550b59374bbe8adf111b7c0bc5e48c14f45bdb685486cbeccde5add70 SHA512 2ddfe7468a474c385ef66a88c3a5a2491183765ae431e5044f504d2e95ec3cb99c0b97b98dda282ba7950f6f2001f46b2f2ea39b9025718c2a329dea967685c1
+EBUILD hugin-2019.0.0.ebuild 2213 BLAKE2B b9a6ceedc6b49b493205f5f16ced5ccdc890f6d2f44c0e846a70a09857f5b4ab62b7d64e668f4114d22f3af7d5168cacdbfb95347ff1514b1f0cb64f6b3056f7 SHA512 4b8f7f1107245768e7de1b5ac7a18e65af3a2ec931eafcb525b92374b40894e124bbd6561651e21595a2a1b2f8996e5e3282591fadaef1efc7671afbe64302cc
+EBUILD hugin-2019.2.0.ebuild 2188 BLAKE2B 3a8957b1f5c620503b18ad71475e67b01540e9893a9b3d904ba1656f519dc7efca50cce5c8b986909caa86591d91fbe4c0297b4a0b5ccf9fc23400e454d07862 SHA512 7662be470548fdb35376af51088442751bed2f55a612b40df0eb9dfd93a0dfcd62cf6194bc7641c543bb776d87c8ed517d6a299b2031f01ade06d5a31c2af13c
+EBUILD hugin-9999.ebuild 2062 BLAKE2B b1b80024aa6ff9133550bc152ebd32232bc9afe5cd0d12363b212d46aea9a7c2b93596753840296702819c5b96d01f53309a6140bf5471a18134cb551bdd6e34 SHA512 fe3f6b2d0a2cbc47737718c59c109530a8b9e764da22982cbcf1c0e4b3f35c6d2a84e66098faf677aa47805a0efc9af92c81db6f21c7cd7fb3fb0e43353f55f4
 MISC metadata.xml 519 BLAKE2B bd02923a26374e3bd638778ce8100efc4694ab6bec54fd8c8cbd32d0b8c3d495fc965194692ebaf2fe909e495011978d7bb8f3c995037fc128cfd9626949549c SHA512 d4e0bfb870b5b6e5769be2c28983d914666e413333887ac7a7cdb868d2f45f6b284a99204f6e97b98e65958412c04291f6fbc21deed8de518d3ff64aae6ad01b
diff --git a/media-gfx/hugin/hugin-2019.0.0.ebuild b/media-gfx/hugin/hugin-2019.0.0.ebuild
index a07dfba592b1..f5dd754fb2f4 100644
--- a/media-gfx/hugin/hugin-2019.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2019.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
 
 inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
 
diff --git a/media-gfx/hugin/hugin-2019.2.0.ebuild b/media-gfx/hugin/hugin-2019.2.0.ebuild
new file mode 100644
index 000000000000..d78bbbd573ac
--- /dev/null
+++ b/media-gfx/hugin/hugin-2019.2.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="GUI for the creation & processing of panoramic images"
+HOMEPAGE="http://hugin.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW"
+IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
+
+CDEPEND="
+	!!dev-util/cocom
+	dev-db/sqlite:3
+	dev-libs/boost:=
+	dev-libs/zthread
+	>=media-gfx/enblend-4.0
+	media-gfx/exiv2:=
+	media-libs/freeglut
+	media-libs/glew:=
+	>=media-libs/libpano13-2.9.19_beta1:0=
+	media-libs/libpng:0=
+	media-libs/openexr:=
+	media-libs/tiff:0
+	>=media-libs/vigra-1.11.0[openexr]
+	sci-libs/fftw:3.0=
+	sci-libs/flann
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/wxGTK:3.0=[X,opengl]
+	lapack? ( virtual/blas virtual/lapack )
+	python? ( ${PYTHON_DEPS} )
+	sift? ( media-gfx/autopano-sift-C )"
+RDEPEND="${CDEPEND}
+	media-libs/exiftool
+	raw? ( media-gfx/dcraw )"
+DEPEND="${CDEPEND}
+	dev-cpp/tclap
+	sys-devel/gettext
+	virtual/pkgconfig
+	python? ( >=dev-lang/swig-2.0.4 )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DOCS=( authors.txt README TODO )
+
+S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	setup-wxwidgets
+}
+
+src_prepare() {
+	sed -i \
+		-e "/COMMAND.*GZIP/d" \
+		-e "s/\.gz//g" \
+		"${S}"/doc/CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_HSI=$(usex python)
+		-DENABLE_LAPACK=$(usex lapack)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	use python && python_optimize
+
+	local lang
+	for lang in ${LANGS} ; do
+		case ${lang} in
+			ca) dir=ca_ES;;
+			ca-valencia) dir=ca_ES@valencia;;
+			cs) dir=cs_CZ;;
+			*) dir=${lang/-/_};;
+		esac
+		if ! use l10n_${lang} ; then
+			rm -r "${ED%/}"/usr/share/locale/${dir} || die
+		fi
+	done
+}
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index 50b288d329c4..448faaebbc26 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
 
 inherit mercurial python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
 
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 557769e18020..aaf4b97be67f 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,8 +1,12 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST imagemagick-6.9.10.78.tar.gz 13522518 BLAKE2B 1eab0f7bc6bbecc44b3f25a752ae2b6ad8f026fe700c78d0b914aa23e5737485c8c41785859035002e1dbd16e7d19af823ea71425cb56f732fbee08419212d7d SHA512 8ab6c91afcf2b8c1bd0a4f130d35abae914599ddf7e0c85d6bf57ace8822cdf1cc57929e047350b06532546827856420a484fc9754ae403684db9df04d0f66a9
-DIST imagemagick-7.0.9.8.tar.gz 13678831 BLAKE2B 3e5189fa244577fdc7d9e674ef0b2385a67dbfc4a0c80fac66a7224b31805925c97fe1955b8386e6d622dd64ffed1cc888657ba5f885d66fb0e8df32703b4ce8 SHA512 3797978e6da49bd6129a437110d9b2b15e1963178c5c62fd228e68295645b469f5cf7d3bb0974ce74a320094973137adfb7409f47248383fe63abc4a49a90ddf
-EBUILD imagemagick-6.9.10.78.ebuild 7016 BLAKE2B 1fc57792a076b612b0849bb540f17f19c194e03c1f741a8e4bc56c562acea94364caf1ed0828457839169f179ef9e6ab7166cbb90a69bfc3ff19186c6c691f90 SHA512 22bc07e091f90331801c24a3d734669ad30afcb178084b7be7677522d85b165bcb0b22f725abdba3baddeebda1970744d3a98213f7d879f5baba9149f22f152f
-EBUILD imagemagick-7.0.9.8.ebuild 7291 BLAKE2B fb478ef6f2c8d871b1182f52f0afbce521787d2ea212d95002fc682667d3450c76536987c4293963de727fefef15169f6ea9f92fe31282eeeb83ea7b237721ce SHA512 a58ba9780324df8af23db6dea87122a6820afc8f2b9352000b54fdd24d0c2820a366f1db4b396b61cf0cd4c7187fcf660bbb60ee7768edfbfeb817ee5c1fd898
+DIST ImageMagick-6.9.10-84.tar.xz 9072724 BLAKE2B 489d5f9e659f3bd7ad32f58780a5f2e2b95772801b8674f4591120d7643627717572c0b01d011fc5cf7b5592723467e331ca02a0fcfb54d41be482a952b5a7f7 SHA512 bb574cd322a57a79e90021e4e5868792d0005b268a282ecf6c6a0e58c79dbc20e422e6a491c2adf1e50841570a69405f8771245cc2f545f5e7f2150cdf84faae
+DIST ImageMagick-6.9.10-86.tar.xz 9064960 BLAKE2B 02adf3a7cf942f01fb5f3fb72cda4f407360fa223768f6988220df5be5210e19973c7ac2243df9b295d5a3e1c43515088b157502204c14e665611764c575e62c SHA512 6d3362a83168ecc5b710bc020db2fa30495d442ffff72a77a99fb8be56225283660cd00ac2d1f75c5d19b44c64b212221aadda90fc0a0d76cc2e1e32bca62ffa
+DIST ImageMagick-7.0.9-14.tar.xz 9485404 BLAKE2B be449bc258841eafc83571891c545ba3cecdf6ec8019e665c680ca7dcfb9639db0cf9aee1e53c63ddad03c57549b523e81b926e2613b559baafc833606169a8c SHA512 eaeac3820943c5ed941a5adfa1a5549864d9ac748523eea7b352c8b51e4eb1189586ed0c69e21b1ce2431203ff43973817d45b293f9e85ecbdf35569ef838c3f
+DIST ImageMagick-7.0.9-16.tar.xz 9480896 BLAKE2B 182217c8c4a9425ca69722785da14bb8575ba50aaf9909fc39626ec34f54ff33b7cb5e627640005a00c1e94282b68a041a937e658eb6b06768149fc72f3807c3 SHA512 8f0c20cb863cfe0df30ef5140180273461d7bdb501670d0527bb6b17ac1adff3d500ba3c13e920c81935b4808cac11282808dd3cc81d1edac8429419fa34de26
+EBUILD imagemagick-6.9.10.84.ebuild 6922 BLAKE2B 408d4b69d369e8ded4bf1f4c5bf545d57e3ae01135c26f4e717094e2d8268d9bc488bcd6d09e44e3dc57d39364018653c2ec5697c9f45ab6ff3af6e8858e5642 SHA512 9d8742a84949c96681a04e0f1086b1907f5bad82baf1e81e0669a84ddc4347b8b09745f422ec0d72b476d2209aaaa7befa5238482e83b19bacd2aba26316a9f7
+EBUILD imagemagick-6.9.10.86.ebuild 6931 BLAKE2B d3745b951ff6b65eb5e50c08433c05de1e145f58fb85e2be366f7ae3d7b84bf28a7797ece60dcc7e165aa389c1fbf9d656874203ea97f32842385a6ad3eb44f7 SHA512 fd0cc166172dea6d3ba8d8787385c8a933c4ce83b9f2ccd89015cb3e72782f7f5f8e20f7e2838711d7ad0c6931b76da1a5025ca4e7664435f16579e2237dca5b
+EBUILD imagemagick-7.0.9.14.ebuild 7197 BLAKE2B 7e98b4f7ad9e4f9ff669147b83fe61fc9e6d3824ff1a3a3e4f19847d7b7991ae35007e89868d81f7b016c64f0ac16f25cdc2a407d99dce7086509c46d2025b78 SHA512 ff11c408b0075d936aaddbb7016b7305608ffbda551a8583c7a4fc96eb0f125ff8dcbd8637fab2885716a71c9fd0780d0cd5b23036cc0092cb9a8ec16d4554ef
+EBUILD imagemagick-7.0.9.16.ebuild 7207 BLAKE2B 004df3bd1f94e9e8c082bc82bbdf949d1d981c8517c5f5033f0ed55c3e9d472565ed8a088292b389325922925dc57733c7a39e14d4d987bb20f50ede87789be4 SHA512 e03e1322c70b842799ce7e90984d940007cf75895ba6d35bd7cb32b39599bebf83feefa67704225d845c82c7f789cc1f9cc7a4269c7a49c48b8336aa350e4c58
 EBUILD imagemagick-9999.ebuild 7207 BLAKE2B 4fc6e4d61f5e851d55546614830dbc3d9a23003033f55ac521bbe990d845aa2b7b7623c66da431f896df16ee71d6539bac7fdf0204c61f00d010c9013b92fef5 SHA512 97ebbef19227007aa32140de833e25d49c9a8f648fda30a9a0abe8073329b0df5a79a74968d5056b3d342e87d435072d64d360ec4270aca53491938c4cfb7f42
 MISC metadata.xml 1111 BLAKE2B 3592f2d81f67d91239152d723c736437a5e8056f8dba1fc5c97e2ead08efd4e913400b441eb6d6b90f26cccf3b89f115c18a5551bc070d1fd81e68dd218493c9 SHA512 33bd68bc4f88cd6029528b0feab9cc9fde0d60475ba5fad8c4f92ff6d373666628e6525d54268735e99182abd2658aa32c7c72ff22106c65f81ed8af5e4f7ea2
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.78.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.84.ebuild
index 99cd54e5c91e..268eb3094776 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.78.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.84.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,8 +10,7 @@ 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"
-SRC_URI="https://github.com/ImageMagick/ImageMagick6/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/${PV}"
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.86.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.86.ebuild
new file mode 100644
index 000000000000..b84069a077d5
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.86.ebuild
@@ -0,0 +1,250 @@
+# 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/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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 )
+	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:=.*:='':" {} +
+
+	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.9.8.ebuild b/media-gfx/imagemagick/imagemagick-7.0.9.14.ebuild
index 568a44c6e220..1ec6c3383d1c 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.9.8.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.9.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,8 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
-	#SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	SRC_URI="https://github.com/ImageMagick/ImageMagick/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
 	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
diff --git a/media-gfx/imagemagick/imagemagick-7.0.9.16.ebuild b/media-gfx/imagemagick/imagemagick-7.0.9.16.ebuild
new file mode 100644
index 000000000000..db7f1fb9468a
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.9.16.ebuild
@@ -0,0 +1,262 @@
+# 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+SLOT="0/7.0.9"
+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 )
+	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 )
+	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:=.*:='':" {} +
+
+	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/img2pdf/Manifest b/media-gfx/img2pdf/Manifest
index 02f72d222714..221a8d478cf3 100644
--- a/media-gfx/img2pdf/Manifest
+++ b/media-gfx/img2pdf/Manifest
@@ -1,5 +1,5 @@
 DIST img2pdf-0.3.1.tar.gz 67954 BLAKE2B d0d6a9927e9b3e7087e562a108157677a46a17a896beddcc424dd2c234fd7c4f1376b824dbf814b42d9a314a8495b149bc9df65ab2864405b9dde0054e7bafdf SHA512 25f788f78e93ed336ed8e31e88350d89263b82477c8d9c36103dfa522a5e661922fc09b59e1d5104161fe1be15114f843172555efa942722d8b093900d38bae1
 DIST img2pdf-0.3.3.tar.gz 80523 BLAKE2B 39e372f1ab82d9f521cf2c512b173680afe6463dd041283b336af49c41b12d12261fe5947ad9f03d489b7898d3c8d161faedb2b3366cb75bd1bc0666f905f60c SHA512 234e0031d75727d2f5d2b82603bb447d9101ace81e604b6d5eb358d0b4681e209dbd737775b90b44096cf84239aac9e87e2369e0c6112a17f24ccbf10a20cdd5
-EBUILD img2pdf-0.3.1.ebuild 598 BLAKE2B 69742665611786d63b89aabf50e145027cec73f93c227d575f3a98cfbfd7d4c448348886d2154e60b975dc2ff5b7172a6a8c467feb52b077dc72e1f3398316fa SHA512 1f79df241953428a675f089d403f8f18614d1a1899d6689a36d5129a19495b887f9d2ee167e055c3b7b93a7b3f58f74de44ce886879bc6b8766da15ebdae5d30
-EBUILD img2pdf-0.3.3.ebuild 649 BLAKE2B cb6e44bf692a89e63ac506ab9b7b6bd70b4c54d8bcac996e5c1fb9d432525802200cfff56353715a862caca08ebbaee6c3195d14fd509b77f18f6b3c35b91f6d SHA512 b7851bc55dbaa96f6ec6ee5cb60b353e484a15911f0c2ba0842afe44a8771d88706d443e84735ce151922148e0b5b1b5f278ae263512c0c585b2e016cfb4916a
+EBUILD img2pdf-0.3.1.ebuild 594 BLAKE2B 634329dc8735f1b3dc72ec7b0c437107a8ce4ebd28b0cbb3486178497628795c2e1f873b1dd8e0e4244b04b6bac1d944221a06f834b19b7a196b2bdb5983780c SHA512 32a7f053834d7ee75454fbff0caabf6a57ae2ba163e5522d3d60c65724cc601734954a9f24de3f21dab1876627974c55580a0e0ec8f451f9536e39a437cc007d
+EBUILD img2pdf-0.3.3.ebuild 645 BLAKE2B 392a638abfd8bf09cfe7681998d3f9e9ccae7bbae5e42730226f44194a2e0fc68e77f3c73e30c9b060aaf50f96511a46959aca430fd6fde3a830c5c568e78f45 SHA512 35eed7c8bad2ccaa50b4128b6e8d5107a7dbd0411e475bb30c223a06b8018dc059aadc8db8cdd6101233f686468b7ae20a91db9e1c5a9cbc6db343d99bc0d01a
 MISC metadata.xml 1096 BLAKE2B 18befc3c4c34d0210ad594ba46749dd304d673ecd697d30b3c60a951787a7ac9e8d7371d0c853c8a4cfce896b18dd36a29f15dd12aa4fb6190635e20d2b201e0 SHA512 c4f5e02479a3ca0d6a2a52c58c25197cae533855500327c84c694b82e2ad625e149124c555b8822f79ec8000a4f926b6e21dd59db92b0989a316687d56775531
diff --git a/media-gfx/img2pdf/img2pdf-0.3.1.ebuild b/media-gfx/img2pdf/img2pdf-0.3.1.ebuild
index 6965a5532988..364ece521a93 100644
--- a/media-gfx/img2pdf/img2pdf-0.3.1.ebuild
+++ b/media-gfx/img2pdf/img2pdf-0.3.1.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=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/media-gfx/img2pdf/img2pdf-0.3.3.ebuild b/media-gfx/img2pdf/img2pdf-0.3.3.ebuild
index 2dafd474d55a..a7efeb646504 100644
--- a/media-gfx/img2pdf/img2pdf-0.3.3.ebuild
+++ b/media-gfx/img2pdf/img2pdf-0.3.3.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=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest
index 83d71d0cd60e..7b14c1375c90 100644
--- a/media-gfx/imv/Manifest
+++ b/media-gfx/imv/Manifest
@@ -1,4 +1,6 @@
-DIST imv-2.1.3.tar.gz 27664 BLAKE2B f873863d897161675b4cfbcc3c4136eebd0176317f30d656dd4c7a92615c926d1a0410d6c80283bb3a25055f3a9b710fa0763ffb86ff63ed1dd919ad3f0dfe8c SHA512 0ecdaad9b4518c2107a14969cf9348542c2ef88707be7b2b5eed435915292687d63e4ebd29cb42297cbc3dfee408ec29fd019ad6ae4f0cd789753aad84aa8128
-EBUILD imv-2.1.3.ebuild 683 BLAKE2B ca632af6611a4ee973fc3483116ab91a8c4be599de54028bba4160b5d6d57d55e5f4016d21051985b6cb487bee301f33e766256240a4e8a0d38bda57b122d82b SHA512 634da620f23dc321e976ed2a75374832e11a503cb30138aa6124f3c1c01d61031c6bbf902e9e9c84a129d7bddae04d7e8b67e6f5866f0db31ffd18aa04a13850
-EBUILD imv-9999.ebuild 650 BLAKE2B 31cb4b77b875bbe24dc50fa9046746c7aef512b69291accd7501700d9efe7f73a89199636058fe424ccfe97c8209a312fb13e30c28efcaea61e27192999ee499 SHA512 415189ec612e1b288a799c0d37113c9aef2592eb135d02d4e6b78c6f47316defa97389ad25f0ef25d9d3cefe10ab71de93cb08095b064e6e79017c430404089e
-MISC metadata.xml 242 BLAKE2B a66b698c79419467b610a75590ee09e217a9b54de470c963269438ca410e7ca224feb08636610af377a388be317aafdf9d7ea647c30be96705da00d5f07e21e5 SHA512 e0d5b53af8e82f684d21217559b6e832935670c8186c6514ca9f3af14b024f39421f297cf23127af2ef3f1874b732f963e88bb180403cae7ac1834a1808664f4
+DIST imv-4.0.1.tar.gz 74982 BLAKE2B 5ff7f093307fdf6114e56f0e5d5a47a4320607eea12daa9a9c89c679f558b4d31f206f7eb03a8b0435a3f05974949029ebfc6e1b1fe4d7d2859bbd722ecb6366 SHA512 f946346638d4314956e86f0e7dfa38baf0ebbb80970f1738749e6c7b80642c2315256738b94ab04d45784c0930edadfc7cc339d2bcfd6eb80fd2e1e98b2d9b28
+DIST imv-4.1.0.tar.gz 77341 BLAKE2B d6735feba4d3e958db70eddea72bbbeb60731cf550680320448ba226ba74eb467617ad295f9094995e0bf31c99473f067ff41f16689ce21fb87d7a9fd2e0946a SHA512 92d7551bda55185b29724e90230dac608a82f4a45cd3cb9c7a5d261f65eede6dcdde78f5c16eecfc1242533ec8e155204189fab3cacf31ddc088707af5131b2a
+EBUILD imv-4.0.1-r1.ebuild 1654 BLAKE2B 055e24b606921a91090433933f4e712a4b48d5ba9efb72523477842d9f4231a264590f3c483588426e4396e5256ecb7939fccb203e4cb1a1735f308cd0598cc0 SHA512 5fdcdbc94e234bb0c5c48625e41d2be7a5ce3fa5bb34499cbc54382535f2adaf8cfa592309c7ab6991925eb95a2d86c5ae9e4c367578bb829079a474e2883213
+EBUILD imv-4.1.0.ebuild 1734 BLAKE2B 21553e17d1fc8945a23496d21b91978cdb6eccec7681cca93f139d29ad8c87453f3969f433f5b8dcf691ab5697196a5ae0143443840f5f867573efdd25b1e401 SHA512 3a891d89e757a2cdedb14f8caf0257f06a84e8fdc40ea11a2540b14dc6129ae99419decc27511aded2628495ad3c33738a904eaa8dc17024d974482d10690137
+EBUILD imv-9999.ebuild 1697 BLAKE2B ee07d54ff94b00950dcba8a4e0bde3808af430921b359904d2a61f82a5457f6f26bb34952858c86de096ac97c5e5eec469720619b8d63b2cf7ed8ba38b825593 SHA512 c8ae62e79b2f9781e31cf221a96e922a3f7537b12d2211cc65d5ad05c4d22262b5b8179e442f46a878d6a245e46009483fd5daca123b6295add58c8f18269b1c
+MISC metadata.xml 456 BLAKE2B 90f9ddfeb2d7135d1cd5bf96cf234f1f56db6581d60340df16b33fcc640bd700d0425156b18755cf41c00ad127802d822933e10220bd4a857cac8d88b3a8691e SHA512 e926970f4155a6d9759bf37f43f91e616de74fa2f276144947b632f07bde0c94dcc17ddb4b079ea6c3535461c3ad682a83746083749ea1a5aaa4c9503ffe0fd8
diff --git a/media-gfx/imv/imv-2.1.3.ebuild b/media-gfx/imv/imv-2.1.3.ebuild
deleted file mode 100644
index a9a06397207d..000000000000
--- a/media-gfx/imv/imv-2.1.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit xdg-utils
-
-DESCRIPTION="Minimal image viewer designed for tiling window manager users"
-HOMEPAGE="https://github.com/eXeC64/imv"
-SRC_URI="https://github.com/eXeC64/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!sys-apps/renameutils
-	media-libs/fontconfig
-	media-libs/libsdl2
-	media-libs/sdl2-ttf
-	media-libs/freeimage
-"
-
-DEPEND="${RDEPEND}
-	test? ( dev-util/cmocka )"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/imv/imv-4.0.1-r1.ebuild b/media-gfx/imv/imv-4.0.1-r1.ebuild
new file mode 100644
index 000000000000..dab63717b9c3
--- /dev/null
+++ b/media-gfx/imv/imv-4.0.1-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs xdg-utils
+
+DESCRIPTION="Minimal image viewer designed for tiling window manager users"
+HOMEPAGE="https://github.com/eXeC64/imv"
+SRC_URI="https://github.com/eXeC64/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X +freeimage jpeg png +svg test tiff wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	|| ( X wayland )
+"
+
+RDEPEND="
+	!sys-apps/renameutils
+	media-libs/fontconfig
+	media-libs/libsdl2
+	media-libs/sdl2-ttf
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/libxkbcommon
+		x11-libs/pango
+	)
+	freeimage? ( media-libs/freeimage )
+	jpeg? ( media-libs/libjpeg-turbo )
+	png? ( media-libs/libpng )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff )
+	wayland? ( dev-libs/wayland )
+"
+BDEPEND="
+	app-text/asciidoc
+	test? ( dev-util/cmocka )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_prepare() {
+	default
+	sed -i -e 's|pkg-config|$(PKG_CONFIG)|g' Makefile || die
+}
+
+src_configure() {
+	tc-export PKG_CONFIG
+	local WINDOWS
+	if use X; then
+		if ! use wayland; then
+			WINDOWS=x11
+		else
+			WINDOWS=all
+		fi
+	else
+		if use wayland; then
+			WINDOWS=wayland
+		fi
+	fi
+
+	BACKENDS=(
+		BACKEND_FREEIMAGE=$(usex freeimage)
+		BACKEND_JPEG=$(usex jpeg)
+		BACKEND_LIBPNG=$(usex png)
+		BACKEND_LIBRSVG=$(usex svg)
+		BACKEND_LIBTIFF=$(usex tiff)
+		WINDOWS=${WINDOWS}
+	)
+}
+
+src_compile() {
+	emake ${BACKENDS[@]}
+}
+
+src_install() {
+	emake ${BACKENDS[@]} DESTDIR="${D}" install
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/imv/imv-4.1.0.ebuild b/media-gfx/imv/imv-4.1.0.ebuild
new file mode 100644
index 000000000000..4987f5a28049
--- /dev/null
+++ b/media-gfx/imv/imv-4.1.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs xdg-utils
+
+DESCRIPTION="Minimal image viewer designed for tiling window manager users"
+HOMEPAGE="https://github.com/eXeC64/imv"
+SRC_URI="https://github.com/eXeC64/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X +freeimage jpeg libnsgif png +svg test tiff wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	|| ( X wayland )
+"
+
+RDEPEND="
+	!sys-apps/renameutils
+	media-libs/fontconfig
+	media-libs/libsdl2
+	media-libs/sdl2-ttf
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/libxkbcommon
+		x11-libs/pango
+	)
+	freeimage? ( media-libs/freeimage )
+	jpeg? ( media-libs/libjpeg-turbo )
+	libnsgif? ( media-libs/libnsgif )
+	png? ( media-libs/libpng )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff )
+	wayland? ( dev-libs/wayland )
+"
+BDEPEND="
+	app-text/asciidoc
+	test? ( dev-util/cmocka )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_prepare() {
+	default
+	sed -i -e 's|pkg-config|$(PKG_CONFIG)|g' Makefile || die
+}
+
+src_configure() {
+	tc-export PKG_CONFIG
+	local WINDOWS
+	if use X; then
+		if ! use wayland; then
+			WINDOWS=x11
+		else
+			WINDOWS=all
+		fi
+	else
+		if use wayland; then
+			WINDOWS=wayland
+		fi
+	fi
+
+	BACKENDS=(
+		BACKEND_FREEIMAGE=$(usex freeimage)
+		BACKEND_JPEG=$(usex jpeg)
+		BACKEND_LIBNSGIF=$(usex libnsgif)
+		BACKEND_LIBPNG=$(usex png)
+		BACKEND_LIBRSVG=$(usex svg)
+		BACKEND_LIBTIFF=$(usex tiff)
+		WINDOWS=${WINDOWS}
+	)
+}
+
+src_compile() {
+	emake ${BACKENDS[@]}
+}
+
+src_install() {
+	emake ${BACKENDS[@]} DESTDIR="${D}" install
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/imv/imv-9999.ebuild b/media-gfx/imv/imv-9999.ebuild
index 275366fe87f1..5fc4052027f6 100644
--- a/media-gfx/imv/imv-9999.ebuild
+++ b/media-gfx/imv/imv-9999.ebuild
@@ -1,30 +1,87 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit xdg-utils git-r3
+EAPI=7
+inherit git-r3 toolchain-funcs xdg-utils
 
 DESCRIPTION="Minimal image viewer designed for tiling window manager users"
 HOMEPAGE="https://github.com/eXeC64/imv"
-EGIT_REPO_URI="https://github.com/eXeC64/imv.git"
+EGIT_REPO_URI="https://github.com/eXeC64/imv"
 
-LICENSE="GPL-2+"
+LICENSE="MIT-with-advertising"
 SLOT="0"
 KEYWORDS=""
-IUSE="test"
+IUSE="X +freeimage jpeg libnsgif png +svg test tiff wayland"
 RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	|| ( X wayland )
+"
 
 RDEPEND="
 	!sys-apps/renameutils
 	media-libs/fontconfig
 	media-libs/libsdl2
 	media-libs/sdl2-ttf
-	media-libs/freeimage
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/libxkbcommon
+		x11-libs/pango
+	)
+	freeimage? ( media-libs/freeimage )
+	jpeg? ( media-libs/libjpeg-turbo )
+	libnsgif? ( media-libs/libnsgif )
+	png? ( media-libs/libpng )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff )
+	wayland? ( dev-libs/wayland )
+"
+BDEPEND="
+	app-text/asciidoc
+	test? ( dev-util/cmocka )
 "
+DEPEND="
+	${RDEPEND}
+"
+
+src_prepare() {
+	default
+	sed -i -e 's|pkg-config|$(PKG_CONFIG)|g' Makefile || die
+}
 
-DEPEND="${RDEPEND}
-	test? ( dev-util/cmocka )"
+src_configure() {
+	tc-export PKG_CONFIG
+	local WINDOWS
+	if use X; then
+		if ! use wayland; then
+			WINDOWS=x11
+		else
+			WINDOWS=all
+		fi
+	else
+		if use wayland; then
+			WINDOWS=wayland
+		fi
+	fi
+
+	BACKENDS=(
+		BACKEND_FREEIMAGE=$(usex freeimage)
+		BACKEND_JPEG=$(usex jpeg)
+		BACKEND_LIBNSGIF=$(usex libnsgif)
+		BACKEND_LIBPNG=$(usex png)
+		BACKEND_LIBRSVG=$(usex svg)
+		BACKEND_LIBTIFF=$(usex tiff)
+		WINDOWS=${WINDOWS}
+	)
+}
+
+src_compile() {
+	emake ${BACKENDS[@]}
+}
+
+src_install() {
+	emake ${BACKENDS[@]} DESTDIR="${D}" install
+}
 
 pkg_postinst() {
 	xdg_desktop_database_update
diff --git a/media-gfx/imv/metadata.xml b/media-gfx/imv/metadata.xml
index 457f62f9ff76..39258bf23daf 100644
--- a/media-gfx/imv/metadata.xml
+++ b/media-gfx/imv/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">eXeC64/imv</remote-id>
-	</upstream>
+<maintainer type='person'><email>jer@gentoo.org</email></maintainer>
+<use>
+<flag name='freeimage'>Use <pkg>media-libs/freeimage</pkg> as image library</flag>
+<flag name='libnsgif'>Use <pkg>media-libs/libnsgif</pkg> as image library</flag>
+</use>
+<upstream>
+<remote-id type="github">eXeC64/imv</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index bc0c1ced7083..64f2d28d003d 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -6,11 +6,12 @@ AUX inkscape-0.92.1-automagic.patch 5416 BLAKE2B 3b17fd7a4cd305b6e683fd6a3f6bd6b
 AUX inkscape-0.92.1-desktop.patch 919 BLAKE2B c9952613e8d8dca1cd11146afd4d8db210be0f65f61b1a674cf5443dfaed3422e7082667cb93e183589d1e840ac3b55c7e70d03f44c0302b8c7db8ae621a976d SHA512 0000e5c6bd83e7d3994712d5a9f7369b2ecb7a15ba8371bfc9e2646b33293334eff987ffc360c2753025d0561395368024587d71ffc015f5a0e8c39077fd45b2
 AUX inkscape-0.92.4-poppler-0.76.0.patch 1579 BLAKE2B c8c578dc3c6f0d79403bc0716bb6875544fbf19c98e721294cf9e5f58d9c89c1b8414dd58975846100c4ae5c21eba8e7e4797c037300ce05d741d9245a0dc59c SHA512 2f45e16aba67f4d1498cf012ac6198ec2bb977b9e39b3d4e2d14a216d86b1d407ff7ea5a889b58b5e800c129c0f99ec8bbc0a42dd7d41578d94ae1ab59208698
 AUX inkscape-0.92.4-poppler-0.82.0.patch 3223 BLAKE2B 6e530a2d2602d61c9f97f61813fad837536ccd3dc25405cf79ebda6563c56ff09e4a98b99c83aced6e8995473b27c7942c5774abafc7c33a2dbe45df58f419e4 SHA512 4a5f2e3ec9f16abe76786945e3085e405bbe7a4c57dfa0e6e7d4ddd4aadd17463766c7392846db08fa41419e05ef8c688d989ded8905755c010db6b08afa2feb
+AUX inkscape-0.92.4-poppler-0.83.0.patch 4167 BLAKE2B cccc3ae0a4196815dcd7c2ff7260ed8ab8f81b4aaeecb557bb2f35d0f01ea616dfe7b0144dbf1638a679dc8642485448f479e6fa0a45274581c812ee792f51fc SHA512 1c6b1bd594bc49b392844d0cc232d79a8478e8f222179444cc197c6b93839cfefeb26b3a4cf702896baaa227d7ef5560dfefddc96ee6a9a1b1ea571fe4374bfc
 AUX inkscape-1.0_beta1-detect-imagemagick.patch 653 BLAKE2B 1e217306b083550d1f4628dc8385c78336c4c9019f8b35fe474c18c1f917105f423d3a958491432109eea22ef04b63ad5c5d23c03ae36ed7663ed86de3e295ed SHA512 5ee7080d5134b970a7b70b6b5052523e98860d66ee42897b5a84c5e70676359c918ea0d5e603a83b27d0e4656d49f711ae76d2dad47083c8ade223cc7da9e123
 AUX inkscape-1.0_beta1-do-not-compress-man.patch 454 BLAKE2B d680993be80d9069c7986f110d512643849f97fae81a8fdf1ab020a418dfbe44cc2bce3d71c8a79e8acac5170dfc01d084420a439d83f6f0e85706acdc8a0399 SHA512 3fc7ac0750a67b9d90d4ec0eed404ffdaa6910397849fa916eeacf5fb1e77cb0cb17f3f1ba99ad39f16610f2b3d7df387e35d36a0404fbd1fd0f857fa8be822b
 DIST inkscape-0.92.4.tar.bz2 31929728 BLAKE2B 892bf4ed913019b27a9b8897e3ae32c44152163ded0eb345d59915ffdc9818d29f210de3294ef1b05601141185b5e3b10779778551b860f31e7df5c659492c77 SHA512 b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120
 DIST inkscape-1.0beta2_2019-12-03_2b71d25d45.tar.xz 39508392 BLAKE2B fd48f22439d1182aff1db5afd74870a6c1d291afb310fc9fa5036fa3c2547ead8c17f6cd67f77a56f655c56af8ffaa7a349b17166c7b18ef3ddf234aa6e57805 SHA512 029508d4867ac0890b2c9c4d274408f849a17e8a7978853df38543d94e7c08d33546a8a40fbcd940da1ba847f11e37ff2bafa285174b65d45ee5de59e907e78f
-EBUILD inkscape-0.92.4.ebuild 3757 BLAKE2B af42502189a61742629d1b016d5f8efdf4b96358aba951eeba3a591b1e6ca5f4ecc75a0e80b39416903e2b60b26ca7c7490628b7a23df2b96365b3aa3b6b4600 SHA512 6c6ad92323f157922fdea7f31c497b120b2b21bffadcf3bafeedb75b72da351071b7b04c081a5c0fb46b8e10497dd0168d8dfa6349bb63b2db9093a40fc422d9
-EBUILD inkscape-1.0_beta2.ebuild 3923 BLAKE2B 6381a0f230c7570e956d00f8036f3f203d61b23a8c568932c44961405d5a5ea7b4d2595a8992eabe7b2db237cb5e057cfdd20982700f28bac4f699bc864acc1e SHA512 9ee9794377c26cadcced8a9b018f214dad9069f06759f5d4e4017e28e412cc32ed90035c7c95194139eb9841458c8609acec32d651a5882eaa60e304316fb862
-EBUILD inkscape-9999.ebuild 3819 BLAKE2B fb5e9ac78bcc32edbc4b2872cb9f872505c3b31af9d1b31251ec555dcb2a057ce468226bcdee6df52842e7cac7260d882cf33bef1a97f7ce0c619dfe049e5d1f SHA512 5892ebc96fb00772bef1709fa92444098f3d43a24d2331a45e5110f7e10cf81227ebf83118e899d7e02794cf1e5e31eb9d6e1240dcec2a60f1ceed972f5ed8a8
+EBUILD inkscape-0.92.4.ebuild 3806 BLAKE2B 9c2e889a86d4806b2dff157b9eb52f6c7631f892695823739aae3bc09bd6caa629f5678f50ad7b68a1013f8b4afcb07cf587462b315b9fd0e4b7b55063c35b45 SHA512 94604323bd15cb26141e226ba34fdccce38ac971bdac9cffc4670476272123652e803a810dc2033874dd6358cba585f568e204f419c27aaa22f50d56c26cab01
+EBUILD inkscape-1.0_beta2.ebuild 3897 BLAKE2B 9ec3d94630f97b36f2983b129b67879da4bfcd91cf5ccdbc09767e4c20272d18f0eafca4a2fcfae6a3cd2ede6f4f6355f2393c7351144e52abf35b8184185930 SHA512 e8ff06bd2f34ad265533384169e435bdb6a97194681109e2b32c9e56f97ae3f1ded6182b748543fd849ec60fd86c1eb6adc9e53f0e7fd052f7fd82718a854f5c
+EBUILD inkscape-9999.ebuild 3793 BLAKE2B 5b75509b673f6af853818e36ed610d861816b02e163cd019301193b6b3a919477e396005f30c8c244e6c3a26ed62e52618ccdb3c9e339d9a863f49f6b9fb7e3d SHA512 314586c90cdb19611b35e4594b14883d10a5d6553d80855458cfdd9b374381e9196c58bbaa506c2a1c3fb2d54418f6dc7f77621a434be64c7025459b11717cf0
 MISC metadata.xml 951 BLAKE2B 5610cce03a912f378f4bbb997bb9acc028f2f02c1ec40034ed523b7f7cee2cc980f1f24fb8fbd26b40d494a514769b722ca64e93078c82ad75c9db94a9f19ca4 SHA512 f62078fa96c501f4d8e01d4e539b74b91cbf90997392e903e30db9c3a117c2ccc7f2d3e1c2e62c85362cd0a2d504dd565cfd70f92e5b947d416f8a3f2cd88f8e
diff --git a/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.83.0.patch b/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.83.0.patch
new file mode 100644
index 000000000000..bcfb1cd482eb
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.92.4-poppler-0.83.0.patch
@@ -0,0 +1,92 @@
+From 51351358a62acb6887eab49bc0dc4a7a3d18c17a Mon Sep 17 00:00:00 2001
+From: Jan Tojnar <jtojnar@gmail.com>
+Date: Tue, 3 Dec 2019 00:17:05 +0100
+Subject: [PATCH] Fix build with Poppler 0.83.0
+
+Fixed for gentoo by dilfridge@gentoo.org
+
+diff -ruN inkscape-0.92.4.orig/src/extension/internal/pdfinput/pdf-input.cpp inkscape-0.92.4/src/extension/internal/pdfinput/pdf-input.cpp
+--- inkscape-0.92.4.orig/src/extension/internal/pdfinput/pdf-input.cpp	2019-01-15 05:29:27.000000000 +0100
++++ inkscape-0.92.4/src/extension/internal/pdfinput/pdf-input.cpp	2020-01-06 10:55:05.105063212 +0100
+@@ -689,12 +689,12 @@
+         //
+         gchar const *poppler_datadir = g_getenv("POPPLER_DATADIR");
+         if (poppler_datadir != NULL) {
+-            globalParams = new GlobalParams(poppler_datadir);
++            globalParams = _POPPLER_NEW_GLOBAL_PARAMS(poppler_datadir);
+         } else {
+-            globalParams = new GlobalParams();
++            globalParams = _POPPLER_NEW_GLOBAL_PARAMS();
+         }
+ #else
+-        globalParams = new GlobalParams();
++        globalParams = _POPPLER_NEW_GLOBAL_PARAMS();
+ #endif // ENABLE_OSX_APP_LOCATIONS
+     }
+ 
+diff -ruN inkscape-0.92.4.orig/src/extension/internal/pdfinput/pdf-parser.cpp inkscape-0.92.4/src/extension/internal/pdfinput/pdf-parser.cpp
+--- inkscape-0.92.4.orig/src/extension/internal/pdfinput/pdf-parser.cpp	2020-01-06 10:53:44.947229010 +0100
++++ inkscape-0.92.4/src/extension/internal/pdfinput/pdf-parser.cpp	2020-01-06 10:56:49.611773932 +0100
+@@ -272,7 +272,7 @@
+     ClipHistoryEntry *save();
+     ClipHistoryEntry *restore();
+     GBool hasSaves() { return saved != NULL; }
+-    void setClip(GfxPath *newClipPath, GfxClipType newClipType = clipNormal);
++    void setClip(_POPPLER_CONST_83 GfxPath *newClipPath, GfxClipType newClipType = clipNormal);
+     GfxPath *getClipPath() { return clipPath; }
+     GfxClipType getClipType() { return clipType; }
+ 
+@@ -3394,7 +3394,7 @@
+     }
+ }
+ 
+-void ClipHistoryEntry::setClip(GfxPath *clipPathA, GfxClipType clipTypeA) {
++void ClipHistoryEntry::setClip(_POPPLER_CONST_83 GfxPath *clipPathA, GfxClipType clipTypeA) {
+     // Free previous clip path
+     if (clipPath) {
+         delete clipPath;
+diff -ruN inkscape-0.92.4.orig/src/extension/internal/pdfinput/poppler-transition-api.h inkscape-0.92.4/src/extension/internal/pdfinput/poppler-transition-api.h
+--- inkscape-0.92.4.orig/src/extension/internal/pdfinput/poppler-transition-api.h	2020-01-06 10:53:44.947229010 +0100
++++ inkscape-0.92.4/src/extension/internal/pdfinput/poppler-transition-api.h	2020-01-06 10:55:05.107063491 +0100
+@@ -3,6 +3,12 @@
+ 
+ #include <glib/poppler-features.h>
+ 
++#if POPPLER_CHECK_VERSION(0, 83, 0)
++#define _POPPLER_CONST_83 const
++#else
++#define _POPPLER_CONST_83
++#endif
++
+ #if POPPLER_CHECK_VERSION(0, 82, 0)
+ #define _POPPLER_CONST_82 const
+ #else
+@@ -15,6 +21,12 @@
+ #define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj), gFalse)
+ #endif
+ 
++#if POPPLER_CHECK_VERSION(0, 83, 0)
++#define _POPPLER_NEW_GLOBAL_PARAMS(args...) std::unique_ptr<GlobalParams>(new GlobalParams(args))
++#else
++#define _POPPLER_NEW_GLOBAL_PARAMS(args...) new GlobalParams(args)
++#endif
++
+ 
+ #if POPPLER_CHECK_VERSION(0, 72, 0)
+ #define getCString c_str
+diff -ruN inkscape-0.92.4.orig/src/extension/internal/pdfinput/svg-builder.cpp inkscape-0.92.4/src/extension/internal/pdfinput/svg-builder.cpp
+--- inkscape-0.92.4.orig/src/extension/internal/pdfinput/svg-builder.cpp	2020-01-06 10:53:44.948229017 +0100
++++ inkscape-0.92.4/src/extension/internal/pdfinput/svg-builder.cpp	2020-01-06 10:55:05.107063491 +0100
+@@ -264,10 +264,10 @@
+ /**
+  * \brief Generates a SVG path string from poppler's data structure
+  */
+-static gchar *svgInterpretPath(GfxPath *path) {
++static gchar *svgInterpretPath(_POPPLER_CONST_83 GfxPath *path) {
+     Inkscape::SVG::PathString pathString;
+     for (int i = 0 ; i < path->getNumSubpaths() ; ++i ) {
+-        GfxSubpath *subpath = path->getSubpath(i);
++        _POPPLER_CONST_83 GfxSubpath *subpath = path->getSubpath(i);
+         if (subpath->getNumPoints() > 0) {
+             pathString.moveTo(subpath->getX(0), subpath->getY(0));
+             int j = 1;
diff --git a/media-gfx/inkscape/inkscape-0.92.4.ebuild b/media-gfx/inkscape/inkscape-0.92.4.ebuild
index 87203911632c..912f6b6098bd 100644
--- a/media-gfx/inkscape/inkscape-0.92.4.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -99,6 +99,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.48.4-epython.patch"
 	"${FILESDIR}/${PN}-0.92.4-poppler-0.76.0.patch" #684246
 	"${FILESDIR}/${PN}-0.92.4-poppler-0.82.0.patch"
+	"${FILESDIR}/${PN}-0.92.4-poppler-0.83.0.patch"
 )
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/inkscape/inkscape-1.0_beta2.ebuild b/media-gfx/inkscape/inkscape-1.0_beta2.ebuild
index d88a546fcfbf..fe3ac5ac3a7c 100644
--- a/media-gfx/inkscape/inkscape-1.0_beta2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0_beta2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="xml"
 MY_P="${P/_/}"
 RELEASE_SUFFIX="_2019-12-03_2b71d25d45"
-inherit cmake-utils flag-o-matic xdg toolchain-funcs python-single-r1
+inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
 
 DESCRIPTION="SVG based generic vector-drawing program"
 HOMEPAGE="https://inkscape.org/"
@@ -109,7 +109,7 @@ pkg_pretend() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
 }
 
@@ -136,11 +136,11 @@ src_configure() {
 		-DWITH_LIBWPG=$(usex wpg)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	find "${ED}" -type f -name "*.la" -delete || die
 
diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index b088e553b3f9..1a10390a90dc 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="xml"
 MY_P="${P/_/}"
-inherit cmake-utils flag-o-matic xdg toolchain-funcs python-single-r1 git-r3
+inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 git-r3
 
 DESCRIPTION="SVG based generic vector-drawing program"
 HOMEPAGE="https://inkscape.org/"
@@ -108,7 +108,7 @@ pkg_pretend() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
 }
 
@@ -135,11 +135,11 @@ src_configure() {
 		-DWITH_LIBWPG=$(usex wpg)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	find "${ED}" -type f -name "*.la" -delete || die
 
diff --git a/media-gfx/iscan-plugin-network-nt/Manifest b/media-gfx/iscan-plugin-network-nt/Manifest
new file mode 100644
index 000000000000..4aa6e49da0f2
--- /dev/null
+++ b/media-gfx/iscan-plugin-network-nt/Manifest
@@ -0,0 +1,3 @@
+DIST iscan-bundle-2.30.4.x64.deb.tar.gz 517592 BLAKE2B f7c0638575d406ed8612f478c06fdb1331e890f932b8dc96a4dcf9fbe499683f53159103c8dfd6c1036f2bc7930bbbc4c8b18d88c460d4b48798e07f31630e0b SHA512 6d967f5d2d554478df49c784d0ee785a9e1fc4f4b6ea4dc320270a50eca35cc3d533b918a1bda33cf3b0e9b783380e7828b77543730079b2e2f40ad9578db79d
+EBUILD iscan-plugin-network-nt-1.1.2.1.ebuild 1199 BLAKE2B 27d5e163fe667e5fc2716d7ca0f4b084c1086b4eadbe47895e456124cb456eeb5891d7eabe0e53814772c70decfda8a8c689bdb47407a5372f8e7b1d2e2302b0 SHA512 c29561704dc018bda0b2263d203372ca361fa52dd2015c2918fb68c1cfb38e2ead2bc5caaf5af9271870cf2a7c70eb83cacc0730934b1c5727d18a45dbd15af7
+MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
diff --git a/media-gfx/iscan-plugin-network-nt/iscan-plugin-network-nt-1.1.2.1.ebuild b/media-gfx/iscan-plugin-network-nt/iscan-plugin-network-nt-1.1.2.1.ebuild
new file mode 100644
index 000000000000..59027f250614
--- /dev/null
+++ b/media-gfx/iscan-plugin-network-nt/iscan-plugin-network-nt-1.1.2.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Network scanning plugin for EPSON scanners (nonfree)"
+
+HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
+# This is distributed as part of the "bundle driver"; since we already have the
+# opensource part separately we just install the nonfree part here.
+
+ISCAN_VERSION="2.30.4"
+
+SRC_URI="https://download2.ebz.epson.net/iscan/general/deb/x64/iscan-bundle-${ISCAN_VERSION}.x64.deb.tar.gz"
+
+LICENSE="EPSON-2018"
+
+SLOT="0"
+
+#KEYWORDS="~amd64"
+# No keywords since I havent really gotten it to work yet. However, installation
+# locations are clearly correct... may be a hardware/network problem on my side.
+
+RESTRICT="bindist mirror strip"
+
+RDEPEND="media-gfx/iscan"
+BDEPEND="app-arch/deb2targz"
+
+src_unpack() {
+	default
+	mv ./iscan-bundle-${ISCAN_VERSION}.x64.deb/plugins/iscan-network-nt_*_amd64.deb ${P}.deb || die
+	mkdir ${P} || die
+	cd ${P} || die
+	unpack ../${P}.deb
+	unpack "${S}/data.tar.gz"
+}
+
+src_install() {
+	exeinto /usr/lib/iscan
+	doexe usr/lib/iscan/network
+
+	gunzip usr/share/doc/iscan-network-nt/*.gz
+	dodoc usr/share/doc/iscan-network-nt/*
+}
diff --git a/media-gfx/tic98/metadata.xml b/media-gfx/iscan-plugin-network-nt/metadata.xml
index 19bf1be2581e..80a71f597854 100644
--- a/media-gfx/tic98/metadata.xml
+++ b/media-gfx/iscan-plugin-network-nt/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
+  <maintainer type="person">
+    <email>dilfridge@gentoo.org</email>
+    <name>Andreas K. Huettel</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 47949c67ee8b..782e910db58a 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -5,10 +5,12 @@ AUX iscan-2.30.1-fix-g++-test.patch 1394 BLAKE2B 6ff018b0be888d4415a40f0d94ab348
 AUX iscan-2.30.1.1-gcc6.patch 564 BLAKE2B a80e24742c9d142ea88c2884c061efda09391aaa75885ac53de85594c5fa0c5f4b3b8f008165b647647658bbd420bcfb9a631deae3211b01f4848e3d7e22a390 SHA512 4c0ef22323f26282596d5705b0a3982bc8bca17e84f54ad9b1a23290cadbc617ae55492fd3d25e9edd283509e0a8ea1de047b18fd98fdfaf8bb22fd90c096e32
 AUX iscan-2.30.3.1-fix-x86-unknown-types.patch 362 BLAKE2B c791249488661dbe3fcf3301cfd46c04cda85ad95f8e21bae8e8f87e63e787ea69d494d7ae152dbce368ccb9fda44781201d1630e1c487cb9ad0d5d2a33e6d77 SHA512 723c3d5b6522da913ed93abaa1797f661e7eecc3974faa2bf730ced27c6a4adb3ffc87bfb38d42c4929b5afafb3cfe3e9111870aa796ea4872a053302b29ec6f
 AUX iscan-2.30.4.2-sscanf.patch 779 BLAKE2B 8e8255c0558e225b3c1bcb5faaf42f0d794177e463119595b53fd0e194b7918703d3b9ac3c8d8fa1939cc86799deda4605764f99b2aa666f3c2047ed21333f31 SHA512 345ac7ae1c75b6da24f16f9abd5f7f4352cfd3497d24229db8a15d26d767e62c8273220a7f40f18c452ab90094b56774eaf738c880c613f0463db04b6d5d9f3d
+DIST imagescan_3.61.0.orig.tar.gz 12649835 BLAKE2B 32c31dcc6bdd9bbff7763e8f671642f586ebc4cb6ce1e3d532b3889b314d39c14253ec7d0547cded0b5bce95d45e8ea1d9586f11cbe101592f6fd73902408cec SHA512 276a3ca69aee7449c9ebc0c1a0364514db3d5f73d4d2cb2c5380b09463e6ba4adf077ca52d403563d68fc4e714ece1ddca1d7310349926e6017a54a371c09612
 DIST iscan_2.30.3-1.tar.gz 1216848 BLAKE2B 8a5f485c1dd814248c46aec6accedd331105c3ccc0f70a582e60dfb62b1cc1f1ebab358f0896b15cbf842ea06f8a35447d91f76391b10bad07df371512856c32 SHA512 5f68b2f7b7c1d1b5d3d65a55c3a80538fda5d2bdf9cd50fbf942e0eb49dcb84983ede66ed2f6354f9591692808df54415400fe02ed47e7373082869612a47872
 DIST iscan_2.30.4-2.tar.gz 1236167 BLAKE2B 598e55aa7099f7973b38f5c3227415c8ddfa7e8c645521981b4e8979047ab692427f5c1719fd83fe0635f2d4604f32f0baff8542f3e1a333298799c4cad7b980 SHA512 b12f374ff8ee1e1879fc6dbc579de39d7bcd4777ec7ad6e4345046f77b4ec13ae45ebdc2803d6907bc2747776aa7e32c313866138c7b8c7bcb53110a214154d2
 DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
 DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
 EBUILD iscan-2.30.3.1.ebuild 3517 BLAKE2B 2c9aa0bf5e12e34c1637951936db597ea0d5fe70509355bf28cef8d7c0c917ed07e940632eae42f2903e00780dc05cead627a90f733ea2f532fc2b5e6d8acc9d SHA512 1331ded32c9d88312c517e5ba5447e87471a0223747d46c22ded7c3a185f715b3a9b4d2d905bb0239cbe31edc1197c7a71a5626af0bf8084b0834124d7745de1
-EBUILD iscan-2.30.4.2.ebuild 4020 BLAKE2B 6b4aab58d9d3b542d9bb338c5d43591217c92468f0ec5d49f6eb48f6575fcef35bcfd2e83566fd4dc4ce1e3ee944f8d10364c4f81a74d4ddd58cc51da44c4395 SHA512 123e0b6481c1209ec7e72fd999ec31551a9a9a0bb4bb26bf32cd89bda02ccf64201217ccecdcf212750279770dd15005327911cf898402aa3a1980351f1e83e4
-MISC metadata.xml 779 BLAKE2B 715d705e7775dc8aefea2c58afaf0520819abe2508ee9dde67298a2acdd847b953ac46750bc711e018eea5ddceef2ef3e7f16308c32fade334622cb9a16f745e SHA512 9ead68d2de8d4b5e09e2d478b6f198d8a83985eaa779e941189f1017beb081910fcc6c7d3c1f41db84b91df55399e5e005c326c7bb2841b2ef745d735aef562f
+EBUILD iscan-2.30.4.2.ebuild 3960 BLAKE2B 9cb40b7213717045476cd6b4c43039df725721ee18ff79b487d11ca2edd1c9752d8a222ad4cfdd03c83048e87e6a4b6b88e6fb44b3382a0a9e21634ce229fea3 SHA512 c715ad28dd6e44123804f5bfcd0fc92dd4d7fca3a5487a1c16c6c23dd96c37b7211686897263931c9511c0923ba434cebe22acdac65a4213c055d376200f4dfc
+EBUILD iscan-3.61.0.ebuild 1161 BLAKE2B 2995eb38b02d3cbf9f108e84f6767ece80082cba82b1a5f1f2b067da1cc1a234ae7971684c3516c6dd93ac0c3d798cded84ea08518bbf1493a2fc2efe07e0a79 SHA512 8efaf5d150233c38f7160ddf139cdd12b42ebcf8b62c0873399d0cba5f579bc4e895f92d9683ee40fc78d920a7f5cfb54242bc178a2c14e6f7d5abfd5beec452
+MISC metadata.xml 923 BLAKE2B b9035c8d418ac3993d4103cf53657da8bbb829aed4bf010241f4f781984ff9450779ca6aa196f604d52680378761635a2ad868c3dbb7d8b87774f5231d251cd9 SHA512 004b33e1d57943fb6ed8319def74938a98dc323dabbb695ff145adff01d84a026311a44a735bc621be6e68e3c3f4e06c1274449d6e2ad30e37f2952c0bacd6ef
diff --git a/media-gfx/iscan/iscan-2.30.4.2.ebuild b/media-gfx/iscan/iscan-2.30.4.2.ebuild
index 90d8c1c878c2..4be72d181288 100644
--- a/media-gfx/iscan/iscan-2.30.4.2.ebuild
+++ b/media-gfx/iscan/iscan-2.30.4.2.ebuild
@@ -126,7 +126,7 @@ src_install() {
 		done
 		if [[ "/plug-ins" != "${gimpplugindir}" ]]; then
 			dodir ${gimpplugindir}
-			dosym $(realpath -s --relative-to="${gimpplugindir}" "${EPREFIX}/usr/bin/iscan" || die) "${gimpplugindir}"/iscan
+			dosym ../../../../bin/iscan "${gimpplugindir}"/iscan
 		else
 			ewarn "No idea where to find the gimp plugin directory"
 		fi
diff --git a/media-gfx/iscan/iscan-3.61.0.ebuild b/media-gfx/iscan/iscan-3.61.0.ebuild
new file mode 100644
index 000000000000..3fe05c6da65a
--- /dev/null
+++ b/media-gfx/iscan/iscan-3.61.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="EPSON Image Scan v3 for Linux"
+HOMEPAGE="http://support.epson.net/linux/en/imagescanv3.php"
+
+SRC_URI="http://support.epson.net/linux/src/scanner/imagescanv3/common/imagescan_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3+"
+
+SLOT="0"
+
+IUSE="graphicsmagick gui imagemagick"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-libs/boost:=
+	media-gfx/sane-backends
+	media-libs/tiff
+	virtual/libusb:1
+	virtual/jpeg
+	gui? ( dev-cpp/gtkmm:= )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:= )
+		graphicsmagick? ( media-gfx/graphicsmagick:= )
+	)
+"
+RDEPEND=${DEPEND}
+
+S="${WORKDIR}/utsushi-0.$(ver_cut 2-3)"
+
+src_configure() {
+	econf \
+		$(use_with gui gtkmm) \
+		--with-jpeg \
+		$(use_with imagemagick magick) \
+		$(use_with imagemagick magick-pp) \
+		--with-tiff \
+		--with-sane \
+		--with-boost=yes
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	elog "If you encounter problems with media-gfx/xsane when scanning (e.g., bad resolution),"
+	elog "please try the built-in GUI and kde-misc/skanlite first before reporting bugs."
+}
diff --git a/media-gfx/iscan/metadata.xml b/media-gfx/iscan/metadata.xml
index 4a9a095daf72..1548b9bbd49d 100644
--- a/media-gfx/iscan/metadata.xml
+++ b/media-gfx/iscan/metadata.xml
@@ -9,6 +9,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>dilfridge@gentoo.org</email>
+		<name>Andreas K. Hüttel (only during xmas vacations)</name>
+	</maintainer>
 	<longdescription lang="en">
 		Image Scan! is a graphical scanner utility for people that do not need all
 		the bells and whistles provided by several of the other utilities out there
diff --git a/media-gfx/kcoloredit/Manifest b/media-gfx/kcoloredit/Manifest
index 8264aaa62825..e276fc9cbdf7 100644
--- a/media-gfx/kcoloredit/Manifest
+++ b/media-gfx/kcoloredit/Manifest
@@ -1,3 +1,3 @@
 DIST kcoloredit-2.0.0_p20171121.tar.gz 67173 BLAKE2B 2114da34e47768113bf643380efd29e59980f5bcfd544b183db7201b6d4707b81bbdc908476c6c5d36acf8b04e68c6ba1f85aab6f2e7594124f9ce4cbc496e54 SHA512 82dd71e45121357a7da45247862f4f9679fbd132e09e8fb85c0cbef6b73069443f84fe51ec642d30b0ff9b5db10aebf34978000636375afff6c91b49089a9554
-EBUILD kcoloredit-2.0.0_p20171121-r1.ebuild 1029 BLAKE2B bcee39ab6f539292de06ee4e2944febbf6bf04ec35098683146524dc0e3cdf2eb73e1d0b2aea5183834e9b5d7c4db2ff822f1edaaadc96d4e8da1f6e2ace509d SHA512 427b12cb0f6c75a36759e9a72c868c039e5db87e2f3b162cdeff359ce9cbc87abfef8973e48de486eaa303a31c3e414d20925e5ddc7b898215a645b34dbd6180
+EBUILD kcoloredit-2.0.0_p20171121-r1.ebuild 1152 BLAKE2B 9d232ddc570944b0f3fbf0fed0df51275cff2ccc1609fae6548b6d9f503b9ab5334d555fcc072a672ad7b8c92da5192b48a66c76669aa640e4d1115062cb91dc SHA512 8665742fd1f35d952a8164f42aaed09978a61c48738bff85314f377c85d8fe2971cc785fa2c95d60bc9e4c52e9eb17f87a252d638c1591676460c12cee7c89c0
 MISC metadata.xml 245 BLAKE2B 7d8aa6c42d332c65c417fb557b95907322f61713c6ee71b25af3944be1f2c693e2110598f877c28fe2bbef4a9fd064fe97c24a92092599d1c2df69e3e3676a60 SHA512 90bcfe500baf163912aaffc9958c9724c4a97cfca294cae6c2eea938f4ca7668c84b132b6dce55767efa47a28b9e87bb75e79634b59079ab8ef3eff3ea95968e
diff --git a/media-gfx/kcoloredit/kcoloredit-2.0.0_p20171121-r1.ebuild b/media-gfx/kcoloredit/kcoloredit-2.0.0_p20171121-r1.ebuild
index e216c0f0398a..bd4bb3311025 100644
--- a/media-gfx/kcoloredit/kcoloredit-2.0.0_p20171121-r1.ebuild
+++ b/media-gfx/kcoloredit/kcoloredit-2.0.0_p20171121-r1.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 COMMIT=50ac0509891343bc01a0aeffda5a44a1e65d9d04
 EGIT_BRANCH="frameworks"
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Tool for editing color palettes"
 HOMEPAGE="https://userbase.kde.org/KColorEdit"
@@ -17,21 +19,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}
 	!media-gfx/kcoloredit:4
diff --git a/media-gfx/kgraphviewer/Manifest b/media-gfx/kgraphviewer/Manifest
index 652722b3eb5f..c0a6ce7e4f65 100644
--- a/media-gfx/kgraphviewer/Manifest
+++ b/media-gfx/kgraphviewer/Manifest
@@ -1,4 +1,4 @@
 AUX kgraphviewer-2.4.3-set-startupwmclass.patch 1045 BLAKE2B 8e48bc5a67cf8857a5eb5a57873fbe19a5a3cc52ef70d5c01ca3674d889acfa28dc46456caccd3a6078572b876e9f73b15e483f46fe35f82bd6fcdbed5d2312c SHA512 b4005bf61e448be43f7bcc3886ec092c9f2930e475067f4c1a382db4039dfdb580ce7e2a4765480438f80dc2e905013c43c8b65711f87fb14e62de73c60bedcd
 DIST kgraphviewer-2.4.3.tar.xz 1491328 BLAKE2B b51cf825ad4763538139f917a7d16d15a7244c19b3cab9c79bbd938ee3dd80e4e35e37012199e1256bcc9a9404d756cdb0f5ffb975484d527577c208ecf1d3fa SHA512 d18146ba380efe73e1ec716dd1cc310fe1eac23eccb10e2a699b107451637b9332cc25d62a4de762df4706cea182c9474ba1e885801c9832e1bb9bff1648e72d
-EBUILD kgraphviewer-2.4.3-r1.ebuild 1024 BLAKE2B 940daf0846ae9311673255a8922bd87c975338bef4fd78254af9ef3b2f3deff78db481aa2a16d7895be05cc0f074f6ab23ca1bccddbcefa7a40e4098abfb265c SHA512 e9f566e219c313f20bbf1c49320c919fd0ad52cb89865eae1f33b29f8f803dc9f80a91606c3cc3079381b8d04707b57f7b562de569f121605132590fa1947b35
+EBUILD kgraphviewer-2.4.3-r1.ebuild 1151 BLAKE2B 7db4acb9f4f074fb9cec921dc3938c98adc31770e4b0277e91ac09f930a8a79ec2ec08cc019952be3ee6a77b6c384a872e77649ce9122b4115d1db5c316414ca SHA512 77e19f012fd9a30c483ab0cf81486db3e2a39722b8199f2db9e74082f54d5305df353cb7fb62b6ee9452eb746c93f9af081ec655881128e86f748a6a5c8f07fd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r1.ebuild b/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r1.ebuild
index 80476c054574..13620f941253 100644
--- a/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r1.ebuild
+++ b/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r1.ebuild
@@ -1,33 +1,36 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Graphviz dot graph file viewer"
-HOMEPAGE="https://kde.org/applications/graphics/kgraphviewer/"
+HOMEPAGE="https://kde.org/applications/graphics/org.kde.kgraphviewer"
 [[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )"
+SLOT="5"
 KEYWORDS="amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=media-gfx/graphviz-2.30
 "
 DEPEND="${COMMON_DEPEND}
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 2feafdb5b409..f978a1d4bb82 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,3 +1,3 @@
 DIST kphotoalbum-5.5.tar.xz 11661532 BLAKE2B a14900cb7628b86aafa736de4b443f3aad3b4198bc6a04bc67fbc40f1bec9898ebbc33e60d4ca90db3b857871f75c70d6946efa2e756b3c5d7ae769bee6b2723 SHA512 fcca891a94580db2f606c5d077af2651e1dbcd59429823410f9fd2d07ac0c3c625ac441b723d4c8cb3ac7ede26ccf69f955c19fe302fffc9788fc33def9ee3e0
-EBUILD kphotoalbum-5.5.ebuild 1514 BLAKE2B 8b8448be3628a37bfc3b095ad03d95c96e5e382fec49ed8867aeeefeb0c1d7ff0d93ea3bd6c9bc6bf0614bc2364ca151d4b06715c7489468a7c872b6be3b027a SHA512 999cfd4416e91eb6e2ac1b9dbe915f341598c9dc8d1a19f770bbda4ef71ea3720db47651a5b5baa4d14fff889f7afb86762c91ed11f40201583ca08b55352928
+EBUILD kphotoalbum-5.5.ebuild 1496 BLAKE2B c1196e3b012258e8170c3a8c27318c55c4cb4e4129959be04078de5b0c9714af0fcf0e6774356ad518b4d62326a15eae08ee95cd280eadbd6819ed5c41852352 SHA512 9795d6c59b50bd328c7a5556441abbaa108c308398782e9172ab0617025a0769cfbce3ea0e46f5df1eedfd609f8bbb91638a4c964517adf950efaef8408cda2f
 MISC metadata.xml 424 BLAKE2B e5e77a618c93044474c0a049bfd37dddbddaaed85bf84fa2e5e7233064176032cc255dbce77607aceca20e431f43f98e29295c977e7841dc86b2c5b286c6df8e SHA512 ec0c2fb381cc5d4b38576c6d5c5b002a07d01027881906bdc1d786311d1d738f6dd67074a6c768a10bbefd3c2c5f01b88bc78cd3456c5884a6d5646593d0dbca
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild
index 2a3a8d42bf70..752ae5dc4358 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild
@@ -53,9 +53,9 @@ DOCS=( ChangeLog README.md )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package kipi KF5Kipi)
-		$(cmake-utils_use_find_package map KF5KGeoMap)
-		$(cmake-utils_use_find_package raw KF5KDcraw)
+		$(cmake_use_find_package kipi KF5Kipi)
+		$(cmake_use_find_package map KF5KGeoMap)
+		$(cmake_use_find_package raw KF5KDcraw)
 	)
 
 	kde5_src_configure
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 10a28556abea..3efc287cc1b0 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,6 +1,6 @@
 AUX krita-4.2.4-tests-optional.patch 12292 BLAKE2B a30463dcc6e02e877b308c4add529f0657d96ace7a13ba7424f4cdf260f3b636d03b2bac224d6239253393650163b622ac54d8d81bbdced2fb153bf216b5fb2d SHA512 1d5045b35981822bc16c4b23e573a299a8325353c8be347c56a4e2fc4e3cd9e937e8eb253f9c6cdc0197a3db7989b822fb41274afe3cd506b9c907daf1867df3
 DIST krita-4.2.7.1.tar.xz 164304772 BLAKE2B 99a4c3b6a48d1d695ee5bb8f6576c9a4593e1ff3a10846340974588ff8b3c061a7838b862c1ecdc4f0635ffa270cb272f1155b1efca4dbf50a11096ee1e92d48 SHA512 28f4af4131a0f364b285596031a3f59a8bd7e97930cd740a4767dbe95540dc403bd6ae0a99ff2bef95e2bac6f23931873404e4fed3ea4afd4b614b5f7d823a35
 DIST krita-4.2.8.2.tar.xz 169994064 BLAKE2B fc390db9e3aaf3f4355e600a98ea479aa510895c26cb82e8800fbff64031bab7a26e0c37d6d274e6397a38c1bc33cff6b48cb5a7c6e61b56579e92e33279b1c4 SHA512 5482ebd62c530764b43439d6782fa7e1793877657620967ea0f6cdad166e3ff508b36cd04bd99c192d35a237c4a0da08477069e333ebaf2093785e207402dea7
-EBUILD krita-4.2.7.1.ebuild 3114 BLAKE2B 5cae86dc90f5a657ffaadcefd3c6c3cb595f96bc3a48aeb45982f2d55f99546c9c4cec6412ccfa4631000764591ebcc27ed5f782d29535aa6d245fbc13e6557f SHA512 7e8fa9982d82509f0efa6edc5826793493fc11348db464ef998cdf0789d914fb185894b66b8ce5ffd053f3e08c23be68b0c4a76cb10455e63e0b9ae2fe041e7c
-EBUILD krita-4.2.8.2.ebuild 3107 BLAKE2B cd2bedeccfb5f6e19e64339fcfb5219e7f55685477d8c9fc3e078971727929e4a63cfed38489bcc326a537bc4c0662b2c2f6b0d801604c53ad74d25af5feaef6 SHA512 a9b6a75cea79ef9dd3fe8ea9fdba414c4bffaae3a36ec92df592cf54845db80976fb9288904b8cca2016f21313c9781454b2bc956d382596b461399f3037c6c7
+EBUILD krita-4.2.7.1.ebuild 3042 BLAKE2B 02884d42141bb22b222fa82a619f380c6a22dc6aa0ca0d61f5668259de8a45a23282c333d13e8e006898257672232284a3bbd7a23f37c18a69f300a6de3b5e1e SHA512 63119789211cf958b8352f700a4409e2885d002559d2d9da8cf4fd00fe13578711357a2d863db68b3e34b8bf8eee4f239a95c081cba47c1940187f5d44e8c7eb
+EBUILD krita-4.2.8.2.ebuild 3035 BLAKE2B c61d765ddf20ee41a52ae5f8c4e74224df47d154d0983a025dd8a6268be4d2fc41fac0cbb7b2cc604063f7a5e998497a34233767daeff389d2110559720397db SHA512 8912086f449982aba8edad2f502483e9319eafa45d4c53772aad363df418fd5da2be7330d7e4b7cdf5989cc7ade49943e696d22394a60d9ac83adb7cf398c8c7
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/krita-4.2.7.1.ebuild b/media-gfx/krita/krita-4.2.7.1.ebuild
index 4f1797aa0064..4c9525d74aae 100644
--- a/media-gfx/krita/krita-4.2.7.1.ebuild
+++ b/media-gfx/krita/krita-4.2.7.1.ebuild
@@ -98,18 +98,18 @@ src_configure() {
 	addpredict /dev/dri
 
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package color-management OCIO)
-		$(cmake-utils_use_find_package fftw FFTW3)
-		$(cmake-utils_use_find_package gif GIF)
-		$(cmake-utils_use_find_package gsl GSL)
-		$(cmake-utils_use_find_package heif HEIF)
-		$(cmake-utils_use_find_package jpeg JPEG)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package qtmedia Qt5Multimedia)
-		$(cmake-utils_use_find_package raw LibRaw)
-		$(cmake-utils_use_find_package tiff TIFF)
-		$(cmake-utils_use_find_package vc Vc)
+		$(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)
 	)
 
 	kde5_src_configure
diff --git a/media-gfx/krita/krita-4.2.8.2.ebuild b/media-gfx/krita/krita-4.2.8.2.ebuild
index 8d45b1ca065a..99703d1a2126 100644
--- a/media-gfx/krita/krita-4.2.8.2.ebuild
+++ b/media-gfx/krita/krita-4.2.8.2.ebuild
@@ -96,18 +96,18 @@ src_configure() {
 	addpredict /dev/dri
 
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package color-management OCIO)
-		$(cmake-utils_use_find_package fftw FFTW3)
-		$(cmake-utils_use_find_package gif GIF)
-		$(cmake-utils_use_find_package gsl GSL)
-		$(cmake-utils_use_find_package heif HEIF)
-		$(cmake-utils_use_find_package jpeg JPEG)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package qtmedia Qt5Multimedia)
-		$(cmake-utils_use_find_package raw LibRaw)
-		$(cmake-utils_use_find_package tiff TIFF)
-		$(cmake-utils_use_find_package vc Vc)
+		$(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/kxstitch/Manifest b/media-gfx/kxstitch/Manifest
index d8b1292a420f..bbd0b165e5d5 100644
--- a/media-gfx/kxstitch/Manifest
+++ b/media-gfx/kxstitch/Manifest
@@ -1,3 +1,3 @@
 DIST kxstitch-2.2.0.tar.xz 1784360 BLAKE2B 6d06090bb33ccd4db7e8b8a3521b0e1377f253b472cc500862b1b8b0da1abf0d759a85a870b50a1a1f55f385274cdc94761e612a838d93aaffb76191df725150 SHA512 bf09130a35bc605db2bbd6e5e129ac494e8f02b920d4a8d6705b5030a9339306b3b302bd988839e1684da3e5e15e91d655dadf916eb4bf2dc9c1322fd435281d
-EBUILD kxstitch-2.2.0.ebuild 918 BLAKE2B d994c10f0ff306f9dd5f49a6c569923641244d37412825f7ffffef4f227aaf0625152d0f3b0bb7ae7894c99ae0af5876598e6db843ac706eb14943ad1dcdca96 SHA512 0139f2eeeaec41152ee24df14692f9605fa37b53012c72167b103d0ed3dce86a454214d92a8c92cb5b03ef2677dc01f1237bacd6a547454c11d9ac947a65ba96
+EBUILD kxstitch-2.2.0.ebuild 1090 BLAKE2B 222a7f15b9f6aff316dfc2a829545cf405930e4bc6c829c00ad0ad774e57e1f5c8814c794617e03661db40952dbc601207a10ec23a3cc228c3a82c76285b902d SHA512 c82935d996386b126694d5b5a4f6539a36620b91c7db39adc90a5fd3c503e87ca548f389020488b37f8ede87b879ce17d411e327a149a3a53167c4ac2c419969
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-gfx/kxstitch/kxstitch-2.2.0.ebuild b/media-gfx/kxstitch/kxstitch-2.2.0.ebuild
index 94faf7f2268d..3d7812d60aa4 100644
--- a/media-gfx/kxstitch/kxstitch-2.2.0.ebuild
+++ b/media-gfx/kxstitch/kxstitch-2.2.0.ebuild
@@ -1,13 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Program to create cross stitch patterns"
-HOMEPAGE="https://userbase.kde.org/KXStitch"
+HOMEPAGE="https://kde.org/applications/graphics/org.kde.kxstitch
+https://userbase.kde.org/KXStitch"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
@@ -19,20 +22,20 @@ BDEPEND="
 	sys-devel/gettext
 "
 DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	media-gfx/imagemagick[cxx]
 	x11-libs/libX11
 "
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 678ed0c5373c..dd2d1a8c6666 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -4,6 +4,6 @@ DIST libimagequant-2.11.7.tar.gz 74311 BLAKE2B 204fbe794014c11d767991a03e729b234
 DIST libimagequant-2.12.2.tar.gz 75611 BLAKE2B 23f5d3666fd21696d4f4dab9db3669642a9e3f6ca971804b914e845018df538136c3db900419ac35230be9fd487b48e0ab672b653e2ee82387c19569b49d6cfc SHA512 7e7bfcffd163d8b73a46d523dc441e4a4726f5dde804f306f13900f74afae6f6e7cf780bf157b5823a71c790bcdd0e9c9c34cf43f84a21289e470fc78835d8d8
 DIST libimagequant-2.12.3.tar.gz 75866 BLAKE2B 857a0e3f0187251e37e0c7f4f5f5cbf49266e4eb9f684118705778d9469330cf95780ea11b83d19e28251f047a7e9b8e7ac32ac4d9554cb5d9e1b3230d39e796 SHA512 4818b00b6f154407f3e402d56f4891c2d7594c8056fada0402d7fa0024ae50127340dd8295da5f5dca13fe1829670a3fa8793aa528f3e74a2294c9a7e37b7257
 EBUILD libimagequant-2.11.7.ebuild 1147 BLAKE2B 41943e15f697966749897fd14aec98dec919ce81189ec5f481517d14eb94a91b95b0b0cdc9f057854a745a2fea5ccf094411900db06eb54dc6aeba410521e871 SHA512 ec8d4ce66233a74974ff6edb4c67dcf5d7f12f4535001bb770d70a995cc5a9b2600f900777fc1996335d49f85efe10a3dc21e547c2b535c68720ee455ec4352f
-EBUILD libimagequant-2.12.2.ebuild 1407 BLAKE2B 5b2f00d50bcd0b445b220c20316eb5974c7c40cfe3c520d90f4ad17bee7971c4da7a7255aa792a0858a9312874e0a3f975de6ff290f7b29ea7e148190b27bb0c SHA512 2f418c79f36a39aa248a72d9427565c51ef18a050da1a469f00c3449d3cea0f4e3afa847160fde1c87bb72e0aca59444194553cef841414284438452c2df28c3
+EBUILD libimagequant-2.12.2.ebuild 1405 BLAKE2B 74af0f628654812c3f109eb34a9093eaeacb4ee2023075bed2c8602a59f8ef94b5efbd911e4c580714b1ef7e09f150d373e3b98bd1e39a2672dd3923fa921ccb SHA512 245ba762d0743e11992c30c2f576e4d0e508c388d306e0a638093b5bc46bb5f71530cb1ce1ba6ca42421b5aee4ff6974fceaaf74f04200af2eaaf4eb2386020c
 EBUILD libimagequant-2.12.3.ebuild 1407 BLAKE2B 5b2f00d50bcd0b445b220c20316eb5974c7c40cfe3c520d90f4ad17bee7971c4da7a7255aa792a0858a9312874e0a3f975de6ff290f7b29ea7e148190b27bb0c SHA512 2f418c79f36a39aa248a72d9427565c51ef18a050da1a469f00c3449d3cea0f4e3afa847160fde1c87bb72e0aca59444194553cef841414284438452c2df28c3
 MISC metadata.xml 527 BLAKE2B c3fa42153fa6cfede4de3d59e12063aeb44f67ce89d36be63c7df4671c57ecfdd43d08aee89bd96387ecbee2e41b1d5921e9ad2486b4dd8f06e6e93529afb0a8 SHA512 82b458b27288b6b49df16d5778f6c75b492d958bcc1c2f2950dee741bfddc82f561be50f590d3f891bf736ee67e5325ae297bf49f99c769ca97ac68042beee11
diff --git a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
index 3143dad9cd89..02ea4f542a52 100644
--- a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
 
 DEPEND=""
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index a5c54d4794df..eebd1f41bd99 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -4,4 +4,4 @@ DIST librecad-2.1.3.tar.gz 22415288 BLAKE2B fb920113a7e4b2e9e7e3425f77364c36f6be
 EBUILD librecad-2.1.3-r4.ebuild 1102 BLAKE2B 8f9a34ce4d164d741fd9c053a956eb28b289d2287f1a627ac11362b47799390753db65e32ace5b57bd2ad0c9f2b84223f86fd9fd77160c0f85a31915b7041c1b SHA512 907a94b6d98f6dfc49e33d2fcb1611b76cbb5f309b22c4ed5ae51ffaaefab146379b39e42849f7bcc97bb7a0f394e31b6df82bd720537ddc387aeaced110a40b
 EBUILD librecad-2.1.3-r5.ebuild 1132 BLAKE2B 1f2f4506ac904e51304f45ce788d4a1b610419297ea0666b481e6bb7f759777b6ad2dbaf777d17707ebe844fa525e76e2faad4e138883c917f5e1ab2688a7229 SHA512 dd4a522f66341db71ef068212781ce482d79220faa9e554c8f5c6e0ff4e95f754214d6e6e0e69ce0b0e151081750de164807d37d6c3d85a1d9602a50e7b87c98
 EBUILD librecad-9999.ebuild 997 BLAKE2B c2f46819e1188ac08ff278385f696c578dac20c707b666d5fe297c2ff19b3f8c37f048e8c3083acacf4f7165378ed5f5de37209b6eff50fd73b8970dd7377b18 SHA512 8e8633998807024c30de31be9eb996b5a6abb1ab416247258e35b1497ea9824b7035556201b3a9c8c546cb3402406344353cfca37ce5d2fbe268bfaafe693b77
-MISC metadata.xml 459 BLAKE2B 8b648b5abdd62d9df306c90d182164694c753231b16ad37319863ee37feac91b2e0fcc89212b5259a899287a638a68cb2e48fcc55af8a076d23b201e6b38ebb3 SHA512 108977904dfb070a16279d3306f40982a73b1cdddfa90e8ab22f83c4a75cd620a829fea9a56a0290d2d160b1d30fd0fb67e320f526726dd57a613e781c700b6c
+MISC metadata.xml 408 BLAKE2B 40e860453480281f8a148bfe527530c836bf21801a435f787c4d07ab1005dc9492a96c3dc0fc7dc4362fe35626f653052f0058eaef84336c59c8910256cfeaf5 SHA512 e08b9546617943ae66186e4b99c53c900a98a1950f429f84b525791c8030b1ec1786b4dfafe983537915ed597e3e9fe089bfc6f701a57af9c453293a2db2c2f6
diff --git a/media-gfx/librecad/metadata.xml b/media-gfx/librecad/metadata.xml
index 56059e49ff58..e83f7a4a7026 100644
--- a/media-gfx/librecad/metadata.xml
+++ b/media-gfx/librecad/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="3d">Require all 2D coordinates stored as 3D</flag>
     <flag name="tools">Build additional tool programs: tff2lff</flag>
diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
index cf78cda9a690..cdd16cd93c74 100644
--- a/media-gfx/luminance-hdr/Manifest
+++ b/media-gfx/luminance-hdr/Manifest
@@ -3,5 +3,5 @@ AUX luminance-hdr-2.6.0-cmake.patch 855 BLAKE2B 2656ec16d554199a8cb0dca0df77ab71
 AUX luminance-hdr-2.6.0-docs.patch 948 BLAKE2B 5ac822b10ffc61c552292806adc3f5470a7f03a9b2df7ba385435904963e52af583a892762867abb6a76a5351ffbbf0ffbd67107310e84bab9b649cc33666e09 SHA512 2b242a558c3b734a653943f3128c4cbc2440f940407faa096505ac7abe945c729bd0b4c5e9d06f53141bdb1271b097d7de15e87cd31db75ef1e30839a64f32b0
 AUX luminance-hdr-2.6.0-no-git.patch 377 BLAKE2B 454a9973831aa3ba312926190a84622c8c3bd9481c67ece8ccf8916517f6b314931a09adf8a4168d8a1c7cd8a7694db27291009b9fae8a9cacc8356d32c7f5c3 SHA512 fba84a0415c8e514fb85b229adb29fbda238e8146d2dfff296d92fde33aeb22562e5ac98fed2422326354be9c0096cc2bd1b8947edfa9e7ca160d207ba0db476
 DIST luminance-hdr-2.6.0.tar.bz2 11556372 BLAKE2B 0026768202d35126b82101eb2dc7cdc2917728b519c1cadc62ffb6470204077b4b6ae220ebf09c7f903839fe0c714715efe796ee4830cc92174370cd2741d576 SHA512 6cfb21b1ddc9cac612e3d176323e34c5181333f1b52953c02ad5aec28cc86bf519ecede248847082085879c5c2fd2c5570b05f5d3bffa96ba3781ff8cd1967d1
-EBUILD luminance-hdr-2.6.0.ebuild 1861 BLAKE2B 651f809ba3540b7fcfd293e9c02a84effd7e47764569be897173a0af323b15ba30ecc2fed61cbbabc2590953647a2bffb4658b454cc36f1706cff6baaad7fbff SHA512 456453932ad36d8b897f929c160edef717d6f68a7c2b56ce391f9287fa6fc48953f9214fe6ee61208fff5261e1fc8cf21d75871cfb8372f7715b662892a5e5c7
+EBUILD luminance-hdr-2.6.0.ebuild 1843 BLAKE2B 8bcee6c893debc0e00445e4d2f0f680b87749beda8170543efc48499bc10d234d9b703fa50e0d9de0eb086bfd5d25cfd8d71e85b4dd138543eee2f8eaad4c440 SHA512 e6e72e6ccdf35c57c70350dab1bcad86bdaeea7e1df59bcd0d9596ea4d904654b1eab48b6fda0dd4a13fb3d971a8dc16bd4b932ec64aa90b3725c75836f82702
 MISC metadata.xml 1276 BLAKE2B 5b913b3c342f4d5a6fc67c30008d8eb9469c61cea7f6a10b8c29d1e60324da71e662a4f4d16a0d4a20c7431f5bab3dc9e157efbeae5dacbdadf4b2f5989e9058 SHA512 f1c9daadf3632c1f22297fe5987484a72cb7f0fa3f0758883c7d3c4fe798a6cad7838b855267b1ccc4ca74574692d915e725940c77e9891652a7cc80604a2597
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild
index 6d4b458a8765..0ba1f7bd1035 100644
--- a/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils toolchain-funcs flag-o-matic xdg-utils
+inherit cmake toolchain-funcs flag-o-matic xdg-utils
 
 DESCRIPTION="Graphical user interface that provides a workflow for HDR imaging"
 HOMEPAGE="http://qtpfsgui.sourceforge.net https://github.com/LuminanceHDR/LuminanceHDR"
@@ -70,10 +70,10 @@ pkg_pretend() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package fits CFITSIO)
+		$(cmake_use_find_package fits CFITSIO)
 		-DUSE_OPENMP="$(usex openmp)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest
index 030b4de56c5e..0fdd039ce56b 100644
--- a/media-gfx/lximage-qt/Manifest
+++ b/media-gfx/lximage-qt/Manifest
@@ -1,3 +1,3 @@
 DIST lximage-qt-0.14.1.tar.xz 78960 BLAKE2B c58e5c553e2803cd8d40d807cd1650b72e4de6297f29cdffce19cf3eb402d01735d869ed4e31e9c28ce03e09038628331cc547aebcb636c34dc936b349e33c9a SHA512 61286ade177a41d954e7b624b9f1320dc64fe6ef5ccc5ffbde5edee1e8cb00f3691b6a04f8eac4314b3fb622ba0613eb4d1851358f3a8c12e4a69d990c1ce3cd
-EBUILD lximage-qt-0.14.1-r1.ebuild 880 BLAKE2B 3ca53743d4547793947308b288763b570dc83abc8a79af34202c22a277646fc3d6db65690087a7c3957f9dd913942da87710c16fc0dfc73ad076fb967dd2b62d SHA512 e64b5b4f4b70d460629a332904171d9999556e4b9d4fd35bbf843dd3de57fc723a41bbb750e78c6fed614c1d0dec50b02bbec8e488bbe94f5dd3d3ab82b7cf29
+EBUILD lximage-qt-0.14.1-r1.ebuild 874 BLAKE2B 3ec899086ab9c1be170ba8c7876cfb1fdcb2856cf7d5c45e5b419b644f29ad940f5c0287aacbb30cdb0687090af68bbbb0f13c95f55008d86a215f9de76ec47d SHA512 3347752c815b2528343f496695bd7ce7f883d864fcaa69d72d7e561fab82fe16ca6c3432a13fb6ec51862dbf7e65336df0a3e9f0110c51d2bbe4127373c4d76d
 MISC metadata.xml 316 BLAKE2B 4efdea74e716c40a0a63878d175f612e550669866bada61cbc0b22d5320a7bbb6a7158796bd5337e71c8aa70d42a977142d9466ac42fbb91f5eb2adcd83fb714 SHA512 b3cad1b8550e54a57940f2cea14c38bd714da71dc772ae073065c6c56c5d4d02a7258dc3ffc226a194d290e7b968a198fa07b02f6c011282896f9ba7173c3c53
diff --git a/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild b/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild
index 6a97c334b7a4..4d0f37e5e5a7 100644
--- a/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild
+++ b/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="LXImage Image Viewer - GPicView replacement"
 HOMEPAGE="https://lxqt.org/"
diff --git a/media-gfx/maim/Manifest b/media-gfx/maim/Manifest
index 87a779f7091b..5a33cf25f2f5 100644
--- a/media-gfx/maim/Manifest
+++ b/media-gfx/maim/Manifest
@@ -1,4 +1,4 @@
 DIST maim-5.5.3.tar.gz 40083 BLAKE2B 93392bcec8d1ae5188c27414695b04d0ff94a0824e9ef4a7fe8ca0949a1583b7dc7893346bde94bcdf629d9dc8d3f8350a8484eb8cc5bcbf8ff24cbdcb651b10 SHA512 bbcd4f0276090b9650cda88e527d0d1b80270a50935fbc02aac9a302a64bc3975386f24a97d8eb3c1f97d7d32cc9905d5e1f652915fbe3aae0766bd90bc5f51a
-EBUILD maim-5.5.3.ebuild 842 BLAKE2B c3a9c035b9f61ee9fff6a6c7c54a2db9ed0687f10190683dd5faefe34b5b970ac656756570e9076d2f4f6f33017f8065b5aa63de13b20de7a944a7c5b6e69534 SHA512 4414a8454d073013a62ed8a9ad7b6e105406a59fa8120415ab16a85f952484778e7a1864595ff12dd3c1b523990a61d5a072118940b23f59eba8653cc1be872e
-EBUILD maim-9999.ebuild 842 BLAKE2B c3a9c035b9f61ee9fff6a6c7c54a2db9ed0687f10190683dd5faefe34b5b970ac656756570e9076d2f4f6f33017f8065b5aa63de13b20de7a944a7c5b6e69534 SHA512 4414a8454d073013a62ed8a9ad7b6e105406a59fa8120415ab16a85f952484778e7a1864595ff12dd3c1b523990a61d5a072118940b23f59eba8653cc1be872e
+EBUILD maim-5.5.3.ebuild 830 BLAKE2B 60f6ff651b255a9f2dfe6c7099a189ad61f3847f2afbac69c340cdc8cd9dd73793715296e1f80ffe68fa469f859b55ee827cca6b854a2c2ecdea8f9c9d86b80e SHA512 c754e859aaa6149b4095ecc2e0c9bd7b79c0328ca9cd1a3db254b19aebac448ae9ccbe6b05b19a7c15c9dd0dd902df73fe20a1ec138df725d588afe0d2494a1e
+EBUILD maim-9999.ebuild 830 BLAKE2B 60f6ff651b255a9f2dfe6c7099a189ad61f3847f2afbac69c340cdc8cd9dd73793715296e1f80ffe68fa469f859b55ee827cca6b854a2c2ecdea8f9c9d86b80e SHA512 c754e859aaa6149b4095ecc2e0c9bd7b79c0328ca9cd1a3db254b19aebac448ae9ccbe6b05b19a7c15c9dd0dd902df73fe20a1ec138df725d588afe0d2494a1e
 MISC metadata.xml 370 BLAKE2B cf97a29c8998e02c1cf3c1a2262af3b4ead910bc3b9a84a43ceb97eb6f8522b134007ba6380e5a0e014ac62b4faad27f856a847026bba576e1e1a6e4c2bfd160 SHA512 d3c3fb700a3d2c5c67a3919ae60fba9e843734875378ba682d93f728c408845f580caf940b3e39436582ddd1c3e2fe4e21f01cc74960d00f8cbddf20047abb62
diff --git a/media-gfx/maim/maim-5.5.3.ebuild b/media-gfx/maim/maim-5.5.3.ebuild
index d046bb0b70e6..f0567fc401b0 100644
--- a/media-gfx/maim/maim-5.5.3.ebuild
+++ b/media-gfx/maim/maim-5.5.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Commandline tool to take screenshots of the desktop"
 HOMEPAGE="https://github.com/naelstrof/maim"
@@ -37,5 +37,5 @@ src_configure() {
 	local mycmakeargs=(
 		-DMAIM_UNICODE=$(usex unicode)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-gfx/maim/maim-9999.ebuild b/media-gfx/maim/maim-9999.ebuild
index d046bb0b70e6..f0567fc401b0 100644
--- a/media-gfx/maim/maim-9999.ebuild
+++ b/media-gfx/maim/maim-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Commandline tool to take screenshots of the desktop"
 HOMEPAGE="https://github.com/naelstrof/maim"
@@ -37,5 +37,5 @@ src_configure() {
 	local mycmakeargs=(
 		-DMAIM_UNICODE=$(usex unicode)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-gfx/mypaint-brushes/Manifest b/media-gfx/mypaint-brushes/Manifest
index 07745695523e..cff71dab3b96 100644
--- a/media-gfx/mypaint-brushes/Manifest
+++ b/media-gfx/mypaint-brushes/Manifest
@@ -1,3 +1,3 @@
 DIST mypaint-brushes-1.3.0.tar.gz 2447093 BLAKE2B 26fc22ef7669f5d88b1cb2bbc4562baffe257c112baf4a782f5045becd17a0bea577f79f290ae51b38cb3030478ea9d2e251033cc95101caacc823d139fe4ce1 SHA512 f8e0050cd700358d75cd25e40acd73905e2a53f21c6177cf67e8012aa4fbba8dc445109f07601c3846f95532a40feff4441081c0aa4e958049fc0ed8008fb414
-EBUILD mypaint-brushes-1.3.0-r1.ebuild 529 BLAKE2B 9af6371367e26d41172a7f88dcf9135c726772989260448b97fb5a10a038164a0c2083b8e32253fe1300b5c1d39f8ab02bef32ac1d0c2bf0e7ceb7c47f1e6276 SHA512 4a3f706de354ef2a33b465a729fce1d16db19358626ee6d0d8e8093dbde9e2ab756fbd79d6133547a8c32d56bca54cc5c222bca575617d648d9c8b447d98a998
+EBUILD mypaint-brushes-1.3.0-r1.ebuild 536 BLAKE2B 271b801888f4e16f7d010e30385187a7af1f6435a8ccce0249261539b5985bc518d0befb18d565ddaf498b64e691d463f3890c1f7b768d800466ed26df8c6789 SHA512 2d6bd09d4aae10c23c779993a6fda73c957098a8d4ebfbd98a0cdd978fd82fa822ff7ce5ad0528987ddee57ee9d85b657a400ec269a3025029d8fe17bbe8e3a8
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
index 96c9e1aba159..7c8f622060cf 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Jehan/mypaint-brushes/archive/v1.3.0.tar.gz -> ${P}.
 
 LICENSE="CC0-1.0"
 SLOT="1.0"  # due to pkgconfig name "mypaint-brushes-1.0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink
diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 6e674047487d..71fd8c57c6f3 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,4 +1,4 @@
 AUX nomacs-3.12-gcc9.patch 1098 BLAKE2B 70e4900d2670b9e4ca9f6ae12f4720a0bc25eabdf0ba09729801428cd6f12d5655db15c3ee3a9c2e5c6f5ae5cac6cf77fd6d1730a39ceda8a713a32f989bed8e SHA512 d653c666345f50c83f199aaeec61e4e481124787f5dad53d89ed06f920e0f20beebb4a56e550665c61af3b1718d6fb24092f98b7f0d99e6ab6eb98d5995093be
 DIST nomacs-3.12.tar.gz 1736648 BLAKE2B 533e18dec4be5d945213ccd629262a2cbae1eba93599f43be0a98d32d0b54d9caad7d963809f2fc9bb5c1ba682a39f44763b5d04e50c6e86658f6cd84324f3d2 SHA512 4508354d48a6115cd40f701cc90cbbcb84490e99eaac0295db48f6fea99550d5e2b3e7365128d0c9cc4eeb621906f55e275603d84cb8b6bb164d0b5e2e192119
-EBUILD nomacs-3.12.ebuild 1315 BLAKE2B aea9616d9268a710139f8018f21b6beb2f7f976b5f7d9ebc5bbf7a4f844867dc9b737bc8a1c3d0c56feef80289af2487a14468034cb2f5386443ab0ac9804a7d SHA512 5f6f2ca97866dd134dcb65884d5d83a61f85ce86c90b8ad3fcb0a274f300d7227a50f09a0050727b7abe5ce9ab43e2e6c869944abaf2dc06463a4686bf6fc05e
+EBUILD nomacs-3.12.ebuild 1303 BLAKE2B 8d57bf7614e38a998b4e06e58d6fb8579b71308d1b16b19672316db92e8b41d7895fbabb9817a29436e6d692b5e6f6b9d97f0b0d0fe36361e294613c001f3bf8 SHA512 295dd7047ffee76e074411f26dbdd8f8288ff667cedd104cf3192ac8d196fdb12274c377a7c53cf97dca201674865eb9f66300d49054fcf3289d33f00255e8c2
 MISC metadata.xml 531 BLAKE2B fc54042c41205b0a44c1b2dcd266e1311b306ee928149b3806e16260be85a65bf0da0716706653f82ff3dc83351fca6a68ca47930a08f3d170d00416515e2eac SHA512 ac9d022d7b0883217b77513e6d913ed816e414402cd4028428f6b239d97c8f5eaab48d709821675529af8a5a3d945105997235dcb63b826fd669f1b5fb2660a4
diff --git a/media-gfx/nomacs/nomacs-3.12.ebuild b/media-gfx/nomacs/nomacs-3.12.ebuild
index 17e8151bfcf1..a527bc46b3e8 100644
--- a/media-gfx/nomacs/nomacs-3.12.ebuild
+++ b/media-gfx/nomacs/nomacs-3.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="Qt-based image viewer"
 HOMEPAGE="https://nomacs.org/"
@@ -57,7 +57,7 @@ src_configure() {
 		-DENABLE_TIFF=$(usex tiff)
 		-DENABLE_QUAZIP=$(usex zip)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index bcadae76a985..17da9c1797b7 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1,9 +1,10 @@
 AUX 50openscad-gentoo.el 167 BLAKE2B 36292439057e2b9a5993c73cf5d46e5b6b0b56695f46307114fcfffa79990be0b0622ec3a6918726d4a5f7e4343525b9e67f785996ec4eb7abb938b6df1cb2f7 SHA512 ce669eba45ab90e9dbcd770a7470ca9ed7088b1acabbc876fe4d31dc7a6edd36076063e4bd417d348c3e073113e3ad2bc2dd0ac89e02d3d8aeca7627ad7d2a1e
 AUX openscad-2015.03_p2_uic_tr_fix.patch 345 BLAKE2B 46f19ba25f9a19b2b6841493877d14a0c6c3c8dcf7d8e5ec65d4d0d8fc5c79b15467b71dd29bfeb38decd4f100d06e9fe185c1670f336672998ef02e9e59794c SHA512 9f4bd1deb85a52e1ab8fd35b384552f902b03d1f06b58144013e722d906604b96c17abf4e4074042487c945419c51432e639120ddecda143a6cb9a2b902548e2
 AUX openscad-2015.03_p3_fix-boost-1.70.0-build.patch 697 BLAKE2B 093b04177e9222e6b41cae806bd8feedf1135ffe26f966f291accb1f72e1683cab4b7339827c8720873e6d45475faabb680a3e5b40dee9e4d03f356cc49888b7 SHA512 4640dac7ee1c8dc8078c33141c08948ec45144275db84c07a079d624210516ed4795d7ff0cbea4842aac9342e07fa0ec6ad938d0fd637a2f1bee2e1055e6baf4
+AUX openscad-2019.05_fix-boost-1.72.0-build.patch 689 BLAKE2B b8aea0ab3793b3f3202f7d4154c1aaca235de2450321958819531dd9dd70c1e375c28c9004a9fb348d5116815e99e4190efd2443057991b2e97873c80f52cc80 SHA512 20bc2baf50f23e6b5ccce0d8c22eb3a5004198a0c97c8c955b15a681a64102537be35a12a37692418159de6664a36689a4c3b65b3a520d51ab086aa091a1e48c
 DIST openscad-2015.03-3.src.tar.gz 13309147 BLAKE2B 77f4e934474882e454dad683d9da6a2c9fe699a84c86ed5ebe1755de037f6930870ffb432dedeef3bea7a76cbc98d0f0d0694e5d0f7b469830370ca3548a650c SHA512 b2cee90563bdf2cb9f7b5a0d637b2266f5fcd62add6147c9326b843a5b0975b8ec900d13a2aa86485fce4a5e7e53a08cf4171a3d1d66355e813d01ca9096faee
 DIST openscad-2019.05.tar.gz 14604881 BLAKE2B ed7d6088606fab44284363da73643e556f07c0f0a7a223bdf718dcc36a82158bf23e315724ea520d63a3f1331207df0ea7b0ade817f01dd39b67ca6f36529d56 SHA512 073053f625ffa4fea6ed836396b7ff4b87b26cf7500b06c804983afc0f1dfd3d78bfb81b3fd217c3939b0ec915d85b0c7990773eaf968512a150deaa0399df13
-EBUILD openscad-2015.03_p3-r1.ebuild 1614 BLAKE2B 6893c841c57595f2139d339c29ec5a47fc3ccedeee1ddd33b7d47c295ef01ba75383918c48c4821bcd520b0e072eb73492f7e6d5cbea4a0755ccc2d5ba688431 SHA512 ab06488d537004e0aff0668e688078fa98820ed9948c1a3ff11a6c20685cee1d28d743d1b2cb6a1f8f97ea35c84e5064a11157da31d437f604b9a92326b52fa7
-EBUILD openscad-2019.05-r1.ebuild 1502 BLAKE2B f2d24980b60eb0ff80afee53f155e63f6176be6266c3ac6b7cbef0ffe987ef611d171bc8a3bde00c36a80960b722144223f6fa68317ad775989137f4539a6b9e SHA512 f1648de37ad19410fde1c022568db35ff6bb737c51e79f445232390e4156dce81e2d4b82c03ec47a9f44d381afa6ef7ed822cb945ea9dc93e2d0e3f908bca9cc
-EBUILD openscad-9999.ebuild 1365 BLAKE2B 2d00f343fd981e771b5215146d26017949dfa2c29f358a5430ce353a5bfc11e481b04b270e89a7f5717c1a535d3c93ae5b794fd2cad5834f86294927708ec3ca SHA512 d3dc21a02a29fca95aa8df5e8b650eae61f31b3fd1ab61a0dbe4c303b974f5bd27a75f92b873b3f4c0e56699afbf37ee0bf53f44fc62c59c099e1caf9cf84977
+EBUILD openscad-2015.03_p3-r1.ebuild 1627 BLAKE2B 25102ebeffe72b17181f8706aad5dbc2e53ebedcd367887bf69d042a13f9885d847c2770eaf09c785c6ee2108c978c76b624b06518f676e673a7f9ba38f1b707 SHA512 a6a44733e27fe93a96e059a8b097ba6eb9508dfe8688c97c9676f4ed55d80873c11fcbd0408ffd2998aaf647a2b5f2c0f5f9e73cf28062884322e872ca7acf2a
+EBUILD openscad-2019.05-r1.ebuild 1586 BLAKE2B 7424f651a851407daf4d3ccca76b8fb174a317322dcd098b5e2151a383f6648ee0970b154c0b39a2b77d5b354beafc645e59bc2d76f52ce44d19561f9e99c8f8 SHA512 b829c91e60e8db36b1b170e425c6bca20a8340955d294f95b641ca1b86e1d74476fbdd6f97a23844e7b10a383eea18669f92eb0e258b55252002f3f0468bad9e
+EBUILD openscad-9999.ebuild 1378 BLAKE2B 6cbdc07111b125e2ee482a284c97614a9c84071aae288d53a3f5adac8abfb255e0d4734835f00950106de760eccc84baee799f5d6517fcbd6e57ad8cd8b44f1a SHA512 dda6d1407515217996692655c7d3d8fa26472b30795e5003c58cfb9eea1eec6f32040c3e819a2a392c612e18b5cd32c2a2d49dedee23a34dd59f4ac5e51ff2ad
 MISC metadata.xml 1025 BLAKE2B f1d33e8f6f5f045c0993882d461e9bd8457fc33ee5c32b115540abe18e66b8020ae2ba0f6a593b3e7feb3e48c1d85554bb8340ee0606541964770a40dafc76b6 SHA512 951f3c8d8f68fa60d56f2c01014ab757fc4a72a7d1c98518c3d4c80db55878740a8c267b87e734cc29284fe2bd05e0b54a13c0b09eb9fd8f10fb67a051b687be
diff --git a/media-gfx/openscad/files/openscad-2019.05_fix-boost-1.72.0-build.patch b/media-gfx/openscad/files/openscad-2019.05_fix-boost-1.72.0-build.patch
new file mode 100644
index 000000000000..28d3285a7375
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2019.05_fix-boost-1.72.0-build.patch
@@ -0,0 +1,27 @@
+From b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Fri, 25 Oct 2019 15:10:26 +0000
+Subject: [PATCH] Add missing header bootlegged by Boost < 1.72
+
+src/parser.y:76:6: error: no template named 'stack' in namespace 'std'
+std::stack<LocalScope *> scope_stack;
+~~~~~^
+---
+ src/parser.y | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/parser.y b/src/parser.y
+index 7f4fd56c..4c77c989 100644
+--- a/src/parser.y
++++ b/src/parser.y
+@@ -46,6 +46,7 @@
+ #include "printutils.h"
+ #include "memory.h"
+ #include <sstream>
++#include <stack>
+ #include <boost/filesystem.hpp>
+ #include "boost-utils.h"
+ #include "feature.h"
+-- 
+2.24.1
+
diff --git a/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild b/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild
index 043c1d22a21c..7ce8b1f70da2 100644
--- a/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild
+++ b/media-gfx/openscad/openscad-2015.03_p3-r1.ebuild
@@ -37,7 +37,7 @@ DEPEND="
 	media-libs/harfbuzz
 	sci-mathematics/cgal:=
 	>=x11-libs/qscintilla-2.9.4:=[qt5(+)]
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/media-gfx/openscad/openscad-2019.05-r1.ebuild b/media-gfx/openscad/openscad-2019.05-r1.ebuild
index 8991b255f4ca..dfdb27dfe668 100644
--- a/media-gfx/openscad/openscad-2019.05-r1.ebuild
+++ b/media-gfx/openscad/openscad-2019.05-r1.ebuild
@@ -16,6 +16,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="emacs"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2019.05_fix-boost-1.72.0-build.patch"
+)
+
 # FIXME: add optional lib3mf
 RDEPEND="
 	dev-cpp/eigen:3
@@ -42,7 +46,7 @@ RDEPEND="
 	media-libs/harfbuzz:=
 	sci-mathematics/cgal:=
 	>=x11-libs/qscintilla-2.10.3:=
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index e885fba11965..3af31a6a7176 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 	media-libs/harfbuzz
 	sci-mathematics/cgal:=
 	>=x11-libs/qscintilla-2.9.4:=[qt5(+)]
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index 6f8ff9ac960b..48410bb5a182 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -4,6 +4,6 @@ AUX openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch 2990 BLAKE2B d6508
 DIST openvdb-4.0.2-patchset-02.tar.xz 12428 BLAKE2B 2684ddf010df975912fcfc8c4f944d9a9ba447b48750140b6c46db31d49297f7495e5c77e9d5b85af0b2e1d0c4987184865642dc95f1fb3e463e85ee5987d203 SHA512 04377d552e218a8eb31c43381ba32263ba206a0870dccda1bcc031863dfdbcc953da7ea89fd420dc1a338fbd6123ac30bac2039c0a2a01c1fa9253a3fdd0b54d
 DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d
 DIST openvdb-5.2.0.tar.gz 1788969 BLAKE2B d146b78dd7db4936779ca214b1f7957d4868bf76aedb95c9a98e21d25983b750337a63bf4bc9ccb438b683988af7a3d708676dcf7b4662c84e4926e8000ceb68 SHA512 69e21190c27a055e476a319b0c2d961303fa2f3fec30bec93ed44072d01816ef89e5e8f0abfc3a22d1c73742aa31284c664596747b49cd985fea1a751776506e
-EBUILD openvdb-4.0.2-r2.ebuild 2077 BLAKE2B eb88f16ecf9d24715a4d5e9aad9b44354466dff5d0058bbc416f9f8962610ad207c32d8470a799f7041454760a1e0b195889e79dd33abf2f14f50e0fb324a390 SHA512 6b1ef61ed8dbb48e27cc03a87ebabcd0918b54304d9b05a3771a7c23223ee17a28ebd89db39deacbd2219a9fff6be3dc2a0ea8e287db17ea14a8d57a30d3fb2b
-EBUILD openvdb-5.2.0.ebuild 1812 BLAKE2B 32e48e12cdf1a532b2ed209b023ccedffc435bc00ca10d99aa458909140727eb3a78b36694ebb619da3ce1c3a02f2d77dbe11d8b334c8130c5ae8ac815155f40 SHA512 73bf8f727fdb3528590330f19dc1ad44a5c78ba2ba40a2bea2cd4c20ce5498970489bb81c740d2c8cd1c39c3639b69b01bddf327e6a0e89f5559f57b906e6d15
+EBUILD openvdb-4.0.2-r2.ebuild 2073 BLAKE2B 6806b2dec4501e149412e39cbd3c98ae171a0783c5a87cdeb4d1be4b3a68872e0bbe9b61d350089707b5528ec1a6382b5786b1f89515886564c75a64c751eeff SHA512 11afedbe01b99943620dc4484ef167f69520b0bcd7364327981866ef2412cd6149050ce734f519c5417b68ff5f975aa9ae6d394cfb621598182b509f396384c8
+EBUILD openvdb-5.2.0.ebuild 1808 BLAKE2B 5729a207dffd1fd54304ec82c3d2a2e3c02cc609e0e60d502e1d15ede1c2507b5a88a0c1c9c1227efc89f9b89a3bcaa19eb88f101447447de1cfdcb8dfaa2eb4 SHA512 df618b2a713e9ccd4e505c14e0b710692c4d31422bfb96651864a88643e8df5b1c6f14f780a339cc23236a99c11f629767baa226607072b83be55f8f9f0c76e9
 MISC metadata.xml 1033 BLAKE2B 303f49be8253322a0bbb94875f7b9b03e127e9d2ab2eea64fbac1cd51f50d5be749c4c45c9491fbf3f56de7420fdb47913b6ef3c2d12f5ea0545042f68d990d4 SHA512 a81a1cd4684197d1d9455b1398c9ba1592d596d52c8e8fc5c0cc8de0357c1f1df7478fd76e4e42cda09524b0bbf41985e13cf530adb7ca7f1605f086207301a8
diff --git a/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
index 1ecb0e1b3a74..718926ffc405 100644
--- a/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
+++ b/media-gfx/openvdb/openvdb-4.0.2-r2.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=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit cmake-utils flag-o-matic python-single-r1
 
diff --git a/media-gfx/openvdb/openvdb-5.2.0.ebuild b/media-gfx/openvdb/openvdb-5.2.0.ebuild
index 9889c5705e62..879fe534b06e 100644
--- a/media-gfx/openvdb/openvdb-5.2.0.ebuild
+++ b/media-gfx/openvdb/openvdb-5.2.0.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=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit cmake-utils flag-o-matic python-single-r1
 
diff --git a/media-gfx/pinta/Manifest b/media-gfx/pinta/Manifest
index 53abc64c9162..d9bbbda60037 100644
--- a/media-gfx/pinta/Manifest
+++ b/media-gfx/pinta/Manifest
@@ -1,5 +1,5 @@
 AUX pinta-1.6-mono-4.patch 4938 BLAKE2B 015d3cb4e3975aeb96defcdc45f50a2246953d17258fd3a41fe886970c4d7950eb188946ba773bdb634eb4fdb292c2ce8a251e010a83ac91ae86c2178955d534 SHA512 142113fbc7e7b80f29c5a6aed921326239961903df10e28adcd4677125da366a24e816577fa570f6e359c06f3f47294a6203de8cfca27f39cc49016fdec61e55
 DIST pinta-1.6.tar.gz 1444709 BLAKE2B 6b560e9f6934d966632126cdcd5adf3debcfe790d61f8cad41bf7bafc8696c0b0e991597eaadae01c6de06fceb5a84fe0459bedbeffbd0d2cdce5114852c041f SHA512 b22ac05c639f9b0f2a49efc7b1f2c10774b3f2fb436dddd58f0005afadc103d4e77d6044479db0b3df04221922634502b1c16aa78d00894bca6a49931889f834
 EBUILD pinta-1.6-r2.ebuild 952 BLAKE2B 92a63881d768f8fbc8d2cbf8d95dbadf8baecab0735c132cc68565c428bc2285014178f42da74f7b19803a3b2d0f1ab3f2e52ff9d26bed67365185fa4a6ee504 SHA512 b26d268ae1b5910a6764686c8e201f903476f39594175db632d317d16ada99f8b24167c27685a915912964b5430fe7b1b25ed1c7ee7cbde7627c0b94691b55a6
-EBUILD pinta-9999.ebuild 909 BLAKE2B c678b03988843deb864843f9de3a77c1e2e3dde54f827e001d0cca74b2bbbe68414a6b9ccf3dece6b31839ef3f046e63e1bd108e0ca2443d110897d7cd0a3cc3 SHA512 19095ffb30e32e43a60f02513a916259a6e451c6c89e4cdd357e09f0e32bbb31e3a00a26413e69450d97609e9a8f55912abf5e936337d08b33085e75d3b1a40c
+EBUILD pinta-9999.ebuild 907 BLAKE2B 6a39c0fa7295730cbacce70ea0b00b44f174b3fbedc1c291b777885c08babf4239d75f93b3589d950396ac2b09475caa9bcfbd57c8fd5bfcc5c170cdbd0ced24 SHA512 491a808930a5a24d65b004840e210d52f8d839bded8c66f355eaf19dbec935ad4e9c87a6f95618c53d4f11c03c9e6f32f37339cb03d9881e5be1b73038be2c11
 MISC metadata.xml 820 BLAKE2B 031a8a51106d8dc3e3cfc2d035fa80c4c642bf0738479937546ff5a55de86c7de3857d1dc814b9af7d8b37477dceb5a61965fa3dcc8959930257b9b85aac8733 SHA512 ffed45156109c45f3569e3173cd2bdc04bd2992b20dfaf71e645d7a901cc122161a1c10f6b0c048e017f3a8a01f4da39fc737221ccb2e764ea7bc75225bc0935
diff --git a/media-gfx/pinta/pinta-9999.ebuild b/media-gfx/pinta/pinta-9999.ebuild
index c0e9d0b023f3..69e365537643 100644
--- a/media-gfx/pinta/pinta-9999.ebuild
+++ b/media-gfx/pinta/pinta-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit fdo-mime mono-env gnome2-utils autotools git-2
+inherit fdo-mime mono-env gnome2-utils autotools git-r3
 
 DESCRIPTION="Simple Painting for Gtk"
 HOMEPAGE="https://pinta-project.com"
diff --git a/media-gfx/plantuml/Manifest b/media-gfx/plantuml/Manifest
index 415f7dc6164e..024b67eee8bd 100644
--- a/media-gfx/plantuml/Manifest
+++ b/media-gfx/plantuml/Manifest
@@ -1,3 +1,5 @@
+DIST plantuml-1.2019.13.tar.gz 4552633 BLAKE2B f6ea05bdd1e4e3cf748dc4d48ca9a89f06246d135bfcc410ec1b2094d1e53ab6ae415c2b39a3fc56441d17999794c1862b95718932d6a20152550deaa42a6c0e SHA512 8d2a2520821a5f75c3508bf2598186718469c6cf2c411f3b975de1abbb4792be8ae70ec84da7ae0bf4668738ca052de5463701dafc5805f362876f1d770ad494
 DIST plantuml-8046.tar.gz 2966063 BLAKE2B 8634fbccbcd0ae2038a5e611215dd4343baba5e9562c02d6ebfc2a9fe702359fd035f490a9fd06484c08431993792efd1b3afd35f2a9812fb052f92f3616e284 SHA512 2ddae800fb30c0e352b44ef06476f7d770c12d516d93fe6f82ec1f33dd3bc1cb3330ba4a0cc89e06daa6eec9a56dc772a4f901d441dea86a8ce82b8d298cdfd5
-EBUILD plantuml-8046.ebuild 703 BLAKE2B 06b199c7c9877d6fe344ff18241c9aeca7397de343679a16a7bcf71b3951e1f09b2a5a1e19e0004f60780684ea0300b5bed8b16aae4e56ebdd5ecf360ef9668b SHA512 2fdc840e0816509ba11f80d21ae23c312a2d3e4836f13baa0e604c7607890ae96efe9944bcf7330d1547cf35be4923c763e8f89711378b6e6db2e817c28058c2
+EBUILD plantuml-0.8046.ebuild 764 BLAKE2B 3583b69e02be91e24c27d0f409fca640f48c9ec9b04be7b2614c87494b4cd9705374a3fcb8ad376cad875503b20b6d74c8f90c496f6d3af518f64491ff4aefa5 SHA512 c68d2f6ce2113d2013b16a0a0d88524a1c2cf0a76f9b9edbe5bb20b139d34047d9bf15ae194a324bfc1562f4f9343ad91ea583b446c193542950a903bee0492d
+EBUILD plantuml-1.2019.13.ebuild 753 BLAKE2B 1d83b5ae4792f5defe439a8194b21ba09092f4434420de14a7a2edbab2c6c9658aacc948c5037daa9f9716a557677e0090e814f5249850fa6f71e7053499d2f6 SHA512 47aac05e900c3a57ddcedad85583aa190c33ec763aa59b7bf1423b232acccc8a74db2247b875fd4e48e20aa1e130755b2773a7958ba6c1cbb2d429a953a24070
 MISC metadata.xml 821 BLAKE2B dd2177671848872c7a33108b012327639d40e2664ae85619bd94810e99a385dfa39111a95922a59e451ee4be7c9eebdc288934ef7a79ef33ce0683c09c13cb51 SHA512 8b2400bb96cbac0403ef0865bdb3d72a00dfad45f1c3807ca1a1ba0d98aa3f7777bc8d65089d82c6132ffb75a7395312b374ffaa88f67866512978be1eae9b98
diff --git a/media-gfx/plantuml/plantuml-8046.ebuild b/media-gfx/plantuml/plantuml-0.8046.ebuild
index 57239acc9c8a..0db55ffddc12 100644
--- a/media-gfx/plantuml/plantuml-8046.ebuild
+++ b/media-gfx/plantuml/plantuml-0.8046.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 JAVA_PKG_IUSE="source"
 inherit java-pkg-2 java-ant-2
 
+MY_VER=$(ver_cut 2)
 DESCRIPTION="Draw UML diagrams using a simple and human readable text description"
 HOMEPAGE="http://plantuml.com"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_VER}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
@@ -19,6 +20,8 @@ RDEPEND=">=virtual/jre-1.7
 	dev-java/ant-core:0
 	>=media-gfx/graphviz-2.26.3"
 
+S="${WORKDIR}/${PN}-${MY_VER}"
+
 EANT_BUILD_TARGET="dist"
 EANT_GENTOO_CLASSPATH="ant-core"
 JAVA_ANT_REWRITE_CLASSPATH="true"
diff --git a/media-gfx/plantuml/plantuml-1.2019.13.ebuild b/media-gfx/plantuml/plantuml-1.2019.13.ebuild
new file mode 100644
index 000000000000..be646991f7bf
--- /dev/null
+++ b/media-gfx/plantuml/plantuml-1.2019.13.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+inherit java-pkg-2 java-ant-2 desktop xdg
+
+DESCRIPTION="Draw UML diagrams using a simple and human readable text description"
+HOMEPAGE="http://plantuml.com"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8"
+
+RDEPEND=">=virtual/jre-1.8
+	dev-java/ant-core:0
+	>=media-gfx/graphviz-2.26.3"
+
+EANT_BUILD_TARGET="dist"
+EANT_GENTOO_CLASSPATH="ant-core"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	java-pkg_dolauncher ${PN} --jar ${PN}.jar
+	use source && java-pkg_dosrc src/*
+
+	make_desktop_entry plantuml PlantUML
+}
diff --git a/media-gfx/pycam/Manifest b/media-gfx/pycam/Manifest
index b8c48bc88de0..ae8483ec6419 100644
--- a/media-gfx/pycam/Manifest
+++ b/media-gfx/pycam/Manifest
@@ -4,4 +4,4 @@ DIST pycam-0.6.4.tar.gz 3079871 BLAKE2B 41368b177e8ead933e898d316349adc40d40e23d
 EBUILD pycam-0.5.1.ebuild 486 BLAKE2B c721319cffbe6ed1d25722792d06bee4877aed0a17b71a1ee92449274267f16c78d0ac8bdaf073d8cf7f65372bb68605e5bcc7f71e166553b75a0e68cfb46961 SHA512 ef68e5b6c3204756789d460865702d2e64cb65b5a4e182908bb7ef0a85f1f5ec024d36cb3d9eed73276398aa2a140bc082e9e90b218b1fbb2232f9ced51d9569
 EBUILD pycam-0.6.2.ebuild 549 BLAKE2B 338b8eb2ccc7256efd5358231e5c3ed0b956cecaaace505742af220aeaad923389a6d6902a4491a3981855cb56f2d74fe371e1d2f9a171260c3b73cd9de4d038 SHA512 297de082c61cf2317757fbf49285b85072001154cd1ece0c6389ec5efb0ed2b5ec80ae4f8f5a02bc521291133640557aab0d4a906fb91e4fe68ce2891af524aa
 EBUILD pycam-0.6.4.ebuild 618 BLAKE2B b74e2f58cda5a1ca5c822e2de5fb2df9debee0645bc47a7c4e8d1a95fc584393278533115298baf213771b0ec64f01a7f5a2d952a6acea16c8f1c5a4811d1237 SHA512 091cc13aa72c87d0b7212a3d9784ab1d592750f1aff4c477de6d86fe5f04572f68a6b460a89e3c15aa13c8ab65290e1e62512228a60f86459f405384e56de430
-MISC metadata.xml 290 BLAKE2B 15f25f9b0eb3e58221cf49040cf9b0f923bc8936ceb3040de236b57206df3547e88f28cfd4666cc83c2021f4e23012ed33e352282aa3f6b668a2b9568f4b5a5d SHA512 b3ebcaa51728a7fe09029f792e3ad7dbaa50b30e98d4e523d7258ab2d70824f3722c40ba60cda6feae303dd3779cb65cefe560c9740f1b07e6d2c905660bf2eb
+MISC metadata.xml 242 BLAKE2B 36ad0b4e5b9871185d814e8deaeb36feb9b92c692d6edad5abaaca3c79c05e733525ecc012f7bf4c5de365a2e3384c5c61c99c21fb4d75cdbe6fb077896959b2 SHA512 b6114ff75cd247836e796cb8418d513394083eae631a98dbcb0b411fd51840450e955d884a56bbe4de8ff315d32cc7e4b22130b8b3a8b97197aa213270bf4db9
diff --git a/media-gfx/pycam/metadata.xml b/media-gfx/pycam/metadata.xml
index 5efab33516e9..2be7eaf5b916 100644
--- a/media-gfx/pycam/metadata.xml
+++ b/media-gfx/pycam/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slis@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">pycam</remote-id>
 	</upstream>
diff --git a/media-gfx/qimgv/Manifest b/media-gfx/qimgv/Manifest
index 5d77755b75c5..04add1c48e47 100644
--- a/media-gfx/qimgv/Manifest
+++ b/media-gfx/qimgv/Manifest
@@ -1,4 +1,6 @@
 DIST qimgv-0.8.5.tar.gz 242650 BLAKE2B 25ac2854b0c35e2288b0e770559bac5ac0152df1e73b025fe99609e3f7126ad0c5342a6f87dd34b0847b22031ca77db7b98b1ef8b9c278fcbebb395454d426a4 SHA512 f4c3df7db433eca04ed0827039a02fcbb6e0d5b2f696010351dc6238c39b7a08784780ad8d56f3701d13506dd6c64671ce361817928d7fb2bb25b88c3f3d32ce
-EBUILD qimgv-0.8.5.ebuild 1142 BLAKE2B cc9ef55fe3dc53342df720bf25d4dd6af93d43143a6d1ac70ff409ad2488d6ed76e7ead64bb4e525abc95511d81cd2b0863a4ab811107989743752281e77be91 SHA512 abd4d018e39c311d4a84f78737370bbda9a55a44479377adc08928689c225c28f944ba6b041a520bd7b0ce042983cb4665778a35fdf886e5cc4fbaeeddcac27a
+DIST qimgv-0.8.8.tar.gz 460682 BLAKE2B fb701fbb336bf8e51751f677f7fddfd7eb0e1b770697ee510c0008a3ebddb0a3948d5a3f6f57a676dfa3117ca03b908cc3f88bcaec16a07000108279bd5fed80 SHA512 376f79eba2a625eb0f622494ce7ba98e1182b43cc6d7e268382c794a74d2772bd17083ac9ae45fcafc5eeb0665ef06ab34bdbeee8401a35bd0652744c576e131
+EBUILD qimgv-0.8.5.ebuild 1124 BLAKE2B 77eeeeba99268152463629bc616a123f4bf178c91652baf69fdd58dfdfd68c7a7f81d4afac2b70b81026196352d417616d0dd9dea9eac6f39214bffb376bc893 SHA512 524ef964adc441ec243405b932deb0e37a41a479a0565ac83f4d15dd05ea48fa92d8d041a6617027c5c1f2a7156aa5bbd578380db552602ed198314af13bc4bc
+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-0.8.5.ebuild b/media-gfx/qimgv/qimgv-0.8.5.ebuild
index 81ac18fca861..71f3879d1181 100644
--- a/media-gfx/qimgv/qimgv-0.8.5.ebuild
+++ b/media-gfx/qimgv/qimgv-0.8.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="A cross-platform image viewer with webm support, written in qt5"
 HOMEPAGE="https://github.com/easymodo/qimgv"
@@ -31,7 +31,7 @@ RDEPEND="
 "
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	# respect make.conf CXXFLAGS
 	sed -i -e '/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -lstdc++fs -O3")/d' CMakeLists.txt || die
 }
@@ -42,7 +42,7 @@ src_configure() {
 		-DKDE_SUPPORT=$(usex kde)
 		-DVIDEO_SUPPORT=$(usex video)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/media-gfx/qimgv/qimgv-0.8.8.ebuild b/media-gfx/qimgv/qimgv-0.8.8.ebuild
new file mode 100644
index 000000000000..b5ebae292347
--- /dev/null
+++ b/media-gfx/qimgv/qimgv-0.8.8.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="A cross-platform image viewer with webm support, written in qt5"
+HOMEPAGE="https://github.com/easymodo/qimgv"
+SRC_URI="https://github.com/easymodo/qimgv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="exif kde video"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	exif? ( media-gfx/exiv2:= )
+	kde? ( kde-frameworks/kwindowsystem:5 )
+	video? ( media-video/mpv[libmpv] )
+"
+RDEPEND="
+	${DEPEND}
+"
+
+src_prepare() {
+	cmake_src_prepare
+	# respect make.conf CXXFLAGS
+	sed -i -e '/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -lstdc++fs -O3")/d' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DEXIV2=$(usex exif)
+		-DKDE_SUPPORT=$(usex kde)
+		-DVIDEO_SUPPORT=$(usex video)
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/qrencode-python/Manifest b/media-gfx/qrencode-python/Manifest
index 2f9479511809..ae6d759bd3a4 100644
--- a/media-gfx/qrencode-python/Manifest
+++ b/media-gfx/qrencode-python/Manifest
@@ -1,3 +1,3 @@
 DIST qrencode-python-1.02_pre140921.tar.gz 2084 BLAKE2B 19cecad794718a56bb0ac756b322fbeb9a748792bc9683a3c0784c5d2e2638b100fe523b4ab34be5563bd10e5773cc6925dbfbabba48d9487ed2d8e4e86dae57 SHA512 231c61f98f064d282611d14194de7b3c0a18faff0ed856722e39a6cc25f744442d77bd43418aec117c6e39ddd78a6ea770edee8992aa4e3cfce50254ac6526aa
-EBUILD qrencode-python-1.02_pre140921.ebuild 692 BLAKE2B b2ec65ef46bc241e3057a6eecd4aa277ee69560eab3b5b53c3e8c9e29cf983fb800e33f66fe8318719eee222d181461d9440e276fedab6f88b2330b59b342fe4 SHA512 6972ae0a4b121324e0195814485fb7912e301f5eaf620cb98dd87d48ddf7c91b4a8a273f76a5e81e9b8346e5d8a5647eb816fcb4b9e31f728acb62ff1c135ce8
+EBUILD qrencode-python-1.02_pre140921.ebuild 688 BLAKE2B f2d85888752152f2b8157eeafe4f24f49bbf0bec6e2cfa1eeaa9102c06bbc8255cfab049c0f73f31ee87dde726857e783d9b0ad5b882c3b1feab02dd8ff42b1b SHA512 39c082a7378b95344b8273a37495ed95c9585a4a0d0f0ff0ba0e2a857d9d52feadb011d16b04d0a8c13b577832788c4c918bf665d52502e5d51fee40594eca22
 MISC metadata.xml 304 BLAKE2B eb11f9f35defdf53355add48e6b21809cbd85cbf1e12930d53ccf77f82a28b5fda23e5dbf0ac2c15c509f8a50997339ca2d43e0ea2c0fed45bf7e4b55f38c9ed SHA512 d36db02c7fa11ce34c655789975cdac826c259dfe778a27b28221c31bc6a5e99e3ce53f0b3c0a3abb8ad29b39e937cb02379a6c93310ccb1978c62511a4c6f1f
diff --git a/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild b/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild
index dbc2aac46927..30af55913085 100644
--- a/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild
+++ b/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.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=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index 58edaad9be46..c645444c0b9e 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -1,5 +1,5 @@
 DIST rawtherapee-5.6.tar.xz 12083264 BLAKE2B a0eb09e98e1041b393ad3aa671641a2a4855379cef6245ca3cca2588ff5f50fedf8becd88bad1ab70f63dfb575f5f22c141040defa10b47268947415999d8e79 SHA512 2c751c7631ea2ef65c334fa0baab16d4c3161fae66487870c476f07f1ea3604a5e28a251fd98d9688cafc088302af7aa6e28e9b27a37f916715708ed5e731f0f
 DIST rawtherapee-5.7.tar.xz 12092496 BLAKE2B 40d97d09106d7d2b843376b4c58daac87f99315604bd8e704e1f231c17d01896cd732da2449f84a59ed221fbf6a929a5db8e728977431fdcc07f3d30120b633a SHA512 8101ec66d9be4cab0c0b91336a3f83a32a6220a2f342f1c74d604c15686ee08bc7dbc090232916f13d5436957d800b64b284a8a9d3352f2f721266b07e005162
-EBUILD rawtherapee-5.6.ebuild 1621 BLAKE2B 9f963fabf47cc479f8b840648b227058c232cfaeefc8904fe2ae2ee38e4b219b427633b8575ffd27172bc49c0fc4c99973e55e193883bc1f6fb35f0176d19e2e SHA512 557b60056ab12fb8b9dea4702e7fae0d2438abc89a5f414d75cdd353ee7a99ea6cbafc4df118ad7272c880dfc0f1a107a4ffff190e9a317b75de68471c15a336
-EBUILD rawtherapee-5.7.ebuild 1623 BLAKE2B bf3e2d94b876c48aeedcbb2030d282753a78da2a4c905b5565446ede991e854277fb2ccd99f409d52ccdb5df986f50525cccaf42e0b1124f68a22c0ca7311865 SHA512 4aeee80c36f123d97d55ff343dc326428f597f74d282f1186cbb9255d0ef2f29dab7ad56cb886e7b20dcbe1353a1988ff205b7d2cc3fc2c1580bbf18b8c6d8c4
+EBUILD rawtherapee-5.6.ebuild 1609 BLAKE2B 44239bb8e54a9149b70d36a1ff582b6f0708c0747f9ee4c021c01438092cec1cb9a64bc64b5fd165ddfc338bbfe533506a14d07c695f5bfba57d6848f6a3b719 SHA512 a1dd100d0f59c2a7642e2f85a34773d37c6c7f1e4d95e865d38c9463dc58151347004860dd320acbe944701c0a8170df89ca0180e915cee93cf7581756a9d51a
+EBUILD rawtherapee-5.7.ebuild 1611 BLAKE2B 098b45f91d7944f5b932b583b39579a217c31538d9816c8942efe683d5f0602919e22b7308cf10eb2e6581b4804ac611c336312722abbf66deea4777f59a9e50 SHA512 dcf827bbf5ba0b7ff77a03f1a7558317164355b8acff4596ae27b88f0ef5a6a17245343f7de349c9486cb471d19345b5ebf966c32776bd6728c96210ded9f4d1
 MISC metadata.xml 484 BLAKE2B 672746e8291016ad6467a9b3c9baa84abac42df9f7de4b4bdb79374bba8e84f7cbfe140a076ebee49ec50587154612b73c6a7022461d01fd7fbdc63a6ddfcd98 SHA512 91f11609c7472bb7cebff5d440ee3d4b0560e0832e1bfb6ffd5b239e8e60647e067894d77ccb6e40a379680775f80b91250c3feab5cd2ce32d7991e0776d0cd9
diff --git a/media-gfx/rawtherapee/rawtherapee-5.6.ebuild b/media-gfx/rawtherapee/rawtherapee-5.6.ebuild
index e59d05f213b3..8af21b12f820 100644
--- a/media-gfx/rawtherapee/rawtherapee-5.6.ebuild
+++ b/media-gfx/rawtherapee/rawtherapee-5.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 MY_P=${P/_rc/-rc}
-inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
+inherit cmake flag-o-matic toolchain-funcs xdg-utils
 
 DESCRIPTION="A powerful cross-platform raw image processing program"
 HOMEPAGE="https://www.rawtherapee.com/"
@@ -58,7 +58,7 @@ src_configure() {
 		-DCACHE_NAME_SUFFIX=""
 		-DWITH_SYSTEM_KLT="off"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/media-gfx/rawtherapee/rawtherapee-5.7.ebuild b/media-gfx/rawtherapee/rawtherapee-5.7.ebuild
index 48b8dca754d1..b51ffe1ca52a 100644
--- a/media-gfx/rawtherapee/rawtherapee-5.7.ebuild
+++ b/media-gfx/rawtherapee/rawtherapee-5.7.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 MY_P=${P/_rc/-rc}
-inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
+inherit cmake flag-o-matic toolchain-funcs xdg-utils
 
 DESCRIPTION="A powerful cross-platform raw image processing program"
 HOMEPAGE="https://www.rawtherapee.com/"
@@ -58,7 +58,7 @@ src_configure() {
 		-DCACHE_NAME_SUFFIX=""
 		-DWITH_SYSTEM_KLT="off"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/media-gfx/scantailor-advanced/Manifest b/media-gfx/scantailor-advanced/Manifest
index 6d14cb57bf7a..a2c6d0b1d664 100644
--- a/media-gfx/scantailor-advanced/Manifest
+++ b/media-gfx/scantailor-advanced/Manifest
@@ -3,5 +3,5 @@ AUX scantailor-advanced-1.0.16-tests.patch 415 BLAKE2B 2d2b8d5d5db7835f36874f04a
 DIST scantailor-advanced-1.0.14.tar.gz 926267 BLAKE2B 2d901afebf3d9b405365ba71868f7aa29c23c537af72679a89a29351557a1a12692223b961dfd0ced3ea540c45f90dde8ea13bcd1667aa355e90a1c24a21e932 SHA512 113723b8a62da1b7141e03b5ad8ac7c426a2943f882cd229c9c51d10de75ee85d019ac21fc2d9eb4cc0d5bfb9ce66a4c41cf523698adc5a9a5d99da02369baf7
 DIST scantailor-advanced-1.0.16.tar.gz 2792788 BLAKE2B d695f9e62bc83569a320f81d2aee5f77064b791f8d59208ca55b0f4a5f25350552a673adce23ab03b92d893bd57815eb6990c91a33c12cd3652c54998d15e29c SHA512 76f103afa44f5fa03f218d237dfe4565abe1d84937ec2ea5e64662c62d073e93d7b25f1e4f66dcfe13ad36bb08abd081b5d52c092f2f54f12f0bc6cdb4340e85
 EBUILD scantailor-advanced-1.0.14.ebuild 999 BLAKE2B 6c07ef5f2b066e4dedc224e22b65d5ef9c2a1ca876c66e5dab728186e3c8b250c150df21eeaf2aba3efbca4f291fa7b5b9c1bf3b13b8afaeb0de431bf432c796 SHA512 e3a994978db112e8bcaf5ef8b6bd11e6ea64a04d487ebeda4dcf4e71723b92eb77324d4d80bd65e22a3ad0756996fbe8832227439104d0387ca3a26b8611d908
-EBUILD scantailor-advanced-1.0.16.ebuild 1004 BLAKE2B 86c71b318953a787319462934c26f9eb34af63f4fcdc2790fa6462659488d870cc02e4d3b2a8abc1d160a4fb4300f553baa2dd187b119c4fad1acb7dc7f9be1a SHA512 5a8d376f8c6e5ca6835709f9aec4857f8c1fd326e2ee7893a20b2b9d00e714b7a3080fa45f301a56bd48f1f3d91101b55e8c9582f8a24f0ceda6011c470ccae1
+EBUILD scantailor-advanced-1.0.16.ebuild 986 BLAKE2B 5e024056d38db6eae3b68d7833d75ecfecf99d99ab6354045c4c59eaeacf24db8a33961fdfd5b78b0dc94c7af88ac18d2ab66e6e3c4e19d99fea89056c7f289e SHA512 adc6a395aff42c2952fd143dc22726346f5566387927056a980cb64e6e72a996b650c1df8c2ff1643a18c13b8e5bbf702dc40fee7c44a9322f15849c1ddf8da5
 MISC metadata.xml 349 BLAKE2B 78647c133687609629962b66aad8c9d2507cdba556647750d4f17131be10ebaf2ebc72491ba4d820e9112e9be19be521ced81f6e9f08684ee0b200f0c9843ae9 SHA512 e3482b130afb2fe9fbce9d33eb62fddf11baf938c14c1def86294e8b8fe57a1121c1b917265714868ef55b8035cd02f9e73c7885bd564fec282ad478452186de
diff --git a/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16.ebuild b/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16.ebuild
index 13b68abef366..be247dca96bb 100644
--- a/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16.ebuild
+++ b/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils desktop virtualx
+inherit cmake desktop virtualx
 
 DESCRIPTION="Interactive post-processing tool for scanned pages"
 HOMEPAGE="http://scantailor.org/ https://github.com/4lex4/scantailor-advanced"
@@ -37,11 +37,11 @@ PATCHES=( "${FILESDIR}"/${P}-tests.patch )
 
 src_test() {
 	cd "${CMAKE_BUILD_DIR}" || die
-	virtx cmake-utils_src_test
+	virtx cmake_src_test
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	newicon resources/appicon.svg ${PN}.svg
 	make_desktop_entry ${PN} "Scan Tailor Advanced"
diff --git a/media-gfx/scour/Manifest b/media-gfx/scour/Manifest
index 64b175ae399a..73235ea95a30 100644
--- a/media-gfx/scour/Manifest
+++ b/media-gfx/scour/Manifest
@@ -1,7 +1,3 @@
-DIST scour-0.35.tar.gz 80981 BLAKE2B 6cf0eba35a9deadf44534d3e8370187ec7b7655e9dc31f25b5bf465fee7482eb18ee985b0702c7fa8cb5db89cb1579186fee1c43b890ba4c74f4e86cd793927a SHA512 9a09d862d66e21a63744401a44f517eef268288408556e3541218713ee8c5b5c0414ab03ac61d5d2fdbd2f01fa3276793b17f110d44cdec1c53c7b7dee16afc0
-DIST scour-0.36.tar.gz 91575 BLAKE2B be65b751151cf939601b6c0dec0613d13be6367f761fc8d7201bd58f2a3475858740be0d972446e2727852b79b1197b82d217b51dd3ae41c0bada10d53d462b7 SHA512 8593f46a0e36fe220f5ce6dd85696172435712491cd1a6983c12054965ce96eeb2a52be0877f8fa6967444817abfc353f9a00f1d8d676cbd6651cfd33a0790f7
 DIST scour-0.37.tar.gz 95478 BLAKE2B f3037b691b110f84266c742ac1212a8069e0ac1260f818610dfecc7ee64a257d9e0772c7c675e4062286cf4b719fe48782c416a0cb85a136ea315b22da58c460 SHA512 ffc9bd33eec038126d781dac50c89e4275d0d5e14ec2b2247a7727af91ac2ffe5522c69b5386f75df67a0b88f8ed62cb6a2ad47d600e55b123d937ba33e9e501
-EBUILD scour-0.35-r1.ebuild 648 BLAKE2B d3dc3dd0b91cd84a4629b7bd388c2fc2afa8823e01f30c01875868d3f92ad93a3acbf34d5d58a69be0314ce47196f3ad3d231e4fa06b6dc287cf61ae7deee252 SHA512 7fead8c52314c1eaf95f8c2b8f8ce58dfeb6ddacf135de160bb540c64ec5458c744acdadc53a8a6c5ea5d0319712a87dc4acc5da47f0b0f05148a9598381bdb5
-EBUILD scour-0.36.ebuild 655 BLAKE2B e28dc63d07ca0e490e24144db10fa3df9e0aabd1080ea6d5884e5a758885f86e17ea2150d90d8340a304d3067479e61ba17e9bb99ac07a3c9c425d59f31c2035 SHA512 2535527237312aa0384c55aadd53fd6ad9b2f6521ad46e369d22de32c072e0e515ab4832851e30b4d6843bb1e4f490211930ee80ee35780e89ac0ef547c5e7c2
-EBUILD scour-0.37.ebuild 659 BLAKE2B 7a42a952d1b781987a4d80cbc227570f60a3d19b905bc487acb6e05e1d5adf9503d8d57c44b0a8c473d88599bcd189373a668da80f44a2d6be5504894df52965 SHA512 00a912ea9b6c0a34d8e786c0b99533d2d2e49c0cadee1d20e6a33e25c175307d8f6f1b732f1efd84719ecf4b4e20d593a21e8f5dbac64bc13cfd459e33f3a8b0
+EBUILD scour-0.37.ebuild 655 BLAKE2B 75ff8a59a02a8dc45a592ef15a0e41f4fe42d4fc0ed44d0d0da4bcbbc1a0a6263bd24539e8fe6bde56efcc93f8ca94363b7cafcad41af10a1f4e06f6bca5c167 SHA512 e69cb25efcdaeed9be06846a54fc5e8f42175cd08b335139cbb78f513a1dfcbf719aac8d4dd1ea1f1a89d9cdeafadcd51eb56979cfbfd8837074f5b5ba454fe3
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/scour/scour-0.35-r1.ebuild b/media-gfx/scour/scour-0.35-r1.ebuild
deleted file mode 100644
index 47e1066ec112..000000000000
--- a/media-gfx/scour/scour-0.35-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="Take an SVG file and produce a cleaner and more concise file"
-HOMEPAGE="http://www.codedread.com/scour/"
-SRC_URI="https://github.com/codedread/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	"${EPYTHON}" testscour.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/media-gfx/scour/scour-0.36.ebuild b/media-gfx/scour/scour-0.36.ebuild
deleted file mode 100644
index 0ce936f07ef5..000000000000
--- a/media-gfx/scour/scour-0.36.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="Take an SVG file and produce a cleaner and more concise file"
-HOMEPAGE="https://github.com/scour-project/scour"
-SRC_URI="https://github.com/scour-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	"${EPYTHON}" testscour.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/media-gfx/scour/scour-0.37.ebuild b/media-gfx/scour/scour-0.37.ebuild
index b593461c8fd1..9fe16aceebb8 100644
--- a/media-gfx/scour/scour-0.37.ebuild
+++ b/media-gfx/scour/scour-0.37.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
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Take an SVG file and produce a cleaner and more concise file"
diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index c06195beffc0..85f957f60397 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -5,4 +5,5 @@ DIST scrot_0.8-13.debian.tar.gz 7943 BLAKE2B 6c58c76f3a8dcf61a8ca4c31f5845cb27b4
 DIST scrot_0.8.orig.tar.gz 74324 BLAKE2B 56facc81c29f101279ffc6d5d323a0cecd32b1ff6d1d4bb2052a90703353a9ad5b6ab46c8840ed20834f976badab4258fbb0f031645d9689eef1b838ebd4b1a0 SHA512 cba8f589e45758ddbfe4e276399a1ecb0dbe29569be5d85d97733e7f64de2911bd2d03e62700ad0c718a1fc886c2e3def9dee1de5cac884f9e65e772cebe838c
 EBUILD scrot-0.8_p13-r1.ebuild 978 BLAKE2B 83e527067dc2dbaca246df7e3520c3658143767a02ddea54786e95fa8922774116f693f5fce4e71583d2aa77f8c326f4441f9c09eaf6be0f318923621408f179 SHA512 4f9c553a74c665adc7f355440b51b15d9488b93f5d6a8fb3ee29e560e396662949e24a88d5f1e8a9aceab0b6e99472562e2a25a7926c14703a240f0eba186260
 EBUILD scrot-1.2.ebuild 924 BLAKE2B a30af374991a9b4156459994848b73b4aff855fe5695c19178bc7ac9fabbe354d70a222759bb2a2fe3fb7642904e0ac4168c66c51cc9c31433a35587b6a6ad5b SHA512 22bf5c2003ec70b2d093e4835a1d512573497011a8dcf6d48182a855a97c942fcb2c8413e872d98905f8df5232214b93bc3bf5e7d3a3b249cea019886d9464b8
+EBUILD scrot-9999.ebuild 842 BLAKE2B fa29235b7684ab9a0e39e490676476086a6759b3e84cd5f2042e46ec43fcaf4f3c17d3ebd2e7ab8ca4b43d2adbfc3c825efefbfcfcaaeaeb1c64093055e46fd4 SHA512 0e18e163e831c4d1900de70297a286b65e85dbcdea1cd95ffad8975907d329cb71164d1335c312a3e4a625ead0de90085dd02e0564349256e779d5102dd90775
 MISC metadata.xml 327 BLAKE2B 44a3d3f80ed251d0864c6aabb7192146c942a2bab99a4e643189eb74445c52a92fc153e4f198b591e628697df09774a2576cf5678a58774295c881eda04e33ad SHA512 bed8805eb922c213b73629ec8c430a7825ec1451edcd332fffeaef9b855b71b9e57e490775fe462ef2234ad9b534a23f19a373f0f2131d84ff2f965b8a2ed25a
diff --git a/media-gfx/scrot/scrot-9999.ebuild b/media-gfx/scrot/scrot-9999.ebuild
new file mode 100644
index 000000000000..da5268bea717
--- /dev/null
+++ b/media-gfx/scrot/scrot-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools bash-completion-r1 git-r3
+
+DESCRIPTION="Screen capture utility using imlib2 library"
+HOMEPAGE="https://github.com/resurrecting-open-source-projects/scrot"
+EGIT_REPO_URI="https://github.com/resurrecting-open-source-projects/${PN}"
+
+LICENSE="feh LGPL-2+"
+SLOT="0"
+KEYWORDS=""
+
+RDEPEND="
+	>=media-libs/giblib-1.2.3
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	|| (
+		media-libs/imlib2[gif]
+		media-libs/imlib2[jpeg]
+		media-libs/imlib2[png]
+		media-libs/imlib2[tiff]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+DOCS=(
+	AUTHORS ChangeLog CONTRIBUTING.md README TODO
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	newbashcomp "${FILESDIR}"/${PN}-1.2.bash-completion ${PN}
+}
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index b6389d9ed2a8..385ca04e3f1f 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,5 +1,5 @@
-DIST shotwell-0.30.2.tar.xz 6461648 BLAKE2B d54f34c05dcb092149129977bf59f0434ec4082929e3c87d9b4e774f85b47d73ecce1e80a6a29965194e9791eecb018405b43f082fb8b334c8d012f06a00b817 SHA512 ee74b9d3fbc5b2a5ca87cbc351fa99f6afaec4ce717166f55d79f41f1b039c272ed9028eb3919874f086f934197806738a54f428e790bca50dd8c9af61c21c36
 DIST shotwell-0.30.7.tar.xz 6455860 BLAKE2B 81da055e1092b9aed8c635e3e18e9c4bfa5820bb915c17cbb26942ce627179ed6b158c0785f54a2e15049150c3569035f58916483505449d55a2b3822276c44d SHA512 960574212d622c29d7617b874466e639d5a292eefdd2cac00ebcbf96d7db06002b9423440ee47ed84da7064d3eb70ba388b573a94c9e44c07d3b8f87faf09c58
-EBUILD shotwell-0.30.2.ebuild 1843 BLAKE2B 7b68e790e6d8204788de6392a1493f3777e687b185aa42104192ed57676376aed1690c77d0ca0a1961b0eecf888b0e0432e793da4863189f62f322986da980c2 SHA512 fa8ac278e4de4f1c23e2381250b98cc781ccc1ddb8d9b15b8bf7b9562d16f01eaa6b772a8613db84c397b3870528df7f6f8fa1b590dff13df9ac185068163387
+DIST shotwell-0.30.8.tar.xz 6460512 BLAKE2B aecdfa8d90bcce19c38a55872671f6521d8808fa46decba4e9910392f9f8907dd99aaecc825f4e3f6ae747ab151bf5bfa3a807364d571db0fc2ddcaad9a492f5 SHA512 dccd496a083145283c79250329f88fdfe526a98ce84b6d1c52a9c48c9e52a4749bdf2449f3102474c994ef1e687e06767b9bcda03ea97d1168d3417743a6e866
 EBUILD shotwell-0.30.7.ebuild 1761 BLAKE2B 8bc073102aab336f564897e677f905c3b578c05d29032e7bafcb7554ebdc8a0e9a8f570224f8d19755d68d94e849d104607421541dcba645139c4787d878a8c6 SHA512 935bcfdfe279afdf441302a5695933a1292cde952c328b9278cc55208a879af463fa411df2c413cb66aa187fafd7c35c6acdd1d1eceb961c347a20c5f102fcf0
+EBUILD shotwell-0.30.8.ebuild 1763 BLAKE2B e92e57a969c6b06d97470dc885304b220760fc49ef60203b6c6385e64807c669fb8f3bd13255422727c774da03934e5b15a44627251f22ca3b1d0d650bd23f2d SHA512 a4139279cfc013088c14109e0e78ada606e893350b5082b73a2854fce421fe4e7ffdfd0304f2d674708fe04be7b6a9b8f10b4d09cd3e5ff8cad60780bbde0553
 MISC metadata.xml 915 BLAKE2B 7f83fe936f9a575c6dd12b014007cd97c5a8ada9aa5e55ddeaddefa4eb05d724a068c81d2f6f41c5b1bae01ed2c4326eb5eba5d4bdccf48619edeb43a8eaabfd SHA512 1b226f7fabfd7f5ee4d82b28ce2998273225319b055c01509cc5e493fdc037941c0edd0099df5dada00228fb225bf5e35d0035d3cd244890ad0cbd929b84d214
diff --git a/media-gfx/shotwell/shotwell-0.30.2.ebuild b/media-gfx/shotwell/shotwell-0.30.8.ebuild
index e5da9071bf82..95201b32b56f 100644
--- a/media-gfx/shotwell/shotwell-0.30.2.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.8.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 VALA_MIN_API_VERSION="0.40"
-VALA_MAX_API_VERSION="0.42"
 
 inherit gnome.org gnome2-utils meson vala xdg
 
@@ -12,10 +11,10 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="opencv udev"
 
-COMMON_DEPEND="
+DEPEND="
 	>=x11-libs/gtk+-3.22.0:3
 	>=dev-libs/glib-2.40.0:2
 	>=dev-libs/libgee-0.8.5:0.8
@@ -29,7 +28,6 @@ COMMON_DEPEND="
 	>=media-libs/libgphoto2-2.5:=
 	udev? ( >=dev-libs/libgudev-145:= )
 	>=media-libs/gexiv2-0.10.4
-	<media-libs/gexiv2-0.11
 	>=media-libs/libraw-0.13.2:=
 	>=media-libs/libexif-0.6.16:=
 	dev-libs/libgdata
@@ -37,11 +35,11 @@ COMMON_DEPEND="
 	x11-libs/cairo
 	opencv? ( >=media-libs/opencv-2.3.0:= )
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	media-plugins/gst-plugins-gdkpixbuf:1.0
 	media-plugins/gst-plugins-meta:1.0
 "
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
 	$(vala_depend)
 	dev-libs/appstream-glib
 	dev-util/itstool
diff --git a/media-gfx/sigal/Manifest b/media-gfx/sigal/Manifest
index 462195c1b237..2e0c901c3f82 100644
--- a/media-gfx/sigal/Manifest
+++ b/media-gfx/sigal/Manifest
@@ -1,3 +1,3 @@
 DIST sigal-1.3.0.tar.gz 3267422 BLAKE2B 0be6dc6b92c8681e47ad7094004793fe78fd8974075958374268bb55f6d2deb903b5ad858c2603c751f74fd2394c945d3f933b3fb44a8f58b18dcd9a2c1c1236 SHA512 132c94a472301a2cc81a4aef13afa8137a6b69dfc035821e22fca6b0598cb94f1788f1a8cf1b47412214c9480867be816070aaa938290a1d10bccc407c38aaf4
-EBUILD sigal-1.3.0.ebuild 882 BLAKE2B cdc6d346ef0f45cf06391536b3ba9e2f42a93ab02e79142e365d6bb314f596977f25800c0b02270cb8979a3b0100319ad4a1463163ca6fab45c9f627051f2b36 SHA512 b24e91c2f1522e999eabd74820d30bbca75cda1ff76c6d1f768e760d01777c6ace79364c5bcb80f0af6c34624ca88b2bea14697b8b1ddfc183c1308cb87e9fe0
+EBUILD sigal-1.3.0.ebuild 878 BLAKE2B 4818ea2706f82c756dbd7f45f4ab0d8f0264d81eb511dafb122b4492c25f7c2709c728bf8d455a6a99308eab07c241065240b071a0fd947584699c5d89732ce2 SHA512 c649a8781fe15ed3d44dd1e863853f77ff96c1a08cc43dd4b88b0fea6f2cbcb8a9243e55ff1d3e9ea3e259167a9f749fcc9f25982d685582e5329841a9a7014a
 MISC metadata.xml 1062 BLAKE2B 2997924c7ffdf6ddf3afd6b8d55ab426c7701eb3beb3c566f870507730f99ddd4875621029e078d7f1db16d582de448257701ff7c6325169fafb71a15e9e2304 SHA512 d49289c1dbd612fe88b6ef3d883b073c4b2985839decd5d3b9d73a3c24e0aa83e37890068be8e127ad1f88f86b9b37f7f2f61299c431b3a21b6219f2671a73d3
diff --git a/media-gfx/sigal/sigal-1.3.0.ebuild b/media-gfx/sigal/sigal-1.3.0.ebuild
index aaa65952a903..c6ef6d35b74a 100644
--- a/media-gfx/sigal/sigal-1.3.0.ebuild
+++ b/media-gfx/sigal/sigal-1.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index b246fc9209ac..b55044ac66e6 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,7 +1,5 @@
 AUX 3.26-add-control-optional-deps.patch 2773 BLAKE2B e6c3faa98ecda13c926752defef389fd155f615df2010d8499aba7870b929f520662f5c718f457edd5f14f68c26d63ab58a5ee1a583af9f5721d4cf4141385a8 SHA512 e786172609ca64afa85663077794cb146edf7f59bd6187bc253d2ab682f5cf244f5238df18648641f7450ce6add97f2db1adfa11b52a3ba5e29c16356e9fac08
 AUX simple-scan-3.32.2-unasigned-variable.patch 1294 BLAKE2B 7e513d96237872f5afc8c5a942d40f0f98632129eb9a2476099d8d28b1eb3660c0f5831d161c1c58f989327ff9eaeb4c5d426c3812fd1fe57270176b5dd37d29 SHA512 f3bcde7dd03ff9ade43f10b14124390aa08e0f2c00b7dc3b1cf08c5870c280a1e21dbdce7029a1f4c3372f72bac5f596026e7f70c7ee36c219d0c3f4df7e31a1
-DIST simple-scan-3.30.2.tar.xz 512540 BLAKE2B 908af68fbd297e2cc0c0c5440166ebc706f6c0a1a88948e9cdfe30a2e9e548125b31e6a00684a8a0db8e4c37c9d0930765b74e2ba9e1d540e4ae705cfd404349 SHA512 3a4d19bd36a88124ba43d388807afd1d6a51fc691ed83570a095e3b9719b5db5f3eb457a41bc8e36f2f1bf25ff4ab83edc150d4cdddd0d528e9280ea2da6cdb6
 DIST simple-scan-3.32.2.tar.xz 790800 BLAKE2B 98e502cbc280285dbe20a0c843d5f8d8b38707e973f2ba6aba2ccef9d739165371f5f30d7d6658853c5a6a280ba2919a98acd02b4757b4e881f96d5a7b53449b SHA512 10322ae72461efe43a4e230443c3aca24aff6f0cab07750c6eab9ebb718889e51d8c77ff722c337f333a8952ac84f69d03ad88eedfd4432ef11f7c7493170e14
-EBUILD simple-scan-3.30.2.ebuild 1411 BLAKE2B 336efc46f57cc33f3522ea53a381a40aae08389ab0902d93b23ed5055bd648bf68d1b747e1d8df525f34da59fde2973e2a87f3aef8d4449c4e1d51b6036fc967 SHA512 c45ea9e8396fd2f216e0c7479691f43d6a8aad37a23ce260ec9974a991e30bc4d7d8a781970948fc87047e317f01a952a5fe4e5506562012b71d5e209479724f
 EBUILD simple-scan-3.32.2.ebuild 1526 BLAKE2B 759f8334d42a2296fceb82b2a3dd7268ea2d650247e31e72266ed34073dcc2686ab162cece76d75ff6de9239c947e1bee3b9b214b88b053b6f04971cd99a4859 SHA512 bc3b9c5722eb613e4325f21c47e0fbd23b0cb6cde2180a938dc7630e63438e37362054e3342024a3cb0af68144b00213261a13074929c076d6943503988f0813
 MISC metadata.xml 616 BLAKE2B 576d986402f8cc708eae60f661640808751747c764d5fe729dd014f33758e0b484a2b80a214d9a3d1ed4bce7e455e34803a62048240e5de8e203184446cdc0df SHA512 6377cb9c20b1ce2db22ba959d386e4389939b72503d87da956d659144b8a6f8b521abdd19dd4c82ac0cb32e260ce6633b75136a353f63b86593f5e1f12394d47
diff --git a/media-gfx/simple-scan/simple-scan-3.30.2.ebuild b/media-gfx/simple-scan/simple-scan-3.30.2.ebuild
deleted file mode 100644
index 91eb231311d1..000000000000
--- a/media-gfx/simple-scan/simple-scan-3.30.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.34"
-VALA_MAX_API_VERSION="0.42"
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Simple document scanning utility"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
-IUSE="colord webp" # packagekit
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.38:2
-	>=x11-libs/gtk+-3.22:3
-	>=sys-libs/zlib-1.2.3.1:=
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	>=dev-libs/libgusb-0.2.7
-	colord? ( >=x11-misc/colord-0.1.24:=[udev] )
-	webp? ( media-libs/libwebp )
-	>=media-gfx/sane-backends-1.0.20:=
-
-	virtual/jpeg:0=
-"
-# packagekit? ( >=app-admin/packagekit-base-1.1.5 )
-RDEPEND="${COMMON_DEPEND}
-	x11-misc/xdg-utils
-"
-DEPEND="${COMMON_DEPEND}
-	$(vala_depend)
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	>=dev-libs/libgusb-0.2.7[vala]
-	colord? ( >=x11-misc/colord-0.1.24:=[vala] )
-"
-
-PATCHES=(
-	# Add control for optional dependencies
-	"${FILESDIR}"/3.26-add-control-optional-deps.patch
-)
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use colord)
-		-Dpackagekit=false
-		$(meson_use webp)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index 73a5573a7839..ba4bdcd95e73 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -7,4 +7,4 @@ DIST slic3r-1.3.0.tar.gz 2104094 BLAKE2B 74c58690cf196f89ecff5eec853215c87c648df
 EBUILD slic3r-1.1.7.ebuild 2934 BLAKE2B 12740144adbadb8ef668003b7c1391b5e124208d02a5f9fe89d17a95e2ced01c04421f985b2aca1e3ddb4df34e7fdedc71af3d0e8dcbc76d85805fcc7c030b2a SHA512 b6b2c92e011e473cdd4934ae43e0ab32556fee66008bab3a397a2ac2f9b78d747eca30a4b794d3955d04f040e260fb5857ebbd6ab08250f611eb76f3faa1c623
 EBUILD slic3r-1.3.0-r1.ebuild 2885 BLAKE2B ef50ccee25ce363aea8b5a678e9e0d3e49182739c71311dcc1417420ab028663e1f74011b8b710e900710eda870c632f783cbe3428a5f6c786256b41e421b60a SHA512 5cf3b715822f7217b38d2fb8ceef29de8684742b16b27f7ac50aeaf3d7df326373e9ff1f9112b816e5c7728a06ebd49292b4376f948671940e6b1577078fe177
 EBUILD slic3r-9999.ebuild 2646 BLAKE2B 69887be58dbafebdf1c1eb52c22db40ab4bce885634fc457d4c0ffdc3de64d378bcf8f68081e0f77ffcedb03cb2d2a3bc93101aebff24cee5d58acea2636cf07 SHA512 cc71f52231dfe4c8b10d49d232ef249b8a32ad9ec63db6d943d2ee8b2bc0b0ba028339cdc463c93e95a4d34501e8adf277f3e13f0de69940d6f50c8e6dcdd4b3
-MISC metadata.xml 861 BLAKE2B 91af33b7f79333028a2c77b24a4e910b93693a8aeec0e260405df9930489e4cadd3a4cf12f66e1b3b90a84113deb1c30108a7cdc000ef2097559871552385cfb SHA512 203b7d367c4eb6ff4b88fc304dac879277a2b515ed349d495d4231bbd3b097172f20a98fe4bb396b92114a78e7db3e56c2bfb3256e7ff94dfaded9e36696c6a8
+MISC metadata.xml 797 BLAKE2B bc34024c8f935d21985d572971a3c28b809dd54e8af65092c98f0f18e9229f9e945732bd36e9620c542260d692e3259aebc38de68c9baca8ba9fa67c3c312cc5 SHA512 13a72e511f2341c9cecc05eca767c348c595d77de4a41a154da93d6bcb31710f24bc51a23abefb08719718194ab3961d3f94697ed97319936e5d9ce625f82da5
diff --git a/media-gfx/slic3r/metadata.xml b/media-gfx/slic3r/metadata.xml
index a21a04deb389..49968e9fe3d2 100644
--- a/media-gfx/slic3r/metadata.xml
+++ b/media-gfx/slic3r/metadata.xml
@@ -9,9 +9,6 @@
         <email>perl@gentoo.org</email>
         <name>Gentoo Perl Project</name>
     </maintainer>
-    <use>
-        <flag name="gui">Enable GUI</flag>
-    </use>
     <longdescription lang="en">
         Slic3r is the tool you need to convert a 3D model into printing instructions for your 3D printer. It cuts the model into horizontal slices (layers), generates toolpaths to fill them and calculates the amount of material to be extruded.
     </longdescription>
diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest
index 8cafab9859cc..df667e3d275e 100644
--- a/media-gfx/sxiv/Manifest
+++ b/media-gfx/sxiv/Manifest
@@ -1,5 +1,5 @@
 AUX sxiv-25-makefile.patch 251 BLAKE2B 05b96799c7e94c2a907158becfbd3d0844a3919f75e7c4e6e8f994ec2881f173919c34625d80357882b28157f72ea6d0bbd6331473c6b213857c3e8a5db92bad SHA512 8e7b30bb73b87981b2d2c4e9bff8f62b5e59d341410dee0d4ecb889a0f39cfb38539a8d6ef2a738517ab5034c035e6588a4d2b7220bd408a2dd040f6cb8d7088
 DIST sxiv-25.tar.gz 48814 BLAKE2B 17ef2ff0e75acd6acce068dfc17dfbce78bb1a38b652e948b5f88902adcbae504e9322c92d125b71c511a95c7e8e47b58060ff58e2c804a7296b5a801d3fc0e8 SHA512 ca0d834c9982c5e98c0bae51d21b7d08692af2d692eeb2ac55e19c4da7d09b16bbaa8022af0a0d00c52def4120058d895f37a2f8b14f453a0ceb65eebe564814
-EBUILD sxiv-25.ebuild 1286 BLAKE2B ea500e8d7ced602d4616efed270173499204332fe6bb665d6c52e33833a1745423aa15ce417fb3502c5471b3746bf73c438533d9010b193b728154c0fe6a3c5f SHA512 9bade847c07cf76abd4131e6ced11c3dba85d8522b4b441b1556f9f20eef69907221dfcec4b7492c782de17f93a6a39453ae66a24223367145002509e979e35f
-EBUILD sxiv-9999.ebuild 1241 BLAKE2B 4881e1503bf20cb06434fbb1cf4c540ecd2d724fb845c00eae2e349b96fc4440ed54359113f72a710a39564b7d4d2f015465b8754e1e6a6fb94abc1d6702e53f SHA512 1f8b2885556990c7de6b572cfc0f54d94d2fc804a73da9953d7f36511d73256c8318855ac32f578acb8bbb286eb0b70c411581a5cdaac2424239c866bab9d441
+EBUILD sxiv-25.ebuild 1293 BLAKE2B 715b77644c20bae1c82681a17ad3dd2d2faa8944148c5df2bd1fe13394aa579fea2ca6d1e903d1512c010a3042e6314ab98a03c59dfdf9079a7413981b177eb6 SHA512 1a1c372246eba6f11fff1fd4821b2f9e20e2fbf45d222d05480c4761417302e05b427654b5ec632b92d4b4865e5749348985dae4c3e09725729bb45d92e2d9dc
+EBUILD sxiv-9999.ebuild 1248 BLAKE2B 7b9c1bd78dfcb12e2b7dec2082aa62878ce29e0cae3d16cec521bd2bb9b0485c8e8951f365a6dc06b594757f2e140546c95801c89f50bd4c2770e67daa012477 SHA512 b9f6bf26b454deec0b17eaf02d5010c3e7b802bad351f2b3bbf6222ac2ed612f5f5b76baeac8d097be07f0756a65879873512939bc4c68c55b9e5989fc98ffcc
 MISC metadata.xml 347 BLAKE2B 0e614a8efac493e84e5b64dc4347616e6af23c5e95a84b29fe755ab73d2bec9527a3e7dfd39cb9d952df4571c2b6d6f3de10e949bd5356d9628f3761bc578a4f SHA512 9aca2dd50b12a3bc6a0175bf8fe1767990b519ba92f91eca79137383901119fb7002b0e31d817a287ec08595d32c0074d92aefb0b0ae14c8e4c0b6b366e28515
diff --git a/media-gfx/sxiv/sxiv-25.ebuild b/media-gfx/sxiv/sxiv-25.ebuild
index 577cc55b305c..2c633fa3bd9c 100644
--- a/media-gfx/sxiv/sxiv-25.ebuild
+++ b/media-gfx/sxiv/sxiv-25.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/muennich/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 DESCRIPTION="Simple (or small or suckless) X Image Viewer"
diff --git a/media-gfx/sxiv/sxiv-9999.ebuild b/media-gfx/sxiv/sxiv-9999.ebuild
index 3b3917053a8f..348cf62e0e1a 100644
--- a/media-gfx/sxiv/sxiv-9999.ebuild
+++ b/media-gfx/sxiv/sxiv-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/muennich/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Simple (or small or suckless) X Image Viewer"
diff --git a/media-gfx/symboleditor/Manifest b/media-gfx/symboleditor/Manifest
index 5e908a8a2576..68fb0fa552c5 100644
--- a/media-gfx/symboleditor/Manifest
+++ b/media-gfx/symboleditor/Manifest
@@ -1,3 +1,3 @@
 DIST symboleditor-2.1.0.tar.xz 495416 BLAKE2B 5f5d5a60806ebf0dacce5dcff538ac0f2c4966b2f2bda79450f66515d8572dd61a67db5e4d0f91b548a62c14e4e14aea283b710dc2a7c84770eb35dd22e20699 SHA512 dc83f3f80b12d8217a230d8c951e90bcc6246c4460d987efb140c54c1e88a8f5d607ac7ebfe706399cd0917e22a2089df6742afadd28305d39ceeff0c55da535
-EBUILD symboleditor-2.1.0.ebuild 883 BLAKE2B 70944d0701dd56a8981b0e51aa120bbb6dbfb5bca1407b88960377f9745dd14e03229f623514e17e593cc7dd7c9271cd679da19979e1a7f91a50f9d1a7b7be60 SHA512 f687f83d98c0f3ca554b616439861a1d2c334cd9a3d38c103b65e94964e41d091665e48e4cf15a7e6b337644152b6bb5a050c070969fc4a31a5cd7073e09539c
+EBUILD symboleditor-2.1.0.ebuild 1030 BLAKE2B 2e192ec790b1dd342b5a478b335ef0f10bce4fbc5a3ef8afb6f9339a96f1ae6e6ad1c7b6fa113e9c3bf92f0556ca6303c60afe7904a234ba0261d704a979723e SHA512 39335aeacbd8d28305484df29dd685685ede38ac3189f9fa93cfe42cdfb34e32d333163550c114582c5dd169fb9eeb31ca7723bb2d892c5c9dae187c7f5a1891
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-gfx/symboleditor/symboleditor-2.1.0.ebuild b/media-gfx/symboleditor/symboleditor-2.1.0.ebuild
index 30fbc9684832..7ed8ac948d21 100644
--- a/media-gfx/symboleditor/symboleditor-2.1.0.ebuild
+++ b/media-gfx/symboleditor/symboleditor-2.1.0.ebuild
@@ -1,34 +1,38 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KDE_HANDBOOK="optional"
-inherit kde5
+ECM_HANDBOOK="optional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Application to create libraries of QPainterPath objects with rendering hints"
-HOMEPAGE="https://userbase.kde.org/SymbolEditor"
+HOMEPAGE="https://kde.org/applications/graphics/org.kde.SymbolEditor
+https://userbase.kde.org/SymbolEditor"
+
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
-IUSE=""
+SLOT="5"
 
 BDEPEND="
 	sys-devel/gettext
 "
 DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
 
@@ -37,5 +41,5 @@ src_configure() {
 		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/media-gfx/synnefo/Manifest b/media-gfx/synnefo/Manifest
index bcce8ab89275..57f90510a2e9 100644
--- a/media-gfx/synnefo/Manifest
+++ b/media-gfx/synnefo/Manifest
@@ -1,3 +1,3 @@
 DIST synnefo-1.1.0.tar.gz 161822 BLAKE2B 1d1981ae815e692cd9230690214bff039c2b523f78faab34d35ad8f25cefbc656ace2ba2ca240baa7d305417f17ea0c4d0cad5d300a638b15cc81d315fdf474c SHA512 f4c50e6e018b0dcf91715c379cd5b79452886fb7fda189ad47a22b9d5f47b3ca710b959b773a1e0a42564e881d09da088a88eef505719b1b1fbfbb5e21fb26ef
-EBUILD synnefo-1.1.0.ebuild 718 BLAKE2B fce0b646a1338cd7bed563fa444622a1a2ee8b8e4954ad0a246bd4b8e416735e970edf3d6ba6a7cb8fd77411de64ca687e88a3cb45c5ce033b2f16f6c75dd48c SHA512 f44c40c3e43ddd4023318e6789a0994abfe8d8cd4672ec6047979552dedb8e477a4cb139352e5478750524f0d4925616966e8cd0c430a4add24a39cb0b814bfe
+EBUILD synnefo-1.1.0.ebuild 712 BLAKE2B 6be06777f5b9f0a89c8fd86e0910a95b0e8dde9bfa3f41579d2120809afe40b61dbfe0e5bd34a6607deec6ce5ffdff8067774bd50c6ecd0b52eec86713efc3d6 SHA512 4df0ac04e02437afcfd04065dd5942bfafc8d83187a8e4f989166bdb566bf1e98602b645f40433a8214ba7eebe48c3e492d84fab1344943a8a8694167adbbecd
 MISC metadata.xml 333 BLAKE2B ae4c40964873b751ece7a62f6f8c4cbc7d6d6cb9d4008e958a243f8a6c5ba3461156a5032097997b3d90a5b9dde516bd5351f4e7cde27f83cbaf82224c7ee1d0 SHA512 49d4f64a95ddf7b75f0e3efe44bc03e8df9f565aec70c52838dea32badc5809d0b3945f87a4de3bc6704f0a3e1732e683412d4ffd480e5ef40bf763c958b7936
diff --git a/media-gfx/synnefo/synnefo-1.1.0.ebuild b/media-gfx/synnefo/synnefo-1.1.0.ebuild
index 5605351edcd4..eb126309b0bc 100644
--- a/media-gfx/synnefo/synnefo-1.1.0.ebuild
+++ b/media-gfx/synnefo/synnefo-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/oyranos-cms/Synnefo.git"
 	inherit git-r3
diff --git a/media-gfx/termtosvg/Manifest b/media-gfx/termtosvg/Manifest
index 74c0d9899512..49cdfd1310ba 100644
--- a/media-gfx/termtosvg/Manifest
+++ b/media-gfx/termtosvg/Manifest
@@ -1,5 +1,5 @@
 DIST termtosvg-0.7.0.tar.gz 276936 BLAKE2B 530bd3ef17aa19cbc23e46e7aea4716dda9369979ae97609ac6f976fecd4f75652b23f47ccf4da8035175f281d1a80b340acc714391882365c01764a92e4588b SHA512 085f6b9728cc641b058c8a060420e8221659a9447119d2c1211cfcd6452c63a187c5dc1e4f98fc7aca2018161ae49a9a71b2264108c5e06167eaaaf18f5aa291
 DIST termtosvg-0.8.0.tar.gz 211057 BLAKE2B db34f9b29a05576e8f2c4ac5f6ee606c61ac88d7a169e43e02655c54bc26fff7c8c37c7a7e96cdf84a015f8dfbe8c953c625f27aeda9ab0568751a0c24e84ae6 SHA512 7688abddff7d1d600a9c86364518418a1a2ad809c5bb0dca2920542af1c0c0c725a11f76b939ded5b671f5bc8f64bfa198b340465d74243983867689c1940bc5
-EBUILD termtosvg-0.7.0.ebuild 651 BLAKE2B befbc29b26d535e58bc34a7a9eb2237abe14f01ee5aa4680bad97458dd2c0506535e53084edd6b911ca5e9f7577f2fd448d935daface86efe5658d87506d57b0 SHA512 9984d0743ad68982ec762ac42bc3b9488c4e0669257d4990c8b1d50489b0601abdd0cfa6229a18b6a86d90c7133df8c097bda815719602c8b90ab8df55503939
-EBUILD termtosvg-0.8.0.ebuild 651 BLAKE2B cc97272b331e8f3e3bb51013f87cf3402f238329277067be2131c8a72dcec722d537d590fb0d0f9090123d684fd29ec7f3c6b84a350cc1fd874e714647d205d4 SHA512 2f2aa5e021e87cdcc0896a4737843383c6b2bdae9b699b4387b31154f75f120e99093fcee25ba44f90df291b21df50fc82b3eb9cf02897b755e15abd6461c3ba
+EBUILD termtosvg-0.7.0.ebuild 649 BLAKE2B 7b6e6981bd5daaceb6eb86c39c3f10ba348bcd2d912eca0898c16fd80d6176a0e80d8b3aefefd00c26fa7f41ca77d70415257ae8cc0dd0af9e12d1499f9d04ad SHA512 fbcf06b1a18068e756ea46ec2505c90bce096748baf33e3fdc6e5050d30139a1d9b18f5cd4ac97c06d007d1a5a475ef60a85df6d3cbb06ec591453a60beba3b4
+EBUILD termtosvg-0.8.0.ebuild 649 BLAKE2B 7b6e6981bd5daaceb6eb86c39c3f10ba348bcd2d912eca0898c16fd80d6176a0e80d8b3aefefd00c26fa7f41ca77d70415257ae8cc0dd0af9e12d1499f9d04ad SHA512 fbcf06b1a18068e756ea46ec2505c90bce096748baf33e3fdc6e5050d30139a1d9b18f5cd4ac97c06d007d1a5a475ef60a85df6d3cbb06ec591453a60beba3b4
 MISC metadata.xml 212 BLAKE2B cc81de7077d569b2a0afc40390d2be47ddc84045da2c51b7a2e19fca5a5f28548ec0bbc2010b6936d5ab5c96442011ddd0833b7b594df2c2cf9abab99d99a3ed SHA512 1d2f2ca333bf8a1aba058691921bf03d664a0d4c213c4435a068893b2e50a6e86c01e07a17819600eaee93b72d9deff052fc12b10ee3ae8437e13eb17a40bc08
diff --git a/media-gfx/termtosvg/termtosvg-0.7.0.ebuild b/media-gfx/termtosvg/termtosvg-0.7.0.ebuild
index 7bc556998fa8..47a2f11c4652 100644
--- a/media-gfx/termtosvg/termtosvg-0.7.0.ebuild
+++ b/media-gfx/termtosvg/termtosvg-0.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Record terminal sessions as SVG animations"
diff --git a/media-gfx/termtosvg/termtosvg-0.8.0.ebuild b/media-gfx/termtosvg/termtosvg-0.8.0.ebuild
index fa8c23ae679f..47a2f11c4652 100644
--- a/media-gfx/termtosvg/termtosvg-0.8.0.ebuild
+++ b/media-gfx/termtosvg/termtosvg-0.8.0.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
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Record terminal sessions as SVG animations"
diff --git a/media-gfx/tic98/Manifest b/media-gfx/tic98/Manifest
deleted file mode 100644
index 3dd99058dfa4..000000000000
--- a/media-gfx/tic98/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX tic98-1.01-gentoo.diff 5452 BLAKE2B ce7e5a57a94de1b349ab194be8a28b3ba4a677acf96e1651e175d08054b86eeb5b94e5a0910a0cfeafac38529b85e1b39c4294160feb90831b932484dde87f8c SHA512 89636f8dade2e9cf6a250b51e1b5a6ca11571e6e7216cfe36306e0004528493fc16c32d7de96f10aed1ae584e23ed2dcbca62e752c46ef2e554224b23e0fb91f
-AUX tic98-1.01-glibc-2.10.patch 624 BLAKE2B 8cda0a43c5ec1c68aeceaf645bde7855d526dc5df2fcad47be05bc3058bb8e44c6ad3300e634e540d6efb0222c14c4166968509ff6dde6a9f714f43be0dc8136 SHA512 282714f6f51e52a44440493acc510fa3c00274c42ef544526dd5ce35488022e18767bf53e6a5cce385d2d30c4b3caf53f9c61a65a64342456463c5a90a7da843
-AUX tic98-1.01-macos.patch 643 BLAKE2B 628598db524d2ed2ca83f94ed87ff04db0fc6b0a1f4b4efe9cd58d399191eb025106e5852b127c44685fe13e8690725630aab5976fc4e5ce0df32ce19de8d2c9 SHA512 0ddc4616e4f4dfe16825199c4414d326ca8016a2df0052cbbc396a56e1f898cac5fa072bb4b400f800254e359d9fbdb87b86477f006c4d6a38bf0d71def2bc93
-DIST tic98-1.01.tar.bz2 99145 BLAKE2B 37abd7f6cc81b1697daa61d19bf08820e1cd13b2cd521f99cc9ad83705e9b048fa28326a2e4e28ed1836c834cd1839d3aaf013d809557c9163f4c933c6ef7ce7 SHA512 3bb6c72f0a9ed199f2eb1ceb53a5552b384510a9f6ecdfabf7f79e815cb0511cf880a00bddf5b88b49ea416fbcf7fed5e84af1ee2fbed7c313b39ee042efa797
-EBUILD tic98-1.01-r3.ebuild 1083 BLAKE2B a8e3c07ae4ce520748ca95157bb2d23f47bf5a29349dba2d8e4e7c99c8a5040a9ec0551b112f27859dd9a909e7483aa36e373a3a9146b8285082d1556c0dcf33 SHA512 8b0408a2821b48dddb2e13fe1e9967062dab21a79ba7899fd79e28021a3cc07618b494c9c83c3662103ccea5b9280d2829877711a969271ed230cedb58da0dff
-MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/tic98/files/tic98-1.01-gentoo.diff b/media-gfx/tic98/files/tic98-1.01-gentoo.diff
deleted file mode 100644
index 880dfa059545..000000000000
--- a/media-gfx/tic98/files/tic98-1.01-gentoo.diff
+++ /dev/null
@@ -1,205 +0,0 @@
-diff -Nru tic98/Makefile tic98.gentoo/Makefile
---- tic98/Makefile	1999-06-22 05:00:58.000000000 -0400
-+++ tic98.gentoo/Makefile	2002-10-19 18:20:55.000000000 -0400
-@@ -1,4 +1,4 @@
--BIN=/home/singlis/linux/bin
-+BIN=/usr/bin
- IMAGES=/home/ml/singlis
- LIBTIC= 
- LIBS=   -lm #-L/home/singlis/linux/lib -lccmalloc -ldl
-@@ -180,4 +180,4 @@
- 	 boundary.o getopt.o windowing.o
- 	$(CC) -o $@ $^ $(LIBS)
- 
-- 
-\ No newline at end of file
-+ 
-diff -Nru tic98/arithcode.c tic98.gentoo/arithcode.c
---- tic98/arithcode.c	1999-06-21 21:48:40.000000000 -0400
-+++ tic98.gentoo/arithcode.c	2002-10-19 18:19:20.000000000 -0400
-@@ -610,7 +610,7 @@
-     bits_to_go = 0;
- }
- 
--#ifdef 0
-+#ifdef none
- void
- arith_encode( unsigned int lbnd, unsigned int hbnd, unsigned int totl )
- /* Arithmetically encode the range. */
-@@ -645,7 +645,7 @@
- }
- 
- 
--#ifdef 0
-+#ifdef none
- void arith_decode( unsigned int lbnd, unsigned int hbnd, unsigned int totl )
- /* Arithmetically decode the range. */
- {
-@@ -726,7 +726,7 @@
- 
- 
- 
--#ifdef 0
-+#ifdef none
- 
- void 
- EncodeGammaSigned (int snum, int *pos, int *neg)
-diff -Nru tic98/b_gamma.c tic98.gentoo/b_gamma.c
---- tic98/b_gamma.c	1999-06-21 21:48:41.000000000 -0400
-+++ tic98.gentoo/b_gamma.c	2002-10-19 18:18:43.000000000 -0400
-@@ -187,7 +187,7 @@
-     }
- }
- 
--#ifdef 0
-+#ifdef none
- void 
- b_gamma_encode_64(unsigned long num)
- {
-diff -Nru tic98/docstrum.c tic98.gentoo/docstrum.c
---- tic98/docstrum.c	1999-07-01 15:58:37.000000000 -0400
-+++ tic98.gentoo/docstrum.c	2002-10-19 18:19:39.000000000 -0400
-@@ -672,7 +672,7 @@
-     calc_docstrum_spacing(list,neighs,0,&within,&between);
- 
-     prune_neighbours_distance(neighs,len, 3*between);
--#ifdef 0
-+#ifdef none
-     prune_neighbours_angle_distance(neighs,len, 0,30, 6*within/*MIN(6*within,sqrt(2.0)*between)*/);
- #endif
- 
-diff -Nru tic98/ppmd_model.c tic98.gentoo/ppmd_model.c
---- tic98/ppmd_model.c	1999-06-21 21:48:42.000000000 -0400
-+++ tic98.gentoo/ppmd_model.c	2002-10-19 18:20:33.000000000 -0400
-@@ -496,7 +496,7 @@
- 	arithmetic_encode( lbnd, hbnd, totl );
- }
- 
--#ifdef 0
-+#ifdef none
- unsigned int
- arith_decode_target (unsigned int totl)
- /* Arithmetically decodes the target. */
-diff -Nru tic98.orig/page_features.c tic98/page_features.c
---- tic98.orig/page_features.c	1999-06-22 03:48:42.000000000 +0200
-+++ tic98/page_features.c	2005-08-02 19:47:09.485681960 +0200
-@@ -37,18 +37,17 @@
- void
- dump_header()
- {
--  fprintf(stdout,"@arff 3
--@relation features
--@attribute 'Number' real
--@attribute 'Area' real
--@attribute 'Avg_area' real
--@attribute 'Density' real
--@attribute 'Aspect' real
--@attribute 'Holes' real
--@attribute 'Edges' real
--@attribute 'class' string range ( {?} )
--@data
--");
-+  fprintf(stdout,"@arff 3"
-+"@relation features"
-+"@attribute 'Number' real"
-+"@attribute 'Area' real"
-+"@attribute 'Avg_area' real"
-+"@attribute 'Density' real"
-+"@attribute 'Aspect' real"
-+"@attribute 'Holes' real"
-+"@attribute 'Edges' real"
-+"@attribute 'class' string range ( {?} )"
-+"@data");
- 
- 
- }
-diff -ru tic98/main_tic.c tic98-new/main_tic.c
---- tic98/main_tic.c	Thu Jul  1 21:02:56 1999
-+++ tic98-new/main_tic.c	Fri Mar 16 11:43:56 2001
-@@ -11,6 +11,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <errno.h>
- 
- #include "arithcode.h"
- #include "globals.h"
-@@ -96,8 +97,10 @@
-   marklistptr list=NULL,list2=NULL;
-   marktype copy;
- 
--  if(marktype_readnamed(fn, image)!=0)
-+  if(marktype_readnamed(fn, image)!=0) {
-+    fprintf(stderr, "imagefn_to_list(): bad input file %s\n", fn);
-     return NULL;
-+  }
- 
-   *w=image->w;
-   *h=image->h;
-@@ -495,7 +498,10 @@
- 
-     TimerStart(1);
- 
--    freopen(outfilename[0],"wb",stdout);
-+    if (! freopen(outfilename[0],"wb",stdout)) {
-+	 fprintf(stderr, "failed to open %s for writing: %s\n",
-+		 outfilename[0], strerror(errno));
-+    }
- 
-     tic98_init(&t);
-     tic98_start_encoding();
-@@ -503,8 +509,11 @@
-     for(i=0;i<num_in;i++){
-       int w,h,xx,yy,ok=0;
-       marktype image;
--      list=imagefn_to_list(&image,infilename[i], &w, &h);
--      
-+      if (! (list=imagefn_to_list(&image,infilename[i], &w, &h))) {
-+	   fprintf(stderr, "cannot read file %s\n", infilename[i]);
-+	   exit(1);
-+      }
-+
-       tic98_num_encode(&t,NEW_PAGE);
- 
-       for(xx=0;xx<image.w;xx++)
-@@ -560,7 +569,10 @@
-     newoutname=(char*)malloc(sizeof(char)*(strlen(outfilename[0])+10));
-     assert(newoutname);
- 
--    freopen(infilename[0],"rb",stdin);
-+    if (! freopen(infilename[0],"rb",stdin)) {
-+	 fprintf(stderr, "failed to open %s for reading: %s\n",
-+		 infilename[0], strerror(errno));
-+    }
- 
-     tic98_init(&t);
-     tic98_start_decoding();
-diff -ru tic98/marklist.c tic98-new/marklist.c
---- tic98/marklist.c	Thu Jul  1 21:56:19 1999
-+++ tic98-new/marklist.c	Fri Mar 16 11:44:20 2001
-@@ -94,11 +94,11 @@
-   magic = magic_popnamed (fn, &err) >> 16;	/* only interested in first 2 bytes */
- 
-   if (err != 0) {
--    return 1;			/* failure */
-     fprintf (stderr, "error - can't open file '%s'\n", fn);
--    return 1;
-+    return 1;			/* failure */
-   }
-   if (!((magic == MAGIC_P1) || (magic == MAGIC_P4))) {
-+    fprintf (stderr, "bad magic in file '%s'\n", fn);
-     return 1;
-   }
-   if (fn2) {
-diff -ru tic98/utils.c tic98-new/utils.c
---- tic98/utils.c	Tue Jun 22 02:48:43 1999
-+++ tic98-new/utils.c	Fri Mar 16 11:23:57 2001
-@@ -117,7 +117,7 @@
-     }
-     else{
- 	*err=1;
--/*	error("magic_popnamed","can't open file",fn);*/
-+	error("magic_popnamed","can't open file",fn);
- 	return 0;
-     }
- }
diff --git a/media-gfx/tic98/files/tic98-1.01-glibc-2.10.patch b/media-gfx/tic98/files/tic98-1.01-glibc-2.10.patch
deleted file mode 100644
index 32caf5e43477..000000000000
--- a/media-gfx/tic98/files/tic98-1.01-glibc-2.10.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- tic98.orig/ppmd_enc.c	2009-07-05 14:15:53.000000000 +0200
-+++ tic98/ppmd_enc.c	2009-07-05 14:18:47.000000000 +0200
-@@ -63,7 +63,7 @@
- }
- 
- int
--getline (FILE *fp, char *s, int max)
-+tic98_getline (FILE *fp, char *s, int max)
- /* Read line from FP into S; return its length (maximum length = MAX). */
- {
-     int i;
-@@ -111,7 +111,7 @@
-     ppm_start_encoding (max_order, max_symbol);
- 
-     /* Read in the integers */
--    while ((len = getline (fp, line, MAX_LINE)) != EOF)
-+    while ((len = tic98_getline (fp, line, MAX_LINE)) != EOF)
-     {
-         count++;
- 	if ((debugProgress) && ((count % debugProgress) == 0))
diff --git a/media-gfx/tic98/files/tic98-1.01-macos.patch b/media-gfx/tic98/files/tic98-1.01-macos.patch
deleted file mode 100644
index 607e76f9416a..000000000000
--- a/media-gfx/tic98/files/tic98-1.01-macos.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- tic98/ppmd_hash.c.orig	2005-11-03 11:09:22.000000000 +0100
-+++ tic98/ppmd_hash.c	2005-11-03 11:09:49.000000000 +0100
-@@ -2,7 +2,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <assert.h>
-+#ifndef __APPLE__
- #include <malloc.h>
-+#endif
- #include "ppmd_hash.h"
- 
- #define HASH_NULL 0
---- tic98/ppmd_model.c.orig	2005-11-03 11:07:09.000000000 +0100
-+++ tic98/ppmd_model.c	2005-11-03 11:09:04.000000000 +0100
-@@ -1,7 +1,11 @@
- /* PPM* model for arithmetic encoder. */
- #include <stdio.h>
- #include <assert.h>
-+#ifndef __APPLE__
- #include <malloc.h>
-+#else
-+#include <stdlib.h>
-+#endif
- #include "arithcode.h"
- #include "ppmd_hash.h"
- 
diff --git a/media-gfx/tic98/tic98-1.01-r3.ebuild b/media-gfx/tic98/tic98-1.01-r3.ebuild
deleted file mode 100644
index f02741df8cff..000000000000
--- a/media-gfx/tic98/tic98-1.01-r3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="compressor for black-and-white images, in particular scanned documents"
-HOMEPAGE="http://membled.com/work/mirror/tic98/"
-SRC_URI="http://membled.com/work/mirror/tic98/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-macos.patch
-	epatch "${FILESDIR}"/${P}-gentoo.diff
-	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
-
-	# respect CFLAGS and LDFLAGS
-	sed -i -e "s:CFLAGS= -O -Wall -Wno-unused:CFLAGS=${CFLAGS}:" \
-		-e "s:LIBS=   -lm #-L/home/singlis/linux/lib -lccmalloc -ldl:LIBS= -lm ${LDFLAGS}:" \
-		-e "s:CC=	gcc -pipe :CC=$(tc-getCC):" \
-		-e "s:CPP=	gcc -pipe:CPP=$(tc-getCPP):" \
-		Makefile || die
-}
-
-src_compile() {
-	emake all
-	emake all2
-}
-
-src_install() {
-	dodir /usr/bin
-	emake BIN="${ED}"usr/bin install
-
-	# collision with media-gfx/netpbm, see bug #207534
-	rm "${ED}"/usr/bin/pbmclean || die
-}
diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest
index 1e8c38a94ac3..d893d9dea4ca 100644
--- a/media-gfx/valentina/Manifest
+++ b/media-gfx/valentina/Manifest
@@ -1,5 +1,6 @@
 AUX 5823.patch 1870 BLAKE2B 1a4edc390abd09010fb946035dab6f4ee9223eaa286f9843404db4f95d94e60da73dbf515c99aa857acdcb7d26bca3117fcdfdf2b9514ad45c2e795ab579cc46 SHA512 0cf9d1691816b165ab691cd34807f7c82eea685b5af2d9c483a9427987ae565f44e31bffcec9c3ede6102aa800d3988b054a178ec74f1826be1a88fd9f5ec28c
 DIST valentina-0.6.1.zip 38326440 BLAKE2B 33d9163058b890254120bb0849972941f36526c71ed0acd8df82867a0116a35be4818c31c3ebb8a7322cf53bca4f9e77b2de10ea0df51c46b764f8f9e7abb8d2 SHA512 6511194c734a1b6cd8a1ed489213c288e90bd653dbd8373c4ee13be78e2ae4fe00a35e19a5ee074e868319ab1a13eb8baea35dedb7242b3888d03aa4b4dc69ce
-EBUILD valentina-0.6.1.ebuild 2177 BLAKE2B 58239504686422d35909bfae8d2913cbda227f6862f6cf7097235045b6a86d0b5f1a93689efd886e6c9f7db0fe7029d14cf5b8c9d2db1d88b3bcf1b262cce37f SHA512 827aee577d869b07cace5e4a9f2c30eb21cc187e52a5eceadc68081d7372e669d182085b0d4243675dbfc2052fdf8e370ec5b9e6919466360eca048c7001c979
-EBUILD valentina-9999.ebuild 2057 BLAKE2B 8f0884308477778a8bdb0ee588b4e976156513fa865c24406acd09079c545b719b82726ed0ec336150e6c26fcfdb97eb3ce71811c55bdffae38a6f0fd4b06525 SHA512 7ae7e33c54c720abd0111783acf5f8ea4c2e4812dc4013176bafc533a33b2359819f386648cef97cea3521329fc55af3f8156b28e4b69353ff1bc882c377fd20
+DIST valentina-5858.patch.bz2 4507 BLAKE2B 10bf1e48b9c822b5fecd040edea05a9fa16bc84d6d8a872a50329bd6b61ae250b489fbf71b19f0453ab5caea0bd7dc821d8c6fbe0fc24a6306d57ce5b34350f9 SHA512 037d2a5305d85d7d6be90c181ee6c39110a86c5f5d77c22453a2933e7d6a43c600f6ffb393015e98f9aab55b0d11291dca482352e1fc74f485578b65b3b84720
+EBUILD valentina-0.6.1-r1.ebuild 2138 BLAKE2B f78ad7ccba1ffbd3cdc8cc9b37f3224597f14edc85443fd7c6e8fb9de4fb8f6561090d6fb2f3784c6ecc351185429f83d7a4c0a4f8bffa1e87d60be26803ed8b SHA512 bb23ed75cda257f20eb5d2dda863095c8b03d8aa7f9932e7bbfa980b29c00f2448606f256f9844df32b6a5f6bd13a2eac7c740ead149950b709162e073c8e102
+EBUILD valentina-9999.ebuild 1914 BLAKE2B 572d8697a238d99cf7a8d6af1c0a7cb730ae380c3eefe20e5bbcb95806ee2894e164289f2a6aaf7e72920ee75388e8e73c733806e71cd0fa2ab50005279398c2 SHA512 d873120eaef5713db1f81666b19c8da3dc14e75d160e3b4ec8f2be43095310d8ead5df2de976aa1503b966b4e4606054f64df2d576085dc7558c36acd1e3e689
 MISC metadata.xml 334 BLAKE2B 7f146a505a30d4461165308b40383e2b78998411874c8af6113c3040142003868f397872ecd22b9b8f3ec6193c532fa934c8646ee04e8c49157464b58035de09 SHA512 d1264aa0d26ba75466c5572c37ca6fd384d4e6db392aca0e47d4b1d0bd3ef7e035fed51c460af1bb258c500d1cc9211ec2e85db3e3aa158d378fb1389a3ebf03
diff --git a/media-gfx/valentina/valentina-0.6.1.ebuild b/media-gfx/valentina/valentina-0.6.1-r1.ebuild
index a59fb86953a5..f44a566e76f4 100644
--- a/media-gfx/valentina/valentina-0.6.1.ebuild
+++ b/media-gfx/valentina/valentina-0.6.1-r1.ebuild
@@ -1,18 +1,19 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit qmake-utils gnome2-utils xdg-utils
+inherit qmake-utils gnome2-utils xdg
 
 DESCRIPTION="Cloth patternmaking software"
 HOMEPAGE="https://valentinaproject.bitbucket.io/"
-SRC_URI="https://bitbucket.org/dismine/${PN}/get/v${PV}.zip -> ${P}.zip"
+SRC_URI="https://bitbucket.org/dismine/${PN}/get/v${PV}.zip -> ${P}.zip
+	https://dev.gentoo.org/~fordfrog/distfiles/valentina-5858.patch.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gnome"
+IUSE=""
 
 LANGS="cs de el en en es fi fr he id it nl pt-BR ro ru uk zh-CN"
 
@@ -40,6 +41,7 @@ S=${WORKDIR}/dismine-${PN}-b639b75d1688
 
 PATCHES=(
 	"${FILESDIR}/5823.patch"
+	"${WORKDIR}/valentina-5858.patch"
 )
 
 src_configure() {
@@ -118,12 +120,3 @@ src_install() {
 	insinto /usr/share/mime/packages
 	doins dist/debian/${PN}.xml
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	if use gnome ; then
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/media-gfx/valentina/valentina-9999.ebuild b/media-gfx/valentina/valentina-9999.ebuild
index 5aaeab21f49e..c5691f998ce1 100644
--- a/media-gfx/valentina/valentina-9999.ebuild
+++ b/media-gfx/valentina/valentina-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit mercurial qmake-utils gnome2-utils xdg-utils
+inherit mercurial qmake-utils gnome2-utils xdg
 
 DESCRIPTION="Cloth patternmaking software"
 HOMEPAGE="https://valentinaproject.bitbucket.io/"
@@ -13,7 +13,7 @@ EHG_REVISION="develop"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="gnome"
+IUSE=""
 
 LANGS="cs de el en en es fi fr he id it nl pt-BR ro ru uk zh-CN"
 
@@ -111,12 +111,3 @@ src_install() {
 	insinto /usr/share/mime/packages
 	doins dist/debian/${PN}.xml
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	if use gnome ; then
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/media-gfx/xdot/Manifest b/media-gfx/xdot/Manifest
index 1f2ea7ab6dd8..40355359e07c 100644
--- a/media-gfx/xdot/Manifest
+++ b/media-gfx/xdot/Manifest
@@ -1,4 +1,4 @@
 DIST xdot-1.1.tar.gz 134215 BLAKE2B e241a4fb1ec69a8613f7813dc159761e6bffb82ea9f58876287d01946f4c93e66e5eef66e6844abb7738979412c2c7d2d26f76bc0563ad0c3c8550d9e8023b47 SHA512 d67c45c8c071013551f79d671a21ce546b680fac5997ba9631a882ffa3c44c15a69949643ed5e8211417006152575a1d99450ccfb6062427521d1e2bc0814f55
-EBUILD xdot-1.1.ebuild 1102 BLAKE2B b134331aa6c28073ed7c0f5b0cdeb4871623622ff8fb9d5b0cecf3e30c2e71f7a001f993c3c5a65a66c9d5feeb1afeca4c502f143ee5921c1e13b2fae7725cec SHA512 95130c58d8241786ac3e07f293829b20d0c1e0e979ede8dc095c2b5cf5881797d8919fe79a4bbd50814eebda34703797281f49f71a037d2b76429daf02cb77e7
-EBUILD xdot-9999.ebuild 1104 BLAKE2B e3e4fc6bfc97f72f48901173e8a8b477414afa78f619b36c3f1e6b418abe2af54534df4305a6e92db6fb18829ee53a94ed93826eaa031906fbde6d6c73c72133 SHA512 dca13c44f96d1e9ac3823b8583faa5ac56a3d69804410c282a612a6f0043d4b6e8019921225e0a3a90a94bcaea1391b7a5a2603aa003fb05e54cffeaf64a4b15
+EBUILD xdot-1.1.ebuild 1100 BLAKE2B 242d0a051658fe0da9365e0b4b0907371254e00c91f99ec580f49d33ec01d82d3c662e4363a66d7451240ad0d79f4dace78de8a87b6bff65276e46e951934e3d SHA512 65dfad6e67b5af81e0e12f7be56a4540a1c308d19c85b0b55f2f799e1bf112d5b35348115ed75cbc6890ee11a633954281866d87ba45ac88d9006549ef8f80d6
+EBUILD xdot-9999.ebuild 1102 BLAKE2B 154a7034a320211af04a977697e0e8fd7ea53ab37de9ef0e5d34fc60f13ab8c7e8861c1d4e24ae8a0a2a2e727ab3cd57070338ce058f693946eacfc98e7b2ef7 SHA512 86d2c030cadded62e64e90466ade5733919487fb07e816b089e6cd98f88345ad5f0d00460e47dac10dbe536c84292b347e3b916e12fafa6c97448759ca92daed
 MISC metadata.xml 483 BLAKE2B 50b03bb7d189da9bd6ca793f30c1ba3d13d12151533b42c99321a849515d7664398ec1b10720596c0453c48d35e2a6083b0559eb127199e1d6f4fc2a93aa04c4 SHA512 7e734dd60daa1e74b28f0932f508787e8deebc75a8f46c41f77007b6c8f96751cd6b07f6638cb89b38eb81d4fd2c6f7ba9f6d449f24f17ad25fb001d7f4f5ff7
diff --git a/media-gfx/xdot/xdot-1.1.ebuild b/media-gfx/xdot/xdot-1.1.ebuild
index b184e548ad6a..400ec5717eb4 100644
--- a/media-gfx/xdot/xdot-1.1.ebuild
+++ b/media-gfx/xdot/xdot-1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 MY_PN=xdot.py
 EGIT_REPO_URI="https://github.com/jrfonseca/${MY_PN}"
diff --git a/media-gfx/xdot/xdot-9999.ebuild b/media-gfx/xdot/xdot-9999.ebuild
index 8842ac3a99a5..8eb74e58ccb6 100644
--- a/media-gfx/xdot/xdot-9999.ebuild
+++ b/media-gfx/xdot/xdot-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 MY_PN=xdot.py
 EGIT_REPO_URI="https://github.com/jrfonseca/${MY_PN}"
diff --git a/media-gfx/yafaray/Manifest b/media-gfx/yafaray/Manifest
index c75bd0537d75..35ab9f93b925 100644
--- a/media-gfx/yafaray/Manifest
+++ b/media-gfx/yafaray/Manifest
@@ -3,5 +3,5 @@ AUX yafaray-3.3.0-respect-cflags.patch 502 BLAKE2B 1df4f8667e8c2577812c690baf17c
 AUX yafaray-3.3.0-strip-debug-mode.patch 767 BLAKE2B 42351950158441bd328e3fd3265e8e9e0f96ee51cf9aadf427c3dda7b57b77716e022801183271dd7206d9ec58b1e239159736894423ca53885c033a2b7e8e0f SHA512 f139d622162d02bfd1d95d38ffa2fcb29fd32cdd51cc14aec986dc481c00aa3c982e537ead2ae8d1972401312aaf9ef8cd92b81fc1fd3ee819f350eadac5d2d2
 DIST yafaray-blender-exporter-3.3.0.tar.gz 377928 BLAKE2B 7876c78ca6228282648909e566803b33304be0082fab48819340845e3927877b9734f7bc7e09702bf7cbf6477c68932637eb766dc98b9e8e4ab42ca99d2a3595 SHA512 70a1a806d97f6f3b43cdb5d6caac6104f0f63720d5920f6a623078e05e6977d065d2fabca4da1644deb97f09176b88347f0278e4bc699c783d807d3f530421d0
 DIST yafaray-core-3.3.0.tar.gz 1135360 BLAKE2B 67f6956a3866bfe0b4167f30a7c2c7f05ee23556e9fff7041ff3937e90011e4c2538b706ae27e02351ae555d0d05531f3eb711257591d85f779683c9c42ac6f7 SHA512 32efb87872485c4a188483ae1172cac2eca2281e7b9ab29f184c047b94f3986d65da199a74c169d0e2fd6af59cf37b7deb69dcfb1cb4763bb1ebca30d46b5b90
-EBUILD yafaray-3.3.0-r2.ebuild 3621 BLAKE2B 1d1d363879b72023228a59b909a2d79bbd498704d647c7f4e8eae74f65c02f65cf5043b46d59c8eda061dc5666935db0b0e6a0a0461fb342a16742dfc11f30d3 SHA512 0fadbb01842fea054f7fda15665f3100105273065eda15ba27666ca0c86d1a9187d7f16be443cfed2af3fcccbf826abc5ef1b0f55052889eb8af2319c26bd3e0
+EBUILD yafaray-3.3.0-r2.ebuild 3595 BLAKE2B c003f4f4c09d588962f46b13526035fe8f8c54bef3be260fdf0a66ed47d5111f0068b0fa7dbcaf9d979749946ea3a15c4ef97e39b04a82aa9571a96f6067782d SHA512 6f80e1877fe2ed934819d2cb336e249fa3f81667396b85e99a853ab0ba59e401f36c6eadce72d42d754f851cbbfbb7d9e2b5106229c29c90a07f31a2dea7885f
 MISC metadata.xml 1135 BLAKE2B c889a0d76e5dace50fac8a3b2ec5dc8e04b88baba19ff7db575a3790ea92b90c9a17cad5320f85e5de85ccb6db3c37323589118cd9d4cf10d8f9f674a04f6318 SHA512 86c9cb6eeab7ed39b4192a6e1a9caf7b4d75df2c7e9fe8e16ccec5a1b11e9663c828ef62160240c228847ee6b1ffb7d0c8589a4b4f5aba20ba34cba59ae2c3fa
diff --git a/media-gfx/yafaray/yafaray-3.3.0-r2.ebuild b/media-gfx/yafaray/yafaray-3.3.0-r2.ebuild
index c54d1fbb0c7e..b1f99de4d347 100644
--- a/media-gfx/yafaray/yafaray-3.3.0-r2.ebuild
+++ b/media-gfx/yafaray/yafaray-3.3.0-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
-inherit cmake-utils flag-o-matic python-single-r1
+inherit cmake flag-o-matic python-single-r1
 
 DESCRIPTION="A free open-source montecarlo raytracing engine"
 HOMEPAGE="http://www.yafaray.org"
@@ -41,7 +41,7 @@ pkg_setup() {
 
 src_prepare() {
 	append-flags "-pthread"
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -i -e "s/@YAFARAY_BLENDER_EXPORTER_VERSION@/v${PV}/" "${WORKDIR}/Blender-Exporter-${PV}/__init__.py" || die
 
@@ -72,11 +72,11 @@ src_configure() {
 		-DWITH_Freetype="$(usex truetype)"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	python_domodule "${BUILD_DIR}/src/bindings/yafaray_v3_interface.py"
 	python_domodule "${BUILD_DIR}/src/bindings/_yafaray_v3_interface.so"
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /media-gfx
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)