gentoo resync : 10.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
commit: 71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree: 9f1f0dee23e13658e52f49437befe78427148c51 /media-gfx
parent: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)
89 files changed, 458 insertions, 364 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 2757a31e1581..0e2c353470b1 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index d1c1bdf5d67d..0a716d92b711 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -13,6 +13,6 @@ AUX alembic-1.7.9-prman.patch 822 BLAKE2B ed5faf9b8e4eb165b82a5001b129403ce0afcb
 AUX alembic-FindIlmBase-pkgconfig.patch 971 BLAKE2B 946766bceb152a1673737af5158be9f5efce812a70adfe36bf5642f150d2576f14c22670cc1bbf9027834c69ac661ca30d27f06f9fbf73f656dd883ce38a381f SHA512 4f5fa5a33c8fb4edcb3c0a5d0290a912015c0e02ecd6340e5dced1f658302034148a1050aee1dcbf3d7d89f11c5e9ea07637c659414951152dd49081c70560c7
 DIST alembic-1.7.11.tar.gz 826833 BLAKE2B ea2ee92cefcc92d3658b8c71351ec0f72bd1fb5d5b6c771ceebe81b1db61a280420f480cd3612f44bc134cccb388954be89baba9dc6e5973e102bc55d65cd974 SHA512 94b9c218a2fe6e2e24205aff4a2f6bab784851c2aa15592fb60ea91f0e8038b0c0656a118f3a5cba0d3de8917dd90b74d0e2d1c4ac034b9ee3f5d0741d9f6b70
 DIST alembic-1.7.9.tar.gz 813379 BLAKE2B 599edeb5ad805656755b3e150fba56182d1d60673951b0c1702b3e3e82d9499ec4fcb938303103c27f84458f61ab8de4b872eaa322380ae7713e3b4cd3831af7 SHA512 8025c20525ffbd5bdc9dd5a33ad8238e49f063d244ab9d112e7d1ddb7ee7cf9b36ceb74cb45d658ce22d3033552c89bddf6b818cf466ea46aa1a70a41fdeddb2
-EBUILD alembic-1.7.11.ebuild 3116 BLAKE2B 4e99e8f09a6dbb375e9625bfd741b041c5eeb025719f976184b0fcc38de33e85760bb361f49749271cc72cc54e1fb28f061a0ae4a2768aa7bf72d57f1ba34a67 SHA512 fdccd1f49994b8dece041f51c3025a6e65df979f4c92e3ccff2857e553cf2fefe02d928a3472494c79190bdd8db49eb2ffb6224c851b8e96cf2ba70c2d2c215b
-EBUILD alembic-1.7.9.ebuild 3042 BLAKE2B 34e36d9afba3d755b7bb9b93d3c05752cb59b1e9243e8c65400b8ed720ae0d506611508ca4b77bbc6f6d9454f658781351da5f3da3f65ddeac703aeb20de741a SHA512 9432e74649534ae0ce54a8879168b1ae2fac5f33b082fd01c164b42adcb9da93efcbd3e806e7ea226c5a432d380b763b23cb6bc012bbd18e20b77e19ed36c91a
+EBUILD alembic-1.7.11-r1.ebuild 3159 BLAKE2B 38f7f04e3878247c1caa0200c0cf8043102742db00c09188c44c43828c7c8030394f75b4f632817fa5cd51fa81697d2c220333c3a9d34e605bccb07c49d6385f SHA512 7bd681f7e9d9da198657b66cdf31a4e2f9a32f0140bfbf2553bf7fac8f7513132056f0760951362b5835fea9995b0e54af71925c5dd2c4b79e979155ba525818
+EBUILD alembic-1.7.9.ebuild 3085 BLAKE2B 48e9c79a0d0234be4cf1a2a175813b91d29948a14373ff0f8f5fb62d3f95dbc7937d0bb83024683598c52c898e63a0178d8767560dcf83e6c4b02d7b4b2fa1e7 SHA512 6252f40f1f0ea0c1bbee9cd7f2867b77024bb79a15cf4d01ee98bfdd7c5846ed2e0150f67047e87b1dec2c957df608fa1ea42fc7d06a4014a3f5aafb81f8e9d2
 MISC metadata.xml 1343 BLAKE2B b0e902df8e5f04bcbe4e784abe396b926db2de2347560181ab77ee60da7cec55ab10aafda38623109681240992b8b43208fc65fe72fc8dd66cf6ebf09defc085 SHA512 af9abd189b8c15b53b60b818a7ce419b812092ba1725ebfa4d3267c5d2f67018c7f3cc06bc24fe9af614fb420b4f8176585a53920378521779c4ca52c39c22cc
diff --git a/media-gfx/alembic/alembic-1.7.11.ebuild b/media-gfx/alembic/alembic-1.7.11-r1.ebuild
index eaf86523653f..8f112f0a4fd3 100644
--- a/media-gfx/alembic/alembic-1.7.11.ebuild
+++ b/media-gfx/alembic/alembic-1.7.11-r1.ebuild
@@ -28,10 +28,12 @@ REQUIRED_USE="
 RDEPEND="
 	${PYTHON_DEPS}
 	>=media-libs/openexr-2.3.0:=
-	boost? ( >=dev-libs/boost-1.65.0:=[python,${PYTHON_USEDEP}] )
 	hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] )
-	python? ( >=dev-python/pyilmbase-2.3.0[${PYTHON_USEDEP}] )
+	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}
diff --git a/media-gfx/alembic/alembic-1.7.9.ebuild b/media-gfx/alembic/alembic-1.7.9.ebuild
index 7acd86b893c6..c04e8c9b6f6b 100644
--- a/media-gfx/alembic/alembic-1.7.9.ebuild
+++ b/media-gfx/alembic/alembic-1.7.9.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
@@ -28,10 +28,12 @@ REQUIRED_USE="
 RDEPEND="
 	${PYTHON_DEPS}
 	>=media-libs/openexr-2.2.0-r2:=
-	boost? ( >=dev-libs/boost-1.65.0:=[python,${PYTHON_USEDEP}] )
 	hdf5? ( >=sci-libs/hdf5-1.8.18[zlib(+)] )
-	python? ( >=dev-python/pyilmbase-2.2.0[${PYTHON_USEDEP}] )
+	python? ( >=dev-python/pyilmbase-2.2.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}
diff --git a/media-gfx/apngasm/Manifest b/media-gfx/apngasm/Manifest
index 076960af9f7b..4f0b781c840b 100644
--- a/media-gfx/apngasm/Manifest
+++ b/media-gfx/apngasm/Manifest
@@ -1,7 +1,4 @@
-AUX apngasm-2.7-string_h.patch 411 BLAKE2B 2b41abb2b338110e65e69412a392c3bcc835cb6808e7235d7ccc38807647f4bdf9a3936305593593b04857bb1a004d5cec4434825c9d53a5ba8ec3858831b401 SHA512 00605660094af0c8f7bbd96a94e02b0ed505f0e2d8bf6643fc6d6d5f92e40411f409630c1d0c538bf874dfd31ccfea2363fea7640edadde5fe2c4d9e15e3e524
 AUX apngasm-2.91-makefile.patch 585 BLAKE2B 8972e2c3b59f4d128f522309496ed643046a18684e003503046927db4e1be06219a9c6818b75bcb0497c7ef5057a91c5f4bee837abca95c89eb79fa8da0fa39e SHA512 f3b9b89ee3071c01bdc08f8a09864956d258abf14aac147a754f6259297ce8a479a067ee5d37225b7dee0f4f419bef53e127266ae770063cdafa478c78d6eda2
-DIST apngasm-2.7-src.zip 11448 BLAKE2B 848a5c9be65bacb3297c9f0b54235f2143be91840c5f0730c0c7bd1c6d273855d730eb9722860f7543eb6e57e8ace5b775f73f5789ee6814f5d62fec02bd2b14 SHA512 28ec70a4ac02021ff85390ad6863aaca5451937209345128ecd5baf76bef9495168c3c4ee5d823afbeb569ca673328673a81b807e7985c3d5d1843c056af7810
 DIST apngasm-2.91-src.zip 597267 BLAKE2B a34a765fef49aa0ac29973b8dc450bfcdfe7aa83dffe19919f916a136db3d0bfebf3c1fac79bfb81a3900cee87afd888469e5432500d181a9539696b4573a42b SHA512 2415389a989f7a7ff7f3e1328f7920c7515c9a492c89ef216ff53db68fe2f1a674ff60d5f4bfd5a8c710f625456557ae7d5b25f486ac826e3113976cd9fc11dc
-EBUILD apngasm-2.7.ebuild 716 BLAKE2B 4107ecdef38e348c4df536a50b4d5646082d7dd19f801326f312d3e6bb13867a4f33cf72a24fe1d0c88df236d911d1d137a41d546fb484caa29485516e6ed714 SHA512 52952bcdc1e070979037174b0477ec6f51c661368f436282eb3556db4a10b63c593e607b284d52ad7ba29ef6732d8b6714a56ed4b2ee310c4b728b6698d09df1
 EBUILD apngasm-2.91.ebuild 974 BLAKE2B 40fa7aad5e2fde3388968668a956a1adc6a161de1e32271334a4f938f82adf5665e37ff77db5c56f97e757bb1f5c326cccb1f6085fa6d82e80e1f66625802480 SHA512 0f5a60881ca232d9efea50d3feda4501e5394a52e0411addc61171d248e8b8b309936c8e59ba10bc2104138268f5b9418a7408852861f013d254fc3f63b0bd55
 MISC metadata.xml 479 BLAKE2B 9307c8ff6da1b0010362d8bdb070e6de22c15ba492e71890882adb87c849bd7e3a639bdf8b0d278b0c2df3894f50a71ade73970daba7573b1b4ea968baa5e2e0 SHA512 a630460ee809f9bb4e7ac231cf5d53b9b560926eb515d9a698a1e2d5f6f4318f771cf77e3f47f256b7458a9b1dba67bbc654cf6f9d4bd9e194490b2cd32c8e31
diff --git a/media-gfx/apngasm/apngasm-2.7.ebuild b/media-gfx/apngasm/apngasm-2.7.ebuild
deleted file mode 100644
index 49660f693fc4..000000000000
--- a/media-gfx/apngasm/apngasm-2.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="create an APNG from multiple PNG files"
-HOMEPAGE="https://sourceforge.net/projects/apngasm/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-src.zip"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-libs/libpng:0=[apng]
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	virtual/pkgconfig"
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-string_h.patch #465780
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LDLIBS="$($(tc-getPKG_CONFIG) --libs libpng --libs zlib)" ${PN}
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc readme.txt
-}
diff --git a/media-gfx/apngasm/files/apngasm-2.7-string_h.patch b/media-gfx/apngasm/files/apngasm-2.7-string_h.patch
deleted file mode 100644
index 303e832b37c5..000000000000
--- a/media-gfx/apngasm/files/apngasm-2.7-string_h.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/465780
-
-Same for all of memcpy(), memset(), strlen() and strcpy():
-
-apngasm.c:141:11: warning: incompatible implicit declaration of built-in function ‘memcpy’ [enabled by default]
-
---- apngasm.c
-+++ apngasm.c
-@@ -29,6 +29,7 @@
-  */
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include "png.h"     /* original (unpatched) libpng is ok */
- #include "zlib.h"
- 
diff --git a/media-gfx/birdfont/Manifest b/media-gfx/birdfont/Manifest
index 35c5aac72f42..211387d1771d 100644
--- a/media-gfx/birdfont/Manifest
+++ b/media-gfx/birdfont/Manifest
@@ -1,3 +1,3 @@
 DIST birdfont-2.18.3.tar.xz 2333612 BLAKE2B bf1b92bd17b0d9970d091fcbbaadb5a027da35bee57cb9e11611959bf8ca09b08d582aa3e6a950a0b1b26688a8fbb3987197bfabb6156097da6a1343426dc051 SHA512 c86fff4e40ecfc571e3880cfa99f6adf518daae5476ea1b2a78bab031bc832bc5c8d58ecc928eda4922134fd3ceca312b80cbb8cf2fd35ecb8dc7656addb854e
-EBUILD birdfont-2.18.3.ebuild 1820 BLAKE2B 1c2ec7495d671e92344771f2e796d73f04daa8426f858ddf02a0c05deb2392ec2bba98606dc2414e43c37c78e6c2b4d13bb03e9b560b084c23281defe1a1fc62 SHA512 980ce17734d809e00a7e39eecef4ad38dd65fe2c5268d5139f787b0f52d419513cda3edd9fe851d64b2093b3431f6b25c35bb435330590560fdd803c3421757d
+EBUILD birdfont-2.18.3.ebuild 1814 BLAKE2B ff853cbd2de046d8a55312f2bd3dbb512689b38f0f33e5bb92f88e253ee88f20d6daa91d9b5248dc90dd7fae16ca7e8542d8419d3bc4e3b6332e6c3ce17112f0 SHA512 7656a32ba0c00e3b22f4071a9f090c1786c513c38e3ee6c928a8d6d2456e1f38f16705c3b757d6f36d7c84385d902935977b90c9d5a1eeb9b26d276f48473db5
 MISC metadata.xml 352 BLAKE2B a73cbe4b01dfc96aa631fc89a7bbc140d85eeb4e8757965a35a6d5cfcbd74d72499ecdeddabe963a972b9411c83c0099faf88dcef61df8cf1c9dc1b33af051a6 SHA512 ef910c9c78ad31aff97b15546e892bfa52a18ca9ccbf2b325c96c60f440fa09d5535ea2455e42dba2a11983b4e8b7eb7c3881c47fa6d43df6a22ac4d01535adc
diff --git a/media-gfx/birdfont/birdfont-2.18.3.ebuild b/media-gfx/birdfont/birdfont-2.18.3.ebuild
index e1ed19434590..22980e4c63ff 100644
--- a/media-gfx/birdfont/birdfont-2.18.3.ebuild
+++ b/media-gfx/birdfont/birdfont-2.18.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PLOCALES="cs de it nl pt_BR sv"
 
 inherit python-any-r1 vala l10n toolchain-funcs multiprocessing
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index b0cb5b71fd6a..d13148e73ab5 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -3,5 +3,5 @@ AUX blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch 1265 BLAKE2B bff3ae
 AUX blender-2.79b-gcc-8.patch 1259 BLAKE2B 7d204a953c71e656fb309e0560e2de03a9316a95e67a76ecdeb303fadeeca14338ba823d6780a50b62bf4686477a962030b42b15ceae12d48ab21034b0358cc1 SHA512 df0a6a0543a7feac22e6082652792e59ce675dcea99a821c480d5c13e42e9df4d7ab43c71d296a22dd195771714e630757b1e220177d3713f409ea21e9251504
 AUX blender-fix-install-rules.patch 518 BLAKE2B 178929de7adb1b4a0063134da93248af8c2c42fe0d3e9730833272b4fe8387075ce592ee65668cc9862a1ad10c9857a31b3f1c0614c9e69f937998ccb5c86a17 SHA512 5343f0e9e6bba2d15a38cb5db95a1aeff0a704c0762e558b9b74d88dd58e2fb5077289f0d8f25a61fa092d083f7db916d27c4642dfd7cf84d4c989258c3253ec
 DIST blender-2.79b.tar.gz 50204270 BLAKE2B 78bda294df783ee9bcbcf32f9a112737b2947da5146fd4351b8b36d81c6630ed0ea302b2fb539642cfbdcc4b64df35af5c8545a3bbf50b1cf87dcf3a60eb4ac0 SHA512 2db21ace446168dd683cdb5aad9dec001f8888ae4e9603a04ddb44fb78489ded827deb07e83712b0f1118a0e7bf66f2a5d935dc4ebb3a6703d72672ff414367f
-EBUILD blender-2.79b-r1.ebuild 8224 BLAKE2B bb325cfee1c3a4ac320a1593489bd9abb5927cc9424b34e048b504e6766cbde7112235f0cd5a4d3259a5840f5cacac040aabbc16c17b463617182da0e2f9bac6 SHA512 cd9fd8fdfb9494da34fc832e553fcba803ab532ad78795134073b20d2640e315a87dac800ddb4cbdf97a94df208f09952015983439aefd29aabf9ff023d47a0b
+EBUILD blender-2.79b-r2.ebuild 8274 BLAKE2B 3c110299aa516d3ae43ff98e0cdeea86941d0b7a18bd73a954c8205fafe1f0aa989941004bae14a2748c15ac67ef7f0277f4d509984eef2be65e30547aaa2950 SHA512 3452dea9674903b566b4ba941fecf1528a2d71d9e5b1f8cf323e2f1690265d4e4bf970b97f2d23d391ae995aed843cbf1f748086b8d1df93731ee4d8c6215ca4
 MISC metadata.xml 2628 BLAKE2B b6ac04e033bd54bf3b6918737289e0a12ece3f87543b033ff85748934b6cecdb0cf8084a3c0e7fd766965b6defa4a402980244bec1a0ed2772ffbd12bfe96a8f SHA512 a47e7a85cc98bf0befad9b5ef5ad75276a6649bb5949367294177f19ae763a3dd0eae1ce8d179463c18c33533c37c283c7beabe08fe27d861bd54eb761675e35
diff --git a/media-gfx/blender/blender-2.79b-r1.ebuild b/media-gfx/blender/blender-2.79b-r2.ebuild
index 22c4be8b581b..e71d9db67e3a 100644
--- a/media-gfx/blender/blender-2.79b-r1.ebuild
+++ b/media-gfx/blender/blender-2.79b-r2.ebuild
@@ -36,8 +36,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 RDEPEND="${PYTHON_DEPS}
 	>=dev-libs/boost-1.62:=[nls?,threads(+)]
 	dev-libs/lzo:2
-	>=dev-python/numpy-1.10.1[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/numpy-1.10.1[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	')
 	media-libs/freetype
 	media-libs/glew:*
 	media-libs/libpng:0=
@@ -76,7 +78,7 @@ RDEPEND="${PYTHON_DEPS}
 	)
 	opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] )
 	openvdb? (
-		media-gfx/openvdb[${PYTHON_USEDEP},-abi3-compat(-),abi4-compat(+)]
+		media-gfx/openvdb[${PYTHON_SINGLE_USEDEP},-abi3-compat(-),abi4-compat(+)]
 		dev-cpp/tbb
 		>=dev-libs/c-blosc-1.5.2
 	)
