gentoo resync : 16.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-16 09:32:48 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-16 09:32:48 +0100
commit: 9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
tree: b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /media-gfx
parent: b17a3ef12038de50228bade1f05502c74e135321 (diff)
87 files changed, 1235 insertions, 230 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 0733721718ea..f630e6e76334 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/autopano-sift-C/Manifest b/media-gfx/autopano-sift-C/Manifest
index e275de057a46..99cecd4bd1ce 100644
--- a/media-gfx/autopano-sift-C/Manifest
+++ b/media-gfx/autopano-sift-C/Manifest
@@ -1,4 +1,4 @@
 AUX autopano-sift-C-2.5.1-lm.patch 516 BLAKE2B 79fd443c4c2f321aa93982fb08ee7d8c6c9b588286e5f73d55c89ab014d53f569cd1de93f5846543ec33c2f9616dca65e932ce21cae47eec1c28b9a3c5ef56f8 SHA512 6198eaa686ab22a7707f840cc81c2fc68c9b02ce9d7831d28d255543bd0898b318b5d00b4f7bae487a6e4c70f4d0af75bfd61aeb07825cc70475e2988bb39002
 DIST autopano-sift-C-2.5.1.tar.gz 192267 BLAKE2B 552fe33230d322b5b33c31a6298058d30a8dd63110f15b1af25fa53aa762a5d9924a712523b626ba2381692c643c0bec44534bd5d2cc69b00faaf5b7fbd51d91 SHA512 4f3c9e8738c7bc29ff6284033b7b813de61ef440c3d544755be8c4ad715a6e4175801ee4c02642df5e05bac82929c5554d85a5c488a2c27da1e5e81d3cd72931
 EBUILD autopano-sift-C-2.5.1.ebuild 618 BLAKE2B e2a58d968de9493c676b4f04051c0b9fc46631ab9cf074fa9f40a802f6dfa120c06f112fb1c59c6d895793ac04d6c6489b2a40db989f25c07e6925b295b75bdd SHA512 895c0f448253cdb8ace54fc0c6d9374ea50a76c79b9b468daf95d3b03681a8e9ae8eb01b57c3c6e06a2b11825a62c348afe6bc8200d1b3e70bedfa5bb43cbb56
-MISC metadata.xml 380 BLAKE2B fe97d444243215c10fa02a9bf9d314358f971a04152087cc8071221267cb792bbb966bce0a0fe001021cb185a69fb4fc99595699dbdf918a3c36ebff51bc1565 SHA512 3e3130aa488e5a1eb4acfe8faa42ee37856a2b048a81b4829fda4a1376e11ab46cf73b858697cc621780ccb921d60d654864cea0be76f9c19977a1cf55924daa
+MISC metadata.xml 242 BLAKE2B 5b14580839e0095bbf38a5ef4012ad45d44dd9923d9b1c04ce68b7a7c0ee746965553854933280c8384653cc0a67a69844a00cb7167c2fb22c1d2fb044ed016c SHA512 20b5112a69b93703ba404eeb80fbf522445c0aa1c9513ab89507f62646b4fe8bf524d558ff1299b88f5fff9d149fa03c7f35e299ad8e292b3a31944f20dceeb3
diff --git a/media-gfx/autopano-sift-C/metadata.xml b/media-gfx/autopano-sift-C/metadata.xml
index 106eda55ad0f..f602a555b7e2 100644
--- a/media-gfx/autopano-sift-C/metadata.xml
+++ b/media-gfx/autopano-sift-C/metadata.xml
@@ -2,8 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription>autopano-sift-C is a program to automatically find control points
-		for stitching together panoramas.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">hugin</remote-id>
 	</upstream>
diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest
index d7b7640c98e2..a8e4cb401450 100644
--- a/media-gfx/chafa/Manifest
+++ b/media-gfx/chafa/Manifest
@@ -1,5 +1,5 @@
 DIST chafa-1.4.0.tar.xz 388932 BLAKE2B 0ccaae1495bd410b05d291ebcf2b6266374f013536ec1b953d6127e63c20b11ff78e96772309caeb5c4bbfc40729f60291b0ab3d2395824801aec7763c1ac2b3 SHA512 e464750296db0eca5d718ff70dbb51529abcd4ff3d5bdd15f20f10ff0207f282e8b59799476fc05718efb48b81b331ae1518d450efd6b62b98a41049e1c6e9d5
 DIST chafa-1.4.1.tar.xz 389428 BLAKE2B 8ed6c6d57953d784763f10c274bd8b7acf7857b095bae58c476d2e17418a7112f1ec000d667eebfc2eda712c9588e686ad4021da017f4d187a5461c0435c5476 SHA512 f0bd1911fd544f93afadbb2105f151dc77e31a2f3af4c7f8441a06f547a7ebe0674664721b18c3a35a7c4e745dda666713adc1dfbe5e97dfdc54856a13bd5063
 EBUILD chafa-1.4.0.ebuild 862 BLAKE2B 934006cdbe8cb31ce8368470f5c6176dc072565daf8bf10501a2f61e213ab0fabbffc57226e178ddd67c5e0f027e55134658c9559ebb74b68cdc1422aaaae07b SHA512 2d852cd464a12bb6390af4e8f2ea75a46203f3f681d1b58ecee4dcc744280fabef5e12bc7949cb1b7c0cbac66ea26384c7025e76e1eec2e5eca7c06dd8de9291
-EBUILD chafa-1.4.1.ebuild 869 BLAKE2B db6ecd6db50d2b42c871962a2cf91da65695e25fd8b02de492a055d84db744d6b240dedc569bf551996c4ca2681770644f6492e7c7fb8e75a5dd2b4bb1ac09d0 SHA512 d4e0a8b5e19aaa7704c3e5962d33dd667131c821744d031b78c1dcaff4f976086e2e722caf0678c4b2ddaf57b5d4edc2b067d35a232e2333b0ff65417ea95fa5
+EBUILD chafa-1.4.1.ebuild 867 BLAKE2B 72b955618b8ed3c3e2906d41071ebf531288ecafd0d44e6a7e333c9151469a8f22dc8004c874f87c79fa46082348fe2ba20e838b475a602c9882a29a76d05962 SHA512 ea1fa10ef54acb434eece699d2c8330d82a4108519f420dc3a800f92a5221425f849010c8e74c266152d3787461ff8eedda08138ad49c9ffbc2cfc4d3a11d123
 MISC metadata.xml 516 BLAKE2B ef0a2e140a6d37d3ace556ac5a6d299caa1fae8e37d93fe8aa43104a2f02d14fd4b5ed1bd218b2298616bcbc3c571868cc7e04d0a5f3ac2b091fa5588d833cbb SHA512 57bebde0a948ed0269c4decdf2b6ac8064f90dde344c547a67cbb40191eb3fb444b147ed8122ad79ba1acb487fc93ca1fb33afb5df80a41c7128e314ac4640ac
diff --git a/media-gfx/chafa/chafa-1.4.1.ebuild b/media-gfx/chafa/chafa-1.4.1.ebuild
index 36e373052197..aecb3393c1b0 100644
--- a/media-gfx/chafa/chafa-1.4.1.ebuild
+++ b/media-gfx/chafa/chafa-1.4.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 arm64 x86"
 IUSE="static-libs +tools"
 
 RDEPEND="
diff --git a/media-gfx/cropgui/Manifest b/media-gfx/cropgui/Manifest
index bb732e5e9d55..d1bd1aa03723 100644
--- a/media-gfx/cropgui/Manifest
+++ b/media-gfx/cropgui/Manifest
@@ -1,3 +1,5 @@
 DIST cropgui-0.4.1.tar.gz 852958 BLAKE2B dcc6ba775e49af9a9fe1054fe5246e87e044f47cb7ca20712e5048dd1fa0fda35ee90c38cf733540913d0220eb58ab0a6dcfe93c7b02ebb9e022529b8add6c1c SHA512 85b0c2c57faecdd7db15e417234f2ea50fc5edbdcacaedcfc53cda68c3a070f4ba0201bff9afbaa3de7c51552309df1ac3e87586b4021e68bbb255a2545d92da
+DIST cropgui-0.5.tar.gz 853934 BLAKE2B ac7cf32495e3ac728223994f79252fd98a0a5cf7da79a9c6796ce3d7b213c797b16250be5d23a1bc6bed492f142a95411d6cbd42fe34242016c4e0181bfd90c4 SHA512 2babea9ea6089c74637c9023ea08c2ae4f666fbf44bb73d7a301de6fee6848e65a86fab312e765f7bd05e8e03bf3e92942d718ea84a950412385a8e0b6aa0630
 EBUILD cropgui-0.4.1.ebuild 1098 BLAKE2B c70f86c3cc622e43bcea65dbb18bde644191cbc4b5ab3e21c66442726cdb581e9dec2e4839ab4f488915aff4cca249b207346a9edb20e986283b1fd1f14a5546 SHA512 969f1d799d14b182c82660a8fae072a09e07efc85798ac125da18eef9d4e6abe0ce161f6d08b5a9d9fc95acda7973838c7aaf6e51792d6629d0422e01ca21760
+EBUILD cropgui-0.5.ebuild 1100 BLAKE2B 8de6ba402cc343918f474ac5ed09eb9e3f1adfec9517e18e6493db139becea2eb6b9e8001e839e5ed41512783372c5a63fac7f8250c0ab3d60f8aad544872bde SHA512 4c2f4e3617d3237a6dee4f3822be2e83058ce11ed627dc10a06119359f5896f027cd9cc4d484b8408730704c0218ed282168c53d6e13d318702ba7c96b169077
 MISC metadata.xml 322 BLAKE2B 90aa45b1eb0991ece5ae99458d976775a725221c0a472dc7f7667ad8b72c322f549aa33099669d5122807d5965348950edfd2c0bfa811435d11149e4577a230c SHA512 05b261ca819100fadde1548385d1632b157bfe6ddf1c7a876703f51d04a8aaa68f2d0aa18b188878c07fa27ed54cd65ec5ec4c4c042788fbbb525271ccda07e3
diff --git a/media-gfx/cropgui/cropgui-0.5.ebuild b/media-gfx/cropgui/cropgui-0.5.ebuild
new file mode 100644
index 000000000000..9f412bfb5f0b
--- /dev/null
+++ b/media-gfx/cropgui/cropgui-0.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+inherit eutils python-r1 desktop xdg-utils
+
+DESCRIPTION="GUI for lossless cropping of jpeg images"
+HOMEPAGE="https://emergent.unpythonic.net/01248401946"
+SRC_URI="https://github.com/jepler/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]"
+
+install_cropgui_wrapper() {
+	python_domodule cropgtk.py cropgui_common.py filechooser.py cropgui.glade
+	make_wrapper "${PN}.tmp" "${PYTHON} $(python_get_sitedir)/${PN}/cropgtk.py"
+	python_newexe "${ED}/usr/bin/${PN}.tmp" "${PN}"
+	rm "${ED}/usr/bin/${PN}.tmp" || die
+}
+
+src_install() {
+	python_moduleinto "${PN}"
+	python_foreach_impl install_cropgui_wrapper
+
+	domenu "${PN}.desktop"
+	doicon "${PN}.png"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/crwinfo/Manifest b/media-gfx/crwinfo/Manifest
index 07d768d868c3..2c8a8211af34 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 595 BLAKE2B 7fe6d06ffde199a51c73fa1d3918640fc32691b8af4dedb8ec89b2f35e8b977b651ccdab3329ecb7fcd9a4e8223d04472620302c277fb702375ce7b869d84eb5 SHA512 8167820347e2d825227e089dad7000c866ef2e9ee8d7ea9a54ee3d9025f27f6a2b8fd94a9320d7faa9f4c0850a498eead932364b5a96eec600bba509f2940b5e
-MISC metadata.xml 369 BLAKE2B 82f9df6d1668d42aeb01f7632349addc219842853a89150515007bea21d058c9b92a6d38598c2cc35bdf8957ea8e40f0bcab55953443afbbd79e21a2c2921738 SHA512 ee3b3a975b809e4433e7a6242a788f016abd75a969c6898ed07861d38b609d11d5cc1997c19165128760ed3f99022dac64f3f63cd2281ff86bc78023d7c40709
+MISC metadata.xml 242 BLAKE2B 3ebb02c611a041f50333e1f36151e7a0b1c901a0c3f3bad55dfbb7b348d0dc3b989cbb87fdad304f56b47b62d0bcccf2af11fcc816f8b523ab1c265e0d35e9cf SHA512 d10ad1d85a15809fe3555c02b15d361239f7b00307632150ab64d4c5cd2d4c52577b3599fb79d3977f479b438215e6a6ef4ce29d8773afe569ed6fbfce85d75d
diff --git a/media-gfx/crwinfo/metadata.xml b/media-gfx/crwinfo/metadata.xml
index 4e06ffe952af..7b7f99802425 100644
--- a/media-gfx/crwinfo/metadata.xml
+++ b/media-gfx/crwinfo/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		Utility to extract thumbnails and information from Canon raw (CRW)
-		files.
-	</longdescription>
 	<upstream>
 		<remote-id type="freshmeat">crwinfo</remote-id>
 	</upstream>
diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest
index 4fad1dece6ab..46f064b026e5 100644
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@@ -1,11 +1,14 @@
+AUX curaengine-4.7.0-fix-tests.patch 359 BLAKE2B a84af3a8b47f2bca74f8aa3bc774a55719fc642048edca310dea0568fddff6cc90269f1711006c26dcca2b64d997a34858442fd674bc99b03aeffcafb93820bd SHA512 9ef48243ada474e2639cbf804be381ac1dabfd656ac58a2a296265b3d16bf416a867147a2f7415256bb0af14ff994e5eeb2e42e61a6f36afa29f7a96bc7ad0e0
 DIST curaengine-3.4.1.tar.gz 949312 BLAKE2B 4902575c40002ab49e3ef13c94c8531b6975ff62e58012dc48744e2d27e9d1767e8f7768250179a374ed24da5a5e2085e9c194068ad6ffb98fff0595a314f7b0 SHA512 51c75e299ef7728101a4c61aa033c9b07112b0955d2ec72ba6173684513ed3c503a744fab487efe2c19da01eb97bd1297b5b8724b4f767639c8e82eefcdd01be
 DIST curaengine-3.6.0.tar.gz 1390109 BLAKE2B a0a6b8016bb5fa2f772634a671fc391df45875fc36cdf100f00ce34b9d5495f32986c473b1ba4c184cb77e50a64e2648c5d4f31053790182e657b0c981e1412c SHA512 340dad4c697fb0d7b633091715a904ae7df8973626e217ae2528d0121723c07a6cf0bbc740b9ad9980f3b288fa690c9c3ee43d90914264855dace007bbb334c8
 DIST curaengine-4.2.0.tar.gz 1654657 BLAKE2B c11f77a126e49c1c63550accd42c3616ab647d2575de0f11e64cb2188e7c565a54f3613e296c3f19e8534a7a758162fe29cdd62e8d62d691a7d9c9e6430545ce SHA512 6c3edac5a21068b50a31d3ab37dac58b986e18be2d24711d77cf210da62b521d62dc92a1b4e8865a26e5c394119349f03b3816d19d67ebee670424cc4a7b2500
 DIST curaengine-4.3.0.tar.gz 1656780 BLAKE2B 9b93e3f294a8a67c2cd4f2d4462a4047e6860e0c391e7ff550b24c498faa82fd2af4fd044845f00f93fb01d38ca3fa1511bfe65a7456b5a6e0b919821be5ab8f SHA512 60ca0ce586c0cf5f1516f803b2a05a20299ef8193f065acd6e11a0054903189225f9c60be1b536ffe5a9a22652097acd3a4aae2833920a468071b78f213f7572
 DIST curaengine-4.6.1.tar.gz 1685119 BLAKE2B 352c5b4b98866ebe6f90dc095960d2417ccf9c023334b4006b604da45aed1e3b6066700b08be3727214433fd505de87cad4da8e17d9067571d91dd0ec7660ebe SHA512 8b3a65fb00bebc37acd24a6d4277c1f09849c0318fca00867479d62c0f64b8628064a898128e1ffc5fb99eed2c1d45a310df2f97fde9c37a9ccc311f5ba4d057
+DIST curaengine-4.7.0.tar.gz 1684860 BLAKE2B da25da5656eb2c2d9cd9bd1c8ea0f633284a6d300f2b5ab7a916be262d20106d07a17a5c5ac63b854b32e98f616ecadbc05a912146f4f6d396c646ca69637116 SHA512 4c5f2eb70912315595e7f090ba9a34196ecb740eb25b5b2da2decf6485260999e8a87f7c2619c6efab9b46280e9eecf11f7e6bb021359c3b72da9fb900b0c1c3
 EBUILD curaengine-3.4.1.ebuild 902 BLAKE2B 5216cfc20c7b68f326828fcab00d1d116dc6ad3f2f4a5b158d6e22a91b4cd7a5081bdaed05ab9fb18c8d135460f1396c0559a1edaecc3c6c94e143e876d6ed0d SHA512 dd985e6460373739dd368b5fb31c35f3fce4a403d64f77db968e32a0186eb1ad0a723b71ea7c67e7d71581012c529bff023ba7ff49e5324883c30b970a55a71d
 EBUILD curaengine-3.6.0.ebuild 902 BLAKE2B 5216cfc20c7b68f326828fcab00d1d116dc6ad3f2f4a5b158d6e22a91b4cd7a5081bdaed05ab9fb18c8d135460f1396c0559a1edaecc3c6c94e143e876d6ed0d SHA512 dd985e6460373739dd368b5fb31c35f3fce4a403d64f77db968e32a0186eb1ad0a723b71ea7c67e7d71581012c529bff023ba7ff49e5324883c30b970a55a71d
 EBUILD curaengine-4.2.0.ebuild 1513 BLAKE2B 51f109e8db08e5e3d0caccc1016628e6570dfab14f30a5b061bc25cf2edff0516bc50409271f26e592f9223d775d4fbce66d8b48b6cdbb914e3115208d7b2a09 SHA512 78ca9ad1b1d59f3274021d57fe3e2d14b7225315e8eaea2179c656bfecb58e59384dcf520d4c5fe1d05af5dec21973cd8020af116eadd75969d1331d08d82d00
 EBUILD curaengine-4.3.0.ebuild 951 BLAKE2B 477593726cb519294f189d8175f04168582dd756de4c0a86cb254f750cf1c0736b9913365e81eb48fe821e5b2c771d1468e5a7cf3e36bae7339d0aa5310affcb SHA512 f5974e877bd0c885f2aa5856ad410b05a16029039ed87913ccb03adedd804b1cf474addb526a8f961902f45b231199b32db852bc8b78aace2b559342715a0686
 EBUILD curaengine-4.6.1.ebuild 955 BLAKE2B 733f85ddaec6e24923289023a83bba47c0f9fbd29be348ff0a338d39bdf8655255cddc54afe14d53600195c178169d3c1a83b26f25739884fee166498280596b SHA512 92d6924c086f4e8b022105d235467dce86d7f65466a9df97026f625eed054a6ec45f2901202c5cd70f5d11ddb9093de0632530e64e04957b1a86dea7eec3f569
-MISC metadata.xml 862 BLAKE2B 233eef15a865c598451d8a6100a8dc99f4c9a4c4ae4f8692a473ad2b8de5c2bc5216052b2bbf698e98f1c7f8156512084beaebc6148b9bc333d5c09d9bfda3ba SHA512 92e4cf75b949ac201537780bc5acf295720da8a342f6d882e2ca3b36aaa5691a3df31e6cf79e44b25f88d2f1177a1b6227165cbe8b9da8762b35560927239382
+EBUILD curaengine-4.7.0.ebuild 2280 BLAKE2B 512648356a1f9155dff7d720ed14de5c76133fe87c8a17799d7eeb4b9610c12d34928a1448800351d8e7183186333ac2005ba99c151e6641b5ad70fac666f089 SHA512 e83fd950243da16b6974694c691fab84f6c4e3cb855c13abd88d402f3913da19df0391dacc073c00a37242b638eba11b0c628006fe843bb6ad15e8d17b5bf589
+MISC metadata.xml 1468 BLAKE2B 7aec44b3b8d90adfa9c95365a7e299907fb0879c2358d5770b96b41f175d0d916e6786b25cc7a3b39f599d2a3e61a00cd4b3a0d039c95cd6e0fd122d2be54e4e SHA512 3ab874f2117073a17297234b29e95b70fe73ab90fbddcfe024586dc2b0b47af23998e0cc5ae271614be95f4c41fc2a9485f097ba3eefea0345d8d592d5e0f390
diff --git a/media-gfx/curaengine/curaengine-4.7.0.ebuild b/media-gfx/curaengine/curaengine-4.7.0.ebuild
new file mode 100644
index 000000000000..a644aeef81b8
--- /dev/null
+++ b/media-gfx/curaengine/curaengine-4.7.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs
+
+MY_PN="CuraEngine"
+
+DESCRIPTION="A 3D model slicing engine for 3D printing"
+HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+arcus doc openmp test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	arcus? (
+		~dev-libs/libarcus-${PV}:*
+		dev-libs/protobuf:=
+	)
+	dev-libs/clipper
+	dev-libs/rapidjson
+	dev-libs/stb"
+
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( README.md )
+PATCHES=( "${FILESDIR}/${PN}-4.7.0-fix-tests.patch" )
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	rm -r "${S}"/libs || die
+
+	# remove static linking
+	# respect cflags
+	sed -i \
+		-e "s/-static-libstdc++//g" \
+		-e 's/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")//g' \
+		-e 's/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE_INIT}")//g' \
+		CMakeLists.txt || die
+
+	if use test; then
+		find "${S}"/tests/arcus "${S}"/tests/integration "${S}"/tests/settings "${S}"/tests/utils \
+		 -type f -name '*.cpp' | xargs sed -i \
+			-e 's <../src/utils/AABB.h> "../../src/utils/AABB.h" g'\
+			-e 's <../src/utils/IntPoint.h> "../../src/utils/IntPoint.h" g' \
+			-e 's <../src/utils/polygon.h> "../../src/utils/polygon.h" g'\
+			-e 's <../src/utils/PolygonConnector.h> "../../src/utils/PolygonConnector.h" g'\
+			-e 's <../src/utils/polygonUtils.h> "../../src/utils/polygonUtils.h" g'\
+			-e 's <../src/utils/string.h> "../../src/utils/string.h" g' \
+			-e 's <../src/utils/SVG.h> "../../src/utils/SVG.h" g' \
+			-e 's#include "../src#include "../../src#g'|| die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test ON OFF)
+		-DENABLE_ARCUS=$(usex arcus ON OFF)
+		-DENABLE_MORE_COMPILER_OPTIMIZATION_FLAGS=OFF
+		-DENABLE_OPENMP=$(usex openmp ON OFF)
+		-DUSE_SYSTEM_LIBS=ON
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		doxygen || die "generating docs failed"
+		mv docs/html . || die
+		find html -type f \(-name '*.md5' -o -name '*.map'\) -delete || die
+		HTML_DOCS=( html/. )
+	fi
+}
diff --git a/media-gfx/curaengine/files/curaengine-4.7.0-fix-tests.patch b/media-gfx/curaengine/files/curaengine-4.7.0-fix-tests.patch
new file mode 100644
index 000000000000..33feab3d3949
--- /dev/null
+++ b/media-gfx/curaengine/files/curaengine-4.7.0-fix-tests.patch
@@ -0,0 +1,13 @@
+Upstream issue: https://github.com/Ultimaker/CuraEngine/issues/1318
+
+--- a/tests/utils/SparseGridTest.cpp
++++ b/tests/utils/SparseGridTest.cpp
+@@ -1,6 +1,7 @@
+ //Copyright (c) 2019 Ultimaker B.V.
+ //CuraEngine is released under the terms of the AGPLv3 or higher.
+ 
++#include <algorithm>
+ #include <gtest/gtest.h>
+ #include <unordered_set>
+ #include <vector>
+
diff --git a/media-gfx/curaengine/metadata.xml b/media-gfx/curaengine/metadata.xml
index 58e8297dc744..45587a19e8cd 100644
--- a/media-gfx/curaengine/metadata.xml
+++ b/media-gfx/curaengine/metadata.xml
@@ -21,6 +21,18 @@
 		<email>perlovka@gmail.com</email>
 		<name>Michael Perlov</name>
 	</maintainer>
