gentoo resync : 05.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
commit: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree: ab466b4dfa7abecb401b2f8039d08af4689306bb /media-gfx
parent: d42200bec37eef2a7478d88988ff00addd0a9202 (diff)
127 files changed, 1041 insertions, 818 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 8ee56b9bcc72..2757a31e1581 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/crwinfo/Manifest b/media-gfx/crwinfo/Manifest
index 363a8832fa12..f23670ea5670 100644
--- a/media-gfx/crwinfo/Manifest
+++ b/media-gfx/crwinfo/Manifest
@@ -1,4 +1,4 @@
 AUX crwinfo-0.2.patch 1009 BLAKE2B 0d4ac95f748b9a0c82d9819a951cefa97c6a1bef06f7495623bc2e3b245ef32e63e8fa9d387d4408c136f58e9606a1b591d802bf3cb76c27ea7079df59d7a711 SHA512 b02efcaf211603b5901b316d286ba0baf7e74776a2f92d6f321b154c8713a7fe653b5652137de8ae25d7a9f9eca6f217a4bab1c6839e7bb144ac5fdd804c001b
 DIST CRWInfo-0.2.tar.gz 10717 BLAKE2B fce230c1913cd924b554697bb1a26661671ec2ec274fbb5f8918f2f5bdb8923897dd1f9b3a4a844f8d0f380f39f50ee08418c6d3cfac39fe7a3e50255aa0632d SHA512 54e386266570460dd43f5a6d4b0eea7d6c37d9327dca8ffc1fa10462f97e23fc080404159723ce6558c3dc6c77eccba6ede628097d95f699a47f57a114e1eb0a
-EBUILD crwinfo-0.2.ebuild 593 BLAKE2B c0e0f91e25e3d193e25da04ecece0f200ee2264473ca8972033f219e1f3ed2da18fa73ff17703218d8c9f94356853918868f10754479547951f9259fbad55514 SHA512 495d28d99f1ec03342c2c766f3b1a005877bca6dd47f96a64caba6eabe10f80212a539accece96fd67a26d8bc8c5a6750cd537a9efabc7b981ac4e1e448a0de7
+EBUILD crwinfo-0.2.ebuild 594 BLAKE2B c4d2eb73ee0329871dbd6b7efbe501cbfc2fb40b8f70495ecf3b51a7c6397131f55c7baea8e19a4908e52de1826c32102f37e02640480d198c1bb089d5507361 SHA512 f37a2bcb985ac2e3f27b2eb0b8ce4ba64eb9b1fb4b28ad69aa7289cfd90832adc70531cd2d579689fefb2db3dab18a8cc88aaa924bccf02f4d81f0b884343978
 MISC metadata.xml 369 BLAKE2B 82f9df6d1668d42aeb01f7632349addc219842853a89150515007bea21d058c9b92a6d38598c2cc35bdf8957ea8e40f0bcab55953443afbbd79e21a2c2921738 SHA512 ee3b3a975b809e4433e7a6242a788f016abd75a969c6898ed07861d38b609d11d5cc1997c19165128760ed3f99022dac64f3f63cd2281ff86bc78023d7c40709
diff --git a/media-gfx/crwinfo/crwinfo-0.2.ebuild b/media-gfx/crwinfo/crwinfo-0.2.ebuild
index 6f3b79d7548b..70f8d611378a 100644
--- a/media-gfx/crwinfo/crwinfo-0.2.ebuild
+++ b/media-gfx/crwinfo/crwinfo-0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://neuemuenze.heim1.tu-clausthal.de/~sven/crwinfo/CRWInfo-${PV}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 
 S="${WORKDIR}/CRWInfo-${PV}"
 
diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest
index 479ef94ca52d..9ad724337a88 100644
--- a/media-gfx/dcraw/Manifest
+++ b/media-gfx/dcraw/Manifest
@@ -4,5 +4,5 @@ AUX dcwrap 437 BLAKE2B ec88784e059ab07990acf3a47517f243502a140b451040c77f9320bd7
 DIST dcraw-9.28.0.tar.gz 194193 BLAKE2B d39a2d76dbbe74a2aed21c6b132ac25c9dd17312813e7f640a4a6d4abd4e8f1868ad596296ca9bfe61427b8b4764821e32679128747ff5a9452988814b77c638 SHA512 04609c4ddd5d1c9fa0ee1617d2ef25efdc22451e1fa6cf669d93abb1fa630a18198b30a289400f1814c8dca285547da8b081a1b00b085c00bb9318ad25c48a30
 DIST parse-1.73.tar.bz2 8186 BLAKE2B 4d7d69bbaad3fd69caeae24e4dfc77fa580d969f903c925f76cf0a7bdb13ff34c96ab6dc9917609ce886365f6971290b3af63aec9fed43b1876aa44dd951521d SHA512 06ffaf72695dc86bfc2bdd10d4f732bc428b72d427f4c10e93fc58536513477cf297adb56fb9cfc5ba5fd5b6b4cd197c33d8dac957a0a1bbe65b23393b64278c
 DIST rawphoto-1.32.tar.bz2 3841 BLAKE2B db7a80af4b06fc3709a9ae69d9f166c3323097821bb561af4e0ac9a1ef677cab6cfd5cd7896d1e1fce85e6fab545ced7d00ce809f97332bec594b94a27f77e23 SHA512 6ee5b6c4e4266c8e04221c894c4e737f8a6d2c6f0cc9c82db73064afd68488bd60de19b86b2d7b82780283bbb9f8156ef3149c1c730f09a00dce632744b44d56
-EBUILD dcraw-9.28.0-r1.ebuild 2941 BLAKE2B b41bd18081876d3b4fc44a745ee89f164b4f008aa973b9ef4adde42f791aa9ba53a322b4ef404e36a458354cba3115ac8bd05e222be440792e70dfc54dba64a7 SHA512 ff848dd78c682db65d39ff8381c63a56791c0c9665e6bc505594cc4159472d3d4e9bfefa746d0b6e358594ce6633263291f85542be29cd1dda9eb045233d4202
+EBUILD dcraw-9.28.0-r1.ebuild 2942 BLAKE2B bf394983338873ce6f8005246cd8e75eacf8f8f8eb5124565a3c8acfa0a1e145a8184fc15e570eb3bbfe33a367026c46e7f6443d1ccd1bb8f314202e609cde9f SHA512 88f88e644238d80ba4e5ad220f0fe2b834ef6ebb529d6af12e7b83dc0ff41c1468b88816f5ce6b721dcd48ef054e199ecd30a7e4654c6e140cf1b927c41b3f1b
 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 5d256c4636ec..b3005f005bc4 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 arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 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 lcms"
 
diff --git a/media-gfx/ebdftopcf/Manifest b/media-gfx/ebdftopcf/Manifest
index 3cd097af4ae3..fb1f28facadb 100644
--- a/media-gfx/ebdftopcf/Manifest
+++ b/media-gfx/ebdftopcf/Manifest
@@ -1,3 +1,3 @@
 DIST ebdftopcf-2.tar.bz2 7774 BLAKE2B 4dc1bde62b796f441332511e1b9206f9eadd216ab66dc1a6858dc467f9dfbbaaeb4a7de494eaae4584d8a57d59a0eb96f69047d1a57bd007cbb8e2f7aaccd1c6 SHA512 4631f1591290e0ddc778d5c557aff1e698d8dd7e5ac7e659fda7752642034fbabb091c840dcfad5695e9fc19909203a7fdc0b7a69d57a162ce6bb8fe710ef0f4
-EBUILD ebdftopcf-2.ebuild 625 BLAKE2B de30d61b51aae0bdefb5c47ffcbfd2df437ebd4d6c84bd008a6585b75c59b1b9795560fe44fa7b2f3bdef65788b4fb07f58c9821f6538115ac741a423f1f77ee SHA512 b46c8a5e796c3e9cc15652d2b86ab541e3c9c5e062faa6bd700ac6fb2c3ff458083521dace30c2c2751e630625d3aecc20de89e3057f44ffa43091acd87d1555
+EBUILD ebdftopcf-2.ebuild 626 BLAKE2B 0a1c65d0b690bdce3dc2721d47e65a32635fa3639893df145169c6d3bc67989f0a107b683fef45bf3a1d3839bf40d6a131a724e7f35196d4c8752b577f8d4557 SHA512 e2fb811cbde726738d55c23ab6df6372f3876985755896b999b456af502092f520da1988e7d58d40105df3456b4d0c4cad19f45c16e0dfa5a117c0a03854ca7d
 MISC metadata.xml 310 BLAKE2B d6b0416573d232c5715df5dcb05139b22609ce8ffb46530c2fd7a0cecc87b37ce2ce286310a80244b1911d5750eb29b55eef6b8c01f6d62c8d007ad2a9b5aae2 SHA512 1923349dde66e8078b37566097a21ead2555a73fdfd97b89beb44a714958dc80f4387ceb642d238419ce0ec388c335ba5db1db5f23b380131f0fbbd51ecd8f22
diff --git a/media-gfx/ebdftopcf/ebdftopcf-2.ebuild b/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
index 549d33bdd9e5..e0c60f084e51 100644
--- a/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
+++ b/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 # these apps are used at runtime by ebdftopcf
diff --git a/media-gfx/exif/Manifest b/media-gfx/exif/Manifest
index 8b89e9ef29df..eb11d0c8afc1 100644
--- a/media-gfx/exif/Manifest
+++ b/media-gfx/exif/Manifest
@@ -1,3 +1,3 @@
 DIST exif-0.6.21.tar.bz2 387531 BLAKE2B 494d4910af2e8f740aeebdeeaf8dec5ae638d3e78339c55d5acc38879ab4837164d2ef407bd07a2e36a00df15d53b132bb027e2e97e79c229c589819af3b7f7b SHA512 73b5b7df08462a6a084a8fb973c39197f5d64ed753a97cb2f94a4acf815fdf0313214c2c8e44a46a24a1f6304fdaa68a579b4a2e246cc095f6e9588e93368cdc
-EBUILD exif-0.6.21.ebuild 577 BLAKE2B 7f88826c39ba1f6bd16b46c84a7558798d7d29151a06ca132d96adfe8571616441d4c1c13ca2669912c937ef4d765391ee475c430817ce692b15121ee0840cf5 SHA512 f79011480d88d94ef72d5438515043d6247ab279932e9b84013e1f811ea45d38e50db7c17b75e0eba3a3d45bae2bab556a20624ea6702e61479b24e26fc146af
+EBUILD exif-0.6.21.ebuild 578 BLAKE2B 77582b88859436628c94cdf04035d94c91856957ce079e31ce6fc484481acc82032c9dc5b562169f74fcf40c191aa0b7dc577fdb681e7f0753e8676a9652e0b1 SHA512 751983623a22110e5cc4d2db2d251744334d99e58828b4dd4cee9ab48133118a39be08e0859e241766e461ad140a8184b079d5ba62122f538f810eac4ed47252
 MISC metadata.xml 346 BLAKE2B afa06166d278c5157eb097eb2d1c70fb929e86830868eddf353de6d8178f8966fc0ca06b52c95129555c3d0b4e15202f16135352bec3578cacbcaf7a9eceacb1 SHA512 195346710c3ead4bf9c050f5ebe548e0e7bb86bb1f9f61b2c1664cdda094c0523ee3c77769de7819b2d82cc4abd55e3b57c0827fdd0f97cc440f40b7519feec5
diff --git a/media-gfx/exif/exif-0.6.21.ebuild b/media-gfx/exif/exif-0.6.21.ebuild
index d7a9d86207d1..24c2ffc81b87 100644
--- a/media-gfx/exif/exif-0.6.21.ebuild
+++ b/media-gfx/exif/exif-0.6.21.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libexif/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="nls"
 
 BDEPEND="
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 2153b1a62a1e..02a3b62d42b0 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,4 +1,4 @@
 AUX exiv2-0.27.2-libssh-0.9.2.patch 2035 BLAKE2B aeb9be311217b80a347d76a7df14ec11fc2018626cf7e9a813865dffd76038db10432fc2c898c0c26bdb3f1556cd34c0f8e4a25b189bc32733a3b4e018b241bf SHA512 25b4ca539585ddc2f4a11fc24ba49e799689d361f5f99f5552e99bd81179c95968affc4a42acd9ac0ba56f237f29ec53970a134b4dce44274a6044638d5bd78e
 DIST exiv2-0.27.2-Source.tar.gz 27591236 BLAKE2B bd10d71356e4c8a465b71f8ceac07fbf2fd6cfb287cb22774568ad35eb38200be504e297224920af50a15ab4e9da98384ff4da7c33713f5346b33738380698b0 SHA512 39eb7d920dce18b275ac66f4766c7c73f7c72ee10e3e1e43d84c611b24f48ce20a70eac6d53948914e93242a25b8b52cc4bc760ee611ddcd77481306c1f9e721
-EBUILD exiv2-0.27.2.ebuild 2469 BLAKE2B 4117d560f3b7cfe77ff46d1a045fbb198c80f8ada7c02968369165843c8a545d04bf81be8f341559295930034f21b08dde529250617df62b586c8d4e5b13a1db SHA512 cfea38ad347adf6dca0e071cfbfc6f7c4d76e0799ae03dfe85d2250b3133e305d2031cb017e42f7458af629cf4f7dc2ebcd7337334548e4e9af9b9f176cfb97b
+EBUILD exiv2-0.27.2.ebuild 2470 BLAKE2B 708ab232f370ea3d5baa7120968e98a9247275a317091edbe69a71e58ad3fbea9fb3f7667b7223f7df9d39aefea314adb8c5f9d4a3584a50388987c07488c885 SHA512 c8cf2837010987bab1513e81fec41598de7ff482a4816a32f6d402e6ce19532d2e44a24a1297b0dafb6443567c6bea74b03c82d8d4fd90da63ef70e07444550c
 MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5
diff --git a/media-gfx/exiv2/exiv2-0.27.2.ebuild b/media-gfx/exiv2/exiv2-0.27.2.ebuild
index 276e0c2eff31..866a52c4b336 100644
--- a/media-gfx/exiv2/exiv2-0.27.2.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://exiv2.org/builds/${P}-Source.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 fi
 
 CMAKE_ECLASS=cmake
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index 86d0ec41eec4..fdd8655ae6c3 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -7,7 +7,7 @@ DIST fbida-2.12.tar.gz 294842 BLAKE2B f9de5957f9015e022868d2b14d0269951fccbe8f10
 DIST fbida-2.13.tar.gz 296020 BLAKE2B 119be4103b53ab7e7d1791a22172e1311ced0db5e9c928faf22ab08dbe1670c91d30f7dafbf8873a9621c16a7902354f5e21e2a86d45c9572b30fe8e205bfc4d SHA512 a316776f381fac6ec6a5d085ece7a42e8e34b2c0f5ae1cc58ad5b5736dc83d8f2e7776779716abfc0ae9c51baacdf911df6a0be610d2b7b2e3ce6d0c81e1fdc3
 DIST fbida-2.14.tar.gz 296826 BLAKE2B 0015b426c5deaf72737a52bddb065e7d0cb804ea97157dded522061d8fabb5c632d5e66b1ef1b4e75b355537ef4f4e603f3a877e2ef92d1581eaa4791ab5be99 SHA512 8f3596ad8a22497880ac698d3b324e038ac5ccae7481fe4a902fc6e8bf43ba1bb3a96af8c7a3347bea86c1988f35674e2647901ac256bd4e8261d467a6a343ec
 DIST ida.png.bz2 11928 BLAKE2B 8a1c89fc5adfb16c69f9591a299beb62c84d66960b586fbc819e53f904c90beef821ecf3539236563644c28e3ad3c7dbf861b140c820be649305a658b3613433 SHA512 cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3
-EBUILD fbida-2.12.ebuild 2419 BLAKE2B a13946e0fa612c070e4478993bbe2679a0acf306eb328a707ccd8c75bec82f3f8f3ebb1172a0a33ad20c0f6197f65c0487a91e9c6e2fe12aaecde5e104ca379f SHA512 0ce6c45ca0cac7576dbd78187715570c2675aa3e974134fccc79b55f1ffb50d28fedd406bcd667fd30b8f48d7c6951f09d105b05f626f337f4897358f8b0868e
+EBUILD fbida-2.12.ebuild 2420 BLAKE2B d6e7426fa9335542e27d6e9d0d1a4203059759ee858ec3afe7ef9ac73abdd973fae9f05357272f69719bb472d36732ea4bb27d7b662f930d7722156397fc292a SHA512 391a1eed17e5876f1b753b3760fe5cf7e0f5b2f626f1ffe81f8876b94d030a969b12b4fa545649ec2da44f0c43936b71571950552b2997a78e6407c78fc84be6
 EBUILD fbida-2.13-r1.ebuild 2402 BLAKE2B 22a7d44291b990a24e6fe92bf3cf7e210d9854af92c7bae76ac343dd975f41a5e1e790623abce9a29190120123a2d09bc963564f69cef084762e26a513a6c594 SHA512 de8c0bd27773aa0e33f155ed80e16c1cd6387a60cc5260472460e996d636efa58cabf38831f41c45a64c2473b6cfa111b9f47974457a5d0f5da9e57813d03c7f
 EBUILD fbida-2.14.ebuild 2355 BLAKE2B fdae71cabb570115f0898a00f60c6c7edd6913861c7108990dc62d8f3931bbfe621b7776362354dd456e6d5cc58fccd6a2a294a4430f9bf76cd1ebe3cf8c71bf SHA512 1acf426bf24d070b8207a8196871566dab72ebc49464b6a26a6afdb31d1f81b867969a11d53ef2e0bc129565694d0f8662a82233b4e059f731e866e44c0227b3
 EBUILD fbida-9999.ebuild 1239 BLAKE2B 78ae23ef4d8f11b72f9c426a35bbcb8d10cc4f2b566c7e13855e631c07d3cf05746c33cac3bd5c48028b1710b10f51f3af3db96fe09978906b460bc40ae2be29 SHA512 2c8aaa0ff740002b3b2b8c4f6de05f9e356d9848fbaf03b30cffa1a492580676494ef9aa2f67410d8f6982180b20c69ba9d96a847f4a8229a3a4a00458400db4
diff --git a/media-gfx/fbida/fbida-2.12.ebuild b/media-gfx/fbida/fbida-2.12.ebuild
index 1a827276e2e1..619df71c1270 100644
--- a/media-gfx/fbida/fbida-2.12.ebuild
+++ b/media-gfx/fbida/fbida-2.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 "
 LICENSE="GPL-2 IJG"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ppc ppc64 ~sh sparc x86"
 IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp"
 REQUIRED_USE="
 	ghostscript? ( tiff )
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index e20fc3aca713..e7cc0beab24b 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -3,4 +3,4 @@ DIST feh-3.2.1.tar.bz2 2112281 BLAKE2B 2918d2714f0557e1b67284709bce22c5e14d8f7f5
 DIST feh-3.3.tar.bz2 2112880 BLAKE2B 56042367c0acce966e115e77f3afa1acd3f942a956bc453de364bcd17d90393ad2868039a5793af64826cd50322e4ef5f9f2b9678f982c7c85b025ed208f8bb8 SHA512 0372115a8f2df77cdfc0fc1b24479e72d9be1f24127c787909ef671075b199b8d5f873200ce202f51705991cf3c5f5cc71ef8f47294fe520e3a9acc5cb7582a9
 EBUILD feh-3.2.1.ebuild 1522 BLAKE2B 79c8a59656764fc43e28f15616dc26ffd40b81b1417d885e5c1b89e32a6ff854c7b6af763acddd0897ce58bf0231eb7250319090c48fa282f14218dfb477edd2 SHA512 6e4ef3a5b5a962510bbce7957b09b11d46111ffd10593159d965bd86e09c7da7800175459b8cdc553a58ac616d146a7752253cf72afd6be003cf93be81eb5409
 EBUILD feh-3.3.ebuild 1526 BLAKE2B 15dabb54b5433f46af59e105bb236c8eee767742db5752ab980411e716b8f5243d632f256192d3d933d67bbc30d68d73fef5fe60122a060c40594bc83b10a250 SHA512 0557f644d86c41cdd21e8e3db16f29f7b45d2872bed6f6fe6a5867e54cf8ee86605da7c1aa1ec0ea6614741ae842a44f56d14c4ce38d1a140f4a1d337b215ab0
-MISC metadata.xml 358 BLAKE2B 602fb8b872f5f209abd20adbb141035c0d0396a7712839c950cfa19e78201c0c39e88fa5e8bebc6224459bb8e328e732ff30db848f6c84510f91830951f2087c SHA512 51fad9cc41f31b03f42e0ac4254ea05a848df755091cdd47ee4ce73f7189acd83e8956c230329ea0053d1f794b529e498525f6ce282a947c9809c4954a5b9a19
+MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/feh/metadata.xml b/media-gfx/feh/metadata.xml
index d4bb1b3a4808..19bf1be2581e 100644
--- a/media-gfx/feh/metadata.xml
+++ b/media-gfx/feh/metadata.xml
@@ -5,7 +5,4 @@
 	<email>graphics@gentoo.org</email>
 	<name>Gentoo Graphics Project</name>
 </maintainer>
-<longdescription>
-feh is an image viewer at heart, though it does other cool stuff.
-</longdescription>
 </pkgmetadata>
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 63066190db28..7579155eaf71 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -3,8 +3,11 @@ AUX 20170731-gethex-unaligned.patch 510 BLAKE2B ed943be0d150c8de7c99decf898cc4cf
 AUX 20170731-startnoui-FindOrMakeEncoding.patch 751 BLAKE2B c4a0248affa9117c5150aacb40a54bcb6f29d84866e1d193898f49a4fe58735eda2319856b6cfdbce450492871a5fe2255443849dd0f98ee70285614f7e44bb1 SHA512 0135717d9760a0bbf6d35ce21c19fb9019d3da01859882918a5643bbe6011a55eaf57ad07c8063c2c5c20cd6c6907420f8015abf54210ccdd75b2ba473e6b366
 AUX 20170731-tilepath.patch 411 BLAKE2B 39ef99a26b85fc25d6c0b778a6b0ddfdb2c366b6456bd8ed47b12ca8681e8970e65e3b69cd06880794832f761c6de801d9e7c51e1edfff5abf434aa7f7dcc7c2 SHA512 026f6765b2db7549f72cd6ccff8d23bdf357ab24035c89cd792fa933f6033445f6cbaf7fa20f1372bdeda2caa242b9f8237f3019292cba0cc551c6de9e5c8341
 AUX 20190317-gdk_init.patch 1391 BLAKE2B 6b4294e24d1bef0300344d2c11ef59d7d3f22d83ba7e8cc3e981db827dde7c30f234be35c017cc8c854ae090aa1f3e177af2c4bc511365fdbdb2e8c40402dda9 SHA512 3976f2a860f6c6aaec8e1532ede9fde7beff3ae98ca8e0cf87b33b7165f158ae676c751a7cb3e7897f1dff3f03c041d4ee6bd06e68904973b5bc5acdee5bede5
+AUX CVE-2020-5395.patch 3073 BLAKE2B 15fa97a633e2c218f512a7d1202555e2465bad9adf0661bcc314a940d691520ba897ed6d76ff2b80111f3c016d71717ec4170196ce2177f3e6478b26f63e76ca SHA512 7dcdd6c4e8eb433de32fe76c2a1832ba9b318c5889ce03325516fa8d3ce63043a89e740758cf75b10626bac43352292e11ba0fdf31725ecff5b9d3065265ac3b
 DIST fontforge-20190317.tar.gz 22762120 BLAKE2B 5cb85d2fb9a2a08fe64548f2667c026e916dd0239d17d8f8d7d2fe8ecb51f2106cf3dc6e6298014c0deadffbfe91925327b483ed4750a171fb621aea8bdee60b SHA512 55f9b0f7cafb1aa5a1461dbf39b52ca6b69a2baa6b761c8c28f86a0bb99e090d9ecc981294f51dadd9297b5ebd3036f01cb4f17b9a97a737eb567b4ae6522f20
+DIST fontforge-20190801.tar.gz 20766334 BLAKE2B c3206e77da4a966b9e513c41c90e19522f3d1aad990cd3035d7c8a8cc009239811743c12c02df3b02fd91fa5a7738913dba43df14523a738a2232cd2d1a91700 SHA512 78f3e1e94e38e26dcf52c6a0e038753033dc47052b7492f0ac0aaf1b8962e4e4bbf07c2550ef6014ea7290a6429bf669acb0691735efe0aee368480b4b7e6236
 DIST fontforge-dist-20170731.tar.xz 13985256 BLAKE2B 7bc49a3b7747de419e4fafb445062873cf9bf56aa73fd7499509b787a1c0fd6c47b0b5d7bfeb2a69d9237f9f66f989af968b0d00e9d5e57030906394f042f29c SHA512 26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11
-EBUILD fontforge-20170731-r4.ebuild 2816 BLAKE2B c18269a507266fb08279df3c4d367100dfdc87e9b875fd559fd4563f9c559c63e9c4f3fc5d92c4d2bc7fd80be26bcbfbf924c25372fb2c35688145eb12b0794e SHA512 e685d7c7509376817a57d623fc1373d8510f5aebbfe226cf1e3f5863d363162e837c2c3616686ee2911a38294cd16c81d1a9e85779711cc9d4089add0288ee96
-EBUILD fontforge-20190317-r2.ebuild 2738 BLAKE2B f5f392434e2b2660f94dc431618dc83834566f3799eb4450b5e4f9aa4e529c3a25bfd35b048fe654bb78ad98a9d9fb34fc7755fbb312060b8203812fdf600c55 SHA512 43c193bc4295b3152743a2efd22b89324a29e49fa22debea90869f7233d6b88b7c678fbc4357096c808f6800b964a3c3bac1af26808fb0343b69c983ffbc3f9e
+EBUILD fontforge-20170731-r5.ebuild 2852 BLAKE2B 635d215e7e84c0c022008c5fcd6aa30758023d2cf5b589a1f5db1681d6659c9af849e6c007d57caa4cab33da203542fd5f2ddf685f9c5773d05b3cb978c8f6f1 SHA512 c5449ea9b0a24c43132a9c663b9bb2fe136e3b56691b1ec4ad35fa52bd40820f37f312a8b75dcca1e1fc96c9a1f1712906c97b4f99d6427dcc85c52552ba1a3e
+EBUILD fontforge-20190317-r3.ebuild 2773 BLAKE2B c92f4cb825907a97e26df7f9d3c5c96fd40a9ce28ad28728432a5644ade9c879d37e2d7bf1923429d396f373a58a29a1485ad7ec40bfc65fab2bd89323f802e8 SHA512 6e9963725f1afa2d7be03868bd24eb44f781ac1bc32f893854272c80113f9941f9d8b805953d91d4f7683091f7eeff9b9f0b23ae3b7bc944f3703966f56bc6a9
+EBUILD fontforge-20190801.ebuild 2531 BLAKE2B 3a5adafebf248d965738ae047b1eb2d0ca69e4e410b91c8184d6ce0522d949e2e04190d6b43ba51816976388688db462354031561feb3649c302f0c00b96a4a0 SHA512 b9a8600d01d8d704887924977f52aca61720371ea753aeefd2a1f50a7b08387b71e70f878545f553531ac449f71ab23306487287a4054b14cb0c2458f2548dd0
 MISC metadata.xml 908 BLAKE2B 57e840cbf69ebd2780ecaf5a3009905b782223a16339beae90acf1c087a185944e33fe952b477184244cb3f5f313fcce32a561ce903d751de457b77f4a90cd74 SHA512 973d4967be4eb7aad087ce977a4d94945a8894138604e8d37257dac97f74e98f7fb9a7cad7e7f46abb4c8c39dcb4bd79e9ad26f96838ad39ac1894e154834d28
