gentoo resync : 01.12.2017

59 files changed, 738 insertions, 778 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index d8f54b74f4d6..c57c98e31d2a 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 78466ab96ed8..937c55236c71 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -12,4 +12,4 @@ DIST asymptote-2.32.src.tgz 1794495 SHA256 2035035e02774598312d5588da2685d20fb85
 DIST asymptote-2.41.src.tgz 3516426 SHA256 1d6e7e89fb5293fad7d836fb0477f785a113f689bd71f37a05af18ff0c5eeef0 SHA512 93f737a44b085c2290c4553c765cf49679820e6623bc5b6d0229818409868876275d6f0571abeb76033955fa95ee594e37d10c9901c54755b085e36760fd96cb WHIRLPOOL e75a6a2b4e29c3388f221b86958b6564edb14a46dad014acdc81554e1f0ac6b889c757f5a0626af6fb46783bf02393f73e92d2209080a31d665bc23550714a39
 EBUILD asymptote-2.32.ebuild 4691 BLAKE2B f31cdc95df2396e50e42dffca2c170f51cf1c2987f306e75ff301fab11dcf33bde5a149eb9b938f1ff8f8db08fb70d9523ec42be69f74b998203e02dacdf2d12 SHA512 542341209f454e6c6bb7c38b2efc3075da2a50b2702999e3d5286aec60593264145176b47fca8dad5588e22bc957d069441f2389c074b95619ff2f50dd6ebcf4
 EBUILD asymptote-2.41-r1.ebuild 4668 BLAKE2B 7daaed268e950da059c64b97821b99b357fb1950736dd2709ba42a3781a8dfabf79f182022ec45ebd2e28e1e5f8bb65f5f224bbe736a0fb0467d01831df756cd SHA512 a30db348b7593b896ba32d94a96d079acbb07e32de936c86db27565f33bfa46854f836a98847b635630930385f380406d05abc81f123377c3f96dc97db912c90
-MISC metadata.xml 1151 BLAKE2B 30ac0763f6d38e161b7f4899200a93ba3103c457bfa195700ac4db83c69123dbf5959b29fd463b76b2e3714a7afdb025c5acab25f94e6fc00ae7da1e230e3f5f SHA512 37a7c882ae951dee27c69937621d9385026ec2fb41d771010b48c07cf753fb5233c7edadf1dd937e9f6013c41406c0a3052a1b3d3493d7fa927bc1da9d6d8f3e
+MISC metadata.xml 1105 BLAKE2B 4b7d588a861ed68910f0d5a7b7f5691b3e97b6cf4514c3544c8610c77340797354575b49b70980320e55ecf5ea8188bbe8f6cc8fce55d18dc466f1d0fd83ade3 SHA512 f115ea831900270542ffe545260eda1ed51d321eca5aa7772f336bcc0e0c6471be3cbde2991c3e48ea5b3fbf51b8541b13de850406af15e42c992da0f2ed08ee
diff --git a/media-gfx/asymptote/metadata.xml b/media-gfx/asymptote/metadata.xml
index c700a1d698dd..fee8887be49c 100644
--- a/media-gfx/asymptote/metadata.xml
+++ b/media-gfx/asymptote/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>grozin@gentoo.org</email>
-    <name>Andrey Grozin</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
+	<maintainer type="person">
+		<email>grozin@gentoo.org</email>
+		<name>Andrey Grozin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription lang="en">
 		Asymptote is a powerful descriptive vector graphics language that
 		provides a natural coordinate-based framework for technical drawing.
 		Labels and equations are typeset with LaTeX, for high-quality PostScript
@@ -18,18 +18,12 @@
 		A major advantage of Asymptote over other graphics packages is that it
 		is a programming language, as opposed to just a graphics program.
 	</longdescription>
-  <use>
-    <flag name="boehm-gc">
-			Enables using the Boehm-Demers-Weiser conservative garbage collector
-		</flag>
-    <flag name="sigsegv">
-			Enables using <pkg>dev-libs/libsigsegv</pkg>
-		</flag>
-    <flag name="offscreen">
-			Enables off-screen rendering
-		</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">asymptote</remote-id>
-  </upstream>
+	<use>
+		<flag name="boehm-gc">Enables using the Boehm-Demers-Weiser conservative garbage collector</flag>
+		<flag name="sigsegv">Enables using <pkg>dev-libs/libsigsegv</pkg></flag>
+		<flag name="offscreen">Enables off-screen rendering</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">asymptote</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 332c7918fb3a..cc416f8f43af 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -11,4 +11,4 @@ EBUILD cura-0.15.04.5_rc5.ebuild 1833 BLAKE2B 4fef821e5be9a9fe988822dec762dc7130
 EBUILD cura-2.1.0_beta.ebuild 1404 BLAKE2B 61d3335fc2b73e792bed2bb0e2a891440febe58e1b3bf2c9d5a94f30551ef46f842948f29243318ffc97b1d48da518c957b34ecefc0cade196da414a528b1fac SHA512 061231ebd90d9eafc0c625e137f48145971a44c71a8791b858d78bb2897b53052beece1fab6b306addea222135e5cff62fdfd95307569b8e6cb7655f86b3ebe9
 EBUILD cura-2.3.1.ebuild 1438 BLAKE2B 839702098c13f0e1e5a1ca93b6866bf4934ee5542ef52acc166d990d7e615eee6524c94a7b0b624341342471e2e571560616fb655ccab39137f7397ce3d90d13 SHA512 4f018a8141afe96380643f5c42e232c723fe24a436051d5ea2415cb5c9b3cfdb43a282a923240174cb7c16da4e1b11c719deda36b43727a5119e3a970d5a6dcf
 EBUILD cura-2.6.0.ebuild 1441 BLAKE2B c8ec71e1cff5575da07847fbda2963d623bb1a9ba0ef52ef1c95a9557ee0702a162680d348baa4ef46e9bf5db6995b4cfa98b1462f5d2a2b0bf5841d30c9a017 SHA512 b6323fb0e21608662600bd452413acc07cd8f6ade9c61e3a3e2cbeea675581a7e4a39071898518df846d46fa106753657789bdd2654941e1426a3e3b07f4e43a
-MISC metadata.xml 706 BLAKE2B 65066050bc4c4c02b95fd3306d388d4dc6a3d8988e73ba0dd47b6e24163e399a553f0cc810d9b80564a37c43dfbe3bbd9591201559ab76a2aaa1ca4670a5e05f SHA512 8cb42b546e53619a693473ce322e0cdf7360de149d665ef91497a0a75b275013bab234bd0d2be6ce73855881e0476c1885a898f1eb5d9e3bec461cb04279ccf5
+MISC metadata.xml 646 BLAKE2B 978b7cbc20d1c6b16fea58f6ba1e3b8f1db861121dcbd6e21c82f8b2dcdbafbdf5b43c77ce078edec3bc23bc277e6c0ca050d6d1ed4e16082deeb38883f2f2da SHA512 e7d2855f6e1afa0019ead78e63b7b94f7c262ceb26678c7621c9062d4ed986579ed06a3a255bae0f8f7588f26bb7923e9629d8ed82aab83bd682aa473b4bb238
diff --git a/media-gfx/cura/metadata.xml b/media-gfx/cura/metadata.xml
index f06d3016b3d9..e0588ff0d2ec 100644
--- a/media-gfx/cura/metadata.xml
+++ b/media-gfx/cura/metadata.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>tomboy64@sina.cn</email>
-        <name>Matthew Brewer</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>3dprint@gentoo.org</email>
-        <name>Gentoo 3D Printer Project</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Gentoo Proxy Maintainers Project</name>
-    </maintainer>
+	<maintainer type="person">
+		<email>tomboy64@sina.cn</email>
+		<name>Matthew Brewer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>3dprint@gentoo.org</email>
+		<name>Gentoo 3D Printer Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
 	<use>
 		<flag name="usb">Access 3D printers via USB</flag>
 	</use>
-    <upstream>
+	<upstream>
 		<remote-id type="github">Ultimaker/Cura</remote-id>
-    </upstream>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest
index b2f15faa872a..19d71ce0f1a3 100644
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@@ -7,4 +7,4 @@ EBUILD curaengine-0.15.04.6.ebuild 1023 BLAKE2B a30c9939fecc1e1a58dd91f9e21137cc
 EBUILD curaengine-2.1.0_beta.ebuild 883 BLAKE2B 30fa9f20814894981f4428ae61988dba2486790393a5c3652f251cdd2e35aa0677a8e21edfdbc694697aab948da4a34ae3b39af7e97308fce9273230accf36ad SHA512 2ef7bc68b8e893ef30704fddcf4c0740e9ed74c320313acc9a7f88bfd4346731f2c140a3b2038d833ed9f5d43b2a32df6006c2da9629c887b7b0eab88d56a16f
 EBUILD curaengine-2.3.1.ebuild 883 BLAKE2B 30fa9f20814894981f4428ae61988dba2486790393a5c3652f251cdd2e35aa0677a8e21edfdbc694697aab948da4a34ae3b39af7e97308fce9273230accf36ad SHA512 2ef7bc68b8e893ef30704fddcf4c0740e9ed74c320313acc9a7f88bfd4346731f2c140a3b2038d833ed9f5d43b2a32df6006c2da9629c887b7b0eab88d56a16f
 EBUILD curaengine-2.6.0.ebuild 883 BLAKE2B fc00d7c53904e98a422867a41a5864205d66ff7ef423564226be2eb7bd8f111c41bf8bc8e31b0e937b97305141e4e12b2e4d2bcd51b3b7ee127127d053830660 SHA512 8e29ef18e30c7c3383aabe2bfc98c3eaf2299d83a5824150baacad8a48257873705ce850a9a7cecb5f6669a9fcd15986e1411ad060137713d5253d8df670b623
-MISC metadata.xml 644 BLAKE2B 75e1b10fa9d7fecf60b9be3bed9a6f22d355db1beaff00d874ae1295eefbdc2ec6a8e981b5b51b07b7408486aa0980c2dc7f8ef0f45f60abf1cc1b606a6fb8ab SHA512 cc7f61f00c63d5f6cd9d0d6b6b688a4a59aeb1acd5b1da3ff17fb4550fcb72febdfd2c41f7c8a4c1fa324a171ff1cdb4fd215f33b67558f85c5e2b0159895529
+MISC metadata.xml 584 BLAKE2B de8f551ef73f75fde6a913a906ad9c8030d7567c1b19a21c85c64b2fd59bc9896bcd46aabd27177b09d22af3caefd6a5f8c897c9d75e0b7f0de44d89f57d87fb SHA512 d251db5b89731c9f3ab502140199261172e40ee224c34c0000ccafb121b4d5b4c80e67ea5eeacb3cfe5be97fbf01cf6d2a10916794482437b466d5b8bbc394e6
diff --git a/media-gfx/curaengine/metadata.xml b/media-gfx/curaengine/metadata.xml
index f11feb002f87..befd642b942a 100644
--- a/media-gfx/curaengine/metadata.xml
+++ b/media-gfx/curaengine/metadata.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>tomboy64@sina.cn</email>
-        <name>Matthew Brewer</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>3dprint@gentoo.org</email>
-        <name>Gentoo 3D Printer Project</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Gentoo Proxy Maintainers Project</name>
-    </maintainer>
-    <upstream>
+	<maintainer type="person">
+		<email>tomboy64@sina.cn</email>
+		<name>Matthew Brewer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>3dprint@gentoo.org</email>
+		<name>Gentoo 3D Printer Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
+	<upstream>
 		<remote-id type="github">Ultimaker/CuraEngine</remote-id>
-    </upstream>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/dawn/Manifest b/media-gfx/dawn/Manifest
index 634191bdafd1..2d7752c6cc82 100644
--- a/media-gfx/dawn/Manifest
+++ b/media-gfx/dawn/Manifest
@@ -1,4 +1,4 @@
 AUX dawn-3.90b-no-interactive.patch 5686 BLAKE2B 49631a9c141f218e1edd245305c6688893b507047876b98849746253c21041475a5267617373751f814ad95b9b762cd13294277dbb514c573ac1e3733886baea SHA512 9a2a86fca7d680569b2cba59354b56e89fc2cff6bd6cc8679744f5283a68d9f6e0ac74892529de632efbfa9834cc7743847520fcafd5e82ded1dc73e05a326d4
 DIST dawn_3_90b.tgz 1334732 SHA256 be9461b490a4acfd87152407adbbe423f3735d9f00a88a9573ecaa9db24ac676 SHA512 5ff0b3572442ad1f435d5f894a0f1637efbc8eb3dae4f67dd456ff220a497cc59fe3bdf773cd38a0690d3689e9cda48f49c408ddab56f31efb9c87447d439fea WHIRLPOOL e709e1006fe794c0723d925002bf1125070a873362a0802a9478d075b1be216ff21e9546c30b1918833164520e91dec870c233e7360caf3826053cabdd108b3b
 EBUILD dawn-3.90b.ebuild 1194 BLAKE2B 67ab0c0336f7b837c19e0fa27171d6c65fae5fbced75071309f3adca1434ea7b40efd840641920eafcce3a8f1e100f2dbf106588dfe46a8ecf724053827b1d8b SHA512 ad827620ac42b5fddeea20d3222b342f2a6481cade600ff1e5da5cffb29d5b62a383de5f8322a05c05a2c979fcf69503b70e4412ae96f0c8318582ba1988224e
-MISC metadata.xml 1198 BLAKE2B fbf8917d002c6961af076199d39821f6091c6a6b2a3a2ecb7e9f8e71c3f3c7ab638475b90ac960107dea559c475391a282d6a65e1d8307ad59954c3504db5397 SHA512 20414450116a882a03aca3e26eba467e6b3813eb9a9453e03f7c3ba572ad1264f3530ebad9815f02ea0a7c447b16f621bf4ca4e49eae71d850c3217e39a9f007
+MISC metadata.xml 1190 BLAKE2B 1d73439a17d21cf023760353df3691121b9c563264a7df26c17a04b5d1f56977faefcb9d3e289f494d6cffaa0c97bd4b444c463ff93d2b7217e34acf452e7b70 SHA512 e89f54b6c40745ace97ed1aa0acd4e3d7d7f69ef68883e17f43e9425016b7d883fee48e4d229543d99be1c66c274184f49c091ecc71cdf835a2b64e9016611d6
diff --git a/media-gfx/dawn/metadata.xml b/media-gfx/dawn/metadata.xml
index 0a1f931af8f8..7e014846cf46 100644
--- a/media-gfx/dawn/metadata.xml
+++ b/media-gfx/dawn/metadata.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>sci-physics@gentoo.org</email>
-	<name>Gentoo Physics Project</name>
-</maintainer>
-<longdescription lang="en">
-  Fukui Renderer DAWN (Drawer for Academic WritiNgs) 
-  is a renderer, which reads 3D geometrical data and visualize them.  
-  It is a vectorized 3D PostScript processor with analytical 
-  hidden line/surface removal. 
-  It aims at precise technical drawing of complicated objects.  
-  It performs geometrical hidden line/surface removal and calculates 
-  out all visible parts of the 3D data before drawing.  This drawing 
-  algorithm realizes device-independent technical high quality of
-  vectorized graphics.
-    3D Data files should be generated by a modeler or by hands 
-  separately.  If you use DAWN as a visualizer of, 
-  say, a simulator of physical experiments, 
-  the simulator application itself is recognized as a modeler.
-    An important feature of DAWN is that it has been developed to
-  visualize 3D data generated by a high-energy experimental detector
-  simulator "GEANT4".
-</longdescription>
+	<maintainer type="project">
+		<email>sci-physics@gentoo.org</email>
+		<name>Gentoo Physics Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Fukui Renderer DAWN (Drawer for Academic WritiNgs)
+		is a renderer, which reads 3D geometrical data and visualize them.
+		It is a vectorized 3D PostScript processor with analytical
+		hidden line/surface removal.
+		It aims at precise technical drawing of complicated objects.
+		It performs geometrical hidden line/surface removal and calculates
+		out all visible parts of the 3D data before drawing.  This drawing
+		algorithm realizes device-independent technical high quality of
+		vectorized graphics.
+
+		3D Data files should be generated by a modeler or by hands
+		separately.  If you use DAWN as a visualizer of,
+		say, a simulator of physical experiments,
+		the simulator application itself is recognized as a modeler.
+
+		An important feature of DAWN is that it has been developed to
+		visualize 3D data generated by a high-energy experimental detector
+		simulator "GEANT4".
+	</longdescription>
 </pkgmetadata>
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index a9099d452a59..0d9f74fde61b 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,6 +1,7 @@
 AUX digikam-5.5.0-cmake-3.9.patch 7298 BLAKE2B d4c9085b9d65977dad1932cbd57f132c8aee844827d28dd74b4ab3ce8dea199ce959306f56064f5abe0a6acaad11c2c45f3932444bda79bb72520ab68c240320 SHA512 0a0f33f8b288fc98b95397ff615ab747bb78e35f8b6ed517e814dfebd32dd3f626f0c232d5b45a69bf80c4b548b72932fb376ce2308b0786b196e7fcdeda9b19
+AUX digikam-5.7.0-qt-5.9.3.patch 1137 BLAKE2B bf369d28083de46d11444eea8ddd35ccc1aa8d052bcd48d8da04a14737d404238717cc70eec7681931f46a455f2e1b441fd1851d3df12d19d8f5653fcc9b2847 SHA512 bfd453d6f4212dfd3e2402d0bba73f9498c04264a7199119fe117a9af834aa95bd12ac8cb2df8be063a8120bbfe159d52f96229692ac7258c4128909dbbffe61
 DIST digikam-5.5.0.tar.xz 129499600 SHA256 df9cbf1b8dbfb9235cebc97e77c02fcb1498c5a905c7fd3b9fb42fd7accc6252 SHA512 3c64774916d4804d932009ba3753d387ecf31e9e3d435c580497d3badb6cc3e57ab5ef1a2334a23379d0987d96dd107be4f01adbb63039f4510aa94ac6d71344 WHIRLPOOL e67b444975ad37e939b2f62bba949bcafb41eee2975470daa02e4ffdd62c6c792b6656edf4811daead52fdc1bf064951fbec7b687192e5d5ee542d5d706140be
