gentoo resync : 19.07.2019

33 files changed, 68 insertions, 243 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 1ec9ba82e476..137d28082554 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/crwinfo/Manifest b/media-gfx/crwinfo/Manifest
index 61afb8fa5a37..afe831d0415b 100644
--- a/media-gfx/crwinfo/Manifest
+++ b/media-gfx/crwinfo/Manifest
@@ -1,4 +1,4 @@
 AUX crwinfo-0.2.patch 991 BLAKE2B 4bbdc2038c9bfd4c8ed05726f7d5045ff8f818ccbf78bdcfbd48ba3fe0e0c9782e0b8a583474925f7cfdd0fc3226170c890057b59aec40a41d1a38e97fa70f55 SHA512 b3ab95be8605d470258e16fece5b5a8fd70c7acc5dfc369f6dc4a6819a44f96c513319311198fb6a1e41b2a3e0bc931ddde2e66566568628f271f31ecc2872af
 DIST CRWInfo-0.2.tar.gz 10717 BLAKE2B fce230c1913cd924b554697bb1a26661671ec2ec274fbb5f8918f2f5bdb8923897dd1f9b3a4a844f8d0f380f39f50ee08418c6d3cfac39fe7a3e50255aa0632d SHA512 54e386266570460dd43f5a6d4b0eea7d6c37d9327dca8ffc1fa10462f97e23fc080404159723ce6558c3dc6c77eccba6ede628097d95f699a47f57a114e1eb0a
-EBUILD crwinfo-0.2.ebuild 720 BLAKE2B e19f9b4b9c85f90fa4d9471ac57369129d67bd86f8f3ef39687efd4c806f6750573c9eeb13cb95e67e8c65b77f93dbb64d1cbef0b70a89830f4a7dc0a94c243c SHA512 637d8308bdcd09bd842a49093e831a97219b469f6456c490759816b5582bc294d5d944171e84c73d14f8f8210afd880bbab55031220f4e929657e17f81d5b15b
+EBUILD crwinfo-0.2.ebuild 717 BLAKE2B 122ffe17e9e4b68ca50cb5a373800365f561a934ccd70cd9fa63e304ec16b129096842462e609156a6be6f2cf7eff4932f32ca37a5f3d833b566907826d5424d SHA512 41a55100107e7a6935ec0fe778a681821aaea4d288d313a46a750997b53d9504704de39860a57ab32ac9e9cda87265f144dbf8bc5bf9de4d0de3aec2ed5c9978
 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 e3c6aed17fe3..09e639edc0a7 100644
--- a/media-gfx/crwinfo/crwinfo-0.2.ebuild
+++ b/media-gfx/crwinfo/crwinfo-0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -11,7 +11,7 @@ SRC_URI="http://neuemuenze.heim1.tu-clausthal.de/~sven/crwinfo/CRWInfo-${PV}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc amd64 alpha ia64 hppa ppc64"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/CRWInfo-${PV}"
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 168ecb30ead2..fd87d4e0fd3f 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -2,5 +2,5 @@ AUX digikam-6.0.0-cmake.patch 1972 BLAKE2B 103f282e8cdc33d6e7cc3982bb15b290ff238
 DIST digikam-6.0.0.tar.xz 331386500 BLAKE2B 93da3822ad10b3c017aadcdcc1501af5dfcfa07640d73b6987cc7e1229573e02489c166abf16a07378466fcd2bf7c4423415af563b5ab835e6d5d8ea63a04eba SHA512 b8a70dde0b3838c4ccaffa3324eacb0541642e82177c90a1f8fcbd9691c194369f2760c4ea56c58b7ae049fc1a748d5d88cb537c62e3700ed5e21bad44d01adb
 DIST digikam-6.1.0.tar.xz 332466544 BLAKE2B 2f9aad537108a905d42bd218052287ccdb76a75e4883990c19a4c12318dbf019fa37b547e1adf4394dad14ab6f2a38d5f0c397060382d525ef7c1cabafa649d6 SHA512 36cffce4fdb751dafc45b2d447fbbd1134b7dc59c19eb6f7aebcf8d66327f6d8a49e787e346984cc842c81dc033ff8f7f8614a81073d99a0c6902770a26053da
 EBUILD digikam-6.0.0.ebuild 3951 BLAKE2B b7bcf74012b240e5864298c82e18e5f1d3a52f0df16c90896b9d2ba295e396f757f10e3c4a14dd8359086acfde797013d68bcfae57f4105de933d16790d0fd24 SHA512 50c11d1925a65f4d9c307bc1a32fb615176b7c14dd4ec3b30b4080b30f93845b732f725cae2a6fc188ea43982396a44acaf6e4fc64c1f47b95a4070f39ef8913
-EBUILD digikam-6.1.0.ebuild 4167 BLAKE2B 0a25c675d347b1f4d693cd7020dd0dd308e07a98f42c00cc3ccee0ab0e5ec8689d574568f00ba6a57ef68edca9ffe4cd16d0e12c05f8ab7fc6e836890b410931 SHA512 9e47a3af8b4509714da06c680abb566b79ffbe81c7ff241b31e2183d4f1c796b1b80bc0c0c15bc28f1bdc9f196048b4d91a965e034eeaadf56d7a2e31aca5594
+EBUILD digikam-6.1.0.ebuild 4175 BLAKE2B 0a961685332a190169cde6f672b4f61cc43192cbeb892b3775f38bad0a3c713efe45d1026ffa55c2a88ec35251aab69dfe7e2f528b1f6108f224db3830c60830 SHA512 3d9de925e7ee5e4b8aca9625a4960223a4c6010a2bfb91bb296d8f3f89d71deab43551a6e9be65e74cc797250a453d410aa4227549990d4bc3e9f2bd0c786e55
 MISC metadata.xml 1256 BLAKE2B c3899279a6382ac2b2a12f5b94938db2324093bd63e0db8e3f82bb56ea9944d4369b793f7fa039c2c08af1887e4cc51d58f4e89a57c81b18cb5f896ef4cd0a5c SHA512 9b220b4271d0cb7b9fd5549fec165c4bc20c250cc66ce14ecb3cb16d0eb8355f35d0e585d9d800ed70437b3cd5434bcacc7dfd783f2a5683dbe1b1b3ce48356f
diff --git a/media-gfx/digikam/digikam-6.1.0.ebuild b/media-gfx/digikam/digikam-6.1.0.ebuild
index d0fd33163224..9ea4daced62d 100644
--- a/media-gfx/digikam/digikam-6.1.0.ebuild
+++ b/media-gfx/digikam/digikam-6.1.0.ebuild
@@ -65,7 +65,7 @@ COMMON_DEPEND="
 		$(add_kdeapps_dep kcontacts)
 	)
 	calendar? ( $(add_kdeapps_dep kcalcore) )
-	dnn? ( >=media-libs/opencv-3.1.0:=[contrib_dnn] )
+	dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contrib_dnn] )
 	gphoto2? ( media-libs/libgphoto2:= )
 	imagemagick? ( media-gfx/imagemagick:= )
 	jpeg2k? ( media-libs/jasper:= )