diff --git a/media-gfx/fontforge/files/CVE-2020-5395.patch b/media-gfx/fontforge/files/CVE-2020-5395.patch
new file mode 100644
index 000000000000..51b524503764
--- /dev/null
+++ b/media-gfx/fontforge/files/CVE-2020-5395.patch
@@ -0,0 +1,78 @@
+From 048a91e2682c1a8936ae34dbc7bd70291ec05410 Mon Sep 17 00:00:00 2001
+From: Skef Iterum <unknown>
+Date: Mon, 6 Jan 2020 03:05:06 -0800
+Subject: [PATCH] Fix for #4084 Use-after-free (heap) in the
+ SFD_GetFontMetaData() function Fix for #4086 NULL pointer dereference in the
+ SFDGetSpiros() function Fix for #4088 NULL pointer dereference in the
+ SFD_AssignLookups() function Add empty sf->fontname string if it isn't set,
+ fixing #4089 #4090 and many   other potential issues (many downstream calls
+ to strlen() on the value).
+
+---
+ fontforge/sfd.c  | 19 ++++++++++++++-----
+ fontforge/sfd1.c |  2 +-
+ 2 files changed, 15 insertions(+), 6 deletions(-)
+
+diff --git a/fontforge/sfd.c b/fontforge/sfd.c
+index 731be201e0..e8ca39ba83 100644
+--- a/fontforge/sfd.c
++++ b/fontforge/sfd.c
+@@ -4032,13 +4032,16 @@ static void SFDGetSpiros(FILE *sfd,SplineSet *cur) {
+     while ( fscanf(sfd,"%lg %lg %c", &cp.x, &cp.y, &cp.ty )==3 ) {
+ 	if ( cur!=NULL ) {
+ 	    if ( cur->spiro_cnt>=cur->spiro_max )
+-		cur->spiros = realloc(cur->spiros,(cur->spiro_max+=10)*sizeof(spiro_cp));
++		cur->spiros = realloc(cur->spiros,
++		                      (cur->spiro_max+=10)*sizeof(spiro_cp));
+ 	    cur->spiros[cur->spiro_cnt++] = cp;
+ 	}
+     }
+-    if ( cur!=NULL && (cur->spiros[cur->spiro_cnt-1].ty&0x7f)!=SPIRO_END ) {
++    if (    cur!=NULL && cur->spiro_cnt>0
++         && (cur->spiros[cur->spiro_cnt-1].ty&0x7f)!=SPIRO_END ) {
+ 	if ( cur->spiro_cnt>=cur->spiro_max )
+-	    cur->spiros = realloc(cur->spiros,(cur->spiro_max+=1)*sizeof(spiro_cp));
++	    cur->spiros = realloc(cur->spiros,
++	                          (cur->spiro_max+=1)*sizeof(spiro_cp));
+ 	memset(&cur->spiros[cur->spiro_cnt],0,sizeof(spiro_cp));
+ 	cur->spiros[cur->spiro_cnt++].ty = SPIRO_END;
+     }
+@@ -7992,10 +7995,12 @@ bool SFD_GetFontMetaData( FILE *sfd,
+     else if ( strmatch(tok,"LayerCount:")==0 )
+     {
+ 	d->had_layer_cnt = true;
+-	getint(sfd,&sf->layer_cnt);
+-	if ( sf->layer_cnt>2 ) {
++	int layer_cnt_tmp;
++	getint(sfd,&layer_cnt_tmp);
++	if ( layer_cnt_tmp>2 ) {
+ 	    sf->layers = realloc(sf->layers,sf->layer_cnt*sizeof(LayerInfo));
+ 	    memset(sf->layers+2,0,(sf->layer_cnt-2)*sizeof(LayerInfo));
++	    sf->layer_cnt = layer_cnt_tmp;
+ 	}
+     }
+     else if ( strmatch(tok,"Layer:")==0 )
+@@ -8948,6 +8953,10 @@ exit( 1 );
+ 	}
+     }
+ 
++    // Many downstream functions assume this isn't NULL (use strlen, etc.)
++    if ( sf->fontname==NULL)
++	sf->fontname = copy("");
++
+     if ( fromdir )
+ 	sf = SFD_FigureDirType(sf,tok,dirname,enc,remap,had_layer_cnt);
+     else if ( sf->subfontcnt!=0 ) {
+diff --git a/fontforge/sfd1.c b/fontforge/sfd1.c
+index cf931059d0..b42f832678 100644
+--- a/fontforge/sfd1.c
++++ b/fontforge/sfd1.c
+@@ -674,7 +674,7 @@ void SFD_AssignLookups(SplineFont1 *sf) {
+ 
+     /* Fix up some gunk from really old versions of the sfd format */
+     SFDCleanupAnchorClasses(&sf->sf);
+-    if ( sf->sf.uni_interp==ui_unset )
++    if ( sf->sf.uni_interp==ui_unset && sf->sf.map!=NULL )
+ 	sf->sf.uni_interp = interp_from_encoding(sf->sf.map->enc,ui_none);
+ 
+     /* Fixup for an old bug */
diff --git a/media-gfx/fontforge/fontforge-20170731-r4.ebuild b/media-gfx/fontforge/fontforge-20170731-r5.ebuild
index 0aef5976173a..04d71dc2cee5 100644
--- a/media-gfx/fontforge/fontforge-20170731-r4.ebuild
+++ b/media-gfx/fontforge/fontforge-20170731-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforg
 
 LICENSE="BSD GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X"
 
 RESTRICT="!test? ( test )"
@@ -68,6 +68,7 @@ PATCHES=(
 	"${FILESDIR}"/20170731-tilepath.patch
 	"${FILESDIR}"/20170731-gethex-unaligned.patch
 	"${FILESDIR}"/20170731-PyMem_Free.patch
+	"${FILESDIR}"/CVE-2020-5395.patch
 )
 
 pkg_setup() {
diff --git a/media-gfx/fontforge/fontforge-20190317-r2.ebuild b/media-gfx/fontforge/fontforge-20190317-r3.ebuild
index 210cb2b03cc9..28c16aebe855 100644
--- a/media-gfx/fontforge/fontforge-20190317-r2.ebuild
+++ b/media-gfx/fontforge/fontforge-20190317-r3.ebuild
@@ -67,6 +67,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/20170731-gethex-unaligned.patch
 	"${FILESDIR}"/20190317-gdk_init.patch
+	"${FILESDIR}"/CVE-2020-5395.patch
 )
 
 pkg_setup() {
diff --git a/media-gfx/fontforge/fontforge-20190801.ebuild b/media-gfx/fontforge/fontforge-20190801.ebuild
new file mode 100644
index 000000000000..31b62099c783
--- /dev/null
+++ b/media-gfx/fontforge/fontforge-20190801.ebuild
@@ -0,0 +1,106 @@
+# Copyright 2004-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+
+inherit python-single-r1 xdg
+
+DESCRIPTION="postscript font editor and converter"
+HOMEPAGE="http://fontforge.github.io/"
+SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforge-${PV}.tar.gz"
+
+LICENSE="BSD GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	cairo? ( png )
+	gtk? ( cairo )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( png python )
+"
+
+RDEPEND="
+	dev-libs/glib
+	dev-libs/libltdl:0
+	dev-libs/libxml2:2=
+	>=media-libs/freetype-2.3.7:2=
+	cairo? (
+		>=x11-libs/cairo-1.6:0=
+		x11-libs/pango:0=
+	)
+	gif? ( media-libs/giflib:0= )
+	jpeg? ( virtual/jpeg:0 )
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0= )
+	truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] )
+	gtk? ( >=x11-libs/gtk+-3.10:3 )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	unicode? ( media-libs/libuninameslist:0= )
+	X? (
+		x11-libs/libX11:0=
+		x11-libs/libXi:0=
+		>=x11-libs/pango-1.10:0=[X]
+	)
+	!media-gfx/pfaedit
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+# Needs keywording on many arches.
+#	zeromq? (
+#		>=net-libs/czmq-2.2.0:0=
+#		>=net-libs/zeromq-4.0.4:0=
+#	)
+
+PATCHES=(
+	"${FILESDIR}"/20170731-gethex-unaligned.patch
+	"${FILESDIR}"/CVE-2020-5395.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable truetype-debugger freetype-debugger "${EPREFIX}/usr/include/freetype2/internal4fontforge")
+		$(use_enable python python-extension)
+		$(use_enable python python-scripting)
+		--enable-tile-path
+		$(use_with cairo)
+		$(use_with gif giflib)
+		$(use_with jpeg libjpeg)
+		$(use_with png libpng)
+		$(use_with readline libreadline)
+		--without-libspiro
+		$(use_with tiff libtiff)
+		$(use_with unicode libuninameslist)
+		$(use_with X x)
+	)
+	if use gtk; then
+		# broken AC_ARG_ENABLE usage
+		# https://bugs.gentoo.org/681550
+		myeconfargs+=( --enable-gdk=gdk3 )
+	fi
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	docompress -x /usr/share/doc/${PF}/html
+	einstalldocs
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index dd3cd4c9d8c2..eea609f3389a 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -10,17 +10,13 @@ AUX gimp-2.8.22-cve-2017-17787.patch 1058 BLAKE2B baeffda42385b552709781a772ef59
 AUX gimp-2.8.22-cve-2017-17788.patch 1012 BLAKE2B 90bc17b66dd40426073a2581c20e68551b1c80378e055704d36ad56cc0a2b7448c847b847aacded6b8033ee86b3bb42e679845a46c65c1ea2d3af8c90aeb53f8 SHA512 82231c53664535c66d70b4e129b24afa31a50d465968f1012e20420ee71842435acf7d43de78cdac81602d80b89a927c03f9d60159c89c41d4b88e6851ed8acc
 AUX gimp-2.8.22-cve-2017-17789.patch 1245 BLAKE2B 14d519b8b024e51b452806b4acb6f00231e535ba3502875e8e90350e62c2cd0ff634ab1b38f16bb098670dd1e9d21c88aa64e19c3f81600acc7ea448e8f22b90 SHA512 f2f4aff0f0478356513a1f6da0732c5d0986ef1deb7b8e68bd283b7259887cf9a4d4785f00e48f03892cc86aa715b9764302640b2b891ab16617ef595ab779b8
 AUX gimp-2.9.8-cve-2017-17784.patch 1087 BLAKE2B 2398e735ccd7b0a5cc393f297b60d4a51038aeb146779268f78fb2f0a24ef912468510de2a0f640c5f905fe9959581686f55bccc022633b6f2a3a93ab3f12848 SHA512 5bc928860b2f2b53cc72c9c3caf6a532cf7e61b02e0716ee99a5166a07b01bdd46edfeae7bf6e333ce14ca11b5fcb963cbd42005e02f914d909431bf201dc6d5
-DIST gimp-2.10.10.tar.bz2 32408724 BLAKE2B 7d4f06d255d7b853f08c2a8bd9695b5cbc27a417f2f78aab56c970675430534b7c6f870168c5555369b873971b4ca3889565085cfc0cb9b2e1bb60c3bfe938bd SHA512 87caab9643a018e741e5e51c61220b7b282a66ed5bb723750cdf4139950f98c9ab246f4d6450420531d0e878c4561150efc4063cda896f08b25669bac4d1d172
-DIST gimp-2.10.12.tar.bz2 32614932 BLAKE2B 93e0c6c3ac58335920a9ebcfa81c970f0c657757860ab255e8a584ec2fa0c4d97c639797419eef58d5ef076797f2437eade20c1dea02c18bcbd8bd0fb30a8069 SHA512 dd4af3f0fa6fca815d254b7f42aeff15412c38294f1f5bd491563e2b597fcb868e6adff9001b196a68e01cf49bde61cbb153b662b8da1aa1b4b1f7285879659f
 DIST gimp-2.10.14.tar.bz2 32786424 BLAKE2B f1254ab0742cf0190f4e50f001d8120fe655b73d838c3ed56abb0a221c0eaec02e5c838f952d492069d55d89e4c3493c59b38aa2af87df8181f8979213e7659b SHA512 acbd095361d9211a5a23474693dd170ed76bf4ea5b1df69791f1d975ef5cdaba1e5fb9f5be9f592a360db5826d71eaaf464005075397cb6630070fe32833c030
 DIST gimp-2.10.8.tar.bz2 31954568 BLAKE2B 11f88b1068fa1fe216a54bed27b26b94c3fdb2cbc67e1e444df74a080d00b678f8c81897a6c5fb5956fa107842b0a853ada44d15d51c2e58db7435ddd0f8e999 SHA512 b458dd710b786152f95a8e48a0727b71cac549fccb31ac9e1e6ac3c617652079773ce7076401f8ade750ed38bdc78dfdec3317423f4c4e9c931f78002bd7454e
 DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6
 DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
-EBUILD gimp-2.10.10-r1.ebuild 6074 BLAKE2B 75682eecedbf6211a78718f5c5856b09c783d28c151e00d82ef328365eb3585109af7b08629a11612e9d56630f8008a08ecf8b09a9c721ea0669fd4a46f9a068 SHA512 d453c6937229ab503c753cadbfc96f8d895f9ddfa8a7facb80d06d2c217a448d21595bc06369b174da2cc7a2c22cf75430e12d2196b4a2aa05a9cb7e58a6bbb7
-EBUILD gimp-2.10.12.ebuild 6074 BLAKE2B df3879b253aa768e86be41bcedafa185d52e25f74cfe6534b3d67670f479062cd0ba101573a0005d6201be0d3190019e74be11beb92753bd82bbd8e0fb5eac8c SHA512 c82794178786e30b3b2a6ad08c4705e9be546885ab00df5b3e218cccca16f3cc7e4a01d722bc0b79f9d6d0217841e1c3a49a54ff77aab9faf926f8a1fab6ff2a
-EBUILD gimp-2.10.14.ebuild 6079 BLAKE2B 9c91ee0cf92a3ed1be7626c12d6be81a7f1b3f4ebb3174cb26d6cbff627e28c7be34d8315357fd9f3b03f618e3019fd1f8c5e8be3b3a86a89cc48ff1218e0fd8 SHA512 2a52f0a331da2073dff070ab0367758f5787cf8d9a7ea3b267bea3c95ba4d4d4ac1635f592efd128db56daadd0eb625548ea951d8cff49cbc6945a2dcacc3701
+EBUILD gimp-2.10.14.ebuild 6083 BLAKE2B 30e51fc97a7e1a97e12cad9acb85fa37d276087c3ad859783b5cbd721944d52622945dc6534bcb31cc32d3acb1b2941c8fd46954d66618d59b6232d6bd4a23ad SHA512 689c781bec1643c2b4598258b0b1162bb37abd8c6ab1b1043d1d2a42b530312ef0caeb522f0b53c7624a4552fc825a9a92821979c8ee76be90b42925c526fc21
 EBUILD gimp-2.10.8-r1.ebuild 6104 BLAKE2B bec6521e91558be2f2282baf131598c519f92c93267f687dedcac78fe70d27851c09307eb438009d35f9307c2ae78a77411cb6238cdde84b0ace9165399308cd SHA512 20f59e5aa3a8d5424b65ed9f947123feee6723dd16f946991022b17ac964be37c6aa0a71022928293fc51c542f3a3ad24ad3432fc6680d7214393d87d5159db2
-EBUILD gimp-2.8.22-r1.ebuild 5124 BLAKE2B b2fb64d49da0796f6eb2245eceade1ea5b5e2c5da2af918dba9c87a0fa4cb7f4c6dbe7688a6d7fe08b085c569413c06ffd4d22bf1cfa3a9f8c00277f634a11ac SHA512 e8cec3990a151e13c606498f5ebc4e685a28d5fb10919ec6bbb71b1f60d814b13722530f8737aff9e18065093800b8ebbe56d5f3844555accc475d2b74acf18d
+EBUILD gimp-2.8.22-r1.ebuild 5125 BLAKE2B 880aa0f1b5fbd631f5242a41059b0ba7ec54773b3f49bd6f600361a1de23d65844ec369b1ae3283dc09d2ce7ea51cfa17a6bd68fe50dd2074e14d26e30f74922 SHA512 648e90b0121e4971bdf9fcd09383f790addb5fa63e256f22c1e76b22ed1b92c2d73cb0740d061dc3c1a65311d3b2e8cb843070fb08ea528cb365886d2b495e5e
 EBUILD gimp-2.9.8-r1.ebuild 6042 BLAKE2B 0190f744da671d8b8d89e2596100c2ac2268adb1d278ef3106d89863c6d501c60c1e6a5cc7cb6c831aff43224e23c1c0a818cf5102afc28da637262e51798e44 SHA512 0a5a0aa970e83d5603223e7dd6a989098a150807183626bd45f03a68eb553fe3cb85a999262adfb60ea417a43e7b45f2f2379f746b019216347b52a9497f2a07
-EBUILD gimp-9999.ebuild 6084 BLAKE2B dbcbaa20a582a88853ecc3cd568aa02b61cd452fece8253e49864a274ba0186ba8496eae39135b28837cb39901d086688e0f769bfb31e236853b01e3584bffe7 SHA512 fbcd4aae7506bf712fcc48cc4496ebd48422af4908eddb128c334edf93480f22ecd5400a2cc0990532c9472f2de162b251854165f92ea1aa0839fdc189ec6a59
+EBUILD gimp-9999.ebuild 6114 BLAKE2B 00745fe1d7fa98a3f681f44f0ca8c8efe3fa7af98ae117ad0b0838376d140c9f7f843eeb87f50d3acb52721d1eb19548b04f0debfd6c9d86647a7270d814109b SHA512 5f7ece5f194ce0d7c526e0aebf69c045f9bddbb4cca2612d73e871ca350bfd5e60ced6bee1f2083096e1b5182b810608d4898ba6391d745e565cb7c02f1c1b0c
 MISC metadata.xml 628 BLAKE2B f1326f51db692d6e64d1bb7b44dfada65799d7ab94279771e6bd729189145a8a4bbe7a83c776bfc46acf682ad9f34c84598d25fb0a3606aabfa30383b35a9694 SHA512 cec60cde9763bdb9012fec754b95018f09da5cf7ff2f577206417651df5c18251dd5c58b1e32fb45e7c2121e06c0a5b7dc86d08b9511da4cf103bcf2fa1b6e52
diff --git a/media-gfx/gimp/gimp-2.10.10-r1.ebuild b/media-gfx/gimp/gimp-2.10.10-r1.ebuild
deleted file mode 100644
index f3976c3f12b0..000000000000
--- a/media-gfx/gimp/gimp-2.10.10-r1.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-GNOME2_EAUTORECONF=yes
-
-inherit autotools gnome2 python-single-r1 virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="aalib alsa altivec aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_x86_mmx cpu_flags_x86_sse"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	>=app-arch/xz-utils-5.0.0
-	>=app-text/poppler-0.50[cairo]
-	>=app-text/poppler-data-0.4.7
-	>=dev-libs/atk-2.2.0
-	>=dev-libs/glib-2.54.2:2
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.40.6:2
-	>=media-gfx/mypaint-brushes-1.3.0
-	>=media-libs/babl-0.1.62
-	>=media-libs/fontconfig-2.12.4
-	>=media-libs/freetype-2.1.7
-	>=media-libs/gegl-0.4.14:0.4[cairo]
-	>=media-libs/gexiv2-0.10.6
-	>=media-libs/harfbuzz-0.9.19
-	>=media-libs/lcms-2.8:2
-	>=media-libs/libmypaint-1.3.0:=
-	>=media-libs/libpng-1.6.25:0=
-	>=media-libs/tiff-3.5.7:0
-	net-libs/glib-networking[ssl]
-	sys-libs/zlib
-	virtual/jpeg:0
-	>=x11-libs/cairo-1.12.2
-	>=x11-libs/gdk-pixbuf-2.30.8:2
-	>=x11-libs/gtk+-2.24.32:2
-	x11-libs/libXcursor
-	>=x11-libs/pango-1.29.4
-	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
-	heif? ( >=media-libs/libheif-1.1.0:= )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
-	mng? ( media-libs/libmng:= )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
-	postscript? ( app-text/ghostscript-gpl )
-	python?	(
-		${PYTHON_DEPS}
-		>=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
-	)
-	udev? ( dev-libs/libgudev:= )
-	unwind? ( >=sys-libs/libunwind-1.1.0:= )
-	webp? ( >=media-libs/libwebp-0.6.0:= )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-themes/hicolor-icon-theme
-	gnome? ( gnome-base/gvfs )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	>=dev-lang/perl-5.10.0
-	dev-libs/appstream-glib
-	dev-util/gtk-update-icon-cache
-	>=dev-util/intltool-0.40.1
-	sys-apps/findutils
-	>=sys-devel/automake-1.11
-	>=sys-devel/gettext-0.19
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-"
-
-DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
-
-# Bugs 685210 (and duplicate 691070)
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
-)
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Disable system CFLAGS suppressing on SSE{2,4.1} support tests by addition of {SSE2,SSE4_1}_EXTRA_CFLAGS: bug #702554
-	sed -i -e 's:\$intrinsics_save_CFLAGS \$SSE2_EXTRA_CFLAGS:\$SSE2_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' \
-		-e 's:\$intrinsics_save_CFLAGS \$SSE4_1_EXTRA_CFLAGS:\$SSE4_1_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' configure.ac || die
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
-
-	gnome2_src_prepare  # calls eautoreconf
-
-	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
-	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
-}
-
-_adjust_sandbox() {
-	# Bugs #569738 and #591214
-	local nv
-	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
-		# We do not check for existence as they may show up later
-		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
-		addwrite "${nv}"
-	done
-
-	addwrite /dev/dri/  # bugs #574038 and #684886
-	addwrite /dev/ati/  # bug #589198
-	addwrite /proc/mtrr  # bug #589198
-}
-
-src_configure() {
-	_adjust_sandbox
-
-	local myconf=(
-		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
-		GDBUS_CODEGEN="${EPREFIX}"/bin/false
-
-		--enable-default-binary
-
-		--enable-mp
-		--with-appdata-test
-		--with-bug-report-url=https://bugs.gentoo.org/
-		--with-xmc
-		--without-libbacktrace
-		--without-webkit
-		--without-xvfb-run
-		$(use_enable altivec)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable python)
-		$(use_enable vector-icons)
-		$(use_with aalib aa)
-		$(use_with alsa)
-		$(use_with !aqua x)
-		$(use_with heif libheif)
-		$(use_with jpeg2k jpeg2000)
-		$(use_with mng libmng)
-		$(use_with openexr)
-		$(use_with postscript gs)
-		$(use_with udev gudev)
-		$(use_with unwind libunwind)
-		$(use_with webp)
-		$(use_with wmf)
-		$(use_with xpm libxpm)
-	)
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
-	gnome2_src_compile
-}
-
-# for https://bugs.gentoo.org/664938
-_rename_plugins() {
-	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
-	local prepend=gimp-org-
-	(
-		cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || exit 1
-		for plugin_slash in $(ls -d1 */); do
-		    plugin=${plugin_slash%/}
-		    if [[ -f ${plugin}/${plugin} ]]; then
-			# NOTE: Folder and file name need to match for Gimp to load that plug-in
-			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
-			mv ${plugin}/{,${prepend}}${plugin} || exit 1
-			mv {,${prepend}}${plugin} || exit 1
-		    fi
-		done
-	)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_optimize
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(get_version_component_range 1-2)
-	mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	# Remove gimp devel-docs html files if user doesn't need it
-	if ! use doc; then
-		rm -r "${ED%/}"/usr/share/gtk-doc || die
-	fi
-
-	_rename_plugins || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.10.12.ebuild b/media-gfx/gimp/gimp-2.10.12.ebuild
deleted file mode 100644
index 3b13abe136af..000000000000
--- a/media-gfx/gimp/gimp-2.10.12.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-GNOME2_EAUTORECONF=yes
-
-inherit autotools gnome2 python-single-r1 virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="aalib alsa altivec aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_x86_mmx cpu_flags_x86_sse"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	>=app-arch/xz-utils-5.0.0
-	>=app-text/poppler-0.50[cairo]
-	>=app-text/poppler-data-0.4.7
-	>=dev-libs/atk-2.2.0
-	>=dev-libs/glib-2.54.2:2
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.40.6:2
-	>=media-gfx/mypaint-brushes-1.3.0
-	>=media-libs/babl-0.1.66
-	>=media-libs/fontconfig-2.12.4
-	>=media-libs/freetype-2.1.7
-	>=media-libs/gegl-0.4.16:0.4[cairo]
-	>=media-libs/gexiv2-0.10.6
-	>=media-libs/harfbuzz-0.9.19
-	>=media-libs/lcms-2.8:2
-	>=media-libs/libmypaint-1.3.0:=
-	>=media-libs/libpng-1.6.25:0=
-	>=media-libs/tiff-3.5.7:0
-	net-libs/glib-networking[ssl]
-	sys-libs/zlib
-	virtual/jpeg:0
-	>=x11-libs/cairo-1.12.2
-	>=x11-libs/gdk-pixbuf-2.30.8:2
-	>=x11-libs/gtk+-2.24.32:2
-	x11-libs/libXcursor
-	>=x11-libs/pango-1.29.4
-	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
-	heif? ( >=media-libs/libheif-1.1.0:= )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
-	mng? ( media-libs/libmng:= )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
-	postscript? ( app-text/ghostscript-gpl )
-	python?	(
-		${PYTHON_DEPS}
-		>=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
-	)
-	udev? ( dev-libs/libgudev:= )
-	unwind? ( >=sys-libs/libunwind-1.1.0:= )
-	webp? ( >=media-libs/libwebp-0.6.0:= )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-themes/hicolor-icon-theme
-	gnome? ( gnome-base/gvfs )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	>=dev-lang/perl-5.10.0
-	dev-libs/appstream-glib
-	dev-util/gtk-update-icon-cache
-	>=dev-util/intltool-0.40.1
-	sys-apps/findutils
-	>=sys-devel/automake-1.11
-	>=sys-devel/gettext-0.19
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-"
-
-DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
-
-# Bugs 685210 (and duplicate 691070)
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
-)
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Disable system CFLAGS suppressing on SSE{2,4.1} support tests by addition of {SSE2,SSE4_1}_EXTRA_CFLAGS: bug #702554
-	sed -i -e 's:\$intrinsics_save_CFLAGS \$SSE2_EXTRA_CFLAGS:\$SSE2_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' \
-		-e 's:\$intrinsics_save_CFLAGS \$SSE4_1_EXTRA_CFLAGS:\$SSE4_1_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' configure.ac || die
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
-
-	gnome2_src_prepare  # calls eautoreconf
-
-	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
-	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
-}
-
-_adjust_sandbox() {
-	# Bugs #569738 and #591214
-	local nv
-	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
-		# We do not check for existence as they may show up later
-		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
-		addwrite "${nv}"
-	done
-
-	addwrite /dev/dri/  # bugs #574038 and #684886
-	addwrite /dev/ati/  # bug #589198
-	addwrite /proc/mtrr  # bug #589198
-}
-
-src_configure() {
-	_adjust_sandbox
-
-	local myconf=(
-		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
-		GDBUS_CODEGEN="${EPREFIX}"/bin/false
-
-		--enable-default-binary
-
-		--enable-mp
-		--with-appdata-test
-		--with-bug-report-url=https://bugs.gentoo.org/
-		--with-xmc
-		--without-libbacktrace
-		--without-webkit
-		--without-xvfb-run
-		$(use_enable altivec)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable python)
-		$(use_enable vector-icons)
-		$(use_with aalib aa)
-		$(use_with alsa)
-		$(use_with !aqua x)
-		$(use_with heif libheif)
-		$(use_with jpeg2k jpeg2000)
-		$(use_with mng libmng)
-		$(use_with openexr)
-		$(use_with postscript gs)
-		$(use_with udev gudev)
-		$(use_with unwind libunwind)
-		$(use_with webp)
-		$(use_with wmf)
-		$(use_with xpm libxpm)
-	)
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
-	gnome2_src_compile
-}
-
-# for https://bugs.gentoo.org/664938
-_rename_plugins() {
-	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
-	local prepend=gimp-org-
-	(
-		cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || exit 1
-		for plugin_slash in $(ls -d1 */); do
-		    plugin=${plugin_slash%/}
-		    if [[ -f ${plugin}/${plugin} ]]; then
-			# NOTE: Folder and file name need to match for Gimp to load that plug-in
-			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
-			mv ${plugin}/{,${prepend}}${plugin} || exit 1
-			mv {,${prepend}}${plugin} || exit 1
-		    fi
-		done
-	)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_optimize
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(get_version_component_range 1-2)
-	mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	# Remove gimp devel-docs html files if user doesn't need it
-	if ! use doc; then
-		rm -r "${ED%/}"/usr/share/gtk-doc || die
-	fi
-
-	_rename_plugins || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.10.14.ebuild b/media-gfx/gimp/gimp-2.10.14.ebuild
index 59020299a272..63247f2f6b4b 100644
--- a/media-gfx/gimp/gimp-2.10.14.ebuild
+++ b/media-gfx/gimp/gimp-2.10.14.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc64 x86"
 
 IUSE="aalib alsa altivec aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_x86_mmx cpu_flags_x86_sse"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-gfx/gimp/gimp-2.8.22-r1.ebuild b/media-gfx/gimp/gimp-2.8.22-r1.ebuild
index f44e399afa46..9fc5aa9cdd4c 100644
--- a/media-gfx/gimp/gimp-2.8.22-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.8.22-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
 IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm"
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 6155d061b952..31756e7a18c7 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 GNOME2_EAUTORECONF=yes
 
 inherit autotools git-r3 gnome2 python-single-r1 virtualx
@@ -30,14 +30,15 @@ COMMON_DEPEND="
 	>=app-text/poppler-data-0.4.9
 	>=dev-libs/atk-2.4.0
 	>=dev-libs/glib-2.56.0:2
+	>=dev-libs/json-glib-1.2.6
 	dev-libs/libxml2
 	dev-libs/libxslt
 	>=gnome-base/librsvg-2.40.6:2
 	>=media-gfx/mypaint-brushes-1.3.0
-	>=media-libs/babl-0.1.72[introspection]
+	>=media-libs/babl-0.1.74[introspection]
 	>=media-libs/fontconfig-2.12.4
 	>=media-libs/freetype-2.1.7
-	>=media-libs/gegl-0.4.18:0.4[cairo,introspection]
+	>=media-libs/gegl-0.4.20:0.4[cairo,introspection]
 	>=media-libs/gexiv2-0.10.6
 	>=media-libs/harfbuzz-0.9.19
 	>=media-libs/lcms-2.8:2
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 770158b20319..97697858011e 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -2,6 +2,8 @@ AUX gmic-2.4.3-curl.patch 2527 BLAKE2B 8bb6a9fb4aff5a1ae19437f93ec4336d87ab61f33
 AUX gmic-2.7.1-qt-cmake.patch 1005 BLAKE2B 2b7e5f60788db611859b803cebd5e6e44ee7fac791d97e37fc22290e813c43b7b5d93e8725da2648c19999234f650399eb5fa7c973932f9bb1407fb88a955f58 SHA512 05fd4675cc1b65e4e504ae4c9913566b59b4c69467775a73734f01f9af842b87696c244203e9be75ef26876c452b34edfdfe1ed201ee6cdc934b2ea786c45a86
 DIST gmic_2.8.1.tar.gz 5995556 BLAKE2B 3f3c35290d18c927745b4b527f5297a9c3beb109a34b7e8b70dcff064f2587e022616e0fe5063d79e94b8fbd0ce3f70b6b5417ebaa0f0cc0f61891d79330afa9 SHA512 0f9ae9454c6f053026cdace43b24e32183f384d79099bc654c3b154647d24ef6541b1fae62cb17e27e527fb51ed8cef03a46490af3ace1551646fc8b3cd64eb9
 DIST gmic_2.8.2.tar.gz 6170087 BLAKE2B 36bea32531fef3694c4bf295603c2327dba2391f8cb868393d01a86dd9dcc52a127584e8eaeeba79425aceb07fd3ee31e0383a182eb0956daa920122463c4a08 SHA512 80fbba0dd1f02fe23986f57190e6e4bb0df31ac8b4084ddcfa088fcf352b44484ada47704b42c9cd27f52a55e42247447c73181c0a84a4f0e54f064e9fc9ca9a
+DIST gmic_2.8.3.tar.gz 6172645 BLAKE2B 51a910ca9bb146173863f7f72dafec8ed42334757223055a5e174bebbed9e23372e1fdeb5b522c2120b203f4cbac0f255a9ada58fa62c7f83c745016d11bcabb SHA512 cde0e3fc50a97dae2b6d1dac1e7292a3d0af5e963586ec3e7ab6890721bc9617ea80b3bc86ec4cdc897d8b4ddc0fde552eea8322f8f337c447c603bcbc1403fd
 EBUILD gmic-2.8.1.ebuild 4382 BLAKE2B 3c4b3090d853dfb3e2e808a3924ccecb74777d78a92bbfeaacade60d18c9deaba13b9382604bd314ef6105e6dd35e76914e6abf193a2b5db54a82bd3d5ce6f9d SHA512 377d9dadf36f7f20256f30f798e5968c0f4fc83fd5844871748c5acfb7a041e73019435ccd0fa524a5f9d0600439c0484c951c0df52a8de32f145f8aac76da7a
 EBUILD gmic-2.8.2.ebuild 4264 BLAKE2B 3d4e56ac83bfe31ffcc595e4fd0e9b509bec3b940d12378d016764b69b22333797bcfb206e69f6c1ec58a7763c04f9197faac87ed6fba33d6f46701892553645 SHA512 ea99f26dee139a974d0f7c878abcb0dec9edf45bcf538371edb8e0e4c011a2665b9dab4320972cceb4e3276bf183737d4573bedb17e8aeb6703eb6977b4e44c4
+EBUILD gmic-2.8.3.ebuild 4264 BLAKE2B 3d4e56ac83bfe31ffcc595e4fd0e9b509bec3b940d12378d016764b69b22333797bcfb206e69f6c1ec58a7763c04f9197faac87ed6fba33d6f46701892553645 SHA512 ea99f26dee139a974d0f7c878abcb0dec9edf45bcf538371edb8e0e4c011a2665b9dab4320972cceb4e3276bf183737d4573bedb17e8aeb6703eb6977b4e44c4
 MISC metadata.xml 547 BLAKE2B 0da3088e531217099bf3f690059d3725ba3c62ad9337dfbf3817584f95594a328b647b0a81eb4d58c2cbc030026bf2aa94e01c817b04072aea1caee435f6ef9f SHA512 e58e976f8e80eea8e3620888858d6386e5d922c842e08c39f7ad611a5fc96e5fb85e39864bc0e805dd20a2c19e02b9fb8d1a5eaaa470075ed73759dcdcd4fbee
diff --git a/media-gfx/gmic/gmic-2.8.3.ebuild b/media-gfx/gmic/gmic-2.8.3.ebuild
new file mode 100644
index 000000000000..b9efdacb34d0
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.8.3.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+inherit cmake bash-completion-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+	|| ( cli gimp krita qt5 )
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		>=media-gfx/gimp-2.8.0
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+BDEPEND="virtual/pkgconfig"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	if ! test-flag-CXX -std=c++11 ; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use gimp || use krita || use qt5; then
+		# respect user flags
+		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
+			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
+			-i gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		cmake_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_cluts.gmz
+
+	# install gmic-qt frontends
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}
diff --git a/media-gfx/gnofract4d/Manifest b/media-gfx/gnofract4d/Manifest
index 74f0fb8165a3..27f162bede23 100644
--- a/media-gfx/gnofract4d/Manifest
+++ b/media-gfx/gnofract4d/Manifest
@@ -5,5 +5,5 @@ DIST gnofract4d-3.14.tar.gz 862499 BLAKE2B dcca058b6a625b4d2f0153f896ed029b27b8e
 DIST gnofract4d-4.0.1_p1.tar.gz 7638038 BLAKE2B c12bade5f219d2d41dc50569c0df315273b0c2a0a6a40543f48f3e4cb766512ed18b979463574db65ac443b1a8dffbcc1f3c9dc04d7c6b89881fdfcfce95c41c SHA512 d7f3a081b3681866d2da911eedab6ec74f22f36d5175a85f93751519e96971cf147b99ddcda32c597283b39e9da4f0fc6a8843331334a18efa3bf459cfd00af5
 EBUILD gnofract4d-3.14-r1.ebuild 838 BLAKE2B faf89e7b8110f981fc500a83b10985e71bd60320a3ae1ff4048d9ecef5866399369e13c35904df5d0474afceab7e29c16d69322aac55bf0a7b12500ca97fc6f5 SHA512 639bbddf911d9314e99142e4f55ab968b0898293d8ddeabd286010faa9304a35cb280f39790028360b78e64c8722581239913b37e15e196631a5011b9fb6950a
 EBUILD gnofract4d-3.14.1.ebuild 1142 BLAKE2B b6ff0697afc901a6e4ce549f2c5a6012a191ccec2b36c26e9ca428e753f422e9759a87b3dad612d715f2f4647eb46a63c2ebf6855c077765c8f4f88b7f00ef06 SHA512 63e621da4294d0b18023ff8f6df66d657ca1fff0af0156d226f19ceaa675f75640798b0c5dca34ce9da19769fe355dbe5268b6fc61bbde26236e7b651bfc9ad5