+	<longdescription>
+		The CuraEngine is a C++ console application for 3D printing GCode generation.
+		It has been made as a better and faster alternative to the old Skeinforge engine.
+
+		This is just a console application for GCode generation.
+		For a full graphical application look at Cura which is the graphical frontend for CuraEngine.
+
+		The CuraEngine can be used seperately or in other applications. Feel free to add it to your application.
+	</longdescription>
+	<use>
+		<flag name="arcus">Build with support for communication library between internal components for Ultimaker software</flag>
+	</use>
 	<slots>
 		<subslots>soname major version number</subslots>
 	</slots>
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index fa13164eae01..1fa4b86e591c 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -2,6 +2,8 @@ AUX digikam-6.3.0-cmake.patch 2038 BLAKE2B 73c6c7d008c3b76f9347f4192d435e10aa360
 AUX digikam-6.4.0-qt-5.15.patch 1499 BLAKE2B 8d82d27d0b5376d5974dbc4d244dc1e3c683b8bfe392956b2d13cf30753984dd84746aaca049284a2c10f5074a1a9a51b228114c0b3eb02f8ae5ceb20abc00fc SHA512 3794b43734258112dfa693795d62887e66b8c99ffe339de3baa91fcd750d409962934e9bfcfc02f253ff9b4b04241eb5c4f983dc8a1b88a8f15d94d7cd3812ac
 DIST digikam-6.4.0.tar.xz 340146992 BLAKE2B ca1bc8b0d165f9774354d8489a11d46d8d7467edd3c1e90fd3a96024c4b7cd23bfd5c813251183bcca6d4beac9bffeb9d921beaa9a3752f75f1918796aacd719 SHA512 b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c699399994199b848757f0497ad25a7805e42
 DIST digikam-7.0.0.tar.xz 571511148 BLAKE2B 4730a7fd70c7939f229ce6e3e95e8e8f2c37d0e54f033b3161c27e93a2eb5d464a9e1339ba1d6acce4312f91dbc3f4b55333f8b7a9a32d58a20dd04c0fbd8d2b SHA512 379d319dddd49605ae59aa8aaebc96f264f7fdfd8d6fa51be8b097e79add4042072cbc1f52d7bc96e6045b967c01f282e50bf955923016ee6e0cfd07d09e2a24
+DIST digikam-7.1.0.tar.xz 593501044 BLAKE2B dcd124a18299a75c02b51642cc33d2a053f1fce4abd82b3f50ea93cc17e8b302b73284106ed716e815741cc38326695f1303e018998a6687f8cd92ab539faeb0 SHA512 df7138a45ff8de6c1e32cb0eea83e1cd4b67f027b149a696d8feb8008ceaae55934c1f1d9625c1ba29de850ad70aa01dc73f1b7517253ca6aa99f0f97b84a3a4
 EBUILD digikam-6.4.0-r1.ebuild 4358 BLAKE2B ca4ffa68ef7be1191439f94f3d52916c2ef4cb06c1fca12017989290c55ae5f2e819d74286ebac80835792df81a895b3c7d002205c44d698129887e36ddc5ddc SHA512 dc14d9384b6c4ee943dd63ec5a6eb6f5fcde9539cbdc4a34d2e5f2467c83eacb9acbabfcba93ea731b5b97a0a7e5fb07e02dbbe4a35f0bc956883a9ff88bfceb
 EBUILD digikam-7.0.0.ebuild 4084 BLAKE2B fab6cca649fa9ff160e754ec45a5c70a45139c92fc79d8b740c2e24250931a43d6a304c506445db8c4ae1cac3958dce5634ba2cca43719373a0f62617b6b5523 SHA512 3bb5113b79604ae17fdfeee9fffa730dbbb06e884033c9ecb7ab9d23bcc1e30f70d5cabf9d8535503170d953be6abefe21c59f9409aa33dd3946eccd656ba600
+EBUILD digikam-7.1.0.ebuild 3999 BLAKE2B 7ad4b24acbb047408c5a05c5403e5ff52296f3983a0fd09a9b5c445c6da9657eb85fd8d05fa137be247329d7f7b70f322f11dd92c8cb5d3c9a4e1ddbe9842972 SHA512 a7ed90a1f046b88ead5542dd62d4ac7cbf81f1f19e4d2cb11a8b30de6c1d8967ed8ffb45ac128765f16f1215c3c4542c7b5ce9f8041d706bf229d7f00224fca4
 MISC metadata.xml 1368 BLAKE2B 5dec50abba4f748e1f8eb465807c719f4b81759277241169d9e721749a1ba807425f7d46e9feb1edb4dcf3b4dd00b40bfbb353fe479e29c8a1878ad1fbfb5082 SHA512 4cd1ada9c4274338e49a692095d80b572c309bd34c838e2663a18ec1e7230de87e27087febfedde46a0f6af19f1a3f440335750375117d20eacd0c756db8b2f8
diff --git a/media-gfx/digikam/digikam-7.1.0.ebuild b/media-gfx/digikam/digikam-7.1.0.ebuild
new file mode 100644
index 000000000000..d630d405febf
--- /dev/null
+++ b/media-gfx/digikam/digikam-7.1.0.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org toolchain-funcs
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	MY_P=${PN}-${PV/_/-}
+	if [[ ${PV} =~ beta[0-9]$ ]]; then
+		SRC_URI="mirror://kde/unstable/${PN}/"
+	else
+		SRC_URI="mirror://kde/stable/${PN}/${PV}/"
+	fi
+	SRC_URI+="${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Digital photo management application"
+HOMEPAGE="https://www.digikam.org/"
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop X"
+
+BDEPEND="
+	>=dev-util/cmake-3.14.3
+	sys-devel/gettext
+	panorama? (
+		sys-devel/bison
+		sys-devel/flex
+	)
+"
+COMMON_DEPEND="
+	dev-libs/expat
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[mysql?]
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=media-gfx/exiv2-0.27:=
+	media-libs/lcms:2
+	media-libs/liblqr
+	media-libs/libpng:0=
+	>=media-libs/opencv-3.3.0:=[contrib,contribdnn]
+	media-libs/tiff:0
+	virtual/jpeg:0
+	addressbook? (
+		>=kde-apps/akonadi-contacts-19.04.3:5
+		>=kde-frameworks/kcontacts-${KFMIN}:5
+	)
+	calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 )
+	gphoto2? ( media-libs/libgphoto2:= )
+	heif? ( media-libs/x265:= )
+	imagemagick? ( media-gfx/imagemagick:= )
+	lensfun? ( media-libs/lensfun )
+	marble? (
+		>=dev-qt/qtconcurrent-${QTMIN}:5
+		>=kde-apps/marble-19.04.3:5
+		>=kde-frameworks/kbookmarks-${KFMIN}:5
+	)
+	mediaplayer? (
+		media-libs/qtav[opengl]
+		media-video/ffmpeg:=
+	)
+	opengl? (
+		>=dev-qt/qtopengl-${QTMIN}:5
+		virtual/opengl
+	)
+	panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
+	scanner? ( >=kde-apps/libksane-19.04.3:5 )
+	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+	dev-libs/boost[threads]
+"
+RDEPEND="${COMMON_DEPEND}
+	mysql? ( virtual/mysql[server(+)] )
+	panorama? ( media-gfx/hugin )
+"
+
+RESTRICT+=" test"
+# bug 366505
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	ecm_pkg_pretend
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	ecm_pkg_setup
+}
+
+# FIXME: Unbundle libraw (libs/rawengine/libraw)
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=OFF # bug 698192
+		-DENABLE_APPSTYLES=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
+		-DENABLE_QWEBENGINE=ON
+		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
+		$(cmake_use_find_package calendar KF5CalendarCore)
+		$(cmake_use_find_package gphoto2 Gphoto2)
+		$(cmake_use_find_package heif X265)
+		$(cmake_use_find_package imagemagick ImageMagick)
+		$(cmake_use_find_package lensfun LensFun)
+		$(cmake_use_find_package marble Marble)
+		-DENABLE_MEDIAPLAYER=$(usex mediaplayer)
+		$(cmake_use_find_package mediaplayer QtAV)
+		-DENABLE_MYSQLSUPPORT=$(usex mysql)
+		-DENABLE_INTERNALMYSQL=$(usex mysql)
+		$(cmake_use_find_package opengl OpenGL)
+		$(cmake_use_find_package panorama KF5ThreadWeaver)
+		$(cmake_use_find_package scanner KF5Sane)
+		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/dpic/Manifest b/media-gfx/dpic/Manifest
index 74e1d47faf40..ab7c740ece92 100644
--- a/media-gfx/dpic/Manifest
+++ b/media-gfx/dpic/Manifest
@@ -1,5 +1,3 @@
-DIST dpic-2013.03.10.tar.gz 583366 BLAKE2B 22b2d67e619bd1f1bd324edfbd5cd12ac55a121d1b419572ff889d8b835f57c583120b128430522da692292af47e94b6dd24c76fb753940a317f66003d0d8169 SHA512 a1c29f32bddeabfcfba1e0253ab502ca2c32c9ad4d490c8b2a7569643972a65ebdc26215888aaba7b2954b217e1667b469d49affb0a771832e98aa5ad25dd9f5
-DIST dpic-2016.08.24.tar.gz 1241900 BLAKE2B fe065892006de496b53ebaa9db5f15758f8e772569ad69cc2972b7b00e2f9a90643efb38f482f71935e958220d42964a033e3ce26dac03241b29e097afb570f1 SHA512 5e8fae76d79f8bdf8ca4427c4cb4ea6be272edc74ff5f8ab4c9434283fe9c5443fe4fb2d4a0fba1c17f14ed05f2d82aeb26cf186c797e3a93d92508f3557d630
-EBUILD dpic-20130310.ebuild 709 BLAKE2B ad12b6c2e21c35713d68e8e353f6669e05bd3f7a0a1f7f223a07e6cdb0aa6998b0ce526fa00475737064d9b346e2a76738d0f227cfc59c1e09c9ad403b6b7409 SHA512 71941028f67cf0f21a7e393a7411bdee2deaa4b0d2e5741256066a92a497f9e95c61f601a7ecdd5b37cda5f4d18b9a4161a9f55fd8eb2ffca08fafb6246a98a7
-EBUILD dpic-20160824.ebuild 707 BLAKE2B bbd3270bf45db76dc094c662e4c323c4d5d41cc467f6e0f8f1aebaa062a658c4b95b683c49853b1cbac32f7d780f02eb744df92827cdc143ee4edfe761e4c92e SHA512 e4a9a48b15cfd00a3db5336bb23beffcb8c38c038c99b33938123f9547351a14579250d6461f8a8575a9420a855995ebc7e40ddc4f553c7ba709793477f9b7f9
+DIST dpic-2020.09.01.tar.gz 917159 BLAKE2B 4b9007b5e1f47b0e764447411b9619f35da63f7e629838e6be420847477b173b1bb31118a2f343bb30daea344dda3b8dcea0169617264299de42e276ed539141 SHA512 a2f9c8e24388c07613e5d76492d5516bcbc7ee19a9eb2e40239456af78b806f1ea2808c61d0288eea9e34c2e0e0433b8a083796e2b8cf66982941c3b7660cabb
+EBUILD dpic-20200901.ebuild 644 BLAKE2B c99570626c7b241f58cc3719175ecc01a0a7ee341eae33490cb88b46a638ddc4dc5c845644736e00b0209e07b715e759b53a7af341638e320a0c2acc0db10fba SHA512 d48edeb0418f57230e367518b397c2ce4768e323e1c20e84c510b6e9c373a7cc1cd78bd03920f31fd07b4afbf5ab5a4194570368ead0f81f9e173f7fddc3857a
 MISC metadata.xml 670 BLAKE2B 1387329f346524328caa10bb9bd449b2e2e83d1f98ef809980218e7e9feffa2ab2fd90d6b9030e3040084948e96a085886bee9bfa64e26f3df5b0441bd0b6e12 SHA512 c236776d4cdc5c202ef03aad5eb4b94906ea9d2981773d0bf05460147cd73b2ef9f64b354ba3782e95c0effa5b9b0564f427e78cd3c776f7bae9e57471db0eeb
diff --git a/media-gfx/dpic/dpic-20130310.ebuild b/media-gfx/dpic/dpic-20130310.ebuild
deleted file mode 100644
index 6fb72b844180..000000000000
--- a/media-gfx/dpic/dpic-20130310.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Converts PIC plots into pstricks, PGF/TikZ, PostScript, MetaPost and TeX"
-HOMEPAGE="http://ece.uwaterloo.ca/~aplevich/dpic"
-SRC_URI="https://ece.uwaterloo.ca/~aplevich/dpic/${PN}-2013.03.10.tar.gz"
-
-LICENSE="BSD-2 CC-BY-3.0 GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin dpic
-	doman doc/dpic.1
-	dodoc README CHANGES doc/dpicdoc.pdf doc/gpic.pdf
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/media-gfx/dpic/dpic-20160824.ebuild b/media-gfx/dpic/dpic-20200901.ebuild
index 1340997077ff..eb96fbf0dae4 100644
--- a/media-gfx/dpic/dpic-20160824.ebuild
+++ b/media-gfx/dpic/dpic-20200901.ebuild
@@ -1,28 +1,23 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Converts PIC plots into pstricks, PGF/TikZ, PostScript, MetaPost and TeX"
 HOMEPAGE="https://ece.uwaterloo.ca/~aplevich/dpic"
-SRC_URI="https://ece.uwaterloo.ca/~aplevich/dpic/${PN}-2016.08.24.tar.gz"
+SRC_URI="https://ece.uwaterloo.ca/~aplevich/dpic/${PN}-2020.09.01.tar.gz"
 
 # dpic: BSD-2, dpicdoc.pdf: CC-BY-3.0, p2c: GPL
 LICENSE="BSD-2 CC-BY-3.0 GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${PN}-2016.08.24"