diff --git a/media-gfx/esci-interpreter-gt-s80/Manifest b/media-gfx/esci-interpreter-gt-s80/Manifest
index e567e1c07c21..0b910a4fb6f3 100644
--- a/media-gfx/esci-interpreter-gt-s80/Manifest
+++ b/media-gfx/esci-interpreter-gt-s80/Manifest
@@ -1,4 +1,4 @@
 DIST esci-interpreter-gt-s80-0.2.1-1.i386.rpm 191157 BLAKE2B 6c028ba8fce8c43c27b9c252e3b205991e2c26d1e803f2bfb167ccaf29c134901e333d0f979dce8dabf9f94d6882a3ed484ad60e73538a20410671d7c8e5a66b SHA512 abcf9228e1265d309f07b3b77081e9c8b21a4f186ef49b857df2e53b1d9e11f11e0975673c02760bd00f96d916fe5108f9218b0bea67bc59ff78ff4c9a09eb69
 DIST esci-interpreter-gt-s80-0.2.1-1.x86_64.rpm 71423 BLAKE2B 423f6745c4c2f7176a3e5d497f16aaf45b966b7d29e640e60599250bbb56504e9a4b7171e180a0d496d16ae49c52c14d4a543e625f92a33f62ab23fe5ddaa818 SHA512 3977255a939630391e35775651094f6c873288c5e2c70ee70c4e19064b78e721372cdd40c7f70ae937e74b572b9a15d9b558fdd6a1dc9905bbd78abce8bd57e5
 EBUILD esci-interpreter-gt-s80-0.2.1.1.ebuild 2127 BLAKE2B 007ab6e4ca273d64c7e5a2c2e754b02aa1dc6f77be609f2c14b812c1745c25a7fa7b868a4482ea1e466c3a5a8c8fe61709f3341d2f1b6fff848b9bab1ce755f1 SHA512 1dfd2c3b2e248cf86dadf8637135d389d2454adadafe51d017fc80ae90428cbc768f9afa8c21f7aac9dbedc26c45a3922944f4ff0369c1b5fe110bcf66703dca
-MISC metadata.xml 481 BLAKE2B c398e9775e32ecd340d417b0f81edab970a02ec5e03fc06303319f42b1a1c16e530aaafa34ff8b1e3141097446322bbafa75b0b99fe1d9d53eb654d00d1b4457 SHA512 9d67fb6d1d6b9015f4fb7c2e461467344ce2601496f206803a186f9cbf24a5919b88d76c030f49c19e1194e639db42ef81566ebec9b95aab01c467e66478065a
+MISC metadata.xml 508 BLAKE2B e9c7f0bd352100b7b1e628aeb5eae70032f95d30504e1e7039ac728f3fb56d9570ceb590792222b118f41e586159ef8783405149655df55b04a8fbb061f21422 SHA512 da7f263f4d1e74e727beba2bc1db5d447d5255df68232030c00ec932df7f8e829055dcd13b69ae603b10fed2fb9f0de28ed7627d41e3746c33f8f74e2078ec22
diff --git a/media-gfx/esci-interpreter-gt-s80/metadata.xml b/media-gfx/esci-interpreter-gt-s80/metadata.xml
index bd2b8dac265e..06222bb652e0 100644
--- a/media-gfx/esci-interpreter-gt-s80/metadata.xml
+++ b/media-gfx/esci-interpreter-gt-s80/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <!--maintainer-needed-->
   <longdescription lang="en">
     Proprietary plugin for several EPSON scanner models, to be used
     with the epkowa SANE backend (provided by
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index c505a22afa6b..5ba8cfe0f93e 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-photos-3.30.1.tar.xz 1118728 BLAKE2B b3de35fb9c2ae7b731cf76a7b02b689997e3cf063037c49a51dbdf8bb37d9217c9bd5380bc872b984eca4e53c5996eb6370f3acc82a90e56dabe9d47999d5578 SHA512 4fa386c3d93f2b15468601e56bfcbdcc83a9e78ed5c4d0a1e51e9adf4ba313bb69e07aae52404026546dd68584e355c5e5100fc12f95fe078ccf2d6160a0a24b
-EBUILD gnome-photos-3.30.1.ebuild 1949 BLAKE2B cc4d0e2567d89777bc47c560f189f195122d05aa9300dec9f72309f4e2059ecb0ad92d38986811f8518ad1136063c51ebaeee173d7cf6c4c407b265ccd5b0067 SHA512 33bff54c100442f3a1f8e439705629374c650aa34c0e3e54e05f59ec1dcc0daaf243a00243f649dbb0a3e14bc0ded6c81517a79ba8d62944cb712ff829628346
+EBUILD gnome-photos-3.30.1-r1.ebuild 1942 BLAKE2B 2c206fea9e07bf866d6f889ac7ec07446b3b2e5dfbd309b647c9e411024fe15616e71efc1e029430815008bf12b00da815b83c4474bc687678571acf9cbe573a SHA512 158679fedb344ad0aa2e47e2148f7dba912e1ff420d725c4b73604bdcebf7472a51631040a92b6e6c249e42aef6dd64b8b402e9e2604f2a910b38ff2f251385f
 MISC metadata.xml 992 BLAKE2B beda29ca65d25e5d68c014fbb70fb539cf17b55d64255d6d74305d710f3979b5156eda764d75992f057416f5eb96af899b988633dd8444fcf22c6a5f73fe9b9b SHA512 3c47be6c01072a0b4845dd42b6d3561d340eb703bd9cb5c727ec24b653ab76eee38e35ba63c4cd71b93514ab0cb8bd75663febeed1901cccedfd30f223e870df
diff --git a/media-gfx/gnome-photos/gnome-photos-3.30.1.ebuild b/media-gfx/gnome-photos/gnome-photos-3.30.1-r1.ebuild
index ece773240cf8..fbe6be92bed9 100644
--- a/media-gfx/gnome-photos/gnome-photos-3.30.1.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-3.30.1-r1.ebuild
@@ -21,7 +21,7 @@ COMMON_DEPEND="
 	gnome-base/gsettings-desktop-schemas
 	>=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts]
 	media-libs/babl
-	>=media-libs/gegl-0.4.0:0.4[cairo,jpeg2k,raw]
+	>=media-libs/gegl-0.4.0:0.4[cairo,raw]
 	>=media-libs/gexiv2-0.10.8
 	>=media-libs/grilo-0.3.5:0.3=
 	>=media-libs/libpng-1.6:0=