-DIST digikam-5.7.0.tar.xz 123315064 SHA256 3605ffb5b6e8fbd6b725e5075f74f505d7edee7531789c2882d11df2d20150f5 SHA512 626c9854311c637b994325237f171adce3dba39159fb336dfe95f1de287e2d08a3aaddd611eea87e8018047d331aff252b555c382cfbe1d8e14413c51a3849f4 WHIRLPOOL b452919ce9bcf8ccc8434586ace23b96b68b76f49d7229d418b2dc5883e9646c79fb99ecd660d732b8d96efc3a49b70d218756b09a3f16ef9f7f2b174679be70
+DIST digikam-5.7.0.tar.xz 123315064 BLAKE2B 0879b25e674e39d204038ab629dec36757ae034e3dd7e9a0a3700f9703272c4a972a21c1db5a42c6c294247a1226b1cb9a8b980bb90cdcc12e0cd752459273ef SHA512 626c9854311c637b994325237f171adce3dba39159fb336dfe95f1de287e2d08a3aaddd611eea87e8018047d331aff252b555c382cfbe1d8e14413c51a3849f4
 EBUILD digikam-5.5.0.ebuild 4754 BLAKE2B 15740067a8a2da70baa564d5dbac7af3998c65975dc48938b67c52326ff500fecc35e6d1a7cdaa7e2b75cefca3ab0354d1c45a742b65a6e9bc2f428f6b60dfeb SHA512 19dd72651406bb4f3a899aa2e4e4ea6c650c5b33963bd9c437510c355349baeea89a91e7394868d57f3b73cf24433833428076cf574429dc9224c2799a08ed19
-EBUILD digikam-5.7.0.ebuild 4808 BLAKE2B d041011b2dc676d3ee25cca0345c0faa5c90aec564578d2fa0d0d1ac04e40293312d27313c7674efbf35fddf983bb1923f6693652a5283baae5056d73c3753b2 SHA512 da8fd9cbf5c4100856bd5c0dd161cc1e3dfc1aac6e33807e863a4c35ab14fb037bfc7b8da4cbdfeaf2ea22d803588225def5277fb5d87021f0a89c8609a45de5
+EBUILD digikam-5.7.0-r1.ebuild 4855 BLAKE2B 7f3d5e6002b3daccee31f1c7ab7fe9a57824bdf4f31d50b4319b07e71c5ecbd476f6c6140b84497b4fbc8fa5cfa707d358b0afa69a0883dc9689018e4726321e SHA512 c6836145cc5cc8b69b66da9494ef0d7101a7fd4c9df1779d1bd2a296ae14f9da88384a7fb58e79c56c53d8c731b1b027145e858b6b919642cfb7bdeada0d5954
 MISC metadata.xml 962 BLAKE2B 918fd2665df0b74bfcac369d306bd8989723db59dd436085ba7ad24e640401b8f39d2005674c4ef85c1875d2b31c9603af9b8ee7465b11f94b09ba9c93a6d9f2 SHA512 c8998f630fca57844cb258b42d6d557c7a6c65f8b0b90caf44225b62827e24eeaaa6defdf1334c7b7c80a1132aac96e178fe3b18ab59035534b605aed4665bab