diff --git a/media-gfx/comix/Manifest b/media-gfx/comix/Manifest
index 9bfac7db4bd3..6be2a2492818 100644
--- a/media-gfx/comix/Manifest
+++ b/media-gfx/comix/Manifest
@@ -1,4 +1,4 @@
 AUX comix-4.0.4-pillow.patch 3658 BLAKE2B f8cbcb64737654dbbe1e4974680cca163b5788a42121e03691fd41bf564ac1c0d6e1d7ca2ef970b69d51c4e704ae37af1a0a57e65f49d5eaa6f41284a07f49ad SHA512 41a37c7f095b1a10182501f0ddd035d97e0b9b150fc5d34871241c5a512c808e5b59ebf1f340b8c41432f0fd8746de9cdc39e7022a54b2f3194a916afadf1e00
 DIST comix-4.0.4.tar.gz 481687 BLAKE2B adf73f63d260fa4171f4e85fe74e25e52253ea4c78eb3d2be8d9319ddeef537899415a582b8f33db76a8e30acf77c2d5bd1fc5b931302040d967bdd39b45e9ff SHA512 9cbc5b1cc100ee50b48b794ce9a7f08130fc7a79376533f0f55904be0e2e8cfe5f8b1deeff2f76e7038a3f81b0f709ce5eea88a709199e1584b73f5259df5f8e
-EBUILD comix-4.0.4-r1.ebuild 1839 BLAKE2B 40d8b1a3ec99a7d0157c2296bde6c6213452c7b81812ad2c7cc7baad10fb9656e225367f18af64d566b7f7d228b8e052877d55e31dd4216121134130dd249733 SHA512 f9809c0348b1d14ac07416e6f35969e82933997afc22cc9ce2f40cd27d469fcaaa091603cb3b85a5bf46cb0313097c702fab8028654da2f00ae8f2a579bb508a
+EBUILD comix-4.0.4-r2.ebuild 1879 BLAKE2B aedcac4792ed3674954ca679b07311add1eeca248dd6cfe079e6bd3f3fa43150a775b0555358e2ba984ae9d798fc27c51c92a08b5d43775e12cf0c8f0ecf4797 SHA512 d381384fe28a6a9372bd229a30e099342c573015a9691b3f3166237400554f3725f34d1c100c19a5851bd98e701b2e24b99b4acef0f0dd0da9a175683da6f612
 MISC metadata.xml 422 BLAKE2B 82b5a9d0e1e0e159549c4f88a3cd00635c93c972adbb6e2f784f2fbd9bf91d2aedb27264066051e73dcd953099e122b2e4d6dbb2a4f52ee6bee2f988843f6c8d SHA512 8a382830d5c7629ee140934a03d9b5b6f4759deae2a1114d16b70634316ff46aa6ceb823a5acca95de7974c25563f8b6e324f32128f61c6fbdb12eb180ec7b6b
diff --git a/media-gfx/comix/comix-4.0.4-r1.ebuild b/media-gfx/comix/comix-4.0.4-r2.ebuild
index b77704f10cf0..fa7c18e84d38 100644
--- a/media-gfx/comix/comix-4.0.4-r1.ebuild
+++ b/media-gfx/comix/comix-4.0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,8 +19,10 @@ IUSE="rar"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
-	dev-python/pillow[${PYTHON_USEDEP}]
-	>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
+	')"
 RDEPEND="${DEPEND}
 	rar? ( || ( app-arch/unrar app-arch/rar ) )"
 
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 11fa4870e6e6..bbfc90e67348 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -4,8 +4,8 @@ DIST cura-3.4.1.tar.gz 21720836 BLAKE2B 228ad51d189f83d2a34c2af7a6edcbe468bc32ee
 DIST cura-3.6.0.tar.gz 23388945 BLAKE2B bd2f2e688306e7ef060141abae22c858e9fbb9385e49110079b48e69955c3f6630f8f69ad67fdf2d9e5c1ac0c969cd2d2f416642fc61a63867f79f88985c5c86 SHA512 b56e5575cb0eb15d759999dcd2f4c33873a0a57805a8ba0ec7860811a2137658a656216c969c6e3316d65fbd5e43f2def10a6385ccbf4fc306d15098569ef279
 DIST cura-4.2.1.tar.gz 29288696 BLAKE2B 1332030e63d7056dcb8dd680208b0da8dd33e5c7809957779849bac808fccad9a222505ddbe80d4071474d10ace842aa4459f14560198a9f3eebb5be53f923e1 SHA512 4f47f3f5597d1a56d88207eacacece49edb766c75ae18ddc9fb8689b76c16fd4decc9c8af7cab485aac3c9cffe13095aaad34e1c60634249ae2923ead771ac52
 DIST cura-4.3.0.tar.gz 30433646 BLAKE2B 8490d703cfd4ad07fd5b30d5f776d978baa17ad8751dad53870714596998becebc85cc2fe49fa05eab37b95106315ace97eaa0bbed65b488b522ebbbcba488dc SHA512 3f4ae11e4e28b151e9587c197f814bc97bc225fb2819f4dabaab392ef9896bb119d6fab0df48c9eb4a390a815815d27045eefa933e2e4a9d53331db8d79ea815
-EBUILD cura-3.4.1.ebuild 1671 BLAKE2B 9e148352819851202d42db7270f90158fdd4aa4c8bddb1aa2769769b26decbdbdf3e67d0432f5e017ce0a6ae48f7c07f45cf2cecb4b8c32d67c41490abd120b8 SHA512 a81c643600777b216bf4218857db59afded1e98ccbbdae5c3489b42242dc304246461a9815a2b8eb99c2b5e283b5cec52b61347dbb16a0207ff7183f518ba3f1
-EBUILD cura-3.6.0.ebuild 1671 BLAKE2B 9e148352819851202d42db7270f90158fdd4aa4c8bddb1aa2769769b26decbdbdf3e67d0432f5e017ce0a6ae48f7c07f45cf2cecb4b8c32d67c41490abd120b8 SHA512 a81c643600777b216bf4218857db59afded1e98ccbbdae5c3489b42242dc304246461a9815a2b8eb99c2b5e283b5cec52b61347dbb16a0207ff7183f518ba3f1
-EBUILD cura-4.2.1.ebuild 1357 BLAKE2B e74b46ee6de460b1ae0e5880326f2a1fd0f9d60eb619f62f1053d2b86daa62a5cc0997e41a3469859e87a0651196a91d91d10488a7435eb53afdf1065cb77153 SHA512 2775f01ceda5ca6fc7f30b3a6e18d90c3243a14eb1bd7e4be900b2a8b75611acb2ca5c8d29b1054734d760dac7094258b5d52ef79ef1886a808d414b4ab5038a
-EBUILD cura-4.3.0.ebuild 1357 BLAKE2B e74b46ee6de460b1ae0e5880326f2a1fd0f9d60eb619f62f1053d2b86daa62a5cc0997e41a3469859e87a0651196a91d91d10488a7435eb53afdf1065cb77153 SHA512 2775f01ceda5ca6fc7f30b3a6e18d90c3243a14eb1bd7e4be900b2a8b75611acb2ca5c8d29b1054734d760dac7094258b5d52ef79ef1886a808d414b4ab5038a
+EBUILD cura-3.4.1.ebuild 1735 BLAKE2B 407f2d1a162ad50c3e571d3b6809523a93b0d9a49866bb10630d2ca0a13e9bc1769a6fb901c6ee60c9eb9ad36f1a851969969dfe54a805c2641e45b871b65432 SHA512 4d3679148889f8cfcf086adbc957648adfeaf622839d6db3401a694c4932d72e8589c4a6958f614b6954c5163c13b651745233261afb452219adbc3ed92f624e
+EBUILD cura-3.6.0.ebuild 1735 BLAKE2B 407f2d1a162ad50c3e571d3b6809523a93b0d9a49866bb10630d2ca0a13e9bc1769a6fb901c6ee60c9eb9ad36f1a851969969dfe54a805c2641e45b871b65432 SHA512 4d3679148889f8cfcf086adbc957648adfeaf622839d6db3401a694c4932d72e8589c4a6958f614b6954c5163c13b651745233261afb452219adbc3ed92f624e
+EBUILD cura-4.2.1.ebuild 1421 BLAKE2B 89456bb773708bb3b455143fe11d97e36bf8e88a843ef5b00027de8150fb2d770cd7294878fcb46b3296cd5b16f7da751ec92c865302ca487e27655c12c37751 SHA512 56166afc68952e79a7900ce4c4330b6ce84d34ac55204ab0b6a08a2122366f4ad1fe7404cfa803ab019339d652f810776ce7dd33bf9bb89dfc0738b8308b3208
+EBUILD cura-4.3.0-r1.ebuild 1421 BLAKE2B 89456bb773708bb3b455143fe11d97e36bf8e88a843ef5b00027de8150fb2d770cd7294878fcb46b3296cd5b16f7da751ec92c865302ca487e27655c12c37751 SHA512 56166afc68952e79a7900ce4c4330b6ce84d34ac55204ab0b6a08a2122366f4ad1fe7404cfa803ab019339d652f810776ce7dd33bf9bb89dfc0738b8308b3208
 MISC metadata.xml 924 BLAKE2B 98684c30170538865b264d21a025a558b66ef0f5b46dd4cc291dacd71367cf775135d66fc379bf6bf0edfacab6e33c939a750fdcc8f036cedb7d9daf5b442072 SHA512 b09e1e1251f3171721bea6ea7ace38beed877525b1a83282035bb34fa871123c0995674d899a486b3ff67ac34429cabc12f9e90ffd1b1e3f60257389a900e483
diff --git a/media-gfx/cura/cura-3.4.1.ebuild b/media-gfx/cura/cura-3.4.1.ebuild
index 16ebf84a070c..f1b275618c69 100644
--- a/media-gfx/cura/cura-3.4.1.ebuild
+++ b/media-gfx/cura/cura-3.4.1.ebuild
@@ -19,13 +19,15 @@ IUSE="+usb zeroconf"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	>=dev-python/uranium-${PV:0:3}[${PYTHON_USEDEP}]
 	>=media-gfx/curaengine-${PV:0:3}
 	>=media-gfx/fdm-materials-${PV:0:3}
-	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_USEDEP}]
-	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_USEDEP}]
-	usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
-	zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )"
+	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}]
+	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
+	>=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
+		zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
+	')"
 
 DEPEND="${RDEPEND}
 	sys-devel/gettext"
diff --git a/media-gfx/cura/cura-3.6.0.ebuild b/media-gfx/cura/cura-3.6.0.ebuild
index 16ebf84a070c..f1b275618c69 100644
--- a/media-gfx/cura/cura-3.6.0.ebuild
+++ b/media-gfx/cura/cura-3.6.0.ebuild
@@ -19,13 +19,15 @@ IUSE="+usb zeroconf"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	>=dev-python/uranium-${PV:0:3}[${PYTHON_USEDEP}]
 	>=media-gfx/curaengine-${PV:0:3}
 	>=media-gfx/fdm-materials-${PV:0:3}
-	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_USEDEP}]
-	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_USEDEP}]
-	usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
-	zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )"
+	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}]
+	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
+	>=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
+		zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
+	')"
 
 DEPEND="${RDEPEND}
 	sys-devel/gettext"
diff --git a/media-gfx/cura/cura-4.2.1.ebuild b/media-gfx/cura/cura-4.2.1.ebuild
index ba1e9563f25e..d72614d316d0 100644
--- a/media-gfx/cura/cura-4.2.1.ebuild
+++ b/media-gfx/cura/cura-4.2.1.ebuild
@@ -20,13 +20,15 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="sys-devel/gettext"
 RDEPEND="${PYTHON_DEPS}
-	>=dev-python/uranium-${PV:0:3}[${PYTHON_USEDEP}]
 	>=media-gfx/curaengine-${PV:0:3}
 	>=media-gfx/fdm-materials-${PV:0:3}
-	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_USEDEP}]
-	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_USEDEP}]
-	usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
-	zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )"
+	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}]
+	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
+	>=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
+		zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
+	')"
 
 DEPEND="${RDEPEND}"
 
diff --git a/media-gfx/cura/cura-4.3.0.ebuild b/media-gfx/cura/cura-4.3.0-r1.ebuild
index ba1e9563f25e..d72614d316d0 100644
--- a/media-gfx/cura/cura-4.3.0.ebuild
+++ b/media-gfx/cura/cura-4.3.0-r1.ebuild
@@ -20,13 +20,15 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="sys-devel/gettext"
 RDEPEND="${PYTHON_DEPS}
-	>=dev-python/uranium-${PV:0:3}[${PYTHON_USEDEP}]
 	>=media-gfx/curaengine-${PV:0:3}
 	>=media-gfx/fdm-materials-${PV:0:3}
-	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_USEDEP}]
-	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_USEDEP}]
-	usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
-	zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )"
+	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}]
+	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
+	>=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
+		zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
+	')"
 
 DEPEND="${RDEPEND}"
 
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 8a11dd151689..11ad59f509ed 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -3,5 +3,5 @@ AUX digikam-6.3.0-googlephoto-import-crash.patch 2815 BLAKE2B e39efa7815aef3f7b1
 DIST digikam-6.3.0.tar.xz 335641824 BLAKE2B 1ecddeee653d6b97570aa3616c6dd0a951210983400fe8aca19ee9e01aef29820f0ab32e3cbc2e92e833868f0f652c5bdd0809324437b6fa778dfdaf04ea3c83 SHA512 9463d7a8351acae32e2fa77c96026d1cb60e56fcc20ad2b71ac7461ff1e5e2e02ca0ef8a12e4d5ae2324aa66e185cdf5b237d6330f4741691876977e773511ce
 DIST digikam-6.4.0.tar.xz 340146992 BLAKE2B ca1bc8b0d165f9774354d8489a11d46d8d7467edd3c1e90fd3a96024c4b7cd23bfd5c813251183bcca6d4beac9bffeb9d921beaa9a3752f75f1918796aacd719 SHA512 b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c699399994199b848757f0497ad25a7805e42
 EBUILD digikam-6.3.0-r1.ebuild 4183 BLAKE2B 0c6db20f59f6c2797a05b63483f81e6e741ff41b1b2ff058fd48a8b6fe6c511765cef05a314b942aed178170ecf806228395c55210b2c7732211a794b1bb3d9b SHA512 bb06b989309c24de79b3eb713767ae41b5654297a53d90d74275ad11b2cbcc0fdb2e79bece5f05cd891be3e4ad36f850e7555ca155171ead6ffbe299bc83a5ef
-EBUILD digikam-6.4.0.ebuild 4355 BLAKE2B 2feed71db7ae7b89f76e91b3d1e94640037522f0bf1fe536abd891e40cda9aa695721eb401fc2f568311bcfd86a7dee16b7a1bfd811896e2ec7ff8791f2e471a SHA512 46d92805507617800d7885238f1754579891483015cf19ac2fe7dcb37c90cc0e263551e70490fcbe16c281418451e7fa7152789a97836e99446c99dca1a1b451
+EBUILD digikam-6.4.0.ebuild 4354 BLAKE2B 0140473b280e5a72bb4dd847bde2b1c0ee4a95a8b824ad81ba22556553f14481e1d25fe7b788a6a0f99ca40efcaab38436030228f5f6f9334e4b9772ae0d72dd SHA512 f2fe5044b465abf70c90866c9c36ed2df1efb783fb1b3c630614b1dfb5191152a8fd316d64685f864d9db4328b4b49db5b1f585f6ac6b7c7ddb55cf5fc2ddfb5
 MISC metadata.xml 1368 BLAKE2B 5dec50abba4f748e1f8eb465807c719f4b81759277241169d9e721749a1ba807425f7d46e9feb1edb4dcf3b4dd00b40bfbb353fe479e29c8a1878ad1fbfb5082 SHA512 4cd1ada9c4274338e49a692095d80b572c309bd34c838e2663a18ec1e7230de87e27087febfedde46a0f6af19f1a3f440335750375117d20eacd0c756db8b2f8
