gentoo resync : 04.05.2019

43 files changed, 109 insertions, 1078 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index c42c64f912df..6e14b000e891 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 009f5701b6cc..887434518239 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -2,7 +2,7 @@ AUX darktable-find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b59cc73
 DIST darktable-2.6.1.tar.xz 3473300 BLAKE2B e2194d9d967872b3dbc5dd608b3aa946424ff8a20a00b8cd8e1e9dd7ad3146acd791d2a7f20652d4673fdaac7bec86e405e055bab664c41b601b5788f0f15e72 SHA512 0d92fa35629ca02ca7cbb2910966b3fad57e536c967fd05381ad02dc9645106e6baaf1a93c1c186618624850c876f23305704e41d7151150e3367e21c415a967
 DIST darktable-2.6.2.tar.xz 3512572 BLAKE2B ee3070ac0f6b6b1c401865801631fb28397f484f30778065b7f899204813530a47ff6e752504b645f59bc29f868e1498e39f5f4e70f8259d8fecf5abc3f15cd6 SHA512 e7a90535747a8615fa2dbd1eb05f81314cc61c689a8a85fda0e2be40208ab0248e6f6ef296bb0894d3d527ed47c6cf6640538029c0c2d58a38d2d5ce10f6f5c0
 DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce SHA512 e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
-EBUILD darktable-2.6.1.ebuild 3735 BLAKE2B 12db2af18017c4770acf9553035542292f501149583e4037961f3f0ffa4bd70fd123e97f0d7771c95224482da615d72ab6458ea0f2fb43076d6de6924a32e010 SHA512 7d762bad746d01c80bd85c33233ef1dbf8ab7e4b5992c4dbeda79bb5579bbfece81903d3ad8532d0ab36bd0a1d76a3a22eb2c1285ef761cfa36de9542eac506d
-EBUILD darktable-2.6.2.ebuild 3737 BLAKE2B a030fb0083587d73a5195a374cf37a7dea114a9207283841a4e07bf071cfac7ee3db77dd0f840160887402297041e64a29a9b4565088003c1a60aea78a39d49d SHA512 b8a7e75e9c247c12b1ce5c584ec3b2524b81a0f1aae4fcbcf284e9e37858ba70b54e0942dd92578eac84489415531a40e9827e8df26e150054833d915facc790
-EBUILD darktable-9999.ebuild 3131 BLAKE2B 09a86d4cebb9c362edbd7c208ee1b3cb84743d25357ec7d9bc1141161587e8b7efaf4ab5261802207cf5b075cce222d67cb304351e476d5300c896620330adb2 SHA512 86db075f0f28a1cea81f3f1edd45b2adad7888f2637af58e6babd5d45ce13f015e3c598c7cfdc4ba3edc979cef3002a9606297ccce5670d19df061e5c7ae4dbd
+EBUILD darktable-2.6.1.ebuild 3763 BLAKE2B df499fa003b19a7f98fac89c5ba73209dd0922e733d596e9ceff9d5ec7034777eee8e57cf6418af3d37afb628bc7ce3bc616617034477be54c62b4d36ec454b9 SHA512 8a9504b625666b88ab790a250a725907d068fccd66cb2e70d17b0b7a55824eb3512fa320b4009f6300af242b8533a0a766c8ad5f10b3cd89c28b7d1f5a4a32f5
+EBUILD darktable-2.6.2.ebuild 3768 BLAKE2B 177d62db7bc383244eadfb2cad1806d1e7cba958656bc597252b57431746807cf3bf2a310b577bc6b91a753e6d5198fce0935a46c0d3cf3c2fef50fe9ac8a782 SHA512 ca6cb3a3b140d1cb914a0e64beba5e7e97804fbc42a8419ea824d2ca6d68502eea60d7673cf093dd86b500739562a714e3f9bdbef16e95aea78687f56f274789
+EBUILD darktable-9999.ebuild 3159 BLAKE2B 3baf702f5ac1c0bbab2797e3ff2fdf63477b5f0050d2f23fe1bbf8090021ba30c68a491f34dffc18b5034d5d24fe3cc0625bc52a87062605e9e9dcdda55c7af8 SHA512 e5baeaa66d89d7a05b584a8d3b7d035b4a3c8f143a2d51cc800f7b3769ab9d71f85f171d362cb20ac64f79d538f1ef5bf428e216733928695ba3e0a0d4b87e3c
 MISC metadata.xml 871 BLAKE2B 5576cc42a46ae48d681043c22cbf206855a0770f112e42138a264950235b1af96751740800f8d9402bf5e00adf725511e557f3b65ec355abbe26de451ad5b70c SHA512 330c5e8b17daee39f3152fbcaed1979814b3b5d0aa205860e5ff309ae068037da0f4190f91672be17c138fcda91890954b2cd310b3725bada6f3916a73cebf1a