diff --git a/media-gfx/hp2xx/Manifest b/media-gfx/hp2xx/Manifest
index cf093bef9f7f..0559e41bcad2 100644
--- a/media-gfx/hp2xx/Manifest
+++ b/media-gfx/hp2xx/Manifest
@@ -2,5 +2,5 @@ AUX hp2xx-3.4.4-docbuild.patch 474 BLAKE2B 2e790843db84da1cbc0aebde13bcb3762cae3
 AUX hp2xx-3.4.4-r1.patch 3824 BLAKE2B a5318bc7e848210f0b8b4b916ba9af62910fcdec605253421062ddf4c0b7a5e9ca46a1c6760eded382a71729003bdd74e4e57865e05e84323dd21ddf690e0f1a SHA512 49a98dc29f820bf43550bec589045e81eaaed991681625bce1a192fee967e28663f053503644663cdb0e57709ba67000dc7f6922054a4ec3969f1555a63df0a3
 DIST hp2xx-3.4.4.tar.gz 610330 BLAKE2B c1e374d53fe36710bef6802347829fe9dce67c73c6ca2f2ea6120a1afd343bbdcbd870b6005001d934d9803b91597ebcaceccafdb5cc29d26ad3aed108016abc SHA512 ccfe4a23ca482471506e59d6d459ce3ed56d9d775613e3238bd82d11cf4ea0595bf57ff95b3bd22a674865ec7f07dc63c1bcf0deb2a430b7ae241734c7e57ccd
 EBUILD hp2xx-3.4.4-r1.ebuild 1588 BLAKE2B e3b7f3b79861cf632b4eb1e3f04d1b12a2e4fcc94f44c166ed014ec9748fce0418f221d4ed4f3ecff5f926f9b8f7dc6643d9c58b8bcd17d1a4243f5db057aaa7 SHA512 e4ca1b98406d9ff20ed03bfe2c160690b2391d2e3bb8a8419ee1a1e4d4bb1add2ca61c248d045940cb30fc1a090774015ccf431dde1276432ea9e43ffccab257
-EBUILD hp2xx-3.4.4.ebuild 832 BLAKE2B 2c97f2962b16a648f79e6505a96389516ee9543d96dae5c74ddc9a15d17bec779c0fc1d1d8caa1c98ff8cc7c2ae1fc3a69758efb0f87f5ca62bbcff3fae86a86 SHA512 39fd7979daa0b47ff0c4269dadd7fffd5a5c51a6e14a03096d1ba0cc4e3e218cdae575c1de5ba958880e3392326df16aa50fef50ea746d0da09de0f8071624b8
+EBUILD hp2xx-3.4.4.ebuild 829 BLAKE2B 5381efb26130bcdf40b30e561e8f7ef19a3b4e1df40d86ac1ce2d8e641db24d64159ca189ece0b76e5d70fe5bdc250015592a4c92d148b7e2dcde9f065c399e9 SHA512 1becdc810fb0a16d05e042f9abdea89a590ce398f1ef400ef708a86a15c87a60a22faf0240e60f59e78b3ef2bb044040e36774a42d25ec2b7ffc0b68e215eb6f
 MISC metadata.xml 259 BLAKE2B 4a7248bc5a529d1cf3b51f8bcfff668a9e525df3e62584369d4b5526c89e70235378420b164073946ea91cf182065d9c8d2d46c8750d5f77855239b77ce45bae SHA512 7b1cbb90c1ddcf63b8802cfa3a53611f6367801b492c7677ef038738a337002c4606bcf93c5186abf808e74bca1fa76266169245acdb3b5997651bcabfecfa5c
diff --git a/media-gfx/hp2xx/hp2xx-3.4.4.ebuild b/media-gfx/hp2xx/hp2xx-3.4.4.ebuild
index 268801ee97d6..731025135dbb 100644
--- a/media-gfx/hp2xx/hp2xx-3.4.4.ebuild
+++ b/media-gfx/hp2xx/hp2xx-3.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-gfx/iscan-plugin-esdip/Manifest b/media-gfx/iscan-plugin-esdip/Manifest
index 892d3893e724..0fba7d7d31f1 100644
--- a/media-gfx/iscan-plugin-esdip/Manifest
+++ b/media-gfx/iscan-plugin-esdip/Manifest
@@ -1,4 +1,4 @@
 DIST iscan-plugin-esdip-1.0.0-5.ltdl7.i386.rpm 1311240 BLAKE2B 0afcb65165c40fe352ab7d47082032d98423b2a5887babf1c3015df9cd3ae860343572131ba76c99eebc5efb5e6a4f66174765695e66d83061b525cbcd2ec77a SHA512 cff826ad66e1718a9b59f09849522af70789f782e36d5ed979ef4296eee7be5e4e02375c939300b94d6ac555f1db2441bee59758a8a0d040770d25b47ba8dbab
 DIST iscan-plugin-esdip-1.0.0-5.ltdl7.x86_64.rpm 1359799 BLAKE2B 01774e0fcf127e578b62091e744833f93a79c6bd61f7a953e025f3e31ea9c66479404b9dce17d7b52f5802e3f0a3c6f9b4d0ed43b1abdeb8027a922015130b71 SHA512 3d5f9721eb9d8b56d16800a4a4a25c4b887d593e08d1d0c3709f10b92c52b906000e84c99f41eec13b9ccdbaf53d2621f6f1582d69a1e5e291239a47987776a7
 EBUILD iscan-plugin-esdip-1.0.0.5-r1.ebuild 970 BLAKE2B ad98ff1aebd5c1d0ea496621b2c376bb63ca51299aebfdf65783f7f6ead654f80b50f5494468202c12cf9f8a23e01551dbd0b5ce5e7a94499ca985c6c226c9e3 SHA512 a75453cb7d7da79b8fde6f60f3459158c284117b2e674622b5ee95e742cd3eb8faa8eb5e34ed19e33305d3a4ef77f52d2a78e03c77a726df39edd997c99da703
