gentoo resync : 25.08.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
commit: 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree: c513fe68548b40365c1c2ebfe35c58ad431cdd77 /media-gfx
parent: 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
211 files changed, 3844 insertions, 3102 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index a6877b109d46..ad24ae050fe3 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 0f49befba3ba..ceb116b804dd 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -6,6 +6,6 @@ AUX alembic-1.7.11-0005-Fix-install-locations.patch 8305 BLAKE2B 25688ca368f4d58
 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 3159 BLAKE2B 38f7f04e3878247c1caa0200c0cf8043102742db00c09188c44c43828c7c8030394f75b4f632817fa5cd51fa81697d2c220333c3a9d34e605bccb07c49d6385f SHA512 7bd681f7e9d9da198657b66cdf31a4e2f9a32f0140bfbf2553bf7fac8f7513132056f0760951362b5835fea9995b0e54af71925c5dd2c4b79e979155ba525818
-EBUILD alembic-1.7.12.ebuild 2650 BLAKE2B a35cb1f3c118736fd819598ccb3ca91fdca227d4f3c0a18bc1834658669357ae1e68fff792b5972cdbc8d5e12465e279b3800071a33e0837ee534df85a122f5d SHA512 927614bc9ca4f11a0e1e4db4e162c82bd101865fc4f901444c36583e36d30a95ee85d5168ff82cb53cf86b88df0203a4170f7e68f2b4b663faea6f96f73b7b33
-MISC metadata.xml 1343 BLAKE2B b0e902df8e5f04bcbe4e784abe396b926db2de2347560181ab77ee60da7cec55ab10aafda38623109681240992b8b43208fc65fe72fc8dd66cf6ebf09defc085 SHA512 af9abd189b8c15b53b60b818a7ce419b812092ba1725ebfa4d3267c5d2f67018c7f3cc06bc24fe9af614fb420b4f8176585a53920378521779c4ca52c39c22cc
+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
diff --git a/media-gfx/alembic/alembic-1.7.11-r1.ebuild b/media-gfx/alembic/alembic-1.7.11-r1.ebuild
index 8f112f0a4fd3..2132a431730c 100644
--- a/media-gfx/alembic/alembic-1.7.11-r1.ebuild
+++ b/media-gfx/alembic/alembic-1.7.11-r1.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake multiprocessing python-single-r1
+inherit cmake multiprocessing
 
 DESCRIPTION="Open framework for storing and sharing scene data"
 HOMEPAGE="https://www.alembic.io/"
@@ -15,25 +13,20 @@ LICENSE="BSD"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="arnold +boost doc examples hdf5 maya prman python test zlib"
+IUSE="arnold +boost doc examples hdf5 maya prman test zlib"
 RESTRICT="!test? ( test )"
 
-# pyalembic python bindings need boost
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	hdf5? ( zlib )
-	python? ( boost )
 "
 
 RDEPEND="
 	${PYTHON_DEPS}
 	>=media-libs/openexr-2.3.0:=
+	boost? ( >=dev-libs/boost-1.65.0:= )
 	hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] )
-	python? ( >=dev-python/pyilmbase-2.3.0[${PYTHON_SINGLE_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.11-r1 )
-	$(python_gen_cond_dep '
-		boost? ( >=dev-libs/boost-1.65.0:=[python,${PYTHON_MULTI_USEDEP}] )
-	')
 "
 DEPEND="
 	${RDEPEND}
@@ -72,7 +65,7 @@ src_configure() {
 		-DUSE_HDF5=$(usex hdf5)
 		-DUSE_MAYA=$(usex maya)
 		-DUSE_PRMAN=$(usex prman)
-		-DUSE_PYALEMBIC=$(usex python)
+		-DUSE_PYALEMBIC=OFF
 		-DUSE_TESTS=$(usex test)
 	)
 	cmake_src_configure
diff --git a/media-gfx/alembic/alembic-1.7.12.ebuild b/media-gfx/alembic/alembic-1.7.12.ebuild
index 8833c3fbfbb6..364b3261bc71 100644
--- a/media-gfx/alembic/alembic-1.7.12.ebuild
+++ b/media-gfx/alembic/alembic-1.7.12.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake multiprocessing python-single-r1
+inherit cmake multiprocessing
 
 DESCRIPTION="Open framework for storing and sharing scene data"
 HOMEPAGE="https://www.alembic.io/"
@@ -15,25 +13,20 @@ LICENSE="BSD"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+boost doc examples hdf5 prman python test zlib"
+IUSE="+boost doc examples hdf5 prman test zlib"
 RESTRICT="!test? ( test )"
 
-# pyalembic python bindings need boost
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	hdf5? ( zlib )
-	python? ( boost )
 "
 
 RDEPEND="
 	${PYTHON_DEPS}
 	>=media-libs/openexr-2.3.0:=
+	boost? ( >=dev-libs/boost-1.65.0:= )
 	hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] )
-	python? ( >=dev-python/pyilmbase-2.3.0[${PYTHON_SINGLE_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.11-r1 )
-	$(python_gen_cond_dep '
-		boost? ( >=dev-libs/boost-1.65.0:=[python?,${PYTHON_MULTI_USEDEP}] )
-	')
 "
 DEPEND="${RDEPEND}"
 BDEPEND="doc? ( >=app-doc/doxygen-1.8.14-r1 )"
@@ -70,7 +63,7 @@ src_configure() {
 		-DUSE_HDF5=$(usex hdf5)
 		-DUSE_MAYA=OFF
 		-DUSE_PRMAN=$(usex prman)
-		-DUSE_PYALEMBIC=$(usex python)
+		-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 4166d46b5bcf..f3240834df66 100644
--- a/media-gfx/alembic/metadata.xml
+++ b/media-gfx/alembic/metadata.xml
@@ -26,9 +26,6 @@
 	<flag name="prman">
 		Compile Alembic plugin for Renderman (experimental)
 	</flag>
-	<flag name="python">
-		Build pyalembic python bindings (needs <pkg>dev-python/pyilmbase</pkg>)
-	</flag>
 	<flag name="test">Build and run the test-suite</flag>
 	<flag name="zlib">Use <pkg>sys-libs/zlib</pkg> for compressions</flag>
 </use>
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index e41f18c5e31a..73415ba4f3c6 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -6,10 +6,14 @@ AUX asymptote-2.62-info.patch 436 BLAKE2B f4994502868851fc175d05bdd83b3a099d67a2
 AUX asymptote-2.62-xdg-utils.patch 752 BLAKE2B 887e0ad34c0b24e20b50556eb070da9c4bcc00af60873b9da84445125f1129eef41050002fd8aa04ea796c14916041692c335a6d04833bf5c374e6c9aec5bad9 SHA512 cee63bbaf975ccb9fdece0728f62026b7e59e945790c6ffa1c182db814c87b0acdf38b9f1939532edf36e8f248d09f8f540c4223f7f6933c3d8a5f2a1ad0602e
 AUX asymptote-2.65-info.patch 436 BLAKE2B 0ddf2454a1ad2370c153d74d8fe4b8f36c2f702d6f732608097865885cb71681e1564e2a25b107bb0d3ff5bc0db746a86f58be49179d6b825459fce02b51b88e SHA512 77e47570629ba0370e43f0e872feb58739958ba939d29edb8411681cf638a00866a892a3dcb9a41de82f463c8e4e21fa1a7e76003075f7d78d938ab38ca636e9
 AUX asymptote-2.65-xdg-utils.patch 754 BLAKE2B 6697eabd3cded5ac11c4802805e1c55a05d41ad35fa46d57ea0534d85a2d34d6fabf1b119d94b83ad8387e9de4537d933f25c24fbe2e376eba4bc02925f2a2fc SHA512 85d85f15d8ebeb3d272d1e619ec7a97cac71b673c03a9811c1e051ef6c49ba41399409eb26b24523145eb758c353233dc50d8b105979723d903c9da3bcbc4d52
+AUX asymptote-2.67-info.patch 436 BLAKE2B 2ec0525ed1695f55bb25d6d5fdbdbf8d77eb85385ab13e5c292b6937fe1e60c51976101b5e1aa0c4036504a7a7b9133aab294220c92f7412fea9e62838c6d0a2 SHA512 d4ea5c8d914b09434ef92bc66e4847c40b82bd8c58581f7d5b305ae759e6e01082dcc31a615081bf77a09e630b5a27f245c2b60b056467000c1237c73939a207
+AUX asymptote-2.67-xdg-utils.patch 791 BLAKE2B 90e37b056462ef70ee34e8d1503ebd194c16f80e62987de776cc40bb0e6efda5a6c8d5e53f85842aa2554f4814423a3ac0bcebf4767996c004cdffa652bc1ecc SHA512 9cb5b2eaf19d3805167bba763333b1ac804d1ef426a59e41a19aa6213a35c5c2088d27fd9f22caf2b36cd6405bb84516e6d1a4de5d6fc5afb57337625e15b010
 DIST asymptote-2.61.src.tgz 4623504 BLAKE2B 8432f07ce21f630c5bdae609650c0bb2bcd237a121df68030dc19d1cae986f0bfa56dd0e241570809f9fcb202440e8b9b3c6d47a22eeaabe3eb9523360a166ca SHA512 34bb610360b4536da70ca9edf1e069ebbf0c9225948b92b3d59ea25e8684587364fa7bbb03909ba02617e6ee81d41a2e530c9ed639141e4cda42096143cab5f7
 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 4631 BLAKE2B 83cdf968e58cf57afcb3860670771ace003b0b1f159da7d34d5df33d6c8d3e29f50438577d1d0b7f88d291de0662282ec3b9b9b0228b3b1269cff7ee0196f592 SHA512 fcd6ad9bd8b4dce2e75ce3ab5606b28fd0cf8bba116176a355f6cd86e5874ad70044f27d30b5b2a9348ec10efadaf7f33685622153a9fa2e6c646f917ccbb4c2
+EBUILD asymptote-2.65.ebuild 4629 BLAKE2B 2a7ec12b9db7c4ecc297f90488589551bc6c47598f91ef1be2b5769dcdcda3a7bd21fab0ce3c22e2591139b711a375a12e70215d4eb592708a420cfb2f31ee7f SHA512 787257f2b70b8f9f2ccea3b595a967440570aa0a5b4141080c0a383e624dae7d483e11086747e3147de4128e3215bae12f3a2f902e2b25ed6327449717a717d9
+EBUILD asymptote-2.67.ebuild 4816 BLAKE2B afc3b823d83c7ad94fba1c04aeba5f77238b9b42e3e8b01950cda82f41aa657c77f6d9235f0e20c8495e85adc73bf008499759148ce5628ddac695e0d5f6e9ac SHA512 82e7b1c5f1add1e1f75e340fb1587c53c65357831800f414e522709042dea0f7373e183f36d981d63b9e681d3d8a5f5adfdb1f5bdb1c03cd7bc58f09fa825a4c
 MISC metadata.xml 1105 BLAKE2B 4b7d588a861ed68910f0d5a7b7f5691b3e97b6cf4514c3544c8610c77340797354575b49b70980320e55ecf5ea8188bbe8f6cc8fce55d18dc466f1d0fd83ade3 SHA512 f115ea831900270542ffe545260eda1ed51d321eca5aa7772f336bcc0e0c6471be3cbde2991c3e48ea5b3fbf51b8541b13de850406af15e42c992da0f2ed08ee
diff --git a/media-gfx/asymptote/asymptote-2.65.ebuild b/media-gfx/asymptote/asymptote-2.65.ebuild
index 4c2242fc1988..be68de6d52cb 100644
--- a/media-gfx/asymptote/asymptote-2.65.ebuild
+++ b/media-gfx/asymptote/asymptote-2.65.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/asymptote/asymptote-2.67.ebuild b/media-gfx/asymptote/asymptote-2.67.ebuild
new file mode 100644
index 000000000000..581f8fb50a44
--- /dev/null
+++ b/media-gfx/asymptote/asymptote-2.67.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=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/"
+SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	offscreen? ( opengl )
+	doc? ( boehm-gc )"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.4-r5:0=
+	>=sys-libs/readline-4.3-r5:0=
+	imagemagick? ( media-gfx/imagemagick[png] )
+	opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm )
+	offscreen? ( media-libs/mesa[osmesa] )
+	svg? ( app-text/dvisvgm )
+	sigsegv? ( dev-libs/libsigsegv )
+	boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] )
+	fftw? ( >=sci-libs/fftw-3.0.1 )
+	gsl? ( sci-libs/gsl )
+	python? ( ${PYTHON_DEPS} )
+	X? (
+		${PYTHON_DEPS}
+		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg]
+		dev-python/numpy
+		dev-python/pycson
+		>=gnome-base/librsvg-2.40
+		)
+	latex? (
+		virtual/latex-base
+		>=dev-texlive/texlive-latexextra-2013
+		)
+	emacs? ( >=app-editors/emacs-23.1:* )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-lang/perl
+		media-gfx/imagemagick[png]
+		virtual/texi2dvi
+		virtual/latex-base
+		app-text/ghostscript-gpl )
+	test? ( app-text/ghostscript-gpl )"
+
+TEXMF=/usr/share/texmf-site
+
+PATCHES=(
+	# Changing pdf, ps, image viewers to xdg-open
+	"${FILESDIR}/${P}-xdg-utils.patch"
+
+	# Bug #322473
+	"${FILESDIR}/${P}-info.patch"
+)
+
+src_prepare() {
+	sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \
+		-i configure.ac \
+		|| die "sed configure.ac failed"
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# for the CPPFLAGS see
+	# https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349
+	econf \
+		CPPFLAGS=-DHAVE_SYS_TYPES_H \
+		CFLAGS="${CXXFLAGS}" \
+		--disable-gc-debug \
+		$(use_enable boehm-gc gc system) \
+		$(use_enable fftw) \
+		$(use_enable gsl) \
+		$(use_enable opengl gl) \
+		$(use_enable offscreen) \
+		$(use_enable sigsegv)
+}
+
+src_compile() {
+	default
+
+	cd doc || die
+	emake asy.1
+	if use doc; then
+		# info
+		einfo "Making info"
+		emake ${PN}.info
+		cd FAQ || die
+		emake
+		cd .. || die
+		# pdf
+		einfo "Making pdf docs"
+		export VARTEXFONTS="${T}"/fonts
+		# see bug #260606
+		emake -j1 asymptote.pdf
+		emake CAD.pdf
+	fi
+	cd .. || die
+
+	if use emacs; then
+		einfo "Compiling emacs lisp files"
+		elisp-compile base/*.el
+	fi
+}
+
+src_install() {
+	# the program
+	dobin asy
+
+	# .asy files
+	insinto /usr/share/${PN}
+	doins -r base/*.asy base/shaders base/webgl
+
+	# documentation
+	dodoc BUGS ChangeLog README ReleaseNotes TODO
+	doman doc/asy.1
+
+	# X GUI
+	if use X; then
+		insinto /usr/share/${PN}
+		doins -r GUI
+		chmod +x "${D}"/usr/share/${PN}/GUI/xasy.py
+		dosym ../share/${PN}/GUI/xasy.py /usr/bin/xasy
+		doman doc/xasy.1x
+	fi
+
+	# examples
+	if use examples; then
+		insinto /usr/share/${PN}/examples
+		doins \
+			examples/*.asy \
+			examples/*.views \
+			examples/*.dat \
+			examples/*.bib \
+			examples/piicon.png \
+			examples/100d.pdb1 \
+			doc/*.asy \
+			doc/*.csv \
+			doc/*.dat \
+			doc/pixel.pdf \
+			doc/extra/*.asy
+		insinto /usr/share/${PN}/examples/animations
+		doins examples/animations/*.asy
+	fi
+
+	# LaTeX style
+	if use latex; then
+		cd doc || die
+		insinto "${TEXMF}"/tex/latex/${PN}
+		doins ${PN}.sty asycolors.sty
+		if use examples; then
+			insinto /usr/share/${PN}/examples
+			doins latexusage.tex externalprc.tex
+			insinto /usr/share/${PN}/examples/animations
+			doins ../examples/animations/*.tex
+		fi
+		cd .. || die
+	fi
+
+	# asymptote.py
+	if use python; then
+		python_foreach_impl python_domodule base/${PN}.py
+	fi
+
+	# emacs mode
+	if use emacs; then
+		elisp-install ${PN} base/*.el base/*.elc asy-keywords.el
+		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
+	fi
+
+	# vim syntax
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins base/asy.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins base/asy_filetype.vim
+	fi
+
+	# extra documentation
+	if use doc; then
+		cd doc || die
+		doinfo ${PN}.info*
+		dodoc ${PN}.pdf CAD.pdf
+		cd FAQ || die
+		dodoc asy-faq.ascii
+		doinfo asy-faq.info
+		docinto html/FAQ
+		dodoc asy-faq.html/*
+	fi
+}
+
+pkg_postinst() {
+	use latex && latex-package_rehash
+	use emacs && elisp-site-regen
+
+	elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
+	elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer'
+}
+
+pkg_postrm() {
+	use latex && latex-package_rehash
+	use emacs && elisp-site-regen
+}
diff --git a/media-gfx/asymptote/files/asymptote-2.67-info.patch b/media-gfx/asymptote/files/asymptote-2.67-info.patch
new file mode 100644
index 000000000000..c0812477115f
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.67-info.patch
@@ -0,0 +1,13 @@
+Index: asymptote-2.67/doc/asymptote.texi
+===================================================================
+--- asymptote-2.67.orig/doc/asymptote.texi
++++ asymptote-2.67/doc/asymptote.texi
+@@ -23,7 +23,7 @@ file LICENSE in the top-level source dir
+      
+ @dircategory Languages
+ @direntry
+-* asymptote: (asymptote/asymptote). Vector graphics language.
++* asymptote: (asymptote). Vector graphics language.
+ @end direntry
+ 
+ @titlepage
diff --git a/media-gfx/asymptote/files/asymptote-2.67-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.67-xdg-utils.patch
new file mode 100644
index 000000000000..a6a2c7daba0c
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.67-xdg-utils.patch
@@ -0,0 +1,23 @@
+Только в asymptote-2.67.orig: .pc
+Index: asymptote-2.67/settings.cc
+===================================================================
+--- asymptote-2.67.orig/settings.cc
++++ asymptote-2.67/settings.cc
+@@ -100,13 +100,13 @@ string defaultPSViewer="open";
+ string defaultPDFViewer="open";
+ string defaultHTMLViewer="open";
+ #else
+-string defaultPSViewer="gv";
+-string defaultPDFViewer="acroread";
+-string defaultHTMLViewer="google-chrome";
++string defaultPSViewer="xdg-open";
++string defaultPDFViewer="xdg-open";
++string defaultHTMLViewer="xdg-open";
+ #endif
+ string defaultGhostscript="gs";
+ string defaultGhostscriptLibrary="";
+-string defaultDisplay="display";
++string defaultDisplay="xdg-open";
+ string defaultAnimate="animate";
+ void queryRegistry() {}
+ const string dirsep="/";
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index a8d482d2523d..e80c5b569484 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,7 +1,10 @@
 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
-EBUILD blender-2.79b-r2.ebuild 8338 BLAKE2B 3511f43b0a51ccb8be44a498baf17b6ea57a7db401bfb5ba356be06f952c3e9ee79ba663df90f56c7a10968818003b6fb5300c40665dae85baf33d304924ca91 SHA512 718fc4cc414961a0dd934e4060a415dd0a55dc06d52f4db3b69a2e777a1c6f4c93cec0ebdb8d8638d443ae409d4f9be86d6f012a4740f31d92dc2e3618e19d41
-MISC metadata.xml 2508 BLAKE2B 1480c808bca37b380c6abd284f2dda8bcb023329d62ee383690adc0887e5e8294aa095eb7178d6ddd6d2e307711b7d4ab8c2fe461ba24cf4153b4e2b96108c36 SHA512 256115d6f93a5d8062758f0740aa1a48327002976df420088281782c6898d0e9c51ab945f26a334f5619a9b288dcc05bdbef5d358249ce350cd3e9d0e6435e26
+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
diff --git a/media-gfx/blender/blender-2.79b-r2.ebuild b/media-gfx/blender/blender-2.79b-r2.ebuild
index 1c922ac27481..977f12110a6a 100644
--- a/media-gfx/blender/blender-2.79b-r2.ebuild
+++ b/media-gfx/blender/blender-2.79b-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python3_6 )
 
-inherit check-reqs cmake-utils xdg-utils flag-o-matic xdg-utils \
+inherit check-reqs cmake-utils flag-o-matic xdg-utils \
 	pax-utils python-single-r1 toolchain-funcs eapi7-ver
 
 DESCRIPTION="3D Creation/Animation/Publishing System"
@@ -77,7 +77,7 @@ RDEPEND="${PYTHON_DEPS}
 	)
 	opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] )
 	openvdb? (
-		media-gfx/openvdb[${PYTHON_SINGLE_USEDEP},-abi3-compat(-),abi4-compat(+)]
+		<media-gfx/openvdb-7[abi4-compat]
 		dev-cpp/tbb
 		>=dev-libs/c-blosc-1.5.2
 	)
@@ -106,6 +106,7 @@ PATCHES=(
 	"${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"
 )
 
 blender_check_requirements() {
diff --git a/media-gfx/blender/blender-2.83.4.ebuild b/media-gfx/blender/blender-2.83.4.ebuild
new file mode 100644
index 000000000000..190185272e9c
--- /dev/null
+++ b/media-gfx/blender/blender-2.83.4.ebuild
@@ -0,0 +1,318 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 )
+
+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.xz"
+
+# Blender can have letters in the version string,
+# so strip off the letter if it exists.
+MY_PV="$(ver_cut 1-2)"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+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 )
+	standalone? ( cycles )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=[nls?,threads(+)]
+	dev-libs/lzo:2=
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
+	media-libs/freetype:=
+	media-libs/glew:*
+	media-libs/libpng:=
+	media-libs/libsamplerate
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/jpeg
+	virtual/libintl
+	virtual/opengl
+	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?] )
+	fftw? ( sci-libs/fftw:3.0= )
+	!headless? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	llvm? ( sys-devel/llvm:= )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( media-libs/openal )
+	opencl? ( virtual/opencl )
+	openimageio? ( media-libs/openimageio )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr:=
+	)
+	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] )
+	openvdb? (
+		~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?]
+		dev-libs/c-blosc:=
+	)
+	osl? ( media-libs/osl )
+	sdl? ( media-libs/libsdl2[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tbb? ( dev-cpp/tbb )
+	tiff? ( media-libs/tiff )
+	valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:=
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-python/sphinx[latex]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	nls? ( sys-devel/gettext )
+"
+
+blender_check_requirements() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	blender_check_requirements
+}
+
+pkg_setup() {
+	blender_check_requirements
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# we don't want static glew, but it's scattered across
+	# multiple files that differ from version to version
+	# !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
+	local file
+	while IFS="" read -d $'\0' -r file ; do
+		sed -i -e '/-DGLEW_STATIC/d' "${file}" || die
+	done < <(find . -type f -name "CMakeLists.txt")
+
+	# 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
+}
+
+src_configure() {
+	# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
+	# shadows, see bug #276338 for reference
+	append-flags -funsigned-char
+	append-lfs-flags
+
+	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=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-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_CXX_GUARDEDALLOC=$(usex debug)
+		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+		-DWITH_CYCLES=$(usex cycles)
+		-DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl)
+		-DWITH_CYCLES_STANDALONE=$(usex standalone)
+		-DWITH_CYCLES_STANDALONE_GUI=$(usex standalone)
+		-DWITH_CYCLES_OSL=$(usex osl)
+		-DWITH_DOC_MANPAGE=$(usex man)
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GTESTS=$(usex test)
+		-DWITH_HEADLESS=$(usex headless)
+		-DWITH_INSTALL_PORTABLE=OFF
+		-DWITH_IMAGE_DDS=$(usex dds)
+		-DWITH_IMAGE_OPENEXR=$(usex openexr)
+		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+		-DWITH_IMAGE_TIFF=$(usex tiff)
+		-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_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_PYTHON_INSTALL=$(usex system-python OFF ON)
+		-DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON)
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_STATIC_LIBS=OFF
+		-DWITH_SYSTEM_EIGEN3=ON
+		-DWITH_SYSTEM_GLEW=ON
+		-DWITH_SYSTEM_LZO=ON
+		-DWITH_TBB=$(usex tbb)
+		-DWITH_X11=$(usex !headless)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+	fi
+}
+
+src_test() {
+	if use test; then
+		einfo "Running Blender Unit Tests ..."
+		cd "${BUILD_DIR}"/bin/tests || die
+		local f
+		for f in *_test; do
+			./"${f}" || die
+		done
+	fi
+}
+
+src_install() {
+	# Pax mark blender for hardened support.
+	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"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+		docinto "html/API/blender"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+	fi
+
+	cmake_src_install
+
+	# fix doc installdir
+	docinto "html"
+	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+	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"
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	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"
+	elog "home directory. This can be done by starting blender, then"
+	elog "dragging the main menu down do display all paths."
+	elog
+	ewarn
+	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
+	ewarn "libraries which are shipped with blender. Note that"
+	ewarn "these have caused security issues in the past."
+	ewarn "If you are concerned about security, file a bug upstream:"
+	ewarn "  https://developer.blender.org/"
+	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."
+	ewarn "~/.config/${PN}/${MY_PV}/cache/"
+	ewarn "It may contain extra render kernels not tracked by portage"
+	ewarn ""
+}
diff --git a/media-gfx/blender/files/blender-2.79b-fix-opencollada.patch b/media-gfx/blender/files/blender-2.79b-fix-opencollada.patch
new file mode 100644
index 000000000000..ab1704864a02
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.79b-fix-opencollada.patch
@@ -0,0 +1,112 @@
+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/metadata.xml b/media-gfx/blender/metadata.xml
index c00fc6daf3f4..2432483fedd4 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -14,6 +14,16 @@
 		rendering, post-production, interactive creation and playback.
 	</longdescription>
 	<use>
+		<flag name="abi6-compat">
+			Build for OpenVDB ABI 6.
+		</flag>
+		<flag name="abi7-compat">
+			Build for OpenVDB ABI 7.
+		</flag>
+		<flag name="alembic">
+			Add support for Alembic through
+			<pkg>media-gfx/alembic</pkg>.
+		</flag>
 		<flag name="bullet">
 			Enable Bullet (Physics Engine).
 		</flag>
@@ -70,6 +80,18 @@
 		<flag name="player">
 			Build the Blender Player. THis requires the Game engine.
 		</flag>
+		<flag name="standalone">
+			Build the standalone version of Cycles.
+		</flag>
+		<flag name="system-numpy">
+			Use the system numpy implementation rather than a local copy.
+		</flag>
+		<flag name="system-python">
+			Use the system python implementation rather than a local copy.
+		</flag>
+		<flag name="tbb">
+			Use threading building blocks library from <pkg>dev-cpp/tbb</pkg>.
+		</flag>
 		<flag name="test">
 			Build the provided unit tests.
 		</flag>
diff --git a/media-gfx/cairosvg/Manifest b/media-gfx/cairosvg/Manifest
index f47ed26892eb..da9457bcdc45 100644
--- a/media-gfx/cairosvg/Manifest
+++ b/media-gfx/cairosvg/Manifest
@@ -1,5 +1,3 @@
-DIST CairoSVG-1.0.22.tar.gz 30896 BLAKE2B b1a4950a67159663bbc72189e57ce36bf2506733b4ff63319178540d242aafd29eb7f5c3993119a5034d3eb77df1dfdd8fed9c53966df13510fe910cbcbb8c43 SHA512 5f4ea7b80947092620827e454182af7332082a8c84fddc035f75ed19c09b4a9027d6bfd5c96e5f388150833788a71ab8fb77a1ffdd963b8106f07b1908a0c8f6
 DIST CairoSVG-2.4.2.tar.gz 38715 BLAKE2B 3c8f77561e13e0fdec371a601f09f0d107f972955c8e8fbc34f5092a7ff5f65b24338c20ae8e21b428eea083925a36b3e5635a9b0010c569d013169d919b7a35 SHA512 0d6dd22d9569fd3849cf7f6594c86bed719169dac1f0f3219e88d82f9d245bf29d51715159085cb26c0340c8f0dcb88412d141ec0ee3710b1477626f5a578441
-EBUILD cairosvg-1.0.22.ebuild 708 BLAKE2B 0c4ae60144019c0dcb7230ca9e9c864fce160bc173a9af147329888d0c1b719e5e8b55ca6a6881b35e96063266903c0f280da85572cdf72c481e0a8d613904e5 SHA512 deb1c685e2c91a284ab591bb5ac4f4a00265564cb945d060273c9b8bddcff7d454b0557d33976119465798352ded1996bcdb6fbeb0338d328d46a82a63db26c4
 EBUILD cairosvg-2.4.2.ebuild 872 BLAKE2B 4f326bdcaa5571e152cd438654fa0ffe4f9aa9465f0e88dce89f00c683506e932fd58fcd075d75f94f634e33d152c8b14a8dbdd8b467e087a6eb2c38d654a0fd SHA512 8bb35201de54b9f633516fa768925ac9b77245a8f8a89ddfea5ed12f01cf0ce57bb39deb24d3b3c11d8c0a59ace7fee30292b2ea175c29f88476e777b43935cf
 MISC metadata.xml 328 BLAKE2B 168e60e4dbd12e2b99ba4ad8a6f8f42ef5a4de12f8f1edc68ba4d1d4252b24995da5d0e4ef9e1db09b3934ba42b042685db625439425a6e98cde2f52050c4af1 SHA512 ebb7d9d27e014fd083d0abe9508040730f980ba8a0bc89670ee5418af2c3af036d0ec16b5607a8805944d3b7eeb835e8806ab059fed68c52268df1cd10d7bbb0
diff --git a/media-gfx/cairosvg/cairosvg-1.0.22.ebuild b/media-gfx/cairosvg/cairosvg-1.0.22.ebuild
deleted file mode 100644
index b51ea3c8cc8a..000000000000
--- a/media-gfx/cairosvg/cairosvg-1.0.22.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-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"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/tinycss[${PYTHON_USEDEP}]
-	dev-python/cssselect[${PYTHON_USEDEP}]
-	dev-python/cairocffi[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( NEWS.rst README.rst TODO.rst )
diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest
index 5a59bc6c2f52..d7b7640c98e2 100644
--- a/media-gfx/chafa/Manifest
+++ b/media-gfx/chafa/Manifest
@@ -1,5 +1,5 @@
 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 822 BLAKE2B 0910f237b704cc9122c8de1466b09d34eddeb94a7765947d6b2d44deaede9cb79641fcba9e2ec27bcab299696c682069d8647ab139e21774526001b4bd541932 SHA512 71f78174ef520ba23215d300944fbb81a25cfb2d43fde72b344cdb9080244981c5ee7e36ba4b8df66e78a1671ed5ee233f901faf1219d20350fac2726b3b3758
-EBUILD chafa-1.4.1.ebuild 822 BLAKE2B 0910f237b704cc9122c8de1466b09d34eddeb94a7765947d6b2d44deaede9cb79641fcba9e2ec27bcab299696c682069d8647ab139e21774526001b4bd541932 SHA512 71f78174ef520ba23215d300944fbb81a25cfb2d43fde72b344cdb9080244981c5ee7e36ba4b8df66e78a1671ed5ee233f901faf1219d20350fac2726b3b3758
-MISC metadata.xml 315 BLAKE2B 9ef556cf5e9857a485b26974ed7476d56ae22b35896ee2bcac66d9d73e356a20b1dcc9f44d3d6bd386f3c408cd222daba5719af6745bc883ce744357cbe2bd53 SHA512 fd5f62584e3b463a38b206997d0332e4cd4eb3b926cb66f59a92e3420fa2336937c12881531bc7ca4eb6a9ad00b704b0538c6326b13c34d26fbca550e658aad5
+EBUILD chafa-1.4.0.ebuild 862 BLAKE2B 934006cdbe8cb31ce8368470f5c6176dc072565daf8bf10501a2f61e213ab0fabbffc57226e178ddd67c5e0f027e55134658c9559ebb74b68cdc1422aaaae07b SHA512 2d852cd464a12bb6390af4e8f2ea75a46203f3f681d1b58ecee4dcc744280fabef5e12bc7949cb1b7c0cbac66ea26384c7025e76e1eec2e5eca7c06dd8de9291
+EBUILD chafa-1.4.1.ebuild 869 BLAKE2B db6ecd6db50d2b42c871962a2cf91da65695e25fd8b02de492a055d84db744d6b240dedc569bf551996c4ca2681770644f6492e7c7fb8e75a5dd2b4bb1ac09d0 SHA512 d4e0a8b5e19aaa7704c3e5962d33dd667131c821744d031b78c1dcaff4f976086e2e722caf0678c4b2ddaf57b5d4edc2b067d35a232e2333b0ff65417ea95fa5
+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
index c17b462fcc51..1a2aba138914 100644
--- a/media-gfx/chafa/chafa-1.4.0.ebuild
+++ b/media-gfx/chafa/chafa-1.4.0.ebuild
@@ -15,6 +15,7 @@ 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"
diff --git a/media-gfx/chafa/chafa-1.4.1.ebuild b/media-gfx/chafa/chafa-1.4.1.ebuild
index c17b462fcc51..36e373052197 100644
--- a/media-gfx/chafa/chafa-1.4.1.ebuild
+++ b/media-gfx/chafa/chafa-1.4.1.ebuild
@@ -9,12 +9,13 @@ SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~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"
diff --git a/media-gfx/chafa/metadata.xml b/media-gfx/chafa/metadata.xml
index 3816441b1234..715490a53a10 100644
--- a/media-gfx/chafa/metadata.xml
+++ b/media-gfx/chafa/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>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="tools">Build command-line tools</flag>
 	</use>
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 590997411d31..ed17ffb8e996 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -6,10 +6,12 @@ AUX darktable-find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b59cc73
 DIST darktable-2.6.2-gcc9.patch.tar.xz 25864 BLAKE2B 857803d4c46b47b1e06e962533c231621fa23e72dffae617bc4e078316fc22c5883df404b30e63d7ed2111078d0d7b54bfa3510524c92fa739238904e2ec17f0 SHA512 29b208fa0b04aa11a2c45312763ba471785b2d0f669c07a6092b82adc0284428d7dc9ea8ebae7bd851414f04191e6aafb434fcc127f062ef66d075208c7d49cb
 DIST darktable-2.6.2.tar.xz 3512572 BLAKE2B ee3070ac0f6b6b1c401865801631fb28397f484f30778065b7f899204813530a47ff6e752504b645f59bc29f868e1498e39f5f4e70f8259d8fecf5abc3f15cd6 SHA512 e7a90535747a8615fa2dbd1eb05f81314cc61c689a8a85fda0e2be40208ab0248e6f6ef296bb0894d3d527ed47c6cf6640538029c0c2d58a38d2d5ce10f6f5c0
 DIST darktable-3.0.2.tar.xz 3931240 BLAKE2B 5f86579a43e396c8116aba63c43e13d7312e5c3a569f9c242fe9a7882f02c5e0ebd7e4b9bbd34576eb83b3b78298038bf0d87bf4786dd19d0fa73ed30de21f67 SHA512 ee2d83f60621586f9e1be958f4b0c3d2214fbf30338837dbd07b901641c32d565cd29f814f5ff75a450495acee2383aa62ba3da3873009077704c925bab501f1
+DIST darktable-3.2.1.tar.xz 3920728 BLAKE2B 79ef5df93d6c4728d19bc8bf01d018f071efe1ea94a68be53fced7217df608e5362b9905e2e633af4d0a11574ca3e42eac9d97fd3bfaf3a22b45b61213f60070 SHA512 0c76f7c145b470d0b129e4565727cef0c7509c1cb7f2405e41b20c81411741513cfc2976c7b8fe168bc1b017e7bfc292bb2d824c3beddce6432ee7143513bdc7
 DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce SHA512 e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
 DIST darktable-usermanual-3.0.0.pdf 16237603 BLAKE2B ff5c24bb038deb37269a84389937740fa0ff77a9fb5bef4c484cdd903e39609588f632f577ce53c690d3abb832ace451d0d9d3f563ebdb6196ae8e2dac008a01 SHA512 2523b48e2baaa71561dc119340aed3bbf2ab4481dceb0c3ca2bbb7b0cacfaab894fa4eef82b667648cd7bb049304dbda09fa1a638f7734219b672b3ea8ee0eac
 EBUILD darktable-2.6.2.ebuild 3879 BLAKE2B 58de04e0d0b727c939ece0f11a3fccf30f2cd7e81ef11e6a64a4857d2bdfe77592e2e748dc64f34bd27b20603f1a2270e1af0d78b5d280f5d8c98bc403c38e68 SHA512 176fc9b85a1c4d5c28032e435e92c59299c857731c4c1e01490ca57aca18704187e0b62c5d9b7dcca4ac760cbefdf7a00eb3b66b036902ff7c4a6e3769b27f80
 EBUILD darktable-3.0.2-r1.ebuild 3888 BLAKE2B e402484fa08d1bbb949ad7381d6b0f0a370fd5c644b9fcbf2e190f65b4eded72580a28decb556795ce7aec7a147a3a147ba601162484358925f6f61e69f826df SHA512 d8e34da86742f2fe5cf2e04023dd0ca2b2ec9d22cff984eefca8246fe5dc5dab4c9633e4aa0585376e5c943617e1808b7f04b9355c162652446f42f2b1783f24
-EBUILD darktable-3.0.2.ebuild 3782 BLAKE2B 79f1f8dbb810a10274c40ff93ec59a74291dd7c3d9d7fad52b44b97a1b8211fb3ef314a4cb937d6886fb6ba150e7ba0c7d4244d3e6aef70bf4ea949dd8d0830e SHA512 8094322d7c29078718354d5fac8f9e9c8be01d4cddac4d30a033b42a1d5c757171e1a90e234170d81eaece1a1dc4d699850fc8ec02ed87fdcb10ee4df384cffc
+EBUILD darktable-3.0.2.ebuild 3781 BLAKE2B b541810d2da2a8758a77e6d9e4f2e3370c79f099f29b4aa884776b6a515eb5a5f76aa0854821e135eb7271db34ae6d2f0e581f1b896e17e958daa05aa889fc2a SHA512 e88070a5dd82642ea2fa3e1418587f185ab492da20d729db6ebda6b00f74b79fc313789cbb4a87e4f071f9c1da4040041a6477291aace42b2529b5640408dbbc
+EBUILD darktable-3.2.1.ebuild 3815 BLAKE2B ea75d2707a1248dccf730abea89407e790a644cfc60eac6de1ac45529c32ff4c0b623047087bc971c685bee89a4c4874be640ff629569167c1fd8bec71a3117d SHA512 397bb4bbb8eeadcd6bf998fbf7ef5d8d4b7c53b2c4422a9eaf1ead57db9945b4b992e72573cc2ad7766003202ebf345450299761ecccd93c52366a717785285c
 EBUILD darktable-9999.ebuild 3262 BLAKE2B aeadead1b20cd782e263b4f67f20d18255034626b9898273827baa60fb528d632ecb831b584bb0c0ed71e1226a9e32049e2bcc96b4d03c2ee5a9a725ef3858d2 SHA512 c323d686bcd203fc58833fdb89429440c801015dab82f26dfb4133e048a2f59449f6120fb6d0165177aa30a7f7c1d6acad08016286d7b989e7731a9e2f0bc4af
 MISC metadata.xml 1045 BLAKE2B 2094a1de028b4db282941604a3af2e608a4694b47d269293c09c1874594054a2457f44a94d9802eb84502c64c714a5af0499e2d2d67a71f61980906fc78acaf8 SHA512 1e0e67191daac03f5aebed02b7981a4944d4b0da4b00b8781fb79a1a362f260e51d182fdf10cf37494ab854cb7627ea4f7d279fad7191a53c0118e8d3c791166
diff --git a/media-gfx/darktable/darktable-3.0.2.ebuild b/media-gfx/darktable/darktable-3.0.2.ebuild
index 1584653803c3..482ed841310f 100644
--- a/media-gfx/darktable/darktable-3.0.2.ebuild
+++ b/media-gfx/darktable/darktable-3.0.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_P
 
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 LANGS=" ca cs da de es fr he hu it ja nb nl pl ru sl"
 # TODO add lua once dev-lang/lua-5.2 is unmasked
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
diff --git a/media-gfx/darktable/darktable-3.2.1.ebuild b/media-gfx/darktable/darktable-3.2.1.ebuild
new file mode 100644
index 000000000000..2ed26c6f2cd4
--- /dev/null
+++ b/media-gfx/darktable/darktable-3.2.1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic 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 ~x86"
+LANGS=" de es fr he it pl pt-BR ru sl"
+# TODO add lua once dev-lang/lua-5.2 is unmasked
+IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
+	lto nls opencl openmp openexr tools webp
+	${LANGS// / l10n_}"
+
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+COMMON_DEPEND="
+	dev-db/sqlite:3
+	dev-libs/json-glib
+	dev-libs/libxml2:2
+	>=dev-libs/pugixml-1.8:0=
+	gnome-base/librsvg:2
+	>=media-gfx/exiv2-0.25-r2:0=[xmp]
+	media-libs/lcms:2
+	>=media-libs/lensfun-0.2.3:0=
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	net-libs/libsoup:2.4
+	net-misc/curl
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/pango
+	colord? ( x11-libs/colord-gtk:0= )
+	cups? ( net-print/cups )
+	flickr? ( media-libs/flickcurl )
+	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	gphoto2? ( media-libs/libgphoto2:= )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	webp? ( media-libs/libwebp:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	opencl? (
+		>=sys-devel/clang-4
+		>=sys-devel/llvm-4
+	)
+"
+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() {
+	local mycmakeargs=(
+		-DBUILD_CURVE_TOOLS=$(usex tools)
+		-DBUILD_NOISE_TOOLS=$(usex tools)
+		-DBUILD_PRINT=$(usex cups)
+		-DCUSTOM_CFLAGS=ON
+		-DRAWSPEED_ENABLE_LTO=$(usex lto)
+		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
+		-DUSE_COLORD=$(usex colord)
+		-DUSE_FLICKR=$(usex flickr)
+		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DUSE_KWALLET=$(usex kwallet)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_LUA=OFF
+		-DUSE_MAP=$(usex geolocation)
+		-DUSE_NLS=$(usex nls)
+		-DUSE_OPENCL=$(usex opencl)
+		-DUSE_OPENEXR=$(usex openexr)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENMP=$(usex openmp)
+		-DUSE_WEBP=$(usex webp)
+	)
+	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
+
+	if use nls ; then
+		for lang in ${LANGS} ; do
+			if ! use l10n_${lang}; then
+				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
+			fi
+		done
+	fi
+}
+
+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/dcraw/Manifest b/media-gfx/dcraw/Manifest
index 656b99fa5dec..4534f90247ba 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 2943 BLAKE2B c7d50b8613f9585bf637c98246a9c40d0df3953330e807b90b17a6c3a86542496814847842d661e7d21b0bf19f0db94aea522e650b1784135d3d9a7322dd1912 SHA512 cdb2b035f760e755c16d608249613d2c94ecde91e1715a9f8380250764f6c0dbee6d92a2de2f5f579de87ff894c238137ecb908dee6b24b94e75a815ae5f4967
+EBUILD dcraw-9.28.0-r1.ebuild 2930 BLAKE2B 510de3b488d886fd7d3ebbe2985c023badfd0a5ac2a39df79e5ce0560864ea5d05d367fa6e6db94fc07e2266dd62a9da0fbc8235152ce9a4d12205fb8bc72cbe SHA512 5ec2ac9be6683c4cfc2b77a2e0f338329b7d72a59ef518d38295de5c6a4e0bb4f26150c75c8b0ce4d8f04e0f65a482de3aed9676cfb0745d85757b582fc6b7c3
 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-r1.ebuild
index ab87022b82a1..49ae04268c38 100644
--- a/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
+++ b/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW"
 IUSE="nls gimp jpeg lcms"
 
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 37da0c42d90b..fa13164eae01 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,7 +1,7 @@
 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.0.0-rc.tar.xz 566061948 BLAKE2B 0f167387c7110223764f203c829079eb677de0251f440b65d7dbc9c6b6e49a77d7e7bdd44d3f578338b7a06a3a7f694402b7a406537075c4cc32a3abb59cf159 SHA512 fbfb3b91038fa76b3f699304318f91e429f6ac51424f9895d48cf30b5319029a8e2b3791adba56b444329916d51fae5a8adc8f6aedbeae36fd165e781742119e
+DIST digikam-7.0.0.tar.xz 571511148 BLAKE2B 4730a7fd70c7939f229ce6e3e95e8e8f2c37d0e54f033b3161c27e93a2eb5d464a9e1339ba1d6acce4312f91dbc3f4b55333f8b7a9a32d58a20dd04c0fbd8d2b SHA512 379d319dddd49605ae59aa8aaebc96f264f7fdfd8d6fa51be8b097e79add4042072cbc1f52d7bc96e6045b967c01f282e50bf955923016ee6e0cfd07d09e2a24
 EBUILD digikam-6.4.0-r1.ebuild 4358 BLAKE2B ca4ffa68ef7be1191439f94f3d52916c2ef4cb06c1fca12017989290c55ae5f2e819d74286ebac80835792df81a895b3c7d002205c44d698129887e36ddc5ddc SHA512 dc14d9384b6c4ee943dd63ec5a6eb6f5fcde9539cbdc4a34d2e5f2467c83eacb9acbabfcba93ea731b5b97a0a7e5fb07e02dbbe4a35f0bc956883a9ff88bfceb
-EBUILD digikam-7.0.0_rc.ebuild 4084 BLAKE2B fab6cca649fa9ff160e754ec45a5c70a45139c92fc79d8b740c2e24250931a43d6a304c506445db8c4ae1cac3958dce5634ba2cca43719373a0f62617b6b5523 SHA512 3bb5113b79604ae17fdfeee9fffa730dbbb06e884033c9ecb7ab9d23bcc1e30f70d5cabf9d8535503170d953be6abefe21c59f9409aa33dd3946eccd656ba600
+EBUILD digikam-7.0.0.ebuild 4084 BLAKE2B fab6cca649fa9ff160e754ec45a5c70a45139c92fc79d8b740c2e24250931a43d6a304c506445db8c4ae1cac3958dce5634ba2cca43719373a0f62617b6b5523 SHA512 3bb5113b79604ae17fdfeee9fffa730dbbb06e884033c9ecb7ab9d23bcc1e30f70d5cabf9d8535503170d953be6abefe21c59f9409aa33dd3946eccd656ba600
 MISC metadata.xml 1368 BLAKE2B 5dec50abba4f748e1f8eb465807c719f4b81759277241169d9e721749a1ba807425f7d46e9feb1edb4dcf3b4dd00b40bfbb353fe479e29c8a1878ad1fbfb5082 SHA512 4cd1ada9c4274338e49a692095d80b572c309bd34c838e2663a18ec1e7230de87e27087febfedde46a0f6af19f1a3f440335750375117d20eacd0c756db8b2f8
diff --git a/media-gfx/digikam/digikam-7.0.0_rc.ebuild b/media-gfx/digikam/digikam-7.0.0.ebuild
index 742181ff7bbb..742181ff7bbb 100644
--- a/media-gfx/digikam/digikam-7.0.0_rc.ebuild
+++ b/media-gfx/digikam/digikam-7.0.0.ebuild
diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
index ee36b2e2c817..a6bdd52c3981 100644
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -1,5 +1,6 @@
 AUX enblend-4.2-doc-install-dir-fix.patch 2705 BLAKE2B a5bfb43521095bc088aef980f849cfb9cb2e7e9ae2a10b2fcd4b56cd7b27888047567c3b95b40e3a8feefe7ee9209db49688800986cc895731e0949acd3bae1c SHA512 a22730295c44da4f9feb3d541b17f298adf98f0328cf01d6a85206087c782e1aebac6509968d1a5433efb5fc3d72e48301ec3d5a2516f01c1f6d923d5032ab03
 AUX enblend-4.2.0_p20161007-cmake.patch 477 BLAKE2B 9a27d95e78cc611c723824a300dbc3eaeb7c2ffe6bcacb19baeb8a24180450f2912310ae9584f450899ececca11636304d36631f8c57f6d4b7c2450043d6f147 SHA512 5b79944beabd97f71f05657ce17e31d9eab60506dfce27fefc3a8f9a10c92f33b1b4fa1411c6d1a33d23819a4020a50f130b9083fecaf3e1a072fda71e5f9ff0
+AUX enblend-4.2.0_p20161007-gcc-10.patch 312 BLAKE2B bbc8521bb1c2b9f3f67dedffdbcab952628fc252d2ed81c37e469f06596f2cb9ab5907c7fc97de1dbfe408e29312c55d08b189b8e6f46215540e64354fbfd60a SHA512 9ed03b22237e1bf297db0daca2b5dd6aa7ad5cd9bf333e507160b7bbf24eb37be173c79314ce1cff7a7df10ba262266ca54f52c8ec6d85a7a411b78bef76d91e
 DIST enblend-4.2.0_p20161007.tar.xz 494060 BLAKE2B 8842dd70a1400a27170794246cb5c89d60b6798373e3a9d63e88738ad569e1174cb4303ccb5a2bc79846651e982e05f8cb9ac3e09b83ee33958b6ccf043ebda9 SHA512 ede037f19a7c3b358f533ecfb235f70824261eaf189d0bdcde6f9cedaa5952be2a6940884e688418b725cb3a67fc1b7d366483a76b7c62326ca857b8efe3a3f3
-EBUILD enblend-4.2.0_p20161007-r1.ebuild 1757 BLAKE2B ba4703076454bc019231877a83feae0971bf755f2d54c4c893731d3bbc0fac47f391cb096a2b0e76c3b8d267c6a36c5977d47160b181c4842cd7e4f8a8b9f99b SHA512 344602f430cfeef0f6cc4998dea06282764dc52eda552bc612dd46dce4b4ae137b0e166c017f9acc8afaececdde53e6d279cba62d19b1ce27d3bf326f0959dba
+EBUILD enblend-4.2.0_p20161007-r1.ebuild 1790 BLAKE2B f003df21942649e91d7a19ae8378d11e63810e72ca99f85d7cc4e7c1ce1935a61ca4b650dde5bfc5ee15325ddefe0c735ea2c14c489de44799c9b01b4ba6e6c3 SHA512 afce2232c64ffc1d15eb076baae2938504561f4c09c1e5c74da4a9805b3e29f107dff91a473d707556dc5307e30885e3524b09b0d17ba97bb30542f6f72790e9
 MISC metadata.xml 437 BLAKE2B 38a5768a400aafc32f2dd5412d889578950c3b2443487ad3c82388624c343f42d19034f7476d22f0b036d8b801610ec7b80aaf9d68367146c25ab8af60154a8b SHA512 937c99056596c0c809eaae348f68a42b8e666a5566f10fd639be559ea0b5f9678369efd191aeec42cd1ff26cce72aef8b56e3ea05fb2ca9df10b3a1f8fb04b4c
diff --git a/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild b/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
index 9049ae5c5e7b..b72cb407f8d9 100644
--- a/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
+++ b/media-gfx/enblend/enblend-4.2.0_p20161007-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
@@ -49,6 +49,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.2-doc-install-dir-fix.patch
 	"${FILESDIR}"/${P}-cmake.patch
+	"${FILESDIR}"/${P}-gcc-10.patch
 )
 
 src_prepare() {
diff --git a/media-gfx/enblend/files/enblend-4.2.0_p20161007-gcc-10.patch b/media-gfx/enblend/files/enblend-4.2.0_p20161007-gcc-10.patch
new file mode 100644
index 000000000000..7203d6b667b1
--- /dev/null
+++ b/media-gfx/enblend/files/enblend-4.2.0_p20161007-gcc-10.patch
@@ -0,0 +1,16 @@
+Fix build with GCC-10.
+
+Thanks-to: Walter Hüttenmeyer
+Bug: https://bugs.gentoo.org/724988
+
+--- a/src/minimizer.cc	2016-09-24 11:29:40.000000000 +0200
++++ b/src/minimizer.cc	2020-05-24 13:09:58.199170984 +0200
+@@ -19,7 +19,7 @@
+  */
+ 
+ #include <gsl/gsl_errno.h>
+-
++#include <limits>
+ #include "minimizer.h"
+ 
+ 
diff --git a/media-gfx/entangle/Manifest b/media-gfx/entangle/Manifest
index b0aea091105e..c9933a3983c8 100644
--- a/media-gfx/entangle/Manifest
+++ b/media-gfx/entangle/Manifest
@@ -1,3 +1,5 @@
 DIST entangle-2.0.tar.xz 501912 BLAKE2B b7e1c393dc95d66bf4389c607c0eb6eb70161ceb2c845135c7c99313a1ec13388c6b00fd6ed7f38ad6f9f18d8c97eba0aadab7964d1be8ec03373e5598374796 SHA512 be8b75c5dd0bdd7cd380f35b5d46d7be9f7caa2be257ce954cf9516ebd5601071ac8b50838f9c40470b6e3e5f95083c3671af68ac43eb345a60d674636a0fe86
+DIST entangle-3.0.tar.xz 518808 BLAKE2B fe2bf4b114bc04fdc56792f984ae7387b70d693fa82f8deaa2023de71a8bba72bc95d4bfc430cdfaf5244e9114b4f7e8bb2e17f3b86de6529037519fa3877899 SHA512 8c6d7e067f88a770c63b76fde2a6ae71894aae95477fcf66b4670697889fdf7939d3f95532626d6f4ca7ae75841d8f247f6bcf78a1ce195b540989f1bfe5ebdd
 EBUILD entangle-2.0.ebuild 1609 BLAKE2B 37cf9af5ed3a495629b477c8f41129f51030e362c2c18510c363f6f6e3d878f0d47dcd0a98645e8dd8e79e075b07b171fcf5b12885a502d773c8e1014bc5191f SHA512 9ab26a4e189119a59cf65c3c591c44f6f934782a3a8e25b8e9dde4df2055aa83b2c1b380c6acea60e5ca2e3926aa791bc25aa3ef16ad4c2a04dce92b205793d1
+EBUILD entangle-3.0.ebuild 1634 BLAKE2B 38a0424e06986024877f9ed84ee21eaeb48376cec721679d6d4372a2795d422b2d759129cedc21eb4c86b4bd5481e587b97637a5ccf3bf8f18c1bc97fb3d9f05 SHA512 48f22c44a3d5553e594d61d0786186ff8bd6bc6d6af7bb2bdcb61dbf1058d6e24ec4d7ebbd4c01729a5a22f64bfca5ca69ab60e903e20c385e228c7bc32af435
 MISC metadata.xml 446 BLAKE2B 1c466f17b5df47045169784918723e953945eaad2eb5879cde6f099feec4cb419e867f77879927933fe3daec259184a361f464b968b19bdf3463b01b7371589d SHA512 555966a8638a027288abdc7ba6d625c15c18792c3401d399a12dc256ec75f14882fce3e70596a3f3e2ed6729e471af04b14d520b8e2e70206a172f98b9967dae
diff --git a/media-gfx/entangle/entangle-3.0.ebuild b/media-gfx/entangle/entangle-3.0.ebuild
new file mode 100644
index 000000000000..59d37d09fd03
--- /dev/null
+++ b/media-gfx/entangle/entangle-3.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+inherit gnome2-utils meson python-single-r1 xdg-utils
+
+DESCRIPTION="Tethered Camera Control & Capture"
+HOMEPAGE="https://entangle-photo.org/"
+SRC_URI="https://entangle-photo.org/download/sources/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/gobject-introspection-1.54.0
+	dev-libs/libgudev:=
+	>=dev-libs/libpeas-1.2.0[gtk,${PYTHON_SINGLE_USEDEP}]
+	>=media-libs/gexiv2-0.10[introspection]
+	>=media-libs/libgphoto2-2.5.0:=
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	media-libs/lcms:2
+	>=media-libs/libraw-0.9.0
+	>=x11-libs/gdk-pixbuf-2.12.0:2
+	>=x11-libs/gtk+-3.22:3[introspection]
+	>=x11-libs/libXext-1.3.0
+	>=x11-libs/pango-1.40.11
+	x11-themes/adwaita-icon-theme"
+RDEPEND="${DEPEND}"
+
+# perl for pod2man
+BDEPEND="
+	app-text/yelp-tools
+	dev-lang/perl
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_compile() {
+	# prevent gst from loading system plugins which causes
+	# sandbox violations on device access
+	local -x GST_PLUGIN_SYSTEM_PATH_1_0=
+	# pre-generate enums to resolve race conditions
+	# https://bugs.gentoo.org/709740
+	meson_src_compile \
+		src/backend/entangle-{camera,colour-profile}-enums.h \
+		src/frontend/entangle-image-display-enums.h
+	meson_src_compile
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index 00e15b24a983..7de89b73a449 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,3 +1,5 @@
 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 1690 BLAKE2B 44cad63aad7db7c197dbca6f8950179f66cded046c54ec12cd2c8cb27044a4ad7f5e05ac4cf3bc6ec298201331c2d9d381206e9b771f091094319041edfcf500 SHA512 206fcee5d41e6117b0f5708311aaeb24fb5e5e09e2345cb78efead1c676e9fc39c55b8f86ee07aa6a6cc5715c1c5950c038f9b529c2b59ffb77ee0fd9071b033
 MISC metadata.xml 428 BLAKE2B b10706bb7638538d5ce63c9787e7a1730e01c8383f2d2a093e38184b031933d2b3749241aa2f3254be4c84fac104bb8ec72940cdf8cd5a9f7bc0944541b015c6 SHA512 9684f07846ce7e49ad82843c2b8b7ac5c9d7124bddb07778292d6810162e89a3d41e7ca426f331e4bae6ecfbe53f71409b35418affba6382e874c78b64ed102f
diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.5.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.5.ebuild
new file mode 100644
index 000000000000..897a10d8bda6
--- /dev/null
+++ b/media-gfx/eog-plugins/eog-plugins-3.26.5.ebuild
@@ -0,0 +1,66 @@
+# 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 af574e61a168..d65c65ada5fd 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,3 +1,5 @@
 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 1558 BLAKE2B fc7954cbc8763a3d4037bfc445576b8a1e0b7f5db72e59e5d5f35879a59c12a0ce96d1ae68fd2af8eeb4218082c0af2bd9f9d47f8ea68a8080ee1b317de636f9 SHA512 f2527c036b67ff6cd1d9047014117f65b6497ecf4fe09398301d32ae97b9ff8ae21665138e4565cec2d747e83815f9312ca08a50546dcf7ca3144f9321c37dfd
 MISC metadata.xml 481 BLAKE2B 2c12b594b9a5b1e4ce3983131d1911f62026c5186d8f5c5af13842cfedfa4d20abdc5ee82e11db3a2e1b45e2b8d4d95fa1a62e668936956e8453b166daff00b4 SHA512 141ec1d6923697f744de806804279b602120ce3d5494257de36b8c8b71185d101692f2e438d7ba0e4a4c946d0aaba068117f16c8344abe891e0ddd4f768ded26
diff --git a/media-gfx/eog/eog-3.36.3.ebuild b/media-gfx/eog/eog-3.36.3.ebuild
new file mode 100644
index 000000000000..75800455eb94
--- /dev/null
+++ b/media-gfx/eog/eog-3.36.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="The Eye of GNOME image viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
+
+LICENSE="GPL-2+"
+SLOT="1"
+
+IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
+REQUIRED_USE="exif? ( jpeg )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.53.4:2
+	>=dev-libs/libpeas-0.7.4:=[gtk]
+	>=gnome-base/gnome-desktop-2.91.2:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=x11-misc/shared-mime-info-0.20
+	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
+	>=x11-libs/gtk+-3.22.0:3[introspection,X]
+	sys-libs/zlib
+
+	exif? ( >=media-libs/libexif-0.6.14 )
+	lcms? ( media-libs/lcms:2 )
+	xmp? ( media-libs/exempi:2 )
+	jpeg? ( virtual/jpeg:0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	svg? ( >=gnome-base/librsvg-2.44.0:2 )
+
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? ( >=dev-util/gtk-doc-1.16
+		app-text/docbook-xml-dtd:4.1.2 )
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use exif libexif)
+		$(meson_use lcms cms)
+		$(meson_use xmp)
+		$(meson_use jpeg libjpeg)
+		$(meson_use svg librsvg)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		-Dinstalled_tests=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
index d2dc07a4b110..8427f864890d 100644
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@@ -1,5 +1,6 @@
+AUX eom-1.24.0-add-gdk-includes.patch 798 BLAKE2B db2156dadd2458100624a01e0724f7520529ace1aeabf78544aa780d91fe57d8db7aee8934401ede46810a8ee8f53f26d0e7304605386fd6fba080825c70abae SHA512 3a487cbbbfd94240858cb0a7221b9515720aeaab7adea3e7dd8be2d05d0369f5d3ecd5e3afc4ceb1cda0e2aecc0c72d0cae796f70ed181a90944e3d5d76a31f2
 DIST eom-1.22.2.tar.xz 2158376 BLAKE2B 88d8b635af5b37f1ee4a36c08eb6f4a50cada86f605ab5927b031458f7f36191fa76457263ce38a9f8a02b7ba59308655b5df7039a73083192bf89c15fbee32f SHA512 1045c6bb98056ad707b0acf509c12e0400c21238482bf801abc6b69252f2ffe9687f7fda8b7e09c6338bc80794b104cbb42c1ea89ff1f169c45fdc1fcbdbeabe
 DIST eom-1.24.0.tar.xz 2433420 BLAKE2B 58f99ba3cf0df3594c459af691cc6ab281657facb49bc3b6101bec1718b165b72b882aabd9abac3c4981b547157aa64d2f24f174fccae06cdaa685728e49740c SHA512 17d26a9341cde0a86f8d8b65008f554398111d80f5d131441654bd9e907df9c9d696038e678aca8d7f4bd2923ff593f626735a3cc30451118818cdbebceb87ab
 EBUILD eom-1.22.2.ebuild 1390 BLAKE2B f9feb1b56216987a705e5b39eecb886bd5cace7ef66b00540a66d06c65a4d9d93e4dc0b013db05b04826835c310ab2c71023757a74f14d7ef10f29763d025125 SHA512 e93fae7450900205833fcfc45b046d536fc119684f992503b99e08709d54a04b81074ff373c49ce00ef7645c7f81edf69a6f82c10f4f7d1cae120f85e9735f14
-EBUILD eom-1.24.0.ebuild 1605 BLAKE2B d3b052ef8c91f55a20a087b5c233b30891c6637e1c9000f3c0a168ed192370dc55f921b553186c3b03d1993dffdde145a9395593529e2b3e66ca3499ce4c79cc SHA512 00860a79f7a18c077306e72534d7f290a902e6c9ad60b96de8b990b0811c6e9dc21e00c87c41d62f31034250a623e593ef592115fcf5d83618cc7bee4b68a0f9
+EBUILD eom-1.24.0-r2.ebuild 1666 BLAKE2B 7c8b1982b350e085321620d4e155526336e3e05b0c662e4c1547e335883f2919e4192c5836ea5b0121dc8fb64e471c3b1c26493e8cc82526b16092e71029bd5e SHA512 a88659a60d9382a6d3db22ffdb7dcf633bece393ab7d56905ef11f071487933cef476ea6af36fd1d79ed61007520e6fce38837105708f791baec892144f6a2b9
 MISC metadata.xml 467 BLAKE2B 5314ab156ff29533e419e8d6b82d634bd3ffd7898e8125525d2d45460dfa464c8c9a7311f3fb69e33172b523e85816d6ecaba0487087dacafd42e31cb261e3d7 SHA512 d21cd9729f0f8bde3caec98e3a7f75de8075b129651b7c25d386cbd1cf9f4a41972f48a6addb7180ae40a0c2a626a5508dab5736ed71d60b56bdd2132d479854
diff --git a/media-gfx/eom/eom-1.24.0.ebuild b/media-gfx/eom/eom-1.24.0-r2.ebuild
index c1052d39a53b..0eaa2620b201 100644
--- a/media-gfx/eom/eom-1.24.0.ebuild
+++ b/media-gfx/eom/eom-1.24.0-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="The MATE image viewer"
@@ -54,6 +54,8 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}/eom-1.24.0-add-gdk-includes.patch" )
+
 src_configure() {
 	mate_src_configure \
 		--enable-thumbnailer \
@@ -63,7 +65,7 @@ src_configure() {
 		$(use_with exif libexif) \
 		$(usex imagemagick \
 			--without-gdk-pixbuf-thumbnailer \
-			--with-gdk-pixbuf-thumbnail \
+			--with-gdk-pixbuf-thumbnailer \
 		) \
 		$(use_with jpeg libjpeg) \
 		$(use_with lcms cms) \
diff --git a/media-gfx/eom/files/eom-1.24.0-add-gdk-includes.patch b/media-gfx/eom/files/eom-1.24.0-add-gdk-includes.patch
new file mode 100644
index 000000000000..ced5dbcdd9fa
--- /dev/null
+++ b/media-gfx/eom/files/eom-1.24.0-add-gdk-includes.patch
@@ -0,0 +1,29 @@
+From 3b76a9f57ea65a7ebd22395eb5d3fda9cc929e8c Mon Sep 17 00:00:00 2001
+From: NP-Hardass <np.hardass@gmail.com>
+Date: Tue, 4 Aug 2020 19:35:28 -0400
+Subject: [PATCH] eom-metadata-reader: add gdk/gdk.h include to resolve #258
+
+be4fa2808c4e1a36c2c9b58c1267a54cdda6e495, enable wayland support
+
+added "defined(GDK_WINDOWING_x11)" macros without the accompanying gdk
+headers
+---
+ src/eom-metadata-reader.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/eom-metadata-reader.c b/src/eom-metadata-reader.c
+index cd796f0..2c93a14 100644
+--- a/src/eom-metadata-reader.c
++++ b/src/eom-metadata-reader.c
+@@ -23,6 +23,8 @@
+ #include <config.h>
+ #endif
+ 
++#include <gdk/gdk.h>
++
+ #include "eom-metadata-reader.h"
+ #include "eom-metadata-reader-jpg.h"
+ #include "eom-metadata-reader-png.h"
+-- 
+2.26.2
+
diff --git a/media-gfx/exact-image/Manifest b/media-gfx/exact-image/Manifest
index 00764ff7a9a6..382f331dd8d9 100644
--- a/media-gfx/exact-image/Manifest
+++ b/media-gfx/exact-image/Manifest
@@ -1,6 +1,10 @@
 AUX exact-image-0.7.5-libpng14.patch 2435 BLAKE2B ca832920ad7bd1b2f1def6faa04e0b7d70d177f859966ef44223ab6c26813d857456e8adc70367c4275338a778e23dd158694ef826da47070abe3e789c5f0df6 SHA512 4f216f96c4190c4f04991368d92e685592f694cb3c9f5dab90281a9bc1f06c9fcaa817494fb15412f5dc427750558019b6e2aeef8769ed932e974e201776bd48
 AUX exact-image-0.8.1-gcc6.patch 6101 BLAKE2B 3dba7f2688a5c59282486f492131edaf104c3c9e7d335f1893467ef6d968b466e344ae1c1992ea080cee4d267001dd6555aaea3a23dfbb0a5748c5262d364fbb SHA512 e11a9dca3c5c6ac4ca5557e6ca212354346b307c38abe77ceaea9f15ef35f5a8de8d24628b290c4ecfdaf84dee44af49414d57c89b067e78b60a02d4e09a5dd4
 AUX exact-image-0.8.1-libpng15.patch 754 BLAKE2B 81b47c6198103f37cc5f0a382001129a10140bead8f98119eb52079ed97d67d9bfd56b60278023f680d66107aaa6f2dea4a035a194c404e33e548f2e37f90f49 SHA512 7f3d271d908e55e3731b38e072dcadcb0d99cbf3de327d5bd486e232c2827055b8f712052e04c9bc81b20fd42d27cc18627a6bc118c9d1ece58b91c18fa9bf13
+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
 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 2261 BLAKE2B 8a32e0ba2118ca0f17eab822ca025599b8c8bc6492f59a4bc7fdbc0779545407e9d580b0649d8b221340af4e3eccc9a7bd088eb520092f490aa78bf339d2436e SHA512 4f9b9a1ce0fa1bd92f0744fc1888f54957e4d915666bd08a52f4c32b9ce2f68b54ed350615a03fe1522bfef0ebaadea462a33a8581e1b4d014a3064ca1dfa8f9
 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
new file mode 100644
index 000000000000..0cea0d26cf53
--- /dev/null
+++ b/media-gfx/exact-image/exact-image-1.0.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A fast, modern and generic image processing library"
+HOMEPAGE="http://www.exactcode.de/site/open_source/exactimage/"
+SRC_URI="http://dl.exactcode.de/oss/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="expat jpeg lua openexr php perl png ruby swig tiff truetype X"
+
+RDEPEND="x11-libs/agg[truetype]
+	sys-libs/zlib
+	expat? ( dev-libs/expat )
+	jpeg? ( virtual/jpeg )
+	lua? ( dev-lang/lua:= )
+	openexr? ( media-libs/openexr )
+	php? ( dev-lang/php:* )
+	perl? ( dev-lang/perl )
+	png? ( >=media-libs/libpng-1.2.43 )
+	ruby? ( dev-lang/ruby:* )
+	tiff? ( media-libs/tiff )
+	truetype? ( >=media-libs/freetype-2 )
+	X? (
+		x11-libs/libXext
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	swig? ( dev-lang/swig )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc6.patch
+	"${FILESDIR}"/${P}-g++.patch
+)
+
+src_prepare() {
+	default
+
+	# Respect user CFLAGS/CXXFLAGS.
+	sed -i \
+		-e '/C\(XX\)\?FLAGS =/s/-O2//' \
+		-e "\$aCFLAGS += ${CFLAGS}\nCXXFLAGS += ${CXXFLAGS}" \
+		Makefile || die
+
+	# Show commands.  Use qualified CC/CXX.
+	sed -i \
+		-e '/^Q =/d' \
+		-e '/^\t@echo /d' \
+		-e "\$aCC:=$(tc-getCC)\nCXX:=$(tc-getCXX)" \
+		build/bottom.make || die
+
+	# The copied string fits exactly.  Use memcpy to reflect that a null
+	# terminator is not needed.
+	sed -i \
+		-e 's/strcpy(\([^,]*\)\(,["a-zA-Z -]*\))/memcpy(\1\2, sizeof(\1))/' \
+		codecs/tga.cc || die
+}
+
+src_configure() {
+	# evas -> enlightenment overlay
+	# bardecode -> protected by custom license
+	# libungif -> not supported anymore
+	# python -> allegedly not python3, but python2 only
+
+	./configure \
+		--prefix=/usr \
+		--libdir=/usr/$(get_libdir) \
+		$(use_with X x11) \
+		$(use_with truetype freetype) \
+		--without-evas \
+		$(use_with jpeg libjpeg) \
+		$(use_with tiff libtiff) \
+		$(use_with png libpng) \
+		--without-libgif \
+		--without-jasper \
+		$(use_with openexr) \
+		$(use_with expat) \
+		--without-lcms \
+		--without-bardecode \
+		$(use_with lua) \
+		$(use_with swig) \
+		--without-python \
+		$(use_with perl) \
+		--without-python \
+		$(use_with php) \
+		$(use_with ruby) || die
+}
diff --git a/media-gfx/exact-image/files/exact-image-1.0.2-g++.patch b/media-gfx/exact-image/files/exact-image-1.0.2-g++.patch
new file mode 100644
index 000000000000..29370eaa9aba
--- /dev/null
+++ b/media-gfx/exact-image/files/exact-image-1.0.2-g++.patch
@@ -0,0 +1,22 @@
+--- a/configure	2020-07-23 19:16:47.199283125 +0200
++++ b/configure	2020-07-23 19:17:01.229075367 +0200
+@@ -19,19 +19,6 @@
+ 
+ parse_options $*
+ 
+-compile c++ available.c ||
+-	status_error "A C++ compiler is not installed or does not work correctly.
+-A C++ compiler is vital for exact-image - so you need to install it first."
+-
+-compile c++ stl.c template.c template-specialization.c \
+-        partial-template-specialization.c function-template.c \
+-        || status_error \
+-	"At least one of the advanced ANSI C++ tests failed. Since these
+-features are vital for exact-image you need to update to a more recent compiler first."
+-
+-headercheck c++ iostream string iostream sstream fstream ||
+-	status_error "Not all tested STL headers are present - please install them."
+-
+ pkgcheck x11 compile X11 atleast 11.0
+ pkgcheck libagg pkg-config LIBAGG atleast 2.3 ||
+ 	status_error "Anti-Grain Geometry was not found, since it is vital
diff --git a/media-gfx/exact-image/files/exact-image-1.0.2-gcc6.patch b/media-gfx/exact-image/files/exact-image-1.0.2-gcc6.patch
new file mode 100644
index 000000000000..10fb38d6d658
--- /dev/null
+++ b/media-gfx/exact-image/files/exact-image-1.0.2-gcc6.patch
@@ -0,0 +1,64 @@
+Bug: https://bugs.gentoo.org/600380
+
+--- a/bardecode/code25i.hh
++++ b/bardecode/code25i.hh
+@@ -21,6 +21,12 @@
+ 
+ #include "scanner_utils.hh"
+ 
++#if __cplusplus >= 201103L
++#define STATIC_CONST_DOUBLE static constexpr double
++#else
++#define STATIC_CONST_DOUBLE static const double
++#endif
++
+ namespace BarDecode
+ {
+     struct code25i_t
+@@ -31,11 +37,11 @@
+         static const int END_SEQUENCE = 0xD;
+         static const char no_entry = 0;
+ 
+-        static const double n_lq = 15;
+-        static const double n_hq = 5.3;
+-        static const double w_lq = 5.2;
+-        static const double w_hq = 1.5;
+-        static const double tol = 0.2;
++        STATIC_CONST_DOUBLE n_lq = 15;
++        STATIC_CONST_DOUBLE n_hq = 5.3;
++        STATIC_CONST_DOUBLE w_lq = 5.2;
++        STATIC_CONST_DOUBLE w_hq = 1.5;
++        STATIC_CONST_DOUBLE tol = 0.2;
+ 
+         static const usize_t min_quiet_usize = 5;
+         //static const usize_t min_quiet_usize = 10;
+--- a/codecs/dcraw.h
++++ b/codecs/dcraw.h
+@@ -3958,22 +3958,22 @@
+     -2,+0,+0,-1,0,0x06, -2,+0,+0,+0,1,0x02, -2,+0,+0,+1,0,0x03,
+     -2,+1,-1,+0,0,0x04, -2,+1,+0,-1,1,0x04, -2,+1,+0,+0,0,0x06,
+     -2,+1,+0,+1,0,0x02, -2,+2,+0,+0,1,0x04, -2,+2,+0,+1,0,0x04,
+-    -1,-2,-1,+0,0,0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01,
+-    -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,0x88, -1,-1,+1,-2,0,0x40,
++    -1,-2,-1,+0,0,(signed char) 0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01,
++    -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,(signed char) 0x88, -1,-1,+1,-2,0,0x40,
+     -1,-1,+1,-1,0,0x22, -1,-1,+1,+0,0,0x33, -1,-1,+1,+1,1,0x11,
+     -1,+0,-1,+2,0,0x08, -1,+0,+0,-1,0,0x44, -1,+0,+0,+1,0,0x11,
+     -1,+0,+1,-2,1,0x40, -1,+0,+1,-1,0,0x66, -1,+0,+1,+0,1,0x22,
+     -1,+0,+1,+1,0,0x33, -1,+0,+1,+2,1,0x10, -1,+1,+1,-1,1,0x44,
+     -1,+1,+1,+0,0,0x66, -1,+1,+1,+1,0,0x22, -1,+1,+1,+2,0,0x10,
+     -1,+2,+0,+1,0,0x04, -1,+2,+1,+0,1,0x04, -1,+2,+1,+1,0,0x04,
+-    +0,-2,+0,+0,1,0x80, +0,-1,+0,+1,1,0x88, +0,-1,+1,-2,0,0x40,
++    +0,-2,+0,+0,1,(signed char) 0x80, +0,-1,+0,+1,1,(signed char) 0x88, +0,-1,+1,-2,0,0x40,
+     +0,-1,+1,+0,0,0x11, +0,-1,+2,-2,0,0x40, +0,-1,+2,-1,0,0x20,
+     +0,-1,+2,+0,0,0x30, +0,-1,+2,+1,1,0x10, +0,+0,+0,+2,1,0x08,
+     +0,+0,+2,-2,1,0x40, +0,+0,+2,-1,0,0x60, +0,+0,+2,+0,1,0x20,
+     +0,+0,+2,+1,0,0x30, +0,+0,+2,+2,1,0x10, +0,+1,+1,+0,0,0x44,
+     +0,+1,+1,+2,0,0x10, +0,+1,+2,-1,1,0x40, +0,+1,+2,+0,0,0x60,
+-    +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,0x80,
+-    +1,-1,+1,+1,0,0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40,
++    +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,(signed char) 0x80,
++    +1,-1,+1,+1,0,(signed char) 0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40,
+     +1,+0,+2,+1,0,0x10
+   }, chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 };
+   ushort (*brow[5])[4], *pix;
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 18f2584b5993..7459bf8a2c72 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,6 +1,3 @@
-AUX exiv2-0.27.2-libssh-0.9.2.patch 2035 BLAKE2B aeb9be311217b80a347d76a7df14ec11fc2018626cf7e9a813865dffd76038db10432fc2c898c0c26bdb3f1556cd34c0f8e4a25b189bc32733a3b4e018b241bf SHA512 25b4ca539585ddc2f4a11fc24ba49e799689d361f5f99f5552e99bd81179c95968affc4a42acd9ac0ba56f237f29ec53970a134b4dce44274a6044638d5bd78e
-DIST exiv2-0.27.2-Source.tar.gz 27591236 BLAKE2B bd10d71356e4c8a465b71f8ceac07fbf2fd6cfb287cb22774568ad35eb38200be504e297224920af50a15ab4e9da98384ff4da7c33713f5346b33738380698b0 SHA512 39eb7d920dce18b275ac66f4766c7c73f7c72ee10e3e1e43d84c611b24f48ce20a70eac6d53948914e93242a25b8b52cc4bc760ee611ddcd77481306c1f9e721
 DIST exiv2-0.27.3-Source.tar.gz 26447901 BLAKE2B ac13e6d8fce83923278cfeb628f143310a3c62b42936c8ed8b302a2c3df4c36f5666fa749adfb1d745e42da8f519762532e6fc281993aa55bcd7ce56e08c6e3e SHA512 3f5758ee862b811eeb89cc75fc2bbd8bf10329efa2ce1e68555cdc7729faa6cfd1603e0cc859fbdbe6d8fd5e53bd9b9e6d869d8a20ed17497bf87ce78c005de9
-EBUILD exiv2-0.27.2.ebuild 2457 BLAKE2B 5d610e7e21b215a72a31435a305d5f5dfdb0e9ef3499b6d805ca53729273475ef85c783aa269b106d24bc846007479159551a5cd3b10f8ccf226773c3e44f7d1 SHA512 bfea82132bdad7b89a35114ad4154db0044940324adcf65427306c15ddc1cd2a5152706a11f1613150799d6a1d439f1881bfe9f1dd62f8b4accb96eeb6251bb1
-EBUILD exiv2-0.27.3.ebuild 2461 BLAKE2B 731b33b83bc92239f23803e278f91ff5c0a300732393394b8ed2c0705ad620f0d14e3ca165f98686781624bc0435725c4846952f42eee1337bb5f3ba35a67723 SHA512 81aab9d3d04d05be26023f247448b155283adbd2c05c1852841f2de4f3f2a00ac2c754d490ea9a41780f80199eadc49a9e9c31ef6d8bfe31546b07f8d4c70428
+EBUILD exiv2-0.27.3.ebuild 2454 BLAKE2B 629c18eba5dd9ec1d5a710dcc26dbbf795431fb7abee2f22f86eb4fecc7afdc073c04c6fcc71d924fba529abba5d7ad2a38af92ccae0b9654d04220c1408937d SHA512 8bc3713da3c83c56e619c22b39341026e2b1a19e564ea0ccfae3f295edeeb1d67566bcc5ba17a8075104e75a2cc4bf3bcecc69782e00773e7accc725e113f5f2
 MISC metadata.xml 492 BLAKE2B 06b2f7b1d7b50e853ae116ad18f254103116c88c7d6957c1c9323083f0f87d7ed268ee188e91edf8b42b02a996e5c85017fffc12b0680f7522a0eda07ecbf74a SHA512 d0e56dd6585c3f10b14043764313de11545380fb15b18ca1627bbd92db357219aef801af050cbf3466b0b4e97fce25a55293068d21db93c1b6003a802944886f
diff --git a/media-gfx/exiv2/exiv2-0.27.2.ebuild b/media-gfx/exiv2/exiv2-0.27.2.ebuild
deleted file mode 100644
index fff1d66eeb26..000000000000
--- a/media-gfx/exiv2/exiv2-0.27.2.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
-
-if [[ ${PV} = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
-	inherit git-r3
-else
-	SRC_URI="https://exiv2.org/builds/${P}-Source.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-fi
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{6,7} )
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
-HOMEPAGE="https://www.exiv2.org/"
-
-LICENSE="GPL-2"
-SLOT="0/27"
-IUSE="doc examples nls +png webready +xmp"
-
-BDEPEND="
-	doc? (
-		${PYTHON_DEPS}
-		app-doc/doxygen
-		dev-libs/libxslt
-		media-gfx/graphviz
-		virtual/pkgconfig
-	)
-	nls? ( sys-devel/gettext )
-"
-DEPEND="
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	png? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-	webready? (
-		net-libs/libssh[${MULTILIB_USEDEP}]
-		net-misc/curl[${MULTILIB_USEDEP}]
-	)
-	xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md doc/ChangeLog doc/cmd.txt )
-
-PATCHES=( "${FILESDIR}/${P}-libssh-0.9.2.patch" )
-
-S="${S}-Source"
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# FIXME @upstream:
-	einfo "Converting doc/cmd.txt to UTF-8"
-	iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
-	mv -f doc/cmd.txt.tmp doc/cmd.txt || die
-
-	cmake_src_prepare
-
-	sed -e "/^include.*compilerFlags/s/^/#DONT /" -i CMakeLists.txt || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DEXIV2_BUILD_SAMPLES=NO
-		-DEXIV2_BUILD_PO=$(usex nls)
-		-DEXIV2_ENABLE_NLS=$(usex nls)
-		-DEXIV2_ENABLE_PNG=$(usex png)
-		-DEXIV2_ENABLE_CURL=$(usex webready)
-		-DEXIV2_ENABLE_SSH=$(usex webready)
-		-DEXIV2_ENABLE_WEBREADY=$(usex webready)
-		-DEXIV2_ENABLE_XMP=$(usex xmp)
-		$(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO)
-		$(multilib_is_native_abi && echo -DEXIV2_BUILD_DOC=$(usex doc))
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-
-	if multilib_is_native_abi; then
-		use doc && eninja doc
-	fi
-}
-
-multilib_src_install_all() {
-	use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
-
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc samples/*.cpp
-	fi
-}
diff --git a/media-gfx/exiv2/exiv2-0.27.3.ebuild b/media-gfx/exiv2/exiv2-0.27.3.ebuild
index 273b13df3d38..e532ee4154f6 100644
--- a/media-gfx/exiv2/exiv2-0.27.3.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.3.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://exiv2.org/builds/${P}-Source.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 	S="${WORKDIR}/${P}-Source"
 fi
 
diff --git a/media-gfx/exiv2/files/exiv2-0.27.2-libssh-0.9.2.patch b/media-gfx/exiv2/files/exiv2-0.27.2-libssh-0.9.2.patch
deleted file mode 100644
index abf165b83f47..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.27.2-libssh-0.9.2.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From c59eb810728572fde84492d43a932dcac89746d6 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 14 Nov 2019 15:06:38 +0100
-Subject: [PATCH] EXIV2_ENABLE_SSH: Fix compatibility with >=libssh-0.9.2
-
-0.9.1 remains broken regardless and is beyond fixing in this place.
-
-Build-tested with both libssh 0.9.0 and 0.9.2.
-
-Solution copied from KDE's kio-extras commit 24506c2af8d1904a99538543804306c6c2b81ca2
----
- cmake/findDependencies.cmake | 13 +++++++++++--
- src/CMakeLists.txt           |  3 +--
- 2 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake
-index a458a0c9..ec3a43f5 100644
---- a/cmake/findDependencies.cmake
-+++ b/cmake/findDependencies.cmake
-@@ -26,8 +26,17 @@ if( EXIV2_ENABLE_WEBREADY )
- 
-     if( EXIV2_ENABLE_SSH )
-         find_package(libssh CONFIG REQUIRED)
--    endif( )
--endif( )
-+        # Define an imported target to have compatibility with <=libssh-0.9.0
-+        # libssh-0.9.1 is broken regardless.
-+        if(NOT TARGET ssh)
-+            add_library(ssh SHARED IMPORTED)
-+            set_target_properties(ssh PROPERTIES
-+                IMPORTED_LOCATION "${LIBSSH_LIBRARIES}"
-+                INTERFACE_INCLUDE_DIRECTORIES "${LIBSSH_INCLUDE_DIR}"
-+            )
-+        endif()
-+    endif()
-+endif()
- 
- if (EXIV2_ENABLE_XMP AND EXIV2_ENABLE_EXTERNAL_XMP)
-     message(FATAL_ERROR "EXIV2_ENABLE_XMP AND EXIV2_ENABLE_EXTERNAL_XMP are mutually exclusive.  You can only choose one of them")
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 27f8dbb1..bdd83fa0 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -173,8 +173,7 @@ target_include_directories(exiv2lib_int PUBLIC
- if (EXIV2_ENABLE_WEBREADY)
- 
-     if( EXIV2_ENABLE_SSH )
--        target_include_directories(exiv2lib SYSTEM PUBLIC ${LIBSSH_INCLUDE_DIR})
--        target_link_libraries(exiv2lib PUBLIC ${LIBSSH_LIBRARIES})
-+        target_link_libraries(exiv2lib PUBLIC ssh)
-     endif()
- 
-     if( EXIV2_ENABLE_CURL )
--- 
-2.24.0
-
diff --git a/media-gfx/fdm-materials/Manifest b/media-gfx/fdm-materials/Manifest
index 04b6606760f6..685a44f82f3f 100644
--- a/media-gfx/fdm-materials/Manifest
+++ b/media-gfx/fdm-materials/Manifest
@@ -7,5 +7,6 @@ EBUILD fdm-materials-3.4.1.ebuild 427 BLAKE2B f0c2ffd1704db661214fadee859f5ecb9a
 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 537 BLAKE2B 2670978d0e05fc242ac0fe2dfd069ac797adc20060ea93e3778ab0145024348063eeb8a8ae17d90d576b48aa2fa8d8fc0f672598fe2752a7130ab28efafd2c76 SHA512 f55b0d58bf6eb84b61e276119c880e0156fc182e771b264f6cb248d4a0e97e7c877d69de782547953c0f91d42db4994250201a60099148ca4876543cd4f5d3d0
 EBUILD fdm-materials-4.6.1.ebuild 418 BLAKE2B 32a8bb1a67475a051216c3ed08230c48df1e6aef3938960d2d4d33d8a2735d6e6505ef992fbff9e9ad2cab7ba9fa7ba71227f735e0736150f35c8f08cf9d4e64 SHA512 73d45424b64d0cc9559dc9c59051e04783330915eb28e1d4d39c5f51a1028c8f819df857a38e4090f3bf14158020ff0e9833846c924072870b7d0bda314b03af
-MISC metadata.xml 865 BLAKE2B faf20efb80033c67c5b6cacbb3679368e6f7e8a63587aebb6a5e1569a2594620d3b657f14baee3bc39046993a0e285ccd3a02e888bd19bd885735f5a731b16fc SHA512 a083d711722c5896ebe0b9f2f8d5084e3e8fb2456c8b201eb2aae775c2e6a0b8a596a6e37f8b0e2015ed0e5095b05331257f916a77ca4df739af82d9a3802738
+MISC metadata.xml 949 BLAKE2B d84bebe6a29c4eb2a6e644347492fe06a60e758efcaba9158d2395d2e3714565f805d01ed029bf8906c54ed286e49902adf6b4e8cef9870219cf3fd13912f5e7 SHA512 d7f04589e2e66b471a721aafa2d2be2d531211f2e5003ed7ffed918e770e6980cf891bc5728a0d1a27c3bcaebf2706ac9dd6d9dac847c412e1b7adde091a7594
diff --git a/media-gfx/fdm-materials/fdm-materials-4.6.1-r1.ebuild b/media-gfx/fdm-materials/fdm-materials-4.6.1-r1.ebuild
new file mode 100644
index 000000000000..dd27037aa323
--- /dev/null
+++ b/media-gfx/fdm-materials/fdm-materials-4.6.1-r1.ebuild
@@ -0,0 +1,26 @@
+# 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"
+IUSE="embedded"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DEMBEDDED=$(usex embedded on off)
+	)
+	cmake_src_configure
+}
diff --git a/media-gfx/fdm-materials/metadata.xml b/media-gfx/fdm-materials/metadata.xml
index 9db3a37e1c15..f29b491fa4de 100644
--- a/media-gfx/fdm-materials/metadata.xml
+++ b/media-gfx/fdm-materials/metadata.xml
@@ -24,6 +24,9 @@
 	<slots>
 		<subslots>soname major version number</subslots>
 	</slots>
+	<use>
+		<flag name="embedded">Build for Ultimaker Embedded software</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">Ultimaker/fdm_materials</remote-id>
 	</upstream>
diff --git a/media-gfx/flameshot/Manifest b/media-gfx/flameshot/Manifest
index b14bc881d9ca..2787b3eaba50 100644
--- a/media-gfx/flameshot/Manifest
+++ b/media-gfx/flameshot/Manifest
@@ -1,5 +1,5 @@
 AUX flameshot-0.6.0-missing-include-fix.patch 869 BLAKE2B edccee0ef880470652535d65797800dc675e40556e4cdf560e257e60e649924316e5a0fdc271507763d90734fc60290e1ddecab417148542e8b318041ca9690c SHA512 852a3c12e1fee4a90e6a31c5c17a371a2b44fe1a399a6e11f8a760d5436ea73fa7aed9ebb906f67f7efbd4315e9c092c7cdf76a464f916df6893cc13bd361f7c
 AUX flameshot-0.6.0-unbundle-qtsingleapplication.patch 1505 BLAKE2B 51b8c59945f580d7777d4f9aeb954196bbd7e473301153053d451e0e07f08abb50a21fb993f940ab6ab40bfbbc6a14e04852d8e6a54e7ce4047ab64feb8cc2b5 SHA512 7543862bdead4f58435be97d09e4045ec1a9e77f90947c55076510da891627e189dc052cbd4ec8947203d5fa2c985220c2cd3fbb6cb9470222b3f5d42c61cf14
 DIST flameshot-0.6.0.tar.gz 641561 BLAKE2B f9e87373d84c1a841f70cd9c13b504865a0ef23d0fb29848f2270171459afe9c6852e12c712ebdc7cf3cfc62214d7b7507b85cf21838d0ebed33bee1e39f4aad SHA512 194127032ab0f62a6ba2698688e11b2d4e6f0e04a282144f5fbb6c232eeebc71371af2d55abbb6e98b8649dee036e6f0a6ef55710e4321a60fd5ac6e453ab975
-EBUILD flameshot-0.6.0.ebuild 1091 BLAKE2B ce6e09d94b1e634f32f8bb2fb59cdad200201aa81845dce1067046c7c86d1ef78a856960c91b16263eb80e6ac8849826dced4a25bb70c517d614cbf7fff05db9 SHA512 97d3a629128bfd55e378147590964e17646e86630e862e9b8720ecf7b271b9e55ff33d9dd06cae1bb13f735a016b6a706fc555163ea9ec882790915dee5b07ba
+EBUILD flameshot-0.6.0.ebuild 1128 BLAKE2B b6a122c46a3f69e662ef2ef9e12b5d7d82a032f6da62db2b833039acdd6f1991a7bea39e4ee90298a37ea341d9e78f0189e515f8769bd861ed9e8b56899a3bee SHA512 ab7825e1ef995c7df8896a7f682df8f719835f1a65f28c8dc92ce26b00c80b17eaed7e32de16cabb1b163bc1f950ee7e01f3eb92a4af002f00082e50000e0ce2
 MISC metadata.xml 366 BLAKE2B d8c8e83d8fb96199510eb45285312ca146aed73d76fd29ef52cd12cedd3b792621206b8ef064694ee60e12f73b932c6466051c85d0e1e2d8782aa2c00cb0bca4 SHA512 1bf8b212a62d64e14786dcf7ba6f97db414e04655fe0625d5ddc5b86d0e36f0c285f9722cdc1fedd39284e1331b167b947546c37b8a3a5441d59dcdf792a2506
diff --git a/media-gfx/flameshot/flameshot-0.6.0.ebuild b/media-gfx/flameshot/flameshot-0.6.0.ebuild
index 08fa91211c6b..7c9bcc840ba2 100644
--- a/media-gfx/flameshot/flameshot-0.6.0.ebuild
+++ b/media-gfx/flameshot/flameshot-0.6.0.ebuild
@@ -24,6 +24,9 @@ DEPEND="
 	dev-qt/qtdbus:5
 	sys-apps/dbus
 "
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
 RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}/${P}-unbundle-qtsingleapplication.patch"
diff --git a/media-gfx/fontypython/Manifest b/media-gfx/fontypython/Manifest
deleted file mode 100644
index 4744d8e1e5a4..000000000000
--- a/media-gfx/fontypython/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 0001-Do-not-crash-on-empty-pogs-list.patch 700 BLAKE2B add60a6ba4ba5366f781fc1b3735556792c5728006e25c4dd5482d5c7e86230cefbbb0ad064d667da559367b0cd6edb38ffbdab541efeb6748d46a7eb92e79f5 SHA512 bc260acfde39630b772591b9c0cdf065f340941d58714e9a73e25fce9b71caf570d62044ac3d3a72efb927ade7e26cc5019e7cedffc811f73ddc8cd4a090562b
-AUX 0002-Removed-unused-code-which-causes-crash-with-wx-3.0.patch 4392 BLAKE2B 52762e1ecc5f873bf429ffdc77aa414c151ddef35f08161279967042334d3e3071f1a66ca8e43926554207b93e255261d94678d155c01683e8e7d2bf8ace571b SHA512 a5cae1a71cddc8b3a9771bb4daf889d77e94f8be214f1ebc4b31061c0b366002c520873f99d84b667bb3a7139582c37d6c6e79742de7210c8d5296ec219f7c11
-AUX 0003-Adapt-to-wxpython-3.0-which-enforces-assertions-on-L.patch 961 BLAKE2B 74c6546bc45e1c4ec8d13b328e1acaefade3fee2f108eca97652bc3508224419e4067ff186b1d2c0bfd49f9ec96ed4a65a5d181b22bebcbbc21fe9cce374aa44 SHA512 d9eb9a881bb5ff5f088a8c5dfdf5acb679e01ca36ca703940cf40f4375ef14dbf73fbfd6caa067d9d3b494a62d88fdefac45af0484c26b535c845435e6890b76
-AUX fontypython-pillow.patch 1275 BLAKE2B 0ee668b07c1f7a888753db50373e65879c906d39402a7271be46d840a1a0e9dcb90c19365740b0644971dbe9e4c294074073c1ab5854f83bd6929eb554e6d148 SHA512 6efce50dee7fd69b27803143371bb3bc9c51b1c027a2bcf4bc6543c130e71462ee79b20efa1ac15ad1215c225e053e8cf1203704ba41eefcbac82c93f597432e
-DIST fontypython-0.4.4.tar.gz 361335 BLAKE2B 9e9f3f0e3b67509851fbf0c061af5754991d4087d7f4a5b9ec0ca176690c4f0125fab82546cdbddd39e0d1f2b4631396628df7c9d09a0dabadd9f3f2651bce6c SHA512 a89c654c9dcd8fc89d3ad91772f856d2d2570a96b3b60f52eed9db217f45e91a55f3044f0e4d1736c5402cde3a6598a353ae59285c892e80034f7baba15f9825
-EBUILD fontypython-0.4.4-r3.ebuild 1003 BLAKE2B 1758520625513103adce6e48e7d388a6162e1e2e5f76c88949f99b84e211e007ce3c3edf7e09c5bcecbeb9f727057c99f2d8294f8469d67c64b942d0fcaecd59 SHA512 ed549f3ab5ab4cd9f921d92849327195f057a012c65a1fb38b66cba60a4ca42d1215d5700fdb688a1c24b78acfbdeb81afd1fd10780717b3ae116a4dc6eb7f8f
-MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-gfx/fontypython/files/0001-Do-not-crash-on-empty-pogs-list.patch b/media-gfx/fontypython/files/0001-Do-not-crash-on-empty-pogs-list.patch
deleted file mode 100644
index b652053596c6..000000000000
--- a/media-gfx/fontypython/files/0001-Do-not-crash-on-empty-pogs-list.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Pietro Battiston <me@pietrobattiston.it>
-Date: Sun, 21 Dec 2014 11:50:28 +0100
-Subject: Do not crash on empty pogs list
-
----
- fontypythonmodules/gui_PogChooser.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fontypythonmodules/gui_PogChooser.py b/fontypythonmodules/gui_PogChooser.py
-index 94b7f2e..f233529 100644
---- a/fontypythonmodules/gui_PogChooser.py
-+++ b/fontypythonmodules/gui_PogChooser.py
-@@ -80,7 +80,7 @@ class PogChooser(wx.ListCtrl) :
- 			i = self.FindItem(-1, select)
- 			self.indexselected = i # Set this to help initial icon settings.
- 			self.Select(i, True)
--		else:
-+		elif self.__poglistCopy:
- 			self.Select(0, False)
- 			self.indexselected = -1
- 
diff --git a/media-gfx/fontypython/files/0002-Removed-unused-code-which-causes-crash-with-wx-3.0.patch b/media-gfx/fontypython/files/0002-Removed-unused-code-which-causes-crash-with-wx-3.0.patch
deleted file mode 100644
index e6f8fb634e83..000000000000
--- a/media-gfx/fontypython/files/0002-Removed-unused-code-which-causes-crash-with-wx-3.0.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From: Pietro Battiston <me@pietrobattiston.it>
-Date: Sun, 21 Dec 2014 09:14:19 +0100
-Subject: Removed unused code which causes crash with wx 3.0
-
----
- fontypython                                | 2 --
- fontypythonmodules/dialogues.py            | 4 ----
- fontypythonmodules/gui_Left.py             | 4 ----
- fontypythonmodules/gui_Middle.py           | 5 -----
- fontypythonmodules/gui_PogChooser.py       | 4 ----
- fontypythonmodules/gui_Right.py            | 4 ----
- fontypythonmodules/gui_ScrolledFontView.py | 4 ----
- fontypythonmodules/wxgui.py                | 4 ----
- 8 files changed, 31 deletions(-)
-
-diff --git a/fontypython b/fontypython
-index a05290f..e46e34e 100755
---- a/fontypython
-+++ b/fontypython
-@@ -72,8 +72,6 @@ else: # err code -11
- 
- 	## Setup wxPython to access translations : enables the stock buttons.
- 	localedir = "fontypythonmodules/locales"
--	langid = wx.LANGUAGE_DEFAULT
--	mylocale = wx.Locale( langid )
- 
- 	iPC = PC.PathControl() 
- 
-diff --git a/fontypythonmodules/dialogues.py b/fontypythonmodules/dialogues.py
-index 1fbff5f..eba7ab3 100644
---- a/fontypythonmodules/dialogues.py
-+++ b/fontypythonmodules/dialogues.py
-@@ -23,10 +23,6 @@ import wx
- import wx.html as html
- 
- 
--## Setup wxPython to access translations : enables the stock buttons.
--langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG
--mylocale = wx.Locale( langid )
--
- ## langcode = locale.getlocale()[0] # I must not use getlocale...
- ## This is suggested by Martin:
- loc = locale.setlocale(locale.LC_CTYPE) # use *one* of the categories (not LC_ALL)
-diff --git a/fontypythonmodules/gui_Left.py b/fontypythonmodules/gui_Left.py
-index 5451f39..7b1f0c6 100644
---- a/fontypythonmodules/gui_Left.py
-+++ b/fontypythonmodules/gui_Left.py
-@@ -17,10 +17,6 @@
- 
- import wx, os
- 
--## Setup wxPython to access translations : enables the stock buttons.
--langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG
--mylocale = wx.Locale( langid )
--
- 
- from pubsub import *
- from wxgui import ps
-diff --git a/fontypythonmodules/gui_Middle.py b/fontypythonmodules/gui_Middle.py
-index 470e3ea..9af3f9f 100644
---- a/fontypythonmodules/gui_Middle.py
-+++ b/fontypythonmodules/gui_Middle.py
-@@ -19,11 +19,6 @@ import wx
- import wx.lib.stattext
- import  wx.lib.buttons  as  buttons
- 
--## Setup wxPython to access translations : enables the stock buttons.
--langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG
--mylocale = wx.Locale( langid )
--
--
- from pubsub import *
- from wxgui import ps
- 
-diff --git a/fontypythonmodules/gui_PogChooser.py b/fontypythonmodules/gui_PogChooser.py
-index f233529..c679191 100644
---- a/fontypythonmodules/gui_PogChooser.py
-+++ b/fontypythonmodules/gui_PogChooser.py
-@@ -17,10 +17,6 @@
- 
- import wx, locale
- 
--## Setup wxPython to access translations : enables the stock buttons.
--langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG
--mylocale = wx.Locale( langid )
--
- from pubsub import *
- from wxgui import ps
- 
-diff --git a/fontypythonmodules/gui_Right.py b/fontypythonmodules/gui_Right.py
-index adefa1d..ea5062b 100644
---- a/fontypythonmodules/gui_Right.py
-+++ b/fontypythonmodules/gui_Right.py
-@@ -17,10 +17,6 @@
- 
- import wx
- 
--## Setup wxPython to access translations : enables the stock buttons.
--langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG
--mylocale = wx.Locale( langid )
--
- from pubsub import *
- from wxgui import ps
- 
-diff --git a/fontypythonmodules/gui_ScrolledFontView.py b/fontypythonmodules/gui_ScrolledFontView.py
-index d7b3d2f..3e35d62 100644
---- a/fontypythonmodules/gui_ScrolledFontView.py
-+++ b/fontypythonmodules/gui_ScrolledFontView.py
-@@ -20,10 +20,6 @@ import wx.lib.scrolledpanel
- 
- from pubsub import *
- 
--## Setup wxPython to access translations : enables the stock buttons.
--langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG
--mylocale = wx.Locale( langid )
--
- import fpsys # Global objects
- 
- from gui_Fitmap import * #Also brings in 'ps' variable
-diff --git a/fontypythonmodules/wxgui.py b/fontypythonmodules/wxgui.py
-index da80d17..6e6716a 100644
---- a/fontypythonmodules/wxgui.py
-+++ b/fontypythonmodules/wxgui.py
-@@ -23,10 +23,6 @@ import fpversion
- ## Now, bring in all those big modules
- import wx
- 
--## Setup wxPython to access translations : enables the stock buttons.
--langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG
--mylocale = wx.Locale( langid )
--
- ## Fetch my own pubsub stuff
- from pubsub import *
- ps = CPubsub()
diff --git a/media-gfx/fontypython/files/0003-Adapt-to-wxpython-3.0-which-enforces-assertions-on-L.patch b/media-gfx/fontypython/files/0003-Adapt-to-wxpython-3.0-which-enforces-assertions-on-L.patch
deleted file mode 100644
index 4875a15ff050..000000000000
--- a/media-gfx/fontypython/files/0003-Adapt-to-wxpython-3.0-which-enforces-assertions-on-L.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Pietro Battiston <me@pietrobattiston.it>
-Date: Sun, 21 Dec 2014 11:50:09 +0100
-Subject: Adapt to wxpython 3.0, which enforces assertions on ListItems ids.
-
----
- fontypythonmodules/gui_PogChooser.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/fontypythonmodules/gui_PogChooser.py b/fontypythonmodules/gui_PogChooser.py
-index c679191..4cdf772 100644
---- a/fontypythonmodules/gui_PogChooser.py
-+++ b/fontypythonmodules/gui_PogChooser.py
-@@ -200,6 +200,7 @@ class PogChooser(wx.ListCtrl) :
- 			li.SetImage(i) 
- 			li.SetText(p) 
- 			id = wx.NewId()
-+			li.SetId(id)
- 			PogChooser.__poglistCopy[id] = p # record the pog name
- 			row = self.InsertItem( li ) 
- 			self.SetItemData( row, id ) # associate back to __poglistCopy
-@@ -214,6 +215,7 @@ class PogChooser(wx.ListCtrl) :
- 		li.SetImage(0)
- 		li.SetText(pogname)
- 		id = wx.NewId()
-+		li.SetId(id)
- 		self.__poglistCopy[id] = pogname 
- 		row = self.InsertItem(li)
- 		self.SetItemData( row, id )
diff --git a/media-gfx/fontypython/files/fontypython-pillow.patch b/media-gfx/fontypython/files/fontypython-pillow.patch
deleted file mode 100644
index 9b7966f55061..000000000000
--- a/media-gfx/fontypython/files/fontypython-pillow.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=471524
-
-diff --git a/fontypythonmodules/fontcontrol.py b/fontypythonmodules/fontcontrol.py
-index e156758..cff34f5 100644
---- a/fontypythonmodules/fontcontrol.py
-+++ b/fontypythonmodules/fontcontrol.py
-@@ -16,7 +16,7 @@
- ##	along with Fonty Python.  If not, see <http://www.gnu.org/licenses/>.
- 
- import os, sys, locale, glob, errno
--import Image, ImageFont, ImageDraw 
-+from PIL import Image, ImageFont, ImageDraw 
- import fontybugs, fpsys
- from pathcontrol import *
- 
-diff --git a/fontypythonmodules/fpsys.py b/fontypythonmodules/fpsys.py
-index f9572ae..fa1a98f 100644
---- a/fontypythonmodules/fpsys.py
-+++ b/fontypythonmodules/fpsys.py
-@@ -159,7 +159,7 @@ def checkFonts( dirtocheck, printer ):
- 	global segfonts
- 	
- 	code = """
--import ImageFont
-+from PIL import ImageFont
- try:
- 	font=ImageFont.truetype("%s", 24, 0)
- 	dud=font.getname()
-diff --git a/fontypythonmodules/sanitycheck.py b/fontypythonmodules/sanitycheck.py
-index cf4fcc1..7e46e9a 100644
---- a/fontypythonmodules/sanitycheck.py
-+++ b/fontypythonmodules/sanitycheck.py
-@@ -24,7 +24,7 @@ import imp
- 
- ## PIL : Is it there?
- try: 
--	import Image, ImageFont, ImageDraw 
-+	from PIL import Image, ImageFont, ImageDraw 
- except: 
- 	print strings.PILError
- 	raise SystemExit
diff --git a/media-gfx/fontypython/fontypython-0.4.4-r3.ebuild b/media-gfx/fontypython/fontypython-0.4.4-r3.ebuild
deleted file mode 100644
index ca9ebc36f3c3..000000000000
--- a/media-gfx/fontypython/fontypython-0.4.4-r3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-WX_GTK_VER=3.0
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 multilib wxwidgets
-
-DESCRIPTION="Font preview application"
-HOMEPAGE="https://savannah.nongnu.org/projects/fontypython"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# Crashes w/ debug build of wxGTK (#201315)
-DEPEND="dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/wxpython:${WX_GTK_VER}[${PYTHON_USEDEP}]
-	x11-libs/wxGTK:${WX_GTK_VER}[-debug]"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-pillow.patch"
-	"${FILESDIR}"/0001-Do-not-crash-on-empty-pogs-list.patch
-	"${FILESDIR}"/0002-Removed-unused-code-which-causes-crash-with-wx-3.0.patch
-	"${FILESDIR}"/0003-Adapt-to-wxpython-3.0-which-enforces-assertions-on-L.patch )
-
-src_prepare() {
-	distutils-r1_src_prepare
-	need-wxwidgets unicode
-}
-
-src_install() {
-	distutils-r1_src_install
-	doman "${S}"/fontypython.1
-}
diff --git a/media-gfx/fontypython/metadata.xml b/media-gfx/fontypython/metadata.xml
deleted file mode 100644
index cc081897d48c..000000000000
--- a/media-gfx/fontypython/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>fonts@gentoo.org</email>
-		<name>Fonts</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/media-gfx/fr0st/Manifest b/media-gfx/fr0st/Manifest
deleted file mode 100644
index 0253bb413e84..000000000000
--- a/media-gfx/fr0st/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX fr0st-1.4-colour.patch 342 BLAKE2B 78ea214d35a1a47eb51d40c8bec3173e8515db69926ee89616703afa832101a5ecba124aac85239c093ea1912ac9298edb6e866a63bef8678985f71b4151b286 SHA512 f3f6fe3af3dca4f709b7fcbd9b8f6c2b089c5cd7b1188a874b16d13eac9f3aae959ed5065a6ecf92ee47080ce25759c8180b86d1c9bd0f85e655217b7bd2f4b7
-DIST fr0st-1.4-src.tgz 1535978 BLAKE2B 1d1700665f6747d0665594e255d8604b1fad576aae21b73a435aa95174ef199bce0fe6d436ee3f5072fe5474657995533675bf7c9b16e6787523b1db4bb189d6 SHA512 d4ececca724bef264097466328e98699efbf82d999107a1ed8b21b938fd5025b888197f021ac56c7fb008226f0230bd058cb94efec61bb59d67f2263d3140ec5
-EBUILD fr0st-1.4-r2.ebuild 1164 BLAKE2B 830cbae5976bb8f9d5b01f4982c9c18f4699ebabc10f41c95fe12e220cfa5a6e8bdb54fd9e1e842fdec2a6c6852899b74e9da7f3a60232648ac7c8643c09b976 SHA512 9e9322bcb75dbf53c78990826418fb4a9fb5c5552f208b0d4053311dde46b5762aae407419adfb19dad3381642ffc32b4371dc84524f3ec6b84171df0022a3b4
-MISC metadata.xml 240 BLAKE2B 203cfb53065168e358c3d2a5a437f6b1ff784f2e375aa7b25e9b6fad79e15d2bb291e8536ee332cb49b23519eed8113121118258d9f434dc5833b592d44c73d5 SHA512 1248dd2251c4efb2cb36b85654237f2be88561cd2a740e650d263f76f051eb8ebeda0b359790af05dcac3ed8b01c91a0b6d600d03fd376b3a65d706db980d6cd
diff --git a/media-gfx/fr0st/files/fr0st-1.4-colour.patch b/media-gfx/fr0st/files/fr0st-1.4-colour.patch
deleted file mode 100644
index 9fb17aadaab7..000000000000
--- a/media-gfx/fr0st/files/fr0st-1.4-colour.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- fr0stlib/gui/canvas.py~	2011-05-14 19:58:25.000000000 +0200
-+++ fr0stlib/gui/canvas.py	2016-02-20 17:47:25.853322560 +0100
-@@ -79,7 +79,7 @@
- 
-     def SetBrush(self, FillColor, FillStyle):
-         r,g,b = FillColor
--        c = wx.Color(r,g,b, self.Opacity)
-+        c = wx.Colour(r,g,b, self.Opacity)
-         self.Brush = wx.Brush(c)
diff --git a/media-gfx/fr0st/fr0st-1.4-r2.ebuild b/media-gfx/fr0st/fr0st-1.4-r2.ebuild
deleted file mode 100644
index 2e138ef92e15..000000000000
--- a/media-gfx/fr0st/fr0st-1.4-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib python-single-r1 wxwidgets
-
-DESCRIPTION="A fractal flame editor"
-HOMEPAGE="https://fr0st.wordpress.com/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}.0/+download/${P}-src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/wxpython:${WX_GTK_VER}
-	>=media-gfx/flam3-3.0.1
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}-src"
-
-pkg_setup() {
-	fr0st_libdir="/usr/$(get_libdir)/fr0st"
-	fr0st_sharedir="/usr/share/fr0st"
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-colour.patch #564106
-	python_fix_shebang .
-	need-wxwidgets unicode
-}
-
-src_install() {
-	insinto "${fr0st_sharedir}"
-	doins -r icons samples
-
-	insinto "${fr0st_libdir}"
-	doins -r fr0stlib
-
-	exeinto "${fr0st_libdir}"
-	doexe fr0st.py
-
-	dosym "${fr0st_libdir}"/fr0st.py /usr/bin/fr0st
-	dosym "${fr0st_sharedir}"/icons/fr0st.png /usr/share/pixmaps/fr0st.png
-
-	make_desktop_entry fr0st fr0st
-
-	dodoc changelog.txt
-}
diff --git a/media-gfx/fr0st/metadata.xml b/media-gfx/fr0st/metadata.xml
deleted file mode 100644
index d8b5cf01c15e..000000000000
--- a/media-gfx/fr0st/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="launchpad">fr0st</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 922bee3cdd76..d3e26b2a6c6b 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,22 +1,10 @@
 AUX gimp-2.10_fix_test-appdata.patch 902 BLAKE2B 2b1a131d874d65422d8bdd44732b9843d89a570a1ea3c058cdb2a424a7791c686aa0e2ae2a0b472f333f2465f6e1a26750a532e9003933c5dffa1af32343c1dc SHA512 2983e8572f5e8113c9e2f564d31c1a5fe7e11ef273c50d2be739089124c6ec1a457da28222020bbd6015b2cbbcbf403b88d8660b9b35241800deb4fb3ad79067
-AUX gimp-2.7.4-no-deprecation.patch 1061 BLAKE2B c34baed7be101547994f23a818d81b855c5b0058d5acce7bb185801083a07874a1a2c6fcc41a79502077cb03c3532d9cfba88212592449b747957b0c08eff205 SHA512 3454f3b1a7579b1da4c36b765ae2a54adab13f0a4ecf02c4c0c3c55a12ff7af57d6d0467f663d2ef3de6cda116095f5f662a29cb3d729e0533edd585731a1dc9
-AUX gimp-2.8.10-clang.patch 7670 BLAKE2B 923573fe329c9b8268ec220b2a0441ae765085c088a1524c5e323cc9615cfec4b8a57b2195e441ea9f43dd609f51f2de60512833652e822b466188787ffe41ec SHA512 772ee0837a214f3ef70e823662fe12e57ee8fd5f800c6508e757b86169b86a5cbd86695870993a66d3726c019d24f79616831bed8baabce3e1d247ecbfe204fc
-AUX gimp-2.8.14-blend-center.patch 999 BLAKE2B 5324cf539a3ef54356f943d3a4cff7ed6abd0aecc5fa7af54193c5cdea0b4c3ca2073696dd1253ad49a451f6a87a50476a48b8bb6c6820e1b90338f3dd7efb0b SHA512 1d3cbe9d1b02e2d10ba982265f7d89f593aa6973f76d529dd909f36efe1c9d968360ec208943f66c00f6589f5c679368099e0db579ddb3655c15cb6ce8bdf930
-AUX gimp-2.8.22-cve-2017-17784.patch 1124 BLAKE2B 8358642d77aca1509942023384254295be74567e68147ca81a854c527ace4ab383ab5ae3dfff9a6e956e10da48db18faa1c84c71c780dff03e4fd84ec2feb180 SHA512 8feab75b01c8d5d57bf869f64ca377f8cfb239079fba97f66bf34f341d9d15f9a8e403b1fe04d27bdbb39151f99a208aa5236c8dd0b6afeac45400a29efa0da7
-AUX gimp-2.8.22-cve-2017-17785.patch 4747 BLAKE2B 45ccd40aca7b5d2603280c27275cee66cc7167c5f1a01c3025c21d70e3ae5f15b962ac3850d57aefd37b66ff76d2a86a7403ab72ae3927ca7763dc1b48bcd8d5 SHA512 51794739489a5e8babbc13c426dc34172caeab07cc8a64b5a8f19a4b88b736e3c9801cc4dadf6848b1e49031d2f1c7a336403a470a26a9ad8cad0a485a8342bd
-AUX gimp-2.8.22-cve-2017-17786-1.patch 2003 BLAKE2B b235625ab65426052b4a4d46923cbb5b2c67f95d03be9830e82b87c0d590f94f0c3a38aa3a447f7278498c3456e878eeaade44719e23360ecaf6971ce5a77738 SHA512 d4887c49cf73c8f0238c338137ac94854524daea8535e206e34a9dfdb63dbc9ec91839d01085c484c995b26882215b652f4f7e23aa614f29272b5a18c8afc019
-AUX gimp-2.8.22-cve-2017-17786-2.patch 1253 BLAKE2B a862581d48a990e3c4b8d185f4cf57d867b4171d27bb224dcf515c219fc181c0329870f98d7d09b9978c0332c485734172aa8cf933496c8b0cfb74be91bf9f1a SHA512 24d02cff72ec684aafd2cc6006955f283e6d5e102c37be0b426cade34219022a8225b367643ce3cfd786425fe53005e7db6a595ba507c7eacf402eebe2b44fa0
-AUX gimp-2.8.22-cve-2017-17787.patch 1058 BLAKE2B baeffda42385b552709781a772ef5947682a6b3c8ea01d97e32dca63fdb5ddeeea85550c4116196d16e63381cffa4ba03873490936da2cb501ee8d50367c0cbd SHA512 438376075d0a46809fd5f12f3d364b914c989ca512739b69da0f609100525da8dbc525ce57c144b5388eec525fd2d7b5c8098e63ddb70c68c186dee9b2ce7b83
-AUX gimp-2.8.22-cve-2017-17788.patch 1012 BLAKE2B 90bc17b66dd40426073a2581c20e68551b1c80378e055704d36ad56cc0a2b7448c847b847aacded6b8033ee86b3bb42e679845a46c65c1ea2d3af8c90aeb53f8 SHA512 82231c53664535c66d70b4e129b24afa31a50d465968f1012e20420ee71842435acf7d43de78cdac81602d80b89a927c03f9d60159c89c41d4b88e6851ed8acc
-AUX gimp-2.8.22-cve-2017-17789.patch 1245 BLAKE2B 14d519b8b024e51b452806b4acb6f00231e535ba3502875e8e90350e62c2cd0ff634ab1b38f16bb098670dd1e9d21c88aa64e19c3f81600acc7ea448e8f22b90 SHA512 f2f4aff0f0478356513a1f6da0732c5d0986ef1deb7b8e68bd283b7259887cf9a4d4785f00e48f03892cc86aa715b9764302640b2b891ab16617ef595ab779b8
-AUX gimp-2.9.8-cve-2017-17784.patch 1087 BLAKE2B 2398e735ccd7b0a5cc393f297b60d4a51038aeb146779268f78fb2f0a24ef912468510de2a0f640c5f905fe9959581686f55bccc022633b6f2a3a93ab3f12848 SHA512 5bc928860b2f2b53cc72c9c3caf6a532cf7e61b02e0716ee99a5166a07b01bdd46edfeae7bf6e333ce14ca11b5fcb963cbd42005e02f914d909431bf201dc6d5
 DIST gimp-2.10.14.tar.bz2 32786424 BLAKE2B f1254ab0742cf0190f4e50f001d8120fe655b73d838c3ed56abb0a221c0eaec02e5c838f952d492069d55d89e4c3493c59b38aa2af87df8181f8979213e7659b SHA512 acbd095361d9211a5a23474693dd170ed76bf4ea5b1df69791f1d975ef5cdaba1e5fb9f5be9f592a360db5826d71eaaf464005075397cb6630070fe32833c030
 DIST gimp-2.10.18.tar.bz2 32946467 BLAKE2B eb1c756ca646ee9ddc42aebe214ad3e2dedf125940dc1b9cfd04a4424bd2b6255041f1bafbda3fc214f93d97e7802372234a42e1daa0ee56caaf0f0bedd908f9 SHA512 88990f2d70508b22f4acadeab6b687e20af19b765ebc6f245d0c99b3dd853fcd3d237c3b7607e50133aa95a1d71931069029dfd7ee94441ff419c542c141bc9f
-DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6
-DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
+DIST gimp-2.10.20.tar.bz2 33108938 BLAKE2B 060c0e46e6f4ac861de265842d545285c2fa4590908172971ef240ae87f8caa2c015447deee810fef59c4869810676daae2e40aa611062168feffe38c7cd9b22 SHA512 7cd0b1833af87a167fdfee59fb491a72727fe3071c21c0de1813adb0f8272a92473e1e300517395b1b4593c8cb6781ee30f7a63966756e5a7f523a164308aba6
 EBUILD gimp-2.10.14-r1.ebuild 6140 BLAKE2B df34bd1bc35873d51aaec12fba454170ce08b2b10f183d00eb56adba4cc40f56877481831b319c11fa8cbbe6fe17929c60341c918610c20fca2355607b876c22 SHA512 3f86c2237be7978066780679326395666d96bd22d4e389aac60f2a0989939e809ad51f2f12018b5a4fbd7d1bbe1469b034c74c86e4321ae6fb8f8caacca9a7b1
-EBUILD gimp-2.10.18-r1.ebuild 6157 BLAKE2B d877545e911f0d707447d885bb83b83dd1bd37cb3db79ee3afd23c52949d91e321ca748f7e632146b5b56264589f633a235b9b4fd9cea3783d29d2c6b5a2d503 SHA512 564dd35735219c97cb9b8caba0aa1aaf782231a6a1cc578596e06c5972bbaacbb0599bce9d8b1cb03ca95403db36bc3caa40cb934c957b2dd399b6d394857448
-EBUILD gimp-2.8.22-r2.ebuild 5139 BLAKE2B 7e659b356107042884fddaff1622c20f1b1d627840556cdba0293fc80c43832fe02883d65ef6b338847b80d0cc041d95f6cce02ea230d071aa5545d89f55e8f8 SHA512 5b32326f52e21dd544c1f92e0f51612fb8a662ac6fa0addce482d3a3e1e9516a55b0c6a9e679407afee94b77c60a0224719ff37cd5aabcc7936a949629d4f189
-EBUILD gimp-2.9.8-r1.ebuild 6068 BLAKE2B 86c853189f8a7aa5e6247d1f973337e3149ea44e13f4adc022b2e6f15eb51ecd4473e862721fd3ee841f5f36108230b2444039e5cb21898c274c97506a285800 SHA512 da7b01a4dafbd9d991ce050b3c8c5d1ce6b1f2d9cc8c4bde6463d5ebfcba2a8399c1f8f61062f1fb564c530acfea5036b6f8d5c3b4b1a291cd575a00df9deb28
-EBUILD gimp-9999.ebuild 6314 BLAKE2B a0c08fcf0c8962d67b688a41d1beaf1469a83e55b4947062431a740379788a8d4f20216a7e176dcbe01a7f6d58a85de72ac0b870f3200da458f57b1b72870f55 SHA512 c1b8c2c627123aaf6164dd2c650d329c2824d52f40f29acb46ae0c052636d3ca7226fd812c307a1a54d76f254668ca51ae9c40304dfff9c62ffa740e40cc3d07
-MISC metadata.xml 628 BLAKE2B f1326f51db692d6e64d1bb7b44dfada65799d7ab94279771e6bd729189145a8a4bbe7a83c776bfc46acf682ad9f34c84598d25fb0a3606aabfa30383b35a9694 SHA512 cec60cde9763bdb9012fec754b95018f09da5cf7ff2f577206417651df5c18251dd5c58b1e32fb45e7c2121e06c0a5b7dc86d08b9511da4cf103bcf2fa1b6e52
+EBUILD gimp-2.10.18-r1.ebuild 6167 BLAKE2B 72365a42b68b73f96204e3fd2dcfd61b55f141ce582315f6828ad0c703baec407f376b8d82338d493cf6620facbd1c9bfdb9f4494164c95988419936ecf6f951 SHA512 a557135d986e349bb37a37822b96be7f79c4d31998c978488e72cf5259222357df81961b9981f9274cb54680ea932e2883407025fdd5ef3c97437df44ca77f12
+EBUILD gimp-2.10.18-r2.ebuild 6317 BLAKE2B 4ed48f6450955abc83ebfc73605a825d1ab493c27ddc4b389d06c93a092961343c9496712f308aee68f81c48757ec3e44257609127a9218b9f02a4d893b7c347 SHA512 44f765e80996107ca3d4b294c4018e23e8ae5619eb2c7cebe6b1f6f0e7614fa296839d58f5b10a5e3f547b12bd1c2e303edd8893d47b5733fc44816ff3b8a0b2
+EBUILD gimp-2.10.20-r1.ebuild 6022 BLAKE2B 75e149312d91224b99ef93146525509c411a02cf59d87f3c727fcee60504f6769d84dc676439eb59a880edb17cfda65ae5ae2eff0062c9ee4ff74247f1f73cf0 SHA512 d1aec4d39329879101a28769a192dd92cc296c80402d99dfed07c9a5f7974363cd94dfe1765142f146bca43e005a6dad77bac45a86c47be26ae2f46be23f4d62
+EBUILD gimp-9999.ebuild 6461 BLAKE2B ba3eac8a82d0ebac3cc0ae18c2cddfecdb54fb922707e813d9a922d1f466564f50d42ab24a9de9dab1f63a1302dc84bcede6b4ca3dd4e38503cb64fcee565a93 SHA512 97a1d450095bfa7219672c45100403950029a5c0620ce50ab50eee318baf8e0b944fe387d6483f4f5b9a5c570b8f77b346306c62ba6cfaf673d01c9f6232861e
+MISC metadata.xml 546 BLAKE2B 2d5b9a68c47a72325199586a142f1d8344bef770d24738169c80958f3def3a0f1ad0b4d23774d3c458d80f17a394033813e01fc5e24b8b62146d2c55b5f8c9b0 SHA512 f654d93c738c942605ae61fe0d76972a1b81bffaf4edc23a1f55bb65e71022df7f14e769a71c41e5c5c7307eef9618a667ae418dc9bc77d5ac1299bbe0c58834
diff --git a/media-gfx/gimp/files/gimp-2.7.4-no-deprecation.patch b/media-gfx/gimp/files/gimp-2.7.4-no-deprecation.patch
deleted file mode 100644
index 66bd93d0d1aa..000000000000
--- a/media-gfx/gimp/files/gimp-2.7.4-no-deprecation.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- configure.ac	2012-01-02 13:15:53.695067626 +0100
-+++ configure.ac	2012-01-02 13:21:49.161623684 +0100
-@@ -1943,33 +1943,6 @@
- AC_SUBST(MIME_TYPES)
- 
- 
--#########################
--# Disable deprecated APIs
--#########################
--
--CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED -DBABL_DISABLE_DEPRECATED -DGSEAL_ENABLE"
--
--# Make sure not to disable deprecated APIs for unreleased versions.
--# We must build without problems with future releases of libraries
--# and disabling deprecated API risks breaking the build
--
--if test "x$have_glib_2_31" != "xyes"; then
--  CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED"
--fi
--
--if test "x$have_gtk_2_26" != "xyes"; then
--  CPPFLAGS="${CPPFLAGS} -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
--fi
--
--if test "x$have_gdk_pixbuf_2_26" != "xyes"; then
--  CPPFLAGS="${CPPFLAGS} -DGDK_PIXBUF_DISABLE_DEPRECATED"
--fi
--
--if test "x$have_pango_1_32" != "xyes"; then
--  CPPFLAGS="${CPPFLAGS} -DPANGO_DISABLE_DEPRECATED"
--fi
--
--
- ############################
- # Require multihead safe API
- ############################
diff --git a/media-gfx/gimp/files/gimp-2.8.10-clang.patch b/media-gfx/gimp/files/gimp-2.8.10-clang.patch
deleted file mode 100644
index 065c66b36139..000000000000
--- a/media-gfx/gimp/files/gimp-2.8.10-clang.patch
+++ /dev/null
@@ -1,204 +0,0 @@
---- app/Makefile.am
-+++ app/Makefile.am
-@@ -120,29 +120,29 @@
- 
- # FIXME: core should not depend on xcf
- workaround_that_core_depends_on_xcf = \
--	-u $(SYMPREFIX)xcf_init
-+	-Wl,-u,$(SYMPREFIX)xcf_init
- 
- # FIXME: core should not depend on pdb
- workaround_that_core_depends_on_pdb = \
--	-u $(SYMPREFIX)internal_procs_init		\
--	-u $(SYMPREFIX)gimp_plug_in_manager_restore
-+	-Wl,-u,$(SYMPREFIX)internal_procs_init		\
-+	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore
- 
- # FIXME: plug-in should not depend on pdb
- workaround_that_plug_in_depends_on_pdb = \
--	-u $(SYMPREFIX)gimp_pdb_compat_param_spec
-+	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec
- 
- # FIXME: file should not depend on plug-in
- workaround_that_file_depends_on_plug_in = \
--	-u $(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
--	-u $(SYMPREFIX)gimp_image_map_config_get_type
-+	-Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
-+	-Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type
- 
- # core, vectors and gegl are on the same architectural layer, prevent
- # the linker from panicing
- calm_down_linker = \
--	-u $(SYMPREFIX)gimp_vectors_undo_get_type	\
--	-u $(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
--	-u $(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
--	-u $(SYMPREFIX)gimp_curve_map_pixels
-+	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type	\
-+	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
-+	-Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
-+	-Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels
- 
- AM_LDFLAGS = \
- 	$(munix)					\
---- app/Makefile.in
-+++ app/Makefile.in
-@@ -702,33 +702,33 @@
- 
- # FIXME: core should not depend on xcf
- workaround_that_core_depends_on_xcf = \
--	-u $(SYMPREFIX)xcf_init
-+	-Wl,-u,$(SYMPREFIX)xcf_init
- 
- 
- # FIXME: core should not depend on pdb
- workaround_that_core_depends_on_pdb = \
--	-u $(SYMPREFIX)internal_procs_init		\
--	-u $(SYMPREFIX)gimp_plug_in_manager_restore
-+	-Wl,-u,$(SYMPREFIX)internal_procs_init		\
-+	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore
- 
- 
- # FIXME: plug-in should not depend on pdb
- workaround_that_plug_in_depends_on_pdb = \
--	-u $(SYMPREFIX)gimp_pdb_compat_param_spec
-+	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec
- 
- 
- # FIXME: file should not depend on plug-in
- workaround_that_file_depends_on_plug_in = \
--	-u $(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
--	-u $(SYMPREFIX)gimp_image_map_config_get_type
-+	-Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
-+	-Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type
- 
- 
- # core, vectors and gegl are on the same architectural layer, prevent
- # the linker from panicing
- calm_down_linker = \
--	-u $(SYMPREFIX)gimp_vectors_undo_get_type	\
--	-u $(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
--	-u $(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
--	-u $(SYMPREFIX)gimp_curve_map_pixels
-+	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type	\
-+	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
-+	-Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
-+	-Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels
- 
- AM_LDFLAGS = \
- 	$(munix)					\
---- app/tests/Makefile.am
-+++ app/tests/Makefile.am
-@@ -63,22 +63,22 @@
- # We need this due to circular dependencies, see more detailed
- # comments about it in app/Makefile.am
- AM_LDFLAGS = \
--	-u $(SYMPREFIX)xcf_init				\
--	-u $(SYMPREFIX)base_init			\
--	-u $(SYMPREFIX)internal_procs_init		\
--	-u $(SYMPREFIX)gimp_plug_in_manager_restore	\
--	-u $(SYMPREFIX)gimp_pdb_compat_param_spec	\
--	-u $(SYMPREFIX)gui_init				\
--	-u $(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
--	-u $(SYMPREFIX)gimp_image_map_config_get_type	\
--	-u $(SYMPREFIX)gimp_vectors_undo_get_type	\
--	-u $(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
--	-u $(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
--	-u $(SYMPREFIX)actions_init			\
--	-u $(SYMPREFIX)gimp_error_dialog_new		\
--	-u $(SYMPREFIX)menus_save			\
--	-u $(SYMPREFIX)gimp_tools_save			\
--	-u $(SYMPREFIX)gimp_curve_map_pixels
-+	-Wl,-u,$(SYMPREFIX)xcf_init				\
-+	-Wl,-u,$(SYMPREFIX)base_init			\
-+	-Wl,-u,$(SYMPREFIX)internal_procs_init		\
-+	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore	\
-+	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec	\
-+	-Wl,-u,$(SYMPREFIX)gui_init				\
-+	-Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
-+	-Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type	\
-+	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type	\
-+	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
-+	-Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
-+	-Wl,-u,$(SYMPREFIX)actions_init			\
-+	-Wl,-u,$(SYMPREFIX)gimp_error_dialog_new		\
-+	-Wl,-u,$(SYMPREFIX)menus_save			\
-+	-Wl,-u,$(SYMPREFIX)gimp_tools_save			\
-+	-Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels
- 
- # Note that we have some duplicate entries here too to work around
- # circular dependencies and systems on the same architectural layer as
---- app/tests/Makefile.in
-+++ app/tests/Makefile.in
-@@ -1221,22 +1221,22 @@
- # We need this due to circular dependencies, see more detailed
- # comments about it in app/Makefile.am
- AM_LDFLAGS = \
--	-u $(SYMPREFIX)xcf_init				\
--	-u $(SYMPREFIX)base_init			\
--	-u $(SYMPREFIX)internal_procs_init		\
--	-u $(SYMPREFIX)gimp_plug_in_manager_restore	\
--	-u $(SYMPREFIX)gimp_pdb_compat_param_spec	\
--	-u $(SYMPREFIX)gui_init				\
--	-u $(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
--	-u $(SYMPREFIX)gimp_image_map_config_get_type	\
--	-u $(SYMPREFIX)gimp_vectors_undo_get_type	\
--	-u $(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
--	-u $(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
--	-u $(SYMPREFIX)actions_init			\
--	-u $(SYMPREFIX)gimp_error_dialog_new		\
--	-u $(SYMPREFIX)menus_save			\
--	-u $(SYMPREFIX)gimp_tools_save			\
--	-u $(SYMPREFIX)gimp_curve_map_pixels
-+	-Wl,-u,$(SYMPREFIX)xcf_init				\
-+	-Wl,-u,$(SYMPREFIX)base_init			\
-+	-Wl,-u,$(SYMPREFIX)internal_procs_init		\
-+	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore	\
-+	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec	\
-+	-Wl,-u,$(SYMPREFIX)gui_init				\
-+	-Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
-+	-Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type	\
-+	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type	\
-+	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
-+	-Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
-+	-Wl,-u,$(SYMPREFIX)actions_init			\
-+	-Wl,-u,$(SYMPREFIX)gimp_error_dialog_new		\
-+	-Wl,-u,$(SYMPREFIX)menus_save			\
-+	-Wl,-u,$(SYMPREFIX)gimp_tools_save			\
-+	-Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels
- 
- 
- # Note that we have some duplicate entries here too to work around
---- devel-docs/app/Makefile.am
-+++ devel-docs/app/Makefile.am
-@@ -62,10 +62,10 @@
- 	-UGTK_DISABLE_SINGLE_INCLUDES
- 
- GTKDOC_LIBS = \
--	-u $(SYMPREFIX)xcf_init		   				     \
--	-u $(SYMPREFIX)internal_procs_init 				     \
--	-u $(SYMPREFIX)gimp_coords_mix	   				     \
--	-u $(SYMPREFIX)gimp_plug_in_manager_restore			     \
-+	-Wl,-u,$(SYMPREFIX)xcf_init		   				     \
-+	-Wl,-u,$(SYMPREFIX)internal_procs_init 				     \
-+	-Wl,-u,$(SYMPREFIX)gimp_coords_mix	   				     \
-+	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore			     \
- 	$(top_builddir)/app/app.o					     \
-         $(top_builddir)/app/batch.o					     \
-         $(top_builddir)/app/errors.o					     \
---- devel-docs/app/Makefile.in
-+++ devel-docs/app/Makefile.in
-@@ -511,10 +511,10 @@
- 	-UGTK_DISABLE_SINGLE_INCLUDES
- 
- GTKDOC_LIBS = \
--	-u $(SYMPREFIX)xcf_init		   				     \
--	-u $(SYMPREFIX)internal_procs_init 				     \
--	-u $(SYMPREFIX)gimp_coords_mix	   				     \
--	-u $(SYMPREFIX)gimp_plug_in_manager_restore			     \
-+	-Wl,-u,$(SYMPREFIX)xcf_init		   				     \
-+	-Wl,-u,$(SYMPREFIX)internal_procs_init 				     \
-+	-Wl,-u,$(SYMPREFIX)gimp_coords_mix	   				     \
-+	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore			     \
- 	$(top_builddir)/app/app.o					     \
-         $(top_builddir)/app/batch.o					     \
-         $(top_builddir)/app/errors.o					     \
diff --git a/media-gfx/gimp/files/gimp-2.8.14-blend-center.patch b/media-gfx/gimp/files/gimp-2.8.14-blend-center.patch
deleted file mode 100644
index eba04df59aa2..000000000000
--- a/media-gfx/gimp/files/gimp-2.8.14-blend-center.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 97e55692ebad5897be334c81c133b6626b9b6920 Mon Sep 17 00:00:00 2001
-From: Michael Natterer <mitch@gimp.org>
-Date: Wed, 26 Aug 2015 23:23:16 +0200
-Subject: app: the blend tool was rendering all gradients off-by-0.5
-
-When calculating the color of a pixel, we want to calculate the color
-at its center, not at its top-left corner. Found by Raymond Jennings.
-
-EDIT (by Sebastian Pipping <sping@gentoo.org>):
-  Cut away patch chunk for app/operations/gimpoperationblend.c
-  since 2.8.14 doesn't seem to have that file.
-
-diff --git a/app/core/gimpdrawable-blend.c b/app/core/gimpdrawable-blend.c
-index af565d1..e4f92a1 100644
---- a/app/core/gimpdrawable-blend.c
-+++ b/app/core/gimpdrawable-blend.c
-@@ -628,6 +628,10 @@ gradient_render_pixel (gdouble   x,
-   RenderBlendData *rbd = render_data;
-   gdouble          factor;
- 
-+  /*  we want to calculate the color at the pixel's center  */
-+  x += 0.5;
-+  y += 0.5;
-+
-   /* Calculate blending factor */
- 
-   switch (rbd->gradient_type)
--- 
-cgit v0.10.2
-
diff --git a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17784.patch b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17784.patch
deleted file mode 100644
index c7df330409f8..000000000000
--- a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17784.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From c57f9dcf1934a9ab0cd67650f2dea18cb0902270 Mon Sep 17 00:00:00 2001
-From: Jehan <jehan@girinstud.io>
-Date: Thu, 21 Dec 2017 12:25:32 +0100
-Subject: Bug 790784 - (CVE-2017-17784) heap overread in gbr parser /
- load_image.
-
-We were assuming the input name was well formed, hence was
-nul-terminated. As any data coming from external input, this has to be
-thorougly checked.
-Similar to commit 06d24a79af94837d615d0024916bb95a01bf3c59 but adapted
-to older gimp-2-8 code.
----
- plug-ins/common/file-gbr.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/plug-ins/common/file-gbr.c b/plug-ins/common/file-gbr.c
-index b028100..d3f01d9 100644
---- a/plug-ins/common/file-gbr.c
-+++ b/plug-ins/common/file-gbr.c
-@@ -443,7 +443,8 @@ load_image (const gchar  *filename,
-     {
-       gchar *temp = g_new (gchar, bn_size);
- 
--      if ((read (fd, temp, bn_size)) < bn_size)
-+      if ((read (fd, temp, bn_size)) < bn_size ||
-+          temp[bn_size - 1] != '\0')
-         {
-           g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-                        _("Error in GIMP brush file '%s'"),
--- 
-cgit v0.12
-
diff --git a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17785.patch b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17785.patch
deleted file mode 100644
index 1f77d36ec6ca..000000000000
--- a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17785.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From 1882bac996a20ab5c15c42b0c5e8f49033a1af54 Mon Sep 17 00:00:00 2001
-From: Tobias Stoeckmann <tobias@stoeckmann.org>
-Date: Sun, 29 Oct 2017 15:19:41 +0100
-Subject: Bug 739133 - (CVE-2017-17785) Heap overflow while parsing FLI files.
-
-It is possible to trigger a heap overflow while parsing FLI files. The
-RLE decoder is vulnerable to out of boundary writes due to lack of
-boundary checks.
-
-The variable "framebuf" points to a memory area which was allocated
-with fli_header->width * fli_header->height bytes. The RLE decoder
-therefore must never write beyond that limit.
-
-If an illegal frame is detected, the parser won't stop, which means
-that the next valid sequence is properly parsed again. This should
-allow GIMP to parse FLI files as good as possible even if they are
-broken by an attacker or by accident.
-
-While at it, I changed the variable xc to be of type size_t, because
-the multiplication of width and height could overflow a 16 bit type.
-
-Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
-(cherry picked from commit edb251a7ef1602d20a5afcbf23f24afb163de63b)
----
- plug-ins/file-fli/fli.c | 50 ++++++++++++++++++++++++++++++++++---------------
- 1 file changed, 35 insertions(+), 15 deletions(-)
-
-diff --git a/plug-ins/file-fli/fli.c b/plug-ins/file-fli/fli.c
-index 313efeb..ffb651e 100644
---- a/plug-ins/file-fli/fli.c
-+++ b/plug-ins/file-fli/fli.c
-@@ -25,6 +25,8 @@
- 
- #include "config.h"
- 
-+#include <glib/gstdio.h>
-+
- #include <string.h>
- #include <stdio.h>
- 
-@@ -461,23 +463,27 @@ void fli_read_brun(FILE *f, s_fli_header *fli_header, unsigned char *framebuf)
- 	unsigned short yc;
- 	unsigned char *pos;
- 	for (yc=0; yc < fli_header->height; yc++) {
--		unsigned short xc, pc, pcnt;
-+		unsigned short pc, pcnt;
-+		size_t n, xc;
- 		pc=fli_read_char(f);
- 		xc=0;
- 		pos=framebuf+(fli_header->width * yc);
-+		n=(size_t)fli_header->width * (fli_header->height-yc);
- 		for (pcnt=pc; pcnt>0; pcnt--) {
- 			unsigned short ps;
- 			ps=fli_read_char(f);
- 			if (ps & 0x80) {
- 				unsigned short len;
--				for (len=-(signed char)ps; len>0; len--) {
-+				for (len=-(signed char)ps; len>0 && xc<n; len--) {
- 					pos[xc++]=fli_read_char(f);
- 				}
- 			} else {
- 				unsigned char val;
-+				size_t len;
-+				len=MIN(n-xc,ps);
- 				val=fli_read_char(f);
--				memset(&(pos[xc]), val, ps);
--				xc+=ps;
-+				memset(&(pos[xc]), val, len);
-+				xc+=len;
- 			}
- 		}
- 	}
-@@ -564,25 +570,34 @@ void fli_read_lc(FILE *f, s_fli_header *fli_header, unsigned char *old_framebuf,
- 	memcpy(framebuf, old_framebuf, fli_header->width * fli_header->height);
- 	firstline = fli_read_short(f);
- 	numline = fli_read_short(f);
-+	if (numline > fli_header->height || fli_header->height-numline < firstline)
-+		return;
-+
- 	for (yc=0; yc < numline; yc++) {
--		unsigned short xc, pc, pcnt;
-+		unsigned short pc, pcnt;
-+		size_t n, xc;
- 		pc=fli_read_char(f);
- 		xc=0;
- 		pos=framebuf+(fli_header->width * (firstline+yc));
-+		n=(size_t)fli_header->width * (fli_header->height-firstline-yc);
- 		for (pcnt=pc; pcnt>0; pcnt--) {
- 			unsigned short ps,skip;
- 			skip=fli_read_char(f);
- 			ps=fli_read_char(f);
--			xc+=skip;
-+			xc+=MIN(n-xc,skip);
- 			if (ps & 0x80) {
- 				unsigned char val;
-+				size_t len;
- 				ps=-(signed char)ps;
- 				val=fli_read_char(f);
--				memset(&(pos[xc]), val, ps);
--				xc+=ps;
-+				len=MIN(n-xc,ps);
-+				memset(&(pos[xc]), val, len);
-+				xc+=len;
- 			} else {
--				fread(&(pos[xc]), ps, 1, f);
--				xc+=ps;
-+				size_t len;
-+				len=MIN(n-xc,ps);
-+				fread(&(pos[xc]), len, 1, f);
-+				xc+=len;
- 			}
- 		}
- 	}
-@@ -689,7 +704,8 @@ void fli_read_lc_2(FILE *f, s_fli_header *fli_header, unsigned char *old_framebu
- 	yc=0;
- 	numline = fli_read_short(f);
- 	for (lc=0; lc < numline; lc++) {
--		unsigned short xc, pc, pcnt, lpf, lpn;
-+		unsigned short pc, pcnt, lpf, lpn;
-+		size_t n, xc;
- 		pc=fli_read_short(f);
- 		lpf=0; lpn=0;
- 		while (pc & 0x8000) {
-@@ -700,26 +716,30 @@ void fli_read_lc_2(FILE *f, s_fli_header *fli_header, unsigned char *old_framebu
- 			}
- 			pc=fli_read_short(f);
- 		}
-+		yc=MIN(yc, fli_header->height);
- 		xc=0;
- 		pos=framebuf+(fli_header->width * yc);
-+		n=(size_t)fli_header->width * (fli_header->height-yc);
- 		for (pcnt=pc; pcnt>0; pcnt--) {
- 			unsigned short ps,skip;
- 			skip=fli_read_char(f);
- 			ps=fli_read_char(f);
--			xc+=skip;
-+			xc+=MIN(n-xc,skip);
- 			if (ps & 0x80) {
- 				unsigned char v1,v2;
- 				ps=-(signed char)ps;
- 				v1=fli_read_char(f);
- 				v2=fli_read_char(f);
--				while (ps>0) {
-+				while (ps>0 && xc+1<n) {
- 					pos[xc++]=v1;
- 					pos[xc++]=v2;
- 					ps--;
- 				}
- 			} else {
--				fread(&(pos[xc]), ps, 2, f);
--				xc+=ps << 1;
-+				size_t len;
-+				len=MIN((n-xc)/2,ps);
-+				fread(&(pos[xc]), len, 2, f);
-+				xc+=len << 1;
- 			}
- 		}
- 		if (lpf) pos[xc]=lpn;
--- 
-cgit v0.12
-
diff --git a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17786-1.patch b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17786-1.patch
deleted file mode 100644
index 4047f7cb3c9f..000000000000
--- a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17786-1.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From ef9c821fff8b637a2178eab1c78cae6764c50e12 Mon Sep 17 00:00:00 2001
-From: Jehan <jehan@girinstud.io>
-Date: Wed, 20 Dec 2017 13:02:38 +0100
-Subject: Bug 739134 - (CVE-2017-17786) Out of bounds read / heap overflow
- in...
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-... TGA importer.
-
-Be more thorough on valid TGA RGB and RGBA images.
-In particular current TGA plug-in can import RGBA as 32 bits (8 bits per
-channel) and 16 bits (5 bits per color channel and 1 bit for alpha), and
-RGB as 15 and 24 bits.
-Maybe there exist more variants, but if they do exist, we simply don't
-support them yet.
-
-Thanks to Hanno Böck for the report and a first patch attempt.
-
-(cherry picked from commit 674b62ad45b6579ec6d7923dc3cb1ef4e8b5498b)
----
- plug-ins/common/file-tga.c | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/plug-ins/common/file-tga.c b/plug-ins/common/file-tga.c
-index aef9870..426acc2 100644
---- a/plug-ins/common/file-tga.c
-+++ b/plug-ins/common/file-tga.c
-@@ -564,12 +564,16 @@ load_image (const gchar  *filename,
-           }
-         break;
-       case TGA_TYPE_COLOR:
--        if (info.bpp != 15 && info.bpp != 16 &&
--            info.bpp != 24 && info.bpp != 32)
-+        if ((info.bpp != 15 && info.bpp != 16 &&
-+             info.bpp != 24 && info.bpp != 32)      ||
-+            ((info.bpp == 15 || info.bpp == 24) &&
-+             info.alphaBits != 0)                   ||
-+            (info.bpp == 16 && info.alphaBits != 1) ||
-+            (info.bpp == 32 && info.alphaBits != 8))
-           {
--            g_message ("Unhandled sub-format in '%s' (type = %u, bpp = %u)",
-+            g_message ("Unhandled sub-format in '%s' (type = %u, bpp = %u, alpha = %u)",
-                        gimp_filename_to_utf8 (filename),
--                       info.imageType, info.bpp);
-+                       info.imageType, info.bpp, info.alphaBits);
-             return -1;
-           }
-         break;
--- 
-cgit v0.12
-
diff --git a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17786-2.patch b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17786-2.patch
deleted file mode 100644
index 7177dd3c1f11..000000000000
--- a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17786-2.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 22e2571c25425f225abdb11a566cc281fca6f366 Mon Sep 17 00:00:00 2001
-From: Jehan <jehan@girinstud.io>
-Date: Wed, 20 Dec 2017 13:26:26 +0100
-Subject: plug-ins: TGA 16-bit RGB (without alpha bit) is also valid.
-
-According to some spec on the web, 16-bit RGB is also valid. In this
-case, the last bit is simply ignored (at least that's how it is
-implemented right now).
-
-(cherry picked from commit 8ea316667c8a3296bce2832b3986b58d0fdfc077)
----
- plug-ins/common/file-tga.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/plug-ins/common/file-tga.c b/plug-ins/common/file-tga.c
-index 426acc2..eb14a1d 100644
---- a/plug-ins/common/file-tga.c
-+++ b/plug-ins/common/file-tga.c
-@@ -568,7 +568,8 @@ load_image (const gchar  *filename,
-              info.bpp != 24 && info.bpp != 32)      ||
-             ((info.bpp == 15 || info.bpp == 24) &&
-              info.alphaBits != 0)                   ||
--            (info.bpp == 16 && info.alphaBits != 1) ||
-+            (info.bpp == 16 && info.alphaBits != 1 &&
-+             info.alphaBits != 0)                   ||
-             (info.bpp == 32 && info.alphaBits != 8))
-           {
-             g_message ("Unhandled sub-format in '%s' (type = %u, bpp = %u, alpha = %u)",
--- 
-cgit v0.12
-
diff --git a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17787.patch b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17787.patch
deleted file mode 100644
index 654726388ea6..000000000000
--- a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17787.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 87ba505fff85989af795f4ab6a047713f4d9381d Mon Sep 17 00:00:00 2001
-From: Jehan <jehan@girinstud.io>
-Date: Thu, 21 Dec 2017 12:49:41 +0100
-Subject: Bug 790853 - (CVE-2017-17787) heap overread in psp importer.
-
-As any external data, we have to check that strings being read at fixed
-length are properly nul-terminated.
-
-(cherry picked from commit eb2980683e6472aff35a3117587c4f814515c74d)
----
- plug-ins/common/file-psp.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/plug-ins/common/file-psp.c b/plug-ins/common/file-psp.c
-index 4cbafe3..e350e4d 100644
---- a/plug-ins/common/file-psp.c
-+++ b/plug-ins/common/file-psp.c
-@@ -890,6 +890,12 @@ read_creator_block (FILE     *f,
-               g_free (string);
-               return -1;
-             }
-+          if (string[length - 1] != '\0')
-+            {
-+              g_message ("Creator keyword data not nul-terminated");
-+              g_free (string);
-+              return -1;
-+            }
-           switch (keyword)
-             {
-             case PSP_CRTR_FLD_TITLE:
--- 
-cgit v0.12
-
diff --git a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17788.patch b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17788.patch
deleted file mode 100644
index 2bf16b85e607..000000000000
--- a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17788.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Hanno Boeck <hanno@hboeck.de>
-Date: Mon, 27 Nov 2017 00:37:29 +0100
-Subject: 790783 - buffer overread in XCF parser if version field...
-Origin: https://git.gnome.org/browse/GIMP/commit/?id=702c4227e8b6169f781e4bb5ae4b5733f51ab126
-Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2017-17788
-Bug-Debian: https://bugs.debian.org/885347
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=790783
-
-...has no null terminator
-
-Check for the presence of '\0' before using atoi() on the version
-string. Patch slightly modified (mitch).
-[carnil: backport to gimp-2-8: affected code in xcf_load_invoker]
----
- app/xcf/xcf.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/app/xcf/xcf.c
-+++ b/app/xcf/xcf.c
-@@ -318,7 +318,8 @@ xcf_load_invoker (GimpProcedure      *pr
-         {
-           info.file_version = 0;
-         }
--      else if (id[9] == 'v')
-+      else if (id[9]  == 'v' &&
-+               id[13] == '\0')
-         {
-           info.file_version = atoi (id + 10);
-         }
diff --git a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17789.patch b/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17789.patch
deleted file mode 100644
index 3d63694f6790..000000000000
--- a/media-gfx/gimp/files/gimp-2.8.22-cve-2017-17789.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 01898f10f87a094665a7fdcf7153990f4e511d3f Mon Sep 17 00:00:00 2001
-From: Jehan <jehan@girinstud.io>
-Date: Wed, 20 Dec 2017 16:44:20 +0100
-Subject: Bug 790849 - (CVE-2017-17789) CVE-2017-17789 Heap buffer overflow...
-
-... in PSP importer.
-Check if declared block length is valid (i.e. within the actual file)
-before going further.
-Consider the file as broken otherwise and fail loading it.
-
-(cherry picked from commit 28e95fbeb5720e6005a088fa811f5bf3c1af48b8)
----
- plug-ins/common/file-psp.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/plug-ins/common/file-psp.c b/plug-ins/common/file-psp.c
-index ac0fff7..4cbafe3 100644
---- a/plug-ins/common/file-psp.c
-+++ b/plug-ins/common/file-psp.c
-@@ -1771,6 +1771,15 @@ load_image (const gchar  *filename,
-     {
-       block_start = ftell (f);
- 
-+      if (block_start + block_total_len > st.st_size)
-+        {
-+          g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-+                       _("Could not open '%s' for reading: %s"),
-+                       gimp_filename_to_utf8 (filename),
-+                       _("invalid block size"));
-+          goto error;
-+        }
-+
-       if (id == PSP_IMAGE_BLOCK)
-         {
-           if (block_number != 0)
--- 
-cgit v0.12
-
diff --git a/media-gfx/gimp/files/gimp-2.9.8-cve-2017-17784.patch b/media-gfx/gimp/files/gimp-2.9.8-cve-2017-17784.patch
deleted file mode 100644
index e46703d3d3d4..000000000000
--- a/media-gfx/gimp/files/gimp-2.9.8-cve-2017-17784.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 06d24a79af94837d615d0024916bb95a01bf3c59 Mon Sep 17 00:00:00 2001
-From: Jehan <jehan@girinstud.io>
-Date: Thu, 21 Dec 2017 12:15:34 +0100
-Subject: Bug 790784 - (CVE-2017-17784) heap overread in gbr parser /
- load_image.
-
-We were assuming the input name was well formed, hence was
-nul-terminated. As any data coming from external input, this has to be
-thorougly checked.
----
- plug-ins/common/file-gbr.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/plug-ins/common/file-gbr.c b/plug-ins/common/file-gbr.c
-index b8933e7..585e74a 100644
---- a/plug-ins/common/file-gbr.c
-+++ b/plug-ins/common/file-gbr.c
-@@ -456,7 +456,8 @@ load_image (GFile   *file,
- 
-       if (! g_input_stream_read_all (input, temp, size,
-                                      &bytes_read, NULL, error) ||
--          bytes_read != size)
-+          bytes_read != size                                   ||
-+          temp[size - 1] != '\0')
-         {
-           g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-                        _("Error in GIMP brush file '%s'"),
--- 
-cgit v0.12
-
diff --git a/media-gfx/gimp/gimp-2.10.18-r1.ebuild b/media-gfx/gimp/gimp-2.10.18-r1.ebuild
index 0b0909f7b22d..0bca675be274 100644
--- a/media-gfx/gimp/gimp-2.10.18-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.18-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc64 ~x86"
+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} )"
diff --git a/media-gfx/gimp/gimp-2.9.8-r1.ebuild b/media-gfx/gimp/gimp-2.10.18-r2.ebuild
index 1213fde7aff4..f586c716b705 100644
--- a/media-gfx/gimp/gimp-2.9.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.18-r2.ebuild
@@ -3,173 +3,195 @@
 
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
+GNOME2_EAUTORECONF=yes
+WANT_AUTOMAKE=
 
-inherit versionator virtualx autotools eutils gnome2 ltprune multilib python-single-r1
+inherit autotools gnome2 python-single-r1 virtualx
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
+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"
 
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
+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 )"
 
-RDEPEND=">=dev-libs/glib-2.40.0:2
+COMMON_DEPEND="
+	>=app-text/poppler-0.50[cairo]
+	>=app-text/poppler-data-0.4.7
 	>=dev-libs/atk-2.2.0
-	>=x11-libs/gtk+-2.24.10:2
-	dev-util/gtk-update-icon-cache
-	>=x11-libs/gdk-pixbuf-2.31:2
-	>=x11-libs/cairo-1.12.2
-	>=x11-libs/pango-1.29.4
-	xpm? ( x11-libs/libXpm )
+	>=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/harfbuzz-0.9.19
+	>=media-libs/gegl-0.4.22:0.4[cairo]
 	>=media-libs/gexiv2-0.10.6
-	>=media-libs/libmypaint-1.3.0[gegl]
-	>=media-libs/fontconfig-2.2.0
+	>=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
-	dev-libs/libxml2
-	dev-libs/libxslt
-	x11-themes/hicolor-icon-theme
-	>=media-libs/babl-0.1.38
-	>=media-libs/gegl-0.3.24:0.3[cairo]
+	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 )
-	aqua? ( x11-libs/gtk-mac-integration )
-	gnome? ( gnome-base/gvfs )
-	virtual/jpeg:0
-	>=media-libs/lcms-2.8:2
-	mng? ( media-libs/libmng )
-	openexr? ( >=media-libs/openexr-1.6.1 )
-	pdf? ( >=app-text/poppler-0.44[cairo] >=app-text/poppler-data-0.4.7 )
-	>=media-libs/libpng-1.6.25:0
+	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/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}]
 			>=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}]
 		')
 	)
-	>=media-libs/tiff-3.5.7:0
-	>=gnome-base/librsvg-2.40.6:2
-	webp? ( >=media-libs/libwebp-0.6.0 )
+	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 )
-	net-libs/glib-networking[ssl]
-	x11-libs/libXcursor
-	sys-libs/zlib
-	app-arch/bzip2
-	>=app-arch/xz-utils-5.0.0
-	postscript? ( app-text/ghostscript-gpl )
-	udev? ( dev-libs/libgudev:= )"
-DEPEND="${RDEPEND}
+	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
-	sys-apps/findutils
-	virtual/pkgconfig
+	dev-util/gtk-update-icon-cache
 	>=dev-util/intltool-0.40.1
+	sys-apps/findutils
 	>=sys-devel/gettext-0.19
-	doc? ( >=dev-util/gtk-doc-1 )
 	>=sys-devel/libtool-2.2
-	>=sys-devel/automake-1.11
-	dev-util/gtk-doc-am"  # due to our call to eautoreconf below (bug #386453)
+	virtual/pkgconfig
+"
 
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
+DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# Bugs 685210 (and duplicate 691070)
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
+)
 
 pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
+	use python && python-single-r1_pkg_setup
 }
 
-PATCHES=(
-	"${FILESDIR}"/${P}-cve-2017-17784.patch  # bug 641954
-	"${FILESDIR}"/${PN}-2.8.22-cve-2017-17785.patch  # bug 641954
-	"${FILESDIR}"/${PN}-2.8.22-cve-2017-17786-1.patch  # bug 641954
-	"${FILESDIR}"/${PN}-2.8.22-cve-2017-17786-2.patch  # bug 641954
-	"${FILESDIR}"/${PN}-2.8.22-cve-2017-17787.patch  # bug 641954
-	# NOTE:                           CVE-2017-17788 already fixed upstream
-	"${FILESDIR}"/${PN}-2.8.22-cve-2017-17789.patch  # bug 641954
-)
-
 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
+
 	# Disable system CFLAGS suppressing on SSE{2,4.1} support tests by addition of {SSE2,SSE4_1}_EXTRA_CFLAGS: bug #702554
 	sed -i -e 's:\$intrinsics_save_CFLAGS \$SSE2_EXTRA_CFLAGS:\$SSE2_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' \
 		-e 's:\$intrinsics_save_CFLAGS \$SSE4_1_EXTRA_CFLAGS:\$SSE4_1_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' configure.ac || die
 
-	gnome2_src_prepare
-
 	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
 	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
-	eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
+
+	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.3
-		GDBUS_CODEGEN=${EPREFIX}/bin/false
+		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+		GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
 		--enable-default-binary
-		$(use_with !aqua x)
-		$(use_with aalib aa)
-		$(use_with alsa)
-		$(use_enable altivec)
+
+		--disable-check-update
+		--enable-mp
 		--with-appdata-test
+		--with-bug-report-url=https://bugs.gentoo.org/
+		--with-xmc
+		--without-libbacktrace
 		--without-webkit
-		--without-libjasper
-		$(use_with postscript gs)
+		--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 webp)
-		$(use_with pdf poppler)
-		$(use_enable python)
-		$(use_enable smp mp)
-		$(use_enable cpu_flags_x86_sse sse)
+		$(use_with postscript gs)
 		$(use_with udev gudev)
+		$(use_with unwind libunwind)
+		$(use_with webp)
 		$(use_with wmf)
-		--with-xmc
 		$(use_with xpm libxpm)
-		$(use_enable vector-icons)
-		--without-xvfb-run
 	)
 
 	gnome2_src_configure "${myconf[@]}"
 }
 
 src_compile() {
-	# 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/  # bug #574038
-	addwrite /dev/ati/  # bug 589198
-	addwrite /proc/mtrr  # bug 589198
-
-	export XDG_DATA_DIRS=${EPREFIX}/usr/share  # bug 587004
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
 	gnome2_src_compile
 }
 
-_clean_up_locales() {
-	[[ -z ${LINGUAS+set} ]] && return
-	einfo "Cleaning up locales..."
-	for lang in ${LANGS}; do
-		has ${lang} ${LINGUAS} && {
-			einfo "- keeping ${lang}"
-			continue
-		}
-		rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
-	done
+# 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() {
@@ -179,21 +201,24 @@ src_test() {
 src_install() {
 	gnome2_src_install
 
-	if use python; then
-		python_optimize
-	fi
+	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
+	mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
 
-	prune_libtool_files --all
+	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
+	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
 
-	_clean_up_locales
+	_rename_plugins || die
 }
 
 pkg_postinst() {
diff --git a/media-gfx/gimp/gimp-2.10.20-r1.ebuild b/media-gfx/gimp/gimp-2.10.20-r1.ebuild
new file mode 100644
index 000000000000..347ade7269ef
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.20-r1.ebuild
@@ -0,0 +1,228 @@
+# 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 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"
+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.2:2
+	>=dev-libs/json-glib-1.2.6
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.40.6:2
+	>=media-gfx/mypaint-brushes-1.3.0:=
+	>=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/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() {
+	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/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
+
+	gnome2_src_prepare  # calls eautoreconf
+
+	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
+	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+_adjust_sandbox() {
+	# Bugs #569738 and #591214
+	local nv
+	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+		# We do not check for existence as they may show up later
+		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+		addwrite "${nv}"
+	done
+
+	addwrite /dev/dri/  # bugs #574038 and #684886
+	addwrite /dev/ati/  # bug #589198
+	addwrite /proc/mtrr  # bug #589198
+}
+
+src_configure() {
+	_adjust_sandbox
+
+	local myconf=(
+		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+		GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
+		--enable-default-binary
+
+		--disable-check-update
+		--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.8.22-r2.ebuild b/media-gfx/gimp/gimp-2.8.22-r2.ebuild
deleted file mode 100644
index 497e8fb7e44b..000000000000
--- a/media-gfx/gimp/gimp-2.8.22-r2.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator virtualx autotools eutils gnome2 fdo-mime ltprune multilib python-single-r1
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm"
-
-RDEPEND=">=dev-libs/glib-2.30.2:2
-	>=dev-libs/atk-2.2.0
-	>=x11-libs/gtk+-2.24.10:2
-	>=x11-libs/gdk-pixbuf-2.24.1:2
-	>=x11-libs/cairo-1.10.2
-	>=x11-libs/pango-1.29.4
-	xpm? ( x11-libs/libXpm )
-	>=media-libs/freetype-2.1.7
-	>=media-libs/fontconfig-2.2.0
-	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-	x11-themes/hicolor-icon-theme
-	>=media-libs/babl-0.1.10
-	>=media-libs/gegl-0.2.0:0
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	aqua? ( x11-libs/gtk-mac-integration )
-	curl? ( net-misc/curl )
-	dbus? ( dev-libs/dbus-glib )
-	gnome? ( gnome-base/gvfs )
-	jpeg? ( virtual/jpeg:0 )
-	exif? ( >=media-libs/libexif-0.6.15 )
-	lcms? ( >=media-libs/lcms-2.2:2 )
-	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-0.12.4[cairo] )
-	png? ( >=media-libs/libpng-1.2.37:0 )
-	python?	(
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	tiff? ( >=media-libs/tiff-3.5.7:0 )
-	svg? ( >=gnome-base/librsvg-2.36.0:2 )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	x11-libs/libXcursor
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	postscript? ( app-text/ghostscript-gpl )
-	udev? ( dev-libs/libgudev:= )"
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.19
-	doc? ( >=dev-util/gtk-doc-1 )
-	>=sys-devel/libtool-2.2
-	>=sys-devel/automake-1.11
-	dev-util/gtk-doc-am"  # due to our call to eautoreconf below (bug #386453)
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-S="${WORKDIR}"/${P}
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	G2CONF="--enable-default-binary \
-		$(use_with !aqua x) \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		$(use_with bzip2) \
-		$(use_with curl libcurl) \
-		$(use_with dbus) \
-		$(use_with gnome gvfs) \
-		--without-webkit \
-		$(use_with jpeg libjpeg) \
-		--without-libjasper \
-		$(use_with exif libexif) \
-		$(use_with lcms lcms lcms2) \
-		$(use_with postscript gs) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_with mng libmng) \
-		$(use_with pdf poppler) \
-		$(use_with png libpng) \
-		$(use_enable python) \
-		$(use_enable smp mp) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_with svg librsvg) \
-		$(use_with tiff libtiff) \
-		$(use_with udev gudev) \
-		$(use_with wmf) \
-		--with-xmc \
-		$(use_with xpm libxpm) \
-		--without-xvfb-run"
-
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cve-2017-17784.patch  # bug 641954
-	epatch "${FILESDIR}"/${P}-cve-2017-17785.patch  # bug 641954
-	epatch "${FILESDIR}"/${P}-cve-2017-17786-1.patch  # bug 641954
-	epatch "${FILESDIR}"/${P}-cve-2017-17786-2.patch  # bug 641954
-	epatch "${FILESDIR}"/${P}-cve-2017-17787.patch  # bug 641954
-	epatch "${FILESDIR}"/${P}-cve-2017-17788.patch  # bug 641954
-	epatch "${FILESDIR}"/${P}-cve-2017-17789.patch  # bug 641954
-
-	epatch "${FILESDIR}"/${PN}-2.8.14-blend-center.patch  # bug 558878
-	epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch  # bug 395695, comment 9 and 16
-	epatch "${FILESDIR}"/${PN}-2.8.10-clang.patch # bug 449370 compile with clang
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
-
-	gnome2_src_prepare
-}
-
-_clean_up_locales() {
-	[[ -z ${LINGUAS+set} ]] && return
-	einfo "Cleaning up locales..."
-	for lang in ${LANGS}; do
-		has ${lang} ${LINGUAS} && {
-			einfo "- keeping ${lang}"
-			continue
-		}
-		rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
-	done
-}
-
-src_test() {
-	Xemake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_optimize
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	prune_libtool_files --all
-
-	# 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
-
-	_clean_up_locales
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 1ba63b659607..4bab1cc4f0bf 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -36,11 +36,11 @@ COMMON_DEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
 	>=gnome-base/librsvg-2.40.6:2
-	>=media-gfx/mypaint-brushes-1.3.0
-	>=media-libs/babl-0.1.78[introspection,lcms,vala]
+	>=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.24:0.4[cairo,introspection,lcms,vala]
+	>=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
@@ -118,6 +118,10 @@ 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/== "xquartz"/= "xquartz"/' configure.ac || die #494864
 	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
 
diff --git a/media-gfx/gimp/metadata.xml b/media-gfx/gimp/metadata.xml
index 7d0fd04395e6..88724f7e8aab 100644
--- a/media-gfx/gimp/metadata.xml
+++ b/media-gfx/gimp/metadata.xml
@@ -10,14 +10,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
-		<flag name="smp">
-			Enable support for multiprocessors
-		</flag>
-		<flag name="vector-icons">
-			Enable support for vector icons (experimental)
-		</flag>
-		<flag name="heif">
-			Enable support for ISO/IEC 23008-12:2017 HEIF files
-		</flag>
+		<flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF files</flag>
+		<flag name="vector-icons">Enable support for vector icons (experimental)</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index 8efa9faad47b..927892d6e4ba 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,3 +1,5 @@
 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 2305 BLAKE2B 895246524e0f75a98f28f6473aa5c35389428f9534bfe6c511715a3de0771e9468053a26f17b3b94a5b0bda44c19249b2d563ba0d3507edf176f4952e76171da SHA512 2fe9ebc90ee752d6de4a491575a9dd73c2ff0b34a55a13c68a46ca045f50b9a427e0a7432f3b4095070768339a2ad111ff65dd7f1d1a10a312312aaffbf46cc7
 MISC metadata.xml 992 BLAKE2B beda29ca65d25e5d68c014fbb70fb539cf17b55d64255d6d74305d710f3979b5156eda764d75992f057416f5eb96af899b988633dd8444fcf22c6a5f73fe9b9b SHA512 3c47be6c01072a0b4845dd42b6d3561d340eb703bd9cb5c727ec24b653ab76eee38e35ba63c4cd71b93514ab0cb8bd75663febeed1901cccedfd30f223e870df
diff --git a/media-gfx/gnome-photos/gnome-photos-3.34.2.ebuild b/media-gfx/gnome-photos/gnome-photos-3.34.2.ebuild
new file mode 100644
index 000000000000..33c329f5adce
--- /dev/null
+++ b/media-gfx/gnome-photos/gnome-photos-3.34.2.ebuild
@@ -0,0 +1,94 @@
+# 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 e73dc32ed3c1..73e616db816f 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,4 +1,4 @@
 AUX 0001-Fix-unwanted-automagic-activation-of-aalib-support.patch 1049 BLAKE2B 62afe72d6630420fa0068e652cdfbfde3c4e73541e53154627ad1cc23ad10f72ac85cf5ae317d2b0bf4127e474af2ca2268e57011eb835d57d88e2d6fa65a85f SHA512 252390cfb2533e9c15d1f881f6729660e2f6cd737a9257c5dec7f06f72f2960c3b5fe940e7fc774c862e6156f517357ca7b933822c23a466ef39fbfc2f14bf8c
 DIST gphoto2-2.5.20.tar.bz2 790065 BLAKE2B 6e10aa468696bc3eff51aaa3e886ad2373997f91597e42b33777ac56bf668f918c2fa0cb8b70eb8f7cb45507e67c9cfc3a46a7408449ad35cc3b743daf74859d SHA512 0350c38c264e5ba858ee14952fbf6ad271e7fef05e3f5f8eb3d45102099ae435fec63b09881efa99af60d4e086a9c2f69be92a7e49617643ab13146a5e4655f3
-EBUILD gphoto2-2.5.20.ebuild 1327 BLAKE2B 4f3dc6bc23983b0148ddca2dbeb2ce7aba01f2dc0a093e6e910e95992f9b67f3b0d2b1c86aca1e8b730730f6edc220830c60b87488e0356971b58643c70a8a34 SHA512 b1362759378142e6b071ccf90b7391af72bd5edabcd2b57f542b9cdadd10848e34afc3a0d9d49f8f13728368caf0e19c57a81a315bdecf6a6b1166d3190414c6
+EBUILD gphoto2-2.5.20.ebuild 1334 BLAKE2B 0cbad273e56fa22e1612ce973622b44995e1dc98bae1a17c7533a7c8b2df36d51ea61cad8fa4adad201778401f2540de7e7e5728ebfbbba38f7e6bf9c6305398 SHA512 90ec16fdf308d2c92ffa7397bb9789eaa65e1ee30ae853add5993e359ecefebe118a0fac09e2edfe08b4d0ee490b6bb6ef5ec90e01b557d3a92af93df622390a
 MISC metadata.xml 329 BLAKE2B aa29f56b9c69aa63e45a1a7b6ba6e7a680f33227521a705f5273689774f4cb22d37cdd345b3aa9c43f254861b7fb1fca34d60ac9e1536d07a0806ab881b9e2e7 SHA512 d4107a001067b831a81094ad13f8ee531b52ac62e5dc0fd8810c3a7d85a069fe352bedb8275a34d3e1cb11c003405035dbfaf9b48270b5dbb02cd25772075ab7
diff --git a/media-gfx/gphoto2/gphoto2-2.5.20.ebuild b/media-gfx/gphoto2/gphoto2-2.5.20.ebuild
index 8bc039ab53cd..0bd55c88a105 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.20.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.20.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="aalib exif ncurses nls readline"
 
 # aalib -> needs libjpeg
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index ccdfb79ccc1b..8d2494c9efc6 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -4,7 +4,6 @@ AUX graphicsmagick-1.3.35-CVE-2020-12672.patch 2753 BLAKE2B 864a77b650f5cec350d8
 AUX graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch 988 BLAKE2B 4906fffe43150ef209c4d2f87d433cf78cd5e3c03a9db22426e3c3455028a5ff63c189ace1f46f47e1fa04fe8d78388b76dcabc288a9a75e57b7ebbb68f8c90d SHA512 95776534891eed617b09873fd70af020c6d6370a6765ba7aaf8185268e8b73b774ce2aeb1b284641fb12260ca0047c4543b17a18ed4ef28db725b75f988c7215
 AUX graphicsmagick-1.3.35-oss-fuzz-23042.patch 1350 BLAKE2B 415bd540a7aa194235ce1e6482035dd9b8ee4d4f5192f4d898e178875d453fd8b481efcbe139db602d411f788e3067a95106ba128ab14af63d3848f92c035405 SHA512 d345b54570e3396db81f0f60980633e139f90a54b579ad953a36aa5e16c1edfe7a5186b4e2d5a2e02f759544b372981278b06d2b688324e6b091c841a5bae133
 DIST GraphicsMagick-1.3.35.tar.xz 5543224 BLAKE2B 8a284d85341c10939fdece5c565d5b881276afb9b4c5dfb2221b780a01b99f78ee62761722c372baf9155c63f7ef176b67310aeedcab0368f4f26f5b0150bcce SHA512 baae92089d52147ef961f93495abc8a9d8b1a963af61d87a650c1ab105d46816aa38c83f654edcb5a0e1b7f07ccc06eaeaa443b9bde3a63a0b9bfb45f3ae144c
-EBUILD graphicsmagick-1.3.35-r1.ebuild 3220 BLAKE2B d91dc85c76795d64082470c7c684ea7ffe1884586f32e729d75ecfe50c645e221ff0423ba7cc51738dc16c9d0e50f0f68d35b470921fbe0dbd12d5059d96421f SHA512 ce44e7ac94afeb81a5a8db285e20d149b1045b5165b99d2f58aa9fc9e853b98a526f6f62b19a8b73d3d43c8fe5c4184b276161c0477a4c519831362cbf9901e6
-EBUILD graphicsmagick-1.3.35.ebuild 3085 BLAKE2B c0e6b0a3eae4087a3aa5130866629037ddeae03fb63dc0914b117ac9f7345f1f18c0ba2e41a9fe06fc80fe206013636f75d1a44c62e300487763bab2ed8f58ad SHA512 eeab4b3a5b8a8ffc5ee810125d5161b18339f06e10883a692592b9ec1f7c4296de9a56459f57f033d378a8638da4d8b30f1d04c5d16cff9d108ff99c8e2dc763
-EBUILD graphicsmagick-9999.ebuild 3079 BLAKE2B 5683335f38a7d90554e705f65bc84ea44643bd6c18b5d7f48f2608d949efc4ecd8f562a6f7f989ee0dbc4e208efbc4a1190154f88baf69c89ad17da1d70ad5ae SHA512 13f6d72eb95a1be93d70d685fc3296885c7084536a951e9158e989169e5e5768c98591af22b0221bcb951ce4b4bbdeb90b21b93f3fa8589026316880d1dbe8cd
-MISC metadata.xml 1057 BLAKE2B ced303553eccbba9ae91f30b3700b331149127c5a17a66bb166bff4139600cf208f3b15f8fa6fdb02594f3278ce7acd2bf6972df42c04dcb4f695710bb3870bf SHA512 9ac680de061b6dc0acd0d3a31587e0b53d3d7bcea7425909a3a4ef074fa0e32a999ecb1f48a64bb2ab55249fb5bbdc72974681fb26a879c4e5a4c9f3a04d0e82
+EBUILD graphicsmagick-1.3.35-r1.ebuild 3244 BLAKE2B 20a05ba460b52292328b8152c8b8991653bc5478dde0768085df9b1ed53e16aa74d485a6b49054d97fc4c30eadc7d8be959519711023c495208537d3387bf099 SHA512 a9f44ee9b36fc6859c30a46f6d61338ce5d4d5819508cb2c59e042fab00fbbcccab25219e292413536376e1a7fed734268c50cd1afa1ef68b0ef285a2543cf85
+EBUILD graphicsmagick-9999.ebuild 3103 BLAKE2B 89b885a1437aa55f10d47fe2485125fd3ec625b07afd0b9c1bc1ff59a927a035abfba5fc49f51e5259d5b12c261af0d3a79db8bcd4da6abc85afe62019d29821 SHA512 bffe1fa515705df9286a0c3aaf434e6e5950de445864da5ad9ece8ed4178d080c985b5f0ccdc08216f9c337ed71750c36452f2b64f4c22b9855fff6a33858e01
+MISC metadata.xml 1071 BLAKE2B 899c521ae7916dc5702bada0b782b3020084f84397f0ab62aa4ac15d14d74045ee3dca8b9c9c98591481502694a59e33fcfd8467b7da836a8ee16fb16fbd4727 SHA512 50d6c48e7459d3772d0b804785f5b40cce16bc7a1ac6602a1d5475cd5616e725aa111385eab50a5347418073f1c7afc03f66aa4fd8959474835d899b22c9bca8
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild
index e2d3a8b1e668..2533e3b977e4 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild
@@ -19,8 +19,8 @@ else
 	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
-IUSE="bzip2 +cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp
-	perl png postscript q16 q32 static-libs svg threads tiff truetype
+IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma
+	openmp perl png postscript q16 q32 static-libs svg threads tiff truetype
 	webp wmf X zlib"
 
 RDEPEND="dev-libs/libltdl:0
@@ -83,7 +83,7 @@ src_configure() {
 		$(use_enable debug gcov)
 		$(use_enable imagemagick magick-compat)
 		$(use_with threads)
-		$(use_with modules)
+		$(use_with dynamic-loading modules)
 		--with-quantum-depth=${depth}
 		--without-frozenpaths
 		$(use_with cxx magick-plus-plus)
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.35.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.35.ebuild
deleted file mode 100644
index 714842ff908c..000000000000
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.35.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools toolchain-funcs
-
-MY_P=${P/graphicsm/GraphicsM}
-
-DESCRIPTION="Collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.graphicsmagick.org/"
-LICENSE="MIT"
-SLOT="0/${PV%.*}"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit mercurial
-	EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
-else
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-fi
-
-IUSE="bzip2 +cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp
-	perl png postscript q16 q32 static-libs svg threads tiff truetype
-	webp wmf X zlib"
-
-RDEPEND="dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	fpx? ( media-libs/libfpx )
-	imagemagick? ( !media-gfx/imagemagick )
-	jbig? ( media-libs/jbigkit )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	lzma? ( app-arch/xz-utils )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	svg? ( dev-libs/libxml2 )
-	tiff? ( media-libs/tiff:0 )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libSM
-		x11-libs/libXext
-		)
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.19-flags.patch
-	"${FILESDIR}"/${PN}-1.3.19-perl.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local depth=8
-	use q16 && depth=16
-	use q32 && depth=32
-
-	local openmp=disable
-	if use openmp && tc-has-openmp; then
-		openmp=enable
-	fi
-
-	local myeconfargs=(
-		--${openmp}-openmp
-		--enable-largefile
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable debug prof)
-		$(use_enable debug gcov)
-		$(use_enable imagemagick magick-compat)
-		$(use_with threads)
-		$(use_with modules)
-		--with-quantum-depth=${depth}
-		--without-frozenpaths
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options=INSTALLDIRS=vendor
-		$(use_with bzip2 bzlib)
-		$(use_with postscript dps)
-		$(use_with fpx)
-		$(use_with jbig)
-		$(use_with webp)
-		$(use_with jpeg)
-		--without-jp2
-		$(use_with lcms lcms2)
-		$(use_with lzma)
-		$(use_with png)
-		$(use_with tiff)
-		$(use_with truetype ttf)
-		$(use_with wmf)
-		--with-fontpath="${EPREFIX}"/usr/share/fonts
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		--with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts
-		$(use_with svg xml)
-		$(use_with zlib)
-		$(use_with X x)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-	use perl && emake perl-build
-}
-
-src_test() {
-	unset DISPLAY # some perl tests fail when DISPLAY is set
-	default
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		emake -C PerlMagick DESTDIR="${D}" install
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die
-}
diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
index 6e0e9fc4f818..5cde9ca89391 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
@@ -19,8 +19,8 @@ else
 	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
-IUSE="bzip2 +cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp
-	perl png postscript q16 q32 static-libs svg threads tiff truetype
+IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma
+	openmp perl png postscript q16 q32 static-libs svg threads tiff truetype
 	webp wmf X zlib"
 
 RDEPEND="dev-libs/libltdl:0
@@ -80,7 +80,7 @@ src_configure() {
 		$(use_enable debug gcov)
 		$(use_enable imagemagick magick-compat)
 		$(use_with threads)
-		$(use_with modules)
+		$(use_with dynamic-loading modules)
 		--with-quantum-depth=${depth}
 		--without-frozenpaths
 		$(use_with cxx magick-plus-plus)
diff --git a/media-gfx/graphicsmagick/metadata.xml b/media-gfx/graphicsmagick/metadata.xml
index 311b330eff12..8e4554b3141f 100644
--- a/media-gfx/graphicsmagick/metadata.xml
+++ b/media-gfx/graphicsmagick/metadata.xml
@@ -10,10 +10,11 @@
   SVG and TIFF.
   The program is the fork of a better-known ImageMagick (5.5.2), which
   emphasizes end-user and API-stabilities.
-</longdescription>
+  </longdescription>
   <use>
     <flag name="fpx">Enable FlashPix support with <pkg>media-libs/libfpx</pkg></flag>
-    <flag name="modules">Compile graphicsmagick with dynamically loadable modules</flag>
+    <flag name="dynamic-loading">Compile graphicsmagick with dynamically
+    loadable modules</flag>
     <flag name="q16">Set storage quantum size to 16 (~2*memory)</flag>
     <flag name="q32">Set storage quantum size to 32 (~5*memory)</flag>
   </use>
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 6c4d860e986b..2dfcf42efd1b 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,7 +1,7 @@
 AUX dotty_change_button.patch 964 BLAKE2B d59c14fbcd967f28da141037f77ba57241c553f647af3f9bb0996c622b3728f294628279926f012cca4d4381a2ca17af6e4566727afba6568df7ff4a98c5bfbd SHA512 841c4c1eb820a9065f8530e7a5bca3743aaf808705177776b45100fbbeb73899c5c765feb14026866b42b7d5ee2b62de1cac5398edb01ef447451a529e350b3b
 AUX graphviz-2.34.0-Xaw-configure.patch 2445 BLAKE2B fc1b3820fd72821ac431f5d93d0b4b0c8f596ca9d2c2f516961f5baab9fd54ba870df75434d2ed59fd9034bb7e2ce38c00faef9c12a79c7ec4da2d5e416d7117 SHA512 473d2ed9070329512cbc26929267b25fb8d7726e21ed01d2921d4d8ac13b8ffaf166f07229fa7409192cfa14fabb0cf68b299bb3331b3cc953ae5363274fd15c
 DIST graphviz-2.42.3.tar.gz 26246717 BLAKE2B 71c61dcd056c9a2e2655c3be995d1da17b3af0d3374e74400fc38da11ab81849f7b5e528f99fc2046294958a4bab0a411ab204e434360f316a5367403472e8a1 SHA512 e03ca6da0ddb1162bd179d159d7dbb379d55012d63bb922aa800260fce52b65beb1a9b5ca1a5199ad3537201b0b4841efc9facee6e03065c6bd02e840f8a29c9
-DIST graphviz-2.44.0.tar.gz 32903746 BLAKE2B 05def6b50366900fe84b8d72b802461d33624444f00d1c648801da81708dcdf7dc601f95561d8f7dc8e745eef61326cb9a234a0db1bc45c8a7d7d46e552c373b SHA512 9fd54a5c7b0d8cf3e1bf7e80409b57022182b6bfe3f57a06a219d6d29684962ac935fc76d1e7420ba88b1ffc2ab5b967cc4617e56f810818f99801d31981a752
-EBUILD graphviz-2.42.3.ebuild 7841 BLAKE2B 3b0d6df9929c253cfca54cb76b504b12e1f74001486fc364da7ae83e3c5ff86a8066af3d62e859f083a418da107a24fb4be4d93df61d6b2fd6b3d8aaae7f8233 SHA512 20240f0f3e8cb2c0e6384b5f6eaf43066552ea267a61b14c9e4c283da2c0e485ab2b2df21768b5cbea2c0ae7eb1d4210b70f2c33f6b7b1d5afead4a7bce781eb
-EBUILD graphviz-2.44.0.ebuild 7848 BLAKE2B bf6deda1a51544782dbbfa20ae6d68f3ff84b13d5faa41b49c7d992bef941166ac8a6864ed27bb9034ddcdb83c4a02d7f3e00e1e51bd8e8be6a196ea2b4d6b58 SHA512 a4b34d28d1615b19c9cdbb9ec8ea7b4b333729eebed03bfc6764f3f5214564558672a9907b21d10c4b3a9f581bdd1df25ccd3aad1f710fb082da67ed0f6ea243
-MISC metadata.xml 2304 BLAKE2B 702643020c9a91f60460e6f6f63cb5ba6389b4307a454a47b24daba75e2ae104e8e93f3d4913a6007749a1d0e70157608b03b9b7d29ae422685e82aaabc3bfc4 SHA512 bc27ff36b8aaf76c265878095f74319314534bc28589b79e0bf4f3fed27ed965e172c1a8279a58f570b799961abb9c87281c3242dda950e936223999fa150e03
+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
+MISC metadata.xml 2244 BLAKE2B 61cc818a6f736cee316c026bef8f02dc03ffa3c63f620832fd063f00111178b07be4c5224f5d4fc0f1cddbfc3180e31ac277d493107e0d716d0d2f05c7272633 SHA512 e8c8d5b2abf9c21c6fe8dd7e3489210275065a2f0f64023f5aa52fac2b2646b974fc36c60aa189be022728384ff223aae5856095846dc5ea85638d1b882ad7e0
diff --git a/media-gfx/graphviz/graphviz-2.42.3.ebuild b/media-gfx/graphviz/graphviz-2.42.3-r1.ebuild
index 25cc03cc6575..86275dffb43f 100644
--- a/media-gfx/graphviz/graphviz-2.42.3.ebuild
+++ b/media-gfx/graphviz/graphviz-2.42.3-r1.ebuild
@@ -13,10 +13,11 @@ SRC_URI="https://www2.graphviz.org/Packages/stable/portable_source/${P}.tar.gz"
 LICENSE="CPL-1.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD"
+IUSE="+cairo devil doc examples gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD"
 
 REQUIRED_USE="
 	!cairo? ( !X !gtk !postscript !lasi )
+	pdf? ( cairo )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
 # Requires ksh, tests against installed package, missing files and directory
@@ -25,6 +26,7 @@ RESTRICT="test"
 BDEPEND="
 	sys-devel/flex
 	sys-devel/libtool
+	x11-libs/gdk-pixbuf:2
 	virtual/pkgconfig
 	nls? ( >=sys-devel/gettext-0.14.5 )
 	perl? ( dev-lang/swig )
@@ -190,9 +192,9 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		--enable-ltdl
+		--enable-gdk-pixbuf
 		$(use_with cairo pangocairo)
 		$(use_with devil)
-		$(use_enable gdk-pixbuf)
 		$(use_with gtk)
 		$(use_with gts)
 		$(use_with qt5 qt)
diff --git a/media-gfx/graphviz/graphviz-2.44.0.ebuild b/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
index 25929d6e9b8b..cab048b373aa 100644
--- a/media-gfx/graphviz/graphviz-2.44.0.ebuild
+++ b/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
@@ -13,10 +13,11 @@ SRC_URI="https://www2.graphviz.org/Packages/stable/portable_source/${P}.tar.gz"
 LICENSE="CPL-1.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD"
+IUSE="+cairo devil doc examples gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD"
 
 REQUIRED_USE="
 	!cairo? ( !X !gtk !postscript !lasi )
+	pdf? ( cairo )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
 # Requires ksh, tests against installed package, missing files and directory
@@ -25,6 +26,7 @@ RESTRICT="test"
 BDEPEND="
 	sys-devel/flex
 	sys-devel/libtool
+	x11-libs/gdk-pixbuf:2
 	virtual/pkgconfig
 	nls? ( >=sys-devel/gettext-0.14.5 )
 	perl? ( dev-lang/swig )
@@ -143,8 +145,7 @@ DEPEND="${RDEPEND}
 #   sci-libs/gts, x11-libs/gtk.  Also needs 'gtk','glade','glut','gts' and 'png'
 #   with flags enabled at configure time
 
-PATCHES=( "${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch
-	  "${FILESDIR}"/dotty_change_button.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch )
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -190,9 +191,9 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		--enable-ltdl
+		--enable-gdk-pixbuf
 		$(use_with cairo pangocairo)
 		$(use_with devil)
-		$(use_enable gdk-pixbuf)
 		$(use_with gtk)
 		$(use_with gts)
 		$(use_with qt5 qt)
diff --git a/media-gfx/graphviz/metadata.xml b/media-gfx/graphviz/metadata.xml
index 2a32c622872f..0e17a85326a1 100644
--- a/media-gfx/graphviz/metadata.xml
+++ b/media-gfx/graphviz/metadata.xml
@@ -36,7 +36,6 @@
 	</longdescription>
 	<use>
 		<flag name="devil">Enables DevIL output plugin -Tdevil</flag>
-		<flag name="gdk-pixbuf">Enables gdk-pixbuf2 plugin</flag>
 		<flag name="gtk">Enables gtk+ output plugin -Tgtk (needs cairo)</flag>
 		<flag name="gts">Enables support for GNU Triangulated Surface Library (required for sfdp to work)</flag>
 		<flag name="lasi">Enables PostScript output via <pkg>media-libs/lasi</pkg>, for plugin -Tlasi (needs cairo)</flag>
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index 7415f05fa64d..ddebe75b022a 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -1,7 +1,7 @@
 DIST gscan2pdf-1.8.11.tar.xz 409212 BLAKE2B 37cb716f13818eaffc39c210b810b845368cc5e323569e8f9d5603b5b412c4182520798321358e4c21339fdbd5f15026a0acd6421a49e7db79ecca86633c3ab0 SHA512 1ea09b8768771be4a1700cb8a6523d5f74fcbf0ebe459d97796032b56f896fd0c50e5ca1ed4c96aedef7e61f6952a92986153cc70173dd5ad91ccfb72461c565
-DIST gscan2pdf-2.6.7.tar.xz 466260 BLAKE2B 311e21c6d024527eb8c281ff3dd99b1abea61d91c7fad88ce22d7e436144a39999c8db89ba1321ebc1d3949f09814ebdfda1b414b5453cb9faca0635cd804d75 SHA512 926df3434cebb8978ff4714b265b4ceff77c177653855c9416a87084ff6601a84a8e536d799f9efa9645336f49ef2c133672863da364145c5a785b43fd5c7c72
 DIST gscan2pdf-2.7.0.tar.xz 468752 BLAKE2B d8f41842c16ff54fff180d2ecaab3fb09c4b7c4d2eac8ba4b6cd2703cca4538844389af8151eaeac030f5962df7ce9192e60c0515f78d2d8aa9aa0ec2973fb97 SHA512 7878d7e77cf107315301bf7adb29c178f4c35c1986780843dfc1742870b8a9bc6cd7a1a0d06f1c37585e6c2050e75222c8af2359b5a7c194f308ba32b5c64f06
+DIST gscan2pdf-2.8.1.tar.xz 476880 BLAKE2B c54e318fa00670f6b2f996791477fd61076abdfe57f2d924cad1fa9092a8796851c9ab503aabb7831ac374e390a19a821a5c7a8b996235deb7d7781b8b47f76c SHA512 2a9f52ce53030f2871d2430b6aab6b06bb1d4e2efbde25ad24196cfa99ad7b13342ff0f2827526020f5c12079e156bc430f891bdb6ffa9545a210bf1cba29be5
 EBUILD gscan2pdf-1.8.11.ebuild 1731 BLAKE2B 0b0f7cdfef98e666e20e44882584e0636e490429186e441d87f965e74071f5076693896e17e68184319dfaf3a1fd4487140209ef3b49603c9496cc936516333d SHA512 b94b73d3396208a8c67c2aad407815329501717c364d60189b21d96f652846e554d59a2a36f4b58383d7f49ab728d4fe251bce9ab1944befb667a9e0c09237b3
-EBUILD gscan2pdf-2.6.7.ebuild 2421 BLAKE2B 0fa711b09f01a9ac476fc921ab6365a785ce4c027f3068a63618d6c7f9a76fb908336e3061fb978a9d76535d60184f475dcc37d5865b1925565ba96d4e7494ac SHA512 cc0d0790aa2dcb1b9faef6ecdee6f14ab0a4f89a0c91099a254695884447dbdc072ba31841aa0d3276ba4e7a43473bf68cfaac2b885e6acd80e1cffb2a146873
 EBUILD gscan2pdf-2.7.0.ebuild 2421 BLAKE2B 0fa711b09f01a9ac476fc921ab6365a785ce4c027f3068a63618d6c7f9a76fb908336e3061fb978a9d76535d60184f475dcc37d5865b1925565ba96d4e7494ac SHA512 cc0d0790aa2dcb1b9faef6ecdee6f14ab0a4f89a0c91099a254695884447dbdc072ba31841aa0d3276ba4e7a43473bf68cfaac2b885e6acd80e1cffb2a146873
+EBUILD gscan2pdf-2.8.1.ebuild 2762 BLAKE2B 9b018438677462c8155ec4d043804d2d74ad3bf4a2f0ebc2cac89557ff791664379fc9d02a3dbf2a936881b23c0de3c6a84a7201ea026997520cf199137ab4c2 SHA512 8ac014f07ee14c17b0c6fe922f1321b43871e16f39f3d207c90cee64b7a68a8b4922d0645095752fdb3c9a3e7fc76c68d6d0ad38d7703a1cb63d846d9eb88867
 MISC metadata.xml 439 BLAKE2B 835480b0d68a079941e94f2646d0136dfb8a8e750e0279f8a5a2e23e6690242582ffe660798f5e80ebfb4378a576aa5715332b53230555866391a99ec28f54ff SHA512 af1cc05ac693899586df81036d2fa11af187edbb3c9449862298ba05efd0dbd0c4c5b008a1a21328c1f9a27a690671bd7a9967d2e457efb31561044e45984401
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.6.7.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.8.1.ebuild
index cda89719399f..c0f0b977918c 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.6.7.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.8.1.ebuild
@@ -57,7 +57,7 @@ BDEPEND="
 		app-text/poppler[utils]
 		app-text/tesseract[-opencl,osd(+),tiff]
 		app-text/unpaper
-		media-gfx/imagemagick[djvu,png,tiff,perl]
+		media-gfx/imagemagick[djvu,png,tiff,perl,postscript]
 		media-gfx/sane-backends[sane_backends_test]
 		media-gfx/sane-frontends
 	)"
@@ -84,6 +84,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/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 7dbc20f488eb..f5c7917f9967 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,4 +1,3 @@
-AUX gthumb-3.6.2-exiv2-0.27.patch 1004 BLAKE2B e351a67d8fbbfd0c13b26ca575a34528ef29f6d6b2a7ede9b0f16a5835f502bf24e8415f597146abde875e5dbd93fd1fec126a6bbb27d4b0f9881fe9c823ceb5 SHA512 e6f4549526d745d7fa0f42175508be7f6b5ffc9258a5b59a31f45e8c095870b13a0da55c50635723abe6235cf983b7730677906bbb16acf99e58447cc72d8c3d
-DIST gthumb-3.6.2.tar.xz 3423044 BLAKE2B ff5fd805c07c969f8e50960cdd36df9b3ef9ddedcaca66578416fc4f602fedf4f1698fec54cda77521c88774e8e309b996123ade9a633df1ffc34bb60cef0ff5 SHA512 5fc5cc43b16b51438403fbb986286d5e66575162be7b4cf35931dd0c41273933f78c210aaf2379e0a2574df6f7f7b2d532d87ce37fbc6369b65331bac338a454
-EBUILD gthumb-3.6.2-r1.ebuild 2717 BLAKE2B 62fb68e66370161eaa5cfe67eeca54eb2e3ae4d037a4f7997ebde75257a8b6ee61254641ecc3124ea03757ac6d18cae93249adccb453570a9a3a05e0c6f2cf3c SHA512 f5455213d6ee5f8613e4aed71d6b06ee7d409a984a68e463545630a566e6f83baf8ea490af97c24ab8243d72fbeaa4681d499cb8613b30a029029f95a704890a
-MISC metadata.xml 492 BLAKE2B 62ee03ca8c249d8ba7d9e6516ca44677ef14a84bd6c9f9d12e245fc053e5b76215e9f5db346e06b364552c911ab9b9ca63598da5098e89fbb2c6011f8e2b4f03 SHA512 f75dcc1e5ffc912b3e3d69335f98f7bd38af5d46de10cae326ef5569a4511a022fa1bfe6964fb8e5e4883dc09cbfcb5f7e58160ad4864ef1fe1cca1d8b66172d
+DIST gthumb-3.10.0.tar.xz 7550040 BLAKE2B 183ffa4c567728375c34a3f84c72d44f266a893fa8d4be7b8270faa2a120bf2e6c61d5e35494aa5e4d4e14366017adbb020f7a3dc8c51b6f012e8f18cee1a72f SHA512 d7bcac6b260bf7d5816af69ea89953517cbc43ea289227ccceebd0700b753a7d97349e6a30ec6bbb42690c56abff5b69dc3fc073f1ee2831ae1aa7d220722efd
+EBUILD gthumb-3.10.0.ebuild 2245 BLAKE2B ab309d292e1cecd8afb910fe6963e0452a21117dcfb6394205251eba8298f3814adc0e5cfb6a39e56a1e45ec30e437d6794c736f1cf1ad4d631e8501e8fe4e2b SHA512 2013a04786f36a73583fe61864e117ab3e34e6c86a4b85d7eed019e820d6cc2a661a52e9a5044115a93970e1110f872ab4f2400719130a6c620cdb4e277401b3
+MISC metadata.xml 420 BLAKE2B d43a138708de7341b7b449d8bc7cbd6dedc471844ee9edac0b4cfa075ba582d5079d6eeacef69031cbfe9ef78493e50cc8f6810f3b80991cb552ffb3a2ca2757 SHA512 856096108784110fbbeeb1c3c5072697f7555edd733f31cfa4820f57e24a1e384f4ab609c77c3ce3a0d8e873c0193e493ea90085509b77686ab46e3f9ff3fc2d
diff --git a/media-gfx/gthumb/files/gthumb-3.6.2-exiv2-0.27.patch b/media-gfx/gthumb/files/gthumb-3.6.2-exiv2-0.27.patch
deleted file mode 100644
index 2bd8b94c3c11..000000000000
--- a/media-gfx/gthumb/files/gthumb-3.6.2-exiv2-0.27.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Patch kindly borrowed from Mageia.
-
-* asturm@gentoo.org: Dropped unnecessary and backwards incompatible
-xmp_exiv2.hpp include.
-
-https://gitlab.gnome.org/GNOME/gthumb/issues/30
-
-diff -Nru a/extensions/exiv2_tools/exiv2-utils.cpp b/extensions/exiv2_tools/exiv2-utils.cpp
---- a/extensions/exiv2_tools/exiv2-utils.cpp	2018-06-17 08:24:44.000000000 +0200
-+++ b/extensions/exiv2_tools/exiv2-utils.cpp	2018-12-31 15:51:50.912329232 +0100
-@@ -32,7 +32,7 @@
- #include <sstream>
- #include <vector>
- #include <iomanip>
--#include <exiv2/xmp.hpp>
-+#include <exiv2/exiv2.hpp>
- #include <gthumb.h>
- #include "exiv2-utils.h"
- 
-@@ -1073,7 +1073,11 @@
- 
- 	try {
- 		if (exifData.empty()) {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+			throw Exiv2::Error(Exiv2::kerErrorMessage, " No Exif data found in the file");
-+#else
- 			throw Exiv2::Error(1, " No Exif data found in the file");
-+#endif
- 		}
- 		Exiv2::ExifData::const_iterator end = exifData.end();
- 		for (Exiv2::ExifData::const_iterator i = exifData.begin(); i != end; ++i) {
diff --git a/media-gfx/gthumb/gthumb-3.10.0.ebuild b/media-gfx/gthumb/gthumb-3.10.0.ebuild
new file mode 100644
index 000000000000..a7ddac9f803c
--- /dev/null
+++ b/media-gfx/gthumb/gthumb-3.10.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Image viewer and browser for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/gthumb"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="cdr colord exif gnome-keyring gstreamer http lcms raw slideshow svg tiff webp"
+
+RDEPEND="
+	>=dev-libs/glib-2.54.0:2
+	>=x11-libs/gtk+-3.16.0:3
+	exif? ( >=media-gfx/exiv2-0.21:= )
+	slideshow? (
+		>=media-libs/clutter-1.12.0:1.0
+		>=media-libs/clutter-gtk-1:1.0 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-plugins/gst-plugins-gtk:1.0 )
+	raw? ( >=media-libs/libraw-0.14:= )
+	http? ( >=net-libs/libsoup-2.42.0:2.4
+		>=dev-libs/json-glib-0.15.0
+		>=net-libs/webkit-gtk-1.10.0:4 )
+	gnome-keyring? ( >=app-crypt/libsecret-0.11 )
+	cdr? ( >=app-cdr/brasero-3.2.0 )
+	svg? ( >=gnome-base/librsvg-2.34:2 )
+	webp? ( >=media-libs/libwebp-0.2.0:= )
+	lcms? ( >=media-libs/lcms-2.6:2 )
+	colord? ( >=x11-misc/colord-1.3
+		>=media-libs/lcms-2.6:2 )
+
+	sys-libs/zlib
+	virtual/jpeg:0=
+	tiff? ( media-libs/tiff:= )
+	media-libs/libpng:0=
+	>=gnome-base/gsettings-desktop-schemas-0.1.4
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/itstool
+	sys-devel/bison
+	sys-devel/flex
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Drun-in-place=false
+		$(meson_use exif exiv2)
+		$(meson_use slideshow clutter)
+		$(meson_use gstreamer)
+		-Dlibchamplain=false # Upstream still doesn't seem to consider this ready
+		$(meson_use colord)
+		$(meson_use tiff libtiff)
+		$(meson_use webp libwebp)
+		$(meson_use raw libraw)
+		$(meson_use svg librsvg)
+		$(meson_use gnome-keyring libsecret)
+		$(meson_use http webservices)
+		$(meson_use cdr libbrasero)
+	)
+
+	# colord pulls in lcms2 anyway, so enable lcms with USE="colord -lcms"; some of upstream HAVE_COLORD code depends on HAVE_LCMS2
+	if use lcms || use colord; then
+		emesonargs+=( -Dlcms2=true )
+	else
+		emesonargs+=( -Dlcms2=false )
+	fi
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/gthumb/gthumb-3.6.2-r1.ebuild b/media-gfx/gthumb/gthumb-3.6.2-r1.ebuild
deleted file mode 100644
index d5b0510c3e92..000000000000
--- a/media-gfx/gthumb/gthumb-3.6.2-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Image viewer and browser for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/gthumb"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="cdr colord debug exif gnome-keyring gstreamer http jpeg json lcms raw slideshow svg tiff test webkit webp"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.36.0:2[dbus]
-	>=x11-libs/gtk+-3.16.0:3
-	exif? ( >=media-gfx/exiv2-0.21:= )
-	slideshow? (
-		>=media-libs/clutter-1.12.0:1.0
-		>=media-libs/clutter-gtk-1:1.0 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-plugins/gst-plugins-gtk:1.0 )
-	raw? ( >=media-libs/libraw-0.14:= )
-	http? ( >=net-libs/libsoup-2.42.0:2.4 )
-	gnome-keyring? ( >=app-crypt/libsecret-0.11 )
-	cdr? ( >=app-cdr/brasero-3.2 )
-	svg? ( >=gnome-base/librsvg-2.34:2 )
-	webp? ( >=media-libs/libwebp-0.2.0 )
-	json? ( >=dev-libs/json-glib-0.15.0 )
-	webkit? ( >=net-libs/webkit-gtk-1.10.0:4 )
-	lcms? ( >=media-libs/lcms-2.6:2 )
-	colord? ( >=x11-misc/colord-1.3
-		>=media-libs/lcms-2.6:2 )
-
-	media-libs/libpng:0=
-	sys-libs/zlib
-	>=gnome-base/gsettings-desktop-schemas-0.1.4
-	jpeg? ( virtual/jpeg:0= )
-	tiff? ( media-libs/tiff:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/intltool-0.50.1
-	dev-util/itstool
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	test? ( ~app-text/docbook-xml-dtd-4.1.2 )
-"
-# eautoreconf needs:
-#	gnome-base/gnome-common
-
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" ) # bug 674092
-
-src_prepare() {
-	# Remove unwanted CFLAGS added with USE=debug
-	sed -e 's/CFLAGS="$CFLAGS -g -O0 -DDEBUG"//' \
-		-i configure.ac -i configure || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Upstream says in configure help that libchamplain support
-	# crashes frequently
-	local myeconfargs=(
-		--disable-static
-		--disable-libchamplain
-		$(use_enable cdr libbrasero)
-		$(use_enable colord)
-		$(use_enable debug)
-		$(use_enable exif exiv2)
-		$(use_enable gnome-keyring libsecret)
-		$(use_enable gstreamer)
-		$(use_enable http libsoup)
-		$(use_enable jpeg)
-		$(use_enable json libjson-glib)
-		$(use_enable raw libraw)
-		$(use_enable slideshow clutter)
-		$(use_enable svg librsvg)
-		$(use_enable test test-suite)
-		$(use_enable tiff)
-		$(use_enable webkit webkit2)
-		$(use_enable webp libwebp)
-	)
-	# colord pulls in lcms2 anyway, so enable lcms with USE="colord -lcms"; some of upstream HAVE_COLORD code depends on HAVE_LCMS2
-	if use lcms || use colord; then
-		myeconfargs+=( --enable-lcms2 )
-	else
-		myeconfargs+=( --disable-lcms2 )
-	fi
-	gnome2_src_configure "${myeconfargs[@]}"
-}
diff --git a/media-gfx/gthumb/metadata.xml b/media-gfx/gthumb/metadata.xml
index 0ba6dde6a358..7277ae1b1da6 100644
--- a/media-gfx/gthumb/metadata.xml
+++ b/media-gfx/gthumb/metadata.xml
@@ -6,8 +6,7 @@
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
 	<use>
-		<flag name="http">Enable webservice integration through <pkg>net-libs/libsoup</pkg></flag>
-		<flag name="json">Compile code that uses the libjson-glib library</flag>
+		<flag name="http">Enable webservice integration through <pkg>net-libs/webkit-gtk</pkg></flag>
 		<flag name="slideshow">Enable slideshow plugin</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/icoutils/Manifest b/media-gfx/icoutils/Manifest
index 023198f495d2..f4e5e1125348 100644
--- a/media-gfx/icoutils/Manifest
+++ b/media-gfx/icoutils/Manifest
@@ -1,5 +1,5 @@
 AUX icoutils-0.29.1-gettext.patch 354 BLAKE2B f165b759526678524344a516a0953c028c70941c776f53c780597f17a241c1469b6b6b3ce409153f045470ce4d9d896a44cbcf3b0557950f9138e08bd95ee451 SHA512 d5efb49f9ba8411b682047fc5de3a9605c89c5d8f9a0fa67b7de52719630187f36abf7ffc7cc1e53481c7474c0b7e5d8b3074a81fca02061c4685053c9cb221f
 AUX icoutils-0.29.1-locale.patch 831 BLAKE2B c24a99e4c186759f3c40e1635f919a9f802af28971c803b31a67b4e990206b0aaf4f7787204599b45888a6615c4bfd7c777bfbada6d67248c6e8e4cf033bdf07 SHA512 bcb0ef117c7f1434e63e411d270a2cad8e4d0ad214c7bd516494c7718b605234ad5920b9e16c5627c98e8e1065bc2550e55b1e2e8b846a5854999419c999107b
 DIST icoutils-0.32.3.tar.bz2 609286 BLAKE2B 0d65fbadb08e4f2e7a60b5ffd4bc14dc82e90abf0a56ddb89f9717a479ab45a50b9747c986c954c3a01e4d8a51d8396ec9d8796dc4a1d7430cb3169c13e06e13 SHA512 982a051a5dc4a63bb2a9f23e78e5a88e481e5c7a9c25789253e1c396e40d4c093e5a9b399966d660e4f2da21ce15d539cb9d20bfd8126b1138f148b86baa6726
-EBUILD icoutils-0.32.3.ebuild 1034 BLAKE2B c45446c3c90ee21719979d1b6b70ffa2c4350f891186e44de902a06d470ee685948e096a389dd4435a4a11e4dff8542950d43ad035d66782e0182952c3c99888 SHA512 292b50796ebb4f83908e4aba0c1613e23fd60ba7b6c93cba6fa38a58c2014935edee5fb70eab8c3908b37ed61ac798920fef84411e5d9c457356ebd88a9942b0
+EBUILD icoutils-0.32.3.ebuild 1023 BLAKE2B 980f66aa0b3e8588b2e336b5b0cefb77b322838d729662e28963f750430074dd9d7f52d36bf61f1237f0b1d56ce9e07af423f0bb76b8b343aee41aa83b824302 SHA512 c6cd8393a57d2d1b593534a754ff87ff144a7ad04bd3468f946ada45f7b72be85b78c547fc2750ea682c61a9416f2697e01fa70b58405e75845508b2aa382220
 MISC metadata.xml 243 BLAKE2B cf24db59438ad12e7ee962da70fbbae676aa42a24a62e49c915a1ba728c08c74d10bc144ce79b91258c66f5523edb3c15941cb1b20a968bbed2e156a83eebf9b SHA512 3b619672a798fcaa808248ae187a6e6253bf1f693d2d9808ffb5b60d4d909130299512b623f7c9dbe6971ad15af7dbb6dd51e4b80f512abe0966dc46861fb775
diff --git a/media-gfx/icoutils/icoutils-0.32.3.ebuild b/media-gfx/icoutils/icoutils-0.32.3.ebuild
index 94291a78237b..13681bb4cfad 100644
--- a/media-gfx/icoutils/icoutils-0.32.3.ebuild
+++ b/media-gfx/icoutils/icoutils-0.32.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 BDEPEND="
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index a11aa00d319b..a0f69dee82af 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,12 +1,8 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.11-19.tar.xz 9076632 BLAKE2B fb6e954052e4dc9b5db80fcb3868e627f3cbe5d9ccb02425fe3838dfef4deb1132360a30b561de28bf7d2051bc7c01ad5c4ebc0266b48f1d48d7af5ecae4b5e2 SHA512 fe8e7399b377c84155d3ad3c3963d58b8704233d9c858ff92ba1837e6e1f5d86846153660cc0973b8cd27917e4c8b4834874c510f00505142cd8165ae3e3526d
-DIST ImageMagick-6.9.11-22.tar.xz 9084304 BLAKE2B 38df3e9535c23b246b6ededc1b9d083fc8c42f3abe85835d6ef29dffb06bbccaa7aae534efeaaf224b9f8495c1c116a6ce4c886e70fa0976cfbda0880a165e96 SHA512 9c6f4ab3f881b4aba4de3fde2d49ed66773b52dacbdc24c92eba6b8b1e97ea28b983cbd9fbcf4721f4b46ab8d249470f44e1cc7e173728d78f2ef049f4aa42c0
-DIST ImageMagick-7.0.10-19.tar.xz 9685552 BLAKE2B e3d6ca1e16ad4bc346153372f1122731a750876650cdb705985ef29ef30c5ceb7f2f473ff2734a38c50e2e531094a08526678cfe1e8f58eef79d30ea18c363bf SHA512 ed577e48ca88d37c01d7e889fa1364af3398e94864b393fcc70711a3317c34adababe5ac0ea7995bd23e10aac554522ed69d290c4c11b946e8a0de86c6365e84
-DIST ImageMagick-7.0.10-22.tar.xz 9710504 BLAKE2B bfa35f9bf28629656d97ab03c1adf2641761f40d7bad284af2dc199b3ac4006e656356762d753d0b3992c78f0a4155423a27de632ee5e9594398164f20bde576 SHA512 5a7023eb8dfddc34c8378f338335e13e4b235e6c3e8e8b0476ae4ca31db78ef8bbdc457f7de1356994ea25d6eb94bb944d725d15aee038196bf7060c934d0926
-EBUILD imagemagick-6.9.11.19.ebuild 7049 BLAKE2B a55cac8280b047983a972159734711175d78840a6d29c75ed38366fc07aa4be312c75f523ef4185318f9734df496373e36b0c3170cd89e0859d282935ef3b566 SHA512 524f10eb990b5a5df4af8d0c39e6cf00d30f6d3bda40c0f609a16825d23b2b1b18d5ea10413df97aca1c6a26b0ac05d06c7c902f8a7c0ded4c33106b05566d2b
-EBUILD imagemagick-6.9.11.22.ebuild 7056 BLAKE2B 31393b291f0d6bec7dc70d794b1a84039d54c1a12b7b4417caacea9bb2dc693a91d00273243a6450c1e7b7044e6b4c66a5fa8ccf28d1634d610a767775dd566a SHA512 72e95675a0102e46604bc1161c687465d2b2acf58a7096dd0637e2b9bdbc4a53ce2fb3490e6d32fd00ce5767540abe39b03a93c187f33b0c6c21f5c96a897d49
-EBUILD imagemagick-7.0.10.19.ebuild 7338 BLAKE2B c5bd8fa410de6a1fec8a11c9f11d4bc527acf4502ef3d02dfd2f845ee0db2831de6a1734c860aacf224df0e13895aed104d238420b5021b947ba35b91b60149c SHA512 2ff4dc18a4fe408c0aead424af26225f8590607a48a60ac11906603f0cd808e23c0b6b50813f3463f570d3e5c3a9675fb60edc67b2bd8428d073c7ebe0778a17
-EBUILD imagemagick-7.0.10.22.ebuild 7346 BLAKE2B 6b3c2522969859e905afddcb92679bed0944d991831822d5bf6e967e0faafed369380f793aa337ac87b3a1af7a1b7290dc0f71094cf6346fdd63d57d49823d97 SHA512 a21b1d1bd706370b2c044c7cd55c290dd7a9ffac55c0c92b86c8f4ac969a14d2d3eca6b9e97decc61099d3f0842e9029f145e0adc4366c1ae153a0333869da74
+DIST ImageMagick-6.9.11-28.tar.xz 9315628 BLAKE2B 8ece7dae4d8c7de695e85b832e5c15c1474e00c9027aeb251a279dc9b51a02f5fd1e96f48987377cd6d937a126e5750e9aef9a11caf64603267b81e6a874f205 SHA512 e2954d1a55a37fa339dd0cbc0ca753e4f783cd77858277e287c033a53ac5f2e96bc5329d069016fc3841d07dc9e8f5b1bb08ecf9ed0224bbc675843132749fdd
+DIST ImageMagick-7.0.10-28.tar.xz 9705324 BLAKE2B 0fe890a23b9fc97ceb5253e24ab8236135f4a4f48c1480ad5577c6a2535bf350fcea062b8897fc5e7993ab86716b1e280fabcf664442e3fe9d209e8c2806ea2d SHA512 fcfdacec893bb0a39c4a3caae1ade5ea7d3f6b8909cc73f218260f9f9b354ebe77aecedb2be2e2a64011eceb895c1ecb2fa0f349361387d56fb0f3cde657e158
+EBUILD imagemagick-6.9.11.28.ebuild 7049 BLAKE2B a55cac8280b047983a972159734711175d78840a6d29c75ed38366fc07aa4be312c75f523ef4185318f9734df496373e36b0c3170cd89e0859d282935ef3b566 SHA512 524f10eb990b5a5df4af8d0c39e6cf00d30f6d3bda40c0f609a16825d23b2b1b18d5ea10413df97aca1c6a26b0ac05d06c7c902f8a7c0ded4c33106b05566d2b
+EBUILD imagemagick-7.0.10.28.ebuild 7338 BLAKE2B c5bd8fa410de6a1fec8a11c9f11d4bc527acf4502ef3d02dfd2f845ee0db2831de6a1734c860aacf224df0e13895aed104d238420b5021b947ba35b91b60149c SHA512 2ff4dc18a4fe408c0aead424af26225f8590607a48a60ac11906603f0cd808e23c0b6b50813f3463f570d3e5c3a9675fb60edc67b2bd8428d073c7ebe0778a17
 EBUILD imagemagick-9999.ebuild 7220 BLAKE2B 12b0db73d15e5d9b5af68912ae1b2907919cc875d73536c261477534fa17363fb8f75b2d63501ab6f844eb9e976893107513968d9e89ccce9d3490cfe93389db SHA512 19ce4536488e465e744a5da210566112de83a6d2df48a1cf9cc44c32a2e9d4ab3a65909ce17ac47e0dc29ccb734a5b52e81f6585dc015a3ad89faa3d72667747
 MISC metadata.xml 1106 BLAKE2B e77cabff89df6b98687290ef0ee06d85111a7ddca6f5e1e31f820e6d186a6510c2afd0b85ba31004f102fd7f7b88f46af101f4ba45011aac75afa40b0a714857 SHA512 68a5f9a80b1e3f2e3004252703f9b3176d7c59880a2724ae431fdfd97e8f2adcd7ff7ad2cd8ea8bd35645a3b559052f2c38713647ce7ae889ff1a6061e6b2d92
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.22.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.22.ebuild
deleted file mode 100644
index 02b0c9655fe7..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.11.22.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-MY_PV="$(ver_rs 3 '-')"
-MY_P="ImageMagick-${MY_PV}"
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/6.9.11"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-RESTRICT="perl? ( userpriv )
-	!test? ( test )"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-#S="${WORKDIR}/ImageMagick6-${MY_PV}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local mesa_cards ati_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	rm "${ED}"/usr/$(get_libdir)/*.la || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.19.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.28.ebuild
index f37a0010b4c8..f37a0010b4c8 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.19.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.28.ebuild
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.22.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.22.ebuild
deleted file mode 100644
index ac9609f64eff..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.10.22.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/7.0.10"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	svg? ( xml )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		--without-jxl
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	if [[ ${PV} == "9999" ]] ; then
-		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
-	else
-		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	fi
-	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	rm "${ED}"/usr/$(get_libdir)/*.la || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.19.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.28.ebuild
index f54a5b0369e3..f54a5b0369e3 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.19.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.28.ebuild
diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest
index 44567ea6e508..693d9bd7d3a0 100644
--- a/media-gfx/imv/Manifest
+++ b/media-gfx/imv/Manifest
@@ -2,5 +2,5 @@ DIST imv-4.0.1.tar.gz 74982 BLAKE2B 5ff7f093307fdf6114e56f0e5d5a47a4320607eea12d
 DIST imv-4.1.0.tar.gz 77341 BLAKE2B d6735feba4d3e958db70eddea72bbbeb60731cf550680320448ba226ba74eb467617ad295f9094995e0bf31c99473f067ff41f16689ce21fb87d7a9fd2e0946a SHA512 92d7551bda55185b29724e90230dac608a82f4a45cd3cb9c7a5d261f65eede6dcdde78f5c16eecfc1242533ec8e155204189fab3cacf31ddc088707af5131b2a
 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 1727 BLAKE2B 5526bd1ee82f4afa84f43752cd03f3809187d7b1c20e47d821b353dfa4dff1b20a718f7e8d1dddd6c41fdf16459db84a7763f6c192a0062b94f090938d31ffdd SHA512 4ab7602d3941b9de703bc0e0dff3c2510b1cde4e143baba19640805638565559e6bcc78b62ef06841fa8afbd51d9dc1a6f94f8bc0bd4d8f11aca402ad2a636c5
-MISC metadata.xml 456 BLAKE2B 90f9ddfeb2d7135d1cd5bf96cf234f1f56db6581d60340df16b33fcc640bd700d0425156b18755cf41c00ad127802d822933e10220bd4a857cac8d88b3a8691e SHA512 e926970f4155a6d9759bf37f43f91e616de74fa2f276144947b632f07bde0c94dcc17ddb4b079ea6c3535461c3ad682a83746083749ea1a5aaa4c9503ffe0fd8
+EBUILD imv-9999.ebuild 1798 BLAKE2B a1c931a83c7b2444d33341e74fa50c4fa532ec3b215e3010eb250a1cae7c2f0f439068d725d3e3bc17eb4cc2cc97fe0e96924d606225cf783d7c009938ca0832 SHA512 c35f9417fe15cce3947ff334aaadae2c76fa9c4084e321bf903bda5cb9e3c9d6341fe709e9b8dcf2cdad84c48e7b848463c75a508ee8fbcce66261533dcf77cd
+MISC metadata.xml 532 BLAKE2B 425eed771fcdee28d9ef37c21fdca5b7f4450f565fff15f647a94de9e9e220b97df1efb517a6daa752ed628332f81b49eb429f6bd9a558094ae7d0e71d359cbf SHA512 f4fc42098f9ae4e48add68134e70ca61dc20fa408b4e2b46fb6072bfa2543ae1d928033ed2dba2dd34f79d3e12f4ad1c98bf5bab600b842f97d99fd8c4a3bdb6
diff --git a/media-gfx/imv/imv-9999.ebuild b/media-gfx/imv/imv-9999.ebuild
index 986d27dd3255..65f50d9221c2 100644
--- a/media-gfx/imv/imv-9999.ebuild
+++ b/media-gfx/imv/imv-9999.ebuild
@@ -2,16 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 toolchain-funcs xdg-utils
+inherit git-r3 meson xdg-utils
 
 DESCRIPTION="Minimal image viewer designed for tiling window manager users"
+LICENSE="MIT-with-advertising"
 HOMEPAGE="https://github.com/eXeC64/imv"
 EGIT_REPO_URI="https://github.com/eXeC64/imv"
 
-LICENSE="MIT-with-advertising"
-SLOT="0"
 KEYWORDS=""
-IUSE="X +freeimage jpeg libnsgif png +svg test tiff wayland"
+SLOT="0"
+IUSE="X +freeimage +png jpeg svg gif heif test tiff wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	|| ( X wayland )
@@ -27,15 +27,18 @@ RDEPEND="
 		virtual/glu
 		x11-libs/libX11
 		x11-libs/libxcb
-		x11-libs/libxkbcommon
+		x11-libs/libxkbcommon[X]
 		x11-libs/pango
 	)
-	freeimage? ( media-libs/freeimage )
-	jpeg? ( media-libs/libjpeg-turbo )
-	libnsgif? ( media-libs/libnsgif )
-	png? ( media-libs/libpng )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff )
+	freeimage? ( media-libs/freeimage[png?,jpeg?,tiff?] )
+	!freeimage? (
+		jpeg? ( media-libs/libjpeg-turbo )
+		png? ( media-libs/libpng )
+		tiff? ( media-libs/tiff )
+	)
+	gif? ( media-libs/libnsgif )
+	heif? ( media-libs/libheif )
+	svg? ( >=gnome-base/librsvg-2.44 )
 	wayland? ( dev-libs/wayland )
 "
 BDEPEND="
@@ -46,13 +49,7 @@ DEPEND="
 	${RDEPEND}
 "
 
-src_prepare() {
-	default
-	sed -i -e 's|pkg-config|$(PKG_CONFIG)|g' Makefile || die
-}
-
 src_configure() {
-	tc-export PKG_CONFIG
 	local WINDOWS
 	if use X; then
 		if ! use wayland; then
@@ -66,23 +63,21 @@ src_configure() {
 		fi
 	fi
 
-	BACKENDS=(
-		BACKEND_FREEIMAGE=$(usex freeimage)
-		BACKEND_JPEG=$(usex jpeg)
-		BACKEND_LIBNSGIF=$(usex libnsgif)
-		BACKEND_LIBPNG=$(usex png)
-		BACKEND_LIBRSVG=$(usex svg)
-		BACKEND_LIBTIFF=$(usex tiff)
-		WINDOWS=${WINDOWS}
-	)
-}
-
-src_compile() {
-	emake ${BACKENDS[@]}
-}
+	if ! use test; then
+		sed -i -e '/^dep_cmocka/,/^endforeach$/d' meson.build || die
+	fi
 
-src_install() {
-	emake ${BACKENDS[@]} DESTDIR="${D}" install
+	local emesonargs=(
+		$(meson_feature freeimage)
+		$(meson_feature gif libnsgif)
+		$(meson_feature heif libheif)
+		$(meson_feature svg librsvg)
+		$(usex freeimage -Dlibjpeg=disabled -Dlibjpeg=enabled)
+		$(usex freeimage -Dlibpng=disabled -Dlibjpeg=enabled)
+		$(usex freeimage -Dlibtiff=disabled -Dlibjpeg=enabled)
+		-Dwindows=$WINDOWS
+	)
+	meson_src_configure
 }
 
 pkg_postinst() {
diff --git a/media-gfx/imv/metadata.xml b/media-gfx/imv/metadata.xml
index 39258bf23daf..e61730462a7b 100644
--- a/media-gfx/imv/metadata.xml
+++ b/media-gfx/imv/metadata.xml
@@ -4,6 +4,7 @@
 <maintainer type='person'><email>jer@gentoo.org</email></maintainer>
 <use>
 <flag name='freeimage'>Use <pkg>media-libs/freeimage</pkg> as image library</flag>
+<flag name='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>
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 65e11c39c82b..0b0cc4c52ede 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,4 +1,4 @@
 DIST inkscape-1.0.tar.xz 31935616 BLAKE2B 096ef6ccfd519118acffa3b15302a2d92f94976f37cf58c1fdab79abb64a2de14d02e1199364c71265a332f57809603ec1b6f4f34b90e910376e1cbc5c6d1cb8 SHA512 37c18079eb926fd6874deee95e4008bae165c5e52d05cb53bbc8f4a48eedd0e0ab6b3e5dfbb23709169187bfe8eb5aa44d576268667f2566a2cd4dd5426554f0
-EBUILD inkscape-1.0-r1.ebuild 3925 BLAKE2B 7693e7eba1c4e5c762751e93fb15653928167f9fbf3bf2332671452abad4e7c11e6094bcfed7d1388478714d00c8487e7416cdf28da5ebc9bfeef3a470785433 SHA512 ceef00cc2408ce6ea37825d2d1599dca87a462a1981a24b8b4d3630c8c3e79dd3bcb72e4d288b9419418bf62df1ac9b8cfead9331dcfd6b33c70b9cbe0c0c908
+EBUILD inkscape-1.0-r1.ebuild 3931 BLAKE2B a1c26f535e5826b5546b9352393d74888bb12a8b5c2136909a713591acc5cec8aa0298942801ef19a959258eb5177404ccf750e9815388aa9f9fb6f8c1fef142 SHA512 6afe0c95dfca5b97b6f81bd78bc9828fb637416ee3c07a69e2634f604c5bdd1ada0ccaba2adc6548aa0562c7bccbdfbd5e0b77af3c19d5f660e8e9b5ecf2f937
 EBUILD inkscape-9999.ebuild 3910 BLAKE2B cfab74f275ac4a5adfba4a19966fda81345f5db7e3cc25ed7222a8c29208e893249dab17887dd7a6fd6a76f27f3f559f9e7181ef229e9c7109d0fa47e0546868 SHA512 b24b3f393c8d66dca3bb29de09cdd44214532c25e7de4d0e45c93a8be2365f1ea7208d9f24311299406da02b9c60ad257efd58795f467a7d6a8ecb3d81a90843
 MISC metadata.xml 983 BLAKE2B 5b149700a92f0f4e8a07a643eb004ee6669a668a8a04dd74f13883c858bd2457f8a7f193f64313bf3203fa628484e502a0252272ae8f665a9ebe661589f3637d SHA512 7ab0de464a4dece17f9421bf44a660590c4d453447603a57568a092f90a0005e751cd599ca0923152fc101558c46c479dc65c13a8727b6071a43b1703b459b1e
diff --git a/media-gfx/inkscape/inkscape-1.0-r1.ebuild b/media-gfx/inkscape/inkscape-1.0-r1.ebuild
index 86a1a7aa6dca..b137a124f305 100644
--- a/media-gfx/inkscape/inkscape-1.0-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://inkscape.org/gallery/item/18460/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
 openmp postscript spell static-libs svg2 visio wpg"
 
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 940d6b363f7c..2d01d4bd7b72 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -8,11 +8,17 @@ AUX iscan-2.30.4.2-sscanf.patch 779 BLAKE2B 8e8255c0558e225b3c1bcb5faaf42f0d7941
 AUX iscan-3.61.0-ijg-libjpeg.patch 1145 BLAKE2B 781c0c9a40848f9c10ddb3418c55b6c4a145f1590c5ec41e22e371830d3d7d63c4e013d8fa69a1f15f24d4883d569c0645df66b3c6120eb724f3a1f9643e3813 SHA512 b570bc0e6aa73f74750aaab4d3ca84838864c8723b14fbf5a45fe9163be3e7819035a12bd058587a4b4964325ba4af99673e78647b11d2a7b1bcf96039522191
 AUX iscan-3.61.0-imagemagick-7.patch 1965 BLAKE2B 14685cc9540ccfda87587b5ff2df7b8c4755dd08bb428f33ce853c32baaf6ab7e6b2d3368df9153fa5f5b39d9ef17b8e468ea59530ac89098107542db2638f05 SHA512 d5545570865370229f2b132aef7131cbbfabd7e929795bee6ce1e0d791c2c623eefabdd0ec265c6cadcc41072049d61e07d5fca46a1f51c621323a38112dc316
 AUX iscan-3.62.0-boost-1.73.patch 1315 BLAKE2B 801f6f9e2f91b4a442b673a2cd9630519ea10e08131877eb09ac52bc190316bfdc98fa1ae572ac2122bd9999a10af421d808762b0d7ca07b249d94428acbfb01 SHA512 183cd4e12451dd66ae096cccdc4ea9fdb4264935894a4442aa094e42ca539ad3f9fec6b01aaac3f20263a3425956808a342de886465b6e9700a7c449c031431f
+AUX iscan-3.62.0-fix-symbols.patch 1213 BLAKE2B 2a3b09e88ba1d44d11440bac0ca11f28f4379a2a81000fa2543b9041ccedff51db77edb70dd452631c600ecc04e7d5f0e68c53a071a9b40d34cdd690c7ed8a24 SHA512 adfcb7b83f26aa03f612025abcc52b6dda8d4439ea0a0b554dac5f335dab9c9c2606ed1835c89ac26a7f34e49264560ed837c06831ae4addeb711b77a7d0dffa
 AUX iscan-3.62.0-gcc-10.patch 503 BLAKE2B 53a351f439f43003e668cad1b8f05231b58137dd4e4a88ea3b04aa326f8ae82d46e664d19a5fba89122c6959e9aeb33beab56a43128c73b483d99c9ec25bf835 SHA512 b32438d590419a8be3c7f28a545ed4dedab0a6f0bcd0c9f3a81def67164c4156dd52064d8d8ca93cf2550b2184de12c94cffd6b91ef82d832179eb3e9f554326
+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
+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 2273 BLAKE2B 4a02fac7387177a601987b9a95d1aa9a43ce2fad8d78ea0ddb1b24b66ba6f5f011eea84bd9f3ce3ae7d5c6342276f67d407acb95e1bfb9ad4c65dec87aeb5caf SHA512 8894b992db9e4edbc35621384443f329df1d28be28576cb495d3877df6e9e307d220c33f5529db6dfb5bb43fc6a3f57a96dd164e825df6875070ba2866449183
+EBUILD iscan-3.62.0.ebuild 2332 BLAKE2B efe846efa66cc80dc3675dc4e1cff7c20eb7902a8523e251bff906c694c0585f34a8f0779235339bdb58442deb8c3e03ae0fef425ca7c6b90ca0d56113da6ca0 SHA512 53ae2081a1956a68deb8dfa3f7b4312ff6b2239300a5cecb3d9aaf8e170906097ca056bf8e7c3c4e5cf566bd0336500305f1dcb85cf429513ecb50cd45a80049
+EBUILD iscan-3.63.0.ebuild 2804 BLAKE2B 74641d8af25e44ff40550977f1ef83fe1f61c01a5d9579e8bca2807cc8566744f2766d4e0be66080155bde35e53e5bf1329574ced45fd94722fcb60082388685 SHA512 21134488ce22b77c190ec26505bb7bf2181b25b7008849cf88d61596154ecdaba2666aa9526d875c4816ba1a0b6a621b27791904d6f6ca5b159ad0cbf7e562c2
 MISC metadata.xml 930 BLAKE2B d2cf4fae5cdcb660357ffe5566ad8d99eef6287f565a45f1824c810b3979e9d2930f458766ff524b231ef8dfd793062ff23cf4bfc2a78a36c5393a6c4224feea SHA512 d609a5cd8f8bbc7653e784d153757849eafb9c772355d0928325a6ecf673e8aa055623601d957f912709f9f16acfde5ca0b0480a1f2a17bfc24825895d861fc0
diff --git a/media-gfx/iscan/files/iscan-3.62.0-fix-symbols.patch b/media-gfx/iscan/files/iscan-3.62.0-fix-symbols.patch
new file mode 100644
index 000000000000..4c0d44bf9ee0
--- /dev/null
+++ b/media-gfx/iscan/files/iscan-3.62.0-fix-symbols.patch
@@ -0,0 +1,34 @@
+commit 4cbb42cc3d2c7e7574dc10f0e6f9f53bdf4d34e8
+Author: blubee <gurenchan@gmail.com>
+Date:   Sun Oct 22 16:22:23 2017 +0800
+
+    Export correct symbols
+    
+    The factory was renamed to scanner_factory in 4b77b4a4.
+
+diff --git a/drivers/Makefile.am b/drivers/Makefile.am
+index 86694ac..282eaa3 100644
+--- a/drivers/Makefile.am
++++ b/drivers/Makefile.am
+@@ -28,7 +28,7 @@ driverlibdir    = $(pkglibdir)
+ driverdatadir   = $(pkgsysconfdir)
+ driver_ldflags  = $(AM_LDFLAGS)
+ driver_ldflags += -export-dynamic
+-driver_ldflags += -export-symbols-regex libdrv_$(driver)_LTX_factory
++driver_ldflags += -export-symbols-regex libdrv_$(driver)_LTX_scanner_factory
+ 
+ driverlib_LTLIBRARIES = libdrv-combo.la
+ 
+diff --git a/drivers/esci/Makefile.am b/drivers/esci/Makefile.am
+index 78ed9be..9cb6bc8 100644
+--- a/drivers/esci/Makefile.am
++++ b/drivers/esci/Makefile.am
+@@ -37,7 +37,7 @@ driverlibdir    = $(pkglibdir)
+ driverdatadir   = $(pkgdatadir)/drivers/esci
+ driver_ldflags  = $(AM_LDFLAGS)
+ driver_ldflags += -export-dynamic
+-driver_ldflags += -export-symbols-regex libdrv_$(driver)_LTX_factory
++driver_ldflags += -export-symbols-regex libdrv_$(driver)_LTX_scanner_factory
+ 
+ driverlib_LTLIBRARIES = libdrv-esci.la
+ 
diff --git a/media-gfx/iscan/files/iscan-3.62.0-tests-boost.patch b/media-gfx/iscan/files/iscan-3.62.0-tests-boost.patch
new file mode 100644
index 000000000000..a5593512c0b2
--- /dev/null
+++ b/media-gfx/iscan/files/iscan-3.62.0-tests-boost.patch
@@ -0,0 +1,81 @@
+commit 13f483741fb1da2bf3d5e96286d0fe84a3f77288
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Mar 3 21:25:46 2019 +0900
+
+    Switch BOOST_MESSAGE usage to use BOOST_TEST_MESSAGE
+    
+    The former has been marked as deprecated since Boost 1.34.0 and was
+    removed in 1.59.0 (released 2015-08-13).
+
+diff --git a/lib/tests/memory.cpp b/lib/tests/memory.cpp
+index 3fa21df..bf523df 100644
+--- a/lib/tests/memory.cpp
++++ b/lib/tests/memory.cpp
+@@ -1,5 +1,6 @@
+ //  memory.cpp -- unit tests for the memory device implementations
+ //  Copyright (C) 2012, 2015  SEIKO EPSON CORPORATION
++//  Copyright (C) 2019  Olaf Meeuwissen
+ //
+ //  License: GPL-3.0+
+ //  Author : EPSON AVASYS CORPORATION
+@@ -145,7 +146,7 @@ constant_octets (octet value)
+   const streamsize margin = 10;
+   const octet nul = 0x00;
+   traits::assign (buffer, size, nul);
+-  BOOST_MESSAGE ("value: " << value );
++  BOOST_TEST_MESSAGE ("value: " << value );
+ 
+   setmem_idevice dev (shared_ptr<setmem_idevice::generator>
+                       (new const_generator (value)));
+diff --git a/sane/tests/backend.cpp b/sane/tests/backend.cpp
+index f2ff7ef..e21edd0 100644
+--- a/sane/tests/backend.cpp
++++ b/sane/tests/backend.cpp
+@@ -1,5 +1,6 @@
+ //  backend.cpp -- unit tests for the SANE utsushi backend
+ //  Copyright (C) 2012, 2013, 2015  SEIKO EPSON CORPORATION
++//  Copyright (C) 2019  Olaf Meeuwissen
+ //
+ //  License: GPL-3.0+
+ //  Author : EPSON AVASYS CORPORATION
+@@ -755,8 +756,8 @@ drop_test_suite (const std::string& name)
+   but::traverse_test_tree (tuid, tcc);
+ 
+   master.remove (tuid);
+-  BOOST_MESSAGE ("Disabled \"" << name << "\" test suite for lack of "
+-                 "a mock device (" << tcc.p_count << " test cases)");
++  BOOST_TEST_MESSAGE ("Disabled \"" << name << "\" test suite for lack of "
++                      "a mock device (" << tcc.p_count << " test cases)");
+ }
+ 
+ bool
+@@ -766,7 +767,7 @@ init_test_runner ()
+ 
+   but::master_test_suite_t& master (but::framework::master_test_suite ());
+ 
+-  BOOST_MESSAGE ("Initializing \"" << master.p_name << "\" test suite");
++  BOOST_TEST_MESSAGE ("Initializing \"" << master.p_name << "\" test suite");
+ 
+   utsushi::monitor mon;    // to discover devices
+ 
+commit dcd5de24246b8ac5a96f971b6b0adfb910f5c60e
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Mar 3 21:40:39 2019 +0900
+
+    Add headers needed by Boost 1.59.0 and later
+
+diff --git a/sane/tests/backend.cpp b/sane/tests/backend.cpp
+index e21edd0..77fbf96 100644
+--- a/sane/tests/backend.cpp
++++ b/sane/tests/backend.cpp
+@@ -27,6 +27,10 @@
+ #include <cstring>
+ 
+ #include <boost/test/unit_test.hpp>
++#if 105800 <= BOOST_VERSION
++#include <boost/test/tree/test_case_counter.hpp>
++#include <boost/test/tree/traverse.hpp>
++#endif
+ #include <boost/preprocessor/cat.hpp>
+ 
+ #include <ltdl.h>
diff --git a/media-gfx/iscan/files/iscan-3.62.0-tests-linkage.patch b/media-gfx/iscan/files/iscan-3.62.0-tests-linkage.patch
new file mode 100644
index 000000000000..ecdf497fcb36
--- /dev/null
+++ b/media-gfx/iscan/files/iscan-3.62.0-tests-linkage.patch
@@ -0,0 +1,94 @@
+commit 1d58388b6fc4f5055c19d1815e3252625fd8ab3f
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Mar 3 21:22:28 2019 +0900
+
+    Fix link issues with the unit test runners
+
+diff --git a/drivers/esci/tests/Makefile.am b/drivers/esci/tests/Makefile.am
+index d00f129..9c8f766 100644
+--- a/drivers/esci/tests/Makefile.am
++++ b/drivers/esci/tests/Makefile.am
+@@ -1,5 +1,6 @@
+ ##  Makefile.am -- an automake template for Makefile.in
+ ##  Copyright (C) 2012-2015  SEIKO EPSON CORPORATION
++##  Copyright (C) 2019  Olaf Meeuwissen
+ ##
+ ##  License: GPL-3.0+
+ ##  Author : EPSON AVASYS CORPORATION
+@@ -39,16 +40,22 @@ AM_CPPFLAGS += -DESCI_GRAMMAR_TRACE=1
+ AM_LDFLAGS  += $(BOOST_LDFLAGS)
+ 
+ LDADD = ../libdrv-esci.la $(LIBUTSUSHI_LIBS)
+-grammar_formats_utr_LDADD   = $(LDADD) $(BOOST_FILESYSTEM_LIB)
+-grammar_utr_LDADD           = $(LDADD) $(BOOST_FILESYSTEM_LIB)
+-## FIXME: remove once usb connexion is a proper plugin
+-setter_utr_LDADD    = $(LDADD) ../../../connexions/libcnx-usb.la
++grammar_formats_utr_LDADD    = $(LDADD) $(BOOST_FILESYSTEM_LIB)
++grammar_utr_LDADD            = $(LDADD) $(BOOST_FILESYSTEM_LIB)
++udev_rules_utr_LDADD         = $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
++udev_rules_utr_LDADD        += $(BOOST_FILESYSTEM_LIB)
++udev_rules_utr_LDADD        += $(BOOST_REGEX_LIB)
++## FIXME: remove when connexions are turned into proper plugins
++setter_utr_LDADD             = $(LDADD)
++setter_utr_LDADD            += ../../../connexions/libcnx-usb.la
++setter_utr_LDADD            += ../../../connexions/libcnx-hexdump.la
+ grammar_formats_utr_LDADD   += ../../../connexions/libcnx-usb.la
++grammar_formats_utr_LDADD   += ../../../connexions/libcnx-hexdump.la
+ grammar_utr_LDADD           += ../../../connexions/libcnx-usb.la
+-grammar_mechanics_utr_LDADD  = $(LDADD) ../../../connexions/libcnx-usb.la
+-udev_rules_utr_LDADD  = $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
+-udev_rules_utr_LDADD += $(BOOST_FILESYSTEM_LIB)
+-udev_rules_utr_LDADD += $(BOOST_REGEX_LIB)
++grammar_utr_LDADD           += ../../../connexions/libcnx-hexdump.la
++grammar_mechanics_utr_LDADD  = $(LDADD)
++grammar_mechanics_utr_LDADD += ../../../connexions/libcnx-usb.la
++grammar_mechanics_utr_LDADD += ../../../connexions/libcnx-hexdump.la
+ 
+ endif
+ 
+diff --git a/filters/tests/Makefile.am b/filters/tests/Makefile.am
+index 4d88e48..ac198df 100644
+--- a/filters/tests/Makefile.am
++++ b/filters/tests/Makefile.am
+@@ -1,6 +1,6 @@
+ ##  Makefile.am -- an automake template for Makefile.in
+ ##  Copyright (C) 2012-2014  SEIKO EPSON CORPORATION
+-##  Copyright (C) 2013, 2015  Olaf Meeuwissen
++##  Copyright (C) 2013, 2015, 2019  Olaf Meeuwissen
+ ##
+ ##  License: GPL-3.0+
+ ##  Author : EPSON AVASYS CORPORATION
+@@ -39,8 +39,9 @@ endif
+ 
+ LDADD  = ../libflt-all.la
+ LDADD += ../../lib/libutsushi.la $(LIBUTSUSHI_LIBS)
+-##  FIXME: drop once usb connexion is a proper plugin
++##  FIXME: drop when connexions have been turned into proper plugins
+ LDADD += ../../connexions/libcnx-usb.la
++LDADD += ../../connexions/libcnx-hexdump.la
+ 
+ if have_libjpeg
+ check_PROGRAMS    += jpeg.utr
+diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
+index fc5eeb5..f24a7da 100644
+--- a/lib/tests/Makefile.am
++++ b/lib/tests/Makefile.am
+@@ -1,6 +1,6 @@
+ ##  Makefile.am -- an automake template for Makefile.in
+ ##  Copyright (C) 2012, 2013  SEIKO EPSON CORPORATION
+-##  Copyright (C) 2015  Olaf Meeuwissen
++##  Copyright (C) 2015, 2019  Olaf Meeuwissen
+ ##
+ ##  License: GPL-3.0+
+ ##  Author : EPSON AVASYS CORPORATION
+@@ -62,8 +62,9 @@ log_no_check_utr_CPPFLAGS += -DUTSUSHI_LOG_ARGUMENT_COUNT_CHECK_ENABLED=false
+ AM_CPPFLAGS += -DLOCALEDIR="\"$(localedir)\""
+ 
+ LDADD  = ../libutsushi.la $(LIBUTSUSHI_LIBS)
+-##  FIXME: drop once usb connexion is a proper plugin
++##  FIXME: drop when connexions have been turned into proper plugins
+ LDADD += ../../connexions/libcnx-usb.la
++LDADD += ../../connexions/libcnx-hexdump.la
+ 
+ if have_libtiff
+ test_runners      += tiff.utr
diff --git a/media-gfx/iscan/files/iscan-3.62.0-tests-tesseract.patch b/media-gfx/iscan/files/iscan-3.62.0-tests-tesseract.patch
new file mode 100644
index 000000000000..52f7b18e6b89
--- /dev/null
+++ b/media-gfx/iscan/files/iscan-3.62.0-tests-tesseract.patch
@@ -0,0 +1,111 @@
+commit 9ce60e8df3b613950c483f0ae5ec772afc329104
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Fri Jun 21 22:20:30 2019 +0900
+
+    Fix tesseract command-line invocation.  Re #78
+
+diff --git a/filters/get-text-orientation b/filters/get-text-orientation
+index 847f2c6..6f0978c 100755
+--- a/filters/get-text-orientation
++++ b/filters/get-text-orientation
+@@ -47,26 +47,14 @@ if test $? != 0; then
+     exit 1
+ fi
+ 
+-tmpfile=$(mktemp -q .reorient.XXX)
+-trap "rm -f $tmpfile" 0 1 2 15
+-
+ case "$engine" in
+     */tesseract|tesseract)
+ 
+-        #  Notwithstanding what the manual page says, tesseract
+-        #  doesn't support reading from standard input with the
+-        #  `-psm 0` option.  We stuff incoming image data into a
+-        #  temporary file to work around this limitation.
+-        #  See https://github.com/tesseract-ocr/tesseract/issues/85
+-
+-        cat - > $tmpfile
++        #  Tesseract 3.03 outputs the results we want to standard
++        #  error; Tesseract 3.04 dumps it on standard output.  We
++        #  want it on the latter.
+ 
+-        #  We don't care about the "regular" tesseract output so
+-        #  divert that to /dev/null.  The output that we do care
+-        #  about ends up on standard error, but our caller looks
+-        #  for it on standard output.  Redirect to handle that.
+-
+-        $engine $tmpfile /dev/null -psm 0 -l osd 2>&1
++        $engine - - -psm 0 -l osd 2>&1
+         ;;
+ 
+     */ocr-engine-getrotate)
+@@ -74,6 +62,9 @@ case "$engine" in
+         #  The ocr-engine-getrotate utility expects an uncompressed
+         #  BMP image.
+ 
++        tmpfile=$(mktemp -q .reorient.XXX)
++        trap "rm -f $tmpfile" 0 1 2 15
++
+         $convert - -compress None bmp3:$tmpfile
+         $engine $tmpfile
+         ;;
+
+commit 56f1d8ed51cc7140b961ef8ab8c7501f69d87fd5
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Oct 21 12:41:20 2019 +0900
+
+    Fix get-text-orientation for newer Tesseract versions.  Fixes #86
+
+diff --git a/filters/get-text-orientation b/filters/get-text-orientation
+index 6f0978c..eb64e4b 100755
+--- a/filters/get-text-orientation
++++ b/filters/get-text-orientation
+@@ -51,10 +51,21 @@ case "$engine" in
+     */tesseract|tesseract)
+ 
+         #  Tesseract 3.03 outputs the results we want to standard
+-        #  error; Tesseract 3.04 dumps it on standard output.  We
+-        #  want it on the latter.
++        #  error; Tesseract 3.04 dumps it on standard output.  So
++        #  do later versions.  We want it on the latter.
++        #  Command-line options changed in 3.05.00.
+ 
+-        $engine - - -psm 0 -l osd 2>&1
++        version=$($engine --version 2>&1 | sed -n 's/.*tesseract *//p')
++
++        case "$version" in
++            3.0[34].* )
++                $engine - - -psm 0 -l osd 2>&1
++                ;;
++
++            3.05.* | [45].* )
++                $engine - - --psm 0 -l osd 2>&1
++                ;;
++        esac
+         ;;
+ 
+     */ocr-engine-getrotate)
+commit 9d5edc4c52e5a6b59d61a43ddcc13353b82992f5
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Jun 23 17:22:22 2019 +0900
+
+    Fix reorientation logic for newer Tesseract versions.  Re #78
+
+diff --git a/filters/reorient.cpp b/filters/reorient.cpp
+index e0c1dc1..60c5173 100644
+--- a/filters/reorient.cpp
++++ b/filters/reorient.cpp
+@@ -483,6 +483,13 @@ reorient::finalize (const context& ctx)
+         log::alert
+           (format ("unexpected document orientation: %1% degrees")
+            % degrees);
++
++      if (engine_ == "tesseract"
++          && !tesseract_version_before_("3.04")) {
++        // Orientation reporting changed direct with 3.04.  See #78
++        /**/ if ( 90 == degrees) rv.orientation (context::left_bottom);
++        else if (270 == degrees) rv.orientation (context::right_top);
++      }
+     }
+   return rv;
+ }
diff --git a/media-gfx/iscan/iscan-3.62.0.ebuild b/media-gfx/iscan/iscan-3.62.0.ebuild
index 7f8e4fae37b8..92b606786000 100644
--- a/media-gfx/iscan/iscan-3.62.0.ebuild
+++ b/media-gfx/iscan/iscan-3.62.0.ebuild
@@ -51,6 +51,8 @@ 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
diff --git a/media-gfx/iscan/iscan-3.63.0.ebuild b/media-gfx/iscan/iscan-3.63.0.ebuild
new file mode 100644
index 000000000000..7a56c9f57049
--- /dev/null
+++ b/media-gfx/iscan/iscan-3.63.0.ebuild
@@ -0,0 +1,101 @@
+# 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 test"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	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 )
+"
+# Disable opencl as during reorient.utr test it produces inconsistent results
+DEPEND="${RDEPEND}
+	test? (
+		app-text/tesseract[training,-opencl]
+		media-fonts/dejavu
+	)
+"
+RESTRICT="!test? ( test )"
+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
+	"${FILESDIR}"/${PN}-3.62.0-fix-symbols.patch
+	"${FILESDIR}"/${PN}-3.62.0-tests-boost.patch
+	"${FILESDIR}"/${PN}-3.62.0-tests-tesseract.patch
+	"${FILESDIR}"/${PN}-3.62.0-tests-linkage.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
+	# Disable check-soname test
+	sed -e '/SANE_BACKEND_SANITY_CHECKS +=/d' -i sane/Makefile.am || 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/jhead/Manifest b/media-gfx/jhead/Manifest
index ca7479ad5a14..1d76b1456a64 100644
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -1,8 +1,4 @@
-AUX Makefile 1095 BLAKE2B 59829280499ade024a4b96852b3a6dac3c25bca26e3131eeb819d46e4c8071b14fc5fd2a98704ae2aa212f1037719e58254fc592709da1ac8b99500c78cc942e SHA512 d2bdf49c30c1878d2d07e3a3168d7caf484d493a00ae6032ea870f130cd7b9f5d69bfd301cd0392dbe2f601d79dc9156a9b43ce5b09781e25e858d8eaf3840f1
-AUX jhead-2.90-mkstemp_respect_flags.patch 892 BLAKE2B 3a0c4ae7bf32391b32a405541bcd70525e8aa1c6064118b94f08ec8864fc712d50500066f10b2fc417ece0a3d4ec95919eb4751b2bf994ad3461d72b4de7d12a SHA512 14051d7088685dd957d0bdaace752167ebcdac7eb3b01b033918897e8c349e417e662688d7737f916f59d4f1dd7ad9752172791699da0565dd2d5b4f908a4ed8
-DIST jhead-2.97.tar.gz 68361 BLAKE2B ed13d637dc491ad1c6ed7f9a5b0b526c80f69b8c521e3618289b16523ebb12690fa53a0a273f3f5793f970f390430d56c8504bed30fb45c5e9e2a9ac248f7667 SHA512 9b33451546e5ad3b82fe6001515fd572925a1e2c11af763ae32d71ad2cb056ffa8d97abe14bd48ae5f6144da9d8322965387537d61e22d22b02624ebf351c230
-DIST jhead-3.00.tar.gz 69151 BLAKE2B 23522718f07cd0b52b3d7fbd6d0f69ca5ecd5499174b06c6572be1319b275dc93eacd270f33cd7b3380ef85e6615aa79adf1fa9a1a86404876b35c31cdb0c95e SHA512 daedfe7ea6be051f769e9a1e0946ea0fa741f387bbc5ba55eec394fb3f37b18a66aa8826190c790eb50a5b9d445ee0d5a28a08d181db3be469686b0675540fbe
-EBUILD jhead-2.97.ebuild 744 BLAKE2B 9ccad5df68d98ad6003a3b69a18661fb600de10f7326199ab7784cfb9bfc16b554bef37c5e555083503e09bcfbcc053cf8b018059b3995995ee2fe8d19c3bfd7 SHA512 39f2a2b352dfbdbe74bc4c188a688aa12623e33132a9afe487271e060c0e4eba7063ef28216796f026092449f1e87702becdadc07a7729108f97df6a725e96cf
-EBUILD jhead-3.00-r2.ebuild 712 BLAKE2B 5ab22c7fb0d1137d7a18f4020737dd30934eea11c00509288255205ee574e255af1b0de1092f8f3822d0dd7b86e3a9dc8b5b50fb327df7fccb5b83add9353464 SHA512 1c44c47e0a404a8a0aff91f4e0e97e0d0edbc1e120361fb068bdfa2d9a74e31ed3420d82f006d4d86cdc1bf218904d40a13f45d5ddb46ac66f91694a098728df
-EBUILD jhead-3.00.ebuild 746 BLAKE2B 576096a432b63a988861a85e05ebb92f1a4346bd012f74269629a2b868254a372699a4ed3be74ae78cb90df792ee61e77842da6da46ec98ae6a570faedf3fb89 SHA512 2f711c62175a02cc968fc698fffff784743a8befe3c315d294e78978357de5df3ee0c665ae70baf64091db4c3744f1c2aa3853fcae87754eb8a67d0a08ebe4a5
+AUX jhead-3.04-mkstemp-fix-makefile.patch 1496 BLAKE2B 99266c5b86f94e6b173ae48e72990503fdb9d6d55e10f509e94d08fa0e821f25075868c8c6587b69c0299caac738b4872f46473236cf714eb5ed7ff0cacbf1f4 SHA512 f1f682a7b24e5e6e31125f80cae48e6c9e1af1e9f21b347784da0724a73e10082ff45b5bd36210883e8163048e3174efe927db95ceb660de821338ff77b05575
+DIST jhead-3.04.tar.gz 67754 BLAKE2B 4b81927fe3db58bf10b6e42c7e045a9d8a2f50df152faf886bb28238ef74e73371d37902c3c13e6edb74a89347b2c6f698f18dd91b51797e1882cb1d3bf5461f SHA512 d783b02059ebcb01845d346e7c48bdc9d9f12fb7b0fd47bf8aff0a85a03f3523fbc536ddab0912f1c56ddb315b6cf31f16d4c7a4f81112d9a4c76a4a57ec1aed
+EBUILD jhead-3.04.ebuild 560 BLAKE2B a086e6fcb77bfba28f39db47362883a63fd5d84e15dc0b53623653b23ddb349d31c3b1015628a9b6cede80fd214295cceca8ea74f41b6e517744ec6bec89d242 SHA512 3684a173be604da4f4494553e0580a0f30754d424fea04bc7be4f321a3bc3810a89136b466b917408dea6be7f8eff61de98bde3062a455190f4fd96b00052b54
 MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
diff --git a/media-gfx/jhead/files/Makefile b/media-gfx/jhead/files/Makefile
deleted file mode 100644
index 5f1d9799a42b..000000000000
--- a/media-gfx/jhead/files/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#--------------------------------
-# jhead makefile for Unix
-# this make file also creates libjhead for meshlab
-#--------------------------------
-OBJ=.
-SRC=.
-AR = ar cqs
-LFLAGS = -shared -Wl,-soname,libjhead.so.1
-
-objs = $(OBJ)/jhead.o $(OBJ)/jpgfile.o $(OBJ)/jpgqguess.o $(OBJ)/paths.o \
-	$(OBJ)/exif.o $(OBJ)/iptc.o $(OBJ)/gpsinfo.o $(OBJ)/makernote.o 
-
-TARGET        = libjhead.so.1.0.0
-TARGET0       = libjhead.so
-TARGET1       = libjhead.so.1
-TARGET2       = libjhead.so.1.0
-
-all: jhead $(TARGET) 
-
-$(OBJ)/%.o:$(SRC)/%.c
-	${CC} -fPIC $(CFLAGS) -c $< -o $@
-
-jhead: $(objs) jhead.h
-	${CC} ${LDFLAGS} -o jhead $(objs) -lm
-
-clean:
-	rm -f $(objs) jhead ${TARGET} ${TARGETA} ${TARGET0} ${TARGETD} \
-	 ${TARGET1} ${TARGET2}
- 
-install:
-	cp jhead ${DESTDIR}/usr/bin/
-	cp ${TARGET} ${DESTDIR}/usr/lib/
-	cp jhead ${DESTDIR}/usr/bin/
-	cp ${TARGET0} ${DESTDIR}/usr/lib/
-	cp ${TARGET1} ${DESTDIR}/usr/lib/
-	cp ${TARGET2} ${DESTDIR}/usr/lib/
-
-$(TARGET):  $(objs) jhead
-	${CC} $(LDFLAGS) $(LFLAGS) -o $(TARGET) $(objs) 
-	ln -s ${TARGET} ${TARGET0}
-	ln -s ${TARGET} ${TARGET1}
-	ln -s ${TARGET} ${TARGET2}
-
-	
diff --git a/media-gfx/jhead/files/jhead-2.90-mkstemp_respect_flags.patch b/media-gfx/jhead/files/jhead-2.90-mkstemp_respect_flags.patch
deleted file mode 100644
index f09214b9f3d6..000000000000
--- a/media-gfx/jhead/files/jhead-2.90-mkstemp_respect_flags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --exclude='*~' -Naur -Naur jhead-2.90.orig/jhead.c jhead-2.90/jhead.c
---- jhead-2.90.orig/jhead.c	2011-02-12 14:36:47.000000000 -0200
-+++ jhead-2.90/jhead.c	2011-02-12 14:39:28.000000000 -0200
-@@ -358,7 +358,7 @@
-     // as mktemp - that is, that between getting the random name, and making the file
-     // some other program could snatch that exact same name!
-     // also, not all pltforms support mkstemp.
--    mktemp(TempName);
-+    mkstemp(TempName);
- 
- 
-     if(!TempName[0]) {
-diff --exclude='*~' -Naur -Naur jhead-2.90.orig/makefile jhead-2.90/makefile
---- jhead-2.90.orig/makefile	2011-02-12 14:36:47.000000000 -0200
-+++ jhead-2.90/makefile	2011-02-12 14:40:50.000000000 -0200
-@@ -13,8 +13,9 @@
- $(OBJ)/%.o:$(SRC)/%.c
- 	${CC} $(CFLAGS) -c $< -o $@
- 
-+
- jhead: $(objs) jhead.h
--	${CC} -o jhead $(objs) -lm
-+	${CC} ${LDFLAGS} -o jhead $(objs) -lm
- 
- clean:
- 	rm -f $(objs) jhead
diff --git a/media-gfx/jhead/files/jhead-3.04-mkstemp-fix-makefile.patch b/media-gfx/jhead/files/jhead-3.04-mkstemp-fix-makefile.patch
new file mode 100644
index 000000000000..0bb634b6f5b9
--- /dev/null
+++ b/media-gfx/jhead/files/jhead-3.04-mkstemp-fix-makefile.patch
@@ -0,0 +1,53 @@
+diff --git a/jhead.c b/jhead.c
+index f78127a..d8d1472 100644
+--- a/jhead.c
++++ b/jhead.c
+@@ -376,7 +376,7 @@ static void DoCommand(const char * FileName, int ShowIt)
+     // as mktemp - that is, that between getting the random name, and making the file
+     // some other program could snatch that exact same name!
+     // also, not all platforms support mkstemp.
+-    mktemp(TempName);
++    mkstemp(TempName);
+ 
+ 
+     if(!TempName[0]) {
+diff --git a/makefile b/makefile
+index f8f195e..c36d34f 100644
+--- a/makefile
++++ b/makefile
+@@ -3,17 +3,20 @@
+ #--------------------------------
+ OBJ=.
+ SRC=.
+-CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+-CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+-LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
++LFLAGS = -fPIC -shared -Wl,-soname,libjhead.so.1
+ 
+-all: jhead
++TARGET	= libjhead.so.1.0.0
++TARGET0	= libjhead.so
++TARGET1	= libjhead.so.1
++TARGET2 = libjhead.so.1.0
++
++all: jhead $(TARGET)
+ 
+ objs = $(OBJ)/jhead.o $(OBJ)/jpgfile.o $(OBJ)/jpgqguess.o $(OBJ)/paths.o \
+ 	$(OBJ)/exif.o $(OBJ)/iptc.o $(OBJ)/gpsinfo.o $(OBJ)/makernote.o 
+ 
+ $(OBJ)/%.o:$(SRC)/%.c
+-	${CC} $(CFLAGS) $(CPPFLAGS) -c $< -o $@
++	${CC} -fPIC $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
+ jhead: $(objs) jhead.h
+ 	${CC} $(LDFLAGS) -o jhead $(objs) -lm
+@@ -23,3 +26,9 @@ clean:
+ 
+ install:
+ 	cp jhead ${DESTDIR}/usr/bin/
++
++$(TARGET): $(objs) jhead
++	${CC} $(LDFLAGS) $(LFLAGS) -o $(TARGET) $(objs)
++	ln -s ${TARGET} ${TARGET0}
++	ln -s ${TARGET} ${TARGET1}
++	ln -s ${TARGET} ${TARGET2}
diff --git a/media-gfx/jhead/jhead-2.97.ebuild b/media-gfx/jhead/jhead-2.97.ebuild
deleted file mode 100644
index 76ae79ab4249..000000000000
--- a/media-gfx/jhead/jhead-2.97.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Exif Jpeg camera setting parser and thumbnail remover"
-HOMEPAGE="http://www.sentex.net/~mwandel/jhead"
-SRC_URI="http://www.sentex.net/~mwandel/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-src_prepare() {
-	# bug 275200 - respect flags and use mktemp instead of mkstemp
-	epatch "${FILESDIR}"/${PN}-2.90-mkstemp_respect_flags.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc *.txt
-	dohtml *.html
-	doman ${PN}.1
-}
diff --git a/media-gfx/jhead/jhead-3.00.ebuild b/media-gfx/jhead/jhead-3.00.ebuild
deleted file mode 100644
index a2d8d93f35bf..000000000000
--- a/media-gfx/jhead/jhead-3.00.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Exif Jpeg camera setting parser and thumbnail remover"
-HOMEPAGE="http://www.sentex.net/~mwandel/jhead"
-SRC_URI="http://www.sentex.net/~mwandel/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-PATCHES=(
-	# bug 275200 - respect flags and use mktemp instead of mkstemp
-	"${FILESDIR}"/${PN}-2.90-mkstemp_respect_flags.patch
-)
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc *.txt
-	docinto html
-	dodoc *.html
-	doman ${PN}.1
-}
diff --git a/media-gfx/jhead/jhead-3.00-r2.ebuild b/media-gfx/jhead/jhead-3.04.ebuild
index f5953484db7e..4cddaa652eab 100644
--- a/media-gfx/jhead/jhead-3.00-r2.ebuild
+++ b/media-gfx/jhead/jhead-3.04.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Exif Jpeg camera setting parser and thumbnail remover"
 HOMEPAGE="http://www.sentex.net/~mwandel/jhead"
@@ -9,15 +9,9 @@ SRC_URI="http://www.sentex.net/~mwandel/${PN}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
 
-src_prepare() {
-	# bug 275200 - respect flags and use mktemp instead of mkstemp
-	eapply "${FILESDIR}/${PN}-2.90-mkstemp_respect_flags.patch"
-	cp "${FILESDIR}/Makefile" makefile || die
-	eapply_user
-}
+PATCHES=( "${FILESDIR}/${P}-mkstemp-fix-makefile.patch" )
 
 src_install() {
 	dobin ${PN}
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 7e943766fcc3..6864f902be87 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,3 +1,5 @@
 DIST kphotoalbum-5.6.1.tar.xz 11773808 BLAKE2B c69cdc0afb455af64fe0624208b6bff34813a8f0341a4d3f21b7dc0462eb51f01574656028de497527c57a7ed70d1ab9dd6fe451ecec1696f09cfa8531dffe77 SHA512 fa1f4d566cd99e8c434b6e1fe28d8910b3b9c6aa05947ffbfa1b2b8efdab76f243f4b12883586e0c6692bfe54763a285374e16f3ceb23051619fe9b84cd58ea7
+DIST kphotoalbum-5.7.0.tar.xz 11784500 BLAKE2B 61b295178bac0724b1212c40ddb4178147183b7d982213077c82681e7480fc8344d5467851b839d06521f89bd8858a6c4727824e95ea712bb28c6e1bb2ce428d SHA512 36153fd946c7819540b1867a24b968103f7101d1d9ddc49a09b70df4b419380875b3016863417ba8326b50fd844d255888cd5b6f2d4ecf1e1a607d0c97e16851
 EBUILD kphotoalbum-5.6.1.ebuild 1726 BLAKE2B 3e2a2d490d50f51bc001838ec0413186b2758b520a2194c78ddb967e192fb45f8f94d4d3b78265186fc947964b7bb84e418dd9d183d041304cfd849c61774089 SHA512 85cc82a95bc884ae00139c4a5ddb9aba18a871eccb3e810d4a7a9ca2876fe2c53908b9e32c06a6fe76a9513f449f6a3c5cd65b4d111a3fcc336d7bb85363b372
-MISC metadata.xml 524 BLAKE2B 9c5dbf76aa448c13bcd650ca6487650f85aa1b961f2c39555cfe97bb94959d79d1c15f9d2836473c564d35a370b2f36efafe29ca8ebf18d97c02374648af9078 SHA512 b8147da9bc6da4da7d9603be758780f6244aa78979f1e2e7bc8f4b578b16cf798b449221b3603c39186fa84c17227ba3fc4976748285ea04ecaf4e3e71cd8f00
+EBUILD kphotoalbum-5.7.0.ebuild 1576 BLAKE2B 9a93f696574f0209009971795379f980af38486627ccd01f74461b85d7c27437f904e4fde94e7b9012a4d5d8fedec492e4ff897bfca55e6f603bdc51aff77142 SHA512 8d7292249f60b3be33317f70bfdd10248da3dc8199647339c695ab140ebfd4bae6bd5813638ae20c10ccf390e17d8842115677e719a76600d132aff4853fb4b1
+MISC metadata.xml 520 BLAKE2B 209e6366254c9c863b1e5c3e850d914b83914a701e0615dbc6fcbdb2c30afc293f4649733a85dd8aa6827a3706c75447954eaa1d1d0eb4430fbc6c8d91a8475c SHA512 806029907a110b1936e6db79513a194a5e94bb195c917dbb700d479bf54a944993d1d0e8379e994c2b5feb05ad7ea495ad70a02e68fe638c5891e24801ee09d5
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild
new file mode 100644
index 000000000000..dfafce49dc68
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Tool for indexing, searching, and viewing images"
+HOMEPAGE="https://www.kphotoalbum.org/"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+ FDL-1.2"
+SLOT="5"
+IUSE="map +raw share"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	media-gfx/exiv2:=
+	media-libs/phonon[qt5(+)]
+	virtual/jpeg:0
+	map? ( kde-apps/marble:5 )
+	raw? ( kde-apps/libkdcraw:5 )
+	share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	media-video/ffmpeg
+"
+
+DOCS=( ChangeLog README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package map Marble)
+		$(cmake_use_find_package raw KF5KDcraw)
+		$(cmake_use_find_package share KF5Purpose)
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/kphotoalbum/metadata.xml b/media-gfx/kphotoalbum/metadata.xml
index ecd49551d433..f0dad21bde3d 100644
--- a/media-gfx/kphotoalbum/metadata.xml
+++ b/media-gfx/kphotoalbum/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="kipi">Support for the KDE Image Plugin Interface</flag>
-		<flag name="map">Enable map display support using <pkg>kde-apps/libkgeomap</pkg></flag>
+		<flag name="map">Enable map display support using <pkg>kde-apps/marble</pkg></flag>
 		<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 0461eff07364..17c7cedfbbd7 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -5,5 +5,5 @@ DIST libimagequant-2.12.2.tar.gz 75611 BLAKE2B 23f5d3666fd21696d4f4dab9db3669642
 DIST libimagequant-2.12.3.tar.gz 75866 BLAKE2B 857a0e3f0187251e37e0c7f4f5f5cbf49266e4eb9f684118705778d9469330cf95780ea11b83d19e28251f047a7e9b8e7ac32ac4d9554cb5d9e1b3230d39e796 SHA512 4818b00b6f154407f3e402d56f4891c2d7594c8056fada0402d7fa0024ae50127340dd8295da5f5dca13fe1829670a3fa8793aa528f3e74a2294c9a7e37b7257
 EBUILD libimagequant-2.11.7.ebuild 1147 BLAKE2B 41943e15f697966749897fd14aec98dec919ce81189ec5f481517d14eb94a91b95b0b0cdc9f057854a745a2fea5ccf094411900db06eb54dc6aeba410521e871 SHA512 ec8d4ce66233a74974ff6edb4c67dcf5d7f12f4535001bb770d70a995cc5a9b2600f900777fc1996335d49f85efe10a3dc21e547c2b535c68720ee455ec4352f
 EBUILD libimagequant-2.12.2.ebuild 1402 BLAKE2B 78bc0307ce586509b1ad63f39c8defb47ee4e94624db279954a11ae0fca2b7511f1ba018f1c3ab72e26e89c29fe81b0c7ad8ae05f142dbfccbaa24793bc90e6a SHA512 f97cbf0ae7c7d293c5340fd996909229ce9cc5664f2f8aaf5409363d7f16e8a45313e8650f908a1965fd7445b931d09c643408b155409dd0fe9bdb91257f304c
-EBUILD libimagequant-2.12.3.ebuild 1404 BLAKE2B 078be497e18f0c0c5c61354a2704ae77dba51d4ff61d1115b46b01bce40f92ff52b3e91ba5206688595a75ffa3556fdaa2bcc3f4077f442cfbb0a5285a049491 SHA512 3051828e6f6767a9ded271a87e1c2a1aa240ca702893eba873863432408b180e77ba550f18b448f09ad5fcb2797d2f511beda25c11b2e757b8e6aff0cf8ae6a2
+EBUILD libimagequant-2.12.3.ebuild 1410 BLAKE2B 5e7c09cc1ea3218fc56e25d053409bf99112c567efe1ab9046b817f20703f06d3b7bfd8112be02b07882e3f32e9b660adcd57400fc0b3aaa555a1661eb5e10ea SHA512 06156624711397f8e90faf24040bdb9c877495d939e5a9b157152e5b827b00175a7d1dfcbe6bffc307c720a3b84229bcca8a037720d1f609e55f6c8402e6cec0
 MISC metadata.xml 430 BLAKE2B 026b07580a573d4221658d920a91ef9a48b74b1b3314250413e16027fb45ae30589ae800f064f8caaf3117b6e9439202554f04394fa3d30d419c61e8a60dd588 SHA512 968098402f9783f65232dda56e60013050eca50176347beb3f40814509f9540879480ce9dd5480c62f1ae9ec9e3059414b620314bff611830d4148974cbb1e5f
diff --git a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
index 85941dfd3408..b434e3e4b783 100644
--- a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
 
 DEPEND=""
diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest
index 469baec9341a..e634099c8560 100644
--- a/media-gfx/lximage-qt/Manifest
+++ b/media-gfx/lximage-qt/Manifest
@@ -1,5 +1,3 @@
-DIST lximage-qt-0.14.1.tar.xz 78960 BLAKE2B c58e5c553e2803cd8d40d807cd1650b72e4de6297f29cdffce19cf3eb402d01735d869ed4e31e9c28ce03e09038628331cc547aebcb636c34dc936b349e33c9a SHA512 61286ade177a41d954e7b624b9f1320dc64fe6ef5ccc5ffbde5edee1e8cb00f3691b6a04f8eac4314b3fb622ba0613eb4d1851358f3a8c12e4a69d990c1ce3cd
 DIST lximage-qt-0.15.0.tar.xz 91444 BLAKE2B a5ccd9afdd4ed1ec60a5da8ec3390e5d93f018209ce62a1fbf929c6984a056539751f576a15e0b81e4f1ba003d35379791066832f02a45de1a5d5e8e8eb8f0b2 SHA512 980fc401b31c5d937877ef35211892984def150a6db6072d9752fa78588ea8ca0827beb5880d46775092c42e93358d3e494e045a50756931129402ded4ecab23
-EBUILD lximage-qt-0.14.1-r1.ebuild 880 BLAKE2B 6e0b004d145d58c7911121792ca6aa753082f2e837bc69e843da0ffd79f181e373be0ee30af2f83aeb0da6b108052d0aaea19bbe085dc33d63d5ce5d03714df4 SHA512 f22a745bf069d539393f4f677311cf859c92d3514a5fefa24d660118e99d83aff97553337463df7e937a3812d02821c5d7496d3fe15741e362faccc81ad3b4d8
-EBUILD lximage-qt-0.15.0.ebuild 855 BLAKE2B 17b5d05670a5f5dfc0f240ef8923c17123351974f83a1128ab4616e0b59c5be29fb3e85fc863f990f8bfc943821e725be377e57eac02fe1055d183021d1383b3 SHA512 501623d4e58afa35f7049b64bc6aa19613b7ab74b5f5759fd549fe13cf93e74ef6e334da2e56817ed97fa5f45f4637bf6ff45044e15cdacb9b58d63755dc79b3
+EBUILD lximage-qt-0.15.0.ebuild 959 BLAKE2B 4c3c897be70d6fc8742774536ce838d2d06860530bcf15ee893892aebdad64a90d13d16f2ca259113539233996041ff9d2b86bdf3c6fb88f67c9f9766054bc95 SHA512 9353543981a42e1574c82b146c6bbed904bb2fd57cff2e251ad347c8ce8d2a7e6964dd2bc745f09e7f5107833464bf82c11d81bf4452f5430efd87289672a630
 MISC metadata.xml 316 BLAKE2B 4efdea74e716c40a0a63878d175f612e550669866bada61cbc0b22d5320a7bbb6a7158796bd5337e71c8aa70d42a977142d9466ac42fbb91f5eb2adcd83fb714 SHA512 b3cad1b8550e54a57940f2cea14c38bd714da71dc772ae073065c6c56c5d4d02a7258dc3ffc226a194d290e7b968a198fa07b02f6c011282896f9ba7173c3c53
diff --git a/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild b/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild
deleted file mode 100644
index 01f612776a8a..000000000000
--- a/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.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
-
-inherit cmake
-
-DESCRIPTION="LXImage Image Viewer - GPicView replacement"
-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://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.6.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.12.0:=
-	x11-libs/libX11
-	x11-libs/libXfixes
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
diff --git a/media-gfx/lximage-qt/lximage-qt-0.15.0.ebuild b/media-gfx/lximage-qt/lximage-qt-0.15.0.ebuild
index a0ad4a567157..d798b41b727c 100644
--- a/media-gfx/lximage-qt/lximage-qt-0.15.0.ebuild
+++ b/media-gfx/lximage-qt/lximage-qt-0.15.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake
+inherit cmake xdg-utils
 
 DESCRIPTION="Qt Image Viewer"
 HOMEPAGE="https://lxqt.github.io/"
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	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"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"
@@ -42,3 +42,11 @@ DEPEND="
 RDEPEND="${DEPEND}
 	!lxqt-base/lxqt-l10n
 "
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/mcomix/Manifest b/media-gfx/mcomix/Manifest
index be93c52d715d..ed2f9afcb24d 100644
--- a/media-gfx/mcomix/Manifest
+++ b/media-gfx/mcomix/Manifest
@@ -1,4 +1,4 @@
 DIST mcomix-1.3.0_pre20200206.tar.gz 3292571 BLAKE2B ad76316020645495042d27bf831588e628da11077efe29b302a57be4e688558b4db8d3f850200bf4a54b84b428a16a52f88ea5e20be85b628ef3630a5f624643 SHA512 c98d4a7022993af3a5c0b5425df52f14b586549472bcd4576a72039c8c6d4fde31df4255df45ab7467acb0280bda02b92d4803b7f92b7c1c818b58df7b52a3ff
-EBUILD mcomix-1.3.0_pre20200206.ebuild 1794 BLAKE2B ee1d2db9785b22c23a6a04f74e372a7424421691f69502910e75a05e27172ab246eea29385315e2433f4d24917d06475d89d8488a7489fafef9fefd04098eeff SHA512 9211f7786603df2d7c7ea21c8179d958849ecd7852e5d79f088c078e522598e4170cbc3b9bd05b873be5a253b5e2d958f07c7c43de83c5f4fa1a590cba306ca1
+EBUILD mcomix-1.3.0_pre20200206.ebuild 1801 BLAKE2B 9503275bf00c885a3549dfdcd168013b6c11bca743ae339e0865db26b2d2985cd8c50d3f6b47c69e63d787cf41faaebb260e4a8e828c0116609a163aadce8743 SHA512 90d21b3e9b83c3b97a713f94155c9b914a5716d4b9443139ee0824fca03538549be6706e2a02a14762e04875189d0b9fe9d9666dec3408bf95b90ba09291616f
 EBUILD mcomix-9999.ebuild 1646 BLAKE2B 1d3b03cf2a5584f446b8b59501c044be9a7c4a10fd0aa20e8fa2f8fcd71f24c0e4a7b3d24e90e9ad152eccb639daaeba8aecb6e92724e5e6429f5e8fd367434c SHA512 3c5f49c2808abbe48dac1ff1ab6f2d92bf48e8882c972c325c2ab78a6ab4a2120f8c32a32e78bfae73da31fb78aec38e1d854737b8b9032592567fb71ae5e4d6
 MISC metadata.xml 397 BLAKE2B 35568ccc8d25ece0069a6f8c404ec0a15f6709dbdb13f235c262f70ddab42ef3c3c431ac989c5ccf2c64c924dd22b1d830c8971576ca11f2358050eec98f138a SHA512 72c698bdfa865d64cb9062e7247fcb0b11195a72d19ad83f7295319a665c4b2a36f4f33cf43a84cb03c3308101a0aa4bf0185756c6cc0bb8a14637cefeb33d97
diff --git a/media-gfx/mcomix/mcomix-1.3.0_pre20200206.ebuild b/media-gfx/mcomix/mcomix-1.3.0_pre20200206.ebuild
index dcc3df6bb40d..3e3e5684b3a7 100644
--- a/media-gfx/mcomix/mcomix-1.3.0_pre20200206.ebuild
+++ b/media-gfx/mcomix/mcomix-1.3.0_pre20200206.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/multiSnow/mcomix3/archive/${GIT_PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/media-gfx/mypaint-brushes/Manifest b/media-gfx/mypaint-brushes/Manifest
index ee3c9876b08b..344ef5c1a081 100644
--- a/media-gfx/mypaint-brushes/Manifest
+++ b/media-gfx/mypaint-brushes/Manifest
@@ -1,3 +1,5 @@
 DIST mypaint-brushes-1.3.0.tar.gz 2447093 BLAKE2B 26fc22ef7669f5d88b1cb2bbc4562baffe257c112baf4a782f5045becd17a0bea577f79f290ae51b38cb3030478ea9d2e251033cc95101caacc823d139fe4ce1 SHA512 f8e0050cd700358d75cd25e40acd73905e2a53f21c6177cf67e8012aa4fbba8dc445109f07601c3846f95532a40feff4441081c0aa4e958049fc0ed8008fb414
-EBUILD mypaint-brushes-1.3.0-r1.ebuild 548 BLAKE2B f216508dd44e7d4a657e8dd30a0b136ad895b326cedaf0bc68c3c19537c22907d253ea0390a7c18363d2e097f7f348d8dc751400849cf21da5fe9b882fa34c55 SHA512 80d06275b8428302f71d29626847ec3b69cfa87f12fcac34a8e3d91d57119ba7a85eff76dbdbac8aec580fa28713ebe15def07259aff98898279483b9a851dda
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+DIST mypaint-brushes-2.0.2.tar.gz 1564926 BLAKE2B 68a244f42cd5d9b1f96466f5409f0c7ebae257f6dbbfdc5139cb9fda86ee4898ce8fda2a35e96f3a65f41333f7f689edb85445bcd88dc0fc4b428d05ba2870fe SHA512 89cecd9d78f4de84ada97a3e33fd67b86dfd259880da15c0ecbfad0fceb8c3b0e93790f3c0bff0cc375959bdf6921b01d1f3646e27c3f961715219a349017556
+EBUILD mypaint-brushes-1.3.0-r1.ebuild 558 BLAKE2B 6850bc1a3e94d52faff03b029efaa481e4f1cc436053fa96499994450ee486c4276bcae2db56ac997ac40fd3eff8c914fa1a0b8ccd55947d0906a6db182180fe SHA512 ff4b72bbae9c2fa8b217de2513b186a75865bda8dba2acf19db7c93f0da126c068983f88737f3ef3d4e30f6b48a98e59f4f4e65955ac7aea439aefeab7a83f68
+EBUILD mypaint-brushes-2.0.2.ebuild 553 BLAKE2B 320197832af961ca357cf01bbb4976e887894b5e29880cb98433f601ba680fb8c64f668ca54cd3460aec12f0680246388c6af88f0a0f541c9269b139de2c7763 SHA512 f290dccf6b5fedd71e81dd4ba71e09ba308d90083f4842a14b68b0e9511c3c0f170be4189007a74d72d84bb5813fd7c270b871cb45fbf19e27c461e23dc7c4d9
+MISC metadata.xml 191 BLAKE2B 8bff04ca02f4930d6f77dd32df009c145cacaad2d1cf271d91ae928f85acdccb0d73b0202a41aa3e60470ba6c7853e41ef76587601b2163f9ec249b7fa1c5274 SHA512 da06af54ba93db06f717082e3f09bbca9e17adad4b070a28131f2ffec15d0dfc82c79a3b2fb045fa33d6756c6df85254733622b0b7b1952b33d5590a71865c62
diff --git a/media-gfx/mypaint-brushes/metadata.xml b/media-gfx/mypaint-brushes/metadata.xml
index 7a38bb900964..3c58a0219fbe 100644
--- a/media-gfx/mypaint-brushes/metadata.xml
+++ b/media-gfx/mypaint-brushes/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
index fa662603aa5c..c217baafef18 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mypaint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CC0-1.0"
 SLOT="1.0"  # due to pkgconfig name "mypaint-brushes-1.0"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
 IUSE=""
 
 DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink
diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
new file mode 100644
index 000000000000..41606195eab1
--- /dev/null
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Default MyPaint brushes"
+HOMEPAGE="https://github.com/mypaint/mypaint-brushes"
+SRC_URI="https://github.com/mypaint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC0-1.0"
+SLOT="2.0" # due to pkgconfig name "mypaint-brushes-2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+
+DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink
+
+src_prepare() {
+	eapply_user
+	eautoreconf
+}
diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index 238b2ded9641..032578bf8825 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -1,4 +1,6 @@
 AUX mypaint-1.2.1-json-c-boolean-defs.patch 1189 BLAKE2B 7cc9728fbe01195b0c95bd844592d4fbae29a7a26758d242933ed712b940d8a893cd41bd2987952e2a817208efbffd779e9c39d4dde42d809a1e11de06a234fa SHA512 8e5815c281a6c63c7818f378d0e75a94860dd24ea69e9fff8e5951b05c407f12e2e19fefeaa559476a4dab46c88eab8821eff061e8c8eadd1f3ce150e42563c2
 DIST mypaint-1.2.1.tar.xz 37897196 BLAKE2B 2d8f6b03f710febae1c2d617a6e542543786be384585ae8a973604da2eba8a0fb770d185aa3d2dfc6f794adf29ffb9c217356a96ab27d677ebb57816f62fae9c SHA512 1783765e495b9535669a83a29d27ba684e6201fdfe0875bdd2c167b1dab8af05993b19025767fe0b2770ed9e578e4709f75d8a4820ac945812cba85609f9eb9b
+DIST mypaint-2.0.1.tar.xz 7295048 BLAKE2B 813a939f95ea6887c57d8c0868e33e9bc8b1b95746d5ecd793d4fd13a32198ee5a445cfdd2691a15e944bfb0099d6ac624dff320ae29465db5b1e0d197bedb30 SHA512 449beddcc6da5d720c9efbeac94a466ed0057bd1962d42ebb419190e8b7fd8ffd341327408467fc5da47920f9d0da1fd6d78233a0dda88de5f5d52d53d9ab562
 EBUILD mypaint-1.2.1-r5.ebuild 2016 BLAKE2B 0a00318c334adc4c97021ca1e52cb089075b1db667f0ad431fcf758345756d7d3558e50a353c8578d5749172ea4bbe396a99041c026cecce6174cb7cc6e4caf3 SHA512 5b1a703cf2efb5e0d729315ea092c58954975dedc177472467f03726956211b34744018cb3ef730f4b5a8ff2053f30218f838609ef225dd05eab21f5d8a683d8
+EBUILD mypaint-2.0.1.ebuild 1561 BLAKE2B b007519875279d38483c18cc383cbef204c138ac1b9a9b876262a9d89fefd5916f79696baee97e457de35d12ecfe1a6eae8815ea1fe4b0600a2e35cab184fcd3 SHA512 7e64726112465bd52a907700ba5db4f1acbbc04e8f9599a772694850ba29e1523bc170943380cb6a1fb5abd943f87e1e8a4b2c2e2650c5b1b81af70bff68e08f
 MISC metadata.xml 247 BLAKE2B 3a8d267e6befd2f46c41982b7196470f32b4fcf5dc6a42ead10b13e81bdcb7975ea998a51d0deb2c3c1a49f00b5f9216d8e43ad7e6dd0aea0f3352b19532d0a0 SHA512 21b957bb801d29dfed1d0aeceac553c9ba039a7fe94ebf899e7ab5c3316bbad116c7bd63a07ccbbb8277d2ce19f27b964499d2ccd942028290519e465e989dbb
diff --git a/media-gfx/mypaint/mypaint-2.0.1.ebuild b/media-gfx/mypaint/mypaint-2.0.1.ebuild
new file mode 100644
index 000000000000..cb35547d5db7
--- /dev/null
+++ b/media-gfx/mypaint/mypaint-2.0.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit desktop distutils-r1 gnome2-utils xdg xdg-utils
+
+DESCRIPTION="fast and easy graphics application for digital painters"
+HOMEPAGE="http://mypaint.org/"
+SRC_URI="https://github.com/mypaint/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW"
+
+BDEPEND="
+	dev-lang/swig
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		>=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+	')
+	>=dev-libs/json-c-0.11:=
+	gnome-base/librsvg
+	media-gfx/mypaint-brushes:2.0
+	media-libs/lcms:2
+	>=media-libs/libmypaint-1.5.0
+	media-libs/libpng:0=
+	sys-devel/gettext
+	sys-libs/libomp
+	x11-libs/gtk+:3
+"
+DEPEND="${RDEPEND}"
+
+# Need to poke at failing tests
+# Dying on a numpy assert
+RESTRICT="test"
+
+distutils_enable_tests setup.py
+
+src_install() {
+	distutils-r1_src_install
+
+	newicon pixmaps/${PN}_logo.png ${PN}.png
+
+	local lang=
+	for lang in ${LANGS}; do
+		if ! has ${lang} ${LINGUAS}; then
+			rm -rf "${ED}"/usr/share/locale/${lang} || die
+		fi
+	done
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	xdg_mimeinfo_database_update
+}
diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index e255c62281f5..03f5d4abe8a0 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,7 +1,7 @@
-AUX nomacs-3.12-gcc9.patch 1098 BLAKE2B 70e4900d2670b9e4ca9f6ae12f4720a0bc25eabdf0ba09729801428cd6f12d5655db15c3ee3a9c2e5c6f5ae5cac6cf77fd6d1730a39ceda8a713a32f989bed8e SHA512 d653c666345f50c83f199aaeec61e4e481124787f5dad53d89ed06f920e0f20beebb4a56e550665c61af3b1718d6fb24092f98b7f0d99e6ab6eb98d5995093be
-DIST nomacs-3.12.tar.gz 1736648 BLAKE2B 533e18dec4be5d945213ccd629262a2cbae1eba93599f43be0a98d32d0b54d9caad7d963809f2fc9bb5c1ba682a39f44763b5d04e50c6e86658f6cd84324f3d2 SHA512 4508354d48a6115cd40f701cc90cbbcb84490e99eaac0295db48f6fea99550d5e2b3e7365128d0c9cc4eeb621906f55e275603d84cb8b6bb164d0b5e2e192119
 DIST nomacs-3.14.2.tar.gz 2169504 BLAKE2B 6050ddba3ddbdeb7d1fbd29831d5dfbee066b61398ef46be4145a287d565eb2d55d59f47bc9e9e34a10379f8e0e676ca1f5373389a0d35c27fe85cff5da3fded SHA512 58104c85078bdbff7f65625658bb01b152631470eea93a43494eed55ae5e2441b7bcf3ed6c8f1aef07831bc99c80af94467fcc0e15dc1d282ef313bfcb3c81e9
+DIST nomacs-3.16.224.tar.gz 1932366 BLAKE2B 4a2dc6ef70b0ae5dc9c9397bd2c88ede0db2bb8660e1907d08b36c4a9cf5a9bd151180aa4b2d6b5f529c1786004a6621eff88fa4bc851d60835e8ba6d6269602 SHA512 7ca8e713eedd71bc3dd3804a9a09ece15badb74949b155ea4da72a0ea129be173c8d0951604a6139d4490525cd420da8635773c11f0d133f666a48dcd9064257
 DIST nomacs-plugins-3.14.tar.gz 514472 BLAKE2B fe8e1608c0a0ed502ea82efe80a9cfab3a9aff3ca7e8cbecfcb199377d137f5c19ad176940ef1f1109938634af3548008da1311339e6da78b8b5b983102bebb6 SHA512 c0bca87e50b7b91d80a9d6afd95eeb1d6730b17b9a28ad4109514b36c42781b3f67b25f68f48c0953110d1e02bb03762e813af9c1ec2851c072b4aea74969cbd
-EBUILD nomacs-3.12.ebuild 1303 BLAKE2B 8d57bf7614e38a998b4e06e58d6fb8579b71308d1b16b19672316db92e8b41d7895fbabb9817a29436e6d692b5e6f6b9d97f0b0d0fe36361e294613c001f3bf8 SHA512 295dd7047ffee76e074411f26dbdd8f8288ff667cedd104cf3192ac8d196fdb12274c377a7c53cf97dca201674865eb9f66300d49054fcf3289d33f00255e8c2
-EBUILD nomacs-3.14.2.ebuild 1930 BLAKE2B ff33cf895e5dbe243344a2b74d1fa744eaa85ec878181a15f048ec664827b2dc8a0af93fe780350cf86fea5474f3e8e567b5dae36908fada0681098b577f824f SHA512 7b42c86df5921bca0d95d5497742b805743a981e4772940de69a6a528353d51ff30c0472f6f4a960ce808c62235e5a8b74c7e4f75e36321e4c4864b39cf69d1b
-MISC metadata.xml 575 BLAKE2B cfd30ae66e512ded8e2a2c9fe4cd1643802d4604c7e6cbbeda71961366ba7231a2424e56ed269dfa7c7216346690a960cda65a4a1d956e6a842f8a5a8eb86ef2 SHA512 067aee95572e8ce05d9cd31fd21cac89469a785772abf1086ba532c00c042aff074aeef62faced8b4de46bf3ec210c35d3b213f06c5ca6f1fcf2090096c3bc57
+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 1852 BLAKE2B 4a32c5476b1c383df212b0ecd68a53d11b5258c5daa7385802a08520eae6b9a866c35afb9c18aa00e60f821b38663896943b7ec606a8351720fdfe36967117cc SHA512 122cd0267ec28982d5659471ad0d241e5e02f0ac4a2cb94e6fbc3c8512433a61ae22b4b60616c387698d4e561707faa8e08c41aef886f23f688a164b2667d411
+MISC metadata.xml 594 BLAKE2B 3e4f800e489a388987f8942f433fad19e378644cb2aecd66d7eacbca167fa12597967bc4bef21260d266aa5553c1b103cc4df8167fbba8655a346e25100e66a6 SHA512 2f3ee7d525fff3d6ca2793d96555dcfba34df5b15cd2879e640aa51b5ccd34e2f466c2a5cceab90050af8c3d668c2d57fd88c136d830343da7313c8eaea247c9
diff --git a/media-gfx/nomacs/files/nomacs-3.12-gcc9.patch b/media-gfx/nomacs/files/nomacs-3.12-gcc9.patch
deleted file mode 100644
index ccf6ea31d9d5..000000000000
--- a/media-gfx/nomacs/files/nomacs-3.12-gcc9.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 37805e3bc8753970127db101f4aa0c061bc5a70d Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Sun, 9 Jun 2019 19:15:28 +1000
-Subject: [PATCH] Fix build with GCC9
-
----
- ImageLounge/src/DkCore/DkMetaData.cpp | 2 ++
- ImageLounge/src/DkGui/DkNoMacs.cpp    | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/ImageLounge/src/DkCore/DkMetaData.cpp b/ImageLounge/src/DkCore/DkMetaData.cpp
-index 7540f7b9..fe2bc7ec 100644
---- a/src/DkCore/DkMetaData.cpp
-+++ b/src/DkCore/DkMetaData.cpp
-@@ -42,6 +42,8 @@
- #include <QApplication>
- #pragma warning(pop)		// no warnings from includes - end
- 
-+#include <iostream>
-+
- namespace nmc {
- 
- // DkMetaDataT --------------------------------------------------------------------
-diff --git a/ImageLounge/src/DkGui/DkNoMacs.cpp b/ImageLounge/src/DkGui/DkNoMacs.cpp
-index edda14cd..8fcdb59c 100644
---- a/src/DkGui/DkNoMacs.cpp
-+++ b/src/DkGui/DkNoMacs.cpp
-@@ -99,6 +99,8 @@
- 
- #include <assert.h>
- 
-+#include <iostream>
-+
- namespace nmc {
- 
- DkNomacsOSXEventFilter::DkNomacsOSXEventFilter(QObject *parent) : QObject(parent) {
--- 
-2.21.0
-
diff --git a/media-gfx/nomacs/metadata.xml b/media-gfx/nomacs/metadata.xml
index 17d5f3794443..5d40018fc73b 100644
--- a/media-gfx/nomacs/metadata.xml
+++ b/media-gfx/nomacs/metadata.xml
@@ -12,6 +12,6 @@
 	</upstream>
 	<use>
 		<flag name="opencv">Build support for <pkg>media-libs/opencv</pkg></flag>
-		<flag name="plugins">Build plugins</flag>
+		<flag name="plugins">Build officially support plugins</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/nomacs/nomacs-3.14.2.ebuild b/media-gfx/nomacs/nomacs-3.14.2.ebuild
index ff12e28b2c9e..399cf622d2d9 100644
--- a/media-gfx/nomacs/nomacs-3.14.2.ebuild
+++ b/media-gfx/nomacs/nomacs-3.14.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE="+jpeg +opencv plugins raw tiff zip"
 
 REQUIRED_USE="
diff --git a/media-gfx/nomacs/nomacs-3.12.ebuild b/media-gfx/nomacs/nomacs-3.16.224.ebuild
index a527bc46b3e8..3d0a8e506dd9 100644
--- a/media-gfx/nomacs/nomacs-3.12.ebuild
+++ b/media-gfx/nomacs/nomacs-3.16.224.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+PLUGIN_PKG="${PN}-plugins-$(ver_cut 1-2)"
 inherit cmake xdg-utils
 
 DESCRIPTION="Qt-based image viewer"
 HOMEPAGE="https://nomacs.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+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 raw tiff zip"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="+jpeg +opencv plugins raw +tiff zip"
 
 REQUIRED_USE="
 	raw? ( opencv )
@@ -32,9 +34,9 @@ RDEPEND="
 	raw? ( media-libs/libraw:= )
 	tiff? (
 		dev-qt/qtimageformats:5
-		media-libs/tiff:0
+		media-libs/tiff
 	)
-	zip? ( dev-libs/quazip[qt5(+)] )
+	zip? ( dev-libs/quazip )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -45,7 +47,19 @@ BDEPEND="
 S="${WORKDIR}/${P}/ImageLounge"
 
 DOCS=( src/changelog.txt )
-PATCHES=( "${FILESDIR}/${P}-gcc9.patch" )
+
+src_prepare() {
+	if use plugins ; then
+		rmdir plugins || die
+		mv -v ../../${PLUGIN_PKG} plugins || die
+		# Fix nomacs-plugins installation and search library directory
+		sed -e "s:lib/nomacs-plugins:$(get_libdir)/nomacs-plugins:" \
+			-i plugins/cmake/Utils.cmake || die
+		sed -e "s:lib/nomacs-plugins:$(get_libdir)/nomacs-plugins:" \
+			-i src/DkCore/DkPluginManager.cpp || die
+	fi
+	cmake_src_prepare
+}
 
 src_configure() {
 	local mycmakeargs=(
@@ -53,6 +67,7 @@ src_configure() {
 		-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)
diff --git a/media-gfx/openexr_viewers/Manifest b/media-gfx/openexr_viewers/Manifest
index eee6d2f98f92..52d355a0a162 100644
--- a/media-gfx/openexr_viewers/Manifest
+++ b/media-gfx/openexr_viewers/Manifest
@@ -1,5 +1,5 @@
 AUX openexr_viewers-2.3.0--with-cg-libdir.patch 811 BLAKE2B 0f2789e55efd1cd25308abfde02bb67fe77a099a509a4bac78eca078de6b18e326705718db061338b4881414e688fa307d70d132a0ba0ff72eaade127234b732 SHA512 02f579d246936f1ebb8e6afa36e21c10cc6fc7eb1a24e168b75c27aafc6a6abccead8e9879d1128a1d6f22ddab4162c97c2df5940c6b71cc6d6fc2cb89527bda
 AUX openexr_viewers-2.3.0-fix-configure.patch 2449 BLAKE2B 226728e4183784337ab684b9245f74110772156fea1b4be8441c7bb14fe2887484691c200e05604f9308204c9221d5b7e7f3c343e5db3cdf0a8896fb13fc5590 SHA512 29a22fee7f88ce1359e74185f8baffa9e734f20555943cced71c198f5c716ab8f8aa5686f11f40e5ebc10911cb82453b784eeac06632f6700d8f4fd3a9ec5e1a
 DIST openexr_viewers-2.3.0.tar.gz 532154 BLAKE2B 353c69a6efbdab6ef7669f531be22b34c11cce3cc790b513eb99d323fc5e1827cb4b0656eab2db61ee89f01c02169c3c855cc4222275964156f31928ae08e015 SHA512 2b7ce7c75733f390bec5c3f9c49edc08da2631e3a45ae20a732dddf9fd813137c3124d0c6e90450fa2b9068f0c40c76374ee7ff9cf0d8697080b2b180c624c5d
-EBUILD openexr_viewers-2.3.0.ebuild 1297 BLAKE2B 366ce7f6a04d538af8f576c772ca75a4ec358472fe6afa247b51a778d5a924a5f23a80daae9ea4b5a04e8eb418b63d38fee8692c4f6e2c68faf848e2e7fa1f94 SHA512 142b637cc0daf7dcefc6eee6afe2e3d347dfea66be64b9cd1d05e63618d47309d88e130e7516844b3e0386c52b07aa0c07908122713bdf6fdcd4c03f437deaff
+EBUILD openexr_viewers-2.3.0.ebuild 1302 BLAKE2B 41ecfac33b3bcffed0b173914aa9f0794d91c0488714b2bfffdca25e5d212f1b7a6b73b3dfcfef7f7b2c96e35d4b3ff7847e86d9ab76c1fbea5130544113ab70 SHA512 7245b8b44d28f53b437fde3a46ca37dbf8c6846983b02c45297b4b4a7afd77dcc748bd1bceebd437963faf8fe9a8d880740fc49e6e0d46a7c40462f609947f0d
 MISC metadata.xml 379 BLAKE2B 3f58950f3fccc797478abbd2b60325904cc3288586e4a180a366e0b99bb7ffa4a08022138c658b3e0db861a720232b44b7bf4bb2b2bdb7f59856272961e1c6c8 SHA512 97d3ed7e0ee8f419d36df6b6ccc3b3e704445935b76fab412b4287ac1b88688591f775927e1cc333a85a64818cbe1c9c3e760d2ab734215c0f558639ca033b6a
diff --git a/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild b/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild
index 89816e0f3c15..3c0b4ab63350 100644
--- a/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild
+++ b/media-gfx/openexr_viewers/openexr_viewers-2.3.0.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
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools flag-o-matic
 
 DESCRIPTION="OpenEXR Viewers"
-HOMEPAGE="http://openexr.com/"
+HOMEPAGE="https://www.openexr.com/"
 SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index d1584fd95e70..1f221e2d4b78 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -6,5 +6,5 @@ AUX openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch 822 BLAKE2B
 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 2061 BLAKE2B 8f0bd7a761adb86a9b627030f2f00a8ebfcf763b4d0a8a7b716db6394ef242d2b8e719faa31e123cc5229a66a92e208d5bee0ffb32c29ec7f03b467ac1508141 SHA512 2085a1a5cdd1617e5e97fe3ac917c4e19745fa1320f03d0c557c2e57337fca6074428c758dfe22bf825fcd384c7a0397561784d5c203b0d805bb9b03fbadf4e0
-EBUILD openscad-9999.ebuild 1979 BLAKE2B 1a7ce40f0f06244a8b420814935dadfacc025a2d899305314bdb827be8152ef85c16069f3e036cb3df263801bc56db729f10d5410fac9b82f8d75583fab549ee SHA512 3a05e021b61e353bd25857d1e238a85f1aa1bf3d34a36ebba2d9b1ce7da578584c19a2b366247088524b1c8e6b7ad447d37d0bab380b5819162b91bcce7f0748
+EBUILD openscad-9999.ebuild 1900 BLAKE2B b7da0c8a17bcc88faa4c9367b4a664a8f58aafe8177d984001fd23ab0ea39f00f40349963691d4aa667d994761c7f60ee7bf0104c023ab43d85e51bde4349b4d SHA512 6378969e22ca27c2ef80928559b2f122e4b86df35a3858ae70537782b1f9209951fa34c55bd791f10cc23a9f0572a6305ba854f3270e4ea11eb045058e9c5b77
 MISC metadata.xml 1123 BLAKE2B d182b2b81115ec212b553802174d5305dd37af439aaafb25dd05368b1431b960cb4e35e65bec0519438e9c1ed767124fc686e293d07e5d44807bbf4ca8d74ea2 SHA512 10fda921c2d18d8e3a12d986cd2de9eebf47d9d2f843381b4ea2874d2483a42b84c6aa6c216ceb4c1ecf4183bbc8d43d7202bafbfcddc15de1bcd6b0f297f29c
diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index 4dc6fbc2617d..a718d9a9a8ac 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -17,10 +17,6 @@ KEYWORDS=""
 IUSE="ccache emacs"
 RESTRICT="test"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-2019.05-0001-Fix-build-with-boost-1.73.patch"
-)
-
 RDEPEND="
 	dev-cpp/eigen:3
 	dev-libs/boost:=
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index acd790b5ad8c..085e02467055 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -1,9 +1,21 @@
 AUX openvdb-4.0.2-findboost-fix.patch 747 BLAKE2B a9dbded82960113bc3e4f623636d446a3877abf117980abc3660703e513bbebfe70b153d5b216afbebee9ccb7edda0902cbfb88c0e702e0282b9798910e965a3 SHA512 e29ee68ffd907da86d67cf7ca8e2adb955acc1725d5d22be7e1851f2c387e17fb51b46630964e897c3b536be3f05705f86ddd70be53c2329a171a8d23dd7fd4e
+AUX openvdb-4.0.2-fix-build-docs.patch 1436 BLAKE2B 5093138c7d1dbc7177c7a956b0b9e82a7661253f29ef3d000664735190791028439b403680d220acb748d7dce063ad5781d91802444295ab32ce91685540178e SHA512 e8908dc4eeb6e4e6694c6ceabd8a5965f04d74a53ac733436e45d0e954e8732205daf149fa2d0dddbc3894c276b52ba3db20acc2c6d091d9b008c7d85ff8db23
+AUX openvdb-4.0.2-fix-const-correctness-for-unittest.patch 1654 BLAKE2B 339e70de004c4a5b626100d8db21c4bf23e20953cfadb0bd8becf64116c2f47e8f83566074df4748d1ad7642a557e18f6cb4889495dbfbc8c826dbfc023f39c5 SHA512 25098a15a014ea3e78cb61f4aebce9c217a6e1ffc650df4a372c5b0639cc08b48e24788671d885edc9ae3ed89a558a8896ece5c122d0e17f8267d6ee3bfb1ea8
 AUX openvdb-5.2.0-use-gnuinstalldirs.patch 10981 BLAKE2B 5ffdb1ec77280bc926d57fdccf9aa74db470e6031025a79e9503196bf4e4fa1984401eea8e5a7cb386545417014735a17bcf7dfc31aff79b8ef639ec82111255 SHA512 7ec960e07f1b1a81b32445e4cfc3769abb1d75d68076b825857fc12410525875bf50ba316da37d2a189d62162ad28c12530905d6c8696d1caa11b6d6752500a1
-AUX openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch 2990 BLAKE2B d6508d578fb8be689f0a6af41b54f0d8ff158a52c2b0a3fe5940cf8cbce0707f2dee8ce228e8a3a80866f6702121849f15e20af281343ff574aecfdb95eef5cc SHA512 ce91505ca64326457caea3036ff899ff58b2aac4787b7bf84581a4ee55978179f93b57bb8a82a59fcf85d90cb85679fb2ec5e2d95e8b20760159ba55d590d5d5
+AUX openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch 3343 BLAKE2B af20c099993e41a5d067146c166891ebe9bbde39ecf6329fc13d7830d6554388ca17721c44d598aa1d13db939dcdf5d1ea18a8ac9824d36c4899f3ba12ea7447 SHA512 7ffcc699342463bd79406c74b225e8c4033243f62c6d1ec6f8f0a94cc42e8d9262849dfaa1b3ed36a7818e576341ba90071a61350e7854a6993766a1fbd8f38f
+AUX openvdb-6.2.1-fix-multilib-header-source.patch 1536 BLAKE2B 8c08943217c457bf5137464f225db04aed64933f8b6e5257909d470193c5b64bce321b40029b30897967e17574514753e7787dbcb36d0e66396ecce674312f80 SHA512 331d47d2b0e41853ef6ce2d652e3ae3524f197188a0e1314b082e4c16eaffef7e34ebaf4b12e26cb519e6282bcf9747529f93ca9e85c32b4b26fe81efaa74749
+AUX openvdb-6.2.1-use-gnuinstalldirs.patch 1583 BLAKE2B 5ae011f52122231457e9dd0e3f93191d0965ae23f414459143cafb95c2b9b35d6672b095d4a94f2bb327173aa04456c7cb8248770895a8a0ca12513696ceb39f SHA512 b600367c0e431315436f142e1a4f1cffb780cedd9de16b215211109980132c60ee608c4b4f8b02605c0f55ed423f7e674bed6bea37687eb45c6f9112b54dcc1f
+AUX openvdb-7.1.0-0001-Fix-multilib-header-source.patch 2825 BLAKE2B 089bc79bbb8bd4544889c65d8bf064bf95869990778cb66595a19be402db85b569acb836b5918c902e6f6a10011a1480ef89e03636f951e30e5833eb667478cb SHA512 6968a60737b08bbec96beb8ec3796b7d99a713a798e37d8cd4015eacce7e7197b5befcd6721b310a4cdcfaca1781ab0cd7165958b14b487796a4159e9e214499
+AUX openvdb-7.1.0-0002-Fix-doc-install-dir.patch 1014 BLAKE2B 380c26e69da18479266201fd1233d19f3c39b13ee67d11cadca5bba900c470218a7563590f12a400a1f954155bfdfacc00862511ef05f3a61a54679924c57cae SHA512 21d4abf1cae31dfa8e59b6648a7c40f6f5f9572bdb87e6410144b427244ede488e059bf572344efc4e4cea91e7fb59b56364a7df6041f717db759002d09e8ee7
 DIST openvdb-4.0.2-patchset-02.tar.xz 12428 BLAKE2B 2684ddf010df975912fcfc8c4f944d9a9ba447b48750140b6c46db31d49297f7495e5c77e9d5b85af0b2e1d0c4987184865642dc95f1fb3e463e85ee5987d203 SHA512 04377d552e218a8eb31c43381ba32263ba206a0870dccda1bcc031863dfdbcc953da7ea89fd420dc1a338fbd6123ac30bac2039c0a2a01c1fa9253a3fdd0b54d
 DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d
 DIST openvdb-5.2.0.tar.gz 1788969 BLAKE2B d146b78dd7db4936779ca214b1f7957d4868bf76aedb95c9a98e21d25983b750337a63bf4bc9ccb438b683988af7a3d708676dcf7b4662c84e4926e8000ceb68 SHA512 69e21190c27a055e476a319b0c2d961303fa2f3fec30bec93ed44072d01816ef89e5e8f0abfc3a22d1c73742aa31284c664596747b49cd985fea1a751776506e
-EBUILD openvdb-4.0.2-r3.ebuild 2293 BLAKE2B c011e11315446c4ac195e98312125824a99a8017f6191e2e5e318c61304fede08dea92c9edb7f884f0ff92f859bb931ca4fc088a7c37d4480bd4dbe8ed54cdce SHA512 1fe3530d7cfa75e55f5cbdba0ca79e350506f163ef35637e7476a88a2ce8de92e6cad7bff4f6b8cd40c9b711d8c2421a845dbe07205c8d6e6608a0599214dc2d
-EBUILD openvdb-5.2.0-r1.ebuild 2028 BLAKE2B 98aec54c4d96593bc53ef61ba71b85611ac0b93c0e01d7675ec1cd759ab1ed9f8a085b793b26946068ae8a8f28f00bcccc99367041df43360798303263a211cf SHA512 20a909898f3e88d0dc2be8220907478367bf31ff365095ddfad82991f58b8796bc64821fb3385376d64c02c99afeb52e430d91f87cb5fa6f3a886a91aa8661fd
-MISC metadata.xml 1033 BLAKE2B 303f49be8253322a0bbb94875f7b9b03e127e9d2ab2eea64fbac1cd51f50d5be749c4c45c9491fbf3f56de7420fdb47913b6ef3c2d12f5ea0545042f68d990d4 SHA512 a81a1cd4684197d1d9455b1398c9ba1592d596d52c8e8fc5c0cc8de0357c1f1df7478fd76e4e42cda09524b0bbf41985e13cf530adb7ca7f1605f086207301a8
+DIST openvdb-6.2.1.tar.gz 1935325 BLAKE2B 24ca340e513d2f22521994fbb2315a1c3f817bb35a7402ca481b12444e5ced58dfd773cc07b47a56d1ed9f6951e58cf1ef0b5c35917620b031383faed21c6557 SHA512 f5d830880316b5ca3921c77c75f3a254aba47d144ac6c0223fc2732d99cbd6b7ffb7f27049f8ab3760ad77b3658fc08a82728325ba753bc29932aa46336457de
+DIST openvdb-7.0.0.tar.gz 1872744 BLAKE2B e3a8c8d51f77e115d3d397abde0860a6322d56eb6c4795c1ba39539a23aab6cf37602ce7122965fbc3098b15b118b25010263f567e8003363b78c9b7d9d5dfd8 SHA512 f5321b22b10e192012d544cc02921d3d52f621778ec5aa21ba6d450f3e29f2fdbd76486ad390a0c008394dbc6ee4aeecc04527ef30e73adf71c1a08a021746b7
+DIST openvdb-7.1.0.tar.gz 1956052 BLAKE2B 7778d67bcc65ecb17b86f6e67a9e5f2d6574de5869a0a9c675ad7bc8540154c0f249a91c68a9da9068a3951b3e919e5676450fcaf13921c6263e7c87012a2f29 SHA512 49806375f7e6d7b12eaba24e672a068531d2f8a05f12eba29069710d2682f9983f9e6ad26047eed4b28e337f8d0e738b90130582863c710e8dd1e720bf0addad
+EBUILD openvdb-4.0.2-r3.ebuild 2586 BLAKE2B 66ca91b3b90af64436d73dc7447be12ebe705c507a3232a1b41fd883c26eae08751af189e35c9ab423cb3bdfe9fd3a8321adaac9df8da58bdcb4f6aaf0926e80 SHA512 d77f6ad528a3a660fe5553c8b3d545747bd6a6634538ec1b1ceb72025d7da658cc69fa023648ab6781d38da0a9dc80ae606595e4c4bf39aaadf22f71b5c6b9de
+EBUILD openvdb-5.2.0-r1.ebuild 2384 BLAKE2B 878871d565a68418dcf684cdd2464e9bb2c7278f3d1e9b5bc3d543415cd4e00cff63f237eacf2a58af57f287bd7dd70be098a95cb1d84525ab00f662a44ab6b6 SHA512 1b129380efaa23f33fd72fee32e4454b2872afe0bf17794d79bbfd6d58ba082b767a5cba133aa8cb2e2a1b22347318279b1ab17d01f696c39e3ef68ceddca460
+EBUILD openvdb-6.2.1.ebuild 2260 BLAKE2B 5ed0e241c5d038a3c9a013f3d0b55536c06f7c407bb92d0370d84b0d95a16b4c5de168d82719f91db25a789ba9c4fb434378a12d58fa9c25b753f40d794b3d1a SHA512 9eebb465a14d9f1d6b308829cdb0bc4232dcd71df56efc346659d6074e6eac886fef2dbc5cea451c61e546cd0a9c90ea41ba6a1320a29a156a0dcb429c471105
+EBUILD openvdb-7.0.0.ebuild 2762 BLAKE2B be75e5b95da7de9ea2ef4d0db8da198ed586b82fd15aa55e777b7f8b373f7227e526c6caafab4c9d9b8ab0ffe9042198d1f18f489e179e3acd55583b514a4a71 SHA512 2d3dc65ee06f4c2493c3ecfdca53c134c82f580506ea2c0249ee66382cd6909be5cdf8f44cd737a5eb42ad01dee5e036186074c76bf409ab546eb7828247a388
+EBUILD openvdb-7.1.0.ebuild 2684 BLAKE2B cdaf61392caa2ffbfd47c0b731fac60db860710bb9e8916efb3a50476672259626fb90299b995776cccc4a072b13b8ef52b553ddde52d44289ec692cebbdefeb SHA512 c9e371eedcbbd4366d13ca045c8c35c4ff351e325174949a884333a23b8828bb01e8a1333e92cbe8fc95fb4bab404de690a0d20ecc43d9b69e91f6c881d2a6f7
+MISC metadata.xml 1660 BLAKE2B 56a7113ef4e645a3a508d025f36129c78be342117583f9cc8ba3ffda2518b04bba3d928ad1fa9e78a601a0f1d216bc1744795c170a6cd3421f22c8754f192a98 SHA512 f5e21ebf80b7179b6bd041bcdf5cc53c4aab3cf99f829d9e26e56f3eea40a9d67edf8ec09d63a39b5e1a231df9d2e57b40e008786d25ee00e8ff2ca0ab0c399d
diff --git a/media-gfx/openvdb/files/openvdb-4.0.2-fix-build-docs.patch b/media-gfx/openvdb/files/openvdb-4.0.2-fix-build-docs.patch
new file mode 100644
index 000000000000..cdbb9440a1a4
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-4.0.2-fix-build-docs.patch
@@ -0,0 +1,32 @@
+When building with doc USE flag enabled, the doc target is not built by
+default and the missing docs cause an install failure.
+
+This patch ensures that when the doc target is defined, it will be
+built. Otherwise it might be possible to fix it using a separate step
+in src_compile to build the documentation specifically, prior to running
+install.
+
+This has been tested and is required on 4.0.2 and 5.2.0, but is not
+needed in >=openvdb-6
+
+To reproduce the bug, enable the doc USE flag and emerge openvdb 4 or 5
+without this patch. The install fails as the doc file is missing.
+
+To show it is fixed. enable the doc USE flag and this patch and emerge
+again. The install succeeds and the documentation can be found at
+/usr/share/doc/openvdb-X
+
+Patch by Adrian Grigo
+
+diff -Naur a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
+--- a/openvdb/CMakeLists.txt	2020-08-18 12:17:15.261321103 +1000
++++ b/openvdb/CMakeLists.txt	2020-08-18 12:17:37.101397373 +1000
+@@ -394,7 +394,7 @@
+   FILE ( WRITE ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config ${DOXYGEN_CONFIG_CONTENT} )
+   FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config "OUTPUT_DIRECTORY=${CMAKE_CURRENT_BINARY_DIR}/doc\n" )
+ 
+-  ADD_CUSTOM_TARGET ( doc
++  ADD_CUSTOM_TARGET ( doc ALL
+     ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config
+     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+     COMMENT "Generating API documentation with Doxygen" VERBATIM
diff --git a/media-gfx/openvdb/files/openvdb-4.0.2-fix-const-correctness-for-unittest.patch b/media-gfx/openvdb/files/openvdb-4.0.2-fix-const-correctness-for-unittest.patch
new file mode 100644
index 000000000000..cb2660329948
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-4.0.2-fix-const-correctness-for-unittest.patch
@@ -0,0 +1,35 @@
+Blosc changed the signature of blosc_compcode_to_compname in 1.15 so
+that the second parameter is now const char** not char **. This causes
+compile failures when using openvdb with earlier versions of blosc.
+
+The fix, which is backported from openvdb-7, is to check the blosc
+version and cast the char** to const char** for modern versions of
+blosc.
+
+The bug can be produced by emerging blosc 1.15+, and then openvdb.
+Without this patch, the compiler will fail with
+error: invalid conversion from ‘char**’ to ‘const char**’
+
+To test that the patch has been properly implemented, emerge modern
+blosc and then openvdb with this patch, and the compile will succeed.
+
+Fixes bug https://bugs.gentoo.org/734102
+Upstream commit https://github.com/AcademySoftwareFoundation/openvdb/commit/d2e8bd87a63d1e9f66a558ecbb6e6cbd54f7de13
+
+diff -Naur a/openvdb/unittest/TestFile.cc b/openvdb/unittest/TestFile.cc
+--- a/openvdb/unittest/TestFile.cc	2020-08-19 02:11:48.945711312 +1000
++++ b/openvdb/unittest/TestFile.cc	2020-08-19 02:13:31.106074899 +1000
+@@ -2666,7 +2666,12 @@
+ 
+     for (int compcode = 0; compcode <= BLOSC_ZLIB; ++compcode) {
+         char* compname = nullptr;
+-        if (0 > blosc_compcode_to_compname(compcode, &compname)) continue;
++#if BLOSC_VERSION_MAJOR > 1 || (BLOSC_VERSION_MAJOR == 1 && BLOSC_VERSION_MINOR >= 15)
++        if (0 > blosc_compcode_to_compname(compcode, const_cast<const char**>(&compname)))
++#else
++        if (0 > blosc_compcode_to_compname(compcode, &compname))
++#endif
++        continue;
+         /// @todo This changes the compressor setting globally.
+         if (blosc_set_compressor(compname) < 0) continue;
+ 
diff --git a/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch b/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch
index c3999e54f9cf..dd0b83540aa3 100644
--- a/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch
+++ b/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch
@@ -1,3 +1,11 @@
+This patch is an updated version of the patch created in dracwyrm's
+patchset for openvdb 4.0.2 which uses PkgConfig to ensure that the
+correct IlmBase and OpenEXR dependencies are found.
+
+In subsequent versions this functionality is taken over by
+altering the directory the header files are searched for in
+multilib-header-source patch by Bernd Waibel
+
 diff -urN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
 --- a/openvdb/CMakeLists.txt	2018-08-28 12:20:33.000000000 +0100
 +++ b/openvdb/CMakeLists.txt	2018-08-28 12:25:19.807755722 +0100
diff --git a/media-gfx/openvdb/files/openvdb-6.2.1-fix-multilib-header-source.patch b/media-gfx/openvdb/files/openvdb-6.2.1-fix-multilib-header-source.patch
new file mode 100644
index 000000000000..e8cfac755d3e
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-6.2.1-fix-multilib-header-source.patch
@@ -0,0 +1,38 @@
+This patch changes the default location that the header files look for
+IlmBaseConfig.h as in Gentoo the version containg the ILMBASE_VERSION_MAJOR
+and ILMBASE_VERSION_MINOR is stored under /usr/include/chost.
+
+Without this patch, compilation fails as it is unable to identify the
+required IlmBase version.
+
+Based on the fix multilib header patch for 7.1.0 by Bernd Waibel
+
+diff -Naur a/cmake/FindIlmBase.cmake b/cmake/FindIlmBase.cmake
+--- a/cmake/FindIlmBase.cmake	2020-02-02 01:03:55.000000000 +0800
++++ b/cmake/FindIlmBase.cmake	2020-02-02 01:09:05.000000000 +0800
+@@ -168,9 +168,15 @@
+   PATH_SUFFIXES include/OpenEXR OpenEXR
+ )
+ 
++if(EXISTS "/usr/include/${CHOST}/OpenEXR/IlmBaseConfig.h")
++  set(_ILMBASE_HEADERS "/usr/include/${CHOST}/OpenEXR")
++else()
++  set(_ILMBASE_HEADERS ${IlmBase_INCLUDE_DIR})
++endif()
++
+ if(EXISTS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h")
+   # Get the ILMBASE version information from the config header
+-  file(STRINGS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h"
++  file(STRINGS "${_ILMBASE_HEADERS}/IlmBaseConfig.h"
+     _ilmbase_version_major_string REGEX "#define ILMBASE_VERSION_MAJOR "
+   )
+   string(REGEX REPLACE "#define ILMBASE_VERSION_MAJOR" ""
+@@ -178,7 +184,7 @@
+   )
+   string(STRIP "${_ilmbase_version_major_string}" IlmBase_VERSION_MAJOR)
+ 
+-  file(STRINGS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h"
++  file(STRINGS "${_ILMBASE_HEADERS}/IlmBaseConfig.h"
+      _ilmbase_version_minor_string REGEX "#define ILMBASE_VERSION_MINOR "
+   )
+   string(REGEX REPLACE "#define ILMBASE_VERSION_MINOR" ""
diff --git a/media-gfx/openvdb/files/openvdb-6.2.1-use-gnuinstalldirs.patch b/media-gfx/openvdb/files/openvdb-6.2.1-use-gnuinstalldirs.patch
new file mode 100644
index 000000000000..ac73d82f9c34
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-6.2.1-use-gnuinstalldirs.patch
@@ -0,0 +1,54 @@
+diff -Naur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2020-01-08 22:16:00.493079361 +0800
++++ b/CMakeLists.txt	2020-01-08 22:16:44.790285583 +0800
+@@ -252,6 +252,8 @@
+ 
+ enable_testing()
+ 
++INCLUDE ( GNUInstallDirs )
++
+ # Add our cmake modules
+ 
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
+diff -Naur a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
+--- a/openvdb/CMakeLists.txt	2020-01-08 22:16:07.362646127 +0800
++++ b/openvdb/CMakeLists.txt	2020-01-08 22:19:54.638308684 +0800
+@@ -492,7 +492,7 @@
+   install(TARGETS
+     openvdb_static
+     DESTINATION
+-    lib
++    ${CMAKE_INSTALL_LIBDIR}
+   )
+ endif()
+ 
+@@ -500,14 +500,14 @@
+   if(WIN32)
+     install(TARGETS
+       openvdb_shared
+-      RUNTIME DESTINATION bin COMPONENT Runtime
+-      ARCHIVE DESTINATION lib COMPONENT Runtime
++      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime
++      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
+     )
+   else()
+     install(TARGETS
+       openvdb_shared
+       DESTINATION
+-      lib
++      ${CMAKE_INSTALL_LIBDIR}
+     )
+   endif()
+ endif()
+diff -Naur a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
+--- a/openvdb/python/CMakeLists.txt	2020-01-08 22:16:14.452199013 +0800
++++ b/openvdb/python/CMakeLists.txt	2020-01-08 22:21:45.311324663 +0800
+@@ -232,7 +232,7 @@
+   ${PYOPENVDB_INSTALL_DIRECTORY}
+ )
+ 
+-install(FILES ${PYTHON_PUBLIC_INCLUDE_NAMES} DESTINATION include/openvdb/python)
++install(FILES ${PYTHON_PUBLIC_INCLUDE_NAMES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/openvdb/python)
+ 
+ # pytest
+ 
diff --git a/media-gfx/openvdb/files/openvdb-7.1.0-0001-Fix-multilib-header-source.patch b/media-gfx/openvdb/files/openvdb-7.1.0-0001-Fix-multilib-header-source.patch
new file mode 100644
index 000000000000..13d0f45fabf4
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-7.1.0-0001-Fix-multilib-header-source.patch
@@ -0,0 +1,75 @@
+From 7558089b3dae599ffc80329da3a5c1decf882ca7 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Fri, 28 Feb 2020 17:01:25 +0100
+Subject: [PATCH] Fix multilib header source
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ cmake/FindIlmBase.cmake | 10 ++++++++--
+ cmake/FindOpenEXR.cmake | 10 ++++++++--
+ 2 files changed, 16 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/FindIlmBase.cmake b/cmake/FindIlmBase.cmake
+index f20f803..bb85019 100644
+--- a/cmake/FindIlmBase.cmake
++++ b/cmake/FindIlmBase.cmake
+@@ -168,9 +168,15 @@ find_path(IlmBase_INCLUDE_DIR IlmBaseConfig.h
+   PATH_SUFFIXES include/OpenEXR OpenEXR
+ )
+ 
++if(EXISTS "/usr/include/${CHOST}/OpenEXR/IlmBaseConfig.h")
++  set(_ILMBASE_HEADERS "/usr/include/${CHOST}/OpenEXR")
++else()
++  set(_ILMBASE_HEADERS ${IlmBase_INCLUDE_DIR})
++endif()
++
+ if(EXISTS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h")
+   # Get the ILMBASE version information from the config header
+-  file(STRINGS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h"
++  file(STRINGS "${_ILMBASE_HEADERS}/IlmBaseConfig.h"
+     _ilmbase_version_major_string REGEX "#define ILMBASE_VERSION_MAJOR "
+   )
+   string(REGEX REPLACE "#define ILMBASE_VERSION_MAJOR" ""
+@@ -178,7 +184,7 @@ if(EXISTS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h")
+   )
+   string(STRIP "${_ilmbase_version_major_string}" IlmBase_VERSION_MAJOR)
+ 
+-  file(STRINGS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h"
++  file(STRINGS "${_ILMBASE_HEADERS}/IlmBaseConfig.h"
+      _ilmbase_version_minor_string REGEX "#define ILMBASE_VERSION_MINOR "
+   )
+   string(REGEX REPLACE "#define ILMBASE_VERSION_MINOR" ""
+diff --git a/cmake/FindOpenEXR.cmake b/cmake/FindOpenEXR.cmake
+index d0d356f..0c5dd7b 100644
+--- a/cmake/FindOpenEXR.cmake
++++ b/cmake/FindOpenEXR.cmake
+@@ -161,9 +161,15 @@ find_path(OpenEXR_INCLUDE_DIR OpenEXRConfig.h
+   PATH_SUFFIXES  include/OpenEXR OpenEXR
+ )
+ 
++if(EXISTS "/usr/include/${CHOST}/OpenEXR/OpenEXRConfig.h")
++	set(_OPENEXR_HEADERS "/usr/include/${CHOST}/OpenEXR")
++else()
++	set(_OPENEXR_HEADERS "${OpenEXR_INCLUDE_DIR}")
++endif()
++
+ if(EXISTS "${OpenEXR_INCLUDE_DIR}/OpenEXRConfig.h")
+   # Get the EXR version information from the config header
+-  file(STRINGS "${OpenEXR_INCLUDE_DIR}/OpenEXRConfig.h"
++  file(STRINGS "${_OPENEXR_HEADERS}/OpenEXRConfig.h"
+     _openexr_version_major_string REGEX "#define OPENEXR_VERSION_MAJOR "
+   )
+   string(REGEX REPLACE "#define OPENEXR_VERSION_MAJOR" ""
+@@ -171,7 +177,7 @@ if(EXISTS "${OpenEXR_INCLUDE_DIR}/OpenEXRConfig.h")
+   )
+   string(STRIP "${_openexr_version_major_string}" OpenEXR_VERSION_MAJOR)
+ 
+-  file(STRINGS "${OpenEXR_INCLUDE_DIR}/OpenEXRConfig.h"
++  file(STRINGS "${_OPENEXR_HEADERS}/OpenEXRConfig.h"
+      _openexr_version_minor_string REGEX "#define OPENEXR_VERSION_MINOR "
+   )
+   string(REGEX REPLACE "#define OPENEXR_VERSION_MINOR" ""
+-- 
+2.25.1
+
+
diff --git a/media-gfx/openvdb/files/openvdb-7.1.0-0002-Fix-doc-install-dir.patch b/media-gfx/openvdb/files/openvdb-7.1.0-0002-Fix-doc-install-dir.patch
new file mode 100644
index 000000000000..73d4b1ccd422
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-7.1.0-0002-Fix-doc-install-dir.patch
@@ -0,0 +1,25 @@
+From 66dec67036116243893fdf74060e55b70f65ab17 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Fri, 28 Feb 2020 21:51:30 +0100
+Subject: [PATCH] Fix doc install dir
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ doc/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index 1cf58ea..a6bd849 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -64,5 +64,5 @@ add_custom_target(doc ALL
+ )
+ 
+ # Suppress "Installing..." messages for all but one of the hundreds of generated files.
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html/index.html DESTINATION doc/html)
+-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html DESTINATION doc MESSAGE_NEVER)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html/index.html DESTINATION ${CMAKE_INSTALL_DOCDIR}/html)
++install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html DESTINATION ${CMAKE_INSTALL_DOCDIR} MESSAGE_NEVER)
+-- 
+2.25.1
+
diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml
index 747061595948..aac3bf03086b 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -15,14 +15,29 @@
 		Chance of Meatballs2' and 'How to Train Your Dragon 2'. 
 	</longdescription>
 	<use>
-		<flag restrict="&lt;media-gfx/openvdb-5.0.0" name="abi3-compat">
-			Disables newer features to maintain compatibility with ABI3. Enabled by default.
+		<flag restrict="&gt;=media-gfx/openvdb-7.0.0" name="numpy">
+			Build pyopenvdb with support for <pkg>dev-python/numpy</pkg>
 		</flag>
-		<flag restrict="&gt;=media-gfx/openvdb-5.0.0" name="abi4-compat">
-			Disables newer features to maintain compatibility with ABI4. Enabled by default.
+		<flag restrict="&lt;=media-gfx/openvdb-6.0.0" name="abi3-compat">
+			Disables newer features to maintain compatibility with ABI3.
+		</flag>
+		<flag restrict="&lt;=media-gfx/openvdb-7.0.0" name="abi4-compat">
+			Disables newer features to maintain compatibility with ABI4.
+		</flag>
+		<flag restrict="&lt;=media-gfx/openvdb-7.1.0" name="abi5-compat">
+			Disables newer features to maintain compatibility with ABI5.
+		</flag>
+		<flag restrict="&gt;=media-gfx/openvdb-6.0.0" name="abi6-compat">
+			Disables newer features to maintain compatibility with ABI6.
+		</flag>
+		<flag restrict="&gt;=media-gfx/openvdb-7.0.0" name="abi7-compat">
+			Disables newer features to maintain compatibility with ABI7.
+		</flag>
+		<flag restrict="&gt;=media-gfx/openvdb-7.0.0" name="utils">
+			Build utility binaries
 		</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">dreamworksanimation/openvdb</remote-id>
+		<remote-id type="github">AcademySoftwareFoundation/openvdb</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild
index 221e31086115..f6705df69633 100644
--- a/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild
+++ b/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild
@@ -1,30 +1,34 @@
 # 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_{6,7,8,9} )
 
-inherit cmake-utils flag-o-matic python-single-r1
+inherit cmake flag-o-matic python-single-r1
 
-DESCRIPTION="Libs for the efficient manipulation of volumetric data"
+DESCRIPTION="Library for the efficient manipulation of volumetric data"
 HOMEPAGE="https://www.openvdb.org"
-SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://dev.gentoo.org/~dracwyrm/patches/${P}-patchset-02.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE="+abi3-compat doc python test"
+IUSE="abi3-compat +abi4-compat doc python test"
 RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	^^ ( abi3-compat abi4-compat )
+"
 
 RDEPEND="
-	>=dev-libs/boost-1.62:=
-	>=dev-libs/c-blosc-1.5.0
-	dev-libs/jemalloc
-	dev-libs/log4cplus
-	media-libs/glfw:=
+	dev-libs/boost:=
+	dev-libs/c-blosc:=
+	dev-libs/jemalloc:=
+	dev-libs/log4cplus:=
+	media-libs/glfw
 	media-libs/openexr:=
 	sys-libs/zlib:=
 	x11-libs/libXcursor
@@ -34,13 +38,18 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			>=dev-libs/boost-1.62:=[python,${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			dev-libs/boost:=[python?,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
 		')
-	)"
+	)
+"
 
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	dev-cpp/tbb
+"
+
+BDEPEND="
 	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen
@@ -50,13 +59,16 @@ DEPEND="${RDEPEND}
 		dev-texlive/texlive-latex
 		dev-texlive/texlive-latexextra
 	)
-	test? ( dev-util/cppunit )"
+	test? ( dev-util/cppunit )
+"
 
 PATCHES=(
 	"${WORKDIR}/${P}-patchset-02/0001-use-gnuinstalldirs.patch"
 	"${WORKDIR}/${P}-patchset-02/0002-use-pkgconfig-for-ilmbase-and-openexr.patch"
 	"${WORKDIR}/${P}-patchset-02/0003-boost-1.65-numpy-support.patch"
 	"${FILESDIR}/${P}-findboost-fix.patch"
+	"${FILESDIR}/${P}-fix-const-correctness-for-unittest.patch"
+	"${FILESDIR}/${P}-fix-build-docs.patch"
 )
 
 pkg_setup() {
@@ -69,6 +81,15 @@ src_configure() {
 	# To stay in sync with Boost
 	append-cxxflags -std=c++14
 
+	local version
+	if use abi3-compat; then
+		version=3
+	elif use abi4-compat; then
+		version=4
+	else
+		die "Openvdb abi version is not compatible"
+	fi
+
 	local mycmakeargs=(
 		-DBLOSC_LOCATION="${myprefix}"
 		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
@@ -85,5 +106,5 @@ src_configure() {
 	use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" )
 	use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild b/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild
index 2f2eb78d9fcb..a176389a2a05 100644
--- a/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild
+++ b/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild
@@ -1,29 +1,32 @@
 # 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_{6,7,8,9} )
 
-inherit cmake-utils flag-o-matic python-single-r1
+inherit cmake flag-o-matic python-single-r1
 
-DESCRIPTION="Libs for the efficient manipulation of volumetric data"
+DESCRIPTION="Library for the efficient manipulation of volumetric data"
 HOMEPAGE="https://www.openvdb.org"
-SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+abi4-compat doc python test"
+IUSE="abi3-compat abi4-compat +abi5-compat doc python test"
 RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	^^ ( abi3-compat abi4-compat abi5-compat )
+"
 
 RDEPEND="
-	>=dev-libs/boost-1.62:=
-	>=dev-libs/c-blosc-1.5.0
-	dev-libs/jemalloc
-	dev-libs/log4cplus
-	media-libs/glfw:=
+	dev-libs/boost:=
+	dev-libs/c-blosc:=
+	dev-libs/jemalloc:=
+	dev-libs/log4cplus:=
+	media-libs/glfw
 	media-libs/openexr:=
 	sys-libs/zlib:=
 	x11-libs/libXcursor
@@ -33,13 +36,18 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			>=dev-libs/boost-1.62:=[python,${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			dev-libs/boost:=[python?,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
 		')
-	)"
+	)
+"
 
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	dev-cpp/tbb
+"
+
+BDEPEND="
 	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen
@@ -49,10 +57,14 @@ DEPEND="${RDEPEND}
 		dev-texlive/texlive-latex
 		dev-texlive/texlive-latexextra
 	)
-	test? ( dev-util/cppunit )"
+	test? ( dev-util/cppunit )
+"
 
-PATCHES=( "${FILESDIR}/${P}-use-gnuinstalldirs.patch"
+PATCHES=(
+	"${FILESDIR}/${P}-use-gnuinstalldirs.patch"
 	"${FILESDIR}/${P}-use-pkgconfig-for-ilmbase-and-openexr.patch"
+	"${FILESDIR}/${PN}-4.0.2-fix-const-correctness-for-unittest.patch"
+	"${FILESDIR}/${PN}-4.0.2-fix-build-docs.patch"
 )
 
 pkg_setup() {
@@ -62,11 +74,22 @@ pkg_setup() {
 src_configure() {
 	local myprefix="${EPREFIX}/usr/"
 
+	local version
+	if use abi3-compat; then
+		version=3
+	elif use abi4-compat; then
+		version=4
+	elif use abi5-compat; then
+		version=5
+	else
+		die "Openvdb ABI version not specified"
+	fi
+
 	local mycmakeargs=(
 		-DBLOSC_LOCATION="${myprefix}"
 		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
 		-DGLFW3_LOCATION="${myprefix}"
-		-DOPENVDB_ABI_VERSION_NUMBER=$(usex abi4-compat 4 5)
+		-DOPENVDB_ABI_VERSION_NUMBER="${version}"
 		-DOPENVDB_BUILD_DOCS=$(usex doc)
 		-DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
 		-DOPENVDB_BUILD_UNITTESTS=$(usex test)
@@ -78,5 +101,5 @@ src_configure() {
 	use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" )
 	use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-gfx/openvdb/openvdb-6.2.1.ebuild b/media-gfx/openvdb/openvdb-6.2.1.ebuild
new file mode 100644
index 000000000000..ebade646417c
--- /dev/null
+++ b/media-gfx/openvdb/openvdb-6.2.1.ebuild
@@ -0,0 +1,102 @@
+# 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} )
+
+inherit cmake flag-o-matic python-single-r1
+
+DESCRIPTION="Library for the efficient manipulation of volumetric data"
+HOMEPAGE="https://www.openvdb.org"
+SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="abi4-compat abi5-compat +abi6-compat doc python test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	^^ ( abi4-compat abi5-compat abi6-compat )
+"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/c-blosc:=
+	dev-libs/jemalloc:=
+	dev-libs/log4cplus:=
+	media-libs/glfw
+	media-libs/openexr:=
+	sys-libs/zlib:=
+	x11-libs/libXcursor
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python?,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+		')
+	)"
+
+DEPEND="
+	${RDEPEND}
+	dev-cpp/tbb
+"
+
+BDEPEND="
+	>=dev-util/cmake-3.16.2-r1
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-multilib-header-source.patch"
+	"${FILESDIR}/${PN}-4.0.2-fix-const-correctness-for-unittest.patch"
+	"${FILESDIR}/${P}-use-gnuinstalldirs.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myprefix="${EPREFIX}/usr/"
+
+	local version
+	if use abi4-compat; then
+		version=4
+	elif use abi5-compat; then
+		version=5
+	elif use abi6-compat; then
+		version=6
+	else
+		die "Openvdb ABI version not specified"
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DOPENVDB_ABI_VERSION_NUMBER="${version}"
+		-DOPENVDB_BUILD_DOCS=$(usex doc)
+		-DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
+		-DOPENVDB_BUILD_UNITTESTS=$(usex test)
+		-DOPENVDB_ENABLE_RPATH=OFF
+		-DCHOST="${CHOST}"
+	)
+
+	use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" )
+	use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" )
+
+	cmake_src_configure
+}
diff --git a/media-gfx/openvdb/openvdb-7.0.0.ebuild b/media-gfx/openvdb/openvdb-7.0.0.ebuild
new file mode 100644
index 000000000000..db984b8cdbfb
--- /dev/null
+++ b/media-gfx/openvdb/openvdb-7.0.0.ebuild
@@ -0,0 +1,123 @@
+# 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} )
+
+inherit cmake flag-o-matic python-single-r1
+
+DESCRIPTION="Library for the efficient manipulation of volumetric data"
+HOMEPAGE="https://www.openvdb.org"
+SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+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 )"
+
+REQUIRED_USE="
+	numpy? ( python )
+	^^ ( abi5-compat abi6-compat abi7-compat )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/c-blosc:=
+	dev-libs/jemalloc:=
+	dev-libs/log4cplus:=
+	media-libs/glfw
+	media-libs/openexr:=
+	sys-libs/zlib:=
+	x11-libs/libXcursor
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}]
+			numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+		')
+	)
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-cpp/tbb
+"
+
+BDEPEND="
+	>=dev-util/cmake-3.16.2-r1
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch"
+	"${FILESDIR}/${PN}-7.1.0-0002-Fix-doc-install-dir.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myprefix="${EPREFIX}/usr/"
+
+	local version
+	if use abi5-compat; then
+		version=5
+	elif use abi6-compat; then
+		version=6
+	elif use abi7-compat; then
+		version=7
+	else
+		die "Openvdb abi version is not compatible"
+	fi
+
+	local mycmakeargs=(
+		-DCHOST="${CHOST}"
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/"
+		-DOPENVDB_ABI_VERSION_NUMBER="${version}"
+		-DOPENVDB_BUILD_DOCS=$(usex doc)
+		-DOPENVDB_BUILD_UNITTESTS=$(usex test)
+		-DOPENVDB_BUILD_VDB_LOD=$(usex !utils)
+		-DOPENVDB_BUILD_VDB_RENDER=$(usex !utils)
+		-DOPENVDB_BUILD_VDB_VIEW=$(usex !utils)
+		-DOPENVDB_CORE_SHARED=ON
+		-DOPENVDB_CORE_STATIC=$(usex static-libs)
+		-DOPENVDB_ENABLE_RPATH=OFF
+		-DUSE_CCACHE=OFF
+		-DUSE_COLORED_OUTPUT=ON
+		-DUSE_EXR=ON
+		-DUSE_LOG4CPLUS=ON
+	)
+
+	if use python; then
+		mycmakeargs+=(
+			-DOPENVDB_BUILD_PYTHON_MODULE=ON
+			-DUSE_NUMPY=$(usex numpy)
+			-DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
+			-DPython_EXECUTABLE="${EPYTHON}"
+		)
+	fi
+
+	if use cpu_flags_x86_avx; then
+		mycmakeargs+=( -DOPENVDB_SIMD=AVX )
+	elif use cpu_flags_x86_sse4_2; then
+		mycmakeargs+=( -DOPENVDB_SIMD=SSE42 )
+	fi
+
+	cmake_src_configure
+}
diff --git a/media-gfx/openvdb/openvdb-7.1.0.ebuild b/media-gfx/openvdb/openvdb-7.1.0.ebuild
new file mode 100644
index 000000000000..912824ece66d
--- /dev/null
+++ b/media-gfx/openvdb/openvdb-7.1.0.ebuild
@@ -0,0 +1,121 @@
+# 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} )
+
+inherit cmake flag-o-matic python-single-r1
+
+DESCRIPTION="Library for the efficient manipulation of volumetric data"
+HOMEPAGE="https://www.openvdb.org"
+SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~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 )"
+
+REQUIRED_USE="
+	numpy? ( python )
+	^^ ( abi6-compat abi7-compat )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/c-blosc:=
+	dev-libs/jemalloc:=
+	dev-libs/log4cplus:=
+	media-libs/glfw
+	media-libs/openexr:=
+	sys-libs/zlib:=
+	x11-libs/libXcursor
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}]
+			numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+		')
+	)
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-cpp/tbb
+"
+
+BDEPEND="
+	>=dev-util/cmake-3.16.2-r1
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-0001-Fix-multilib-header-source.patch"
+	"${FILESDIR}/${P}-0002-Fix-doc-install-dir.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myprefix="${EPREFIX}/usr/"
+
+	local version
+	if use abi6-compat; then
+		version=6
+	elif use abi7-compat; then
+		version=7
+	else
+		die "Openvdb abi version is not compatible"
+	fi
+
+	local mycmakeargs=(
+		-DCHOST="${CHOST}"
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/"
+		-DOPENVDB_ABI_VERSION_NUMBER="${version}"
+		-DOPENVDB_BUILD_DOCS=$(usex doc)
+		-DOPENVDB_BUILD_UNITTESTS=$(usex test)
+		-DOPENVDB_BUILD_VDB_LOD=$(usex !utils)
+		-DOPENVDB_BUILD_VDB_RENDER=$(usex !utils)
+		-DOPENVDB_BUILD_VDB_VIEW=$(usex !utils)
+		-DOPENVDB_CORE_SHARED=ON
+		-DOPENVDB_CORE_STATIC=$(usex static-libs)
+		-DOPENVDB_ENABLE_RPATH=OFF
+		-DUSE_CCACHE=OFF
+		-DUSE_COLORED_OUTPUT=ON
+		-DUSE_EXR=ON
+		-DUSE_LOG4CPLUS=ON
+	)
+
+	if use python; then
+		mycmakeargs+=(
+			-DOPENVDB_BUILD_PYTHON_MODULE=ON
+			-DUSE_NUMPY=$(usex numpy)
+			-DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
+			-DPython_EXECUTABLE="${EPYTHON}"
+		)
+	fi
+
+	if use cpu_flags_x86_avx; then
+		mycmakeargs+=( -DOPENVDB_SIMD=AVX )
+	elif use cpu_flags_x86_sse4_2; then
+		mycmakeargs+=( -DOPENVDB_SIMD=SSE42 )
+	fi
+
+	cmake_src_configure
+}
diff --git a/media-gfx/plantuml/Manifest b/media-gfx/plantuml/Manifest
index 94c9df0d971f..9f1b2d599759 100644
--- a/media-gfx/plantuml/Manifest
+++ b/media-gfx/plantuml/Manifest
@@ -1,3 +1,3 @@
 DIST plantuml-1.2020.0.tar.gz 4552164 BLAKE2B c78da31cffbeb0cf1a8852e53d07126c9b0dc80bf12f36f1039c806651c6802dd63456610307836207158bc871c4e2a8d9cf12a80bafa9dbde3b2be29b02f2e8 SHA512 1c3a7f735a197e5fd044547a6c48f21c2ee774d553d3de82d4931b2684a56dc4ef8af5f524e6aa4eebcb16f214620f6c99c038101d6703f03642a5b94f124fa8
-EBUILD plantuml-1.2020.0.ebuild 752 BLAKE2B 395c0b2d0670037c7f3d402bcf744eaf01bab1a30b4bbfe6723b9d3e7e74977d3191ce62e445d96210ddd3a7a46a55e0f422d46f57740f1a5f0c8cf46450dddc SHA512 e3df33845c7db1bf360fa282ee8db7ade401637a01a06dc89d576399ec85c615a2435e7055dfcdb2783935a1cf89c28317d6ed63e6aefc6d93d3471f869262a8
+EBUILD plantuml-1.2020.0.ebuild 753 BLAKE2B 8f364621800c0eec170569351134912dfb9a1f9f9d1bc4ee80f520f0f57c0361ebaef3e28c900770489d95e282b9ec756f8d7b16e0899e5b3d6273a586898945 SHA512 637ea579deef346114c2c60f80c263496f8e28168e3010861f3e3faf58a15234dc17911973251c19450b70851169f592df3211fa100f6c4ec6401d2fa71252ec
 MISC metadata.xml 821 BLAKE2B dd2177671848872c7a33108b012327639d40e2664ae85619bd94810e99a385dfa39111a95922a59e451ee4be7c9eebdc288934ef7a79ef33ce0683c09c13cb51 SHA512 8b2400bb96cbac0403ef0865bdb3d72a00dfad45f1c3807ca1a1ba0d98aa3f7777bc8d65089d82c6132ffb75a7395312b374ffaa88f67866512978be1eae9b98
diff --git a/media-gfx/plantuml/plantuml-1.2020.0.ebuild b/media-gfx/plantuml/plantuml-1.2020.0.ebuild
index e02996fa69cd..2e0af1c75a78 100644
--- a/media-gfx/plantuml/plantuml-1.2020.0.ebuild
+++ b/media-gfx/plantuml/plantuml-1.2020.0.ebuild
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="source"
 inherit java-pkg-2 java-ant-2 desktop xdg
 
 DESCRIPTION="Draw UML diagrams using a simple and human readable text description"
-HOMEPAGE="http://plantuml.com"
+HOMEPAGE="https://plantuml.com"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/media-gfx/pngquant/Manifest b/media-gfx/pngquant/Manifest
index 65e22a973f7a..8a0b4be63682 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 1328 BLAKE2B 3fe65dc071f8f993c440ad318473eb71deccd0ad62ff635b5c57f8cef1fee1a7c4f85ac6332e92076962e2655e98c1cb16a5fee38ff80af9469feccd00ffe797 SHA512 afbea31a05dbe254316f102b47eae79a29123c5a535fe7d254bc6d3f9a95ec69cb2421499454491ca6fb8e1734c651e79dee6c61583d33d307c741ebe28affea
+EBUILD pngquant-2.12.6.ebuild 1327 BLAKE2B 7d8064e1ae61ce3e55b0abedd9b1c2110520cb3fd5ce213c54fec4bfd8f351c4589b78cc6e4482897508462012b71c6535a6a7c91bfdeeef70adc12d8af34017 SHA512 20e6faa61a71ad2956e4d23f3c4c2a48a720432167d73e374e316ce299d1c0d30b55a37ef8376ff9b308466c78a7ad58a7aaf7092745e6d2776cca10ee5f6f1f
 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 26e19714bec4..87e336dddabb 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/potrace/Manifest b/media-gfx/potrace/Manifest
index 64f9212596c9..c6e807de2d4a 100644
--- a/media-gfx/potrace/Manifest
+++ b/media-gfx/potrace/Manifest
@@ -1,5 +1,5 @@
 DIST potrace-1.15.tar.gz 650840 BLAKE2B 1a2074ff0ff958e1c9cbcd35a6267ef7f4bdfa5ba9b511413fa2c5db16a7263ed27291a0bf7c76feb25abd59db099e1096b736eab28a6397accfce88f42fdeff SHA512 c9a8edd4f3339da587b9b32e12c83c8f7b993c7c23f551fa267545d9411679bc024924e23596ed1c83985693fc894b65dfa9f860275de395d9e0a88da37a4f02
 DIST potrace-1.16.tar.gz 657314 BLAKE2B ee6b04f355d593dd1ebcc4833b244e25eaaa69c91f90987d530a4e5a454668dff6ecfb7a5d8270ebbd9e7c177fd447d1b3fe2a343fc4b9413dd3f507c0c6e417 SHA512 10d85ed3fada80951223c65e923b5e6ee3e76e071575971d5b09b996b477ec5ff2403e0337c44963c6b441cc3ba6c4f7009541124a25c16b7721fdebd1f774b9
 EBUILD potrace-1.15.ebuild 796 BLAKE2B 3ca9c7636ce5e73b43a0f0b283702baecd5c2c9679bb748154f4b9628b8a5c0da1313541b765a5c6b29c90e2b5ba83983b70baf9f7be9d4e95879f45698148d7 SHA512 fa276bfc2dfe220688168102a2e04118611014b9511b0af6a8a1d38bde81fedac7365a928db71336b9db3b0cd28bd93dce6bab4da3dd4444dc4995f3e4e0fc7c
-EBUILD potrace-1.16.ebuild 799 BLAKE2B 2e274b37600db02c2cb7dcd3b60f121e604c637364f5e1d4a6ee0e8b21d34c545bf66638c5da61509f09e3e7f677a9bc7c776637d51cc4782e3b19588c6dd58b SHA512 a481f13281ce17eec964a398720c4dacb2fee268862cc22f4f388516b686e295cb2627742a3b8c2010310fc2eddb5b55dbe9860333ccb56bb6c334cd6216b5e4
+EBUILD potrace-1.16.ebuild 845 BLAKE2B 483f75e909a1858440d836504b5ab63435d073e5b17644b96e548479837f3a603a3d62f092475ff1fefaaae69cca775155f473194ea2a8726b5209257f6462f3 SHA512 44adf15a3fb53446ab7e281890a21c95ae9ea5f907ff3e03ac64703af4f8ade8a309113874a8aa4149d7e60b8f45e8c159d56b4c71d1136c591cf501d27d8f16
 MISC metadata.xml 414 BLAKE2B 898ecb37a2e19b25b8ff0a2f6b990812556b6902809102c7aac7dbbc8a11b27c74d8955081866bec821829ed499d5841d1dbd5c5829bc40387333135d9c4e77e SHA512 6120a5d57ff58cba2bf2407293def120107d5f58c2757f08c08435d7679ceb4a4174a07fd4813db8dfa0239eabec633c99ed49f860111361baa33995fc3ff288
diff --git a/media-gfx/potrace/potrace-1.16.ebuild b/media-gfx/potrace/potrace-1.16.ebuild
index 61be1a6b5914..b4da07394f6f 100644
--- a/media-gfx/potrace/potrace-1.16.ebuild
+++ b/media-gfx/potrace/potrace-1.16.ebuild
@@ -11,8 +11,8 @@ SRC_URI="http://potrace.sourceforge.net/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="metric static-libs"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="metric"
 
 RDEPEND="sys-libs/zlib:="
 DEPEND="${RDEPEND}"
@@ -22,12 +22,18 @@ DOCS=( AUTHORS ChangeLog NEWS README )
 src_configure() {
 	tc-export CC # bug 610098
 	local myeconfargs=(
-		--enable-shared
+		--disable-static
 		--enable-zlib
 		--with-libpotrace
 		$(use_enable metric a4)
 		$(use_enable metric)
-		$(use_enable static-libs static)
 	)
 	econf "${myeconfargs[@]}"
 }
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-gfx/propaganda/Manifest b/media-gfx/propaganda/Manifest
index 71de2febfdf5..f381730a0541 100644
--- a/media-gfx/propaganda/Manifest
+++ b/media-gfx/propaganda/Manifest
@@ -14,4 +14,4 @@ DIST Propaganda-Vol-10.tar.gz 6376914 BLAKE2B 365e96616d8f82321fd0a0460e6b14e5db
 DIST Propaganda-Vol-11.tar.gz 3030910 BLAKE2B b5637635165557c079d7801b91a6b1d7372a7ac1ef1ba414d0cf172d652de779fb05f106f0ef7cabebac79bbc8a1b21cabde0f34a14735eca17ccb193ade0882 SHA512 752a3e27bfbde1f694be3f57e4c7bf638159f8e7b06c00c703a82ff2795625298feca20f91beecc651da66ac7b6dc5e7fcfc0b5d7b465118e94f8769488be1c7
 DIST Propaganda-Vol-12.tar.gz 3140955 BLAKE2B ce23e5e781bd1d1cba757bcee71df199627e18bb72eddd0a6dc5759f1d80fcefbb4daa6048450aa51f9b4830ece14461ef63a299e0c13d43a1670bc8b1a4b0fc SHA512 1cef61c88a4cbe4c757c05c1ecf2d72ab67ad13e0268497971f9a11047351d0a0e8770a69bd6754672b6a8c99e69a2e61693fb593bcfb4db7003cd9eddd31f80
 EBUILD propaganda-1.0-r1.ebuild 1200 BLAKE2B d0f29c2ef8d257b0d0bfe8d09926456a548d85cbadc8224ac90805e8788f4f75aa69af9991d603d40d4450ac7118c874f04f5cb7e80d04700e9fe0027ce1472d SHA512 b30d65a468330bcdadf91863bb41e6e36dba1957b2ecfc7a3199ad1921f1d0f2ce65114d01ebac86749f1c6c1e9ee3844af9c6822f4e5fb3cbb2cb0a929d934f
-MISC metadata.xml 251 BLAKE2B 08302baf062696a2cd9e6bbc3469d3e6a2d4d03caf4734810ad4dd22f64347a70a36e38cff8753da18246f448a080829bce1ceae41ae418dbeb19eb1336e5dd7 SHA512 5425f5f068673da4e79daec7d2d22dc122024e4b54a53b8d7b07ccb2b138fb5657b7fe29ec640c6faf12d6efefeaf3a53d67e954ec8b9884b0ff3d959c86a13f
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-gfx/propaganda/metadata.xml b/media-gfx/propaganda/metadata.xml
index 0d42cb6211d9..7a38bb900964 100644
--- a/media-gfx/propaganda/metadata.xml
+++ b/media-gfx/propaganda/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>andrey_utkin@gentoo.org</email>
-		<name>Andrey Utkin</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-gfx/qimgv/Manifest b/media-gfx/qimgv/Manifest
index a44de7ca2170..cbb9aa68126a 100644
--- a/media-gfx/qimgv/Manifest
+++ b/media-gfx/qimgv/Manifest
@@ -1,3 +1,3 @@
-DIST qimgv-0.8.8.tar.gz 460682 BLAKE2B fb701fbb336bf8e51751f677f7fddfd7eb0e1b770697ee510c0008a3ebddb0a3948d5a3f6f57a676dfa3117ca03b908cc3f88bcaec16a07000108279bd5fed80 SHA512 376f79eba2a625eb0f622494ce7ba98e1182b43cc6d7e268382c794a74d2772bd17083ac9ae45fcafc5eeb0665ef06ab34bdbeee8401a35bd0652744c576e131
-EBUILD qimgv-0.8.8.ebuild 1126 BLAKE2B ac635b6d46d4d63c8afb846fc248ef15c29e607cc2a5a85d7236cf5e4a186a4a2ac610e60fa3dd7fd108f9d6f7de8622b72d3a0d40e315704ef7e696bc3416b8 SHA512 7ba8910b8dc806e176596f2f2ab19ab24b066d94661ad2b466c6cb3d65bc20d982335172eb7ff0642dec26d065f4bd0399c973d3740c8bbb19c272d6289106c0
-MISC metadata.xml 453 BLAKE2B ca83aa2e239dbd9bfca29a20d99b8d352392db1f17fd77497d6eb6266e19e300a30c5544508a479ee6832a6ef1211ff5df08787b726839e5ad39fdd21f8ab5d7 SHA512 ca30cade161d874f67a0aa2fdc6084bce465920bbbca9cde599f6b879dfd6801426d6603e02bb9f34f1ac1f00acba896279f231b49bcc9cd3f0355ff4bb310d9
+DIST qimgv-0.9.1.tar.gz 670033 BLAKE2B c1461791af4e6f73e36ec85968102e694f87acc904d270292ce8133206f9987f061ed02045d19058f76e448ce0410e9ffa38341253342b63b8a521183abaa1c5 SHA512 dbad56ebced421cafe6f5e03314fed5ed47e1c98405bac24a89f28f2684484af4f1fa6cc2b37f79e6afa7a1375f76881a8072646405691a47750a95032e02e2b
+EBUILD qimgv-0.9.1.ebuild 1200 BLAKE2B 07a1c8d6973b5057f6b35787dc80320b14e9cda3508e6fda87647ca317934a95713bbadcba240e98cc18c60ea0b24c823b1908ed1b12b2dd6da947df31a6dbcb SHA512 bb7846e169df31b8fec03c5ff3c3fb25f80728101b574635ac97f26af2560bf668ecc70f713b0cd54888bde2d00cbf6e7065828b8e0dd865b412d38a4a26863f
+MISC metadata.xml 533 BLAKE2B d0ca121069311bd9a2f996eec811bb5e2ad4c329d06a024f97d561b3d322e60c97fb40565c5d6de5b53f15f258a33f5e5ae98ac2ee3219bb05f7e61b68c29b00 SHA512 3f377ab27c3f1a18276eb86d05428f5414c28792270e51b61ecf25e8a89a086646988ab7cbb43a89b5ab8c8946daceb55ee5ca15ca1ee35e30fbfb2b1dff87ad
diff --git a/media-gfx/qimgv/metadata.xml b/media-gfx/qimgv/metadata.xml
index 840ab55fbe94..09edd32618cc 100644
--- a/media-gfx/qimgv/metadata.xml
+++ b/media-gfx/qimgv/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
+		<flag name="opencv">Enable HQ scaling via <pkg>media-libs/opencv</pkg></flag>
 		<flag name="video">Add support for gif/webm playback via libmpv</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/qimgv/qimgv-0.8.8.ebuild b/media-gfx/qimgv/qimgv-0.9.1.ebuild
index b5ebae292347..1652efc8f403 100644
--- a/media-gfx/qimgv/qimgv-0.8.8.ebuild
+++ b/media-gfx/qimgv/qimgv-0.9.1.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,7 +12,7 @@ SRC_URI="https://github.com/easymodo/qimgv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="exif kde video"
+IUSE="exif kde opencv video"
 
 BDEPEND="
 	virtual/pkgconfig
@@ -24,6 +24,7 @@ DEPEND="
 	dev-qt/qtwidgets:5
 	exif? ( media-gfx/exiv2:= )
 	kde? ( kde-frameworks/kwindowsystem:5 )
+	opencv? ( media-libs/opencv:= )
 	video? ( media-video/mpv[libmpv] )
 "
 RDEPEND="
@@ -40,6 +41,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DEXIV2=$(usex exif)
 		-DKDE_SUPPORT=$(usex kde)
+		-DOPENCV_SUPPORT=$(usex opencv)
 		-DVIDEO_SUPPORT=$(usex video)
 	)
 	cmake_src_configure
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 37e088e58901..6e315505bbbb 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -15,5 +15,5 @@ AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71
 DIST backends-1.0.30.tar.gz 5721262 BLAKE2B 139d3ca908d54b94d14ef4145d44a89b939807c15870be03c3c028cf95351bf9a4abd3ea115b84396366bb054f37ade883f429467dceb0663c2855b92e0a4fa5 SHA512 19127c8109c1587d60d8cba713f73b1a24242df44fa49c3e59320f48022783f05d26d3242a3f87478e583a807d88b446ef7a51afb33b674be29656496c435d7b
 DIST sane-backends-1.0.27.tar.gz 6430188 BLAKE2B 90f910311e31a436eaa0ca0fedd998aac3331f89a346f31613776ebc860a10cc37055fd15db8de8d743498914ea0c16e4153dbaa101380eb6e36857d730c3456 SHA512 c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5
 EBUILD sane-backends-1.0.27-r3.ebuild 8101 BLAKE2B e6ff1e73fad9d33c8b9d4a475de311b5ddf60a66fe2604f6c8573bfd593688292a84ac554dc06d0c9d1181f443f31e0e9fc6e6e520a0e76fe62f373129f92388 SHA512 1434b237b354d84eecfab48624805dcbd8dcaaf42e5315ca25c980942551a2cb0cae39453907982d96ffe2a4042def9eb7d44b9ad768750aa35d65a18057c06c
-EBUILD sane-backends-1.0.30-r2.ebuild 8153 BLAKE2B 4a837163fb0ca438814f3ecb54f5a9d1ab6e229b243dc8348b624c2e28ecc489897f728252410e0409d0885d8fcbf6801a5bb5a67479a52284368aa25699ac96 SHA512 6f6ce83f0b66c15eb193c19916fc2978f49b19068efa6dbaa7e6ed9b414c71ecf6513978a725cb95d27a4f304cbc8f377e837aa42af6aeaa16495fd29fbc1f25
+EBUILD sane-backends-1.0.30-r2.ebuild 8226 BLAKE2B ffc58ff6ba7064d1c75578136824af3701bb10d4fd717c98c77d5c74442e235ac90d3d0e851da2ca2c3a8d4dcb27f8e4e9b79629f8d815adab3ebf50b9653155 SHA512 0b0ce0411abace6eeb61be6d497dfbc54c07400300f5bde8a6e0c0e2f8cccdb26abd45f9dc0e1590ff996854d77071dc9720da528eaa99377dbf53d5a14891e6
 MISC metadata.xml 266 BLAKE2B c76ad15982ba5b341a41155c75a5fda95a99ef658ed972c452bfb7b0968aafe33f83cc5bd0f2effb1c2b4f9721a8f61987f2fb7906855b3869e7787226f2b385 SHA512 67d43b02a8c1aab418ca79b30d88af0e78f9df9b95c93887cfed5976290e714409e7dc400f09170d7e7844a411aa3e3202f49f31f39b7f580a8c0b6f3d4db659
diff --git a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
index d81a991ad811..adeb389d709b 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
@@ -124,7 +124,7 @@ SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="
@@ -140,6 +140,11 @@ RDEPEND="
 		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
 	)
 	sane_backends_escl? (
+		|| (
+			net-dns/avahi[dbus]
+			net-dns/avahi[gtk]
+			net-dns/avahi[gtk2]
+		)
 		net-dns/avahi[${MULTILIB_USEDEP}]
 		net-misc/curl[${MULTILIB_USEDEP}]
 	)
diff --git a/media-gfx/scour/Manifest b/media-gfx/scour/Manifest
index fe1a74a69ad5..95fe86d4c418 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 708 BLAKE2B 0525bd0e25e3c8b958a843ffaf36fb1c2fae11ea73081cce8dff132ab65a1462f28e074b3abcb21a74fe03ce7e4d5d72b3ff3298fb1f048664f82da89fd9ecfb SHA512 0fa8a4115e44a6c3c36ff4ba53426a5f09840e619d5040d6e4cef9de7d5472ceb0fea0bc3bf63c7159d1d7f7f2f09a2155952ae071373c748bacf0db7eed9e65
+EBUILD scour-0.37.ebuild 714 BLAKE2B 815aafbedcabb398269b8e7a374a06247207361d7c16f2f112d9e099ed81feb0b7c330e8157e0bd13953c3439df3f0515783cbd0d451141b9686f97cc1fe3daf SHA512 8d856e2fc7fb9b93670fd69564e973be5ec4452c99e83c6cef0b0dbb8486866c7d00d03ca4f29c8bc06b38d972faf7dcf5b64dd4734a6aeea92e1593f0c4167b
 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 385e5c4dbf25..17f4bd745571 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 ~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 ad57bb577088..6bcdebfad5a6 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -1,11 +1,14 @@
+AUX ax_prefix_config_h.m4 8195 BLAKE2B d2eb17b7730a216f8fa88585b7dce51d641fb9e801a77d8059329a3838a8ce0d4eac02e1229cd087cdbac9f47c7bcfe99bfe0a14e8c4db233c6c4e066ea09b81 SHA512 cf70c3e909da9379ebed51a66fe94cbd7a068574e0ba0da5690f917523b090f29eb23f0464849d6364adc28411258483b0d773ed3488c9e9328d5a1f732427c4
 AUX scrot-1.2.bash-completion 1990 BLAKE2B 6c99578185f7d69581854372344088398279af8227fccccff07dcb590ae1a90d6ef9122ba3cf02b0db634fe68554818e63d1cfa54bae0fb1ccb65cf0f84769b4 SHA512 76880911e6799894d68aae78313a114fc18c6bf2f0411a0fdce3f30d33c8ff266290aed9570a546c3a05a71503a130c5cbe2cb6e0f92c240edbc8e9f19362db4
 AUX scrot.bash-completion 1063 BLAKE2B ab03add49bb68db845d1cb599e62dfd4070a8110b5bbf03584fec395a3b0c60262bf3f4fc0ddc1a35c17996a8986107ae3bad053a8974da7c456bdfe7410b424 SHA512 ce8df63bb5b10dbf19f465f2629ebe7045d84105f3da70a49f2bde6a0a416a8f14a02ba3e7d3a8aeba144a592b45a770929b56f6ae7ac867222213ac8f923a0f
 DIST scrot-1.2.tar.gz 36839 BLAKE2B 26ca05fb3c8fa9069ad87bdd5cc93791994e44e2f5cd7a4b729a6c9e3035c349049500b9627fd31532c280465f77f839370d095f1b0f2ccc10649b3e6fa01edb SHA512 b89e7a94e6317fdb7bd260190c6d68a2dfefc08691b4574337afdfff84f55b8b9c955a6ac60642ae9749c1deaa16bee7b855fbd15833a95f602536693daf8c37
 DIST scrot-1.3.tar.gz 141726 BLAKE2B 1972edfa3b61c95fd786d0b4db13633778293b2c671c395939ea0b77d49714e644abd60cfae5656f03fd1c701185d2c8961c45d62989e882f2cd8f4a824dee57 SHA512 45828824701c7574676d0746d01f3dc8313ea91a272fa169b616765442e8842b67d8aa73f47009a66d34dd6b89a230fd9fb42bc598e88baae70fc45345c13a4c
+DIST scrot-1.4.tar.gz 157779 BLAKE2B ba844f8bc500c468d028ce62ae57bd6a9fa0e403df6f05dd217722a9115456b70a38aabd7ccb0da53d855b9971d0f5948f82545ca0c8cceb75ede0d4546e27c1 SHA512 8423e7b2658f3e0ccf30f61e122016469226328adf8b1e511aeb031dd2655ae66582651e2d046c7c35d23efb98656369a02b59e711980481ddc4db24c299ee11
 DIST scrot_0.8-13.debian.tar.gz 7943 BLAKE2B 6c58c76f3a8dcf61a8ca4c31f5845cb27b4d0ed2bf9619cc8ea5824b5e42c66ee5163c7f4e76308763947b933003dbd3df6e641b0596ed342993343fd5418a75 SHA512 3f6d0a8e592088af38a3d90394b6b7246430479f5b0c8451af5eae383725d1896dc4bbf595495f9f2b546f00ef38780123c4ee0e3f06971c55a6ac2dfa5b7d53
 DIST scrot_0.8.orig.tar.gz 74324 BLAKE2B 56facc81c29f101279ffc6d5d323a0cecd32b1ff6d1d4bb2052a90703353a9ad5b6ab46c8840ed20834f976badab4258fbb0f031645d9689eef1b838ebd4b1a0 SHA512 cba8f589e45758ddbfe4e276399a1ecb0dbe29569be5d85d97733e7f64de2911bd2d03e62700ad0c718a1fc886c2e3def9dee1de5cac884f9e65e772cebe838c
 EBUILD scrot-0.8_p13-r1.ebuild 975 BLAKE2B 4f0920e23cada110c426fcd1ef874379f8ae3d9ed272dc5fd8a8cc4ffa0253066ee1f26428cad4d771bc5875fc205daea8d3e5fa381a204e5d13edcec2bab881 SHA512 b26b4f5aaa5a522a602404197697b17cd04d53d23229c7d1078e851400019c2fc506b96ba72b6aa36c9fe084711c67b9a57f4b75113e0b3ebb64289fd03fbf75
 EBUILD scrot-1.2.ebuild 920 BLAKE2B b00fcbdf7665347b42716ce8ab78b8f6965f90b4b1f1a88acd2fffacd2978145208965afd206012c837ab22126ba7e78990b8760c5a58cccef373d2715991918 SHA512 341f2fbb5f4824b38d4c42e18929173cad358faf4b9b475d0c735ddc1a681962019c3a8a35892c5120afc42895ac1ac654c1faeb7a7fee5010725a61251bc7cd
 EBUILD scrot-1.3-r1.ebuild 971 BLAKE2B f4daabaf37c8e2d6ea724d1b96f12928b4f5ece6301a0fa44dcffbbfdf00d4b213f56b5b066116b64eb45bb78100c9b9fd2fb451e2e8d9da664b9624c7f67c63 SHA512 552252c5ca01774197b34dd862a458399004f5be2f78b5d889176c0ebf072b05b08cfa842953205dc64da4ed3d4d011f81fb964a071992ea5b772c0ae69fcacd
-EBUILD scrot-9999.ebuild 896 BLAKE2B 73a81a5b80390880d211ec0b6d4150ac65061c9659b661ec5ddceb330f04fcc9fc5cd510daea33d98d61531352641edef5f2d6af112773913cd170e12dd8d85c SHA512 51e6a4b44b612c5e4f5377a9508cc218856ed761e69342ccd3fd94917f71bfcfea8d36ee65188c1b4f7c9eccd2f1364dee7e8919689aae002fa48ad1c6757946
+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
diff --git a/media-gfx/scrot/files/ax_prefix_config_h.m4 b/media-gfx/scrot/files/ax_prefix_config_h.m4
new file mode 100644
index 000000000000..22acbac68d5e
--- /dev/null
+++ b/media-gfx/scrot/files/ax_prefix_config_h.m4
@@ -0,0 +1,203 @@
+# ===========================================================================
+#    https://www.gnu.org/software/autoconf-archive/ax_prefix_config_h.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PREFIX_CONFIG_H [(OUTPUT-HEADER [,PREFIX [,ORIG-HEADER]])]
+#
+# DESCRIPTION
+#
+#   Generate an installable config.h.
+#
+#   A package should not normally install its config.h as a system header,
+#   but if it must, this macro can be used to avoid namespace pollution by
+#   making a copy of config.h with a prefix added to all the macro names.
+#
+#   Each "#define SOMEDEF" line of the configuration header has the given
+#   prefix added, in the same case as the first character of the macro name.
+#
+#   Defaults:
+#
+#     OUTPUT-HEADER = $PACKAGE-config.h
+#     PREFIX = $PACKAGE
+#     ORIG-HEADER, from AM_CONFIG_HEADER(config.h)
+#
+#   Your configure.ac script should contain both macros in this order.
+#
+#   Example:
+#
+#     AC_INIT(config.h.in)        # config.h.in as created by "autoheader"
+#     AM_INIT_AUTOMAKE(testpkg, 0.1.1)    # makes #undef VERSION and PACKAGE
+#     AM_CONFIG_HEADER(config.h)          # prep config.h from config.h.in
+#     AX_PREFIX_CONFIG_H(mylib/_config.h) # prep mylib/_config.h from it..
+#     AC_MEMORY_H                         # makes "#undef NEED_MEMORY_H"
+#     AC_C_CONST_H                        # makes "#undef const"
+#     AC_OUTPUT(Makefile)                 # creates the "config.h" now
+#                                         # and also mylib/_config.h
+#
+#   If the argument to AX_PREFIX_CONFIG_H would have been omitted then the
+#   default output file would have been called simply "testpkg-config.h",
+#   but even under the name "mylib/_config.h" it contains prefix-defines
+#   like
+#
+#     #ifndef TESTPKG_VERSION
+#     #define TESTPKG_VERSION "0.1.1"
+#     #endif
+#     #ifndef TESTPKG_NEED_MEMORY_H
+#     #define TESTPKG_NEED_MEMORY_H 1
+#     #endif
+#     #ifndef _testpkg_const
+#     #define _testpkg_const _const
+#     #endif
+#
+#   and this "mylib/_config.h" can be installed along with other header
+#   files, which is most convenient when creating a shared library (that has
+#   some headers) whose functionality depends on features detected at
+#   compile-time. No need to invent some "mylib-confdefs.h.in" manually.
+#
+#   Note that some AC_DEFINEs that end up in the config.h file are actually
+#   self-referential - e.g. AC_C_INLINE, AC_C_CONST, and the AC_TYPE_OFF_T
+#   say that they "will define inline|const|off_t if the system does not do
+#   it by itself". You might want to clean up about these - consider an
+#   extra mylib/conf.h that reads something like:
+#
+#     #include <mylib/_config.h>
+#     #ifndef _testpkg_const
+#     #define _testpkg_const const
+#     #endif
+#
+#   and then start using _testpkg_const in the header files. That is also a
+#   good thing to differentiate whether some library-user has starting to
+#   take up with a different compiler, so perhaps it could read something
+#   like this:
+#
+#     #ifdef _MSC_VER
+#     #include <mylib/_msvc.h>
+#     #else
+#     #include <mylib/_config.h>
+#     #endif
+#     #ifndef _testpkg_const
+#     #define _testpkg_const const
+#     #endif
+#
+# LICENSE
+#
+#   Copyright (c) 2014 Reuben Thomas <rrt@sc3d.org>
+#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+#   Copyright (c) 2008 Marten Svantesson
+#   Copyright (c) 2008 Gerald Point <Gerald.Point@labri.fr>
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation; either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <https://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 16
+
+AC_DEFUN([AX_PREFIX_CONFIG_H],[dnl
+AC_PREREQ([2.62])
+AC_BEFORE([AC_CONFIG_HEADERS],[$0])dnl
+AC_CONFIG_COMMANDS(m4_default([$1], [$PACKAGE-config.h]),[dnl
+AS_VAR_PUSHDEF([_OUT],[ac_prefix_conf_OUT])dnl
+AS_VAR_PUSHDEF([_DEF],[ac_prefix_conf_DEF])dnl
+AS_VAR_PUSHDEF([_PKG],[ac_prefix_conf_PKG])dnl
+AS_VAR_PUSHDEF([_LOW],[ac_prefix_conf_LOW])dnl
+AS_VAR_PUSHDEF([_UPP],[ac_prefix_conf_UPP])dnl
+AS_VAR_PUSHDEF([_INP],[ac_prefix_conf_INP])dnl
+m4_pushdef([_script],[conftest.prefix])dnl
+m4_pushdef([_symbol],[m4_cr_Letters[]m4_cr_digits[]_])dnl
+_OUT=`echo m4_default([$1], [$PACKAGE-config.h])`
+_DEF=`echo _$_OUT | sed -e "y:m4_cr_letters:m4_cr_LETTERS[]:" -e "s/@<:@^m4_cr_Letters@:>@/_/g"`
+_PKG=`echo m4_default([$2], [$PACKAGE])`
+_LOW=`echo _$_PKG | sed -e "y:m4_cr_LETTERS-:m4_cr_letters[]_:"`
+_UPP=`echo $_PKG | sed -e "y:m4_cr_letters-:m4_cr_LETTERS[]_:"  -e "/^@<:@m4_cr_digits@:>@/s/^/_/"`
+_INP=`echo "$3" | sed -e 's/ *//'`
+if test ".$_INP" = "."; then
+   for ac_file in : $CONFIG_HEADERS; do test "_$ac_file" = _: && continue
+     case "$ac_file" in
+        *.h) _INP=$ac_file ;;
+        *)
+     esac
+     test ".$_INP" != "." && break
+   done
+fi
+if test ".$_INP" = "."; then
+   case "$_OUT" in
+      */*) _INP=`basename "$_OUT"`
+      ;;
+      *-*) _INP=`echo "$_OUT" | sed -e "s/@<:@_symbol@:>@*-//"`
+      ;;
+      *) _INP=config.h
+      ;;
+   esac
+fi
+if test -z "$_PKG" ; then
+   AC_MSG_ERROR([no prefix for _PREFIX_PKG_CONFIG_H])
+else
+  if test ! -f "$_INP" ; then if test -f "$srcdir/$_INP" ; then
+     _INP="$srcdir/$_INP"
+  fi fi
+  AC_MSG_NOTICE(creating $_OUT - prefix $_UPP for $_INP defines)
+  if test -f $_INP ; then
+    AS_ECHO(["s/^@%:@undef  *\\(@<:@m4_cr_LETTERS[]_@:>@\\)/@%:@undef $_UPP""_\\1/"]) > _script
+    AS_ECHO(["s/^@%:@undef  *\\(@<:@m4_cr_letters@:>@\\)/@%:@undef $_LOW""_\\1/"]) >> _script
+    AS_ECHO(["s/^@%:@def[]ine  *\\(@<:@m4_cr_LETTERS[]_@:>@@<:@_symbol@:>@*\\)\\(.*\\)/@%:@ifndef $_UPP""_\\1\\"]) >> _script
+    AS_ECHO(["@%:@def[]ine $_UPP""_\\1\\2\\"]) >> _script
+    AS_ECHO(["@%:@endif/"]) >> _script
+    AS_ECHO(["s/^@%:@def[]ine  *\\(@<:@m4_cr_letters@:>@@<:@_symbol@:>@*\\)\\(.*\\)/@%:@ifndef $_LOW""_\\1\\"]) >> _script
+    AS_ECHO(["@%:@define $_LOW""_\\1\\2\\"]) >> _script
+    AS_ECHO(["@%:@endif/"]) >> _script
+    # now executing _script on _DEF input to create _OUT output file
+    echo "@%:@ifndef $_DEF"      >$tmp/pconfig.h
+    echo "@%:@def[]ine $_DEF 1" >>$tmp/pconfig.h
+    echo ' ' >>$tmp/pconfig.h
+    echo /'*' $_OUT. Generated automatically at end of configure. '*'/ >>$tmp/pconfig.h
+
+    sed -f _script $_INP >>$tmp/pconfig.h
+    echo ' ' >>$tmp/pconfig.h
+    echo '/* once:' $_DEF '*/' >>$tmp/pconfig.h
+    echo "@%:@endif" >>$tmp/pconfig.h
+    if cmp -s $_OUT $tmp/pconfig.h 2>/dev/null; then
+      AC_MSG_NOTICE([$_OUT is unchanged])
+    else
+      ac_dir=`AS_DIRNAME(["$_OUT"])`
+      AS_MKDIR_P(["$ac_dir"])
+      rm -f "$_OUT"
+      mv $tmp/pconfig.h "$_OUT"
+    fi
+  else
+    AC_MSG_ERROR([input file $_INP does not exist - skip generating $_OUT])
+  fi
+  rm -f conftest.*
+fi
+m4_popdef([_symbol])dnl
+m4_popdef([_script])dnl
+AS_VAR_POPDEF([_INP])dnl
+AS_VAR_POPDEF([_UPP])dnl
+AS_VAR_POPDEF([_LOW])dnl
+AS_VAR_POPDEF([_PKG])dnl
+AS_VAR_POPDEF([_DEF])dnl
+AS_VAR_POPDEF([_OUT])dnl
+],[PACKAGE="$PACKAGE"])])
diff --git a/media-gfx/scrot/scrot-1.4.ebuild b/media-gfx/scrot/scrot-1.4.ebuild
new file mode 100644
index 000000000000..a41006736faa
--- /dev/null
+++ b/media-gfx/scrot/scrot-1.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools bash-completion-r1
+
+DESCRIPTION="Screen capture utility using imlib2 library"
+HOMEPAGE="https://github.com/resurrecting-open-source-projects/scrot"
+SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="feh LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=media-libs/giblib-1.2.3
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXfixes
+	|| (
+		media-libs/imlib2[gif]
+		media-libs/imlib2[jpeg]
+		media-libs/imlib2[png]
+		media-libs/imlib2[tiff]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+DOCS=(
+	AUTHORS ChangeLog CONTRIBUTING.md README.md TODO
+)
+
+src_prepare() {
+	sed -i -e 's#-g -O3##g' src/Makefile.am || die
+	cat "${FILESDIR}"/ax_prefix_config_h.m4 >> acinclude.m4 || die
+
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	newbashcomp "${FILESDIR}"/${PN}-1.2.bash-completion ${PN}
+}
diff --git a/media-gfx/scrot/scrot-9999.ebuild b/media-gfx/scrot/scrot-9999.ebuild
index 3bf57b1445bc..605a004b7102 100644
--- a/media-gfx/scrot/scrot-9999.ebuild
+++ b/media-gfx/scrot/scrot-9999.ebuild
@@ -34,7 +34,10 @@ DOCS=(
 
 src_prepare() {
 	sed -i -e 's#-g -O3##g' src/Makefile.am || die
+	cat "${FILESDIR}"/ax_prefix_config_h.m4 >> acinclude.m4 || die
+
 	default
+
 	eautoreconf
 }
 
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 9a03a075dbca..b0997b66a18e 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,5 +1,5 @@
-DIST shotwell-0.30.8.tar.xz 6460512 BLAKE2B aecdfa8d90bcce19c38a55872671f6521d8808fa46decba4e9910392f9f8907dd99aaecc825f4e3f6ae747ab151bf5bfa3a807364d571db0fc2ddcaad9a492f5 SHA512 dccd496a083145283c79250329f88fdfe526a98ce84b6d1c52a9c48c9e52a4749bdf2449f3102474c994ef1e687e06767b9bcda03ea97d1168d3417743a6e866
+DIST shotwell-0.30.10.tar.xz 6465992 BLAKE2B d6be2a2b34cf4adbae4ac1f2bce5a29bfe059c546b8ab76f35b3ac9159a9233f231ee1ac4b3f81e8016278fcdec6b222af3ba7a62b2eb8d15dd82ef2cfb544c1 SHA512 4c84b5702476f264bd475fa93eff2e58f2876b076f186fc19b3dbddaae76b80485793b887f668788ac3c7f7230eb0c6a61fef2c0c70d52c665d0e49f6deb0b11
 DIST shotwell-0.30.9.tar.xz 6465508 BLAKE2B 9b302d156b350d5cfa961afaa5d75e71db8b34a65a27de0d3b298841ca9be96d502dc98c85c681ca336965fce72db8034609f3f9c6c04fea1127db6c397e6499 SHA512 a232d717356d7e9f0a6b1ad825f4182dd9f6ee4cca9745717e3bd18ded03cdaba94c32256d055389ce2b0cda0c5828b25d1448c10598a474dc3ea0817fc303ee
-EBUILD shotwell-0.30.8-r1.ebuild 1783 BLAKE2B ea068d6335d7b5d4af0fef2bb571275f0218d384fb118706a948e79177814d6062cb2990ecb43fcf62352986d9f8fae0d02c0318c3481b1277d24524573f90d6 SHA512 c90464d3bd7749d57b3a36aa6352cea07ac47a487c0e7317d1717fb53cfc183dbcb438a22f0314b73d43a31b9555f08acad4eb27d73046d030ef6f3e041d6be4
-EBUILD shotwell-0.30.9.ebuild 1780 BLAKE2B 0673a1e1f01d8ff263cbe0c2e50b4c820ae0819a5ec1ae7d50f3ea80e278204ef3ebb123bfa810a29ef008d57d3e999882ae14ae08b41dbc18367078a2b55572 SHA512 123bed26e43830c4377bfd644a387a8b749967def9b19344eceeb41d658ddf3585190c42145cd644724d269063a782f9d89371339768dfaa722ff29800410067
+EBUILD shotwell-0.30.10.ebuild 1770 BLAKE2B e350fb9b6f1dc16162124ad047b954c0be8433d16e2d36031145ed649bc8e5b45168f3ab00396d5d8bc3c71b5cd6f32d931b45938159975095b32cb9237d8a69 SHA512 cb8918d88b5649661610cdaa269239bbd6f9a03dcc4c9d5d2d62f3a516ad89424f2fd020de7e55d2cd9afc0e2d0c42263131eb32bdd5058662259b50bf33fbe8
+EBUILD shotwell-0.30.9.ebuild 1768 BLAKE2B 0330351fb22d25299ffeffbfd1d202d2fad725619157fe0ebfae5859f5a6ddcb5fea9c845d7c41d990d8f1205dbf36c99600a1f707a2ac1c202a38de3742ab01 SHA512 46dac08f76651649c187833065dd1ce7829f42f4ddb84e829bacaa25eb7ab5d9f22397f392ca1e60e796940490b396e461c93c08e1289f1085725d842643f29e
 MISC metadata.xml 795 BLAKE2B 4b5da2cc205b128a0cb9d10a50c3743b8d12302d266e37d5e0479915824af75af8c22b7b12ffca57146aa0a999e2bff3d7c4969af9e19f317a70b9195b02333f SHA512 d3ceceeed90fd4cadd5e212d047b3d6f7882860d145cb80521a4db8e9baaf461910ff70cb5bb2c1cda991939bf2c8917bb7f252bf68c7487d40271b0419c6322
diff --git a/media-gfx/shotwell/shotwell-0.30.8-r1.ebuild b/media-gfx/shotwell/shotwell-0.30.10.ebuild
index d3ec66a1c974..906964fd3761 100644
--- a/media-gfx/shotwell/shotwell-0.30.8-r1.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.10.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 VALA_MIN_API_VERSION="0.40"
-VALA_MAX_API_VERSION="0.46"
 
 inherit gnome.org gnome2-utils meson vala xdg
 
@@ -12,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
 IUSE="opencv udev"
 
 DEPEND="
@@ -67,6 +66,7 @@ src_configure() {
 		$(meson_use udev)
 		-Dinstall-apport-hook=false
 		$(meson_use opencv face-detection)
+		-Dfatal_warnings=false
 	)
 	meson_src_configure
 }
diff --git a/media-gfx/shotwell/shotwell-0.30.9.ebuild b/media-gfx/shotwell/shotwell-0.30.9.ebuild
index 13b00763e4b1..37d81390d3f9 100644
--- a/media-gfx/shotwell/shotwell-0.30.9.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.9.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86"
 IUSE="opencv udev"
 
 DEPEND="
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index fdf76ea28d83..fae161eb5383 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,6 +1,6 @@
 AUX 3.26-add-control-optional-deps.patch 2773 BLAKE2B e6c3faa98ecda13c926752defef389fd155f615df2010d8499aba7870b929f520662f5c718f457edd5f14f68c26d63ab58a5ee1a583af9f5721d4cf4141385a8 SHA512 e786172609ca64afa85663077794cb146edf7f59bd6187bc253d2ab682f5cf244f5238df18648641f7450ce6add97f2db1adfa11b52a3ba5e29c16356e9fac08
-DIST simple-scan-3.34.4.tar.xz 795228 BLAKE2B b6f185bfbc1954ae2573fd1dcfa54f67e26290654c1019bfd34c229235e27cfc1eb40de0e6d5249f97b73c57745e1133fbd6fd1c3f9bdedb795b61068d5ed25d SHA512 b16b653e0a8ce399ecbdb88c4663d7780793518809eb73681c9c6281b9cde784167090c41720b21c184b9fdece28b07ba61fe8a97f10d792cc7326a458741ba4
 DIST simple-scan-3.34.6.tar.xz 801064 BLAKE2B 94c6bc386c2d7701bd13067e384eb294ce145d2e02d66e366e76a2c85fb5e3ac4e9bae0efa37fe13d3fc857b57c1730bf01961f7968d6744a4ea4dc47308cb23 SHA512 7b2d0eab13f08d4110d2143c4572e249297891e3868e6eb178a7a765b2d56960820931fbda538ede318014c578871657aa0e27518d184f861efc18ad4fdd900c
-EBUILD simple-scan-3.34.4.ebuild 1322 BLAKE2B b6359d130e933254fa3e5350ebb2ac562d4682f5c1af219f07321202e3deab61adf6dc9cd34e1dbbc3a04b0211ed091273e494692fadceca6a52bfebd1383c04 SHA512 16e305af51c31b4f775de7b4afe58cbe7ca51622dfa073c890a3e179b83a5f5853d333042aad26a738fbb19253621cc347e7b8a0984717fa2d04629443a9d219
+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 1329 BLAKE2B 21944ee06e8464b55a1ff8240f6e0c8816fb736093614b698ba7a964e013214aec8c3c010867dc7c3d5ac6688d8a21cb2d0a457dcbfd033d0e41bc203551d908 SHA512 accbc4335878c4c83b2e9dd98821fd5594683456750f3f169d38c261f6c4410f9b09856cd2c78d84df50787f1aa70446704f5ef567a145a252569b2d7af19362
 MISC metadata.xml 616 BLAKE2B 576d986402f8cc708eae60f661640808751747c764d5fe729dd014f33758e0b484a2b80a214d9a3d1ed4bce7e455e34803a62048240e5de8e203184446cdc0df SHA512 6377cb9c20b1ce2db22ba959d386e4389939b72503d87da956d659144b8a6f8b521abdd19dd4c82ac0cb32e260ce6633b75136a353f63b86593f5e1f12394d47
diff --git a/media-gfx/simple-scan/simple-scan-3.34.4.ebuild b/media-gfx/simple-scan/simple-scan-3.36.4.ebuild
index 712e20069e08..a7a3d720bbeb 100644
--- a/media-gfx/simple-scan/simple-scan-3.34.4.ebuild
+++ b/media-gfx/simple-scan/simple-scan-3.36.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="colord webp"
 
 DEPEND="
diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index ba4bdcd95e73..57dce906eb79 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -1,10 +1,11 @@
 AUX slic3r-1.1.7-adjust_var_path.patch 274 BLAKE2B 7f360a202f1bcbeb42619ed7293a5997ebc47ab754fc2fed0c88bbf514bf32b6c72f7c64e9c86efef90d8aec93a72662da599af910c14f6186e0f3cc5b1e9482 SHA512 c13cf1a6f37aa13a9b85093e75de0d2368b4ca4623b28be17e7cfef5740b2b4f4cee69492c099bf936e4ee553e37389b8ffa9ea0df804a80a1cb6295cd198653
 AUX slic3r-1.3.0-boost.patch 338 BLAKE2B 8ae2f8fa44f932f3b43254c027039930a22209a31ac60fe572c0e3b883b5caf3f5b99e76acc0dd64f0b121eb31318d865bb19da1c918855910b36ac8ddb3a289 SHA512 3068908d72c3ddf54b063ac61edd01acec031462b36e25af2a69a635d286477d17f4937fc407fb1c69f6d3d2c2511c83cd40992bd3255c085deeeaa4a55b3213
 AUX slic3r-1.3.0-no-locallib.patch 15462 BLAKE2B 0fd73fbf341573392ebdab3c4d010e1a11cbf424ded6b5b6fab18c05ffde049a8816c2884a06acdbacf0f41ed30b4d136a849eb6bf92e5fb72591e6e0081592d SHA512 cdf791f721ab3a2356631ee9c74c796c48626c8313dd31dab59e880ab181734e892fa341bbb1a648d35303f4fb4a8e3c4615d360c317438876f67de1ef9f9187
+AUX slic3r-9999-boost-173.patch 1152 BLAKE2B 5f37ed2bff40f4f7da867ffb547e7f34f03864b313c8b085d13a8fd9bac9c3ef672e9dc730ac810ccbd5f2032e87f79a5d6d4afe0486c9feaa2fa6f57ed01c5b SHA512 f8045ca3f32a74fb2f657552ea4f85aa5e75bde84ac2db2e05810d8df934e5ce902bc45adfcc02b4ca33c759e0b7e2f6b25db941563a7d3c46ea9ca97240689d
 AUX slic3r-9999-no-locallib.patch 15462 BLAKE2B 0fd73fbf341573392ebdab3c4d010e1a11cbf424ded6b5b6fab18c05ffde049a8816c2884a06acdbacf0f41ed30b4d136a849eb6bf92e5fb72591e6e0081592d SHA512 cdf791f721ab3a2356631ee9c74c796c48626c8313dd31dab59e880ab181734e892fa341bbb1a648d35303f4fb4a8e3c4615d360c317438876f67de1ef9f9187
 DIST slic3r-1.1.7.tar.gz 2079200 BLAKE2B b3aa45741bb92a75dd09be783cb9a8cd551c7736f04022905d11587d8b2a533db85c1f88a9d0185b2b6414ba56d44e0feb104bcfcaf52a0a35a1db912c6976db SHA512 0c3a12890f57f422084b20152ede3467a8624db4ba8be774258df0af963c1f6f41fda7d96967f6355bd95727539e6aad51c30cf45284a7ee3fff294839acc650
 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 2646 BLAKE2B 69887be58dbafebdf1c1eb52c22db40ab4bce885634fc457d4c0ffdc3de64d378bcf8f68081e0f77ffcedb03cb2d2a3bc93101aebff24cee5d58acea2636cf07 SHA512 cc71f52231dfe4c8b10d49d232ef249b8a32ad9ec63db6d943d2ee8b2bc0b0ba028339cdc463c93e95a4d34501e8adf277f3e13f0de69940d6f50c8e6dcdd4b3
+EBUILD slic3r-9999.ebuild 2689 BLAKE2B 1aa5771deef7a1b0b475ebdfb28a1b7866be011da3207fbd7ffa3a215bb4f154afbe2a540fee751d776117be0ffef6d53ac5f837b6d0705239108ab7b5f8d73e SHA512 c96177d936221f8251b3859b24b64a9188eb814354e5a2c849ae87170c5791f8f4433bd020196f1a6c931296f3624eabbaa3b697937d1f1bee2d9b918dd519ab
 MISC metadata.xml 797 BLAKE2B bc34024c8f935d21985d572971a3c28b809dd54e8af65092c98f0f18e9229f9e945732bd36e9620c542260d692e3259aebc38de68c9baca8ba9fa67c3c312cc5 SHA512 13a72e511f2341c9cecc05eca767c348c595d77de4a41a154da93d6bcb31710f24bc51a23abefb08719718194ab3961d3f94697ed97319936e5d9ce625f82da5
diff --git a/media-gfx/slic3r/files/slic3r-9999-boost-173.patch b/media-gfx/slic3r/files/slic3r-9999-boost-173.patch
new file mode 100644
index 000000000000..ef7289afcd8c
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r-9999-boost-173.patch
@@ -0,0 +1,39 @@
+--- a/xs/src/libslic3r/SLAPrint.cpp	2020-05-10 23:32:00.044962439 -0600
++++ b/xs/src/libslic3r/SLAPrint.cpp	2020-05-10 23:40:48.867348908 -0600
+@@ -7,6 +7,7 @@
+ #include <iostream>
+ #include <complex>
+ #include <cstdio>
++#include "boost/bind.hpp"
+ 
+ namespace Slic3r {
+ 
+--- a/xs/src/libslic3r/PrintObject.cpp	2020-05-10 23:32:00.044962439 -0600
++++ b/xs/src/libslic3r/PrintObject.cpp	2020-05-10 23:46:22.614152088 -0600
+@@ -7,6 +7,7 @@
+ #include <algorithm>
+ #include <vector>
+ #include <limits>
++#include "boost/bind.hpp"
+ 
+ namespace Slic3r {
+ 
+--- a/xs/src/libslic3r/SupportMaterial.cpp	2020-05-10 23:32:00.044962439 -0600
++++ b/xs/src/libslic3r/SupportMaterial.cpp	2020-05-10 23:54:17.078033850 -0600
+@@ -1,5 +1,6 @@
+ #include "SupportMaterial.hpp"
+ #include "Log.hpp"
++#include "boost/bind.hpp"
+ 
+ namespace Slic3r
+ {
+--- a/xs/src/libslic3r/TriangleMesh.cpp	2020-05-10 23:32:00.045962432 -0600
++++ b/xs/src/libslic3r/TriangleMesh.cpp	2020-05-10 23:35:44.778426800 -0600
+@@ -15,6 +15,7 @@
+ #include <stdexcept>
+ #include <boost/config.hpp>
+ #include <boost/nowide/convert.hpp>
++#include "boost/bind.hpp"
+ 
+ #ifdef SLIC3R_DEBUG
+ #include "SVG.hpp"
diff --git a/media-gfx/slic3r/slic3r-9999.ebuild b/media-gfx/slic3r/slic3r-9999.ebuild
index d4bc4f6a67a5..61ef1b641af8 100644
--- a/media-gfx/slic3r/slic3r-9999.ebuild
+++ b/media-gfx/slic3r/slic3r-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -75,6 +75,7 @@ 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-173.patch
 	eapply_user
 	popd || die
 }
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 064ebfe83903..0aad9c529ae3 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -3,5 +3,5 @@ AUX tuxpaint-0.9.21-LDFLAGS.patch 853 BLAKE2B 2f68ff92e99697342b1046848b489c7281
 AUX tuxpaint-0.9.21-libpng1.5.patch 838 BLAKE2B bbc335be723205a673896279fdbe21c1b817214e54a470b06170c45e9e0ec78563a600b9251675063ba37a5d97fb63e2f13f37f3e50b0ffa3038e7027c0c0599 SHA512 c860141816023bf0d36d7aac33134e213d0dfb111d9e123c4e1470753eb2a34c6e93046def09ee2a566de1f7b6a9aeb1638f408f935ddbf9c62285129bee7d0a
 AUX tuxpaint-0.9.21-underlinking.patch 592 BLAKE2B 1af0a14e4512b748fb2294e9ebe7ce0f72fa7b9df269ff1ac6c7756327f7fa3728ffd2808e888ab035d6f56ddeae20b269a75ef76e1560b4ce391c60372ea02d SHA512 66f0cea73c2e89353bd0085ae9de280ccf197dd3e253e00b05f4c0aeac2e2489ec94e21ad26a41ca09cce717533bd0010c655498cf9267bba6019bf78e2a836f
 DIST tuxpaint-0.9.21.tar.gz 9543034 BLAKE2B 196a743542d72e3dc5cea69b9e66a3baecdde7e3b288cb6759632d2b472f69db8d70ad404737416afe7f2ef4d0c0d21c7b2caadb64ca8d21a909e275ee6fcc46 SHA512 fafd80fe7a5a4d65236c8b5a4f15c644c76180e0e4ed7e774795572b70cc38ddb3273be2a93f041d74a1e536a5a9386c18e51987425ea1a3ff910661e4b0afb3
-EBUILD tuxpaint-0.9.21-r2.ebuild 1687 BLAKE2B 8129f5e37296aa3bce37269fa3d99f3d3b97b274d2ee0fa0ddca06322009a514a58a29ebe0a77b58a5f1bafe0f381d061da1681f5c78e1b2fb72a70197cadfd3 SHA512 0cf622a7f6eb1867905de448d7f4448b3c071e513b38195e5921ad6c01a777e41d4fc9b563fe9ff855418af1037abf7c5535c9d8f5f0f702f4f435d9f1bb6980
+EBUILD tuxpaint-0.9.21-r2.ebuild 1701 BLAKE2B 8d08863971b633e62022a4264bc3cb22bc20bd9469c35378960f07a0eb606481715ac6924d360648e75f27109283c4fb93de44ab504ee533a2ad6fa9bf06b737 SHA512 53ba744c47ab39730e6db19fea50e44818ed0fee483aa1e4e3a7e1d6cd8b679e1dfd453523956b0cbd447d92808c6c861dcb5109af2470a14fd228eb85d6b945
 MISC metadata.xml 618 BLAKE2B 41214f92d2223b2791c7f79b8add3c494549a9f7e4048d17ec74aa13a56c460d3c83df08bd2f93358e8aa4eb6b497a6f3b9e49cd422a6a17a211341bd44e4bdd SHA512 e1be803667ac0a7a2a364f05f08e0514826292f11b3ff261a215864cfa50d61538f4535a83b0903e85c942098155231725db6e664aee4cfca812a36d670c0f72
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild
index fd4b7f65c002..6c8458138345 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit gnome2-utils multilib toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs xdg-utils
 
 DESCRIPTION="Drawing program designed for young children"
 HOMEPAGE="http://www.tuxpaint.org/"
@@ -11,7 +12,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-
 IUSE="nls"
 
 RDEPEND="
@@ -27,10 +27,16 @@ RDEPEND="
 	media-libs/sdl-ttf
 	x11-libs/cairo
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	nls? ( sys-devel/gettext )
 "
 
+DOCS=(
+	docs/{ADVANCED-STAMPS-HOWTO,AUTHORS,CHANGES,default_colors,dejavu}.txt
+	docs/{EXTENDING,FAQ,OPTIONS,PNG,README,SVG}.txt
+)
+
 PATCHES=(
 	# Sanitize the Makefile and correct a few other issues
 	"${FILESDIR}/${PN}-0.9.20-gentoo.patch"
@@ -56,27 +62,20 @@ src_compile() {
 
 src_install() {
 	emake -j1 PKG_ROOT="${D}" \
-		$(use nls && echo ENABLE_GETTEXT=1) install
-
-	rm -f docs/COPYING.txt docs/INSTALL.txt
-	dodoc docs/*.txt
-}
+		$(usex nls ENABLE_GETTEXT=1 '') install
 
-pkg_preinst() {
-	gnome2_icon_savelist
+	einstalldocs
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 
 	if ! has_version "${CATEGORY}/${PN}"; then
-		elog ""
 		elog "For additional graphic stamps, you can emerge the"
 		elog "media-gfx/tuxpaint-stamps package."
-		elog ""
 	fi
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest
index 9c45ff273c85..2e49dfad8c66 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 2072 BLAKE2B c49e11e2877256db8ad2bfa46a51e2ffd8449c5dfa8f9ca99cbc2a150f5f29169439f314539f727eceaadd1c23e5751b56fd0c9e5034a4020c9f3cd11075028d SHA512 eafd4eaa8d5570ae8fe06e014133b7a3fefe9030fde5d68dbbaab56fcc9c8b7ca0046411ea0c3ba3211d035e982fbee44946b45775877c4231dcab1b7ebf2521
+EBUILD ufraw-0.22-r3.ebuild 2046 BLAKE2B 5fec56e23c541c5442cc7e8a6b30cc8d30a2f00440b716e7ce32e0bb6b59a265095e837cba1d8f28ab9243df239db6e64b31070b56d665b407509a64823150a8 SHA512 6bbdc2eb64abb46dab9e6404b0a470b5791b358b1833910116706abdf21e6e52fc0d644909ba9e67f5472385e06b0b01fe46bbce9f999dec7121214df1498521
 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-r3.ebuild
index 9d1ace9d197d..23f139c7faba 100644
--- a/media-gfx/ufraw/ufraw-0.22-r3.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r3.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 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="contrast fits gimp gnome gtk openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"
diff --git a/media-gfx/uniconvertor/Manifest b/media-gfx/uniconvertor/Manifest
deleted file mode 100644
index 43d09d21e94e..000000000000
--- a/media-gfx/uniconvertor/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX uniconvertor-2.0_pre379-ImageMagick7.patch 2158 BLAKE2B ca11ef1817fa80f0223e4af5737d24ee76c998104645af629f0731387e8c391b3f081083305b197b89dad37e1eab6e2d804ea58cb7632682292645554407218b SHA512 dcc828944a6458fd479906952afc81830777eb38dc58cd461ab8da560c24ec73016be0d318e2b416b29ca2cb04d2cb61dbb16fec41360a86d4a32224e1645029
-AUX uniconvertor-2.0_pre379-abs.patch 215 BLAKE2B 9f898acba90b3f42fda77a32ecc11b4316eb750d514085388c4cf0e4547cafba9cacfefaf48febf0303b4fec3875fc3905e57869941bb35c1f908a04174fa1bf SHA512 4b845caa96367a6da29342dac5d9cc54eb5e43ec8d2205712b9b61275db07db5c72018ab26c4c2770e6537eafb6c35b2b634442dc70f550805c406bdb9f93c37
-AUX uniconvertor-2.0_pre379-import.patch 935 BLAKE2B 5c201dbcac46f297cc2bcb243eecbf6629e54cada8b02b70ecef5a6c82806aba9f4dea090471e03001fc70b6f6c5b52e7721fba4d97d7c9a6505eb6531db81b1 SHA512 a51a182f5fb7694a935553b85174e4f32136046eb45cb7246fc4beb071bf9b953124ffd8d6eeb6d33bda5d53b8733236dca8d5f4a2dd3bad28ec1664976337fc
-AUX uniconvertor-2.0_pre379-libimg.patch 1201 BLAKE2B d25aa6bb28c6328ade007da10207317a6bcfe5c8c38eefa7d440ad6cc473c973fd41e923367d8b125f6d3fbdbac9df54993d398c040942e00b2730dd9c753fc2 SHA512 ff373151caf0c10e9a833ab68cf153d024706293c8000af248cb11a12582216c20f79e0998bdaabce0cc47d3248f786aa55ce9ba8814b1f4bb33e07670dd3136
-AUX uniconvertor-2.0_pre379-test.patch 1544 BLAKE2B 16e8b1ddd6d0ca064a2f1be12ac97bf75dccd3d73fffb252253154779d0175ac292a08f4bb38deeb815a5e6cf624a9ff80654627e46d02655c315fd7b2a640ce SHA512 760ea5ced19040d0d29230f9d6fdafafd7f6fcdd727e18261730b7696d0e9a85037cdceab8e20f202a79bd7b8c84edfa7f21619bfde1320bbdc1e1d0c6d298db
-DIST uniconvertor-2.0_pre379.tar.xz 1844780 BLAKE2B 51698d88941be700dd31e5527a8ffc8b2548d9f1323242e8f31a3ad00f2e4a2c5617be87443b130d664aeceea8b96ff17b72dfe32964854cc8f121351a918ec3 SHA512 3a0dd8e52addb391225ae148a673e3464a04e0d36e5955e496ef78e91597408706e5cbc06113b3e959446c6dd89aefa821f32ef81a5d1837a2a3d405a5a63dea
-EBUILD uniconvertor-2.0_pre379-r2.ebuild 1842 BLAKE2B c90a6f269ad8891c05ff22016b2d1d95316fec86c16e06200679597b804745d4fb18b202196ad5444a40e51d8701a98c33626a532ec88263c2580369e6af2db2 SHA512 65198e23b0f6c3dcd047dd9541d700cfab5104e977679249a80a72feb3042ab213b812f5100587df1283d9833e8252a4dc86da925af9c960d02ec622bbac2bf7
-MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-ImageMagick7.patch b/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-ImageMagick7.patch
deleted file mode 100644
index c79b79231587..000000000000
--- a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-ImageMagick7.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- a/src/uc2/libimg/_libimg.c	2013-02-25 11:20:00.000000000 +0100
-+++ b/src/uc2/libimg/_libimg.c	2016-07-11 09:41:03.721305655 +0200
-@@ -16,8 +16,8 @@
-  *	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
-+#include <MagickWand/MagickWand.h>
- #include <Python.h>
--#include <wand/MagickWand.h>
- 
- static PyObject *
- im_InitMagick(PyObject *self, PyObject *args) {
-@@ -184,33 +184,18 @@
- 	else if (img_type == GrayscaleType){
- 		return Py_BuildValue("s", "GrayscaleType");
- 	}
--	else if (img_type == GrayscaleMatteType){
--		return Py_BuildValue("s", "GrayscaleMatteType");
--	}
- 	else if (img_type == PaletteType){
- 		return Py_BuildValue("s", "PaletteType");
- 	}
--	else if (img_type == PaletteMatteType){
--		return Py_BuildValue("s", "PaletteMatteType");
--	}
- 	else if (img_type == TrueColorType){
- 		return Py_BuildValue("s", "TrueColorType");
- 	}
--	else if (img_type == TrueColorMatteType){
--		return Py_BuildValue("s", "TrueColorMatteType");
--	}
- 	else if (img_type == ColorSeparationType){
- 		return Py_BuildValue("s", "ColorSeparationType");
- 	}
--	else if (img_type == ColorSeparationMatteType){
--		return Py_BuildValue("s", "ColorSeparationMatteType");
--	}
- 	else if (img_type == OptimizeType){
- 		return Py_BuildValue("s", "OptimizeType");
- 	}
--	else if (img_type == PaletteBilevelMatteType){
--		return Py_BuildValue("s", "PaletteBilevelMatteType");
--	}
- 	else {
- 		return Py_BuildValue("s", "UndefinedType");
- 	}
-@@ -235,9 +220,7 @@
- //HSBColorspace,
- //HSLColorspace,
- //HWBColorspace,
--//Rec601LumaColorspace,
- //Rec601YCbCrColorspace,
--//Rec709LumaColorspace,
- //Rec709YCbCrColorspace,
- //LogColorspace,
- //CMYColorspace
-@@ -305,15 +288,9 @@
- 	else if (cs == HWBColorspace){
- 		return Py_BuildValue("s", "HWBColorspace");
- 	}
--	else if (cs == Rec601LumaColorspace){
--		return Py_BuildValue("s", "Rec601LumaColorspace");
--	}
- 	else if (cs == Rec601YCbCrColorspace){
- 		return Py_BuildValue("s", "Rec601YCbCrColorspace");
- 	}
--	else if (cs == Rec709LumaColorspace){
--		return Py_BuildValue("s", "Rec709LumaColorspace");
--	}
- 	else if (cs == Rec709YCbCrColorspace){
- 		return Py_BuildValue("s", "Rec709YCbCrColorspace");
- 	}
diff --git a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-abs.patch b/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-abs.patch
deleted file mode 100644
index c344f8b1c54d..000000000000
--- a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-abs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/uc2/formats/sk1/sk1objs/curvelow.c
-+++ b/src/uc2/formats/sk1/sk1objs/curvelow.c
-@@ -24,6 +24,7 @@
- 
- 
- #include "math.h"
-+#include <stdlib.h> /* abs() */
- // #include "X11/Xlib.h"
- #include "curvelow.h"
- 
diff --git a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-import.patch b/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-import.patch
deleted file mode 100644
index fae5535c6492..000000000000
--- a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-import.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- src/uc2/formats/sk1/model.py          | 2 +-
- src/unittests/image_tests/__init__.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/uc2/formats/sk1/model.py b/src/uc2/formats/sk1/model.py
-index 33e2b55..59aecf2 100644
---- a/src/uc2/formats/sk1/model.py
-+++ b/src/uc2/formats/sk1/model.py
-@@ -16,7 +16,7 @@
- #	along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
- from copy import deepcopy
--import Image
-+from PIL import Image
- 
- from uc2 import _, uc2const
- from uc2.formats.pdxf import const
-diff --git a/src/unittests/image_tests/__init__.py b/src/unittests/image_tests/__init__.py
-index 031cd9f..6165129 100644
---- a/src/unittests/image_tests/__init__.py
-+++ b/src/unittests/image_tests/__init__.py
-@@ -16,7 +16,7 @@
- #	along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
- import unittest, os, shutil
--import Image
-+from PIL import Image
- 
- 
- _pkgdir = __path__[0]
diff --git a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-libimg.patch b/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-libimg.patch
deleted file mode 100644
index f84b332ec63e..000000000000
--- a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-libimg.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- setup.py | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 46cda83..5cfd22a 100644
---- a/setup.py
-+++ b/setup.py
-@@ -184,14 +184,14 @@ modules.append(cairo_module)
- #		libraries=['potrace'])
- #modules.append(trace_module)
- 
--#libimg_src = os.path.join(src_path, 'uc2', 'libimg')
--#files = make_source_list(libimg_src, ['_libimg.c', ])
--#include_dirs = make_source_list(include_path, ['ImageMagick', ])
--#libimg_module = Extension('uc2.libimg._libimg',
--#		define_macros=[('MAJOR_VERSION', '1'), ('MINOR_VERSION', '0')],
--#		sources=files, include_dirs=include_dirs,
--#		libraries=['MagickWand'])
--#modules.append(libimg_module)
-+libimg_src = os.path.join(src_path, 'uc2', 'libimg')
-+files = make_source_list(libimg_src, ['_libimg.c', ])
-+include_dirs = make_source_list(include_path, ['ImageMagick-6', ])
-+libimg_module = Extension('uc2.libimg._libimg',
-+		define_macros=[('MAJOR_VERSION', '1'), ('MINOR_VERSION', '0')],
-+		sources=files, include_dirs=include_dirs,
-+		libraries=['MagickWand'])
-+modules.append(libimg_module)
- 
- if os.path.isfile(os.path.join(include_path, 'lcms2.h')):
-  	pycms_src = os.path.join(src_path, 'uc2', 'cms')
diff --git a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-test.patch b/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-test.patch
deleted file mode 100644
index 2a3e3a00601f..000000000000
--- a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-test.patch
+++ /dev/null
@@ -1,37 +0,0 @@
- src/unittests/_libimg_tests/__init__.py | 2 +-
- src/unittests/image_tests/__init__.py   | 4 +++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/unittests/_libimg_tests/__init__.py b/src/unittests/_libimg_tests/__init__.py
-index 3891290..cdc7dd6 100644
---- a/src/unittests/_libimg_tests/__init__.py
-+++ b/src/unittests/_libimg_tests/__init__.py
-@@ -84,7 +84,7 @@ class TestCoreLibImgFunctions(unittest.TestCase):
- 	def test07_image_type(self):
- 		names = []
- 		names.append(['type_bilevel.png', 'BilevelType'])
--		names.append(['type_grayscale.png', 'GrayscaleType'])
-+		names.append(['type_grayscale.png', 'BilevelType'])
- 		names.append(['type_palette.png', 'PaletteType'])
- 		names.append(['type_palettematte.png', 'PaletteMatteType'])
- 		names.append(['type_truecolor.png', 'TrueColorType'])
-diff --git a/src/unittests/image_tests/__init__.py b/src/unittests/image_tests/__init__.py
-index 031cd9f..265743a 100644
---- a/src/unittests/image_tests/__init__.py
-+++ b/src/unittests/image_tests/__init__.py
-@@ -42,6 +42,7 @@ class TestImageFunctions(unittest.TestCase):
- 	def tearDown(self):pass
- #		shutil.rmtree(self.save_dir)
- 
-+	@unittest.skip("Broken")
- 	def test01_create_new_image(self):
- 		for mode in MODES:
- 			image = Image.new(mode, (100, 100))
-@@ -77,6 +78,7 @@ class TestImageFunctions(unittest.TestCase):
- 				result = False
- 			self.assertNotEquals(False, result)
- 
-+	@unittest.skip("Broken")
- 	def test04_load_unsupported_images(self):
- 		for name in FILES2:
- 			filename = os.path.join(self.load_dir, name)
diff --git a/media-gfx/uniconvertor/metadata.xml b/media-gfx/uniconvertor/metadata.xml
deleted file mode 100644
index 1b2becffa26c..000000000000
--- a/media-gfx/uniconvertor/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild b/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild
deleted file mode 100644
index d3c2dfdf93f7..000000000000
--- a/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Convert vector graphic file formats like .cdr, .svg, wmf and more."
-HOMEPAGE="https://sk1project.net/modules.php?name=Products&product=uniconvertor"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2"
-IUSE=""
-
-RDEPEND="
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	media-gfx/imagemagick:=
-	media-libs/lcms:2
-	dev-python/pillow[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-text/ghostscript-gpl"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-import.patch
-	"${FILESDIR}"/${P}-libimg.patch
-	"${FILESDIR}"/${P}-test.patch
-	"${FILESDIR}"/${P}-abs.patch
-	)
-
-python_prepare_all() {
-	local wand
-	wand=$(pkg-config --libs MagickWand | sed -e "s:^ *::g" -e "s: *$::g" -e "s:-l:\':g" -e "s: :',:g" -e "s:$:':g" -e "s:,'$::g")
-
-	distutils-r1_python_prepare_all
-
-	sed \
-		-e "s@/usr/include@${EPREFIX}/usr/include@" \
-		-e "s@/usr/share@${EPREFIX}/usr/share@" \
-		-e "/libraries/s:'MagickWand':${wand}:g" \
-		-i setup.py || die
-
-	# https://bugs.gentoo.org/581816
-	if has_version ">=media-gfx/imagemagick-7.0" ; then
-		sed  -e "s:ImageMagick-6:ImageMagick-7:" -i setup.py || die
-		eapply "${FILESDIR}"/${P}-ImageMagick7.patch
-	fi
-
-	ln -sf \
-		"${EPREFIX}"/usr/share/imagemagick/sRGB.icm \
-		src/unittests/cms_tests/cms_data/sRGB.icm || die
-}
-
-python_test() {
-	einfo ${PYTHONPATH}
-	#distutils_install_for_testing
-	cd src/unittests || die
-	${EPYTHON} all_tests.py || die
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/xdot/Manifest b/media-gfx/xdot/Manifest
index fc97c960363f..30092ce0212f 100644
--- a/media-gfx/xdot/Manifest
+++ b/media-gfx/xdot/Manifest
@@ -1,4 +1,4 @@
 DIST xdot-1.1.tar.gz 134215 BLAKE2B e241a4fb1ec69a8613f7813dc159761e6bffb82ea9f58876287d01946f4c93e66e5eef66e6844abb7738979412c2c7d2d26f76bc0563ad0c3c8550d9e8023b47 SHA512 d67c45c8c071013551f79d671a21ce546b680fac5997ba9631a882ffa3c44c15a69949643ed5e8211417006152575a1d99450ccfb6062427521d1e2bc0814f55
-EBUILD xdot-1.1.ebuild 1129 BLAKE2B 6316813447e8d0588018c93955c2bed5012df4669ce17b885122d267b512cdc65b2196a443a3398591e7b4063b58d0faed989f1d0ede51c269ecd333e81af031 SHA512 c73f5b741eac3a227435408eb57bb73dd832bb6e62217edd01a41ad9b285f2dccebed50ca976043053dd115568d7db8622e7e23576fe5bba6bad83e7cff613fe
-EBUILD xdot-9999.ebuild 1102 BLAKE2B 154a7034a320211af04a977697e0e8fd7ea53ab37de9ef0e5d34fc60f13ab8c7e8861c1d4e24ae8a0a2a2e727ab3cd57070338ce058f693946eacfc98e7b2ef7 SHA512 86d2c030cadded62e64e90466ade5733919487fb07e816b089e6cd98f88345ad5f0d00460e47dac10dbe536c84292b347e3b916e12fafa6c97448759ca92daed
+EBUILD xdot-1.1.ebuild 1131 BLAKE2B 8cbb12c6cf8e7d4d9ae7f21519be9f512257dabb46f7cb18251c7128e318e1a0c3197df884362206a2a3d8c4ca868d46f9d312a74dfebd5d758905425813b48c SHA512 4d25cb15d1c705217272e38f3215a2b25a3610a84f26752cee69568e3dc8d329099d387d769dde6217262c42dc422f7adfa7a164fa9cf3624439e109e7864cec
+EBUILD xdot-9999.ebuild 1136 BLAKE2B 6f437471ef3c8574cf84b2acd7f65c735f7aa06e4566616dc9a7dd1ca1044b5488b42dc50dbdded9ee92be2d96a3c642757e8813cc4fcf1e835c48e2b6d929a6 SHA512 1b0b8322537735e66e72fad2a846e4244ba5b8c79ba2ba67a4667cb07839df67050b8b92b72c56ba115f51a7f1c159e2c7e0b46d1f4d2e3dfbdcf040cc77c320
 MISC metadata.xml 483 BLAKE2B 50b03bb7d189da9bd6ca793f30c1ba3d13d12151533b42c99321a849515d7664398ec1b10720596c0453c48d35e2a6083b0559eb127199e1d6f4fc2a93aa04c4 SHA512 7e734dd60daa1e74b28f0932f508787e8deebc75a8f46c41f77007b6c8f96751cd6b07f6638cb89b38eb81d4fd2c6f7ba9f6d449f24f17ad25fb001d7f4f5ff7
diff --git a/media-gfx/xdot/xdot-1.1.ebuild b/media-gfx/xdot/xdot-1.1.ebuild
index ab6cb8df3ba5..1feb05b5fa48 100644
--- a/media-gfx/xdot/xdot-1.1.ebuild
+++ b/media-gfx/xdot/xdot-1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 MY_PN=xdot.py
 EGIT_REPO_URI="https://github.com/jrfonseca/${MY_PN}"
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 	SRC_URI=""
 else
-	KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
+	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"
diff --git a/media-gfx/xdot/xdot-9999.ebuild b/media-gfx/xdot/xdot-9999.ebuild
index 8eb74e58ccb6..6c4786522753 100644
--- a/media-gfx/xdot/xdot-9999.ebuild
+++ b/media-gfx/xdot/xdot-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 MY_PN=xdot.py
 EGIT_REPO_URI="https://github.com/jrfonseca/${MY_PN}"
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~x86"
+	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"
diff --git a/media-gfx/xsane/Manifest b/media-gfx/xsane/Manifest
index 5b4fd2e1c824..1fef601b60db 100644
--- a/media-gfx/xsane/Manifest
+++ b/media-gfx/xsane/Manifest
@@ -2,5 +2,5 @@ AUX xsane-0.999-lcms2.patch 11790 BLAKE2B 0fd549512d56635e9a41620ba097d4db8f103b
 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 2209 BLAKE2B e87b97733e6d5a6670334901b08dcba2aec60abb479b96b02af0344e4b74c0b3659bb546cae84f13896d3762997bf93b42853a8382e6bea76d123401a90dd905 SHA512 90b876433b8b3aa2f4d5190ee2d8de527105c3184d7a90110308a1db694a6836c5f487ea8bc5997f1b6af543c81382071c3d81fd8d59dab4d433961737900b46
+EBUILD xsane-0.999-r2.ebuild 2187 BLAKE2B fd9e08c5327b3456acfec78efd7f22dc40aec9200989f63e9a351cd80bad042335b5149d3cd22e0ea07e4887da86468e93d87694beafe0309713cbaf38f57a28 SHA512 007a65f4365c17dc5a21d92453032704c1b4d29f181c00ccc46d2eef12f0e1d7187f936f1dd310385d51716e38cd0bee2c8e4606ee55d930cb417a9108b9b27e
 MISC metadata.xml 370 BLAKE2B 800a5ac17360397771b4021cdd36777cd546b8f32132f5edc380cec9c1aa41d10daa1d67da06230b447f5115c6296e36aa1ca881f923d3238ace1f8a48584891 SHA512 c00b90634545ce757206fa7d23b345e11afe409813f16312bb4dea494f8d0342996f994623dec0939bc40e13395a1be8a40b014064dcc039f669efcd7fd7b19f
diff --git a/media-gfx/xsane/xsane-0.999-r2.ebuild b/media-gfx/xsane/xsane-0.999-r2.ebuild
index 9c0f60ec0b39..da19a27bb818 100644
--- a/media-gfx/xsane/xsane-0.999-r2.ebuild
+++ b/media-gfx/xsane/xsane-0.999-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls jpeg png tiff gimp lcms ocr"
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
commit	3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree	c513fe68548b40365c1c2ebfe35c58ad431cdd77 /media-gfx
parent	05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)