gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /media-gfx
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
202 files changed, 2876 insertions, 2920 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 6af727c616bd..b510c0fe3e4b 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 538aa384b011..2c5e907849a6 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -3,8 +3,12 @@ AUX asymptote-2.68-info.patch 436 BLAKE2B 2ec0525ed1695f55bb25d6d5fdbdbf8d77eb85
 AUX asymptote-2.68-xdg-utils.patch 791 BLAKE2B 90e37b056462ef70ee34e8d1503ebd194c16f80e62987de776cc40bb0e6efda5a6c8d5e53f85842aa2554f4814423a3ac0bcebf4767996c004cdffa652bc1ecc SHA512 9cb5b2eaf19d3805167bba763333b1ac804d1ef426a59e41a19aa6213a35c5c2088d27fd9f22caf2b36cd6405bb84516e6d1a4de5d6fc5afb57337625e15b010
 AUX asymptote-2.69-info.patch 436 BLAKE2B cf8510e1f0135eb1e16e0e3913572418761a6eec863efff59c29d84a0f5f1b863febdb965120e1661bca743cf5d0d6e752a929cbe197ec7ae8fca162eb47ade1 SHA512 5a7c19d64609ed8c287a598b57331a318fbc47aac8770d0a9e1451b3b4f4f715a4fc30b8dc7238fd3498ca10ab4fcf2bf6373cc2e576c11d5d8eeaeadf9324c5
 AUX asymptote-2.69-xdg-utils.patch 791 BLAKE2B 126fbc6a5b253e536c6daf479d5b422b52e51d874504f2b586df647ecf940f730b6564cab8c5bf5e2fbff1e5eee8b84dd882f312e2492afa0ae6490d401ee7fd SHA512 003dd1867fb4d44d9e9dd414e908adda6f3802d44a614732e28df415c6591aaa4cb053dd7848c857c7b9cc3ae253cf3cc51699242e3d5629395070d29da226da
+AUX asymptote-2.70-info.patch 436 BLAKE2B 70eac7625341e21f9cf03cf1ea08e4864fe102627349f2411680b9c18f4df508f5cd6972f9e6dc719795f0323c51b6a5d096e9e3cae81cc1ee497f3f9325fafd SHA512 5b7494351bef5240bd4dba531a3eb68d3a6025990f32fe4064df31e351df9cfb27be29c69b16309929a63ec8d164eb4f2b14315406e546c7dba9dc416ae6b8d4
+AUX asymptote-2.70-xdg-utils.patch 791 BLAKE2B 971b2f1c6a4db7e39cc2d4bac0e3e6cc951733fb0718ace6e6807f63585fe8f4aa6f8519c6e03ed75f0176dca87e705d1b7175e0c1c7a1e79eb6c15dc4f2df76 SHA512 f78359aa71adfcea4ba31e3cae4c30aca47e39337b647f6fb2ad5264bd318a45071fcc47b1bbe5cc4c59c6b707b7b17461af62add2ee2477027d95d369f29994
 DIST asymptote-2.68.src.tgz 4672007 BLAKE2B 96c1a99815cf04180ea2fe01528615390faf8d1e5853d4e2e5f4fcdf48f0ec7e774ab0facdb86ad427e6ac11f5ce684902997f7d1e4855460ad450f6d6c64cfd SHA512 20aa3ae5116b93f266020a1d45178d7120cf39980634108b86a0bc8a4202e28b2cf0a1ac6fa5e921506db150e9077a1e3d7b8ad04869bc9bd22bae447f45fd46
 DIST asymptote-2.69.src.tgz 4673601 BLAKE2B 9734ffec10c9c0b8053598402a4eb81a3ed8a48f8ce8e58d1720442be26e25fe7778d6d47cd2d29dae61183d15aaa456bca430ab98e951844c8210484226e67f SHA512 a1b746600b4e6880350e57adeb3a3228d10b1b0c1db11ee0e750545cf8023716eec92253c0cd0980747f72c16fd0097f25ee688657168f24a0def106260e0791
+DIST asymptote-2.70.src.tgz 4674495 BLAKE2B 126b2e99222e6ae438aaef89df00b8eae19118c3ef42d2fab0b0117f343911939e680d22e903b784213186a5d2eeeecb112afba1467562e7127c34de4bc66773 SHA512 24d60af361e3f0309a896ce8163da6fc0a9d6587efe726c5acf874dcb74f4d51b4bad8146a615ff54173ef06dac53117fd1cc09c77940271adc9f64cac6bcfe6
 EBUILD asymptote-2.68.ebuild 4806 BLAKE2B d024e46c7c697e624c27f938f96afc1f65403d36995d62050bc3ec8313d2b81aeb2516ae1c5c7442db4345863fca106e7182da4f22d7d601f766366d816f4e2d SHA512 3bb36ddf4578fafba5644e29b98e743ae71c1484e2d7dc7845d8f96fc8315fd9f8e28b7368f5893de217e87cad60960a99cde5e33a39265cc5b17281b6873c5d
 EBUILD asymptote-2.69-r1.ebuild 5394 BLAKE2B a27ece88ae76bfd52f81536a569040f377617419bcc28771121908e1658c0ad1547eefb4370a0846b9b52b0be1e38d4245345a34f6b148d8869732504d4776f7 SHA512 a6d9ac4a6a69aca723938c2fdd6128b3312bc3c612573864ea479bf5f8c38bda65440e9c14c99d7f17bb531f769c8dc9010fc756c11439ba1e4df6ed4fef450d
+EBUILD asymptote-2.70.ebuild 5394 BLAKE2B a27ece88ae76bfd52f81536a569040f377617419bcc28771121908e1658c0ad1547eefb4370a0846b9b52b0be1e38d4245345a34f6b148d8869732504d4776f7 SHA512 a6d9ac4a6a69aca723938c2fdd6128b3312bc3c612573864ea479bf5f8c38bda65440e9c14c99d7f17bb531f769c8dc9010fc756c11439ba1e4df6ed4fef450d
 MISC metadata.xml 1363 BLAKE2B d1ff4a713593a568879201c3d7165a633af6446844bc2128396a8f2cfc4ebc0764aef67b61bd0b0c2bcc9cad5ae442dd35b4c1610239f047f4baf3de225cda3f SHA512 e3c7c10ca9c129e0f988235a2f4ad7c8d306517e7a1966e1f4cb734d1c4d30bb143f9178bc744a85012ccc031fa453177d18452ed7991c8ae18a86bbb88283fc
diff --git a/media-gfx/asymptote/asymptote-2.70.ebuild b/media-gfx/asymptote/asymptote-2.70.ebuild
new file mode 100644
index 000000000000..11723a29a480
--- /dev/null
+++ b/media-gfx/asymptote/asymptote-2.70.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit autotools elisp-common latex-package python-r1
+
+DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
+HOMEPAGE="https://asymptote.sourceforge.io/"
+SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="+boehm-gc context curl 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 )
+	doc? ( boehm-gc )"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.4-r5:0=
+	>=sys-libs/readline-4.3-r5:0=
+	net-libs/libtirpc
+	imagemagick? ( media-gfx/imagemagick[png] )
+	opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm )
+	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} )
+	curl? ( net-misc/curl )
+	X? (
+		${PYTHON_DEPS}
+		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg]
+		dev-python/numpy
+		dev-python/pycson
+		>=gnome-base/librsvg-2.40
+		)
+	latex? (
+		virtual/latex-base
+		>=dev-texlive/texlive-latexextra-2013
+		)
+	context? ( dev-texlive/texlive-context )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	doc? (
+		media-gfx/imagemagick[png]
+		virtual/texi2dvi
+		virtual/latex-base
+		app-text/ghostscript-gpl )
+	test? ( app-text/ghostscript-gpl )"
+
+TEXMF=/usr/share/texmf-site
+
+PATCHES=(
+	# Changing pdf, ps, image viewers to xdg-open
+	"${FILESDIR}/${P}-xdg-utils.patch"
+
+	# Bug #322473
+	"${FILESDIR}/${P}-info.patch"
+)
+
+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 \
+		--disable-gc-full-debug \
+		--with-latex=/usr/share/texmf-site/tex/latex \
+		--with-context=/usr/share/texmf-site/tex/context \
+		$(use_enable boehm-gc gc system) \
+		$(use_enable curl) \
+		$(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
+	einfo "Making info"
+	cd png || die
+	emake ${PN}.info
+	cd .. || die
+	if use doc; then
+		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 asy-latex.pdf asyRefCard.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 -r base/*.asy base/*.js base/*.sh base/*.ps base/shaders base/webgl
+	chmod 755 "${D}"/usr/share/${PN}/shaders/*
+
+	# documentation
+	dodoc README ReleaseNotes ChangeLog
+	cd doc || die
+	doman asy.1
+	doinfo png/${PN}.info
+	if use doc; then
+		dodoc FAQ/asy-faq.ascii
+		dodoc CAD.pdf asy-latex.pdf asyRefCard.pdf asymptote.pdf
+	fi
+	cd .. || die
+
+	# asymptote.py
+	if use python; then
+		python_moduleinto ${PN}
+		python_foreach_impl python_domodule aspy.py
+		python_foreach_impl python_domodule base/${PN}.py
+	fi
+
+	# X GUI
+	if use X; then
+		cd GUI || die
+		python_setup
+		sed -e 1d -i xasy.py
+		echo "#!/usr/bin/env ${EPYTHON}" > xasy1
+		cat xasy1 xasy.py > xasy
+		rm xasy1 xasy.py
+		mv xasy xasy.py
+		cd .. || die
+		python_domodule GUI
+		chmod 755 "${D}/$(python_get_sitedir)/${PN}/GUI/xasy.py"
+		dosym "$(python_get_sitedir)/${PN}/GUI/xasy.py" /usr/bin/xasy
+		doman doc/xasy.1x
+	fi
+
+	# examples
+	if use examples; then
+		docinto examples
+		dodoc \
+			examples/*.asy \
+			examples/*.views \
+			examples/*.dat \
+			examples/*.bib \
+			examples/*.png \
+			examples/*.pdb1 \
+			doc/*.asy \
+			doc/*.csv \
+			doc/*.dat \
+			doc/pixel.pdf \
+			doc/extra/*.asy
+		docinto examples/animations
+		dodoc examples/animations/*.asy
+	fi
+
+	# LaTeX style
+	if use latex; then
+		cd doc || die
+		insinto "${TEXMF}"/tex/latex/${PN}
+		doins *.sty latexmkrc
+		if use examples; then
+			docinto examples
+			dodoc latexusage.tex externalprc.tex
+			docinto examples/animations
+			dodoc ../examples/animations/*.tex
+		fi
+		cd .. || die
+	fi
+
+	# ConTeXt
+	if use context; then
+		insinto /usr/share/texmf-site/tex/context
+		doins doc/colo-asy.tex
+	fi
+
+	# emacs mode
+	if use emacs; then
+		elisp-install ${PN} base/*.el base/*.elc asy-keywords.el
+		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 base/asy_filetype.vim
+	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/files/asymptote-2.70-info.patch b/media-gfx/asymptote/files/asymptote-2.70-info.patch
new file mode 100644
index 000000000000..369765df084e
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.70-info.patch
@@ -0,0 +1,13 @@
+Index: asymptote-2.70/doc/asymptote.texi
+===================================================================
+--- asymptote-2.70.orig/doc/asymptote.texi
++++ asymptote-2.70/doc/asymptote.texi
+@@ -23,7 +23,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.70-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.70-xdg-utils.patch
new file mode 100644
index 000000000000..bf7b50973e36
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.70-xdg-utils.patch
@@ -0,0 +1,23 @@
+Только в asymptote-2.67.orig: .pc
+Index: asymptote-2.70/settings.cc
+===================================================================
+--- asymptote-2.70.orig/settings.cc
++++ asymptote-2.70/settings.cc
+@@ -101,13 +101,13 @@ string defaultPSViewer="open";
+ string defaultPDFViewer="open";
+ string defaultHTMLViewer="open";
+ #else
+-string defaultPSViewer="gv";
+-string defaultPDFViewer="acroread";
+-string defaultHTMLViewer="google-chrome";
++string defaultPSViewer="xdg-open";
++string defaultPDFViewer="xdg-open";
++string defaultHTMLViewer="xdg-open";
+ #endif
+ string defaultGhostscript="gs";
+ string defaultGhostscriptLibrary="";
+-string defaultDisplay="display";
++string defaultDisplay="xdg-open";
+ string defaultAnimate="animate";
+ void queryRegistry() {}
+ const string dirsep="/";
diff --git a/media-gfx/cairosvg/Manifest b/media-gfx/cairosvg/Manifest
index 5fad24d3f6fa..bd17cf46d9d1 100644
--- a/media-gfx/cairosvg/Manifest
+++ b/media-gfx/cairosvg/Manifest
@@ -1,6 +1,4 @@
 AUX cairosvg-2.5.1-no-ref.patch 923 BLAKE2B 4a14bdd5f19f9abbb9415c19cb15aecc6dee8bf34feef0cb551f4185c16e4a93ac29d6e46f81dab03f479b2e982c9d0a85a622c1292cfe6d52c6acc1c896aa7f SHA512 f1a45ba47fc3f1f4b91799d6d45b2388a2ac6b0be08695f2507b4bf34818b6a7e8c23cbfbb270c3d603d81acbe3c9bc0a867e5864b684f67540b449d684e6f0e
-DIST CairoSVG-2.5.1.tar.gz 8397716 BLAKE2B f5d307f3019df3b8e19a86c4f185bb6c95ff5f450705a06506f03447f7a4e97091fed4dbbdad7220da0b04c6bed3eb252f3f3e8d91bff55ab6432d0df7f62d70 SHA512 5f6732758ed8024b58173bc920a44fcafa65a2daf301ee07e088d542f1e82d0093bd853e58da2484c392d1b625fd27c0634d07ad58cf00e674741aa413013605
 DIST CairoSVG-2.5.2.tar.gz 8397659 BLAKE2B f2f45aa01015f5ccebe3dede303b6a701c0183b7b53f0d69c8756d5f0e6c0898826939f0b5bcc9e00e4185c83ff507d6fa886a020ad0b63c80a565a181807f58 SHA512 070fbb549614401a7d8290497b0eb7702330ee264c5f625cd1e7aac4aea7d71ee7d2d8899297212e1a3c11c93903b191c0c699336d9000796318b11f4e075576
-EBUILD cairosvg-2.5.1.ebuild 1086 BLAKE2B 343f56a5999d6567deecc1a462aa13330ed2d7d9aa089cfc29e825eb5ec806a27b4b681d0fafed62c3b7dd86374fd95fa47aa49c32ff4d656cee0d2660c3e783 SHA512 25df198004cc80c2ecd41fc2a904b8b9c492308833832a97bb345483381aca6e3ebfff4e0bcae78a5a3667d791abac4db640d81951e08a9c9f750e0665342d27
-EBUILD cairosvg-2.5.2.ebuild 1098 BLAKE2B cc0b4fea4184021846498ecb52545ffe675a605440b3d977cb6afd379d576c899c5a058a9da04424cab7760e7f0872d7e667b90388a657c824d784180ac9f913 SHA512 2602ae41f31468840005417188cf5d3a50beb12309ca94230f00ed27646db53e3f5fe078b2ce0796c02123665feb3c7beb9d6f14923536007c057f80e927eb1d
+EBUILD cairosvg-2.5.2.ebuild 1096 BLAKE2B a993a4f1a60334cb070c5576539858b63f2a18a872672178a6f0557de7b9caa0b10d1a7b1cb64bf409625b722cf6bbda0332635fa57840cab467b58f8b28722e SHA512 7682b39fd248423dae300933887731575da4293712aa39cee5ce5d5c99c304dd55434196e44c3d531d03d925162c370ebb4d1e0fa71fa09c45ebee5f24e62781
 MISC metadata.xml 328 BLAKE2B 168e60e4dbd12e2b99ba4ad8a6f8f42ef5a4de12f8f1edc68ba4d1d4252b24995da5d0e4ef9e1db09b3934ba42b042685db625439425a6e98cde2f52050c4af1 SHA512 ebb7d9d27e014fd083d0abe9508040730f980ba8a0bc89670ee5418af2c3af036d0ec16b5607a8805944d3b7eeb835e8806ab059fed68c52268df1cd10d7bbb0
diff --git a/media-gfx/cairosvg/cairosvg-2.5.1.ebuild b/media-gfx/cairosvg/cairosvg-2.5.1.ebuild
deleted file mode 100644
index 9c2727b8be54..000000000000
--- a/media-gfx/cairosvg/cairosvg-2.5.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-MY_PN="CairoSVG"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="CLI and library to export SVG to PDF, PostScript, and PNG"
-HOMEPAGE="https://cairosvg.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/cairocffi[${PYTHON_USEDEP}]
-	dev-python/cssselect2[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/tinycss2[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# junk deps
-	sed -e '/pytest-runner/d' \
-		-e '/--flake8/d' \
-		-e '/--isort/d' \
-		-i setup.cfg || die
-
-	# this test compares output against old version; this makes little
-	# sense for us and requires both distfiles around
-	rm test_non_regression/test_non_regression.py || die
-	eapply "${FILESDIR}"/${P}-no-ref.patch
-
-	distutils-r1_src_prepare
-}
diff --git a/media-gfx/cairosvg/cairosvg-2.5.2.ebuild b/media-gfx/cairosvg/cairosvg-2.5.2.ebuild
index 0ca94523db8b..ee2e49f8cf67 100644
--- a/media-gfx/cairosvg/cairosvg-2.5.2.ebuild
+++ b/media-gfx/cairosvg/cairosvg-2.5.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/cairocffi[${PYTHON_USEDEP}]
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 973f14825f4d..d9ccb4c88778 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -11,6 +11,6 @@ DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f450
 DIST darktable-usermanual-3.4.0.pdf 16241791 BLAKE2B d6fc232c3eddb5474e36ce1fbc02c3472291e5ebdf2eae09c419215263f615546a79f88ee9d252b387fc5e4f2c9714398deab8de176b3d928b6a17c2878cef56 SHA512 fd154c02d5e0c63d9698b2f80a7439a191f4582b717b2f163923eda40aae1ebe8aeaf1a70efdc423eb8c8269d74fc0e23df8c9c0269ee8f5a357611501c3547e
 EBUILD darktable-2.6.2.ebuild 3475 BLAKE2B 447c7330f1721443008a4794458d2365c5459a17e9257e4b2ae9a218824b78481ac66f37b230689035021d345908815135d71bfffad40e5c7d28bc7687cfcaa6 SHA512 23cf95b35f5445d7b21f13f11304e1eed211adb738d6d4389123b82596a77bcd8c8412b89c793d93fe1f6ab5dfde104618903ec35ab1e59a784eb7e43328362b
 EBUILD darktable-3.4.0-r1.ebuild 4588 BLAKE2B adc2823c2cf2849c3c93e833817afd023da1ab0060f526651d9e5c5eff955ad3286fd828592fcb2bbf7356dce18ea27b1e0ff34f18027b90fb6aba3f00b0147b SHA512 960511d2f1df6bcd4affb5b02b89378c78277f645b1bfefb36278b22caa6b80b9e1d5f12fb2f2e4eff19756a9dc6d73f2401abc4d71ec6bd42fe485a5edf979b
-EBUILD darktable-3.4.1.ebuild 4480 BLAKE2B f90cf79f6fb5a37556eaeee5d1774d5235e784cde6919463c2f6486f77534cebd55d6901f74fff9f2af3377141d47cb8c7492b039e995caff015006335a11f6e SHA512 d12e9abf350d2bcf70204aac54f79046e24f67c80b9590e90ef01d360e51a29a5658d08730e3fde656aedbcca9bdeb43a987cb8507252ec45d677086518ca97c
+EBUILD darktable-3.4.1.ebuild 4479 BLAKE2B adc0caa5bcfc85e34505145b3db046a29b3e1a6826f1a4fbf37a21058753de0102d271f555abc5244a449dc00ff6fd8f138ee6b17e7ec7f4d64f2972c4bc38ec SHA512 c7f8858dba88183aa732cce17dc9b6cdb93d47787ab9dcdf89d49ff39da51cdbed8231664a9e7c6b1b59088d29db8ce7967ea33f402f9270eafc6c5c1b251a99
 EBUILD darktable-9999.ebuild 4480 BLAKE2B 6d3d2e59331dfe3d44afeccf8616f0f14bf63a8b7a9f8c203416fe6fa907047b059cb09081e26ac216bcd98957c4a9651579df48a4dc1dc79e073a884b421095 SHA512 3f2e5818e2af72ba8ee3c7e82ab947f7a6a36c666b7cbd994be8890e102cbe08247af01640d7f437a67b1a58b955fddf48084375651ad2c48743cd58088eae39
 MISC metadata.xml 1151 BLAKE2B 45fdf41338969512b2790e0dc3fb75b1633244c398c8f2eb67b9264ceba3b41c64d19713bc6727870465d03ebc37714c464a537c5ef4c7b1b7f52711a8e8c268 SHA512 784be9b2454a021f7547894cafb4e2e0fdbda8e30dbfbf78a0d234f596ab8321a5e5a0b8944af8f55d0ce7b466139837d4f0f5139152e2fc691ae528c0e3eef8
diff --git a/media-gfx/darktable/darktable-3.4.1.ebuild b/media-gfx/darktable/darktable-3.4.1.ebuild
index f5fe46fb2c52..eeb346c65cfc 100644
--- a/media-gfx/darktable/darktable-3.4.1.ebuild
+++ b/media-gfx/darktable/darktable-3.4.1.ebuild
@@ -25,7 +25,7 @@ else
 	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 )"
 
-	KEYWORDS="~amd64 ~arm64 -x86"
+	KEYWORDS="amd64 ~arm64 -x86"
 	LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
 fi
 
diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest
index 529ec02fabc6..3809cffbb544 100644
--- a/media-gfx/dcraw/Manifest
+++ b/media-gfx/dcraw/Manifest
@@ -4,5 +4,5 @@ AUX dcwrap 437 BLAKE2B ec88784e059ab07990acf3a47517f243502a140b451040c77f9320bd7
 DIST dcraw-9.28.0.tar.gz 194193 BLAKE2B d39a2d76dbbe74a2aed21c6b132ac25c9dd17312813e7f640a4a6d4abd4e8f1868ad596296ca9bfe61427b8b4764821e32679128747ff5a9452988814b77c638 SHA512 04609c4ddd5d1c9fa0ee1617d2ef25efdc22451e1fa6cf669d93abb1fa630a18198b30a289400f1814c8dca285547da8b081a1b00b085c00bb9318ad25c48a30
 DIST parse-1.73.tar.bz2 8186 BLAKE2B 4d7d69bbaad3fd69caeae24e4dfc77fa580d969f903c925f76cf0a7bdb13ff34c96ab6dc9917609ce886365f6971290b3af63aec9fed43b1876aa44dd951521d SHA512 06ffaf72695dc86bfc2bdd10d4f732bc428b72d427f4c10e93fc58536513477cf297adb56fb9cfc5ba5fd5b6b4cd197c33d8dac957a0a1bbe65b23393b64278c
 DIST rawphoto-1.32.tar.bz2 3841 BLAKE2B db7a80af4b06fc3709a9ae69d9f166c3323097821bb561af4e0ac9a1ef677cab6cfd5cd7896d1e1fce85e6fab545ced7d00ce809f97332bec594b94a27f77e23 SHA512 6ee5b6c4e4266c8e04221c894c4e737f8a6d2c6f0cc9c82db73064afd68488bd60de19b86b2d7b82780283bbb9f8156ef3149c1c730f09a00dce632744b44d56
-EBUILD dcraw-9.28.0-r2.ebuild 2935 BLAKE2B 7791bcdf07ec06cb8af067f6b1816b7a9c846ea8e3eba0b657045711157556cdddc0befa17122e8319ade92b36a63addfe9f3be10b28ec1c6a34917682ab9ddc SHA512 ee72b2bf1bb645b5cb226f13ebc7027d793b6f8bd1ef79457189f60e15227db1a9eda240ad4bf8c487051afcd0934a714d2f691f3cbc79f4670b633f6676626b
+EBUILD dcraw-9.28.0-r2.ebuild 2962 BLAKE2B 90a57136615f9b9b6345174a51f0beed8105afca5e1ce4bbcc321fb6e4b7ff87432e59401f3b75f49ce7e6614aec77530ea77bbe24a8477ffa570502c9b8651e SHA512 c7b51592fb736d9e3e76ee0a420ea99db898fca7c1c1efc06bd67bfa7709c0c60df9c84bfa85f47ae15d39ee2bd50b9efe8dbe21d87cf1fad18337edb595678f
 MISC metadata.xml 609 BLAKE2B a48ebce771f67412c53ed8d2ef83b44c1276600c5634c6f2ce51d677675d6c3f134d0ec7578fd777cd12dd7edd267a70529aa3ffc6875ffccc1ef97d93b72e52 SHA512 16d0cb26ad197852a44c84dbc87964ef441d850ea9fab643395edb027a2abf1a18aaa087890552f0be624678db239a9efbe384d4e3e9605a6fa2dfbf2543bf8d
diff --git a/media-gfx/dcraw/dcraw-9.28.0-r2.ebuild b/media-gfx/dcraw/dcraw-9.28.0-r2.ebuild
index 49a9c411cf33..607282673bfd 100644
--- a/media-gfx/dcraw/dcraw-9.28.0-r2.ebuild
+++ b/media-gfx/dcraw/dcraw-9.28.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -74,8 +74,8 @@ src_compile() {
 	# rawphoto gimp plugin
 	if use gimp; then
 		run_build $(tc-getCC) ${CFLAGS} ${LDFLAGS} \
-			$(pkg-config --cflags gimpui-2.0) rawphoto.c -o rawphoto \
-			$(pkg-config --libs gimpui-2.0)
+			$($(tc-getPKG_CONFIG) --cflags gimpui-2.0) rawphoto.c -o rawphoto \
+			$($(tc-getPKG_CONFIG) --libs gimpui-2.0)
 	fi
 
 	if use nls; then
@@ -92,7 +92,7 @@ src_install() {
 
 	# rawphoto gimp plugin
 	if use gimp; then
-		insinto "$(pkg-config --variable=gimplibdir gimp-2.0)/plug-ins"
+		insinto "$($(tc-getPKG_CONFIG) --variable=gimplibdir gimp-2.0)/plug-ins"
 		insopts -m0755
 		doins rawphoto
 	fi
diff --git a/media-gfx/ebdftopcf/Manifest b/media-gfx/ebdftopcf/Manifest
index e0887833a70b..ca64094dee21 100644
--- a/media-gfx/ebdftopcf/Manifest
+++ b/media-gfx/ebdftopcf/Manifest
@@ -1,3 +1,3 @@
 DIST ebdftopcf-2.tar.bz2 7774 BLAKE2B 4dc1bde62b796f441332511e1b9206f9eadd216ab66dc1a6858dc467f9dfbbaaeb4a7de494eaae4584d8a57d59a0eb96f69047d1a57bd007cbb8e2f7aaccd1c6 SHA512 4631f1591290e0ddc778d5c557aff1e698d8dd7e5ac7e659fda7752642034fbabb091c840dcfad5695e9fc19909203a7fdc0b7a69d57a162ce6bb8fe710ef0f4
-EBUILD ebdftopcf-2.ebuild 622 BLAKE2B 26986e7559441c79cdc4d8eb77c86351bdaf79eba6c980df5c00d114635b36d8285f93ed579babe7a20fa07004e528ddb2f646d1e29b8b5d1ed3c9682e7ead70 SHA512 0d90d8125f78fbb2338add33eba44c8e5e1de2df2cfbfdd51872b0c890ae44449a6c551f1b6523f0270ad916648b6911483235776caf81856398bf0d85a211d4
+EBUILD ebdftopcf-2.ebuild 623 BLAKE2B 0aea2a7592a851b68d6d4503a4dfc92343101ae1a80ea1e39fc7363a4c043ef7741a67d0ce27ab1cb10bd7b183320e48b7d472116c41fd74c7e3c97365efb327 SHA512 849c5cd295edd0ac5f3493ebf1a4904e735ab52c3c51bb4481ed7f942d0e0efc4293553eacc96b1194e1f6eacf2fa6762561ef9b55ca9d5d1cc3371c9c17b2f2
 MISC metadata.xml 310 BLAKE2B d6b0416573d232c5715df5dcb05139b22609ce8ffb46530c2fd7a0cecc87b37ce2ce286310a80244b1911d5750eb29b55eef6b8c01f6d62c8d007ad2a9b5aae2 SHA512 1923349dde66e8078b37566097a21ead2555a73fdfd97b89beb44a714958dc80f4387ceb642d238419ce0ec388c335ba5db1db5f23b380131f0fbbd51ecd8f22
diff --git a/media-gfx/ebdftopcf/ebdftopcf-2.ebuild b/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
index 9d7d4f6cc57d..6db2d76e9187 100644
--- a/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
+++ b/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 # these apps are used at runtime by ebdftopcf
diff --git a/media-gfx/engauge/Manifest b/media-gfx/engauge/Manifest
index 55d3a93f21a7..ac390d61c6af 100644
--- a/media-gfx/engauge/Manifest
+++ b/media-gfx/engauge/Manifest
@@ -1,4 +1,4 @@
 AUX engauge-10.6-qt-5.11.patch 662 BLAKE2B 7f287da70c06f71bd115541f636e4b5803149c9a6a8855dad388be234ba6f2981f63dc6ad97f89a890d796f4138f4d1318be1d7994b31a23232071a5999a5527 SHA512 9056af93efa32bb8619820ae990abc4ab172b2ceecc262b1f41c2e33a4b08417a4793a201a7cb7c79c648688c6366b10cb1849e1f03f4c3b5407dc2544cd12ce
 DIST engauge-digitizer-10.6.tar.gz 68463313 BLAKE2B 2f939b383d2b2ca7d3ac73196ae6c9f4cd3380f7cb1bc7703d23ffe2554bfd6dfb6f206d3b9c33953757791855c908c7899f078c1c1472549859258d406e5796 SHA512 f571978298f0646f338ee786aae692800bd73242f68a4f35509023d3ea0daaa16ede6a1d45cbc28a31efc277697315c63fe3d2cce1f0cf80334bdeea11599a67
-EBUILD engauge-10.6.ebuild 2115 BLAKE2B 5d48548a59aa3b9fa06ed4d02b31c719ef8d41af8632cfa5c081846b41f3a91fe9f7044118fbcbd20b5e6e23c1bc6af2757282f47effd89d3123b767894ca63a SHA512 b5754a3d46e86bb4dd4aee9dbffb08b166fae2af089d1630d0d34d9a2fd0a10c8ee2be6a4580fde792d05bf3efe2df0f81334da4c46b7fb70696bcc1a1055a5f
+EBUILD engauge-10.6.ebuild 2119 BLAKE2B ef8ab2506d9ebd3dbfae1cdf90a934243b2702029d4302a638fbf07075e5fefff15fdfe4b58fb730dc5cb9f2bc8311114dd8daf0191a6be825b2b6459790f639 SHA512 8237e4d4d0f6a209d4ebf62e813c95b1104ed29be5ee6eec822c7c75de77b7b3c65679d6eaa97b43fddae53e08463c256cc69efacf8d7a60362eb52ac9bad11d
 MISC metadata.xml 343 BLAKE2B cf936a8340fd4266de9732db4288c7ef99b9f54d004da63e13e22dfe07b9a55124844760a46f7b4609c14cbd443e1575be2e2d705220197bda8b4eeb838c52b7 SHA512 ec67be582e6b1a4fb6d9aa401f265c25823f0c9be3671052f602dfbeafa1c2bb307139e47ead3736ddc58b453143246e6830da99d04fc2412802f649f83cfb1e
diff --git a/media-gfx/engauge/engauge-10.6.ebuild b/media-gfx/engauge/engauge-10.6.ebuild
index 57437e9947cc..a7edfc0f4def 100644
--- a/media-gfx/engauge/engauge-10.6.ebuild
+++ b/media-gfx/engauge/engauge-10.6.ebuild
@@ -7,7 +7,7 @@ inherit desktop qmake-utils xdg
 
 DESCRIPTION="Convert an image file showing a graph or map into numbers"
 HOMEPAGE="https://markummitchell.github.io/engauge-digitizer/"
-SRC_URI="https://github.com/markummitchell/engauge-digitizer/archive/v$PV.tar.gz -> engauge-digitizer-$PV.tar.gz"
+SRC_URI="https://github.com/markummitchell/engauge-digitizer/archive/v${PV}.tar.gz -> engauge-digitizer-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-gfx/entangle/Manifest b/media-gfx/entangle/Manifest
index 4f90d6075e6a..1ccbc4af3a5e 100644
--- a/media-gfx/entangle/Manifest
+++ b/media-gfx/entangle/Manifest
@@ -1,3 +1,3 @@
 DIST entangle-3.0.tar.xz 518808 BLAKE2B fe2bf4b114bc04fdc56792f984ae7387b70d693fa82f8deaa2023de71a8bba72bc95d4bfc430cdfaf5244e9114b4f7e8bb2e17f3b86de6529037519fa3877899 SHA512 8c6d7e067f88a770c63b76fde2a6ae71894aae95477fcf66b4670697889fdf7939d3f95532626d6f4ca7ae75841d8f247f6bcf78a1ce195b540989f1bfe5ebdd
-EBUILD entangle-3.0.ebuild 1634 BLAKE2B 60f5e5a3a184fe60398978dac80e47752ffde0881531dbcd03389ef8b63ed32ce7419fe4435004615a4db8225e2212bad187f927a593f7cac9de3322e0dd5463 SHA512 5c704042ae2685372a05c193585d452e6eb0b2becec559798ddc0b3666cc946ab2d02bfaf7c45e0fa3af9ce4baf9e5bff498062f68674cc975e0c12b620c2e33
+EBUILD entangle-3.0.ebuild 1634 BLAKE2B 5f22a861ef53689b4165f032617f25b5b22568a4abdd1225bbb2c141e5ce4bdabafeb1bbfe18a5c7a737833c4ff2f76afbb7c8dbe91215c2474a3b6a45839ea5 SHA512 c26f758dc92410e43c72b8c8c316c11391c95c83c180f237a957e70b3ca2ecd0b74dcf944c7e467dd8359fa7adaee7f378d3a5f18299d6c4b1c6e09685467e7f
 MISC metadata.xml 446 BLAKE2B 1c466f17b5df47045169784918723e953945eaad2eb5879cde6f099feec4cb419e867f77879927933fe3daec259184a361f464b968b19bdf3463b01b7371589d SHA512 555966a8638a027288abdc7ba6d625c15c18792c3401d399a12dc256ec75f14882fce3e70596a3f3e2ed6729e471af04b14d520b8e2e70206a172f98b9967dae
diff --git a/media-gfx/entangle/entangle-3.0.ebuild b/media-gfx/entangle/entangle-3.0.ebuild
index f6883eee6365..a86a9e92e53b 100644
--- a/media-gfx/entangle/entangle-3.0.ebuild
+++ b/media-gfx/entangle/entangle-3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{7..9} )
 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 360123d9442d..9a2c4d057792 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,5 +1,5 @@
-DIST eog-plugins-3.26.5.tar.xz 478188 BLAKE2B 655eb9860435775862ba44bd26530edff778a3c8c574e9bf592800b4d57b4e5b0e52d36b7d71d6a6d615d47c320542105dcee9de89250901fcbfa6c255dcfddc SHA512 3b7979d241c2c0b522ffb6c30a6b8c90fed9e899cda8a73fb9d9a9392f474516f8c24fc75f3f35f920c8a6cf04b8bda611a8669839588936c48467813a6227a7
 DIST eog-plugins-3.26.6.tar.xz 482004 BLAKE2B a70a7d1b69b7d5e6e4d44e79a4305c08ab95c06596512bf458628a65b1a8b5f7fc6c3caf39385ce722de7fdabcf0cc5e620f9dfbc53dfc377fe29252fb21a23c SHA512 67b3cfcc071ef5a196f87041039f65c9ef8e7ba2ef1cdc8dd9ea4d67f64c8b1ee0990446c5cec4fe229aabb35d106a4c0804ba6e8cbd2edfe5a91ddc3765527a
-EBUILD eog-plugins-3.26.5.ebuild 1686 BLAKE2B a9fa071d24c2cf70ca1f1ab1ea6a375aa3579fa600443484c557b58a1d7a29ad81d4867833e479af6a8a5893690db04780329993ceaa35db4444918e7f937cf2 SHA512 a519eda4f08e1ec4e3d11bd051edfff427225f8e33805106d4387612c5a94a8f884be6a7f6087dd7f676c9eb25c2457a4320c7156295b37e630222c54d4f060b
-EBUILD eog-plugins-3.26.6.ebuild 1612 BLAKE2B a8bab614f4923e33eae731575cdce3040a5e90b78f1ac7483a89ad735c7b73a74e5a7bbe25888eb2455d04abcec22ec2d83bff902ddfdb538977aea9c3f4443b SHA512 8d4ae707feafdc35ddaf122ab88a12ab5a5165c28167ed063482f4b31dd9e1c6babd694a42fe70dd1511d4281ae98d90789ee7c2271c044cb7eda6d70d56a0ed
+DIST eog-plugins-3.26.7.tar.xz 482336 BLAKE2B 9cd1d7e16f8e7f1fe06c3bc2ea79ab06c397beaf9d9bfb26568ad5fb90a144ceab11f6250c7dd51ebb5d3962fff47a4c855b85725b95abca07cdc4de739a2b7e SHA512 c9312eccc5529b01cb285a165c833243ea60bb12f8be6f40ccc6da0db1bd951916000a48aa31705b048659e8d637aa7e56d761fe0f9be720a4e0ce81289d2b83
+EBUILD eog-plugins-3.26.6.ebuild 1611 BLAKE2B f8f089076446c44fe38708f31438f2cbe8e7eb12038655aba5b987d1c3452589c635f2635df01f46fd16f7edf8cba88f118df94c2d500c05bc86d78531aa7de5 SHA512 506b53a23216432f0de1dd1065477dc93f71d513d9a5a08850d1158eb9a6b6ebdc2978ffd3526c8ba2ec8abc1c3e642cc2719a1fb22f07b68e8dc58e10918247
+EBUILD eog-plugins-3.26.7.ebuild 1732 BLAKE2B 5648b640cb74b390d0267eed43f27caaa45856a270ddc2ff9cde42214d17e7cfc3a800c68a24be97baf5429ca1f6a7bf30b4f3891e6694137aa182014cd1f437 SHA512 d8d3db885432bd48a67c57c8fde71b69326f162231965098fdc8a5e9b0d3e7bb8892ca2182f7fbc12c4e6d984f9eec53a323493531a2d0840e634be4e834ed0d
 MISC metadata.xml 428 BLAKE2B b10706bb7638538d5ce63c9787e7a1730e01c8383f2d2a093e38184b031933d2b3749241aa2f3254be4c84fac104bb8ec72940cdf8cd5a9f7bc0944541b015c6 SHA512 9684f07846ce7e49ad82843c2b8b7ac5c9d7124bddb07778292d6810162e89a3d41e7ca426f331e4bae6ecfbe53f71409b35418affba6382e874c78b64ed102f
diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.6.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.6.ebuild
index 53de08824e3a..bc43c210a772 100644
--- a/media-gfx/eog-plugins/eog-plugins-3.26.6.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-3.26.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="+exif map picasa +python"
 REQUIRED_USE="
diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.5.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.7.ebuild
index 50facce03914..f667eae22ba1 100644
--- a/media-gfx/eog-plugins/eog-plugins-3.26.5.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-3.26.7.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{7,8} )
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit gnome2 python-single-r1
 
@@ -12,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="+exif map picasa +python"
 REQUIRED_USE="
@@ -43,9 +42,8 @@ RDEPEND="
 		x11-libs/gtk+:3[introspection]
 		x11-libs/pango[introspection] )
 "
-# libxml2 required for glib-compile-resources
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=sys-devel/gettext-0.19.7
 	virtual/pkgconfig
 "
@@ -64,3 +62,9 @@ src_configure() {
 		$(use_enable python) \
 		--with-plugins=${plugins}
 }
+
+src_install() {
+	default
+	mv "${ED}"/usr/share/{appdata,metainfo}
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 5bee1378c560..c20d83b99c72 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,9 +1,5 @@
-DIST eog-3.36.3.tar.xz 3651556 BLAKE2B 6224b21342b24bed8cfed5702c440547423a7c0db36278c082f336f274ebabea401700c418eafced814fb33043362963055acbcacc81edff8b0f202898c09542 SHA512 90205561dbc49aa42e60f636ce23d04dcd05513d28176ffa4c1dd6602889c4b2c920bd299086d3d7bfee72fcc6a029e2d34e14eb80ba5f91573161fbd1b85aea
-DIST eog-3.36.4.tar.xz 3651632 BLAKE2B f971ab236422a875ea8d91a661c6c653ba2ef4834b282dcce7d5c53e9c23bedf49610c0a8ff1bedb2af1821610ab29de8476a2b13b6cb1b82e58c3309b56b7dd SHA512 d1f4aa2e225a8147507cbed74a74bd435887884a2431f3ea0d1c569217a291f93c1440bede1c6abf03660ad8df46530e8b2195399ac8faaac36b1e31e8e93daf
-DIST eog-3.38.1.tar.xz 3655616 BLAKE2B 1e0265dc798413e9b2588c36879a526069bc3d8788339e97470d8d0b738e01cd2fc00bc3db118721fd45a40e5829e225d9451d4cf868e0c9a7bfd74cdc90c06d SHA512 26317413271001b4edcd30438e81a2bb1d2e10edd639c054ffdc08743a5274b27afb51186a660e29022be5e9ecf10043b94e7d409194589d2bba6906ede2cff9
 DIST eog-3.38.2.tar.xz 3614956 BLAKE2B ab442006b2eca1550d072c57af989e748f130b07088e724ccf8e2d6e6b2cf132e06ff2ff89d9333f6fa3cd701c27cdb616dabf125f14dc5a4d1b92d14a85be56 SHA512 f9af91a76b85b8e1250f3ecf04cfc30ae35892282fe65c810358d27cc7e0aac3cafe50dcf815c54c6056c24eb1107d6f5ecf8131f78559095cda5024d255ebe6
-EBUILD eog-3.36.3.ebuild 1556 BLAKE2B 6ba5e5184a6916dcc56b4879ca3abf4e5eff4711fcdc97c3a56a415f3564d1b02ec74dbf270b0586e9496ba421b9bae052591a40aeebb789e22867b1d6443dba SHA512 c59d6e36cec5e04be93567fe493f62885effd1a828240aed0e4d5afe04d31a1615d237294814eef7c774ac009cccf0cadea8c86881908df08a1a312a774f9e06
-EBUILD eog-3.36.4.ebuild 1558 BLAKE2B fc7954cbc8763a3d4037bfc445576b8a1e0b7f5db72e59e5d5f35879a59c12a0ce96d1ae68fd2af8eeb4218082c0af2bd9f9d47f8ea68a8080ee1b317de636f9 SHA512 f2527c036b67ff6cd1d9047014117f65b6497ecf4fe09398301d32ae97b9ff8ae21665138e4565cec2d747e83815f9312ca08a50546dcf7ca3144f9321c37dfd
-EBUILD eog-3.38.1.ebuild 1592 BLAKE2B 948a363a67e2e8996650fe2838cd5aa1d786159a9a7ab7cc6bcd087c98bec57926a99bd65b72fe52c88c1ad55a42e8e670ac823fc3f014aa17331dde8ab4f438 SHA512 e7e942076a528403b3b3419bd1f0855276cf5509bf30a5ad63d4f176a44bb58e15ab749f47ddbd865e9e80c4dd2b78c9e1e0f6e1e41316a3fb8cff7000081556
-EBUILD eog-3.38.2.ebuild 1593 BLAKE2B e40e84edd2b76c87e8fa42b84fa255d470c13fed651263c0237a8c645df7affd497b72394f79c143ceb1067c7aa871855a3331e1a2f1800904e2092356938907 SHA512 ff4b3988b9d508c1df713d2f720b36084c23dc50f57f20ddba970f543ac3ae45831553e46a2586c073d6af1cd4fde0816c40efffd67904f6546a5bc75e2c1d64
+DIST eog-40.0.tar.xz 3601476 BLAKE2B 149b173cb46c46c445b72cc118456e5fb957e48179176daafd3f1726a75353b30fb8750af2fd259235378127c48c2d44e769744c84b7ab9c3d57c679c7ef5828 SHA512 8f395caf4a5eb9ba9f5da6d7dd60c4383b029fc10041abc559afe7c45953f4ef8ddddc64604807df59d61178fa8a16e5a62526e91bfc19c8c57fbf654612d7d9
+EBUILD eog-3.38.2.ebuild 1591 BLAKE2B b021bdc30c23209e66970052e2a05b295013fd53765e966436cad01af8d33084306accddecca864ed3ea07fb97dd675b74b6e76d15a761f0a1f9fd8eca82d311 SHA512 38158a2a01bae2503b81aa8ed540c7b0f45a138915d1fdf5eb5cf3d4e661769cf2d92d89f743256922436dd2ff1a69a21902dafbcb6de89627d6bfe3d0b6d598
+EBUILD eog-40.0.ebuild 1593 BLAKE2B e40e84edd2b76c87e8fa42b84fa255d470c13fed651263c0237a8c645df7affd497b72394f79c143ceb1067c7aa871855a3331e1a2f1800904e2092356938907 SHA512 ff4b3988b9d508c1df713d2f720b36084c23dc50f57f20ddba970f543ac3ae45831553e46a2586c073d6af1cd4fde0816c40efffd67904f6546a5bc75e2c1d64
 MISC metadata.xml 481 BLAKE2B 2c12b594b9a5b1e4ce3983131d1911f62026c5186d8f5c5af13842cfedfa4d20abdc5ee82e11db3a2e1b45e2b8d4d95fa1a62e668936956e8453b166daff00b4 SHA512 141ec1d6923697f744de806804279b602120ce3d5494257de36b8c8b71185d101692f2e438d7ba0e4a4c946d0aaba068117f16c8344abe891e0ddd4f768ded26
diff --git a/media-gfx/eog/eog-3.36.3.ebuild b/media-gfx/eog/eog-3.36.3.ebuild
deleted file mode 100644
index 3ece93d2d976..000000000000
--- a/media-gfx/eog/eog-3.36.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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.44.0:2 )
-
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	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/eog/eog-3.36.4.ebuild b/media-gfx/eog/eog-3.36.4.ebuild
deleted file mode 100644
index 75800455eb94..000000000000
--- a/media-gfx/eog/eog-3.36.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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.44.0:2 )
-
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	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/eog/eog-3.38.2.ebuild b/media-gfx/eog/eog-3.38.2.ebuild
index e0fd2241d634..8b0331ef5a00 100644
--- a/media-gfx/eog/eog-3.38.2.ebuild
+++ b/media-gfx/eog/eog-3.38.2.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.53.4:2
diff --git a/media-gfx/eog/eog-3.38.1.ebuild b/media-gfx/eog/eog-40.0.ebuild
index ec0be1b69d8e..e0fd2241d634 100644
--- a/media-gfx/eog/eog-3.38.1.ebuild
+++ b/media-gfx/eog/eog-40.0.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.53.4:2
diff --git a/media-gfx/exact-image/Manifest b/media-gfx/exact-image/Manifest
index e8e6476edf7e..51af689ca762 100644
--- a/media-gfx/exact-image/Manifest
+++ b/media-gfx/exact-image/Manifest
@@ -3,5 +3,5 @@ AUX exact-image-1.0.2-g++.patch 936 BLAKE2B 6ab787c1393228bb1671c8a2d7b76969fcd1
 AUX exact-image-1.0.2-gcc6.patch 2795 BLAKE2B 17282b91baa020b94654c92d87611001584f82360303a56e70cb8f081caf400394a367982e115bff094dfe11a0798503a606de106f1bf6427b57a9ede1cd6ed5 SHA512 ef42fccab6d0958df2dcf86578f9df1f84254515c2bea611f256e23227b9d6dc917467f2d8f54230f9386e9726152c6bbe4ab4f3d117e0da5a3e99b00e93e348
 AUX exact-image-1.0.2-php.patch 481 BLAKE2B bf9a3935813098c5248bac843c580d61266b60cf7063824c90e5b87df552d2b0fa125648f4ebcba46acc29d72f9bcd0a0c647467ebdc0d433616da5d8c16225f SHA512 b984095cc071558ce8b7d4b7db2915f793ed8d468f38757d2faab0f7ffc9e866a06838a5d0c578f67e9cc3e88f2bd07b0cde00ce95d909cdc07e5fbf24f3e62e
 DIST exact-image-1.0.2.tar.bz2 322174 BLAKE2B 67afefb4c5a52416459cd4ac6198012eb6d7895a73ea8363fae05286c7e7f62aa1a02166985f53b5638c7dc7b23b4dc1fb1c7b2272a9dc595ce329a7083ee1b9 SHA512 8ba5a198a236ddf5fa58f40c80f32ba9d300376c637a13a7acf3d2db7906fced373b33a7ecff9cff4d09d8b21de9ce1fb9f5bfb1f4522557bd01af0e3d6dcc65
-EBUILD exact-image-1.0.2-r1.ebuild 2411 BLAKE2B f758dde0d8d6698ae8a201d284b6741332043f0b6d82a1da3bc4e187cb5a6ccb040a64acc7577caf94d08270f25d8cb5a6b41e6b030c6f7926b39be5ec246127 SHA512 91969b5b8243222439d3aee8078546dc4370cdca470582596881950d5a003f0b4f805bd39ee61f35eb28a4788c5d4a926afa424d94afdba9407e13b2293c85c6
+EBUILD exact-image-1.0.2-r1.ebuild 2404 BLAKE2B d0ab18a2209c7b93bb07dc1dd3cb4a09714987c1878540ee4258c112883b65523bd04236aeeb0c626e0ff7eeac76f3e99c79e2b15f9e96d924994724566d7433 SHA512 20f460a664de7e6a3c0e7eebcf7ee2e7fb8952ce5a71cd8ad3d21d13023adf117529c1ff94381cbf73dc92789e204c03b5f14aa7447a77b62ea452dc9e251124
 MISC metadata.xml 329 BLAKE2B ceb9ef8fb31cd43ccaeec69b64fe88a4894da38dd2c45a1b74dde46161daa3d437fc9e2d7a699c8ca57acd8bb6ad06dbbbe173eefcf243ee2f78233046a7006b SHA512 eb4d23c96cd7e20afb64bf80075a0cfcdb27c69ca075261d54676c47044ca6d120dd5b80cb2217787b71a9db02688764b0b3f2147c6a6e652954e43cafaebf57
diff --git a/media-gfx/exact-image/exact-image-1.0.2-r1.ebuild b/media-gfx/exact-image/exact-image-1.0.2-r1.ebuild
index 91b8519e19bc..51f39a69c4e2 100644
--- a/media-gfx/exact-image/exact-image-1.0.2-r1.ebuild
+++ b/media-gfx/exact-image/exact-image-1.0.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 LUA_COMPAT=( lua5-{1..4} luajit )
 
-inherit eutils lua-single multilib toolchain-funcs
+inherit lua-single multilib toolchain-funcs
 
 DESCRIPTION="A fast, modern and generic image processing library"
 HOMEPAGE="http://www.exactcode.de/site/open_source/exactimage/"
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index a6cacd031bf4..4b3e5e03d65b 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -1,8 +1,10 @@
 AUX feh-3.2-debug-cflags.patch 193 BLAKE2B 298f65a8f9142167d1cd2cfce0bc61ad9d7d4a5519ab8e78d1259ea60b5566376f8d9ddba660db65ef5e229bdc0ff254d9aab2284d8929ea0ac171da44f8c44d SHA512 336d23b767c5c3da9b94a1e6759129c242caf70a611b2410816a562d90720e3abab6a3444ce06975d62b4ebbe8e54c70942800516c7575cc6d5e13ce69679884
 DIST feh-3.6.1.tar.bz2 2116064 BLAKE2B cae12f9475a2678c2f521baac9deb6668eae07811ae0904bbefef873fd54182b94532bf811394964e725f0e45890f65fcfc3dc988135d388ddcf625adbeca4e0 SHA512 b4350f1c5f66a450b2f088affea973abab9e184df110b693e46e1fc532d213d62a52bf08029f345daf92d45c828ff3bd380dcd7b167f319f1ff3b1d04150cd75
 DIST feh-3.6.2.tar.bz2 2116515 BLAKE2B c813f1bcee2170b509c4579472f2106ed01bcba49a91eaec2f48b2f41b10f43de59ab0d114ee9a04faa9b8d73c13636e49bac4730ff2275bec55cff56379e1fc SHA512 d3a14d7880387575a224bc5cdf1b63bfc5bd793c52fdc07620ddd80e1309a6b9a0c93f3f66ad08a0221f04eabb226372fcb14849a8682c4a2b4691981bb80c40
+DIST feh-3.6.3.tar.bz2 2116771 BLAKE2B 062381cc744617f0c8e0a4a7aac7e0841ef78993d3f65e9853dce6b81d6ce36caf4c72ce35785b96c8e0644da41a6ad12706e6a740740fb27cddf281d780e749 SHA512 53e9e1903f256fee9d49af2f8ce4bf153317e7d5de6b396448f16fd54ae1a13217edb44566cd0433e25675a25175cc412a726f058856136f19629661e2f62ce2
 DIST feh-3.6.tar.bz2 2116101 BLAKE2B 8ad47c6b456746d951728fd8a0ba1a2fed4ceb4a7e15554f68b4de071da7b3f4e9e16a10b1a05e51291b8b4127bab98f2b96231298fd181d8dc544bc089a772f SHA512 1df017adcf0650ff2cdc26556cbea5a6b8c9dad1dd44128cccc79312334d0140ab9e5c9c8bac7249dcfbdd7985ae75d847752eadad14216102d8ab7bcb2c42c7
 EBUILD feh-3.6.1.ebuild 1469 BLAKE2B a4e68a319f63055c4997c72abf39c49c0373b47465873539edf872ed282c5012ae40ddc7cac10968d757b6f9e775bd754a069aac2e42945650e50c6d7be968e1 SHA512 3bca9ab073f234d23d2609e755bc6741742150ac3d3df22e3c831b674d79f7d893ce2b3bcf3b86399b051fe754f8de9e349d5884564bed1cd6b7a1cf1c24c1a5
 EBUILD feh-3.6.2.ebuild 1510 BLAKE2B 4f025973871e4f60fd467603e58df078db0cd93ab240a8ce320b3c50034c907cf6729f5c36185c376581236d4bce6913224e842ba711e6c481409e7691a307c4 SHA512 54677a9d00d4135041ed124893bb9fe7e36af5f2afe8d9baca2e52deb8a5bf1a6347a1b597ce938873d2caa54f3ed9c5ef1428760e10fe566ebe65edacc5ccc2
+EBUILD feh-3.6.3.ebuild 1510 BLAKE2B 4f025973871e4f60fd467603e58df078db0cd93ab240a8ce320b3c50034c907cf6729f5c36185c376581236d4bce6913224e842ba711e6c481409e7691a307c4 SHA512 54677a9d00d4135041ed124893bb9fe7e36af5f2afe8d9baca2e52deb8a5bf1a6347a1b597ce938873d2caa54f3ed9c5ef1428760e10fe566ebe65edacc5ccc2
 EBUILD feh-3.6.ebuild 1469 BLAKE2B a4e68a319f63055c4997c72abf39c49c0373b47465873539edf872ed282c5012ae40ddc7cac10968d757b6f9e775bd754a069aac2e42945650e50c6d7be968e1 SHA512 3bca9ab073f234d23d2609e755bc6741742150ac3d3df22e3c831b674d79f7d893ce2b3bcf3b86399b051fe754f8de9e349d5884564bed1cd6b7a1cf1c24c1a5
 MISC metadata.xml 252 BLAKE2B c64921f238c2751f1f0746df3d109951ebf79c5e1ed5a2fa6d9c33f5420a6ff87c52a5387048a35c148e8cdd29beb406001a9aca3f6cc0f396a78ccb37ae2e3e SHA512 39fbe572d744f1a6f2a23b85a7d62706c478d05f2c74c30e48ccfca5ffd8f26d968fe0869fb9eed4b6494c655f950ab6445346da6eacf85d10da0c1a627cf59b
diff --git a/media-gfx/feh/feh-3.6.3.ebuild b/media-gfx/feh/feh-3.6.3.ebuild
new file mode 100644
index 000000000000..2010a07aeadf
--- /dev/null
+++ b/media-gfx/feh/feh-3.6.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs 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 ~arm64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug curl exif test xinerama inotify"
+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)
+		inotify=$(use_feh inotify)
+	)
+}
+
+src_compile() {
+	tc-export CC
+	emake "${fehopts[@]}"
+}
+
+src_install() {
+	emake "${fehopts[@]}" install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/flam3/Manifest b/media-gfx/flam3/Manifest
index 3f16f9fee2fc..defae84b5954 100644
--- a/media-gfx/flam3/Manifest
+++ b/media-gfx/flam3/Manifest
@@ -1,3 +1,3 @@
 DIST flam3-3.1.1.tar.gz 1181954 BLAKE2B 9691647704e96052f04f79b59b55b47285940ada3486ef6828d1e95934c5741915bf0e4f11c3ff39da7b5534b5c6c9ec16a88bc0568ac65c8a4b5d4aff9c8d29 SHA512 8a84840d9cb91d63dd0ba5c8a6725f703f6315a7add0c091502c0dac5c77eb0495054bb4b601f72454dea0def99131ca679095da65eeebaae9b01dc59cf75e7e
-EBUILD flam3-3.1.1.ebuild 753 BLAKE2B 42ea277494de993383f4b16a383a20a9dc1ff52bfc7cf0f092524b5ad8f62a542ea88e37456afd9b9e521883af62842dbd645433dd43a96514d3a67d37464599 SHA512 afded1a293e601f2873a8c346cbbcc042d627ed254fafb90f54f7f8dadca5930cda1c40fc04160bfa18e19c08c1a56bef1eb3f2a2321eca13fb8e19691456257
+EBUILD flam3-3.1.1.ebuild 748 BLAKE2B 330660b6924e4d97a2ed818b3b8dff66ed3cd6dc870cebda13fa936a237be0574d18b2650c5036d7d3f01174cc32254e361ed579683263e7127b5a647c208b45 SHA512 5e3f6fca43473f0736ffb16a1362a2f50f77052385cd17eb0b6a9cd599dd032f5c2f56a81fcb736596988df6dd457d35cda4af52526cf74f0bb5b7d1d6e3470f
 MISC metadata.xml 322 BLAKE2B 8fa31c5e84e310169a863d1d66a77d73cff819cf595acfd7fc8f23c90a2271348899e8a5a5a5a184ea7de9428aebf7d841ab0a035fdc28f0ecd312396dcf3def SHA512 98b61c299f8cfa8c42a5f4b5b51b9eecbdffe3632ef8fd687afab26454fa8fccb71348a42cca69fbae7d154f69814feac61c4109ba671dd2fa413bf75e0445ca
diff --git a/media-gfx/flam3/flam3-3.1.1.ebuild b/media-gfx/flam3/flam3-3.1.1.ebuild
index bc2cc8e1aa49..6a111b72cfe3 100644
--- a/media-gfx/flam3/flam3-3.1.1.ebuild
+++ b/media-gfx/flam3/flam3-3.1.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Tools and a library for creating flame fractal images"
 HOMEPAGE="https://flam3.com/"
-SRC_URI="https://github.com/scottdraves/flam3/archive/v$PV.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/scottdraves/flam3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/media-gfx/flameshot/Manifest b/media-gfx/flameshot/Manifest
index 22376c33e137..7622c0466f0d 100644
--- a/media-gfx/flameshot/Manifest
+++ b/media-gfx/flameshot/Manifest
@@ -1,5 +1,5 @@
 AUX flameshot-0.6.0-missing-include-fix.patch 869 BLAKE2B edccee0ef880470652535d65797800dc675e40556e4cdf560e257e60e649924316e5a0fdc271507763d90734fc60290e1ddecab417148542e8b318041ca9690c SHA512 852a3c12e1fee4a90e6a31c5c17a371a2b44fe1a399a6e11f8a760d5436ea73fa7aed9ebb906f67f7efbd4315e9c092c7cdf76a464f916df6893cc13bd361f7c
 AUX flameshot-0.6.0-unbundle-qtsingleapplication.patch 1505 BLAKE2B 51b8c59945f580d7777d4f9aeb954196bbd7e473301153053d451e0e07f08abb50a21fb993f940ab6ab40bfbbc6a14e04852d8e6a54e7ce4047ab64feb8cc2b5 SHA512 7543862bdead4f58435be97d09e4045ec1a9e77f90947c55076510da891627e189dc052cbd4ec8947203d5fa2c985220c2cd3fbb6cb9470222b3f5d42c61cf14
 DIST flameshot-0.6.0.tar.gz 641561 BLAKE2B f9e87373d84c1a841f70cd9c13b504865a0ef23d0fb29848f2270171459afe9c6852e12c712ebdc7cf3cfc62214d7b7507b85cf21838d0ebed33bee1e39f4aad SHA512 194127032ab0f62a6ba2698688e11b2d4e6f0e04a282144f5fbb6c232eeebc71371af2d55abbb6e98b8649dee036e6f0a6ef55710e4321a60fd5ac6e453ab975
-EBUILD flameshot-0.6.0.ebuild 1126 BLAKE2B dc0f3b785a508b06a24f6427c661f0cf3b4b3dd4cac145da7930336abcb717f66cbe2650fd40f8cba7e1b9d3c0af30cb70f5bdeab09848ec32a1d10d5a86d81d SHA512 307f2d58679069fa4047abf3b154499d30790a1b8a38757939dab11cce03e83218ffaecdd8f7e889ea1058740fbccf289a017b2bff5bf7894cbac5817cf99ab2
+EBUILD flameshot-0.6.0.ebuild 1167 BLAKE2B 04249a8ba0efb3bfbdd9435dac5a80d9418d01c1c811e9111ce96ddf70c7869f458432e36bc50956cfd9d1a7cd83996b6d1043da442cce0237c370c27748b1e0 SHA512 1be8a46785eff93665ec860d080ecf43afbeee9b4879d583065d87ee3b7ea9ed5662e01e295408acd1a6366f8761ed4973802e282c1bbcb20481bfdf5414da49
 MISC metadata.xml 396 BLAKE2B aa67921bf3b8f848824726187c8645c3d48e4a4b3e629ac32fea19e9764408871beddb474e10b9f8f106ff9caa9d0b0fbd87441f14275383c95c3062d47e071f SHA512 7b9df389d3add92f56cc7fcd95fd4986883860e088d678c20d9ca3d47c80faa45a2242bc74b8d54b54999279a8be1d7d04fac5f741db5876e45577c6df8413aa
diff --git a/media-gfx/flameshot/flameshot-0.6.0.ebuild b/media-gfx/flameshot/flameshot-0.6.0.ebuild
index bf095c3de1b4..1944a2858d7c 100644
--- a/media-gfx/flameshot/flameshot-0.6.0.ebuild
+++ b/media-gfx/flameshot/flameshot-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 inherit desktop qmake-utils xdg-utils
 
 DESCRIPTION="Powerful yet simple to use screenshot software"
-HOMEPAGE="https://flameshot.js.org"
-SRC_URI="https://github.com/lupoDharkael/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://flameshot.org https://github.com/flameshot-org/flameshot"
+SRC_URI="https://github.com/flameshot-org/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="FreeArt GPL-3 Apache-2.0"
 SLOT="0"
diff --git a/media-gfx/fondu/Manifest b/media-gfx/fondu/Manifest
index a2d2ff1cad43..698453587615 100644
--- a/media-gfx/fondu/Manifest
+++ b/media-gfx/fondu/Manifest
@@ -1,4 +1,4 @@
-AUX fondu-20060102-build-fix.patch 2446 BLAKE2B aa584eecfdb0221fa7f40b4abbf21103c95cb710d5f37a598ef41d634c0c560a84a856b72e839ef40cba20da6886bf6c127a11072da8949e77aef237350bc656 SHA512 02bd3202020718501540249d9f97c82ee3ddae25f6371a06d7b448fb43e393b5b2bcf5d6609395e6928d5bb559ed6b36614ae6cae271b4aae6afa2f0916b533b
+AUX fondu-20060102-build-fix.patch 2286 BLAKE2B 1cbfae9acdd023cadfcc66957da2b40ef23cea79311e6119fbba5db071360a646d5f89eb12c2085cee94cb97efa9b4e6430faa4f846820548b3af8f161070b50 SHA512 393fe9450a705a86c14b60b74a45d9298feff019ef31bb897e55eede8cabc8cb7e4465e621639c8ca3d92e6aaec3f7d4fce34ad875d6ed28a67a2a780c2d5a98
 DIST fondu_src-060102.tgz 131516 BLAKE2B 7ffb51ff8fe40e7bf2eeb4eb66b979cb278b912808f295c6460dfc6172ef32286eeb82a64281f969ecc07ce7cf6d3e4f1dfefe9417e0f4c58c80790eb0f10c70 SHA512 01d31901ab50eee70a74a3e211d78c55173748ad6e0cdadcda471a1f543856795a3bd8b421206cde044d240a1b425f32f6e40239ade0e87517e00b6ed9277bce
-EBUILD fondu-20060102-r1.ebuild 729 BLAKE2B 2df1e7fe61f9a5329834b89931b2c0602738f980fd262b77a057065d275d49c6564bd1bb10b57e4e8504ce809c8087238e64f913f659e75a2de2f8a4bb9e4133 SHA512 35b4307249bc29771253a65050d932f598ef4d493a5226a40a838386b54b301b38689a44d1bfeb44734296a8ae4fe8dd4a6c7efd5a4f1a3214ec2732c8f7a335
+EBUILD fondu-20060102-r1.ebuild 717 BLAKE2B 9c23eef8c89b33d7ea5147d2e59a29d02d7bc6fb200a3f4579d264dd9d50e72a3bc75297bea90fc5b881f8c012aec0abce305bc475b39e1fa406b14c2d182e30 SHA512 48b0b0295bbef6299fecde46640457fc08d133b1d7d87b2afc3ff8709e059abfc03639f8d5310245c134c0e74c0dc49ae25d6adeddae509aa81b3659c50c13d2
 MISC metadata.xml 313 BLAKE2B b2781092327c78cdbdb69d47d9b398a8cb13b333dfff2394f38b1d916173995a58d7e8d1f15b68226a3f4c28c3de78369395a1458679ffa972963bbf133c6913 SHA512 142d5ea488f33eaf8b47fc0d3cb330bc01a425756a7d49ad0df7f60dcebf1ba986684b4dd2e2c44ce41d2af018b9586f94f903ce7ba2aec0eb8958d8b7586e48
diff --git a/media-gfx/fondu/files/fondu-20060102-build-fix.patch b/media-gfx/fondu/files/fondu-20060102-build-fix.patch
index d84d0b7bde4e..6a96c2d7c5da 100644
--- a/media-gfx/fondu/files/fondu-20060102-build-fix.patch
+++ b/media-gfx/fondu/files/fondu-20060102-build-fix.patch
@@ -10,9 +10,8 @@ frommacbinary.c:58: warning: too few arguments for format
 Upstream: https://sourceforge.net/tracker/?func=detail&aid=2875547&group_id=39411&atid=425133
 Author: Peter Volkov <pva@gentoo.org>
 
-=== modified file 'fondu.c'
---- fondu.c	2009-10-09 07:24:15 +0000
-+++ fondu.c	2009-10-09 07:25:49 +0000
+--- a/fondu.c
++++ b/fondu.c
 @@ -473,7 +473,7 @@
  	}
  	if ( styleoff!=0 ) {
@@ -55,9 +54,8 @@ Author: Peter Volkov <pva@gentoo.org>
  		pt += strings[ 0 ][0];
  		if ( format!=0 && format!=-1 )
 
-=== modified file 'frommacbinary.c'
---- frommacbinary.c	2009-10-09 07:24:15 +0000
-+++ frommacbinary.c	2009-10-09 07:27:54 +0000
+--- a/frommacbinary.c
++++ b/frommacbinary.c
 @@ -55,7 +55,7 @@
  /* frombin filenames */
  
diff --git a/media-gfx/fondu/fondu-20060102-r1.ebuild b/media-gfx/fondu/fondu-20060102-r1.ebuild
index 03f2e4f22ced..fd4359d3d3cd 100644
--- a/media-gfx/fondu/fondu-20060102-r1.ebuild
+++ b/media-gfx/fondu/fondu-20060102-r1.ebuild
@@ -1,29 +1,30 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-
-inherit eutils
+EAPI=7
 
 MY_PV=${PV:2:6}
 
 DESCRIPTION="Utilities for converting between and manipulating mac fonts and unix fonts"
 HOMEPAGE="http://fondu.sourceforge.net/"
 SRC_URI="http://fondu.sourceforge.net/${PN}_src-${MY_PV}.tgz"
+S="${WORKDIR}"/${PN}-${MY_PV}
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE=""
 
-S=${WORKDIR}/${PN}-${MY_PV}
+PATCHES=(
+	"${FILESDIR}"/${P}-build-fix.patch
+)
 
 src_prepare() {
+	default
+
 	sed -e 's:^CFLAGS =:CFLAGS +=:' \
 		-e 's:$(CFLAGS) -o:$(CFLAGS) $(LDFLAGS) -o:' \
 		-e 's:wilprefix:prefix:' \
 		-i Makefile.in || die "failed to sed"
-	epatch "${FILESDIR}/${P}-build-fix.patch"
 }
 
 src_install() {
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index a32eb57ace5b..bff3d56416fa 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -1,11 +1,4 @@
-AUX 20200314-MacServiceReadFDs.patch 1053 BLAKE2B 733c1e217681b7f5f6cf776835f142d93224bc240928c2b37101f71a19f31f240ac6c1f28931e544b5e277b82e6f0baceb0634fb92a74009b0c3b93d49262824 SHA512 cd8bf4bdf1e792ec4a9c7177cfd2e0cae42d0fa4ad016bb5372826e776170c6d4c53cdd2013784410fac9e4fd674afe3030b64577b2ac9f4b019d84510425614
-AUX 20200314-big-endian.patch 11856 BLAKE2B ae107bec5156a60605d19588b61ce9b7869a41ce148f3da16b7f69a3c298667c224d0cd22796aa447ef71118ee0b6c0cb8682f71d483de4806cd4640cefcb86f SHA512 d15dd1dcc5d3ca6d798954b31ce2dbc943536bbbcd158eb3ac95c9643fa0dee4c0357aa954298ef8d270be13c0f012d424d9c5f34d865dd9dd33ff7f189d257f
-AUX 20200314-stylemap.patch 869 BLAKE2B a5907efaa1357f5b445eadfa951d9558de78eb1f8eb271cac15318a6d1e7d95c4d56918ca41307c9ff74ab05bf3cc373a5189ccaa5c76282b2c0c5d6834bfaba SHA512 1f0e363d42606fb506dd6f747ac250cce6ab4b5bf49400095cab9fd48b68232a8d58325147d2e1f7ca223093d36edf020f70f383bb0bf24f3a2f2fc3b35fb747
-AUX 20200314-tilepath.patch 1142 BLAKE2B 61aa804682a5e486c2f131fd9d81fc5d29ca946f18d9d11a323d4c49cfa8c9404b846e2afb6ac4dbf00af78133f27819f72f678298c3abfaeecd576877ac1ed4 SHA512 2cbd0ac47c211ceda2e2e4d6b62a69432e084ec664d58ff5e259f2d1eee9b70b64610d4a428d5f86305c8427c21dd6a00944a86a995c8cc5f9aed63df4aa5a31
-AUX fontforge-20200314-freetype-2.10.3.patch 2000 BLAKE2B 384f524e4f7bf633169c8d59ab3e7bae0a967f48365e3699301d548225d63feb1e0195f06371d5b39169b16b5ace6ea474de0eaca9c1cc5fe957da0e74322697 SHA512 b4881fbaf6ac5f2099fa11e6b537697b4493a129d2f21d58387303326d079e7b21a515e0f1efb0bf50311b811f640847c69d29b64e2bdea3d56b7975b31836ab
 AUX fontforge-doc-no-warn-error.patch 834 BLAKE2B c8bd1cfcf320b7831cc64d67d8de52b37e2f37bbac91d5df709d23e144ae33ec02907606348185eac7030f5151719e0023c0d9fda5395334a15c56f7174151c4 SHA512 6055f1696f1910e81ab1b84b48d336c1a097b53618a3a960e8ce2aeb57e05ad364848d48082b792cd4d5cc85fc95947cddd2e04e7a98c5ceb6f9ced14bd4e674
-DIST fontforge-20200314.tar.xz 13850076 BLAKE2B 5e6ae3b7940a5b3b08811abdfc9d151f231e6d457b219eb0c666e1b831db815b696f345eda0d4d423b7e340f56fca67205734ae19903b3815381080d34b5e95c SHA512 09f5dc93f87ca63668d72d108690604489d6b3cec7eedff1c07ad6d1ce5eae442ab60e79e71ae8b99e9808f3551011788025a86ffc3a9738518d99761d849975
 DIST fontforge-20201107.tar.xz 14163424 BLAKE2B 8ce9148eef6e5b7206ab5c70310ff36fac67c392117e3c0b28060803a54306bf21c179b62b98734e11253739eac29e2ea8bcf3014c09432bb3a0b2b0f3ec631a SHA512 cf9666395405ab02943f0160959f04251bd2a80e279a8f60431089ad19a4c5a232efd42097050ed9f6c1fb39d01488176262949fd81f5f0960fe853b497437dc
-EBUILD fontforge-20200314.ebuild 3058 BLAKE2B 94968a4ca991a47bb10ed96bd636fe0930df065c5d8d18348b50cfcf7b5710b8aea7f4b981410b3f041bd942a7544002c1c1100fb75bf94945b6893dc2948437 SHA512 3a7af2adbee535f5589145d7e41e1fe627558bb672da9979842d5917ff0c59496c7ec5c4f1d56b0f82553d3bf83bac0fee526674da017875b49e07aae2f7bd7a
-EBUILD fontforge-20201107.ebuild 2858 BLAKE2B ab21f8e1d9bf605cd3676130da35a0afc3ec9faf2c1fa34614b50c5eb6b0c291621041d3e5c91079834cc8b71dc044c6c004020d217db5e517d3ce0432292ed4 SHA512 c13614e750bde83c367c3491a1b10411b6df77767fb1aea42e0c274311b47cc9d41189f83cc6103f8ce9fd6e429c769748ac2b6f276e3435f8df2aac51f78d03
+EBUILD fontforge-20201107.ebuild 2857 BLAKE2B 67a11f7c1544d54ac4e7afaf17eefa768fd9f4f281980330fa67dfeb60d66881cc8c5d2ade1482df452c8b46bf062e81207ff613a8394c5fc2d3124b8065d42a SHA512 c7c60fee29aa677ef934ce39c37fefee838ac31bc08b32a55338cb74df45ec341ebdf08c20f63a1917aa7254705a619f00be28aa9a0e7294910a652ae8a3e505
 MISC metadata.xml 861 BLAKE2B 124399e55210b51cd13640775c816694e8ac20aa897984124bb6b62491494bf754e8ad772f0c322044853c8000ba882491193213a749dc696bf0d63d781cd8df SHA512 cde1be6966688ea55af73b02cf4fbffae5141bdfebf45211ca84c0f3651e39916b9abeb6bab652663ff5a68ed0b359df35e0420447a5f1c9a0ab16368f74e479
diff --git a/media-gfx/fontforge/files/20200314-MacServiceReadFDs.patch b/media-gfx/fontforge/files/20200314-MacServiceReadFDs.patch
deleted file mode 100644
index d6beff7984c9..000000000000
--- a/media-gfx/fontforge/files/20200314-MacServiceReadFDs.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 5a3d2ce60aeefd706c36a8325721b0c8c818c742 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 1 May 2020 05:06:07 -0400
-Subject: [PATCH] Stub-out MacServiceReadFDs() on non-Mac platforms (#4246)
-
-This should fix a build failure on Linux with musl libc due to the
-missing sys/select.h include.
-
-MacServiceReadFDs seems to only be called in startui.c, also behind the
-__Mac macro.
-
-Bug: https://bugs.gentoo.org/706792
----
- gdraw/gdraw.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gdraw/gdraw.c b/gdraw/gdraw.c
-index 1fb3354b1d..6bac57b92a 100644
---- a/gdraw/gdraw.c
-+++ b/gdraw/gdraw.c
-@@ -32,7 +32,7 @@
- #include "gkeysym.h"
- #include "ustring.h"
- 
--#if __Mac || __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__
-+#if __Mac
- #  include <sys/select.h>
- #endif
- 
-@@ -1076,7 +1076,7 @@ GDrawRemoveReadFD( GDisplay *gdisp,
- 
- void MacServiceReadFDs()
- {
--#if (!defined(__MINGW32__))&&(!defined(__CYGWIN__))
-+#if __Mac
-     int ret = 0;
-     
-     GDisplay *gdisp = GDrawGetDisplayOfWindow(0);
diff --git a/media-gfx/fontforge/files/20200314-big-endian.patch b/media-gfx/fontforge/files/20200314-big-endian.patch
deleted file mode 100644
index f9581ad35f42..000000000000
--- a/media-gfx/fontforge/files/20200314-big-endian.patch
+++ /dev/null
@@ -1,298 +0,0 @@
-From 65619185a42bd52bb4a4894c1714d78d96ed4175 Mon Sep 17 00:00:00 2001
-From: Jeremy Tan <jtanx@outlook.com>
-Date: Sun, 26 Apr 2020 18:57:58 +1000
-Subject: [PATCH 1/2] tottfgpos.c: fix incorrect sizing of the scripts array
-
-latn contains 58 entries (29 pairs), meaning the size was too small
-to fit the 0 marker at the end of the array
----
- fontforge/tottfgpos.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fontforge/tottfgpos.c b/fontforge/tottfgpos.c
-index 5de5164ed1..e12a0b8a79 100644
---- a/fontforge/tottfgpos.c
-+++ b/fontforge/tottfgpos.c
-@@ -60,7 +60,7 @@ int use_second_indic_scripts = false;
- /* scripts (for opentype) that I understand */
-     /* see also list in lookups.c mapping script tags to friendly names */
- 
--static uint32 scripts[][59] = {
-+static uint32 scripts[][61] = {
- /* Adlam */	{ CHR('a','d','l','m'), 0x1e900, 0x1e95f },
- /* Ahom */	{ CHR('a','h','o','m'), 0x11700, 0x1173f },
- /* Anatolian */	{ CHR('h','l','u','w'), 0x14400, 0x1467f },
-
-From fde85b13382595cb3ab889e38570b4944edad808 Mon Sep 17 00:00:00 2001
-From: Jeremy Tan <jtanx@outlook.com>
-Date: Sun, 26 Apr 2020 19:00:04 +1000
-Subject: [PATCH 2/2] python.c: fix type specifier on long input/return values
-
-int is guaranteed to be at least 16 bits, while long is at least
-32 bits. So for uint32/int32 values, parse longs with the "l"/"k"
-specifier and cast return values to long.
-
-The cast is necessary as on amd64 a long is 64 bits
----
- fontforge/python.c | 68 +++++++++++++++++++++++-----------------------
- 1 file changed, 34 insertions(+), 34 deletions(-)
-
-diff --git a/fontforge/python.c b/fontforge/python.c
-index 5344b0f60f..6c9675fa4e 100644
---- a/fontforge/python.c
-+++ b/fontforge/python.c
-@@ -760,7 +760,7 @@ static PyObject *PyFF_UnicodeAnnotationFromLib(PyObject *UNUSED(self), PyObject
-     char *temp;
-     long val;
- 
--    if ( !PyArg_ParseTuple(args,"|i",&val) )
-+    if ( !PyArg_ParseTuple(args,"|l",&val) )
- 	return( NULL );
- 
-     if ( (temp=unicode_annot(val))==NULL ) {
-@@ -777,7 +777,7 @@ static PyObject *PyFF_UnicodeNameFromLib(PyObject *UNUSED(self), PyObject *args)
-     char *temp;
-     long val;
- 
--    if ( !PyArg_ParseTuple(args,"|i",&val) )
-+    if ( !PyArg_ParseTuple(args,"|l",&val) )
- 	return( NULL );
- 
-     if ( (temp=unicode_name(val))==NULL ) {
-@@ -798,10 +798,10 @@ static PyObject *PyFF_UnicodeBlockStartFromLib(PyObject *UNUSED(self), PyObject
- /* Use this function with UnicodeBlockNameFromLib(n) & UnicodeBlockEndFromLib(n). */
-     long val;
- 
--    if ( !PyArg_ParseTuple(args,"|i",&val) )
-+    if ( !PyArg_ParseTuple(args,"|l",&val) )
- 	return( NULL );
- 
--    return( Py_BuildValue("i", unicode_block_start(val)) );
-+    return( Py_BuildValue("l", (long)unicode_block_start(val)) );
- }
- 
- static PyObject *PyFF_UnicodeBlockEndFromLib(PyObject *UNUSED(self), PyObject *args) {
-@@ -809,10 +809,10 @@ static PyObject *PyFF_UnicodeBlockEndFromLib(PyObject *UNUSED(self), PyObject *a
- /* Use this function with UnicodeBlockStartFromLib(n), UnicodeBlockNameFromLib(n) */
-     long val;
- 
--    if ( !PyArg_ParseTuple(args,"|i",&val) )
-+    if ( !PyArg_ParseTuple(args,"|l",&val) )
- 	return( NULL );
- 
--    return( Py_BuildValue("i", unicode_block_end(val)) );
-+    return( Py_BuildValue("l", (long)unicode_block_end(val)) );
- }
- 
- static PyObject *PyFF_UnicodeBlockNameFromLib(PyObject *UNUSED(self), PyObject *args) {
-@@ -822,7 +822,7 @@ static PyObject *PyFF_UnicodeBlockNameFromLib(PyObject *UNUSED(self), PyObject *
-     char *temp;
-     long val;
- 
--    if ( !PyArg_ParseTuple(args,"|i",&val) )
-+    if ( !PyArg_ParseTuple(args,"|l",&val) )
- 	return( NULL );
- 
-     if ( (temp=unicode_block_name(val))==NULL ) {
-@@ -853,24 +853,24 @@ static PyObject *PyFF_UnicodeNames2GetCntFromLib(PyObject *UNUSED(self), PyObjec
- static PyObject *PyFF_UnicodeNames2GetNxtFromLib(PyObject *UNUSED(self), PyObject *args) {
-     long val;
- 
--    if ( !PyArg_ParseTuple(args,"|i",&val) )
-+    if ( !PyArg_ParseTuple(args,"|l",&val) )
- 	return( NULL );
--    return( Py_BuildValue("i", unicode_names2getUtabLoc(val)) );
-+    return( Py_BuildValue("l", (long)unicode_names2getUtabLoc(val)) );
- }
- 
- static PyObject *PyFF_UnicodeNames2NxtUniFromLib(PyObject *UNUSED(self), PyObject *args) {
-     long val;
- 
--    if ( !PyArg_ParseTuple(args,"|i",&val) )
-+    if ( !PyArg_ParseTuple(args,"|l",&val) )
- 	return( NULL );
--    return( Py_BuildValue("i", unicode_names2valFrmTab(val)) );
-+    return( Py_BuildValue("l", (long)unicode_names2valFrmTab(val)) );
- }
- 
- static PyObject *PyFF_UnicodeNames2FrmTabFromLib(PyObject *UNUSED(self), PyObject *args) {
-     long val;
-     char *temp;
- 
--    if ( !PyArg_ParseTuple(args,"|i",&val) )
-+    if ( !PyArg_ParseTuple(args,"|l",&val) )
- 	return( NULL );
-     if ( (temp=unicode_name2FrmTab(val))==NULL ) {
- 	return Py_BuildValue("s", "");
-@@ -883,7 +883,7 @@ static PyObject *PyFF_UnicodeNames2FromLib(PyObject *UNUSED(self), PyObject *arg
-     long val;
-     char *temp;
- 
--    if ( !PyArg_ParseTuple(args,"|i",&val) )
-+    if ( !PyArg_ParseTuple(args,"|l",&val) )
- 	return( NULL );
-     if ( (temp=unicode_name2(val))==NULL ) {
- 	return Py_BuildValue("s", "");
-@@ -899,7 +899,7 @@ static PyObject *PyFF_UnicodeNames2FromLib(PyObject *UNUSED(self), PyObject *arg
- static PyObject *PyFF_isligature(PyObject *UNUSED(self), PyObject *args) {
-     long codepoint;
- 
--    if ( !PyArg_ParseTuple(args,"|i",&codepoint) )
-+    if ( !PyArg_ParseTuple(args,"|l",&codepoint) )
- 	return( NULL );
- 
-     return( Py_BuildValue("i", is_LIGATURE(codepoint)==0?1:0) );
-@@ -908,7 +908,7 @@ static PyObject *PyFF_isligature(PyObject *UNUSED(self), PyObject *args) {
- static PyObject *PyFF_isvulgarfraction(PyObject *UNUSED(self), PyObject *args) {
-     long codepoint;
- 
--    if ( !PyArg_ParseTuple(args,"|i",&codepoint) )
-+    if ( !PyArg_ParseTuple(args,"|l",&codepoint) )
- 	return( NULL );
- 
-     return( Py_BuildValue("i", is_VULGAR_FRACTION(codepoint)==0?1:0) );
-@@ -917,7 +917,7 @@ static PyObject *PyFF_isvulgarfraction(PyObject *UNUSED(self), PyObject *args) {
- static PyObject *PyFF_isotherfraction(PyObject *UNUSED(self), PyObject *args) {
-     long codepoint;
- 
--    if ( !PyArg_ParseTuple(args,"|i",&codepoint) )
-+    if ( !PyArg_ParseTuple(args,"|l",&codepoint) )
- 	return( NULL );
- 
-     return( Py_BuildValue("i", is_OTHER_FRACTION(codepoint)==0?1:0) );
-@@ -926,7 +926,7 @@ static PyObject *PyFF_isotherfraction(PyObject *UNUSED(self), PyObject *args) {
- static PyObject *PyFF_isfraction(PyObject *UNUSED(self), PyObject *args) {
-     long codepoint;
- 
--    if ( !PyArg_ParseTuple(args,"|i",&codepoint) )
-+    if ( !PyArg_ParseTuple(args,"|l",&codepoint) )
- 	return( NULL );
- 
-     return( Py_BuildValue("i", (is_VULGAR_FRACTION(codepoint)==0 || \
-@@ -957,28 +957,28 @@ static PyObject *PyFF_FracChartGetCnt(PyObject *UNUSED(self), PyObject *UNUSED(a
- static PyObject *PyFF_LigChartGetNxt(PyObject *UNUSED(self), PyObject *args) {
-     long val;
- 
--    if ( !PyArg_ParseTuple(args,"|i",&val) )
-+    if ( !PyArg_ParseTuple(args,"|l",&val) )
- 	return( NULL );
- 
--    return( Py_BuildValue("i", Ligature_get_U(val)) );
-+    return( Py_BuildValue("l", (long)Ligature_get_U(val)) );
- }
- 
- static PyObject *PyFF_VulChartGetNxt(PyObject *UNUSED(self), PyObject *args) {
-     long val;
- 
--    if ( !PyArg_ParseTuple(args,"|i",&val) )
-+    if ( !PyArg_ParseTuple(args,"|l",&val) )
- 	return( NULL );
- 
--    return( Py_BuildValue("i", VulgFrac_get_U(val)) );
-+    return( Py_BuildValue("l", (long)VulgFrac_get_U(val)) );
- }
- 
- static PyObject *PyFF_OFracChartGetNxt(PyObject *UNUSED(self), PyObject *args) {
-     long val;
- 
--    if ( !PyArg_ParseTuple(args,"|i",&val) )
-+    if ( !PyArg_ParseTuple(args,"|l",&val) )
- 	return( NULL );
- 
--    return( Py_BuildValue("i", Fraction_get_U(val)) );
-+    return( Py_BuildValue("l", (long)Fraction_get_U(val)) );
- }
- 
- /* If you have a unicode ligature, or fraction, these routines return loc n. */
-@@ -987,7 +987,7 @@ static PyObject *PyFF_OFracChartGetNxt(PyObject *UNUSED(self), PyObject *args) {
- static PyObject *PyFF_LigChartGetLoc(PyObject *UNUSED(self), PyObject *args) {
-     long codepoint;
- 
--    if ( !PyArg_ParseTuple(args,"|i",&codepoint) )
-+    if ( !PyArg_ParseTuple(args,"|l",&codepoint) )
- 	return( NULL );
- 
-     return( Py_BuildValue("i", Ligature_find_N(codepoint)) );
-@@ -996,7 +996,7 @@ static PyObject *PyFF_LigChartGetLoc(PyObject *UNUSED(self), PyObject *args) {
- static PyObject *PyFF_VulChartGetLoc(PyObject *UNUSED(self), PyObject *args) {
-     long codepoint;
- 
--    if ( !PyArg_ParseTuple(args,"|i",&codepoint) )
-+    if ( !PyArg_ParseTuple(args,"|l",&codepoint) )
- 	return( NULL );
- 
-     return( Py_BuildValue("i", VulgFrac_find_N(codepoint)) );
-@@ -1005,7 +1005,7 @@ static PyObject *PyFF_VulChartGetLoc(PyObject *UNUSED(self), PyObject *args) {
- static PyObject *PyFF_OFracChartGetLoc(PyObject *UNUSED(self), PyObject *args) {
-     long codepoint;
- 
--    if ( !PyArg_ParseTuple(args,"|i",&codepoint) )
-+    if ( !PyArg_ParseTuple(args,"|l",&codepoint) )
- 	return( NULL );
- 
-     return( Py_BuildValue("i", Fraction_find_N(codepoint)) );
-@@ -1066,7 +1066,7 @@ static PyObject *PyFF_LigChartGetAltVal(PyObject *UNUSED(self), PyObject *args)
- 
-     if ( !PyArg_ParseTuple(args,"ll",&nthCode, &altN) )
- 	return( NULL );
--    return( Py_BuildValue("i", Ligature_alt_getV(nthCode,altN)) );
-+    return( Py_BuildValue("l", (long)Ligature_alt_getV(nthCode,altN)) );
- }
- 
- static PyObject *PyFF_LigChartUGetAltVal(PyObject *UNUSED(self), PyObject *args) {
-@@ -1074,7 +1074,7 @@ static PyObject *PyFF_LigChartUGetAltVal(PyObject *UNUSED(self), PyObject *args)
- 
-     if ( !PyArg_ParseTuple(args,"ll",&nthCode, &altN) )
- 	return( NULL );
--    return( Py_BuildValue("i", LigatureU_alt_getV(nthCode,altN)) );
-+    return( Py_BuildValue("l", (long)LigatureU_alt_getV(nthCode,altN)) );
- }
- 
- static PyObject *PyFF_VulChartGetAltVal(PyObject *UNUSED(self), PyObject *args) {
-@@ -1082,7 +1082,7 @@ static PyObject *PyFF_VulChartGetAltVal(PyObject *UNUSED(self), PyObject *args)
- 
-     if ( !PyArg_ParseTuple(args,"ll",&nthCode, &altN) )
- 	return( NULL );
--    return( Py_BuildValue("i", VulgFrac_alt_getV(nthCode,altN)) );
-+    return( Py_BuildValue("l", (long)VulgFrac_alt_getV(nthCode,altN)) );
- }
- 
- static PyObject *PyFF_VulChartUGetAltVal(PyObject *UNUSED(self), PyObject *args) {
-@@ -1090,7 +1090,7 @@ static PyObject *PyFF_VulChartUGetAltVal(PyObject *UNUSED(self), PyObject *args)
- 
-     if ( !PyArg_ParseTuple(args,"ll",&nthCode, &altN) )
- 	return( NULL );
--    return( Py_BuildValue("i", VulgFracU_alt_getV(nthCode,altN)) );
-+    return( Py_BuildValue("l", (long)VulgFracU_alt_getV(nthCode,altN)) );
- }
- 
- static PyObject *PyFF_OFracChartGetAltVal(PyObject *UNUSED(self), PyObject *args) {
-@@ -1098,7 +1098,7 @@ static PyObject *PyFF_OFracChartGetAltVal(PyObject *UNUSED(self), PyObject *args
- 
-     if ( !PyArg_ParseTuple(args,"ll",&nthCode, &altN) )
- 	return( NULL );
--    return( Py_BuildValue("i", Fraction_alt_getV(nthCode,altN)) );
-+    return( Py_BuildValue("l", (long)Fraction_alt_getV(nthCode,altN)) );
- }
- 
- static PyObject *PyFF_OFracChartUGetAltVal(PyObject *UNUSED(self), PyObject *args) {
-@@ -1106,7 +1106,7 @@ static PyObject *PyFF_OFracChartUGetAltVal(PyObject *UNUSED(self), PyObject *arg
- 
-     if ( !PyArg_ParseTuple(args,"ll",&nthCode, &altN) )
- 	return( NULL );
--    return( Py_BuildValue("i", FractionU_alt_getV(nthCode,altN)) );
-+    return( Py_BuildValue("l", (long)FractionU_alt_getV(nthCode,altN)) );
- }
- 
- static PyObject *PyFF_Version(PyObject *UNUSED(self), PyObject *UNUSED(args)) {
-@@ -1542,8 +1542,8 @@ return( ret );
- }
- 
- static PyObject *PyFF_scriptFromUnicode(PyObject *UNUSED(self), PyObject *args) {
--    long u;
--    if ( !PyArg_ParseTuple(args,"i",&u) )
-+    unsigned long u;
-+    if ( !PyArg_ParseTuple(args,"k",&u) )
- 	return( NULL );
- 
-     uint32 script = ScriptFromUnicode(u, NULL);
diff --git a/media-gfx/fontforge/files/20200314-stylemap.patch b/media-gfx/fontforge/files/20200314-stylemap.patch
deleted file mode 100644
index d3311cab02d2..000000000000
--- a/media-gfx/fontforge/files/20200314-stylemap.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3b83adc89771000eb95fcd87bb675f771ba85aaf Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 29 Mar 2020 16:36:14 -0400
-Subject: [PATCH] Avoid integer size conflict when setting stylemap
-
-stylemap is a 16-bit integer, but hexmap writes 32-bits.
-
-Bug: https://bugs.gentoo.org/642756
----
- fontforge/sfd.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/fontforge/sfd.c b/fontforge/sfd.c
-index 9517d8cb1..b638fe447 100644
---- a/fontforge/sfd.c
-+++ b/fontforge/sfd.c
-@@ -8104,7 +8104,9 @@ bool SFD_GetFontMetaData( FILE *sfd,
-     }
-     else if ( strmatch(tok,"StyleMap:")==0 )
-     {
--    gethex(sfd,(uint32 *)&sf->pfminfo.stylemap);
-+	uint32 u;
-+	gethex(sfd,&u);
-+	sf->pfminfo.stylemap = u;
-     }
-     /* Legacy attribute for StyleMap. Deprecated. */
-     else if ( strmatch(tok,"OS2StyleName:")==0 )
--- 
-2.26.0.rc2
-
diff --git a/media-gfx/fontforge/files/20200314-tilepath.patch b/media-gfx/fontforge/files/20200314-tilepath.patch
deleted file mode 100644
index 1e0d077532a4..000000000000
--- a/media-gfx/fontforge/files/20200314-tilepath.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 43e6087ec9bdbb23b8bb61c07efe6490fab23d73 Mon Sep 17 00:00:00 2001
-From: skef <6175836+skef@users.noreply.github.com>
-Date: Thu, 19 Mar 2020 17:16:20 -0700
-Subject: [PATCH] Tilepath fix (#4231)
-
----
- fontforgeexe/tilepath.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fontforgeexe/tilepath.c b/fontforgeexe/tilepath.c
-index b329b54098..2575058eb4 100644
---- a/fontforgeexe/tilepath.c
-+++ b/fontforgeexe/tilepath.c
-@@ -571,7 +571,7 @@ static void AdjustPoint(TD *td,Spline *spline,bigreal t, FitPoint *to) {
- 	} else {
- 	    bigreal s=(dy1*dx2/dy2-dx1);
- 	    if ( s>-.00001 && s<.00001 ) {	/* essentially parallel */
--		to->p.x = x1; to->y = y1;
-+		to->p.x = x1; to->p.y = y1;
- 	    } else {
- 		bigreal t1 = (x1-x2- dx2/dy2*(y1-y2))/s;
- 		to->p.x = x1 + dx1*t1;
-@@ -610,7 +610,7 @@ static SplinePoint *TDMakePoint(TD *td,Spline *old,real t) {
- 
-     AdjustPoint(td,old,t,&fp);
-     new = chunkalloc(sizeof(SplinePoint));
--    new->me.x = tp.p.x; new->me.y = tp.p.y;
-+    new->me.x = fp.p.x; new->me.y = fp.p.y;
-     new->nextcp = new->me;
-     new->prevcp = new->me;
-     new->nonextcp = new->noprevcp = true;
diff --git a/media-gfx/fontforge/files/fontforge-20200314-freetype-2.10.3.patch b/media-gfx/fontforge/files/fontforge-20200314-freetype-2.10.3.patch
deleted file mode 100644
index 0a07423ab626..000000000000
--- a/media-gfx/fontforge/files/fontforge-20200314-freetype-2.10.3.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-https://bugs.gentoo.org/753788
-https://github.com/fontforge/fontforge/commit/7837530190a3b666109ba4eb9b3b76f09799057c
-----
-From 7837530190a3b666109ba4eb9b3b76f09799057c Mon Sep 17 00:00:00 2001
-From: Jeremy Tan <jtanx@outlook.com>
-Date: Tue, 3 Nov 2020 21:27:26 +1100
-Subject: [PATCH] Fix FreeType debugger compilation with FreeType >= 2.10.3
-
-Fixes #4477
----
- fontforge/fffreetype.h  | 4 +++-
- fontforgeexe/cvdebug.c  | 4 +++-
- fontforgeexe/cvdgloss.c | 4 +++-
- 3 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/fontforge/fffreetype.h b/fontforge/fffreetype.h
-index 7757b7bf3b..11070fc916 100644
---- a/fontforge/fffreetype.h
-+++ b/fontforge/fffreetype.h
-@@ -39,7 +39,9 @@
- #endif
- 
- #if defined(FREETYPE_HAS_DEBUGGER)
--# include <internal/internal.h>
-+#if FREETYPE_MAJOR == 2 && (FREETYPE_MINOR < 10 || (FREETYPE_MINOR == 10 && FREETYPE_PATCH < 3))
-+#  include <internal/internal.h>
-+# endif
- # include <ttdriver.h>
- # include <ttinterp.h>
- # include <ttobjs.h>
-diff --git a/fontforgeexe/cvdebug.c b/fontforgeexe/cvdebug.c
-index 9fb7db6112..a891902a06 100644
---- a/fontforgeexe/cvdebug.c
-+++ b/fontforgeexe/cvdebug.c
-@@ -59,7 +59,9 @@ void CVDebugPointPopup(CharView *cv) {
- #include <ft2build.h>
- #include FT_FREETYPE_H
- 
--#include <internal/internal.h>
-+#if FREETYPE_MAJOR == 2 && (FREETYPE_MINOR < 10 || (FREETYPE_MINOR == 10 && FREETYPE_PATCH < 3))
-+# include <internal/internal.h>
-+#endif
- #include <ttinterp.h>
- 
- # define PPEMX(exc)	((exc)->size->root.metrics.x_ppem)
-diff --git a/fontforgeexe/cvdgloss.c b/fontforgeexe/cvdgloss.c
-index 33cc5c71e1..c1ad97790b 100644
---- a/fontforgeexe/cvdgloss.c
-+++ b/fontforgeexe/cvdgloss.c
-@@ -42,7 +42,9 @@ extern GBox _ggadget_Default_Box;
- #include <ft2build.h>
- #include FT_FREETYPE_H
- 
--#include <internal/internal.h>
-+#if FREETYPE_MAJOR == 2 && (FREETYPE_MINOR < 10 || (FREETYPE_MINOR == 10 && FREETYPE_PATCH < 3))
-+# include <internal/internal.h>
-+#endif
- #include <ttinterp.h>
- 
- #define PPEMX(exc)	((exc)->size->root.metrics.x_ppem)
diff --git a/media-gfx/fontforge/fontforge-20200314.ebuild b/media-gfx/fontforge/fontforge-20200314.ebuild
deleted file mode 100644
index 3572b345a24f..000000000000
--- a/media-gfx/fontforge/fontforge-20200314.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2004-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit python-single-r1 xdg cmake
-
-DESCRIPTION="postscript font editor and converter"
-HOMEPAGE="https://fontforge.org/"
-SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforge-${PV}.tar.xz"
-
-LICENSE="BSD GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode woff2 X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/libltdl:0
-	dev-libs/libxml2:2=
-	>=media-libs/freetype-2.3.7:2=
-	gif? ( media-libs/giflib:0= )
-	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0= )
-	truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] )
-	gtk? ( >=x11-libs/gtk+-3.10:3 )
-	!gtk? (
-		X? (
-			>=x11-libs/cairo-1.6:0=
-			>=x11-libs/pango-1.10:0=[X]
-			x11-libs/libX11:0=
-			x11-libs/libXi:0=
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	unicode? ( media-libs/libuninameslist:0= )
-	woff2? ( media-libs/woff2:0= )
-"
-DEPEND="${RDEPEND}
-	!gtk? ( X? ( x11-base/xorg-proto ) )
-"
-BDEPEND="
-	sys-devel/gettext
-	doc? ( >=dev-python/sphinx-2 )
-	python? ( ${PYTHON_DEPS} )
-	test? ( ${RDEPEND} )
-"
-
-PATCHES=(
-	"${FILESDIR}"/20200314-stylemap.patch
-	"${FILESDIR}"/20200314-tilepath.patch
-	"${FILESDIR}"/20200314-big-endian.patch
-	"${FILESDIR}"/fontforge-doc-no-warn-error.patch
-	"${FILESDIR}"/20200314-MacServiceReadFDs.patch
-	"${FILESDIR}"/${P}-freetype-2.10.3.patch
-)
-
-pkg_setup() {
-	:
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DOCS=$(usex doc ON OFF)
-		-DENABLE_LIBGIF=$(usex gif ON OFF)
-		-DENABLE_LIBJPEG=$(usex jpeg ON OFF)
-		-DENABLE_LIBPNG=$(usex png ON OFF)
-		-DENABLE_LIBREADLINE=$(usex readline ON OFF)
-		-DENABLE_LIBSPIRO=OFF # No package in Gentoo
-		-DENABLE_LIBTIFF=$(usex tiff ON OFF)
-		-DENABLE_LIBUNINAMESLIST=$(usex unicode ON OFF)
-		-DENABLE_MAINTAINER_TOOLS=OFF
-		-DENABLE_PYTHON_EXTENSION=$(usex python ON OFF)
-		-DENABLE_PYTHON_SCRIPTING=$(usex python ON OFF)
-		-DENABLE_TILE_PATH=ON
-		-DENABLE_WOFF2=$(usex woff2 ON OFF)
-	)
-
-	if use gtk || use X; then
-		mycmakeargs+=(
-			-DENABLE_GUI=ON
-			# Prefer GTK over X11 if both USE flage are enabled
-			-DENABLE_X11=$(usex gtk OFF ON)
-		)
-	else
-		mycmakeargs+=( -DENABLE_GUI=OFF )
-	fi
-
-	if use python; then
-		python_setup
-		mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
-	fi
-
-	if use truetype-debugger ; then
-		local ft2="${ESYSROOT}/usr/include/freetype2"
-		local ft2i="${ft2}/internal4fontforge"
-		mycmakeargs+=(
-			-DENABLE_FREETYPE_DEBUGGER="${ft2}"
-			-DFreeTypeSource_INCLUDE_DIRS="${ft2};${ft2i}/include;${ft2i}/include/freetype;${ft2i}/src/truetype"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	docompress -x /usr/share/doc/${PF}/html
-	einstalldocs
-	find "${ED}" -name '*.la' -type f -delete || die
-}
diff --git a/media-gfx/fontforge/fontforge-20201107.ebuild b/media-gfx/fontforge/fontforge-20201107.ebuild
index 47fd33f66d96..f7295ecb2741 100644
--- a/media-gfx/fontforge/fontforge-20201107.ebuild
+++ b/media-gfx/fontforge/fontforge-20201107.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforg
 
 LICENSE="BSD GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode woff2 X"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index 1521a79097d9..62375eabab90 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,5 +1,8 @@
 AUX fotoxx-15.05-docdir.patch 395 BLAKE2B b0fb1bdd0e56f29569b49ca6b6d2acd205a1272924ab955d5778ffb7150400193ee12052a169ee9a2e0e07dd6b40c0ccb0f62e84463c651577447d32109fa273 SHA512 9204f4712ced994b22137b8f5fc80976120835ea5bde14b5caaa5db604b10de7a7b6ea743333603a1887a8012d806a5af8cf0ffea26f8ea8eb74d228fb822c1e
 AUX fotoxx-15.05-gcc-11.patch 925 BLAKE2B ac27fa95bc877b66607f5aca75c44462c0a8c39ee3acc117c9f6949a9d4975728156470dc04dce9b8a95582c72e5c236b68e4d2f01508246bdef0ac23b087621 SHA512 19801bf47e796953d148a12cdeb1eb5dbac23f4d54b41782923c61096f9dabf791b6d7afbc529f2c4214f940d83ba6807816afb0f8303b3ab514330bc01dfb63
+AUX fotoxx-21.40-documentation.patch 1511 BLAKE2B da0443a6b1ff8684e43005239f0184c742cd59727e3c55460713680b14b5d39ba528b7a17a87b893a9585824f1e402b5f46bbe45451dd8888b62d1752524db44 SHA512 d0f79f986b605c3f981de99c533f57a60aac47844d1434482e507a7e7e4d2be2b581419e211f034213c7c23db0e56f4fe5d789f39624a33aee283c8b8a489509
 DIST fotoxx-15.05.tar.gz 3573278 BLAKE2B 0a7f564b2a31cf7db131d8a09a8624f087b7a5beb377949843d99d5933d5b16fb270177fe233f943af7f26753fffc6a52a5a5feea18c065f0dd99a74256a33f0 SHA512 07155e5f32c0ada33dd95de333a4a124c9fc56b3807bb2edc2b078f0eab37968f374f84701bb8ce9b200f00ed4587c83f772899ba39527378d3527050960ac0e
+DIST fotoxx-21.40.tar.gz 8583921 BLAKE2B 63e49768c6d5941fe4259f83aef4ce8d0e19498c1090e4eb5017337f184edb0c60939323cc6481efcf72d0544347e046c94e37619e1f466b6dde0ab0919c3792 SHA512 05db14fafd8187bcb1de1576ca445fe525e895089fe670a80f890b2c525f5424fabd751ea422a5cc266cc7e8175ecaf7800b97a5ad686ea3e4e482de78190f3b
 EBUILD fotoxx-15.05.ebuild 1199 BLAKE2B deaad80fe616d8691961775ca86ac57c93fad6920a5f7bd46b97163ec83f7d8450bb7d3d5b925b26402c9817be6d8c94b7ab365bb649093a5db6a3f34c30615b SHA512 cb0117567b401365354eb10b3554363afa48400f6b4412468897fca144921c849be45d7839eb47dcdae25dd4488fac212b1ba1370fa31fde88f25c2859dbd57d
-MISC metadata.xml 773 BLAKE2B 75c03d8cf914e9aeb25db837d5e945908082d8711b19fbeb8694371ebb8c2ff6c69088dd4c887ce4f29eb456e2f412f6d992ac04c447a31e814838dbf5932aa1 SHA512 1fbf87c22810a242a8d7f0e91e6ee6bcb6b1a08cb39c3e827171e110bdcc5468a2440c42d56f1630860555a54fee0133483d8551dac164492bb630fcb45c7cc8
+EBUILD fotoxx-21.40.ebuild 2262 BLAKE2B 5716c0160390c9ca7efb4b12208249d96ffb6751220d4153bbb428927e279842d1a8cacef93524ab46b326a64193c248966711fa0bbda551d836bbde85c624ac SHA512 7fb41c1418894314bbc8e5b06101ed27d3231d245cbfa8366bdb3bcd28a310e673c2cfdfca4be2c3900e6ae6a3bdc42359f383e619f03d54e529c7cf9dc14918
+MISC metadata.xml 850 BLAKE2B 463cae7d8df56ad93adaf7fbb4cf31f2838452e1349e61175c9981db4e95cc506b992cba2876885f8e949061808300752ef5806e9a096647f769bca654cca8e9 SHA512 e5c38d8602a52ae25bf90990136a98b57f69701cea70d4762f6102dc791f97b134853f7321894d1fbbbfdd353cebad7afa27cb56373f256d9497c3600d66d19e
diff --git a/media-gfx/fotoxx/files/fotoxx-21.40-documentation.patch b/media-gfx/fotoxx/files/fotoxx-21.40-documentation.patch
new file mode 100644
index 000000000000..523c640cc001
--- /dev/null
+++ b/media-gfx/fotoxx/files/fotoxx-21.40-documentation.patch
@@ -0,0 +1,33 @@
+diff -ur a/Makefile b/Makefile
+--- a/Makefile	2021-04-08 10:05:46.064519573 -0500
++++ b/Makefile	2021-04-08 10:51:26.906128397 -0500
+@@ -97,6 +97,7 @@
+ 
+ zfuncs.o: zfuncs.cc  zfuncs.h
+ 	$(CXX) zfuncs.cc $(CFLAGS)                   \
++	-D DOCDIR=\"$(DOCDIR)\"                      \
+ 
+ # install application files in standard locations
+ PREFIX ?= /usr
+@@ -122,8 +123,7 @@
+ 	cp -f -R  data/* $(DESTDIR)$(DATADIR)
+ 	cp -f -R  images/* $(DESTDIR)$(IMAGEDIR)
+ 	# man page  (21.29) 
+-	gzip -fk -9 man/fotoxx.man
+-	mv -f man/fotoxx.man.gz $(DESTDIR)$(MANDIR)/fotoxx.1.gz
++	cp man/fotoxx.man $(DESTDIR)$(MANDIR)/fotoxx.1
+ 	# desktop file and icon
+ 	cp -f fotoxx.desktop $(DESTDIR)$(MENUDIR)
+ 	cp -f fotoxx.png $(DESTDIR)$(ICONDIR)
+diff -ur a/zfuncs.cc b/zfuncs.cc
+--- a/zfuncs.cc	2021-04-08 10:05:46.062519630 -0500
++++ b/zfuncs.cc	2021-04-08 11:09:07.977258807 -0500
+@@ -5615,7 +5615,7 @@
+ 
+    strncatv(zdatadir,199,zprefix,"/share/",zappname,"/data",null);               //  /prefix/share/appname/data
+    strncatv(zimagedir,199,zprefix,"/share/",zappname,"/images",null);            //  /prefix/share/appname/images
+-   strncatv(zdocdir,199,zprefix,"/share/doc/",zappname,null);                    //  /prefix/share/doc/appname
++   strncatv(zdocdir,199,zprefix,"/share/doc/",zappvers,null);                    //  /prefix/share/doc/appname
+    
+    ch_time = zstrdup(build_date_time,"zinitapp");
+    if (ch_time[4] == ' ') ch_time[4] = '0';                                      //  replace month day ' d' with '0d'
diff --git a/media-gfx/fotoxx/fotoxx-21.40.ebuild b/media-gfx/fotoxx/fotoxx-21.40.ebuild
new file mode 100644
index 000000000000..12a78336fe75
--- /dev/null
+++ b/media-gfx/fotoxx/fotoxx-21.40.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature xdg-utils
+
+DESCRIPTION="Program for improving image files made with a digital camera"
+HOMEPAGE="https://kornelix.net/fotoxx/fotoxx.html"
+SRC_URI="https://kornelix.net/downloads/downloads/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# For required dependencies read doc/README, for required tools read
+# data/userguide [INSTALLATION]. xdg-open (x11-misc/xdg-utils) is an
+# alternative to firefox and chromium-browser. `grep '"which ' * -R`
+# is helpful to report some required tools run via the shell.
+
+DEPEND="
+	media-libs/clutter
+	media-libs/clutter-gtk
+	media-libs/lcms:2
+	media-libs/libpng:0
+	media-libs/tiff:0
+	media-libs/libchamplain[gtk]
+	virtual/jpeg
+	x11-libs/gtk+:3"
+RDEPEND="
+	${DEPEND}
+	media-gfx/dcraw
+	media-libs/exiftool
+	x11-misc/xdg-utils
+"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}/${PN}-21.40-documentation.patch" )
+
+DOCS=()
+HTML_DOCS=()
+
+src_prepare() {
+	sed -i -e "/^DOCDIR/ s/${PN}$/${PF}/" Makefile || die
+	default
+}
+
+src_install() {
+	# For the Help menu items to work, *.html must be in /usr/share/doc/${PF},
+	# and README, changelog, copyright, license, etc. must not be compressed.
+	emake DESTDIR="${D}" install
+	rm -f "${D}"/usr/share/doc/${PF}/*.man || die
+	docompress -x /usr/share/doc
+}
+
+pkg_postinst() {
+	optfeature "HEIC file support" media-libs/libheif
+	optfeature "additional RAW file support" media-gfx/rawtherapee
+	optfeature "additional RAW file support" media-gfx/darktable
+	optfeature "video thumbnails & playback" media-video/ffmpeg
+	optfeature "copying images to optical media" app-cdr/dvd+rw-tools
+	optfeature "additional panorama support" media-gfx/hugin
+	optfeature "WEBP file support" media-libs/libwebp
+
+	elog
+	elog "Please read the Help > User Guide for details. The source location is"
+	elog "/usr/share/fotoxx/data/userguide and after running fotoxx a copy will"
+	elog "be placed at /home/<user>/.fotoxx/userguide."
+	elog
+	elog "To play videos, in Tools > Preferences set 'Video File Play Command'."
+	elog
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-gfx/fotoxx/metadata.xml b/media-gfx/fotoxx/metadata.xml
index d1ae72d9d648..0efacfdbf8d9 100644
--- a/media-gfx/fotoxx/metadata.xml
+++ b/media-gfx/fotoxx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>bkohler@gentoo.org</email>
+		<name>Ben Kohler</name>
+	</maintainer>
 	<longdescription lang="en">
 		Navigate a large image collection using a thumbnail browser.
 		Import camera RAW files and edit with 16-bit color.
diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest
index 3ce13ff752fc..1563e850ae2f 100644
--- a/media-gfx/freewrl/Manifest
+++ b/media-gfx/freewrl/Manifest
@@ -1,5 +1,5 @@
 AUX freewrl-3.0.0-fno-common.patch 223 BLAKE2B 007d3fcb08acc5da859d28564e54558394a3f5fd23c1662e9d39e3c6d50c03cc5b024f7e4b72cdd6000249a67250a5c70e070c85d7e4f26e312e97a0895df54b SHA512 538bb6a1afdf7103e6ecc01dbd7005e33c14c01437f9c3666e1749bba8612c7cdb998bb4fb4e8d9e22663be97dfa991ac68a3e269c0817d71df8da54a5e417af
 DIST freewrl-3.0.0.tar.bz2 1567282 BLAKE2B 84bf924ce51d70aca0baa504dba0726af82b3d2ff93de87bd18ab772f6bdbcc50807a496c14264006894b6c52bfe9844e672412162f3df1107453fa1f8b066a3 SHA512 12e75c6891238fbc9c750a9449c8a6a9f4b86124ac12871adbfb3c68b7ef09f35d3709dcb63693e50f8ac824170aef3b97854a72de0b324e67fbbb7c081675a0
-EBUILD freewrl-3.0.0-r1.ebuild 4460 BLAKE2B 3128a4878d9de0684195cf958a55e3bc4ce5b4ca09268953fd798daeb65557b0face9703e005b39ed82ae47cb47058cc9429a6dac356ad97f2be5a71e33e62b0 SHA512 b46d091ddc13e80d13a47c96bbf7c9658582da825c3b2e1912abe8618167158b2d205257e05bfbb76ecee700220824440d15cc1016cab62e4f9c45b779ca3964
-EBUILD freewrl-9999.ebuild 4475 BLAKE2B cb6bb434408a491065a616020bc46940496996a2f3087eb7f035dab0b783024f408c4f314441b6ece02e9d957f0e51e565331597983fac527358e2851da9516d SHA512 f2fecd0bcb9f98a3ff3ed774ab6bd75be3e24f3cdf3dfe89ae4ac17e690425c97612f16cb91394cfb17f95195e387c7cade1600680c5d1b2b9b76a65a600c1c5
+EBUILD freewrl-3.0.0-r1.ebuild 4476 BLAKE2B 80bd01f1a801d177fb4db154611037dc51e05809ae47d139936dbc74f9f53a60a5d5f56704a2222df8ac71b9621113bf1e1bfe7f4b2bea6555217d99032a6275 SHA512 3dab57e3c992fffbb27a70f87ff762330077579952e7d3dd36a2b1db56405213c8423013ea8f4054e5588208c449213f547488349f16335d16b100c188885fd3
+EBUILD freewrl-9999.ebuild 4490 BLAKE2B a3d0c2830ef600d27162fc568dfe54a41c708e6675e5ad9387c884d7f83fb615b7c19b4e7ece397558b000a1fd8e7333ec44f576f6a664db3564c6d9d65beb3a SHA512 1c7ba90270113d7ba20b5e1f919bd008d5a1da91158cee7d3667238c288090d02ff274a68d0aa2691ca7439914cd09c336d807c932cff5b687c9d0ab9dcf74a4
 MISC metadata.xml 1302 BLAKE2B eb8522dbaadd9c9ebc8d3b5e03072fc7b57f6d87046f52104985a5e0e8f40669b53906921286d1d2c79e393853cac4c88f5a351c7bd0c38e3b9905308c0a890e SHA512 f7581007975722b3d16cf349c55ab67b5cf92a47316399adefb38a9413669f544c9fa5cc922f02f5a7473d4570d884d561dc8ef397347eca80494964f2f4faf0
diff --git a/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild b/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild
index b7a8547435d6..545457a35528 100644
--- a/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild
+++ b/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild
@@ -3,13 +3,12 @@
 
 EAPI=5
 
-inherit autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib
+inherit autotools nsplugins epatch java-pkg-opt-2 multilib toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.code.sf.net/p/freewrl/git"
 	S="${WORKDIR}/${P}/freex3d"
-	SRC_URI=
 else
 	SRC_URI="mirror://sourceforge/freewrl/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
@@ -17,6 +16,7 @@ fi
 
 DESCRIPTION="VRML97 and X3D compliant browser, library, and web-browser plugin"
 HOMEPAGE="http://freewrl.sourceforge.net/"
+
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="curl debug java libeai motif +nsplugin opencl osc +sox static-libs"
@@ -85,8 +85,8 @@ src_configure() {
 			JAVASCRIPT_ENGINE_LIBS="-ljs"
 		fi
 		if has_version "dev-lang/spidermonkey:0[threadsafe]" ; then
-			JAVASCRIPT_ENGINE_CFLAGS+=" -DJS_THREADSAFE $(pkg-config --cflags nspr)"
-			JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) ${JAVASCRIPT_ENGINE_LIBS}"
+			JAVASCRIPT_ENGINE_CFLAGS+=" -DJS_THREADSAFE $($(tc-getPKG_CONFIG) --cflags nspr)"
+			JAVASCRIPT_ENGINE_LIBS="$($(tc-getPKG_CONFIG) --libs nspr) ${JAVASCRIPT_ENGINE_LIBS}"
 		fi
 		export JAVASCRIPT_ENGINE_CFLAGS
 		export JAVASCRIPT_ENGINE_LIBS
@@ -135,9 +135,9 @@ src_install() {
 
 pkg_postinst() {
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
-	elog "By default, FreeWRL expects to find the 'firefox' binary in your include"
-	elog "path.  If you do not have firefox installed or you wish to use a different"
-	elog "web browser to open links that are within VRML / X3D files, please be sure to"
-	elog "specify the command via your BROWSER environment variable."
+		elog "By default, FreeWRL expects to find the 'firefox' binary in your include"
+		elog "path.  If you do not have firefox installed or you wish to use a different"
+		elog "web browser to open links that are within VRML / X3D files, please be sure to"
+		elog "specify the command via your BROWSER environment variable."
 	fi
 }
diff --git a/media-gfx/freewrl/freewrl-9999.ebuild b/media-gfx/freewrl/freewrl-9999.ebuild
index 0f77fc735ce4..3e3d9594c1e4 100644
--- a/media-gfx/freewrl/freewrl-9999.ebuild
+++ b/media-gfx/freewrl/freewrl-9999.ebuild
@@ -3,14 +3,13 @@
 
 EAPI=5
 
-inherit autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib
+inherit autotools nsplugins epatch java-pkg-opt-2 multilib toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.code.sf.net/p/freewrl/git"
 	EGIT_BRANCH="develop"
 	S="${WORKDIR}/${P}/freex3d"
-	SRC_URI=
 else
 	SRC_URI="mirror://sourceforge/freewrl/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
@@ -86,8 +85,8 @@ src_configure() {
 			JAVASCRIPT_ENGINE_LIBS="-ljs"
 		fi
 		if has_version "dev-lang/spidermonkey:0[threadsafe]" ; then
-			JAVASCRIPT_ENGINE_CFLAGS+=" -DJS_THREADSAFE $(pkg-config --cflags nspr)"
-			JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) ${JAVASCRIPT_ENGINE_LIBS}"
+			JAVASCRIPT_ENGINE_CFLAGS+=" -DJS_THREADSAFE $($(tc-getPKG_CONFIG) --cflags nspr)"
+			JAVASCRIPT_ENGINE_LIBS="$($(tc-getPKG_CONFIG) --libs nspr) ${JAVASCRIPT_ENGINE_LIBS}"
 		fi
 		export JAVASCRIPT_ENGINE_CFLAGS
 		export JAVASCRIPT_ENGINE_LIBS
@@ -137,9 +136,9 @@ src_install() {
 
 pkg_postinst() {
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
-	elog "By default, FreeWRL expects to find the 'firefox' binary in your include"
-	elog "path.  If you do not have firefox installed or you wish to use a different"
-	elog "web browser to open links that are within VRML / X3D files, please be sure to"
-	elog "specify the command via your BROWSER environment variable."
+		elog "By default, FreeWRL expects to find the 'firefox' binary in your include"
+		elog "path.  If you do not have firefox installed or you wish to use a different"
+		elog "web browser to open links that are within VRML / X3D files, please be sure to"
+		elog "specify the command via your BROWSER environment variable."
 	fi
 }
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index f2aa82b3b072..3b4a961762c7 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,7 +1,8 @@
 AUX geeqie-1.5.1-no_common.patch 2168 BLAKE2B 3949807b4bdd99a9283ca1ff1108fbfcc6cc034d56339875bf1d65513461ccd2da447c4923e5c1c0c14af8f204503c8b2fa72bce4faa4e270a8309cae2fd75e1 SHA512 3198780bc3840691cf2239fdf8d963bb9ead90b38fdf32d4276bd55c70fbb69d0e88f55ed901990c50907dde5b242e0f1af96ca6733ccb767b9e5e2d82ffeda9
+AUX geeqie-1.6-yelp.patch 1044 BLAKE2B be5523c05bf0bc9a416b843a3fea8f5722272e138540ac7e1f4cdbafcf585c1357d07877c14a3dea2209f0206114b45aa4c45410e471bf5604df1be4b8553570 SHA512 fd5d11655ff788d7fb138db8f9cdce3dc9111888e0c2e37b31f9e07c956ab21f9952fd31deccb514a258426382c8c0a0de716e4cde254f4f0f4349793c119445
 DIST geeqie-1.5.1.tar.xz 1587116 BLAKE2B f8742a88eefd90fb1e7e1d1365058cef190b6231fcb001faa9f110676e8403c8e5959f9af398d6fa1ddc4e4c62439728904c6c39f5095f476014a5b7b74b4d16 SHA512 265eade90afe45856855e856c5f640786ca2e3add57c3ade8ca380d075297f96bf44c6e0c4fd6eabbc2666a37f898b50d37dd2e01d77875b8a622d72d8a0e6ac
 DIST geeqie-1.6.tar.xz 1693488 BLAKE2B ee5369884c4c0e60fe827d43ef336c5aaa89d55aec8905bb8cdd4edb2ee12e15d525577a3c85403e2e8955a08c817007b72d1d1e3614063377a21aaba317acee SHA512 4acd05c6012c80581e9c594c7dc7d12265528aa8d3868afef9def36798945afb851da9376bbe5f205ac3c5e1e2362188cc0e2891b49f3ea4396bbc6974c143ef
 EBUILD geeqie-1.5.1-r1.ebuild 2280 BLAKE2B 9653c0f0ac69e5a18812a86534e5ff6025e754545f2d53e3f06e538f59a600c98b27fff34f425e1d342a3c0ac8ef229f58ef8da99b9cd4c5f1f54e91246eead9 SHA512 26a4d709e1c8c6f3a6db159d4e912def9ce7ed7cb7a7d1a261d2428b46440aad882d450b1f8d54f513fd02a1f637bd0328403c9c143281b889dc3f34dfca7a31
-EBUILD geeqie-1.6.ebuild 2235 BLAKE2B cf7aff0c366ba4399c5f6622bdb6d1d5c9e74fbd8b29be0526d12a24ce8a577fc160c0388f4c5718bef6ca91cf0070e03a8c32aadea7fd3841eba2e202dcaf93 SHA512 3ba5b3cca3da8b7d14560628983d2a39650cd714df97295ef809f573aa9789f92db3966a517760d5806b4482abf3294d4922c25d2c81d6d36512dc5aaa9bd53b
+EBUILD geeqie-1.6.ebuild 2278 BLAKE2B 73e0b1ea05b4b92f7408bbb7dc12cfaa555eb7210a0235d1ce7a039c1b68be65615479975bbabf3809b76f6f562e8e9eb3b542359c6f0223fc449cf8a82fdd5e SHA512 74f04c2ccc000a26a6c649703275fb1efdc9101aa0b9c3c88500c4978b68bc8fabea61a669ba288c0dab36d22ae0d393e9dbcb955f1088e88adbd37a92c9f6f5
 EBUILD geeqie-9999.ebuild 2330 BLAKE2B 5663c258cc045098f835f35484648755e87b7223f4caee2bacc746c78bbeaa683e3fa5b7ad8bef4198853bb1628c09e103df94e8d0a98b2961d2a1a36fbbc104 SHA512 e911efd079f9b6c8455302d2f02f55de4050ecda2a17beb2ab945753c8e1c6ce0fb1947f107e4218354441b912970d5687c0ac5c72b5e87346dfc06668a6c2b2
 MISC metadata.xml 923 BLAKE2B 49de6dd7b0380b1cc74ccabbc8f84e2c55144b80612e04c4e55c82d052027882cc293a70a52f857bded73246ccbb5351df53dc1e1e08b8c2c08e630bc24f9882 SHA512 752280a5fefc097c5ca8b1fc2e9f05220aa809e45484560edca7baa68d95b0d91fa14973c321aefcdb76052dc02e405e2fb4a32e6322f04cd8223afaa6734d58
diff --git a/media-gfx/geeqie/files/geeqie-1.6-yelp.patch b/media-gfx/geeqie/files/geeqie-1.6-yelp.patch
new file mode 100644
index 000000000000..e1d7797d1d50
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-1.6-yelp.patch
@@ -0,0 +1,25 @@
+From a33d8c40e9e56597f68e83be3336036992996738 Mon Sep 17 00:00:00 2001
+From: Matthew Miller <mattdm@mattdm.org>
+Date: Thu, 8 Apr 2021 20:21:39 -0400
+Subject: [PATCH] Fix doc building with newer yelp
+
+This adds `-i`, because otherwise it will complain about missing files (which
+we copy into place later), and adds a trailing slash to the output directory,
+because `yelp-build` now puts the files into the wrong place otherwise.
+---
+ doc/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 3d044bd8..78b96233 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -7,7 +7,7 @@ EXTRA_DIST = docbook2html.sh docbook icons
+ html/GuideIndex.html: docbook/GuideIndex.xml
+ 	rm -rf html; mkdir html; cp $(srcdir)/icons/* html/
+ 	if [ -x "$(GNOME_DOC_TOOL)" ]; then \
+-		"$(GNOME_DOC_TOOL)" html -o html $(srcdir)/docbook/GuideIndex.xml ; \
++		"$(GNOME_DOC_TOOL)" html -i -o html/ $(srcdir)/docbook/GuideIndex.xml ; \
+ 	else \
+ 		echo "yelp-tools not found, html is not built" ; \
+ 	fi
diff --git a/media-gfx/geeqie/geeqie-1.6.ebuild b/media-gfx/geeqie/geeqie-1.6.ebuild
index 39216c027930..1ba491ef5cd1 100644
--- a/media-gfx/geeqie/geeqie-1.6.ebuild
+++ b/media-gfx/geeqie/geeqie-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,6 +42,8 @@ REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
 	gpu-accel? ( gtk3 )
 	map? ( gpu-accel )"
 
+PATCHES=( "${FILESDIR}"/${P}-yelp.patch )
+
 src_prepare() {
 	default
 
diff --git a/media-gfx/gimageview/Manifest b/media-gfx/gimageview/Manifest
index 82ca3edacba9..f091811dee8c 100644
--- a/media-gfx/gimageview/Manifest
+++ b/media-gfx/gimageview/Manifest
@@ -3,5 +3,5 @@ AUX gimageview-0.2.27-gtk2.patch 624 BLAKE2B cd23a3c07bb885010fc01a0cc211ab12b93
 AUX gimageview-0.2.27-libpng15.patch 601 BLAKE2B fb97fa8cc84927f03df462ec09d3a312e06dd2b5554e0c62c90e739f72917dd479f1d2ec3cf50d5d4e1f558cbab1a1eb221a150940efa1494c9239b6e9aa086a SHA512 390bf474bbf300cbd9c18ec3475769185f16226dfdb9389f62cd6e60bf33529009de68ee8bf387f690fc6a9e87f315f022f4f0b2fb6ef6ebfcdf49d96b5c49f9
 AUX gimageview-0.2.27-sort_fix.diff 714 BLAKE2B 2ea9e8eba6a0253bb4990b083e00013f40eb049028f0ecd700bd56193400ec6ef366d4c2360beea5b3314df2ea207cf782c1bc6e32221a3e73a83f9e92d94a23 SHA512 ab3ce0f2bb9b4c1d52d05c78db4d42fa2e77e7a5d7655b82a036279c9049de609dedebdea8422596ebf91080e91ac6ce42babb4aaf22877ec3dc808cfc37a3ea
 DIST gimageview-0.2.27.tar.gz 1348286 BLAKE2B 51538af8bdc85243e825e58b6bbefa285bdefad95b05228e08a8500a5fc9f7036a53f931689543a30841f9cbd54ad4576fbf5a29dd79d7b1f05f07cdaa8c9aa7 SHA512 36ac16f4fffcde34b608da35aa089d40225129a2f9dcd70cb024713738842600c7231522093b3d0bf5a7c4c4dcb7ba4b14d550e417e8b52030d43d4b51145220
-EBUILD gimageview-0.2.27-r4.ebuild 1739 BLAKE2B 4cdab9a02f7a1c145e05c3b66d8cb686b936bf9cd1be776c9d60c93a0d99d6743ece899044c9aceaea3c317dd37091b7b5974462dfd32530c3f32beb0a01edff SHA512 d4da7255f9981dcc850e76b94bc3cbe7cee8875e3dd346fb9fbdcb59fcc8d1a656340e88d9fd3ab1e01bfd9d2845b373a50e33af4444ba056b7d7fb48f29dc0b
+EBUILD gimageview-0.2.27-r4.ebuild 1739 BLAKE2B fd6828bdd7bb7f453414449b107cdd7efd2945e56a58cad20495718589612431fa7f55aa451acc476edfd12039e285396c1f69af25431678d0460e83ab0ab3ed SHA512 7a06d43a74b5b767d47bc0967f697e6f1a15f9e42b5b4b278090a5b8f0ecd12981f03acda22a07b6d5c5d14776aa71f052026d89a929e5492ccb6b3f76b885b1
 MISC metadata.xml 248 BLAKE2B 73b24d9b798f81fcb841c813142b07b7fe872ff2c9dd6a51f7d205dbf4b3f6b9b1c975d22fa265f2749361f4bb058ecf90d8525c36ba28e6f32c3855599a8333 SHA512 61a3b73ed8a3baeb3886b73a3c578eece805577d7708771b09ac4c82ab8cd8c08c65ee185fb1eba8b4ad3c79442b4e769bc9c72a60ba9a6f9438623360058a1a
diff --git a/media-gfx/gimageview/gimageview-0.2.27-r4.ebuild b/media-gfx/gimageview/gimageview-0.2.27-r4.ebuild
index ed176aa16b3a..4af34c5a9f87 100644
--- a/media-gfx/gimageview/gimageview-0.2.27-r4.ebuild
+++ b/media-gfx/gimageview/gimageview-0.2.27-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO: USE xine could be restored if support for xine-lib-1.2.x
@@ -6,7 +6,7 @@
 
 EAPI=6
 
-inherit eutils libtool ltprune
+inherit epatch libtool ltprune
 
 DESCRIPTION="Powerful GTK+ based image & movie viewer"
 HOMEPAGE="http://gtkmmviewer.sourceforge.net/"
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 642fd41afbef..81cce9710ac6 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,8 +1,10 @@
 AUX gimp-2.10_fix_test-appdata.patch 902 BLAKE2B 2b1a131d874d65422d8bdd44732b9843d89a570a1ea3c058cdb2a424a7791c686aa0e2ae2a0b472f333f2465f6e1a26750a532e9003933c5dffa1af32343c1dc SHA512 2983e8572f5e8113c9e2f564d31c1a5fe7e11ef273c50d2be739089124c6ec1a457da28222020bbd6015b2cbbcbf403b88d8660b9b35241800deb4fb3ad79067
 AUX gimp-2.99.2_fix_autoconf-2.70.patch 1913 BLAKE2B 779ce5a54150ee2a89507420931f255c09602af36ab8176f7ae9f18a7c1feb12451e817d2a89251d0366af6db90f602a107108227c98ac99b73e16ddb7b1fd05 SHA512 efa8882896335d3ac4ae7fb8874b5bd568472ccdcaeaf1d771f6c6b815b138186016f39f5f2f30fa01c1018ad583649fcf564cc5a8bcece741092f7dbc22f5fa
 DIST gimp-2.10.22.tar.bz2 33152226 BLAKE2B d11b0ee8f0f24934383028a0b21820af30da6133814d64b67981888086f3eaa4378e474ff801db046f2fe5d380325ac7279df6e749d100219e2f6558c9bdf10d SHA512 13841ac4a186df47e4155095ca888a903b2db9e25a73fbb834fe981ccf915cb67a3e08506e5c13b6c5f35e27b1de24befbccf871e438b1a35f67f069bebd8fd0
+DIST gimp-2.10.24.tar.bz2 31546295 BLAKE2B e2b873313b41799cb9461f6cd2ec45dcb0d3f51fe3e2710e47be99be868fba962cb75afb47bc2f12e2d6090993d70f560f4d58d2614939a0d36cadc9191fa2a7 SHA512 828350ad5c53b8409463c24693821d78a1940f18c221249ae7b864ad9db5cf01ab41d6ec5bbefd96115f0e91809ecdc61451d71881b56b07920c442f4a514936
 DIST gimp-2.99.4.tar.bz2 30355676 BLAKE2B b982139e36809b7e149c1c055d7cf0506c0c00beda2745904c62f4b56f1f1605378358f29ab427f7df6c68251ce367e00d79a1b9b7b3d0fde22526895eb5ce27 SHA512 1abb6851f4c6af440d75d09c55dcb6bf6485739de1960fb536035935729331221265beef589386da685ad8ffbe83e0f0699cf2db55589953deae4d82aa99154b
 EBUILD gimp-2.10.22-r2.ebuild 5636 BLAKE2B ab208d7b8c28b52eee77ed8ba150264e7939308474a6adffa7372589f5b4d1347b1d25145d1f91aae4a05731d1a050e99cfe7700ae2ff455a67eca1cb61dfe8d SHA512 d9646bd07e014e6efa79782665b0d095b95476ede9ce15222428c53c91609b5837d925923aae8f3cad92b20043f0db98993a4b037e6bd866cd467753c49f20be
+EBUILD gimp-2.10.24.ebuild 5581 BLAKE2B 7639817275bc53b7e08b8f190aa11b2be6d62f2c12f46474fe67c74409fdbb0a4cc2bcaa8c7bdd04721f111ea52d3c8a950efb9d85ee1d22cbaab687207fcbe7 SHA512 c22ff9efa6044e6f0fba4094b0bd9debfb9752464357dbbe7c760ba9901ad36d479c1bbecfcae8c7c6b0bfecb8084cab970d8ee1d458122b2eb9f0b40a0b8054
 EBUILD gimp-2.99.4.ebuild 6553 BLAKE2B d57881c19a9f742024773bf6ce2ace5612fada66e047abb4f121cd14326af8314fb3d9ca19ef47317e6908bb567a8207aabb6916208621a1e13870e2e4b2136e SHA512 f4f03298670b734e1ff69d6ee2c57e9f01f79a57236fd6b9518b67cc7f4672c0486b3e63182913826f08fc0c5e0e5d86ee844e435f5c598c86d24e0af6c15aa6
-EBUILD gimp-9999.ebuild 6990 BLAKE2B a24f11b76b68054be80cb854083aac1894049fd7a0d63b22ac0159032423c6f31295e767030a4bb48c5a63073d8a50dcde1ca43f345323c538e46a1c2344265c SHA512 f645dcdd4118822cc7149f36fd0c2e51dd40620375c72de9dbc0b6abf49916bc9fca907793ee5a97197bac7ce87561809e12364b42dd2c4ea9bd7683674c34cb
+EBUILD gimp-9999.ebuild 7011 BLAKE2B 5c9703b19e17a0e95e88d27c8a37cd316decf0d721c55243bc456b0a6467c6d952bbefaf79938358c03b2bb17b2c984375c837f992670640e180fe9e33e232f9 SHA512 c4c6e9ad7f32b76db12469398d7a49001de4e6043c536b09803fcfced310d1166b6877a72ed67e628ccfa8e06effd723bbeb3c4ba68e30de9815c98df206405f
 MISC metadata.xml 576 BLAKE2B cf4bbbe0b8610a1e1b0190c58bb578cb5c0d2bc7b1350ce98b1ce091af2e6052554bad53a96e729f4de30acb231cebc5ba3bc10b92302405bb2a791bbe897024 SHA512 82fcdb57a699ab887f9b0d0a9edb33d7e7d26e3aaa88727986820cf6053a9f9d275e1227ce82bd5e0291fc9c0d9362e014c08ca0822229d717ee851970dc6c8a
diff --git a/media-gfx/gimp/gimp-2.10.24.ebuild b/media-gfx/gimp/gimp-2.10.24.ebuild
new file mode 100644
index 000000000000..7f0d8d959b43
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.24.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME2_EAUTORECONF=yes
+WANT_AUTOMAKE=
+
+inherit autotools gnome2 toolchain-funcs virtualx
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+
+IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=app-text/poppler-0.50[cairo]
+	>=app-text/poppler-data-0.4.7
+	>=dev-libs/atk-2.2.0
+	>=dev-libs/glib-2.56.2:2
+	>=dev-libs/json-glib-1.2.6
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.40.6:2
+	>=media-gfx/mypaint-brushes-2.0.2:=
+	>=media-libs/babl-0.1.86
+	>=media-libs/fontconfig-2.12.4
+	>=media-libs/freetype-2.1.7
+	>=media-libs/gegl-0.4.30:0.4[cairo]
+	>=media-libs/gexiv2-0.10.6
+	>=media-libs/harfbuzz-0.9.19
+	>=media-libs/lcms-2.8:2
+	>=media-libs/libmypaint-1.6.1:=
+	>=media-libs/libpng-1.6.25:0=
+	>=media-libs/tiff-3.5.7:0
+	net-libs/glib-networking[ssl]
+	sys-libs/zlib
+	virtual/jpeg
+	>=x11-libs/cairo-1.12.2
+	>=x11-libs/gdk-pixbuf-2.31:2
+	>=x11-libs/gtk+-2.24.32:2
+	x11-libs/libXcursor
+	>=x11-libs/pango-1.29.4
+	aalib? ( media-libs/aalib )
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
+	heif? ( >=media-libs/libheif-1.9.1:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+	mng? ( media-libs/libmng:= )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	postscript? ( app-text/ghostscript-gpl )
+	udev? ( dev-libs/libgudev:= )
+	unwind? ( >=sys-libs/libunwind-1.1.0:= )
+	webp? ( >=media-libs/libwebp-0.6.0:= )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/hicolor-icon-theme
+	gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-lang/perl-5.10.0
+	dev-libs/appstream-glib
+	dev-util/gtk-update-icon-cache
+	>=dev-util/intltool-0.40.1
+	sys-apps/findutils
+	>=sys-devel/gettext-0.19
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+"
+
+DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
+
+# Bugs 685210 (and duplicate 691070)
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
+)
+
+src_prepare() {
+	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
+
+	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
+
+	gnome2_src_prepare  # calls eautoreconf
+
+	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
+	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+_adjust_sandbox() {
+	# Bugs #569738 and #591214
+	local nv
+	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+		# We do not check for existence as they may show up later
+		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+		addwrite "${nv}"
+	done
+
+	addwrite /dev/dri/  # bugs #574038 and #684886
+	addwrite /dev/ati/  # bug #589198
+	addwrite /proc/mtrr  # bug #589198
+}
+
+src_configure() {
+	_adjust_sandbox
+
+	local myconf=(
+		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+		GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
+		--enable-default-binary
+
+		--disable-check-update
+		--disable-python
+		--enable-mp
+		--with-appdata-test
+		--with-bug-report-url=https://bugs.gentoo.org/
+		--with-xmc
+		--without-libbacktrace
+		--without-webkit
+		--without-xvfb-run
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable debug)
+		$(use_enable vector-icons)
+		$(use_with aalib aa)
+		$(use_with alsa)
+		$(use_with !aqua x)
+		$(use_with heif libheif)
+		$(use_with jpeg2k jpeg2000)
+		$(use_with mng libmng)
+		$(use_with openexr)
+		$(use_with postscript gs)
+		$(use_with udev gudev)
+		$(use_with unwind libunwind)
+		$(use_with webp)
+		$(use_with wmf)
+		$(use_with xpm libxpm)
+	)
+
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
+	gnome2_src_compile
+}
+
+# for https://bugs.gentoo.org/664938
+_rename_plugins() {
+	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
+	local prepend=gimp-org-
+	(
+		cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
+		for plugin_slash in $(ls -d1 */); do
+		    plugin=${plugin_slash%/}
+		    if [[ -f ${plugin}/${plugin} ]]; then
+			# NOTE: Folder and file name need to match for Gimp to load that plug-in
+			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
+			mv ${plugin}/{,${prepend}}${plugin} || die
+			mv {,${prepend}}${plugin} || die
+		    fi
+		done
+	)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Workaround for bug #321111 to give GIMP the least
+	# precedence on PDF documents by default
+	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+	local gimp_app_version=$(ver_cut 1-2)
+	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+	# Remove gimp devel-docs html files if user doesn't need it
+	if ! use doc; then
+		rm -r "${ED}"/usr/share/gtk-doc || die
+	fi
+
+	_rename_plugins || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 0e8f9ddf7cc6..e412365e13ec 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..9} )
 GNOME2_EAUTORECONF=yes
 VALA_MIN_API_VERSION="0.40"
 VALA_USE_DEPEND=vapigen
@@ -37,10 +37,10 @@ COMMON_DEPEND="
 	dev-libs/libxslt
 	>=gnome-base/librsvg-2.40.21:2
 	>=media-gfx/mypaint-brushes-2.0.2:=
-	>=media-libs/babl-0.1.84[introspection,lcms,vala?]
+	>=media-libs/babl-0.1.86[introspection,lcms,vala?]
 	>=media-libs/fontconfig-2.12.6
 	>=media-libs/freetype-2.10.2
-	>=media-libs/gegl-0.4.28:0.4[cairo,introspection,lcms,vala?]
+	>=media-libs/gegl-0.4.30:0.4[cairo,introspection,lcms,vala?]
 	>=media-libs/gexiv2-0.10.10
 	>=media-libs/harfbuzz-2.6.5
 	>=media-libs/lcms-2.9:2
@@ -58,7 +58,7 @@ COMMON_DEPEND="
 	aalib? ( media-libs/aalib )
 	alsa? ( >=media-libs/alsa-lib-1.0.0 )
 	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
-	heif? ( >=media-libs/libheif-1.7.0:= )
+	heif? ( >=media-libs/libheif-1.9.1:= )
 	javascript? ( dev-libs/gjs )
 	jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )
 	lua? (
@@ -185,6 +185,7 @@ src_configure() {
 		$(use_enable cpu_flags_x86_mmx mmx)
 		$(use_enable cpu_flags_x86_sse sse)
 		$(use_enable doc gtk_doc)
+		$(use_enable debug)
 		$(use_enable vector-icons)
 		$(use_with aalib aa)
 		$(use_with alsa)
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 42405e53e159..d69c5af86ad0 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,8 +1,6 @@
 AUX gmic-2.9.2_ipa-sra.patch 665 BLAKE2B b61fa87ac2da5fd5956c89cb4a6c128f266a175dca70cd34ff4bed0483c934241a375131eaddd6ebd5f3afb52e694d4fc6839d20718bc06463c0e263f15b6d5a SHA512 6f04cac4de5914cedd269655fe58ca406199c042bdbab6e706cfea49516d0a7e1234e61c51b6a142341a7984dd96e97c4b8f13c2efbe427627be26539af8653e
-DIST gmic_2.9.4.tar.gz 7279628 BLAKE2B ca5fc69a2990a86a340c4305dc406d4e9032ba04afa59819dc2c788b4c181d23bd03d3050380802fe1effa2b6389df60734f8b3523fac7b0ff6bc35b64a368a6 SHA512 76bb4798e91a68e76a985d7fbc488f8677facaa1efc4ab3a0b9c7d966aa3f5763d1ae1de80f572636d58f1831d9bdae1651ea0b6a76d49a18bf5ad6e12756d73
 DIST gmic_2.9.5.tar.gz 7304367 BLAKE2B 5227aced76cc5ff0a0144f940c71daeeb947e282b6f8c28894ecfda6b863803d0c2227bac869362ba0710fa33fcf81a4c77ea582cbea77ab8a670f65eef9826c SHA512 95d0642cad057eeaa8f7bdd4259719adf6f36189e7851e9e09399bb61f3a52722f0f83f0d2d5991c4e44a692fd3afc735fdb93e6fe45ae092d1e51a139560809
-DIST gmic_2.9.6.tar.gz 7304588 BLAKE2B 50afbc4d84e180a02bb920b0302dff800284c4f7bc2f11ecfcf74f4a505a3173317b670656c03c5e29149886deb238b0be17f192c019f29d43652072790e56fb SHA512 231bae405ad66e28488468d9cc0ff2d4ca7dad289b75c51d2e2984086c5b2cbe646432992be1185e533e3a8c13aa51e0a330253dbf21ec530f93d3ae83bdaaf2
-EBUILD gmic-2.9.4.ebuild 4845 BLAKE2B 998961857815fc1d5c993c96dd2ad74bdcde8353cd561bd5306e7808e2d07db73da4dbe1b020d23b85784a0cc4b0dd57e7e05ae9e530328355a32b699a90d2a7 SHA512 2cbb56d2a4433d63983b494cb5c7047054e2d320fca46b6db32c21c8abc4f389287e67f0ed522ca58a2c2e8c78013adf9df4914fb7a85335f4415284cd307d12
+DIST gmic_2.9.7.tar.gz 7401418 BLAKE2B 528edcd45c27fce22b16a9ec279ac91465a720fafcc87ac5fcb6ab2bb8a914581592ad3e4e2cd5a64934bd35b13b65d0832e1ca5e07525205c45f9d3c10a719f SHA512 d54a2a8f61f40dcc90f497f223484b63f9658c499e39720ea7b90b06d00cfdc057497ada4790dc757191e2905ed9bd36ca4076019c519cf79393cdc123b24730
 EBUILD gmic-2.9.5.ebuild 4259 BLAKE2B 7596e851d7ad3b53e29c21a8e65c7f893d30bea57889237b844befe1124c8cdf9d5bf5d8fe8c71f90adbcb44d3809473214e0117877f53b2b2b85218b9756b0a SHA512 a124e2cbc12aa50bdb444114afc9b22ed85cb269c315370f75a5aeeeabb29cb11bbf17bbb8e2104fbca4c67f7b7a9e68324b455fe627c42d9cd6ede70c79b142
-EBUILD gmic-2.9.6.ebuild 4262 BLAKE2B ea9fdfb207a5a28d1d04136a916d806bab9906e0d4495dd37b29ecae0296a57d5c9f2fdfd6485ac7bfda9b7d5f104b976c4fb9232910839256c3727a115532ad SHA512 2402560d48ea661dabcb9b727d3dcb6669f71fe7270bf3986db57aa5a8f51366133d3950d748e0e631dec77c346ca9057bdd8540aef93c4d5d9bf8a20fd33bbd
-MISC metadata.xml 605 BLAKE2B f1ed3b46614a3e3273e4bdedfd7b45629eca482a0805ff1bda2161e4d785a478b91f8ccdbab399b184ec93d020211e35e4503fbf4205b1e2e1f04c7e547303bd SHA512 8303e0a301edb88bdb7522baf47e29b39e895ccaa729231d64b6a39af73f0eb1626c39439f1ed70d496d982f3abca4ff9586d20fc5a9d08b0e57a19b60bf088d
+EBUILD gmic-2.9.7.ebuild 4262 BLAKE2B ea9fdfb207a5a28d1d04136a916d806bab9906e0d4495dd37b29ecae0296a57d5c9f2fdfd6485ac7bfda9b7d5f104b976c4fb9232910839256c3727a115532ad SHA512 2402560d48ea661dabcb9b727d3dcb6669f71fe7270bf3986db57aa5a8f51366133d3950d748e0e631dec77c346ca9057bdd8540aef93c4d5d9bf8a20fd33bbd
+MISC metadata.xml 533 BLAKE2B 29dc054d7e7f718782ad0bb914bd8ce7b2dc6519826c4fe21be1cc20c4ddd21b99355c565106123de39bec8dadb08c1ca1fcb10989cc6fe984e6a6ea7e611c5f SHA512 2eb6d59dfa0d092625b755e952dbddf6c6dda811ae19768811ea7dc8a07771cfd3e4d074e8e996ec2de5e74243721c8b82d7cb8fc86300246096e18b782b5a2c
diff --git a/media-gfx/gmic/gmic-2.9.4.ebuild b/media-gfx/gmic/gmic-2.9.4.ebuild
deleted file mode 100644
index 09772f17dece..000000000000
--- a/media-gfx/gmic/gmic-2.9.4.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-
-inherit cmake bash-completion-r1 toolchain-funcs
-
-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 arm64 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 digikam ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
-REQUIRED_USE="
-	|| ( cli digikam gimp krita qt5 )
-	digikam? ( png zlib fftw X )
-	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 )
-	digikam? (
-		media-gfx/digikam
-		${QT_DEPEND}
-	)
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		media-gfx/gimp:0/2
-		${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}
-	digikam? ( dev-qt/linguist-tools )
-	gimp? ( dev-qt/linguist-tools )
-	krita? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use openmp; then
-			tc-has-openmp || die "Please switch to an openmp compatible compiler"
-		fi
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use digikam || use gimp || use krita || use qt5; then
-		# 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"
-		# Bug #753377
-		local PATCHES=()
-		cmake_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_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 digikam; then
-		mycmakeargs+=( -DGMIC_QT_HOST=digikam )
-		BUILD_DIR="${BUILD_DIR}"/digikam cmake_src_configure
-	fi
-
-	if use gimp; then
-		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
-	fi
-
-	if use krita; then
-		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
-	fi
-
-	if use qt5; then
-		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	# build gmic-qt frontends
-	local S="${S}/gmic-qt"
-	use digikam && { BUILD_DIR="${BUILD_DIR}"/digikam cmake_src_compile || die "failed building digikam plugin" ; }
-	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_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 digikam; then
-		local DIGIKAMDIR="/usr/$(get_libdir)/qt5/plugins/digikam/editor"
-		exeinto "${DIGIKAMDIR}"
-		doexe "${BUILD_DIR}"/digikam/Editor_GmicQt_Plugin.so
-	fi
-	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.9.6.ebuild b/media-gfx/gmic/gmic-2.9.7.ebuild
index 20cad100504d..20cad100504d 100644
--- a/media-gfx/gmic/gmic-2.9.6.ebuild
+++ b/media-gfx/gmic/gmic-2.9.7.ebuild
diff --git a/media-gfx/gmic/metadata.xml b/media-gfx/gmic/metadata.xml
index 39d49193716b..2e93f14ae226 100644
--- a/media-gfx/gmic/metadata.xml
+++ b/media-gfx/gmic/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="cli">Build CLI interface</flag>
-		<flag name="digikam">Build <pkg>media-gfx/digikam</pkg> plugin</flag>
 		<flag name="krita">Build <pkg>media-gfx/krita</pkg> plugin</flag>
 		<flag name="opencv">Enable support for webcams using the OpenCV library</flag>
 	</use>
diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest
index 6a3b80ce26d9..5934932461f7 100644
--- a/media-gfx/gnome-font-viewer/Manifest
+++ b/media-gfx/gnome-font-viewer/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-font-viewer-3.34.0.tar.xz 157756 BLAKE2B dabda5516fc5461d382f6ac6ed2ac6177dee137983833e3643d029e2370b76ef586223a41b591ef0f6c21024f1e42fe7b234c8ef9cdbbbf9845c46b9a55222eb SHA512 1be6230da5ff47a129db43b5f5467d3fed8925fad7a6637f24d72c8c99c80d8dd1635eaef1b7c7f650a86132a54cde8326d3418075f5818d0154dc8d503927c7
+DIST gnome-font-viewer-40.0.tar.xz 175396 BLAKE2B 33e10646fe31f76696867c0c5e7a99385064f09049390adb78149141f906958a6f14c3e29a9fbbfe8c48879f4600963ec66e9753018d9d7d658f4111c6dad120 SHA512 c82044e6750494d693cf631abe7fb76c655b58965ccd1ca08f512f0e79c40e9f207997465908b99e5813f350ca05ea8e76f029be79f3008173c49f3c5a4ee23d
 EBUILD gnome-font-viewer-3.34.0.ebuild 661 BLAKE2B 8739b88db8eb33fd8e926e6d2332d2709295d9b717e57aba42968b2946777358b052f7ff74c7662c59549b81d186136ef0730830a6d4d9a7b417615026a4e0d4 SHA512 31f4a036e1c791507d655b7dd7e984ffe594eace707539efb797accc11b04b27a8ef00cafb6ea9aeeb630565a3dbb3b6a7452e1ee810bed079c6b72ed02b8d91
+EBUILD gnome-font-viewer-40.0.ebuild 697 BLAKE2B be88c9be05b96972ac8fa8c7c9d14c62e239d097f9504789d9f9e546b7f830b65bd9e6880c42dcec2d2a93378b30c1f931510890e8115285422fe329b54657a2 SHA512 539829a641857982fb9f613353cce677b3a986b76af2c292755eab1fc12728fdb3db4fce00e8ef9aad06a6060ed8c30b03b69b8426cc0e4acacb410195b4095d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0.ebuild
new file mode 100644
index 000000000000..e30e1d5675f2
--- /dev/null
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-libs/glib-2.56.0:2
+	>=x11-libs/gtk+-3.24.1:3
+	>=gui-libs/libhandy-1.0.0:1=
+	>=media-libs/harfbuzz-0.9.9
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	gnome-base/gnome-desktop:3=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	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 ee3d21bef874..90d7d2792ca2 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-photos-3.34.2.tar.xz 639992 BLAKE2B f189e7e1a831f4d19416b689733ef6a55822d57b5f1ea29a4dcb4fc06d5f9a450e45aaf53f65e392ac78e9959f7359f3df17827a326cfd6dbf8cc7d77cc0a367 SHA512 6315fb8e7623de48a42f1b47a2935c80f8f9f6db1ab724d1857697f673c4ca0d5ca1afa5c0d147455c3c0ad0224b85b52a220b1dd39a1409804bb75794d0a04b
-EBUILD gnome-photos-3.34.2.ebuild 2299 BLAKE2B c85181b8d033e99e0bbc73bf6b6485e34f8ad1553aab367e9ff07d8c940467d91b5b0c12329a4b7386489cac8f3fac38ff01236d727d7f5e105a4cb5febbc867 SHA512 a7db426d14887fb06277d2904cdfcdddfdb38791ba3dae3cf64d938329f1383464a772f88b424794d32fdffbce00b534595fdcc58f283972c4a4289aafc54327
+DIST gnome-photos-40.0.tar.xz 632440 BLAKE2B 4a3be35e627169afa4b3b9aca2c675f6035f3e46822450fc479550a3e48aebba6f9e335dc528a6593f1bd844fde501b8535ed368be9825f229280a08d5ead7e6 SHA512 70641e7fc6375e15cadc62ad75804d3ffb1d2193dd0bbed21b291b38f1d271ba7d34a4714a1658b9f13345f20e421190958b4713aae64f4f46913628079ba814
+EBUILD gnome-photos-3.34.2-r1.ebuild 2306 BLAKE2B 0975c84b46f2dbff95b983abcb2e4913872a644a9734853d74379dcd9e07f3730bacf19fb403b80fe43e419cc5334d214ff278cc5f61e17a3ee7cf3789be4822 SHA512 e03f425e66164cd3c1b588a62a76340496567d82f21992d4d00306a7cbac4600efa146f0bb03f39462f45a24a8a87f6ba2b235d2c28326ef5658551d0d9b9b7b
+EBUILD gnome-photos-40.0.ebuild 2362 BLAKE2B 32f52e14fba2762e02175b6d82640f61af8c566abfcb23f567771b9d031bba44c9f06223df4ac1c40fd9469b7e140aa20265419866d6ead4edb386313fada0fc SHA512 d8002fc69d2847e54083027f3146e40c4abc2b98b932e333e9000918e895dca99978a911c45acf9b0608992d80b56263d5a2af2a5bdbc3cb5589c52d39198942
 MISC metadata.xml 992 BLAKE2B beda29ca65d25e5d68c014fbb70fb539cf17b55d64255d6d74305d710f3979b5156eda764d75992f057416f5eb96af899b988633dd8444fcf22c6a5f73fe9b9b SHA512 3c47be6c01072a0b4845dd42b6d3561d340eb703bd9cb5c727ec24b653ab76eee38e35ba63c4cd71b93514ab0cb8bd75663febeed1901cccedfd30f223e870df
diff --git a/media-gfx/gnome-photos/gnome-photos-3.34.2.ebuild b/media-gfx/gnome-photos/gnome-photos-3.34.2-r1.ebuild
index d7514e59171a..ead6423224bf 100644
--- a/media-gfx/gnome-photos/gnome-photos-3.34.2.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-3.34.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg
 
@@ -43,7 +43,7 @@ RDEPEND="${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] )
-	>=app-misc/tracker-miners-2
+	>=app-misc/tracker-miners-2:0
 "
 BDEPEND="
 	dev-libs/appstream-glib
diff --git a/media-gfx/gnome-photos/gnome-photos-40.0.ebuild b/media-gfx/gnome-photos/gnome-photos-40.0.ebuild
new file mode 100644
index 000000000000..fd086220f9ac
--- /dev/null
+++ b/media-gfx/gnome-photos/gnome-photos-40.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg
+
+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 )"
+
+DEPEND="
+	media-libs/babl
+	>=x11-libs/cairo-1.14.0
+	>=x11-libs/gdk-pixbuf-2.36.8:2
+	>=media-libs/gegl-0.4.0:0.4[cairo,raw]
+	sci-geosciences/geocode-glib
+	>=media-libs/gexiv2-0.10.8
+	>=dev-libs/glib-2.62.0:2
+	>=net-libs/gnome-online-accounts-3.8.0:=
+	>=media-libs/grilo-0.3.5:0.3=
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.22.16:3
+	>=dev-libs/libdazzle-3.26.0
+	>=dev-libs/libgdata-0.17.13:0=[gnome-online-accounts]
+	>=net-libs/libgfbgraph-0.2.1:0.2
+	>=gui-libs/libhandy-1.1.90:1=
+	virtual/jpeg:0
+	>=media-libs/libpng-1.6:0=
+	app-misc/tracker:3=
+	sys-apps/dbus
+"
+# 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.
+# tracker-miners gschema used at runtime.
+RDEPEND="${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] )
+	app-misc/tracker-miners:3
+"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	dev-util/gdbus-codegen
+	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}]') )
+"
+
+DOCS=() # meson installs docs itself
+
+python_check_deps() {
+	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_src_prepare
+	sed -i -e "/photos_docdir.*=.*join_paths/s/meson.project_name()/'${PF}'/" meson.build
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test dogtail)
+		-Dflatpak=false
+		-Dinstalled_tests=false
+		-Dmanuals=true
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest
index d70f151e7c31..a157c752d3d1 100644
--- a/media-gfx/gnome-screenshot/Manifest
+++ b/media-gfx/gnome-screenshot/Manifest
@@ -1,5 +1,5 @@
-DIST gnome-screenshot-3.36.0.tar.xz 231420 BLAKE2B ce916d4d221252f47c84ebdec52ddcc2e25c2481df848cb6199842857c7ba537f56c22bdcb2a8e5b988d767fbc242d0c727119bc1ae9d569644eae15688aebf5 SHA512 fda599e7c50b37d8356352085b2f45f3b8c868af897352810998e127bd7333d5a1383369ec1cb980064f7e0aafa0e01bc5cdb31563ea56b1a7e4099fc18cc6b4
 DIST gnome-screenshot-3.38.0.tar.xz 356716 BLAKE2B 31f2a0cdf16a9f967c789ec1f698140f78a5c4d66489bc8a47b8b61b5e536e6b67fd60b9cb241221262eef5b3117ce3e1a59fa162a7f193de440f7de9db0afc3 SHA512 183f81b9b481d1afb4a3c8e37b25a78652e599d4c5a4f1a2cc9449cd1efdf3b613018c17de9ab61304ba19ad7152d696aeed475c0184a4728ea1359ca2be2ecf
-EBUILD gnome-screenshot-3.36.0.ebuild 1204 BLAKE2B 7e2465f20e33696123deb1156db4e4a1356bb48b8613824be9d418b7f31c2a41ddf4fb25b0c422007e703ec7a68b8872b760f080988538b94c7a8bd2d5c52dc2 SHA512 1115c12624ba4bd0a218347775c8810c916f862e0155471a55e84ae38e214c9de19992d025a52b5ba685a506022a0091a307c8b14c61973f33edb9d8b44ef90a
-EBUILD gnome-screenshot-3.38.0.ebuild 1333 BLAKE2B 9f34d3dbfa01a050d45966f97b1133bb70482753d04479a9156f48aeb5c90bf9e7dde6bba2310758fbab2900acbfe6b598015c40b512d64d42fc856087f3d888 SHA512 bdc7f9f585b362b3ad8676bd5cc1f4e849af8b6958fea2a131ff66923d109fabedcdb28772efe39c49e4adfe54b10820c7c2e83c1bc6de89b32e8b0ae71069e6
+DIST gnome-screenshot-40.0.tar.xz 358088 BLAKE2B cad407f471e953667946b741ed59fe210d7ba3d079f2db8101974e565a1d0bfaec0cb1b40791be0e183dd399a82db5f15bbbec741ef16b4b572b043fcaf8ea8e SHA512 0889d7701711f17de68f8a55f512b7764fed087b1b2f86b372d1a38ee956f05ca8c833ca16a1de2396b07c01de79204d988192036780f521b82733436d019cb0
+EBUILD gnome-screenshot-3.38.0.ebuild 1332 BLAKE2B 781c43ba1a3f6d0365500eef7da33ed2ba3d610702cf1be844333f02ca5a8e26a5dd7f673c5fdaaeb710f931a285bd489c72a169b0a3c894f909cee9658a424d SHA512 66126fef44e6d6b6a6c060e4bd8ab92d6943678554a0dc264e6141cacc0d688746b12c10f482b6fd728014a503db7dce0c145cb1cd222fca0787908f7edda880
+EBUILD gnome-screenshot-40.0.ebuild 1245 BLAKE2B dbed2f6b436bc243e18fb44155ceea506e9dc455ad0b75bca9456950ed180af0b3ecc8360a6fd27d3f2c657cbab085b91421e4fe206255e9d3b86c69f1ea35bf SHA512 44f9a2bef1f17809313368c185a13117b28b577ad135ea43dfb2aa7cbdc85b0c941724e2209264d27f5129241a32af41717b9e5c479747dd95388c066a6b28a6
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.38.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.38.0.ebuild
index 540ff2319e52..882eeb1a8d81 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.38.0.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.38.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="X"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 # libcanberra 0.26-r2 is needed for gtk+:3 fixes
 DEPEND="
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.36.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-40.0.ebuild
index 521236d8c9cd..56de65187634 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.36.0.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-40.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,16 +9,17 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="X"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
-# libcanberra 0.26-r2 is needed for gtk+:3 fixes
 DEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
 	>=dev-libs/glib-2.35.1:2[dbus]
 	>=x11-libs/gtk+-3.12.0:3
-	>=media-libs/libcanberra-0.26-r2[gtk3]
+	>=gui-libs/libhandy-1:1=
 "
 RDEPEND="${DEPEND}
 	>=gnome-base/gsettings-desktop-schemas-0.1.0
@@ -35,6 +36,13 @@ 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_configure() {
+	local emesonargs=(
+		$(meson_feature X x11)
+	)
+	meson_src_configure
+}
+
 src_install() {
 	meson_src_install
 	readme.gentoo_create_doc
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 9f3702d5037c..1bda9cf1f961 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,7 +1,6 @@
-AUX 0001-Fix-unwanted-automagic-activation-of-aalib-support.patch 1049 BLAKE2B 62afe72d6630420fa0068e652cdfbfde3c4e73541e53154627ad1cc23ad10f72ac85cf5ae317d2b0bf4127e474af2ca2268e57011eb835d57d88e2d6fa65a85f SHA512 252390cfb2533e9c15d1f881f6729660e2f6cd737a9257c5dec7f06f72f2960c3b5fe940e7fc774c862e6156f517357ca7b933822c23a466ef39fbfc2f14bf8c
 AUX gphoto2-2.5.26-s-cdk-cdk.h-cdk.h.patch 883 BLAKE2B cdbc9626b09610eb98cc32e04e68f6d4ea7d13709258ea6d23e9c1a800be1c7bb02589da354234ad523f43d9c93335eeaf8bbd42c26ffe8747a19fbd5fec3b2c SHA512 b2f3e36d151fefa78b63ba478efa17ab419a4f9d60c03a5951b149cb045495d4cd5e102a2977af6097f6d902449c5c56a8b1c0ac55eaa924f08931d08488b0ab
-DIST gphoto2-2.5.20.tar.bz2 790065 BLAKE2B 6e10aa468696bc3eff51aaa3e886ad2373997f91597e42b33777ac56bf668f918c2fa0cb8b70eb8f7cb45507e67c9cfc3a46a7408449ad35cc3b743daf74859d SHA512 0350c38c264e5ba858ee14952fbf6ad271e7fef05e3f5f8eb3d45102099ae435fec63b09881efa99af60d4e086a9c2f69be92a7e49617643ab13146a5e4655f3
 DIST gphoto2-2.5.26.tar.bz2 804521 BLAKE2B 20ddf39ad8668543864119cb1cf8dd5db4be5a773ccdd73efe434fe790ce001842512acf9a9f3ad08bad43460b42e4de257b2ca5561b5d7727f0703dba8f8098 SHA512 fbfc8d860db830be423271a0f569d51a296e9394884fe1a9e22eafd4ba0b7e4e68d86ba0391df81a64d4a4976b2644b2c39339532bd0e8e01f461b9a89cceb47
-EBUILD gphoto2-2.5.20.ebuild 1334 BLAKE2B 0cbad273e56fa22e1612ce973622b44995e1dc98bae1a17c7533a7c8b2df36d51ea61cad8fa4adad201778401f2540de7e7e5728ebfbbba38f7e6bf9c6305398 SHA512 90ec16fdf308d2c92ffa7397bb9789eaa65e1ee30ae853add5993e359ecefebe118a0fac09e2edfe08b4d0ee490b6bb6ef5ec90e01b557d3a92af93df622390a
-EBUILD gphoto2-2.5.26.ebuild 1269 BLAKE2B 6e365087fec2efbaf88972074ba136174487a138ce77639caca12fc8998a7f22265369818056743b93cd9ffb0b904e8d88d9edda8001e65e8a202dd08807a831 SHA512 f3d4fab65fecb86a4946b41c616810387179ef05d2bce7cf22642d685ff56a0019cc5c0ccc8a1f5de8cc78099ad77df19dfe29d15e9187f5126cb3eea274be47
+DIST gphoto2-2.5.27.tar.bz2 803602 BLAKE2B ad62abc3e91ce3cee1edd8f991ac84616144997bff425eef5cea10c340f9c98694ecda783ec5762f4583d05f38cfecbb7b47e0884c05f114f931a7af8b0a676d SHA512 47001025d3647ac809ab7fd2d9319a2966d72b00471f9a9c865dfad7091c7cac2e299ecd41dfc7997a6665cf2612d4317591964f51a9d336f848e8199e3928b7
+EBUILD gphoto2-2.5.26.ebuild 1266 BLAKE2B 0e2827440e0571d77bd1ba084b14d327c8692606aaeb17fade74de960fa97dc565d22b88af7d94496e61de793f0df0c38b730ecba263c29b61108675b2088973 SHA512 54de9e62b9c74b5d7cffc396c94ec09a63a401d75b464b9d1717dd70f70d7429dd4438eb6f81368c767283da0ac58630910b6ea49bfc9f3a022114bdd2bd4cb3
+EBUILD gphoto2-2.5.27.ebuild 1213 BLAKE2B 651dcb8ec325c67075b4fd85454034f4bd761827b1ebfa0c863e562b6c3e3e945a1ec79c2dc83c5651bb9f937f9ab497d6aa15909c2aff754ec333315552d92b SHA512 8fdcdd4dbd262bf9dc4a24b677c08cf129ac87e000e7a662af07f10a4ba6896588a6dbc2627e3fedc74d47a9afe8088882aaac5e29b60e84ae60862b777cb7fd
 MISC metadata.xml 329 BLAKE2B aa29f56b9c69aa63e45a1a7b6ba6e7a680f33227521a705f5273689774f4cb22d37cdd345b3aa9c43f254861b7fb1fca34d60ac9e1536d07a0806ab881b9e2e7 SHA512 d4107a001067b831a81094ad13f8ee531b52ac62e5dc0fd8810c3a7d85a069fe352bedb8275a34d3e1cb11c003405035dbfaf9b48270b5dbb02cd25772075ab7
diff --git a/media-gfx/gphoto2/files/0001-Fix-unwanted-automagic-activation-of-aalib-support.patch b/media-gfx/gphoto2/files/0001-Fix-unwanted-automagic-activation-of-aalib-support.patch
deleted file mode 100644
index 8e78578d71d1..000000000000
--- a/media-gfx/gphoto2/files/0001-Fix-unwanted-automagic-activation-of-aalib-support.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 45fb2a39195b5b31f61f376323ff78ab40940760 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 8 Dec 2018 16:19:35 +0100
-Subject: [PATCH] Fix unwanted automagic activation of aalib support
-
----
- configure.ac | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a6068c9..c19fed9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -306,8 +306,9 @@ aa_msg="no (http://www.sourceforge.net/projects/aa-project)"
- try_aa=:
- have_aa=false
- AC_ARG_WITH([aalib],AS_HELP_STRING([--with-aalib],[Do use aalib for preview ASCII rendering]),[
--        if test x$withval = xyes; then
--                try_aa=:
-+        if test x$withval = xno; then
-+                try_aa=false
-+                aa_msg="no (not requested)"
-         fi
- ])
- if $try_aa; then
-@@ -323,8 +324,6 @@ if $try_aa; then
-                         AA_LIBS="-laa"
-                 fi
- 	])
--else
--        aa_msg="no (not requested)"
- fi
- AM_CONDITIONAL([HAVE_AA], [$have_aa])
- AC_SUBST([AA_LIBS])
--- 
-2.19.2
-
diff --git a/media-gfx/gphoto2/gphoto2-2.5.26.ebuild b/media-gfx/gphoto2/gphoto2-2.5.26.ebuild
index cb6815b02bf1..fe0d36cbfff3 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.26.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.26.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="aalib exif ncurses nls readline"
 
 # aalib -> needs libjpeg
diff --git a/media-gfx/gphoto2/gphoto2-2.5.20.ebuild b/media-gfx/gphoto2/gphoto2-2.5.27.ebuild
index 0bd55c88a105..a48879567c57 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.20.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.27.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit autotools
 
 DESCRIPTION="Free, redistributable digital camera software application"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="aalib exif ncurses nls readline"
 
 # aalib -> needs libjpeg
@@ -24,16 +24,12 @@ RDEPEND="
 	ncurses? ( dev-libs/cdk:0= )
 	readline? ( sys-libs/readline:0= )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	nls? ( >=sys-devel/gettext-0.14.1 )
 "
 
-PATCHES=(
-	# https://github.com/gphoto/gphoto2/pull/179
-	"${FILESDIR}"/0001-Fix-unwanted-automagic-activation-of-aalib-support.patch
-)
-
 src_prepare() {
 	default
 	if ! use exif ; then
diff --git a/media-gfx/gqview/Manifest b/media-gfx/gqview/Manifest
deleted file mode 100644
index ee369492b1b8..000000000000
--- a/media-gfx/gqview/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX gqview-2.1.5-format-security.patch 1923 BLAKE2B 7cfae186700d681c451c9ccb6394045fee83935795088e9669fe19aa85baf90e47d9c386f18a01e58e60047cb0c9dea9f431f879597042f0c6e7a804be581471 SHA512 8d9d06abe67fc5e98bbd0570315326b66474c99456594871308ba40a84e899a38f86fda812f965d46988d4b72f05ae4a2c27126532dd0bf9f96ede968593b200
-AUX gqview-2.1.5-gcc-10.patch 253 BLAKE2B a6db8c12035b02a4a27395f96831f18efb37ef99bb47d6a6929c3b085ea61da6daae0bfc59c7566ecacb02de0d6585d89781f30bda709cf3eb23f1dd2b87572c SHA512 e25067a5dc6fe9a7c602e96b980b8273d92be3c56547e464c43cf8f7b5d9b2eab54231475218ac051d443076a9c56e751cc995749c5b461714f93958354aaa73
-AUX gqview-2.1.5-glibc.patch 1113 BLAKE2B a608841786df165a99b13d8413ee7b5e718fa222a07062505344f14e4506fee068b54ca8a1063a23453fa4871c323d0bf0ecc8339600b096ebea9b3021fa1ea9 SHA512 c2605aa15c6515fab27e494cc05fd41196bd36ce696831d10b078680836546e8cd1252837712cecc10d6dc2635819babb37b85820b12cc9bf060796d3bc63c67
-AUX gqview-2.1.5-helpdir.patch 823 BLAKE2B 40750550ba6aff8fbdd9af56182ec6b0129bc6039fe1e9e889753015cf68cebe666595b0da362ad5ac028aba174ed986ab790387e0a16d0ec19d710fedac1eba SHA512 82c428fd9dc26539b32e494dbe9012d989d801819edbe67487ea91af1c1d915bf782087199119263d71bb2f921c498139c9804c2db2688f3570cea0d9b7300e2
-AUX gqview-2.1.5-readmedir.patch 257 BLAKE2B 9db86f9542121dd8f0a0c3004b945adae8ae41ef3fe4b421320f8c10a6d97949341f2779aa466972d91eddf7f39c3cb6834fdae3085e1afeda51ec5c50253576 SHA512 816e95ce5999e930aa7488b66575469669842e9ee48bfc979f02a64e7ed9439af30ffee4c4c6e37c97a6a47e28bdbee9761f996b1946f1d9d4330e756a691745
-AUX gqview-2.1.5-windows.patch 561 BLAKE2B 142f068e495c2dcd090649f93b8f3a55ca894c76d31deed0403f99b0830750e133ffb1e6ad651454c6ef01e95c35571b3f30f3502a2eef2d3e01174a20251441 SHA512 f4382d81362efca9decd18f93ffcabc5eeb36251b67377d35a6de87eb0672b24e15d82610b64865415fa23f6e26090c557b7f1df8092cf34b38f7106dd7a33c3
-DIST gqview-2.1.5.tar.gz 1685061 BLAKE2B f47c0e5937ea87223c2110b148c5a52b912d6c65476e5f2d67377e544bb42cae919796d1714992cda6f0e7e7409a7bd0dd6689ac37d2da41254118b699327b9c SHA512 a9e184f9bfbcb789fa732f490b5b1883aaa4c153fb924e2995f36ddef2d170ad9d0695689221d7a0ccae587f5de07b34ca03fa407f774ed3505d0183bf44b555
-EBUILD gqview-2.1.5-r2.ebuild 1126 BLAKE2B 2ed44ec0096fe5c38b3b1106b4cd678c36e2465a67bf60b0902c8cbed95c09da2183194e319c4f87bb9dde1ea8b0919d174a41c17b6ffd01d501bec0ef3664f7 SHA512 bab3680014f333becf847f42645793f794a7561b7db6c3d03810e577d9b39f98e41e25e957d8ea27206efee12b9022a103cc798ab78afddc2716343aa5e956fb
-MISC metadata.xml 327 BLAKE2B ea87b42c500a8abef98a4b3db6f2ee8e328e19d1567f1ef005d6eb13350738028b14e24a32e5f937a72535104145a9a7356d29522070a41258a0a336b96f5330 SHA512 11072de25c4a5e21242befac6ad979c98da602b717a75b3d956c8a575fa1976d06fc4623501873bafdb4a7c5481e02ef108720c9cf3576ac70cd2079729bb366
diff --git a/media-gfx/gqview/files/gqview-2.1.5-format-security.patch b/media-gfx/gqview/files/gqview-2.1.5-format-security.patch
deleted file mode 100644
index baf88993a1f3..000000000000
--- a/media-gfx/gqview/files/gqview-2.1.5-format-security.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Don't pass external input as format string. Detected by -Werror=format-security.
-
-https://bugs.gentoo.org/530630
---- a/src/print.c
-+++ b/src/print.c
-@@ -1220,7 +1220,7 @@ static void print_job_ps_page_image_pixel(FILE *f, guchar *pix)
- 		}
- 	text[6] = '\0';
- 
--	fprintf(f, text);
-+	fprintf(f, "%s", text);
- }                                                                                                                         
- static gint print_job_ps_page_image(PrintWindow *pw, GdkPixbuf *pixbuf,
- 				    gdouble x, gdouble y, gdouble w, gdouble h,
-@@ -1345,7 +1345,7 @@ static const gchar *ps_text_to_hex_array(FILE *f, const gchar *text, gdouble x,
- 		text[1] = hex_digits[*p & 0xf];
- 		text[2] = '\0';
- 
--		fprintf(f, text);
-+		fprintf(f, "%s", text);
- 
- 		p++;
- 		}
---- a/src/ui_fileops.c
-+++ b/src/ui_fileops.c
-@@ -44,7 +44,7 @@ void print_term(const gchar *text_utf8)
- 	gchar *text_l;
- 
- 	text_l = g_locale_from_utf8(text_utf8, -1, NULL, NULL, NULL);
--	printf((text_l) ? text_l : text_utf8);
-+	printf("%s", (text_l) ? text_l : text_utf8);
- 	g_free(text_l);
- }
- 
---- a/src/view_file_icon.c
-+++ b/src/view_file_icon.c
-@@ -614,7 +614,7 @@ static void vficon_dnd_get(GtkWidget *widget, GdkDragContext *context,
- 	uri_text = uri_text_from_list(list, &total, (info == TARGET_TEXT_PLAIN));
- 	path_list_free(list);
- 
--	if (debug) printf(uri_text);
-+	if (debug) printf("%s", uri_text);
- 
- 	gtk_selection_data_set(selection_data, selection_data->target,
- 			       8, (guchar *)uri_text, total);
---- a/src/view_file_list.c
-+++ b/src/view_file_list.c
-@@ -136,7 +136,7 @@ static void vflist_dnd_get(GtkWidget *widget, GdkDragContext *context,
- 	uri_text = uri_text_from_list(list, &total, (info == TARGET_TEXT_PLAIN));
- 	path_list_free(list);
- 
--	if (debug) printf(uri_text);
-+	if (debug) printf("%s", uri_text);
- 
- 	gtk_selection_data_set(selection_data, selection_data->target,
- 			       8, (guchar *)uri_text, total);
diff --git a/media-gfx/gqview/files/gqview-2.1.5-gcc-10.patch b/media-gfx/gqview/files/gqview-2.1.5-gcc-10.patch
deleted file mode 100644
index 567237ce7b38..000000000000
--- a/media-gfx/gqview/files/gqview-2.1.5-gcc-10.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/bar_exif.h
-+++ b/src/bar_exif.h
-@@ -26,4 +26,4 @@ gint bar_exif_is_advanced(GtkWidget *bar);
- 
--const gchar **bar_exif_key_list;
--const gint bar_exif_key_count;
-+extern const gchar **bar_exif_key_list;
-+extern const gint bar_exif_key_count;
- 
diff --git a/media-gfx/gqview/files/gqview-2.1.5-glibc.patch b/media-gfx/gqview/files/gqview-2.1.5-glibc.patch
deleted file mode 100644
index 957080737040..000000000000
--- a/media-gfx/gqview/files/gqview-2.1.5-glibc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 38f6b25..4d7ad2c 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -123,6 +123,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
- LCMS_LIBS = @LCMS_LIBS@
-+LIBM = @LIBM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
-diff --git a/configure.in b/configure.in
-index 9335493..2299b4a 100644
---- a/configure.in
-+++ b/configure.in
-@@ -52,6 +52,9 @@ fi
- AC_SUBST(LCMS_LIBS)
- AM_CONDITIONAL(HAVE_LCMS, test "$have_lcms" = "yes")
- 
-+AC_CHECK_LIB(m, ceil, LIBM="-lm")
-+AC_SUBST(LIBM)
-+
- ALL_LINGUAS="ar be bg ca cs da de eo es et eu fi fr hu id it ja ko nl no pl pt_BR ro ru sk sl sv th tr uk vi zh_CN.GB2312 zh_TW"
- GETTEXT_PACKAGE=$PACKAGE
- AC_SUBST(GETTEXT_PACKAGE)
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 7ce4702..5005877 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -166,7 +166,7 @@ gqview_SOURCES = \
- 	view_file_icon.c	\
- 	view_file_icon.h
- 
--gqview_LDADD = $(GTK_LIBS) $(INTLLIBS) $(LCMS_LIBS)
-+gqview_LDADD = $(GTK_LIBS) $(INTLLIBS) $(LCMS_LIBS) $(LIBM)
- 
- EXTRA_DIST = \
- 	$(extra_SLIK)
diff --git a/media-gfx/gqview/files/gqview-2.1.5-helpdir.patch b/media-gfx/gqview/files/gqview-2.1.5-helpdir.patch
deleted file mode 100644
index e72ea05a213b..000000000000
--- a/media-gfx/gqview/files/gqview-2.1.5-helpdir.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -19,8 +19,8 @@ fi
- 
- AM_PATH_GTK_2_0(2.4.0,,AC_MSG_ERROR(GTK+ >= 2.4.0 not installed.))
- 
--AC_DEFINE_UNQUOTED(GQVIEW_HELPDIR, "$prefix/share/doc/gqview-$VERSION", [Location of documentation files])
--AC_DEFINE_UNQUOTED(GQVIEW_HTMLDIR, "$prefix/share/doc/gqview-$VERSION/html", [Location of html documentation])
-+AC_DEFINE_UNQUOTED(GQVIEW_HELPDIR, "$docdir", [Location of documentation files])
-+AC_DEFINE_UNQUOTED(GQVIEW_HTMLDIR, "$docdir/html", [Location of html documentation])
- 
- dnl checks for functions
- AC_CHECK_FUNCS(strverscmp)
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in.
- 
--helpdir = $(datadir)/doc/gqview-$(VERSION)/html
-+helpdir = $(docdir)/html
- help_DATA = \
- 	gnu_fdl.txt	\
- 	gqview_faq.html	\
diff --git a/media-gfx/gqview/files/gqview-2.1.5-readmedir.patch b/media-gfx/gqview/files/gqview-2.1.5-readmedir.patch
deleted file mode 100644
index 22d244b8c91f..000000000000
--- a/media-gfx/gqview/files/gqview-2.1.5-readmedir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -5,7 +5,7 @@ DIST_SUBDIRS = src po doc
- 
- man_MANS = gqview.1
- 
--readmedir = $(datadir)/doc/gqview-$(VERSION)
-+readmedir = $(docdir)
- readme_DATA = README COPYING ChangeLog TODO
- 
- desktopdir = $(datadir)/applications
diff --git a/media-gfx/gqview/files/gqview-2.1.5-windows.patch b/media-gfx/gqview/files/gqview-2.1.5-windows.patch
deleted file mode 100644
index 207f3c02fabd..000000000000
--- a/media-gfx/gqview/files/gqview-2.1.5-windows.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- old/src/main.c	2006-11-01 17:28:37.000000000 +0000
-+++ new/src/main.c	2008-06-21 23:31:06.000000000 +0000
-@@ -1054,11 +1054,8 @@
- 	if (layout_valid(&lw))
- 		{
- 		main_window_maximized =  window_maximized(lw->window);
--		if (!main_window_maximized)
--			{
--			layout_geometry_get(NULL, &main_window_x, &main_window_y,
--					    &main_window_w, &main_window_h);
--			}
-+		layout_geometry_get(NULL, &main_window_x, &main_window_y,
-+				    &main_window_w, &main_window_h);
- 		}
- 
- 	layout_geometry_get_dividers(NULL, &window_hdivider_pos, &window_vdivider_pos);
diff --git a/media-gfx/gqview/gqview-2.1.5-r2.ebuild b/media-gfx/gqview/gqview-2.1.5-r2.ebuild
deleted file mode 100644
index 8cbd809fc3d6..000000000000
--- a/media-gfx/gqview/gqview-2.1.5-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools xdg-utils
-
-DESCRIPTION="A GTK-based image browser"
-HOMEPAGE="http://gqview.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gqview/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.4:2
-	virtual/libintl"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-windows.patch
-	"${FILESDIR}"/${P}-glibc.patch
-	"${FILESDIR}"/${P}-gcc-10.patch
-	"${FILESDIR}"/${P}-helpdir.patch
-	"${FILESDIR}"/${P}-readmedir.patch
-	"${FILESDIR}"/${P}-format-security.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^Encoding/d' \
-		-e '/^Icon/s/\.png//' \
-		-e '/^Categories/s/Application;//' \
-		gqview.desktop || die
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --without-lcms
-}
-
-src_install() {
-	default
-	# bug #30111
-	docompress -x /usr/share/doc/${PF}/README
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/gqview/metadata.xml b/media-gfx/gqview/metadata.xml
deleted file mode 100644
index ff7e99eb02ba..000000000000
--- a/media-gfx/gqview/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gqview</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 59c1ed9bec31..877a65c1649d 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -1,4 +1,4 @@
 AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3bcaf0af3e6b29a0269581390f64950e42e41280e482fc9cfda9bfe24ef166eb6c24d21377a15fca4264fec69d902d8ba18810bdb01 SHA512 26ab6dda13d758a5e4237c8b5d207d3c5111afbb11b2c3984cd742913c3c7932559b23b5ea9f774f1c6373eb0f761a9400dccc95876740b3cd06c44084a10965
 DIST graphite2-1.3.14.tgz 6630061 BLAKE2B 72bf6736aaa8476a89e44ef53c5b6c94f45d815fe1a451ba6b3696bfe023971210975dee4a9c8cb3042f36442e4efecf5baf171ef4230ad2b10694a89865f918 SHA512 14b5eb2ba8158b8b62ffa7fb142100a0af1de0f0c45b2673801b636714a106b46fcd423b05c722d963c9543fafcf10fec811975308211a54f20a3ba322d7b295
-EBUILD graphite2-1.3.14.ebuild 2657 BLAKE2B 69d3558e59361d817a68ea4b7ef50b3bba7a825047e35b106be76f4791b7fb9e4005f477a1b5d85c647307e537877c89c664716c64719e1bf00043eff611d7e3 SHA512 72e9e730ecbfb5263d1db37c481b55541d6ca411368bd594cfcd7bfaa0f01ca3d7df3a93765c08f8a3ca49115abed8cbc86cb42f2120384ae7767b68c1ecf932
+EBUILD graphite2-1.3.14.ebuild 2658 BLAKE2B 9f52a46ef49203fc746c89d7240615e29e289781361748ac8526e32d7f674dfed84a5a55899e9b5d56d1079cec9b6889271b8a0f197cd15da6f5ad8e95799e42 SHA512 963784d04c6123adb20404de0b3867f7a17e8afa41602bd4f5252c969e8a4a5fcee0808a36b62147e2c5cd8022fe04f9496160e6a32d54a8205d9f407d81f424
 MISC metadata.xml 336 BLAKE2B 7069f4f7bb9ecd39581528f3f6b072d2ebf2c32b24224b9ca5b69b138490e764b740768334954f5cfc25819cab55a50fbd0933dc77fb3397886aacfd105f0853 SHA512 ac8ae39ab005c1562818a97b64bfef48ab64e2a1993aa3eef4ee4b3066b32d9211787df1273e20cb767839e42364ed72b3e99c51bb65f0c88937564d5dbb5380
diff --git a/media-gfx/graphite2/graphite2-1.3.14.ebuild b/media-gfx/graphite2/graphite2-1.3.14.ebuild
index 2916af32a841..7293cfb0a10e 100644
--- a/media-gfx/graphite2/graphite2-1.3.14.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.14.ebuild
@@ -15,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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="perl test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 6ff6afca9225..e43ea7ea0abf 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,4 +1,7 @@
 AUX graphviz-2.34.0-Xaw-configure.patch 2445 BLAKE2B fc1b3820fd72821ac431f5d93d0b4b0c8f596ca9d2c2f516961f5baab9fd54ba870df75434d2ed59fd9034bb7e2ce38c00faef9c12a79c7ec4da2d5e416d7117 SHA512 473d2ed9070329512cbc26929267b25fb8d7726e21ed01d2921d4d8ac13b8ffaf166f07229fa7409192cfa14fabb0cf68b299bb3331b3cc953ae5363274fd15c
+AUX graphviz-2.47.1-bashisms.patch 407 BLAKE2B 957817776e4ea7a0ae84a64d65c452e1bf632a1a10e18a62a47c238fef3a63aca9fe60c5a8749d63004b5a6a442b55870de201a546dfc8b40e43dd4f47e9aeae SHA512 035312d4910bd063bcffdfa3b921c6398614625381747611603fbeed4e1332e687ba7b12b86e18ffe6ae826ebb99a9916c3ee058a86a240126a230b6cd14242e
 DIST graphviz-2.44.1.tar.gz 34079677 BLAKE2B 90183afa6affedb097eab237fae148a9c085c3a724fb74d370f7c042b53d09b44ba0cb755a2ac74175d89d3a45687b60f0e210bdd404fc72da98bdf61b9eaa8d SHA512 42e6137c7cce18daf6f17e6fcbbdfe8e0a531de1bdd3ac7b8751445214aa0d85713b65ba896a234a02670827b0d608bd64b758ef60a4d0384ffa3355ee0dbc42
-EBUILD graphviz-2.44.1-r1.ebuild 7817 BLAKE2B 564764858f192744662ad608c67e1db5d1e512d6bffd9c2e857d0832d94546154f2c8ad947c4a47527a953fd456b219b823c76a6a863ac7e42a2006cdfead467 SHA512 836d9ddfa80b5c943135a47d431e2f5e73275dbea3787f5a5d6104b5cc65e47483d4e428c6b5fe494a96a180995220dee2fd2ecf75524a6dcc0a7f83cb7360d1
+DIST graphviz-2.47.1.tar.xz 23226336 BLAKE2B 7e9f8683ba3694ff34c589dee7f595694e3fb44fa14b3904d648e2f6effebcd725b3cbf09bdfbc25825a92a8fdb4a6cf988f7000997d0a6be065138585fc897a SHA512 4a49a14ca738058ced6ce6352b65137c34cd130525ab2b84a436d282b8b65ecfe7330a214e472e74cfa8e432b4574a746460daff0a4d292962c851fec341aefb
+EBUILD graphviz-2.44.1-r1.ebuild 7818 BLAKE2B dffb6585f3d02af75a32ee80c497432344ad9f4c1508807d9eee3f9eee437872ab120e4e2e6cef679cc93620697c38540a3ee9cb642bfdb16b648def86484483 SHA512 eea967b85b9f22fd3826cf21b0441acefd6350cd5670975602e4d435731731b210b9eb38dbebc0b5740ee92238737f14e71063329c2bed72ebfa1f2ac50073e7
+EBUILD graphviz-2.47.1.ebuild 7690 BLAKE2B a7f9318f44a6a512f82a63b00590a656226f3cd7493014bbf03746fa61de73699bbb1ff6cd8e55e88a54b28317d705cba999ec15248111b91b30ceeb69b8a4e0 SHA512 5cc01c00b7068d00fd725801312ba0d9162821a897797b1dc92052c78f3c0559456aaeaf80f1e8b6b7e2a0d255ef98a458c4ca472c1fdc40ca198ccefc6b6d1f
 MISC metadata.xml 2244 BLAKE2B 61cc818a6f736cee316c026bef8f02dc03ffa3c63f620832fd063f00111178b07be4c5224f5d4fc0f1cddbfc3180e31ac277d493107e0d716d0d2f05c7272633 SHA512 e8c8d5b2abf9c21c6fe8dd7e3489210275065a2f0f64023f5aa52fac2b2646b974fc36c60aa189be022728384ff223aae5856095846dc5ea85638d1b882ad7e0
diff --git a/media-gfx/graphviz/files/graphviz-2.47.1-bashisms.patch b/media-gfx/graphviz/files/graphviz-2.47.1-bashisms.patch
new file mode 100644
index 000000000000..4e9aab6ae341
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.47.1-bashisms.patch
@@ -0,0 +1,12 @@
+diff -Naur a/configure.ac b/configure.ac
+--- a/configure.ac	2019-07-13 03:14:04.000000000 +0000
++++ b/configure.ac	2020-05-15 19:44:57.715169627 +0000
+@@ -315,7 +315,7 @@
+ dnl ===========================================================================
+ dnl Set GCC compiler flags
+ 
+-if [test "${GCC}" == "yes"]
++if [test "${GCC}" = "yes"]
+ then
+   # Enable common warnings flags
+   CFLAGS="${CFLAGS} -Wall"
diff --git a/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
index e17e6e89118a..6cf05d68b56f 100644
--- a/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
@@ -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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
 IUSE="+cairo devil doc examples 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/graphviz/graphviz-2.47.1.ebuild b/media-gfx/graphviz/graphviz-2.47.1.ebuild
new file mode 100644
index 000000000000..e0b4dec8afe4
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-2.47.1.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+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/"
+# unfortunately upstream uses an "artifact" store for the pre-generated
+# tarball now, which makes predictable URLs impossible.
+SRC_URI="https://gitlab.com/graphviz/graphviz/-/package_files/9573974/download -> ${P}.tar.xz"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
+IUSE="+cairo devil doc examples gtk gts guile java lasi nls pdf perl postscript python qt5 ruby svg tcl X"
+
+REQUIRED_USE="
+	!cairo? ( !X !gtk !postscript !lasi )
+	pdf? ( cairo )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Requires ksh, tests against installed package, missing files and directory
+RESTRICT="test"
+
+BDEPEND="
+	sys-devel/flex
+	sys-devel/libtool
+	x11-libs/gdk-pixbuf:2
+	virtual/pkgconfig
+	doc? (
+		app-text/ghostscript-gpl
+		sys-apps/groff
+	)
+	guile? (
+		dev-lang/swig
+		dev-scheme/guile
+	)
+	java? (
+		dev-lang/swig
+		virtual/jdk:1.8
+	)
+	nls? ( >=sys-devel/gettext-0.14.5 )
+	perl? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+	ruby? ( dev-lang/swig )
+	tcl? ( dev-lang/swig )"
+RDEPEND="
+	>=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 )
+	guile? ( dev-scheme/guile )
+	java? ( virtual/jdk:1.8 )
+	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="${RDEPEND}"
+
+# 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}"/${PN}-2.47.1-bashisms.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
+
+	# 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
+
+	use java && append-cppflags $(java-pkg_get-jni-cflags)
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		--enable-ltdl
+		--enable-gdk-pixbuf
+		$(use_with cairo pangocairo)
+		$(use_with devil)
+		$(use_with gtk)
+		$(use_with gts)
+		$(use_with qt5 qt)
+		$(use_with lasi)
+		$(use_with pdf poppler)
+		$(use_with postscript ghostscript)
+		$(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
+
+	find "${ED}" -name '*.la' -delete || die
+
+	einstalldocs
+
+	use python && python_optimize \
+		"${D}"$(python_get_sitedir) \
+		"${ED}"/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/gthumb/Manifest b/media-gfx/gthumb/Manifest
index bd8beb7a0b67..e587886f67a4 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,3 +1,5 @@
 DIST gthumb-3.10.2.tar.xz 7582448 BLAKE2B 29c6e74706e0f78c4a641841861f9e4d996c5baa7e9a26e12352e6c124402bad24af1ee45871f413de4935abe53109ffad484ed8d853c131cfa438714e4226b5 SHA512 3b4d23a744e0663a0358d41697b1b01ec2faa3f12fc29853c82de8109dec5ef66c3827ed6e0efb97147e34ab9643b42daedc3ee7babe03f486ba589323604b74
+DIST gthumb-3.10.3.tar.xz 7582472 BLAKE2B 1e8274720428db05d4e14bb6a37ff55a74fe009ea551bda6fe75506f7187e03685903c2743fb6e66a33da73c974188528afad866c568bb14cc6f05749e08af7c SHA512 2d157644c6efbf4f4ab31c525a4eecc69fbdf31003f922d5fdf8866ca6bbb44e5b8bd7f809be12de41178ddcef30bb49029ea06eb4feb8398a6aa1b052c6ae38
 EBUILD gthumb-3.10.2.ebuild 2245 BLAKE2B 28314db4585b015cb840a5518fe88029b3bd5367c4001cad2b30456903bb3c55165e3e2de162159c5a93a7983c534b15a93b70a9155048888d67107db3bc7905 SHA512 794bc6f1e88a4a0d9c3deda091d0dda93ed5cf85c8f21c2d9ee6de0c98846b8002522fac9a6132e857abcf7746b04c7b7a7c3781a7b5b1d120f96402dd787bdf
+EBUILD gthumb-3.10.3.ebuild 2317 BLAKE2B 9f28dffa29d393041d1eb3f52677afca13dc427916b493313f61dff79420fe0ee71485f67e215926ab27acc9e8d208ffc386dda1fd5c1042cde15aa5951dec07 SHA512 f6404fc7513201b42eba5589b27bd96d27369931abc7f9095c5e61f3ee84177d7de954e2842f01c97deb382a99580d54452df47e552a72a4477c5991c7b2f667
 MISC metadata.xml 420 BLAKE2B d43a138708de7341b7b449d8bc7cbd6dedc471844ee9edac0b4cfa075ba582d5079d6eeacef69031cbfe9ef78493e50cc8f6810f3b80991cb552ffb3a2ca2757 SHA512 856096108784110fbbeeb1c3c5072697f7555edd733f31cfa4820f57e24a1e384f4ab609c77c3ce3a0d8e873c0193e493ea90085509b77686ab46e3f9ff3fc2d
diff --git a/media-gfx/gthumb/gthumb-3.10.3.ebuild b/media-gfx/gthumb/gthumb-3.10.3.ebuild
new file mode 100644
index 000000000000..79d24ac86c01
--- /dev/null
+++ b/media-gfx/gthumb/gthumb-3.10.3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
+
+DESCRIPTION="Image viewer and browser for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/gthumb"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="cdr colord exif gnome-keyring gstreamer http lcms raw slideshow svg tiff webp"
+
+RDEPEND="
+	>=dev-libs/glib-2.54.0:2
+	>=x11-libs/gtk+-3.16.0:3
+	exif? ( >=media-gfx/exiv2-0.21:= )
+	slideshow? (
+		>=media-libs/clutter-1.12.0:1.0
+		>=media-libs/clutter-gtk-1:1.0
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-plugins/gst-plugins-gtk:1.0
+	)
+	raw? ( >=media-libs/libraw-0.14:= )
+	http? (
+		>=net-libs/libsoup-2.42.0:2.4
+		>=dev-libs/json-glib-0.15.0
+		>=net-libs/webkit-gtk-1.10.0:4
+	)
+	gnome-keyring? ( >=app-crypt/libsecret-0.11 )
+	cdr? ( >=app-cdr/brasero-3.2.0 )
+	svg? ( >=gnome-base/librsvg-2.34:2 )
+	webp? ( >=media-libs/libwebp-0.2.0:= )
+	lcms? ( >=media-libs/lcms-2.6:2 )
+	colord? (
+		>=x11-misc/colord-1.3
+		>=media-libs/lcms-2.6:2
+	)
+
+	sys-libs/zlib
+	virtual/jpeg:0=
+	tiff? ( media-libs/tiff:= )
+	media-libs/libpng:0=
+	>=gnome-base/gsettings-desktop-schemas-0.1.4
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/glib-utils
+	dev-util/itstool
+	sys-devel/bison
+	sys-devel/flex
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Drun-in-place=false
+		$(meson_use exif exiv2)
+		$(meson_use slideshow clutter)
+		$(meson_use gstreamer)
+		-Dlibchamplain=false # Upstream still doesn't seem to consider this ready
+		$(meson_use colord)
+		$(meson_use tiff libtiff)
+		$(meson_use webp libwebp)
+		$(meson_use raw libraw)
+		$(meson_use svg librsvg)
+		$(meson_use gnome-keyring libsecret)
+		$(meson_use http webservices)
+		$(meson_use cdr libbrasero)
+	)
+
+	# colord pulls in lcms2 anyway, so enable lcms with USE="colord -lcms"; some of upstream HAVE_COLORD code depends on HAVE_LCMS2
+	if use lcms || use colord; then
+		emesonargs+=( -Dlcms2=true )
+	else
+		emesonargs+=( -Dlcms2=false )
+	fi
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/gtkimageview/Manifest b/media-gfx/gtkimageview/Manifest
index c92f8612d5e7..3f2302c2e774 100644
--- a/media-gfx/gtkimageview/Manifest
+++ b/media-gfx/gtkimageview/Manifest
@@ -1,3 +1,4 @@
+AUX gtkimageview-1.6.4-slibtool-undefined-references.patch 1038 BLAKE2B 6026cf188eb0d230f139667eadd8926eedc14bddacdcc338798ccf59422e06b48727c0a5faf172acefe03a710965a56dbf515a9ec4ffb48ceff99d9dcce33059 SHA512 0d4b3baa96c4cf7ac79623a963c2d95226858a5e06ba5eab6658f7737d9e3501fe9dd44f2716691b2a67176907010de5faf5363a6aa1d9e0981eca83412c03f4
 DIST gtkimageview-1.6.4.tar.gz 1158138 BLAKE2B b59abcbac71d4bd039bf9f3fc2f25f6590f91c4cc320cea90243a4889e020f1a54a3ca5d8a843f7482551ce8da6fafe6e3ce4fbc5a5e32fd6ceb4367b5abb9db SHA512 6378c640006e73aa1ffbf92eb9d4e42570707bc159f0a657b11f027d328088f5e89fc334de170de5ab1a39bed588b0b76f4633688a894cb7def16f1dea9f8e39
-EBUILD gtkimageview-1.6.4.ebuild 1214 BLAKE2B 3670654ed740e99716ef8fd930b70de468d5868770ad04ac8d5674640978b5013ff9e26d3db652512746646cd73669417cd2c6d2efea4af2146edbaf32279cb4 SHA512 cf47f073e3ce16b5d2b2d0689c69a2929c96b172b423ebf8dcc63e2f92ffbfe42fdc82abc21e24f2bcd6f3c26930a402b2a7e8242d6c26da9b5c6cd70c722800
+EBUILD gtkimageview-1.6.4.ebuild 1315 BLAKE2B d9353501d43fee619926ae26e176c49d04160053cf838ccee5ed1cf4bef0c8409895b8127f7efa22227b1bb7dde5136e652c6853e926743936cfd351a2bfb1f3 SHA512 228bf366b5a4031782487a26f11c0d4160ce2a6196430be184c0555b01b5798c029f58ce8c35ea96d2e697b68ea0e7240ec58d993b8380fb19a342e048e8f318
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-gfx/gtkimageview/files/gtkimageview-1.6.4-slibtool-undefined-references.patch b/media-gfx/gtkimageview/files/gtkimageview-1.6.4-slibtool-undefined-references.patch
new file mode 100644
index 000000000000..b323d74c2573
--- /dev/null
+++ b/media-gfx/gtkimageview/files/gtkimageview-1.6.4-slibtool-undefined-references.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/779127
+
+commit 7f1fc516fbfb185e77b0acaab84a25b666a55e21
+Author: orbea <orbea@riseup.net>
+Date:   Mon Mar 29 11:50:45 2021 -0700
+
+    build: Fix undefined libm reference.
+
+diff --git a/configure.in b/configure.in
+index bd01480..63eb587 100644
+--- a/configure.in
++++ b/configure.in
+@@ -23,6 +23,9 @@ GNOME_COMPILE_WARNINGS(error)
+ DEPRECATED_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+ AC_SUBST(DEPRECATED_FLAGS)
+ 
++AC_CHECK_LIBM
++AC_SUBST([LIBM])
++
+ PKG_CHECK_MODULES(DEP,
+     gtk+-2.0 >= 2.6.0)
+ AC_SUBST(DEP_CFLAGS)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 57c9f42..375dc44 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -41,7 +41,7 @@ libgtkimageview_la_SOURCES =        \
+ 	$(BUILT_SOURCES)	    \
+ 	$(libgtkimageview_headers)
+ 
+-libgtkimageview_la_LIBADD = $(DEP_LIBS)
++libgtkimageview_la_LIBADD = $(DEP_LIBS) $(LIBM)
+ libgtkimageview_la_LDFLAGS = -no-undefined
+ 
+ libgtkimageview_includedir = $(includedir)/gtkimageview
diff --git a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
index 707ce5975732..a5f5c5e507ff 100644
--- a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
+++ b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-GNOME2_LA_PUNT="yes"
+EAPI=7
 
+GNOME2_LA_PUNT="yes"
 inherit autotools gnome2
 
 DESCRIPTION="A simple image viewer widget for GTK"
@@ -19,11 +19,16 @@ IUSE="examples static-libs"
 RESTRICT="test"
 
 RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
+DEPEND="gnome-base/gnome-common"
+BDEPEND="
 	dev-util/gtk-doc-am
+	gnome-base/gnome-common
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.4-slibtool-undefined-references.patch
+)
+
 src_prepare() {
 	gnome2_src_prepare
 
@@ -47,6 +52,7 @@ src_configure() {
 
 src_install() {
 	gnome2_src_install
+
 	if use examples ; then
 		docinto examples
 		dodoc tests/ex-*.c
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index fe338f100a4b..338100839ec8 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,4 +1,4 @@
 DIST hugin-2020.0.0.tar.bz2 10371301 BLAKE2B f5092dfe3c61344f8b03e14dd85903ae6f5170989b6824578bd3350408d7a11be2c2f9cd83d030a3967b81e4125cf97af075d79136a93e06de3fac8901859c6d SHA512 4c55767c630ea03faf359bda606e5e9e7709a47ab41e821772da8c6da0cf658b1d31d7d8e96ea1c41ec61bdeb2da8c86c92b5d6964a9301732a13137178ec04e
-EBUILD hugin-2020.0.0-r1.ebuild 2118 BLAKE2B 85617fbf8640f4bef73589f6c93d5f20de441bf4016c0db1358d4616669e453bffbb16ff433b8922f56eb282890e677acf489f47816324aea810fb0cdebfae04 SHA512 179466d5fd0784d1156e23bcc2d8f54fd11b37de5e036301747159101baca9f6108598f5a9e319eb818ab012089615c6c3c416d9425f93d3bb792c307d3c3f21
-EBUILD hugin-9999.ebuild 2061 BLAKE2B 02d3b47b6a75b0cb1618a04f6267535bdf2e085eb01f24b50e943f1b2d1fe524224fb9d30a971ad901db6c4e2d4856c102b13aae6cc094b52265dd2dcbabe6ca SHA512 d15b5933ceb4e15a16a4cb437a0f09cb0655311daab2f21645a8700ec4d808174975e70b6966a796bb30f0255f1a0e2e7492d6e88ec813a9007b2a3e1eb029c3
+EBUILD hugin-2020.0.0-r1.ebuild 2119 BLAKE2B e697eebaa7c6e6afba08e1edbb179dfc7db8fb60a7f8e07cfe749936f9f943d42b71b21fef88ce10f56050f905fe6c42e53fc989e4685274c6e38e4d476d7559 SHA512 051eb7eff33fb3eb73465d769de6a755c8c3c5136f7191969ec1ab1f84f641caa259dc049b901327121b6ac690492da43224e30a94e2a6373c8e9686fafa69b7
+EBUILD hugin-9999.ebuild 2062 BLAKE2B 4a24726bf47c3ff2911c29cf6c8fe8fd3632c82ca54a1fe60c562ea3e202260c93e38d76b5ea6a1d934b3ff036019110ee15d45067e91effc43a3aafd426b56a SHA512 359170dfbae430c9210dc75945cc883eea5b7928d22ea191f9179674032a06a3d84bccbf28cefaaafca1dc7b91c1c14040f4c26dad6d0c48506fae41b6f1817c
 MISC metadata.xml 546 BLAKE2B efad9c27562890b23594411333a0ef827b7e54acde132ffdec4f664eae37fb3ab270950ef650e6caaea4bd3b69a7bed469e794dce51d59850cd06ff844e08836 SHA512 0d096754e2f6ef1468e6bdf7464e6f5cc1de06f20136b68be7aaf199cd78a10e4213678d875ff61d829f692dbd5b0728d50bb35eefb1de6af4e5e0fd7d91d350
diff --git a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
index 8a8381d740e3..7c550810e7c9 100644
--- a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit python-single-r1 wxwidgets cmake xdg
 
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index b55ba425e71f..4ec32d7007d0 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit mercurial python-single-r1 wxwidgets cmake xdg
 
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index b3c877b02c03..3de5807c6da2 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,12 +1,16 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.12-3.tar.xz 9174208 BLAKE2B 5ee9ab5196cb2dcbb2d210dfb71fbb63956bdfc33e97fa03a51f6884736dffc1227ec94d44a46c19eeb216a1896c06b0927678410e0171d855b77e13ab10c51e SHA512 c117fd1fe57478f66fb2b3bab1d6d908a643519a0e4b8026f138ba77778f29bb83e15a78a3b58b461a16cf2dcf66db84d6cc9e77532aab14f776dabf2eb8f24a
-DIST ImageMagick-6.9.12-4.tar.xz 9169012 BLAKE2B 2c1229907d14f60315f9ca2baf8c54380855119df4b4d00f01736a0c8c5c880f85e911c02767957f009cd60da12d86025637e3dfcfe296c9874e284eee70c332 SHA512 301637b0fc2b4f4b1ba79e3f6ed7e24e55dc749b3adf3afd408c750220647df17f4f5e70869d503c53feb7ef15b94159e4e92b5ba09ec50f9e7902d7fa261b84
-DIST ImageMagick-7.0.11-3.tar.xz 10151644 BLAKE2B f32234fd1f89dfd4ead816f06984b6f673235f368cebbdc19704e677e2a1802ef2212d489346e7f48239a6aa14e7a089b45259645879b5010773d6565e5b0a1e SHA512 9a5cf4fc2c325d435a04c54bec3502bfa86d8bfa0b91efc53e34f364de039bcea5318ea3ebdb10e0bd49767f29ce44ca209bcefb51c2676a6a55a2e97c6ebf9b
-DIST ImageMagick-7.0.11-4.tar.xz 10155508 BLAKE2B 914da94cfa933e21d01d31f57273989674a42171404ad10ba731f0c054d23ebb7ff66585b590535b01600c212c0039761d5dff36ce23dd79b6747fbbfd08acb1 SHA512 fedd0b01cc3b7d13429b2765d2bc8b4800fb228bbaaff35a5206ee52edc71a3fcd12d0832213eb9218804b3ca898b5de4594b98f77d7de8302087f350b4f028b
-EBUILD imagemagick-6.9.12.3.ebuild 7059 BLAKE2B 15ee8b4d1965bbae05ff93a7ccbbf2e40aa70f8111984895c85e1e78941f8b8403f94c423ed439e2ff3593f48964a481aa02f96e436f0f4bbc93e197018f3c45 SHA512 a868f2837298bd861abf52e88d1ead03c533a5f68a080ed2367748a409bb90ceb68415f9837be68f8f03d859e31aef34347594a22ba4250196e259a64be82126
-EBUILD imagemagick-6.9.12.4.ebuild 7066 BLAKE2B 1a8c103b4b74ec48f1d1a985e35315043f5e9306ca54183c457935279ad2e54038e65d20ac92b5d0ce3ad94d6a636179fb9b59eae087d1ea351ac12adf68e28b SHA512 443cc02aa96ba19fc040add6f56a099d2deedb72c1c2c074031dde18322c866e764d232de4d73dbf0189dc0a6777970ea5c2471d5b4e25f9bdae827f53431903
-EBUILD imagemagick-7.0.11.3.ebuild 7367 BLAKE2B 574aee956d82d649ff633bece498d743a3edec70f641da61565143572823c124e2cae9250214f8c9058490e52fffbdb2952eb385971134ba576a8f3c1208ac6b SHA512 ffaac421781cec3c38473b2398c57691cb33d0708afd1fb3918ad3007a2ebb9d0e1c48c6e81e2b49374066cc855bfffab3c7945a827a328b044f661eb20682d3
-EBUILD imagemagick-7.0.11.4.ebuild 7375 BLAKE2B 7654a1366679222fc571f074f0c7b5369e5cc9e0f5b10d29283c9ad2bbc43587aeddbad38a83961bff1fe64c69b295f2611324cfea4c09a66bbe45acd0d0366f SHA512 c082496c8c8e08f3d6d4e02cca1b8936ef0573a962f49449967dfd68d3b038405488887cf004627e3748478aa5f7ccfde44d2c93e1defd840baac931ee172c08
-EBUILD imagemagick-9999.ebuild 7375 BLAKE2B 7654a1366679222fc571f074f0c7b5369e5cc9e0f5b10d29283c9ad2bbc43587aeddbad38a83961bff1fe64c69b295f2611324cfea4c09a66bbe45acd0d0366f SHA512 c082496c8c8e08f3d6d4e02cca1b8936ef0573a962f49449967dfd68d3b038405488887cf004627e3748478aa5f7ccfde44d2c93e1defd840baac931ee172c08
+DIST ImageMagick-6.9.12-7.tar.xz 9156816 BLAKE2B 56a13ff744b15fb987232b70d9ea2a14b10de709011375da2b970e408d91079be38ccc5a301308734293c18c81d78a2e68ecee56b7d8478c6222cd7745b847ab SHA512 cfb261c60c07bc52cd491173a17040b33b0fa95f396d933fe9e14767cb5d009a8ebe7194949c2387c723d3a0492bc7b7a078ed89ce8a0024dd8ed73b40748d4c
+DIST ImageMagick-6.9.12-8.tar.xz 9159788 BLAKE2B ceb383d93cd70a2d5755a982a47a7f996b4e9cd4eaa7cfcb14d01fdc84904ccac9d897337616116f0fbf1bed7640ba93bcf5426552a83b45d2de455cbf0bda42 SHA512 e248aab0490eaf382a7be36679c23c0a84386302d5a1cd0d054af79fa95d8f6f03a5ad0f628cd818d453284f9b353168491ed58047338ec8eec15983d3007fed
+DIST ImageMagick-6.9.12-9.tar.xz 9161440 BLAKE2B 05c7e3290060fe83aaf1f88761fa2afe63b720fe397ab2f22264d1c4b28cc92c33a2f94782994dce33f8f4528df7cc60503460b23183f815cc43e169cf38c73c SHA512 90848fa3381c69c6526fe6473b9b847cfa81e500aa7ad2be32c4030de1fb84432d83c1dee75a90914e6a18d6aa747aa58696adec43ff61e797f92d0dbcfde01a
+DIST ImageMagick-7.0.11-7.tar.xz 10280524 BLAKE2B a4d0cb3e157bff25245d6c3bf3eba55d6f3693ba66d8c5efbc757b31077b1bac0753dca095f853455793355e92e8376a8e41acf3809115c6dbae47977190c42d SHA512 5c36aa566892f0e473ccec0058d7113779704cdf8f4d747132434216c9c0f304de5aafbbbcacc4b21d7e6224e3b9c9439fe6b446e28e821f614c2d1026a280e7
+DIST ImageMagick-7.0.11-8.tar.xz 10280632 BLAKE2B 99c41f09b740f4222b17efa41c8b54445ccb3cfd23aa16d6ae16433952e6c94a02c8db0ffaa3b51e432a2bddb39060b1789b4778f1d9f756b0b992d706a3884d SHA512 e4aa87b30bb75fba815cd4f617a7c0dba29523c03ad6670c7514842587678553d0b45100ccd6e041d59628cf30fe047243d440af78b39d0f82cd405ff0ea0f96
+DIST ImageMagick-7.0.11-9.tar.xz 10266692 BLAKE2B 18e2b7d5e8f93af68cd7a7379968279a1119d25a06bc131465c9ebb500f923664b4332c02828d0837fd1f15395de99b1bdacaf016f1a4a021d71dbe7d0878f46 SHA512 73ecb116fd8885f2ec88a12ae8b36c51b37de3e7e2aa2f9fbbd24a90bc0d78d7603663ec8003abea8af0f200a6176fb26998963a9bb90ce80ebc7feb2dd8921a
+EBUILD imagemagick-6.9.12.7.ebuild 7182 BLAKE2B d971cfc66508d794a3409e00c6165f9e78c7dfa40ca8e631499368be50efaa8d12ed08d2712c8bd0fc392245c22471bff5f2662c6abe89b301badeb9dc82de42 SHA512 8ebf8dd67a2efe586495f245bad587616a746bb8d161217d9680adbc714bb461403a171d3be4ff843c20e45f090de81fb5cb50ae5b128a5813d8199bee88fa12
+EBUILD imagemagick-6.9.12.8.ebuild 7190 BLAKE2B dd19343291540d9b16a9788d9f2f6b15066d4266bccd43007223c87aef52bb26d5525a54bba2e5d1db7dff888ab39aa8b9c254bf90933e272b648336ba1981d5 SHA512 9eafa9a51938be0e0b8ec28fb147cb71b9f0fc81f97ddc2b9d48bbeb45a21a39331ab22644fb8739feecf7d0b4130d1b2c9be006db9b5b623bbeadf8473a0c20
+EBUILD imagemagick-6.9.12.9.ebuild 7190 BLAKE2B dd19343291540d9b16a9788d9f2f6b15066d4266bccd43007223c87aef52bb26d5525a54bba2e5d1db7dff888ab39aa8b9c254bf90933e272b648336ba1981d5 SHA512 9eafa9a51938be0e0b8ec28fb147cb71b9f0fc81f97ddc2b9d48bbeb45a21a39331ab22644fb8739feecf7d0b4130d1b2c9be006db9b5b623bbeadf8473a0c20
+EBUILD imagemagick-7.0.11.7.ebuild 7340 BLAKE2B ecd38b0e0d7ed63543c514bdbf3f232ac2ca908891f2cab24a93fced4a08586eb207e3d236c8f1ee35361d743995f129e96e4f693eca30973f3c9320a7cd5a45 SHA512 258513e90922bb80e11c9a148d9d04a28ade01c6187281f6741ea2f384180aaf3ba81f25394bb58b7d6e28bc2379a41aad01a1b7c669b52efd5c5dc5bacc6d50
+EBUILD imagemagick-7.0.11.8.ebuild 7348 BLAKE2B 42e9b6cd1b6878fd985dc3b445dfa7f034ddaab981c59b8cedba865d349204a6cd046fbf3901c71ed1125f51ef5dcca35b4473a7803e790c35887cf0798c1b00 SHA512 85e4cb868711c678ddea99bd2442faf52a10c9dc5ba28a5b5dbc80a575073ac48eba4c9f1384b65911bd190fe5e7ffa7000d695086677d07c2d296e9eaa7db9b
+EBUILD imagemagick-7.0.11.9.ebuild 7348 BLAKE2B 42e9b6cd1b6878fd985dc3b445dfa7f034ddaab981c59b8cedba865d349204a6cd046fbf3901c71ed1125f51ef5dcca35b4473a7803e790c35887cf0798c1b00 SHA512 85e4cb868711c678ddea99bd2442faf52a10c9dc5ba28a5b5dbc80a575073ac48eba4c9f1384b65911bd190fe5e7ffa7000d695086677d07c2d296e9eaa7db9b
+EBUILD imagemagick-9999.ebuild 7348 BLAKE2B 42e9b6cd1b6878fd985dc3b445dfa7f034ddaab981c59b8cedba865d349204a6cd046fbf3901c71ed1125f51ef5dcca35b4473a7803e790c35887cf0798c1b00 SHA512 85e4cb868711c678ddea99bd2442faf52a10c9dc5ba28a5b5dbc80a575073ac48eba4c9f1384b65911bd190fe5e7ffa7000d695086677d07c2d296e9eaa7db9b
 MISC metadata.xml 1226 BLAKE2B 09876ac633363817b503a307e2cc0a500cfdcc1256cbb3b3e595600a0c913aa7ad252eb4dbe18b911bfcc9f06ec7b8046e0c2e3882eec305e471080bd76de906 SHA512 da1bb41d877614a237ea14379614a509fb58d58f4e93e56500e6aa0007c0515e6d90731c5df9e387f36632a210276a6983784cede64119453c965a9fc7e2ea4d
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.4.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.7.ebuild
index 7ff90f249dff..69de151f32bc 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.12.4.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.7.ebuild
@@ -1,27 +1,36 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
 
-MY_PV="$(ver_rs 3 '-')"
-MY_P="ImageMagick-${MY_PV}"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
 HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/6.9.11-60"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 )
+	svg? ( xml )
 	test? ( corefonts )"
 
 RESTRICT="!test? ( test )"
 
+BDEPEND="virtual/pkgconfig"
+
 RDEPEND="
 	dev-libs/libltdl:0
 	bzip2? ( app-arch/bzip2 )
@@ -64,13 +73,12 @@ RDEPEND="
 	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
@@ -88,7 +96,7 @@ src_prepare() {
 	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
+	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
@@ -98,7 +106,7 @@ src_prepare() {
 	if test -n "${mesa_cards}"; then
 		addpredict "${mesa_cards}"
 	fi
-	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
 	if test -n "${nvidia_cards}"; then
 		addpredict "${nvidia_cards}"
 	fi
@@ -196,7 +204,7 @@ src_install() {
 		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
 		install
 
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
 	dodoc {AUTHORS,README}.txt ChangeLog
 
 	if use perl; then
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.3.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.8.ebuild
index 923c0a8e8415..d17773f5081b 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.12.3.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.8.ebuild
@@ -1,27 +1,36 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
 
-MY_PV="$(ver_rs 3 '-')"
-MY_P="ImageMagick-${MY_PV}"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
 HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/6.9.11-60"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 )
+	svg? ( xml )
 	test? ( corefonts )"
 
 RESTRICT="!test? ( test )"
 
+BDEPEND="virtual/pkgconfig"
+
 RDEPEND="
 	dev-libs/libltdl:0
 	bzip2? ( app-arch/bzip2 )
@@ -64,13 +73,12 @@ RDEPEND="
 	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
@@ -88,7 +96,7 @@ src_prepare() {
 	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
+	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
@@ -98,7 +106,7 @@ src_prepare() {
 	if test -n "${mesa_cards}"; then
 		addpredict "${mesa_cards}"
 	fi
-	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
 	if test -n "${nvidia_cards}"; then
 		addpredict "${nvidia_cards}"
 	fi
@@ -196,7 +204,7 @@ src_install() {
 		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
 		install
 
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
 	dodoc {AUTHORS,README}.txt ChangeLog
 
 	if use perl; then
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.9.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.9.ebuild
new file mode 100644
index 000000000000..d17773f5081b
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.9.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2021 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/ImageMagick6.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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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/6.9.11-60"
+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 )
+	svg? ( xml )
+	test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? (
+		gnome-base/librsvg
+		media-gfx/potrace
+		)
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	X? ( x11-base/xorg-proto )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/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.11.3.ebuild b/media-gfx/imagemagick/imagemagick-7.0.11.7.ebuild
index 8f1725c766d6..53b6fa068e7a 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.11.3.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.11.7.ebuild
@@ -22,7 +22,6 @@ HOMEPAGE="https://www.imagemagick.org/"
 LICENSE="imagemagick"
 SLOT="0/7.0.11-0"
 IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-RESTRICT="!test? ( test )"
 
 REQUIRED_USE="corefonts? ( truetype )
 	svg? ( xml )
diff --git a/media-gfx/imagemagick/imagemagick-7.0.11.4.ebuild b/media-gfx/imagemagick/imagemagick-7.0.11.8.ebuild
index 5256a3f29d2f..769cb4c0e00a 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.11.4.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.11.8.ebuild
@@ -22,7 +22,6 @@ HOMEPAGE="https://www.imagemagick.org/"
 LICENSE="imagemagick"
 SLOT="0/7.0.11-0"
 IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-RESTRICT="!test? ( test )"
 
 REQUIRED_USE="corefonts? ( truetype )
 	svg? ( xml )
diff --git a/media-gfx/imagemagick/imagemagick-7.0.11.9.ebuild b/media-gfx/imagemagick/imagemagick-7.0.11.9.ebuild
new file mode 100644
index 000000000000..769cb4c0e00a
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.11.9.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2021 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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.11-0"
+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 )
+	svg? ( xml )
+	test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? (
+		gnome-base/librsvg
+		media-gfx/potrace
+		)
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	X? ( x11-base/xorg-proto )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		--without-jxl
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	if [[ ${PV} == "9999" ]] ; then
+		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+	else
+		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	fi
+	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index 5256a3f29d2f..769cb4c0e00a 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -22,7 +22,6 @@ HOMEPAGE="https://www.imagemagick.org/"
 LICENSE="imagemagick"
 SLOT="0/7.0.11-0"
 IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-RESTRICT="!test? ( test )"
 
 REQUIRED_USE="corefonts? ( truetype )
 	svg? ( xml )
diff --git a/media-gfx/imageworsener/Manifest b/media-gfx/imageworsener/Manifest
index 391642012af0..af3cd397612c 100644
--- a/media-gfx/imageworsener/Manifest
+++ b/media-gfx/imageworsener/Manifest
@@ -1,3 +1,3 @@
 DIST imageworsener-1.3.3.tar.gz 662243 BLAKE2B 6b34dc111c5b2dcc25fdc717b7ec8d4268ca1b67c31cca58b5e1983643f1e3b78543a3bdba24b3692a05cb83a887bfcf0e7b09307535994d280056a0047c8b0d SHA512 ebe8a31819cf665d8d8d7e789d873de03206e74e100ea99b2d8dc6ac2590025ff0058066daeb17ebfaa6cf49222e33c8a9efa83f39f5e2b9b49d27a3ee1b027f
-EBUILD imageworsener-1.3.3.ebuild 1051 BLAKE2B 43356b73389511107b05407879eb78d796672e18c3f31ab9e2af270bd2dd6f1eb716c3e3bfb8e5df1b9a454f499793032daf6141e6a8ae942900dddd3d3230fb SHA512 af31bee059e18397f64910922ade7e8202a0eb8aa506d0f4229bd03061ae7fc0ea4fa6c94e8c8cbc60d852c054ef7834cb6215d703cd86f6eb27c578e1c6079e
+EBUILD imageworsener-1.3.3.ebuild 1035 BLAKE2B 9b677ce01fbc57cd7fd1e04c4e2f421ae2b8b6a39192bab5d70e1ddd46beea3328ecffde5d7245db92cd534d9d4f249de70c3f7f16244ca3828ee43fe6b913ad SHA512 e31439d3094fb56c612e7dfb58dd79939b1a784906539e3ec9ace6ca7f10c490ae1eedd504ce6a8f84dbba93d4357aea5a5efc48cece390bc97bbdc3bf3a2105
 MISC metadata.xml 245 BLAKE2B 72d076c6c3242be9c56106016a71f78c926c6c7fe92ae2d22c9cb5084eb1cf3cb4f930e6439c43b57e12c261fe77ef99c469b5629ecafb052dcedef6e346dc86 SHA512 385f7a990e82a7352c25fdf12ac028a67cc41112a9b5cde2e66140d26fdca910e6187d7965b622c3026843f6064d352a1884d5ff7b36aef0d0fab49d364a8a56
diff --git a/media-gfx/imageworsener/imageworsener-1.3.3.ebuild b/media-gfx/imageworsener/imageworsener-1.3.3.ebuild
index 0b004e603e38..336ee113102f 100644
--- a/media-gfx/imageworsener/imageworsener-1.3.3.ebuild
+++ b/media-gfx/imageworsener/imageworsener-1.3.3.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils
-
 MY_P=${PN}-src-${PV}
 MY_PN=imagew
 
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 3344f3c76232..ed0531c4bfbd 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,7 +1,5 @@
-AUX missing_atomic_include.patch 319 BLAKE2B 8b122e0f1b61cbe98413b21f90c97826fc75b64c4c12f70b2a3048d4c14151f9f790e5c55fbea6eed518f9bdae57e2620b2be15351d86ae339fd4e38925aa57b SHA512 05f3f392f115d918aae78bb6c82b7461212a26bab826e02b686ad03f8c3f8e4fe0b1c1b89e2982e8912922ef987596501ef4145474e2745bf89487e9ba6134db
-DIST inkscape-1.0.1.tar.xz 32051632 BLAKE2B d17ae49c42908e24aade2216f5adaf56b14ac830decfa2c07ea711c034d144251d5c039f516934a6d004b48165ab3a70d40a7cb7e658ae5e97ef37b392a7d556 SHA512 70145e02fe7c3ffbfa3dcea690bfe3315131fb9a507c70bcdc1d0db394d207e3bd04d7cc86c3b625597bddfd2b6e09a03841aece6d2ffb6517fe1c619193ec96
+AUX glib-2.67.3.patch 1945 BLAKE2B 8093eb444a360481e0f6fd89334f4ca6a693c6df0d0cdc5bee0bfcc308fc9e8b8090c3ca8c7c772ad7ac074d56e81ff3202f1bfd4ee526e0927b28118d27d53c SHA512 c355c7e67acb29fe41c50af4ac8724c636516394c33e9d529eed23eb6d7bbf014bb0f2f9981ccea9e1b3b98a3f87dc256dc385099eb218353e2b220a3d130172
 DIST inkscape-1.0.2.tar.xz 32421620 BLAKE2B c3f9c37b15343ba0955a6d06810aef5fb9e035a240f99579301b8cd93858a62b5ed1a3ff528a9642ec74b8900305495236cf7f4c672864369a4e33dca3b34bd4 SHA512 f4fbc627c0f07db11194715c505b771a60af29a9a7f8be0232e4f7eb6b1c5814c3f160c2003d64ec62aeb92ef44174320a47aa6b6abc7a67cc27c996cba9522d
-EBUILD inkscape-1.0.1-r1.ebuild 4141 BLAKE2B 09e9fd9978b22e2a7fd25562570c37b7283dd53641571a113cb32fad32bd4a4e2a33686d56a7a630895cb728933e9bbd28c0a50b1950a180219d3ae3823443a7 SHA512 70636fd302b86c1da68d240c0febb15720e0ae0f51901fc9189b41d0f35cadae2790c5bfe2d5a221b40d3ecb108419a060a255092cb2280f7128da35f71fc313
-EBUILD inkscape-1.0.2-r1.ebuild 4108 BLAKE2B ac7e2d31b2501d803a0aaa837f9d43781537bc6cb9ac9b6739a0111e51250f199b2a93fc24b5ff0af68c5571ada89799dd50914c5fba7c2d3b7bf63f6a5928db SHA512 9bc3c6556758de0e8d4ba85863f3dd04ca37b73922ee3b1264c57ed9c5214d56887eaa2fa1a3120353c1871db727400cef56c27bc905cd9256e7bff6717d784b
+EBUILD inkscape-1.0.2-r1.ebuild 4150 BLAKE2B 756fec945d62135590e0347adcbb98436159c487134b883ec5316d7140062377e638c3275b092a13baff70a692ed287f1081271163fa39ae5bdb6720dba2526d SHA512 bb997baf9aa3d21325af5be627908d7ff20a019f23fe680954d85e1b48c579c9bb4902f1d5f6de820a6415243e7b4c997f496ca877bacc8bc64debb80a51afee
 EBUILD inkscape-9999.ebuild 4062 BLAKE2B 95b6edfd2512eb33365bf8c19968a51f02cea399569caeca8f20bf6a000936fd7c2932e2fe389c05b931084e9133f01ef6cd8a28d6e8cc9137a5538e9254f151 SHA512 f871de44af448c640f208637bb65eba87dfde5d992e1f7886ba54b31e322054f2069d818fb5b6032d4b5a59177ec9e2cf46f0ce964ec90f56d6370146ed55fd0
 MISC metadata.xml 983 BLAKE2B 5b149700a92f0f4e8a07a643eb004ee6669a668a8a04dd74f13883c858bd2457f8a7f193f64313bf3203fa628484e502a0252272ae8f665a9ebe661589f3637d SHA512 7ab0de464a4dece17f9421bf44a660590c4d453447603a57568a092f90a0005e751cd599ca0923152fc101558c46c479dc65c13a8727b6071a43b1703b459b1e
diff --git a/media-gfx/inkscape/files/glib-2.67.3.patch b/media-gfx/inkscape/files/glib-2.67.3.patch
new file mode 100644
index 000000000000..b959bcd76fdc
--- /dev/null
+++ b/media-gfx/inkscape/files/glib-2.67.3.patch
@@ -0,0 +1,65 @@
+From eb24388f1730918edd9565d9e5d09340ec0b3b08 Mon Sep 17 00:00:00 2001
+From: Harald van Dijk <harald@gigawatt.nl>
+Date: Wed, 17 Feb 2021 09:13:49 +0000
+Subject: [PATCH] Fix build with glib 2.67.3.
+
+As of glib 2.67.3, <glib.h> can no longer be included in extern "C"
+blocks. It was indirectly included by both "types.h" and "color.h".
+"types.h" already does not need to be wrapped in an extern "C" block,
+"color.h" does but can be modified not to, so with that changed they can
+be moved out.
+---
+ src/3rdparty/autotrace/autotrace.h | 6 +++---
+ src/3rdparty/autotrace/color.h     | 7 +++++++
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/src/3rdparty/autotrace/autotrace.h b/src/3rdparty/autotrace/autotrace.h
+index 2ce6f272a9..e56be9a74c 100644
+--- a/src/3rdparty/autotrace/autotrace.h
++++ b/src/3rdparty/autotrace/autotrace.h
+@@ -23,6 +23,9 @@
+ 
+ #include <stdio.h>
+ 
++#include "types.h"
++#include "color.h"
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif                          /* __cplusplus */
+@@ -35,9 +38,6 @@ extern "C" {
+  * Typedefs
+  * ===================================================================== */
+ 
+-#include "types.h"
+-#include "color.h"
+-
+ /* Third degree is the highest we deal with.  */
+   enum _at_polynomial_degree {
+     AT_LINEARTYPE = 1,
+diff --git a/src/3rdparty/autotrace/color.h b/src/3rdparty/autotrace/color.h
+index e50ab30ae0..88651db9f7 100644
+--- a/src/3rdparty/autotrace/color.h
++++ b/src/3rdparty/autotrace/color.h
+@@ -24,6 +24,10 @@
+ #include <glib.h>
+ #include <glib-object.h>
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif                          /* __cplusplus */
++
+ typedef struct _at_color at_color;
+ struct _at_color {
+   guint8 r;
+@@ -43,4 +47,7 @@ void at_color_free(at_color * color);
+ GType at_color_get_type(void);
+ #define AT_TYPE_COLOR (at_color_get_type ())
+ 
++#ifdef __cplusplus
++}
++#endif                          /* __cplusplus */
+ #endif /* not AT_COLOR_H */
+-- 
+GitLab
+
diff --git a/media-gfx/inkscape/files/missing_atomic_include.patch b/media-gfx/inkscape/files/missing_atomic_include.patch
deleted file mode 100644
index b298550c5c89..000000000000
--- a/media-gfx/inkscape/files/missing_atomic_include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/ui/tool/node.cpp	2020-05-01 15:18:52.000000000 +0200
-+++ b/src/ui/tool/node.cpp	2020-08-18 01:25:05.266412299 +0200
-@@ -7,6 +7,7 @@
-  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
-  */
- 
-+#include <atomic>
- #include <iostream>
- #include <stdexcept>
- #include <boost/utility.hpp>
diff --git a/media-gfx/inkscape/inkscape-1.0.1-r1.ebuild b/media-gfx/inkscape/inkscape-1.0.1-r1.ebuild
deleted file mode 100644
index 861ac2210cd7..000000000000
--- a/media-gfx/inkscape/inkscape-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="xml"
-
-inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
-
-DESCRIPTION="SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://inkscape.org/gallery/item/21571/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
-IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
-openmp postscript spell static-libs svg2 visio wpg"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}/missing_atomic_include.patch"
-)
-
-BDEPEND="
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/poppler-0.57.0:=[cairo]
-	>=dev-cpp/cairomm-1.12:0
-	>=dev-cpp/glibmm-2.54.1:2
-	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40:1.4
-	>=dev-libs/boehm-gc-7.1:=
-	dev-libs/double-conversion:=
-	>=dev-libs/glib-2.41
-	>=dev-libs/libsigc++-2.8:2
-	>=dev-libs/libxml2-2.7.4
-	>=dev-libs/libxslt-1.1.25
-	dev-libs/gdl:3
-	dev-libs/popt
-	media-gfx/potrace
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:0=
-	net-libs/libsoup
-	sci-libs/gsl:=
-	x11-libs/libX11
-	>=x11-libs/pango-1.37.2
-	x11-libs/gtk+:3
-	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		media-gfx/scour[${PYTHON_MULTI_USEDEP}]
-	')
-	cdr? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libcdr
-	)
-	dbus? ( dev-libs/dbus-glib )
-	exif? ( media-libs/libexif )
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	spell? (
-		app-text/aspell
-		app-text/gtkspell:3
-	)
-	visio? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	wpg? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-"
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-	')
-	dia? ( app-office/dia )
-	postscript? ( app-text/ghostscript-gpl )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.65
-"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${P}_2020-09-07_3bc2e813f5
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
-		-DENABLE_POPPLER=ON
-		-DWITH_NLS=ON
-		-DENABLE_POPPLER_CAIRO=ON
-		-DWITH_PROFILING=OFF
-		-DWITH_LIBCDR=$(usex cdr)
-		-DWITH_DBUS=$(usex dbus)
-		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
-		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
-		-DWITH_JEMALLOC=$(usex jemalloc)
-		-DENABLE_LCMS=$(usex lcms)
-		-DWITH_OPENMP=$(usex openmp)
-		-DBUILD_SHARED_LIBS=$(usex !static-libs)
-		-DWITH_SVG2=$(usex svg2)
-		-DWITH_LIBVISIO=$(usex visio)
-		-DWITH_LIBWPG=$(usex wpg)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
-
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
-
-	local extdir="${ED}"/usr/share/${PN}/extensions
-
-	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
-		python_optimize "${ED}"/usr/share/${PN}/extensions
-	fi
-
-	# Empty directory causes sandbox issues, see bug #761915
-	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
-}
diff --git a/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
index 6e4e248cea3a..d70335ea2fbb 100644
--- a/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
 openmp postscript spell static-libs svg2 visio wpg"
 
@@ -100,6 +100,10 @@ RESTRICT="test"
 
 S="${WORKDIR}"/${P}_2021-01-15_e86c870879
 
+PATCHES=(
+	"${FILESDIR}"/glib-2.67.3.patch
+)
+
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
 		tc-has-openmp || die "Please switch to an openmp compatible compiler"
diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest
index e2689fbc9c3a..7957465bbd8c 100644
--- a/media-gfx/lximage-qt/Manifest
+++ b/media-gfx/lximage-qt/Manifest
@@ -1,3 +1,5 @@
 DIST lximage-qt-0.16.0.tar.xz 100920 BLAKE2B 17a41013b7d7e599662a698fa24b6b15a550b2211dd818fbfda19b0fb9439bf77b63b2d8248ad8a65605fee8fc73c78d294ae86401d5660f6d798aa775273709 SHA512 2da46d23567cff7044a884e14b30de36b3a19d802768585b7c3332897b0af2fc42993ed9bb9d062db7988a0526cc7357a09fbac5f283a615b109ea8dfbf474b5
+DIST lximage-qt-0.17.0.tar.xz 109772 BLAKE2B e49c6fb2b3db9b5ff829f7003862ab8124773d82a540019f2ba64c48fa4fffff0eb5f317b8222be95b1b030b5d64a961d4c96298275a835f56816dc857cc6e27 SHA512 fb7867f5589fa45f3e2d37dcd0733c49fb5439206b11d2a43020305c5c7d222796aa0cf2dbf19d5fc7829a34d3877241cb4bb36ea2883a41503eadd39deaf8e0
 EBUILD lximage-qt-0.16.0.ebuild 959 BLAKE2B 3a34d5641750e187e535301f03c17e1658c05e8601eae6d29f3b93be0767cc5961a8880a8653a90ecd90ee92947169bc42687f2c5c3acf8c92dd064dd86ff5eb SHA512 d3bf56b433b6a1350d6c721dad015a336f6f3c5614f5c9b86e4856fd131e45592d744beaa9266c5b84e1e16da3655076ee51cb20b4734600fcacc09ad2566763
+EBUILD lximage-qt-0.17.0.ebuild 938 BLAKE2B 5d3bef87e5584628a8391fad17648b0a5641d070bcbd763ae6a0a8ac26cd713529206f4b58b31ebc583faaf1637a7a22f7688f1a1faa0f9f523f73beedf80a91 SHA512 535ace519ac94cb0cdfa70eff46402046714a00cf6ce1c9b89d5f983003690d07b32176a285983d8a1b16564934acdfc72d6ec0cb15afa8da4171f3bfa8c248f
 MISC metadata.xml 316 BLAKE2B 4efdea74e716c40a0a63878d175f612e550669866bada61cbc0b22d5320a7bbb6a7158796bd5337e71c8aa70d42a977142d9466ac42fbb91f5eb2adcd83fb714 SHA512 b3cad1b8550e54a57940f2cea14c38bd714da71dc772ae073065c6c56c5d4d02a7258dc3ffc226a194d290e7b968a198fa07b02f6c011282896f9ba7173c3c53
diff --git a/media-gfx/lximage-qt/lximage-qt-0.17.0.ebuild b/media-gfx/lximage-qt/lximage-qt-0.17.0.ebuild
new file mode 100644
index 000000000000..ff0920adf74e
--- /dev/null
+++ b/media-gfx/lximage-qt/lximage-qt-0.17.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Qt Image Viewer"
+HOMEPAGE="https://lxqt.github.io/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.9.0
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/libexif
+	>=x11-libs/libfm-qt-0.17.0:=
+	x11-libs/libX11
+	x11-libs/libXfixes
+"
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/nvidia-texture-tools/Manifest b/media-gfx/nvidia-texture-tools/Manifest
index 1b63817fa8d8..be6822945d8f 100644
--- a/media-gfx/nvidia-texture-tools/Manifest
+++ b/media-gfx/nvidia-texture-tools/Manifest
@@ -9,6 +9,6 @@ AUX nvidia-texture-tools-2.1.2-test_path.patch 846 BLAKE2B 51a9014da038c9015b767
 DIST nvidia-texture-tools-2.0.8-1.tar.gz 935227 BLAKE2B aef1801795f6102ac7c96df236de0e8534bfacfc72d297ff3bcd13b530829e8848f33065477a1fb2ffaa35d75bd9e34913d3551469aa814cab8cb76f2f04e721 SHA512 8e7ac79daaa10a2b1b64cfc8d6b37b37698e2a46f925cc33cdfd8e4b36705db8836edec6f98c5d6da475d7773f4a5826b5cebc120b7c5a6f9515906e2e4fae9d
 DIST nvidia-texture-tools-2.0.8-patchset-1-r1.tar.xz 9604 BLAKE2B b93c9586688dd690668c9d57d533c3460b008cf357a202cc6dc315ab6d24cd3d796d8596024d193bdd9100fab52970b323f03dc16b4f72b3e551167bb46513b5 SHA512 988ea0731b7f98f804a715404fc8cb8a8956a6c6b795f0ce8570f800dac3319f222bac8f12ab6fde50bbec3d68926ed3b24516931f9aebe2a7ce0fcae0dc8e13
 DIST nvidia-texture-tools-2.1.2.tar.gz 45172897 BLAKE2B de1827ccf9900499e089e7f0ccdf2acab089afb2c4d8e41978c3cf653aca81f8d9136bdd0e4467e7f5534b44f7329883f1ca66508c289200b23dfdd1158a9fc6 SHA512 4285e1a348c6ab9abbc34a499879fe1c8ff6976da01d0397eb95e19ae7fb566f3efb57613d2cee31e6c694b497a28b050e377267e137a4d114d093d681824adb
-EBUILD nvidia-texture-tools-2.0.8-r4.ebuild 1506 BLAKE2B fa68fcb7198d50acf90bfe8973e1cb7e7a657dcbaadf65c35640de3d7b999259ca6771ed5de15a512bbf493076c9efc895c03d75a77a60cce7e31dfa76618fcd SHA512 f7e293b826a9a0e1b9993b5046ebcb2b44fe0008340fb4ad5ce00ed69fe693a6a60301b60829a9fe2b62f05f5d5b4fafa31735b767fea2d3f9f3abaa08641591
+EBUILD nvidia-texture-tools-2.0.8-r4.ebuild 1509 BLAKE2B e225f9c2337221f96a95a991da54ea42d1c295b1e2514a34b7592d1b8186d044d637787a4957f19e3f0adedeafff0727f12bb4e50a558f8e6c6d66424c361f57 SHA512 571f32347ebca8009cff74ce1445cb6358e8613c19577b8824ab4da7a0ebf8f21ac526e202a95a13a6b653be1dfc86e55d8b1afdd35ad782c5be92c312d4b8d4
 EBUILD nvidia-texture-tools-2.1.2.ebuild 1124 BLAKE2B e4562a10601c49f9ef2d9a7332c027bca00049bfa03e12a7e744557d73ebd47bdac9b2f3569aa1ad96b59e6c77c00e48039780d440ef2a174e89e7b61d702865 SHA512 1717a44a98d3faed523f2727989dab39fa07554864ee5400c30e92030dab750c4182d68c167563d515c34b30120ff786cace46605e4dae15e38bef822a0ec0bf
 MISC metadata.xml 548 BLAKE2B 7ee44cd2eba3f160653796a39cd0d86bb3e9510690dbca309f22e373a7d90022db794cb6e099cc7d0c6195ee842d1482059f717db1f6a1ccfb16b7617ac78dbd SHA512 7614e56190a58544ac155951e1961d7238ed91c512a10db44b3f88bb03e21ecf7b3128ade8d2316df626a65794d673e0d78a61ee35690817a397f3ee8cf98f0f
diff --git a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild
index c71aa223a894..d0e927d8fc91 100644
--- a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild
+++ b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils eutils
+inherit cmake-utils edos2unix
 
 DESCRIPTION="A set of cuda-enabled texture tools and compressors"
 HOMEPAGE="http://developer.nvidia.com/object/texture_tools.html"
diff --git a/media-gfx/openexr_viewers/Manifest b/media-gfx/openexr_viewers/Manifest
deleted file mode 100644
index 52d355a0a162..000000000000
--- a/media-gfx/openexr_viewers/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX openexr_viewers-2.3.0--with-cg-libdir.patch 811 BLAKE2B 0f2789e55efd1cd25308abfde02bb67fe77a099a509a4bac78eca078de6b18e326705718db061338b4881414e688fa307d70d132a0ba0ff72eaade127234b732 SHA512 02f579d246936f1ebb8e6afa36e21c10cc6fc7eb1a24e168b75c27aafc6a6abccead8e9879d1128a1d6f22ddab4162c97c2df5940c6b71cc6d6fc2cb89527bda
-AUX openexr_viewers-2.3.0-fix-configure.patch 2449 BLAKE2B 226728e4183784337ab684b9245f74110772156fea1b4be8441c7bb14fe2887484691c200e05604f9308204c9221d5b7e7f3c343e5db3cdf0a8896fb13fc5590 SHA512 29a22fee7f88ce1359e74185f8baffa9e734f20555943cced71c198f5c716ab8f8aa5686f11f40e5ebc10911cb82453b784eeac06632f6700d8f4fd3a9ec5e1a
-DIST openexr_viewers-2.3.0.tar.gz 532154 BLAKE2B 353c69a6efbdab6ef7669f531be22b34c11cce3cc790b513eb99d323fc5e1827cb4b0656eab2db61ee89f01c02169c3c855cc4222275964156f31928ae08e015 SHA512 2b7ce7c75733f390bec5c3f9c49edc08da2631e3a45ae20a732dddf9fd813137c3124d0c6e90450fa2b9068f0c40c76374ee7ff9cf0d8697080b2b180c624c5d
-EBUILD openexr_viewers-2.3.0.ebuild 1302 BLAKE2B 41ecfac33b3bcffed0b173914aa9f0794d91c0488714b2bfffdca25e5d212f1b7a6b73b3dfcfef7f7b2c96e35d4b3ff7847e86d9ab76c1fbea5130544113ab70 SHA512 7245b8b44d28f53b437fde3a46ca37dbf8c6846983b02c45297b4b4a7afd77dcc748bd1bceebd437963faf8fe9a8d880740fc49e6e0d46a7c40462f609947f0d
-MISC metadata.xml 379 BLAKE2B 3f58950f3fccc797478abbd2b60325904cc3288586e4a180a366e0b99bb7ffa4a08022138c658b3e0db861a720232b44b7bf4bb2b2bdb7f59856272961e1c6c8 SHA512 97d3ed7e0ee8f419d36df6b6ccc3b3e704445935b76fab412b4287ac1b88688591f775927e1cc333a85a64818cbe1c9c3e760d2ab734215c0f558639ca033b6a
diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0--with-cg-libdir.patch b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0--with-cg-libdir.patch
deleted file mode 100644
index 9d118e362d4c..000000000000
--- a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0--with-cg-libdir.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/m4/path.cb.m4 b/m4/path.cb.m4
-index 7e38708..b5675b1 100644
---- a/m4/path.cb.m4
-+++ b/m4/path.cb.m4
-@@ -10,9 +10,17 @@ dnl
- AC_ARG_WITH(cg-prefix,[  --with-cg-prefix=PFX  Prefix where Cg is installed (optional)],
- 	    cg_prefix="$withval", cg_prefix="")
- 
-+AC_ARG_WITH(cg-libdir, [  --with-cg-libdir=PATH Directory where Cg libraries are installed (optional)],
-+	    cg_libdir="$withval", cg_libdir="")
-+
-   if test x$cg_prefix != x ; then
-     CG_CXXFLAGS="-I$cg_prefix/include"
--    CG_LDFLAGS="-L$cg_prefix/lib -lGL -lCg -lCgGL -lGLU -lpthread -lglut"
-+    if test x$cg_libdir != x; then
-+       CG_LDFLAGS="-L$cg_libdir"
-+    else
-+       CG_LDFLAGS="-L$cg_prefix/lib"
-+    fi
-+    CG_LDFLAGS="$CG_LDFLAGS -lGL -lCg -lCgGL -lGLU -lpthread -lglut"
-   else
-     case $host_os in
-       darwin*)
diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch
deleted file mode 100644
index f9d51d5045b6..000000000000
--- a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 0ae7531..f2cdfee 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4,8 +4,7 @@ AC_SUBST(OPENEXR_VIEWERS_VERSION, 2.3.0)
- AC_CANONICAL_HOST
- AC_CONFIG_SRCDIR(playexr/main.cpp)
- AM_CONFIG_HEADER(config/OpenEXR_ViewersConfig.h)
--AM_INIT_AUTOMAKE(1.6.3)  dnl Require automake 1.6.3 or better
--AM_MAINTAINER_MODE
-+AM_INIT_AUTOMAKE
- 
- 
- LIBTOOL_CURRENT=24
-@@ -19,7 +18,7 @@ AC_PROG_CXX
- AC_PROG_INSTALL
- AC_PROG_CC
- AC_PROG_LN_S
--AC_PROG_LIBTOOL
-+LT_INIT
- AC_PROG_MAKE_SET
- 
- dnl
-@@ -124,19 +109,8 @@ AC_ARG_ENABLE(threading,
-               [multithread="${enableval}"], [multithread=yes])
- 
- if test x$PKG_CONFIG == xno && test "x${multithread}" != xno ; then
--    ACX_PTHREAD(
--    [
--	AC_DEFINE(HAVE_PTHREAD)
--	OPENEXR_LIBS="$PTHREAD_LIBS $OPENEXR_LIBS"
--	OPENEXR_CXXFLAGS="$OPENEXR_CXXFLAGS $PTHREAD_CFLAGS"
--	OPENEXR_CTL_LIBS="$PTHREAD_LIBS $OPENEXR_CTL_LIBS"
--	OPENEXR_CTL_CXXFLAGS="$OPENEXR_CTL_CXXFLAGS $PTHREAD_CFLAGS"
--	CC="$PTHREAD_CC"
--	
--	AM_POSIX_SEM()
--    ],
--    [AC_MSG_ERROR([POSIX thread support required])])
--    AC_MSG_NOTICE([multithread true, LIBS = $LIBS, CC = $CC, CXXFLAGS = $CXXFLAGS])
-+    AX_PTHREAD
-+	AC_DEFINE([HAVE_PTHREAD], [1], [define if POSIX thread support is available])
- fi
- 
- 
-@@ -233,10 +155,13 @@ AM_PATH_FLTK(have_fltk=yes, have_fltk=no)
- dnl
- dnl check for Cg
- dnl
--if test "${have_fltk}" = yes; then
-+AC_ARG_ENABLE(cg, AS_HELP_STRING([--enable-cg],
-+	[enable nvidia cg support [[default: test]]]), [want_cg="${enableval}"], [want_cg=yes])
-+
-+if test "${have_fltk}" = yes -a "${want_cg}" != no; then
-   AM_PATH_CG(have_cg=yes, have_cg=no)
-   if test "${have_cg}" = yes; then
--    AC_DEFINE(HAVE_FRAGMENT_SHADERS)
-+    AC_DEFINE([HAVE_FRAGMENT_SHADERS], [1], [define if Cg support is available])
-   fi
- else have_cg=no
- fi
-@@ -251,20 +176,10 @@ AC_C_CONST
- AC_C_INLINE
- AC_TYPE_SIZE_T
- 
--dnl gcc optimization
--AC_MSG_CHECKING(for gcc optimization flags)
--old_cflags=$CFLAGS
--CFLAGS="$CFLAGS -pipe"
--AC_TRY_COMPILE([#include <stdio.h>],
--[ printf ("hello, world"); ],
--[ EXTRA_OPT_CFLAGS="-pipe"],[ EXTRA_OPT_CFLAGS=""])
--CFLAGS=$old_cflags
--AC_MSG_RESULT([$EXTRA_OPT_CFLAGS])
--
- dnl Platform-specific stuff
- case "$host" in
- *darwin*) 
--  AC_DEFINE(HAVE_DARWIN) 
-+  AC_DEFINE([HAVE_DARWIN], [1], [define if compiling on darwin platform (OSX)]) 
- 
-   dnl OS X universal binary support, requires --disable-dependency-tracking
-   AC_ARG_ENABLE(osx-universal-binaries,
diff --git a/media-gfx/openexr_viewers/metadata.xml b/media-gfx/openexr_viewers/metadata.xml
deleted file mode 100644
index 80b95a6d4e5c..000000000000
--- a/media-gfx/openexr_viewers/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>media-video@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="cg">Add support for nvidia's cg shaders</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">openexr/openexr</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild b/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild
deleted file mode 100644
index 3c0b4ab63350..000000000000
--- a/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="OpenEXR Viewers"
-HOMEPAGE="https://www.openexr.com/"
-SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cg"
-
-RDEPEND="
-	~media-libs/ilmbase-${PV}:=
-	~media-libs/openexr-${PV}:=
-	virtual/opengl
-	x11-libs/fltk:1[opengl]
-	cg? ( media-gfx/nvidia-cg-toolkit )
-"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=( ChangeLog README.md )
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-configure.patch"
-	"${FILESDIR}/${P}--with-cg-libdir.patch"
-)
-
-src_prepare() {
-	default
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-openexrctltest
-		--with-fltk-config="/usr/bin/fltk-config"
-	)
-
-	if use cg; then
-		myeconfargs+=(
-			--enable-cg
-			--with-cg-prefix="/opt/nvidia-cg-toolkit"
-			--with-cg-libdir="/opt/nvidia-cg-toolkit/$(get_libdir)"
-		)
-		append-ldflags "$(no-as-needed)" # binary-only libCg is not properly linked
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir=/usr/share/doc/${PF}/pdf \
-		install
-
-	einstalldocs
-}
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 81c44b0192c4..605099b0f386 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -9,6 +9,6 @@ AUX openscad-9999-0001-fix-to-find-lib3mf-2.patch 1317 BLAKE2B f8e42492d2a85fc8a
 DIST openscad-2019.05.tar.gz 14604881 BLAKE2B ed7d6088606fab44284363da73643e556f07c0f0a7a223bdf718dcc36a82158bf23e315724ea520d63a3f1331207df0ea7b0ade817f01dd39b67ca6f36529d56 SHA512 073053f625ffa4fea6ed836396b7ff4b87b26cf7500b06c804983afc0f1dfd3d78bfb81b3fd217c3939b0ec915d85b0c7990773eaf968512a150deaa0399df13
 DIST openscad-2021.01.tar.gz 15817555 BLAKE2B 417857d704fa3c14312641ebda983eb85a1e3bc0d517a235fa3bd2523fce6f93c1ea526c330179bc35f03e6c73d3cd7c4c57cd71480088c21bfc99bb020ab7cd SHA512 8deaa26bf4c295c12da38f323d2b2e6f827851337f5bc1cc9c79afc083c9f913c19a263086e6e853bf2c8434c1ccc705ea22ddb02dc99d39bb1e5e03fc58d128
 EBUILD openscad-2019.05-r5.ebuild 2370 BLAKE2B c467ccc9cc544545b780d915611f04e5db32bbd6eb106d140c45400bdc9979ee55459e1fcce1286c3b95b9b043b001fdbb40af24ad97684c1693f4cc7a7fbc46 SHA512 9b525433b12e4d125cb568032fca3d1b8a7ab699b4887e7b84172776973d965861046c6b1fa7c19439118220bd0cb585bf5f6ae81f51700cbe7d8c6aacab7b11
-EBUILD openscad-2021.01.ebuild 2314 BLAKE2B a9b9faf82fa7212da43685b7feec011d7cadf983a4da8141820ab06423d21734c377be62e426f86d090b39092f4976f03aaebcdf2d3669552f897065ef5fb73a SHA512 a9f2d5affe0d715fc22641c71f034383428012f0ec4f77711db20684e7dcce26c26f4609b050402e76a0e7e78a88c7c619bbfebe7036a99375d31fd62c442700
+EBUILD openscad-2021.01.ebuild 2313 BLAKE2B fa4b810dad64447261a69a7991c4becce0505a1f29986779de14d916bd31f302d3f535dbfb21da0a871a540a847bb99ab2c17bba0ccd57c423aa9d3e3836096d SHA512 68111d61a0007fd2bf5ff1606251d2eebef147610b0ee429bf3a679d561932c6cead82339a83eb2bba1fa7714ffda6a0f12694e55ebdf28d0544d63ec7015822
 EBUILD openscad-9999.ebuild 2711 BLAKE2B 8ffeccfc4b473f47f7d787ec8c942d91b483aa9ee73e104a40c117c5bd35304c810b397f46438c879e416739b8586c35ba5af76f6c4fea92e37fdaef47294aac SHA512 c74b01903711779da96d591b11ef346279b3f8958c96d2c71b17fc65094e42a3b1e684666cd30883d5ea5ec6dd50bea59550911f9a1460cb399f9ec101b3a8f4
 MISC metadata.xml 1432 BLAKE2B a3521113144173687a24d729db70bbdbfeaf312889ba7461b8440501992da1d457676fbf1cb233cda5affdc024ca932b891e5751785d100fcc0af4ee1da8521f SHA512 ea8b7a46e3de907858841b305e3c6815da5a0a77bd11499beac33de70cf11af72b1332225fa762a85626b6463a7e0a46b35b4140d23a3d25d8c6c60cd90d5b79
diff --git a/media-gfx/openscad/openscad-2021.01.ebuild b/media-gfx/openscad/openscad-2021.01.ebuild
index 5a5a5f2805dc..bdfcfe89c0f5 100644
--- a/media-gfx/openscad/openscad-2021.01.ebuild
+++ b/media-gfx/openscad/openscad-2021.01.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
 IUSE="emacs"
 # tests are not fully working and need cmake which isn't yet
 # officially supported.
diff --git a/media-gfx/opentoonz/Manifest b/media-gfx/opentoonz/Manifest
index 459f2e52ac50..a0c475517ab5 100644
--- a/media-gfx/opentoonz/Manifest
+++ b/media-gfx/opentoonz/Manifest
@@ -1,3 +1,3 @@
 DIST opentoonz-1.4.0.tar.gz 53531141 BLAKE2B adb7a85fb0581d92119b5f6b75dc320428ea0763955f8c883072cba78045acdeea75a5cea82065a29d2c59f53b4843d8ff92690c9a47c01605b4702fd36d6c13 SHA512 777f5d59ec8076e1e53a81347e15bef198bea77449073f1e9d5fdd371a61e20fd6dc8b26c6656c783959782bd71008fbb63c05742aaa50c92bd317aded7d0649
-EBUILD opentoonz-1.4.0.ebuild 1817 BLAKE2B 63407ff2f79ce44b991ca53ffa0d606f605f203cae9ce95749293afc29e25f9802061884d1425e82c5a43da4a6fd477087dff9da03faa53e11e92482ce74cf4a SHA512 66e8e879c11a5bd55a9125f786bf2bad513def93eb95113f79c1172202365bcad8a9f655a9fc39459d529427590e1182e0b636eb3bc1ef5187e4c2e6e0c265a3
+EBUILD opentoonz-1.4.0.ebuild 1817 BLAKE2B ac23db342d8452b16996094c6c54a230ac2999e5ab448409899295a4b065734cef7c26dd4f64b771f560fabdde3a0f92d8381b0956cbfeb5b084badea82a6eae SHA512 2e5aea7c1d3b4e0bf5e294096bd68b81e5fe79984b19d4714d6661aa08dc633140f02f26e2332a89dfd6a59d04e6ba2990b6c1463a74768a574c7ae030a92de0
 MISC metadata.xml 483 BLAKE2B 1bf3e7b5b52878a5a985d77c599103b95c1216b49e5d0a1310f4733b077163bf7c2816e651f789e1feb71e2523c650f8dcd4c4fa5d0cd893b1794433c2eacaba SHA512 bb7db97672a8195197d42d1b8476699a0e3758c102c9d64bfd6b6193259d201465869faf7e84e22319707521e15c2a0e712f008339f75b97015683a019284bc0
diff --git a/media-gfx/opentoonz/opentoonz-1.4.0.ebuild b/media-gfx/opentoonz/opentoonz-1.4.0.ebuild
index cccd2e4ca023..e18b20946951 100644
--- a/media-gfx/opentoonz/opentoonz-1.4.0.ebuild
+++ b/media-gfx/opentoonz/opentoonz-1.4.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+CMAKE_MAKEFILE_GENERATOR=emake
 inherit cmake xdg-utils
 
 DESCRIPTION="An open-source full-featured 2D animation creation software"
@@ -48,7 +49,6 @@ DEPEND="
 "
 
 CMAKE_USE_DIR="${S}"/toonz/sources
-CMAKE_MAKEFILE_GENERATOR=emake
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/media-gfx/peps/Manifest b/media-gfx/peps/Manifest
index 55f892733d97..f72b253106c9 100644
--- a/media-gfx/peps/Manifest
+++ b/media-gfx/peps/Manifest
@@ -1,3 +1,3 @@
 DIST peps-2.0.tar.gz 55421 BLAKE2B 6d259fe66c0e0cb413d9d66ee4d495bb5957f3a233a5878bd4b6b12639d098191e58de9a8fc1f09c713ac74d6e13f589989b4482309e1757cf3c822907c0fa2f SHA512 38940b4288c688d7a5f2a71d260b0b0aafc849988bba6859244a7409b4b08a2d3c1b43adcc940c7af4ff9313b7203ea92858fc855ddf2864548566d78890d767
-EBUILD peps-2.0-r1.ebuild 1204 BLAKE2B 8c13eb7e741ff4dc134c5c2ae715da53b2e0259d02021ce04f286b29d95fc0845f4290d1c80b549c037e5bd94861e298730630dc1b59a69b8f98175957433991 SHA512 a7d13c0426b308f27010384d5f54aff31940e9f942a26778c7bee607696b88617e7a55b1e2413db92d5c45cc337ecb1907bce310ec3ed2afede581ee71fd4dad
+EBUILD peps-2.0-r1.ebuild 1194 BLAKE2B 48278622b6c96b633bab2913f590b921b188eb828f162669427fdd5b18da328e85c8a2edaae89137ad04d752ef6934e76b8e789171c32a16a0f49ad10fcfec1b SHA512 451b39be963fc3ac476255b63b1ab0e2a411751f9219a0f0dc2d2693b4620c5821604495b31fed849f47e35ade6583501ae69a3a2070a59f045b6dcd294b960d
 MISC metadata.xml 512 BLAKE2B c69d2d5a0d510523cbc652a01e4e99bceef0946bb7ef836c931026af679bbf7ce32fa795b98d9c3d54eaf043186b9c96c87fa57c594504d011d8fbc093ee5393 SHA512 3ee45ee8181f04c3d1bd36170eb0ec59906c9c35962c78e5c21e656bdc240e39d6c788e7eb33189c1142a9098e6da3639ebc10063713332c49b32af4c4055ab5
diff --git a/media-gfx/peps/peps-2.0-r1.ebuild b/media-gfx/peps/peps-2.0-r1.ebuild
index f094d7b5a1ca..e3253b9329d4 100644
--- a/media-gfx/peps/peps-2.0-r1.ebuild
+++ b/media-gfx/peps/peps-2.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Preprocess and convert EPS files to bitmap with Ghostscript"
 HOMEPAGE="http://peps.redprince.net/peps/"
diff --git a/media-gfx/photopc/Manifest b/media-gfx/photopc/Manifest
index 3bb25a044508..96688298dd90 100644
--- a/media-gfx/photopc/Manifest
+++ b/media-gfx/photopc/Manifest
@@ -1,3 +1,4 @@
+AUX photopc-3.07-implicit-declarations.patch 995 BLAKE2B d07e2ecdc6d5740c70084821a78707058008929db1bc3f944f7bb60c0160bfbfea972fd6ee8c163db3dfd71ca6873eab6bd03f66711f2d18f5f20e42116a1e3e SHA512 02caf623d49fbd513124fe595562c99abac26d5485bcfe9437149d058245302030cde9a7a556760f7e98a783e1b064e61485cb8a5a873f83111c07f751cc1022
 DIST photopc-3.07.tar.gz 183668 BLAKE2B 283adf1664ec48c439cd1343d5015d8cc591f401d6a59edd8c70d9f6c69bb051e9a7c20a72898da98be2e483e0e9c2e0a2db527fe3f94b5ca7ff15ab9f743161 SHA512 2346da12e8276024a33582806898660da74613edd7fe8ee3f707e505197ba6072c31d58a24b540021e60117d81f553360a7efa57924db9cd0a4e428d64c0c1d3
-EBUILD photopc-3.07.ebuild 501 BLAKE2B 292f1960f6108787d7253abe78f982a7b1563db8c84cdd1403cef3ad54cd90b16ba2f16632e32b42684c1bcb886ba495c77f1660d2fb1dce409a203ccd352a58 SHA512 43507f6ff25a5ed40d29e3f9793e6d6f3ce4ea169aa153ddeedc916ad00b8240b01ec3e855edb03fd500b08240dcd168d7e5bb574f63a3b4b62ea36c49d9df26
+EBUILD photopc-3.07.ebuild 557 BLAKE2B c1715350ec16b1eff15751058ffa7e321c3a51f887c0ff9bc6cae0035867171f908d795e33fe995a38f9e069e8f185285afe61f76511537b9d934ed35cebf9f1 SHA512 cc812fd69d9eeac676d2d7120e9655704acb6855898d6ebf12d56d139b9f9dd6baa7b79ff6d99f084d1c40a7ccdeee33dff20c3c0355963a6067bd1bc4d50868
 MISC metadata.xml 244 BLAKE2B 8ab61f2a63517bc1812136e7dafb4b3604933a9b2de6ffa14750941629793010b8ef0f078aad96b4cb9cdd0536481dbb004586564b0fa35f9da36872e7752fb0 SHA512 183bf97fb61d17612a38ae6403231067e26472c99e09a8a0cc20b802cf6572b2332205d7cae88166631252aac379c90c33e79ea0960f4710a6df37bc92f16ed0
diff --git a/media-gfx/photopc/files/photopc-3.07-implicit-declarations.patch b/media-gfx/photopc/files/photopc-3.07-implicit-declarations.patch
new file mode 100644
index 000000000000..dcf155f85190
--- /dev/null
+++ b/media-gfx/photopc/files/photopc-3.07-implicit-declarations.patch
@@ -0,0 +1,36 @@
+diff --git a/ctimez.c b/ctimez.c
+index 21a529d..ecd5616 100644
+--- a/ctimez.c
++++ b/ctimez.c
+@@ -48,6 +48,7 @@ static char *rcsid="$Id: ctimez.c,v 1.7 1999/11/09 18:55:03 crosser Exp $";
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <stdio.h>
++#include <string.h>
+ #if TIME_WITH_SYS_TIME
+ # include <sys/time.h>
+ # include <time.h>
+diff --git a/eph_cmd.c b/eph_cmd.c
+index 7f90ad6..462eff0 100644
+--- a/eph_cmd.c
++++ b/eph_cmd.c
+@@ -89,6 +89,7 @@ static char *rcsid="$Id: eph_cmd.c,v 1.20 2001/08/28 06:28:01 crosser Exp $";
+ #include "config.h"
+ #endif
+ #include <stdio.h>
++#include <string.h>
+ #include "eph_io.h"
+ #include "eph_priv.h"
+ 
+diff --git a/fnames.c b/fnames.c
+index bf2db6d..8d19f4c 100644
+--- a/fnames.c
++++ b/fnames.c
+@@ -53,6 +53,7 @@ static char *rcsid="$Id: fnames.c,v 1.7 2001/01/11 06:49:57 crosser Exp $";
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <stdio.h>
++#include <string.h>
+ #if TIME_WITH_SYS_TIME
+ # include <sys/time.h>
+ # include <time.h>
diff --git a/media-gfx/photopc/photopc-3.07.ebuild b/media-gfx/photopc/photopc-3.07.ebuild
index 1d85a3d57011..a2e80fb2afd2 100644
--- a/media-gfx/photopc/photopc-3.07.ebuild
+++ b/media-gfx/photopc/photopc-3.07.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,7 +12,10 @@ SRC_URI="mirror://sourceforge/photopc/${P}.tar.gz"
 LICENSE="photopc"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.07-implicit-declarations.patch
+)
 
 src_compile() {
 	emake AR="$(tc-getAR)"
diff --git a/media-gfx/png2ico/Manifest b/media-gfx/png2ico/Manifest
index 268838f2be49..9f84558bf509 100644
--- a/media-gfx/png2ico/Manifest
+++ b/media-gfx/png2ico/Manifest
@@ -1,4 +1,4 @@
-AUX png2ico-2002.12.08-memset_and_strcmp.patch 277 BLAKE2B 4661418441743f931cbf8e397a837000a9d88e129e287652ba3ce57a0f67e6e9c67ad623387fe6a28185c249265200705c183218572030f3f393bb8cb787bb19 SHA512 a89d8dc1b65e6cfc3c1201a255a1b16ef22ae0fbc02e3b8a0ac097f1d62c472960f42132d84fc9fada900138a6d49af60455999cd28d2565035a69a5244994c9
+AUX png2ico-2002.12.08-memset_and_strcmp.patch 281 BLAKE2B 6bb5d3903110ea4a44d61c25270aab5111c378b700d658c9379cd863c0f92c1ec5cb18dfa234082f8566772416b3b8abcd35b61901ecc5974590729f83df84b5 SHA512 602c324d355df15059c9ceb540ffc680eaca133be692f2b8579394f71e5fd91ea2e5ba0a740bbbf0eac508a9563161a0eb891b5e9e6b3efd52504b7357c533b1
 DIST png2ico-src-2002-12.08.tar.gz 26527 BLAKE2B 08f6c733b1dd9000f71a34d85d4f52cda62b3117e5d8a5889d4c3209988522ac3b549b0c295e3c9e17e1d3ac98f9c1c5e69555310d2c488d515bb197204bd0ed SHA512 f9410d2d15a14b5350cab7bf93f91b80f9e1d0b6a1fdae8b8850d11f29c9f4000bc8c3778fe24acec75f1f182d5ea383cff38e22b8ac5da6432c0a7a2d0e3208
-EBUILD png2ico-2002.12.08.ebuild 812 BLAKE2B 75ae9dfc9b0f4a81272a73ba5397df70fbe44f7448059b2b870df3cbcc5241f098cf54c474f471b43e27e1c3c4514d6fc65d1b7c55bb0b0066b2fb3db1e8ba35 SHA512 3982aff7692f98faf43a05176deda7a9d55f7d42393e964fd18bff784d10cbbd3631f51a7d68889c1cf67db93d7edc7473c17727c77473264153713fa4b9540d
+EBUILD png2ico-2002.12.08.ebuild 814 BLAKE2B fd40704d714384edf45e0b4ca97f28c1d706030061c7f42ce3b1f4d2f1d750328631fdde0ced48bae79e68d0e0ce1ac5af186cbfde8dd28acfa2af55fba73193 SHA512 3754fc03b8a1e919e2736c65ec43eb3d5598b0571af47eae67f486d6c6e93d2a56e5c145be3fea57a5e0487d87ba266806720e3fe7596a76bf608377de95ff9f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/png2ico/files/png2ico-2002.12.08-memset_and_strcmp.patch b/media-gfx/png2ico/files/png2ico-2002.12.08-memset_and_strcmp.patch
index 96720bebd18f..195ff1a47749 100644
--- a/media-gfx/png2ico/files/png2ico-2002.12.08-memset_and_strcmp.patch
+++ b/media-gfx/png2ico/files/png2ico-2002.12.08-memset_and_strcmp.patch
@@ -1,8 +1,8 @@
 png2ico.cpp:133:31: error: ‘memset’ was not declared in this scope
 png2ico.cpp:443:34: error: ‘strcmp’ was not declared in this scope
 
---- png2ico.cpp
-+++ png2ico.cpp
+--- a/png2ico.cpp
++++ b/png2ico.cpp
 @@ -33,6 +33,7 @@
  
  
diff --git a/media-gfx/png2ico/png2ico-2002.12.08.ebuild b/media-gfx/png2ico/png2ico-2002.12.08.ebuild
index 732301d1bfe0..1a732423a74a 100644
--- a/media-gfx/png2ico/png2ico-2002.12.08.ebuild
+++ b/media-gfx/png2ico/png2ico-2002.12.08.ebuild
@@ -1,26 +1,31 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="PNG to icon converter"
 HOMEPAGE="http://winterdrache.de/freeware/png2ico/index.html"
 SRC_URI="http://winterdrache.de/freeware/${PN}/data/${PN}-src-${PV/./-}.tar.gz"
+S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="media-libs/libpng:0=
-	sys-libs/zlib:="
+RDEPEND="
+	media-libs/libpng:0=
+	sys-libs/zlib:=
+"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}
+PATCHES=(
+	"${FILESDIR}"/${P}-memset_and_strcmp.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-memset_and_strcmp.patch
+	default
 
 	sed -i \
 		-e 's:CPPFLAGS=-W -Wall -O2:CXXFLAGS+=-W -Wall:' \
diff --git a/media-gfx/pngcrush/Manifest b/media-gfx/pngcrush/Manifest
index b0554c681a9e..69bc4ef12fa8 100644
--- a/media-gfx/pngcrush/Manifest
+++ b/media-gfx/pngcrush/Manifest
@@ -1,3 +1,3 @@
 DIST pngcrush-1.8.13-nolib.tar.xz 66104 BLAKE2B dad0bce2e8f2a135d085343da98ebecfb78a6b05019d43be1b0b1f940ce23ffa980bcb08e8948b6b8cc3efc04bc6ae92a0b9cf8ea8183e27eebfae4c6c48e31e SHA512 c073d573e9b13b72fa39b178271ce65d1a19fef35943ef0a9e6121a5c66d9db212aaad38ab777c5b44e20a107eb677003acbdb4a354bcb2dc40f535a97d9df0e
-EBUILD pngcrush-1.8.13.ebuild 735 BLAKE2B d967fe468e6b852ee6982221bf42ff34a7494fee31677bacf585d30a4e33a05bb087a46607061fc9b0638e70b3c4c059e75e64db1c04fe7aab6b2d81b6d00c9b SHA512 28efe8f74e071ec5b6dce77114d4b2fc0d55e29ef0ffa3f3519a4722bb84e607baaa7de958c9f4746d9b0fb6d839d8a388a33bb38c2a4c895e9ac48556973d28
+EBUILD pngcrush-1.8.13.ebuild 742 BLAKE2B d30edb52e432f6edf56aed4f0f22885bdaa067c1489ea6fed8487959cc1bd16708bd7c5b6b4cecbd917226603afbcc688073995918dab23afe1713cb146470ed SHA512 b0e0709d443da7131bc4400a5c597670f06e7e3019a6446cbae0572ee143129dd0c2a041342031c6000a6704a82f9ccfc2b20517ea696020bffc9370386ec835
 MISC metadata.xml 496 BLAKE2B 82f643a07a4a3e7e3dd7e1cd52e36c66f0b945fdcfb6ec423220cce5286f76fe3ccce7c2d20e33259c7688320ba252914bf7b29dae0b59fcc0e9e4cd1c204745 SHA512 6991a3d0f64d838920ab4828f762f7304efdea7df088f87e57dca0315708813d223af9fe831f0c8eddde6462f4f3b6dada6e4b1903bf2d772352bf1ec7ce78ec
diff --git a/media-gfx/pngcrush/pngcrush-1.8.13.ebuild b/media-gfx/pngcrush/pngcrush-1.8.13.ebuild
index 5f8886dfc50a..9c2048706892 100644
--- a/media-gfx/pngcrush/pngcrush-1.8.13.ebuild
+++ b/media-gfx/pngcrush/pngcrush-1.8.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pmt/${P}-nolib.tar.xz"
 
 LICENSE="pngcrush"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="media-libs/libpng:0=
 	sys-libs/zlib:="
diff --git a/media-gfx/pngnq/Manifest b/media-gfx/pngnq/Manifest
index a1997ec6e2e5..0269b64ac043 100644
--- a/media-gfx/pngnq/Manifest
+++ b/media-gfx/pngnq/Manifest
@@ -1,5 +1,5 @@
-AUX pngnq-1.0-libpng14.patch 378 BLAKE2B b9bb0babb5bd6152c8c9cba7149641f55dd6a424ef153b46112769db564c86c01e49a6eb9145c206262d1765b5f9f82aade789419d6a21b2cfdc49323bb49305 SHA512 7a91550806ecc84bb5646b8a654f26d059ed253389626f5069de9e43b0667d2e2c3ee7a94efa96e908b1083d9af5efb80f942a78b6547b0bca8827c245f154fa
-AUX pngnq-1.0-libpng15.patch 355 BLAKE2B e5d2a1e28efaf677f4fcee58deb6743c29c546acfe905d3858e6f9da239f69e6d30f0beb9cffd55b50323f902441c687c44ff9f5e6d62d318a92bdd6fc20c58d SHA512 5ae6782a36bff27560318d5ca98101a49c0d66db71682d4976407af18e637740c68c1eb4b609d1b301e23d3dd62ef4a8bbe180f941e5333e91e17d900f66e96c
+AUX pngnq-1.0-libpng14.patch 382 BLAKE2B e85fbdccf1765efff65b638dccab6d3e5afa83aa6782f8be8188414985e18000bb68273e2250d2063eac56bca4f1e0481dadf747fc05e94f1d340eb21cdfdc59 SHA512 4194becadf43c3e8c1d63a15e3de1118c386dab4e4e7e6e5622dbc896d3c1cab5ffaac6f6f8c7a504fdf303bb6c0fad44351e7d89b304cd3c4d15908e347fe4f
+AUX pngnq-1.0-libpng15.patch 359 BLAKE2B f031f310aed6a30ed48e8e0754f3e392ccbc2fe9a929443885f3e2f040fb081f5122d6e1c9b89e63bdc0594051faebdcf53e5085a01b1520f256e60d1e06e9b6 SHA512 e2542833a6950b8e8ab09a9973a0df237d5667ce9d75b2e909485398d38517bd7d7d0237d8b1c3875c4538a6157219870cf6c7e29a98e6a1dbb93d11476d1059
 DIST pngnq-1.1.tar.gz 117372 BLAKE2B 94c670342d514c577c386b8fe207307f057e5c0c3816b35ab2b625258051269410b9c5ad45f89c047715bb1ad927909498a6faef5591eb61039fd68c94fc44a6 SHA512 3bbc4ace1375517a7a73bbc65ff39512ef316e4b67fc3941cd0b7269e584a26f915f30591f8aa1c44eea73fe4ebe9519063a7bc426841e412c648aaa188be234
-EBUILD pngnq-1.1.ebuild 541 BLAKE2B 0cb65094d6077bf8fe9a4d37e5acdcd67622920af11c23134dff94e01eb632afafb24771dfa79ac7a95f08c7dbed2449b2a0824a03a99e488fa33606c2fbdbf5 SHA512 2c6c8e8f6b8e06945c36bd9532855e2da452f44c9796c347807ba99a8beb734d5643ce0ff195b0c09cfd4711e50b2fe0ed2e7e4ced37a9fef674c11220e9ce1e
+EBUILD pngnq-1.1.ebuild 542 BLAKE2B 034bc177d9d3b5cdd4c957abd3b2c33f3704187d7cdf53beffa4fd65422484774b315cdcdacc7e30359f110829c5ca46aa4b8da7cfdccee6c40961f56f6976fe SHA512 33a67929a65e92063da4f266f0c496ec12109fe620abf737b6fb32b323df9acf06fcd1d1513e4c463d22f031996a32ece5677a0d9a78aa5cf19d204144b19460
 MISC metadata.xml 242 BLAKE2B 3a91325709735643b586ce59973577915db70517caeede4f75c3e1363c35faf2a691c693666f8eeffa5609fd0d84bbb66ab368d163edb3e9fbc9cfcf25e0b7d2 SHA512 8490ed93a302cb46556d266836db2d7c6a317b2dd903cfcde06b8fb9d1455b925cd6114f41acac1175e1da6a707bf9f0ab5737d9b52936fb4e75974fd8e8d60a
diff --git a/media-gfx/pngnq/files/pngnq-1.0-libpng14.patch b/media-gfx/pngnq/files/pngnq-1.0-libpng14.patch
index e2eb9c8972e5..effef6d9d069 100644
--- a/media-gfx/pngnq/files/pngnq-1.0-libpng14.patch
+++ b/media-gfx/pngnq/files/pngnq-1.0-libpng14.patch
@@ -1,7 +1,7 @@
 http://aur.archlinux.org/packages.php?ID=10325
 
---- src/rwpng.c
-+++ src/rwpng.c
+--- a/src/rwpng.c
++++ b/src/rwpng.c
 @@ -80,7 +80,7 @@
       * have used slightly more general png_sig_cmp() function instead */
  
diff --git a/media-gfx/pngnq/files/pngnq-1.0-libpng15.patch b/media-gfx/pngnq/files/pngnq-1.0-libpng15.patch
index 7590431dcd3a..7f791fc109ad 100644
--- a/media-gfx/pngnq/files/pngnq-1.0-libpng15.patch
+++ b/media-gfx/pngnq/files/pngnq-1.0-libpng15.patch
@@ -1,5 +1,5 @@
---- src/rwpng.c
-+++ src/rwpng.c
+--- a/src/rwpng.c
++++ b/src/rwpng.c
 @@ -31,8 +31,9 @@
  
  #include <stdio.h>
diff --git a/media-gfx/pngnq/pngnq-1.1.ebuild b/media-gfx/pngnq/pngnq-1.1.ebuild
index d2580bf868b5..7d5cce6344f9 100644
--- a/media-gfx/pngnq/pngnq-1.1.ebuild
+++ b/media-gfx/pngnq/pngnq-1.1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 WANT_AUTOMAKE=1.13
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Pngnq is a tool for quantizing PNG images in RGBA format"
 HOMEPAGE="http://pngnq.sourceforge.net/"
@@ -12,14 +13,18 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="BSD pngnq rwpng"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="media-libs/libpng:0="
-DEPEND=${RDEPEND}
+DEPEND="${RDEPEND}"
 
 DOCS=( NEWS README )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0-libpng1{4,5}.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0-libpng1{4,5}.patch
+	default
+
 	eautoreconf
 }
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 1e7fed71fda6..5ba7388f8934 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,8 +1,6 @@
 AUX sane-backends-1.0.24-saned_pidfile_location.patch 345 BLAKE2B dcf7cbd5787c7a225450e03663e7c1ca69dd40fc58e3de9d994fde6a66635d6a3ca20d2886fe7cbc6a7ed3202f8f3a8c7e3d9ea4072b4418a7a43048427a06c3 SHA512 49519b8fea68292b8cbd7bdcaf5b4803a1b890800e17015ace1d662e4503cc0844f191793c8f42cd6aa7e9922ee9f961d4784e30f22abc497973be1978bf1b24
 AUX sane-backends-1.0.27-disable-usb-tests.patch 336 BLAKE2B 00fd225a4426405d515f5b6641c86e6d9035a588a776aaec26eaa4e10beebf0a9fd97da991646b7964a867c422da2bc1cf93560d1ba326f0086675036338ff00 SHA512 64cce489e87de31e1a865b86d5829ae4914a30f47e27b07fba68629261cefcd617b8eed272c94b7554545e4802283c5bd5b53f79f54403d875726b38378ae74d
 AUX sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch 459 BLAKE2B d127c054b3e4f8aca5de54888e7a37c986515350aac84bb66ca195fca57138cbe3ac3f29b0982e4019b5b599b81984dceacd5523f794a04cfb5d416a051a1e61 SHA512 d9bcce33482db2f15ee094a244359fafdce196984a799509d9b16e24f46feb3aecd419520e65ca9513b40ff4975d793bec05924bfdd69586d9a6f3feb42cccc3
-AUX sane-backends-1.0.30-bigendian-depth.patch 372 BLAKE2B f93f510496f1234c586f57b4814ad45ea3dd0bf78a934edd6ab951c5423be235560e54d871d8f9edef6fe51b4d9e18ecf33367635cefa1e500f8ed29a722e0bd SHA512 0cfe593471be5a89666ad9bb112999368d9195f0bf3aa13597251b3a5ebf645eeb776b29df04291f4fda6e330f2bdfbbbc04865588d9af54c5f610b9e923d9fb
-AUX sane-backends-1.0.30-missing-stdint-include.patch 374 BLAKE2B e20005c96096a228126b7e1d414ae2c127bf7ad16894defc8e3c65230380449e61f75b3cd63bd80b16bf8b1ebc08e5f974eb621d16f9c6b994105bb9d95e1a89 SHA512 521a3275879e84f6727ebc3b8e5ae4fbbb1495d2c41cb6880e170c62f684da2af7ea47b0a89d0806687f8a48791f2562959158a31a30dd240880757b6c81a321
 AUX sane-backends-1.0.31-autoconf-2.70.patch 2629 BLAKE2B 30579b5075b850fc5b3f421880f8545def8dac69e274fb7bb756c3dcf0f0b93b91c4aa231bc74ee923721a832c7b5d187e3b074a926224cad99291139bff2a6f SHA512 7c4395d715ef699788f3cede0b89540dc53c1aa8e771efebf59b1e7a978f96506d2f3b4df72990967fd254dfc076c092674ef6d2019ca8426593474c8e033d26
 AUX sane-backends-1.0.31-backend_pot_input.patch 1155 BLAKE2B 0882b8291db5eab404abad4ec2c6332f77405ffc39ba3639bd279d8cc5857888ff13d87bb1d37d4ce1cd6272d3f0f1cc0ffddd6ba4d2780b47717ee0a5905ae4 SHA512 4447a39892aef52dad3ede292973a444675b2eb0f6086fb1ab45106a32aa4474e3970582b831efaf7474abbf78d5ce694f1e751c229101140ffda8800bfd5210
 AUX sane-backends-1.0.31-udev_rules_update.patch 2537 BLAKE2B 37ae4b905f331e9b024e712010a6e2dde19d3d0a700267fac4e5b11648f851253759ca4d58b200501816c7352d12427b8584b75e405ae7a7509b1771e3417e3f SHA512 55536f477ed67a73c0d5414b5018f1ebe47301ec4fa8613a50a1105d96eadb3fb2809f784a340f29ca37894b8f0b9bc10e8f2eedda3fa15fa4111af5dc57c095
@@ -11,8 +9,6 @@ AUX saned.confd 76 BLAKE2B cac74b6f117f7f78a71b951433bc6b155f8641e2cf1bd74787116
 AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b5a546d61133522cdc98c7011669feaadc2d030ffeb49a86130075f22a18edab5f4c925780681 SHA512 655200141339f14bf7fc6f4fff3403cf9504809b7f023aa5425aad691c5baa65772100da0a6311669f83ed1dce73b7d65ca20aa31345b13c48dfdb1b30ce5dbd
 AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9 SHA512 a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093
 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965
-DIST backends-1.0.30.tar.gz 5721262 BLAKE2B 139d3ca908d54b94d14ef4145d44a89b939807c15870be03c3c028cf95351bf9a4abd3ea115b84396366bb054f37ade883f429467dceb0663c2855b92e0a4fa5 SHA512 19127c8109c1587d60d8cba713f73b1a24242df44fa49c3e59320f48022783f05d26d3242a3f87478e583a807d88b446ef7a51afb33b674be29656496c435d7b
 DIST backends-1.0.31.tar.gz 5731445 BLAKE2B d70691acbd3f5788a26bab6b35eeb243801b435272b57e3fa568127562ff57797452e396e6e5f058c33d3bce0f99b672542fb89bc8eb4d36cbe82ccc20b8f298 SHA512 d8ef05cc3aa9c4fa42c9241e1e61fc93e7959df3746a3a2cfaa6e4fb26dfd0911b4d3227b2da28852f8630fa17ad3432a1230a6f4425340e79a3b82ec5eaa9eb
-EBUILD sane-backends-1.0.30-r2.ebuild 8229 BLAKE2B d7f2e41ea54e06aaabd9a0abd47210c45ecc891e34f9563aabf19b11df0e3d250741f1a557465d5fb2f1e5de99f18d292212b160bc52224c5026544f7bd17f0f SHA512 08ba6b7bd2b5a28a8be809794b5b720075d1b3ba383d2b8bdbb763322f9b01838374ac3c152feafe9d49edd9d135cf184e8ccd8f5adfc4b7a4b546f5a1e194ea
-EBUILD sane-backends-1.0.31.ebuild 8660 BLAKE2B da356bb6b7aed6bfca528df6db8b49e6451d2b31443003f0187d2b56882ff2d3eff17b3b8f0cb8ca7703a5e4871d6586165e54832cbcda4d923ace23732f264c SHA512 d8b0c1627dc073ac557e6986fa37404825bbf958ea1dea967d13281a349ffa57bc67a67bf4b1bf506138cc58f23fb2e9b15e324a871d6eb49922a20c3f8c97d5
+EBUILD sane-backends-1.0.31-r2.ebuild 8547 BLAKE2B 547791d93b480363954d3cdb9caccf85b1f2aa20049d804414be8aa2cffefae28bfff477255cc7853c9d262dcdd7cc279b42315a066b9cfc5a107f6aef91bc66 SHA512 3405c7bc68efcb086b58311de1295ffeba8744cd52335c2d163fa218a702811edb79583b990bcf85a5123639c42afcbe30b588ed4e83097a1d4f266854f96096
 MISC metadata.xml 266 BLAKE2B c76ad15982ba5b341a41155c75a5fda95a99ef658ed972c452bfb7b0968aafe33f83cc5bd0f2effb1c2b4f9721a8f61987f2fb7906855b3869e7787226f2b385 SHA512 67d43b02a8c1aab418ca79b30d88af0e78f9df9b95c93887cfed5976290e714409e7dc400f09170d7e7844a411aa3e3202f49f31f39b7f580a8c0b6f3d4db659
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.30-bigendian-depth.patch b/media-gfx/sane-backends/files/sane-backends-1.0.30-bigendian-depth.patch
deleted file mode 100644
index bac06593b9e6..000000000000
--- a/media-gfx/sane-backends/files/sane-backends-1.0.30-bigendian-depth.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Correct overlooked bigendian case.  This has been fixed upstream in a different
-way since the 1.0.30 release.
-
---- a/backend/genesys/low.cpp
-+++ b/backend/genesys/low.cpp
-@@ -539,7 +539,7 @@
-     }
- 
- #ifdef WORDS_BIGENDIAN
--    if (depth == 16) {
-+    if (session.params.depth == 16) {
-         dev->pipeline.push_node<ImagePipelineNodeSwap16BitEndian>();
-     }
- #endif
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.30-missing-stdint-include.patch b/media-gfx/sane-backends/files/sane-backends-1.0.30-missing-stdint-include.patch
deleted file mode 100644
index 14c97ae95bf6..000000000000
--- a/media-gfx/sane-backends/files/sane-backends-1.0.30-missing-stdint-include.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://gitlab.com/sane-project/backends/-/issues/314
-https://gitlab.com/sane-project/backends/-/commit/6bb87fdf1f3dc190cfc4b7d64b0c8c8c3d10151b.diff
---- a/sanei/sanei_usb.c
-+++ b/sanei/sanei_usb.c
-@@ -48,6 +48,9 @@
- 
- #include "../include/sane/config.h"
- 
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
- #include <stdlib.h>
- #include <ctype.h>
- #include <sys/types.h>
diff --git a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
deleted file mode 100644
index 514150eb9ec7..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
+++ /dev/null
@@ -1,351 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal optfeature systemd toolchain-funcs udev user
-
-# gphoto and v4l are handled by their usual USE flags.
-# The pint backend was disabled because I could not get it to compile.
-IUSE_SANE_BACKENDS="
-	abaton
-	agfafocus
-	apple
-	artec
-	artec_eplus48u
-	as6e
-	avision
-	bh
-	canon
-	canon630u
-	canon_dr
-	canon_pp
-	cardscan
-	coolscan
-	coolscan2
-	coolscan3
-	dc210
-	dc240
-	dc25
-	dell1600n_net
-	dmc
-	epjitsu
-	epson
-	epson2
-	escl
-	fujitsu
-	genesys
-	gt68xx
-	hp
-	hp3500
-	hp3900
-	hp4200
-	hp5400
-	hp5590
-	hpljm1005
-	hpsj5s
-	hs2p
-	ibm
-	kodak
-	kodakaio
-	kvs1025
-	kvs20xx
-	kvs40xx
-	leo
-	lexmark
-	ma1509
-	magicolor
-	matsushita
-	microtek
-	microtek2
-	mustek
-	mustek_pp
-	mustek_usb
-	mustek_usb2
-	nec
-	net
-	niash
-	p5
-	pie
-	pixma
-	plustek
-	plustek_pp
-	pnm
-	qcam
-	ricoh
-	ricoh2
-	rts8891
-	s9036
-	sceptre
-	sharp
-	sm3600
-	sm3840
-	snapscan
-	sp15c
-	st400
-	stv680
-	tamarack
-	teco1
-	teco2
-	teco3
-	test
-	u12
-	umax
-	umax1220u
-	umax_pp
-	xerox_mfp"
-
-IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
-
-for GBACKEND in ${IUSE_SANE_BACKENDS}; do
-	case ${GBACKEND} in
-	# Disable backends that require parallel ports as no one has those anymore.
-	canon_pp|hpsj5s|mustek_pp|\
-	pnm|mustek_usb2|kvs40xx)
-		IUSE+=" sane_backends_${GBACKEND}"
-		;;
-	*)
-		IUSE+=" +sane_backends_${GBACKEND}"
-	esac
-done
-
-REQUIRED_USE="
-	sane_backends_escl? ( zeroconf )
-	sane_backends_kvs40xx? ( threads )
-	sane_backends_mustek_usb2? ( threads )
-"
-
-MY_PN=${PN//sane-/}
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.sane-project.org/"
-SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-# For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
-RDEPEND="
-	gphoto2? (
-		>=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
-		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
-	)
-	sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	sane_backends_dell1600n_net? (
-		>=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
-		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
-	)
-	sane_backends_escl? (
-		|| (
-			net-dns/avahi[dbus]
-			net-dns/avahi[gtk]
-			net-dns/avahi[gtk2]
-		)
-		net-dns/avahi[${MULTILIB_USEDEP}]
-		net-misc/curl[${MULTILIB_USEDEP}]
-	)
-	sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	sane_backends_pixma? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	snmp? ( net-analyzer/net-snmp:0= )
-	systemd? ( sys-apps/systemd:0= )
-	usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] )
-	v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	xinetd? ( sys-apps/xinetd )
-	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	dev-libs/libxml2
-	v4l? ( sys-kernel/linux-headers )
-"
-BDEPEND="
-	sys-devel/autoconf-archive
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
-	"${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch
-	"${FILESDIR}"/${P}-missing-stdint-include.patch
-	"${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch
-	"${FILESDIR}"/${PN}-1.0.30-bigendian-depth.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/sane-config
-)
-
-pkg_setup() {
-	enewgroup scanner
-	enewuser saned -1 -1 -1 scanner
-}
-
-src_prepare() {
-	default
-
-	# Patch out the git reference so we can run eautoreconf
-	sed -i -e "s/m4_esyscmd_s(\[git describe --dirty\])/${PV}/" configure.ac || die
-	eautoreconf
-
-	# Fix for "make check".  Upstream sometimes forgets to update this.
-	local ver=$(./configure --version | awk '{print $NF; exit 0}')
-	sed -i \
-		-e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \
-		testsuite/tools/data/html* || die
-
-}
-
-src_configure() {
-	# From Fedora
-	append-flags -fno-strict-aliasing
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# the blank is intended - an empty string would result in building ALL backends.
-	local lbackends=" "
-
-	use gphoto2 && lbackends="gphoto2"
-	use v4l && lbackends="${lbackends} v4l"
-	for backend in ${IUSE_SANE_BACKENDS}; do
-		if use "sane_backends_${backend}" && [ ${backend} != pnm ]; then
-			lbackends="${lbackends} ${backend}"
-		fi
-	done
-
-	local myconf=(
-		$(use_with usb)
-		$(multilib_native_use_with snmp)
-	)
-
-	# you can only enable this backend, not disable it...
-	if use sane_backends_pnm; then
-		myconf+=( --enable-pnm-backend )
-	fi
-	if use sane_backends_mustek_pp; then
-		myconf+=( --enable-parport-directio )
-	fi
-	if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp; }; then
-		myconf+=( sane_cv_use_libieee1284=no )
-	fi
-
-	# relative path must be used for tests to work properly
-	# All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory
-	# --without-api-spec to not automagically depend on tons of stuff
-	# that break in many ways, bug #636202, #668232, #668350
-	# People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html
-	ECONF_SOURCE=${S} \
-	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
-	BACKENDS="${lbackends}" \
-	econf \
-		--disable-locking \
-		--without-api-spec \
-		$(use_with gphoto2) \
-		$(multilib_native_use_with systemd) \
-		$(use_with v4l) \
-		$(use_enable ipv6) \
-		$(use_enable threads pthread) \
-		$(use_enable zeroconf avahi) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake VARTEXFONTS="${T}/fonts"
-
-	if tc-is-cross-compiler; then
-		pushd "${BUILD_DIR}"/tools >/dev/null || die
-
-		# The build system sucks and doesn't handle this properly.
-		# https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \
-			-I. -I../include -I"${S}"/include \
-			"${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \
-			"${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die
-		local dirs=( hal hotplug hotplug-ng udev )
-		local targets=(
-			hal/libsane.fdi
-			hotplug/libsane.usermap
-			hotplug-ng/libsane.db
-			udev/libsane.rules
-		)
-		mkdir -p "${dirs[@]}" || die
-		emake "${targets[@]}"
-
-		popd >/dev/null || die
-	fi
-
-	if use usb; then
-		sed -i -e '/^$/d' \
-			tools/hotplug/libsane.usermap || die
-	fi
-}
-
-multilib_src_install() {
-	emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
-		docdir="${EPREFIX}"/usr/share/doc/${PF}
-
-	if multilib_is_native_abi; then
-		if use usb; then
-			insinto /etc/hotplug/usb
-			doins tools/hotplug/libsane.usermap
-		fi
-
-		udev_newrules tools/udev/libsane.rules 41-libsane.rules
-		insinto "/usr/share/pkgconfig"
-		doins tools/sane-backends.pc
-	fi
-}
-
-multilib_src_install_all() {
-	keepdir /var/lib/lock/sane
-	fowners root:scanner /var/lib/lock/sane
-	fperms g+w /var/lib/lock/sane
-	dodir /etc/env.d
-
-	if use systemd; then
-		systemd_newunit "${FILESDIR}"/saned_at.service "saned@.service"
-		systemd_newunit "${FILESDIR}"/saned.socket saned.socket
-	fi
-
-	if use usb; then
-		exeinto /etc/hotplug/usb
-		doexe tools/hotplug/libusbscanner
-		newdoc tools/hotplug/README README.hotplug
-	fi
-
-	dodoc NEWS AUTHORS PROBLEMS README README.linux
-	find "${D}" -name '*.la' -delete || die
-
-	if use xinetd; then
-		insinto /etc/xinetd.d
-		doins "${FILESDIR}"/saned
-	fi
-
-	newinitd "${FILESDIR}"/saned.initd saned
-	newconfd "${FILESDIR}"/saned.confd saned
-}
-
-pkg_postinst() {
-	elog "Optional backends:"
-	optfeature "Epson-specific backend" media-gfx/iscan
-	optfeature "HP-specific backend" net-print/hplip
-
-	if use xinetd; then
-		elog "If you want remote clients to connect, edit"
-		elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
-	fi
-
-	if ! use systemd; then
-		elog "If you are using a USB scanner, add all users who want"
-		elog "to access your scanner to the \"scanner\" group."
-	fi
-}
diff --git a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild b/media-gfx/sane-backends/sane-backends-1.0.31-r2.ebuild
index 621a5997d9bb..0e3cb32ecc8d 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.31-r2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7..9} )
 
 # python-any-r1 required for a script in
 # backends/pixma/scripts/
-inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 systemd toolchain-funcs udev user
+inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 systemd toolchain-funcs udev
 
 # gphoto and v4l are handled by their usual USE flags.
 # The pint backend was disabled because I could not get it to compile.
@@ -131,10 +131,12 @@ SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="
+	acct-group/scanner
+	acct-user/saned
 	gphoto2? (
 		>=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
 		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
@@ -151,7 +153,6 @@ RDEPEND="
 		|| (
 			net-dns/avahi[dbus]
 			net-dns/avahi[gtk]
-			net-dns/avahi[gtk2]
 		)
 		net-dns/avahi[${MULTILIB_USEDEP}]
 		net-misc/curl[${MULTILIB_USEDEP}]
@@ -193,12 +194,6 @@ MULTILIB_CHOST_TOOLS=(
 	/usr/bin/sane-config
 )
 
-pkg_setup() {
-	enewgroup scanner
-	enewuser saned -1 -1 -1 scanner
-	python-any-r1_pkg_setup
-}
-
 src_prepare() {
 	default
 
@@ -350,7 +345,6 @@ multilib_src_install_all() {
 }
 
 pkg_postinst() {
-	elog "Optional backends:"
 	optfeature "Epson-specific backend" media-gfx/iscan
 	optfeature "HP-specific backend" net-print/hplip
 
diff --git a/media-gfx/sfftobmp/Manifest b/media-gfx/sfftobmp/Manifest
index 53752af33172..0705fc04ebda 100644
--- a/media-gfx/sfftobmp/Manifest
+++ b/media-gfx/sfftobmp/Manifest
@@ -1,5 +1,5 @@
 AUX sfftobmp-3.1.1-gcc44-and-boost-1_37.patch 1351 BLAKE2B 00dc9e14b8742a7aaa16bff964d6c183c81856298b205df97c5028081046b6cb0b0687ef0a3649d3560f6a5eafab6e62f5e276d41afc70e57398917828482ece SHA512 bd92e0f3e6743941080319da764ce6bbdb0b8d0694a9e5dd113e3a64c0deb0a86ce33a9a9f306c8a2c75d08f6fb33c78c1fe60f36309acf9c6223ec02b158f5b
 AUX sfftobmp-3.1.2-boost_fs3.patch 538 BLAKE2B bb2ea6156f3572f2da8ffd2f2bfd55fa89afe99af3f358d56b978e98160bd7b90c72cae8490687fc0b9c0509f896f5c6a7bfe41677f42652d77d52860b56e46c SHA512 75158af4ff574fe5112e4057ce0c2bca2f49afaf63862c42add85b8ee8e843f0a08b8c3d9f658f999024643d95ffcd65085bcb0607213722eb021b102037872e
 DIST sfftobmp3_1_2_src.zip 121478 BLAKE2B fe5e09d358cfa75a45a05e780fcf8b3409ae9791882c8c4ab3fe99b078cade57a75751343c42a5d7764702ca32565e8c97d417e3c095c10a01b6fcd0f09f03b3 SHA512 3c460dcd60486954f792ecc8e864d109dabbae30b56a6ba4b3228a42dd489fd88793e4d93e2d032e6cd1c552bf5e217bc2afb3eae85a1a4e1db340f7761905b7
-EBUILD sfftobmp-3.1.2-r1.ebuild 779 BLAKE2B 6bec6ef6b6e45a4dce5cced32592287571c219fdac698723e876fa0fddbf7c1df3e2ccc5144c3deba65d3db8050f0699f6eb0ed09fc68ed807b010c993b37ecb SHA512 89449a9ad5737348348b82005230d9d72fcde123c08908d1d0f6af51926db4cca510fc2221a958450948aaa59650998da0829b344154014ba612b81d6ac55c9a
+EBUILD sfftobmp-3.1.2-r1.ebuild 776 BLAKE2B 57ddfa11e0f88cff41ce693309b478594a57e353504cd2476a527bc25ed977885683c32d764271babd15897b0fe3364ffb55942d3ca86d0395b8b9b4f20f577c SHA512 8c0a30b354a613cf39a404cab80a1c56b67e8d01f1617dbb4e53a23f8d63c86062b66dfc6584e9cb7a0fa395e573607e9e227c3819080ec8d558fc59b4a4c930
 MISC metadata.xml 245 BLAKE2B 38d8c158d180bcc80f641f84e8b1411b5924fe54c5173e5bc60ff2fdfdc55a34c8608189c5a9281926e877c2eff646d784d2770e0893ac325a084b26a821780b SHA512 e758417b46d7ffa5144bda2c2fda4decbc3e6d2aa1eb220b8552dbde32f56fc49f63bae452ce0e750f4f2c69f3ebfd064ddd7356d2e2742e8a63804b06531808
diff --git a/media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild b/media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild
index c29caa1997b3..4f2ebeb017fe 100644
--- a/media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild
+++ b/media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools eutils flag-o-matic
+inherit autotools epatch flag-o-matic
 
 MY_P=${PN}${PV//./_}
 
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index ded96e431af4..b33996128339 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,5 +1,3 @@
-DIST shotwell-0.30.10.tar.xz 6465992 BLAKE2B d6be2a2b34cf4adbae4ac1f2bce5a29bfe059c546b8ab76f35b3ac9159a9233f231ee1ac4b3f81e8016278fcdec6b222af3ba7a62b2eb8d15dd82ef2cfb544c1 SHA512 4c84b5702476f264bd475fa93eff2e58f2876b076f186fc19b3dbddaae76b80485793b887f668788ac3c7f7230eb0c6a61fef2c0c70d52c665d0e49f6deb0b11
 DIST shotwell-0.30.11.tar.xz 6499416 BLAKE2B 8b63b2ff64ae41560221d9bcca2c88d0dff8c40416278d3344dbdbf50e4352e999e3ae52ea9fbcc871d5023ffeeb6ee954ee91a2d7eddc1a8f1df45dc4e12cf8 SHA512 71a057aa1ae2b432f385e174429e29f46ca29055aa6003b6017f3da54551027536c70e9f8ca605719e8e008233bdb6f17981462a54495d91e94aebdbe5718c9f
-EBUILD shotwell-0.30.10.ebuild 1768 BLAKE2B 0330351fb22d25299ffeffbfd1d202d2fad725619157fe0ebfae5859f5a6ddcb5fea9c845d7c41d990d8f1205dbf36c99600a1f707a2ac1c202a38de3742ab01 SHA512 46dac08f76651649c187833065dd1ce7829f42f4ddb84e829bacaa25eb7ab5d9f22397f392ca1e60e796940490b396e461c93c08e1289f1085725d842643f29e
-EBUILD shotwell-0.30.11.ebuild 1770 BLAKE2B e303b726fe6ecc295eaabcc65efe9d044dac4a51e0d51de54145d02aac7a9d2f790552b20549d76b1fe4bb5b22eaf008c7c5801ca4cd5767219f022ad520cb34 SHA512 e26e678c2cdd099df62e9e0782dde73883eea688a32a633871bd1c416b2b9a8f21fe51bec6eab482039392de678ba03ee90e4a63a4c4b9737e8aed286d9de03d
+EBUILD shotwell-0.30.11.ebuild 1769 BLAKE2B ce81642084c5b8ac1b41b72842ac4c798ab3a2a136e95f899735bd4dbab8d013809c1a0b6139f366b2f0e6a76d7a26a314b80ea453405e2a2f4eb1dbfd2e5d3a SHA512 e8aab87360f510ee71ae3b06f9904a7895223ea31ec1b7a5e29f9f8238668e523d5654bad84c4f459fdad78cc6853f4478994c2383535b834c342a4c6469e081
 MISC metadata.xml 795 BLAKE2B 4b5da2cc205b128a0cb9d10a50c3743b8d12302d266e37d5e0479915824af75af8c22b7b12ffca57146aa0a999e2bff3d7c4969af9e19f317a70b9195b02333f SHA512 d3ceceeed90fd4cadd5e212d047b3d6f7882860d145cb80521a4db8e9baaf461910ff70cb5bb2c1cda991939bf2c8917bb7f252bf68c7487d40271b0419c6322
diff --git a/media-gfx/shotwell/shotwell-0.30.10.ebuild b/media-gfx/shotwell/shotwell-0.30.10.ebuild
deleted file mode 100644
index 37d81390d3f9..000000000000
--- a/media-gfx/shotwell/shotwell-0.30.10.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86"
-IUSE="opencv udev"
-
-DEPEND="
-	>=x11-libs/gtk+-3.22.0:3
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/libgee-0.8.5:0.8
-	>=net-libs/webkit-gtk-2.4:4
-	>=dev-libs/json-glib-0.7.6
-	>=dev-libs/libxml2-2.6.32:2
-	x11-libs/gdk-pixbuf:2
-	>=dev-db/sqlite-3.5.9:3
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-libs/libgphoto2-2.5:=
-	udev? ( >=dev-libs/libgudev-145:= )
-	>=media-libs/gexiv2-0.10.4
-	>=media-libs/libraw-0.13.2:=
-	>=media-libs/libexif-0.6.16:=
-	dev-libs/libgdata
-	>=app-crypt/gcr-3:=[gtk]
-	x11-libs/cairo
-	opencv? ( >=media-libs/opencv-2.3.0:= )
-"
-RDEPEND="${DEPEND}
-	media-plugins/gst-plugins-gdkpixbuf:1.0
-	media-plugins/gst-plugins-meta:1.0
-"
-BDEPEND="
-	$(vala_depend)
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	net-libs/libsoup:2.4[vala]
-	media-libs/gexiv2[vala]
-	app-crypt/gcr[vala]
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dunity-support=false
-		# -Dpublishers # In 0.30.2 all get compiled in anyways, even if restricted list, affects only runtime support
-		-Dextra-plugins=true
-		#trace
-		#measure
-		-Ddupe-detection=true
-		$(meson_use udev)
-		-Dinstall-apport-hook=false
-		$(meson_use opencv face-detection)
-		-Dfatal_warnings=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/shotwell/shotwell-0.30.11.ebuild b/media-gfx/shotwell/shotwell-0.30.11.ebuild
index 5d0a000fcb6b..46f2f6e7fac2 100644
--- a/media-gfx/shotwell/shotwell-0.30.11.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.11.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86"
 IUSE="opencv udev"
 
 DEPEND="
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 5aee0fa28219..8f224005bae4 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,6 +1,7 @@
 AUX 3.26-add-control-optional-deps.patch 2773 BLAKE2B e6c3faa98ecda13c926752defef389fd155f615df2010d8499aba7870b929f520662f5c718f457edd5f14f68c26d63ab58a5ee1a583af9f5721d4cf4141385a8 SHA512 e786172609ca64afa85663077794cb146edf7f59bd6187bc253d2ab682f5cf244f5238df18648641f7450ce6add97f2db1adfa11b52a3ba5e29c16356e9fac08
-DIST simple-scan-3.36.4.tar.xz 914688 BLAKE2B ae972cf6b5085d0e79fdfa9250aed655051b97239988b410e175b3058dda3ed5dc19b6574c015dd9a7afcbefd4d05cce6120b3648c061ff1e52043f866769a62 SHA512 780eeabd9593f14b2b04b9474bb1faebe3a32a7fd7e6b067c144fe44ad9b880f307bf80a8a925fb2549ca0b8172357c9a393146dfabd4b68bfc4396c32de4fa8
+AUX 40.0-add-control-optional-deps.patch 2713 BLAKE2B 594f076b9515697322711033a206eb6aa7ab8940c6d4ef5711af4bdaaa126b82738b2d300d97843a9c889c314d16873ea05ecb07e0c566e8a273289fc799f8aa SHA512 60bdf1653292f5e2b3ef435c35c81a5eb2963142ea14e2095c5c5673d776979053c65ef0e54f80b503489dcc6e93d1a2ab8d29711059c469ecebcb83ece5e42c
 DIST simple-scan-3.36.7.tar.xz 914572 BLAKE2B dee363c08b0454bc6a4990fc14831069162f74365549a081421c286658cce130957b91030558d1232c979601be00e955996f702e8bafeeeb30710b89ee3e42c0 SHA512 ff0dd82d0db30dbfacfd8b04d7bcbc0599c1b1b47f845e1176ec7ffce0aa44253735431c2c531ef428dae0cee80818acfbba4fb2514f501623c0c0242aa8a7a2
-EBUILD simple-scan-3.36.4.ebuild 1325 BLAKE2B d7a8eb204425d66cd2fb1aaad25a91a8d8c2ae153066f1a828bdd416c37d204f747119cb252e7f778d05be51fef3ea290e737bfcbc1f7c78e994ac9b933890d9 SHA512 6d211475e250bcaa86eb452669062a5727cfcc6285927b6ba61cba7c68e07a0c9d1dd826c5b2b9b43cc7861e21af090750641aaf53a8f97b4298fbad19a00e62
-EBUILD simple-scan-3.36.7.ebuild 1328 BLAKE2B 48f73d77aec818cd87b713512bca9e8bccf13a4eadc785f0bba38e0c975de6084d936d2a9dd371c62061cc6ce8f5b9c728b892767481cd27587ea77a27ce7390 SHA512 72ae614c26f849c5ad16e470ec1d4188fb3988786db9956d26d9339afd8f8fbd69531fd3763268d5d56c2a8ae353ab0fc5dee94407a56a8069cd5d0a3bb34400
+DIST simple-scan-40.0.tar.xz 1469740 BLAKE2B 120da2785066abf010b7f5a1dba902f596f28f7b89f667dc00c8117f36b94688ef3d1582bdd47aa93e42d6a4946a71ef1b475e482a660e708e06fbb050741f0d SHA512 978c11b789219cb08a961b1bc1428150d023e823ee1f7fd39a3bee714f0079e25559a918ef98f42a464f8a22f4a93a59893b7b4c054dc28d343479d3fc593d8a
+EBUILD simple-scan-3.36.7.ebuild 1325 BLAKE2B e5a2408a96d33bd695c4c071c6cd449bb6319f3718eeecb2f3813c76280168815ed02fad0ea2c45018500d1abb43d2aa61c7e07cb7964dc2b4549605d63c3425 SHA512 bf91d3186657701c3bdee611373879f86ed02ddcc4697c46528d68536435c09ee21b6cf2b22735131d7032b636cd86be717aeeef25c437ce9b9c38005ef2b361
+EBUILD simple-scan-40.0.ebuild 1448 BLAKE2B 413062a72b35d163c7c99d30687687da6ffadcbf7c22b3497e70ef2311bbdf4035c859649493ffd92d92099f105f2771b68d72474810fcfc2250932904cd8a84 SHA512 5bf293d0e9f8284d5fe75ca1211dccc2651c1560d42646bf8b887ca767c2abeb4a7d47624057d57eea3beb336272c74e8cc7e0cd9d8561a87f4162aa611c72ba
 MISC metadata.xml 616 BLAKE2B 576d986402f8cc708eae60f661640808751747c764d5fe729dd014f33758e0b484a2b80a214d9a3d1ed4bce7e455e34803a62048240e5de8e203184446cdc0df SHA512 6377cb9c20b1ce2db22ba959d386e4389939b72503d87da956d659144b8a6f8b521abdd19dd4c82ac0cb32e260ce6633b75136a353f63b86593f5e1f12394d47
diff --git a/media-gfx/simple-scan/files/40.0-add-control-optional-deps.patch b/media-gfx/simple-scan/files/40.0-add-control-optional-deps.patch
new file mode 100644
index 000000000000..5ea8f56323fa
--- /dev/null
+++ b/media-gfx/simple-scan/files/40.0-add-control-optional-deps.patch
@@ -0,0 +1,82 @@
+From a5f01beb41a81f483d90eb4dd785822a8615f65f Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Wed, 30 May 2018 08:44:18 +0200
+Subject: [PATCH] build: Add control for optional dependencies
+
+---
+ meson.build       | 18 ++++++++++++++----
+ meson_options.txt |  3 +++
+ src/meson.build   | 12 ++++++++----
+ 3 files changed, 25 insertions(+), 8 deletions(-)
+ create mode 100644 meson_options.txt
+
+diff --git a/meson.build b/meson.build
+index 1e1522c..45d7ed7 100644
+--- a/meson.build
++++ b/meson.build
+@@ -34,10 +34,20 @@ zlib_dep = dependency ('zlib')
+ cairo_dep = dependency ('cairo')
+ gdk_pixbuf_dep = dependency ('gdk-pixbuf-2.0')
+ gusb_dep = dependency ('gusb', version: '>= 0.2.7')
+-colord_dep = dependency ('colord', required: false)
+-packagekit_dep = dependency ('packagekit-glib2', version: '>= 1.1.5', required: false)
+-webp_dep = dependency ('libwebp', required: false)
+-webpmux_dep = dependency ('libwebpmux', required: false)
++
++if get_option('colord')
++    colord_dep = dependency ('colord')
++endif
++
++if get_option('packagekit')
++    packagekit_dep = dependency ('packagekit-glib2', version: '>= 1.1.5')
++endif
++
++if get_option('webp')
++    webp_dep = dependency ('libwebp')
++    webpmux_dep = dependency ('libwebpmux')
++endif
++
+ sane_dep = dependency ('sane-backends')
+ msgfmt = find_program  ('msgfmt')
+ itstool = find_program  ('itstool')
+diff --git a/meson_options.txt b/meson_options.txt
+new file mode 100644
+index 0000000..570ecdd
+--- /dev/null
++++ b/meson_options.txt
+@@ -0,0 +1,3 @@
++option('colord', type: 'boolean', value: false)
++option('packagekit', type: 'boolean', value: false)
++option('webp', type: 'boolean', value: false)
+diff --git a/src/meson.build b/src/meson.build
+index 3f699eb..0c8965e 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -1,16 +1,20 @@
+ vala_args = [ '--pkg=posix', '--vapidir=' + meson.current_source_dir () ]
+ dependencies = [ glib_dep, gtk_dep, libhandy_dep, zlib_dep, cairo_dep, gdk_pixbuf_dep, gusb_dep, sane_dep ]
+-if colord_dep.found ()
++if get_option('colord')
+     vala_args += [ '-D', 'HAVE_COLORD' ]
+     dependencies += colord_dep
+ endif
+-if packagekit_dep.found ()
++if get_option('packagekit')
+     vala_args += [ '-D', 'HAVE_PACKAGEKIT' ]
+     dependencies += packagekit_dep
+ endif
+-if webp_dep.found () and (not colord_dep.found () or webpmux_dep.found ()) # Webpmux only required if colord
++if get_option('webp')
+     vala_args += [ '-D', 'HAVE_WEBP' ]
+-    dependencies += [ webp_dep, webpmux_dep ]
++    dependencies += [ webp_dep ]
++    # Webpmux only required if colord
++    if get_option('colord')
++        dependencies += [ webpmux_dep ]
++    endif
+ endif
+ 
+ simple_scan = executable ('simple-scan',
+-- 
+2.26.3
+
diff --git a/media-gfx/simple-scan/simple-scan-3.36.7.ebuild b/media-gfx/simple-scan/simple-scan-3.36.7.ebuild
index e1a51a707fde..69bdf0601327 100644
--- a/media-gfx/simple-scan/simple-scan-3.36.7.ebuild
+++ b/media-gfx/simple-scan/simple-scan-3.36.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="colord webp"
 
 DEPEND="
diff --git a/media-gfx/simple-scan/simple-scan-3.36.4.ebuild b/media-gfx/simple-scan/simple-scan-40.0.ebuild
index ef472faa37e6..05268ac37b55 100644
--- a/media-gfx/simple-scan/simple-scan-3.36.4.ebuild
+++ b/media-gfx/simple-scan/simple-scan-40.0.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
 VALA_MIN_API_VERSION="0.34"
-inherit gnome.org gnome2-utils meson vala xdg
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
 
 DESCRIPTION="Simple document scanning utility"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="colord webp"
 
 DEPEND="
 	>=dev-libs/glib-2.38:2
 	>=x11-libs/gtk+-3.22:3
+	>=gui-libs/libhandy-1.1.90:1=
 	>=sys-libs/zlib-1.2.3.1:=
 	x11-libs/cairo:=
 	x11-libs/gdk-pixbuf:2
@@ -31,18 +33,20 @@ RDEPEND="${DEPEND}
 	x11-misc/xdg-utils
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	$(vala_depend)
 	dev-libs/libxml2:2
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
+	gui-libs/libhandy[vala]
 	dev-libs/libgusb[vala]
 	colord? ( x11-misc/colord[vala] )
 "
 
 PATCHES=(
 	# Add control for optional dependencies
-	"${FILESDIR}"/3.26-add-control-optional-deps.patch
+	"${FILESDIR}"/40.0-add-control-optional-deps.patch
 )
 
 src_prepare() {
diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index 7ceae0241b3e..b5c776dcb635 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -5,7 +5,7 @@ AUX slic3r-1.3.0-wayland.patch 224 BLAKE2B 71395194aed291387897eae5e5af8d58bee0e
 AUX slic3r-1.3.1_pre20200824-boost-1.73.patch 3928 BLAKE2B 24c2e497a7dd80fa4212e21652abd85b439917a1d4c84866591be2c2fb4d6acc999468edc4a50ed065b64611ffe3b3f11415f383e2298904986d585b0acd0f67 SHA512 9100c93537a8a40ccd17fc8486797b02e426d853d443ec40b85feaf92bba38d26c97bd4b3aa66609ab3cb8116d7ce94588302761e337153e2f37006770698875
 DIST slic3r-1.3.0.tar.gz 2104094 BLAKE2B 74c58690cf196f89ecff5eec853215c87c648df5a504725fea9f14b0343bca105190de1d63e2e8e76d47fcaf8dbe7b6d26f61b304ce7336412effa1c9a3fba41 SHA512 ff0f7747e166826ff1c53220974ee9d3a217d0e19964dbe4a5fa3e81f262a6810a47632686b7f1b3128384ae05c6f98d8aab980524079bdf9811445fe23a0f0d
 DIST slic3r-1.3.1_pre20200824.tar.gz 2432288 BLAKE2B 37e767b6cb12909ea3a6411532103ea30500903cf3d6a221c2fa3d3109fb733db5d0cb0e9d0eec5033dad9acec2f89258242cdab316ea26392a8386097d9dd38 SHA512 fd7198f7c4a60911b2009f617d37485bf73964a626a53d02bd13baae963d28e74dc2f8314888e7c0fcacb389e0b481f3357c6ea595ac8f92d99f7a228c5cc2b7
-EBUILD slic3r-1.3.0-r3.ebuild 2748 BLAKE2B 823f3341684d705f34faa66ee361c91f0ca1b8916ca9773e5dd6817d06d5b0a4b048abd60f747670531969ca63a673ff228156f6e05f1a1b2c9d85d7e21fb7d3 SHA512 6937adaab0083e646c74fbf4b1c0a7daab521c37c160d5220ef6fb7cdaff44815388a7e449460bd56ab05b80c3714cb0f69e7452fe2ee1460344f4b58f69ecc5
-EBUILD slic3r-1.3.1_pre20200824.ebuild 2784 BLAKE2B d3bee26847f0640e90e5df95c8c0f56976e220a3c5fc2c92b94eaf401da28ba14c0c19e04e68509b6e352b6aa6884061ac56feb0c9f42cd82c8d7030d69438cc SHA512 726a2f7f87652a160fbdfa437ab42001c13ea27361cc8818a5a725e2af8bef2a3099f836fa4cd4679eed6c0c0487f9781501b8433d3bd24b980165b44e77d139
-EBUILD slic3r-9999.ebuild 2758 BLAKE2B 2c49616aff2a3964f43d00f74aa014adfb364ee100b4f1dc6c7f86fe4469fa80e9f7eb311f4d9f27fe66a3de84d13c95a966acd7e29e7833a7a72882831f0a41 SHA512 0a77983538340eebcc19d9c3054104a8b4cfae18ac6f3eebe478b9ae99297b8ca5207b16699048b861f0f812892877850224f7b55f343c79ad683040cfd33920
+EBUILD slic3r-1.3.0-r3.ebuild 2741 BLAKE2B be0b9946dfcefc79bd0ead2db2dc7d684a81cb1f6c5af82f57347006a2f155cdb9276eff6e47b16bbfea8c0a64d6c89455f39faa010686393df211bf9569a6e9 SHA512 b0f97a438154a387d8e0d6245328abd9e3cce85ea6f80ff2c41b9a22d77c9345e023ab44b8bf521ed223b6c201481f52d9130b4abb37938af46456c4061a1fb1
+EBUILD slic3r-1.3.1_pre20200824.ebuild 2777 BLAKE2B 15ef5c7e7a21769ce90e52953536673e3658acdb9674d504c35ca42732b44688c23ee44ac7c845d6b73a7aa52f6fe23363bf6cd25d2a5f2193586ea3dd12e928 SHA512 b7d0ca2b4f9c449088240f332d95125288a73dc3a0ab591ecf476c0d3cec1d2378f0ec5c1e27fb628ff616fe0895d9ec2dc586a82afe37dcb9cd19a293648b68
+EBUILD slic3r-9999.ebuild 2688 BLAKE2B 4b9af5d0085ba6d6632ede733a6fade66dff9d50c4230762c56920cf1c226a3962d6c33432cece0e26d65fdff9764c7255dbabaf98bd0d09cc0dd2bef6385534 SHA512 b871d0d53023b9e6c5caaedea1c121063da47f4cb9fccab328af6e40deefc36c52057dd803ce7aed7846ca61504dab8be8b341fad1a8332467e1a2c387bdf3e2
 MISC metadata.xml 910 BLAKE2B 037c38babeaf484e00175fa577897939965d4b0c9246ae43cea6099eb9c80c64b150b58598bd4d9b6b4cea3c3d660d50d75a83a4dcc75c23bc52619ea42d2e35 SHA512 60ddcbb15c781478becc5779ff884d92b735d87b7c97f8305641b3a98db3f07a35d02c86c2b1e032fd05fa351a6f343e7c4f09aff31c5d2844bf34930dbcc316
diff --git a/media-gfx/slic3r/slic3r-1.3.0-r3.ebuild b/media-gfx/slic3r/slic3r-1.3.0-r3.ebuild
index 5917a9210b8d..f0ea0fd4ed27 100644
--- a/media-gfx/slic3r/slic3r-1.3.0-r3.ebuild
+++ b/media-gfx/slic3r/slic3r-1.3.0-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop eutils perl-module
+inherit desktop perl-module
 
 DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
 HOMEPAGE="https://slic3r.org"
diff --git a/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild b/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild
index c9c2ba374c52..3d5a2d5dbff2 100644
--- a/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild
+++ b/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop eutils perl-module
+inherit desktop perl-module
 
 COMMIT="92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d"
 
diff --git a/media-gfx/slic3r/slic3r-9999.ebuild b/media-gfx/slic3r/slic3r-9999.ebuild
index 6c8f1b5b6d9e..c492bce9fc3b 100644
--- a/media-gfx/slic3r/slic3r-9999.ebuild
+++ b/media-gfx/slic3r/slic3r-9999.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils git-r3 perl-module
+inherit desktop git-r3 perl-module
 
 DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
 HOMEPAGE="https://slic3r.org"
-SRC_URI=""
 EGIT_REPO_URI="https://github.com/Slic3r/Slic3r.git"
+S="${WORKDIR}/slic3r-${PV}"
 
 LICENSE="AGPL-3 CC-BY-3.0"
 SLOT="0"
-KEYWORDS=""
 IUSE="+gui test"
 RESTRICT="!test? ( test )"
 
 # check Build.PL for dependencies
-RDEPEND="!=dev-lang/perl-5.16*
+RDEPEND="
+	!=dev-lang/perl-5.16*
 	>=dev-libs/boost-1.55[threads]
 	dev-perl/Class-XSAccessor
 	dev-perl/Devel-CheckLib
@@ -53,7 +53,8 @@ RDEPEND="!=dev-lang/perl-5.16*
 		>=virtual/perl-Socket-2.16.0
 		x11-libs/libXmu
 	)"
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	dev-libs/clipper
 	dev-perl/Devel-CheckLib
 	>=dev-perl/ExtUtils-CppGuess-0.70.0
@@ -63,14 +64,15 @@ DEPEND="${RDEPEND}
 	>=dev-perl/Module-Build-WithXSpp-0.140.0
 	>=virtual/perl-ExtUtils-MakeMaker-6.800.0
 	>=virtual/perl-ExtUtils-ParseXS-3.220.0
-	test? (	virtual/perl-Test-Harness
-		virtual/perl-Test-Simple )"
+	test? (
+		virtual/perl-Test-Harness
+		virtual/perl-Test-Simple
+	)
+"
 
-S="${WORKDIR}/slic3r-${PV}"
 PERL_S="${S}/xs"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.3.1_pre20200824-boost-1.73.patch"
 	"${FILESDIR}/${PN}-1.3.0-no-locallib.patch"
 	"${FILESDIR}/${PN}-1.3.0-use-system-clipper.patch"
 )
diff --git a/media-gfx/tachyon/Manifest b/media-gfx/tachyon/Manifest
index 17a7139da245..73a9943d5a40 100644
--- a/media-gfx/tachyon/Manifest
+++ b/media-gfx/tachyon/Manifest
@@ -1,8 +1,5 @@
-AUX tachyon-0.99_beta6-ldflags.patch 939 BLAKE2B e0c96b6e46fe53e58eba7077a76003d06543c6d95714b49977bc2eb130f327758e82c1b93bbc436baf1d467b5d870a1636483ec1db747692d27f052a270f3506 SHA512 a57a66fd72295b74de7ec94bf1a0b4c75fc61c1189bf0c4eb288a274915f72c97c869b60aad167a73d78c7242821e522de22e4de99ab13a3f61367568bfb5acd
 AUX tachyon-0.99_beta6-r2-ldflags.patch 856 BLAKE2B 5d8587eac987a66758f0314afb5bba620fbbb99b32d295e4deb649a929ac19afd52c835f375d72bd2284b3cd4d9185c272090d2a27d06ea0220d1c59b03bb995 SHA512 2807689e3bad156d3d54a0f4dce5e6aaf7555750c6650aa3957bd3ae51922ed3f8489534528de45c22d75db85450340d674a621e608668cde972df12c03a63b0
 AUX tachyon-0.99_beta6-r2-shared.patch 8043 BLAKE2B 6d559c22477de0e3148e374a8db2faa1e8249d0599409f9d8cfc843d06c1960639f74797414328c40a7fa46c9143cefb208ab68f4d47e3c0b8fd0dbde1ea951d SHA512 eb9c2e43c679030b410d5f9077e85969ee9ec3926f7c44eb9047c902f5834dd4734af3f07105f116b4dc23c0d420f87d67193a759d329810ca168ac4a28f95ad
-AUX tachyon-0.99_beta6-shared.patch 8065 BLAKE2B 7336cf23288d2a20df3ab8373508b3720b6ac2e381987a645aded0c5d189bbe73d8e12211f36ea4fc0256de662cd7b2b51eee03fdce6daa195f504eaa1e1cf5e SHA512 535a3e6524d6d788e1eabf73fb5cd1bbbb2cbc6fb32294895762cf2405360c40861b1813b3b15bea6f28577595bffd84607997a9964bd743722b003acc1dfd17
 DIST tachyon-0.99b6.tar.gz 2981568 BLAKE2B 69e96362d5914db7cfeaf36a7c0fc57ebe2bff07c6c2c4b13107edb17146577df73ad7dbf740d402e322f1fb2df9cde79e634170ecd9d49037beb678de42df83 SHA512 4d0d707bf46528b87bfe1a05f490f40bcbee8f21271c5212247d4fd25956a27ad8a40b4621817a3f1c03495f1ba9eeb99b152929fdcd92c7118a35ef116f3f33
-EBUILD tachyon-0.99_beta6-r1.ebuild 2770 BLAKE2B 97f621974a5b750bb6b3d2c121fb4e2c0304038a4eccf0952dd1cbb1a451f181f84905072aa4f8854453e89189f37b2be63c8c2d4036f4d137110dc943af226f SHA512 bc878fed95bcbd9d193426dd5252ec80ba508e36adcae36418478fab596794c792aa2afbc1005327a8fec2a680408bca0745f869e2ad0693eda983b2a5fd53d2
-EBUILD tachyon-0.99_beta6-r2.ebuild 2540 BLAKE2B c8ff5b64f22c954e3a8488c5b21c5a54b5087dfb85c4aab43ebd5831997b252b4f6fa5c7863c1f9647a3e0482b1ea8a6a024acf632d6afa1c722e388e048142e SHA512 5a8cdcbecf01a4c02aa42467c9a0feb39b4a45224b94103418764b846c7c693e48cc078b2b2037f6d193d81ea82db5e8a5b81292f900f119a506d206ee0eeb13
+EBUILD tachyon-0.99_beta6-r2.ebuild 2533 BLAKE2B 0b7ab33bba057b75b772dcacb5a6122526ed1e0a09b92f7e256755ece2374894667dd8fb6844dc5a8aafaf3e95e6943a2a9af534655991a37a0e543fc45f46a1 SHA512 4236ae35aff704933cb75a603eeb9b103754deb38a250d96532c8913106e93fc878b1867d5db57d7a300ee677b865b7e738fca14401e4925b05950591285e990
 MISC metadata.xml 339 BLAKE2B 342dd48842a409d4be459fcfd339f485ed05f838cf9dfe4d3f5695cee5ca0dc3f09623c4b4adddc1661b02ae5f066e11b97551ec0ef0771269fd89972ebda7ad SHA512 ceba0ae3ec140c4efe0d1708243954fb3bc9804109727610079712a5ce91f5133197e61a2c3bb4dcfd6f743dcfcbc829cc68f5def0b2aa023e3eeb5dfa09a68a
diff --git a/media-gfx/tachyon/files/tachyon-0.99_beta6-ldflags.patch b/media-gfx/tachyon/files/tachyon-0.99_beta6-ldflags.patch
deleted file mode 100644
index 99d5b8bfb664..000000000000
--- a/media-gfx/tachyon/files/tachyon-0.99_beta6-ldflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/unix/Makefile b/unix/Makefile
-index 8dd0846..d2fe1ac 100644
---- a/unix/Makefile
-+++ b/unix/Makefile
-@@ -121,7 +121,7 @@ ${MGFLIB} : ../libmgf/Makefile
- 	};
- 
- ${ARCHDIR}/tachyon : ${RAYLIB} ${PARSELIB} ${OBJDIR}/main.o ${OBJDIR}/getargs.o ${OBJDIR}/parse.o ${OBJDIR}/nffparse.o ${OBJDIR}/glwin.o ${OBJDIR}/spaceball.o ${OBJDIR}/trackball.o ${PARSEOBJS} 
--	${CC} ${CFLAGS} ${DEMOINC} -o ${ARCHDIR}/tachyon ${OBJDIR}/main.o ${OBJDIR}/getargs.o ${OBJDIR}/parse.o ${OBJDIR}/nffparse.o ${OBJDIR}/glwin.o ${OBJDIR}/spaceball.o ${OBJDIR}/trackball.o ${PARSEOBJS} -L${RAYLIBDIR} ${PARSELIBS} ${LIBS}
-+	${CC} ${CFLAGS} ${LDFLAGS} ${DEMOINC} -o ${ARCHDIR}/tachyon ${OBJDIR}/main.o ${OBJDIR}/getargs.o ${OBJDIR}/parse.o ${OBJDIR}/nffparse.o ${OBJDIR}/glwin.o ${OBJDIR}/spaceball.o ${OBJDIR}/trackball.o ${PARSEOBJS} -L${RAYLIBDIR} ${PARSELIBS} ${LIBS}
- 	${STRIP} ${ARCHDIR}/tachyon
- 
- ${ARCHDIR}/animray : ${RAYLIB} ${OBJDIR}/mainanim.o
diff --git a/media-gfx/tachyon/files/tachyon-0.99_beta6-shared.patch b/media-gfx/tachyon/files/tachyon-0.99_beta6-shared.patch
deleted file mode 100644
index dd23fe301675..000000000000
--- a/media-gfx/tachyon/files/tachyon-0.99_beta6-shared.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-diff -up tachyon/unix/Makefile.shared tachyon/unix/Makefile
---- tachyon/unix/Makefile.shared	2011-02-07 16:14:38.000000000 +0100
-+++ tachyon/unix/Makefile	2011-07-23 20:23:51.000000000 +0200
-@@ -22,7 +22,7 @@ OBJDIR=${ARCHDIR}/libtachyon
- #
- # Name of raytracing library file to create
- #
--RAYLIB=${ARCHDIR}/libtachyon.a
-+RAYLIB=${ARCHDIR}/libtachyon.so
- RAYLIBDIR=${ARCHDIR}
- 
- #
-@@ -251,124 +251,125 @@ RAYOBJS= ${OBJDIR}/api.o \
- 	${OBJDIR}/tgafile.o \
- 	${OBJDIR}/winbmp.o
- 
-+VERSION=$(shell grep TACHYON_VERSION_STRING ../src/tachyon.h | cut -d\" -f 2)
-+${RAYLIB} : DIRNAME=tachyon-${VERSION}
- ${RAYLIB} : ${RAYOBJS}
--	rm -f ${RAYLIB}
--	${AR} ${ARFLAGS} ${RAYLIB} ${RAYOBJS}
--	${RANLIB} ${RAYLIB}
-+	${CC} ${LDFLAGS} -shared -Wl,-soname,libtachyon.so.${VERSION} -o ${RAYLIBDIR}/libtachyon.so.${VERSION} ${CFLAGS} -fPIC ${RAYOBJS} ${PNGLIB} -lm -lpthread ${JPEGLIB}
-+	ln -s libtachyon.so.${VERSION} ${RAYLIBDIR}/libtachyon.so
- 
- ${OBJDIR}/vol.o : ${SRCDIR}/vol.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/vol.c -o ${OBJDIR}/vol.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/vol.c -o ${OBJDIR}/vol.o
- 
- ${OBJDIR}/extvol.o : ${SRCDIR}/extvol.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/extvol.c -o ${OBJDIR}/extvol.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/extvol.c -o ${OBJDIR}/extvol.o
- 
- ${OBJDIR}/winbmp.o : ${SRCDIR}/winbmp.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/winbmp.c -o ${OBJDIR}/winbmp.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/winbmp.c -o ${OBJDIR}/winbmp.o
- 
- ${OBJDIR}/vector.o : ${SRCDIR}/vector.c ${OBJDEPS} 
--	${CC} ${CFLAGS} -c ${SRCDIR}/vector.c -o ${OBJDIR}/vector.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/vector.c -o ${OBJDIR}/vector.o
- 
- ${OBJDIR}/triangle.o : ${SRCDIR}/triangle.c ${OBJDEPS} ${SRCDIR}/triangle.h
--	${CC} ${CFLAGS} -c ${SRCDIR}/triangle.c -o ${OBJDIR}/triangle.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/triangle.c -o ${OBJDIR}/triangle.o
- 
- ${OBJDIR}/trace.o : ${SRCDIR}/trace.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/trace.c -o ${OBJDIR}/trace.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/trace.c -o ${OBJDIR}/trace.o
- 
- ${OBJDIR}/threads.o : ${SRCDIR}/threads.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/threads.c -o ${OBJDIR}/threads.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/threads.c -o ${OBJDIR}/threads.o
- 
- ${OBJDIR}/tgafile.o : ${SRCDIR}/tgafile.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/tgafile.c -o ${OBJDIR}/tgafile.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/tgafile.c -o ${OBJDIR}/tgafile.o
- 
- ${OBJDIR}/util.o : ${SRCDIR}/util.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/util.c -o ${OBJDIR}/util.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/util.c -o ${OBJDIR}/util.o
- 
- ${OBJDIR}/ui.o : ${SRCDIR}/ui.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/ui.c -o ${OBJDIR}/ui.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/ui.c -o ${OBJDIR}/ui.o
- 
- ${OBJDIR}/texture.o : ${SRCDIR}/texture.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/texture.c -o ${OBJDIR}/texture.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/texture.c -o ${OBJDIR}/texture.o
- 
- ${OBJDIR}/sphere.o : ${SRCDIR}/sphere.c ${OBJDEPS} ${SRCDIR}/sphere.h
--	${CC} ${CFLAGS} -c ${SRCDIR}/sphere.c -o ${OBJDIR}/sphere.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/sphere.c -o ${OBJDIR}/sphere.o
- 
- ${OBJDIR}/sgirgb.o : ${SRCDIR}/sgirgb.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/sgirgb.c -o ${OBJDIR}/sgirgb.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/sgirgb.c -o ${OBJDIR}/sgirgb.o
- 
- ${OBJDIR}/shade.o : ${SRCDIR}/shade.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/shade.c -o ${OBJDIR}/shade.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/shade.c -o ${OBJDIR}/shade.o
- 
- ${OBJDIR}/ring.o : ${SRCDIR}/ring.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/ring.c -o ${OBJDIR}/ring.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/ring.c -o ${OBJDIR}/ring.o
- 
- ${OBJDIR}/render.o : ${SRCDIR}/render.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/render.c -o ${OBJDIR}/render.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/render.c -o ${OBJDIR}/render.o
- 
- ${OBJDIR}/quadric.o : ${SRCDIR}/quadric.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/quadric.c -o ${OBJDIR}/quadric.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/quadric.c -o ${OBJDIR}/quadric.o
- 
- ${OBJDIR}/jpeg.o : ${SRCDIR}/jpeg.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/jpeg.c -o ${OBJDIR}/jpeg.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/jpeg.c -o ${OBJDIR}/jpeg.o
- 
- ${OBJDIR}/pngfile.o : ${SRCDIR}/pngfile.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/pngfile.c -o ${OBJDIR}/pngfile.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/pngfile.c -o ${OBJDIR}/pngfile.o
- 
- ${OBJDIR}/ppm.o : ${SRCDIR}/ppm.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/ppm.c -o ${OBJDIR}/ppm.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/ppm.c -o ${OBJDIR}/ppm.o
- 
- ${OBJDIR}/psd.o : ${SRCDIR}/psd.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/psd.c -o ${OBJDIR}/psd.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/psd.c -o ${OBJDIR}/psd.o
- 
- ${OBJDIR}/plane.o : ${SRCDIR}/plane.c ${OBJDEPS} ${SRCDIR}/plane.h
--	${CC} ${CFLAGS} -c ${SRCDIR}/plane.c -o ${OBJDIR}/plane.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/plane.c -o ${OBJDIR}/plane.o
- 
- ${OBJDIR}/parallel.o : ${SRCDIR}/parallel.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/parallel.c -o ${OBJDIR}/parallel.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/parallel.c -o ${OBJDIR}/parallel.o
- 
- ${OBJDIR}/objbound.o : ${SRCDIR}/objbound.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/objbound.c -o ${OBJDIR}/objbound.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/objbound.c -o ${OBJDIR}/objbound.o
- 
- ${OBJDIR}/light.o : ${SRCDIR}/light.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/light.c -o ${OBJDIR}/light.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/light.c -o ${OBJDIR}/light.o
- 
- ${OBJDIR}/intersect.o : ${SRCDIR}/intersect.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/intersect.c -o ${OBJDIR}/intersect.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/intersect.c -o ${OBJDIR}/intersect.o
- 
- ${OBJDIR}/imageio.o : ${SRCDIR}/imageio.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/imageio.c -o ${OBJDIR}/imageio.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/imageio.c -o ${OBJDIR}/imageio.o
- 
- ${OBJDIR}/imap.o : ${SRCDIR}/imap.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/imap.c -o ${OBJDIR}/imap.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/imap.c -o ${OBJDIR}/imap.o
- 
- ${OBJDIR}/grid.o : ${SRCDIR}/grid.c ${SRCDIR}/grid.h ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/grid.c -o ${OBJDIR}/grid.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/grid.c -o ${OBJDIR}/grid.o
- 
- ${OBJDIR}/global.o : ${SRCDIR}/global.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/global.c -o ${OBJDIR}/global.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/global.c -o ${OBJDIR}/global.o
- 
- ${OBJDIR}/hash.o : ${SRCDIR}/hash.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/hash.c -o ${OBJDIR}/hash.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/hash.c -o ${OBJDIR}/hash.o
- 
- ${OBJDIR}/cylinder.o : ${SRCDIR}/cylinder.c ${OBJDEPS} ${SRCDIR}/cylinder.h
--	${CC} ${CFLAGS} -c ${SRCDIR}/cylinder.c -o ${OBJDIR}/cylinder.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/cylinder.c -o ${OBJDIR}/cylinder.o
- 
- ${OBJDIR}/coordsys.o : ${SRCDIR}/coordsys.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/coordsys.c -o ${OBJDIR}/coordsys.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/coordsys.c -o ${OBJDIR}/coordsys.o
- 
- ${OBJDIR}/camera.o : ${SRCDIR}/camera.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/camera.c -o ${OBJDIR}/camera.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/camera.c -o ${OBJDIR}/camera.o
- 
- ${OBJDIR}/box.o : ${SRCDIR}/box.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/box.c -o ${OBJDIR}/box.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/box.c -o ${OBJDIR}/box.o
- 
- ${OBJDIR}/bndbox.o : ${SRCDIR}/bndbox.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/bndbox.c -o ${OBJDIR}/bndbox.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/bndbox.c -o ${OBJDIR}/bndbox.o
- 
- ${OBJDIR}/apigeom.o : ${SRCDIR}/apigeom.c ${OBJDEPS}
--	${CC} ${CFLAGS} -c ${SRCDIR}/apigeom.c -o ${OBJDIR}/apigeom.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/apigeom.c -o ${OBJDIR}/apigeom.o
- 
- ${OBJDIR}/api.o : ${SRCDIR}/api.c ${OBJDEPS} ${SRCDIR}/sphere.h ${SRCDIR}/plane.h ${SRCDIR}/triangle.h ${SRCDIR}/cylinder.h
--	${CC} ${CFLAGS} -c ${SRCDIR}/api.c -o ${OBJDIR}/api.o
-+	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/api.c -o ${OBJDIR}/api.o
- 
- clean :
- 	@echo "Cleaning object files, binaries etc."
diff --git a/media-gfx/tachyon/tachyon-0.99_beta6-r1.ebuild b/media-gfx/tachyon/tachyon-0.99_beta6-r1.ebuild
deleted file mode 100644
index 906476b0c400..000000000000
--- a/media-gfx/tachyon/tachyon-0.99_beta6-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-MY_PV=${PV/_beta/b}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A portable, high performance parallel ray tracing system"
-HOMEPAGE="http://jedi.ks.uiuc.edu/~johns/raytracer/"
-SRC_URI="http://jedi.ks.uiuc.edu/~johns/raytracer/files/${MY_PV}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~x86 ~x64-macos"
-IUSE="doc examples jpeg mpi +opengl png threads"
-
-CDEPEND="
-	jpeg? ( virtual/jpeg:0= )
-	mpi? ( virtual/mpi )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-		)
-	png? ( media-libs/libpng:0= )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="^^ ( opengl mpi )"
-
-S="${WORKDIR}/${PN}/unix"
-
-pkg_setup() {
-	local ostarget
-
-	# TODO: Test on alpha, ia64
-	# TODO: add other architectures
-	# TODO: X, Motif, MBOX, Open Media Framework, Spaceball I/O, MGF ?
-	TACHYON_MAKE_TARGET=
-
-	case ${CHOST} in
-		powerpc*-darwin*)   ostarget=macosx      ;;
-		*86*-darwin*)       ostarget=macosx-x86  ;;
-		*)					ostarget=linux       ;;
-	esac
-
-	if use threads ; then
-		if use opengl ; then
-			TACHYON_MAKE_TARGET=${ostarget}-thr-ogl
-		elif use mpi ; then
-			TACHYON_MAKE_TARGET=${ostarget}-mpi-thr
-		else
-			TACHYON_MAKE_TARGET=${ostarget}-thr
-		fi
-
-		# TODO: Support for linux-athlon-thr ?
-	else
-		if use mpi ; then
-			TACHYON_MAKE_TARGET=${ostarget}-mpi
-		else
-			TACHYON_MAKE_TARGET=${ostarget}
-		fi
-	fi
-
-	if [[ -z "${TACHYON_MAKE_TARGET}" ]]; then
-		die "No target found, check use flags"
-	else
-		einfo "Using target: ${TACHYON_MAKE_TARGET}"
-	fi
-}
-
-src_prepare() {
-	emakeconf=()
-	use jpeg && \
-		emakeconf+=(
-			USEJPEG=-DUSEJPEG
-			JPEGLIB=-ljpeg
-		)
-
-	use png && \
-		emakeconf+=(
-			USEPNG=-DUSEPNG
-			PNGINC="$($(tc-getPKG_CONFIG) --cflags libpng)"
-			PNGLIB="$($(tc-getPKG_CONFIG) --libs libpng)"
-			)
-
-	if use mpi ; then
-		sed \
-			-e "s:MPIDIR=:MPIDIR=/usr:g" \
-			-e "s:linux-lam:linux-mpi:g" \
-			-i Make-config || die "sed failed"
-	fi
-	sed -i \
-		-e "s:-O3::g;s:-g::g;s:-pg::g" \
-		-e "s:-m32:${CFLAGS}:g" \
-		-e "s:-m64:${CFLAGS}:g" \
-		-e "s:-ffast-math::g" \
-		-e "s:STRIP = strip:STRIP = touch:g" \
-		-e "s:CC = *cc:CC = $(tc-getCC):g" \
-		-e "s:-fomit-frame-pointer::g" Make-arch || die "sed failed"
-
-	epatch \
-		"${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-shared.patch
-	eapply_user
-}
-
-src_compile() {
-	emake ${TACHYON_MAKE_TARGET} "${emakeconf[@]}" VERSION=${PV}
-}
-
-src_install() {
-	cd .. || die
-	dodoc Changes README
-
-	insinto /usr/include/${PN}
-	doins src/*.h
-
-	use doc && dohtml docs/tachyon/*
-
-	cd compile/${TACHYON_MAKE_TARGET} || die
-
-	dobin ${PN}
-	dolib.so lib${PN}.so*
-
-	if use examples; then
-		cd "${S}/../scenes" || die
-		insinto "/usr/share/${PN}/examples"
-		doins *
-	fi
-}
diff --git a/media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild b/media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild
index bb7b5300a850..73976dc2018e 100644
--- a/media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild
+++ b/media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_PV="${PV/_beta/b}"
 MY_P="${PN}-${MY_PV}"
diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest
index 1c3acf0b12ba..7560c08c9093 100644
--- a/media-gfx/transfig/Manifest
+++ b/media-gfx/transfig/Manifest
@@ -3,5 +3,5 @@ AUX transfig-3.2.5e-gcc10-fno-common.patch 939 BLAKE2B 70af7830470b5ed524d6b5df5
 DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980
 DIST transfig-3.2.5e-gentoo-patchset-r1.tar.bz2 21160 BLAKE2B 093020827fc0636f7549c3b325e4f148aa52407d8e288038dd02012875737523e83e0717662d04e463a01e8cfacfabffaaa4362b5bb1276c4f2052f6653fa26f SHA512 dbef1ca464929de45f3c706e76eb9f324ea9e692cc8c924893926e07ef7d4e0dbe597bcf465a9c7fc9fca22abe0acc6784ab09658a18aeff4ba44921b52b02ff
 DIST transfig.3.2.5e.tar.gz 531256 BLAKE2B 830a97cb801b9cb284f7746a7f4a9645263cc34fd35d904288143d730331901302b12223ba135d8fa936f5ca0eeccacd194bbe2e74dfcfbf0cf4aede273ab507 SHA512 ed1379f1112514d90a4b3eecd3222baad311d804b5090e8e66867ec299e4f9a5f8d83ef8939aa6ecaa85a18143b8fb9b97f78e078ac5eeb934a158c55de6bb1e
-EBUILD transfig-3.2.5e-r1.ebuild 3358 BLAKE2B fd6d18e9000d426e58da37561484cbb2a5dc781364c917891e72ef6e900c770a51deb08fffed7fcc4b35990f772ab6b3566cf39df1ef92e096b32e763c9098f3 SHA512 bd6595d88cc5cde424117e4be140332118803020f6ca64b2e3c911d5c52800418cf72c3e5631a182817341a6671bb69377d1e14ab1bc40bf82a660537cfc0f7d
+EBUILD transfig-3.2.5e-r1.ebuild 3436 BLAKE2B 0e09a34f42b70c66dd94c9295250fcab9bae35bcec9869eae363a1b4aadd566e1171c55620027304ddeb8a637129a6695db80dde72641e1a17d0461a75d05316 SHA512 b8989f461feb24e3d31e721e561a3d28581b88ba107aac7db1fa5a15c77d94966786b080bd47af9c5325353906966e2b0bf32cb153531f0c1ce52041cc216995
 MISC metadata.xml 238 BLAKE2B 60ff9cbe893ace8f33a3d44ee85a5c73c9bd5553478173bf92c4aa93398ae1140ba28673eb6c7373ac48ede6679546b57ea08b8e676ce5c7a47792a2ba8b3148 SHA512 65918555949ddfef068a9a197dffda69aee483ac55c1b52dcf19376aecf1cb53d8a3fc0931d4ebdbe64ba3341e2a2567d56c2830eb31e6746735449c53a1203c
diff --git a/media-gfx/transfig/transfig-3.2.5e-r1.ebuild b/media-gfx/transfig/transfig-3.2.5e-r1.ebuild
index 5c2d730704e1..39ce8231f7e8 100644
--- a/media-gfx/transfig/transfig-3.2.5e-r1.ebuild
+++ b/media-gfx/transfig/transfig-3.2.5e-r1.ebuild
@@ -2,29 +2,31 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic toolchain-funcs
 
-MY_P=${PN}.${PV}
+inherit toolchain-funcs
 
-DESCRIPTION="A set of tools for creating TeX documents with graphics"
+MY_P="${PN}.${PV}"
+
+DESCRIPTION="Set of tools for creating TeX documents with graphics"
 HOMEPAGE="https://www.xfig.org/"
 SRC_URI="mirror://sourceforge/mcj/${MY_P}.tar.gz
 	mirror://gentoo/fig2mpdf-1.1.2.tar.bz2
 	https://dev.gentoo.org/~sultan/distfiles/media-gfx/transfig/${P}-gentoo-patchset-r1.tar.bz2"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 
-RDEPEND="x11-libs/libXpm
-	virtual/jpeg
+RDEPEND="
 	media-libs/libpng
-	x11-apps/rgb"
-DEPEND="${RDEPEND}
-	x11-misc/imake
-	app-text/rman"
-
-S=${WORKDIR}/${MY_P}
+	virtual/jpeg
+	x11-apps/rgb
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/rman
+	>=x11-misc/imake-1.0.8-r1"
 
 PATCHES=(
 	"${WORKDIR}/${P}-gentoo-patchset/${PN}-3.2.5d-fig2mpdf-r1.patch"
@@ -61,11 +63,6 @@ sed_Imakefile() {
 src_prepare() {
 	default
 
-	# Create wrapper for gcc, bug #720820
-	printf '#!/bin/sh\n%s ${*}\n' "$(tc-getCC)" > "${T}"/gcc
-	chmod +x "${T}"/gcc
-	export PATH="${T}:${PATH}"
-
 	find . -type f -exec chmod a-x '{}' \; || die
 	find . -name Makefile -delete || die
 
@@ -75,20 +72,32 @@ src_prepare() {
 	sed_Imakefile fig2dev/Imakefile fig2dev/dev/Imakefile
 }
 
-src_compile() {
-	xmkmf || die "xmkmf failed"
-	emake Makefiles
+src_configure() {
+	export IMAKECPP=${IMAKECPP:-$(tc-getCPP)}
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" xmkmf || die
+}
 
-	emake CC="$(tc-getCC)" AR="$(tc-getAR) clq" RANLIB="$(tc-getRANLIB)" \
-		LOCAL_LDFLAGS="${LDFLAGS}" CDEBUGFLAGS="${CFLAGS}" \
+src_compile() {
+	emake CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" Makefiles
+
+	local myemakeargs=(
+		CC="$(tc-getCC)"
+		AR="$(tc-getAR) cq"
+		RANLIB="$(tc-getRANLIB)"
+		CDEBUGFLAGS="${CFLAGS}"
+		LOCAL_LDFLAGS="${LDFLAGS}"
 		USRLIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	)
+	emake "${myemakeargs[@]}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" \
-		INSTDATFLAGS="-m 644" \
-		INSTMANFLAGS="-m 644" \
-		install install.man
+	local myemakeargs=(
+		DESTDIR="${D}"
+		INSTDATFLAGS="-m 644"
+		INSTMANFLAGS="-m 644"
+	)
+	emake "${myemakeargs[@]}" install install.man
 
 	dobin "${WORKDIR}/fig2mpdf/fig2mpdf"
 	doman "${WORKDIR}/fig2mpdf/fig2mpdf.1"
@@ -100,7 +109,7 @@ src_install() {
 
 	einstalldocs
 
-	rm -f "${ED}/usr/share/doc/${PF}/html/"{Makefile,*.lfig,*.pdf,*.tex} || die
+	rm "${ED}/usr/share/doc/${PF}/html/"{Makefile,*.lfig,*.pdf,*.tex} || die
 
 	mv "${ED}"/usr/bin/fig2ps2tex{.sh,} || die #338295
 }
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 51eabb043070..7f1cc010a716 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,3 +1,3 @@
 DIST tuxpaint-0.9.24.tar.gz 15561675 BLAKE2B 971baec8b7728cbb54a2a45b604c152a9620d0f6a1856cca99482ad0fd76f2a4493aab81f54e10e5da4d81800b0e3506cb73dda0e00510ef966b0c98f8aa5cb4 SHA512 a4ee9eea833f9a6313701a4686f9f276570df84436c68d9a3d04e9448a8ea00833207e1034965e15145be744194c7b9a7d3c91bdfa3489d06a61de84b64cc723
-EBUILD tuxpaint-0.9.24.ebuild 1674 BLAKE2B 5ba887bd2e613c42def2cfcd2ef6bc2b37ca5dcabbdbc4dece2255301299532b2d3fb203443e47d9e771758354cac65bf582c465e80d6d662ca384be5856383a SHA512 26c1c718f70a796cd0950c6f8abd82665a2230e5dac9d92b43540003cee6c18dd3044895d1d74a85a95afe196edcdcacc72ae3f8f9aa8f5edbdb8656d724d667
+EBUILD tuxpaint-0.9.24.ebuild 1635 BLAKE2B 9ffccad94bc488235212c359a9c804645fb89a057c733f7119e97dfa7e00dcd093c755044c2eea5dc987ae144f0d3771725010b750071310aa6d62a40f5d751f SHA512 68681f9189d444532315c15aa23afac9ff7d6ed2646e2140750b345644b352c95649a74331c934d2fa2f413588fb2e7e74f941b9391201da716d3c61695c9a73
 MISC metadata.xml 618 BLAKE2B 41214f92d2223b2791c7f79b8add3c494549a9f7e4048d17ec74aa13a56c460d3c83df08bd2f93358e8aa4eb6b497a6f3b9e49cd422a6a17a211341bd44e4bdd SHA512 e1be803667ac0a7a2a364f05f08e0514826292f11b3ff261a215864cfa50d61538f4535a83b0903e85c942098155231725db6e664aee4cfca812a36d670c0f72
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
index a76582804619..b17d98b9288c 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
@@ -66,6 +66,5 @@ src_install() {
 
 pkg_postinst() {
 	xdg_pkg_postinst
-	elog "Optional uninstalled features:"
 	optfeature "additional graphic stamps" media-gfx/tuxpaint-stamps
 }
diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest
index 8c9b02802645..afe2f337102c 100644
--- a/media-gfx/ufraw/Manifest
+++ b/media-gfx/ufraw/Manifest
@@ -6,8 +6,9 @@ AUX ufraw-0.22-drop_superfluous_abs.patch 448 BLAKE2B eae5b9f2dd6d12922b5fcd4834
 AUX ufraw-0.22-exiv2-0.27.patch 738 BLAKE2B 5392f37396074b1188b4c9f3bac06eb4168d68f53d367cc5107dbf71a66d5aab56a62489a826ac8fc0a4add74666bf232fde96f41f0ffc9604f5e6fd09d5d4fd SHA512 d37a132dc06ce186f177d6720ad23bc5f1e8ce84743b6e506242efee20cf628a4192d2bdaf1718260dba7bdef82d78bae2eb366df44e3dd3de13e318f812b76d
 AUX ufraw-0.22-fix-unsigned-char.patch 748 BLAKE2B 30a8dfcfb71f78449838ade5f77074d667fc1e71ca079f8042869a9e82ff8b9422ddbdc892c7458e05ad411d552352b5f530ae2da4a629d449857a1e62be0c78 SHA512 0ea99fe69adeeae1e6c07bcf9d583f6b8247ad0f01ddf3435edb605618b0c24d80c5662442250020b92352ebba12757bb69ad7b107ab8a8f464d5cf2b642664b
 AUX ufraw-0.22-gcc9.patch 3569 BLAKE2B ce417eb79994190666b842f6017f18eadead284bb763f1248ab4c0dd6132977fc56c79c11e3782a33d507aceec193e9ab2be423bea4335521e4308cb617b04d7 SHA512 aaf902c4a96ba1d9f21ff31e5499fd9d9216ff17812b41276e15a7150a4a90aa8a7a9e4aec70a006e68930e0e05c4a1da38abc78175de521752f1c6152e77b5a
+AUX ufraw-0.22-glib-2.68.patch 444 BLAKE2B e4700eda91c0c7382db15136bd8f73e61f193f8996db7cf311b61d72a692af0cd3162faca9132078c7322080dabe1b4a7d3bbb891e75640aa2c34c0414f0031b SHA512 b251955ce43db93aa3d1fa5b1a1963591449858e7a4cdb94c0055538e05c1c12488bf70dbd0ce169d0e73446345027ff3a8e4127dee4c24ae5878f5af9f74143
 AUX ufraw-0.22-jasper-automagic.patch 613 BLAKE2B 100e6b31540030a20c8cff8e99329a738378788b2ab11665c0c8ab2f3246c821a176dba8b26cea354e8b0d127d2c601c21b0ac94f5264327916d0f8779618165 SHA512 855337bf109ebc0ea7b9bd429bcc429bd9caa561e2a815352c51e860a6e405d500913b70414ded7f47e053332c89b964d1817c8f22627504cf157f1565f3c7a4
 AUX ufraw-0.22-jpeg9.patch 1076 BLAKE2B 84448c537706d7b29f54d4735a75bf9501eac7927529c6d8e43d6cd746763ab753715d54cf943bb8bb5ddd8a29891f7522a680426acd2eb52af450492656ae3e SHA512 520e9351d7b8aa84f79a7c2841c2f56eaca849e67e448dc9503d248e31c1aa9fecaa64a332c0a155b6ba1ab7debec8734f3f2ef710bcb534a5fca34e9b5c8f7c
 DIST ufraw-0.22.tar.gz 1103554 BLAKE2B 5ffa4c660602553853221d7b31bfb78b02644bfeb4461cf752186d83ed8087b7905e414c7d741916ca9460c05849ab679b2f3098c99e5246f54a49b6a915268f SHA512 a42eff5052c18afec90245cf97ceeade78e3f288186cf697ac4abf2e8290d4081db8ac4de3ae47b3774f30a6cb4cbda392099e6fd2125fe751abb40d9b065ad2
-EBUILD ufraw-0.22-r4.ebuild 2046 BLAKE2B d7fb1a2fae08eab732252663bbd495fd41af18049df29406379b3d929264ece0917fd2fd8f60024887d9549484d610763dfe030ca4afa795b9c9ce919b862285 SHA512 723f6615cdc6acbe9cb6c9d425a4d5be1aed82eb4104f730098b7ccb69f9d4e67fbbe81c1e09b86a002619e55e9e43775f013b478f9772b531d575f5614a6913
+EBUILD ufraw-0.22-r4.ebuild 2082 BLAKE2B a4f04f08e12e1139b6711fa9a68682b5a39af78bc40ec1c819b5e46fc1e7e350f521377ff17021113d934b3bb36fb9e3b53644a35d422df91fc27d74d2783a85 SHA512 a6244fe2f0b8507c7c68641f177541d8afd49932a48ee1f05059eb9f1fe2b86f29a96e3c7e8a8a080801fb6113c44a6d8c57a3e9e332aa4dc55511b8fb35be3b
 MISC metadata.xml 496 BLAKE2B e14f04b9daf2f209851e28ddf26240225cb2e65f675c5903f512a3aeaefa8a7fbfc1c4140c9ed0aec699c2ec3ff53b0ea72e777f6836b4069db12e8ca3b9dd6c SHA512 cb35076b463c212dc7ba1d015ee3a04633ba6564f6fe8b569dc364123a5487b1b17219e523d7d2ccb725bb75815bdab1b1271135ee5624ec4177af327df397ff
diff --git a/media-gfx/ufraw/files/ufraw-0.22-glib-2.68.patch b/media-gfx/ufraw/files/ufraw-0.22-glib-2.68.patch
new file mode 100644
index 000000000000..c2499fa16bf5
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.22-glib-2.68.patch
@@ -0,0 +1,19 @@
+--- a/uf_glib.h	2021-04-18 23:14:11.346861061 -0400
++++ b/uf_glib.h	2021-04-18 23:14:20.180520873 -0400
+@@ -13,13 +13,13 @@
+ #ifndef _UF_GLIB_H
+ #define _UF_GLIB_H
+ 
++#include <glib.h>
++#include <glib/gstdio.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
+-#include <glib.h>
+-#include <glib/gstdio.h>
+-
+ // g_win32_locale_filename_from_utf8 is needed only on win32
+ #ifdef _WIN32
+ #define uf_win32_locale_filename_from_utf8(__some_string__) \
diff --git a/media-gfx/ufraw/ufraw-0.22-r4.ebuild b/media-gfx/ufraw/ufraw-0.22-r4.ebuild
index 0400a1d39a78..1be3077ba8ed 100644
--- a/media-gfx/ufraw/ufraw-0.22-r4.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r4.ebuild
@@ -46,6 +46,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gcc9.patch
 	"${FILESDIR}"/${P}-CVE-2015-8366.patch
 	"${FILESDIR}"/${P}-CVE-2018-19655.patch
+	"${FILESDIR}"/${P}-glib-2.68.patch
 )
 
 src_prepare() {
diff --git a/media-gfx/videorbits/Manifest b/media-gfx/videorbits/Manifest
deleted file mode 100644
index 0cb873b92fac..000000000000
--- a/media-gfx/videorbits/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX videorbits-2.201-libpng15.patch 826 BLAKE2B e3051587a3198b2d3df970e01b4a38ec138b9d5c5dfe81269eb19ef6b13b258ff68dc8070fd8987a5f6db41121dbb480ba62d318e00d9047789d6247c35eae75 SHA512 6fd83e3524afb791f7c68755741651052fcb2b531efc0f4d7dc223ba1206999fd1ebcb6374eca9c5938246a0c077de309cd1450e9385b231fd73d12a9ed2cc3a
-AUX videorbits-2.205-fix-buildsystem.patch 635 BLAKE2B 89499ec57ce08722b0e8fcaa0bfc37cabf11627fe867e905b0cb329323453052cbe92ccd00f06d26beef11a134d5430163ac158b40fb398bdf448087f9709b6f SHA512 46462bdf437424f3af86526c1f2dfef68884f504646357ff3e5779f4629fdf22742a26e2dcf9df9b03a20da8125e87cb3b4772600d7590428d6d0a31f711ae9a
-AUX videorbits-2.205-qa-implicit-declarations.patch 712 BLAKE2B 5b24e38dc2951659f2c45ad50e853796d91338e59b1c55e6ffc396c4d3c221e80a559dc0aceb999a3e594ca9b61beeffcd0177d98c5daa6758582af2a25e314a SHA512 cfcab0079719ca2595b83e65ded05b8154a139304c23184823f0c957bb06af09465d486f8763a83baf8cc298b16f9e3b0b53f6218977972555bf2142ab3e43f8
-AUX videorbits-2.205-remove-bits-nan.patch 969 BLAKE2B bae9ba484c80c25c5eeb6e2bd1f9de5a49e3f5cf552e74bd9953985cbea5bff6002bd34c90cae057cd8a41272232760310f510418c0fef5c1ae9fbe3a93b1fb5 SHA512 cca1aa22cab689537248b9c0026acbf33114b359c1ab7b66cf23ac6f038dfb7653c48229b0b581552b23ced35ccdeae00b3676059745775aeac91ee7f5fe8d7e
-DIST videorbits-2.205.tgz 672377 BLAKE2B e111d48c3a7e8c3fc1bf878249a07c799879fa3c68e8555c539fd4089800fd7695f1758188295f65aa62fababfc6cc3c534abae384eb820f80bb1bbe0eb4b92d SHA512 faad5a7ab98167d67b7748b4b9aca1ced0e802ed85cba55ba9966d08c48045daa8fef8d387c576dcfa50ace8c4962bb0043bb83e3ba741844ede67d331e4fbf8
-EBUILD videorbits-2.205.ebuild 806 BLAKE2B fbd4d3fa5da3be4bc15684e792b9a951c7ddbab5db83ada4c7be8c35438248f221934cb415f23863aaea2408a65f8a348fd612eb214347a89fdeea69d0042883 SHA512 2c92add8732840b7de77f6341a83d14b060ff09cde893070c43b212419d4653edaad6e9a9ea970713fad4d75de235bd12b2c7f85d19dce50603085aa56064323
-MISC metadata.xml 250 BLAKE2B 50ea93eb13d7a17cbaaa68accbae08e643330655c4af46a99440edbec4d7ef50111c45d91dfa2490de8cc9c77fb8be16e9f4b285f67c91522cbee316db6a860d SHA512 c18112cc613181bf7e1d339de4f2283d8d4f1c8a6492025a9c0e4c54dedeeed696713e844edd437eb1bd3e9659e4eb33cc49132450ff3ec7efa109a0238b3596
diff --git a/media-gfx/videorbits/files/videorbits-2.201-libpng15.patch b/media-gfx/videorbits/files/videorbits-2.201-libpng15.patch
deleted file mode 100644
index f87132b0be44..000000000000
--- a/media-gfx/videorbits/files/videorbits-2.201-libpng15.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- videorbits-2.205/src/simple_png_read.c
-+++ videorbits-2.205/src/simple_png_read.c
-@@ -92,7 +92,7 @@
-     return -1;
-   }
- 
--  if (setjmp(png_ptr->jmpbuf)) {
-+  if (setjmp(png_jmpbuf(png_ptr))) {
-     fprintf(stderr, "simple_png_read: error (internal)\n"); 
-     png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
-     fclose(fp);
-@@ -226,7 +226,7 @@
-     return -1;
-   }
- 
--  if (setjmp(png_ptr->jmpbuf)) {
-+  if (setjmp(png_jmpbuf(png_ptr))) {
-     fprintf(stderr, "simple_png_read_header: error\n"); 
-     png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
-     fclose(fp);
---- videorbits-2.205/src/simple_png_write.c
-+++ videorbits-2.205/src/simple_png_write.c
-@@ -18,6 +18,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <png.h>
-+#include <zlib.h>
- 
- int simple_png_write_rgba(
-   char *filename, 
diff --git a/media-gfx/videorbits/files/videorbits-2.205-fix-buildsystem.patch b/media-gfx/videorbits/files/videorbits-2.205-fix-buildsystem.patch
deleted file mode 100644
index 8d2359232bc2..000000000000
--- a/media-gfx/videorbits/files/videorbits-2.205-fix-buildsystem.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix installation paths.
-
---- videorbits-2.205/images/Makefile.am
-+++ videorbits-2.205/images/Makefile.am
-@@ -1,4 +1,4 @@
--imagesdir = $(prefix)/images
--images_DATA= v04.pgm  v06.pgm
-+images_dir = $(datadir)/videorbits/images
-+images__DATA= v04.pgm  v06.pgm
- 
- 
---- videorbits-2.205/lookuptables/Makefile.am
-+++ videorbits-2.205/lookuptables/Makefile.am
-@@ -1,3 +1,3 @@
--lookuptablesdir = $(prefix)/lookuptables
--lookuptables_DATA=powLookup22.txt powLookup47.txt Kodak_DCS260_response_function 
-+lookuptables_dir = $(datadir)/videorbits/lookuptables
-+lookuptables__DATA=powLookup22.txt powLookup47.txt Kodak_DCS260_response_function 
- 
diff --git a/media-gfx/videorbits/files/videorbits-2.205-qa-implicit-declarations.patch b/media-gfx/videorbits/files/videorbits-2.205-qa-implicit-declarations.patch
deleted file mode 100644
index 1e46ccf5651e..000000000000
--- a/media-gfx/videorbits/files/videorbits-2.205-qa-implicit-declarations.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Fix implicit declarations caused by missing headers and
-failures caused by -Werror=format-security checks
-
---- videorbits-2.205/src/pchirp2nocrop.c
-+++ videorbits-2.205/src/pchirp2nocrop.c
-@@ -1,5 +1,6 @@
- #include <stdlib.h>
- #include <math.h>
-+#include <string.h>
- #include "PNMImageOffsetable.h"
- #include "mat_util.h"
- #include "boundingbox.h"
---- videorbits-2.205/src/par.c
-+++ videorbits-2.205/src/par.c
-@@ -111,7 +111,7 @@
- 
-   /* - - Write file-type number - - */ 
-   sprintf(magic_number, "P%d\n", data_type);
--  fprintf(file_ptr, magic_number); 
-+  fprintf(file_ptr, "%s", magic_number); 
- 
-   /* - - put comments - - */  /* !!!!!! break up long comments */
-   fprintf(file_ptr, "# %s\n", comments);  
diff --git a/media-gfx/videorbits/files/videorbits-2.205-remove-bits-nan.patch b/media-gfx/videorbits/files/videorbits-2.205-remove-bits-nan.patch
deleted file mode 100644
index 822b8dd8167a..000000000000
--- a/media-gfx/videorbits/files/videorbits-2.205-remove-bits-nan.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 27db38e20d2f1c685c9a4aa01cfbde96b0555d80 Mon Sep 17 00:00:00 2001
-From: Harri Nieminen <moikkis@gmail.com>
-Date: Tue, 27 Mar 2018 19:45:19 +0300
-Subject: [PATCH] Don't include bits/nan.h
-
----
- src/cement.c     | 1 -
- src/cementinit.c | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/src/cement.c b/src/cement.c
-index 3dfb6f9..23c424c 100644
---- a/src/cement.c
-+++ b/src/cement.c
-@@ -1,7 +1,6 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <math.h>
--#include <bits/nan.h>
- #include <limits.h>
- #include <string.h>
- #include <errno.h>
-diff --git a/src/cementinit.c b/src/cementinit.c
-index 95850d9..afa160e 100644
---- a/src/cementinit.c
-+++ b/src/cementinit.c
-@@ -1,5 +1,4 @@
- #include <math.h>
--#include <bits/nan.h>
- /* NB:  supposedly nan.h is included from math.h when -std=c99 is on the
-  *      gcc compile line but that doesn't work so its included it directly.
-  *      Not having this line makes nan become unreliable, sometime it is
--- 
-2.16.3
-
diff --git a/media-gfx/videorbits/metadata.xml b/media-gfx/videorbits/metadata.xml
deleted file mode 100644
index e416281791b7..000000000000
--- a/media-gfx/videorbits/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">comparametric</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-gfx/videorbits/videorbits-2.205.ebuild b/media-gfx/videorbits/videorbits-2.205.ebuild
deleted file mode 100644
index 6628294ba749..000000000000
--- a/media-gfx/videorbits/videorbits-2.205.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="a collection of programs for creating high dynamic range images"
-HOMEPAGE="http://comparametric.sourceforge.net/"
-SRC_URI="mirror://sourceforge/comparametric/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	sys-libs/zlib
-	media-libs/libpng:0=
-	virtual/jpeg:0
-	sci-libs/fftw:2.1
-	media-libs/netpbm"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.201-libpng15.patch"
-	"${FILESDIR}/${P}-qa-implicit-declarations.patch"
-	"${FILESDIR}/${P}-fix-buildsystem.patch"
-	"${FILESDIR}/${P}-remove-bits-nan.patch"
-)
-DOCS=( AUTHORS README README.MORE )
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
diff --git a/media-gfx/waifu2x-ncnn-vulkan/Manifest b/media-gfx/waifu2x-ncnn-vulkan/Manifest
index b1fb3903302f..2f27df705ca0 100644
--- a/media-gfx/waifu2x-ncnn-vulkan/Manifest
+++ b/media-gfx/waifu2x-ncnn-vulkan/Manifest
@@ -1,7 +1,9 @@
 DIST waifu2x-ncnn-vulkan-20200224.tar.gz 34063828 BLAKE2B 9fa00abd31f0d81dd785be5253e44f5bd4082ae9b2fcae747562eb6c577fd7cccdfeaf7421d09c54119fd36285dffcc68d2889ddc06d1a6ddf47ea418066367e SHA512 13531a186817da99efb60fc0b16d0d3f455d0f2d2c9b4b53ddaedf7c50f622b2e5385e4f5dd29668cf845444b39645f0b7e810ab5084aa1e3ca6dbaf424a4e13
 DIST waifu2x-ncnn-vulkan-20200414.tar.gz 34063752 BLAKE2B eb52cc3cf857bdb428497acf8721d51abd6e067b4ae2f126833dfcf8402eae118cfa112b310b366e3e945b871b8c3306e5d826426c43e66b6e1055729644f222 SHA512 c0c5d40fdbf0b643b589d5bca5460ec59fbf38ede33af510c4b30b3211f18cd44d665980a11c13ee922cacf7a05d89b076078bcb8fa59c0523ad6b985a804d97
 DIST waifu2x-ncnn-vulkan-20200818.tar.gz 34073325 BLAKE2B 125c0b975e6aab20fc20563c1edc669a4741779366f9aff20d0f695f56f29d0e1728c1fd1130cdaf4adb6a2c8dad348e262580702519004581b2055ae38ac315 SHA512 6f40885fd91cde3206198da3bf2103d1867a8f35549340cc697819dea2b3e06932203a95a7fda2c636658b40fdc1d3f0f4c4e3e13ba142f9a8ad8475ff1b8f58
+DIST waifu2x-ncnn-vulkan-20210210.tar.gz 34076481 BLAKE2B 821b59d5e681caf4bbdeb0e3576a6df0e257a0f8fdc68c3f4152c5f35cb2d288245051dce874e009af6556b4c7e4fffe1fa261872baf2493e056a78c847acc0d SHA512 56ed4dfda71054f3ebfd6c4c11bcb9351a676ace8405cdc309bd16d18eb65ad0fd230fb943a0ba1dcb3afdb517e7f86bf6df2eadff6e754d296304135cd885be
 EBUILD waifu2x-ncnn-vulkan-20200224.ebuild 846 BLAKE2B 1f1674a2fd28d5e045b30b1122a46442d22e7d67a9690acffe1be24ea570b049d43caf005fc794ea064192d2208b5f5a81e8183462c4238c2f79b0ebd53314cb SHA512 4ed5fee1692e928ce7703e25d87fcda114a1e615fbcb6cbdbe8ab9437173f09c2816f949c22807fdab260a3e5af0ac8dc10c9f78004f92786b7318794422cb5c
 EBUILD waifu2x-ncnn-vulkan-20200414.ebuild 846 BLAKE2B 1f1674a2fd28d5e045b30b1122a46442d22e7d67a9690acffe1be24ea570b049d43caf005fc794ea064192d2208b5f5a81e8183462c4238c2f79b0ebd53314cb SHA512 4ed5fee1692e928ce7703e25d87fcda114a1e615fbcb6cbdbe8ab9437173f09c2816f949c22807fdab260a3e5af0ac8dc10c9f78004f92786b7318794422cb5c
-EBUILD waifu2x-ncnn-vulkan-20200818.ebuild 1046 BLAKE2B 503c4c9a540a48bc54c9ca3b791377bb48c92730f8fb8678aade074bfcabfff2d4e952bf3471cff9379611488d31e30007a54c34d2efcfc78bee09508ed5fb33 SHA512 e7fb66910a10a1fe529bb5a251693fd2aa66b0ad4ed534da1e9665f5b2d4a31456ec0a60bf9997446090e48ffd120130a8ec7aee91f2153a5c89790fc51db8ee
+EBUILD waifu2x-ncnn-vulkan-20200818.ebuild 1045 BLAKE2B ff8530866c99de62b34a885361e10616fa54b8689d9e690941ac01397bde024204ac70801109b0b945afb28086c17a2ee33ff9284b62528d2f95c3d399e0f560 SHA512 7115cf9671e25838e1d160c55e552ba0e405584c961549c728a2f86481a062b88f02b11bb7d46f6d5a30057d19497ad49572a1a1e18a53bc455324a499351acd
+EBUILD waifu2x-ncnn-vulkan-20210210.ebuild 1045 BLAKE2B 6a82c95e27af54e06e38adc6616612f276a12a2510516c2a166b95872f63a0b33e4a764bb0293184bb87b9c14f9d6570ce321a090266037b35f7c13ec990bd55 SHA512 d18ebedcdd5ef779c75ac2281b3f787309b74710d38c3d36da3e723bcc22243b216a3fa63fefc760b12a5d70c191511302e919aa8e513f88ae7eae1121358ab4
 MISC metadata.xml 342 BLAKE2B 718aec175f149d204eb6afabb3a2a59e47366538f16d346a1baeeae03afdfb68bd4c5c39d642af862400f0736644141eb156b43014f4125df61a0b9979bdb83d SHA512 a9b596ab9b9e2bd6052bbb11d7b19e2b6a4fbf69935345498cf5f5fa4934731bfccaf3e3391da0260e6f165198f71545ae8f86b1b01b8507fb9b003cd7e56809
diff --git a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200818.ebuild b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200818.ebuild
index 028da39f4e2d..5800b9b7f2e3 100644
--- a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200818.ebuild
+++ b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200818.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	>=dev-libs/ncnn-20200727
+	~dev-libs/ncnn-20200727
 	media-libs/vulkan-loader
 	media-libs/libwebp
 	dev-util/glslang"
diff --git a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210210.ebuild b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210210.ebuild
new file mode 100644
index 000000000000..cbab4dd50452
--- /dev/null
+++ b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210210.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="waifu2x converter using ncnn and vulkan"
+HOMEPAGE="https://github.com/nihui/waifu2x-ncnn-vulkan"
+
+SRC_URI="https://github.com/nihui/waifu2x-ncnn-vulkan/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	~dev-libs/ncnn-20210322
+	media-libs/vulkan-loader
+	media-libs/libwebp
+	dev-util/glslang"
+
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+CMAKE_USE_DIR="${S}/src"
+
+src_prepare() {
+	# Make finding models actually possible.
+	sed -i 's|path_t model = PATHSTR("models-cunet")|path_t model = PATHSTR("/usr/share/waifu2x-ncnn-vulkan/models-cunet")|' src/main.cpp
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DUSE_SYSTEM_NCNN=ON"
+		"-DUSE_SYSTEM_WEBP=ON"
+		"-DGLSLANG_TARGET_DIR=${EPREFIX}/usr/$(get_libdir)/cmake"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/waifu2x-ncnn-vulkan
+
+	insinto "/usr/share/${PN}"
+	doins -r models/*
+}
diff --git a/media-gfx/xdot/Manifest b/media-gfx/xdot/Manifest
index 300e50c91118..0ed84353bbf3 100644
--- a/media-gfx/xdot/Manifest
+++ b/media-gfx/xdot/Manifest
@@ -1,6 +1,6 @@
 DIST xdot-1.1.tar.gz 134215 BLAKE2B e241a4fb1ec69a8613f7813dc159761e6bffb82ea9f58876287d01946f4c93e66e5eef66e6844abb7738979412c2c7d2d26f76bc0563ad0c3c8550d9e8023b47 SHA512 d67c45c8c071013551f79d671a21ce546b680fac5997ba9631a882ffa3c44c15a69949643ed5e8211417006152575a1d99450ccfb6062427521d1e2bc0814f55
 DIST xdot-1.2.tar.gz 136057 BLAKE2B 484a3513ec3d67dbc6e167f171e7f70977ba2472766f25aa7cc088235f99470bfac5fac67368ea53b633320752a928634840ff3dcccc6b96795d3b7c203db922 SHA512 b4d3b15114b982c7c38cc71c0602f6d1ba9874c7315c2b8c4a8a48bf7674e9b38bf19a0d4a2d319acc9a29cf8f177a651d4e213761e88b0b3cb26e95e8a92dda
-EBUILD xdot-1.1.ebuild 1129 BLAKE2B 821d0ed786233301466b3ea5bb824a066700bd4c157a95abc68e1f9bcf6faad7ed2845ad2625694378f61783a22fc9c1b1c99017cf525eaaae638e2d669e5a43 SHA512 c3b57551658137ba292db06250680d78db2406d09ab6fad63532c2a66f3a683e5f4a8a77d25c79b7a0ed34dc8c0f051eb8193f65af5a8e833d3d0e27bff6d9dc
+EBUILD xdot-1.1.ebuild 1131 BLAKE2B 11898731ef0d96bcc944d2bcbd9d301c0b2fe8c3bb0d89557007306553bf8305b0eedfd37c6470a3dd2e2baa9f0ec6ae65d26fc92328ad3691e1cee715de0c43 SHA512 11398d81224730c7b8f857f706bd0b09769966085acea59438a3617618a5a573a7f252d156b741adff328132e76876f431325c2592742e08d1330dbadab9bb88
 EBUILD xdot-1.2.ebuild 837 BLAKE2B c0f7422340f793e2b523740c03db3f664bfc8c64d92b86e9512747a36c5b12df1b4cd20288394fdbb919840e0cac1c18a29ac8de1708c8989cce4e166b9c779c SHA512 862afd6dab66622a834d841d6a16cf41a1341277ada9cd2227a63b19e85e33fb38e09eedaf8e48ad756255375b13918fb30202eb67878dd56dfd2121f9043a14
 EBUILD xdot-9999.ebuild 842 BLAKE2B baf7f994b3dc0f3b858c60bec848f8dd34c4d2a48c81e240cadaa47dd08456e4a68e2520735785deae0a6eae955bea065087845834a7aa3c5b7cc4a27a402fc3 SHA512 68d5c597cae55589a792637187cb0395eeeead7ca987194ba7aa06be4eba262e0a9e2896737906996ed35f19418754b4392868151ce2ae66bc31c282c3a237c6
 MISC metadata.xml 398 BLAKE2B 4cfe399944032b70bb0092f9bd2f47b7e1f45cccfa75e2c8eea9dc41ae8456ffb450d5777a77218c22b8f97d57e0bd63956b63c345dba7167b1cfa8cfe3182aa SHA512 7afd30baf3ee9ec5c492659df23168d22c5a07381ed5972c8a02394a57dd332b86b59393b1bd16d2d365d61aa46839aafa78ff0386a92a26563139e31ed01a76
diff --git a/media-gfx/xdot/xdot-1.1.ebuild b/media-gfx/xdot/xdot-1.1.ebuild
index 6858d9654d1e..34a76a96430a 100644
--- a/media-gfx/xdot/xdot-1.1.ebuild
+++ b/media-gfx/xdot/xdot-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,7 +35,7 @@ RDEPEND="${DEPEND}"
 
 src_unpack() {
 	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
+	[[ ${PV} = 9999* ]] && git-r3_src_unpack
 }
 
 src_prepare() {
diff --git a/media-gfx/xli/Manifest b/media-gfx/xli/Manifest
index e90a2e216b97..4ac04f0a5637 100644
--- a/media-gfx/xli/Manifest
+++ b/media-gfx/xli/Manifest
@@ -1,7 +1,7 @@
 AUX Xli.ad 123 BLAKE2B 4ea6d6b8b4e0ddf53ac1e5fb1fc67c000b48843e114b3349a9021096ee27af135c998f2013377c2b31cc2885f2eaf627ce343d25fd5cad407a4def92a87bb192 SHA512 a37a8054e1533bc46f0e24b88137bf2ea8a7294f16e37edd6c323f42d28bfa0dc93b74d41fb1cb3df3488754db42fb5a269c42ae08dade61f22b8c42c8cd9c8b
 AUX xli-1.17.0-fix-scale-zoom.patch 1942 BLAKE2B fefbcbec8d9dba30fc1435fc998e37116ffa22ccb752840e999d95aa227d74b16f76dd704840be404910c5d1bc340de57e8108b8a7e4edc58cd5fc6dce4299a2 SHA512 b77348b83e26b0684cf7292100bbdbbd2c3f7b025f14588f7b52935d997b7ca51c3aad70479ce74cd9193a045436b39233b7ebb1fea6abcdf3d3a9dc21c8b84f
-AUX xli-1.17.0-libpng14.patch 241 BLAKE2B c4894ae4a5b879d8ac961d064da80d1518d0ed9a47946c21f9a701b89361e94f0d4d2b05926f6c14be4a558707601e84352bb689847a1f01d83cae6eb25c9d02 SHA512 e5a2de3525198d323ae6c89ab9b0455559761cd4f6b86b719934bc77e31582cd557090766875d97512cb60a42e88653f5dc204dffa9ae1370695c73bfc2231b1
+AUX xli-1.17.0-libpng14.patch 245 BLAKE2B 681fd31f8d7f812272e54dc67de31ece9a936f4608d339e9d63fe7bdc2ba257d20d7ce01fb00b120662557bdfa44b908bbeb4e136665abdadeb062c1425e7af7 SHA512 079162bfd639994ea6553b49f9370faf5becee8ec1e99a1e71f43e32968f244c5a393433fba8920a399a9eb8bc4a3ec6097903bd2eaff46bdeef55f1f90d1fcf
 AUX xli-security-gentoo.diff 6940 BLAKE2B 907fd85a2b248083380ae2210665dd9c251a7d528a93b1e2dffd149827f4900cab54b84b8a0be67c198a73d180cf31f4c8cdd7c4a37a3a8c5b30718babd5b1bf SHA512 b992219eb4b89bfee57429afbf67be6d6a04051b50de6e814c84c1adb209494d2faff15a228b43a992530fbeac83f15a94e9c1988982f98eabf287c26716671e
 DIST xli-2005-02-27.tar.gz 201011 BLAKE2B c16f40368a7c55cb7d31777662e4e9c1515232904df4f6f0e7fdc4daf44fdafaa0a3d9d8298493dac9352fa10eaf5d2984f9e66832ca0bfd07d9e6d551f4dca5 SHA512 132b28396ebf3832dc35ff5fa7c102539ef30a194512fe6577ce1432bb84ecd7b4368e75eaf59f26a806900f63e1bfb9a93487ce1ebe3cfef2199256a783ccf7
-EBUILD xli-1.17.0-r5.ebuild 1952 BLAKE2B 5ab86022919ffd8a3310873f34570e99df53b92b6ee30ed7282ef0239447aea7e3cfcf0578cb0ad399d6cfbefa83e8eda55eaa2e1339cb313a0ba1323434378c SHA512 2a78201598ecddc731f1c5aac8c52de98f5e408c74165c0b42c3d85fa14ce1cc8fed0151eb3def6e64c805d53c45e94e417847572b0be28ec2ffc1ec5a0cf73f
+EBUILD xli-1.17.0-r5.ebuild 2070 BLAKE2B 924a33bcab38adf00affd98b624a622b1972731d1ba29febe8ab4a03b733cd9e37f2a04facc68c9a2d34274d269c36217ce05a5b0518edc52561b30d403e55e3 SHA512 5e86436169daab208443f43119c8823d3bc3a82525c25c1211333e0d23a22d9901c7b5acd6211d16ac1982cca3e4405c4fa49546f0bd11318cb0ece5dc25caaa
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/media-gfx/xli/files/xli-1.17.0-libpng14.patch b/media-gfx/xli/files/xli-1.17.0-libpng14.patch
index afb4b24208d7..992a0cc79ff9 100644
--- a/media-gfx/xli/files/xli-1.17.0-libpng14.patch
+++ b/media-gfx/xli/files/xli-1.17.0-libpng14.patch
@@ -1,8 +1,8 @@
 http://aur.archlinux.org/packages.php?ID=1676
 http://archwyrm.net/~me/xli-libpng.diff
 
---- png.c
-+++ png.c
+--- a/png.c
++++ b/png.c
 @@ -27,7 +27,7 @@
  	if (ret != 8)
  		return 0;
diff --git a/media-gfx/xli/xli-1.17.0-r5.ebuild b/media-gfx/xli/xli-1.17.0-r5.ebuild
index 9439e0b09532..c04527ac7b8b 100644
--- a/media-gfx/xli/xli-1.17.0-r5.ebuild
+++ b/media-gfx/xli/xli-1.17.0-r5.ebuild
@@ -1,34 +1,43 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 SNAPSHOT="2005-02-27"
 DESCRIPTION="X Load Image: view images or load them to root window"
 HOMEPAGE="ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/viewers/X/xli-1.16.README"
 SRC_URI="http://pantransit.reptiles.org/prog/xli/xli-${SNAPSHOT}.tar.gz"
+S="${WORKDIR}/${PN}-${SNAPSHOT}"
 
 LICENSE="HPND"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
-RDEPEND="app-arch/bzip2
-	>=media-libs/libpng-1.0.5
-	>=sys-libs/zlib-1.1.4
+RDEPEND="
+	app-arch/bzip2:=
+	>=media-libs/libpng-1.0.5:=
+	>=sys-libs/zlib-1.1.4:=
 	virtual/jpeg:0
-	x11-libs/libXext"
-
-DEPEND="${RDEPEND}
+	x11-libs/libXext
+	!media-gfx/xloadimage"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/rman
 	x11-base/xorg-proto
-	x11-misc/imake
-	!media-gfx/xloadimage"
+	>=x11-misc/imake-1.0.8-r1"
 
-S=${WORKDIR}/${PN}-${SNAPSHOT}
+PATCHES=(
+	"${FILESDIR}"/xli-security-gentoo.diff
+	"${FILESDIR}"/${P}-fix-scale-zoom.patch #282979
+	"${FILESDIR}"/${P}-libpng14.patch
+)
+DOCS=( README README.xloadimage ABOUTGAMMA TODO chkgamma.jpg )
 
 src_prepare() {
+	default
+
 	# avoid conflicts on systems that have zopen in system headers
 	sed -i -e "s:zopen:xli_zopen:g" *
 
@@ -44,18 +53,20 @@ src_prepare() {
 	# This hack will allow xli to compile using gcc-3.3
 	sed -i rlelib.c \
 		-e 's/#include <varargs.h>//'
+}
 
-	# fix potential security issues.
-	EPATCH_OPTS="-F3 -l" epatch "${FILESDIR}"/xli-security-gentoo.diff
-
-	# Fix scale per bug 282979
-	epatch "${FILESDIR}"/${P}-fix-scale-zoom.patch \
-		"${FILESDIR}"/${P}-libpng14.patch
+src_configure() {
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
 }
 
 src_compile() {
-	xmkmf || die
-	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" EXTRA_LDOPTIONS="${LDFLAGS}"
+	local myemakeargs=(
+		CC="$(tc-getCC)"
+		CDEBUGFLAGS="${CFLAGS}"
+		EXTRA_LDOPTIONS="${LDFLAGS}"
+	)
+	emake "${myemakeargs[@]}"
 }
 
 src_install() {
@@ -64,10 +75,10 @@ src_install() {
 	dosym xli /usr/bin/xsetbg
 	dosym xli /usr/bin/xview
 
-	dodoc README README.xloadimage ABOUTGAMMA TODO chkgamma.jpg
 	newman xli.man xli.1
 	newman xliguide.man xliguide.1
 	newman xlito.man xlito.1
+	einstalldocs
 
 	insinto /etc/X11/app-defaults
 	newins "${FILESDIR}"/Xli.ad Xli
diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest
index f869f5fb6d40..fb8671fddc59 100644
--- a/media-gfx/xpaint/Manifest
+++ b/media-gfx/xpaint/Manifest
@@ -1,3 +1,10 @@
+AUX xpaint-2.10.2-libtool-clang.patch 416 BLAKE2B 021018cc53dd726cc943cf316a69c3e9717f08e3f15de2c3acac0343a1ef1ee519d497cb8e497d432c4dfe9d68b06f67dade7c5992ba6fae318025759255aad5 SHA512 79eaa418eaab3253149d9ddfc7214af03a222ab406f85711600bba2d2b79f56c13c7c35abfeabba172b073896558a6445f5cfc26f97b8f501b2a0e08043c50b5
+AUX xpaint-2.10.2-respect-ldflags.patch 936 BLAKE2B d91ad744ec49ba4226255050a38bd6441f2087868e1f3f542c997736663a822f26c1f5ff4fdd8ae7b1c39581a3627bad28ec8743611f4366879b77397e0b5922 SHA512 9a2de804b7b940fd8a58bb1d0780cb05ad206560c224fbb007cf23f628a5ebeb37cc9cca39b1be4e33aaa5611bd7a7f5aab6267e07d2e11b667007d505f8debf
+AUX xpaint-3.1.3-gentoo-prefix.patch 3605 BLAKE2B c513a72991ec83b99fc12d90c112c743a0fec456ae09ad77ecee887e67d2891efd200d8d08bad594472060515b56b02b9097951c5ad285ddfebd3d46acc4265a SHA512 d231237fa1512637c5448b1c8c7a1dcffa1383a0dd24f6606215643ce51932ef58e994bfbc3f24d3376acdd9cc06d713d453c643d4d00e9d00af0e011e55762d
+AUX xpaint-3.1.3-gentoo-qa.patch 1480 BLAKE2B 43b80854e8d0bb68566f86116444507852bf61807846ec97238a90fefc8a86f9be3978858c12af3278b787b14f805edb628327ae411b8b6fbdcd7530ee72cbd5 SHA512 cfa7057625f3086b573f9109a89f29e1cf17c15d253a0c903bd0f315e4aac3d8111df899ef98d0a3416486d81305f0a041f061985d31d435ccbd24b0fc5a57b3
+AUX xpaint-3.1.3-libtool-clang.patch 1434 BLAKE2B d89978f8c925a64fa62ff2a0788ed81ca5faee6a71afda069930a7381e2bb095bbad3c1236c3594532afc5441ef789bf6ea0571b4bb25065e2cbef7fdc52ebe3 SHA512 f4027619c4eda686953fc33c62518a7ef12db09e6160f5e038179aa06f64629d2ad28b373ec332fe3266fd7e15af77577b6a60cfdffb165afe1358519201c399
 DIST xpaint-2.10.2.tar.bz2 1891925 BLAKE2B 056ef057357a2441c8a286adf326a98650e5e0905ee07c5ef24b0689dbb57247711c44b63211494e4ca9e44429d6237c017f53e2690f99790fa6100e4ce4d118 SHA512 a25aa940931c686e86cbc2bd8d6fd3c80d2c793a20d7a2dd90fb5cba1cd360b5e1c8433bf0d639e2b86cb2a74040be373f732c4617909aaf8c5ada2624ab5614
-EBUILD xpaint-2.10.2-r1.ebuild 1562 BLAKE2B 3bdd005d1615418f4eca8947d5d42beef5c4b9a195c8366918599be1a8bb731bca66c43389602bc014e9dfc5f0cdee7bc5837190309ad5eb997acb968ebf48ce SHA512 5d07821b01cc4a49cf5b3ff05520b109bfccde7fcf2cca64c6ca7bdd39df1b5784d6d4a7609af01d662f951da96957a14a23cbd8685d5d9faf1e8530ec142cd6
-MISC metadata.xml 1204 BLAKE2B 3cd1cf2062126075b6b4be1b987ab9098ae31b611abe6e81c15e684e62ed0a1133177c4718e5bc51d5be2a0b5b2b58fb4d4a2d67ea77f21ca6d9009f2a4d4150 SHA512 e2b37b1d3381dd97ecdd40f20535426539d7caff8032ffcb5e6b74d65968adb7319523a55e45d31a697a75b9aa384e0a5155059237730ea080cf46532da12c22
+DIST xpaint-3.1.3.tar.bz2 1656489 BLAKE2B c6f5ed4a6c990dccacc572c834fabf68a16cacfde477915e5c3598a96335a899344d4375a48e6bf06fb601e9b260a11cc2b43afb404a83b9fb7b3044288ce1fa SHA512 8ef15d6af4b65d9da18d3e5eb9eacc0b42e718d069e20de91f2e0352b642d0a4b7626a2008fdd6217c0668ed1ecdc7a09c4a993a6074c77b7899b4613c1c4bda
+EBUILD xpaint-2.10.2-r1.ebuild 1627 BLAKE2B bcc7cc7bf254149c0a86633644700b4b2c109913f9c5c1587bff6d83a4a16db876975910b8e61c55a6fe6b79790eb709ddbb13aea7fa61da9e5b1ace2608aacd SHA512 869b6bcf1cf93fa0a64663bdaf38cb18aa0258005767bfc2087440f2acc9b506e824526d1684fb151a6220bc30d33cf545188aed0b52e40217078e952d7cd716
+EBUILD xpaint-3.1.3.ebuild 1897 BLAKE2B bcb42a0d09a8bbca4579966ab89e9abb101140e54944600fe7f6fa7e718fce557a13b3a212179fe880e8357a83e1c9ce08a600d391296fe67e139581f252ae3f SHA512 150c481b08f0348d9055dd9063648483b843616b69d2debef5cd4347fe1569708768c43791fa2243e9e9c5ae11aecbe958010983e1a1bdf6a005268dceb9ab31
+MISC metadata.xml 1439 BLAKE2B ca0b1f7ca10f9329bd535358cd6d683bdcbb793277a3c494c50b86d6e5a85691f2ebaefcdac49b5fa5dd610ebca07d30c16f9045db0cbb079dde142fadca4dae SHA512 74c75e26fa1ba697c15dee5c76048c99e104fff2492194ef71ebbe472c15790a5ca2a28f1ee2697b8c0dea1ff7b2e36947e52b03a9d885a338687353d6c555d3
diff --git a/media-gfx/xpaint/files/xpaint-2.10.2-libtool-clang.patch b/media-gfx/xpaint/files/xpaint-2.10.2-libtool-clang.patch
new file mode 100644
index 000000000000..d6a3dab07830
--- /dev/null
+++ b/media-gfx/xpaint/files/xpaint-2.10.2-libtool-clang.patch
@@ -0,0 +1,13 @@
+libtool doesn't work if compiling with clang.  Need to add --tag=CC
+See bug https://bugs.gentoo.org/731010
+--- a/xpaintrw/Makefile.am
++++ b/xpaintrw/Makefile.am
+@@ -25,7 +25,7 @@
+ 
+ xpaint_DEFINES = $(ARCH_DEFINES) $(EXTRA_DEFINES) $(XAWLIB_DEFINES)
+ 
+-LIBTOOL = /usr/bin/libtool
++LIBTOOL = /usr/bin/libtool --tag=CC
+ AM_CFLAGS   = @X_CFLAGS@ @SPECIAL_CFLAGS@ $(xpaint_DEFINES)
+ AM_YFLAGS     = -d
+ CLEANFILES    = 
diff --git a/media-gfx/xpaint/files/xpaint-2.10.2-respect-ldflags.patch b/media-gfx/xpaint/files/xpaint-2.10.2-respect-ldflags.patch
new file mode 100644
index 000000000000..11a0b0e9a84e
--- /dev/null
+++ b/media-gfx/xpaint/files/xpaint-2.10.2-respect-ldflags.patch
@@ -0,0 +1,18 @@
+The original Makefile did not pass CFLAGS and LDFLAGS
+See bug https://bugs.gentoo.org/727632
+Also remove -O3 and stripping, leave portage control that
+--- a/util/Makefile
++++ b/util/Makefile
+@@ -10,10 +10,10 @@
+ endif
+ 
+ pdfconcat:
+-	$(CC) $(CFLAGS) -O3 -s -DNDEBUG=1 -DNO_CONFIG=1 -ansi -pedantic -Wunused -Wall -W -Wstrict-prototypes -Wtraditional -Wnested-externs -Winline -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wmissing-prototypes -Wmissing-declarations pdfconcat.c -o pdfconcat
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DNDEBUG=1 -DNO_CONFIG=1 -ansi -pedantic -Wunused -Wall -W -Wstrict-prototypes -Wtraditional -Wnested-externs -Winline -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wmissing-prototypes -Wmissing-declarations pdfconcat.c -o pdfconcat
+ 
+ ppmtops:
+-	$(CC) $(CFLAGS) ppmtops.c -o ppmtops
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) ppmtops.c -o ppmtops
+ 
+ ifneq ($(WITH_PGF),no)
+ pgf2pnm: main.cpp pnm.cpp
diff --git a/media-gfx/xpaint/files/xpaint-3.1.3-gentoo-prefix.patch b/media-gfx/xpaint/files/xpaint-3.1.3-gentoo-prefix.patch
new file mode 100644
index 000000000000..cf02a14725fa
--- /dev/null
+++ b/media-gfx/xpaint/files/xpaint-3.1.3-gentoo-prefix.patch
@@ -0,0 +1,103 @@
+This patch fixes compiling xpaint inside a gentoo prefix.
+There are multiple issues:
+	search paths hardcoded to /usr/include,
+	install paths outside prefix,
+	X resources in app-defaults with path hardcoded to /usr/share/xpaint
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,7 +3,7 @@
+ ## Local Configuration arguments
+ BINDIR = $(prefix)/bin
+ SHAREDIR = $(prefix)/share/xpaint
+-XAPPLOADDIR = /etc/X11/app-defaults
++XAPPLOADDIR = $(sysconfdir)/X11/app-defaults
+ 
+ ## Enable/disable PRINTCAP (for older BSD style printing configuration)
+ ## PRINTCAP = -DPRINTCAP
+@@ -85,7 +85,7 @@
+ .PHONY:
+ 
+ version.h:
+-	rm -f xaw_incdir ; ln -s /usr/include/X11/Xaw3dxft xaw_incdir
++	rm -f xaw_incdir ; ln -s @includedir@/X11/Xaw3dxft xaw_incdir
+ 	echo "#define XPAINT_VERSION \"$(PACKAGE_VERSION)\"" > version.h
+ 
+ substads: substads.c
+@@ -149,8 +149,7 @@
+ 	mkdir -p $(DESTDIR)$(SHAREDIR)/messages
+ 	cd share/messages ; $(RM) -f *~ ; cp -f Messages* $(DESTDIR)$(SHAREDIR)/messages
+ 	chmod -R a+r $(DESTDIR)$(SHAREDIR)/
+-	cd util ; make install
+-	cd vxp2ps ; make install
++	cd vxp2ps ; make BINDIR=$(BINDIR) install
+ 
+ clean-local:
+ 	rm -f xaw_incdir
+--- a/util/Makefile
++++ b/util/Makefile
+@@ -17,9 +17,9 @@
+ 
+ ifneq ($(WITH_PGF),no)
+ pgf2pnm: main.cpp pnm.cpp
+-	@if [ -x /usr/include/libpgf ] ; then \
+-	$(CXX) $(CXXFLAGS) -fpermissive -c main.cpp -o main.o -I/usr/include/libpgf ; \
+-	$(CXX) $(CXXFLAGS) -fpermissive -c pnm.cpp -o pnm.o -I/usr/include/libpgf ; \
++	@if [ -x $(includedir)/libpgf ] ; then \
++	$(CXX) $(CXXFLAGS) -fpermissive -c main.cpp -o main.o -I$(includedir)/libpgf ; \
++	$(CXX) $(CXXFLAGS) -fpermissive -c pnm.cpp -o pnm.o -I$(includedir)/libpgf ; \
+ 	$(CXX) $(CXXFLAGS) -fpermissive -o pgf2pnm main.o pnm.o $(LDFLAGS) -lpgf ; \
+ 	else \
+ 	echo "libpgf not installed !!" ; \
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,7 +32,7 @@
+ AC_TYPE_UINT32_T
+ AC_TYPE_UINT64_T
+ 
+-CFLAGS="$CFLAGS -I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft"
++CFLAGS="$CFLAGS -I${prefix}/include -I${prefix}/include/X11 -I${prefix}/include/X11/Xaw3dxft"
+ LIBS="$LIBS -lm"
+ echo "VERSION = $VERSION" > .version
+ 
+@@ -40,7 +40,7 @@
+ AC_CHECK_LIB([X11], [XOpenDisplay], have_x11="yes")
+ if test x"$have_x11" = xyes; then
+   AC_SUBST([X_LIBS], ["-lXmu -lXt -lSM -lICE -lXext -lX11 -lXpm -ldl -rdynamic"])
+-  AC_SUBST([X_CFLAGS], ["-I/usr/include/X11"])
++  AC_SUBST([X_CFLAGS], ["-I${prefix}/include/X11"])
+ else
+   echo "X11 libraries not installed !"
+   exit 1
+@@ -291,7 +291,7 @@
+ fi
+ 
+ if test x$enable_libopenjp2 = xyes; then
+-  CFLAGS="$CFLAGS -I/usr/include/openjpeg-2.3"
++  CFLAGS="$CFLAGS -I${prefix}/include/openjpeg-2.3"
+   LIBS="$LIBS -lopenjp2"
+   AC_SUBST(LIBOPENJP2_LIBS)
+   AC_DEFINE(HAVE_OPENJP2)
+@@ -323,9 +323,9 @@
+   [AC_LANG_PROGRAM([[#include <freetype2/config/ftheader.h>]])],
+   [AC_MSG_RESULT([already in path])],
+   [AC_PREPROC_IFELSE(
+-    [AC_LANG_PROGRAM([[#include </usr/include/freetype2/freetype/config/ftheader.h>]])],
+-    [AC_MSG_RESULT([/usr/include/freetype2])
+-     AC_SUBST([SPECIAL_CFLAGS], ["-I/usr/include/freetype2"])],
++    [AC_LANG_PROGRAM([[#include <${prefix}/include/freetype2/freetype/config/ftheader.h>]])],
++    [AC_MSG_RESULT([${prefix}/include/freetype2])
++     AC_SUBST([SPECIAL_CFLAGS], ["-I${prefix}/include/freetype2"])],
+     [AC_MSG_ERROR([cannot find freetype2 headers; try setting CFLAGS.])]
+   )]
+ )
+--- a/xpaintrw/Makefile.am
++++ b/xpaintrw/Makefile.am
+@@ -13,7 +13,7 @@
+ ARCH_DEFINES = -fPIC
+ 
+ ## PBM_DEFINES = -DNETPBM10
+-PBM_DEFINES = -I/usr/include/netpbm -DNETPBM11
++PBM_DEFINES = -I@includedir@/netpbm -DNETPBM11
+ 
+ ## 
+ ## Specific xpaint options
diff --git a/media-gfx/xpaint/files/xpaint-3.1.3-gentoo-qa.patch b/media-gfx/xpaint/files/xpaint-3.1.3-gentoo-qa.patch
new file mode 100644
index 000000000000..cc7d70de6f3e
--- /dev/null
+++ b/media-gfx/xpaint/files/xpaint-3.1.3-gentoo-qa.patch
@@ -0,0 +1,41 @@
+The original Makefile did not pass CFLAGS and LDFLAGS
+See bug https://bugs.gentoo.org/727632
+Also remove -O3 and stripping
+--- a/vxp2ps/Makefile
++++ b/vxp2ps/Makefile
+@@ -3,16 +3,16 @@
+ all: vxp2ps vxp2tex vxp2dkw
+ 
+ vxp2ps: vxp2ps.c
+-	gcc vxp2ps.c -o vxp2ps -lm $(CFLAGSEXTRA)
++	$(CC) vxp2ps.c -o vxp2ps -lm $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+ 
+ vxp2tex: vxp2tex.c
+-	gcc vxp2tex.c -o vxp2tex -lm
++	$(CC) vxp2tex.c -o vxp2tex -lm $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+ 
+ vxp2dkw: vxp2dkw.c
+-	gcc vxp2dkw.c -o vxp2dkw -lm
++	$(CC) vxp2dkw.c -o vxp2dkw -lm $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+ 
+ install: all
+-	install -c -s vxp2ps vxp2tex vxp2dkw "$(DESTDIR)"/usr/bin
++	install -c vxp2ps vxp2tex vxp2dkw "$(DESTDIR)$(BINDIR)"
+ 
+ clean:
+ 	rm -f core *~ vxp2ps vxp2tex vxp2dkw
+--- a/util/Makefile
++++ b/util/Makefile
+@@ -10,10 +10,10 @@
+ endif
+ 
+ pdfconcat:
+-	$(CC) $(CFLAGS) -O3 -s -DNDEBUG=1 -DNO_CONFIG=1 -ansi -pedantic -Wunused -Wall -W -Wnested-externs -Winline -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wmissing-prototypes -Wmissing-declarations pdfconcat.c -o pdfconcat
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DNDEBUG=1 -DNO_CONFIG=1 -ansi -pedantic -Wunused -Wall -W -Wnested-externs -Winline -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wmissing-prototypes -Wmissing-declarations pdfconcat.c -o pdfconcat
+ 
+ ppmtops:
+-	$(CC) $(CFLAGS) ppmtops.c -o ppmtops
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) ppmtops.c -o ppmtops
+ 
+ ifneq ($(WITH_PGF),no)
+ pgf2pnm: main.cpp pnm.cpp
diff --git a/media-gfx/xpaint/files/xpaint-3.1.3-libtool-clang.patch b/media-gfx/xpaint/files/xpaint-3.1.3-libtool-clang.patch
new file mode 100644
index 000000000000..9aef70c8a9a1
--- /dev/null
+++ b/media-gfx/xpaint/files/xpaint-3.1.3-libtool-clang.patch
@@ -0,0 +1,51 @@
+libtool doesn't work if compiling with clang.  Need to add --tag=CC
+Don't hardcode /usr/bin/libtool in gentoo prefix
+See bug https://bugs.gentoo.org/731010
+
+rdlibtool needs to find system libtool in current directory
+See bug https://bugs.gentoo.org/778791
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,6 +17,10 @@
+ AC_LANG_C
+ AM_PROG_AR
+ 
++dnl libtool
++LT_INIT
++AC_SUBST([LIBTOOL_DEPS])
++
+ ## basic types
+ 
+ AC_TYPE_INT8_T
+--- a/xpaintrw/Makefile.am
++++ b/xpaintrw/Makefile.am
+@@ -28,7 +28,8 @@
+ 
+ xpaint_DEFINES = $(ARCH_DEFINES) $(EXTRA_DEFINES) $(XAWLIB_DEFINES)
+ 
+-LIBTOOL = /usr/bin/libtool
++LIBTOOL = ../libtool
++AM_LIBTOOLFLAGS = --tag=CC
+ AM_CFLAGS   = @X_CFLAGS@ @SPECIAL_CFLAGS@ $(xpaint_DEFINES)
+ AM_YFLAGS     = -d
+ CLEANFILES    = 
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -53,12 +53,16 @@
+ dist_man_MANS = xpaint.1 imgmerge.1
+ AM_CFLAGS   = @X_CFLAGS@ @SPECIAL_CFLAGS@ $(xpaint_DEFINES)
+ ACLOCAL_AMFLAGS = -I m4
+-BUILT_SOURCES = version.h DefaultRC.txt.h messages.h XPaint.ad.h xpaint.1
++BUILT_SOURCES = version.h DefaultRC.txt.h messages.h XPaint.ad.h xpaint.1 libtool
+ AM_YFLAGS     = -d
+ CLEANFILES    = preproc substads \
+ 	version.h DefaultRC.txt.h messages.h XPaint.ad.h xpaint.1
+ EXTRA_DIST    = 
+ 
++LIBTOOL_DEPS = @LIBTOOL_DEPS@
++libtool:
++	$(SHELL) ./config.status libtool
++
+ BASE_HDRS = bitmap.h color.h crc32.h \
+ 	Colormap.h ColormapP.h graphic.h hash.h image.h \
+ 	menu.h messages.h misc.h operation.h ops.h \
diff --git a/media-gfx/xpaint/metadata.xml b/media-gfx/xpaint/metadata.xml
index 8165ff483f18..74876f64cd4e 100644
--- a/media-gfx/xpaint/metadata.xml
+++ b/media-gfx/xpaint/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>ceamac.paragon@gmail.com</email>
+		<name>Viorel Munteanu</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		XPaint is an X Window System color image bitmap editing program.
 		It also supports advanced features, such as image processing
diff --git a/media-gfx/xpaint/xpaint-2.10.2-r1.ebuild b/media-gfx/xpaint/xpaint-2.10.2-r1.ebuild
index dc92f046b92f..425586764ea2 100644
--- a/media-gfx/xpaint/xpaint-2.10.2-r1.ebuild
+++ b/media-gfx/xpaint/xpaint-2.10.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop toolchain-funcs
+inherit autotools desktop toolchain-funcs
 
 DESCRIPTION="Image editor with tiff, jpeg and png support"
 HOMEPAGE="http://sf-xpaint.sourceforge.net/"
@@ -18,6 +18,7 @@ IUSE="pgf tiff"
 RDEPEND="
 	media-libs/fontconfig
 	media-libs/freetype:2
+	media-libs/libjpeg-turbo:=
 	media-libs/libpng:0=
 	x11-libs/libICE
 	x11-libs/libX11
@@ -28,7 +29,6 @@ RDEPEND="
 	x11-libs/libXpm
 	x11-libs/libXt
 	sys-libs/zlib
-	media-libs/libjpeg-turbo:=
 	pgf? ( media-libs/libpgf )
 	tiff? (
 		media-libs/jbigkit:0=
@@ -39,12 +39,18 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	sys-devel/bison
 	sys-devel/flex
+	sys-devel/libtool
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-libtool-clang.patch
+	"${FILESDIR}"/${P}-respect-ldflags.patch
+)
+
 src_prepare() {
 	default
-	sed -i -e 's/-O3 -s//g' util/Makefile || die
+	eautoreconf
 }
 
 src_configure() {
@@ -78,6 +84,5 @@ src_install() {
 		-C util install
 	doicon icons/xpaint.svg
 	make_desktop_entry "${PN}"
-	find "${D}" -name '*.la' -type f -delete || die
-	find "${D}" -name '*.a' -type f -delete || die
+	find "${ED}" \( -name '*.la' -o -name '*.a' \) -type f -delete || die
 }
diff --git a/media-gfx/xpaint/xpaint-3.1.3.ebuild b/media-gfx/xpaint/xpaint-3.1.3.ebuild
new file mode 100644
index 000000000000..6c62608de446
--- /dev/null
+++ b/media-gfx/xpaint/xpaint-3.1.3.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop toolchain-funcs xdg-utils
+
+DESCRIPTION="Image editor with tiff, jpeg and png support"
+HOMEPAGE="http://sf-xpaint.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pgf tiff"
+# jpeg2k disabled for blocking media-libs/openjpeg:0 security cleanup, bug 735592
+
+RDEPEND="
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	media-libs/netpbm:=
+	x11-libs/libICE
+	x11-libs/libX11
+	>=x11-libs/libXaw3dXft-1.6.2h[unicode]
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	sys-libs/zlib
+	pgf? ( media-libs/libpgf )
+	tiff? (
+		media-libs/jbigkit:0=
+		media-libs/tiff:0
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-libtool-clang.patch
+	"${FILESDIR}"/${P}-gentoo-qa.patch
+	"${FILESDIR}"/${P}-gentoo-prefix.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable tiff) \
+		--disable-libdvipgm \
+		--disable-libopenjpeg
+}
+
+src_compile() {
+	# clean up
+	emake clean
+	emake -C util clean
+
+	# parallel make still fails sometimes
+	emake substads
+	emake xpaint.1
+
+	# regenerate resources in app-defaults
+	rm XPaint.ad || die
+
+	default
+	emake \
+		WITH_PGF="$(usex pgf "yes" "no")" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		includedir="${EPREFIX}"/usr/include \
+		-C util
+}
+
+src_install() {
+	default
+	emake \
+		WITH_PGF="$(usex pgf "yes" "no")" \
+		DESTDIR="${ED}" \
+		-C util install
+	doicon icons/xpaint.svg
+	make_desktop_entry "${PN}"
+	find "${ED}" \( -name '*.la' -o -name '*.a' \) -type f -delete || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/xsane/Manifest b/media-gfx/xsane/Manifest
index 618de244763c..11ab37fb4811 100644
--- a/media-gfx/xsane/Manifest
+++ b/media-gfx/xsane/Manifest
@@ -2,5 +2,5 @@ AUX xsane-0.999-lcms2.patch 11788 BLAKE2B 2a7f40e1d430b74f29c201e850ee5520395a6a
 DIST xsane-0.998-patches-2.tar.xz 54804 BLAKE2B d5eb339f5d5d9eb61d213ca37e31e8b36df03f271f86a0c5f924286b39c9d2f47416512243ff3ad07e2f9d0ac4e3f0a73346ced1ce74ac17dbb0c9aaf6ae3c89 SHA512 973ccac2fe3b6089049c1c5ba3e4cb0db29fdc79de372f8a7b461ee108e5bfc3f4a84997552fc3d3b651bbe9f98d247a5974d90e8949089b2ea52118eab6ad1f
 DIST xsane-0.999.tar.gz 2950621 BLAKE2B a8490981b7da497934f0334874fb65d2d3f2a7d9153825544672a39780bd8c4bfabee6bda134bd7b37b07947d1f01f283fb7242552b0e6342cab5a70484a5488 SHA512 73ec961fce1a86b5d6f5bac0995d222785eb4b077dc8e72492b092d2bf4500455426e80e4d27233721cd38ec84f77fb9f92190a6afe45bdaf7ffd1ee50b431ed
 DIST xsane-256x256.png 18478 BLAKE2B 5661d68fab2c5f7219f0de9e2c2c811ef5fba6f5472e85d98f6f3a10bb058c1d26597d15c2aa8ab59c52060a62b571aafc2daafcef4bb8edd0445cf875ec0ca3 SHA512 7bd63a701a4776b395689799ad98b7619917a9b40367c980bebaa116e6c5c2bfeffb8b996a8295b07f3483aa689c9040d8a68bb21376af65b1c0e8f69294f2e5
-EBUILD xsane-0.999-r3.ebuild 2207 BLAKE2B a85c9aaa6cfcb3c47f4ac55502696ce4c286cc89fee10258107a24df204d6614ed4ce71dd20253dca0fbddd22f51ab24063bf78ed3fac53cbef2fd0914d1c484 SHA512 0be6936b17ffb26f2a0970b172d3cc01b25372d9ca8fd1e5560dba33fbf198aa16b28f9a4004cb095a339987d65d804fd6d8720665467bd27653b427b9ad5b55
+EBUILD xsane-0.999-r3.ebuild 2221 BLAKE2B c232d21f6edcf1ba2449b60a519692b7b24044e7dc104b2b45e9b258390f255e81eeadd473ebb53dbd974d6519292f8f7890845732e54cd20b103d6d28b93c90 SHA512 ad59eb75376b490b7a73c4059d1b48e9aaf32d3e6afe6be4d6fea75bf090ed287aca0115c4eab1643c49c10cf7baa8a83ecacff512453bb368a2dc271dc69186
 MISC metadata.xml 370 BLAKE2B 800a5ac17360397771b4021cdd36777cd546b8f32132f5edc380cec9c1aa41d10daa1d67da06230b447f5115c6296e36aa1ca881f923d3238ace1f8a48584891 SHA512 c00b90634545ce757206fa7d23b345e11afe409813f16312bb4dea494f8d0342996f994623dec0939bc40e13395a1be8a40b014064dcc039f669efcd7fd7b19f
diff --git a/media-gfx/xsane/xsane-0.999-r3.ebuild b/media-gfx/xsane/xsane-0.999-r3.ebuild
index 08d3756194f8..f6c406558796 100644
--- a/media-gfx/xsane/xsane-0.999-r3.ebuild
+++ b/media-gfx/xsane/xsane-0.999-r3.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils toolchain-funcs
 
-DESCRIPTION="graphical scanning frontend"
+inherit autotools desktop epatch l10n toolchain-funcs
+
+DESCRIPTION="Graphical scanning frontend"
 HOMEPAGE="http://www.xsane.org/"
 SRC_URI="
 	http://www.xsane.org/download/${P}.tar.gz
diff --git a/media-gfx/xzgv/Manifest b/media-gfx/xzgv/Manifest
index 77a3a92a87e0..cee187e00d07 100644
--- a/media-gfx/xzgv/Manifest
+++ b/media-gfx/xzgv/Manifest
@@ -1,4 +1,4 @@
-AUX xzgv-0.9-asneeded-and-cflags.patch 976 BLAKE2B d83aaa182b8e27f8883d6512f657cc34300b8d5e08521cf6f8e11db67bcfe6f8052ba18d17a4ebbd1181d09e7607e2a5ad8b632c03c4c60c78b86167beacfabc SHA512 05fa8d01d86e5a3e4be7c7226ce21e041f80e9ea8beeaf57f9e4624237b87e39447c07019e8b6530681ed8583c370737f50583941ed939195553ce81110742af
+AUX xzgv-0.9-asneeded-and-cflags.patch 1002 BLAKE2B 7278103cadc14e2c52b9df5bddee761a757c363e7bfd46ebcfa83048b46ea0b0da19f8bba5380f535f92957b640ce977c207577db91fbf45104f012256608aea SHA512 b0afc6e73042bffc94f8fcdd83deff1dc182d5150a0b5da81ecead0ad5e2852c4aa4ce6be6e9334312ab9983df27af90fb9f81fc7529615a8e3d8c9de5ad47f9
 DIST xzgv-0.9.1.tar.gz 163419 BLAKE2B 6b97136a8e9b8228f849d5f905af6654a876b044e39dbacfeb01e89ac64d03920cd9f0bf17ff2e2ad4a59cb690d601db34488c72280fc0743799e7ed0c0288a0 SHA512 e57d0eb3f34bc63cb9f2d033856eefdeb6363ce55589b8bc52a8c253e211a4e36d3c0691b4559581d4052810fde445c6ec1832b964c40c5365c3869ce72f7361
-EBUILD xzgv-0.9.1.ebuild 672 BLAKE2B 60d62e57389262c964ae0bf0ac75c630431728b55a46c2d6545dc90465a5d6b09cf44cfe8daeee31df016c7a7d494dd43c697dc692172ee0f40332a49ebcf074 SHA512 991be7ef2638495e84110c449fa7d0bcba7703e6f3fbb25e64f6935454bd24782ffe22513657550f2fc7db0332488abbda23e790be0010eafe9dca6a721cd748
+EBUILD xzgv-0.9.1.ebuild 677 BLAKE2B 7ffad5441432d8f944e23a2039656fdb21530537b8bf397aa8d14adb3290d23d91848748dc1991685eca45e51f7a756ec9031faf0c9673f1f6e7cae16c270de4 SHA512 e1d31ad4ad8ede88f11811fd3fb7f9099aec8b0e617cab925b95aee1d975bf4e13b76910023869713f2ef79c07ec0b9b3a7ac19a5755f3e9eb1e04d519873d62
 MISC metadata.xml 241 BLAKE2B d46a91c71c0348dbb312757885169dd5cd781957192054db8e43e4e0027dfd127f6ad5830d3452e40a7d5200016bf1b9d1bee268941c3c920445ee3e31278c84 SHA512 3dba82b698fa750dbd8847b3f22334c288688f5ce73b940f6073ae962754cadffc7fa8b9fcb8a5b60021481e970abc95d93d5f148ce60293b289f7e32ad28c2b
diff --git a/media-gfx/xzgv/files/xzgv-0.9-asneeded-and-cflags.patch b/media-gfx/xzgv/files/xzgv-0.9-asneeded-and-cflags.patch
index 8b3c671dbf8a..344f283d7663 100644
--- a/media-gfx/xzgv/files/xzgv-0.9-asneeded-and-cflags.patch
+++ b/media-gfx/xzgv/files/xzgv-0.9-asneeded-and-cflags.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/500692
 
---- config.mk
-+++ config.mk
+--- a/config.mk
++++ b/config.mk
 @@ -7,7 +7,7 @@
  # This is likely to be what you'll want for most systems:
  #
@@ -11,16 +11,16 @@ http://bugs.gentoo.org/500692
  
  # Set the awk interpreter to use for a script used while compiling.
  # (This should be a `new' awk, such as gawk or mawk.)
---- src/Makefile
-+++ src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -9,8 +9,8 @@
  # This gets definitions for CC, CFLAGS, BINDIR etc.
  include ../config.mk
  
 -CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0`
 -LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0`
-+CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0` `pkg-config --cflags x11`
-+LIBS=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0` `pkg-config --libs x11` -lm
++CFLAGS+=`${PKG_CONFIG} --cflags gtk+-2.0` `${PKG_CONFIG} --cflags gdk-pixbuf-2.0` `${PKG_CONFIG} --cflags x11`
++LIBS=`${PKG_CONFIG} --libs gtk+-2.0` `${PKG_CONFIG} --libs gdk-pixbuf-2.0` `${PKG_CONFIG} --libs x11` -lm
  
  all: xzgv
  
diff --git a/media-gfx/xzgv/xzgv-0.9.1.ebuild b/media-gfx/xzgv/xzgv-0.9.1.ebuild
index 283f5de88d59..912f0a805616 100644
--- a/media-gfx/xzgv/xzgv-0.9.1.ebuild
+++ b/media-gfx/xzgv/xzgv-0.9.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Fast and simple GTK+ image viewer"
 HOMEPAGE="https://sourceforge.net/projects/xzgv"
@@ -11,18 +12,21 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
 
 RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-apps/texinfo
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P/.1}-asneeded-and-cflags.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P/.1}-asneeded-and-cflags.patch
+)
 
 src_compile() {
+	tc-export PKG_CONFIG
+
 	emake CC="$(tc-getCC)"
 	emake -C doc CC="$(tc-getCC)"
 }
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 70c493e060c3..ee98cac38519 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -13,4 +13,4 @@ DIST zbar-0.23.1.tar.gz 1019268 BLAKE2B 5aa8725a0945b6f50eb78bb7b8a61e5b46356b18
 DIST zbar-0.23.tar.gz 1301948 BLAKE2B dd74ce44bcb10f8a7cf180b982e5bd82f1f5674540931377d207ab730bb2d080fe222bfc42d4a3d70895ad53b78638e73c2294018b80d30dc28f7e6ecc14c761 SHA512 9737f9dca42c29f92aa1eca5c0808da34f1d16c88c65241c9e3984c487e502f398437e7a707a1edd2c440f784db537ba33ea4008a2d1c1caaf5eea6431b1400b
 EBUILD zbar-0.23-r1.ebuild 5071 BLAKE2B 92487f7fd2c94a6bee21827729c0ed4bbbde6c1b552e5da271a96a277d2d1c4d20b0b8baf80b769e89bb65bc9fe0ca0db483342bcbcf0daf466edc82f399dbe3 SHA512 f4d5affd6ea81be0b0aaacd168a0a45c854a49b7aeda4d042aa26eef4e0492ece016c21c7887aad1c1644c0095f04eb94277ba12276b0e1c8e5c4d98f977b4b4
 EBUILD zbar-0.23.1.ebuild 5328 BLAKE2B 625e339803ae037096dd0dddae0553cb11d4a0a7f7ae144f7e8e5a85964fba652c66ee05bae302c290d837914d2f95f6aaaf91a0277ea6714ab53b7d12bbd7c6 SHA512 41f92ac81780148a1672306eb185f0d1899a5dd607e831a50d69c2a2c594125221172a9907ed63f15f163421917032e45902a1c8701ababe0048728a8e735c78
-MISC metadata.xml 961 BLAKE2B c3ad2c531212c82cef3e1fbae09030591863b82d2b404ad65b696b5ebab4d5abe85e9f0e8733e543af393b395940241ddfc3885a0a3654b33d88ce8d60253e91 SHA512 635d3ba26ffc33e712944153cbd062eb7a6b83f492223ead8e67ff7d6e9c1f336641af56e52d1afca032c3a5716d36954d6222cbd0a076d12d2f4f0159683317
+MISC metadata.xml 737 BLAKE2B 51ad296b25247d05d1872f0ce6ac5ab5dc0c3c0141c19a851a13c5dab881c2c6f7c8b538bf86783ea9138318e369e25d1828d866adb050dd98dbd336b6932a1c SHA512 0811b0674da5175f0ba71238a8ecad01a5d0000dec24988df42ab91748de016e717471822d6903f279ad411cb50207bc6c4dc6de11268e065961a96948434e6f
diff --git a/media-gfx/zbar/metadata.xml b/media-gfx/zbar/metadata.xml
index 14483e82c58e..21d625e4e4c4 100644
--- a/media-gfx/zbar/metadata.xml
+++ b/media-gfx/zbar/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>email@linxon.ru</email>
-		<name>Yury Martynov</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">zbar</remote-id>
 		<remote-id type="github">mchehab/zbar</remote-id>
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /media-gfx
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)