diff --git a/media-gfx/darktable/darktable-2.6.1.ebuild b/media-gfx/darktable/darktable-2.6.1.ebuild
index 9aad79d520ff..6a8e3830f4d0 100644
--- a/media-gfx/darktable/darktable-2.6.1.ebuild
+++ b/media-gfx/darktable/darktable-2.6.1.ebuild
@@ -111,11 +111,13 @@ src_install() {
 	cmake-utils_src_install
 	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
 
-	for lang in ${LANGS} ; do
-		if ! use l10n_${lang}; then
-			rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
-		fi
-	done
+	if use nls ; then
+		for lang in ${LANGS} ; do
+			if ! use l10n_${lang}; then
+				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
+			fi
+		done
+	fi
 
 	if use pax_kernel && use opencl ; then
 		pax-mark Cm "${ED}"/usr/bin/${PN} || die
diff --git a/media-gfx/darktable/darktable-2.6.2.ebuild b/media-gfx/darktable/darktable-2.6.2.ebuild
index 16cb27650ab5..48d249ae7306 100644
--- a/media-gfx/darktable/darktable-2.6.2.ebuild
+++ b/media-gfx/darktable/darktable-2.6.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_P
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-LANGS=" ca de es fi fr hu ja nb nl pl pt-BR ru sl"
+LANGS=" ca cs de es fi fr hu ja nb nl pl pt-BR ru sl"
 # TODO add lua once dev-lang/lua-5.2 is unmasked
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
 nls opencl openmp openexr pax_kernel webp
@@ -111,11 +111,13 @@ src_install() {
 	cmake-utils_src_install
 	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
 
-	for lang in ${LANGS} ; do
-		if ! use l10n_${lang}; then
-			rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
-		fi
-	done
+	if use nls ; then
+		for lang in ${LANGS} ; do
+			if ! use l10n_${lang}; then
+				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
+			fi
+		done
+	fi
 
 	if use pax_kernel && use opencl ; then
 		pax-mark Cm "${ED}"/usr/bin/${PN} || die
diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
index 891596c86e8f..6357db9016d5 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -103,11 +103,13 @@ src_install() {
 	cmake-utils_src_install
 	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
 
-	for lang in ${LANGS} ; do
-		if ! use l10n_${lang}; then
-			rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
-		fi
-	done
+	if use nls ; then
+		for lang in ${LANGS} ; do
+			if ! use l10n_${lang}; then
+				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
+			fi
+		done
+	fi
 
 	if use pax_kernel && use opencl ; then
 		pax-mark Cm "${ED}"/usr/bin/${PN} || die
diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest
index b2f922b86688..45b340ff29fc 100644
--- a/media-gfx/dcraw/Manifest
+++ b/media-gfx/dcraw/Manifest
@@ -4,6 +4,6 @@ AUX dcwrap 437 BLAKE2B ec88784e059ab07990acf3a47517f243502a140b451040c77f9320bd7
 DIST dcraw-9.28.0.tar.gz 194193 BLAKE2B d39a2d76dbbe74a2aed21c6b132ac25c9dd17312813e7f640a4a6d4abd4e8f1868ad596296ca9bfe61427b8b4764821e32679128747ff5a9452988814b77c638 SHA512 04609c4ddd5d1c9fa0ee1617d2ef25efdc22451e1fa6cf669d93abb1fa630a18198b30a289400f1814c8dca285547da8b081a1b00b085c00bb9318ad25c48a30
 DIST parse-1.73.tar.bz2 8186 BLAKE2B 4d7d69bbaad3fd69caeae24e4dfc77fa580d969f903c925f76cf0a7bdb13ff34c96ab6dc9917609ce886365f6971290b3af63aec9fed43b1876aa44dd951521d SHA512 06ffaf72695dc86bfc2bdd10d4f732bc428b72d427f4c10e93fc58536513477cf297adb56fb9cfc5ba5fd5b6b4cd197c33d8dac957a0a1bbe65b23393b64278c
 DIST rawphoto-1.32.tar.bz2 3841 BLAKE2B db7a80af4b06fc3709a9ae69d9f166c3323097821bb561af4e0ac9a1ef677cab6cfd5cd7896d1e1fce85e6fab545ced7d00ce809f97332bec594b94a27f77e23 SHA512 6ee5b6c4e4266c8e04221c894c4e737f8a6d2c6f0cc9c82db73064afd68488bd60de19b86b2d7b82780283bbb9f8156ef3149c1c730f09a00dce632744b44d56
-EBUILD dcraw-9.28.0-r1.ebuild 3081 BLAKE2B 81ac28d2e8dced5e8d92e3df18ac1ea04438a652930665b392c16670ca1b77da1b81c2c23cf9112060cd2fd4e2bef6ba93445a5d49f72c059bd44df4a2b786e7 SHA512 bce5809ecb127cd172687ec32cdd0aabb17a90905c6ff2ba4355964210d14f38d457812833d7dce40cc3b09a1852aba446c600d2feb2376a89da25006fafdf78
+EBUILD dcraw-9.28.0-r1.ebuild 3079 BLAKE2B f52a4ea3b8b1bd95597ae48fbab7a3d538520dc07d233d233bfd91f180dc7fd1b2de07a24dd838ec8865873c8fe9785f009ec08a857427c7603254d0044e9675 SHA512 d467db8fc86d45757854d21abfa9ad93f7d0d4d8b4defd81cd01206743c4a0c9f40cd59c6a2f76d19c723fb99e860332a796cae72d497b3aa04a9d27a75ac844
 EBUILD dcraw-9.28.0.ebuild 2963 BLAKE2B 7ba95ebd63edcf718d263183ec26860ee7e7a2d9a835a01028a5b7cc29ee6ca8a9af3f2c0f411eebcf88c168a2891b87cedcbd7517ff415cb674f1121f2c7194 SHA512 f2082082748c6006cf81fd7888d9ed0a9b9373aaf1855ae8f699d7c51eb79cde748b3a702792f0bcd0a40b6c8eb4e8c0e8e838847c70a6841997b01d40a844e4
 MISC metadata.xml 701 BLAKE2B ad6e3ac7425a35fb16cfde74a0d540ab47676008f1de56cdf3ca101e3724e3c8147cf76f548f22a38862b09c67f34411f44718359e6467bdf8b94b9d041cf82a SHA512 0758eece42b5007b53e04f0ddb6385fbdea360afc8a4cfd94d3f5234e4a677819cbebdca3a78c7f3765770e6ccb5b2d74f20199b7c167137fd15554cc14d0755
diff --git a/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild b/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
index b711bc3baee1..31216b8a0849 100644
--- a/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
+++ b/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW"
 IUSE="nls gimp jpeg jpeg2k lcms"
 
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 758b8e6c597b..a7b297e36096 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -2,5 +2,5 @@ AUX 0001-Fix-unwanted-automagic-activation-of-aalib-support.patch 1049 BLAKE2B 6
 DIST gphoto2-2.5.15.tar.bz2 790513 BLAKE2B e8a22d014ebd33f5e0976d72c5df8373e29106def5da575b69d21f2a58e9408c6ce399476135909e57111196d6e61ead953f66a00c9f440b7cf92e0da0f4a0f6 SHA512 46058a12a81379f3311911e103cf934b6eb616d7f81180615b385d01e855bf6ce998eb12811b9d032328ebed6acfc4456f3a383cfedb93c6967c9699654d4f40
 DIST gphoto2-2.5.20.tar.bz2 790065 BLAKE2B 6e10aa468696bc3eff51aaa3e886ad2373997f91597e42b33777ac56bf668f918c2fa0cb8b70eb8f7cb45507e67c9cfc3a46a7408449ad35cc3b743daf74859d SHA512 0350c38c264e5ba858ee14952fbf6ad271e7fef05e3f5f8eb3d45102099ae435fec63b09881efa99af60d4e086a9c2f69be92a7e49617643ab13146a5e4655f3
 EBUILD gphoto2-2.5.15.ebuild 1389 BLAKE2B dfdf84cdcd5c2305ee92572633308fd7f861677dfa98fe708b76b4ca6983014854e27f8c21456a9b1db806d2a160a0f45fe4bea13b5227290c0d6edeed444b1d SHA512 353294fbc29fb2c3f948e51906b91f5214948e2c6172a171a0a9a6ae19d318b215865bea8212c63cbfcfd5d54134acd9ab35b7cf8eba8c6677c9727833fd6ad0
-EBUILD gphoto2-2.5.20.ebuild 1327 BLAKE2B fc83ba6e8d6624ee700bf40cfc238ebf255b8e8c606c33cecb248cd7217a0ecc17b9a1e1239e718ca5f82e54d965e65052de6f8cb14de137e432879a29e7875e SHA512 39e2c807c15580d7b528b2712d36f0d29c5b261f1b489db19e1239b172e74f65be0fd2b1b6553d29a1f0b2523b800141dcd8aa15524376659532e7d06e8d3715
+EBUILD gphoto2-2.5.20.ebuild 1326 BLAKE2B a015935a02dc2013b1de40ccbdc459615151ea2279d22fa996700dde299d9c9045877b1d546ed84bd8803bd757bb703286e6d7c071fe9c21c0a117f4deacb235 SHA512 2b463c8106f657aa93f48b297a8897729a2a1b4fc8de8a6331fc94d501540d0a3ec1b9f137000412a62ed072256c9847939af200a4ee4e5e849f0622207d4118
 MISC metadata.xml 449 BLAKE2B 324e2ea46a0f8199033bf628d6719a51968a02af01fa3e8abcd1caaf7a4dcd892bfb6b8347a030edf4b2e8529aba47d7103789103a3b03adaa538338ab2ec91f SHA512 f938819a203e0119b1d81aa1dc812717d6ef02c3012f8ed667db452c7712bb7b142cee36d519ec33f4cf65ebcba7a660e2f67f6b66087ec6be832a4987e10c53
diff --git a/media-gfx/gphoto2/gphoto2-2.5.20.ebuild b/media-gfx/gphoto2/gphoto2-2.5.20.ebuild
index 7f9f28877711..271c8d93a66e 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.20.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.20.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="aalib exif ncurses nls readline"
 
 # aalib -> needs libjpeg
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 28bca7dbc1ce..6d81f83319a9 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,12 +1,8 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.10-40.tar.xz 8943020 BLAKE2B df7420a9460a339ffa439c90b1b2c4685be44a14ad15af946bc8274e53a6d92f4826d58ead494dc3de69ae4ea3063c03cd87349c1c42ab7cf6ee855e19cc304e SHA512 494ce14b546453c95ecbba369c2bfe86b8b5a065b27436ac58b6f38d09299e53883538aa2c29404497bdb6ce7f60aba5825be8244fba6e8c2be7b3cc2ac23e17
 DIST ImageMagick-6.9.10-42.tar.xz 8944092 BLAKE2B c616030d5624cc67879f698c52a906dede56db5f594cd1efef67ae7a7ce555f385b60b442e87904e3cb9f95840448e2a58d5121bd8e408812a3099864be880f0 SHA512 49ca335a7f0f83fb925995fa4249790cbb93142a0a30387f4d6c6ee9278599801da8b8644f3828afff8be841f55b64e31fda3bb4c6eea2c540bb94be4c926cb6
-DIST ImageMagick-7.0.8-40.tar.xz 9451940 BLAKE2B 26cba54acb5f8dddefb6a91eceef776e520dc6c01681e63904fb449f8ee440c2b96e535675d49ee92b87598d82d7dd75f3292100d75fc1d78b4658758c7c50e0 SHA512 09defd7bedfc18ff5ef8e404e2f1189cbcd97f087b05fc925cfd6e90b416e97aea691542a1eca6841b99c24dbeaf10d2437a74d8d380dfc5f70a1eb54ae61982
 DIST ImageMagick-7.0.8-42.tar.xz 9455976 BLAKE2B c3cc7353da73fea92c51febad8816c333970b91069ee54756acf7f1b9f57481fceec066dcb21845b2ebf1a9a97b17b9f8b6859d1becdbfc9553bfa148b5c0433 SHA512 88f57b69ece3b93b0af41e85bacb0b232cf07e7d0aab34e1479ce6c5fe29b1cfcdcd8bc6b2b87773c2109122614a0f64847629029470d945409b08b19032d936
-EBUILD imagemagick-6.9.10.40.ebuild 6883 BLAKE2B 1f0a8acce9f7c79171822ba87d131aa0457f1d9afa6621a29972b77958f9abc6150b8ce756065e9e51b2c399c78115393ab04c56b35074c2ff42cddb00f95c15 SHA512 b96f189b6b59ce49628ddc311fef7a7c21c8e81aa268b4958a71b832ecc329c6ce0ffd858f9b0d036c3f5d3de43926d2d2486c0313177362278b999b2ea91fa8
-EBUILD imagemagick-6.9.10.42.ebuild 6892 BLAKE2B 9a7579489c9e2ccd38b3ae9f91393680f13ebe29745ee90fef5e8a72059a731da47a8d8f0394621baf2261d9e848166783738c3fd881372630ce8bb82fd67de8 SHA512 83f54f846c25d858c8a093f5058b764690c1b15d69c09519ee492f0ec4d13555c191991f241fe75a5438fd421d6bc036b655d8d0febfba575897db979cd157bf
-EBUILD imagemagick-7.0.8.40.ebuild 7150 BLAKE2B 52a9342ec82c516f5bc3339c4f41f016448950bc7dd486babdc57d1a62ecc005dd0937073ebad7a4e170f050c11ed7ca4dca9ce39cd18d6498807259eeea643b SHA512 e9f3ab662260bc535d27a6d7166a52d8e29bd999923fa6995b2ffd3b5161de41e62d9e3774bfbdded2bc447b8c0087ed597a0c6a0a79954e06478d3113418a1f
-EBUILD imagemagick-7.0.8.42.ebuild 7160 BLAKE2B 276ed8dc19455db44ec6a14244f07070e5b9a8a6158e0d06ef2ab0ab4541e607244c216a7ffbaefcf166439edf4a00aab2a5f826a4fc917dade1f710f47b66cb SHA512 5c6f6ce5a3801c56b550c78f8ca5a1a2f812ea39db7fcd9eb65fa6e9130d3035102eef379e9fe5617ec62910ebff039fde9ce9f02eac96a62431d18b5b954245
+EBUILD imagemagick-6.9.10.42.ebuild 6883 BLAKE2B 1f0a8acce9f7c79171822ba87d131aa0457f1d9afa6621a29972b77958f9abc6150b8ce756065e9e51b2c399c78115393ab04c56b35074c2ff42cddb00f95c15 SHA512 b96f189b6b59ce49628ddc311fef7a7c21c8e81aa268b4958a71b832ecc329c6ce0ffd858f9b0d036c3f5d3de43926d2d2486c0313177362278b999b2ea91fa8
+EBUILD imagemagick-7.0.8.42.ebuild 7150 BLAKE2B 52a9342ec82c516f5bc3339c4f41f016448950bc7dd486babdc57d1a62ecc005dd0937073ebad7a4e170f050c11ed7ca4dca9ce39cd18d6498807259eeea643b SHA512 e9f3ab662260bc535d27a6d7166a52d8e29bd999923fa6995b2ffd3b5161de41e62d9e3774bfbdded2bc447b8c0087ed597a0c6a0a79954e06478d3113418a1f
 EBUILD imagemagick-9999.ebuild 7160 BLAKE2B 2435e94755e6e1a9d6ee4cab669b8564daaa06e7c75024463cf5df4f851f695afd2afdfb84930ff8886ceef6bed578365d7489d7febd877064621c4dd541f74b SHA512 c65b9cb286317eafefb96c63984f25850c835a81eb04fe452d8bd22bacded153c460716c06a2f924b7595925ecbb417ea809d737aa291bc174c125d97dc7cbba
 MISC metadata.xml 1015 BLAKE2B 3fbe479f30575b11fa9e78de7bb00c231370aa4b2ca3b0e16924710189013ab91199db8c8cb7cff4611a2924c7fa01e4a43bfd9f7f61cfe45a4de3a254d4c8e2 SHA512 bf1479f91de5f8248c4a86d98017a332ab3d5eb153bb896ca1a39fce2fbff4e8248df92025987f6bfaf7e0d36677c167177c9c21969f1f0b8c2e0a53197efece
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.40.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.40.ebuild
deleted file mode 100644
index b6bca9ea8b20..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.10.40.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-MY_PV="$(ver_rs 3 '-')"
-MY_P="ImageMagick-${MY_PV}"
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://${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 heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RESTRICT="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 )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local mesa_cards ati_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.42.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.42.ebuild
index b09291336ccb..b6bca9ea8b20 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.42.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.42.ebuild
@@ -14,7 +14,7 @@ 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"
+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 heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 RESTRICT="perl? ( userpriv )"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.40.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.40.ebuild
deleted file mode 100644
index 59c2b130c53d..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.8.40.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-	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"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	if [[ ${PV} == "9999" ]] ; then
-		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
-	else
-		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	fi
-	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.42.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.42.ebuild
index 69c412db11b7..59c2b130c53d 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.8.42.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.42.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-	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"
+	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"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest
index c9d78a86d573..587fd91aa744 100644
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -3,6 +3,6 @@ AUX jhead-2.90-mkstemp_respect_flags.patch 892 BLAKE2B 3a0c4ae7bf32391b32a405541
 DIST jhead-2.97.tar.gz 68361 BLAKE2B ed13d637dc491ad1c6ed7f9a5b0b526c80f69b8c521e3618289b16523ebb12690fa53a0a273f3f5793f970f390430d56c8504bed30fb45c5e9e2a9ac248f7667 SHA512 9b33451546e5ad3b82fe6001515fd572925a1e2c11af763ae32d71ad2cb056ffa8d97abe14bd48ae5f6144da9d8322965387537d61e22d22b02624ebf351c230
 DIST jhead-3.00.tar.gz 69151 BLAKE2B 23522718f07cd0b52b3d7fbd6d0f69ca5ecd5499174b06c6572be1319b275dc93eacd270f33cd7b3380ef85e6615aa79adf1fa9a1a86404876b35c31cdb0c95e SHA512 daedfe7ea6be051f769e9a1e0946ea0fa741f387bbc5ba55eec394fb3f37b18a66aa8826190c790eb50a5b9d445ee0d5a28a08d181db3be469686b0675540fbe
 EBUILD jhead-2.97.ebuild 745 BLAKE2B 41bee772b4941cba460549b464f24758b716d4ed3012a544e2277deea5cd651ef0fa3519d6b7c77a3b0512320b7936294c0ea4a8b574ce5c7141cbb82f566a9d SHA512 690547b5b0b4eb36153ff782f6e55e8b67155e677cba2ace3a0ec6cdd0f3d1eda313dcaea5e33a417e98c1c113cfb22de011a88117f31dcea7ab7858e229bb67
-EBUILD jhead-3.00-r2.ebuild 705 BLAKE2B 90f6d9c4fcaeac9e387f9a2ada519f18d875fed9f4a9c99fe1328108294db8eb5f4dae28fc27c13fdcba3e030447500e60aa28fc14f8dfacc9b725a2b148fcaf SHA512 8ec686acec1b6fbf8e3192ab4954fb6c67ba2be42ba917677e399d2540e0f539d78dfdc5982129a205a67a7184338ded547433341f28abd1f56136cb6fa9841b
+EBUILD jhead-3.00-r2.ebuild 712 BLAKE2B 553ff5f7d3782219a5f1d101139ef5e7969615bd6592ce4e21b1fa0977500dfe4029654c397034a5f7df78e70626be9143b0fd4cf436d95f152aba86eef1a093 SHA512 cec895df2fddd9ddb33bfbaba45136951f11de3a79b1e6b1899aef557d8dd982be053807f60eb8c28a8c7f3dd731bf8059ae8568749cdf8a3ecaf1a8bb23f0eb
 EBUILD jhead-3.00.ebuild 746 BLAKE2B 576096a432b63a988861a85e05ebb92f1a4346bd012f74269629a2b868254a372699a4ed3be74ae78cb90df792ee61e77842da6da46ec98ae6a570faedf3fb89 SHA512 2f711c62175a02cc968fc698fffff784743a8befe3c315d294e78978357de5df3ee0c665ae70baf64091db4c3744f1c2aa3853fcae87754eb8a67d0a08ebe4a5
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/jhead/jhead-3.00-r2.ebuild b/media-gfx/jhead/jhead-3.00-r2.ebuild
index c3e3a742dfc7..09eacfbb60c7 100644
--- a/media-gfx/jhead/jhead-3.00-r2.ebuild
+++ b/media-gfx/jhead/jhead-3.00-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.sentex.net/~mwandel/${PN}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 src_prepare(){
diff --git a/media-gfx/jpeginfo/Manifest b/media-gfx/jpeginfo/Manifest
index 99dee686565b..5b7998d6bd7b 100644
--- a/media-gfx/jpeginfo/Manifest
+++ b/media-gfx/jpeginfo/Manifest
@@ -1,5 +1,5 @@
 AUX jpeginfo-1.6.0-parallel_install.patch 334 BLAKE2B 01d3e16d44789c5c1d1346f6c3067496daad051e60c9a39c69641fcec1766bb69e872f5259b4edd2d7b5fe5c793bc25e47c7329aa49b625ac80954a444562f92 SHA512 5dd86f4172caacb8d43952274b3a0a86df5d346839d29eb7e80e6f7ae8be4b73a70dbaccc1732703d45cc966b8fd762a0a4c5e02a3701718ebcc6ff646f1e676
 DIST jpeginfo-1.6.1.tar.gz 64856 BLAKE2B 5d9748a4af26087e45f2ae3fa709bb2099547f22aaeaf1fde529d92d633b1bc665dfde301a9ecaf4a8e4fa190ef637126d6f4ee43118bb31f5782a402d4a08d1 SHA512 9cc9367b8b3e38ba46bff9477b8f61e63b55bd41a67ea2895cca9c097abba2a7a3ae068c235ecfea72c99af52bba91cbb1eb92feb019ba4eb08e826a7083c68b
-EBUILD jpeginfo-1.6.1-r1.ebuild 645 BLAKE2B 26a03bd811828c9a8a6a77a3d437e0a47f9e567f9cd2d6f0410db3c84d1b636bfcfbc7662624fca9fd3e81c75a6a76b981394f598e5f8faf156783a7ace6baea SHA512 c20b4baeb09a4de39db1a68b497f792ee1a0734e35eb559359e6bb97ae6191a45d5a3817f977a89d46b0eee7ba32cf5602ab15ee5007064b7442e12ef13d712c
+EBUILD jpeginfo-1.6.1-r1.ebuild 643 BLAKE2B 2f1d3ddcdb79c1b5dacdb0e5219502224c679969e6b437d761d2e86021fc7af805c205106af13ab230694673434183b91b6f48eee9fa66975ba2e7345aa8985e SHA512 f6f1ec73f9b12de6dab5ae15c4bda8c20268b8e35c5c3d2804e21de27239d3376c9c3dbb103e5bb7a1f5f8693a2030a28a30ea1405d2436f5a8ec2f80d14632d
 EBUILD jpeginfo-1.6.1.ebuild 670 BLAKE2B 3c03a10d42865a06ca72ce8c0fe765dc2d978ec9b53f0f6f7cc1e19c13bce7ddcb969e37975240788699e33e4bbc4d5a826444148f7950932fbfd8e4467af4fa SHA512 099f7b21978f8df38d027d11af7222ecb539ef42b573d93c4a343e710934bb4fc3c127c9f406c5a9c8859bc7ab0e52d5629918f1cd23079f8c32b7dba0484ae2
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/jpeginfo/jpeginfo-1.6.1-r1.ebuild b/media-gfx/jpeginfo/jpeginfo-1.6.1-r1.ebuild
index 8e8fd5f1145b..73e1104685fc 100644
--- a/media-gfx/jpeginfo/jpeginfo-1.6.1-r1.ebuild
+++ b/media-gfx/jpeginfo/jpeginfo-1.6.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kokkonen.net/tjko/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="virtual/jpeg:0"
 DEPEND="${RDEPEND}"
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 061639dea310..cff2f12ea04f 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,4 +1,6 @@
 AUX kphotoalbum-5.4-exiv2-0.27.patch 1687 BLAKE2B b1d94b96200dc3e750e76c1e8567061ee6fa693478aa82556f24ef805365653eb90d72252b0a26d24b9b8a224f767ca56710e0d52701a71d82e41d3651e86d17 SHA512 768e7c1e31e4472dc304eae85bf8ba73bc590cd7817c486ae9051f0a25eb333f9054dea81187230b816381c6299e6bf374e1d6455db9b7d2532490b6f1f934f7
 DIST kphotoalbum-5.4.2.tar.xz 11807452 BLAKE2B 45ecdb4fbe3d66770394751911201737b698d2d497bb387871755113d153ef2c01a9b7e4a101f2b465d79801d0f88f084a0d0832550591012b44c70e5b28ff7f SHA512 9a4548141c56dd6426244e646a0d2bfb2eac28797c63ae478a56d6b1c0484ce5e607abcb079e50fcbc0643f7e9a94844a9af6600748ce465b8f66781aa5e3038
+DIST kphotoalbum-5.5.tar.xz 11661532 BLAKE2B a14900cb7628b86aafa736de4b443f3aad3b4198bc6a04bc67fbc40f1bec9898ebbc33e60d4ca90db3b857871f75c70d6946efa2e756b3c5d7ae769bee6b2723 SHA512 fcca891a94580db2f606c5d077af2651e1dbcd59429823410f9fd2d07ac0c3c625ac441b723d4c8cb3ac7ede26ccf69f955c19fe302fffc9788fc33def9ee3e0
 EBUILD kphotoalbum-5.4.2.ebuild 1576 BLAKE2B 29430537ec49d17356232341a687a57bc2ac88e0307bf370a0deedab0b39ce41f377914c21c23c55913990eefd20d6a06b4c57172b81c6f5b8c5b0cbb0741cc4 SHA512 d2454c899ccaa1b85164b74d6e4080a48a21c1e24b351049c4ccf9278891878604a3d2bcae9e6dbbdf965fa02c7339c0a44502befcf7b385bc9e58f8c472092d
+EBUILD kphotoalbum-5.5.ebuild 1521 BLAKE2B 0a6e7c204fd03881b2b9f1dbc6694d7f12905adfa03a5b30be2085e4f82f7344282679e6c12707f3e9407038814d54dad80e9c6bcfc226492973841e4c1ab85d SHA512 132be79a4b22a264667c3e7505e3a394abee66900f9b0ea94e5aad82e5d69158c51154750893fd6e9e43c4dbf240cf57eb27367189d47f08744013248d7ba532
 MISC metadata.xml 424 BLAKE2B e5e77a618c93044474c0a049bfd37dddbddaaed85bf84fa2e5e7233064176032cc255dbce77607aceca20e431f43f98e29295c977e7841dc86b2c5b286c6df8e SHA512 ec0c2fb381cc5d4b38576c6d5c5b002a07d01027881906bdc1d786311d1d738f6dd67074a6c768a10bbefd3c2c5f01b88bc78cd3456c5884a6d5646593d0dbca
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild
new file mode 100644
index 000000000000..b062c1d18226
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Tool for indexing, searching, and viewing images"
+HOMEPAGE="https://www.kphotoalbum.org/"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+ FDL-1.2"
+IUSE="+kipi map +raw"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql 'sqlite')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-gfx/exiv2:=
+	media-libs/phonon[qt5(+)]
+	virtual/jpeg:0
+	kipi? ( $(add_kdeapps_dep libkipi) )
+	map? ( $(add_kdeapps_dep libkgeomap) )
+	raw? ( $(add_kdeapps_dep libkdcraw) )
+"
+RDEPEND="${DEPEND}
+	media-video/ffmpeg
+	kipi? ( media-plugins/kipi-plugins:5 )
+"
+
+DOCS=( ChangeLog README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kipi KF5Kipi)
+		$(cmake-utils_use_find_package map KF5KGeoMap)
+		$(cmake-utils_use_find_package raw KF5KDcraw)
+	)
+
+	kde5_src_configure
+}
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index b1cd43dfb09a..cb6a68e85995 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -3,5 +3,5 @@ AUX libimagequant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1
 DIST libimagequant-2.11.7.tar.gz 74311 BLAKE2B 204fbe794014c11d767991a03e729b234978fb1edb1fdffcb7d332461ccaa1a536a1e9dbc7b44a8838db61cc76fdbc1eb75087b480f4fc42bf791fea913639a2 SHA512 8816811c06eec27232e39725c581e382b7076f3bc23b017810de0e92236e6e4eb480def7b50347c9b75f7d792245669398c39a17359eb81077badf12e6f0a172
 DIST libimagequant-2.12.2.tar.gz 75611 BLAKE2B 23f5d3666fd21696d4f4dab9db3669642a9e3f6ca971804b914e845018df538136c3db900419ac35230be9fd487b48e0ab672b653e2ee82387c19569b49d6cfc SHA512 7e7bfcffd163d8b73a46d523dc441e4a4726f5dde804f306f13900f74afae6f6e7cf780bf157b5823a71c790bcdd0e9c9c34cf43f84a21289e470fc78835d8d8
 EBUILD libimagequant-2.11.7.ebuild 1191 BLAKE2B 61db0687381d1ad9c124e94be50b93bba3d70a3758dfdde81bbf3fe2a9a9ffd26cc73ef29ee1fc7bbd3fdab8947b7316c76622ca1c5f28f923212c63ca2c81fa SHA512 38db43ddfb6c4e8aad817dde0cc20ccf5397f4bcc4a3183a33d1256122a42a79ba6b079677746b31d17625b275f2e3d9e346e314a1311981b86d4add48238dce
-EBUILD libimagequant-2.12.2.ebuild 1454 BLAKE2B 8e9506be6ed5f0fe99734df7765a1bed62d2a74e7b8e346a315938a082b5fc05cd8cb58d71d25613b2b98afab0e83199c8f25bc0267f5efec26622add3622512 SHA512 b86d5c73eb281e96c321ef544335cc0e98346eb5f22f244590da159c92da0a442aed5be96be507890db6dba5bf631076b2aa2128b2135cdb9ca767b61090d578
+EBUILD libimagequant-2.12.2.ebuild 1453 BLAKE2B cc36b27f971c7bdbbfb22a9b14ad70d00129aa90b1cc248cb512040d9a36f6e290acf5a5e6b34f672fc0b0cd95597569ee3d38e0cee57dbdfaa0be4dbc54c19b SHA512 c58252bd015bf0949df83f2781525b94578b19e9827837f50382db171c169af3c5239cb67bf68959411c1d6c231b3182b3ebeeac1ba0ef309514ff535a4eee4d
 MISC metadata.xml 527 BLAKE2B c3fa42153fa6cfede4de3d59e12063aeb44f67ce89d36be63c7df4671c57ecfdd43d08aee89bd96387ecbee2e41b1d5921e9ad2486b4dd8f06e6e93529afb0a8 SHA512 82b458b27288b6b49df16d5778f6c75b492d958bcc1c2f2950dee741bfddc82f561be50f590d3f891bf736ee67e5325ae297bf49f99c769ca97ac68042beee11
diff --git a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
index 56e70c7e72c9..29794caf1359 100644
--- a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
 
 DEPEND=""
diff --git a/media-gfx/pngrewrite/Manifest b/media-gfx/pngrewrite/Manifest
index 47b1aa5c389f..a1156816dc55 100644
--- a/media-gfx/pngrewrite/Manifest
+++ b/media-gfx/pngrewrite/Manifest
@@ -2,5 +2,5 @@ AUX pngrewrite-1.3.0-gcc44.patch 411 BLAKE2B c1df75d9f27385c4f71a6cb87007d9eb50b
 DIST pngrewrite-1.3.0.zip 105995 BLAKE2B f09ce3b542e7013136e9244f89f6be5389df0522296bab609ad2023acb0a9792ee4ae5f9ba3666682c5d81c2364530225f5b306417a8e26d468f39e74d99cd68 SHA512 f146d69780309c61246f71cbc58081e1e357ea0cb58ee7ae5908075ab9cf86218f3eed956ff32df39efcebad7a743bf303ce1a50753d4d4c3710968002a75f1d
 DIST pngrewrite-1.4.0.zip 149760 BLAKE2B 7ae0acabe8d231233bfab3fe0c6a71da4f835d5c6c6943aa394ec0e83f126c93127d5f798e2206f2c45ed5b9b016a14c45a99ea450b40fd63af09a321fb5d2bd SHA512 9ed9d220a4d8066f752d7ba123dd831ce6550072e7f8dd2327bf257b3d8e886f781c4878896c633a9a251a1311a10af56434e2c9ff773d174233a340a1f37e42
 EBUILD pngrewrite-1.3.0.ebuild 702 BLAKE2B fb84c0a1afcb918156f2db5ae747efa3e846ccf77e0f04f04022bed5473b09f5270812874fd00abec6dabeea1b8c5b11e7da549497201c933a5a968885cf94e2 SHA512 f4afe06f24b456c3ba90988540bc618cf07e521256bd247047e33c15e794bebf2ac36ae51c8f5b07ab5560dc681622c94be14935dd74bc1f7ba00d942dc94e56
-EBUILD pngrewrite-1.4.0.ebuild 637 BLAKE2B 8777a33e36f753f8acf4d94c24ca5c09fe573e8114427f6723a09b44f4171f6d5f3847e93f487a0b032b9a9e2894bfa13ce5fe6c9b5c4ee940bad4493f2243cb SHA512 4cab23f9013cb714b509c015228e217bd707222dd7be3d5556ae421c46532c2e240e2fb6f5d3abb41bf5a859ac09fdfb42d809d2250acbc663358ed0f2a8da57
+EBUILD pngrewrite-1.4.0.ebuild 636 BLAKE2B fb51d370ae9f7b3db9e89b9621e770a400335180f1a87afab6eee5470ececddcb2463187e6626d3b042d15884070cacbf19a53a3352850cfaf47eefd56c5d5f4 SHA512 21c50bf23b8af7e15fc5e095c182f8e4d78f1d51e5a75a838c5bcc8b28e9f09d95f4927c99a81834e6446ef510e8b91a85ee3581b92aa4e9541fb0db840b0cf2
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/pngrewrite/pngrewrite-1.4.0.ebuild b/media-gfx/pngrewrite/pngrewrite-1.4.0.ebuild
index 62104a186ac0..839e5ce3368c 100644
--- a/media-gfx/pngrewrite/pngrewrite-1.4.0.ebuild
+++ b/media-gfx/pngrewrite/pngrewrite-1.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://entropymine.com/jason/${PN}/${P}.zip"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc sparc ~x86 ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ppc sparc ~x86 ~x86-linux ~ppc-macos"
 IUSE=""
 
 BDEPEND="app-arch/unzip"
diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index a95ed321143f..b44f4f2f8485 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -1,8 +1,5 @@
 AUX scrot.bash-completion 1063 BLAKE2B ab03add49bb68db845d1cb599e62dfd4070a8110b5bbf03584fec395a3b0c60262bf3f4fc0ddc1a35c17996a8986107ae3bad053a8974da7c456bdfe7410b424 SHA512 ce8df63bb5b10dbf19f465f2629ebe7045d84105f3da70a49f2bde6a0a416a8f14a02ba3e7d3a8aeba144a592b45a770929b56f6ae7ac867222213ac8f923a0f
-DIST scrot-0.8.tar.gz 74324 BLAKE2B 56facc81c29f101279ffc6d5d323a0cecd32b1ff6d1d4bb2052a90703353a9ad5b6ab46c8840ed20834f976badab4258fbb0f031645d9689eef1b838ebd4b1a0 SHA512 cba8f589e45758ddbfe4e276399a1ecb0dbe29569be5d85d97733e7f64de2911bd2d03e62700ad0c718a1fc886c2e3def9dee1de5cac884f9e65e772cebe838c
 DIST scrot_0.8-13.debian.tar.gz 7943 BLAKE2B 6c58c76f3a8dcf61a8ca4c31f5845cb27b4d0ed2bf9619cc8ea5824b5e42c66ee5163c7f4e76308763947b933003dbd3df6e641b0596ed342993343fd5418a75 SHA512 3f6d0a8e592088af38a3d90394b6b7246430479f5b0c8451af5eae383725d1896dc4bbf595495f9f2b546f00ef38780123c4ee0e3f06971c55a6ac2dfa5b7d53
 DIST scrot_0.8.orig.tar.gz 74324 BLAKE2B 56facc81c29f101279ffc6d5d323a0cecd32b1ff6d1d4bb2052a90703353a9ad5b6ab46c8840ed20834f976badab4258fbb0f031645d9689eef1b838ebd4b1a0 SHA512 cba8f589e45758ddbfe4e276399a1ecb0dbe29569be5d85d97733e7f64de2911bd2d03e62700ad0c718a1fc886c2e3def9dee1de5cac884f9e65e772cebe838c
-EBUILD scrot-0.8-r1.ebuild 666 BLAKE2B b91b37a7b8db6a3de2d4685293a32183f58b3ca5b9ec6b630d52597f56e681fd0a808bd9fdc2dbef8a9734c144c307a3fedc8d41e37b9b7ad9c75cddcf56025d SHA512 c43a8d61910df70a0a0a91562ab3fd685fd275e0408ad6b6007cb4a942dd7b4ac18cc343e9396cba16b18e5dc2df9d8efbd628187dae4446aa0dc97df96daed0
-EBUILD scrot-0.8_p13-r1.ebuild 1001 BLAKE2B c203706b7257fad582145bb304dd812417c73339ff6d2094174f12782d1043b3085855c6a2f580a8edc76641553c5728c5b46ed945fbcd1e33a3c9bfcde721f8 SHA512 2b90cc64c342e4ba07e87f55a4457bc2c45edb5cd5271995a72c25c3cbc72befc35d8334dfc3ddfd7869c4cc73d586d2b2769f40dd6f8239646397c3ff52d6e9
-EBUILD scrot-0.8_p13.ebuild 913 BLAKE2B 72da0f29f58047ec05aa001763247bd30471eee27c97373a9646cb55e29d8d33507faa1affd4f4b7e37a3fb25fad4cf6f09e6bab1b8e683c5cf54f7feb764ea1 SHA512 3544e4dd18d3c0686d0e0666adb32f89dd571a504cb6abb7083ca80275d408e0315b25cfabe032ba5c8380365e538357b0482307715652f17699f76f221b0a0e
+EBUILD scrot-0.8_p13-r1.ebuild 1000 BLAKE2B 213b2de3ccfeabb1567be94edcf681f7562a51bb00b065e6d593a4cc83dd7921fbbba796b35506a8e6ab0538290e9a9a6353fa9371ee78e32f0e7cf9be74d322 SHA512 cee4e837e4f64ec495c34409ad7f23bc54422fda88f89fa61f5a6931e0a18faff7290b43a1705faa0b66abc8b0d663b85d14adfad16acc817a8f7122183419ea
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/scrot/scrot-0.8-r1.ebuild b/media-gfx/scrot/scrot-0.8-r1.ebuild
deleted file mode 100644
index e5f7314290bf..000000000000
--- a/media-gfx/scrot/scrot-0.8-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1
-
-DESCRIPTION="Screen capture utility using imlib2 library"
-HOMEPAGE="http://www.linuxbrit.co.uk/"
-SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
-
-LICENSE="feh LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/imlib2-1.0.3
-	>=media-libs/giblib-1.2.3"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -r "${D}"/usr/doc
-	dodoc AUTHORS ChangeLog
-
-	newbashcomp "${FILESDIR}/${PN}.bash-completion" ${PN}
-}
diff --git a/media-gfx/scrot/scrot-0.8_p13-r1.ebuild b/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
index 841368076118..2cc010f584c7 100644
--- a/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
+++ b/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.sourcearchive.com/downloads/${MY_PV}/${PN}_0.8.orig.tar.gz
 
 LICENSE="feh LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/imlib2-1.0.3