-
-DOCS=( "README" "doc/dpicdoc.pdf" )
+S="${WORKDIR}/${PN}-2020.09.01"
 
 src_install() {
-	dobin ${PN}
-	doman doc/${PN}.1
+	dobin dpic
+	doman doc/dpic.1
 
 	einstalldocs
 
diff --git a/media-gfx/ephoto/Manifest b/media-gfx/ephoto/Manifest
index b7a7a4dae5ca..78704bb8e818 100644
--- a/media-gfx/ephoto/Manifest
+++ b/media-gfx/ephoto/Manifest
@@ -1,3 +1,3 @@
 DIST ephoto-1.5-1.tar.xz 327004 BLAKE2B 73b6f72085c845e3bc39a70f1a5b087741ee9d2b6d0a7678af90b78dd08cd68defd7256a12e4ce2f9acab1fc93aafcfcac0f2ee689e9ef0b68f8837446fbf58d SHA512 2c56103e6018ef0252dd5efcb0996e9346c383887b6d272f4fddc0b22e0f98dc032049c8521bca6707f1a5d172abc2d6c8e037104f4aa7a5f920fd55a2fad23e
-EBUILD ephoto-1.5.ebuild 562 BLAKE2B d22dc7f708b783d07c55319623d528d4602fa370b81056c148c1d6c0a3181396d0e8915cde663e679128c9e0e01db2bd87bd9e56b03f20c74e91bf199bc73ff6 SHA512 1a4e48f84811e6df14110137f2c47cade278989a888cb1f692bd97c98762a0d5269eef17fb60558edbc14f75c4b6d3cf5b6bdfb23a91a61deeaa48e442ff9ee0
+EBUILD ephoto-1.5.ebuild 575 BLAKE2B 198c1646f1e6ffdfb63737d40b6b9b88a32f391070bce32c9ea96145442c39c35d8df651e43e9109ae267ee1b40811cb89845a11a939f3c43add9e2784508e68 SHA512 b27b0a09d84ccee58067bc8350daa09de38fd67d3afa068797207c63f7452c3b4021b0a213c1b9aab8384b4d14a421d6822e4246d75b8f638084d01eaa72223f
 MISC metadata.xml 1113 BLAKE2B 26731e35dd88df506debdf22fe037093433f03f3639a87ddff42770b63309b3c69e5a2caed1cd717043f7b353d1d6da7f2f3a7c3a2bd8bd922e86c6f6eec9784 SHA512 d044c92df38d066afc19253852fed55696aa6d4cd5d7bb227040a4d35f3a297348073834b75c177abf4a75602ebfbee525f74e5c0cb308cedff96263ad187bdf
diff --git a/media-gfx/ephoto/ephoto-1.5.ebuild b/media-gfx/ephoto/ephoto-1.5.ebuild
index 4279e7ce070d..766bca265ca8 100644
--- a/media-gfx/ephoto/ephoto-1.5.ebuild
+++ b/media-gfx/ephoto/ephoto-1.5.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit xdg
+
 DESCRIPTION="Enlightenment image viewer written with EFL"
 HOMEPAGE="https://www.enlightenment.org/about-ephoto"
 SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz -> ${P}-1.tar.xz"
diff --git a/media-gfx/exact-image/Manifest b/media-gfx/exact-image/Manifest
index 382f331dd8d9..c66dcc10734b 100644
--- a/media-gfx/exact-image/Manifest
+++ b/media-gfx/exact-image/Manifest
@@ -1,10 +1,11 @@
 AUX exact-image-0.7.5-libpng14.patch 2435 BLAKE2B ca832920ad7bd1b2f1def6faa04e0b7d70d177f859966ef44223ab6c26813d857456e8adc70367c4275338a778e23dd158694ef826da47070abe3e789c5f0df6 SHA512 4f216f96c4190c4f04991368d92e685592f694cb3c9f5dab90281a9bc1f06c9fcaa817494fb15412f5dc427750558019b6e2aeef8769ed932e974e201776bd48
 AUX exact-image-0.8.1-gcc6.patch 6101 BLAKE2B 3dba7f2688a5c59282486f492131edaf104c3c9e7d335f1893467ef6d968b466e344ae1c1992ea080cee4d267001dd6555aaea3a23dfbb0a5748c5262d364fbb SHA512 e11a9dca3c5c6ac4ca5557e6ca212354346b307c38abe77ceaea9f15ef35f5a8de8d24628b290c4ecfdaf84dee44af49414d57c89b067e78b60a02d4e09a5dd4
 AUX exact-image-0.8.1-libpng15.patch 754 BLAKE2B 81b47c6198103f37cc5f0a382001129a10140bead8f98119eb52079ed97d67d9bfd56b60278023f680d66107aaa6f2dea4a035a194c404e33e548f2e37f90f49 SHA512 7f3d271d908e55e3731b38e072dcadcb0d99cbf3de327d5bd486e232c2827055b8f712052e04c9bc81b20fd42d27cc18627a6bc118c9d1ece58b91c18fa9bf13
+AUX exact-image-1.0.2-dcraw.patch 496 BLAKE2B d9d86facb3b0f9721d3f5791d4744bbf71d3802c094e4d1f20de44898d817a8319b78c0cd011670d53beec35bbf9efb477c9b3e20ac2724a48017c5d0746c634 SHA512 409cf7ad9963b5e6f4997ad5b466a86c5c3179bbfe63f14311a1297c9e87423f7d838b2b037109029a8dfa6125d7bbacd53f069d8634c1ffdd2c946d40e70b99
 AUX exact-image-1.0.2-g++.patch 936 BLAKE2B 6ab787c1393228bb1671c8a2d7b76969fcd11d26f0c14ca08a95cee7241422205d8cb398f2a6b711e884c476cba662718705848a818b1944428b2a207133fede SHA512 44fafd62c713bc59c1cb774924394ad32a13c33b79696a4762e3730108650ccd3033f554fc8b0d7cf9b71126367bce5b90074f2c954ca57c8389975b57eac5e1
 AUX exact-image-1.0.2-gcc6.patch 2795 BLAKE2B 17282b91baa020b94654c92d87611001584f82360303a56e70cb8f081caf400394a367982e115bff094dfe11a0798503a606de106f1bf6427b57a9ede1cd6ed5 SHA512 ef42fccab6d0958df2dcf86578f9df1f84254515c2bea611f256e23227b9d6dc917467f2d8f54230f9386e9726152c6bbe4ab4f3d117e0da5a3e99b00e93e348
 DIST exact-image-0.8.1.tar.bz2 283660 BLAKE2B 49aa68640b785da59fd0e04d0a0892ad06adbc286a98bf908e60e77cfd273263e83dce3c9eb75c30f422c2b6eef2178dd0585aada63f992291abf298b369f3aa SHA512 0adc51c5a29415e236a963cfdaf8f5527e628e9a645e87d00c69a7185e60639cfcd9b1c2b4c3abe1826c5364f0c5d45a0ebb8923cfed53d041d1d36b2604b565
 DIST exact-image-1.0.2.tar.bz2 322174 BLAKE2B 67afefb4c5a52416459cd4ac6198012eb6d7895a73ea8363fae05286c7e7f62aa1a02166985f53b5638c7dc7b23b4dc1fb1c7b2272a9dc595ce329a7083ee1b9 SHA512 8ba5a198a236ddf5fa58f40c80f32ba9d300376c637a13a7acf3d2db7906fced373b33a7ecff9cff4d09d8b21de9ce1fb9f5bfb1f4522557bd01af0e3d6dcc65
 EBUILD exact-image-0.8.1-r3.ebuild 2289 BLAKE2B 93a144bd88c5d743e24f34cf9920d97662cd5db725e952012237e2ad89c9f2a53734989a2e94d20346752ec275c940f2ff3ffe8e72c1d134a8d9818f434b1bb2 SHA512 dc14b66c56f7733019b433ac5b7b348bf105dccac9157c3a1ef03789bb5e33d7a2e0d2fd466a097d950c7a50a123581f40d62b81c1d2abce2213cde851465ef0
-EBUILD exact-image-1.0.2.ebuild 2261 BLAKE2B 8a32e0ba2118ca0f17eab822ca025599b8c8bc6492f59a4bc7fdbc0779545407e9d580b0649d8b221340af4e3eccc9a7bd088eb520092f490aa78bf339d2436e SHA512 4f9b9a1ce0fa1bd92f0744fc1888f54957e4d915666bd08a52f4c32b9ce2f68b54ed350615a03fe1522bfef0ebaadea462a33a8581e1b4d014a3064ca1dfa8f9
+EBUILD exact-image-1.0.2.ebuild 2293 BLAKE2B dc3139e8131b7417adcb9f35c60bab060a4ad3d58a47360fcf8c973c503c9e3cf8ccc6aaf5dbe467eb7033c72b5d990ad6bbea30c0097ef2c8f3a0282fae47c0 SHA512 775b3b9ba817cd8bf5cb0028e3eb34896941e73f75144ebae30cac0568a62ea4c84bf0edd08ce8520536488e126bf16d7670b3a2a22fad4df83dd99ea5a5b467
 MISC metadata.xml 329 BLAKE2B ceb9ef8fb31cd43ccaeec69b64fe88a4894da38dd2c45a1b74dde46161daa3d437fc9e2d7a699c8ca57acd8bb6ad06dbbbe173eefcf243ee2f78233046a7006b SHA512 eb4d23c96cd7e20afb64bf80075a0cfcdb27c69ca075261d54676c47044ca6d120dd5b80cb2217787b71a9db02688764b0b3f2147c6a6e652954e43cafaebf57
diff --git a/media-gfx/exact-image/exact-image-1.0.2.ebuild b/media-gfx/exact-image/exact-image-1.0.2.ebuild
index 0cea0d26cf53..2c2e93b4fffd 100644
--- a/media-gfx/exact-image/exact-image-1.0.2.ebuild
+++ b/media-gfx/exact-image/exact-image-1.0.2.ebuild
@@ -39,6 +39,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc6.patch
 	"${FILESDIR}"/${P}-g++.patch
+	"${FILESDIR}"/${P}-dcraw.patch
 )
 
 src_prepare() {
diff --git a/media-gfx/exact-image/files/exact-image-1.0.2-dcraw.patch b/media-gfx/exact-image/files/exact-image-1.0.2-dcraw.patch
new file mode 100644
index 000000000000..ba609c294b17
--- /dev/null
+++ b/media-gfx/exact-image/files/exact-image-1.0.2-dcraw.patch
@@ -0,0 +1,11 @@
+--- a/codecs/dcraw.h	2020-09-10 08:42:19.905105346 +0200
++++ b/codecs/dcraw.h	2020-09-10 08:47:50.826316874 +0200
+@@ -9956,7 +9956,7 @@
+   strncpy (th->desc, desc, 512);
+   strncpy (th->make, make, 64);
+   strncpy (th->model, model, 64);
+-  strcpy (th->soft, "dcraw v"DCRAW_VERSION);
++  strcpy (th->soft, "dcraw v" DCRAW_VERSION);
+   t = localtime (&timestamp);
+   sprintf (th->date, "%04d:%02d:%02d %02d:%02d:%02d",
+       t->tm_year+1900,t->tm_mon+1,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec);
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index 5b1c101cbbd5..c0500ac4b79a 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -2,14 +2,15 @@ AUX fbida-2.10-fprintf-format.patch 172 BLAKE2B 1abaa348e1bdd459b9f6458d361bed01
 AUX fbida-2.10-giflib-4.2.patch 542 BLAKE2B e41f1cb27860b0fdf99d4e9a3961021e4be64f6ac9e47099e6dd7b784b96599490137f6340e54052216af1692e2d9177d831612248ed7be849e6141ab5eb86b0 SHA512 7610721d965c3640c4524311626ba099501cac1aef6cea62d32158e8a7720cc23bdb0c83422795676de021f88a592c3d2f7d4d26d810dc06d959f7c85e91019e
 AUX fbida-2.13-Autoconf.patch 239 BLAKE2B 749fa77fe9f2a5b8b61051dcebfacc6efcf97cd2f9bd7d9d4de737bca89689203dff7a1c3baff620289ddc211419a1b31a3924b7542049db345af5503479e5f0 SHA512 b87ed3f79fe9efea02fc97d6cde0e6d67c2e6baf93ab3a19564090f2806cbfa1b67610a16a4151ba8df31d570f79f8f964dd608ce4fda95e7f7cbcc562902847
 AUX fbida-2.14-Autoconf.patch 244 BLAKE2B 52b9fff1bcb3eaae0753842e953566ce7eebb4ff445dc288b2ca84342247ec0744dac9327c53dc863cf564543e791305d5a27ffda059837320cac461f4e222fb SHA512 cb31757e3ca3eabbff4c4ecb27581b39b8fef386412b4f26558a070b6b08891b09a31a06861d965009f5158e03ab227b86873f4b64316cf63bc7b51ce6074221
+AUX fbida-2.14-cpp.patch 222 BLAKE2B e8bfabd42c57a08261982b0ab71532135db8a289963c12a0ee3d8793806761a630a75671c655a2ab25cc24be714fa25eababac6f853d7b2323f2dac910741bba SHA512 8fe4bc3e5eb6bfbb8b362807238d9635df9dbc11b4f33a5ed485000f59722c68d3bc8a93953d74e7b86af33d7107c6fb7e253798396a4574baf517a41e44db14
 AUX fbida-2.14-fno-common.patch 1148 BLAKE2B 108c21e732afaebe6183835732341b814b1def9a77a4faa55742858d2eeb75a8d2ba4c4151505dbaa683b31b49e1ce6d88aef6ab9b3e6b830a59533903e02597 SHA512 4fe7560be0a5cb4f00ebe8a1574f131b6fd83902c6dbe54995f384a250b25b03e5f0022a5c38c306a709de6240f447c53c9af3ba3aca863b08e725567746185e
 AUX ida-desktop.patch 384 BLAKE2B 627319b163e62af11acc2c0957254cc671145b9df22f27af8988e5f0bcdf383f7cf2ad4fa7b7c97acfbba3181081ee1c025c4b3c82e99bfd7fe4efe69edd59c0 SHA512 0e14a3b848774d1538e309a9c8a8f0445a870db21723d11d0c39d86760ccb9c6f9a5f08ec75016875b2867c2d2075b59aad0fa810621f2c2afcccd14fef26737
 DIST fbida-2.12.tar.gz 294842 BLAKE2B f9de5957f9015e022868d2b14d0269951fccbe8f10b591b3b58758fb67232487aaaf2de23c8ee9b42a7ad9e645e3fed2ac1f05588c039ce9270f418b60b1a3da SHA512 383eb766a98137f7252cd981d0e8c9a7382223705a43332f50990ea26763d4882ed1585e72fe9199528502d7f8f9de2e90718dbce71ee08d2181c74aa3e7e515
 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 2413 BLAKE2B 2fde21f65df975032f3638e2f22ff4aef0ccd81b408e571fe88cc180ae9cc7d11c00f296158abac0c0b891dd46d3bc9c9bbd0a4e4e332e9c53cb074c74e256da SHA512 e2b31fb9cee9204d38060a2269996c8142a981e0179e67ab86bfebb7967bcfae59a45794106e9e741a5a5269b307290885bdfa1b009919550a034d7302390200
+EBUILD fbida-2.12.ebuild 2414 BLAKE2B 893937473fba4502d1ea4cb6903b42a21a64ac0aece55d5b5991b741ed6f80e5f02139e3348c8116d45e0a2819076165e3cc3ccae1864455a3e9a0a29310f526 SHA512 d63b867ea02fdcbb3a39aec5c358b3eb0de7bc30fbd318b1066332ddcf073f5f8ccfe5cd73b59d2e5518d6a72b758cd248c2c65bca44c1fa7cd08908e266b388
 EBUILD fbida-2.13-r1.ebuild 2395 BLAKE2B b3f42d22b78ce8a0fe9158fad16daef4cf0fea76585c0f83035604b48664dd9f8a98adcbe2cb6e47fdd4c2fde8f33ec03087796c656dcc92682954864a54333b SHA512 e1809154631d9a298007bd02fca72914ffe9244fd904bbd6fa322831e944f02887cca4ac8e7dc50411efd0cd9356cb4ae663677cfd2a50eda5357132c082c30d
-EBUILD fbida-2.14.ebuild 2391 BLAKE2B d43531e71d419ade0e6c06bb2fe92bb72523e466af372a94d6291eeb9dbf3ec36ffbb61ea293e7c590c844f846685c96ee7fd7de78009bfb877dc879891f5b5c SHA512 29ea58a36af771231ea4d7cef4004681662440495ae98893bb143bd0e9ec26fb653688eddaa65f667241a868103e2216394b3685f3543f3848c9594d4cf73209
-EBUILD fbida-9999.ebuild 1261 BLAKE2B 13ca3dd7089feb7104c38febddacd22f3d856543d418d08897ca53b82b1e112660cc2db58c5904cf7a52fd2ed0b81a072c606168c7f5e19d5ebcfeb9aa2922a3 SHA512 fa8c7e06f7ee7ee7e4acc6c926558497de046bd5a895c8027fe715d8b83d4c803cd4971ff307b16685a1f87f37d3c043fc417fb89ca19431018501086bb58f29
+EBUILD fbida-2.14-r2.ebuild 2496 BLAKE2B 666bcb15a1a59db0d811c7016fbebab486d2ea5994b2f5bb92b48aa7f9ab320b1a32dc389d6a71d996ae815fb72fefcfb5e1f4b4037d5d90ab2ed461a7c6f4de SHA512 f321d0b96591e4107eda976e530165f2597d4ac44e0fdba6f1bdc20af9d8d8398491620e0167190bb94f3c255b9c161a8904d46c92a10e27bfd3a6bc7385d90b
+EBUILD fbida-9999.ebuild 1349 BLAKE2B b011518d4f9816d0440b1bfd853fe97514e236fa20fb5eee942924b7e30751b981e0eb13a9e819627dff1af7b866b10c3712cbe0554d30e96e3bf5e7fddaa285 SHA512 10d5b89d83f020f3c14a9a68c622a96cd864ef8081b8163967938bacf592d1594ee8c09ff248515de246835a0a4e4fb78a768590f459bf53883011bede177ca0
 MISC metadata.xml 439 BLAKE2B 66a897b749b63e389153a97d84be2d4cf7e9c06c0b967ae715bd8202e038005ee724110d7d62ff99ef6ba21c8a365634f9350fc43e7dce44c81717cdeee85c54 SHA512 078e39413b3d63c3324c1f98e83b1b9747f2653108e34986dfc869cc3b65452d1b85ecefdaab17c0c53bd50cdb879f68c8b55a9da7d0cdee47ca329af10eec58
diff --git a/media-gfx/fbida/fbida-2.12.ebuild b/media-gfx/fbida/fbida-2.12.ebuild
index ac6cac234948..80d37357377a 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 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86"
 IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp"
 REQUIRED_USE="
 	ghostscript? ( tiff )
diff --git a/media-gfx/fbida/fbida-2.14.ebuild b/media-gfx/fbida/fbida-2.14-r2.ebuild
index 9e5d00b136d3..d0237a1e80d4 100644
--- a/media-gfx/fbida/fbida-2.14.ebuild
+++ b/media-gfx/fbida/fbida-2.14-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils toolchain-funcs
+EAPI=7
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)"
 HOMEPAGE="https://www.kraxel.org/blog/linux/fbida/"
@@ -20,17 +20,21 @@ REQUIRED_USE="
 
 CDEPEND="
 	!media-gfx/fbi
-	app-text/poppler
 	>=media-libs/fontconfig-2.2
 	>=media-libs/freetype-2.0
+	app-text/poppler
 	media-libs/libepoxy
 	media-libs/libexif
-	media-libs/mesa[X(+)]
 	virtual/jpeg:*
 	virtual/ttf-fonts
 	x11-libs/cairo[opengl]
-	x11-libs/libdrm
 	curl? ( net-misc/curl )
+	fbcon? (
+		app-text/poppler[cairo]
+		media-libs/mesa[X(+),gbm]
+		x11-libs/libdrm
+		x11-libs/pixman
+	)
 	gif? ( media-libs/giflib:= )
 	lirc? ( app-misc/lirc )
 	png? ( media-libs/libpng:* )
@@ -38,7 +42,7 @@ CDEPEND="
 	tiff? ( media-libs/tiff:* )
 	webp? ( media-libs/libwebp )
 	X? (
-		>=x11-libs/motif-2.3:0
+		>=x11-libs/motif-2.3:0[xft]
 		x11-libs/libX11
 		x11-libs/libXpm
 		x11-libs/libXt
@@ -61,6 +65,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.10-giflib-4.2.patch
 	"${FILESDIR}"/${PN}-2.14-Autoconf.patch
 	"${FILESDIR}"/${PN}-2.14-fno-common.patch
+	"${FILESDIR}"/${PN}-2.14-cpp.patch
 )
 
 src_configure() {
diff --git a/media-gfx/fbida/fbida-9999.ebuild b/media-gfx/fbida/fbida-9999.ebuild
index 1da490349569..c8b7ba52c583 100644
--- a/media-gfx/fbida/fbida-9999.ebuild
+++ b/media-gfx/fbida/fbida-9999.ebuild
@@ -6,19 +6,20 @@ inherit desktop git-r3 meson toolchain-funcs
 
 DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)"
 HOMEPAGE="https://www.kraxel.org/blog/linux/fbida/"
-EGIT_REPO_URI="https://git.kraxel.org/cgit/fbida"
+EGIT_REPO_URI="https://git.kraxel.org/git/fbida"
 SRC_URI="
 	mirror://gentoo/ida.png.bz2
 "
 LICENSE="GPL-2 IJG"
 SLOT="0"
 KEYWORDS=""
+
 CDEPEND="
 	!media-gfx/fbi
 	>=media-libs/fontconfig-2.2
 	>=media-libs/freetype-2.0
-	>=x11-libs/motif-2.3:0
-	app-text/poppler
+	>=x11-libs/motif-2.3:0[xft]
+	app-text/poppler[cairo]
 	media-libs/giflib:=
 	media-libs/libepoxy
 	media-libs/libexif
@@ -34,6 +35,8 @@ CDEPEND="
 	x11-libs/libXpm
 	x11-libs/libXt
 	x11-libs/libdrm
+	x11-libs/libxkbcommon
+	x11-libs/pixman
 "
 DEPEND="
 	${CDEPEND}
