gentoo resync : 17.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-17 01:16:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-17 01:16:38 +0000
commit: 53cba99042fa967e2a93da9f8db806fe2d035543 (patch)
tree: 9780d3b87dfc6bdebc6b7b7d15af1ecb813c6853 /media-gfx
parent: 71deace00d1a2b091313fe137ab7092418c6f87c (diff)
114 files changed, 323 insertions, 428 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 0e2c353470b1..1f6d0e64fc9c 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/crwinfo/Manifest b/media-gfx/crwinfo/Manifest
index f23670ea5670..09094f0d3285 100644
--- a/media-gfx/crwinfo/Manifest
+++ b/media-gfx/crwinfo/Manifest
@@ -1,4 +1,4 @@
 AUX crwinfo-0.2.patch 1009 BLAKE2B 0d4ac95f748b9a0c82d9819a951cefa97c6a1bef06f7495623bc2e3b245ef32e63e8fa9d387d4408c136f58e9606a1b591d802bf3cb76c27ea7079df59d7a711 SHA512 b02efcaf211603b5901b316d286ba0baf7e74776a2f92d6f321b154c8713a7fe653b5652137de8ae25d7a9f9eca6f217a4bab1c6839e7bb144ac5fdd804c001b
 DIST CRWInfo-0.2.tar.gz 10717 BLAKE2B fce230c1913cd924b554697bb1a26661671ec2ec274fbb5f8918f2f5bdb8923897dd1f9b3a4a844f8d0f380f39f50ee08418c6d3cfac39fe7a3e50255aa0632d SHA512 54e386266570460dd43f5a6d4b0eea7d6c37d9327dca8ffc1fa10462f97e23fc080404159723ce6558c3dc6c77eccba6ede628097d95f699a47f57a114e1eb0a
-EBUILD crwinfo-0.2.ebuild 594 BLAKE2B c4d2eb73ee0329871dbd6b7efbe501cbfc2fb40b8f70495ecf3b51a7c6397131f55c7baea8e19a4908e52de1826c32102f37e02640480d198c1bb089d5507361 SHA512 f37a2bcb985ac2e3f27b2eb0b8ce4ba64eb9b1fb4b28ad69aa7289cfd90832adc70531cd2d579689fefb2db3dab18a8cc88aaa924bccf02f4d81f0b884343978
+EBUILD crwinfo-0.2.ebuild 594 BLAKE2B 5cfb758c30f4fb51d217b62ffa764f3dc547b8df1662e4320431c946bc6b1ada4e19c2612a54cfa6e1cc09d4128bf2761dbe7acfcf7cf26332d1711c149015d6 SHA512 b3e65197b64fe7e4528e135b8ffcb8c3cca98348f792512dc39d0b1d5fb2ad66958b7adacaf26f216ffba706e7f9bb2a18c2f2b93224c0bd9baaee429ce17329
 MISC metadata.xml 369 BLAKE2B 82f9df6d1668d42aeb01f7632349addc219842853a89150515007bea21d058c9b92a6d38598c2cc35bdf8957ea8e40f0bcab55953443afbbd79e21a2c2921738 SHA512 ee3b3a975b809e4433e7a6242a788f016abd75a969c6898ed07861d38b609d11d5cc1997c19165128760ed3f99022dac64f3f63cd2281ff86bc78023d7c40709
diff --git a/media-gfx/crwinfo/crwinfo-0.2.ebuild b/media-gfx/crwinfo/crwinfo-0.2.ebuild
index 70f8d611378a..8fbcd90d0766 100644
--- a/media-gfx/crwinfo/crwinfo-0.2.ebuild
+++ b/media-gfx/crwinfo/crwinfo-0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest
index 0083ca12d560..741b66626b82 100644
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@@ -4,6 +4,6 @@ DIST curaengine-4.2.0.tar.gz 1654657 BLAKE2B c11f77a126e49c1c63550accd42c3616ab6
 DIST curaengine-4.3.0.tar.gz 1656780 BLAKE2B 9b93e3f294a8a67c2cd4f2d4462a4047e6860e0c391e7ff550b24c498faa82fd2af4fd044845f00f93fb01d38ca3fa1511bfe65a7456b5a6e0b919821be5ab8f SHA512 60ca0ce586c0cf5f1516f803b2a05a20299ef8193f065acd6e11a0054903189225f9c60be1b536ffe5a9a22652097acd3a4aae2833920a468071b78f213f7572
 EBUILD curaengine-3.4.1.ebuild 902 BLAKE2B 5216cfc20c7b68f326828fcab00d1d116dc6ad3f2f4a5b158d6e22a91b4cd7a5081bdaed05ab9fb18c8d135460f1396c0559a1edaecc3c6c94e143e876d6ed0d SHA512 dd985e6460373739dd368b5fb31c35f3fce4a403d64f77db968e32a0186eb1ad0a723b71ea7c67e7d71581012c529bff023ba7ff49e5324883c30b970a55a71d
 EBUILD curaengine-3.6.0.ebuild 902 BLAKE2B 5216cfc20c7b68f326828fcab00d1d116dc6ad3f2f4a5b158d6e22a91b4cd7a5081bdaed05ab9fb18c8d135460f1396c0559a1edaecc3c6c94e143e876d6ed0d SHA512 dd985e6460373739dd368b5fb31c35f3fce4a403d64f77db968e32a0186eb1ad0a723b71ea7c67e7d71581012c529bff023ba7ff49e5324883c30b970a55a71d
-EBUILD curaengine-4.2.0.ebuild 1513 BLAKE2B 3127bc6c0fcace2d6dbe09110981ea46b231d619db892b52cb00ff05d35f43e6e3e9ba24f19b37c5869b53e919777719004d456e9d2da2700fa4ac07d66ac158 SHA512 65f8d5ab2e3fafa67169b1864cbd2fdb1b19d4d8274a7fa69ecb7da3ad3a69c92204d4805254c9c665193533c60a37996ef0b065f2c45d78370ea361f2ccec3a
-EBUILD curaengine-4.3.0.ebuild 951 BLAKE2B 375377c9f6215589eda96dccd38cc0332e46403966e9a63928317419f6da410d7efb0595efa021c91bd7aa4aa18f4e8a56fe39cf365620911b7eb45d3b161c42 SHA512 92151a605f442ff93f976eb73ceead43a645490838440679a5ee783f76532a05c6ed1a336d9335753d0a13942c67c6996a81c65f30cb680e8663b145365e3f62
+EBUILD curaengine-4.2.0.ebuild 1513 BLAKE2B 51f109e8db08e5e3d0caccc1016628e6570dfab14f30a5b061bc25cf2edff0516bc50409271f26e592f9223d775d4fbce66d8b48b6cdbb914e3115208d7b2a09 SHA512 78ca9ad1b1d59f3274021d57fe3e2d14b7225315e8eaea2179c656bfecb58e59384dcf520d4c5fe1d05af5dec21973cd8020af116eadd75969d1331d08d82d00
+EBUILD curaengine-4.3.0.ebuild 951 BLAKE2B 477593726cb519294f189d8175f04168582dd756de4c0a86cb254f750cf1c0736b9913365e81eb48fe821e5b2c771d1468e5a7cf3e36bae7339d0aa5310affcb SHA512 f5974e877bd0c885f2aa5856ad410b05a16029039ed87913ccb03adedd804b1cf474addb526a8f961902f45b231199b32db852bc8b78aace2b559342715a0686
 MISC metadata.xml 862 BLAKE2B 233eef15a865c598451d8a6100a8dc99f4c9a4c4ae4f8692a473ad2b8de5c2bc5216052b2bbf698e98f1c7f8156512084beaebc6148b9bc333d5c09d9bfda3ba SHA512 92e4cf75b949ac201537780bc5acf295720da8a342f6d882e2ca3b36aaa5691a3df31e6cf79e44b25f88d2f1177a1b6227165cbe8b9da8762b35560927239382
diff --git a/media-gfx/curaengine/curaengine-4.2.0.ebuild b/media-gfx/curaengine/curaengine-4.2.0.ebuild
index 775c51f9f076..812973727d59 100644
--- a/media-gfx/curaengine/curaengine-4.2.0.ebuild
+++ b/media-gfx/curaengine/curaengine-4.2.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
diff --git a/media-gfx/curaengine/curaengine-4.3.0.ebuild b/media-gfx/curaengine/curaengine-4.3.0.ebuild
index 3e767bdc29ba..e0161146a043 100644
--- a/media-gfx/curaengine/curaengine-4.3.0.ebuild
+++ b/media-gfx/curaengine/curaengine-4.3.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
diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest
index 9ad724337a88..0a49892875b1 100644
--- a/media-gfx/dcraw/Manifest
+++ b/media-gfx/dcraw/Manifest
@@ -4,5 +4,5 @@ AUX dcwrap 437 BLAKE2B ec88784e059ab07990acf3a47517f243502a140b451040c77f9320bd7
 DIST dcraw-9.28.0.tar.gz 194193 BLAKE2B d39a2d76dbbe74a2aed21c6b132ac25c9dd17312813e7f640a4a6d4abd4e8f1868ad596296ca9bfe61427b8b4764821e32679128747ff5a9452988814b77c638 SHA512 04609c4ddd5d1c9fa0ee1617d2ef25efdc22451e1fa6cf669d93abb1fa630a18198b30a289400f1814c8dca285547da8b081a1b00b085c00bb9318ad25c48a30
 DIST parse-1.73.tar.bz2 8186 BLAKE2B 4d7d69bbaad3fd69caeae24e4dfc77fa580d969f903c925f76cf0a7bdb13ff34c96ab6dc9917609ce886365f6971290b3af63aec9fed43b1876aa44dd951521d SHA512 06ffaf72695dc86bfc2bdd10d4f732bc428b72d427f4c10e93fc58536513477cf297adb56fb9cfc5ba5fd5b6b4cd197c33d8dac957a0a1bbe65b23393b64278c
 DIST rawphoto-1.32.tar.bz2 3841 BLAKE2B db7a80af4b06fc3709a9ae69d9f166c3323097821bb561af4e0ac9a1ef677cab6cfd5cd7896d1e1fce85e6fab545ced7d00ce809f97332bec594b94a27f77e23 SHA512 6ee5b6c4e4266c8e04221c894c4e737f8a6d2c6f0cc9c82db73064afd68488bd60de19b86b2d7b82780283bbb9f8156ef3149c1c730f09a00dce632744b44d56
-EBUILD dcraw-9.28.0-r1.ebuild 2942 BLAKE2B bf394983338873ce6f8005246cd8e75eacf8f8f8eb5124565a3c8acfa0a1e145a8184fc15e570eb3bbfe33a367026c46e7f6443d1ccd1bb8f314202e609cde9f SHA512 88f88e644238d80ba4e5ad220f0fe2b834ef6ebb529d6af12e7b83dc0ff41c1468b88816f5ce6b721dcd48ef054e199ecd30a7e4654c6e140cf1b927c41b3f1b
+EBUILD dcraw-9.28.0-r1.ebuild 2942 BLAKE2B e26acb57a9bdecf554ef6b32df6048b335e37857a61556cdd609d6d34d8b70c7a671aa904918f73a0e895bb33b032dfe1943d8eb1c4ef70c0b592c45aadcf018 SHA512 14a6c7a2c183d50662f73652922387bb5f432acadcdfca5996e1eaa84b5224dcc587bba334c2931b57912027dd9da08ab9770fe2b73d5cf1fce4005596cce97f
 MISC metadata.xml 701 BLAKE2B ad6e3ac7425a35fb16cfde74a0d540ab47676008f1de56cdf3ca101e3724e3c8147cf76f548f22a38862b09c67f34411f44718359e6467bdf8b94b9d041cf82a SHA512 0758eece42b5007b53e04f0ddb6385fbdea360afc8a4cfd94d3f5234e4a677819cbebdca3a78c7f3765770e6ccb5b2d74f20199b7c167137fd15554cc14d0755
diff --git a/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild b/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
index b3005f005bc4..149dbc748f21 100644
--- a/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
+++ b/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 11ad59f509ed..56301149ec4b 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,7 +1,4 @@
 AUX digikam-6.3.0-cmake.patch 2038 BLAKE2B 73c6c7d008c3b76f9347f4192d435e10aa3607abf62436372ef131ac034ef538c1baa8d0d03e6b587b771fb766fa3286c649a6ffc7640a2f21e292b1e524cab6 SHA512 c8e6d2fd6c18d8c8e8733dffd1e0e2fb66b8bf3496aa6f767a4c633a56733c85bc53bdceaf689e84beca672a5013a02349cfca73d9f1e89a99252c7bac526a4d
-AUX digikam-6.3.0-googlephoto-import-crash.patch 2815 BLAKE2B e39efa7815aef3f7b165e0915610e54af188479af3bef140717d5d903e557bb0da49fa493e06df9a76b9695df7ebe84cbf6132674209f45476da0a1d4752ceb7 SHA512 523dc9add1ee5b9ffb675c1983e8f54624b7537dbec567a60661fdd58b045978f2a794a47093f5a3d268e4aa159a8064cd6b261798bf19cfeb5241fd5ce4cdb8
-DIST digikam-6.3.0.tar.xz 335641824 BLAKE2B 1ecddeee653d6b97570aa3616c6dd0a951210983400fe8aca19ee9e01aef29820f0ab32e3cbc2e92e833868f0f652c5bdd0809324437b6fa778dfdaf04ea3c83 SHA512 9463d7a8351acae32e2fa77c96026d1cb60e56fcc20ad2b71ac7461ff1e5e2e02ca0ef8a12e4d5ae2324aa66e185cdf5b237d6330f4741691876977e773511ce
 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 4354 BLAKE2B 0140473b280e5a72bb4dd847bde2b1c0ee4a95a8b824ad81ba22556553f14481e1d25fe7b788a6a0f99ca40efcaab38436030228f5f6f9334e4b9772ae0d72dd SHA512 f2fe5044b465abf70c90866c9c36ed2df1efb783fb1b3c630614b1dfb5191152a8fd316d64685f864d9db4328b4b49db5b1f585f6ac6b7c7ddb55cf5fc2ddfb5
+EBUILD digikam-6.4.0.ebuild 4353 BLAKE2B 0bd8a3906543c12f68f755d2917cffe42980cf0a1223a2eebe63cce2bf55f0491a517e0a58810d36cbe5d9dc8e895d3e59e0ca9aad9e5fe06508c0021d701049 SHA512 6ab9c8bbcbcee0c7dfc049650d91192670cdedfbc7812149b7e67cffe7e0785eb51be9853a9c3f452e9bb41a28375f350da11f2054417bc2a0f14d58f2ff6c9e
 MISC metadata.xml 1368 BLAKE2B 5dec50abba4f748e1f8eb465807c719f4b81759277241169d9e721749a1ba807425f7d46e9feb1edb4dcf3b4dd00b40bfbb353fe479e29c8a1878ad1fbfb5082 SHA512 4cd1ada9c4274338e49a692095d80b572c309bd34c838e2663a18ec1e7230de87e27087febfedde46a0f6af19f1a3f440335750375117d20eacd0c756db8b2f8