diff --git a/media-gfx/scrot/scrot-0.8_p13.ebuild b/media-gfx/scrot/scrot-0.8_p13.ebuild
deleted file mode 100644
index 3beccb11abbe..000000000000
--- a/media-gfx/scrot/scrot-0.8_p13.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PV=${PV/_p/-}
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="Screen capture utility using imlib2 library"
-HOMEPAGE="http://scrot.sourcearchive.com/"
-SRC_URI="http://${PN}.sourcearchive.com/downloads/${MY_PV}/${PN}_0.8.orig.tar.gz
-	http://${PN}.sourcearchive.com/downloads/${MY_PV}/${PN}_${MY_PV}.debian.tar.gz"
-
-LICENSE="feh LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/imlib2-1.0.3
-	>=media-libs/giblib-1.2.3"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}-0.8
-
-src_prepare() {
-	local d=${WORKDIR}/debian/patches
-	EPATCH_SOURCE=${d} epatch $(<"${d}"/series)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -r "${D}"/usr/doc
-	dodoc AUTHORS ChangeLog
-
-	newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
-}
diff --git a/media-gfx/swftools/Manifest b/media-gfx/swftools/Manifest
deleted file mode 100644
index 2c5d14736ba5..000000000000
--- a/media-gfx/swftools/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX swftools-0.9.2-jpeg-9.patch 336 BLAKE2B 2ad16996d39ff263cfc3ae93ff0341e60108cd232f2056b299f1da88ffa6e12a1c4b5256834207767aea559c34f023535df73a71d6911daa65ff50ca40c2c281 SHA512 09ace71ef3481bb79e13c82538666f7099de779a0742d2260dd957b099993281cb88d1245d6122a7bf35cc435e8f3233d4f6d4f1379e4acb2143b3ba4e6c9614
-AUX swftools-0.9.2_general.patch 1747 BLAKE2B 3c7453bfe98a97c2a909a70d3cc5292526e7288d10e4fa63bb4ad6e5e4b9c4ab8dfedafe5320f4394efca205708f0d02e68b73a3b8449ccd432e96e7b1dc784f SHA512 c6874f0a12939f67f93a1c7615e3dfe5ecdfadffe1bb9f790be44815b4329758566e8a10eb7d4ed6757580f4c8c0251ced12908a1555c500efb41727ef05307c
-AUX swftools-0.9.2_giflib.patch 2687 BLAKE2B 566dc5e27dd334e73c5d44b62ec987289c298d9c2ba44af589b892a740c1134f11afb290fd0b16feee99db1f37754351cff6079951b0f222acd8e9a1b1d00162 SHA512 88f8bf4d75578656ff37498cdfb4c577dda85f192222b749708dabffc27314605ca930aa6a8686e2205f0dd81f5b53988432685430ac0f8f15ac538658e6a03c
-AUX swftools-0.9.2_giflib5.patch 678 BLAKE2B 1bd7e82f2faa13d0c56c6e769efca3b01b583d6226315119a320bd24f8082a428ded545d4291457f5a8a4633fdd31283672974b13407b45792db510048913a4e SHA512 91a6bc2dd57aec2979b9b7eada5990b8dfa68748acf6d2c4f58c379e0312a9581637c0dfd0899107ba3805e72f34c6652fe4e59f07629a457534ee5d93663800
-AUX swftools-0.9.2_nopdf.patch 2366 BLAKE2B fe2b7f826a557d9a67d18851b085b3f3e045347d789d8c9988298b082b834bdbfe21a02eca195f49757ac14e2e8407b98590d31bdd90a736328ff20fdd1810a8 SHA512 aaecc86d3cea1b97d748959fdf00c4249891bc3ff4d668e7d7a2ec5277e53cc9bda9281a2de065c9395aab49175f5438822d82641a24768997ec48cd4bcd213b
-DIST swftools-0.9.2.tar.gz 2675939 BLAKE2B e5d2edcb5a23f4c174da61bee97eb708e71a0b14657b27dc01294ee8b368fd53cca08c7c354c9c038a02c4a3e0220d90e80f8637c86469eea169a431f35d0573 SHA512 91bbd48914f9a8a1cdf85532b371721b01982c5f88648b908fbe99fbf4e17e9893ce575e4fd699927e9bc1c79d846f6bcd4f1d868578fb17403467cc1e28259b
-EBUILD swftools-0.9.2-r1.ebuild 1038 BLAKE2B 3388878b979a979759875aa42a8b1804362950404ef7b216507058085a7637b6f3a9c6e0d82a298ee47e50cd67c532c78a936ef64f298395e6db28f251d9e1ed SHA512 c015470a0880dda540c2ba139bb5c45a55877ba821e0216a5c0bc917d4115ba948f6235d0eaad26391d845c63ba16e6827630eb0931514cf756917019981b192
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/swftools/files/swftools-0.9.2-jpeg-9.patch b/media-gfx/swftools/files/swftools-0.9.2-jpeg-9.patch
deleted file mode 100644
index 7f809ea99836..000000000000
--- a/media-gfx/swftools/files/swftools-0.9.2-jpeg-9.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Patch kindly borrowed from macports.org.
-
---- a/lib/jpeg.c	2011-10-14 15:46:10.000000000 -0500
-+++ b/lib/jpeg.c	2014-08-06 20:15:51.000000000 -0500
-@@ -5,6 +5,12 @@
- #include "../config.h"
- 
- #ifdef HAVE_JPEGLIB
-+#ifndef FALSE
-+#define FALSE 0
-+#endif
-+#ifndef TRUE
-+#define TRUE 1
-+#endif
- #define HAVE_BOOLEAN
- #include <jpeglib.h>
- 
diff --git a/media-gfx/swftools/files/swftools-0.9.2_general.patch b/media-gfx/swftools/files/swftools-0.9.2_general.patch
deleted file mode 100644
index f49fcb0d2f64..000000000000
--- a/media-gfx/swftools/files/swftools-0.9.2_general.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urB swftools-0.9.2.old/src/png2swf.c swftools-0.9.2.jo/src/png2swf.c
---- swftools-0.9.2.old/src/png2swf.c	2012-04-08 19:25:26.000000000 +0200
-+++ swftools-0.9.2.jo/src/png2swf.c	2012-04-11 23:29:08.569700175 +0200
-@@ -777,7 +777,7 @@
-     printf("-q , --quiet                   Omit normal log messages, only log errors\n");
-     printf("-C , --cgi                     For use as CGI- prepend http header, write to stdout\n");
-     printf("-V , --version                 Print version information and exit\n");
--    printf("-s , --scale <percent>         Scale image to <percent>% size.\n");
-+    printf("-s , --scale <percent>         Scale image to <percent>%% size.\n");
-     printf("\n");
- }
- 
-diff -urB swftools-0.9.2.old/swfs/Makefile.in swftools-0.9.2.jo/swfs/Makefile.in
---- swftools-0.9.2.old/swfs/Makefile.in	2012-04-08 19:25:26.000000000 +0200
-+++ swftools-0.9.2.jo/swfs/Makefile.in	2012-04-11 23:29:08.573699972 +0200
-@@ -41,10 +41,8 @@
- 	$(INSTALL_DATA) ./PreLoaderTemplate.swf $(pkgdatadir)/swfs/PreLoaderTemplate.swf
- 	$(INSTALL_DATA) ./tessel_loader.swf $(pkgdatadir)/swfs/tessel_loader.swf
- 	$(INSTALL_DATA) ./swft_loader.swf $(pkgdatadir)/swfs/swft_loader.swf
--	rm -f $(pkgdatadir)/swfs/default_viewer.swf -o -L $(pkgdatadir)/swfs/default_viewer.swf
--	$(LN_S) $(pkgdatadir)/swfs/simple_viewer.swf $(pkgdatadir)/swfs/default_viewer.swf
--	rm -f $(pkgdatadir)/swfs/default_loader.swf -o -L $(pkgdatadir)/swfs/default_loader.swf
--	$(LN_S) $(pkgdatadir)/swfs/tessel_loader.swf $(pkgdatadir)/swfs/default_loader.swf
-+	cd $(pkgdatadir)/swfs; ${LN_S} simple_viewer.swf default_viewer.swf
-+	cd $(pkgdatadir)/swfs; ${LN_S} tessel_loader.swf default_loader.swf
- 		
- uninstall:
- 	$(UNINSTALL_DATA) $(pkgdatadir)/swfs/simple_viewer.swf
diff --git a/media-gfx/swftools/files/swftools-0.9.2_giflib.patch b/media-gfx/swftools/files/swftools-0.9.2_giflib.patch
deleted file mode 100644
index 913b5e3b08d1..000000000000
--- a/media-gfx/swftools/files/swftools-0.9.2_giflib.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 05c1df6a6da28734533722dc0ac99ea5b206a492 Mon Sep 17 00:00:00 2001
-From: Matthias Kramm <kramm@quiss.org>
-Date: Sat, 6 Jul 2013 12:09:53 -0700
-Subject: [PATCH] applied giflib patch from Jan Engelhardt
-
----
- src/gif2swf.c | 28 ++++++++++++++++++++++++----
- 1 file changed, 24 insertions(+), 4 deletions(-)
-
-diff --git a/src/gif2swf.c b/src/gif2swf.c
-index 2359da5..5e52ea8 100644
---- a/src/gif2swf.c
-+++ b/src/gif2swf.c
-@@ -222,6 +222,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id, int imgidx)
- 
-     GifFileType *gft;
-     FILE *fi;
-+    int ret;
- 
-     if ((fi = fopen(sname, "rb")) == NULL) {
-         if (VERBOSE(1))
-@@ -230,13 +231,24 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id, int imgidx)
-     }
-     fclose(fi);
- 
--    if ((gft = DGifOpenFileName(sname)) == NULL) {
-+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
-+    gft = DGifOpenFileName(sname, NULL);
-+#else
-+    gft = DGifOpenFileName(sname);
-+#endif
-+    if (gft == NULL) {
-         fprintf(stderr, "%s is not a GIF file!\n", sname);
-         return t;
-     }
- 
--    if (DGifSlurp(gft) != GIF_OK) {
-+    if ((ret = DGifSlurp(gft)) != GIF_OK) {
-+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2
-+        fprintf(stderr, "GIF-LIB: %s\n", GifErrorString());
-+#elif defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
-+        fprintf(stderr, "GIF-LIB: %s\n", GifErrorString(ret));
-+#else
-         PrintGifError();
-+#endif
-         return t;
-     }
- 
-@@ -465,6 +475,7 @@ int CheckInputFile(char *fname, char **realname)
-     FILE *fi;
-     char *s = malloc(strlen(fname) + 5);
-     GifFileType *gft;
-+    int ret;
- 
-     if (!s)
-         exit(2);
-@@ -488,7 +499,12 @@ int CheckInputFile(char *fname, char **realname)
-     }
-     fclose(fi);
- 
--    if ((gft = DGifOpenFileName(s)) == NULL) {
-+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
-+    gft = DGifOpenFileName(s, NULL);
-+#else
-+    gft = DGifOpenFileName(s);
-+#endif
-+    if (gft == NULL) {
-         fprintf(stderr, "%s is not a GIF file!\n", fname);
-         return -1;
-     }
-@@ -498,8 +514,14 @@ int CheckInputFile(char *fname, char **realname)
-     if (global.max_image_height < gft->SHeight)
-         global.max_image_height = gft->SHeight;
- 
--    if (DGifSlurp(gft) != GIF_OK) { 
-+    if ((ret = DGifSlurp(gft)) != GIF_OK) {
-+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2
-+        fprintf(stderr, "GIF-LIB: %s\n", GifErrorString());
-+#elif defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
-+        fprintf(stderr, "GIF-LIB: %s\n", GifErrorString(ret));
-+#else
-         PrintGifError();
-+#endif
-         return -1;
-     }
-     // After DGifSlurp() call, gft->ImageCount become available
--- 
-1.8.4
-
diff --git a/media-gfx/swftools/files/swftools-0.9.2_giflib5.patch b/media-gfx/swftools/files/swftools-0.9.2_giflib5.patch
deleted file mode 100644
index 6450f827b87b..000000000000
--- a/media-gfx/swftools/files/swftools-0.9.2_giflib5.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- swftools-0.9.2.orig/src/gif2swf.c	2016-02-16 16:15:39.697992195 -0500
-+++ swftools-0.9.2/src/gif2swf.c	2016-02-16 16:25:37.047992256 -0500
-@@ -467,7 +467,11 @@
- 
-     free(pal);
-     free(imagedata);
-+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1
-+    DGifCloseFile(gft, D_GIF_SUCCEEDED);
-+#else
-     DGifCloseFile(gft);
-+#endif
- 
-     return t;
- }
-@@ -542,7 +546,11 @@
-             fprintf(stderr, "frame: %u, delay: %.3f sec\n", i + 1, getGifDelayTime(gft, i) / 100.0);
-     }
- 
-+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1
-+    DGifCloseFile(gft, D_GIF_SUCCEEDED);
-+#else
-     DGifCloseFile(gft);
-+#endif
- 
-     return 0;
- }
diff --git a/media-gfx/swftools/files/swftools-0.9.2_nopdf.patch b/media-gfx/swftools/files/swftools-0.9.2_nopdf.patch
deleted file mode 100644
index 9dc6c2ac2560..000000000000
--- a/media-gfx/swftools/files/swftools-0.9.2_nopdf.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -urB swftools-0.9.2.old/lib/Makefile.in swftools-0.9.2.jo/lib/Makefile.in
---- swftools-0.9.2.old/lib/Makefile.in	2011-10-07 05:35:18.000000000 +0200
-+++ swftools-0.9.2.jo/lib/Makefile.in	2012-04-11 23:33:53.299308801 +0200
-@@ -3,7 +3,8 @@
- top_srcdir = @top_srcdir@
- include ../Makefile.common
- 
--all: librfxswf$(A) libgfxpdf$(A) libbase$(A) libgfx$(A) libgfxswf$(A) libocr$(A)
-+#all: librfxswf$(A) libgfxpdf$(A) libbase$(A) libgfx$(A) libgfxswf$(A) libocr$(A)
-+all: librfxswf$(A) libbase$(A) libgfx$(A) libgfxswf$(A) libocr$(A)
- 
- lame_objects = lame/psymodel.$(O) lame/fft.$(O) lame/newmdct.$(O) lame/quantize.$(O) lame/takehiro.$(O) lame/reservoir.$(O) lame/quantize_pvt.$(O) lame/vbrquantize.$(O) lame/encoder.$(O) lame/id3tag.$(O) lame/version.$(O) lame/tables.$(O) lame/util.$(O) lame/bitstream.$(O) lame/set_get.$(O) lame/VbrTag.$(O) lame/lame.$(O)
- lame_in_source = @lame_in_source@
-diff -urB swftools-0.9.2.old/Makefile.in swftools-0.9.2.jo/Makefile.in
---- swftools-0.9.2.old/Makefile.in	2012-04-08 19:25:26.000000000 +0200
-+++ swftools-0.9.2.jo/Makefile.in	2012-04-11 23:33:53.299308801 +0200
-@@ -8,8 +8,8 @@
- 	cd m4;$(MAKE) $@
- 	@echo making $@ in lib...
- 	cd lib;$(MAKE) $@
--	@echo making $@ in lib/pdf...
--	cd lib/pdf;$(MAKE) $@
-+#	@echo making $@ in lib/pdf...
-+#	cd lib/pdf;$(MAKE) $@
- 	@echo making $@ in lib...
- 	cd lib;$(MAKE) $@
- 	@echo making $@ in lib/python...
-diff -urB swftools-0.9.2.old/src/Makefile.in swftools-0.9.2.jo/src/Makefile.in
---- swftools-0.9.2.old/src/Makefile.in	2011-10-07 05:20:17.000000000 +0200
-+++ swftools-0.9.2.jo/src/Makefile.in	2012-04-11 23:33:53.299308801 +0200
-@@ -3,7 +3,8 @@
- top_srcdir = @top_srcdir@
- include ../Makefile.common
- 
--install_programs = wav2swf$(E) @PNG2SWF@ swfcombine$(E) swfstrings$(E) swfextract$(E) swfdump$(E) swfc$(E) @JPEG2SWF@ @GIF2SWF@ swfbbox$(E) font2swf$(E) swfrender$(E) as3compile$(E) @PDF2SWF@ @PDF2PDF@
-+#install_programs = wav2swf$(E) @PNG2SWF@ swfcombine$(E) swfstrings$(E) swfextract$(E) swfdump$(E) swfc$(E) @JPEG2SWF@ @GIF2SWF@ swfbbox$(E) font2swf$(E) swfrender$(E) as3compile$(E) @PDF2SWF@ @PDF2PDF@
-+install_programs = wav2swf$(E) @PNG2SWF@ swfcombine$(E) swfstrings$(E) swfextract$(E) swfdump$(E) swfc$(E) @JPEG2SWF@ @GIF2SWF@ swfbbox$(E) font2swf$(E) swfrender$(E) as3compile$(E) @PDF2PDF@
- programs = $(install_programs) swfbytes$(E) ttftool$(E)
- 
- all: $(programs)
diff --git a/media-gfx/swftools/metadata.xml b/media-gfx/swftools/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/media-gfx/swftools/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/media-gfx/swftools/swftools-0.9.2-r1.ebuild b/media-gfx/swftools/swftools-0.9.2-r1.ebuild
deleted file mode 100644
index cbdcdb3e1c78..000000000000
--- a/media-gfx/swftools/swftools-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="SWF Tools is a collection of SWF manipulation and generation utilities"
-HOMEPAGE="http://www.swftools.org/"
-SRC_URI="http://www.swftools.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
-	app-text/poppler
-	media-libs/freetype:2
-	media-libs/giflib:0=
-	>=media-libs/t1lib-1.3.1:5
-	virtual/jpeg:0
-"
-DEPEND="${RDEPEND}
-	!<media-libs/ming-0.4.0_rc2
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}_nopdf.patch
-	epatch "${FILESDIR}"/${P}_general.patch
-	epatch "${FILESDIR}"/${P}_giflib.patch
-	epatch "${FILESDIR}"/${P}_giflib5.patch
-	epatch "${FILESDIR}"/${P}-jpeg-9.patch
-}
-
-src_configure() {
-	econf --enable-poppler
-	# disable the python interface; there's no configure switch; bug 118242
-	echo "all install uninstall clean:" > lib/python/Makefile
-}
-
-src_compile() {
-	emake FLAGS="${CFLAGS}"
-}
-
-src_install() {
-	einstall
-	dodoc AUTHORS ChangeLog
-}
diff --git a/media-gfx/wkhtmltopdf/Manifest b/media-gfx/wkhtmltopdf/Manifest
index 5067c62fcdea..342ce5d16cac 100644
--- a/media-gfx/wkhtmltopdf/Manifest
+++ b/media-gfx/wkhtmltopdf/Manifest
@@ -1,7 +1,3 @@
-AUX wkhtmltopdf-0.12.4-build.patch 883 BLAKE2B 42a078df1eae5abe887ed80deaaa42c7a40b7abd140217cbc639f89e1cd78e188f6b13a4b75cbd20a9711003bba9a351d195dc9762b7cb71ee6876f0b78e076c SHA512 679196b89343bade3b8846bc7913c5ebf9d9badb63ffb3de6797a9bdb14e83806cdc0771354bfa9e633bda9c6934d65cbcc7b4f585a31499565a8c6777e1370e
-AUX wkhtmltopdf-0.12.4-gcc6-warn.patch 1271 BLAKE2B fc81541b57da3ce5342026a0d9b4c7017e417cdd6c2546f6a699061e4d8307023611ec7166d0bd27ee092ade0aa73776804f798c007c9fb2e99fcd14879c32e1 SHA512 af4282d023e2da3ab5ba2e7475b3bfa476fc1c9507e2af2db407ff99312cbae60b41846e13564c3b55b670caecd072f6c996348dbbc68528e6a798b3068f6058
-DIST wkhtmltopdf-0.12.4.tar.gz 128695 BLAKE2B 4bd65b8c0b424973524d9307ff329f05702a9ba3206b91abd8252a4127781a502cf40314669b35b395bb0b3712f9fbcf8ba2537164a7fcf8b3276c3262283eb3 SHA512 6ec27453efdf32b97f6434a3eb5dd3d3470bbdccdbb4f997ff4234441c79960932e51d963e5d0d2d98bbf8b4f7ab2ed8835dbc1a35407a63815691b59217caa2
 DIST wkhtmltopdf-0.12.5.tar.gz 511181 BLAKE2B f52d56fd932dfa514cc2711d22f99ea29960a3c4da2522be9f58f3197cb12494f1cdc8856399e328cfc39956282b8174886ee8edfc7417ba5c5d65ea353f6046 SHA512 3f982a6964085b36f62988b618d88d4339f03ad8d2e733c1fcba5e2e7cb545ccc99313ce35474605df818f91c289a87ddd952f21974fdbe846f990bf03fc2fdb