@@ -45,6 +48,7 @@ RDEPEND="
 PATCHES=(
 	"${FILESDIR}"/ida-desktop.patch
 	"${FILESDIR}"/${PN}-2.10-giflib-4.2.patch
+	"${FILESDIR}"/${PN}-2.14-cpp.patch
 )
 
 src_unpack() {
diff --git a/media-gfx/fbida/files/fbida-2.14-cpp.patch b/media-gfx/fbida/files/fbida-2.14-cpp.patch
new file mode 100644
index 000000000000..1e7635bbd2a9
--- /dev/null
+++ b/media-gfx/fbida/files/fbida-2.14-cpp.patch
@@ -0,0 +1,6 @@
+--- a/scripts/jpeg-version.sh
++++ b/scripts/jpeg-version.sh
+@@ -1,2 +1,2 @@
+ #!/bin/sh
+-echo JPEG_LIB_VERSION | cpp $CFLAGS -include jpeglib.h | tail -1
++echo JPEG_LIB_VERSION | $CPP $CFLAGS -include jpeglib.h - | tail -1
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index 54a59316b5b3..15b40802a9de 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -2,7 +2,9 @@ AUX feh-3.2-debug-cflags.patch 193 BLAKE2B 298f65a8f9142167d1cd2cfce0bc61ad9d7d4
 DIST feh-3.3.tar.bz2 2112880 BLAKE2B 56042367c0acce966e115e77f3afa1acd3f942a956bc453de364bcd17d90393ad2868039a5793af64826cd50322e4ef5f9f2b9678f982c7c85b025ed208f8bb8 SHA512 0372115a8f2df77cdfc0fc1b24479e72d9be1f24127c787909ef671075b199b8d5f873200ce202f51705991cf3c5f5cc71ef8f47294fe520e3a9acc5cb7582a9
 DIST feh-3.4.1.tar.bz2 2114441 BLAKE2B c24e5f54762439cfbb031b4b24ded03f1c0c9c75233ae5b6dc66a7a56922902c672606a1b36fef9b30789c09946c8ccc5f9a60fe201db07e70bcf0ce0638c0c1 SHA512 d674d3134819cf6731aebf8af87a2f890d54dd7f8c64071e8816a032aeeb95c31f56752bb3477be0dfb653f813872b32dc2daf4e0514fed03e3f6bba36896c66
 DIST feh-3.4.tar.bz2 2114146 BLAKE2B 0bc65db77c67c42b693122b877417c3dc4db7a0551cdf62723b3f7c134e5f2bb73ee6d0aa5a0c81402cf5a5f723ceb29a45fb5e4aef1911dc643aeb82c3ef17d SHA512 50cb7fd33b583ee802cbbba8ed7a74e9eb72a141ffa28ab998a196f9f8d030a8192420fc084136f699cb33b1b8c4d8c2c111fa90695dd82a1366330a428383ce
+DIST feh-3.5.tar.bz2 2115162 BLAKE2B 8300cfc0e480afb070d40e35390edb30dc451dc5581add5f377a370bf606f7e7730a99c8a4773accb38b01a4e9b47fe5c95d8e9c2dcf9d71e96a71c4fd11a388 SHA512 69b4c73a8009c5b5e031bdf3c6a628da2f3cd71927d6c546ba2b2cfb6d10912e4a44e5d0de93704645a4dd33d71f1445749abe03383cc2298fa10c2d5d88fb5e
 EBUILD feh-3.3.ebuild 1462 BLAKE2B 6a15abb299ed6f7667e2bb72cc615f8ed9b0c19a85363970f6338703a71650b73a124a6674d2d632ebf282792dc509fd06478cebdcf7cb30d850fed331cfe047 SHA512 0112815c065ba37ad9574bc497d2d6617de4bec7e6fe8a7b2ab94dbdb41fbd1e81631e0d674638026459ff3021a76cab6d1a76370ed87af5b0044ba6eb7f9b4c
 EBUILD feh-3.4.1.ebuild 1473 BLAKE2B eb858644d7a10d27e7bc9258534312c8223431bc364a1714bf6189b8d910ba39fe89c3c78bc0163aeda4576afb8268931917b0137dd4f9fcf066836a9768dcf5 SHA512 acedb3528aeda464305fd704223bb42a6c6f45c10ac93a28b8a09a8097e08924b6a2beda5b7c1bbe71a2c4d08940d9e2c1d916f02a7ee65d477d18f9d0d07d4a
 EBUILD feh-3.4.ebuild 1466 BLAKE2B 7f802e0c0e92c003602a60f1b1faf1c132c88de3ed6b92138075fe3497fb24f0b8fccef12c7e034e31b407b56cea1a751558ae4b8bb723eb29feca80a6a8fe23 SHA512 52cf87f2fffc675074444ba45bb97a6aebce8c144d29799091040fe9e590a83229bed60120561e0fad18134220f3f9de211b3fb0b19a8d57a8b42c8b00327117
+EBUILD feh-3.5.ebuild 1473 BLAKE2B eb858644d7a10d27e7bc9258534312c8223431bc364a1714bf6189b8d910ba39fe89c3c78bc0163aeda4576afb8268931917b0137dd4f9fcf066836a9768dcf5 SHA512 acedb3528aeda464305fd704223bb42a6c6f45c10ac93a28b8a09a8097e08924b6a2beda5b7c1bbe71a2c4d08940d9e2c1d916f02a7ee65d477d18f9d0d07d4a
 MISC metadata.xml 252 BLAKE2B c64921f238c2751f1f0746df3d109951ebf79c5e1ed5a2fa6d9c33f5420a6ff87c52a5387048a35c148e8cdd29beb406001a9aca3f6cc0f396a78ccb37ae2e3e SHA512 39fbe572d744f1a6f2a23b85a7d62706c478d05f2c74c30e48ccfca5ffd8f26d968fe0869fb9eed4b6494c655f950ab6445346da6eacf85d10da0c1a627cf59b
diff --git a/media-gfx/feh/feh-3.5.ebuild b/media-gfx/feh/feh-3.5.ebuild
new file mode 100644
index 000000000000..7d87a35ace60
--- /dev/null
+++ b/media-gfx/feh/feh-3.5.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs xdg-utils
+
+DESCRIPTION="A fast, lightweight imageviewer using imlib2"
+HOMEPAGE="https://feh.finalrewind.org/"
+SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
+
+LICENSE="feh"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug curl exif test xinerama"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="media-libs/imlib2[X]
+	>=media-libs/libpng-1.2:0=
+	x11-libs/libX11
+	curl? ( net-misc/curl )
+	exif? ( media-libs/libexif )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+	virtual/jpeg:0"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXt
+	test? (
+		>=dev-lang/perl-5.10
+		dev-perl/Test-Command
+		media-libs/imlib2[gif,jpeg,png]
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch )
+
+pkg_setup() {
+	use_feh() { usex $1 1 0; }
+
+	fehopts=(
+		DESTDIR="${D}"
+		PREFIX="${EPREFIX}"/usr
+		doc_dir='${main_dir}'/share/doc/${PF}
+		example_dir='${main_dir}'/share/doc/${PF}/examples
+		curl=$(use_feh curl)
+		debug=$(use_feh debug)
+		xinerama=$(use_feh xinerama)
+		exif=$(use_feh exif)
+	)
+}
+
+src_compile() {
+	tc-export CC
+	emake "${fehopts[@]}"
+}
+
+src_install() {
+	emake "${fehopts[@]}" install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/freepv/Manifest b/media-gfx/freepv/Manifest
index c0624b8cda49..b84de8dcdbb3 100644
--- a/media-gfx/freepv/Manifest
+++ b/media-gfx/freepv/Manifest
@@ -5,5 +5,5 @@ AUX freepv-0.3.0-noplugin.patch 1099 BLAKE2B 41c3c76e19d058764a700665f7c139f3b1d
 AUX freepv-0.3.0-stringh.patch 273 BLAKE2B 16781116005749beead28a96190ae04f19808934c20d52f62c7c858a6eb42793b5de2bc394373499636b7367e48819e1e48fe4cf40dcb9de80c3001d395d34ae SHA512 b368117f3a675df53e76ada4b13aa6d99f2744f006b2a8d6e37c96c5a1c62f48383042a519e82d03bd569192615de94f1b87dfa851178924d6b002522372b67f
 AUX freepv-0.3.0-unsigned_short.patch 1787 BLAKE2B 975d3b534deb4198b505553cd05f34369db07a98706a2b6154891cc1d163e538ca9430d91db340fcf88ea2e9b6325c3047af4c24d0e248fb384da7a749ea2eff SHA512 aba4a7b0d882ebce73b5ec823e8a51cec2788efdc4d9000c9d48a3c07a77e88dbee1e24ffdb1a57b2a4ae45b9310b25cf0157c15d73f8fffdf0a2582e8b88078
 DIST freepv-0.3.0.tar.gz 175545 BLAKE2B 7169679ffb5eeaefb4f558056fc7abe9b8093722e21c0313bf22ad9839c8274d58f8123758a5842bfe06edd3fd9b84b927a25b932607efe7d0f67b772d99c8e3 SHA512 0b207dc25c51b19fd76637743adb8e395c6098d03611612086d66d3f1aa6e4d0c5700aa0e23210082d6aa7495f19d1c3d8f0f93ad11a5236df86d709d5f71a7d
-EBUILD freepv-0.3.0-r5.ebuild 1065 BLAKE2B 1390f41b75114a3ae735e3d55fa666444f6272bc9184a7b3b6893d590a3b04e59e77eb96e5cc1a6fe388b9d704b89551335c1a6ee216c16cda3ae33e6d4bd9a7 SHA512 32077cae06f717bb1e07331d07e1f945e2968eee23907891e6c20341c074a48415b1cd20209455d30f4c17cf9b9e49e46fb83393e92de65cee758a449e54da01
+EBUILD freepv-0.3.0-r5.ebuild 1066 BLAKE2B e264f06842fbf7f1360d6b94cc1fc5014bee983314e3744f56233460ecda897e393ea4607712f528758e41a9d4cde9a13575f41d461486a53192b6545092be4d SHA512 c10e7c0f7b3d4dd01f5b3fbb08c67f9301cb3a27452ae942ae82c1db2ae993d09c19765d5384842b1baecb2baec7d2adbd6c0d988c17998009502ea913fef3ad
 MISC metadata.xml 474 BLAKE2B d3d6659b4526c50e8b141bed97fedbf2dc99626760444f637c4a8601b634cdd2e2c3fa18ab5a269adc32efccaaaaf8f39c7dbaa71b5ff83ad2204417e1e0dc2b SHA512 4466402d68177a660716acf3afdb8ddc2074e8ac7ad35f2ad6b31adc9fe938b39cc999dc082fa07f8787be8798a053a6248dac12091a22d32d9fb83a1022b421
diff --git a/media-gfx/freepv/freepv-0.3.0-r5.ebuild b/media-gfx/freepv/freepv-0.3.0-r5.ebuild
index 018aec18a7dd..db82a97be089 100644
--- a/media-gfx/freepv/freepv-0.3.0-r5.ebuild
+++ b/media-gfx/freepv/freepv-0.3.0-r5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit cmake-utils flag-o-matic
+inherit cmake-utils flag-o-matic xdg
 
 DESCRIPTION="Panorama viewer (Quicktime, PangeaVR, GLPanoView formats)"
 HOMEPAGE="http://freepv.sourceforge.net/"
diff --git a/media-gfx/gnofract4d/Manifest b/media-gfx/gnofract4d/Manifest
index 2efaf114aaf3..6b3373cf2d95 100644
--- a/media-gfx/gnofract4d/Manifest
+++ b/media-gfx/gnofract4d/Manifest
@@ -1,3 +1,3 @@
 DIST gnofract4d-4.0.1_p1.tar.gz 7638038 BLAKE2B c12bade5f219d2d41dc50569c0df315273b0c2a0a6a40543f48f3e4cb766512ed18b979463574db65ac443b1a8dffbcc1f3c9dc04d7c6b89881fdfcfce95c41c SHA512 d7f3a081b3681866d2da911eedab6ec74f22f36d5175a85f93751519e96971cf147b99ddcda32c597283b39e9da4f0fc6a8843331334a18efa3bf459cfd00af5
-EBUILD gnofract4d-4.0.1_p1-r1.ebuild 1666 BLAKE2B ca6a2f20b4cd279798a3a6e3ca9471cc530b131edde088cd511a0ee4f5c0bece2e7e27e5813b91ff66e79856892aa8695a51a764248589ce5661b64b787d1e5c SHA512 eca186d36beba57e9a77e36f8d60224867217f5f3ee6993c16665750a435a32736a82fcbd22077b0d65947dbbc78b6105378cabee51b4d0e294094a269537a68
+EBUILD gnofract4d-4.0.1_p1-r1.ebuild 1670 BLAKE2B 0aa8cdc1939247d7bd32712e84cfeda733cacef5902a52f5c0bffc44d7a8e15855bdd74405b98dfec0261413ed13d91a3dc0fb87fbd0ec84526d2c977ae34dcf SHA512 0ee9619276e583ace4c893e762da5f89fdca65b28f2170fb73e79a54a5da5621c50398a31f5c23987c47362a99414c99041c0ee3ad15a41d0d94ecebb391625b
 MISC metadata.xml 311 BLAKE2B e595489db486352ace6f66c3d72be3f47857ab75d48b8c2c2964bc2466d372eefa5e503f2c089d88cf6aedfd7d076a6595f733b883dfb25276567de67abc6911 SHA512 392ac93a529b535ac58ad270f8d5d4ded4b1cd8914604ef9533dcdf10c08a05e3afc6800f3eb7b546c856e608444a662c6cfea8b436936e1931d7fdfe43b676b
diff --git a/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild b/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild
index 1563bc834fda..752aa4114bef 100644
--- a/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild
+++ b/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
 
-inherit distutils-r1 eutils virtualx xdg
+inherit distutils-r1 optfeature virtualx xdg
 
 COMMIT=bd600c20921afff7b02fc0a76ab79242ebd0896d
 
diff --git a/media-gfx/grub-splashes/Manifest b/media-gfx/grub-splashes/Manifest
index ed2aed7bfce4..7b9d85576203 100644
--- a/media-gfx/grub-splashes/Manifest
+++ b/media-gfx/grub-splashes/Manifest
@@ -2,4 +2,4 @@ DIST 49074-natural_gentoo-8.0.tar.gz 278632 BLAKE2B 3318f98c80cc9be652fae4e6f115
 DIST 98478-gentoo-splash.xpm.gz 18681 BLAKE2B 65969e247cd7c348c4a1c3cd4de5e4d3c4e888eefa11166b1be75272c66b2c7d88beda3bd25581c52d3f7325dc4821f15350bd826f5974444b48ccca19424ea0 SHA512 ea3b6d284e5d41462dede7705a2aa5b6655c1f6aae630cd508dc653391c741cf0a3f487e5694e50769e23696c16279280f89325cfdb47994d8d7210eb447117d
 DIST grub-splashes-0.1.tar.gz 180413 BLAKE2B 4007da6ee3ce221ca6027354c611bdfe54645b484bedeaa84664a82fccadb46a4de2b3bd0b3c9a8eef4af2fce9df23481e9e2f9a18e1999be28245a4a50a3e37 SHA512 af96ff45778ccf062d26ac1fd0ea9cf47678faf9c0891040580e0563ef5591fc9b2c34d338568b77c0683d7c8814b89ff7d62dec582fb714ae503a86ff6b84be
 EBUILD grub-splashes-20091109.ebuild 1018 BLAKE2B d6de69050ad2bff9aadf8de3bda78be792428c4289bbf5666f3229a01f50307049bf45f1ceb3f9eff088fdabb6705ed7665f61efc1e045ed2ef75e01872d66d4 SHA512 ec9ab1f189473f71d65652a32aafdbee502203be6e1f359d5cb7a154eefa7163d9fb3b859091e6967df777a70410364e2a154d201cfc1cce54f26d314919abb6
-MISC metadata.xml 285 BLAKE2B 3c801bfc26d50b4fc9411d16db1e969d5c4a1a342313f56764cc018d3f251bd4829b07eff39e4a3fb517972fe93a58433c3913c1820d3fad1a265ff1b6b5da32 SHA512 ed2ac793160c53dacf32e536c21c9d138bb7634bf54a31cd8d5efb25de87639afbb80fee2c8d772830845ec207f14240bc6edf233bfb68aa3c8ff74d9b52605a
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/grub-splashes/metadata.xml b/media-gfx/grub-splashes/metadata.xml
index a9b4714910bb..6f49eba8f496 100644
--- a/media-gfx/grub-splashes/metadata.xml
+++ b/media-gfx/grub-splashes/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
-<longdescription>
-A collection of grub themes provided and maintained by the Gentoo Artwork project
-</longdescription>
 </pkgmetadata>
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index ddebe75b022a..fa96b4db2509 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -1,7 +1,7 @@
 DIST gscan2pdf-1.8.11.tar.xz 409212 BLAKE2B 37cb716f13818eaffc39c210b810b845368cc5e323569e8f9d5603b5b412c4182520798321358e4c21339fdbd5f15026a0acd6421a49e7db79ecca86633c3ab0 SHA512 1ea09b8768771be4a1700cb8a6523d5f74fcbf0ebe459d97796032b56f896fd0c50e5ca1ed4c96aedef7e61f6952a92986153cc70173dd5ad91ccfb72461c565
 DIST gscan2pdf-2.7.0.tar.xz 468752 BLAKE2B d8f41842c16ff54fff180d2ecaab3fb09c4b7c4d2eac8ba4b6cd2703cca4538844389af8151eaeac030f5962df7ce9192e60c0515f78d2d8aa9aa0ec2973fb97 SHA512 7878d7e77cf107315301bf7adb29c178f4c35c1986780843dfc1742870b8a9bc6cd7a1a0d06f1c37585e6c2050e75222c8af2359b5a7c194f308ba32b5c64f06
 DIST gscan2pdf-2.8.1.tar.xz 476880 BLAKE2B c54e318fa00670f6b2f996791477fd61076abdfe57f2d924cad1fa9092a8796851c9ab503aabb7831ac374e390a19a821a5c7a8b996235deb7d7781b8b47f76c SHA512 2a9f52ce53030f2871d2430b6aab6b06bb1d4e2efbde25ad24196cfa99ad7b13342ff0f2827526020f5c12079e156bc430f891bdb6ffa9545a210bf1cba29be5
-EBUILD gscan2pdf-1.8.11.ebuild 1731 BLAKE2B 0b0f7cdfef98e666e20e44882584e0636e490429186e441d87f965e74071f5076693896e17e68184319dfaf3a1fd4487140209ef3b49603c9496cc936516333d SHA512 b94b73d3396208a8c67c2aad407815329501717c364d60189b21d96f652846e554d59a2a36f4b58383d7f49ab728d4fe251bce9ab1944befb667a9e0c09237b3
-EBUILD gscan2pdf-2.7.0.ebuild 2421 BLAKE2B 0fa711b09f01a9ac476fc921ab6365a785ce4c027f3068a63618d6c7f9a76fb908336e3061fb978a9d76535d60184f475dcc37d5865b1925565ba96d4e7494ac SHA512 cc0d0790aa2dcb1b9faef6ecdee6f14ab0a4f89a0c91099a254695884447dbdc072ba31841aa0d3276ba4e7a43473bf68cfaac2b885e6acd80e1cffb2a146873
-EBUILD gscan2pdf-2.8.1.ebuild 2762 BLAKE2B 9b018438677462c8155ec4d043804d2d74ad3bf4a2f0ebc2cac89557ff791664379fc9d02a3dbf2a936881b23c0de3c6a84a7201ea026997520cf199137ab4c2 SHA512 8ac014f07ee14c17b0c6fe922f1321b43871e16f39f3d207c90cee64b7a68a8b4922d0645095752fdb3c9a3e7fc76c68d6d0ad38d7703a1cb63d846d9eb88867
+EBUILD gscan2pdf-1.8.11.ebuild 1732 BLAKE2B 6f1e069c628d5d3abbb137c7e248783881122eed602420b0d43461b54fb8c7395cf1f40f30b42bbd8577121305b3405f486666fb76e64bb20fab381037bb079a SHA512 6bc6808d5c18b208a2b1a0ffb8778c2a4db0b99b531ea7e861a9739adaf42d5a1aaa8fd95e95ee2c930e1b435113c247f1ecca143b9fcb7fb98d78d7db10fcc0
+EBUILD gscan2pdf-2.7.0.ebuild 2425 BLAKE2B 972f8b38f5456a4de7e70cd1aa5f880cc0451544ef19f9ef41e317598b03ba2560d1df7899cece35269bc044fd25ae87d19f9d13996fe13994b00417cfab4461 SHA512 4aa94273ec47ff844ff5cdbecbc8c9e1a965a1b33a576a7d8abb1fdafa9c5eeb5d99a19ab5dd47e1c530dcd815137757979361dbdfaa3a1cfba693f44b2cd0af
+EBUILD gscan2pdf-2.8.1.ebuild 2766 BLAKE2B be30bbc71adc8f429edc9ff7bba2952aa4f7dee4bb1b41d8de0df8d8af1272589a3b545176527bca4b9c9f0129985005981fbe3d1b3a2c1b4ac97cf9f47bbc3a SHA512 54e8c8c55844b989a9018ada1e4e06efd9cd4d84f20ead711de1de7b85d4e04c1fe71849444f18729068953a92f0bf6a1a0a257197f906b0cf48fd513dabc62f
 MISC metadata.xml 439 BLAKE2B 835480b0d68a079941e94f2646d0136dfb8a8e750e0279f8a5a2e23e6690242582ffe660798f5e80ebfb4378a576aa5715332b53230555866391a99ec28f54ff SHA512 af1cc05ac693899586df81036d2fa11af187edbb3c9449862298ba05efd0dbd0c4c5b008a1a21328c1f9a27a690671bd7a9967d2e457efb31561044e45984401
diff --git a/media-gfx/gscan2pdf/gscan2pdf-1.8.11.ebuild b/media-gfx/gscan2pdf/gscan2pdf-1.8.11.ebuild
index e9f942dadcd1..4052a9af56cc 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-1.8.11.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-1.8.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils perl-module
+inherit optfeature perl-module
 
 DESCRIPTION="Scan documents, perform OCR, produce PDFs and DjVus"
 HOMEPAGE="http://gscan2pdf.sourceforge.net/"
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.7.0.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.7.0.ebuild
index cda89719399f..904dffb20a89 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.7.0.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.7.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DIST_TEST="do"
 
-inherit eutils perl-module virtualx xdg-utils
+inherit optfeature perl-module virtualx xdg-utils
 
 DESCRIPTION="Scan documents, perform OCR, produce PDFs and DjVus"
 HOMEPAGE="http://gscan2pdf.sourceforge.net/"
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.8.1.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.8.1.ebuild
index c0f0b977918c..f383412678cd 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.8.1.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.8.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DIST_TEST="do"
 
-inherit eutils perl-module virtualx xdg-utils
+inherit optfeature perl-module virtualx xdg-utils
 
 DESCRIPTION="Scan documents, perform OCR, produce PDFs and DjVus"
 HOMEPAGE="http://gscan2pdf.sourceforge.net/"
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 099fb93eafc6..25f30f86172a 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,5 +1,7 @@
 AUX missing_atomic_include.patch 319 BLAKE2B 8b122e0f1b61cbe98413b21f90c97826fc75b64c4c12f70b2a3048d4c14151f9f790e5c55fbea6eed518f9bdae57e2620b2be15351d86ae339fd4e38925aa57b SHA512 05f3f392f115d918aae78bb6c82b7461212a26bab826e02b686ad03f8c3f8e4fe0b1c1b89e2982e8912922ef987596501ef4145474e2745bf89487e9ba6134db
+DIST inkscape-1.0.1.tar.xz 32051632 BLAKE2B d17ae49c42908e24aade2216f5adaf56b14ac830decfa2c07ea711c034d144251d5c039f516934a6d004b48165ab3a70d40a7cb7e658ae5e97ef37b392a7d556 SHA512 70145e02fe7c3ffbfa3dcea690bfe3315131fb9a507c70bcdc1d0db394d207e3bd04d7cc86c3b625597bddfd2b6e09a03841aece6d2ffb6517fe1c619193ec96
 DIST inkscape-1.0.tar.xz 31935616 BLAKE2B 096ef6ccfd519118acffa3b15302a2d92f94976f37cf58c1fdab79abb64a2de14d02e1199364c71265a332f57809603ec1b6f4f34b90e910376e1cbc5c6d1cb8 SHA512 37c18079eb926fd6874deee95e4008bae165c5e52d05cb53bbc8f4a48eedd0e0ab6b3e5dfbb23709169187bfe8eb5aa44d576268667f2566a2cd4dd5426554f0
 EBUILD inkscape-1.0-r1.ebuild 3988 BLAKE2B 22cba5fab527c9bedb32d3428b5bf4bd79d6d052cdf883f8178080e4b3bb200e0e087968ca4e121e3a52044ffa5e37130d203a6472e53da2bc1d92f4a7b62742 SHA512 2361552e58e969bc71a988d59b609fff6c991ccdb4df1948a932c20c62286e8d17618505f2b2785a3e3c6611c209e9e1be2fcf052cb955910ccfc0b2f12824bf
+EBUILD inkscape-1.0.1.ebuild 3992 BLAKE2B 26ea32692568ac7eb66e81701adf9d447de4ed961869e8d57e90143b3b7dbf682eb353cffee7e4a9f8c642b948a57bbb83cf70ff6ff3ed0804314e3e648876f9 SHA512 22ab2410bed438b1604082874c0421476c6757af41fe86adf2b40b914956fb63673a4bb7ab73486c34c85e0cda54df18e61774c436a2f78a0dbfdad444a51b80
 EBUILD inkscape-9999.ebuild 3910 BLAKE2B cfab74f275ac4a5adfba4a19966fda81345f5db7e3cc25ed7222a8c29208e893249dab17887dd7a6fd6a76f27f3f559f9e7181ef229e9c7109d0fa47e0546868 SHA512 b24b3f393c8d66dca3bb29de09cdd44214532c25e7de4d0e45c93a8be2365f1ea7208d9f24311299406da02b9c60ad257efd58795f467a7d6a8ecb3d81a90843
 MISC metadata.xml 983 BLAKE2B 5b149700a92f0f4e8a07a643eb004ee6669a668a8a04dd74f13883c858bd2457f8a7f193f64313bf3203fa628484e502a0252272ae8f665a9ebe661589f3637d SHA512 7ab0de464a4dece17f9421bf44a660590c4d453447603a57568a092f90a0005e751cd599ca0923152fc101558c46c479dc65c13a8727b6071a43b1703b459b1e
diff --git a/media-gfx/inkscape/inkscape-1.0.1.ebuild b/media-gfx/inkscape/inkscape-1.0.1.ebuild
new file mode 100644
index 000000000000..c7b103100cf6
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-1.0.1.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_REQ_USE="xml"
+
+inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
+
+DESCRIPTION="SVG based generic vector-drawing program"
+HOMEPAGE="https://inkscape.org/"
+SRC_URI="https://inkscape.org/gallery/item/21571/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
+openmp postscript spell static-libs svg2 visio wpg"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}/missing_atomic_include.patch"
+)
+
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/poppler-0.57.0:=[cairo]
+	>=dev-cpp/cairomm-1.12
+	>=dev-cpp/glibmm-2.54.1
+	dev-cpp/gtkmm:3.0
+	>=dev-cpp/pangomm-2.40
+	>=dev-libs/boehm-gc-7.1:=
+	dev-libs/double-conversion:=
+	>=dev-libs/glib-2.41
+	>=dev-libs/libsigc++-2.8
+	>=dev-libs/libxml2-2.7.4
+	>=dev-libs/libxslt-1.1.25
+	dev-libs/gdl:3
+	dev-libs/popt
+	media-gfx/potrace
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0=
+	net-libs/libsoup
+	sci-libs/gsl:=
+	x11-libs/libX11
+	>=x11-libs/pango-1.37.2
+	x11-libs/gtk+:3
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		media-gfx/scour[${PYTHON_MULTI_USEDEP}]
+	')
+	cdr? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libcdr
+	)
+	dbus? ( dev-libs/dbus-glib )
+	exif? ( media-libs/libexif )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	spell? (
+		app-text/aspell
+		app-text/gtkspell:3
+	)
+	visio? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	wpg? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+"
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+	')
+	dia? ( app-office/dia )
+	postscript? ( app-text/ghostscript-gpl )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.65
+"
+
+RESTRICT="test"
+
+S="${WORKDIR}"/${P}_2020-09-07_3bc2e813f5
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
+		-DENABLE_POPPLER=ON
+		-DWITH_NLS=ON
+		-DENABLE_POPPLER_CAIRO=ON
+		-DWITH_PROFILING=OFF
+		-DWITH_LIBCDR=$(usex cdr)
+		-DWITH_DBUS=$(usex dbus)
+		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
+		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
+		-DWITH_JEMALLOC=$(usex jemalloc)
+		-DENABLE_LCMS=$(usex lcms)
+		-DWITH_OPENMP=$(usex openmp)
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DWITH_SVG2=$(usex svg2)
+		-DWITH_LIBVISIO=$(usex visio)
+		-DWITH_LIBWPG=$(usex wpg)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
+
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
+
+	local extdir="${ED}"/usr/share/${PN}/extensions
+
+	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
+		python_optimize "${ED}"/usr/share/${PN}/extensions
+	fi
+}
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 2d01d4bd7b72..99ff9b14da90 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -20,5 +20,5 @@ DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1
 DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
 EBUILD iscan-2.30.4.2.ebuild 3958 BLAKE2B 3e1284c43d52dd91a6b9e88c2c8d5aef7ee76ed2c7b7a1e0d35781db6f5882efe1ea6c1b1152df86bf0b831941a271bf8c5a9c75fb2fe26646e99d2f73d17da8 SHA512 9b23f93cc94371c33036fec992c96baec8e94b743e732c8579755eec94cfc35ec79c95b879df664783818e03cff648c932e23217b856537a3875bab9c38a228a
 EBUILD iscan-3.62.0.ebuild 2332 BLAKE2B efe846efa66cc80dc3675dc4e1cff7c20eb7902a8523e251bff906c694c0585f34a8f0779235339bdb58442deb8c3e03ae0fef425ca7c6b90ca0d56113da6ca0 SHA512 53ae2081a1956a68deb8dfa3f7b4312ff6b2239300a5cecb3d9aaf8e170906097ca056bf8e7c3c4e5cf566bd0336500305f1dcb85cf429513ecb50cd45a80049
