gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /media-gfx
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
246 files changed, 2242 insertions, 4142 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index f9b2df3796c7..481cda3f6bf6 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index ceb116b804dd..c2f3dc976a62 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -4,8 +4,8 @@ AUX alembic-1.7.11-0003-Fix-env-var-for-renderman.patch 828 BLAKE2B 8e135e4d814a
 AUX alembic-1.7.11-0004-Fix-a-compile-issue-with-const.patch 1044 BLAKE2B 49ed2fe0b260e9917f781ed5e1e2fb5ffaad89f567be893ff68580f7ec766ceb7f3ffc884d5f5cf030d467b0fcd096d56363b4273e8d1968c1ed3d5b9016fda8 SHA512 18d32d6b1d611f9ec9f545281f5900f58673cf773b11fbcf457d9a0c39a8c87690e1d39b2dfb910f74696b73d34e23f7adefa8242c29d80595ac3fb0879d87d6
 AUX alembic-1.7.11-0005-Fix-install-locations.patch 8305 BLAKE2B 25688ca368f4d58a32d5c7afbbd4b1a738d3a69644034d18d487f2d48348ca4de32e3e691a8c5ec137c4829079cb0fedbdd9c5cfc98ff38144097845f07e0065 SHA512 b025cc77c21c57b43d9536e488ac5d68037cfa186c561399409ba863c722fca20f75b939aa7d5166d302b92e636deba05e0db4747d614f3420b4e76d30a8cbb2
 AUX alembic-1.7.11-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch 1074 BLAKE2B 1d8b252eb8fcfe18e019a11350d1b9974d30a1d95146d5dd8eda8feb585c4e7d1070543f290d32e41929b17e86fda9a6eca7d045d4b4cf8fc31b4075addedf7a SHA512 059c89cbe402429684e56fa14041cf65974259b4ad1d464edd925bb6353d758402689e8de7021a3b3de6f98b1225a90fc50bbc843639b9be2823527afe77ee57
-DIST alembic-1.7.11.tar.gz 826833 BLAKE2B ea2ee92cefcc92d3658b8c71351ec0f72bd1fb5d5b6c771ceebe81b1db61a280420f480cd3612f44bc134cccb388954be89baba9dc6e5973e102bc55d65cd974 SHA512 94b9c218a2fe6e2e24205aff4a2f6bab784851c2aa15592fb60ea91f0e8038b0c0656a118f3a5cba0d3de8917dd90b74d0e2d1c4ac034b9ee3f5d0741d9f6b70
 DIST alembic-1.7.12.tar.gz 827983 BLAKE2B 7d508fdbfd92f213936635666a221fdad30f242a37ef8ff54a6272854565ebb890ffd11d8fe010f1558c0872fcb23080413d76380772ebf5db52033bdf0d9c85 SHA512 e05e0b24056c17f01784ced1f9606a269974de195f1aca8a6fce2123314e7ee609f70df77ac7fe18dc7f0c04fb883d38cc7de9b963caacf9586aaa24d4ac6210
-EBUILD alembic-1.7.11-r1.ebuild 2909 BLAKE2B 5851b780d234dc5412bb17c14f6a28c5bafa7dc121638ad7b255141c5fcaac85485fc6c6e393def35fc8508c2b33164c75b3a7f9a85ef51e9d2510ee9eb6cb4d SHA512 3a51c9f37e1d9d28280b6e8c2986aaaefe01797639907bbf2df3093eaf7358ad8290cf9d385beb707f7cddd6ed889275f62e8c993d8469ea7500e66d366a4083
-EBUILD alembic-1.7.12.ebuild 2399 BLAKE2B ed883f1e669d8ef3c5e3267c68a87064af3c3de5e3d747ba8b723b53a352d7d8b28081e6e229ed307359b11ccd31228161dd61b3f6c3b37c6a77e2afd286860b SHA512 220895749a03e0cb41a3a7f772f24c8789ae62c3df43de19a60dab0365d66761f04df504618acb355e36fa6319c7f3bd4c0613cbde5f760607d5dd02d797c6bf
-MISC metadata.xml 1238 BLAKE2B 5d2eafb6cc973920681f3c8a6787d5f943b436260f3122f5fba502aca6dfa08d3f6270b42c913b5a68c24b205138b068e482b881c43406874645804e105f0f32 SHA512 95667508715b5ae934acdb2b451919ecf0f0779ad5fa2bc89e731583c33570abdca0f481cbb203740f9ea6c39e773eea08bfa2f3f363d26c41c4c23c7fe3ea7b
+DIST alembic-1.7.16.tar.gz 855709 BLAKE2B 8009ed199b7dca190e40f56969d7c446e65bd78f58cee75dda4883ecf02b6c7ee422db76c4f523a76a4b2d42ef1547ededf5de0055cdb5d801c5cd4918a0b5f4 SHA512 bd4777dc4abf15bfb8307b00fd2d67671e89944d0dd8a74a657f4aee49e6a1cd0ab1fe5bb7f9afc63abcce2123466bb8a9a3886d41724ed2c242bc61d7d5b3a1
+EBUILD alembic-1.7.12.ebuild 2398 BLAKE2B 304acd044f9cc247f99df23810934a2917df21bdc7e7885a52857c458e6419f502460a35f1bebe947bbc4513c47dd1e09dfc4d447fa278ae0fcfd568ae683b98 SHA512 2c31a9759a2725576b0c22745db5cb59b376b5cf5bbe4d72df641666304533d8005d9417702073bbe0570772e56b06687571d45876840eeb899b9f52866458f0
+EBUILD alembic-1.7.16.ebuild 1241 BLAKE2B f4f0a1ea27ae8e8539c0e4c14e399d9d2e546053367a80d7bb6074295257cb701b2affcc01bc614ca516bfe11417f5fd37d3a5ad897eb647fe4645fed91f6440 SHA512 5715deaf8e193709500879591572d4c73734c7ad1c161fe344ce68f3c2d868ab1ebcdf2c50c7f93b2f4c253a7d4e6eabfbc6d213eb86101fdba2225807841ccc
+MISC metadata.xml 1080 BLAKE2B 96c475f6b75a08520843721121d708e9e31dbfa633f7c3ac73621b85ecd139c12bc022aa4719c3390ce61fbd5b55c6444c69ff0a380abcc08685de3052632104 SHA512 fb6d89a0b587010d22fed63b5b281a88282366219c174fff7484176d3a61109b47bb87e49758c185273d044a8f52eb7230b122d145a4ed341c24597d89ff0166
diff --git a/media-gfx/alembic/alembic-1.7.11-r1.ebuild b/media-gfx/alembic/alembic-1.7.11-r1.ebuild
deleted file mode 100644
index 2132a431730c..000000000000
--- a/media-gfx/alembic/alembic-1.7.11-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multiprocessing
-
-DESCRIPTION="Open framework for storing and sharing scene data"
-HOMEPAGE="https://www.alembic.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="arnold +boost doc examples hdf5 maya prman test zlib"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	hdf5? ( zlib )
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=media-libs/openexr-2.3.0:=
-	boost? ( >=dev-libs/boost-1.65.0:= )
-	hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] )
-	zlib? ( >=sys-libs/zlib-1.2.11-r1 )
-"
-DEPEND="
-	${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.8.14-r1 )
-"
-
-DOCS=( "ACKNOWLEDGEMENTS.txt" "FEEDBACK.txt" "NEWS.txt" "README.txt" )
-
-PATCHES=(
-	"${FILESDIR}/${P}-0001-Fix-to-find-boost-with-cmake-3.11.patch"
-	"${FILESDIR}/${P}-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch"
-	"${FILESDIR}/${P}-0003-Fix-env-var-for-renderman.patch"
-	"${FILESDIR}/${P}-0004-Fix-a-compile-issue-with-const.patch"
-	"${FILESDIR}/${P}-0005-Fix-install-locations.patch"
-	"${FILESDIR}/${P}-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-	if use doc; then
-		doxygen -u Doxyfile || die "Failed to update Doxyfile"
-		sed -i -e 's|DOT_NUM_THREADS[ \t]*= 0|DOT_NUM_THREADS = '$(makeopts_jobs)'|' Doxyfile || die "Failed to change dot threads"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DALEMBIC_SHARED_LIBS=ON
-		# The CMakeLists.txt file needs C++11 or C++-0x if none of them
-		# is defined
-		-DALEMBIC_LIB_USES_BOOST=$(usex boost)
-		-DALEMBIC_LIB_USES_TR1=$(usex !boost)
-		-DUSE_ARNOLD=$(usex arnold)
-		-DUSE_BINARIES=ON
-		-DUSE_EXAMPLES=$(usex examples)
-		-DUSE_HDF5=$(usex hdf5)
-		-DUSE_MAYA=$(usex maya)
-		-DUSE_PRMAN=$(usex prman)
-		-DUSE_PYALEMBIC=OFF
-		-DUSE_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		doxygen Doxyfile || die "Failed to build documentation"
-	fi
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	cmake_src_install
-}
-
-pkg_postinst() {
-	if use arnold; then
-		einfo "NOTE: The arnold plugin is highly experimental and hasn't been"
-		einfo "tested, due to missing license. If you have trouble compiling"
-		einfo "or running it, please file a bug report for the package at"
-		einfo "Gentoo's bugzilla."
-	fi
-	if use maya; then
-		einfo "NOTE: The maya plugin is highly experimental and hasn't been"
-		einfo "tested, due to missing license. If you have trouble compiling"
-		einfo "or running it, please file a bug report for the package at"
-		einfo "Gentoo's bugzilla."
-	fi
-	if use prman; then
-		einfo "If you're looking for an ebuild for renderman, you may want to"
-		einfo "try the waebbl overlay: 'eselect repository enable waebbl'"
-		einfo "followed by 'emerge renderman'"
-	fi
-}
diff --git a/media-gfx/alembic/alembic-1.7.12.ebuild b/media-gfx/alembic/alembic-1.7.12.ebuild
index 364b3261bc71..d67d4611da19 100644
--- a/media-gfx/alembic/alembic-1.7.12.ebuild
+++ b/media-gfx/alembic/alembic-1.7.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+boost doc examples hdf5 prman test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/alembic/alembic-1.7.16.ebuild b/media-gfx/alembic/alembic-1.7.16.ebuild
new file mode 100644
index 000000000000..e7b7b255e52c
--- /dev/null
+++ b/media-gfx/alembic/alembic-1.7.16.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake multiprocessing
+
+DESCRIPTION="Open framework for storing and sharing scene data"
+HOMEPAGE="https://www.alembic.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="hdf5 test zlib"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="hdf5? ( zlib )"
+
+RDEPEND="
+	>=media-libs/openexr-2.5.0:=
+	hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] )
+	zlib? ( >=sys-libs/zlib-1.2.11-r1 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+DOCS=( "ACKNOWLEDGEMENTS.txt" "FEEDBACK.txt" "NEWS.txt" "README.txt" )
+
+PATCHES=( "${FILESDIR}/${PN}-1.7.11-0005-Fix-install-locations.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DALEMBIC_SHARED_LIBS=ON
+		# C++-11 and thus {shared,unique,weak}_ptr are common nowadays, so these
+		# are no longer needed and using boost fails. Options will get removed by
+		# upstream soon
+		-DALEMBIC_LIB_USES_BOOST=OFF
+		-DALEMBIC_LIB_USES_TR1=OFF
+		-DUSE_ARNOLD=OFF
+		-DUSE_BINARIES=ON
+		-DUSE_EXAMPLES=OFF
+		-DUSE_HDF5=$(usex hdf5)
+		-DUSE_MAYA=OFF
+		-DUSE_PRMAN=OFF
+		-DUSE_PYALEMBIC=OFF
+		-DUSE_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/media-gfx/alembic/metadata.xml b/media-gfx/alembic/metadata.xml
index f3240834df66..034ebe0790b5 100644
--- a/media-gfx/alembic/metadata.xml
+++ b/media-gfx/alembic/metadata.xml
@@ -14,15 +14,9 @@
 	developed by Sony Pictures Imageworks Inc. and Lucasfilm Ltd.
 </longdescription>
 <use>
-	<flag name="arnold">
-		Add support for arnold renderer (experimental)
-	</flag>
 	<flag name="boost">Use <pkg>dev-libs/boost</pkg> library</flag>
 	<flag name="examples">Install alembic examples</flag>
 	<flag name="hdf5">Add support <pkg>sci-libs/hdf5</pkg></flag>
-	<flag name="maya">
-		Compile Alembic plugin for Maya (experimental)
-	</flag>
 	<flag name="prman">
 		Compile Alembic plugin for Renderman (experimental)
 	</flag>
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 73415ba4f3c6..b630945633a1 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -12,8 +12,8 @@ DIST asymptote-2.61.src.tgz 4623504 BLAKE2B 8432f07ce21f630c5bdae609650c0bb2bcd2
 DIST asymptote-2.62.src.tgz 4625853 BLAKE2B 49a5c75f936149139576cc224b005e76d2465a6c813bcb152f2534e98e042685c1500eafb0954b9e53ac0e667b47ab88a8b3387f1627d58828008d0e4d4cc0c8 SHA512 f7e817cdbb3c079a10c5f6f56a1eb47b1aaf8230902c06870bc8feacfed5f7af3d8ed22e4c60cc7130828ced8d36ec035533de1074cb049d3de9006ee542ac2e
 DIST asymptote-2.65.src.tgz 4640419 BLAKE2B a508532b9697a0744d48f8109d5b04ca71eb1ee7a08f15eccd2b95d63c16c980621ef03d01a03917a767c774f14a239a13f8fe50ad98b154b092f710917af1ad SHA512 c6879689192c1646a318b389de222accc55c8d5e9df17fab3c88c37f627d2cff8133cdefe9e6dec2784cf72edf261e557ad83f7fac6e67fd49c483e9d8971026
 DIST asymptote-2.67.src.tgz 4668696 BLAKE2B 30be754a0e5869caad4d605f162dffe688d2dc09a0163a8c37d15fd9d6dd05652b7b0b2710ab31edaa8f4b36484df256d032f8826f3547e755eb90e5dbb179ec SHA512 5854ce51bc7a3d330eeb0887376645c3d292a368b06d01ec84c15ee5beee90ae429abfee1bff5025bdfb51edfa7f66e535c1187f66440df0c6626c79e3de6210
-EBUILD asymptote-2.61.ebuild 4627 BLAKE2B e96e10d46b053e2f4e77a7ff95d4462ada1d67c46ada65d5c5f2cf7904c8470ca08a9801a09ea51f3a59e0a2e7371a1a86735b544e25c63ead28ea6f5a9a6879 SHA512 5ad08eabea089f9e96d0f79eb50c1c428a2e3bdb002b0d34417a58af5ed59d4e24eb41adb45241890cbadadc6cb745c00811a0fcd2d5d878e091a210cfcfc095
-EBUILD asymptote-2.62.ebuild 4629 BLAKE2B 325473944f50c21e9b7f1336cb406569a1b85c902ff14e37aca970a5586c45adadda1fdeed9c9e9d5858aa2f0ef1d7fd45e8bc4a145d57cda7da4398fb82483f SHA512 31f06d0ca6e5ed329ee76e69ea26fe4868806aecc047a552efa7a1e6cfb06b9f9c2d9fa9f0db16098185342820a997716479361c4ac68b41ad496315283e0bf9
-EBUILD asymptote-2.65.ebuild 4629 BLAKE2B 2a7ec12b9db7c4ecc297f90488589551bc6c47598f91ef1be2b5769dcdcda3a7bd21fab0ce3c22e2591139b711a375a12e70215d4eb592708a420cfb2f31ee7f SHA512 787257f2b70b8f9f2ccea3b595a967440570aa0a5b4141080c0a383e624dae7d483e11086747e3147de4128e3215bae12f3a2f902e2b25ed6327449717a717d9
-EBUILD asymptote-2.67.ebuild 4816 BLAKE2B afc3b823d83c7ad94fba1c04aeba5f77238b9b42e3e8b01950cda82f41aa657c77f6d9235f0e20c8495e85adc73bf008499759148ce5628ddac695e0d5f6e9ac SHA512 82e7b1c5f1add1e1f75e340fb1587c53c65357831800f414e522709042dea0f7373e183f36d981d63b9e681d3d8a5f5adfdb1f5bdb1c03cd7bc58f09fa825a4c
+EBUILD asymptote-2.61.ebuild 4627 BLAKE2B 211e3136584bbf32862382b9e8320493c2380430b92f79fee46a35174db8dcbd73140c4460f31f37c3aff378cc45ae5fc6d188d859e162209fb843c1c48e19fa SHA512 52f15e395335622fdd219b9c589ba5c296bbf39de02e69275f70016e865a71206c40424a236022212d793bca2847fb7ceefa5819197a18cc9ffed44377050e15
+EBUILD asymptote-2.62.ebuild 4629 BLAKE2B c19da5209a22a836a6c9c59870c1a7456c5724886296de32d668258990ac221a49059c81dd8b5fab8f376fd42e20f53a6e0a30d71d86251c3c4ab3828d1c87a4 SHA512 b6d960457b9ffaadaf842ab6fc335a15a62b576b83ba0d76bdacbc1cb3d961f494901a16cb31bfc9305faebf85716a0b5a1b18fc9e4270825d56382e816b9833
+EBUILD asymptote-2.65.ebuild 4629 BLAKE2B b79215e02d3e4f59e190025daae4a4d6f328d0eebec055da2ae73ba81afb42534d41a1c81b2b9f6cfb2b1857fa099985ef57d15a433cc80ed1095718f8e4368f SHA512 94bf7f665139cc77125185918e2236ac31c0c7a1a8732eb2cc37d777c54d7b30bb2bd850502243bc219c55e38204c175d1017011e03a6bfa3a1d70dd16fe97d0
+EBUILD asymptote-2.67.ebuild 4816 BLAKE2B 6d7e6563239cfca0317d25ea4180b1e1079578148969375018782bea8bd234376da6516be67f89f40746e8b8fa0c57ddaaefa087a31614e8521aca00cdbfa896 SHA512 0af77d5679a84feaca0ab4ae6cbb95b77fa415056d4f38306d34debfde4c480fd8668c3a57c3e74a071222f6dae2f671b42e4bb1618ee7d8c9b0aa9b5b05bf10
 MISC metadata.xml 1105 BLAKE2B 4b7d588a861ed68910f0d5a7b7f5691b3e97b6cf4514c3544c8610c77340797354575b49b70980320e55ecf5ea8188bbe8f6cc8fce55d18dc466f1d0fd83ade3 SHA512 f115ea831900270542ffe545260eda1ed51d321eca5aa7772f336bcc0e0c6471be3cbde2991c3e48ea5b3fbf51b8541b13de850406af15e42c992da0f2ed08ee
diff --git a/media-gfx/asymptote/asymptote-2.61.ebuild b/media-gfx/asymptote/asymptote-2.61.ebuild
index 90caa2a04989..0117ea06a1dd 100644
--- a/media-gfx/asymptote/asymptote-2.61.ebuild
+++ b/media-gfx/asymptote/asymptote-2.61.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7} )
 inherit autotools elisp-common latex-package python-r1
 
 DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
-HOMEPAGE="http://asymptote.sourceforge.net/"
+HOMEPAGE="https://asymptote.sourceforge.io/"
 SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
 
 LICENSE="GPL-3"
diff --git a/media-gfx/asymptote/asymptote-2.62.ebuild b/media-gfx/asymptote/asymptote-2.62.ebuild
index 5f683b025c14..af22df7d3e9b 100644
--- a/media-gfx/asymptote/asymptote-2.62.ebuild
+++ b/media-gfx/asymptote/asymptote-2.62.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7} )
 inherit autotools elisp-common latex-package python-r1
 
 DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
-HOMEPAGE="http://asymptote.sourceforge.net/"
+HOMEPAGE="https://asymptote.sourceforge.io/"
 SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
 
 LICENSE="GPL-3"
diff --git a/media-gfx/asymptote/asymptote-2.65.ebuild b/media-gfx/asymptote/asymptote-2.65.ebuild
index be68de6d52cb..99fe53927a88 100644
--- a/media-gfx/asymptote/asymptote-2.65.ebuild
+++ b/media-gfx/asymptote/asymptote-2.65.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit autotools elisp-common latex-package python-r1
 
 DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
-HOMEPAGE="http://asymptote.sourceforge.net/"
+HOMEPAGE="https://asymptote.sourceforge.io/"
 SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
 
 LICENSE="GPL-3"
diff --git a/media-gfx/asymptote/asymptote-2.67.ebuild b/media-gfx/asymptote/asymptote-2.67.ebuild
index 581f8fb50a44..1e7593538a89 100644
--- a/media-gfx/asymptote/asymptote-2.67.ebuild
+++ b/media-gfx/asymptote/asymptote-2.67.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit autotools elisp-common latex-package python-r1
 
 DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
-HOMEPAGE="http://asymptote.sourceforge.net/"
+HOMEPAGE="https://asymptote.sourceforge.io/"
 SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
 
 LICENSE="GPL-3"
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index e80c5b569484..61d0c227951e 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,10 +1,5 @@
-AUX blender-2.79b-ffmpeg-4-compat.patch 2052 BLAKE2B 3e9f341416a3dc629d950623cc54da4c2984c7f73b6565cb7cb0aa00bf86eec725f0fdc503a517b29282596669de108d1dbe2c9783c8a0da412a6d14834d5cdf SHA512 afd90ee52a2a7d955417450e92642e2169c1f0e6d20d96a1f08521db718bc224941c15d23152eb3fcde1b4dc84ffb52162d77b23252ef8250a6b5ddbcd8ca67d
-AUX blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch 1265 BLAKE2B bff3ae55e61e7ad3b14d190b28b2a3ec932be020c9cc15365142bd8c9fb23d9b559209690fb2554bb82c0221a51329a2056d50c0876d2f91ea5c047dd4d00762 SHA512 295daedff4cce243d47133116443d4e0e91a263d56a9303aeec214984faa83bc54a7736848a684120cb8a397f95b1d8c5caa74c9369368723d8d6facf6888618
-AUX blender-2.79b-fix-opencollada.patch 4227 BLAKE2B 3f6742623ad9801c0748c324e7d64f9d548caf32c7d0ebf6db217f5fa895d9596c44c1e1b0beb4f38a7026ffd0fdee1147e5cc0dd3491e6443d44786484855d2 SHA512 753aa45f416cdc5c22d26ac8ec99a403100f4e8ec0e39c39ae3b112611099554a4b0f1275202205c966249f6560d3138cbf0e84e7ccae440096aec7166382fb7
-AUX blender-2.79b-gcc-8.patch 1259 BLAKE2B 7d204a953c71e656fb309e0560e2de03a9316a95e67a76ecdeb303fadeeca14338ba823d6780a50b62bf4686477a962030b42b15ceae12d48ab21034b0358cc1 SHA512 df0a6a0543a7feac22e6082652792e59ce675dcea99a821c480d5c13e42e9df4d7ab43c71d296a22dd195771714e630757b1e220177d3713f409ea21e9251504
-AUX blender-fix-install-rules.patch 518 BLAKE2B 178929de7adb1b4a0063134da93248af8c2c42fe0d3e9730833272b4fe8387075ce592ee65668cc9862a1ad10c9857a31b3f1c0614c9e69f937998ccb5c86a17 SHA512 5343f0e9e6bba2d15a38cb5db95a1aeff0a704c0762e558b9b74d88dd58e2fb5077289f0d8f25a61fa092d083f7db916d27c4642dfd7cf84d4c989258c3253ec
-DIST blender-2.79b.tar.gz 50204270 BLAKE2B 78bda294df783ee9bcbcf32f9a112737b2947da5146fd4351b8b36d81c6630ed0ea302b2fb539642cfbdcc4b64df35af5c8545a3bbf50b1cf87dcf3a60eb4ac0 SHA512 2db21ace446168dd683cdb5aad9dec001f8888ae4e9603a04ddb44fb78489ded827deb07e83712b0f1118a0e7bf66f2a5d935dc4ebb3a6703d72672ff414367f
 DIST blender-2.83.4.tar.xz 38528352 BLAKE2B 54596207cbee34fcaa6b81a0d829976b42c28c793b88de81d78c1c3fdfe9dd2a0189a314be281b2a0f1829a0b7fd30d37bceaa28d35c9794dcb0f009fa71e83d SHA512 061735273159742784ed210d13fb39ad076efbbfd5f0291bab1b983699d43b20462dc7e4795e28dab0cd191c9879b43d9ad0f0545c24ef5da23c74679e5ccab5
-EBUILD blender-2.79b-r2.ebuild 8330 BLAKE2B a8e25b98ba96c2f0a75e8502ba8132e4a7dd3819ab01903310d6ddbd081a3b655a4406d15020c3d063d65bcfd5fbcb878e8a9ee4967b489a0edc581806341567 SHA512 303bc0821d1aa8cadb5c5cbeeda7e4fee64daece469c5cc1d304844cf89430e54017f7811dbd7d31e8ad61bfe51cdae98e0d9ff4716a902bcb4103c5c92b187b
-EBUILD blender-2.83.4.ebuild 8559 BLAKE2B 7291ae9d7790cbb9183201e91ac7d1f08c6fc2fd0481f19adf7bc23e29af2855e4390c0da45a7d68687102d885093e805bf1cc436fc628541068d566cd6d174a SHA512 be6584a264b10fb0ccfef5bff93c3f3e4d3b789a1e32507534d4a6215cf408a215d3541d299b7730e6c64a28c3732b49dce4a73f735f6c97b6b251a88e0201d6
-MISC metadata.xml 3132 BLAKE2B d4679d2ca60cc618bb93a3a904842813014ef93e05f52346452629a8975d79bd60ead97f3d9d94439f2e858e3e1fe66695ede0290992e2dae3d8317a5b30a9b4 SHA512 c450c3f4727a95ffe4dc9bbb3e1a7b2173d51d5876203a4872ef8c29fb13e2f096c344c8e15ccb07f0e662a2dbf81c68d0911c774d6a9c4b286f2e50dc7b9dca
+DIST blender-2.90.1.tar.xz 38836408 BLAKE2B 42622e742ebd397dc035c85cf26ab72ffee64f2cd46f1523de78dc8861bc19286a7d87b9e31a0d6afdf9a931da7018ccbdb9b4185b8535b4529656c6d85efc34 SHA512 e7d6f8df598f2a2a99f64716331ec4e981a5a49c76b307caf7856480c778455cfc4bbb56fbedc8b22d1e10951ebaeb6844d1ead9476847bf2824dddf5b135992
+EBUILD blender-2.83.4-r1.ebuild 8560 BLAKE2B 295b8bdf8d2dfc2d260911fa07deb04ecd5ace532e5358fc99a2be61f972b44aac993becde6b708b38b3c08967979ed1e595c6f62f4570f3ea032e9ed0e93907 SHA512 7fe110617b574ae4ad11056a7748891556f20f41b907c6f38a714469a5f544ac8a59a4f2d400e3d4e594080b86476e6e281a20b7edf01aa87d0906f9de0cf754
+EBUILD blender-2.90.1-r1.ebuild 8594 BLAKE2B 1eea748af879ef517c436f8105dfa6f63537e4cc43fa3bd5f07e003afd418940c7f47a2b3fab8e5605a7e5afc7ca582cc71c6c14d00d3b05a523dae94d7bec86 SHA512 f0a5797d2aa739e47311dc66e6464431f6620d6bdd322dbca3cfd9dd1daa4e5e7df4d4665ae855690c3701d72b89dc917cffd566d72c8e98c8c1168c0f6c26cc
+MISC metadata.xml 2961 BLAKE2B 77f0031737c448bac4387ca94430ccebbb75f1cdf6fa5780e3c1bdf2118382dbba29479e680c009685cc86105ed3f64d73b7ce2c1a882a1dd18bf4e00a1a249b SHA512 67031dc5c4428e1e7d15fc499f1cb3abd666e2c365d423c845fd587ac87712a72b171df5d7ca2a0b5d2cbe2850081212a77f66c11196700aa7f253b0c5963442
diff --git a/media-gfx/blender/blender-2.83.4.ebuild b/media-gfx/blender/blender-2.83.4-r1.ebuild
index 190185272e9c..a4a6501ff7a4 100644
--- a/media-gfx/blender/blender-2.83.4.ebuild
+++ b/media-gfx/blender/blender-2.83.4-r1.ebuild
@@ -19,7 +19,7 @@ MY_PV="$(ver_cut 1-2)"
 
 SLOT="0"
 LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \
 	abi6-compat abi7-compat alembic collada color-management cuda cycles \
 	debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \
@@ -78,7 +78,7 @@ RDEPEND="${PYTHON_DEPS}
 	nls? ( virtual/libiconv )
 	openal? ( media-libs/openal )
 	opencl? ( virtual/opencl )
-	openimageio? ( media-libs/openimageio )
+	openimageio? ( media-libs/openimageio:= )
 	openexr? (
 		media-libs/ilmbase:=
 		media-libs/openexr:=
diff --git a/media-gfx/blender/blender-2.79b-r2.ebuild b/media-gfx/blender/blender-2.90.1-r1.ebuild
index 977f12110a6a..7ad59e31836d 100644
--- a/media-gfx/blender/blender-2.79b-r2.ebuild
+++ b/media-gfx/blender/blender-2.90.1-r1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_7 )
 
-inherit check-reqs cmake-utils flag-o-matic xdg-utils \
-	pax-utils python-single-r1 toolchain-funcs eapi7-ver
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 \
+	toolchain-funcs xdg-utils
 
 DESCRIPTION="3D Creation/Animation/Publishing System"
 HOMEPAGE="https://www.blender.org"
 
-SRC_URI="https://download.blender.org/source/${P}.tar.gz"
+SRC_URI="https://download.blender.org/source/${P}.tar.xz"
 
 # Blender can have letters in the version string,
 # so strip off the letter if it exists.
@@ -19,37 +19,45 @@ MY_PV="$(ver_cut 1-2)"
 
 SLOT="0"
 LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="amd64 ~x86"
-IUSE="+bullet +dds +elbeem +game-engine +openexr collada color-management \
-	cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k \
-	llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \
-	osl player sdl sndfile test tiff valgrind"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \
+	abi6-compat abi7-compat alembic collada color-management cuda cycles \
+	debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \
+	man ndof nls openal opencl openimageio openmp opensubdiv \
+	openvdb osl sdl sndfile standalone test tiff valgrind"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	alembic? ( openexr )
 	cuda? ( cycles )
 	cycles? ( openexr tiff openimageio )
+	elbeem? ( tbb )
 	opencl? ( cycles )
+	openvdb? (
+		^^ ( abi6-compat abi7-compat )
+		tbb
+	)
 	osl? ( cycles llvm )
-	player? ( game-engine !headless )"
+	standalone? ( cycles )"
 
 RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/boost-1.62:=[nls?,threads(+)]
-	dev-libs/lzo:2
+	dev-libs/boost:=[nls?,threads(+)]
+	dev-libs/lzo:2=
 	$(python_gen_cond_dep '
-		>=dev-python/numpy-1.10.1[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
 	')
-	media-libs/freetype
+	media-libs/freetype:=
 	media-libs/glew:*
-	media-libs/libpng:0=
+	media-libs/libpng:=
 	media-libs/libsamplerate
-	sys-libs/zlib
+	sys-libs/zlib:=
 	virtual/glu
-	virtual/jpeg:0=
+	virtual/jpeg
 	virtual/libintl
 	virtual/opengl
-	collada? ( >=media-libs/opencollada-1.6.18:= )
+	alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] )
+	collada? ( >=media-libs/opencollada-1.6.68 )
 	color-management? ( media-libs/opencolorio )
 	cuda? ( dev-util/nvidia-cuda-toolkit:= )
 	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
@@ -61,7 +69,7 @@ RDEPEND="${PYTHON_DEPS}
 	)
 	jack? ( virtual/jack )
 	jemalloc? ( dev-libs/jemalloc:= )
-	jpeg2k? ( media-libs/openjpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
 	llvm? ( sys-devel/llvm:= )
 	ndof? (
 		app-misc/spacenavd
@@ -70,25 +78,29 @@ RDEPEND="${PYTHON_DEPS}
 	nls? ( virtual/libiconv )
 	openal? ( media-libs/openal )
 	opencl? ( virtual/opencl )
-	openimageio? ( >=media-libs/openimageio-1.7.0 )
+	openimageio? ( media-libs/openimageio:= )
 	openexr? (
-		>=media-libs/ilmbase-2.2.0:=
-		>=media-libs/openexr-2.2.0:=
+		media-libs/ilmbase:=
+		media-libs/openexr:=
 	)
-	opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] )
+	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] )
 	openvdb? (
-		<media-gfx/openvdb-7[abi4-compat]
-		dev-cpp/tbb
-		>=dev-libs/c-blosc-1.5.2
+		~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?]
+		dev-libs/c-blosc:=
 	)
-	osl? ( media-libs/osl:= )
+	osl? ( media-libs/osl )
 	sdl? ( media-libs/libsdl2[sound,joystick] )
 	sndfile? ( media-libs/libsndfile )
-	tiff? ( media-libs/tiff:0 )
-	valgrind? ( dev-util/valgrind )"
+	tbb? ( dev-cpp/tbb )
+	tiff? ( media-libs/tiff )
+	valgrind? ( dev-util/valgrind )
+"
 
 DEPEND="${RDEPEND}
-	>=dev-cpp/eigen-3.2.8:3
+	dev-cpp/eigen:=
+"
+
+BDEPEND="
 	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen[dot]
@@ -99,15 +111,8 @@ DEPEND="${RDEPEND}
 		dev-texlive/texlive-latex
 		dev-texlive/texlive-latexextra
 	)
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-fix-install-rules.patch"
-	"${FILESDIR}/${P}-gcc-8.patch"
-	"${FILESDIR}/${P}-ffmpeg-4-compat.patch"
-	"${FILESDIR}/${P}-fix-for-gcc9-new-openmp-data-sharing.patch"
-	"${FILESDIR}/${P}-fix-opencollada.patch"
-)
+	nls? ( sys-devel/gettext )
+"
 
 blender_check_requirements() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -127,7 +132,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# we don't want static glew, but it's scattered across
 	# multiple files that differ from version to version
@@ -140,7 +145,7 @@ src_prepare() {
 	# Disable MS Windows help generation. The variable doesn't do what it
 	# it sounds like.
 	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
-	    -i doc/doxygen/Doxyfile || die
+		-i doc/doxygen/Doxyfile || die
 }
 
 src_configure() {
@@ -148,36 +153,44 @@ src_configure() {
 	# shadows, see bug #276338 for reference
 	append-flags -funsigned-char
 	append-lfs-flags
-	# Blender is compatible ABI 4 or less, so use ABI 4.
-	append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=4
+
+	if use openvdb; then
+		local version
+		if use abi6-compat; then
+			version=6;
+		elif use abi7-compat; then
+			version=7;
+		else
+			die "Openvdb abi version not compatible"
+		fi
+		append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=${version}
+	fi
 
 	local mycmakeargs=(
-		-DPYTHON_VERSION="${EPYTHON/python/}"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DBUILD_SHARED_LIBS=OFF
 		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DWITH_INSTALL_PORTABLE=OFF
-		-DWITH_PYTHON_INSTALL=OFF
-		-DWITH_PYTHON_INSTALL_NUMPY=OFF
-		-DWITH_STATIC_LIBS=OFF
-		-DWITH_SYSTEM_GLEW=ON
-		-DWITH_SYSTEM_OPENJPEG=ON
-		-DWITH_SYSTEM_EIGEN3=ON
-		-DWITH_SYSTEM_LZO=ON
-		-DWITH_C11=ON
-		-DWITH_CXX11=ON
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DWITH_ALEMBIC=$(usex alembic)
+		-DWITH_ASSERT_ABORT=$(usex debug)
 		-DWITH_BOOST=ON
 		-DWITH_BULLET=$(usex bullet)
 		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
 		-DWITH_CODEC_SNDFILE=$(usex sndfile)
-		-DWITH_CUDA=$(usex cuda)
+		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
 		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
 		-DWITH_CYCLES=$(usex cycles)
+		-DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl)
+		-DWITH_CYCLES_EMBREE=OFF
+		-DWITH_CYCLES_STANDALONE=$(usex standalone)
+		-DWITH_CYCLES_STANDALONE_GUI=$(usex standalone)
 		-DWITH_CYCLES_OSL=$(usex osl)
-		-DWITH_LLVM=$(usex llvm)
+		-DWITH_DOC_MANPAGE=$(usex man)
 		-DWITH_FFTW3=$(usex fftw)
-		-DWITH_GAMEENGINE=$(usex game-engine)
+		-DWITH_GHOST_X11=$(usex !headless)
+		-DWITH_GTESTS=$(usex test)
 		-DWITH_HEADLESS=$(usex headless)
-		-DWITH_X11=$(usex !headless)
+		-DWITH_INSTALL_PORTABLE=OFF
 		-DWITH_IMAGE_DDS=$(usex dds)
 		-DWITH_IMAGE_OPENEXR=$(usex openexr)
 		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
@@ -185,31 +198,33 @@ src_configure() {
 		-DWITH_INPUT_NDOF=$(usex ndof)
 		-DWITH_INTERNATIONAL=$(usex nls)
 		-DWITH_JACK=$(usex jack)
+		-DWITH_LLVM=$(usex llvm)
+		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
+		-DWITH_MEM_VALGRIND=$(usex valgrind)
 		-DWITH_MOD_FLUID=$(usex elbeem)
 		-DWITH_MOD_OCEANSIM=$(usex fftw)
 		-DWITH_OPENAL=$(usex openal)
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_OPENCOLORIO=$(usex color-management)
 		-DWITH_OPENCOLLADA=$(usex collada)
+		-DWITH_OPENCOLORIO=$(usex color-management)
 		-DWITH_OPENIMAGEIO=$(usex openimageio)
 		-DWITH_OPENMP=$(usex openmp)
 		-DWITH_OPENSUBDIV=$(usex opensubdiv)
 		-DWITH_OPENVDB=$(usex openvdb)
 		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
-		-DWITH_PLAYER=$(usex player)
+		-DWITH_PYTHON_INSTALL=$(usex system-python OFF ON)
+		-DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON)
 		-DWITH_SDL=$(usex sdl)
-		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
-		-DWITH_ASSERT_ABORT=$(usex debug)
-		-DWITH_GTESTS=$(usex test)
-		-DWITH_DOC_MANPAGE=$(usex man)
-		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
-		-DWITH_MEM_VALGRIND=$(usex valgrind)
+		-DWITH_STATIC_LIBS=OFF
+		-DWITH_SYSTEM_EIGEN3=ON
+		-DWITH_SYSTEM_GLEW=ON
+		-DWITH_SYSTEM_LZO=ON
+		-DWITH_TBB=$(usex tbb)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	if use doc; then
 		# Workaround for binary drivers.
@@ -244,7 +259,11 @@ src_test() {
 
 src_install() {
 	# Pax mark blender for hardened support.
-	pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender
+	pax-mark m "${BUILD_DIR}"/bin/blender
+
+	if use standalone; then
+		dobin "${BUILD_DIR}"/bin/cycles
+	fi
 
 	if use doc; then
 		docinto "html/API/python"
@@ -254,21 +273,21 @@ src_install() {
 		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
 	fi
 
-	cmake-utils_src_install
+	cmake_src_install
 
 	# fix doc installdir
 	docinto "html"
 	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
-	rm -r "${ED%/}"/usr/share/doc/blender || die
+	rm -r "${ED}"/usr/share/doc/blender || die
 
-	python_fix_shebang "${ED%/}/usr/bin/blender-thumbnailer.py"
-	python_optimize "${ED%/}/usr/share/blender/${MY_PV}/scripts"
+	python_fix_shebang "${ED}/usr/bin/blender-thumbnailer.py"
+	python_optimize "${ED}/usr/share/blender/${MY_PV}/scripts"
 }
 
 pkg_postinst() {
 	elog
 	elog "Blender uses python integration. As such, may have some"
-	elog "inherit risks with running unknown python scripts."
+	elog "inherent risks with running unknown python scripts."
 	elog
 	elog "It is recommended to change your blender temp directory"
 	elog "from /tmp to /home/user/tmp or another tmp file under your"
@@ -284,11 +303,13 @@ pkg_postinst() {
 	ewarn
 	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
 
 	ewarn ""
 	ewarn "You may want to remove the following directory."
diff --git a/media-gfx/blender/files/blender-2.79b-ffmpeg-4-compat.patch b/media-gfx/blender/files/blender-2.79b-ffmpeg-4-compat.patch
deleted file mode 100644
index 4ad05aafb15d..000000000000
--- a/media-gfx/blender/files/blender-2.79b-ffmpeg-4-compat.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -urN a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h
---- a/intern/ffmpeg/ffmpeg_compat.h	2018-03-23 15:22:25.000000000 +0000
-+++ b/intern/ffmpeg/ffmpeg_compat.h	2018-08-16 14:39:23.484489828 +0100
-@@ -109,6 +109,45 @@
- 
- #endif
- 
-+/* XXX TODO Probably fix to correct modern flags in code? Not sure how old FFMPEG we want to support though,
-+ * so for now this will do. */
-+
-+#ifndef FF_MIN_BUFFER_SIZE
-+#  ifdef AV_INPUT_BUFFER_MIN_SIZE
-+#    define FF_MIN_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE
-+#  endif
-+#endif
-+
-+#ifndef FF_INPUT_BUFFER_PADDING_SIZE
-+#  ifdef AV_INPUT_BUFFER_PADDING_SIZE
-+#    define FF_INPUT_BUFFER_PADDING_SIZE AV_INPUT_BUFFER_PADDING_SIZE
-+#  endif
-+#endif
-+
-+#ifndef CODEC_FLAG_GLOBAL_HEADER
-+#  ifdef AV_CODEC_FLAG_GLOBAL_HEADER
-+#    define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER
-+#  endif
-+#endif
-+
-+#ifndef CODEC_FLAG_GLOBAL_HEADER
-+#  ifdef AV_CODEC_FLAG_GLOBAL_HEADER
-+#    define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER
-+#  endif
-+#endif
-+
-+#ifndef CODEC_FLAG_INTERLACED_DCT
-+#  ifdef AV_CODEC_FLAG_INTERLACED_DCT
-+#    define CODEC_FLAG_INTERLACED_DCT AV_CODEC_FLAG_INTERLACED_DCT
-+#  endif
-+#endif
-+
-+#ifndef CODEC_FLAG_INTERLACED_ME
-+#  ifdef AV_CODEC_FLAG_INTERLACED_ME
-+#    define CODEC_FLAG_INTERLACED_ME AV_CODEC_FLAG_INTERLACED_ME
-+#  endif
-+#endif
-+
- /* FFmpeg upstream 1.0 is the first who added AV_ prefix. */
- #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 59, 100)
- #  define AV_CODEC_ID_NONE CODEC_ID_NONE
-diff -urN a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
---- a/source/blender/blenkernel/intern/writeffmpeg.c	2018-03-23 15:22:25.000000000 +0000
-+++ b/source/blender/blenkernel/intern/writeffmpeg.c	2018-08-16 14:39:21.702484751 +0100
-@@ -605,7 +605,8 @@
- 	c->rc_buffer_aggressivity = 1.0;
- #endif
- 
--	c->me_method = ME_EPZS;
-+	/* Deprecated and not doing anything since July 2015, deleted in recent ffmpeg */
-+	//c->me_method = ME_EPZS;
- 	
- 	codec = avcodec_find_encoder(c->codec_id);
- 	if (!codec)
diff --git a/media-gfx/blender/files/blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch b/media-gfx/blender/files/blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch
deleted file mode 100644
index 0ecc960d28e1..000000000000
--- a/media-gfx/blender/files/blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/intern/elbeem/intern/solver_main.cpp b/intern/elbeem/intern/solver_main.cpp
-index 68f7c04..514087b 100644
---- a/intern/elbeem/intern/solver_main.cpp
-+++ b/intern/elbeem/intern/solver_main.cpp
-@@ -381,7 +381,7 @@ LbmFsgrSolver::mainLoop(const int lev)
- 	GRID_REGION_INIT();
- #if PARALLEL==1
- 	const int gDebugLevel = ::gDebugLevel;
--#pragma omp parallel default(none) num_threads(mNumOMPThreads) \
-+#pragma omp parallel num_threads(mNumOMPThreads) \
-   reduction(+: \
- 	  calcCurrentMass,calcCurrentVolume, \
- 		calcCellsFilled,calcCellsEmptied, \
-@@ -1126,7 +1126,7 @@ LbmFsgrSolver::preinitGrids()
- 		GRID_REGION_INIT();
- #if PARALLEL==1
- 	const int gDebugLevel = ::gDebugLevel;
--#pragma omp parallel default(none) num_threads(mNumOMPThreads) \
-+#pragma omp parallel num_threads(mNumOMPThreads) \
-   reduction(+: \
- 	  calcCurrentMass,calcCurrentVolume, \
- 		calcCellsFilled,calcCellsEmptied, \
-@@ -1164,7 +1164,7 @@ LbmFsgrSolver::standingFluidPreinit()
- 	GRID_REGION_INIT();
- #if PARALLEL==1
- 	const int gDebugLevel = ::gDebugLevel;
--#pragma omp parallel default(none) num_threads(mNumOMPThreads) \
-+#pragma omp parallel num_threads(mNumOMPThreads) \
-   reduction(+: \
- 	  calcCurrentMass,calcCurrentVolume, \
- 		calcCellsFilled,calcCellsEmptied, \
diff --git a/media-gfx/blender/files/blender-2.79b-fix-opencollada.patch b/media-gfx/blender/files/blender-2.79b-fix-opencollada.patch
deleted file mode 100644
index ab1704864a02..000000000000
--- a/media-gfx/blender/files/blender-2.79b-fix-opencollada.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-Opencollada 1.65 and later added a pure virtual function writeAnimationClip
-so the compiler is unable to create a DocumentImporter implementation.
-These patches are backported from blender 2.80-r1 which fix the issue.
-
-See https://developer.blender.org/rB10c50d7dbf7578b35b3bf19a1948f556f9eb203b
-and https://developer.blender.org/rB3552731551ef1845b493ffebf78be5a42527e9f2
-
-Thanks to Dennis Schridde for finding them.
-
---- blender-2.79b/source/blender/collada/CMakeLists.txt.orig	2020-07-23 18:00:09.421620416 +0200
-+++ blender-2.79b/source/blender/collada/CMakeLists.txt	2020-07-23 18:00:13.868584964 +0200
-@@ -25,6 +25,18 @@
- 
- remove_strict_flags()
- 
-+FIND_FILE(_opencollada_with_animation_clip
-+      NAMES
-+        COLLADAFWAnimationClip.h
-+      PATHS
-+        ${OPENCOLLADA_INCLUDE_DIRS}
-+      NO_DEFAULT_PATH
-+    )
-+
-+IF(_opencollada_with_animation_clip)
-+   add_compile_definitions(OPENCOLLADA_WITH_ANIMATION_CLIP)
-+ENDIF()
-+
- set(INC
- 	.
- 	../blenkernel
---- blender-2.79b/source/blender/collada/DocumentImporter.h.orig	2018-03-23 16:10:23.000000000 +0100
-+++ blender-2.79b/source/blender/collada/DocumentImporter.h	2020-07-23 18:00:13.897584733 +0200
-@@ -108,6 +108,11 @@
- 
- 	bool writeAnimationList(const COLLADAFW::AnimationList*);
- 
-+#if OPENCOLLADA_WITH_ANIMATION_CLIP
-+	// Please enable this when building with Collada 1.6.65 or newer (also in DocumentImporter.cpp)
-+	bool writeAnimationClip(const COLLADAFW::AnimationClip *AnimationClip);
-+#endif
-+
- 	bool writeGeometry(const COLLADAFW::Geometry*);
- 
- 	bool writeMaterial(const COLLADAFW::Material*);
---- blender-2.79b/source/blender/collada/DocumentImporter.cpp.orig	2018-03-23 16:22:25.000000000 +0100
-+++ blender-2.79b/source/blender/collada/DocumentImporter.cpp	2020-07-23 18:00:13.896584741 +0200
-@@ -1349,6 +1349,19 @@
- 
-+#if OPENCOLLADA_WITH_ANIMATION_CLIP
-+// Since opencollada 1.6.68
-+// called on post-process stage after writeVisualScenes
-+bool DocumentImporter::writeAnimationClip(const COLLADAFW::AnimationClip *AnimationClip)
-+{
-+	if (mImportStage != General)
-+		return true;
-+
-+	return true;
-+	//return animation_clip_importer.write_animation_clip(animationClip); // TODO: implement import of AnimationClips
-+}
-+#endif
-+
- // this is called on postprocess, before writeVisualScenes
- bool DocumentImporter::writeController(const COLLADAFW::Controller *controller)
- {
- 	if (mImportStage != General)
- 		return true;
---- blender-2.79b/source/blender/collada/CMakeLists.txt.orig	2020-07-23 18:00:45.035336449 +0200
-+++ blender-2.79b/source/blender/collada/CMakeLists.txt	2020-07-23 18:00:52.459277244 +0200
-@@ -24,8 +24,7 @@
- # ***** END GPL LICENSE BLOCK *****
- 
- remove_strict_flags()
--
--FIND_FILE(_opencollada_with_animation_clip
-+FIND_FILE(OPENCOLLADA_ANIMATION_CLIP
-       NAMES
-         COLLADAFWAnimationClip.h
-       PATHS
-@@ -33,8 +32,11 @@
-       NO_DEFAULT_PATH
-     )
- 
--IF(_opencollada_with_animation_clip)
--   add_compile_definitions(OPENCOLLADA_WITH_ANIMATION_CLIP)
-+IF(OPENCOLLADA_ANIMATION_CLIP)
-+   message(STATUS "Found opencollada: ${OPENCOLLADA_ANIMATION_CLIP} ")
-+   add_definitions(-DWITH_OPENCOLLADA_ANIMATION_CLIP)
-+ELSE()
-+   message(STATUS "opencollada: Build without animation clip support")
- ENDIF()
- 
- set(INC
---- blender-2.79b/source/blender/collada/DocumentImporter.h.orig	2020-07-23 18:00:13.897584733 +0200
-+++ blender-2.79b/source/blender/collada/DocumentImporter.h	2020-07-23 18:00:52.487277021 +0200
-@@ -108,7 +108,7 @@
- 
- 	bool writeAnimationList(const COLLADAFW::AnimationList*);
- 
--#if OPENCOLLADA_WITH_ANIMATION_CLIP
-+#if WITH_OPENCOLLADA_ANIMATION_CLIP
- 	// Please enable this when building with Collada 1.6.65 or newer (also in DocumentImporter.cpp)
- 	bool writeAnimationClip(const COLLADAFW::AnimationClip *AnimationClip);
- #endif
---- blender-2.79b/source/blender/collada/DocumentImporter.cpp.orig	2020-07-23 18:00:13.896584741 +0200
-+++ blender-2.79b/source/blender/collada/DocumentImporter.cpp	2020-07-23 18:00:52.486277028 +0200
-@@ -1349,5 +1349,5 @@
- 
--#if OPENCOLLADA_WITH_ANIMATION_CLIP
-+#if WITH_OPENCOLLADA_ANIMATION_CLIP
- // Since opencollada 1.6.68
- // called on post-process stage after writeVisualScenes
- bool DocumentImporter::writeAnimationClip(const COLLADAFW::AnimationClip *AnimationClip)
diff --git a/media-gfx/blender/files/blender-2.79b-gcc-8.patch b/media-gfx/blender/files/blender-2.79b-gcc-8.patch
deleted file mode 100644
index 3a64ad2f796d..000000000000
--- a/media-gfx/blender/files/blender-2.79b-gcc-8.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- blender-2.79b-orig/intern/cycles/util/util_sseb.h	2018-03-24 02:22:25.000000000 +1100
-+++ blender-2.79b/intern/cycles/util/util_sseb.h	2018-05-30 20:43:33.888717930 +1000
-@@ -116,7 +116,7 @@
- __forceinline const sseb unpackhi( const sseb& a, const sseb& b ) { return _mm_unpackhi_ps(a, b); }
- 
- template<size_t i0, size_t i1, size_t i2, size_t i3> __forceinline const sseb shuffle( const sseb& a ) {
--	return _mm_shuffle_epi32(a, _MM_SHUFFLE(i3, i2, i1, i0));
-+	return _mm_castsi128_ps(_mm_shuffle_epi32(a, _MM_SHUFFLE(i3, i2, i1, i0)));
- }
- 
- template<> __forceinline const sseb shuffle<0, 1, 0, 1>( const sseb& a ) {
---- blender-2.79b-orig/intern/itasc/kdl/tree.hpp	2018-03-24 02:22:25.000000000 +1100
-+++ blender-2.79b/intern/itasc/kdl/tree.hpp	2018-05-30 20:33:52.045179988 +1000
-@@ -34,7 +34,7 @@
-     //Forward declaration
-     class TreeElement;
-     // Eigen allocator is needed for alignment of Eigen data types
--    typedef std::map<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<std::string, TreeElement> > > SegmentMap;
-+    typedef std::map<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<const std::string, TreeElement> > > SegmentMap;
- 
-     class TreeElement
-     {
diff --git a/media-gfx/blender/files/blender-fix-install-rules.patch b/media-gfx/blender/files/blender-fix-install-rules.patch
deleted file mode 100644
index e62aba814b9f..000000000000
--- a/media-gfx/blender/files/blender-fix-install-rules.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -purN a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
---- a/source/creator/CMakeLists.txt	2016-09-28 10:26:55.000000000 +0100
-+++ b/source/creator/CMakeLists.txt	2016-10-03 12:17:08.938928486 +0100
-@@ -328,12 +328,6 @@ endif()
- # Install Targets (Generic, All Platforms)
- 
- 
--# important to make a clean  install each time, else old scripts get loaded.
--install(
--	CODE
--	"file(REMOVE_RECURSE ${TARGETDIR_VER})"
--)
--
- if(WITH_PYTHON)
- 	# install(CODE "message(\"copying blender scripts...\")")
- 	
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index 2432483fedd4..0dff6db1f81c 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -48,9 +48,6 @@
 		<flag name="elbeem">
 			Adds surface fluid simulation to Blender using El'Beem library.
 		</flag>
-		<flag name="game-engine">
-			Adds Game Engine support to Blender.
-		</flag>
 		<flag name="headless">
 			Build without graphical support (renderfarm, server mode only).
 		</flag>
@@ -77,9 +74,6 @@
 		<flag name="osl">
 			Add support for OpenShadingLanguage scripting.
 		</flag>
-		<flag name="player">
-			Build the Blender Player. THis requires the Game engine.
-		</flag>
 		<flag name="standalone">
 			Build the standalone version of Cycles.
 		</flag>
diff --git a/media-gfx/cairosvg/Manifest b/media-gfx/cairosvg/Manifest
index da9457bcdc45..6c31df9f7c6c 100644
--- a/media-gfx/cairosvg/Manifest
+++ b/media-gfx/cairosvg/Manifest
@@ -1,3 +1,5 @@
 DIST CairoSVG-2.4.2.tar.gz 38715 BLAKE2B 3c8f77561e13e0fdec371a601f09f0d107f972955c8e8fbc34f5092a7ff5f65b24338c20ae8e21b428eea083925a36b3e5635a9b0010c569d013169d919b7a35 SHA512 0d6dd22d9569fd3849cf7f6594c86bed719169dac1f0f3219e88d82f9d245bf29d51715159085cb26c0340c8f0dcb88412d141ec0ee3710b1477626f5a578441
+DIST CairoSVG-2.5.0.tar.gz 40481 BLAKE2B d177570710f54a7d64446de81a700a6ebe5dd475ab75e268575ee2d3a45cb1da14a349d6a5516ef965191093f12ba916a1919fe115fa4b6e4dc0f9a22657946b SHA512 9387273a5531f2e055871d3ccc3b770a46e549dceb443d9d7dbf3635f44da4a752f06ece2f86582f57eac08d59d78f833e1ed2e7badea340d5a0f1eb31beb24c
 EBUILD cairosvg-2.4.2.ebuild 872 BLAKE2B 4f326bdcaa5571e152cd438654fa0ffe4f9aa9465f0e88dce89f00c683506e932fd58fcd075d75f94f634e33d152c8b14a8dbdd8b467e087a6eb2c38d654a0fd SHA512 8bb35201de54b9f633516fa768925ac9b77245a8f8a89ddfea5ed12f01cf0ce57bb39deb24d3b3c11d8c0a59ace7fee30292b2ea175c29f88476e777b43935cf
+EBUILD cairosvg-2.5.0.ebuild 873 BLAKE2B 14c9f7bc21c36ccfa7c8af5dfc202a8c224022f6c1fa8e9097776ceb5a04cbf9039d80fffbf614d45fd220beec61b0dd9a3bf704454ce5a69ad0061bfb75d18a SHA512 2f97dcf15a076d968296625cd1af14d0781f7f9bd18197aeb9910e88572dd5d6ea5f74d9f3c94180a6fe40b93c1a1b9d846c439c08131f737fc9c50659bf9c63
 MISC metadata.xml 328 BLAKE2B 168e60e4dbd12e2b99ba4ad8a6f8f42ef5a4de12f8f1edc68ba4d1d4252b24995da5d0e4ef9e1db09b3934ba42b042685db625439425a6e98cde2f52050c4af1 SHA512 ebb7d9d27e014fd083d0abe9508040730f980ba8a0bc89670ee5418af2c3af036d0ec16b5607a8805944d3b7eeb835e8806ab059fed68c52268df1cd10d7bbb0
diff --git a/media-gfx/cairosvg/cairosvg-2.5.0.ebuild b/media-gfx/cairosvg/cairosvg-2.5.0.ebuild
new file mode 100644
index 000000000000..a0513821d46b
--- /dev/null
+++ b/media-gfx/cairosvg/cairosvg-2.5.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..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
+	distutils-r1_src_prepare
+}
diff --git a/media-gfx/cellwriter/Manifest b/media-gfx/cellwriter/Manifest
index 3a09f526d158..5d6ba29366b1 100644
--- a/media-gfx/cellwriter/Manifest
+++ b/media-gfx/cellwriter/Manifest
@@ -1,5 +1,6 @@
+AUX cellwriter-1.3.6-fno-common.patch 701 BLAKE2B 9e7dd63b7cda6089c49a9c1b22d0486c082a8a06fe8cb4fe0446c19590914778d2e3ff303e24678858f05ab5569d774f3a0e53c43571786f512500e3073ac964 SHA512 8b852daa731a75edd858faf4ab7a6dc91351f440abdad27b555fdd7cd8d41383fc0bf4ea7f5a34769864370b4641f8ebba926ab9547e5899c6ed2e2250c8f5e4
 DIST cellwriter-1.3.5.tar.gz 293241 BLAKE2B 57d287782af21ae8010dc43ea89a2da081ecee854740cd8c5991de62450929a89f04c1601ff77ac69b945d5997042c8f739defa00614aa0af947655d5251f8ef SHA512 a9b682babda4335ea18716032ac52e73578459e9ab8866b20177f6d0cb606b9da2bf5a3fae2e2547277351db2533c7e92461f5c6a6ebc542ffe5844ff7ae65d6
 DIST cellwriter-1.3.6.tar.gz 434211 BLAKE2B 2734ee3a7e61f626d253613513675a4f3819724d9f9110af08ff4809f7abe68cb897815f5dc74d686ea6e016453117bc4869fd89ef4396446ea2de830cc9ec7f SHA512 0d564b03454a440e27c72323a4dd7943d6f1c84d1ed2db172ca999f62fdafed599559f9a6dff9df5f37820d489bd7ae2c6dd9a91965e308fcb1d1722bce543fa
 EBUILD cellwriter-1.3.5.ebuild 721 BLAKE2B 808b942a5569059c05b3dec134498a4820aae5465a50c292e6853d09169ba508f0caba59c1d6cb8977bec06f9bdc0ba468c998b6e2e19511282840bbf32a3143 SHA512 170049250eb87307cde5583a8a4452c014e208d460758a8b6b0d61472c7ac9f9a97d34b0385d65061ce4857df56b7637a68bb8999911914ebac76d0025e12b53
-EBUILD cellwriter-1.3.6.ebuild 712 BLAKE2B 7b16b1f30f4a619e1c00b00982fe6a4332b1191a7e5f7d3dc98c146462d88c7875028a71c96d65ea51f87e6cc8cf54c85c84a8051f8895b8792b85ff8e56607b SHA512 5506c4754e9d89ebc86c06b6501512114aecca2f9e2ed82c14450789a36727ea2a83f10909cc5e7d3be07faff4786866f3ed1abbc15e72d0054a6a3ba9948c3e
+EBUILD cellwriter-1.3.6.ebuild 677 BLAKE2B 5aa89d739afef7eafa8ce956cd5fa4674e2634a14074d3f993f6c0ec9ead607bb514b405f1984a7b14a36b930dfd98b386655748706d13e5e42fa5a11edaeb22 SHA512 34ac5fc7e7d959c08b4b782469046c0bdc9ca049b5291a7b72acaabb2120b6efd95eb79f17a1f69ae04e1b83f5a817cedf81b7d286a5a716e851d636a23d820b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/cellwriter/cellwriter-1.3.6.ebuild b/media-gfx/cellwriter/cellwriter-1.3.6.ebuild
index 467dc084c967..abed385e2f83 100644
--- a/media-gfx/cellwriter/cellwriter-1.3.6.ebuild
+++ b/media-gfx/cellwriter/cellwriter-1.3.6.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-inherit xdg-utils
+EAPI=7
+
+inherit xdg
 
 DESCRIPTION="Grid-entry natural handwriting input panel"
 HOMEPAGE="http://risujin.org/cellwriter/"
@@ -10,23 +11,23 @@ SRC_URI="https://github.com/risujin/cellwriter/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
+KEYWORDS="amd64 ppc x86"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="x11-libs/gtk+:2
 	x11-libs/libX11
 	x11-libs/libXtst"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	x11-base/xorg-proto"
 
 DOCS="AUTHORS ChangeLog README TODO" # NEWS is no-op
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.6-fno-common.patch"
+)
+
 src_prepare() {
 	default
 
 	sed -i -e '/Encoding/d' ${PN}.desktop || die
 }
-
-pkg_postinst() { xdg_icon_cache_update; }
-pkg_postrm() { xdg_icon_cache_update; }
diff --git a/media-gfx/cellwriter/files/cellwriter-1.3.6-fno-common.patch b/media-gfx/cellwriter/files/cellwriter-1.3.6-fno-common.patch
new file mode 100644
index 000000000000..54f035339720
--- /dev/null
+++ b/media-gfx/cellwriter/files/cellwriter-1.3.6-fno-common.patch
@@ -0,0 +1,25 @@
+https://sources.debian.org/patches/cellwriter/1.3.6-2/fix_ftbfs.patch/
+https://bugs.gentoo.org/707182
+--- a/src/options.c
++++ b/src/options.c
+@@ -26,9 +26,6 @@ Foundation, Inc., 51 Franklin Street, Fi
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-/* preprocess.c */
+-int ignore_stroke_dir, ignore_stroke_num;
+-
+ /* cellwidget.c */
+ extern int cell_width, cell_height, cell_cols_pref, cell_rows_pref,
+            train_on_input, right_to_left, keyboard_enabled, xinput_enabled;
+--- a/src/recognize.c
++++ b/src/recognize.c
+@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fi
+ #include "recognize.h"
+ 
+ /* preprocess.c */
+-int prep_examined;
++extern int prep_examined;
+ 
+ void engine_prep(void);
+ 
diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest
index 5d1461923ee1..b77a76a93e47 100644
--- a/media-gfx/chafa/Manifest
+++ b/media-gfx/chafa/Manifest
@@ -1,5 +1,3 @@
-DIST chafa-1.4.0.tar.xz 388932 BLAKE2B 0ccaae1495bd410b05d291ebcf2b6266374f013536ec1b953d6127e63c20b11ff78e96772309caeb5c4bbfc40729f60291b0ab3d2395824801aec7763c1ac2b3 SHA512 e464750296db0eca5d718ff70dbb51529abcd4ff3d5bdd15f20f10ff0207f282e8b59799476fc05718efb48b81b331ae1518d450efd6b62b98a41049e1c6e9d5
 DIST chafa-1.4.1.tar.xz 389428 BLAKE2B 8ed6c6d57953d784763f10c274bd8b7acf7857b095bae58c476d2e17418a7112f1ec000d667eebfc2eda712c9588e686ad4021da017f4d187a5461c0435c5476 SHA512 f0bd1911fd544f93afadbb2105f151dc77e31a2f3af4c7f8441a06f547a7ebe0674664721b18c3a35a7c4e745dda666713adc1dfbe5e97dfdc54856a13bd5063
-EBUILD chafa-1.4.0.ebuild 862 BLAKE2B 934006cdbe8cb31ce8368470f5c6176dc072565daf8bf10501a2f61e213ab0fabbffc57226e178ddd67c5e0f027e55134658c9559ebb74b68cdc1422aaaae07b SHA512 2d852cd464a12bb6390af4e8f2ea75a46203f3f681d1b58ecee4dcc744280fabef5e12bc7949cb1b7c0cbac66ea26384c7025e76e1eec2e5eca7c06dd8de9291
 EBUILD chafa-1.4.1.ebuild 866 BLAKE2B 24e4c50c2a29e9f3d5451f7b4ec9f4cc176dec6a2b5d4636e8de26e72f514b358957f78946ba0cd9cd9bde26d3c73c6677cac957d8db82733c45ba51e34c7165 SHA512 179ac5f28de859623651bfc30539d2242c2aeb949fd6398dd809a65ca7d4df80430dc1af7d2004f1a8852231d4666da29ed2ea3b404a9e43eb87a3055fd359a3
 MISC metadata.xml 516 BLAKE2B ef0a2e140a6d37d3ace556ac5a6d299caa1fae8e37d93fe8aa43104a2f02d14fd4b5ed1bd218b2298616bcbc3c571868cc7e04d0a5f3ac2b091fa5588d833cbb SHA512 57bebde0a948ed0269c4decdf2b6ac8064f90dde344c547a67cbb40191eb3fb444b147ed8122ad79ba1acb487fc93ca1fb33afb5df80a41c7128e314ac4640ac
diff --git a/media-gfx/chafa/chafa-1.4.0.ebuild b/media-gfx/chafa/chafa-1.4.0.ebuild
deleted file mode 100644
index 1a2aba138914..000000000000
--- a/media-gfx/chafa/chafa-1.4.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="versatile and fast Unicode/ASCII/ANSI graphics renderer"
-HOMEPAGE="https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa"
-SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs +tools"
-
-RDEPEND="
-	dev-libs/glib:2
-	media-gfx/imagemagick:0=
-	tools? ( >=media-libs/freetype-2.0.0 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	local econfargs=(
-		$(use_enable static-libs static)
-		# install manpage manually
-		--disable-man
-		$(use_with tools)
-	)
-
-	econf "${econfargs[@]}"
-}
-
-src_install() {
-	local DOCS=( AUTHORS NEWS README TODO )
-	default
-
-	use tools && doman docs/chafa.1
-
-	find "${ED}"/usr/lib* -name '*.la' -delete || die
-}
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 2d612ef0dde1..4e69e15b3e5b 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,14 +1,7 @@
-AUX cura-3.3.0-fix-install-paths.patch 1663 BLAKE2B 293bdecb0e6ef130e80bc078f89470908bdc74f9ede901405e8b99953dc5927986d51db3f3494004c44ea543621328c24860ff3ab0c1ff4452d2347f082a53fb SHA512 0c42638c0f0f0cc108c0aec19b0319037c4a17ac4fc6d05920191a927ee32ea4901ca4cb2ae5473c3ded2afbcabd2cad55b6cbaf3ad986ad205fc22936c31fa2
-AUX cura-4.2.1-fix-install-paths.patch 1824 BLAKE2B 423ee2da55c69fa7fda2d93931f00460f16f5539dcf22e0db93210a90be533a1dfa7dabc4ae787bb404ff7ca38c7b4fdb0113cdfdf0f20a2f7907bfcb827dbcf SHA512 d88923ae9baef2889b952f6fe85e312890390228afb8ab27edab5e0abac48eba57b5a78ae0a913c96bf420fcc9f98a5281ede19c0d23d784104c85715d6bb7aa
 AUX cura-4.6.1-fix-install-paths.patch 1478 BLAKE2B 177cd0d14fdecd0da4da0cbc4d1ff86082adbc4182c3789dd9d4ec056ab76b43d6ce7b48e027c5fc5d7b1684a15e310101361e6896fa980cd3370b1d2f2860c5 SHA512 4ddf154f398b9d285fb51e9255a7dd5d10caef0a1980bcf3f37c231d1c3c91433cfa9d351b7c96404364db1924f1fed63a98e8f317eef6905fd14e96171af3b0
-DIST cura-3.4.1.tar.gz 21720836 BLAKE2B 228ad51d189f83d2a34c2af7a6edcbe468bc32ee6ac012141eac1b7332046790e2e85c4e643c1ebb13ceded6024cd52aeab2bcd0db555db8f355a7b568bed728 SHA512 5d1935c923173a5ea6d3a95181d61c8deffbb51f3ee4f3e4cb2c5a58f79581d3dd9adc6a9583e6ca0ab5da4c36b63695d7479e67d1237c132354616aa990e3c1
-DIST cura-3.6.0.tar.gz 23388945 BLAKE2B bd2f2e688306e7ef060141abae22c858e9fbb9385e49110079b48e69955c3f6630f8f69ad67fdf2d9e5c1ac0c969cd2d2f416642fc61a63867f79f88985c5c86 SHA512 b56e5575cb0eb15d759999dcd2f4c33873a0a57805a8ba0ec7860811a2137658a656216c969c6e3316d65fbd5e43f2def10a6385ccbf4fc306d15098569ef279
-DIST cura-4.2.1.tar.gz 29288696 BLAKE2B 1332030e63d7056dcb8dd680208b0da8dd33e5c7809957779849bac808fccad9a222505ddbe80d4071474d10ace842aa4459f14560198a9f3eebb5be53f923e1 SHA512 4f47f3f5597d1a56d88207eacacece49edb766c75ae18ddc9fb8689b76c16fd4decc9c8af7cab485aac3c9cffe13095aaad34e1c60634249ae2923ead771ac52
-DIST cura-4.3.0.tar.gz 30433646 BLAKE2B 8490d703cfd4ad07fd5b30d5f776d978baa17ad8751dad53870714596998becebc85cc2fe49fa05eab37b95106315ace97eaa0bbed65b488b522ebbbcba488dc SHA512 3f4ae11e4e28b151e9587c197f814bc97bc225fb2819f4dabaab392ef9896bb119d6fab0df48c9eb4a390a815815d27045eefa933e2e4a9d53331db8d79ea815
 DIST cura-4.6.1.tar.gz 36080329 BLAKE2B 5d86734334a2c65afd62eea6b3324b0fc543670b48f5410eac16561590706feed2320c45b22e60c9835973f965a00f222280441daf44866ffc93ebcf1295c750 SHA512 8802993a98e75428d11bfdc7721d5d48e8939ef1c783789db2941cb40b6fc8014eacbdea09c559c6d68cb1dd99def15bfb503d5c164f057a384c8a7620b15dc2
-EBUILD cura-3.4.1.ebuild 1735 BLAKE2B 407f2d1a162ad50c3e571d3b6809523a93b0d9a49866bb10630d2ca0a13e9bc1769a6fb901c6ee60c9eb9ad36f1a851969969dfe54a805c2641e45b871b65432 SHA512 4d3679148889f8cfcf086adbc957648adfeaf622839d6db3401a694c4932d72e8589c4a6958f614b6954c5163c13b651745233261afb452219adbc3ed92f624e
-EBUILD cura-3.6.0.ebuild 1735 BLAKE2B 407f2d1a162ad50c3e571d3b6809523a93b0d9a49866bb10630d2ca0a13e9bc1769a6fb901c6ee60c9eb9ad36f1a851969969dfe54a805c2641e45b871b65432 SHA512 4d3679148889f8cfcf086adbc957648adfeaf622839d6db3401a694c4932d72e8589c4a6958f614b6954c5163c13b651745233261afb452219adbc3ed92f624e
-EBUILD cura-4.2.1.ebuild 1421 BLAKE2B 89456bb773708bb3b455143fe11d97e36bf8e88a843ef5b00027de8150fb2d770cd7294878fcb46b3296cd5b16f7da751ec92c865302ca487e27655c12c37751 SHA512 56166afc68952e79a7900ce4c4330b6ce84d34ac55204ab0b6a08a2122366f4ad1fe7404cfa803ab019339d652f810776ce7dd33bf9bb89dfc0738b8308b3208
-EBUILD cura-4.3.0-r1.ebuild 1421 BLAKE2B 89456bb773708bb3b455143fe11d97e36bf8e88a843ef5b00027de8150fb2d770cd7294878fcb46b3296cd5b16f7da751ec92c865302ca487e27655c12c37751 SHA512 56166afc68952e79a7900ce4c4330b6ce84d34ac55204ab0b6a08a2122366f4ad1fe7404cfa803ab019339d652f810776ce7dd33bf9bb89dfc0738b8308b3208
-EBUILD cura-4.6.1.ebuild 1527 BLAKE2B 8f8b53c5c38fb3ba4e4ed1c59e284710b5bc11ff6689955d2f1631caf9a7a54e61c2e790808e26c8c8f5e6acab6cabf3544e8a89696b264f35c8c968a33fb809 SHA512 c93e8959b9d6591394b824ca8624a2b8226998584b14bff6912dad3b571659e95fbef0975a6d98336ce16fe59f19d738a1eafeacb245a08f9eebdc36e59d75c2
+DIST cura-4.7.0.tar.gz 29712949 BLAKE2B b208a669aa38b07012099fe01ec453232c2bd3007befe649a4fd4cb0a0b12473762a5069d09218a3f2fe865141bbb8c8b7d5a26168fed02900abb20d78b0ad3f SHA512 0b3383042b9c8cf2ce27caee95c365be786c9eb40898c74ea4e0fb903241087e48a6e908d85635a9e43cf21ca3623098c6fe980d0cec3fc6a59c01c9c9cb4d9d
+EBUILD cura-4.6.1-r1.ebuild 1555 BLAKE2B e85dd7c3db1b31a5a00b59786cb34ad397c009317df00685d4b1bfbbe8807e1dbb63fc0143b34c37dcdb328bb4918cfca20f4bd56cbefc2e8a208091dfd6fade SHA512 085dcb0e2548540af6aa8389016ea80576ff95cbf69412efebceec675e4d58d40785fb552fbbd9e5a9e862129241b86da34d9e6a46eff42cc37ce92af4eae46e
+EBUILD cura-4.7.0-r1.ebuild 1875 BLAKE2B 62d221c6fe448597843fedacc46ba5b9183f3afac3a56c12f890f8babf2a37b55617a8103236b696649d9f674cc332b7cfa1fdb4e360140d64e2ae693bf74418 SHA512 9e3b797621690107ecb38c5e1ab27fe2b8f5a904835d49e5712a3b6ea49f5f0d621913e8f9f857205499e185dfcbe85fdfbf3f7233cfb9e17e0427ee11a31000
+EBUILD cura-4.7.0.ebuild 1562 BLAKE2B 5013051eab23a054a73afda2d283a34ec352eaf5d7a738a1d851566fd95ab27d229b05613c4039598b42034ec5caa597356fc5b54e8fd62cb26d4155275d1e09 SHA512 76beb567cbff2cb0888b8c265c8f70856910600f4430b275f1ff5164da2150d559c72259ff177074a81190c7bdab3a15bc0bca8faf6d4daf7097d38bf47cae57
 MISC metadata.xml 924 BLAKE2B 98684c30170538865b264d21a025a558b66ef0f5b46dd4cc291dacd71367cf775135d66fc379bf6bf0edfacab6e33c939a750fdcc8f036cedb7d9daf5b442072 SHA512 b09e1e1251f3171721bea6ea7ace38beed877525b1a83282035bb34fa871123c0995674d899a486b3ff67ac34429cabc12f9e90ffd1b1e3f60257389a900e483
diff --git a/media-gfx/cura/cura-3.4.1.ebuild b/media-gfx/cura/cura-3.4.1.ebuild
deleted file mode 100644
index f1b275618c69..000000000000
--- a/media-gfx/cura/cura-3.4.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1
-
-MY_PN=Cura
-
-DESCRIPTION="A 3D model slicing application for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/Cura"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+usb zeroconf"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=media-gfx/curaengine-${PV:0:3}
-	>=media-gfx/fdm-materials-${PV:0:3}
-	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}]
-	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
-	>=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
-		zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
-	')"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-PATCHES=( "${FILESDIR}/${PN}-3.3.0-fix-install-paths.patch" )
-DOCS=( README.md )
-
-src_prepare() {
-	default
-	sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	doicon icons/*.png
-	python_optimize "${D}${get_libdir}"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/cura/cura-3.6.0.ebuild b/media-gfx/cura/cura-3.6.0.ebuild
deleted file mode 100644
index f1b275618c69..000000000000
--- a/media-gfx/cura/cura-3.6.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1
-
-MY_PN=Cura
-
-DESCRIPTION="A 3D model slicing application for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/Cura"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+usb zeroconf"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=media-gfx/curaengine-${PV:0:3}
-	>=media-gfx/fdm-materials-${PV:0:3}
-	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}]
-	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
-	>=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
-		zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
-	')"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-PATCHES=( "${FILESDIR}/${PN}-3.3.0-fix-install-paths.patch" )
-DOCS=( README.md )
-
-src_prepare() {
-	default
-	sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	doicon icons/*.png
-	python_optimize "${D}${get_libdir}"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/cura/cura-4.3.0-r1.ebuild b/media-gfx/cura/cura-4.3.0-r1.ebuild
deleted file mode 100644
index d72614d316d0..000000000000
--- a/media-gfx/cura/cura-4.3.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit cmake desktop python-single-r1 xdg
-
-MY_PN=Cura
-
-DESCRIPTION="A 3D model slicing application for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/Cura"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+usb zeroconf"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="sys-devel/gettext"
-RDEPEND="${PYTHON_DEPS}
-	>=media-gfx/curaengine-${PV:0:3}
-	>=media-gfx/fdm-materials-${PV:0:3}
-	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}]
-	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
-	>=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
-		zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
-	')"
-
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-PATCHES=( "${FILESDIR}/${PN}-4.2.1-fix-install-paths.patch" )
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	doicon icons/*.png
-	python_optimize "${D}${get_libdir}"
-}
diff --git a/media-gfx/cura/cura-4.2.1.ebuild b/media-gfx/cura/cura-4.6.1-r1.ebuild
index d72614d316d0..74ad049667a8 100644
--- a/media-gfx/cura/cura-4.2.1.ebuild
+++ b/media-gfx/cura/cura-4.6.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit cmake desktop python-single-r1 xdg
 
 MY_PN=Cura
@@ -20,20 +20,22 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="sys-devel/gettext"
 RDEPEND="${PYTHON_DEPS}
-	>=media-gfx/curaengine-${PV:0:3}
-	>=media-gfx/fdm-materials-${PV:0:3}
-	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}]
-	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
-	>=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
+	~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+	~dev-libs/libcharon-${PV}[${PYTHON_SINGLE_USEDEP}]
+	~dev-libs/libsavitar-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+	~dev-python/uranium-${PV}[${PYTHON_SINGLE_USEDEP}]
+	~media-gfx/curaengine-${PV}
+	~media-gfx/fdm-materials-${PV}
 	$(python_gen_cond_dep '
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/sentry-sdk[${PYTHON_MULTI_USEDEP}]
 		usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
 		zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
 	')"
-
 DEPEND="${RDEPEND}"
 
 DOCS=( README.md )
-PATCHES=( "${FILESDIR}/${PN}-4.2.1-fix-install-paths.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.6.1-fix-install-paths.patch" )
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_prepare() {
diff --git a/media-gfx/cura/cura-4.7.0-r1.ebuild b/media-gfx/cura/cura-4.7.0-r1.ebuild
new file mode 100644
index 000000000000..36f6fd35e91d
--- /dev/null
+++ b/media-gfx/cura/cura-4.7.0-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{6..8})
+inherit cmake desktop python-single-r1 xdg
+
+MY_PN=Cura
+
+DESCRIPTION="A 3D model slicing application for 3D printing"
+HOMEPAGE="https://github.com/Ultimaker/Cura"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+usb zeroconf"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="sys-devel/gettext"
+RDEPEND="${PYTHON_DEPS}
+	~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+	~dev-libs/libcharon-${PV}[${PYTHON_SINGLE_USEDEP}]
+	~dev-libs/libsavitar-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+	~dev-python/uranium-${PV}[${PYTHON_SINGLE_USEDEP}]
+	~media-gfx/curaengine-${PV}
+	~media-gfx/fdm-materials-${PV}
+	$(python_gen_cond_dep '
+			dev-python/mypy[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
+			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+			dev-python/sentry-sdk[${PYTHON_MULTI_USEDEP}]
+			sci-libs/shapely[${PYTHON_MULTI_USEDEP}]
+			usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
+			zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
+	')"
+DEPEND="${RDEPEND}"
+
+DOCS=(README.md)
+PATCHES=("${FILESDIR}/${PN}-4.6.1-fix-install-paths.patch")
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	sed -i -e "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	# trimesh not available in portage
+	local mycmakeargs=(
+		-DCURA_NO_INSTALL_PLUGINS="AMFReader;Toolbox;TrimeshReader"
+		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	doicon icons/*.png
+	python_fix_shebang "${D}/usr/bin/cura"
+	python_optimize "${D}${get_libdir}"
+}
diff --git a/media-gfx/cura/cura-4.6.1.ebuild b/media-gfx/cura/cura-4.7.0.ebuild
index bbd5d0b29de1..4264d19b6a62 100644
--- a/media-gfx/cura/cura-4.6.1.ebuild
+++ b/media-gfx/cura/cura-4.7.0.ebuild
@@ -20,11 +20,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="sys-devel/gettext"
 RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
-	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}]
-	>=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
-	>=media-gfx/curaengine-${PV:0:3}
-	>=media-gfx/fdm-materials-${PV:0:3}
+	~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+	~dev-libs/libcharon-${PV}[${PYTHON_SINGLE_USEDEP}]
+	~dev-libs/libsavitar-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+	~dev-python/uranium-${PV}[${PYTHON_SINGLE_USEDEP}]
+	~media-gfx/curaengine-${PV}
+	~media-gfx/fdm-materials-${PV}
 	$(python_gen_cond_dep '
 		dev-python/requests[${PYTHON_MULTI_USEDEP}]
 		dev-python/sentry-sdk[${PYTHON_MULTI_USEDEP}]
diff --git a/media-gfx/cura/files/cura-3.3.0-fix-install-paths.patch b/media-gfx/cura/files/cura-3.3.0-fix-install-paths.patch
deleted file mode 100644
index 066f9148c4d9..000000000000
--- a/media-gfx/cura/files/cura-3.3.0-fix-install-paths.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- Cura-3.1.0-orig/CMakeLists.txt  2017-12-04 18:05:38.000000000 +0200
-+++ Cura-3.1.0/CMakeLists.txt   2017-12-29 18:11:19.508034087 +0200
-@@ -36,10 +36,20 @@
- 
- find_package(PythonInterp 3.5.0 REQUIRED)
- 
-+if(NOT PYTHON_SITE_PACKAGES_DIR)
-+   if(APPLE OR WIN32)
-+       set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-+           CACHE STRING "Directory to install Python bindings to")
-+   else()
-+       set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages
-+           CACHE STRING "Directory to install Python bindings to")
-+   endif()
-+endif()
-+
- install(DIRECTORY resources
-         DESTINATION ${CMAKE_INSTALL_DATADIR}/cura)
- install(DIRECTORY plugins
--        DESTINATION lib${LIB_SUFFIX}/cura)
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cura)
- if(NOT APPLE AND NOT WIN32)
-     install(FILES cura_app.py
-             DESTINATION ${CMAKE_INSTALL_BINDIR}
-@@ -53,10 +63,10 @@
-             DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}/dist-packages/cura)
-     else()
-         install(DIRECTORY cura
--            DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-+            DESTINATION ${PYTHON_SITE_PACKAGES_DIR}
-             FILES_MATCHING PATTERN *.py)
-         install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py
--            DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/cura)
-+            DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura)
-     endif()
-     install(FILES ${CMAKE_BINARY_DIR}/cura.desktop
-             DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
diff --git a/media-gfx/cura/files/cura-4.2.1-fix-install-paths.patch b/media-gfx/cura/files/cura-4.2.1-fix-install-paths.patch
deleted file mode 100644
index fc10d727d130..000000000000
--- a/media-gfx/cura/files/cura-4.2.1-fix-install-paths.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -urN Cura-4.2.1-orig/CMakeLists.txt Cura-4.2.1/CMakeLists.txt
---- Cura-4.2.1-orig/CMakeLists.txt	2019-07-31 15:34:07.000000000 +0300
-+++ Cura-4.2.1/CMakeLists.txt	2019-08-04 18:39:24.106917187 +0300
-@@ -47,6 +47,15 @@
-     find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
- endif()
- 
-+if(NOT PYTHON_SITE_PACKAGES_DIR)
-+   if(APPLE OR WIN32)
-+       set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-+           CACHE STRING "Directory to install Python bindings to")
-+   else()
-+       set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages
-+           CACHE STRING "Directory to install Python bindings to")
-+   endif()
-+endif()
- 
- if(NOT ${URANIUM_DIR} STREQUAL "")
-     set(CMAKE_MODULE_PATH "${URANIUM_DIR}/cmake")
-@@ -64,7 +73,7 @@
- install(DIRECTORY resources
-         DESTINATION ${CMAKE_INSTALL_DATADIR}/cura)
- install(DIRECTORY plugins
--        DESTINATION lib${LIB_SUFFIX}/cura)
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cura)
- 
- if(NOT APPLE AND NOT WIN32)
-     install(FILES cura_app.py
-@@ -79,10 +88,10 @@
-             DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}/dist-packages/cura)
-     else()
-         install(DIRECTORY cura
--            DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages
-+            DESTINATION ${PYTHON_SITE_PACKAGES_DIR}
-             FILES_MATCHING PATTERN *.py)
-         install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py
--            DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages/cura)
-+            DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura)
-     endif()
-     install(FILES ${CMAKE_BINARY_DIR}/cura.desktop
-             DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest
index 00c0f3254f8e..58fb1d65cf9f 100644
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@@ -1,14 +1,6 @@
 AUX curaengine-4.7.0-fix-tests.patch 359 BLAKE2B a84af3a8b47f2bca74f8aa3bc774a55719fc642048edca310dea0568fddff6cc90269f1711006c26dcca2b64d997a34858442fd674bc99b03aeffcafb93820bd SHA512 9ef48243ada474e2639cbf804be381ac1dabfd656ac58a2a296265b3d16bf416a867147a2f7415256bb0af14ff994e5eeb2e42e61a6f36afa29f7a96bc7ad0e0
-DIST curaengine-3.4.1.tar.gz 949312 BLAKE2B 4902575c40002ab49e3ef13c94c8531b6975ff62e58012dc48744e2d27e9d1767e8f7768250179a374ed24da5a5e2085e9c194068ad6ffb98fff0595a314f7b0 SHA512 51c75e299ef7728101a4c61aa033c9b07112b0955d2ec72ba6173684513ed3c503a744fab487efe2c19da01eb97bd1297b5b8724b4f767639c8e82eefcdd01be
-DIST curaengine-3.6.0.tar.gz 1390109 BLAKE2B a0a6b8016bb5fa2f772634a671fc391df45875fc36cdf100f00ce34b9d5495f32986c473b1ba4c184cb77e50a64e2648c5d4f31053790182e657b0c981e1412c SHA512 340dad4c697fb0d7b633091715a904ae7df8973626e217ae2528d0121723c07a6cf0bbc740b9ad9980f3b288fa690c9c3ee43d90914264855dace007bbb334c8
-DIST curaengine-4.2.0.tar.gz 1654657 BLAKE2B c11f77a126e49c1c63550accd42c3616ab647d2575de0f11e64cb2188e7c565a54f3613e296c3f19e8534a7a758162fe29cdd62e8d62d691a7d9c9e6430545ce SHA512 6c3edac5a21068b50a31d3ab37dac58b986e18be2d24711d77cf210da62b521d62dc92a1b4e8865a26e5c394119349f03b3816d19d67ebee670424cc4a7b2500
-DIST curaengine-4.3.0.tar.gz 1656780 BLAKE2B 9b93e3f294a8a67c2cd4f2d4462a4047e6860e0c391e7ff550b24c498faa82fd2af4fd044845f00f93fb01d38ca3fa1511bfe65a7456b5a6e0b919821be5ab8f SHA512 60ca0ce586c0cf5f1516f803b2a05a20299ef8193f065acd6e11a0054903189225f9c60be1b536ffe5a9a22652097acd3a4aae2833920a468071b78f213f7572
 DIST curaengine-4.6.1.tar.gz 1685119 BLAKE2B 352c5b4b98866ebe6f90dc095960d2417ccf9c023334b4006b604da45aed1e3b6066700b08be3727214433fd505de87cad4da8e17d9067571d91dd0ec7660ebe SHA512 8b3a65fb00bebc37acd24a6d4277c1f09849c0318fca00867479d62c0f64b8628064a898128e1ffc5fb99eed2c1d45a310df2f97fde9c37a9ccc311f5ba4d057
 DIST curaengine-4.7.0.tar.gz 1684860 BLAKE2B da25da5656eb2c2d9cd9bd1c8ea0f633284a6d300f2b5ab7a916be262d20106d07a17a5c5ac63b854b32e98f616ecadbc05a912146f4f6d396c646ca69637116 SHA512 4c5f2eb70912315595e7f090ba9a34196ecb740eb25b5b2da2decf6485260999e8a87f7c2619c6efab9b46280e9eecf11f7e6bb021359c3b72da9fb900b0c1c3
-EBUILD curaengine-3.4.1.ebuild 902 BLAKE2B 5216cfc20c7b68f326828fcab00d1d116dc6ad3f2f4a5b158d6e22a91b4cd7a5081bdaed05ab9fb18c8d135460f1396c0559a1edaecc3c6c94e143e876d6ed0d SHA512 dd985e6460373739dd368b5fb31c35f3fce4a403d64f77db968e32a0186eb1ad0a723b71ea7c67e7d71581012c529bff023ba7ff49e5324883c30b970a55a71d
-EBUILD curaengine-3.6.0.ebuild 902 BLAKE2B 5216cfc20c7b68f326828fcab00d1d116dc6ad3f2f4a5b158d6e22a91b4cd7a5081bdaed05ab9fb18c8d135460f1396c0559a1edaecc3c6c94e143e876d6ed0d SHA512 dd985e6460373739dd368b5fb31c35f3fce4a403d64f77db968e32a0186eb1ad0a723b71ea7c67e7d71581012c529bff023ba7ff49e5324883c30b970a55a71d
-EBUILD curaengine-4.2.0.ebuild 1513 BLAKE2B 51f109e8db08e5e3d0caccc1016628e6570dfab14f30a5b061bc25cf2edff0516bc50409271f26e592f9223d775d4fbce66d8b48b6cdbb914e3115208d7b2a09 SHA512 78ca9ad1b1d59f3274021d57fe3e2d14b7225315e8eaea2179c656bfecb58e59384dcf520d4c5fe1d05af5dec21973cd8020af116eadd75969d1331d08d82d00
-EBUILD curaengine-4.3.0.ebuild 951 BLAKE2B 477593726cb519294f189d8175f04168582dd756de4c0a86cb254f750cf1c0736b9913365e81eb48fe821e5b2c771d1468e5a7cf3e36bae7339d0aa5310affcb SHA512 f5974e877bd0c885f2aa5856ad410b05a16029039ed87913ccb03adedd804b1cf474addb526a8f961902f45b231199b32db852bc8b78aace2b559342715a0686
 EBUILD curaengine-4.6.1.ebuild 955 BLAKE2B 733f85ddaec6e24923289023a83bba47c0f9fbd29be348ff0a338d39bdf8655255cddc54afe14d53600195c178169d3c1a83b26f25739884fee166498280596b SHA512 92d6924c086f4e8b022105d235467dce86d7f65466a9df97026f625eed054a6ec45f2901202c5cd70f5d11ddb9093de0632530e64e04957b1a86dea7eec3f569
 EBUILD curaengine-4.7.0.ebuild 2287 BLAKE2B edf6a643b44302269a589d8040ed39d54d26ef5a602f9d8d2e6a196e754f78b0e3e0f3439781f6b29afa39424642b57914b34538ccfc510f2de1a8291394a5c7 SHA512 5b83c30d7ace834f57ea23f3a963bfbbf407a46d87175181df73d1e367725eb0d1fed080204f90a352965ba83ce45c70ae81b7f6852bfd7cb70af525049893ed
 MISC metadata.xml 1468 BLAKE2B 7aec44b3b8d90adfa9c95365a7e299907fb0879c2358d5770b96b41f175d0d916e6786b25cc7a3b39f599d2a3e61a00cd4b3a0d039c95cd6e0fd122d2be54e4e SHA512 3ab874f2117073a17297234b29e95b70fe73ab90fbddcfe024586dc2b0b47af23998e0cc5ae271614be95f4c41fc2a9485f097ba3eefea0345d8d592d5e0f390
diff --git a/media-gfx/curaengine/curaengine-3.4.1.ebuild b/media-gfx/curaengine/curaengine-3.4.1.ebuild
deleted file mode 100644
index 4b6d43259726..000000000000
--- a/media-gfx/curaengine/curaengine-3.4.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-MY_PN="CuraEngine"
-
-DESCRIPTION="A 3D model slicing engine for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
-	~dev-libs/libarcus-${PV}:*
-	dev-libs/protobuf
-	dev-libs/stb"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-DOCS=( README.md )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
-	local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_make
-	if use doc; then
-		doxygen
-		mv docs/html . || die
-		find html -name '*.md5' -or -name '*.map' -delete || die
-		DOCS+=( html )
-	fi
-}
diff --git a/media-gfx/curaengine/curaengine-3.6.0.ebuild b/media-gfx/curaengine/curaengine-3.6.0.ebuild
deleted file mode 100644
index 4b6d43259726..000000000000
--- a/media-gfx/curaengine/curaengine-3.6.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-MY_PN="CuraEngine"
-
-DESCRIPTION="A 3D model slicing engine for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
-	~dev-libs/libarcus-${PV}:*
-	dev-libs/protobuf
-	dev-libs/stb"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-DOCS=( README.md )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
-	local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_make
-	if use doc; then
-		doxygen
-		mv docs/html . || die
-		find html -name '*.md5' -or -name '*.map' -delete || die
-		DOCS+=( html )
-	fi
-}
diff --git a/media-gfx/curaengine/curaengine-4.2.0.ebuild b/media-gfx/curaengine/curaengine-4.2.0.ebuild
deleted file mode 100644
index 812973727d59..000000000000
--- a/media-gfx/curaengine/curaengine-4.2.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs
-
-MY_PN="CuraEngine"
-
-DESCRIPTION="A 3D model slicing engine for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="|| ( <sys-devel/gcc-9 <sys-devel/clang-8 )
-	doc? ( app-doc/doxygen )"
-RDEPEND="${PYTHON_DEPS}
-	~dev-libs/libarcus-${PV}:*
-	dev-libs/protobuf
-	dev-libs/stb"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_pretend() {
-	if [[ $(tc-getCC) == clang ]] && [[ $(clang-major-version) -ge 8 ]]; then
-		eerror "Compilation with sys-devel/clang-8 or newer is not supported"
-		eerror "See https://github.com/Ultimaker/CuraEngine/issues/984 for more information"
-		eerror ""
-		die "Incompatible clang version found"
-	elif [[ $(gcc-major-version) -ge 9 ]]; then
-		eerror "Compilation with sys-devel/gcc-9 or newer is not supported"
-		eerror "See https://github.com/Ultimaker/CuraEngine/issues/984 for more information"
-		eerror ""
-		die "Incompatible gcc version found"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_build
-	if use doc; then
-		doxygen
-		mv docs/html . || die
-		find html -name '*.md5' -or -name '*.map' -delete || die
-		DOCS+=( html )
-	fi
-}
diff --git a/media-gfx/curaengine/curaengine-4.3.0.ebuild b/media-gfx/curaengine/curaengine-4.3.0.ebuild
deleted file mode 100644
index e0161146a043..000000000000
--- a/media-gfx/curaengine/curaengine-4.3.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs
-
-MY_PN="CuraEngine"
-
-DESCRIPTION="A 3D model slicing engine for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="|| ( sys-devel/gcc sys-devel/clang )
-	doc? ( app-doc/doxygen )"
-RDEPEND="${PYTHON_DEPS}
-	~dev-libs/libarcus-${PV}:*
-	dev-libs/protobuf
-	dev-libs/stb"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
-	local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_build
-	if use doc; then
-		doxygen || die
-		mv docs/html . || die
-		find html -name '*.md5' -or -name '*.map' -delete || die
-		DOCS+=( html )
-	fi
-}
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 195dac7b6e68..23078950aa0a 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -11,7 +11,8 @@ DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f450
 DIST darktable-usermanual-3.0.0.pdf 16237603 BLAKE2B ff5c24bb038deb37269a84389937740fa0ff77a9fb5bef4c484cdd903e39609588f632f577ce53c690d3abb832ace451d0d9d3f563ebdb6196ae8e2dac008a01 SHA512 2523b48e2baaa71561dc119340aed3bbf2ab4481dceb0c3ca2bbb7b0cacfaab894fa4eef82b667648cd7bb049304dbda09fa1a638f7734219b672b3ea8ee0eac
 EBUILD darktable-2.6.2.ebuild 3475 BLAKE2B 447c7330f1721443008a4794458d2365c5459a17e9257e4b2ae9a218824b78481ac66f37b230689035021d345908815135d71bfffad40e5c7d28bc7687cfcaa6 SHA512 23cf95b35f5445d7b21f13f11304e1eed211adb738d6d4389123b82596a77bcd8c8412b89c793d93fe1f6ab5dfde104618903ec35ab1e59a784eb7e43328362b
 EBUILD darktable-3.0.2.ebuild 3776 BLAKE2B 2148441c564365ed0cf732ca101f7ebbcfb99812bf01170164b8ebcd1d77dcc345ce08784fb3a9c2d8eefc27b9a410d449c45a5ce93449bb87295829156c4e2b SHA512 8cde8a2a1b6fbec34d918f5380068801be7b8cb4a8e8bc8d47bf51281c8f333aaefd63418769beec9b72efb8a9fac59422fe35ef570f25606a2d789e415f988e
-EBUILD darktable-3.2.1-r1.ebuild 3860 BLAKE2B b042040c6173334adbb6a9c62f11ee15a6cdbc5a79845b7f254774fa6ec91e2f08c99ed3a2300de63cc0efc14e8388e04cd87ab8cb9dee2e550f2e55ef43c9ed SHA512 89bb5a74cd8beb302de16732cc7a38da421762e3a3f004b35403ad9a2dccd7a6d1788f83216ac2b3e35d5ef4cdc7df055afc3647e8d9c928a3cc8bb050d10397
+EBUILD darktable-3.2.1-r1.ebuild 4250 BLAKE2B 6b29ac0b75ea866c64f8ee57ace0c85d315537f1df46b705b357b477528917f732e927cb14ce6465d5787b19e113030f62fac68cc1f0d42f626108cbb4ecf4ce SHA512 6f86a3688b660a76af91dd5124540af6333df5625b304f33b4fc3b0d668ea127592bdaf5b6b705420fef905b7e16dc09a9d130f3d96f4938f5a2ad9421147ce0
+EBUILD darktable-3.2.1-r2.ebuild 4128 BLAKE2B ce99fb9f3320b7f1dd9fe4b2fe9da5a8faf623bc8a77c10872ff54590a6da1c971a4c688ffb0c657f33e2bc11f47e55fec9269eaea99f3e6eb97d0ebe53d75fb SHA512 d55d5a17ff0e0122ac06eb970c238c824755b8e464b219b758203e2eeef849c185a6fd5535819d8f11514f16b4c8210491a5e86beac39232ad2e5536ddaaf23c
 EBUILD darktable-3.2.1.ebuild 3810 BLAKE2B edeaeaeb1d291965a30e95177c39716952572640aeb7dcd42d7ad153cbb4c46c7c9dbafc1961ab32d42863f5c0ada9214d40c9ac41e4eb6b6529863749036224 SHA512 a6427900ba11b3c9acd249c7e14383dd8525e01f8a1baead0a39af8ab75af801a223a4e7613cba341d9ae94ea4b3be9b2f5c24f1270b22cccad81846bada28a0
 EBUILD darktable-9999.ebuild 3314 BLAKE2B 6b768625082d82fe0cb4eb92b3a66cc6fc6d19d525bd25c9a00fc83e80336ea576e5dbd6b6133bffaf4f188d6ca5c6591793d12bec98af2a75e2c90217ad7485 SHA512 05b8dc06351cb42b9b10e906dfeaf595197c8bb398577384868550630e393d4bb8e3e6280b4249d4658f8ebefd0e7d8b013ca5a650251766e5efb12a460089e0
-MISC metadata.xml 967 BLAKE2B b87460be69114c3aa5b23813e4c9750fa03c748343142b880858fa26f9251ba6d9a427eb05d6a6ad16ced258dd5f4376f53f67e4b0345fd1d5bd26c064a8c5c5 SHA512 1ef671b139bbb1019380d0d84ab9a705c145def53186866aba6d2f48d0d1cc107bd1bb5a010706dbefcf7d46a9cbaf350dd85d55b609b8d5b8e2e1566197aa1f
+MISC metadata.xml 1214 BLAKE2B 1a3dfda02a96ea7115bd06b3bbcc7ffe283b4e0fb4a68bffa56aed7064c2f6584984f083e8fabae0af7e9a363a7d7fa528f53ae45e585060d005fe6bc6291ee8 SHA512 1e5cdbf0f8c8669c2fc8b6988beca291b73b8457442f005acada1856049f545302a4ceeacdbf9c7faa9658a9f28532dbe915a697b7576d87a8a3b9820b1cf9aa
diff --git a/media-gfx/darktable/darktable-3.2.1-r1.ebuild b/media-gfx/darktable/darktable-3.2.1-r1.ebuild
index adbe95a27f15..05d2a6634f26 100644
--- a/media-gfx/darktable/darktable-3.2.1-r1.ebuild
+++ b/media-gfx/darktable/darktable-3.2.1-r1.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-inherit cmake flag-o-matic toolchain-funcs xdg
+LUA_COMPAT=( lua5-3 )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
 
 DOC_PV="3.0.0"
 MY_PV="${PV/_/}"
@@ -16,12 +18,14 @@ SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_P
 
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 LANGS=" de es fr he it pl pt-BR ru sl"
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-	lto lua nls opencl openmp openexr tools webp
+	lto lua nls opencl openmp openexr system-lua tools webp
 	${LANGS// / l10n_}"
 
+REQUIRED_USE="system-lua? ( lua ${LUA_REQUIRED_USE} )"
+
 BDEPEND="
 	dev-util/intltool
 	virtual/pkgconfig
@@ -55,6 +59,7 @@ COMMON_DEPEND="
 	jpeg2k? ( media-libs/openjpeg:2= )
 	opencl? ( virtual/opencl )
 	openexr? ( media-libs/openexr:0= )
+	system-lua? ( ${LUA_DEPS} )
 	webp? ( media-libs/libwebp:0= )
 "
 DEPEND="${COMMON_DEPEND}
@@ -98,17 +103,21 @@ src_prepare() {
 }
 
 src_configure() {
-	# TODO: switch to system Lua once 5.3 has been unmasked
+	# As of darktable-3.2.1, AVIF support is not compatible with >=media-libs/libavif-0.8.0; see Bug #751352.
+	# GMIC support mostly works but there are several problems with the media-gfx/gmic ebuilds currently
+	# in the tree, and the package itself has got no maintainer.
 	local mycmakeargs=(
-		-DDONT_USE_INTERNAL_LUA=OFF
 		-DBUILD_CURVE_TOOLS=$(usex tools)
 		-DBUILD_NOISE_TOOLS=$(usex tools)
 		-DBUILD_PRINT=$(usex cups)
 		-DCUSTOM_CFLAGS=ON
+		-DDONT_USE_INTERNAL_LUA=$(usex system-lua)
 		-DRAWSPEED_ENABLE_LTO=$(usex lto)
+		-DUSE_AVIF=no
 		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
 		-DUSE_COLORD=$(usex colord)
 		-DUSE_FLICKR=$(usex flickr)
+		-DUSE_GMIC=no
 		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
 		-DUSE_KWALLET=$(usex kwallet)
 		-DUSE_LIBSECRET=$(usex gnome-keyring)
diff --git a/media-gfx/darktable/darktable-3.2.1-r2.ebuild b/media-gfx/darktable/darktable-3.2.1-r2.ebuild
new file mode 100644
index 000000000000..03bc356adc65
--- /dev/null
+++ b/media-gfx/darktable/darktable-3.2.1-r2.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-3 )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
+
+DOC_PV="3.0.0"
+MY_PV="${PV/_/}"
+MY_P="${P/_/.}"
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/"
+SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+	doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
+
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+LANGS=" de es fr he it pl pt-BR ru sl"
+IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
+	lto lua nls opencl openmp openexr system-lua tools webp
+	${LANGS// / l10n_}"
+
+REQUIRED_USE="system-lua? ( lua ${LUA_REQUIRED_USE} )"
+
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+COMMON_DEPEND="
+	dev-db/sqlite:3
+	dev-libs/json-glib
+	dev-libs/libxml2:2
+	>=dev-libs/pugixml-1.8:0=
+	gnome-base/librsvg:2
+	>=media-gfx/exiv2-0.25-r2:0=[xmp]
+	media-libs/lcms:2
+	>=media-libs/lensfun-0.2.3:0=
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	net-libs/libsoup:2.4
+	net-misc/curl
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/pango
+	colord? ( x11-libs/colord-gtk:0= )
+	cups? ( net-print/cups )
+	flickr? ( media-libs/flickcurl )
+	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	gmic? ( media-gfx/gmic )
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	gphoto2? ( media-libs/libgphoto2:= )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	system-lua? ( ${LUA_DEPS} )
+	webp? ( media-libs/libwebp:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	opencl? (
+		>=sys-devel/clang-4
+		>=sys-devel/llvm-4
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/"${PN}"-find-opencl-header.patch
+	"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
+	"${FILESDIR}"/${PN}-3.0.2_jsonschema-automagic.patch
+)
+
+S="${WORKDIR}/${P/_/~}"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# Bug #695658
+		if tc-is-gcc; then
+			test-flags-CC -floop-block &> /dev/null || \
+				die "Please switch to a gcc version built with USE=graphite"
+		fi
+
+		if use openmp ; then
+			tc-has-openmp || die "Please switch to an openmp compatible compiler"
+		fi
+	fi
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse3 && append-flags -msse3
+
+	sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# As of darktable-3.2.1, AVIF support is not compatible with >=media-libs/libavif-0.8.0; see Bug #751352.
+	local mycmakeargs=(
+		-DBUILD_CURVE_TOOLS=$(usex tools)
+		-DBUILD_NOISE_TOOLS=$(usex tools)
+		-DBUILD_PRINT=$(usex cups)
+		-DCUSTOM_CFLAGS=ON
+		-DDONT_USE_INTERNAL_LUA=$(usex system-lua)
+		-DRAWSPEED_ENABLE_LTO=$(usex lto)
+		-DUSE_AVIF=no
+		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
+		-DUSE_COLORD=$(usex colord)
+		-DUSE_FLICKR=$(usex flickr)
+		-DUSE_GMIC=$(usex gmic)
+		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DUSE_KWALLET=$(usex kwallet)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_LUA=$(usex lua)
+		-DUSE_MAP=$(usex geolocation)
+		-DUSE_NLS=$(usex nls)
+		-DUSE_OPENCL=$(usex opencl)
+		-DUSE_OPENEXR=$(usex openexr)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENMP=$(usex openmp)
+		-DUSE_WEBP=$(usex webp)
+	)
+	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
+
+	if use nls ; then
+		for lang in ${LANGS} ; do
+			if ! use l10n_${lang}; then
+				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog
+	elog "When updating a major version,"
+	elog "please bear in mind that your edits will be preserved during this process,"
+	elog "but it will not be possible to downgrade any more."
+	elog
+	ewarn "It will not be possible to downgrade!"
+	ewarn
+}
diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index 63e4e905d37f..f7f953454f3a 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -12,9 +12,11 @@
 	<use>
 		<flag name="flickr">Add support for uploading photos to flickr</flag>
 		<flag name="geolocation">Enable geotagging support</flag>
+		<flag name="gmic">Use the G'MIC image-processing framework (<pkg>media-gfx/gmic</pkg>), e.g. to support Colour LUTs compressed using their compression scheme</flag>
 		<flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
 		<flag name="lto">Enable link-time optimisations in the RawSpeed library</flag>
 		<flag name="opencl">Enable opencl support</flag>
+		<flag name="system-lua">Use dev-lang/lua instead of the bundled liblua</flag>
 		<flag name="tools">Install tools for generating base curves and noise profiles</flag>
 	</use>
 	<upstream>
diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest
index 4534f90247ba..58c6002c10a2 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-r1.ebuild 2930 BLAKE2B 510de3b488d886fd7d3ebbe2985c023badfd0a5ac2a39df79e5ce0560864ea5d05d367fa6e6db94fc07e2266dd62a9da0fbc8235152ce9a4d12205fb8bc72cbe SHA512 5ec2ac9be6683c4cfc2b77a2e0f338329b7d72a59ef518d38295de5c6a4e0bb4f26150c75c8b0ce4d8f04e0f65a482de3aed9676cfb0745d85757b582fc6b7c3
+EBUILD dcraw-9.28.0-r2.ebuild 2934 BLAKE2B 383b2322514a66cc883781cd9bef376609afc5d2e235fa06c53ac498acd511e6bdc5aa6a3a9365092257d0e021dd9578b71648d882751566e560e558c91088b2 SHA512 d7348bc90a14338bb39bc3ba9b48eed982e1e027a1c76ce97b0856a6306b269c1bd4480d9d9a58e3fe4b56c4e67560385af3cde99252022fa564220e1e9160b4
 MISC metadata.xml 609 BLAKE2B a48ebce771f67412c53ed8d2ef83b44c1276600c5634c6f2ce51d677675d6c3f134d0ec7578fd777cd12dd7edd267a70529aa3ffc6875ffccc1ef97d93b72e52 SHA512 16d0cb26ad197852a44c84dbc87964ef441d850ea9fab643395edb027a2abf1a18aaa087890552f0be624678db239a9efbe384d4e3e9605a6fa2dfbf2543bf8d
diff --git a/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild b/media-gfx/dcraw/dcraw-9.28.0-r2.ebuild
index 49ae04268c38..7163adea330f 100644
--- a/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
+++ b/media-gfx/dcraw/dcraw-9.28.0-r2.ebuild
@@ -19,7 +19,7 @@ IUSE="nls gimp jpeg lcms"
 COMMON_DEPEND="
 	jpeg? ( virtual/jpeg:0 )
 	lcms? ( media-libs/lcms:2 )
-	gimp? ( media-gfx/gimp )
+	gimp? ( media-gfx/gimp:0/2 )
 "
 DEPEND="${COMMON_DEPEND}"
 BDEPEND="
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 07f632785654..4e0d7e0a8c54 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,7 +1,3 @@
-AUX digikam-6.3.0-cmake.patch 2038 BLAKE2B 73c6c7d008c3b76f9347f4192d435e10aa3607abf62436372ef131ac034ef538c1baa8d0d03e6b587b771fb766fa3286c649a6ffc7640a2f21e292b1e524cab6 SHA512 c8e6d2fd6c18d8c8e8733dffd1e0e2fb66b8bf3496aa6f767a4c633a56733c85bc53bdceaf689e84beca672a5013a02349cfca73d9f1e89a99252c7bac526a4d
-AUX digikam-6.4.0-qt-5.15.patch 1499 BLAKE2B 8d82d27d0b5376d5974dbc4d244dc1e3c683b8bfe392956b2d13cf30753984dd84746aaca049284a2c10f5074a1a9a51b228114c0b3eb02f8ae5ceb20abc00fc SHA512 3794b43734258112dfa693795d62887e66b8c99ffe339de3baa91fcd750d409962934e9bfcfc02f253ff9b4b04241eb5c4f983dc8a1b88a8f15d94d7cd3812ac
-DIST digikam-6.4.0.tar.xz 340146992 BLAKE2B ca1bc8b0d165f9774354d8489a11d46d8d7467edd3c1e90fd3a96024c4b7cd23bfd5c813251183bcca6d4beac9bffeb9d921beaa9a3752f75f1918796aacd719 SHA512 b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c699399994199b848757f0497ad25a7805e42
 DIST digikam-7.1.0.tar.xz 593501044 BLAKE2B dcd124a18299a75c02b51642cc33d2a053f1fce4abd82b3f50ea93cc17e8b302b73284106ed716e815741cc38326695f1303e018998a6687f8cd92ab539faeb0 SHA512 df7138a45ff8de6c1e32cb0eea83e1cd4b67f027b149a696d8feb8008ceaae55934c1f1d9625c1ba29de850ad70aa01dc73f1b7517253ca6aa99f0f97b84a3a4
-EBUILD digikam-6.4.0-r1.ebuild 4358 BLAKE2B ca4ffa68ef7be1191439f94f3d52916c2ef4cb06c1fca12017989290c55ae5f2e819d74286ebac80835792df81a895b3c7d002205c44d698129887e36ddc5ddc SHA512 dc14d9384b6c4ee943dd63ec5a6eb6f5fcde9539cbdc4a34d2e5f2467c83eacb9acbabfcba93ea731b5b97a0a7e5fb07e02dbbe4a35f0bc956883a9ff88bfceb
-EBUILD digikam-7.1.0.ebuild 3999 BLAKE2B 7ad4b24acbb047408c5a05c5403e5ff52296f3983a0fd09a9b5c445c6da9657eb85fd8d05fa137be247329d7f7b70f322f11dd92c8cb5d3c9a4e1ddbe9842972 SHA512 a7ed90a1f046b88ead5542dd62d4ac7cbf81f1f19e4d2cb11a8b30de6c1d8967ed8ffb45ac128765f16f1215c3c4542c7b5ce9f8041d706bf229d7f00224fca4
-MISC metadata.xml 1368 BLAKE2B 5dec50abba4f748e1f8eb465807c719f4b81759277241169d9e721749a1ba807425f7d46e9feb1edb4dcf3b4dd00b40bfbb353fe479e29c8a1878ad1fbfb5082 SHA512 4cd1ada9c4274338e49a692095d80b572c309bd34c838e2663a18ec1e7230de87e27087febfedde46a0f6af19f1a3f440335750375117d20eacd0c756db8b2f8
+EBUILD digikam-7.1.0.ebuild 3997 BLAKE2B d8408390ff16b7e10cf1b8c4c88dec147bfc79cee9edf86a08d2ef84017698f128373dfa17adafc76770457285bee20d5f4a67483a3c0677ccf7ce81fce9fbed SHA512 ce6b78314d5e64ea5c3710afcf44f426ea1220162d2a0ab0888f8bd6e8f1d79a010614a913bc249976ab4cdbf1aff1c9264f5ce81f975e5be44af6d4a47db305
+MISC metadata.xml 1097 BLAKE2B 1870f4bef0643db48fa2e6241f25d33c718010556b79bb54339f4ff9a13d7d005cea8e358e83d54ee94860b191969c834b9e5fd8152a17d7a5cc464a6813000e SHA512 25c2fcb533b644cf4aa376518a77f35bab0676c6f8853998f50e1eebbb2de20ca49e02fc110b1d6f55d2502f4e353803f12a2b336b98d85321b891a42ba16ccd
diff --git a/media-gfx/digikam/digikam-6.4.0-r1.ebuild b/media-gfx/digikam/digikam-6.4.0-r1.ebuild
deleted file mode 100644
index 870d93f3a99d..000000000000
--- a/media-gfx/digikam/digikam-6.4.0-r1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org toolchain-funcs
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	MY_PV=${PV/_/-}
-	MY_P=${PN}-${MY_PV}
-	SRC_BRANCH=stable
-	[[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
-	SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${PV}/${MY_P}.tar.xz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/"
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="addressbook calendar dnn heif +imagemagick gphoto2 +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
-
-BDEPEND="
-	>=dev-util/cmake-3.14.3
-	sys-devel/gettext
-	panorama? (
-		sys-devel/bison
-		sys-devel/flex
-	)
-"
-COMMON_DEPEND="
-	dev-libs/expat
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[mysql?]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=media-gfx/exiv2-0.27:=
-	media-libs/lcms:2
-	media-libs/liblqr
-	media-libs/libpng:0=
-	>=media-libs/opencv-3.1.0:=
-	media-libs/tiff:0
-	virtual/jpeg:0
-	addressbook? (
-		>=kde-apps/akonadi-contacts-19.04.3:5
-		>=kde-frameworks/kcontacts-${KFMIN}:5
-	)
-	calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 )
-	dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contribdnn] )
-	gphoto2? ( media-libs/libgphoto2:= )
-	heif? ( media-libs/x265:= )
-	imagemagick? ( media-gfx/imagemagick:= )
-	lensfun? ( media-libs/lensfun )
-	marble? (
-		>=dev-qt/qtconcurrent-${QTMIN}:5
-		>=kde-apps/marble-19.04.3:5
-		>=kde-frameworks/kbookmarks-${KFMIN}:5
-	)
-	mediaplayer? (
-		media-libs/qtav[opengl]
-		media-video/ffmpeg:=
-	)
-	opengl? (
-		>=dev-qt/qtopengl-${QTMIN}:5
-		virtual/opengl
-	)
-	panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
-	scanner? ( >=kde-apps/libksane-19.04.3:5 )
-	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
-	vkontakte? ( net-libs/libkvkontakte:5 )
-	!webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
-	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/eigen:3
-	dev-libs/boost[threads]
-"
-RDEPEND="${COMMON_DEPEND}
-	mysql? ( virtual/mysql[server(+)] )
-	panorama? ( media-gfx/hugin )
-"
-
-RESTRICT+=" test"
-# bug 366505
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.3.0-cmake.patch"
-	"${FILESDIR}/${P}-qt-5.15.patch" # bug 730298
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	ecm_pkg_pretend
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	ecm_pkg_setup
-}
-
-# FIXME: Unbundle libraw (libs/rawengine/libraw)
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=OFF # bug 698192
-		-DENABLE_APPSTYLES=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
-		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
-		$(cmake_use_find_package calendar KF5CalendarCore)
-		-DENABLE_FACESENGINE_DNN=$(usex dnn)
-		$(cmake_use_find_package gphoto2 Gphoto2)
-		$(cmake_use_find_package heif X265)
-		$(cmake_use_find_package imagemagick ImageMagick)
-		$(cmake_use_find_package lensfun LensFun)
-		$(cmake_use_find_package marble Marble)
-		-DENABLE_MEDIAPLAYER=$(usex mediaplayer)
-		$(cmake_use_find_package mediaplayer QtAV)
-		-DENABLE_MYSQLSUPPORT=$(usex mysql)
-		-DENABLE_INTERNALMYSQL=$(usex mysql)
-		$(cmake_use_find_package opengl OpenGL)
-		$(cmake_use_find_package panorama KF5ThreadWeaver)
-		$(cmake_use_find_package scanner KF5Sane)
-		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake_use_find_package vkontakte KF5Vkontakte)
-		-DENABLE_QWEBENGINE=$(usex !webkit)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/digikam/digikam-7.1.0.ebuild b/media-gfx/digikam/digikam-7.1.0.ebuild
index d630d405febf..3fcf93ec3dc5 100644
--- a/media-gfx/digikam/digikam-7.1.0.ebuild
+++ b/media-gfx/digikam/digikam-7.1.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
 		SRC_URI="mirror://kde/stable/${PN}/${PV}/"
 	fi
 	SRC_URI+="${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/media-gfx/digikam/files/digikam-6.3.0-cmake.patch b/media-gfx/digikam/files/digikam-6.3.0-cmake.patch
deleted file mode 100644
index f14f406d88d5..000000000000
--- a/media-gfx/digikam/files/digikam-6.3.0-cmake.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From beb8eb984aac519ed5dfd13615f430ec14e73f16 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 17 Feb 2019 23:51:03 +0100
-Subject: [PATCH] Un-break optional Qt5 detection
-
----
- core/CMakeLists.txt | 26 ++++++++++----------------
- 1 file changed, 10 insertions(+), 16 deletions(-)
-
-diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index 633760d194..736826d234 100644
---- a/core/CMakeLists.txt
-+++ b/core/CMakeLists.txt
-@@ -136,16 +136,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED
- )
- 
- if(ENABLE_QWEBENGINE)
--    find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebEngineWidgets)
-+    find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} NO_MODULE)
- else()
--    find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebKitWidgets)
-+    find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} NO_MODULE)
- endif()
- 
--find_package(Qt5 ${QT_MIN_VERSION}
--             OPTIONAL_COMPONENTS
--             DBus
--             OpenGL
--)
-+find_package(Qt5DBus ${QT_MIN_VERSION})
-+
-+find_package(Qt5OpenGL ${QT_MIN_VERSION})
- 
- if(ENABLE_DBUS)
-     if(NOT Qt5DBus_FOUND)
-@@ -156,14 +154,10 @@ endif()
- # Dependencies For unit tests and CLI test tools
- 
- if(BUILD_TESTING)
--    find_package(Qt5 ${QT_MIN_VERSION} REQUIRED
--                 NO_MODULE COMPONENTS
--                 Test
--    )
--    find_package(Qt5 ${QT_MIN_VERSION}
--                 OPTIONAL_COMPONENTS
--                 Qml WebView  # Optional, for 'sialis' O2 library test tool.
--    )
-+    find_package(Qt5Test ${QT_MIN_VERSION} NO_MODULE)
-+    # Optional, for 'sialis' O2 library test tool.
-+    find_package(Qt5Qml ${QT_MIN_VERSION} NO_MODULE)
-+    find_package(Qt5WebView ${QT_MIN_VERSION} NO_MODULE)
- endif()
- 
- find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
-@@ -335,7 +329,7 @@ endif()
- find_package(X11)
- 
- if(X11_FOUND)
--    find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS X11Extras)
-+    find_package(Qt5X11Extras ${QT_MIN_VERSION} NO_MODULE)
-     set(HAVE_X11 TRUE)
- else()
-     set(HAVE_X11 FALSE)
--- 
-2.23.0
-
diff --git a/media-gfx/digikam/files/digikam-6.4.0-qt-5.15.patch b/media-gfx/digikam/files/digikam-6.4.0-qt-5.15.patch
deleted file mode 100644
index c2d5154b5498..000000000000
--- a/media-gfx/digikam/files/digikam-6.4.0-qt-5.15.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Fix build with Qt 5.15
-
-Authored-by: Thomas Posch <bugs.gentoo.org@online.posch.name>
-
-diff -Naur a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
---- a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp	2020-06-30 22:48:50.477149053 +0200
-+++ b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp	2020-06-30 22:49:52.217439213 +0200
-@@ -44,6 +44,8 @@
- #include <QMatrix>
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
-+#include <QPainterPathStroker>
- #include <QPixmap>
- #include <QTimer>
- #include <QWheelEvent>
-diff -Naur a/core/libs/dimg/filters/curves/curveswidget.cpp b/core/libs/dimg/filters/curves/curveswidget.cpp
---- a/core/libs/dimg/filters/curves/curveswidget.cpp	2020-06-30 22:48:50.374150231 +0200
-+++ b/core/libs/dimg/filters/curves/curveswidget.cpp	2020-06-30 22:49:17.219842551 +0200
-@@ -41,6 +41,7 @@
- #include <QFont>
- #include <QFontMetrics>
- #include <QPaintEvent>
-+#include <QPainterPath>
- #include <QMouseEvent>
- 
- // KDE includes
-diff -Naur a/core/libs/dimg/filters/levels/histogrampainter.cpp b/core/libs/dimg/filters/levels/histogrampainter.cpp
---- a/core/libs/dimg/filters/levels/histogrampainter.cpp	2020-06-30 22:48:50.374150231 +0200
-+++ b/core/libs/dimg/filters/levels/histogrampainter.cpp	2020-06-30 22:49:17.219842551 +0200
-@@ -30,6 +30,7 @@
- // Qt includes
- 
- #include <QPainter>
-+#include <QPainterPath>
- 
- // KDE includes
- 
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index 5843335b3898..518cc8835a85 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -10,7 +10,6 @@
 	</maintainer>
 	<use>
 		<flag name="addressbook">Enable akonadi contact integration</flag>
-		<flag name="dnn">Build neural network faces engine module</flag>
 		<flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF files using <pkg>media-libs/x265</pkg></flag>
 		<flag name="imagemagick">Enable support for additional image formats such as XCF, FITS, HEIC etc.</flag>
 		<flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg></flag>
@@ -18,7 +17,5 @@
 		<flag name="mediaplayer">Enable support for media player using <pkg>media-libs/qtav</pkg></flag>
 		<flag name="panorama">Build the panorama plugin which requires <pkg>media-gfx/hugin</pkg></flag>
 		<flag name="semantic-desktop">Enable <pkg>kde-frameworks/kfilemetadata</pkg> support</flag>
-		<flag name="vkontakte">Build <pkg>net-libs/libkvkontakte</pkg> plugin for vkontakte.ru</flag>
-		<flag name="webkit">Build with <pkg>dev-qt/qtwebkit</pkg> instead of <pkg>dev-qt/qtwebengine</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/engauge/Manifest b/media-gfx/engauge/Manifest
index 5819808ec6fa..7c39e6d03cd8 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 2251 BLAKE2B a958f71f35d275f3ad04608c0f5ff6a78a20267468fb50e5dccea49b8b579e5086ff7de771d312c093cf42603333b692a4c3388650b688b6c4840852b5cfb854 SHA512 7af030fb6ac6f341747dc93fb49d5bf392263eeb4bc0c86e9d14f80e3e48aeb019cf3e00036b7d63a35f4ff0f021559cf7c536ace69594f1c79f87bdddeb7937
+EBUILD engauge-10.6.ebuild 2116 BLAKE2B d7879884824581dd5f3d481b2a8760659986708ad802cb6841380ca55164fe63e9899c8fc8a774260a9f01646d3b9f971113b36583da59300feb92b363d19b82 SHA512 51840f63f8f56984d549051b88dde704f150d122f316cda1277900d4f18da8b1da45b0ed5bca4c9dfd7cf6ddc9efd5926b8e84dbf4e234971275db17bb4a555c
 MISC metadata.xml 337 BLAKE2B 8c46cdaadb388ccd12d29c41a075ec60130482855d0735cd468a174e631129964fec7c2e7649994e8f958def8ceb8f4ad0ecb60ab69ce37171c9945696825369 SHA512 41201e69d211283450ef6ff45a23e0978934044e170da84de7e7978360bd5ce1e3b277df4a90e00221cca3f987cd6839ee90fceea232c70cebeb69b5bc7c1c6d
diff --git a/media-gfx/engauge/engauge-10.6.ebuild b/media-gfx/engauge/engauge-10.6.ebuild
index 7f52ab96807e..e1145ca2e153 100644
--- a/media-gfx/engauge/engauge-10.6.ebuild
+++ b/media-gfx/engauge/engauge-10.6.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop gnome2-utils qmake-utils
+inherit desktop qmake-utils xdg
 
 DESCRIPTION="Convert an image file showing a graph or map into numbers"
-HOMEPAGE="http://markummitchell.github.io/engauge-digitizer/"
+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"
 
 LICENSE="GPL-2"
@@ -16,23 +16,23 @@ IUSE="doc examples jpeg2k pdf"
 
 RDEPEND="dev-qt/qtcore:5
 	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	dev-qt/qthelp:5
-	dev-qt/qtnetwork:5
 	dev-libs/log4cpp
 	sci-libs/fftw:3.0
 	jpeg2k? ( media-libs/openjpeg:2 )
 	pdf? ( app-text/poppler[qt5] )"
 DEPEND="${RDEPEND}"
 
-S=$WORKDIR/engauge-digitizer-$PV
+S=${WORKDIR}/engauge-digitizer-${PV}
 
-src_prepare() {
-	eapply_user
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
 
-	eapply "${FILESDIR}/${P}-qt-5.11.patch"
+src_prepare() {
+	default
 
 	# Make sure the documentation is looked for in the proper directory
 	sed -e "s:engauge-digitizer/engauge.qhc:${PF}/engauge.qhc:" \
@@ -81,15 +81,3 @@ src_install() {
 		doins -r samples
 	fi
 }
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index 940b39a42f25..7db6411e222e 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,5 +1,3 @@
-DIST eog-plugins-3.26.4.tar.xz 477772 BLAKE2B 104ddf58d33e5513349839312fef820af20d7a3e64a3a8cbd7d964d8250564d6cd62c58cf95fb5359ab95eac8fe2b83ed051e6f3dc8144a8884ec72c74a12622 SHA512 95f2cf2c6ed84b4801517a708f18e1cd673f814d849029a41491f3719512d6a3a2cb5cb11898a7f972f8b674c682245c99964ba2da19b285ed175b720d5396e8
 DIST eog-plugins-3.26.5.tar.xz 478188 BLAKE2B 655eb9860435775862ba44bd26530edff778a3c8c574e9bf592800b4d57b4e5b0e52d36b7d71d6a6d615d47c320542105dcee9de89250901fcbfa6c255dcfddc SHA512 3b7979d241c2c0b522ffb6c30a6b8c90fed9e899cda8a73fb9d9a9392f474516f8c24fc75f3f35f920c8a6cf04b8bda611a8669839588936c48467813a6227a7
-EBUILD eog-plugins-3.26.4-r1.ebuild 1688 BLAKE2B a8facd636930691003351dc4f962970dcc19509ef2df7f106899ade4caeade426e2e5223856c7ea8f6a9decc80861d12bebfaa66b1ab164a03d016150b492c05 SHA512 86920010db0205fa3aa896a18b371acb4c72c0a277aed032675eff40cbe87b7985847c7bdddb007b5575072e50732da650e68bad315c6724c9d3cb53ba753eae
 EBUILD eog-plugins-3.26.5.ebuild 1688 BLAKE2B a8facd636930691003351dc4f962970dcc19509ef2df7f106899ade4caeade426e2e5223856c7ea8f6a9decc80861d12bebfaa66b1ab164a03d016150b492c05 SHA512 86920010db0205fa3aa896a18b371acb4c72c0a277aed032675eff40cbe87b7985847c7bdddb007b5575072e50732da650e68bad315c6724c9d3cb53ba753eae
 MISC metadata.xml 428 BLAKE2B b10706bb7638538d5ce63c9787e7a1730e01c8383f2d2a093e38184b031933d2b3749241aa2f3254be4c84fac104bb8ec72940cdf8cd5a9f7bc0944541b015c6 SHA512 9684f07846ce7e49ad82843c2b8b7ac5c9d7124bddb07778292d6810162e89a3d41e7ca426f331e4bae6ecfbe53f71409b35418affba6382e874c78b64ed102f
diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.4-r1.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.4-r1.ebuild
deleted file mode 100644
index 33ba60e823b5..000000000000
--- a/media-gfx/eog-plugins/eog-plugins-3.26.4-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Eye of GNOME plugins"
-HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="+exif map picasa +python"
-REQUIRED_USE="
-	map? ( exif )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libpeas-0.7.4:=
-	>=media-gfx/eog-3.15.90
-	>=x11-libs/gtk+-3.14:3
-	exif? ( >=media-libs/libexif-0.6.16 )
-	map? (
-		media-libs/libchamplain:0.12[gtk]
-		>=media-libs/clutter-1.9.4:1.0
-		>=media-libs/clutter-gtk-1.1.2:1.0 )
-	picasa? ( >=dev-libs/libgdata-0.9.1:= )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-libs/glib-2.32:2[dbus]
-		dev-libs/libpeas:=[gtk,python,${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		')
-		gnome-base/gsettings-desktop-schemas
-		media-gfx/eog[introspection]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection] )
-"
-# libxml2 required for glib-compile-resources
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local plugins="fit-to-width,send-by-mail,hide-titlebar,light-theme"
-	use exif && plugins="${plugins},exif-display"
-	use map && plugins="${plugins},map"
-	use picasa && plugins="${plugins},postasa"
-	use python && plugins="${plugins},slideshowshuffle,pythonconsole,fullscreenbg,export-to-folder,maximize-windows"
-	gnome2_src_configure \
-		$(use_enable python) \
-		--with-plugins=${plugins}
-}
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 95a7c1ebb2f3..237892175ba7 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,5 +1,3 @@
-DIST eog-3.32.2.tar.xz 4601712 BLAKE2B 84803acf2e2c2cb7451b357d18c7553854dd9a440ee8f951db479641ebf7fe49d8b8185124301c8b272db22d424c31197146e58d0907248cb87aa822441184d6 SHA512 c1093db4bce6bfde758a42fddc7ce7437d2adf3aa44a633b253ca3cb75c910e8862a323d182394696c617cb92114919dc576b992e7a65aa5fefb504062382d81
 DIST eog-3.36.3.tar.xz 3651556 BLAKE2B 6224b21342b24bed8cfed5702c440547423a7c0db36278c082f336f274ebabea401700c418eafced814fb33043362963055acbcacc81edff8b0f202898c09542 SHA512 90205561dbc49aa42e60f636ce23d04dcd05513d28176ffa4c1dd6602889c4b2c920bd299086d3d7bfee72fcc6a029e2d34e14eb80ba5f91573161fbd1b85aea
-EBUILD eog-3.32.2.ebuild 1556 BLAKE2B 4a6f2ce822682b8fb164e7b95a26a16fe6bd9f1d09ac21d70a38942673370aa4b3e5007f3b41c37be9badb97f4f2080a1e8e82f0de3ee816ec7300f92d55b957 SHA512 e988399d2027b41da66b5004c9e879238799b24b12e3581229c995b39b51b7c78322a7734f1688f1b8c87f231e339d6cba8507778bd6d9ad18796b3a2e1bd5f1
 EBUILD eog-3.36.3.ebuild 1556 BLAKE2B 6ba5e5184a6916dcc56b4879ca3abf4e5eff4711fcdc97c3a56a415f3564d1b02ec74dbf270b0586e9496ba421b9bae052591a40aeebb789e22867b1d6443dba SHA512 c59d6e36cec5e04be93567fe493f62885effd1a828240aed0e4d5afe04d31a1615d237294814eef7c774ac009cccf0cadea8c86881908df08a1a312a774f9e06
 MISC metadata.xml 481 BLAKE2B 2c12b594b9a5b1e4ce3983131d1911f62026c5186d8f5c5af13842cfedfa4d20abdc5ee82e11db3a2e1b45e2b8d4d95fa1a62e668936956e8453b166daff00b4 SHA512 141ec1d6923697f744de806804279b602120ce3d5494257de36b8c8b71185d101692f2e438d7ba0e4a4c946d0aaba068117f16c8344abe891e0ddd4f768ded26
diff --git a/media-gfx/eog/eog-3.32.2.ebuild b/media-gfx/eog/eog-3.32.2.ebuild
deleted file mode 100644
index 696783af59c4..000000000000
--- a/media-gfx/eog/eog-3.32.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 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.36.2: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/exact-image/Manifest b/media-gfx/exact-image/Manifest
index c66dcc10734b..985677f0ce61 100644
--- a/media-gfx/exact-image/Manifest
+++ b/media-gfx/exact-image/Manifest
@@ -4,8 +4,9 @@ AUX exact-image-0.8.1-libpng15.patch 754 BLAKE2B 81b47c6198103f37cc5f0a382001129
 AUX exact-image-1.0.2-dcraw.patch 496 BLAKE2B d9d86facb3b0f9721d3f5791d4744bbf71d3802c094e4d1f20de44898d817a8319b78c0cd011670d53beec35bbf9efb477c9b3e20ac2724a48017c5d0746c634 SHA512 409cf7ad9963b5e6f4997ad5b466a86c5c3179bbfe63f14311a1297c9e87423f7d838b2b037109029a8dfa6125d7bbacd53f069d8634c1ffdd2c946d40e70b99
 AUX exact-image-1.0.2-g++.patch 936 BLAKE2B 6ab787c1393228bb1671c8a2d7b76969fcd11d26f0c14ca08a95cee7241422205d8cb398f2a6b711e884c476cba662718705848a818b1944428b2a207133fede SHA512 44fafd62c713bc59c1cb774924394ad32a13c33b79696a4762e3730108650ccd3033f554fc8b0d7cf9b71126367bce5b90074f2c954ca57c8389975b57eac5e1
 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-0.8.1.tar.bz2 283660 BLAKE2B 49aa68640b785da59fd0e04d0a0892ad06adbc286a98bf908e60e77cfd273263e83dce3c9eb75c30f422c2b6eef2178dd0585aada63f992291abf298b369f3aa SHA512 0adc51c5a29415e236a963cfdaf8f5527e628e9a645e87d00c69a7185e60639cfcd9b1c2b4c3abe1826c5364f0c5d45a0ebb8923cfed53d041d1d36b2604b565
 DIST exact-image-1.0.2.tar.bz2 322174 BLAKE2B 67afefb4c5a52416459cd4ac6198012eb6d7895a73ea8363fae05286c7e7f62aa1a02166985f53b5638c7dc7b23b4dc1fb1c7b2272a9dc595ce329a7083ee1b9 SHA512 8ba5a198a236ddf5fa58f40c80f32ba9d300376c637a13a7acf3d2db7906fced373b33a7ecff9cff4d09d8b21de9ce1fb9f5bfb1f4522557bd01af0e3d6dcc65
 EBUILD exact-image-0.8.1-r3.ebuild 2289 BLAKE2B 93a144bd88c5d743e24f34cf9920d97662cd5db725e952012237e2ad89c9f2a53734989a2e94d20346752ec275c940f2ff3ffe8e72c1d134a8d9818f434b1bb2 SHA512 dc14b66c56f7733019b433ac5b7b348bf105dccac9157c3a1ef03789bb5e33d7a2e0d2fd466a097d950c7a50a123581f40d62b81c1d2abce2213cde851465ef0
-EBUILD exact-image-1.0.2.ebuild 2293 BLAKE2B dc3139e8131b7417adcb9f35c60bab060a4ad3d58a47360fcf8c973c503c9e3cf8ccc6aaf5dbe467eb7033c72b5d990ad6bbea30c0097ef2c8f3a0282fae47c0 SHA512 775b3b9ba817cd8bf5cb0028e3eb34896941e73f75144ebae30cac0568a62ea4c84bf0edd08ce8520536488e126bf16d7670b3a2a22fad4df83dd99ea5a5b467
+EBUILD exact-image-1.0.2.ebuild 2323 BLAKE2B f69a90dc3e2eeed132a92b6a40d7808b8c76566af60fe54e10318775106c43944b562f053eec866b0a0ea98871f18b3f68ab03374115691d3955fb66500a013c SHA512 6ce57a06ce8dde1aff7fa6e9299fda48ae4399cd79cda2bd2b8addba49cc66e3efe8648313a00da4c11427d0f68886a0e535c964d2f90a49eec809673e5baa91
 MISC metadata.xml 329 BLAKE2B ceb9ef8fb31cd43ccaeec69b64fe88a4894da38dd2c45a1b74dde46161daa3d437fc9e2d7a699c8ca57acd8bb6ad06dbbbe173eefcf243ee2f78233046a7006b SHA512 eb4d23c96cd7e20afb64bf80075a0cfcdb27c69ca075261d54676c47044ca6d120dd5b80cb2217787b71a9db02688764b0b3f2147c6a6e652954e43cafaebf57
diff --git a/media-gfx/exact-image/exact-image-1.0.2.ebuild b/media-gfx/exact-image/exact-image-1.0.2.ebuild
index 2c2e93b4fffd..62b39e9d7e4d 100644
--- a/media-gfx/exact-image/exact-image-1.0.2.ebuild
+++ b/media-gfx/exact-image/exact-image-1.0.2.ebuild
@@ -40,6 +40,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gcc6.patch
 	"${FILESDIR}"/${P}-g++.patch
 	"${FILESDIR}"/${P}-dcraw.patch
+	"${FILESDIR}"/${P}-php.patch
 )
 
 src_prepare() {
diff --git a/media-gfx/exact-image/files/exact-image-1.0.2-php.patch b/media-gfx/exact-image/files/exact-image-1.0.2-php.patch
new file mode 100644
index 000000000000..787d71335f38
--- /dev/null
+++ b/media-gfx/exact-image/files/exact-image-1.0.2-php.patch
@@ -0,0 +1,11 @@
+--- a/api/php/Makefile	2020-10-06 08:28:04.511865454 +0200
++++ b/api/php/Makefile	2020-10-06 08:28:18.109638538 +0200
+@@ -8,7 +8,7 @@
+ 
+ $($(X_MODULE)_OUTPUT)/api-php-wrap.cc: $(X_MODULE)/../api.hh $(X_MODULE)/../api-swig.hh
+ 	$(Q)echo "  SWIG      $(dir $@)"
+-	$(Q)swig -php5 -c++ -outdir $(dir $@) -o '$@' $(X_MODULE)/../api-swig.hh
++	$(Q)swig -php7 -c++ -outdir $(dir $@) -o '$@' $(X_MODULE)/../api-swig.hh
+ 
+ # we have an own install
+ _X_BUILD_IMPLICIT := $(_X_BUILD_IMPLICIT)
diff --git a/media-gfx/farbfeld/Manifest b/media-gfx/farbfeld/Manifest
index eb4bf01f2231..230e20dfea54 100644
--- a/media-gfx/farbfeld/Manifest
+++ b/media-gfx/farbfeld/Manifest
@@ -1,4 +1,4 @@
 DIST farbfeld-4.tar.gz 10340 BLAKE2B 0ef13baabe70f0be485746602a77eb4002c8611d1ccb0468de512b687eb9a5c48dafb81c12274e29377697bc70d3586f4a71b47e82ffd3f6238398741565c1b9 SHA512 5139dd81cf1e3cb7a32108c0acad0e4ae0de13e86b997f1a759aa1b1f7be6c1ad2a93a69af7126e3512a7c9b1669a2a301ff60171b098b3450f1da0594e3b6ac
 EBUILD farbfeld-4.ebuild 761 BLAKE2B e5746da38c2a34fe6cc9cff7764f19988d2aa15b28776835f7afb0e975d93b0faa970920b02f806aeba06447ced6ebe07bb8689fdec323ae5f0ccbf46911e8cb SHA512 d17a0f75ed5063c3a898c6eaab81031e3604364e1dfef5209ceb6523e25cd1c4df4efb421f738f64bbf2ee0fc703d9dcbaa70703907a5ca891b013232c2d807d
 EBUILD farbfeld-9999.ebuild 757 BLAKE2B 11f98fef448e43c042811cce0d00a545ed79ec2ba0f732569b64d23bb0e08ebc534d5d60591d0a7aa297c01d5a7088ea076d09362cb0cd03c0aeb4b07c17a68b SHA512 38482a2850a26b59b87bd35179ac740d382e0b6f6b63ae7febb395717ee874627d0e45257915ba32e5e6e2e3c8782290f4090b411d5d9d031366d6ed338d6122
-MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/farbfeld/metadata.xml b/media-gfx/farbfeld/metadata.xml
index a8fb43312942..6f49eba8f496 100644
--- a/media-gfx/farbfeld/metadata.xml
+++ b/media-gfx/farbfeld/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index c0500ac4b79a..f0b365f591aa 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -11,6 +11,6 @@ DIST fbida-2.14.tar.gz 296826 BLAKE2B 0015b426c5deaf72737a52bddb065e7d0cb804ea97
 DIST ida.png.bz2 11928 BLAKE2B 8a1c89fc5adfb16c69f9591a299beb62c84d66960b586fbc819e53f904c90beef821ecf3539236563644c28e3ad3c7dbf861b140c820be649305a658b3613433 SHA512 cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3
 EBUILD fbida-2.12.ebuild 2414 BLAKE2B 893937473fba4502d1ea4cb6903b42a21a64ac0aece55d5b5991b741ed6f80e5f02139e3348c8116d45e0a2819076165e3cc3ccae1864455a3e9a0a29310f526 SHA512 d63b867ea02fdcbb3a39aec5c358b3eb0de7bc30fbd318b1066332ddcf073f5f8ccfe5cd73b59d2e5518d6a72b758cd248c2c65bca44c1fa7cd08908e266b388
 EBUILD fbida-2.13-r1.ebuild 2395 BLAKE2B b3f42d22b78ce8a0fe9158fad16daef4cf0fea76585c0f83035604b48664dd9f8a98adcbe2cb6e47fdd4c2fde8f33ec03087796c656dcc92682954864a54333b SHA512 e1809154631d9a298007bd02fca72914ffe9244fd904bbd6fa322831e944f02887cca4ac8e7dc50411efd0cd9356cb4ae663677cfd2a50eda5357132c082c30d
-EBUILD fbida-2.14-r2.ebuild 2496 BLAKE2B 666bcb15a1a59db0d811c7016fbebab486d2ea5994b2f5bb92b48aa7f9ab320b1a32dc389d6a71d996ae815fb72fefcfb5e1f4b4037d5d90ab2ed461a7c6f4de SHA512 f321d0b96591e4107eda976e530165f2597d4ac44e0fdba6f1bdc20af9d8d8398491620e0167190bb94f3c255b9c161a8904d46c92a10e27bfd3a6bc7385d90b
+EBUILD fbida-2.14-r2.ebuild 2490 BLAKE2B ebd28f775399112630f9d3e9528c40315f06546de74b5c70ee68b235f589bb2d9a3f6510c9740191fe8b1248358f9a48b59cc64e91343a41e52eb8dc6b3af050 SHA512 6cbb2a32b7b917e979a66ad8574de21c5f7c7e022f2f302a6b2e0e9c3f178d47c50cdf0ae6460a63ace59b7ec70e4519057f60fec5115c0ac94df82ff38de766
 EBUILD fbida-9999.ebuild 1349 BLAKE2B b011518d4f9816d0440b1bfd853fe97514e236fa20fb5eee942924b7e30751b981e0eb13a9e819627dff1af7b866b10c3712cbe0554d30e96e3bf5e7fddaa285 SHA512 10d5b89d83f020f3c14a9a68c622a96cd864ef8081b8163967938bacf592d1594ee8c09ff248515de246835a0a4e4fb78a768590f459bf53883011bede177ca0
-MISC metadata.xml 439 BLAKE2B 66a897b749b63e389153a97d84be2d4cf7e9c06c0b967ae715bd8202e038005ee724110d7d62ff99ef6ba21c8a365634f9350fc43e7dce44c81717cdeee85c54 SHA512 078e39413b3d63c3324c1f98e83b1b9747f2653108e34986dfc869cc3b65452d1b85ecefdaab17c0c53bd50cdb879f68c8b55a9da7d0cdee47ca329af10eec58
+MISC metadata.xml 395 BLAKE2B c51bbf0a7dc30596e65875c667f819332a547600b256f8ce75defd435677a36a0a3b0ede7cc4f9abf983890e34116ad11fa202f2b491b95605432a9f934e9fd7 SHA512 a8408235a641c85cb2c3e0fe141b7a590d52b5000888e1f753f6155257f669219cab6ddedf690a66ac5fc11d500fe8d270cdde36bbae31e2637e0c6ae413728a
diff --git a/media-gfx/fbida/fbida-2.14-r2.ebuild b/media-gfx/fbida/fbida-2.14-r2.ebuild
index d0237a1e80d4..7a8c7095485b 100644
--- a/media-gfx/fbida/fbida-2.14-r2.ebuild
+++ b/media-gfx/fbida/fbida-2.14-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 "
 LICENSE="GPL-2 IJG"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86"
 IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp"
 REQUIRED_USE="
 	ghostscript? ( tiff )
diff --git a/media-gfx/fbida/metadata.xml b/media-gfx/fbida/metadata.xml
index 0959fcdd1155..e7dd09135bed 100644
--- a/media-gfx/fbida/metadata.xml
+++ b/media-gfx/fbida/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 <flag name="fbcon">Install the framebuffer image viewer "fbi"</flag>
 <flag name="ghostscript">Install the framebuffer ghostscript viewer "fbgs"</flag>
diff --git a/media-gfx/fdm-materials/Manifest b/media-gfx/fdm-materials/Manifest
index 99c8b021eac6..40d1f8a52e09 100644
--- a/media-gfx/fdm-materials/Manifest
+++ b/media-gfx/fdm-materials/Manifest
@@ -1,14 +1,5 @@
-DIST fdm-materials-3.4.1.tar.gz 20852 BLAKE2B 7ad125e62c1a1cf2a05440c6ef593bf5115e6998d1a2d190063eaaadf8b9d0d93a1c98a1f2fdf672657e2c47159cc49ba6402e47ef5b55b880a8f0a7bffc9969 SHA512 c635bb3d3875e10abdc8f54c22ee74abf678cf8409ebeda6f083ac368025f90bd1871f9b13ad94c843f80073e0ae20d1dc08e80bed37ea7e2bfb3161d8ee8f0d
-DIST fdm-materials-3.6.0.tar.gz 23037 BLAKE2B 842edbbef94dbf8a775d81bae3b6621dfeff9ba5cc8d9986ad672f95fe864007c931ef37d38c8702201d286c1cdb9770ab5709e364335833fd40c8c1e4c0f68f SHA512 1f868b716135a3b81495ed6445794c4d5cddc618dbf7a19b29ccdddbcd1d6f9d49190be7cea99c6dd2b8c07f1126973f1c43b223ff213ce04b6fe8811c71a577
-DIST fdm-materials-4.2.0.tar.gz 29011 BLAKE2B cd167506070e5609b0e464cb547271008b9f500312e378c9d8a16ae71cdcbde0efbd91bc0149f56ea9d9c9cf97f4a946810c542a4a0d8350344b48393dacc070 SHA512 02981374d4abcbfbcbace5b6b5d5542d4a5cc65ddf3a47569e34ad94284df56fdcc5f674801ee74c12034c502df8e5cca84a077f648f81557067f0044bf7bf9c
-DIST fdm-materials-4.3.0.tar.gz 33208 BLAKE2B 5505a885e03130757134557525e30ecda7091d3238aa5be753065c8bf81dd08914acf22ba85b95f3c78818bf5defedf97ea083d22f1886fc5113d692d70b14e6 SHA512 420accb4ff3eba754e96ceecda4980f121cab22ca3aeefe0781be47cce2ed64cd93df2a2bd974ea611e71ea45a944692e7b27bfbb6f9b0e9dd971e7621e4ff58
 DIST fdm-materials-4.6.1.tar.gz 36321 BLAKE2B bbdc28bf9d05b14f4b0545c4c50c67c31668f97aa9b6fcb8d51c5c958523ebe3307deb07587239df6a73e47c523db6c15f0ea4eb3c2560931a055c784d2b30cc SHA512 784b89acfb2a5bdc6a0e8ce864326ab21f4785887baa215ffcfe472853cc8386d32ed237199df3744c25d12abbef89605445e74b104770f0f3f8363944008c6e
 DIST fdm-materials-4.7.0.tar.gz 41139 BLAKE2B a372d8273809a7d1a14e0b6e35a9c7266d626f26013f53a5d6c8462e2b1054bd65c72745ed1afdf96b17d6573f74b8555c946ef76c94acb8d860efa459d9955e SHA512 cbc42e2777d1332b5187cf1f826f73bf5c1c5a1106d851dc08d8082f41bde6846f349ed2339ae60ad00b2005b0983f01850931adc765d545de0a700f1d9cccaf
-EBUILD fdm-materials-3.4.1.ebuild 427 BLAKE2B f0c2ffd1704db661214fadee859f5ecb9a1653c7921649d5f75a7d90d1c22a5441cc614fc664943b4e2b1805d6d2a9e38a48c1ec6de8f029ff3df78ffed6587b SHA512 3ddb73a72ae39f3061c813f367cc5088b11617fde22acb7c77d43977174b4f00b156e1cf923ebe231c3a261e3684e9bbfecdc7bb9f08c08de3398a83b8c7ac44
-EBUILD fdm-materials-3.6.0.ebuild 424 BLAKE2B 86abac9f2f32f709c5e2dde549df6758108d22945a55fff32f4be6c2bf3842c210af686f00a6c403f0ae13611062e300cb4e235d4bd8fd25c0cf281fcda31f7e SHA512 aaaf876fe1c373061e94067ba1c89af62fb4836c44c7115c55d7684f01be6f11653850b94b029fdc56e70fc861eb44325aa946feac81d1ac0f06c3d48d8a7264
-EBUILD fdm-materials-4.2.0.ebuild 418 BLAKE2B 32a8bb1a67475a051216c3ed08230c48df1e6aef3938960d2d4d33d8a2735d6e6505ef992fbff9e9ad2cab7ba9fa7ba71227f735e0736150f35c8f08cf9d4e64 SHA512 73d45424b64d0cc9559dc9c59051e04783330915eb28e1d4d39c5f51a1028c8f819df857a38e4090f3bf14158020ff0e9833846c924072870b7d0bda314b03af
-EBUILD fdm-materials-4.3.0.ebuild 418 BLAKE2B 32a8bb1a67475a051216c3ed08230c48df1e6aef3938960d2d4d33d8a2735d6e6505ef992fbff9e9ad2cab7ba9fa7ba71227f735e0736150f35c8f08cf9d4e64 SHA512 73d45424b64d0cc9559dc9c59051e04783330915eb28e1d4d39c5f51a1028c8f819df857a38e4090f3bf14158020ff0e9833846c924072870b7d0bda314b03af
 EBUILD fdm-materials-4.6.1-r1.ebuild 544 BLAKE2B 62876b85725d6065e9ecf53c100ab9787c5147b1b4428e641a89837b9e01a38bc5c7a17ba0c55b6e25a8863f6e17bf0b732922c1f99298d3b8e8fac5579b3801 SHA512 a9d88895a40efca25e88c795a357cca743dab6d89c0366eeff6081ae73ae129ddbe3575469d9ff76f571ca882db868ed02c9e9a01f2332cb807b91f896130ab3
-EBUILD fdm-materials-4.6.1.ebuild 418 BLAKE2B 32a8bb1a67475a051216c3ed08230c48df1e6aef3938960d2d4d33d8a2735d6e6505ef992fbff9e9ad2cab7ba9fa7ba71227f735e0736150f35c8f08cf9d4e64 SHA512 73d45424b64d0cc9559dc9c59051e04783330915eb28e1d4d39c5f51a1028c8f819df857a38e4090f3bf14158020ff0e9833846c924072870b7d0bda314b03af
 EBUILD fdm-materials-4.7.0.ebuild 544 BLAKE2B 62876b85725d6065e9ecf53c100ab9787c5147b1b4428e641a89837b9e01a38bc5c7a17ba0c55b6e25a8863f6e17bf0b732922c1f99298d3b8e8fac5579b3801 SHA512 a9d88895a40efca25e88c795a357cca743dab6d89c0366eeff6081ae73ae129ddbe3575469d9ff76f571ca882db868ed02c9e9a01f2332cb807b91f896130ab3
 MISC metadata.xml 949 BLAKE2B d84bebe6a29c4eb2a6e644347492fe06a60e758efcaba9158d2395d2e3714565f805d01ed029bf8906c54ed286e49902adf6b4e8cef9870219cf3fd13912f5e7 SHA512 d7f04589e2e66b471a721aafa2d2be2d531211f2e5003ed7ffed918e770e6980cf891bc5728a0d1a27c3bcaebf2706ac9dd6d9dac847c412e1b7adde091a7594
diff --git a/media-gfx/fdm-materials/fdm-materials-3.4.1.ebuild b/media-gfx/fdm-materials/fdm-materials-3.4.1.ebuild
deleted file mode 100644
index a11c9629a10d..000000000000
--- a/media-gfx/fdm-materials/fdm-materials-3.4.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-MY_PN="fdm_materials"
-
-DESCRIPTION="FDM materials for media-gfx/cura"
-HOMEPAGE="https://github.com/Ultimaker/fdm_materials"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-gfx/fdm-materials/fdm-materials-3.6.0.ebuild b/media-gfx/fdm-materials/fdm-materials-3.6.0.ebuild
deleted file mode 100644
index 8d5efda44626..000000000000
--- a/media-gfx/fdm-materials/fdm-materials-3.6.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-MY_PN="fdm_materials"
-
-DESCRIPTION="FDM materials for media-gfx/cura"
-HOMEPAGE="https://github.com/Ultimaker/fdm_materials"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-gfx/fdm-materials/fdm-materials-4.2.0.ebuild b/media-gfx/fdm-materials/fdm-materials-4.2.0.ebuild
deleted file mode 100644
index db648b1ea936..000000000000
--- a/media-gfx/fdm-materials/fdm-materials-4.2.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_PN="fdm_materials"
-
-DESCRIPTION="FDM materials for media-gfx/cura"
-HOMEPAGE="https://github.com/Ultimaker/fdm_materials"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-gfx/fdm-materials/fdm-materials-4.3.0.ebuild b/media-gfx/fdm-materials/fdm-materials-4.3.0.ebuild
deleted file mode 100644
index db648b1ea936..000000000000
--- a/media-gfx/fdm-materials/fdm-materials-4.3.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_PN="fdm_materials"
-
-DESCRIPTION="FDM materials for media-gfx/cura"
-HOMEPAGE="https://github.com/Ultimaker/fdm_materials"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-gfx/fdm-materials/fdm-materials-4.6.1.ebuild b/media-gfx/fdm-materials/fdm-materials-4.6.1.ebuild
deleted file mode 100644
index db648b1ea936..000000000000
--- a/media-gfx/fdm-materials/fdm-materials-4.6.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_PN="fdm_materials"
-
-DESCRIPTION="FDM materials for media-gfx/cura"
-HOMEPAGE="https://github.com/Ultimaker/fdm_materials"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index b1c2b6842c52..9a2c3f184230 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -2,7 +2,10 @@ AUX 20200314-MacServiceReadFDs.patch 1053 BLAKE2B 733c1e217681b7f5f6cf776835f142
 AUX 20200314-big-endian.patch 11856 BLAKE2B ae107bec5156a60605d19588b61ce9b7869a41ce148f3da16b7f69a3c298667c224d0cd22796aa447ef71118ee0b6c0cb8682f71d483de4806cd4640cefcb86f SHA512 d15dd1dcc5d3ca6d798954b31ce2dbc943536bbbcd158eb3ac95c9643fa0dee4c0357aa954298ef8d270be13c0f012d424d9c5f34d865dd9dd33ff7f189d257f
 AUX 20200314-stylemap.patch 869 BLAKE2B a5907efaa1357f5b445eadfa951d9558de78eb1f8eb271cac15318a6d1e7d95c4d56918ca41307c9ff74ab05bf3cc373a5189ccaa5c76282b2c0c5d6834bfaba SHA512 1f0e363d42606fb506dd6f747ac250cce6ab4b5bf49400095cab9fd48b68232a8d58325147d2e1f7ca223093d36edf020f70f383bb0bf24f3a2f2fc3b35fb747
 AUX 20200314-tilepath.patch 1142 BLAKE2B 61aa804682a5e486c2f131fd9d81fc5d29ca946f18d9d11a323d4c49cfa8c9404b846e2afb6ac4dbf00af78133f27819f72f678298c3abfaeecd576877ac1ed4 SHA512 2cbd0ac47c211ceda2e2e4d6b62a69432e084ec664d58ff5e259f2d1eee9b70b64610d4a428d5f86305c8427c21dd6a00944a86a995c8cc5f9aed63df4aa5a31
+AUX 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
-EBUILD fontforge-20200314.ebuild 3027 BLAKE2B 6279419e6cc43c67c7089acf6585563c3be3bbe67447129cc6e480d76ace2091f7430c6ae2353bc17df3e8ad70a6dfc0a26c2757fddbfa463c21e4eb2055852a SHA512 f86153004126af75d1c752139caa0cd0a9af482dcc032d28844cba7d038fced7e7cab7c3964a8583daa94ce5ccb2eca12444e9aa539563587caa4149b600d522
-MISC metadata.xml 968 BLAKE2B 25c959d8983e879ee629f097471240a284877f9b3881c1530b91ecfee2c1207c57811a9498f92701fabafee2d8756bf75885ffe55021ab8f6194d5ea2b4c52d2 SHA512 1fb9e55e26f8974a5cc3dd421fd644ec55761c2a6767c7c8d32f8f514720e4dfc3509645bce2acc082cfca6f4b4ed4fe633d1bc9d3074cfe8ba53ae5b1b16004
+DIST fontforge-20201107.tar.xz 14163424 BLAKE2B 8ce9148eef6e5b7206ab5c70310ff36fac67c392117e3c0b28060803a54306bf21c179b62b98734e11253739eac29e2ea8bcf3014c09432bb3a0b2b0f3ec631a SHA512 cf9666395405ab02943f0160959f04251bd2a80e279a8f60431089ad19a4c5a232efd42097050ed9f6c1fb39d01488176262949fd81f5f0960fe853b497437dc
+EBUILD fontforge-20200314.ebuild 3071 BLAKE2B 55e4a654b8172aff3934d2b646b4f444bc8368f3bb66cd4b747cdf0fc7cf1a7ec3db9b680de6cafdc3f37f97346dcdb767bb60b230a383d58c2532dd74c76e7c SHA512 84c50f07b0079562a5c30250bcc302739a6297b598f8f5e9f8df258cad660c6a09ee72fdd3fded1e7d68346358e8635cdfebdb472a40e824756d97bd83620d5c
+EBUILD fontforge-20201107.ebuild 2871 BLAKE2B b8e7c8aaf7fb36e8cab1d5e9b4ea449b8e20c90e5d2b5fe9bfcd37927e07f5245fc960af874b426bf20580a1d84eb48577f848c544826a3512a11a786f813e2e SHA512 b6ed5eb401c6b7af8f95b7e0e5d39e303adf43e290b62275caae44a4031db6e5ab4079d49d7d794d633f8df28d45e7b6fa1eb7cf01a061334cae689e9561401b
+MISC metadata.xml 861 BLAKE2B 124399e55210b51cd13640775c816694e8ac20aa897984124bb6b62491494bf754e8ad772f0c322044853c8000ba882491193213a749dc696bf0d63d781cd8df SHA512 cde1be6966688ea55af73b02cf4fbffae5141bdfebf45211ca84c0f3651e39916b9abeb6bab652663ff5a68ed0b359df35e0420447a5f1c9a0ab16368f74e479
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
new file mode 100644
index 000000000000..0a07423ab626
--- /dev/null
+++ b/media-gfx/fontforge/files/fontforge-20200314-freetype-2.10.3.patch
@@ -0,0 +1,60 @@
+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
index 3379e2f1b634..613e6a7f4259 100644
--- a/media-gfx/fontforge/fontforge-20200314.ebuild
+++ b/media-gfx/fontforge/fontforge-20200314.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit python-single-r1 xdg cmake
 
@@ -58,6 +58,7 @@ PATCHES=(
 	"${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() {
diff --git a/media-gfx/fontforge/fontforge-20201107.ebuild b/media-gfx/fontforge/fontforge-20201107.ebuild
new file mode 100644
index 000000000000..96f32a9698ba
--- /dev/null
+++ b/media-gfx/fontforge/fontforge-20201107.ebuild
@@ -0,0 +1,112 @@
+# Copyright 2004-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,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 ~x86-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}"/fontforge-doc-no-warn-error.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/metadata.xml b/media-gfx/fontforge/metadata.xml
index b37524e7333a..c14fd11b9eae 100644
--- a/media-gfx/fontforge/metadata.xml
+++ b/media-gfx/fontforge/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>fonts@gentoo.org</email>
 		<name>Fonts</name>
diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest
index 50f61adcb787..986d671a41c6 100644
--- a/media-gfx/freewrl/Manifest
+++ b/media-gfx/freewrl/Manifest
@@ -6,4 +6,4 @@ AUX freewrl-2.3.3-ld.gold.patch 1120 BLAKE2B 86f6b8baf403b70b3fd346265b20bd39b76
 DIST freewrl-3.0.0.tar.bz2 1567282 BLAKE2B 84bf924ce51d70aca0baa504dba0726af82b3d2ff93de87bd18ab772f6bdbcc50807a496c14264006894b6c52bfe9844e672412162f3df1107453fa1f8b066a3 SHA512 12e75c6891238fbc9c750a9449c8a6a9f4b86124ac12871adbfb3c68b7ef09f35d3709dcb63693e50f8ac824170aef3b97854a72de0b324e67fbbb7c081675a0
 EBUILD freewrl-3.0.0-r1.ebuild 4430 BLAKE2B 7145155adf968a057b3ab817fe496fd8fa7e618e53996a27967d7937ecaa1c0f45e318e83d470d9bfc225aca797675a95f78160e07aa46afbb81e98750fd389b SHA512 0a02299bc0698e022b8eaca0aa6e9151cdb08b16155137d05a4404a467ef66ff04e0d1e0a22b86ad9d557a61210966b7a960f63c6cc478cc889b93e39f775c3a
 EBUILD freewrl-9999.ebuild 4489 BLAKE2B 8d5f07f5fbb46894e75b62994794738dcf50fa2025eeddc5a0c5c4aada55169e15c2ae5ec90434ed8f96a4a12f1f0b20b1195eee7ffc4a391280f1b9842d56c6 SHA512 9d9dd93cdc9e6dae64d0bdb068b56fa2c6a0f478708be6e48aa771e10526b30c73ae039cc83fe3f62d00bab2571e60bb013ee796c7cd613c8b3c7fa8a7cc60dc
-MISC metadata.xml 1431 BLAKE2B 85ddccbf801a54f7ff8956e7bd1bbb453ea4c79ff3cc56e52a46633416153be9b1af1ebc602ba36f07971bccecb679cc9933a023a7c7060495b86d1c9667a2cd SHA512 7290fb74f164cf5e520a024171f43d9edb4d31f09b9806a6939d5a3e1143cd2240dc1a3bea7d02ec18ee9351f6e3e27d7117b9289e0a5eaabdb42c5ed74c9d2a
+MISC metadata.xml 1381 BLAKE2B 566f615062dd20b88fb1a040961df6e117477544c38d0c53ed7350d1311829b086af1a5c3f763e24d3d63e044a2193c07ac16ed3238826a10fce987d94122db0 SHA512 04a5283d1d9006fcb92806f9eed0033d3f173e7c3d8db54bc5d09f3c26536714f1c090036ae902fbbd9dd801353139a2e896bb462cb28d50d2717fd4d16e7c8d
diff --git a/media-gfx/freewrl/metadata.xml b/media-gfx/freewrl/metadata.xml
index 21fdcd50c357..51d17f440b62 100644
--- a/media-gfx/freewrl/metadata.xml
+++ b/media-gfx/freewrl/metadata.xml
@@ -14,7 +14,6 @@ throw triangles to the screen as Extrusions, IndexedFaceSets, TriangleSets, Circ
 Cubes; the list goes on and on.  With royalty free open standards, your models will continue to render, year after year. 
 </longdescription>
 	<use>
-		<flag name="glew">Enable glew extensions</flag>
 		<flag name="libeai">Build EAI C library</flag>
 		<flag name="opencl">Enable OpenCL support</flag>
 		<flag name="osc">Allows for OSC-based control and communication between multiple freewrl instances</flag>
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 918c4f7b69d7..55c1610421ce 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,5 +1,6 @@
 AUX geeqie-1.5.1-no_common.patch 2168 BLAKE2B 3949807b4bdd99a9283ca1ff1108fbfcc6cc034d56339875bf1d65513461ccd2da447c4923e5c1c0c14af8f204503c8b2fa72bce4faa4e270a8309cae2fd75e1 SHA512 3198780bc3840691cf2239fdf8d963bb9ead90b38fdf32d4276bd55c70fbb69d0e88f55ed901990c50907dde5b242e0f1af96ca6733ccb767b9e5e2d82ffeda9
 DIST geeqie-1.5.1.tar.xz 1587116 BLAKE2B f8742a88eefd90fb1e7e1d1365058cef190b6231fcb001faa9f110676e8403c8e5959f9af398d6fa1ddc4e4c62439728904c6c39f5095f476014a5b7b74b4d16 SHA512 265eade90afe45856855e856c5f640786ca2e3add57c3ade8ca380d075297f96bf44c6e0c4fd6eabbc2666a37f898b50d37dd2e01d77875b8a622d72d8a0e6ac
+EBUILD geeqie-1.5.1-r1.ebuild 2282 BLAKE2B 4030d0db0a455bff639f2f6ec1f3d7005240ead319a4ca8882c6417a1a6204839d698859dbd745e13a754130f47d100a3643c824367ecb4cbfc6210fb3244dd3 SHA512 077244b2b9ec5c7db5c96329abf79ef004ba8b497c87f780d5a90689bb931409906e36d56bef0e09467a0dd4ace46db608e7ad03a205d50e1d2c8b98f64e176b
 EBUILD geeqie-1.5.1.ebuild 2221 BLAKE2B d55676b39a62b450cad26488920f2af5bec2915c93e2fa25f78e843db43e136538daaab7122cf512da3917bfdbb8008459e35e1293d631a291898b5f0490d1c9 SHA512 ba79b67a40834c520140359ac316738d19b23ee641683b4a3a513a465c5101cd2fb17e1a3316b5647bcda8bb51ed93a050892bc7d14c7593aed760960920b940
-EBUILD geeqie-9999.ebuild 2271 BLAKE2B 2515899a7b95323a57e493b938dbe7108da67e6609777d469c184ba0b6adfeaa9309d91873db80157699cb2b3d8feec529b4b14bcf6a2252e2b77c0238e2bba5 SHA512 e424be1e9892eadba760355d55158ba55f303b53f42c6ad293117c1cbd3b23427f47bba0051d659a49c3dfb98062ce72c9b49873e6f37867ba85d16f964c9fcf
+EBUILD geeqie-9999.ebuild 2330 BLAKE2B 5663c258cc045098f835f35484648755e87b7223f4caee2bacc746c78bbeaa683e3fa5b7ad8bef4198853bb1628c09e103df94e8d0a98b2961d2a1a36fbbc104 SHA512 e911efd079f9b6c8455302d2f02f55de4050ecda2a17beb2ab945753c8e1c6ce0fb1947f107e4218354441b912970d5687c0ac5c72b5e87346dfc06668a6c2b2
 MISC metadata.xml 923 BLAKE2B 49de6dd7b0380b1cc74ccabbc8f84e2c55144b80612e04c4e55c82d052027882cc293a70a52f857bded73246ccbb5351df53dc1e1e08b8c2c08e630bc24f9882 SHA512 752280a5fefc097c5ca8b1fc2e9f05220aa809e45484560edca7baa68d95b0d91fa14973c321aefcdb76052dc02e405e2fb4a32e6322f04cd8223afaa6734d58
diff --git a/media-gfx/geeqie/geeqie-1.5.1-r1.ebuild b/media-gfx/geeqie/geeqie-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..f0063ff9ba03
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-1.5.1-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+LUA_COMPAT=( lua5-{1..3} )
+
+inherit autotools lua-single xdg
+
+DESCRIPTION="A lightweight GTK image viewer forked from GQview"
+HOMEPAGE="http://www.geeqie.org"
+SRC_URI="http://www.geeqie.org/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map nls pdf tiff xmp"
+
+RDEPEND="
+	virtual/libintl
+	doc? ( app-text/gnome-doc-utils )
+	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
+	gpu-accel? ( media-libs/clutter-gtk )
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( x11-libs/gtk+:2 )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	lirc? ( app-misc/lirc )
+	lua? ( ${LUA_DEPS} )
+	map? ( media-libs/libchamplain:0.12 )
+	pdf? ( >=app-text/poppler-0.62[cairo] )
+	tiff? ( media-libs/tiff:0 )
+	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
+	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	gpu-accel? ( gtk3 )
+	map? ( gpu-accel )"
+
+PATCHES=( "${FILESDIR}"/${P}-no_common.patch )
+
+src_prepare() {
+	default
+
+	# Remove -Werror (gcc changes may add new warnings)
+	sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable debug debug-log)
+		$(use_enable ffmpegthumbnailer)
+		$(use_enable gpu-accel)
+		$(use_enable gtk3)
+		$(use_enable jpeg)
+		$(use_enable lcms)
+		$(use_enable lua)
+		$(use_enable lirc)
+		$(use_enable map)
+		$(use_enable nls)
+		$(use_enable pdf)
+		$(use_enable tiff)
+	)
+
+	if use exif || use xmp; then
+		myeconfargs+=( --enable-exiv2 )
+	else
+		myeconfargs+=( --disable-exiv2)
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	rm -f "${D}/usr/share/doc/${PF}/COPYING"
+	# Application needs access to the uncompressed file
+	docompress -x /usr/share/doc/${PF}/README.md
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "Some plugins may require additional packages"
+	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
+	elog "- RAW images plugin: media-gfx/ufraw"
+}
diff --git a/media-gfx/geeqie/geeqie-9999.ebuild b/media-gfx/geeqie/geeqie-9999.ebuild
index aef56eaf8bab..b9db7c038a20 100644
--- a/media-gfx/geeqie/geeqie-9999.ebuild
+++ b/media-gfx/geeqie/geeqie-9999.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+LUA_COMPAT=( lua5-{1..3} )
 
-inherit autotools git-r3 xdg
+inherit autotools git-r3 lua-single xdg
 
 DESCRIPTION="A lightweight GTK image viewer forked from GQview"
 HOMEPAGE="http://www.geeqie.org"
@@ -26,7 +27,7 @@ RDEPEND="
 	jpeg? ( virtual/jpeg:0 )
 	lcms? ( media-libs/lcms:2 )
 	lirc? ( app-misc/lirc )
-	lua? ( >=dev-lang/lua-5.1:= )
+	lua? ( ${LUA_DEPS} )
 	map? ( media-libs/libchamplain:0.12 )
 	pdf? ( >=app-text/poppler-0.62[cairo] )
 	tiff? ( media-libs/tiff:0 )
@@ -39,7 +40,8 @@ BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-REQUIRED_USE="gpu-accel? ( gtk3 )
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	gpu-accel? ( gtk3 )
 	map? ( gpu-accel )"
 
 src_prepare() {
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index b820e28c1358..ea50841bdde1 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,9 +1,10 @@
 AUX gimp-2.10_fix_test-appdata.patch 902 BLAKE2B 2b1a131d874d65422d8bdd44732b9843d89a570a1ea3c058cdb2a424a7791c686aa0e2ae2a0b472f333f2465f6e1a26750a532e9003933c5dffa1af32343c1dc SHA512 2983e8572f5e8113c9e2f564d31c1a5fe7e11ef273c50d2be739089124c6ec1a457da28222020bbd6015b2cbbcbf403b88d8660b9b35241800deb4fb3ad79067
-DIST gimp-2.10.18.tar.bz2 32946467 BLAKE2B eb1c756ca646ee9ddc42aebe214ad3e2dedf125940dc1b9cfd04a4424bd2b6255041f1bafbda3fc214f93d97e7802372234a42e1daa0ee56caaf0f0bedd908f9 SHA512 88990f2d70508b22f4acadeab6b687e20af19b765ebc6f245d0c99b3dd853fcd3d237c3b7607e50133aa95a1d71931069029dfd7ee94441ff419c542c141bc9f
+AUX gimp-2.99.2_fix_autoconf-2.70.patch 1913 BLAKE2B 779ce5a54150ee2a89507420931f255c09602af36ab8176f7ae9f18a7c1feb12451e817d2a89251d0366af6db90f602a107108227c98ac99b73e16ddb7b1fd05 SHA512 efa8882896335d3ac4ae7fb8874b5bd568472ccdcaeaf1d771f6c6b815b138186016f39f5f2f30fa01c1018ad583649fcf564cc5a8bcece741092f7dbc22f5fa
 DIST gimp-2.10.20.tar.bz2 33108938 BLAKE2B 060c0e46e6f4ac861de265842d545285c2fa4590908172971ef240ae87f8caa2c015447deee810fef59c4869810676daae2e40aa611062168feffe38c7cd9b22 SHA512 7cd0b1833af87a167fdfee59fb491a72727fe3071c21c0de1813adb0f8272a92473e1e300517395b1b4593c8cb6781ee30f7a63966756e5a7f523a164308aba6
-EBUILD gimp-2.10.18-r1.ebuild 6166 BLAKE2B a0457d562c194faf821e57647a171d1152f35c567332dff9fbde3e5c69a1ad55e547f07ca94d4f3f58178be7c56005655d2c77c342b8fc983968aca93784e033 SHA512 e7dbff03388e9b651851eb54aa5c8fb61736f288747d0ada5986bb9851cd5de7fefa9b57fe81b36363de27f608b254fba3049f759d4d2ccc40b1eaf3f70308b4
-EBUILD gimp-2.10.18-r2.ebuild 6313 BLAKE2B c4858a01c8bb279ebb9f14bce5c578679bec05de6d6418a4137c012840fa7cdb707d97b74bdb602f0c9a018fe56bd67452af71bf42857b0d9a77a133caa3cc89 SHA512 eca3afb038ed0c51ae1b499e69b1af5f41e3ef2cc95b1d064241d6151b2bc8d8444e2b7a8806a84de15c4f8306a3ee07de8101827114a5a5b9c26acd0e487bca
-EBUILD gimp-2.10.20-r1.ebuild 6022 BLAKE2B 75e149312d91224b99ef93146525509c411a02cf59d87f3c727fcee60504f6769d84dc676439eb59a880edb17cfda65ae5ae2eff0062c9ee4ff74247f1f73cf0 SHA512 d1aec4d39329879101a28769a192dd92cc296c80402d99dfed07c9a5f7974363cd94dfe1765142f146bca43e005a6dad77bac45a86c47be26ae2f46be23f4d62
-EBUILD gimp-2.10.20-r2.ebuild 5652 BLAKE2B 42e8acc097cb3e25713fa144e9e1259ef29c01d0bd706f6f5ecbce4040ac2841027ab9231314d8f3225b4fd9c360e16e51a4a49be02ad5612550892be96a8031 SHA512 467eebc4200c581b91c9af811132b817a7518e41beb238921e735568d8c174052da04a98b0c1a30e7683f4f0cbef4b6a794cf01e0941076df98f5e95d27d1444
-EBUILD gimp-9999.ebuild 6461 BLAKE2B ba3eac8a82d0ebac3cc0ae18c2cddfecdb54fb922707e813d9a922d1f466564f50d42ab24a9de9dab1f63a1302dc84bcede6b4ca3dd4e38503cb64fcee565a93 SHA512 97a1d450095bfa7219672c45100403950029a5c0620ce50ab50eee318baf8e0b944fe387d6483f4f5b9a5c570b8f77b346306c62ba6cfaf673d01c9f6232861e
+DIST gimp-2.10.22.tar.bz2 33152226 BLAKE2B d11b0ee8f0f24934383028a0b21820af30da6133814d64b67981888086f3eaa4378e474ff801db046f2fe5d380325ac7279df6e749d100219e2f6558c9bdf10d SHA512 13841ac4a186df47e4155095ca888a903b2db9e25a73fbb834fe981ccf915cb67a3e08506e5c13b6c5f35e27b1de24befbccf871e438b1a35f67f069bebd8fd0
+DIST gimp-2.99.2.tar.bz2 32375596 BLAKE2B 3dc5af7935e3503106cf2020798974d68fe86e5034792b09683519502474022e3a7832f418dfcdb4a022e6ebe878bb567bfbbbe51a96f0ae76375adc0dfdd6e5 SHA512 0a773ab01427abfb1b7690e855a041dc4883630fc827ce9d83169ccc5b4f925ecb9a0a16928a9c0ed0592c2c351ced5832e212d3115475c0f7a6092822adc194
+EBUILD gimp-2.10.20-r3.ebuild 5652 BLAKE2B bc21e87460de992194034412240af90c0e35c15f311ddb55c191852512c8ca7472df32e7b3bea6717171a73f8faa8a486f311cad16da92b43bf8becbd9eb6b09 SHA512 2b03724793af7df9456bc7f491e075875fc5e49fc09c57d27513cf1efed44055986961b17164959cc6e3086e6593fa7c5ae20f02fd65a88d633880e4f3e172b5
+EBUILD gimp-2.10.22-r1.ebuild 5587 BLAKE2B 418e5b5cd0a3352fa8eb9362ffbdf4a6f6ffd658ad8337c5d7fdb2e19366d5be3e42d0da469ac6f0caf002b0fc385ad2bc627811785fe16fde384d4d02dd42de SHA512 2d027b4a6a7e3437feae6d4678fcc3aa9bae42fa9db413dbae5e05961860d717186aeebfecd396492903e69d78c81fe9e747e23cfae7093223eb2575aa935be6
+EBUILD gimp-2.99.2.ebuild 6485 BLAKE2B 95fba925bca3edd2582f9a478225a36acac50dd8d7911458499b9678469e1b9c466b1ced1b46c34aa0e5eb19f5eb9c19ff21d230c033634be66c4a3769caeaf7 SHA512 20bf106a3cad5d98afe3f0e5ee4e23d75bd9663e0f4fccb370d3bc9f97343f81a2680940f5fd78d1621feed62b98687ee5faf71bcc35c269404f03fafe1895f9
+EBUILD gimp-9999.ebuild 6772 BLAKE2B fb77a595d6a04d99dba7a511786dbf38414c2830e97643ee60329717b96da082077f51494e30dff0faba089057e7676358c5b11f97ae638cd400f492f6b93e02 SHA512 e8e22ad2ad22f94d988000d43c375d88a999ed8771d6c0ba1cc4a19e89c0cb5ad75a5026eac662d0548bbda11493ba4fe419d06d338283f78707c3987bddbfef
 MISC metadata.xml 546 BLAKE2B 2d5b9a68c47a72325199586a142f1d8344bef770d24738169c80958f3def3a0f1ad0b4d23774d3c458d80f17a394033813e01fc5e24b8b62146d2c55b5f8c9b0 SHA512 f654d93c738c942605ae61fe0d76972a1b81bffaf4edc23a1f55bb65e71022df7f14e769a71c41e5c5c7307eef9618a667ae418dc9bc77d5ac1299bbe0c58834
diff --git a/media-gfx/gimp/files/gimp-2.99.2_fix_autoconf-2.70.patch b/media-gfx/gimp/files/gimp-2.99.2_fix_autoconf-2.70.patch
new file mode 100644
index 000000000000..732cd9381ae3
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.99.2_fix_autoconf-2.70.patch
@@ -0,0 +1,58 @@
+From cebeb90a87105cd6e35bcb357d53cc04c828ca21 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sun, 25 Oct 2020 18:09:21 +0000
+Subject: [PATCH] configure.ac: fix `--with-linux-input` handling with upcoming
+ autoconf-2.70
+
+Upcoming autoconf-2.70 exposes deficiency in configure.ac:
+
+```
+$ autoconf-2.70_beta2 && ./configure --host=x86_64-pc-linux-gnu
+./configure: line 1430: 5: Bad file descriptor
+checking whether  is declared... ./configure: line 1432: ${+y}: bad
+```
+
+It happens because macros are called with parameters using insufficient quoting.
+
+More details at https://lists.gnu.org/archive/html/bug-autoconf/2020-10/msg00027.html
+
+The fix only amends `--with-linux-input`. Other cases of underquoting
+will need to be handled separately.
+
+Fix-by: Zack Weinberg
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ configure.ac | 17 ++++++++---------
+ 1 file changed, 8 insertions(+), 9 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 96312f706e..63b85be07a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2135,15 +2135,14 @@ fi
+ AC_ARG_WITH(linux-input, [  --without-linux-input   don't build linux input event controller module])
+ 
+ have_linux_input="no (linux input support disabled)"
+-if test "x$with_linux_input" != "xno"; then
+-  AC_CHECK_HEADER(linux/input.h,
+-	AC_CHECK_DECL(KEY_OK,
+-		have_linux_input=yes,
+-		have_linux_input="no (needs Linux 2.6)",
+-		[#include <linux/input.h>]))
+-fi
+-
+-AM_CONDITIONAL(HAVE_LINUX_INPUT, test "x$have_linux_input" = xyes)
++AS_IF([test "x$with_linux_input" != "xno"],
++  [AC_CHECK_HEADER([linux/input.h],
++    [AC_CHECK_DECL([KEY_OK],
++                   [have_linux_input=yes],
++                   [have_linux_input="no (needs Linux 2.6)"],
++                   [#include <linux/input.h>])])])
++
++AM_CONDITIONAL([HAVE_LINUX_INPUT], [test "x$have_linux_input" = xyes])
+ 
+ 
+ ###############################
+-- 
+GitLab
+
diff --git a/media-gfx/gimp/gimp-2.10.18-r1.ebuild b/media-gfx/gimp/gimp-2.10.18-r1.ebuild
deleted file mode 100644
index 282b14daa351..000000000000
--- a/media-gfx/gimp/gimp-2.10.18-r1.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-GNOME2_EAUTORECONF=yes
-WANT_AUTOMAKE=
-
-inherit autotools gnome2 python-single-r1 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="2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
-
-IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-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.0: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-1.3.0
-	>=media-libs/babl-0.1.74
-	>=media-libs/fontconfig-2.12.4
-	>=media-libs/freetype-2.1.7
-	>=media-libs/gegl-0.4.22: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.3.0:=
-	>=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.3.2:= )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
-	mng? ( media-libs/libmng:= )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
-	postscript? ( app-text/ghostscript-gpl )
-	python?	(
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	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"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Disable system CFLAGS suppressing on SSE{2,4.1} support tests by addition of {SSE2,SSE4_1}_EXTRA_CFLAGS: bug #702554
-	sed -i -e 's:\$intrinsics_save_CFLAGS \$SSE2_EXTRA_CFLAGS:\$SSE2_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' \
-		-e 's:\$intrinsics_save_CFLAGS \$SSE4_1_EXTRA_CFLAGS:\$SSE4_1_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' configure.ac || die
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
-
-	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
-}
-
-_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
-		--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 python)
-		$(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 || exit 1
-		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} || exit 1
-			mv {,${prepend}}${plugin} || exit 1
-		    fi
-		done
-	)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	use python && python_optimize
-
-	# 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=$(get_version_component_range 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-2.10.20-r2.ebuild b/media-gfx/gimp/gimp-2.10.20-r3.ebuild
index b608de52d4ef..b108c5a443af 100644
--- a/media-gfx/gimp/gimp-2.10.20-r2.ebuild
+++ b/media-gfx/gimp/gimp-2.10.20-r3.ebuild
@@ -11,8 +11,8 @@ 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="2"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
+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"
 
diff --git a/media-gfx/gimp/gimp-2.10.20-r1.ebuild b/media-gfx/gimp/gimp-2.10.22-r1.ebuild
index 347ade7269ef..97824d5c1abc 100644
--- a/media-gfx/gimp/gimp-2.10.20-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.22-r1.ebuild
@@ -2,21 +2,19 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 )
 GNOME2_EAUTORECONF=yes
 WANT_AUTOMAKE=
 
-inherit autotools gnome2 python-single-r1 toolchain-funcs virtualx
+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="2"
+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 python udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+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 )"
 
@@ -29,11 +27,11 @@ COMMON_DEPEND="
 	dev-libs/libxml2:2
 	dev-libs/libxslt
 	>=gnome-base/librsvg-2.40.6:2
-	>=media-gfx/mypaint-brushes-1.3.0:=
+	>=media-gfx/mypaint-brushes-2.0.2:=
 	>=media-libs/babl-0.1.78
 	>=media-libs/fontconfig-2.12.4
 	>=media-libs/freetype-2.1.7
-	>=media-libs/gegl-0.4.24:0.4[cairo]
+	>=media-libs/gegl-0.4.26:0.4[cairo]
 	>=media-libs/gexiv2-0.10.6
 	>=media-libs/harfbuzz-0.9.19
 	>=media-libs/lcms-2.8:2
@@ -56,13 +54,6 @@ COMMON_DEPEND="
 	mng? ( media-libs/libmng:= )
 	openexr? ( >=media-libs/openexr-1.6.1:= )
 	postscript? ( app-text/ghostscript-gpl )
-	python?	(
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}]
-		')
-	)
 	udev? ( dev-libs/libgudev:= )
 	unwind? ( >=sys-libs/libunwind-1.1.0:= )
 	webp? ( >=media-libs/libwebp-0.6.0:= )
@@ -95,14 +86,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
 )
 
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
 src_prepare() {
-	if has_version "media-gfx/mypaint-brushes:2.0" ; then
-		sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
-	fi
+	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
@@ -139,6 +124,7 @@ src_configure() {
 		--enable-default-binary
 
 		--disable-check-update
+		--disable-python
 		--enable-mp
 		--with-appdata-test
 		--with-bug-report-url=https://bugs.gentoo.org/
@@ -149,7 +135,6 @@ src_configure() {
 		$(use_enable cpu_flags_ppc_altivec altivec)
 		$(use_enable cpu_flags_x86_mmx mmx)
 		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable python)
 		$(use_enable vector-icons)
 		$(use_with aalib aa)
 		$(use_with alsa)
@@ -179,14 +164,14 @@ _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 || exit 1
+		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} || exit 1
-			mv {,${prepend}}${plugin} || exit 1
+			mv ${plugin}/{,${prepend}}${plugin} || die
+			mv {,${prepend}}${plugin} || die
 		    fi
 		done
 	)
@@ -199,8 +184,6 @@ src_test() {
 src_install() {
 	gnome2_src_install
 
-	use python && python_optimize
-
 	# Workaround for bug #321111 to give GIMP the least
 	# precedence on PDF documents by default
 	mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
diff --git a/media-gfx/gimp/gimp-2.10.18-r2.ebuild b/media-gfx/gimp/gimp-2.99.2.ebuild
index ec2b8c9e32d4..f06290af12d5 100644
--- a/media-gfx/gimp/gimp-2.10.18-r2.ebuild
+++ b/media-gfx/gimp/gimp-2.99.2.ebuild
@@ -2,68 +2,76 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 )
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 GNOME2_EAUTORECONF=yes
-WANT_AUTOMAKE=
+VALA_MIN_API_VERSION="0.40"
+VALA_USE_DEPEND=vapigen
 
-inherit autotools gnome2 python-single-r1 virtualx
+inherit autotools gnome2 python-single-r1 toolchain-funcs vala virtualx
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
+SRC_URI="mirror://gimp/v2.99/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
+SLOT="0/3"
+#KEYWORDS="~amd64"
 
-IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
+IUSE="aalib alsa aqua debug doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RESTRICT="!test? ( test )"
 
+# media-libs/{babl,gegl} are required to be built with USE="introspection"
+# to fix the compilation checking of /usr/share/gir-1.0/{Babl-0.1gir,Gegl-0.4.gir}
 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.0:2
-	>=dev-libs/json-glib-1.2.6
+	>=app-text/poppler-0.90.1[cairo]
+	>=app-text/poppler-data-0.4.9
+	>=dev-libs/atk-2.34.1
+	>=dev-libs/glib-2.62.6:2
+	>=dev-libs/json-glib-1.4.4
 	dev-libs/libxml2:2
 	dev-libs/libxslt
-	>=gnome-base/librsvg-2.40.6:2
-	>=media-gfx/mypaint-brushes-1.3.0:=
-	>=media-libs/babl-0.1.74
-	>=media-libs/fontconfig-2.12.4
-	>=media-libs/freetype-2.1.7
-	>=media-libs/gegl-0.4.22: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.3.0:=
-	>=media-libs/libpng-1.6.25:0=
-	>=media-libs/tiff-3.5.7:0
+	>=gnome-base/librsvg-2.40.21:2
+	>=media-gfx/mypaint-brushes-2.0.2:=
+	>=media-libs/babl-0.1.78[introspection,lcms,vala?]
+	>=media-libs/fontconfig-2.12.6
+	>=media-libs/freetype-2.10.2
+	>=media-libs/gegl-0.4.26:0.4[cairo,introspection,lcms,vala?]
+	>=media-libs/gexiv2-0.10.10
+	>=media-libs/harfbuzz-2.6.5
+	>=media-libs/lcms-2.9:2
+	>=media-libs/libmypaint-1.6.1:=
+	>=media-libs/libpng-1.6.37:0=
+	>=media-libs/tiff-4.1.0: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/cairo-1.16.0
+	>=x11-libs/gdk-pixbuf-2.40.0:2
+	>=x11-libs/gtk+-3.24.16:3
 	x11-libs/libXcursor
-	>=x11-libs/pango-1.29.4
+	>=x11-libs/pango-1.42.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.3.2:= )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+	heif? ( >=media-libs/libheif-1.7.0:= )
+	javascript? ( dev-libs/gjs )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )
+	lua? (
+		dev-lang/luajit
+		dev-lua/lgi
+	)
 	mng? ( media-libs/libmng:= )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
+	openexr? ( >=media-libs/openexr-2.3.0:= )
 	postscript? ( app-text/ghostscript-gpl )
-	python?	(
+	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			>=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygobject-3.0:3[${PYTHON_MULTI_USEDEP}]
 		')
 	)
-	udev? ( dev-libs/libgudev:= )
+	udev? ( >=dev-libs/libgudev-167:= )
 	unwind? ( >=sys-libs/libunwind-1.1.0:= )
 	webp? ( >=media-libs/libwebp-0.6.0:= )
 	wmf? ( >=media-libs/libwmf-0.2.8 )
@@ -78,43 +86,54 @@ RDEPEND="
 
 DEPEND="
 	${COMMON_DEPEND}
-	>=dev-lang/perl-5.10.0
-	dev-libs/appstream-glib
+	>=dev-lang/perl-5.30.3
+	>=dev-libs/appstream-glib-0.7.16
+	dev-util/gdbus-codegen
 	dev-util/gtk-update-icon-cache
-	>=dev-util/intltool-0.40.1
+	>=dev-util/intltool-0.51.0
 	sys-apps/findutils
-	>=sys-devel/gettext-0.19
-	>=sys-devel/libtool-2.2
+	>=sys-devel/autoconf-2.54
+	>=sys-devel/automake-1.11
+	>=sys-devel/gettext-0.21
+	>=sys-devel/libtool-2.4.6
 	virtual/pkgconfig
+	doc? (
+		>=dev-util/gtk-doc-1.32
+		dev-util/gtk-doc-am
+	)
+	vala? ( $(vala_depend) )
 "
 
-DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
+DOCS=( "AUTHORS" "HACKING" "NEWS" "README" "README.i18n" )
 
 # Bugs 685210 (and duplicate 691070)
 PATCHES=(
 	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
+	"${FILESDIR}/${P}_fix_autoconf-2.70.patch"
 )
 
 pkg_setup() {
-	use python && python-single-r1_pkg_setup
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
 }
 
 src_prepare() {
-	if has_version "media-gfx/mypaint-brushes:2.0" ; then
-		sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
-	fi
+	sed -i -e 's/\[gegl_micro_version\], \[27\]/\[gegl_micro_version\], \[26\]/' configure.ac || die
 
-	# Disable system CFLAGS suppressing on SSE{2,4.1} support tests by addition of {SSE2,SSE4_1}_EXTRA_CFLAGS: bug #702554
-	sed -i -e 's:\$intrinsics_save_CFLAGS \$SSE2_EXTRA_CFLAGS:\$SSE2_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' \
-		-e 's:\$intrinsics_save_CFLAGS \$SSE4_1_EXTRA_CFLAGS:\$SSE4_1_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' configure.ac || die
+	sed -i -e 's/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
 
+	use vala && vala_src_prepare
+
 	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() {
@@ -136,7 +155,7 @@ src_configure() {
 
 	local myconf=(
 		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
-		GDBUS_CODEGEN="${EPREFIX}"/bin/false
+		GDBUS_CODEGEN="${EPREFIX}"/usr/bin/gdbus-codegen
 
 		--enable-default-binary
 
@@ -151,18 +170,22 @@ src_configure() {
 		$(use_enable cpu_flags_ppc_altivec altivec)
 		$(use_enable cpu_flags_x86_mmx mmx)
 		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable python)
+		$(use_enable doc gtk_doc)
 		$(use_enable vector-icons)
 		$(use_with aalib aa)
 		$(use_with alsa)
 		$(use_with !aqua x)
 		$(use_with heif libheif)
+		$(use_with javascript)
 		$(use_with jpeg2k jpeg2000)
+		$(use_with lua)
 		$(use_with mng libmng)
 		$(use_with openexr)
 		$(use_with postscript gs)
+		$(use_with python)
 		$(use_with udev gudev)
 		$(use_with unwind libunwind)
+		$(use_with vala)
 		$(use_with webp)
 		$(use_with wmf)
 		$(use_with xpm libxpm)
@@ -181,7 +204,7 @@ _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 || exit 1
+		cd "${ED%/}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1
 		for plugin_slash in $(ls -d1 */); do
 		    plugin=${plugin_slash%/}
 		    if [[ -f ${plugin}/${plugin} ]]; then
@@ -201,7 +224,9 @@ src_test() {
 src_install() {
 	gnome2_src_install
 
-	use python && python_optimize
+	if use python; then
+		python_optimize
+	fi
 
 	# Workaround for bug #321111 to give GIMP the least
 	# precedence on PDF documents by default
@@ -210,13 +235,7 @@ src_install() {
 	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=$(get_version_component_range 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
+	mv "${ED%/}"/usr/share/man/man1/gimp-console{-*,}.1 || die
 
 	_rename_plugins || die
 }
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 4bab1cc4f0bf..0d94d06ee022 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -3,22 +3,22 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 GNOME2_EAUTORECONF=yes
 VALA_MIN_API_VERSION="0.40"
 VALA_USE_DEPEND=vapigen
 
-inherit autotools git-r3 gnome2 python-single-r1 vala virtualx
+inherit autotools git-r3 gnome2 python-single-r1 toolchain-funcs vala virtualx
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/"
 EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gimp.git"
 SRC_URI=""
 LICENSE="GPL-3 LGPL-3"
-SLOT="2"
+SLOT="0/3"
 KEYWORDS=""
 
-IUSE="aalib alsa aqua debug doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
+IUSE="aalib alsa aqua debug doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RESTRICT="!test? ( test )"
@@ -26,44 +26,45 @@ RESTRICT="!test? ( test )"
 # media-libs/{babl,gegl} are required to be built with USE="introspection"
 # to fix the compilation checking of /usr/share/gir-1.0/{Babl-0.1gir,Gegl-0.4.gir}
 COMMON_DEPEND="
-	app-arch/bzip2
-	>=app-arch/xz-utils-5.0.0
-	>=app-text/poppler-0.69[cairo]
+	>=app-text/poppler-0.90.1[cairo]
 	>=app-text/poppler-data-0.4.9
-	>=dev-libs/atk-2.4.0
-	>=dev-libs/glib-2.56.2:2
-	>=dev-libs/json-glib-1.2.6
-	dev-libs/libxml2
+	>=dev-libs/atk-2.34.1
+	>=dev-libs/glib-2.62.6:2
+	>=dev-libs/json-glib-1.4.4
+	dev-libs/libxml2:2
 	dev-libs/libxslt
-	>=gnome-base/librsvg-2.40.6:2
-	>=media-gfx/mypaint-brushes-1.3.0:=
-	>=media-libs/babl-0.1.80[introspection,lcms,vala]
-	>=media-libs/fontconfig-2.12.4
-	>=media-libs/freetype-2.1.7
-	>=media-libs/gegl-0.4.26:0.4[cairo,introspection,lcms,vala]
-	>=media-libs/gexiv2-0.10.6
-	>=media-libs/harfbuzz-0.9.19
-	>=media-libs/lcms-2.8:2
-	>=media-libs/libmypaint-1.3.0:=
-	>=media-libs/libpng-1.6.25:0=
-	>=media-libs/tiff-3.5.7:0
+	>=gnome-base/librsvg-2.40.21:2
+	>=media-gfx/mypaint-brushes-2.0.2:=
+	>=media-libs/babl-0.1.82[introspection,lcms,vala?]
+	>=media-libs/fontconfig-2.12.6
+	>=media-libs/freetype-2.10.2
+	>=media-libs/gegl-0.4.27:0.4[cairo,introspection,lcms,vala?]
+	>=media-libs/gexiv2-0.10.10
+	>=media-libs/harfbuzz-2.6.5
+	>=media-libs/lcms-2.9:2
+	>=media-libs/libmypaint-1.6.1:=
+	>=media-libs/libpng-1.6.37:0=
+	>=media-libs/tiff-4.1.0:0
 	net-libs/glib-networking[ssl]
 	sys-libs/zlib
-	virtual/jpeg:0
-	>=x11-libs/cairo-1.14.0
-	>=x11-libs/gdk-pixbuf-2.36:2
-	>=x11-libs/gtk+-3.22.29:3
+	virtual/jpeg
+	>=x11-libs/cairo-1.16.0
+	>=x11-libs/gdk-pixbuf-2.40.0:2
+	>=x11-libs/gtk+-3.24.16:3
 	x11-libs/libXcursor
-	>=x11-libs/pango-1.42.0
+	>=x11-libs/pango-1.42.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.3.2:= )
+	heif? ( >=media-libs/libheif-1.7.0:= )
 	javascript? ( dev-libs/gjs )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
-	lua? ( dev-lang/luajit )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )
+	lua? (
+		dev-lang/luajit
+		dev-lua/lgi
+	)
 	mng? ( media-libs/libmng:= )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
+	openexr? ( >=media-libs/openexr-2.3.0:= )
 	postscript? ( app-text/ghostscript-gpl )
 	python? (
 		${PYTHON_DEPS}
@@ -86,22 +87,22 @@ RDEPEND="
 
 DEPEND="
 	${COMMON_DEPEND}
-	>=dev-lang/perl-5.10.0
-	>=dev-libs/appstream-glib-0.7.7
+	>=dev-lang/perl-5.30.3
+	>=dev-libs/appstream-glib-0.7.16
 	dev-util/gdbus-codegen
 	dev-util/gtk-update-icon-cache
-	>=dev-util/intltool-0.40.1
+	>=dev-util/intltool-0.51.0
 	sys-apps/findutils
 	>=sys-devel/autoconf-2.54
 	>=sys-devel/automake-1.11
-	>=sys-devel/gettext-0.19
-	>=sys-devel/libtool-2.2
+	>=sys-devel/gettext-0.21
+	>=sys-devel/libtool-2.4.6
 	virtual/pkgconfig
 	doc? (
-		>=dev-util/gtk-doc-1.0
+		>=dev-util/gtk-doc-1.32
 		dev-util/gtk-doc-am
 	)
-	$(vala_depend)
+	vala? ( $(vala_depend) )
 "
 
 DOCS=( "AUTHORS" "HACKING" "NEWS" "README" "README.i18n" )
@@ -118,24 +119,27 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if has_version "media-gfx/mypaint-brushes:2.0" ; then
-		sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
-	fi
+	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
 
 	# Fix checking of gtk-doc.make if USE="-doc" like autogen.sh
+	# USE="doc" is currently broken for gimp-9999 due to absence of appropriate *.m4 file
 	if ! use doc ; then
 		echo "EXTRA_DIST = missing-gtk-doc" > gtk-doc.make
+		sed -i -e "/CLEANFILES/s/^/#/g" \
+		"${S}"/devel-docs/{libgimp,libgimpbase,libgimpcolor,libgimpconfig,libgimpmath,libgimpmodule,libgimpthumb,libgimpwidgets}/Makefile.am || die
 	fi
 
 	gnome2_src_prepare  # calls eautoreconf
 
-	vala_src_prepare
+	use vala && vala_src_prepare
 
 	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() {
@@ -161,11 +165,11 @@ src_configure() {
 
 		--enable-default-binary
 
+		--disable-check-update
 		--enable-mp
 		--with-appdata-test
 		--with-bug-report-url=https://bugs.gentoo.org/
 		--with-xmc
-		--with-vala
 		--without-libbacktrace
 		--without-webkit
 		--without-xvfb-run
@@ -187,6 +191,7 @@ src_configure() {
 		$(use_with python)
 		$(use_with udev gudev)
 		$(use_with unwind libunwind)
+		$(use_with vala)
 		$(use_with webp)
 		$(use_with wmf)
 		$(use_with xpm libxpm)
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 93e0e161c9b5..26d127e139b1 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,5 +1,6 @@
-DIST gmic_2.9.0.tar.gz 6195597 BLAKE2B 3e1f83aa7e2024c545cab16c15cbd108ecaa33e7b0423c37cbb7e19fc9179280dfb31d819926110f06ff10a8b2b3e22b3c7f6c3e8bdece8b51c7295b8e78a974 SHA512 3b3703520998e5ad547316683158d7b60541a8cea2a7c1e7118f8de88492e0961bf1fe1da360dfb26d0ba7eaf997e7005a864364297db2bb405d532dedc4241d
-DIST gmic_2.9.1.tar.gz 6212626 BLAKE2B cb948987629f9bf07f3e756eb5f90526ac2012a7bd2c11021a3fbc253709d9e62ecd60a2f3a9f9fd9a8605f0f2a73497143c4f121e27d1cb5aa4f3a455916c56 SHA512 dc6a90bb130b50164f7696a2e0c702ee24267f1559f52b77d4040fa0477c452b52eb140263bb3abb49673638246784b356004866e13f6d0660feff759688b45b
-EBUILD gmic-2.9.0.ebuild 4280 BLAKE2B d75d51965efd8f73b1b3112b14d640ddc63ee4ea8f0c51aa7deaa06ae16b87259e1d3b50c8513271a1004633246d788862ace4cbf05e341c13a0c6ebee427293 SHA512 99dc7f60578d1b42865e476527e4a2f86622dec59afd182d85c5588ace1764f34f2c92f08a6ffae1cb2f27c66e8b2044cd20d9daaa19aed64b5a03d21a01142b
-EBUILD gmic-2.9.1.ebuild 4280 BLAKE2B d75d51965efd8f73b1b3112b14d640ddc63ee4ea8f0c51aa7deaa06ae16b87259e1d3b50c8513271a1004633246d788862ace4cbf05e341c13a0c6ebee427293 SHA512 99dc7f60578d1b42865e476527e4a2f86622dec59afd182d85c5588ace1764f34f2c92f08a6ffae1cb2f27c66e8b2044cd20d9daaa19aed64b5a03d21a01142b
-MISC metadata.xml 455 BLAKE2B 3854d23d62226a85f06404a3df62db1520a966a921137768f90a64bf2fcb0235f0786b8187154a0758682551eae61550fd571f7dfd940396de6f03fd6be204ad SHA512 95088719b28034519d74495a7232695eedd527cb031f65b808ac30d4cf0fc8ab2bca2271d02ef285f338d60151b30f0b3420eb29a45ac4f8a8922ab6b7e42a5e
+AUX gmic-2.9.2_ipa-sra.patch 665 BLAKE2B b61fa87ac2da5fd5956c89cb4a6c128f266a175dca70cd34ff4bed0483c934241a375131eaddd6ebd5f3afb52e694d4fc6839d20718bc06463c0e263f15b6d5a SHA512 6f04cac4de5914cedd269655fe58ca406199c042bdbab6e706cfea49516d0a7e1234e61c51b6a142341a7984dd96e97c4b8f13c2efbe427627be26539af8653e
+DIST gmic_2.9.2.tar.gz 6639693 BLAKE2B 4b452cc5c82e8ea30a1bd65e51b6187fc12d9c7f8af6d0f8107a8d183c6e87dff11394f103eae7ac17daa00c6c9aa0f47ce78a92156e2da9bc4ee0fcacbf398d SHA512 be8707b5c156b17189548c1f808b976afcb7b7cce20ff54ff4589eda9a76a8cddf81c64b7a53c332254b2c8c29fb8ca0926016cadcb1efb7131a38d857fce796
+DIST gmic_2.9.3.tar.gz 7279292 BLAKE2B 920a94321b2916f65bb2c5b273c4938acdcd7b4825a3eeeb15407b1a6d7881f927792f89524db7d3a33272ddae8e39e8f60d29a922b5dd2873e6b9be2948a646 SHA512 e640c73b9d008b445d075b02ed7d359a0c2ee51df8245557192e38ed108e6db43de0fca577f1636c40b2c4a7db038f79926e7666b9f00b6421cda96d9a91b3ff
+EBUILD gmic-2.9.2-r1.ebuild 4848 BLAKE2B 19cec459abf67e10c99319c9fc1174eba19390e94bfe07595d75c3bcf144cad2235281b1a07eabb56c245aba87ceda414c602f64b51734669010961f652db473 SHA512 1857c8b9c01dbd03f3e2dee257fece0ebb6574ce1eb91db76be86e1b3879b0aed7067ba25857e247e49ec1adfb4cc483f52b41ede31f9156b8650e4f295593c8
+EBUILD gmic-2.9.3.ebuild 4848 BLAKE2B 19cec459abf67e10c99319c9fc1174eba19390e94bfe07595d75c3bcf144cad2235281b1a07eabb56c245aba87ceda414c602f64b51734669010961f652db473 SHA512 1857c8b9c01dbd03f3e2dee257fece0ebb6574ce1eb91db76be86e1b3879b0aed7067ba25857e247e49ec1adfb4cc483f52b41ede31f9156b8650e4f295593c8
+MISC metadata.xml 605 BLAKE2B f1ed3b46614a3e3273e4bdedfd7b45629eca482a0805ff1bda2161e4d785a478b91f8ccdbab399b184ec93d020211e35e4503fbf4205b1e2e1f04c7e547303bd SHA512 8303e0a301edb88bdb7522baf47e29b39e895ccaa729231d64b6a39af73f0eb1626c39439f1ed70d496d982f3abca4ff9586d20fc5a9d08b0e57a19b60bf088d
diff --git a/media-gfx/gmic/files/gmic-2.9.2_ipa-sra.patch b/media-gfx/gmic/files/gmic-2.9.2_ipa-sra.patch
new file mode 100644
index 000000000000..384856a0464f
--- /dev/null
+++ b/media-gfx/gmic/files/gmic-2.9.2_ipa-sra.patch
@@ -0,0 +1,15 @@
+A GCC-specific setting from years ago. gcc-9 quietly ignores it (the
+resulting binaries appear to be the same whether -fno-ipa-sra has been
+specified or not), clang fails on it as not recognised.
+Just get rid of it altogether.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -100,7 +100,7 @@
+ if(APPLE)
+    set(COMPILE_FLAGS "${COMPILE_FLAGS} -mmacosx-version-min=10.8 -stdlib=libc++ -Wno-error=c++11-narrowing -Wc++11-extensions -fpermissive")
+ else()
+-  set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-error=narrowing -fno-ipa-sra -fpermissive")
++  set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-error=narrowing -fpermissive")
+ endif()
+ 
+ if(NOT "${PRERELEASE_TAG}" STREQUAL "")
diff --git a/media-gfx/gmic/gmic-2.9.1.ebuild b/media-gfx/gmic/gmic-2.9.2-r1.ebuild
index 660e4b3ff4dc..4af6d1c63fa1 100644
--- a/media-gfx/gmic/gmic-2.9.1.ebuild
+++ b/media-gfx/gmic/gmic-2.9.2-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 CMAKE_BUILD_TYPE=Release
+
 inherit cmake bash-completion-r1 toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
@@ -11,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"
@@ -19,9 +20,10 @@ HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
 
 LICENSE="CeCILL-2 GPL-3"
 SLOT="0"
-IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+IUSE="+cli curl digikam ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
 REQUIRED_USE="
-	|| ( cli gimp krita qt5 )
+	|| ( 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 )
@@ -36,9 +38,13 @@ QT_DEPEND="
 "
 COMMON_DEPEND="
 	curl? ( net-misc/curl )
+	digikam? (
+		media-gfx/digikam
+		${QT_DEPEND}
+	)
 	fftw? ( sci-libs/fftw:3.0=[threads] )
 	gimp? (
-		>=media-gfx/gimp-2.8.0
+		media-gfx/gimp:0/2
 		${QT_DEPEND}
 	)
 	graphicsmagick? ( media-gfx/graphicsmagick:0= )
@@ -61,19 +67,22 @@ 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"
 
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
+)
 
-	if ! test-flag-CXX -std=c++11 ; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use openmp; then
+			tc-has-openmp || die "Please switch to an openmp compatible compiler"
+		fi
 	fi
 }
 
@@ -81,12 +90,14 @@ src_prepare() {
 	cmake_src_prepare
 	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
 
-	if use gimp || use krita || use qt5; then
+	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
 }
@@ -125,6 +136,11 @@ src_configure() {
 		-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
@@ -146,6 +162,7 @@ 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" ; }
@@ -161,6 +178,11 @@ src_install() {
 	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
diff --git a/media-gfx/gmic/gmic-2.9.0.ebuild b/media-gfx/gmic/gmic-2.9.3.ebuild
index 660e4b3ff4dc..4af6d1c63fa1 100644
--- a/media-gfx/gmic/gmic-2.9.0.ebuild
+++ b/media-gfx/gmic/gmic-2.9.3.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 CMAKE_BUILD_TYPE=Release
+
 inherit cmake bash-completion-r1 toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
@@ -11,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"
@@ -19,9 +20,10 @@ HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
 
 LICENSE="CeCILL-2 GPL-3"
 SLOT="0"
-IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+IUSE="+cli curl digikam ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
 REQUIRED_USE="
-	|| ( cli gimp krita qt5 )
+	|| ( 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 )
@@ -36,9 +38,13 @@ QT_DEPEND="
 "
 COMMON_DEPEND="
 	curl? ( net-misc/curl )
+	digikam? (
+		media-gfx/digikam
+		${QT_DEPEND}
+	)
 	fftw? ( sci-libs/fftw:3.0=[threads] )
 	gimp? (
-		>=media-gfx/gimp-2.8.0
+		media-gfx/gimp:0/2
 		${QT_DEPEND}
 	)
 	graphicsmagick? ( media-gfx/graphicsmagick:0= )
@@ -61,19 +67,22 @@ 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"
 
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
+)
 
-	if ! test-flag-CXX -std=c++11 ; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use openmp; then
+			tc-has-openmp || die "Please switch to an openmp compatible compiler"
+		fi
 	fi
 }
 
@@ -81,12 +90,14 @@ src_prepare() {
 	cmake_src_prepare
 	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
 
-	if use gimp || use krita || use qt5; then
+	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
 }
@@ -125,6 +136,11 @@ src_configure() {
 		-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
@@ -146,6 +162,7 @@ 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" ; }
@@ -161,6 +178,11 @@ src_install() {
 	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
diff --git a/media-gfx/gmic/metadata.xml b/media-gfx/gmic/metadata.xml
index aa4cb5a5a511..39d49193716b 100644
--- a/media-gfx/gmic/metadata.xml
+++ b/media-gfx/gmic/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 	<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/gnofract4d/Manifest b/media-gfx/gnofract4d/Manifest
index 4bd3cdf285e1..e9b342644eab 100644
--- a/media-gfx/gnofract4d/Manifest
+++ b/media-gfx/gnofract4d/Manifest
@@ -1,3 +1,5 @@
 DIST gnofract4d-4.0.1_p1.tar.gz 7638038 BLAKE2B c12bade5f219d2d41dc50569c0df315273b0c2a0a6a40543f48f3e4cb766512ed18b979463574db65ac443b1a8dffbcc1f3c9dc04d7c6b89881fdfcfce95c41c SHA512 d7f3a081b3681866d2da911eedab6ec74f22f36d5175a85f93751519e96971cf147b99ddcda32c597283b39e9da4f0fc6a8843331334a18efa3bf459cfd00af5
+DIST gnofract4d-4.3_p20201029.tar.gz 18270417 BLAKE2B 82d9f9528c33cf73478fa48d8692617237029944e68d9626d0c39e088b1b6aebc02a8c32a1a0e14c8d115cf3f0434940ec8a8c3d915fc9967b22f7e51353dd6b SHA512 f5844a88c41941429379efe99d1e0593a994a42d600e6e05f722c01c4ced48ceff730bf6bc797e083bd558931d39a31ffe86021eac0f0c6ec0f3047569962e3f
 EBUILD gnofract4d-4.0.1_p1-r1.ebuild 1694 BLAKE2B b3d643bcea4ff74a339d4015b7f3747d8accd17e3c33f464d03252b2d0ba1106e47d6ce7162b1343259850c34b3a6b206cb62b5d546abf83fcae53e1042b05e5 SHA512 6504876211812d61e6868a5633d1b293d5d5675845720e605c39cbd535dba7d71305ba1227760ee7a926a58968a5c6898b338e86eeacc883bdd8c11b4cb4cd2f
-MISC metadata.xml 311 BLAKE2B e595489db486352ace6f66c3d72be3f47857ab75d48b8c2c2964bc2466d372eefa5e503f2c089d88cf6aedfd7d076a6595f733b883dfb25276567de67abc6911 SHA512 392ac93a529b535ac58ad270f8d5d4ded4b1cd8914604ef9533dcdf10c08a05e3afc6800f3eb7b546c856e608444a662c6cfea8b436936e1931d7fdfe43b676b
+EBUILD gnofract4d-4.3_p20201029.ebuild 1479 BLAKE2B d64ade871f3b076512259041aad55d4b4d469b824241ebd5df5235338f031751008505b03fe9dd28f7c54345f6f2a7eb34bda031b1fc86f2c85de825a8c2f2d4 SHA512 21df442787343a302c17cb3fc0d2bead5e4d7c2b5197bd0aff0497bcf67a60fc5375f70c5ad956b44250f9cfbe29eade1e48c2965c37e25b8f77e77ac17c2f58
+MISC metadata.xml 504 BLAKE2B b5087f6e8de7658fdb35b694f16dff28b7ecd6c600c787299df812174613a71ef605595531cb97df0e098bfcb10664c40e9e091b76a62078626d944387b2cadd SHA512 03e3638abe60e3a4350eb1770d5fdeb287e3eb83418d266b65ef839031e6eb6d82d5fb2546611038819c1fb302a69a047c9283b922bdb055110722cb4fb2f20f
diff --git a/media-gfx/gnofract4d/gnofract4d-4.3_p20201029.ebuild b/media-gfx/gnofract4d/gnofract4d-4.3_p20201029.ebuild
new file mode 100644
index 000000000000..644c1fba0921
--- /dev/null
+++ b/media-gfx/gnofract4d/gnofract4d-4.3_p20201029.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 optfeature virtualx xdg
+
+COMMIT="3e3893b0ee381098418d7b28997f6b861c53eff1"
+
+DESCRIPTION="A program for drawing beautiful mathematically-based images known as fractals"
+HOMEPAGE="https://fract4d.github.io/gnofract4d/"
+SRC_URI="https://github.com/fract4d/gnofract4d/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	media-libs/libpng:0=
+	virtual/jpeg"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	')
+	x11-libs/gtk+:3[introspection]"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		media-video/ffmpeg[vpx,zlib]
+	)"
+
+distutils_enable_tests pytest
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_prepare() {
+	sed -i -e "s:share/doc/gnofract4d/:share/doc/${PF}/:" setup.py || die
+	# test_regress.py does not provide pytest with any tests and inspecting it requires dev-python/pillow
+	rm test_regress.py || die
+	# tests hanging with virtx
+	rm fract4dgui/tests/test_{director,gtkfractal}.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_compile_all() {
+	if use test; then
+		ln -s "${BUILD_DIR}"/lib/fract4d/*.so fract4d/ || die
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "creating videos" media-video/ffmpeg[vpx,zlib]
+}
diff --git a/media-gfx/gnofract4d/metadata.xml b/media-gfx/gnofract4d/metadata.xml
index 052b81b5cf3b..d11e338560d8 100644
--- a/media-gfx/gnofract4d/metadata.xml
+++ b/media-gfx/gnofract4d/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">
+		<email>aklhfex@gmail.com</email>
+		<name>Chris Mayo</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">edyoung/gnofract4d</remote-id>
 	</upstream>
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index ad8530cbc6b0..c505a81c959c 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-photos-3.34.1.tar.xz 636916 BLAKE2B 3d041f3a8349164e12b8788b028edf23c0db1e671c5da4356dbdc01f5129e8dfabd3ee9df3af82b2794e22c1d8d894b7726068d69a605b0d598ec1dc21754470 SHA512 9ee1bf299f82b4a55d2642e34cfa82e0a3a362cd5e415acd5421d54430da5ea5a9f831ecf5ccf6966eea056c851fde57385f9224441be3d06e086be108d53227
 DIST gnome-photos-3.34.2.tar.xz 639992 BLAKE2B f189e7e1a831f4d19416b689733ef6a55822d57b5f1ea29a4dcb4fc06d5f9a450e45aaf53f65e392ac78e9959f7359f3df17827a326cfd6dbf8cc7d77cc0a367 SHA512 6315fb8e7623de48a42f1b47a2935c80f8f9f6db1ab724d1857697f673c4ca0d5ca1afa5c0d147455c3c0ad0224b85b52a220b1dd39a1409804bb75794d0a04b
-EBUILD gnome-photos-3.34.1.ebuild 2303 BLAKE2B 2c1d5d39d8c532b72ea27a6abcd8c35d49638a3c5b0e6ac24fd4ef2069e1fc93c54f8056e55a45d0e82d5becd134e50f4b7b464b13b65d7e9c8a6ff43d92262c SHA512 f49cc3c4c8aea3b6292dcfa858b5ff3f78c13c282e66700d5f5de8dde3bac3ceacce2201d92930aa8a503fc629b17130b484b6da7a4850ee822ec7f2d0fb3755
 EBUILD gnome-photos-3.34.2.ebuild 2303 BLAKE2B 2c1d5d39d8c532b72ea27a6abcd8c35d49638a3c5b0e6ac24fd4ef2069e1fc93c54f8056e55a45d0e82d5becd134e50f4b7b464b13b65d7e9c8a6ff43d92262c SHA512 f49cc3c4c8aea3b6292dcfa858b5ff3f78c13c282e66700d5f5de8dde3bac3ceacce2201d92930aa8a503fc629b17130b484b6da7a4850ee822ec7f2d0fb3755
 MISC metadata.xml 992 BLAKE2B beda29ca65d25e5d68c014fbb70fb539cf17b55d64255d6d74305d710f3979b5156eda764d75992f057416f5eb96af899b988633dd8444fcf22c6a5f73fe9b9b SHA512 3c47be6c01072a0b4845dd42b6d3561d340eb703bd9cb5c727ec24b653ab76eee38e35ba63c4cd71b93514ab0cb8bd75663febeed1901cccedfd30f223e870df
diff --git a/media-gfx/gnome-photos/gnome-photos-3.34.1.ebuild b/media-gfx/gnome-photos/gnome-photos-3.34.1.ebuild
deleted file mode 100644
index 66f59c290559..000000000000
--- a/media-gfx/gnome-photos/gnome-photos-3.34.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-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.57.2: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.15.2:0=[gnome-online-accounts]
-	>=net-libs/libgfbgraph-0.2.1:0.2
-	virtual/jpeg:0
-	>=media-libs/libpng-1.6:0=
-	>=app-misc/tracker-2.0:0/2.0
-	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-2
-"
-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)
-		-Dinstalled_tests=false
-	)
-	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/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 73e616db816f..8953efaba9c1 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,4 +1,7 @@
 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 1270 BLAKE2B 534c1e6777dd16ef441e91469080669f7489bc0ef3a3bfe8aafc8fb644ef7bebcb2a5a0c2c67a805a9b5db8792a58f35f17e7e1f163c48d94ac57ff1001bb5ba SHA512 d73ae39d2b0efc236965b8d94ac2d556076c9c07eb293bfd5cdfc95cdc50c3b663fd226a1fc85baf7a7d4a6bb4078d91289e7289ea6389607576d839689d9d3a
 MISC metadata.xml 329 BLAKE2B aa29f56b9c69aa63e45a1a7b6ba6e7a680f33227521a705f5273689774f4cb22d37cdd345b3aa9c43f254861b7fb1fca34d60ac9e1536d07a0806ab881b9e2e7 SHA512 d4107a001067b831a81094ad13f8ee531b52ac62e5dc0fd8810c3a7d85a069fe352bedb8275a34d3e1cb11c003405035dbfaf9b48270b5dbb02cd25772075ab7
diff --git a/media-gfx/gphoto2/files/gphoto2-2.5.26-s-cdk-cdk.h-cdk.h.patch b/media-gfx/gphoto2/files/gphoto2-2.5.26-s-cdk-cdk.h-cdk.h.patch
new file mode 100644
index 000000000000..b68e618cc018
--- /dev/null
+++ b/media-gfx/gphoto2/files/gphoto2-2.5.26-s-cdk-cdk.h-cdk.h.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/679332
+
+diff --git a/configure.ac b/configure.ac
+index ed76a66..b0db85c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -141,7 +141,7 @@ AC_ARG_WITH([cdk-prefix],AS_HELP_STRING([--with-cdk-prefix=PREFIX],
+ if $try_cdk; then
+         CPPFLAGS_save="$CPPFLAGS"
+         CPPFLAGS="-I$cdk_prefix/include $CPPFLAGS"
+-        AC_CHECK_HEADER([cdk/cdk.h], [
++        AC_CHECK_HEADER([cdk.h], [
+                 have_cdk=:
+                 AC_PATH_PROG([CDK_CONFIG], [cdk5-config])
+                 if test -n "${CDK_CONFIG}"; then
+diff --git a/gphoto2/gphoto2-cmd-config.c b/gphoto2/gphoto2-cmd-config.c
+index 360fd61..c801604 100644
+--- a/gphoto2/gphoto2-cmd-config.c
++++ b/gphoto2/gphoto2-cmd-config.c
+@@ -29,7 +29,7 @@
+ 
+ #include <gphoto2/gphoto2-widget.h>
+ 
+-#include <cdk/cdk.h>
++#include <cdk.h>
+ 
+ #ifndef MAX
+ # define MAX(a, b) ((a) > (b) ? (a) : (b))
+-- 
diff --git a/media-gfx/gphoto2/gphoto2-2.5.26.ebuild b/media-gfx/gphoto2/gphoto2-2.5.26.ebuild
new file mode 100644
index 000000000000..4e4d43690010
--- /dev/null
+++ b/media-gfx/gphoto2/gphoto2-2.5.26.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Free, redistributable digital camera software application"
+HOMEPAGE="http://www.gphoto.org/"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="aalib exif ncurses nls readline"
+
+# aalib -> needs libjpeg
+RDEPEND="
+	dev-libs/popt
+	>=media-libs/libgphoto2-2.5.17:=[exif?]
+	aalib? (
+		media-libs/aalib
+		virtual/jpeg:0 )
+	exif? (	media-libs/libexif )
+	ncurses? ( dev-libs/cdk:0= )
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.14.1 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-s-cdk-cdk.h-cdk.h.patch
+)
+
+src_prepare() {
+	default
+	if ! use exif ; then
+		# Remove tests that require EXIF to pass, bug 610024
+		rm "${S}"/tests/data/test0{35,36,37,40}* || die
+	fi
+	# Leave GCC debug builds under user control
+	sed -r '/(C|LD)FLAGS/ s/ -g( |")/\1/' \
+		-i configure{.ac,} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with aalib) \
+		$(use_with aalib jpeg) \
+		$(use_with exif libexif auto) \
+		$(use_with ncurses cdk) \
+		$(use_enable nls) \
+		$(use_with readline)
+}
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 2dfcf42efd1b..2580db4342e0 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -3,5 +3,5 @@ AUX graphviz-2.34.0-Xaw-configure.patch 2445 BLAKE2B fc1b3820fd72821ac431f5d93d0
 DIST graphviz-2.42.3.tar.gz 26246717 BLAKE2B 71c61dcd056c9a2e2655c3be995d1da17b3af0d3374e74400fc38da11ab81849f7b5e528f99fc2046294958a4bab0a411ab204e434360f316a5367403472e8a1 SHA512 e03ca6da0ddb1162bd179d159d7dbb379d55012d63bb922aa800260fce52b65beb1a9b5ca1a5199ad3537201b0b4841efc9facee6e03065c6bd02e840f8a29c9
 DIST graphviz-2.44.1.tar.gz 34079677 BLAKE2B 90183afa6affedb097eab237fae148a9c085c3a724fb74d370f7c042b53d09b44ba0cb755a2ac74175d89d3a45687b60f0e210bdd404fc72da98bdf61b9eaa8d SHA512 42e6137c7cce18daf6f17e6fcbbdfe8e0a531de1bdd3ac7b8751445214aa0d85713b65ba896a234a02670827b0d608bd64b758ef60a4d0384ffa3355ee0dbc42
 EBUILD graphviz-2.42.3-r1.ebuild 7864 BLAKE2B 4390c7d22ec3e914d25445eda9ffab4bd879c5a1316355a69cd0cea756a3d85c15c3dc31bcbf97161de877eb70605e230b7a43b2c3201d980387f49653231278 SHA512 9105485fa2e67399edd207249ad80ed7b16c2f9378b33e2f844f402a4e7cbef53868ef8fb4800d06672deb75f62a51ec68949fd2d16c2cf345846116c0e68b74
-EBUILD graphviz-2.44.1-r1.ebuild 7828 BLAKE2B ccb3b572a5f9233f796e92972c0706a12873c8520d4b1ee5c688c37712cadc1621b6d05a7d48c78d8708c7b39333779a572e090a46c741b96d8216524b314e36 SHA512 6239cd60bdcf14260e92cc8a50b7c361d0eef7b115df705a3f0664023faf7ebe7667942ad0a06ba4a190306428dc2a2d501f1b726f81b0d079af74572cfd6b09
+EBUILD graphviz-2.44.1-r1.ebuild 7830 BLAKE2B 19f5260cf992b446d4b1e9ea745abdf1f63f1055326a0c72b563884578404b3d30bb5b174a984bf632770280e9fcdb58ef39f786562f35f278df9c8931f31ba7 SHA512 a4393ed01752bb891ec10c7a78d83b3eede794c3734d85b7dfece62efe6d6f1df05dbdc35a25e55e88be8e9fc5dc23879a2f1abfecfcd31d967196e990a79184
 MISC metadata.xml 2244 BLAKE2B 61cc818a6f736cee316c026bef8f02dc03ffa3c63f620832fd063f00111178b07be4c5224f5d4fc0f1cddbfc3180e31ac277d493107e0d716d0d2f05c7272633 SHA512 e8c8d5b2abf9c21c6fe8dd7e3489210275065a2f0f64023f5aa52fac2b2646b974fc36c60aa189be022728384ff223aae5856095846dc5ea85638d1b882ad7e0
diff --git a/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
index cab048b373aa..cc8390a654b3 100644
--- a/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils
 
 DESCRIPTION="Open Source Graph Visualization Software"
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index fa96b4db2509..9fd48b9725b6 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -1,7 +1,7 @@
 DIST gscan2pdf-1.8.11.tar.xz 409212 BLAKE2B 37cb716f13818eaffc39c210b810b845368cc5e323569e8f9d5603b5b412c4182520798321358e4c21339fdbd5f15026a0acd6421a49e7db79ecca86633c3ab0 SHA512 1ea09b8768771be4a1700cb8a6523d5f74fcbf0ebe459d97796032b56f896fd0c50e5ca1ed4c96aedef7e61f6952a92986153cc70173dd5ad91ccfb72461c565
-DIST gscan2pdf-2.7.0.tar.xz 468752 BLAKE2B d8f41842c16ff54fff180d2ecaab3fb09c4b7c4d2eac8ba4b6cd2703cca4538844389af8151eaeac030f5962df7ce9192e60c0515f78d2d8aa9aa0ec2973fb97 SHA512 7878d7e77cf107315301bf7adb29c178f4c35c1986780843dfc1742870b8a9bc6cd7a1a0d06f1c37585e6c2050e75222c8af2359b5a7c194f308ba32b5c64f06
 DIST gscan2pdf-2.8.1.tar.xz 476880 BLAKE2B c54e318fa00670f6b2f996791477fd61076abdfe57f2d924cad1fa9092a8796851c9ab503aabb7831ac374e390a19a821a5c7a8b996235deb7d7781b8b47f76c SHA512 2a9f52ce53030f2871d2430b6aab6b06bb1d4e2efbde25ad24196cfa99ad7b13342ff0f2827526020f5c12079e156bc430f891bdb6ffa9545a210bf1cba29be5
+DIST gscan2pdf-2.9.1.tar.xz 484740 BLAKE2B e75ac6a5296ba2f89838ae9c95dc0ceb592ea8ffaf8d89a0635043e07fedbdcf97df26ac810556da7d0e0306eb7aaff76dc18162c6a5f89cb1953bd623a594a3 SHA512 4fc3107c871a7915ebdc023476b1159c0fe03934f1a52a417a5bc285be46f7db0ed38ec4cf015b15953c728ef19d1f4f30207d418b655c950bfb64ddc5d23237
 EBUILD gscan2pdf-1.8.11.ebuild 1732 BLAKE2B 6f1e069c628d5d3abbb137c7e248783881122eed602420b0d43461b54fb8c7395cf1f40f30b42bbd8577121305b3405f486666fb76e64bb20fab381037bb079a SHA512 6bc6808d5c18b208a2b1a0ffb8778c2a4db0b99b531ea7e861a9739adaf42d5a1aaa8fd95e95ee2c930e1b435113c247f1ecca143b9fcb7fb98d78d7db10fcc0
-EBUILD gscan2pdf-2.7.0.ebuild 2425 BLAKE2B 972f8b38f5456a4de7e70cd1aa5f880cc0451544ef19f9ef41e317598b03ba2560d1df7899cece35269bc044fd25ae87d19f9d13996fe13994b00417cfab4461 SHA512 4aa94273ec47ff844ff5cdbecbc8c9e1a965a1b33a576a7d8abb1fdafa9c5eeb5d99a19ab5dd47e1c530dcd815137757979361dbdfaa3a1cfba693f44b2cd0af
 EBUILD gscan2pdf-2.8.1.ebuild 2766 BLAKE2B be30bbc71adc8f429edc9ff7bba2952aa4f7dee4bb1b41d8de0df8d8af1272589a3b545176527bca4b9c9f0129985005981fbe3d1b3a2c1b4ac97cf9f47bbc3a SHA512 54e8c8c55844b989a9018ada1e4e06efd9cd4d84f20ead711de1de7b85d4e04c1fe71849444f18729068953a92f0bf6a1a0a257197f906b0cf48fd513dabc62f
+EBUILD gscan2pdf-2.9.1.ebuild 2802 BLAKE2B c6228fbf93f5eed2d18826f774d5430f6bdfb004301ab3fcdc85071fb68fcb014357857acbdfb4eef559e714ed6ed1d4e17d5dcad6bb7d901654d780d4dacb2e SHA512 cd9b67c5830bc94d27732c3508846be536ca16d95626fff5ede74788543b0735f530b4aba09ca8228afb549f9cbfb4d7491fb2640a41e274c607b4d6810b0856
 MISC metadata.xml 439 BLAKE2B 835480b0d68a079941e94f2646d0136dfb8a8e750e0279f8a5a2e23e6690242582ffe660798f5e80ebfb4378a576aa5715332b53230555866391a99ec28f54ff SHA512 af1cc05ac693899586df81036d2fa11af187edbb3c9449862298ba05efd0dbd0c4c5b008a1a21328c1f9a27a690671bd7a9967d2e457efb31561044e45984401
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.7.0.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.9.1.ebuild
index 904dffb20a89..0a695a657733 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.7.0.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.9.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -29,6 +29,7 @@ RDEPEND="
 	dev-perl/HTML-Parser
 	dev-perl/Image-Sane
 	dev-perl/List-MoreUtils
+	dev-perl/Locale-Codes
 	dev-perl/Locale-gettext
 	dev-perl/Log-Log4perl
 	dev-perl/PDF-API2
@@ -53,11 +54,11 @@ BDEPEND="
 		dev-perl/Sub-Override
 		media-libs/fontconfig
 
-		app-text/djvu[tiff]
+		app-text/djvu[jpeg,tiff]
 		app-text/poppler[utils]
-		app-text/tesseract[-opencl,osd(+),tiff]
+		app-text/tesseract[-opencl,osd(+),png,tiff]
 		app-text/unpaper
-		media-gfx/imagemagick[djvu,png,tiff,perl]
+		media-gfx/imagemagick[djvu,jpeg,png,tiff,perl,postscript]
 		media-gfx/sane-backends[sane_backends_test]
 		media-gfx/sane-frontends
 	)"
@@ -84,6 +85,15 @@ pkg_postrm() {
 }
 
 src_test() {
+	echo "Using:"
+	echo "  $(best_version app-text/djvu)"
+	echo "  $(best_version app-text/poppler)"
+	echo "  $(best_version app-text/tesseract)"
+	echo "  $(best_version dev-perl/Image-Sane)"
+	echo "  $(best_version media-gfx/imagemagick)"
+	echo "  $(best_version media-gfx/sane-backends)"
+	echo "  $(best_version media-libs/tiff)"
+
 	local confdir="${HOME}/.config/ImageMagick"
 	mkdir -p "${confdir}" || die
 	cat > "${confdir}/policy.xml" <<-EOT || die
diff --git a/media-gfx/gtkam/Manifest b/media-gfx/gtkam/Manifest
index 497817882eba..6b7efd901257 100644
--- a/media-gfx/gtkam/Manifest
+++ b/media-gfx/gtkam/Manifest
@@ -1,4 +1,4 @@
 AUX gtkam-0.1.18-desktop-validation.patch 536 BLAKE2B dfb407a715e16af5068cf0be270aadf67c4d5dac81c15dd4de77b410ccaef1f4a56463a90f37773cad95dd47fbcc6e84398ca201451644e970061d67265bb7f5 SHA512 2b6cf0e5c680debb3b724e6fa1afffafce05d2f2bbf022d51157b958ad6d7f71b4027c8ec29ae1115c30bc8091c53173fea40211b494afbccd9cf97cc209f0a8
 DIST gtkam-1.0.tar.bz2 908986 BLAKE2B 941207d7865144611caba41c4c2e87719cf3b7ba50c1b48e9e5876ae403504443801cce2c14d3eaabcca749ef0e3ba9d95184081333361058d9fbde10ad4e935 SHA512 3b2b8aa5114237dc6fd5d6727e9ae76e88afa3257d0f18d790cc706b737c0a1002b86559621b3357629f9a7fb4d8f321c46f9eec83c7aa27998acb0f48904f7c
-EBUILD gtkam-1.0.ebuild 944 BLAKE2B b582149402711676b16ae305fd700bb9ef256252b5adb409364c003921f106595ceb29d36ea363873ab46de1e789f2341eecf5a55a0f44dcc5f89e06a5b380b9 SHA512 94b699f89877e1eb8ae5513e47ac01060adc3a30b2123b0f96b1ec7c69df6d997397b7fe9e1c294943ffbb5991d93f1a56f335006b362f100276060ae8473c0d
+EBUILD gtkam-1.0-r1.ebuild 941 BLAKE2B d8bffaf28f09431a5c6ee50abed5a2833829ded54ef8225ea099ded111fcc2fd9b071eed4ff85850445c5e887b1f1b582980d5880e82407b2578a9796e691159 SHA512 67398ede4fbaf6d96ed2abccbecb0e6284f1b14846651b5e19f7d713d6452bafc9f6e811008ffdd8affcf547f28396e8034f9b896eb62e49dc58f2c327f008cb
 MISC metadata.xml 329 BLAKE2B aa29f56b9c69aa63e45a1a7b6ba6e7a680f33227521a705f5273689774f4cb22d37cdd345b3aa9c43f254861b7fb1fca34d60ac9e1536d07a0806ab881b9e2e7 SHA512 d4107a001067b831a81094ad13f8ee531b52ac62e5dc0fd8810c3a7d85a069fe352bedb8275a34d3e1cb11c003405035dbfaf9b48270b5dbb02cd25772075ab7
diff --git a/media-gfx/gtkam/gtkam-1.0.ebuild b/media-gfx/gtkam/gtkam-1.0-r1.ebuild
index c5029ddcfd60..4f2f08b09baf 100644
--- a/media-gfx/gtkam/gtkam-1.0.ebuild
+++ b/media-gfx/gtkam/gtkam-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ RDEPEND="
 	>=media-libs/libgphoto2-2.5.0
 	>=media-libs/libexif-0.3.2
 	media-libs/libexif-gtk
-	gimp? ( >=media-gfx/gimp-2 )
+	gimp? ( media-gfx/gimp:0/2 )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index d60e15871b9c..951ad8d3abc3 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,4 +1,4 @@
 DIST hugin-2019.2.0.tar.bz2 10335030 BLAKE2B 4fbcb974eea01dbd8d722f64b5cadfd1b3fe101e5e7849d069c531e55e1ea71c226bcb1550b59374bbe8adf111b7c0bc5e48c14f45bdb685486cbeccde5add70 SHA512 2ddfe7468a474c385ef66a88c3a5a2491183765ae431e5044f504d2e95ec3cb99c0b97b98dda282ba7950f6f2001f46b2f2ea39b9025718c2a329dea967685c1
-EBUILD hugin-2019.2.0.ebuild 2185 BLAKE2B 25b087eccf301e5540e6e897161e7c1ccbe907a26b22feefd31a40357602c5f9c61f41e41b033958d0df171c2df04c4e49ee4061f9d0e5db002f2f8ed46c1edf SHA512 89c7d596a4fef47dc3d144ae30a4cce0745391b05760108d6755717413a76bc6bf5d790ec50b0af01a88ced13ce1467d4cc311a24c877c9584df14ad712545b0
-EBUILD hugin-9999.ebuild 2058 BLAKE2B d7f7ab9b065dcc31cc85033a044b3e8da912779069709e2c1c02c3958744896c9c84cfb2bbf9c802b444e92ce6f6cd86d402254d3b2e5eb5f2b2b766eef069e0 SHA512 65ead2eab2416af88e8529704ee0c936901d3512558e1433eaff5ec3b3db5ba8659b2f72fd4613cc305afb9461003841ce7e3c04b8bbd201c8842ab7ddb5c5c7
+EBUILD hugin-2019.2.0.ebuild 2337 BLAKE2B 9ca08518fef5bb7d3167cc01caa64da8bd076142174e000cd3881f855644e8e95021149104d86ef82973c6d073eddbaccaf7ea0e8621e3a8e458562d4b7f5b6f SHA512 a17162e5db9fad823f35f867f96e13bb443e2150da84b54d71577a4c33cdbf9497da3d1b3cc0ee051ee7ed607a877133dd6e4483e2a86f150f27f7558e8627cc
+EBUILD hugin-9999.ebuild 2210 BLAKE2B 141192648c323a010a27b1b2b4da162f15ea47d4a8a610d3c4f22a4f9101df9c653601f9a887a314dfa44c4771fa7831caf79d58975dcbd49f37cb46277f2718 SHA512 cc2633109a207a4c7d6a9a409b55a86395bad1beb3f1cbf5b951a58816cd3032597be32bbe251e69db75421fde406aa686ba36b24381e5e95c58f8e747850295
 MISC metadata.xml 546 BLAKE2B efad9c27562890b23594411333a0ef827b7e54acde132ffdec4f664eae37fb3ab270950ef650e6caaea4bd3b69a7bed469e794dce51d59850cd06ff844e08836 SHA512 0d096754e2f6ef1468e6bdf7464e6f5cc1de06f20136b68be7aaf199cd78a10e4213678d875ff61d829f692dbd5b0728d50bb35eefb1de6af4e5e0fd7d91d350
diff --git a/media-gfx/hugin/hugin-2019.2.0.ebuild b/media-gfx/hugin/hugin-2019.2.0.ebuild
index 7cc3209c4c52..0981ba7e2eef 100644
--- a/media-gfx/hugin/hugin-2019.2.0.ebuild
+++ b/media-gfx/hugin/hugin-2019.2.0.ebuild
@@ -86,6 +86,10 @@ src_install() {
 	cmake-utils_src_install
 	use python && python_optimize
 
+	mkdir -p "${ED}"/usr/share/metainfo || die
+	mv "${ED}"/usr/share/appdata/* "${ED}"/usr/share/metainfo/ || die
+	rmdir "${ED}"/usr/share/appdata || die
+
 	local lang
 	for lang in ${LANGS} ; do
 		case ${lang} in
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index 3eb92a7c66c7..34db3dfeb053 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -80,6 +80,10 @@ src_install() {
 	cmake-utils_src_install
 	use python && python_optimize
 
+	mkdir -p "${ED}"/usr/share/metainfo || die
+	mv "${ED}"/usr/share/appdata/* "${ED}"/usr/share/metainfo/ || die
+	rmdir "${ED}"/usr/share/appdata || die
+
 	local lang
 	for lang in ${LANGS} ; do
 		case ${lang} in
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 4aa8e8675d83..72dd23175083 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,12 +1,12 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.11-28.tar.xz 9315628 BLAKE2B 8ece7dae4d8c7de695e85b832e5c15c1474e00c9027aeb251a279dc9b51a02f5fd1e96f48987377cd6d937a126e5750e9aef9a11caf64603267b81e6a874f205 SHA512 e2954d1a55a37fa339dd0cbc0ca753e4f783cd77858277e287c033a53ac5f2e96bc5329d069016fc3841d07dc9e8f5b1bb08ecf9ed0224bbc675843132749fdd
-DIST ImageMagick-6.9.11-31.tar.xz 9225744 BLAKE2B 0a540862ac6cf3504e0ad081748c5e6a99b8858ed52e145b8be142a3294a5e354ee8453987c9783deb924a69fe2dbf340d88e9bc7bcdb14b98f33a6bf18e3039 SHA512 11a33d75c2e9ff35ff5e8d0c40a470874dcbe39350f84f7816c536798af0be5da78cd28416ce74e6f045a4cfdb0f70e1f7fb58dd7bf88465a744fb587c098ee4
-DIST ImageMagick-7.0.10-28.tar.xz 9705324 BLAKE2B 0fe890a23b9fc97ceb5253e24ab8236135f4a4f48c1480ad5577c6a2535bf350fcea062b8897fc5e7993ab86716b1e280fabcf664442e3fe9d209e8c2806ea2d SHA512 fcfdacec893bb0a39c4a3caae1ade5ea7d3f6b8909cc73f218260f9f9b354ebe77aecedb2be2e2a64011eceb895c1ecb2fa0f349361387d56fb0f3cde657e158
-DIST ImageMagick-7.0.10-31.tar.xz 9653808 BLAKE2B 14c02ed0be35d817ebc2ccb0fcd436e34a7350dbe459ec3acd1a6ed94e46b181b5f713c9e8b5260e08287d5feb34c7a23b4e57bda0752a8206352c10b5379825 SHA512 0f6a2e098706186e43be3b91f10ac243aef4d96ce8943e88709243f9673205ec2261502c623f10af4f8fa126d8b4d5e3f636c9820790e5d730e54c5e634a61b3
-EBUILD imagemagick-6.9.11.28.ebuild 7049 BLAKE2B a55cac8280b047983a972159734711175d78840a6d29c75ed38366fc07aa4be312c75f523ef4185318f9734df496373e36b0c3170cd89e0859d282935ef3b566 SHA512 524f10eb990b5a5df4af8d0c39e6cf00d30f6d3bda40c0f609a16825d23b2b1b18d5ea10413df97aca1c6a26b0ac05d06c7c902f8a7c0ded4c33106b05566d2b
-EBUILD imagemagick-6.9.11.31.ebuild 7056 BLAKE2B 31393b291f0d6bec7dc70d794b1a84039d54c1a12b7b4417caacea9bb2dc693a91d00273243a6450c1e7b7044e6b4c66a5fa8ccf28d1634d610a767775dd566a SHA512 72e95675a0102e46604bc1161c687465d2b2acf58a7096dd0637e2b9bdbc4a53ce2fb3490e6d32fd00ce5767540abe39b03a93c187f33b0c6c21f5c96a897d49
-EBUILD imagemagick-7.0.10.28.ebuild 7338 BLAKE2B c5bd8fa410de6a1fec8a11c9f11d4bc527acf4502ef3d02dfd2f845ee0db2831de6a1734c860aacf224df0e13895aed104d238420b5021b947ba35b91b60149c SHA512 2ff4dc18a4fe408c0aead424af26225f8590607a48a60ac11906603f0cd808e23c0b6b50813f3463f570d3e5c3a9675fb60edc67b2bd8428d073c7ebe0778a17
-EBUILD imagemagick-7.0.10.31.ebuild 7346 BLAKE2B 6b3c2522969859e905afddcb92679bed0944d991831822d5bf6e967e0faafed369380f793aa337ac87b3a1af7a1b7290dc0f71094cf6346fdd63d57d49823d97 SHA512 a21b1d1bd706370b2c044c7cd55c290dd7a9ffac55c0c92b86c8f4ac969a14d2d3eca6b9e97decc61099d3f0842e9029f145e0adc4366c1ae153a0333869da74
-EBUILD imagemagick-9999.ebuild 7220 BLAKE2B 12b0db73d15e5d9b5af68912ae1b2907919cc875d73536c261477534fa17363fb8f75b2d63501ab6f844eb9e976893107513968d9e89ccce9d3490cfe93389db SHA512 19ce4536488e465e744a5da210566112de83a6d2df48a1cf9cc44c32a2e9d4ab3a65909ce17ac47e0dc29ccb734a5b52e81f6585dc015a3ad89faa3d72667747
+DIST ImageMagick-6.9.11-35.tar.xz 9214584 BLAKE2B a482a8134b321395437178bcc25963931738f73925698c860f6d7088fe1ed79917d6e7d4a4da3b5fe71aeb29695901341fdc20336f68e64ae63bba1bd5ef9ce2 SHA512 3d04e1add469486b6c9d1e562f7623bed516a64e797abd3113c34937723333550f52245f89395da7126f656a58c0c2d3516cec14abe0a3d6ab2a75a1ccde1645
+DIST ImageMagick-6.9.11-41.tar.xz 9163764 BLAKE2B 943dbed16e096adb88ac81c9fb50190bb9bbfd4fda24145b49bb147034f2b69403ed17c61a5edf52d28f22c4d729d4704ad10084f395b8d6890e87c800cc5486 SHA512 7331885b5dc0b1048e961e9c357fbfc0eabb71c265387842eb42530b0f02210d017f7e0536602780f294f48c6077932abd7d10322584da9b392a7a18e7460cc9
+DIST ImageMagick-7.0.10-35.tar.xz 9656888 BLAKE2B 3b1da9c2a6118cd4885eeaa366f2fbcda1a16a9a81025b810431262510ec70d2397512e3b1a5eedf95a3a29bebdff16399b2cb308a0da67b512472c86a6505ca SHA512 340395496b1d41f52ffd6c5928d9426edbc3e79aa1d3ad38b41eac361b6291a2ede3d3997ced61500fd34a32b74f774e7335e6d13de0b7c5e70d7039ec95887c
+DIST ImageMagick-7.0.10-41.tar.xz 9645036 BLAKE2B 3e90fc739cc271a20be49e1cf7b2a637e1b3916ae2934d7874f28339039ce5c331c35eb8863ef6144270586afd85ac9475a0603d64b9a8189a9f06de6f47f42e SHA512 62439bcc7a2447593bedf165c2c05e67e27d672823523d611439fa2dc288e948772389772dcf1f8633ca7dbf38b514cf5fc3bfb5fb3d61e2efdd38fe7a2ad040
+EBUILD imagemagick-6.9.11.35.ebuild 7044 BLAKE2B c60176b4c63910d2e47dbe4ac5a4fffa8723eba62404c184ed9e3eff79f2240a80dd8f07d67c8da466abf7b13b504fb220972d8a2d1548504b67e416fe1b8a11 SHA512 b72d98b36e26ef58f5d90e5ce614085c57f0606abf450790c22779a59e7af48969f2e186734827465375ba86159bd044b6e7d91f65444f035f391b39f698dbbc
+EBUILD imagemagick-6.9.11.41-r1.ebuild 7054 BLAKE2B c1f4280b7d3380b01a44f33af60b062eeb2c98f0850dcd3d4fe88ebe292ad5c2e299c018983724b96f18461c0acdb6f9807ccaf8b233328a5ff2c00582734255 SHA512 9aa1c7e617fe258be2eb1f7f0f9d462a51d6d0884edab102fbfa70936891b3371e1d86fa059648fccfb52a25645fb6376171d55ce20f7d6de267445c0f958b97
+EBUILD imagemagick-7.0.10.35.ebuild 7353 BLAKE2B f630da70a10987d339b433551781f27c8fff1a309e8fc755ef152ffb273a8219e861fd0b8819d6d7e4c4f4d7f07367e5581edf25308ea80f9daded8586fc73e9 SHA512 fb26e0c6a3578f1c4d02e551b6f96519f567f1a5cc94ab81b3a764fb8d0f477f775c21989050cc0c6c0cde114b4e8e7b63e91f741ecb8ff4e4c0cd8e48551749
+EBUILD imagemagick-7.0.10.41-r1.ebuild 7364 BLAKE2B 5067a5a79b93c7ea8364940352cc4988393ceb86a08e617dd95a309022be37b60dd9ffd1621c1a799cb372608f75c213d7fc1ddb13340225ad4643c408630bc4 SHA512 85560f10889069420c6459e696aa96d7306486bea2410d8f3bdc9160995eaad65b10ca171c2a39a170ba21043bb4cd84f5e6e0776e020ecf1286b84611430981
+EBUILD imagemagick-9999.ebuild 7235 BLAKE2B 17a5da6495c2c2a8f6b7215d62b5328caa34eb223af014047ebaab23175f4970567f2f39f21b49f78b237a676f35acef6371d6f23e31e2880400942dde249857 SHA512 41293ffa8582738c7908d0c56260fbe0294e13bebfd91106b0548fccc4abe42bc4f20bbbb1406ecf61aba259ca98d77181b4608075fbeea43c150bc1d275d86e
 MISC metadata.xml 1106 BLAKE2B e77cabff89df6b98687290ef0ee06d85111a7ddca6f5e1e31f820e6d186a6510c2afd0b85ba31004f102fd7f7b88f46af101f4ba45011aac75afa40b0a714857 SHA512 68a5f9a80b1e3f2e3004252703f9b3176d7c59880a2724ae431fdfd97e8f2adcd7ff7ad2cd8ea8bd35645a3b559052f2c38713647ce7ae889ff1a6061e6b2d92
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.28.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.35.ebuild
index f37a0010b4c8..45ebf61e641e 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.28.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.35.ebuild
@@ -20,8 +20,7 @@ IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg
 REQUIRED_USE="corefonts? ( truetype )
 	test? ( corefonts )"
 
-RESTRICT="perl? ( userpriv )
-	!test? ( test )"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/libltdl:0
@@ -211,7 +210,7 @@ src_install() {
 
 	if use opencl; then
 		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
 		EOF
 
 		insinto /etc/sandbox.d
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.31.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.41-r1.ebuild
index 02b0c9655fe7..671132b9e8fb 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.31.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.41-r1.ebuild
@@ -13,15 +13,14 @@ HOMEPAGE="https://www.imagemagick.org/"
 SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
-SLOT="0/6.9.11"
+SLOT="0/6.9.11-37"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 REQUIRED_USE="corefonts? ( truetype )
 	test? ( corefonts )"
 
-RESTRICT="perl? ( userpriv )
-	!test? ( test )"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/libltdl:0
@@ -211,7 +210,7 @@ src_install() {
 
 	if use opencl; then
 		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
 		EOF
 
 		insinto /etc/sandbox.d
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.28.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.35.ebuild
index f54a5b0369e3..9407d6f5b2d6 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.28.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.35.ebuild
@@ -224,7 +224,7 @@ src_install() {
 
 	if use opencl; then
 		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
 		EOF
 
 		insinto /etc/sandbox.d
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.31.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.41-r1.ebuild
index ac9609f64eff..c476290b8c6a 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.31.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.41-r1.ebuild
@@ -20,7 +20,7 @@ DESCRIPTION="A collection of tools and libraries for many image formats"
 HOMEPAGE="https://www.imagemagick.org/"
 
 LICENSE="imagemagick"
-SLOT="0/7.0.10"
+SLOT="0/7.0.10-37"
 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 )"
 
@@ -224,7 +224,7 @@ src_install() {
 
 	if use opencl; then
 		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
 		EOF
 
 		insinto /etc/sandbox.d
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index eb7593072ecd..542b188a2826 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -224,7 +224,7 @@ src_install() {
 
 	if use opencl; then
 		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
 		EOF
 
 		insinto /etc/sandbox.d
diff --git a/media-gfx/img2pdf/Manifest b/media-gfx/img2pdf/Manifest
index ca96b88df798..bc136e75f16e 100644
--- a/media-gfx/img2pdf/Manifest
+++ b/media-gfx/img2pdf/Manifest
@@ -1,7 +1,3 @@
-DIST img2pdf-0.3.3.tar.gz 80523 BLAKE2B 39e372f1ab82d9f521cf2c512b173680afe6463dd041283b336af49c41b12d12261fe5947ad9f03d489b7898d3c8d161faedb2b3366cb75bd1bc0666f905f60c SHA512 234e0031d75727d2f5d2b82603bb447d9101ace81e604b6d5eb358d0b4681e209dbd737775b90b44096cf84239aac9e87e2369e0c6112a17f24ccbf10a20cdd5
-DIST img2pdf-0.3.4.tar.gz 83729 BLAKE2B c595ca7eebfcb91cfe076822836ce07ec0036a510645aae54e495798765df91cddf5de292245c623b2e23918d7862271cdca5d7b8dd76573dc40d8ba7807865a SHA512 0e81e3ee06c62f0ee732b87776f6bc2d066ebce6c23dbcb85b2497518ba43fa3813b3e15f0c476c1203ae6d2b1f4f3e2f1b70215033dddb889fafd75b3671420
 DIST img2pdf-0.3.6.tar.gz 91006 BLAKE2B ad89b42be4613c30383770f336b07773bf13e87061fca61eb7d5e25d6489662fc2bae94d9a6d61d531a77f41b9e94492d0db1f32570f6d471fa9f8cb0816630d SHA512 2a9d31b9de52123941fd650123a483f4dc0757edda304da994353b5f3167bddbb25fa1ed8fededcf859c5d07b65b9c2d5185000949002a68dcae1e7bf0f1547d
-EBUILD img2pdf-0.3.3.ebuild 645 BLAKE2B 392a638abfd8bf09cfe7681998d3f9e9ccae7bbae5e42730226f44194a2e0fc68e77f3c73e30c9b060aaf50f96511a46959aca430fd6fde3a830c5c568e78f45 SHA512 35eed7c8bad2ccaa50b4128b6e8d5107a7dbd0411e475bb30c223a06b8018dc059aadc8db8cdd6101233f686468b7ae20a91db9e1c5a9cbc6db343d99bc0d01a
-EBUILD img2pdf-0.3.4.ebuild 603 BLAKE2B 37166fe22d5a8c141c9d4163856cb88ee0df95d1760806e6f7e9b2aafc3ad61ce9a0797fc0a965942e6cd90aebf0b4caeacd42ea2406e8580459968dee2d3257 SHA512 74e5f31989e22b71f9238b03c0c0b756d42410cc25f7e28f9e3a0b6d3047656f94cd005930bd4811db0a912744cc1af87e6f1035c2391ef0db9b368e597af943
 EBUILD img2pdf-0.3.6.ebuild 563 BLAKE2B 37031fdbc0276e3e64bb865377a717334892f926a1bf97ef320b0bf8b7b894e8a3a1a86c7b90ab30e11683712ea10a0ba545dfb2b2dff67f5f78c1852518a14f SHA512 c4f94db0ce5e98bcdb0eab1b72eb4b04c3a8061f5cf82bcb8520b5eeef8a2d98dc98a81420e73b5323688d036fc00471d20c5897532c1bca54d34f416ef12471
 MISC metadata.xml 1120 BLAKE2B df864ac9c560f0e55a889701014713ecc210b15b094ad729b94bfbe29fcadbf6d31f37d4b2761a538fa6e4a9617a0b030f487b2e2d5c3b347d834a2c287f07ec SHA512 825a15bf571a32a1b458a4d731fdc578ac024f8a067ff61e9cdd85066fcae5f92bb48a3fcb4bf0e78c5b01f5d4550b6a3b7bd6c1951f7e7264fb4c8078c216e2
diff --git a/media-gfx/img2pdf/img2pdf-0.3.3.ebuild b/media-gfx/img2pdf/img2pdf-0.3.3.ebuild
deleted file mode 100644
index a7efeb646504..000000000000
--- a/media-gfx/img2pdf/img2pdf-0.3.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Losslessly convert raster images to PDF"
-HOMEPAGE="https://gitlab.mister-muffin.de/josch/img2pdf"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pdfrw[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff,zlib]
-	)"
-RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/media-gfx/img2pdf/img2pdf-0.3.4.ebuild b/media-gfx/img2pdf/img2pdf-0.3.4.ebuild
deleted file mode 100644
index d6e18fd6a2fa..000000000000
--- a/media-gfx/img2pdf/img2pdf-0.3.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Losslessly convert raster images to PDF"
-HOMEPAGE="https://gitlab.mister-muffin.de/josch/img2pdf"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="test? (
-		dev-python/pdfrw[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff,zlib]
-	)"
-RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest
index 693d9bd7d3a0..f2b11f9eaa70 100644
--- a/media-gfx/imv/Manifest
+++ b/media-gfx/imv/Manifest
@@ -3,4 +3,4 @@ DIST imv-4.1.0.tar.gz 77341 BLAKE2B d6735feba4d3e958db70eddea72bbbeb60731cf55068
 EBUILD imv-4.0.1-r2.ebuild 1668 BLAKE2B 15349164bbf9db90387a806b7a93546321865f1b0ab9afceae73cb8a19f5c3c91868000babc6ecc07ebd799b09f43f3392937b53b9a7ee587d5591a74cf140ae SHA512 2d35ea2a80e63dea404172db166ff394afc052ed063d88fd3d5b35e592bffd6d2154461caab979104a414a39b908e6dd5e362d7f99146f683ba3c3fa8b445e2b
 EBUILD imv-4.1.0-r1.ebuild 1767 BLAKE2B fe2541d3bce172e6fc1c559ed0593a4c52b1536b907459d2e5842db5c14ec356e7523cf3d91225ab6b5d3261b8ff3fa4ab9724c8d95979e88078b5b7617d897f SHA512 7484d434a44818bd131ccecd484bd88e6ed8867eacf48f94e863b9dc480f197005a5f8bc519207afd82f3fca7d02416dbd7fc7ff966520b7a57c726317af4cdd
 EBUILD imv-9999.ebuild 1798 BLAKE2B a1c931a83c7b2444d33341e74fa50c4fa532ec3b215e3010eb250a1cae7c2f0f439068d725d3e3bc17eb4cc2cc97fe0e96924d606225cf783d7c009938ca0832 SHA512 c35f9417fe15cce3947ff334aaadae2c76fa9c4084e321bf903bda5cb9e3c9d6341fe709e9b8dcf2cdad84c48e7b848463c75a508ee8fbcce66261533dcf77cd
-MISC metadata.xml 532 BLAKE2B 425eed771fcdee28d9ef37c21fdca5b7f4450f565fff15f647a94de9e9e220b97df1efb517a6daa752ed628332f81b49eb429f6bd9a558094ae7d0e71d359cbf SHA512 f4fc42098f9ae4e48add68134e70ca61dc20fa408b4e2b46fb6072bfa2543ae1d928033ed2dba2dd34f79d3e12f4ad1c98bf5bab600b842f97d99fd8c4a3bdb6
+MISC metadata.xml 490 BLAKE2B 6b48ec3d26724e518dff34a3cd7b6a121f023c2b78b39777abc71d85192bd27877a7bd058b564f10528765b18c823aa01bdf3f9537468112c2384e66bd2b02e3 SHA512 b53c973037b89ba73e2af0d181bf23b5fc881c73fa2645f3bdd880a948e2d250feb5398a41910b6695cde1b5171b60951edf5e1c9e82279253e356a7d1748618
diff --git a/media-gfx/imv/metadata.xml b/media-gfx/imv/metadata.xml
index e61730462a7b..5ae50d4b1eeb 100644
--- a/media-gfx/imv/metadata.xml
+++ b/media-gfx/imv/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type='person'><email>jer@gentoo.org</email></maintainer>
+<!-- maintainer-needed -->
 <use>
-<flag name='freeimage'>Use <pkg>media-libs/freeimage</pkg> as image library</flag>
-<flag name='heif'>Use <pkg>media-libs/libheif</pkg> as image library</flag>
-<flag name='libnsgif'>Use <pkg>media-libs/libnsgif</pkg> as image library</flag>
+<flag name="freeimage">Use <pkg>media-libs/freeimage</pkg> as image library</flag>
+<flag name="heif">Use <pkg>media-libs/libheif</pkg> as image library</flag>
+<flag name="libnsgif">Use <pkg>media-libs/libnsgif</pkg> as image library</flag>
 </use>
 <upstream>
 <remote-id type="github">eXeC64/imv</remote-id>
diff --git a/media-gfx/iscan-plugin-esdip/Manifest b/media-gfx/iscan-plugin-esdip/Manifest
index 0fba7d7d31f1..8d36db0465c3 100644
--- a/media-gfx/iscan-plugin-esdip/Manifest
+++ b/media-gfx/iscan-plugin-esdip/Manifest
@@ -1,4 +1,4 @@
 DIST iscan-plugin-esdip-1.0.0-5.ltdl7.i386.rpm 1311240 BLAKE2B 0afcb65165c40fe352ab7d47082032d98423b2a5887babf1c3015df9cd3ae860343572131ba76c99eebc5efb5e6a4f66174765695e66d83061b525cbcd2ec77a SHA512 cff826ad66e1718a9b59f09849522af70789f782e36d5ed979ef4296eee7be5e4e02375c939300b94d6ac555f1db2441bee59758a8a0d040770d25b47ba8dbab
 DIST iscan-plugin-esdip-1.0.0-5.ltdl7.x86_64.rpm 1359799 BLAKE2B 01774e0fcf127e578b62091e744833f93a79c6bd61f7a953e025f3e31ea9c66479404b9dce17d7b52f5802e3f0a3c6f9b4d0ed43b1abdeb8027a922015130b71 SHA512 3d5f9721eb9d8b56d16800a4a4a25c4b887d593e08d1d0c3709f10b92c52b906000e84c99f41eec13b9ccdbaf53d2621f6f1582d69a1e5e291239a47987776a7
-EBUILD iscan-plugin-esdip-1.0.0.5-r1.ebuild 970 BLAKE2B ad98ff1aebd5c1d0ea496621b2c376bb63ca51299aebfdf65783f7f6ead654f80b50f5494468202c12cf9f8a23e01551dbd0b5ce5e7a94499ca985c6c226c9e3 SHA512 a75453cb7d7da79b8fde6f60f3459158c284117b2e674622b5ee95e742cd3eb8faa8eb5e34ed19e33305d3a4ef77f52d2a78e03c77a726df39edd997c99da703
+EBUILD iscan-plugin-esdip-1.0.0.5-r1.ebuild 897 BLAKE2B b9003033d872c564692851078a14bffbce9516eddccd71fd3d5f7768c7533245ad6e2f229aba3e91d8fabd522ced68d6da2987f50cd8764eeb314f2627c011c3 SHA512 41603ccade55b70e14df026cbbf24fed6fbd745a11a9335b2ab8de2c3fcbacefc02bce727e9952bc3e42f468fdbf50a4883fbfad3452cb16f5ff652afa727c3c
 MISC metadata.xml 451 BLAKE2B f1f7ad59a6f74f8b22dd85652f80e8b038e6f26c7a8f82a46f1b85c2b4e6a7b9cd43f300aef128116e5b79a5ff9e43c38bde186e46c434ee6a5bbc75f3336e50 SHA512 ac4ba67895db738a472b4663a9d648c0ad4540a48433ec90af77ff9a6c63892a87bd94ea06c5cb5b91a5019609288a85836d1afecd4d988885aca6c89fbafc72
diff --git a/media-gfx/iscan-plugin-esdip/iscan-plugin-esdip-1.0.0.5-r1.ebuild b/media-gfx/iscan-plugin-esdip/iscan-plugin-esdip-1.0.0.5-r1.ebuild
index f8a30eaf927f..e4e0428578ea 100644
--- a/media-gfx/iscan-plugin-esdip/iscan-plugin-esdip-1.0.0.5-r1.ebuild
+++ b/media-gfx/iscan-plugin-esdip/iscan-plugin-esdip-1.0.0.5-r1.ebuild
@@ -1,29 +1,26 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit rpm versionator multilib
+inherit rpm
 
-MY_PV="$(get_version_component_range 1-3)"
-MY_PVR="$(replace_version_separator 3 -)"
+MY_PV="$(ver_cut 1-3)"
+MY_PVR="$(ver_rs 3 -)"
 
 DESCRIPTION="Plugin for 'epkowa' backend for image manipulation"
 HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=L"
 SRC_URI="amd64? ( https://dev.gentoo.org/~flameeyes/avasys/${PN}-${MY_PVR}.ltdl7.x86_64.rpm )
 	x86? ( https://dev.gentoo.org/~flameeyes/avasys/${PN}-${MY_PVR}.ltdl7.i386.rpm )"
+S="${WORKDIR}"
 
 LICENSE="AVASYS"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 
-IUSE=""
-
 DEPEND=">=media-gfx/iscan-2.28.0"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"
-
 QA_PREBUILT="/usr/lib64/iscan/libesdtr.so.0*
 	/usr/lib64/iscan/libesdtr2.so.0*"
 
diff --git a/media-gfx/iscan-plugin-gt-f500/Manifest b/media-gfx/iscan-plugin-gt-f500/Manifest
index 53e472d5e3a2..b52971932503 100644
--- a/media-gfx/iscan-plugin-gt-f500/Manifest
+++ b/media-gfx/iscan-plugin-gt-f500/Manifest
@@ -1,3 +1,3 @@
 DIST iscan-plugin-gt-f500-1.0.0-1.c2.i386.rpm 126130 BLAKE2B 619dad6d7a93f96a962dbbcfa1095544245c1bfaf1525125fa872bfbf45bca1579759673cfdca3a342a96101967d397da38a12f1d326080aa42bcb130642e61a SHA512 efecbb6e3f4fe3f498ebf9bb68a1755405c675d67c52042dcfc2e4e7f98903a870f969b4453d110c9f774452c6ae44042482ee954762c5f5a559e2d3e52a98d0
-EBUILD iscan-plugin-gt-f500-1.0.0.1-r1.ebuild 2044 BLAKE2B fa1a14db0403e80f7f030aa2125f30112ae373d677fa5a8438ad33e05320571c0d190a85d2818385534ff24d9eee6be759461d6cf523e2bc7ad5c92cb13b6ed8 SHA512 13cd13f9ce2fb9190afe00116af1c469e76caca24572e0bf0db2f23c2abd1ec4129cc9020fef52a7062dd2f3a8d5d3c57bef700eb3ae1c114fa3ecaac7226e82
+EBUILD iscan-plugin-gt-f500-1.0.0.1-r1.ebuild 2035 BLAKE2B 0d188c91873f35fbe752a858dcf1d23779dc5c2a2501aad89b96f5d6bbd2d84188b0d4933eebef31e3255c2491e996eef2b96e9891cd0cacfa4720cfe346b19a SHA512 c8dde7e196ddfd27c753b0f9b9a3c1579800c1fb876a9dd19eaf68a15be30cbc0bee239fe13a7f72c958b1ac30de44faf295939d54dc862693ec2d7e81c4c542
 MISC metadata.xml 745 BLAKE2B 10d7bdff900b0a44b044d84683c2c013ad25a9a20cb6bab454aec00e949635615af71498e09d1b5c431f0257d224bbae40c445599378f00574684cf6c6b6ef00 SHA512 08f9ff794990e46bc9debea0455ba309626ad4014c8e832e6da750b8618cede462adee0f37ddbdeed2875a431a4316a60c73aca2195dbff6abd4c3fa1893d822
diff --git a/media-gfx/iscan-plugin-gt-f500/iscan-plugin-gt-f500-1.0.0.1-r1.ebuild b/media-gfx/iscan-plugin-gt-f500/iscan-plugin-gt-f500-1.0.0.1-r1.ebuild
index ec4ff46f4fda..dc9d71820484 100644
--- a/media-gfx/iscan-plugin-gt-f500/iscan-plugin-gt-f500-1.0.0.1-r1.ebuild
+++ b/media-gfx/iscan-plugin-gt-f500/iscan-plugin-gt-f500-1.0.0.1-r1.ebuild
@@ -1,27 +1,25 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit multilib rpm versionator
+inherit rpm
 
-MY_P="${PN}-$(replace_version_separator 3 -)"
+MY_P="${PN}-$(ver_rs 3 -)"
 
 DESCRIPTION="Epson Perfection 2480/2580 PHOTO scanner plugin for SANE 'epkowa' backend"
 HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
 SRC_URI="https://dev.gentoo.org/~flameeyes/avasys/${MY_P}.c2.i386.rpm"
+S="${WORKDIR}"
 
 LICENSE="EPSON EAPL"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-
 IUSE="minimal"
 
 DEPEND="minimal? ( >=media-gfx/iscan-2.21.0 )"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"
-
 src_configure() { :; }
 src_compile() { :; }
 
@@ -38,47 +36,34 @@ src_install() {
 	doexe "${WORKDIR}/usr/$(get_libdir)/iscan/"*
 }
 
-pkg_setup() {
-	basecmds=(
-		"iscan-registry --COMMAND interpreter usb 0x04b8 0x0121 '/opt/iscan/esci/libesint41.so.2 /usr/share/iscan/esfw41.bin'"
-	)
-}
-
 pkg_postinst() {
 	elog
 	elog "Firmware file esfw41.bin for Epson Perfection 2480/2580 PHOTO"
-	elog "has been installed in /usr/share/iscan."
+	elog "has been installed in ${EROOT}/usr/share/iscan."
 	elog
+
 	use minimal && return
-	[[ -n ${REPLACING_VERSIONS} ]] && return
+	[[ -n "${REPLACING_VERSIONS}" ]] && return
 
 	# Needed for scanner to work properly.
-	if [[ ${ROOT} == "/" ]]; then
-		for basecmd in "${basecmds[@]}"; do
-			eval ${basecmd/COMMAND/add}
-		done
+	if [[ -z "${EROOT}" ]]; then
+		iscan-registry --add interpreter usb 0x04b8 0x0121 '/opt/iscan/esci/libesint41.so.2 /usr/share/iscan/esfw41.bin' || die
 	else
 		ewarn "Unable to register the plugin and firmware when installing outside of /."
 		ewarn "execute the following command yourself:"
-		for basecmd in "${basecmds[@]}"; do
-			ewarn "${basecmd/COMMAND/add}"
-		done
+		ewarn "iscan-registry --add interpreter usb 0x04b8 0x0121 '/opt/iscan/esci/libesint41.so.2 /usr/share/iscan/esfw41.bin'"
 	fi
 }
 
 pkg_prerm() {
 	use minimal && return
-	[[ -n ${REPLACED_BY_VERSION} ]] && return
+	[[ -n "${REPLACED_BY_VERSION}" ]] && return
 
-	if [[ ${ROOT} == "/" ]]; then
-		for basecmd in "${basecmds[@]}"; do
-			eval ${basecmd/COMMAND/remove}
-		done
+	if [[ -z "${EROOT}" ]]; then
+		iscan-registry --remove interpreter usb 0x04b8 0x0121 '/opt/iscan/esci/libesint41.so.2 /usr/share/iscan/esfw41.bin' || die
 	else
 		ewarn "Unable to de-register the plugin and firmware when installing outside of /."
 		ewarn "execute the following command yourself:"
-		for basecmd in "${basecmds[@]}"; do
-			ewarn "${basecmd/COMMAND/remove}"
-		done
+		ewarn "iscan-registry --remove interpreter usb 0x04b8 0x0121 '/opt/iscan/esci/libesint41.so.2 /usr/share/iscan/esfw41.bin'"
 	fi
 }
diff --git a/media-gfx/iscan-plugin-gt-f720/Manifest b/media-gfx/iscan-plugin-gt-f720/Manifest
index 36868f2beec5..045c9159cf1a 100644
--- a/media-gfx/iscan-plugin-gt-f720/Manifest
+++ b/media-gfx/iscan-plugin-gt-f720/Manifest
@@ -1,4 +1,4 @@
 DIST esci-interpreter-gt-f720-0.0.1-2.i386.rpm 381387 BLAKE2B 1852f0f89e7181d8adad209d146e41f1a122e95256c073ef77b96338585520c25e287bff86a0eda8fd09733328a2c67c22bddffabfc37f5de7aef1726f5c997b SHA512 6ccc6f48d8c00614346a0faee798b876497ba5ac1b35e3fd558a6e01711b944dc713e654d53fff09daff00b91251150665932564fea4fc60ec1a0a7ec95fa1f5
 DIST esci-interpreter-gt-f720-0.0.1-2.x86_64.rpm 170040 BLAKE2B e46bc0841a872883b85b2d91cadcc1007e3639d0f1c6d64948b91a3fd65c66bf295102bd898b9a5b1fe671d0746023ed95ab1325418501f2176be17af88e1f67 SHA512 457fcfa3ae8291336a127e95dc81e24a2125ae8f861bf74d2006e4d019c54bd351c2480254b9173e52dfe489962dffea2819963596f280e1dc05c527fbf6b625
-EBUILD iscan-plugin-gt-f720-0.0.1.2.ebuild 1572 BLAKE2B b4559ff53034389c89ce8c488aaf23773b758e329fbffaba0bf773c292bfc4e493d8881e9a8925e42f6f07351da1f57e668bd9c030d12bda10ea4c6341539d6e SHA512 3de21ed5ecf6c80465aefe88c7188ee8d83ff385304a68efc4fb84ceaf768cbbf6274f26c9fa303d012ce86bf428fb9f4001cc1c1dd3d304121bf53cf49899e4
+EBUILD iscan-plugin-gt-f720-0.0.1.2.ebuild 1528 BLAKE2B 553ab5439b1bd2af34e8da14671a6cd6fc092db9983dd85064956cadf2965c64eeec961aa978bdcc214246d412d4d18592c7b5278e81223f0ffbfa269d635868 SHA512 5e16ca6600ccd2444efe05527d8d4da973625730029ef77ae77dd7a4275bafb7f7ba846db012d46e09bbb69742f4a1c7dc145f919468a48a9c3c2fb487785276
 MISC metadata.xml 471 BLAKE2B a439ab30f66271d78a132879e8329c7fe0be9834c2b1b51558df8779f5fe90bcdb7d4406778332f2194c29d5f183c5b748b06d5a5769e3f5d91eeada16a0f561 SHA512 bf031ef052c52c9376d340659eaaa9f9ca8543e3719dd35cf126946f31018f7eb49b829bafd1c2b311a531d562ff68414b24db0c9bb9d392f6e4038ff1d25c7b
diff --git a/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.2.ebuild b/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.2.ebuild
index a09a64ceb97d..d107dd8ad8ec 100644
--- a/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.2.ebuild
+++ b/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.2.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit multilib versionator rpm
+inherit rpm
 
-MY_PV="$(get_version_component_range 1-3)"
-MY_PVR="$(replace_version_separator 3 -)"
+MY_PV="$(ver_cut 1-3)"
+MY_PVR="$(ver_rs 3 -)"
 MY_P="esci-interpreter-gt-f720-${MY_PVR}"
 
 DESCRIPTION="Epson Perfection V300 PHOTO scanner plugin for SANE 'epkowa' backend"
 HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
 SRC_URI="amd64? ( https://dev.gentoo.org/~flameeyes/avasys/${MY_P}.x86_64.rpm )
 	x86? ( https://dev.gentoo.org/~flameeyes/avasys/${MY_P}.i386.rpm )"
+S="${WORKDIR}"
 
 LICENSE="AVASYS"
 SLOT="0"
@@ -21,8 +22,6 @@ KEYWORDS="-* amd64 x86"
 DEPEND=">=media-gfx/iscan-2.21.0"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"
-
 QA_PREBUILT="usr/lib64/esci/libesci-interpreter-gt-f720.so*"
 
 src_install() {
@@ -42,15 +41,15 @@ pkg_postinst() {
 	local MY_LIB="/usr/$(get_libdir)"
 
 	# Needed for scaner to work properly.
-	iscan-registry --add interpreter usb 0x04b8 0x0131 "${MY_LIB}/esci/libesci-interpreter-gt-f720 /usr/share/esci/esfw8b.bin"
+	iscan-registry --add interpreter usb 0x04b8 0x0131 "${MY_LIB}/esci/libesci-interpreter-gt-f720 /usr/share/esci/esfw8b.bin" || die
 	elog
 	elog "Firmware file esfw8b.bin for Epson Perfection V300 PHOTO"
-	elog "has been installed in /usr/share/esci and registered for use."
+	elog "has been installed in ${EROOT}/usr/share/esci and registered for use."
 	elog
 }
 
 pkg_prerm() {
 	local MY_LIB="/usr/$(get_libdir)"
 
-	iscan-registry --remove interpreter usb 0x04b8 0x0131 "${MY_LIB}/esci/libesci-interpreter-gt-f720 /usr/share/esci/esfw8b.bin"
+	iscan-registry --remove interpreter usb 0x04b8 0x0131 "${MY_LIB}/esci/libesci-interpreter-gt-f720 /usr/share/esci/esfw8b.bin" || die
 }
diff --git a/media-gfx/iscan-plugin-gt-x770/Manifest b/media-gfx/iscan-plugin-gt-x770/Manifest
index 642109f0833f..d50b2adac965 100644
--- a/media-gfx/iscan-plugin-gt-x770/Manifest
+++ b/media-gfx/iscan-plugin-gt-x770/Manifest
@@ -1,4 +1,4 @@
 DIST iscan-plugin-gt-x770-2.1.2-1.i386.rpm 462166 BLAKE2B 536bf2dfcf8d9ae7764e95b639aa5aa3a04d0f5b51c2884198d6d4d3105411ab9673bdf19006a4e2586d17dd74d673b57951fee69e3fba257a674234bcc4d883 SHA512 b8c16dd1c3d2d8f01956a72a170fa9b51520c78ab9d2d0cd581ee1b18760a28693d364e3bc3ac50a4f1c794fb4da777d452fe12ae3cf513a06eb5bedd2543b30
 DIST iscan-plugin-gt-x770-2.1.2-1.x86_64.rpm 196426 BLAKE2B 19641d3ef0742f2468df304ef0d151d3fd46408c9e4eb7e4c8ce27604fc5947e73f2448b474cde1a9aa545252561866a9ee61860430ede4ae68234204a5d71b8 SHA512 a69830fb35b2732351b35ef39a6863886bf6bc992242188e57d273444ea17e55294b5b9331c5e770b8af179e4f346e5be74c5fd79e1e6cefd2a1e975c3e68a43
-EBUILD iscan-plugin-gt-x770-2.1.2.1-r3.ebuild 2186 BLAKE2B ef5bd12a59a632b981c6a443567e994f9c297e615878f26ba8c72bc4a6133040c11b2fe137dc210a4c07f928080f22810ad48d1d18355835c561c7324764bfc4 SHA512 405c062938edb045612d4589e9a3d39b87826e931ca19a15ef7093ecfff9ee295c235deebc2581fa733928fbbc893c3a01b491b38449ada022349163143704a5
+EBUILD iscan-plugin-gt-x770-2.1.2.1-r3.ebuild 2127 BLAKE2B dcd0b55969739c064113c2153405b54b27320dfae2474f97f789ec297218dd74e64fccce61e3abf4885f8090087dc0bdf4decfc7403d0ea372654ae6799ef187 SHA512 32c6c7faeef7594d2b8f10760749c1f4ca0c9126a7cfd534a1f67fe4825470966758eff885b5dbedb7e069adf9c7d4f2712e40b87a3ecbd1b924923d050ebaf0
 MISC metadata.xml 458 BLAKE2B 3c055123ac3d559601ecbb0ad2a8fb18737c86e604f0f932744dec345ab4626e9734a5712888a4922380c6367b1003f812b63da815ff70cdbddb0b71c0fe9c29 SHA512 ade1af441c26e6f3b1c149fbb8a4f8530d425ff28e8d0525826f59985e08dec2cd3de02099ca1be2f3c8f9136d3aa482917b0636158ba46ba5f76649d12a572c
diff --git a/media-gfx/iscan-plugin-gt-x770/iscan-plugin-gt-x770-2.1.2.1-r3.ebuild b/media-gfx/iscan-plugin-gt-x770/iscan-plugin-gt-x770-2.1.2.1-r3.ebuild
index 380f3d1e59ea..e876f9536887 100644
--- a/media-gfx/iscan-plugin-gt-x770/iscan-plugin-gt-x770-2.1.2.1-r3.ebuild
+++ b/media-gfx/iscan-plugin-gt-x770/iscan-plugin-gt-x770-2.1.2.1-r3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit rpm versionator multilib
+inherit rpm
 
-MY_PV="$(get_version_component_range 1-3)"
-MY_PVR="$(replace_version_separator 3 -)"
+MY_PV="$(ver_cut 1-3)"
+MY_PVR="$(ver_rs 3 -)"
 
 DESCRIPTION="Epson Perfection V500 scanner plugin for SANE 'epkowa' backend"
 HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
@@ -14,19 +14,16 @@ SRC_URI="
 	x86? ( https://dev.gentoo.org/~flameeyes/avasys/${PN}/${MY_PV}/${PN}-${MY_PVR}.i386.rpm )
 	amd64? ( https://dev.gentoo.org/~flameeyes/avasys/${PN}/${MY_PV}/${PN}-${MY_PVR}.x86_64.rpm )
 "
+S="${WORKDIR}"
 
 LICENSE="AVASYS"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 
-IUSE=""
-
 DEPEND=">=media-gfx/iscan-2.21.0
 	!!<media-gfx/iscan-plugin-gt-x770-2.1.2.1-r2"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"
-
 QA_PREBUILT="/opt/iscan/esci/libesint7C.so*"
 
 src_configure() { :; }
@@ -44,46 +41,32 @@ src_install() {
 	doexe "${WORKDIR}/usr/$(get_libdir)/iscan/"*
 }
 
-pkg_setup() {
-	basecmds=(
-		"iscan-registry --COMMAND interpreter usb 0x04b8 0x0130 /opt/iscan/esci/libesint7C /usr/share/iscan/esfw7C.bin"
-	)
-}
-
 pkg_postinst() {
 	elog
 	elog "Firmware file esfw41.bin for Epson Perfection V500"
-	elog "has been installed in /usr/share/iscan."
+	elog "has been installed in ${EROOT}/usr/share/iscan."
 	elog
 
-	[[ -n ${REPLACING_VERSIONS} ]] && return
+	[[ -n "${REPLACING_VERSIONS}" ]] && return
 
 	# Needed for scanner to work properly.
-	if [[ ${ROOT} == "/" ]]; then
-		for basecmd in "${basecmds[@]}"; do
-			eval ${basecmd/COMMAND/add}
-		done
+	if [[ -z "${EROOT}" ]]; then
+		iscan-registry --add interpreter usb 0x04b8 0x0130 /opt/iscan/esci/libesint7C /usr/share/iscan/esfw7C.bin || die
 	else
 		ewarn "Unable to register the plugin and firmware when installing outside of /."
 		ewarn "execute the following command yourself:"
-		for basecmd in "${basecmds[@]}"; do
-			ewarn "${basecmd/COMMAND/add}"
-		done
+		ewarn "iscan-registry --add interpreter usb 0x04b8 0x0130 /opt/iscan/esci/libesint7C /usr/share/iscan/esfw7C.bin"
 	fi
 }
 
 pkg_prerm() {
-	[[ -n ${REPLACED_BY_VERSION} ]] && return
+	[[ -n "${REPLACED_BY_VERSION}" ]] && return
 
-	if [[ ${ROOT} == "/" ]]; then
-		for basecmd in "${basecmds[@]}"; do
-			eval ${basecmd/COMMAND/remove}
-		done
+	if [[ -z "${EROOT}" ]]; then
+		iscan-registry --remove interpreter usb 0x04b8 0x0130 /opt/iscan/esci/libesint7C /usr/share/iscan/esfw7C.bin || die
 	else
 		ewarn "Unable to de-register the plugin and firmware when installing outside of /."
 		ewarn "execute the following command yourself:"
-		for basecmd in "${basecmds[@]}"; do
-			ewarn "${basecmd/COMMAND/remove}"
-		done
+		ewarn "iscan-registry --remove interpreter usb 0x04b8 0x0130 /opt/iscan/esci/libesint7C /usr/share/iscan/esfw7C.bin"
 	fi
 }
diff --git a/media-gfx/iscan-plugin-gt-x820/Manifest b/media-gfx/iscan-plugin-gt-x820/Manifest
index e3f2e8af020b..7c4f2c185184 100644
--- a/media-gfx/iscan-plugin-gt-x820/Manifest
+++ b/media-gfx/iscan-plugin-gt-x820/Manifest
@@ -1,4 +1,4 @@
 DIST iscan-plugin-gt-x820-2.2.0-1.i386.rpm 490641 BLAKE2B 7618023f7637a8684f928b07217d2fa5df2a6cc1f5331a53a9b57e58b9d1127061b0e14e9af4c7b93746d3511414658bae47b12bc0db505054e6459925bfd566 SHA512 37f72ce8d71d315f51f45cd08c8865a2e613b8a6c6a27e7f4671bd5a796d10f3f9cffb954dd5f3875395f49244b090f5a2a4f2749d6c5d080ce4766faf7ccdf1
 DIST iscan-plugin-gt-x820-2.2.0-1.x86_64.rpm 206774 BLAKE2B 3d3faf1c04742bfcfd96473fc5274423a458c4082526887d5164585274c1ee2fd7606fa351267a7b94b0f632634817dda8e4bd57dcc54a43c307b6a602646706 SHA512 342b034ae7cf1f2b346ffce8719a025e55df2295daaad896acb072e3e36b916f0503106293dc88340d4b1b732b8daa6f4d0681f843754824b757667940b5b545
-EBUILD iscan-plugin-gt-x820-2.2.0.1.ebuild 2241 BLAKE2B 7923a0dbb21e2535e56c05f8318cdeda066681774ba6d4e71bd50a4a1c39970ab64b9b0725fe41427f0e8237260a6eec87721ceecce5b4230144036a084e4295 SHA512 843cf78f8b5c874db81ede7a0a3e78f924ddcf66031bc093c2ec99d33db671b388d40351080b4afa610438f0abe6de9b28ff9fd43d6ee43498c9e2fcf52044bc
+EBUILD iscan-plugin-gt-x820-2.2.0.1.ebuild 2179 BLAKE2B 6ffc60c2f6541389c0ba7012908790f2523cc66d9669b00e410b9ee56eab16311b0058e0a418700c4bfdcd31adf2f093f37825f8c3f27c5ac069299dbcb746cd SHA512 faf33871e463f47fe8c04e88e75964237fac081d13086f0ad1d9cabf96581716348ddc72d523387afc726fdc429e174419ee564c2ed8b2a80d59ae23bfbf4589
 MISC metadata.xml 464 BLAKE2B 54e1ca2207c523fdc988369222b6f581807986d5f00206bcf2cd58a7b969c5677b8b1df6ec42a6aeaec7e7a32430f5c1bf4e3a4e583da4e93db45e73d6e1d565 SHA512 42f9ba42888fbd42fdf6197d3b9e59c96efd8b48fafd9eb54cba4aa6bc23df7d45f3a9f0c0157750234018e225560cb34c63cc8b9245fda12bdeb3ce25390871
diff --git a/media-gfx/iscan-plugin-gt-x820/iscan-plugin-gt-x820-2.2.0.1.ebuild b/media-gfx/iscan-plugin-gt-x820/iscan-plugin-gt-x820-2.2.0.1.ebuild
index ba7639fb7a51..a368e5a4192d 100644
--- a/media-gfx/iscan-plugin-gt-x820/iscan-plugin-gt-x820-2.2.0.1.ebuild
+++ b/media-gfx/iscan-plugin-gt-x820/iscan-plugin-gt-x820-2.2.0.1.ebuild
@@ -1,29 +1,26 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit rpm versionator multilib
+inherit rpm
 
-MY_PV="$(get_version_component_range 1-3)"
-MY_PVR="$(replace_version_separator 3 -)"
+MY_PV="$(ver_cut 1-3)"
+MY_PVR="$(ver_rs 3 -)"
 
 DESCRIPTION="Epson Perfection V600 scanner plugin for SANE 'epkowa' backend"
 HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
 SRC_URI="amd64? ( https://dev.gentoo.org/~flameeyes/avasys/${PN}-${MY_PVR}.x86_64.rpm )
 	x86? ( https://dev.gentoo.org/~flameeyes/avasys/${PN}-${MY_PVR}.i386.rpm )"
+S="${WORKDIR}"
 
 LICENSE="AVASYS"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 
-IUSE=""
-
 DEPEND=">=media-gfx/iscan-2.21.0"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"
-
 QA_PREBUILT="/opt/iscan/lib/libesintA1.so*"
 
 src_configure() { :; }
@@ -41,50 +38,36 @@ src_install() {
 	doexe "${WORKDIR}/usr/$(get_libdir)/iscan/"*
 }
 
-pkg_setup() {
-	basecmds=(
-		"iscan-registry --COMMAND interpreter usb 0x04b8 0x013a /opt/iscan/lib/libesintA1 /usr/share/iscan/esfwA1.bin"
-	)
-}
-
 pkg_postinst() {
 	elog
 	elog "Firmware file esfwA1.bin for Epson Perfection V600"
-	elog "has been installed in /usr/share/iscan."
+	elog "has been installed in ${EROOT}/usr/share/iscan."
 	elog
 
 	# Only register scanner on new installs
-	[[ -n ${REPLACING_VERSIONS} ]] && return
+	[[ -n "${REPLACING_VERSIONS}" ]] && return
 
 	# Needed for scanner to work properly.
-	if [[ ${ROOT} == "/" ]]; then
-		for basecmd in "${basecmds[@]}"; do
-			eval ${basecmd/COMMAND/add}
-		done
+	if [[ -z "${EROOT}" ]]; then
+		iscan-registry --add interpreter usb 0x04b8 0x013a /opt/iscan/lib/libesintA1 /usr/share/iscan/esfwA1.bin || die
 		elog "New firmware has been registered automatically."
 		elog
 	else
 		ewarn "Unable to register the plugin and firmware when installing outside of /."
 		ewarn "execute the following command yourself:"
-		for basecmd in "${basecmds[@]}"; do
-			ewarn "${basecmd/COMMAND/add}"
-		done
+		ewarn "iscan-registry --add interpreter usb 0x04b8 0x013a /opt/iscan/lib/libesintA1 /usr/share/iscan/esfwA1.bin"
 	fi
 }
 
 pkg_prerm() {
 	# Only unregister on on uninstall
-	[[ -n ${REPLACED_BY_VERSION} ]] && return
+	[[ -n "${REPLACED_BY_VERSION}" ]] && return
 
-	if [[ ${ROOT} == "/" ]]; then
-		for basecmd in "${basecmds[@]}"; do
-			eval ${basecmd/COMMAND/remove}
-		done
+	if [[ -z "${EROOT}" ]]; then
+		iscan-registry --remove interpreter usb 0x04b8 0x013a /opt/iscan/lib/libesintA1 /usr/share/iscan/esfwA1.bin || die
 	else
 		ewarn "Unable to register the plugin and firmware when installing outside of /."
 		ewarn "execute the following command yourself:"
-		for basecmd in "${basecmds[@]}"; do
-			ewarn "${basecmd/COMMAND/remove}"
-		done
+		ewarn "iscan-registry --remove interpreter usb 0x04b8 0x013a /opt/iscan/lib/libesintA1 /usr/share/iscan/esfwA1.bin"
 	fi
 }
diff --git a/media-gfx/iscan-plugin-network-nt/Manifest b/media-gfx/iscan-plugin-network-nt/Manifest
index 673737c2a9a4..aaaff9881617 100644
--- a/media-gfx/iscan-plugin-network-nt/Manifest
+++ b/media-gfx/iscan-plugin-network-nt/Manifest
@@ -1,5 +1,3 @@
 DIST imagescan-bundle-centos-8-3.62.0.x64.rpm.tar.gz 11111201 BLAKE2B 51b868569fa049f8bc35a911245895c0fe0c5e0060b129c1c84a39cddd0aa4344ea024b6896dadc535438bcfc0be74337348533adf1b2be8866aad4e30bcb41a SHA512 11af49d20fc8e828c25dc6e912d1dbefebcba9835b1ebe922bc57c30dd0d13b79508a1bb01ad260c721d865fd393a41bc2bf41dc84b42efb22512a28cc9542f3
-DIST iscan-bundle-2.30.4.x64.deb.tar.gz 517592 BLAKE2B f7c0638575d406ed8612f478c06fdb1331e890f932b8dc96a4dcf9fbe499683f53159103c8dfd6c1036f2bc7930bbbc4c8b18d88c460d4b48798e07f31630e0b SHA512 6d967f5d2d554478df49c784d0ee785a9e1fc4f4b6ea4dc320270a50eca35cc3d533b918a1bda33cf3b0e9b783380e7828b77543730079b2e2f40ad9578db79d
-EBUILD iscan-plugin-network-nt-1.1.2.1.ebuild 1199 BLAKE2B 27d5e163fe667e5fc2716d7ca0f4b084c1086b4eadbe47895e456124cb456eeb5891d7eabe0e53814772c70decfda8a8c689bdb47407a5372f8e7b1d2e2302b0 SHA512 c29561704dc018bda0b2263d203372ca361fa52dd2015c2918fb68c1cfb38e2ead2bc5caaf5af9271870cf2a7c70eb83cacc0730934b1c5727d18a45dbd15af7
-EBUILD iscan-plugin-network-nt-1.1.3.ebuild 1123 BLAKE2B dbaa5263b12cc1bf780237394319619b5078e1d341c9705e01809ab9acaee6cf58ac1338ad5a99ca596ce008a698276a000aed799f0356a3f24428a26a4edde7 SHA512 6e4d5af17cf980749b39c8c3d3b2cbeb373feb7e70acda055c6e8b0e89b873bebc8fc403d36582de8b3f7745f4c003bd45efd47ac9dd2c4431e1f03a63b4838d
+EBUILD iscan-plugin-network-nt-1.1.3.ebuild 1171 BLAKE2B 5f678879d26f6ab2ad266e6df134004d59efd30b617879040e2fc71ff80e6076b4d390ba4d32fba4fadae15e76699043a2906f33db41f310fb2bf0b59102bec4 SHA512 5ad1ac6b80e3bda397f34e542420114a5ca886ab59d5e54e81f3ad6abf78dc2eda7d1432df63582f4e7f63cd74d58edad51557fe1757b901a8c5ec917dac90d5
 MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
diff --git a/media-gfx/iscan-plugin-network-nt/iscan-plugin-network-nt-1.1.2.1.ebuild b/media-gfx/iscan-plugin-network-nt/iscan-plugin-network-nt-1.1.2.1.ebuild
deleted file mode 100644
index 59027f250614..000000000000
--- a/media-gfx/iscan-plugin-network-nt/iscan-plugin-network-nt-1.1.2.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Network scanning plugin for EPSON scanners (nonfree)"
-
-HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-# This is distributed as part of the "bundle driver"; since we already have the
-# opensource part separately we just install the nonfree part here.
-
-ISCAN_VERSION="2.30.4"
-
-SRC_URI="https://download2.ebz.epson.net/iscan/general/deb/x64/iscan-bundle-${ISCAN_VERSION}.x64.deb.tar.gz"
-
-LICENSE="EPSON-2018"
-
-SLOT="0"
-
-#KEYWORDS="~amd64"
-# No keywords since I havent really gotten it to work yet. However, installation
-# locations are clearly correct... may be a hardware/network problem on my side.
-
-RESTRICT="bindist mirror strip"
-
-RDEPEND="media-gfx/iscan"
-BDEPEND="app-arch/deb2targz"
-
-src_unpack() {
-	default
-	mv ./iscan-bundle-${ISCAN_VERSION}.x64.deb/plugins/iscan-network-nt_*_amd64.deb ${P}.deb || die
-	mkdir ${P} || die
-	cd ${P} || die
-	unpack ../${P}.deb
-	unpack "${S}/data.tar.gz"
-}
-
-src_install() {
-	exeinto /usr/lib/iscan
-	doexe usr/lib/iscan/network
-
-	gunzip usr/share/doc/iscan-network-nt/*.gz
-	dodoc usr/share/doc/iscan-network-nt/*
-}
diff --git a/media-gfx/iscan-plugin-network-nt/iscan-plugin-network-nt-1.1.3.ebuild b/media-gfx/iscan-plugin-network-nt/iscan-plugin-network-nt-1.1.3.ebuild
index b1b7f05ba96d..aeba3f796a7d 100644
--- a/media-gfx/iscan-plugin-network-nt/iscan-plugin-network-nt-1.1.3.ebuild
+++ b/media-gfx/iscan-plugin-network-nt/iscan-plugin-network-nt-1.1.3.ebuild
@@ -24,6 +24,8 @@ RESTRICT="bindist mirror strip"
 CONFIG_CHECK="~SYN_COOKIES"
 S=${WORKDIR}
 
+QA_PREBUILT="/usr/libexec/utsushi/networkscan"
+
 src_unpack() {
 	default
 	rpm_unpack ./imagescan-bundle-centos-8-${ISCAN_VERSION}.x64.rpm/plugins/imagescan-plugin-networkscan-${PV}-1epson4centos8.x86_64.rpm
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 99ff9b14da90..373a8e317dab 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -13,12 +13,11 @@ AUX iscan-3.62.0-gcc-10.patch 503 BLAKE2B 53a351f439f43003e668cad1b8f05231b58137
 AUX iscan-3.62.0-tests-boost.patch 2819 BLAKE2B 8c11f7bd80c5cbc0c34c0aacf605a914e908f4a9d3cf18b4e105c4a2c6fddefd414bd7e77015d1992e53dad6df6a797d6bdc4ee534ced9e17eb0091afae4306b SHA512 4bcdd5a747c3e2608bf8b7fb0e4e7354474dccd727d3bd11b0911ffe8ea050a412f241687a15524a479a3f13b87c95c04092b8cf15f922f5f95cc234fe8736d4
 AUX iscan-3.62.0-tests-linkage.patch 3921 BLAKE2B 0dedae75fbbe387d2db900eb88b0e839746cfcbfa2b2ed7d52f9fd1b6756f14aa8fc53708ab2d1e461dff25ebe4e73e97f647ba4792bd263021f9b94f7b50139 SHA512 0b84829871ef45acf0ac209a0ba315b88409429c454b4655a4004c9d1afddf88d1ae0b1fff891078f5cf68541f7a8d896d50a550b650f1157517d5dbc99bfbd4
 AUX iscan-3.62.0-tests-tesseract.patch 3825 BLAKE2B ee16bab5f36e866d2a212f832f90b8fa078cfea51dd81ae8175086ce896b718c52f2dd5c56ba15ddf89427abde6231b93672a71467d18fc47c45fdd166efce54 SHA512 63cf6b7f42f6cc1dfc05e9a5d333514aa56ba658e96a860b753d9a120df79a41abbd0fcc04070e103908bf05648dcdff96eab343981fa0f5293aee4258309980
-DIST imagescan_3.62.0.orig.tar.gz 12650003 BLAKE2B 732283eb8370192fdd0fba8939bc81e277a7a227b024f14856b8d3d5c562b7320c7b40aa48cfa627e23dc654544c9bac27d35add5e10bf0ca65ab0279290b90c SHA512 3b6188013d162c605a3ce1bcac9e5a7b16b1af6363bc7ef4b257aed1c0d3e3dfd402a048ec699b6b6cc42883d0b26f50f0c6f1bd0ddc917baed4ce8902a9d8fa
+AUX iscan-3.63.0-autoconf-2.70.patch 1147 BLAKE2B d87e32fa8510096fe965ec24a21276e0c7ba0b838cb2eb5228bb0a336db037dd77240895d61eb574abbc03334d44b0c1467c4bf1dc48a69c72518cfd64d90a51 SHA512 6a58a0df2cd579ea85ea30c263d4538dae8abbfc65d3e102ac546e282bbc8ef72762894c926fc0500322b99364b815f29eb86a098989e4c67675d5d92efa304a
 DIST imagescan_3.63.0.orig.tar.gz 12776113 BLAKE2B d1a9f1d60ba4a2239c6ed74f7f9e0da078e2743e78e0abb67a69506bf90ac35b069f84b5a092a6eb8fd73f60eb668e78b4c7fae56b3a65b6b3d8600f082c064a SHA512 3c9b18e630d6fb1c042244542675e89a8b467469d7212ab684f72100810d1f7d0ec16d13c472a83ca05a3a4fc44e366f692a36cd6b0e81c9a332dd3b40de9535
 DIST iscan_2.30.4-2.tar.gz 1236167 BLAKE2B 598e55aa7099f7973b38f5c3227415c8ddfa7e8c645521981b4e8979047ab692427f5c1719fd83fe0635f2d4604f32f0baff8542f3e1a333298799c4cad7b980 SHA512 b12f374ff8ee1e1879fc6dbc579de39d7bcd4777ec7ad6e4345046f77b4ec13ae45ebdc2803d6907bc2747776aa7e32c313866138c7b8c7bcb53110a214154d2
 DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
 DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
-EBUILD iscan-2.30.4.2.ebuild 3958 BLAKE2B 3e1284c43d52dd91a6b9e88c2c8d5aef7ee76ed2c7b7a1e0d35781db6f5882efe1ea6c1b1152df86bf0b831941a271bf8c5a9c75fb2fe26646e99d2f73d17da8 SHA512 9b23f93cc94371c33036fec992c96baec8e94b743e732c8579755eec94cfc35ec79c95b879df664783818e03cff648c932e23217b856537a3875bab9c38a228a
-EBUILD iscan-3.62.0.ebuild 2332 BLAKE2B efe846efa66cc80dc3675dc4e1cff7c20eb7902a8523e251bff906c694c0585f34a8f0779235339bdb58442deb8c3e03ae0fef425ca7c6b90ca0d56113da6ca0 SHA512 53ae2081a1956a68deb8dfa3f7b4312ff6b2239300a5cecb3d9aaf8e170906097ca056bf8e7c3c4e5cf566bd0336500305f1dcb85cf429513ecb50cd45a80049
-EBUILD iscan-3.63.0.ebuild 2851 BLAKE2B c4214d99f21980e76534285aaefa4b4ba19f9e9dd6f2dbd4c1509cd48b80b081c1a23ec8cb6c32b3a3840ded05d46faf28e499ffc483b4798cdc26fc864974c2 SHA512 67645e77b4df636edcf60e68777f114165715238cfefd22285305d2fdb04565b42ed4cd3efff3ede9c6b2a8b6faac25c291e0e8a8f572e717124c920b3419efe
+EBUILD iscan-2.30.4.2-r1.ebuild 3960 BLAKE2B ae1797ba1ca4f7bb8c5b0c6397425965f651dfb63f45cd8c350e93c0a99c854ca12065fb8d5da10f9ea1ec5e9b52d362a4306de9b3d125558380752b95e939e2 SHA512 081a5d83837300553c17ac16b09e0c8f0ffd2d8686df67023f5bd77e6b095612428331f7354d151eaf90943708b5efb9e80d8914d1c95998a6edb5c609a42ab5
+EBUILD iscan-3.63.0.ebuild 2899 BLAKE2B fa560b7857120e9180165b2d72161cdd3705fa8002b93022ef675a2df1ed22852453a72199e67e2bbe3ec08402860700eff9c76f6d0bd406441dfd64a57ea150 SHA512 72991e80c75e6d86362adedf76c63827b0752da2815ccdbbe72ecd84c621a5f733f3a8491b07a0452ac09f236fd24c866f52a03d46dca5b72e200c29bfe3ed30
 MISC metadata.xml 930 BLAKE2B d2cf4fae5cdcb660357ffe5566ad8d99eef6287f565a45f1824c810b3979e9d2930f458766ff524b231ef8dfd793062ff23cf4bfc2a78a36c5393a6c4224feea SHA512 d609a5cd8f8bbc7653e784d153757849eafb9c772355d0928325a6ecf673e8aa055623601d957f912709f9f16acfde5ca0b0480a1f2a17bfc24825895d861fc0
diff --git a/media-gfx/iscan/files/iscan-3.63.0-autoconf-2.70.patch b/media-gfx/iscan/files/iscan-3.63.0-autoconf-2.70.patch
new file mode 100644
index 000000000000..bda932904ac5
--- /dev/null
+++ b/media-gfx/iscan/files/iscan-3.63.0-autoconf-2.70.patch
@@ -0,0 +1,34 @@
+--- a/configure.ac	2020-10-19 22:50:43.160537331 +0200
++++ b/configure.ac	2020-10-19 22:56:41.724847150 +0200
+@@ -352,7 +352,7 @@
+ AM_CONDITIONAL([have_libusb], [test x != "x$LIBUSB_LIBS"])
+ 
+ AS_IF([test xno != "x$with_magick_pp"],
+-   AS_CASE("x$with_magick_pp",
++   [AS_CASE("x$with_magick_pp",
+      [xGraphicsMagick],
+        [PKG_CHECK_MODULES([LIBMAGICK_PP], [GraphicsMagick++],
+           [AC_DEFINE([HAVE_GRAPHICS_MAGICK_PP], [1])])
+@@ -373,11 +373,11 @@
+        ],
+      [dnl default case
+       AC_MSG_ERROR([unknown value: --with-magick-pp=$with_magick_pp])
+-     ]))
++     ])])
+ AM_CONDITIONAL([have_libmagick_pp], [test x != "x$LIBMAGICK_PP_LIBS"])
+ 
+ AS_IF([test xno != "x$with_magick"],
+-   AS_CASE("x$with_magick",
++   [AS_CASE("x$with_magick",
+      [xGraphicsMagick],
+        [AC_CHECK_PROGS([MAGICK_CONVERT], [gm])
+         AS_IF([test xgm != x$MAGICK_CONVERT],
+@@ -408,7 +408,7 @@
+        ],
+      [dnl default case
+       AC_MSG_ERROR([unknown value: --with-magick=$with_magick])
+-     ]))
++     ])])
+ AC_DEFINE_UNQUOTED([MAGICK_CONVERT], ["$MAGICK_CONVERT"])
+ AM_CONDITIONAL([have_magick], [test x != "x$MAGICK_CONVERT"])
+ 
diff --git a/media-gfx/iscan/iscan-2.30.4.2.ebuild b/media-gfx/iscan/iscan-2.30.4.2-r1.ebuild
index b4014ba2ccb7..333d41b9b1c7 100644
--- a/media-gfx/iscan/iscan-2.30.4.2.ebuild
+++ b/media-gfx/iscan/iscan-2.30.4.2-r1.ebuild
@@ -39,7 +39,7 @@ DEPEND="
 	media-gfx/sane-backends
 	virtual/libusb:1
 	virtual/udev
-	gimp? ( media-gfx/gimp:2 )
+	gimp? ( media-gfx/gimp:0/2 )
 	X? (
 		dev-libs/glib:2
 		media-libs/libpng:=
diff --git a/media-gfx/iscan/iscan-3.62.0.ebuild b/media-gfx/iscan/iscan-3.62.0.ebuild
deleted file mode 100644
index 92b606786000..000000000000
--- a/media-gfx/iscan/iscan-3.62.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop flag-o-matic udev xdg-utils
-
-DESCRIPTION="EPSON Image Scan v3 for Linux"
-HOMEPAGE="https://support.epson.net/linux/en/imagescanv3.php https://gitlab.com/utsushi/utsushi"
-SRC_URI="https://support.epson.net/linux/src/scanner/imagescanv3/common/imagescan_${PV}.orig.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="graphicsmagick gui"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	dev-libs/boost:=
-	media-gfx/sane-backends
-	media-libs/tiff
-	virtual/jpeg
-	virtual/libusb:1
-	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-	gui? ( dev-cpp/gtkmm:2.4 )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/utsushi-0.$(ver_cut 2-3)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.61.0-ijg-libjpeg.patch
-	"${FILESDIR}"/${PN}-3.61.0-imagemagick-7.patch
-	"${FILESDIR}"/${PN}-3.62.0-gcc-10.patch
-	"${FILESDIR}"/${PN}-3.62.0-boost-1.73.patch
-)
-
-src_prepare() {
-	default
-
-	# Remove vendored libraries
-	rm -r upstream/boost || die
-	# Workaround for deprecation warnings:
-	# https://gitlab.com/utsushi/utsushi/issues/90
-	sed -e 's|=-Werror|="-Werror -Wno-error=deprecated-declarations"|g' -i configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	# Workaround for:
-	# /usr/lib64/utsushi/libutsushi.so.0: undefined symbol: libcnx_usb_LTX_factory
-	append-ldflags $(no-as-needed)
-	# https://bugs.gentoo.org/720994
-	append-ldflags -pthread
-	local myconf=(
-		$(use_with gui gtkmm)
-		--enable-sane-config
-		--enable-udev-config
-		--with-boost=yes
-		--with-jpeg
-		--with-magick=$(usex graphicsmagick GraphicsMagick ImageMagick)
-		--with-magick-pp=$(usex graphicsmagick GraphicsMagick ImageMagick)
-		--with-sane
-		--with-tiff
-		--with-udev-confdir="$(get_udevdir)"
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	dodoc lib/devices.conf
-	find "${ED}" -name '*.la' -delete || die
-	if use gui; then
-		newicon -s scalable doc/icon.svg "${PN}".svg
-		make_desktop_entry utsushi "Image Scan"
-	fi
-}
-
-pkg_postinst() {
-	use gui && xdg_icon_cache_update
-	elog "If you encounter problems with media-gfx/xsane when scanning (e.g., bad resolution),"
-	elog "please try the built-in GUI and kde-misc/skanlite first before reporting bugs."
-}
-
-pkg_postrm() {
-	use gui && xdg_icon_cache_update
-}
diff --git a/media-gfx/iscan/iscan-3.63.0.ebuild b/media-gfx/iscan/iscan-3.63.0.ebuild
index 3d5f0e15b002..aa9f572ec9db 100644
--- a/media-gfx/iscan/iscan-3.63.0.ebuild
+++ b/media-gfx/iscan/iscan-3.63.0.ebuild
@@ -45,6 +45,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.62.0-tests-boost.patch
 	"${FILESDIR}"/${PN}-3.62.0-tests-tesseract.patch
 	"${FILESDIR}"/${PN}-3.62.0-tests-linkage.patch
+	"${FILESDIR}"/${PN}-3.63.0-autoconf-2.70.patch
 )
 
 src_prepare() {
diff --git a/media-gfx/kgraphviewer/Manifest b/media-gfx/kgraphviewer/Manifest
index c0a6ce7e4f65..7416f83cbb3e 100644
--- a/media-gfx/kgraphviewer/Manifest
+++ b/media-gfx/kgraphviewer/Manifest
@@ -1,4 +1,4 @@
 AUX kgraphviewer-2.4.3-set-startupwmclass.patch 1045 BLAKE2B 8e48bc5a67cf8857a5eb5a57873fbe19a5a3cc52ef70d5c01ca3674d889acfa28dc46456caccd3a6078572b876e9f73b15e483f46fe35f82bd6fcdbed5d2312c SHA512 b4005bf61e448be43f7bcc3886ec092c9f2930e475067f4c1a382db4039dfdb580ce7e2a4765480438f80dc2e905013c43c8b65711f87fb14e62de73c60bedcd
 DIST kgraphviewer-2.4.3.tar.xz 1491328 BLAKE2B b51cf825ad4763538139f917a7d16d15a7244c19b3cab9c79bbd938ee3dd80e4e35e37012199e1256bcc9a9404d756cdb0f5ffb975484d527577c208ecf1d3fa SHA512 d18146ba380efe73e1ec716dd1cc310fe1eac23eccb10e2a699b107451637b9332cc25d62a4de762df4706cea182c9474ba1e885801c9832e1bb9bff1648e72d
-EBUILD kgraphviewer-2.4.3-r1.ebuild 1151 BLAKE2B 7db4acb9f4f074fb9cec921dc3938c98adc31770e4b0277e91ac09f930a8a79ec2ec08cc019952be3ee6a77b6c384a872e77649ce9122b4115d1db5c316414ca SHA512 77e19f012fd9a30c483ab0cf81486db3e2a39722b8199f2db9e74082f54d5305df353cb7fb62b6ee9452eb746c93f9af081ec655881128e86f748a6a5c8f07fd
+EBUILD kgraphviewer-2.4.3-r1.ebuild 1134 BLAKE2B 98138f2be42b6e006d96576dac964717aafbcae7eaf222cde033791b6cfac6131ead11ecc81d68675e154448e9064b1b2fa19d714cabccb41daa27ca92544ccf SHA512 9da0a9b995323a44bc274838b33a16eaafd4584a4f54249ccaed1b638c762599dfb915a50a3207a5abf970a49b26b5d6af3cb40978f4266f488482bcdabfbabc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r1.ebuild b/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r1.ebuild
index 13620f941253..036079737c78 100644
--- a/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r1.ebuild
+++ b/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r1.ebuild
@@ -9,12 +9,12 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="Graphviz dot graph file viewer"
-HOMEPAGE="https://kde.org/applications/graphics/org.kde.kgraphviewer"
+HOMEPAGE="https://apps.kde.org/en/kgraphviewer"
 [[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 8f672481b618..33b9e0c93785 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,8 +1,8 @@
-AUX krita-4.2.4-tests-optional.patch 12292 BLAKE2B a30463dcc6e02e877b308c4add529f0657d96ace7a13ba7424f4cdf260f3b636d03b2bac224d6239253393650163b622ac54d8d81bbdced2fb153bf216b5fb2d SHA512 1d5045b35981822bc16c4b23e573a299a8325353c8be347c56a4e2fc4e3cd9e937e8eb253f9c6cdc0197a3db7989b822fb41274afe3cd506b9c907daf1867df3
 AUX krita-4.3.0-tests-optional.patch 16252 BLAKE2B 17c329e534f0591a63429416d6a9718948e4052160e318ff7f79ea1b7ff2e4e0135c0bbc2b3eff8aa843895c0e1ddb84722c0dff8c3e3eddc942f2a809129634 SHA512 e38428b2ac55516312cb6d01b1b17cc255d21fe7a57d5f36ca4eebf8023624af91b31c25a19f04d829f2dfee5896b5bb5275ecbf5ae61423951024501f690927
+AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc34064c659a3cf48d12a539c3029dd70f17b0b48a7398b68de6a937adff3af0c2d4a47d0f84fdc7746ec612fb05272d963f SHA512 f16885a72cd5f8f250b03903062c70190367ed409c2582d579bfb1e6ab09514df7f96214ce236e33bb8eec2f3872d887f9c3152f4e524b1719250a9064bf719c
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
-DIST krita-4.2.9.tar.xz 170082028 BLAKE2B dafe300a1ef56a743272ce5936a0640949b7cfd37322e30e8a7ef17c4e51bf9dc8175d1443f9943836a229933ecb9a5d28249b8c90155165f3f0ee800e3cfa66 SHA512 66eef3d1b5647e62551276662ef4332f15abc022f1032f27a2ad695a8d2dc5fa758146492a9da2b8cbd4a52e47c576473029d2aa9728dea3bec869b8173f08c0
 DIST krita-4.3.0.tar.xz 166246720 BLAKE2B 74a6e02968a2abdeb59ca2702f0a4a7be23473657667b14592ad08b81d25d9e4815fb5d206a23f33a82268974e9369450525c53b43fef46831ad4c501c34546c SHA512 5633a6ccacc140b119082f14fe792b1219b8065304fccc55a84a2373a46cb036ad40f718beb8719e1f664e35d679b18e86f5f3db8685166a187d8cf3a77722f4
-EBUILD krita-4.2.9.ebuild 3244 BLAKE2B 258e95d2a887e08bf8f57a35fd2a862a409d298f7638ba8c8f3a514ea4620a33ed17f3f390de944d286c2af96333e7ded6a061ce0488ee6fe2a6a8201bbf391f SHA512 3c01812b04489bbd292db164ff55244d237a54e707f43c756d4b2811beded4cb69aee065baa80bf20c67d319d97cdecf3d6a5f50fb761f377fe5cb38c583c034
-EBUILD krita-4.3.0.ebuild 3375 BLAKE2B a31a068f53e926e2763cb59d53f7a3a73dd6778fd8c66943c857657b8fac05eb2157e04cb835fd226ed939e6793554883e48cc9b6db7505d3570cecbf542d221 SHA512 352fbd63af6e738fad0654a886181bd22525c4d5c9e34681cce52476aef7b5c62eb88f12dba85c20ddcc24f6d08478f5102c62e7614e5de15a7a17a9841ffbdd
+DIST krita-4.4.1.tar.xz 169788052 BLAKE2B fe0cbba0e63a3873578c54055b0a11941518a52a9fab17e54f13d26325717a5d6e7f0d6c79d29df2bcc91c39174bc992d2e1e14e1012a5fdd8c447f224e3a190 SHA512 8832202384bae5c73715087b1b3230e459eb780cfa71b7c7bfb92ba4498b8b78575a7b3437aa4b88f396cec47080ccaaaadbc1b1f8bcbcdeb607909fee710afe
+EBUILD krita-4.3.0.ebuild 3352 BLAKE2B f208f12608511dcb60794fecc77c53612271aa4c41270c08f676846ba8c26b682656b584272641ea8a6e99be894fd17ea853dd14332ee492b0a1f80d19dc5ff0 SHA512 9af651db98a10f23c45b58b4f444eb65a3b3d5a895df9a4b6657a2fa1d122e4f5569dcb8bc2154295325d1341c4b1ab308e827862be59d1834e94a7e25dcc3bc
+EBUILD krita-4.4.1.ebuild 3379 BLAKE2B ecb1eaa51f8745e6e18c54154c432e37e5dc9e78a226d91dd906b3118784e068f19272a347eab1906448ba0d9fe8c6101c19cca1d15f3056eed8a9db6060a9f9 SHA512 e3c9ce1a6cbe4bb119f8914c2e24376446ba980a5c4952325204f98e76651fc9be6f00d7b41504b40ba3f74e8f72a964961e1ccd1f1a7305d96716513cee4c8b
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/files/krita-4.2.4-tests-optional.patch b/media-gfx/krita/files/krita-4.2.4-tests-optional.patch
deleted file mode 100644
index 2f13c999b67e..000000000000
--- a/media-gfx/krita/files/krita-4.2.4-tests-optional.patch
+++ /dev/null
@@ -1,399 +0,0 @@
---- a/plugins/filters/CMakeLists.txt	2019-07-31 11:22:19.572862843 +0200
-+++ b/plugins/filters/CMakeLists.txt	2019-07-31 11:22:19.576862870 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- add_subdirectory( blur )
- add_subdirectory( colors )
- add_subdirectory( colorsfilters )
---- a/plugins/filters/unsharp/CMakeLists.txt	2019-07-31 11:22:19.582862912 +0200
-+++ b/plugins/filters/unsharp/CMakeLists.txt	2019-07-31 11:22:19.587862947 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- set(kritaunsharpfilter_SOURCES
-     unsharp.cpp
---- a/plugins/paintops/defaultpaintops/CMakeLists.txt	2019-07-31 11:22:19.592862983 +0200
-+++ b/plugins/paintops/defaultpaintops/CMakeLists.txt	2019-07-31 11:22:19.595863003 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(brush/tests)
-+endif()
- 
- include_directories(brush
-                     duplicate
---- a/plugins/paintops/libpaintop/CMakeLists.txt	2019-07-31 11:22:19.600863038 +0200
-+++ b/plugins/paintops/libpaintop/CMakeLists.txt	2019-07-31 11:22:19.603863060 +0200
-@@ -104,4 +104,6 @@
- install(TARGETS kritalibpaintop  ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/plugins/dockers/lut/CMakeLists.txt	2019-07-31 11:22:19.608863094 +0200
-+++ b/plugins/dockers/lut/CMakeLists.txt	2019-07-31 11:22:19.613863129 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories(SYSTEM
-     ${OCIO_INCLUDE_DIR}
---- a/plugins/dockers/animation/CMakeLists.txt	2019-07-31 11:22:19.619863171 +0200
-+++ b/plugins/dockers/animation/CMakeLists.txt	2019-07-31 11:22:19.624863206 +0200
-@@ -1,5 +1,7 @@
- if (NOT WIN32 AND NOT APPLE)
--    add_subdirectory(tests)
-+    if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif()
- 
- set(KRITA_ANIMATIONDOCKER_SOURCES
---- a/plugins/extensions/qmic/CMakeLists.txt	2019-07-31 11:22:19.630863248 +0200
-+++ b/plugins/extensions/qmic/CMakeLists.txt	2019-07-31 11:22:19.635863283 +0200
-@@ -20,4 +20,6 @@
- target_link_libraries(kritaqmic kritaui)
- install(TARGETS kritaqmic  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/plugins/tools/basictools/CMakeLists.txt	2019-07-31 11:22:19.641863325 +0200
-+++ b/plugins/tools/basictools/CMakeLists.txt	2019-07-31 11:22:19.645863353 +0200
-@@ -1,5 +1,7 @@
- if (NOT APPLE)
--    add_subdirectory(tests)
-+    if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif ()
- 
- set(kritadefaulttools_SOURCES
---- a/plugins/tools/tool_transform2/CMakeLists.txt	2019-07-31 11:22:19.650863388 +0200
-+++ b/plugins/tools/tool_transform2/CMakeLists.txt	2019-07-31 11:22:19.653863409 +0200
-@@ -1,5 +1,7 @@
- if (NOT WIN32 AND NOT APPLE)
--    add_subdirectory(tests)
-+    if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif()
- 
- set(kritatooltransform_SOURCES
---- a/plugins/impex/svg/CMakeLists.txt	2019-07-31 11:22:19.658863444 +0200
-+++ b/plugins/impex/svg/CMakeLists.txt	2019-07-31 11:22:19.662863472 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritasvgimport_SOURCES
-     kis_svg_import.cc
---- a/plugins/impex/brush/CMakeLists.txt	2019-07-31 11:22:19.668863514 +0200
-+++ b/plugins/impex/brush/CMakeLists.txt	2019-07-31 11:22:19.672863542 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritabrushexport_PART_SRCS
-     kis_brush_export.cpp
---- a/plugins/impex/psd/CMakeLists.txt	2019-07-31 11:22:19.678863584 +0200
-+++ b/plugins/impex/psd/CMakeLists.txt	2019-07-31 11:22:19.684863626 +0200
-@@ -1,5 +1,7 @@
- if (NOT MSVC AND NOT APPLE)
--    add_subdirectory(tests)
-+    if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif()
- 
- configure_file(config_psd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_psd.h)
---- a/plugins/impex/tga/CMakeLists.txt	2019-07-31 11:22:19.690863668 +0200
-+++ b/plugins/impex/tga/CMakeLists.txt	2019-07-31 11:22:19.695863703 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritatgaexport_SOURCES
-     kis_tga_export.cpp
---- a/plugins/impex/libkra/CMakeLists.txt	2019-07-31 11:22:19.700863738 +0200
-+++ b/plugins/impex/libkra/CMakeLists.txt	2019-07-31 11:22:19.704863766 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritalibkra_LIB_SRCS
-     kis_colorize_dom_utils.cpp
---- a/plugins/impex/jpeg/CMakeLists.txt	2019-07-31 11:22:19.709863801 +0200
-+++ b/plugins/impex/jpeg/CMakeLists.txt	2019-07-31 11:22:19.713863829 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms")
- 
---- a/plugins/impex/gif/CMakeLists.txt	2019-07-31 11:22:19.720863878 +0200
-+++ b/plugins/impex/gif/CMakeLists.txt	2019-07-31 11:22:19.726863920 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritagifexport_SOURCES
-     kis_gif_export.cpp
---- a/plugins/impex/exr/CMakeLists.txt	2019-07-31 11:22:19.732863962 +0200
-+++ b/plugins/impex/exr/CMakeLists.txt	2019-07-31 11:22:19.736863990 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} )
- 
---- a/plugins/impex/xcf/CMakeLists.txt	2019-07-31 11:22:19.740864018 +0200
-+++ b/plugins/impex/xcf/CMakeLists.txt	2019-07-31 11:22:19.744864046 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(XCFTOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/xcftools")
- 
---- a/plugins/impex/tiff/CMakeLists.txt	2019-07-31 11:22:19.750864088 +0200
-+++ b/plugins/impex/tiff/CMakeLists.txt	2019-07-31 11:22:19.755864123 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(libkritatiffconverter_LIB_SRCS
-     kis_tiff_converter.cc
---- a/plugins/impex/ora/CMakeLists.txt	2019-07-31 11:22:19.762864172 +0200
-+++ b/plugins/impex/ora/CMakeLists.txt	2019-07-31 11:22:19.767864207 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(libkritaconverter_LIB_SRCS
-     ora_converter.cpp
---- a/plugins/impex/heif/CMakeLists.txt	2019-07-31 11:22:19.774864256 +0200
-+++ b/plugins/impex/heif/CMakeLists.txt	2019-07-31 11:22:19.778864284 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HEIF_CFLAGS}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${HEIF_CFLAGS}")
---- a/plugins/impex/pdf/CMakeLists.txt	2019-07-31 11:22:19.783864319 +0200
-+++ b/plugins/impex/pdf/CMakeLists.txt	2019-07-31 11:22:19.788864354 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritapdfimport_SOURCES kis_pdf_import.cpp kis_pdf_import_widget.cpp )
- 
---- a/plugins/impex/csv/CMakeLists.txt	2019-07-31 11:22:19.796864410 +0200
-+++ b/plugins/impex/csv/CMakeLists.txt	2019-07-31 11:22:19.803864459 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- # import
- 
---- a/plugins/impex/heightmap/CMakeLists.txt	2019-07-31 11:22:19.810864508 +0200
-+++ b/plugins/impex/heightmap/CMakeLists.txt	2019-07-31 11:22:19.819864571 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
- 
---- a/plugins/impex/raw/CMakeLists.txt	2019-07-31 11:22:19.826864620 +0200
-+++ b/plugins/impex/raw/CMakeLists.txt	2019-07-31 11:22:19.830864648 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- if(OPENEXR_FOUND)
- 	include_directories(${OPENEXR_INCLUDE_DIR})
---- a/plugins/impex/qimageio/CMakeLists.txt	2019-07-31 11:22:19.837864697 +0200
-+++ b/plugins/impex/qimageio/CMakeLists.txt	2019-07-31 11:22:19.844864746 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritaqimageioexport_SOURCES
-     kis_qimageio_export.cpp
---- a/plugins/impex/qml/CMakeLists.txt	2019-07-31 11:22:19.851864795 +0200
-+++ b/plugins/impex/qml/CMakeLists.txt	2019-07-31 11:22:19.856864830 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritaqmlexport_SOURCES
-     qml_converter.cc
---- a/plugins/impex/png/CMakeLists.txt	2019-07-31 11:22:19.862864872 +0200
-+++ b/plugins/impex/png/CMakeLists.txt	2019-07-31 11:22:19.867864907 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritapngimport_SOURCES
-     kis_png_import.cc
---- a/plugins/color/lcms2engine/CMakeLists.txt	2019-07-31 11:22:19.872864942 +0200
-+++ b/plugins/color/lcms2engine/CMakeLists.txt	2019-07-31 11:22:19.876864969 +0200
-@@ -1,6 +1,8 @@
- project( lcmsengine )
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories(SYSTEM
-     ${LCMS2_INCLUDE_DIR}
---- a/libs/brush/CMakeLists.txt	2019-07-31 11:22:19.881865005 +0200
-+++ b/libs/brush/CMakeLists.txt	2019-07-31 11:22:19.885865033 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- include_directories(SYSTEM
-     ${EIGEN3_INCLUDE_DIR}
---- a/libs/global/CMakeLists.txt	2019-07-31 11:22:19.890865068 +0200
-+++ b/libs/global/CMakeLists.txt	2019-07-31 11:22:19.896865110 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- include(CheckFunctionExists)
- check_function_exists(backtrace HAVE_BACKTRACE)
---- a/libs/image/CMakeLists.txt	2019-07-31 11:22:19.902865151 +0200
-+++ b/libs/image/CMakeLists.txt	2019-07-31 11:22:19.908865194 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- add_subdirectory( tiles3 )
- 
---- a/libs/image/tiles3/CMakeLists.txt	2019-07-31 11:22:19.913865228 +0200
-+++ b/libs/image/tiles3/CMakeLists.txt	2019-07-31 11:22:19.917865256 +0200
-@@ -1 +1,3 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/libs/odf/CMakeLists.txt	2019-07-31 11:22:19.922865291 +0200
-+++ b/libs/odf/CMakeLists.txt	2019-07-31 11:22:19.926865319 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- set(kritaodf_LIB_SRCS
-     KoOdf.cpp
---- a/libs/metadata/CMakeLists.txt	2019-07-31 11:22:19.930865347 +0200
-+++ b/libs/metadata/CMakeLists.txt	2019-07-31 11:22:19.934865376 +0200
-@@ -29,4 +29,6 @@
- 
- install(TARGETS kritametadata  ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/libs/store/CMakeLists.txt	2019-07-31 11:22:19.940865418 +0200
-+++ b/libs/store/CMakeLists.txt	2019-07-31 11:22:19.944865445 +0200
-@@ -1,6 +1,8 @@
- include_directories(${QUAZIP_INCLUDE_DIRS})
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritastore_LIB_SRCS
-     KoDirectoryStore.cpp
---- a/libs/libkis/CMakeLists.txt	2019-07-31 11:22:19.951865495 +0200
-+++ b/libs/libkis/CMakeLists.txt	2019-07-31 11:22:19.958865544 +0200
-@@ -47,4 +47,6 @@
- install(TARGETS kritalibkis  ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/libs/widgetutils/CMakeLists.txt	2019-07-31 11:22:19.968865614 +0200
-+++ b/libs/widgetutils/CMakeLists.txt	2019-07-31 11:22:19.981865705 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- configure_file(xmlgui/config-xmlgui.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xmlgui.h )
- 
---- a/libs/widgets/CMakeLists.txt	2019-07-31 11:22:19.992865782 +0200
-+++ b/libs/widgets/CMakeLists.txt	2019-07-31 11:22:20.000865837 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
- 
---- a/libs/flake/CMakeLists.txt	2019-07-31 11:22:20.010865908 +0200
-+++ b/libs/flake/CMakeLists.txt	2019-07-31 11:22:20.017865956 +0200
-@@ -9,8 +9,12 @@
- )
- 
- add_subdirectory(styles)
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-+if(BUILD_TESTING)
- add_subdirectory(resources/tests)
-+endif()
- 
- set(kritaflake_SRCS
-     KoGradientHelper.cpp
---- a/libs/ui/CMakeLists.txt	2019-07-31 11:22:20.029866040 +0200
-+++ b/libs/ui/CMakeLists.txt	2019-07-31 11:22:20.039866111 +0200
-@@ -7,7 +7,9 @@
-     ${OCIO_INCLUDE_DIR}
- )
- 
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- if (APPLE)
-     find_library(FOUNDATION_LIBRARY Foundation)
---- a/libs/pigment/CMakeLists.txt	2019-07-31 11:22:20.050866188 +0200
-+++ b/libs/pigment/CMakeLists.txt	2019-07-31 11:22:20.057866236 +0200
-@@ -31,7 +31,9 @@
-     message("${__per_arch_factory_objs}")
- endif()
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- add_subdirectory(benchmarks)
- 
- set(kritapigment_SRCS
diff --git a/media-gfx/krita/files/krita-4.3.1-tests-optional.patch b/media-gfx/krita/files/krita-4.3.1-tests-optional.patch
new file mode 100644
index 000000000000..37f2ac50ffda
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.3.1-tests-optional.patch
@@ -0,0 +1,80 @@
+From 2e9369281d44a2701ac7364568d381cca0d92ec5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 12 Jul 2020 18:55:31 +0200
+Subject: [PATCH] KritaAddBrokenUnitTest.cmake, MacroKritaAddBenchmark.cmake:
+ Skip ecm_add_test early if Qt5::Test is not available
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ cmake/modules/KritaAddBrokenUnitTest.cmake | 4 ++++
+ cmake/modules/MacroKritaAddBenchmark.cmake | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/cmake/modules/KritaAddBrokenUnitTest.cmake b/cmake/modules/KritaAddBrokenUnitTest.cmake
+index b7d0e8d852..901a0a1f99 100644
+--- a/cmake/modules/KritaAddBrokenUnitTest.cmake
++++ b/cmake/modules/KritaAddBrokenUnitTest.cmake
+@@ -23,6 +23,10 @@ function(KRITA_ADD_BROKEN_UNIT_TEST)
+     message(FATAL_ERROR "ecm_add_test() called with multiple source files but without setting \"TEST_NAME\"")
+   endif()
+ 
++  if(NOT TARGET Qt5::Test)
++    return()
++  endif()
++
+   set(_testname ${ARG_NAME_PREFIX}${_targetname})
+ 
+   # add test to the global list of disabled tests
+diff --git a/cmake/modules/MacroKritaAddBenchmark.cmake b/cmake/modules/MacroKritaAddBenchmark.cmake
+index c748d8e319..f804d9b8f4 100644
+--- a/cmake/modules/MacroKritaAddBenchmark.cmake
++++ b/cmake/modules/MacroKritaAddBenchmark.cmake
+@@ -23,6 +23,10 @@ macro (KRITA_ADD_BENCHMARK _test_NAME)
+         set(_nogui "NOGUI")
+     endif()
+ 
++    if(NOT TARGET Qt5::Test)
++        return()
++    endif()
++
+     add_executable( ${_test_NAME} ${_srcList} )
+     ecm_mark_as_test(${_test_NAME})
+ 
+-- 
+2.27.0
+
+From 3c9fe10e25e94bdb1eb5e7b07ac2696635fdc5a3 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 17 Jun 2020 20:18:28 +0200
+Subject: [PATCH] Don't build tests when testing not requested
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+
+diff --git a/libs/flake/CMakeLists.txt b/libs/flake/CMakeLists.txt
+index cbdac265d2..1a50c1620a 100644
+--- a/libs/flake/CMakeLists.txt
++++ b/libs/flake/CMakeLists.txt
+@@ -9,8 +9,10 @@ include_directories(
+ )
+ 
+ add_subdirectory(styles)
+-add_subdirectory(tests)
+-add_subdirectory(resources/tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++    add_subdirectory(resources/tests)
++endif()
+ 
+ set(kritaflake_SRCS
+     KoGradientHelper.cpp
+diff --git a/libs/image/tiles3/CMakeLists.txt b/libs/image/tiles3/CMakeLists.txt
+index 88c0516360..01f2383ddb 100644
+--- a/libs/image/tiles3/CMakeLists.txt
++++ b/libs/image/tiles3/CMakeLists.txt
+@@ -1 +1,3 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+-- 
+2.27.0
diff --git a/media-gfx/krita/krita-4.3.0.ebuild b/media-gfx/krita/krita-4.3.0.ebuild
index 55f079f74824..745d2ca7bf00 100644
--- a/media-gfx/krita/krita-4.3.0.ebuild
+++ b/media-gfx/krita/krita-4.3.0.ebuild
@@ -13,11 +13,11 @@ inherit ecm kde.org python-single-r1
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
 		https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://kde.org/applications/graphics/org.kde.krita https://krita.org/en/"
+HOMEPAGE="https://apps.kde.org/en/krita https://krita.org/en/"
 
 LICENSE="GPL-3"
 SLOT="5"
diff --git a/media-gfx/krita/krita-4.2.9.ebuild b/media-gfx/krita/krita-4.4.1.ebuild
index 150df39c7060..1b8485696af3 100644
--- a/media-gfx/krita/krita-4.2.9.ebuild
+++ b/media-gfx/krita/krita-4.4.1.ebuild
@@ -4,20 +4,20 @@
 EAPI=7
 
 ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-KFMIN=5.60.0
-QTMIN=5.12.3
+PYTHON_COMPAT=( python3_{7,8,9} )
+KFMIN=5.74.0
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-3)/${P}.tar.xz
-		https://dev.gentoo.org/~asturm/distfiles/${P}-patchset.tar.xz"
-	KEYWORDS="amd64 ~ppc64 ~x86"
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
+		https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://kde.org/applications/graphics/org.kde.krita https://krita.org/en/"
+HOMEPAGE="https://apps.kde.org/en/krita https://krita.org/en/"
 
 LICENSE="GPL-3"
 SLOT="5"
@@ -46,7 +46,6 @@ RDEPEND="${PYTHON_DEPS}
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtx11extras-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
@@ -89,8 +88,8 @@ DEPEND="${RDEPEND}
 RESTRICT+=" test"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.2.4-tests-optional.patch
-	"${WORKDIR}"/${P}-patchset
+	"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
+	"${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
 )
 
 pkg_setup() {
@@ -98,12 +97,18 @@ pkg_setup() {
 	ecm_pkg_setup
 }
 
+src_prepare() {
+	ecm_src_prepare
+	sed -e "/CMAKE_CXX_STANDARD/s/11/14/" -i CMakeLists.txt || die
+}
+
 src_configure() {
 	# Prevent sandbox violation from FindPyQt5.py module
 	# See Gentoo-bug 655918
 	addpredict /dev/dri
 
 	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_SeExpr2=ON # not packaged
 		$(cmake_use_find_package color-management OCIO)
 		$(cmake_use_find_package fftw FFTW3)
 		$(cmake_use_find_package gif GIF)
diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest
index bbd0b165e5d5..9de4f1609f60 100644
--- a/media-gfx/kxstitch/Manifest
+++ b/media-gfx/kxstitch/Manifest
@@ -1,3 +1,3 @@
 DIST kxstitch-2.2.0.tar.xz 1784360 BLAKE2B 6d06090bb33ccd4db7e8b8a3521b0e1377f253b472cc500862b1b8b0da1abf0d759a85a870b50a1a1f55f385274cdc94761e612a838d93aaffb76191df725150 SHA512 bf09130a35bc605db2bbd6e5e129ac494e8f02b920d4a8d6705b5030a9339306b3b302bd988839e1684da3e5e15e91d655dadf916eb4bf2dc9c1322fd435281d
-EBUILD kxstitch-2.2.0.ebuild 1090 BLAKE2B 222a7f15b9f6aff316dfc2a829545cf405930e4bc6c829c00ad0ad774e57e1f5c8814c794617e03661db40952dbc601207a10ec23a3cc228c3a82c76285b902d SHA512 c82935d996386b126694d5b5a4f6539a36620b91c7db39adc90a5fd3c503e87ca548f389020488b37f8ede87b879ce17d411e327a149a3a53167c4ac2c419969
+EBUILD kxstitch-2.2.0.ebuild 1068 BLAKE2B 6a1150e38075510bb315d9b81d1b363bf97b55d23e991a31cc97887140286db9b1103e8420691d8b8d5e5b6f4fe93c10237673c5c4c1ea3c6ec918687a23a90d SHA512 a10a1cb13711fb96f082eb202d62f9c3ae38b5766caccad9aadf759428540910bb9c7a764c3b2b418c4431622f41331e2fbcf1f98955178346065bd8d5d7109d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-gfx/kxstitch/kxstitch-2.2.0.ebuild b/media-gfx/kxstitch/kxstitch-2.2.0.ebuild
index 3d7812d60aa4..7fa99b755bd0 100644
--- a/media-gfx/kxstitch/kxstitch-2.2.0.ebuild
+++ b/media-gfx/kxstitch/kxstitch-2.2.0.ebuild
@@ -9,8 +9,7 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="Program to create cross stitch patterns"
-HOMEPAGE="https://kde.org/applications/graphics/org.kde.kxstitch
-https://userbase.kde.org/KXStitch"
+HOMEPAGE="https://apps.kde.org/en/kxstitch https://userbase.kde.org/KXStitch"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
index 0e360bf90513..e031a5c1a8d4 100644
--- a/media-gfx/luminance-hdr/Manifest
+++ b/media-gfx/luminance-hdr/Manifest
@@ -3,5 +3,5 @@ AUX luminance-hdr-2.6.0-cmake.patch 855 BLAKE2B 2656ec16d554199a8cb0dca0df77ab71
 AUX luminance-hdr-2.6.0-docs.patch 948 BLAKE2B 5ac822b10ffc61c552292806adc3f5470a7f03a9b2df7ba385435904963e52af583a892762867abb6a76a5351ffbbf0ffbd67107310e84bab9b649cc33666e09 SHA512 2b242a558c3b734a653943f3128c4cbc2440f940407faa096505ac7abe945c729bd0b4c5e9d06f53141bdb1271b097d7de15e87cd31db75ef1e30839a64f32b0
 AUX luminance-hdr-2.6.0-no-git.patch 377 BLAKE2B 454a9973831aa3ba312926190a84622c8c3bd9481c67ece8ccf8916517f6b314931a09adf8a4168d8a1c7cd8a7694db27291009b9fae8a9cacc8356d32c7f5c3 SHA512 fba84a0415c8e514fb85b229adb29fbda238e8146d2dfff296d92fde33aeb22562e5ac98fed2422326354be9c0096cc2bd1b8947edfa9e7ca160d207ba0db476
 DIST luminance-hdr-2.6.0.tar.bz2 11556372 BLAKE2B 0026768202d35126b82101eb2dc7cdc2917728b519c1cadc62ffb6470204077b4b6ae220ebf09c7f903839fe0c714715efe796ee4830cc92174370cd2741d576 SHA512 6cfb21b1ddc9cac612e3d176323e34c5181333f1b52953c02ad5aec28cc86bf519ecede248847082085879c5c2fd2c5570b05f5d3bffa96ba3781ff8cd1967d1
-EBUILD luminance-hdr-2.6.0.ebuild 1843 BLAKE2B 8bcee6c893debc0e00445e4d2f0f680b87749beda8170543efc48499bc10d234d9b703fa50e0d9de0eb086bfd5d25cfd8d71e85b4dd138543eee2f8eaad4c440 SHA512 e6e72e6ccdf35c57c70350dab1bcad86bdaeea7e1df59bcd0d9596ea4d904654b1eab48b6fda0dd4a13fb3d971a8dc16bd4b932ec64aa90b3725c75836f82702
+EBUILD luminance-hdr-2.6.0-r1.ebuild 2075 BLAKE2B 205d6c7414aa36307e4234f8468e490ee2559ee5c7d385a8d98a5448aa8526eddb76ffa4731f86e326ac9683f60de4ef1083bd2c98dffcde1c55a50798493bc2 SHA512 0836f498b93caac775cc9f91af799d4696e2cf50db72021c87c4a5114cddcc5344a490b9a411e1c29cb8e93764a2f095b3410afa726d8e5c8a91488b67769d28
 MISC metadata.xml 1271 BLAKE2B 5b8779e6384359fcf4cb1f510adedd1a932ed005eb8f63e9984d9939a822e710adab367967a5c5891faea9f030dd6605dd6e675dc5bb7deffb9f8686f044007c SHA512 32ee3e70caebe2048e755dd0d81ca91570b386e5d0839425b34e6502959ace8ee23086b497c8c88ceccd3333a7d39283c8a8a7f52573a01b9a0a0d5ce3018c6c
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.6.0-r1.ebuild
index 0ba1f7bd1035..6ad066bc4226 100644
--- a/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -76,12 +76,22 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_install() {
+	cmake_src_install
+
+	mkdir -p "${D}/usr/share/metainfo" || die
+	mv "${D}/usr/share/appdata/"* "${D}/usr/share/metainfo/" || die
+	rmdir "${D}/usr/share/appdata" || die
+}
+
 pkg_postinst() {
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 }
diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest
index e634099c8560..2ca25277e4a2 100644
--- a/media-gfx/lximage-qt/Manifest
+++ b/media-gfx/lximage-qt/Manifest
@@ -1,3 +1,5 @@
 DIST lximage-qt-0.15.0.tar.xz 91444 BLAKE2B a5ccd9afdd4ed1ec60a5da8ec3390e5d93f018209ce62a1fbf929c6984a056539751f576a15e0b81e4f1ba003d35379791066832f02a45de1a5d5e8e8eb8f0b2 SHA512 980fc401b31c5d937877ef35211892984def150a6db6072d9752fa78588ea8ca0827beb5880d46775092c42e93358d3e494e045a50756931129402ded4ecab23
+DIST lximage-qt-0.16.0.tar.xz 100920 BLAKE2B 17a41013b7d7e599662a698fa24b6b15a550b2211dd818fbfda19b0fb9439bf77b63b2d8248ad8a65605fee8fc73c78d294ae86401d5660f6d798aa775273709 SHA512 2da46d23567cff7044a884e14b30de36b3a19d802768585b7c3332897b0af2fc42993ed9bb9d062db7988a0526cc7357a09fbac5f283a615b109ea8dfbf474b5
 EBUILD lximage-qt-0.15.0.ebuild 959 BLAKE2B 4c3c897be70d6fc8742774536ce838d2d06860530bcf15ee893892aebdad64a90d13d16f2ca259113539233996041ff9d2b86bdf3c6fb88f67c9f9766054bc95 SHA512 9353543981a42e1574c82b146c6bbed904bb2fd57cff2e251ad347c8ce8d2a7e6964dd2bc745f09e7f5107833464bf82c11d81bf4452f5430efd87289672a630
+EBUILD lximage-qt-0.16.0.ebuild 961 BLAKE2B 5b87008492d6624580dc409dea5a14295f940a2ccc5c2d65667aeba29cd43c4a744779278c63b9ef441736893d6d12abdd2ef34c304d3073e1046a99355ea2c4 SHA512 23afd5ce3049f2c562dd490459a7f847fd144f34c14bf84ee2e58d752d0facc2459f5bb33bd58669f687a12ad2a62b5cc68d580d7b442354237628057a087ec9
 MISC metadata.xml 316 BLAKE2B 4efdea74e716c40a0a63878d175f612e550669866bada61cbc0b22d5320a7bbb6a7158796bd5337e71c8aa70d42a977142d9466ac42fbb91f5eb2adcd83fb714 SHA512 b3cad1b8550e54a57940f2cea14c38bd714da71dc772ae073065c6c56c5d4d02a7258dc3ffc226a194d290e7b968a198fa07b02f6c011282896f9ba7173c3c53
diff --git a/media-gfx/lximage-qt/lximage-qt-0.16.0.ebuild b/media-gfx/lximage-qt/lximage-qt-0.16.0.ebuild
new file mode 100644
index 000000000000..9fc843665a0f
--- /dev/null
+++ b/media-gfx/lximage-qt/lximage-qt-0.16.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 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.8.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.16.0:=
+	x11-libs/libX11
+	x11-libs/libXfixes
+"
+RDEPEND="${DEPEND}
+	!lxqt-base/lxqt-l10n
+"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/mypaint-brushes/Manifest b/media-gfx/mypaint-brushes/Manifest
index 6d9678c88683..56be7e5e13ff 100644
--- a/media-gfx/mypaint-brushes/Manifest
+++ b/media-gfx/mypaint-brushes/Manifest
@@ -1,3 +1,3 @@
 DIST mypaint-brushes-2.0.2.tar.gz 1564926 BLAKE2B 68a244f42cd5d9b1f96466f5409f0c7ebae257f6dbbfdc5139cb9fda86ee4898ce8fda2a35e96f3a65f41333f7f689edb85445bcd88dc0fc4b428d05ba2870fe SHA512 89cecd9d78f4de84ada97a3e33fd67b86dfd259880da15c0ecbfad0fceb8c3b0e93790f3c0bff0cc375959bdf6921b01d1f3646e27c3f961715219a349017556
 EBUILD mypaint-brushes-2.0.2.ebuild 549 BLAKE2B 1f74b819805240361e6217da37aa5c8945b55cd420dd9bef7f5d1241a8509d1f228c25f0b5b8f54d3940613f560082ca6b4b9af4d4cac8efdf5a3e7ec1b7055f SHA512 bd107f540acbca1e910bcbff4a976a6d146492c6e71621a43c840e2e23dd5924d918ad086931fc95444d34fd22e4e0528d0c538b38d21ac87ba606d8d21c1bca
-MISC metadata.xml 191 BLAKE2B 8bff04ca02f4930d6f77dd32df009c145cacaad2d1cf271d91ae928f85acdccb0d73b0202a41aa3e60470ba6c7853e41ef76587601b2163f9ec249b7fa1c5274 SHA512 da06af54ba93db06f717082e3f09bbca9e17adad4b070a28131f2ffec15d0dfc82c79a3b2fb045fa33d6756c6df85254733622b0b7b1952b33d5590a71865c62
+MISC metadata.xml 263 BLAKE2B 3674e5c7d5dedc501574b523bf09a9f2d8f2e066edffa5649d59afba65ef3d9c36f3fd909f196f676b5b1266e5edce6ba6c44cf11fdca73b02b30cebcb662a3e SHA512 2f82b95119eb592f8edd7468010dbdc6863b235a0827586114fca02d01d45ce32a2be24077edfa497b0692f2f14447ad070c15b8a951b87091806750b8b0b862
diff --git a/media-gfx/mypaint-brushes/metadata.xml b/media-gfx/mypaint-brushes/metadata.xml
index 3c58a0219fbe..a1af484833bd 100644
--- a/media-gfx/mypaint-brushes/metadata.xml
+++ b/media-gfx/mypaint-brushes/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index ea34ba704f2d..7d3d1a604438 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -2,4 +2,4 @@ AUX mypaint-2.0.1-GIL-hold.patch 5153 BLAKE2B 3d70b414bfb6396fffb9ebfc9c1fe67918
 AUX mypaint-2.0.1-r1-build-system.patch 638 BLAKE2B 8e0209eb8fdba535cb8c0075e183681b0d8f8a11613cf7c3d2ddb5e20954d6c95da3ef3824063ac55bb11feda38cdf00eb8190cf76ca7753d2432d870926194b SHA512 8c088a089408542f57ef0fb608a63ae6fa0cce5392cb309376198813d35f5c3e54466945419984973af77e11f5bc4908961b5e81982a32fbef04c081df1b0349
 DIST mypaint-2.0.1.tar.xz 7295048 BLAKE2B 813a939f95ea6887c57d8c0868e33e9bc8b1b95746d5ecd793d4fd13a32198ee5a445cfdd2691a15e944bfb0099d6ac624dff320ae29465db5b1e0d197bedb30 SHA512 449beddcc6da5d720c9efbeac94a466ed0057bd1962d42ebb419190e8b7fd8ffd341327408467fc5da47920f9d0da1fd6d78233a0dda88de5f5d52d53d9ab562
 EBUILD mypaint-2.0.1-r2.ebuild 1818 BLAKE2B 834cc6863ab6c57876cdb2e56aab050be451806da7192a53bcd99d306e86cff9de0389ff5d35310ef4c45afed763109246e800b9ad4d744f0e8f1face0784362 SHA512 63e3c76f051c261b3c6a429a6629798673a36142dbb8756e8595651ebfc8379ed16c0f9c76e7fe38990c33f64ceb4c10c3f2393a859cdb1be3cbdb8668012275
-MISC metadata.xml 247 BLAKE2B 3a8d267e6befd2f46c41982b7196470f32b4fcf5dc6a42ead10b13e81bdcb7975ea998a51d0deb2c3c1a49f00b5f9216d8e43ad7e6dd0aea0f3352b19532d0a0 SHA512 21b957bb801d29dfed1d0aeceac553c9ba039a7fe94ebf899e7ab5c3316bbad116c7bd63a07ccbbb8277d2ce19f27b964499d2ccd942028290519e465e989dbb
+MISC metadata.xml 319 BLAKE2B ab7e3fb18424bef511847aee3d01ebe0f43203da55f8435af4577818ebc3f2f2483e5d238029b526b5ff2b4246f07a2ff08f7e3f8c432c7ffc76d6a5c8854b65 SHA512 3e8de4f800d8cd107b92661e8e0386279fcffe61c46d91f72e86fe28e6ab04e7dbf8b4f1c2e0f6c55631cbae6d1f3e24a2fd61819b83c574811f4afdfb8bd970
diff --git a/media-gfx/mypaint/metadata.xml b/media-gfx/mypaint/metadata.xml
index 3bce1ea264f7..8f3ad100df7e 100644
--- a/media-gfx/mypaint/metadata.xml
+++ b/media-gfx/mypaint/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>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">mypaint/mypaint</remote-id>
 	</upstream>
diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 3165d0c7bb48..5e8a2860b516 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,7 +1,4 @@
-DIST nomacs-3.14.2.tar.gz 2169504 BLAKE2B 6050ddba3ddbdeb7d1fbd29831d5dfbee066b61398ef46be4145a287d565eb2d55d59f47bc9e9e34a10379f8e0e676ca1f5373389a0d35c27fe85cff5da3fded SHA512 58104c85078bdbff7f65625658bb01b152631470eea93a43494eed55ae5e2441b7bcf3ed6c8f1aef07831bc99c80af94467fcc0e15dc1d282ef313bfcb3c81e9
 DIST nomacs-3.16.224.tar.gz 1932366 BLAKE2B 4a2dc6ef70b0ae5dc9c9397bd2c88ede0db2bb8660e1907d08b36c4a9cf5a9bd151180aa4b2d6b5f529c1786004a6621eff88fa4bc851d60835e8ba6d6269602 SHA512 7ca8e713eedd71bc3dd3804a9a09ece15badb74949b155ea4da72a0ea129be173c8d0951604a6139d4490525cd420da8635773c11f0d133f666a48dcd9064257
-DIST nomacs-plugins-3.14.tar.gz 514472 BLAKE2B fe8e1608c0a0ed502ea82efe80a9cfab3a9aff3ca7e8cbecfcb199377d137f5c19ad176940ef1f1109938634af3548008da1311339e6da78b8b5b983102bebb6 SHA512 c0bca87e50b7b91d80a9d6afd95eeb1d6730b17b9a28ad4109514b36c42781b3f67b25f68f48c0953110d1e02bb03762e813af9c1ec2851c072b4aea74969cbd
 DIST nomacs-plugins-3.16.tar.gz 561522 BLAKE2B 2bda4f36d56709653f6696af3404e416fd2d9fe7fa11de9636643c728028018ac769df3e2e519799322c5c42006cdc114d0e6406f9f60294234b07d9fd8d8409 SHA512 cd72f6ddbe3e07d7ed97f08405bac7574f4f3285c81e835f5630e011c8a9b105f23d892fed8084cb35ce521aca5524db071d0edb8bb04850dd2209d9ed019747
-EBUILD nomacs-3.14.2.ebuild 1928 BLAKE2B 65f9e2319a248fbe8a81cd4cca751c26125ba299b9203e369405eb1cca92345ca9c4b2e5c4210ce4424e40d3738fc8bdeab64a90511e8302078ce6b55b00ccb3 SHA512 82000a615de936bd8434a43f4aeb9936aeffa4f833263169dfa6353f0c735814f11c3f62fbe71218c3c7f4bc16afc0d805c453b0c7881ca7a5b096f3a1351100
-EBUILD nomacs-3.16.224.ebuild 1859 BLAKE2B d414d51449da48f68cee86b29e0a320df1212450f241b49bb1332617a4f41aef6071c06444a052e18820567a65a6863e35e2f37fa2738135446f316a47b609a7 SHA512 2f9f196cfc9aebc83e1038b304ec605c97ad828d2672365dde59f117706249e9e069d7e1312e19baa2aa5946990e6de758867ecc2a7c21ebfb6f7497d33e1ea2
+EBUILD nomacs-3.16.224.ebuild 1857 BLAKE2B a2e81270aca33f91efa823b838b0c194d763a8031d559cab8e32b412432d0ffca660dc18550769c083efe1f2d9ea4c80b77341dc8740ddb8576459ea5387cdb3 SHA512 68e42c71845989c8551f01bab2d13aa3216ec4ffeac30e2351676d1355f1ee69af5f874d49e6438ed9756cfe01c5dedc8c194f3abaea38455ebfd45cf510bf82
 MISC metadata.xml 594 BLAKE2B 3e4f800e489a388987f8942f433fad19e378644cb2aecd66d7eacbca167fa12597967bc4bef21260d266aa5553c1b103cc4df8167fbba8655a346e25100e66a6 SHA512 2f3ee7d525fff3d6ca2793d96555dcfba34df5b15cd2879e640aa51b5ccd34e2f466c2a5cceab90050af8c3d668c2d57fd88c136d830343da7313c8eaea247c9
diff --git a/media-gfx/nomacs/nomacs-3.14.2.ebuild b/media-gfx/nomacs/nomacs-3.14.2.ebuild
deleted file mode 100644
index 399cf622d2d9..000000000000
--- a/media-gfx/nomacs/nomacs-3.14.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-PLUGIN_PKG="${PN}-plugins-$(ver_cut 1-2)"
-
-DESCRIPTION="Qt-based image viewer"
-HOMEPAGE="https://nomacs.org/"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	plugins? ( https://github.com/${PN}/${PN}-plugins/archive/$(ver_cut 1-2).tar.gz -> ${PLUGIN_PKG}.tar.gz )
-"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="+jpeg +opencv plugins raw tiff zip"
-
-REQUIRED_USE="
-	raw? ( opencv )
-	tiff? ( opencv )
-"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[jpeg?]
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-gfx/exiv2:=
-	opencv? ( >=media-libs/opencv-3.4:= )
-	raw? ( media-libs/libraw:= )
-	tiff? (
-		dev-qt/qtimageformats:5
-		media-libs/tiff
-	)
-	zip? ( dev-libs/quazip )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P}/ImageLounge"
-
-DOCS=( src/changelog.txt )
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	if use plugins ; then
-		unpack "${PLUGIN_PKG}.tar.gz"
-		mv "${PLUGIN_PKG}" "${S}/plugins" || die
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	if use plugins ; then
-		# Fix nomacs-plugins installation and search library directory
-		sed -i "s:lib/nomacs-plugins:$(get_libdir)/nomacs-plugins:" "${S}/plugins/cmake/Utils.cmake" || die
-		sed -i "s:lib/nomacs-plugins:$(get_libdir)/nomacs-plugins:" "${S}/src/DkCore/DkPluginManager.cpp" || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CODE_COV=OFF
-		-DUSE_SYSTEM_QUAZIP=ON
-		-DENABLE_TRANSLATIONS=ON
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_PLUGINS=$(usex plugins)
-		-DENABLE_RAW=$(usex raw)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_QUAZIP=$(usex zip)
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/nomacs/nomacs-3.16.224.ebuild b/media-gfx/nomacs/nomacs-3.16.224.ebuild
index 694ae3a802b6..252958e43a9a 100644
--- a/media-gfx/nomacs/nomacs-3.16.224.ebuild
+++ b/media-gfx/nomacs/nomacs-3.16.224.ebuild
@@ -13,7 +13,7 @@ plugins? ( https://github.com/${PN}/${PN}-plugins/archive/$(ver_cut 1-2).tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux"
 IUSE="+jpeg +opencv plugins raw +tiff zip"
 
 REQUIRED_USE="
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 5b3782bedd2b..e64e73eb0395 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -4,7 +4,6 @@ AUX openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch 820 BLAK
 AUX openscad-2019.05_fix-boost-1.72.0-build.patch 689 BLAKE2B b8aea0ab3793b3f3202f7d4154c1aaca235de2450321958819531dd9dd70c1e375c28c9004a9fb348d5116815e99e4190efd2443057991b2e97873c80f52cc80 SHA512 20bc2baf50f23e6b5ccce0d8c22eb3a5004198a0c97c8c955b15a681a64102537be35a12a37692418159de6664a36689a4c3b65b3a520d51ab086aa091a1e48c
 AUX openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch 822 BLAKE2B ae4c7dc441e5a7391ecd2e704c644877fa7d73f8900fbe6082e070a3d9ecce74f368ead39be3f0321fb47095becf60057fafdee2a5e961106402dffff73687be SHA512 7bae2af4c627cc2f465e75890284bcca8e738dcbe5accf0511fcca2ee845ce9ef5602b752d61ecab7afd92f3a45975287db4e42379ede7875123a8c0a721f2c3
 DIST openscad-2019.05.tar.gz 14604881 BLAKE2B ed7d6088606fab44284363da73643e556f07c0f0a7a223bdf718dcc36a82158bf23e315724ea520d63a3f1331207df0ea7b0ade817f01dd39b67ca6f36529d56 SHA512 073053f625ffa4fea6ed836396b7ff4b87b26cf7500b06c804983afc0f1dfd3d78bfb81b3fd217c3939b0ec915d85b0c7990773eaf968512a150deaa0399df13
-EBUILD openscad-2019.05-r2.ebuild 1589 BLAKE2B e5537b0658a553fb95b55aa972f16e2eead4540f2e50d1cb04c094adc8aed115d092fd525e6cdbdadaa8bc54fc9f77953927a13650e2e8971614c74efd1122a0 SHA512 e6303ba15e877affd22a03d848f7b08e80d61ac9580993c01c0a3c39d51b3d4319b51067a178c9cd48dcd657f9397005794d2d820662b06f97c34e09899883d5
-EBUILD openscad-2019.05-r3.ebuild 2068 BLAKE2B c9d48ee8d7dbfca6cee6fb4c0d762b75389bc27b60d07ffeb5fc4ecc0097cd9a7f9a2fba3e3af8825301ba79edb5bdb26e4ee6d1d6adcef96f24a1d8275467dd SHA512 3afa92ce2fa1b3a80e8e7979a1ecb6e6c2e47584ab3231b7d76f9a04395b8964f81d991932ac1eb24dd84032e2551416bf39f2bbf1b07a226ef1dcdeb2efd7ae
+EBUILD openscad-2019.05-r3.ebuild 2069 BLAKE2B 04ea91d2e612adf7ed8b4d94c30c769713a99893da2120eb8675081c862a2804c0aabf21da51dfa78a10240d01b71144c1586d7859b69f4a639e22a5e090138c SHA512 0663545e9fb542b534bd7fcc98ca8e131de799a8f8ceac29a8aad31e5a1283fff22efa1a5a4677f991b8319ff824643e088e124d5b07d0fe7105f649e45e04d3
 EBUILD openscad-9999.ebuild 1900 BLAKE2B b7da0c8a17bcc88faa4c9367b4a664a8f58aafe8177d984001fd23ab0ea39f00f40349963691d4aa667d994761c7f60ee7bf0104c023ab43d85e51bde4349b4d SHA512 6378969e22ca27c2ef80928559b2f122e4b86df35a3858ae70537782b1f9209951fa34c55bd791f10cc23a9f0572a6305ba854f3270e4ea11eb045058e9c5b77
 MISC metadata.xml 1123 BLAKE2B d182b2b81115ec212b553802174d5305dd37af439aaafb25dd05368b1431b960cb4e35e65bec0519438e9c1ed767124fc686e293d07e5d44807bbf4ca8d74ea2 SHA512 10fda921c2d18d8e3a12d986cd2de9eebf47d9d2f843381b4ea2874d2483a42b84c6aa6c216ceb4c1ecf4183bbc8d43d7202bafbfcddc15de1bcd6b0f297f29c
diff --git a/media-gfx/openscad/openscad-2019.05-r2.ebuild b/media-gfx/openscad/openscad-2019.05-r2.ebuild
deleted file mode 100644
index 7b1bffdcad6e..000000000000
--- a/media-gfx/openscad/openscad-2019.05-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp-common qmake-utils xdg
-
-SITEFILE="50${PN}-gentoo.el"
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="https://www.openscad.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="emacs"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2019.05_fix-boost-1.72.0-build.patch"
-)
-
-# FIXME: add optional lib3mf
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/gmp:0=
-	dev-libs/hidapi
-	dev-libs/libspnav
-	dev-libs/libzip:=
-	dev-libs/mpfr:0=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5[-gles2-only]
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	media-gfx/opencsg
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/glew-2.0.0:0=
-	media-libs/harfbuzz:=
-	sci-mathematics/cgal:=
-	>=x11-libs/qscintilla-2.10.3:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	# fix path prefix
-	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
-}
-
-src_configure() {
-	eqmake5 "${PN}.pro"
-}
-
-src_compile() {
-	default
-
-	if use emacs ; then
-		elisp-compile contrib/*.el
-	fi
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		elisp-install ${PN} contrib/*.el contrib/*.elc
-	fi
-
-	einstalldocs
-}
diff --git a/media-gfx/openscad/openscad-2019.05-r3.ebuild b/media-gfx/openscad/openscad-2019.05-r3.ebuild
index 359b6566b45c..42738f600c39 100644
--- a/media-gfx/openscad/openscad-2019.05-r3.ebuild
+++ b/media-gfx/openscad/openscad-2019.05-r3.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="ccache emacs"
 RESTRICT="test"
 
@@ -46,7 +46,7 @@ RDEPEND="
 	>=media-libs/glew-2.0.0:0=
 	media-libs/harfbuzz:=
 	media-libs/lib3mf
-	sci-mathematics/cgal:=
+	<sci-mathematics/cgal-5:=
 	>=x11-libs/qscintilla-2.10.3:=
 	emacs? ( >=app-editors/emacs-23.1:* )
 "
diff --git a/media-gfx/opentoonz/Manifest b/media-gfx/opentoonz/Manifest
index e2e7f56680d2..3a1e019bed8e 100644
--- a/media-gfx/opentoonz/Manifest
+++ b/media-gfx/opentoonz/Manifest
@@ -1,11 +1,5 @@
-AUX opentoonz-1.1.2-gcc6-no-throw-in-destructors.patch 1469 BLAKE2B cb25eaa0b3e44bee9c4da81b6f50bfcd68c1566149d089fefddb9d90ed76cb3ae9f33b063bc3834e69da008660f689eb56b9597bd1702b40df761006b170c079 SHA512 c11194c06df6dc2e2ce18f3c6863c19191793512672779a2b5d4df2e2b59348dd4c71c7ab887546b96943e97e0257b3aa152f45aa53a3e5ed95008fa3d6b59d5
-DIST opentoonz-1.1.2.tar.gz 36777909 BLAKE2B d822218c5ea1843a50da8d799bd9edf6998bd424ec2b65600371a0ae9f69aaea0d1c45aa53c3a0287c67459b8101a82bc0c339510859f4fbac3a116c9671df08 SHA512 800a741cb40e7dede79ef92705fc8fe3a23524c8a4397c30f80a81a7513c98606fb1bb5574188969ba08cfe8995d679f9fc5ecb696a6ac14c48aa2646a2c871e
-DIST opentoonz-1.2.1.tar.gz 39843446 BLAKE2B f9035bab5c6fa1d86459b401ca94acbffe8e38a2f5ec2bc97f303c7e829b9f6695480e7ab7a7560909f6ce45109ca1704d5020ff774964b5ed72b1b01588e93b SHA512 3eaf5983b5ec7424338e25975228b9bf6e9da61b2699c52377528966ecf07971868426bda0a64c780c2876cc1f0e4adb63c46767e8099fbfe32a8d1586c13f44
 DIST opentoonz-1.3.0.tar.gz 39920932 BLAKE2B 292e01c078a4cf461fff0814a60e4ab6aea9a74a63f23e854815632432e07e65d5c01dce9d3aab36595f94ca06dd83b078e52858532d8dadb2e7518514c08b08 SHA512 5df272c943f2c222a457545c99388266579d88c702d6c7e71dfe0c924a0189e30323cf9e369c96755c507ee5347620da0140215b2647555f0b3bdae41c615c71
 DIST opentoonz-1.4.0.tar.gz 53531141 BLAKE2B adb7a85fb0581d92119b5f6b75dc320428ea0763955f8c883072cba78045acdeea75a5cea82065a29d2c59f53b4843d8ff92690c9a47c01605b4702fd36d6c13 SHA512 777f5d59ec8076e1e53a81347e15bef198bea77449073f1e9d5fdd371a61e20fd6dc8b26c6656c783959782bd71008fbb63c05742aaa50c92bd317aded7d0649
-EBUILD opentoonz-1.1.2.ebuild 2145 BLAKE2B 13e02438560b95acea8e4706b9c9c35d1d76470e5d7e51c9e4a1f3b269cfe3b1f73ac066fc59e59b82306f1adb573bd53f119ed8fd8f7adbe1ac249fc47ec23b SHA512 3c761e8112b70b3807e8114f9adf208bf5e54ec6986a86087fadf518be1b0fdb30ba7fa83eb71bf41bbccb2fd29c46164265599ad7633a901a255b7cb8c24fbe
-EBUILD opentoonz-1.2.1-r1.ebuild 2179 BLAKE2B 3e9ab88c1cf7f1364e2feaaa58fd92ccfc426337c85307d046da8d14734528c5da16fbb341ca1c8ff2992fc07ff465a1aa06b9d25e823cbca9b32e221ee45ee5 SHA512 d85550a7169a8f31c5db8384aa7bb0b6d190cf9afb4d0553a64640ea52d3f5a0cf4ebb29a781a68fcbdb913723a79f0c3ae7f6a03d347ffe053f5964687d410c
 EBUILD opentoonz-1.3.0-r1.ebuild 1899 BLAKE2B fafe1a38973cf8e8687b705b91d496c1897c1536e17f978e6bfdef122c8b43e045c34f71e0d942843093881b138630a342e4fe3a4c11483faeb4acc30bea82d7 SHA512 1f3e0f7a9db57c9a4150f490c82c186698e4fc56eac11ec725dd2e4b518166eb0e91e359f3d863dfa49dd52f5125c57074f28e2338438367478e4e1702d81e06
-EBUILD opentoonz-1.3.0.ebuild 1910 BLAKE2B 104dd1987f0b2221b357d5afe5922eb67dc97942cd4823cd4179c4ecf4ae55074004243f0a6039a93f6a3c560ee38b346f19d6e9603bec0c2f87e4bd36b8abf3 SHA512 b84833dadd77ee39f9918c177edd919ee93456967ae21c7a587b780282085676681b54518dfff4da35a4127a2b8fd4a7b8898bfe03f2b2a4445bb00fe052b3c6
 EBUILD opentoonz-1.4.0.ebuild 1817 BLAKE2B 63407ff2f79ce44b991ca53ffa0d606f605f203cae9ce95749293afc29e25f9802061884d1425e82c5a43da4a6fd477087dff9da03faa53e11e92482ce74cf4a SHA512 66e8e879c11a5bd55a9125f786bf2bad513def93eb95113f79c1172202365bcad8a9f655a9fc39459d529427590e1182e0b636eb3bc1ef5187e4c2e6e0c265a3
 MISC metadata.xml 453 BLAKE2B 5bcdb89e0cab891a18531065af9dc5d65510905f8c21178d62125901d0d65d0522b8e4a5ab94f92d09ed0085a0cfae6701c04001dc29bc5e138b12b888cf71ec SHA512 227ed636186b559a5c4fe8728bc8ad2fa519177451f61c6cc67e20be3f8b071715fe38c274956cc987c3c2a49a25b7c7ca61280608871861c0007c558c016d6f
diff --git a/media-gfx/opentoonz/files/opentoonz-1.1.2-gcc6-no-throw-in-destructors.patch b/media-gfx/opentoonz/files/opentoonz-1.1.2-gcc6-no-throw-in-destructors.patch
deleted file mode 100644
index ad0e5a2758ea..000000000000
--- a/media-gfx/opentoonz/files/opentoonz-1.1.2-gcc6-no-throw-in-destructors.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=612938
-
-From ae91dbad8c33b35ea564d235c8eba63adfcc0fef Mon Sep 17 00:00:00 2001
-From: Peter-Levine <plevine457@gmail.com>
-Date: Wed, 31 May 2017 04:49:36 -0400
-Subject: [PATCH] Don't allow throw() in destructors (#1182)
-
----
- toonz/sources/image/3gp/tiio_3gp_proxy.cpp | 2 --
- toonz/sources/image/mov/tiio_mov_proxy.cpp | 2 --
- 2 files changed, 4 deletions(-)
-
-diff --git a/toonz/sources/image/3gp/tiio_3gp_proxy.cpp b/toonz/sources/image/3gp/tiio_3gp_proxy.cpp
-index d1bd79717..03140f695 100644
---- a/toonz/sources/image/3gp/tiio_3gp_proxy.cpp
-+++ b/toonz/sources/image/3gp/tiio_3gp_proxy.cpp
-@@ -138,8 +138,6 @@ TLevelWriter3gp::~TLevelWriter3gp() {
-   QString res;
- 
-   stream << (msg << QString("$closeLW3gp") << m_id);
--  if (tipc::readMessage(stream, msg) != "ok")
--    throw TException("Unable to write file");
- }
- 
- //------------------------------------------------------------------
-diff --git a/toonz/sources/image/mov/tiio_mov_proxy.cpp b/toonz/sources/image/mov/tiio_mov_proxy.cpp
-index 260bbb196..6be067c01 100644
---- a/toonz/sources/image/mov/tiio_mov_proxy.cpp
-+++ b/toonz/sources/image/mov/tiio_mov_proxy.cpp
-@@ -206,8 +206,6 @@ TLevelWriterMov::~TLevelWriterMov() {
-   QString res;
- 
-   stream << (msg << QString("$closeLWMov") << m_id);
--  if (tipc::readMessage(stream, msg) != "ok")
--    throw TException("Unable to write file");
- }
- 
- //------------------------------------------------------------------
diff --git a/media-gfx/opentoonz/opentoonz-1.1.2.ebuild b/media-gfx/opentoonz/opentoonz-1.1.2.ebuild
deleted file mode 100644
index ced01576533d..000000000000
--- a/media-gfx/opentoonz/opentoonz-1.1.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="An open-source full-featured 2D animation creation software"
-HOMEPAGE="https://github.com/opentoonz/opentoonz"
-SRC_URI="https://github.com/opentoonz/opentoonz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD libtiff"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-arch/lz4:=
-	>=dev-libs/boost-1.55.0:=
-	dev-libs/lzo:2=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/freeglut:=
-	media-libs/freetype:2=
-	media-libs/glew:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/libsdl2:=
-	sci-libs/blas-reference:=
-	>=sci-libs/superlu-4.1:=
-	sys-libs/zlib:=
-	virtual/libusb:=
-	virtual/opengl
-"
-DEPEND="
-	$RDEPEND
-	virtual/pkgconfig
-	dev-qt/linguist-tools:5
-"
-
-CMAKE_USE_DIR="${S}"/toonz/sources
-
-PATCHES=( "${FILESDIR}"/${P}-gcc6-no-throw-in-destructors.patch )
-
-src_configure()
-{
-	local mycmakeargs=(
-		-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
-		-DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
-		-DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
-		-DCMAKE_SKIP_RPATH=ON
-	)
-
-	# The upstream uses their own modified libtiff
-	# See: https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md#building-libtiff
-	cd thirdparty/tiff-4.0.3 || die
-	econf \
-		--with-pic \
-		--disable-jbig \
-		--enable-static \
-		--disable-shared
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cd "${S}"/thirdparty/tiff-4.0.3 || die
-	emake
-
-	cmake-utils_src_compile
-}
-
-pkg_postinst()
-{
-	elog "It is supposedly optional but some files are"
-	elog "actually required to run the executable properly."
-	elog
-	elog "The .config/OpenToonz/ directory in your home folder"
-	elog "will contain your settings, work and other files."
-	elog
-	elog "We need to create it from the command-line:"
-	elog
-	elog "$ mkdir -p \$HOME/.config/OpenToonz"
-	elog "$ cp -r /usr/share/opentoonz/stuff/ \$HOME/.config/OpenToonz/"
-}
diff --git a/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild b/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild
deleted file mode 100644
index b1aa0a87358e..000000000000
--- a/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="An open-source full-featured 2D animation creation software"
-HOMEPAGE="https://github.com/opentoonz/opentoonz"
-SRC_URI="https://github.com/opentoonz/opentoonz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD libtiff"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-arch/lz4:=
-	>=dev-libs/boost-1.55.0:=
-	dev-libs/lzo:2=
-	>=dev-qt/qtcore-5.9:5
-	>=dev-qt/qtgui-5.9:5
-	>=dev-qt/qtmultimedia-5.9:5[widgets]
-	>=dev-qt/qtnetwork-5.9:5
-	>=dev-qt/qtopengl-5.9:5
-	>=dev-qt/qtprintsupport-5.9:5
-	>=dev-qt/qtscript-5.9:5
-	>=dev-qt/qtsvg-5.9:5
-	>=dev-qt/qtwidgets-5.9:5
-	>=dev-qt/qtxml-5.9:5
-	media-libs/freeglut:=
-	media-libs/freetype:2=
-	media-libs/glew:=
-	media-libs/libjpeg-turbo:=
-	>=media-libs/libmypaint-1.3.0
-	media-libs/libpng:=
-	media-libs/libsdl2:=
-	sci-libs/cblas-reference:=
-	>=sci-libs/superlu-4.1:=
-	sys-libs/zlib:=
-	virtual/libusb:=
-	virtual/opengl
-"
-DEPEND="
-	$RDEPEND
-	virtual/pkgconfig
-	dev-qt/linguist-tools:5
-"
-
-CMAKE_USE_DIR="${S}"/toonz/sources
-
-src_configure()
-{
-	local mycmakeargs=(
-		-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
-		-DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
-		-DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
-		-DCMAKE_SKIP_RPATH=ON
-	)
-
-	# The upstream uses their own modified libtiff
-	# See: https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md#building-libtiff
-	cd thirdparty/tiff-4.0.3 || die
-	econf \
-		--with-pic \
-		--disable-jbig \
-		--enable-static \
-		--disable-shared
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cd "${S}"/thirdparty/tiff-4.0.3 || die
-	emake
-
-	cmake-utils_src_compile
-}
-
-pkg_postinst()
-{
-	elog "It is supposedly optional but some files are"
-	elog "actually required to run the executable properly."
-	elog
-	elog "The .config/OpenToonz/ directory in your home folder"
-	elog "will contain your settings, work and other files."
-	elog
-	elog "We need to create it from the command-line:"
-	elog
-	elog "$ mkdir -p \$HOME/.config/OpenToonz"
-	elog "$ cp -r /usr/share/opentoonz/stuff/ \$HOME/.config/OpenToonz/"
-}
diff --git a/media-gfx/opentoonz/opentoonz-1.3.0.ebuild b/media-gfx/opentoonz/opentoonz-1.3.0.ebuild
deleted file mode 100644
index 74922af17dc9..000000000000
--- a/media-gfx/opentoonz/opentoonz-1.3.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="An open-source full-featured 2D animation creation software"
-HOMEPAGE="https://github.com/opentoonz/opentoonz"
-SRC_URI="https://github.com/opentoonz/opentoonz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD libtiff"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-arch/lz4:=
-	>=dev-libs/boost-1.55.0:=
-	dev-libs/lzo:2
-	>=dev-qt/qtcore-5.9:5
-	>=dev-qt/qtgui-5.9:5
-	>=dev-qt/qtmultimedia-5.9:5[widgets]
-	>=dev-qt/qtnetwork-5.9:5
-	>=dev-qt/qtopengl-5.9:5
-	>=dev-qt/qtprintsupport-5.9:5
-	>=dev-qt/qtscript-5.9:5
-	>=dev-qt/qtsvg-5.9:5
-	>=dev-qt/qtwidgets-5.9:5
-	>=dev-qt/qtxml-5.9:5
-	media-libs/freeglut
-	media-libs/freetype:2
-	media-libs/glew:=
-	media-libs/libjpeg-turbo
-	>=media-libs/libmypaint-1.3.0:=
-	media-libs/libpng:=
-	media-libs/libsdl2
-	sci-libs/cblas-reference
-	>=sci-libs/superlu-4.1:=
-	sys-libs/zlib:=
-	virtual/libusb:=
-	virtual/opengl
-"
-DEPEND="
-	${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-CMAKE_USE_DIR="${S}"/toonz/sources
-
-src_configure() {
-	local mycmakeargs=(
-		-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
-		-DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
-		-DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
-		-DCMAKE_SKIP_RPATH=ON
-	)
-
-	# The upstream uses their own modified libtiff
-	# See: https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md#building-libtiff
-	cd thirdparty/tiff-4.0.3 || die
-	econf \
-		--with-pic \
-		--disable-jbig \
-		--enable-static \
-		--disable-shared
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cd "${S}"/thirdparty/tiff-4.0.3 || die
-	emake
-
-	cmake-utils_src_compile
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index e935ac3d4a18..16d5cca4d8ca 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -16,6 +16,6 @@ DIST openvdb-7.1.0.tar.gz 1956052 BLAKE2B 7778d67bcc65ecb17b86f6e67a9e5f2d6574de
 EBUILD openvdb-4.0.2-r4.ebuild 2621 BLAKE2B bbaafee76eeea4aab92cb434043d069de3b962db271612a882055a9a26369f1f509b220f8ec8eaa3920c9ae42be81e78075516abff2a87eb58cc6f0fab7fb9f2 SHA512 5bbb892bf40e96239efdec47bf256f92bc2a3ef3f3c53c37a928f9fd798c129ecc764bc466d90953670e6ba398bd3fce7ea32ab8a87d68c2112e0b051033bf76
 EBUILD openvdb-5.2.0-r2.ebuild 2419 BLAKE2B 13838290e15d9cfa3f592dcc840fb08d4ee29a03362a23c5dd4df44af4c1c61e3b512485bfd1ba4487dda38edb58171d1457dd24c4c081c69d2b0afa0050e416 SHA512 0fe29028f37bb9a62cfebba9e4048dbd72b54d368d66ff055bbf6f722f2abc06dc115c33bc613cd5c6776d061f9904513c5fa989c9436b55ef7d884d823d378c
 EBUILD openvdb-6.2.1-r1.ebuild 2295 BLAKE2B d80285cba57899fbe0813eaecffcc0eae412bff68001067e35573389497c4117e8378396675fd94e7ac4d0b79119769a07d2cdcdf97fa252981fbed27da0584a SHA512 3c561ff41a27aa0f843afbb6d2031ecef94927e8f6be6f9c2b3a03eea467fbfb62dba25f6fbed65c34bc4b5605f916a8dc24d6414804bbecdd47a510f3e1ad99
-EBUILD openvdb-7.0.0-r1.ebuild 2796 BLAKE2B 9bdce2c646e58c6b9fb7dbcde273b5659e4b424d7068be5b776400c529b0267cf79d75d3429d3d9abb0e3e86297621aa63f6f9242e51a7a7569b1daffe9b4999 SHA512 94aa6701f3eec40b105d91643fea984ab18f6c1f4bc4e26e1302819cd92ec9a5e6f5bf2f2532e5b6c3709cf2a2b04d3f62f66fa20ff7477858d9be6c62b599d1
-EBUILD openvdb-7.1.0-r1.ebuild 2718 BLAKE2B 0dd0f5f37550915992c608da30524cebcaa435d9f52c442e292d9f606781434ee1b2c7203c6e0baac283de158b30ecbcf8233d181b2b06e4709b4ddb9eddf249 SHA512 4a176c0609da17355850307e54a76e8b7d7d2145847bcdbeb43923ff6b29a8c0ef33d7f969b52632eb72b63cb046084eca824e4b7239a7c3673d4997bac3083d
+EBUILD openvdb-7.0.0-r1.ebuild 2795 BLAKE2B 440272791f4a53f323eee0f4050614d05f989d57c5dc315d0a640a909943472b4a35c108aed40af92809401cf57458cf9a8ce4c891f097dd2bf95bd2af33d38a SHA512 6a2791a989bcc851a1f250da50dc118502029be02e6fe7dc6965c8595644d4921f7622b1e08b029514573163148e5a4df3aecbde2258e1ded373313a70bae910
+EBUILD openvdb-7.1.0-r1.ebuild 2725 BLAKE2B d89bc3fa321c0d6f29427d94e6f1d77e7e2f4ae6e4a13361f205cbc3eb5e84dc22ee5c06bfade5ca357b924291781871518aa92189dabadf1f7205779d6b836b SHA512 bc7d8a1a282ea3a0c4f4ec862cb36bd52841828c4977ac5ac69114f4b0550548993f196f021eb04dc04dd705e822a2f33451885d832ca2f926156e64c982f9d1
 MISC metadata.xml 1660 BLAKE2B 56a7113ef4e645a3a508d025f36129c78be342117583f9cc8ba3ffda2518b04bba3d928ad1fa9e78a601a0f1d216bc1744795c170a6cd3421f22c8754f192a98 SHA512 f5e21ebf80b7179b6bd041bcdf5cc53c4aab3cf99f829d9e26e56f3eea40a9d67edf8ec09d63a39b5e1a231df9d2e57b40e008786d25ee00e8ff2ca0ab0c399d
diff --git a/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild b/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild
index ca09736ee52a..a22bb7a1d6f1 100644
--- a/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild
+++ b/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.g
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 doc numpy python static-libs test utils abi5-compat abi6-compat +abi7-compat"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild b/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild
index 89a658ed62e1..1b5f48159d43 100644
--- a/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild
+++ b/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.g
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 doc numpy python static-libs test utils abi6-compat +abi7-compat"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/pencil/Manifest b/media-gfx/pencil/Manifest
index 2e36954f7975..e936b1c16dfc 100644
--- a/media-gfx/pencil/Manifest
+++ b/media-gfx/pencil/Manifest
@@ -1,5 +1,8 @@
 AUX pencil-0.6.4-fixes-for-qt-5.15.0.patch 823 BLAKE2B ea39062880493e22b5c58c3864581a37a3db38e171a065230fc18cbe79e79db420992aec838972d99ac2b0a3a23a47035ffd6df7644d0fda4daae136fa1e158c SHA512 93138586a3e6f353712a2f3e0ff4abdd88e2224d996b3069fbe11f3b4cde2ecadec21a33b7ac5ac2de7a49727332e6155cb09154e179bc42e870aaba375eb0db
+AUX pencil-0.6.5-skip-building-tests.patch 1301 BLAKE2B c7bfb172e5050936a1cf7294d2992c580ffb0b337c879d60c42575c5dff7c0269a1e406eecf7e97871a6ab785c9910a5ffc47fa97b5f9881239debf294c6cf96 SHA512 c71e2cc135a267f79bffca15f3cafb4a7e6e4d3b0f3718f37551b6985a9264774c70974c22acbf591c7b204e9aa1ea46ca4d3b3722770931b000cc633f3f62aa
 DIST pencil-0.6.4.tar.gz 3397891 BLAKE2B cb3fc754cd9abc2944fd184ea61b057a784a5b9e3c42724ef50b117a933cad0b72456a32e849c2de3ae6a7eb8bc6bdeee3ed751e8a6c8c68a74130d03ba6f1de SHA512 da28bd6bcdb0336c81e0735bec261373cd1e5db06feb012d4bba098c9df2ebea6f5b763e9c5e5e17c1518efdd6b9cde634ecf2152b49c25cde6c93da63e6fde8
+DIST pencil-0.6.5.tar.gz 3714951 BLAKE2B 0b3ba5165f4a6778588eed3141c6260a29470ccf277e42612e68e8b4daf5b9cf32f6a4343c038d6014ceb1e99f7ce8c2a398130ea55e7ef16e2d006de3661625 SHA512 6d95dc4157ea0f5da829f40cdf99c682e560ca74af6964693d221321e7b3e923893957fc30475a725f09c18dc4667968ec6cd92e5ffb56999ea70a927266b637
 EBUILD pencil-0.6.4-r1.ebuild 1245 BLAKE2B 64ac22d27b4b39ed72aea5c885c4328f3078d3d1e278fae29547354274303da49deeb655081e1db182829cd6e1952e8a33cdc77ff0c1259bdf988bec195aa0c0 SHA512 ab3ee1d4ec5f3f7aa1b3356807564805bec48a3cb937b557e316364f5c52d379a590df3502f0224f350116d4c597bb5bb5ddc5575e8a43fb300d7f56bf457966
 EBUILD pencil-0.6.4.ebuild 1179 BLAKE2B 0527c9a25c2a5ece6d99a9032d1e9760170a3d479d812cd1704946d28805baf6cac08aead03e211d2f583387081dcd911e92bf5719495044ecb460d72c5cfbf5 SHA512 38f900e8f322fe4b4dd20fc0e12e466f35824b52aa5e98577db97eb297c8afdfe9182cc8edec1b2b85ee478c43dbb5ea6e739985665be398402a37219c302a01
+EBUILD pencil-0.6.5.ebuild 1054 BLAKE2B 553ebc52d60ecc1c8905bf7f002281c12e1df8f482e70a34adcab738b8620550c61965119d0c57715a8f35128238333dca584a10421cbe76a67f7bc6ace80243 SHA512 f5422c2bcd414eeeb566b01742de93114bde276c5e1c6c6cbd21cc9eea5cd1069bbaac733b1e36a19049e8abf98b3848032bca334e4b5601280947836a9ad8c5
 MISC metadata.xml 328 BLAKE2B d37566524ba0b352bca868e5a9db91ac4faf995bc4f9fca49be83be786c8e7b3ba305a10fcc1aea71b610a1442fa1b398ca549b9fcfccf0275c958d99e9d1279 SHA512 4e393e069c386f40fd7f817af383e3ee77d2f4592059a2b3cb54f68eae45eb665db9873971a29d94612dea0c8022bc0a3c2a01bac19e62d774739d3b666aac3e
diff --git a/media-gfx/pencil/files/pencil-0.6.5-skip-building-tests.patch b/media-gfx/pencil/files/pencil-0.6.5-skip-building-tests.patch
new file mode 100644
index 000000000000..dd7c80f2893c
--- /dev/null
+++ b/media-gfx/pencil/files/pencil-0.6.5-skip-building-tests.patch
@@ -0,0 +1,53 @@
+From f949445894fa6da9eaa9f26f54bac59888822011 Mon Sep 17 00:00:00 2001
+From: Matt Chang <chchwy@gmail.com>
+Date: Wed, 5 Aug 2020 15:06:29 +1000
+Subject: [PATCH] qmake CONFIG+=NO_TESTS to skip building tests
+
+---
+ pencil2d.pro | 24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/pencil2d.pro b/pencil2d.pro
+index f9fbca5a2..e1bc4a179 100644
+--- a/pencil2d.pro
++++ b/pencil2d.pro
+@@ -4,22 +4,23 @@
+ 
+ TEMPLATE = subdirs
+ 
+-SUBDIRS = \ # sub-project names
+-    core_lib \
+-    app \
+-    tests
+-
+ # build the project sequentially as listed in SUBDIRS !
+ CONFIG += ordered
+ 
+-# where to find the sub projects - give the folders
++SUBDIRS += core_lib
+ core_lib.subdir = core_lib
+-app.subdir      = app
+-tests.subdir    = tests
+ 
+-# what subproject depends on others
+-app.depends      = core_lib
+-tests.depends    = core_lib
++SUBDIRS += app
++app.subdir = app
++app.depends = core_lib
++
++SUBDIRS += tests
++tests.subdir = tests
++tests.depends = core_lib
++
++NO_TESTS {
++  SUBDIRS -= tests
++}
+ 
+ TRANSLATIONS += translations/pencil.ts \
+                 translations/pencil_ar.ts \
+@@ -48,4 +49,3 @@ TRANSLATIONS += translations/pencil.ts \
+                 translations/pencil_zh_CN.ts \
+                 translations/pencil_zh_TW.ts
+ 
+-macx: LIBS += -framework AppKit
diff --git a/media-gfx/pencil/pencil-0.6.5.ebuild b/media-gfx/pencil/pencil-0.6.5.ebuild
new file mode 100644
index 000000000000..e4872b8d9df9
--- /dev/null
+++ b/media-gfx/pencil/pencil-0.6.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils xdg-utils
+
+DESCRIPTION="2D animation and drawing program based on Qt5"
+HOMEPAGE="https://www.pencil2d.org/"
+SRC_URI="https://github.com/pencil2d/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+
+S="${WORKDIR}/${P/_/-}"
+PATCHES="${FILESDIR}/${P}-skip-building-tests.patch"
+
+src_prepare() {
+	default
+	sed -e "/^QT/s/xmlpatterns //" \
+		-i core_lib/core_lib.pro tests/tests.pro || die
+}
+
+src_configure() {
+	eqmake5 PREFIX=/usr $(usex test "" "CONFIG+=NO_TESTS")
+}
+
+src_install() {
+	einstalldocs
+	emake INSTALL_ROOT="${D}" install
+	# TODO: Install l10n files
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/pinta/Manifest b/media-gfx/pinta/Manifest
deleted file mode 100644
index d9bbbda60037..000000000000
--- a/media-gfx/pinta/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX pinta-1.6-mono-4.patch 4938 BLAKE2B 015d3cb4e3975aeb96defcdc45f50a2246953d17258fd3a41fe886970c4d7950eb188946ba773bdb634eb4fdb292c2ce8a251e010a83ac91ae86c2178955d534 SHA512 142113fbc7e7b80f29c5a6aed921326239961903df10e28adcd4677125da366a24e816577fa570f6e359c06f3f47294a6203de8cfca27f39cc49016fdec61e55
-DIST pinta-1.6.tar.gz 1444709 BLAKE2B 6b560e9f6934d966632126cdcd5adf3debcfe790d61f8cad41bf7bafc8696c0b0e991597eaadae01c6de06fceb5a84fe0459bedbeffbd0d2cdce5114852c041f SHA512 b22ac05c639f9b0f2a49efc7b1f2c10774b3f2fb436dddd58f0005afadc103d4e77d6044479db0b3df04221922634502b1c16aa78d00894bca6a49931889f834
-EBUILD pinta-1.6-r2.ebuild 952 BLAKE2B 92a63881d768f8fbc8d2cbf8d95dbadf8baecab0735c132cc68565c428bc2285014178f42da74f7b19803a3b2d0f1ab3f2e52ff9d26bed67365185fa4a6ee504 SHA512 b26d268ae1b5910a6764686c8e201f903476f39594175db632d317d16ada99f8b24167c27685a915912964b5430fe7b1b25ed1c7ee7cbde7627c0b94691b55a6
-EBUILD pinta-9999.ebuild 907 BLAKE2B 6a39c0fa7295730cbacce70ea0b00b44f174b3fbedc1c291b777885c08babf4239d75f93b3589d950396ac2b09475caa9bcfbd57c8fd5bfcc5c170cdbd0ced24 SHA512 491a808930a5a24d65b004840e210d52f8d839bded8c66f355eaf19dbec935ad4e9c87a6f95618c53d4f11c03c9e6f32f37339cb03d9881e5be1b73038be2c11
-MISC metadata.xml 820 BLAKE2B 031a8a51106d8dc3e3cfc2d035fa80c4c642bf0738479937546ff5a55de86c7de3857d1dc814b9af7d8b37477dceb5a61965fa3dcc8959930257b9b85aac8733 SHA512 ffed45156109c45f3569e3173cd2bdc04bd2992b20dfaf71e645d7a901cc122161a1c10f6b0c048e017f3a8a01f4da39fc737221ccb2e764ea7bc75225bc0935
diff --git a/media-gfx/pinta/files/pinta-1.6-mono-4.patch b/media-gfx/pinta/files/pinta-1.6-mono-4.patch
deleted file mode 100644
index 0e37a46815bb..000000000000
--- a/media-gfx/pinta/files/pinta-1.6-mono-4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -Naur pinta-1.6_orig/Pinta/Pinta.csproj pinta-1.6/Pinta/Pinta.csproj
---- pinta-1.6_orig/Pinta/Pinta.csproj	2015-03-01 23:07:57.000000000 +0100
-+++ pinta-1.6/Pinta/Pinta.csproj	2015-12-12 15:02:28.796155090 +0100
-@@ -80,7 +80,7 @@
-     <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-       <Package>gtk-sharp-2.0</Package>
-     </Reference>
--    <Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
-+    <Reference Include="Mono.Posix, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
-     <Reference Include="System" />
-     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-       <Package>gtk-sharp-2.0</Package>
-diff -Naur pinta-1.6_orig/Pinta.Core/Pinta.Core.csproj pinta-1.6/Pinta.Core/Pinta.Core.csproj
---- pinta-1.6_orig/Pinta.Core/Pinta.Core.csproj	2015-03-01 23:07:57.000000000 +0100
-+++ pinta-1.6/Pinta.Core/Pinta.Core.csproj	2015-12-12 15:02:28.798155090 +0100
-@@ -55,7 +55,7 @@
-     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-   </PropertyGroup>
-   <ItemGroup>
--    <Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
-+    <Reference Include="Mono.Posix, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
-     <Reference Include="System" />
-     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-     <Reference Include="System.Core" />
-diff -Naur pinta-1.6_orig/Pinta.Effects/Pinta.Effects.csproj pinta-1.6/Pinta.Effects/Pinta.Effects.csproj
---- pinta-1.6_orig/Pinta.Effects/Pinta.Effects.csproj	2015-03-01 23:07:57.000000000 +0100
-+++ pinta-1.6/Pinta.Effects/Pinta.Effects.csproj	2015-12-12 15:02:28.797155090 +0100
-@@ -58,7 +58,7 @@
-     <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-     <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
--    <Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
-+    <Reference Include="Mono.Posix, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
-     <Reference Include="System" />
-     <Reference Include="System.Core">
-     </Reference>
-diff -Naur pinta-1.6_orig/Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj pinta-1.6/Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj
---- pinta-1.6_orig/Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj	2015-03-01 23:07:57.000000000 +0100
-+++ pinta-1.6/Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj	2015-12-12 15:02:28.797155090 +0100
-@@ -54,7 +54,7 @@
-     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-   </PropertyGroup>
-   <ItemGroup>
--    <Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
-+    <Reference Include="Mono.Posix, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
-     <Reference Include="System" />
-     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-     <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-diff -Naur pinta-1.6_orig/Pinta.Install.proj pinta-1.6/Pinta.Install.proj
---- pinta-1.6_orig/Pinta.Install.proj	2015-03-01 23:14:37.000000000 +0100
-+++ pinta-1.6/Pinta.Install.proj	2015-12-12 15:05:20.974156635 +0100
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
--<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
- 
-   <!-- Set some paths -->
-   <PropertyGroup>
-diff -Naur pinta-1.6_orig/Pinta.Tools/Pinta.Tools.csproj pinta-1.6/Pinta.Tools/Pinta.Tools.csproj
---- pinta-1.6_orig/Pinta.Tools/Pinta.Tools.csproj	2015-03-01 23:07:57.000000000 +0100
-+++ pinta-1.6/Pinta.Tools/Pinta.Tools.csproj	2015-12-12 15:02:28.795155090 +0100
-@@ -54,7 +54,7 @@
-     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-   </PropertyGroup>
-   <ItemGroup>
--    <Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
-+    <Reference Include="Mono.Posix, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
-     <Reference Include="System" />
-     <Reference Include="System.Core" />
-     <Reference Include="System.Xml" />
diff --git a/media-gfx/pinta/metadata.xml b/media-gfx/pinta/metadata.xml
deleted file mode 100644
index 9f6f43064df6..000000000000
--- a/media-gfx/pinta/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<maintainer status="active">
-			<email>cameronwhite91@gmail.com</email>
-			<name>Cameron White</name>
-		</maintainer>
-		<changelog>https://github.com/PintaProject/Pinta/commits/1.3</changelog>
-		<doc lang="en">http://pinta-project.com/HowTo.ashx</doc>
-		<bugs-to>https://bugs.launchpad.net/pinta/+filebug</bugs-to>
-		<remote-id type="github">PintaProject/Pinta</remote-id>
-	</upstream>
-	<longdescription lang="en">
-		Pinta is a free, open source drawing/editing program modeled after 
-		Paint.NET. Its goal is to provide users with a simple yet powerful
-		way to draw and manipulate images on Linux, Mac, and Windows.
-	</longdescription>
-</pkgmetadata>
-
diff --git a/media-gfx/pinta/pinta-1.6-r2.ebuild b/media-gfx/pinta/pinta-1.6-r2.ebuild
deleted file mode 100644
index 71b8c5e2e47f..000000000000
--- a/media-gfx/pinta/pinta-1.6-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit fdo-mime mono-env gnome2-utils
-
-DESCRIPTION="Simple Painting for Gtk"
-HOMEPAGE="https://pinta-project.com"
-SRC_URI="https://github.com/PintaProject/Pinta/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="MIT CC-BY-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="dev-lang/mono
-	dev-dotnet/mono-addins[gtk]"
-RDEPEND="${COMMON_DEPEND}
-	x11-libs/cairo[X]
-	x11-libs/gdk-pixbuf[X,jpeg,tiff]
-	x11-themes/adwaita-icon-theme"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-mono-4.patch"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/pinta/pinta-9999.ebuild b/media-gfx/pinta/pinta-9999.ebuild
deleted file mode 100644
index 69e365537643..000000000000
--- a/media-gfx/pinta/pinta-9999.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit fdo-mime mono-env gnome2-utils autotools git-r3
-
-DESCRIPTION="Simple Painting for Gtk"
-HOMEPAGE="https://pinta-project.com"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/PintaProject/Pinta.git"
-
-LICENSE="MIT CC-BY-3.0"
-SLOT="0"
-KEYWORDS=""
-
-COMMON_DEPEND="dev-lang/mono
-	dev-dotnet/mono-addins[gtk]"
-RDEPEND="${COMMON_DEPEND}
-	x11-libs/cairo[X]
-	x11-libs/gdk-pixbuf[X,jpeg,tiff]
-	x11-themes/adwaita-icon-theme"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	eautoreconf
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/pngquant/Manifest b/media-gfx/pngquant/Manifest
index 8a0b4be63682..f94ac415f9d6 100644
--- a/media-gfx/pngquant/Manifest
+++ b/media-gfx/pngquant/Manifest
@@ -2,5 +2,5 @@ AUX pngquant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1070f9
 DIST pngquant-2.12.3-src.tar.gz 143572 BLAKE2B 6f4cc9f36c9148f36734d9afa3765e206c09e833064cff5d98494d0d71610e857d7c605bc5673eb9fd5b38029ade60c9c1ffc18e745a3dfe5dbde6d39a81d0c7 SHA512 cf39f56750a49b2818fb86b168845e54f3797b664c3f49535ee93a3dc899299192a692039396ffcddc5988d040a778006c5f701f8bcd9f5c73583a47b711b01c
 DIST pngquant-2.12.6.tar.gz 69074 BLAKE2B 3573d54d94b0085de9ffd4dd34a8fd46c49a1e02d0a6419271c17bc7ac7ab6c05d811336a3a8a8ab21d4dea774c93ee1baae141b42c255838fb1eef9cdb1a871 SHA512 8ffff346df67edf1000c71b6d26371826bc4d236b3f57ef1ec73b3b61668cff9c3ca7d541417c39bc6c89e00176c91eb28867b7a91945ac84292ca0ac54984e9
 EBUILD pngquant-2.12.3.ebuild 1169 BLAKE2B 56452f5fa0d76b47151583ef5c4684781eeee2ad12736845790af6ac1a1bb06516c692156a54aa08bcafe5d9df3f5175e3be34e9564e79970ca43cb65428275f SHA512 648727074119405019a00eb3f252ff86e0157874821f3fb9e6025183937cb4639a8b15c19974ee31bb27313cf791a45c8569490e885f0a92b88b1b2d62eada44
-EBUILD pngquant-2.12.6.ebuild 1327 BLAKE2B 7d8064e1ae61ce3e55b0abedd9b1c2110520cb3fd5ce213c54fec4bfd8f351c4589b78cc6e4482897508462012b71c6535a6a7c91bfdeeef70adc12d8af34017 SHA512 20e6faa61a71ad2956e4d23f3c4c2a48a720432167d73e374e316ce299d1c0d30b55a37ef8376ff9b308466c78a7ad58a7aaf7092745e6d2776cca10ee5f6f1f
+EBUILD pngquant-2.12.6.ebuild 1326 BLAKE2B 0936d6d66db8d49e22f868b75060af49defbe24e5dd7f885d3df63d3a7ad06ff3e613fdecf39d4a0bb0a38332731a8d5c9e2e2ab7e53500f286365a78dc2f706 SHA512 c57ccd496ba3abb3851b497cc1a4e411cf53c93222d091ba81c13a90818f514710f43b43becfbd4d35c36d3d885a8e51f1392f2ba802ffbe002dee2528c03a67
 MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
diff --git a/media-gfx/pngquant/pngquant-2.12.6.ebuild b/media-gfx/pngquant/pngquant-2.12.6.ebuild
index 87e336dddabb..c80fb8d347d6 100644
--- a/media-gfx/pngquant/pngquant-2.12.6.ebuild
+++ b/media-gfx/pngquant/pngquant-2.12.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kornelski/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 HPND rwpng"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 IUSE="cpu_flags_x86_sse2 debug lcms openmp test"
 REQUIRED_USE="test? ( lcms )"
diff --git a/media-gfx/pstoedit/Manifest b/media-gfx/pstoedit/Manifest
index b1e1d28045b4..4e44c8d9e427 100644
--- a/media-gfx/pstoedit/Manifest
+++ b/media-gfx/pstoedit/Manifest
@@ -1,5 +1,8 @@
 AUX pstoedit-3.60-libdl.patch 428 BLAKE2B 8ed39e1a13da74ccecaa2aeec57447fc75b682c9ea5a8fe6586052fd766bc9ab23cb76bdc56bb613cb43672f6d10a05cfaa8bc860865d2586673ab4a9c8642aa SHA512 dc29caf4b1bf1e6ce7cc73fd5ae1682f0aba8a798f632d29cca450bf3883afe54142ea06fbe6d9aa07f2580450780afe1c671cb1c37f1dd800582b2036797f73
 AUX pstoedit-3.70-pkgconfig.patch 627 BLAKE2B 00412e11239e49f12babc35f2225c7ac2a25ce62e59d8b3088c0d7284b867c8919dc70c61bc60cea06e75dee84698eaf223861ad8db09cd36dfdf5ee813aee9c SHA512 8edfc9f0c0db6371405ff16641294c8aebb7dc09e9bc8b9114c7506f4fd494f0361b90abceddad68c351baa2d2917b6212056ed69c0a6dde0d914a2c801888ec
+AUX pstoedit-3.75-libdl.patch 432 BLAKE2B 19d6b192c7fa1497f40baff8c039139248be34bbd7f1858e4731da4e631a46dfa8a7e5a9041a5e991a44fb049b0399fad763c65b9a27437d7bcd1d61631fd760 SHA512 010263020e07b57fdde3fa6478cf5865877d71d015a446d8111326d69ce7138467e384bb5f48baa149932a0c4a42d9a60552ff8616125cbc1dabf613cd78df79
 DIST pstoedit-3.70.tar.gz 1013949 BLAKE2B ec459dc56851d942076adf4352ef974188b0b8273a6f9150c8767c1d63c3c9b6d993ea8c0b1a0b59663b31652eb7a4b8697e4c38c23d5aa0572d554120a5e900 SHA512 63668ea039fdf988ba007bafb8dc1f23f06d4eb430a92b97fb93c71b819f63e2708b99476ec9b096598db2ddd30d29a69101f078e7d4fdfec314677f50293cf9
-EBUILD pstoedit-3.70-r1.ebuild 1299 BLAKE2B ec4d5c0837e3bda460b5d12580b46262bc68703352281e6a658664375a65eeb50b3ec01dda1f1b19e6085a965141e5e3f06384ea02f88a884dbcc20efd50a1c0 SHA512 3a33b5d87db3a758d706cb794ba8b1ad797ae66726cded8c3a6ff50908d814a7c0dc28012e99bf09886b1eeb5159a09fbf301f77c8971c84d1edf422b441ab9a
+DIST pstoedit-3.75.tar.gz 1290057 BLAKE2B 607a265ea6f058e1ba432d55c4602452cd52a48302441ecee542a113d90b090ce888cc6fa5e3a8e3a2fdbf94dce9b1ab1f7f5ba58ab81f1f509eea9052a3cd82 SHA512 54b8cf7e78e52027d45e7550821476d9a9c4df4f63af83792b6a2909bc62236450ba6b619f95eede9f61a715f4937f1fbaf2ce4ae4b486daa0294c396a882a28
+EBUILD pstoedit-3.70-r1.ebuild 1297 BLAKE2B 125a79a689158f4a159b94af9e414361c2afd3895fe5ad916a1d50e8f2cf4a7e95828878cb345d6d89a96f5242bd2f3e33045d769cde9fb7df8b92778014fb6f SHA512 a22378c7c78ea1f46843a30d31a99e35579dd8ee7d53fd9512fd93d02c2f22dc84532649929692cf16df6164550aaaadc827c97b9e37653720ba26c30da47db5
+EBUILD pstoedit-3.75.ebuild 1300 BLAKE2B 0b768119f2ee332b2b0ca8aceb1c4607c7ee3a7583f7714812487164755f3d39eccea233abe4fa6d58a7d60478816c36ed269a726163959ae2a69671d687a95a SHA512 b888cd1b2bff870246cac853938c5534c00ea31d5aa9f448b9a74653c995b082bbe319ea300ed3f7e1a91fc4959ac728c650846d43bcb03c3b343fb05c552999
 MISC metadata.xml 633 BLAKE2B 3a142022d38aaf0e5bd5d6df58b8a6e2f94589992eba8a48d875138af60bb44d8893ed91a7dcb169246ff2d2405940c406d5d37f84bfc9c621b8771b96678f05 SHA512 6d62633c23d2b45c5bdf75e8e09e3f58def09a2512e540699857809ea79ddc41c823cc382a9a412b6dc061e02c3b5574c8addc7bebd6e7bb10caa2c2408162a6
diff --git a/media-gfx/pstoedit/files/pstoedit-3.75-libdl.patch b/media-gfx/pstoedit/files/pstoedit-3.75-libdl.patch
new file mode 100644
index 000000000000..33d559164cfe
--- /dev/null
+++ b/media-gfx/pstoedit/files/pstoedit-3.75-libdl.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 9aac694..de0f367 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -143,7 +143,7 @@ libpstoedit_la_SOURCES =			\
+ 	psfront.h				\
+ 	genericints.h
+ 
+-libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -ldl -lm
++libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} ${LIBLD_LDFLAGS} -ldl -lm
+ libpstoedit_la_LDFLAGS = -no-undefined
+ 
+ pstoedit_SOURCES = cmdmain.cpp
diff --git a/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild b/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild
index 2ec54f83bfa5..f56518c824ee 100644
--- a/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="emf imagemagick plotutils pptx static-libs"
 
 RDEPEND="
diff --git a/media-gfx/pstoedit/pstoedit-3.75.ebuild b/media-gfx/pstoedit/pstoedit-3.75.ebuild
new file mode 100644
index 000000000000..da2b4e71c73b
--- /dev/null
+++ b/media-gfx/pstoedit/pstoedit-3.75.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Translate PostScript and PDF graphics into other vector formats"
+HOMEPAGE="https://sourceforge.net/projects/pstoedit/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="emf imagemagick plotutils pptx"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=app-text/ghostscript-gpl-8.71-r1
+	>=media-libs/gd-2.0.35-r1:=
+	emf? ( >=media-libs/libemf-1.0.3 )
+	imagemagick? ( >=media-gfx/imagemagick-6.6.1.2:=[cxx] )
+	plotutils? ( media-libs/plotutils )
+	pptx? ( dev-libs/libzip:= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( doc/readme.txt )
+HTML_DOCS=( doc/{changelog,pstoedit}.htm )
+
+PATCHES=( "${FILESDIR}"/${P}-libdl.patch )
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/CXXFLAGS="-g"/d' \
+		-e 's:-pedantic::' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--without-swf
+		$(use_with emf)
+		$(use_with imagemagick magick)
+		$(use_with plotutils libplot)
+		$(use_with pptx)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	doman doc/pstoedit.1
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index 185afbdef80e..b7eb1f61aa02 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -1,7 +1,3 @@
-DIST qrencode-4.0.2.tar.bz2 430309 BLAKE2B 1f68d2a921ba60df3a6c7381d7886b27a2876f90771d78c12d5d0fed2d6a4edb4d7da5985e2b244406a0cf3434b351fbec8b12c5944c365078ef2b227edb0acd SHA512 2429c7938e32eacbaf327c029c7745ba33259f879661a8b6470cc617c780daf5bd1d5689599151df62e84badd2568eccab6c12f157331e512ab24a3899e0f002
-DIST qrencode-4.1.0.tar.bz2 449040 BLAKE2B cff4e950a436e2bb3a73543ce11639861426840db6861eefd3d641dcb14cd6b4be7c2045468a002f7599a89aa71c77f7dfc971dd726ecce0d524f9b792ea6e91 SHA512 50ccc65f748cc1007dccd8d0eee0063b870c3e8a5fe5b8b2a813881151a86748a36844bcfa6ab08c82674b80e9b5bcbfd564ade92562cc49e01cbfa45376b4a9
 DIST qrencode-4.1.1.tar.bz2 461562 BLAKE2B ae3abb4a162518c0204d09c9df7434fb348e24c20e790a261841220b0a7165168137d5acbdbc53e40558724eac2e1e21786f11013f384b545d56a1c9caaff61d SHA512 981b3242c213e1b40ac88711912dd8c27ea11f3437d1a04b6b226499a6e991a8f0b3b10f818bcc104812192a1dac4ce05f16ecd847a50cb03d4859b84bad89b8
-EBUILD qrencode-4.0.2.ebuild 791 BLAKE2B 59ae47be368e05d95bcc77a0a18165b5d1c961aa181aea6c3c1882c3d6969a99cce6d6e31272a45bbeb478e85d3f732e21d5b9fb7f91e87306fc0d94b3feb15b SHA512 7698b6d3d99e70e37abb1a43bfd643019b411343a578bed7e1905e19db40263158710968e3e9833da20f45412dbce0fcb5f4b3d4c9b1179ce9b20b4356699fee
-EBUILD qrencode-4.1.0.ebuild 799 BLAKE2B 162c9977a8fc2ede9aea8fdca4caeb5a031150b9a6aab825ad48882bc103a4f3c39fee4db434421d3597462deece7260eaad21b461714608f15f7d6df58478c6 SHA512 22404cdc9ba4492f0351cd6fe5788c28fe0f49c6c44df0b7ee526cf3ff686489eda8905d1cac4ccf85c742593fc7e6eb246cac5c0f99af1646567b91bc23bfe7
-EBUILD qrencode-4.1.1.ebuild 799 BLAKE2B 9d085069ad33bbf42477e5c490b7f5be148a4e50682aa613f696b7b56448565b098f7b97daa694482027420879f6a23d861c67df35ba98eefe46fe087b3791e9 SHA512 9a412c5f7a58b6d2625a4099e144d719fc3ed76c3051ef41a184130decdc347f54d45a6d9fa2d03a5a36f524bfe043e3f73d36f9cd454b68d02710924f1a17e3
+EBUILD qrencode-4.1.1.ebuild 791 BLAKE2B 46e8735214b66eda2cef2f9c44d21dfcd4fd61038d784a0ba3c2122d3a79965178252923c2552f5eac98f75420548b80399125e6f7562da4f59818cd1b162f1e SHA512 a64177f469b74fa426c1759db00cd575f67b35140df80a3f82f6bf71df7a554b7cd2a299fbb800b53ed647f3bb57e083924bc0214c2be1c31f25571514c0ed71
 MISC metadata.xml 370 BLAKE2B af379243b15cc55c2e2c14bd20ec8b9bb41d4fbb6a87938aae5cbc39e17c78ac45b322d946eadec59fc48c13354fd9dfdffea8c2572301d8d4cb86f162d49bdc SHA512 f5987a8aab3b861bbe4961c69d0c72b07826c43320fd383075036ad63a070204c6ed41297b2490b4a14224f5c4269c37c40e5abc9bce4d1c5857e68e98d6428c
diff --git a/media-gfx/qrencode/qrencode-4.0.2.ebuild b/media-gfx/qrencode/qrencode-4.0.2.ebuild
deleted file mode 100644
index a17874b37ded..000000000000
--- a/media-gfx/qrencode/qrencode-4.0.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="C library for encoding data in a QR Code symbol"
-HOMEPAGE="https://fukuchi.org/works/qrencode/"
-SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0/4"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="media-libs/libpng:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_with test tests)
-		# TODO: figure out how to make SDL check fail as the SDL test
-		# program is not useful
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	cd tests || die
-	./test_basic.sh || die
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-gfx/qrencode/qrencode-4.1.0.ebuild b/media-gfx/qrencode/qrencode-4.1.0.ebuild
deleted file mode 100644
index 0c26d1d08ecf..000000000000
--- a/media-gfx/qrencode/qrencode-4.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="C library for encoding data in a QR Code symbol"
-HOMEPAGE="https://fukuchi.org/works/qrencode/"
-SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="media-libs/libpng:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_with test tests)
-		# TODO: figure out how to make SDL check fail as the SDL test
-		# program is not useful
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	cd tests || die
-	./test_basic.sh || die
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-gfx/qrencode/qrencode-4.1.1.ebuild b/media-gfx/qrencode/qrencode-4.1.1.ebuild
index 0872a1336274..4819e67172dd 100644
--- a/media-gfx/qrencode/qrencode-4.1.1.ebuild
+++ b/media-gfx/qrencode/qrencode-4.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index 5773724e0441..efbefafb22dc 100644
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@@ -1,5 +1,4 @@
-AUX sam2p-0.49.3-build-fixes.patch 6108 BLAKE2B 85c608628a932c698a5ad7f44394c85138f850f3e4c2807101eab1fefee5721bd76cd3edfebf71d57221b94709e2aa1c09c415821f3128d3ee5f71c37640365d SHA512 70e14339b6fb8f587adc4692982601db0b1d0343a737cf08931101589eaecc419e8f571bd138a6e585a7a9a7a9f2e8f3ebf3ccf4c315d805be9f625a917a56c3
-AUX sam2p-0.49.3-perl526.patch 648 BLAKE2B 0fa1d54116325cfbf1720c8465ddf5d8bc6a3a11843207e075f63ffae803e128e8c961ff9ca33f961f169f1af2f1419bb5edddb139c87a7193da064aab8cc6da SHA512 22628eadcf9399ba89a652ad41ac55e98fdb596df029e466a4bbc609131e914e456451362e8639c98dbf59c7e288296b4940fa2e92d8ce671715103e9b622f0d
-DIST sam2p-0.49.3.tar.gz 2184864 BLAKE2B 47d3ce6384c344f66e564ea9f70e89e311540c1bbaf640a70cec2830347b3767aa79d525d25c12cfc2aecc61aca676239b99b345fc7e6bb2edfac7c60bd8d674 SHA512 9e9c91a2cd692e49bf73e7c197a0fcbe7df96c685636d1d00456eb8b4b847de3f4848d9bb3d9246340c479c62900ddd4e0a248257aa5e6ec6e16683c5dad54f8
-EBUILD sam2p-0.49.3.ebuild 977 BLAKE2B f271f97481d19a1bc58930007ea2674d8237435b3a1ae0977a2a1f784e4d82dbe038982bebb1a458c074180ad8a96da3b0d97e5905f31d8d91256dc1c4efa988 SHA512 274eea35289dc9a180dc0b962e26568e8aeb522edbc6917265cdbd500448aaead014fb7f00bca1d0edbf5d2ba8581e56f1e8c0e4c8c330c30d74fa31ada257e9
+AUX sam2p-build-fixes.patch 1803 BLAKE2B d9c805da6c46f5457cc6006941a1331f0e46ed8fcadf7c73b9a11debfaa7e2f040beeae42aa9cf316a2df71ffe9d136808a1e9ebeea5c146851057a8addb7bf6 SHA512 fa32011db37a74f746542df82f29e7869412cf8ad93d0b4c3c6e100dda06c254f204671199db0d1abd6134975325cb939f65f0a22457a84a78b6b277411ea2f5
+DIST sam2p-0.49.4_p20190718.tar.gz 1816309 BLAKE2B 3d97e00c2bd6b6c292c051d4eb6b73549d1c82a5bd7be3d6b718d8e9d2e96b47657c184af43fa57c0ca4b2b8c26904fb42508d17f7dda715def7d2082affa8b6 SHA512 1c6074fabca6146e51fe0d5a10c912ec679cf122e10aab7bead9e35e3d007e79773aedb1f627572b1b88cacefe0e7edf72efd71d32c47731723b910667220c51
+EBUILD sam2p-0.49.4_p20190718-r1.ebuild 1217 BLAKE2B 729c4c96c26c8fb2ad9490a963d4d48623f3113502e232506eaa3953e6acaa01724d58a3fefd1fa1825d95ee1a44256a0eb805312a73a2e736e5ef22b0fb75fb SHA512 686c9c27eb9d01bf33eeaca50045c14862751c5efa732d28d75c13a96adc105dc1172714f253196d9b0780be12d774d8695baf1bdc318ec42d9f12f420cef912
 MISC metadata.xml 373 BLAKE2B a0a62fca7fbcd916d83a6d7fa8f020c333b529ed06492cd8f52a8e04d228714bd53d1283e0b43f5a0c399aafdaf99b5caa5534a0ba54e1bff4958b4f28e899f7 SHA512 2bac0bb931232d7b994f24551d0fedccfcaf69932e4900264857e9ba09a9c32495ab743c1fe930e63adca3b7bc11efdea526982e6e27869033bc17731fa5c7fa
diff --git a/media-gfx/sam2p/files/sam2p-0.49.3-build-fixes.patch b/media-gfx/sam2p/files/sam2p-0.49.3-build-fixes.patch
deleted file mode 100644
index dfad65cc05d9..000000000000
--- a/media-gfx/sam2p/files/sam2p-0.49.3-build-fixes.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-Fix literal suffix errors in C++14, caused by missing spaces between
-C-strings and macros.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=585630
-
---- a/configure.in
-+++ b/configure.in
-@@ -81,8 +81,6 @@
- dnl Checks for programs.
- dnl AC_PROG_CC
- AC_LANG_CPLUSPLUS
--CXXFLAGS=" "
--dnl ^^^ set it to non-empty, so AC_PROG_CXX won't include `-g'
- CCC="$CCC g++"
- dnl ^^^ check g++ before c++ (see acspecific.m4, grep AC_PROG_CXX)
- AC_PROG_CXX
-@@ -216,7 +214,7 @@
- 
- dnl AC_PTS_RUN_OK([perl -x -S ./ccdep.pl $CXX], [], [AC_MSG_ERROR(cannot compute depends)])
- rm -f Makedep
--AC_PTS_RUN_OK([make Makedep], [], [AC_MSG_ERROR(cannot compute depends)])
-+AC_PTS_RUN_OK([gmake Makedep], [], [AC_MSG_ERROR(cannot compute depends)])
- AC_PTS_OK
- echo "configure done. Now you should run: make; make install"
- 
---- a/gensio.cpp
-+++ b/gensio.cpp
-@@ -494,7 +494,7 @@
- 
-  #if HAVE_PTS_POPEN
-   if (!tmpsname) {
--    if (NULLP==(p=popen(redir_cmd(), "w"CFG_PTS_POPEN_B))) Error::sev(Error::EERROR) << "Filter::PipeE" << ": popen() failed: " << (SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0;
-+    if (NULLP==(p=popen(redir_cmd(), "w" CFG_PTS_POPEN_B))) Error::sev(Error::EERROR) << "Filter::PipeE" << ": popen() failed: " << (SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0;
-     signal(SIGPIPE, SIG_IGN); /* Don't abort process with SIGPIPE signals if child cannot read our data */
-   } else {
-  #else
-@@ -622,7 +622,7 @@
-   if (state==0) { /* Read the whole stream from `in', write it to `tmpsname' */
-    #if HAVE_PTS_POPEN
-     if (!tmpsname) {
--      if (NULLP==(p=popen(redir_cmd(), "w"CFG_PTS_POPEN_B))) Error::sev(Error::EERROR) << "Filter::PipeD" << ": popen() failed: " << (SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0;
-+      if (NULLP==(p=popen(redir_cmd(), "w" CFG_PTS_POPEN_B))) Error::sev(Error::EERROR) << "Filter::PipeD" << ": popen() failed: " << (SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0;
-       signal(SIGPIPE, SIG_IGN); /* Don't abort process with SIGPIPE signals if child cannot read our data */
-       vi_precopy();
-       in.vi_read(0,0);
-@@ -730,12 +730,7 @@
- 
- /* --- */
- 
--
--#if HAVE_lstat_in_sys_stat
--#  define PTS_lstat lstat
--#else
- #  define PTS_lstat stat
--#endif
- 
- /** @param fname must start with '/' (dir separator)
-  * @return true if file successfully created
---- a/in_ps.cpp
-+++ b/in_ps.cpp
-@@ -137,7 +137,7 @@
-     // fprintf(stderr, "bbox=[%"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g]\n", llx, lly, urx, ury);
-     /* Dat: we must call translate _after_ setpagedevice (so it will take effect), at least with ESP Ghostscript 7.05.6 (2003-02-05); BUGFIX at Fri Aug 12 22:49:07 CEST 2005 */
-     sprintf(bboxline,
--      "<</PageSize[%"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g]>>setpagedevice\n"
-+      "<</PageSize[%" PTS_CFG_PRINTFGLEN "g %" PTS_CFG_PRINTFGLEN "g]>>setpagedevice\n"
-       /* removing /PageSize also cancels /a4, /a5 etc. */
-       /* we need `currentmatrix ... setpagedevice setmatrix' because
-        * setpagedevice cancels the current transformation matrix so our
-@@ -147,7 +147,7 @@
-       "/setpagedevice{matrix currentmatrix exch "
-       "dup length dict copy dup /PageSize undef setpagedevice "
-       "setmatrix}bind def\n"
--      "%"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g translate\n"
-+      "%" PTS_CFG_PRINTFGLEN "g %" PTS_CFG_PRINTFGLEN "g translate\n"
-       , urx-llx, ury-lly, -llx, -lly);
-   } else {
-     Error::sev(Error::WARNING) << "in_eps_reader: missing EPS bbox" << (Error*)0;
---- a/Makefile
-+++ b/Makefile
-@@ -17,7 +17,7 @@
- export PERL_BADLANG
- 
- CXXX=$(CXD_assert)
--LDALL=$(LDXX) -s $(LDFLAGS) $(LIBS)
-+LDALL=$(LDXX) $(LDFLAGS) $(LIBS)
- ifeq ($(ENABLE_DEBUG), no)
- CXXX=$(CXD_no)
- endif
-@@ -51,8 +51,8 @@
- IDE_TARGETS_debug := $(patsubst %,%.yes, $(TARGETS))
- IDE_TARGETS_release := $(TARGETS)
- 
--CXD_assert =$(CXX) -s -O2
--CXD_no     =$(CXX) -s -DNDEBUG -O3
-+CXD_assert =$(CXX)
-+CXD_no     =$(CXX) -DNDEBUG
- # CXD_yes    =$(CXX) $(GFLAG) -lefence
- CXD_yes    =$(CXX) $(GFLAG)
- CXD_checker=checkerg++ $(GFLAG)
---- a/minips.cpp
-+++ b/minips.cpp
-@@ -292,9 +292,9 @@
- void MiniPS::Real::dump(GenBuffer::Writable &out_, bool dumpPS_force) {
-   char buf[64]; /* Imp: should be enough?? */
-   if (metric!=0 && (dumpPS_force || dumpPS)) {
--    sprintf(buf, "%"PTS_CFG_PRINTFGLEN"g%s", d, me_psfactor[metric]);
-+    sprintf(buf, "%" PTS_CFG_PRINTFGLEN "g%s", d, me_psfactor[metric]);
-   } else {
--    sprintf(buf, "%"PTS_CFG_PRINTFGLEN"g", d*me_factor[metric]);
-+    sprintf(buf, "%" PTS_CFG_PRINTFGLEN "g", d*me_factor[metric]);
-   }
-   out_ << buf;
- }
-@@ -1044,7 +1044,7 @@
-   } else {
-     d = d < 0 ? 72.0 / -d : d / 72.0;
-     char buf[64]; /* Dat: enough */
--    sprintf(buf, "%"PTS_CFG_PRINTFGLEN"g", d);
-+    sprintf(buf, "%" PTS_CFG_PRINTFGLEN "g", d);
-     out << buf;
-   }
- }
-@@ -1093,7 +1093,7 @@
-     out << (rounding>=2 && ll<0 ? 0 : ll);
-   } else {
-     char buf[64]; /* Dat: enough */
--    sprintf(buf, "%"PTS_CFG_PRINTFGLEN"g", d);
-+    sprintf(buf, "%" PTS_CFG_PRINTFGLEN "g", d);
-     out << buf;
-   }
- }
---- a/ps_tiny.c
-+++ b/ps_tiny.c
-@@ -151,7 +151,7 @@
- }
- 
- static void erri(char const*msg1, char const*msg2) {
--  fprintf(stderr, "%s: error at %"SLEN_P"u.%"SLEN_P"u.%"SLEN_P"u: %s%s\n",
-+  fprintf(stderr, "%s: error at %" SLEN_P "u.%" SLEN_P "u.%" SLEN_P "u: %s%s\n",
-     PROGNAME, curline, curofs-leftofs+1, curofs, msg1, msg2?msg2:"");
-   exit(3);
- }
-@@ -230,7 +230,7 @@
- /** @param b: assume null-terminated @return true on error */
- static /*inline*/ sbool toInteger(char *s, psint_t *ret) {
-   int n=0; /* BUGFIX?? found by __CHECKER__ */
--  return sscanf(s, "%"SLEN_P"i%n", ret, &n)<1 || s[n]!='\0';
-+  return sscanf(s, "%" SLEN_P "i%n", ret, &n)<1 || s[n]!='\0';
- }
- 
- /** @param b: assume null-terminated @return true on error */
-@@ -700,7 +700,7 @@
-   getotag("Abbr");
-   getkey("acount");  acount=getuintval();
-   getkey("xcount");  xcount=getuintval();
--  sprintf(tmp,"%"SLEN_P"u dict%%</I>", acount+xcount);
-+  sprintf(tmp,"%" SLEN_P "u dict%%</I>", acount+xcount);
-   setifmt(tmp,0); copy("I"); noifmt();
-   gettagbeg();
- 
diff --git a/media-gfx/sam2p/files/sam2p-0.49.3-perl526.patch b/media-gfx/sam2p/files/sam2p-0.49.3-perl526.patch
deleted file mode 100644
index cb24dbda1bda..000000000000
--- a/media-gfx/sam2p/files/sam2p-0.49.3-perl526.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 79a7de171f461a1c79089fa770f0da186e87c723
-Author: Peter Szabo <pts@fazekas.hu>
-Date:   Sun Apr 30 04:00:23 2017 +0200
-
-    fixed Perl 5.26 compatibility for perl -x (https://github.com/pts/sam2p/issues/2)
-
-diff --git a/Makefile b/Makefile
-index 849b09d..1791a9c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -71,10 +71,10 @@ sam2p_version.h: debian/changelog
- sam2p_main.o: sam2p_version.h
- 
- xpmc.h: cols2.pl
--	perl -x cols2.pl >xpmc.h
-+	perl -x ./cols2.pl >xpmc.h
- 
- #HQ=perl -e'$$_=join"",<STDIN>; s@([^\w\.\/\-])@sprintf"\\%03o",ord$$1@ge; print "\"$$_\"\n"'
--HQ=perl -x hq.pl
-+HQ=perl -x ./hq.pl
- #%.tth: %.tte
- #	<$< >$@	$(HQ)
- #%.tth: %.ttm
diff --git a/media-gfx/sam2p/files/sam2p-build-fixes.patch b/media-gfx/sam2p/files/sam2p-build-fixes.patch
new file mode 100644
index 000000000000..6a1c80175127
--- /dev/null
+++ b/media-gfx/sam2p/files/sam2p-build-fixes.patch
@@ -0,0 +1,53 @@
+Make stripping configurable, correct CC/CXX/CFLAGS/CXXFLAGS handling, add
+missing include
+
+diff --git a/Makefile b/Makefile
+index 1433167..38bb7cc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -28,12 +28,13 @@ ifeq ($(MAKECMDGOALS),Makedep.force)
+ MAKE_DIST=000
+ endif
+
++GCC_STRIP ?= -s
+ BASH=bash
+ PERL_BADLANG=x
+ export PERL_BADLANG
+
+ CXXX=$(CXD_assert)
+-LDALL=$(LDXX) -s $(LDFLAGS) $(LIBS)
++LDALL=$(LDXX) $(GCC_STRIP) $(LDFLAGS) $(LIBS)
+ ifeq ($(ENABLE_DEBUG), no)
+ CXXX=$(CXD_no)
+ endif
+@@ -46,8 +47,8 @@ CXXX=$(CXD_checker)
+ LDALL=checkerg++ $(LDFLAGS) $(LIBS)
+ endif
+
+-CXXALL=$(CXXX) $(CXXFLAGS) $(CXXFLAGSB)
+-CCALL =$(CXXX) $(CXXFLAGS) $(CXXFLAGSB)
++CXXALL=$(CXX) $(CXXFLAGS) $(CXXFLAGSB)
++CCALL =$(CC) $(CFLAGS) $(CXXFLAGSB)
+ CXDFAL=$(CXXFLAGS) $(CXXFLAGSB) $(LDFLAGS) $(LIBS)
+
+ .PHONY: clean dist dist-noautoconf dist-more allclean distclean dist-install
+@@ -67,7 +68,7 @@ ifeq ($(MAKE_DIST),)
+   #
+   # echo to config.h is needed to make config.h younger than config.h.in;
+   # configure doesn't change the timestamp of config.h if it's unchanged.
+-  Makedep config.h: configure Makehelp.in config.h.in ccdep.pl sam2p_version.h; ./configure MAKE=$(MAKE) --enable-gif --enable-lzw && echo "" >>config.h
++  Makedep config.h: configure Makehelp.in config.h.in ccdep.pl sam2p_version.h;
+   Makehelp:;
+   include Makehelp  # Defines CXX. File generated by ./configure.
+   include Makedep   # Contains ALL+=... .
+@@ -101,8 +102,8 @@ IDE_MODES := release debug
+ IDE_TARGETS_debug := $(patsubst %,%.yes, $(TARGETS))
+ IDE_TARGETS_release := $(TARGETS)
+
+-CXD_assert =$(CXX) -s -O2
+-CXD_no     =$(CXX) -s -DNDEBUG -O3
++CXD_assert =$(CXX) $(GCC_STRIP) $(CXXFLAGS)
++CXD_no     =$(CXX) $(GCC_STRIP) $(CXXFLAGS)
+ # CXD_yes    =$(CXX) $(GFLAG) -lefence
+ CXD_yes    =$(CXX) $(GFLAG)
+ CXD_checker=checkerg++ $(GFLAG)
diff --git a/media-gfx/sam2p/sam2p-0.49.3.ebuild b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
index aab339fb4890..7672df96d2c9 100644
--- a/media-gfx/sam2p/sam2p-0.49.3.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
@@ -1,24 +1,27 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools toolchain-funcs
 
+COMMIT="b953f63307c4a83fa4615a4863e3fb250205cd98"
+
 DESCRIPTION="Utility to convert raster images to EPS, PDF and many others"
 HOMEPAGE="https://github.com/pts/sam2p"
-SRC_URI="https://github.com/pts/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/pts/sam2p/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE="examples gif"
+RESTRICT="test"
 
-DEPEND="dev-lang/perl"
+BDEPEND="dev-lang/perl"
 
-RESTRICT="test"
+S="${WORKDIR}/${PN}-${COMMIT}"
 
-PATCHES=( "${FILESDIR}"/${P}-build-fixes.patch "${FILESDIR}/${P}-perl526.patch" )
+PATCHES=( "${FILESDIR}"/${PN}-build-fixes.patch )
 
 src_prepare() {
 	default
@@ -26,14 +29,23 @@ src_prepare() {
 	# configure.in files are deprecated
 	mv configure.{in,ac} || die
 
+	# missing include for memset
+	sed -i '1s;^;#include <string.h>\n;' pts_defl.c
+
 	# eautoreconf is still needed or you get bad warnings
 	eautoreconf
 }
 
 src_configure() {
-	tc-export CXX
+	tc-export CC CXX
 
-	econf --enable-lzw $(use_enable gif)
+	econf \
+		--enable-lzw \
+		$(use_enable gif)
+}
+
+src_compile() {
+	emake GCC_STRIP=
 }
 
 src_install() {
@@ -41,6 +53,9 @@ src_install() {
 	einstalldocs
 
 	if use examples; then
+		# clear pre-compressed files
+		rm examples/*.gz || die
+
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
diff --git a/media-gfx/sane-frontends/Manifest b/media-gfx/sane-frontends/Manifest
index e325a411d817..43840f189b08 100644
--- a/media-gfx/sane-frontends/Manifest
+++ b/media-gfx/sane-frontends/Manifest
@@ -1,6 +1,6 @@
 AUX MissingCapsFlag.patch 417 BLAKE2B 5382644f1c8af41fb383bf9889528f279bbac0a18ee2e38f080769b653f24fc02dec53f88f364441d8ceb6d401ad70137215627a181434f6cfcf8245a1d6c37c SHA512 39790a52414a7edcfc4dd9379bd8f35ce91e932209ba9c2ab3f1cb9e5dd140b37f3bfed1e642050a142da43ae435329ab60e201f2934be76648380615a3f37ef
 DIST sane-frontends-1.0.14.tar.gz 231892 BLAKE2B 3d3af2ded774fa90ba4b9545a00df1f036fc72edb71a69f803dde84ca1e9d37b4d20ac91d046ce702c31eb7353d2d85b91cbf8bd53b84adea7f2e58f8be1a062 SHA512 51b24a9bd6889e99419c1d6abb30cb14d8f89b6196c5147044697bdb1b39ee029bdc0d7c6e1f1e800491988aa26f658bc974b25040c49d008ca8977673c78710
 DIST sane-frontends-upstream-1.0.14.tar.gz 233587 BLAKE2B 69e34ed783cff68879b92d478195fe8c67f29d8904e22bdc62deb7310e8ac73d1ce6fc89ee0eafe3e2460f54cec257dbfe28843aec679cfe8669be6c5fc0e2bd SHA512 ffb854f4f4fd08a98395f325c22aa81924ac1e0827e795107bf01f3c42c2cd64bc204c79bc5ec8fd570746d039eae87a2da9cdf30b7f4640442a33c6495d35f8
-EBUILD sane-frontends-1.0.14-r3.ebuild 1325 BLAKE2B 15ca465ddb4abdc4da68f09ae7f4e764ef39c3fdb15694ec30dfc7ddebb4dd3a618f3c4ff2e99251fb41e5ba20b4e3fc2bac54d7141319b8dfd692c2dc6e8926 SHA512 80071ec62e4d7a952bc78b7d93e0631694c30a333a22a0640b68797bb2d9e5b04b3746401b7b2339e891f40474cc7cabad9d57aba1778faae44991f04ecd52d0
-EBUILD sane-frontends-1.0.14-r4.ebuild 1472 BLAKE2B 346d15cc4d372c1f58615595e76c1875356a2b12c0fa27fb9e896692c5ad7ff96af481f7f3febe8d4672201bee95dec99cc92a39d88b882f7a9c38e55cac0ef3 SHA512 82ae275c29f2b817ac66cd8c70d707629a344f1d1ec4eb3a22158bec687870b82634889047d3429fdf7d18a26d5ad9f83894c6a058278d7c780bf52ecb4492cf
+EBUILD sane-frontends-1.0.14-r5.ebuild 1327 BLAKE2B 47d1bf4de1aeaccbfe509b43e67b9b304dbc3f043f9c52191aa68def6728c34ef1e6d90eff2f13d58a10cb95ca13b4d057b31c251e02691724396ab41c1d441f SHA512 0d6b6c59126be879f88beffb63e442777b475bc6b4dce458e093dfcb9b17a41ffa3fd5c67731cd5a4dda20044d7bf83806a9d9a3010a40c5d6128c2c93e1ea4a
+EBUILD sane-frontends-1.0.14-r6.ebuild 1481 BLAKE2B 623302c76649708361c2306f653c6197988c438ea1fa4cc864c6b3746c855a3bf812dce266f11bfb8e867028c40ea15d91d9a8e4704fcb00f99b2e3c469131d4 SHA512 0d5cffda3cc018817c90298cd8db9599cddf0d389effaffc193f6d23cc4cc3dae116302b90293e82fc52a49612a408937cc799c826d579e78348e7317c7727ee
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild b/media-gfx/sane-frontends/sane-frontends-1.0.14-r5.ebuild
index 47701fce5177..c4179ca68c95 100644
--- a/media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild
+++ b/media-gfx/sane-frontends/sane-frontends-1.0.14-r5.ebuild
@@ -14,7 +14,7 @@ IUSE="gimp gtk"
 
 RDEPEND="
 	media-gfx/sane-backends
-	gimp? ( media-gfx/gimp:2 )
+	gimp? ( media-gfx/gimp:0/2 )
 	gtk? (
 		dev-libs/glib:2
 		x11-libs/gtk+:2
diff --git a/media-gfx/sane-frontends/sane-frontends-1.0.14-r4.ebuild b/media-gfx/sane-frontends/sane-frontends-1.0.14-r6.ebuild
index 7db138001934..536c072960dd 100644
--- a/media-gfx/sane-frontends/sane-frontends-1.0.14-r4.ebuild
+++ b/media-gfx/sane-frontends/sane-frontends-1.0.14-r6.ebuild
@@ -9,14 +9,14 @@ SRC_URI="https://salsa.debian.org/debian/sane-frontends/-/archive/upstream/${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="gimp gtk"
 
 REQUIRED_USE="gimp? ( gtk )"
 
 DEPEND="
 	media-gfx/sane-backends
-	gimp? ( media-gfx/gimp:2 )
+	gimp? ( media-gfx/gimp:0/2 )
 	gtk? (
 		dev-libs/glib:2
 		x11-libs/gtk+:2
diff --git a/media-gfx/scour/Manifest b/media-gfx/scour/Manifest
index 95fe86d4c418..5f32b0bcb4bd 100644
--- a/media-gfx/scour/Manifest
+++ b/media-gfx/scour/Manifest
@@ -1,3 +1,3 @@
 DIST scour-0.37.tar.gz 95478 BLAKE2B f3037b691b110f84266c742ac1212a8069e0ac1260f818610dfecc7ee64a257d9e0772c7c675e4062286cf4b719fe48782c416a0cb85a136ea315b22da58c460 SHA512 ffc9bd33eec038126d781dac50c89e4275d0d5e14ec2b2247a7727af91ac2ffe5522c69b5386f75df67a0b88f8ed62cb6a2ad47d600e55b123d937ba33e9e501
-EBUILD scour-0.37.ebuild 714 BLAKE2B 815aafbedcabb398269b8e7a374a06247207361d7c16f2f112d9e099ed81feb0b7c330e8157e0bd13953c3439df3f0515783cbd0d451141b9686f97cc1fe3daf SHA512 8d856e2fc7fb9b93670fd69564e973be5ec4452c99e83c6cef0b0dbb8486866c7d00d03ca4f29c8bc06b38d972faf7dcf5b64dd4734a6aeea92e1593f0c4167b
+EBUILD scour-0.37.ebuild 713 BLAKE2B de315366c00d8a003caf02d9b0720ee167612747e00e588a681130d631d62d24d8d70f49cf7af7d28f1c729593534b4ddb5a10471cac5e3af7115df2a3d3df75 SHA512 27b44365996613023de73b1c984a27ca0571c21b77644cc80dced11bb1ca6c5cb4114c859c74d01e5f73ffa8baad06b0ab9a65cf1d221d1eaad4007cb7976923
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/media-gfx/scour/scour-0.37.ebuild b/media-gfx/scour/scour-0.37.ebuild
index 17f4bd745571..14ba7f0dcc4a 100644
--- a/media-gfx/scour/scour-0.37.ebuild
+++ b/media-gfx/scour/scour-0.37.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/scour-project/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0"
 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=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index 6bcdebfad5a6..350cb798fd2f 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -11,4 +11,4 @@ EBUILD scrot-1.2.ebuild 920 BLAKE2B b00fcbdf7665347b42716ce8ab78b8f6965f90b4b1f1
 EBUILD scrot-1.3-r1.ebuild 971 BLAKE2B f4daabaf37c8e2d6ea724d1b96f12928b4f5ece6301a0fa44dcffbbfdf00d4b213f56b5b066116b64eb45bb78100c9b9fd2fb451e2e8d9da664b9624c7f67c63 SHA512 552252c5ca01774197b34dd862a458399004f5be2f78b5d889176c0ebf072b05b08cfa842953205dc64da4ed3d4d011f81fb964a071992ea5b772c0ae69fcacd
 EBUILD scrot-1.4.ebuild 1040 BLAKE2B 6b990c2fbc01356181fef511a83b866903964d68cbef468036fe28ab49987994ab1b4b61fc835eff726deff4b00f3346acbee91231e4ec4f8f84da0c4ded499c SHA512 65b973c0a9211d25e41397cb3407b694a2d1aa253c86a9b9342c2c39ebc65a805d5e30cabd152bb57e39517b1d0e9f76d4b219fb613618931143054de11b52d5
 EBUILD scrot-9999.ebuild 962 BLAKE2B bd263137adf2fa88b029f8b38b92d86219308cdf290b775334fd28bd0f4e51b2a10bb6726b8f6c568a5fa5b309ec7b71199958b7030374bdfb6cb83ede7a0121 SHA512 2eddd1a3086c9b834ead426e1df2c0aa84a85021aa7606d30d92a23ad0e2869a99a9ff248f6af960a28082555f68a823d448837a9f70892c49ec9a8ea5bd9903
-MISC metadata.xml 211 BLAKE2B 3e8296d37e4cf92be5d17d7f263807fad2fc9685607894f9f269f3123987c3baeff7fce17f80480419fb68f2eac48919541cd7aaa21de659d95dd647e05ade48 SHA512 58d7fc7dd62d18c69c3b30062d76c291bc795b7a53804d1380fc49ed6f6a4389805c327633297b9c56c40cbae9a6e5608e12d8a64c01e370954e551246c4b486
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/scrot/metadata.xml b/media-gfx/scrot/metadata.xml
index 132a3b9b4743..6f49eba8f496 100644
--- a/media-gfx/scrot/metadata.xml
+++ b/media-gfx/scrot/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>jer@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 649d8e0f9df2..efd5c74587ab 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,5 +1,5 @@
 DIST shotwell-0.30.10.tar.xz 6465992 BLAKE2B d6be2a2b34cf4adbae4ac1f2bce5a29bfe059c546b8ab76f35b3ac9159a9233f231ee1ac4b3f81e8016278fcdec6b222af3ba7a62b2eb8d15dd82ef2cfb544c1 SHA512 4c84b5702476f264bd475fa93eff2e58f2876b076f186fc19b3dbddaae76b80485793b887f668788ac3c7f7230eb0c6a61fef2c0c70d52c665d0e49f6deb0b11
-DIST shotwell-0.30.9.tar.xz 6465508 BLAKE2B 9b302d156b350d5cfa961afaa5d75e71db8b34a65a27de0d3b298841ca9be96d502dc98c85c681ca336965fce72db8034609f3f9c6c04fea1127db6c397e6499 SHA512 a232d717356d7e9f0a6b1ad825f4182dd9f6ee4cca9745717e3bd18ded03cdaba94c32256d055389ce2b0cda0c5828b25d1448c10598a474dc3ea0817fc303ee
+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.9.ebuild 1768 BLAKE2B 0330351fb22d25299ffeffbfd1d202d2fad725619157fe0ebfae5859f5a6ddcb5fea9c845d7c41d990d8f1205dbf36c99600a1f707a2ac1c202a38de3742ab01 SHA512 46dac08f76651649c187833065dd1ce7829f42f4ddb84e829bacaa25eb7ab5d9f22397f392ca1e60e796940490b396e461c93c08e1289f1085725d842643f29e
+EBUILD shotwell-0.30.11.ebuild 1771 BLAKE2B 547d2bf462331d8b50eb2df2eaaf71bd1fab2ec7816d8e3e4b01317c0c6617b136f6ffcbfdd66235b85fe1924e6a59f9a93cbb6cff12b3bea1a243fefccf8d1f SHA512 4c0cc1fd43a65f197a906398a7022efb76811c417ca0eabe84de48771da6a2eb235aaaef5b678dc98638a958945996ec44e68ad95d56a2ea7fbbbea5058fd882
 MISC metadata.xml 795 BLAKE2B 4b5da2cc205b128a0cb9d10a50c3743b8d12302d266e37d5e0479915824af75af8c22b7b12ffca57146aa0a999e2bff3d7c4969af9e19f317a70b9195b02333f SHA512 d3ceceeed90fd4cadd5e212d047b3d6f7882860d145cb80521a4db8e9baaf461910ff70cb5bb2c1cda991939bf2c8917bb7f252bf68c7487d40271b0419c6322
diff --git a/media-gfx/shotwell/shotwell-0.30.9.ebuild b/media-gfx/shotwell/shotwell-0.30.11.ebuild
index 37d81390d3f9..b65b5be27d2a 100644
--- a/media-gfx/shotwell/shotwell-0.30.9.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.11.ebuild
@@ -11,14 +11,14 @@ 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="
 	>=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
+	>=net-libs/webkit-gtk-2.26:4
 	>=dev-libs/json-glib-0.7.6
 	>=dev-libs/libxml2-2.6.32:2
 	x11-libs/gdk-pixbuf:2
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index a53fadd2d56a..462f191f0d62 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,6 +1,4 @@
 AUX 3.26-add-control-optional-deps.patch 2773 BLAKE2B e6c3faa98ecda13c926752defef389fd155f615df2010d8499aba7870b929f520662f5c718f457edd5f14f68c26d63ab58a5ee1a583af9f5721d4cf4141385a8 SHA512 e786172609ca64afa85663077794cb146edf7f59bd6187bc253d2ab682f5cf244f5238df18648641f7450ce6add97f2db1adfa11b52a3ba5e29c16356e9fac08
-DIST simple-scan-3.34.6.tar.xz 801064 BLAKE2B 94c6bc386c2d7701bd13067e384eb294ce145d2e02d66e366e76a2c85fb5e3ac4e9bae0efa37fe13d3fc857b57c1730bf01961f7968d6744a4ea4dc47308cb23 SHA512 7b2d0eab13f08d4110d2143c4572e249297891e3868e6eb178a7a765b2d56960820931fbda538ede318014c578871657aa0e27518d184f861efc18ad4fdd900c
 DIST simple-scan-3.36.4.tar.xz 914688 BLAKE2B ae972cf6b5085d0e79fdfa9250aed655051b97239988b410e175b3058dda3ed5dc19b6574c015dd9a7afcbefd4d05cce6120b3648c061ff1e52043f866769a62 SHA512 780eeabd9593f14b2b04b9474bb1faebe3a32a7fd7e6b067c144fe44ad9b880f307bf80a8a925fb2549ca0b8172357c9a393146dfabd4b68bfc4396c32de4fa8
-EBUILD simple-scan-3.34.6.ebuild 1327 BLAKE2B 9fc4b9c2f9d3536f3bd43c6902576f8241555a98ce6a0789572ec3169f783053e5a30462021221a324547ff5e8e19d51fd0bfe63c31875173b5e612fb3c7d192 SHA512 99364ee3c39e21e47bdb790780f48c74b2132a9f2c658f7a6dd87a2c634981372c0499e72b4f6aee28b90d3ffe2901b3381e8252d6d86413ddeb3079be9b0ee7
 EBUILD simple-scan-3.36.4.ebuild 1327 BLAKE2B 9fc4b9c2f9d3536f3bd43c6902576f8241555a98ce6a0789572ec3169f783053e5a30462021221a324547ff5e8e19d51fd0bfe63c31875173b5e612fb3c7d192 SHA512 99364ee3c39e21e47bdb790780f48c74b2132a9f2c658f7a6dd87a2c634981372c0499e72b4f6aee28b90d3ffe2901b3381e8252d6d86413ddeb3079be9b0ee7
 MISC metadata.xml 616 BLAKE2B 576d986402f8cc708eae60f661640808751747c764d5fe729dd014f33758e0b484a2b80a214d9a3d1ed4bce7e455e34803a62048240e5de8e203184446cdc0df SHA512 6377cb9c20b1ce2db22ba959d386e4389939b72503d87da956d659144b8a6f8b521abdd19dd4c82ac0cb32e260ce6633b75136a353f63b86593f5e1f12394d47
diff --git a/media-gfx/simple-scan/simple-scan-3.34.6.ebuild b/media-gfx/simple-scan/simple-scan-3.34.6.ebuild
deleted file mode 100644
index a519c8b9e1ba..000000000000
--- a/media-gfx/simple-scan/simple-scan-3.34.6.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
-VALA_MIN_API_VERSION="0.34"
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Simple document scanning utility"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="colord webp"
-
-DEPEND="
-	>=dev-libs/glib-2.38:2
-	>=x11-libs/gtk+-3.22:3
-	>=sys-libs/zlib-1.2.3.1:=
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	>=dev-libs/libgusb-0.2.7
-	colord? ( >=x11-misc/colord-0.1.24:=[udev] )
-	webp? ( media-libs/libwebp )
-	>=media-gfx/sane-backends-1.0.20:=
-
-	virtual/jpeg:0=
-"
-# packagekit? ( >=app-admin/packagekit-base-1.1.5 )
-RDEPEND="${DEPEND}
-	x11-misc/xdg-utils
-"
-BDEPEND="
-	$(vala_depend)
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	dev-libs/libgusb[vala]
-	colord? ( x11-misc/colord[vala] )
-"
-
-PATCHES=(
-	# Add control for optional dependencies
-	"${FILESDIR}"/3.26-add-control-optional-deps.patch
-)
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use colord)
-		-Dpackagekit=false
-		$(meson_use webp)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index 57dce906eb79..9f33509616c0 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -7,5 +7,6 @@ DIST slic3r-1.1.7.tar.gz 2079200 BLAKE2B b3aa45741bb92a75dd09be783cb9a8cd551c773
 DIST slic3r-1.3.0.tar.gz 2104094 BLAKE2B 74c58690cf196f89ecff5eec853215c87c648df5a504725fea9f14b0343bca105190de1d63e2e8e76d47fcaf8dbe7b6d26f61b304ce7336412effa1c9a3fba41 SHA512 ff0f7747e166826ff1c53220974ee9d3a217d0e19964dbe4a5fa3e81f262a6810a47632686b7f1b3128384ae05c6f98d8aab980524079bdf9811445fe23a0f0d
 EBUILD slic3r-1.1.7.ebuild 2934 BLAKE2B 12740144adbadb8ef668003b7c1391b5e124208d02a5f9fe89d17a95e2ced01c04421f985b2aca1e3ddb4df34e7fdedc71af3d0e8dcbc76d85805fcc7c030b2a SHA512 b6b2c92e011e473cdd4934ae43e0ab32556fee66008bab3a397a2ac2f9b78d747eca30a4b794d3955d04f040e260fb5857ebbd6ab08250f611eb76f3faa1c623
 EBUILD slic3r-1.3.0-r1.ebuild 2885 BLAKE2B ef50ccee25ce363aea8b5a678e9e0d3e49182739c71311dcc1417420ab028663e1f74011b8b710e900710eda870c632f783cbe3428a5f6c786256b41e421b60a SHA512 5cf3b715822f7217b38d2fb8ceef29de8684742b16b27f7ac50aeaf3d7df326373e9ff1f9112b816e5c7728a06ebd49292b4376f948671940e6b1577078fe177
-EBUILD slic3r-9999.ebuild 2689 BLAKE2B 1aa5771deef7a1b0b475ebdfb28a1b7866be011da3207fbd7ffa3a215bb4f154afbe2a540fee751d776117be0ffef6d53ac5f837b6d0705239108ab7b5f8d73e SHA512 c96177d936221f8251b3859b24b64a9188eb814354e5a2c849ae87170c5791f8f4433bd020196f1a6c931296f3624eabbaa3b697937d1f1bee2d9b918dd519ab
+EBUILD slic3r-1.3.0-r2.ebuild 2896 BLAKE2B b02342bf78e7a0a90af62a5dc5d0c430763e04d7ea6bd474404ae60380e75edecc9f86e6bd26433081461a9903d7c01487b9eca1938e4c7bf08a4a100746323f SHA512 9f40f4d2e8e454bb9f3419e96b05ed8ee0363f3e61ecea3828deb2bcd24debb7d856ecd7693fe8053c7a126c2be46b054b5effdd3bab034c3e9af7c56aed239f
+EBUILD slic3r-9999.ebuild 2700 BLAKE2B 3977555fb2da32181d4ef307e7666ed1ff33d1384644e724cec22e7e7f185b6f2bb5faa8d8f020a217a3fcab1ffe61a6332302ec3db258a623cb3d7b9a6787bc SHA512 af562137cbb1306cfaae9b7cb017d2fb44c17147c9101fee74c1f9e96eee22aa6558567b42777cf8711ce182f0587e1049f5231100fbfff53f99fea8f40f0fca
 MISC metadata.xml 797 BLAKE2B bc34024c8f935d21985d572971a3c28b809dd54e8af65092c98f0f18e9229f9e945732bd36e9620c542260d692e3259aebc38de68c9baca8ba9fa67c3c312cc5 SHA512 13a72e511f2341c9cecc05eca767c348c595d77de4a41a154da93d6bcb31710f24bc51a23abefb08719718194ab3961d3f94697ed97319936e5d9ce625f82da5
diff --git a/media-gfx/slic3r/slic3r-1.3.0-r2.ebuild b/media-gfx/slic3r/slic3r-1.3.0-r2.ebuild
new file mode 100644
index 000000000000..60c8950aab45
--- /dev/null
+++ b/media-gfx/slic3r/slic3r-1.3.0-r2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic perl-module
+
+DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
+HOMEPAGE="https://slic3r.org"
+SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gui test"
+RESTRICT="!test? ( test )"
+
+# check Build.PL for dependencies
+RDEPEND="!=dev-lang/perl-5.16*
+	>=dev-libs/boost-1.55[threads]
+	dev-perl/Class-XSAccessor
+	dev-perl/Devel-CheckLib
+	dev-perl/Devel-Size
+	>=dev-perl/Encode-Locale-1.50.0
+	dev-perl/IO-stringy
+	>=dev-perl/Math-PlanePath-53.0.0
+	>=dev-perl/Moo-1.3.1
+	dev-perl/XML-SAX-ExpatXS
+	virtual/perl-Carp
+	virtual/perl-Encode
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+	virtual/perl-parent
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Test-Simple
+	virtual/perl-Thread-Semaphore
+	>=virtual/perl-threads-1.960.0
+	virtual/perl-Time-HiRes
+	virtual/perl-Unicode-Normalize
+	virtual/perl-XSLoader
+	gui? ( dev-perl/Class-Accessor
+		dev-perl/Growl-GNTP
+		dev-perl/libwww-perl
+		dev-perl/Module-Pluggable
+		dev-perl/Net-Bonjour
+		dev-perl/Net-DBus
+		dev-perl/OpenGL
+		>=dev-perl/Wx-0.991.800
+		dev-perl/Wx-GLCanvas
+		>=media-libs/freeglut-3
+		virtual/perl-Math-Complex
+		>=virtual/perl-Socket-2.16.0
+		x11-libs/libXmu
+	)"
+DEPEND="${RDEPEND}
+	dev-perl/Devel-CheckLib
+	>=dev-perl/ExtUtils-CppGuess-0.70.0
+	>=dev-perl/ExtUtils-Typemaps-Default-1.50.0
+	>=dev-perl/ExtUtils-XSpp-0.170.0
+	>=dev-perl/Module-Build-0.380.0
+	>=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 )"
+
+S="${WORKDIR}/Slic3r-${PV}/xs"
+
+pkg_pretend() {
+	einfo "Checking for -std=c++11 support in compiler"
+	test-flags-CXX -std=c++11 > /dev/null || die
+}
+
+src_prepare() {
+	pushd "${WORKDIR}/Slic3r-${PV}" || die
+	sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die
+	eapply "${FILESDIR}"/${P}-no-locallib.patch
+	eapply "${FILESDIR}"/${P}-boost.patch
+	eapply_user
+	popd || die
+	# drop std=c++11 to compiler defaults...
+	sed \
+		-e '/c++11/d' \
+		-i Build.PL || die
+}
+
+src_configure() {
+	SLIC3R_NO_AUTO=1 perl-module_src_configure
+}
+
+src_test() {
+	perl-module_src_test
+	pushd .. || die
+	prove -Ixs/blib/arch -Ixs/blib/lib/ t/ || die "Tests failed"
+	popd || die
+}
+
+src_install() {
+	perl-module_src_install
+
+	pushd .. || die
+	insinto "${VENDOR_LIB}"
+	doins -r lib/Slic3r.pm lib/Slic3r
+
+	insinto "${VENDOR_LIB}"/Slic3r
+	doins -r var
+
+	exeinto "${VENDOR_LIB}"/Slic3r
+	doexe slic3r.pl
+
+	dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl
+
+	make_desktop_entry "slic3r.pl --gui %F" \
+		Slic3r \
+		"${VENDOR_LIB}/Slic3r/var/Slic3r_128px.png" \
+		"Graphics;3DGraphics;Engineering;Development"
+	popd || die
+}
diff --git a/media-gfx/slic3r/slic3r-9999.ebuild b/media-gfx/slic3r/slic3r-9999.ebuild
index 61ef1b641af8..404994de740e 100644
--- a/media-gfx/slic3r/slic3r-9999.ebuild
+++ b/media-gfx/slic3r/slic3r-9999.ebuild
@@ -106,7 +106,7 @@ src_install() {
 
 	dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl
 
-	make_desktop_entry slic3r.pl \
+	make_desktop_entry "slic3r.pl --gui %F" \
 		Slic3r \
 		"${VENDOR_LIB}/Slic3r/var/Slic3r_128px.png" \
 		"Graphics;3DGraphics;Engineering;Development"
diff --git a/media-gfx/symboleditor/Manifest b/media-gfx/symboleditor/Manifest
index 68fb0fa552c5..8b758f6e4cbb 100644
--- a/media-gfx/symboleditor/Manifest
+++ b/media-gfx/symboleditor/Manifest
@@ -1,3 +1,3 @@
 DIST symboleditor-2.1.0.tar.xz 495416 BLAKE2B 5f5d5a60806ebf0dacce5dcff538ac0f2c4966b2f2bda79450f66515d8572dd61a67db5e4d0f91b548a62c14e4e14aea283b710dc2a7c84770eb35dd22e20699 SHA512 dc83f3f80b12d8217a230d8c951e90bcc6246c4460d987efb140c54c1e88a8f5d607ac7ebfe706399cd0917e22a2089df6742afadd28305d39ceeff0c55da535
-EBUILD symboleditor-2.1.0.ebuild 1030 BLAKE2B 2e192ec790b1dd342b5a478b335ef0f10bce4fbc5a3ef8afb6f9339a96f1ae6e6ad1c7b6fa113e9c3bf92f0556ca6303c60afe7904a234ba0261d704a979723e SHA512 39335aeacbd8d28305484df29dd685685ede38ac3189f9fa93cfe42cdfb34e32d333163550c114582c5dd169fb9eeb31ca7723bb2d892c5c9dae187c7f5a1891
+EBUILD symboleditor-2.1.0.ebuild 1008 BLAKE2B 93518cb75dc6ea88254f5f8d2364b8ecb355eace0644fc2fd41343166e4b07914cd4cea95874ad61d47a24ff21fe6795c75bf05dac2ab7bab238cd462e877dad SHA512 3d1d9650ad766eacac0706d1afbbfacfc0eb735a8d372290cf14157936d40368ca1f9cb8ff4701825f7eeb600d393f0390440275845a0524ed865909bc06be2c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-gfx/symboleditor/symboleditor-2.1.0.ebuild b/media-gfx/symboleditor/symboleditor-2.1.0.ebuild
index 7ed8ac948d21..5d69fe765308 100644
--- a/media-gfx/symboleditor/symboleditor-2.1.0.ebuild
+++ b/media-gfx/symboleditor/symboleditor-2.1.0.ebuild
@@ -9,7 +9,7 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="Application to create libraries of QPainterPath objects with rendering hints"
-HOMEPAGE="https://kde.org/applications/graphics/org.kde.SymbolEditor
+HOMEPAGE="https://apps.kde.org/en/SymbolEditor
 https://userbase.kde.org/SymbolEditor"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
diff --git a/media-gfx/termtosvg/Manifest b/media-gfx/termtosvg/Manifest
index 7fb7fdc8f6fd..9a7930d4db16 100644
--- a/media-gfx/termtosvg/Manifest
+++ b/media-gfx/termtosvg/Manifest
@@ -1,7 +1,3 @@
-DIST termtosvg-0.7.0.tar.gz 276936 BLAKE2B 530bd3ef17aa19cbc23e46e7aea4716dda9369979ae97609ac6f976fecd4f75652b23f47ccf4da8035175f281d1a80b340acc714391882365c01764a92e4588b SHA512 085f6b9728cc641b058c8a060420e8221659a9447119d2c1211cfcd6452c63a187c5dc1e4f98fc7aca2018161ae49a9a71b2264108c5e06167eaaaf18f5aa291
-DIST termtosvg-0.8.0.tar.gz 211057 BLAKE2B db34f9b29a05576e8f2c4ac5f6ee606c61ac88d7a169e43e02655c54bc26fff7c8c37c7a7e96cdf84a015f8dfbe8c953c625f27aeda9ab0568751a0c24e84ae6 SHA512 7688abddff7d1d600a9c86364518418a1a2ad809c5bb0dca2920542af1c0c0c725a11f76b939ded5b671f5bc8f64bfa198b340465d74243983867689c1940bc5
 DIST termtosvg-1.1.0.tar.gz 385300 BLAKE2B 63750444014ab6451ef32d884f9ccc095b58171438f0b5326d5bcb77ebb87daf6f212cf0c07ef426859b9a50dbcc9e77325ab6901f2a6ff95f43cca26c948010 SHA512 4e5000d885b2ac4fc281d9f45c3be3d6b4c93ed604d2d929471843edc7e0ee78a8cc5ee28f92b51050d3f46d3302a2dcbbba3c9a2a3775eebe87d8171c1c6e8d
-EBUILD termtosvg-0.7.0.ebuild 649 BLAKE2B 7b6e6981bd5daaceb6eb86c39c3f10ba348bcd2d912eca0898c16fd80d6176a0e80d8b3aefefd00c26fa7f41ca77d70415257ae8cc0dd0af9e12d1499f9d04ad SHA512 fbcf06b1a18068e756ea46ec2505c90bce096748baf33e3fdc6e5050d30139a1d9b18f5cd4ac97c06d007d1a5a475ef60a85df6d3cbb06ec591453a60beba3b4
-EBUILD termtosvg-0.8.0.ebuild 649 BLAKE2B 7b6e6981bd5daaceb6eb86c39c3f10ba348bcd2d912eca0898c16fd80d6176a0e80d8b3aefefd00c26fa7f41ca77d70415257ae8cc0dd0af9e12d1499f9d04ad SHA512 fbcf06b1a18068e756ea46ec2505c90bce096748baf33e3fdc6e5050d30139a1d9b18f5cd4ac97c06d007d1a5a475ef60a85df6d3cbb06ec591453a60beba3b4
-EBUILD termtosvg-1.1.0.ebuild 568 BLAKE2B 9490105e7d632a25b53960bc38940ec4fc7500f7aadeac9750113a329325b710e55c45529e38f631f203994c88291ada0df74f09a075c8508af22c792acc894f SHA512 26090a0ee43f28abc54f38acf29063f6a15aa55b7f5f95e875414210a59e07cda4859987e268f377240f749bb5099d9bcd3e69fd2a125fef71f80ee04fb233dc
+EBUILD termtosvg-1.1.0.ebuild 567 BLAKE2B 1c0b5e5f1da9e01ec5e6f6945a797d82ec06a69bc97fc029946285c8a461f8ee81310051f5687dceb7cf38ff777dd9d72582c3cacf96dce2b3f4cab6ea68c51b SHA512 5b618aae426714dfa32a6982b352ea193b3beb5450f4e9dcf8242b91f049deb9944539ab064545e585d4a84cd735a86c6e465be2f50cbe95b93f3bb345c8d780
 MISC metadata.xml 212 BLAKE2B cc81de7077d569b2a0afc40390d2be47ddc84045da2c51b7a2e19fca5a5f28548ec0bbc2010b6936d5ab5c96442011ddd0833b7b594df2c2cf9abab99d99a3ed SHA512 1d2f2ca333bf8a1aba058691921bf03d664a0d4c213c4435a068893b2e50a6e86c01e07a17819600eaee93b72d9deff052fc12b10ee3ae8437e13eb17a40bc08
diff --git a/media-gfx/termtosvg/termtosvg-0.7.0.ebuild b/media-gfx/termtosvg/termtosvg-0.7.0.ebuild
deleted file mode 100644
index 47a2f11c4652..000000000000
--- a/media-gfx/termtosvg/termtosvg-0.7.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Record terminal sessions as SVG animations"
-HOMEPAGE="https://github.com/nbedos/termtosvg"
-SRC_URI="https://github.com/nbedos/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/pyte-0.8.0[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" -m unittest discover -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/media-gfx/termtosvg/termtosvg-0.8.0.ebuild b/media-gfx/termtosvg/termtosvg-0.8.0.ebuild
deleted file mode 100644
index 47a2f11c4652..000000000000
--- a/media-gfx/termtosvg/termtosvg-0.8.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Record terminal sessions as SVG animations"
-HOMEPAGE="https://github.com/nbedos/termtosvg"
-SRC_URI="https://github.com/nbedos/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/pyte-0.8.0[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" -m unittest discover -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/media-gfx/termtosvg/termtosvg-1.1.0.ebuild b/media-gfx/termtosvg/termtosvg-1.1.0.ebuild
index b98385c32d9a..8bfa9cd3a916 100644
--- a/media-gfx/termtosvg/termtosvg-1.1.0.ebuild
+++ b/media-gfx/termtosvg/termtosvg-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 
 DESCRIPTION="Record terminal sessions as SVG animations"
diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest
index ecca7e396314..2c27dcb0d717 100644
--- a/media-gfx/transfig/Manifest
+++ b/media-gfx/transfig/Manifest
@@ -1,6 +1,7 @@
+AUX transfig-3.2.5e-clang.patch 352 BLAKE2B 4fd67be2edad08f410b846bc57701d4e3eaa88eb6eda65500ed2cf530d1e8a7772f4618e83d0440c4429ebbf0c14f08f8424896057eb5ebc230e1f1c5f12e982 SHA512 72ccf2ef21f7d90e688cd0bcc7e6aa91b0a460e34b6484ae0dc1e6d059ffc0f921af9c7637bf38aecbd66116583d4a13aee16d5643f6c4f771b480fa75828511
 AUX transfig-3.2.5e-gcc10-fno-common.patch 939 BLAKE2B 70af7830470b5ed524d6b5df5ae11369476bbc60594da9bd766aa1d752020171b82e0d35e0d57ce1499f69e13b5a5f5274c9c530a2d7fa0f9deabda55462f0a0 SHA512 7b4b5dd4da00180f2eb34a7dcdc407e958df69ba843c371c496dc488977aa8045c31e1007f05e9dcb96765bfa83df75caabd92c99114555b252846892292e465
 DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980
-DIST transfig-3.2.5e-gentoo-patchset.tar.bz2 21130 BLAKE2B 1c07bc7e85fdde29f5e9290bf3c0df75610a7c219f001920b7412d2c104fe1d8d5b2698d91cde1c08f57d4718547c2dffa0aa859bd53a295c55a285ca4f5fbb7 SHA512 4c6ca63159ae58c35c1a9c818bc3b29715a4015e6a11d283b4d0c57c0cfeccbf38160f61f3c91f9bc68f82a8b5676349bb98866f40f617bb95afd73267d00e97
+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.ebuild 2995 BLAKE2B a50fa8614a2326e7a427c538d41dd0e589e2129544045919042a0ca8821fa4b29322c23606b143bb2f51e95ee7c6b2e89e8abb4e3c0c2536d926cf1d355d39f1 SHA512 652a8b602eca4c66b26e5bdb4bac9b3c390d0b71be482b18230db5c5561e4ca56d2b842e1867fec368a891b200a365e167a0ba9808c0e246c9be24c610c10ff1
+EBUILD transfig-3.2.5e-r1.ebuild 3363 BLAKE2B f0aae4180c95c5db7d6e74098d500cbe217c1bd82d790943ad850fb24f7c5e41fd7d6777f58d3a2c69ebfe16ebc689f06d711aa5659b57427095d42cbbb4a73d SHA512 9e55173b88e516c4ebd5727ac48dd28c01b8cc733d26d84e667385d758774f1d37cf20cc97ad624db378ca5d0f9a64c11f549c5417ab1b5ec1ac22351eb5253e
 MISC metadata.xml 238 BLAKE2B 60ff9cbe893ace8f33a3d44ee85a5c73c9bd5553478173bf92c4aa93398ae1140ba28673eb6c7373ac48ede6679546b57ea08b8e676ce5c7a47792a2ba8b3148 SHA512 65918555949ddfef068a9a197dffda69aee483ac55c1b52dcf19376aecf1cb53d8a3fc0931d4ebdbe64ba3341e2a2567d56c2830eb31e6746735449c53a1203c
diff --git a/media-gfx/transfig/files/transfig-3.2.5e-clang.patch b/media-gfx/transfig/files/transfig-3.2.5e-clang.patch
new file mode 100644
index 000000000000..f75b649ff26f
--- /dev/null
+++ b/media-gfx/transfig/files/transfig-3.2.5e-clang.patch
@@ -0,0 +1,12 @@
+index 6a622f1..a14b96f 100644
+--- a/fig2dev/dev/genibmgl.c
++++ b/fig2dev/dev/genibmgl.c
+@@ -572,7 +572,7 @@ static set_width(w)
+ {
+     static int current_width=-1;
+ 
+-    if (w == current_width) return;
++    if (w == current_width) return 0;
+ 
+     /* Default line width is 0.3 mm; back off to original xfig pen
+        thickness number, and re-size.
diff --git a/media-gfx/transfig/transfig-3.2.5e.ebuild b/media-gfx/transfig/transfig-3.2.5e-r1.ebuild
index da2af8a5f308..b45a700dffdb 100644
--- a/media-gfx/transfig/transfig-3.2.5e.ebuild
+++ b/media-gfx/transfig/transfig-3.2.5e-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
-inherit toolchain-funcs eutils flag-o-matic multilib
+EAPI=7
+inherit flag-o-matic toolchain-funcs
 
 MY_P=${PN}.${PV}
 
@@ -10,12 +10,11 @@ DESCRIPTION="A 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/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"
+	https://dev.gentoo.org/~sultan/distfiles/media-gfx/transfig/${P}-gentoo-patchset-r1.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
 
 RDEPEND="x11-libs/libXpm
 	virtual/jpeg
@@ -27,6 +26,20 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=(
+	"${WORKDIR}/${P}-gentoo-patchset/${PN}-3.2.5d-fig2mpdf-r1.patch"
+	"${WORKDIR}/${P}-gentoo-patchset/${PN}-3.2.5c-maxfontsize.patch"
+	"${WORKDIR}/${P}-gentoo-patchset/${PN}-3.2.5-solaris.patch"
+	"${WORKDIR}/${P}-gentoo-patchset/${PN}-3.2.5e-typos.patch"
+	"${WORKDIR}/${P}-gentoo-patchset/${PN}-3.2.5e-man-hyphen.patch"
+	"${WORKDIR}/${P}-gentoo-patchset/${PN}-3.2.5e-fprintf_format_warnings.patch"
+	"${FILESDIR}/${PN}-3.2.5e-gcc10-fno-common.patch"
+	"${FILESDIR}/${PN}-3.2.5e-clang.patch"
+)
+
+DOCS=( README CHANGES LATEX.AND.XFIG NOTES )
+HTML_DOCS=( "${WORKDIR}/fig2mpdf/doc/." )
+
 sed_Imakefile() {
 	# see fig2dev/Imakefile for details
 	vars2subs="BINDIR=${EPREFIX}/usr/bin
@@ -41,20 +54,20 @@ sed_Imakefile() {
 	for variable in ${vars2subs} ; do
 		varname=${variable%%=*}
 		varval=${variable##*=}
-		sed -i "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" "$@"
+		sed -i "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" "$@" || die
 	done
 }
 
 src_prepare() {
-	find . -type f -exec chmod a-x '{}' \;
-	find . -name Makefile -delete
-	epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5d-fig2mpdf-r1.patch
-	epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5c-maxfontsize.patch
-	epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5-solaris.patch
-	epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5e-typos.patch
-	epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5e-man-hyphen.patch
-	epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5e-fprintf_format_warnings.patch
-	epatch "${FILESDIR}"/${PN}-3.2.5e-gcc10-fno-common.patch
+	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
 
 	sed -e 's:-L$(ZLIBDIR) -lz::' \
 		-e 's: -lX11::' \
@@ -66,13 +79,16 @@ src_compile() {
 	xmkmf || die "xmkmf failed"
 	emake Makefiles
 
-	emake CC="$(tc-getCC)" LOCAL_LDFLAGS="${LDFLAGS}" CDEBUGFLAGS="${CFLAGS}" \
+	emake CC="$(tc-getCC)" AR="$(tc-getAR) clq" RANLIB="$(tc-getRANLIB)" \
+		LOCAL_LDFLAGS="${LDFLAGS}" CDEBUGFLAGS="${CFLAGS}" \
 		USRLIBDIR="${EPREFIX}/usr/$(get_libdir)"
 }
 
 src_install() {
 	emake DESTDIR="${D}" \
-		${transfig_conf} install install.man
+		INSTDATFLAGS="-m 644" \
+		INSTMANFLAGS="-m 644" \
+		install install.man
 
 	dobin "${WORKDIR}/fig2mpdf/fig2mpdf"
 	doman "${WORKDIR}/fig2mpdf/fig2mpdf.1"
@@ -82,11 +98,11 @@ src_install() {
 	newins "${WORKDIR}/${P}-gentoo-patchset/transfig-ru_RU.KOI8-R.ps" ru_RU.KOI8-R.ps
 	newins "${WORKDIR}/${P}-gentoo-patchset/transfig-uk_UA.KOI8-U.ps" uk_UA.KOI8-U.ps
 
-	dohtml "${WORKDIR}/fig2mpdf/doc/"*
+	einstalldocs
 
-	mv "${ED}"/usr/bin/fig2ps2tex{.sh,} || die #338295
+	rm -f "${ED}/usr/share/doc/${PF}/html/"{Makefile,*.lfig,*.pdf,*.tex} || die
 
-	dodoc README CHANGES LATEX.AND.XFIG NOTES
+	mv "${ED}"/usr/bin/fig2ps2tex{.sh,} || die #338295
 }
 
 pkg_postinst() {
diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest
index 2e49dfad8c66..8c9b02802645 100644
--- a/media-gfx/ufraw/Manifest
+++ b/media-gfx/ufraw/Manifest
@@ -9,5 +9,5 @@ AUX ufraw-0.22-gcc9.patch 3569 BLAKE2B ce417eb79994190666b842f6017f18eadead284bb
 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-r3.ebuild 2046 BLAKE2B 5fec56e23c541c5442cc7e8a6b30cc8d30a2f00440b716e7ce32e0bb6b59a265095e837cba1d8f28ab9243df239db6e64b31070b56d665b407509a64823150a8 SHA512 6bbdc2eb64abb46dab9e6404b0a470b5791b358b1833910116706abdf21e6e52fc0d644909ba9e67f5472385e06b0b01fe46bbce9f999dec7121214df1498521
+EBUILD ufraw-0.22-r4.ebuild 2046 BLAKE2B d7fb1a2fae08eab732252663bbd495fd41af18049df29406379b3d929264ece0917fd2fd8f60024887d9549484d610763dfe030ca4afa795b9c9ce919b862285 SHA512 723f6615cdc6acbe9cb6c9d425a4d5be1aed82eb4104f730098b7ccb69f9d4e67fbbe81c1e09b86a002619e55e9e43775f013b478f9772b531d575f5614a6913
 MISC metadata.xml 496 BLAKE2B e14f04b9daf2f209851e28ddf26240225cb2e65f675c5903f512a3aeaefa8a7fbfc1c4140c9ed0aec699c2ec3ff53b0ea72e777f6836b4069db12e8ca3b9dd6c SHA512 cb35076b463c212dc7ba1d015ee3a04633ba6564f6fe8b569dc364123a5487b1b17219e523d7d2ccb725bb75815bdab1b1271135ee5624ec4177af327df397ff
diff --git a/media-gfx/ufraw/ufraw-0.22-r3.ebuild b/media-gfx/ufraw/ufraw-0.22-r4.ebuild
index 23f139c7faba..0400a1d39a78 100644
--- a/media-gfx/ufraw/ufraw-0.22-r3.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r4.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	media-libs/tiff
 	virtual/jpeg:0=
 	fits? ( sci-libs/cfitsio:= )
-	gimp? ( >=media-gfx/gimp-2 )
+	gimp? ( media-gfx/gimp:0/2 )
 	gnome? ( >=gnome-base/gconf-2 )
 	gtk? (
 		>=media-gfx/gtkimageview-1.5
diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index d3134b7fbf89..d3983135816f 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -5,9 +5,9 @@ DIST wings-2.1.6.tar.bz2 2688154 BLAKE2B 9183ac21f3ae58e5c4d248f3ab9e8af89c3838b
 DIST wings-2.1.7.tar.bz2 2720764 BLAKE2B b0ba4a1acaee6ea0bcd21cab1eca1a37a0fd3549c2d5551969e71084eb2596a9c7574f0ddc3a86230fccbaf58c3ac87d7061ccfa17047d10e1b8bff096198235 SHA512 6cd2816e22b2326af43f539831d36b32015828c5261c0503ea36cd171dfd8a54eba65165395fbb3f173224d6bb2d3a3015f8f58225c6237c2d5bf56604e72d10
 DIST wings-2.2.5.tar.bz2 3211359 BLAKE2B d5aa7ea337894f18d6b45ff7e68bb35d587da47bf173045d80eb643d748fc64a511db305d1dc164789b06aa34ea47549a04a05564fa615bf01532da294768cd3 SHA512 343fd601a68cccff0151748f151c85635bf57acc01c25fd2ba770f255d65e73a49671c3a84c4433576c1ba3f9e98a2d098a47e3674d4617a07817973bee0136a
 DIST wings-2.2.6.1.tar.bz2 3266532 BLAKE2B a3ec86925632df7d231d620a47841781f8b2e66a50d13857c57fa6389890e7a03fed8bf5e0d09b03de00d6360ee0e4129a4178aec34270367879890f9430c208 SHA512 dba4b189c80180533b7a6c10be5c236a4a9fdacaa7dc491a0d1892149f7a75e636778acc11e38ef82a06718ae705e640da2e1618ec655828d2056e6b3864aba4
-EBUILD wings-2.1.5.ebuild 1227 BLAKE2B 99b1a96187c9ce18f06178f1de1d770553b49a6868df2cdf95fb094706b66ec7eeca4ff1b7bbe53d0d3808f4952fc839e5f6a1cc694bbf5b6ed701ae872e6f8d SHA512 f96956083b40c8dac25b07d5710b6585e83f4de755e872beb6066a821ccadfc4c561ecc0cad8b72b0c9fcbee2479f432533ed6355fbab7a91e6d515b8d62526c
-EBUILD wings-2.1.6.ebuild 1229 BLAKE2B dec57c2c9815bc5f7f1b0d406b04cfcd5b5c2796387fb3f9019b8f6b2c0cb1da375e8a3edb1df864bc3748e39c81c141bc2f6972df82bd3240e0a0cff9f24289 SHA512 dd36fec8555b57509ae7970c98dd644476364f439f798af652796e7edd73ec0fc001abd57f74c99944daa3503d67dc2cd6ed15dc6911702dac67fcfb33f3c091
-EBUILD wings-2.1.7.ebuild 1229 BLAKE2B dec57c2c9815bc5f7f1b0d406b04cfcd5b5c2796387fb3f9019b8f6b2c0cb1da375e8a3edb1df864bc3748e39c81c141bc2f6972df82bd3240e0a0cff9f24289 SHA512 dd36fec8555b57509ae7970c98dd644476364f439f798af652796e7edd73ec0fc001abd57f74c99944daa3503d67dc2cd6ed15dc6911702dac67fcfb33f3c091
-EBUILD wings-2.2.5.ebuild 1034 BLAKE2B 5ad8926041f33e1eaf6dacec8c12acfd5668a4ec9149cb964096e88e921b5e41bc41cee8a7a2c55ee0e5d2948d6fabf887c5483f2fdf46a3c640c894350494bd SHA512 1a2717be399c5ed478e2099a82b0953eac8b4675c2078b5bc7659023df0f6902f6e99c2136682a7faacadcf7dfaf01b74731c9cacbd31d1f69d46fb77ff6fd8f
-EBUILD wings-2.2.6.1.ebuild 1034 BLAKE2B f3216f917744465ace1882b970b6501a197059953cce001d72f525825bf44c7d01a5f0ebd3db5671c09be5e2a0a94fad30d331e4251590c9da8b2ae6e6e8eb5f SHA512 1cf1d639585abfe8237caec443b277ed112c454d94eb5ebdd0450b57ab7c7eedc7558e3b43b292b2fa1b8333c173ad9835a5a806ba93036dc7001071a3db7460
-MISC metadata.xml 610 BLAKE2B d2119ccef4d09c2b0114c626a6d04e655a09ea9683a1eabd0016531dee81a63bf15018547e33749b8d4aba2720a0824089dc9cd8c53f1e695067eb7f7645d463 SHA512 b4e380f9dd075cf85c13e6ed4caf1b44e9239ce9cc1914a66bb40acb07310c5dae12e21d2cb9b42b9d261f50a4b8972e9d5c5cb81bda0eb775e5e4e60aacdf26
+EBUILD wings-2.1.5.ebuild 1180 BLAKE2B 5bef1461396a3add3e4890f6c5da41bc8f05ed6c83a505af235c589c4f8ec82530cef1abee5ec245fb57bb5cb4399bb9f6a5224e6266c8bb3bd7e9b9bc3b4be3 SHA512 07d6bce373c8cb86aefbdb75af8d993f5ba26df4a5efb57553a9bfe0ccbeda95212989d1857f34afd46c3edbb8f659246790f7b638ba9b447d2365cfb11d28e2
+EBUILD wings-2.1.6.ebuild 1182 BLAKE2B 015fdd8e991c6780698859d7686dac0e18ed3f64ee8f0507d175b48e3fd0367163636293a8935c6360d9a3549b7736cb6914195e1dc179e2d32612e3a67706a5 SHA512 09756cd501538a3afb36f25229b9e428b02d980ac64756a5e978c11e3f2c6243d4d4b71f63a4f6ba165f23ec5b5b32db544818a0f50a3c85ed65bb9285b7fb07
+EBUILD wings-2.1.7.ebuild 1182 BLAKE2B 015fdd8e991c6780698859d7686dac0e18ed3f64ee8f0507d175b48e3fd0367163636293a8935c6360d9a3549b7736cb6914195e1dc179e2d32612e3a67706a5 SHA512 09756cd501538a3afb36f25229b9e428b02d980ac64756a5e978c11e3f2c6243d4d4b71f63a4f6ba165f23ec5b5b32db544818a0f50a3c85ed65bb9285b7fb07
+EBUILD wings-2.2.5.ebuild 987 BLAKE2B 41187682d8691f9e16585b1dec9648ba0a92d3cb2ffd6ea2e3fa839e4072daa27344086bc4aaeade4b1c0a4afa458717ab65d15a1e395b2b0b8842ad6a29bdfc SHA512 8e6301935d3fea8c0c42151ce31611db965f6a288a72995a3ec12f8e61b8245637ea9683b7fdb2e9c7328c8de2b0b746b064dc6a84444a7ba442661c00f8283b
+EBUILD wings-2.2.6.1.ebuild 1118 BLAKE2B 7256288278684a98dc329f50c2b386e8823357ed592d88dac9322beffc83fd9928b8f3c28249773cf123aee4b80ff920a24ff6300f70aecdcd63103fc460c42a SHA512 b22c3242f8c7f0c756fef38e2fc8fcf971a3de0bef2b8999453ff32ef18588b4f7df39a484a9cbd7caa7a70fc7c14f8ca09bc1ebf211e8107b3befbcc72545e1
+MISC metadata.xml 563 BLAKE2B abcaefdbfcdf37907b5f05dc7b219e27adfc1e8fbdb771833aef706b2e56df205c97c8d827ff18b148242a6d784caecbc02e55ee4ee9bd8d6fdacc1177d4b4c7 SHA512 b78da01e4913d05c103c1a99ab5cfc9567cd202c84be3338713459c7a4178d9faea84feb62ae26592a694745b1eedf01dcea557ace1e36f4dca86c0011bd05c4
diff --git a/media-gfx/wings/metadata.xml b/media-gfx/wings/metadata.xml
index eca4d413b357..2490feb795e5 100644
--- a/media-gfx/wings/metadata.xml
+++ b/media-gfx/wings/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jer@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 Wings 3D is a polygon mesh modeler inspired by Nendo and 
 Mirai from Izware.
diff --git a/media-gfx/wings/wings-2.1.5.ebuild b/media-gfx/wings/wings-2.1.5.ebuild
index 04bf89ee2191..be3e01a0d82e 100644
--- a/media-gfx/wings/wings-2.1.5.ebuild
+++ b/media-gfx/wings/wings-2.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,10 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 RDEPEND="
-	|| (
-		<dev-lang/erlang-21[smp,wxwidgets]
-		>dev-lang/erlang-21[wxwidgets]
-	)
+	>dev-lang/erlang-21[wxwidgets]
 	dev-libs/cl
 	media-libs/glu
 	media-libs/libsdl[opengl]
diff --git a/media-gfx/wings/wings-2.1.6.ebuild b/media-gfx/wings/wings-2.1.6.ebuild
index 3772405f629a..9f5e9713d19b 100644
--- a/media-gfx/wings/wings-2.1.6.ebuild
+++ b/media-gfx/wings/wings-2.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,10 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	|| (
-		<dev-lang/erlang-21[smp,wxwidgets]
-		>dev-lang/erlang-21[wxwidgets]
-	)
+	>dev-lang/erlang-21[wxwidgets]
 	dev-libs/cl
 	media-libs/glu
 	media-libs/libsdl[opengl]
diff --git a/media-gfx/wings/wings-2.1.7.ebuild b/media-gfx/wings/wings-2.1.7.ebuild
index 3772405f629a..9f5e9713d19b 100644
--- a/media-gfx/wings/wings-2.1.7.ebuild
+++ b/media-gfx/wings/wings-2.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,10 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	|| (
-		<dev-lang/erlang-21[smp,wxwidgets]
-		>dev-lang/erlang-21[wxwidgets]
-	)
+	>dev-lang/erlang-21[wxwidgets]
 	dev-libs/cl
 	media-libs/glu
 	media-libs/libsdl[opengl]
diff --git a/media-gfx/wings/wings-2.2.5.ebuild b/media-gfx/wings/wings-2.2.5.ebuild
index 8ae2e6a7556a..b6561579ab68 100644
--- a/media-gfx/wings/wings-2.2.5.ebuild
+++ b/media-gfx/wings/wings-2.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,10 +12,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	|| (
-		<dev-lang/erlang-21[smp,wxwidgets]
-		>dev-lang/erlang-21[wxwidgets]
-	)
+	>dev-lang/erlang-21[wxwidgets]
 	dev-libs/cl
 	media-libs/glu
 	media-libs/libsdl[opengl]
diff --git a/media-gfx/wings/wings-2.2.6.1.ebuild b/media-gfx/wings/wings-2.2.6.1.ebuild
index 81caee71f2ed..e27096cf47fe 100644
--- a/media-gfx/wings/wings-2.2.6.1.ebuild
+++ b/media-gfx/wings/wings-2.2.6.1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+inherit toolchain-funcs
 
 DESCRIPTION="Wings 3D is an advanced subdivision modeler"
 HOMEPAGE="http://www.wings3d.com/"
@@ -9,13 +10,10 @@ SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
-	|| (
-		<dev-lang/erlang-21[smp,wxwidgets]
-		>dev-lang/erlang-21[wxwidgets]
-	)
+	>dev-lang/erlang-21[wxwidgets]
 	dev-libs/cl
 	media-libs/glu
 	media-libs/libsdl[opengl]
@@ -25,8 +23,14 @@ DEPEND="
 	${RDEPEND}
 "
 
+src_prepare() {
+	sed -i -e 's# -Werror##g;s# -O3##g' $(find -name Makefile) || die
+	default
+}
+
 src_compile() {
 	export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
+	tc-export CC
 	# Work around parallel make issues
 	# Set ER_LIBS to the top source directory
 	emake vsn.mk
diff --git a/media-gfx/xdot/Manifest b/media-gfx/xdot/Manifest
index b4525cb005b7..fd10c5225b1f 100644
--- a/media-gfx/xdot/Manifest
+++ b/media-gfx/xdot/Manifest
@@ -1,4 +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 1131 BLAKE2B 8cbb12c6cf8e7d4d9ae7f21519be9f512257dabb46f7cb18251c7128e318e1a0c3197df884362206a2a3d8c4ca868d46f9d312a74dfebd5d758905425813b48c SHA512 4d25cb15d1c705217272e38f3215a2b25a3610a84f26752cee69568e3dc8d329099d387d769dde6217262c42dc422f7adfa7a164fa9cf3624439e109e7864cec
-EBUILD xdot-9999.ebuild 1136 BLAKE2B 6f437471ef3c8574cf84b2acd7f65c735f7aa06e4566616dc9a7dd1ca1044b5488b42dc50dbdded9ee92be2d96a3c642757e8813cc4fcf1e835c48e2b6d929a6 SHA512 1b0b8322537735e66e72fad2a846e4244ba5b8c79ba2ba67a4667cb07839df67050b8b92b72c56ba115f51a7f1c159e2c7e0b46d1f4d2e3dfbdcf040cc77c320
+EBUILD xdot-1.2.ebuild 808 BLAKE2B e5c0d62e96490d5703e3eb20b7a6beb6afd1948d583daeb716195497f14210e25835e706a84293a600b34f78cd5297af85590afc1ad24a274e96ec750a27ec14 SHA512 784e9fc8f30e5fb769f3eeef850a894c889b5675d7883c9fab2ed21b86f766bf819920e3f28839a36038b135007635be9e65babd9a670ac91f602254b670692b
+EBUILD xdot-9999.ebuild 808 BLAKE2B e5c0d62e96490d5703e3eb20b7a6beb6afd1948d583daeb716195497f14210e25835e706a84293a600b34f78cd5297af85590afc1ad24a274e96ec750a27ec14 SHA512 784e9fc8f30e5fb769f3eeef850a894c889b5675d7883c9fab2ed21b86f766bf819920e3f28839a36038b135007635be9e65babd9a670ac91f602254b670692b
 MISC metadata.xml 398 BLAKE2B 4cfe399944032b70bb0092f9bd2f47b7e1f45cccfa75e2c8eea9dc41ae8456ffb450d5777a77218c22b8f97d57e0bd63956b63c345dba7167b1cfa8cfe3182aa SHA512 7afd30baf3ee9ec5c492659df23168d22c5a07381ed5972c8a02394a57dd332b86b59393b1bd16d2d365d61aa46839aafa78ff0386a92a26563139e31ed01a76
diff --git a/media-gfx/xdot/xdot-1.2.ebuild b/media-gfx/xdot/xdot-1.2.ebuild
new file mode 100644
index 000000000000..0b806d655849
--- /dev/null
+++ b/media-gfx/xdot/xdot-1.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+MY_PN=xdot.py
+EGIT_REPO_URI="https://github.com/jrfonseca/${MY_PN}"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+	MY_P="${MY_PN}-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+inherit ${GIT_ECLASS} distutils-r1
+
+DESCRIPTION="Interactive viewer for Graphviz dot files"
+HOMEPAGE="https://github.com/jrfonseca/xdot.py"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+
+DEPEND="
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	media-gfx/graphviz
+"
+RDEPEND="${DEPEND}"
diff --git a/media-gfx/xdot/xdot-9999.ebuild b/media-gfx/xdot/xdot-9999.ebuild
index 6c4786522753..0b806d655849 100644
--- a/media-gfx/xdot/xdot-9999.ebuild
+++ b/media-gfx/xdot/xdot-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 MY_PN=xdot.py
 EGIT_REPO_URI="https://github.com/jrfonseca/${MY_PN}"
@@ -28,20 +29,6 @@ SLOT="0"
 DEPEND="
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	media-gfx/graphviz
 "
 RDEPEND="${DEPEND}"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-src_prepare() {
-	eapply_user
-
-	# Don't require graphviz python(2) supprt, which xdot doesn't use. This allows xdot to support python3.
-	# For more info, see https://bugs.gentoo.org/643126
-	sed -i "/install_requires=\['graphviz'\],/d" setup.py || die
-}
diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest
index cdbad9dd4e44..cdade2829dd9 100644
--- a/media-gfx/xfig/Manifest
+++ b/media-gfx/xfig/Manifest
@@ -1,6 +1,7 @@
 AUX xfig-3.2.6a-app-defaults.patch 502 BLAKE2B e7277af104c8fd9ed652e2ec6b175376157583f60659564f846348dbb5a205669989f7fd31e8069548af32a424be87548b6b3033d004bcd24e1a44d262a53c38 SHA512 4c5b523f17cacc85839eeb287a82192c9c3d8c704cca34c8de87d38aa05fb502afdadb9169a396573fb977e650ca7a1fabbdab067fb128be024dea724cb791be
 AUX xfig-3.2.6a-solaris.patch 523 BLAKE2B eeae0cc11ae6e3fd6e8c157648d8663131d0d11b020f5e64ec1a324f05ee5bd08be8c111c1ebe34065256d64d103619f61ff3f5524aa7636eb8f76e9aa64a714 SHA512 b2eb546b8fdd0d18bab3d9a2c183149fdb4fb278d5e2d8234f040c4fef727bec7461f861391027dea32028b822aa2e540824cb18af09769f32c7a1fb7bf48319
 AUX xfig-3.2.6a-urwfonts.patch 4933 BLAKE2B eb1edf6b30966864dbdf3e932f2cde231ff5777cdc0dff34cf047a169335ba78e493b10817e39aac72221d17d491138c3c28a3b293582d3808255140d5df6762 SHA512 29fea111b6c07f6ea28bc46259c0dc8d20b1bbf86e33d550037744b93d4f4de7ec9c4ea7fa14c5f91a4278848216d183ac841970c798140359e1fc317baac468
-DIST xfig-full-3.2.6a.tar.xz 5502944 BLAKE2B 3a83feeb5647ffa9586b9ce40116e9854a423c0cc90265ad78b27c0c82a15bbda9d9734475aba13f442c259cd0489a667242f319ac758ddbfea1a5b268e12550 SHA512 82e292e050213b6d22be5e174224308b446505e25208f29d4f4c5e760a87ff4104b9dcea0a332241c9bca358e1d44336bb38c316eb3f28130d7c8828c10a805f
-EBUILD xfig-3.2.6a-r1.ebuild 1180 BLAKE2B 9409fdba002eaacf0e5fd75da24e05d8b196ddd2aab2c6a47e173bbe6accbceb7c81050e6a36682b4c8f7b7923ed106ed551f17569d8429d97e9560a5396258a SHA512 1608fda4f8a1d6616a5436bf5d56df08eddeb717944479a3be6032c0fc472b6e485ca9aacf568c7b61cfec1f14fd63d92e43dd132778922860a6edb4744bb3c8
+AUX xfig-3.2.7b-ghostscript.patch 615 BLAKE2B 374bf50e43980ce3de7e60bdc0ddad5ded9306dfff137e2b644ed21dd201c34ab5b2c3ae57eaf102585333321e217a9d09936db247592b0d559f6bc5744235ad SHA512 7343433ce589495dcf653df678bf364d190dad28bd49d4608d589ab9fe6e385ac0c1e3ca040dacf75503dce9441fb741500cbb1143e248fe1893542c970e7d86
+DIST xfig-3.2.7b.tar.xz 5059984 BLAKE2B a22465e16019e9887e302ea308e250ad5d7ba0c49aec8f554a73d3b4489d803a05041cb7d267c543a7c0d3b78eac25077c628283f82767932afcc9d9750ce883 SHA512 f3396ebf8a5961909e58b05b60117fd7bbc8c24fabbd47f108eaea9586f4180af572faffe077b1a5dcbf669ebd69b1c2791f302c126dea62a44aa1592de66f73
+EBUILD xfig-3.2.7b.ebuild 1270 BLAKE2B 586982fcc8aeb6ad63677fa6c025dd2acc4faa2d4404c871d14e3a871ed5f6b9738f7893ac592c48f64a9eea436d23ddc16e355519fc5288af8ea505d0368e11 SHA512 c4bdf0ef73c9433b7bed3c8a9657eb12180342adb832ed0b06d96ace55062da4442aed85f610f9534323dddb2ecb56542305e5d00800c6851ac933a349ac9177
 MISC metadata.xml 238 BLAKE2B 60ff9cbe893ace8f33a3d44ee85a5c73c9bd5553478173bf92c4aa93398ae1140ba28673eb6c7373ac48ede6679546b57ea08b8e676ce5c7a47792a2ba8b3148 SHA512 65918555949ddfef068a9a197dffda69aee483ac55c1b52dcf19376aecf1cb53d8a3fc0931d4ebdbe64ba3341e2a2567d56c2830eb31e6746735449c53a1203c
diff --git a/media-gfx/xfig/files/xfig-3.2.7b-ghostscript.patch b/media-gfx/xfig/files/xfig-3.2.7b-ghostscript.patch
new file mode 100644
index 000000000000..07a7de141ec0
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.7b-ghostscript.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 7426253..ae5b045 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -1356,7 +1356,7 @@ splash.xpm: $(top_srcdir)/splash-image/spl_bckgnd.fig.in \
+ 	fig2dev -L xpm $(top_srcdir)/splash-image/spl_bckgnd.fig \
+ 	| sed '2 {s/static //; s/noname/spl_bckgnd_xpm/}' > $@
+ 
+-splash.xbm: $(top_srcdir)/splash-image/spl_bckgnd.fig $(top_srcdir)/version.m4
++splash.xbm: $(top_srcdir)/splash-image/spl_bckgnd.fig.in $(top_srcdir)/version.m4
+ 	fig2dev -L xbm -S 4 $(top_srcdir)/splash-image/spl_bckgnd.fig \
+ 	| sed '1,3 s/noname/spl_bckgnd/; 3 s/char/unsigned &/' > $@
+ 
diff --git a/media-gfx/xfig/xfig-3.2.6a-r1.ebuild b/media-gfx/xfig/xfig-3.2.7b.ebuild
index 2a08fb6f16d8..3280bd7089f4 100644
--- a/media-gfx/xfig/xfig-3.2.6a-r1.ebuild
+++ b/media-gfx/xfig/xfig-3.2.7b.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit xdg
 
 DESCRIPTION="A menu-driven tool to draw and manipulate objects interactively in an X window"
 HOMEPAGE="http://mcj.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mcj/${PN}-full-${PV}.tar.xz"
+SRC_URI="https://downloads.sourceforge.net/project/mcj/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="jpeg nls postscript"
 
 RDEPEND="
@@ -36,12 +36,15 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.2.6a-urwfonts.patch"
 	"${FILESDIR}/${PN}-3.2.6a-solaris.patch"
 	"${FILESDIR}/${PN}-3.2.6a-app-defaults.patch"
+	"${FILESDIR}/${PN}-3.2.7b-ghostscript.patch"
 )
 
 src_configure() {
-	econf \
-		$(use_enable nls i18n) \
-		$(use_enable jpeg) \
-		$(use_with postscript gs) \
+	local myeconfargs=(
+		$(use_enable nls i18n)
+		$(use_enable jpeg)
+		$(use_with postscript gs)
 		--htmldir="${EPREFIX}/usr/share/doc/${PF}" # it expects docdir...
+	)
+	econf "${myeconfargs[@]}"
 }
diff --git a/media-gfx/xli/Manifest b/media-gfx/xli/Manifest
index 7c40e7ac02c7..8e5d63df3fcd 100644
--- a/media-gfx/xli/Manifest
+++ b/media-gfx/xli/Manifest
@@ -3,5 +3,5 @@ AUX xli-1.17.0-fix-scale-zoom.patch 1942 BLAKE2B fefbcbec8d9dba30fc1435fc998e371
 AUX xli-1.17.0-libpng14.patch 241 BLAKE2B c4894ae4a5b879d8ac961d064da80d1518d0ed9a47946c21f9a701b89361e94f0d4d2b05926f6c14be4a558707601e84352bb689847a1f01d83cae6eb25c9d02 SHA512 e5a2de3525198d323ae6c89ab9b0455559761cd4f6b86b719934bc77e31582cd557090766875d97512cb60a42e88653f5dc204dffa9ae1370695c73bfc2231b1
 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 1955 BLAKE2B 0e55ca414d96e0b467320301fc78c75d4c67578cb04802d3293cb8da952e8d618b0af21785202f0362e4edd4a80b4637eb177b690b206bf0a98f9758ba86d939 SHA512 b1ac31544d7044df876f41377719eb5cc35f5ea584b737e9c53436427815342cc706e2df7bdbfbf901804064aad1d1f675e421f7bf865f61e872ea0164d7d273
+EBUILD xli-1.17.0-r5.ebuild 1962 BLAKE2B 8ce3029218540ae042b0cf1fc716a3c3b970bf7510249cd27ce193d91281eb89a65aaf950dead5816147ce05c85d12cdba2bc5f994522f16a159739d3c915d3f SHA512 f8be77b1d95c5a4b2e169fdd63b1b69e7494bb99614a24b349c23141d7f301968efb1ef220bc2d0db4fab5417c01b28c1b2e360ab7eeb7583f83fa741b2305b5
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/media-gfx/xli/xli-1.17.0-r5.ebuild b/media-gfx/xli/xli-1.17.0-r5.ebuild
index 97d0eeaee455..7d885d6770dc 100644
--- a/media-gfx/xli/xli-1.17.0-r5.ebuild
+++ b/media-gfx/xli/xli-1.17.0-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://pantransit.reptiles.org/prog/xli/xli-${SNAPSHOT}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 RDEPEND="app-arch/bzip2
 	>=media-libs/libpng-1.0.5
diff --git a/media-gfx/xsane/Manifest b/media-gfx/xsane/Manifest
index 1fef601b60db..618de244763c 100644
--- a/media-gfx/xsane/Manifest
+++ b/media-gfx/xsane/Manifest
@@ -1,6 +1,6 @@
-AUX xsane-0.999-lcms2.patch 11790 BLAKE2B 0fd549512d56635e9a41620ba097d4db8f103ba9395d84803a64de75766027bc9f6696e3dc76ccaf0b7e5e84240d328cc3a15106d87d27e7d74ee6cc29409d64 SHA512 4734fd4599e2fed7b86a94836a40725fafb70e9252885faf092495fabfbaa02a7c245b3cacea19e5e1c455a3a74b475ad8cb215fbba3fa64bc066068abddbb29
+AUX xsane-0.999-lcms2.patch 11788 BLAKE2B 2a7f40e1d430b74f29c201e850ee5520395a6a6d906323125c084effb9a52720d1a1d38d2a3680986a05787170818011342a7fcde225f4d1f70cdf36c6a9d8a1 SHA512 bdb5f078d7a36702b327b01f8c6d4259d52252968e5d287ce17aed18adb0bb89420049609242ee89048cb8e4012a0dd04ba29fa994570014d3c62b098e33508b
 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-r2.ebuild 2187 BLAKE2B fd9e08c5327b3456acfec78efd7f22dc40aec9200989f63e9a351cd80bad042335b5149d3cd22e0ea07e4887da86468e93d87694beafe0309713cbaf38f57a28 SHA512 007a65f4365c17dc5a21d92453032704c1b4d29f181c00ccc46d2eef12f0e1d7187f936f1dd310385d51716e38cd0bee2c8e4606ee55d930cb417a9108b9b27e
+EBUILD xsane-0.999-r3.ebuild 2207 BLAKE2B a85c9aaa6cfcb3c47f4ac55502696ce4c286cc89fee10258107a24df204d6614ed4ce71dd20253dca0fbddd22f51ab24063bf78ed3fac53cbef2fd0914d1c484 SHA512 0be6936b17ffb26f2a0970b172d3cc01b25372d9ca8fd1e5560dba33fbf198aa16b28f9a4004cb095a339987d65d804fd6d8720665467bd27653b427b9ad5b55
 MISC metadata.xml 370 BLAKE2B 800a5ac17360397771b4021cdd36777cd546b8f32132f5edc380cec9c1aa41d10daa1d67da06230b447f5115c6296e36aa1ca881f923d3238ace1f8a48584891 SHA512 c00b90634545ce757206fa7d23b345e11afe409813f16312bb4dea494f8d0342996f994623dec0939bc40e13395a1be8a40b014064dcc039f669efcd7fd7b19f
diff --git a/media-gfx/xsane/files/xsane-0.999-lcms2.patch b/media-gfx/xsane/files/xsane-0.999-lcms2.patch
index c3d696c28ecf..0a98bc8122bb 100644
--- a/media-gfx/xsane/files/xsane-0.999-lcms2.patch
+++ b/media-gfx/xsane/files/xsane-0.999-lcms2.patch
@@ -32,10 +32,10 @@ index df7b114..3659c97 100644
 +  if test "${ac_cv_search_cmsOpenProfileFromFile}" != "no"; then
 +    AC_DEFINE(HAVE_LIBLCMS, 1, [Define if LCMS is to be used.])
 +  fi
-+  if test "${ac_cv_search_cmsOpenProfileFromFile}" == "-llcms2"; then
++  if test "${ac_cv_search_cmsOpenProfileFromFile}" = "-llcms2"; then
 +    AC_DEFINE(HAVE_LIBLCMS2, 1, [Define if you have liblcms2.])
 +  else
-+    if test "${ac_cv_search_cmsOpenProfileFromFile}" == "-llcms"; then
++    if test "${ac_cv_search_cmsOpenProfileFromFile}" = "-llcms"; then
 +      AC_DEFINE(HAVE_LIBLCMS1, 1, [Define if you have liblcms.])
 +    fi
 +  fi
diff --git a/media-gfx/xsane/xsane-0.999-r2.ebuild b/media-gfx/xsane/xsane-0.999-r3.ebuild
index da19a27bb818..08d3756194f8 100644
--- a/media-gfx/xsane/xsane-0.999-r2.ebuild
+++ b/media-gfx/xsane/xsane-0.999-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls jpeg png tiff gimp lcms ocr"
 
 RDEPEND="
@@ -24,7 +24,7 @@ RDEPEND="
 	jpeg? ( virtual/jpeg:0 )
 	png? ( media-libs/libpng:0= )
 	tiff? ( media-libs/tiff:0 )
-	gimp? ( media-gfx/gimp )
+	gimp? ( media-gfx/gimp:0/2 )
 	lcms? ( media-libs/lcms:2 )
 "
 PDEPEND="ocr? ( app-text/gocr )"
@@ -76,14 +76,14 @@ src_install() {
 	# link xsane so it is seen as a plugin in gimp
 	if use gimp; then
 		local plugindir
-		local gimptool=$(ls "${EPREFIX}"/usr/bin/gimptool* | head -n1)
-		if [ -n "${gimptool}" ]; then
-			plugindir="$(${gimptool} --gimpplugindir)/plug-ins"
+		local gimptool=( "${EPREFIX}"/usr/bin/gimptool* )
+		if [[ ${#gimptool[@]} -gt 0 ]]; then
+			plugindir="$("${gimptool[0]}" --gimpplugindir)/plug-ins"
 		else
 			die "Can't find GIMP plugin directory."
 		fi
-		dodir "${plugindir#${EPREFIX}}"
-		dosym /usr/bin/xsane "${plugindir#${EPREFIX}}"/xsane
+		mkdir -p "${D}${plugindir}" || die
+		ln -s ../../../../bin/xsane "${D}${plugindir}"/xsane || die
 	fi
 
 	newicon "${DISTDIR}/${PN}-256x256.png" "${PN}".png
diff --git a/media-gfx/yafaray/Manifest b/media-gfx/yafaray/Manifest
index 2758bc62bdc1..0e541819531e 100644
--- a/media-gfx/yafaray/Manifest
+++ b/media-gfx/yafaray/Manifest
@@ -1,5 +1,4 @@
 AUX yafaray-3.4.1-0001-Respect-user-pre-defined-CXXFLAGS.patch 1160 BLAKE2B 2145d744a269b25dad27b78afb52baec14b23c7a90041263b907020145b51482165ccd4dd833c537dadd4ca0074cdd90fefb642d8fb3bb5853d37164f5e3f2eb SHA512 d6b327c887badb28685277487fcb76917206781aa5e1d6ebd0f6832a28d573945bca2cce5a0e856a1b573c103a696cf7b7b10a91bb6135649249e8ca143ff8fc
-DIST yafaray-blender-exporter-3.4.1.tar.gz 381253 BLAKE2B b1483c79b14581729f598b92ca504af4a8a73cff54ff2014e8be646eaa2eea7f10074d1dc8c58251d8a987ac6e5ac10d1bc34b80c229f74e6d580bbaa3a3c461 SHA512 1f7baf7bf5953be8b4e004b1509cc23164df0a05e28d33a2301195ea21ad4d4cd6fdd67a0b1af11c1075bab7018e64b38f564be8b647d8513db46feee7d8bf85
 DIST yafaray-core-3.4.1.tar.gz 1136077 BLAKE2B a2ce3945f52315084ee744ff4a6733255018196f0000ca6b1786fbd2ec49ade64cb62e98dfba95dca4dec361f47235d59a8c9bd95ee7d095214fc0afbdcb1ee4 SHA512 a9116273fbc2aaaadbc38a65b1eaaa502070ff06f8a2929e880714a9db57188e65cf319c20a3f96e08146af36a67aea139709a633eb024be65319a64330e6f68
-EBUILD yafaray-3.4.1.ebuild 4381 BLAKE2B ac952d608b2aac41f46e17a080fa1d86f5619f3adf97498a275da52279fea0ee4f6ee4112fc1d66131fdb832693661147e68c7309ef88f8f29a510b81e5b4d09 SHA512 c13a2d24795a64c8d6f2f64bf937f7f0367320efc0d1bb5c34c9fca374d4f2bbe76edccb5814b3fdc0d4e4da1b0b94cf0654ce13c482a38d3e2de0a38d33a250
-MISC metadata.xml 1135 BLAKE2B c889a0d76e5dace50fac8a3b2ec5dc8e04b88baba19ff7db575a3790ea92b90c9a17cad5320f85e5de85ccb6db3c37323589118cd9d4cf10d8f9f674a04f6318 SHA512 86c9cb6eeab7ed39b4192a6e1a9caf7b4d75df2c7e9fe8e16ccec5a1b11e9663c828ef62160240c228847ee6b1ffb7d0c8589a4b4f5aba20ba34cba59ae2c3fa
+EBUILD yafaray-3.4.1.ebuild 3072 BLAKE2B 99207e9b3c330cc717af5649b951db81cedc259f27a18de0dd1092c9f895aa0ff1feec2cfc8eab2b24c32836b642fa2a0e5c85597f787ff2a35228f556189f23 SHA512 c3164f5fe95c9488a3dbd71bf81e724394dbc71a209153a89fbebff7345fe9102f5c2d8a316145b8359b868ebfd53120fd42de13b835dbac61421dd71d218cc0
+MISC metadata.xml 1058 BLAKE2B 6eba6592abe559d29863843dcbc69648b3789d3ce7f031d174db306ce001a381e9cb04232a40ac0ad167e21527a195bfab8e0603bd3d9be8782a54cc02c9b8d3 SHA512 f864ed542ec6cabe36bf92ae2dbb3f56cb0a38ab5967f032b7a1c8cd1d8b4ef9ceb2529448dce48d2397b1f25e0ceb5d657c1ec09ac8fc34d43131b43b4528cb
diff --git a/media-gfx/yafaray/metadata.xml b/media-gfx/yafaray/metadata.xml
index 795c6e4891e0..24519079a75e 100644
--- a/media-gfx/yafaray/metadata.xml
+++ b/media-gfx/yafaray/metadata.xml
@@ -14,7 +14,6 @@
 		An render engine consists of a "faceless" computer program that interacts with a host 3D application to provide very specific raytracing capabilties "on demand". Blender 3D is the host application of YafaRay.
 	</longdescription>
 	<use>
-		<flag name="blender">Install addon for <pkg>media-gfx/blender</pkg></flag>
 		<flag name="fastmath">Enable mathematic approximations to make code faster</flag>
 		<flag name="fasttrig">Enable trigonometric approximations to make code faster</flag>
 		<flag name="opencv">Use <pkg>media-libs/opencv</pkg></flag>
diff --git a/media-gfx/yafaray/yafaray-3.4.1.ebuild b/media-gfx/yafaray/yafaray-3.4.1.ebuild
index e583d32d4b7c..4efd96180ca1 100644
--- a/media-gfx/yafaray/yafaray-3.4.1.ebuild
+++ b/media-gfx/yafaray/yafaray-3.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{7,8} )
 
 # doesn't build with ninja when qt5 and python USE flags are both enabled
 CMAKE_MAKEFILE_GENERATOR="emake"
@@ -12,19 +12,17 @@ inherit cmake flag-o-matic python-single-r1
 
 DESCRIPTION="A free open-source montecarlo raytracing engine"
 HOMEPAGE="http://www.yafaray.org"
-SRC_URI="https://github.com/YafaRay/Core/archive/v${PV}.tar.gz -> ${PN}-core-${PV}.tar.gz
-	blender? ( https://github.com/YafaRay/Blender-Exporter/archive/v${PV}.tar.gz -> ${PN}-blender-exporter-${PV}.tar.gz )"
+SRC_URI="https://github.com/YafaRay/Core/archive/v${PV}.tar.gz -> ${PN}-core-${PV}.tar.gz"
 
 S="${WORKDIR}/Core-${PV}"
 
-LICENSE="blender? ( GPL-2+ ) LGPL-2.1"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="blender +fastmath +fasttrig jpeg opencv openexr png +python qt5 tiff truetype"
+IUSE="+fastmath +fasttrig jpeg opencv openexr png +python qt5 tiff truetype"
 RESTRICT="test"
 
 REQUIRED_USE="
-	blender? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
@@ -37,10 +35,7 @@ RDEPEND="
 	opencv? ( >=media-libs/opencv-3.1.0:= )
 	openexr? ( >=media-libs/openexr-2.2.0:= )
 	png? ( media-libs/libpng:0= )
-	python? (
-		${PYTHON_DEPS}
-		blender? ( ~media-gfx/blender-2.79b[${PYTHON_SINGLE_USEDEP}] )
-	)
+	python? ( ${PYTHON_DEPS} )
 	qt5? ( dev-qt/qtwidgets:5 )
 	tiff? ( media-libs/tiff:0 )
 	truetype? ( media-libs/freetype:2 )
@@ -63,13 +58,6 @@ src_prepare() {
 	append-ldflags -pthread
 
 	cmake_src_prepare
-
-	if use blender; then
-		# fix PLUGIN_PATH
-		sed -e "s/PLUGIN_PATH = os.path.join(__path__\[0\], 'bin'/PLUGIN_PATH = os.path.join(__path__\[0\], '"$(get_libdir)"'/" \
-			-e "s/@YAFARAY_BLENDER_EXPORTER_VERSION@/v"${PV}"/" \
-			-i "${WORKDIR}"/Blender-Exporter-${PV}/__init__.py || die "patching startup file failed"
-	fi
 }
 
 src_configure() {
@@ -116,18 +104,6 @@ src_install() {
 	fi
 
 	rm -rv "${ED}"/usr/share/doc/${PN} || die
-
-	if use blender; then
-		pushd "${WORKDIR}/Blender-Exporter-${PV}" || die
-		# grab blender version number for plugin directory
-		local blender_plugin_dir=$(best_version media-gfx/blender)
-		blender_plugin_dir=${blender_plugin_dir##*/} # remove category
-		blender_plugin_dir=${blender_plugin_dir#*-}  # remove package name
-		blender_plugin_dir=${blender_plugin_dir%%-*} # remove revision number if exists
-		insinto /usr/share/blender/${blender_plugin_dir}/scripts/addons/yafaray_v3
-		doins -r .
-		popd || die
-	fi
 }
 
 pkg_postinst() {
@@ -135,10 +111,4 @@ pkg_postinst() {
 	einfo "yafaray-xml with /usr/share/yafaray/tests/test01/test01.xml"
 	einfo "as an input file, then compare the result to"
 	einfo "'/usr/share/yafaray/tests/test01/test01 - expected render result.png'"
-	if use blender; then
-		elog
-		elog "To use within Blender, navigate to File -> User Preferences -> Add-ons (tab)"
-		elog "and enable 'Render: YafaRay v3 Exporter'. This will make YafaRay available"
-		elog "in the render engines drop-down."
-	fi
 }
diff --git a/media-gfx/zgv/Manifest b/media-gfx/zgv/Manifest
index 999cb9f038f7..d11f7812fab6 100644
--- a/media-gfx/zgv/Manifest
+++ b/media-gfx/zgv/Manifest
@@ -1,6 +1,6 @@
-AUX zgv-5.9-Makefile-QA.patch 1906 BLAKE2B a0179372591660f8186b7d7f302819a01bfd44280f616f8e564e3a9ba4a5a0faec14aef2c0f42c54899017918e1d8b239277288f0834c5fff303ea85a16941f4 SHA512 a266ccb673475c2a520c4a28f1859522a3fe9be626080c45fb5f2bdd200d3eeb9f22dab74456910f60369e48d4ed1d5a5a8c9faa3e3a5bda7d9ca82807dba9f0
-AUX zgv-5.9-cmyk-yccl-fix.diff 1554 BLAKE2B df243b6744b73142437a586f2da929a9647b715e59c15332277722ce154dafeacded631ee188380750a2b34a6c5ecb1912e74fd1f248f81fe22eb5732db6c381 SHA512 b2ed44029d87038139137deb068ea55503ca4bb10cb6bf61880115dd913427cdded4e7808eec9947a1b35760efa7547420ea5fa2f0416266d0d307ce6b10cfd3
-AUX zgv-5.9-libpng15.patch 468 BLAKE2B 9567c3bbba21cd7878f7962248ceaab81977a28a347a5eb22bd78c6db4a02ccccd689c82a84b6b5de2a6726d2cdb878edaa34bc7f3848612b9a05f0b1d847672 SHA512 ff7ec6258960381d9cb9c061af67bfb9984a1bae70c0c902a0837787c82bd60ed699e8aa9d76f35a993a76aaf8ea5a9740cffa88fdb0bb654f9b3b09ba3cac00
+AUX zgv-5.9-Makefile-QA.patch 1823 BLAKE2B 95e54001dcc7006b37b72779004e2a3fb9e0ac9d21b34f9906538e722334f1de7a4582f78be2219a8fac3fd5bd802647181a15c2608195e79e1ca51d1c8fa387 SHA512 1d164cc196bc15310db327d65b98de4ef60006bdc69180635b497687941da37e88ae210a62a77bfc0512c7f652cd8f046d337304a237c9ae0f0ffeeb2f3703dc
+AUX zgv-5.9-cmyk-yccl-fix.diff 1546 BLAKE2B 6c06094647394ba0ccef409c58e439a03cc01057611c11052223fb79045da35318c09402be3401c5c8f7f736b519f612311395aae41667ae11ac56c0ad18c410 SHA512 eee145236a4b4499009c2cf8a442d4dfcde22c63281586e4a6b14fdff9ae50976bfe85561f5f3c927697878e9dfe82d73bbe98ee26662bcef1b6948bb7eca45c
+AUX zgv-5.9-libpng15.patch 472 BLAKE2B 7b32e3ad4caaeaf4ea4d9594b14d9d0bdf2aaefaf40b6aea2420a8bade7562755ede5c8a5a8950a2a308a32e5aff1e8919dfa182327732d4d1b8adbe2df310b4 SHA512 845e6304d273df86c71f889be429cfdf66aa075abe0065d395151b3bc4707b63e00ad1fe95a445dcf73952d0368ee72dc46b3ae558a7076b9de0dad13a12f985
 DIST zgv-5.9.tar.gz 395525 BLAKE2B 2b28802c1e5437778d1e65bac1281caf5b783959af0534a99f733c11c2910189439235a11b38214cd229b42f912dc8cdb71cc2a789a5166b09a7cba2cc6d7e45 SHA512 f78d43c1703559f28961d8ce9ed6fc21cbb28b33885f824cc682591bf659d234b6c641f1677d42c592bcb22843854cbbac32ce0911bd1092f76a7ef5bfe31ddf
-EBUILD zgv-5.9.ebuild 1157 BLAKE2B 3cddb4c3ce95cf024c1e620a600735f3d2e6d2fe438d74c695100c9196b80b6107f904e3acfe770df7b17a5796c7cf82df034a21b99ec4ff25a8a4f838f4ad34 SHA512 9471aca8f6be313a79c9b27fc148ce35db5d2b1c1dea99904bbad2f054a5848fc7322874518ae9ac15305a359a00f7831c7f78c5bcdfbb7316e4da1cb015fb48
+EBUILD zgv-5.9.ebuild 1171 BLAKE2B 843310ebb66a10bad90337125e769d69236a7e53f10a386582fc42eff34a53a43c32ba62f847191b82a1c2251ee721bd330b4823705d985d7785844065009253 SHA512 df712de4bacd1b4077c462a4178fbf536f20f718f462b7b9042c4231eed983887f53fb119a067985916486c0586e03650d4b75298d676ff1fddad1d6e2c4091d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/zgv/files/zgv-5.9-Makefile-QA.patch b/media-gfx/zgv/files/zgv-5.9-Makefile-QA.patch
index e4569547d175..6d3a1341ecb5 100644
--- a/media-gfx/zgv/files/zgv-5.9-Makefile-QA.patch
+++ b/media-gfx/zgv/files/zgv-5.9-Makefile-QA.patch
@@ -1,6 +1,5 @@
-diff -NrU5 zgv-5.9.original/src/Makefile zgv-5.9/src/Makefile
---- zgv-5.9.original/src/Makefile	2009-09-28 15:31:29.000000000 -0600
-+++ zgv-5.9/src/Makefile	2009-09-28 15:56:26.000000000 -0600
+--- a/src/Makefile	2009-09-28 15:31:29.000000000 -0600
++++ b/src/Makefile	2009-09-28 15:56:26.000000000 -0600
 @@ -45,11 +45,11 @@
  	readbmp.o readtga.o readpng.o readpcx.o \
  	readxvpic.o readmrf.o readxbm.o readxpm.o \
diff --git a/media-gfx/zgv/files/zgv-5.9-cmyk-yccl-fix.diff b/media-gfx/zgv/files/zgv-5.9-cmyk-yccl-fix.diff
index e510a4ba9ec2..662838c57ee0 100644
--- a/media-gfx/zgv/files/zgv-5.9-cmyk-yccl-fix.diff
+++ b/media-gfx/zgv/files/zgv-5.9-cmyk-yccl-fix.diff
@@ -1,5 +1,5 @@
---- zgv-5.9/src/readjpeg.c	Sun Oct 31 14:54:26 2004
-+++ zgv/src/readjpeg.c	Wed Sep 21 21:03:22 2005
+--- a/src/readjpeg.c	Sun Oct 31 14:54:26 2004
++++ b/src/readjpeg.c	Wed Sep 21 21:03:22 2005
 @@ -92,11 +92,13 @@
  	int *real_width,int *real_height)
  {
diff --git a/media-gfx/zgv/files/zgv-5.9-libpng15.patch b/media-gfx/zgv/files/zgv-5.9-libpng15.patch
index 2f12532831de..3d7e4ecb5df1 100644
--- a/media-gfx/zgv/files/zgv-5.9-libpng15.patch
+++ b/media-gfx/zgv/files/zgv-5.9-libpng15.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/389591
 
---- src/readpng.c
-+++ src/readpng.c
+--- a/src/readpng.c
++++ b/src/readpng.c
 @@ -63,7 +63,7 @@
  use_errmsg=1;
  
diff --git a/media-gfx/zgv/zgv-5.9.ebuild b/media-gfx/zgv/zgv-5.9.ebuild
index c5761d43e5fa..c22ba876d4a3 100644
--- a/media-gfx/zgv/zgv-5.9.ebuild
+++ b/media-gfx/zgv/zgv-5.9.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="A svgalib console image viewer"
 HOMEPAGE="http://www.svgalib.org/rus/zgv/"
@@ -11,24 +12,27 @@ SRC_URI="http://www.svgalib.org/rus/zgv/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
-IUSE=""
 
-RDEPEND=">=media-libs/svgalib-1.4.2
-	virtual/jpeg
+RDEPEND="
 	media-libs/libpng
+	>=media-libs/svgalib-1.4.2
 	>=media-libs/tiff-3.5.5
+	sys-apps/gawk
 	>=sys-libs/zlib-1.1.4
-	sys-apps/gawk"
+	virtual/jpeg
+"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-Makefile-QA.patch
+	"${FILESDIR}"/${P}-cmyk-yccl-fix.diff
+	"${FILESDIR}"/${P}-libpng15.patch
+)
+
 src_prepare() {
 	sed -i -e "/^CFLAGS=/s:=.*:=${CFLAGS}:" config.mk || die
 	sed -i -e 's:$(RM):echo:' doc/Makefile || die
-
-	epatch \
-		"${FILESDIR}"/${P}-Makefile-QA.patch \
-		"${FILESDIR}"/${P}-cmyk-yccl-fix.diff \
-		"${FILESDIR}"/${P}-libpng15.patch
+	default
 }
 
 src_compile() {
@@ -39,18 +43,18 @@ src_install() {
 	dodir /usr/bin /usr/share/info /usr/share/man/man1
 
 	emake \
-		PREFIX="${D}"/usr \
-		INFODIR="${D}"/usr/share/info \
-		MANDIR="${D}"/usr/share/man/man1 \
+		PREFIX="${ED}"/usr \
+		INFODIR="${ED}"/usr/share/info \
+		MANDIR="${ED}"/usr/share/man/man1 \
 		install
 
 	dodoc AUTHORS ChangeLog INSTALL NEWS README* SECURITY TODO
 
 	# Fix info files
 	cd "${D}"/usr/share/info
-	rm dir*
-	mv zgv zgv.info
+	rm dir* || die
+	mv zgv zgv.info || die
 	for i in 1 2 3 4 ; do
-		mv zgv-$i zgv.info-$i
+		mv zgv-$i zgv.info-$i || die
 	done
 }
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /media-gfx
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)