diff --git a/media-gfx/digikam/digikam-5.7.0.ebuild b/media-gfx/digikam/digikam-5.7.0-r1.ebuild
index f5836f87eb1a..62c259e566c2 100644
--- a/media-gfx/digikam/digikam-5.7.0.ebuild
+++ b/media-gfx/digikam/digikam-5.7.0-r1.ebuild
@@ -106,6 +106,8 @@ RDEPEND="${COMMON_DEPEND}
 RESTRICT=test
 # bug 366505
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.9.3.patch" )
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 	kde5_pkg_pretend
diff --git a/media-gfx/digikam/files/digikam-5.7.0-qt-5.9.3.patch b/media-gfx/digikam/files/digikam-5.7.0-qt-5.9.3.patch
new file mode 100644
index 000000000000..7001850cd9c4
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-5.7.0-qt-5.9.3.patch
@@ -0,0 +1,32 @@
+From 855ba5b7d4bc6337234720a72ea824ddd3b32e5b Mon Sep 17 00:00:00 2001
+From: Maik Qualmann <metzpinguin@gmail.com>
+Date: Tue, 28 Nov 2017 21:29:00 +0100
+Subject: try to fix the Qt-5.9.3 empty album problem CCBUGS: 387373
+
+* asturm: Fix build w/ Qt-5.7
+---
+ libs/database/coredb/coredburl.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/libs/database/coredb/coredburl.cpp b/libs/database/coredb/coredburl.cpp
+index 2c0d0eb..b1bdf71 100644
+--- a/libs/database/coredb/coredburl.cpp
++++ b/libs/database/coredb/coredburl.cpp
+@@ -88,8 +88,13 @@ CoreDbUrl CoreDbUrl::fromAlbumAndName(const QString& name,
+                                       const DbEngineParameters& parameters)
+ {
+     CoreDbUrl url;
++    QString path(album);
+     url.setScheme(QLatin1String("digikamalbums"));
+-    url.setPath(QLatin1Char('/') + album + QLatin1Char('/') + name);
++
++    if (path != QLatin1String("/"))
++        path += QLatin1Char('/');
++
++    url.setPath(path + name);
+ 
+     QUrlQuery q(url);
+     q.addQueryItem(QLatin1String("albumRoot"),   albumRoot.adjusted(QUrl::StripTrailingSlash).toLocalFile());
+-- 
+cgit v0.11.2
+
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index b4a5a81de7fe..4d29d12dca69 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -7,4 +7,4 @@ DIST fotoxx-15.05.tar.gz 3573278 SHA256 65567adc86087a3a8acdebcb0f15ec299cf690a8
 EBUILD fotoxx-13.11.1.ebuild 1164 BLAKE2B f08e5c31562fe3d86b21205a0f0b268227c2d97da587f1aa921084f1be8a2b3a47d407a470ffb1b9cbc54164727e127ff8df3a37f646b35117234db843217315 SHA512 4b33c9b0ab25e83ec19b099779c50a2f3748d1b0fbb5183c1ec700f26347809f3a82dac11ef0b8937567514a5fb2e41ac5079cce3b6f36245e2673f2e17557b1
 EBUILD fotoxx-15.04.1.ebuild 1166 BLAKE2B c9a7cf065c5269fad172cf4377e0c238335e9a98129d2b7bfe730a78bdddaa7d236392d0e8757d86a1f4280ebb2362c78b45afdda530c653661c2cd73847fa0e SHA512 515bc431d1fd7c5a46f4eef3443f572406c4122b3533986904a10a71a6955ab2e71a182debd5bb85b5bdd3fbf97e10127cdd827b484a2407040dde3d426c4083
 EBUILD fotoxx-15.05.ebuild 1166 BLAKE2B c9a7cf065c5269fad172cf4377e0c238335e9a98129d2b7bfe730a78bdddaa7d236392d0e8757d86a1f4280ebb2362c78b45afdda530c653661c2cd73847fa0e SHA512 515bc431d1fd7c5a46f4eef3443f572406c4122b3533986904a10a71a6955ab2e71a182debd5bb85b5bdd3fbf97e10127cdd827b484a2407040dde3d426c4083
-MISC metadata.xml 867 BLAKE2B 6634db0862f9f5c6d638292eb4cd59a7cc2d8e4426407fe41ebcec456a2b95b05b401f664bf0a640e75a7e2cd1152cdb18d1b6ca848228bcb58d689b4315ed76 SHA512 179101cc1d0e87a3b6140a21e74727a987ae07d3a22b6765c2eefb92a6d022d082238b39cf3c5ce72e8456ae7d0c1a6e22a1636c8dbfe7a192c5fa1affc2687b
+MISC metadata.xml 852 BLAKE2B 9038d1062982e40363cd1f2e65851702391c0b704e3d8eee90a886b7d7e9bb479a3a8882537032bed300fc13aaf1320536ee0376be01040ab3bba939655b4ca7 SHA512 3cd1fc0f08d9e3e4d547f5b3d3049449ede40a22b41b294dbf2712db97af5d108974b6607380ac4e863770c78d54ada0ff8bdbfaab1e03372da29dbdfcffdfca
diff --git a/media-gfx/fotoxx/metadata.xml b/media-gfx/fotoxx/metadata.xml
index de79489b296c..046fd381d620 100644
--- a/media-gfx/fotoxx/metadata.xml
+++ b/media-gfx/fotoxx/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>grozin@gentoo.org</email>
-    <name>Andrey Grozin</name>
-  </maintainer>
-  <longdescription lang="en">
-	  Navigate a large image collection using a thumbnail browser.
-	  Import camera RAW files and edit with 16-bit color.
-	  Save edited images as TIFF-8/16, PNG or JPEG with adjustable compression.
-	  Edit the whole image or a selected area, with adjustable edge-blending.
-	  Edit functions have live feedback using the full window.
-	  Undo/redo up to 99 edits. Add tags, dates, and star-ratings to images
-	  and search using these criteria and (wildcard) file names.
-	  Fotoxx does not use filters, layers, and masks - the edit functions work directly on the image.
+	<maintainer type="person">
+		<email>grozin@gentoo.org</email>
+		<name>Andrey Grozin</name>
+	</maintainer>
+	<longdescription lang="en">
+		Navigate a large image collection using a thumbnail browser.
+		Import camera RAW files and edit with 16-bit color.
+		Save edited images as TIFF-8/16, PNG or JPEG with adjustable compression.
+		Edit the whole image or a selected area, with adjustable edge-blending.
+		Edit functions have live feedback using the full window.
+		Undo/redo up to 99 edits. Add tags, dates, and star-ratings to images
+		and search using these criteria and (wildcard) file names.
+		Fotoxx does not use filters, layers, and masks - the edit functions work directly on the image.
 	</longdescription>
 </pkgmetadata>
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 7df69418ab29..3e6e02e88a5b 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,11 +1,4 @@
-AUX geeqie-1.2.2-fix_keywords_gtk3.patch 477 BLAKE2B 505cdf973143356cc33258ffeeddf82561d63175b077f9838191c2c43567286181a6c2f26d2dfec1fc10089150640fb23f64c1c28efb68f9ceaaf7ba119eea31 SHA512 adcda745352c62cbc811238229aeacd8e0016c17367d60ce7571a21e9891270a5506c247b8b8adb602a655d32619cb118fb29ed85edeccddec0949600c936b3f
-AUX geeqie-1.2.3-fix_keywords_gtk3.patch 3168 BLAKE2B ce20e3c613d32096c4280d85cf6f3b9386a081a10acaf3914634c8e9a8b3255c74873adefad9690a26b32b75e4762bd8fcfa4b8d75f7f6d9f193e4cfeb8e7398 SHA512 76214c6ce36c20f8af6daba22e4ea7d5021c4e5efd544298e25e7383918c94ab47cf7ce33768bf34eb7f1b319e46ad1100d3e34dd902a32234c01ea53be8be4f
 AUX geeqie-1.3-stdstring.patch 2247 BLAKE2B 4569351aff9f524c17b9ad08634406e21d6e1b88921e12e320f5a618665aad9287b05d4d16d90f3a701fb7de73514005dfd5bf7d09e87313a97cc594849a9b2b SHA512 f26122a1419f795393174340f0e4a5b341d8341664840347730a8b19b1956d4c684b6a5a5183357250364a040eacc18267aab272789ac65ece9ece56d6b2dadf
-DIST geeqie-1.2.2.tar.xz 1156616 SHA256 e1cbc403650730e2f4092159e4347c858d3d81e4374d2a51d635234ba90b3ee3 SHA512 0e134802b42061e76ec2f2d9069ab13ebcab17f889b04917e15aba74a208a4c4ffa5a957f45eb5bd14917d98d2d6250c1085cb065a1ae487050e5e2f325c14c4 WHIRLPOOL 78e960d2e551675b6474d30cfb0119177e14d1930a23b930c5b7ef7757092085db423713be495a4fcb51112c293eb88b12fe511b5b4bf64c86c27b8e410cb318
-DIST geeqie-1.2.3.tar.xz 1129804 SHA256 2629bf33a9070fad4804b1ef051c3bf8a8fdad3bba4e6188dc20588185003248 SHA512 1bb2a6e5782cdafb4aeb1ab9247f7d43f4ef341594ea795214c136ba1fe416cf8bc37faa43462780eca3d0b07a7852e27719f8d23c8bdb42c899857846b4f7b1 WHIRLPOOL 8b4ee7218bb1562695c5c5322e684652f9318f04ed77bc0a54e70dd46f63801a7f0cc9c9b37346a58f6c1059278c07f980dec439dd753f2f87ce7f2a98e01566
-DIST geeqie-1.3.tar.xz 1141820 SHA256 4b6f566dd1a8badac68c4353c7dd0f4de17f8627b85a7a70d5eb1ae3b540ec3f SHA512 b17c4174741acd60261af268f0e9290ee3d7766d18fc0d28ada5730bb50651a6261d0b04b9fbe810d323c8e6a1b5a21a4f1ebf0eb88daf95f123b77b8484e718 WHIRLPOOL 8b3e54ae6cf8f8a633225df4f5058c29a7dd56adc63c9594cb995929d4cebb3b07d76a257a454506330f32673ac9a57ce63eb3fbf33126ed4cbccc7542910720
-EBUILD geeqie-1.2.2-r2.ebuild 1785 BLAKE2B 5e0ab155ce1d941cadd0373650124b30263c8feca2b67b817860f5661164e1aa06a11b25f6e2861b5722db0a329fd240aae0c67a597a2a72bb6e46ce5cb0e04f SHA512 8703001eea8161e35965a9e414983aa1b493efae3edbe6b8b6fed2d221e7df72ed299c393b1072f1deb1ddfe3f5703f638916bbcca63862a765aa6d7d2648f87
-EBUILD geeqie-1.2.3-r1.ebuild 1781 BLAKE2B 7930b651a8102df97dc2dc00bfc17233ff0a297d5fd8a13ba6936d830d8a17631aa45a3fed868c33fa60fc5b6560e95859daadb1301896058190198a75454cea SHA512 425e3cdad548f852c470e3758cbc66be3e53ac47b543c190d8f24c7f60b682211afc6f278738d21e534569da9bc3ce23237b1fdae60bfb635d597d678312c1dc
-EBUILD geeqie-1.3-r1.ebuild 1942 BLAKE2B bafa7e6f73b0b706c6127528d7bd0cd95ab2b171d21263509e18d6a892a5ce395b05e5a734f93590918858fdfda0c79d889f12482df6e6835cf7be4b88bcf10f SHA512 3d453cb523f5b2cbb72fee0d0d80fe3d1ca014f5d4f9b71b78b16a9c2f9098d4d206b37aff72afc9f0dcc93e462a65016ca0d3a602c6f3736db01e006b6ed0c3
-EBUILD geeqie-1.3.ebuild 1931 BLAKE2B 6953c1e65d14c434e432dd2cfe95c05418b458da4873f7074e7cf0e7e8e9a5f9fe3d955a570c58a548065296b72a0d0b794e87ddea0d37a09929cce246696716 SHA512 3c7751b1a5c6f46b2e9857be84a398ac8d76c73a8708c082da7c34440ab87af5a570295c009de46ceca8f9f83efc1f86f370d007589bf107d64adec1da5606d1
+DIST geeqie-1.3.tar.xz 1141820 BLAKE2B 7a8639a136797c85d1bf96567ed0cae74c5cd0dacb8fac4832ffcb31ead372ac100948f9b65332d749500327c6ec3e7cb195da15980eaf0771ca6b55879dd8e4 SHA512 b17c4174741acd60261af268f0e9290ee3d7766d18fc0d28ada5730bb50651a6261d0b04b9fbe810d323c8e6a1b5a21a4f1ebf0eb88daf95f123b77b8484e718
+EBUILD geeqie-1.3-r1.ebuild 1941 BLAKE2B 2ac0dfaa649219e597b6128fd65cc435edb9fb90f6e1c44defa821f9c282b18c208a3553d11dba175b69806f674b9baa0c2348dd7988971adbeb14d43d521e50 SHA512 9116a91a9459f59c9dab49bfd40b29f57ad042ae740d29809cfd55b6df829c73327ef28e1c8a69cee3b14fee2962edc5b002f2f26adb8c0d72ea1f61c17dc91b
 MISC metadata.xml 806 BLAKE2B bdab12aff9617fbcdc5e5e9be5b22d1d48b4a41691375c9a3af8bee2e3c10a511cb9aaf0144a1df2d0988ed9185d36699b45a04e397b532e9ca98ec1a7863ee7 SHA512 f5d2929460a639de62f06abf298d4817ffbf9550892b4ad0eccbb9bb8fbffeb5e399c9184bb1d1367090135af329d36807bf1f7497ec5af77201da631a5f91d4
diff --git a/media-gfx/geeqie/files/geeqie-1.2.2-fix_keywords_gtk3.patch b/media-gfx/geeqie/files/geeqie-1.2.2-fix_keywords_gtk3.patch
deleted file mode 100644
index 99bc10d9b57f..000000000000
--- a/media-gfx/geeqie/files/geeqie-1.2.2-fix_keywords_gtk3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/bar_keywords.c	2015-05-23 14:20:43.000000000 +0200
-+++ b/src/bar_keywords.c	2015-12-30 00:34:21.453531792 +0100
-@@ -1295,6 +1295,9 @@
- 	g_object_set_data(G_OBJECT(pkd->widget), "pane_data", pkd);
- 	g_signal_connect(G_OBJECT(pkd->widget), "destroy",
- 			 G_CALLBACK(bar_pane_keywords_destroy), pkd);
-+#if GTK_CHECK_VERSION(3,0,0)
-+	gtk_widget_set_size_request(pkd->widget, -1, 400);
-+#endif
- 	gtk_widget_show(hbox);
- 
- 	scrolled = gtk_scrolled_window_new(NULL, NULL);
diff --git a/media-gfx/geeqie/files/geeqie-1.2.3-fix_keywords_gtk3.patch b/media-gfx/geeqie/files/geeqie-1.2.3-fix_keywords_gtk3.patch
deleted file mode 100644
index 695effaffaef..000000000000
--- a/media-gfx/geeqie/files/geeqie-1.2.3-fix_keywords_gtk3.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From a174e816ae993e7ee9731651b2674dbfdec9ed95 Mon Sep 17 00:00:00 2001
-From: Colin Clark <cclark@mcb.net>
-Date: Wed, 30 Mar 2016 15:36:32 +0100
-Subject: [PATCH] Bug fix #227 + enable user to set height of Keywords pane
-
-Bug #227 Keywords section of Info sidebar doesn't work on GTK3 build
-https://sourceforge.net/p/geeqie/bugs/227/
-
-Permit the user to set the height of the Keywords pane in the Info
-sidebar by editing the line:
-
-<pane_keywords id = "keywords" title = "Keywords" expanded = "true" key
-= "Xmp.dc.subject" height = "200"/>
-
-in the configuration file geeqierc.xml
----
- src/bar_keywords.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/bar_keywords.c b/src/bar_keywords.c
-index f58f348..0eee90c 100644
---- a/src/bar_keywords.c
-+++ b/src/bar_keywords.c
-@@ -113,6 +113,7 @@ struct _PaneKeywordsData
- 	guint idle_id; /* event source id */
- 	FileData *fd;
- 	gchar *key;
-+	gint height;
- };
- 
- typedef struct _ConfDialogData ConfDialogData;
-@@ -249,6 +250,7 @@ static void bar_pane_keywords_write_config(GtkWidget *pane, GString *outstr, gin
- 	write_char_option(outstr, indent, "title", gtk_label_get_text(GTK_LABEL(pkd->pane.title)));
- 	WRITE_BOOL(pkd->pane, expanded);
- 	WRITE_CHAR(*pkd, key);
-+	WRITE_INT(*pkd, height);
- 	WRITE_STRING("/>");
- }
- 
-@@ -1263,7 +1265,7 @@ static void bar_pane_keywords_destroy(GtkWidget *widget, gpointer data)
- }
- 
- 
--static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, const gchar *key, gboolean expanded)
-+static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, const gchar *key, gboolean expanded, gint height)
- {
- 	PaneKeywordsData *pkd;
- 	GtkWidget *hbox;
-@@ -1285,6 +1287,7 @@ static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, con
- 
- 	pkd->pane.expanded = expanded;
- 
-+	pkd->height = height;
- 	pkd->key = g_strdup(key);
- 
- 	pkd->expand_checked = TRUE;
-@@ -1295,6 +1298,7 @@ static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, con
- 	g_object_set_data(G_OBJECT(pkd->widget), "pane_data", pkd);
- 	g_signal_connect(G_OBJECT(pkd->widget), "destroy",
- 			 G_CALLBACK(bar_pane_keywords_destroy), pkd);
-+	gtk_widget_set_size_request(pkd->widget, -1, height);
- 	gtk_widget_show(hbox);
- 
- 	scrolled = gtk_scrolled_window_new(NULL, NULL);
-@@ -1417,6 +1421,7 @@ GtkWidget *bar_pane_keywords_new_from_config(const gchar **attribute_names, cons
- 	gchar *title = NULL;
- 	gchar *key = g_strdup(COMMENT_KEY);
- 	gboolean expanded = TRUE;
-+	gint height = 200;
- 	GtkWidget *ret;
- 
- 	while (*attribute_names)
-@@ -1428,13 +1433,14 @@ GtkWidget *bar_pane_keywords_new_from_config(const gchar **attribute_names, cons
- 		if (READ_CHAR_FULL("title", title)) continue;
- 		if (READ_CHAR_FULL("key", key)) continue;
- 		if (READ_BOOL_FULL("expanded", expanded)) continue;
-+		if (READ_INT_FULL("height", height)) continue;
- 
- 
- 		log_printf("unknown attribute %s = %s\n", option, value);
- 		}
- 
- 	bar_pane_translate_title(PANE_KEYWORDS, id, &title);
--	ret = bar_pane_keywords_new(id, title, key, expanded);
-+	ret = bar_pane_keywords_new(id, title, key, expanded, height);
- 	g_free(id);
- 	g_free(title);
- 	g_free(key);
diff --git a/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild b/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild
deleted file mode 100644
index de6fb6131af3..000000000000
--- a/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-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 gtk3 jpeg lcms lirc lua tiff xmp"
-
-RDEPEND="gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	virtual/libintl
-	doc? ( app-text/gnome-doc-utils )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	lirc? ( app-misc/lirc )
-	lua? ( >=dev-lang/lua-5.1:= )
-	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
-	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )
-	tiff? ( media-libs/tiff:0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix_keywords_gtk3.patch
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	# clutter does not compile, gps depends on clutter
-	local myconf="--disable-dependency-tracking
-		--with-readmedir=/usr/share/doc/${PF}
-		--disable-clutter
-		--disable-gps
-		$(use_enable debug debug-log)
-		$(use_enable gtk3)
-		$(use_enable jpeg)
-		$(use_enable lcms)
-		$(use_enable lua)
-		$(use_enable lirc)
-		$(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
-}
-
-pkg_postinst() {
-	elog "Some plugins may require additional packages"
-	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
-	elog "- RAW images plugin: media-gfx/ufraw"
-}
diff --git a/media-gfx/geeqie/geeqie-1.2.3-r1.ebuild b/media-gfx/geeqie/geeqie-1.2.3-r1.ebuild
deleted file mode 100644
index 947373854fe5..000000000000
--- a/media-gfx/geeqie/geeqie-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-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 gtk3 jpeg lcms lirc lua tiff xmp"
-
-RDEPEND="gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	virtual/libintl
-	doc? ( app-text/gnome-doc-utils )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	lirc? ( app-misc/lirc )
-	lua? ( >=dev-lang/lua-5.1:= )
-	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
-	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )
-	tiff? ( media-libs/tiff:0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix_keywords_gtk3.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# clutter does not compile, gps depends on clutter
-	local myconf="--disable-dependency-tracking
-		--with-readmedir=/usr/share/doc/${PF}
-		--disable-clutter
-		--disable-gps
-		$(use_enable debug debug-log)
-		$(use_enable gtk3)
-		$(use_enable jpeg)
-		$(use_enable lcms)
-		$(use_enable lua)
-		$(use_enable lirc)
-		$(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
-}
-
-pkg_postinst() {
-	elog "Some plugins may require additional packages"
-	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
-	elog "- RAW images plugin: media-gfx/ufraw"
-}
diff --git a/media-gfx/geeqie/geeqie-1.3-r1.ebuild b/media-gfx/geeqie/geeqie-1.3-r1.ebuild
index 285783cea80b..dd9b8e0511a4 100644
--- a/media-gfx/geeqie/geeqie-1.3-r1.ebuild
+++ b/media-gfx/geeqie/geeqie-1.3-r1.ebuild
@@ -10,7 +10,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 gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp"
 
 RDEPEND="gtk3? ( x11-libs/gtk+:3 )
diff --git a/media-gfx/geeqie/geeqie-1.3.ebuild b/media-gfx/geeqie/geeqie-1.3.ebuild
deleted file mode 100644
index c9e69adfdcac..000000000000
--- a/media-gfx/geeqie/geeqie-1.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-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 gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp"
-
-RDEPEND="gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	virtual/libintl
-	doc? ( app-text/gnome-doc-utils )
-	gpu-accel? ( media-libs/clutter-gtk )
-	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 )
-	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
-	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )
-	tiff? ( media-libs/tiff:0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-REQUIRED_USE="gpu-accel? ( gtk3 )
-	map? ( gpu-accel )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-stdstring.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# clutter does not compile, gps depends on clutter
-	local myconf="--disable-dependency-tracking
-		--with-readmedir=/usr/share/doc/${PF}
-		$(use_enable debug debug-log)
-		$(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
-}
-
-pkg_postinst() {
-	elog "Some plugins may require additional packages"
-	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
-	elog "- RAW images plugin: media-gfx/ufraw"
-}
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 5eb4f86f5c9d..3a5114094723 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -5,4 +5,4 @@ DIST graphviz-2.38.0.tar.gz 25848858 SHA256 81aa238d9d4a010afa73a9d2a704fc3221c7
 DIST graphviz-2.40.1.tar.gz 25633455 SHA256 ca5218fade0204d59947126c38439f432853543b0818d9d728c589dfe7f3a421 SHA512 a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5 WHIRLPOOL 0ff4a23cf8c3e0bcbf12776d65ea0aa538050286d6b25bcc3707c7c1ad2d0f8c282239f57bfc0c3795bccf276e9d6627d77ed2920781008a2558af126787a72c
 EBUILD graphviz-2.38.0-r1.ebuild 7839 BLAKE2B 61404cd98cf30d6944452387eac4d1af61af871637cdb885e15505c8ca68f119b9d3998d4cffdf74473ba02499e46bb5780630751266e2ea0898e30fe8f09f0b SHA512 5033b119a945305cf1535b64a6fea92a1be164d23aa8413b69dafc46f6dea2058f843b63776c13c175101840d4648cf56c9b9dade6c0bd6b443dbb1c8c20fb89
 EBUILD graphviz-2.40.1.ebuild 7789 BLAKE2B 5590b712474306353556183d56d6a37dd930e999b2461d8405788c2df81f9fbedf8dc9324426015f18e2fe5f8c2e33c98ec7dd1fa024280e8844465348e240cb SHA512 abf891342a6aa4a71a6d1d7066bfbfdc0bf1846447fc1cd87a2a9cb600f3b2f623e52bdc1aac060e39623ec489d6d2820333ccc7831b229211a27753f04b9081
-MISC metadata.xml 2243 BLAKE2B ff3fceee6cbd36230cc9e5bc8947e54bd5573f16d4c24377cc2e039c6a3357749d3909b9240ea048c101fff0e13ff24a2f61c3408c79beca1629ed2923bc411e SHA512 1834830ffacc66c508b0eb5c8897957d4f22d9cdb66176dfdd2c9fa17542561330bbec428658d8677db21ad2e05ebdb166912cbc799d27b24e94ff5b8477ef53
+MISC metadata.xml 2204 BLAKE2B cc6012ca977a477d6a557df8343e980e926f1e67f737064f3fea406db213e53c416db5fc50692b1132ebcd5b5ce52d4bb2f5a2cec91b0af846b905d36748e48c SHA512 cd26813c5d7d6341ae9a21be50ca4451657c9813e25b2d0d69cd972fbdecdacf63e763ecd1f1a56fee10f07a25e1063822f7b2e9a96df48e3bcf8c7d1d05de3a
diff --git a/media-gfx/graphviz/metadata.xml b/media-gfx/graphviz/metadata.xml
index 73daee8cb67b..f76b39ca8a88 100644
--- a/media-gfx/graphviz/metadata.xml
+++ b/media-gfx/graphviz/metadata.xml
@@ -1,49 +1,42 @@
 <?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>
-  <longdescription>
-graphviz  is a set of graph drawing tools for Unix or MS-Windows 
-(win32), including a web service interface (webdot). Source code and 
-binary executables for common platforms are available. Graph drawing 
-addresses the problem of visualizing structural information by 
-constructing geometric representations of abstract graphs and networks. 
-Automatic generation of graph drawings has important applications in key 
-technologies such as database design, software engineering, VLSI and 
-network design and visual interfaces in other domains. Situations where 
-these tools might be particularly useful include:
+	<maintainer type="project">
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
+	<longdescription>
+		graphviz is a set of graph drawing tools for Unix or MS-Windows
+		(win32), including a web service interface (webdot). Source code and
+		binary executables for common platforms are available. Graph drawing
+		addresses the problem of visualizing structural information by
+		constructing geometric representations of abstract graphs and networks.
+		Automatic generation of graph drawings has important applications in key
+		technologies such as database design, software engineering, VLSI and
+		network design and visual interfaces in other domains. Situations where
+		these tools might be particularly useful include:
 
-    * you would like to restructure a program and first need to 
-understand the relationships between its types, procedures, and source 
-files.
-    * you need to find the bottlenecks in an Internet backbone - not 
-only individual links, but their relationships
-    * you're debugging a protocol or microarchitecture represented as a 
-finite state machine and need to figure out how a certain
-      error state arises
-    * you would like to browse a database schema, knowledge base, or 
-distributed program represented pictorially
-    * you would like to see an overview of a collection of linked 
-documents
-    * you would like to discover patterns and communities of interest in 
-a database of telephone calls or e-mail messages
-</longdescription>
-  <use>
-    <flag name="devil">Enables DevIL output plugin -Tdevil</flag>
-    <flag name="gdk-pixbuf">Enables gdk-pixbuf2 plugin</flag>
-    <flag name="gtk">Enables gtk+ output plugin -Tgtk (needs cairo)</flag>
-    <flag name="gts">Enables support for gts</flag>
-    <flag name="lasi">
-		Enables PostScript output via <pkg>media-libs/lasi</pkg>, for 
-		plugin -Tlasi (needs cairo)
-	</flag>
-    <flag name="qt4">Builds gvedit front-end</flag>
-    <flag name="X">
-		Builds lefty front-end, builds plugin -Txlib, and enables support
-		for x11 in various other modules (needs cairo)
-	</flag>
-  </use>
+		* you would like to restructure a program and first need to
+		understand the relationships between its types, procedures, and source
+		files.
+		* you need to find the bottlenecks in an Internet backbone - not
+		only individual links, but their relationships
+		* you're debugging a protocol or microarchitecture represented as a
+		finite state machine and need to figure out how a certain error state arises
+		* you would like to browse a database schema, knowledge base, or
+		distributed program represented pictorially
+		* you would like to see an overview of a collection of linked
+		documents
+		* you would like to discover patterns and communities of interest in
+		a database of telephone calls or e-mail messages
+	</longdescription>
+	<use>
+		<flag name="devil">Enables DevIL output plugin -Tdevil</flag>
+		<flag name="gdk-pixbuf">Enables gdk-pixbuf2 plugin</flag>
+		<flag name="gtk">Enables gtk+ output plugin -Tgtk (needs cairo)</flag>
+		<flag name="gts">Enables support for gts</flag>
+		<flag name="lasi">Enables PostScript output via <pkg>media-libs/lasi</pkg>, for plugin -Tlasi (needs cairo)</flag>
+		<flag name="qt4">Builds gvedit front-end</flag>
+		<flag name="X">Builds lefty front-end, builds plugin -Txlib, and enables support for x11 in various other modules (needs cairo)</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index 53327010f776..9a708aa46ae4 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -1,7 +1,7 @@
-DIST gscan2pdf-1.8.6.tar.xz 402532 SHA256 0674d9f1decc84b0abfa7849a66d0d50fc508cef2b901a3806addb017c4e4645 SHA512 3d33d0666e452b313a8dca91734188ab268e2fae9f0e259cd2142661a61697302bba5d602ee7395c1ffd7c87e0c52b422f9201a2b70f5211246aed359ff4092c WHIRLPOOL 59ed68feaff638f24add40f1c931ca3bfe476e26edf9c40ce0fd22c21b7a0aa43711c205362506fae0a4b5c4bbab95edfc0c35f9c56e4f70c3c7d3ea80d231a9
-DIST gscan2pdf-1.8.7.tar.xz 403676 SHA256 91ac65d3a331109bcb4995e3a379991cb50815dab7f8e3fe68e055bbc271f78a SHA512 990338c9dd9bdd5685a40792803b3077e27296c5a3363471e55d3297a815e1c344bc94e3430981764531fb02380d7d7b1c253dda5e9e65e86e632ae8371ca72d WHIRLPOOL 2a1eb67942efb7ad703560a228d3a0cfe09081e30b688c68d2a7621a5ccfce73ae7711db1d6b02b9b57462ed0d94c7ff2a16da8ebd7a25beac08098077346768
-DIST gscan2pdf-1.8.8.tar.xz 404456 SHA256 2adcbfce4bcfaacb7b73b7c8b5ea3ca3a0257fbab717a589328439a04621c6a7 SHA512 331821c0f9d7365866b7ba6bdbcd29d03b69516e44f95d186296a9a105887924c747fd1c89740bd708f04d5d67a65481b972d57fef09d8bee16dfe1b2655b9e3 WHIRLPOOL 1f6141c347147ad5e8710d2aa4dfd6f9c67f1daefb724c5045a62a24118546f1405a1e01b0d06bf72744256ec7f5c7f6dc1d0b28d0787f7fe11a2659162ae78c
-EBUILD gscan2pdf-1.8.6.ebuild 1670 BLAKE2B d38681e0b5174f0de0866065cf32ca1b1caac236ab4de14184659f845fd4297cc570430e7e0de92c046dcf98c02931ee8c5fd6eeb734f36904597e69cfde3ee5 SHA512 a67f54ab33bfc53571e4a87be08e9a561c731360fed7737baf13ec2696ad3b4a15b149e9be165742dc25b2829995f7e36bc0cdce58fdfba0e590f45a89779ceb
-EBUILD gscan2pdf-1.8.7.ebuild 1733 BLAKE2B 34eb1f1882a31569fe2dec3549a037986dd50c024aed983e2b96762507cfcee70e9428103be4a862e76c8cadee6f92fb0a597000d4b9a4a4082d38f88f60fc80 SHA512 046288f89b95875f7acb9150a6f9099ad25d17e4dfd68cbaaeb5c147352fcee2ebe306bbf58e3dba3873eb2ace0d62eef97c445b75efd4abef469d29d49d742d
+DIST gscan2pdf-1.8.10.tar.xz 406128 BLAKE2B 328c05f377e12742bbf8ebf92f327afddc4556533e4f7500b237d968fa07b6505f0a3be2c02f42318740e9d185611c094cf96c66804af02197097eebd16b880c SHA512 334979b10238d510da8c5807290920b50e3a06ddda99dad41ced96d33e1ca8467cafe1f3112fb81b6705f80bc232eb6f041d588a57e04d5eecd09a201f007a49
+DIST gscan2pdf-1.8.8.tar.xz 404456 BLAKE2B 23e81ad9d46867863f7cf14e0350cce568d9f9e7a57fd8eb9a4b1a56a112d72008adacf7cc4514c6d93dd6b225684d57494a5baa295c8f84a927de7bd208d722 SHA512 331821c0f9d7365866b7ba6bdbcd29d03b69516e44f95d186296a9a105887924c747fd1c89740bd708f04d5d67a65481b972d57fef09d8bee16dfe1b2655b9e3
+DIST gscan2pdf-1.8.9.tar.xz 405780 BLAKE2B 2b0b818f314064e03ecd6b1eed988f9d45808a7142c00d190dba552ac87f06da74aacb47341ce749a9e1c916cf607eafd4f1d412a6a239a07426e57c16e62dc9 SHA512 a9042b2a184b03bb7a53d5fa56abc93e873c6e675350db4094e38c04e3f7e784eb6f0369a950f598b052474e8cbaea007af10849a2cee18cdb18d90605d4d90a
+EBUILD gscan2pdf-1.8.10.ebuild 1733 BLAKE2B 34eb1f1882a31569fe2dec3549a037986dd50c024aed983e2b96762507cfcee70e9428103be4a862e76c8cadee6f92fb0a597000d4b9a4a4082d38f88f60fc80 SHA512 046288f89b95875f7acb9150a6f9099ad25d17e4dfd68cbaaeb5c147352fcee2ebe306bbf58e3dba3873eb2ace0d62eef97c445b75efd4abef469d29d49d742d
 EBUILD gscan2pdf-1.8.8.ebuild 1733 BLAKE2B 34eb1f1882a31569fe2dec3549a037986dd50c024aed983e2b96762507cfcee70e9428103be4a862e76c8cadee6f92fb0a597000d4b9a4a4082d38f88f60fc80 SHA512 046288f89b95875f7acb9150a6f9099ad25d17e4dfd68cbaaeb5c147352fcee2ebe306bbf58e3dba3873eb2ace0d62eef97c445b75efd4abef469d29d49d742d
+EBUILD gscan2pdf-1.8.9.ebuild 1733 BLAKE2B 34eb1f1882a31569fe2dec3549a037986dd50c024aed983e2b96762507cfcee70e9428103be4a862e76c8cadee6f92fb0a597000d4b9a4a4082d38f88f60fc80 SHA512 046288f89b95875f7acb9150a6f9099ad25d17e4dfd68cbaaeb5c147352fcee2ebe306bbf58e3dba3873eb2ace0d62eef97c445b75efd4abef469d29d49d742d
 MISC metadata.xml 439 BLAKE2B 835480b0d68a079941e94f2646d0136dfb8a8e750e0279f8a5a2e23e6690242582ffe660798f5e80ebfb4378a576aa5715332b53230555866391a99ec28f54ff SHA512 af1cc05ac693899586df81036d2fa11af187edbb3c9449862298ba05efd0dbd0c4c5b008a1a21328c1f9a27a690671bd7a9967d2e457efb31561044e45984401
diff --git a/media-gfx/gscan2pdf/gscan2pdf-1.8.7.ebuild b/media-gfx/gscan2pdf/gscan2pdf-1.8.10.ebuild
index 00f29f30d45d..00f29f30d45d 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-1.8.7.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-1.8.10.ebuild
diff --git a/media-gfx/gscan2pdf/gscan2pdf-1.8.6.ebuild b/media-gfx/gscan2pdf/gscan2pdf-1.8.9.ebuild
index ef4bdc2f70b7..00f29f30d45d 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-1.8.6.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-1.8.9.ebuild
@@ -54,7 +54,8 @@ mydoc="History"
 
 pkg_postinst() {
 	optfeature "DjVu file support" "app-text/djvu[tiff] media-gfx/imagemagick[djvu]"
-	optfeature "creating PostScript files from PDFs" app-text/ghostscript-gpl
+	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
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index fa98fb2822ce..9ad3b0f221d5 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -3,4 +3,4 @@ DIST hugin-2017.0.tar.bz2 9803272 SHA256 86646ea27f32b959d38e7d36270703214b1ae96
 EBUILD hugin-2016.2.0.ebuild 1936 BLAKE2B 1a0cf740d00b1895eed69db2731828732d09eab78cdaf636cdc287ac1527007aa8ba79f7bafb1c638dc0ff2a6f18ba60072b73a60082e89b0651ffba166ac5df SHA512 454c46fd7baa9adc344e489dd6187137578fa3efb77574ebdad692a0e4f062f31a2182d087b35168140ab456e843fbf9fed8e74612661c24bf7c586eb23ee527
 EBUILD hugin-2017.0.ebuild 1911 BLAKE2B 3f841ea9ab36e3ad1e3771ac3bedde3af448de56764fec69e15faa4e1c77134d129d5131dbc20516d1b6627eff4f73e2508b9c44f8cf56c709f8b2e0b18736b8 SHA512 1ed1eae05bd56d17a0611f193522b94948430db6345a1afdca703afd9ddda5e76607e767f15e788f517311e9b01f5f80525a30d6655d977d1e293d9e6880730e
 EBUILD hugin-9999.ebuild 1966 BLAKE2B 4e3e989e04935f2c05284f5402e2b467c660523366e15cec4d3f3ca1bd9cddc42a7daf7b8b5110d05019e142ac2b318d5e9c55e2800a895a9f7afbb7e9ec0ee6 SHA512 4078ea6e87847b07304d91767bcc8d50982609156ca82680cfec7085d327a8bec906e2987adc5b7eb7adfb7103ddac63f1315abb2e537de33f6f0f6b59d819c2
-MISC metadata.xml 536 BLAKE2B 8cf1e8238734877d4731af704211b8273ea34bed06950b7e32edf11caf0338979c1e5c5e65dc8bb52bc2732e0f8fd91de3f491c1f2b44d52b34d54c28282cc01 SHA512 43c6f8e931cfcc90ff2fbb79ec5c6b3045a571add719515cd98900e45a3d1f5c6139ca0ca1076c2b919bc28cd6317bc2a840dc4a54ee491c501d08703fdea8e4
+MISC metadata.xml 519 BLAKE2B bd02923a26374e3bd638778ce8100efc4694ab6bec54fd8c8cbd32d0b8c3d495fc965194692ebaf2fe909e495011978d7bb8f3c995037fc128cfd9626949549c SHA512 d4e0bfb870b5b6e5769be2c28983d914666e413333887ac7a7cdb868d2f45f6b284a99204f6e97b98e65958412c04291f6fbc21deed8de518d3ff64aae6ad01b
diff --git a/media-gfx/hugin/metadata.xml b/media-gfx/hugin/metadata.xml
index 48424f55e336..df762b45d7ce 100644
--- a/media-gfx/hugin/metadata.xml
+++ b/media-gfx/hugin/metadata.xml
@@ -1,16 +1,15 @@
 <?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>
-  <longdescription>hugin is a panorama stitching program</longdescription>
-  <use>
-    <flag name="sift">automatically align images with
-		<pkg>media-gfx/autopano-sift-C</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">hugin</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
+	<longdescription>hugin is a panorama stitching program</longdescription>
+	<use>
+		<flag name="sift">automatically align images with <pkg>media-gfx/autopano-sift-C</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">hugin</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 96d9266380c1..650e3107863f 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,15 +1,19 @@
 DIST ImageMagick-6.9.9-0.tar.xz 8780640 SHA256 0a8a091dc4f57ec486e03285a1c30dc3f062d58133f848b6274dfc6ae5dbb60b SHA512 ddd2042e5d9fd2ee9ba91f65c7be3f0cf1a8ce340be9cefaaca2517073d2319b43b7190c5302c92e845f8e250d87681e375aec7238ca93401b42dd248776e338 WHIRLPOOL 603965b07098c3963ab5c089ee4a3fa4b1d36eb8fa52d1e5c22d2dd9bdd6b5ffa165713274fb524991faffe447ce7df14df40c8848f1436e7b86c25d901eda45
 DIST ImageMagick-6.9.9-18.tar.xz 8797460 SHA256 121dd50d051488e908306d7d1ba624781f5ec9532d30a2281b4a2bf6f26ee0b4 SHA512 b18733e01c3f41a221a691ceb992bb2e7ecabbdd1b4765c5dd46f00c2047db8534acee9659aed55786baa00062946353bd02ac60b0609caf21f87fb34a40d290 WHIRLPOOL 9077ece10f3ab8be3334816589640523bed69eef1a3cb789653cb9b260caef6721ef941010f806b00a65f8bd5a9bafa87578163b2b92888f488cdabc49218408
 DIST ImageMagick-6.9.9-20.tar.xz 8994128 SHA256 72131caaee1c673923709f7353b6731b43a2735b29110deac5121db403b07f0f SHA512 36c241490ee41de5cd72e5bc297ac2353a0d4574337776445798b0c5823f491304c3f3a728d420d03f66b652eafcdb68ec2992347321ac3919c1d72c0afdb849 WHIRLPOOL 757763b393b2ebc41d264c3e49f42bbfab1a5bf1e0bf0507d944346500fde299280ed9e8710b8f02740bf72934a58cd85afd8cba31963a452a6de9bdaca27f94
+DIST ImageMagick-6.9.9-23.tar.xz 8795632 BLAKE2B c3a2ece7897961b191b1090384c0872422af80903d0447a0b67f06d45062d60f12903a30a00d28bedc33a6c0b74f38bfe043a113613f0bfb5b1608b972ce8e2a SHA512 9160e0f6606c6ea011e9e47a11f092735456be60d6d039b9cf73c055c046ce89f05d096bdc3d37f87e2d6e36cd8dc9adf233b42bb9ad7d14aa03f13c7a1b6c03
 DIST ImageMagick-6.9.9-9.tar.xz 8797832 SHA256 59eed394d295d651e49ec0f3cfe3f0bb7aeccc28bd7a32360db9f8fc4bf9f25c SHA512 d024f753e1bf234e38736935f38a9bf82969ca77130059383f9d1871a39f68d7678a546d2786d57d602744e2008909df3f2ab08e1207b4c97c0952e7b03876d8 WHIRLPOOL f56279a778c81b6a1b61b7e47f24de25b4758c6d46fabf1f63c6847dac151297ec6bd76e390b3f21b0521963b254771ad9779ed3b4e62f0d77e94f225ec595ef
-DIST ImageMagick-7.0.6-9.tar.xz 8550004 SHA256 aa8cb89dad36b555d8ca497f207008a56b315727c9b5d6d7b28f8f9e3ee7ac25 SHA512 5756d2605cbfbd876765372e954aeefdcdf60f1ee364ce40c3302f8958c510e6f0ecf47a3ee3c264eaaade1504bdae068118eb2cb96d418237f7f53da94a6c11 WHIRLPOOL 602c18d89b4f463d1bbd96d2a9e75c3dd2c2b11419ebe8611121f3a8d6c9ec82798cc5b1183d2f8c2cf7e174695faad4b35468540e3ee7a8c58de4a240035dfe
-DIST ImageMagick-7.0.7-6.tar.xz 8556160 SHA256 52ae1acad9cfbba871b9d3cf033235067a49a20a510c1d6228a4fb3372d5b50e SHA512 9dff09a29b94f0de8ede82473820860f812edf3fc8edb0d1f8daa21c127d3e7831047f33ab22c407f2803a03561b690a52525672da837bbab1a1255156b4e6ff WHIRLPOOL ca21db0a46d055e7bc3a942e70f785599eafbd44e325dd6a33bf42dd19e655ebb0143a12d26b460d9708600e3925aab97f7ce403fbadb65eb14cb90cb3254313
-DIST ImageMagick-7.0.7-8.tar.xz 8797060 SHA256 547826f95a23ad3a1a6a514c0bff16ae875f6b7211809dff566e5994f65a0313 SHA512 0852df3bc996032a713ce6dc274cc36c3818c1c8304223de391e58bce8230aa12ac9778b4b28278c0ab4e42f2a7b4094052a5e4e6e4208329848948237fb41d2 WHIRLPOOL 13a6baf033b4caa0543fa36e4d91d82dc03b7875582e63a0803f152796041870b798ee8fdb0a923b6da08836fd7f1be5faffe36cf5e3241cb8154c3287ce294d
+DIST ImageMagick-7.0.6-9.tar.xz 8550004 BLAKE2B 2ca6cb995bdbdb16188c8cfa1fe328cccfe604341331413dc35950bc115f8a76af21f2f07cc3384da460a03d3de97484e1293507d30fea4571ee8f064f536757 SHA512 5756d2605cbfbd876765372e954aeefdcdf60f1ee364ce40c3302f8958c510e6f0ecf47a3ee3c264eaaade1504bdae068118eb2cb96d418237f7f53da94a6c11
+DIST ImageMagick-7.0.7-11.tar.xz 8626180 BLAKE2B cb43c167227632dbcb96575d2f4845cb80a40f4490be240aa8020993033e23f42ba9f600ba37751cce66dc51237b209be965115fbed20329f046a8ca014accdf SHA512 089c8516ca66845c6b8e6b365815ef1806fc97c785f75c06ed62241d7b6255387ee8f9004b1bcc0a6d03b7aa397d8e25131ca2aadc9255cc1e2368d73f774551
+DIST ImageMagick-7.0.7-6.tar.xz 8556160 BLAKE2B 3450c4c7e3804b0dcf7659a7ca0f11f6d1225c577b33216e10f6feeaa817412839ce613fdcae2175beace4cf844f880379899c1ad4914ff6df25fe2817fd0572 SHA512 9dff09a29b94f0de8ede82473820860f812edf3fc8edb0d1f8daa21c127d3e7831047f33ab22c407f2803a03561b690a52525672da837bbab1a1255156b4e6ff
+DIST ImageMagick-7.0.7-8.tar.xz 8797060 BLAKE2B a1a4278c375047fed7e59fdb9fa2a9526e2fc14136a669a0d148f78e5b308244de0ddd5c4b79e8e2214e4c91d39ae25531581868a2832ad91189a34460b5b5ad SHA512 0852df3bc996032a713ce6dc274cc36c3818c1c8304223de391e58bce8230aa12ac9778b4b28278c0ab4e42f2a7b4094052a5e4e6e4208329848948237fb41d2
 EBUILD imagemagick-6.9.9.0.ebuild 5158 BLAKE2B da4cadafcda858bb14d298662fa44abaeb346cc500bfaeaaf11cd0cd89162017af3d308ef240e1370f8320be260b77337077e7ca7ed84c0c007370da2f7a932c SHA512 ddec64d6ede1cf433bce3a4da1fb74c0346349b922cc1dd164acfb6cce99df1c207296a2334a7b59163a34250e91a80b8a7cb4a607fbca1bdb84bb3ee3c9f36c
 EBUILD imagemagick-6.9.9.18.ebuild 5128 BLAKE2B c5d4f87b3ea909fa94d940f24a7f01f4026955e874868ad0d8124d941f06ddc0b24c3e11e40d6d825c3201d2b58a1d5446ce607a73ac62e13600d609ce1dc777 SHA512 86114b9cd2ffb6aa94808060abb78a03897e7ae0611b3c326ba60fe2ff17506209c413fc863a32ac63ae36d24ae2960cdc931b7b0493a8cb04189fa163990c68
 EBUILD imagemagick-6.9.9.20.ebuild 5120 BLAKE2B b02f1bdfe05aa3a9f96bdc3596b785326753f5249bf5b19ba70a6a76ad1dfddb453acdacef7ee3d1c80bb75017912e73b9650fe5fad688620fdaadb01d87574a SHA512 f7e5492163118e23d46829613a8bd380faee2e2c6e597b1fcde7f7a1684c80a45ad0bab4b39deac083b4136cedc789c128fb6809c824469bef66c3a904738422
+EBUILD imagemagick-6.9.9.23.ebuild 5126 BLAKE2B ee6a8a6ab2c4f69c19f3679e33eacefb4fcc6e5804d90725ce46ae5092600432d260e747860626e60cca6a2ecb1e444ac38e648dd204873f9a161426ace26262 SHA512 09f9069d63c64f6948994cf5ad82eec35ad1c6b313d33603e0ce7c0984685ffa948300c1db932f476a98851ba3ecffd0e37494aa1c1cae69b2f3a0fc7961a5e1
 EBUILD imagemagick-6.9.9.9.ebuild 5128 BLAKE2B c5d4f87b3ea909fa94d940f24a7f01f4026955e874868ad0d8124d941f06ddc0b24c3e11e40d6d825c3201d2b58a1d5446ce607a73ac62e13600d609ce1dc777 SHA512 86114b9cd2ffb6aa94808060abb78a03897e7ae0611b3c326ba60fe2ff17506209c413fc863a32ac63ae36d24ae2960cdc931b7b0493a8cb04189fa163990c68
 EBUILD imagemagick-7.0.6.9.ebuild 5134 BLAKE2B 3542aaffdbab0fa1e93eed3c67b923effd7bf418fe3e95b7501d8b1d36b3f6b81a2beb4bbdd8da29ac3bb96842a1f7bf8dbb72da0e2ed5dedeb4fc1a61fce1a5 SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0
+EBUILD imagemagick-7.0.7.11.ebuild 5132 BLAKE2B 4e85b964b58823a57f8afea90f551aebdcc3622ff4f2502ca1a9b6c452568f5176e008f8e42028ceb554120f7fe5393f79abdbee4d90ca1a0ad52921d1a50690 SHA512 e2ab69517f5d6ae5be2ad1992cbeb490f48e832f2a6c281cf25fce2b2f8b78653870b63135fc237564831728b7fa2e2ee99c783bc255e6b4f582dd43a83e66c9
 EBUILD imagemagick-7.0.7.6.ebuild 5134 BLAKE2B 3542aaffdbab0fa1e93eed3c67b923effd7bf418fe3e95b7501d8b1d36b3f6b81a2beb4bbdd8da29ac3bb96842a1f7bf8dbb72da0e2ed5dedeb4fc1a61fce1a5 SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0
 EBUILD imagemagick-7.0.7.8.ebuild 5134 BLAKE2B 3542aaffdbab0fa1e93eed3c67b923effd7bf418fe3e95b7501d8b1d36b3f6b81a2beb4bbdd8da29ac3bb96842a1f7bf8dbb72da0e2ed5dedeb4fc1a61fce1a5 SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0
 MISC metadata.xml 984 BLAKE2B ae695ec1fc34ad3b29269ad21cfb8b79ff6158a2ace9cd4194354448794dc183ac568757d6a7e6c07f31634dfb780e0411a0237b3c106344e6c7c7244a8aee36 SHA512 39a4c5aa27db2de81ad4621bacf43baf96415eecdf836fb2024890634c025b29f2b41dc003ac4d6f87b2365c1a4c68b6af2b9e169b3137bbee3e0a6cb435c5c7
diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.23.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.23.ebuild
new file mode 100644
index 000000000000..63f47b02281a
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.9.23.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
+
+MY_P=ImageMagick-$(replace_version_separator 3 '-')
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-gfx/ufraw )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-proto/xextproto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	local mesa_cards ati_cards nvidia_cards render_cards
+	default
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+	emake check
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.11.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.11.ebuild
new file mode 100644
index 000000000000..63f0f987d13e
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.7.11.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
+
+MY_P=ImageMagick-$(replace_version_separator 3 '-')
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-gfx/ufraw )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-proto/xextproto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	local ati_cards mesa_cards nvidia_cards render_cards
+	default
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+	emake check
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
diff --git a/media-gfx/jpeg2ps/Manifest b/media-gfx/jpeg2ps/Manifest
index a60c84430c28..49ecdd967d94 100644
--- a/media-gfx/jpeg2ps/Manifest
+++ b/media-gfx/jpeg2ps/Manifest
@@ -1,4 +1,4 @@
 AUX jpeg2ps-1.9-include.diff 341 BLAKE2B e231ddda6066ba9787f6bf2da8c60ad1b429e7261d2cff3809d0c1bccec80e95ee9aebb4f7a099be8dfcba1908c1ed186b6aef840a3981531f7297d2a975709a SHA512 b67639f655ee752ea2ee3fa881767af46a1f1722510a9e85fd6f79553cda772e9550fd80070084fb85865ee6046469a90b9c90885c1f875d50a1eb1dac59cbd4
 DIST jpeg2ps-1.9.tar.gz 67105 SHA256 e09919ff55bb1fd26299adfe92e5ea0e7daaa3bfa0277a0483cac9764eac25a2 SHA512 babc6183db2c95d0bcfba3d34f924bd2a37d0a566bf684f3af3955b8b3978cd4b94b10e94f366aec641988258476f84ce730e4da43f2bb0a836e81da4892ad3c WHIRLPOOL bc78fc722f851acd11418f7ebdc145466a34d43c293edb4ee96edec5ff41b995c2c11dd46f1936d3c5fb6c4c241c64f3c073efc88ae0022f2b0e1f53790338c9
 EBUILD jpeg2ps-1.9-r1.ebuild 1363 BLAKE2B ec3abe4df150666312eca88bd92d73ba60d7083a2d88cad799bdfdd7293ae832ad6d61654e9ac371785e33b3300cc5da127edba75cae9c0cc6fae6cc79660d3f SHA512 a0c8092d4d0b84a8fb4f935a72b7109fe881671946c3b641dcbaa1495413746d43ed29b8854a3366bea20f6eb5014a82f2815a570a9b2f162259dd50fd4110e2