-EBUILD iscan-3.63.0.ebuild 2804 BLAKE2B 74641d8af25e44ff40550977f1ef83fe1f61c01a5d9579e8bca2807cc8566744f2766d4e0be66080155bde35e53e5bf1329574ced45fd94722fcb60082388685 SHA512 21134488ce22b77c190ec26505bb7bf2181b25b7008849cf88d61596154ecdaba2666aa9526d875c4816ba1a0b6a621b27791904d6f6ca5b159ad0cbf7e562c2
+EBUILD iscan-3.63.0.ebuild 2851 BLAKE2B c4214d99f21980e76534285aaefa4b4ba19f9e9dd6f2dbd4c1509cd48b80b081c1a23ec8cb6c32b3a3840ded05d46faf28e499ffc483b4798cdc26fc864974c2 SHA512 67645e77b4df636edcf60e68777f114165715238cfefd22285305d2fdb04565b42ed4cd3efff3ede9c6b2a8b6faac25c291e0e8a8f572e717124c920b3419efe
 MISC metadata.xml 930 BLAKE2B d2cf4fae5cdcb660357ffe5566ad8d99eef6287f565a45f1824c810b3979e9d2930f458766ff524b231ef8dfd793062ff23cf4bfc2a78a36c5393a6c4224feea SHA512 d609a5cd8f8bbc7653e784d153757849eafb9c772355d0928325a6ecf673e8aa055623601d957f912709f9f16acfde5ca0b0480a1f2a17bfc24825895d861fc0
diff --git a/media-gfx/iscan/iscan-3.63.0.ebuild b/media-gfx/iscan/iscan-3.63.0.ebuild
index 7a56c9f57049..3d5f0e15b002 100644
--- a/media-gfx/iscan/iscan-3.63.0.ebuild
+++ b/media-gfx/iscan/iscan-3.63.0.ebuild
@@ -28,8 +28,9 @@ RDEPEND="
 # Disable opencl as during reorient.utr test it produces inconsistent results
 DEPEND="${RDEPEND}
 	test? (
-		app-text/tesseract[training,-opencl]
+		app-text/tesseract[png,tiff,training,-opencl]
 		media-fonts/dejavu
+		virtual/imagemagick-tools[png,tiff]
 	)
 "
 RESTRICT="!test? ( test )"
diff --git a/media-gfx/jpegpixi/Manifest b/media-gfx/jpegpixi/Manifest
index 032e93994855..6d8f2d8d8825 100644
--- a/media-gfx/jpegpixi/Manifest
+++ b/media-gfx/jpegpixi/Manifest
@@ -1,3 +1,3 @@
 DIST jpegpixi-1.1.1.tar.gz 155045 BLAKE2B 767789f87e7fe29f36c6332cd79f15d3d5109ee84626f8bec3827602c28dcfa55e297611ff565495a4ffabc421247d6e39ea0832721d276394ac7ad607e6bb1f SHA512 e77bb351c5e0c92c8476684be29695bf82f2be043b0e6f40acfc3c692180cfeb625ebf180a6ed48d97b9d895ecb12b5ba34a47f6cb6a352af0fe1767e846ef3e
 EBUILD jpegpixi-1.1.1.ebuild 579 BLAKE2B f2ce7551c6dda703a8e76e0a51ec3caf90c42f24d80bed432b2c7603221a0c7dc8c0b5d42af8f7d80502fc25b56c6871be35752c91cba33c10dd7fc672e30968 SHA512 06d2202db7ae3c83e048ec7e5b3c18f2e14042004c9be3245afcf34bb6243230b0da44d87068bd2b4c14fd759bd5b67cba494c53b291582b28ba32077ae5dab2
-MISC metadata.xml 290 BLAKE2B 64afc02906a82e1d1058845207beb786c4558aa106394bc68eb33bf8c1480b3335a8276605dae945f6c139c4b24be57a92593868189ccf540a3f5687eea17f71 SHA512 2e6892d467c3f23b373f7b4f89178d5ce43f1c54e293fb37530e05de6d29b5a7816aed7d6fa5f31f5ebfcb55edb56c51a79d524a9567656d8847a55fa1b61d16
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-gfx/jpegpixi/metadata.xml b/media-gfx/jpegpixi/metadata.xml
index f60a078ed15a..7a38bb900964 100644
--- a/media-gfx/jpegpixi/metadata.xml
+++ b/media-gfx/jpegpixi/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription>
-		Almost lossless JPEG pixel interpolator, for correcting digital camera
-		defects.
-	</longdescription>
 </pkgmetadata>
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 6864f902be87..0f8b4bea700c 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,5 +1,3 @@
-DIST kphotoalbum-5.6.1.tar.xz 11773808 BLAKE2B c69cdc0afb455af64fe0624208b6bff34813a8f0341a4d3f21b7dc0462eb51f01574656028de497527c57a7ed70d1ab9dd6fe451ecec1696f09cfa8531dffe77 SHA512 fa1f4d566cd99e8c434b6e1fe28d8910b3b9c6aa05947ffbfa1b2b8efdab76f243f4b12883586e0c6692bfe54763a285374e16f3ceb23051619fe9b84cd58ea7
 DIST kphotoalbum-5.7.0.tar.xz 11784500 BLAKE2B 61b295178bac0724b1212c40ddb4178147183b7d982213077c82681e7480fc8344d5467851b839d06521f89bd8858a6c4727824e95ea712bb28c6e1bb2ce428d SHA512 36153fd946c7819540b1867a24b968103f7101d1d9ddc49a09b70df4b419380875b3016863417ba8326b50fd844d255888cd5b6f2d4ecf1e1a607d0c97e16851
-EBUILD kphotoalbum-5.6.1.ebuild 1726 BLAKE2B 3e2a2d490d50f51bc001838ec0413186b2758b520a2194c78ddb967e192fb45f8f94d4d3b78265186fc947964b7bb84e418dd9d183d041304cfd849c61774089 SHA512 85cc82a95bc884ae00139c4a5ddb9aba18a871eccb3e810d4a7a9ca2876fe2c53908b9e32c06a6fe76a9513f449f6a3c5cd65b4d111a3fcc336d7bb85363b372
-EBUILD kphotoalbum-5.7.0.ebuild 1576 BLAKE2B 9a93f696574f0209009971795379f980af38486627ccd01f74461b85d7c27437f904e4fde94e7b9012a4d5d8fedec492e4ff897bfca55e6f603bdc51aff77142 SHA512 8d7292249f60b3be33317f70bfdd10248da3dc8199647339c695ab140ebfd4bae6bd5813638ae20c10ccf390e17d8842115677e719a76600d132aff4853fb4b1
-MISC metadata.xml 520 BLAKE2B 209e6366254c9c863b1e5c3e850d914b83914a701e0615dbc6fcbdb2c30afc293f4649733a85dd8aa6827a3706c75447954eaa1d1d0eb4430fbc6c8d91a8475c SHA512 806029907a110b1936e6db79513a194a5e94bb195c917dbb700d479bf54a944993d1d0e8379e994c2b5feb05ad7ea495ad70a02e68fe638c5891e24801ee09d5
+EBUILD kphotoalbum-5.7.0.ebuild 1574 BLAKE2B 800f6a06118ddb5a1f51d286d5d08313ed29722cff38555688aa3bcb620fba32d7730edc5240d2d85fdfe8d612a899f67d4af584a91143c46722e86b63979caa SHA512 91ff5cb83b4b4dfb712ea90468f66f2d387dd0c5ea2dccf068f7f38d4586335f4a0a2c0f03f21f2c8446596950868d03399b6f65e6a867c66daa7be076e81d52
+MISC metadata.xml 450 BLAKE2B a20dea7c14d78a7fe31d76833fd632db0fbf91caaa04288e5de9089786b0725aaf523d73e89def8a940fe1bdb240463fbf37fcbe667f3270e070bfd9fdb0e3d3 SHA512 61eee726b84b0482e88c7b1f2bf811603e04ab2ed9b24154ba4ad863252dda11a7e715909637160541b8be90a2d2a510506255b05935c1da5bbff94f1f67877a
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild
deleted file mode 100644
index 61893466aefd..000000000000
--- a/media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Tool for indexing, searching, and viewing images"
-HOMEPAGE="https://www.kphotoalbum.org/"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2+ FDL-1.2"
-SLOT="5"
-IUSE="+kipi map +raw share"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	media-gfx/exiv2:=
-	media-libs/phonon[qt5(+)]
-	virtual/jpeg:0
-	kipi? ( kde-apps/libkipi:5= )
-	map? ( kde-apps/libkgeomap:5 )
-	raw? ( kde-apps/libkdcraw:5 )
-	share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	media-video/ffmpeg
-	kipi? ( kde-apps/kipi-plugins:5 )
-"
-
-DOCS=( ChangeLog README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kipi KF5Kipi)
-		$(cmake_use_find_package map KF5KGeoMap)
-		$(cmake_use_find_package raw KF5KDcraw)
-		$(cmake_use_find_package share KF5Purpose)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild
index dfafce49dc68..cac8efff8a79 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.kphotoalbum.org/"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2+ FDL-1.2"
diff --git a/media-gfx/kphotoalbum/metadata.xml b/media-gfx/kphotoalbum/metadata.xml
index f0dad21bde3d..5b8b5f496a48 100644
--- a/media-gfx/kphotoalbum/metadata.xml
+++ b/media-gfx/kphotoalbum/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="kipi">Support for the KDE Image Plugin Interface</flag>
 		<flag name="map">Enable map display support using <pkg>kde-apps/marble</pkg></flag>
 		<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
 	</use>
diff --git a/media-gfx/maim/Manifest b/media-gfx/maim/Manifest
index 066fa409e7f2..e611c6ef97bd 100644
--- a/media-gfx/maim/Manifest
+++ b/media-gfx/maim/Manifest
@@ -1,4 +1,4 @@
 DIST maim-5.6.3.tar.gz 40217 BLAKE2B 90f6854d8e54b92f8c6e8d5b597ea287e85e622ad689f1b72361aa919d0ce57bf4f28f289fd0da51b30c1195977b70982837d8b4b81ec5597361bc6ed5f1ad0a SHA512 8e19bd4e89db117bcb74a9b9e35f3232cdd0ef3836a536d170f803d7159fbc4be415d20695e5e61942ff7714d990d027149cee20a689f797d25d01610cc1c3be
 EBUILD maim-5.6.3.ebuild 845 BLAKE2B 03ba5512384fbc25c4c0680a1399d63fd4e349affcfd0d104c020fed460aefb423d83ce44d7ab9aa94ae8fef5d9341bbf42ff67d0aad668ae8ebbf90f6569e1e SHA512 cb4184187848233f19288a9c0438492ff8abc700440888eeec8baac081ac4191875ddc3f9d8cb659b477d9012821b01440c03e3544ea36931d069dd89e1813a5
 EBUILD maim-9999.ebuild 845 BLAKE2B 03ba5512384fbc25c4c0680a1399d63fd4e349affcfd0d104c020fed460aefb423d83ce44d7ab9aa94ae8fef5d9341bbf42ff67d0aad668ae8ebbf90f6569e1e SHA512 cb4184187848233f19288a9c0438492ff8abc700440888eeec8baac081ac4191875ddc3f9d8cb659b477d9012821b01440c03e3544ea36931d069dd89e1813a5
-MISC metadata.xml 370 BLAKE2B cf97a29c8998e02c1cf3c1a2262af3b4ead910bc3b9a84a43ceb97eb6f8522b134007ba6380e5a0e014ac62b4faad27f856a847026bba576e1e1a6e4c2bfd160 SHA512 d3c3fb700a3d2c5c67a3919ae60fba9e843734875378ba682d93f728c408845f580caf940b3e39436582ddd1c3e2fe4e21f01cc74960d00f8cbddf20047abb62
+MISC metadata.xml 245 BLAKE2B d0f0419f8a7ceef258bb5d6499438203206131b3dd86d5e5f15abd9567155a7b93fc33c277ee7d95440674757244a9edd429977cd48aefe146d8284bce340164 SHA512 67d8f26574827a11a25ccae725ff3ea2d4eb69cdfe78fb7f1ce3f081c7ed65bf6c53518151ad540e2d790ba69bbbc390d26602b66d34de8ac2ae27f96a15e5bf
diff --git a/media-gfx/maim/metadata.xml b/media-gfx/maim/metadata.xml
index e340eaffe6a7..e07ed367a553 100644
--- a/media-gfx/maim/metadata.xml
+++ b/media-gfx/maim/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
-	<longdescription>
-		maim (Make Image) is a utility that takes screenshots of your desktop using imlib2.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">naelstrof/maim</remote-id>
 	</upstream>
diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index 032578bf8825..f846f2bd9a04 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -1,6 +1,10 @@
 AUX mypaint-1.2.1-json-c-boolean-defs.patch 1189 BLAKE2B 7cc9728fbe01195b0c95bd844592d4fbae29a7a26758d242933ed712b940d8a893cd41bd2987952e2a817208efbffd779e9c39d4dde42d809a1e11de06a234fa SHA512 8e5815c281a6c63c7818f378d0e75a94860dd24ea69e9fff8e5951b05c407f12e2e19fefeaa559476a4dab46c88eab8821eff061e8c8eadd1f3ce150e42563c2
+AUX mypaint-2.0.1-GIL-hold.patch 5153 BLAKE2B 3d70b414bfb6396fffb9ebfc9c1fe6791878a97a999355b103fd848993172049db7f97f81d96e253294b9629a2a5dfe7c6710f29561f45b89f4fb26d4cf9a788 SHA512 aa64bb4ffb907516af811bb8ef4c0bccce9b785f94e0d71a44be30e7c96ea3a35dcceeac618956bf11c9d2c5c4e05524c8492ed14967148e2d6b9646b1ed5c15
+AUX mypaint-2.0.1-build-system.patch 1141 BLAKE2B c888061735a4297ec93343a1cb41582774c1a84a642095992b043e459c11c8222f21e1b041c67e345fdc61e194bdf58b6a21daaa00d12263354740330283f8c3 SHA512 55d7c826fc955459d7089baaf31cd4b3a38d0a6b7bdcff64f88e406dd152d4d40344bbff0dbd297f5dfc65a6cc8bd6d0dc06d5c57d8e8dda03b4c42e709a2142
+AUX mypaint-2.0.1-r1-build-system.patch 638 BLAKE2B 8e0209eb8fdba535cb8c0075e183681b0d8f8a11613cf7c3d2ddb5e20954d6c95da3ef3824063ac55bb11feda38cdf00eb8190cf76ca7753d2432d870926194b SHA512 8c088a089408542f57ef0fb608a63ae6fa0cce5392cb309376198813d35f5c3e54466945419984973af77e11f5bc4908961b5e81982a32fbef04c081df1b0349
 DIST mypaint-1.2.1.tar.xz 37897196 BLAKE2B 2d8f6b03f710febae1c2d617a6e542543786be384585ae8a973604da2eba8a0fb770d185aa3d2dfc6f794adf29ffb9c217356a96ab27d677ebb57816f62fae9c SHA512 1783765e495b9535669a83a29d27ba684e6201fdfe0875bdd2c167b1dab8af05993b19025767fe0b2770ed9e578e4709f75d8a4820ac945812cba85609f9eb9b
 DIST mypaint-2.0.1.tar.xz 7295048 BLAKE2B 813a939f95ea6887c57d8c0868e33e9bc8b1b95746d5ecd793d4fd13a32198ee5a445cfdd2691a15e944bfb0099d6ac624dff320ae29465db5b1e0d197bedb30 SHA512 449beddcc6da5d720c9efbeac94a466ed0057bd1962d42ebb419190e8b7fd8ffd341327408467fc5da47920f9d0da1fd6d78233a0dda88de5f5d52d53d9ab562
 EBUILD mypaint-1.2.1-r5.ebuild 2016 BLAKE2B 0a00318c334adc4c97021ca1e52cb089075b1db667f0ad431fcf758345756d7d3558e50a353c8578d5749172ea4bbe396a99041c026cecce6174cb7cc6e4caf3 SHA512 5b1a703cf2efb5e0d729315ea092c58954975dedc177472467f03726956211b34744018cb3ef730f4b5a8ff2053f30218f838609ef225dd05eab21f5d8a683d8
-EBUILD mypaint-2.0.1.ebuild 1561 BLAKE2B b007519875279d38483c18cc383cbef204c138ac1b9a9b876262a9d89fefd5916f79696baee97e457de35d12ecfe1a6eae8815ea1fe4b0600a2e35cab184fcd3 SHA512 7e64726112465bd52a907700ba5db4f1acbbc04e8f9599a772694850ba29e1523bc170943380cb6a1fb5abd943f87e1e8a4b2c2e2650c5b1b81af70bff68e08f
+EBUILD mypaint-2.0.1-r1.ebuild 1793 BLAKE2B a8b15a6f608d1d20ddf4844074a746905a163fdc3e1083defe8b176a7f281f8480b50282dfb3bb203176731fbf44ea816d6dcf04858330462e425a78fcfbb9c1 SHA512 da6d1c0291c169758b9524b0c752586b78702fda147b077bbee5368b6898fb3ee533c5a4e341e0e143cefc5b77fc25b4f93c0be9dc70ef0f7258a563d1cd7bcd
+EBUILD mypaint-2.0.1.ebuild 1555 BLAKE2B f9ec58013d9adbea0c569fc915659abd6c96e5cd943f85d935b04bc697fc3ad8549e3f1c42d8ae86b4fa12b552e32c71f65c34ccdf1140762231d0da0fed803f SHA512 87d5098d2460b8fb002c87116216885779e72107e262dc8910ce9a69fc85424028ad740339d92750e9f9524ab3fe45545ac3c0a4644ad26e1f6a64eb15305078
 MISC metadata.xml 247 BLAKE2B 3a8d267e6befd2f46c41982b7196470f32b4fcf5dc6a42ead10b13e81bdcb7975ea998a51d0deb2c3c1a49f00b5f9216d8e43ad7e6dd0aea0f3352b19532d0a0 SHA512 21b957bb801d29dfed1d0aeceac553c9ba039a7fe94ebf899e7ab5c3316bbad116c7bd63a07ccbbb8277d2ce19f27b964499d2ccd942028290519e465e989dbb