-EBUILD gnofract4d-4.0.1_p1.ebuild 1587 BLAKE2B a5bf8c0e09fcfad146b17e8b9539ac71b1f3cf6a99b9e3fbcf63990851b3c74f94debce896f5402031cd1c07f513143bcf1be49c203ffd087c1c88ebe9db05a2 SHA512 dbb31b3576f377bd6a8dc6668c5db387e9fe78249ffbfd4e84d6b2a6111f77598787aa5d2d3a12c69a45bdf9b98680a19dfe771f6223f48b48665e159665dce3
+EBUILD gnofract4d-4.0.1_p1.ebuild 1586 BLAKE2B 9e9767bf940353b7521dfbf8ad98641f0249a22130ee22b9a936093effdb2df4275bec4757609dd86b9bfcff640d9bbc1f34fee000dfa5cda60eb701fee1245f SHA512 fd919929386aae4b36ab9bc65321042b1c26338054b651c0cadf9ee96975308f2111db06123fa987fa0f87ea68f1d3ea62142a495e0e96c59ebb56b4b741f5e0
 MISC metadata.xml 403 BLAKE2B f0bfac9f73e6c64e4535ff9dd389bd65bd622ba3aa0b64d52ef1f3b96a5cf0fbc4913c311b3e227fd9ac91c18f3d78aa9ae085c7610b06e768a39f6f5993121e SHA512 ed69568f628be6a938f2f2cd9a7a2610b881f437ec57eb12baf803b00ddb5f62e7d562a1743eaff5a3fc8d083802cac05ed965aa0d473846e94aa526e66babb4
diff --git a/media-gfx/gnofract4d/gnofract4d-4.0.1_p1.ebuild b/media-gfx/gnofract4d/gnofract4d-4.0.1_p1.ebuild
index e42cdfbabe28..397401cf09f1 100644
--- a/media-gfx/gnofract4d/gnofract4d-4.0.1_p1.ebuild
+++ b/media-gfx/gnofract4d/gnofract4d-4.0.1_p1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/edyoung/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+doc"
 REQUIRED_USE="test? ( doc )"
 
diff --git a/media-gfx/gnome-raw-thumbnailer/Manifest b/media-gfx/gnome-raw-thumbnailer/Manifest
index 92b24d9877b3..82342109e92a 100644
--- a/media-gfx/gnome-raw-thumbnailer/Manifest
+++ b/media-gfx/gnome-raw-thumbnailer/Manifest
@@ -2,5 +2,5 @@ AUX gnome-raw-thumbnailer-3.0.0-deprecation-warning.patch 1715 BLAKE2B 62d10ead9
 AUX gnome-raw-thumbnailer-3.0.0-fix-downscale.patch 1030 BLAKE2B 49c4e566963e31f7f6293cc420157e0e33a8cfdd169e65771019fd00acf2d8a760c522ce6f0c2a2c13052804ed726b2eb35e378a43a1110328ea694449cfdf77 SHA512 b4985090dad9a06087d2b598eed03333a80d71343a244db3c08fc0f5ef1fc8baae1969b0cdaad460cdd54106173fdd9aa52086203727e823e20bb830deee1242
 AUX gnome-raw-thumbnailer-3.0.0-libopenraw-0.1.patch 696 BLAKE2B c790781d81b5e4b4793c2a2f4aea2893b964e607b5cfc55eb658defb4748c7958558ae85435c0d18986f7267ac58b8c8b41471ce7cdcae7b04100f0c23d560b0 SHA512 ac12cf060a1f40abecb2ff86429766662632e1a448dd84c5205c8def987d7e20c1738402cfd7d6c76b4a5f908872c77ddc046e6379705c1e69277543828bdab7
 DIST raw-thumbnailer-3.0.0.tar.bz2 270499 BLAKE2B e08d78ba44f160ba1903b78b5e85d9237610c81ac9a63c25c7b2c308139b8e18c9041e2c35aaf44eb87017be17f7bb3968798e165c28349703a5306a78999bbd SHA512 b6b477af0ec604e100a67829bc9262a3aa54db9beb644e60a9ae95f916fd641ad7ccaa908fc6458be2eee60ecdb47bda9449720bc078f1c4fe0135fabf0bd9eb
-EBUILD gnome-raw-thumbnailer-3.0.0-r1.ebuild 891 BLAKE2B 27f1e0832bb2157f0d4be4fc89e55290e45da89f32b8ecf4a98dff7866220f4447dbbd654e5e0f340e2a5a11b74017374a1a2e6b206f7b6f67abdf6f7de4ca36 SHA512 103e0fc49a92d0004b9dafbaf6546506ad7f5380cc3fdc6d4ab81c4fb9cc4a5e99625c2db66316a5ed37954146dbd67e191afac918739e9d148c9ddb5003e186
+EBUILD gnome-raw-thumbnailer-3.0.0-r1.ebuild 892 BLAKE2B 629d29e543c293d73c1ef6abd32a149901c3c59503add678d3b5b1565c58e484b3ff073fd396a374a28344f256845a6e87d03e3e4d23dd4585cf5ec91e3de63a SHA512 2f8db97af94e20154cb3b5feaff5141ad50493149f9f698458c22588c89a8763f6c3a5834ee07b207d698d0176e44171b278684bd985bf89423bcedf24afa9fc
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild b/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild
index 79c2a4895fa1..fee5a65d96c2 100644
--- a/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild
+++ b/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://libopenraw.freedesktop.org/download/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 3a737a0fd95d..6c21dbd93945 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,4 +1,4 @@
 AUX 0001-Fix-unwanted-automagic-activation-of-aalib-support.patch 1049 BLAKE2B 62afe72d6630420fa0068e652cdfbfde3c4e73541e53154627ad1cc23ad10f72ac85cf5ae317d2b0bf4127e474af2ca2268e57011eb835d57d88e2d6fa65a85f SHA512 252390cfb2533e9c15d1f881f6729660e2f6cd737a9257c5dec7f06f72f2960c3b5fe940e7fc774c862e6156f517357ca7b933822c23a466ef39fbfc2f14bf8c
 DIST gphoto2-2.5.20.tar.bz2 790065 BLAKE2B 6e10aa468696bc3eff51aaa3e886ad2373997f91597e42b33777ac56bf668f918c2fa0cb8b70eb8f7cb45507e67c9cfc3a46a7408449ad35cc3b743daf74859d SHA512 0350c38c264e5ba858ee14952fbf6ad271e7fef05e3f5f8eb3d45102099ae435fec63b09881efa99af60d4e086a9c2f69be92a7e49617643ab13146a5e4655f3
-EBUILD gphoto2-2.5.20.ebuild 1326 BLAKE2B a015935a02dc2013b1de40ccbdc459615151ea2279d22fa996700dde299d9c9045877b1d546ed84bd8803bd757bb703286e6d7c071fe9c21c0a117f4deacb235 SHA512 2b463c8106f657aa93f48b297a8897729a2a1b4fc8de8a6331fc94d501540d0a3ec1b9f137000412a62ed072256c9847939af200a4ee4e5e849f0622207d4118
+EBUILD gphoto2-2.5.20.ebuild 1327 BLAKE2B fc83ba6e8d6624ee700bf40cfc238ebf255b8e8c606c33cecb248cd7217a0ecc17b9a1e1239e718ca5f82e54d965e65052de6f8cb14de137e432879a29e7875e SHA512 39e2c807c15580d7b528b2712d36f0d29c5b261f1b489db19e1239b172e74f65be0fd2b1b6553d29a1f0b2523b800141dcd8aa15524376659532e7d06e8d3715
 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 271c8d93a66e..7f9f28877711 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/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 7d14cf5b7244..01f8983bff10 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -2,7 +2,7 @@ AUX graphicsmagick-1.3.19-flags.patch 1800 BLAKE2B 50f4f0de0cb3842fb84e136038bc0
 AUX graphicsmagick-1.3.19-perl.patch 491 BLAKE2B 6a6465162d9a4d7d09b1edb425cc7114cd4e0fc65e48f15c8c2a854fe835fd1fe94c56611c6d2744d9e26884c57b1f67353bfd32abe2f25a145dd7abbf5479f0 SHA512 da114b891ec923253048d90ee14f136742072bcb70e512e8d2838bbcac57b5fe6ea580cdccfd1bba5156777623c43e946ce2a8661f88612d4c24849bef0fb865
 DIST GraphicsMagick-1.3.32.tar.xz 5535224 BLAKE2B 96fd7bfe62b4b1b25f9ffc0ff8e2ac023f0528b9af857fc27a5a9cd1123eeb6533b868c7bad8dca5b58e114a674dda009a62904df64622d7b5f3c0d72156283d SHA512 f84cdb9318962aed1dc25d70db4d0ca102e4f88748f468f8a56b77d228fd315b772afa48e90a396d32e8226eba9105717bcb94166bbe43723afeec58ead53e09
 DIST GraphicsMagick-1.3.33.tar.xz 5558348 BLAKE2B 9c3747ee63d94bc6d16c06c04c7fad2ca93e849df7ae4391523b416111b5569c7493226f6b967a5ff80e0ff2ccbe7f6de5a7223e935024fd66a96be401fdf26b SHA512 8afeb461d1a9dab9b88b9bc7c2d50b5c409463b369e6b0ba7ee39b0ece32da9393d7a5a4d18faf8f72a529346a3477bae61b802bac2af81aeae79d95c9d6cd13
-EBUILD graphicsmagick-1.3.32.ebuild 3070 BLAKE2B bc0e999658cef33e429ea4b7f0e205ce8f39baef336d1db99b6d44a38fb3fd5dbd44f810d676e799253fd091f9d7bc232c108d390363a5c13cec30452bb50df7 SHA512 27fa8ad843e55826401760774b5645144161e95a732cc4c10d8a1625054780722d33a004cffb134368bb8ed876cef9caccf54ac4397f3d13d1696b25524fa427
+EBUILD graphicsmagick-1.3.32.ebuild 3071 BLAKE2B 50b4693c863362fae0f18d4505a2dfcf4d62894e1adfa6e01907b691ad52d04d5f6540548beda199166e49e72f9bf101d0434c1821b3593ffa7af303d730b723 SHA512 d15345f5c1ac66d3c33d77590c9117cae5b2aad0732f080e4f45a78ea2061cbf6d36b9c9b5f0f89f9a5c20580ea52b42c794c12c1f305a08b8c09c546ab4ae00
 EBUILD graphicsmagick-1.3.33.ebuild 3078 BLAKE2B 722f3289f587b875e2483557fd60b55ed3afd7bc43ccf8cfb91479f9ead4c2ab2cf9b6ee8f41c4d2045cf64a0cea5df07c7c2ccf47c2fe31d8d2b0c8f9ebb0a9 SHA512 43ac942e1f3b92f375999ddf9883a23107ec0975aeca11994c9e38110918bcbf86063ac18abe0e9da881406c08bc6c5024ee32ae405d5a8149415733d06224a1
 EBUILD graphicsmagick-9999.ebuild 3078 BLAKE2B 722f3289f587b875e2483557fd60b55ed3afd7bc43ccf8cfb91479f9ead4c2ab2cf9b6ee8f41c4d2045cf64a0cea5df07c7c2ccf47c2fe31d8d2b0c8f9ebb0a9 SHA512 43ac942e1f3b92f375999ddf9883a23107ec0975aeca11994c9e38110918bcbf86063ac18abe0e9da881406c08bc6c5024ee32ae405d5a8149415733d06224a1
 MISC metadata.xml 1154 BLAKE2B f94864df05c239bd37ec05d00068e934e60e8dcbe03e52020df7d830842be94c08dbf339eca919c4e7fe18d5ad62bf3077ac9877b18ef6f09fd2b9f52c31aba0 SHA512 9bdbcace99fd11f192bea183b5d84bc9b2d06979db21d1a9a3e57677a4438f24a5812619c73a0becfc7fb81140414199fde3d0e8811abf1a92322535529f5d2c
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild
index bbcd10eb11a0..8db754c191d7 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
 else
 	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 1d1d66e8d752..cb90f0e44b14 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -1,4 +1,4 @@
 AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3bcaf0af3e6b29a0269581390f64950e42e41280e482fc9cfda9bfe24ef166eb6c24d21377a15fca4264fec69d902d8ba18810bdb01 SHA512 26ab6dda13d758a5e4237c8b5d207d3c5111afbb11b2c3984cd742913c3c7932559b23b5ea9f774f1c6373eb0f761a9400dccc95876740b3cd06c44084a10965
 DIST graphite2-1.3.13.tgz 6664757 BLAKE2B 3faad44f7ba5e0729f722fd4589c5f6a4c53cffc2bb93615c8220d03c759dedf05924b1f56cafcf1c28e0a4b50fba0d319da30572fffde4baab6bc240528a0d3 SHA512 44ac2f353c1a795a55c78b4ff72df35a3a5a94700356c0eefe105d66cd499ac93f9cfd5ab7b3ea842b575156cb8df19e0b57ff8b9dbaee8a576319ff5889c131
-EBUILD graphite2-1.3.13.ebuild 2663 BLAKE2B aec1ec8ebcff5ed41a50fa62bf1754297c544df79ec28a0ddc45233ea614f4d9050c4d13f9499bf1fcff8249b0d139c640b6471d4fc047bbe01affb6cb7c9277 SHA512 09cee62a4b873f485b6b473c01ee482ebfa7541129da656929a251dbde58135936c671aa16b02f87c81b6e8aad2aad21e1a58aafe12fcfaf60b6210c47750f0d
+EBUILD graphite2-1.3.13.ebuild 2664 BLAKE2B be4e958ce54f6645f36dec95c6919f58c3d7f82ecd9daff55ebf13dfe20054980233f61bbb8c3477e694bd9edcf3d2d80888227a4fd67eec81afefcd2870be5e SHA512 8039a69d6595ab92833e3bd56108744b60f1500daf9b1fa1ca6a62187bfa0edbe47662f61ccb7fea5ab90013b39f1c782a01680917145556fdcdd26cedd8c2aa
 MISC metadata.xml 336 BLAKE2B 7069f4f7bb9ecd39581528f3f6b072d2ebf2c32b24224b9ca5b69b138490e764b740768334954f5cfc25819cab55a50fbd0933dc77fb3397886aacfd105f0853 SHA512 ac8ae39ab005c1562818a97b64bfef48ab64e2a1993aa3eef4ee4b3066b32d9211787df1273e20cb767839e42364ed72b3e99c51bb65f0c88937564d5dbb5380
diff --git a/media-gfx/graphite2/graphite2-1.3.13.ebuild b/media-gfx/graphite2/graphite2-1.3.13.ebuild
index a297b8ce652c..3b8abd615a36 100644
--- a/media-gfx/graphite2/graphite2-1.3.13.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.13.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="perl test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index f0c8a3eb1bd7..6917049b114d 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,4 +1,4 @@
 AUX graphviz-2.34.0-Xaw-configure.patch 2445 BLAKE2B fc1b3820fd72821ac431f5d93d0b4b0c8f596ca9d2c2f516961f5baab9fd54ba870df75434d2ed59fd9034bb7e2ce38c00faef9c12a79c7ec4da2d5e416d7117 SHA512 473d2ed9070329512cbc26929267b25fb8d7726e21ed01d2921d4d8ac13b8ffaf166f07229fa7409192cfa14fabb0cf68b299bb3331b3cc953ae5363274fd15c
 DIST graphviz-2.42.3.tar.gz 26246717 BLAKE2B 71c61dcd056c9a2e2655c3be995d1da17b3af0d3374e74400fc38da11ab81849f7b5e528f99fc2046294958a4bab0a411ab204e434360f316a5367403472e8a1 SHA512 e03ca6da0ddb1162bd179d159d7dbb379d55012d63bb922aa800260fce52b65beb1a9b5ca1a5199ad3537201b0b4841efc9facee6e03065c6bd02e840f8a29c9
-EBUILD graphviz-2.42.3.ebuild 7810 BLAKE2B fbd88ab7469d3c742d6683109f4dbe899cac7a40dc696d003f412b26eb3bea617abe7e32ebf8ef34d8278c6954a91143cc3fc823ca8d7c91a8ab59498eb4bdf4 SHA512 ba906c822d7b6cdd7826805a9d49fc27d032055c8923892e2d1a9f7f8223ee07170fd95f1c6e10506909c0a33bcba8e58938d6ba5f666ab2fa220ee1b587d549
+EBUILD graphviz-2.42.3.ebuild 7811 BLAKE2B 8d796d79f93a9196fb0b863f98f0ef210c8698a10e70b4529c2511af11a66e266e47eca941ab0499169d66af1ce785f2221b9d4726ee3cb826231beb34c12bcb SHA512 de9f59adb32b0b1d4215490d7946e1812dd813cb800676a71aaa0cae0a47992fd869e4ef2272ef5c009419e836e35e351405dbaec75368d55bd0de9339ecebff
 MISC metadata.xml 2211 BLAKE2B 1c39235c1d8c2efce0596cda2d20bf1cf2e81643068f68215f31462b6320f7f31533877630aa3c2b2bc9a7f7856f7b27354a97bb2c61d7e63a6de86f569ed192 SHA512 f7689fe65e46905d48fb2e45c3ad2a1e8f4fcb572515fdd7dfa26cdd21ed1eaf52d8ecaab9c297f5e8df69a205337b8526e0304ddbdb8c4b3e82cb1e428a1e71
diff --git a/media-gfx/graphviz/graphviz-2.42.3.ebuild b/media-gfx/graphviz/graphviz-2.42.3.ebuild
index b833f8b72908..e0130b73420f 100644
--- a/media-gfx/graphviz/graphviz-2.42.3.ebuild
+++ b/media-gfx/graphviz/graphviz-2.42.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www2.graphviz.org/Packages/stable/portable_source/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD"
 
 REQUIRED_USE="
diff --git a/media-gfx/gtkimageview/Manifest b/media-gfx/gtkimageview/Manifest
index 798a89c51896..f882c744da2a 100644
--- a/media-gfx/gtkimageview/Manifest
+++ b/media-gfx/gtkimageview/Manifest
@@ -1,3 +1,3 @@
 DIST gtkimageview-1.6.4.tar.gz 1158138 BLAKE2B b59abcbac71d4bd039bf9f3fc2f25f6590f91c4cc320cea90243a4889e020f1a54a3ca5d8a843f7482551ce8da6fafe6e3ce4fbc5a5e32fd6ceb4367b5abb9db SHA512 6378c640006e73aa1ffbf92eb9d4e42570707bc159f0a657b11f027d328088f5e89fc334de170de5ab1a39bed588b0b76f4633688a894cb7def16f1dea9f8e39
-EBUILD gtkimageview-1.6.4.ebuild 1217 BLAKE2B 4ce89fbe05b1461b618cbbaf8f8634908d29bf3fd65f6d02e046723c1ef88e5464a16988003cee973be34384c3be173122948043aa2a555682100a12a571447c SHA512 8fd20711c6ad30531ef488a152866d4744a1d661c0b8b30a4a5cde40009ccf0fa165905c2a1170bc56e597d0c4e04e0e01f57b578f28881a64267f5bcda1e529
+EBUILD gtkimageview-1.6.4.ebuild 1218 BLAKE2B fb4f68ba9231d6b786da90e37852fffd5c5443098b72d761973986340a3643c57a730039bd3f1f67cb1652d0ae083a1bdc27cb99c9ee21f701405829695a47b2 SHA512 399b9c8325165fb25f5aa43a10c7a7aaa753b10f170de0430b2e1cb7fcc58a19b8aea60d356cd10c19f9ae2e79f36c0e29c51402509f46cc96fb69879a6dfbe9
 MISC metadata.xml 259 BLAKE2B 0a31c91e9ff9700c8a5c77c6eb9ddad55c6b78e7e583213c20adc8e73248c7e8b31c9a11702a0b5a8b665acd2753c145362974d6c5c6aae1979c7845ab4b01d8 SHA512 6744883613ae3b83c57ec9604c5f31717ab714b4f3e7f4f680e4b9e54f622f8e5f753b3cd666862f0e3e6dc4223aee87b89aba472d9f20e1b317595e06aeae30
diff --git a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
index b19a09bf8fd3..4a33fe1c6f33 100644
--- a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
+++ b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="examples static-libs"
 
 # tests are severely broken, bug #483952
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 84b0349e45bb..b9ff306bbb47 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -4,4 +4,4 @@ DIST hugin-2019.2.0.tar.bz2 10335030 BLAKE2B 4fbcb974eea01dbd8d722f64b5cadfd1b3f
 EBUILD hugin-2019.0.0.ebuild 2213 BLAKE2B b9a6ceedc6b49b493205f5f16ced5ccdc890f6d2f44c0e846a70a09857f5b4ab62b7d64e668f4114d22f3af7d5168cacdbfb95347ff1514b1f0cb64f6b3056f7 SHA512 4b8f7f1107245768e7de1b5ac7a18e65af3a2ec931eafcb525b92374b40894e124bbd6561651e21595a2a1b2f8996e5e3282591fadaef1efc7671afbe64302cc
 EBUILD hugin-2019.2.0.ebuild 2188 BLAKE2B 3a8957b1f5c620503b18ad71475e67b01540e9893a9b3d904ba1656f519dc7efca50cce5c8b986909caa86591d91fbe4c0297b4a0b5ccf9fc23400e454d07862 SHA512 7662be470548fdb35376af51088442751bed2f55a612b40df0eb9dfd93a0dfcd62cf6194bc7641c543bb776d87c8ed517d6a299b2031f01ade06d5a31c2af13c
 EBUILD hugin-9999.ebuild 2062 BLAKE2B b1b80024aa6ff9133550bc152ebd32232bc9afe5cd0d12363b212d46aea9a7c2b93596753840296702819c5b96d01f53309a6140bf5471a18134cb551bdd6e34 SHA512 fe3f6b2d0a2cbc47737718c59c109530a8b9e764da22982cbcf1c0e4b3f35c6d2a84e66098faf677aa47805a0efc9af92c81db6f21c7cd7fb3fb0e43353f55f4