-EBUILD wkhtmltopdf-0.12.4-r1.ebuild 1011 BLAKE2B 870938f9f9c8b32e998a1e746bd4d93233c0f2fa6caeb069ba1090a766f2c602ef7818e3eec14a0a4242eb707a727df8dc48ee4e9123c58f9dc9834e0fc55d14 SHA512 ac76c9b09621fb465a8d6caa05c4406259dd81373541bf9b80a4b8b90d72ef95dc61fb58af5953918923b055bdccee398fa878e95e1511c0d11d5111f33e3bcb
 EBUILD wkhtmltopdf-0.12.5.ebuild 894 BLAKE2B 9fb89715477e0fc29ef9a8043a5a330c133c4cb3820a02de0a89f34df189b0eff715adac588fbb981cb9affaf89cc6a9871c2870f9429a9c67cf17a16fcd89fd SHA512 2cf388f46e5f220b7498bc007240c3735ff094b069200fac34a0c1c892a0faf62bf008cc800b536330948518273a817ba741f20e4015fd8b16cb3c352e8ebb9f
 MISC metadata.xml 347 BLAKE2B d7124ab4db60733f87dcb83d4d12ae47352d5b672a82a949426c3f0c8498c7178fb04ec91ddaf9639b3f1f897f623f7d1e76a10c46af4a0c2a94b8b15efc196e SHA512 b642c6b896856dca084c706f397b6fed8537b126105356365ec0eb14fc6bd51229fece832800f2ab18d8d64a1f22c4015d2fa6467d067ffc58c001af6e216828