diff --git a/media-gfx/mypaint/files/mypaint-2.0.1-GIL-hold.patch b/media-gfx/mypaint/files/mypaint-2.0.1-GIL-hold.patch
new file mode 100644
index 000000000000..7fbf6ef9f265
--- /dev/null
+++ b/media-gfx/mypaint/files/mypaint-2.0.1-GIL-hold.patch
@@ -0,0 +1,112 @@
+https://github.com/mypaint/mypaint/issues/1107
+https://bugs.gentoo.org/739122
+https://github.com/mypaint/mypaint/commit/356716e7bacfcbb1f3ab80171fea405fdd10b2b9.patch
+----
+From 356716e7bacfcbb1f3ab80171fea405fdd10b2b9 Mon Sep 17 00:00:00 2001
+From: Red Rozenglass <rozenglass@protonmail.com>
+Date: Fri, 11 Sep 2020 02:43:49 +0300
+Subject: [PATCH] Acquire/release the GIL while processing tile requests
+
+Fixes crashes on some Linux distros, potentially improves performance.
+
+When handling tile requests we currently use an openmp critical block in a
+callback registered with libmypaint. The callback calls into Python code
+without locking the GIL. This sometimes crashes mypaint in numpy's memory
+cache allocator on some Linux distros that compile numpy with run-time
+asserts (without `-DNDEBUG`), like Gentoo, as numpy uses Python's GIL
+internally as a locking mechanism for its non-thread-safe global cache
+management.
+
+Acquiring the GIL in the C callback, before calling into Python, ensures
+that the GIL is still locked by the current thread when it reaches numpy's
+code, and thus prevents the crashes. We yield the GIL whenever Python code
+calls again into libmypaint, This allows other threads to acquire it, and
+concurrent callbacks to run, which prevents deadlocks that would otherwise
+happen while waiting for all the callbacks to finish on Python's side. When
+libmypaint is done we re-acquire the GIL, and return up to the callback
+where the GIL is released again after some Python reference count
+bookkeeping.
+
+The OpenMP critical block is no longer necessary after introducing the GIL
+locking mechanism. This would potentially improve performance as the C code
+in libmypaint can process multiple callbacks at the same time during the
+`Py_BEGIN_ALLOW_THREADS' period that yields the GIL.
+---
+ lib/brush.hpp              | 16 ++++++++++++++--
+ lib/pythontiledsurface.cpp |  7 +++++--
+ lib/tiledsurface.hpp       |  4 +++-
+ 3 files changed, 22 insertions(+), 5 deletions(-)
+
+diff --git a/lib/brush.hpp b/lib/brush.hpp
+index f717a42df..0db455377 100644
+--- a/lib/brush.hpp
++++ b/lib/brush.hpp
+@@ -66,13 +66,25 @@ class Brush {
+   bool stroke_to (Surface * surface, float x, float y, float pressure, float xtilt, float ytilt, double dtime, float viewzoom, float viewrotation, float barrel_rotation)
+   {
+       MyPaintSurface2 *c_surface = surface->get_surface2_interface();
+-      return mypaint_brush_stroke_to_2(c_brush, c_surface, x, y, pressure, xtilt, ytilt, dtime, viewzoom, viewrotation, barrel_rotation);
++      bool stroke_finished_or_empty;
++
++      Py_BEGIN_ALLOW_THREADS
++          stroke_finished_or_empty = mypaint_brush_stroke_to_2(c_brush, c_surface, x, y, pressure, xtilt, ytilt, dtime, viewzoom, viewrotation, barrel_rotation);
++      Py_END_ALLOW_THREADS
++
++      return stroke_finished_or_empty;
+   }
+ 
+   bool stroke_to_linear (Surface * surface, float x, float y, float pressure, float xtilt, float ytilt, double dtime, float viewzoom, float viewrotation, float barrel_rotation)
+   {
+       MyPaintSurface2 *c_surface = surface->get_surface2_interface();
+-      return mypaint_brush_stroke_to_2_linearsRGB(c_brush, c_surface, x, y, pressure, xtilt, ytilt, dtime, viewzoom, viewrotation, barrel_rotation);
++      bool stroke_finished_or_empty;
++
++      Py_BEGIN_ALLOW_THREADS
++          stroke_finished_or_empty = mypaint_brush_stroke_to_2_linearsRGB(c_brush, c_surface, x, y, pressure, xtilt, ytilt, dtime, viewzoom, viewrotation, barrel_rotation);
++      Py_END_ALLOW_THREADS
++
++      return stroke_finished_or_empty;
+   }
+ 
+   double get_total_stroke_painting_time()
+diff --git a/lib/pythontiledsurface.cpp b/lib/pythontiledsurface.cpp
+index 46c515c99..2c6e773db 100644
+--- a/lib/pythontiledsurface.cpp
++++ b/lib/pythontiledsurface.cpp
+@@ -36,8 +36,9 @@ tile_request_start(MyPaintTiledSurface2 *tiled_surface, MyPaintTileRequest *requ
+     const int ty = request->ty;
+     PyArrayObject* rgba = NULL;
+ 
+-#pragma omp critical
+ {
++    PyGILState_STATE gstate = PyGILState_Ensure();
++
+     rgba = (PyArrayObject*)PyObject_CallMethod(self->py_obj, "_get_tile_numpy", "(iii)", tx, ty, readonly);
+     if (rgba == NULL) {
+         request->buffer = NULL;
+@@ -59,7 +60,9 @@ tile_request_start(MyPaintTiledSurface2 *tiled_surface, MyPaintTileRequest *requ
+         Py_DECREF((PyObject *)rgba);
+         request->buffer = (uint16_t*)PyArray_DATA(rgba);
+     }
+-} // #end pragma opt critical
++
++    PyGILState_Release(gstate);
++}
+ 
+ 
+ }
+diff --git a/lib/tiledsurface.hpp b/lib/tiledsurface.hpp
+index 3a6b2e61d..d1a5d1307 100644
+--- a/lib/tiledsurface.hpp
++++ b/lib/tiledsurface.hpp
+@@ -66,7 +66,9 @@ class TiledSurface : public Surface {
+       MyPaintRectangle* rects = this->bbox_rectangles;
+       MyPaintRectangles bboxes = {BBOXES, rects};
+ 
+-      mypaint_surface2_end_atomic((MyPaintSurface2 *)c_surface, &bboxes);
++      Py_BEGIN_ALLOW_THREADS
++          mypaint_surface2_end_atomic((MyPaintSurface2 *)c_surface, &bboxes);
++      Py_END_ALLOW_THREADS
+ 
+       // The capacity of the bounding box array will most often exceed the number
+       // of rectangles that are actually used. The call to mypaint_surface_end_atomic
diff --git a/media-gfx/mypaint/files/mypaint-2.0.1-build-system.patch b/media-gfx/mypaint/files/mypaint-2.0.1-build-system.patch
new file mode 100644
index 000000000000..c7806e7119dc
--- /dev/null
+++ b/media-gfx/mypaint/files/mypaint-2.0.1-build-system.patch
@@ -0,0 +1,37 @@
+diff --git a/setup.py b/setup.py
+index 670df4d..703f9d2 100644
+--- a/setup.py
++++ b/setup.py
+@@ -471,9 +471,6 @@ class BuildExt (build_ext):
+             linkflags.extend([
+                 "-O0",
+             ])
+-        else:
+-            linkflags.append("-O3")
+-            ccflags.append("-O3")
+ 
+         return build_ext.build_extension(self, ext)
+ 
+@@ -869,7 +866,6 @@ def get_ext_modules():
+         '-Wno-write-strings',
+         '-D_POSIX_C_SOURCE=200809L',
+         "-DNO_TESTS",  # FIXME: we're building against shared libmypaint now
+-        '-g',  # always include symbols, for profiling
+     ]
+     extra_link_args = []
+ 
+diff --git a/setup.py b/setup.py
+index 703f9d2..cc8abbd 100644
+--- a/setup.py
++++ b/setup.py
+@@ -456,10 +456,6 @@ class BuildExt (build_ext):
+         ccflags = ext.extra_compile_args
+         linkflags = ext.extra_link_args
+ 
+-        if sys.platform != "darwin" and not self.disable_openmp:
+-            linkflags.append(OPENMP_CFLAG)
+-            ccflags.append(OPENMP_LDFLAG)
+-
+         if self.debug:
+             skip = ["-DNDEBUG"]
+             ccflags[:] = [f for f in ccflags if f not in skip]
diff --git a/media-gfx/mypaint/files/mypaint-2.0.1-r1-build-system.patch b/media-gfx/mypaint/files/mypaint-2.0.1-r1-build-system.patch
new file mode 100644
index 000000000000..63a7a5bf75ed
--- /dev/null
+++ b/media-gfx/mypaint/files/mypaint-2.0.1-r1-build-system.patch
@@ -0,0 +1,22 @@
+diff --git a/setup.py b/setup.py
+index 670df4d..703f9d2 100644
+--- a/setup.py
++++ b/setup.py
+@@ -471,9 +471,6 @@ class BuildExt (build_ext):
+             linkflags.extend([
+                 "-O0",
+             ])
+-        else:
+-            linkflags.append("-O3")
+-            ccflags.append("-O3")
+ 
+         return build_ext.build_extension(self, ext)
+ 
+@@ -869,7 +866,6 @@ def get_ext_modules():
+         '-Wno-write-strings',
+         '-D_POSIX_C_SOURCE=200809L',
+         "-DNO_TESTS",  # FIXME: we're building against shared libmypaint now
+-        '-g',  # always include symbols, for profiling
+     ]
+     extra_link_args = []
+ 
diff --git a/media-gfx/mypaint/mypaint-2.0.1-r1.ebuild b/media-gfx/mypaint/mypaint-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..9cc5552420b7
--- /dev/null
+++ b/media-gfx/mypaint/mypaint-2.0.1-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit desktop distutils-r1 xdg
+
+DESCRIPTION="Fast and easy graphics application for digital painters"
+HOMEPAGE="http://mypaint.org/"
+SRC_URI="https://github.com/mypaint/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="openmp"
+LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/swig
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		>=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+	')
+	>=dev-libs/json-c-0.11:=
+	gnome-base/librsvg
+	media-gfx/mypaint-brushes:2.0
+	media-libs/lcms:2
+	>=media-libs/libmypaint-1.5.0[openmp?]
+	media-libs/libpng:0=
+	sys-devel/gettext
+	sys-libs/libomp
+	x11-libs/gtk+:3
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.1-r1-build-system.patch"
+	"${FILESDIR}/${P}-GIL-hold.patch"
+)
+
+distutils_enable_tests setup.py
+
+src_compile() {
+	# --disable-openmp can't be passed to setup.py build,
+	# only setup.py build_ext.
+	# Trying to call build_ext then build and such fails.
+	#
+	# We just override the environment instead for simplicity.
+	local openmp=$(usex openmp '-fopenmp' '-fno-openmp')
+
+	OPENMP_CFLAG="${openmp}" OPENMP_LDFLAG="${openmp}" distutils-r1_src_compile
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	newicon pixmaps/${PN}_logo.png ${PN}.png
+
+	local lang=
+	for lang in ${LANGS}; do
+		if ! has ${lang} ${LINGUAS}; then
+			rm -rf "${ED}"/usr/share/locale/${lang} || die
+		fi
+	done
+}
diff --git a/media-gfx/mypaint/mypaint-2.0.1.ebuild b/media-gfx/mypaint/mypaint-2.0.1.ebuild
index cb35547d5db7..1ca2e261568c 100644
--- a/media-gfx/mypaint/mypaint-2.0.1.ebuild
+++ b/media-gfx/mypaint/mypaint-2.0.1.ebuild
@@ -4,10 +4,11 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_SINGLE_IMPL=1
 
-inherit desktop distutils-r1 gnome2-utils xdg xdg-utils
+inherit desktop distutils-r1 xdg
 
-DESCRIPTION="fast and easy graphics application for digital painters"
+DESCRIPTION="Fast and easy graphics application for digital painters"
 HOMEPAGE="http://mypaint.org/"
 SRC_URI="https://github.com/mypaint/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
@@ -18,6 +19,7 @@ KEYWORDS="~amd64 ~x86"
 LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW"
 
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-lang/swig
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -42,12 +44,17 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-# Need to poke at failing tests
-# Dying on a numpy assert
-RESTRICT="test"
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.1-build-system.patch"
+)
 
 distutils_enable_tests setup.py
 
+# TODO: Allow openmp support (patched out)
+# There's no urgency on this given that it currently
+# breaks runtime use [0]
+# [0] https://github.com/mypaint/mypaint/issues/1107.
+
 src_install() {
 	distutils-r1_src_install
 
@@ -60,18 +67,3 @@ src_install() {
 		fi
 	done
 }
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	xdg_mimeinfo_database_update
-}
diff --git a/media-gfx/nvidia-texture-tools/Manifest b/media-gfx/nvidia-texture-tools/Manifest
index d1b945c35738..1b63817fa8d8 100644
--- a/media-gfx/nvidia-texture-tools/Manifest
+++ b/media-gfx/nvidia-texture-tools/Manifest
@@ -4,7 +4,11 @@ AUX nvidia-texture-tools-2.0.8-cpp14.patch 1566 BLAKE2B b5ffbc9c4b680a46683a628c
 AUX nvidia-texture-tools-2.0.8-drop-qt4.patch 319 BLAKE2B 534bcddc9574a14ccd5a61f84f10289705624a8547f38f86df85fb0238581fcedbb6d0bb99483d3f2dfd5521a21006d6ba4a60c528ce1ed640e5bb01d2fa924c SHA512 1024d9890d55493cc92b6254047c19b5895b0ea2a6d9ae2b4e1dbf726a165f4a624ec8acca8655c4efed6c8bec52218ffcd116ef48d3bf68606f04107baab671
 AUX nvidia-texture-tools-2.0.8-gcc-4.7.patch 406 BLAKE2B 8c17ed5fd7158f118b450f81c5fa77794db82c0d4de1b37e7b53c929eaadc9ece875cf529b3b3446b90623e563e255fcd90842038cebebf52ec0dda1b7835507 SHA512 1bcd69cbbbd01194bb68bff547b240cb196ef3aa73c73c401fb657c4ae7cd77f995fcd7d39f868d25c49994312b236210306aa577194fe756830a22f03da3e7b
 AUX nvidia-texture-tools-2.0.8-openexr.patch 2558 BLAKE2B 55694c275548dd9177991e008fe9a9c37c290d4e8b17e4dd91a0ec241dc75900e4b6f29f8650780af112ebffcc7ca04c617456b5e2186e590f3e2da705960a1e SHA512 f17a4f009298c65a06e536a434033db9735b0574c3fc2225bde2c86841c1ad8b35c6d9f5988a98285eb9e7b2e9832e8c9495a1a36e3dcf398101b08d59e87ade
+AUX nvidia-texture-tools-2.1.2-cmake.patch 4189 BLAKE2B 77ee5acecff6a05b7714f35b73aa7c1797eac97f448dee222958fc1429d8ff1ae9083745a7b4d70f04677d683112d872661d271e6a45baab52fab28d32b89764 SHA512 4464750881aaa864cbfbf492005ff8d62bb25da2fd024760f3f315833610d0f353c6b50cfc2a36a7e2f7c989f06857032150a9c6ce8d9257222fb1d9248e1e06
+AUX nvidia-texture-tools-2.1.2-test_path.patch 846 BLAKE2B 51a9014da038c9015b767045822e47a5ec0383f4f301110ecbeb1c840c3b9ae62cf5590c424c1ae4acff1d64721a9b942e098e034bb3d89eb992bdf846e9fd71 SHA512 124c75bc1bf0b1247313547b29de36f7d9c39446eda269a08c90d61b23382491845277359f326e77718a7b7c0b30cb8795edb897b36c8675e5d3eed63cf15698
 DIST nvidia-texture-tools-2.0.8-1.tar.gz 935227 BLAKE2B aef1801795f6102ac7c96df236de0e8534bfacfc72d297ff3bcd13b530829e8848f33065477a1fb2ffaa35d75bd9e34913d3551469aa814cab8cb76f2f04e721 SHA512 8e7ac79daaa10a2b1b64cfc8d6b37b37698e2a46f925cc33cdfd8e4b36705db8836edec6f98c5d6da475d7773f4a5826b5cebc120b7c5a6f9515906e2e4fae9d
 DIST nvidia-texture-tools-2.0.8-patchset-1-r1.tar.xz 9604 BLAKE2B b93c9586688dd690668c9d57d533c3460b008cf357a202cc6dc315ab6d24cd3d796d8596024d193bdd9100fab52970b323f03dc16b4f72b3e551167bb46513b5 SHA512 988ea0731b7f98f804a715404fc8cb8a8956a6c6b795f0ce8570f800dac3319f222bac8f12ab6fde50bbec3d68926ed3b24516931f9aebe2a7ce0fcae0dc8e13
+DIST nvidia-texture-tools-2.1.2.tar.gz 45172897 BLAKE2B de1827ccf9900499e089e7f0ccdf2acab089afb2c4d8e41978c3cf653aca81f8d9136bdd0e4467e7f5534b44f7329883f1ca66508c289200b23dfdd1158a9fc6 SHA512 4285e1a348c6ab9abbc34a499879fe1c8ff6976da01d0397eb95e19ae7fb566f3efb57613d2cee31e6c694b497a28b050e377267e137a4d114d093d681824adb
 EBUILD nvidia-texture-tools-2.0.8-r4.ebuild 1506 BLAKE2B fa68fcb7198d50acf90bfe8973e1cb7e7a657dcbaadf65c35640de3d7b999259ca6771ed5de15a512bbf493076c9efc895c03d75a77a60cce7e31dfa76618fcd SHA512 f7e293b826a9a0e1b9993b5046ebcb2b44fe0008340fb4ad5ce00ed69fe693a6a60301b60829a9fe2b62f05f5d5b4fafa31735b767fea2d3f9f3abaa08641591
-MISC metadata.xml 370 BLAKE2B b516169c99bf0f8fd79fcb152c6dccc702b037f94483232fd3dee83d96f4a8b71abf82e19c72df9ebed4f95aabe8c26af44b0449961c31619e4e4ec474a69c78 SHA512 11a9aee676f6834be3333dc43e91d2c4980c65cba6d2fcbbb0a8c5d1eaea9e0ee78956905fed45724e465bdda93ce28d65c66de5b92be539a5f5f80afde924bc
+EBUILD nvidia-texture-tools-2.1.2.ebuild 1124 BLAKE2B e4562a10601c49f9ef2d9a7332c027bca00049bfa03e12a7e744557d73ebd47bdac9b2f3569aa1ad96b59e6c77c00e48039780d440ef2a174e89e7b61d702865 SHA512 1717a44a98d3faed523f2727989dab39fa07554864ee5400c30e92030dab750c4182d68c167563d515c34b30120ff786cace46605e4dae15e38bef822a0ec0bf
+MISC metadata.xml 548 BLAKE2B 7ee44cd2eba3f160653796a39cd0d86bb3e9510690dbca309f22e373a7d90022db794cb6e099cc7d0c6195ee842d1482059f717db1f6a1ccfb16b7617ac78dbd SHA512 7614e56190a58544ac155951e1961d7238ed91c512a10db44b3f88bb03e21ecf7b3128ade8d2316df626a65794d673e0d78a61ee35690817a397f3ee8cf98f0f
diff --git a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.1.2-cmake.patch b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.1.2-cmake.patch
new file mode 100644
index 000000000000..61e453a1c4a2
--- /dev/null
+++ b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.1.2-cmake.patch
@@ -0,0 +1,97 @@
+diff -Naur nvidia-texture-tools-2.1.2.orig/CMakeLists.txt nvidia-texture-tools-2.1.2/CMakeLists.txt
+--- nvidia-texture-tools-2.1.2.orig/CMakeLists.txt	2020-08-24 08:27:21.000000000 +0200
++++ nvidia-texture-tools-2.1.2/CMakeLists.txt	2020-09-04 18:10:04.297646679 +0200
+@@ -28,12 +28,6 @@
+ 
+ ADD_SUBDIRECTORY(src)
+ 
+-# These files should only be installed when creating packages.
+-INSTALL(FILES 
+-	LICENSE
+-	README.md
+-	DESTINATION share/doc/nvtt)
+-
+ # Add packaging support
+ INCLUDE(InstallRequiredSystemLibraries)
+ 
+diff -Naur nvidia-texture-tools-2.1.2.orig/extern/libsquish-1.15/CMakeLists.txt nvidia-texture-tools-2.1.2/extern/libsquish-1.15/CMakeLists.txt
+--- nvidia-texture-tools-2.1.2.orig/extern/libsquish-1.15/CMakeLists.txt	2020-08-24 08:27:21.000000000 +0200
++++ nvidia-texture-tools-2.1.2/extern/libsquish-1.15/CMakeLists.txt	2020-09-04 18:09:45.861623060 +0200
+@@ -111,7 +111,7 @@
+ 
+ INSTALL(
+     TARGETS squish
+-    LIBRARY DESTINATION lib
++    LIBRARY DESTINATION ${LIBDIR}
+     ARCHIVE DESTINATION lib
+     PUBLIC_HEADER DESTINATION include
+     )
+diff -Naur nvidia-texture-tools-2.1.2.orig/src/nvcore/CMakeLists.txt nvidia-texture-tools-2.1.2/src/nvcore/CMakeLists.txt
+--- nvidia-texture-tools-2.1.2.orig/src/nvcore/CMakeLists.txt	2020-08-24 08:27:21.000000000 +0200
++++ nvidia-texture-tools-2.1.2/src/nvcore/CMakeLists.txt	2020-09-04 18:09:45.860623059 +0200
+@@ -45,6 +45,6 @@
+ endif()
+ 
+ INSTALL(TARGETS nvcore
+-    RUNTIME DESTINATION bin
+-    LIBRARY DESTINATION lib
+-    ARCHIVE DESTINATION lib/static)
++    RUNTIME DESTINATION ${BINDIR}
++    LIBRARY DESTINATION ${LIBDIR}
++    ARCHIVE DESTINATION ${LIBDIR})
+diff -Naur nvidia-texture-tools-2.1.2.orig/src/nvimage/CMakeLists.txt nvidia-texture-tools-2.1.2/src/nvimage/CMakeLists.txt
+--- nvidia-texture-tools-2.1.2.orig/src/nvimage/CMakeLists.txt	2020-08-24 08:27:21.000000000 +0200
++++ nvidia-texture-tools-2.1.2/src/nvimage/CMakeLists.txt	2020-09-04 18:09:45.860623059 +0200
+@@ -57,7 +57,7 @@
+ TARGET_LINK_LIBRARIES(nvimage ${LIBS} nvcore posh bc6h bc7 nvmath)
+ 
+ INSTALL(TARGETS nvimage
+-    RUNTIME DESTINATION bin
+-    LIBRARY DESTINATION lib
+-    ARCHIVE DESTINATION lib/static)
++    RUNTIME DESTINATION ${BINDIR}
++    LIBRARY DESTINATION ${LIBDIR}
++    ARCHIVE DESTINATION ${LIBDIR})
+ 
+diff -Naur nvidia-texture-tools-2.1.2.orig/src/nvmath/CMakeLists.txt nvidia-texture-tools-2.1.2/src/nvmath/CMakeLists.txt
+--- nvidia-texture-tools-2.1.2.orig/src/nvmath/CMakeLists.txt	2020-08-24 08:27:21.000000000 +0200
++++ nvidia-texture-tools-2.1.2/src/nvmath/CMakeLists.txt	2020-09-04 18:09:45.860623059 +0200
+@@ -19,6 +19,6 @@
+ TARGET_LINK_LIBRARIES(nvmath ${LIBS} nvcore)
+ 
+ INSTALL(TARGETS nvmath
+-    RUNTIME DESTINATION bin
+-    LIBRARY DESTINATION lib
+-    ARCHIVE DESTINATION lib/static)
++    RUNTIME DESTINATION ${BINDIR}
++    LIBRARY DESTINATION ${LIBDIR}
++    ARCHIVE DESTINATION ${LIBDIR})
+diff -Naur nvidia-texture-tools-2.1.2.orig/src/nvthread/CMakeLists.txt nvidia-texture-tools-2.1.2/src/nvthread/CMakeLists.txt
+--- nvidia-texture-tools-2.1.2.orig/src/nvthread/CMakeLists.txt	2020-08-24 08:27:21.000000000 +0200
++++ nvidia-texture-tools-2.1.2/src/nvthread/CMakeLists.txt	2020-09-04 18:09:45.860623059 +0200
+@@ -23,6 +23,6 @@
+ TARGET_LINK_LIBRARIES(nvthread ${LIBS} nvcore)
+ 
+ INSTALL(TARGETS nvthread
+-	RUNTIME DESTINATION bin
+-	LIBRARY DESTINATION lib
+-	ARCHIVE DESTINATION lib/static)
++	RUNTIME DESTINATION ${BINDIR}
++	LIBRARY DESTINATION ${LIBDIR}
++	ARCHIVE DESTINATION ${LIBDIR})
+diff -Naur nvidia-texture-tools-2.1.2.orig/src/nvtt/CMakeLists.txt nvidia-texture-tools-2.1.2/src/nvtt/CMakeLists.txt
+--- nvidia-texture-tools-2.1.2.orig/src/nvtt/CMakeLists.txt	2020-08-24 08:27:21.000000000 +0200
++++ nvidia-texture-tools-2.1.2/src/nvtt/CMakeLists.txt	2020-09-04 18:09:45.860623059 +0200
+@@ -56,9 +56,9 @@
+ TARGET_LINK_LIBRARIES(nvtt ${LIBS} nvcore nvimage nvthread nvsquish bc6h bc7 nvmath rg_etc1)
+ 
+ INSTALL(TARGETS nvtt 
+-    RUNTIME DESTINATION bin
+-    LIBRARY DESTINATION lib
+-    ARCHIVE DESTINATION lib/static)
++    RUNTIME DESTINATION ${BINDIR}
++    LIBRARY DESTINATION ${LIBDIR}
++    ARCHIVE DESTINATION ${LIBDIR})
+ 
+ INSTALL(FILES nvtt.h nvtt_wrapper.h DESTINATION include/nvtt)
+ 
diff --git a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.1.2-test_path.patch b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.1.2-test_path.patch
new file mode 100644
index 000000000000..270147823b28
--- /dev/null
+++ b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.1.2-test_path.patch
@@ -0,0 +1,29 @@
+From 4c95dc87165a439698f63c3861c7c17b1fe2193a Mon Sep 17 00:00:00 2001
+From: Bernard Cafarelli <bernard.cafarelli@gmail.com>
+Date: Mon, 7 Sep 2020 14:29:22 +0200
+Subject: [PATCH] Fix data testsuite path
+
+Add separator between base path and set path if base path is set
+
+Fixes #299
+---
+ src/nvtt/tests/testsuite.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/nvtt/tests/testsuite.cpp b/src/nvtt/tests/testsuite.cpp
+index 9737807..06ab9d1 100644
+--- a/src/nvtt/tests/testsuite.cpp
++++ b/src/nvtt/tests/testsuite.cpp
+@@ -509,6 +509,9 @@ int main(int argc, char *argv[])
+     nvtt::Context context;
+     context.enableCudaAcceleration(!nocuda);
+ 
++    if (basePath.length() > 0) {
++        basePath.appendSeparator();
++    }
+     basePath.append(set.basePath);
+ 
+     FileSystem::changeDirectory(basePath.str());
+-- 
+2.28.0
+
diff --git a/media-gfx/nvidia-texture-tools/metadata.xml b/media-gfx/nvidia-texture-tools/metadata.xml
index 20324d728bf0..504fd8077747 100644
--- a/media-gfx/nvidia-texture-tools/metadata.xml
+++ b/media-gfx/nvidia-texture-tools/metadata.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
 	<use>
 		<flag name="cg">Enable NVIDIA C graphics compiler toolkit plug-in</flag>
 		<flag name="glew">Enable support for The OpenGL Extension Wrangler Library (<pkg>media-libs/glew</pkg>)</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">castano/nvidia-texture-tools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
new file mode 100644
index 000000000000..8a3d4922c2b2
--- /dev/null
+++ b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A set of cuda-enabled texture tools and compressors"
+HOMEPAGE="https://github.com/castano/nvidia-texture-tools"
+SRC_URI="https://github.com/castano/nvidia-texture-tools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_sse2 openmp"
+
+RDEPEND="
+	media-libs/ilmbase:=
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake.patch
+	"${FILESDIR}"/${P}-test_path.patch
+	)
+DOCS=( ChangeLog README.md )
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_configure() {
+	# May be able to restore CUDA, but needs an old gcc
+	local mycmakeargs=(
+		-DCUDA_FOUND=OFF
+		-DGCONFTOOL2=OFF
+		-DNVTT_SHARED=0
+		-DBUILD_SQUISH_WITH_OPENMP=$(usex openmp)
+		-DBUILD_SQUISH_WITH_SSE2=$(usex cpu_flags_x86_sse2)
+	)
+	cmake_src_configure
+}
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index 014921a2892a..e935ac3d4a18 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -16,6 +16,6 @@ DIST openvdb-7.1.0.tar.gz 1956052 BLAKE2B 7778d67bcc65ecb17b86f6e67a9e5f2d6574de
 EBUILD openvdb-4.0.2-r4.ebuild 2621 BLAKE2B bbaafee76eeea4aab92cb434043d069de3b962db271612a882055a9a26369f1f509b220f8ec8eaa3920c9ae42be81e78075516abff2a87eb58cc6f0fab7fb9f2 SHA512 5bbb892bf40e96239efdec47bf256f92bc2a3ef3f3c53c37a928f9fd798c129ecc764bc466d90953670e6ba398bd3fce7ea32ab8a87d68c2112e0b051033bf76
 EBUILD openvdb-5.2.0-r2.ebuild 2419 BLAKE2B 13838290e15d9cfa3f592dcc840fb08d4ee29a03362a23c5dd4df44af4c1c61e3b512485bfd1ba4487dda38edb58171d1457dd24c4c081c69d2b0afa0050e416 SHA512 0fe29028f37bb9a62cfebba9e4048dbd72b54d368d66ff055bbf6f722f2abc06dc115c33bc613cd5c6776d061f9904513c5fa989c9436b55ef7d884d823d378c
 EBUILD openvdb-6.2.1-r1.ebuild 2295 BLAKE2B d80285cba57899fbe0813eaecffcc0eae412bff68001067e35573389497c4117e8378396675fd94e7ac4d0b79119769a07d2cdcdf97fa252981fbed27da0584a SHA512 3c561ff41a27aa0f843afbb6d2031ecef94927e8f6be6f9c2b3a03eea467fbfb62dba25f6fbed65c34bc4b5605f916a8dc24d6414804bbecdd47a510f3e1ad99
-EBUILD openvdb-7.0.0-r1.ebuild 2797 BLAKE2B 42e37529f3381d64850ad32fb885ce8e74fe1a68204d513cd488310dd795330c8155257f580a03c8aeef6a6cd921108e8de6f132dfceb87299b152f5d1b20496 SHA512 7f783e6c4c3a79ca161379773a64a6d79238d265766a1bd0272acb8073c001c2a0bde8631e32e6ec675a7d7fe2c1664d16b8af06488131f938644a246fb89d73
-EBUILD openvdb-7.1.0-r1.ebuild 2719 BLAKE2B 90aca1fa48f509cb569224b0c5bd4da12d9eda40070fa6043eb3d0da75e03e2776dd9c4b7cecfe7a6b42cf848ae9bf9a02c64f4a1f9e0b1f1c11aa7eebeb670a SHA512 4db58bb80bf5468f31e7c0316ad61ad9b331ecdf8a03423e3803b0282dfe305672ce48235ebd20b9806f329f076950c5da50519b3821be91603d2d23ba1584c7
+EBUILD openvdb-7.0.0-r1.ebuild 2796 BLAKE2B 9bdce2c646e58c6b9fb7dbcde273b5659e4b424d7068be5b776400c529b0267cf79d75d3429d3d9abb0e3e86297621aa63f6f9242e51a7a7569b1daffe9b4999 SHA512 94aa6701f3eec40b105d91643fea984ab18f6c1f4bc4e26e1302819cd92ec9a5e6f5bf2f2532e5b6c3709cf2a2b04d3f62f66fa20ff7477858d9be6c62b599d1
+EBUILD openvdb-7.1.0-r1.ebuild 2718 BLAKE2B 0dd0f5f37550915992c608da30524cebcaa435d9f52c442e292d9f606781434ee1b2c7203c6e0baac283de158b30ecbcf8233d181b2b06e4709b4ddb9eddf249 SHA512 4a176c0609da17355850307e54a76e8b7d7d2145847bcdbeb43923ff6b29a8c0ef33d7f969b52632eb72b63cb046084eca824e4b7239a7c3673d4997bac3083d
 MISC metadata.xml 1660 BLAKE2B 56a7113ef4e645a3a508d025f36129c78be342117583f9cc8ba3ffda2518b04bba3d928ad1fa9e78a601a0f1d216bc1744795c170a6cd3421f22c8754f192a98 SHA512 f5e21ebf80b7179b6bd041bcdf5cc53c4aab3cf99f829d9e26e56f3eea40a9d67edf8ec09d63a39b5e1a231df9d2e57b40e008786d25ee00e8ff2ca0ab0c399d
diff --git a/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild b/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild
index 2e79cc7f27c1..ca09736ee52a 100644
--- a/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild
+++ b/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild
@@ -109,7 +109,7 @@ src_configure() {
 			-DOPENVDB_BUILD_PYTHON_MODULE=ON
 			-DUSE_NUMPY=$(usex numpy)
 			-DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
-			-DPython_EXECUTABLE="${EPYTHON}"
+			-DPython_EXECUTABLE="${PYTHON}"
 		)
 	fi
 
diff --git a/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild b/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild
index 4ad1b89c2ce6..89a658ed62e1 100644
--- a/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild
+++ b/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild
@@ -107,7 +107,7 @@ src_configure() {
 			-DOPENVDB_BUILD_PYTHON_MODULE=ON
 			-DUSE_NUMPY=$(usex numpy)
 			-DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
-			-DPython_EXECUTABLE="${EPYTHON}"
+			-DPython_EXECUTABLE="${PYTHON}"
 		)
 	fi
 
diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index a87d46ba8840..c256627dcbd1 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -3,5 +3,5 @@ DIST rawtherapee-5.7.tar.xz 12092496 BLAKE2B 40d97d09106d7d2b843376b4c58daac87f9
 DIST rawtherapee-5.8.tar.xz 12653148 BLAKE2B f6d4b9b177ad3b6a32b460ecfc7caf5d42a01b5dd4f24da29739f5a2e5936a8d36f9857c0e24bca11f077ab0626f08bbad59ef756792d12f93ef9516427cd2c4 SHA512 bc79586cd937dcaefc053e65faa2162de887d514e44980956d937c157c6d55c4f6e6a7a9b8f91f2d657ed2054814737b96d5d741674c1e5a961d7177433efe4e
 EBUILD rawtherapee-5.6.ebuild 1609 BLAKE2B 44239bb8e54a9149b70d36a1ff582b6f0708c0747f9ee4c021c01438092cec1cb9a64bc64b5fd165ddfc338bbfe533506a14d07c695f5bfba57d6848f6a3b719 SHA512 a1dd100d0f59c2a7642e2f85a34773d37c6c7f1e4d95e865d38c9463dc58151347004860dd320acbe944701c0a8170df89ca0180e915cee93cf7581756a9d51a
 EBUILD rawtherapee-5.7.ebuild 1611 BLAKE2B 098b45f91d7944f5b932b583b39579a217c31538d9816c8942efe683d5f0602919e22b7308cf10eb2e6581b4804ac611c336312722abbf66deea4777f59a9e50 SHA512 dcf827bbf5ba0b7ff77a03f1a7558317164355b8acff4596ae27b88f0ef5a6a17245343f7de349c9486cb471d19345b5ebf966c32776bd6728c96210ded9f4d1
-EBUILD rawtherapee-5.8.ebuild 1699 BLAKE2B a89a6c3d0fb17679bd282a1aeef89b103000a89626d14e32d4fb94a883b6e1c46bf7667b5f181147c89318e21cfc354fbd89a13e753da05ec67551025197f04d SHA512 73df4a6a1aa89176f0703afb66d3cfdd74645c752f44817afd6f792ccd769f59574e11db79e6920f41038b8b8a002e57beea5506a7601ba5791bd00d82977dd2
+EBUILD rawtherapee-5.8.ebuild 1697 BLAKE2B f2eb2c24f9cfdf7444026bf750c0fe68e13054f4d2926addbc8d41a02d0e6277a9099f28eae53ad35087e1ca7351225a8cd20005996e6464b9162fe516b92d56 SHA512 181b057cf7a23818a0756416e67cbb8ecc5d4c5951342237a8e5f13d7f72b1488b42ed9c2ae20dd76c77a62347a5220b68394fbe5b0726e19994629a0be14158
 MISC metadata.xml 365 BLAKE2B 7f954a20d61ad3c5f034099555edf9141e5d24b3dca5b47f8c9f53ef9f7e9422d10dc458dc3b4693288d182f579173a58b85708920a4b1d52576f07567397306 SHA512 ca26a61740ecd1b5ed7197bbc06c91f48e2955db05e2c7952edac28f99dc394504140672148214d202d61d673e4294ecc037457dc0f77bf4b790fc36e668eee7
diff --git a/media-gfx/rawtherapee/rawtherapee-5.8.ebuild b/media-gfx/rawtherapee/rawtherapee-5.8.ebuild
index 425c6e3abbce..ef4b8c6fd287 100644
--- a/media-gfx/rawtherapee/rawtherapee-5.8.ebuild
+++ b/media-gfx/rawtherapee/rawtherapee-5.8.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 tcmalloc"
 
 RDEPEND="
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 601c5c632674..411bd6571a0b 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -14,6 +14,6 @@ AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3
 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965
 DIST backends-1.0.30.tar.gz 5721262 BLAKE2B 139d3ca908d54b94d14ef4145d44a89b939807c15870be03c3c028cf95351bf9a4abd3ea115b84396366bb054f37ade883f429467dceb0663c2855b92e0a4fa5 SHA512 19127c8109c1587d60d8cba713f73b1a24242df44fa49c3e59320f48022783f05d26d3242a3f87478e583a807d88b446ef7a51afb33b674be29656496c435d7b
 DIST sane-backends-1.0.27.tar.gz 6430188 BLAKE2B 90f910311e31a436eaa0ca0fedd998aac3331f89a346f31613776ebc860a10cc37055fd15db8de8d743498914ea0c16e4153dbaa101380eb6e36857d730c3456 SHA512 c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5
-EBUILD sane-backends-1.0.27-r3.ebuild 8101 BLAKE2B e6ff1e73fad9d33c8b9d4a475de311b5ddf60a66fe2604f6c8573bfd593688292a84ac554dc06d0c9d1181f443f31e0e9fc6e6e520a0e76fe62f373129f92388 SHA512 1434b237b354d84eecfab48624805dcbd8dcaaf42e5315ca25c980942551a2cb0cae39453907982d96ffe2a4042def9eb7d44b9ad768750aa35d65a18057c06c
-EBUILD sane-backends-1.0.30-r2.ebuild 8225 BLAKE2B 7f24aae8530d41ceb9890e2c1c1d34b1250303dc8b47f2e5f68d329d4782ba8c667ec04e32c743528b50034a58c94a05a725db01c94964bae33205c2464952a3 SHA512 86fa4ae0347a8c2dac06a34e0f26b81e582d201e3556e57c18e01388dd3697b62bb22d24cb445344f7752fa2fb8b358a2ba9a3b64002f66dbb5220d28be46349
+EBUILD sane-backends-1.0.27-r3.ebuild 8102 BLAKE2B 02630c414ad01a5f0a0aa860fd45600e94e7a803f09dc66d6273ea4e41340ff30c98d31a3c2329a3280b63231c5cad08c77f5bc2c8e5c3944a7d8a19b1d59cc3 SHA512 79159a2dd5e688a2b08f5eebd85c97b229d521b14c722bb367d23fe4641daec3554b24ffa4d886affd32109cc7dcc3ee0b77f5bd6e1e0f5c6af23ccce47eadac
+EBUILD sane-backends-1.0.30-r2.ebuild 8229 BLAKE2B d7f2e41ea54e06aaabd9a0abd47210c45ecc891e34f9563aabf19b11df0e3d250741f1a557465d5fb2f1e5de99f18d292212b160bc52224c5026544f7bd17f0f SHA512 08ba6b7bd2b5a28a8be809794b5b720075d1b3ba383d2b8bdbb763322f9b01838374ac3c152feafe9d49edd9d135cf184e8ccd8f5adfc4b7a4b546f5a1e194ea
 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 b2767d69d408..3470233904fc 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 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
index 2b959ff201cd..514150eb9ec7 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools eutils flag-o-matic multilib-minimal systemd toolchain-funcs udev user
+inherit autotools flag-o-matic multilib-minimal optfeature systemd toolchain-funcs udev user
 
 # gphoto and v4l are handled by their usual USE flags.
 # The pint backend was disabled because I could not get it to compile.
diff --git a/media-gfx/sfftobmp/Manifest b/media-gfx/sfftobmp/Manifest
index 3f426357cafb..53752af33172 100644
--- a/media-gfx/sfftobmp/Manifest
+++ b/media-gfx/sfftobmp/Manifest
@@ -2,4 +2,4 @@ AUX sfftobmp-3.1.1-gcc44-and-boost-1_37.patch 1351 BLAKE2B 00dc9e14b8742a7aaa16b
 AUX sfftobmp-3.1.2-boost_fs3.patch 538 BLAKE2B bb2ea6156f3572f2da8ffd2f2bfd55fa89afe99af3f358d56b978e98160bd7b90c72cae8490687fc0b9c0509f896f5c6a7bfe41677f42652d77d52860b56e46c SHA512 75158af4ff574fe5112e4057ce0c2bca2f49afaf63862c42add85b8ee8e843f0a08b8c3d9f658f999024643d95ffcd65085bcb0607213722eb021b102037872e
 DIST sfftobmp3_1_2_src.zip 121478 BLAKE2B fe5e09d358cfa75a45a05e780fcf8b3409ae9791882c8c4ab3fe99b078cade57a75751343c42a5d7764702ca32565e8c97d417e3c095c10a01b6fcd0f09f03b3 SHA512 3c460dcd60486954f792ecc8e864d109dabbae30b56a6ba4b3228a42dd489fd88793e4d93e2d032e6cd1c552bf5e217bc2afb3eae85a1a4e1db340f7761905b7
 EBUILD sfftobmp-3.1.2-r1.ebuild 779 BLAKE2B 6bec6ef6b6e45a4dce5cced32592287571c219fdac698723e876fa0fddbf7c1df3e2ccc5144c3deba65d3db8050f0699f6eb0ed09fc68ed807b010c993b37ecb SHA512 89449a9ad5737348348b82005230d9d72fcde123c08908d1d0f6af51926db4cca510fc2221a958450948aaa59650998da0829b344154014ba612b81d6ac55c9a
-MISC metadata.xml 302 BLAKE2B 9d6aba0d209ba1d319177b887ff81b5130539ad3db60b810f488277c756da398c4dd53966c4e8a428838a41bfaa6926f26410f33b42c07c9e5e9e0a0a8b70db7 SHA512 6ac3921ad7d5ca5703915d8ad5f6f1f477bde3c6b7566904ee9775ecccfb783ed2cc82238bde81d6be63304da1afad2b5afe2a5e860e4290d0d4e42f4645096c
+MISC metadata.xml 245 BLAKE2B 38d8c158d180bcc80f641f84e8b1411b5924fe54c5173e5bc60ff2fdfdc55a34c8608189c5a9281926e877c2eff646d784d2770e0893ac325a084b26a821780b SHA512 e758417b46d7ffa5144bda2c2fda4decbc3e6d2aa1eb220b8552dbde32f56fc49f63bae452ce0e750f4f2c69f3ebfd064ddd7356d2e2742e8a63804b06531808
diff --git a/media-gfx/sfftobmp/metadata.xml b/media-gfx/sfftobmp/metadata.xml
index fd38410961d5..25a1448081f3 100644
--- a/media-gfx/sfftobmp/metadata.xml
+++ b/media-gfx/sfftobmp/metadata.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription>sff to bmp converter</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">sfftools</remote-id>
 	</upstream>
diff --git a/media-gfx/synnefo/Manifest b/media-gfx/synnefo/Manifest
index 57f90510a2e9..94cf4215ed2a 100644
--- a/media-gfx/synnefo/Manifest
+++ b/media-gfx/synnefo/Manifest
@@ -1,3 +1,4 @@
+AUX synnefo-1.1.0-cxx11.patch 5387 BLAKE2B 64280de77601f7a44e03138fa7af59c8e5466621e8f3735babf830c4b0a917e5c6b1147de6f7078cbc503d2a71755e11143d4e8993502ba6bc23bb40edc6cbbb SHA512 7c9e99ddf56758caaca004e33707372f1df7ad21269cefa59c04a3e1f733408abb83ae7e60f13499e8a185cfc7b8b1dfe62a506863fd289f78b1e71fa311ea6c
 DIST synnefo-1.1.0.tar.gz 161822 BLAKE2B 1d1981ae815e692cd9230690214bff039c2b523f78faab34d35ad8f25cefbc656ace2ba2ca240baa7d305417f17ea0c4d0cad5d300a638b15cc81d315fdf474c SHA512 f4c50e6e018b0dcf91715c379cd5b79452886fb7fda189ad47a22b9d5f47b3ca710b959b773a1e0a42564e881d09da088a88eef505719b1b1fbfbb5e21fb26ef
-EBUILD synnefo-1.1.0.ebuild 712 BLAKE2B 6be06777f5b9f0a89c8fd86e0910a95b0e8dde9bfa3f41579d2120809afe40b61dbfe0e5bd34a6607deec6ce5ffdff8067774bd50c6ecd0b52eec86713efc3d6 SHA512 4df0ac04e02437afcfd04065dd5942bfafc8d83187a8e4f989166bdb566bf1e98602b645f40433a8214ba7eebe48c3e492d84fab1344943a8a8694167adbbecd
+EBUILD synnefo-1.1.0.ebuild 769 BLAKE2B 3bea272c73df737d3f4ed0b6fdd89d68c265c1afdd858f206c51406d5dea219a6668ca966ee19467ca0757bf919f163857ef5921d4fd90e94cabe19e6061c8af SHA512 80bf16de85f329ce9e4602b864331e08ff74d53729d4a85ce114ba5757da1e7e5184ed5a3eee7d9cac10e790947f15a6e591f5a812e4cb6b2017e79c19edd471
 MISC metadata.xml 333 BLAKE2B ae4c40964873b751ece7a62f6f8c4cbc7d6d6cb9d4008e958a243f8a6c5ba3461156a5032097997b3d90a5b9dde516bd5351f4e7cde27f83cbaf82224c7ee1d0 SHA512 49d4f64a95ddf7b75f0e3efe44bc03e8df9f565aec70c52838dea32badc5809d0b3945f87a4de3bc6704f0a3e1732e683412d4ffd480e5ef40bf763c958b7936
diff --git a/media-gfx/synnefo/files/synnefo-1.1.0-cxx11.patch b/media-gfx/synnefo/files/synnefo-1.1.0-cxx11.patch
new file mode 100644
index 000000000000..fdc438f09d26
--- /dev/null
+++ b/media-gfx/synnefo/files/synnefo-1.1.0-cxx11.patch
@@ -0,0 +1,99 @@
+From 30691bdb98566482e1c29ee440cfc8531fac2616 Mon Sep 17 00:00:00 2001
+From: Kai-Uwe Behrmann <ku.b@gmx.de>
+Date: Thu, 22 Dec 2016 13:02:05 +0100
+Subject: [PATCH] fix some compiler warnings about string macro usage
+
+---
+ src/modules/devices/sy_devices.cpp   | 12 ++++++------
+ src/modules/information/sy_info.cpp  |  4 ++--
+ src/modules/settings/sy_settings.cpp |  2 +-
+ 3 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/src/modules/devices/sy_devices.cpp b/src/modules/devices/sy_devices.cpp
+index b477fd7..f60c4a2 100644
+--- a/src/modules/devices/sy_devices.cpp
++++ b/src/modules/devices/sy_devices.cpp
+@@ -146,10 +146,10 @@ int syDeviceGetProfile( oyConfig_s * device, uint32_t icc_profile_flags, oyProfi
+ {
+     oyOptions_s * options = 0;
+     oyOptions_SetFromText( &options,
+-                     "//"OY_TYPE_STD"/config/command",
++                     "//" OY_TYPE_STD "/config/command",
+                            "list", OY_CREATE_NEW );
+     oyOptions_SetFromText( &options,
+-                     "//"OY_TYPE_STD"/config/icc_profile.x_color_region_target",
++                     "//" OY_TYPE_STD "/config/icc_profile.x_color_region_target",
+                            "yes", OY_CREATE_NEW );
+     oyOptions_SetFromInt( &options, "///icc_profile_flags", icc_profile_flags, 0, OY_CREATE_NEW );
+     int error = oyDeviceAskProfile2( device, options, profile );
+@@ -595,7 +595,7 @@ int SyDevicesModule::installTaxiProfile(oyConfig_s * device)
+                             "//" OY_TYPE_STD "/icc_profile_flags",
+                             icc_profile_flags, 0, OY_CREATE_NEW );
+       oyOptions_SetFromText( &options,
+-+                            "//"OY_TYPE_STD"/config/skip_ask_for_profile",
+++                            "//" OY_TYPE_STD "/config/skip_ask_for_profile",
+                              "yes", OY_CREATE_NEW );
+       error = oyDeviceSetup(device, options);
+       oyOptions_Release( &options );
+@@ -803,7 +803,7 @@ void SyDevicesModule::populateDeviceListing()
+     char ** texts = 0;
+ 
+     // get all configuration filters
+-    oyConfigDomainList( "//"OY_TYPE_STD"/device/config.icc_profile",
++    oyConfigDomainList( "//" OY_TYPE_STD "/device/config.icc_profile",
+                         &texts, &count, &rank_list ,0 );
+ 
+     for (i = 0; i < count; i++)
+@@ -960,7 +960,7 @@ oyConfig_s * SyDevicesModule::getCurrentDevice( void )
+     oyOptions_SetFromText( &options, "//" OY_TYPE_STD "/config/command", 
+                            "properties", OY_CREATE_NEW );
+     oyOptions_SetFromText( &options,
+-                     "//"OY_TYPE_STD"/config/icc_profile.x_color_region_target",
++                     "//" OY_TYPE_STD "/config/icc_profile.x_color_region_target",
+                            "yes", OY_CREATE_NEW );
+     if(current_device_class && current_device_name)
+       error = oyDeviceGet( OY_TYPE_STD, current_device_class, current_device_name,
+@@ -1003,7 +1003,7 @@ void SyDevicesModule::assignProfile( QString profile_name, oySCOPE_e scope )
+                                "//" OY_TYPE_STD "/icc_profile_flags",
+                                icc_profile_flags, 0, OY_CREATE_NEW );
+          oyOptions_SetFromText( &options,
+-+                               "//"OY_TYPE_STD"/config/skip_ask_for_profile",
+++                               "//" OY_TYPE_STD "/config/skip_ask_for_profile",
+                                 "yes", OY_CREATE_NEW );
+          oyDeviceSetup( device, options ); /* reinitialise */
+          oyOptions_Release( &options );
+diff --git a/src/modules/information/sy_info.cpp b/src/modules/information/sy_info.cpp
+index 9d194cf..3b4909c 100644
+--- a/src/modules/information/sy_info.cpp
++++ b/src/modules/information/sy_info.cpp
+@@ -231,7 +231,7 @@ void SyInfoModule::populateDeviceProfiles( QTreeWidgetItem * deviceListTree )
+     oyConfDomain_s * d = 0;
+ 
+     // get all configuration filters
+-    oyConfigDomainList( "//"OY_TYPE_STD"/device/config.icc_profile",
++    oyConfigDomainList( "//" OY_TYPE_STD "/device/config.icc_profile",
+                         &texts, &count, &rank_list ,0 );
+ 
+     for(i = count - 1; i >= 0; --i)
+@@ -266,7 +266,7 @@ void SyInfoModule::populateDeviceProfiles( QTreeWidgetItem * deviceListTree )
+         oyConfig_s * device = oyConfigs_Get( devices, j );
+         char * device_info = 0;
+         oyOptions_s * options = 0;
+-        oyOptions_SetFromText( &options, "//"OY_TYPE_STD"/config/icc_profile.x_color_region_target",
++        oyOptions_SetFromText( &options, "//" OY_TYPE_STD "/config/icc_profile.x_color_region_target",
+                                          "yes", OY_CREATE_NEW );
+         oyOptions_SetFromInt( &options, "///icc_profile_flags", icc_profile_flags, 0, OY_CREATE_NEW );
+ 
+diff --git a/src/modules/settings/sy_settings.cpp b/src/modules/settings/sy_settings.cpp
+index a1c54ee..3f74c1d 100644
+--- a/src/modules/settings/sy_settings.cpp
++++ b/src/modules/settings/sy_settings.cpp
+@@ -213,7 +213,7 @@ void SySendNativeUpdate(const char * func)
+ {
+     // e.g. send native (e.g. X11) reload event
+     oyOptions_s * opts = oyOptions_New(NULL), * results = 0;
+-    int error = oyOptions_Handle( "//"OY_TYPE_STD"/send_native_update_event",
++    int error = oyOptions_Handle( "//" OY_TYPE_STD "/send_native_update_event",
+                       opts,"send_native_update_event",
+                       &results );
+     oyOptions_Release( &opts );
diff --git a/media-gfx/synnefo/synnefo-1.1.0.ebuild b/media-gfx/synnefo/synnefo-1.1.0.ebuild
index eb126309b0bc..3ac8c9b7578d 100644
--- a/media-gfx/synnefo/synnefo-1.1.0.ebuild
+++ b/media-gfx/synnefo/synnefo-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,3 +31,5 @@ RDEPEND="${DEPEND}
 "
 
 DOCS=( AUTHORS.md README.md )
+
+PATCHES=( "${FILESDIR}/${P}-cxx11.patch" ) # bug 739982
diff --git a/media-gfx/tuxpaint-stamps/Manifest b/media-gfx/tuxpaint-stamps/Manifest
index efbd290e290c..d088003a95a3 100644
--- a/media-gfx/tuxpaint-stamps/Manifest
+++ b/media-gfx/tuxpaint-stamps/Manifest
@@ -1,4 +1,4 @@
 AUX tuxpaint-stamps-20090628-make-382.patch 365 BLAKE2B d427c1867b47fde62f1dfb568240727fbef151fc6af6d45e33b5f83a8c30d0dd4e67ea91ee34af248dc6bbbf1a17d7da876dd848033757cad87d4e84116c351f SHA512 17915d5b7aaf9857a6e15a51a2039b00edd6a9adda27f529a10a5422b37df5e9ec500dd497c6e6df45fdae6617717f90d166fb04d5401d9bfa767e09fea31e49
 DIST tuxpaint-stamps-2009.06.28.tar.gz 48273629 BLAKE2B a9c11b846d60bb4de5bfaa721a24254fb6510bfddeca54f398ebf941f2fd74f546eaf3cdf7cd65932835e2e72993d6627f6247c7dc4a4488d2d2b2174c04455a SHA512 ca059275484bec045c4f2bad414ea5359d2a8812cc1c8d1e11ad8f3b7e63e107c1fccc347291ffe95d81a5192b39198c56d319ef6a0f475fb128d9a2d0e5e027
 EBUILD tuxpaint-stamps-20090628-r1.ebuild 626 BLAKE2B 4531c55c9a3febee023974ac4386001a779bfd487d367dad37fd58690780345ce46c3a679b270f6554e85817c47e61269bf34140c71dbe89e0f2da0c89e2fd68 SHA512 0cb6a1e8b249ee3970c888c7aae9030746003d177b7f14b8541e4b213e5fc7d5b50abb0a3d278b8c6b180f643b8ee3057338cdd5acfee0d85f752402ba2f614f
-MISC metadata.xml 354 BLAKE2B 9e9c851dd7a87ea893f20c4fdeeae447eb7efd6f3688419c417a1d38782e5c53743dc4de664ca0bd462b83450553fa0aa161ef5d9cef344f3361d029cdce35ff SHA512 e47edc76f8fcdf36abba39af57e5af6c2c1c66bb8f430f86248b3491680b405e866faf946477974b908903fce9d2d8adbc737dc737bd493a671c4db7ee372e15
+MISC metadata.xml 250 BLAKE2B 59de89b600be3703150400084ef9d6610d90f4bbc28d54ad418d28c81ca9cae021c6874457e5ad3d9c740748bf004ea8cf22945c7ab7855e072bac48675ea72c SHA512 37e0b7133afe4ac81b9f340fb4bfd8d6bedaf18fd2605f282f2908a6fdcc8a8f8a1dd6cc9dbcb056ab937464558387ad0cbacc034cc3ccffcf80adb843e1f55d
diff --git a/media-gfx/tuxpaint-stamps/metadata.xml b/media-gfx/tuxpaint-stamps/metadata.xml
index 4b198127c379..b6da2c1fac45 100644
--- a/media-gfx/tuxpaint-stamps/metadata.xml
+++ b/media-gfx/tuxpaint-stamps/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
-  <longdescription>
-  These are additional stamps for the Tux Paint drawing program.
-</longdescription>
   <upstream>
     <remote-id type="sourceforge">tuxpaint</remote-id>
   </upstream>
diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest
index 3d06dd391d3d..f044a1e53c05 100644
--- a/media-gfx/valentina/Manifest
+++ b/media-gfx/valentina/Manifest
@@ -1,6 +1,6 @@
 AUX 5823.patch 1870 BLAKE2B 1a4edc390abd09010fb946035dab6f4ee9223eaa286f9843404db4f95d94e60da73dbf515c99aa857acdcb7d26bca3117fcdfdf2b9514ad45c2e795ab579cc46 SHA512 0cf9d1691816b165ab691cd34807f7c82eea685b5af2d9c483a9427987ae565f44e31bffcec9c3ede6102aa800d3988b054a178ec74f1826be1a88fd9f5ec28c
-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 2153 BLAKE2B c6c14a02af78cb73c6c36690646ae1da71cd6ef832884009d9fec074813203b9a5ba96feddc63cdc8df0b3bd178b3932f068c6989e57bc7d497afd5d3fc14af6 SHA512 6bc3da7de6f6275eec8f633ac622e8f8d3c84cff59995690035c4c4c9e9f696517b5459eac530a4901d45b66c13f824bfd3cc7de746b1e576927b4e5478942a3
-EBUILD valentina-9999.ebuild 1939 BLAKE2B 416f90138e80d3f60fc429b001501b986e0033b2e31e7b7de12cce26ebd63d25b4a18b78c67d624a7a8831558f35a704d1a971720cf9c153347ddc6d268e47c7 SHA512 f5beb0b8e592ce55dae34ab3f0980e4fd4169879fe12b093d08317247ddb53755399c931858e64be39c8da13b5748665bbc1536446ea408d83f9b71ecf10c636
+DIST valentina-v0.6.1.tar.bz2 25575677 BLAKE2B 56d5adc973df319b3a65f877768c2195e1af2db39118e18fb17636e5739610d55e4ade4d4516a6817347dcdb0e4468e4587cff91fc5a5ea74a35029c52bf858c SHA512 52a3a02bd08f85c6241fe29baa9c8a2b80d2e8b071877bc68f98c3ff7bcdf810d9975903f804bf4e120f1a65c06de405fd44bc822292ab7b6191b778ec703542
+EBUILD valentina-0.6.1-r1.ebuild 2157 BLAKE2B b090fc8ea166a9a267f1e8c27cbce6c874718f7436795f16bb2b712a37f634ec3e5da6a1d64edc8492e1a3c41fb5c8187c30aaa9e55d20f3305073a74ad91d36 SHA512 6ea35b9df7a5900b2170537f92dfbfb25fb279ced3faf8dc44b5fc34ad26d6162c9b4b23e086be8bea23ce08c6384cc380730cf95e0976d4179e4533c9aeb949
+EBUILD valentina-9999.ebuild 1959 BLAKE2B 157b209658db28fc9525507f90efdc257291fd5860631f850b8e1a965f1911b548a6964fb4d238a69868e2556d0dc4abc67eb189d516d790086ca0d78d7f0490 SHA512 eb6009b78fb0ca7d389749cf12322b36a5d2c96d019973c71f257b93e9b20b66e80ec090372c69804deaedc08e60f36a780559d5af0414334231db33de21b208
 MISC metadata.xml 334 BLAKE2B 7f146a505a30d4461165308b40383e2b78998411874c8af6113c3040142003868f397872ecd22b9b8f3ec6193c532fa934c8646ee04e8c49157464b58035de09 SHA512 d1264aa0d26ba75466c5572c37ca6fd384d4e6db392aca0e47d4b1d0bd3ef7e035fed51c460af1bb258c500d1cc9211ec2e85db3e3aa158d378fb1389a3ebf03
diff --git a/media-gfx/valentina/valentina-0.6.1-r1.ebuild b/media-gfx/valentina/valentina-0.6.1-r1.ebuild
index 3649628d9225..ac59849d9eea 100644
--- a/media-gfx/valentina/valentina-0.6.1-r1.ebuild
+++ b/media-gfx/valentina/valentina-0.6.1-r1.ebuild
@@ -7,7 +7,7 @@ inherit qmake-utils gnome2-utils xdg
 
 DESCRIPTION="Cloth patternmaking software"
 HOMEPAGE="https://valentinaproject.bitbucket.io/"
-SRC_URI="https://bitbucket.org/dismine/${PN}/get/v${PV}.zip -> ${P}.zip
+SRC_URI="https://gitlab.com/smart-pattern/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2
 	https://dev.gentoo.org/~fordfrog/distfiles/valentina-5858.patch.bz2"
 
 LICENSE="GPL-3"
@@ -35,10 +35,12 @@ CDEPEND="
 	dev-qt/qtxml:5
 	dev-qt/qtxmlpatterns:5"
 RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-	app-arch/unzip"
+DEPEND="
+	${CDEPEND}
+	dev-qt/qttest:5
+"
 
-S=${WORKDIR}/dismine-${PN}-b639b75d1688
+S=${WORKDIR}/${PN}-v${PV}
 
 PATCHES=(
 	"${FILESDIR}/5823.patch"
diff --git a/media-gfx/valentina/valentina-9999.ebuild b/media-gfx/valentina/valentina-9999.ebuild
index 16d93280dd62..abe4eee7ed04 100644
--- a/media-gfx/valentina/valentina-9999.ebuild
+++ b/media-gfx/valentina/valentina-9999.ebuild
@@ -35,7 +35,10 @@ CDEPEND="
 	dev-qt/qtxml:5
 	dev-qt/qtxmlpatterns:5"
 RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}"
+DEPEND="
+	${CDEPEND}
+	dev-qt/qttest:5
+"
 
 src_configure() {
 	local locales=""
diff --git a/media-gfx/word_cloud/Manifest b/media-gfx/word_cloud/Manifest
index 78de99cafc30..2a4d2dec9fde 100644
--- a/media-gfx/word_cloud/Manifest
+++ b/media-gfx/word_cloud/Manifest
@@ -1,4 +1,6 @@
 AUX word_cloud-1.6.0-bundled-font.patch 238 BLAKE2B 0c62c4e8d76b3f5beb5e7e031bf25727809e2cf3c4c5954dfd748a0c60d1c118531321664c146889c88f8652c9a0ef05e1fc63c06bcac97719f6db937af6cea1 SHA512 f28a37c1c48ea878c6ba702a5bac100c6204b4f2ce9452cb93f37da62b0bf961e78f3ac082a6d1fd238da362f9019e29f337c6bc6f01e65749e2a836c7d6963e
 DIST word_cloud-1.6.0.tar.gz 27524706 BLAKE2B 751b78fca97ec6e93c6a766c5b960dbb5fd91c012637e9c905ef96eea0dc60882ef1604a9868cfb3ca91a2c9ac6f50132ad5d820e6dd52114e68112bbe6decb0 SHA512 cb67570e2f6206c92316ef398382703b4ff0f1740688cd4a9ec66a093a663e903da66daaef666d634a7fddc5ec19da859d706693940a963a3bf58c52e9054056
+DIST word_cloud-1.8.0.tar.gz 27691477 BLAKE2B 26f1a9da8382fb1865d939bf87ed91911a1d5c1f0c38294d514e9ca9917d4293a9c8c7bb304fe68889127becb01eca77c0fc5e1d3588b9a5015971afee4f8aba SHA512 25b30b88953e8aca8ec5c7ce156fd1519c3b10e7d9dd0160d22136513ae28be9eed8bcfcbca0292879c43a115b2b7eac8324640590d571aa27549973fa8b98c5
 EBUILD word_cloud-1.6.0.ebuild 623 BLAKE2B 8d307dde7291f9660d49dc08e5bddab75ed81d2f83367d1d30bf367ef9ab28bcf464fd20c93ce74f788222de01f88090fc66480cf80bb60f6ae5d65e9827e544 SHA512 9703bb931a38315a1968ded0a757d14074d220adfc14424d7b5e169ec8ffec5e4e784a4c1e248c832d63f11f7eaa704f3e40cbb98fad72cab30c3b7cd1a37e26
+EBUILD word_cloud-1.8.0.ebuild 630 BLAKE2B 6a01d221fe6d4cb210c804549fcf60d137be53d5a64856de47ce05a9660a937465394c084d30f732b07dd4c1e8cb40fb8aed7510aaa19ecab20ce38349eca8e9 SHA512 1a9bb92ee89f2ebbb4b4160e049a1decd6e5fa408ef4a82c974f67670b96314244a42a18692a6a64854ada4a8dd4b22cbb5c5544c8c26ba9f93ef49086b7fc1f
 MISC metadata.xml 212 BLAKE2B ecb53eb3efac6ceef048d345601c5ca0430e2f62d6409dc2a18494ee188f792d4763892816f197418d2e9a6d04452091a0c69d83afc207b366fca816632209ee SHA512 3919b8b096abf61c7edaa6a76898603b6ca2e206e2eccd27c671957a9d085bc2591a2fb4839a85ef2a51dcbf887bb2c752d4b38e82ea19c48dfd6d99b67954fa
diff --git a/media-gfx/word_cloud/word_cloud-1.8.0.ebuild b/media-gfx/word_cloud/word_cloud-1.8.0.ebuild
new file mode 100644
index 000000000000..9e8a918b2496
--- /dev/null
+++ b/media-gfx/word_cloud/word_cloud-1.8.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_{7,8} )
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="A little word cloud generator in Python"
+HOMEPAGE="https://amueller.github.io/word_cloud/"
+SRC_URI="https://github.com/amueller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	media-fonts/droid"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.6.0-bundled-font.patch )
diff --git a/media-gfx/xdot/Manifest b/media-gfx/xdot/Manifest
index 30092ce0212f..b4525cb005b7 100644
--- a/media-gfx/xdot/Manifest
+++ b/media-gfx/xdot/Manifest
@@ -1,4 +1,4 @@
 DIST xdot-1.1.tar.gz 134215 BLAKE2B e241a4fb1ec69a8613f7813dc159761e6bffb82ea9f58876287d01946f4c93e66e5eef66e6844abb7738979412c2c7d2d26f76bc0563ad0c3c8550d9e8023b47 SHA512 d67c45c8c071013551f79d671a21ce546b680fac5997ba9631a882ffa3c44c15a69949643ed5e8211417006152575a1d99450ccfb6062427521d1e2bc0814f55
 EBUILD xdot-1.1.ebuild 1131 BLAKE2B 8cbb12c6cf8e7d4d9ae7f21519be9f512257dabb46f7cb18251c7128e318e1a0c3197df884362206a2a3d8c4ca868d46f9d312a74dfebd5d758905425813b48c SHA512 4d25cb15d1c705217272e38f3215a2b25a3610a84f26752cee69568e3dc8d329099d387d769dde6217262c42dc422f7adfa7a164fa9cf3624439e109e7864cec
 EBUILD xdot-9999.ebuild 1136 BLAKE2B 6f437471ef3c8574cf84b2acd7f65c735f7aa06e4566616dc9a7dd1ca1044b5488b42dc50dbdded9ee92be2d96a3c642757e8813cc4fcf1e835c48e2b6d929a6 SHA512 1b0b8322537735e66e72fad2a846e4244ba5b8c79ba2ba67a4667cb07839df67050b8b92b72c56ba115f51a7f1c159e2c7e0b46d1f4d2e3dfbdcf040cc77c320
-MISC metadata.xml 483 BLAKE2B 50b03bb7d189da9bd6ca793f30c1ba3d13d12151533b42c99321a849515d7664398ec1b10720596c0453c48d35e2a6083b0559eb127199e1d6f4fc2a93aa04c4 SHA512 7e734dd60daa1e74b28f0932f508787e8deebc75a8f46c41f77007b6c8f96751cd6b07f6638cb89b38eb81d4fd2c6f7ba9f6d449f24f17ad25fb001d7f4f5ff7
+MISC metadata.xml 398 BLAKE2B 4cfe399944032b70bb0092f9bd2f47b7e1f45cccfa75e2c8eea9dc41ae8456ffb450d5777a77218c22b8f97d57e0bd63956b63c345dba7167b1cfa8cfe3182aa SHA512 7afd30baf3ee9ec5c492659df23168d22c5a07381ed5972c8a02394a57dd332b86b59393b1bd16d2d365d61aa46839aafa78ff0386a92a26563139e31ed01a76
diff --git a/media-gfx/xdot/metadata.xml b/media-gfx/xdot/metadata.xml
index fed3a8992570..fbe4f1f1c762 100644
--- a/media-gfx/xdot/metadata.xml
+++ b/media-gfx/xdot/metadata.xml
@@ -5,9 +5,6 @@
     <email>mattst88@gentoo.org</email>
     <name>Matt Turner</name>
   </maintainer>
-  <longdescription>
-  Interactive viewer for Graphviz dot files
-  </longdescription>
   <upstream>
     <remote-id type="github">jrfonseca/xdot.py</remote-id>
     <bugs-to>https://github.com/jrfonseca/xdot.py</bugs-to>
diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest
index 393a1598d75c..cdbad9dd4e44 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 1167 BLAKE2B faae7a014a92a9ed4d0177912cb4eef8d70ef841c6421656fc0986261d5bde417dadfd359adf22e58b897bad45626c0c920092a64a55bba2980723f35641890a SHA512 022d02e0ebddf9375d356235af091134f4b6533bd4b5c0bfb7919d0c686290bb112ef6881febb1e34847789df579ad64bbc4452b08ebaffa1eaf61cffa2b529c
+EBUILD xfig-3.2.6a-r1.ebuild 1180 BLAKE2B 9409fdba002eaacf0e5fd75da24e05d8b196ddd2aab2c6a47e173bbe6accbceb7c81050e6a36682b4c8f7b7923ed106ed551f17569d8429d97e9560a5396258a SHA512 1608fda4f8a1d6616a5436bf5d56df08eddeb717944479a3be6032c0fc472b6e485ca9aacf568c7b61cfec1f14fd63d92e43dd132778922860a6edb4744bb3c8
 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 8ce2049866c2..2a08fb6f16d8 100644
--- a/media-gfx/xfig/xfig-3.2.6a-r1.ebuild
+++ b/media-gfx/xfig/xfig-3.2.6a-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit xdg
+
 DESCRIPTION="A menu-driven tool to draw and manipulate objects interactively in an X window"
 HOMEPAGE="http://mcj.sourceforge.net/"
 SRC_URI="mirror://sourceforge/mcj/${PN}-full-${PV}.tar.xz"
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-16 09:32:48 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-16 09:32:48 +0100
commit	9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
tree	b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /media-gfx
parent	b17a3ef12038de50228bade1f05502c74e135321 (diff)