diff --git a/media-gfx/digikam/digikam-6.3.0-r1.ebuild b/media-gfx/digikam/digikam-6.3.0-r1.ebuild
deleted file mode 100644
index 7a9327fbcb30..000000000000
--- a/media-gfx/digikam/digikam-6.3.0-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5 toolchain-funcs
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	MY_PV=${PV/_/-}
-	MY_P=${PN}-${MY_PV}
-	SRC_BRANCH=stable
-	[[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
-	SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${PV}/${MY_P}.tar.xz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/"
-
-LICENSE="GPL-2"
-IUSE="addressbook calendar dnn +imagemagick gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
-
-BDEPEND="
-	>=dev-util/cmake-3.14.3
-	sys-devel/gettext
-	panorama? (
-		sys-devel/bison
-		sys-devel/flex
-	)
-"
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui '-gles2')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql 'mysql?')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	dev-libs/expat
-	>=media-gfx/exiv2-0.26:=
-	media-libs/lcms:2
-	media-libs/liblqr
-	media-libs/libpng:0=
-	>=media-libs/opencv-3.1.0:=
-	media-libs/tiff:0
-	virtual/jpeg:0
-	addressbook? (
-		|| (
-			$(add_frameworks_dep kcontacts)
-			$(add_kdeapps_dep kcontacts)
-		)
-		$(add_kdeapps_dep akonadi-contacts)
-	)
-	calendar? ( || (
-		$(add_frameworks_dep kcalendarcore)
-		$(add_kdeapps_dep kcalcore)
-	) )
-	dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contribdnn] )
-	gphoto2? ( media-libs/libgphoto2:= )
-	imagemagick? ( media-gfx/imagemagick:= )
-	lensfun? ( media-libs/lensfun )
-	marble? (
-		$(add_frameworks_dep kbookmarks)
-		$(add_kdeapps_dep marble)
-		$(add_qt_dep qtconcurrent)
-	)
-	mediaplayer? (
-		media-libs/qtav[opengl]
-		!libav? ( media-video/ffmpeg:= )
-		libav? ( media-video/libav:= )
-	)
-	opengl? (
-		$(add_qt_dep qtopengl)
-		virtual/opengl
-	)
-	panorama? ( $(add_frameworks_dep threadweaver) )
-	scanner? ( $(add_kdeapps_dep libksane) )
-	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
-	vkontakte? ( net-libs/libkvkontakte:5 )
-	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
-	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/eigen:3
-	dev-libs/boost[threads]
-"
-RDEPEND="${COMMON_DEPEND}
-	mysql? ( virtual/mysql[server] )
-	panorama? ( media-gfx/hugin )
-"
-
-RESTRICT+=" test"
-# bug 366505
-
-PATCHES=(
-	"${FILESDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${P}-googlephoto-import-crash.patch"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	kde5_pkg_pretend
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	kde5_pkg_setup
-}
-
-# FIXME: Unbundle libraw (libs/rawengine/libraw)
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=OFF # bug #698192
-		-DENABLE_APPSTYLES=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
-		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
-		$(cmake_use_find_package calendar KF5CalendarCore)
-		-DENABLE_FACESENGINE_DNN=$(usex dnn)
-		$(cmake_use_find_package gphoto2 Gphoto2)
-		$(cmake_use_find_package imagemagick ImageMagick)
-		$(cmake_use_find_package lensfun LensFun)
-		$(cmake_use_find_package marble Marble)
-		-DENABLE_MEDIAPLAYER=$(usex mediaplayer)
-		$(cmake_use_find_package mediaplayer QtAV)
-		-DENABLE_MYSQLSUPPORT=$(usex mysql)
-		-DENABLE_INTERNALMYSQL=$(usex mysql)
-		$(cmake_use_find_package opengl OpenGL)
-		$(cmake_use_find_package panorama KF5ThreadWeaver)
-		$(cmake_use_find_package scanner KF5Sane)
-		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake_use_find_package vkontakte KF5Vkontakte)
-		-DENABLE_QWEBENGINE=$(usex !webkit)
-		$(cmake_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-gfx/digikam/digikam-6.4.0.ebuild b/media-gfx/digikam/digikam-6.4.0.ebuild
index 92dabb81cb7d..5bce62aec098 100644
--- a/media-gfx/digikam/digikam-6.4.0.ebuild
+++ b/media-gfx/digikam/digikam-6.4.0.ebuild
@@ -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/digikam/files/digikam-6.3.0-googlephoto-import-crash.patch b/media-gfx/digikam/files/digikam-6.3.0-googlephoto-import-crash.patch
deleted file mode 100644
index 7a8a7e533a13..000000000000
--- a/media-gfx/digikam/files/digikam-6.3.0-googlephoto-import-crash.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From ea22af510d62c85224ed430611db8818f97ecc69 Mon Sep 17 00:00:00 2001
-From: Maik Qualmann <metzpinguin@gmail.com>
-Date: Wed, 4 Sep 2019 20:59:20 +0200
-Subject: fix crash  when close/reopen Google import window BUGS: 411587
- FIXED-IN: 6.3.0
-
----
- .../generic/webservices/google/gphoto/gptalker.cpp     |  3 ++-
- core/dplugins/generic/webservices/google/gswindow.cpp  | 18 ++++++++++++++----
- 3 files changed, 17 insertions(+), 5 deletions(-)
-
-diff --git a/core/dplugins/generic/webservices/google/gphoto/gptalker.cpp b/core/dplugins/generic/webservices/google/gphoto/gptalker.cpp
-index 1cddfbd..b5e68ef 100644
---- a/core/dplugins/generic/webservices/google/gphoto/gptalker.cpp
-+++ b/core/dplugins/generic/webservices/google/gphoto/gptalker.cpp
-@@ -160,6 +160,7 @@ GPTalker::~GPTalker()
-     if (m_reply)
-     {
-         m_reply->abort();
-+        m_reply = nullptr;
-     }
- 
-     WSToolUtils::removeTemporaryDir("google");
-@@ -637,7 +638,7 @@ void GPTalker::slotFinished(QNetworkReply* reply)
-         {
-             emit signalAddPhotoDone(reply->error(), reply->errorString());
-         }
--        else
-+        else if (reply->error() != QNetworkReply::OperationCanceledError)
-         {
-             QMessageBox::critical(QApplication::activeWindow(),
-                                   i18n("Error"), reply->errorString());
-diff --git a/core/dplugins/generic/webservices/google/gswindow.cpp b/core/dplugins/generic/webservices/google/gswindow.cpp
-index 424aee2..d5af448 100644
---- a/core/dplugins/generic/webservices/google/gswindow.cpp
-+++ b/core/dplugins/generic/webservices/google/gswindow.cpp
-@@ -266,11 +266,10 @@ GSWindow::GSWindow(DInfoInterface* const iface,
- 
- GSWindow::~GSWindow()
- {
--    delete d->widget;
--    delete d->albumDlg;
--    delete d->gphotoAlbumDlg;
--    delete d->talker;
-+    d->transferQueue.clear();
-+
-     delete d->gphotoTalker;
-+    delete d->talker;
-     delete d;
- }
- 
-@@ -851,6 +850,11 @@ void GSWindow::downloadNextPhoto()
- void GSWindow::slotGetPhotoDone(int errCode, const QString& errMsg,
-                                 const QByteArray& photoData, const QString& fileName)
- {
-+    if (d->transferQueue.isEmpty())
-+    {
-+        return;
-+    }
-+
-     GSPhoto item = d->transferQueue.first().second;
- 
-     /**
-@@ -982,6 +986,11 @@ void GSWindow::slotGetPhotoDone(int errCode, const QString& errMsg,
- 
- void GSWindow::slotAddPhotoDone(int err, const QString& msg)
- {
-+    if (d->transferQueue.isEmpty())
-+    {
-+        return;
-+    }
-+
-     if (err == 0)
-     {
-         d->widget->imagesList()->processed(d->transferQueue.first().first,false);
-@@ -1245,6 +1254,7 @@ void GSWindow::buttonStateChange(bool state)
- void GSWindow::slotFinished()
- {
-     writeSettings();
-+    d->transferQueue.clear();
-     d->widget->imagesList()->listView()->clear();
- }
- 
--- 
-cgit v1.1
diff --git a/media-gfx/ebdftopcf/Manifest b/media-gfx/ebdftopcf/Manifest
index fb1f28facadb..4b64bba9334a 100644
--- a/media-gfx/ebdftopcf/Manifest
+++ b/media-gfx/ebdftopcf/Manifest
@@ -1,3 +1,3 @@
 DIST ebdftopcf-2.tar.bz2 7774 BLAKE2B 4dc1bde62b796f441332511e1b9206f9eadd216ab66dc1a6858dc467f9dfbbaaeb4a7de494eaae4584d8a57d59a0eb96f69047d1a57bd007cbb8e2f7aaccd1c6 SHA512 4631f1591290e0ddc778d5c557aff1e698d8dd7e5ac7e659fda7752642034fbabb091c840dcfad5695e9fc19909203a7fdc0b7a69d57a162ce6bb8fe710ef0f4
-EBUILD ebdftopcf-2.ebuild 626 BLAKE2B 0a1c65d0b690bdce3dc2721d47e65a32635fa3639893df145169c6d3bc67989f0a107b683fef45bf3a1d3839bf40d6a131a724e7f35196d4c8752b577f8d4557 SHA512 e2fb811cbde726738d55c23ab6df6372f3876985755896b999b456af502092f520da1988e7d58d40105df3456b4d0c4cad19f45c16e0dfa5a117c0a03854ca7d
+EBUILD ebdftopcf-2.ebuild 626 BLAKE2B 2fdec10ad10a814fbda7f3f7c83d357e38feb60df254323122e79694a5866dd2fbc4428862e49efda143585b25e41d0f51fd5ff60e31aebc0d95efaf4e296b84 SHA512 f0fe4ce86574b9923565b7aab8f8e094aad857a031070bd3bef8a7f8a1ebc9d14251496ffb9e30abef43a5bdac671ffcc7589337b50b29d2d1f67fcab9b8fc81
 MISC metadata.xml 310 BLAKE2B d6b0416573d232c5715df5dcb05139b22609ce8ffb46530c2fd7a0cecc87b37ce2ce286310a80244b1911d5750eb29b55eef6b8c01f6d62c8d007ad2a9b5aae2 SHA512 1923349dde66e8078b37566097a21ead2555a73fdfd97b89beb44a714958dc80f4387ceb642d238419ce0ec388c335ba5db1db5f23b380131f0fbbd51ecd8f22
diff --git a/media-gfx/ebdftopcf/ebdftopcf-2.ebuild b/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
index e0c60f084e51..e2cc624b1b2d 100644
--- a/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
+++ b/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/media-gfx/engauge/Manifest b/media-gfx/engauge/Manifest
index ddb06a553378..5819808ec6fa 100644
--- a/media-gfx/engauge/Manifest
+++ b/media-gfx/engauge/Manifest
@@ -1,4 +1,4 @@
 AUX engauge-10.6-qt-5.11.patch 662 BLAKE2B 7f287da70c06f71bd115541f636e4b5803149c9a6a8855dad388be234ba6f2981f63dc6ad97f89a890d796f4138f4d1318be1d7994b31a23232071a5999a5527 SHA512 9056af93efa32bb8619820ae990abc4ab172b2ceecc262b1f41c2e33a4b08417a4793a201a7cb7c79c648688c6366b10cb1849e1f03f4c3b5407dc2544cd12ce
 DIST engauge-digitizer-10.6.tar.gz 68463313 BLAKE2B 2f939b383d2b2ca7d3ac73196ae6c9f4cd3380f7cb1bc7703d23ffe2554bfd6dfb6f206d3b9c33953757791855c908c7899f078c1c1472549859258d406e5796 SHA512 f571978298f0646f338ee786aae692800bd73242f68a4f35509023d3ea0daaa16ede6a1d45cbc28a31efc277697315c63fe3d2cce1f0cf80334bdeea11599a67
-EBUILD engauge-10.6.ebuild 2251 BLAKE2B d7846b51f73af71c961780b660fc24cdf95861c85ca263171f3670b03a1c3ec74cb58825f8578dff800f5d65046f0165340f8a7e06cee4b7c84c037f4b91910f SHA512 80a0aa364ba748065fbba73fa86aee4e3712c10fe29b9549ea43a25aa2923350ebd1019e552783cd2fb8bac9da1d304a95b97be2e785e0511a3c70ab63ba9cde
+EBUILD engauge-10.6.ebuild 2251 BLAKE2B a958f71f35d275f3ad04608c0f5ff6a78a20267468fb50e5dccea49b8b579e5086ff7de771d312c093cf42603333b692a4c3388650b688b6c4840852b5cfb854 SHA512 7af030fb6ac6f341747dc93fb49d5bf392263eeb4bc0c86e9d14f80e3e48aeb019cf3e00036b7d63a35f4ff0f021559cf7c536ace69594f1c79f87bdddeb7937
 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 a1741e7df831..7f52ab96807e 100644
--- a/media-gfx/engauge/engauge-10.6.ebuild
+++ b/media-gfx/engauge/engauge-10.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/media-gfx/exif/Manifest b/media-gfx/exif/Manifest
index eb11d0c8afc1..957f8e11baa2 100644
--- a/media-gfx/exif/Manifest
+++ b/media-gfx/exif/Manifest
@@ -1,3 +1,3 @@
 DIST exif-0.6.21.tar.bz2 387531 BLAKE2B 494d4910af2e8f740aeebdeeaf8dec5ae638d3e78339c55d5acc38879ab4837164d2ef407bd07a2e36a00df15d53b132bb027e2e97e79c229c589819af3b7f7b SHA512 73b5b7df08462a6a084a8fb973c39197f5d64ed753a97cb2f94a4acf815fdf0313214c2c8e44a46a24a1f6304fdaa68a579b4a2e246cc095f6e9588e93368cdc
-EBUILD exif-0.6.21.ebuild 578 BLAKE2B 77582b88859436628c94cdf04035d94c91856957ce079e31ce6fc484481acc82032c9dc5b562169f74fcf40c191aa0b7dc577fdb681e7f0753e8676a9652e0b1 SHA512 751983623a22110e5cc4d2db2d251744334d99e58828b4dd4cee9ab48133118a39be08e0859e241766e461ad140a8184b079d5ba62122f538f810eac4ed47252
+EBUILD exif-0.6.21.ebuild 578 BLAKE2B f726c2bbfebb9e2b4995ebc34cd32d401a0a842bfb76f47fbbbe978e435d4bc5aba97d43aacd8a6841df1ab752f0355432564c2db8c74e0ed9becea20fe0b0f9 SHA512 004a71575b1dc4903b3da50df53bebfc2f79da43accb18b11e83352021d55d292d0e07588b1f27917d079f813a6bab81089083bda204e3d4dcee544b1ab6c973
 MISC metadata.xml 346 BLAKE2B afa06166d278c5157eb097eb2d1c70fb929e86830868eddf353de6d8178f8966fc0ca06b52c95129555c3d0b4e15202f16135352bec3578cacbcaf7a9eceacb1 SHA512 195346710c3ead4bf9c050f5ebe548e0e7bb86bb1f9f61b2c1664cdda094c0523ee3c77769de7819b2d82cc4abd55e3b57c0827fdd0f97cc440f40b7519feec5
diff --git a/media-gfx/exif/exif-0.6.21.ebuild b/media-gfx/exif/exif-0.6.21.ebuild
index 24c2ffc81b87..4f5ebc2326df 100644
--- a/media-gfx/exif/exif-0.6.21.ebuild
+++ b/media-gfx/exif/exif-0.6.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index fdd8655ae6c3..ddb5d4bf6304 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -7,7 +7,7 @@ DIST fbida-2.12.tar.gz 294842 BLAKE2B f9de5957f9015e022868d2b14d0269951fccbe8f10
 DIST fbida-2.13.tar.gz 296020 BLAKE2B 119be4103b53ab7e7d1791a22172e1311ced0db5e9c928faf22ab08dbe1670c91d30f7dafbf8873a9621c16a7902354f5e21e2a86d45c9572b30fe8e205bfc4d SHA512 a316776f381fac6ec6a5d085ece7a42e8e34b2c0f5ae1cc58ad5b5736dc83d8f2e7776779716abfc0ae9c51baacdf911df6a0be610d2b7b2e3ce6d0c81e1fdc3
 DIST fbida-2.14.tar.gz 296826 BLAKE2B 0015b426c5deaf72737a52bddb065e7d0cb804ea97157dded522061d8fabb5c632d5e66b1ef1b4e75b355537ef4f4e603f3a877e2ef92d1581eaa4791ab5be99 SHA512 8f3596ad8a22497880ac698d3b324e038ac5ccae7481fe4a902fc6e8bf43ba1bb3a96af8c7a3347bea86c1988f35674e2647901ac256bd4e8261d467a6a343ec
 DIST ida.png.bz2 11928 BLAKE2B 8a1c89fc5adfb16c69f9591a299beb62c84d66960b586fbc819e53f904c90beef821ecf3539236563644c28e3ad3c7dbf861b140c820be649305a658b3613433 SHA512 cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3
-EBUILD fbida-2.12.ebuild 2420 BLAKE2B d6e7426fa9335542e27d6e9d0d1a4203059759ee858ec3afe7ef9ac73abdd973fae9f05357272f69719bb472d36732ea4bb27d7b662f930d7722156397fc292a SHA512 391a1eed17e5876f1b753b3760fe5cf7e0f5b2f626f1ffe81f8876b94d030a969b12b4fa545649ec2da44f0c43936b71571950552b2997a78e6407c78fc84be6
+EBUILD fbida-2.12.ebuild 2417 BLAKE2B 3aa05ed88d79037d361985b70919ca0d711d248484d55659cc307aece06729ff6208d73807ae2ed2ceab55e4195de8207d032db522152b27a6205baab545894c SHA512 edd97cf604f7c8ec8be49ab7fbe987f9007809e84cd279001ac94076864d6d31393aee25bf5932c093ec4058b4afe5f59d57760abb9e783f8052c6536459923b
 EBUILD fbida-2.13-r1.ebuild 2402 BLAKE2B 22a7d44291b990a24e6fe92bf3cf7e210d9854af92c7bae76ac343dd975f41a5e1e790623abce9a29190120123a2d09bc963564f69cef084762e26a513a6c594 SHA512 de8c0bd27773aa0e33f155ed80e16c1cd6387a60cc5260472460e996d636efa58cabf38831f41c45a64c2473b6cfa111b9f47974457a5d0f5da9e57813d03c7f
 EBUILD fbida-2.14.ebuild 2355 BLAKE2B fdae71cabb570115f0898a00f60c6c7edd6913861c7108990dc62d8f3931bbfe621b7776362354dd456e6d5cc58fccd6a2a294a4430f9bf76cd1ebe3cf8c71bf SHA512 1acf426bf24d070b8207a8196871566dab72ebc49464b6a26a6afdb31d1f81b867969a11d53ef2e0bc129565694d0f8662a82233b4e059f731e866e44c0227b3
 EBUILD fbida-9999.ebuild 1239 BLAKE2B 78ae23ef4d8f11b72f9c426a35bbcb8d10cc4f2b566c7e13855e631c07d3cf05746c33cac3bd5c48028b1710b10f51f3af3db96fe09978906b460bc40ae2be29 SHA512 2c8aaa0ff740002b3b2b8c4f6de05f9e356d9848fbaf03b30cffa1a492580676494ef9aa2f67410d8f6982180b20c69ba9d96a847f4a8229a3a4a00458400db4
diff --git a/media-gfx/fbida/fbida-2.12.ebuild b/media-gfx/fbida/fbida-2.12.ebuild
index 619df71c1270..ab56de804a32 100644
--- a/media-gfx/fbida/fbida-2.12.ebuild
+++ b/media-gfx/fbida/fbida-2.12.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
diff --git a/media-gfx/fdm-materials/Manifest b/media-gfx/fdm-materials/Manifest
index a67b6c9efd53..c7f4e7f86f4c 100644
--- a/media-gfx/fdm-materials/Manifest
+++ b/media-gfx/fdm-materials/Manifest
@@ -4,6 +4,6 @@ DIST fdm-materials-4.2.0.tar.gz 29011 BLAKE2B cd167506070e5609b0e464cb547271008b
 DIST fdm-materials-4.3.0.tar.gz 33208 BLAKE2B 5505a885e03130757134557525e30ecda7091d3238aa5be753065c8bf81dd08914acf22ba85b95f3c78818bf5defedf97ea083d22f1886fc5113d692d70b14e6 SHA512 420accb4ff3eba754e96ceecda4980f121cab22ca3aeefe0781be47cce2ed64cd93df2a2bd974ea611e71ea45a944692e7b27bfbb6f9b0e9dd971e7621e4ff58
 EBUILD fdm-materials-3.4.1.ebuild 427 BLAKE2B f0c2ffd1704db661214fadee859f5ecb9a1653c7921649d5f75a7d90d1c22a5441cc614fc664943b4e2b1805d6d2a9e38a48c1ec6de8f029ff3df78ffed6587b SHA512 3ddb73a72ae39f3061c813f367cc5088b11617fde22acb7c77d43977174b4f00b156e1cf923ebe231c3a261e3684e9bbfecdc7bb9f08c08de3398a83b8c7ac44
 EBUILD fdm-materials-3.6.0.ebuild 424 BLAKE2B 86abac9f2f32f709c5e2dde549df6758108d22945a55fff32f4be6c2bf3842c210af686f00a6c403f0ae13611062e300cb4e235d4bd8fd25c0cf281fcda31f7e SHA512 aaaf876fe1c373061e94067ba1c89af62fb4836c44c7115c55d7684f01be6f11653850b94b029fdc56e70fc861eb44325aa946feac81d1ac0f06c3d48d8a7264
-EBUILD fdm-materials-4.2.0.ebuild 418 BLAKE2B 7442d31ef7f748c4eb2c9ee7bb62fc4808af71767f4630099b7720f81e5d316db39a63d5dbeee6513a8d190b558aaa5409fcfc288715c418352ab8df4903eccf SHA512 8b4ffda0f21307c4c25066fc3bdb92c4e275df225e5c07281cc4c9c3966ccc03231917f19694e1c3ec0c5bdf7365cd689c6f6ddbeb41eb2af6cbb7aee7cf5c78
-EBUILD fdm-materials-4.3.0.ebuild 418 BLAKE2B 7442d31ef7f748c4eb2c9ee7bb62fc4808af71767f4630099b7720f81e5d316db39a63d5dbeee6513a8d190b558aaa5409fcfc288715c418352ab8df4903eccf SHA512 8b4ffda0f21307c4c25066fc3bdb92c4e275df225e5c07281cc4c9c3966ccc03231917f19694e1c3ec0c5bdf7365cd689c6f6ddbeb41eb2af6cbb7aee7cf5c78
+EBUILD fdm-materials-4.2.0.ebuild 418 BLAKE2B 32a8bb1a67475a051216c3ed08230c48df1e6aef3938960d2d4d33d8a2735d6e6505ef992fbff9e9ad2cab7ba9fa7ba71227f735e0736150f35c8f08cf9d4e64 SHA512 73d45424b64d0cc9559dc9c59051e04783330915eb28e1d4d39c5f51a1028c8f819df857a38e4090f3bf14158020ff0e9833846c924072870b7d0bda314b03af
+EBUILD fdm-materials-4.3.0.ebuild 418 BLAKE2B 32a8bb1a67475a051216c3ed08230c48df1e6aef3938960d2d4d33d8a2735d6e6505ef992fbff9e9ad2cab7ba9fa7ba71227f735e0736150f35c8f08cf9d4e64 SHA512 73d45424b64d0cc9559dc9c59051e04783330915eb28e1d4d39c5f51a1028c8f819df857a38e4090f3bf14158020ff0e9833846c924072870b7d0bda314b03af
 MISC metadata.xml 865 BLAKE2B faf20efb80033c67c5b6cacbb3679368e6f7e8a63587aebb6a5e1569a2594620d3b657f14baee3bc39046993a0e285ccd3a02e888bd19bd885735f5a731b16fc SHA512 a083d711722c5896ebe0b9f2f8d5084e3e8fb2456c8b201eb2aae775c2e6a0b8a596a6e37f8b0e2015ed0e5095b05331257f916a77ca4df739af82d9a3802738
diff --git a/media-gfx/fdm-materials/fdm-materials-4.2.0.ebuild b/media-gfx/fdm-materials/fdm-materials-4.2.0.ebuild
index 54cf788eca53..db648b1ea936 100644
--- a/media-gfx/fdm-materials/fdm-materials-4.2.0.ebuild
+++ b/media-gfx/fdm-materials/fdm-materials-4.2.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
diff --git a/media-gfx/fdm-materials/fdm-materials-4.3.0.ebuild b/media-gfx/fdm-materials/fdm-materials-4.3.0.ebuild
index 54cf788eca53..db648b1ea936 100644
--- a/media-gfx/fdm-materials/fdm-materials-4.3.0.ebuild
+++ b/media-gfx/fdm-materials/fdm-materials-4.3.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
diff --git a/media-gfx/gimageview/Manifest b/media-gfx/gimageview/Manifest
index be03ce90b2a2..8e1c7a27f6f1 100644
--- a/media-gfx/gimageview/Manifest
+++ b/media-gfx/gimageview/Manifest
@@ -3,5 +3,5 @@ AUX gimageview-0.2.27-gtk2.patch 624 BLAKE2B cd23a3c07bb885010fc01a0cc211ab12b93
 AUX gimageview-0.2.27-libpng15.patch 601 BLAKE2B fb97fa8cc84927f03df462ec09d3a312e06dd2b5554e0c62c90e739f72917dd479f1d2ec3cf50d5d4e1f558cbab1a1eb221a150940efa1494c9239b6e9aa086a SHA512 390bf474bbf300cbd9c18ec3475769185f16226dfdb9389f62cd6e60bf33529009de68ee8bf387f690fc6a9e87f315f022f4f0b2fb6ef6ebfcdf49d96b5c49f9
 AUX gimageview-0.2.27-sort_fix.diff 714 BLAKE2B 2ea9e8eba6a0253bb4990b083e00013f40eb049028f0ecd700bd56193400ec6ef366d4c2360beea5b3314df2ea207cf782c1bc6e32221a3e73a83f9e92d94a23 SHA512 ab3ce0f2bb9b4c1d52d05c78db4d42fa2e77e7a5d7655b82a036279c9049de609dedebdea8422596ebf91080e91ac6ce42babb4aaf22877ec3dc808cfc37a3ea
 DIST gimageview-0.2.27.tar.gz 1348286 BLAKE2B 51538af8bdc85243e825e58b6bbefa285bdefad95b05228e08a8500a5fc9f7036a53f931689543a30841f9cbd54ad4576fbf5a29dd79d7b1f05f07cdaa8c9aa7 SHA512 36ac16f4fffcde34b608da35aa089d40225129a2f9dcd70cb024713738842600c7231522093b3d0bf5a7c4c4dcb7ba4b14d550e417e8b52030d43d4b51145220
-EBUILD gimageview-0.2.27-r4.ebuild 1734 BLAKE2B 31a4cdc39c7cc9016c2713739253ef65e246d90a0e24f05f5382b68b84cb6c1f81d12774f1b74f205f8ff537c5eec93ffb848b4e727e0e187363c1b59e10b3ca SHA512 38ef8e065c24653df8b5036a35ea6317e485564ea741574738a28c987e9a530932dbaba423262ba3b555d7193c9ce66069522430815dcd9893b1335e789a0795
+EBUILD gimageview-0.2.27-r4.ebuild 1739 BLAKE2B 4cdab9a02f7a1c145e05c3b66d8cb686b936bf9cd1be776c9d60c93a0d99d6743ece899044c9aceaea3c317dd37091b7b5974462dfd32530c3f32beb0a01edff SHA512 d4da7255f9981dcc850e76b94bc3cbe7cee8875e3dd346fb9fbdcb59fcc8d1a656340e88d9fd3ab1e01bfd9d2845b373a50e33af4444ba056b7d7fb48f29dc0b
 MISC metadata.xml 340 BLAKE2B 6ffbc043ec8ce9eaeb4554c7edbe786c997c5d1d79f265d0c435d588723a411ee8ec69243e821c2f7ee5aa2af3724e81d8687caa6f5ea781a0ad1ca54ba9879e SHA512 74355232aa8f1b9102de0ef61115dc39ac98890ddc93d9c0a595338bc2d23eb455c2db8fffa150c548ed5e8caa73817c046463c6190bce46761b7e17e66d594f
diff --git a/media-gfx/gimageview/gimageview-0.2.27-r4.ebuild b/media-gfx/gimageview/gimageview-0.2.27-r4.ebuild
index f9b57769d726..ed176aa16b3a 100644
--- a/media-gfx/gimageview/gimageview-0.2.27-r4.ebuild
+++ b/media-gfx/gimageview/gimageview-0.2.27-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO: USE xine could be restored if support for xine-lib-1.2.x
@@ -6,7 +6,7 @@
 
 EAPI=6
 
-inherit eutils libtool
+inherit eutils libtool ltprune
 
 DESCRIPTION="Powerful GTK+ based image & movie viewer"
 HOMEPAGE="http://gtkmmviewer.sourceforge.net/"
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index aa5db513d85d..e70cd24d8930 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -16,7 +16,7 @@ DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b755
 DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
 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-2.8.22-r2.ebuild 5171 BLAKE2B 003abf6e668ad7a409c67d18d41a5cfcd5f68b90801cb07377b3ab6b97d968b2db8686f1173c3175c59cd7a28d5714a12f3eeade0de19be7a2c08340efabe012 SHA512 a1104e3cbd6104af8111578d35908043e2e8090f74a7252d52f3d21dac046fca33bbdf8b207e92ba039c217a7e50c801c37e3bc5921836a6f46f1683796804d8
+EBUILD gimp-2.9.8-r1.ebuild 6095 BLAKE2B abec863e179bba25bf55594f9ab5fb03ed4601d2191ff3a53a13142b8d535a82f37b60ce84ada8b1161307bd77e1fc01203178d18a3083719ec2aad4cfae245e SHA512 571b4a9f149470816aa21b6d9100e50e82ed586776818156001b0dcfda7ee5a14d3f9a44c5b25fb007ea6477918af9b98ae6b9690e83068ace27034d97aab2ee
 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.8.22-r2.ebuild b/media-gfx/gimp/gimp-2.8.22-r2.ebuild
index 3d4251ed76a5..2019f5fca97e 100644
--- a/media-gfx/gimp/gimp-2.8.22-r2.ebuild
+++ b/media-gfx/gimp/gimp-2.8.22-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
+inherit versionator virtualx autotools eutils gnome2 fdo-mime ltprune multilib python-single-r1
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/"
diff --git a/media-gfx/gimp/gimp-2.9.8-r1.ebuild b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
index 73a8c30f70ff..76a5a7bea1a6 100644
--- a/media-gfx/gimp/gimp-2.9.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
-inherit versionator virtualx autotools eutils gnome2 multilib python-single-r1
+inherit versionator virtualx autotools eutils gnome2 ltprune multilib python-single-r1
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/"
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 97697858011e..7fd4a405b43d 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -3,7 +3,7 @@ AUX gmic-2.7.1-qt-cmake.patch 1005 BLAKE2B 2b7e5f60788db611859b803cebd5e6e44ee7f
 DIST gmic_2.8.1.tar.gz 5995556 BLAKE2B 3f3c35290d18c927745b4b527f5297a9c3beb109a34b7e8b70dcff064f2587e022616e0fe5063d79e94b8fbd0ce3f70b6b5417ebaa0f0cc0f61891d79330afa9 SHA512 0f9ae9454c6f053026cdace43b24e32183f384d79099bc654c3b154647d24ef6541b1fae62cb17e27e527fb51ed8cef03a46490af3ace1551646fc8b3cd64eb9
 DIST gmic_2.8.2.tar.gz 6170087 BLAKE2B 36bea32531fef3694c4bf295603c2327dba2391f8cb868393d01a86dd9dcc52a127584e8eaeeba79425aceb07fd3ee31e0383a182eb0956daa920122463c4a08 SHA512 80fbba0dd1f02fe23986f57190e6e4bb0df31ac8b4084ddcfa088fcf352b44484ada47704b42c9cd27f52a55e42247447c73181c0a84a4f0e54f064e9fc9ca9a
 DIST gmic_2.8.3.tar.gz 6172645 BLAKE2B 51a910ca9bb146173863f7f72dafec8ed42334757223055a5e174bebbed9e23372e1fdeb5b522c2120b203f4cbac0f255a9ada58fa62c7f83c745016d11bcabb SHA512 cde0e3fc50a97dae2b6d1dac1e7292a3d0af5e963586ec3e7ab6890721bc9617ea80b3bc86ec4cdc897d8b4ddc0fde552eea8322f8f337c447c603bcbc1403fd
-EBUILD gmic-2.8.1.ebuild 4382 BLAKE2B 3c4b3090d853dfb3e2e808a3924ccecb74777d78a92bbfeaacade60d18c9deaba13b9382604bd314ef6105e6dd35e76914e6abf193a2b5db54a82bd3d5ce6f9d SHA512 377d9dadf36f7f20256f30f798e5968c0f4fc83fd5844871748c5acfb7a041e73019435ccd0fa524a5f9d0600439c0484c951c0df52a8de32f145f8aac76da7a
-EBUILD gmic-2.8.2.ebuild 4264 BLAKE2B 3d4e56ac83bfe31ffcc595e4fd0e9b509bec3b940d12378d016764b69b22333797bcfb206e69f6c1ec58a7763c04f9197faac87ed6fba33d6f46701892553645 SHA512 ea99f26dee139a974d0f7c878abcb0dec9edf45bcf538371edb8e0e4c011a2665b9dab4320972cceb4e3276bf183737d4573bedb17e8aeb6703eb6977b4e44c4
-EBUILD gmic-2.8.3.ebuild 4264 BLAKE2B 3d4e56ac83bfe31ffcc595e4fd0e9b509bec3b940d12378d016764b69b22333797bcfb206e69f6c1ec58a7763c04f9197faac87ed6fba33d6f46701892553645 SHA512 ea99f26dee139a974d0f7c878abcb0dec9edf45bcf538371edb8e0e4c011a2665b9dab4320972cceb4e3276bf183737d4573bedb17e8aeb6703eb6977b4e44c4
+EBUILD gmic-2.8.1.ebuild 4398 BLAKE2B 5b94640e53922ec0c81b44d2dd2a49f0568a3c64c77a190b9d84ec731d4c0c157442976ec880f565a180a7f5c928f8a2a04c5f8a7f4c18c306b53bf82f01d35b SHA512 82ea10c6dab6fe7710ca84eaf39632827d423d1668ccaf82c5c34cd6417e73100600e54b422f1fede0010446915460f881cb7c1d76e7d2437408d5e8b44f6afc
+EBUILD gmic-2.8.2.ebuild 4280 BLAKE2B d75d51965efd8f73b1b3112b14d640ddc63ee4ea8f0c51aa7deaa06ae16b87259e1d3b50c8513271a1004633246d788862ace4cbf05e341c13a0c6ebee427293 SHA512 99dc7f60578d1b42865e476527e4a2f86622dec59afd182d85c5588ace1764f34f2c92f08a6ffae1cb2f27c66e8b2044cd20d9daaa19aed64b5a03d21a01142b
+EBUILD gmic-2.8.3.ebuild 4280 BLAKE2B d75d51965efd8f73b1b3112b14d640ddc63ee4ea8f0c51aa7deaa06ae16b87259e1d3b50c8513271a1004633246d788862ace4cbf05e341c13a0c6ebee427293 SHA512 99dc7f60578d1b42865e476527e4a2f86622dec59afd182d85c5588ace1764f34f2c92f08a6ffae1cb2f27c66e8b2044cd20d9daaa19aed64b5a03d21a01142b
 MISC metadata.xml 547 BLAKE2B 0da3088e531217099bf3f690059d3725ba3c62ad9337dfbf3817584f95594a328b647b0a81eb4d58c2cbc030026bf2aa94e01c817b04072aea1caee435f6ef9f SHA512 e58e976f8e80eea8e3620888858d6386e5d922c842e08c39f7ad611a5fc96e5fb85e39864bc0e805dd20a2c19e02b9fb8d1a5eaaa470075ed73759dcdcd4fbee
diff --git a/media-gfx/gmic/gmic-2.8.1.ebuild b/media-gfx/gmic/gmic-2.8.1.ebuild
index 4c6884de7863..a4b190fb3199 100644
--- a/media-gfx/gmic/gmic-2.8.1.ebuild
+++ b/media-gfx/gmic/gmic-2.8.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_BUILD_TYPE=Release
-inherit cmake bash-completion-r1
+inherit cmake bash-completion-r1 toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
diff --git a/media-gfx/gmic/gmic-2.8.2.ebuild b/media-gfx/gmic/gmic-2.8.2.ebuild
index b9efdacb34d0..660e4b3ff4dc 100644
--- a/media-gfx/gmic/gmic-2.8.2.ebuild
+++ b/media-gfx/gmic/gmic-2.8.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_BUILD_TYPE=Release
-inherit cmake bash-completion-r1
+inherit cmake bash-completion-r1 toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
diff --git a/media-gfx/gmic/gmic-2.8.3.ebuild b/media-gfx/gmic/gmic-2.8.3.ebuild
index b9efdacb34d0..660e4b3ff4dc 100644
--- a/media-gfx/gmic/gmic-2.8.3.ebuild
+++ b/media-gfx/gmic/gmic-2.8.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_BUILD_TYPE=Release
-inherit cmake bash-completion-r1
+inherit cmake bash-completion-r1 toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
diff --git a/media-gfx/gnome-raw-thumbnailer/Manifest b/media-gfx/gnome-raw-thumbnailer/Manifest
index 82342109e92a..457632b3a3c6 100644
--- a/media-gfx/gnome-raw-thumbnailer/Manifest
+++ b/media-gfx/gnome-raw-thumbnailer/Manifest
@@ -2,5 +2,5 @@ AUX gnome-raw-thumbnailer-3.0.0-deprecation-warning.patch 1715 BLAKE2B 62d10ead9
 AUX gnome-raw-thumbnailer-3.0.0-fix-downscale.patch 1030 BLAKE2B 49c4e566963e31f7f6293cc420157e0e33a8cfdd169e65771019fd00acf2d8a760c522ce6f0c2a2c13052804ed726b2eb35e378a43a1110328ea694449cfdf77 SHA512 b4985090dad9a06087d2b598eed03333a80d71343a244db3c08fc0f5ef1fc8baae1969b0cdaad460cdd54106173fdd9aa52086203727e823e20bb830deee1242
 AUX gnome-raw-thumbnailer-3.0.0-libopenraw-0.1.patch 696 BLAKE2B c790781d81b5e4b4793c2a2f4aea2893b964e607b5cfc55eb658defb4748c7958558ae85435c0d18986f7267ac58b8c8b41471ce7cdcae7b04100f0c23d560b0 SHA512 ac12cf060a1f40abecb2ff86429766662632e1a448dd84c5205c8def987d7e20c1738402cfd7d6c76b4a5f908872c77ddc046e6379705c1e69277543828bdab7
 DIST raw-thumbnailer-3.0.0.tar.bz2 270499 BLAKE2B e08d78ba44f160ba1903b78b5e85d9237610c81ac9a63c25c7b2c308139b8e18c9041e2c35aaf44eb87017be17f7bb3968798e165c28349703a5306a78999bbd SHA512 b6b477af0ec604e100a67829bc9262a3aa54db9beb644e60a9ae95f916fd641ad7ccaa908fc6458be2eee60ecdb47bda9449720bc078f1c4fe0135fabf0bd9eb
-EBUILD gnome-raw-thumbnailer-3.0.0-r1.ebuild 892 BLAKE2B 629d29e543c293d73c1ef6abd32a149901c3c59503add678d3b5b1565c58e484b3ff073fd396a374a28344f256845a6e87d03e3e4d23dd4585cf5ec91e3de63a SHA512 2f8db97af94e20154cb3b5feaff5141ad50493149f9f698458c22588c89a8763f6c3a5834ee07b207d698d0176e44171b278684bd985bf89423bcedf24afa9fc
+EBUILD gnome-raw-thumbnailer-3.0.0-r1.ebuild 892 BLAKE2B 3fc40eba782dbf20cbbf1c2dd66f177ec4e8b7ca2f97217a8ab8e43599a84e72fe261984dc9627a90af974d03cd84840fe6a70430285c8508ca04401426f2fe5 SHA512 87d926927195488b42ddc6f9e4969d0f7f6dc9181d888060afdbfa7453c25f5cac3a70cdb53d1b808f4b4e7b45aab24891ec6795555fcda7054601f04677eaea
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild b/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild
index fee5a65d96c2..d1b31651b20d 100644
--- a/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild
+++ b/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 6c21dbd93945..bd2f910c224f 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,4 +1,4 @@
 AUX 0001-Fix-unwanted-automagic-activation-of-aalib-support.patch 1049 BLAKE2B 62afe72d6630420fa0068e652cdfbfde3c4e73541e53154627ad1cc23ad10f72ac85cf5ae317d2b0bf4127e474af2ca2268e57011eb835d57d88e2d6fa65a85f SHA512 252390cfb2533e9c15d1f881f6729660e2f6cd737a9257c5dec7f06f72f2960c3b5fe940e7fc774c862e6156f517357ca7b933822c23a466ef39fbfc2f14bf8c
 DIST gphoto2-2.5.20.tar.bz2 790065 BLAKE2B 6e10aa468696bc3eff51aaa3e886ad2373997f91597e42b33777ac56bf668f918c2fa0cb8b70eb8f7cb45507e67c9cfc3a46a7408449ad35cc3b743daf74859d SHA512 0350c38c264e5ba858ee14952fbf6ad271e7fef05e3f5f8eb3d45102099ae435fec63b09881efa99af60d4e086a9c2f69be92a7e49617643ab13146a5e4655f3
-EBUILD gphoto2-2.5.20.ebuild 1327 BLAKE2B fc83ba6e8d6624ee700bf40cfc238ebf255b8e8c606c33cecb248cd7217a0ecc17b9a1e1239e718ca5f82e54d965e65052de6f8cb14de137e432879a29e7875e SHA512 39e2c807c15580d7b528b2712d36f0d29c5b261f1b489db19e1239b172e74f65be0fd2b1b6553d29a1f0b2523b800141dcd8aa15524376659532e7d06e8d3715
+EBUILD gphoto2-2.5.20.ebuild 1327 BLAKE2B 4f3dc6bc23983b0148ddca2dbeb2ce7aba01f2dc0a093e6e910e95992f9b67f3b0d2b1c86aca1e8b730730f6edc220830c60b87488e0356971b58643c70a8a34 SHA512 b1362759378142e6b071ccf90b7391af72bd5edabcd2b57f542b9cdadd10848e34afc3a0d9d49f8f13728368caf0e19c57a81a315bdecf6a6b1166d3190414c6
 MISC metadata.xml 449 BLAKE2B 324e2ea46a0f8199033bf628d6719a51968a02af01fa3e8abcd1caaf7a4dcd892bfb6b8347a030edf4b2e8529aba47d7103789103a3b03adaa538338ab2ec91f SHA512 f938819a203e0119b1d81aa1dc812717d6ef02c3012f8ed667db452c7712bb7b142cee36d519ec33f4cf65ebcba7a660e2f67f6b66087ec6be832a4987e10c53
diff --git a/media-gfx/gphoto2/gphoto2-2.5.20.ebuild b/media-gfx/gphoto2/gphoto2-2.5.20.ebuild
index 7f9f28877711..8bc039ab53cd 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.20.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.20.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
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 01f8983bff10..0089cceeac2a 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -2,7 +2,7 @@ AUX graphicsmagick-1.3.19-flags.patch 1800 BLAKE2B 50f4f0de0cb3842fb84e136038bc0
 AUX graphicsmagick-1.3.19-perl.patch 491 BLAKE2B 6a6465162d9a4d7d09b1edb425cc7114cd4e0fc65e48f15c8c2a854fe835fd1fe94c56611c6d2744d9e26884c57b1f67353bfd32abe2f25a145dd7abbf5479f0 SHA512 da114b891ec923253048d90ee14f136742072bcb70e512e8d2838bbcac57b5fe6ea580cdccfd1bba5156777623c43e946ce2a8661f88612d4c24849bef0fb865
 DIST GraphicsMagick-1.3.32.tar.xz 5535224 BLAKE2B 96fd7bfe62b4b1b25f9ffc0ff8e2ac023f0528b9af857fc27a5a9cd1123eeb6533b868c7bad8dca5b58e114a674dda009a62904df64622d7b5f3c0d72156283d SHA512 f84cdb9318962aed1dc25d70db4d0ca102e4f88748f468f8a56b77d228fd315b772afa48e90a396d32e8226eba9105717bcb94166bbe43723afeec58ead53e09
 DIST GraphicsMagick-1.3.33.tar.xz 5558348 BLAKE2B 9c3747ee63d94bc6d16c06c04c7fad2ca93e849df7ae4391523b416111b5569c7493226f6b967a5ff80e0ff2ccbe7f6de5a7223e935024fd66a96be401fdf26b SHA512 8afeb461d1a9dab9b88b9bc7c2d50b5c409463b369e6b0ba7ee39b0ece32da9393d7a5a4d18faf8f72a529346a3477bae61b802bac2af81aeae79d95c9d6cd13
-EBUILD graphicsmagick-1.3.32.ebuild 3071 BLAKE2B 50b4693c863362fae0f18d4505a2dfcf4d62894e1adfa6e01907b691ad52d04d5f6540548beda199166e49e72f9bf101d0434c1821b3593ffa7af303d730b723 SHA512 d15345f5c1ac66d3c33d77590c9117cae5b2aad0732f080e4f45a78ea2061cbf6d36b9c9b5f0f89f9a5c20580ea52b42c794c12c1f305a08b8c09c546ab4ae00
+EBUILD graphicsmagick-1.3.32.ebuild 3071 BLAKE2B a06ec92ee372c465555b5358f38e1169d2bb1249a8db6b308f13ae7a7fc673790c2de3aabef621e4456799911184604be82979401836ce4c6d76eb9c8e25bc11 SHA512 fc56850edbf9d1fa7446d784f3ca331ffca7e286a75757bd773c40ec6b973ed46b312917fea6ad8e569004d7c739db11edb702c1004805d2dc4b25d0c203cc61
 EBUILD graphicsmagick-1.3.33.ebuild 3078 BLAKE2B 722f3289f587b875e2483557fd60b55ed3afd7bc43ccf8cfb91479f9ead4c2ab2cf9b6ee8f41c4d2045cf64a0cea5df07c7c2ccf47c2fe31d8d2b0c8f9ebb0a9 SHA512 43ac942e1f3b92f375999ddf9883a23107ec0975aeca11994c9e38110918bcbf86063ac18abe0e9da881406c08bc6c5024ee32ae405d5a8149415733d06224a1
 EBUILD graphicsmagick-9999.ebuild 3078 BLAKE2B 722f3289f587b875e2483557fd60b55ed3afd7bc43ccf8cfb91479f9ead4c2ab2cf9b6ee8f41c4d2045cf64a0cea5df07c7c2ccf47c2fe31d8d2b0c8f9ebb0a9 SHA512 43ac942e1f3b92f375999ddf9883a23107ec0975aeca11994c9e38110918bcbf86063ac18abe0e9da881406c08bc6c5024ee32ae405d5a8149415733d06224a1
 MISC metadata.xml 1154 BLAKE2B f94864df05c239bd37ec05d00068e934e60e8dcbe03e52020df7d830842be94c08dbf339eca919c4e7fe18d5ad62bf3077ac9877b18ef6f09fd2b9f52c31aba0 SHA512 9bdbcace99fd11f192bea183b5d84bc9b2d06979db21d1a9a3e57677a4438f24a5812619c73a0becfc7fb81140414199fde3d0e8811abf1a92322535529f5d2c
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild
index 8db754c191d7..3cd7e821789d 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index 9619dc8be0be..cb0816b2b1bd 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -1,7 +1,7 @@
 DIST gscan2pdf-1.8.11.tar.xz 409212 BLAKE2B 37cb716f13818eaffc39c210b810b845368cc5e323569e8f9d5603b5b412c4182520798321358e4c21339fdbd5f15026a0acd6421a49e7db79ecca86633c3ab0 SHA512 1ea09b8768771be4a1700cb8a6523d5f74fcbf0ebe459d97796032b56f896fd0c50e5ca1ed4c96aedef7e61f6952a92986153cc70173dd5ad91ccfb72461c565
-DIST gscan2pdf-2.6.2.tar.xz 458920 BLAKE2B e8c54654c10adae7d66844e3814025f8c934df935c315e48b6a2a34810b06b47d22208af22da04d872b2ac9737f5f5cba72d42fb2de92f1fa8110dbe64ba71ba SHA512 7b0bba012eab6edcaede2a2163935947ab9c71b21abb4cde8456f958537f84435a274a0ae6fb3827afd835f376d462ab5402e772307034936ec2b24889ecaec2
 DIST gscan2pdf-2.6.3.tar.xz 459276 BLAKE2B 395260a2034e9ac782c4c6104af5dc24561d271b45a359762cef990fce9f8343c6dc3c863ad66fc0ba56991df20945384edb695e3d94fa5fcc58c78ad039d380 SHA512 77478e7d35a90fd737a28f302bac214d3946cd5f0ce93f8d22b3485a6d1150ff2834433d028487fea4433a36a532714b4f47e8fbba3307c178fc161a0adbdbb0
+DIST gscan2pdf-2.6.4.tar.xz 460636 BLAKE2B 80d6123f8849ce305ca9b914da267f5b8898d6b3b660026ba075e5f8e10fc78093bb49d3186ec6a90d32b8c6ae0dade70fc146dcb677540810c06e91186bdbd7 SHA512 10d08b10f3101759757a2d98f2c2b41813a5f67234471f746ecda5ffebe085cb0d435343d05fa9107ed942785f707c7c2d8db6e430b1af335afe30b1d9079f08
 EBUILD gscan2pdf-1.8.11.ebuild 1731 BLAKE2B 0b0f7cdfef98e666e20e44882584e0636e490429186e441d87f965e74071f5076693896e17e68184319dfaf3a1fd4487140209ef3b49603c9496cc936516333d SHA512 b94b73d3396208a8c67c2aad407815329501717c364d60189b21d96f652846e554d59a2a36f4b58383d7f49ab728d4fe251bce9ab1944befb667a9e0c09237b3
-EBUILD gscan2pdf-2.6.2.ebuild 2318 BLAKE2B cb72ecd97b6eec1ca9b2a0be67aa0a9cbf20c1367791b65b57d22f3568d4632e5ef1285cb72d8cc30e5a2e438d4134cdd16cf9ce65f47bca0a0f0d1e34e9c6d0 SHA512 1a80ea580d566d981c28fb9f2fba632a964b01be736b9a68cf253ec96781f98bc0e11f5555018d50bbb65023f51bebf5c33b350bae5bf3974e4d007fc344871a
 EBUILD gscan2pdf-2.6.3.ebuild 2318 BLAKE2B f0b8c7ddcfd7fb1033b4214b3cf49ebf440e50c517ae212c24ce5b9ac055526d356e09ce3dc5df0dd1f7745bc80e7791e1a9ec8f13d188c9be08fcd0e98239d8 SHA512 404b6aceff7b758f2f6ae45c8187564e242f3d24e69db2012c155e4bf17a18a95202c9a3f1f3fc1aa5bff04bb6b0a27701cbb3e636e9a37d98d03f5a90092904
+EBUILD gscan2pdf-2.6.4.ebuild 2420 BLAKE2B 4e1824b65e2b7f696ed5fc73073a2e49263fb052af14c0a46f88a308f345d6663b125df3b60ae1d5c1b86122b61206991aaf8c82ca1820354216b378dee0b845 SHA512 889325f26253e3d389c9db922591ff803e7ac3f02eeb659e669645564eb92dac13c7ebe4fc8df8930ac854f30d232f4346ee80e8c65ba5575c7368f3af2ff4ff
 MISC metadata.xml 439 BLAKE2B 835480b0d68a079941e94f2646d0136dfb8a8e750e0279f8a5a2e23e6690242582ffe660798f5e80ebfb4378a576aa5715332b53230555866391a99ec28f54ff SHA512 af1cc05ac693899586df81036d2fa11af187edbb3c9449862298ba05efd0dbd0c4c5b008a1a21328c1f9a27a690671bd7a9967d2e457efb31561044e45984401
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.6.2.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.6.4.ebuild
index 2c4c4ca4eca1..58c42016341f 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.6.2.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.6.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DIST_TEST="do"
 
-inherit eutils perl-module virtualx
+inherit eutils perl-module virtualx xdg-utils
 
 DESCRIPTION="Scan documents, perform OCR, produce PDFs and DjVus"
 HOMEPAGE="http://gscan2pdf.sourceforge.net/"
@@ -67,6 +67,8 @@ PERL_RM_FILES=( t/{90_MANIFEST,91_critic,99_pod}.t )
 mydoc="History"
 
 pkg_postinst() {
+	xdg_desktop_database_update
+
 	optfeature "DjVu file support" "app-text/djvu[tiff] media-gfx/imagemagick[djvu]"
 	optfeature "encrypting PDFs" app-text/pdftk
 	optfeature "creating PostScript files from PDFs" app-text/poppler[utils]
@@ -77,6 +79,10 @@ pkg_postinst() {
 	optfeature "sending PDFs as email attachments" x11-misc/xdg-utils
 }
 
+pkg_postrm() {
+	xdg_desktop_database_update
+}
+
 src_test(){
 	local confdir="${HOME}/.config/ImageMagick"
 	mkdir -p "${confdir}" || die
@@ -86,5 +92,5 @@ src_test(){
 			<policy domain="coder" rights="read" pattern="PS" />
 		</policymap>
 	EOT
-	virtx perl-module_src_test
+	NO_AT_BRIDGE=1 virtx perl-module_src_test
 }
diff --git a/media-gfx/icon-slicer/Manifest b/media-gfx/icon-slicer/Manifest
index b8469f6cc258..e158ea104cbc 100644
--- a/media-gfx/icon-slicer/Manifest
+++ b/media-gfx/icon-slicer/Manifest
@@ -1,3 +1,3 @@
 DIST icon-slicer-0.3.tar.gz 112429 BLAKE2B 4900e7d702bb45a209c165476aab5604f1623ea48081f742ce36115bde0a6a153aa5540c952013841a4853b827d1b718892006827105dd06c04e7fa892e9ee58 SHA512 09e46dca933a7c647b232d2ae8f589526e5f1cb43e07fe7056f0449cfbe812becc3a171c4f7c716bc65c0f95dc4de989a99b4f1b3566ac52e7ad67965f5be4ab
-EBUILD icon-slicer-0.3.ebuild 520 BLAKE2B 7ef562384edde6acac507cee5bbad134a6bb87026ee8c5fcd29c65bea6c8ebcd526a8dec33ba4e186c853473af0a88e307261dda36f3a05103dc6888207db6bb SHA512 11f22c35adfd41f264a19c107aaec8346b8163a9711ef28314fff3694f2f31605d12b8caf30ee4a0735eb0f6cafa54b5737dcccef7169097e4ec533b98103939
+EBUILD icon-slicer-0.3.ebuild 517 BLAKE2B 7810e7ecfc47d6a71a6352854780c61d0a60eeef2388e66389b793251645579e48a6189093d14738fa4c897a7774c78532451f0634dcb46651dab1cb5a1657d4 SHA512 a4e2760ece13b27982aa655570d6f2c88c0f5831512869f60a452cf1140af4eefbd8dd14a73c0cd783e630b132a19d3d26db8fc6ea043ced8cd9b799a4b09398
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/icon-slicer/icon-slicer-0.3.ebuild b/media-gfx/icon-slicer/icon-slicer-0.3.ebuild
index b34ed5fd7c94..c567ca314e93 100644
--- a/media-gfx/icon-slicer/icon-slicer-0.3.ebuild
+++ b/media-gfx/icon-slicer/icon-slicer-0.3.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=6
diff --git a/media-gfx/igal/Manifest b/media-gfx/igal/Manifest
index ce7d5457ab6e..afdfbfa80507 100644
--- a/media-gfx/igal/Manifest
+++ b/media-gfx/igal/Manifest
@@ -1,3 +1,3 @@
 DIST igal2-2.0.tar.gz 27206 BLAKE2B 64683d32d0fc3c16d4e27f6dcd1acb3d1e1b55de8e4362065bda9b9b27e6d54409e115af46da2505dfe79f00e5004ebfb395dc4fe71d91b557c43a0c4d4f01e1 SHA512 663bc4f05fbb226c55c3304126ceb480f050715499a2849567ad1d33da568ed02f85b64ad176f6e1cb1c99c8f50650676a7323f0d0497880802a245274a77a0f
-EBUILD igal-2.0-r1.ebuild 871 BLAKE2B ab437110fa587dc7c1f8a209f9bfd2502f2deecb33dd1e316df0a3674fc0090cee8cc18a9369247df27499925536d6ab2e6321d1ea603f91554cf98825405ccb SHA512 435c6353503c0bbabf0f104c0f8d84721b2ca62e78dd9b7ddacbd1bc754debd90b9cb458a3a0c193215697639b8a8045c5485b183d70dea432f8290c35c2c9a7
+EBUILD igal-2.0-r1.ebuild 871 BLAKE2B 873d17abc0195bbf64d35fcb5005c0e69d81cf8297825c32faf1aaf82f35f538c7f17d8da6a94f04b2fcc01d1106a235653ee81193d40ef3a5cc0b8f3cfecb8c SHA512 ebae0b89b254d6c3da1b399548d964613860a97efcb4cc67bece38ec205ff1522c6eafcb94996aa3500f7aacb2e7e2c7430bc75e5bc797dcce1dc0873dae08d2
 MISC metadata.xml 515 BLAKE2B df57e086f1c3f791956327fcc23a384d29d8c0887abea8b9562e5dde6f041bc68d77f787120d2e20974be17c17d129a0e54078cc774a79934423c573e13b6955 SHA512 379299c58fe3018ce51c1e54302dafcc9c258661368101503c1995d7bd0a435175ffe32ff3e7ac6087fa1fb39f4d6e9623acb4ee3acd73a333c95375cb3de072
diff --git a/media-gfx/igal/igal-2.0-r1.ebuild b/media-gfx/igal/igal-2.0-r1.ebuild
index 8673d3bb6ba5..4110b52fc42b 100644
--- a/media-gfx/igal/igal-2.0-r1.ebuild
+++ b/media-gfx/igal/igal-2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index c27c90f8d681..50a8239877ca 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,12 +1,12 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.10-84.tar.xz 9072724 BLAKE2B 489d5f9e659f3bd7ad32f58780a5f2e2b95772801b8674f4591120d7643627717572c0b01d011fc5cf7b5592723467e331ca02a0fcfb54d41be482a952b5a7f7 SHA512 bb574cd322a57a79e90021e4e5868792d0005b268a282ecf6c6a0e58c79dbc20e422e6a491c2adf1e50841570a69405f8771245cc2f545f5e7f2150cdf84faae
 DIST ImageMagick-6.9.10-86.tar.xz 9064960 BLAKE2B 02adf3a7cf942f01fb5f3fb72cda4f407360fa223768f6988220df5be5210e19973c7ac2243df9b295d5a3e1c43515088b157502204c14e665611764c575e62c SHA512 6d3362a83168ecc5b710bc020db2fa30495d442ffff72a77a99fb8be56225283660cd00ac2d1f75c5d19b44c64b212221aadda90fc0a0d76cc2e1e32bca62ffa
-DIST ImageMagick-7.0.9-14.tar.xz 9485404 BLAKE2B be449bc258841eafc83571891c545ba3cecdf6ec8019e665c680ca7dcfb9639db0cf9aee1e53c63ddad03c57549b523e81b926e2613b559baafc833606169a8c SHA512 eaeac3820943c5ed941a5adfa1a5549864d9ac748523eea7b352c8b51e4eb1189586ed0c69e21b1ce2431203ff43973817d45b293f9e85ecbdf35569ef838c3f
+DIST ImageMagick-6.9.10-92.tar.xz 9071556 BLAKE2B 4b50c9c9d84592ee0073f2cb7f0174fd681624188a42a8ce074c0727df72894fd81df19c7c8c6f4ed68c56f709f8d558de4fd729513cf0ce781d5627151231bc SHA512 7fd74c2e59f373e457a8b60b8d2ae84e2511901c3d7d06fd4e715b821e2d4e72b9f64f3f9c1c0c543c2fce7e4855381ec30d8f0d007d4d3249502dd2c408cede
 DIST ImageMagick-7.0.9-16.tar.xz 9480896 BLAKE2B 182217c8c4a9425ca69722785da14bb8575ba50aaf9909fc39626ec34f54ff33b7cb5e627640005a00c1e94282b68a041a937e658eb6b06768149fc72f3807c3 SHA512 8f0c20cb863cfe0df30ef5140180273461d7bdb501670d0527bb6b17ac1adff3d500ba3c13e920c81935b4808cac11282808dd3cc81d1edac8429419fa34de26
-EBUILD imagemagick-6.9.10.84.ebuild 6923 BLAKE2B db33249935f9938e01a1c271fc9f2874ec8a8eef00b2f1f024563d2aa27ca4d73bc80bdb796337b11bf9a496b239771b72a090d6e82669924a141a946051961d SHA512 60b9d3d71a8cb753e48f9edf5159bddb4a2471b439ad2ecae61f3237501220a7ca644889ffa8734676a65b50b5da410232457dde208bfe467cfd0e3d95f0b906
-EBUILD imagemagick-6.9.10.86.ebuild 6931 BLAKE2B 590e91832dbe44c3b3dedf956b0f01d3537251f09e7e2a96ed7b0cfd9b9a054597fc3f664bac68182e94fb5c9931d2d7e1f0c9fe83b711a2703fcb3c9f8df541 SHA512 662f13698db0a5fcbb34d04e8bb85e52f2469f003ca9dc337ce0a2c03dd9a381bbee2d4ef43979ff4f9991f9bab6c3d6701725a1df8135f4b052ae76317a7c42
-EBUILD imagemagick-7.0.9.14.ebuild 7198 BLAKE2B 6cec58bcde0421af89dc9c5049a77652fe46205cf9a391f742703fe8ee121439c5f43373677a39c88217f2017cc6e4aee2033c480af039ac6fdc646777ebb2fe SHA512 fbafdeab636fc3c4918e805efadaa7b1d063dd94b2e7bc8d3763185655f5fc01c801ae33ef3b59718d56ad8c1d082e2b26b6cc21dbacee6adf94ce94ea7bb4da
-EBUILD imagemagick-7.0.9.16.ebuild 7207 BLAKE2B 004df3bd1f94e9e8c082bc82bbdf949d1d981c8517c5f5033f0ed55c3e9d472565ed8a088292b389325922925dc57733c7a39e14d4d987bb20f50ede87789be4 SHA512 e03e1322c70b842799ce7e90984d940007cf75895ba6d35bd7cb32b39599bebf83feefa67704225d845c82c7f789cc1f9cc7a4269c7a49c48b8336aa350e4c58
+DIST ImageMagick-7.0.9-22.tar.xz 9485092 BLAKE2B ab1be450d9566943e8da0de33b47ba1dafe600fd5453d6df30682c7b0f881b78528cc5d97c14d42b3a7ad44a75d9a50b36a5cc1aacf7ec699f8c03e09d2324e3 SHA512 dc6d9c3e480d532efcbc6b0ba6d34985a86d5f280ed635fedd04898225e7002f56543e6ec13a603bda8d9d85861146c0f859f95c4729911c1e330cd158f9cec6
+EBUILD imagemagick-6.9.10.86.ebuild 6923 BLAKE2B db33249935f9938e01a1c271fc9f2874ec8a8eef00b2f1f024563d2aa27ca4d73bc80bdb796337b11bf9a496b239771b72a090d6e82669924a141a946051961d SHA512 60b9d3d71a8cb753e48f9edf5159bddb4a2471b439ad2ecae61f3237501220a7ca644889ffa8734676a65b50b5da410232457dde208bfe467cfd0e3d95f0b906
+EBUILD imagemagick-6.9.10.92.ebuild 6931 BLAKE2B 590e91832dbe44c3b3dedf956b0f01d3537251f09e7e2a96ed7b0cfd9b9a054597fc3f664bac68182e94fb5c9931d2d7e1f0c9fe83b711a2703fcb3c9f8df541 SHA512 662f13698db0a5fcbb34d04e8bb85e52f2469f003ca9dc337ce0a2c03dd9a381bbee2d4ef43979ff4f9991f9bab6c3d6701725a1df8135f4b052ae76317a7c42
+EBUILD imagemagick-7.0.9.16.ebuild 7198 BLAKE2B 6cec58bcde0421af89dc9c5049a77652fe46205cf9a391f742703fe8ee121439c5f43373677a39c88217f2017cc6e4aee2033c480af039ac6fdc646777ebb2fe SHA512 fbafdeab636fc3c4918e805efadaa7b1d063dd94b2e7bc8d3763185655f5fc01c801ae33ef3b59718d56ad8c1d082e2b26b6cc21dbacee6adf94ce94ea7bb4da
+EBUILD imagemagick-7.0.9.22.ebuild 7207 BLAKE2B 004df3bd1f94e9e8c082bc82bbdf949d1d981c8517c5f5033f0ed55c3e9d472565ed8a088292b389325922925dc57733c7a39e14d4d987bb20f50ede87789be4 SHA512 e03e1322c70b842799ce7e90984d940007cf75895ba6d35bd7cb32b39599bebf83feefa67704225d845c82c7f789cc1f9cc7a4269c7a49c48b8336aa350e4c58
 EBUILD imagemagick-9999.ebuild 7207 BLAKE2B 4fc6e4d61f5e851d55546614830dbc3d9a23003033f55ac521bbe990d845aa2b7b7623c66da431f896df16ee71d6539bac7fdf0204c61f00d010c9013b92fef5 SHA512 97ebbef19227007aa32140de833e25d49c9a8f648fda30a9a0abe8073329b0df5a79a74968d5056b3d342e87d435072d64d360ec4270aca53491938c4cfb7f42
 MISC metadata.xml 1111 BLAKE2B 3592f2d81f67d91239152d723c736437a5e8056f8dba1fc5c97e2ead08efd4e913400b441eb6d6b90f26cccf3b89f115c18a5551bc070d1fd81e68dd218493c9 SHA512 33bd68bc4f88cd6029528b0feab9cc9fde0d60475ba5fad8c4f92ff6d373666628e6525d54268735e99182abd2658aa32c7c72ff22106c65f81ed8af5e4f7ea2
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.86.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.86.ebuild
index 57ae3d2ccac0..ce112a772a73 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.86.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.86.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 REQUIRED_USE="corefonts? ( truetype )
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.84.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.92.ebuild
index ce112a772a73..57ae3d2ccac0 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.84.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.92.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 REQUIRED_USE="corefonts? ( truetype )
diff --git a/media-gfx/imagemagick/imagemagick-7.0.9.16.ebuild b/media-gfx/imagemagick/imagemagick-7.0.9.16.ebuild
index db7f1fb9468a..447fb88f37fb 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.9.16.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.9.16.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.9.14.ebuild b/media-gfx/imagemagick/imagemagick-7.0.9.22.ebuild
index 447fb88f37fb..db7f1fb9468a 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.9.14.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.9.22.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/imageworsener/Manifest b/media-gfx/imageworsener/Manifest
index eb8326c7ee64..127343f344c8 100644
--- a/media-gfx/imageworsener/Manifest
+++ b/media-gfx/imageworsener/Manifest
@@ -1,5 +1,5 @@
 DIST imageworsener-1.3.2.tar.gz 661710 BLAKE2B ac79b9d883be34b93e935dc813e6f1edb4806203a20d1f7663d7cbeec74d62227aa88c92b9e96cb940f2a952e92d9724f98fe69dcbd7d2a9dccc2c0a2e9d19c2 SHA512 99b30ac838f437a85985eb830d0557f22c69bc40ef2dafe3493f145b70a89b72699e134f061719fa0dcc8b585ed2b418a6afc0c2f7ce67e2e9383d48a7b7b668
 DIST imageworsener-1.3.3.tar.gz 662243 BLAKE2B 6b34dc111c5b2dcc25fdc717b7ec8d4268ca1b67c31cca58b5e1983643f1e3b78543a3bdba24b3692a05cb83a887bfcf0e7b09307535994d280056a0047c8b0d SHA512 ebe8a31819cf665d8d8d7e789d873de03206e74e100ea99b2d8dc6ac2590025ff0058066daeb17ebfaa6cf49222e33c8a9efa83f39f5e2b9b49d27a3ee1b027f
-EBUILD imageworsener-1.3.2.ebuild 1031 BLAKE2B 542293ffcc50ef2c6bbf2d94a2c623f17028e8207ad90778aaa51a329156ec2c66039c240128f8d6b9e04ce2fa2bf259bf8a6e3645c8208e68f2ce57256549fa SHA512 d3dcbf8dd76050c3b94f05e75ab2e7aacc8ed30370bbb235e74569c80dd399753566fa7ad927d9a6f94e572dcf6a589f6a5f11c9ca03c3ea37a33ed9c5448465
-EBUILD imageworsener-1.3.3.ebuild 1033 BLAKE2B 765544c276abd8674728912588c902f811fa13f16781b870b7432b2c02e2327d9b89b2be47b2452521a016b31a8c545a20be136472252d3a219e825006b8046b SHA512 d28f46a3e6503d12929af9855bf2fa6bcde90cb7d363bc67b314ce1240e789da3fbd5938b75c3bb3f04770eb11d23b7cea781294d598c8a76967d8b64a91346c
+EBUILD imageworsener-1.3.2.ebuild 1039 BLAKE2B 37de87bcc96ea9f69b39025f37dd5648711ceec6712c113896db21848504ad40c03d119852a6790c988a581ee512876f33ce81da422db1cf561075ef00a7c69c SHA512 ca237686311d12e133d71b7f97475e816295b78adaf1097936443a5275bf0d843cc2d734fcd755dcc7a9a409d8aef50b77b507ff6e963ad41341d2190a889f5e
+EBUILD imageworsener-1.3.3.ebuild 1053 BLAKE2B 84eb784b282c7066380f2164bf04c0fb39d098fb4a04abffe156bd74fbc61ff4c513215864beebcfeee386f1c4870fd5bfa3c83c6992c3a8133c490660ac4375 SHA512 426c33e0f91e3893d415520cd35b7f84e6cf753a9b13357c6c9ac02751d548ab54f1e3c776422b067e6e253fb71ab864e2253c87465a480a58f2397ed42ee884
 MISC metadata.xml 245 BLAKE2B 72d076c6c3242be9c56106016a71f78c926c6c7fe92ae2d22c9cb5084eb1cf3cb4f930e6439c43b57e12c261fe77ef99c469b5629ecafb052dcedef6e346dc86 SHA512 385f7a990e82a7352c25fdf12ac028a67cc41112a9b5cde2e66140d26fdca910e6187d7965b622c3026843f6064d352a1884d5ff7b36aef0d0fab49d364a8a56
diff --git a/media-gfx/imageworsener/imageworsener-1.3.2.ebuild b/media-gfx/imageworsener/imageworsener-1.3.2.ebuild
index 8fb4887db676..1725bfb56b44 100644
--- a/media-gfx/imageworsener/imageworsener-1.3.2.ebuild
+++ b/media-gfx/imageworsener/imageworsener-1.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils
+inherit eutils ltprune
 
 MY_P=${PN}-src-${PV}
 MY_PN=imagew
diff --git a/media-gfx/imageworsener/imageworsener-1.3.3.ebuild b/media-gfx/imageworsener/imageworsener-1.3.3.ebuild
index 2759af96c03e..c51206e3f3eb 100644
--- a/media-gfx/imageworsener/imageworsener-1.3.3.ebuild
+++ b/media-gfx/imageworsener/imageworsener-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,7 +41,7 @@ src_configure() {
 src_install() {
 	default
 	dodoc {changelog,readme,technical}.txt
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
 
 src_test() {
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 145007dd1277..5f076ca90fc6 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -6,6 +6,7 @@ AUX iscan-2.30.1.1-gcc6.patch 564 BLAKE2B a80e24742c9d142ea88c2884c061efda09391a
 AUX iscan-2.30.3.1-fix-x86-unknown-types.patch 362 BLAKE2B c791249488661dbe3fcf3301cfd46c04cda85ad95f8e21bae8e8f87e63e787ea69d494d7ae152dbce368ccb9fda44781201d1630e1c487cb9ad0d5d2a33e6d77 SHA512 723c3d5b6522da913ed93abaa1797f661e7eecc3974faa2bf730ced27c6a4adb3ffc87bfb38d42c4929b5afafb3cfe3e9111870aa796ea4872a053302b29ec6f
 AUX iscan-2.30.4.2-sscanf.patch 779 BLAKE2B 8e8255c0558e225b3c1bcb5faaf42f0d794177e463119595b53fd0e194b7918703d3b9ac3c8d8fa1939cc86799deda4605764f99b2aa666f3c2047ed21333f31 SHA512 345ac7ae1c75b6da24f16f9abd5f7f4352cfd3497d24229db8a15d26d767e62c8273220a7f40f18c452ab90094b56774eaf738c880c613f0463db04b6d5d9f3d
 AUX iscan-3.61.0-ijg-libjpeg.patch 1145 BLAKE2B 781c0c9a40848f9c10ddb3418c55b6c4a145f1590c5ec41e22e371830d3d7d63c4e013d8fa69a1f15f24d4883d569c0645df66b3c6120eb724f3a1f9643e3813 SHA512 b570bc0e6aa73f74750aaab4d3ca84838864c8723b14fbf5a45fe9163be3e7819035a12bd058587a4b4964325ba4af99673e78647b11d2a7b1bcf96039522191
+AUX iscan-3.61.0-imagemagick-7.patch 1965 BLAKE2B 14685cc9540ccfda87587b5ff2df7b8c4755dd08bb428f33ce853c32baaf6ab7e6b2d3368df9153fa5f5b39d9ef17b8e468ea59530ac89098107542db2638f05 SHA512 d5545570865370229f2b132aef7131cbbfabd7e929795bee6ce1e0d791c2c623eefabdd0ec265c6cadcc41072049d61e07d5fca46a1f51c621323a38112dc316
 DIST imagescan_3.61.0.orig.tar.gz 12649835 BLAKE2B 32c31dcc6bdd9bbff7763e8f671642f586ebc4cb6ce1e3d532b3889b314d39c14253ec7d0547cded0b5bce95d45e8ea1d9586f11cbe101592f6fd73902408cec SHA512 276a3ca69aee7449c9ebc0c1a0364514db3d5f73d4d2cb2c5380b09463e6ba4adf077ca52d403563d68fc4e714ece1ddca1d7310349926e6017a54a371c09612
 DIST iscan_2.30.3-1.tar.gz 1216848 BLAKE2B 8a5f485c1dd814248c46aec6accedd331105c3ccc0f70a582e60dfb62b1cc1f1ebab358f0896b15cbf842ea06f8a35447d91f76391b10bad07df371512856c32 SHA512 5f68b2f7b7c1d1b5d3d65a55c3a80538fda5d2bdf9cd50fbf942e0eb49dcb84983ede66ed2f6354f9591692808df54415400fe02ed47e7373082869612a47872
 DIST iscan_2.30.4-2.tar.gz 1236167 BLAKE2B 598e55aa7099f7973b38f5c3227415c8ddfa7e8c645521981b4e8979047ab692427f5c1719fd83fe0635f2d4604f32f0baff8542f3e1a333298799c4cad7b980 SHA512 b12f374ff8ee1e1879fc6dbc579de39d7bcd4777ec7ad6e4345046f77b4ec13ae45ebdc2803d6907bc2747776aa7e32c313866138c7b8c7bcb53110a214154d2
@@ -13,5 +14,5 @@ DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1
 DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
 EBUILD iscan-2.30.3.1.ebuild 3517 BLAKE2B f2097ee00fab3de458f2c8f4320765844c5a78cf23b85c0b880356695b9d2027ea5df2cf03d7f7829d3d42a9d49adfc22bc062a418131ea8d83ce015088dbdce SHA512 9a058f3d2a604c4a08e6f48d3b98b4eca7fac74ae8807f5fff77c73754a44f6207a6eef051d34fc78e5984a67a009ba51d38f73d3a4c05ecc0bfdda995dc9ef4
 EBUILD iscan-2.30.4.2.ebuild 3960 BLAKE2B 9cb40b7213717045476cd6b4c43039df725721ee18ff79b487d11ca2edd1c9752d8a222ad4cfdd03c83048e87e6a4b6b88e6fb44b3382a0a9e21634ce229fea3 SHA512 c715ad28dd6e44123804f5bfcd0fc92dd4d7fca3a5487a1c16c6c23dd96c37b7211686897263931c9511c0923ba434cebe22acdac65a4213c055d376200f4dfc
-EBUILD iscan-3.61.0.ebuild 1219 BLAKE2B eacc4710c1501271d0d572beb767fb7b7ff2ca94ac2cb6220b3839e4a0436886cdc6d390693e6c268128d542a9597109407f0b0c960bf4033e3c1582f438efb8 SHA512 adf70b06312939200effb9c4c98bb6bc9e0bd105a42942ecac923c70f9280dbb6d3e8a5f0eb8c3e8799b49e21bc3e1b8b6ed5256448b60fbc626032f516eff3d
+EBUILD iscan-3.61.0.ebuild 1250 BLAKE2B cb63fcc67fd5424f970f5f7100afa29e8ecc532cb45302a52a81b61ece434fdecf3ce719fd7900c7f59703841ac71cdd8f6c62360e534bcb85cb52554ae9c435 SHA512 5d6bf78b213762aa016c8604b81fe31c571682979c452b3bea21604bac538e19e0697c6e7e22b49894067d9ee0ea40b0fd7fbda6e57bf34cf21cd0e59a09fb6e
 MISC metadata.xml 923 BLAKE2B b9035c8d418ac3993d4103cf53657da8bbb829aed4bf010241f4f781984ff9450779ca6aa196f604d52680378761635a2ad868c3dbb7d8b87774f5231d251cd9 SHA512 004b33e1d57943fb6ed8319def74938a98dc323dabbb695ff145adff01d84a026311a44a735bc621be6e68e3c3f4e06c1274449d6e2ad30e37f2952c0bacd6ef
diff --git a/media-gfx/iscan/files/iscan-3.61.0-imagemagick-7.patch b/media-gfx/iscan/files/iscan-3.61.0-imagemagick-7.patch
new file mode 100644
index 000000000000..9d345a2b309c
--- /dev/null
+++ b/media-gfx/iscan/files/iscan-3.61.0-imagemagick-7.patch
@@ -0,0 +1,54 @@
+From 222aa3e123ee771d8997f6931997e3143186e0d6 Mon Sep 17 00:00:00 2001
+From: sirjaren <sirjaren@gmail.com>
+Date: Tue, 20 Feb 2018 13:35:46 -0600
+Subject: [PATCH] media-gfx/utsushi: ImageMagick deskew/crop support
+
+Fixes to allow utsushi to be built with --magick-pp.  According to:
+  https://github.com/utsushi/utsushi/issues/43
+
+The API changes from ImageMagick 6 to 7 means build failures as there
+are old API's in use.  It seems, that these API's are not actually used
+(as in GraphicsMagick doesn't use them), so it may be ok to disable the
+checks for them in 'doc-locate.cpp'.
+
+This is not yet confirmed, but allows building and using deskew in my
+own testing.
+---
+ .../files/utsushi-9999-magick-pp.patch        | 33 ++++++++++
+ 4 files changed, 111 insertions(+), 8 deletions(-)
+ create mode 100644 media-gfx/utsushi/files/utsushi-9999-boost.patch
+ create mode 100644 media-gfx/utsushi/files/utsushi-9999-magick-pp.patch
+
+diff --git a/filters/doc-locate.cpp b/filters/doc-locate.cpp
+index 4b09b29..4508274 100644
+--- a/filters/doc-locate.cpp
++++ b/filters/doc-locate.cpp
+@@ -260,17 +260,17 @@ public:
+     clone.rotate (deskew_angle ());
+ 
+     Magick::Geometry rv = bbox (clone);
+-    if (HAVE_IMAGE_MAGICK_PP)
+-    {
+-      if (clone.page ().xNegative ())
+-        rv.xOff (rv.xOff () - clone.page ().xOff());
+-      else
+-        rv.xOff (rv.xOff () + clone.page ().xOff());
+-      if (clone.page ().yNegative ())
+-        rv.yOff (rv.yOff () - clone.page ().yOff());
+-      else
+-        rv.yOff (rv.yOff () + clone.page ().yOff());
+-    }
++    /*if (HAVE_IMAGE_MAGICK_PP)
++     *{
++     *  if (clone.page ().xNegative ())
++     *    rv.xOff (rv.xOff () - clone.page ().xOff());
++     *  else
++     *    rv.xOff (rv.xOff () + clone.page ().xOff());
++     *  if (clone.page ().yNegative ())
++     *    rv.yOff (rv.yOff () - clone.page ().yOff());
++     *  else
++     *    rv.yOff (rv.yOff () + clone.page ().yOff());
++    }*/
+     return scale (rv);
+   }
+ 
diff --git a/media-gfx/iscan/iscan-3.61.0.ebuild b/media-gfx/iscan/iscan-3.61.0.ebuild
index 5ea99a53ae23..8d372ec8a73e 100644
--- a/media-gfx/iscan/iscan-3.61.0.ebuild
+++ b/media-gfx/iscan/iscan-3.61.0.ebuild
@@ -5,15 +5,11 @@ EAPI=7
 
 DESCRIPTION="EPSON Image Scan v3 for Linux"
 HOMEPAGE="http://support.epson.net/linux/en/imagescanv3.php"
-
 SRC_URI="http://support.epson.net/linux/src/scanner/imagescanv3/common/imagescan_${PV}.orig.tar.gz"
 
 LICENSE="GPL-3+"
-
 SLOT="0"
-
 IUSE="graphicsmagick gui imagemagick"
-
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="
@@ -28,11 +24,14 @@ DEPEND="
 		graphicsmagick? ( media-gfx/graphicsmagick:= )
 	)
 "
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/utsushi-0.$(ver_cut 2-3)"
 
-PATCHES=( "${FILESDIR}"/${PN}-3.61.0-ijg-libjpeg.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-ijg-libjpeg.patch
+	"${FILESDIR}"/${P}-imagemagick-7.patch
+)
 
 src_configure() {
 	econf \
diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest
index 03f24b9ab744..9515ace331de 100644
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -2,7 +2,7 @@ AUX Makefile 1095 BLAKE2B 59829280499ade024a4b96852b3a6dac3c25bca26e3131eeb819d4
 AUX jhead-2.90-mkstemp_respect_flags.patch 892 BLAKE2B 3a0c4ae7bf32391b32a405541bcd70525e8aa1c6064118b94f08ec8864fc712d50500066f10b2fc417ece0a3d4ec95919eb4751b2bf994ad3461d72b4de7d12a SHA512 14051d7088685dd957d0bdaace752167ebcdac7eb3b01b033918897e8c349e417e662688d7737f916f59d4f1dd7ad9752172791699da0565dd2d5b4f908a4ed8
 DIST jhead-2.97.tar.gz 68361 BLAKE2B ed13d637dc491ad1c6ed7f9a5b0b526c80f69b8c521e3618289b16523ebb12690fa53a0a273f3f5793f970f390430d56c8504bed30fb45c5e9e2a9ac248f7667 SHA512 9b33451546e5ad3b82fe6001515fd572925a1e2c11af763ae32d71ad2cb056ffa8d97abe14bd48ae5f6144da9d8322965387537d61e22d22b02624ebf351c230
 DIST jhead-3.00.tar.gz 69151 BLAKE2B 23522718f07cd0b52b3d7fbd6d0f69ca5ecd5499174b06c6572be1319b275dc93eacd270f33cd7b3380ef85e6615aa79adf1fa9a1a86404876b35c31cdb0c95e SHA512 daedfe7ea6be051f769e9a1e0946ea0fa741f387bbc5ba55eec394fb3f37b18a66aa8826190c790eb50a5b9d445ee0d5a28a08d181db3be469686b0675540fbe
-EBUILD jhead-2.97.ebuild 746 BLAKE2B 1c2b2588dd2104a28b32c44bc2b5641378fe66992a8f5f181a97014dc615950436765dc29c2666e6aa2a1ead24e9dbdacd463c06d233e73382b6c614a6dc2019 SHA512 cfb8694fe762bfe2f963eefe7d4782ffbeb99a0e89d4c8e43a62ba462f11c50cd1d1ec8df57780735c49d2fa71eb8e7606ae701c2a6912174d3c35ceef93dd7a
+EBUILD jhead-2.97.ebuild 743 BLAKE2B 4df5635844b53852f0fbc56a12130d338d99ed6ff19f5c6aec3727df51f89eab5937cc1cc11405ccb56a5dd5bc64f8b55c6155426722f7b386a979ab8b66f94b SHA512 1c95628553d0bd1d8e93b405e95c68bb5890a878a2e49ab8eba67b176626976199db8d224dbb409364120c79c99c7e0626464089b7c02ac9e097a398a3b14483
 EBUILD jhead-3.00-r2.ebuild 711 BLAKE2B fd9cd6299a0a6d4955e58e4f5ee3af77f14155aff3687fcff8c3a6b91cd4095cf950987893f3d30fdeb6936fc4f081c877c52e0c868120e2392e0436e9fa3347 SHA512 98ba55bf301b2cdcd5ab8b53e1e1612b62da19aa5c41f884eb1e72936487b747b45ab06375489d8999a91d549a57c816079f0d219c6ac929bc9164d425a27e84
 EBUILD jhead-3.00.ebuild 746 BLAKE2B 576096a432b63a988861a85e05ebb92f1a4346bd012f74269629a2b868254a372699a4ed3be74ae78cb90df792ee61e77842da6da46ec98ae6a570faedf3fb89 SHA512 2f711c62175a02cc968fc698fffff784743a8befe3c315d294e78978357de5df3ee0c665ae70baf64091db4c3744f1c2aa3853fcae87754eb8a67d0a08ebe4a5
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/jhead/jhead-2.97.ebuild b/media-gfx/jhead/jhead-2.97.ebuild
index 7b2a5545a032..7027fe94c7bc 100644
--- a/media-gfx/jhead/jhead-2.97.ebuild
+++ b/media-gfx/jhead/jhead-2.97.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/media-gfx/jpeginfo/Manifest b/media-gfx/jpeginfo/Manifest
index 58b0d6968f81..f14855a626b0 100644
--- a/media-gfx/jpeginfo/Manifest
+++ b/media-gfx/jpeginfo/Manifest
@@ -1,4 +1,4 @@
 AUX jpeginfo-1.6.0-parallel_install.patch 334 BLAKE2B 01d3e16d44789c5c1d1346f6c3067496daad051e60c9a39c69641fcec1766bb69e872f5259b4edd2d7b5fe5c793bc25e47c7329aa49b625ac80954a444562f92 SHA512 5dd86f4172caacb8d43952274b3a0a86df5d346839d29eb7e80e6f7ae8be4b73a70dbaccc1732703d45cc966b8fd762a0a4c5e02a3701718ebcc6ff646f1e676
 DIST jpeginfo-1.6.1.tar.gz 64856 BLAKE2B 5d9748a4af26087e45f2ae3fa709bb2099547f22aaeaf1fde529d92d633b1bc665dfde301a9ecaf4a8e4fa190ef637126d6f4ee43118bb31f5782a402d4a08d1 SHA512 9cc9367b8b3e38ba46bff9477b8f61e63b55bd41a67ea2895cca9c097abba2a7a3ae068c235ecfea72c99af52bba91cbb1eb92feb019ba4eb08e826a7083c68b
-EBUILD jpeginfo-1.6.1-r1.ebuild 644 BLAKE2B 67707966fb52fbc78c078bb388caadf6f36d99a732c98da0c1a88548512ec39fb47075106182db65f186cd0a647596995ac1f017f795da5e35deb305091bae73 SHA512 6e78587f62cc87721af626eb1bd67370ed8fd6a1881bee63285584087e4145802693af294a93afe5ad5d3d219c959565029c1d9a19330cbdaf2e9c4865a8b3f5
+EBUILD jpeginfo-1.6.1-r1.ebuild 644 BLAKE2B f6b00bb15e3021ae11d12c007a7439a4371451fbd643f5d1a2a433e0b26ce8658d7d18f5279cc14e1a6dca32b47879d1462b1f069f280443f353bed0a039b61e SHA512 9ef1850cb4c8384985ae6af37fa95609f62dca8a480a435e00d59e74864b1b9fa223cb5f32b6d9a82882cd03d8f22fec22a9b530a8be302d8454e0c8f1e3beb4
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/jpeginfo/jpeginfo-1.6.1-r1.ebuild b/media-gfx/jpeginfo/jpeginfo-1.6.1-r1.ebuild
index 4b8027f00b3d..8649717927b5 100644
--- a/media-gfx/jpeginfo/jpeginfo-1.6.1-r1.ebuild
+++ b/media-gfx/jpeginfo/jpeginfo-1.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
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 540055d51ebe..22d787ae8a58 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,6 +1,5 @@
-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
+DIST kphotoalbum-5.6.1.tar.xz 11773808 BLAKE2B c69cdc0afb455af64fe0624208b6bff34813a8f0341a4d3f21b7dc0462eb51f01574656028de497527c57a7ed70d1ab9dd6fe451ecec1696f09cfa8531dffe77 SHA512 fa1f4d566cd99e8c434b6e1fe28d8910b3b9c6aa05947ffbfa1b2b8efdab76f243f4b12883586e0c6692bfe54763a285374e16f3ceb23051619fe9b84cd58ea7
 EBUILD kphotoalbum-5.5.ebuild 1496 BLAKE2B c1196e3b012258e8170c3a8c27318c55c4cb4e4129959be04078de5b0c9714af0fcf0e6774356ad518b4d62326a15eae08ee95cd280eadbd6819ed5c41852352 SHA512 9795d6c59b50bd328c7a5556441abbaa108c308398782e9172ab0617025a0769cfbce3ea0e46f5df1eedfd609f8bbb91638a4c964517adf950efaef8408cda2f
-EBUILD kphotoalbum-5.6-r1.ebuild 1775 BLAKE2B 21f528296b083240c19671ee6da362e66459f0a91d4c17c92101084d7cb9871e869f904cb7ec19b7d0f87bc2beb5989c24237994fb383bfedc4584c1494dd820 SHA512 b79bce8f53e1e34dfb2de28e0fcd1e0b3f5ac5689d51a489ca43b2f6680d54c951da6c5cad2c27bddbcea59a5132ff62c53798688dd883817de4e990f473d404
+EBUILD kphotoalbum-5.6.1.ebuild 1728 BLAKE2B d928f7e46d1c92eda043d1b850c07d92c35f795713dee9a6e22607c3e116d867872a450281c14f8451cfe5ae32c5277230c04f4cb34745b8db91cac5d69ec900 SHA512 13dcefa8f117c81d4621cca8ab8199fc18f8dd1383e4fd8e5854b3864ca272e96583f8acf1b7e93e402a400623eac45de9e2ace375e580bbb18605ebf5eda03b
 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
deleted file mode 100644
index 96b752bf075a..000000000000
--- a/media-gfx/kphotoalbum/files/kphotoalbum-5.6-crashfix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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.1.ebuild
index 5c27d00b9ab8..2e4ae7efba73 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild
@@ -55,8 +55,6 @@ RDEPEND="${DEPEND}
 
 DOCS=( ChangeLog README.md )
 
-PATCHES=( "${FILESDIR}/${P}-crashfix.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package kipi KF5Kipi)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index ccd2288d7b92..9bb42a0ef04c 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,6 +1,8 @@
 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-patchset.tar.xz 13848 BLAKE2B 86059e08833541b7d4dfda2c36cd1479809452171353b755ab3a264fa41fb99fc7ffacf064af3767aa095fda81aa9a2212b63c7242c72f94ca23a83b34c0502f SHA512 79532700c967f94479af22e2fbd33c0b6d8c4295c872316935800b99258dceaedbac2b1c6314251d4d621c25a328ea602f49d415cc9275095bc3cd2f29756a61
 DIST krita-4.2.8.2.tar.xz 169994064 BLAKE2B fc390db9e3aaf3f4355e600a98ea479aa510895c26cb82e8800fbff64031bab7a26e0c37d6d274e6397a38c1bc33cff6b48cb5a7c6e61b56579e92e33279b1c4 SHA512 5482ebd62c530764b43439d6782fa7e1793877657620967ea0f6cdad166e3ff508b36cd04bd99c192d35a237c4a0da08477069e333ebaf2093785e207402dea7
 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
+EBUILD krita-4.2.8.2-r2.ebuild 3231 BLAKE2B 154fc4eb751841d36fd99381a98398481e046770edf3bdf5686baa119c539cecb1a374e380a35dacad1fbce44de382fa506fea974265848c0791396a3ef38aa8 SHA512 8f91ad1ebc4cf806c97f606c8572345d94c432cfb047bf2e0ed2e7f1c9d64448f5eabbc99b47bb4d0400bdedfb3c9b7963bcd3e3444fffab3f90f966105879c9
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/krita-4.2.8.2-r2.ebuild b/media-gfx/krita/krita-4.2.8.2-r2.ebuild
new file mode 100644
index 000000000000..1507a29d7b47
--- /dev/null
+++ b/media-gfx/krita/krita-4.2.8.2-r2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PYTHON_COMPAT=( python3_{6,7,8} )
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-3)/${P}.tar.xz
+		https://dev.gentoo.org/~asturm/distfiles/${P}-patchset.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://kde.org/applications/graphics/org.kde.krita https://krita.org/en/"
+
+LICENSE="GPL-3"
+SLOT="5"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-cpp/eigen:3
+	dev-lang/perl
+	sys-devel/gettext
+"
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=
+	dev-libs/quazip
+	$(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
+	>=dev-qt/qtgui-${QTMIN}:5=[-gles2]
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	media-gfx/exiv2:=
+	media-libs/lcms
+	media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXi
+	color-management? ( media-libs/opencolorio )
+	fftw? ( sci-libs/fftw:3.0= )
+	gif? ( media-libs/giflib )
+	gsl? ( sci-libs/gsl:= )
+	jpeg? ( virtual/jpeg:0 )
+	heif? ( media-libs/libheif:= )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr
+	)
+	pdf? ( app-text/poppler[qt5] )
+	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
+	raw? ( media-libs/libraw:= )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${RDEPEND}
+	vc? ( >=dev-libs/vc-1.1.0 )
+"
+
+# bug 630508
+RESTRICT+=" test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.4-tests-optional.patch
+	"${WORKDIR}"/${P}-patchset
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_configure() {
+	# Prevent sandbox violation from FindPyQt5.py module
+	# See Gentoo-bug 655918
+	addpredict /dev/dri
+
+	local mycmakeargs=(
+		$(cmake_use_find_package color-management OCIO)
+		$(cmake_use_find_package fftw FFTW3)
+		$(cmake_use_find_package gif GIF)
+		$(cmake_use_find_package gsl GSL)
+		$(cmake_use_find_package heif HEIF)
+		$(cmake_use_find_package jpeg JPEG)
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package qtmedia Qt5Multimedia)
+		$(cmake_use_find_package raw LibRaw)
+		$(cmake_use_find_package tiff TIFF)
+		$(cmake_use_find_package vc Vc)
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 592b446c5d1a..40cc334695a3 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 1402 BLAKE2B 0ee7dbd64971bbad9082cc26a742e42abca7ba6230d8eb9ae8445e7c9460486893afbc561557e474639f1b3146615dcddb8d92c8b69476dc79f93ab14c7ca0f9 SHA512 a5985fea8bb1f48f1205eb6bc70e9dd6d93e42bab5a6417d90306f93e7737dba30c73d1a1ec1add93dcadef5d617828279ab0fa43148f5e0a9357aa1b7f6bd73
-EBUILD libimagequant-2.12.3.ebuild 1404 BLAKE2B 6056841304b2b31bb15d2554083fd2352b4f794b2df2b1077c2ab27ad383bf783a068e27c0c10e6a20b675931910b62b8bedcd13fb2af7d39ad3ad3eed21a488 SHA512 b468bcc5dd8d43d957f52ab8babd0b9dc14470f7d2413cf7f8fddd453336046db03b7fcfb9882b62023b7ea343b6b95d1b6ebe1ff4fd2ed0266598c3050298bd
+EBUILD libimagequant-2.12.2.ebuild 1402 BLAKE2B 78bc0307ce586509b1ad63f39c8defb47ee4e94624db279954a11ae0fca2b7511f1ba018f1c3ab72e26e89c29fe81b0c7ad8ae05f142dbfccbaa24793bc90e6a SHA512 f97cbf0ae7c7d293c5340fd996909229ce9cc5664f2f8aaf5409363d7f16e8a45313e8650f908a1965fd7445b931d09c643408b155409dd0fe9bdb91257f304c
+EBUILD libimagequant-2.12.3.ebuild 1404 BLAKE2B 078be497e18f0c0c5c61354a2704ae77dba51d4ff61d1115b46b01bce40f92ff52b3e91ba5206688595a75ffa3556fdaa2bcc3f4077f442cfbb0a5285a049491 SHA512 3051828e6f6767a9ded271a87e1c2a1aa240ca702893eba873863432408b180e77ba550f18b448f09ad5fcb2797d2f511beda25c11b2e757b8e6aff0cf8ae6a2
 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 ef2a9b8c654a..f14ba77a5424 100644
--- a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
diff --git a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
index c04b34f09632..85941dfd3408 100644
--- a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
diff --git a/media-gfx/maim/Manifest b/media-gfx/maim/Manifest
index 5a33cf25f2f5..a21736efe149 100644
--- a/media-gfx/maim/Manifest
+++ b/media-gfx/maim/Manifest
@@ -1,4 +1,4 @@
 DIST maim-5.5.3.tar.gz 40083 BLAKE2B 93392bcec8d1ae5188c27414695b04d0ff94a0824e9ef4a7fe8ca0949a1583b7dc7893346bde94bcdf629d9dc8d3f8350a8484eb8cc5bcbf8ff24cbdcb651b10 SHA512 bbcd4f0276090b9650cda88e527d0d1b80270a50935fbc02aac9a302a64bc3975386f24a97d8eb3c1f97d7d32cc9905d5e1f652915fbe3aae0766bd90bc5f51a
-EBUILD maim-5.5.3.ebuild 830 BLAKE2B 60f6ff651b255a9f2dfe6c7099a189ad61f3847f2afbac69c340cdc8cd9dd73793715296e1f80ffe68fa469f859b55ee827cca6b854a2c2ecdea8f9c9d86b80e SHA512 c754e859aaa6149b4095ecc2e0c9bd7b79c0328ca9cd1a3db254b19aebac448ae9ccbe6b05b19a7c15c9dd0dd902df73fe20a1ec138df725d588afe0d2494a1e
-EBUILD maim-9999.ebuild 830 BLAKE2B 60f6ff651b255a9f2dfe6c7099a189ad61f3847f2afbac69c340cdc8cd9dd73793715296e1f80ffe68fa469f859b55ee827cca6b854a2c2ecdea8f9c9d86b80e SHA512 c754e859aaa6149b4095ecc2e0c9bd7b79c0328ca9cd1a3db254b19aebac448ae9ccbe6b05b19a7c15c9dd0dd902df73fe20a1ec138df725d588afe0d2494a1e
+EBUILD maim-5.5.3.ebuild 830 BLAKE2B 25f8d53c31efa110e7888a683e92486e24a3512edeb7464a0ddbfa4dfbc37e4b5e656d40fdc021b8c0d6653d1799416dadc8a68815e2cad55fca9bda31f75874 SHA512 aefe3f5b3ca17d88aa4ee06455d214e1b07a6f15185380f7c8fdd05857d8f189c6ba3d6488abfb8c4808fd64d6a6beaca13309046f1b41df32b139e9ccabbfa7
+EBUILD maim-9999.ebuild 830 BLAKE2B 25f8d53c31efa110e7888a683e92486e24a3512edeb7464a0ddbfa4dfbc37e4b5e656d40fdc021b8c0d6653d1799416dadc8a68815e2cad55fca9bda31f75874 SHA512 aefe3f5b3ca17d88aa4ee06455d214e1b07a6f15185380f7c8fdd05857d8f189c6ba3d6488abfb8c4808fd64d6a6beaca13309046f1b41df32b139e9ccabbfa7
 MISC metadata.xml 370 BLAKE2B cf97a29c8998e02c1cf3c1a2262af3b4ead910bc3b9a84a43ceb97eb6f8522b134007ba6380e5a0e014ac62b4faad27f856a847026bba576e1e1a6e4c2bfd160 SHA512 d3c3fb700a3d2c5c67a3919ae60fba9e843734875378ba682d93f728c408845f580caf940b3e39436582ddd1c3e2fe4e21f01cc74960d00f8cbddf20047abb62
diff --git a/media-gfx/maim/maim-5.5.3.ebuild b/media-gfx/maim/maim-5.5.3.ebuild
index f0567fc401b0..7d5505eca012 100644
--- a/media-gfx/maim/maim-5.5.3.ebuild
+++ b/media-gfx/maim/maim-5.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/media-gfx/maim/maim-9999.ebuild b/media-gfx/maim/maim-9999.ebuild
index f0567fc401b0..7d5505eca012 100644
--- a/media-gfx/maim/maim-9999.ebuild
+++ b/media-gfx/maim/maim-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/media-gfx/mcomix/Manifest b/media-gfx/mcomix/Manifest
index 92572e568268..5f7847bf61df 100644
--- a/media-gfx/mcomix/Manifest
+++ b/media-gfx/mcomix/Manifest
@@ -1,3 +1,3 @@
 DIST mcomix-1.2.1.tar.bz2 571128 BLAKE2B fa00e55e5cf2ef676a625b97ca467ade6b629fa08bfd920b8c370dc7d33c6602c5614d120d7279df32d063db646da8b635712ba90793175eea2c74c2c1973a8a SHA512 efa4d57edc3a48d9e711767fb3e233ef9b334ff8ba467999e572e60ed747a4ee4aa420c8aa7788b16d7eb6e0901d454d6a405fcec47a8c74098a49491e915cd0
-EBUILD mcomix-1.2.1.ebuild 1680 BLAKE2B f22bfa496ae7b4a6200273ef947c80319498e911e0bcb5133125905f398af2f0b4d7b24aa0495c878d23ff4ac7aa15128783841a13f94e2501cd2541c7f79618 SHA512 35e478e8f5cc6717553776ea773ae021738d64fac15431b4b25f09ec3e51167b5f35e8ab41104319f36170bc2e006f06337a118e2db87fe3ef8b3dabe0232f92
+EBUILD mcomix-1.2.1.ebuild 1684 BLAKE2B 593e3bffc8bb970f7839bc4ded48bef0505cfe30982d1432b357e4d4ab5607feb9999898afbafbc3855892249b2c5c18bae1586fd8db89d0b31a6c5bebbf11d2 SHA512 4b799f1e6d4a40f1aa88cbe34c27d787046b65ed05c55e0a5ca9918762b345481b7ed5bd8fbde10508e2f14f68ad16c8029aaf8a56c922e16fb635fc5809a1f1
 MISC metadata.xml 345 BLAKE2B 5b642c2387884d75cef7f8121f65d121dd6c83c3b0abc78cb2d81eed5195653fffd4c1e1ad4f441bfc7ee391fa5e356a10e28d05438dca5aaad25ece60d15f41 SHA512 2abfc4450db91c8b5a4645600e2a289d81d416e5f01f5f45020e5626a008bde48e6864c13a132c755b9dbafa1ebcd4756da7a1be30c897f02aad0aebaab38d5e
diff --git a/media-gfx/mcomix/mcomix-1.2.1.ebuild b/media-gfx/mcomix/mcomix-1.2.1.ebuild
index 8eaf5d5a9967..c34c73cf85a4 100644
--- a/media-gfx/mcomix/mcomix-1.2.1.ebuild
+++ b/media-gfx/mcomix/mcomix-1.2.1.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"
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="sqlite"
 
 PLOCALES="ca cs de el es fa fr gl he hr hu id it ja ko nl pl pt_BR ru sv uk zh_CN zh_TW"
 
-inherit distutils-r1 l10n xdg-utils
+inherit distutils-r1 eutils l10n xdg-utils
 
 DESCRIPTION="A fork of comix, a GTK image viewer for comic book archives"
 HOMEPAGE="https://sourceforge.net/p/mcomix/wiki/Home/"
diff --git a/media-gfx/opentoonz/Manifest b/media-gfx/opentoonz/Manifest
index b08243215bd2..e2e7f56680d2 100644
--- a/media-gfx/opentoonz/Manifest
+++ b/media-gfx/opentoonz/Manifest
@@ -3,9 +3,9 @@ DIST opentoonz-1.1.2.tar.gz 36777909 BLAKE2B d822218c5ea1843a50da8d799bd9edf6998
 DIST opentoonz-1.2.1.tar.gz 39843446 BLAKE2B f9035bab5c6fa1d86459b401ca94acbffe8e38a2f5ec2bc97f303c7e829b9f6695480e7ab7a7560909f6ce45109ca1704d5020ff774964b5ed72b1b01588e93b SHA512 3eaf5983b5ec7424338e25975228b9bf6e9da61b2699c52377528966ecf07971868426bda0a64c780c2876cc1f0e4adb63c46767e8099fbfe32a8d1586c13f44
 DIST opentoonz-1.3.0.tar.gz 39920932 BLAKE2B 292e01c078a4cf461fff0814a60e4ab6aea9a74a63f23e854815632432e07e65d5c01dce9d3aab36595f94ca06dd83b078e52858532d8dadb2e7518514c08b08 SHA512 5df272c943f2c222a457545c99388266579d88c702d6c7e71dfe0c924a0189e30323cf9e369c96755c507ee5347620da0140215b2647555f0b3bdae41c615c71
 DIST opentoonz-1.4.0.tar.gz 53531141 BLAKE2B adb7a85fb0581d92119b5f6b75dc320428ea0763955f8c883072cba78045acdeea75a5cea82065a29d2c59f53b4843d8ff92690c9a47c01605b4702fd36d6c13 SHA512 777f5d59ec8076e1e53a81347e15bef198bea77449073f1e9d5fdd371a61e20fd6dc8b26c6656c783959782bd71008fbb63c05742aaa50c92bd317aded7d0649
-EBUILD opentoonz-1.1.2.ebuild 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.1.2.ebuild 2145 BLAKE2B 13e02438560b95acea8e4706b9c9c35d1d76470e5d7e51c9e4a1f3b269cfe3b1f73ac066fc59e59b82306f1adb573bd53f119ed8fd8f7adbe1ac249fc47ec23b SHA512 3c761e8112b70b3807e8114f9adf208bf5e54ec6986a86087fadf518be1b0fdb30ba7fa83eb71bf41bbccb2fd29c46164265599ad7633a901a255b7cb8c24fbe
+EBUILD opentoonz-1.2.1-r1.ebuild 2179 BLAKE2B 3e9ab88c1cf7f1364e2feaaa58fd92ccfc426337c85307d046da8d14734528c5da16fbb341ca1c8ff2992fc07ff465a1aa06b9d25e823cbca9b32e221ee45ee5 SHA512 d85550a7169a8f31c5db8384aa7bb0b6d190cf9afb4d0553a64640ea52d3f5a0cf4ebb29a781a68fcbdb913723a79f0c3ae7f6a03d347ffe053f5964687d410c
+EBUILD opentoonz-1.3.0-r1.ebuild 1899 BLAKE2B fafe1a38973cf8e8687b705b91d496c1897c1536e17f978e6bfdef122c8b43e045c34f71e0d942843093881b138630a342e4fe3a4c11483faeb4acc30bea82d7 SHA512 1f3e0f7a9db57c9a4150f490c82c186698e4fc56eac11ec725dd2e4b518166eb0e91e359f3d863dfa49dd52f5125c57074f28e2338438367478e4e1702d81e06
+EBUILD opentoonz-1.3.0.ebuild 1910 BLAKE2B 104dd1987f0b2221b357d5afe5922eb67dc97942cd4823cd4179c4ecf4ae55074004243f0a6039a93f6a3c560ee38b346f19d6e9603bec0c2f87e4bd36b8abf3 SHA512 b84833dadd77ee39f9918c177edd919ee93456967ae21c7a587b780282085676681b54518dfff4da35a4127a2b8fd4a7b8898bfe03f2b2a4445bb00fe052b3c6
 EBUILD opentoonz-1.4.0.ebuild 1817 BLAKE2B 63407ff2f79ce44b991ca53ffa0d606f605f203cae9ce95749293afc29e25f9802061884d1425e82c5a43da4a6fd477087dff9da03faa53e11e92482ce74cf4a SHA512 66e8e879c11a5bd55a9125f786bf2bad513def93eb95113f79c1172202365bcad8a9f655a9fc39459d529427590e1182e0b636eb3bc1ef5187e4c2e6e0c265a3
 MISC metadata.xml 453 BLAKE2B 5bcdb89e0cab891a18531065af9dc5d65510905f8c21178d62125901d0d65d0522b8e4a5ab94f92d09ed0085a0cfae6701c04001dc29bc5e138b12b888cf71ec SHA512 227ed636186b559a5c4fe8728bc8ad2fa519177451f61c6cc67e20be3f8b071715fe38c274956cc987c3c2a49a25b7c7ca61280608871861c0007c558c016d6f
diff --git a/media-gfx/opentoonz/opentoonz-1.1.2.ebuild b/media-gfx/opentoonz/opentoonz-1.1.2.ebuild
index 41ec70caafc7..ced01576533d 100644
--- a/media-gfx/opentoonz/opentoonz-1.1.2.ebuild
+++ b/media-gfx/opentoonz/opentoonz-1.1.2.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
diff --git a/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild b/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild
index 8906b6e2ae54..b1aa0a87358e 100644
--- a/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild
+++ b/media-gfx/opentoonz/opentoonz-1.2.1-r1.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=6
diff --git a/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild b/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild
index 7f206e2ccf0f..b9eb63a13837 100644
--- a/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild
+++ b/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/media-gfx/opentoonz/opentoonz-1.3.0.ebuild b/media-gfx/opentoonz/opentoonz-1.3.0.ebuild
index 760fe526d498..74922af17dc9 100644
--- a/media-gfx/opentoonz/opentoonz-1.3.0.ebuild
+++ b/media-gfx/opentoonz/opentoonz-1.3.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=6
diff --git a/media-gfx/pngrewrite/Manifest b/media-gfx/pngrewrite/Manifest
index 4acf03a5411d..6a86341c4721 100644
--- a/media-gfx/pngrewrite/Manifest
+++ b/media-gfx/pngrewrite/Manifest
@@ -1,3 +1,3 @@
 DIST pngrewrite-1.4.0.zip 149760 BLAKE2B 7ae0acabe8d231233bfab3fe0c6a71da4f835d5c6c6943aa394ec0e83f126c93127d5f798e2206f2c45ed5b9b016a14c45a99ea450b40fd63af09a321fb5d2bd SHA512 9ed9d220a4d8066f752d7ba123dd831ce6550072e7f8dd2327bf257b3d8e886f781c4878896c633a9a251a1311a10af56434e2c9ff773d174233a340a1f37e42
-EBUILD pngrewrite-1.4.0.ebuild 636 BLAKE2B 7d25a4cb5242352ced8f36539949219652d2f9128cf71e1b0e04e5e455290c51027521574b058c7a58e217afb8927f90f474d70fb57707859eae91edb53a2d22 SHA512 5917266359b8d21e2175cf46ebe5a7c0c9c4d6415969bbc478ac51dc29a46fe38ce5064a8fa106706bd7aaa7174540c9fe5625e17576bc56ea7e8de5698f7230
+EBUILD pngrewrite-1.4.0.ebuild 636 BLAKE2B e06e969c4727d71dc64fb57bcf665ceb84601a00d25f9dac7756dab400f98df02160d4c95777b53b28d78cd7c4fcb3f8d088075519b0c5e9725689c532cfedf8 SHA512 057686c8e59d0e7e2408f1199f28a94772adf9c0a587c95df7bd8c861c58cac868414845df4224759dc68d738160bbe9949c96f2be677a888566b75843e2115e
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/pngrewrite/pngrewrite-1.4.0.ebuild b/media-gfx/pngrewrite/pngrewrite-1.4.0.ebuild
index 9262e8a69ad1..78bd15d1a013 100644
--- a/media-gfx/pngrewrite/pngrewrite-1.4.0.ebuild
+++ b/media-gfx/pngrewrite/pngrewrite-1.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
diff --git a/media-gfx/potrace/Manifest b/media-gfx/potrace/Manifest
index 4ac83b239c1c..98fed352d3bd 100644
--- a/media-gfx/potrace/Manifest
+++ b/media-gfx/potrace/Manifest
@@ -1,5 +1,5 @@
 DIST potrace-1.15.tar.gz 650840 BLAKE2B 1a2074ff0ff958e1c9cbcd35a6267ef7f4bdfa5ba9b511413fa2c5db16a7263ed27291a0bf7c76feb25abd59db099e1096b736eab28a6397accfce88f42fdeff SHA512 c9a8edd4f3339da587b9b32e12c83c8f7b993c7c23f551fa267545d9411679bc024924e23596ed1c83985693fc894b65dfa9f860275de395d9e0a88da37a4f02
 DIST potrace-1.16.tar.gz 657314 BLAKE2B ee6b04f355d593dd1ebcc4833b244e25eaaa69c91f90987d530a4e5a454668dff6ecfb7a5d8270ebbd9e7c177fd447d1b3fe2a343fc4b9413dd3f507c0c6e417 SHA512 10d85ed3fada80951223c65e923b5e6ee3e76e071575971d5b09b996b477ec5ff2403e0337c44963c6b441cc3ba6c4f7009541124a25c16b7721fdebd1f774b9
-EBUILD potrace-1.15.ebuild 803 BLAKE2B ff3fd19f619310deecf5fd8e92ecf811c535f3cdab2284c300babafd7240930eee65a16625b4708be987a0eade0a0bf986f0c5b036d3551384822065aa8c44f8 SHA512 e9f00da09e220892ca95160c1593ecf995632c0d516e6b6257b84480b1314a37742819ca64921c6672a9fa8f20f978c47e2f30fbdaea8655c935644c952f90a5
+EBUILD potrace-1.15.ebuild 800 BLAKE2B d1d24d18391bbad2f36cd81a539936b604fe258318e545855f6caf7f931af945a1ba14dbd4dfd29675cf5805f7aa2ee51c276749c09a344692d34ec2b6c1b059 SHA512 7219c25ee89e8b732d9b91a599b48d6487aa006b4e1bf11fc5a54db27790200b5788ba2810e19944ddefff9ae436e9ce5b9378263f682df3ed7acae4c04f11f7
 EBUILD potrace-1.16.ebuild 810 BLAKE2B 2dc8008fe2cd0b65e308e819b7ff04b9c9dd743b7e7e889f6fe99425da94206b4a4048edb47ee780e1a7b865c15f65761fde93b60336678888ce2349c6da0539 SHA512 00779894c3f2178015cdbc51491a016fea978750f2afa02bb41cc0115982129332e97523089ff40323972a3a45ab3f092e76a510678f3c61283adf43c03d964b
 MISC metadata.xml 534 BLAKE2B 04a21e1af300190548959fc595c0f0ca4918bcc949bb6f5ac6747f79806b3c2f3e57ecf25076e8d8a876ff1ee45b8b816e89c957f8ca4e05292ef390c5de32e0 SHA512 00f7a8a90caa7e7d9920929733f084d41baf72c45dc998255c54964eb50f6ec70d6af8666463fdefca27f95156834f1c4e9676f115bbb86538e979967a73b6c3
diff --git a/media-gfx/potrace/potrace-1.15.ebuild b/media-gfx/potrace/potrace-1.15.ebuild
index c108417d6cf1..45c8a269b262 100644
--- a/media-gfx/potrace/potrace-1.15.ebuild
+++ b/media-gfx/potrace/potrace-1.15.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=6
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index c5e67b0b8ec0..d120e325699c 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -6,6 +6,6 @@ AUX povray-3.7.0.0-user-conf.patch 1491 BLAKE2B ee99672c70a5d7e12048acbfc50a3ef4
 AUX povray-3.7.0_rc6-darwin-defaults.patch 920 BLAKE2B 9cffcda18626cfdbea9a6b00ae99ee300d6b29a79e22229e35d116070b4a1ac1fbb4869242a043155a4fa189f701e6bc318cd3ba8fbc743d497db26c763926c8 SHA512 17ae635430f0d57157c9915ce5b25a88afcb34f6dd9552b27a42b32d638fdfbcb8b4e41ec89b52048db9d054812535b7b41f328ffe4554e719e4a3de21cbfdee
 DIST povray-3.7.0.0.tar.gz 38191521 BLAKE2B 5d936bdcdf9910ede2247cfa5e3881211da00762ac4bc08225dc6b53addc9e09546de9493e642b5d41228d81a50a4bcfbb5e606eb8bd9a224bb1afc5fc82db6e SHA512 82e3dbcd58b7ae921fe3b953815ca4dbbfb22eda434554baee4accabd1455b18cb511061f1cf9cf93128fab0a042df374fe2f68186d78c19853a465bd4bcbe10
 DIST povray-3.7.0.0_p20160914-fix-c++14.patch.bz2 12876 BLAKE2B b1c458764f04a57420a4562e9faacae4ae955c3d9ce4343ffd49176bb575f63830fcd58d0777dea22b975df118aa14e2bdd91509758d33d659daa3fbbaba5880 SHA512 3329da12a822762559445e208a746ff208c39f7b63e27ba84a390074bb52a105c9a2f66180e58c5157795bb16346e11b5b05efaf077ee0d8246179975a692b04
-EBUILD povray-3.7.0.0-r1.ebuild 4601 BLAKE2B 0b9a2f347af8b11af38c9c4a8f48ab53de2298d334e64dafd363f2f48c2a21b75af9c396d634e900265af24df4ab9ad9542a0ffa65560ca903afa9737d7e9e83 SHA512 33d3020577323b6086d7fef1af504e08ccefac952946c049f368fc4032cfda020df493f0f405e1a87b6aaad8ab92f61f8f51dfb7e6f51c8ae17ae41128dc08c6
-EBUILD povray-3.7.0.0.ebuild 4383 BLAKE2B fea8094c4e2aa73fd14211b2cf41e49d3574c9a8675ce80994d8b1f3f5c4622c0236b476ec4436f8792fb03eefb2d601791a48774762d9f118a9fcd0f597a9ed SHA512 9cf9a03d37fac820aa2db1231731c7c2021913460ebd4c84b5d591851640116880beaeedab6bd11eb8195cd187b20e87727266b96774b03b66fc091cc7fd9489
+EBUILD povray-3.7.0.0-r1.ebuild 4601 BLAKE2B de10f72d1f0ab7abe109407939fc6bab89ef5791e5996c7be0c0122a68cace73439e47902b37f9697d1fbad349f0b8ce123b78d652e7111144d71a10842c34e6 SHA512 fd8db2ee56b12192107df4d91bc115857a9088b8d4141956b112c3edba067c07542a2236892b99ba4ee5fc31963dccb801bc0bfc116ba97092f4f19146df59b0
+EBUILD povray-3.7.0.0.ebuild 4380 BLAKE2B ef8e6a8341cf78d0f6943f2d17405bca0263df44e496c537765bcbfabbae96ba71870cb98468560dea329f5e3276713fcd17522b8694951cbc5b44aaacf744e4 SHA512 12c71437feeb850e325990e805d6a806897e44607e73ec378ee3d29cb36b2e95e19d6343615b339b84d639a959888859e8c3ccc61339d63d181531191eb055f2
 MISC metadata.xml 504 BLAKE2B f0b8ba895e8949a452dc4ddac0f3e78513b3c91107131d288e9e4ea7d1dd406622ac8a3ddeacd0b3df039ce95ab6f3dd339b80bf91f48ea99ab6d5c74a6cb4d8 SHA512 e2146892acd26bd3fc03fe1733f67073a1db1106f568ac886548b7c3e4fef508d1f3a619d74b8573696f007ae764d26e1f8556c3dbb03b9434b71258f0bcbb00
diff --git a/media-gfx/povray/povray-3.7.0.0-r1.ebuild b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
index e103d01fc846..31b33d771ffd 100644
--- a/media-gfx/povray/povray-3.7.0.0-r1.ebuild
+++ b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/media-gfx/povray/povray-3.7.0.0.ebuild b/media-gfx/povray/povray-3.7.0.0.ebuild
index bd540c614ef4..bf7c88f5c8a0 100644
--- a/media-gfx/povray/povray-3.7.0.0.ebuild
+++ b/media-gfx/povray/povray-3.7.0.0.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
diff --git a/media-gfx/pstoedit/Manifest b/media-gfx/pstoedit/Manifest
index 18b9c3433f93..888419f72fc0 100644
--- a/media-gfx/pstoedit/Manifest
+++ b/media-gfx/pstoedit/Manifest
@@ -1,5 +1,5 @@
 AUX pstoedit-3.60-libdl.patch 428 BLAKE2B 8ed39e1a13da74ccecaa2aeec57447fc75b682c9ea5a8fe6586052fd766bc9ab23cb76bdc56bb613cb43672f6d10a05cfaa8bc860865d2586673ab4a9c8642aa SHA512 dc29caf4b1bf1e6ce7cc73fd5ae1682f0aba8a798f632d29cca450bf3883afe54142ea06fbe6d9aa07f2580450780afe1c671cb1c37f1dd800582b2036797f73
 AUX pstoedit-3.70-pkgconfig.patch 627 BLAKE2B 00412e11239e49f12babc35f2225c7ac2a25ce62e59d8b3088c0d7284b867c8919dc70c61bc60cea06e75dee84698eaf223861ad8db09cd36dfdf5ee813aee9c SHA512 8edfc9f0c0db6371405ff16641294c8aebb7dc09e9bc8b9114c7506f4fd494f0361b90abceddad68c351baa2d2917b6212056ed69c0a6dde0d914a2c801888ec
 DIST pstoedit-3.70.tar.gz 1013949 BLAKE2B ec459dc56851d942076adf4352ef974188b0b8273a6f9150c8767c1d63c3c9b6d993ea8c0b1a0b59663b31652eb7a4b8697e4c38c23d5aa0572d554120a5e900 SHA512 63668ea039fdf988ba007bafb8dc1f23f06d4eb430a92b97fb93c71b819f63e2708b99476ec9b096598db2ddd30d29a69101f078e7d4fdfec314677f50293cf9
-EBUILD pstoedit-3.70-r1.ebuild 1296 BLAKE2B db93576f665f793c602693f62a9db3fd4bca36f79892ca0ea80849b6f2e2ba364efa4ce9b09350d068b7dd9f843055579a45d018979a69b5506b75ebea955ae2 SHA512 cff803bc42a6e8c417abfa690a24c5aa4d4896dc736c77dc83cc3416e9ed5eee8d8238fdd37b01adced82832219e72dd949f1880defbe8363d06738b118a7d32
+EBUILD pstoedit-3.70-r1.ebuild 1296 BLAKE2B a7f651a8c88f9525be5902d9a68e66c0526e94108344276eaedfb85e2e5e832d1fa996b9caf468d3f8f9f33924354240ca7d64c754956459a93aa73beb547b04 SHA512 68467c26bb06438857c80d8817f7789b2b583e806918ef3829c1608671d2271103c5d48697de8e03d0cee2fc165af7312817fc31a8e447be5cfb71fb06274795
 MISC metadata.xml 633 BLAKE2B 3a142022d38aaf0e5bd5d6df58b8a6e2f94589992eba8a48d875138af60bb44d8893ed91a7dcb169246ff2d2405940c406d5d37f84bfc9c621b8771b96678f05 SHA512 6d62633c23d2b45c5bdf75e8e09e3f58def09a2512e540699857809ea79ddc41c823cc382a9a412b6dc061e02c3b5574c8addc7bebd6e7bb10caa2c2408162a6
diff --git a/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild b/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild
index 2e06d542724d..7fff681c0e9c 100644
--- a/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/media-gfx/qrencode-python/Manifest b/media-gfx/qrencode-python/Manifest
index ae6d759bd3a4..d14b12fdd115 100644
--- a/media-gfx/qrencode-python/Manifest
+++ b/media-gfx/qrencode-python/Manifest
@@ -1,3 +1,3 @@
 DIST qrencode-python-1.02_pre140921.tar.gz 2084 BLAKE2B 19cecad794718a56bb0ac756b322fbeb9a748792bc9683a3c0784c5d2e2638b100fe523b4ab34be5563bd10e5773cc6925dbfbabba48d9487ed2d8e4e86dae57 SHA512 231c61f98f064d282611d14194de7b3c0a18faff0ed856722e39a6cc25f744442d77bd43418aec117c6e39ddd78a6ea770edee8992aa4e3cfce50254ac6526aa
-EBUILD qrencode-python-1.02_pre140921.ebuild 688 BLAKE2B f2d85888752152f2b8157eeafe4f24f49bbf0bec6e2cfa1eeaa9102c06bbc8255cfab049c0f73f31ee87dde726857e783d9b0ad5b882c3b1feab02dd8ff42b1b SHA512 39c082a7378b95344b8273a37495ed95c9585a4a0d0f0ff0ba0e2a857d9d52feadb011d16b04d0a8c13b577832788c4c918bf665d52502e5d51fee40594eca22
+EBUILD qrencode-python-1.02_pre140921.ebuild 682 BLAKE2B 8f48f36dd811c03ee194b28b892adedb2ae706add292af66ec1c54671132729c5706588b06d046dfb200a9e1f38b30003ec5d99cb0982fef3ef66c6d72c80ce7 SHA512 90cd6811c8ae45df2c7bed3387e544d8d74da905aa04f68c93eae9c1d7f6e6c66040deb8440abbeb33a343f8e7b60f89c353224954826d1c50d1b89b585788c4
 MISC metadata.xml 304 BLAKE2B eb11f9f35defdf53355add48e6b21809cbd85cbf1e12930d53ccf77f82a28b5fda23e5dbf0ac2c15c509f8a50997339ca2d43e0ea2c0fed45bf7e4b55f38c9ed SHA512 d36db02c7fa11ce34c655789975cdac826c259dfe778a27b28221c31bc6a5e99e3ce53f0b3c0a3abb8ad29b39e937cb02379a6c93310ccb1978c62511a4c6f1f
diff --git a/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild b/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild
index 30af55913085..84b7e240314d 100644
--- a/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild
+++ b/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index 2dd583630068..f09c69f3686a 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -1,3 +1,3 @@
 DIST qrencode-4.0.2.tar.bz2 430309 BLAKE2B 1f68d2a921ba60df3a6c7381d7886b27a2876f90771d78c12d5d0fed2d6a4edb4d7da5985e2b244406a0cf3434b351fbec8b12c5944c365078ef2b227edb0acd SHA512 2429c7938e32eacbaf327c029c7745ba33259f879661a8b6470cc617c780daf5bd1d5689599151df62e84badd2568eccab6c12f157331e512ab24a3899e0f002
-EBUILD qrencode-4.0.2.ebuild 790 BLAKE2B cd466f6a8f2202198820a0e5577da6beaf379245aedd649f3c87550dca08ae9b8c624fef61abd236e1e7c5a799314fca6046b0a961d221070fcc32581a76e0ab SHA512 41be501a819292faadc94cda499b88b9a07bda810a273c3926a618fa2cdabf737c71e2ae10b8edbb423b886b83a06304fb27d398662f2d7d04a965e34c09b957
+EBUILD qrencode-4.0.2.ebuild 790 BLAKE2B 3124940b8adbcc3984fddd40575d11e5bfd85807ec5adc3e57b4e94ebf6994de9d4a5400d42027ebe9899d4f0e9f42d7979103871d78d1180b0dc79bc483f12c SHA512 5b9013864af0a28ab7ef3894518602d777ef8e996de0698e5f1d1cb7d8ebf1e5b8999c972c815f9ce751e9bd52d138de33213426fb73691f9372dc190d34b4cb
 MISC metadata.xml 370 BLAKE2B af379243b15cc55c2e2c14bd20ec8b9bb41d4fbb6a87938aae5cbc39e17c78ac45b322d946eadec59fc48c13354fd9dfdffea8c2572301d8d4cb86f162d49bdc SHA512 f5987a8aab3b861bbe4961c69d0c72b07826c43320fd383075036ad63a070204c6ed41297b2490b4a14224f5c4269c37c40e5abc9bce4d1c5857e68e98d6428c
diff --git a/media-gfx/qrencode/qrencode-4.0.2.ebuild b/media-gfx/qrencode/qrencode-4.0.2.ebuild
index 99912ba47907..3a6dc60172bb 100644
--- a/media-gfx/qrencode/qrencode-4.0.2.ebuild
+++ b/media-gfx/qrencode/qrencode-4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/media-gfx/raw-thumbnailer/Manifest b/media-gfx/raw-thumbnailer/Manifest
index 03d0c78ce602..3fd0d985b6e2 100644
--- a/media-gfx/raw-thumbnailer/Manifest
+++ b/media-gfx/raw-thumbnailer/Manifest
@@ -1,4 +1,4 @@
 AUX raw-thumbnailer-0.2.1-libopenraw.patch 897 BLAKE2B 26065ada735e744b0bac662110f8f6a8d70f808721452adab0c7b4cf6927152ab255e424b2978147895e36833cf525893d3f601a09871e712a2dcd348d05e1f0 SHA512 c9b582a6f7d8ccd5958da96d4773105e17b9047b1081d5a4e2a48384831f83e79ef32b9fafd3cd2436472ac86554ffa2232b1d039f06d9890425c5b2d6da185d
 DIST raw-thumbnailer-0.2.1.tar.gz 89468 BLAKE2B 8041cfee56f9be900c6f7bfa6dfb9b21b482ee8eb7dacb83ed37603c32edf6e1dee122de3e98b06d158b6725a1900c73c7e1aee1b8e6a53545428ff7aca47b53 SHA512 cc3c107b060add00b4af811bb548b597493ff0d54d863c530d183970ac8bdd4f6b9f4c25cf978e1d2bf80b11424dbbfb20e73c6dd1abeff3a15a08843bcd41e1
-EBUILD raw-thumbnailer-0.2.1-r1.ebuild 666 BLAKE2B 08111226e538be42d182faa19a3dc5df639a5a4c3b224a374ad77b71dff0b7ee98b4ddb3304ca43a6f91055a7938795a844c5605ec95f01f78e06bf1e5804192 SHA512 39a5f5fa9a697c3cf0ad045b911c1c50271dad437c65f5a4e14b325f37ac8362fd9a85d08e51b94e3517f6cececaee4f86858bb84657f8c8f0630caab3986a95
+EBUILD raw-thumbnailer-0.2.1-r1.ebuild 663 BLAKE2B 44f64c0fd57ef4719e6b78e565fe17d98dc5af592a186aca3378654bbbf889a9e81b5e344913b5b68c9a558d0844ac1c4f508107d2b695f9f2b6bf806016f9f8 SHA512 d4b42cd43e37ea53bdb4aeb6dc1e87afc79f087dcc1dfa008698f8c24cd37a50d627c6de5e27fd0c95dee018b149c6443a562abb125056763673cac510fe1c3a
 MISC metadata.xml 407 BLAKE2B 713244da2a69bfc59fb7a82373bba128e0d08fe7c12645245fb01df403e3affc792fc26ca28967dcc6c499145e90f9a34eb7c984164ccf4396a8924c4c153312 SHA512 7383547238ca395a6cffde72366521dd7e3e04218f8840f19f093cfa61d0788d10138d39250702085a5669f715aaf3d0da5e357829a0e0fd44a70d20c14ed46a
diff --git a/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild b/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild
index d0682ba162fb..f0ebcddfdce8 100644
--- a/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild
+++ b/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.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=6
diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index 04fc66680cc8..c1fe1a194935 100644
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@@ -1,5 +1,5 @@
 AUX sam2p-0.49.3-build-fixes.patch 6108 BLAKE2B 85c608628a932c698a5ad7f44394c85138f850f3e4c2807101eab1fefee5721bd76cd3edfebf71d57221b94709e2aa1c09c415821f3128d3ee5f71c37640365d SHA512 70e14339b6fb8f587adc4692982601db0b1d0343a737cf08931101589eaecc419e8f571bd138a6e585a7a9a7a9f2e8f3ebf3ccf4c315d805be9f625a917a56c3
 AUX sam2p-0.49.3-perl526.patch 648 BLAKE2B 0fa1d54116325cfbf1720c8465ddf5d8bc6a3a11843207e075f63ffae803e128e8c961ff9ca33f961f169f1af2f1419bb5edddb139c87a7193da064aab8cc6da SHA512 22628eadcf9399ba89a652ad41ac55e98fdb596df029e466a4bbc609131e914e456451362e8639c98dbf59c7e288296b4940fa2e92d8ce671715103e9b622f0d
 DIST sam2p-0.49.3.tar.gz 2184864 BLAKE2B 47d3ce6384c344f66e564ea9f70e89e311540c1bbaf640a70cec2830347b3767aa79d525d25c12cfc2aecc61aca676239b99b345fc7e6bb2edfac7c60bd8d674 SHA512 9e9c91a2cd692e49bf73e7c197a0fcbe7df96c685636d1d00456eb8b4b847de3f4848d9bb3d9246340c479c62900ddd4e0a248257aa5e6ec6e16683c5dad54f8
-EBUILD sam2p-0.49.3.ebuild 983 BLAKE2B 2282f09da966b24d67d47a695b60866efbdf012e36df3064b3389d902a33ddc4c54fe18b56490a76f019388574660a93e34e27985b6b78ca9cfb53d369ab8580 SHA512 b1dbedc78534e5cf39a9cf85f08831476a2e02a185ed9481d8bc3bb96bc3130d83d06c519317f7c31939fbdd85df7ee1b3804d78662fb3f56dbcb4c9f0aebd04
+EBUILD sam2p-0.49.3.ebuild 980 BLAKE2B 7b329d3a5cf0c0a37061229b3265fa2793f32da96c234ecabe4f033744eed97b29c13277b5ead3863ecd282ab3f92b96da49f72826958d94434fd51f25a3c11f SHA512 cc588d3967d9a372177c904938f35679f9b586fc0a5084d5d264c82c8e393eec17b3f310fa149b064987345c6cfa5840e4feec0571bb3bd3e2117acfb316c903
 MISC metadata.xml 373 BLAKE2B a0a62fca7fbcd916d83a6d7fa8f020c333b529ed06492cd8f52a8e04d228714bd53d1283e0b43f5a0c399aafdaf99b5caa5534a0ba54e1bff4958b4f28e899f7 SHA512 2bac0bb931232d7b994f24551d0fedccfcaf69932e4900264857e9ba09a9c32495ab743c1fe930e63adca3b7bc11efdea526982e6e27869033bc17731fa5c7fa
diff --git a/media-gfx/sam2p/sam2p-0.49.3.ebuild b/media-gfx/sam2p/sam2p-0.49.3.ebuild
index e1a1c30472f3..6559080f200a 100644
--- a/media-gfx/sam2p/sam2p-0.49.3.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.3.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=6
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 285678e983e6..31fe249f42ee 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -10,5 +10,5 @@ AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b
 AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9 SHA512 a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093
 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965
 DIST sane-backends-1.0.27.tar.gz 6430188 BLAKE2B 90f910311e31a436eaa0ca0fedd998aac3331f89a346f31613776ebc860a10cc37055fd15db8de8d743498914ea0c16e4153dbaa101380eb6e36857d730c3456 SHA512 c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5
-EBUILD sane-backends-1.0.27-r3.ebuild 8124 BLAKE2B d0b908b529932e5c1b17b5659da58be7f1ad71cda6a19b8912f269f7ae8f93a3c8b5343f4cde5bbfbaecdb764476c66ce22ebe5279d5dad312800def0616c4d3 SHA512 41973ef657abb6401e20b0de90aeb49289736c1a7e75b1a0bddb9391c173e6663450ed361ac458167da76f2fc31be91e7430fd358ede64188e34d2757d43039c
+EBUILD sane-backends-1.0.27-r3.ebuild 8131 BLAKE2B ae8d38b48e51b64dc19df47a7fe9d1f1af59e19f53dd313a478238202a0df5f019d3b07df2fe59b093ebf255c436ca620473f0ce33d3f7ea97d16f8a4027566f SHA512 27e62801c83dc2d48abc4b228a1de021950ae4f9df7facf882f80d2246fa8996521382666cd1845f89a437839f80176146564fe37724ea2ce1423f601c4dd672
 MISC metadata.xml 266 BLAKE2B c76ad15982ba5b341a41155c75a5fda95a99ef658ed972c452bfb7b0968aafe33f83cc5bd0f2effb1c2b4f9721a8f61987f2fb7906855b3869e7787226f2b385 SHA512 67d43b02a8c1aab418ca79b30d88af0e78f9df9b95c93887cfed5976290e714409e7dc400f09170d7e7844a411aa3e3202f49f31f39b7f580a8c0b6f3d4db659
diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
index c619337d506e..149f3fdc347d 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic multilib-minimal systemd toolchain-funcs udev user
+inherit eutils flag-o-matic multilib-minimal systemd toolchain-funcs udev user
 
 # gphoto and v4l are handled by their usual USE flags.
 # The pint backend was disabled because I could not get it to compile.
diff --git a/media-gfx/sane-frontends/Manifest b/media-gfx/sane-frontends/Manifest
index 9150fbd854a7..e325a411d817 100644
--- a/media-gfx/sane-frontends/Manifest
+++ b/media-gfx/sane-frontends/Manifest
@@ -1,6 +1,6 @@
 AUX MissingCapsFlag.patch 417 BLAKE2B 5382644f1c8af41fb383bf9889528f279bbac0a18ee2e38f080769b653f24fc02dec53f88f364441d8ceb6d401ad70137215627a181434f6cfcf8245a1d6c37c SHA512 39790a52414a7edcfc4dd9379bd8f35ce91e932209ba9c2ab3f1cb9e5dd140b37f3bfed1e642050a142da43ae435329ab60e201f2934be76648380615a3f37ef
 DIST sane-frontends-1.0.14.tar.gz 231892 BLAKE2B 3d3af2ded774fa90ba4b9545a00df1f036fc72edb71a69f803dde84ca1e9d37b4d20ac91d046ce702c31eb7353d2d85b91cbf8bd53b84adea7f2e58f8be1a062 SHA512 51b24a9bd6889e99419c1d6abb30cb14d8f89b6196c5147044697bdb1b39ee029bdc0d7c6e1f1e800491988aa26f658bc974b25040c49d008ca8977673c78710
 DIST sane-frontends-upstream-1.0.14.tar.gz 233587 BLAKE2B 69e34ed783cff68879b92d478195fe8c67f29d8904e22bdc62deb7310e8ac73d1ce6fc89ee0eafe3e2460f54cec257dbfe28843aec679cfe8669be6c5fc0e2bd SHA512 ffb854f4f4fd08a98395f325c22aa81924ac1e0827e795107bf01f3c42c2cd64bc204c79bc5ec8fd570746d039eae87a2da9cdf30b7f4640442a33c6495d35f8
-EBUILD sane-frontends-1.0.14-r3.ebuild 1328 BLAKE2B 7e0a7f4305f8425e649e564bba1fdd8050d9bdd5850d078fd72f674c2945f6cbbbfecb647e74dc5259b054b177e17291396c333e197af0fef6feae1a1d9159ee SHA512 e11cb1e3604a48b123395754f47f6759883258db9e18579762798fe27fc5caa3200bc479a93894bfdb10a4209a7028c555ff5257fba8de254459095366ec9910
+EBUILD sane-frontends-1.0.14-r3.ebuild 1325 BLAKE2B 15ca465ddb4abdc4da68f09ae7f4e764ef39c3fdb15694ec30dfc7ddebb4dd3a618f3c4ff2e99251fb41e5ba20b4e3fc2bac54d7141319b8dfd692c2dc6e8926 SHA512 80071ec62e4d7a952bc78b7d93e0631694c30a333a22a0640b68797bb2d9e5b04b3746401b7b2339e891f40474cc7cabad9d57aba1778faae44991f04ecd52d0
 EBUILD sane-frontends-1.0.14-r4.ebuild 1472 BLAKE2B 346d15cc4d372c1f58615595e76c1875356a2b12c0fa27fb9e896692c5ad7ff96af481f7f3febe8d4672201bee95dec99cc92a39d88b882f7a9c38e55cac0ef3 SHA512 82ae275c29f2b817ac66cd8c70d707629a344f1d1ec4eb3a22158bec687870b82634889047d3429fdf7d18a26d5ad9f83894c6a058278d7c780bf52ecb4492cf
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild b/media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild
index c6df628cc493..47701fce5177 100644
--- a/media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild
+++ b/media-gfx/sane-frontends/sane-frontends-1.0.14-r3.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=6
diff --git a/media-gfx/scour/Manifest b/media-gfx/scour/Manifest
index 73235ea95a30..367d265d4a9c 100644
--- a/media-gfx/scour/Manifest
+++ b/media-gfx/scour/Manifest
@@ -1,3 +1,3 @@
 DIST scour-0.37.tar.gz 95478 BLAKE2B f3037b691b110f84266c742ac1212a8069e0ac1260f818610dfecc7ee64a257d9e0772c7c675e4062286cf4b719fe48782c416a0cb85a136ea315b22da58c460 SHA512 ffc9bd33eec038126d781dac50c89e4275d0d5e14ec2b2247a7727af91ac2ffe5522c69b5386f75df67a0b88f8ed62cb6a2ad47d600e55b123d937ba33e9e501
-EBUILD scour-0.37.ebuild 655 BLAKE2B 75ff8a59a02a8dc45a592ef15a0e41f4fe42d4fc0ed44d0d0da4bcbbc1a0a6263bd24539e8fe6bde56efcc93f8ca94363b7cafcad41af10a1f4e06f6bca5c167 SHA512 e69cb25efcdaeed9be06846a54fc5e8f42175cd08b335139cbb78f513a1dfcbf719aac8d4dd1ea1f1a89d9cdeafadcd51eb56979cfbfd8837074f5b5ba454fe3
+EBUILD scour-0.37.ebuild 651 BLAKE2B f16fb89a553d6df7bda9f403b3e89741c77f15bc49637a01abc641300de50300e826dae8bda3504a18527634c5102ef95b8052ae4f6fc38ad2e45be26a34cb35 SHA512 b225e49f98919b95c2222849592ff991889635bb15fc1bfa6e3fe828bbc1f88ac87e6286b684d979710589579045ae3176ee3cfe3c78eed894ef15da87280fec
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/scour/scour-0.37.ebuild b/media-gfx/scour/scour-0.37.ebuild
index 9fe16aceebb8..33cb17eca93d 100644
--- a/media-gfx/scour/scour-0.37.ebuild
+++ b/media-gfx/scour/scour-0.37.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Take an SVG file and produce a cleaner and more concise file"
diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index 94a6f5600f77..ada8d37d529f 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -3,7 +3,7 @@ AUX scrot.bash-completion 1063 BLAKE2B ab03add49bb68db845d1cb599e62dfd4070a8110b
 DIST scrot-1.2.tar.gz 36839 BLAKE2B 26ca05fb3c8fa9069ad87bdd5cc93791994e44e2f5cd7a4b729a6c9e3035c349049500b9627fd31532c280465f77f839370d095f1b0f2ccc10649b3e6fa01edb SHA512 b89e7a94e6317fdb7bd260190c6d68a2dfefc08691b4574337afdfff84f55b8b9c955a6ac60642ae9749c1deaa16bee7b855fbd15833a95f602536693daf8c37
 DIST scrot_0.8-13.debian.tar.gz 7943 BLAKE2B 6c58c76f3a8dcf61a8ca4c31f5845cb27b4d0ed2bf9619cc8ea5824b5e42c66ee5163c7f4e76308763947b933003dbd3df6e641b0596ed342993343fd5418a75 SHA512 3f6d0a8e592088af38a3d90394b6b7246430479f5b0c8451af5eae383725d1896dc4bbf595495f9f2b546f00ef38780123c4ee0e3f06971c55a6ac2dfa5b7d53
 DIST scrot_0.8.orig.tar.gz 74324 BLAKE2B 56facc81c29f101279ffc6d5d323a0cecd32b1ff6d1d4bb2052a90703353a9ad5b6ab46c8840ed20834f976badab4258fbb0f031645d9689eef1b838ebd4b1a0 SHA512 cba8f589e45758ddbfe4e276399a1ecb0dbe29569be5d85d97733e7f64de2911bd2d03e62700ad0c718a1fc886c2e3def9dee1de5cac884f9e65e772cebe838c
-EBUILD scrot-0.8_p13-r1.ebuild 979 BLAKE2B dd4429a13bb0acb2adb27de98626b4a48595d11fac71ce6efb60f561df306b21bd2140e5d1d660a71502be45e7fdf1fe216903a0720453e7548cd52d70ec7d08 SHA512 335d2a604aace50cde51329dea8eadaf122a2848eaa4bfda9c25d01a16a6f6f9bc8b9bc8e7a6c5214d25ae21b30532f8dd9ab81cddd518ac8683f689bc3c1fd2
+EBUILD scrot-0.8_p13-r1.ebuild 979 BLAKE2B b23b16d0e7bd90eecbc834b454fef4906395f20dbd02f1ed34f47e0ad4d080f82e7efe581d11f48982b04e0fc31c4b221b0a7d2a265fac656d7446eea0f399d7 SHA512 dcfe367a3879392cfeb117640beebf935e707a643fed27a5caccbb808f2850016c7a416f8b122bae8c9b8817906a6ee74cebc2aaef9c7a428a79c39fafc6e6b7
 EBUILD scrot-1.2.ebuild 924 BLAKE2B a30af374991a9b4156459994848b73b4aff855fe5695c19178bc7ac9fabbe354d70a222759bb2a2fe3fb7642904e0ac4168c66c51cc9c31433a35587b6a6ad5b SHA512 22bf5c2003ec70b2d093e4835a1d512573497011a8dcf6d48182a855a97c942fcb2c8413e872d98905f8df5232214b93bc3bf5e7d3a3b249cea019886d9464b8
 EBUILD scrot-9999.ebuild 842 BLAKE2B fa29235b7684ab9a0e39e490676476086a6759b3e84cd5f2042e46ec43fcaf4f3c17d3ebd2e7ab8ca4b43d2adbfc3c825efefbfcfcaaeaeb1c64093055e46fd4 SHA512 0e18e163e831c4d1900de70297a286b65e85dbcdea1cd95ffad8975907d329cb71164d1335c312a3e4a625ead0de90085dd02e0564349256e779d5102dd90775
 MISC metadata.xml 327 BLAKE2B 44a3d3f80ed251d0864c6aabb7192146c942a2bab99a4e643189eb74445c52a92fc153e4f198b591e628697df09774a2576cf5678a58774295c881eda04e33ad SHA512 bed8805eb922c213b73629ec8c430a7825ec1451edcd332fffeaef9b855b71b9e57e490775fe462ef2234ad9b534a23f19a373f0f2131d84ff2f965b8a2ed25a
diff --git a/media-gfx/scrot/scrot-0.8_p13-r1.ebuild b/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
index 2b78c1ec5980..b090cb21f603 100644
--- a/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
+++ b/media-gfx/scrot/scrot-0.8_p13-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=5
diff --git a/media-gfx/svg2rlg/Manifest b/media-gfx/svg2rlg/Manifest
index 2eacde524b35..850691e250e0 100644
--- a/media-gfx/svg2rlg/Manifest
+++ b/media-gfx/svg2rlg/Manifest
@@ -2,5 +2,5 @@ AUX svg2rlg-issue-3.patch 507 BLAKE2B 801eb095c1e383a0e75c4f79e11e8063ae94290c99
 AUX svg2rlg-issue-6.patch 1221 BLAKE2B c7440b817c14851b20d5a33712029bc3430a59b1376e0b7ca52d9aeed6a7c8e2cbb07e0c91b1342182e03c0646e86ef7d730062fe5539c4440094d4644675c47 SHA512 500b929de726cb728ea10f295c7e15845046d0d3d70067c2ef54cca1466f456cb682797ddf99e0ae62ec68ba125183900763e82a2889f8941b507490a197ed88
 AUX svg2rlg-issue-7.patch 473 BLAKE2B 625268097edb59bc3c71ad3ff486d293dbbcfb0789c2bd73c5848c4e0aab4ec6ba2f9e5a28b23aa12f141f92e893d4e779b871e2d5fd05960cb263d05b5bcf8b SHA512 42be68efd3aedb00d1461dfa99de7aebf9477a531a491676cc189a7299e206650df9a9bd51d27c3a2cf6e761f8892c5b61577eed1b232f5109374df32329d3e4
 DIST svg2rlg-0.3.tar.gz 490908 BLAKE2B a3383326d1d503965f93ff3b7b9f144835d5c7ba1613b0bf215ce31cc968eee76c826a170f62a5c4f173c8326dbe4a9f47a9f6f1a1345d2ed9ffd5350077e2e9 SHA512 44efebe7d978a46ab26b4bc332ad08db9236a86b160d73fc1fdc2b54c44bb2604147ae458eea1fe81c579c7f94e39869459567a6b6b3a551d6db6132816c4723
-EBUILD svg2rlg-0.3.ebuild 814 BLAKE2B 7b5f1f94ff80af1415271c5c7207d73f7f0781437bc9ed62e328f0ae3c10acca5e6eadf74da57ac94a37d17eaa41ed45e4dfffeb54174648f7bdf88941ea2683 SHA512 b63a5d954f90f890f4849143fb29982afdf048eb2b6ea1c20bdf1645c1c2b10ccbc7edcc83b089dc067f06026f1f284632b1b426a21331d5b9e22726acf33349
+EBUILD svg2rlg-0.3.ebuild 811 BLAKE2B dc07917f18d2d41d4c48ba35a06cdeec63258726a28593eb25b6cff1ee3f610810a56802035a2514e35f5b7f03c19d2fe92a42ecbb464707267e2a109f7ba105 SHA512 1c96dc3207c1bed148f117caf95432220b585105e401a23ee0dd8238e20aa6520ed018d1ed607d215657e350ad47ed438521d6b74acd73081d20f72d5d9ee2e6
 MISC metadata.xml 363 BLAKE2B bab52a0cc6fbf81e6993b0ce74a89882a692bd008f0b193b3f30a665cbb8e6f6741f594bc6297a606c125bf2751c189142d500264e5d909b3715716c113b5ec9 SHA512 ab6cf1b5b4bb40fc26b110c6d34ea4d21e80c127549cb43cf262a43f771113494ef357c811d70523c07a3b9da0e3137a524364c997da4f3f25e9cddbdc125813
diff --git a/media-gfx/svg2rlg/svg2rlg-0.3.ebuild b/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
index 5311c580e812..18207130fde4 100644
--- a/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
+++ b/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest
index c8c0ddf38f80..393a1598d75c 100644
--- a/media-gfx/xfig/Manifest
+++ b/media-gfx/xfig/Manifest
@@ -2,5 +2,5 @@ AUX xfig-3.2.6a-app-defaults.patch 502 BLAKE2B e7277af104c8fd9ed652e2ec6b1753761
 AUX xfig-3.2.6a-solaris.patch 523 BLAKE2B eeae0cc11ae6e3fd6e8c157648d8663131d0d11b020f5e64ec1a324f05ee5bd08be8c111c1ebe34065256d64d103619f61ff3f5524aa7636eb8f76e9aa64a714 SHA512 b2eb546b8fdd0d18bab3d9a2c183149fdb4fb278d5e2d8234f040c4fef727bec7461f861391027dea32028b822aa2e540824cb18af09769f32c7a1fb7bf48319
 AUX xfig-3.2.6a-urwfonts.patch 4933 BLAKE2B eb1edf6b30966864dbdf3e932f2cde231ff5777cdc0dff34cf047a169335ba78e493b10817e39aac72221d17d491138c3c28a3b293582d3808255140d5df6762 SHA512 29fea111b6c07f6ea28bc46259c0dc8d20b1bbf86e33d550037744b93d4f4de7ec9c4ea7fa14c5f91a4278848216d183ac841970c798140359e1fc317baac468
 DIST xfig-full-3.2.6a.tar.xz 5502944 BLAKE2B 3a83feeb5647ffa9586b9ce40116e9854a423c0cc90265ad78b27c0c82a15bbda9d9734475aba13f442c259cd0489a667242f319ac758ddbfea1a5b268e12550 SHA512 82e292e050213b6d22be5e174224308b446505e25208f29d4f4c5e760a87ff4104b9dcea0a332241c9bca358e1d44336bb38c316eb3f28130d7c8828c10a805f
-EBUILD xfig-3.2.6a-r1.ebuild 1170 BLAKE2B 6650a07387146c64c767dbfed06920fc19c015e9ca782db73e47ed80d675e265ae79d2d86dc1a30eb6992a0688cfb94096bcaf156b5252c74336baca46c7efec SHA512 4fa2696a017d98dc4b1217d8c19514fb7dcd0828b48ab17ea326ee19d67c91ecc04c14d17165cceb51c9f903ed5dfe6af2e78879fe3c18096a156bda48478506
+EBUILD xfig-3.2.6a-r1.ebuild 1167 BLAKE2B faae7a014a92a9ed4d0177912cb4eef8d70ef841c6421656fc0986261d5bde417dadfd359adf22e58b897bad45626c0c920092a64a55bba2980723f35641890a SHA512 022d02e0ebddf9375d356235af091134f4b6533bd4b5c0bfb7919d0c686290bb112ef6881febb1e34847789df579ad64bbc4452b08ebaffa1eaf61cffa2b529c
 MISC metadata.xml 238 BLAKE2B 60ff9cbe893ace8f33a3d44ee85a5c73c9bd5553478173bf92c4aa93398ae1140ba28673eb6c7373ac48ede6679546b57ea08b8e676ce5c7a47792a2ba8b3148 SHA512 65918555949ddfef068a9a197dffda69aee483ac55c1b52dcf19376aecf1cb53d8a3fc0931d4ebdbe64ba3341e2a2567d56c2830eb31e6746735449c53a1203c
diff --git a/media-gfx/xfig/xfig-3.2.6a-r1.ebuild b/media-gfx/xfig/xfig-3.2.6a-r1.ebuild
index 966b2c0e6ae4..8ce2049866c2 100644
--- a/media-gfx/xfig/xfig-3.2.6a-r1.ebuild
+++ b/media-gfx/xfig/xfig-3.2.6a-r1.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=6
diff --git a/media-gfx/xli/Manifest b/media-gfx/xli/Manifest
index 7d229527c9bc..b2addc09f645 100644
--- a/media-gfx/xli/Manifest
+++ b/media-gfx/xli/Manifest
@@ -3,5 +3,5 @@ AUX xli-1.17.0-fix-scale-zoom.patch 1942 BLAKE2B fefbcbec8d9dba30fc1435fc998e371
 AUX xli-1.17.0-libpng14.patch 241 BLAKE2B c4894ae4a5b879d8ac961d064da80d1518d0ed9a47946c21f9a701b89361e94f0d4d2b05926f6c14be4a558707601e84352bb689847a1f01d83cae6eb25c9d02 SHA512 e5a2de3525198d323ae6c89ab9b0455559761cd4f6b86b719934bc77e31582cd557090766875d97512cb60a42e88653f5dc204dffa9ae1370695c73bfc2231b1
 AUX xli-security-gentoo.diff 6940 BLAKE2B 907fd85a2b248083380ae2210665dd9c251a7d528a93b1e2dffd149827f4900cab54b84b8a0be67c198a73d180cf31f4c8cdd7c4a37a3a8c5b30718babd5b1bf SHA512 b992219eb4b89bfee57429afbf67be6d6a04051b50de6e814c84c1adb209494d2faff15a228b43a992530fbeac83f15a94e9c1988982f98eabf287c26716671e
 DIST xli-2005-02-27.tar.gz 201011 BLAKE2B c16f40368a7c55cb7d31777662e4e9c1515232904df4f6f0e7fdc4daf44fdafaa0a3d9d8298493dac9352fa10eaf5d2984f9e66832ca0bfd07d9e6d551f4dca5 SHA512 132b28396ebf3832dc35ff5fa7c102539ef30a194512fe6577ce1432bb84ecd7b4368e75eaf59f26a806900f63e1bfb9a93487ce1ebe3cfef2199256a783ccf7
-EBUILD xli-1.17.0-r5.ebuild 1941 BLAKE2B 896578dbe61887f2e40508ca0bbd8986bcb117ab50d655168bdf9cb29e0a33c4aef1373e5d72c1c47fb62d40fa8166fc7b1cd985c583a2909199534a3801de55 SHA512 aecab753b6982f704e47fcddfffee8a59c1fd6475343df7e635528b7853c8373de4149ad07095dacaf90919a8fe215af94429e00196d4aa14429968c9c22be9b
+EBUILD xli-1.17.0-r5.ebuild 1954 BLAKE2B b53199a09d313287ef5c7cf3bfc75ec2c82d344dc25dcba959046aae80df9ff143024b4fd9dff81760679281f9c65730fb07433c2b41b59af411195c8d731613 SHA512 ba5222a82eaca28307a9e296feeaa526a4b3a5bad9346629ce61e01ca536af74185d74a7881c76d045f0a38b5c9304102395df6e95550c6d4fcf31cde50ea0b7
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/xli/xli-1.17.0-r5.ebuild b/media-gfx/xli/xli-1.17.0-r5.ebuild
index d153dd215fc0..88a1b694c474 100644
--- a/media-gfx/xli/xli-1.17.0-r5.ebuild
+++ b/media-gfx/xli/xli-1.17.0-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 SNAPSHOT="2005-02-27"
 DESCRIPTION="X Load Image: view images or load them to root window"
diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest
index 870f69542a59..4e85f07d26c1 100644
--- a/media-gfx/xloadimage/Manifest
+++ b/media-gfx/xloadimage/Manifest
@@ -8,5 +8,5 @@ AUX xloadimage-4.1-zio-shell-meta-char.diff 1372 BLAKE2B 1c960ba7ae4da62eedcdfc2
 AUX xloadimage-gentoo.patch 8956 BLAKE2B 9834cb47e16fb20f970e9d33a6e42fef09d5a3d3cae3f5ab0db5c76661acb7c67a20115f4069bc2769b6d9f54acf4adea27e27b79495d74a77644db5281beba8 SHA512 8eba3107d81f0dc6caf749e9a9889f1662e5d1004e480a9a170533f3ee00c6f9f11d3c2008655322242ab61f31b676406fd44b97d83e4ce93b8f68a12397830b
 DIST xloadimage-4.1-gentoo-r1.diff.bz2 41535 BLAKE2B 77cdbb2e6d5dda6084aae2831bcb8750a027f59a673f5a1f8eeb61385bd21243d640bd13a3be7fb24d2ce2cb475a05cb04c91c2b53977c61fb3aa4416e67e112 SHA512 a1a52d576eb68c44e5ff3b68a6bd87cd9b8f21f6fa8edee2d7df2329002d40f6513df6c04ecd57f66018583d0251019bd02e15756dac705b8c9cb8470cb386e3
 DIST xloadimage.4.1.tar.gz 596021 BLAKE2B 3c22facf05167d1836c21243799d8f66c211e44d659b4397668ed604cdd82b3bd8f11ab7b3be5e87c59a9b3aa8569d0d3d2e474b572c3bca07b6437b293014bf SHA512 2c91699c8ef07c101ff9b458708ace01cab2979a5e88cf8a4e47ec971f7b4cb5571108afa3e53271ade4e8ccfdcf72ef9e2e09edfc0be6b8afaba50847aa0586
-EBUILD xloadimage-4.1-r12.ebuild 2506 BLAKE2B 32a0b1fdb8cc2d36074e7bc6c7b24a205be29bb5b0aa1584153b0837cebe21acadd726c32cb604ec6283ba7f3c6ea06ee23faa758da7feead1ec7e21606f1ee4 SHA512 5087541ae281a963ed730cfbd37043a989612ba80a5354feced496a3b8b86e5154bf779ff1f099986d4fc73a688879db99a5088a4c17fb8445576faeaa4205b6
+EBUILD xloadimage-4.1-r12.ebuild 2506 BLAKE2B 128b3b05785c8f4b48acc60de606d9d6915599cc97c1a96c315a5c372c52172fe700cebb00ff3c7355a20f2b6345d28dbf27620f89f85bb6043d9eec2fce71b9 SHA512 1b89f05188dd9c63adec3e98cf68a9932de5a746f4fbf6dc4fbae430d737fde16cebd39118a5c239d510452e2143c569d0cb0528b62fa03f0b22bce1fb83c86a
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
index ffa69a2a5c03..3e16fb47f0c8 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/media-gfx/xsane/Manifest b/media-gfx/xsane/Manifest
index 41255621d128..c72269f2fbee 100644
--- a/media-gfx/xsane/Manifest
+++ b/media-gfx/xsane/Manifest
@@ -2,5 +2,5 @@ AUX xsane-0.999-lcms2.patch 11790 BLAKE2B 0fd549512d56635e9a41620ba097d4db8f103b
 DIST xsane-0.998-patches-2.tar.xz 54804 BLAKE2B d5eb339f5d5d9eb61d213ca37e31e8b36df03f271f86a0c5f924286b39c9d2f47416512243ff3ad07e2f9d0ac4e3f0a73346ced1ce74ac17dbb0c9aaf6ae3c89 SHA512 973ccac2fe3b6089049c1c5ba3e4cb0db29fdc79de372f8a7b461ee108e5bfc3f4a84997552fc3d3b651bbe9f98d247a5974d90e8949089b2ea52118eab6ad1f
 DIST xsane-0.999.tar.gz 2950621 BLAKE2B a8490981b7da497934f0334874fb65d2d3f2a7d9153825544672a39780bd8c4bfabee6bda134bd7b37b07947d1f01f283fb7242552b0e6342cab5a70484a5488 SHA512 73ec961fce1a86b5d6f5bac0995d222785eb4b077dc8e72492b092d2bf4500455426e80e4d27233721cd38ec84f77fb9f92190a6afe45bdaf7ffd1ee50b431ed
 DIST xsane-256x256.png 18478 BLAKE2B 5661d68fab2c5f7219f0de9e2c2c811ef5fba6f5472e85d98f6f3a10bb058c1d26597d15c2aa8ab59c52060a62b571aafc2daafcef4bb8edd0445cf875ec0ca3 SHA512 7bd63a701a4776b395689799ad98b7619917a9b40367c980bebaa116e6c5c2bfeffb8b996a8295b07f3483aa689c9040d8a68bb21376af65b1c0e8f69294f2e5
-EBUILD xsane-0.999-r2.ebuild 2209 BLAKE2B 3d2486694c28003b228d2d101e948e4203b040728a6b3e850ff97b6813ffa8c540b2964d9fc170e7164f2ad8ef963494362f3fa7f858f6626bd86f2e8916b3e5 SHA512 aa5ee7d5223203f811d3cdfeab93268f9c5871d467e5e1dc052450a4d34a3480c96c19ee09adb245a85c21dbd413195f4b946f3de6110eb11e45120cf12ddcf0
+EBUILD xsane-0.999-r2.ebuild 2209 BLAKE2B e87b97733e6d5a6670334901b08dcba2aec60abb479b96b02af0344e4b74c0b3659bb546cae84f13896d3762997bf93b42853a8382e6bea76d123401a90dd905 SHA512 90b876433b8b3aa2f4d5190ee2d8de527105c3184d7a90110308a1db694a6836c5f487ea8bc5997f1b6af543c81382071c3d81fd8d59dab4d433961737900b46
 MISC metadata.xml 500 BLAKE2B 9eec3d7fa81661bc2035035649e602539db5c45451576a452562a9980811424e93999d34cdb64a0eb8fabf7c4408bc47d402654abb53d26b0e4779c8c501b318 SHA512 1f304a2fd92fe512a70e104c02fb72c9518e4f9e6eed795aa6462eb06a26f314673b9964b8c576a07f11e64eea0031ad607070bc1c167d5058d5ef34f867e383
diff --git a/media-gfx/xsane/xsane-0.999-r2.ebuild b/media-gfx/xsane/xsane-0.999-r2.ebuild
index b49b303796f0..9c0f60ec0b39 100644
--- a/media-gfx/xsane/xsane-0.999-r2.ebuild
+++ b/media-gfx/xsane/xsane-0.999-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
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index 41ec1e7e05f3..4eced860ea74 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -8,5 +8,5 @@ AUX xv-3.10a-wformat-security.patch 519 BLAKE2B 7b0ba8ee6dc33af787040e72fdfd4cf1
 DIST xv-3.10a-jumbo-patches-20070520.tar.gz 1363802 BLAKE2B 1a9f77b950dfa817aa861d9b2b6898d6e378b4a61a57c746a8822793a8e11e54165faf859e073ef99c9fbea5aa0c4c8caa4608ef03f553003b779a4bf59c3ab6 SHA512 e2ac5a3b4d743bf142c162b00815dd9d8dcaf345d0649016b2c6441fe2329879471b19453808e677c1a0b8eeb3468295dba160b1f30eacb2a7a9d8524ce03e75
 DIST xv-3.10a.png.bz2 3082 BLAKE2B 05f56053fc0a77bba155db306ae181f5404bced3b2c22a33b3a0a0750b84461ffec98934d3dbabd764fbb6ec95ce2851f4cf3959682a315fe6e6653cbaaa5ae4 SHA512 41e81c34e74a034292c2a8f525d1452614a2b42e980a1a2c93e3fcf990db528853d633496815e5fb2c897a780a2da171af590f436e2c7ef181eea00eb6922e9b
 DIST xv-3.10a.tar.gz 2259124 BLAKE2B 42cea578a879c819be8f42ffb1d247643904d8b462a4d6faa208185e49566798605c89006cbc190725fa6356b87da3375cf04d2ba86b559419cf8f7471c867e5 SHA512 5b8c5890503e2796638921cabae8967e458c73e332acea8561b1025ed13c771bc44c0e309b4592852e33726eeaa9784f933d1312073b0ba2e0b8c0cedabcaa3f
-EBUILD xv-3.10a-r19.ebuild 2435 BLAKE2B 7992a0e09a88e9e00d7d206508b537c4df3b48b7d1baa00d1ebc75bdae5c9d11801420f64030b5d9e099a39734566cf0b05f43b2cc95fa3bb397fbc830c9da3d SHA512 5a85bdfa54a0e6adb1f7d385b23e6d5f5e053a1f4bcdd2d758ea2613d5bc031e26f189439612c683c8980f22389c40599fc504af77273a013c78f014d6c8e0c5
+EBUILD xv-3.10a-r19.ebuild 2451 BLAKE2B de03f257e6112992dfab5d674cbf7cc36f7d6e0d4a1f163a4a61e5899542c000c800503874eae6e172675cf668ce7273915d47fe0d62d99d3f586cee36d1b68f SHA512 d3c7f887dad97078ed92da87157b95ad68782e228128fcf6a253896959c0bbdc3ebb1ca5935530bb9a0a43243ec31fd1bcbde62ab81706e4e4abdf213545f028
 MISC metadata.xml 249 BLAKE2B a10cceeac3a30f80ec870c8976e45bd2e0326e472b03cdfbe85b639f95dc7cdc8f372e5efafa5c9c8e679e77a24d5507f3a8f0dc97f2207252e280b3bb936662 SHA512 2250a3bff9eebe0962c70d89aed4f7e95dd3d33b5c3171f02bcf99d972d5242ec04b25d73b3ffd99ce96a641cf8eb78befb41941a352f4ff754702712b4e937d
diff --git a/media-gfx/xv/xv-3.10a-r19.ebuild b/media-gfx/xv/xv-3.10a-r19.ebuild
index 2970c8c06095..c8c707abb0cd 100644
--- a/media-gfx/xv/xv-3.10a-r19.ebuild
+++ b/media-gfx/xv/xv-3.10a-r19.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic toolchain-funcs
 
 JUMBOV=20070520
 DESCRIPTION="Interactive image manipulation program supporting a wide variety of formats"
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-17 01:16:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-17 01:16:38 +0000
commit	53cba99042fa967e2a93da9f8db806fe2d035543 (patch)
tree	9780d3b87dfc6bdebc6b7b7d15af1ecb813c6853 /media-gfx
parent	71deace00d1a2b091313fe137ab7092418c6f87c (diff)