-MISC metadata.xml 519 BLAKE2B bd02923a26374e3bd638778ce8100efc4694ab6bec54fd8c8cbd32d0b8c3d495fc965194692ebaf2fe909e495011978d7bb8f3c995037fc128cfd9626949549c SHA512 d4e0bfb870b5b6e5769be2c28983d914666e413333887ac7a7cdb868d2f45f6b284a99204f6e97b98e65958412c04291f6fbc21deed8de518d3ff64aae6ad01b
+MISC metadata.xml 445 BLAKE2B ac876779272c1b22b648f4231a766d738bedf3b8a5a195fed926e6976531bc4653181a992bdcfaeaa6bdd9c79c21971025f207681490870209852d561aeeae78 SHA512 f2684887481f43030dbe01cf4df354511e4b294d53d7f7fbb9627cdddeb29709d806c6017f2c32557e4e6e288615ab2430fe7d102ea30072e1ea733d60177945
diff --git a/media-gfx/hugin/metadata.xml b/media-gfx/hugin/metadata.xml
index df762b45d7ce..637ee9b92882 100644
--- a/media-gfx/hugin/metadata.xml
+++ b/media-gfx/hugin/metadata.xml
@@ -5,7 +5,6 @@
 		<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>
diff --git a/media-gfx/icon-slicer/Manifest b/media-gfx/icon-slicer/Manifest
index 6d4e3c5b1c1d..b8469f6cc258 100644
--- a/media-gfx/icon-slicer/Manifest
+++ b/media-gfx/icon-slicer/Manifest
@@ -1,3 +1,3 @@
 DIST icon-slicer-0.3.tar.gz 112429 BLAKE2B 4900e7d702bb45a209c165476aab5604f1623ea48081f742ce36115bde0a6a153aa5540c952013841a4853b827d1b718892006827105dd06c04e7fa892e9ee58 SHA512 09e46dca933a7c647b232d2ae8f589526e5f1cb43e07fe7056f0449cfbe812becc3a171c4f7c716bc65c0f95dc4de989a99b4f1b3566ac52e7ad67965f5be4ab
-EBUILD icon-slicer-0.3.ebuild 519 BLAKE2B 5478e53d8e1426b40dd8d4317f30767a26cf27c32b8e739ebbfc8b61be9743379a94990de7502df6189e35bb1179fb0cc891e249d5b8005f0c9fa8026fefe1dc SHA512 e06f52423d741b22e6904aa4f6c2289eb96dc616a27ab210bfdf56e5989e4dbb5abc8c8598d3a0dbee15831ff0cb3955be143ad9752b2b1a18b76342d1f1466c
+EBUILD icon-slicer-0.3.ebuild 520 BLAKE2B 7ef562384edde6acac507cee5bbad134a6bb87026ee8c5fcd29c65bea6c8ebcd526a8dec33ba4e186c853473af0a88e307261dda36f3a05103dc6888207db6bb SHA512 11f22c35adfd41f264a19c107aaec8346b8163a9711ef28314fff3694f2f31605d12b8caf30ee4a0735eb0f6cafa54b5737dcccef7169097e4ec533b98103939
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/icon-slicer/icon-slicer-0.3.ebuild b/media-gfx/icon-slicer/icon-slicer-0.3.ebuild
index 65d61ae11ded..b34ed5fd7c94 100644
--- a/media-gfx/icon-slicer/icon-slicer-0.3.ebuild
+++ b/media-gfx/icon-slicer/icon-slicer-0.3.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="utility for generating icon themes and libXcursor cursor themes"
 HOMEPAGE="https://www.freedesktop.org/software/icon-slicer/"
 SRC_URI="https://www.freedesktop.org/software/icon-slicer/releases/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 ~hppa ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ia64 ppc sparc x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
diff --git a/media-gfx/igal/Manifest b/media-gfx/igal/Manifest
index f95cce79e139..ce7d5457ab6e 100644
--- a/media-gfx/igal/Manifest
+++ b/media-gfx/igal/Manifest
@@ -1,3 +1,3 @@
 DIST igal2-2.0.tar.gz 27206 BLAKE2B 64683d32d0fc3c16d4e27f6dcd1acb3d1e1b55de8e4362065bda9b9b27e6d54409e115af46da2505dfe79f00e5004ebfb395dc4fe71d91b557c43a0c4d4f01e1 SHA512 663bc4f05fbb226c55c3304126ceb480f050715499a2849567ad1d33da568ed02f85b64ad176f6e1cb1c99c8f50650676a7323f0d0497880802a245274a77a0f
-EBUILD igal-2.0-r1.ebuild 870 BLAKE2B 2b26949800e7b3b58c49a1ed6d719b57d17c7b3023353e65804d590e1745ea0a5fee9b7b77e3ed1e3267cc733b72478b801b263d8e3745c2619c2189318e2578 SHA512 096d16325a6abd831d4bb529a40f7d096970457e180c513dec5ada11919355bd33059306c4e2cd558aca1c6c5c60e9590180c2ef0a69a70eefceb9af42ab00fb
+EBUILD igal-2.0-r1.ebuild 871 BLAKE2B ab437110fa587dc7c1f8a209f9bfd2502f2deecb33dd1e316df0a3674fc0090cee8cc18a9369247df27499925536d6ab2e6321d1ea603f91554cf98825405ccb SHA512 435c6353503c0bbabf0f104c0f8d84721b2ca62e78dd9b7ddacbd1bc754debd90b9cb458a3a0c193215697639b8a8045c5485b183d70dea432f8290c35c2c9a7
 MISC metadata.xml 515 BLAKE2B df57e086f1c3f791956327fcc23a384d29d8c0887abea8b9562e5dde6f041bc68d77f787120d2e20974be17c17d129a0e54078cc774a79934423c573e13b6955 SHA512 379299c58fe3018ce51c1e54302dafcc9c258661368101503c1995d7bd0a435175ffe32ff3e7ac6087fa1fb39f4d6e9623acb4ee3acd73a333c95375cb3de072
