gentoo resync : 15.12.2019

187 files changed, 1241 insertions, 2757 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index e8cb86c97a4d..e2f0edcbc732 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index b7a52f527c11..7bf73a696c4a 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -13,6 +13,6 @@ AUX alembic-1.7.9-prman.patch 822 BLAKE2B ed5faf9b8e4eb165b82a5001b129403ce0afcb
 AUX alembic-FindIlmBase-pkgconfig.patch 971 BLAKE2B 946766bceb152a1673737af5158be9f5efce812a70adfe36bf5642f150d2576f14c22670cc1bbf9027834c69ac661ca30d27f06f9fbf73f656dd883ce38a381f SHA512 4f5fa5a33c8fb4edcb3c0a5d0290a912015c0e02ecd6340e5dced1f658302034148a1050aee1dcbf3d7d89f11c5e9ea07637c659414951152dd49081c70560c7
 DIST alembic-1.7.11.tar.gz 826833 BLAKE2B ea2ee92cefcc92d3658b8c71351ec0f72bd1fb5d5b6c771ceebe81b1db61a280420f480cd3612f44bc134cccb388954be89baba9dc6e5973e102bc55d65cd974 SHA512 94b9c218a2fe6e2e24205aff4a2f6bab784851c2aa15592fb60ea91f0e8038b0c0656a118f3a5cba0d3de8917dd90b74d0e2d1c4ac034b9ee3f5d0741d9f6b70
 DIST alembic-1.7.9.tar.gz 813379 BLAKE2B 599edeb5ad805656755b3e150fba56182d1d60673951b0c1702b3e3e82d9499ec4fcb938303103c27f84458f61ab8de4b872eaa322380ae7713e3b4cd3831af7 SHA512 8025c20525ffbd5bdc9dd5a33ad8238e49f063d244ab9d112e7d1ddb7ee7cf9b36ceb74cb45d658ce22d3033552c89bddf6b818cf466ea46aa1a70a41fdeddb2
-EBUILD alembic-1.7.11.ebuild 3119 BLAKE2B 040244248ec857db60a11694161671343e2f0bf407bfd40a0fa8505199ce24b6b3829b95f9f2147b24b898531c4b37ba2c676bc5b42573208d9f552fc446e3d8 SHA512 cf22b4742a8f52713713043cb9327b56ede8f41e79392dc07c601db2d7fbf310908bbbc7f8f6893de9374ccfcaa95baa9f458db437e7ba4c93e8e97f9528696b
-EBUILD alembic-1.7.9.ebuild 3015 BLAKE2B dd6e430c4b1d11e7bcab88de6ee6c5bb2c6bb176ec700c59448c31477069fc42dda77fee34694ff983c25bec7854b3adaa7c1b120b61648e4f41b0d6d41e40aa SHA512 6ed134efe406b41b3187f33edbc092076cff7f42eabb110d5bd9f0191f984a040ce86e5ccd0ab4f9bcaa7ea86de58b4002424684f9f68bd5600bc511dbdfba7f
+EBUILD alembic-1.7.11.ebuild 3146 BLAKE2B b10879c542287839d80356ea5890eb6e16b28a66208812ff9bd3984218dd0bf06cca58f30b807d20634b30efa06e12befd135694bf0e4684b2bef83b0a1b6236 SHA512 2ef89d05137cc421563bb381ebacf56b967d207d2b742154c1c60d45ad3d23ac8d538947d1d7f07d41d933fd5253f5fdaf39f11344b9203522e25289424c04c1
+EBUILD alembic-1.7.9.ebuild 3042 BLAKE2B 34e36d9afba3d755b7bb9b93d3c05752cb59b1e9243e8c65400b8ed720ae0d506611508ca4b77bbc6f6d9454f658781351da5f3da3f65ddeac703aeb20de741a SHA512 9432e74649534ae0ce54a8879168b1ae2fac5f33b082fd01c164b42adcb9da93efcbd3e806e7ea226c5a432d380b763b23cb6bc012bbd18e20b77e19ed36c91a
 MISC metadata.xml 1343 BLAKE2B b0e902df8e5f04bcbe4e784abe396b926db2de2347560181ab77ee60da7cec55ab10aafda38623109681240992b8b43208fc65fe72fc8dd66cf6ebf09defc085 SHA512 af9abd189b8c15b53b60b818a7ce419b812092ba1725ebfa4d3267c5d2f67018c7f3cc06bc24fe9af614fb420b4f8176585a53920378521779c4ca52c39c22cc
diff --git a/media-gfx/alembic/alembic-1.7.11.ebuild b/media-gfx/alembic/alembic-1.7.11.ebuild
index f23a45282d8c..a306c9ea3d73 100644
--- a/media-gfx/alembic/alembic-1.7.11.ebuild
+++ b/media-gfx/alembic/alembic-1.7.11.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="arnold +boost doc examples hdf5 maya prman python test zlib"
+RESTRICT="!test? ( test )"
 
 # pyalembic python bindings need boost
 REQUIRED_USE="
diff --git a/media-gfx/alembic/alembic-1.7.9.ebuild b/media-gfx/alembic/alembic-1.7.9.ebuild
index a6eebf37327a..7acd86b893c6 100644
--- a/media-gfx/alembic/alembic-1.7.9.ebuild
+++ b/media-gfx/alembic/alembic-1.7.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="arnold +boost doc examples hdf5 maya prman python test zlib"
+RESTRICT="!test? ( test )"
 
 # pyalembic python bindings need boost
 REQUIRED_USE="
diff --git a/media-gfx/aoi/Manifest b/media-gfx/aoi/Manifest
deleted file mode 100644
index e15b063a63e2..000000000000
--- a/media-gfx/aoi/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST aoi25.zip 4529346 BLAKE2B 8de066ab70d2223d7721c3f7b0454e1873a96479d7bb7b9572789e74411ca7806c7156475775cc190a9e75d360ad363639a45f8b1681ee5195e3a4d5eafc4446 SHA512 3374c687426c2b62fa5fbf5f8440f2b3f299972968376e262f06da0eddf420876cf3f9f3c817c0ab7fc1f2f2804dee918752364f7fbff61e417042f4c868a524
-DIST aoi272.zip 4733701 BLAKE2B 781479fbc2778b25c35158f11d7f3eac7af29ab6014e976b431d871916bc18f6de4dd6d07557d3d5b25c8b12ce6537764d89bc6a12540339e1cf7b76f9b34143 SHA512 8dadbc23e795700b625d83f00bf15b79a923ed083de63e0f18579706baa8af9c3cbad3c08e0e7e5156190e257941f2499a3a49259295a52c586a54f19e4af182
-DIST manual2.3.zip 11511867 BLAKE2B 1b670bbe889c9425804e897cd27c0b57ba9a342926090db33c91da84ce355cb53baf22d56d7212bf74324d6fae3fc24aa931922cc4895609d94616488febf8bc SHA512 b8d11eba570f854d621622a6ef30e26194913b2069c4cd5bc00090521120dc9d1c20d4dae4ef8cf900dbaf9ef94f7afc2d88dc88c4dc6e2e0064db08e2567366
-DIST manual2.6.zip 13402007 BLAKE2B 69b5a0c7259add32849db3cbefdb083810389626459211f23de0bab4820db49a291438ecf2bf2bc28197465f0bc110a02aeddebba2000b0efb796da9ba85faa3 SHA512 ef8d1bce3cbd1f8f5a7f55f5d296f4cd3694af8aafc88579f3c514104ae2ded4f0c1bbe8379dfc91a865042ce459b336b4630718f6b293216d9577b3eb5765f1
-EBUILD aoi-2.5.ebuild 1089 BLAKE2B e7b68e30f086e913af76a46fcc7b5c7a2542a91039a7bc6402534ab5a7c1201f712610f2342bb3301cec50bc695a01b6d0cf870d61be45b1f87f2c56e16609d6 SHA512 0c989687d5f356b961072bb5b6fa7aa6a3fb240ee1ac29abe6e5f78115b949c44328e21449a1c8b9d1e083087115872c8cae42b8c989604f2071ce3aa6c542dd
-EBUILD aoi-2.7.2.ebuild 1150 BLAKE2B 7e0972893c947622bf8ff0a331368e50a5cb6928c9336b093395d23d16b01f3dd5fcd7e9c012121f4de2adcb9f09ec903e8cd69409c028ca2afaf66ac286f675 SHA512 763697775e87cdf54924924573fa7c782906fce2ef6a28b24ac310632aa89b2feeb137a783763899a0abfcd149ac893a96ea8c2b10957ac6caba504cc28d7c60
-MISC metadata.xml 332 BLAKE2B b9ff097d9219667ec524d86bc1e294b8a9f46ed9489d75942f35670a41d0e9ab5fb685beb826717242137a76f4ddc259740a3888de463b2d62ce51b201e24500 SHA512 794201c962be68e01de8bfb5ce9312702bccf64100de79f3d778237334d0a1099b0469cd892707b9d5f2a4c236dd9e4b49eadbfb7867cec550b779de40d0d742
diff --git a/media-gfx/aoi/aoi-2.5.ebuild b/media-gfx/aoi/aoi-2.5.ebuild
deleted file mode 100644
index 06c64af08dd5..000000000000
--- a/media-gfx/aoi/aoi-2.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit java-pkg-2 eutils
-
-MY_P="aoi25"
-MY_MANUAL_V="2.3"
-S="${WORKDIR}/ArtOfIllusion25"
-DESCRIPTION="A free, open-source 3D modelling and rendering studio"
-SRC_URI="mirror://sourceforge/aoi/${MY_P}.zip
-	doc? ( mirror://sourceforge/aoi/manual${MY_MANUAL_V}.zip )"
-HOMEPAGE="http://aoi.sourceforge.net/index"
-KEYWORDS="~amd64 x86"
-LICENSE="GPL-2"
-SLOT="0"
-DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
-IUSE="doc"
-
-src_install() {
-	# documentation
-	dodoc HISTORY README
-	if use doc ; then
-		mv "${WORKDIR}"/AoI\ Manual/ "${WORKDIR}"/aoi_manual
-		dohtml -r "${WORKDIR}"/aoi_manual/
-	fi
-
-	# main app
-	java-pkg_dojar ArtOfIllusion.jar
-
-	# run script
-	java-pkg_dolauncher aoi \
-		--jar ArtOfIllusion.jar \
-		--java_args -Xmx128M
-
-	# plugins
-	mv Plugins "${D}"/usr/share/${PN}/lib
-
-	# scripts
-	mv Scripts "${D}"/usr/share/${PN}/lib
-
-	# icon
-	mv Icons/64x64.png Icons/aoi.png
-	doicon Icons/aoi.png
-
-	# desktop entry
-	make_desktop_entry aoi "Art of Illusion" aoi "Graphics"
-}
diff --git a/media-gfx/aoi/aoi-2.7.2.ebuild b/media-gfx/aoi/aoi-2.7.2.ebuild
deleted file mode 100644
index df3e0a207a32..000000000000
--- a/media-gfx/aoi/aoi-2.7.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit java-pkg-2 eutils versionator
-
-MY_V=$(delete_all_version_separators)
-MY_P="aoi${MY_V}"
-MY_MANUAL_V="2.6"
-S="${WORKDIR}/ArtOfIllusion${MY_V}"
-DESCRIPTION="A free, open-source 3D modelling and rendering studio"
-SRC_URI="mirror://sourceforge/aoi/${MY_P}.zip
-	doc? ( mirror://sourceforge/aoi/manual${MY_MANUAL_V}.zip )"
-HOMEPAGE="http://aoi.sourceforge.net/index"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.5"
-IUSE="doc"
-
-src_install() {
-	# documentation
-	dodoc HISTORY README
-	if use doc ; then
-		mv "${WORKDIR}"/AoI\ Manual/ "${WORKDIR}"/aoi_manual
-		dohtml -r "${WORKDIR}"/aoi_manual/
-	fi
-
-	# main app
-	java-pkg_dojar ArtOfIllusion.jar
-
-	# run script
-	java-pkg_dolauncher aoi \
-		--jar ArtOfIllusion.jar \
-		--java_args -Xmx128M
-
-	# plugins
-	mv Plugins "${D}"/usr/share/${PN}/lib
-
-	# scripts
-	mv Scripts "${D}"/usr/share/${PN}/lib
-
-	# icon
-	mv Icons/64x64.png Icons/aoi.png
-	doicon Icons/aoi.png
-
-	# desktop entry
-	make_desktop_entry aoi "Art of Illusion" aoi "Graphics"
-}
diff --git a/media-gfx/aoi/metadata.xml b/media-gfx/aoi/metadata.xml
deleted file mode 100644
index b75d613c6085..000000000000
--- a/media-gfx/aoi/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">aoi</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index c426f2124028..02be1684148f 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -4,24 +4,14 @@ AUX asymptote-2.41-configure-ac.patch 475 BLAKE2B fbc6e09ab9bfba21bd0deb6cf12514
 AUX asymptote-2.41-info.patch 436 BLAKE2B 71987cc6fa4df197bed0dca7d4df27058ce28732cf8aea6a58f9bbd83e378757569bc39aa6fe0ff14f5dfbf7044e4f4ad27014814c318bb7a4993f9aafac761e SHA512 7d3ae35b2eb2b226ae3b7326d2e7d50524402d49be90303035a2872b5a109bb104f53376b9da681cc8d6922ddadec6a606540842745109edd3b55ce50725a6fb
 AUX asymptote-2.41-perl-5.26.patch 400 BLAKE2B 68d346f18f4021ac486dc06dd9dde7e118acb3050284e5aac8a5ef33baaed43a06bacbaaa0a75b0a49a7b8d03f7af65c8daf759d7a9e13b152ad6f7946a7a5df SHA512 bb333f4f42063be1c4a19d4cfd4209ac7b7d3c4318a5c3634581d63af2183cc27918b80e47148b1cbc256049b38cb85982ef7e00f7f021be3e714adabf15c87b
 AUX asymptote-2.41-xdg-utils.patch 744 BLAKE2B 9e36f5f04c7be761abb026fd894417ff5b7a90f46d2af14392d5a9e6fa6e666703892379954dd45044953519f59a235858b3ca91a84c9056d147591544bca09e SHA512 370fb078d926185ab7e10cbbc8afc4bfe0829e682fe89729a5d41bb3bda5dda96711f1fdcb99b9da69606563ce120383e5a1211372f3d8dd54ea3ddfc0838d7f
-AUX asymptote-2.47-configure-ac.patch 475 BLAKE2B d47a0b93bc890f2bbe528458768f1ea66745d8f3341b8870a155fb066fecdc224bdfb8fde78bdb00f671ee11f2222c43d83d79dfd32b47cc8cc26a61fac223bc SHA512 20a3b965aa892f70de432cd201025bea61e1635767b43a890e0c40d3098f982b2c6de663b613b5fac0ceb6c2392935df85f590716f7d92beb0880d0250e28a0e
-AUX asymptote-2.47-info.patch 436 BLAKE2B bb74a841ea91483fb46845d6f5fe7a5ff98d6b890632fd1bc6fdb24a182aed1a7ba531f8ad472201b1b6e898985ca3981f3a3ad6eea312059081188077fb9082 SHA512 df36a1a7987538ec93acdb99513da5bd45835137b0e82b17a686daf1821a4111b24400fb090d79de9d477930a6258b91af526bf653e8ca8cf5c7e88969f253d3
-AUX asymptote-2.47-xdg-utils.patch 727 BLAKE2B e49045dac05319382a1c1b649ce525d8bc806dbd4e9cf080103b4371025e57880d82b578c7e85f0f41c9b728ad29acce073629a5b04e4382897632c2ed18dbf8 SHA512 c30b8190f008730846364b4e97667053fc31308eac5173226617d7f1d41f828ebb8f9307012be9eab7dfa99163aa00d5c0d7d49c3765740561acc9e90772208b
-AUX asymptote-2.48-configure-ac.patch 475 BLAKE2B 9794a455eef50cab9bf0bfe306adc39971f4255eaf2dae3357e16d3754d6b577cfd28efafc887a2a4ed22a9569f2e6211e74d61ee85b351690e4390f74ebf507 SHA512 10f60794c7fd79d1fd11cbec7afe0fdbd82ff62add1ed13c1089f24d896867a35b54f6e245dfa2c757193b8575cf582a92390fedba69331159fa9107fd3dc8c7
-AUX asymptote-2.48-info.patch 436 BLAKE2B 549c1dabc62651789889ae78d82dc59326982aa37e8903474a7023481f514a1c0632cd114c347b607ea08901c1f93e751e41d064d16e1dcd4bb8eeedb2a4d5d4 SHA512 f38f45e1148ddd97c231221995cdc04527ed711a60820a7b07ac30272ae3cade1a27786215064a1ca42055b5a3edbc49780b587e3f4d074a3eb2d9ee229cdba6
-AUX asymptote-2.48-xdg-utils.patch 727 BLAKE2B 0352df07cb5930daa71d3fdbf2fb6230b22d3423e06e596e4c92358ba5f84b473900c76c28a083ed583fed21ed644bbe43ec59e7e65ce91257d72ee5d31b794e SHA512 ea5d83b50973bb361e5ad3ad409c2fa0f634fb390a52d17d4a1915960dcff1a84a56e5a59e79cb2fcdd7a02dd7544ee7c58bade22e3c519641e94019bd1d3ffc
-AUX asymptote-2.49-info.patch 436 BLAKE2B bd620511b6c695bd30f91c2e2d3455f35ce328c769f075c862ef884021c44b2363b2dbe045487d7a1d362953782fcef4cc7aaad331e9479371193ef9dbd6facf SHA512 6dfca4a63df4d2735b7f957aa5f6c193a9f2ab81a8d45249d09903c454b2a95e3f480eadeb545d7adfe8efcebb80e4c59f7d240140f197190313272d6e7df57b
-AUX asymptote-2.49-xdg-utils.patch 727 BLAKE2B f2ba7a7cdded26eee90926b62a077be99e84e8ede15e3ffa8c923147c16316bcddff63970b4967d792035c253b4d300ea9139a55b0ad30562c1a6dd279b7ebdb SHA512 64eb6e626ad8a8dd96d9cac5e6ac0c798f317b1d3120bcaffcab4e6c4dff69b07c12108ab78812e54eae862f7946c75edb94dc3c3501996284ac98f54a6ded9d
 AUX asymptote-2.60-info.patch 436 BLAKE2B 7e0848a620289fc5c5913a8e09c7f19bf08fcc28533b3326045b5c09cbc116de74f5d18984d410834ab175d7b8d21de8b70f3dc45058da02e6eada0839382315 SHA512 d2ff074572997bf2eafd49c41ea730a1a87c3bf9e18968a129ba94e741f2d673eb27aabdb43ae706b0296d9cbf2f000fa46c4ad119629b070d4f51295f9cff5b
 AUX asymptote-2.60-xdg-utils.patch 752 BLAKE2B 1723819dea49747cb995df9d9beef9878cbbc0379bfeed75cf52e5bc1ccc1a536d088e6f01770330bef2d86156b2699f1a6c9aa1c7ce0655689226f99fc99dfd SHA512 0e82e39cf26e6ccbfab9d9410f5ee7ab7574744036208fb742c3e894db33fd7f2bbb85ccea5f04068d7658eef1eddafdb6d1a505a80a2f38121c47c77184f176
+AUX asymptote-2.61-info.patch 436 BLAKE2B 34787bb4afb276074a16bbf36bf31ed71a1fd213d96f6124f4552497901c6b315009b33da74dbd554806089ce2ca1a35d3efbb4ce6388e4e05339c4ed36ab688 SHA512 4ec89ac4ddd7eb1b4b1757453000b88f509323f20995631e82a2923cd275d4ba3f7ffabef8293da943ab2ecf406e20e239ef7d2c956d6c441b287ae79e34da20
+AUX asymptote-2.61-xdg-utils.patch 752 BLAKE2B e73ad1bdda49fe95f494815571b21c7987e256450885077b89bb1dc6e192fb0cb5389dcbc1864750f6a3b6bb2762056df3c3ccea01edc42ca8f5cb435d1fc4f8 SHA512 a967c529c9e487fea3fedc46cfde81347aca98e470f7bae17879f4ca7c661ea658e764dfb352c73dc0860e152d5a0969e4ced034e1bbbd59f78d495365ce5f70
 DIST asymptote-2.41.src.tgz 3516426 BLAKE2B d4623609be58566e32de82c5c47f635ed737459fa27cd2da0622d639cd8207fc69988a7ecbf82993b051435fbf223c1f1178d213aea258a2b57fd3a698eee9cb SHA512 93f737a44b085c2290c4553c765cf49679820e6623bc5b6d0229818409868876275d6f0571abeb76033955fa95ee594e37d10c9901c54755b085e36760fd96cb
-DIST asymptote-2.47.src.tgz 3621676 BLAKE2B 575032093276b9df6b8d74897a4721dd0d5419b3380bce7962afc9dcdd20ec3bd47b5c4b882f2276a2ac4c0d99e657d7385122d7dc400efbfb52ceec753ee8f4 SHA512 9efc4a70e8d29d6d50ba49c54c48da38beb00f64e5b39f23dbaec5cb12b714e427473fdffbf71f2d636a007cbfc993fa3237a8beab01e3419c1da1287823c159
-DIST asymptote-2.48.src.tgz 3729763 BLAKE2B 5820ddbbd27f6e7296501f50f25051d8417a0ab24d7c4c777013bf23601b5cbe34a69ba781e16e05141fda4e2e7a8bc527a41829f8d9e983aadc19bd05743122 SHA512 cd8b756185ae6627ea66bcaea224152f6644df633fe7ed40c1738f3b2ec31fbaa7ba97f2b1e290b073995779768ee3a264dd942f609b768cab7624d12807583d
-DIST asymptote-2.49.src.tgz 3730453 BLAKE2B b52c2fbac5ea9c6046f2bd2990c7f3792823ae0ecd749c58990bcee898b8af7d26c4b457bee6aa15fb11e3c63a7cdc6d7e4976418ee96fc4470a17f3202d79cd SHA512 08c20e45ab764281b480a97c5e2294cdfcc18b179cbdc85cf9956806b40fe305360d589077bd3ac429985503b0e7d17c889a37349d8c6fdf8ccbd8d822544226
 DIST asymptote-2.60.src.tgz 4650347 BLAKE2B d969e4716a2493ae926ea1f58d0b247986e49a6a1902fb94859a45177ece4f149f5875cf788eace1c27c968652c49b2ace7b98aba02380cf8e1e3d4231560476 SHA512 a0653b9647d8c2a77656ea82faf8b69d28a43cf5ac61cfa9c6c62e2c51b4939e83202b95056495d10bee86a81e48b765ed4604a4d882a47a36b1dd6d5f9ad96b
+DIST asymptote-2.61.src.tgz 4623504 BLAKE2B 8432f07ce21f630c5bdae609650c0bb2bcd237a121df68030dc19d1cae986f0bfa56dd0e241570809f9fcb202440e8b9b3c6d47a22eeaabe3eb9523360a166ca SHA512 34bb610360b4536da70ca9edf1e069ebbf0c9225948b92b3d59ea25e8684587364fa7bbb03909ba02617e6ee81d41a2e530c9ed639141e4cda42096143cab5f7
 EBUILD asymptote-2.41-r1.ebuild 4699 BLAKE2B 59a57de3618882d0d6068980358ad0a6477eee4359e9284051a94d3a045a8853292f21cf299869035ca329120fea658494f8189e9871c1fd5af45959d7f520c8 SHA512 08918fb1af35f5d3729257fc274ef19c8c37518c65b3dbe5833c0039fa8b751bb86613a4c7b93f48d78e695195645c5623f940a91505a4ba8fc21e272d769448
-EBUILD asymptote-2.47.ebuild 4642 BLAKE2B 2a1074a1e15004e007aa5677d1b28f4691a34437a2b2ad00aa7bb3274e0c074436011f0fe61f18fa04ccf75ebc8f639a226249304ed9cc281fbeb9448ad4ea72 SHA512 673eae19940ac799f9e997c7c199b84aa0daea590ceddf92d580bad25dc74506e4890901ec86f5cf1c4160f26243f31455cd686717d9b91d63381b0c501f9dc3
-EBUILD asymptote-2.48-r1.ebuild 4688 BLAKE2B a7ee10f84a9d9e1288813f986ca555f9ab597b1849a87cf89e8ed267bc57db2ecb13ae19c29db62884b6a1841d8b0f2ca111bc18a21af194d57c176033bf3ad3 SHA512 b2484d43cdc0a9d70cbf4bbdf137059e2330c86d625b2c02b50254dff966a39762f53e83e63dda5e76d2d2ecca33d4dc5dab667baa450314beeb4d77ad304800
-EBUILD asymptote-2.49.ebuild 4629 BLAKE2B 374f0d52308a20a93dd2d87ef49d6a1b3df60a41f8581277611905d4521a1b137b4fd45fbaa4f9cd0c45f52bc1d777d0c1db4dcbac986d4c0dae939056de4fb5 SHA512 74f2ca8df36bcdc97ad7ad1127e714839830d4b812bfae2dc125b59b7a26f4dbaa0cd406d20c71327363a41d305e6d5a15caa274d94ed0aa505cbd73da848bee
 EBUILD asymptote-2.60.ebuild 4560 BLAKE2B e051d01f655a987b8d95a7e8ecaeb531504d2294a3f1c896e4a8956f4df2efec3e1f48d2d9016b308e50dc3737a1b8c554f6e7612da4339a9cef6128df2b9d62 SHA512 15855d03cbd9510b6bcf72cf1edf1b8e5d5f514169fcadc21e76f4d0f81c8bed00f2062ccfb854f302d6213548864b5b013a706276e6d779001a3d380b142ff2
+EBUILD asymptote-2.61.ebuild 4560 BLAKE2B e051d01f655a987b8d95a7e8ecaeb531504d2294a3f1c896e4a8956f4df2efec3e1f48d2d9016b308e50dc3737a1b8c554f6e7612da4339a9cef6128df2b9d62 SHA512 15855d03cbd9510b6bcf72cf1edf1b8e5d5f514169fcadc21e76f4d0f81c8bed00f2062ccfb854f302d6213548864b5b013a706276e6d779001a3d380b142ff2
 MISC metadata.xml 1105 BLAKE2B 4b7d588a861ed68910f0d5a7b7f5691b3e97b6cf4514c3544c8610c77340797354575b49b70980320e55ecf5ea8188bbe8f6cc8fce55d18dc466f1d0fd83ade3 SHA512 f115ea831900270542ffe545260eda1ed51d321eca5aa7772f336bcc0e0c6471be3cbde2991c3e48ea5b3fbf51b8541b13de850406af15e42c992da0f2ed08ee
diff --git a/media-gfx/asymptote/asymptote-2.47.ebuild b/media-gfx/asymptote/asymptote-2.47.ebuild
deleted file mode 100644
index 77448ad65450..000000000000
--- a/media-gfx/asymptote/asymptote-2.47.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit autotools elisp-common latex-package multilib python-r1
-
-DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
-HOMEPAGE="http://asymptote.sourceforge.net/"
-SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	offscreen? ( opengl )
-	doc? ( boehm-gc )"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.4-r5:0=
-	>=sys-libs/readline-4.3-r5:0=
-	imagemagick? ( media-gfx/imagemagick[png] )
-	opengl? ( >=media-libs/mesa-8[X(+)] )
-	offscreen? ( media-libs/mesa[osmesa] )
-	svg? ( app-text/dvisvgm )
-	sigsegv? ( dev-libs/libsigsegv )
-	boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] )
-	fftw? ( >=sci-libs/fftw-3.0.1 )
-	gsl? ( sci-libs/gsl )
-	python? ( ${PYTHON_DEPS} )
-	X? (
-		${PYTHON_DEPS}
-		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg]
-		dev-python/numpy
-		dev-python/pycson
-		>=gnome-base/librsvg-2.40
-		)
-	latex? (
-		virtual/latex-base
-		>=dev-texlive/texlive-latexextra-2013
-		)
-	emacs? ( virtual/emacs )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-lang/perl
-		media-gfx/imagemagick[png]
-		virtual/texi2dvi
-		virtual/latex-base
-		app-text/ghostscript-gpl )
-	test? ( app-text/ghostscript-gpl )"
-
-TEXMF=/usr/share/texmf-site
-
-PATCHES=(
-	# gc.h -> gc/gc.h
-	"${FILESDIR}/${P}-configure-ac.patch"
-
-	# Changing pdf, ps, image viewers to xdg-open
-	"${FILESDIR}/${P}-xdg-utils.patch"
-
-	# Bug #322473
-	"${FILESDIR}/${P}-info.patch"
-)
-
-src_prepare() {
-	sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \
-		-i configure.ac \
-		|| die "sed configure.ac failed"
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# for the CPPFLAGS see
-	# https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349
-	econf \
-		CPPFLAGS=-DHAVE_SYS_TYPES_H \
-		CFLAGS="${CXXFLAGS}" \
-		--disable-gc-debug \
-		$(use_enable boehm-gc gc system) \
-		$(use_enable fftw) \
-		$(use_enable gsl) \
-		$(use_enable opengl gl) \
-		$(use_enable offscreen) \
-		$(use_enable sigsegv)
-}
-
-src_compile() {
-	default
-
-	cd doc || die
-	emake asy.1
-	if use doc; then
-		# info
-		einfo "Making info"
-		emake ${PN}.info
-		cd FAQ || die
-		emake
-		cd .. || die
-		# pdf
-		einfo "Making pdf docs"
-		export VARTEXFONTS="${T}"/fonts
-		# see bug #260606
-		emake -j1 asymptote.pdf
-		emake CAD.pdf
-	fi
-	cd .. || die
-
-	if use emacs; then
-		einfo "Compiling emacs lisp files"
-		elisp-compile base/*.el
-	fi
-}
-
-src_install() {
-	# the program
-	dobin asy
-
-	# .asy files
-	insinto /usr/share/${PN}
-	doins base/*.asy
-
-	# documentation
-	dodoc BUGS ChangeLog README ReleaseNotes TODO
-	doman doc/asy.1
-
-	# X GUI
-	if use X; then
-		insinto /usr/share/${PN}
-		doins -r GUI
-		chmod +x "${D}"usr/share/${PN}/GUI/xasy.py
-		dosym /usr/share/${PN}/GUI/xasy.py /usr/bin/xasy
-		doman doc/xasy.1x
-	fi
-
-	# examples
-	if use examples; then
-		insinto /usr/share/${PN}/examples
-		doins \
-			examples/*.asy \
-			examples/*.eps \
-			doc/*.asy \
-			doc/*.csv \
-			doc/*.dat \
-			doc/extra/*.asy
-		insinto /usr/share/${PN}/examples/animations
-		doins examples/animations/*.asy
-	fi
-
-	# LaTeX style
-	if use latex; then
-		cd doc || die
-		insinto "${TEXMF}"/tex/latex/${PN}
-		doins ${PN}.sty asycolors.sty
-		if use examples; then
-			insinto /usr/share/${PN}/examples
-			doins latexusage.tex
-		fi
-		cd .. || die
-	fi
-
-	# asymptote.py
-	if use python; then
-		python_foreach_impl python_domodule base/${PN}.py
-	fi
-
-	# emacs mode
-	if use emacs; then
-		elisp-install ${PN} base/*.el base/*.elc
-		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
-	fi
-
-	# vim syntax
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins base/asy.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}"/asy-ftd.vim
-	fi
-
-	# extra documentation
-	if use doc; then
-		cd doc || die
-		doinfo ${PN}.info*
-		cd FAQ || die
-		dodoc asy-faq.ascii
-		doinfo asy-faq.info
-		insinto /usr/share/doc/${PF}/html/FAQ
-		doins asy-faq.html/*
-		cd .. || die
-		insinto /usr/share/doc/${PF}
-		doins ${PN}.pdf CAD.pdf
-	fi
-}
-
-pkg_postinst() {
-	use latex && latex-package_rehash
-	use emacs && elisp-site-regen
-
-	elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
-	elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer'
-}
-
-pkg_postrm() {
-	use latex && latex-package_rehash
-	use emacs && elisp-site-regen
-}
diff --git a/media-gfx/asymptote/asymptote-2.48-r1.ebuild b/media-gfx/asymptote/asymptote-2.48-r1.ebuild
deleted file mode 100644
index 2c4a4f4d8894..000000000000
--- a/media-gfx/asymptote/asymptote-2.48-r1.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit autotools elisp-common latex-package multilib python-r1
-
-DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
-HOMEPAGE="http://asymptote.sourceforge.net/"
-SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	offscreen? ( opengl )
-	doc? ( boehm-gc )"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.4-r5:0=
-	>=sys-libs/readline-4.3-r5:0=
-	imagemagick? ( media-gfx/imagemagick[png] )
-	opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm )
-	offscreen? ( media-libs/mesa[osmesa] )
-	svg? ( app-text/dvisvgm )
-	sigsegv? ( dev-libs/libsigsegv )
-	boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] )
-	fftw? ( >=sci-libs/fftw-3.0.1 )
-	gsl? ( sci-libs/gsl )
-	python? ( ${PYTHON_DEPS} )
-	X? (
-		${PYTHON_DEPS}
-		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg]
-		dev-python/numpy
-		dev-python/pycson
-		>=gnome-base/librsvg-2.40
-		)
-	latex? (
-		virtual/latex-base
-		>=dev-texlive/texlive-latexextra-2013
-		)
-	emacs? ( virtual/emacs )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-lang/perl
-		media-gfx/imagemagick[png]
-		virtual/texi2dvi
-		virtual/latex-base
-		app-text/ghostscript-gpl )
-	test? ( app-text/ghostscript-gpl )"
-
-TEXMF=/usr/share/texmf-site
-
-PATCHES=(
-	# gc.h -> gc/gc.h
-	"${FILESDIR}/${P}-configure-ac.patch"
-
-	# Changing pdf, ps, image viewers to xdg-open
-	"${FILESDIR}/${P}-xdg-utils.patch"
-
-	# Bug #322473
-	"${FILESDIR}/${P}-info.patch"
-)
-
-src_prepare() {
-	sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \
-		-i configure.ac \
-		|| die "sed configure.ac failed"
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# for the CPPFLAGS see
-	# https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349
-	econf \
-		CPPFLAGS=-DHAVE_SYS_TYPES_H \
-		CFLAGS="${CXXFLAGS}" \
-		--disable-gc-debug \
-		$(use_enable boehm-gc gc system) \
-		$(use_enable fftw) \
-		$(use_enable gsl) \
-		$(use_enable opengl gl) \
-		$(use_enable offscreen) \
-		$(use_enable sigsegv)
-}
-
-src_compile() {
-	default
-
-	cd doc || die
-	emake asy.1
-	if use doc; then
-		# info
-		einfo "Making info"
-		emake ${PN}.info
-		cd FAQ || die
-		emake
-		cd .. || die
-		# pdf
-		einfo "Making pdf docs"
-		export VARTEXFONTS="${T}"/fonts
-		# see bug #260606
-		emake -j1 asymptote.pdf
-		emake CAD.pdf
-	fi
-	cd .. || die
-
-	if use emacs; then
-		einfo "Compiling emacs lisp files"
-		elisp-compile base/*.el
-	fi
-}
-
-src_install() {
-	# the program
-	dobin asy
-
-	# .asy files
-	insinto /usr/share/${PN}
-	doins base/*.asy
-
-	# documentation
-	dodoc BUGS ChangeLog README ReleaseNotes TODO
-	doman doc/asy.1
-
-	# X GUI
-	if use X; then
-		insinto /usr/share/${PN}
-		doins -r GUI
-		chmod +x "${D}"usr/share/${PN}/GUI/xasy.py
-		dosym /usr/share/${PN}/GUI/xasy.py /usr/bin/xasy
-		doman doc/xasy.1x
-	fi
-
-	# examples
-	if use examples; then
-		insinto /usr/share/${PN}/examples
-		doins \
-			examples/*.asy \
-			examples/*.eps \
-			doc/*.asy \
-			doc/*.csv \
-			doc/*.dat \
-			doc/extra/*.asy
-		insinto /usr/share/${PN}/examples/animations
-		doins examples/animations/*.asy
-	fi
-
-	# LaTeX style
-	if use latex; then
-		cd doc || die
-		insinto "${TEXMF}"/tex/latex/${PN}
-		doins ${PN}.sty asycolors.sty
-		if use examples; then
-			insinto /usr/share/${PN}/examples
-			doins latexusage.tex
-		fi
-		cd .. || die
-	fi
-
-	# asymptote.py
-	if use python; then
-		python_foreach_impl python_domodule base/${PN}.py
-	fi
-
-	# emacs mode
-	if use emacs; then
-		elisp-install ${PN} base/*.el base/*.elc
-		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
-	fi
-
-	# vim syntax
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins base/asy.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}"/asy-ftd.vim
-	fi
-
-	# extra documentation
-	if use doc; then
-		cd doc || die
-		doinfo ${PN}.info*
-		cd FAQ || die
-		dodoc asy-faq.ascii
-		doinfo asy-faq.info
-		insinto /usr/share/doc/${PF}/html/FAQ
-		doins asy-faq.html/*
-		cd .. || die
-		insinto /usr/share/doc/${PF}
-		doins ${PN}.pdf CAD.pdf
-	fi
-}
-
-pkg_postinst() {
-	use latex && latex-package_rehash
-	use emacs && elisp-site-regen
-
-	elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
-	elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer'
-}
-
-pkg_postrm() {
-	use latex && latex-package_rehash
-	use emacs && elisp-site-regen
-}
diff --git a/media-gfx/asymptote/asymptote-2.49.ebuild b/media-gfx/asymptote/asymptote-2.61.ebuild
index 22a6d01b693b..bef7be52b544 100644
--- a/media-gfx/asymptote/asymptote-2.49.ebuild
+++ b/media-gfx/asymptote/asymptote-2.61.ebuild
@@ -134,7 +134,7 @@ src_install() {
 		insinto /usr/share/${PN}
 		doins -r GUI
 		chmod +x "${D}"usr/share/${PN}/GUI/xasy.py
-		dosym /usr/share/${PN}/GUI/xasy.py /usr/bin/xasy
+		dosym ../share/${PN}/GUI/xasy.py /usr/bin/xasy
 		doman doc/xasy.1x
 	fi
 
@@ -187,14 +187,12 @@ src_install() {
 	if use doc; then
 		cd doc || die
 		doinfo ${PN}.info*
+		dodoc ${PN}.pdf CAD.pdf
 		cd FAQ || die
 		dodoc asy-faq.ascii
 		doinfo asy-faq.info
-		insinto /usr/share/doc/${PF}/html/FAQ
-		doins asy-faq.html/*
-		cd .. || die
-		insinto /usr/share/doc/${PF}
-		doins ${PN}.pdf CAD.pdf
+		docinto html/FAQ
+		dodoc asy-faq.html/*
 	fi
 }
 
diff --git a/media-gfx/asymptote/files/asymptote-2.47-configure-ac.patch b/media-gfx/asymptote/files/asymptote-2.47-configure-ac.patch
deleted file mode 100644
index e0c372a095d2..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.47-configure-ac.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: asymptote-2.47/configure.ac
-===================================================================
---- asymptote-2.47.orig/configure.ac
-+++ asymptote-2.47/configure.ac
-@@ -169,7 +169,7 @@ if test "x$ac_cv_use_gc" != "xno" ; then
-       fi
-       CPPFLAGS_SAVE=$CPPFLAGS
-       CPPFLAGS=$CPPFLAGS" $INCL"
--      AC_CHECK_HEADER(gc.h,
-+      AC_CHECK_HEADER([gc/gc.h],
- 	AC_CHECK_LIB([gc],[GC_malloc],[
- 	  LIBS=$LIBS"-lgc "
- 	  AC_MSG_NOTICE([enabling system $GCNAME])],[
diff --git a/media-gfx/asymptote/files/asymptote-2.47-info.patch b/media-gfx/asymptote/files/asymptote-2.47-info.patch
deleted file mode 100644
index dd2850211c1a..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.47-info.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: asymptote-2.47/doc/asymptote.texi
-===================================================================
---- asymptote-2.47.orig/doc/asymptote.texi
-+++ asymptote-2.47/doc/asymptote.texi
-@@ -23,7 +23,7 @@ file LICENSE in the top-level source dir
-      
- @dircategory Languages
- @direntry
--* asymptote: (asymptote/asymptote). Vector graphics language.
-+* asymptote: (asymptote). Vector graphics language.
- @end direntry
- 
- @titlepage
diff --git a/media-gfx/asymptote/files/asymptote-2.47-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.47-xdg-utils.patch
deleted file mode 100644
index d26b6c098d62..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.47-xdg-utils.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: asymptote-2.47/settings.cc
-===================================================================
---- asymptote-2.47.orig/settings.cc
-+++ asymptote-2.47/settings.cc
-@@ -91,15 +91,15 @@ bool msdos=false;
- string HOME="HOME";
- string docdir=ASYMPTOTE_DOCDIR;
- const char pathSeparator=':';
--string defaultPSViewer="gv";
-+string defaultPSViewer="xdg-open";
- #ifdef __APPLE__
- string defaultPDFViewer="open";
- #else  
--string defaultPDFViewer="acroread";
-+string defaultPDFViewer="xdg-open";
- #endif  
- string defaultGhostscript="gs";
- string defaultGhostscriptLibrary="";
--string defaultDisplay="display";
-+string defaultDisplay="xdg-open";
- string defaultAnimate="animate";
- void queryRegistry() {}
- const string dirsep="/";
diff --git a/media-gfx/asymptote/files/asymptote-2.48-configure-ac.patch b/media-gfx/asymptote/files/asymptote-2.48-configure-ac.patch
deleted file mode 100644
index ef6fc52c934b..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.48-configure-ac.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: asymptote-2.48/configure.ac
-===================================================================
---- asymptote-2.48.orig/configure.ac
-+++ asymptote-2.48/configure.ac
-@@ -162,7 +162,7 @@ if test "x$ac_cv_use_gc" != "xno" ; then
-       fi
-       CPPFLAGS_SAVE=$CPPFLAGS
-       CPPFLAGS=$CPPFLAGS" $INCL"
--      AC_CHECK_HEADER(gc.h,
-+      AC_CHECK_HEADER([gc/gc.h],
- 	AC_CHECK_LIB([gc],[GC_malloc],[
- 	  LIBS=$LIBS"-lgc "
- 	  AC_MSG_NOTICE([enabling system $GCNAME])],[
diff --git a/media-gfx/asymptote/files/asymptote-2.48-info.patch b/media-gfx/asymptote/files/asymptote-2.48-info.patch
deleted file mode 100644
index cd1577037f1f..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.48-info.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: asymptote-2.48/doc/asymptote.texi
-===================================================================
---- asymptote-2.48.orig/doc/asymptote.texi
-+++ asymptote-2.48/doc/asymptote.texi
-@@ -23,7 +23,7 @@ file LICENSE in the top-level source dir
-      
- @dircategory Languages
- @direntry
--* asymptote: (asymptote/asymptote). Vector graphics language.
-+* asymptote: (asymptote). Vector graphics language.
- @end direntry
- 
- @titlepage
diff --git a/media-gfx/asymptote/files/asymptote-2.49-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.49-xdg-utils.patch
deleted file mode 100644
index d5d719de25da..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.49-xdg-utils.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: asymptote-2.49/settings.cc
-===================================================================
---- asymptote-2.49.orig/settings.cc
-+++ asymptote-2.49/settings.cc
-@@ -91,15 +91,15 @@ bool msdos=false;
- string HOME="HOME";
- string docdir=ASYMPTOTE_DOCDIR;
- const char pathSeparator=':';
--string defaultPSViewer="gv";
-+string defaultPSViewer="xdg-open";
- #ifdef __APPLE__
- string defaultPDFViewer="open";
- #else  
--string defaultPDFViewer="acroread";
-+string defaultPDFViewer="xdg-open";
- #endif  
- string defaultGhostscript="gs";
- string defaultGhostscriptLibrary="";
--string defaultDisplay="display";
-+string defaultDisplay="xdg-open";
- string defaultAnimate="animate";
- void queryRegistry() {}
- const string dirsep="/";
diff --git a/media-gfx/asymptote/files/asymptote-2.49-info.patch b/media-gfx/asymptote/files/asymptote-2.61-info.patch
index e2b51860c3d6..0046ab9628a0 100644
--- a/media-gfx/asymptote/files/asymptote-2.49-info.patch
+++ b/media-gfx/asymptote/files/asymptote-2.61-info.patch
@@ -1,7 +1,7 @@
-Index: asymptote-2.49/doc/asymptote.texi
+Index: asymptote-2.61/doc/asymptote.texi
 ===================================================================
---- asymptote-2.49.orig/doc/asymptote.texi
-+++ asymptote-2.49/doc/asymptote.texi
+--- asymptote-2.61.orig/doc/asymptote.texi
++++ asymptote-2.61/doc/asymptote.texi
 @@ -23,7 +23,7 @@ file LICENSE in the top-level source dir
       
  @dircategory Languages
diff --git a/media-gfx/asymptote/files/asymptote-2.48-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.61-xdg-utils.patch
index fe4ca556a73c..269691eecfe9 100644
--- a/media-gfx/asymptote/files/asymptote-2.48-xdg-utils.patch
+++ b/media-gfx/asymptote/files/asymptote-2.61-xdg-utils.patch
@@ -1,18 +1,17 @@
-Index: asymptote-2.48/settings.cc
+Index: asymptote-2.61/settings.cc
 ===================================================================
---- asymptote-2.48.orig/settings.cc
-+++ asymptote-2.48/settings.cc
-@@ -91,15 +91,15 @@ bool msdos=false;
- string HOME="HOME";
- string docdir=ASYMPTOTE_DOCDIR;
- const char pathSeparator=':';
--string defaultPSViewer="gv";
-+string defaultPSViewer="xdg-open";
- #ifdef __APPLE__
+--- asymptote-2.61.orig/settings.cc
++++ asymptote-2.61/settings.cc
+@@ -98,13 +98,13 @@ string defaultPSViewer="open";
  string defaultPDFViewer="open";
+ string defaultHTMLViewer="open";
  #else  
+-string defaultPSViewer="gv";
 -string defaultPDFViewer="acroread";
+-string defaultHTMLViewer="google-chrome";
++string defaultPSViewer="xdg-open";
 +string defaultPDFViewer="xdg-open";
++string defaultHTMLViewer="xdg-open";
  #endif  
  string defaultGhostscript="gs";
  string defaultGhostscriptLibrary="";
diff --git a/media-gfx/aview/Manifest b/media-gfx/aview/Manifest
index 93f528a586f7..bc823931a852 100644
--- a/media-gfx/aview/Manifest
+++ b/media-gfx/aview/Manifest
@@ -1,5 +1,5 @@
-AUX aview-1.3.0_rc1-asciiview.patch 1936 BLAKE2B bdf5ba38805fb2f8920ca9c3b342a69b76b01d33df5667a57ba0cbdcde576f8847f7b0cac420f3744516f74725e72ef1170d44a21a53536046d33329d6a7a83e SHA512 3666e403e5ed8b4be557b8aea314e33e5ad7162c2d7c7291810b4bc6824161f53a5b5b5325c4a4667467f72582303693710750e1d30a3761304346bc335f6299
-AUX aview-1.3.0_rc1-includes.patch 281 BLAKE2B 768cd3d142a119910e88b0cd219ec1a431549df18427cb3ae22fd91ae99ec23fc223da8025fc9bff82fd8268dcb7dcd017d0c53ad6c323bd4e3735cd9f658b38 SHA512 c8a5303be05a9205baba541e286725413fd8e8b161cb7d0bb1a32a8809b4e977ca12b9bd0df2c793be0e72e2353fdf9b09f96d541d361c5df87af7885cc350c7
+AUX aview-1.3.0_rc1-asciiview.patch 1940 BLAKE2B 595c179934b0978246ed520434cc1454ff9aa36ced73c162080676114a0706c09acf3d05fab12bf5c57580cf1e96c7aea74b8bc65265276dc5e88fd359b9cddb SHA512 5b3afbba50a6338834798d9b380c2246011f3c465a2515ef0a5701c5eade5fdb0b09518e64906b10fb6b4a2bf8e9a419463c337a4672bcf79cae35cce2d0143a
+AUX aview-1.3.0_rc1-includes.patch 690 BLAKE2B 7d081353c4e245440820765710e25e769d8482fd7c8ad9160bf59776268240804f8e365a28c2a569324c8ca3bdb11f7cb7d0dce1225cc2779ff0c74122767ad0 SHA512 42104612c07740269f311bc264b20775035a1f11dabf1c662b3cf800f9a6e623081d7fba9731ee3d06b0f14030c848166409a6801fd035f03f8ba8479abb118a
 DIST aview-1.3.0rc1.tar.gz 54317 BLAKE2B 3a47dab51763f7c5cd9d4d5950437f3e0b86b46a9bf498c93e88258daefb511c82789b1d4bb1288844dbc70aae033fd0ffd9ffab4b28eb553effa7a2c777ef69 SHA512 941f2a92aaf3852b403daf688cda4ca2eb82ec32ee6566cd2aef3d121f259f1bb0214f872c4d5020c658bd81adba0577313acc5972d2f44b295f21905e107144
-EBUILD aview-1.3.0_rc1-r3.ebuild 795 BLAKE2B c5555997150e6ced634ebf32f6b98614edbefad00a26154c5331ef4a7d3e160f88853930c58f77fb85fda25b27c65aff00a9d882d4e832abfe9774522d50203b SHA512 8d627352973103e17ccf063302ce96bb772b1c0453326a3783281757222cb9eb2956b4b07da23964d6fad06ac9961f590be021e9910cc0fbcfe61932c7071796
+EBUILD aview-1.3.0_rc1-r3.ebuild 622 BLAKE2B 3356e52232cd0b5820ae25c07abcb2c227edeb205833e55fac8413ad71f0d1e5e6ab0b1669761ac7ab901af171a0b6c0d3a8f9f4cb6abd2cd8e07ef6d7cdb9ab SHA512 22a4c563a5f4be3b6687e739b0067e60ade9822fe51f81dca6cd9019395f1a29924f6b7c115e0d009996bd3c106b982c821e0bad4172b6b6d60a16417fc20ce5
 MISC metadata.xml 252 BLAKE2B e7a66be557802d7ca467631d022e882e2985f5d724603ca154106cc8ac13a6c13bb9d2c9d69cfc68871ec9473dc93e883e62d6463496d5ce8987546dfe2afeb3 SHA512 bd3eef9d63a167ed485cb156ca81b53649a9ed2bd4fbaf3f58328cadb09f5b4b65b2343a6f032b7540c445a98bb6c3abb3084f91dc1cf78ecfe9a067732e4385
diff --git a/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild b/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
index 4487794334ea..728a22350066 100644
--- a/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
+++ b/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
@@ -1,42 +1,32 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit base
+inherit autotools
 
 MY_P=${P/_/}
-S=${WORKDIR}/${MY_P/rc*/}
+
 DESCRIPTION="An ASCII Image Viewer"
-SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
 HOMEPAGE="http://aa-project.sourceforge.net/aview/"
+SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-IUSE=""
 
-DEPEND=">=media-libs/aalib-1.4_rc4"
+DEPEND="media-libs/aalib:="
 RDEPEND="${DEPEND}"
 
+S="${WORKDIR}/${MY_P/rc*/}"
+
 PATCHES=(
 	"${FILESDIR}"/${P}-asciiview.patch
 	"${FILESDIR}"/${P}-includes.patch
 )
 
 src_prepare() {
-	base_src_prepare
-
-	sed -i -e 's:#include <malloc.h>:#include <stdlib.h>:g' "${S}"/*.c || die
-}
-
-src_compile() {
-	make aview
-}
-
-src_install() {
-	dobin aview asciiview
-
-	doman *.1
-	dodoc ANNOUNCE ChangeLog README TODO
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
 }
diff --git a/media-gfx/aview/files/aview-1.3.0_rc1-asciiview.patch b/media-gfx/aview/files/aview-1.3.0_rc1-asciiview.patch
index 6d71bbb967b1..6d547ea0f13a 100644
--- a/media-gfx/aview/files/aview-1.3.0_rc1-asciiview.patch
+++ b/media-gfx/aview/files/aview-1.3.0_rc1-asciiview.patch
@@ -10,8 +10,8 @@ asciiview script (bug #293654) by Kevin McCarthy <signals@gentoo.org>
 
 Rollup patch created by Kevin McCarthy <signals@gentoo.org>
 
---- asciiview
-+++ asciiview
+--- a/asciiview
++++ b/asciiview
 @@ -3,13 +3,13 @@
  clear()
  {
diff --git a/media-gfx/aview/files/aview-1.3.0_rc1-includes.patch b/media-gfx/aview/files/aview-1.3.0_rc1-includes.patch
index 3e5006b4c549..79b819e95882 100644
--- a/media-gfx/aview/files/aview-1.3.0_rc1-includes.patch
+++ b/media-gfx/aview/files/aview-1.3.0_rc1-includes.patch
@@ -1,7 +1,25 @@
-Index: aview-1.3.0/main.c
-===================================================================
---- aview-1.3.0.orig/main.c
-+++ aview-1.3.0/main.c
+--- a/flip.c
++++ b/flip.c
+@@ -7,6 +7,7 @@
+ 
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <string.h>
+ #include <sys/time.h>
+ #include <unistd.h>
+ #include <aalib.h>
+--- a/image.c
++++ b/image.c
+@@ -1,6 +1,6 @@
+ #include <stdio.h>
+ #include <unistd.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include "config.h"
+ 
+ int imgwidth, imgheight;
+--- a/main.c
++++ b/main.c
 @@ -1,4 +1,6 @@
  #include <aalib.h>
 +#include <string.h>
@@ -9,3 +27,13 @@ Index: aview-1.3.0/main.c
  #include "image.h"
  #include "ui.h"
  #include "config.h"
+--- a/ui.c
++++ b/ui.c
+@@ -1,6 +1,6 @@
+ #include <stdio.h>
+ #include <ctype.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <aalib.h>
+ #include "shrink.h"
diff --git a/media-gfx/crwinfo/Manifest b/media-gfx/crwinfo/Manifest
index afe831d0415b..363a8832fa12 100644
--- a/media-gfx/crwinfo/Manifest
+++ b/media-gfx/crwinfo/Manifest
@@ -1,4 +1,4 @@
-AUX crwinfo-0.2.patch 991 BLAKE2B 4bbdc2038c9bfd4c8ed05726f7d5045ff8f818ccbf78bdcfbd48ba3fe0e0c9782e0b8a583474925f7cfdd0fc3226170c890057b59aec40a41d1a38e97fa70f55 SHA512 b3ab95be8605d470258e16fece5b5a8fd70c7acc5dfc369f6dc4a6819a44f96c513319311198fb6a1e41b2a3e0bc931ddde2e66566568628f271f31ecc2872af
+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 717 BLAKE2B 122ffe17e9e4b68ca50cb5a373800365f561a934ccd70cd9fa63e304ec16b129096842462e609156a6be6f2cf7eff4932f32ca37a5f3d833b566907826d5424d SHA512 41a55100107e7a6935ec0fe778a681821aaea4d288d313a46a750997b53d9504704de39860a57ab32ac9e9cda87265f144dbf8bc5bf9de4d0de3aec2ed5c9978
+EBUILD crwinfo-0.2.ebuild 593 BLAKE2B c0e0f91e25e3d193e25da04ecece0f200ee2264473ca8972033f219e1f3ed2da18fa73ff17703218d8c9f94356853918868f10754479547951f9259fbad55514 SHA512 495d28d99f1ec03342c2c766f3b1a005877bca6dd47f96a64caba6eabe10f80212a539accece96fd67a26d8bc8c5a6750cd537a9efabc7b981ac4e1e448a0de7
 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 09e639edc0a7..6f3b79d7548b 100644
--- a/media-gfx/crwinfo/crwinfo-0.2.ebuild
+++ b/media-gfx/crwinfo/crwinfo-0.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Canon raw image (CRW) information and thumbnail extractor"
 HOMEPAGE="http://freshmeat.net/projects/crwinfo/"
@@ -12,16 +12,14 @@ SRC_URI="http://neuemuenze.heim1.tu-clausthal.de/~sven/crwinfo/CRWInfo-${PV}.tar
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
 
 S="${WORKDIR}/CRWInfo-${PV}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}.patch
-	sed \
-		-e '/gcc/s:^.*$:\t$(CC) $(CFLAGS) -Wall -c crwinfo.c\n\t$(CC) $(LDFLAGS) -o crwinfo crwinfo.o:g' \
-		-i Makefile || die
+PATCHES=( "${FILESDIR}"/${P}.patch )
+
+src_compile() {
 	tc-export CC
+	emake crwinfo
 }
 
 src_install() {
diff --git a/media-gfx/crwinfo/files/crwinfo-0.2.patch b/media-gfx/crwinfo/files/crwinfo-0.2.patch
index 18170b10d71e..1753ed0bdf3e 100644
--- a/media-gfx/crwinfo/files/crwinfo-0.2.patch
+++ b/media-gfx/crwinfo/files/crwinfo-0.2.patch
@@ -1,5 +1,5 @@
---- crwinfo.c.orig	2002-07-30 11:17:03.000000000 -0600
-+++ crwinfo.c	2005-01-21 15:24:54.256888228 -0700
+--- a/crwinfo.c
++++ b/crwinfo.c
 @@ -95,10 +95,10 @@
     fprintf( stderr, "-m        show misc. information (whitepoint, AF mode etc)\n" );
     fprintf( stderr, "-f        show flash information (flash mode etc)\n" );
@@ -15,3 +15,8 @@
     fprintf( stderr, "-x        show experimental information (don't rely on it)\n" );
     exit(0);
  }
+--- a/Makefile
++++ b/Makefile
+@@ -1,2 +0,0 @@
+-all:
+-	gcc -o crwinfo -W -Wall -g crwinfo.c
diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest
index 7a776d2a7ccd..ea8fe61007a5 100644
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@@ -2,8 +2,8 @@ DIST curaengine-3.4.1.tar.gz 949312 BLAKE2B 4902575c40002ab49e3ef13c94c8531b6975
 DIST curaengine-3.6.0.tar.gz 1390109 BLAKE2B a0a6b8016bb5fa2f772634a671fc391df45875fc36cdf100f00ce34b9d5495f32986c473b1ba4c184cb77e50a64e2648c5d4f31053790182e657b0c981e1412c SHA512 340dad4c697fb0d7b633091715a904ae7df8973626e217ae2528d0121723c07a6cf0bbc740b9ad9980f3b288fa690c9c3ee43d90914264855dace007bbb334c8
 DIST curaengine-4.2.0.tar.gz 1654657 BLAKE2B c11f77a126e49c1c63550accd42c3616ab647d2575de0f11e64cb2188e7c565a54f3613e296c3f19e8534a7a758162fe29cdd62e8d62d691a7d9c9e6430545ce SHA512 6c3edac5a21068b50a31d3ab37dac58b986e18be2d24711d77cf210da62b521d62dc92a1b4e8865a26e5c394119349f03b3816d19d67ebee670424cc4a7b2500
 DIST curaengine-4.3.0.tar.gz 1656780 BLAKE2B 9b93e3f294a8a67c2cd4f2d4462a4047e6860e0c391e7ff550b24c498faa82fd2af4fd044845f00f93fb01d38ca3fa1511bfe65a7456b5a6e0b919821be5ab8f SHA512 60ca0ce586c0cf5f1516f803b2a05a20299ef8193f065acd6e11a0054903189225f9c60be1b536ffe5a9a22652097acd3a4aae2833920a468071b78f213f7572
-EBUILD curaengine-3.4.1.ebuild 875 BLAKE2B 943c5d77bb91f833a42005edff60824935bc9cc0d6707035ee5ab2fe29d8d631c51fc7678b96dbebf468ea2e5bbb9cfb233999ffaadcf9f196ec824ba2f3d83f SHA512 4ec5e4cb05f236ff9052ecf6455967d05ae668002d255af0d8435960080882ec687de6d7547074d4fee1fd435a04796a26dc4bcdd595ad5748e8d3b0c052f39e
-EBUILD curaengine-3.6.0.ebuild 875 BLAKE2B 943c5d77bb91f833a42005edff60824935bc9cc0d6707035ee5ab2fe29d8d631c51fc7678b96dbebf468ea2e5bbb9cfb233999ffaadcf9f196ec824ba2f3d83f SHA512 4ec5e4cb05f236ff9052ecf6455967d05ae668002d255af0d8435960080882ec687de6d7547074d4fee1fd435a04796a26dc4bcdd595ad5748e8d3b0c052f39e
-EBUILD curaengine-4.2.0.ebuild 1507 BLAKE2B fc44669821417480266caea7e305b363f60042b0d6d5f5c440e327f05f12fcef151d80e0cc2d1652ee79976866225b95cbc55ee255c30139c16f98e4153669c9 SHA512 12ff9ce73c0c1471bd9ea9fc1d3cd83198ae5a83c5fa42a41d2dbdd6a28b3763c80539f8b2bd6b01a96723473a1a62aab4ee179db613203ff56ef1d35de53290
-EBUILD curaengine-4.3.0.ebuild 946 BLAKE2B 54b40c2c7c4f6a2d85a001164551b8e4618e07900a158f2eff01a4027e5ba3bdb3abab2b1470e7c4c2508d250fa254f8af8fc7f21992b18effe3e658f6cb41dd SHA512 b802b25700787ca33b94b10ab12eaa0c2444e8c7bbeaa21e486783632df3f1121421a23e227bd2f751076bc30d0235a8fdb16bad2266c4f32896621e0a37ea33
+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 1534 BLAKE2B fe0a144d44cb815494771c2eb1781fdc11ca3e686c49ed6ffecfb5338341b3d2cf4f315104f8bff919f7652a48238621db65b36ad88292b15e3e3ed10229b209 SHA512 b5bb40937b354d9141be8c47e38a82c1be9fefefe497add0829549a91286e3d238c3d9ce242475d739e0c755637fa436e04007abbc46993e74fe93c9f3a4244e
+EBUILD curaengine-4.3.0.ebuild 973 BLAKE2B 42b34ff73efbe37cad3cec8abef6bd5c0f0f2026de3072aedc7d79164fa1e76691898a4e3404252378383460fde7cbcd27146c1b597c0f3f4bc37a803f6a2ba7 SHA512 a4b546a8431b6c358e84aaa6bb8f21db753f31ebb2313cb2a179bdebbc6c545dfe1e4ef3b0de6ee501126075b57ab2a60f71601efd8f9b884bafd913eeb29094
 MISC metadata.xml 862 BLAKE2B 233eef15a865c598451d8a6100a8dc99f4c9a4c4ae4f8692a473ad2b8de5c2bc5216052b2bbf698e98f1c7f8156512084beaebc6148b9bc333d5c09d9bfda3ba SHA512 92e4cf75b949ac201537780bc5acf295720da8a342f6d882e2ca3b36aaa5691a3df31e6cf79e44b25f88d2f1177a1b6227165cbe8b9da8762b35560927239382
diff --git a/media-gfx/curaengine/curaengine-3.4.1.ebuild b/media-gfx/curaengine/curaengine-3.4.1.ebuild
index 00cac9e508c9..4b6d43259726 100644
--- a/media-gfx/curaengine/curaengine-3.4.1.ebuild
+++ b/media-gfx/curaengine/curaengine-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="${PYTHON_DEPS}
 	~dev-libs/libarcus-${PV}:*
diff --git a/media-gfx/curaengine/curaengine-3.6.0.ebuild b/media-gfx/curaengine/curaengine-3.6.0.ebuild
index 00cac9e508c9..4b6d43259726 100644
--- a/media-gfx/curaengine/curaengine-3.6.0.ebuild
+++ b/media-gfx/curaengine/curaengine-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="${PYTHON_DEPS}
 	~dev-libs/libarcus-${PV}:*
diff --git a/media-gfx/curaengine/curaengine-4.2.0.ebuild b/media-gfx/curaengine/curaengine-4.2.0.ebuild
index 30ee0ee8564f..8fc2576a3f8f 100644
--- a/media-gfx/curaengine/curaengine-4.2.0.ebuild
+++ b/media-gfx/curaengine/curaengine-4.2.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="|| ( <sys-devel/gcc-9 <sys-devel/clang-8 )
 	doc? ( app-doc/doxygen )"
diff --git a/media-gfx/curaengine/curaengine-4.3.0.ebuild b/media-gfx/curaengine/curaengine-4.3.0.ebuild
index f42d62c313c5..4fd3aedee744 100644
--- a/media-gfx/curaengine/curaengine-4.3.0.ebuild
+++ b/media-gfx/curaengine/curaengine-4.3.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="|| ( sys-devel/gcc sys-devel/clang )
 	doc? ( app-doc/doxygen )"
diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest
index 1676b198a7bd..479ef94ca52d 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 2985 BLAKE2B 96bb1af7612b64d9a8bcbc70f240092189e8a88ba19bf558d92e5877ebbdfc0f58a398b1dfd919e2bfc8ea082c958815766edc69e0f84045a39b9ba70b59a7ec SHA512 b653248aa049035f3e11c2e0d3e972a10985abd4c6bffe54477b171eec650f648cc8e4e9e506da76099e98e57e4118e81173df09b303c842687c1e930411f4b7
+EBUILD dcraw-9.28.0-r1.ebuild 2941 BLAKE2B b41bd18081876d3b4fc44a745ee89f164b4f008aa973b9ef4adde42f791aa9ba53a322b4ef404e36a458354cba3115ac8bd05e222be440792e70dfc54dba64a7 SHA512 ff848dd78c682db65d39ff8381c63a56791c0c9665e6bc505594cc4159472d3d4e9bfefa746d0b6e358594ce6633263291f85542be29cd1dda9eb045233d4202
 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 6f0ec1521e68..5d256c4636ec 100644
--- a/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
+++ b/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
@@ -104,7 +104,7 @@ src_install() {
 			if has ${lang} ${LINGUAS-${lang}}; then
 				[[ -f dcraw.${lang}.1 ]] && doman dcraw.${lang}.1
 				insinto /usr/share/locale/${lang}/LC_MESSAGES
-				newins dcraw_${lang}.mo dcraw.mo || die "failed to install dcraw_${lang}.mo"
+				newins dcraw_${lang}.mo dcraw.mo
 			fi
 		done
 	fi
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index bdd607008fcc..04c8ced7704d 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,10 +1,5 @@
-AUX digikam-6.2.0-cmake.patch 2011 BLAKE2B da9e459cd8c7f89d986166cf19dde36d599565f573831057c0d68706c05f4b49240215e159d36e377f16b178c7de04e713bdfb3214bd83e114cbbd5b40f4f37a SHA512 44a63a08da538bee35efc965789b463455646c3ee9ed8fbe6f22591155c20b623e48838af52f8b521a35b3548fe44909516a15a4d815347e61de71d07bbfad17
-AUX digikam-6.2.0-googlephoto-upload.patch 1072 BLAKE2B 5384a259b2fdd15cf195fed8f5aa1a16a0af3932af1e2226b3bfd2be95d19f6fee003fd9d3344c0921ff5655d22ea4f30f98e8ed7c1e5dee1d4b91d4d031562e SHA512 c71ab51371e45538f33ba9603eabdc8e3e518f7e38aa274407d90f216a14f6071066f388291d072fca46eb6589e3cafe0eb5b78f3bb3520ca9aa85add092d265
-AUX digikam-6.2.0-imagemagick-7.0.8.60.patch 641 BLAKE2B c2a7261a92cb757aa39f2ccb5a561b8cb34563540e1c0e84662a056dad66e17c941a77ee9d42b168e83d18f72786e9bf49e741f73bf20c714496fad80ad22987 SHA512 d1ecf5a25a3cdf542ababa6d4306bf6bce25b5f04e8f880460a8a67f4f4eac283f139b82848a085a28dc16b0a8a9310a3ed294d110105b0562239ef21ce6e442
 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.2.0.tar.xz 339472960 BLAKE2B 0db48839474d599a364fba73cad751b889fe6f37c88323d1feddce67acb0ecad306c67976e1524328e6aaf33464c9dd35b1b85cf3c41ba72be9cef664e30d520 SHA512 05667c91af290df0eabd3b18a7c6741ded3f1b01b0a9cb572d6df79f25787d0291624760d6c0fa23bd36665a94bc7ccba845c117ee381de7edff97d1d4158e56
 DIST digikam-6.3.0.tar.xz 335641824 BLAKE2B 1ecddeee653d6b97570aa3616c6dd0a951210983400fe8aca19ee9e01aef29820f0ab32e3cbc2e92e833868f0f652c5bdd0809324437b6fa778dfdaf04ea3c83 SHA512 9463d7a8351acae32e2fa77c96026d1cb60e56fcc20ad2b71ac7461ff1e5e2e02ca0ef8a12e4d5ae2324aa66e185cdf5b237d6330f4741691876977e773511ce
-EBUILD digikam-6.2.0.ebuild 4166 BLAKE2B 7dda2079c57b887ba01a6243c6f5d4506baa4eb285b218d05c2ee6de84f1d1014154a621bcfc4c4980ec1dd5d4d1c2d3d6c80a33187b1e52638e9c67fb041ac5 SHA512 ee99c9c55687aa28283179c92e6e9fc1e19027206fe0ff3a51541da23bb024297c1d03c9ab59039f481820856ae44de03f4958db26333f3a9f0976c3729d8ea0
-EBUILD digikam-6.3.0-r1.ebuild 4258 BLAKE2B bff44f4ffbc3a535aaab5182d92f069bd4feb05e5f1b8a64f175792e05b7dafa1cbf7f09aaaa1c5563671df02731746a858561e486fb297e1f7f976a68932fe4 SHA512 3d5564fbad31fc8e16edad3afed3ede2f7e50f92899660364a4914d99cc60b18d06bddf77546812e2f54637815b2bc5176d65a944d77d8279535d7da8ae3e7ac
+EBUILD digikam-6.3.0-r1.ebuild 4255 BLAKE2B fcdff7cb0211901c20caf4197a09f0a58e6956c4bc6006a688106283f84b78fe0892c4050f9a33bb2b3bd8e577d2315f94a23e2f28e86b232193e3de5cf8769c SHA512 3444df820862f4c76b9c16e3073eabf27f3dfe9266469ce377fe51264d77de4de51555eeb9ad5c6e32f0ace1deb901d3a1d8cb1df7322b5ce1bd505684bd778a
 MISC metadata.xml 1256 BLAKE2B c3899279a6382ac2b2a12f5b94938db2324093bd63e0db8e3f82bb56ea9944d4369b793f7fa039c2c08af1887e4cc51d58f4e89a57c81b18cb5f896ef4cd0a5c SHA512 9b220b4271d0cb7b9fd5549fec165c4bc20c250cc66ce14ecb3cb16d0eb8355f35d0e585d9d800ed70437b3cd5434bcacc7dfd783f2a5683dbe1b1b3ce48356f
diff --git a/media-gfx/digikam/digikam-6.2.0.ebuild b/media-gfx/digikam/digikam-6.2.0.ebuild
deleted file mode 100644
index b91dd599e0f1..000000000000
--- a/media-gfx/digikam/digikam-6.2.0.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MIN_VERSION=3.14.3
-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="
-	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_kdeapps_dep akonadi-contacts)
-		$(add_kdeapps_dep kcontacts)
-	)
-	calendar? ( $(add_kdeapps_dep kcalcore) )
-	dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contrib_dnn] )
-	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}-googlephoto-upload.patch"
-	"${FILESDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${P}-imagemagick-7.0.8.60.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=(
-		-DENABLE_APPSTYLES=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
-		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
-		$(cmake-utils_use_find_package calendar KF5CalendarCore)
-		-DENABLE_FACESENGINE_DNN=$(usex dnn)
-		$(cmake-utils_use_find_package gphoto2 Gphoto2)
-		$(cmake-utils_use_find_package imagemagick ImageMagick)
-		$(cmake-utils_use_find_package lensfun LensFun)
-		$(cmake-utils_use_find_package marble Marble)
-		-DENABLE_MEDIAPLAYER=$(usex mediaplayer)
-		$(cmake-utils_use_find_package mediaplayer QtAV)
-		-DENABLE_MYSQLSUPPORT=$(usex mysql)
-		-DENABLE_INTERNALMYSQL=$(usex mysql)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		$(cmake-utils_use_find_package panorama KF5ThreadWeaver)
-		$(cmake-utils_use_find_package scanner KF5Sane)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake-utils_use_find_package vkontakte KF5Vkontakte)
-		-DENABLE_QWEBENGINE=$(usex !webkit)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-gfx/digikam/digikam-6.3.0-r1.ebuild b/media-gfx/digikam/digikam-6.3.0-r1.ebuild
index 6ba0fe7a630e..8b30b380b54e 100644
--- a/media-gfx/digikam/digikam-6.3.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-6.3.0-r1.ebuild
@@ -12,7 +12,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
 
@@ -71,7 +71,7 @@ COMMON_DEPEND="
 		$(add_frameworks_dep kcalendarcore)
 		$(add_kdeapps_dep kcalcore)
 	) )
-	dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contrib_dnn] )
+	dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contribdnn] )
 	gphoto2? ( media-libs/libgphoto2:= )
 	imagemagick? ( media-gfx/imagemagick:= )
 	lensfun? ( media-libs/lensfun )
diff --git a/media-gfx/digikam/files/digikam-6.2.0-cmake.patch b/media-gfx/digikam/files/digikam-6.2.0-cmake.patch
deleted file mode 100644
index f25dd6306afa..000000000000
--- a/media-gfx/digikam/files/digikam-6.2.0-cmake.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From d915828e4db2e7b40e799abc01a6fdb683d2b921 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 17 Feb 2019 23:51:03 +0100
-Subject: [PATCH] Un-break optional Qt5 detection
-
----
- core/CMakeLists.txt | 26 ++++++++++----------------
- 1 file changed, 10 insertions(+), 16 deletions(-)
-
-diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index c04ee1a9c3..c3762437e6 100644
---- a/core/CMakeLists.txt
-+++ b/core/CMakeLists.txt
-@@ -136,16 +136,14 @@ find_package(Qt5 ${QT_MIN_VERSION}
- )
- 
- if(ENABLE_QWEBENGINE)
--    find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebEngineWidgets)
-+    find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} NO_MODULE)
- else()
--    find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebKitWidgets)
-+    find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} NO_MODULE)
- endif()
- 
--find_package(Qt5 ${QT_MIN_VERSION}
--             OPTIONAL_COMPONENTS
--             DBus
--             OpenGL
--)
-+find_package(Qt5DBus ${QT_MIN_VERSION})
-+
-+find_package(Qt5OpenGL ${QT_MIN_VERSION})
- 
- if(ENABLE_DBUS)
-     if(NOT Qt5DBus_FOUND)
-@@ -156,14 +154,10 @@ endif()
- # Dependencies For unit tests and CLI test tools
- 
- if(BUILD_TESTING)
--    find_package(Qt5 ${QT_MIN_VERSION}
--                 NO_MODULE COMPONENTS
--                 Test
--    )
--    find_package(Qt5 ${QT_MIN_VERSION}
--                 OPTIONAL_COMPONENTS
--                 Qml WebView  # Optional, for 'sialis' O2 library test tool.
--    )
-+    find_package(Qt5Test ${QT_MIN_VERSION} NO_MODULE)
-+    # Optional, for 'sialis' O2 library test tool.
-+    find_package(Qt5Qml ${QT_MIN_VERSION} NO_MODULE)
-+    find_package(Qt5WebView ${QT_MIN_VERSION} NO_MODULE)
- endif()
- 
- find_package(KF5 ${KF5_MIN_VERSION}
-@@ -335,7 +329,7 @@ endif()
- find_package(X11)
- 
- if(X11_FOUND)
--    find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS X11Extras)
-+    find_package(Qt5X11Extras ${QT_MIN_VERSION} NO_MODULE)
-     set(HAVE_X11 TRUE)
- else()
-     set(HAVE_X11 FALSE)
--- 
-2.22.0
-
diff --git a/media-gfx/digikam/files/digikam-6.2.0-googlephoto-upload.patch b/media-gfx/digikam/files/digikam-6.2.0-googlephoto-upload.patch
deleted file mode 100644
index 1c182ed7c9e7..000000000000
--- a/media-gfx/digikam/files/digikam-6.2.0-googlephoto-upload.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 19490eb10de0444219e8b525bb75513c046d184d Mon Sep 17 00:00:00 2001
-From: Maik Qualmann <metzpinguin@gmail.com>
-Date: Wed, 7 Aug 2019 19:52:13 +0200
-Subject: [PATCH] fix upload error to Google Photo when description contains
- quotes BUGS: 410692 FIXED-IN: 6.3.0
-
----
- core/dplugins/generic/webservices/google/gswindow.cpp | 1 +
- 1 files changed, 1 insertions(+)
-
-diff --git a/core/dplugins/generic/webservices/google/gswindow.cpp b/core/dplugins/generic/webservices/google/gswindow.cpp
-index a03e683e65..a80eac5cdb 100644
---- a/core/dplugins/generic/webservices/google/gswindow.cpp
-+++ b/core/dplugins/generic/webservices/google/gswindow.cpp
-@@ -594,6 +594,7 @@ void GSWindow::slotStartTransfer()
-                 QStringList descriptions = QStringList() << info.title() << info.comment();
-                 descriptions.removeAll(QLatin1String(""));
-                 temp.description         = descriptions.join(QLatin1String("\n\n"));
-+                temp.description.replace(QLatin1Char('"'), QLatin1String("\\\""));
-                 break;
-         }
- 
--- 
-2.22.0
-
diff --git a/media-gfx/digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch b/media-gfx/digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch
deleted file mode 100644
index 264da2c34f29..000000000000
--- a/media-gfx/digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/core/tests/dimg/magickloader.cpp	
-+++ a/core/tests/dimg/magickloader.cpp	
-@@ -139,7 +139,11 @@ int main(int argc, char** argv)
-         if (inf->encoder) mode.append(QLatin1Char('W'));
-         else              mode.append(QLatin1Char('-'));
- 
-+#if( (MagickLibVersion >= 0x708) && defined(magick_module) ) /* defined since 7.0.8.60 */
-+        QString module = QLatin1String(inf->magick_module);
-+#else
-         QString module = QLatin1String(inf->module);
-+#endif
-         QString mime   = QMimeDatabase().mimeTypeForFile(QFileInfo(QString::fromLatin1("foo.%1").arg(module))).name();
- 
-         if (module != QLatin1String("DNG")  &&
\ No newline at end of file
diff --git a/media-gfx/displaycal/Manifest b/media-gfx/displaycal/Manifest
index c466bbc4f161..a134cc8cb1e7 100644
--- a/media-gfx/displaycal/Manifest
+++ b/media-gfx/displaycal/Manifest
@@ -1,7 +1,3 @@
-DIST DisplayCAL-3.8.7.0.tar.gz 10619677 BLAKE2B 9b697d3548bd3a2a7a5f2bb38589bdd7e67ff964b613371a83ae11ec1a114874283d67a442f4336a1d50e86fe127ae755ea68865de112ea83520def404a6e715 SHA512 f47cda64648ef59c211aa54993ee423e80caf26f8942de88672e430bec7976d83f15c58fe9df8217217be48a1b36e8c3342fc3baf862077fe229da214fd38400
-DIST DisplayCAL-3.8.7.1.tar.gz 10621039 BLAKE2B be4e350a63efb615a363aea36e4e92bc837d0021088ab28f78e92ba0743af5e3930812c1154d32ff06d301461d44b50b483ea15e6954943204974cc264918057 SHA512 67f49b3ae85620f9e9c7e9d4162538f78ab160a590e6cb95f78203045e0d2d8d604abe3ab533030e9359d70292a8b7dd02174c99b3143fabd7ca27a3b07a5626
 DIST DisplayCAL-3.8.8.1.tar.gz 10625317 BLAKE2B 3e988221ee7d75d5a34b1cd69ab80737017c7e7a0fa16c3bc1587210b6b1108e623a3ccada3be8b99fae4c0a70f2cf45293222232f87f0ac13fedf2a1f22fcbd SHA512 e16cdc4590274f10fc122e18a5d94a1d326c43bc132e7af97c6f28c5a656f02203cfb7c73b92fa98d3ee2a8bbf560514615bc9b34c881d2758a5a6f2867092b3
-EBUILD displaycal-3.8.7.0.ebuild 1597 BLAKE2B b916779c94482492e7c5afb4c14df42112e57aacc9abd225ff6734aa1b826329a60077dfcf4f36ca2a0d423036e16126a151226b47a992770b1048735c7a07d0 SHA512 6be4e0594baa19567b31f7a1daeabcfc1bb6a9a21c8212003de604588dfcff97ec97c17f18c2dd7ab910e6dcf69697c0f50a1e4be623e3f798bc8661bceb3e82
-EBUILD displaycal-3.8.7.1.ebuild 1597 BLAKE2B b916779c94482492e7c5afb4c14df42112e57aacc9abd225ff6734aa1b826329a60077dfcf4f36ca2a0d423036e16126a151226b47a992770b1048735c7a07d0 SHA512 6be4e0594baa19567b31f7a1daeabcfc1bb6a9a21c8212003de604588dfcff97ec97c17f18c2dd7ab910e6dcf69697c0f50a1e4be623e3f798bc8661bceb3e82
 EBUILD displaycal-3.8.8.1.ebuild 1597 BLAKE2B b916779c94482492e7c5afb4c14df42112e57aacc9abd225ff6734aa1b826329a60077dfcf4f36ca2a0d423036e16126a151226b47a992770b1048735c7a07d0 SHA512 6be4e0594baa19567b31f7a1daeabcfc1bb6a9a21c8212003de604588dfcff97ec97c17f18c2dd7ab910e6dcf69697c0f50a1e4be623e3f798bc8661bceb3e82
 MISC metadata.xml 342 BLAKE2B e74a7767c5b6e82bd35776606de555f9d4f26a25727decc6b0216fa3ea27cee8f28a7749e46b842c52e403c5150b24b4e33e0b971bd49077814e7945ee8cc290 SHA512 f9d5979fc8525c40af8d4e64afb8264873b0ae7cda1e9c4f3b3f30957c2a4f7fcbab76002783213a896395e8b5ef78e315441c28872589a91a0035d5f346d317
diff --git a/media-gfx/displaycal/displaycal-3.8.7.0.ebuild b/media-gfx/displaycal/displaycal-3.8.7.0.ebuild
deleted file mode 100644
index 6d9baac97b2a..000000000000
--- a/media-gfx/displaycal/displaycal-3.8.7.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils xdg
-
-MY_PN="DisplayCAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
-HOMEPAGE="https://displaycal.net/"
-SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=media-gfx/argyllcms-1.1.0
-	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-	>=x11-libs/libX11-1.3.3
-	>=x11-apps/xrandr-1.3.2
-	>=x11-libs/libXxf86vm-1.1.0
-	>=x11-libs/libXinerama-1.1
-"
-RDEPEND="${DEPEND}
-	dev-python/faulthandler[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.2.1[${PYTHON_USEDEP}]
-"
-
-# Just in case someone renames the ebuild
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Do not generate udev/hotplug files
-	sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
-		-i DisplayCAL/setup.py || die
-	# Prohibit setup from running xdg-* programs, resulting to sandbox violation
-	sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
-		-e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
-		-i DisplayCAL/postinstall.py || die
-
-	# Remove deprecated Encoding key from .desktop file
-	sed -e '/Encoding=UTF-8/d' -i misc/*.desktop  || die
-
-	# Remove x-world Media Type
-	sed -e 's/x\-world\/x\-vrml\;//g' \
-		-i misc/displaycal-vrml-to-x3d-converter.desktop || die
-
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/displaycal/displaycal-3.8.7.1.ebuild b/media-gfx/displaycal/displaycal-3.8.7.1.ebuild
deleted file mode 100644
index 6d9baac97b2a..000000000000
--- a/media-gfx/displaycal/displaycal-3.8.7.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils xdg
-
-MY_PN="DisplayCAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
-HOMEPAGE="https://displaycal.net/"
-SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=media-gfx/argyllcms-1.1.0
-	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-	>=x11-libs/libX11-1.3.3
-	>=x11-apps/xrandr-1.3.2
-	>=x11-libs/libXxf86vm-1.1.0
-	>=x11-libs/libXinerama-1.1
-"
-RDEPEND="${DEPEND}
-	dev-python/faulthandler[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.2.1[${PYTHON_USEDEP}]
-"
-
-# Just in case someone renames the ebuild
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Do not generate udev/hotplug files
-	sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
-		-i DisplayCAL/setup.py || die
-	# Prohibit setup from running xdg-* programs, resulting to sandbox violation
-	sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
-		-e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
-		-i DisplayCAL/postinstall.py || die
-
-	# Remove deprecated Encoding key from .desktop file
-	sed -e '/Encoding=UTF-8/d' -i misc/*.desktop  || die
-
-	# Remove x-world Media Type
-	sed -e 's/x\-world\/x\-vrml\;//g' \
-		-i misc/displaycal-vrml-to-x3d-converter.desktop || die
-
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/ditaa/Manifest b/media-gfx/ditaa/Manifest
index 7a979ef2fd81..2293b45c95af 100644
--- a/media-gfx/ditaa/Manifest
+++ b/media-gfx/ditaa/Manifest
@@ -65,5 +65,5 @@ DIST xml-apis-ext-1.3.04.pom 1837 BLAKE2B a1db75a095c5a007fe95088428aa84efc6d94c
 DIST xmlgraphics-commons-2.2.jar 646509 BLAKE2B d129509003efc96a737d90c8e0bf52cf0a7b8e75ecd6eac44f918022a88290d498430c6e0eb903c100a026e2b863e391b8b6f20e78bdb1c22c589557616e9e49 SHA512 77f07e7ccce8f55dfbddbc4a9777aaacebd13a55edb67124017683c0e0bbdcf5bfa54d91a86de700e3116fbabc066b1810d189c4832bf1464db9c52a3c9f554a
 DIST xmlgraphics-commons-2.2.pom 3480 BLAKE2B c4694909338261307bc5bffe3e0de003bcbffa7dbeac3f568022bd9a42f9ba6a3138858d2354de0a9ab21ab9219c8d8577cc4b440921b3727053dfd1df7bb95e SHA512 3fa756d43ffd9e2b50f804f63a412329e74c96e3487b97676882c574daa08a1167b41f438cc07b575816c6f6ddbac5d017d0a34a74218834aac4fa90baf98b95
 EBUILD ditaa-0.10.ebuild 877 BLAKE2B bfef9480532218b20fb76898966ccfe733ed35a66921657aaa2029f369d7bcd5a8960b762e05b2e7e07b099f6926581e2694f82ffa2d4db2727d504a17edebe8 SHA512 16a191d7bd8eb04a12f5099aab7103ced74004baafa67edd4567e410c33e538ce32a086f6ffb961ad210136dfd60ccee2919e7341709c41669945ad11378d6c2
-EBUILD ditaa-0.11.0.ebuild 7442 BLAKE2B 4d1bc5beb70b3af38bc5e91a2f28cdad850314c8008e40527ff75a07614a4823301354ac59fa5deca76ce2d0c882c481c0dac30c0136fbd0039446c3038853b7 SHA512 79a04e02ecfc7c05b3e0c551d8c5eddb21c955ec0d301ea8c0ed55eafcd452d508bd2c6bff27953ff59820798f0422260542b14f5a00d056185338fbec5f464e
+EBUILD ditaa-0.11.0.ebuild 7444 BLAKE2B 6c61e65f837c691293c5b39e8ea9407595d3f7a5ee6b9bf87a1740d9642c9c610494bda2275e748f00c640462fdb0a8312bacb7b2c0c79b7c48f34506121162b SHA512 3157bb91c4035de6807d8587d3a3b9c095bc3a6478145e733553981a481031b91d34ffbf56aa11709f399ea8c9824d3ab8ab4d366829a9bcbdf3cc68c04fcb67
 MISC metadata.xml 353 BLAKE2B c1399a1104a9fee9cf1ae3a55f85b1ea9865a3e2b6f5c19836918a3cfc551ccc179ce5571f94df4910e5a0bca955322485b6359257e3a6643ed19cf9c37216ad SHA512 6112ea1ba12f0d98ae7fa47f05e85bd2394dc84fb5ac3cce4979f4bf45ec8796b77482b74c7e58086243bc3d5d57128a59cee7bd085308a2a5f373e27ce043de
diff --git a/media-gfx/ditaa/ditaa-0.11.0.ebuild b/media-gfx/ditaa/ditaa-0.11.0.ebuild
index 15a698349069..eecb078348d3 100644
--- a/media-gfx/ditaa/ditaa-0.11.0.ebuild
+++ b/media-gfx/ditaa/ditaa-0.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/stathissideris/${PN}/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 IUSE=""
 
 DEPEND="dev-java/leiningen-bin
diff --git a/media-gfx/engauge/Manifest b/media-gfx/engauge/Manifest
index 29dff18aa6e9..16b15d87dbf3 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 2324 BLAKE2B 5585f8e4675da09a8b3a3691f387cdd1bf06992f43548712eb58f4e9029e41d31aa70da50c0a762462a26744a1b1bb4b1feffff9089016ce0b8ada00b7619faa SHA512 0cbbe01804a346a606050479e79447616ea35e72536470c3ce5d5140bc779e28789260cb79f8ff97ae18553af899118084aa697715cdb298da36bfb8d2354a4a
+EBUILD engauge-10.6.ebuild 2253 BLAKE2B 2a704f6f1954d9cde078bbdd1a9682f55cb12a048b0169ef66651d269af980c2d90514dd64f76b5e83b63910d115a4ea3b360c8b9dfc84145dc4bc52ccbd8f41 SHA512 824195c10b66e7c65e494f37a3a78584e6cbdf2ca3e7d429050104e91c052b139e5d010afde757f0817fd169c5c222c98bb98162c64d60f1d5e5214697a2e941
 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 7d8aba7d2cce..d9161fe8f238 100644
--- a/media-gfx/engauge/engauge-10.6.ebuild
+++ b/media-gfx/engauge/engauge-10.6.ebuild
@@ -74,11 +74,11 @@ src_install() {
 
 	if use doc; then
 		pushd doc >/dev/null || die
-		doins -r . || die "install documentation failed"
+		doins -r .
 		popd >/dev/null || die
 	fi
 	if use examples; then
-		doins -r samples || die "install examples failed"
+		doins -r samples
 	fi
 }
 
diff --git a/media-gfx/entangle/Manifest b/media-gfx/entangle/Manifest
index 36e8389882cd..11fb2b46abcc 100644
--- a/media-gfx/entangle/Manifest
+++ b/media-gfx/entangle/Manifest
@@ -1,5 +1,5 @@
 DIST entangle-0.6.0.tar.gz 906858 BLAKE2B 18a35ef7e077f5929846127e06bff2d07b61c5409d2957b421d8ec5466f29483b6fc7d5567cd057e2b44ef4147ed962e267e7e5509ef6640582b5d291a7f79f3 SHA512 f96718f01286eb0dbf1fafd4d51258bda876a5b22a6167173f0f60b4fe00683baff3d4c8f9866a5dc1eec493e2b25fd932794a63a8a8d102cb220b1d6ea8e960
 DIST entangle-2.0.tar.xz 501912 BLAKE2B b7e1c393dc95d66bf4389c607c0eb6eb70161ceb2c845135c7c99313a1ec13388c6b00fd6ed7f38ad6f9f18d8c97eba0aadab7964d1be8ec03373e5598374796 SHA512 be8b75c5dd0bdd7cd380f35b5d46d7be9f7caa2be257ce954cf9516ebd5601071ac8b50838f9c40470b6e3e5f95083c3671af68ac43eb345a60d674636a0fe86
 EBUILD entangle-0.6.0.ebuild 989 BLAKE2B f122100e8892a4ee256e0e2cda1b3c243a20c68058b6778ebb20509b53395998cd8b6c273131289690408f28b1bc04767a023dbfce404eecf6cb9272eca7cd5e SHA512 cc78f9327578e7ef13d29d0547bb76144f4d4a4b2698a7457014441a044dd2afbf1dbf157185cd9c681a7d486935369c099fcc2a04e8ce871892f4a1b34e5d2b
-EBUILD entangle-2.0.ebuild 1395 BLAKE2B 2210087e4f41847b80680a20564f47f7972e4a28640550b8a6f02e611c7e63f3f940b20eca61bf9d8ab49439336912b1a069a12a575e9a2b4df662ae81bac0c3 SHA512 c486b1bacd394cd714f74e12995509445bed330dd1a5095a554035cb33e534a28a22d4026a572eb0d8c334a61bbd09039092f932edfa3f8048ad9994bedcacd6
+EBUILD entangle-2.0.ebuild 1402 BLAKE2B 0a8e798f96b75d095ef95dfb313fb7980bc84d964f5bc630352d5d09cfbdf76207f8bf0dcb4c1e8bac4ba2f24b7a133ea0462de946a4a14455eda28819f93fc9 SHA512 38073a2dd304e40a10d4be4f2f06651632268eac42645ccd323d65ec5882da1bf3239bff5250b395dcfa0be7bf51d24e71bc0953ad7e003ed75f952df4635c50
 MISC metadata.xml 446 BLAKE2B 1c466f17b5df47045169784918723e953945eaad2eb5879cde6f099feec4cb419e867f77879927933fe3daec259184a361f464b968b19bdf3463b01b7371589d SHA512 555966a8638a027288abdc7ba6d625c15c18792c3401d399a12dc256ec75f14882fce3e70596a3f3e2ed6729e471af04b14d520b8e2e70206a172f98b9967dae
diff --git a/media-gfx/entangle/entangle-2.0.ebuild b/media-gfx/entangle/entangle-2.0.ebuild
index ebb4c3d3cf09..00fd3649f7ac 100644
--- a/media-gfx/entangle/entangle-2.0.ebuild
+++ b/media-gfx/entangle/entangle-2.0.ebuild
@@ -21,7 +21,7 @@ DEPEND="
 	>=dev-libs/glib-2.36:2
 	>=dev-libs/gobject-introspection-1.54.0
 	dev-libs/libgudev:=
-	>=dev-libs/libpeas-1.2.0[gtk,${PYTHON_USEDEP}]
+	>=dev-libs/libpeas-1.2.0[gtk,${PYTHON_SINGLE_USEDEP}]
 	>=media-libs/gexiv2-0.10[introspection]
 	>=media-libs/libgphoto2-2.5.0:=
 	media-libs/gstreamer:1.0
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index 3de9a9833457..31875754ce21 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,5 +1,5 @@
 DIST eog-plugins-3.26.3.tar.xz 470712 BLAKE2B cd5845481006b681555f35d1f353ed624baa83fc8fc45bb889b2418f31a776bf9e08e270f911f61f431123825a5b96fa684f72e378ddd0ad1107ff44a5c98519 SHA512 5ea0bbf692fa71fa77b0b78307cceee067c95e80c2e69e173990c1154df8014912f24f8d023eda79da56b7c1bdf0870e5e92b968a68c4961af3fc1382d4f468c
 DIST eog-plugins-3.26.4.tar.xz 477772 BLAKE2B 104ddf58d33e5513349839312fef820af20d7a3e64a3a8cbd7d964d8250564d6cd62c58cf95fb5359ab95eac8fe2b83ed051e6f3dc8144a8884ec72c74a12622 SHA512 95f2cf2c6ed84b4801517a708f18e1cd673f814d849029a41491f3719512d6a3a2cb5cb11898a7f972f8b674c682245c99964ba2da19b285ed175b720d5396e8
 EBUILD eog-plugins-3.26.3.ebuild 1643 BLAKE2B 2a215a9e8543aa1375f76010b86549570cb94dfad3456b32edbc34331c11edae91863ab578e14a8a01f542d5ba81f08afa179e5a14e7d1a5dc095c1e6f60d79e SHA512 804238ae08418988ca0d9c081856534102df03be217c79f6a159b4fff33d85bbeadd055dbae6b6a73056e133c461def676e2e41ad34e6d301fd86525f102b5e7
-EBUILD eog-plugins-3.26.4.ebuild 1645 BLAKE2B 3612e4ba2e617760703c89ac8b0b767a667030e463f66c02b96a7573b8477211179367609b255068ab19ecf6f7666cb7c914202bc02e242a0a9faadfb7b99316 SHA512 0a34bc3225f031a17fece2dd6ba65c27a191cadd7a8c363548674c3094d954ca33988d433d646ee71b04b4d936152089a75712bd7f5fb7699e39440e10adb024
+EBUILD eog-plugins-3.26.4.ebuild 1645 BLAKE2B 2506b95724c7c841148a3119fddcde8bf694d38e069b49f0c99f6cfca91ceb02f9ed4f3a86d1ffa8d201c1e59ac656155aa32570f413e7e1d5c5ece1a3f57810 SHA512 528dc1f6b0581f0cab4d515e9495cb702905b522b90c9ecec8610d150ca1476096843c502f3599e314fb2e796fb5d9be35d38e36442ea3f028b15d0f247926e9
 MISC metadata.xml 428 BLAKE2B b10706bb7638538d5ce63c9787e7a1730e01c8383f2d2a093e38184b031933d2b3749241aa2f3254be4c84fac104bb8ec72940cdf8cd5a9f7bc0944541b015c6 SHA512 9684f07846ce7e49ad82843c2b8b7ac5c9d7124bddb07778292d6810162e89a3d41e7ca426f331e4bae6ecfbe53f71409b35418affba6382e874c78b64ed102f
diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.4.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.4.ebuild
index 8cdfa42dd1c0..267d2dfd4e31 100644
--- a/media-gfx/eog-plugins/eog-plugins-3.26.4.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-3.26.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
 
 inherit gnome2 python-single-r1
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="+exif map picasa +python"
 REQUIRED_USE="
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 4c0c94bb35c7..163ad184476d 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,5 +1,5 @@
 DIST eog-3.28.4.tar.xz 5732396 BLAKE2B 9adf7e6793add9298dd879a0fe5ea7c736854d3a40473b2def84851a1e5a78ef84316b20b172c85c85f070278a51b06c1019aef1e5e9c5f31a87243c9229a579 SHA512 57ccb6269b2829a0606cbae08fc376bcd13028d3affe03d76c929a95faf9106dfd497872a12019158aeff5e8e101640d912cae0cece435121319820df7262c00
 DIST eog-3.32.2.tar.xz 4601712 BLAKE2B 84803acf2e2c2cb7451b357d18c7553854dd9a440ee8f951db479641ebf7fe49d8b8185124301c8b272db22d424c31197146e58d0907248cb87aa822441184d6 SHA512 c1093db4bce6bfde758a42fddc7ce7437d2adf3aa44a633b253ca3cb75c910e8862a323d182394696c617cb92114919dc576b992e7a65aa5fefb504062382d81
 EBUILD eog-3.28.4.ebuild 1545 BLAKE2B 99d8a1146eda116127f92d61fa32156f6b771de5d10882b3911a7a7e8ff975373bbfd7f12c705f5034a4de39fc3075a39f01480e5a4ab3ff435ca1fcf48f3b86 SHA512 2f1515802ca565104be4193276bff4f787072e08765feaed378cdeb91c5e911707a53ab61cca383770ead610477798e6d8f6ed1e09fbdf4cf5c33cf2bab143ca
-EBUILD eog-3.32.2.ebuild 1558 BLAKE2B 6b055c8daee8d02bee2a8f5e60ea3715801947c9a69e10e9c7e6532fe77085622d70e821fa98929706980b212d0f844cd2c7a53285eea4c8feaf6084dbf624a1 SHA512 d22a4803fb821cc1c4d20d55ed330282c2762b7f5cc24f5af0ae064f66593e992ba956040f59d2b18c30b0fedb2ac3223cf6936ba7f8e72b14a17cd13b61055a
+EBUILD eog-3.32.2.ebuild 1556 BLAKE2B 4a6f2ce822682b8fb164e7b95a26a16fe6bd9f1d09ac21d70a38942673370aa4b3e5007f3b41c37be9badb97f4f2080a1e8e82f0de3ee816ec7300f92d55b957 SHA512 e988399d2027b41da66b5004c9e879238799b24b12e3581229c995b39b51b7c78322a7734f1688f1b8c87f231e339d6cba8507778bd6d9ad18796b3a2e1bd5f1
 MISC metadata.xml 481 BLAKE2B 2c12b594b9a5b1e4ce3983131d1911f62026c5186d8f5c5af13842cfedfa4d20abdc5ee82e11db3a2e1b45e2b8d4d95fa1a62e668936956e8453b166daff00b4 SHA512 141ec1d6923697f744de806804279b602120ce3d5494257de36b8c8b71185d101692f2e438d7ba0e4a4c946d0aaba068117f16c8344abe891e0ddd4f768ded26
diff --git a/media-gfx/eog/eog-3.32.2.ebuild b/media-gfx/eog/eog-3.32.2.ebuild
index 88760dd26209..696783af59c4 100644
--- a/media-gfx/eog/eog-3.32.2.ebuild
+++ b/media-gfx/eog/eog-3.32.2.ebuild
@@ -14,7 +14,7 @@ SLOT="1"
 IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
 REQUIRED_USE="exif? ( jpeg )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.53.4:2
diff --git a/media-gfx/evoluspencil/Manifest b/media-gfx/evoluspencil/Manifest
index d88ef1579cbb..aab9a40d5f5f 100644
--- a/media-gfx/evoluspencil/Manifest
+++ b/media-gfx/evoluspencil/Manifest
@@ -1,6 +1,6 @@
-AUX pencil.desktop 196 BLAKE2B 68f39a50bb5fc78ab4add930c95fce0408488e878a33577cc906e1f81e65ce7be433ae305156cfbbb221de7ad146a1ff2085d955b69ee1b6ae8ccaada6659867 SHA512 f392b155602b99234fab97c49ddc5646a4f2a9cf06748519b45b3d61759bfd6c2b4c6cf33b93980d31e738cbcc5f9842b0dc08f1961b200565d0c61cf62b1736
+AUX pencil.desktop 202 BLAKE2B bb588b85ed8e8e9fbed0425f3a6a88dabe77d42a1c6efbe9cfc32017d2373015b8f64899c5ca0f8992278debeeff73ca8c0985038f21342e25198eefa059c251 SHA512 101e4f9a205b71ae3a2ee084b40108a05acf210b78d54dad2d35c6fc215468d8fad10a963aee2a7dffd0406b56a98b61a0e28cf8b9ee563a78f66b9fd20e620c
 DIST evoluspencil-3.0.4-49.rpm 55779457 BLAKE2B 7f74bf4d0ac4dcd6ef2e37d56e6b06eda72a34e6c4bc0e2fbb5b55727bb3ba0ecfe183e64ad5f6abe77d258dca2bfc7acca0d08c934a7700699690ff8d39e335 SHA512 72a17841d214523223d6f35ca8ba69076070baf83248ceb5747a23865ec955f8aafbb799eb01b3a3c99226a7bc1653e55be6f7292941b1a859598e016673f2ec
 DIST evoluspencil-3.1.0-1.rpm 88059338 BLAKE2B 905f37968815be8daf37f60197f33636094c1007553d917f4098e09de9943bbd027bb21cf216df64145206ac968b48fff7a91fcb3acbb1b5d01a897375e31e99 SHA512 3a9a451563f499d918b36b48482a13107e18de0f7fcb786b20a88ffd8f487cf07cfdc279bcf6d4db3b8bbde89a424352d7e1fa1d8eeaa4972d830ec22883a15f
 EBUILD evoluspencil-3.0.4.ebuild 1214 BLAKE2B e1f6e703f422d56b9e8c7c88d5c92be1d31fd9f52e7a5693032169030684787066118bf78eee2887f26085cd491e0e1d33f1220bcd7827a4b3181c869251a505 SHA512 5171bedc17afcb591a5321766c676508ddc82525c54cfe036857bf3a9a368e49936042da78c6ffe74dcdbb56d4214f60f4daf7ead62399e6c25a8c468bc8991a
-EBUILD evoluspencil-3.1.0.ebuild 1600 BLAKE2B 98e6e379b7161a6976121ae09a54b8be2536f692b7b1d71700238cae9b6fbe4218b0863727d91880d24a1b85f5f0f67b3114ef8b35092388380993e8d8ab7e93 SHA512 27db14562b9e1e5832af6cbce38a932dad8cf4768eb681414a23da7f934cf9d011b169f271cfec31cedcb9ccda116351dea32ae25fbb4b8c40a23df7c7995e5c
+EBUILD evoluspencil-3.1.0-r1.ebuild 1580 BLAKE2B 6eeef050f664ab5aa9c400bdcdd99f545d8db2d995a3eefc46707ca6fffa31fc5fa1556f5f3e863af7823e1ad06869e05bab42f80e9e1816afd60fcb925c986a SHA512 a9a28d1ff3fd7845cf5cc091672ee5b19a9386b448aa1922fe16648353a4d45e5bd0dce45d3b0b9ff51e25e82ba21db3a08e741ec3445937a3b817e9b38a6713
 MISC metadata.xml 299 BLAKE2B 219ec05cbf4172c1097e96d59b6e6cee44ea19ebe827440b53493c1953bebe7c5a3f017b6d2ef0bb5300a3d9cd957e683461c4f3edc8bc4d17603c7d78ed59d9 SHA512 be27e090213278995ed73b5b85ef663921136f999def3608d1fdf79bd6537ba38d2424f204e228aa498fa85a2e327633c63b6ca01dae330cc37c4f6832ff861b
diff --git a/media-gfx/evoluspencil/evoluspencil-3.1.0.ebuild b/media-gfx/evoluspencil/evoluspencil-3.1.0-r1.ebuild
index 199a2b8ec46d..4980879c87bb 100644
--- a/media-gfx/evoluspencil/evoluspencil-3.1.0.ebuild
+++ b/media-gfx/evoluspencil/evoluspencil-3.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit rpm xdg-utils
+inherit rpm xdg-utils desktop
 
 MY_PN="${PN/evolus/}"
 MY_PV="${PV}.ga"
@@ -64,10 +64,9 @@ src_install() {
 	doins -r opt/${MY_PN}-${MY_PV}/*
 
 	fperms 755 /opt/${MY_PN}/${MY_PN}
-	dosym ../../opt/${MY_PN}/${MY_PN} /usr/bin/${MY_PN}
+	dosym ../../opt/${MY_PN}/${MY_PN} /usr/bin/evoluspencil
 
-	insinto /usr/share/applications
-	doins "${FILESDIR}"/${MY_PN}.desktop
+	domenu "${FILESDIR}"/${MY_PN}.desktop
 
 	mkdir -p "${D}"/usr/share/icons/hicolor/256x256/apps/ || die
 	mv "${D}"/opt/${MY_PN}/${MY_PN}.png "${D}"/usr/share/icons/hicolor/256x256/apps/ || die
diff --git a/media-gfx/evoluspencil/files/pencil.desktop b/media-gfx/evoluspencil/files/pencil.desktop
index 4a3354ddfd9e..c965585c02fb 100644
--- a/media-gfx/evoluspencil/files/pencil.desktop
+++ b/media-gfx/evoluspencil/files/pencil.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Pencil
 Comment=An open-source GUI prototyping tool that is available for ALL platforms.
-Exec="/usr/bin/pencil"
+Exec="/usr/bin/evoluspencil"
 Terminal=false
 Type=Application
 Icon=pencil
diff --git a/media-gfx/exiftags/Manifest b/media-gfx/exiftags/Manifest
deleted file mode 100644
index d1994f56a28b..000000000000
--- a/media-gfx/exiftags/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST exiftags-1.01.tar.gz 70921 BLAKE2B e1ca96f057ef1d00f6b50d33bdb7ea11805d7a9b0f628fcab0a6729edfede4b8f54be81119aaeb9586122225aea02059df625c468b63f9747ba47de04355bc97 SHA512 850d9f709dfa034eb5e04318f18b85c486c21407525074a00dccd81781b874cc6a34dccd97b4566fbeb96c61399858ce0718eb90e329383974b6c4dc0180c684
-EBUILD exiftags-1.01.ebuild 624 BLAKE2B 01d45e9f99b6430eb9edaa9a2dd81bf8e52e52e95b9e2310b89526a647652617618f6f483ccf6cc15d9caf7365adf4f690173f933366e485f32e47b4cb809d7d SHA512 5cc8ba7378a8b4b806b32ad88212c32c159c1d88c2ff77abe3f9fb4e75b31a66d62b41fd91052e3a21fd4b06990459e395391ae1af74e0fd673ab60adc3f60a9
-MISC metadata.xml 259 BLAKE2B 0a31c91e9ff9700c8a5c77c6eb9ddad55c6b78e7e583213c20adc8e73248c7e8b31c9a11702a0b5a8b665acd2753c145362974d6c5c6aae1979c7845ab4b01d8 SHA512 6744883613ae3b83c57ec9604c5f31717ab714b4f3e7f4f680e4b9e54f622f8e5f753b3cd666862f0e3e6dc4223aee87b89aba472d9f20e1b317595e06aeae30
diff --git a/media-gfx/exiftags/exiftags-1.01.ebuild b/media-gfx/exiftags/exiftags-1.01.ebuild
deleted file mode 100644
index b2ff92f16ae2..000000000000
--- a/media-gfx/exiftags/exiftags-1.01.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs
-
-DESCRIPTION="Extracts JPEG EXIF headers from digital camera photos"
-HOMEPAGE="http://johnst.org/sw/exiftags/"
-SRC_URI="http://johnst.org/sw/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND=""
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed."
-}
-
-src_install() {
-	dobin exiftags exifcom exiftime || die "dobin failed."
-	doman exiftags.1 exifcom.1 exiftime.1
-	dodoc README CHANGES
-}
diff --git a/media-gfx/exiftags/metadata.xml b/media-gfx/exiftags/metadata.xml
deleted file mode 100644
index 899a49093b0d..000000000000
--- a/media-gfx/exiftags/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/media-gfx/flam3/Manifest b/media-gfx/flam3/Manifest
index aebde316cb4a..3acd6916bc13 100644
--- a/media-gfx/flam3/Manifest
+++ b/media-gfx/flam3/Manifest
@@ -1,4 +1,3 @@
-AUX flam3-3.0.1-libpng15.patch 2446 BLAKE2B 2fceeba5e87af7242e88cd9844aa6ccbd0e3aff989c9dcd3b3a22d65f3e3c28d9437d9ef48b46f74c1992d4575549a5238875d4e43d76865b7651e16df42f803 SHA512 e14120be47dbeef0d7790385f3202dee2014f6cc48631b6a14a3cc8b759771a32b4ef2a3cdfd5048d0286ef173c95d017b4c3c997bab3f909fb777a95832df28
 DIST flam3-3.1.1.tar.gz 1181954 BLAKE2B 9691647704e96052f04f79b59b55b47285940ada3486ef6828d1e95934c5741915bf0e4f11c3ff39da7b5534b5c6c9ec16a88bc0568ac65c8a4b5d4aff9c8d29 SHA512 8a84840d9cb91d63dd0ba5c8a6725f703f6315a7add0c091502c0dac5c77eb0495054bb4b601f72454dea0def99131ca679095da65eeebaae9b01dc59cf75e7e
 EBUILD flam3-3.1.1.ebuild 752 BLAKE2B a3610475d5b8ca2838ff1e63e8762f6abb33c81300eb1b347f808e1d9f73c883f91303130d6b7dccdb3f7cfe8ce12f7b3c22d41fcbb3262c27d970820e6c7fc3 SHA512 040bd665e40d14196122a32bdc39b60f9d120bdbf7c93e0b4134879fd1d57c6dd9ad0aac4b0c0ca5d4ef9090a54f93e3ba826eba1a3325aa75272fa5cfc518fd
 MISC metadata.xml 322 BLAKE2B 8fa31c5e84e310169a863d1d66a77d73cff819cf595acfd7fc8f23c90a2271348899e8a5a5a5a184ea7de9428aebf7d841ab0a035fdc28f0ecd312396dcf3def SHA512 98b61c299f8cfa8c42a5f4b5b51b9eecbdffe3632ef8fd687afab26454fa8fccb71348a42cca69fbae7d154f69814feac61c4109ba671dd2fa413bf75e0445ca
diff --git a/media-gfx/flam3/files/flam3-3.0.1-libpng15.patch b/media-gfx/flam3/files/flam3-3.0.1-libpng15.patch
deleted file mode 100644
index 61f905589872..000000000000
--- a/media-gfx/flam3/files/flam3-3.0.1-libpng15.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-http://code.google.com/p/flam3/issues/detail?id=8
-
---- src/png.c
-+++ src/png.c
-@@ -142,7 +142,7 @@
-   }
-   if (setjmp(png_jmpbuf(png_ptr))) {
-      if (png_image) {
--	 for (y = 0 ; y < info_ptr->height ; y++)
-+	 for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++)
- 	     free (png_image[y]);
- 	 free (png_image);
-      }
-@@ -161,19 +161,19 @@
-   png_set_sig_bytes (png_ptr, SIG_CHECK_SIZE);
-   png_read_info (png_ptr, info_ptr);
- 
--  if (8 != info_ptr->bit_depth) {
-+  if (8 != png_get_bit_depth(png_ptr, info_ptr)) {
-     fprintf(stderr, "bit depth type must be 8, not %d.\n",
--	    info_ptr->bit_depth);
-+	    png_get_bit_depth(png_ptr, info_ptr));
-     return 0;
-   }
- 
--  *width = info_ptr->width;
--  *height = info_ptr->height;
-+  *width = png_get_image_width(png_ptr, info_ptr);
-+  *height = png_get_image_height(png_ptr, info_ptr);
-   p = q = malloc(4 * *width * *height);
--  png_image = (png_byte **)malloc (info_ptr->height * sizeof (png_byte*));
-+  png_image = (png_byte **)malloc (png_get_image_height(png_ptr, info_ptr) * sizeof (png_byte*));
- 
--  linesize = info_ptr->width;
--  switch (info_ptr->color_type) {
-+  linesize = png_get_image_width(png_ptr, info_ptr);
-+  switch (png_get_color_type(png_ptr, info_ptr)) {
-     case PNG_COLOR_TYPE_RGB:
-       linesize *= 3;
-       break;
-@@ -182,21 +182,21 @@
-       break;
-   default:
-     fprintf(stderr, "color type must be RGB or RGBA not %d.\n",
--	    info_ptr->color_type);
-+	    png_get_color_type(png_ptr, info_ptr));
-     return 0;
-   }
- 
--  for (y = 0 ; y < info_ptr->height ; y++) {
-+  for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++) {
-     png_image[y] = malloc (linesize);
-   }
-   png_read_image (png_ptr, png_image);
-   png_read_end (png_ptr, info_ptr);
- 
--  for (y = 0 ; y < info_ptr->height ; y++) {
-+  for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++) {
-     unsigned char *s = png_image[y];
--    for (x = 0 ; x < info_ptr->width ; x++) {
-+    for (x = 0 ; x < png_get_image_width(png_ptr, info_ptr) ; x++) {
- 
--      switch (info_ptr->color_type) {
-+      switch (png_get_color_type(png_ptr, info_ptr)) {
-       case PNG_COLOR_TYPE_RGB:
- 	p[0] = s[0];
- 	p[1] = s[1];
-@@ -217,7 +217,7 @@
-     }
-   }
- 
--  for (y = 0 ; y < info_ptr->height ; y++)
-+  for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++)
-     free (png_image[y]);
-   free (png_image);
-   png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp)NULL);  
diff --git a/media-gfx/galleryadd/Manifest b/media-gfx/galleryadd/Manifest
deleted file mode 100644
index b045df832965..000000000000
--- a/media-gfx/galleryadd/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST galleryadd-2.30.tar.gz 10763 BLAKE2B fd5e88bd7f293ee9e76abd8caaca53ac97529cb8136fed3a3264426a0213073ffd358e044249b933b10f7628513e7159cfc50540a6ff021cf78ec740e2768f1f SHA512 f604c92eedf6e753d727c064a1460298b6155e0960cdd1795e36d29a6442e294c153842c296b5422b6a38ffbde671954ce59da27c13740f85da74b0b3efaf162
-EBUILD galleryadd-2.30.ebuild 496 BLAKE2B e45c62d56d08a8fed23fd6030b0035b361b3d8749fd751e94d25a13fc7bc9d551bd04db44370a42757ad6a026f25f406073dbfb7755200be6775a131029a636b SHA512 39ef55a595c270d7a62592a556475e6cf9912a8da49cfc37bfc8ddb76014295c894eb3fb0d1d27dc1230341bf4697910b47c20b3216da6e92532d3de022b5e35
-MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/media-gfx/galleryadd/galleryadd-2.30.ebuild b/media-gfx/galleryadd/galleryadd-2.30.ebuild
deleted file mode 100644
index 7f0e2e0fbbf1..000000000000
--- a/media-gfx/galleryadd/galleryadd-2.30.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Perl script to recursively adds directories/images to Gallery"
-HOMEPAGE="http://iainlea.dyndns.org/software/galleryadd/"
-SRC_URI="http://iainlea.dyndns.org/software/galleryadd/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RDEPEND="dev-perl/libwww-perl
-		 virtual/perl-Time-HiRes"
-DEPEND=""
-
-S="${WORKDIR}"
-
-src_install() {
-	dobin galleryadd.pl
-}
diff --git a/media-gfx/galleryadd/metadata.xml b/media-gfx/galleryadd/metadata.xml
deleted file mode 100644
index 79d462e85571..000000000000
--- a/media-gfx/galleryadd/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>robbat2@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 1690771ed8d8..987dbb9ab708 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,9 +1,4 @@
-AUX geeqie-1.4-exiv2-0.27.patch 2052 BLAKE2B db7bb4d2631d566e4c9dbc89cad262cfb173df96b92ea83a690bdcdbbb7d3c873e9e5bd5a581c45b3a4af42c3c7711c65080e1822eaa31be97632b57d4e34713 SHA512 b8108f9a77022f1a0d1354883d1f7a1981a8079e675e765aa67fac16606ed42ecc169ad5cb8a6baf86e919d6ddf018ed54bf5950b9601d2cd1ff647f7fa47bca
-DIST geeqie-1.4.tar.xz 35881152 BLAKE2B 2932ac379abaee2b742b66daff544f29d7bf0aac82ff97f92e10ac7902ad874badcbb143f562c665d94f6297331090d0746373979a745f338a738078b72538a4 SHA512 a88b6dcf30847e38c109f5bc6436d93f6b4e1336a094c6b8a45db117830117120bf58f390afcd8a4b7aaf2934f995c3f75ac33a7faf56bfc2bcc9bd4eebfb205
 DIST geeqie-1.5.1.tar.xz 1587116 BLAKE2B f8742a88eefd90fb1e7e1d1365058cef190b6231fcb001faa9f110676e8403c8e5959f9af398d6fa1ddc4e4c62439728904c6c39f5095f476014a5b7b74b4d16 SHA512 265eade90afe45856855e856c5f640786ca2e3add57c3ade8ca380d075297f96bf44c6e0c4fd6eabbc2666a37f898b50d37dd2e01d77875b8a622d72d8a0e6ac
-DIST geeqie-1.5.tar.xz 1585780 BLAKE2B 6dc0a30c26f25988cbd3fa81a916642504e9f6f280b03d78c820cbf5b453d8a392d3c8da8d482de24b3c39e7e9ba0663879d651c60a8061b8034d2c526007944 SHA512 2b87d543d8d77a4fec331fd1b73ca2038912362fc1f94c9b0f163dcc7c2dd58118e175c5540aecafb0581708ea5c2a5a321dde09f644e2322bd4ca5c0284b722
-EBUILD geeqie-1.4-r1.ebuild 2396 BLAKE2B 4fe4b8aee881eb138f5b8bf2a7199c18858d45586220c549173d13d8ab5e200b143e8aca3ab623bb9e507419d6b5e5027c63a47d72d4606355a3e9adc03381ea SHA512 5b4b13476620aeee811cd06f357c2fc49a1e732f68a0508715ba113b02688440738edb4799f53adf2a79c713e22c3ed19ef376981b2aed9be884bedd70880bf0
-EBUILD geeqie-1.5.1.ebuild 2277 BLAKE2B da3871fd0cf5af559c1443bb711c2b4a2b78402c4b7b1310930dafdeb41775adfee11862471bbb829531901d5f0bc518de56933880507d6de1aebf713163e2f4 SHA512 b1106f2714c659432ccf384671bd15a0f39cf5bd5d1a883088a15f0bac57ca2749184ed795103d21e6ff48e45818c6330b91702724deb37cb06033cd36f8c87b
-EBUILD geeqie-1.5.ebuild 2277 BLAKE2B da3871fd0cf5af559c1443bb711c2b4a2b78402c4b7b1310930dafdeb41775adfee11862471bbb829531901d5f0bc518de56933880507d6de1aebf713163e2f4 SHA512 b1106f2714c659432ccf384671bd15a0f39cf5bd5d1a883088a15f0bac57ca2749184ed795103d21e6ff48e45818c6330b91702724deb37cb06033cd36f8c87b
-EBUILD geeqie-9999.ebuild 2269 BLAKE2B 719319e9805f58a4f1dfaea869c911f1ade15e762ba46add49975f17b38a6e3909b74e0db223082c06ae55c0aa655389ab5a10e75d4d1dc85552e55105fe29d0 SHA512 8435b9882a9a767af7592bfb59e32d47f0f01e932eac23f920bf0933ae1ae3044302205dd6902fe490c6f995d669b1eaf62b141cc66538444bd5d57d39d896b4
+EBUILD geeqie-1.5.1.ebuild 2211 BLAKE2B 60e09480c32ed15924e77dde7dd598ef5ffe231ff306ec69748302775a9407a59d7402c1c9a711b732ab74e091cc0d78062c0d018aa75415f0b4152d6b69e968 SHA512 27edac026322f122ad0e92bb285a207fcb29e4a7300dc9a332874ebb9eca26e34e2b3485b0891d1a8d80af1fe0783778c9906b1ed01bbdeefac222312b2f3ce0
+EBUILD geeqie-9999.ebuild 2205 BLAKE2B 66b7e06022214a479a57bfc9d162a054411f409074ceec3d0a5ff07b8917c1b7ada20451b5af30d0377e5046f408347ba7fcb6d2e5b5db205ca34f3adea687dc SHA512 f9808d2f779af157583c44b0c1ce8ca2cca71663487aa5918340f19c429da53e186b3eca865a92e49b033456e3de0134f2ac4d9deed2d408a35651785d5a0fa4
 MISC metadata.xml 923 BLAKE2B 49de6dd7b0380b1cc74ccabbc8f84e2c55144b80612e04c4e55c82d052027882cc293a70a52f857bded73246ccbb5351df53dc1e1e08b8c2c08e630bc24f9882 SHA512 752280a5fefc097c5ca8b1fc2e9f05220aa809e45484560edca7baa68d95b0d91fa14973c321aefcdb76052dc02e405e2fb4a32e6322f04cd8223afaa6734d58
diff --git a/media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch b/media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch
deleted file mode 100644
index b9a3bde0db2e..000000000000
--- a/media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 13859e2ec3a1afc74f109cfffdf0de39030cde86 Mon Sep 17 00:00:00 2001
-From: Rasmus Thomsen <rasmus.thomsen@protonmail.com>
-Date: Wed, 2 Jan 2019 01:04:45 +0100
-Subject: [PATCH] fix build against exiv2-0.27.x
-
-fixes #654
----
- src/exiv2.cc | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/src/exiv2.cc b/src/exiv2.cc
-index b3c80657..f40b725e 100644
---- a/src/exiv2.cc
-+++ b/src/exiv2.cc
-@@ -22,17 +22,27 @@
- 
- #ifdef HAVE_EXIV2
- 
-+// Don't include the <exiv2/version.hpp> file directly
-+// Early Exiv2 versions didn't have version.hpp and the macros.
-+#include <exiv2/exiv2.hpp>
- #include <exiv2/image.hpp>
- #include <exiv2/exif.hpp>
- #include <iostream>
- #include <string>
- 
- // EXIV2_TEST_VERSION is defined in Exiv2 0.15 and newer.
-+#ifdef EXIV2_VERSION
- #ifndef EXIV2_TEST_VERSION
--# define EXIV2_TEST_VERSION(major,minor,patch) \
-+#define EXIV2_TEST_VERSION(major,minor,patch) \
- 	( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) )
- #endif
-+#else
-+#define EXIV2_TEST_VERSION(major,minor,patch) (false)
-+#endif
- 
-+#if EXIV2_TEST_VERSION(0,27,0)
-+#define HAVE_EXIV2_ERROR_CODE
-+#endif
- 
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -40,6 +50,10 @@
- #include <fcntl.h>
- #include <sys/mman.h>
- 
-+#if EXIV2_TEST_VERSION(0,27,0)
-+#define EXV_PACKAGE "exiv2"
-+#endif
-+
- #if !EXIV2_TEST_VERSION(0,17,90)
- #include <exiv2/tiffparser.hpp>
- #include <exiv2/tiffcomposite.hpp>
-@@ -374,7 +388,11 @@
- #endif
- 			Exiv2::Image *image = imageData_->image();
- 
--			if (!image) Exiv2::Error(21);
-+#ifdef HAVE_EXIV2_ERROR_CODE
-+			if (!image) throw Exiv2::Error(Exiv2::ErrorCode::kerInputDataReadFailed);
-+#else
-+			if (!image) throw Exiv2::Error(21);
-+#endif
- 			image->setExifData(exifData_);
- 			image->setIptcData(iptcData_);
- #if EXIV2_TEST_VERSION(0,16,0)
-@@ -394,8 +412,12 @@
- 			sidecar->setXmpData(xmpData_);
- 			sidecar->writeMetadata();
- #else
-+#ifdef HAVE_EXIV2_ERROR_CODE
-+			throw Exiv2::Error(Exiv2::ErrorCode::kerNotAnImage, "xmp");
-+#else
- 			throw Exiv2::Error(3, "xmp");
- #endif
-+#endif
- 			}
- 	}
- 
diff --git a/media-gfx/geeqie/geeqie-1.4-r1.ebuild b/media-gfx/geeqie/geeqie-1.4-r1.ebuild
deleted file mode 100644
index 5cf44c8bfe1d..000000000000
--- a/media-gfx/geeqie/geeqie-1.4-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools xdg-utils
-
-DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://www.geeqie.org"
-SRC_URI="http://www.geeqie.org/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp"
-
-RDEPEND="
-	virtual/libintl
-	doc? ( app-text/gnome-doc-utils )
-	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
-	gpu-accel? ( media-libs/clutter-gtk )
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	lirc? ( app-misc/lirc )
-	lua? ( >=dev-lang/lua-5.1:= )
-	map? ( media-libs/libchamplain:0.12 )
-	tiff? ( media-libs/tiff:0 )
-	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
-	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-REQUIRED_USE="gpu-accel? ( gtk3 )
-	map? ( gpu-accel )"
-
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" ) # bug 674044
-
-src_prepare() {
-	default
-
-	# Missing from release tarball, and requires git tree to generate
-	sed -e "/readme_DATA/s/ChangeLog\(.html\)\?//g" -i Makefile.am || die
-
-	# Remove -Werror (gcc changes may add new warnings)
-	sed -e '/CFLAGS/s/-Werror //g' -i configure.in || die
-
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="--disable-dependency-tracking
-		--with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable debug debug-log)
-		$(use_enable ffmpegthumbnailer)
-		$(use_enable gpu-accel)
-		$(use_enable gtk3)
-		$(use_enable jpeg)
-		$(use_enable lcms)
-		$(use_enable lua)
-		$(use_enable lirc)
-		$(use_enable map)
-		$(use_enable tiff)"
-
-	if use exif || use xmp; then
-		myconf="${myconf} --enable-exiv2"
-	else
-		myconf="${myconf} --disable-exiv2"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	rm -f "${D}/usr/share/doc/${PF}/COPYING"
-	# Application needs access to the uncompressed file
-	docompress -x /usr/share/doc/${PF}/README.md
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	elog "Some plugins may require additional packages"
-	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
-	elog "- RAW images plugin: media-gfx/ufraw"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/geeqie/geeqie-1.5.1.ebuild b/media-gfx/geeqie/geeqie-1.5.1.ebuild
index 5323596a4a94..88c65fbe11e3 100644
--- a/media-gfx/geeqie/geeqie-1.5.1.ebuild
+++ b/media-gfx/geeqie/geeqie-1.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools xdg-utils
+inherit autotools xdg
 
 DESCRIPTION="A lightweight GTK image viewer forked from GQview"
 HOMEPAGE="http://www.geeqie.org"
@@ -11,7 +11,7 @@ SRC_URI="http://www.geeqie.org/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map nls pdf tiff xmp"
 
 RDEPEND="
@@ -83,13 +83,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 
 	elog "Some plugins may require additional packages"
 	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
 	elog "- RAW images plugin: media-gfx/ufraw"
 }
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/geeqie/geeqie-1.5.ebuild b/media-gfx/geeqie/geeqie-1.5.ebuild
deleted file mode 100644
index 5323596a4a94..000000000000
--- a/media-gfx/geeqie/geeqie-1.5.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg-utils
-
-DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://www.geeqie.org"
-SRC_URI="http://www.geeqie.org/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map nls pdf tiff xmp"
-
-RDEPEND="
-	virtual/libintl
-	doc? ( app-text/gnome-doc-utils )
-	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
-	gpu-accel? ( media-libs/clutter-gtk )
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	lirc? ( app-misc/lirc )
-	lua? ( >=dev-lang/lua-5.1:= )
-	map? ( media-libs/libchamplain:0.12 )
-	pdf? ( >=app-text/poppler-0.62[cairo] )
-	tiff? ( media-libs/tiff:0 )
-	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
-	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="gpu-accel? ( gtk3 )
-	map? ( gpu-accel )"
-
-src_prepare() {
-	default
-
-	# Remove -Werror (gcc changes may add new warnings)
-	sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="--disable-dependency-tracking
-		--with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable debug debug-log)
-		$(use_enable ffmpegthumbnailer)
-		$(use_enable gpu-accel)
-		$(use_enable gtk3)
-		$(use_enable jpeg)
-		$(use_enable lcms)
-		$(use_enable lua)
-		$(use_enable lirc)
-		$(use_enable map)
-		$(use_enable nls)
-		$(use_enable pdf)
-		$(use_enable tiff)"
-
-	if use exif || use xmp; then
-		myconf="${myconf} --enable-exiv2"
-	else
-		myconf="${myconf} --disable-exiv2"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	rm -f "${D}/usr/share/doc/${PF}/COPYING"
-	# Application needs access to the uncompressed file
-	docompress -x /usr/share/doc/${PF}/README.md
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	elog "Some plugins may require additional packages"
-	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
-	elog "- RAW images plugin: media-gfx/ufraw"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/geeqie/geeqie-9999.ebuild b/media-gfx/geeqie/geeqie-9999.ebuild
index e7ca05a8bf03..3f25e162490a 100644
--- a/media-gfx/geeqie/geeqie-9999.ebuild
+++ b/media-gfx/geeqie/geeqie-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools git-r3 xdg-utils
+inherit autotools git-r3 xdg
 
 DESCRIPTION="A lightweight GTK image viewer forked from GQview"
 HOMEPAGE="http://www.geeqie.org"
@@ -84,13 +84,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 
 	elog "Some plugins may require additional packages"
 	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
 	elog "- RAW images plugin: media-gfx/ufraw"
 }
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index c44e57747804..33ad5a41a80c 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,3 +1,4 @@
+AUX gimp-2.10_fix_test-appdata.patch 902 BLAKE2B 2b1a131d874d65422d8bdd44732b9843d89a570a1ea3c058cdb2a424a7791c686aa0e2ae2a0b472f333f2465f6e1a26750a532e9003933c5dffa1af32343c1dc SHA512 2983e8572f5e8113c9e2f564d31c1a5fe7e11ef273c50d2be739089124c6ec1a457da28222020bbd6015b2cbbcbf403b88d8660b9b35241800deb4fb3ad79067
 AUX gimp-2.7.4-no-deprecation.patch 1061 BLAKE2B c34baed7be101547994f23a818d81b855c5b0058d5acce7bb185801083a07874a1a2c6fcc41a79502077cb03c3532d9cfba88212592449b747957b0c08eff205 SHA512 3454f3b1a7579b1da4c36b765ae2a54adab13f0a4ecf02c4c0c3c55a12ff7af57d6d0467f663d2ef3de6cda116095f5f662a29cb3d729e0533edd585731a1dc9
 AUX gimp-2.8.10-clang.patch 7670 BLAKE2B 923573fe329c9b8268ec220b2a0441ae765085c088a1524c5e323cc9615cfec4b8a57b2195e441ea9f43dd609f51f2de60512833652e822b466188787ffe41ec SHA512 772ee0837a214f3ef70e823662fe12e57ee8fd5f800c6508e757b86169b86a5cbd86695870993a66d3726c019d24f79616831bed8baabce3e1d247ecbfe204fc
 AUX gimp-2.8.14-blend-center.patch 999 BLAKE2B 5324cf539a3ef54356f943d3a4cff7ed6abd0aecc5fa7af54193c5cdea0b4c3ca2073696dd1253ad49a451f6a87a50476a48b8bb6c6820e1b90338f3dd7efb0b SHA512 1d3cbe9d1b02e2d10ba982265f7d89f593aa6973f76d529dd909f36efe1c9d968360ec208943f66c00f6589f5c679368099e0db579ddb3655c15cb6ce8bdf930
@@ -11,13 +12,15 @@ AUX gimp-2.8.22-cve-2017-17789.patch 1245 BLAKE2B 14d519b8b024e51b452806b4acb6f0
 AUX gimp-2.9.8-cve-2017-17784.patch 1087 BLAKE2B 2398e735ccd7b0a5cc393f297b60d4a51038aeb146779268f78fb2f0a24ef912468510de2a0f640c5f905fe9959581686f55bccc022633b6f2a3a93ab3f12848 SHA512 5bc928860b2f2b53cc72c9c3caf6a532cf7e61b02e0716ee99a5166a07b01bdd46edfeae7bf6e333ce14ca11b5fcb963cbd42005e02f914d909431bf201dc6d5
 DIST gimp-2.10.10.tar.bz2 32408724 BLAKE2B 7d4f06d255d7b853f08c2a8bd9695b5cbc27a417f2f78aab56c970675430534b7c6f870168c5555369b873971b4ca3889565085cfc0cb9b2e1bb60c3bfe938bd SHA512 87caab9643a018e741e5e51c61220b7b282a66ed5bb723750cdf4139950f98c9ab246f4d6450420531d0e878c4561150efc4063cda896f08b25669bac4d1d172
 DIST gimp-2.10.12.tar.bz2 32614932 BLAKE2B 93e0c6c3ac58335920a9ebcfa81c970f0c657757860ab255e8a584ec2fa0c4d97c639797419eef58d5ef076797f2437eade20c1dea02c18bcbd8bd0fb30a8069 SHA512 dd4af3f0fa6fca815d254b7f42aeff15412c38294f1f5bd491563e2b597fcb868e6adff9001b196a68e01cf49bde61cbb153b662b8da1aa1b4b1f7285879659f
+DIST gimp-2.10.14.tar.bz2 32786424 BLAKE2B f1254ab0742cf0190f4e50f001d8120fe655b73d838c3ed56abb0a221c0eaec02e5c838f952d492069d55d89e4c3493c59b38aa2af87df8181f8979213e7659b SHA512 acbd095361d9211a5a23474693dd170ed76bf4ea5b1df69791f1d975ef5cdaba1e5fb9f5be9f592a360db5826d71eaaf464005075397cb6630070fe32833c030
 DIST gimp-2.10.8.tar.bz2 31954568 BLAKE2B 11f88b1068fa1fe216a54bed27b26b94c3fdb2cbc67e1e444df74a080d00b678f8c81897a6c5fb5956fa107842b0a853ada44d15d51c2e58db7435ddd0f8e999 SHA512 b458dd710b786152f95a8e48a0727b71cac549fccb31ac9e1e6ac3c617652079773ce7076401f8ade750ed38bdc78dfdec3317423f4c4e9c931f78002bd7454e
 DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6
 DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
-EBUILD gimp-2.10.10-r1.ebuild 6020 BLAKE2B 1b0c8bcd5a31c22686b7afb56ec23f50f25829073f357f3a898d2b93077967a27ddb55fc03f8efdb5beeef1f1e7c42c8bc48fc8481c18d52c8274a5c7680a8c7 SHA512 8b3cf0c9780ba21f4e2f95526be76784c97a442beb2c8e3636410836ba93f6760a59f16dca6c6eaf7cc51fa86727e113a77ae76a4a1d95e9d45df6d22b99be46
-EBUILD gimp-2.10.12.ebuild 6022 BLAKE2B 9ae48bd4b1a5bbdb5240d3b42fe7d1407a10e96991b92f4300f7ea57da359809250783a531f02327db37e4b5f4db7a1cad2a002e6191142ab1da0d1a7f9fbcc7 SHA512 912dd6614fd5f239078856b9bad3dbe191294fbdd8fc87dd98755b3772871b05663180b846902224081cecc03a50444f304bd4cf6510d44d179263aeb5389d56
+EBUILD gimp-2.10.10-r1.ebuild 5721 BLAKE2B d1f1001c4e61a2662f01e78dd51d3cfd257ac7998839ab1d373fd4865cd5c8ea0f2b01a607ed265279712886932c03cf0bb453c29e8cef7b8b31d146617c0b1d SHA512 4d8d2a2f1b417534fa1783a8a137a8b53c1acb64d0e72c1a0659199d8d6050661784d4c611d908ed83d00fb0cb269e251d5b69223707e4ac5d61842f941a06ab
+EBUILD gimp-2.10.12.ebuild 5721 BLAKE2B 1e46bca7e17c7ad3281ceed4ed6e9696d37b68c115b3dd22af7b8b06b34562b48bdaa18718b32f39dcf1f36348cc734c72c0e32af1495fb7c5eae6957951d05f SHA512 9c8886d90acc7ae3bf4f3e70bf27d30485fdf38a90e611e56e925bd1850784c802250bc9b5575ba0a182ead869656e45086672202ebaa6c069b445d3947ecb31
+EBUILD gimp-2.10.14.ebuild 5719 BLAKE2B 16acdf866f51f88dd9cfffb03aea7e6a4af4b91aee2f98333a17ffd0eff30d99a25e8a0c2b94b15721ec408015f6b3c6f7b11b714ed31a2356ad398e13e7a3c2 SHA512 2e73e99e77cb7a2dcd5a403294a84f142e93f5f500191aa843cbfafe5de4a98a8d78170ba4281768e21f70d70ded4b955460c55c453b739947516cd13a2d109d
 EBUILD gimp-2.10.8-r1.ebuild 6104 BLAKE2B bec6521e91558be2f2282baf131598c519f92c93267f687dedcac78fe70d27851c09307eb438009d35f9307c2ae78a77411cb6238cdde84b0ace9165399308cd SHA512 20f59e5aa3a8d5424b65ed9f947123feee6723dd16f946991022b17ac964be37c6aa0a71022928293fc51c542f3a3ad24ad3432fc6680d7214393d87d5159db2
 EBUILD gimp-2.8.22-r1.ebuild 5124 BLAKE2B b2fb64d49da0796f6eb2245eceade1ea5b5e2c5da2af918dba9c87a0fa4cb7f4c6dbe7688a6d7fe08b085c569413c06ffd4d22bf1cfa3a9f8c00277f634a11ac SHA512 e8cec3990a151e13c606498f5ebc4e685a28d5fb10919ec6bbb71b1f60d814b13722530f8737aff9e18065093800b8ebbe56d5f3844555accc475d2b74acf18d
 EBUILD gimp-2.9.8-r1.ebuild 5661 BLAKE2B 0617f1c469d09aa5df2884bf54db4338a2ff851a301a3ee7b2daf229c1308aa4818b9693b3f757f23052a857eb6a584d37fbe98e4b2390687dbfb83740c2bb95 SHA512 a10f751e97fd8a1b8e3fb1cc8d4fda72f040aa6631ed22f72c10c29b3b57954fc062518572715643fb7da61bfd501bf0dc6226db49130e3efdb8cb4afe610eed
-EBUILD gimp-9999.ebuild 6009 BLAKE2B f254cda756f2e1c0de1013012c45748ae32739b18a23d4245833fc6994e01afd2cb77ef115200b8c8f6699cbcdfd1e66c89f6d767547dffa8ae0ff34d510629c SHA512 adb32cf41ed3af0aefe82cc3ff53fa40cdca552dafbf38fec508de1452bfb2eda24cfc5f96f8163e9a505b1a04527a12d12b113761a592722b86022c8dac246a
-MISC metadata.xml 425 BLAKE2B 3b3206df95f94e2ee61a5139b3c146c323348653803d8e7150aa2a56f01e46afcf91cee68286a2d86012fb990991012c6b7fa4150100fe45a21130d0ce3cab6d SHA512 0aa8538d2d93e5241dae2c14ffe416a448c4e1de7275dd2c81408bfd1e4dcd773474ade257f333ea2bd34555486c25768779132d37c1a44241318058c1f8d13d
+EBUILD gimp-9999.ebuild 6548 BLAKE2B b53fac4d6a5228fa21d39a2af406ec66dea3c0cde5dbb82a98bf7a6d189e7544700aeddfa4e27a2bd9a35c021e12650675e6d0f7c47dc747315d52f94b488da4 SHA512 e0405c9423550f387f0b3494ab3a1324a548406be8e633c03b45066902aeabb22869d89d6cb349c27031ff6ddf7ccd55d756c43f6e4a3204a0734b863d571e56
+MISC metadata.xml 628 BLAKE2B f1326f51db692d6e64d1bb7b44dfada65799d7ab94279771e6bd729189145a8a4bbe7a83c776bfc46acf682ad9f34c84598d25fb0a3606aabfa30383b35a9694 SHA512 cec60cde9763bdb9012fec754b95018f09da5cf7ff2f577206417651df5c18251dd5c58b1e32fb45e7c2121e06c0a5b7dc86d08b9511da4cf103bcf2fa1b6e52
diff --git a/media-gfx/gimp/files/gimp-2.10_fix_test-appdata.patch b/media-gfx/gimp/files/gimp-2.10_fix_test-appdata.patch
new file mode 100644
index 000000000000..77b7b2f3cbdf
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.10_fix_test-appdata.patch
@@ -0,0 +1,14 @@
+diff -Nur a/desktop/test-appdata.sh.in b/desktop/test-appdata.sh.in
+--- a/desktop/test-appdata.sh.in	2019-04-07 14:38:14.000000000 +0300
++++ b/desktop/test-appdata.sh.in	2019-11-06 23:19:32.000000000 +0300
+@@ -2,8 +2,8 @@
+ 
+ # TODO: use validate-strict when the last errors for a strict validation
+ # are fixed.
+-appstream-util validate-relax ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/org.gimp.GIMP.appdata.xml && \
+-appstream-util validate-relax ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/gimp-data-extras.metainfo.xml && \
++appstream-util validate-relax --nonet ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/org.gimp.GIMP.appdata.xml && \
++appstream-util validate-relax --nonet ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/gimp-data-extras.metainfo.xml && \
+ if [ $(expr @GIMP_MICRO_VERSION@ % 2) = 0 ]; then
+   grep TODO ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/org.gimp.GIMP.appdata.xml
+   if [ $? = 0 ]; then
diff --git a/media-gfx/gimp/gimp-2.10.10-r1.ebuild b/media-gfx/gimp/gimp-2.10.10-r1.ebuild
index faa127d6d835..ff1bb96d42f1 100644
--- a/media-gfx/gimp/gimp-2.10.10-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.10-r1.ebuild
@@ -5,83 +5,94 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 GNOME2_EAUTORECONF=yes
 
-inherit eapi7-ver virtualx autotools gnome2 multilib python-single-r1
+inherit autotools gnome2 python-single-r1 virtualx
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2"
+SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
 KEYWORDS="~amd64 ~x86"
 
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua debug doc openexr gnome heif postscript jpeg2k cpu_flags_x86_mmx mng python cpu_flags_x86_sse udev unwind vector-icons webp wmf xpm"
+IUSE="aalib alsa altivec aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_x86_mmx cpu_flags_x86_sse"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
 
-RDEPEND=">=dev-libs/glib-2.56.0:2
+COMMON_DEPEND="
+	app-arch/bzip2
+	>=app-arch/xz-utils-5.0.0
+	>=app-text/poppler-0.50[cairo]
+	>=app-text/poppler-data-0.4.7
 	>=dev-libs/atk-2.2.0
-	>=x11-libs/gtk+-2.24.32:2
-	>=x11-libs/gdk-pixbuf-2.31:2
-	>=x11-libs/cairo-1.12.2
-	>=x11-libs/pango-1.29.4
-	xpm? ( x11-libs/libXpm )
-	>=media-libs/freetype-2.1.7
-	>=media-libs/harfbuzz-0.9.19
-	>=media-libs/gexiv2-0.10.6
-	>=media-libs/libmypaint-1.3.0
-	>=media-gfx/mypaint-brushes-1.3.0
-	>=media-libs/fontconfig-2.12.4
-	sys-libs/zlib
+	>=dev-libs/glib-2.54.2:2
 	dev-libs/libxml2
 	dev-libs/libxslt
-	x11-themes/hicolor-icon-theme
+	>=gnome-base/librsvg-2.40.6:2
+	>=media-gfx/mypaint-brushes-1.3.0
 	>=media-libs/babl-0.1.62
+	>=media-libs/fontconfig-2.12.4
+	>=media-libs/freetype-2.1.7
 	>=media-libs/gegl-0.4.14:0.4[cairo]
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	aqua? ( x11-libs/gtk-mac-integration )
-	gnome? ( gnome-base/gvfs )
+	>=media-libs/gexiv2-0.10.6
+	>=media-libs/harfbuzz-0.9.19
+	>=media-libs/lcms-2.8:2
+	>=media-libs/libmypaint-1.3.0:=
+	>=media-libs/libpng-1.6.25:0=
+	>=media-libs/tiff-3.5.7:0
+	net-libs/glib-networking[ssl]
+	sys-libs/zlib
 	virtual/jpeg:0
+	>=x11-libs/cairo-1.12.2
+	>=x11-libs/gdk-pixbuf-2.30.8:2
+	>=x11-libs/gtk+-2.24.32:2
+	x11-libs/libXcursor
+	>=x11-libs/pango-1.29.4
+	aalib? ( media-libs/aalib )
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
+	heif? ( >=media-libs/libheif-1.1.0:= )
 	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
-	>=media-libs/lcms-2.8:2
-	mng? ( media-libs/libmng )
+	mng? ( media-libs/libmng:= )
 	openexr? ( >=media-libs/openexr-1.6.1:= )
-	>=app-text/poppler-0.50[cairo]
-	>=app-text/poppler-data-0.4.7
-	>=media-libs/libpng-1.6.25:0=
+	postscript? ( app-text/ghostscript-gpl )
 	python?	(
 		${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
 		>=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
+		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
 	)
-	>=media-libs/tiff-3.5.7:0
-	>=gnome-base/librsvg-2.40.6:2
-	webp? ( >=media-libs/libwebp-0.6.0 )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	net-libs/glib-networking[ssl]
-	x11-libs/libXcursor
-	sys-libs/zlib
-	app-arch/bzip2
-	>=app-arch/xz-utils-5.0.0
-	postscript? ( app-text/ghostscript-gpl )
 	udev? ( dev-libs/libgudev:= )
-	unwind? ( sys-libs/libunwind:= )
-	heif? ( >=media-libs/libheif-1.1.0:= )"
-DEPEND="${RDEPEND}
+	unwind? ( >=sys-libs/libunwind-1.1.0:= )
+	webp? ( >=media-libs/libwebp-0.6.0:= )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/hicolor-icon-theme
+	gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
 	>=dev-lang/perl-5.10.0
 	dev-libs/appstream-glib
 	dev-util/gtk-update-icon-cache
-	sys-apps/findutils
-	virtual/pkgconfig
 	>=dev-util/intltool-0.40.1
+	sys-apps/findutils
+	>=sys-devel/automake-1.11
 	>=sys-devel/gettext-0.19
-	doc? ( >=dev-util/gtk-doc-1 )
 	>=sys-devel/libtool-2.2
-	>=sys-devel/automake-1.11
-	dev-util/gtk-doc-am"
+	virtual/pkgconfig
+"
 
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
+DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# Bugs 685210 (and duplicate 691070)
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
+)
 
 pkg_setup() {
 	if use python; then
@@ -121,33 +132,32 @@ src_configure() {
 		GDBUS_CODEGEN="${EPREFIX}"/bin/false
 
 		--enable-default-binary
-		--disable-silent-rules
 
-		$(use_with !aqua x)
-		$(use_with aalib aa)
-		$(use_with alsa)
-		$(use_enable altivec)
+		--enable-mp
 		--with-appdata-test
-		--without-libbacktrace
 		--with-bug-report-url=https://bugs.gentoo.org/
+		--with-xmc
+		--without-libbacktrace
 		--without-webkit
-		$(use_with jpeg2k jpeg2000)
-		$(use_with postscript gs)
+		--without-xvfb-run
+		$(use_enable altivec)
 		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable python)
+		$(use_enable vector-icons)
+		$(use_with aalib aa)
+		$(use_with alsa)
+		$(use_with !aqua x)
+		$(use_with heif libheif)
+		$(use_with jpeg2k jpeg2000)
 		$(use_with mng libmng)
 		$(use_with openexr)
-		$(use_with webp)
-		$(use_with heif libheif)
-		$(use_enable python)
-		--enable-mp
-		$(use_enable cpu_flags_x86_sse sse)
+		$(use_with postscript gs)
 		$(use_with udev gudev)
 		$(use_with unwind libunwind)
+		$(use_with webp)
 		$(use_with wmf)
-		--with-xmc
 		$(use_with xpm libxpm)
-		$(use_enable vector-icons)
-		--without-xvfb-run
 	)
 
 	gnome2_src_configure "${myconf[@]}"
@@ -158,18 +168,6 @@ src_compile() {
 	gnome2_src_compile
 }
 
-_clean_up_locales() {
-	[[ -z ${LINGUAS+set} ]] && return
-	einfo "Cleaning up locales..."
-	for lang in ${LANGS}; do
-		has ${lang} ${LINGUAS} && {
-			einfo "- keeping ${lang}"
-			continue
-		}
-		rm -Rf "${ED%/}"/usr/share/locale/"${lang}"
-	done
-}
-
 # for https://bugs.gentoo.org/664938
 _rename_plugins() {
 	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
@@ -209,8 +207,12 @@ src_install() {
 	local gimp_app_version=$(get_version_component_range 1-2)
 	mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
 
+	# Remove gimp devel-docs html files if user doesn't need it
+	if ! use doc; then
+		rm -r "${ED%/}"/usr/share/gtk-doc || die
+	fi
+
 	_rename_plugins || die
-	_clean_up_locales
 }
 
 pkg_postinst() {
diff --git a/media-gfx/gimp/gimp-2.10.12.ebuild b/media-gfx/gimp/gimp-2.10.12.ebuild
index c50fc2d19f7f..b3c8a9550e9a 100644
--- a/media-gfx/gimp/gimp-2.10.12.ebuild
+++ b/media-gfx/gimp/gimp-2.10.12.ebuild
@@ -5,83 +5,94 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 GNOME2_EAUTORECONF=yes
 
-inherit eapi7-ver virtualx autotools gnome2 multilib python-single-r1
+inherit autotools gnome2 python-single-r1 virtualx
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2"
+SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
 KEYWORDS="~amd64 ~x86"
 
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua debug doc openexr gnome heif postscript jpeg2k cpu_flags_x86_mmx mng python cpu_flags_x86_sse udev unwind vector-icons webp wmf xpm"
+IUSE="aalib alsa altivec aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_x86_mmx cpu_flags_x86_sse"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
 
-RDEPEND=">=dev-libs/glib-2.56.0:2
+COMMON_DEPEND="
+	app-arch/bzip2
+	>=app-arch/xz-utils-5.0.0
+	>=app-text/poppler-0.50[cairo]
+	>=app-text/poppler-data-0.4.7
 	>=dev-libs/atk-2.2.0
-	>=x11-libs/gtk+-2.24.32:2
-	>=x11-libs/gdk-pixbuf-2.31:2
-	>=x11-libs/cairo-1.12.2
-	>=x11-libs/pango-1.29.4
-	xpm? ( x11-libs/libXpm )
-	>=media-libs/freetype-2.1.7
-	>=media-libs/harfbuzz-0.9.19
-	>=media-libs/gexiv2-0.10.6
-	>=media-libs/libmypaint-1.3.0:=
-	>=media-gfx/mypaint-brushes-1.3.0
-	>=media-libs/fontconfig-2.12.4
-	sys-libs/zlib
+	>=dev-libs/glib-2.54.2:2
 	dev-libs/libxml2
 	dev-libs/libxslt
-	x11-themes/hicolor-icon-theme
+	>=gnome-base/librsvg-2.40.6:2
+	>=media-gfx/mypaint-brushes-1.3.0
 	>=media-libs/babl-0.1.66
+	>=media-libs/fontconfig-2.12.4
+	>=media-libs/freetype-2.1.7
 	>=media-libs/gegl-0.4.16:0.4[cairo]
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	aqua? ( x11-libs/gtk-mac-integration )
-	gnome? ( gnome-base/gvfs )
+	>=media-libs/gexiv2-0.10.6
+	>=media-libs/harfbuzz-0.9.19
+	>=media-libs/lcms-2.8:2
+	>=media-libs/libmypaint-1.3.0:=
+	>=media-libs/libpng-1.6.25:0=
+	>=media-libs/tiff-3.5.7:0
+	net-libs/glib-networking[ssl]
+	sys-libs/zlib
 	virtual/jpeg:0
+	>=x11-libs/cairo-1.12.2
+	>=x11-libs/gdk-pixbuf-2.30.8:2
+	>=x11-libs/gtk+-2.24.32:2
+	x11-libs/libXcursor
+	>=x11-libs/pango-1.29.4
+	aalib? ( media-libs/aalib )
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
+	heif? ( >=media-libs/libheif-1.1.0:= )
 	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
-	>=media-libs/lcms-2.8:2
-	mng? ( media-libs/libmng )
+	mng? ( media-libs/libmng:= )
 	openexr? ( >=media-libs/openexr-1.6.1:= )
-	>=app-text/poppler-0.50[cairo]
-	>=app-text/poppler-data-0.4.7
-	>=media-libs/libpng-1.6.25:0=
+	postscript? ( app-text/ghostscript-gpl )
 	python?	(
 		${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
 		>=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
+		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
 	)
-	>=media-libs/tiff-3.5.7:0
-	>=gnome-base/librsvg-2.40.6:2
-	webp? ( >=media-libs/libwebp-0.6.0 )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	net-libs/glib-networking[ssl]
-	x11-libs/libXcursor
-	sys-libs/zlib
-	app-arch/bzip2
-	>=app-arch/xz-utils-5.0.0
-	postscript? ( app-text/ghostscript-gpl )
 	udev? ( dev-libs/libgudev:= )
-	unwind? ( sys-libs/libunwind:= )
-	heif? ( >=media-libs/libheif-1.1.0:= )"
-DEPEND="${RDEPEND}
+	unwind? ( >=sys-libs/libunwind-1.1.0:= )
+	webp? ( >=media-libs/libwebp-0.6.0:= )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/hicolor-icon-theme
+	gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
 	>=dev-lang/perl-5.10.0
 	dev-libs/appstream-glib
 	dev-util/gtk-update-icon-cache
-	sys-apps/findutils
-	virtual/pkgconfig
 	>=dev-util/intltool-0.40.1
+	sys-apps/findutils
+	>=sys-devel/automake-1.11
 	>=sys-devel/gettext-0.19
-	doc? ( >=dev-util/gtk-doc-1 )
 	>=sys-devel/libtool-2.2
-	>=sys-devel/automake-1.11
-	dev-util/gtk-doc-am"
+	virtual/pkgconfig
+"
 
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
+DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# Bugs 685210 (and duplicate 691070)
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
+)
 
 pkg_setup() {
 	if use python; then
@@ -121,33 +132,32 @@ src_configure() {
 		GDBUS_CODEGEN="${EPREFIX}"/bin/false
 
 		--enable-default-binary
-		--disable-silent-rules
 
-		$(use_with !aqua x)
-		$(use_with aalib aa)
-		$(use_with alsa)
-		$(use_enable altivec)
+		--enable-mp
 		--with-appdata-test
-		--without-libbacktrace
 		--with-bug-report-url=https://bugs.gentoo.org/
+		--with-xmc
+		--without-libbacktrace
 		--without-webkit
-		$(use_with jpeg2k jpeg2000)
-		$(use_with postscript gs)
+		--without-xvfb-run
+		$(use_enable altivec)
 		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable python)
+		$(use_enable vector-icons)
+		$(use_with aalib aa)
+		$(use_with alsa)
+		$(use_with !aqua x)
+		$(use_with heif libheif)
+		$(use_with jpeg2k jpeg2000)
 		$(use_with mng libmng)
 		$(use_with openexr)
-		$(use_with webp)
-		$(use_with heif libheif)
-		$(use_enable python)
-		--enable-mp
-		$(use_enable cpu_flags_x86_sse sse)
+		$(use_with postscript gs)
 		$(use_with udev gudev)
 		$(use_with unwind libunwind)
+		$(use_with webp)
 		$(use_with wmf)
-		--with-xmc
 		$(use_with xpm libxpm)
-		$(use_enable vector-icons)
-		--without-xvfb-run
 	)
 
 	gnome2_src_configure "${myconf[@]}"
@@ -158,18 +168,6 @@ src_compile() {
 	gnome2_src_compile
 }
 
-_clean_up_locales() {
-	[[ -z ${LINGUAS+set} ]] && return
-	einfo "Cleaning up locales..."
-	for lang in ${LANGS}; do
-		has ${lang} ${LINGUAS} && {
-			einfo "- keeping ${lang}"
-			continue
-		}
-		rm -Rf "${ED%/}"/usr/share/locale/"${lang}"
-	done
-}
-
 # for https://bugs.gentoo.org/664938
 _rename_plugins() {
 	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
@@ -209,8 +207,12 @@ src_install() {
 	local gimp_app_version=$(get_version_component_range 1-2)
 	mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
 
+	# Remove gimp devel-docs html files if user doesn't need it
+	if ! use doc; then
+		rm -r "${ED%/}"/usr/share/gtk-doc || die
+	fi
+
 	_rename_plugins || die
-	_clean_up_locales
 }
 
 pkg_postinst() {
diff --git a/media-gfx/gimp/gimp-2.10.14.ebuild b/media-gfx/gimp/gimp-2.10.14.ebuild
new file mode 100644
index 000000000000..0217d66c15c3
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.14.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+GNOME2_EAUTORECONF=yes
+
+inherit autotools gnome2 python-single-r1 virtualx
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="aalib alsa altivec aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_x86_mmx cpu_flags_x86_sse"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	>=app-arch/xz-utils-5.0.0
+	>=app-text/poppler-0.50[cairo]
+	>=app-text/poppler-data-0.4.7
+	>=dev-libs/atk-2.2.0
+	>=dev-libs/glib-2.56.0:2
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.40.6:2
+	>=media-gfx/mypaint-brushes-1.3.0
+	>=media-libs/babl-0.1.72
+	>=media-libs/fontconfig-2.12.4
+	>=media-libs/freetype-2.1.7
+	>=media-libs/gegl-0.4.18:0.4[cairo]
+	>=media-libs/gexiv2-0.10.6
+	>=media-libs/harfbuzz-0.9.19
+	>=media-libs/lcms-2.8:2
+	>=media-libs/libmypaint-1.3.0:=
+	>=media-libs/libpng-1.6.25:0=
+	>=media-libs/tiff-3.5.7:0
+	net-libs/glib-networking[ssl]
+	sys-libs/zlib
+	virtual/jpeg:0
+	>=x11-libs/cairo-1.12.2
+	>=x11-libs/gdk-pixbuf-2.31:2
+	>=x11-libs/gtk+-2.24.32:2
+	x11-libs/libXcursor
+	>=x11-libs/pango-1.29.4
+	aalib? ( media-libs/aalib )
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
+	heif? ( >=media-libs/libheif-1.3.2:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+	mng? ( media-libs/libmng:= )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	postscript? ( app-text/ghostscript-gpl )
+	python?	(
+		${PYTHON_DEPS}
+		>=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
+		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
+	)
+	udev? ( dev-libs/libgudev:= )
+	unwind? ( >=sys-libs/libunwind-1.1.0:= )
+	webp? ( >=media-libs/libwebp-0.6.0:= )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/hicolor-icon-theme
+	gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-lang/perl-5.10.0
+	dev-libs/appstream-glib
+	dev-util/gtk-update-icon-cache
+	>=dev-util/intltool-0.40.1
+	sys-apps/findutils
+	>=sys-devel/automake-1.11
+	>=sys-devel/gettext-0.19
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+"
+
+DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
+
+# Bugs 685210 (and duplicate 691070)
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
+)
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
+
+	gnome2_src_prepare  # calls eautoreconf
+
+	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
+	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+}
+
+_adjust_sandbox() {
+	# Bugs #569738 and #591214
+	local nv
+	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+		# We do not check for existence as they may show up later
+		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+		addwrite "${nv}"
+	done
+
+	addwrite /dev/dri/  # bugs #574038 and #684886
+	addwrite /dev/ati/  # bug #589198
+	addwrite /proc/mtrr  # bug #589198
+}
+
+src_configure() {
+	_adjust_sandbox
+
+	local myconf=(
+		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+		GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
+		--enable-default-binary
+
+		--enable-mp
+		--with-appdata-test
+		--with-bug-report-url=https://bugs.gentoo.org/
+		--with-xmc
+		--without-libbacktrace
+		--without-webkit
+		--without-xvfb-run
+		$(use_enable altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable python)
+		$(use_enable vector-icons)
+		$(use_with aalib aa)
+		$(use_with alsa)
+		$(use_with !aqua x)
+		$(use_with heif libheif)
+		$(use_with jpeg2k jpeg2000)
+		$(use_with mng libmng)
+		$(use_with openexr)
+		$(use_with postscript gs)
+		$(use_with udev gudev)
+		$(use_with unwind libunwind)
+		$(use_with webp)
+		$(use_with wmf)
+		$(use_with xpm libxpm)
+	)
+
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
+	gnome2_src_compile
+}
+
+# for https://bugs.gentoo.org/664938
+_rename_plugins() {
+	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
+	local prepend=gimp-org-
+	(
+		cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || exit 1
+		for plugin_slash in $(ls -d1 */); do
+		    plugin=${plugin_slash%/}
+		    if [[ -f ${plugin}/${plugin} ]]; then
+			# NOTE: Folder and file name need to match for Gimp to load that plug-in
+			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
+			mv ${plugin}/{,${prepend}}${plugin} || exit 1
+			mv {,${prepend}}${plugin} || exit 1
+		    fi
+		done
+	)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use python; then
+		python_optimize
+	fi
+
+	# Workaround for bug #321111 to give GIMP the least
+	# precedence on PDF documents by default
+	mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+	local gimp_app_version=$(get_version_component_range 1-2)
+	mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+	# Remove gimp devel-docs html files if user doesn't need it
+	if ! use doc; then
+		rm -r "${ED%/}"/usr/share/gtk-doc || die
+	fi
+
+	_rename_plugins || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index e5e13bd8d9a8..fb68f61b9b4d 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -2,10 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PLOCALES="am ar ast az be bg br bs ca ca@valencia cs csb da de dz el en_CA en_GB eo
+	es et eu fa fi fr ga gd gl gu he hi hr hu id is it ja ka kk km kn ko ky
+	lt lv mk ml mr ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl
+	sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
+
+PYTHON_COMPAT=( python3_{6,7} )
 GNOME2_EAUTORECONF=yes
 
-inherit virtualx autotools gnome2 multilib python-single-r1 git-r3
+inherit autotools git-r3 gnome2 l10n python-single-r1 virtualx
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/"
@@ -15,76 +20,94 @@ LICENSE="GPL-3 LGPL-3"
 SLOT="2"
 KEYWORDS=""
 
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua debug doc openexr gnome heif postscript jpeg2k cpu_flags_x86_mmx mng python cpu_flags_x86_sse udev unwind vector-icons webp wmf xpm"
+IUSE="aalib alsa altivec aqua debug doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_x86_mmx cpu_flags_x86_sse"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND=">=dev-libs/glib-2.56.0:2
-	>=dev-libs/atk-2.2.0
-	>=x11-libs/gtk+-2.24.32:2
-	>=x11-libs/gdk-pixbuf-2.31:2
-	>=x11-libs/cairo-1.12.2
-	>=x11-libs/pango-1.29.4
-	xpm? ( x11-libs/libXpm )
+RESTRICT="!test? ( test )"
+
+# media-libs/{babl,gegl} are required to be built with USE="introspection"
+# to fix the compilation checking of /usr/share/gir-1.0/{Babl-0.1gir,Gegl-0.4.gir}
+COMMON_DEPEND="
+	app-arch/bzip2
+	>=app-arch/xz-utils-5.0.0
+	>=app-text/poppler-0.69[cairo]
+	>=app-text/poppler-data-0.4.9
+	>=dev-libs/atk-2.4.0
+	>=dev-libs/glib-2.56.0:2
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.40.6:2
+	>=media-gfx/mypaint-brushes-1.3.0
+	>=media-libs/babl-0.1.72[introspection]
+	>=media-libs/fontconfig-2.12.4
 	>=media-libs/freetype-2.1.7
-	>=media-libs/harfbuzz-0.9.19
+	>=media-libs/gegl-0.4.18:0.4[cairo,introspection]
 	>=media-libs/gexiv2-0.10.6
+	>=media-libs/harfbuzz-0.9.19
+	>=media-libs/lcms-2.8:2
 	>=media-libs/libmypaint-1.3.0:=
-	>=media-gfx/mypaint-brushes-1.3.0
-	>=media-libs/fontconfig-2.12.4
+	>=media-libs/libpng-1.6.25:0=
+	>=media-libs/tiff-3.5.7:0
+	net-libs/glib-networking[ssl]
 	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-	x11-themes/hicolor-icon-theme
-	>=media-libs/babl-0.1.66
-	>=media-libs/gegl-0.4.16:0.4[cairo]
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	aqua? ( x11-libs/gtk-mac-integration )
-	gnome? ( gnome-base/gvfs )
 	virtual/jpeg:0
+	>=x11-libs/cairo-1.14.0
+	>=x11-libs/gdk-pixbuf-2.36:2
+	>=x11-libs/gtk+-3.22.29:3
+	x11-libs/libXcursor
+	>=x11-libs/pango-1.42.0
+	aalib? ( media-libs/aalib )
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
+	heif? ( >=media-libs/libheif-1.3.2:= )
+	javascript? ( dev-libs/gjs )
 	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
-	>=media-libs/lcms-2.8:2
-	mng? ( media-libs/libmng )
+	lua? ( dev-lang/luajit )
+	mng? ( media-libs/libmng:= )
 	openexr? ( >=media-libs/openexr-1.6.1:= )
-	>=app-text/poppler-0.50[cairo]
-	>=app-text/poppler-data-0.4.7
-	>=media-libs/libpng-1.6.25:0=
-	python?	(
+	postscript? ( app-text/ghostscript-gpl )
+	python? (
 		${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
-		>=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
 	)
-	>=media-libs/tiff-3.5.7:0
-	>=gnome-base/librsvg-2.40.6:2
-	webp? ( >=media-libs/libwebp-0.6.0 )
+	udev? ( >=dev-libs/libgudev-167:= )
+	unwind? ( >=sys-libs/libunwind-1.1.0:= )
+	webp? ( >=media-libs/libwebp-0.6.0:= )
 	wmf? ( >=media-libs/libwmf-0.2.8 )
-	net-libs/glib-networking[ssl]
-	x11-libs/libXcursor
-	sys-libs/zlib
-	app-arch/bzip2
-	>=app-arch/xz-utils-5.0.0
-	postscript? ( app-text/ghostscript-gpl )
-	udev? ( dev-libs/libgudev:= )
-	unwind? ( sys-libs/libunwind:= )
-	heif? ( >=media-libs/libheif-1.1.0:= )"
-DEPEND="${RDEPEND}
+	xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/hicolor-icon-theme
+	gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
 	>=dev-lang/perl-5.10.0
-	dev-libs/appstream-glib
+	>=dev-libs/appstream-glib-0.7.7
 	dev-util/gdbus-codegen
 	dev-util/gtk-update-icon-cache
-	sys-apps/findutils
-	virtual/pkgconfig
 	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.19
-	doc? ( >=dev-util/gtk-doc-1 )
-	>=sys-devel/libtool-2.2
+	sys-apps/findutils
 	>=sys-devel/autoconf-2.54
 	>=sys-devel/automake-1.11
-	dev-util/gtk-doc-am"
+	>=sys-devel/gettext-0.19
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+	doc? (
+		>=dev-util/gtk-doc-1.0
+		dev-util/gtk-doc-am
+	)
+"
 
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
+DOCS=( "AUTHORS" "HACKING" "NEWS" "README" "README.i18n" )
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# Bugs 685210 (and duplicate 691070)
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
+)
 
 pkg_setup() {
 	if use python; then
@@ -96,6 +119,15 @@ src_prepare() {
 	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
 	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
 
+	# Fix checking of gtk-doc.make if USE="-doc" like autogen.sh
+	if ! use doc ; then
+		echo "EXTRA_DIST = missing-gtk-doc" > gtk-doc.make
+	fi
+
+	# Remove disabled locales
+	_rm_locale() { sed -i -e "/${1}/d" po/LINGUAS || die "Failed to remove disabled locales"; }
+	l10n_for_each_disabled_locale_do _rm_locale
+
 	gnome2_src_prepare  # calls eautoreconf
 
 	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
@@ -124,33 +156,35 @@ src_configure() {
 		GDBUS_CODEGEN="${EPREFIX}"/usr/bin/gdbus-codegen
 
 		--enable-default-binary
-		--disable-silent-rules
 
-		$(use_with !aqua x)
-		$(use_with aalib aa)
-		$(use_with alsa)
-		$(use_enable altivec)
+		--enable-mp
 		--with-appdata-test
-		--without-libbacktrace
 		--with-bug-report-url=https://bugs.gentoo.org/
+		--with-xmc
+		--without-libbacktrace
 		--without-webkit
-		$(use_with jpeg2k jpeg2000)
-		$(use_with postscript gs)
+		--without-xvfb-run
+		$(use_enable altivec)
 		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable doc gtk_doc)
+		$(use_enable vector-icons)
+		$(use_with aalib aa)
+		$(use_with alsa)
+		$(use_with !aqua x)
+		$(use_with heif libheif)
+		$(use_with javascript)
+		$(use_with jpeg2k jpeg2000)
+		$(use_with lua)
 		$(use_with mng libmng)
 		$(use_with openexr)
-		$(use_with webp)
-		$(use_with heif libheif)
-		$(use_enable python)
-		--enable-mp
-		$(use_enable cpu_flags_x86_sse sse)
+		$(use_with postscript gs)
+		$(use_with python)
 		$(use_with udev gudev)
 		$(use_with unwind libunwind)
+		$(use_with webp)
 		$(use_with wmf)
-		--with-xmc
 		$(use_with xpm libxpm)
-		$(use_enable vector-icons)
-		--without-xvfb-run
 	)
 
 	gnome2_src_configure "${myconf[@]}"
@@ -161,18 +195,6 @@ src_compile() {
 	gnome2_src_compile
 }
 
-_clean_up_locales() {
-	[[ -z ${LINGUAS+set} ]] && return
-	einfo "Cleaning up locales..."
-	for lang in ${LANGS}; do
-		has ${lang} ${LINGUAS} && {
-			einfo "- keeping ${lang}"
-			continue
-		}
-		rm -Rf "${ED%/}"/usr/share/locale/"${lang}"
-	done
-}
-
 # for https://bugs.gentoo.org/664938
 _rename_plugins() {
 	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
@@ -212,7 +234,6 @@ src_install() {
 	mv "${ED%/}"/usr/share/man/man1/gimp-console{-*,}.1 || die
 
 	_rename_plugins || die
-	_clean_up_locales
 }
 
 pkg_postinst() {
diff --git a/media-gfx/gimp/metadata.xml b/media-gfx/gimp/metadata.xml
index e615a07f9cf7..7d0fd04395e6 100644
--- a/media-gfx/gimp/metadata.xml
+++ b/media-gfx/gimp/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>torokhov-s-a@yandex.ru</email>
+		<name>Sergey Torokhov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="smp">
 			Enable support for multiprocessors
diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest
index 33d26b6f58db..cbeccb58db63 100644
--- a/media-gfx/gnome-font-viewer/Manifest
+++ b/media-gfx/gnome-font-viewer/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-font-viewer-3.30.0.tar.xz 139076 BLAKE2B 0c84b4e8550df6689f69da1f8b968d436721ba3a9cd97fd7f8f71ad7316af8146d368b65b0702bb7c25c4fd210cf8fb9634620b129505cb3f4f78e3e450c3718 SHA512 9ba3dffdd0152c9a1380b39f4f96de7e7d0281c675c0821d4c0be27b7aab9f23d3ca7497b70dcf47807be5cc7fcf252877e5cd0009f6cf1ec231d429477fe600
 DIST gnome-font-viewer-3.32.0.tar.xz 153852 BLAKE2B b79279e57b2ce4310acf3d1164da68b9408518456f72d28aae09092c53f9ab5cc6e1754b06c6ed147fdb842f76a3e0e4ad2bd7f5ddad5773091b28eae9811d78 SHA512 16b000b16b3e3e996dd83ef7f2a2f6877f6d367c6fd69f26f385dd13cc87a7690cd85e8895008fc7c5ca32ad4a15b763fe918ddc08aaf042f65087289b126681
 EBUILD gnome-font-viewer-3.30.0.ebuild 665 BLAKE2B c46f27c81e9599e0ce966258779ed13f9195a64debf1aacf2a415639968b09847ef95ad000ea81d4703e54517b6089518fd4d097e66318d5f41421768ca6b8a6 SHA512 d96e5a23228559ab472fece42eeca29e9d548b105e4714e409f88ebebf84bbb5e9c867fb02e3e97d88dc14df50bea908d9f9e7b230beddac1cdb7d13bae51fbe
-EBUILD gnome-font-viewer-3.32.0.ebuild 667 BLAKE2B 996241b7f0c165b72992f8583375114f6177c38eb5f34fe2af94b79335514bc30f6b72630b957c9b4f2e36676fef320563642affc358524ed39bbe056ea6a892 SHA512 58afc0cd707a75d82af327ec7f7ffb9cb45991f5ba31f19f75857be56191f4d6e128d8d6188fb60d9fa8755b5753e121123134cf311c6e22475d66f3764fa6b8
+EBUILD gnome-font-viewer-3.32.0.ebuild 665 BLAKE2B c46f27c81e9599e0ce966258779ed13f9195a64debf1aacf2a415639968b09847ef95ad000ea81d4703e54517b6089518fd4d097e66318d5f41421768ca6b8a6 SHA512 d96e5a23228559ab472fece42eeca29e9d548b105e4714e409f88ebebf84bbb5e9c867fb02e3e97d88dc14df50bea908d9f9e7b230beddac1cdb7d13bae51fbe
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.32.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.32.0.ebuild
index 7d298e54cbec..eb3984b87024 100644
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.32.0.ebuild
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.32.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-font-viewer"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/glib-2.35.1:2
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index 928a81c7d55b..3c61749610da 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-photos-3.30.1.tar.xz 1118728 BLAKE2B b3de35fb9c2ae7b731cf76a7b02b689997e3cf063037c49a51dbdf8bb37d9217c9bd5380bc872b984eca4e53c5996eb6370f3acc82a90e56dabe9d47999d5578 SHA512 4fa386c3d93f2b15468601e56bfcbdcc83a9e78ed5c4d0a1e51e9adf4ba313bb69e07aae52404026546dd68584e355c5e5100fc12f95fe078ccf2d6160a0a24b
 DIST gnome-photos-3.32.1.tar.xz 632688 BLAKE2B 9fa7307d1571f6c4e07d6c9700fd947e4a0ff26f8308f7b1871da817e5d80b19861d3c94a1b8ffe0daa820862ad064075641c8eb42ad66134e7c554696448932 SHA512 31a52b93c27ee603ddb314998d663d02c1cfdbc33214d2d9f977f7b66f4fc131a52cd17b274efcfb80f2fb17d7b469157e99a783cbfe76e0b872a2a75363b208
-EBUILD gnome-photos-3.30.1-r1.ebuild 1949 BLAKE2B 8f5589d46c9d807dd7855e65b04309cd9bcfd85d80fb2d203f7ea7ccabb83e0e9467037ad53fcead3adebd731fedc854325b146994e715ec3df4007ae69511ae SHA512 dbb23890e3d1e3f31cbbecc524322d5c7840fded647ce281d763a9af126aeecefb46d1890bdb262c26446aa44875fc08cef9b6ead727dacfe399633e3a7e7164
-EBUILD gnome-photos-3.32.1.ebuild 2278 BLAKE2B 3da565e8cc9df8ed03970a3d0770bc538da3e0ac6b76048004080b97fb4ca2ade1b3ae8eeb17fa5aeacaf8a80a47163b2339a1a0bcd7332c725acff165f4dc0a SHA512 fd188627c7fa8aa3c57787604e913e9e2276b4a3b3f831ed8e2e31e5a7fd4a658076f9f82feb70a75481d7478fbbaf37e929a5b9f479f062ddeaff85c33dcc99
+EBUILD gnome-photos-3.30.1-r1.ebuild 1976 BLAKE2B 943d102726da0a7dc85f9f027e0b426d59039bdf19e492fc5cebedaaa9df99ba7ad8fbe52d670f89172f59d34d1aa59a7b54cfcd95ed09472dbbb22ec4a7bf82 SHA512 bb52b6e8d2675b7eb5390d9e316ae3a68a34fdebde3a6261c9bc445ce8a3a7581a47b5d261285233f502b9dd016805b62bf5695050d097a2d9240b2768d48b21
+EBUILD gnome-photos-3.32.1.ebuild 2303 BLAKE2B 29e853fb84511cbf9da793dbf84df5400a953a725f9e76d1d4aacecce52d39786cc8282f45cd7c83312a9155c4cafec7fc2263ec5c2f632048629b95f067e5ab SHA512 1be09542f8f9e189078968daa14367e9813e112989509fff9d15488b650cd89ecd3483344c5a6098706e9506ed05c4577c357e733bae22f8da9df875849512fb
 MISC metadata.xml 992 BLAKE2B beda29ca65d25e5d68c014fbb70fb539cf17b55d64255d6d74305d710f3979b5156eda764d75992f057416f5eb96af899b988633dd8444fcf22c6a5f73fe9b9b SHA512 3c47be6c01072a0b4845dd42b6d3561d340eb703bd9cb5c727ec24b653ab76eee38e35ba63c4cd71b93514ab0cb8bd75663febeed1901cccedfd30f223e870df
diff --git a/media-gfx/gnome-photos/gnome-photos-3.30.1-r1.ebuild b/media-gfx/gnome-photos/gnome-photos-3.30.1-r1.ebuild
index 7d25df358979..e08ff3b0ea8b 100644
--- a/media-gfx/gnome-photos/gnome-photos-3.30.1-r1.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-3.30.1-r1.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-3+ LGPL-2+ CC0-1.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
 IUSE="flickr test upnp-av"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	>=app-misc/tracker-2.0:0/2.0
diff --git a/media-gfx/gnome-photos/gnome-photos-3.32.1.ebuild b/media-gfx/gnome-photos/gnome-photos-3.32.1.ebuild
index bf9760240045..8a814d5bc75a 100644
--- a/media-gfx/gnome-photos/gnome-photos-3.32.1.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-3.32.1.ebuild
@@ -11,8 +11,9 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
 
 LICENSE="GPL-3+ LGPL-2+ CC0-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="flickr test upnp-av"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	media-libs/babl
diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest
index 26942ec13d03..1eccce76d6c1 100644
--- a/media-gfx/gnome-screenshot/Manifest
+++ b/media-gfx/gnome-screenshot/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-screenshot-3.30.0.tar.xz 225244 BLAKE2B 69c75bb8e3d18578317343b549d4ad837b6e58420c6b49efbc01338697bc2251032d9158e658c9f4ae4e086a1c117eac818c18b6ed95d031c2b60c2ba62a56b6 SHA512 a42ff4f14bbb3a3feb438ee64f1dff3d3a792a6585fef92fde8546b9c3fc07013e8bd2ef42ddc880f2529cbc4241a50d441d4de2a4b26923036f1724aabafdba
 DIST gnome-screenshot-3.32.0.tar.xz 228876 BLAKE2B a7f742cf67815428da3013db23d36b34f52bf99c3d77002cac9243d2f5c5c5c1828cb92a34e0541d18c57f357d39f876a815d7caa432f92704c749a431faae95 SHA512 2747f3cc6ff6df6db6d64c9c13f7d7e3c0bf738cdace2850869c1158d23d02dd03b55e6704c9540f1e5b789626ea07741a0030ce3b06dd70c09f2fb2afa79c61
 EBUILD gnome-screenshot-3.30.0.ebuild 1236 BLAKE2B f051edbcf5eda8f5a730da5971708e5e19fd2fd3ba43529986c06e31e35f2563bb98f230318ecdfaee0606fd3287dfea7c86305c5ac587c7634a8b922e57cf41 SHA512 276749c60a4e8f84322fdb3100f6a499aaabc7f38f3c00a4b8ccba3894e246b125087856c3b2a6aea93c06736a3d5d670907491561d721d41753bbdfd9185dbf
-EBUILD gnome-screenshot-3.32.0.ebuild 1210 BLAKE2B 7432b6628559d1f970a4569fdd3c3db3dbc7caca7f86445c45e80244434625aa081ad112fed9e6fcb29dcd2a955271ba038b58e52e5cc433d3deebeba2a4957a SHA512 1cbe6d314fe58fce64bfc73a42a1a8172d530a5fe80111625f5d50a06bc547b4cf470bc36cbba942c89ba8f418e203bfb632a26eccf107f97473ac6a554bb4fb
+EBUILD gnome-screenshot-3.32.0.ebuild 1208 BLAKE2B f231ccd7901bf917986d1e9ca02e6d47421896bc6ae96a548166a1fcfe91344bdd307f2ab122625d3725c34ac367508dfea098cccd49a570fe90cc62731bb719 SHA512 acff8007646b7d67f69eea78a2037ea71e235288a337930d80f4aa8f886b8b8d5a96634450ddd3e3db8daa47798591f29ca1673b12546ca31d8909476af4ef6a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.32.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.32.0.ebuild
index 151a81f1829c..9d6b6a3b2a0b 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.32.0.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.32.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 
 # libcanberra 0.26-r2 is needed for gtk+:3 fixes
 DEPEND="
diff --git a/media-gfx/gphotofs/Manifest b/media-gfx/gphotofs/Manifest
index b81aba711d0e..8c44706c5737 100644
--- a/media-gfx/gphotofs/Manifest
+++ b/media-gfx/gphotofs/Manifest
@@ -1,3 +1,3 @@
 DIST gphotofs-0.5.tar.bz2 261357 BLAKE2B 6c8194308b461fe8b88aba3e6d16a15715cbb9f247aed2f57147e7192f342e3dbb26d0ce112b0203f73c078333706f717eb1822b86b1e0b5da4e632174907b55 SHA512 6f5bcaf8ca820c0590ec95af55ec9438c864a298660ad15c6d6e8f59201a7f873d29f16cf77d13538111f6cec3f958ea0ac88c6c51836ab2d8c9d6cca156ed3a
-EBUILD gphotofs-0.5.ebuild 488 BLAKE2B d2570aa305a7b611bb5993da2149e10f44b4c53d5506c3cc5b7ae9ba053cd4fcbbcecd73ee0b2ec410ded4d5170276a0e905d99cb1857877a27668fe10c95762 SHA512 87322ad31c19cd6af2191b0da285d75ec5b10066ab3e5b84afbef51b2b767428bbaf98937ea83836c1baab02a2d629ac8873adeb57a5a432aa583398be4ba6cf
+EBUILD gphotofs-0.5-r1.ebuild 466 BLAKE2B 3f6c561769e8efe34b2c93bd2e8e453b64d073867260f5a6cd3fefbb7bbaeb5b0b272071d57e7cc1ca173c713f40c1a35847e78e0033f2b46844319e3d187202 SHA512 96f96cda5590aca31efdf280a6c77c27d885a94250fc4f968ab81de4d3585168f9010e679e48ed9cb035de2767e5effb215afda8e515f8ecaf329317b6e92812
 MISC metadata.xml 446 BLAKE2B 18f2eb77d8f9427330eacbd64d569781416321b6a92fcee1038000f3c1b5fd09c74be486d2647f310273713fe2fd35f837a8e6dc246882984a02cb655011c130 SHA512 619180d3c610d109b8a379a83995c56b74cfb33af9bfb16c23d4fd95a0790a1f43ad14617f2024a58d7fca5886f51c7129c542adaab0a6db3b1b9583efce036c
diff --git a/media-gfx/gphotofs/gphotofs-0.5.ebuild b/media-gfx/gphotofs/gphotofs-0.5-r1.ebuild
index c1b0cfced6b0..70e41b60a411 100644
--- a/media-gfx/gphotofs/gphotofs-0.5.ebuild
+++ b/media-gfx/gphotofs/gphotofs-0.5-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
 DESCRIPTION="FUSE file system for interfacing with digital cameras using gphoto2"
 HOMEPAGE="http://www.gphoto.org/"
@@ -10,11 +10,12 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-RDEPEND=">=media-libs/libgphoto2-2.5.0
-	>=sys-fs/fuse-2.5
-	>=dev-libs/glib-2.6"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.14.1"
+RDEPEND="
+	dev-libs/glib:2
+	media-libs/libgphoto2:=
+	sys-fs/fuse:0="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig"
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 86654f0d1154..57d188d9892f 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -1,6 +1,6 @@
 AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3bcaf0af3e6b29a0269581390f64950e42e41280e482fc9cfda9bfe24ef166eb6c24d21377a15fca4264fec69d902d8ba18810bdb01 SHA512 26ab6dda13d758a5e4237c8b5d207d3c5111afbb11b2c3984cd742913c3c7932559b23b5ea9f774f1c6373eb0f761a9400dccc95876740b3cd06c44084a10965
 DIST graphite2-1.3.10.tgz 3889647 BLAKE2B c6db80950ed5f81d5ecf77003e23e6545c2824948bdc04aa3111747c0eb1ef074b09fe4c3ec20b68b00f75958ea39c5945a7fbe2fecde55ff32d22e517c91156 SHA512 d6d578feaa2d9304dc9bcd3926958070b8c23b27437a9fcb801e08e62f33a5549b7a6aa9636c7f8eb80a2a2c6d5cac97d58050fb30fd102b9fd0f8c558f4252b
 DIST graphite2-1.3.13.tgz 6664757 BLAKE2B 3faad44f7ba5e0729f722fd4589c5f6a4c53cffc2bb93615c8220d03c759dedf05924b1f56cafcf1c28e0a4b50fba0d319da30572fffde4baab6bc240528a0d3 SHA512 44ac2f353c1a795a55c78b4ff72df35a3a5a94700356c0eefe105d66cd499ac93f9cfd5ab7b3ea842b575156cb8df19e0b57ff8b9dbaee8a576319ff5889c131
-EBUILD graphite2-1.3.10.ebuild 2477 BLAKE2B 4539b2af04bce3abbc85227ad702f1088b5c11ada2dd32e8a13eb541ec59062cfbbd0b1f014f65e66633ec811bbf501143b283413df0950e379af5a5244e436c SHA512 1b7829629f0562da73bdc3e64c5fa6842360abaa4debd354ce34b267b663fe117da84fb527817a1fd0cef0d493fa95454f804e949b40858d320bd04321d65b1c
-EBUILD graphite2-1.3.13.ebuild 2644 BLAKE2B a0811c823d4468c8c00130455295bb29cc8ae1e915f87ca2a810e00b3278cfbb57beb5660d6447f4e7ff3c591a74857c0c8c55189e20d84c276dacd73b6bb2fa SHA512 2cd4c28a43605d30ea0c1af133d40b1e2b98142dd0335295d6d40e0ac57124f3df1f5b40018cc9ad5b25410e90c0690fdcddf2798c3a3751e0864253de08b0b8
+EBUILD graphite2-1.3.10.ebuild 2501 BLAKE2B 636ff39993801a16ba340cb932da05c3c8837f8fa5df259eaaa7d41525a1e9e46499c2e067f746d43d2f573924a455031f90c993e1f79ed5da661f606b811afe SHA512 8de1cde1422d657a472c584802384a8d1cc7bd44f74078921c684c4b6b36cba5d14527bf6d61810e8adbe107080e5c21e76c8254f5efa119fce17c02092163b1
+EBUILD graphite2-1.3.13.ebuild 2670 BLAKE2B e51fbf26d3c4e8f367811eed90251cfb22d7d4e0a686d681f3d32cd71693fd10c27801aaa8ec61c2147adaa52bd42c341251aad5c614af04cc708469e2139c3f SHA512 d53d7ea6700e365b24263f7358e39f8e9943fa35b052048843b9610cc1a730e92fc76ceebdf5eb9cb47d9fce0e729d6f34220355515d386867daf78dc58fc54f
 MISC metadata.xml 336 BLAKE2B 7069f4f7bb9ecd39581528f3f6b072d2ebf2c32b24224b9ca5b69b138490e764b740768334954f5cfc25819cab55a50fbd0933dc77fb3397886aacfd105f0853 SHA512 ac8ae39ab005c1562818a97b64bfef48ab64e2a1993aa3eef4ee4b3066b32d9211787df1273e20cb767839e42364ed72b3e99c51bb65f0c88937564d5dbb5380
diff --git a/media-gfx/graphite2/graphite2-1.3.10.ebuild b/media-gfx/graphite2/graphite2-1.3.10.ebuild
index a4a3816cea42..54c11d8e1d90 100644
--- a/media-gfx/graphite2/graphite2-1.3.10.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="perl test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	perl? ( dev-lang/perl:= )
diff --git a/media-gfx/graphite2/graphite2-1.3.13.ebuild b/media-gfx/graphite2/graphite2-1.3.13.ebuild
index 1af96ad4ff90..cc89c7d3d94c 100644
--- a/media-gfx/graphite2/graphite2-1.3.13.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.13.ebuild
@@ -14,8 +14,9 @@ SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="perl test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	perl? ( dev-lang/perl:= )
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 93db8be007be..12dacc76d7e1 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,9 +1,8 @@
 AUX graphviz-2.34.0-Xaw-configure.patch 2445 BLAKE2B fc1b3820fd72821ac431f5d93d0b4b0c8f596ca9d2c2f516961f5baab9fd54ba870df75434d2ed59fd9034bb7e2ce38c00faef9c12a79c7ec4da2d5e416d7117 SHA512 473d2ed9070329512cbc26929267b25fb8d7726e21ed01d2921d4d8ac13b8ffaf166f07229fa7409192cfa14fabb0cf68b299bb3331b3cc953ae5363274fd15c
-AUX graphviz-2.40.1-qt5.patch 4140 BLAKE2B d0d92dddd6ae1efb7e24e22ac0f32025b16ad1aab5182ec410dfd527732fefdf335cda392f1036409ac3a6b86be15794b80546ff9cbfd47454bd01266d861945 SHA512 bd1d51ae10d17ef321bba7dfa619054642debbb02ea1458b0597e6c62471e7750bf5d2cfc68ccb6fd2964b0fbe072b2e7642dd8b097c7e046f8877a2e36d3f44
 AUX graphviz-2.42.1-libgv_python.patch 621 BLAKE2B fa1d3e0f37870c46d8e6266ac812691f2f2bc8a0cdfaa6e4183da2f46714f8621d14578cc8f4dbf7a96e276f272822dd447d61145133d5d47a9c6ae686e24439 SHA512 637c344698cbfd7f698f5615fd04644bb5b704761dccaf9abd4fa98b9b60e1572cd3f2b8af4ae46ce3aa7b57cd1a633b781d1642d4ee0c97c5812f38719f8a37
 AUX graphviz-2.42.1-math.patch 843 BLAKE2B 3ceeeec968dd45478f4bb07d819cb5a4b5a215c36728dd9212db9a81841ad4ffcc1c02a56b850fb9cfde0de3689eb595eb1f73feb97c11e77d0fdfea5e708127 SHA512 17494f6795b4ed8cdef8652089132243808acd76fe970a6297cb93907cd15ad91460dbffd5ab3251d8c84a4e0ca0ec4cc96268682ef93f4b5f6b1dc88bb0b64d
-DIST graphviz-2.40.1.tar.gz 25633455 BLAKE2B 96ba5a8cb94d93cf4ecd424bf29c1bf67099e39e582be97fca088de0aad6bbbb46b00af55c197894e0b63f1a96177894b6cd23498295bb524fe19a75661cbc59 SHA512 a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5
 DIST graphviz-2.42.1.tar.gz 25543401 BLAKE2B e64044923a823f6fbe91b498b04fffe3e5b6803c55c5ce29a60b16a38d97260061b013e8bd13bc99f360d035c840f18a01301b29ca1cb73c4be87843f18c45fc SHA512 ac263df086eea6faf682f493756b79a0af8bae3f515cd8c09238e89f295226baf743a3fd22d977ef6f223388769ef11241dfb2fdb6087305ce4fdd3fa8ed2f78
-EBUILD graphviz-2.40.1-r1.ebuild 7929 BLAKE2B 954fb0e307df7e28ae4cf0806aa5b1969615c542416532d11930b3327075977be13b38eb127639fe153bac3819f28a7ef1c0be926391331d3f01e60a4ebdbba8 SHA512 c0cf4c8aa2954391a46b3698c445b2dc100db6c8194cd191c8ecc4ea3b2ac2616b47ec8117b180abae6c8dd9edbde9c2e8731af78bccd6364932447c6a289a72
-EBUILD graphviz-2.42.1.ebuild 7928 BLAKE2B 56671e7d38854644335c6d16e86fac6ac03631e1a42ad71359f6450f0d8e95faef2f2f3854161d26bcdd1c343b7cbe5d78540aad50bae5a744fe2f6201b032fd SHA512 666ddedd9ebb69072f67644332fb0b88aa0369fa54c33ea6cce605e29c9f3d406c3feebd865cc93e31e7deb2511492c3bab8046afda4605b190e91c1308e87b3
+DIST graphviz-2.42.3.tar.gz 26246717 BLAKE2B 71c61dcd056c9a2e2655c3be995d1da17b3af0d3374e74400fc38da11ab81849f7b5e528f99fc2046294958a4bab0a411ab204e434360f316a5367403472e8a1 SHA512 e03ca6da0ddb1162bd179d159d7dbb379d55012d63bb922aa800260fce52b65beb1a9b5ca1a5199ad3537201b0b4841efc9facee6e03065c6bd02e840f8a29c9
+EBUILD graphviz-2.42.1-r1.ebuild 7935 BLAKE2B 1ac923f722297c1c12e5a8c38ced5b5568c76267be5be645503f64cc3977d1b352083edbeda259a05aad67ace7268906e55d3103c4aa456b27d6ce2cc66c9acb SHA512 7b122f160d5e886a4bd9a5844040eff974d5f86774fabd6938cebe85f01a40f49799fc64ba2708b7d8f8885a2efd506a9e6d401908d5ac970fc2ebc2ade46cb3
+EBUILD graphviz-2.42.3.ebuild 7823 BLAKE2B b10b894caa51995e558f5c28c3d247ba54055d9c82133f57a4d708d84255bcb7b212c71a712a29f1c732fed7506c8cbef0d21ef55b73ca36b419a72f6ffccd21 SHA512 8652c04572d91396521bad94323d72433a4a7a82d6f0084f2efd937517d76e7e735b9050abb03344dc8f319940fdfc29f5f1b6160400c3902fd09e989bdb1107
 MISC metadata.xml 2211 BLAKE2B 1c39235c1d8c2efce0596cda2d20bf1cf2e81643068f68215f31462b6320f7f31533877630aa3c2b2bc9a7f7856f7b27354a97bb2c61d7e63a6de86f569ed192 SHA512 f7689fe65e46905d48fb2e45c3ad2a1e8f4fcb572515fdd7dfa26cdd21ed1eaf52d8ecaab9c297f5e8df69a205337b8526e0304ddbdb8c4b3e82cb1e428a1e71
diff --git a/media-gfx/graphviz/files/graphviz-2.40.1-qt5.patch b/media-gfx/graphviz/files/graphviz-2.40.1-qt5.patch
deleted file mode 100644
index 02e81fac1d25..000000000000
--- a/media-gfx/graphviz/files/graphviz-2.40.1-qt5.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-Submitted By:            Pierre Labastie <pierre dot labastie at neuf dot fr>
-Date:                    2017-08-27
-Initial Package Version: 2.40.1
-Upstream Status:         Unknown
-Origin:                  https://github.com/elkrejzi/pacman/blob/master/pkgbuild/graphviz/graphviz-qt5.patch
-                         Addition of patch for cmd/gvedit/Makefile.am by P. Labastie
-Description:             Fixes use of Qt5
-
-diff -Naur a/cmd/gvedit/csettings.cpp b/cmd/gvedit/csettings.cpp
---- a/cmd/gvedit/csettings.cpp	2016-09-08 06:45:03.000000000 +0200
-+++ b/cmd/gvedit/csettings.cpp	2017-08-28 17:05:32.226578375 +0200
-@@ -16,7 +16,7 @@
- #include "csettings.h"
- #include "qmessagebox.h"
- #include "qfiledialog.h"
--#include <QtGui>
-+#include <QtWidgets>
- #include <qfile.h>
- #include "mdichild.h"
- #include "string.h"
-diff -Naur a/cmd/gvedit/imageviewer.h b/cmd/gvedit/imageviewer.h
---- a/cmd/gvedit/imageviewer.h	2016-08-09 23:02:09.000000000 +0200
-+++ b/cmd/gvedit/imageviewer.h	2017-08-28 17:05:32.226578375 +0200
-@@ -15,7 +15,7 @@
- 
- #ifndef IMAGEVIEWER_H
- #define IMAGEVIEWER_H
--#include <QtGui>
-+#include <QtWidgets>
- #include <QMainWindow>
- #include <QPrinter>
- 
-diff -Naur a/cmd/gvedit/mainwindow.cpp b/cmd/gvedit/mainwindow.cpp
---- a/cmd/gvedit/mainwindow.cpp	2016-09-20 06:45:02.000000000 +0200
-+++ b/cmd/gvedit/mainwindow.cpp	2017-08-28 17:05:32.226578375 +0200
-@@ -11,7 +11,7 @@
-  * Contributors: See CVS logs. Details at http://www.graphviz.org/
-  *************************************************************************/
- 
--#include <QtGui>
-+#include <QtWidgets>
- #include <qframe.h>
- #include "mainwindow.h"
- #include "mdichild.h"
-diff -Naur a/cmd/gvedit/Makefile.am b/cmd/gvedit/Makefile.am
---- a/cmd/gvedit/Makefile.am	2016-09-20 06:45:02.000000000 +0200
-+++ b/cmd/gvedit/Makefile.am	2017-08-28 17:06:21.012476088 +0200
-@@ -30,6 +30,8 @@
- 	-DDEMAND_LOADING=1 \
- 	-DGVEDIT_DATADIR=\""$(pkgdatadir)/gvedit"\"
- 
-+gvedit_CXXFLAGS = -fPIC
-+
- gvedit_LDADD = \
- 	$(top_builddir)/lib/gvc/libgvc.la \
- 	$(top_builddir)/lib/cgraph/libcgraph.la \
-diff -Naur a/cmd/gvedit/mdichild.cpp b/cmd/gvedit/mdichild.cpp
---- a/cmd/gvedit/mdichild.cpp	2016-08-09 23:02:09.000000000 +0200
-+++ b/cmd/gvedit/mdichild.cpp	2017-08-28 17:05:32.226578375 +0200
-@@ -12,7 +12,7 @@
-  *************************************************************************/
- 
- 
--#include <QtGui>
-+#include <QtWidgets>
- 
- #include "mdichild.h"
- #include "mainwindow.h"
-diff -Naur a/cmd/gvedit/ui_settings.h b/cmd/gvedit/ui_settings.h
---- a/cmd/gvedit/ui_settings.h	2016-09-08 06:45:03.000000000 +0200
-+++ b/cmd/gvedit/ui_settings.h	2017-08-28 17:05:32.226578375 +0200
-@@ -10,22 +10,22 @@
- #ifndef UI_SETTINGS_H
- #define UI_SETTINGS_H
- 
--#include <QtCore/QVariant>
--#include <QtGui/QAction>
--#include <QtGui/QApplication>
--#include <QtGui/QButtonGroup>
--#include <QtGui/QComboBox>
--#include <QtGui/QDialog>
--#include <QtGui/QFrame>
--#include <QtGui/QHBoxLayout>
--#include <QtGui/QHeaderView>
--#include <QtGui/QLabel>
--#include <QtGui/QLineEdit>
--#include <QtGui/QPushButton>
--#include <QtGui/QSpacerItem>
--#include <QtGui/QTextEdit>
--#include <QtGui/QVBoxLayout>
--#include <QtGui/QWidget>
-+#include <QVariant>
-+#include <QAction>
-+#include <QApplication>
-+#include <QButtonGroup>
-+#include <QComboBox>
-+#include <QDialog>
-+#include <QFrame>
-+#include <QHBoxLayout>
-+#include <QHeaderView>
-+#include <QLabel>
-+#include <QLineEdit>
-+#include <QPushButton>
-+#include <QSpacerItem>
-+#include <QTextEdit>
-+#include <QVBoxLayout>
-+#include <QWidget>
- 
- QT_BEGIN_NAMESPACE
- 
-diff -Naur a/configure.ac b/configure.ac
---- a/configure.ac	2016-12-22 06:44:41.000000000 +0100
-+++ b/configure.ac	2017-08-28 17:05:32.227578435 +0200
-@@ -2561,10 +2561,10 @@
-   use_qt="No (disabled)"
- else
- 
--  AC_CHECK_PROGS(QMAKE,qmake-qt4 qmake-qt3 qmake,false)
-+  AC_CHECK_PROGS(QMAKE,qmake-qt5 qmake,false)
-   if test "$QMAKE" != "false"; then
--    PKG_CHECK_MODULES(QTCORE, [QtCore],[
--      PKG_CHECK_MODULES(QTGUI, [QtGui],[
-+    PKG_CHECK_MODULES(QTCORE, [Qt5Core],[
-+      PKG_CHECK_MODULES(QTGUI, [Qt5Widgets Qt5PrintSupport],[
- 	use_qt="Yes"
-       ],[
-         use_qt="No (QtGui not available)"
diff --git a/media-gfx/graphviz/graphviz-2.42.1.ebuild b/media-gfx/graphviz/graphviz-2.42.1-r1.ebuild
index a87a88648f07..4dac9f5771e0 100644
--- a/media-gfx/graphviz/graphviz-2.42.1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.42.1-r1.ebuild
@@ -74,7 +74,7 @@ DEPEND="${COMMON_DEPEND}
 	ruby?	( dev-lang/swig )
 	tcl?	( dev-lang/swig )
 "
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
 	!<=sci-chemistry/cluster-1.3.081231
 "
 
diff --git a/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.42.3.ebuild
index cb6f4538d330..67b51ca4f754 100644
--- a/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.42.3.ebuild
@@ -1,79 +1,87 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
 
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
 inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils
 
 DESCRIPTION="Open Source Graph Visualization Software"
 HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/"
-SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
+SRC_URI="https://www2.graphviz.org/Packages/stable/portable_source/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD"
 
 REQUIRED_USE="
 	!cairo? ( !X !gtk !postscript !lasi )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
-# Requires ksh
+# Requires ksh, tests against installed package, missing files and directory
 RESTRICT="test"
 
-COMMON_DEPEND="
+BDEPEND="
+	sys-devel/flex
+	sys-devel/libtool
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.14.5 )
+	perl? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+	ruby? ( dev-lang/swig )
+	tcl? ( dev-lang/swig )
+"
+RDEPEND="
 	>=dev-libs/expat-2
 	>=dev-libs/glib-2.11.1:2
 	dev-libs/libltdl:0
 	>=media-libs/fontconfig-2.3.95
 	>=media-libs/freetype-2.1.10
 	>=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib]
-	>=media-libs/libpng-1.2:0
+	>=media-libs/libpng-1.2:0=
 	sys-libs/zlib
 	virtual/jpeg:0
 	virtual/libiconv
-	cairo?	(
+	cairo? (
 		>=x11-libs/cairo-1.1.10[svg]
 		>=x11-libs/pango-1.12
 	)
-	devil?	( media-libs/devil[png,jpeg] )
-	gtk?	( x11-libs/gtk+:2 )
-	gts?	( sci-libs/gts )
-	lasi?	( media-libs/lasi )
-	pdf?	( app-text/poppler )
-	perl?	( dev-lang/perl:= )
+	devil? ( media-libs/devil[png,jpeg] )
+	gtk? ( x11-libs/gtk+:2 )
+	gts? ( sci-libs/gts )
+	lasi? ( media-libs/lasi )
+	pdf? ( app-text/poppler )
+	perl? ( dev-lang/perl:= )
 	postscript? ( app-text/ghostscript-gpl )
-	python?	( ${PYTHON_DEPS} )
-	qt5?	(
+	python? ( ${PYTHON_DEPS} )
+	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 		dev-qt/qtprintsupport:5
 		dev-qt/qtwidgets:5
 	)
-	ruby?	( dev-lang/ruby:* )
-	svg?	( gnome-base/librsvg )
-	tcl?	( >=dev-lang/tcl-8.3:0= )
+	ruby? ( dev-lang/ruby:* )
+	svg? ( gnome-base/librsvg )
+	tcl? ( >=dev-lang/tcl-8.3:0= )
 	X? (
 		x11-libs/libX11
 		x11-libs/libXaw
 		x11-libs/libXmu
 		x11-libs/libXpm
 		x11-libs/libXt
-	)"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	sys-devel/libtool
-	virtual/pkgconfig
-	guile?	( dev-lang/swig dev-scheme/guile )
-	java?	( dev-lang/swig >=virtual/jdk-1.5 )
-	nls?	( >=sys-devel/gettext-0.14.5 )
-	perl?	( dev-lang/swig )
-	python?	( dev-lang/swig )
-	ruby?	( dev-lang/swig )
-	tcl?	( dev-lang/swig )"
-RDEPEND="${COMMON_DEPEND}
-	!<=sci-chemistry/cluster-1.3.081231"
+	)
+"
+DEPEND="${RDEPEND}
+	guile? (
+		dev-lang/swig
+		dev-scheme/guile
+	)
+	java? (
+		dev-lang/swig
+		>=virtual/jdk-1.5
+	)
+"
 
 # Dependency description / Maintainer-Info:
 
@@ -104,6 +112,7 @@ RDEPEND="${COMMON_DEPEND}
 # There can be swig-generated bindings for the following languages (/tclpkg/gv):
 # - c-sharp (disabled)
 # - scheme (enabled via guile) ... no longer broken on ~x86
+# - go (disabled)
 # - io (disabled)
 # - java (enabled via java) *2
 # - lua (enabled via lua)
@@ -134,10 +143,7 @@ RDEPEND="${COMMON_DEPEND}
 #   sci-libs/gts, x11-libs/gtk.  Also needs 'gtk','glade','glut','gts' and 'png'
 #   with flags enabled at configure time
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch
-	"${FILESDIR}"/${P}-qt5.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch )
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -163,11 +169,6 @@ src_prepare() {
 	# delete the dir since we don't need to eautoreconf it
 	rm -r libltdl || die
 
-	# no nls, no gettext, no iconv macro, so disable it
-	if ! use nls ; then
-		sed -i -e '/^AM_ICONV/d' configure.ac || die
-	fi
-
 	# Nuke the dead symlinks for the bindings
 	sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die
 
@@ -182,30 +183,22 @@ src_prepare() {
 
 	use java && append-cppflags $(java-pkg_get-jni-cflags)
 
-	append-cxxflags -std=c++11  # bug 648764
-
 	eautoreconf
 }
 
 src_configure() {
 	local myconf=(
 		--enable-ltdl
-		--disable-silent-rules
-		$(use_enable static-libs static)
-	)
-
-	# libtool file collision, bug 276609
-	myconf+=( --without-included-ltdl --disable-ltdl-install )
-
-	myconf+=(
 		$(use_with cairo pangocairo)
 		$(use_with devil)
+		$(use_enable gdk-pixbuf)
 		$(use_with gtk)
 		$(use_with gts)
 		$(use_with qt5 qt)
 		$(use_with lasi)
 		$(use_with pdf poppler)
 		$(use_with postscript ghostscript)
+		$(use_enable static-libs static)
 		$(use_with svg rsvg)
 		$(use_with X x)
 		$(use_with X xaw)
@@ -216,36 +209,34 @@ src_configure() {
 		--with-ipsepcola
 		--with-libgd
 		--with-sfdp
-		$(use_enable gdk-pixbuf)
 		--without-ming
-	)
-
-	# new/experimental features, to be tested, disable for now
-	myconf+=(
+		# new/experimental features, to be tested, disable for now
 		--with-cgraph
 		--without-glitz
 		--without-ipsepcola
 		--without-smyrna
 		--without-visio
-	)
-
-	# Bindings:
-	myconf+=(
+		# Bindings:
 		$(use_enable guile)
-		--disable-io
 		$(use_enable java)
+		$(use_enable perl)
+		$(use_enable python python2)
+		$(use_enable python python3)
+		$(use_enable ruby)
+		$(use_enable tcl)
+		--disable-go
+		--disable-io
 		--disable-lua
 		--disable-ocaml
-		$(use_enable perl)
 		--disable-php
-		$(use_enable python)
+		--disable-python
 		--disable-r
-		$(use_enable ruby)
 		--disable-sharp
-		$(use_enable tcl)
+		# libtool file collision, bug #276609
+		--without-included-ltdl
+		--disable-ltdl-install
 	)
-
-	econf ${myconf[@]}
+	econf "${myconf[@]}"
 }
 
 src_install() {
@@ -267,11 +258,12 @@ src_install() {
 		find "${ED}" -name '*.la' -delete || die
 	fi
 
-	dodoc AUTHORS ChangeLog NEWS README
+	einstalldocs
 
 	use python && python_optimize \
 		"${D}$(python_get_sitedir)" \
-		"${D}/usr/$(get_libdir)/graphviz/python"
+		"${D}/usr/$(get_libdir)/graphviz/python2" \
+		"${D}/usr/$(get_libdir)/graphviz/python3"
 }
 
 pkg_postinst() {
@@ -282,5 +274,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	# Remove cruft, bug #547344
-	rm -rf "${EROOT}"usr/lib/graphviz/config{,6} || die
+	rm -rf "${EROOT}"/usr/$(get_libdir)/graphviz/config{,6} || die
 }
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index 7245cf913363..9bccbe3ed0d4 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -1,5 +1,7 @@
 DIST gscan2pdf-1.8.11.tar.xz 409212 BLAKE2B 37cb716f13818eaffc39c210b810b845368cc5e323569e8f9d5603b5b412c4182520798321358e4c21339fdbd5f15026a0acd6421a49e7db79ecca86633c3ab0 SHA512 1ea09b8768771be4a1700cb8a6523d5f74fcbf0ebe459d97796032b56f896fd0c50e5ca1ed4c96aedef7e61f6952a92986153cc70173dd5ad91ccfb72461c565
 DIST gscan2pdf-2.6.1.tar.xz 457976 BLAKE2B ae7fb7164c1270ff049dde87eb3bc7bc54f4c7d67a12a36f3b22831f6b77117645d5491c41f97879c428ce28d48271be8aee93e1ac96e3c3d9c064a7963abaaa SHA512 694f1d24b96a60960084e3963073e39fcd01461e9e5f2dc2e71d6821f0a3985dc04810c0404b5a21cb11aaa4adbf5747a3c942d07d259bb9028f078f3147cc85
+DIST gscan2pdf-2.6.2.tar.xz 458920 BLAKE2B e8c54654c10adae7d66844e3814025f8c934df935c315e48b6a2a34810b06b47d22208af22da04d872b2ac9737f5f5cba72d42fb2de92f1fa8110dbe64ba71ba SHA512 7b0bba012eab6edcaede2a2163935947ab9c71b21abb4cde8456f958537f84435a274a0ae6fb3827afd835f376d462ab5402e772307034936ec2b24889ecaec2
 EBUILD gscan2pdf-1.8.11.ebuild 1731 BLAKE2B 0b0f7cdfef98e666e20e44882584e0636e490429186e441d87f965e74071f5076693896e17e68184319dfaf3a1fd4487140209ef3b49603c9496cc936516333d SHA512 b94b73d3396208a8c67c2aad407815329501717c364d60189b21d96f652846e554d59a2a36f4b58383d7f49ab728d4fe251bce9ab1944befb667a9e0c09237b3
 EBUILD gscan2pdf-2.6.1.ebuild 2318 BLAKE2B cb72ecd97b6eec1ca9b2a0be67aa0a9cbf20c1367791b65b57d22f3568d4632e5ef1285cb72d8cc30e5a2e438d4134cdd16cf9ce65f47bca0a0f0d1e34e9c6d0 SHA512 1a80ea580d566d981c28fb9f2fba632a964b01be736b9a68cf253ec96781f98bc0e11f5555018d50bbb65023f51bebf5c33b350bae5bf3974e4d007fc344871a
+EBUILD gscan2pdf-2.6.2.ebuild 2318 BLAKE2B cb72ecd97b6eec1ca9b2a0be67aa0a9cbf20c1367791b65b57d22f3568d4632e5ef1285cb72d8cc30e5a2e438d4134cdd16cf9ce65f47bca0a0f0d1e34e9c6d0 SHA512 1a80ea580d566d981c28fb9f2fba632a964b01be736b9a68cf253ec96781f98bc0e11f5555018d50bbb65023f51bebf5c33b350bae5bf3974e4d007fc344871a
 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.2.ebuild
new file mode 100644
index 000000000000..2c4c4ca4eca1
--- /dev/null
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.6.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_TEST="do"
+
+inherit eutils perl-module virtualx
+
+DESCRIPTION="Scan documents, perform OCR, produce PDFs and DjVus"
+HOMEPAGE="http://gscan2pdf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-perl/Config-General
+	dev-perl/Data-UUID
+	dev-perl/Date-Calc
+	dev-perl/Filesys-Df
+	dev-perl/glib-perl
+	dev-perl/GooCanvas2
+	dev-perl/Gtk3
+	dev-perl/Gtk3-SimpleList
+	dev-perl/HTML-Parser
+	dev-perl/Image-Sane
+	dev-perl/List-MoreUtils
+	dev-perl/Locale-gettext
+	dev-perl/Log-Log4perl
+	dev-perl/PDF-API2
+	dev-perl/Proc-ProcessTable
+	dev-perl/Readonly
+	dev-perl/Set-IntSpan
+	dev-perl/Try-Tiny
+	virtual/perl-Archive-Tar
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	virtual/perl-File-Temp
+	virtual/perl-Getopt-Long
+	virtual/perl-threads
+	virtual/perl-threads-shared
+	media-gfx/imagemagick[png,tiff,perl]
+	media-gfx/sane-backends
+	media-libs/tiff"
+
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-perl/Sub-Override
+		media-libs/fontconfig
+
+		app-text/djvu[tiff]
+		app-text/poppler[utils]
+		app-text/tesseract[-opencl,osd(+),tiff]
+		app-text/unpaper
+		media-gfx/imagemagick[djvu,png,tiff,perl]
+		media-gfx/sane-backends[sane_backends_test]
+		media-gfx/sane-frontends
+	)"
+
+PERL_RM_FILES=( t/{90_MANIFEST,91_critic,99_pod}.t )
+
+mydoc="History"
+
+pkg_postinst() {
+	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]
+	optfeature "adding to an existing PDF" app-text/poppler[utils]
+	optfeature "Optical Character Recognition" app-text/tesseract[osd,tiff]
+	optfeature "scan post-processing" app-text/unpaper
+	optfeature "automatic document feeder support" media-gfx/sane-frontends
+	optfeature "sending PDFs as email attachments" x11-misc/xdg-utils
+}
+
+src_test(){
+	local confdir="${HOME}/.config/ImageMagick"
+	mkdir -p "${confdir}" || die
+	cat > "${confdir}/policy.xml" <<-EOT || die
+		<policymap>
+			<policy domain="coder" rights="read|write" pattern="PDF" />
+			<policy domain="coder" rights="read" pattern="PS" />
+		</policymap>
+	EOT
+	virtx perl-module_src_test
+}
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index f2ed81945be7..7dbc20f488eb 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,4 +1,4 @@
 AUX gthumb-3.6.2-exiv2-0.27.patch 1004 BLAKE2B e351a67d8fbbfd0c13b26ca575a34528ef29f6d6b2a7ede9b0f16a5835f502bf24e8415f597146abde875e5dbd93fd1fec126a6bbb27d4b0f9881fe9c823ceb5 SHA512 e6f4549526d745d7fa0f42175508be7f6b5ffc9258a5b59a31f45e8c095870b13a0da55c50635723abe6235cf983b7730677906bbb16acf99e58447cc72d8c3d
 DIST gthumb-3.6.2.tar.xz 3423044 BLAKE2B ff5fd805c07c969f8e50960cdd36df9b3ef9ddedcaca66578416fc4f602fedf4f1698fec54cda77521c88774e8e309b996123ade9a633df1ffc34bb60cef0ff5 SHA512 5fc5cc43b16b51438403fbb986286d5e66575162be7b4cf35931dd0c41273933f78c210aaf2379e0a2574df6f7f7b2d532d87ce37fbc6369b65331bac338a454
-EBUILD gthumb-3.6.2-r1.ebuild 2690 BLAKE2B ae853fc2f1a55a17626b589c7aab46e19441a52299a3fd829347eb30358bb2e8e030303154674c7ed91933845333dc4e79c40a560c0ad74f0527fcc9d2aef6e3 SHA512 38ef0e0adbc136339941de2f7e67d801c80013d3606f06eb3cb43445c60d987771ef5c2ac9e88f2f52e988a0bb902b32f92c10a017278cc21545e658011c60e7
+EBUILD gthumb-3.6.2-r1.ebuild 2717 BLAKE2B 62fb68e66370161eaa5cfe67eeca54eb2e3ae4d037a4f7997ebde75257a8b6ee61254641ecc3124ea03757ac6d18cae93249adccb453570a9a3a05e0c6f2cf3c SHA512 f5455213d6ee5f8613e4aed71d6b06ee7d409a984a68e463545630a566e6f83baf8ea490af97c24ab8243d72fbeaa4681d499cb8613b30a029029f95a704890a
 MISC metadata.xml 492 BLAKE2B 62ee03ca8c249d8ba7d9e6516ca44677ef14a84bd6c9f9d12e245fc053e5b76215e9f5db346e06b364552c911ab9b9ca63598da5098e89fbb2c6011f8e2b4f03 SHA512 f75dcc1e5ffc912b3e3d69335f98f7bd38af5d46de10cae326ef5569a4511a022fa1bfe6964fb8e5e4883dc09cbfcb5f7e58160ad4864ef1fe1cca1d8b66172d
diff --git a/media-gfx/gthumb/gthumb-3.6.2-r1.ebuild b/media-gfx/gthumb/gthumb-3.6.2-r1.ebuild
index c06bbec3e549..d5b0510c3e92 100644
--- a/media-gfx/gthumb/gthumb-3.6.2-r1.ebuild
+++ b/media-gfx/gthumb/gthumb-3.6.2-r1.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="cdr colord debug exif gnome-keyring gstreamer http jpeg json lcms raw slideshow svg tiff test webkit webp"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/glib-2.36.0:2[dbus]
diff --git a/media-gfx/hp2xx/Manifest b/media-gfx/hp2xx/Manifest
index 0559e41bcad2..cf106fc1982a 100644
--- a/media-gfx/hp2xx/Manifest
+++ b/media-gfx/hp2xx/Manifest
@@ -1,6 +1,5 @@
 AUX hp2xx-3.4.4-docbuild.patch 474 BLAKE2B 2e790843db84da1cbc0aebde13bcb3762cae3d727c6999f45ef9a1b8598d9a47fb786a032b051540410cc1f2ade6c94394a4fd5b4f319a4cae35acb03ef36227 SHA512 48e103f3f6d71f31fa4734a500d173afa33564eebe56ded5edf42c30b6a6c52b22f7742293661328bf26111e4b7fa68c6f47fec7e9ab387d49551b49147ebc70
-AUX hp2xx-3.4.4-r1.patch 3824 BLAKE2B a5318bc7e848210f0b8b4b916ba9af62910fcdec605253421062ddf4c0b7a5e9ca46a1c6760eded382a71729003bdd74e4e57865e05e84323dd21ddf690e0f1a SHA512 49a98dc29f820bf43550bec589045e81eaaed991681625bce1a192fee967e28663f053503644663cdb0e57709ba67000dc7f6922054a4ec3969f1555a63df0a3
+AUX hp2xx-3.4.4-r1.patch 3721 BLAKE2B 0cb18857495aa32789f0df25227e5cae1f2b137cfd7f1f8a6c224778638770d98f348e9b81628f1ff45a16cc181584e2e187873d4deb0f3d2ecadda268a1e542 SHA512 e68e320602a4ff49029b8e97962b10bc38f8d23a08ed37691b835fc1ecb22ad51533961448de044092f9ba2cb79e191f2772359b22f2bb3dde19bf5f18c1aac7
 DIST hp2xx-3.4.4.tar.gz 610330 BLAKE2B c1e374d53fe36710bef6802347829fe9dce67c73c6ca2f2ea6120a1afd343bbdcbd870b6005001d934d9803b91597ebcaceccafdb5cc29d26ad3aed108016abc SHA512 ccfe4a23ca482471506e59d6d459ce3ed56d9d775613e3238bd82d11cf4ea0595bf57ff95b3bd22a674865ec7f07dc63c1bcf0deb2a430b7ae241734c7e57ccd
-EBUILD hp2xx-3.4.4-r1.ebuild 1588 BLAKE2B e3b7f3b79861cf632b4eb1e3f04d1b12a2e4fcc94f44c166ed014ec9748fce0418f221d4ed4f3ecff5f926f9b8f7dc6643d9c58b8bcd17d1a4243f5db057aaa7 SHA512 e4ca1b98406d9ff20ed03bfe2c160690b2391d2e3bb8a8419ee1a1e4d4bb1add2ca61c248d045940cb30fc1a090774015ccf431dde1276432ea9e43ffccab257
-EBUILD hp2xx-3.4.4.ebuild 829 BLAKE2B 5381efb26130bcdf40b30e561e8f7ef19a3b4e1df40d86ac1ce2d8e641db24d64159ca189ece0b76e5d70fe5bdc250015592a4c92d148b7e2dcde9f065c399e9 SHA512 1becdc810fb0a16d05e042f9abdea89a590ce398f1ef400ef708a86a15c87a60a22faf0240e60f59e78b3ef2bb044040e36774a42d25ec2b7ffc0b68e215eb6f
+EBUILD hp2xx-3.4.4-r1.ebuild 1518 BLAKE2B f07d48755c0baca8b43f3de66f62760763e7b05463f94517f13d413cb6bc0a75c0e8cfa8b7361f6fb181f2e28f67a3d8a420cc07ce548faf4e184d18760334f5 SHA512 622d36d51651ffbc1a7797ae8113876be20ba2e55925a942ea77095ae2e5f21510ce070fd9ef6fd6c47e634ea91511384457bc4f3a3ef057c7582728a6d0a4b1
 MISC metadata.xml 259 BLAKE2B 4a7248bc5a529d1cf3b51f8bcfff668a9e525df3e62584369d4b5526c89e70235378420b164073946ea91cf182065d9c8d2d46c8750d5f77855239b77ce45bae SHA512 7b1cbb90c1ddcf63b8802cfa3a53611f6367801b492c7677ef038738a337002c4606bcf93c5186abf808e74bca1fa76266169245acdb3b5997651bcabfecfa5c
diff --git a/media-gfx/hp2xx/files/hp2xx-3.4.4-r1.patch b/media-gfx/hp2xx/files/hp2xx-3.4.4-r1.patch
index 9bff4f43b922..d9f3edb84947 100644
--- a/media-gfx/hp2xx/files/hp2xx-3.4.4-r1.patch
+++ b/media-gfx/hp2xx/files/hp2xx-3.4.4-r1.patch
@@ -1,6 +1,20 @@
-diff -ruN hp2xx-3.4.4.orig/makes/generic.mak hp2xx-3.4.4/makes/generic.mak
---- hp2xx-3.4.4.orig/makes/generic.mak	2003-06-21 17:16:35.000000000 +0200
-+++ hp2xx-3.4.4/makes/generic.mak	2012-02-07 22:30:29.000000000 +0100
+--- a/Makefile
++++ b/Makefile
+@@ -1,9 +1,9 @@
+ 
+ all:
+-	cd sources; make
++	cd sources && $(MAKE)
+ 
+ clean:
+-	cd sources; make clean
++	cd sources && $(MAKE) clean
+ 
+ install:
+-	cd sources; make install
++	cd sources && $(MAKE) install
+--- a/makes/generic.mak
++++ b/makes/generic.mak
 @@ -30,11 +30,11 @@
  CP       = cp
  MKINFO   = makeinfo
@@ -115,9 +129,8 @@ diff -ruN hp2xx-3.4.4.orig/makes/generic.mak hp2xx-3.4.4/makes/generic.mak
  	$(BINDCMD)
  
  
-diff -ruN hp2xx-3.4.4.orig/sources/png.c hp2xx-3.4.4/sources/png.c
---- hp2xx-3.4.4.orig/sources/png.c	2003-06-21 17:31:51.000000000 +0200
-+++ hp2xx-3.4.4/sources/png.c	2012-02-07 22:26:33.000000000 +0100
+--- a/sources/png.c
++++ b/sources/png.c
 @@ -5,6 +5,7 @@
  #include <stdio.h>
  #include <stdlib.h>
diff --git a/media-gfx/hp2xx/hp2xx-3.4.4-r1.ebuild b/media-gfx/hp2xx/hp2xx-3.4.4-r1.ebuild
index 9bdc0204255d..82bdb6b2b16f 100644
--- a/media-gfx/hp2xx/hp2xx-3.4.4-r1.ebuild
+++ b/media-gfx/hp2xx/hp2xx-3.4.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils base
+inherit toolchain-funcs
 
 DESCRIPTION="Convert Hewlett-Packard's HP-GL plotter language to other graphics formats"
 HOMEPAGE="https://www.gnu.org/software/hp2xx/"
@@ -12,58 +12,72 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="X jpeg png tiff"
+IUSE="jpeg png tiff X"
 
 RDEPEND="
-	png? ( media-libs/libpng sys-libs/zlib )
-	tiff? ( media-libs/tiff )
 	jpeg? ( virtual/jpeg )
+	png? (
+		media-libs/libpng:=
+		sys-libs/zlib
+	)
+	tiff? ( media-libs/tiff:= )
 	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
-	sys-apps/texinfo"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/texinfo"
 
-PATCHES=(  "${FILESDIR}"/${P}-r1.patch
-	"${FILESDIR}"/${P}-docbuild.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-r1.patch
+	"${FILESDIR}"/${P}-docbuild.patch
+)
 
 src_prepare() {
-	base_src_prepare
+	default
 	cp -v makes/generic.mak sources/Makefile || die
 }
 
-src_compile() {
-	cd "${S}/sources" || die
+src_configure() {
 	export PREVIEWER="no_prev"
 	export EX_SRC=
 	export EX_OBJ=
 	export EX_DEFS=-DUNIX
 	export ALL_LIBS=-lm
-	use X && \
-		PREVIEWER="to_x11" \
-		EX_DEFS="-DHAS_UNIX_X11" \
-		ALL_LIBS="${ALL_LIBS} -lX11"
+
 	use jpeg && \
-		EX_SRC="${EX_SRC} to_jpg.c" \
-		EX_OBJ="${EX_OBJ} to_jpg.o" \
-		EX_DEFS="${EX_DEFS} -DJPG" \
-		ALL_LIBS="${ALL_LIBS} -ljpeg"
+		EX_SRC+=" to_jpg.c" \
+		EX_OBJ+=" to_jpg.o" \
+		EX_DEFS+=" -DJPG" \
+		ALL_LIBS+=" -ljpeg"
 	use png && \
-		EX_SRC="${EX_SRC} png.c to_png.c" \
-		EX_OBJ="${EX_OBJ} png.o to_png.o" \
-		EX_DEFS="${EX_DEFS} -DPNG" \
-		ALL_LIBS="${ALL_LIBS} -lpng"
+		EX_SRC+=" png.c to_png.c" \
+		EX_OBJ+=" png.o to_png.o" \
+		EX_DEFS+=" -DPNG" \
+		ALL_LIBS+=" -lpng"
 	use tiff && \
-		EX_SRC="${EX_SRC} to_tif.c" \
-		EX_OBJ="${EX_OBJ} to_tif.o" \
-		EX_DEFS="${EX_DEFS} -DTIF" \
-		ALL_LIBS="${ALL_LIBS} -ltiff"
-	emake all
+		EX_SRC+=" to_tif.c" \
+		EX_OBJ+=" to_tif.o" \
+		EX_DEFS+=" -DTIF" \
+		ALL_LIBS+=" -ltiff"
+	use X && \
+		PREVIEWER="to_x11" \
+		EX_DEFS="-DHAS_UNIX_X11" \
+		ALL_LIBS+=" -lX11"
+
+	tc-export CC
+}
+
+src_compile() {
+	emake -C sources all
 }
 
 src_install() {
-	dodir /usr/bin /usr/share/info /usr/share/man/man1
+	dodir \
+		/usr/bin \
+		/usr/share/info \
+		/usr/share/man/man1
 
-	make prefix="${D}/usr" \
-		mandir="${D}/usr/share/man" \
-		infodir="${D}/usr/share/info" \
-		install || die
+	emake \
+		prefix="${ED}"/usr \
+		mandir="${ED}"/usr/share/man \
+		infodir="${ED}"/usr/share/info \
+		install
 }
diff --git a/media-gfx/hp2xx/hp2xx-3.4.4.ebuild b/media-gfx/hp2xx/hp2xx-3.4.4.ebuild
deleted file mode 100644
index 731025135dbb..000000000000
--- a/media-gfx/hp2xx/hp2xx-3.4.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils base
-
-DESCRIPTION="Convert Hewlett-Packard's HP-GL plotter language to other graphics formats"
-HOMEPAGE="https://www.gnu.org/software/hp2xx/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	media-libs/libpng
-	media-libs/tiff
-	sys-libs/zlib
-	virtual/jpeg
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-r1.patch" )
-
-src_prepare() {
-	base_src_prepare
-	cp -v makes/generic.mak sources/Makefile || die
-}
-
-src_compile() {
-	cd "${S}/sources" || die
-	emake all
-}
-
-src_install() {
-	dodir /usr/bin /usr/share/info /usr/share/man/man1
-
-	make prefix="${D}/usr" \
-		mandir="${D}/usr/share/man" \
-		infodir="${D}/usr/share/info" \
-		install || die
-}
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 92c3d07dd937..9e2ac510cfb6 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,5 +1,5 @@
 AUX hugin-2019.0.0-exiv2-0.27.1.patch 998 BLAKE2B fd072b1bfb995f3e63ca78b0ad288c6012e6256d8c268fde7b9d3e1fb346544d34807394ac45b244329d96d6e75347c7e06b8cffa44258dd9b59378f56ead112 SHA512 9127921810b9a3cbc7aa216cb961cf5d8eef04ab5beb6baef94851d25e32314dd0565e507e3e57d2d560b6079afcf54e16330935334835fe664842d337732643
 DIST hugin-2019.0.0.tar.bz2 10297887 BLAKE2B 59c4df340f01dc7fa72c08b575fe2449ac40b96ac2e925aaef0d7804df54db25df7b5901cb25a5da4d8e78c93c668081d535517c275cd1ccb40f5159e1c725e5 SHA512 49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5
-EBUILD hugin-2019.0.0.ebuild 2209 BLAKE2B 422eb30880ce4b6b99f2386897fbd9bf681f3ac95d08e2403e7588b4d67b6ffbb5426135c301d5a67316977f4752a9db81717672a9374f737f4c6f82cd5e45c6 SHA512 4c6cf8a833bab922cad4c58de82d08360459584894c41d0b4f423480244bbdfc4dd5782c98f5bc8e040974f475d52944b9a1a5ded96e3f465e32241e7fecabfb
-EBUILD hugin-9999.ebuild 2058 BLAKE2B 7a3caa225c3a346a02fe52944ec07fa46116868df793ad91e7f1744bce8eabe495f5969da4f28a399f8c07673c42b6dc37bbcb7d4ee99c83c4dd819b959e39fb SHA512 7d9e70cee2f287214ea55c8aecb181f790ba1ac53bd7ea0fed5a50ce2d6f62c0fa656b27efaf6d965cd91b58e3e04941df645723236c2df58f510d4f69690cc5
+EBUILD hugin-2019.0.0.ebuild 2217 BLAKE2B 3a6bf11afcb1d5a70d48facc30faf58e86e6383389fc6066060b82cf27aa9f16f972ea9ec84021ec9bb2163b9f1b3978b4d8df7c376e4c4214b18d8498544180 SHA512 b595aa2b5912850ad5a779ee83465d313c25cf86b9393e7f322bbd728efb89e31c62acf6626826b4a6e4f262864030fefd777f6c6a106fb7eb116b946448c07a
+EBUILD hugin-9999.ebuild 2066 BLAKE2B e4f553556bdc38e2b64851510634e565833ee6f2a1e23cfcaa64a2b980249e4caf0daa9834b788e008377fdd289238498c04ffaecdeb6ca473b14a4eb225597a SHA512 d3f9f892292f6596c690a7cbb804fdb30abd800da6c924ea28ae601e3b98dae1d942aa41612570dc3fc4f5e0b65b48bd2bf133e698b3f356c9c57faf3f6fc30a
 MISC metadata.xml 519 BLAKE2B bd02923a26374e3bd638778ce8100efc4694ab6bec54fd8c8cbd32d0b8c3d495fc965194692ebaf2fe909e495011978d7bb8f3c995037fc128cfd9626949549c SHA512 d4e0bfb870b5b6e5769be2c28983d914666e413333887ac7a7cdb868d2f45f6b284a99204f6e97b98e65958412c04291f6fbc21deed8de518d3ff64aae6ad01b
diff --git a/media-gfx/hugin/hugin-2019.0.0.ebuild b/media-gfx/hugin/hugin-2019.0.0.ebuild
index 65ee4e79249f..a07dfba592b1 100644
--- a/media-gfx/hugin/hugin-2019.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2019.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} )
 
 inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
 
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index 5ec24c68ade6..50b288d329c4 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} )
 
 inherit mercurial python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
 
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index f572e70d227f..557769e18020 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,8 +1,8 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.10-73.tar.xz 9065360 BLAKE2B 7d29c08d9bb0b93b5ea214307203530cb8822cc7f8bc7fb39016b6eac2fc2ad6be40e3a71af7fe09d6bb0b05d669701b05949a7f20df2dcc014fbf8983c8dc36 SHA512 b05d8b4334f054c1b0ee9ef106d70c7bcbe3671ccd097320f648084d9b5ef9c4fc0b9d68267a62e69b64313e64a97343630feadf20e672e64ab2deac518b84b7
-DIST ImageMagick-7.0.9-4.tar.xz 9479288 BLAKE2B 2638f193fb14f3f10f2b3927275777916f5234cd6aa515cae778471169ad74fab447b5dc620b5b630282cd00e4218922baf5fca066778d517c92de41216bcf9f SHA512 75c34a9aad62f7a102873e2b3fcda7c032bc40bfa0c0d5b524001f4c45a93943072009b717e2a90ca1637bc7df3806408a3a3c2c1356de835e3a8bbce20cddb0
-EBUILD imagemagick-6.9.10.73.ebuild 6884 BLAKE2B 24b1413689469e54ed6c4bbd3bac31ae6df01aeb325880fe9a6345d8055bad2432a33bc447f113b9abccc9fff107f93fde9e1bc7401d29d6ea54eafe49de1536 SHA512 9c446953e81687e0b14614ce615ef2292a5a16cfe662852f8cb708899f9e85d9532d66b9fa57d83770f38b6d723ca20a8dbd31ce7830b75942a23c10927db080
-EBUILD imagemagick-7.0.9.4.ebuild 7197 BLAKE2B 64c354e2595638045ee19576ae55065283a7ccb1a19268ecddeeeb04e4c777403d815f53a4cc0dee849ad9262a2861e697fbb1eea8aa86af33fd926a945e1924 SHA512 61305f69a4841e10fd4f715ce51611604beb926f765480839a391bbfabe79cb0824428165c519ee938bce306414970bbd621665015c72c4d0c50ac8d79b37e8e
+DIST imagemagick-6.9.10.78.tar.gz 13522518 BLAKE2B 1eab0f7bc6bbecc44b3f25a752ae2b6ad8f026fe700c78d0b914aa23e5737485c8c41785859035002e1dbd16e7d19af823ea71425cb56f732fbee08419212d7d SHA512 8ab6c91afcf2b8c1bd0a4f130d35abae914599ddf7e0c85d6bf57ace8822cdf1cc57929e047350b06532546827856420a484fc9754ae403684db9df04d0f66a9
+DIST imagemagick-7.0.9.8.tar.gz 13678831 BLAKE2B 3e5189fa244577fdc7d9e674ef0b2385a67dbfc4a0c80fac66a7224b31805925c97fe1955b8386e6d622dd64ffed1cc888657ba5f885d66fb0e8df32703b4ce8 SHA512 3797978e6da49bd6129a437110d9b2b15e1963178c5c62fd228e68295645b469f5cf7d3bb0974ce74a320094973137adfb7409f47248383fe63abc4a49a90ddf
+EBUILD imagemagick-6.9.10.78.ebuild 7016 BLAKE2B 1fc57792a076b612b0849bb540f17f19c194e03c1f741a8e4bc56c562acea94364caf1ed0828457839169f179ef9e6ab7166cbb90a69bfc3ff19186c6c691f90 SHA512 22bc07e091f90331801c24a3d734669ad30afcb178084b7be7677522d85b165bcb0b22f725abdba3baddeebda1970744d3a98213f7d879f5baba9149f22f152f
+EBUILD imagemagick-7.0.9.8.ebuild 7291 BLAKE2B fb478ef6f2c8d871b1182f52f0afbce521787d2ea212d95002fc682667d3450c76536987c4293963de727fefef15169f6ea9f92fe31282eeeb83ea7b237721ce SHA512 a58ba9780324df8af23db6dea87122a6820afc8f2b9352000b54fdd24d0c2820a366f1db4b396b61cf0cd4c7187fcf660bbb60ee7768edfbfeb817ee5c1fd898
 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.73.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.78.ebuild
index 104ec59adc77..99cd54e5c91e 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.73.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.78.ebuild
@@ -10,7 +10,8 @@ MY_P="ImageMagick-${MY_PV}"
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
 HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+#SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+SRC_URI="https://github.com/ImageMagick/ImageMagick6/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="imagemagick"
 SLOT="0/${PV}"
@@ -67,7 +68,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	X? ( x11-base/xorg-proto )"
 
-S="${WORKDIR}/${MY_P}"
+#S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/ImageMagick6-${MY_PV}"
 
 src_prepare() {
 	default
diff --git a/media-gfx/imagemagick/imagemagick-7.0.9.4.ebuild b/media-gfx/imagemagick/imagemagick-7.0.9.8.ebuild
index 8287ed2ffd50..568a44c6e220 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.9.4.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.9.8.ebuild
@@ -12,7 +12,8 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+	#SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+	SRC_URI="https://github.com/ImageMagick/ImageMagick/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 	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
 
diff --git a/media-gfx/imageworsener/Manifest b/media-gfx/imageworsener/Manifest
index 5e7befe93838..eb8326c7ee64 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 1007 BLAKE2B 744e74cd7006ba139e8aab9311d44a12201f202129c66d4da7710504e7a1bbcfde3dbcef5ebb08ee38ddb657d80708967a28c7fcbc20f0b58fbc78d3de05d0a5 SHA512 bfe07f2ebb359e3b53cf2f86a7bb766084633b6a5f14a0aba8d8997797f5a36da8e81a30ba62715d73461bdbdf56dea887951663d8891a1514b1dc8c31f398e7
-EBUILD imageworsener-1.3.3.ebuild 1006 BLAKE2B ca8a3d560d784f7b20c8877d23ff533441742b4660ae7f13f9b4eef6522260d8cda712d16637ea0833d0bb10bd850079f3928867cd924e4d5779be5bb855cca6 SHA512 2eaddfded3b5fc45a456079543840b321ede9513d8513a9282b27cb9547557ace21cca8e05bd68fe57f3791319ac46a3f301f63fb2fed41c441432a33da6f9cb
+EBUILD imageworsener-1.3.2.ebuild 1031 BLAKE2B 542293ffcc50ef2c6bbf2d94a2c623f17028e8207ad90778aaa51a329156ec2c66039c240128f8d6b9e04ce2fa2bf259bf8a6e3645c8208e68f2ce57256549fa SHA512 d3dcbf8dd76050c3b94f05e75ab2e7aacc8ed30370bbb235e74569c80dd399753566fa7ad927d9a6f94e572dcf6a589f6a5f11c9ca03c3ea37a33ed9c5448465
+EBUILD imageworsener-1.3.3.ebuild 1033 BLAKE2B 765544c276abd8674728912588c902f811fa13f16781b870b7432b2c02e2327d9b89b2be47b2452521a016b31a8c545a20be136472252d3a219e825006b8046b SHA512 d28f46a3e6503d12929af9855bf2fa6bcde90cb7d363bc67b314ce1240e789da3fbd5938b75c3bb3f04770eb11d23b7cea781294d598c8a76967d8b64a91346c
 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 39edd7cfaa89..8fb4887db676 100644
--- a/media-gfx/imageworsener/imageworsener-1.3.2.ebuild
+++ b/media-gfx/imageworsener/imageworsener-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,7 @@ DEPEND="png? ( media-libs/libpng:0 )
 RDEPEND="${DEPEND}"
 
 REQUIRED_USE="test? ( jpeg png webp zlib )"
+RESTRICT="!test? ( test )"
 
 src_configure() {
 	local switch=''
diff --git a/media-gfx/imageworsener/imageworsener-1.3.3.ebuild b/media-gfx/imageworsener/imageworsener-1.3.3.ebuild
index 6ca631010a12..2759af96c03e 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-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,6 +24,7 @@ DEPEND="png? ( media-libs/libpng:0 )
 RDEPEND="${DEPEND}"
 
 REQUIRED_USE="test? ( jpeg png webp zlib )"
+RESTRICT="!test? ( test )"
 
 src_configure() {
 	local switch=''
diff --git a/media-gfx/img2pdf/Manifest b/media-gfx/img2pdf/Manifest
index 47f1be7665f4..02f72d222714 100644
--- a/media-gfx/img2pdf/Manifest
+++ b/media-gfx/img2pdf/Manifest
@@ -1,5 +1,5 @@
 DIST img2pdf-0.3.1.tar.gz 67954 BLAKE2B d0d6a9927e9b3e7087e562a108157677a46a17a896beddcc424dd2c234fd7c4f1376b824dbf814b42d9a314a8495b149bc9df65ab2864405b9dde0054e7bafdf SHA512 25f788f78e93ed336ed8e31e88350d89263b82477c8d9c36103dfa522a5e661922fc09b59e1d5104161fe1be15114f843172555efa942722d8b093900d38bae1
 DIST img2pdf-0.3.3.tar.gz 80523 BLAKE2B 39e372f1ab82d9f521cf2c512b173680afe6463dd041283b336af49c41b12d12261fe5947ad9f03d489b7898d3c8d161faedb2b3366cb75bd1bc0666f905f60c SHA512 234e0031d75727d2f5d2b82603bb447d9101ace81e604b6d5eb358d0b4681e209dbd737775b90b44096cf84239aac9e87e2369e0c6112a17f24ccbf10a20cdd5
-EBUILD img2pdf-0.3.1.ebuild 571 BLAKE2B 1f66a8c4c08cf3b29c1cec00b61cb2afb9434a2c842ed594b2c261743e2162cb8d54328b7238bfd93cbe766e600f3271b643dede92fd1feffe99b1cf705c5961 SHA512 511b479e2e87791e33614c173a749d34270359ee2fd08ee6cc09f3c26bbc0cf57c4052df8c91355edc776866cc62fb56772f142b72bb134c461a80a07255c41b
-EBUILD img2pdf-0.3.3.ebuild 622 BLAKE2B b65c91334ef05e4ed459ca9c4ca6996963d79715fafdafff4608e087cd89357b3947633a40ec6ee63c48a77ef0b9686997db19974b9de6679f8e34bac31025a4 SHA512 8f4337032d1e9b1c2c4ecb1cb169c276ba56049240081b78ea01259790b6778c6b77760ae5101c2eccd13530123bd8fb24d8ff25a22ab611d176aa54754a739c
+EBUILD img2pdf-0.3.1.ebuild 598 BLAKE2B 69742665611786d63b89aabf50e145027cec73f93c227d575f3a98cfbfd7d4c448348886d2154e60b975dc2ff5b7172a6a8c467feb52b077dc72e1f3398316fa SHA512 1f79df241953428a675f089d403f8f18614d1a1899d6689a36d5129a19495b887f9d2ee167e055c3b7b93a7b3f58f74de44ce886879bc6b8766da15ebdae5d30
+EBUILD img2pdf-0.3.3.ebuild 649 BLAKE2B cb6e44bf692a89e63ac506ab9b7b6bd70b4c54d8bcac996e5c1fb9d432525802200cfff56353715a862caca08ebbaee6c3195d14fd509b77f18f6b3c35b91f6d SHA512 b7851bc55dbaa96f6ec6ee5cb60b353e484a15911f0c2ba0842afe44a8771d88706d443e84735ce151922148e0b5b1b5f278ae263512c0c585b2e016cfb4916a
 MISC metadata.xml 1096 BLAKE2B 18befc3c4c34d0210ad594ba46749dd304d673ecd697d30b3c60a951787a7ac9e8d7371d0c853c8a4cfce896b18dd36a29f15dd12aa4fb6190635e20d2b201e0 SHA512 c4f5e02479a3ca0d6a2a52c58c25197cae533855500327c84c694b82e2ad625e149124c555b8822f79ec8000a4f926b6e21dd59db92b0989a316687d56775531
diff --git a/media-gfx/img2pdf/img2pdf-0.3.1.ebuild b/media-gfx/img2pdf/img2pdf-0.3.1.ebuild
index 58dbb835eaa4..6965a5532988 100644
--- a/media-gfx/img2pdf/img2pdf-0.3.1.ebuild
+++ b/media-gfx/img2pdf/img2pdf-0.3.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="LGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/pdfrw[${PYTHON_USEDEP}] )"
diff --git a/media-gfx/img2pdf/img2pdf-0.3.3.ebuild b/media-gfx/img2pdf/img2pdf-0.3.3.ebuild
index 6cb9e2637350..2dafd474d55a 100644
--- a/media-gfx/img2pdf/img2pdf-0.3.3.ebuild
+++ b/media-gfx/img2pdf/img2pdf-0.3.3.ebuild
@@ -15,6 +15,7 @@ LICENSE="LGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest
index 745fab7650f7..83d71d0cd60e 100644
--- a/media-gfx/imv/Manifest
+++ b/media-gfx/imv/Manifest
@@ -1,4 +1,4 @@
 DIST imv-2.1.3.tar.gz 27664 BLAKE2B f873863d897161675b4cfbcc3c4136eebd0176317f30d656dd4c7a92615c926d1a0410d6c80283bb3a25055f3a9b710fa0763ffb86ff63ed1dd919ad3f0dfe8c SHA512 0ecdaad9b4518c2107a14969cf9348542c2ef88707be7b2b5eed435915292687d63e4ebd29cb42297cbc3dfee408ec29fd019ad6ae4f0cd789753aad84aa8128
-EBUILD imv-2.1.3.ebuild 659 BLAKE2B f7809e0abc7215ab526563d1e4052a433e0f1bc630534fdedb5e74c0a865e0495ea51a9c61402650281f570dedc4ae747dd410a9688d7546c1678d5c3af3c3ee SHA512 e6e76eb3e757ae23e12d78563865cc079a7868807ec44c1fa9b865ecdb0f2b65079577284e80ee034a6b6166fe007d7f97ae519fd72eaab6fc6796a02e7abbe5
-EBUILD imv-9999.ebuild 626 BLAKE2B 0e49ff992814d480949b2c1dd191941bdad490e300804d85616586ddd29842a1489540cd5ec912818bd8ae1cdc82534b2ca4da48b9b4370713b8b2bb7301179c SHA512 7e3a72ebd8dc20e0b743338df6e96b7f656b4a4e7a7fbce9f2e5b9e57e07d0b3caef8714dc6196170ce6fb75b1e3e164612851df580dbc9c48e440d35ae7bd8b
+EBUILD imv-2.1.3.ebuild 683 BLAKE2B ca632af6611a4ee973fc3483116ab91a8c4be599de54028bba4160b5d6d57d55e5f4016d21051985b6cb487bee301f33e766256240a4e8a0d38bda57b122d82b SHA512 634da620f23dc321e976ed2a75374832e11a503cb30138aa6124f3c1c01d61031c6bbf902e9e9c84a129d7bddae04d7e8b67e6f5866f0db31ffd18aa04a13850
+EBUILD imv-9999.ebuild 650 BLAKE2B 31cb4b77b875bbe24dc50fa9046746c7aef512b69291accd7501700d9efe7f73a89199636058fe424ccfe97c8209a312fb13e30c28efcaea61e27192999ee499 SHA512 415189ec612e1b288a799c0d37113c9aef2592eb135d02d4e6b78c6f47316defa97389ad25f0ef25d9d3cefe10ab71de93cb08095b064e6e79017c430404089e
 MISC metadata.xml 242 BLAKE2B a66b698c79419467b610a75590ee09e217a9b54de470c963269438ca410e7ca224feb08636610af377a388be317aafdf9d7ea647c30be96705da00d5f07e21e5 SHA512 e0d5b53af8e82f684d21217559b6e832935670c8186c6514ca9f3af14b024f39421f297cf23127af2ef3f1874b732f963e88bb180403cae7ac1834a1808664f4
diff --git a/media-gfx/imv/imv-2.1.3.ebuild b/media-gfx/imv/imv-2.1.3.ebuild
index 2740210f7e98..a9a06397207d 100644
--- a/media-gfx/imv/imv-2.1.3.ebuild
+++ b/media-gfx/imv/imv-2.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!sys-apps/renameutils
diff --git a/media-gfx/imv/imv-9999.ebuild b/media-gfx/imv/imv-9999.ebuild
index d13f547a6d2c..275366fe87f1 100644
--- a/media-gfx/imv/imv-9999.ebuild
+++ b/media-gfx/imv/imv-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS=""
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!sys-apps/renameutils
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 80e24805e9e8..bc0c1ced7083 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -6,13 +6,11 @@ AUX inkscape-0.92.1-automagic.patch 5416 BLAKE2B 3b17fd7a4cd305b6e683fd6a3f6bd6b
 AUX inkscape-0.92.1-desktop.patch 919 BLAKE2B c9952613e8d8dca1cd11146afd4d8db210be0f65f61b1a674cf5443dfaed3422e7082667cb93e183589d1e840ac3b55c7e70d03f44c0302b8c7db8ae621a976d SHA512 0000e5c6bd83e7d3994712d5a9f7369b2ecb7a15ba8371bfc9e2646b33293334eff987ffc360c2753025d0561395368024587d71ffc015f5a0e8c39077fd45b2
 AUX inkscape-0.92.4-poppler-0.76.0.patch 1579 BLAKE2B c8c578dc3c6f0d79403bc0716bb6875544fbf19c98e721294cf9e5f58d9c89c1b8414dd58975846100c4ae5c21eba8e7e4797c037300ce05d741d9245a0dc59c SHA512 2f45e16aba67f4d1498cf012ac6198ec2bb977b9e39b3d4e2d14a216d86b1d407ff7ea5a889b58b5e800c129c0f99ec8bbc0a42dd7d41578d94ae1ab59208698
 AUX inkscape-0.92.4-poppler-0.82.0.patch 3223 BLAKE2B 6e530a2d2602d61c9f97f61813fad837536ccd3dc25405cf79ebda6563c56ff09e4a98b99c83aced6e8995473b27c7942c5774abafc7c33a2dbe45df58f419e4 SHA512 4a5f2e3ec9f16abe76786945e3085e405bbe7a4c57dfa0e6e7d4ddd4aadd17463766c7392846db08fa41419e05ef8c688d989ded8905755c010db6b08afa2feb
-AUX inkscape-1.0_beta1-avoid-reordering-cmake-cxx-flags.patch 4720 BLAKE2B 561623ee56ebc933b4997fd3b53f761ff5fdbf212e72e09ffd79539bde74d88b46959340012381396b761dad81712c7101c5dc94887bb96f973428d969dc8034 SHA512 a4252e9e1b19b63356c9b4af09f511e544da825b29edadf5352f0e4eb14fd150732ab6eb1abc1e0d814b37bd644179bc2f35c8a13e82c589975c01ca3d8838be
 AUX inkscape-1.0_beta1-detect-imagemagick.patch 653 BLAKE2B 1e217306b083550d1f4628dc8385c78336c4c9019f8b35fe474c18c1f917105f423d3a958491432109eea22ef04b63ad5c5d23c03ae36ed7663ed86de3e295ed SHA512 5ee7080d5134b970a7b70b6b5052523e98860d66ee42897b5a84c5e70676359c918ea0d5e603a83b27d0e4656d49f711ae76d2dad47083c8ade223cc7da9e123
 AUX inkscape-1.0_beta1-do-not-compress-man.patch 454 BLAKE2B d680993be80d9069c7986f110d512643849f97fae81a8fdf1ab020a418dfbe44cc2bce3d71c8a79e8acac5170dfc01d084420a439d83f6f0e85706acdc8a0399 SHA512 3fc7ac0750a67b9d90d4ec0eed404ffdaa6910397849fa916eeacf5fb1e77cb0cb17f3f1ba99ad39f16610f2b3d7df387e35d36a0404fbd1fd0f857fa8be822b
-AUX inkscape-1.0_beta1-poppler-0.82.patch 3030 BLAKE2B 746111982b19f2bd17a91ae0049c7615914b5b5b8eb052810f6d45642da84fdec85d41ddd419289b9b556ff1cb98c424b9b9f79dffe9d0b73d26c8af9fdf24db SHA512 26caa1a35a5e3243cf3ffeb9cc12e981237006a9540b8316d4c4d2ddbdcce1aaf64fc34ee1c09bd7264b33faa115e1c096837a3171b22d3c0ccdff916b73d9c7
 DIST inkscape-0.92.4.tar.bz2 31929728 BLAKE2B 892bf4ed913019b27a9b8897e3ae32c44152163ded0eb345d59915ffdc9818d29f210de3294ef1b05601141185b5e3b10779778551b860f31e7df5c659492c77 SHA512 b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120
-DIST inkscape-1.0beta1.tar.bz2 31096177 BLAKE2B 72769d0e15f20fcc5cdf81987896e7d354c2c71fc31feaa18dfff12df2791d2ed85be4451e76e8191c5f469b2e70fd03f4888270e67628c50978a3fd30c41264 SHA512 35b3ba46d76b55eb268209631ea652b3512d3aaf07f577543081c311acff13b0a667ecf069e9f1c2f47dc16525df952cfb9ca29e9a3078f9096ee7865b917245
+DIST inkscape-1.0beta2_2019-12-03_2b71d25d45.tar.xz 39508392 BLAKE2B fd48f22439d1182aff1db5afd74870a6c1d291afb310fc9fa5036fa3c2547ead8c17f6cd67f77a56f655c56af8ffaa7a349b17166c7b18ef3ddf234aa6e57805 SHA512 029508d4867ac0890b2c9c4d274408f849a17e8a7978853df38543d94e7c08d33546a8a40fbcd940da1ba847f11e37ff2bafa285174b65d45ee5de59e907e78f
 EBUILD inkscape-0.92.4.ebuild 3757 BLAKE2B af42502189a61742629d1b016d5f8efdf4b96358aba951eeba3a591b1e6ca5f4ecc75a0e80b39416903e2b60b26ca7c7490628b7a23df2b96365b3aa3b6b4600 SHA512 6c6ad92323f157922fdea7f31c497b120b2b21bffadcf3bafeedb75b72da351071b7b04c081a5c0fb46b8e10497dd0168d8dfa6349bb63b2db9093a40fc422d9
-EBUILD inkscape-1.0_beta1.ebuild 4055 BLAKE2B d991c2c28be04ee7c8d4299ddf70b6e751fd2917d8cfb9d83da8c10a8eb7ab9a95c1c71f57f8d744b2de85d11882d7916ba3c3c4afa365356639d8d5f4e0d4cf SHA512 2d4007c77938ad2c72bb9b5fe5ba807162e26e114c60ae5ba3dc752d3ae1ae6fed060cacb1add17722ac4e234375cf823cd65a7906a59c1af51d4209d8460fa8
-EBUILD inkscape-9999.ebuild 3864 BLAKE2B ab5f9f44bc42c703734e4f9782c38c2b97b1b92e1816866e051005ff94ad8b14e7793c89f755e9bf068f99f56f98d8e97d3ca0cc7bcd13e3bfa5717b847e678b SHA512 5d839456b149ac5971a894ab02c2c7d9579fe81921135eeb4773514dfad550c5324a9f9042f9d41ee65e9b9ab2e27ea6d442538c379f7e6ff607460cef83add5
+EBUILD inkscape-1.0_beta2.ebuild 3923 BLAKE2B 6381a0f230c7570e956d00f8036f3f203d61b23a8c568932c44961405d5a5ea7b4d2595a8992eabe7b2db237cb5e057cfdd20982700f28bac4f699bc864acc1e SHA512 9ee9794377c26cadcced8a9b018f214dad9069f06759f5d4e4017e28e412cc32ed90035c7c95194139eb9841458c8609acec32d651a5882eaa60e304316fb862
+EBUILD inkscape-9999.ebuild 3819 BLAKE2B fb5e9ac78bcc32edbc4b2872cb9f872505c3b31af9d1b31251ec555dcb2a057ce468226bcdee6df52842e7cac7260d882cf33bef1a97f7ce0c619dfe049e5d1f SHA512 5892ebc96fb00772bef1709fa92444098f3d43a24d2331a45e5110f7e10cf81227ebf83118e899d7e02794cf1e5e31eb9d6e1240dcec2a60f1ceed972f5ed8a8
 MISC metadata.xml 951 BLAKE2B 5610cce03a912f378f4bbb997bb9acc028f2f02c1ec40034ed523b7f7cee2cc980f1f24fb8fbd26b40d494a514769b722ca64e93078c82ad75c9db94a9f19ca4 SHA512 f62078fa96c501f4d8e01d4e539b74b91cbf90997392e903e30db9c3a117c2ccc7f2d3e1c2e62c85362cd0a2d504dd565cfd70f92e5b947d416f8a3f2cd88f8e
diff --git a/media-gfx/inkscape/files/inkscape-1.0_beta1-avoid-reordering-cmake-cxx-flags.patch b/media-gfx/inkscape/files/inkscape-1.0_beta1-avoid-reordering-cmake-cxx-flags.patch
deleted file mode 100644
index bd78bc582325..000000000000
--- a/media-gfx/inkscape/files/inkscape-1.0_beta1-avoid-reordering-cmake-cxx-flags.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From 09319f688e10d47f9fc9be2b6feb831fb132660a Mon Sep 17 00:00:00 2001
-From: Patrick Storz <eduard.braun2@gmx.de>
-Date: Sat, 12 Oct 2019 15:56:14 +0200
-Subject: [PATCH] CMake: Avoid reordering CMAKE_CXX_FLAGS
-
-Order matters; the reordering caused the _FORTIFY_SOURCE flag to be
-always undefined (as we flipped a "-U" and "-D")
-
-Also skip removing duplicates to avoid similar pitfalls (we kept
-only the first occurrence but should've kept the last)
-It did not work properly anyway (we still had duplicates in the end)
-and was only required as we wrote the final CMAKE_CXX_FLAGS back to
-cache and consequently appended new flags with every run of CMAKE.
----
- CMakeLists.txt                           | 13 -----------
- CMakeScripts/CanonicalizeFlagsVar.cmake  | 11 ----------
- CMakeScripts/DefineDependsandFlags.cmake | 28 ++++++++++++++----------
- 3 files changed, 17 insertions(+), 35 deletions(-)
- delete mode 100644 CMakeScripts/CanonicalizeFlagsVar.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b30f013f38..aa14e13e01 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -207,19 +207,6 @@ if(GMOCK_PRESENT)
-     endif()
- endif()
- 
--# -----------------------------------------------------------------------------
--# Canonicalize the flags to speed up recompilation using ccache/etc.
--# This should be the last thing we do:
--# -----------------------------------------------------------------------------
--include(CMakeScripts/CanonicalizeFlagsVar.cmake)
--canonicalize_flags_var("${CMAKE_CXX_FLAGS}" _new_cxx)
--set(CMAKE_CXX_FLAGS "${_new_cxx}" CACHE STRING "" FORCE)
--canonicalize_flags_var("${CMAKE_CXX_FLAGS_DEBUG}" _new_cxx)
--set(CMAKE_CXX_FLAGS_DEBUG "${_new_cxx}" CACHE STRING "" FORCE)
--# message(FATAL_ERROR "CMAKE_CXX_FLAGS = <${CMAKE_CXX_FLAGS}>")
--
--
--
- 
- # -----------------------------------------------------------------------------
- # Clean Targets
-diff --git a/CMakeScripts/CanonicalizeFlagsVar.cmake b/CMakeScripts/CanonicalizeFlagsVar.cmake
-deleted file mode 100644
-index ddc5b7b5d3..0000000000
---- a/CMakeScripts/CanonicalizeFlagsVar.cmake
-+++ /dev/null
-@@ -1,11 +0,0 @@
--# This file is copyright by Shlomi Fish, 2016.
--#
--# This file is licensed under the MIT/X11 license:
--# https://opensource.org/licenses/mit-license.php
--
--macro (canonicalize_flags_var in_val out_var)
--    string(REPLACE " " ";" _c "${in_val}")
--    list(REMOVE_DUPLICATES _c)
--    list(SORT _c)
--    string(REPLACE ";" " " "${out_var}" "${_c}")
--endmacro()
-diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
-index 996100b4d7..9dd7f7785f 100644
---- a/CMakeScripts/DefineDependsandFlags.cmake
-+++ b/CMakeScripts/DefineDependsandFlags.cmake
-@@ -2,6 +2,7 @@ set(INKSCAPE_LIBS "")
- set(INKSCAPE_INCS "")
- set(INKSCAPE_INCS_SYS "")
- set(INKSCAPE_CXX_FLAGS "")
-+set(INKSCAPE_CXX_FLAGS_DEBUG "")
- 
- list(APPEND INKSCAPE_INCS ${PROJECT_SOURCE_DIR}
-     ${PROJECT_SOURCE_DIR}/src
-@@ -98,7 +99,7 @@ list(APPEND INKSCAPE_INCS_SYS ${INKSCAPE_DEP_INCLUDE_DIRS})
- add_definitions(${INKSCAPE_DEP_CFLAGS_OTHER})
- 
- find_package(DoubleConversion REQUIRED)  # lib2geom dependency
--        
-+
- if(WITH_JEMALLOC)
-     find_package(JeMalloc)
-     if (JEMALLOC_FOUND)
-@@ -369,14 +370,6 @@ sanitize_ldflags_for_libs(SIGC++_LDFLAGS)
- list(APPEND INKSCAPE_LIBS ${SIGC++_LDFLAGS})
- list(APPEND INKSCAPE_CXX_FLAGS ${SIGC++_CFLAGS_OTHER})
- 
--list(REMOVE_DUPLICATES INKSCAPE_CXX_FLAGS)
--foreach(flag ${INKSCAPE_CXX_FLAGS})
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}" CACHE STRING "" FORCE)
--endforeach()
--foreach(flag ${INKSCAPE_CXX_FLAGS_DEBUG})
--  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${flag}" CACHE STRING "" FORCE)
--endforeach()
--
- # Some linkers, like gold, don't find symbols recursively. So we have to link against X11 explicitly
- find_package(X11)
- if(X11_FOUND)
-@@ -386,14 +379,27 @@ endif(X11_FOUND)
- 
- # end Dependencies
- 
-+
-+
-+# Set include directories and CXX flags
-+# (INKSCAPE_LIBS are set as target_link_libraries for inkscape_base in src/CMakeLists.txt)
-+
-+foreach(flag ${INKSCAPE_CXX_FLAGS})
-+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
-+endforeach()
-+foreach(flag ${INKSCAPE_CXX_FLAGS_DEBUG})
-+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${flag}")
-+endforeach()
-+
- list(REMOVE_DUPLICATES INKSCAPE_LIBS)
- list(REMOVE_DUPLICATES INKSCAPE_INCS_SYS)
- 
--# C/C++ Flags
- include_directories(${INKSCAPE_INCS})
- include_directories(SYSTEM ${INKSCAPE_INCS_SYS})
- 
--include(${CMAKE_CURRENT_LIST_DIR}/ConfigChecks.cmake)
-+include(${CMAKE_CURRENT_LIST_DIR}/ConfigChecks.cmake) # TODO: Check if this needs to be "hidden" here
- 
- unset(INKSCAPE_INCS)
- unset(INKSCAPE_INCS_SYS)
-+unset(INKSCAPE_CXX_FLAGS)
-+unset(INKSCAPE_CXX_FLAGS_DEBUG)
--- 
-2.22.0
-
diff --git a/media-gfx/inkscape/files/inkscape-1.0_beta1-poppler-0.82.patch b/media-gfx/inkscape/files/inkscape-1.0_beta1-poppler-0.82.patch
deleted file mode 100644
index 4c5bff4977a6..000000000000
--- a/media-gfx/inkscape/files/inkscape-1.0_beta1-poppler-0.82.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 324c7903d9fd62e74c042c31477299be3b980fd2 Mon Sep 17 00:00:00 2001
-From: Thomas Holder <thomas@thomas-holder.de>
-Date: Sat, 26 Oct 2019 14:39:31 +0200
-Subject: [PATCH] fix poppler 0.82.0 build
-
----
- src/extension/internal/pdfinput/pdf-parser.cpp           | 2 +-
- src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
- src/extension/internal/pdfinput/svg-builder.cpp          | 2 +-
- src/extension/internal/pdfinput/svg-builder.h            | 2 +-
- 4 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index 4f798e35bf..4eae275757 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -2405,7 +2405,7 @@ void PdfParser::doShowText(GooString *s) {
-   int wMode;
-   double riseX, riseY;
-   CharCode code;
--  Unicode *u = nullptr;
-+  Unicode _POPPLER_CONST_82 *u = nullptr;
-   double x, y, dx, dy, tdx, tdy;
-   double originX, originY, tOriginX, tOriginY;
-   double oldCTM[6], newCTM[6];
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 5e8bc4ae90..01834007e8 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -14,6 +14,12 @@
- 
- #include <glib/poppler-features.h>
- 
-+#if POPPLER_CHECK_VERSION(0, 82, 0)
-+#define _POPPLER_CONST_82 const
-+#else
-+#define _POPPLER_CONST_82
-+#endif
-+
- #if POPPLER_CHECK_VERSION(0, 76, 0)
- #define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse)
- #else
-diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
-index 14727eba5f..a7134684a0 100644
---- a/src/extension/internal/pdfinput/svg-builder.cpp
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp
-@@ -1395,7 +1395,7 @@ void SvgBuilder::beginString(GfxState *state) {
- void SvgBuilder::addChar(GfxState *state, double x, double y,
-                          double dx, double dy,
-                          double originX, double originY,
--                         CharCode /*code*/, int /*nBytes*/, Unicode *u, int uLen) {
-+                         CharCode /*code*/, int /*nBytes*/, Unicode const *u, int uLen) {
- 
- 
-     bool is_space = ( uLen == 1 && u[0] == 32 );
-diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
-index c42d694dec..050465d4bf 100644
---- a/src/extension/internal/pdfinput/svg-builder.h
-+++ b/src/extension/internal/pdfinput/svg-builder.h
-@@ -142,7 +142,7 @@ public:
-     void addChar(GfxState *state, double x, double y,
-                  double dx, double dy,
-                  double originX, double originY,
--                 CharCode code, int nBytes, Unicode *u, int uLen);
-+                 CharCode code, int nBytes, Unicode const *u, int uLen);
-     void beginTextObject(GfxState *state);
-     void endTextObject(GfxState *state);
- 
--- 
-2.22.0
diff --git a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild b/media-gfx/inkscape/inkscape-1.0_beta2.ebuild
index da91d92ffc50..d88a546fcfbf 100644
--- a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0_beta2.ebuild
@@ -6,18 +6,18 @@ EAPI=7
 PYTHON_COMPAT=( python3_{5,6,7} )
 PYTHON_REQ_USE="xml"
 MY_P="${P/_/}"
+RELEASE_SUFFIX="_2019-12-03_2b71d25d45"
 inherit cmake-utils flag-o-matic xdg toolchain-funcs python-single-r1
 
 DESCRIPTION="SVG based generic vector-drawing program"
 HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://inkscape.org/gallery/item/14917/${MY_P}.tar.bz2"
-#SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
+SRC_URI="https://inkscape.org/gallery/item/16197/${MY_P}${RELEASE_SUFFIX}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="cdr dbus dia exif gnome graphicsmagick imagemagick inkjar jemalloc jpeg
-lcms nls openmp postscript spell static-libs svg2 visio wpg"
+IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms nls
+openmp postscript spell static-libs svg2 visio wpg"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -59,7 +59,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	)
 	dbus? ( dev-libs/dbus-glib )
 	exif? ( media-libs/libexif )
-	gnome? ( >=gnome-base/gnome-vfs-2.0 )
 	imagemagick? (
 		!graphicsmagick? ( <media-gfx/imagemagick-7:=[cxx] )
 		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
@@ -94,15 +93,13 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-libs/boost-1.65
 "
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/${MY_P}${RELEASE_SUFFIX}"
 
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-detect-imagemagick.patch
-	"${FILESDIR}"/${P}-do-not-compress-man.patch
-	"${FILESDIR}"/${P}-poppler-0.82.patch
-	"${FILESDIR}"/${P}-avoid-reordering-cmake-cxx-flags.patch
+	"${FILESDIR}"/${PN}-1.0_beta1-detect-imagemagick.patch
+	"${FILESDIR}"/${PN}-1.0_beta1-do-not-compress-man.patch
 )
 
 pkg_pretend() {
diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index bb14d85592ec..b088e553b3f9 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -15,8 +15,8 @@ EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="cdr dbus dia exif gnome graphicsmagick imagemagick inkjar jemalloc jpeg
-lcms nls openmp postscript spell static-libs svg2 visio wpg"
+IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms nls
+openmp postscript spell static-libs svg2 visio wpg"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -58,7 +58,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	)
 	dbus? ( dev-libs/dbus-glib )
 	exif? ( media-libs/libexif )
-	gnome? ( >=gnome-base/gnome-vfs-2.0 )
 	imagemagick? (
 		!graphicsmagick? ( <media-gfx/imagemagick-7:=[cxx] )
 		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 9480f640e3ca..47949c67ee8b 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -10,5 +10,5 @@ DIST iscan_2.30.4-2.tar.gz 1236167 BLAKE2B 598e55aa7099f7973b38f5c3227415c8ddfa7
 DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
 DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
 EBUILD iscan-2.30.3.1.ebuild 3517 BLAKE2B 2c9aa0bf5e12e34c1637951936db597ea0d5fe70509355bf28cef8d7c0c917ed07e940632eae42f2903e00780dc05cead627a90f733ea2f532fc2b5e6d8acc9d SHA512 1331ded32c9d88312c517e5ba5447e87471a0223747d46c22ded7c3a185f715b3a9b4d2d905bb0239cbe31edc1197c7a71a5626af0bf8084b0834124d7745de1
-EBUILD iscan-2.30.4.2.ebuild 3962 BLAKE2B 9909e1c577437861e7020ed0760b4a98a7c844cd7a84cc910db628d46c7a8da5f42d19f46b47a5f8762f35f40f0ce3e79aa801744d24ef392bb2e39df737ae41 SHA512 89b4e30259cdedce969a2186440a5e4b52f1bfcb6dfbe1deec54a88dc61da35495cf8663340a0cbc0fb4f5ff1909f8abdea63129266876c051a8686ee2eee770
+EBUILD iscan-2.30.4.2.ebuild 4020 BLAKE2B 6b4aab58d9d3b542d9bb338c5d43591217c92468f0ec5d49f6eb48f6575fcef35bcfd2e83566fd4dc4ce1e3ee944f8d10364c4f81a74d4ddd58cc51da44c4395 SHA512 123e0b6481c1209ec7e72fd999ec31551a9a9a0bb4bb26bf32cd89bda02ccf64201217ccecdcf212750279770dd15005327911cf898402aa3a1980351f1e83e4
 MISC metadata.xml 779 BLAKE2B 715d705e7775dc8aefea2c58afaf0520819abe2508ee9dde67298a2acdd847b953ac46750bc711e018eea5ddceef2ef3e7f16308c32fade334622cb9a16f745e SHA512 9ead68d2de8d4b5e09e2d478b6f198d8a83985eaa779e941189f1017beb081910fcc6c7d3c1f41db84b91df55399e5e005c326c7bb2841b2ef745d735aef562f
diff --git a/media-gfx/iscan/iscan-2.30.4.2.ebuild b/media-gfx/iscan/iscan-2.30.4.2.ebuild
index a82b27d06c6f..90d8c1c878c2 100644
--- a/media-gfx/iscan/iscan-2.30.4.2.ebuild
+++ b/media-gfx/iscan/iscan-2.30.4.2.ebuild
@@ -126,7 +126,7 @@ src_install() {
 		done
 		if [[ "/plug-ins" != "${gimpplugindir}" ]]; then
 			dodir ${gimpplugindir}
-			dosym "${ED%/}"/usr/bin/iscan "${gimpplugindir}"/iscan
+			dosym $(realpath -s --relative-to="${gimpplugindir}" "${EPREFIX}/usr/bin/iscan" || die) "${gimpplugindir}"/iscan
 		else
 			ewarn "No idea where to find the gimp plugin directory"
 		fi
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index ac8cd7935a7d..10a28556abea 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,4 +1,6 @@
 AUX krita-4.2.4-tests-optional.patch 12292 BLAKE2B a30463dcc6e02e877b308c4add529f0657d96ace7a13ba7424f4cdf260f3b636d03b2bac224d6239253393650163b622ac54d8d81bbdced2fb153bf216b5fb2d SHA512 1d5045b35981822bc16c4b23e573a299a8325353c8be347c56a4e2fc4e3cd9e937e8eb253f9c6cdc0197a3db7989b822fb41274afe3cd506b9c907daf1867df3
 DIST krita-4.2.7.1.tar.xz 164304772 BLAKE2B 99a4c3b6a48d1d695ee5bb8f6576c9a4593e1ff3a10846340974588ff8b3c061a7838b862c1ecdc4f0635ffa270cb272f1155b1efca4dbf50a11096ee1e92d48 SHA512 28f4af4131a0f364b285596031a3f59a8bd7e97930cd740a4767dbe95540dc403bd6ae0a99ff2bef95e2bac6f23931873404e4fed3ea4afd4b614b5f7d823a35
+DIST krita-4.2.8.2.tar.xz 169994064 BLAKE2B fc390db9e3aaf3f4355e600a98ea479aa510895c26cb82e8800fbff64031bab7a26e0c37d6d274e6397a38c1bc33cff6b48cb5a7c6e61b56579e92e33279b1c4 SHA512 5482ebd62c530764b43439d6782fa7e1793877657620967ea0f6cdad166e3ff508b36cd04bd99c192d35a237c4a0da08477069e333ebaf2093785e207402dea7
 EBUILD krita-4.2.7.1.ebuild 3114 BLAKE2B 5cae86dc90f5a657ffaadcefd3c6c3cb595f96bc3a48aeb45982f2d55f99546c9c4cec6412ccfa4631000764591ebcc27ed5f782d29535aa6d245fbc13e6557f SHA512 7e8fa9982d82509f0efa6edc5826793493fc11348db464ef998cdf0789d914fb185894b66b8ce5ffd053f3e08c23be68b0c4a76cb10455e63e0b9ae2fe041e7c
+EBUILD krita-4.2.8.2.ebuild 3107 BLAKE2B cd2bedeccfb5f6e19e64339fcfb5219e7f55685477d8c9fc3e078971727929e4a63cfed38489bcc326a537bc4c0662b2c2f6b0d801604c53ad74d25af5feaef6 SHA512 a9b6a75cea79ef9dd3fe8ea9fdba414c4bffaae3a36ec92df592cf54845db80976fb9288904b8cca2016f21313c9781454b2bc956d382596b461399f3037c6c7
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/krita-4.2.8.2.ebuild b/media-gfx/krita/krita-4.2.8.2.ebuild
new file mode 100644
index 000000000000..8d45b1ca065a
--- /dev/null
+++ b/media-gfx/krita/krita-4.2.8.2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional-recursive"
+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"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/"
+
+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
+	dev-python/PyQt5[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_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"
+
+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-utils_use_find_package color-management OCIO)
+		$(cmake-utils_use_find_package fftw FFTW3)
+		$(cmake-utils_use_find_package gif GIF)
+		$(cmake-utils_use_find_package gsl GSL)
+		$(cmake-utils_use_find_package heif HEIF)
+		$(cmake-utils_use_find_package jpeg JPEG)
+		$(cmake-utils_use_find_package openexr OpenEXR)
+		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake-utils_use_find_package qtmedia Qt5Multimedia)
+		$(cmake-utils_use_find_package raw LibRaw)
+		$(cmake-utils_use_find_package tiff TIFF)
+		$(cmake-utils_use_find_package vc Vc)
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 884ac9cc40e1..678ed0c5373c 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -3,7 +3,7 @@ AUX libimagequant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1
 DIST libimagequant-2.11.7.tar.gz 74311 BLAKE2B 204fbe794014c11d767991a03e729b234978fb1edb1fdffcb7d332461ccaa1a536a1e9dbc7b44a8838db61cc76fdbc1eb75087b480f4fc42bf791fea913639a2 SHA512 8816811c06eec27232e39725c581e382b7076f3bc23b017810de0e92236e6e4eb480def7b50347c9b75f7d792245669398c39a17359eb81077badf12e6f0a172
 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 1191 BLAKE2B 61db0687381d1ad9c124e94be50b93bba3d70a3758dfdde81bbf3fe2a9a9ffd26cc73ef29ee1fc7bbd3fdab8947b7316c76622ca1c5f28f923212c63ca2c81fa SHA512 38db43ddfb6c4e8aad817dde0cc20ccf5397f4bcc4a3183a33d1256122a42a79ba6b079677746b31d17625b275f2e3d9e346e314a1311981b86d4add48238dce
-EBUILD libimagequant-2.12.2.ebuild 1451 BLAKE2B c2864c295cca60262bd47c613d60fafa2f6f5cb3f3fdf6db13c334fd7470d8109fff3a75b2fa95ba267dd528e25ac5ffa0cb5c32ea241e179d76108b56a2e010 SHA512 132f76b9be03b93143f7117de9923f2f79d8e1b05843320bcfc57cffc5ee5f8b89890a4edc964f08d389c801f4f9be298548be297c4507e001f555602901a378
-EBUILD libimagequant-2.12.3.ebuild 1451 BLAKE2B c2864c295cca60262bd47c613d60fafa2f6f5cb3f3fdf6db13c334fd7470d8109fff3a75b2fa95ba267dd528e25ac5ffa0cb5c32ea241e179d76108b56a2e010 SHA512 132f76b9be03b93143f7117de9923f2f79d8e1b05843320bcfc57cffc5ee5f8b89890a4edc964f08d389c801f4f9be298548be297c4507e001f555602901a378
+EBUILD libimagequant-2.11.7.ebuild 1147 BLAKE2B 41943e15f697966749897fd14aec98dec919ce81189ec5f481517d14eb94a91b95b0b0cdc9f057854a745a2fea5ccf094411900db06eb54dc6aeba410521e871 SHA512 ec8d4ce66233a74974ff6edb4c67dcf5d7f12f4535001bb770d70a995cc5a9b2600f900777fc1996335d49f85efe10a3dc21e547c2b535c68720ee455ec4352f
+EBUILD libimagequant-2.12.2.ebuild 1407 BLAKE2B 5b2f00d50bcd0b445b220c20316eb5974c7c40cfe3c520d90f4ad17bee7971c4da7a7255aa792a0858a9312874e0a3f975de6ff290f7b29ea7e148190b27bb0c SHA512 2f418c79f36a39aa248a72d9427565c51ef18a050da1a469f00c3449d3cea0f4e3afa847160fde1c87bb72e0aca59444194553cef841414284438452c2df28c3
+EBUILD libimagequant-2.12.3.ebuild 1407 BLAKE2B 5b2f00d50bcd0b445b220c20316eb5974c7c40cfe3c520d90f4ad17bee7971c4da7a7255aa792a0858a9312874e0a3f975de6ff290f7b29ea7e148190b27bb0c SHA512 2f418c79f36a39aa248a72d9427565c51ef18a050da1a469f00c3449d3cea0f4e3afa847160fde1c87bb72e0aca59444194553cef841414284438452c2df28c3
 MISC metadata.xml 527 BLAKE2B c3fa42153fa6cfede4de3d59e12063aeb44f67ce89d36be63c7df4671c57ecfdd43d08aee89bd96387ecbee2e41b1d5921e9ad2486b4dd8f06e6e93529afb0a8 SHA512 82b458b27288b6b49df16d5778f6c75b492d958bcc1c2f2950dee741bfddc82f561be50f590d3f891bf736ee67e5325ae297bf49f99c769ca97ac68042beee11
diff --git a/media-gfx/libimagequant/libimagequant-2.11.7.ebuild b/media-gfx/libimagequant/libimagequant-2.11.7.ebuild
index d884ee7fac2d..b318487fa32a 100644
--- a/media-gfx/libimagequant/libimagequant-2.11.7.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.11.7.ebuild
@@ -34,8 +34,8 @@ src_configure() {
 }
 
 src_compile() {
-	emake shared || die "make failed"
-	use static-libs && (emake static || die "make failed")
+	emake shared
+	use static-libs && emake static
 }
 
 src_install() {
diff --git a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
index 3b54e4177a1b..3143dad9cd89 100644
--- a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
@@ -40,8 +40,8 @@ src_configure() {
 }
 
 src_compile() {
-	emake shared imagequant.pc || die "make failed"
-	use static-libs && (emake static || die "make failed")
+	emake shared imagequant.pc
+	use static-libs && emake static
 }
 
 src_install() {
diff --git a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
index 3b54e4177a1b..3143dad9cd89 100644
--- a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
@@ -40,8 +40,8 @@ src_configure() {
 }
 
 src_compile() {
-	emake shared imagequant.pc || die "make failed"
-	use static-libs && (emake static || die "make failed")
+	emake shared imagequant.pc
+	use static-libs && emake static
 }
 
 src_install() {
diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
index 79611ece9f37..cf78cda9a690 100644
--- a/media-gfx/luminance-hdr/Manifest
+++ b/media-gfx/luminance-hdr/Manifest
@@ -3,5 +3,5 @@ AUX luminance-hdr-2.6.0-cmake.patch 855 BLAKE2B 2656ec16d554199a8cb0dca0df77ab71
 AUX luminance-hdr-2.6.0-docs.patch 948 BLAKE2B 5ac822b10ffc61c552292806adc3f5470a7f03a9b2df7ba385435904963e52af583a892762867abb6a76a5351ffbbf0ffbd67107310e84bab9b649cc33666e09 SHA512 2b242a558c3b734a653943f3128c4cbc2440f940407faa096505ac7abe945c729bd0b4c5e9d06f53141bdb1271b097d7de15e87cd31db75ef1e30839a64f32b0
 AUX luminance-hdr-2.6.0-no-git.patch 377 BLAKE2B 454a9973831aa3ba312926190a84622c8c3bd9481c67ece8ccf8916517f6b314931a09adf8a4168d8a1c7cd8a7694db27291009b9fae8a9cacc8356d32c7f5c3 SHA512 fba84a0415c8e514fb85b229adb29fbda238e8146d2dfff296d92fde33aeb22562e5ac98fed2422326354be9c0096cc2bd1b8947edfa9e7ca160d207ba0db476
 DIST luminance-hdr-2.6.0.tar.bz2 11556372 BLAKE2B 0026768202d35126b82101eb2dc7cdc2917728b519c1cadc62ffb6470204077b4b6ae220ebf09c7f903839fe0c714715efe796ee4830cc92174370cd2741d576 SHA512 6cfb21b1ddc9cac612e3d176323e34c5181333f1b52953c02ad5aec28cc86bf519ecede248847082085879c5c2fd2c5570b05f5d3bffa96ba3781ff8cd1967d1
-EBUILD luminance-hdr-2.6.0.ebuild 1834 BLAKE2B 9244091ac7adeb579930597cee3681b65858b1edf58c00949ccc4a61ce020046b0a27dbdca99401abeda47eb16a83ac1b6eff9e7e14ae6a00e7080ab569ba604 SHA512 878d4b5d5a0700449257362e022a84c03c3a30d37dcc45f79bc3a7e2305751a5ecf4cc87659c2b5592dcd20f35ae0fe97765501a7e331810249ce7bf339aa6c5
+EBUILD luminance-hdr-2.6.0.ebuild 1861 BLAKE2B 651f809ba3540b7fcfd293e9c02a84effd7e47764569be897173a0af323b15ba30ecc2fed61cbbabc2590953647a2bffb4658b454cc36f1706cff6baaad7fbff SHA512 456453932ad36d8b897f929c160edef717d6f68a7c2b56ce391f9287fa6fc48953f9214fe6ee61208fff5261e1fc8cf21d75871cfb8372f7715b662892a5e5c7
 MISC metadata.xml 1276 BLAKE2B 5b913b3c342f4d5a6fc67c30008d8eb9469c61cea7f6a10b8c29d1e60324da71e662a4f4d16a0d4a20c7431f5bab3dc9e157efbeae5dacbdadf4b2f5989e9058 SHA512 f1c9daadf3632c1f22297fe5987484a72cb7f0fa3f0758883c7d3c4fe798a6cad7838b855267b1ccc4ca74574692d915e725940c77e9891652a7cc80604a2597
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild
index ffed4bc47e6c..6d4b458a8765 100644
--- a/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="cpu_flags_x86_sse2 fits openmp test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
diff --git a/media-gfx/opcion/Manifest b/media-gfx/opcion/Manifest
deleted file mode 100644
index 36f1ef3a7099..000000000000
--- a/media-gfx/opcion/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX opcion-1.1.1-fix-source.patch 408 BLAKE2B db69614febebd183d219dae70717e3916d6747c5dcd1219303ae3f1a6f8f565aa70d8e21762b1094fc6ae128eda584b7026ad6ba39375856c9fdd57a4a114849 SHA512 3097cc8970296bf9d571c44ac9c07074c88e7a3b8800082dfcaf94c1daa0ddae8c56f7101c5052d8382ac554a725debbb7a3271fd0257ab195d63313133f18ae
-DIST Opcion_v1.1.1_src.zip 319793 BLAKE2B 1c374f7e52ce7f313b8bc5b99ffcc990ccef3776a4e48d2499d3c3e8dccdbca353e00b109dc2f1fceacf020d095106d1c67569a23f65f1b891dc0bdbdf902070 SHA512 47b4729a54b4b76fdd5ece01f40e700f6c942df60a36956e08383aa24bb436e59b40df25d42d2d7c6b01633a92c7449a8c7f0acb9a9e63af76d1054373f51f14
-EBUILD opcion-1.1.1-r2.ebuild 1352 BLAKE2B cd9799c147bc824803f872f20616f4f5b71f863ff6195f735d8a9d6df3b745d02d494887df0a6d68d8fb5ea364ff3ca209db23253e107ab184bcb92a5c497e82 SHA512 6ee0fa78e5a3651c44bd716f8674b0b8e70fbe6b07574b01574bc6ad55bd4a8859f0d37252433132fa4d43739f5268debf8598820947808d0b8692c1949395a9
-MISC metadata.xml 314 BLAKE2B cd7e5e66092292581e8368d19331e42bbf2d9cf9cd9ba11a1537938ffcd8b04acdae9edf2250822452ca2cab8a4526dff70674059faf90c47d81ff56c91ac441 SHA512 2d933e44fbd5ec8dc05d7730bbca4f1d80d658f5735706fdc2ba3ce50b1637f37df9e5054d19e3e0e3869ea7b5417593d05bc8eaeaece0239000204666706687
diff --git a/media-gfx/opcion/files/opcion-1.1.1-fix-source.patch b/media-gfx/opcion/files/opcion-1.1.1-fix-source.patch
deleted file mode 100644
index 4c5f1dc9c9e3..000000000000
--- a/media-gfx/opcion/files/opcion-1.1.1-fix-source.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- FontViewer/components/AAToggleButton.java	2007-04-29 12:20:16.000000000 +0200
-+++ FontViewer/components/AAToggleButton.java	2007-04-29 12:10:53.000000000 +0200
-@@ -38,7 +38,11 @@
-         this.setToolTipText(fname + " (" + floc + ")");
-     }
-     
--    public String getFName() {
-+    public AAToggleButton(String s) {
-+		super(s);
-+	}
-+
-+	public String getFName() {
-         return fname;
-     }
-     
diff --git a/media-gfx/opcion/metadata.xml b/media-gfx/opcion/metadata.xml
deleted file mode 100644
index 99e11a0882f4..000000000000
--- a/media-gfx/opcion/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>fonts@gentoo.org</email>
-		<name>Fonts</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">opcion</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-gfx/opcion/opcion-1.1.1-r2.ebuild b/media-gfx/opcion/opcion-1.1.1-r2.ebuild
deleted file mode 100644
index 9d00507f7c00..000000000000
--- a/media-gfx/opcion/opcion-1.1.1-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils java-pkg-2
-
-MY_P="Opcion_v${PV}"
-
-DESCRIPTION="Free font viewer written in Java"
-HOMEPAGE="http://opcion.sourceforge.net/"
-SRC_URI="mirror://sourceforge/opcion/${MY_P}_src.zip"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-COMMON_DEP="=dev-java/jgoodies-looks-1.2*"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# add missing constructor
-	epatch "${FILESDIR}/${P}-fix-source.patch"
-
-	# calls nonexisting constructor and seems unused
-	rm FontViewer/windows/test.java || die
-
-	rm -rf com/jgoodies || die
-	find . -name '*.class' -delete || die
-	rm *.txt || die
-}
-
-src_compile() {
-	find . -name '*.java' > "${T}/src.list"
-	local cp="$(java-pkg_getjars jgoodies-looks-1.2)"
-	mkdir build || die
-	# quite icky way to copy resources
-	cp -R FontViewer com build || die
-	find build -name '*.java' -delete
-	ejavac -nowarn -classpath "${cp}" -d build "@${T}/src.list"
-	jar cf ${PN}.jar -C build . || die
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-
-	java-pkg_dolauncher ${PN} --main FontViewer.Opcion
-
-	newicon FontViewer/resources/icons/IconSmall.png ${PN}-icon.png
-	make_desktop_entry ${PN} opcion ${PN}-icon
-}
diff --git a/media-gfx/opencsg/Manifest b/media-gfx/opencsg/Manifest
index d83aafacc1cb..61337ded544c 100644
--- a/media-gfx/opencsg/Manifest
+++ b/media-gfx/opencsg/Manifest
@@ -2,4 +2,4 @@ AUX opencsg-1.4.2-includepath.patch 529 BLAKE2B 300ed0021302cf3c14ea3039c52ca579
 DIST OpenCSG-1.4.2.tar.gz 933135 BLAKE2B 20882afaddf40cc4e0c43c3e70bad334aae3885241a3993ce7083de20f9b10d6e6c4eb3a55abba2b1eca64fdae784c491492543a5012b8b2d67eb63a16dd693b SHA512 fbe6f925982717ecca7bd0eacc4fc5b362c80c7663b1ff0d9a228f2b5e1d3625d3e6d324d9e634665c74e9c0fc37d10290ece293e59a3eba67035b6b700b7778
 EBUILD opencsg-1.4.2-r1.ebuild 775 BLAKE2B d41ff856ec2ee82e6bba5c318b656adf1ca234c97a80f9c565a23fda444d6d1cd7f6cb4aeb3b9c1f7d5b6c368ffa2195f693fd469073b0a86363a181eadae1a1 SHA512 fd959b3c0a5e70b7d89a21747de355b05d6ceb4ce18fc78a5f20beea074869a02585d27415dc4b999cca3dbb62730d1953c9681f3eb827f454ff2a870b91dbef
 EBUILD opencsg-1.4.2.ebuild 754 BLAKE2B 32fb0c21ba6f023852e258035a33339f72d74d0806176d794f46bf9a17a198a8c2e4b22ffa31a866b2a11815dde170907cbe3c6c5b21fdfeb67779eabba8b7e9 SHA512 356eb205e3de711d0bea816a0b284cf31abbeb5ba5de13bafa71231872c31983e3bf28f04ff2daff92c6905347ce6bcff3f7eb86669f5c9fa098e1887f962d92
-MISC metadata.xml 1150 BLAKE2B aa7c35a3fbd4c2a1251d40cdeb5ca95be0b06ee8c55d7c597d656681859e5c746ebaaaa7c90e65e1a68cef0393112d156d338c4cc490a6a1193d186db9f08db3 SHA512 1ae03d7d7bc61ee9e07d52dc7d717108d03343f4c48c512dc7f8336eaec846ba8de7a10380d47c155d0c280f0bb72722fde2aeff972e8da21606dfaf9f0eb226
+MISC metadata.xml 1070 BLAKE2B 1a892821eaa48f008252d7c88ef7dfb90153b148965620c4dc222b36e2cead376a0a210f894bba92e3b0d6b6206fe52d2b50d073d51aac9160e8a7c7919aa715 SHA512 6ec0f9e9f23969068ee01620785c028d3b8c3ddef2614019ed8b9dc263e8507be748bc8a47f69e55084cf5026e814b4cf1feeb119980e3ecb6a16c8e43037133
diff --git a/media-gfx/opencsg/metadata.xml b/media-gfx/opencsg/metadata.xml
index 706f6998b308..9fe432b2d593 100644
--- a/media-gfx/opencsg/metadata.xml
+++ b/media-gfx/opencsg/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mattm@gentoo.org</email>
-		<name>Matthew Marlowe</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		OpenCSG is a library that does image-based CSG rendering using
 		OpenGL. OpenCSG is written in C++ and supports most modern
diff --git a/media-gfx/openmesh/Manifest b/media-gfx/openmesh/Manifest
index c1bce3b55c10..2afd29209950 100644
--- a/media-gfx/openmesh/Manifest
+++ b/media-gfx/openmesh/Manifest
@@ -1,3 +1,3 @@
 DIST OpenMesh-7.1.tar.bz2 22855582 BLAKE2B 778b3a40c2e476cdb2f50b5b4a90f8b6ae7852f166087426ff1db25c829cb4172cd7ed14db1a22229f7b4447e7ebeb0d6116647d929b7dab43d565192a8ac48e SHA512 bca0f937e08fe512efb436f5b96b83a1ff7945640e18fb1bb083956f04609560e29b1c1f7e058840791df77df6859fdd20ff6f49d80b908e8c1c5542b8615e6d
-EBUILD openmesh-7.1.ebuild 1440 BLAKE2B f4e59b2cbf50699f594dc958d9b02f5123c1aad2928807197dfe654faa0e76afb4208ddc42a89897f27c46c93e6a3eeb19606d196af70dd6ee9998afcc832e84 SHA512 2e0f3e49e0129f749260b4fc163cdc5d1b193d35b04976cf7d911e72de91b3a5927877fdafb563abe2859a4aad22b88819ae7d957c75550ed24dd3adfc456788
+EBUILD openmesh-7.1.ebuild 1464 BLAKE2B 3d03850630cc8f0c7efc08efa89f889d1634ea8700f0410c133340218329f8f8e7fed5907f6f6ee7e2610fd22c8e67fbf7fb7fa22e851a8cb6f8085c802f84c9 SHA512 2f5610ece826ac6d17ec001d2f9018d26c04e867bdcde46ee2274ca6f7a003d7119f95f9a4fd0c22b4040c23894455d9fb3e4b52964646fa9b9687d77c9ea7c9
 MISC metadata.xml 648 BLAKE2B 12598229d6cae71dae7cb87eac84679289994134848466d94c81d241db642f880c386a3ae65b0a5da939ae96cdd01eb19052ccf887f4df87edd3806526a3e225 SHA512 24e414a301d38d43961c5de285fc2fe2638a5a7c1d606d3f89efb5f701399d743382a0761f72f4aaf1d143755349a5a0f0cd49171a36137f65c1b7b8d3ccdcef
diff --git a/media-gfx/openmesh/openmesh-7.1.ebuild b/media-gfx/openmesh/openmesh-7.1.ebuild
index 9cc6fc78dcce..19b09a04fb5a 100644
--- a/media-gfx/openmesh/openmesh-7.1.ebuild
+++ b/media-gfx/openmesh/openmesh-7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,7 @@ LICENSE="BSD"
 SLOT="4"
 KEYWORDS="~amd64 ~ia64 ~x86"
 IUSE="qt5 static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	qt5? (
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index 6432ed005a6e..6f8ff9ac960b 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -4,6 +4,6 @@ AUX openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch 2990 BLAKE2B d6508
 DIST openvdb-4.0.2-patchset-02.tar.xz 12428 BLAKE2B 2684ddf010df975912fcfc8c4f944d9a9ba447b48750140b6c46db31d49297f7495e5c77e9d5b85af0b2e1d0c4987184865642dc95f1fb3e463e85ee5987d203 SHA512 04377d552e218a8eb31c43381ba32263ba206a0870dccda1bcc031863dfdbcc953da7ea89fd420dc1a338fbd6123ac30bac2039c0a2a01c1fa9253a3fdd0b54d
 DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d
 DIST openvdb-5.2.0.tar.gz 1788969 BLAKE2B d146b78dd7db4936779ca214b1f7957d4868bf76aedb95c9a98e21d25983b750337a63bf4bc9ccb438b683988af7a3d708676dcf7b4662c84e4926e8000ceb68 SHA512 69e21190c27a055e476a319b0c2d961303fa2f3fec30bec93ed44072d01816ef89e5e8f0abfc3a22d1c73742aa31284c664596747b49cd985fea1a751776506e
-EBUILD openvdb-4.0.2-r2.ebuild 2050 BLAKE2B 019c4b6ba119dff7aff5cc3b41846f03e65f6680274199c89be04cc573e85af95a28e5d81b6f6d4a62fc1ecdcc733aba9911f4f97abb40128215147ca006a640 SHA512 c806cbdfd23bc085c032212672686e3ff19a1d414e9003570090373d82382a309f3f8d5673de2a791bd6a54a1f491e318e97cef982b03d15a51d21b5392af396
-EBUILD openvdb-5.2.0.ebuild 1785 BLAKE2B b16a9beabf0e755da3daf1213703eb1103bc4a93681c5686842cfd814c1ac13753a8380d4a432772977f328fc5f4ba0e7eb5422142e9c11771952b7ef2b3de0c SHA512 e9ac1a52a478e9bd4108ef78eb124934a22310b9ec96239bf6e796abb873f1a36c527416b68d99e5fea077def2edbb4949198ef0e733532dc9a8daecf86e09a0
+EBUILD openvdb-4.0.2-r2.ebuild 2077 BLAKE2B eb88f16ecf9d24715a4d5e9aad9b44354466dff5d0058bbc416f9f8962610ad207c32d8470a799f7041454760a1e0b195889e79dd33abf2f14f50e0fb324a390 SHA512 6b1ef61ed8dbb48e27cc03a87ebabcd0918b54304d9b05a3771a7c23223ee17a28ebd89db39deacbd2219a9fff6be3dc2a0ea8e287db17ea14a8d57a30d3fb2b
+EBUILD openvdb-5.2.0.ebuild 1812 BLAKE2B 32e48e12cdf1a532b2ed209b023ccedffc435bc00ca10d99aa458909140727eb3a78b36694ebb619da3ce1c3a02f2d77dbe11d8b334c8130c5ae8ac815155f40 SHA512 73bf8f727fdb3528590330f19dc1ad44a5c78ba2ba40a2bea2cd4c20ce5498970489bb81c740d2c8cd1c39c3639b69b01bddf327e6a0e89f5559f57b906e6d15
 MISC metadata.xml 1033 BLAKE2B 303f49be8253322a0bbb94875f7b9b03e127e9d2ab2eea64fbac1cd51f50d5be749c4c45c9491fbf3f56de7420fdb47913b6ef3c2d12f5ea0545042f68d990d4 SHA512 a81a1cd4684197d1d9455b1398c9ba1592d596d52c8e8fc5c0cc8de0357c1f1df7478fd76e4e42cda09524b0bbf41985e13cf530adb7ca7f1605f086207301a8
diff --git a/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
index ec3c20d387c3..1ecb0e1b3a74 100644
--- a/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
+++ b/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
@@ -16,6 +16,7 @@ LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
 IUSE="+abi3-compat doc python test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
diff --git a/media-gfx/openvdb/openvdb-5.2.0.ebuild b/media-gfx/openvdb/openvdb-5.2.0.ebuild
index bcceabc54872..9889c5705e62 100644
--- a/media-gfx/openvdb/openvdb-5.2.0.ebuild
+++ b/media-gfx/openvdb/openvdb-5.2.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+abi4-compat doc python test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
diff --git a/media-gfx/pencil/Manifest b/media-gfx/pencil/Manifest
index 89f59021c717..0787b67873c4 100644
--- a/media-gfx/pencil/Manifest
+++ b/media-gfx/pencil/Manifest
@@ -1,3 +1,3 @@
 DIST pencil-0.6.1.1.tar.gz 2987266 BLAKE2B ae97364178e62535c17941c6c4a3ad507f5883628cbce59635a2c86cf3485ebd85a5815f28516315dabc30bd791c723805078d47f36b1409d545a769b78d90c4 SHA512 e84330da70091414a9fca8f0be8c8ca82272d89777cd0e5a33d30e4a53449eca20cfc175c84cbbe063dd1017be5b263ddf490f69771d9931c9d31261ebe46354
-EBUILD pencil-0.6.1.1.ebuild 1132 BLAKE2B d64702756ab05f05cc1db2b275e5809f23a4ffd17e52db8d9fbe62b278fc2a468ca9867c5faf48e51209711109441c18ad764f88938ce4a9e4b3dc0629b402aa SHA512 22d2bf01842905b4f2feacf32d8bf3d22b6e1afb3612bcddfc8f5b554c8d35abee6d1b34be1bb521680ad05f840da9d5bc68e2244860140ed89d32375c6c7496
+EBUILD pencil-0.6.1.1.ebuild 1102 BLAKE2B 6b11aadcdc1646338e23f84fccc1517ba838ab35d27020d0be2688917cde88b7e7eec1952b8e10456ce047e20365460e7591bf047212f030b781417860adbfe1 SHA512 be9356d9632feca6719d60e8f848f95c02443e4cbe772c0d75c569803c8a1e0270ddfcb0135267dcfb4b2c34995a6459b5e8f748b08d95602c8d2e5f2b3645a4
 MISC metadata.xml 251 BLAKE2B 014f8e7a6a13c0ed2ba147bc1ecb8768c9cea185f10b74923d2e2157b3bdf0771a8300a4d88d2492ff9e7daaa5d0bb5c5e04f6c70273a4a0afe85869087d201c SHA512 d515519588ccedd03f6b4d0b653e957c8f26c922098a5408e9962fe9dbbb9105001a9ea1b08b73ce6e5fa41fabdc86081f6fe24f8394e2a44d036d01a01da0ed
diff --git a/media-gfx/pencil/pencil-0.6.1.1.ebuild b/media-gfx/pencil/pencil-0.6.1.1.ebuild
index e40717fe2bd8..69c4eb9be6d8 100644
--- a/media-gfx/pencil/pencil-0.6.1.1.ebuild
+++ b/media-gfx/pencil/pencil-0.6.1.1.ebuild
@@ -40,7 +40,7 @@ src_install() {
 	einstalldocs
 
 	# install target not yet provided
-	# emake INSTALL_ROOT="${D}" install || die "emake install failed"
+	# emake INSTALL_ROOT="${D}" install
 	newbin bin/pencil2d ${PN}
 
 	newicon app/data/icons/icon.png ${PN}.png
diff --git a/media-gfx/photoqt/Manifest b/media-gfx/photoqt/Manifest
index e71d82aaf69a..117be25723e6 100644
--- a/media-gfx/photoqt/Manifest
+++ b/media-gfx/photoqt/Manifest
@@ -1,5 +1,5 @@
 AUX photoqt-1.7.1-cmake.patch 358 BLAKE2B ecadfc9f5ff6cac0535f5db36efc87f37705e77bc6d4b2445a77430c606c642081bff5c6c5733804dcf6cc3878d424bce4c39fd590478ee596f63e23f022506b SHA512 3a5b74999bc6765c37252dd2b34e36ed910c0f3c58e30dbdc84b38b361b45bf6e9131525069b1184c7e2b4e820674742233359120c63c37324fb802e0d9c1726
 AUX photoqt-1.7.1-exiv2-0.27.patch 3900 BLAKE2B 080ed5afb4c9a29779b6a875261a893315529dd87caacec31bca34b91a626bc196acb9ce3f7ed4427478855e31a4e24a14ef9d12834054c2c766e42596435fad SHA512 6a8b56ab47b4e2f21f951b8e78455b5ba7757c1a1d98ffd0f754a245662f87877a6a326409868091d0a163caa639ff7fc497151baee3b9fdae26b3cd291065f4
 DIST photoqt-1.7.1.tar.gz 1324774 BLAKE2B b739508511cdc34b6de5736260692c48186a49d0cf62d8283238ee274d2fdf73716589277fa602f86c8c15fff87b49d1700202d260480e002dfa18380b47d328 SHA512 50cee1a77a5e69d05f19a8f1ac8ab18d1ef420962b05f3a76e12ce0f3202db7037c894bbd7631674504f0e51c2be690aff4248ed343d0da2dc8a1ccce2d8e078
-EBUILD photoqt-1.7.1-r1.ebuild 1471 BLAKE2B 607dace056cb2c481275e48ec11d3ff381f48e2c23e9d1d03208950744f591db05dd0a2410c069739c869ac096d84a49a9c59e7d012eb3b7a85809615dd19c7c SHA512 5b45c2011f4fbc6c340c828a6073f61f73f81a5dc91124344f92bbfb232107d3afef95284fbeda0d6a56daf333ab8610bd81255f8292fa6b3659bb7ab7301b9a
+EBUILD photoqt-1.7.1-r1.ebuild 1265 BLAKE2B 6f6d7be992fc9fca2f99ca9aa7c3026c7c02595b55318be69c838182310e0d68a51c335ff08a6d948a1810fb7a7e8f9d27c695ff67da5e41fb7689e143037cf2 SHA512 c0ea40aeafede7202f4bff59a00071117d1ca4a79d8e805ef08c2f5d143cb1df8f4e9c433cfb3e0e5a8a599297027db27d0e197e54a20cf57a8bd6c954cefc07
 MISC metadata.xml 474 BLAKE2B 44114be5222dc1c0ad5a926fc6ff85da5b284a929a0991795632896c0f56ad24021591260c899549eda9b36557dc251363d17eef52928930afaaafebdf29bcf3 SHA512 50c4bf4437dec5d9919e3a16fdc4e429e3fdbc8d23656ecca57ae7674bc90bd6e8e33949191d7c15d49cbfe5451e72155e1bf441f020a44ab98b35115a29b6e0
diff --git a/media-gfx/photoqt/photoqt-1.7.1-r1.ebuild b/media-gfx/photoqt/photoqt-1.7.1-r1.ebuild
index b8f003fbdbfa..53e9fae1e605 100644
--- a/media-gfx/photoqt/photoqt-1.7.1-r1.ebuild
+++ b/media-gfx/photoqt/photoqt-1.7.1-r1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils gnome2-utils xdg-utils
+ECM_KDEINSTALLDIRS=false
+inherit ecm
 
 DESCRIPTION="Simple but powerful Qt-based image viewer"
 HOMEPAGE="https://photoqt.org/"
@@ -14,8 +15,10 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="devil exif freeimage graphicsmagick pdf raw"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
 RDEPEND="
-	dev-qt/qtcore:5
 	dev-qt/qtdeclarative:5
 	dev-qt/qtgraphicaleffects:5
 	dev-qt/qtgui:5
@@ -36,10 +39,7 @@ RDEPEND="
 	pdf? ( app-text/poppler[qt5] )
 	raw? ( media-libs/libraw:= )
 "
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	kde-frameworks/extra-cmake-modules:5
-"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-cmake.patch"
@@ -55,15 +55,5 @@ src_configure() {
 		-DPOPPLER=$(usex pdf)
 		-DRAW=$(usex raw)
 	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	ecm_src_configure
 }
diff --git a/media-gfx/pngquant/Manifest b/media-gfx/pngquant/Manifest
index 63eb62a16f6d..e0e14f9e53a4 100644
--- a/media-gfx/pngquant/Manifest
+++ b/media-gfx/pngquant/Manifest
@@ -1,6 +1,4 @@
 AUX pngquant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1070f90d4c59584a2b9dac062febb7bdeb1efbbd1cb4f39f8fd1aa94f81ac4318bd0413bdde44f75d418f69b916a70883220d9ef031 SHA512 68c2bf917d60da653abff4fc20c44a9f692213aed87a220a3ffb03ec308107eda7be1a6e135393658ef54d2d63bb0675f5e2a95bdf4b02628fcf5d367c0ce9ef
-DIST pngquant-2.12.2-src.tar.gz 143404 BLAKE2B b06b1185fdeb1990e6b6f0cb77e33051729731fc2c2f4b1f618bd9077057354eabc21405872c938dbdf5395040860b4a884e9780bbd439da36f2af61d53e82a9 SHA512 ed82e0a57d9f4f3ee40258c4cbbf7ed086177dee1e2afdcb7d308f779c83fb2be9c7226c0713b9c72e6b6c22161dbaca3d14f2bdc2f0468daa608be80e9ef1c9
 DIST pngquant-2.12.3-src.tar.gz 143572 BLAKE2B 6f4cc9f36c9148f36734d9afa3765e206c09e833064cff5d98494d0d71610e857d7c605bc5673eb9fd5b38029ade60c9c1ffc18e745a3dfe5dbde6d39a81d0c7 SHA512 cf39f56750a49b2818fb86b168845e54f3797b664c3f49535ee93a3dc899299192a692039396ffcddc5988d040a778006c5f701f8bcd9f5c73583a47b711b01c
-EBUILD pngquant-2.12.2.ebuild 1169 BLAKE2B 56452f5fa0d76b47151583ef5c4684781eeee2ad12736845790af6ac1a1bb06516c692156a54aa08bcafe5d9df3f5175e3be34e9564e79970ca43cb65428275f SHA512 648727074119405019a00eb3f252ff86e0157874821f3fb9e6025183937cb4639a8b15c19974ee31bb27313cf791a45c8569490e885f0a92b88b1b2d62eada44
-EBUILD pngquant-2.12.3.ebuild 1170 BLAKE2B 7c11ec368fcf151b197cdf89128b0b12dad91c2de6a39a9b04f2cc81d85eb59c4e09dd41544a0733ea0f42c5787974e499635f44a43a5a55815d020cfd7faad0 SHA512 842cf9d9d8cfa08ecf9eda120fadf8aa168736000fbaea8b8dcbf63d08901dad796fa1eb46a0a0facf9f6239feb392a0e1529a242ee085d96af950a331f6fa1e
+EBUILD pngquant-2.12.3.ebuild 1169 BLAKE2B 56452f5fa0d76b47151583ef5c4684781eeee2ad12736845790af6ac1a1bb06516c692156a54aa08bcafe5d9df3f5175e3be34e9564e79970ca43cb65428275f SHA512 648727074119405019a00eb3f252ff86e0157874821f3fb9e6025183937cb4639a8b15c19974ee31bb27313cf791a45c8569490e885f0a92b88b1b2d62eada44
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/pngquant/pngquant-2.12.2.ebuild b/media-gfx/pngquant/pngquant-2.12.2.ebuild
deleted file mode 100644
index fddd03b24f41..000000000000
--- a/media-gfx/pngquant/pngquant-2.12.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="command-line utility and library for lossy compression of PNG images"
-HOMEPAGE="https://pngquant.org/"
-SRC_URI="https://pngquant.org/${P}-src.tar.gz"
-
-LICENSE="GPL-3 HPND rwpng"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="debug lcms openmp cpu_flags_x86_sse2"
-
-RDEPEND="media-libs/libpng:0=
-	media-gfx/libimagequant:=
-	sys-libs/zlib:=
-	lcms? ( media-libs/lcms:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.12.2-respect-CFLAGS.patch )
-
-src_prepare() {
-	default
-
-	# avoid silent fallback to bundled lib
-	rm -rv lib || die
-}
-
-src_configure() {
-	tc-export AR CC
-	# Hand rolled configure script, so not all flags are supported.
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		--with-libimagequant \
-		$(use debug && echo --enable-debug) \
-		$(use_enable cpu_flags_x86_sse2 sse) \
-		$(use openmp && tc-has-openmp && echo --with-openmp) \
-		$(use_with lcms lcms2) \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc CHANGELOG README.md
-}
diff --git a/media-gfx/pngquant/pngquant-2.12.3.ebuild b/media-gfx/pngquant/pngquant-2.12.3.ebuild
index 822e8fbf648f..fddd03b24f41 100644
--- a/media-gfx/pngquant/pngquant-2.12.3.ebuild
+++ b/media-gfx/pngquant/pngquant-2.12.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://pngquant.org/${P}-src.tar.gz"
 
 LICENSE="GPL-3 HPND rwpng"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug lcms openmp cpu_flags_x86_sse2"
 
 RDEPEND="media-libs/libpng:0=
diff --git a/media-gfx/pngtoico/Manifest b/media-gfx/pngtoico/Manifest
index 1b0ead29b9b9..8fd6c72eb58e 100644
--- a/media-gfx/pngtoico/Manifest
+++ b/media-gfx/pngtoico/Manifest
@@ -1,5 +1,5 @@
-AUX pngtoico-1.0.1-Makefile.patch 467 BLAKE2B 7f8e68c8f2469b86da5396da2bffbb9bbe23419660b0ba05df6b2eb6892ed4559fa3a976f2071753074ef7c1197119767e4ea450b8831f11ca0c2784cc796b2b SHA512 e8658146be6b61046a4154a4282897df0bf9336ca5c536a383ca5d80487a849ef972fb02dc003f0228c59bf8f1c17783f72e3191055d0cb3b4582ce98af087ed
-AUX pngtoico-1.0.1-libpng15.patch 231 BLAKE2B e2c360809f356e50bc1319210b55a2aa9adabcb4edb84ab9a871286f065dae81525b67738e1ee12f44265f079cf5e415c4a8ee33cce1410e93a560729ebd830c SHA512 a32a89b248d712b776384d30ff76b9e4b119acf292f62b5e82b36387e1a4113e8926209543859509cfcd00b85ad4a8f95223a66fa1fbd4771b5a7779ed66caf1
+AUX pngtoico-1.0.1-Makefile.patch 677 BLAKE2B 97d77dca4f085bf827affd68141a315be3ad67dff27f6f42890a8cc4770f747a094dc4756cb6cc29d79bb5c160b8a0d71528b6c8f3faf78bc7bf2040db7a41c8 SHA512 fe39f9d3db272d0bd0b208e2ddfa9f40e60336f0f8474605c3cdae025e80cb11bf3ba9ff8d1ac484d38b0682f54f823524177b718c73b9c34c9d7b7911810dc2
+AUX pngtoico-1.0.1-libpng15.patch 235 BLAKE2B a41aaf9a8574f04c317a251861f3e1b8b8346a4038c353ca844c589422abf48dae33026c1c33cf11ee3d3da4a689e67190cf338f75c0bec7b526b1c5e104f6fe SHA512 0ad131b4ccbd3e92386bc6e67e0efc3c19296510f1d7299d9f438d40d15a5042256b7ff76e01ee3ba41db7765c20c0d601a98bcc1386e0d1f97025cbae030a5e
 DIST pngtoico-1.0.1.tar.bz2 4355 BLAKE2B 47f35525b261e0c9261e2da5d16eb5068f151dfd6e36da6595884946836e1051312c610aacd5760ecc1c7b49f8df6b507b799f80a08b014b4cf136d9ab366668 SHA512 240d387b6d83cf9243d003d3233b642d1ae3f29f12ba5c97a4e0aa17f6a0d48ea035fb3f7cd4d44dd3d1056e713c6f5a3a4ae9b9bee8e191a564ed162bdebf7d
-EBUILD pngtoico-1.0.1-r1.ebuild 690 BLAKE2B f464cf5611b85131619fba99f28e29f3aed848f13e7f9ba5c98ed53d65806fa5e55ddf383cd8f9e2566080e6bf0ee0f0ae920c07299969af7b23aedd4cd3f5d5 SHA512 10a16c3bc36874abc8ceafaf08fef2c5d2b96f3ac6675cd1c621f12157bd82e21698d8d9e4c3d65b0c4051b4923ddf4890822f28b0f9651386a5201de2ad5d7c
+EBUILD pngtoico-1.0.1-r1.ebuild 634 BLAKE2B 6087be501849bbebbf859f0e4989e72707a9ce87694fdcfa3c1cbdf1694da514dbff17c8ec986c0f48a923cc80ea74a877d3f13545c310a7c265e60c1b24c576 SHA512 7a910cbf6985c4100435749b2cd5b58e2a89e11b3ee68dee4dc6a1405842c15e522113dfcff1b9b39fbf6d0ae272d04fcd0e1c948b7224d9588ecabd00307493
 MISC metadata.xml 241 BLAKE2B d11260008412b27ed0c22e21420a082065b8ce13021a7800ef00ade71a7746d834686a3685dad6250e10ab8b6eee8747a3b0bff3d6f488cc05fd9c769194f8a9 SHA512 3e1af4796a9c6a176936843173357f35ff94281769b8f35e0678fa403a294a0bb0eb98f371d129cd19b74e1cc8e84cfa8db71e9ecebfb67394a51d55e6d90642
diff --git a/media-gfx/pngtoico/files/pngtoico-1.0.1-Makefile.patch b/media-gfx/pngtoico/files/pngtoico-1.0.1-Makefile.patch
index 77d86dc52446..22fb79fe7aaa 100644
--- a/media-gfx/pngtoico/files/pngtoico-1.0.1-Makefile.patch
+++ b/media-gfx/pngtoico/files/pngtoico-1.0.1-Makefile.patch
@@ -1,15 +1,23 @@
---- Makefile	2002-01-01 22:46:46.000000000 +0000
-+++ Makefile.new	2002-11-11 01:11:12.000000000 +0000
-@@ -21,9 +21,9 @@
+--- a/Makefile
++++ b/Makefile
+@@ -20,10 +20,9 @@
+ mandir      = $(prefix)/man
  man1dir     = $(mandir)/man1
  
- CC      = gcc -W -Wall
+-CC      = gcc -W -Wall
 -CFLAGS  = -O2 -fomit-frame-pointer
 -LDFLAGS = -s
 -LIBS    = -lpng
-+CFLAGS  += -fomit-frame-pointer `libpng-config --cflags`
-+LDFLAGS += `libpng-config --ldflags` 
-+LIBS    = `libpng-config --libs`
++CFLAGS  += `libpng-config --cflags` -Wall
++LDFLAGS += `libpng-config --ldflags`
++LDLIBS  += `libpng-config --libs`
  INSTALL = install
  INSTALL_EXEC = $(INSTALL) -c -m 755
  INSTALL_DATA = $(INSTALL) -c -m 644
+@@ -40,6 +39,3 @@
+ 	mkdir -p $(INSTALLROOT)$(bindir) $(INSTALLROOT)$(man1dir)
+ 	$(INSTALL_EXEC) pngtoico $(INSTALLROOT)$(bindir)
+ 	$(INSTALL_DATA) pngtoico.1 $(INSTALLROOT)$(man1dir)
+-
+-pngtoico: pngtoico.c
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o pngtoico pngtoico.c $(LIBS)
diff --git a/media-gfx/pngtoico/files/pngtoico-1.0.1-libpng15.patch b/media-gfx/pngtoico/files/pngtoico-1.0.1-libpng15.patch
index c81b25ade627..616e181e264c 100644
--- a/media-gfx/pngtoico/files/pngtoico-1.0.1-libpng15.patch
+++ b/media-gfx/pngtoico/files/pngtoico-1.0.1-libpng15.patch
@@ -1,5 +1,5 @@
---- pngtoico.c
-+++ pngtoico.c
+--- a/pngtoico.c
++++ b/pngtoico.c
 @@ -188,7 +188,7 @@
      goto perrexit;
    }
diff --git a/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild b/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild
index 2c6647ac4bd3..ed2c5e757a46 100644
--- a/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild
+++ b/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Convert png images to MS ico format"
 HOMEPAGE="https://www.kernel.org/pub/software/graphics/pngtoico/"
@@ -11,19 +12,17 @@ SRC_URI="https://www.kernel.org/pub/software/graphics/pngtoico/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
-RDEPEND=">=media-libs/libpng-1.4"
+RDEPEND="media-libs/libpng:="
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-Makefile.patch \
-		"${FILESDIR}"/${P}-libpng15.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-Makefile.patch
+	"${FILESDIR}"/${P}-libpng15.patch
+)
 
-src_compile() {
-	emake CC="$(tc-getCC)" || die
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
diff --git a/media-gfx/pngtools/Manifest b/media-gfx/pngtools/Manifest
index 867f05b41f29..7aeb384263b5 100644
--- a/media-gfx/pngtools/Manifest
+++ b/media-gfx/pngtools/Manifest
@@ -2,5 +2,5 @@ AUX pngtools-0.3-implicit-declarations.patch 1428 BLAKE2B 7e6cc10c336658e039de5f
 AUX pngtools-0.4-libpng14.patch 1265 BLAKE2B a959b83fe85a10348d815ccccaa17d2e46c03398a38cdffff52372a39419ef2ed70deb7e5751228066085c714969d755665801bf8b973d945622159af1937e03 SHA512 94940722266361f90239712875067ab0d82c18545300d9d604b76eb00ffdb8e82af0e0ab78966b645aba2dbdf59666a2da593365d5b9c9745def2b8ede0a4480
 AUX pngtools-0.4-libpng15-fixes.patch 6722 BLAKE2B 083318ef199f4c07ed1f44ddf95623fd198e10a2b939f86c1bf7a9995fac98080d0dbbe79e2e88817e8f07c5bd2f79ad80d7ee2d41cb0d03ca7aa46b8707ba64 SHA512 aafc4c746efc0ef00e9d9e59acf0dee58b56ce80a9f04ddfa9879f46f342170f4641f23081323299a143d4837367645240f823ba9900592fcfdec71961f3f330
 DIST pngtools_0_4.tgz 1312178 BLAKE2B bff4be34b9a14a459cef2fb5cd1b70bb645c1fca8843bffc2a517b7f56e7a40e104b25b887f8bda227da2e12613c6c568b081b38bf70881b291bb5562eaeb6db SHA512 588b954c7c43ba48442ed4b22ad94fcfb456c7fc84a682e9126ca9d1c9b63dbb8f2d64e6e156664f327efbe11bb2ab1ac29d63ebb8a05329ac14200fb29f95a1
-EBUILD pngtools-0.4-r2.ebuild 784 BLAKE2B 76037d1e9bb48a499270d4dd1406761fa2c8db8024327930c77b07b937f05b81b219364d05a0676d5546efe0ce37f9de37dec84e68bf6f00e50e8c72f863704e SHA512 980cd7dc16287b78c51e049bee4aae83d89107f202dbb9a0dec9028e49e689c78b1f3e26535c1c29363088e7ee625fac5b2536473099383e0d244aefd5d0142c
+EBUILD pngtools-0.4-r2.ebuild 703 BLAKE2B 2ce8afd2ce3d957fdd4bf77b3e1cc821523aadde6b2f4995928ece1cae9c633f4c3de60454589929536cc0299b257485de175e7fd73877e2f272f0a161a99086 SHA512 6c618d4ec7c027b1a621d879aa10ff27bab962ffbbe6de42031380fc1343b6a63f6f85a15385232765c9d46d5dc83ce616adcc1aebea8930259529fdb86b5788
 MISC metadata.xml 334 BLAKE2B 1187762760d5f446f3e05d51549d1cd45c5544fbbf12c0ac47b649b3fe3ee569a366fc52c024cbcad263c11b8da4c08bcd54df7c9f92e6eed1530d918ffd78c1 SHA512 348994bfded172670ed4e52da50cec54a3c059a65d8a00e5aca8109c9320964dec238ad3c6439e7eb7556b4ee047423b93ca34c88090dbe1bfbcdd7a5a9e6fe2
diff --git a/media-gfx/pngtools/pngtools-0.4-r2.ebuild b/media-gfx/pngtools/pngtools-0.4-r2.ebuild
index b561e2cde5e5..18ba166788ad 100644
--- a/media-gfx/pngtools/pngtools-0.4-r2.ebuild
+++ b/media-gfx/pngtools/pngtools-0.4-r2.ebuild
@@ -1,34 +1,37 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit autotools eutils
+EAPI=7
 
-MY_PV=${PV/./_}
+inherit autotools
 
 DESCRIPTION="A series of tools for the PNG image format"
 HOMEPAGE="http://www.stillhq.com/pngtools/"
-SRC_URI="http://www.stillhq.com/pngtools/source/pngtools_${MY_PV}.tgz"
+SRC_URI="http://www.stillhq.com/pngtools/source/pngtools_${PV/./_}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
-RDEPEND=">=media-libs/libpng-1.4:0"
+RDEPEND="media-libs/libpng:="
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.3-implicit-declarations.patch
-	epatch "${FILESDIR}"/${P}-libpng14.patch
-	epatch "${FILESDIR}"/${P}-libpng15-fixes.patch
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3-implicit-declarations.patch
+	"${FILESDIR}"/${P}-libpng14.patch
+	"${FILESDIR}"/${P}-libpng15-fixes.patch
+)
 
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ABOUT AUTHORS ChangeLog NEWS README chunks.txt
-	insinto /usr/share/doc/${PF}/examples
-	doins *.png
+	default
+	dodoc ABOUT chunks.txt
+
+	docinto examples
+	dodoc *.png
 }
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index 2905b8dae638..3e6c8d9a5673 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 762 BLAKE2B 8a2c329585741b7ef23870eac8d34a3c236e7a9d69b895e718cc67ae8504e0d0644f3f9ba176c4f489ef882748eb4baf973a201b2febf7e75fd88d7ac67201bc SHA512 34973be8c02b8668bfb8de801b3dc34c82063bb521e0135f1c695d9b326f03d93e24dc0fb6d169d46cb0191cccf0bc13ae9306679d9dfac93573ad0f8f5632c7
+EBUILD qrencode-4.0.2.ebuild 789 BLAKE2B 134716a40b8641d1cf44f5b0681809e50caac16b6f8439f27d3461d19fae183bb978211528da663c141c0824dbcb998ea843aff7f441e597f75e306bbd762ee8 SHA512 18e23638fa8f4dfc285ca683e6fde648845c0d834ecd9e8c4d937365a1d55a9d89d338bb70a5c37fe654d6c66b0e1909318d5e19e352e5b994704058418b120e
 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 4e8725288441..7c9a840f5f0a 100644
--- a/media-gfx/qrencode/qrencode-4.0.2.ebuild
+++ b/media-gfx/qrencode/qrencode-4.0.2.ebuild
@@ -11,6 +11,7 @@ LICENSE="LGPL-2"
 SLOT="0/4"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="media-libs/libpng:0="
 DEPEND="${RDEPEND}
diff --git a/media-gfx/qvv/Manifest b/media-gfx/qvv/Manifest
index cfc96a023eb4..6191832a1814 100644
--- a/media-gfx/qvv/Manifest
+++ b/media-gfx/qvv/Manifest
@@ -1,4 +1,4 @@
 AUX qvv-4.04-toLatin1.patch 1008 BLAKE2B bd7a9a6fb8b8051d8ea4e9a7a2c563969eeafbf8b87ae49691f669e8da2318bbad570a2fed917030cdbce644595f1f8b31c5c629291e2b04cdb10dbd20584656 SHA512 2f4f2b8265a6bb7b92fd4b993527877ff3961388088a281a68659f838d9ac57436f59a74b8fb37ec3a02b1eb7624bcb2ccb59c02a555cb91cfdbce41e45c46a9
 DIST qvv-4.04.tar.gz 4580207 BLAKE2B 0f73f455ca5f7446312043c53322668a7824fdbcadb0eff1e98698f14bfbaac7c57a1ac1e7e42164ed1071e319f90d1aa5d57cf865c31d3242bdfd954875c12a SHA512 102c51f7eb146d4ddcbfee16fcf93bc08f874268c2838c1358d314daf466639c5506adc2ba99231cb5f2f7074a980545c1640241396964012e9991b946d7839d
-EBUILD qvv-4.04.ebuild 765 BLAKE2B c7442c9c9dd728a89aee6d47c511301b780a88f238e6607cb0a08de6dd4261c1f5b7a5ca641d27d882d91d74bf30d69b70ef21e11381a05343d9442606dc6484 SHA512 cf340c63a1413618f926bc4754bf89d46bf989d355dcd39ac220b1cf015e5a7dfa0e1da79f7512a2a917e9e54e7eefc10acad04b0dc64370b827b9275bf372be
+EBUILD qvv-4.04.ebuild 743 BLAKE2B 174fdc70666b412dea1232376297e8951977c800d0fa8f94f59ffa159955c0448a61d34b2a18209fe5e3845cd0bcb18a287f151cc5b2ce4943ca2ad5d02ad812 SHA512 59f9d3ced5261208e113260714efad0ffe5f3b8552ce0c1a2a6f8905119587f24c21202e7ae2d74a463eb56f95e8624478907610f0c94275ddd131ea7948f8c4
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/qvv/qvv-4.04.ebuild b/media-gfx/qvv/qvv-4.04.ebuild
index bd8c0105b3bc..50d847492219 100644
--- a/media-gfx/qvv/qvv-4.04.ebuild
+++ b/media-gfx/qvv/qvv-4.04.ebuild
@@ -31,7 +31,7 @@ src_configure() {
 
 src_install() {
 	einstalldocs
-	dobin qvv || die "dobin failed"
+	dobin qvv
 	doicon images/qvv_icon_128x128.png || die "doicon failed"
 	make_desktop_entry qvv QVV qvv_icon_128x128
 }
diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index 252f0ce5ff55..f3342279e97d 100644
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@@ -1,7 +1,3 @@
-AUX sam2p-0.45-fbsd.patch 319 BLAKE2B 8ea5955763ef1cd1c483f36cb1bdbb10eaf3eb2ad1327d39466eb82c42596a54ca2f8573efa2c447fbe958e038c8acc7b2bacda8c2bde0937bb385a007da901f SHA512 e0b0b48e391cf52cbb46613d185aedd0e758a2db8783798718600a7d4bb11cce15cd64fcadb222227d1adcb7f3a476b3c842ee206bfb8f127624fada7da8e770
-AUX sam2p-0.49-glibc-2.20.patch 629 BLAKE2B d3fc912f3a9106a0f8dd0261fdd8f0a558c62c690eaef83d2bf4d098290ab1bb47792bf6678c4e3252437f3a69351a475b3354069cf3a1ef33254deabcfa8b67 SHA512 8c7dcef4bbe2b8f5b6934e286d313071ff50f872550134016b368104055dc18fe77843b9a59a6c8a853115b3154bbecb68fe3b4467c9d1eebe894ebcd379146c
-AUX sam2p-0.49.1-build.patch 1179 BLAKE2B 8115374dcfb4d96c7da3d8d651a735b9ea3488b8120c60bdd87c9b65f18b696fd796c26cf481da98afe6d9016350447220ed4584caad18346a4c82adb0c36843 SHA512 4bb8693bb2068d295e8a996bf66ee94eb215f103ef7996ef236cb4e80be2489655350d902d6b0a3fdd66004d332294ff2478e2dea0d02714af49c652bea5184b
-AUX sam2p-0.49.1-gcc48.patch 1186 BLAKE2B 4427b023378134d57b1605745ffabea68dd05c2c99e6315cd7429011ebc4f41555b4773ec32d7f276ecff08693f730bab83d01292d32d022248f6d94120c60c0 SHA512 048c3b308bfdc624ab43fd7403314ebbe3d1c2dd32c72d9236b5e5df2f4c1766fb88c7f6460cac74b84be3c6d8f5ed1e879299256f028b42700fc3d5d7e63bc0
 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
diff --git a/media-gfx/sam2p/files/sam2p-0.45-fbsd.patch b/media-gfx/sam2p/files/sam2p-0.45-fbsd.patch
deleted file mode 100644
index aed13acf08dd..000000000000
--- a/media-gfx/sam2p/files/sam2p-0.45-fbsd.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gensio.cpp.orig	Fri Feb  7 02:24:56 2003
-+++ gensio.cpp	Fri Feb  7 02:25:11 2003
-@@ -491,11 +491,7 @@
- /* --- */
- 
- 
--#if HAVE_lstat_in_sys_stat
--#  define PTS_lstat lstat
--#else
- #  define PTS_lstat stat
--#endif
- 
- /** @param fname must start with '/' (dir separator)
-  * @return true if file successfully created
diff --git a/media-gfx/sam2p/files/sam2p-0.49-glibc-2.20.patch b/media-gfx/sam2p/files/sam2p-0.49-glibc-2.20.patch
deleted file mode 100644
index f96a97969390..000000000000
--- a/media-gfx/sam2p/files/sam2p-0.49-glibc-2.20.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://bugs.gentoo.org/524048
-
-ignore warnings w/newer glibc-2.20
-
-patch by Dmitry Derevyanko
-
---- a/ccdep.pl
-+++ b/ccdep.pl
-@@ -233,6 +233,9 @@
-   } elsif ($S=~/\A([^:]+):\d+:(\d+:)? warning: this is the location of /) {
-     # ^^^ gcc-3.1
-     undef $included_from;
-+  } elsif ($S=~/\A([^:]+):\d+:(\d+:)? warning: .*\bdeprecated\b/) {
-+    # Example: /usr/include/features.h:148:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
-+    undef $included_from;
-   } elsif ($S=~/: No such file or directory$/) {  # Depends on $ENV{LC_ALL}.
-     # ^^^ gcc-3.3
-     undef $included_from;
diff --git a/media-gfx/sam2p/files/sam2p-0.49.1-build.patch b/media-gfx/sam2p/files/sam2p-0.49.1-build.patch
deleted file mode 100644
index ba421463d536..000000000000
--- a/media-gfx/sam2p/files/sam2p-0.49.1-build.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- configure.in
-+++ configure.in
-@@ -81,7 +81,7 @@
- dnl Checks for programs.
- dnl AC_PROG_CC
- AC_LANG_CPLUSPLUS
--CXXFLAGS=" "
-+#CXXFLAGS=" "
- dnl ^^^ set it to non-empty, so AC_PROG_CXX won't include `-g'
- CCC="$CCC g++"
- dnl ^^^ check g++ before c++ (see acspecific.m4, grep AC_PROG_CXX)
-@@ -215,7 +215,7 @@
- 
- dnl AC_PTS_RUN_OK([perl -x -S ./ccdep.pl $CXX], [], [AC_MSG_ERROR(cannot compute depends)])
- rm -f Makedep
--AC_PTS_RUN_OK([make Makedep], [], [AC_MSG_ERROR(cannot compute depends)])
-+AC_PTS_RUN_OK([gmake Makedep], [], [AC_MSG_ERROR(cannot compute depends)])
- AC_PTS_OK
- echo "configure done. Now you should run: make; make install"
- 
---- Makefile
-+++ Makefile
-@@ -17,7 +17,7 @@
- export PERL_BADLANG
- 
- CXXX=$(CXD_assert)
--LDALL=$(LDXX) -s $(LDFLAGS) $(LIBS)
-+LDALL=$(LDXX) $(LDFLAGS) $(LIBS)
- ifeq ($(ENABLE_DEBUG), no)
- CXXX=$(CXD_no)
- endif
-@@ -51,8 +51,8 @@
- IDE_TARGETS_debug := $(patsubst %,%.yes, $(TARGETS))
- IDE_TARGETS_release := $(TARGETS)
- 
--CXD_assert =$(CXX) -s -O2
--CXD_no     =$(CXX) -s -DNDEBUG -O3
-+CXD_assert =$(CXX)
-+CXD_no     =$(CXX) -DNDEBUG
- # CXD_yes    =$(CXX) $(GFLAG) -lefence
- CXD_yes    =$(CXX) $(GFLAG)
- CXD_checker=checkerg++ $(GFLAG)
diff --git a/media-gfx/sam2p/files/sam2p-0.49.1-gcc48.patch b/media-gfx/sam2p/files/sam2p-0.49.1-gcc48.patch
deleted file mode 100644
index d427c2076d3c..000000000000
--- a/media-gfx/sam2p/files/sam2p-0.49.1-gcc48.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: ccdep.pl
-===================================================================
---- ccdep.pl	(revision 123)
-+++ ccdep.pl	(revision 125)
-@@ -137,13 +137,20 @@
- 
- my @DS=find_ds();
- my @DSQ=map{shq$_}@DS;
--my $R="$GCCP -DOBJDEP -M -MG -E 2>&1 @DSQ";
--$R=backtick($R);
-+my $DIAG=" -fno-diagnostics-show-caret";
-+my $Q="$GCCP -DOBJDEP$DIAG -M -MG -E 2>&1 @DSQ";
-+my $R=backtick($Q);
-+if ($R=~/\berror: .*-fno-diagnostics-show-caret\b/) {
-+  # gcc-4.6 and earlier don't have this flag, and they fail.
-+  $Q=~s@ -fno-diagnostics-show-caret(?=\s)@@;
-+  $DIAG="";
-+  $R=backtick($Q);
-+}
- 
- if ($R!~/: warning: #warning\b/) {
-   # config2.h:314:4: warning: #warning REQUIRES: c_lgcc3.o
-   # Dat: g++-3.3 ignores #warning with -M -MG -E
--  $R.="\n".backtick("$GCCP -DOBJDEP -E 2>&1 >/dev/null @DSQ");
-+  $R.="\n".backtick("$GCCP -DOBJDEP$DIAG -E 2>&1 >/dev/null @DSQ");
- }
- 
- ## die $R;
---- rule.hpp	2013-04-18 12:14:20.385333527 +0200
-+++ rule.hpp	2013-04-18 12:14:35.818870070 +0200
-@@ -88,7 +88,7 @@
-       PR_PNGAuto=15,
-       PR_PNGAutoMaybe=25,
-       PR_PNGAutoBadUnsigned=45,
--      PR_PNGAutoBadSigned=55,
-+      PR_PNGAutoBadSigned=55
-     END_STATIC_ENUM()
-     pr_t Predictor;
- 
diff --git a/media-gfx/scour/Manifest b/media-gfx/scour/Manifest
index de96bad848b5..64b175ae399a 100644
--- a/media-gfx/scour/Manifest
+++ b/media-gfx/scour/Manifest
@@ -3,5 +3,5 @@ DIST scour-0.36.tar.gz 91575 BLAKE2B be65b751151cf939601b6c0dec0613d13be6367f761
 DIST scour-0.37.tar.gz 95478 BLAKE2B f3037b691b110f84266c742ac1212a8069e0ac1260f818610dfecc7ee64a257d9e0772c7c675e4062286cf4b719fe48782c416a0cb85a136ea315b22da58c460 SHA512 ffc9bd33eec038126d781dac50c89e4275d0d5e14ec2b2247a7727af91ac2ffe5522c69b5386f75df67a0b88f8ed62cb6a2ad47d600e55b123d937ba33e9e501
 EBUILD scour-0.35-r1.ebuild 648 BLAKE2B d3dc3dd0b91cd84a4629b7bd388c2fc2afa8823e01f30c01875868d3f92ad93a3acbf34d5d58a69be0314ce47196f3ad3d231e4fa06b6dc287cf61ae7deee252 SHA512 7fead8c52314c1eaf95f8c2b8f8ce58dfeb6ddacf135de160bb540c64ec5458c744acdadc53a8a6c5ea5d0319712a87dc4acc5da47f0b0f05148a9598381bdb5
 EBUILD scour-0.36.ebuild 655 BLAKE2B e28dc63d07ca0e490e24144db10fa3df9e0aabd1080ea6d5884e5a758885f86e17ea2150d90d8340a304d3067479e61ba17e9bb99ac07a3c9c425d59f31c2035 SHA512 2535527237312aa0384c55aadd53fd6ad9b2f6521ad46e369d22de32c072e0e515ab4832851e30b4d6843bb1e4f490211930ee80ee35780e89ac0ef547c5e7c2
-EBUILD scour-0.37.ebuild 663 BLAKE2B 3ae27fd25ded2ec3851ab2bbe575df8c6c39d7092be7cdb46956611a5ea2a80f596198d8cede927652cfe1afb73756f3376ae61ba2cd3ff410f8c0272e6bcb93 SHA512 bc197cf5bf2a39065f4bacbae35f3a7cd58a91384ee5e40f7b9f839618de0a94a152a14a125a424a4623ad1885a733b16f058c53aac10303ef55006285ee4f7d
+EBUILD scour-0.37.ebuild 659 BLAKE2B 7a42a952d1b781987a4d80cbc227570f60a3d19b905bc487acb6e05e1d5adf9503d8d57c44b0a8c473d88599bcd189373a668da80f44a2d6be5504894df52965 SHA512 00a912ea9b6c0a34d8e786c0b99533d2d2e49c0cadee1d20e6a33e25c175307d8f6f1b732f1efd84719ecf4b4e20d593a21e8f5dbac64bc13cfd459e33f3a8b0
 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 8997eb6dcf04..b593461c8fd1 100644
--- a/media-gfx/scour/scour-0.37.ebuild
+++ b/media-gfx/scour/scour-0.37.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/scour-project/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 103f4f8cf221..b6389d9ed2a8 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,5 +1,5 @@
 DIST shotwell-0.30.2.tar.xz 6461648 BLAKE2B d54f34c05dcb092149129977bf59f0434ec4082929e3c87d9b4e774f85b47d73ecce1e80a6a29965194e9791eecb018405b43f082fb8b334c8d012f06a00b817 SHA512 ee74b9d3fbc5b2a5ca87cbc351fa99f6afaec4ce717166f55d79f41f1b039c272ed9028eb3919874f086f934197806738a54f428e790bca50dd8c9af61c21c36
 DIST shotwell-0.30.7.tar.xz 6455860 BLAKE2B 81da055e1092b9aed8c635e3e18e9c4bfa5820bb915c17cbb26942ce627179ed6b158c0785f54a2e15049150c3569035f58916483505449d55a2b3822276c44d SHA512 960574212d622c29d7617b874466e639d5a292eefdd2cac00ebcbf96d7db06002b9423440ee47ed84da7064d3eb70ba388b573a94c9e44c07d3b8f87faf09c58
 EBUILD shotwell-0.30.2.ebuild 1843 BLAKE2B 7b68e790e6d8204788de6392a1493f3777e687b185aa42104192ed57676376aed1690c77d0ca0a1961b0eecf888b0e0432e793da4863189f62f322986da980c2 SHA512 fa8ac278e4de4f1c23e2381250b98cc781ccc1ddb8d9b15b8bf7b9562d16f01eaa6b772a8613db84c397b3870528df7f6f8fa1b590dff13df9ac185068163387
-EBUILD shotwell-0.30.7.ebuild 1763 BLAKE2B 01e3d39505853eeeeb9331825af3acc97eb5e0e5f6a293f503df67c7d0d499d814614a8d821f04f5402614ef8de4a5ea80c2ba4e06609108728513d13d644919 SHA512 674da637aa376f31270d1a7690a610b57f71c6b67770a2c63fbd6a7c8204f30768213525974bd79331063c71f6db21789ee3dde8dd4b4eed2512d856fff45c2d
+EBUILD shotwell-0.30.7.ebuild 1761 BLAKE2B 8bc073102aab336f564897e677f905c3b578c05d29032e7bafcb7554ebdc8a0e9a8f570224f8d19755d68d94e849d104607421541dcba645139c4787d878a8c6 SHA512 935bcfdfe279afdf441302a5695933a1292cde952c328b9278cc55208a879af463fa411df2c413cb66aa187fafd7c35c6acdd1d1eceb961c347a20c5f102fcf0
 MISC metadata.xml 915 BLAKE2B 7f83fe936f9a575c6dd12b014007cd97c5a8ada9aa5e55ddeaddefa4eb05d724a068c81d2f6f41c5b1bae01ed2c4326eb5eba5d4bdccf48619edeb43a8eaabfd SHA512 1b226f7fabfd7f5ee4d82b28ce2998273225319b055c01509cc5e493fdc037941c0edd0099df5dada00228fb225bf5e35d0035d3cd244890ad0cbd929b84d214
diff --git a/media-gfx/shotwell/shotwell-0.30.7.ebuild b/media-gfx/shotwell/shotwell-0.30.7.ebuild
index b5bd37671121..5d15592ff559 100644
--- a/media-gfx/shotwell/shotwell-0.30.7.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="opencv udev"
 
 DEPEND="
diff --git a/media-gfx/sigal/Manifest b/media-gfx/sigal/Manifest
index 89b5cb344a70..462195c1b237 100644
--- a/media-gfx/sigal/Manifest
+++ b/media-gfx/sigal/Manifest
@@ -1,3 +1,3 @@
 DIST sigal-1.3.0.tar.gz 3267422 BLAKE2B 0be6dc6b92c8681e47ad7094004793fe78fd8974075958374268bb55f6d2deb903b5ad858c2603c751f74fd2394c945d3f933b3fb44a8f58b18dcd9a2c1c1236 SHA512 132c94a472301a2cc81a4aef13afa8137a6b69dfc035821e22fca6b0598cb94f1788f1a8cf1b47412214c9480867be816070aaa938290a1d10bccc407c38aaf4
-EBUILD sigal-1.3.0.ebuild 855 BLAKE2B 3a5b4d1e583ee68248dc85718f4163f53a08afdc5e2475d98dadb1df7f6797a44a5b43e22fd94560f14b876008d5b6e7e7426c114caf4a1860de103aae69c56c SHA512 f789d4a14b209ef8a8f4b38a6d573578607ccfacdc17f27783d2eac784737c9c0348b97aa06884184ae204e89b0759036a940963573c885b62e09e214a266a37
+EBUILD sigal-1.3.0.ebuild 882 BLAKE2B cdc6d346ef0f45cf06391536b3ba9e2f42a93ab02e79142e365d6bb314f596977f25800c0b02270cb8979a3b0100319ad4a1463163ca6fab45c9f627051f2b36 SHA512 b24e91c2f1522e999eabd74820d30bbca75cda1ff76c6d1f768e760d01777c6ace79364c5bcb80f0af6c34624ca88b2bea14697b8b1ddfc183c1308cb87e9fe0
 MISC metadata.xml 1062 BLAKE2B 2997924c7ffdf6ddf3afd6b8d55ab426c7701eb3beb3c566f870507730f99ddd4875621029e078d7f1db16d582de448257701ff7c6325169fafb71a15e9e2304 SHA512 d49289c1dbd612fe88b6ef3d883b073c4b2985839decd5d3b9d73a3c24e0aa83e37890068be8e127ad1f88f86b9b37f7f2f61299c431b3a21b6219f2671a73d3
diff --git a/media-gfx/sigal/sigal-1.3.0.ebuild b/media-gfx/sigal/sigal-1.3.0.ebuild
index ba6b0dd74075..aaa65952a903 100644
--- a/media-gfx/sigal/sigal-1.3.0.ebuild
+++ b/media-gfx/sigal/sigal-1.3.0.ebuild
@@ -14,6 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="s3 test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="dev-python/blinker[${PYTHON_USEDEP}]
 	dev-python/click[${PYTHON_USEDEP}]
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 2b3088c8972c..b246fc9209ac 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -3,5 +3,5 @@ AUX simple-scan-3.32.2-unasigned-variable.patch 1294 BLAKE2B 7e513d96237872f5afc
 DIST simple-scan-3.30.2.tar.xz 512540 BLAKE2B 908af68fbd297e2cc0c0c5440166ebc706f6c0a1a88948e9cdfe30a2e9e548125b31e6a00684a8a0db8e4c37c9d0930765b74e2ba9e1d540e4ae705cfd404349 SHA512 3a4d19bd36a88124ba43d388807afd1d6a51fc691ed83570a095e3b9719b5db5f3eb457a41bc8e36f2f1bf25ff4ab83edc150d4cdddd0d528e9280ea2da6cdb6
 DIST simple-scan-3.32.2.tar.xz 790800 BLAKE2B 98e502cbc280285dbe20a0c843d5f8d8b38707e973f2ba6aba2ccef9d739165371f5f30d7d6658853c5a6a280ba2919a98acd02b4757b4e881f96d5a7b53449b SHA512 10322ae72461efe43a4e230443c3aca24aff6f0cab07750c6eab9ebb718889e51d8c77ff722c337f333a8952ac84f69d03ad88eedfd4432ef11f7c7493170e14
 EBUILD simple-scan-3.30.2.ebuild 1411 BLAKE2B 336efc46f57cc33f3522ea53a381a40aae08389ab0902d93b23ed5055bd648bf68d1b747e1d8df525f34da59fde2973e2a87f3aef8d4449c4e1d51b6036fc967 SHA512 c45ea9e8396fd2f216e0c7479691f43d6a8aad37a23ce260ec9974a991e30bc4d7d8a781970948fc87047e317f01a952a5fe4e5506562012b71d5e209479724f
-EBUILD simple-scan-3.32.2.ebuild 1528 BLAKE2B 3ace2c7fbe21c9c24f9937942613d7cafc23c2027bba6f5a25bfe2bd6aef100a3739e49aea0d35cf7a00f44b7f0c709571581ceeeda216d6f4f3938c5fd35c3d SHA512 be19bd803d7e3eb315212c2bf4ae7cffd8f4f714e670c7099a56ba0689497eacfd011b498e655ad6ee4e3e729def0e5cb4c5de4ac14bd1e3c27cbabebaaac3a6
+EBUILD simple-scan-3.32.2.ebuild 1526 BLAKE2B 759f8334d42a2296fceb82b2a3dd7268ea2d650247e31e72266ed34073dcc2686ab162cece76d75ff6de9239c947e1bee3b9b214b88b053b6f04971cd99a4859 SHA512 bc3b9c5722eb613e4325f21c47e0fbd23b0cb6cde2180a938dc7630e63438e37362054e3342024a3cb0af68144b00213261a13074929c076d6943503988f0813
 MISC metadata.xml 616 BLAKE2B 576d986402f8cc708eae60f661640808751747c764d5fe729dd014f33758e0b484a2b80a214d9a3d1ed4bce7e455e34803a62048240e5de8e203184446cdc0df SHA512 6377cb9c20b1ce2db22ba959d386e4389939b72503d87da956d659144b8a6f8b521abdd19dd4c82ac0cb32e260ce6633b75136a353f63b86593f5e1f12394d47
diff --git a/media-gfx/simple-scan/simple-scan-3.32.2.ebuild b/media-gfx/simple-scan/simple-scan-3.32.2.ebuild
index 2c9045ad83f2..79bbc6ac4fd0 100644
--- a/media-gfx/simple-scan/simple-scan-3.32.2.ebuild
+++ b/media-gfx/simple-scan/simple-scan-3.32.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE="colord webp" # packagekit
 
 COMMON_DEPEND="
diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index 6bdd256ccfd1..73a5573a7839 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -4,7 +4,7 @@ AUX slic3r-1.3.0-no-locallib.patch 15462 BLAKE2B 0fd73fbf341573392ebdab3c4d010e1
 AUX slic3r-9999-no-locallib.patch 15462 BLAKE2B 0fd73fbf341573392ebdab3c4d010e1a11cbf424ded6b5b6fab18c05ffde049a8816c2884a06acdbacf0f41ed30b4d136a849eb6bf92e5fb72591e6e0081592d SHA512 cdf791f721ab3a2356631ee9c74c796c48626c8313dd31dab59e880ab181734e892fa341bbb1a648d35303f4fb4a8e3c4615d360c317438876f67de1ef9f9187
 DIST slic3r-1.1.7.tar.gz 2079200 BLAKE2B b3aa45741bb92a75dd09be783cb9a8cd551c7736f04022905d11587d8b2a533db85c1f88a9d0185b2b6414ba56d44e0feb104bcfcaf52a0a35a1db912c6976db SHA512 0c3a12890f57f422084b20152ede3467a8624db4ba8be774258df0af963c1f6f41fda7d96967f6355bd95727539e6aad51c30cf45284a7ee3fff294839acc650
 DIST slic3r-1.3.0.tar.gz 2104094 BLAKE2B 74c58690cf196f89ecff5eec853215c87c648df5a504725fea9f14b0343bca105190de1d63e2e8e76d47fcaf8dbe7b6d26f61b304ce7336412effa1c9a3fba41 SHA512 ff0f7747e166826ff1c53220974ee9d3a217d0e19964dbe4a5fa3e81f262a6810a47632686b7f1b3128384ae05c6f98d8aab980524079bdf9811445fe23a0f0d
-EBUILD slic3r-1.1.7.ebuild 2907 BLAKE2B 6075bf46ffd1f42fd6246107aad4b7c9c50a9332429164bf4d42a158a34158b71ae7a9132007aa7dee9d005177b0e3d3444cf6bb76bf81d44f99b4d669293b5d SHA512 7ebf691df256f4718ec3fd7c30605d8b10bb5abfed45bade71555fd6fe852f353ab7ed9ca25ffeeeb81154a291adb77ec416dc3a19c3a3927ba89c826b6f8c1c
-EBUILD slic3r-1.3.0-r1.ebuild 2858 BLAKE2B 0f9e3bf1b0cda1b34587f7230a369a7e23ced0c961793ac73995c5f25fe687e12ea635caa630beffdf4738fc104c947729aaab25dfa2dbf53fc7a8d64cebd8e7 SHA512 dda4ff6df826b4db481fcc226720fab6582cc8dc4660013ccc3718ba225a10fd2cd7a13024a57ac3cbfe6144c0e0044ced0b90853b7f3f7e28d4f89e1e9abf4e
-EBUILD slic3r-9999.ebuild 2619 BLAKE2B a15c36937ef599cbe0135c69296ecd57b0fb9fcce0ca8e598993a108454a29035a6801de0aabbabf64e8ec515afc909eaa5337bedbe01defb718374a3c638243 SHA512 4c4bbf15cbbe25111ad29dad2204f7b51ca59485ae2b5b746406345581157f40e4cf1b5143c368184fdc847d2af8131915be933214356af92903374cb0e86c29
+EBUILD slic3r-1.1.7.ebuild 2934 BLAKE2B 12740144adbadb8ef668003b7c1391b5e124208d02a5f9fe89d17a95e2ced01c04421f985b2aca1e3ddb4df34e7fdedc71af3d0e8dcbc76d85805fcc7c030b2a SHA512 b6b2c92e011e473cdd4934ae43e0ab32556fee66008bab3a397a2ac2f9b78d747eca30a4b794d3955d04f040e260fb5857ebbd6ab08250f611eb76f3faa1c623
+EBUILD slic3r-1.3.0-r1.ebuild 2885 BLAKE2B ef50ccee25ce363aea8b5a678e9e0d3e49182739c71311dcc1417420ab028663e1f74011b8b710e900710eda870c632f783cbe3428a5f6c786256b41e421b60a SHA512 5cf3b715822f7217b38d2fb8ceef29de8684742b16b27f7ac50aeaf3d7df326373e9ff1f9112b816e5c7728a06ebd49292b4376f948671940e6b1577078fe177
+EBUILD slic3r-9999.ebuild 2646 BLAKE2B 69887be58dbafebdf1c1eb52c22db40ab4bce885634fc457d4c0ffdc3de64d378bcf8f68081e0f77ffcedb03cb2d2a3bc93101aebff24cee5d58acea2636cf07 SHA512 cc71f52231dfe4c8b10d49d232ef249b8a32ad9ec63db6d943d2ee8b2bc0b0ba028339cdc463c93e95a4d34501e8adf277f3e13f0de69940d6f50c8e6dcdd4b3
 MISC metadata.xml 861 BLAKE2B 91af33b7f79333028a2c77b24a4e910b93693a8aeec0e260405df9930489e4cadd3a4cf12f66e1b3b90a84113deb1c30108a7cdc000ef2097559871552385cfb SHA512 203b7d367c4eb6ff4b88fc304dac879277a2b515ed349d495d4231bbd3b097172f20a98fe4bb396b92114a78e7db3e56c2bfb3256e7ff94dfaded9e36696c6a8
diff --git a/media-gfx/slic3r/slic3r-1.1.7.ebuild b/media-gfx/slic3r/slic3r-1.1.7.ebuild
index 6750210520c6..f144a2980def 100644
--- a/media-gfx/slic3r/slic3r-1.1.7.ebuild
+++ b/media-gfx/slic3r/slic3r-1.1.7.ebuild
@@ -13,6 +13,7 @@ LICENSE="AGPL-3 CC-BY-3.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+gui test"
+RESTRICT="!test? ( test )"
 
 # check Build.PL for dependencies
 RDEPEND="!=dev-lang/perl-5.16*
diff --git a/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild b/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild
index 556d06e66281..67feefd30fac 100644
--- a/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild
+++ b/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild
@@ -13,6 +13,7 @@ LICENSE="AGPL-3 CC-BY-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+gui test"
+RESTRICT="!test? ( test )"
 
 # check Build.PL for dependencies
 RDEPEND="!=dev-lang/perl-5.16*
diff --git a/media-gfx/slic3r/slic3r-9999.ebuild b/media-gfx/slic3r/slic3r-9999.ebuild
index e5b72c099430..d4bc4f6a67a5 100644
--- a/media-gfx/slic3r/slic3r-9999.ebuild
+++ b/media-gfx/slic3r/slic3r-9999.ebuild
@@ -14,6 +14,7 @@ LICENSE="AGPL-3 CC-BY-3.0"
 SLOT="0"
 KEYWORDS=""
 IUSE="+gui test"
+RESTRICT="!test? ( test )"
 
 # check Build.PL for dependencies
 RDEPEND="!=dev-lang/perl-5.16*
diff --git a/media-gfx/tif22pnm/Manifest b/media-gfx/tif22pnm/Manifest
index 2ca28127b0c7..96fb43210047 100644
--- a/media-gfx/tif22pnm/Manifest
+++ b/media-gfx/tif22pnm/Manifest
@@ -1,5 +1,5 @@
-AUX tif22pnm-0.14-gentoo.patch 982 BLAKE2B c93efa7afaabec8ccb85e645f5c1dce43894cb09cbc10db3baf3c0eb56bd16d88a8564e2cf47846d209c2fa90e4c0fd63bec0b59db5b7424462a2b3e923fb06b SHA512 05a6dfb601689422aba875d0fac29f36e0bc2d4f27f30491810290e7f6113a1f73cdd5c2f36f171a12e4549944c9a4bdbf82a572988e2a5599cc471d4a8d55e5
+AUX tif22pnm-0.14-gentoo.patch 990 BLAKE2B 03603a6082d3b29f6917b14b8f43890886303d5b88ff602c03fb15d98b4271594677869e5432473f91dfd55062b8d0d459d235b7581908f978d957b3b1a9c54f SHA512 583a43fec6e9152bf7452f693fcd47e611d4eec05cc4073422f895350e6c02b10b914c5ef6edc83ba12ccda8eb16063878dbb0736b14092671bdfb51889459b9
 AUX tif22pnm-0.14-math.patch 760 BLAKE2B a5a9b9c30c60fd78bec411925b545c4fe5396c13a7598cd259eed376bbeee3c14ed4b4e19e82282d39a2bc45be35197c0655db897ee2914511da634f1b72eed8 SHA512 616217de0ebb1ef790096d82582508e5b0df1224e2aecd35638205aa9f088683acf7e8d51db060fabcece21976b0f048ac816b361d2240656f3edb262612d6ea
 DIST tif22pnm-0.14.tar.gz 108047 BLAKE2B e6252a9388710950e62c9500fa1578a9a624d4181ff6482f9333b84daf79a9f2d5b62ab6e1cc80b08d96c47b8d401f7fb53afe4523672fe9e0eec38ed2fb4f5a SHA512 0cc09cfca3dcf0de8d3ee50a3d9a061e80a5298f40e7bdc3483f0ec5dfcca419af797fb30c2d97ae7a1d16e3e58d627ae5a3596043eea7ad35a504abab4885f9
-EBUILD tif22pnm-0.14.ebuild 640 BLAKE2B c6c83fcca789c7e4027bd1c598a0f213d6dfe4967a17ac50da7450ccec020dd17a71924289eb075d05d82affa02ad314bc290701580e222b70296cb2d8e5d8a1 SHA512 d5cdf646084172bb6262cebee1cdbab82e7215b61189712f3a031ad21a53f2bb1323d8222c1baf283528dfab0326814707b1dbf343003c959a25b0ea3633edc0
+EBUILD tif22pnm-0.14.ebuild 645 BLAKE2B 7fbb82503b46776c2f56905b8402ae39342c679715c50ecf6149a0a5ffb86b1b3ca54f12c3de12fe4aa50e38a8bfa836420156944b0d3bceb029c68c24571368 SHA512 34ce66eedb1e3dadba3a184cdcb2ed66a7db12695de2dc1a2357fb962845f91b77f4e95d394799c8680701c379b3ed6191617d9d5eca32b8d590e40ecdc5942b
 MISC metadata.xml 324 BLAKE2B f3e99ed0bf3ce49ac6237d9da13e0e1a383691968e749a02e6e7005fcc6f9ca6089c02a0c9cad0ae9a082f126bffd44611b89d55797883420c00e9befd0ee7df SHA512 6d220ad280dc8def147f95477f3b8f23b406d1ad6ec4431329b331f374ca784ad50542e55e02f4afabe60c5785b47a2a0f0fb8e515bb8e8683d30b2a53895e59
diff --git a/media-gfx/tif22pnm/files/tif22pnm-0.14-gentoo.patch b/media-gfx/tif22pnm/files/tif22pnm-0.14-gentoo.patch
index f71c751bd1a5..cc97d68d2322 100644
--- a/media-gfx/tif22pnm/files/tif22pnm-0.14-gentoo.patch
+++ b/media-gfx/tif22pnm/files/tif22pnm-0.14-gentoo.patch
@@ -1,5 +1,5 @@
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -21,7 +21,6 @@
  dnl Checks for programs.
  AC_PROG_CC
@@ -8,8 +8,8 @@
  dnl ^^^ set it to non-empty, so AC_PROG_CXX won't include `-g'
  dnl AC_PROG_CXX
  dnl AC_PTS_PROG_CFLAGS(fs, -fsigned-char)
---- do.sh
-+++ do.sh
+--- a/do.sh
++++ b/do.sh
 @@ -35,8 +35,8 @@
  if [ x"$CMD" != x ]; then echo "Executing: $CMD"; fi
  
diff --git a/media-gfx/tif22pnm/tif22pnm-0.14.ebuild b/media-gfx/tif22pnm/tif22pnm-0.14.ebuild
index fd8bd8740a00..cb5142c6aa6e 100644
--- a/media-gfx/tif22pnm/tif22pnm-0.14.ebuild
+++ b/media-gfx/tif22pnm/tif22pnm-0.14.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit autotools eutils flag-o-matic
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="tif22pnm and png22pnm command-line converters"
 HOMEPAGE="http://pts.szit.bme.hu/ https://code.google.com/p/sam2p/"
@@ -11,19 +12,24 @@ SRC_URI="https://sam2p.googlecode.com/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND=">=media-libs/libpng-1.2:0
-	media-libs/tiff:0"
+RDEPEND="
+	media-libs/libpng:0=
+	media-libs/tiff:0="
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-math.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-math.patch
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_install() {
 	dobin png22pnm tif22pnm
-	dodoc README
+	einstalldocs
 }
diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest
index 32d1f7d26f68..fc17e60bef64 100644
--- a/media-gfx/transfig/Manifest
+++ b/media-gfx/transfig/Manifest
@@ -1,5 +1,5 @@
 DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980
 DIST transfig-3.2.5e-gentoo-patchset.tar.bz2 21130 BLAKE2B 1c07bc7e85fdde29f5e9290bf3c0df75610a7c219f001920b7412d2c104fe1d8d5b2698d91cde1c08f57d4718547c2dffa0aa859bd53a295c55a285ca4f5fbb7 SHA512 4c6ca63159ae58c35c1a9c818bc3b29715a4015e6a11d283b4d0c57c0cfeccbf38160f61f3c91f9bc68f82a8b5676349bb98866f40f617bb95afd73267d00e97
 DIST transfig.3.2.5e.tar.gz 531256 BLAKE2B 830a97cb801b9cb284f7746a7f4a9645263cc34fd35d904288143d730331901302b12223ba135d8fa936f5ca0eeccacd194bbe2e74dfcfbf0cf4aede273ab507 SHA512 ed1379f1112514d90a4b3eecd3222baad311d804b5090e8e66867ec299e4f9a5f8d83ef8939aa6ecaa85a18143b8fb9b97f78e078ac5eeb934a158c55de6bb1e
-EBUILD transfig-3.2.5e.ebuild 2941 BLAKE2B 3f759d189bf7a67cacd0710192879ee03b094d7f04638c7ed86981339f0c79fd00fac734f0fd7cef3133b54821936c817bad65db282287292b50c21d2486e4a1 SHA512 c681938d553ecd9c30ba294a051498c3a8b4535763d148878d9ed9624493f42d478b0531887d6ee5d2accf608ad5932d8429d4ac603de14f16cd48a95921c823
+EBUILD transfig-3.2.5e.ebuild 2934 BLAKE2B e47dc2d05c406714dd5b6567bf11bd798aace725ff04fcdf9812456a3d2e1836e835b4d51dc72ce88e2fe157ebe17c25d5d13ae70252c4a35e1b3a9cb52b995c SHA512 82914a0ed62dca61e1a9869616dc107ac06cec302ff95d91428c5f5aedfd8a063f187e6cd5d8ba5e382b370cdeb43925613ce2edd854a014c78007e578f55e07
 MISC metadata.xml 238 BLAKE2B 60ff9cbe893ace8f33a3d44ee85a5c73c9bd5553478173bf92c4aa93398ae1140ba28673eb6c7373ac48ede6679546b57ea08b8e676ce5c7a47792a2ba8b3148 SHA512 65918555949ddfef068a9a197dffda69aee483ac55c1b52dcf19376aecf1cb53d8a3fc0931d4ebdbe64ba3341e2a2567d56c2830eb31e6746735449c53a1203c
diff --git a/media-gfx/transfig/transfig-3.2.5e.ebuild b/media-gfx/transfig/transfig-3.2.5e.ebuild
index e93b71f45406..268d2795797f 100644
--- a/media-gfx/transfig/transfig-3.2.5e.ebuild
+++ b/media-gfx/transfig/transfig-3.2.5e.ebuild
@@ -81,7 +81,7 @@ src_install() {
 	newins "${WORKDIR}/${P}-gentoo-patchset/transfig-ru_RU.KOI8-R.ps" ru_RU.KOI8-R.ps
 	newins "${WORKDIR}/${P}-gentoo-patchset/transfig-uk_UA.KOI8-U.ps" uk_UA.KOI8-U.ps
 
-	dohtml "${WORKDIR}/fig2mpdf/doc/"* || die
+	dohtml "${WORKDIR}/fig2mpdf/doc/"*
 
 	mv "${ED}"/usr/bin/fig2ps2tex{.sh,} || die #338295
 
diff --git a/media-gfx/tuxpaint-stamps/Manifest b/media-gfx/tuxpaint-stamps/Manifest
index cdfe556ce393..c3d66341d916 100644
--- a/media-gfx/tuxpaint-stamps/Manifest
+++ b/media-gfx/tuxpaint-stamps/Manifest
@@ -1,4 +1,4 @@
 AUX tuxpaint-stamps-20090628-make-382.patch 365 BLAKE2B d427c1867b47fde62f1dfb568240727fbef151fc6af6d45e33b5f83a8c30d0dd4e67ea91ee34af248dc6bbbf1a17d7da876dd848033757cad87d4e84116c351f SHA512 17915d5b7aaf9857a6e15a51a2039b00edd6a9adda27f529a10a5422b37df5e9ec500dd497c6e6df45fdae6617717f90d166fb04d5401d9bfa767e09fea31e49
 DIST tuxpaint-stamps-2009.06.28.tar.gz 48273629 BLAKE2B a9c11b846d60bb4de5bfaa721a24254fb6510bfddeca54f398ebf941f2fd74f546eaf3cdf7cd65932835e2e72993d6627f6247c7dc4a4488d2d2b2174c04455a SHA512 ca059275484bec045c4f2bad414ea5359d2a8812cc1c8d1e11ad8f3b7e63e107c1fccc347291ffe95d81a5192b39198c56d319ef6a0f475fb128d9a2d0e5e027
-EBUILD tuxpaint-stamps-20090628-r1.ebuild 633 BLAKE2B 36c7528a86a293e989957bb3d432a5f7aab727da08b4f68ae885d08fb0c5414ff2edfefacc5fe2c81774cfa57ee4beefe514b22a372ecd0f3892a886ecb13304 SHA512 39ae328455293cf7c484c46559ce8fe40a74f91f68a1d60e959994af94590be034070926e166d3c0a6f85ffa83682459fd14ad8081372585097da49b507d9c7a
+EBUILD tuxpaint-stamps-20090628-r1.ebuild 626 BLAKE2B 4531c55c9a3febee023974ac4386001a779bfd487d367dad37fd58690780345ce46c3a679b270f6554e85817c47e61269bf34140c71dbe89e0f2da0c89e2fd68 SHA512 0cb6a1e8b249ee3970c888c7aae9030746003d177b7f14b8541e4b213e5fc7d5b50abb0a3d278b8c6b180f643b8ee3057338cdd5acfee0d85f752402ba2f614f
 MISC metadata.xml 451 BLAKE2B 65a95d2b7b8d856945f27d0ba716502c266b114aa517908d87feeb6d613dae24dd2dd20f1a268d6592492038408198956f8cdc24488c3eb1e3dbe3484dedfa29 SHA512 5236357c1909fd5a6ce60a110ee8d81297e4f98d69f93c06e4fdda27d34df91693cd5b9f71746f84337a4005c56d95479e7de9684f4fc564a421d3f83af86461
diff --git a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20090628-r1.ebuild b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20090628-r1.ebuild
index d07338e4201e..d235d332f2d0 100644
--- a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20090628-r1.ebuild
+++ b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20090628-r1.ebuild
@@ -24,7 +24,7 @@ src_prepare() {
 }
 
 src_install() {
-	emake PREFIX="${D}/usr" install-all || die
+	emake PREFIX="${D}/usr" install-all
 
 	rm -f docs/COPYING.txt || die
 	dodoc docs/*.txt
diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index b9ebcfbc807d..581da18e0595 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -3,7 +3,9 @@ AUX wings.sh-r1 181 BLAKE2B d892abf053f7f0039e50057869a4a0a26438f7312dca62561fc2
 DIST wings-2.1.5.tar.bz2 2653117 BLAKE2B 10b14e8dd29daf74fd6af9229341296fa457df405542274533df85198d932188c53094afffbc4b09342c29086df02a7e19d4983f1fc912623ea79ae85e9d4067 SHA512 37f363f39d0618550d7814733a4e52c18b52c7d8ee357c76dcf97ae1b530f5b941bddecfba18d63538792dda3ca3013055759595157832e11e017bfe18b34df0
 DIST wings-2.1.6.tar.bz2 2688154 BLAKE2B 9183ac21f3ae58e5c4d248f3ab9e8af89c3838b312aa51f6d625c21cde05b9326156737e449876aa2a0ea8047a9ce75ad433fe1430ff5add2c5b516144ba7244 SHA512 db17ae58f57233a65f9cec43cca41e9d259eb6499229e6ffc1f1acb8e86e18deda7a1ab1075f0948885cc4ca3c075871150efb007bf3e8e8e5a2e77b5b924af7
 DIST wings-2.1.7.tar.bz2 2720764 BLAKE2B b0ba4a1acaee6ea0bcd21cab1eca1a37a0fd3549c2d5551969e71084eb2596a9c7574f0ddc3a86230fccbaf58c3ac87d7061ccfa17047d10e1b8bff096198235 SHA512 6cd2816e22b2326af43f539831d36b32015828c5261c0503ea36cd171dfd8a54eba65165395fbb3f173224d6bb2d3a3015f8f58225c6237c2d5bf56604e72d10
+DIST wings-2.2.5.tar.bz2 3211359 BLAKE2B d5aa7ea337894f18d6b45ff7e68bb35d587da47bf173045d80eb643d748fc64a511db305d1dc164789b06aa34ea47549a04a05564fa615bf01532da294768cd3 SHA512 343fd601a68cccff0151748f151c85635bf57acc01c25fd2ba770f255d65e73a49671c3a84c4433576c1ba3f9e98a2d098a47e3674d4617a07817973bee0136a
 EBUILD wings-2.1.5.ebuild 1227 BLAKE2B 99b1a96187c9ce18f06178f1de1d770553b49a6868df2cdf95fb094706b66ec7eeca4ff1b7bbe53d0d3808f4952fc839e5f6a1cc694bbf5b6ed701ae872e6f8d SHA512 f96956083b40c8dac25b07d5710b6585e83f4de755e872beb6066a821ccadfc4c561ecc0cad8b72b0c9fcbee2479f432533ed6355fbab7a91e6d515b8d62526c
 EBUILD wings-2.1.6.ebuild 1229 BLAKE2B dec57c2c9815bc5f7f1b0d406b04cfcd5b5c2796387fb3f9019b8f6b2c0cb1da375e8a3edb1df864bc3748e39c81c141bc2f6972df82bd3240e0a0cff9f24289 SHA512 dd36fec8555b57509ae7970c98dd644476364f439f798af652796e7edd73ec0fc001abd57f74c99944daa3503d67dc2cd6ed15dc6911702dac67fcfb33f3c091
 EBUILD wings-2.1.7.ebuild 1229 BLAKE2B dec57c2c9815bc5f7f1b0d406b04cfcd5b5c2796387fb3f9019b8f6b2c0cb1da375e8a3edb1df864bc3748e39c81c141bc2f6972df82bd3240e0a0cff9f24289 SHA512 dd36fec8555b57509ae7970c98dd644476364f439f798af652796e7edd73ec0fc001abd57f74c99944daa3503d67dc2cd6ed15dc6911702dac67fcfb33f3c091
+EBUILD wings-2.2.5.ebuild 1034 BLAKE2B 5ad8926041f33e1eaf6dacec8c12acfd5668a4ec9149cb964096e88e921b5e41bc41cee8a7a2c55ee0e5d2948d6fabf887c5483f2fdf46a3c640c894350494bd SHA512 1a2717be399c5ed478e2099a82b0953eac8b4675c2078b5bc7659023df0f6902f6e99c2136682a7faacadcf7dfaf01b74731c9cacbd31d1f69d46fb77ff6fd8f
 MISC metadata.xml 730 BLAKE2B c74a1bbba0f4b98683e0d3d1d5045ffdfc7ea81b6180cd7ee967bb3846f446e5bda5528bec501e7941c076d6bc755cc0fb1b005506203d7ef57ccb15378724bd SHA512 7672ac58e0f7ba153b0a5939cf8e426e8c3f8c97366436340e1bbb65e85a785add4c6394e81e1aade634f58d8751a85ba75cbb1bb57fa822773a632736d96086
diff --git a/media-gfx/wings/wings-2.2.5.ebuild b/media-gfx/wings/wings-2.2.5.ebuild
new file mode 100644
index 000000000000..8ae2e6a7556a
--- /dev/null
+++ b/media-gfx/wings/wings-2.2.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Wings 3D is an advanced subdivision modeler"
+HOMEPAGE="http://www.wings3d.com/"
+SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	|| (
+		<dev-lang/erlang-21[smp,wxwidgets]
+		>dev-lang/erlang-21[wxwidgets]
+	)
+	dev-libs/cl
+	media-libs/glu
+	media-libs/libsdl[opengl]
+	virtual/opengl
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_compile() {
+	export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
+	# Work around parallel make issues
+	# Set ER_LIBS to the top source directory
+	emake vsn.mk
+	for subdir in intl_tools e3d src plugins_src icons; do
+		emake -C ${subdir} opt ERL_LIBS="${S}"
+	done
+	default
+}
+
+src_install() {
+	WINGS_PATH=${ERL_PATH}/${P}
+	dodir ${WINGS_PATH}
+
+	find -name 'Makefile*' -exec rm -f '{}' \;
+
+	insinto ${WINGS_PATH}
+	doins -r e3d ebin icons plugins priv psd shaders src textures tools
+
+	newbin "${FILESDIR}"/wings.sh-r1 wings
+	dodoc AUTHORS README
+}
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 0b5867510540..3357e331ab7c 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,5 +1,5 @@
 AUX zbar-0.10-errors.patch 178 BLAKE2B 588e8d227bf8d7f47346dcc4a9c99ad5b372af5e2788dca09e490473f50b712945b91be16b2a64f99c48019961ce3f9b766e19c22bafee6d6b4ec8f8e3814239 SHA512 0978f9d52bed844448c5a92349806134e4b03bf069307fad2f3944b92b6f1c8dda094574ae4829860263d735ba7d20e71d435308185503634f9e46897479c7f1
 AUX zbar-0.10_p20121015-ImageMagick-7.patch 1135 BLAKE2B 103cfe85d547cd3087a08676abdfd5966b9b4dd32de4c35e1aee144247af8562e6425d65d170fcb98bcb43e0bc18dcd39d4cf3baf46eea4a1c81814a14946bb0 SHA512 c67dee821338d0bbb54b3c4b22a75616e876ad56e5bbcaad856fe16b39ef3e07b7b80dcb6c25023857ebd561c55ac4faab144fa4ead05424df24d5af7c2509dc
 DIST zbar-0.20.1.tar.gz 555199 BLAKE2B f224a2207fa0603da4cc3a0e1d05bc73f3cf0cc9d13c26b3b801d3418f4f6a001b52e468b721552af61f4c8d7357934abd0560c24d3b233107785c69cfe14753 SHA512 21ad9d8fcdecb41bd4b8979366ab8ec6e8eac815f52270b0dc72ce6a126ccef933d048ce8bbe28f46ada5defadf85ba8c97c5c1870c9560a9dab28c585dfaf42
-EBUILD zbar-0.20.1-r1.ebuild 3723 BLAKE2B 4cda360aa4207d10b9f23c6a3f4389f6a5e89ee6ed067ec59f1cf31875ab88b28ffd624e076774aaf425ebbc787de327f345e88b677a20c348cc4cef63be2760 SHA512 3fa329f034162bfac7eb0ef827ac23349eabff32698b147062a5828fad7ac0513ac840300e32757e9be72d373db617235a234c8d360588db2e3e4f8e126fa183
+EBUILD zbar-0.20.1-r1.ebuild 3750 BLAKE2B 259754767901ad0b09db83d38a5ebf7130c5beea96e36a39d2ec30905347f287eff29f558678427d95676c45943c59230f703e3fa8af8fac36d52647d2474586 SHA512 21555d40bd966c9de37cc69fca082cc9bb9cc70733f9b2c4313b6cd52a31bd33dbad8bce4de5b0c820cd8ea22ce36cd4954ee80aa64962385abd1d91f5b321f8
 MISC metadata.xml 353 BLAKE2B 7b2ecbdb282d7be372b33efc762ff91d574edf1f176e65c300a2a1cdab0d9c86a12be1d4c49f48a684237eb265ee7491ef9bebbfd62a6005246031f7271b7e32 SHA512 8547b611ca96a01ec0d6dcd01c61203984af10306223a77071fe9be348d1ca7ceb290c4160ca9eb8ebc04227caa9b9f5bf3d3d436b97f140fc534fbd3236826c
diff --git a/media-gfx/zbar/zbar-0.20.1-r1.ebuild b/media-gfx/zbar/zbar-0.20.1-r1.ebuild
index 1a03d35fa4d5..9a6382e3b61f 100644
--- a/media-gfx/zbar/zbar-0.20.1-r1.ebuild
+++ b/media-gfx/zbar/zbar-0.20.1-r1.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 
 IUSE="graphicsmagick gtk imagemagick java jpeg python qt5 static-libs test +threads v4l X xv"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( X ${PYTHON_REQUIRED_USE} )