-MISC metadata.xml 330 BLAKE2B e5dcd427123301f4650877f2602961bf8f09a2415d6b954851ecba00f5dd334a9fca5d91701524e9fc74c7b4ba050bf8e302a435529ee7425dad918b93dd4b90 SHA512 14d8957884806cffc9fed806bacba7331e4669164b4be427aac8a9c1d0af7d6da815249c34e6bf5832370c20eeda683af2296f1d3145aecbd8030237a73a47a9
+MISC metadata.xml 328 BLAKE2B 04a8462385dca7aca1047d2033773cade34f5af1eeafb1dfbd30dbe721064d2e1e386632c0c0d2e662e3155ed190da109f9d06bfb8395da94d605727619d132e SHA512 a8558499212b37b0e2309500cd2ebca93ee94edd86daa9f203173ba9d4ba9803fac69802dd067b71e7422a175a113961b8e6e139312dc2444f711df59de0e7d3
diff --git a/media-gfx/jpeg2ps/metadata.xml b/media-gfx/jpeg2ps/metadata.xml
index d6fe5b053823..e62e2f53570a 100644
--- a/media-gfx/jpeg2ps/metadata.xml
+++ b/media-gfx/jpeg2ps/metadata.xml
@@ -1,13 +1,11 @@
 <?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>