diff --git a/media-gfx/igal/igal-2.0-r1.ebuild b/media-gfx/igal/igal-2.0-r1.ebuild
index 39981fbb6709..8673d3bb6ba5 100644
--- a/media-gfx/igal/igal-2.0-r1.ebuild
+++ b/media-gfx/igal/igal-2.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.trexler.at/${MY_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"
 IUSE=""
 
 RDEPEND="
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index dacb00e2b967..c27c90f8d681 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -4,9 +4,9 @@ DIST ImageMagick-6.9.10-84.tar.xz 9072724 BLAKE2B 489d5f9e659f3bd7ad32f58780a5f2
 DIST ImageMagick-6.9.10-86.tar.xz 9064960 BLAKE2B 02adf3a7cf942f01fb5f3fb72cda4f407360fa223768f6988220df5be5210e19973c7ac2243df9b295d5a3e1c43515088b157502204c14e665611764c575e62c SHA512 6d3362a83168ecc5b710bc020db2fa30495d442ffff72a77a99fb8be56225283660cd00ac2d1f75c5d19b44c64b212221aadda90fc0a0d76cc2e1e32bca62ffa
 DIST ImageMagick-7.0.9-14.tar.xz 9485404 BLAKE2B be449bc258841eafc83571891c545ba3cecdf6ec8019e665c680ca7dcfb9639db0cf9aee1e53c63ddad03c57549b523e81b926e2613b559baafc833606169a8c SHA512 eaeac3820943c5ed941a5adfa1a5549864d9ac748523eea7b352c8b51e4eb1189586ed0c69e21b1ce2431203ff43973817d45b293f9e85ecbdf35569ef838c3f
 DIST ImageMagick-7.0.9-16.tar.xz 9480896 BLAKE2B 182217c8c4a9425ca69722785da14bb8575ba50aaf9909fc39626ec34f54ff33b7cb5e627640005a00c1e94282b68a041a937e658eb6b06768149fc72f3807c3 SHA512 8f0c20cb863cfe0df30ef5140180273461d7bdb501670d0527bb6b17ac1adff3d500ba3c13e920c81935b4808cac11282808dd3cc81d1edac8429419fa34de26
-EBUILD imagemagick-6.9.10.84.ebuild 6922 BLAKE2B 02fd8d38f7a74e1ff0c340a8d4214c3ee3cbfdca778b55e7cc905b3d18fe31e1fbdc575db9bd4e9283328be82de8fa2999bc685381c00b03fb95540b71021601 SHA512 a520af063f46496a351257956abb0c2ede9bbc80942af3772c40ffe6c00499f466e33e8736700b4077fe4b9e735774525a77210b37b3bb4a71f92ddd3d2dad0c
+EBUILD imagemagick-6.9.10.84.ebuild 6923 BLAKE2B db33249935f9938e01a1c271fc9f2874ec8a8eef00b2f1f024563d2aa27ca4d73bc80bdb796337b11bf9a496b239771b72a090d6e82669924a141a946051961d SHA512 60b9d3d71a8cb753e48f9edf5159bddb4a2471b439ad2ecae61f3237501220a7ca644889ffa8734676a65b50b5da410232457dde208bfe467cfd0e3d95f0b906
 EBUILD imagemagick-6.9.10.86.ebuild 6931 BLAKE2B 590e91832dbe44c3b3dedf956b0f01d3537251f09e7e2a96ed7b0cfd9b9a054597fc3f664bac68182e94fb5c9931d2d7e1f0c9fe83b711a2703fcb3c9f8df541 SHA512 662f13698db0a5fcbb34d04e8bb85e52f2469f003ca9dc337ce0a2c03dd9a381bbee2d4ef43979ff4f9991f9bab6c3d6701725a1df8135f4b052ae76317a7c42
-EBUILD imagemagick-7.0.9.14.ebuild 7197 BLAKE2B 7e98b4f7ad9e4f9ff669147b83fe61fc9e6d3824ff1a3a3e4f19847d7b7991ae35007e89868d81f7b016c64f0ac16f25cdc2a407d99dce7086509c46d2025b78 SHA512 ff11c408b0075d936aaddbb7016b7305608ffbda551a8583c7a4fc96eb0f125ff8dcbd8637fab2885716a71c9fd0780d0cd5b23036cc0092cb9a8ec16d4554ef
+EBUILD imagemagick-7.0.9.14.ebuild 7198 BLAKE2B 6cec58bcde0421af89dc9c5049a77652fe46205cf9a391f742703fe8ee121439c5f43373677a39c88217f2017cc6e4aee2033c480af039ac6fdc646777ebb2fe SHA512 fbafdeab636fc3c4918e805efadaa7b1d063dd94b2e7bc8d3763185655f5fc01c801ae33ef3b59718d56ad8c1d082e2b26b6cc21dbacee6adf94ce94ea7bb4da
 EBUILD imagemagick-7.0.9.16.ebuild 7207 BLAKE2B 004df3bd1f94e9e8c082bc82bbdf949d1d981c8517c5f5033f0ed55c3e9d472565ed8a088292b389325922925dc57733c7a39e14d4d987bb20f50ede87789be4 SHA512 e03e1322c70b842799ce7e90984d940007cf75895ba6d35bd7cb32b39599bebf83feefa67704225d845c82c7f789cc1f9cc7a4269c7a49c48b8336aa350e4c58
 EBUILD imagemagick-9999.ebuild 7207 BLAKE2B 4fc6e4d61f5e851d55546614830dbc3d9a23003033f55ac521bbe990d845aa2b7b7623c66da431f896df16ee71d6539bac7fdf0204c61f00d010c9013b92fef5 SHA512 97ebbef19227007aa32140de833e25d49c9a8f648fda30a9a0abe8073329b0df5a79a74968d5056b3d342e87d435072d64d360ec4270aca53491938c4cfb7f42
 MISC metadata.xml 1111 BLAKE2B 3592f2d81f67d91239152d723c736437a5e8056f8dba1fc5c97e2ead08efd4e913400b441eb6d6b90f26cccf3b89f115c18a5551bc070d1fd81e68dd218493c9 SHA512 33bd68bc4f88cd6029528b0feab9cc9fde0d60475ba5fad8c4f92ff6d373666628e6525d54268735e99182abd2658aa32c7c72ff22106c65f81ed8af5e4f7ea2
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.84.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.84.ebuild
index 45e32912305d..ce112a772a73 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.84.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.84.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 REQUIRED_USE="corefonts? ( truetype )
diff --git a/media-gfx/imagemagick/imagemagick-7.0.9.14.ebuild b/media-gfx/imagemagick/imagemagick-7.0.9.14.ebuild
index 1ec6c3383d1c..447fb88f37fb 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.9.14.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.9.14.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 7c28412c2367..145007dd1277 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -11,7 +11,7 @@ DIST iscan_2.30.3-1.tar.gz 1216848 BLAKE2B 8a5f485c1dd814248c46aec6accedd331105c
 DIST iscan_2.30.4-2.tar.gz 1236167 BLAKE2B 598e55aa7099f7973b38f5c3227415c8ddfa7e8c645521981b4e8979047ab692427f5c1719fd83fe0635f2d4604f32f0baff8542f3e1a333298799c4cad7b980 SHA512 b12f374ff8ee1e1879fc6dbc579de39d7bcd4777ec7ad6e4345046f77b4ec13ae45ebdc2803d6907bc2747776aa7e32c313866138c7b8c7bcb53110a214154d2
 DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
 DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
-EBUILD iscan-2.30.3.1.ebuild 3517 BLAKE2B 2c9aa0bf5e12e34c1637951936db597ea0d5fe70509355bf28cef8d7c0c917ed07e940632eae42f2903e00780dc05cead627a90f733ea2f532fc2b5e6d8acc9d SHA512 1331ded32c9d88312c517e5ba5447e87471a0223747d46c22ded7c3a185f715b3a9b4d2d905bb0239cbe31edc1197c7a71a5626af0bf8084b0834124d7745de1
+EBUILD iscan-2.30.3.1.ebuild 3517 BLAKE2B f2097ee00fab3de458f2c8f4320765844c5a78cf23b85c0b880356695b9d2027ea5df2cf03d7f7829d3d42a9d49adfc22bc062a418131ea8d83ce015088dbdce SHA512 9a058f3d2a604c4a08e6f48d3b98b4eca7fac74ae8807f5fff77c73754a44f6207a6eef051d34fc78e5984a67a009ba51d38f73d3a4c05ecc0bfdda995dc9ef4
 EBUILD iscan-2.30.4.2.ebuild 3960 BLAKE2B 9cb40b7213717045476cd6b4c43039df725721ee18ff79b487d11ca2edd1c9752d8a222ad4cfdd03c83048e87e6a4b6b88e6fb44b3382a0a9e21634ce229fea3 SHA512 c715ad28dd6e44123804f5bfcd0fc92dd4d7fca3a5487a1c16c6c23dd96c37b7211686897263931c9511c0923ba434cebe22acdac65a4213c055d376200f4dfc
 EBUILD iscan-3.61.0.ebuild 1219 BLAKE2B eacc4710c1501271d0d572beb767fb7b7ff2ca94ac2cb6220b3839e4a0436886cdc6d390693e6c268128d542a9597109407f0b0c960bf4033e3c1582f438efb8 SHA512 adf70b06312939200effb9c4c98bb6bc9e0bd105a42942ecac923c70f9280dbb6d3e8a5f0eb8c3e8799b49e21bc3e1b8b6ed5256448b60fbc626032f516eff3d
 MISC metadata.xml 923 BLAKE2B b9035c8d418ac3993d4103cf53657da8bbb829aed4bf010241f4f781984ff9450779ca6aa196f604d52680378761635a2ad868c3dbb7d8b87774f5231d251cd9 SHA512 004b33e1d57943fb6ed8319def74938a98dc323dabbb695ff145adff01d84a026311a44a735bc621be6e68e3c3f4e06c1274449d6e2ad30e37f2952c0bacd6ef
diff --git a/media-gfx/iscan/iscan-2.30.3.1.ebuild b/media-gfx/iscan/iscan-2.30.3.1.ebuild
index bc1a2e5b8a03..4421e8e40180 100644
--- a/media-gfx/iscan/iscan-2.30.3.1.ebuild
+++ b/media-gfx/iscan/iscan-2.30.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -116,7 +116,7 @@ src_install() {
 	if use gimp; then
 		local plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
 		dodir "${plugindir}"
-		dosym "${ED}"/usr/bin/iscan "${plugindir}"/iscan
+		dosym ../../../../bin/iscan "${plugindir}"/iscan
 	fi
 
 	use X && make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner
diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest
index 52dd9749f6cc..03f24b9ab744 100644
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -2,7 +2,7 @@ AUX Makefile 1095 BLAKE2B 59829280499ade024a4b96852b3a6dac3c25bca26e3131eeb819d4
 AUX jhead-2.90-mkstemp_respect_flags.patch 892 BLAKE2B 3a0c4ae7bf32391b32a405541bcd70525e8aa1c6064118b94f08ec8864fc712d50500066f10b2fc417ece0a3d4ec95919eb4751b2bf994ad3461d72b4de7d12a SHA512 14051d7088685dd957d0bdaace752167ebcdac7eb3b01b033918897e8c349e417e662688d7737f916f59d4f1dd7ad9752172791699da0565dd2d5b4f908a4ed8
 DIST jhead-2.97.tar.gz 68361 BLAKE2B ed13d637dc491ad1c6ed7f9a5b0b526c80f69b8c521e3618289b16523ebb12690fa53a0a273f3f5793f970f390430d56c8504bed30fb45c5e9e2a9ac248f7667 SHA512 9b33451546e5ad3b82fe6001515fd572925a1e2c11af763ae32d71ad2cb056ffa8d97abe14bd48ae5f6144da9d8322965387537d61e22d22b02624ebf351c230
 DIST jhead-3.00.tar.gz 69151 BLAKE2B 23522718f07cd0b52b3d7fbd6d0f69ca5ecd5499174b06c6572be1319b275dc93eacd270f33cd7b3380ef85e6615aa79adf1fa9a1a86404876b35c31cdb0c95e SHA512 daedfe7ea6be051f769e9a1e0946ea0fa741f387bbc5ba55eec394fb3f37b18a66aa8826190c790eb50a5b9d445ee0d5a28a08d181db3be469686b0675540fbe
-EBUILD jhead-2.97.ebuild 745 BLAKE2B 41bee772b4941cba460549b464f24758b716d4ed3012a544e2277deea5cd651ef0fa3519d6b7c77a3b0512320b7936294c0ea4a8b574ce5c7141cbb82f566a9d SHA512 690547b5b0b4eb36153ff782f6e55e8b67155e677cba2ace3a0ec6cdd0f3d1eda313dcaea5e33a417e98c1c113cfb22de011a88117f31dcea7ab7858e229bb67
+EBUILD jhead-2.97.ebuild 746 BLAKE2B 1c2b2588dd2104a28b32c44bc2b5641378fe66992a8f5f181a97014dc615950436765dc29c2666e6aa2a1ead24e9dbdacd463c06d233e73382b6c614a6dc2019 SHA512 cfb8694fe762bfe2f963eefe7d4782ffbeb99a0e89d4c8e43a62ba462f11c50cd1d1ec8df57780735c49d2fa71eb8e7606ae701c2a6912174d3c35ceef93dd7a
 EBUILD jhead-3.00-r2.ebuild 711 BLAKE2B fd9cd6299a0a6d4955e58e4f5ee3af77f14155aff3687fcff8c3a6b91cd4095cf950987893f3d30fdeb6936fc4f081c877c52e0c868120e2392e0436e9fa3347 SHA512 98ba55bf301b2cdcd5ab8b53e1e1612b62da19aa5c41f884eb1e72936487b747b45ab06375489d8999a91d549a57c816079f0d219c6ac929bc9164d425a27e84
 EBUILD jhead-3.00.ebuild 746 BLAKE2B 576096a432b63a988861a85e05ebb92f1a4346bd012f74269629a2b868254a372699a4ed3be74ae78cb90df792ee61e77842da6da46ec98ae6a570faedf3fb89 SHA512 2f711c62175a02cc968fc698fffff784743a8befe3c315d294e78978357de5df3ee0c665ae70baf64091db4c3744f1c2aa3853fcae87754eb8a67d0a08ebe4a5
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/jhead/jhead-2.97.ebuild b/media-gfx/jhead/jhead-2.97.ebuild
index 21e355e2ae1e..7b2a5545a032 100644
--- a/media-gfx/jhead/jhead-2.97.ebuild
+++ b/media-gfx/jhead/jhead-2.97.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.sentex.net/~mwandel/${PN}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 src_prepare() {
diff --git a/media-gfx/jpeginfo/Manifest b/media-gfx/jpeginfo/Manifest
index 00522a43fa93..58b0d6968f81 100644
--- a/media-gfx/jpeginfo/Manifest
+++ b/media-gfx/jpeginfo/Manifest
@@ -1,4 +1,4 @@
 AUX jpeginfo-1.6.0-parallel_install.patch 334 BLAKE2B 01d3e16d44789c5c1d1346f6c3067496daad051e60c9a39c69641fcec1766bb69e872f5259b4edd2d7b5fe5c793bc25e47c7329aa49b625ac80954a444562f92 SHA512 5dd86f4172caacb8d43952274b3a0a86df5d346839d29eb7e80e6f7ae8be4b73a70dbaccc1732703d45cc966b8fd762a0a4c5e02a3701718ebcc6ff646f1e676
 DIST jpeginfo-1.6.1.tar.gz 64856 BLAKE2B 5d9748a4af26087e45f2ae3fa709bb2099547f22aaeaf1fde529d92d633b1bc665dfde301a9ecaf4a8e4fa190ef637126d6f4ee43118bb31f5782a402d4a08d1 SHA512 9cc9367b8b3e38ba46bff9477b8f61e63b55bd41a67ea2895cca9c097abba2a7a3ae068c235ecfea72c99af52bba91cbb1eb92feb019ba4eb08e826a7083c68b
-EBUILD jpeginfo-1.6.1-r1.ebuild 643 BLAKE2B 2f1d3ddcdb79c1b5dacdb0e5219502224c679969e6b437d761d2e86021fc7af805c205106af13ab230694673434183b91b6f48eee9fa66975ba2e7345aa8985e SHA512 f6f1ec73f9b12de6dab5ae15c4bda8c20268b8e35c5c3d2804e21de27239d3376c9c3dbb103e5bb7a1f5f8693a2030a28a30ea1405d2436f5a8ec2f80d14632d
+EBUILD jpeginfo-1.6.1-r1.ebuild 644 BLAKE2B 67707966fb52fbc78c078bb388caadf6f36d99a732c98da0c1a88548512ec39fb47075106182db65f186cd0a647596995ac1f017f795da5e35deb305091bae73 SHA512 6e78587f62cc87721af626eb1bd67370ed8fd6a1881bee63285584087e4145802693af294a93afe5ad5d3d219c959565029c1d9a19330cbdaf2e9c4865a8b3f5
 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 73e1104685fc..4b8027f00b3d 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/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index dd2d1a8c6666..0bbe78e07288 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -4,6 +4,6 @@ DIST libimagequant-2.11.7.tar.gz 74311 BLAKE2B 204fbe794014c11d767991a03e729b234
 DIST libimagequant-2.12.2.tar.gz 75611 BLAKE2B 23f5d3666fd21696d4f4dab9db3669642a9e3f6ca971804b914e845018df538136c3db900419ac35230be9fd487b48e0ab672b653e2ee82387c19569b49d6cfc SHA512 7e7bfcffd163d8b73a46d523dc441e4a4726f5dde804f306f13900f74afae6f6e7cf780bf157b5823a71c790bcdd0e9c9c34cf43f84a21289e470fc78835d8d8
 DIST libimagequant-2.12.3.tar.gz 75866 BLAKE2B 857a0e3f0187251e37e0c7f4f5f5cbf49266e4eb9f684118705778d9469330cf95780ea11b83d19e28251f047a7e9b8e7ac32ac4d9554cb5d9e1b3230d39e796 SHA512 4818b00b6f154407f3e402d56f4891c2d7594c8056fada0402d7fa0024ae50127340dd8295da5f5dca13fe1829670a3fa8793aa528f3e74a2294c9a7e37b7257
 EBUILD libimagequant-2.11.7.ebuild 1147 BLAKE2B 41943e15f697966749897fd14aec98dec919ce81189ec5f481517d14eb94a91b95b0b0cdc9f057854a745a2fea5ccf094411900db06eb54dc6aeba410521e871 SHA512 ec8d4ce66233a74974ff6edb4c67dcf5d7f12f4535001bb770d70a995cc5a9b2600f900777fc1996335d49f85efe10a3dc21e547c2b535c68720ee455ec4352f
-EBUILD libimagequant-2.12.2.ebuild 1405 BLAKE2B 74af0f628654812c3f109eb34a9093eaeacb4ee2023075bed2c8602a59f8ef94b5efbd911e4c580714b1ef7e09f150d373e3b98bd1e39a2672dd3923fa921ccb SHA512 245ba762d0743e11992c30c2f576e4d0e508c388d306e0a638093b5bc46bb5f71530cb1ce1ba6ca42421b5aee4ff6974fceaaf74f04200af2eaaf4eb2386020c
-EBUILD libimagequant-2.12.3.ebuild 1407 BLAKE2B 5b2f00d50bcd0b445b220c20316eb5974c7c40cfe3c520d90f4ad17bee7971c4da7a7255aa792a0858a9312874e0a3f975de6ff290f7b29ea7e148190b27bb0c SHA512 2f418c79f36a39aa248a72d9427565c51ef18a050da1a469f00c3449d3cea0f4e3afa847160fde1c87bb72e0aca59444194553cef841414284438452c2df28c3
+EBUILD libimagequant-2.12.2.ebuild 1406 BLAKE2B 69cf7e6dacb7b6b11089a2586f195471ce96b3b55a21badb93d14292ff7a79e783ecb357b0231af715848c2af8d5f11cd71e54f96e479db0c1ed76f163736a77 SHA512 7f7d6fe3f448c506b85cc8e3000b09777dce49f107a621d18b49b047ab222b341632eca299c9641dbdbc0313f79d37573cfcfa9c8de4961f41e96d456de2259c
+EBUILD libimagequant-2.12.3.ebuild 1408 BLAKE2B 4461d184fd6e5af9d598cf4cd4d9d75014eb2d4c41137c5bbce1c099b4ecdffa2f5fb0bf5c84f0854973dbe04ea62e042f9a62f48a681d8d30ec91ac3a0941ee SHA512 8bb3ae3fcf20c8f57e43b6465abfc2c0ecd6d5e12d455c566f541f4d021a1f2a3c134b1006aa5b8bf1e1d8a32d9aaf26c0e50e6a2dcda4b879c988fd3fa4b0c3
 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 02ea4f542a52..de044c9bcfc7 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/libimagequant/libimagequant-2.12.3.ebuild b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
index 3143dad9cd89..053745426699 100644
--- a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.12.3.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/mypaint-brushes/Manifest b/media-gfx/mypaint-brushes/Manifest
index cff71dab3b96..96d6a1417fd3 100644
--- a/media-gfx/mypaint-brushes/Manifest
+++ b/media-gfx/mypaint-brushes/Manifest
@@ -1,3 +1,3 @@
 DIST mypaint-brushes-1.3.0.tar.gz 2447093 BLAKE2B 26fc22ef7669f5d88b1cb2bbc4562baffe257c112baf4a782f5045becd17a0bea577f79f290ae51b38cb3030478ea9d2e251033cc95101caacc823d139fe4ce1 SHA512 f8e0050cd700358d75cd25e40acd73905e2a53f21c6177cf67e8012aa4fbba8dc445109f07601c3846f95532a40feff4441081c0aa4e958049fc0ed8008fb414
-EBUILD mypaint-brushes-1.3.0-r1.ebuild 536 BLAKE2B 271b801888f4e16f7d010e30385187a7af1f6435a8ccce0249261539b5985bc518d0befb18d565ddaf498b64e691d463f3890c1f7b768d800466ed26df8c6789 SHA512 2d6bd09d4aae10c23c779993a6fda73c957098a8d4ebfbd98a0cdd978fd82fa822ff7ce5ad0528987ddee57ee9d85b657a400ec269a3025029d8fe17bbe8e3a8
+EBUILD mypaint-brushes-1.3.0-r1.ebuild 542 BLAKE2B 46890eee9770d37bef3669eb21923253aa011548653d8517926ac39c53bccdadb7baaa40dcfa6b1d7c5d7056ffd07e0fc3739b70c8ae6f9d85c5f171a1abf7a4 SHA512 199430015a24663e6b29f19860cb20612f16f683e089e07b8a4bc63132a61a4537d7373346df1b5578b05c735861d83b1ba3bcaca98dfdb29b0df531d82f4207
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
index 7c8f622060cf..81cc30d41ad8 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Jehan/mypaint-brushes/archive/v1.3.0.tar.gz -> ${P}.
 
 LICENSE="CC0-1.0"
 SLOT="1.0"  # due to pkgconfig name "mypaint-brushes-1.0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ia64 ~ppc64 x86"
 IUSE=""
 
 DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink
diff --git a/media-gfx/optipng/Manifest b/media-gfx/optipng/Manifest
index a578b2423b8e..05325db9d814 100644
--- a/media-gfx/optipng/Manifest
+++ b/media-gfx/optipng/Manifest
@@ -1,8 +1,4 @@
-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
-AUX optipng-0.7.6-cve-2017-16938.patch 878 BLAKE2B 8ad045b58d4e9072576b50c2f3b2052bc9e877ccfa367a039af27071a999deeadc48c418c5b5b5911022c08a212abb96f486dcf3860da7d74ae2a0978f82de9c SHA512 ea3e0e4823b6acb88f06cb56934147c147b98776f501c09a170f05a0b94355dd08539bb2c3ee69d47293028770df6134c3c648d091e14d5362f360961ee9c468
-DIST optipng-0.7.6.tar.gz 2202237 BLAKE2B f113027ff12f2fc97bd4dc43b8e62f5af8f86e251b43c0f86ffbd59366b329d1fc2a58103aa349cb18fb0c9d2e5f051517439c02aeb44ee435c6fff0c75efb7a SHA512 d31d7494c23413d87b601a706cc2faf82923156a818da66e0bfad11741aed065db8f1b0c088d2abd66899ac192408c05f594295ded2684c4549c5f03b140a184
 DIST optipng-0.7.7.tar.gz 2329555 BLAKE2B af3e1c806522282ccbf9325c0b49f61a30d24b8e2db2dd8ec316a312d0dea595cbb6e8b5b38ef5ea90f1efe14244b81f85f88e11e7334fdd4b91b43b6dae8e7d SHA512 c33b7650143ab39944d2c066e07e10273c37024c5bfe7c00475bfb513af96afa081ff388164845d426d3bce624c0282dee574fa150e963f18d3683d821030280
-EBUILD optipng-0.7.6-r2.ebuild 1421 BLAKE2B 70322d5447186354a43c2a0efe46fae53b6fae7ab0a7e47436d179c745857d9792c392a39a7a391319dcb83b26fd2e3a49ef746d7bfff4b412f0468e80b93a9d SHA512 f1805005c8dce16e50786721b84ff80609917edb0167423c253f608b250fa06540f4f524a41d2558ddb4f6a3f5791dac24d0b21d5e1b523fbc6f7fc8ba04aab8
+EBUILD optipng-0.7.7-r1.ebuild 1287 BLAKE2B da5138c4d24c9df741fc0ccec37d1e52fa5e810c10b6f4a0e0ef9242e7d877b4f0f915da260cc6bb4283a14df968fa4862da9432ea0264da17039c59f22f890a SHA512 09fb255b4e69d02dab80cde99591d27c60cb5270100565c333de5ab75be33db2e236823f49a75852ae7693be3abb4b32b371fd964ab1c91bb36b41f8e4035dbc
 EBUILD optipng-0.7.7.ebuild 1289 BLAKE2B 056adeff112c68820bb1bed10ba3f9705b5ce3bc5aed2510c393333d16ab6e83ae59f02f1aa1ec20d1435c7098a9578eb73bf322ae2d853dd5ea0d168d65eb24 SHA512 701d10e6ac8bd6bf0cba74421dc592718ca9de3cc9acc5cc8911cd98cdefa0a8e904a90379cd396969c0a0d53f05b244ab62e7eb7980def90792b550d411db82
 MISC metadata.xml 326 BLAKE2B aa1da3dfcfd0faa4d1bcc901659c15b3ce974eace4d7b1317c7fcfdac13939ca4e0ed9d58eb46e7921caefe63475fcffe3193ad138506c9e16b0d8d9abb73bb8 SHA512 57810d8957812cf02573aff451fb8248944bd100beaa06412deb4b5622161fca2ee466ad80050d68e94acf5e2e7963c6fa657416996c0503da6ac88f1f00efdb
diff --git a/media-gfx/optipng/files/optipng-0.7.5-estonian.patch b/media-gfx/optipng/files/optipng-0.7.5-estonian.patch
deleted file mode 100644
index 37a2ca3ec688..000000000000
--- a/media-gfx/optipng/files/optipng-0.7.5-estonian.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2cf0d7cb7928aac9ec0e21ceaaf09053434a4947 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Tue, 16 Sep 2014 02:58:45 +0200
-Subject: [PATCH] Fix for Estonian locale support (bug #522446)
-
----
- configure | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index 6d2a507..17d4bc1 100755
---- a/configure
-+++ b/configure
-@@ -256,7 +256,7 @@ then
-                 $sed_preconfig_libpng
-                 s|^AR *=.*|AR = $AR|
-                 s|^ARFLAGS *=.*|ARFLAGS = $ARFLAGS|
--                s|^AR_\([A-Z]*\) *=.*|AR_\1 = $AR $ARFLAGS|
-+                s|^AR_\([[:upper:]]*\) *=.*|AR_\1 = $AR $ARFLAGS|
-             "
-         fi
-         if test "$RANLIB"
-@@ -408,7 +408,7 @@ sed_config="
-     s|@LIBPNG_DISTCLEAN_XCMD@|${LIBPNG_DISTCLEAN_XCMD-true}|g
-     s|@ZLIB_MK@|${ZLIB_MK-Makefile}|g
-     s|@ZLIB_DISTCLEAN@|${ZLIB_DISTCLEAN-distclean}|g
--    s|@[A-Z]*_MK@|Makefile|g
-+    s|@[[:upper:]]*_MK@|Makefile|g
-     s| *\$||
- "
- 
--- 
-2.1.0
-
diff --git a/media-gfx/optipng/files/optipng-0.7.6-cve-2017-1000229.patch b/media-gfx/optipng/files/optipng-0.7.6-cve-2017-1000229.patch
deleted file mode 100644
index 19dc3ad0c57b..000000000000
--- a/media-gfx/optipng/files/optipng-0.7.6-cve-2017-1000229.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 77ac8e9fd9b2c1aeec3951e2bb50f7cc2c1e92d2 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 19 Nov 2017 16:04:26 +0100
-Subject: [PATCH] Prevent integer overflow (bug #65, CVE-2017-1000229)
-
----
- src/minitiff/tiffread.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/minitiff/tiffread.c b/src/minitiff/tiffread.c
-index b4910ec..5f9b376 100644
---- a/src/minitiff/tiffread.c
-+++ b/src/minitiff/tiffread.c
-@@ -350,6 +350,8 @@ minitiff_read_info(struct minitiff_info *tiff_ptr, FILE *fp)
-         count = tiff_ptr->strip_offsets_count;
-         if (count == 0 || count > tiff_ptr->height)
-             goto err_invalid;
-+        if (count > (size_t)-1 / sizeof(long))
-+            goto err_memory;
-         tiff_ptr->strip_offsets = (long *)malloc(count * sizeof(long));
-         if (tiff_ptr->strip_offsets == NULL)
-             goto err_memory;
--- 
-2.14.2
-
diff --git a/media-gfx/optipng/files/optipng-0.7.6-cve-2017-16938.patch b/media-gfx/optipng/files/optipng-0.7.6-cve-2017-16938.patch
deleted file mode 100644
index 71edf20cfefe..000000000000
--- a/media-gfx/optipng/files/optipng-0.7.6-cve-2017-16938.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From e05fb81a20541833a2d62ce08552b18c0920b9a1 Mon Sep 17 00:00:00 2001
-From: Cosmin Truta <ctruta@gmail.com>
-Date: Sat, 25 Nov 2017 23:17:46 -0500
-Subject: [PATCH] gifread: Detect indirect circular dependencies in LZW tables
-
----
- src/gifread/gifread.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/gifread/gifread.c b/src/gifread/gifread.c
-index 0123456789abcdef..0123456789abcdef 100644
---- a/src/gifread/gifread.c
-+++ b/src/gifread/gifread.c
-@@ -499,6 +499,8 @@ static int LZWReadByte(int init_flag, int input_code_size, FILE *stream)
-             *sp++ = table[1][code];
-             if (code == table[0][code])
-                 GIFError("GIF/LZW error: circular table entry");
-+            if ((size_t)(sp - stack) >= sizeof(stack) / sizeof(stack[0]))
-+                GIFError("GIF/LZW error: circular table");
-             code = table[0][code];
-         }
- 
diff --git a/media-gfx/optipng/optipng-0.7.6-r2.ebuild b/media-gfx/optipng/optipng-0.7.7-r1.ebuild
index 19129f893305..11a75013d0aa 100644
--- a/media-gfx/optipng/optipng-0.7.6-r2.ebuild
+++ b/media-gfx/optipng/optipng-0.7.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Compress PNG files without affecting image quality"
 HOMEPAGE="http://optipng.sourceforge.net/"
@@ -11,27 +11,25 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/zlib
-	media-libs/libpng:0"
+	media-libs/libpng:0="
 DEPEND="${RDEPEND}
 	sys-apps/findutils"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7.5-estonian.patch
-	epatch "${FILESDIR}"/${PN}-0.7.6-cve-2017-1000229.patch  # bug 637936
-	epatch "${FILESDIR}"/${PN}-0.7.6-cve-2017-16938.patch  # bug 639690
+DOCS=( AUTHORS.txt README.txt )
 
+src_prepare() {
 	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
+		-e 's/^#if defined AT_FDCWD/#if (defined(AT_FDCWD) \&\& !(defined(__SVR4) \&\& defined(__sun)))/' \
+		src/optipng/ioutil.c || die
 
 	tc-export CC AR RANLIB
 	export LD=$(tc-getCC)
@@ -51,8 +49,11 @@ src_compile() {
 }
 
 src_install() {
-	dodoc README.txt doc/*.txt
-	dohtml doc/*.html
+	einstalldocs
+
+	dodoc doc/*.txt
+	docinto html
+	dodoc doc/*.html
 	doman src/${PN}/man/${PN}.1
 
 	dobin src/${PN}/${PN}
diff --git a/media-gfx/pencil/Manifest b/media-gfx/pencil/Manifest
index 0787b67873c4..0528e8d2e857 100644
--- a/media-gfx/pencil/Manifest
+++ b/media-gfx/pencil/Manifest
@@ -1,3 +1,5 @@
 DIST pencil-0.6.1.1.tar.gz 2987266 BLAKE2B ae97364178e62535c17941c6c4a3ad507f5883628cbce59635a2c86cf3485ebd85a5815f28516315dabc30bd791c723805078d47f36b1409d545a769b78d90c4 SHA512 e84330da70091414a9fca8f0be8c8ca82272d89777cd0e5a33d30e4a53449eca20cfc175c84cbbe063dd1017be5b263ddf490f69771d9931c9d31261ebe46354
+DIST pencil-0.6.4.tar.gz 3397891 BLAKE2B cb3fc754cd9abc2944fd184ea61b057a784a5b9e3c42724ef50b117a933cad0b72456a32e849c2de3ae6a7eb8bc6bdeee3ed751e8a6c8c68a74130d03ba6f1de SHA512 da28bd6bcdb0336c81e0735bec261373cd1e5db06feb012d4bba098c9df2ebea6f5b763e9c5e5e17c1518efdd6b9cde634ecf2152b49c25cde6c93da63e6fde8
 EBUILD pencil-0.6.1.1.ebuild 1102 BLAKE2B 6b11aadcdc1646338e23f84fccc1517ba838ab35d27020d0be2688917cde88b7e7eec1952b8e10456ce047e20365460e7591bf047212f030b781417860adbfe1 SHA512 be9356d9632feca6719d60e8f848f95c02443e4cbe772c0d75c569803c8a1e0270ddfcb0135267dcfb4b2c34995a6459b5e8f748b08d95602c8d2e5f2b3645a4
-MISC metadata.xml 251 BLAKE2B 014f8e7a6a13c0ed2ba147bc1ecb8768c9cea185f10b74923d2e2157b3bdf0771a8300a4d88d2492ff9e7daaa5d0bb5c5e04f6c70273a4a0afe85869087d201c SHA512 d515519588ccedd03f6b4d0b653e957c8f26c922098a5408e9962fe9dbbb9105001a9ea1b08b73ce6e5fa41fabdc86081f6fe24f8394e2a44d036d01a01da0ed
+EBUILD pencil-0.6.4.ebuild 1179 BLAKE2B 0527c9a25c2a5ece6d99a9032d1e9760170a3d479d812cd1704946d28805baf6cac08aead03e211d2f583387081dcd911e92bf5719495044ecb460d72c5cfbf5 SHA512 38f900e8f322fe4b4dd20fc0e12e466f35824b52aa5e98577db97eb297c8afdfe9182cc8edec1b2b85ee478c43dbb5ea6e739985665be398402a37219c302a01
+MISC metadata.xml 328 BLAKE2B d37566524ba0b352bca868e5a9db91ac4faf995bc4f9fca49be83be786c8e7b3ba305a10fcc1aea71b610a1442fa1b398ca549b9fcfccf0275c958d99e9d1279 SHA512 4e393e069c386f40fd7f817af383e3ee77d2f4592059a2b3cb54f68eae45eb665db9873971a29d94612dea0c8022bc0a3c2a01bac19e62d774739d3b666aac3e
diff --git a/media-gfx/pencil/metadata.xml b/media-gfx/pencil/metadata.xml
index eac6c670643d..9fb96e2736a9 100644
--- a/media-gfx/pencil/metadata.xml
+++ b/media-gfx/pencil/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>bkohler@gentoo.org</email>
+		<name>Ben Kohler</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pencil-planner</remote-id>
 	</upstream>
diff --git a/media-gfx/pencil/pencil-0.6.4.ebuild b/media-gfx/pencil/pencil-0.6.4.ebuild
new file mode 100644
index 000000000000..7a7001dd26d7
--- /dev/null
+++ b/media-gfx/pencil/pencil-0.6.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils xdg-utils
+
+DESCRIPTION="2D animation and drawing program based on Qt5"
+HOMEPAGE="https://www.pencil2d.org/"
+SRC_URI="https://github.com/pencil2d/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+	default
+	sed -e "/^QT/s/xmlpatterns //" \
+		-i core_lib/core_lib.pro tests/tests.pro || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	einstalldocs
+
+	# install target not yet provided
+	# emake INSTALL_ROOT="${D}" install
+	newbin bin/pencil2d ${PN}
+
+	newicon app/data/icons/icon.png ${PN}.png
+	make_desktop_entry ${PN} pencil2d ${PN} Graphics
+
+	insinto /usr/share/mime/packages/
+	doins app/data/pencil2d.xml
+
+	# TODO: Install l10n files
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/pngrewrite/Manifest b/media-gfx/pngrewrite/Manifest
index 35b8d5c9122a..4acf03a5411d 100644
--- a/media-gfx/pngrewrite/Manifest
+++ b/media-gfx/pngrewrite/Manifest
@@ -1,3 +1,3 @@
 DIST pngrewrite-1.4.0.zip 149760 BLAKE2B 7ae0acabe8d231233bfab3fe0c6a71da4f835d5c6c6943aa394ec0e83f126c93127d5f798e2206f2c45ed5b9b016a14c45a99ea450b40fd63af09a321fb5d2bd SHA512 9ed9d220a4d8066f752d7ba123dd831ce6550072e7f8dd2327bf257b3d8e886f781c4878896c633a9a251a1311a10af56434e2c9ff773d174233a340a1f37e42
-EBUILD pngrewrite-1.4.0.ebuild 635 BLAKE2B a2e0c5cee40b1219fae402d7aed9f03bace33baa0f5b01637d5259d49592afb1a41173ce2e478fb6a2c2fb94c453d3432785882f417aefb761cef25d82081cff SHA512 599d88c3157f519a47a7965f683d88a37738f82e2660535663a3ce04b50abf09408843668e3b9fd0a6d3cb0ac9c216b076fa755c7b6a4853473f160119b18540
+EBUILD pngrewrite-1.4.0.ebuild 636 BLAKE2B 7d25a4cb5242352ced8f36539949219652d2f9128cf71e1b0e04e5e455290c51027521574b058c7a58e217afb8927f90f474d70fb57707859eae91edb53a2d22 SHA512 5917266359b8d21e2175cf46ebe5a7c0c9c4d6415969bbc478ac51dc29a46fe38ce5064a8fa106706bd7aaa7174540c9fe5625e17576bc56ea7e8de5698f7230
 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 02fff6cf2812..9262e8a69ad1 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/potrace/Manifest b/media-gfx/potrace/Manifest
index d0d77a0ebbcb..4ac83b239c1c 100644
--- a/media-gfx/potrace/Manifest
+++ b/media-gfx/potrace/Manifest
@@ -1,5 +1,5 @@
 DIST potrace-1.15.tar.gz 650840 BLAKE2B 1a2074ff0ff958e1c9cbcd35a6267ef7f4bdfa5ba9b511413fa2c5db16a7263ed27291a0bf7c76feb25abd59db099e1096b736eab28a6397accfce88f42fdeff SHA512 c9a8edd4f3339da587b9b32e12c83c8f7b993c7c23f551fa267545d9411679bc024924e23596ed1c83985693fc894b65dfa9f860275de395d9e0a88da37a4f02
 DIST potrace-1.16.tar.gz 657314 BLAKE2B ee6b04f355d593dd1ebcc4833b244e25eaaa69c91f90987d530a4e5a454668dff6ecfb7a5d8270ebbd9e7c177fd447d1b3fe2a343fc4b9413dd3f507c0c6e417 SHA512 10d85ed3fada80951223c65e923b5e6ee3e76e071575971d5b09b996b477ec5ff2403e0337c44963c6b441cc3ba6c4f7009541124a25c16b7721fdebd1f774b9
-EBUILD potrace-1.15.ebuild 802 BLAKE2B 90ab4ca18a92cad6e0249210767b3b47925f2dc1a307ab1bb93533647b8d000ccddb8d311b8057f09d30f124abdca51f1cea335396c6186d758d34ddc0360bd1 SHA512 e8079aae16749a380bea1278dfd0c521d55615be793a885d26389e8ea31d9f278ff1f607b1a0c196473652031f28f8ad8e74095456e4dcdafbe53bc69a2c354a
+EBUILD potrace-1.15.ebuild 803 BLAKE2B ff3fd19f619310deecf5fd8e92ecf811c535f3cdab2284c300babafd7240930eee65a16625b4708be987a0eade0a0bf986f0c5b036d3551384822065aa8c44f8 SHA512 e9f00da09e220892ca95160c1593ecf995632c0d516e6b6257b84480b1314a37742819ca64921c6672a9fa8f20f978c47e2f30fbdaea8655c935644c952f90a5
 EBUILD potrace-1.16.ebuild 810 BLAKE2B 2dc8008fe2cd0b65e308e819b7ff04b9c9dd743b7e7e889f6fe99425da94206b4a4048edb47ee780e1a7b865c15f65761fde93b60336678888ce2349c6da0539 SHA512 00779894c3f2178015cdbc51491a016fea978750f2afa02bb41cc0115982129332e97523089ff40323972a3a45ab3f092e76a510678f3c61283adf43c03d964b
 MISC metadata.xml 534 BLAKE2B 04a21e1af300190548959fc595c0f0ca4918bcc949bb6f5ac6747f79806b3c2f3e57ecf25076e8d8a876ff1ee45b8b816e89c957f8ca4e05292ef390c5de32e0 SHA512 00f7a8a90caa7e7d9920929733f084d41baf72c45dc998255c54964eb50f6ec70d6af8666463fdefca27f95156834f1c4e9676f115bbb86538e979967a73b6c3
diff --git a/media-gfx/potrace/potrace-1.15.ebuild b/media-gfx/potrace/potrace-1.15.ebuild
index 00f83d8c4f1d..c108417d6cf1 100644
--- a/media-gfx/potrace/potrace-1.15.ebuild
+++ b/media-gfx/potrace/potrace-1.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://potrace.sourceforge.net/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="metric static-libs"
 
 RDEPEND="sys-libs/zlib"
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index 596b1719701e..c5e67b0b8ec0 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -6,6 +6,6 @@ AUX povray-3.7.0.0-user-conf.patch 1491 BLAKE2B ee99672c70a5d7e12048acbfc50a3ef4
 AUX povray-3.7.0_rc6-darwin-defaults.patch 920 BLAKE2B 9cffcda18626cfdbea9a6b00ae99ee300d6b29a79e22229e35d116070b4a1ac1fbb4869242a043155a4fa189f701e6bc318cd3ba8fbc743d497db26c763926c8 SHA512 17ae635430f0d57157c9915ce5b25a88afcb34f6dd9552b27a42b32d638fdfbcb8b4e41ec89b52048db9d054812535b7b41f328ffe4554e719e4a3de21cbfdee
 DIST povray-3.7.0.0.tar.gz 38191521 BLAKE2B 5d936bdcdf9910ede2247cfa5e3881211da00762ac4bc08225dc6b53addc9e09546de9493e642b5d41228d81a50a4bcfbb5e606eb8bd9a224bb1afc5fc82db6e SHA512 82e3dbcd58b7ae921fe3b953815ca4dbbfb22eda434554baee4accabd1455b18cb511061f1cf9cf93128fab0a042df374fe2f68186d78c19853a465bd4bcbe10
 DIST povray-3.7.0.0_p20160914-fix-c++14.patch.bz2 12876 BLAKE2B b1c458764f04a57420a4562e9faacae4ae955c3d9ce4343ffd49176bb575f63830fcd58d0777dea22b975df118aa14e2bdd91509758d33d659daa3fbbaba5880 SHA512 3329da12a822762559445e208a746ff208c39f7b63e27ba84a390074bb52a105c9a2f66180e58c5157795bb16346e11b5b05efaf077ee0d8246179975a692b04
-EBUILD povray-3.7.0.0-r1.ebuild 4600 BLAKE2B 4de36a7661c6c6e6acb59982b490f8f4aa73c3b06d34fa56f589a29ddb827b3e2f500804baadba82393a167b8fcef1949bfe608512e0a2ab19a7f1dba6817486 SHA512 260c687db531dc2d70b699264768eea74022ca3af33c05b0c755d752b303f5348763ec2eee9443a6731dc0bc4e06c23fb2748f99628c0336edc206605d744fb5
-EBUILD povray-3.7.0.0.ebuild 4382 BLAKE2B 70ff0cbe6d4cd48cea00743eff20a2fbe77a552ae347665fbd389878a3ad1830344e6432250b2018e222c3164d316c27fc2d22ba87982bb7352994d173501c64 SHA512 ccd2db035aff782d0d8a05456525243f70ac38c99d6437225c9d56b81dd18e96b8732627982cc2930371648f7cbe6f7aca4d10180004e3daec856699f40ec13a
+EBUILD povray-3.7.0.0-r1.ebuild 4601 BLAKE2B 0b9a2f347af8b11af38c9c4a8f48ab53de2298d334e64dafd363f2f48c2a21b75af9c396d634e900265af24df4ab9ad9542a0ffa65560ca903afa9737d7e9e83 SHA512 33d3020577323b6086d7fef1af504e08ccefac952946c049f368fc4032cfda020df493f0f405e1a87b6aaad8ab92f61f8f51dfb7e6f51c8ae17ae41128dc08c6
+EBUILD povray-3.7.0.0.ebuild 4383 BLAKE2B fea8094c4e2aa73fd14211b2cf41e49d3574c9a8675ce80994d8b1f3f5c4622c0236b476ec4436f8792fb03eefb2d601791a48774762d9f118a9fcd0f597a9ed SHA512 9cf9a03d37fac820aa2db1231731c7c2021913460ebd4c84b5d591851640116880beaeedab6bd11eb8195cd187b20e87727266b96774b03b66fc091cc7fd9489
 MISC metadata.xml 504 BLAKE2B f0b8ba895e8949a452dc4ddac0f3e78513b3c91107131d288e9e4ea7d1dd406622ac8a3ddeacd0b3df039ce95ab6f3dd339b80bf91f48ea99ab6d5c74a6cb4d8 SHA512 e2146892acd26bd3fc03fe1733f67073a1db1106f568ac886548b7c3e4fef508d1f3a619d74b8573696f007ae764d26e1f8556c3dbb03b9434b71258f0bcbb00
diff --git a/media-gfx/povray/povray-3.7.0.0-r1.ebuild b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
index 235c82274deb..e103d01fc846 100644
--- a/media-gfx/povray/povray-3.7.0.0-r1.ebuild
+++ b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/POV-Ray/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug +io-restrictions openexr static-libs tiff X"
 
 DEPEND="
diff --git a/media-gfx/povray/povray-3.7.0.0.ebuild b/media-gfx/povray/povray-3.7.0.0.ebuild
index 6908555adbf9..bd540c614ef4 100644
--- a/media-gfx/povray/povray-3.7.0.0.ebuild
+++ b/media-gfx/povray/povray-3.7.0.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/POV-Ray/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug +io-restrictions mkl openexr static-libs tiff X"
 
 DEPEND="
diff --git a/media-gfx/pstoedit/Manifest b/media-gfx/pstoedit/Manifest
index 53f7fbbdd5e0..18b9c3433f93 100644
--- a/media-gfx/pstoedit/Manifest
+++ b/media-gfx/pstoedit/Manifest
@@ -1,5 +1,5 @@
 AUX pstoedit-3.60-libdl.patch 428 BLAKE2B 8ed39e1a13da74ccecaa2aeec57447fc75b682c9ea5a8fe6586052fd766bc9ab23cb76bdc56bb613cb43672f6d10a05cfaa8bc860865d2586673ab4a9c8642aa SHA512 dc29caf4b1bf1e6ce7cc73fd5ae1682f0aba8a798f632d29cca450bf3883afe54142ea06fbe6d9aa07f2580450780afe1c671cb1c37f1dd800582b2036797f73
 AUX pstoedit-3.70-pkgconfig.patch 627 BLAKE2B 00412e11239e49f12babc35f2225c7ac2a25ce62e59d8b3088c0d7284b867c8919dc70c61bc60cea06e75dee84698eaf223861ad8db09cd36dfdf5ee813aee9c SHA512 8edfc9f0c0db6371405ff16641294c8aebb7dc09e9bc8b9114c7506f4fd494f0361b90abceddad68c351baa2d2917b6212056ed69c0a6dde0d914a2c801888ec
 DIST pstoedit-3.70.tar.gz 1013949 BLAKE2B ec459dc56851d942076adf4352ef974188b0b8273a6f9150c8767c1d63c3c9b6d993ea8c0b1a0b59663b31652eb7a4b8697e4c38c23d5aa0572d554120a5e900 SHA512 63668ea039fdf988ba007bafb8dc1f23f06d4eb430a92b97fb93c71b819f63e2708b99476ec9b096598db2ddd30d29a69101f078e7d4fdfec314677f50293cf9
-EBUILD pstoedit-3.70-r1.ebuild 1295 BLAKE2B e8bf30e99080f8e2e6a9a3618013ae6d95f790e4470d141a42f1193c19c5ded2b23bd475d6cf534654021dd75c39d02ff721120822d610d8daa7a51040046714 SHA512 7023242000af96db657c915d6307d8a56f48108112698a74285291197adea3d6cbb1455bdbfe6d7f733fa1414dec5c7fd49c0e26f46687eab8daceaae3e8dc89
+EBUILD pstoedit-3.70-r1.ebuild 1296 BLAKE2B db93576f665f793c602693f62a9db3fd4bca36f79892ca0ea80849b6f2e2ba364efa4ce9b09350d068b7dd9f843055579a45d018979a69b5506b75ebea955ae2 SHA512 cff803bc42a6e8c417abfa690a24c5aa4d4896dc736c77dc83cc3416e9ed5eee8d8238fdd37b01adced82832219e72dd949f1880defbe8363d06738b118a7d32
 MISC metadata.xml 633 BLAKE2B 3a142022d38aaf0e5bd5d6df58b8a6e2f94589992eba8a48d875138af60bb44d8893ed91a7dcb169246ff2d2405940c406d5d37f84bfc9c621b8771b96678f05 SHA512 6d62633c23d2b45c5bdf75e8e09e3f58def09a2512e540699857809ea79ddc41c823cc382a9a412b6dc061e02c3b5574c8addc7bebd6e7bb10caa2c2408162a6
diff --git a/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild b/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild
index 76f9250a7c8c..2e06d542724d 100644
--- a/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.70-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="emf imagemagick plotutils pptx static-libs"
 
 RDEPEND="
diff --git a/media-gfx/pycam/Manifest b/media-gfx/pycam/Manifest
index ae8483ec6419..ba9341aa6e56 100644
--- a/media-gfx/pycam/Manifest
+++ b/media-gfx/pycam/Manifest
@@ -1,7 +1,3 @@
-DIST pycam-0.5.1.tar.gz 1680577 BLAKE2B 06d30496146a96bd4613c1674890de7073c32eb78ba3a879124fe74b613259629a20d032fb5cb1be1cfd18b3cf7dc6c7e99fb57763d1af1b1907e46509e577ff SHA512 f880d960f82eb374465a593f3b27e9f72148b3ceb99fde15bee4ccf1078acc8ef44ddfd9ee12f89e5b5e5ee14706b6e5d76eff7d0334c9526866ff263a057994
-DIST pycam-0.6.2.tar.gz 3070572 BLAKE2B 3dbc6123f92035de1a9fa23453463ee1f45543c72f4f92b6d367d1031abd4cda638ff6b5bb261c8ae127c2cf875cf44837e76b73777acc8d58aaa3d95ec67894 SHA512 ff96a40aacf92ffd20e729912fc81177ffc01d688cfca300d31dd71399d91754dfbf5b864d95a88f938286e38c759c372968e53c29041653c85f446c6c9eca42
 DIST pycam-0.6.4.tar.gz 3079871 BLAKE2B 41368b177e8ead933e898d316349adc40d40e23d5c7b56943f3f46acf2ff3634e797636e0723b9470453bb2e12f8fd9c70fd4aaedc207ea4638d9d422948f3dc SHA512 4095d45b6c561c2e706469f12772ede8063fa0216cef4a52412fe4d5e892882aa62a65a6159d97c6c066aec20d4915a7a05724dc0e2b66f2309e0fa3bbc0253f
-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.4.ebuild 618 BLAKE2B b74e2f58cda5a1ca5c822e2de5fb2df9debee0645bc47a7c4e8d1a95fc584393278533115298baf213771b0ec64f01a7f5a2d952a6acea16c8f1c5a4811d1237 SHA512 091cc13aa72c87d0b7212a3d9784ab1d592750f1aff4c477de6d86fe5f04572f68a6b460a89e3c15aa13c8ab65290e1e62512228a60f86459f405384e56de430
 MISC metadata.xml 242 BLAKE2B 36ad0b4e5b9871185d814e8deaeb36feb9b92c692d6edad5abaaca3c79c05e733525ecc012f7bf4c5de365a2e3384c5c61c99c21fb4d75cdbe6fb077896959b2 SHA512 b6114ff75cd247836e796cb8418d513394083eae631a98dbcb0b411fd51840450e955d884a56bbe4de8ff315d32cc7e4b22130b8b3a8b97197aa213270bf4db9
diff --git a/media-gfx/pycam/pycam-0.5.1.ebuild b/media-gfx/pycam/pycam-0.5.1.ebuild
deleted file mode 100644
index 26eaf6996f51..000000000000
--- a/media-gfx/pycam/pycam-0.5.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 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="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-DEPEND="
-	dev-python/pygtk
-	dev-python/pygtkglext
-	dev-python/pyopengl
-"
-RDEPEND="${DEPEND}"
diff --git a/media-gfx/pycam/pycam-0.6.2.ebuild b/media-gfx/pycam/pycam-0.6.2.ebuild
deleted file mode 100644
index d26eca4bad30..000000000000
--- a/media-gfx/pycam/pycam-0.6.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 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://github.com/SebKuzminsky/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-DEPEND="
-	dev-python/pygtk
-	dev-python/pygtkglext
-	dev-python/pyopengl
-	dev-python/librsvg-python
-"
-RDEPEND="${DEPEND}"
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index 3e6c8d9a5673..2dd583630068 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -1,3 +1,3 @@
 DIST qrencode-4.0.2.tar.bz2 430309 BLAKE2B 1f68d2a921ba60df3a6c7381d7886b27a2876f90771d78c12d5d0fed2d6a4edb4d7da5985e2b244406a0cf3434b351fbec8b12c5944c365078ef2b227edb0acd SHA512 2429c7938e32eacbaf327c029c7745ba33259f879661a8b6470cc617c780daf5bd1d5689599151df62e84badd2568eccab6c12f157331e512ab24a3899e0f002
-EBUILD qrencode-4.0.2.ebuild 789 BLAKE2B 134716a40b8641d1cf44f5b0681809e50caac16b6f8439f27d3461d19fae183bb978211528da663c141c0824dbcb998ea843aff7f441e597f75e306bbd762ee8 SHA512 18e23638fa8f4dfc285ca683e6fde648845c0d834ecd9e8c4d937365a1d55a9d89d338bb70a5c37fe654d6c66b0e1909318d5e19e352e5b994704058418b120e
+EBUILD qrencode-4.0.2.ebuild 790 BLAKE2B cd466f6a8f2202198820a0e5577da6beaf379245aedd649f3c87550dca08ae9b8c624fef61abd236e1e7c5a799314fca6046b0a961d221070fcc32581a76e0ab SHA512 41be501a819292faadc94cda499b88b9a07bda810a273c3926a618fa2cdabf737c71e2ae10b8edbb423b886b83a06304fb27d398662f2d7d04a965e34c09b957
 MISC metadata.xml 370 BLAKE2B af379243b15cc55c2e2c14bd20ec8b9bb41d4fbb6a87938aae5cbc39e17c78ac45b322d946eadec59fc48c13354fd9dfdffea8c2572301d8d4cb86f162d49bdc SHA512 f5987a8aab3b861bbe4961c69d0c72b07826c43320fd383075036ad63a070204c6ed41297b2490b4a14224f5c4269c37c40e5abc9bce4d1c5857e68e98d6428c
diff --git a/media-gfx/qrencode/qrencode-4.0.2.ebuild b/media-gfx/qrencode/qrencode-4.0.2.ebuild
index 7c9a840f5f0a..99912ba47907 100644
--- a/media-gfx/qrencode/qrencode-4.0.2.ebuild
+++ b/media-gfx/qrencode/qrencode-4.0.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0/4"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/raw-thumbnailer/Manifest b/media-gfx/raw-thumbnailer/Manifest
index 9efd205de6d3..03d0c78ce602 100644
--- a/media-gfx/raw-thumbnailer/Manifest
+++ b/media-gfx/raw-thumbnailer/Manifest
@@ -1,4 +1,4 @@
 AUX raw-thumbnailer-0.2.1-libopenraw.patch 897 BLAKE2B 26065ada735e744b0bac662110f8f6a8d70f808721452adab0c7b4cf6927152ab255e424b2978147895e36833cf525893d3f601a09871e712a2dcd348d05e1f0 SHA512 c9b582a6f7d8ccd5958da96d4773105e17b9047b1081d5a4e2a48384831f83e79ef32b9fafd3cd2436472ac86554ffa2232b1d039f06d9890425c5b2d6da185d
 DIST raw-thumbnailer-0.2.1.tar.gz 89468 BLAKE2B 8041cfee56f9be900c6f7bfa6dfb9b21b482ee8eb7dacb83ed37603c32edf6e1dee122de3e98b06d158b6725a1900c73c7e1aee1b8e6a53545428ff7aca47b53 SHA512 cc3c107b060add00b4af811bb548b597493ff0d54d863c530d183970ac8bdd4f6b9f4c25cf978e1d2bf80b11424dbbfb20e73c6dd1abeff3a15a08843bcd41e1
-EBUILD raw-thumbnailer-0.2.1-r1.ebuild 665 BLAKE2B c4959322b430f6d3399765ec55c0e0612974c398e355a677f0ec57fd083125204747d6e062db3cd54b2788ad0d0ac95289810c8317ce086c14d7053fd2a1cfd5 SHA512 c0c58237a63610e0c0a94c72d13608e3445d7cc9b20b0b4815f0d90b7830adc025795b62c1923fe5cbc8ffd9d13b271087f2889ce22a592c3405feed7faa211e
+EBUILD raw-thumbnailer-0.2.1-r1.ebuild 666 BLAKE2B 08111226e538be42d182faa19a3dc5df639a5a4c3b224a374ad77b71dff0b7ee98b4ddb3304ca43a6f91055a7938795a844c5605ec95f01f78e06bf1e5804192 SHA512 39a5f5fa9a697c3cf0ad045b911c1c50271dad437c65f5a4e14b325f37ac8362fd9a85d08e51b94e3517f6cececaee4f86858bb84657f8c8f0630caab3986a95
 MISC metadata.xml 407 BLAKE2B 713244da2a69bfc59fb7a82373bba128e0d08fe7c12645245fb01df403e3affc792fc26ca28967dcc6c499145e90f9a34eb7c984164ccf4396a8924c4c153312 SHA512 7383547238ca395a6cffde72366521dd7e3e04218f8840f19f093cfa61d0788d10138d39250702085a5669f715aaf3d0da5e357829a0e0fd44a70d20c14ed46a
diff --git a/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild b/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild
index d186964a5563..d0682ba162fb 100644
--- a/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild
+++ b/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libopenraw-0.1:=[gtk]
diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index f3342279e97d..04fc66680cc8 100644
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@@ -1,5 +1,5 @@
 AUX sam2p-0.49.3-build-fixes.patch 6108 BLAKE2B 85c608628a932c698a5ad7f44394c85138f850f3e4c2807101eab1fefee5721bd76cd3edfebf71d57221b94709e2aa1c09c415821f3128d3ee5f71c37640365d SHA512 70e14339b6fb8f587adc4692982601db0b1d0343a737cf08931101589eaecc419e8f571bd138a6e585a7a9a7a9f2e8f3ebf3ccf4c315d805be9f625a917a56c3
 AUX sam2p-0.49.3-perl526.patch 648 BLAKE2B 0fa1d54116325cfbf1720c8465ddf5d8bc6a3a11843207e075f63ffae803e128e8c961ff9ca33f961f169f1af2f1419bb5edddb139c87a7193da064aab8cc6da SHA512 22628eadcf9399ba89a652ad41ac55e98fdb596df029e466a4bbc609131e914e456451362e8639c98dbf59c7e288296b4940fa2e92d8ce671715103e9b622f0d
 DIST sam2p-0.49.3.tar.gz 2184864 BLAKE2B 47d3ce6384c344f66e564ea9f70e89e311540c1bbaf640a70cec2830347b3767aa79d525d25c12cfc2aecc61aca676239b99b345fc7e6bb2edfac7c60bd8d674 SHA512 9e9c91a2cd692e49bf73e7c197a0fcbe7df96c685636d1d00456eb8b4b847de3f4848d9bb3d9246340c479c62900ddd4e0a248257aa5e6ec6e16683c5dad54f8
-EBUILD sam2p-0.49.3.ebuild 982 BLAKE2B e24499cf5f551bb8ffdb47b4ff661acc9d349eaf2b765a0aa871ed27e9b3a8793ba7790749924179e774a1d99ae172a7ad1525392d3bd69546ea73bbc403a8b7 SHA512 ea06a40f4e0206412585655330984e1de43eccfc25428852d2419e0d056a2aad4f27fbd3b93c92e37386252a0c9af01faac77a5d02ff732049195adadad1cbdf
+EBUILD sam2p-0.49.3.ebuild 983 BLAKE2B 2282f09da966b24d67d47a695b60866efbdf012e36df3064b3389d902a33ddc4c54fe18b56490a76f019388574660a93e34e27985b6b78ca9cfb53d369ab8580 SHA512 b1dbedc78534e5cf39a9cf85f08831476a2e02a185ed9481d8bc3bb96bc3130d83d06c519317f7c31939fbdd85df7ee1b3804d78662fb3f56dbcb4c9f0aebd04
 MISC metadata.xml 373 BLAKE2B a0a62fca7fbcd916d83a6d7fa8f020c333b529ed06492cd8f52a8e04d228714bd53d1283e0b43f5a0c399aafdaf99b5caa5534a0ba54e1bff4958b4f28e899f7 SHA512 2bac0bb931232d7b994f24551d0fedccfcaf69932e4900264857e9ba09a9c32495ab743c1fe930e63adca3b7bc11efdea526982e6e27869033bc17731fa5c7fa
diff --git a/media-gfx/sam2p/sam2p-0.49.3.ebuild b/media-gfx/sam2p/sam2p-0.49.3.ebuild
index 0380fdef2d0a..e1a1c30472f3 100644
--- a/media-gfx/sam2p/sam2p-0.49.3.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pts/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-macos"
 IUSE="examples gif"
 
 DEPEND="dev-lang/perl"
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 015a1059fa17..285678e983e6 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -10,5 +10,5 @@ AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b
 AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9 SHA512 a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093
 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965
 DIST sane-backends-1.0.27.tar.gz 6430188 BLAKE2B 90f910311e31a436eaa0ca0fedd998aac3331f89a346f31613776ebc860a10cc37055fd15db8de8d743498914ea0c16e4153dbaa101380eb6e36857d730c3456 SHA512 c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5
-EBUILD sane-backends-1.0.27-r3.ebuild 8123 BLAKE2B 7abe22b6a5af2d4e11d054bf538a1595215018ee4b6b6bf55d86443213c925504d5c43222214ae184a7001dc9ca6c53b5c18f759b618990ac8ce30e4c5905c7c SHA512 c35348ef4b4536a47113f38301695459299a92d3cb0d23a689eec282c883ee462810ae97c9b2c47beeb15bf6454b6bbc09511b51c6e331985a64963266ada185
+EBUILD sane-backends-1.0.27-r3.ebuild 8124 BLAKE2B d0b908b529932e5c1b17b5659da58be7f1ad71cda6a19b8912f269f7ae8f93a3c8b5343f4cde5bbfbaecdb764476c66ce22ebe5279d5dad312800def0616c4d3 SHA512 41973ef657abb6401e20b0de90aeb49289736c1a7e75b1a0bddb9391c173e6663450ed361ac458167da76f2fc31be91e7430fd358ede64188e34d2757d43039c
 MISC metadata.xml 266 BLAKE2B c76ad15982ba5b341a41155c75a5fda95a99ef658ed972c452bfb7b0968aafe33f83cc5bd0f2effb1c2b4f9721a8f61987f2fb7906855b3869e7787226f2b385 SHA512 67d43b02a8c1aab418ca79b30d88af0e78f9df9b95c93887cfed5976290e714409e7dc400f09170d7e7844a411aa3e3202f49f31f39b7f580a8c0b6f3d4db659
diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
index ec01ac6e3c37..c619337d506e 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild
@@ -122,7 +122,7 @@ SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz"
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-gfx/sane-frontends/Manifest b/media-gfx/sane-frontends/Manifest
index 93e2f61d49bf..9150fbd854a7 100644
--- a/media-gfx/sane-frontends/Manifest
+++ b/media-gfx/sane-frontends/Manifest
@@ -1,6 +1,6 @@
 AUX MissingCapsFlag.patch 417 BLAKE2B 5382644f1c8af41fb383bf9889528f279bbac0a18ee2e38f080769b653f24fc02dec53f88f364441d8ceb6d401ad70137215627a181434f6cfcf8245a1d6c37c SHA512 39790a52414a7edcfc4dd9379bd8f35ce91e932209ba9c2ab3f1cb9e5dd140b37f3bfed1e642050a142da43ae435329ab60e201f2934be76648380615a3f37ef
 DIST sane-frontends-1.0.14.tar.gz 231892 BLAKE2B 3d3af2ded774fa90ba4b9545a00df1f036fc72edb71a69f803dde84ca1e9d37b4d20ac91d046ce702c31eb7353d2d85b91cbf8bd53b84adea7f2e58f8be1a062 SHA512 51b24a9bd6889e99419c1d6abb30cb14d8f89b6196c5147044697bdb1b39ee029bdc0d7c6e1f1e800491988aa26f658bc974b25040c49d008ca8977673c78710
 DIST sane-frontends-upstream-1.0.14.tar.gz 233587 BLAKE2B 69e34ed783cff68879b92d478195fe8c67f29d8904e22bdc62deb7310e8ac73d1ce6fc89ee0eafe3e2460f54cec257dbfe28843aec679cfe8669be6c5fc0e2bd SHA512 ffb854f4f4fd08a98395f325c22aa81924ac1e0827e795107bf01f3c42c2cd64bc204c79bc5ec8fd570746d039eae87a2da9cdf30b7f4640442a33c6495d35f8
-EBUILD sane-frontends-1.0.14-r3.ebuild 1327 BLAKE2B 15e8425ed7db7301ded095f2652f8214a40f8381f67f90077835dcb9d03c6e024be07de4eb85279a6b8d728865d989c66d238a17d00d685546f05775ef1af251 SHA512 0e7c3cfcd8df0bba6fec4ece1188b3907d33fa57878a0d38265dda4d29c3b295c7128ce84507b55ca21a373926d15bf66d82f91a49a4fea0009c4c9e4d1305ca
-EBUILD sane-frontends-1.0.14-r4.ebuild 1477 BLAKE2B 51ac9358562198a79a391efec2f00b120b1a36f9d0e8fe39305bf6943449365bec1606f414cb0853f00a633ae1a4e439cb92f6d9d4ede4c01196936e4ee5b6fd SHA512 fb36d5fb3e1ceec7d226ce4d18e32822fc0e68d1aa55a86b517b05b1726a3be807456e5fd8a211e1991a32c724d786d782bc21262c2be1951eaaf2514923c6a3
+EBUILD sane-frontends-1.0.14-r3.ebuild 1328 BLAKE2B 7e0a7f4305f8425e649e564bba1fdd8050d9bdd5850d078fd72f674c2945f6cbbbfecb647e74dc5259b054b177e17291396c333e197af0fef6feae1a1d9159ee SHA512 e11cb1e3604a48b123395754f47f6759883258db9e18579762798fe27fc5caa3200bc479a93894bfdb10a4209a7028c555ff5257fba8de254459095366ec9910
+EBUILD sane-frontends-1.0.14-r4.ebuild 1472 BLAKE2B 346d15cc4d372c1f58615595e76c1875356a2b12c0fa27fb9e896692c5ad7ff96af481f7f3febe8d4672201bee95dec99cc92a39d88b882f7a9c38e55cac0ef3 SHA512 82ae275c29f2b817ac66cd8c70d707629a344f1d1ec4eb3a22158bec687870b82634889047d3429fdf7d18a26d5ad9f83894c6a058278d7c780bf52ecb4492cf
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild b/media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild
index 7af78ea1b989..c6df628cc493 100644
--- a/media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild
+++ b/media-gfx/sane-frontends/sane-frontends-1.0.14-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://alioth.debian.org/frs/download.php/file/1140/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 IUSE="gimp gtk"
 
 RDEPEND="
diff --git a/media-gfx/sane-frontends/sane-frontends-1.0.14-r4.ebuild b/media-gfx/sane-frontends/sane-frontends-1.0.14-r4.ebuild
index 8f9b6030f8cd..7db138001934 100644
--- a/media-gfx/sane-frontends/sane-frontends-1.0.14-r4.ebuild
+++ b/media-gfx/sane-frontends/sane-frontends-1.0.14-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -56,7 +56,7 @@ src_install() {
 			die "Can't find GIMP plugin directory."
 		fi
 		dodir "${plugindir#${EPREFIX}}"
-		dosym "${EPREFIX}"/usr/bin/xscanimage "${plugindir#${EPREFIX}}"/xscanimage
+		dosym ../../../../bin/xscanimage "${plugindir#${EPREFIX}}"/xscanimage
 	fi
 
 	einstalldocs
diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index 85f957f60397..94a6f5600f77 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -3,7 +3,7 @@ AUX scrot.bash-completion 1063 BLAKE2B ab03add49bb68db845d1cb599e62dfd4070a8110b
 DIST scrot-1.2.tar.gz 36839 BLAKE2B 26ca05fb3c8fa9069ad87bdd5cc93791994e44e2f5cd7a4b729a6c9e3035c349049500b9627fd31532c280465f77f839370d095f1b0f2ccc10649b3e6fa01edb SHA512 b89e7a94e6317fdb7bd260190c6d68a2dfefc08691b4574337afdfff84f55b8b9c955a6ac60642ae9749c1deaa16bee7b855fbd15833a95f602536693daf8c37
 DIST scrot_0.8-13.debian.tar.gz 7943 BLAKE2B 6c58c76f3a8dcf61a8ca4c31f5845cb27b4d0ed2bf9619cc8ea5824b5e42c66ee5163c7f4e76308763947b933003dbd3df6e641b0596ed342993343fd5418a75 SHA512 3f6d0a8e592088af38a3d90394b6b7246430479f5b0c8451af5eae383725d1896dc4bbf595495f9f2b546f00ef38780123c4ee0e3f06971c55a6ac2dfa5b7d53
 DIST scrot_0.8.orig.tar.gz 74324 BLAKE2B 56facc81c29f101279ffc6d5d323a0cecd32b1ff6d1d4bb2052a90703353a9ad5b6ab46c8840ed20834f976badab4258fbb0f031645d9689eef1b838ebd4b1a0 SHA512 cba8f589e45758ddbfe4e276399a1ecb0dbe29569be5d85d97733e7f64de2911bd2d03e62700ad0c718a1fc886c2e3def9dee1de5cac884f9e65e772cebe838c
-EBUILD scrot-0.8_p13-r1.ebuild 978 BLAKE2B 83e527067dc2dbaca246df7e3520c3658143767a02ddea54786e95fa8922774116f693f5fce4e71583d2aa77f8c326f4441f9c09eaf6be0f318923621408f179 SHA512 4f9c553a74c665adc7f355440b51b15d9488b93f5d6a8fb3ee29e560e396662949e24a88d5f1e8a9aceab0b6e99472562e2a25a7926c14703a240f0eba186260
+EBUILD scrot-0.8_p13-r1.ebuild 979 BLAKE2B dd4429a13bb0acb2adb27de98626b4a48595d11fac71ce6efb60f561df306b21bd2140e5d1d660a71502be45e7fdf1fe216903a0720453e7548cd52d70ec7d08 SHA512 335d2a604aace50cde51329dea8eadaf122a2848eaa4bfda9c25d01a16a6f6f9bc8b9bc8e7a6c5214d25ae21b30532f8dd9ab81cddd518ac8683f689bc3c1fd2
 EBUILD scrot-1.2.ebuild 924 BLAKE2B a30af374991a9b4156459994848b73b4aff855fe5695c19178bc7ac9fabbe354d70a222759bb2a2fe3fb7642904e0ac4168c66c51cc9c31433a35587b6a6ad5b SHA512 22bf5c2003ec70b2d093e4835a1d512573497011a8dcf6d48182a855a97c942fcb2c8413e872d98905f8df5232214b93bc3bf5e7d3a3b249cea019886d9464b8
 EBUILD scrot-9999.ebuild 842 BLAKE2B fa29235b7684ab9a0e39e490676476086a6759b3e84cd5f2042e46ec43fcaf4f3c17d3ebd2e7ab8ca4b43d2adbfc3c825efefbfcfcaaeaeb1c64093055e46fd4 SHA512 0e18e163e831c4d1900de70297a286b65e85dbcdea1cd95ffad8975907d329cb71164d1335c312a3e4a625ead0de90085dd02e0564349256e779d5102dd90775
 MISC metadata.xml 327 BLAKE2B 44a3d3f80ed251d0864c6aabb7192146c942a2bab99a4e643189eb74445c52a92fc153e4f198b591e628697df09774a2576cf5678a58774295c881eda04e33ad SHA512 bed8805eb922c213b73629ec8c430a7825ec1451edcd332fffeaef9b855b71b9e57e490775fe462ef2234ad9b534a23f19a373f0f2131d84ff2f965b8a2ed25a
diff --git a/media-gfx/scrot/scrot-0.8_p13-r1.ebuild b/media-gfx/scrot/scrot-0.8_p13-r1.ebuild
index a14632141579..2b78c1ec5980 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sh sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/imlib2-1.0.3
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 385ca04e3f1f..dbe49f4d1e2b 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,5 +1,3 @@
-DIST shotwell-0.30.7.tar.xz 6455860 BLAKE2B 81da055e1092b9aed8c635e3e18e9c4bfa5820bb915c17cbb26942ce627179ed6b158c0785f54a2e15049150c3569035f58916483505449d55a2b3822276c44d SHA512 960574212d622c29d7617b874466e639d5a292eefdd2cac00ebcbf96d7db06002b9423440ee47ed84da7064d3eb70ba388b573a94c9e44c07d3b8f87faf09c58
 DIST shotwell-0.30.8.tar.xz 6460512 BLAKE2B aecdfa8d90bcce19c38a55872671f6521d8808fa46decba4e9910392f9f8907dd99aaecc825f4e3f6ae747ab151bf5bfa3a807364d571db0fc2ddcaad9a492f5 SHA512 dccd496a083145283c79250329f88fdfe526a98ce84b6d1c52a9c48c9e52a4749bdf2449f3102474c994ef1e687e06767b9bcda03ea97d1168d3417743a6e866
-EBUILD shotwell-0.30.7.ebuild 1761 BLAKE2B 8bc073102aab336f564897e677f905c3b578c05d29032e7bafcb7554ebdc8a0e9a8f570224f8d19755d68d94e849d104607421541dcba645139c4787d878a8c6 SHA512 935bcfdfe279afdf441302a5695933a1292cde952c328b9278cc55208a879af463fa411df2c413cb66aa187fafd7c35c6acdd1d1eceb961c347a20c5f102fcf0
-EBUILD shotwell-0.30.8.ebuild 1763 BLAKE2B e92e57a969c6b06d97470dc885304b220760fc49ef60203b6c6385e64807c669fb8f3bd13255422727c774da03934e5b15a44627251f22ca3b1d0d650bd23f2d SHA512 a4139279cfc013088c14109e0e78ada606e893350b5082b73a2854fce421fe4e7ffdfd0304f2d674708fe04be7b6a9b8f10b4d09cd3e5ff8cad60780bbde0553
+EBUILD shotwell-0.30.8.ebuild 1761 BLAKE2B 97634c1aa95c5e010f9fcbe4efeb69e1f67556d50cc16b085f3516b55302c4232643210c03ba12b5ee6611ce2759ed78035d2a0b50709163f2acba55ff0ba964 SHA512 9dfddd186bf38c2f7622f3903c371575c01496549b3c092a69fd8a35be2e9fe2dc51642bb0dfaf610ee94c50936e32f5a3ac155fd841fd72f4cb9eb54a75ac11
 MISC metadata.xml 915 BLAKE2B 7f83fe936f9a575c6dd12b014007cd97c5a8ada9aa5e55ddeaddefa4eb05d724a068c81d2f6f41c5b1bae01ed2c4326eb5eba5d4bdccf48619edeb43a8eaabfd SHA512 1b226f7fabfd7f5ee4d82b28ce2998273225319b055c01509cc5e493fdc037941c0edd0099df5dada00228fb225bf5e35d0035d3cd244890ad0cbd929b84d214
diff --git a/media-gfx/shotwell/shotwell-0.30.7.ebuild b/media-gfx/shotwell/shotwell-0.30.7.ebuild
deleted file mode 100644
index 5d15592ff559..000000000000
--- a/media-gfx/shotwell/shotwell-0.30.7.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="opencv udev"
-
-DEPEND="
-	>=x11-libs/gtk+-3.22.0:3
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/libgee-0.8.5:0.8
-	>=net-libs/webkit-gtk-2.4:4
-	>=dev-libs/json-glib-0.7.6
-	>=dev-libs/libxml2-2.6.32:2
-	x11-libs/gdk-pixbuf:2
-	>=dev-db/sqlite-3.5.9:3
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-libs/libgphoto2-2.5:=
-	udev? ( >=dev-libs/libgudev-145:= )
-	>=media-libs/gexiv2-0.10.4
-	>=media-libs/libraw-0.13.2:=
-	>=media-libs/libexif-0.6.16:=
-	dev-libs/libgdata
-	>=app-crypt/gcr-3:=[gtk]
-	x11-libs/cairo
-	opencv? ( >=media-libs/opencv-2.3.0:= )
-"
-RDEPEND="${DEPEND}
-	media-plugins/gst-plugins-gdkpixbuf:1.0
-	media-plugins/gst-plugins-meta:1.0
-"
-BDEPEND="
-	$(vala_depend)
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	net-libs/libsoup:2.4[vala]
-	media-libs/gexiv2[vala]
-	app-crypt/gcr[vala]
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dunity-support=false
-		# -Dpublishers # In 0.30.2 all get compiled in anyways, even if restricted list, affects only runtime support
-		-Dextra-plugins=true
-		#trace
-		#measure
-		-Ddupe-detection=true
-		$(meson_use udev)
-		-Dinstall-apport-hook=false
-		$(meson_use opencv face-detection)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/shotwell/shotwell-0.30.8.ebuild b/media-gfx/shotwell/shotwell-0.30.8.ebuild
index 95201b32b56f..9a4b0984d33c 100644
--- a/media-gfx/shotwell/shotwell-0.30.8.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.8.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="opencv udev"
 
 DEPEND="
diff --git a/media-gfx/svg2rlg/Manifest b/media-gfx/svg2rlg/Manifest
index 26ca42c2a1b8..2eacde524b35 100644
--- a/media-gfx/svg2rlg/Manifest
+++ b/media-gfx/svg2rlg/Manifest
@@ -2,5 +2,5 @@ AUX svg2rlg-issue-3.patch 507 BLAKE2B 801eb095c1e383a0e75c4f79e11e8063ae94290c99
 AUX svg2rlg-issue-6.patch 1221 BLAKE2B c7440b817c14851b20d5a33712029bc3430a59b1376e0b7ca52d9aeed6a7c8e2cbb07e0c91b1342182e03c0646e86ef7d730062fe5539c4440094d4644675c47 SHA512 500b929de726cb728ea10f295c7e15845046d0d3d70067c2ef54cca1466f456cb682797ddf99e0ae62ec68ba125183900763e82a2889f8941b507490a197ed88
 AUX svg2rlg-issue-7.patch 473 BLAKE2B 625268097edb59bc3c71ad3ff486d293dbbcfb0789c2bd73c5848c4e0aab4ec6ba2f9e5a28b23aa12f141f92e893d4e779b871e2d5fd05960cb263d05b5bcf8b SHA512 42be68efd3aedb00d1461dfa99de7aebf9477a531a491676cc189a7299e206650df9a9bd51d27c3a2cf6e761f8892c5b61577eed1b232f5109374df32329d3e4
 DIST svg2rlg-0.3.tar.gz 490908 BLAKE2B a3383326d1d503965f93ff3b7b9f144835d5c7ba1613b0bf215ce31cc968eee76c826a170f62a5c4f173c8326dbe4a9f47a9f6f1a1345d2ed9ffd5350077e2e9 SHA512 44efebe7d978a46ab26b4bc332ad08db9236a86b160d73fc1fdc2b54c44bb2604147ae458eea1fe81c579c7f94e39869459567a6b6b3a551d6db6132816c4723
-EBUILD svg2rlg-0.3.ebuild 813 BLAKE2B a5d3becc568025f810f0adf309c3267852d0c6a70838b9f97d7fe7c941c923db306707036cfd3fa745921647b49111ba5e8a961e383b014aa2d7015e65423ec0 SHA512 2acf12bcf15f8ff0afcc6bcb4c9d4dca6d0f866150b27e20e05e1cc762fbb2f4abfb9612de4d7a3be358ef63874ae3523f0963b67dee42cea69431799439eeb0
+EBUILD svg2rlg-0.3.ebuild 814 BLAKE2B 7b5f1f94ff80af1415271c5c7207d73f7f0781437bc9ed62e328f0ae3c10acca5e6eadf74da57ac94a37d17eaa41ed45e4dfffeb54174648f7bdf88941ea2683 SHA512 b63a5d954f90f890f4849143fb29982afdf048eb2b6ea1c20bdf1645c1c2b10ccbc7edcc83b089dc067f06026f1f284632b1b426a21331d5b9e22726acf33349
 MISC metadata.xml 363 BLAKE2B bab52a0cc6fbf81e6993b0ce74a89882a692bd008f0b193b3f30a665cbb8e6f6741f594bc6297a606c125bf2751c189142d500264e5d909b3715716c113b5ec9 SHA512 ab6cf1b5b4bb40fc26b110c6d34ea4d21e80c127549cb43cf262a43f771113494ef357c811d70523c07a3b9da0e3137a524364c997da4f3f25e9cddbdc125813
diff --git a/media-gfx/svg2rlg/svg2rlg-0.3.ebuild b/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
index 1f64cee52b86..5311c580e812 100644
--- a/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
+++ b/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest
index df667e3d275e..acea5755ad46 100644
--- a/media-gfx/sxiv/Manifest
+++ b/media-gfx/sxiv/Manifest
@@ -1,5 +1,7 @@
 AUX sxiv-25-makefile.patch 251 BLAKE2B 05b96799c7e94c2a907158becfbd3d0844a3919f75e7c4e6e8f994ec2881f173919c34625d80357882b28157f72ea6d0bbd6331473c6b213857c3e8a5db92bad SHA512 8e7b30bb73b87981b2d2c4e9bff8f62b5e59d341410dee0d4ecb889a0f39cfb38539a8d6ef2a738517ab5034c035e6588a4d2b7220bd408a2dd040f6cb8d7088
 DIST sxiv-25.tar.gz 48814 BLAKE2B 17ef2ff0e75acd6acce068dfc17dfbce78bb1a38b652e948b5f88902adcbae504e9322c92d125b71c511a95c7e8e47b58060ff58e2c804a7296b5a801d3fc0e8 SHA512 ca0d834c9982c5e98c0bae51d21b7d08692af2d692eeb2ac55e19c4da7d09b16bbaa8022af0a0d00c52def4120058d895f37a2f8b14f453a0ceb65eebe564814
+DIST sxiv-26.tar.gz 48569 BLAKE2B a73707e2fd699b53e38ddc48710a73b945d4e102743567283d7351c92c513e4e57a32c409267593a2c5808caf811b7caeb555f8ba2762f1cc76a421aceff0e95 SHA512 c4bd56ea14e520ea9b116e275009f2089e5c434d6894281215b09d07572b2d3190c3c3eca015a2933328d704afb7d443a66e858b4e6904a3d4d45378b35d22cb
 EBUILD sxiv-25.ebuild 1293 BLAKE2B 715b77644c20bae1c82681a17ad3dd2d2faa8944148c5df2bd1fe13394aa579fea2ca6d1e903d1512c010a3042e6314ab98a03c59dfdf9079a7413981b177eb6 SHA512 1a1c372246eba6f11fff1fd4821b2f9e20e2fbf45d222d05480c4761417302e05b427654b5ec632b92d4b4865e5749348985dae4c3e09725729bb45d92e2d9dc
-EBUILD sxiv-9999.ebuild 1248 BLAKE2B 7b9c1bd78dfcb12e2b7dec2082aa62878ce29e0cae3d16cec521bd2bb9b0485c8e8951f365a6dc06b594757f2e140546c95801c89f50bd4c2770e67daa012477 SHA512 b9f6bf26b454deec0b17eaf02d5010c3e7b802bad351f2b3bbf6222ac2ed612f5f5b76baeac8d097be07f0756a65879873512939bc4c68c55b9e5989fc98ffcc
+EBUILD sxiv-26.ebuild 1188 BLAKE2B 5d9e15fe964703bc0187ffe4ae1db7170aae5bef4b3dcb3eba40a8a8cfef66122a70164800933cae2a4786a48dd4c2e1faf15349d3564f0f549e8e9c7c58295b SHA512 4f0a3d095154a04902a5e6c4ae10e4b7b82816a0e713bd83ad9135ebf500de13b3449c4b9c3fa41f02fc77294683c12e5837e6acf8a9bd40e77368b06f909148
+EBUILD sxiv-9999.ebuild 1188 BLAKE2B 5d9e15fe964703bc0187ffe4ae1db7170aae5bef4b3dcb3eba40a8a8cfef66122a70164800933cae2a4786a48dd4c2e1faf15349d3564f0f549e8e9c7c58295b SHA512 4f0a3d095154a04902a5e6c4ae10e4b7b82816a0e713bd83ad9135ebf500de13b3449c4b9c3fa41f02fc77294683c12e5837e6acf8a9bd40e77368b06f909148
 MISC metadata.xml 347 BLAKE2B 0e614a8efac493e84e5b64dc4347616e6af23c5e95a84b29fe755ab73d2bec9527a3e7dfd39cb9d952df4571c2b6d6f3de10e949bd5356d9628f3761bc578a4f SHA512 9aca2dd50b12a3bc6a0175bf8fe1767990b519ba92f91eca79137383901119fb7002b0e31d817a287ec08595d32c0074d92aefb0b0ae14c8e4c0b6b366e28515
diff --git a/media-gfx/sxiv/sxiv-26.ebuild b/media-gfx/sxiv/sxiv-26.ebuild
new file mode 100644
index 000000000000..ff78c92751b8
--- /dev/null
+++ b/media-gfx/sxiv/sxiv-26.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg-utils savedconfig toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/muennich/sxiv.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/muennich/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Simple (or small or suckless) X Image Viewer"
+HOMEPAGE="https://github.com/muennich/sxiv/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="exif gif +jpeg +png"
+
+RDEPEND="
+	exif? ( media-libs/libexif )
+	gif? ( media-libs/giflib:0= )
+	media-libs/imlib2[X,gif?,jpeg?,png?]
+	x11-libs/libX11
+	x11-libs/libXft
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	restore_config config.h
+	default
+}
+
+src_compile() {
+	emake V=1 CC="$(tc-getCC)" HAVE_LIBEXIF=$(usex exif 1 0) HAVE_GIFLIB=$(usex gif 1 0)
+}
+
+src_install() {
+	emake DESTDIR="${ED}" PREFIX=/usr install
+	emake -C icon DESTDIR="${ED}" PREFIX=/usr install
+	dodoc README.md
+	domenu sxiv.desktop
+
+	save_config config.h
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/media-gfx/sxiv/sxiv-9999.ebuild b/media-gfx/sxiv/sxiv-9999.ebuild
index 348cf62e0e1a..ff78c92751b8 100644
--- a/media-gfx/sxiv/sxiv-9999.ebuild
+++ b/media-gfx/sxiv/sxiv-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop xdg-utils gnome2-utils savedconfig toolchain-funcs
+inherit desktop xdg-utils savedconfig toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/muennich/sxiv.git"
@@ -47,16 +47,12 @@ src_install() {
 	save_config config.h
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/media-gfx/termtosvg/Manifest b/media-gfx/termtosvg/Manifest
index 49cdfd1310ba..7fb7fdc8f6fd 100644
--- a/media-gfx/termtosvg/Manifest
+++ b/media-gfx/termtosvg/Manifest
@@ -1,5 +1,7 @@
 DIST termtosvg-0.7.0.tar.gz 276936 BLAKE2B 530bd3ef17aa19cbc23e46e7aea4716dda9369979ae97609ac6f976fecd4f75652b23f47ccf4da8035175f281d1a80b340acc714391882365c01764a92e4588b SHA512 085f6b9728cc641b058c8a060420e8221659a9447119d2c1211cfcd6452c63a187c5dc1e4f98fc7aca2018161ae49a9a71b2264108c5e06167eaaaf18f5aa291
 DIST termtosvg-0.8.0.tar.gz 211057 BLAKE2B db34f9b29a05576e8f2c4ac5f6ee606c61ac88d7a169e43e02655c54bc26fff7c8c37c7a7e96cdf84a015f8dfbe8c953c625f27aeda9ab0568751a0c24e84ae6 SHA512 7688abddff7d1d600a9c86364518418a1a2ad809c5bb0dca2920542af1c0c0c725a11f76b939ded5b671f5bc8f64bfa198b340465d74243983867689c1940bc5
+DIST termtosvg-1.1.0.tar.gz 385300 BLAKE2B 63750444014ab6451ef32d884f9ccc095b58171438f0b5326d5bcb77ebb87daf6f212cf0c07ef426859b9a50dbcc9e77325ab6901f2a6ff95f43cca26c948010 SHA512 4e5000d885b2ac4fc281d9f45c3be3d6b4c93ed604d2d929471843edc7e0ee78a8cc5ee28f92b51050d3f46d3302a2dcbbba3c9a2a3775eebe87d8171c1c6e8d
 EBUILD termtosvg-0.7.0.ebuild 649 BLAKE2B 7b6e6981bd5daaceb6eb86c39c3f10ba348bcd2d912eca0898c16fd80d6176a0e80d8b3aefefd00c26fa7f41ca77d70415257ae8cc0dd0af9e12d1499f9d04ad SHA512 fbcf06b1a18068e756ea46ec2505c90bce096748baf33e3fdc6e5050d30139a1d9b18f5cd4ac97c06d007d1a5a475ef60a85df6d3cbb06ec591453a60beba3b4
 EBUILD termtosvg-0.8.0.ebuild 649 BLAKE2B 7b6e6981bd5daaceb6eb86c39c3f10ba348bcd2d912eca0898c16fd80d6176a0e80d8b3aefefd00c26fa7f41ca77d70415257ae8cc0dd0af9e12d1499f9d04ad SHA512 fbcf06b1a18068e756ea46ec2505c90bce096748baf33e3fdc6e5050d30139a1d9b18f5cd4ac97c06d007d1a5a475ef60a85df6d3cbb06ec591453a60beba3b4
+EBUILD termtosvg-1.1.0.ebuild 568 BLAKE2B 9490105e7d632a25b53960bc38940ec4fc7500f7aadeac9750113a329325b710e55c45529e38f631f203994c88291ada0df74f09a075c8508af22c792acc894f SHA512 26090a0ee43f28abc54f38acf29063f6a15aa55b7f5f95e875414210a59e07cda4859987e268f377240f749bb5099d9bcd3e69fd2a125fef71f80ee04fb233dc
 MISC metadata.xml 212 BLAKE2B cc81de7077d569b2a0afc40390d2be47ddc84045da2c51b7a2e19fca5a5f28548ec0bbc2010b6936d5ab5c96442011ddd0833b7b594df2c2cf9abab99d99a3ed SHA512 1d2f2ca333bf8a1aba058691921bf03d664a0d4c213c4435a068893b2e50a6e86c01e07a17819600eaee93b72d9deff052fc12b10ee3ae8437e13eb17a40bc08
diff --git a/media-gfx/termtosvg/termtosvg-1.1.0.ebuild b/media-gfx/termtosvg/termtosvg-1.1.0.ebuild
new file mode 100644
index 000000000000..b98385c32d9a
--- /dev/null
+++ b/media-gfx/termtosvg/termtosvg-1.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Record terminal sessions as SVG animations"
+HOMEPAGE="https://github.com/nbedos/termtosvg"
+SRC_URI="https://github.com/nbedos/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	>=dev-python/pyte-0.8.0[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest
index fc17e60bef64..83dc35553593 100644
--- a/media-gfx/transfig/Manifest
+++ b/media-gfx/transfig/Manifest
@@ -1,5 +1,5 @@
 DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980
 DIST transfig-3.2.5e-gentoo-patchset.tar.bz2 21130 BLAKE2B 1c07bc7e85fdde29f5e9290bf3c0df75610a7c219f001920b7412d2c104fe1d8d5b2698d91cde1c08f57d4718547c2dffa0aa859bd53a295c55a285ca4f5fbb7 SHA512 4c6ca63159ae58c35c1a9c818bc3b29715a4015e6a11d283b4d0c57c0cfeccbf38160f61f3c91f9bc68f82a8b5676349bb98866f40f617bb95afd73267d00e97
 DIST transfig.3.2.5e.tar.gz 531256 BLAKE2B 830a97cb801b9cb284f7746a7f4a9645263cc34fd35d904288143d730331901302b12223ba135d8fa936f5ca0eeccacd194bbe2e74dfcfbf0cf4aede273ab507 SHA512 ed1379f1112514d90a4b3eecd3222baad311d804b5090e8e66867ec299e4f9a5f8d83ef8939aa6ecaa85a18143b8fb9b97f78e078ac5eeb934a158c55de6bb1e
-EBUILD transfig-3.2.5e.ebuild 2934 BLAKE2B e47dc2d05c406714dd5b6567bf11bd798aace725ff04fcdf9812456a3d2e1836e835b4d51dc72ce88e2fe157ebe17c25d5d13ae70252c4a35e1b3a9cb52b995c SHA512 82914a0ed62dca61e1a9869616dc107ac06cec302ff95d91428c5f5aedfd8a063f187e6cd5d8ba5e382b370cdeb43925613ce2edd854a014c78007e578f55e07
+EBUILD transfig-3.2.5e.ebuild 2935 BLAKE2B b99aafdf73b546f9038e8820ab8ebe07c37b58e045da040fc36aa68db7b489934cbc38831b6764800938715f4b2d61ab7c87ef7bd153e8276b7a1e507f1187ca SHA512 38572c6f9ee4091bb6d648c85bede7bd8d7046f9cdb8ebd802c048d7d144ab907ab8ec055f78bf1b25baa5324b0b13eb7a07b69bebd30c062241f9201c98b79f
 MISC metadata.xml 238 BLAKE2B 60ff9cbe893ace8f33a3d44ee85a5c73c9bd5553478173bf92c4aa93398ae1140ba28673eb6c7373ac48ede6679546b57ea08b8e676ce5c7a47792a2ba8b3148 SHA512 65918555949ddfef068a9a197dffda69aee483ac55c1b52dcf19376aecf1cb53d8a3fc0931d4ebdbe64ba3341e2a2567d56c2830eb31e6746735449c53a1203c
diff --git a/media-gfx/transfig/transfig-3.2.5e.ebuild b/media-gfx/transfig/transfig-3.2.5e.ebuild
index 268d2795797f..7e9dcc63d778 100644
--- a/media-gfx/transfig/transfig-3.2.5e.ebuild
+++ b/media-gfx/transfig/transfig-3.2.5e.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/mcj/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libXpm
diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest
index d893d9dea4ca..18c2237e8f41 100644
--- a/media-gfx/valentina/Manifest
+++ b/media-gfx/valentina/Manifest
@@ -2,5 +2,5 @@ AUX 5823.patch 1870 BLAKE2B 1a4edc390abd09010fb946035dab6f4ee9223eaa286f9843404d
 DIST valentina-0.6.1.zip 38326440 BLAKE2B 33d9163058b890254120bb0849972941f36526c71ed0acd8df82867a0116a35be4818c31c3ebb8a7322cf53bca4f9e77b2de10ea0df51c46b764f8f9e7abb8d2 SHA512 6511194c734a1b6cd8a1ed489213c288e90bd653dbd8373c4ee13be78e2ae4fe00a35e19a5ee074e868319ab1a13eb8baea35dedb7242b3888d03aa4b4dc69ce
 DIST valentina-5858.patch.bz2 4507 BLAKE2B 10bf1e48b9c822b5fecd040edea05a9fa16bc84d6d8a872a50329bd6b61ae250b489fbf71b19f0453ab5caea0bd7dc821d8c6fbe0fc24a6306d57ce5b34350f9 SHA512 037d2a5305d85d7d6be90c181ee6c39110a86c5f5d77c22453a2933e7d6a43c600f6ffb393015e98f9aab55b0d11291dca482352e1fc74f485578b65b3b84720
 EBUILD valentina-0.6.1-r1.ebuild 2138 BLAKE2B f78ad7ccba1ffbd3cdc8cc9b37f3224597f14edc85443fd7c6e8fb9de4fb8f6561090d6fb2f3784c6ecc351185429f83d7a4c0a4f8bffa1e87d60be26803ed8b SHA512 bb23ed75cda257f20eb5d2dda863095c8b03d8aa7f9932e7bbfa980b29c00f2448606f256f9844df32b6a5f6bd13a2eac7c740ead149950b709162e073c8e102
-EBUILD valentina-9999.ebuild 1914 BLAKE2B 572d8697a238d99cf7a8d6af1c0a7cb730ae380c3eefe20e5bbcb95806ee2894e164289f2a6aaf7e72920ee75388e8e73c733806e71cd0fa2ab50005279398c2 SHA512 d873120eaef5713db1f81666b19c8da3dc14e75d160e3b4ec8f2be43095310d8ead5df2de976aa1503b966b4e4606054f64df2d576085dc7558c36acd1e3e689
+EBUILD valentina-9999.ebuild 1922 BLAKE2B 57a28e28e6ab7cefccc216d03365bc4b41dadaea31bdcdc3a198b8122aef3848d209e68219dec0f806303e27027675eff522be11b6d4716d822efe70ee5d1e6f SHA512 b89d500a486d5d9109806fd38bc6a38eb02036b6ff4c4e69cba30b0df6f5a7516d9f2a0187bf77d48f5ff0b3a99327b6c65c25b0575b34502a4695c00c111053
 MISC metadata.xml 334 BLAKE2B 7f146a505a30d4461165308b40383e2b78998411874c8af6113c3040142003868f397872ecd22b9b8f3ec6193c532fa934c8646ee04e8c49157464b58035de09 SHA512 d1264aa0d26ba75466c5572c37ca6fd384d4e6db392aca0e47d4b1d0bd3ef7e035fed51c460af1bb258c500d1cc9211ec2e85db3e3aa158d378fb1389a3ebf03
diff --git a/media-gfx/valentina/valentina-9999.ebuild b/media-gfx/valentina/valentina-9999.ebuild
index c5691f998ce1..bd9274174887 100644
--- a/media-gfx/valentina/valentina-9999.ebuild
+++ b/media-gfx/valentina/valentina-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit mercurial qmake-utils gnome2-utils xdg
+inherit qmake-utils gnome2-utils xdg git-r3
 
 DESCRIPTION="Cloth patternmaking software"
-HOMEPAGE="https://valentinaproject.bitbucket.io/"
-EHG_REPO_URI="https://bitbucket.org/dismine/valentina"
-EHG_REVISION="develop"
+HOMEPAGE="https://gitlab.com/smart-pattern/valentina"
+EGIT_REPO_URI="https://gitlab.com/smart-pattern/valentina.git"
+EGIT_BRANCH="develop"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest
index 0e5e6557f1eb..c8c0ddf38f80 100644
--- a/media-gfx/xfig/Manifest
+++ b/media-gfx/xfig/Manifest
@@ -2,5 +2,5 @@ AUX xfig-3.2.6a-app-defaults.patch 502 BLAKE2B e7277af104c8fd9ed652e2ec6b1753761
 AUX xfig-3.2.6a-solaris.patch 523 BLAKE2B eeae0cc11ae6e3fd6e8c157648d8663131d0d11b020f5e64ec1a324f05ee5bd08be8c111c1ebe34065256d64d103619f61ff3f5524aa7636eb8f76e9aa64a714 SHA512 b2eb546b8fdd0d18bab3d9a2c183149fdb4fb278d5e2d8234f040c4fef727bec7461f861391027dea32028b822aa2e540824cb18af09769f32c7a1fb7bf48319
 AUX xfig-3.2.6a-urwfonts.patch 4933 BLAKE2B eb1edf6b30966864dbdf3e932f2cde231ff5777cdc0dff34cf047a169335ba78e493b10817e39aac72221d17d491138c3c28a3b293582d3808255140d5df6762 SHA512 29fea111b6c07f6ea28bc46259c0dc8d20b1bbf86e33d550037744b93d4f4de7ec9c4ea7fa14c5f91a4278848216d183ac841970c798140359e1fc317baac468
 DIST xfig-full-3.2.6a.tar.xz 5502944 BLAKE2B 3a83feeb5647ffa9586b9ce40116e9854a423c0cc90265ad78b27c0c82a15bbda9d9734475aba13f442c259cd0489a667242f319ac758ddbfea1a5b268e12550 SHA512 82e292e050213b6d22be5e174224308b446505e25208f29d4f4c5e760a87ff4104b9dcea0a332241c9bca358e1d44336bb38c316eb3f28130d7c8828c10a805f
-EBUILD xfig-3.2.6a-r1.ebuild 1169 BLAKE2B 20645bb76b9368fdd233a1ed1ae0e4e203aa9c5e158be1b56dd30c03daf1d81ec7ebdc33fdb25f0b95263759253bd072e7aff55c2454471e33156251d70b1cc4 SHA512 3ff5e96b91d7e7964b1613b4fdd3e78a17e36f60d7468433a9efdb7b9d7c8c2bb9d4c3832d663362f273c5f5dc4eec5539e06b60ffc8f95ff402e05bf937b02c
+EBUILD xfig-3.2.6a-r1.ebuild 1170 BLAKE2B 6650a07387146c64c767dbfed06920fc19c015e9ca782db73e47ed80d675e265ae79d2d86dc1a30eb6992a0688cfb94096bcaf156b5252c74336baca46c7efec SHA512 4fa2696a017d98dc4b1217d8c19514fb7dcd0828b48ab17ea326ee19d67c91ecc04c14d17165cceb51c9f903ed5dfe6af2e78879fe3c18096a156bda48478506
 MISC metadata.xml 238 BLAKE2B 60ff9cbe893ace8f33a3d44ee85a5c73c9bd5553478173bf92c4aa93398ae1140ba28673eb6c7373ac48ede6679546b57ea08b8e676ce5c7a47792a2ba8b3148 SHA512 65918555949ddfef068a9a197dffda69aee483ac55c1b52dcf19376aecf1cb53d8a3fc0931d4ebdbe64ba3341e2a2567d56c2830eb31e6746735449c53a1203c
diff --git a/media-gfx/xfig/xfig-3.2.6a-r1.ebuild b/media-gfx/xfig/xfig-3.2.6a-r1.ebuild
index d68fd060b615..966b2c0e6ae4 100644
--- a/media-gfx/xfig/xfig-3.2.6a-r1.ebuild
+++ b/media-gfx/xfig/xfig-3.2.6a-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mcj/${PN}-full-${PV}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="jpeg nls postscript"
 
 RDEPEND="
diff --git a/media-gfx/xli/Manifest b/media-gfx/xli/Manifest
index d6df8409ea5e..7d229527c9bc 100644
--- a/media-gfx/xli/Manifest
+++ b/media-gfx/xli/Manifest
@@ -3,5 +3,5 @@ AUX xli-1.17.0-fix-scale-zoom.patch 1942 BLAKE2B fefbcbec8d9dba30fc1435fc998e371
 AUX xli-1.17.0-libpng14.patch 241 BLAKE2B c4894ae4a5b879d8ac961d064da80d1518d0ed9a47946c21f9a701b89361e94f0d4d2b05926f6c14be4a558707601e84352bb689847a1f01d83cae6eb25c9d02 SHA512 e5a2de3525198d323ae6c89ab9b0455559761cd4f6b86b719934bc77e31582cd557090766875d97512cb60a42e88653f5dc204dffa9ae1370695c73bfc2231b1
 AUX xli-security-gentoo.diff 6940 BLAKE2B 907fd85a2b248083380ae2210665dd9c251a7d528a93b1e2dffd149827f4900cab54b84b8a0be67c198a73d180cf31f4c8cdd7c4a37a3a8c5b30718babd5b1bf SHA512 b992219eb4b89bfee57429afbf67be6d6a04051b50de6e814c84c1adb209494d2faff15a228b43a992530fbeac83f15a94e9c1988982f98eabf287c26716671e
 DIST xli-2005-02-27.tar.gz 201011 BLAKE2B c16f40368a7c55cb7d31777662e4e9c1515232904df4f6f0e7fdc4daf44fdafaa0a3d9d8298493dac9352fa10eaf5d2984f9e66832ca0bfd07d9e6d551f4dca5 SHA512 132b28396ebf3832dc35ff5fa7c102539ef30a194512fe6577ce1432bb84ecd7b4368e75eaf59f26a806900f63e1bfb9a93487ce1ebe3cfef2199256a783ccf7
-EBUILD xli-1.17.0-r5.ebuild 1940 BLAKE2B 539399e6b68c4f2276d4fdfec33fd4b8b498dd827d7e845c9289ae38f0f02680a22e51b721332692d2b2d8dd12bcdbac035a79059847c829f9e4d013010b9f6d SHA512 0b057dde5cb1e77023c59d90fd6279c01375c6953909d7a1b98586c09426bf78099d57ddde47ead9ddec3507988ebbe8ccc36609eec2519cf6bad2db349849fe
+EBUILD xli-1.17.0-r5.ebuild 1941 BLAKE2B 896578dbe61887f2e40508ca0bbd8986bcb117ab50d655168bdf9cb29e0a33c4aef1373e5d72c1c47fb62d40fa8166fc7b1cd985c583a2909199534a3801de55 SHA512 aecab753b6982f704e47fcddfffee8a59c1fd6475343df7e635528b7853c8373de4149ad07095dacaf90919a8fe215af94429e00196d4aa14429968c9c22be9b
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/xli/xli-1.17.0-r5.ebuild b/media-gfx/xli/xli-1.17.0-r5.ebuild
index fecafa404d77..d153dd215fc0 100644
--- a/media-gfx/xli/xli-1.17.0-r5.ebuild
+++ b/media-gfx/xli/xli-1.17.0-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://pantransit.reptiles.org/prog/xli/xli-${SNAPSHOT}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 RDEPEND="app-arch/bzip2
 	>=media-libs/libpng-1.0.5
diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest
index ee2c432606bd..870f69542a59 100644
--- a/media-gfx/xloadimage/Manifest
+++ b/media-gfx/xloadimage/Manifest
@@ -8,5 +8,5 @@ AUX xloadimage-4.1-zio-shell-meta-char.diff 1372 BLAKE2B 1c960ba7ae4da62eedcdfc2
 AUX xloadimage-gentoo.patch 8956 BLAKE2B 9834cb47e16fb20f970e9d33a6e42fef09d5a3d3cae3f5ab0db5c76661acb7c67a20115f4069bc2769b6d9f54acf4adea27e27b79495d74a77644db5281beba8 SHA512 8eba3107d81f0dc6caf749e9a9889f1662e5d1004e480a9a170533f3ee00c6f9f11d3c2008655322242ab61f31b676406fd44b97d83e4ce93b8f68a12397830b
 DIST xloadimage-4.1-gentoo-r1.diff.bz2 41535 BLAKE2B 77cdbb2e6d5dda6084aae2831bcb8750a027f59a673f5a1f8eeb61385bd21243d640bd13a3be7fb24d2ce2cb475a05cb04c91c2b53977c61fb3aa4416e67e112 SHA512 a1a52d576eb68c44e5ff3b68a6bd87cd9b8f21f6fa8edee2d7df2329002d40f6513df6c04ecd57f66018583d0251019bd02e15756dac705b8c9cb8470cb386e3
 DIST xloadimage.4.1.tar.gz 596021 BLAKE2B 3c22facf05167d1836c21243799d8f66c211e44d659b4397668ed604cdd82b3bd8f11ab7b3be5e87c59a9b3aa8569d0d3d2e474b572c3bca07b6437b293014bf SHA512 2c91699c8ef07c101ff9b458708ace01cab2979a5e88cf8a4e47ec971f7b4cb5571108afa3e53271ade4e8ccfdcf72ef9e2e09edfc0be6b8afaba50847aa0586
-EBUILD xloadimage-4.1-r12.ebuild 2505 BLAKE2B c97aea4b87d8b9dd4eec3f73fc42d5fb5cf23e0da705661b5d635fbd38721065d7425ac8bc78bc4d2c0acb5e8e8d186cdafbb703b94557715cdbca6ee754acd7 SHA512 6fcd3145050f6f5948725f5a34e394829caca68ab4da59439978da208e6a55cdc732480217d7d641485f6751b301e2261a21b6872659ab741fdcdc3588e7b9aa
+EBUILD xloadimage-4.1-r12.ebuild 2506 BLAKE2B 32a0b1fdb8cc2d36074e7bc6c7b24a205be29bb5b0aa1584153b0837cebe21acadd726c32cb604ec6283ba7f3c6ea06ee23faa758da7feead1ec7e21606f1ee4 SHA512 5087541ae281a963ed730cfbd37043a989612ba80a5354feced496a3b8b86e5154bf779ff1f099986d4fc73a688879db99a5088a4c17fb8445576faeaa4205b6
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
index 89c8ad348394..ffa69a2a5c03 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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="tiff jpeg png"
 
 RDEPEND="x11-libs/libX11
diff --git a/media-gfx/xsane/Manifest b/media-gfx/xsane/Manifest
index 78ebcef8676c..41255621d128 100644
--- a/media-gfx/xsane/Manifest
+++ b/media-gfx/xsane/Manifest
@@ -2,5 +2,5 @@ AUX xsane-0.999-lcms2.patch 11790 BLAKE2B 0fd549512d56635e9a41620ba097d4db8f103b
 DIST xsane-0.998-patches-2.tar.xz 54804 BLAKE2B d5eb339f5d5d9eb61d213ca37e31e8b36df03f271f86a0c5f924286b39c9d2f47416512243ff3ad07e2f9d0ac4e3f0a73346ced1ce74ac17dbb0c9aaf6ae3c89 SHA512 973ccac2fe3b6089049c1c5ba3e4cb0db29fdc79de372f8a7b461ee108e5bfc3f4a84997552fc3d3b651bbe9f98d247a5974d90e8949089b2ea52118eab6ad1f
 DIST xsane-0.999.tar.gz 2950621 BLAKE2B a8490981b7da497934f0334874fb65d2d3f2a7d9153825544672a39780bd8c4bfabee6bda134bd7b37b07947d1f01f283fb7242552b0e6342cab5a70484a5488 SHA512 73ec961fce1a86b5d6f5bac0995d222785eb4b077dc8e72492b092d2bf4500455426e80e4d27233721cd38ec84f77fb9f92190a6afe45bdaf7ffd1ee50b431ed
 DIST xsane-256x256.png 18478 BLAKE2B 5661d68fab2c5f7219f0de9e2c2c811ef5fba6f5472e85d98f6f3a10bb058c1d26597d15c2aa8ab59c52060a62b571aafc2daafcef4bb8edd0445cf875ec0ca3 SHA512 7bd63a701a4776b395689799ad98b7619917a9b40367c980bebaa116e6c5c2bfeffb8b996a8295b07f3483aa689c9040d8a68bb21376af65b1c0e8f69294f2e5
-EBUILD xsane-0.999-r2.ebuild 2208 BLAKE2B 663433e738fdb5445010cf840c6867ca4dced99206f65ad02af5764333a5dbcbe6ee2936554ab36aff166bf7593bf037f96068be60bcaea7d8dee5ab200d4998 SHA512 c0ac54f725188f25d0f6792a15c89084ccc252843f2a83c59e05eacbbe47a215022ce3e5bc3ca78b5b57873307f01592b4cced510c387e6001122d64a8592ed9
+EBUILD xsane-0.999-r2.ebuild 2209 BLAKE2B 3d2486694c28003b228d2d101e948e4203b040728a6b3e850ff97b6813ffa8c540b2964d9fc170e7164f2ad8ef963494362f3fa7f858f6626bd86f2e8916b3e5 SHA512 aa5ee7d5223203f811d3cdfeab93268f9c5871d467e5e1dc052450a4d34a3480c96c19ee09adb245a85c21dbd413195f4b946f3de6110eb11e45120cf12ddcf0
 MISC metadata.xml 500 BLAKE2B 9eec3d7fa81661bc2035035649e602539db5c45451576a452562a9980811424e93999d34cdb64a0eb8fabf7c4408bc47d402654abb53d26b0e4779c8c501b318 SHA512 1f304a2fd92fe512a70e104c02fb72c9518e4f9e6eed795aa6462eb06a26f314673b9964b8c576a07f11e64eea0031ad607070bc1c167d5058d5ef34f867e383
diff --git a/media-gfx/xsane/xsane-0.999-r2.ebuild b/media-gfx/xsane/xsane-0.999-r2.ebuild
index c45649a3a835..b49b303796f0 100644
--- a/media-gfx/xsane/xsane-0.999-r2.ebuild
+++ b/media-gfx/xsane/xsane-0.999-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="nls jpeg png tiff gimp lcms ocr"
 
 RDEPEND="
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index 77bb6fc49049..41ec1e7e05f3 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -8,5 +8,5 @@ AUX xv-3.10a-wformat-security.patch 519 BLAKE2B 7b0ba8ee6dc33af787040e72fdfd4cf1
 DIST xv-3.10a-jumbo-patches-20070520.tar.gz 1363802 BLAKE2B 1a9f77b950dfa817aa861d9b2b6898d6e378b4a61a57c746a8822793a8e11e54165faf859e073ef99c9fbea5aa0c4c8caa4608ef03f553003b779a4bf59c3ab6 SHA512 e2ac5a3b4d743bf142c162b00815dd9d8dcaf345d0649016b2c6441fe2329879471b19453808e677c1a0b8eeb3468295dba160b1f30eacb2a7a9d8524ce03e75
 DIST xv-3.10a.png.bz2 3082 BLAKE2B 05f56053fc0a77bba155db306ae181f5404bced3b2c22a33b3a0a0750b84461ffec98934d3dbabd764fbb6ec95ce2851f4cf3959682a315fe6e6653cbaaa5ae4 SHA512 41e81c34e74a034292c2a8f525d1452614a2b42e980a1a2c93e3fcf990db528853d633496815e5fb2c897a780a2da171af590f436e2c7ef181eea00eb6922e9b
 DIST xv-3.10a.tar.gz 2259124 BLAKE2B 42cea578a879c819be8f42ffb1d247643904d8b462a4d6faa208185e49566798605c89006cbc190725fa6356b87da3375cf04d2ba86b559419cf8f7471c867e5 SHA512 5b8c5890503e2796638921cabae8967e458c73e332acea8561b1025ed13c771bc44c0e309b4592852e33726eeaa9784f933d1312073b0ba2e0b8c0cedabcaa3f
-EBUILD xv-3.10a-r19.ebuild 2434 BLAKE2B cce0e3c145bb9f3fa07837d156b2aa0d3760e24700b77dea1ee4bb68f585fdc1fa729ff189371e8148a5ad6b4c7894d550eefb3453caa40d53c92fe997eedc0e SHA512 6a835d1d99705524e589779819bb340bcea73df699263d3b1a5d98608f23ec701cfb3a7441fa7e17f6d21bd5e0ef1e6811d80138095886bc4275d6597b716b27
+EBUILD xv-3.10a-r19.ebuild 2435 BLAKE2B 7992a0e09a88e9e00d7d206508b537c4df3b48b7d1baa00d1ebc75bdae5c9d11801420f64030b5d9e099a39734566cf0b05f43b2cc95fa3bb397fbc830c9da3d SHA512 5a85bdfa54a0e6adb1f7d385b23e6d5f5e053a1f4bcdd2d758ea2613d5bc031e26f189439612c683c8980f22389c40599fc504af77273a013c78f014d6c8e0c5
 MISC metadata.xml 249 BLAKE2B a10cceeac3a30f80ec870c8976e45bd2e0326e472b03cdfbe85b639f95dc7cdc8f372e5efafa5c9c8e679e77a24d5507f3a8f0dc97f2207252e280b3bb936662 SHA512 2250a3bff9eebe0962c70d89aed4f7e95dd3d33b5c3171f02bcf99d972d5242ec04b25d73b3ffd99ce96a641cf8eb78befb41941a352f4ff754702712b4e937d
diff --git a/media-gfx/xv/xv-3.10a-r19.ebuild b/media-gfx/xv/xv-3.10a-r19.ebuild
index 2ce5b1529cd4..2970c8c06095 100644
--- a/media-gfx/xv/xv-3.10a-r19.ebuild
+++ b/media-gfx/xv/xv-3.10a-r19.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.gz
 
 LICENSE="xv"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="jpeg tiff png"
 
 DEPEND="x11-libs/libXt
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 3357e331ab7c..4a2661a3858d 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,5 +1,12 @@
 AUX zbar-0.10-errors.patch 178 BLAKE2B 588e8d227bf8d7f47346dcc4a9c99ad5b372af5e2788dca09e490473f50b712945b91be16b2a64f99c48019961ce3f9b766e19c22bafee6d6b4ec8f8e3814239 SHA512 0978f9d52bed844448c5a92349806134e4b03bf069307fad2f3944b92b6f1c8dda094574ae4829860263d735ba7d20e71d435308185503634f9e46897479c7f1
 AUX zbar-0.10_p20121015-ImageMagick-7.patch 1135 BLAKE2B 103cfe85d547cd3087a08676abdfd5966b9b4dd32de4c35e1aee144247af8562e6425d65d170fcb98bcb43e0bc18dcd39d4cf3baf46eea4a1c81814a14946bb0 SHA512 c67dee821338d0bbb54b3c4b22a75616e876ad56e5bbcaad856fe16b39ef3e07b7b80dcb6c25023857ebd561c55ac4faab144fa4ead05424df24d5af7c2509dc
+AUX zbar-0.23_create_correct_pkconfig_file_for_zbar-qt5.patch 2109 BLAKE2B 8e32a3d0115fe7dc31a8208021659827f959bebbd1a56972765a379e03c7aca704c394d7eecb928f3547b9b42afff6cdaa1e564875bb6a94ac0cdb9a55422fe1 SHA512 dfbbe1caf384dc769d97ecebaf544b81c1fa266c78ca4fa8087673724b3408fe2e77535b60aefe904aa42dd1ed1182676623f98aed565910566c511908b8ecee
+AUX zbar-0.23_fix_Qt5X11Extras_detect.patch 643 BLAKE2B 27485c866503189670424eaf81a0a9b6aefa284576789ba6533af03cb1af59a2c531f22e09adcc8e2b9b6418f861f8b96a1bf602502d0e863ae9785ac2d336c7 SHA512 ee40586c64ded170e314ee2961588518234e22d9cee9e9a55f994231cd50b120e82225c551c5a2e85988de1c14a5c0baf6303fffea0663e2e4808df3a0c8421a
+AUX zbar-0.23_fix_detection_of_errors_in_the_v4l_read.patch 1122 BLAKE2B e4330ca4ce75a4659466faa618a99280ad7868aa21d1fe30db837917460cb9fc3594421cb2cb70457813611764c7e976e5ba9acc414be5fa95808f91d995eb0b SHA512 c6d6b3bf93f59f87687e03294742ec7a4803308d7395869d8cccefdb186c69ad429c631f2f4d0c4de0a2dd495f3b99342622d01acb1e823ceb9250380549ca20
+AUX zbar-0.23_fix_python_detect.patch 351 BLAKE2B d5261e9adb3c9b43f1208a41a655718b952d06ce0ec003bb08bf30979d6c467b2b50e6fb9a6cd06f95230ed4ae55e14599c276f9f41f03677b4d18167c6665c4 SHA512 d24d75f840d84488986cede3378e067ac68d218acac34a8c34888c88611df8f4b1b397cfd5ecfcda82480fd56ea2bada29d8373cc6e93ae8050b84e801c36ca7
+AUX zbar-0.23_reset_conversion_descriptor_after_close.patch 829 BLAKE2B b39c63a1aa11a79123226ebf91ba0b4d047412b96b12d8ed591e85625c96e3de1fcfd0624b622c4f59c98d4e4e3483c74d6699ae2579a18352d12698b3b0f430 SHA512 c641b83c81c07e850a17672a8ad5a16ab650330ccffcba98d209ed105058cc66664aff76d391803503b6d784daaf2b31d9faad2aa9dd69221598b13187e27dd1
 DIST zbar-0.20.1.tar.gz 555199 BLAKE2B f224a2207fa0603da4cc3a0e1d05bc73f3cf0cc9d13c26b3b801d3418f4f6a001b52e468b721552af61f4c8d7357934abd0560c24d3b233107785c69cfe14753 SHA512 21ad9d8fcdecb41bd4b8979366ab8ec6e8eac815f52270b0dc72ce6a126ccef933d048ce8bbe28f46ada5defadf85ba8c97c5c1870c9560a9dab28c585dfaf42
+DIST zbar-0.23.tar.gz 1301948 BLAKE2B dd74ce44bcb10f8a7cf180b982e5bd82f1f5674540931377d207ab730bb2d080fe222bfc42d4a3d70895ad53b78638e73c2294018b80d30dc28f7e6ecc14c761 SHA512 9737f9dca42c29f92aa1eca5c0808da34f1d16c88c65241c9e3984c487e502f398437e7a707a1edd2c440f784db537ba33ea4008a2d1c1caaf5eea6431b1400b
 EBUILD zbar-0.20.1-r1.ebuild 3750 BLAKE2B 259754767901ad0b09db83d38a5ebf7130c5beea96e36a39d2ec30905347f287eff29f558678427d95676c45943c59230f703e3fa8af8fac36d52647d2474586 SHA512 21555d40bd966c9de37cc69fca082cc9bb9cc70733f9b2c4313b6cd52a31bd33dbad8bce4de5b0c820cd8ea22ce36cd4954ee80aa64962385abd1d91f5b321f8
-MISC metadata.xml 353 BLAKE2B 7b2ecbdb282d7be372b33efc762ff91d574edf1f176e65c300a2a1cdab0d9c86a12be1d4c49f48a684237eb265ee7491ef9bebbfd62a6005246031f7271b7e32 SHA512 8547b611ca96a01ec0d6dcd01c61203984af10306223a77071fe9be348d1ca7ceb290c4160ca9eb8ebc04227caa9b9f5bf3d3d436b97f140fc534fbd3236826c
+EBUILD zbar-0.23.ebuild 4994 BLAKE2B 439b61a455f9d12ebf7c4b900f25397d8eea50d26ccbf4750439c857be80ac1fd3024ba4061016314030b9c1e9713f0bebdea10888b1ed02c45a1c44b228795e SHA512 c57cc6cdbec6f0130e49aa5a8051738c9829fa7f92e5f7b8396ee39f667169377fa112e18c22da7205075dd7ac72504d6babb4572564e21440cc1ec09c6a85f8
+MISC metadata.xml 931 BLAKE2B a8c611d728a6fd0dbc94f333681a5a0ec4fc2bd8529cca7dcebfa8e1774c1d5e069c870baffd29fa033ce0529d2c2cb2ee3a1a54c089b1fd988b0d2c1ce82aae SHA512 c42caef53bc9c8743f8f02f5c96f687b605248a4311efea44777781a85a4b5a31e586cbdd7d85b07a6b2aca8138f5c7238b1f35a37b13741a297e9751731da19
diff --git a/media-gfx/zbar/files/zbar-0.23_create_correct_pkconfig_file_for_zbar-qt5.patch b/media-gfx/zbar/files/zbar-0.23_create_correct_pkconfig_file_for_zbar-qt5.patch
new file mode 100644
index 000000000000..3be9c2222776
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.23_create_correct_pkconfig_file_for_zbar-qt5.patch
@@ -0,0 +1,71 @@
+From cac1fffce80f0835e4d8d234023a775b4243b916 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
+Date: Sun, 20 Oct 2019 01:44:02 +0200
+Subject: [PATCH] Create correct pkconfig file for zbar-qt5
+
+Although zbar supports Qt5, the created pkgconfig file always requested
+the Qt(4) components.
+
+Fixes issue #62.
+---
+ configure.ac   | 13 ++++++++++---
+ zbar-qt5.pc.in | 12 ++++++++++++
+ 2 files changed, 22 insertions(+), 3 deletions(-)
+ create mode 100644 zbar-qt5.pc.in
+
+diff --git a/configure.ac b/configure.ac
+index 935110a..49ef6a8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -659,15 +659,23 @@ AS_IF([test "x$with_qt" != "xno"],
+      CPPFLAGS="$CPPFLAGS $QT_CPPFLAGS"
+ dnl -fPIC has no effect on Windows and breaks windres
+      AS_IF([test "x$win32" = "xno"], [CPPFLAGS="$CPPFLAGS -fPIC"])
+-     AC_MSG_NOTICE([using Qt version $QT_VERSION])],
++     AC_MSG_NOTICE([using Qt version $QT_VERSION])
++     qt_pkgconfig_file="zbar-qt5.pc"
++     ],
+ 
+     [MOC=`$PKG_CONFIG QtGui --variable=moc_location`
+      AC_MSG_NOTICE([using moc from $MOC])
+      QT_VERSION=`$PKG_CONFIG QtGui --modversion`
+-     AC_MSG_NOTICE([using Qt version $QT_VERSION])]))
++     AC_MSG_NOTICE([using Qt version $QT_VERSION])
++     qt_pkgconfig_file="zbar-qt.pc"
++     ]))
+ 
+ AM_CONDITIONAL([HAVE_QT], [test "x$with_qt" = "xyes"])
+ 
++AM_COND_IF([HAVE_QT],
++     [AC_CONFIG_FILES([zbar-qt.pc:"${qt_pkgconfig_file}.in"])]
++)
++
+ dnl Java
+ have_java="maybe"
+ 
+@@ -820,7 +828,6 @@ java/Makefile
+ zbar/Makefile
+ zbar.pc
+ zbar-gtk.pc
+-zbar-qt.pc
+ doc/doxygen.conf])
+ 
+ AC_CONFIG_FILES([test/test_examples.sh],[chmod 755 test/test_examples.sh])
+diff --git a/zbar-qt5.pc.in b/zbar-qt5.pc.in
+new file mode 100644
+index 0000000..3378993
+--- /dev/null
++++ b/zbar-qt5.pc.in
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: zbar-qt
++Description: bar code scanning and decoding Qt5 widget
++URL: http://zbar.sourceforge.net
++Version: @VERSION@
++Requires: zbar, Qt5Core >= 5, Qt5Gui >= 5
++Libs: -L${libdir} -lzbarqt
++Cflags: -I${includedir}
diff --git a/media-gfx/zbar/files/zbar-0.23_fix_Qt5X11Extras_detect.patch b/media-gfx/zbar/files/zbar-0.23_fix_Qt5X11Extras_detect.patch
new file mode 100644
index 000000000000..7692db41e0da
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.23_fix_Qt5X11Extras_detect.patch
@@ -0,0 +1,18 @@
+diff -ur a/configure.ac b/configure.ac
+--- a/configure.ac	2019-05-23 23:37:12.000000000 +0300
++++ b/configure.ac	2020-01-22 12:27:14.190755156 +0300
+@@ -638,13 +638,9 @@
+ 
+ AC_ARG_VAR([MOC], [full path to Qt moc program])
+ 
+-AS_IF([test "x$have_x" = "xyes"],
+-      [qt_extra="Qt5X11Extras >= 5.0"],
+-      [qt_extra=""])
+-
+ AS_IF([test "x$with_qt" != "xno"],
+       [PKG_CHECK_MODULES([QT],
+-		         [Qt5Core >= 5 Qt5Gui >= 5 Qt5Widgets >= 5.0 $qt_extra],,
++		         [Qt5Core >= 5 Qt5Gui >= 5 Qt5Widgets >= 5.0 Qt5X11Extras >= 5.0],,
+ 		         [with_qt5 = "no"
+ 		          PKG_CHECK_MODULES([QT],
+ 					    [QtCore >= 4 QtGui >= 4],,
diff --git a/media-gfx/zbar/files/zbar-0.23_fix_detection_of_errors_in_the_v4l_read.patch b/media-gfx/zbar/files/zbar-0.23_fix_detection_of_errors_in_the_v4l_read.patch
new file mode 100644
index 000000000000..8484e31b7375
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.23_fix_detection_of_errors_in_the_v4l_read.patch
@@ -0,0 +1,29 @@
+From 52a4fa5242af5da770b3cab1713f87e8d899e7ed Mon Sep 17 00:00:00 2001
+From: Dan Fandrich <dan@coneharvesters.com>
+Date: Fri, 27 Dec 2019 18:33:17 +0100
+Subject: [PATCH] Fix detection of errors in the v4l read.
+
+The return type must be signed in order to detect a read failure. Also,
+display an error message after such a failure.
+---
+ zbar/video/v4l2.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
+index daed38b..c0398ea 100644
+--- a/zbar/video/v4l2.c
++++ b/zbar/video/v4l2.c
+@@ -133,9 +133,11 @@ static zbar_image_t *v4l2_dq (zbar_video_t *vdo)
+             return(NULL);
+ 
+         /* FIXME should read entire image */
+-        unsigned long datalen = read(fd, (void*)img->data, img->datalen);
+-        if(datalen < 0)
++        ssize_t datalen = read(fd, (void*)img->data, img->datalen);
++        if(datalen < 0) {
++            perror("v4l2_dq read");
+             return(NULL);
++        }
+         else if(datalen != img->datalen)
+             zprintf(0, "WARNING: read() size mismatch: 0x%lx != 0x%lx\n",
+                     datalen, img->datalen);
diff --git a/media-gfx/zbar/files/zbar-0.23_fix_python_detect.patch b/media-gfx/zbar/files/zbar-0.23_fix_python_detect.patch
new file mode 100644
index 000000000000..54e10184217e
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.23_fix_python_detect.patch
@@ -0,0 +1,13 @@
+diff -ur a/configure.ac b/configure.ac
+--- a/configure.ac	2019-05-23 23:37:12.000000000 +0300
++++ b/configure.ac	2020-01-06 12:30:41.621264633 +0300
+@@ -559,8 +559,7 @@
+                            [with_python="no"])
+                     ])
+              ]
+-      )],
+-      [with_python="auto"]
++      )]
+ )
+ 
+ AS_IF([test "x$with_python" != "xno"],
diff --git a/media-gfx/zbar/files/zbar-0.23_reset_conversion_descriptor_after_close.patch b/media-gfx/zbar/files/zbar-0.23_reset_conversion_descriptor_after_close.patch
new file mode 100644
index 000000000000..75d02cb996a5
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.23_reset_conversion_descriptor_after_close.patch
@@ -0,0 +1,25 @@
+From ba0bcb39c4fa57634c05597464352d4e630f1ea2 Mon Sep 17 00:00:00 2001
+From: hz-mk <51707958+hz-mk@users.noreply.github.com>
+Date: Tue, 11 Jun 2019 16:32:18 +0200
+Subject: [PATCH] Reset conversion descriptor after close (prevent double free)
+
+---
+ zbar/qrcode/qrdectxt.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/zbar/qrcode/qrdectxt.c b/zbar/qrcode/qrdectxt.c
+index 2ab7b9b..4be7635 100644
+--- a/zbar/qrcode/qrdectxt.c
++++ b/zbar/qrcode/qrdectxt.c
+@@ -409,7 +409,10 @@ int qr_code_data_list_extract_text(const qr_code_data_list *_qrlist,
+       /*If eci should be reset between codes, do so.*/
+       if(eci<=QR_ECI_GLI1){
+         eci=-1;
+-        if(eci_cd!=(iconv_t)-1)iconv_close(eci_cd);
++        if(eci_cd!=(iconv_t)-1){
++	  iconv_close(eci_cd);
++	  eci_cd=(iconv_t)-1;
++	}
+       }
+ 
+     }
diff --git a/media-gfx/zbar/metadata.xml b/media-gfx/zbar/metadata.xml
index fd5ad454e03a..064f2be75872 100644
--- a/media-gfx/zbar/metadata.xml
+++ b/media-gfx/zbar/metadata.xml
@@ -1,10 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>email@linxon.ru</email>
+		<name>Yury Martynov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">zbar</remote-id>
 		<remote-id type="github">mchehab/zbar</remote-id>
 		<bugs-to>https://github.com/mchehab/zbar/issues</bugs-to>
 	</upstream>
+	<longdescription>
+		The ZBar Bar Code Reader is a library for scanning and decoding bar
+		codes from various sources such as video streams, image files or raw
+		intensity sensors.  It supports EAN, UPC, Code 128, Code 93, Code 39
+		and Interleaved 2 of 5. The flexible, layered architecture features a
+		fast, streaming interface with a minimal memory footprint.
+	</longdescription>
 </pkgmetadata>
diff --git a/media-gfx/zbar/zbar-0.23.ebuild b/media-gfx/zbar/zbar-0.23.ebuild
new file mode 100644
index 000000000000..495dc423d47e
--- /dev/null
+++ b/media-gfx/zbar/zbar-0.23.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 virtualx
+
+DESCRIPTION="Library and tools for reading barcodes from images or video"
+HOMEPAGE="https://github.com/mchehab/zbar"
+SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg python qt5 static-libs test +threads v4l X xv"
+REQUIRED_USE="
+	introspection? ( gtk )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? (
+		${PYTHON_REQUIRED_USE}
+		X? ( imagemagick )
+	)
+	xv? ( X )"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	gtk? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+		introspection? ( dev-libs/gobject-introspection )
+	)
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[png,jpeg?] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[png,jpeg?] )
+	)
+	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+	)
+	v4l? ( media-libs/libv4l:0=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8 )"
+
+DEPEND="${COMMON_DEPEND}
+	java? (
+		>=virtual/jdk-1.8
+		test? (
+			dev-java/hamcrest-core:1.3
+			dev-java/junit:4
+		)
+	)
+	test? (
+		${PYTHON_DEPS}
+		dev-python/pillow[${PYTHON_USEDEP}]
+	)"
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	gtk? ( dev-util/glib-utils )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.10-errors.patch"
+	"${FILESDIR}/${P}_create_correct_pkconfig_file_for_zbar-qt5.patch"
+	"${FILESDIR}/${P}_fix_detection_of_errors_in_the_v4l_read.patch"
+	"${FILESDIR}/${P}_fix_python_detect.patch"
+	"${FILESDIR}/${P}_fix_Qt5X11Extras_detect.patch"
+	"${FILESDIR}/${P}_reset_conversion_descriptor_after_close.patch"
+)
+
+DOCS=( README.md NEWS.md TODO.md HACKING.md TODO.md ChangeLog )
+
+pkg_setup() {
+	if use python || use test; then
+		python-single-r1_pkg_setup
+	fi
+	use java && java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if use python || use test; then
+		if use test; then
+			# make tests happy
+			# because one of the test requires loadable py module from the current ${BUILD_DIR}
+			sed -e "s|PYTHONPATH=@abs_top_srcdir@|PYTHONPATH=@builddir@|g" \
+				-i test/Makefile.am.inc || die
+		fi
+
+		python_fix_shebang \
+			examples/*.py \
+			test/{test_python,barcodetest}.py # test_pygtk.py — py2 only
+	fi
+
+	if use java; then
+		java-pkg-opt-2_src_prepare
+		sed -e "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
+			-i java/Makefile.am || die
+	fi
+
+	# do not install {LICENSE,INSTALL,etc}.md doc files with 'make install' (use DOCS=() instead)
+	sed -e "s|^dist_doc_DATA =\(.*\)|dist_doc_DATA =|" -i Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	append-cppflags -DNDEBUG
+
+	local myeconfargs=(
+		$(use_with dbus)
+		$(use_with gtk gtk gtk3) # default is gtk2
+		$(use_with jpeg)
+		$(multilib_native_use_with introspection gir)
+		$(multilib_native_use_with java)
+		$(multilib_native_use_with python python auto)
+		$(use_enable static-libs static)
+		$(use_enable threads pthread)
+		$(use_enable v4l video)
+		$(use_with X x)
+		$(use_with X xshm)
+		$(use_with xv xv)
+	)
+
+	if multilib_is_native_abi; then
+		# both must be enabled to use GraphicsMagick
+		if use graphicsmagick; then
+			myeconfargs+=(
+				--with-graphicsmagick
+				--without-imagemagick
+			)
+		elif use imagemagick; then
+			myeconfargs+=(
+				--with-imagemagick
+				--without-graphicsmagick
+			)
+		else
+			myeconfargs+=(
+				--without-imagemagick
+				--without-graphicsmagick
+			)
+		fi
+
+		if use java; then
+			export JAVACFLAGS="$(java-pkg_javac-args)"
+			append-cflags "$(java-pkg_get-jni-cflags)"
+			if use test; then # bug 629078
+				java-pkg_append_ CLASSPATH .
+				java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only junit-4 junit.jar)
+				java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)
+			fi
+		fi
+
+		if use qt5; then
+			myeconfargs+=(
+				--with-qt
+				--with-qt5
+			)
+		else
+			myeconfargs+=( --without-qt )
+		fi
+	else
+		myeconfargs+=(
+			--without-qt
+			--without-imagemagick
+			--without-graphicsmagick
+		)
+	fi
+
+	ECONF_SOURCE="${S}" \
+		econf "${myeconfargs[@]}"
+
+	# work around out-of-source build issues for multilib systems (bug 672184)
+	mkdir qt zbarcam || die
+}
+
+src_test() {
+	virtx multilib-minimal_src_test
+}
+
+src_install() {
+	if use qt5; then
+		local MULTILIB_WRAPPED_HEADERS=(
+			/usr/include/zbar/QZBar.h
+			/usr/include/zbar/QZBarImage.h
+		)
+	fi
+	multilib-minimal_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	use java && java-pkg-opt-2_pkg_preinst
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
commit	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree	ab466b4dfa7abecb401b2f8039d08af4689306bb /media-gfx
parent	d42200bec37eef2a7478d88988ff00addd0a9202 (diff)