diff --git a/media-gfx/digikam/digikam-6.4.0.ebuild b/media-gfx/digikam/digikam-6.4.0.ebuild
index 9ee9030d8c61..92dabb81cb7d 100644
--- a/media-gfx/digikam/digikam-6.4.0.ebuild
+++ b/media-gfx/digikam/digikam-6.4.0.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
@@ -13,7 +13,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_BRANCH=stable
 	[[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
 	SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/media-gfx/engauge/Manifest b/media-gfx/engauge/Manifest
index 16b15d87dbf3..ddb06a553378 100644
--- a/media-gfx/engauge/Manifest
+++ b/media-gfx/engauge/Manifest
@@ -1,4 +1,4 @@
 AUX engauge-10.6-qt-5.11.patch 662 BLAKE2B 7f287da70c06f71bd115541f636e4b5803149c9a6a8855dad388be234ba6f2981f63dc6ad97f89a890d796f4138f4d1318be1d7994b31a23232071a5999a5527 SHA512 9056af93efa32bb8619820ae990abc4ab172b2ceecc262b1f41c2e33a4b08417a4793a201a7cb7c79c648688c6366b10cb1849e1f03f4c3b5407dc2544cd12ce
 DIST engauge-digitizer-10.6.tar.gz 68463313 BLAKE2B 2f939b383d2b2ca7d3ac73196ae6c9f4cd3380f7cb1bc7703d23ffe2554bfd6dfb6f206d3b9c33953757791855c908c7899f078c1c1472549859258d406e5796 SHA512 f571978298f0646f338ee786aae692800bd73242f68a4f35509023d3ea0daaa16ede6a1d45cbc28a31efc277697315c63fe3d2cce1f0cf80334bdeea11599a67
-EBUILD engauge-10.6.ebuild 2253 BLAKE2B 2a704f6f1954d9cde078bbdd1a9682f55cb12a048b0169ef66651d269af980c2d90514dd64f76b5e83b63910d115a4ea3b360c8b9dfc84145dc4bc52ccbd8f41 SHA512 824195c10b66e7c65e494f37a3a78584e6cbdf2ca3e7d429050104e91c052b139e5d010afde757f0817fd169c5c222c98bb98162c64d60f1d5e5214697a2e941
+EBUILD engauge-10.6.ebuild 2251 BLAKE2B d7846b51f73af71c961780b660fc24cdf95861c85ca263171f3670b03a1c3ec74cb58825f8578dff800f5d65046f0165340f8a7e06cee4b7c84c037f4b91910f SHA512 80a0aa364ba748065fbba73fa86aee4e3712c10fe29b9549ea43a25aa2923350ebd1019e552783cd2fb8bac9da1d304a95b97be2e785e0511a3c70ab63ba9cde
 MISC metadata.xml 337 BLAKE2B 8c46cdaadb388ccd12d29c41a075ec60130482855d0735cd468a174e631129964fec7c2e7649994e8f958def8ceb8f4ad0ecb60ab69ce37171c9945696825369 SHA512 41201e69d211283450ef6ff45a23e0978934044e170da84de7e7978360bd5ce1e3b277df4a90e00221cca3f987cd6839ee90fceea232c70cebeb69b5bc7c1c6d
diff --git a/media-gfx/engauge/engauge-10.6.ebuild b/media-gfx/engauge/engauge-10.6.ebuild
index d9161fe8f238..a1741e7df831 100644
--- a/media-gfx/engauge/engauge-10.6.ebuild
+++ b/media-gfx/engauge/engauge-10.6.ebuild
@@ -70,7 +70,7 @@ src_install() {
 	# Install qt help files
 	insinto /usr/share/doc/${PF} # this must match sed expression in src_prepare
 	doins bin/documentation/engauge.{qch,qhc}
-	docompress -x "${EPREFIX%/}"/usr/share/doc/$PF/engauge.{qch,qhc}
+	docompress -x "${EPREFIX}"/usr/share/doc/$PF/engauge.{qch,qhc}
 
 	if use doc; then
 		pushd doc >/dev/null || die
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index 9be5d3fd420b..00e15b24a983 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST eog-plugins-3.26.4.tar.xz 477772 BLAKE2B 104ddf58d33e5513349839312fef820af20d7a3e64a3a8cbd7d964d8250564d6cd62c58cf95fb5359ab95eac8fe2b83ed051e6f3dc8144a8884ec72c74a12622 SHA512 95f2cf2c6ed84b4801517a708f18e1cd673f814d849029a41491f3719512d6a3a2cb5cb11898a7f972f8b674c682245c99964ba2da19b285ed175b720d5396e8
-EBUILD eog-plugins-3.26.4.ebuild 1643 BLAKE2B d9b11d153fe0bf64b28ebecd99f8953dab21764cc608dd0b6f5b2fbc7951d06145875fcc5ea578299d3d92fe7413889de1b1aad472ee24500fa2ba611086bdec SHA512 795624595a121dc071196915473919f2b9c2af1272e60f17bd05ef5cc263345cfabb68eb1bcb37eb34676353265eb939836b2ba1c9a8d345e2dfcc51dbec6881
+EBUILD eog-plugins-3.26.4-r1.ebuild 1688 BLAKE2B a8facd636930691003351dc4f962970dcc19509ef2df7f106899ade4caeade426e2e5223856c7ea8f6a9decc80861d12bebfaa66b1ab164a03d016150b492c05 SHA512 86920010db0205fa3aa896a18b371acb4c72c0a277aed032675eff40cbe87b7985847c7bdddb007b5575072e50732da650e68bad315c6724c9d3cb53ba753eae
 MISC metadata.xml 428 BLAKE2B b10706bb7638538d5ce63c9787e7a1730e01c8383f2d2a093e38184b031933d2b3749241aa2f3254be4c84fac104bb8ec72940cdf8cd5a9f7bc0944541b015c6 SHA512 9684f07846ce7e49ad82843c2b8b7ac5c9d7124bddb07778292d6810162e89a3d41e7ca426f331e4bae6ecfbe53f71409b35418affba6382e874c78b64ed102f
diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.4.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.4-r1.ebuild
index c686fd3f919f..33ba60e823b5 100644
--- a/media-gfx/eog-plugins/eog-plugins-3.26.4.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-3.26.4-r1.ebuild
@@ -34,8 +34,10 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		>=dev-libs/glib-2.32:2[dbus]
-		dev-libs/libpeas:=[gtk,python,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		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]
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 02a3b62d42b0..aeac03b21301 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,4 +1,4 @@
 AUX exiv2-0.27.2-libssh-0.9.2.patch 2035 BLAKE2B aeb9be311217b80a347d76a7df14ec11fc2018626cf7e9a813865dffd76038db10432fc2c898c0c26bdb3f1556cd34c0f8e4a25b189bc32733a3b4e018b241bf SHA512 25b4ca539585ddc2f4a11fc24ba49e799689d361f5f99f5552e99bd81179c95968affc4a42acd9ac0ba56f237f29ec53970a134b4dce44274a6044638d5bd78e
 DIST exiv2-0.27.2-Source.tar.gz 27591236 BLAKE2B bd10d71356e4c8a465b71f8ceac07fbf2fd6cfb287cb22774568ad35eb38200be504e297224920af50a15ab4e9da98384ff4da7c33713f5346b33738380698b0 SHA512 39eb7d920dce18b275ac66f4766c7c73f7c72ee10e3e1e43d84c611b24f48ce20a70eac6d53948914e93242a25b8b52cc4bc760ee611ddcd77481306c1f9e721
-EBUILD exiv2-0.27.2.ebuild 2470 BLAKE2B 708ab232f370ea3d5baa7120968e98a9247275a317091edbe69a71e58ad3fbea9fb3f7667b7223f7df9d39aefea314adb8c5f9d4a3584a50388987c07488c885 SHA512 c8cf2837010987bab1513e81fec41598de7ff482a4816a32f6d402e6ce19532d2e44a24a1297b0dafb6443567c6bea74b03c82d8d4fd90da63ef70e07444550c
+EBUILD exiv2-0.27.2.ebuild 2460 BLAKE2B a1005706088ae5aa1eb7ee147779e7b52bf4e9e352e07519cf716a7205bb9c891633e72de697349b24e98d88e00e952d8427ca393713ac94920b3523314e6aa3 SHA512 c043dd22d651f746f52551de91950deb18776e24c1d3a33156b4e7072bed395f6bb70dff8b0bf4d9eec4a2cf6ce76851448d93dd31ce47e4009dd5f48dca4939
 MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5
diff --git a/media-gfx/exiv2/exiv2-0.27.2.ebuild b/media-gfx/exiv2/exiv2-0.27.2.ebuild
index 866a52c4b336..eb4ea7a0803c 100644
--- a/media-gfx/exiv2/exiv2-0.27.2.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.2.ebuild
@@ -12,7 +12,7 @@ else
 fi
 
 CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-multilib python-any-r1
 
 DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index e7cc0beab24b..1212f2a0acd8 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -2,5 +2,5 @@ AUX feh-3.2-debug-cflags.patch 193 BLAKE2B 298f65a8f9142167d1cd2cfce0bc61ad9d7d4
 DIST feh-3.2.1.tar.bz2 2112281 BLAKE2B 2918d2714f0557e1b67284709bce22c5e14d8f7f545ca33c16ec7928273edf18c9be48a685c3e9a032170bf2b7e572a4b78664f37b2a16c5ae5829b3cc55ca76 SHA512 11a136990f7d02409501f10553659c64ad5d18d4bfaa4e5cfdeb7a2f53ffdb8bd9b8347796c65e75c49615ac4c12bc81bf3a58325f778cb5e0c1608181d7b53a
 DIST feh-3.3.tar.bz2 2112880 BLAKE2B 56042367c0acce966e115e77f3afa1acd3f942a956bc453de364bcd17d90393ad2868039a5793af64826cd50322e4ef5f9f2b9678f982c7c85b025ed208f8bb8 SHA512 0372115a8f2df77cdfc0fc1b24479e72d9be1f24127c787909ef671075b199b8d5f873200ce202f51705991cf3c5f5cc71ef8f47294fe520e3a9acc5cb7582a9
 EBUILD feh-3.2.1.ebuild 1522 BLAKE2B 79c8a59656764fc43e28f15616dc26ffd40b81b1417d885e5c1b89e32a6ff854c7b6af763acddd0897ce58bf0231eb7250319090c48fa282f14218dfb477edd2 SHA512 6e4ef3a5b5a962510bbce7957b09b11d46111ffd10593159d965bd86e09c7da7800175459b8cdc553a58ac616d146a7752253cf72afd6be003cf93be81eb5409
-EBUILD feh-3.3.ebuild 1526 BLAKE2B 15dabb54b5433f46af59e105bb236c8eee767742db5752ab980411e716b8f5243d632f256192d3d933d67bbc30d68d73fef5fe60122a060c40594bc83b10a250 SHA512 0557f644d86c41cdd21e8e3db16f29f7b45d2872bed6f6fe6a5867e54cf8ee86605da7c1aa1ec0ea6614741ae842a44f56d14c4ce38d1a140f4a1d337b215ab0
+EBUILD feh-3.3.ebuild 1466 BLAKE2B 7f802e0c0e92c003602a60f1b1faf1c132c88de3ed6b92138075fe3497fb24f0b8fccef12c7e034e31b407b56cea1a751558ae4b8bb723eb29feca80a6a8fe23 SHA512 52cf87f2fffc675074444ba45bb97a6aebce8c144d29799091040fe9e590a83229bed60120561e0fad18134220f3f9de211b3fb0b19a8d57a8b42c8b00327117
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/feh/feh-3.3.ebuild b/media-gfx/feh/feh-3.3.ebuild
index ad37f294e684..cdfb177f990f 100644
--- a/media-gfx/feh/feh-3.3.ebuild
+++ b/media-gfx/feh/feh-3.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit toolchain-funcs gnome2-utils xdg-utils
+EAPI=7
+inherit toolchain-funcs xdg-utils
 
 DESCRIPTION="A fast, lightweight imageviewer using imlib2"
 HOMEPAGE="https://feh.finalrewind.org/"
@@ -57,18 +57,14 @@ src_install() {
 	emake "${fehopts[@]}" install
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 	xdg_desktop_database_update
 }
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 7579155eaf71..50b89672093b 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -7,7 +7,7 @@ AUX CVE-2020-5395.patch 3073 BLAKE2B 15fa97a633e2c218f512a7d1202555e2465bad9adf0
 DIST fontforge-20190317.tar.gz 22762120 BLAKE2B 5cb85d2fb9a2a08fe64548f2667c026e916dd0239d17d8f8d7d2fe8ecb51f2106cf3dc6e6298014c0deadffbfe91925327b483ed4750a171fb621aea8bdee60b SHA512 55f9b0f7cafb1aa5a1461dbf39b52ca6b69a2baa6b761c8c28f86a0bb99e090d9ecc981294f51dadd9297b5ebd3036f01cb4f17b9a97a737eb567b4ae6522f20
 DIST fontforge-20190801.tar.gz 20766334 BLAKE2B c3206e77da4a966b9e513c41c90e19522f3d1aad990cd3035d7c8a8cc009239811743c12c02df3b02fd91fa5a7738913dba43df14523a738a2232cd2d1a91700 SHA512 78f3e1e94e38e26dcf52c6a0e038753033dc47052b7492f0ac0aaf1b8962e4e4bbf07c2550ef6014ea7290a6429bf669acb0691735efe0aee368480b4b7e6236
 DIST fontforge-dist-20170731.tar.xz 13985256 BLAKE2B 7bc49a3b7747de419e4fafb445062873cf9bf56aa73fd7499509b787a1c0fd6c47b0b5d7bfeb2a69d9237f9f66f989af968b0d00e9d5e57030906394f042f29c SHA512 26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11
-EBUILD fontforge-20170731-r5.ebuild 2852 BLAKE2B 635d215e7e84c0c022008c5fcd6aa30758023d2cf5b589a1f5db1681d6659c9af849e6c007d57caa4cab33da203542fd5f2ddf685f9c5773d05b3cb978c8f6f1 SHA512 c5449ea9b0a24c43132a9c663b9bb2fe136e3b56691b1ec4ad35fa52bd40820f37f312a8b75dcca1e1fc96c9a1f1712906c97b4f99d6427dcc85c52552ba1a3e
-EBUILD fontforge-20190317-r3.ebuild 2773 BLAKE2B c92f4cb825907a97e26df7f9d3c5c96fd40a9ce28ad28728432a5644ade9c879d37e2d7bf1923429d396f373a58a29a1485ad7ec40bfc65fab2bd89323f802e8 SHA512 6e9963725f1afa2d7be03868bd24eb44f781ac1bc32f893854272c80113f9941f9d8b805953d91d4f7683091f7eeff9b9f0b23ae3b7bc944f3703966f56bc6a9
-EBUILD fontforge-20190801.ebuild 2531 BLAKE2B 3a5adafebf248d965738ae047b1eb2d0ca69e4e410b91c8184d6ce0522d949e2e04190d6b43ba51816976388688db462354031561feb3649c302f0c00b96a4a0 SHA512 b9a8600d01d8d704887924977f52aca61720371ea753aeefd2a1f50a7b08387b71e70f878545f553531ac449f71ab23306487287a4054b14cb0c2458f2548dd0
+EBUILD fontforge-20170731-r5.ebuild 2846 BLAKE2B b46db1ea40d29dbef84dfc10a12acdfed036c39543ce1175efbff8b4c77af0e0da438b87074447796280ae223a8918f8f83ba3cdb589adaf02a75e15e817c634 SHA512 a17303781657c81bedd15e690c8d39354155fdfe123b082e1d68246ea7bb0ca5ad3b3b6e00be54785870c4c270414e03eef104ce248f56e9bdd91295fcd9e321
+EBUILD fontforge-20190317-r3.ebuild 2767 BLAKE2B 0f9e4a2b3635106ea515cebd1d60574ac855b984be40c9b40c06d1b0f68256fb637582dee980ed6990bbdd7f0cb302d2b2f1e423712f1814e698d731b9a83da8 SHA512 5e2efe3ce7bee1d3f157ad48ac1b716a76ed466b38178e0d3d905901b8c8d4af21647dd8df7c1fb7d8d9d2ff1b61f3718d911fe3c159ac0eaec4189220239934
+EBUILD fontforge-20190801.ebuild 2525 BLAKE2B e7ab0458ad00c279f544bb19de2cdb614e33bccb1b9e65043e70cf7b29bbcab11978ee4c820a2a912cd95a2546b7fbf47d19e15148c4d9021085e80eca071bd0 SHA512 8e6e70aa680eb038c1d502c9915fb9cce31c5c9bc1a4ebc580a53cae1eb9589be93c0d2471db6b48695a14e85262d82363fab7189d20e485b2816457f908bd9c
 MISC metadata.xml 908 BLAKE2B 57e840cbf69ebd2780ecaf5a3009905b782223a16339beae90acf1c087a185944e33fe952b477184244cb3f5f313fcce32a561ce903d751de457b77f4a90cd74 SHA512 973d4967be4eb7aad087ce977a4d94945a8894138604e8d37257dac97f74e98f7fb9a7cad7e7f46abb4c8c39dcb4bd79e9ad26f96838ad39ac1894e154834d28
diff --git a/media-gfx/fontforge/fontforge-20170731-r5.ebuild b/media-gfx/fontforge/fontforge-20170731-r5.ebuild
index 04d71dc2cee5..90a77ef518b6 100644
--- a/media-gfx/fontforge/fontforge-20170731-r5.ebuild
+++ b/media-gfx/fontforge/fontforge-20170731-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit gnome2-utils python-single-r1 xdg-utils
 
diff --git a/media-gfx/fontforge/fontforge-20190317-r3.ebuild b/media-gfx/fontforge/fontforge-20190317-r3.ebuild
index 28c16aebe855..b6d8e0e08cbc 100644
--- a/media-gfx/fontforge/fontforge-20190317-r3.ebuild
+++ b/media-gfx/fontforge/fontforge-20190317-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit python-single-r1 xdg
 
diff --git a/media-gfx/fontforge/fontforge-20190801.ebuild b/media-gfx/fontforge/fontforge-20190801.ebuild
index 31b62099c783..20cd4600afaa 100644
--- a/media-gfx/fontforge/fontforge-20190801.ebuild
+++ b/media-gfx/fontforge/fontforge-20190801.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit python-single-r1 xdg
 
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index eea609f3389a..aa5db513d85d 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -14,9 +14,9 @@ DIST gimp-2.10.14.tar.bz2 32786424 BLAKE2B f1254ab0742cf0190f4e50f001d8120fe655b
 DIST gimp-2.10.8.tar.bz2 31954568 BLAKE2B 11f88b1068fa1fe216a54bed27b26b94c3fdb2cbc67e1e444df74a080d00b678f8c81897a6c5fb5956fa107842b0a853ada44d15d51c2e58db7435ddd0f8e999 SHA512 b458dd710b786152f95a8e48a0727b71cac549fccb31ac9e1e6ac3c617652079773ce7076401f8ade750ed38bdc78dfdec3317423f4c4e9c931f78002bd7454e
 DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6
 DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
-EBUILD gimp-2.10.14.ebuild 6083 BLAKE2B 30e51fc97a7e1a97e12cad9acb85fa37d276087c3ad859783b5cbd721944d52622945dc6534bcb31cc32d3acb1b2941c8fd46954d66618d59b6232d6bd4a23ad SHA512 689c781bec1643c2b4598258b0b1162bb37abd8c6ab1b1043d1d2a42b530312ef0caeb522f0b53c7624a4552fc825a9a92821979c8ee76be90b42925c526fc21
-EBUILD gimp-2.10.8-r1.ebuild 6104 BLAKE2B bec6521e91558be2f2282baf131598c519f92c93267f687dedcac78fe70d27851c09307eb438009d35f9307c2ae78a77411cb6238cdde84b0ace9165399308cd SHA512 20f59e5aa3a8d5424b65ed9f947123feee6723dd16f946991022b17ac964be37c6aa0a71022928293fc51c542f3a3ad24ad3432fc6680d7214393d87d5159db2
-EBUILD gimp-2.8.22-r1.ebuild 5125 BLAKE2B 880aa0f1b5fbd631f5242a41059b0ba7ec54773b3f49bd6f600361a1de23d65844ec369b1ae3283dc09d2ce7ea51cfa17a6bd68fe50dd2074e14d26e30f74922 SHA512 648e90b0121e4971bdf9fcd09383f790addb5fa63e256f22c1e76b22ed1b92c2d73cb0740d061dc3c1a65311d3b2e8cb843070fb08ea528cb365886d2b495e5e
-EBUILD gimp-2.9.8-r1.ebuild 6042 BLAKE2B 0190f744da671d8b8d89e2596100c2ac2268adb1d278ef3106d89863c6d501c60c1e6a5cc7cb6c831aff43224e23c1c0a818cf5102afc28da637262e51798e44 SHA512 0a5a0aa970e83d5603223e7dd6a989098a150807183626bd45f03a68eb553fe3cb85a999262adfb60ea417a43e7b45f2f2379f746b019216347b52a9497f2a07
-EBUILD gimp-9999.ebuild 6114 BLAKE2B 00745fe1d7fa98a3f681f44f0ca8c8efe3fa7af98ae117ad0b0838376d140c9f7f843eeb87f50d3acb52721d1eb19548b04f0debfd6c9d86647a7270d814109b SHA512 5f7ece5f194ce0d7c526e0aebf69c045f9bddbb4cca2612d73e871ca350bfd5e60ced6bee1f2083096e1b5182b810608d4898ba6391d745e565cb7c02f1c1b0c
+EBUILD gimp-2.10.14-r1.ebuild 6128 BLAKE2B 76a1ce0fe3defafb47cf2f853661e3a5f3ef0be8107fcf52b1df9b4018780a716bc7a6f76dc9a3142583483b7819180b0d9980d8b2b1861238f424a77c3c37ae SHA512 dd91a497d1cf7a4d587a2d7c926c3d1750ff5944c94e64ede97010213975be80893402ac5055be0107b9706ab14a3725652f4b8eb09db6b8ac8da0fd46d5e0ca
+EBUILD gimp-2.10.8-r2.ebuild 6149 BLAKE2B 51647e9a4673cd19e921554e1529a171205d74f3b32c54325f9e03fa08ddb140162fc9cd205da2303fede40e64fc55dbc2345dbff4c9b86df5564d568beff690 SHA512 7a2cdc2ea67f6a1bb0bf36b25e1018fb71aaeb052d05ab086310d9bd03a0b1d20be62485ac1516bd02d3d667a69d3cc64eca1c05f9ea4783e2a9f177a47aca8f
+EBUILD gimp-2.8.22-r2.ebuild 5163 BLAKE2B 030810c37e0c20fa903f581e02c8e9ead89095a7375f1291e2dc771bb4026657c56e3d4f97abca096e0509e005779e3b8f139fe78e12c64b40fe518f6c879a55 SHA512 a457e0c1335a536b4072a09354f41d57a9455f973d93698ef81d1ce1e2d38015c235595400c4e9dff4f3e23856c1fe43c7aea3244e8935eadf0f6ae46ea36215
+EBUILD gimp-2.9.8-r1.ebuild 6087 BLAKE2B 2bcf7bf2256e1a768fc76806b8af465ad48dcc761c9b22a788a2674dfcd08d1cb3c12b3c85f7bf44dc70815bf5b45d3631a41c90201798076d6df7a734d05f7c SHA512 84b90d508a087cf9f31e33abe4c4cf5f6b19200bd25a1cf4d1e2a3bbc41cb7ce7697fade6da4d44e0d86766431b95d7dc927bd45c18e7b33ae62a7b021bde4b5
+EBUILD gimp-9999.ebuild 6152 BLAKE2B 26ca217a370be419450cf6f9ef66ceed8c8d77bc260de37ab74c5f6706b6c032befe261ada5e9a82fe4c6bc8b4893080e1ee64435fd25c39e829b29a499db581 SHA512 6565b9cbe478c9c311a036897cf3c1f9b3841aea0b3095665e0d482ad85cb22274660b1800dbc50f9225e88d2e262c5995d6763d28ef99caa2021f231924ebd8
 MISC metadata.xml 628 BLAKE2B f1326f51db692d6e64d1bb7b44dfada65799d7ab94279771e6bd729189145a8a4bbe7a83c776bfc46acf682ad9f34c84598d25fb0a3606aabfa30383b35a9694 SHA512 cec60cde9763bdb9012fec754b95018f09da5cf7ff2f577206417651df5c18251dd5c58b1e32fb45e7c2121e06c0a5b7dc86d08b9511da4cf103bcf2fa1b6e52
diff --git a/media-gfx/gimp/gimp-2.10.14.ebuild b/media-gfx/gimp/gimp-2.10.14-r1.ebuild
index 63247f2f6b4b..e169695de69b 100644
--- a/media-gfx/gimp/gimp-2.10.14.ebuild
+++ b/media-gfx/gimp/gimp-2.10.14-r1.ebuild
@@ -58,8 +58,10 @@ COMMON_DEPEND="
 	postscript? ( app-text/ghostscript-gpl )
 	python?	(
 		${PYTHON_DEPS}
-		>=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
+		$(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:= )
diff --git a/media-gfx/gimp/gimp-2.10.8-r1.ebuild b/media-gfx/gimp/gimp-2.10.8-r2.ebuild
index c69d663e35e1..936e49178bae 100644
--- a/media-gfx/gimp/gimp-2.10.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.8-r2.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
@@ -53,8 +53,10 @@ RDEPEND=">=dev-libs/glib-2.56.0:2
 	>=media-libs/libpng-1.6.25:0=
 	python?	(
 		${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
-		>=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}]
+		')
 	)
 	>=media-libs/tiff-3.5.7:0
 	>=gnome-base/librsvg-2.40.6:2
diff --git a/media-gfx/gimp/gimp-2.8.22-r1.ebuild b/media-gfx/gimp/gimp-2.8.22-r2.ebuild
index 9fc5aa9cdd4c..3d4251ed76a5 100644
--- a/media-gfx/gimp/gimp-2.8.22-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.8.22-r2.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=5
@@ -45,7 +45,9 @@ RDEPEND=">=dev-libs/glib-2.30.2:2
 	png? ( >=media-libs/libpng-1.2.37:0 )
 	python?	(
 		${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
+		$(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 )
diff --git a/media-gfx/gimp/gimp-2.9.8-r1.ebuild b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
index fc0e9d31d199..73a8c30f70ff 100644
--- a/media-gfx/gimp/gimp-2.9.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
@@ -49,8 +49,10 @@ RDEPEND=">=dev-libs/glib-2.40.0:2
 	>=media-libs/libpng-1.6.25:0
 	python?	(
 		${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
-		>=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}]
+		')
 	)
 	>=media-libs/tiff-3.5.7:0
 	>=gnome-base/librsvg-2.40.6:2
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 31756e7a18c7..a8add4680ec1 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -65,7 +65,9 @@ COMMON_DEPEND="
 	postscript? ( app-text/ghostscript-gpl )
 	python? (
 		${PYTHON_DEPS}
-		>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/pygobject-3.0:3[${PYTHON_MULTI_USEDEP}]
+		')
 	)
 	udev? ( >=dev-libs/libgudev-167:= )
 	unwind? ( >=sys-libs/libunwind-1.1.0:= )
diff --git a/media-gfx/gnofract4d/Manifest b/media-gfx/gnofract4d/Manifest
index 27f162bede23..34ab2622a22e 100644
--- a/media-gfx/gnofract4d/Manifest
+++ b/media-gfx/gnofract4d/Manifest
@@ -1,9 +1,3 @@
-AUX gnofract4d-3.14-desktop.patch 479 BLAKE2B cfb56a81893b0bc1d9ea1fe119e75ab4324b5f8022deadc3380ae39407e8278ae4c6e425cfacd3072246b5df2083fc513d31f5c40c5505a44fd76ee9a65dde1c SHA512 1b90e6ce53e3b346af48a680d2486a5b69de49f2059f6a02c0f6d722a52ca70165e2935818ca57d58d149625528b923a897c85a34381595b9aae94f0476f90b5
-AUX gnofract4d-3.14-manual.patch 914 BLAKE2B 20be2e073ba3fb8fe06647b091e152a5d29119fe25c88fdd9dba3ad1dbbc0330b2fa15b84348e17601c39bc6c5c1cd9316f5f165889959fbe46731c79b469a66 SHA512 591858a7ba5e28e24cb170b5a6d24b98fd060ca79257542f9b3bcbe26d476ae2331ffa991c5d1726d352223198077e61339277b05e65ef0975944694f74a46ce
-DIST gnofract4d-3.14.1.tar.gz 4660808 BLAKE2B f5125be0414b847f506686734e9234c3d88732be6f7cd0feb9cbe759d6e0584f8ce143d64de17a5fcca9b28d75ae922e00993140f0ccb793d10faadb3221b990 SHA512 bcec1d12c589cdee2f0da5555a075db511debd21d4536db66793f6a28be35656258daffd8cbaaff4b5af041b18ca77c94d910ec4d0c7e14960412c580fd56725
-DIST gnofract4d-3.14.tar.gz 862499 BLAKE2B dcca058b6a625b4d2f0153f896ed029b27b8e6135a310942c4b58bf5a6396977f5ca065061918e99034b6303a5634c5288cac90c887a8dfa87286d24f9f1d04f SHA512 cf3614f60a43f7ab20208fb1a62d3823495c84060d177d2926bad20a475e661d7ec45a7bc14e826229656027fe7c0f68aac093b6b0dc7912e84d8d8ec8ff81e5
 DIST gnofract4d-4.0.1_p1.tar.gz 7638038 BLAKE2B c12bade5f219d2d41dc50569c0df315273b0c2a0a6a40543f48f3e4cb766512ed18b979463574db65ac443b1a8dffbcc1f3c9dc04d7c6b89881fdfcfce95c41c SHA512 d7f3a081b3681866d2da911eedab6ec74f22f36d5175a85f93751519e96971cf147b99ddcda32c597283b39e9da4f0fc6a8843331334a18efa3bf459cfd00af5
-EBUILD gnofract4d-3.14-r1.ebuild 838 BLAKE2B faf89e7b8110f981fc500a83b10985e71bd60320a3ae1ff4048d9ecef5866399369e13c35904df5d0474afceab7e29c16d69322aac55bf0a7b12500ca97fc6f5 SHA512 639bbddf911d9314e99142e4f55ab968b0898293d8ddeabd286010faa9304a35cb280f39790028360b78e64c8722581239913b37e15e196631a5011b9fb6950a
-EBUILD gnofract4d-3.14.1.ebuild 1142 BLAKE2B b6ff0697afc901a6e4ce549f2c5a6012a191ccec2b36c26e9ca428e753f422e9759a87b3dad612d715f2f4647eb46a63c2ebf6855c077765c8f4f88b7f00ef06 SHA512 63e621da4294d0b18023ff8f6df66d657ca1fff0af0156d226f19ceaa675f75640798b0c5dca34ce9da19769fe355dbe5268b6fc61bbde26236e7b651bfc9ad5
-EBUILD gnofract4d-4.0.1_p1.ebuild 1586 BLAKE2B 9e9767bf940353b7521dfbf8ad98641f0249a22130ee22b9a936093effdb2df4275bec4757609dd86b9bfcff640d9bbc1f34fee000dfa5cda60eb701fee1245f SHA512 fd919929386aae4b36ab9bc65321042b1c26338054b651c0cadf9ee96975308f2111db06123fa987fa0f87ea68f1d3ea62142a495e0e96c59ebb56b4b741f5e0
+EBUILD gnofract4d-4.0.1_p1-r1.ebuild 1666 BLAKE2B ca6a2f20b4cd279798a3a6e3ca9471cc530b131edde088cd511a0ee4f5c0bece2e7e27e5813b91ff66e79856892aa8695a51a764248589ce5661b64b787d1e5c SHA512 eca186d36beba57e9a77e36f8d60224867217f5f3ee6993c16665750a435a32736a82fcbd22077b0d65947dbbc78b6105378cabee51b4d0e294094a269537a68
 MISC metadata.xml 403 BLAKE2B f0bfac9f73e6c64e4535ff9dd389bd65bd622ba3aa0b64d52ef1f3b96a5cf0fbc4913c311b3e227fd9ac91c18f3d78aa9ae085c7610b06e768a39f6f5993121e SHA512 ed69568f628be6a938f2f2cd9a7a2610b881f437ec57eb12baf803b00ddb5f62e7d562a1743eaff5a3fc8d083802cac05ed965aa0d473846e94aa526e66babb4
diff --git a/media-gfx/gnofract4d/files/gnofract4d-3.14-desktop.patch b/media-gfx/gnofract4d/files/gnofract4d-3.14-desktop.patch
deleted file mode 100644
index ca521962460f..000000000000
--- a/media-gfx/gnofract4d/files/gnofract4d-3.14-desktop.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/gnofract4d.desktop b/gnofract4d.desktop
-index 4bf055f..b8dfc47 100644
---- a/gnofract4d.desktop
-+++ b/gnofract4d.desktop
-@@ -1,13 +1,10 @@
- [Desktop Entry]
- Version=1.0
--Encoding=UTF-8
- Name=Gnofract 4D Fractal Generator
- Comment=Generate fractal images such as the Mandelbrot set
- Exec=gnofract4d %F
--Icon=gnofract4d-logo.png
-+Icon=gnofract4d-logo
- Terminal=false
- Type=Application
- Categories=GNOME;Graphics;Math;
- MimeType=text/x-gnofract4d-fractal-parameters
--
--
diff --git a/media-gfx/gnofract4d/files/gnofract4d-3.14-manual.patch b/media-gfx/gnofract4d/files/gnofract4d-3.14-manual.patch
deleted file mode 100644
index ce1918b33286..000000000000
--- a/media-gfx/gnofract4d/files/gnofract4d-3.14-manual.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/doc/gnofract4d-manual/C/gnofract4d-manual.xml b/doc/gnofract4d-manual/C/gnofract4d-manual.xml
-index 3cea223..0ce6e17 100644
---- a/doc/gnofract4d-manual/C/gnofract4d-manual.xml
-+++ b/doc/gnofract4d-manual/C/gnofract4d-manual.xml
-@@ -2,7 +2,6 @@
- <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- 
- <!ENTITY stdlib SYSTEM "stdlib.xml">
--<!ENTITY commands SYSTEM "commands.xml">
- <!ENTITY tutorial001 SYSTEM "tutorial001.xml">
- <!ENTITY tutorial002 SYSTEM "tutorial002.xml">
- <!ENTITY tutorial003 SYSTEM "tutorial003.xml">
-@@ -625,12 +624,6 @@ see weird effects unless you disable periodicity checking.
- </sect2>
- </sect1>
- 
--<sect1 id="cmdref">
--<title>Command Reference</title>
--<!-- pull in auto-generated list of keyboard and mouse commands -->
--&commands;
--</sect1>
--
- <sect1 id="maths">
- <title> About the maths</title>
- 
diff --git a/media-gfx/gnofract4d/gnofract4d-3.14-r1.ebuild b/media-gfx/gnofract4d/gnofract4d-3.14-r1.ebuild
deleted file mode 100644
index 73a10f4e5557..000000000000
--- a/media-gfx/gnofract4d/gnofract4d-3.14-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="A program for drawing beautiful mathematically-based images known as fractals"
-HOMEPAGE="http://gnofract4d.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	>=media-libs/libpng-1.4
-	virtual/jpeg
-	>=dev-python/pygtk-2[${PYTHON_USEDEP}]
-	>=gnome-base/gconf-2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_install() {
-	distutils-r1_src_install
-	rm -rf "${D}"/usr/share/doc/${PN}
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-gfx/gnofract4d/gnofract4d-3.14.1.ebuild b/media-gfx/gnofract4d/gnofract4d-3.14.1.ebuild
deleted file mode 100644
index 45040d6819ae..000000000000
--- a/media-gfx/gnofract4d/gnofract4d-3.14.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-MY_PV=V_${PV//./_}
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="A program for drawing beautiful mathematically-based images known as fractals"
-HOMEPAGE="http://edyoung.github.io/gnofract4d/"
-SRC_URI="https://github.com/edyoung/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	media-libs/libpng:0=
-	virtual/jpeg:0
-	>=dev-python/pygtk-2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/gnofract4d-3.14-desktop.patch
-	"${FILESDIR}"/gnofract4d-3.14-manual.patch
-)
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-python_compile_all() {
-	# Needs fixing to be able to generate commands.xml
-	"${EPYTHON}" createdocs.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	rm -rf "${ED%/}"/usr/share/doc/${PN} || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-gfx/gnofract4d/gnofract4d-4.0.1_p1.ebuild b/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild
index 397401cf09f1..1563bc834fda 100644
--- a/media-gfx/gnofract4d/gnofract4d-4.0.1_p1.ebuild
+++ b/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/edyoung/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+doc"
 REQUIRED_USE="test? ( doc )"
 
@@ -25,14 +25,18 @@ COMMON_DEPEND="
 	media-libs/libpng:0=
 	virtual/jpeg:0"
 RDEPEND="${COMMON_DEPEND}
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
 	x11-libs/gtk+:3[introspection]"
 BDEPEND="virtual/pkgconfig"
 DEPEND="${COMMON_DEPEND}
 	doc? (
 		app-text/docbook-xsl-stylesheets
-		dev-python/pygobject[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pygobject[${PYTHON_MULTI_USEDEP}]
+		')
 		dev-libs/libxslt
 		x11-libs/gtk+:3[introspection]
 	)"
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 6917049b114d..27a23edb4232 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,4 +1,4 @@
 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
-EBUILD graphviz-2.42.3.ebuild 7811 BLAKE2B 8d796d79f93a9196fb0b863f98f0ef210c8698a10e70b4529c2511af11a66e266e47eca941ab0499169d66af1ce785f2221b9d4726ee3cb826231beb34c12bcb SHA512 de9f59adb32b0b1d4215490d7946e1812dd813cb800676a71aaa0cae0a47992fd869e4ef2272ef5c009419e836e35e351405dbaec75368d55bd0de9339ecebff
+EBUILD graphviz-2.42.3.ebuild 7801 BLAKE2B 2c37c5480316b56be87b2e04c696f9bbe8e37acfed73de99a7958f377f9c15ed4573cdc9bcb90055b42fed22cf3a42fdfe2c1dce47ba0c06ce3a994d152dbd81 SHA512 aaae718fadae30ac7afdacb87d02262515f6b7224b5b724cd77ea3c910dc85babdfb36cfff7045b13b8cfa12f3b6fca88627ebf970aba3e5524a3a0d5ec3d7ae
 MISC metadata.xml 2211 BLAKE2B 1c39235c1d8c2efce0596cda2d20bf1cf2e81643068f68215f31462b6320f7f31533877630aa3c2b2bc9a7f7856f7b27354a97bb2c61d7e63a6de86f569ed192 SHA512 f7689fe65e46905d48fb2e45c3ad2a1e8f4fcb572515fdd7dfa26cdd21ed1eaf52d8ecaab9c297f5e8df69a205337b8526e0304ddbdb8c4b3e82cb1e428a1e71
diff --git a/media-gfx/graphviz/graphviz-2.42.3.ebuild b/media-gfx/graphviz/graphviz-2.42.3.ebuild
index e0130b73420f..fd8cee3432be 100644
--- a/media-gfx/graphviz/graphviz-2.42.3.ebuild
+++ b/media-gfx/graphviz/graphviz-2.42.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils
 
 DESCRIPTION="Open Source Graph Visualization Software"
diff --git a/media-gfx/gtkimageview/Manifest b/media-gfx/gtkimageview/Manifest
index f882c744da2a..b58571812185 100644
--- a/media-gfx/gtkimageview/Manifest
+++ b/media-gfx/gtkimageview/Manifest
@@ -1,3 +1,3 @@
 DIST gtkimageview-1.6.4.tar.gz 1158138 BLAKE2B b59abcbac71d4bd039bf9f3fc2f25f6590f91c4cc320cea90243a4889e020f1a54a3ca5d8a843f7482551ce8da6fafe6e3ce4fbc5a5e32fd6ceb4367b5abb9db SHA512 6378c640006e73aa1ffbf92eb9d4e42570707bc159f0a657b11f027d328088f5e89fc334de170de5ab1a39bed588b0b76f4633688a894cb7def16f1dea9f8e39
-EBUILD gtkimageview-1.6.4.ebuild 1218 BLAKE2B fb4f68ba9231d6b786da90e37852fffd5c5443098b72d761973986340a3643c57a730039bd3f1f67cb1652d0ae083a1bdc27cb99c9ee21f701405829695a47b2 SHA512 399b9c8325165fb25f5aa43a10c7a7aaa753b10f170de0430b2e1cb7fcc58a19b8aea60d356cd10c19f9ae2e79f36c0e29c51402509f46cc96fb69879a6dfbe9
+EBUILD gtkimageview-1.6.4.ebuild 1216 BLAKE2B 0ca91426de4420e01f0fca0703abaf35b556cf778ddd76bc48fa127a96370de4e1be2c8ff2f503dc5caf3d593c1b6cbfd35c4fe1a437c3b416cbb18596fe22ca SHA512 19462e54cafef1ff0547b9f85dd4cb0e52a274ad81d6bb5e1068f117d7c011175c4f38a5305c9b71d3a25947bff406cf576fe9e467862ca33fbafcf01ac0ff14
 MISC metadata.xml 259 BLAKE2B 0a31c91e9ff9700c8a5c77c6eb9ddad55c6b78e7e583213c20adc8e73248c7e8b31c9a11702a0b5a8b665acd2753c145362974d6c5c6aae1979c7845ab4b01d8 SHA512 6744883613ae3b83c57ec9604c5f31717ab714b4f3e7f4f680e4b9e54f622f8e5f753b3cd666862f0e3e6dc4223aee87b89aba472d9f20e1b317595e06aeae30
diff --git a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
index 4a33fe1c6f33..e7f1da0489bc 100644
--- a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
+++ b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="examples static-libs"
 
 # tests are severely broken, bug #483952
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index b9ff306bbb47..10d78a908965 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,7 +1,7 @@
 AUX hugin-2019.0.0-exiv2-0.27.1.patch 998 BLAKE2B fd072b1bfb995f3e63ca78b0ad288c6012e6256d8c268fde7b9d3e1fb346544d34807394ac45b244329d96d6e75347c7e06b8cffa44258dd9b59378f56ead112 SHA512 9127921810b9a3cbc7aa216cb961cf5d8eef04ab5beb6baef94851d25e32314dd0565e507e3e57d2d560b6079afcf54e16330935334835fe664842d337732643
 DIST hugin-2019.0.0.tar.bz2 10297887 BLAKE2B 59c4df340f01dc7fa72c08b575fe2449ac40b96ac2e925aaef0d7804df54db25df7b5901cb25a5da4d8e78c93c668081d535517c275cd1ccb40f5159e1c725e5 SHA512 49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5
 DIST hugin-2019.2.0.tar.bz2 10335030 BLAKE2B 4fbcb974eea01dbd8d722f64b5cadfd1b3fe101e5e7849d069c531e55e1ea71c226bcb1550b59374bbe8adf111b7c0bc5e48c14f45bdb685486cbeccde5add70 SHA512 2ddfe7468a474c385ef66a88c3a5a2491183765ae431e5044f504d2e95ec3cb99c0b97b98dda282ba7950f6f2001f46b2f2ea39b9025718c2a329dea967685c1
-EBUILD hugin-2019.0.0.ebuild 2213 BLAKE2B b9a6ceedc6b49b493205f5f16ced5ccdc890f6d2f44c0e846a70a09857f5b4ab62b7d64e668f4114d22f3af7d5168cacdbfb95347ff1514b1f0cb64f6b3056f7 SHA512 4b8f7f1107245768e7de1b5ac7a18e65af3a2ec931eafcb525b92374b40894e124bbd6561651e21595a2a1b2f8996e5e3282591fadaef1efc7671afbe64302cc
+EBUILD hugin-2019.0.0.ebuild 2209 BLAKE2B 9206caa49b018f46613c673c26ebd555e6750e640aabff5753dd61a9c744d1718d6a05ab8298cb6d259e11e989d74c5a6224d1c77ea699448a377b9f839fbc10 SHA512 921e1aa1514125756ccba0ac9896978677ea4a1e5672c68eedd671bbd4e28e84f046c39ebddbe7f8489e32d93c9e4a637f8c9a9810ab8269913e4c60f83c0b8c
 EBUILD hugin-2019.2.0.ebuild 2188 BLAKE2B 3a8957b1f5c620503b18ad71475e67b01540e9893a9b3d904ba1656f519dc7efca50cce5c8b986909caa86591d91fbe4c0297b4a0b5ccf9fc23400e454d07862 SHA512 7662be470548fdb35376af51088442751bed2f55a612b40df0eb9dfd93a0dfcd62cf6194bc7641c543bb776d87c8ed517d6a299b2031f01ade06d5a31c2af13c
-EBUILD hugin-9999.ebuild 2062 BLAKE2B b1b80024aa6ff9133550bc152ebd32232bc9afe5cd0d12363b212d46aea9a7c2b93596753840296702819c5b96d01f53309a6140bf5471a18134cb551bdd6e34 SHA512 fe3f6b2d0a2cbc47737718c59c109530a8b9e764da22982cbcf1c0e4b3f35c6d2a84e66098faf677aa47805a0efc9af92c81db6f21c7cd7fb3fb0e43353f55f4
+EBUILD hugin-9999.ebuild 2058 BLAKE2B d7f7ab9b065dcc31cc85033a044b3e8da912779069709e2c1c02c3958744896c9c84cfb2bbf9c802b444e92ce6f6cd86d402254d3b2e5eb5f2b2b766eef069e0 SHA512 65ead2eab2416af88e8529704ee0c936901d3512558e1433eaff5ec3b3db5ba8659b2f72fd4613cc305afb9461003841ce7e3c04b8bbd201c8842ab7ddb5c5c7
 MISC metadata.xml 445 BLAKE2B ac876779272c1b22b648f4231a766d738bedf3b8a5a195fed926e6976531bc4653181a992bdcfaeaa6bdd9c79c21971025f207681490870209852d561aeeae78 SHA512 f2684887481f43030dbe01cf4df354511e4b294d53d7f7fbb9627cdddeb29709d806c6017f2c32557e4e6e288615ab2430fe7d102ea30072e1ea733d60177945
diff --git a/media-gfx/hugin/hugin-2019.0.0.ebuild b/media-gfx/hugin/hugin-2019.0.0.ebuild
index f5dd754fb2f4..1217aa9474d5 100644
--- a/media-gfx/hugin/hugin-2019.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2019.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
 
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index 448faaebbc26..3eb92a7c66c7 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit mercurial python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
 
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index e9f318a85c1b..e51902325fbf 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -11,7 +11,7 @@ AUX inkscape-1.0_beta1-detect-imagemagick.patch 653 BLAKE2B 1e217306b083550d1f46
 AUX inkscape-1.0_beta1-do-not-compress-man.patch 454 BLAKE2B d680993be80d9069c7986f110d512643849f97fae81a8fdf1ab020a418dfbe44cc2bce3d71c8a79e8acac5170dfc01d084420a439d83f6f0e85706acdc8a0399 SHA512 3fc7ac0750a67b9d90d4ec0eed404ffdaa6910397849fa916eeacf5fb1e77cb0cb17f3f1ba99ad39f16610f2b3d7df387e35d36a0404fbd1fd0f857fa8be822b
 DIST inkscape-0.92.4.tar.bz2 31929728 BLAKE2B 892bf4ed913019b27a9b8897e3ae32c44152163ded0eb345d59915ffdc9818d29f210de3294ef1b05601141185b5e3b10779778551b860f31e7df5c659492c77 SHA512 b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120
 DIST inkscape-1.0beta2_2019-12-03_2b71d25d45.tar.xz 39508392 BLAKE2B fd48f22439d1182aff1db5afd74870a6c1d291afb310fc9fa5036fa3c2547ead8c17f6cd67f77a56f655c56af8ffaa7a349b17166c7b18ef3ddf234aa6e57805 SHA512 029508d4867ac0890b2c9c4d274408f849a17e8a7978853df38543d94e7c08d33546a8a40fbcd940da1ba847f11e37ff2bafa285174b65d45ee5de59e907e78f
-EBUILD inkscape-0.92.4-r1.ebuild 3861 BLAKE2B d471f26fb7d4724dbcff97236700e1ef7654d1d7fd42e348880133a82e72ddc48f2c103dd8ff25a4a552a711043b47d5c54f1f88503416048fce3db6f4bc9e5e SHA512 3948c06d7e5c29e5b3e4af75583e6425f78cd4eef4baf40bddc72bd91daf17dad131bab27d119320598b0d9175c0f69595b1630e5b5eb28ad861835580bd14c7
-EBUILD inkscape-1.0_beta2.ebuild 3897 BLAKE2B 9ec3d94630f97b36f2983b129b67879da4bfcd91cf5ccdbc09767e4c20272d18f0eafca4a2fcfae6a3cd2ede6f4f6355f2393c7351144e52abf35b8184185930 SHA512 e8ff06bd2f34ad265533384169e435bdb6a97194681109e2b32c9e56f97ae3f1ded6182b748543fd849ec60fd86c1eb6adc9e53f0e7fd052f7fd82718a854f5c
-EBUILD inkscape-9999.ebuild 3793 BLAKE2B 5b75509b673f6af853818e36ed610d861816b02e163cd019301193b6b3a919477e396005f30c8c244e6c3a26ed62e52618ccdb3c9e339d9a863f49f6b9fb7e3d SHA512 314586c90cdb19611b35e4594b14883d10a5d6553d80855458cfdd9b374381e9196c58bbaa506c2a1c3fb2d54418f6dc7f77621a434be64c7025459b11717cf0
+EBUILD inkscape-0.92.4-r2.ebuild 3836 BLAKE2B 39efa33d21c2ae8054827c76cfe451a60fbca48b12a4eeb106bd0b03895ecf02102df8fd2c28626d7daf4a720eaeb67d4e3642f214d9f4ad68b3c183826a4e47 SHA512 8c2304ac76e116472f726b952ebc3a47478ca78d50686c1594ea55555b7e39d1f1003118ec6572244735f871a18f55ec49391fbde3d327b204d518cf84978f03
+EBUILD inkscape-1.0_beta2-r1.ebuild 3976 BLAKE2B 683f82a3d9a6c38b300b32d7fa068d9a0f48742c795b96983479b97220fcc9f5b55c5fe5a0db1f4bbbb0db8e7b99ace1f7b6cf55099c53158db92f609b06f194 SHA512 3fa193291787d0cc72538254e0bb078ce1f52f1737a3d73507ec214b1ace7fd1ebd368dfe1bb520017b9204e15b1e504ba6e950c784e93bb4be628c99d287783
+EBUILD inkscape-9999.ebuild 3872 BLAKE2B c6c462f94bcdd5008970dc87ecedd04a92df986896e2d20549f4079abd7d89bc116d963591a84ed14b0088836ed9a9c077992f53a9f5bc453ef0057bf60e0212 SHA512 ff66fcc652da60c452fe883da71cfc09eeb9586595ff91355aa7466784112f872851e8c58acc5d35eac4d2779800ff517a73b013479fef5f35e33ba781fe2729
 MISC metadata.xml 951 BLAKE2B 5610cce03a912f378f4bbb997bb9acc028f2f02c1ec40034ed523b7f7cee2cc980f1f24fb8fbd26b40d494a514769b722ca64e93078c82ad75c9db94a9f19ca4 SHA512 f62078fa96c501f4d8e01d4e539b74b91cbf90997392e903e30db9c3a117c2ccc7f2d3e1c2e62c85362cd0a2d504dd565cfd70f92e5b947d416f8a3f2cd88f8e
diff --git a/media-gfx/inkscape/inkscape-0.92.4-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild
index 8550767b2694..bc73e6c6f57d 100644
--- a/media-gfx/inkscape/inkscape-0.92.4-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild
@@ -32,9 +32,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/libxml2-2.6.20
 	>=dev-libs/libxslt-1.0.15
 	dev-libs/popt
-	dev-python/lxml[${PYTHON_USEDEP}]
 	media-gfx/potrace
-	media-gfx/scour[${PYTHON_USEDEP}]
 	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/libpng:0=
@@ -72,10 +70,12 @@ COMMON_DEPEND="${PYTHON_DEPS}
 # install these so we could of course just not depend on those and rely
 # on that.
 RDEPEND="${COMMON_DEPEND}
-	|| (
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
+	$(python_gen_cond_dep '
+		|| (
+			dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		)
+	')
 	media-gfx/uniconvertor
 	dia? ( app-office/dia )
 	latex? (
diff --git a/media-gfx/inkscape/inkscape-1.0_beta2.ebuild b/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild
index fe3ac5ac3a7c..52bc56d18a54 100644
--- a/media-gfx/inkscape/inkscape-1.0_beta2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild
@@ -41,9 +41,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/libxslt-1.1.25
 	dev-libs/gdl:3
 	dev-libs/popt
-	dev-python/lxml[${PYTHON_USEDEP}]
 	media-gfx/potrace
-	media-gfx/scour[${PYTHON_USEDEP}]
 	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/libpng:0=
@@ -52,6 +50,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	x11-libs/libX11
 	>=x11-libs/pango-1.37.2
 	x11-libs/gtk+:3
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		media-gfx/scour[${PYTHON_MULTI_USEDEP}]
+	')
 	cdr? (
 		app-text/libwpg:0.3
 		dev-libs/librevenge
@@ -85,7 +87,9 @@ COMMON_DEPEND="${PYTHON_DEPS}
 # install these so we could of course just not depend on those and rely
 # on that.
 RDEPEND="${COMMON_DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+	')
 	dia? ( app-office/dia )
 	postscript? ( app-text/ghostscript-gpl )
 "
diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 1a10390a90dc..bc57307639b5 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -40,9 +40,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/libxslt-1.1.25
 	dev-libs/gdl:3
 	dev-libs/popt
-	dev-python/lxml[${PYTHON_USEDEP}]
 	media-gfx/potrace
-	media-gfx/scour[${PYTHON_USEDEP}]
 	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/libpng:0=
@@ -51,6 +49,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	x11-libs/libX11
 	>=x11-libs/pango-1.37.2
 	x11-libs/gtk+:3
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		media-gfx/scour[${PYTHON_MULTI_USEDEP}]
+	')
 	cdr? (
 		app-text/libwpg:0.3
 		dev-libs/librevenge
@@ -84,7 +86,9 @@ COMMON_DEPEND="${PYTHON_DEPS}
 # install these so we could of course just not depend on those and rely
 # on that.
 RDEPEND="${COMMON_DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+	')
 	dia? ( app-office/dia )
 	postscript? ( app-text/ghostscript-gpl )
 "
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index f978a1d4bb82..540055d51ebe 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,3 +1,6 @@
+AUX kphotoalbum-5.6-crashfix.patch 1755 BLAKE2B bab46b6f8e28a946165e72ec7931e9ecf355c340b111662c4b7b14c1a0f6024d63a54f1f5ff8337e43387c278394ff911068018560d8456311a17e5946be44ec SHA512 864ff03a92e7a4726fd847e543b9e53192a18196008f58376c28825caa6a04fb0f5c81535f0714031ceb523510fa19a043ace71e27e5a7aacf7a1d07e71e3a0a
 DIST kphotoalbum-5.5.tar.xz 11661532 BLAKE2B a14900cb7628b86aafa736de4b443f3aad3b4198bc6a04bc67fbc40f1bec9898ebbc33e60d4ca90db3b857871f75c70d6946efa2e756b3c5d7ae769bee6b2723 SHA512 fcca891a94580db2f606c5d077af2651e1dbcd59429823410f9fd2d07ac0c3c625ac441b723d4c8cb3ac7ede26ccf69f955c19fe302fffc9788fc33def9ee3e0
+DIST kphotoalbum-5.6.tar.xz 11773088 BLAKE2B 933e29a71bbdb678936c1d466894468a62ee0a8903ebbe21d0d9ace619b8b2ceaeaec12bc955bf1513cb53eedc85faa6291549a5f87784323c9c5b556f76d3b3 SHA512 7e950494a9fe591062e488d08f9e675dd0aacacbea640619461cd3bb0ac2fe945f189fe1e30c69614e9ed3751ac3ddfe84d943a0aa2d2f35fc5cd733002938f5
 EBUILD kphotoalbum-5.5.ebuild 1496 BLAKE2B c1196e3b012258e8170c3a8c27318c55c4cb4e4129959be04078de5b0c9714af0fcf0e6774356ad518b4d62326a15eae08ee95cd280eadbd6819ed5c41852352 SHA512 9795d6c59b50bd328c7a5556441abbaa108c308398782e9172ab0617025a0769cfbce3ea0e46f5df1eedfd609f8bbb91638a4c964517adf950efaef8408cda2f
-MISC metadata.xml 424 BLAKE2B e5e77a618c93044474c0a049bfd37dddbddaaed85bf84fa2e5e7233064176032cc255dbce77607aceca20e431f43f98e29295c977e7841dc86b2c5b286c6df8e SHA512 ec0c2fb381cc5d4b38576c6d5c5b002a07d01027881906bdc1d786311d1d738f6dd67074a6c768a10bbefd3c2c5f01b88bc78cd3456c5884a6d5646593d0dbca
+EBUILD kphotoalbum-5.6-r1.ebuild 1775 BLAKE2B 21f528296b083240c19671ee6da362e66459f0a91d4c17c92101084d7cb9871e869f904cb7ec19b7d0f87bc2beb5989c24237994fb383bfedc4584c1494dd820 SHA512 b79bce8f53e1e34dfb2de28e0fcd1e0b3f5ac5689d51a489ca43b2f6680d54c951da6c5cad2c27bddbcea59a5132ff62c53798688dd883817de4e990f473d404
+MISC metadata.xml 524 BLAKE2B 9c5dbf76aa448c13bcd650ca6487650f85aa1b961f2c39555cfe97bb94959d79d1c15f9d2836473c564d35a370b2f36efafe29ca8ebf18d97c02374648af9078 SHA512 b8147da9bc6da4da7d9603be758780f6244aa78979f1e2e7bc8f4b578b16cf798b449221b3603c39186fa84c17227ba3fc4976748285ea04ecaf4e3e71cd8f00
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.6-crashfix.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.6-crashfix.patch
new file mode 100644
index 000000000000..96b752bf075a
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.6-crashfix.patch
@@ -0,0 +1,41 @@
+From 583e10e8356d2ed64f0358ebf107bff35a98db31 Mon Sep 17 00:00:00 2001
+From: Johannes Zarl-Zierl <johannes@zarl-zierl.at>
+Date: Sun, 9 Feb 2020 22:51:15 +0100
+Subject: Fix crash when associating a tag with an area.
+
+If a tag is being associated with an area, the context menu has two
+levels: the direct "associate with <last added tag>" and the sub-menu
+"associate with..." followed by a list of tags.
+
+Each version uses a different function signature for
+ResizableFrame::associateTags. When refactoring connections to the "new"
+signal-slot syntax in commit c38f5136 (thus released in version 5.6), I
+applied the wrong signature to the connect statement.
+
+This resulted in a crash/failed assertion when selecting a tag in the
+described way.
+---
+ AnnotationDialog/ResizableFrame.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/AnnotationDialog/ResizableFrame.cpp b/AnnotationDialog/ResizableFrame.cpp
+index f2dba86..44175fb 100644
+--- a/AnnotationDialog/ResizableFrame.cpp
++++ b/AnnotationDialog/ResizableFrame.cpp
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2014-2019 The KPhotoAlbum Development Team
++/* Copyright (C) 2014-2020 The KPhotoAlbum Development Team
+ 
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public
+@@ -522,7 +522,7 @@ void AnnotationDialog::ResizableFrame::addTagActions(QMenu *menu)
+                     submenu->addAction(createAssociateTagAction(tag));
+                 }
+ 
+-                connect(submenu, &QMenu::triggered, this, QOverload<>::of(&ResizableFrame::associateTag));
++                connect(submenu, &QMenu::triggered, this, QOverload<QAction *>::of(&ResizableFrame::associateTag));
+             }
+         }
+     }
+-- 
+cgit v1.1
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild
new file mode 100644
index 000000000000..5c27d00b9ab8
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild
@@ -0,0 +1,69 @@
+# 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="+kipi map +raw share"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${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
+	kipi? ( kde-apps/libkipi:5= )
+	map? ( kde-apps/libkgeomap:5 )
+	raw? ( kde-apps/libkdcraw:5 )
+	share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	media-video/ffmpeg
+	kipi? ( kde-apps/kipi-plugins:5 )
+"
+
+DOCS=( ChangeLog README.md )
+
+PATCHES=( "${FILESDIR}/${P}-crashfix.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package kipi KF5Kipi)
+		$(cmake_use_find_package map KF5KGeoMap)
+		$(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 2a675ce364ee..ecd49551d433 100644
--- a/media-gfx/kphotoalbum/metadata.xml
+++ b/media-gfx/kphotoalbum/metadata.xml
@@ -8,5 +8,6 @@
 	<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="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 3efc287cc1b0..ccd2288d7b92 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,6 +1,6 @@
 AUX krita-4.2.4-tests-optional.patch 12292 BLAKE2B a30463dcc6e02e877b308c4add529f0657d96ace7a13ba7424f4cdf260f3b636d03b2bac224d6239253393650163b622ac54d8d81bbdced2fb153bf216b5fb2d SHA512 1d5045b35981822bc16c4b23e573a299a8325353c8be347c56a4e2fc4e3cd9e937e8eb253f9c6cdc0197a3db7989b822fb41274afe3cd506b9c907daf1867df3
 DIST krita-4.2.7.1.tar.xz 164304772 BLAKE2B 99a4c3b6a48d1d695ee5bb8f6576c9a4593e1ff3a10846340974588ff8b3c061a7838b862c1ecdc4f0635ffa270cb272f1155b1efca4dbf50a11096ee1e92d48 SHA512 28f4af4131a0f364b285596031a3f59a8bd7e97930cd740a4767dbe95540dc403bd6ae0a99ff2bef95e2bac6f23931873404e4fed3ea4afd4b614b5f7d823a35
 DIST krita-4.2.8.2.tar.xz 169994064 BLAKE2B fc390db9e3aaf3f4355e600a98ea479aa510895c26cb82e8800fbff64031bab7a26e0c37d6d274e6397a38c1bc33cff6b48cb5a7c6e61b56579e92e33279b1c4 SHA512 5482ebd62c530764b43439d6782fa7e1793877657620967ea0f6cdad166e3ff508b36cd04bd99c192d35a237c4a0da08477069e333ebaf2093785e207402dea7
-EBUILD krita-4.2.7.1.ebuild 3042 BLAKE2B 02884d42141bb22b222fa82a619f380c6a22dc6aa0ca0d61f5668259de8a45a23282c333d13e8e006898257672232284a3bbd7a23f37c18a69f300a6de3b5e1e SHA512 63119789211cf958b8352f700a4409e2885d002559d2d9da8cf4fd00fe13578711357a2d863db68b3e34b8bf8eee4f239a95c081cba47c1940187f5d44e8c7eb
-EBUILD krita-4.2.8.2.ebuild 3035 BLAKE2B c61d765ddf20ee41a52ae5f8c4e74224df47d154d0983a025dd8a6268be4d2fc41fac0cbb7b2cc604063f7a5e998497a34233767daeff389d2110559720397db SHA512 8912086f449982aba8edad2f502483e9319eafa45d4c53772aad363df418fd5da2be7330d7e4b7cdf5989cc7ade49943e696d22394a60d9ac83adb7cf398c8c7
+EBUILD krita-4.2.7.1-r1.ebuild 3085 BLAKE2B d74af4a0f54c2d32891331f56af901c53784dfc5225107f6964e0d3233c6bde8ef7448886fac2452e97086b6a0f7274d318c500d579bb1f26f012fcf9dc7d671 SHA512 a21571b44aad77ad5e6d2bed068f2bd847ebe1022604c4e5c7df13439d38811312e4d0943dfb30f276105e52278055c17ab36c04fcb8621be022ca9dde428bd8
+EBUILD krita-4.2.8.2-r1.ebuild 3078 BLAKE2B f750a48f852abf028e06ea9c68c1dffe7fa0d855e9be0d5c426825e0e1155c089f114022d7be8355e441701dde776bb516fe9e06288284050ffd92c756a8e684 SHA512 27c41cba15503acb849278c14678228a445ec0534d80d370200a68f9ab5bfa48d13d903ce9f6bbeffa8aba757ebee8e43e75638575b49cc51844cdc97a5e7cb1
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/krita-4.2.7.1.ebuild b/media-gfx/krita/krita-4.2.7.1-r1.ebuild
index 4c9525d74aae..2d2e1b4c6547 100644
--- a/media-gfx/krita/krita-4.2.7.1.ebuild
+++ b/media-gfx/krita/krita-4.2.7.1-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
@@ -50,8 +50,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	$(add_qt_dep qtxml)
 	dev-libs/boost:=
 	dev-libs/quazip
-	dev-python/PyQt5[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')
 	media-gfx/exiv2:=
 	media-libs/lcms
 	media-libs/libpng:0=
diff --git a/media-gfx/krita/krita-4.2.8.2.ebuild b/media-gfx/krita/krita-4.2.8.2-r1.ebuild
index 99703d1a2126..2348b287dfb9 100644
--- a/media-gfx/krita/krita-4.2.8.2.ebuild
+++ b/media-gfx/krita/krita-4.2.8.2-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
@@ -31,8 +31,10 @@ BDEPEND="
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
 	dev-libs/quazip
-	dev-python/PyQt5[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 0bbe78e07288..592b446c5d1a 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -4,6 +4,6 @@ DIST libimagequant-2.11.7.tar.gz 74311 BLAKE2B 204fbe794014c11d767991a03e729b234
 DIST libimagequant-2.12.2.tar.gz 75611 BLAKE2B 23f5d3666fd21696d4f4dab9db3669642a9e3f6ca971804b914e845018df538136c3db900419ac35230be9fd487b48e0ab672b653e2ee82387c19569b49d6cfc SHA512 7e7bfcffd163d8b73a46d523dc441e4a4726f5dde804f306f13900f74afae6f6e7cf780bf157b5823a71c790bcdd0e9c9c34cf43f84a21289e470fc78835d8d8
 DIST libimagequant-2.12.3.tar.gz 75866 BLAKE2B 857a0e3f0187251e37e0c7f4f5f5cbf49266e4eb9f684118705778d9469330cf95780ea11b83d19e28251f047a7e9b8e7ac32ac4d9554cb5d9e1b3230d39e796 SHA512 4818b00b6f154407f3e402d56f4891c2d7594c8056fada0402d7fa0024ae50127340dd8295da5f5dca13fe1829670a3fa8793aa528f3e74a2294c9a7e37b7257
 EBUILD libimagequant-2.11.7.ebuild 1147 BLAKE2B 41943e15f697966749897fd14aec98dec919ce81189ec5f481517d14eb94a91b95b0b0cdc9f057854a745a2fea5ccf094411900db06eb54dc6aeba410521e871 SHA512 ec8d4ce66233a74974ff6edb4c67dcf5d7f12f4535001bb770d70a995cc5a9b2600f900777fc1996335d49f85efe10a3dc21e547c2b535c68720ee455ec4352f
-EBUILD libimagequant-2.12.2.ebuild 1406 BLAKE2B 69cf7e6dacb7b6b11089a2586f195471ce96b3b55a21badb93d14292ff7a79e783ecb357b0231af715848c2af8d5f11cd71e54f96e479db0c1ed76f163736a77 SHA512 7f7d6fe3f448c506b85cc8e3000b09777dce49f107a621d18b49b047ab222b341632eca299c9641dbdbc0313f79d37573cfcfa9c8de4961f41e96d456de2259c
-EBUILD libimagequant-2.12.3.ebuild 1408 BLAKE2B 4461d184fd6e5af9d598cf4cd4d9d75014eb2d4c41137c5bbce1c099b4ecdffa2f5fb0bf5c84f0854973dbe04ea62e042f9a62f48a681d8d30ec91ac3a0941ee SHA512 8bb3ae3fcf20c8f57e43b6465abfc2c0ecd6d5e12d455c566f541f4d021a1f2a3c134b1006aa5b8bf1e1d8a32d9aaf26c0e50e6a2dcda4b879c988fd3fa4b0c3
+EBUILD libimagequant-2.12.2.ebuild 1402 BLAKE2B 0ee7dbd64971bbad9082cc26a742e42abca7ba6230d8eb9ae8445e7c9460486893afbc561557e474639f1b3146615dcddb8d92c8b69476dc79f93ab14c7ca0f9 SHA512 a5985fea8bb1f48f1205eb6bc70e9dd6d93e42bab5a6417d90306f93e7737dba30c73d1a1ec1add93dcadef5d617828279ab0fa43148f5e0a9357aa1b7f6bd73
+EBUILD libimagequant-2.12.3.ebuild 1404 BLAKE2B 6056841304b2b31bb15d2554083fd2352b4f794b2df2b1077c2ab27ad383bf783a068e27c0c10e6a20b675931910b62b8bedcd13fb2af7d39ad3ad3eed21a488 SHA512 b468bcc5dd8d43d957f52ab8babd0b9dc14470f7d2413cf7f8fddd453336046db03b7fcfb9882b62023b7ea343b6b95d1b6ebe1ff4fd2ed0266598c3050298bd
 MISC metadata.xml 527 BLAKE2B c3fa42153fa6cfede4de3d59e12063aeb44f67ce89d36be63c7df4671c57ecfdd43d08aee89bd96387ecbee2e41b1d5921e9ad2486b4dd8f06e6e93529afb0a8 SHA512 82b458b27288b6b49df16d5778f6c75b492d958bcc1c2f2950dee741bfddc82f561be50f590d3f891bf736ee67e5325ae297bf49f99c769ca97ac68042beee11
diff --git a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
index de044c9bcfc7..ef2a9b8c654a 100644
--- a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
@@ -30,8 +30,8 @@ src_configure() {
 	tc-export AR CC
 	# Hand rolled configure script, so not all flags are supported.
 	./configure \
-		--prefix="${EPREFIX%/}/usr" \
-		--libdir="${EPREFIX%/}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
 		$(use debug && echo --enable-debug) \
 		$(use_enable cpu_flags_x86_sse2 sse) \
 		$(use_with openmp) \
diff --git a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
index 053745426699..c04b34f09632 100644
--- a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
@@ -30,8 +30,8 @@ src_configure() {
 	tc-export AR CC
 	# Hand rolled configure script, so not all flags are supported.
 	./configure \
-		--prefix="${EPREFIX%/}/usr" \
-		--libdir="${EPREFIX%/}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
 		$(use debug && echo --enable-debug) \
 		$(use_enable cpu_flags_x86_sse2 sse) \
 		$(use_with openmp) \
diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index 6cd4dc9f69d8..7bebf1f375d0 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -1,3 +1,3 @@
 DIST mypaint-1.2.1.tar.xz 37897196 BLAKE2B 2d8f6b03f710febae1c2d617a6e542543786be384585ae8a973604da2eba8a0fb770d185aa3d2dfc6f794adf29ffb9c217356a96ab27d677ebb57816f62fae9c SHA512 1783765e495b9535669a83a29d27ba684e6201fdfe0875bdd2c167b1dab8af05993b19025767fe0b2770ed9e578e4709f75d8a4820ac945812cba85609f9eb9b
-EBUILD mypaint-1.2.1-r4.ebuild 1893 BLAKE2B 9dcb7eea376b676720cf638aa48664e307676d0125cc6c0ef6b451e6eac84d54f05e8775d9faaf99f8c4b0eef89d7999ea028dedad3205ae8f8bfc7b9979309e SHA512 1136db76fd4c71255f693f06981fcdf4f6220a4315ba26213168e4c8345d2d42d18ac380b9c50f6aeb97a53b8fc87994738e50f8c58f535f35a6d55701102ff3
+EBUILD mypaint-1.2.1-r5.ebuild 1959 BLAKE2B 2275a7b1cd2792808f710ebecd9545accccf935c8e27557474e8af53a64dc697da551df4158dcf72cdea480fa548e1c6617eb1aa2ace433d86f6237bb924a8b4 SHA512 7d220b043c0186402d2ef9a79cefc220f32d22b370eb64335d92d271b670d7d70aad9c5a9810617d450d6ffe0a28e6f0f93518d74d0bd04b97f9dcde6e2a5208
 MISC metadata.xml 247 BLAKE2B 3a8d267e6befd2f46c41982b7196470f32b4fcf5dc6a42ead10b13e81bdcb7975ea998a51d0deb2c3c1a49f00b5f9216d8e43ad7e6dd0aea0f3352b19532d0a0 SHA512 21b957bb801d29dfed1d0aeceac553c9ba039a7fe94ebf899e7ab5c3316bbad116c7bd63a07ccbbb8277d2ce19f27b964499d2ccd942028290519e465e989dbb
diff --git a/media-gfx/mypaint/mypaint-1.2.1-r4.ebuild b/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild
index d30ef32ed435..a55e00599696 100644
--- a/media-gfx/mypaint/mypaint-1.2.1-r4.ebuild
+++ b/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild
@@ -20,13 +20,15 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 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"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	|| (
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	>=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		|| (
+			dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		)
+		>=dev-python/pycairo-1.4[${PYTHON_MULTI_USEDEP}]
+		dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}]
+	')
 	>=dev-libs/json-c-0.11:=
 	media-libs/lcms:2
 	>=media-libs/libmypaint-1.3.0
diff --git a/media-gfx/opentoonz/Manifest b/media-gfx/opentoonz/Manifest
index 150fe89a2c50..b08243215bd2 100644
--- a/media-gfx/opentoonz/Manifest
+++ b/media-gfx/opentoonz/Manifest
@@ -2,8 +2,10 @@ AUX opentoonz-1.1.2-gcc6-no-throw-in-destructors.patch 1469 BLAKE2B cb25eaa0b3e4
 DIST opentoonz-1.1.2.tar.gz 36777909 BLAKE2B d822218c5ea1843a50da8d799bd9edf6998bd424ec2b65600371a0ae9f69aaea0d1c45aa53c3a0287c67459b8101a82bc0c339510859f4fbac3a116c9671df08 SHA512 800a741cb40e7dede79ef92705fc8fe3a23524c8a4397c30f80a81a7513c98606fb1bb5574188969ba08cfe8995d679f9fc5ecb696a6ac14c48aa2646a2c871e
 DIST opentoonz-1.2.1.tar.gz 39843446 BLAKE2B f9035bab5c6fa1d86459b401ca94acbffe8e38a2f5ec2bc97f303c7e829b9f6695480e7ab7a7560909f6ce45109ca1704d5020ff774964b5ed72b1b01588e93b SHA512 3eaf5983b5ec7424338e25975228b9bf6e9da61b2699c52377528966ecf07971868426bda0a64c780c2876cc1f0e4adb63c46767e8099fbfe32a8d1586c13f44
 DIST opentoonz-1.3.0.tar.gz 39920932 BLAKE2B 292e01c078a4cf461fff0814a60e4ab6aea9a74a63f23e854815632432e07e65d5c01dce9d3aab36595f94ca06dd83b078e52858532d8dadb2e7518514c08b08 SHA512 5df272c943f2c222a457545c99388266579d88c702d6c7e71dfe0c924a0189e30323cf9e369c96755c507ee5347620da0140215b2647555f0b3bdae41c615c71
-EBUILD opentoonz-1.1.2.ebuild 2152 BLAKE2B bbad89bf0799119e05e7ec8e900e786f28e51d4609874e7b676922ab8cc8ecb4506652f836e40778d3963eaea2cf9ec58c8da8fde68393455e60f82868ae3913 SHA512 62ca55a27d0e4ca42f274747b530221e003e67774fb822969f1b7e4e77eb80b961894a6362c45633c642dcbb1e35572ca77056d7cf43fede9f632789bb53aa35
-EBUILD opentoonz-1.2.1-r1.ebuild 2186 BLAKE2B cbd057c9b0cc2830f4168a5e044abd28d59e9395b51341463f204837c0e7a91f0c3a12905a34e06368b4d7f328a743c68808062754dba85d331d69b992970e2b SHA512 0ab9b5ec34212e2ded9a7b80efa8150b2bf4197d43dea613529f782bb1c2470b34beebb244bb38a79e4634e742ff67a9b482c4922d3f78432ae7c81b0dcdfe24
-EBUILD opentoonz-1.3.0-r1.ebuild 1903 BLAKE2B 3761c8c26faa082c4c76704a6f1b17a3d4700181e03f219228f7d33d11574a6485f62d9fe43caa874cb6a86534adc7b7ccb1de5650903a9132b9b9df1e1e2f02 SHA512 c6bb11fecaa28c0789d2c9acb3289b218d3eb673a94c8730bb09f465a6768a17288015751c3a0390ea22832868ada1686545cc2365c7915aeaaf9da215346077
-EBUILD opentoonz-1.3.0.ebuild 1914 BLAKE2B bc234169777f8e3ba8528ffdc7651f8a54b705b3d4928e072de752f9140fe97d760e82d5d07292a230caa9e29d8fe213c7be0ed9466a2ee06c8ac39923466f58 SHA512 eb89c56318659db87a84122dcdb4c75a7492ca98fe49025eb5b825756d81db43130d7b730d5d893372ff4d1b605577e10fa8c37ad1be0a1609c99f992c9e9f8e
+DIST opentoonz-1.4.0.tar.gz 53531141 BLAKE2B adb7a85fb0581d92119b5f6b75dc320428ea0763955f8c883072cba78045acdeea75a5cea82065a29d2c59f53b4843d8ff92690c9a47c01605b4702fd36d6c13 SHA512 777f5d59ec8076e1e53a81347e15bef198bea77449073f1e9d5fdd371a61e20fd6dc8b26c6656c783959782bd71008fbb63c05742aaa50c92bd317aded7d0649
+EBUILD opentoonz-1.1.2.ebuild 2148 BLAKE2B 5c1adbbc2ac37a1c7f86a8c73068157c4eb71bcb0337801e278e60e8588ad4e3f4e4a8895e26016ff335178cf52634acb2d17af94c6d018eeb726a5a5e650074 SHA512 5c1e8613c74b4462f912c7ca61430524fa34b5818728a8aad5bb60bb5a4976dbf571848bd7c29de40fda3294f07dd085cda479e0715c6b2a236a54da8767d0ac
+EBUILD opentoonz-1.2.1-r1.ebuild 2182 BLAKE2B e534e83b2ec8e80b0b4a66ee20f96b95d8f0bd5cab0a39f3aa0e7705a264a9b3047fff1700f4eed91b410840d8e9b6adbe312d6026abb0bfcf331c4bc23c482c SHA512 74ebde75e7d947e2a8e4a2fe1137fd95df85a8e8c89ca5654a7d4cb64c0a7bb96fbb368c553a521f4ecd6aea5d105c1bf7cf633326744ec9d81da781284ac42e
+EBUILD opentoonz-1.3.0-r1.ebuild 1899 BLAKE2B c93035dac4262df5c652b9fe16342fc50436408db9e29189c7dd0286ddb2e40db40ce2304436b396ce5e22f3b7f5e05b1777edde23d651474c240aaea6948dd6 SHA512 c8c35a99f037e2adce3b04ad312ea0f06590eb1dd31f0ad55769e58a80a2006334db2c1fe13fb3ef2f500edaaec43fea3c0bdec751db3e17db5fde93be16e3ff
+EBUILD opentoonz-1.3.0.ebuild 1910 BLAKE2B a119751d568e41f56b5a70f75431a5353002e8504dbc46ca0c6bfd0a817338bf468c91228740c1af3c01af5253278027082627955b8a7b3e9d813ab3630707ff SHA512 912bf4afdf94ba6d8fcf6e764144812a2c1a8b6d6b55cb9fc78e1bcc97ba89bf0d6a888a6803551cac305645ce5da9a6cd0a0647bf1ba3445c1c8db3086b02fa
+EBUILD opentoonz-1.4.0.ebuild 1817 BLAKE2B 63407ff2f79ce44b991ca53ffa0d606f605f203cae9ce95749293afc29e25f9802061884d1425e82c5a43da4a6fd477087dff9da03faa53e11e92482ce74cf4a SHA512 66e8e879c11a5bd55a9125f786bf2bad513def93eb95113f79c1172202365bcad8a9f655a9fc39459d529427590e1182e0b636eb3bc1ef5187e4c2e6e0c265a3
 MISC metadata.xml 453 BLAKE2B 5bcdb89e0cab891a18531065af9dc5d65510905f8c21178d62125901d0d65d0522b8e4a5ab94f92d09ed0085a0cfae6701c04001dc29bc5e138b12b888cf71ec SHA512 227ed636186b559a5c4fe8728bc8ad2fa519177451f61c6cc67e20be3f8b071715fe38c274956cc987c3c2a49a25b7c7ca61280608871861c0007c558c016d6f
diff --git a/media-gfx/opentoonz/opentoonz-1.1.2.ebuild b/media-gfx/opentoonz/opentoonz-1.1.2.ebuild
index ed5cd3d6884d..41ec70caafc7 100644
--- a/media-gfx/opentoonz/opentoonz-1.1.2.ebuild
+++ b/media-gfx/opentoonz/opentoonz-1.1.2.ebuild
@@ -54,8 +54,8 @@ src_configure()
 {
 	local mycmakeargs=(
 		-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
-		-DSUPERLU_INCLUDE_DIR="${EPREFIX%/}/usr/include/superlu"
-		-DLZO_INCLUDE_DIR="${EPREFIX%/}/usr/include/lzo"
+		-DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
+		-DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
 		-DCMAKE_SKIP_RPATH=ON
 	)
 
diff --git a/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild b/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild
index bcb59bf1a284..8906b6e2ae54 100644
--- a/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild
+++ b/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild
@@ -53,8 +53,8 @@ src_configure()
 {
 	local mycmakeargs=(
 		-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
-		-DSUPERLU_INCLUDE_DIR="${EPREFIX%/}/usr/include/superlu"
-		-DLZO_INCLUDE_DIR="${EPREFIX%/}/usr/include/lzo"
+		-DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
+		-DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
 		-DCMAKE_SKIP_RPATH=ON
 	)
 
diff --git a/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild b/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild
index 9921de91c2f5..7f206e2ccf0f 100644
--- a/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild
+++ b/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild
@@ -52,8 +52,8 @@ CMAKE_USE_DIR="${S}"/toonz/sources
 src_configure() {
 	local mycmakeargs=(
 		-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
-		-DSUPERLU_INCLUDE_DIR="${EPREFIX%/}/usr/include/superlu"
-		-DLZO_INCLUDE_DIR="${EPREFIX%/}/usr/include/lzo"
+		-DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
+		-DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
 		-DCMAKE_SKIP_RPATH=ON
 	)
 
diff --git a/media-gfx/opentoonz/opentoonz-1.3.0.ebuild b/media-gfx/opentoonz/opentoonz-1.3.0.ebuild
index a73803cb0e07..760fe526d498 100644
--- a/media-gfx/opentoonz/opentoonz-1.3.0.ebuild
+++ b/media-gfx/opentoonz/opentoonz-1.3.0.ebuild
@@ -52,8 +52,8 @@ CMAKE_USE_DIR="${S}"/toonz/sources
 src_configure() {
 	local mycmakeargs=(
 		-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
-		-DSUPERLU_INCLUDE_DIR="${EPREFIX%/}/usr/include/superlu"
-		-DLZO_INCLUDE_DIR="${EPREFIX%/}/usr/include/lzo"
+		-DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
+		-DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
 		-DCMAKE_SKIP_RPATH=ON
 	)
 
diff --git a/media-gfx/opentoonz/opentoonz-1.4.0.ebuild b/media-gfx/opentoonz/opentoonz-1.4.0.ebuild
new file mode 100644
index 000000000000..cccd2e4ca023
--- /dev/null
+++ b/media-gfx/opentoonz/opentoonz-1.4.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="An open-source full-featured 2D animation creation software"
+HOMEPAGE="https://github.com/opentoonz/opentoonz"
+SRC_URI="https://github.com/opentoonz/opentoonz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD libtiff"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	app-arch/lz4:=
+	>=dev-libs/boost-1.55.0:=
+	dev-libs/lzo:2
+	>=dev-qt/qtcore-5.9:5
+	>=dev-qt/qtgui-5.9:5
+	>=dev-qt/qtmultimedia-5.9:5[widgets]
+	>=dev-qt/qtnetwork-5.9:5
+	>=dev-qt/qtopengl-5.9:5
+	>=dev-qt/qtprintsupport-5.9:5
+	>=dev-qt/qtscript-5.9:5
+	>=dev-qt/qtsvg-5.9:5
+	>=dev-qt/qtwidgets-5.9:5
+	>=dev-qt/qtxml-5.9:5
+	media-libs/freeglut
+	media-libs/freetype:2
+	media-libs/glew:=
+	media-libs/libjpeg-turbo
+	>=media-libs/libmypaint-1.3.0:=
+	media-libs/libpng:=
+	>=sci-libs/superlu-4.1:=
+	sys-libs/zlib
+	virtual/cblas
+	virtual/libusb:1
+	virtual/opengl
+"
+DEPEND="
+	${RDEPEND}
+"
+
+CMAKE_USE_DIR="${S}"/toonz/sources
+CMAKE_MAKEFILE_GENERATOR=emake
+
+src_configure() {
+	local mycmakeargs=(
+		-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
+		-DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
+		-DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
+		-DCMAKE_SKIP_RPATH=ON
+	)
+
+	# The upstream uses their own modified libtiff
+	# See: https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md#building-libtiff
+	cd thirdparty/tiff-4.0.3 || die
+	econf \
+		--with-pic \
+		--disable-jbig \
+		--enable-static \
+		--disable-shared
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cd "${S}"/thirdparty/tiff-4.0.3 || die
+	emake
+
+	cmake_src_compile
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index fc6521dc0b97..7e890192290d 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -4,6 +4,6 @@ AUX openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch 2990 BLAKE2B d6508
 DIST openvdb-4.0.2-patchset-02.tar.xz 12428 BLAKE2B 2684ddf010df975912fcfc8c4f944d9a9ba447b48750140b6c46db31d49297f7495e5c77e9d5b85af0b2e1d0c4987184865642dc95f1fb3e463e85ee5987d203 SHA512 04377d552e218a8eb31c43381ba32263ba206a0870dccda1bcc031863dfdbcc953da7ea89fd420dc1a338fbd6123ac30bac2039c0a2a01c1fa9253a3fdd0b54d
 DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d
 DIST openvdb-5.2.0.tar.gz 1788969 BLAKE2B d146b78dd7db4936779ca214b1f7957d4868bf76aedb95c9a98e21d25983b750337a63bf4bc9ccb438b683988af7a3d708676dcf7b4662c84e4926e8000ceb68 SHA512 69e21190c27a055e476a319b0c2d961303fa2f3fec30bec93ed44072d01816ef89e5e8f0abfc3a22d1c73742aa31284c664596747b49cd985fea1a751776506e
-EBUILD openvdb-4.0.2-r2.ebuild 2067 BLAKE2B ff4e79f2e30a1a9669b6542835ca3f5c010eb9431aad10216e002fa49780253feec6175edd793593e7ef66dc5d415e997f6466d8b4336174cd91a032b8f081cf SHA512 0d1d47dd858e5be0bb00828bfbe3ece2c0ec56f48395b7c0c3d2c621f5be53192a5fa8001d241496231c6428d1824842f7721a06518b88b160e3e6bbd3d5479e
-EBUILD openvdb-5.2.0.ebuild 1802 BLAKE2B 07280548100cbfc4ac8dda53e6622f51910f6fea6700b3eaa20caba8d3587654266347c45487bf922cb024582bbb2dc634c7578650ec876ed379e3a1a1f6b07a SHA512 61a0bc1ae582ab57e6ab19e8aeb7a405b1253966b91f46387455f17f05b2f723d02f4d8d7d3ad63996b00c7dbee1a90f259b1f7bcbc78d9bab3383144f78a228
+EBUILD openvdb-4.0.2-r3.ebuild 2137 BLAKE2B 3d899278e4496b9d1d0d6a7d8d3b708e160409ec10e0a7a1390d9a68ec165cae1f09b0194581fbf4de91fb4093547077a52a6633b64db8661ccc1e8f69d0be38 SHA512 30d53679c8e6e9d553d4a8828ec4a876bc98b69dd248a616c5a821a12c5db56a2ac8f392f9f4dd40b0532cbdcce8871c0c9fc3f3016ae816bd175f54b6469d34
+EBUILD openvdb-5.2.0-r1.ebuild 1872 BLAKE2B c057d4625a41784f401c9426feceee90aa947490a6b643e41eaff70c9c45482d479afc3f219744cc172b48749ea1cf59214155d5ba0b567eebc4f973c919ae46 SHA512 55f6b579fbd4f96b7145d33d9d6ec756093b2054ae109d7e62022a28387d33076b2917020722bc8a143068af7ae19f2835b29c1a5d226f4ea3cb8e7b4fd99130
 MISC metadata.xml 1033 BLAKE2B 303f49be8253322a0bbb94875f7b9b03e127e9d2ab2eea64fbac1cd51f50d5be749c4c45c9491fbf3f56de7420fdb47913b6ef3c2d12f5ea0545042f68d990d4 SHA512 a81a1cd4684197d1d9455b1398c9ba1592d596d52c8e8fc5c0cc8de0357c1f1df7478fd76e4e42cda09524b0bbf41985e13cf530adb7ca7f1605f086207301a8
diff --git a/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild
index e54468f1c2a1..c683e96e7099 100644
--- a/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
+++ b/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild
@@ -20,7 +20,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
-	>=dev-libs/boost-1.62:=[python?,${PYTHON_USEDEP}]
+	>=dev-libs/boost-1.62:=
 	>=dev-libs/c-blosc-1.5.0
 	dev-libs/jemalloc
 	dev-libs/log4cplus
@@ -33,7 +33,10 @@ RDEPEND="
 	x11-libs/libXrandr
 	python? (
 		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-libs/boost-1.62:=[python,${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
 	)"
 
 DEPEND="${RDEPEND}
diff --git a/media-gfx/openvdb/openvdb-5.2.0.ebuild b/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild
index 3bbdbdb4fb2a..acb7886d4438 100644
--- a/media-gfx/openvdb/openvdb-5.2.0.ebuild
+++ b/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
-	>=dev-libs/boost-1.62:=[python?,${PYTHON_USEDEP}]
+	>=dev-libs/boost-1.62:=
 	>=dev-libs/c-blosc-1.5.0
 	dev-libs/jemalloc
 	dev-libs/log4cplus
@@ -32,7 +32,10 @@ RDEPEND="
 	x11-libs/libXrandr
 	python? (
 		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-libs/boost-1.62:=[python,${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
 	)"
 
 DEPEND="${RDEPEND}
diff --git a/media-gfx/sigal/Manifest b/media-gfx/sigal/Manifest
index 2e0c901c3f82..f441be68e6ca 100644
--- a/media-gfx/sigal/Manifest
+++ b/media-gfx/sigal/Manifest
@@ -1,3 +1,3 @@
 DIST sigal-1.3.0.tar.gz 3267422 BLAKE2B 0be6dc6b92c8681e47ad7094004793fe78fd8974075958374268bb55f6d2deb903b5ad858c2603c751f74fd2394c945d3f933b3fb44a8f58b18dcd9a2c1c1236 SHA512 132c94a472301a2cc81a4aef13afa8137a6b69dfc035821e22fca6b0598cb94f1788f1a8cf1b47412214c9480867be816070aaa938290a1d10bccc407c38aaf4
-EBUILD sigal-1.3.0.ebuild 878 BLAKE2B 4818ea2706f82c756dbd7f45f4ab0d8f0264d81eb511dafb122b4492c25f7c2709c728bf8d455a6a99308eab07c241065240b071a0fd947584699c5d89732ce2 SHA512 c649a8781fe15ed3d44dd1e863853f77ff96c1a08cc43dd4b88b0fea6f2cbcb8a9243e55ff1d3e9ea3e259167a9f749fcc9f25982d685582e5329841a9a7014a
+EBUILD sigal-1.3.0.ebuild 872 BLAKE2B f3c89f1299b61c8769cd068fe89bee7d4e0848e7ac73486233264e90e7c3252dc5224d862a1d9eb2e8f162a495183853f6f952d874d045f41d0c04131e550176 SHA512 118373cdddec32a41697436295b2f8d8885edd73a14b12d92c71a53c05f6edb6e1d877767a25173d61981282efa0d97b2efb1c6bc7ecfa5bd13ccd1758405894
 MISC metadata.xml 1062 BLAKE2B 2997924c7ffdf6ddf3afd6b8d55ab426c7701eb3beb3c566f870507730f99ddd4875621029e078d7f1db16d582de448257701ff7c6325169fafb71a15e9e2304 SHA512 d49289c1dbd612fe88b6ef3d883b073c4b2985839decd5d3b9d73a3c24e0aa83e37890068be8e127ad1f88f86b9b37f7f2f61299c431b3a21b6219f2671a73d3
diff --git a/media-gfx/sigal/sigal-1.3.0.ebuild b/media-gfx/sigal/sigal-1.3.0.ebuild
index c6ef6d35b74a..50b523364a30 100644
--- a/media-gfx/sigal/sigal-1.3.0.ebuild
+++ b/media-gfx/sigal/sigal-1.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest
index acea5755ad46..b1d0e3367795 100644
--- a/media-gfx/sxiv/Manifest
+++ b/media-gfx/sxiv/Manifest
@@ -2,6 +2,6 @@ AUX sxiv-25-makefile.patch 251 BLAKE2B 05b96799c7e94c2a907158becfbd3d0844a3919f7
 DIST sxiv-25.tar.gz 48814 BLAKE2B 17ef2ff0e75acd6acce068dfc17dfbce78bb1a38b652e948b5f88902adcbae504e9322c92d125b71c511a95c7e8e47b58060ff58e2c804a7296b5a801d3fc0e8 SHA512 ca0d834c9982c5e98c0bae51d21b7d08692af2d692eeb2ac55e19c4da7d09b16bbaa8022af0a0d00c52def4120058d895f37a2f8b14f453a0ceb65eebe564814
 DIST sxiv-26.tar.gz 48569 BLAKE2B a73707e2fd699b53e38ddc48710a73b945d4e102743567283d7351c92c513e4e57a32c409267593a2c5808caf811b7caeb555f8ba2762f1cc76a421aceff0e95 SHA512 c4bd56ea14e520ea9b116e275009f2089e5c434d6894281215b09d07572b2d3190c3c3eca015a2933328d704afb7d443a66e858b4e6904a3d4d45378b35d22cb
 EBUILD sxiv-25.ebuild 1293 BLAKE2B 715b77644c20bae1c82681a17ad3dd2d2faa8944148c5df2bd1fe13394aa579fea2ca6d1e903d1512c010a3042e6314ab98a03c59dfdf9079a7413981b177eb6 SHA512 1a1c372246eba6f11fff1fd4821b2f9e20e2fbf45d222d05480c4761417302e05b427654b5ec632b92d4b4865e5749348985dae4c3e09725729bb45d92e2d9dc
-EBUILD sxiv-26.ebuild 1188 BLAKE2B 5d9e15fe964703bc0187ffe4ae1db7170aae5bef4b3dcb3eba40a8a8cfef66122a70164800933cae2a4786a48dd4c2e1faf15349d3564f0f549e8e9c7c58295b SHA512 4f0a3d095154a04902a5e6c4ae10e4b7b82816a0e713bd83ad9135ebf500de13b3449c4b9c3fa41f02fc77294683c12e5837e6acf8a9bd40e77368b06f909148
-EBUILD sxiv-9999.ebuild 1188 BLAKE2B 5d9e15fe964703bc0187ffe4ae1db7170aae5bef4b3dcb3eba40a8a8cfef66122a70164800933cae2a4786a48dd4c2e1faf15349d3564f0f549e8e9c7c58295b SHA512 4f0a3d095154a04902a5e6c4ae10e4b7b82816a0e713bd83ad9135ebf500de13b3449c4b9c3fa41f02fc77294683c12e5837e6acf8a9bd40e77368b06f909148
+EBUILD sxiv-26.ebuild 1239 BLAKE2B c860e96538e8bfe6712ce11d13fcd27d91af12a463dcb6963314d4757f96fa271b0f2bbe403f96cba534c5f3700d551653ac1d765dd7273ffe16cdc9be3739a5 SHA512 f5fed5f22046c485b8f7b621f10a29aaa44496287199752ef26e59db3b5980d307440afcce925ded90403e13d2de689f5eb844660725693864fff9060a603d44
+EBUILD sxiv-9999.ebuild 1239 BLAKE2B c860e96538e8bfe6712ce11d13fcd27d91af12a463dcb6963314d4757f96fa271b0f2bbe403f96cba534c5f3700d551653ac1d765dd7273ffe16cdc9be3739a5 SHA512 f5fed5f22046c485b8f7b621f10a29aaa44496287199752ef26e59db3b5980d307440afcce925ded90403e13d2de689f5eb844660725693864fff9060a603d44
 MISC metadata.xml 347 BLAKE2B 0e614a8efac493e84e5b64dc4347616e6af23c5e95a84b29fe755ab73d2bec9527a3e7dfd39cb9d952df4571c2b6d6f3de10e949bd5356d9628f3761bc578a4f SHA512 9aca2dd50b12a3bc6a0175bf8fe1767990b519ba92f91eca79137383901119fb7002b0e31d817a287ec08595d32c0074d92aefb0b0ae14c8e4c0b6b366e28515
diff --git a/media-gfx/sxiv/sxiv-26.ebuild b/media-gfx/sxiv/sxiv-26.ebuild
index ff78c92751b8..890ffab338b5 100644
--- a/media-gfx/sxiv/sxiv-26.ebuild
+++ b/media-gfx/sxiv/sxiv-26.ebuild
@@ -29,6 +29,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${PN}-25-makefile.patch )
+
 src_prepare() {
 	restore_config config.h
 	default
diff --git a/media-gfx/sxiv/sxiv-9999.ebuild b/media-gfx/sxiv/sxiv-9999.ebuild
index ff78c92751b8..890ffab338b5 100644
--- a/media-gfx/sxiv/sxiv-9999.ebuild
+++ b/media-gfx/sxiv/sxiv-9999.ebuild
@@ -29,6 +29,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${PN}-25-makefile.patch )
+
 src_prepare() {
 	restore_config config.h
 	default
diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest
index 83dc35553593..a0c95a371726 100644
--- a/media-gfx/transfig/Manifest
+++ b/media-gfx/transfig/Manifest
@@ -1,5 +1,6 @@
+AUX transfig-3.2.5e-gcc10-fno-common.patch 939 BLAKE2B 70af7830470b5ed524d6b5df5ae11369476bbc60594da9bd766aa1d752020171b82e0d35e0d57ce1499f69e13b5a5f5274c9c530a2d7fa0f9deabda55462f0a0 SHA512 7b4b5dd4da00180f2eb34a7dcdc407e958df69ba843c371c496dc488977aa8045c31e1007f05e9dcb96765bfa83df75caabd92c99114555b252846892292e465
 DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980
 DIST transfig-3.2.5e-gentoo-patchset.tar.bz2 21130 BLAKE2B 1c07bc7e85fdde29f5e9290bf3c0df75610a7c219f001920b7412d2c104fe1d8d5b2698d91cde1c08f57d4718547c2dffa0aa859bd53a295c55a285ca4f5fbb7 SHA512 4c6ca63159ae58c35c1a9c818bc3b29715a4015e6a11d283b4d0c57c0cfeccbf38160f61f3c91f9bc68f82a8b5676349bb98866f40f617bb95afd73267d00e97
 DIST transfig.3.2.5e.tar.gz 531256 BLAKE2B 830a97cb801b9cb284f7746a7f4a9645263cc34fd35d904288143d730331901302b12223ba135d8fa936f5ca0eeccacd194bbe2e74dfcfbf0cf4aede273ab507 SHA512 ed1379f1112514d90a4b3eecd3222baad311d804b5090e8e66867ec299e4f9a5f8d83ef8939aa6ecaa85a18143b8fb9b97f78e078ac5eeb934a158c55de6bb1e
-EBUILD transfig-3.2.5e.ebuild 2935 BLAKE2B b99aafdf73b546f9038e8820ab8ebe07c37b58e045da040fc36aa68db7b489934cbc38831b6764800938715f4b2d61ab7c87ef7bd153e8276b7a1e507f1187ca SHA512 38572c6f9ee4091bb6d648c85bede7bd8d7046f9cdb8ebd802c048d7d144ab907ab8ec055f78bf1b25baa5324b0b13eb7a07b69bebd30c062241f9201c98b79f
+EBUILD transfig-3.2.5e.ebuild 2993 BLAKE2B 89f50342d529fb295a7e60803d5605ec60f7f0d47814b68b944133e95564a7ef2850d67f20d8a2b93f0265bc458b8901c415b72de4ca4348364514417f026c5b SHA512 fe0dd0fe59c4881a6e76ab9199e3ee225cbb6f64880fda01cd67fed169bc7d609677cee3efe983f40e6c3e3a300bb657f427f1ffdfce08ba475c6f88f41bf14a
 MISC metadata.xml 238 BLAKE2B 60ff9cbe893ace8f33a3d44ee85a5c73c9bd5553478173bf92c4aa93398ae1140ba28673eb6c7373ac48ede6679546b57ea08b8e676ce5c7a47792a2ba8b3148 SHA512 65918555949ddfef068a9a197dffda69aee483ac55c1b52dcf19376aecf1cb53d8a3fc0931d4ebdbe64ba3341e2a2567d56c2830eb31e6746735449c53a1203c
diff --git a/media-gfx/transfig/files/transfig-3.2.5e-gcc10-fno-common.patch b/media-gfx/transfig/files/transfig-3.2.5e-gcc10-fno-common.patch
new file mode 100644
index 000000000000..e0c92161e3ff
--- /dev/null
+++ b/media-gfx/transfig/files/transfig-3.2.5e-gcc10-fno-common.patch
@@ -0,0 +1,30 @@
+--- a/fig2dev/dev/gensvg.c
++++ b/fig2dev/dev/gensvg.c
+@@ -230,10 +230,12 @@
+ };
+ 
+ /* arrowhead arrays */
+-Point   points[50], fillpoints[50], clippoints[50];
+-int     npoints, nfillpoints, nclippoints;
+-int     arrowx1, arrowy1;	/* first point of object */
+-int     arrowx2, arrowy2;	/* second point of object */
++Point   fillpoints[50];
++int     nfillpoints;
++extern Point   points[50], clippoints[50];
++extern int     npoints, nclippoints;
++extern int     arrowx1, arrowy1;	/* first point of object */
++extern int     arrowx2, arrowy2;	/* second point of object */
+ 
+ static int tileno=0; /* number of current tile */ 
+ 
+--- a/fig2dev/fig2dev.h
++++ b/fig2dev/fig2dev.h
+@@ -127,7 +127,7 @@
+ extern char	*prog, *from, *to;
+ extern char	*name;
+ extern double	font_size;
+-Boolean	correct_font_size;	/* use correct font size */
++extern Boolean	correct_font_size;	/* use correct font size */
+ extern double	mag, fontmag;
+ extern FILE	*tfp;
+ 
diff --git a/media-gfx/transfig/transfig-3.2.5e.ebuild b/media-gfx/transfig/transfig-3.2.5e.ebuild
index 7e9dcc63d778..668facad5ece 100644
--- a/media-gfx/transfig/transfig-3.2.5e.ebuild
+++ b/media-gfx/transfig/transfig-3.2.5e.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="4"
@@ -54,6 +54,7 @@ src_prepare() {
 	epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5e-typos.patch
 	epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5e-man-hyphen.patch
 	epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5e-fprintf_format_warnings.patch
+	epatch "${FILESDIR}"/${PN}-3.2.5e-gcc10-fno-common.patch
 
 	sed -e 's:-L$(ZLIBDIR) -lz::' \
 		-e 's: -lX11::' \
diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest
index 18c2237e8f41..9068aa1615b2 100644
--- a/media-gfx/valentina/Manifest
+++ b/media-gfx/valentina/Manifest
@@ -1,6 +1,6 @@
 AUX 5823.patch 1870 BLAKE2B 1a4edc390abd09010fb946035dab6f4ee9223eaa286f9843404db4f95d94e60da73dbf515c99aa857acdcb7d26bca3117fcdfdf2b9514ad45c2e795ab579cc46 SHA512 0cf9d1691816b165ab691cd34807f7c82eea685b5af2d9c483a9427987ae565f44e31bffcec9c3ede6102aa800d3988b054a178ec74f1826be1a88fd9f5ec28c
 DIST valentina-0.6.1.zip 38326440 BLAKE2B 33d9163058b890254120bb0849972941f36526c71ed0acd8df82867a0116a35be4818c31c3ebb8a7322cf53bca4f9e77b2de10ea0df51c46b764f8f9e7abb8d2 SHA512 6511194c734a1b6cd8a1ed489213c288e90bd653dbd8373c4ee13be78e2ae4fe00a35e19a5ee074e868319ab1a13eb8baea35dedb7242b3888d03aa4b4dc69ce
 DIST valentina-5858.patch.bz2 4507 BLAKE2B 10bf1e48b9c822b5fecd040edea05a9fa16bc84d6d8a872a50329bd6b61ae250b489fbf71b19f0453ab5caea0bd7dc821d8c6fbe0fc24a6306d57ce5b34350f9 SHA512 037d2a5305d85d7d6be90c181ee6c39110a86c5f5d77c22453a2933e7d6a43c600f6ffb393015e98f9aab55b0d11291dca482352e1fc74f485578b65b3b84720
-EBUILD valentina-0.6.1-r1.ebuild 2138 BLAKE2B f78ad7ccba1ffbd3cdc8cc9b37f3224597f14edc85443fd7c6e8fb9de4fb8f6561090d6fb2f3784c6ecc351185429f83d7a4c0a4f8bffa1e87d60be26803ed8b SHA512 bb23ed75cda257f20eb5d2dda863095c8b03d8aa7f9932e7bbfa980b29c00f2448606f256f9844df32b6a5f6bd13a2eac7c740ead149950b709162e073c8e102
+EBUILD valentina-0.6.1-r1.ebuild 2136 BLAKE2B b5e29fd5988c8a0187cef2a6df84bb2d82cd59ba6b375bc4e57bcb8dd0ee9f5665a634e845f56320009799326bb0628d27fcf74229f640db5a0ebfdfa7ad3dd1 SHA512 a132e6373561efd9e8c93d59182e8be01c335b5e150203b2eaab806b274e001416a425c1652fd2a768b117e1acbccedd3a54952254178e8d2977cecd642948ac
 EBUILD valentina-9999.ebuild 1922 BLAKE2B 57a28e28e6ab7cefccc216d03365bc4b41dadaea31bdcdc3a198b8122aef3848d209e68219dec0f806303e27027675eff522be11b6d4716d822efe70ee5d1e6f SHA512 b89d500a486d5d9109806fd38bc6a38eb02036b6ff4c4e69cba30b0df6f5a7516d9f2a0187bf77d48f5ff0b3a99327b6c65c25b0575b34502a4695c00c111053
 MISC metadata.xml 334 BLAKE2B 7f146a505a30d4461165308b40383e2b78998411874c8af6113c3040142003868f397872ecd22b9b8f3ec6193c532fa934c8646ee04e8c49157464b58035de09 SHA512 d1264aa0d26ba75466c5572c37ca6fd384d4e6db392aca0e47d4b1d0bd3ef7e035fed51c460af1bb258c500d1cc9211ec2e85db3e3aa158d378fb1389a3ebf03
diff --git a/media-gfx/valentina/valentina-0.6.1-r1.ebuild b/media-gfx/valentina/valentina-0.6.1-r1.ebuild
index f44a566e76f4..ef3be1080d91 100644
--- a/media-gfx/valentina/valentina-0.6.1-r1.ebuild
+++ b/media-gfx/valentina/valentina-0.6.1-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
@@ -12,7 +12,7 @@ SRC_URI="https://bitbucket.org/dismine/${PN}/get/v${PV}.zip -> ${P}.zip
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 LANGS="cs de el en en es fi fr he id it nl pt-BR ro ru uk zh-CN"
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 4a2661a3858d..af7c283a4248 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -7,6 +7,6 @@ AUX zbar-0.23_fix_python_detect.patch 351 BLAKE2B d5261e9adb3c9b43f1208a41a65571
 AUX zbar-0.23_reset_conversion_descriptor_after_close.patch 829 BLAKE2B b39c63a1aa11a79123226ebf91ba0b4d047412b96b12d8ed591e85625c96e3de1fcfd0624b622c4f59c98d4e4e3483c74d6699ae2579a18352d12698b3b0f430 SHA512 c641b83c81c07e850a17672a8ad5a16ab650330ccffcba98d209ed105058cc66664aff76d391803503b6d784daaf2b31d9faad2aa9dd69221598b13187e27dd1
 DIST zbar-0.20.1.tar.gz 555199 BLAKE2B f224a2207fa0603da4cc3a0e1d05bc73f3cf0cc9d13c26b3b801d3418f4f6a001b52e468b721552af61f4c8d7357934abd0560c24d3b233107785c69cfe14753 SHA512 21ad9d8fcdecb41bd4b8979366ab8ec6e8eac815f52270b0dc72ce6a126ccef933d048ce8bbe28f46ada5defadf85ba8c97c5c1870c9560a9dab28c585dfaf42
 DIST zbar-0.23.tar.gz 1301948 BLAKE2B dd74ce44bcb10f8a7cf180b982e5bd82f1f5674540931377d207ab730bb2d080fe222bfc42d4a3d70895ad53b78638e73c2294018b80d30dc28f7e6ecc14c761 SHA512 9737f9dca42c29f92aa1eca5c0808da34f1d16c88c65241c9e3984c487e502f398437e7a707a1edd2c440f784db537ba33ea4008a2d1c1caaf5eea6431b1400b
-EBUILD zbar-0.20.1-r1.ebuild 3750 BLAKE2B 259754767901ad0b09db83d38a5ebf7130c5beea96e36a39d2ec30905347f287eff29f558678427d95676c45943c59230f703e3fa8af8fac36d52647d2474586 SHA512 21555d40bd966c9de37cc69fca082cc9bb9cc70733f9b2c4313b6cd52a31bd33dbad8bce4de5b0c820cd8ea22ce36cd4954ee80aa64962385abd1d91f5b321f8
-EBUILD zbar-0.23.ebuild 4994 BLAKE2B 439b61a455f9d12ebf7c4b900f25397d8eea50d26ccbf4750439c857be80ac1fd3024ba4061016314030b9c1e9713f0bebdea10888b1ed02c45a1c44b228795e SHA512 c57cc6cdbec6f0130e49aa5a8051738c9829fa7f92e5f7b8396ee39f667169377fa112e18c22da7205075dd7ac72504d6babb4572564e21440cc1ec09c6a85f8
+EBUILD zbar-0.20.1-r2.ebuild 3795 BLAKE2B a2d47958dd6175ab9bad3f4cfb34e14cb41ff8265848784ade15d5e7de7e4d105d206b0a34739de7119dd35398cdc3f041a6917734234ad0dab9a3d34ca90e30 SHA512 f2fe964c7196ac539aaf95324855b024f594461af471d9bcbb4d611f76b99a25ee430616a2213398beb1e25a66ea511a816ecd0b711be08b8b54ef9cd2f0e616
+EBUILD zbar-0.23-r1.ebuild 5032 BLAKE2B ff4c538a9afacc4007dee2b186cdf5dbf086c93f7915305b6d882b5e326cace8bc25942475b6bb64ce4915c04e08dd4730c7ed537ef5fee3632e664c4806a064 SHA512 f15df43d499480c3d7c85f6207ee3cef58609d5d8723fce35f4c027e136efe9fc8277576a307e8ecd5b9fdb356402bf0dfd38f5e4ed66d908946cf74ec0611f9
 MISC metadata.xml 931 BLAKE2B a8c611d728a6fd0dbc94f333681a5a0ec4fc2bd8529cca7dcebfa8e1774c1d5e069c870baffd29fa033ce0529d2c2cb2ee3a1a54c089b1fd988b0d2c1ce82aae SHA512 c42caef53bc9c8743f8f02f5c96f687b605248a4311efea44777781a85a4b5a31e586cbdd7d85b07a6b2aca8138f5c7238b1f35a37b13741a297e9751731da19
diff --git a/media-gfx/zbar/zbar-0.20.1-r1.ebuild b/media-gfx/zbar/zbar-0.20.1-r2.ebuild
index 9a6382e3b61f..5aba21e790d8 100644
--- a/media-gfx/zbar/zbar-0.20.1-r1.ebuild
+++ b/media-gfx/zbar/zbar-0.20.1-r2.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
@@ -33,7 +33,11 @@ COMMON_DEPEND="
 	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
 	python? (
 		${PYTHON_DEPS}
-		gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] )
+		gtk? (
+			$(python_gen_cond_dep '
+				>=dev-python/pygtk-2[${PYTHON_MULTI_USEDEP}]
+			')
+		)
 	)
 	qt5? (
 		dev-qt/qtcore:5
diff --git a/media-gfx/zbar/zbar-0.23.ebuild b/media-gfx/zbar/zbar-0.23-r1.ebuild
index 495dc423d47e..87656810dce6 100644
--- a/media-gfx/zbar/zbar-0.23.ebuild
+++ b/media-gfx/zbar/zbar-0.23-r1.ebuild
@@ -66,7 +66,9 @@ DEPEND="${COMMON_DEPEND}
 	)
 	test? (
 		${PYTHON_DEPS}
-		dev-python/pillow[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		')
 	)"
 
 BDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
commit	71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree	9f1f0dee23e13658e52f49437befe78427148c51 /media-gfx
parent	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)