-<use>
-	<flag name="metric">
-		Default to A4 paper size
-	</flag>
-</use>
+	<maintainer type="project">
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
+	<use>
+		<flag name="metric">Default to A4 paper size</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 292fcd96aa3f..be489a421143 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -1,3 +1,5 @@
 DIST libimagequant-2.10.1.tar.gz 70783 SHA256 c06f6d33611b90b57ed362752c9fe4819f6c51896b3024010f18744dc14ce0f7 SHA512 1cbb725e5f3774f931379f640c6532e169ea02a7b502a93af6b75a305e3dab1bd34a375391be0e8fdc15fea578715e8f8319d95d674383b7048e5f73e48b106f WHIRLPOOL 654407abec0b565b9ead32b427e2393be760a012eaba8d657c4b5fd9d75f729af98be5bcdeea99487419ef91d347dbb86598f3719992401ec49ee8adcef0e9a0
+DIST libimagequant-2.11.4.tar.gz 74117 BLAKE2B 5d42dc876c77694a1d4576e633d2e3aa1e531061aa849a683542cf11b14333f65125bbae699f927bf42896a934ade6d745aa517d6cbc4b7097d96c7579532ec9 SHA512 e9d2aaac2f37968dc93ba0da7d03f0fcf60b3f17d9a0b9edfd6930eade25844dd603de74492d8e1de8dc2da4e7f3e47959a558b5a67588d71e9e1db035eca1cc
 EBUILD libimagequant-2.10.1.ebuild 1173 BLAKE2B 5592028ff9799e260eccd6d6438faa28ea40dbc0b1515ec59f0aeebe5e6198d612a3c26a629bffdf5a903eebfff072a54ec25c3569e11afd07d72613b2a9025d SHA512 8636368abd9bbc7e20d28c968e5fefdf3f8a8d11e5b7c6651a98bc79b724c34abdcf948c8deda9cb5ca421858d2dbb155c2a1079665e5224fbf82c7d48477a76
+EBUILD libimagequant-2.11.4.ebuild 1175 BLAKE2B 45ebfb632526601318788fded0c26678026dd518e4168213a523e7baba7a46742fae05cb7db89fa8bca4f7687bdb5faff62da218d236f35c109392d90d7b93c8 SHA512 342ad821a2c7581c1fe603fdbacbe8b72d6f5ee2c3e41c56075056678a9fcaebeba79aa2b68f3c83f8115e1f2b6d2fb839842f67defd9a9fb7f35e30acb80f38
 MISC metadata.xml 527 BLAKE2B c3fa42153fa6cfede4de3d59e12063aeb44f67ce89d36be63c7df4671c57ecfdd43d08aee89bd96387ecbee2e41b1d5921e9ad2486b4dd8f06e6e93529afb0a8 SHA512 82b458b27288b6b49df16d5778f6c75b492d958bcc1c2f2950dee741bfddc82f561be50f590d3f891bf736ee67e5325ae297bf49f99c769ca97ac68042beee11
diff --git a/media-gfx/libimagequant/libimagequant-2.11.4.ebuild b/media-gfx/libimagequant/libimagequant-2.11.4.ebuild
new file mode 100644
index 000000000000..db64a5c57738
--- /dev/null
+++ b/media-gfx/libimagequant/libimagequant-2.11.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Palette quantization library that powers pngquant and other PNG optimizers"
+HOMEPAGE="https://pngquant.org/lib/"
+SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	tc-export AR CC
+	# Hand rolled configure script, so not all flags are supported.
+	./configure \
+		--prefix="${EPREFIX}/usr" \
+		$(use debug && echo --enable-debug) \
+		$(use_enable cpu_flags_x86_sse2 sse) \
+		$(use_with openmp) \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_compile() {
+	emake shared || die "make failed"
+	use static-libs && (emake static || die "make failed")
+}
+
+src_install() {
+	dolib.so libimagequant.so
+	dolib.so libimagequant.so.*
+	use static-libs && dolib.a libimagequant.a
+	doheader libimagequant.h
+	einstalldocs
+}
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index 8cf498bd048e..c1708c74daa5 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,11 +1,5 @@
-AUX iota-fix-2.1.1.patch 264 BLAKE2B 6cb4a8834eee3bf7af7cb38c7bdfecbe63ca3703aaa0bc328af061df8861789a45f6be9f4277bbb72a90a697d5da0cc3cb4dcaf3b93f35742971a58463baae42 SHA512 fe9fa83e7bcaeaea01b08d3a294501f2738ec41a2433c154eabb3544b169aedcdd99525157473baa254b0890292185b17733c1e6a4810c633ed6cc1ec5d5e689
-DIST librecad-2.0.3.zip 16590256 SHA256 4221348541c46c6e9698c1fa3471a14a81376e022a009a164a7f0d0035da4643 SHA512 c40952ae967d83197645bef65dac6e050ddeacf536401b2b99cd18d753462af086ac2a410c6746a92c094ad76fd9177a900c21531ed7b7fcdf1e4b0f7f070e00 WHIRLPOOL c2e1d33b17b7a47ffd9b3795ad292b22cb1225aceacf052494745243630b0537e21701930b9433ea235c462d65581efc2b5ccda3b37712d4ab639ab9bcc6a97d
-DIST librecad-2.0.9.zip 25524745 SHA256 3fd92e8249642462d41d688446393ee5e79f68b7b0d9878388c6c194af2cb43a SHA512 e2029389b2ced67a94d9411cb2f49f524ac12542409bc7829a043af9611dd51544fc431e364f4dcfb1a8b645b2bc6eb86fc74294726a65ee687f69bd7eb8f700 WHIRLPOOL 20aaa38cd92547bae6cee4b696f5b7f3699438481c5051af6112c6b1661ffb018509ff1fdcfb4591e8828c8ffcfcc5a3002c594dbcf95beba93e9768c5133c02
-DIST librecad-2.1.1.zip 26085717 SHA256 a5d27119ff137611c090fb174890ed1312c56897fb1482327d676da148fbd7dc SHA512 82b27e75fddae798da0e30e0c560d3769dfddab936e33a3585fd3e871eccf88e51c28d5ed938a530cb65c2e2ecfc593772ca83a2d23dd29126aa8225595f3d01 WHIRLPOOL 50ac34d0bdf1cd55ee6f7a959c1c1430197ac8acb7739755887b726349e39c9a1fe32ef25cab285aeaf649057701256f6210750c986ddb67ed3f338c80e300ed
 DIST librecad-2.1.3.zip 26086377 SHA256 f05af030c71192109c1472c6fd24696fcb564b2eb83ff9789b88bec2e93c10a3 SHA512 9a41c17b512ccbc1a0ebb0e6da8e7297663490479f042fadaffda819e371afc7fa49b789449df9fd4e36a2e2b6f95b9b5be19df47cf3c4252111db2a7ed7f009 WHIRLPOOL a0209b3513fd5f10e608795e34267d5efc7338996ba6cc485cbd9084200cb87fb8b51ab3f224520fc8c693c5ac3db8d049dde68011e8005922ad9c761625971c
-EBUILD librecad-2.0.3.ebuild 787 BLAKE2B 6441e2b285da0c3c5afd64ea573e743af11816ad8b82e13f50c3d660e08039370fcc768c291f79ae0953888044c87a8fae16e1ed80bed3eeba2fb2681f14e91d SHA512 5d34f9e791018f75a990d378f41c077458411d96ed40729a1b34afe527849e7fc3d245a02941dc95ce1582e3ffb935aec50efc926b57b98d3e5f48e7378b7325
-EBUILD librecad-2.0.9-r1.ebuild 1374 BLAKE2B 19d3feaecdb7d816b67c503eedc9d23dba971fd1bac424f7472a4ad3c061a6f8bccd16cb8d9910cb5f7a0383210ddf4acf026195c7d17df5f933be148ec14ab4 SHA512 c41f56a05b3f98f10947ec5c648796ad138fd9ae013e7b64045cc3a66ac74e075c962c02cbef5ee5e40f1597927a903fd5a177ebb3c84cd74efd7e4a8e97c2c5
-EBUILD librecad-2.1.1.ebuild 1418 BLAKE2B 9c495bc078b8e8a40273415faf6eb92f90c123fae3d53f2dfc49c4b359aa323091fe86c381bbae2afd2276c1a9a7f9271e5895e6077e86b1bc6c8bfc8e9a3995 SHA512 2080a1913324c030b6f7f3a2e21c96b894ec72ca335dc04c5594061d0a06637e9b40e7fae20920832012a5317baca4987971fe4e7cc86dea6c9cd40e4e2d9ded
 EBUILD librecad-2.1.3-r1.ebuild 1418 BLAKE2B db2d3476c190f0e45b9ed1786de2369b887db0c3cdba7abfb259733123a2b96b4dd423236e05b4b8f4eba3a5254a1381ba4f9323fe171359e9cda7ff3205a2d1 SHA512 6489a761f0bad291fc536047653edfb527240fd8582428cb4811b3c5197a9e6a51b143dd650541f543ab4b312c71fc8a626248c8569ac1fbb6b5fe302e660761
+EBUILD librecad-2.1.3-r2.ebuild 1286 BLAKE2B a2e32013aae07cadbed37d15785da9e0371f746a334d70209c5271f06f8986936ae16d4399c002345ab3e9784ea81e105737aeebd0c860a30919b6f3700b6708 SHA512 ee11a46159107e2673d9885860aa0f1456658932503423d24c6965007b022703e0c1a9a2c0ea10165f35856a0adda13fa72967bc4515e956d1abff5480c44aab
 EBUILD librecad-9999.ebuild 1344 BLAKE2B 7e2d33864340058bf32c0d6f541bfe7b7a16daf386d35015f39535f5ddbee51b2a46d99c7a5a7437d9763e4f953e0bbc9f4fab1d99bf42d1240247c1052e3993 SHA512 722322ffaab726f066da0497261ba9d9f4eedab1f885e1d19b587bfbae5745cfde7399c24767f303a9c76a7d456d7564b3cc9d872b875be2a4cab8c499e6589d
 MISC metadata.xml 459 BLAKE2B 8b648b5abdd62d9df306c90d182164694c753231b16ad37319863ee37feac91b2e0fcc89212b5259a899287a638a68cb2e48fcc55af8a076d23b201e6b38ebb3 SHA512 108977904dfb070a16279d3306f40982a73b1cdddfa90e8ab22f83c4a75cd620a829fea9a56a0290d2d160b1d30fd0fb67e320f526726dd57a613e781c700b6c