-MISC metadata.xml 424 BLAKE2B e14e3e08743bbd0cb6fbcdf3bc3d30c2b0924aead7fceae0d98a1cdda83c8a52972319e46ee47f903cfe9a565abd4698e9bb85f7b5b6d7081731e0e2a691c7ef SHA512 c2a7bfe181fdb15dc9921d600107e41335f592d132e53ec180181d6c830eb353260c93cf230b97b5aca52d4e0003d3d2b60cb37726d49bacd8ba07716467a0b2
+MISC metadata.xml 451 BLAKE2B f1f7ad59a6f74f8b22dd85652f80e8b038e6f26c7a8f82a46f1b85c2b4e6a7b9cd43f300aef128116e5b79a5ff9e43c38bde186e46c434ee6a5bbc75f3336e50 SHA512 ac4ba67895db738a472b4663a9d648c0ad4540a48433ec90af77ff9a6c63892a87bd94ea06c5cb5b91a5019609288a85836d1afecd4d988885aca6c89fbafc72
diff --git a/media-gfx/iscan-plugin-esdip/metadata.xml b/media-gfx/iscan-plugin-esdip/metadata.xml
index ccb742d82570..8fec2c8da950 100644
--- a/media-gfx/iscan-plugin-esdip/metadata.xml
+++ b/media-gfx/iscan-plugin-esdip/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <!--maintainer-needed-->
   <longdescription lang="en">
     Proprietary plugin for several EPSON scanner models, to be used
     with the epkowa SANE backend (provided by
diff --git a/media-gfx/iscan-plugin-gt-f500/Manifest b/media-gfx/iscan-plugin-gt-f500/Manifest
index 7bf3500c212d..53e472d5e3a2 100644
--- a/media-gfx/iscan-plugin-gt-f500/Manifest
+++ b/media-gfx/iscan-plugin-gt-f500/Manifest
@@ -1,3 +1,3 @@
 DIST iscan-plugin-gt-f500-1.0.0-1.c2.i386.rpm 126130 BLAKE2B 619dad6d7a93f96a962dbbcfa1095544245c1bfaf1525125fa872bfbf45bca1579759673cfdca3a342a96101967d397da38a12f1d326080aa42bcb130642e61a SHA512 efecbb6e3f4fe3f498ebf9bb68a1755405c675d67c52042dcfc2e4e7f98903a870f969b4453d110c9f774452c6ae44042482ee954762c5f5a559e2d3e52a98d0
 EBUILD iscan-plugin-gt-f500-1.0.0.1-r1.ebuild 2044 BLAKE2B fa1a14db0403e80f7f030aa2125f30112ae373d677fa5a8438ad33e05320571c0d190a85d2818385534ff24d9eee6be759461d6cf523e2bc7ad5c92cb13b6ed8 SHA512 13cd13f9ce2fb9190afe00116af1c469e76caca24572e0bf0db2f23c2abd1ec4129cc9020fef52a7062dd2f3a8d5d3c57bef700eb3ae1c114fa3ecaac7226e82
-MISC metadata.xml 718 BLAKE2B 5e35a1dbf8f13e427d77ae17fcb3a8c3f629b801883777c8b9ab531a78cf576bc36c083278b58bc49c8f267055143ddb3cc7e7f89e9b643b7f4b4d2a6fae91c6 SHA512 4115f0c83b8865fe26ed3a1b796d9491f8fda3c8f03ad611fee755fa91b591f4297656340efc7d4b916a8a215e0ee5d8fea9fc824a5139305fe2a1525b135271
+MISC metadata.xml 745 BLAKE2B 10d7bdff900b0a44b044d84683c2c013ad25a9a20cb6bab454aec00e949635615af71498e09d1b5c431f0257d224bbae40c445599378f00574684cf6c6b6ef00 SHA512 08f9ff794990e46bc9debea0455ba309626ad4014c8e832e6da750b8618cede462adee0f37ddbdeed2875a431a4316a60c73aca2195dbff6abd4c3fa1893d822
diff --git a/media-gfx/iscan-plugin-gt-f500/metadata.xml b/media-gfx/iscan-plugin-gt-f500/metadata.xml
index c1744e26e874..fd4975467fc4 100644
--- a/media-gfx/iscan-plugin-gt-f500/metadata.xml
+++ b/media-gfx/iscan-plugin-gt-f500/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <!--maintainer-needed-->
   <longdescription lang="en">
     Proprietary plugin for several EPSON scanner models, to be used
     with the epkowa SANE backend (provided by
diff --git a/media-gfx/iscan-plugin-gt-f720/Manifest b/media-gfx/iscan-plugin-gt-f720/Manifest
index a44f4e562bc5..36868f2beec5 100644
--- a/media-gfx/iscan-plugin-gt-f720/Manifest
+++ b/media-gfx/iscan-plugin-gt-f720/Manifest
@@ -1,4 +1,4 @@
 DIST esci-interpreter-gt-f720-0.0.1-2.i386.rpm 381387 BLAKE2B 1852f0f89e7181d8adad209d146e41f1a122e95256c073ef77b96338585520c25e287bff86a0eda8fd09733328a2c67c22bddffabfc37f5de7aef1726f5c997b SHA512 6ccc6f48d8c00614346a0faee798b876497ba5ac1b35e3fd558a6e01711b944dc713e654d53fff09daff00b91251150665932564fea4fc60ec1a0a7ec95fa1f5
 DIST esci-interpreter-gt-f720-0.0.1-2.x86_64.rpm 170040 BLAKE2B e46bc0841a872883b85b2d91cadcc1007e3639d0f1c6d64948b91a3fd65c66bf295102bd898b9a5b1fe671d0746023ed95ab1325418501f2176be17af88e1f67 SHA512 457fcfa3ae8291336a127e95dc81e24a2125ae8f861bf74d2006e4d019c54bd351c2480254b9173e52dfe489962dffea2819963596f280e1dc05c527fbf6b625
 EBUILD iscan-plugin-gt-f720-0.0.1.2.ebuild 1572 BLAKE2B b4559ff53034389c89ce8c488aaf23773b758e329fbffaba0bf773c292bfc4e493d8881e9a8925e42f6f07351da1f57e668bd9c030d12bda10ea4c6341539d6e SHA512 3de21ed5ecf6c80465aefe88c7188ee8d83ff385304a68efc4fb84ceaf768cbbf6274f26c9fa303d012ce86bf428fb9f4001cc1c1dd3d304121bf53cf49899e4
-MISC metadata.xml 445 BLAKE2B b4b62d7f86b0897cac8ce562b27c0cffd16ed8f067f8095d4f1cb2315dc6740dacca43403085832063c3b0babfc74d326a4f2e139c1c571fc8aad832e4c8f9f5 SHA512 ed7c058931f20c758d70f6751841acfafdf388d98d17e80e700d69613e841cf883f02a3a134fb37e24c834012dfa0d8ec67b976ff866a90880b9b561f9c15164
+MISC metadata.xml 471 BLAKE2B a439ab30f66271d78a132879e8329c7fe0be9834c2b1b51558df8779f5fe90bcdb7d4406778332f2194c29d5f183c5b748b06d5a5769e3f5d91eeada16a0f561 SHA512 bf031ef052c52c9376d340659eaaa9f9ca8543e3719dd35cf126946f31018f7eb49b829bafd1c2b311a531d562ff68414b24db0c9bb9d392f6e4038ff1d25c7b
diff --git a/media-gfx/iscan-plugin-gt-f720/metadata.xml b/media-gfx/iscan-plugin-gt-f720/metadata.xml
index 8cb2931d6deb..33e566367b04 100644
--- a/media-gfx/iscan-plugin-gt-f720/metadata.xml
+++ b/media-gfx/iscan-plugin-gt-f720/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<longdescription lang="en">
 		Proprietary plugin for several EPSON scanner models with the epkowa SANE backend (provided by media-gfx/iscan).
 		This particular plugin (f720) seems to be required for:
diff --git a/media-gfx/iscan-plugin-perfection-v370/Manifest b/media-gfx/iscan-plugin-perfection-v370/Manifest
index 60f91c278f74..71fcfce18c67 100644
--- a/media-gfx/iscan-plugin-perfection-v370/Manifest
+++ b/media-gfx/iscan-plugin-perfection-v370/Manifest
@@ -1,4 +1,4 @@
 DIST iscan-plugin-perfection-v370-1.0.0-2.i386.rpm 383681 BLAKE2B 88ea54050150ae2619cf2dc1489200b3b3bbc4d36fbeb91b689a758c4ddea8361af4c64a21fe12919d9ec411d2da237e6192d4cf6488450cf0ab45d27e40dad8 SHA512 ca0d77e614b826529b23e7ccb6f8546143c471757fb9648c30830055764442c44c811d12c61b04e14d6d435c5de67eb20d24653aee23022ed7104ce89074fdf1
 DIST iscan-plugin-perfection-v370-1.0.0-2.x86_64.rpm 172082 BLAKE2B 1cb196052a3f7d53ae5870426425d80b7d9bc4ee62def3acd9b21d321fafe1342e393dd5c05dffd87077bee3e57217300c5f372bfb9e163ad08593d3031f4718 SHA512 d0a942f4dbf51edf773e3bd83749ffc5dc9b1b67daec042fb49b4050ead34c604ce0183b138dd0719c2fe1ba2d610034b8d2d16ba12df4cd8617d1182b66466f
 EBUILD iscan-plugin-perfection-v370-1.0.0.2.ebuild 2294 BLAKE2B 1a833c5ef9f4b15edff38c70124a2a15359a72f62d1f0aa75368027765bbce46b1ca22c06a7ec7004eb33d1747a0052bf69bf486187fecd8891b318f15309593 SHA512 53ead17b26b8ca0aec5f8d4a39f959c0db44d9c85cb02c52905eac7bf83a4cbfe6f74cb912bd77d14e8bad8af2f722430049cab6fb5e1c421ef967a30cfc621a
-MISC metadata.xml 486 BLAKE2B fa88263e4aadd873c2cd7427cc7f049301e62efa67a4842dd56080ce034aee88db056d43390c3de16384417d61d463ea9f71902b8a63b627f93317edcec94657 SHA512 510143fb16b2d57709327f38a5fe23a9512edf6ce507e46f3d17217794a3afaac0eaf939b9b82fc9f3e605bdee196064354c5be52cddd1e7f9a4acc79e45d9fb
+MISC metadata.xml 513 BLAKE2B 7a1030a811a3aa249b582405a9c278a2bb066211f38a90a0dae9c377e72e823e4b897f7cac3ce33f09dcaad52b4536f521b757973ad52e554b496660f970fcd1 SHA512 b0cc6849c96d9e993aa16ea7f76b374b4bc9a7324b7cd10a5fc828045f7425ae60d371a7dc9b2d2ca489869f3424d25e37c7c25c25ee0038c78f679fb2404244
diff --git a/media-gfx/iscan-plugin-perfection-v370/metadata.xml b/media-gfx/iscan-plugin-perfection-v370/metadata.xml
index a5cee8e84a03..d1781ff4ec9d 100644
--- a/media-gfx/iscan-plugin-perfection-v370/metadata.xml
+++ b/media-gfx/iscan-plugin-perfection-v370/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <!--maintainer-needed-->
   <longdescription lang="en">
     Proprietary plugin for several EPSON scanner models, to be used
     with the epkowa SANE backend (provided by
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 9ad7cef12382..2feafdb5b409 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,3 +1,3 @@
 DIST kphotoalbum-5.5.tar.xz 11661532 BLAKE2B a14900cb7628b86aafa736de4b443f3aad3b4198bc6a04bc67fbc40f1bec9898ebbc33e60d4ca90db3b857871f75c70d6946efa2e756b3c5d7ae769bee6b2723 SHA512 fcca891a94580db2f606c5d077af2651e1dbcd59429823410f9fd2d07ac0c3c625ac441b723d4c8cb3ac7ede26ccf69f955c19fe302fffc9788fc33def9ee3e0
-EBUILD kphotoalbum-5.5.ebuild 1519 BLAKE2B 866de469ea2bc6f2121ac5689eadb99b370953162adc09b5fe2fed8ca0b94c1f73799e163add92617942b13dc152f316c10e6a41da26a2d127f625992e8c0d64 SHA512 779d8d5f93d466dade4d75078cba7aa9a738d91e46dfc5c76cbaad668ec967c3269f52d3cda379a5e2351488fb389adaed1e4431e4ad141a8be8412930bfc9d3
+EBUILD kphotoalbum-5.5.ebuild 1514 BLAKE2B 8b8448be3628a37bfc3b095ad03d95c96e5e382fec49ed8867aeeefeb0c1d7ff0d93ea3bd6c9bc6bf0614bc2364ca151d4b06715c7489468a7c872b6be3b027a SHA512 999cfd4416e91eb6e2ac1b9dbe915f341598c9dc8d1a19f770bbda4ef71ea3720db47651a5b5baa4d14fff889f7afb86762c91ed11f40201583ca08b55352928
 MISC metadata.xml 424 BLAKE2B e5e77a618c93044474c0a049bfd37dddbddaaed85bf84fa2e5e7233064176032cc255dbce77607aceca20e431f43f98e29295c977e7841dc86b2c5b286c6df8e SHA512 ec0c2fb381cc5d4b38576c6d5c5b002a07d01027881906bdc1d786311d1d738f6dd67074a6c768a10bbefd3c2c5f01b88bc78cd3456c5884a6d5646593d0dbca
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild
index c6580ef98077..2a3a8d42bf70 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild
@@ -46,7 +46,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	media-video/ffmpeg
-	kipi? ( media-plugins/kipi-plugins:5 )
+	kipi? ( kde-apps/kipi-plugins:5 )
 "
 
 DOCS=( ChangeLog README.md )
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 3f4986cab4ea..ffa70b71cfd1 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,12 +1,9 @@
 AUX krita-4.0.3-tests-optional.patch 10001 BLAKE2B d31e7e89c745642e6cf5fec9f464122954bc050104f1f3dacff2001b8a594a376cd9a61243ca3e6eafc842c68a63c8d1a3b5dc75e737ff8ef8b0e2f1f08d61a2 SHA512 753af31735cd9df6d17e9323fa6699b2b27b60f58d0597e84a30f749c97c7a0595b3719e94235a34e3e51a90b0f6c183e4864ea6a0c5e5f70f27c41e3da0ffdb
 AUX krita-4.1.8-fix-pre-5.12-tablet-support.patch 1794 BLAKE2B d67cfe9a758e26416abf1150a4b25f81b5befb8ffb254daf0c25b4b189ba0aefe9a3256eb83013d80919e21f77f7880fa7856a05ef5c995dfc73d079753e2c38 SHA512 c4048d8fe560508f04df785a012db99a5e6a2d4ca5b1d8e774a307cdb99f62de4969b04a58586c771a174dadf6dedafaa70568e8b6342612fbe52be32db257cb
 AUX krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch 1591 BLAKE2B d11c8b3a7f5a70c40fe5c0f19bcb06c9a2b047e651a27ce3de9e8ecc41287171b50566b481a8ca49b7625aae1ffd0db0a507b1ad7928b6c959de15ec7b7c2dc5 SHA512 3d1d9c09abb2b72d6d7ef5061e7fdb4ca98a4d7f7d1356833fa518da6bce52f9959532f0417b7e30a305ef052acc59dd2b27ef71e1de5fa138fe4f107528517a
-AUX krita-4.2.2-fixuifiles.patch 759 BLAKE2B 0d99b4948e0dc9c507232736d8c56dd3595b5d985fc58cfe09b057cdfdf91d2e2df066d0538733c8b79429eecef7f53e5f69192b9813445ddfd22e9177e75ef3 SHA512 f77b22771e5bea7804868d19456e89dbab8079096e9776a788ac100eb8fd278c144efb8279753bc7ce6b2845c9d4505fd6733e33251298bfd0069a7deb337bee
 AUX krita-4.2.2-tests-optional.patch 12503 BLAKE2B 31b96b377e217dd9e7f8dd25e45487fc7bf0bf4883ffb15d965c0fbdf0a660baf0229024e236cd50ec8533ab85b89cb0c78c4a78f210801be87a43c0ecee4701 SHA512 a4f64e008e07974dbc343a90e8ec181121b14b7d000dfb5bb167b49871b2c31e1d74786409240d2bfbbdeebb89f8b29d2e8cd61df0761a523e61e8a6115ea9fe
 DIST krita-4.1.8.tar.gz 244065767 BLAKE2B ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157 SHA512 d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
-DIST krita-4.2.2.tar.gz 246075662 BLAKE2B 0d4f57924f4a63afbbd53df885844aa02e93b75afb0be3a32f1be6a6d3b031389b6efc907e725b31f31f6846fd8a02cefb33e93354a75191f7ba6bf485b72f4e SHA512 7ca5f18c9c8c0448ac2634bb6e0108328b4ae84527741aa35863a3423449797a4e1e1debcd7c6ace2c6c3362d339ed5b7970af71e5bd4b0e7299cf8e877ca096
 DIST krita-4.2.3.tar.gz 246136588 BLAKE2B 1d7a371f7aeb8cf3747adcd4ab681b0ecf849e64ace16b456e9c2b8ed5fd958be895fd64c623931e47ae81bdf35b3e54161ecb204501f48c97b35ac2dcb8ac59 SHA512 6493740183b360a939d85cc7bc646cb173dc923a3dc63966d0f178bf308675ffead01d3bfefeeffb376f5efd7d90ee7f271b3ff412787123113dd125cc022ab5
 EBUILD krita-4.1.8-r1.ebuild 3390 BLAKE2B 4cb6c211221e5a0e13ce674b7a10c984539a5e5f529a533d6e56f1facfe591e7d1b57707a84c8d87266221cb5445ad7fd15b57954d3a67b114c46c90329730a8 SHA512 14e135e8d6451489127ca1653179de82d7460d182ad6a18bd4fbabd81d16851fcaa783d06be2bbc8cef9ea435f90f5a3f799cf87a338888188acb26ee9b3564a
-EBUILD krita-4.2.2.ebuild 3185 BLAKE2B 7fb9adb95e8a0965b983f2c7fa63ba90c2df688e99f81bb6d19f27693c0350aecb48d811a0c61fa72da7004e0d9bac971b9299a13cad939223d292f61e566c46 SHA512 0b25893e4a8dda09c493c563118cd5fac0649e7f4f76689b0b776d1de4cb461d6cf8f57b391150e9216c2fd618250bcbf2d52ed4b90bfe33d1f421f6cc8bb5b4
 EBUILD krita-4.2.3.ebuild 3154 BLAKE2B e06830f14cbfff0d24ef927bc345aefda68a3d02faae654650eec386e1ba62617aaca4575de60e4cc676607c7586b101601554d0d421bed300e02d048fffa3fa SHA512 e9018a4fe54361dd2f36f3da008054b5207760e4ad2327c55dd4113e3924f7fa704b2fb1c12c44fabf46596e88cadc9a915cdee50fc24d97cda1db8bbeabb0bc
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch b/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch
deleted file mode 100644
index 1703386a3c72..000000000000
--- a/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e46ad1f917705d84dc5562c2f261a06eb70a57b9 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-Date: Tue, 25 Jun 2019 06:57:40 +0200
-Subject: fixuifiles
-
----
- libs/widgetutils/tests/dialogsavertestwidget.ui | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/libs/widgetutils/tests/dialogsavertestwidget.ui b/libs/widgetutils/tests/dialogsavertestwidget.ui
-index 66e70b3..ba0f54f 100644
---- a/libs/widgetutils/tests/dialogsavertestwidget.ui
-+++ b/libs/widgetutils/tests/dialogsavertestwidget.ui
-@@ -10,9 +10,6 @@
-     <height>300</height>
-    </rect>
-   </property>
--  <property name="windowTitle">
--   <string>Form</string>
--  </property>
-   <widget class="QPushButton" name="pushButton">
-    <property name="geometry">
-     <rect>
--- 
-cgit v1.1
diff --git a/media-gfx/krita/krita-4.2.2.ebuild b/media-gfx/krita/krita-4.2.2.ebuild
deleted file mode 100644
index 5a7e08cbf683..000000000000
--- a/media-gfx/krita/krita-4.2.2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-QT_MINIMAL="5.12.3"
-VIRTUALX_REQUIRED="test"
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/"
-LICENSE="GPL-3"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui '-gles2' '' '5=')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	dev-libs/boost:=
-	dev-libs/quazip
-	dev-python/PyQt5[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	media-gfx/exiv2:=
-	media-libs/lcms
-	media-libs/libpng:0=
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXi
-	color-management? ( media-libs/opencolorio )
-	fftw? ( sci-libs/fftw:3.0= )
-	gif? ( media-libs/giflib )
-	gsl? ( sci-libs/gsl:= )
-	jpeg? ( virtual/jpeg:0 )
-	heif? ( media-libs/libheif:= )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr
-	)
-	pdf? ( app-text/poppler[qt5] )
-	qtmedia? ( $(add_qt_dep qtmultimedia) )
-	raw? ( media-libs/libraw:= )
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/calligra:4[calligra_features_krita]
-	!app-office/calligra-l10n:4[calligra_features_krita(+)]
-"
-
-# bug 630508
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tests-optional.patch
-	"${FILESDIR}"/${P}-fixuifiles.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_configure() {
-	# Prevent sandbox violation from FindPyQt5.py module
-	# See Gentoo-bug 655918
-	addpredict /dev/dri
-
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package color-management OCIO)
-		$(cmake-utils_use_find_package fftw FFTW3)
-		$(cmake-utils_use_find_package gif GIF)
-		$(cmake-utils_use_find_package gsl GSL)
-		$(cmake-utils_use_find_package heif HEIF)
-		$(cmake-utils_use_find_package jpeg JPEG)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package qtmedia Qt5Multimedia)
-		$(cmake-utils_use_find_package raw LibRaw)
-		$(cmake-utils_use_find_package tiff TIFF)
-		$(cmake-utils_use_find_package vc Vc)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index 7f6ad0a66bde..c5cee437f1b7 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -1,7 +1,5 @@
-DIST rawtherapee-5.4.tar.xz 11991988 BLAKE2B 625b4e04b82f34d994e0f23f6aea6af4b0a2af2b6a325e916e7b51f8a83b568b65bef47a489be547d1e2437f9637b2ecea0d69d95bfabd53b61b11b46d9e36bc SHA512 6dc9a82202b80675f90eeb8f08c4484700561861f296546ae9425c6e9603f6e84bdc0859896c333d2367cc0b371c6bb6ab2fe36ff3d6f56419cbf18a58d8ef89
 DIST rawtherapee-5.5.tar.xz 12163556 BLAKE2B 6251655b5bcc8b805eda584e386771b14dec15a2d8a96518bdb79d7e31354c78eb263f6964d7f6ffaeb35a127d3f775c9c39dfebf072a0bfc14d284358acd03c SHA512 fcb546ad6e420200a821c89555ec259140995a3bc69429d2ecb648632c02e10ffceebbd7296e879c93b53ad8efa45ea71336d936cd90cead723e70e8932a413a
 DIST rawtherapee-5.6.tar.xz 12083264 BLAKE2B a0eb09e98e1041b393ad3aa671641a2a4855379cef6245ca3cca2588ff5f50fedf8becd88bad1ab70f63dfb575f5f22c141040defa10b47268947415999d8e79 SHA512 2c751c7631ea2ef65c334fa0baab16d4c3161fae66487870c476f07f1ea3604a5e28a251fd98d9688cafc088302af7aa6e28e9b27a37f916715708ed5e731f0f
-EBUILD rawtherapee-5.4.ebuild 1626 BLAKE2B c85d316a1e741e3bb34b278429c35a01312bfb33ff413fdca05d3d14b329ed57f207ba56537711943c9afef4c3177c421af9f46bcf1d95a96a361cef5c3bac7b SHA512 f9645dfa2bda00054821956bc1a9de57066c06c8f74ec1d8ebdaf0b1ed2e4453b253fb66ae4ff7a8f0e55d8a455176cea71b5502e76a8004f435a65bc877bcf9
 EBUILD rawtherapee-5.5.ebuild 1630 BLAKE2B e97a9f3cd46273c7eb61006f7d9f7225792838a3b4465705103ad9d5f13e40348d0c7d691dd899daeb24a1ac568e303be150aad3319d555b502ae0664a88c842 SHA512 34b18eddacacad43a444eca19556a4e1ab237b56ae85fe82344464cebe6148921feb28771979242d09b8585cf3993338ba0ae89b561241b9963362c540b84fb8
-EBUILD rawtherapee-5.6.ebuild 1623 BLAKE2B bf3e2d94b876c48aeedcbb2030d282753a78da2a4c905b5565446ede991e854277fb2ccd99f409d52ccdb5df986f50525cccaf42e0b1124f68a22c0ca7311865 SHA512 4aeee80c36f123d97d55ff343dc326428f597f74d282f1186cbb9255d0ef2f29dab7ad56cb886e7b20dcbe1353a1988ff205b7d2cc3fc2c1580bbf18b8c6d8c4
+EBUILD rawtherapee-5.6.ebuild 1621 BLAKE2B 9f963fabf47cc479f8b840648b227058c232cfaeefc8904fe2ae2ee38e4b219b427633b8575ffd27172bc49c0fc4c99973e55e193883bc1f6fb35f0176d19e2e SHA512 557b60056ab12fb8b9dea4702e7fae0d2438abc89a5f414d75cdd353ee7a99ea6cbafc4df118ad7272c880dfc0f1a107a4ffff190e9a317b75de68471c15a336
 MISC metadata.xml 484 BLAKE2B 672746e8291016ad6467a9b3c9baa84abac42df9f7de4b4bdb79374bba8e84f7cbfe140a076ebee49ec50587154612b73c6a7022461d01fd7fbdc63a6ddfcd98 SHA512 91f11609c7472bb7cebff5d440ee3d4b0560e0832e1bfb6ffd5b239e8e60647e067894d77ccb6e40a379680775f80b91250c3feab5cd2ce32d7991e0776d0cd9
diff --git a/media-gfx/rawtherapee/rawtherapee-5.4.ebuild b/media-gfx/rawtherapee/rawtherapee-5.4.ebuild
deleted file mode 100644
index 0b50baaa01ce..000000000000
--- a/media-gfx/rawtherapee/rawtherapee-5.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils toolchain-funcs flag-o-matic gnome2-utils xdg-utils
-
-MY_P=${P/_rc/-rc}
-DESCRIPTION="A powerful cross-platform raw image processing program"
-HOMEPAGE="http://www.rawtherapee.com/"
-SRC_URI="http://rawtherapee.com/shared/source/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="openmp"
-
-RDEPEND="x11-libs/gtk+:3
-	dev-libs/expat
-	dev-libs/libsigc++:2
-	media-libs/libcanberra[gtk3]
-	media-libs/tiff:0
-	media-libs/libpng:0
-	media-libs/libiptcdata
-	media-libs/lcms:2
-	media-libs/lensfun
-	sci-libs/fftw:3.0
-	sys-libs/zlib
-	virtual/jpeg:0"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	dev-cpp/gtkmm:3.0"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_configure() {
-	# upstream tested that "fast-math" give wrong results, so filter it
-	# https://bugs.gentoo.org/show_bug.cgi?id=606896#c2
-	filter-flags -ffast-math
-	# -Ofast enable "fast-math" both in gcc and clang
-	replace-flags -Ofast -O3
-	# In case we add an ebuild for klt we can (i)use that one,
-	# see http://cecas.clemson.edu/~stb/klt/
-	local mycmakeargs=(
-		-DOPTION_OMP=$(usex openmp)
-		-DDOCDIR=/usr/share/doc/${PF}
-		-DCREDITSDIR=/usr/share/${PN}
-		-DLICENCEDIR=/usr/share/${PN}
-		-DCACHE_NAME_SUFFIX=""
-		-DWITH_SYSTEM_KLT="off"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/rawtherapee/rawtherapee-5.6.ebuild b/media-gfx/rawtherapee/rawtherapee-5.6.ebuild
index 48b8dca754d1..e59d05f213b3 100644
--- a/media-gfx/rawtherapee/rawtherapee-5.6.ebuild
+++ b/media-gfx/rawtherapee/rawtherapee-5.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://rawtherapee.com/shared/source/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="openmp"
 
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index 4182bb9c9723..1d7cabd03e2b 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,3 +1,5 @@
 DIST ristretto-0.8.4.tar.bz2 581374 BLAKE2B 8d4dc91daa1aebf7d8193d8a48c3be29ad6fed86b7fbea68effb63f6a56d2d39898b5ab0c93933adf9d65cce327109dca5ecff96855c4311494de7cc4182213f SHA512 c5479cde66e4f0903b9b8d9b1b8f4c7cde35ebfa334e414c8202e783c332bd4bfec650f85d308c7151d31fe84b27a13bb4048290b0a82ce7b8ba4baf3e4088b8
+DIST ristretto-0.8.5.tar.bz2 583736 BLAKE2B b2c0582eb7930eb3bdf9941dc086befd6a81f0d3aa8ea5ecdbedb00f7914287937e520c5257853d080dca4ebee08f1c40f8e8386a6de90856721a804462e9cab SHA512 48d2a68cd13e58c0f450fc674b031a4fc4495ece0ae00805f0564a5bd9cc2ac19c1c009726dd343bdfeffa59509f0ecc9cd069986af5a2ff2c2566c4490b5fbf
 EBUILD ristretto-0.8.4.ebuild 876 BLAKE2B c950d825ab3ba23f9a0660a45c18874d591271a86e03c32d77be2908af0628cd1936290505f03a3b523ffd8932a453a8467d5c37062b6e19800635b8835c812f SHA512 42a4b7741c85d52878adc859fe4b9c9a7c5680c59be2c9c52bc9768371c2f39b89da1f01130c63aa4e66420b7d637531355c9eaea418d761b80024bfceb8c337
+EBUILD ristretto-0.8.5.ebuild 859 BLAKE2B f78523b7231cc1539b258c3fefa5087702c85859c456d7bd3200c5edbb194deda98d7ba0fa3e5bed4ee37461f5990a7f77db5e68b6cc86724fc298317e6a302e SHA512 0a9dcd229aebc553cf39dc4b349b737eea6d30941e60b05c4c8236cba84de6af4532f26a9bd1f77b39d7dafdb25f7a7b6b596226f0191e2ab73eb684f6495e70
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/media-gfx/ristretto/ristretto-0.8.5.ebuild b/media-gfx/ristretto/ristretto-0.8.5.ebuild
new file mode 100644
index 000000000000..f41ef692e684
--- /dev/null
+++ b/media-gfx/ristretto/ristretto-0.8.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="A fast and lightweight picture viewer for Xfce"
+HOMEPAGE="https://docs.xfce.org/apps/ristretto/start"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.24:2
+	media-libs/libexif:0=
+	x11-libs/cairo:0
+	>=x11-libs/gtk+-2.20:2
+	x11-libs/libX11:0=
+	>=xfce-base/libxfce4ui-4.10:0=
+	>=xfce-base/libxfce4util-4.10:0=
+	>=xfce-base/xfconf-4.10:0="
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+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/transfig/Manifest b/media-gfx/transfig/Manifest
index 86c0c4d992f4..32d1f7d26f68 100644
--- a/media-gfx/transfig/Manifest
+++ b/media-gfx/transfig/Manifest
@@ -2,4 +2,4 @@ DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6
 DIST transfig-3.2.5e-gentoo-patchset.tar.bz2 21130 BLAKE2B 1c07bc7e85fdde29f5e9290bf3c0df75610a7c219f001920b7412d2c104fe1d8d5b2698d91cde1c08f57d4718547c2dffa0aa859bd53a295c55a285ca4f5fbb7 SHA512 4c6ca63159ae58c35c1a9c818bc3b29715a4015e6a11d283b4d0c57c0cfeccbf38160f61f3c91f9bc68f82a8b5676349bb98866f40f617bb95afd73267d00e97
 DIST transfig.3.2.5e.tar.gz 531256 BLAKE2B 830a97cb801b9cb284f7746a7f4a9645263cc34fd35d904288143d730331901302b12223ba135d8fa936f5ca0eeccacd194bbe2e74dfcfbf0cf4aede273ab507 SHA512 ed1379f1112514d90a4b3eecd3222baad311d804b5090e8e66867ec299e4f9a5f8d83ef8939aa6ecaa85a18143b8fb9b97f78e078ac5eeb934a158c55de6bb1e
 EBUILD transfig-3.2.5e.ebuild 2941 BLAKE2B 3f759d189bf7a67cacd0710192879ee03b094d7f04638c7ed86981339f0c79fd00fac734f0fd7cef3133b54821936c817bad65db282287292b50c21d2486e4a1 SHA512 c681938d553ecd9c30ba294a051498c3a8b4535763d148878d9ed9624493f42d478b0531887d6ee5d2accf608ad5932d8429d4ac603de14f16cd48a95921c823
-MISC metadata.xml 212 BLAKE2B 71dabc83d0433b968a559d72c4d8a18ff9477e154e5b7e72ca22b859a0fec0ae23b0fdad7233686c6c1e20178142f5c60bf93f58db30c5109106e4d86b9f1cef SHA512 05c3af7b4c872998a64d3d6dce356ad1bfeb67f4ec845e82e022a89c96945ba5fe8848df48b8736feb39bd4d9a7d6714f0895a9c824e3c67d903ea3da1ca0f22
+MISC metadata.xml 238 BLAKE2B 60ff9cbe893ace8f33a3d44ee85a5c73c9bd5553478173bf92c4aa93398ae1140ba28673eb6c7373ac48ede6679546b57ea08b8e676ce5c7a47792a2ba8b3148 SHA512 65918555949ddfef068a9a197dffda69aee483ac55c1b52dcf19376aecf1cb53d8a3fc0931d4ebdbe64ba3341e2a2567d56c2830eb31e6746735449c53a1203c
diff --git a/media-gfx/transfig/metadata.xml b/media-gfx/transfig/metadata.xml
index 327363b300a4..05e2c4230006 100644
--- a/media-gfx/transfig/metadata.xml
+++ b/media-gfx/transfig/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="sourceforge">mcj</remote-id>
 	</upstream>
diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest
index cc7e1af21847..0e5e6557f1eb 100644
--- a/media-gfx/xfig/Manifest
+++ b/media-gfx/xfig/Manifest
@@ -3,4 +3,4 @@ AUX xfig-3.2.6a-solaris.patch 523 BLAKE2B eeae0cc11ae6e3fd6e8c157648d8663131d0d1
 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
-MISC metadata.xml 212 BLAKE2B 71dabc83d0433b968a559d72c4d8a18ff9477e154e5b7e72ca22b859a0fec0ae23b0fdad7233686c6c1e20178142f5c60bf93f58db30c5109106e4d86b9f1cef SHA512 05c3af7b4c872998a64d3d6dce356ad1bfeb67f4ec845e82e022a89c96945ba5fe8848df48b8736feb39bd4d9a7d6714f0895a9c824e3c67d903ea3da1ca0f22
+MISC metadata.xml 238 BLAKE2B 60ff9cbe893ace8f33a3d44ee85a5c73c9bd5553478173bf92c4aa93398ae1140ba28673eb6c7373ac48ede6679546b57ea08b8e676ce5c7a47792a2ba8b3148 SHA512 65918555949ddfef068a9a197dffda69aee483ac55c1b52dcf19376aecf1cb53d8a3fc0931d4ebdbe64ba3341e2a2567d56c2830eb31e6746735449c53a1203c
diff --git a/media-gfx/xfig/metadata.xml b/media-gfx/xfig/metadata.xml
index 327363b300a4..05e2c4230006 100644
--- a/media-gfx/xfig/metadata.xml
+++ b/media-gfx/xfig/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="sourceforge">mcj</remote-id>
 	</upstream>