diff --git a/media-gfx/wkhtmltopdf/files/wkhtmltopdf-0.12.4-build.patch b/media-gfx/wkhtmltopdf/files/wkhtmltopdf-0.12.4-build.patch
deleted file mode 100644
index 0148f3b42948..000000000000
--- a/media-gfx/wkhtmltopdf/files/wkhtmltopdf-0.12.4-build.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fix build without patched Qt
-
-This was broken since 96b03ae.
-
-diff --git a/src/lib/multipageloader.cc b/src/lib/multipageloader.cc
-index 93dece8..456a857 100644
---- a/src/lib/multipageloader.cc
-+++ b/src/lib/multipageloader.cc
-@@ -213,10 +213,11 @@ ResourceObject::ResourceObject(MultiPageLoaderPrivate & mpl, const QUrl & u, con
- 	}
- 
- 	webPage.setNetworkAccessManager(&networkAccessManager);
--
-+#ifdef __EXTENSIVE_WKHTMLTOPDF_QT_HACK__
- 	double devicePixelRatio = multiPageLoader.dpi / 96.; // The used version of WebKit always renders at 96 DPI when no zoom is applied. It does not fully support a device pixel ratio != 1 natively.
- 	webPage.mainFrame()->setZoomFactor(devicePixelRatio * settings.zoomFactor); // Zoom in the page to achieve a higher DPI.
- 	webPage.setDevicePixelRatio(devicePixelRatio); // Fix CSS media queries (does not affect anything else).
-+#endif
- }
- 
- /*!
diff --git a/media-gfx/wkhtmltopdf/files/wkhtmltopdf-0.12.4-gcc6-warn.patch b/media-gfx/wkhtmltopdf/files/wkhtmltopdf-0.12.4-gcc6-warn.patch
deleted file mode 100644
index 83f862677a67..000000000000
--- a/media-gfx/wkhtmltopdf/files/wkhtmltopdf-0.12.4-gcc6-warn.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c7a709f3d9b7628d5416e45c365901381beef7cc Mon Sep 17 00:00:00 2001
-From: Ashish Kulkarni <kulkarni.ashish@gmail.com>
-Date: Tue, 20 Dec 2016 17:57:26 +0530
-Subject: [PATCH] fix compilation warning with GCC 6.2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-../lib/pdfsettings.cc: In function ‘QString wkhtmltopdf::settings::unitRealToStr(const UnitReal&, bool*)’:
-../lib/pdfsettings.cc:308:3: warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
-   if (ok) *ok=false; break;
-   ^~
-../lib/pdfsettings.cc:308:22: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ‘if’
-   if (ok) *ok=false; break;
-                      ^~~~~
----
- src/lib/pdfsettings.cc | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/pdfsettings.cc b/src/lib/pdfsettings.cc
-index e3c62526..b339ec10 100644
---- a/src/lib/pdfsettings.cc
-+++ b/src/lib/pdfsettings.cc
-@@ -305,7 +305,8 @@ QString unitRealToStr(const UnitReal & ur, bool * ok) {
- 	case QPrinter::Point: c = "pt"; break;
- 	case QPrinter::Millimeter: c = "mm"; break;
- 	default:
--		if (ok) *ok=false; break;
-+		if (ok) *ok=false;
-+		return "";
- 	}
- 	return QString("%1%2").arg(ur.first).arg(c);
- }
diff --git a/media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.4-r1.ebuild b/media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.4-r1.ebuild
deleted file mode 100644
index 26b0e472f391..000000000000
--- a/media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.4-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="Convert html to pdf (and various image formats) using webkit"
-HOMEPAGE="https://wkhtmltopdf.org/ https://github.com/wkhtmltopdf/wkhtmltopdf/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5[printsupport]
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtxmlpatterns:5
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-	"${FILESDIR}"/${P}-gcc6-warn.patch
-)
-
-src_prepare() {
-	default
-	sed -i "s:\(INSTALLBASE/\)lib:\1$(get_libdir):" src/lib/lib.pro || die
-}
-
-src_configure() {
-	eqmake5 INSTALLBASE=/usr
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	use examples && dodoc -r examples
-	einstalldocs
-}
diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest
index b7a230e5ff1e..527983e084a9 100644
--- a/media-gfx/xloadimage/Manifest
+++ b/media-gfx/xloadimage/Manifest
@@ -8,6 +8,5 @@ AUX xloadimage-4.1-zio-shell-meta-char.diff 1372 BLAKE2B 1c960ba7ae4da62eedcdfc2
 AUX xloadimage-gentoo.patch 8956 BLAKE2B 9834cb47e16fb20f970e9d33a6e42fef09d5a3d3cae3f5ab0db5c76661acb7c67a20115f4069bc2769b6d9f54acf4adea27e27b79495d74a77644db5281beba8 SHA512 8eba3107d81f0dc6caf749e9a9889f1662e5d1004e480a9a170533f3ee00c6f9f11d3c2008655322242ab61f31b676406fd44b97d83e4ce93b8f68a12397830b
 DIST xloadimage-4.1-gentoo-r1.diff.bz2 41535 BLAKE2B 77cdbb2e6d5dda6084aae2831bcb8750a027f59a673f5a1f8eeb61385bd21243d640bd13a3be7fb24d2ce2cb475a05cb04c91c2b53977c61fb3aa4416e67e112 SHA512 a1a52d576eb68c44e5ff3b68a6bd87cd9b8f21f6fa8edee2d7df2329002d40f6513df6c04ecd57f66018583d0251019bd02e15756dac705b8c9cb8470cb386e3
 DIST xloadimage.4.1.tar.gz 596021 BLAKE2B 3c22facf05167d1836c21243799d8f66c211e44d659b4397668ed604cdd82b3bd8f11ab7b3be5e87c59a9b3aa8569d0d3d2e474b572c3bca07b6437b293014bf SHA512 2c91699c8ef07c101ff9b458708ace01cab2979a5e88cf8a4e47ec971f7b4cb5571108afa3e53271ade4e8ccfdcf72ef9e2e09edfc0be6b8afaba50847aa0586
-EBUILD xloadimage-4.1-r11.ebuild 2552 BLAKE2B 9ea8ec71be31f995f78aa0cd1801a9a47c9aacb3462f7397ed43b697021e0bced2f0a144082972daed3a10ac9589a65570506e0fa50fe2a64abe1663f3e31332 SHA512 03b9f7de5b6d51bde25176cbac7f82b37a13d73545916588b41469b1b158003663db5c534ad9fa0afde16773799634fe6f8527ab1335786d58d9daa604e7e2b9
-EBUILD xloadimage-4.1-r12.ebuild 2517 BLAKE2B 877ce8c199d1080a21006d2f46714191aa7810b85a443e0a48dd772a3fc852ccf679d078c4c2b617f8321a4fa530c94b3cc36c689a2d392c05e79bb8a2ad0a6a SHA512 489017f7a6ede439fb8ac701cfe35f037a25f8ac98ee0927ef01cd2e40c2f4afd140289c50d2d19934af0316fbcc58a08fcc820bf6322962aa4258894151d8de
+EBUILD xloadimage-4.1-r12.ebuild 2515 BLAKE2B 09e734559fef97a8371a2c4c303b38880dc43196eb3919cbef586d4f298c32364ff878d097f1465b44a9925b02379e1f0d320b0e601a5378892d8fc477f7a2d9 SHA512 562f89276c0ebdce52af5ddc39af7fb2514e766b2c88a12ae3b87604700e4a080414a569bf46f2c5874bf5ba047e18f994a8fe91e6a2f0d2aa3aa64cdd57df31
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild
deleted file mode 100644
index 88c8bacd1277..000000000000
--- a/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="utility to view many different types of images under X11"
-HOMEPAGE="http://world.std.com/~jimf/xloadimage.html"
-SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz
-	mirror://gentoo/${P}-gentoo-r1.diff.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="tiff jpeg png"
-
-RDEPEND="x11-libs/libX11
-	tiff? ( media-libs/tiff )
-	png? ( media-libs/libpng )
-	jpeg? ( virtual/jpeg:0 )"
-DEPEND="${RDEPEND}
-	!media-gfx/xli"
-
-S=${WORKDIR}/${P/-/.}
-
-src_prepare() {
-	epatch "${WORKDIR}"/${P}-gentoo-r1.diff
-	epatch "${FILESDIR}"/${P}-zio-shell-meta-char.diff
-	epatch "${FILESDIR}"/${P}-endif.patch
-
-	# Do not define errno extern, but rather include errno.h
-	# <azarah@gentoo.org> (1 Jan 2003)
-	epatch "${FILESDIR}"/${P}-include-errno_h.patch
-
-	epatch "${FILESDIR}"/xloadimage-gentoo.patch
-
-	sed -i -e "s:OPT_FLAGS=:OPT_FLAGS=$CFLAGS:" Make.conf || die
-	sed -i -e "s:^#include <varargs.h>:#include <stdarg.h>:" rlelib.c || die
-
-	# On FreeBSD systems malloc.h is a false header asking for fixes.
-	# On MacOSX it would require malloc/malloc.h
-	# On other systems it's simply unneeded
-	sed -i -e 's,<malloc.h>,<stdlib.h>,' vicar.c || die
-
-	epatch "${FILESDIR}"/${P}-unaligned-access.patch
-	epatch "${FILESDIR}"/${P}-ldflags_and_exit.patch
-
-	sed -i -e "/^DEFS = /s:/etc:${EPREFIX}/etc:" Makefile.in
-
-	epatch "${FILESDIR}"/${P}-libpng15.patch
-	sed -i \
-		-e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
-		png.c || die
-
-	# One of the previous patches screws up a bracket...
-	epatch "${FILESDIR}"/${P}-bracket.patch
-
-	chmod +x configure
-	eautoreconf
-}
-
-src_configure() {
-	# Set TIFFHeader to TIFFHeaderCommon wrt #319383
-	has_version '>=media-libs/tiff-4.0.0_pre' && \
-		append-flags -DTIFFHeader=TIFFHeaderCommon
-
-	tc-export CC
-	econf $(use_with jpeg) \
-		$(use_with png) \
-		$(use_with tiff)
-}
-
-src_compile() {
-	emake SYSPATHFILE="${EPREFIX}"/etc/X11/Xloadimage || die
-}
-
-src_install() {
-	dobin xloadimage uufilter || die
-
-	dosym xloadimage /usr/bin/xsetbg || die
-	dosym xloadimage /usr/bin/xview || die
-
-	insinto /etc/X11
-	doins xloadimagerc || die
-
-	newman xloadimage.man xloadimage.1 || die
-	newman uufilter.man uufilter.1 || die
-
-	echo ".so man1/xloadimage.1" > "${T}"/xsetbg.1
-	doman "${T}"/xsetbg.1 || die
-	newman "${T}"/xsetbg.1 xview.1 || die
-
-	dodoc README
-}
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
index f02fa7f780e9..8e6085e9cb7e 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="tiff jpeg png"
 
 RDEPEND="x11-libs/libX11