diff --git a/media-gfx/librecad/files/iota-fix-2.1.1.patch b/media-gfx/librecad/files/iota-fix-2.1.1.patch
deleted file mode 100644
index 12506f4b820d..000000000000
--- a/media-gfx/librecad/files/iota-fix-2.1.1.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- librecad/src/lib/engine/rs_spline.cpp.old	2016-06-20 20:43:27.000000000 +0200
-+++ librecad/src/lib/engine/rs_spline.cpp	2016-09-05 13:23:25.459841304 +0200
-@@ -26,6 +26,7 @@
- 
- #include<iostream>
- #include<cmath>
-+#include<numeric>
- #include "rs_spline.h"
- 
- 
diff --git a/media-gfx/librecad/librecad-2.0.3.ebuild b/media-gfx/librecad/librecad-2.0.3.ebuild
deleted file mode 100644
index c1767e4ccf78..000000000000
--- a/media-gfx/librecad/librecad-2.0.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qt4-r2
-
-DESCRIPTION="Generic 2D CAD program"
-HOMEPAGE="http://www.librecad.org/"
-SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc tools"
-
-DEPEND="
-	dev-cpp/muParser
-	dev-qt/qtgui:4
-	dev-qt/qthelp:4
-	dev-qt/qtsvg:4
-	dev-libs/boost
-	media-libs/freetype
-	"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/LibreCAD-${PV}"
-
-src_install() {
-	dobin unix/librecad
-	use tools && dobin unix/ttf2lff
-	insinto /usr/share/${PN}
-	doins -r unix/resources/*
-	use doc && dohtml -r librecad/support/doc/*
-	doicon librecad/res/main/${PN}.png
-	make_desktop_entry ${PN} LibreCAD ${PN} Graphics
-}
diff --git a/media-gfx/librecad/librecad-2.1.1.ebuild b/media-gfx/librecad/librecad-2.1.1.ebuild
deleted file mode 100644
index 87af2fd665b6..000000000000
--- a/media-gfx/librecad/librecad-2.1.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qmake-utils
-
-DESCRIPTION="Generic 2D CAD program"
-HOMEPAGE="http://www.librecad.org/"
-SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="3d debug doc tools qt4 +qt5"
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-DEPEND="
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtsvg:4
-		dev-qt/qthelp:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qthelp:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	dev-libs/boost:=
-	dev-cpp/muParser
-	media-libs/freetype:2"
-
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/LibreCAD-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}/iota-fix-2.1.1.patch"
-
-	# currently RS_VECTOR3D causes an internal compiler error on GCC-4.8
-	if ! use 3d; then
-		sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die
-	fi
-}
-
-src_configure() {
-	if use qt4; then
-		eqmake4 -r
-	else
-		eqmake5 -r
-	fi
-}
-
-src_install() {
-	dobin unix/librecad
-	use tools && dobin unix/ttf2lff
-	insinto /usr/share/${PN}
-	doins -r unix/resources/*
-	use doc && insinto html && dodoc -r librecad/support/doc/*
-	insinto /usr/share/appdata
-	doins unix/appdata/librecad.appdata.xml
-	doicon librecad/res/main/${PN}.png
-	make_desktop_entry ${PN} LibreCAD ${PN} Graphics
-}
diff --git a/media-gfx/librecad/librecad-2.0.9-r1.ebuild b/media-gfx/librecad/librecad-2.1.3-r2.ebuild
index c1bc20456856..517916041bd8 100644
--- a/media-gfx/librecad/librecad-2.0.9-r1.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,15 +14,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="3d debug doc tools qt4 +qt5"
-REQUIRED_USE="|| ( qt4 qt5 )"
+REQUIRED_USE="qt5"
 
 DEPEND="
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtsvg:4
-		dev-qt/qthelp:4
-	)
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -40,6 +34,8 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/LibreCAD-${PV}"
 
 src_prepare() {
+# 	epatch "${FILESDIR}/iota-fix-2.1.1.patch"
+
 	# currently RS_VECTOR3D causes an internal compiler error on GCC-4.8
 	if ! use 3d; then
 		sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die
@@ -47,11 +43,7 @@ src_prepare() {
 }
 
 src_configure() {
-	if use qt4; then
-		eqmake4 -r
-	else
-		eqmake5 -r
-	fi
+	eqmake5 -r
 }
 
 src_install() {
diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest
index 5f7c56b158bf..64ac9cea1b66 100644
--- a/media-gfx/meshlab/Manifest
+++ b/media-gfx/meshlab/Manifest
@@ -17,4 +17,4 @@ AUX 2016.12/remove-io_TXT.patch 416 BLAKE2B 60aa9c033a4902c4a9acb76b1ac130076cfd
 DIST meshlab-2016.12.tar.gz 94194402 BLAKE2B 53dda75b51198d529d35ae64e1b9d8ec240ec6031835e6cde2ff1ad21403086112a6f4b9acf5c6f53328787078b3e1a90cc177f5e009834b310cdf6b168c59b0 SHA512 68bf863fc390725a949578b545bc749bbe2c07ca75d1461772c7777fd6a4b095f11b64b5b0e8b729f83fea1bb9e3ca4b41123cdea3799a8eee0de587eb7bf1d8
 DIST vcglib-1.0.1.tar.gz 9063634 BLAKE2B 91fba7ebf1ac18d0dfb33d3e26656e546b7c35ae753777730c44ebdf327413dfe94dd5e84907eb7e1644d70bfdf7d00ae8ecd0a81587d790a31354f7db09d626 SHA512 55d1854054744abae2d41e7b5041df89253bae108df5fc1cfe777013de7192dce04bc474475cb11a1d0343ebcab1ea61b381d9d9c36c452528043e85e75bc211
 EBUILD meshlab-2016.12.ebuild 3321 BLAKE2B 1ac52882b29a8d2e911f4d74ea4d2346a2daf9ec8919f3d0b5cda75efa2165e3ddcff73dc44a6cfaaf360e18f2c5096e99cad4606db99a5c84f9de6bfdcca919 SHA512 58e7e67ced488d844fac1823a4ce4dce1cb7025ea3b07c4c02502e501a8aa4fe9dd276ad13c5e4561e89869519aa676b73a665f74aac754fd2d423a2d5026e71
-MISC metadata.xml 725 BLAKE2B fd41657316f1191399d69e33dbb22f7c41db87d470e954c6cf51389073a696b5b3379b4cefdf93ea50191cf41297d6b2747fcdf4193ba947f0f09822458cd0cd SHA512 258ab0d2d585eddccba320f327624e2cb8daaf387512bb221cab8bf535b1e23c35009ab9452111ad1f923d442d876370c5f3e13b40f845df97aa3c00ce11fcce
+MISC metadata.xml 729 BLAKE2B 5c89ef346791f1aaecf313a580c18e32d37a116e87aa5955d21445816fd7a9fae30af5763dafe32f019fcda1333b3bfe48280abb1845fe096f223642badb9629 SHA512 f1d3b39a1c612b895463f0cb674411fce2614ff55855b964dee1b9c999aa1ad4bb6ec0a000cab9a1767f54474597836a92fda48722a3d8a90d21f412316e2b71
diff --git a/media-gfx/meshlab/metadata.xml b/media-gfx/meshlab/metadata.xml
index 0b461a28eacc..5454c9e8ca1b 100644
--- a/media-gfx/meshlab/metadata.xml
+++ b/media-gfx/meshlab/metadata.xml
@@ -9,10 +9,10 @@
 		<name>Gentoo 3D print</name>
 	</maintainer>
 	<longdescription lang="en">
-	Printrun is a set of G-code sending applications for RepRap.
-	It consists of printcore (dumb G-code sender), pronsole (featured command line
-	G-code sender), pronterface (featured G-code sender with graphical user
-	interface), and a small collection of helpful scripts.
+		Printrun is a set of G-code sending applications for RepRap.
+		It consists of printcore (dumb G-code sender), pronsole (featured command line
+		G-code sender), pronterface (featured G-code sender with graphical user
+		interface), and a small collection of helpful scripts.
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">meshlab</remote-id>
diff --git a/media-gfx/optipng/Manifest b/media-gfx/optipng/Manifest
index 3bbcc4f0e880..695741872358 100644
--- a/media-gfx/optipng/Manifest
+++ b/media-gfx/optipng/Manifest
@@ -1,6 +1,5 @@
 AUX optipng-0.7.5-estonian.patch 1014 BLAKE2B 3c973120185be858a89c02b1f452e47da5f51866ec9ad59653d2f27cea9ea2b7d318d33b00c3eb14b6e87e629f63062d63f2ffd523e62b9927b0b75e4d781af1 SHA512 535e869c42df6181f0bd30287adb9175c18e8a9730c997a6466e64870b968d9575e6952889353be5ac4232b2087b004cde953e151da4c75b8048b3cdccb8f27d
 AUX optipng-0.7.6-cve-2017-1000229.patch 903 BLAKE2B d193e4c62813e40b653699d17b478838633e43536caa6bca54a7b48ad4290af3aa452b37d3bacbb194bec11aeed47e84b60cab4fd71281d554e72309e376ceb4 SHA512 2bf259c59121e735a6c65137d5819c07057b3b1e43e14793cc4f739b607f6ea4e4788ddf1dee521bd8b623796c901f974e7c925f36ff13adec669dfc6fbf449e
 DIST optipng-0.7.6.tar.gz 2202237 BLAKE2B f113027ff12f2fc97bd4dc43b8e62f5af8f86e251b43c0f86ffbd59366b329d1fc2a58103aa349cb18fb0c9d2e5f051517439c02aeb44ee435c6fff0c75efb7a SHA512 d31d7494c23413d87b601a706cc2faf82923156a818da66e0bfad11741aed065db8f1b0c088d2abd66899ac192408c05f594295ded2684c4549c5f03b140a184
-EBUILD optipng-0.7.6-r1.ebuild 1336 BLAKE2B a54e08e74534f32e4f768593b9330275b5ca013790338ebf1a56b62b1ae7889d865051d83a61e077b0bd570adbd27dc39a8a57c08f7e8727048da11115659703 SHA512 8a169fe7d8e12bc8dc351a049e1a4d4a50ff9d53433b737c91ed0e26cd9b24ba59ea611002df6c38018572d69a177920ab6b8b1abcc22f9ef5b2d5ef36d15a7f
-EBUILD optipng-0.7.6.ebuild 1264 BLAKE2B 7300c5845c1e78740781546ff0f7389af8f76e373d690c82270bd0d391d80f9b690cc4f59b16fe380c4ce47ac6c2c04eaf6f28c1bd32eb2bb242a8fe785bef66 SHA512 acfe88a65ae266104b41044ccbd6961326a711e67797ebf176af972d08471b1e958bad2a1b46243e59ddb0f6eb10a95dcada7a76a6235970902f7ea277cf1429
+EBUILD optipng-0.7.6-r1.ebuild 1335 BLAKE2B 9d40e9ec7e7d8cd7f96cf82676c48bb32f4eac2eca8c7a7d67eb2419994827ae0dc2b28b02a12265034b98de08100e849d0fba2ba414237165dca3fc096a4f65 SHA512 fde34b5fcd172711ee57f55cd93c8d60eb44086a09974aac5cea7b104a3a7c961a1840a38934aaa0a6182fdc2d8be01372d420af5f30054f298ebd565c0c09f5
 MISC metadata.xml 326 BLAKE2B aa1da3dfcfd0faa4d1bcc901659c15b3ce974eace4d7b1317c7fcfdac13939ca4e0ed9d58eb46e7921caefe63475fcffe3193ad138506c9e16b0d8d9abb73bb8 SHA512 57810d8957812cf02573aff451fb8248944bd100beaa06412deb4b5622161fca2ee466ad80050d68e94acf5e2e7963c6fa657416996c0503da6ac88f1f00efdb
diff --git a/media-gfx/optipng/optipng-0.7.6-r1.ebuild b/media-gfx/optipng/optipng-0.7.6-r1.ebuild
index 7cc031c42aab..9039ea4f1538 100644
--- a/media-gfx/optipng/optipng-0.7.6-r1.ebuild
+++ b/media-gfx/optipng/optipng-0.7.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/zlib
diff --git a/media-gfx/optipng/optipng-0.7.6.ebuild b/media-gfx/optipng/optipng-0.7.6.ebuild
deleted file mode 100644
index 18082197dd2c..000000000000
--- a/media-gfx/optipng/optipng-0.7.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Compress PNG files without affecting image quality"
-HOMEPAGE="http://optipng.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="sys-libs/zlib
-	media-libs/libpng:0"
-DEPEND="${RDEPEND}
-	sys-apps/findutils"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7.5-estonian.patch
-
-	rm -R src/{libpng,zlib} || die
-	find . -type d -name build -exec rm -R {} + || die
-
-	# next release is almost a complete rewrite, so plug this compilation
-	# problem in anticipation of the much (c)leaner(?) rewrite
-	sed -i \
-		-e 's/^#ifdef AT_FDCWD/#if defined(AT_FDCWD) \&\& !(defined (__SVR4) \&\& defined (__sun))/' \
-		src/optipng/osys.c || die
-
-	tc-export CC AR RANLIB
-	export LD=$(tc-getCC)
-}
-
-src_configure() {
-	./configure \
-		-with-system-libpng \
-		-with-system-zlib \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake -C src/optipng
-}
-
-src_install() {
-	dodoc README.txt doc/*.txt
-	dohtml doc/*.html
-	doman src/${PN}/man/${PN}.1
-
-	dobin src/${PN}/${PN}
-}
diff --git a/media-gfx/pdf2svg/Manifest b/media-gfx/pdf2svg/Manifest
index 83a5872d5d76..c53d77dab3a8 100644
--- a/media-gfx/pdf2svg/Manifest
+++ b/media-gfx/pdf2svg/Manifest
@@ -1,5 +1,7 @@
 DIST pdf2svg-0.2.1.tar.gz 77601 SHA256 96e6902e0bca6aeb70f3c6621d0d95b346b14c6a0282c12c1e7635f67af0c74b SHA512 17b54ed40f38982452206a9e7eb6fd309906904af10ef375d7e3894e7d8d8a351a5c47ef6553678db48373c5de878923fd46a66cc3e22a01034434fde9671793 WHIRLPOOL 4018341269d189000a79d58d429d3346e3e33e649ccc762fe84c6da04e1ecc10573d7a2659c4f897484023a5ab393ce723b6227ac8f7df76ceb0c1fda84d7dd6
 DIST pdf2svg-0.2.2.tar.gz 84009 SHA256 c2a29cc81d01fea220523abad39c400e9c5411b395b6ba3ccbedb4cd398ec6cb SHA512 ea8b3d33acc7900d162a338b715d55a0cda578e2f08afcbe2773558998b267134ce0c34d5ed295d3dcb2bf882f0097835a6ba83fc837a201173e4c67b9d4dca3 WHIRLPOOL b4a0381d175e0ad18534681c53e994e6e47915d27584f2efd12d638f1f5eb4fb9e181673f81079384addc0ba933da4f777dc632eafe1055b8b79952dbf599e33
-EBUILD pdf2svg-0.2.1.ebuild 718 BLAKE2B 8d9f363b64016d186c3a66c1b627850b70b7245bd4cbece924ce036bdb9f6bd7c1156fc4d2fe32a5efdb15922ccf2d845037d1810721ec7ab3e56cada7a2c2c4 SHA512 857ddc1e07ec327d2f6b594e1b38663008e105d22ebe7a6cf675eea735f7499ff91fba8beeef5002ee95d0f6ca914e0af42164c37acb628b86064d3be6fa1e02
-EBUILD pdf2svg-0.2.2.ebuild 768 BLAKE2B 2bd326ab17e9461128ddfd06aa227d4e02dcf87c997d14b3b1e12ebb4bdfcefd57ad171d38e9fa52738794a2b148e79aac2a9a99c57385d68317b0d0fd9a9e44 SHA512 44bc36ea2b3ab978b0ec930b0cd8481f58ff8aa1284128753b066602f5691b04a2f3b3ae6bddeb1a131e34280d14b748ebdb862940ecf78dbb73649061344f65
+DIST pdf2svg-0.2.3.tar.gz 89461 BLAKE2B 5857935195429f43cf9d6dc3bd66a88945be45225f0ae8324762937b7bfe407f0c4fb4013069d4eda2f0e036710a1a78b261093c18e4693622cc6fc9f7fd7916 SHA512 e8f0cc34c112c7d9ae02396ca587f1354462add882501f003b0173e05ebb09c09456dc1736679674fec5a2c04bdc0ef4141266090ba7efeba8b194ee602f5ee2
+EBUILD pdf2svg-0.2.1.ebuild 763 BLAKE2B 0a49a51739a74a6ed4a685a65f60e6561553fbd679b0284c4f0748455a6309c46718b07fd798d8d4351b7de2e59092c6f8a11042f5525445d7976a417e3e78f4 SHA512 c5193574269dbe8f018e2896f7c7b9dc0e7168394a2a9a01e1ef3fb84dfde1b6fea013e6bf51a46bd5b6b6e35fd53e1d019d3c9d72a2e878aad62ad7845df910
+EBUILD pdf2svg-0.2.2.ebuild 806 BLAKE2B f81b4ef507abeb64a3fa6ad285bfd50d733456ac1fdbe4621486edc9502135a85fc07419c72b305fee6feb1b76a11888f0b33225cd3087e501ab94bd2cf6fcd9 SHA512 1a2dd289c78baa56da8cdb3e5b4ab4e78c9fb8eaca00d9937b6b44a0f20f679349aa5182fac5f127dae204f893a961026606e31f433dc28ff0790e36658c521f
+EBUILD pdf2svg-0.2.3.ebuild 807 BLAKE2B 8e499e85b47d605aa53006f5c24821e3ae119fb53021a4af14d63e14e6de75785e31c74961a6a8e40515fb8216338b9ad2c1b0ab73dda6c65cfce50ee5d985e3 SHA512 40ca62959901d676ed048903c3bc5b365b8d206a01379e00206044054ebd90d61fabfc9f386d154cc09f35e70aaa4510deafe297155e505c053ee4fb78d04316
 MISC metadata.xml 259 BLAKE2B 0a31c91e9ff9700c8a5c77c6eb9ddad55c6b78e7e583213c20adc8e73248c7e8b31c9a11702a0b5a8b665acd2753c145362974d6c5c6aae1979c7845ab4b01d8 SHA512 6744883613ae3b83c57ec9604c5f31717ab714b4f3e7f4f680e4b9e54f622f8e5f753b3cd666862f0e3e6dc4223aee87b89aba472d9f20e1b317595e06aeae30
diff --git a/media-gfx/pdf2svg/pdf2svg-0.2.1.ebuild b/media-gfx/pdf2svg/pdf2svg-0.2.1.ebuild
index ec0acdb0faa9..9494d3e45e1d 100644
--- a/media-gfx/pdf2svg/pdf2svg-0.2.1.ebuild
+++ b/media-gfx/pdf2svg/pdf2svg-0.2.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils
 
 DESCRIPTION="pdf2svg is based on poppler and cairo and can convert pdf to svg files"
-HOMEPAGE="http://www.cityinthesky.co.uk/pdf2svg.html"
+HOMEPAGE="http://www.cityinthesky.co.uk/opensource/pdf2svg/ https://github.com/dawbarton/pdf2svg/"
 SRC_URI="http://www.cityinthesky.co.uk/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-gfx/pdf2svg/pdf2svg-0.2.2.ebuild b/media-gfx/pdf2svg/pdf2svg-0.2.2.ebuild
index 3eae62f204e0..2eae4fdc0ed5 100644
--- a/media-gfx/pdf2svg/pdf2svg-0.2.2.ebuild
+++ b/media-gfx/pdf2svg/pdf2svg-0.2.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils
 
 DESCRIPTION="pdf2svg is based on poppler and cairo and can convert pdf to svg files"
-HOMEPAGE="http://www.cityinthesky.co.uk/opensource/pdf2svg/"
+HOMEPAGE="http://www.cityinthesky.co.uk/opensource/pdf2svg/ https://github.com/dawbarton/pdf2svg/"
 SRC_URI="http://www.cityinthesky.co.uk/wp-content/uploads/2013/10/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-gfx/pdf2svg/pdf2svg-0.2.3.ebuild b/media-gfx/pdf2svg/pdf2svg-0.2.3.ebuild
new file mode 100644
index 000000000000..a4cb3377aa84
--- /dev/null
+++ b/media-gfx/pdf2svg/pdf2svg-0.2.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="pdf2svg is based on poppler and cairo and can convert pdf to svg files"
+HOMEPAGE="http://www.cityinthesky.co.uk/opensource/pdf2svg/ https://github.com/dawbarton/pdf2svg/"
+SRC_URI="https://github.com/dawbarton/pdf2svg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-text/poppler-0.12.3-r3:=[cairo]
+	>=x11-libs/cairo-1.2.6:=[svg]
+	x11-libs/gtk+:2="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS" # ChangeLog is only for <=0.2.1
+# and README.md doesn't have anything useful for usage
+
+src_prepare() {
+	sed -i \
+		-e 's:#include <stdio.h>:#include <stdio.h>\n#include <stdlib.h>:' \
+		${PN}.c || die
+	default
+}
diff --git a/media-gfx/pngquant/Manifest b/media-gfx/pngquant/Manifest
index dd66e26687f3..cefe2e460772 100644
--- a/media-gfx/pngquant/Manifest
+++ b/media-gfx/pngquant/Manifest
@@ -1,5 +1,7 @@
+DIST pngquant-2.11.4-src.tar.gz 142149 BLAKE2B eccf0c7a279d62981cfdf44ab0e378b2331377cd892019161b453edc7ffe73616a2aa83a07cf5f8d7292a0f96bf25612c23129348463cac73647021eae44f160 SHA512 171949977e1fd71c05bd75552f2e62535f6c15f31c3192cbe31df7451091634a6fbbfd08b47dd040f353af3b5f41fcc13db4421a212ca07cc6836f029635ddd0
 DIST pngquant-2.5.2-src.tar.bz2 54611 SHA256 5b064596305c6f765a753e96e08224dd71b31c20b72bdaf0f205da16b76a347d SHA512 d542765bc1f7e22fd7199cd4aeb8dc7b82fa87fe05c53ca6b7919522e081c861d419a541909284aa4e5dcfeeedb19729a50150d9139389c1949b3aeaf4933401 WHIRLPOOL 84682a44087a51a5475f1d21e3ce9e58fbb7cee81dc76c3e52cd234a28e80bd56686cc5323dcf8202e3a46fab3ca59278f45efee54dc93277040e742592bb064
 DIST pngquant-2.7.2-src.tar.gz 91721 SHA256 75801ed048c40cc4bff12773892d16d7ff00c11b9c549845c2133fd3abca17c2 SHA512 ab84651cf0b5f3af2095b5741e0d03f4ddedbed59e75c5c75faeac20efa8dd2fb482f2a8d9447b5673e9ae6970b9af8dfdbe40062bdf377206ee87eaa69ed9d8 WHIRLPOOL 88a6b77b8204e43f5f97815f34df103f31936e75f4e4822d7f8ac3d2ec80d5a584af7645277ef57d663159d088ce326c15d3eb69d016a682858e3658aabfa410
+EBUILD pngquant-2.11.4.ebuild 1001 BLAKE2B b448d71c1b9b5f97cfbb96a2f400933c697cf7821f34a1e78731b6fbf23856fcaa079d9a43d9346a2899b55217f6f7ce65a0f52315f89464ea321ec2c7f75224 SHA512 e3c453cb022071993544a910d95025e88222732fd5b533b4ef7b4b4c8fbe42d052528c9329af704d9ba53e7d8e522b2f87895013a337999afd3fe5656ea805cd
 EBUILD pngquant-2.5.2.ebuild 946 BLAKE2B 1331a1223d2b795427398ffb3c002ab4ec8e3ace914aa9dd45bedcd927c09e325894346f5f164827180a2651cb4953148c64f71c9bcd5ed516989ae0aeddc398 SHA512 0a9e059e99d0c96b4d4506c75edfce6f70ba73b0395bbb4953fbd67b2d790ecc949b111563396b8295168d91a5f196a404d3892e6a16f3fa1b1916db97a4b314
 EBUILD pngquant-2.7.2.ebuild 949 BLAKE2B f1cab7bef58f710abc1ff6a6a190ab47e79f689add003de67877e495855516330268df9a6f467abccdb779a2a3eaf369c3a91c29b10540c1b845171acede851e SHA512 f895a15658ad06e9f18bcd388877bc0519f4131d6cf6aca3924300073dc684bac4d5d07c403040870d14a18ad88e7832506fceba0da38ca2063829d5e398fed8
 MISC metadata.xml 542 BLAKE2B 689fca130bae0cd3fbe8401a272fc6cf243f278536aea44b81d1695b720950cb14883291875abb60a6cec3ba7acbf58af36ceb7003816ff8c339d1b4f994fe55 SHA512 77bc685becffe4e065318a0f5310402fc72d5b52a5a29d2c812b3797ff40761599b7d1df9d4e6ae73308de5c41763004798c30053a9005cafc8282760c4b7225
diff --git a/media-gfx/pngquant/pngquant-2.11.4.ebuild b/media-gfx/pngquant/pngquant-2.11.4.ebuild
new file mode 100644
index 000000000000..fb15ab76cb4f
--- /dev/null
+++ b/media-gfx/pngquant/pngquant-2.11.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="command-line utility and library for lossy compression of PNG images"
+HOMEPAGE="http://pngquant.org/"
+SRC_URI="http://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}"
+
+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/printrun/Manifest b/media-gfx/printrun/Manifest
index cdd9efdd9db6..77355e026ca3 100644
--- a/media-gfx/printrun/Manifest
+++ b/media-gfx/printrun/Manifest
@@ -4,4 +4,4 @@ DIST printrun-20150310.tar.gz 906153 SHA256 6edaa533df5a590f55039b81e47f61881d2a
 EBUILD printrun-20150310-r1.ebuild 756 BLAKE2B 4cca8978f7cd6c05453dbd70ac09d7244ae7ffbbf1f41cff7d940568d51936f1951dcd1322984c04c9057648252fea46e15f477a0bce9718dd9ff6b0fe4578e3 SHA512 c002e13d5d6ba4018135ccf0f50745246ea5e4e747d43b4a64a4b10c71551cee9ff263b89e68d87ae42349bb0ef71da7f27b89b823204f73c3da9f4d4a814626
 EBUILD printrun-20150310-r2.ebuild 941 BLAKE2B c5790772b5082e9e9da436144f04328b28aa61a0cf299f95b223932cb2f1f6c2c596b5f86f915e34ff1887d09d4c722f4f92cefe182ad4b36a9e5e0897800e71 SHA512 12c118df5c164b9c360589c174e3f4332104995becfa544e8639688bf64b8f9fc639a39145a448dd1238f821ee6bf7dea75a0c78c733c2e84a9ec6a161722035
 EBUILD printrun-99999999.ebuild 817 BLAKE2B 8bfafded94054c6ce9300992c8bbc26f09d18ea154249ad38b3af560458e1b36755f0e84885d0f8a82366084c610d5fde06a8f6d21bf2f2bdf7816cdfb965481 SHA512 d8454c7f5b0431dfc6ff8cb79c6ecbea46b600f087bcc3f096c73f32b93cef0be5db092290ca5445ed920d54c235fcc0c22d00285cd815c4f4cf017f27dbd0df
-MISC metadata.xml 728 BLAKE2B ed271cf40043dd37eb2926a92ed34b22ef9936180df5d984e4e8aa7141b108bca066bf7c0260b5dd6b585ef4f647b76d94c7aa9e56ad8716eb6701e7522e15f0 SHA512 37128e13862a70950c89d42e8d7bdfdd7eee598890f9c80b7c60a903ac0466b2e177546d5a5cd23883aaef9128bdae5428172b39b6cb65f4132fe2f9d3880723
+MISC metadata.xml 733 BLAKE2B 974af1352e4ea808c0160859b515c005fca1c18f1324f248eae861570f37a55aa38c85425e6dc0e754a1d82bb86a3d891f3fc8fd4c9452cc0850f0bfdacf1ce2 SHA512 93eb29b57b903a06fddc055e0699782265dc7e1603872954ac6581fae061089f0368d7b46c6c37811bbc197ce2edf8395090e1ada742920eec0e20c5be6176f8
diff --git a/media-gfx/printrun/metadata.xml b/media-gfx/printrun/metadata.xml
index 0611e6680367..e071fa596fc7 100644
--- a/media-gfx/printrun/metadata.xml
+++ b/media-gfx/printrun/metadata.xml
@@ -9,11 +9,11 @@
 		<name>Gentoo 3D print</name>
 	</maintainer>
 	<longdescription lang="en">
- Printrun is a set of G-code sending applications for RepRap.
- It consists of printcore (dumb G-code sender), pronsole (featured command line
- G-code sender), pronterface (featured G-code sender with graphical user
- interface), and a small collection of helpful scripts.
-</longdescription>
+		Printrun is a set of G-code sending applications for RepRap.
+		It consists of printcore (dumb G-code sender), pronsole (featured command line
+		G-code sender), pronterface (featured G-code sender with graphical user
+		interface), and a small collection of helpful scripts.
+	</longdescription>
 	<upstream>
 		<remote-id type="github">kliment/Printrun</remote-id>
 	</upstream>
diff --git a/media-gfx/propaganda/Manifest b/media-gfx/propaganda/Manifest
index 6d1997648272..cd2ad97c59d7 100644
--- a/media-gfx/propaganda/Manifest
+++ b/media-gfx/propaganda/Manifest
@@ -1,18 +1,18 @@
-DIST Propaganda-13.tar.gz 4143608 SHA256 69ec4fa3ce48ad8f775ba9f1fbb4c7fcc8e7046fc7290782f3dc93fc4e2823d9 SHA512 c945e87f90e3f2617916a6e66522f9f0395e12b036bcbc4ef1b072e05443b865122dcffec2358fa98138ef14104d6a2b02285c19c45b26ee64255b869049a09f WHIRLPOOL a6bbb07a14e77196173ab71fe0c838d36d322a3c9467acd0bbb7385bfa52ed9766573c9bb7c2b584b23dfdee32ed95b247c73065f41cdfdf36602224f59ad1e1
-DIST Propaganda-14.tar.gz 3734658 SHA256 1b13ba961a029e15e22c63abaeb237f2775a1735405209f97c62890b7982c21d SHA512 aa0ce453096501728270b995ea91bc79be425f7b37255753687410c9a6d3205023b25bb9b3adc41856315d143099834d490547422d640a964b2c9ff751e039fc WHIRLPOOL ce344f0ea32603fdc8ad3235b51c48215eea9ff8b31b8f23da9db87f193ef7991ef25e02ef50a08a01384424916eaf7778618a40931c523e47b0b6c89e1aa57c
-DIST Propaganda-For-E.tar.gz 4234559 SHA256 af2eb4c656598cbd3cb1f8356be264eaba63b438bc4fa6b08c5745b44308c49e SHA512 3c44bff6d78fca42e31c1229a27d0bc1ce2931ab16004242444772cd04ce09bf36940aa498a2e32e45470122a6a79e08d5ed2b32d530bee329b47faff359e93d WHIRLPOOL 2251d208766751d1415fcdbeab69ed45377233aaa41cd6d8cdf93470c04aead5236485a4cd8c5873400025b532fed048d74db2ab9e267bb85320aee50cade218
-DIST Propaganda-Vol-01.tar.gz 1086117 SHA256 a859a05f3d9b4c0ed85aeff37fee68b404fc7767400b978f07b0ada16d9680ea SHA512 58465f94d0df1b2445f02a61202e8fd6af5759250154684e2a1752d031f5e2c09156ead538d43c519bfa7bb572cd8c9b9355c4f014706072528c06ac35e73b98 WHIRLPOOL df908ffa8d445348e1f82b32a0e7dde902c5988b36d333d382585b65da825b0be496c5e9d0f5c76d70689efd6a60e08fcc252a9ed2eb31231ef1c7b5633cbe96
+DIST Propaganda-13.tar.gz 4143608 BLAKE2B d14fda5d9d6b39034999013233a7ec34f87ca381b6bd8479f771904d14879c647c2843dc8a4bab637d960d80a631577a925c19242a3212f7cc545bb7aa75c471 SHA512 c945e87f90e3f2617916a6e66522f9f0395e12b036bcbc4ef1b072e05443b865122dcffec2358fa98138ef14104d6a2b02285c19c45b26ee64255b869049a09f
+DIST Propaganda-14.tar.gz 3734658 BLAKE2B 1e7d6936a521a17b49a049646ddb2f5aa00cacb0107afc38e944dfa8944ddc4ca21f2caf5fe405c2e2c9757263d294ac42fbc2305d47cdee4ed649656133abb1 SHA512 aa0ce453096501728270b995ea91bc79be425f7b37255753687410c9a6d3205023b25bb9b3adc41856315d143099834d490547422d640a964b2c9ff751e039fc
+DIST Propaganda-For-E.tar.gz 4234559 BLAKE2B 53b719428fa9c9c622bc28db0c261efdd8897d12aff45a47a2c95cbc46ceae2c2ad48cd65ab5b69a5d417327371249892efe0efe2ae67eb02b10a9f4c05f665a SHA512 3c44bff6d78fca42e31c1229a27d0bc1ce2931ab16004242444772cd04ce09bf36940aa498a2e32e45470122a6a79e08d5ed2b32d530bee329b47faff359e93d
+DIST Propaganda-Vol-01.tar.gz 1086117 BLAKE2B f0f50411a2fcd41eb5a27f4c9defb22d84d90fe4c2000ea58bcc317e866633ccf337dc16498b8e0507c855f668603273427e088a0166f78904659c76a5503c89 SHA512 58465f94d0df1b2445f02a61202e8fd6af5759250154684e2a1752d031f5e2c09156ead538d43c519bfa7bb572cd8c9b9355c4f014706072528c06ac35e73b98
 DIST Propaganda-Vol-02.tar.gz 335094 SHA256 d5184bcb3a92f984a79087432ebee41bfaaceaa451d58b1e7d7471f08d164595 SHA512 f97b68a772f739fb1763409a9046a5bebf17958ea64ec0a843cca546dec5d2dabb14be9494d8ebb144ccc27f9bcbe6a6fcec670b27e5d74ab06ec9147245875d WHIRLPOOL e3ac7a290f30c46ed5edc154599bd6e5571edcfd529cd8b6a5ca3d98fb2489ce42c70ca36dc59de93ef2bc61feae58d5483fc6da7cd53d3dbcccb346154532dd
-DIST Propaganda-Vol-03.tar.gz 1186808 SHA256 f906297306e55398c4335db7cb5154b0c7ef07e40323b7d5698f988b187bd064 SHA512 ea41270952829d8c089615c9fbfc160b52383446ffcfd818a18f56be30615be5e6ec5cd6527792a926a4ecf7b738e2982c8614b86a8abb37d395bbc32ec1febc WHIRLPOOL 4b5c863ccaf8792eebfb1025728ccc4eba391ef9450f6f0d8b2823f4918f6cc0a54e8478e4f8846c1f156e896cd8e723570d9125cb3cf58f9e239a61c6db6145
-DIST Propaganda-Vol-04.tar.gz 1136867 SHA256 f1b8e04a0935b97540783c67e01942aa72a54609dbd1a8d947f4a03248ed7e8b SHA512 567d6379d9bbbad90216576dae5260f52e45d3d0bde09dfd9190a5e24cdc70955004edd28e0a45a2a5107ca9b0f134ff8918261c39e952ff0075f021465767cd WHIRLPOOL 54289e10fef21f5a372d5d053b1efdd13d359b9fc8814b60b5a4fa763683d3ea6bcfce89f79322280466ec82ac8e82e1fd57b8918fdcc004ebeb00d463ca3730
+DIST Propaganda-Vol-03.tar.gz 1186808 BLAKE2B bf361c280f4da1b55f7d5c92bda00110dd21d2dd30fba8e39a847bb48ec04826df9558a381d132ae0c77e9934b8192feaeceddd947c5500f686f9d07a558ff87 SHA512 ea41270952829d8c089615c9fbfc160b52383446ffcfd818a18f56be30615be5e6ec5cd6527792a926a4ecf7b738e2982c8614b86a8abb37d395bbc32ec1febc
+DIST Propaganda-Vol-04.tar.gz 1136867 BLAKE2B dfdf4c09e5f13a2a983c18b8adcc752a74b1d670a908751f44a1c2aa54e167a3a2e1e595fb3e947c7697f36b8a9af0f7fd57627f42b6ec4a5320f5563646c59c SHA512 567d6379d9bbbad90216576dae5260f52e45d3d0bde09dfd9190a5e24cdc70955004edd28e0a45a2a5107ca9b0f134ff8918261c39e952ff0075f021465767cd
 DIST Propaganda-Vol-05.tar.gz 1020372 SHA256 f886a25a0b2401bdefd62a770afb4221b1385691492dccbe683276a69447ef1d SHA512 c695545ac2fa72287e014d4598025d984c04495b6ed32e1a3eaa295b9af107516431516de2f3cf779a209b10c3245d2fee5de5b5f6c2e3ccabc831824e53bbd4 WHIRLPOOL c8afa9ca1d2b96974f9d0c192429ee7ca36ff8e5fef8196a2ff12e1b42d93bf14722787677ffdfaf5ab56c91b801d209d360f81bd6123cffec60eaff44126ed1
-DIST Propaganda-Vol-06.tar.gz 1165404 SHA256 718ae670c608ff049b0be010bd894529a88702ba399f8502bf60648a3ad6c427 SHA512 bc1475ee96ff7d26c288374c40ee7cd538ad64908c0604bba1cded56600ec6485c24e89ada3acba5dd8932b9302cf0756ed00728903e480790d063c846a7fa4c WHIRLPOOL 1c8e502afd59f07c87e2303242ab0c6da4d067b31445de08f3a21ea3079cb6bcaacf0c2da3ac4df87710795528c20915ec909f54159258689ca9a74c13a46aee
+DIST Propaganda-Vol-06.tar.gz 1165404 BLAKE2B 8a23745a5c2e22e9471afb8c0a98971a41bfdbb98f3d4fe6cd5e9c794485d89b6e6db851ff1ae3d265ca317dc012228234e1b8f409679c9e7acfd7f1601bdd34 SHA512 bc1475ee96ff7d26c288374c40ee7cd538ad64908c0604bba1cded56600ec6485c24e89ada3acba5dd8932b9302cf0756ed00728903e480790d063c846a7fa4c
 DIST Propaganda-Vol-07.tar.gz 1736281 SHA256 cc4219992257620d85f34db0e542bd0d8b9932fda42b93fa2a874aa56a3dc113 SHA512 0a3c7fce63985af882c0297697a06683adf0cca1c45662d8113f970a5ed631db1ffa3e2ac32966e561100e57849eec4442ed7a5b8ead25c988aa467293b2e2bd WHIRLPOOL ec87b0963bfdeb8cb8cde5fd02e530efe7d04c7f93ac8d256d7e0cc9ce27c98ff7030485be995fe19fbbdfdbe2ae830a395e485ec92158282848087c4f25deb2
-DIST Propaganda-Vol-08.tar.gz 1486421 SHA256 34cae16d1cb8ec07c309ab450a5bcdffc0ed02a6ffa3f594c2f50734f6e65895 SHA512 357143586e5b882a13f78b2aabed4c7434f45be54b6a3a46601f6ead2307d36e28c9ec56c68a6e40fe6040a3b093b9a9d1d9624073f9ed711f55473185df3f39 WHIRLPOOL 2608a4ec4e96b40e97340158c4b1031bbf11cee6eb7fc4f20d7780a6845e6f8a77ff9704e9703a471d6055efc40696fdf1583fe7aef7ad1ddc5a28d5401366c0
-DIST Propaganda-Vol-09.tar.gz 1664869 SHA256 1029ce133b109eff2e64ee97563488e22e4d0e75e4e0df29e409eec07d665ad9 SHA512 cd70f63d9a68cf1d73627d31589aa6c2bb42ba014c6c0fc9e0b2991017bb0136950f4bc9d478b39e156ba2039f72c970ad9ef4b4e0a73294ffec1c6adfe4b303 WHIRLPOOL 5d58e77d1ceb31e83fbf6d229a1fed799348c81f7fd740c6d8aa45f744c40f5970632a3eb232599eb48f618bc3af8a090b098ce3b6c4ed782a82874334e97715
-DIST Propaganda-Vol-10.tar.gz 6376914 SHA256 2a9df4a6af44aa0a4e061412e67cd096cb1d13eddc6fbb3ba7a2b0a2a869cf5c SHA512 080d563442050f1266d09fbb2148d14173555a213ce1fb110ce4aab2d85a18563543705227b1e68146dd2f1a5b1bb7cc75f9512f823a4970f92b55eb9251b1fd WHIRLPOOL 4bf5d9944bece8f3628878ae52d40e5598b906e6ac283c0ec45b73534af825bfc6a123970eda40ea47c8579f30ae76104dd08b6fcef88786f264d2cfc7da6633
-DIST Propaganda-Vol-11.tar.gz 3030910 SHA256 c9aa7e8379b10dd4353e791b3f90aa43543e3d8745c0a1630343aea7ab52c515 SHA512 752a3e27bfbde1f694be3f57e4c7bf638159f8e7b06c00c703a82ff2795625298feca20f91beecc651da66ac7b6dc5e7fcfc0b5d7b465118e94f8769488be1c7 WHIRLPOOL 8cb9b5df0ebac9ad72044786960fd3dc67e2e576436ffc8443692c55bb495bd2be9bdbd8913f6a3d0a4581cca8a6d868f12c616b82e3f7ccbd1b76b73ecbbd9f
-DIST Propaganda-Vol-12.tar.gz 3140955 SHA256 704973ebf106b0e30ecbae211f1a67daddd9f84f880a191d03a726010823d919 SHA512 1cef61c88a4cbe4c757c05c1ecf2d72ab67ad13e0268497971f9a11047351d0a0e8770a69bd6754672b6a8c99e69a2e61693fb593bcfb4db7003cd9eddd31f80 WHIRLPOOL c0c98c4f3f32927974b7cd36b550737596f830924952c16faafa3f52243bbdeaa0fa0e2c7a46e3d63320817d836408489bc58450ea9e70e07646d81ab4b3649b
-EBUILD propaganda-1.0-r1.ebuild 1176 BLAKE2B 6699e2187f325a19c1f2b3f480ae3f5ebbe711adcaa03a3c82c8317bd808058473fa0f0cf9ebb1b471eecbc6229d02c5a8bd84bbe2191e311750213dc7d7381e SHA512 013d23575e23faa8b34bff19d74b79c9372722cca876c9a8e7be51628369d7e5753f58f573136c151add46f1409d96e9c1a493bbfe61339cb2ed79b8fb2f68d3
+DIST Propaganda-Vol-08.tar.gz 1486421 BLAKE2B 866e76c153f0fb4f16aea95d158d8f2e06a531b11a6e31a7525e069741de85fb34f0f1e0b0a4de7d4d63d66f47e9e46f30039caf630081e7e3702e49ba8b58f8 SHA512 357143586e5b882a13f78b2aabed4c7434f45be54b6a3a46601f6ead2307d36e28c9ec56c68a6e40fe6040a3b093b9a9d1d9624073f9ed711f55473185df3f39
+DIST Propaganda-Vol-09.tar.gz 1664869 BLAKE2B 48baf8efa75f18141a557e0f36a982232d480ee3454ddf045a71a317e9fd56d059639b6dea11afdb7a4a5cdef3f451334eea367373450d3efa5732a2ef5d5b05 SHA512 cd70f63d9a68cf1d73627d31589aa6c2bb42ba014c6c0fc9e0b2991017bb0136950f4bc9d478b39e156ba2039f72c970ad9ef4b4e0a73294ffec1c6adfe4b303
+DIST Propaganda-Vol-10.tar.gz 6376914 BLAKE2B 365e96616d8f82321fd0a0460e6b14e5db7b96942ffa49f193ac86bba76c2394fa451718e611e8697ccde3ff02a6ac649d0ea85a04fad76a940c3769418b9751 SHA512 080d563442050f1266d09fbb2148d14173555a213ce1fb110ce4aab2d85a18563543705227b1e68146dd2f1a5b1bb7cc75f9512f823a4970f92b55eb9251b1fd
+DIST Propaganda-Vol-11.tar.gz 3030910 BLAKE2B b5637635165557c079d7801b91a6b1d7372a7ac1ef1ba414d0cf172d652de779fb05f106f0ef7cabebac79bbc8a1b21cabde0f34a14735eca17ccb193ade0882 SHA512 752a3e27bfbde1f694be3f57e4c7bf638159f8e7b06c00c703a82ff2795625298feca20f91beecc651da66ac7b6dc5e7fcfc0b5d7b465118e94f8769488be1c7
+DIST Propaganda-Vol-12.tar.gz 3140955 BLAKE2B ce23e5e781bd1d1cba757bcee71df199627e18bb72eddd0a6dc5759f1d80fcefbb4daa6048450aa51f9b4830ece14461ef63a299e0c13d43a1670bc8b1a4b0fc SHA512 1cef61c88a4cbe4c757c05c1ecf2d72ab67ad13e0268497971f9a11047351d0a0e8770a69bd6754672b6a8c99e69a2e61693fb593bcfb4db7003cd9eddd31f80
+EBUILD propaganda-1.0-r1.ebuild 1172 BLAKE2B d77e4745e589e8ddf7273d3fbdb417ca79e00d8b51b7c98c60eaf72887656b7a3ddef5bfe17ec534407b5a051f7b7824db01e6fd12116c226408128f4324aa34 SHA512 449456227f619afb5e87503ea8accbc8b6ff94efb8cba4e7419c56a8a6510db998c0cfc50e834a04e592b842f3092b4ad059f035081cc92dde824c8e8ad3e308
 EBUILD propaganda-1.0.ebuild 1788 BLAKE2B 7f84ff0975e2a666aa715f0bd7036b150327504b3228c234aa9a6e44c41edb27ab1da4a9235e84613ee53ee88887262eac9c23d64f935fd0603a524afd271809 SHA512 48cb923ddbfcec7f7ff0dad6d884caaa3b4fca63b4d6a206ef2c8b62e7f0e219779da4f95bcbf79583faf3e515952b318708c8af371b0980bd8913d8ec1f7439
 MISC metadata.xml 251 BLAKE2B 08302baf062696a2cd9e6bbc3469d3e6a2d4d03caf4734810ad4dd22f64347a70a36e38cff8753da18246f448a080829bce1ceae41ae418dbeb19eb1336e5dd7 SHA512 5425f5f068673da4e79daec7d2d22dc122024e4b54a53b8d7b07ccb2b138fb5657b7fe29ec640c6faf12d6efefeaf3a53d67e954ec8b9884b0ff3d959c86a13f
diff --git a/media-gfx/propaganda/propaganda-1.0-r1.ebuild b/media-gfx/propaganda/propaganda-1.0-r1.ebuild
index 86f584a1d5f7..59b1cfda3be3 100644
--- a/media-gfx/propaganda/propaganda-1.0-r1.ebuild
+++ b/media-gfx/propaganda/propaganda-1.0-r1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="${SITE}Propaganda-Vol-01.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 src_prepare() {
diff --git a/media-gfx/pycam/Manifest b/media-gfx/pycam/Manifest
index 4b4299a01d8c..732989c29fd2 100644
--- a/media-gfx/pycam/Manifest
+++ b/media-gfx/pycam/Manifest
@@ -1,8 +1,6 @@
 AUX fix-export-toolpath.patch 663 BLAKE2B fcd47ee6ec2008e34df9a451a98a7be941aa00a3d6fde0102adc0d434d68aa4f4ac4e558d33e07df4fbe7c630e91cc909f4912acf34c8eb16f67e0a9a550cf0d SHA512 d6bbb4b16e8df111a1961b70ae68d241fed3310fe71d7942a9da9dbdf64cb50d04e4a29f558bcbb3439a592a32d2d87f11b32dde15ebd64246db640498805d90
 DIST pycam-0.5.1.tar.gz 1680577 SHA256 e26a6db82efa4761a1db6b81de3165898430d5c14d09614b67321105d67e264c SHA512 f880d960f82eb374465a593f3b27e9f72148b3ceb99fde15bee4ccf1078acc8ef44ddfd9ee12f89e5b5e5ee14706b6e5d76eff7d0334c9526866ff263a057994 WHIRLPOOL 3f78eedcc6d745142578ef3e57141cf026b2ebca1a699a340237e2288c9c7054a1226ad47aa947d5de612c44c4445fd451e8adcfe7c0783b59332cb1a12998b9
 DIST pycam-0.6.2.tar.gz 3070572 BLAKE2B 3dbc6123f92035de1a9fa23453463ee1f45543c72f4f92b6d367d1031abd4cda638ff6b5bb261c8ae127c2cf875cf44837e76b73777acc8d58aaa3d95ec67894 SHA512 ff96a40aacf92ffd20e729912fc81177ffc01d688cfca300d31dd71399d91754dfbf5b864d95a88f938286e38c759c372968e53c29041653c85f446c6c9eca42
-DIST pycam-0.6_pre20130416.tar.gz 5766314 BLAKE2B ed29f1f553586b0428851b5d7d24fc56fc92351e5e9b1cafd3066b0012e39360223a0383256bde16ef9d888dc3631e2d8994abc19dbaecc4cace54b0828d523d SHA512 04d0a3328febbe58010cf9ad990b8c059f9fe0a17946d8485979082dfaa0b3b8705ffdcd695dca5887d9892a55285cca7acf774fe7c407240103da2de92dc9a1
 EBUILD pycam-0.5.1.ebuild 486 BLAKE2B c721319cffbe6ed1d25722792d06bee4877aed0a17b71a1ee92449274267f16c78d0ac8bdaf073d8cf7f65372bb68605e5bcc7f71e166553b75a0e68cfb46961 SHA512 ef68e5b6c3204756789d460865702d2e64cb65b5a4e182908bb7ef0a85f1f5ec024d36cb3d9eed73276398aa2a140bc082e9e90b218b1fbb2232f9ced51d9569
 EBUILD pycam-0.6.2.ebuild 549 BLAKE2B 338b8eb2ccc7256efd5358231e5c3ed0b956cecaaace505742af220aeaad923389a6d6902a4491a3981855cb56f2d74fe371e1d2f9a171260c3b73cd9de4d038 SHA512 297de082c61cf2317757fbf49285b85072001154cd1ece0c6389ec5efb0ed2b5ec80ae4f8f5a02bc521291133640557aab0d4a906fb91e4fe68ce2891af524aa
-EBUILD pycam-0.6_pre20130416-r1.ebuild 603 BLAKE2B 679f7fb045a99c62c76d0ab90c8293af2333bfd9c113efa5bba14c178f0e74f4d4b512204cf6b7a273fb7091d2a4a72773201bff0fca2713d731d89530d6c4ef SHA512 e9c286f58e35381b714eb3c0a979219a311aad6a50d9bea496ca7900e67548a7efd330a76092c2fe9372f737ffded68a22749104e4e173fbce535c20659c364b
 MISC metadata.xml 290 BLAKE2B 15f25f9b0eb3e58221cf49040cf9b0f923bc8936ceb3040de236b57206df3547e88f28cfd4666cc83c2021f4e23012ed33e352282aa3f6b668a2b9568f4b5a5d SHA512 b3ebcaa51728a7fe09029f792e3ad7dbaa50b30e98d4e523d7258ab2d70824f3722c40ba60cda6feae303dd3779cb65cefe560c9740f1b07e6d2c905660bf2eb
diff --git a/media-gfx/pycam/pycam-0.6_pre20130416-r1.ebuild b/media-gfx/pycam/pycam-0.6_pre20130416-r1.ebuild
deleted file mode 100644
index 1eb3bef2beba..000000000000
--- a/media-gfx/pycam/pycam-0.6_pre20130416-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 python-r1
-
-DESCRIPTION="Open Source CAM - Toolpath Generation for 3-Axis CNC machining"
-HOMEPAGE="http://pycam.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~slis/${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-DEPEND="
-	dev-python/pygtk
-	dev-python/pygtkglext
-	dev-python/pyopengl
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}/fix-export-toolpath.patch"
-	distutils-r1_src_prepare
-}
diff --git a/media-gfx/svg2rlg/Manifest b/media-gfx/svg2rlg/Manifest
index 076645dffaac..c500e13fcbdd 100644
--- a/media-gfx/svg2rlg/Manifest
+++ b/media-gfx/svg2rlg/Manifest
@@ -3,4 +3,4 @@ AUX svg2rlg-issue-6.patch 1221 BLAKE2B c7440b817c14851b20d5a33712029bc3430a59b13
 AUX svg2rlg-issue-7.patch 473 BLAKE2B 625268097edb59bc3c71ad3ff486d293dbbcfb0789c2bd73c5848c4e0aab4ec6ba2f9e5a28b23aa12f141f92e893d4e779b871e2d5fd05960cb263d05b5bcf8b SHA512 42be68efd3aedb00d1461dfa99de7aebf9477a531a491676cc189a7299e206650df9a9bd51d27c3a2cf6e761f8892c5b61577eed1b232f5109374df32329d3e4
 DIST svg2rlg-0.3.tar.gz 490908 SHA256 05db4480b90e912e08727d4cb24385fe33e8436def079b8f149b61a350638bee SHA512 44efebe7d978a46ab26b4bc332ad08db9236a86b160d73fc1fdc2b54c44bb2604147ae458eea1fe81c579c7f94e39869459567a6b6b3a551d6db6132816c4723 WHIRLPOOL 257bd5c50f86578b75b510c9ebc78d32155d73d321e40c83c64ddbe644d37c7a49d28660f0d7a509caaa1760f7715e405cc197eb4ef4b43f5d05fc9445625799
 EBUILD svg2rlg-0.3.ebuild 806 BLAKE2B eedbfdfd72a4090b52252bf85702225e89c0c84138198c425d18825041f073e40d3ef3086b4015615bcf629c8a247461003e90e454937ac9965b3d2589708a1f SHA512 b7e1b0662cdbc32b179daf16f62244c93d65ea356f2604c900517fbe55284fc2f8dd4a3e0e3da649a1a7841e7e9854d0950c9be8c262e2d3f753aa6be7691fea
-MISC metadata.xml 371 BLAKE2B fe687095eabdde49c60de46f62c4b618bb4630775223cc1d45e577453e77f6375ec85b2e651f3fc85d8829115040a0207719b9ee3f4f5a742fb717b6d8293fd0 SHA512 1d0eee581b8e4d17ebfea5a3bed36317ebd37bde175791616311f36834c6105d7c4aebddfa7fa6fa54a9cdebd5a1450757411eec9923810510abf89b1544a0ea
+MISC metadata.xml 363 BLAKE2B bab52a0cc6fbf81e6993b0ce74a89882a692bd008f0b193b3f30a665cbb8e6f6741f594bc6297a606c125bf2751c189142d500264e5d909b3715716c113b5ec9 SHA512 ab6cf1b5b4bb40fc26b110c6d34ea4d21e80c127549cb43cf262a43f771113494ef357c811d70523c07a3b9da0e3137a524364c997da4f3f25e9cddbdc125813
diff --git a/media-gfx/svg2rlg/metadata.xml b/media-gfx/svg2rlg/metadata.xml
index 9563deaff36d..bba039ed4aed 100644
--- a/media-gfx/svg2rlg/metadata.xml
+++ b/media-gfx/svg2rlg/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription lang="en">
-		The tool can be used as a console application to convert SVG to PDF
-		files.
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		The tool can be used as a console application to convert SVG to PDF files.
 	</longdescription>
-  <upstream>
-    <remote-id type="pypi">svg2rlg</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="pypi">svg2rlg</remote-id>
+	</upstream>
 </pkgmetadata>