gentoo new year resync : 01.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
commit: 129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree: 53bf797418ac5e9b99c41ca0382c87b82421e5de /media-gfx
parent: 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)
90 files changed, 1351 insertions, 464 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 2ab8b3b8b3ed..e290ed6dd9b4 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index 269b4b8403d5..6392038086a7 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -1,4 +1,4 @@
 AUX argyllcms-2.1.2-fno-common.patch 5132 BLAKE2B 5398d60a364a36ea24d6cce682330db177aaaec874a39e4f2a9c754a8862504938471851a14ce0871bb7863a9fd9a794f7ede2144090e1f44718f001344032e8 SHA512 d60f0eb9bd6d32b85d8ac88aa32558d1446357c6643fbdb393e90eba08f8f701ba8185741879b2320bda73e08ed14989cc1a16ffd4d2996d5e9afb05774e4e76
 DIST Argyll_V2.1.2_src.zip 13837056 BLAKE2B cf6181549e37b1deda11bdd4a63b27e101180a1e82b132ea8dca5af6830a74d5e2f940633f5aecf9a8d62fe8c2b0cdce8f2af44124ce7432b33d2a1bdbaa2c21 SHA512 f49b588c5f0a39edcc30a068a8bde8c7b74611d3feb15d07d4a61b205ed1231c288629f65e1a5a60a3921d552a28e075667ada555401a0d9694fd882bddd4b06
-EBUILD argyllcms-2.1.2-r1.ebuild 2167 BLAKE2B 78c01e2d3a10326a57d42e6b514e1b4a5cf455754dac3fd48552da4b3308370447a47263696221918b485c5a0d52a47f98a58166a07652e67d49f03b70eec7bc SHA512 8e2d651ac4fca6843212f021f103fd6b3f0108ffeba2eef8a6f7fcf7cee553bb5eda313bd90284f0b0004c21537c9162c36d129f28f0de7d7428313bc358fcf0
+EBUILD argyllcms-2.1.2-r1.ebuild 2168 BLAKE2B 7ee5f4e6b74626dc19b19732fa54a4c6ce187ce2a7c5ba2a2ad21788e766159671882a0e6af4e987239d9a39820b635d8479e3b16939c5637eaae9323ce3f352 SHA512 36946ed6dd4da3141cb80c867e516555d8542c2400cc608f7eb0cc549cf32b293a7d3b818dabf6821ad8e4c7658d087dba561e4dc4600c69b190938248276bd8
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/media-gfx/argyllcms/argyllcms-2.1.2-r1.ebuild b/media-gfx/argyllcms/argyllcms-2.1.2-r1.ebuild
index 822de05ed22f..8525a9f4b216 100644
--- a/media-gfx/argyllcms/argyllcms-2.1.2-r1.ebuild
+++ b/media-gfx/argyllcms/argyllcms-2.1.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm64 hppa x86"
+KEYWORDS="amd64 arm64 ~hppa x86"
 IUSE="doc libressl"
 
 RDEPEND="
diff --git a/media-gfx/crwinfo/Manifest b/media-gfx/crwinfo/Manifest
index 2c8a8211af34..200e2fe441a4 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
+EBUILD crwinfo-0.2.ebuild 596 BLAKE2B 2e948a0873510fc6e296a0480a2b58ecc93453aeeedb9f54b3e30df68821aa08ee20c51b4baa6d27a89ceb66ebd705380a132c93ec8c42db11cb3ede612ea345 SHA512 efbd17d4e327fdbc6b1ffa43a396d39fdf57fb79fb332370fd5135675f9c094e4ba37e2bc11bd70bb03177abd3739b2e662be6980920a5e970e0fe331c9101b1
 MISC metadata.xml 242 BLAKE2B 3ebb02c611a041f50333e1f36151e7a0b1c901a0c3f3bad55dfbb7b348d0dc3b989cbb87fdad304f56b47b62d0bcccf2af11fcc816f8b523ab1c265e0d35e9cf SHA512 d10ad1d85a15809fe3555c02b15d361239f7b00307632150ab64d4c5cd2d4c52577b3599fb79d3977f479b438215e6a6ef4ce29d8773afe569ed6fbfce85d75d
diff --git a/media-gfx/crwinfo/crwinfo-0.2.ebuild b/media-gfx/crwinfo/crwinfo-0.2.ebuild
index debdd7e05574..399e3208c0fb 100644
--- a/media-gfx/crwinfo/crwinfo-0.2.ebuild
+++ b/media-gfx/crwinfo/crwinfo-0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://neuemuenze.heim1.tu-clausthal.de/~sven/crwinfo/CRWInfo-${PV}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 S="${WORKDIR}/CRWInfo-${PV}"
 
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index a6fa2c7e1f57..899665bbf0c2 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,6 +1,8 @@
 AUX darktable-2.6.2-exiv2-0.27.patch 598 BLAKE2B 724290bb5c1344c0113abde04688009b3db10f530684f3f53e0fcc935a9ebef4b3680a36cb5d005e8826ea1512f0ec505b06e404d144006848601699d33d1416 SHA512 77fc92bf8d373552fc82de1927a1708b989caf0b080c8ef279692c0b9f2e95526a70d2bf4af5f62abb68ccb733af08237f9e143773cc8a75d72dfb6ba434df6c
 AUX darktable-3.0.2_cmake-march-autodetection.patch 908 BLAKE2B aa1c0cedfe1f267332f11b9a8f38ce368af02b7e4f9751b128b7af91dcdfb066a0529ae126d41a34bc3fc66f336924f3376f270674bcc7e0912d2e23d46ec83b SHA512 da1f10e86b7b9e2a3f317d620a58ebed156a5c6e0f22f429da617cb176d1c18d6d1b6706c1444c9007ccb776bc6b951e3560214e89e95b4050899ec692b74dde
 AUX darktable-3.0.2_jsonschema-automagic.patch 729 BLAKE2B fdf306a513cc78fbd2b377d55baa4631b0feb885312252a784b06477afb08f8b43b742b4acfb9da7cb52c20eecf997668ff17444020690671136e17573dc75e9 SHA512 7b2f17827ad099c476f3272d9ffc41dbd3d1e1bdea482beaddb4d654d3555677212ed50df1fd83f94e1274670baecd951878280e1a052f327fce47b12ad720e5
+AUX darktable-3.4.0-xmmintrin-sse-only.patch 748 BLAKE2B 4466070726d011e2522dd939a55e5d8671f927d0c0165e176b3732a8eac17401cfc7d681fa0b97a8ee0f4dd796da1f937a6cf7d4ee2bfb2d828d7a37b92c3570 SHA512 998804a761320db915f96a499136be8abcbf7e906d07f0ed7df62c07cd5ed277ed9bcf0b348660731ecb131feb3611f1435efc485ebcb3c13fcb48020c1d93fa
+AUX darktable-3.4.0_jsonschema-automagic.patch 891 BLAKE2B b0abdd7ea80a446e2556daf06f78343deeb781a12b670f3c3d2f8a34ec9877e16991f6a105c90d58f437915b30bd8bddfb995d515bc73563a44f3807258c9fee SHA512 57cdf87586c6382347334577fff71d415be0123ad101c073535e9d4e87e7edac275272e0b3be91bd34965bacf1f6166cfc64af34b4cdedfb27b409e27bc3bdc9
 AUX darktable-find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b59cc73834d734c454a7c561654bc27f052de55db6c62f454927b2c701b7f4f6c52d5d2fac0b7c230b90ef89bdc9431856bd4ae69a SHA512 93023a318158850a5bac4a1d871ea6e69a3c9f2bc57f8af47bc83bb131f96e8972c23b07945df2eddfb05bffdd950e8250da77c47d1543b776a7e9405adad020
 DIST darktable-2.6.2-gcc9.patch.tar.xz 25864 BLAKE2B 857803d4c46b47b1e06e962533c231621fa23e72dffae617bc4e078316fc22c5883df404b30e63d7ed2111078d0d7b54bfa3510524c92fa739238904e2ec17f0 SHA512 29b208fa0b04aa11a2c45312763ba471785b2d0f669c07a6092b82adc0284428d7dc9ea8ebae7bd851414f04191e6aafb434fcc127f062ef66d075208c7d49cb
 DIST darktable-2.6.2.tar.xz 3512572 BLAKE2B ee3070ac0f6b6b1c401865801631fb28397f484f30778065b7f899204813530a47ff6e752504b645f59bc29f868e1498e39f5f4e70f8259d8fecf5abc3f15cd6 SHA512 e7a90535747a8615fa2dbd1eb05f81314cc61c689a8a85fda0e2be40208ab0248e6f6ef296bb0894d3d527ed47c6cf6640538029c0c2d58a38d2d5ce10f6f5c0
@@ -11,7 +13,6 @@ DIST darktable-usermanual-3.0.0.pdf 16237603 BLAKE2B ff5c24bb038deb37269a8438993
 DIST darktable-usermanual-3.4.0.pdf 16241791 BLAKE2B d6fc232c3eddb5474e36ce1fbc02c3472291e5ebdf2eae09c419215263f615546a79f88ee9d252b387fc5e4f2c9714398deab8de176b3d928b6a17c2878cef56 SHA512 fd154c02d5e0c63d9698b2f80a7439a191f4582b717b2f163923eda40aae1ebe8aeaf1a70efdc423eb8c8269d74fc0e23df8c9c0269ee8f5a357611501c3547e
 EBUILD darktable-2.6.2.ebuild 3475 BLAKE2B 447c7330f1721443008a4794458d2365c5459a17e9257e4b2ae9a218824b78481ac66f37b230689035021d345908815135d71bfffad40e5c7d28bc7687cfcaa6 SHA512 23cf95b35f5445d7b21f13f11304e1eed211adb738d6d4389123b82596a77bcd8c8412b89c793d93fe1f6ab5dfde104618903ec35ab1e59a784eb7e43328362b
 EBUILD darktable-3.2.1-r1.ebuild 4250 BLAKE2B 6b29ac0b75ea866c64f8ee57ace0c85d315537f1df46b705b357b477528917f732e927cb14ce6465d5787b19e113030f62fac68cc1f0d42f626108cbb4ecf4ce SHA512 6f86a3688b660a76af91dd5124540af6333df5625b304f33b4fc3b0d668ea127592bdaf5b6b705420fef905b7e16dc09a9d130f3d96f4938f5a2ad9421147ce0
-EBUILD darktable-3.2.1-r2.ebuild 4128 BLAKE2B ce99fb9f3320b7f1dd9fe4b2fe9da5a8faf623bc8a77c10872ff54590a6da1c971a4c688ffb0c657f33e2bc11f47e55fec9269eaea99f3e6eb97d0ebe53d75fb SHA512 d55d5a17ff0e0122ac06eb970c238c824755b8e464b219b758203e2eeef849c185a6fd5535819d8f11514f16b4c8210491a5e86beac39232ad2e5536ddaaf23c
-EBUILD darktable-3.4.0.ebuild 4143 BLAKE2B 7f84937e11acb786d28aba040b5f53a321f8918a6c818f4e6c3403574c11caf310bc93045332e33fccb5b2d598579cd14013aaaf4565ad857716b65e56a2b053 SHA512 dede5f52a89a3e86a11caad7caf23dd80a14482f0a6bc2e3284634577f8693e07b5773b6bda890f8b9ca45264d22c3b114171da444752d36d17390ee9d78d84d
-EBUILD darktable-9999.ebuild 3314 BLAKE2B 6b768625082d82fe0cb4eb92b3a66cc6fc6d19d525bd25c9a00fc83e80336ea576e5dbd6b6133bffaf4f188d6ca5c6591793d12bec98af2a75e2c90217ad7485 SHA512 05b8dc06351cb42b9b10e906dfeaf595197c8bb398577384868550630e393d4bb8e3e6280b4249d4658f8ebefd0e7d8b013ca5a650251766e5efb12a460089e0
-MISC metadata.xml 1225 BLAKE2B 0ecba5279d318553ec1c4beb6b2dfc0c1386de48f92ed289051aac0938284d82b7be66985fb071d93808fc086260937ebdf440df83864d324d0d8aa1158db502 SHA512 73ebe5709000bfa8cfe3ec6992b021d85d80e0200bbf1ce8d19153632e835f2c8dbb3afc283eeecd4b95be087d17bf73f0de9c4b6ce89ce4b37c90413e4b970e
+EBUILD darktable-3.4.0-r1.ebuild 4585 BLAKE2B 219537b19aeb5096cee8d029aa4d50bc75a45b45c8cd3b22c624ec4c5affc0f4697a9c1a5b176f054742ffdc2de700bff8001258dff340c246e8e4d207d5aae2 SHA512 2978b96f9e4ea1eae466e5db8ccef786596e72b8018cf3e576076f1bba900b2996dc306cc34a1da1b1fa9b9cbfb9dda710222ca30a353a3f13b16806e0ecedb0
+EBUILD darktable-9999.ebuild 4475 BLAKE2B 3afed84176b49c7604c36fc5605a75f7db9bbe0fbde3a438dc964010a184b70031565b4f20914315c934c9d8d1f4e24d2f12e05d8e20a7498a972bb83a2d1ec9 SHA512 5294cb5cf18fe9be1d6b43553ab46759925dbb904c0b0a5fca9349a9b860d6756cb834eb4aa493f0b831a49554387898d5107191f92f05d9f03f35989cae0dd6
+MISC metadata.xml 1296 BLAKE2B 41415c7a013551a7e5cec72b8df9304b446d273f80b1975dd5f15672ec128f20e1b6d94be67d2e8e049674e1f12fae0d85840bd9aced2b62b213fe519b85f80d SHA512 110b05e5c449e0e1bb9fc0228a4b762e2f2fee74215ba0b084d9f719481af682d2a70c8df04313eb89916051f2c3ba1e057321b839144ad70298faf90605acd7
diff --git a/media-gfx/darktable/darktable-3.2.1-r2.ebuild b/media-gfx/darktable/darktable-3.4.0-r1.ebuild
index 03bc356adc65..cb8b5d62769c 100644
--- a/media-gfx/darktable/darktable-3.2.1-r2.ebuild
+++ b/media-gfx/darktable/darktable-3.4.0-r1.ebuild
@@ -7,29 +7,41 @@ LUA_COMPAT=( lua5-3 )
 
 inherit cmake flag-o-matic lua-single toolchain-funcs xdg
 
-DOC_PV="3.0.0"
-MY_PV="${PV/_/}"
-MY_P="${P/_/.}"
-
 DESCRIPTION="A virtual lighttable and darkroom for photographers"
 HOMEPAGE="https://www.darktable.org/"
-SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-	doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
-
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-LANGS=" de es fr he it pl pt-BR ru sl"
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-	lto lua nls opencl openmp openexr system-lua tools webp
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
+
+	LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW"
+else
+	DOC_PV="3.4.0"
+	MY_PV="${PV/_/}"
+	MY_P="${P/_/.}"
+
+	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+		doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
+
+	KEYWORDS="~amd64 ~arm64"
+	LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
+fi
+
+IUSE="avif colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
+	lto lua nls opencl openmp openexr test tools webp
 	${LANGS// / l10n_}"
 
-REQUIRED_USE="system-lua? ( lua ${LUA_REQUIRED_USE} )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	dev-util/intltool
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
+	test? ( >=dev-python/jsonschema-3.2.0 )
 "
 COMMON_DEPEND="
 	dev-db/sqlite:3
@@ -49,6 +61,7 @@ COMMON_DEPEND="
 	x11-libs/cairo
 	>=x11-libs/gtk+-3.22:3
 	x11-libs/pango
+	avif? ( >=media-libs/libavif-0.8.2 )
 	colord? ( x11-libs/colord-gtk:0= )
 	cups? ( net-print/cups )
 	flickr? ( media-libs/flickcurl )
@@ -58,9 +71,9 @@ COMMON_DEPEND="
 	gphoto2? ( media-libs/libgphoto2:= )
 	graphicsmagick? ( media-gfx/graphicsmagick )
 	jpeg2k? ( media-libs/openjpeg:2= )
+	lua? ( ${LUA_DEPS} )
 	opencl? ( virtual/opencl )
 	openexr? ( media-libs/openexr:0= )
-	system-lua? ( ${LUA_DEPS} )
 	webp? ( media-libs/libwebp:0= )
 "
 DEPEND="${COMMON_DEPEND}
@@ -73,10 +86,12 @@ RDEPEND="${COMMON_DEPEND}
 	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
 "
 
+# the xmmintrin patch will no longer be needed come 3.4.1
 PATCHES=(
 	"${FILESDIR}"/"${PN}"-find-opencl-header.patch
 	"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
-	"${FILESDIR}"/${PN}-3.0.2_jsonschema-automagic.patch
+	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
+	"${FILESDIR}"/${PN}-3.4.0-xmmintrin-sse-only.patch
 )
 
 S="${WORKDIR}/${P/_/~}"
@@ -95,6 +110,10 @@ pkg_pretend() {
 	fi
 }
 
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
 src_prepare() {
 	use cpu_flags_x86_sse3 && append-flags -msse3
 
@@ -104,15 +123,14 @@ src_prepare() {
 }
 
 src_configure() {
-	# As of darktable-3.2.1, AVIF support is not compatible with >=media-libs/libavif-0.8.0; see Bug #751352.
 	local mycmakeargs=(
 		-DBUILD_CURVE_TOOLS=$(usex tools)
 		-DBUILD_NOISE_TOOLS=$(usex tools)
 		-DBUILD_PRINT=$(usex cups)
 		-DCUSTOM_CFLAGS=ON
-		-DDONT_USE_INTERNAL_LUA=$(usex system-lua)
+		-DDONT_USE_INTERNAL_LUA=ON
 		-DRAWSPEED_ENABLE_LTO=$(usex lto)
-		-DUSE_AVIF=no
+		-DUSE_AVIF=$(usex avif)
 		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
 		-DUSE_COLORD=$(usex colord)
 		-DUSE_FLICKR=$(usex flickr)
@@ -128,6 +146,7 @@ src_configure() {
 		-DUSE_OPENJPEG=$(usex jpeg2k)
 		-DUSE_OPENMP=$(usex openmp)
 		-DUSE_WEBP=$(usex webp)
+		-DWANT_JSON_VALIDATION=$(usex test)
 	)
 	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
 	cmake_src_configure
@@ -135,9 +154,10 @@ src_configure() {
 
 src_install() {
 	cmake_src_install
+	# This USE flag is masked for -9999
 	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
 
-	if use nls ; then
+	if use nls; then
 		for lang in ${LANGS} ; do
 			if ! use l10n_${lang}; then
 				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
diff --git a/media-gfx/darktable/darktable-3.4.0.ebuild b/media-gfx/darktable/darktable-3.4.0.ebuild
deleted file mode 100644
index ffafc687cb4b..000000000000
--- a/media-gfx/darktable/darktable-3.4.0.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-3 )
-
-inherit cmake flag-o-matic lua-single toolchain-funcs xdg
-
-DOC_PV="3.4.0"
-MY_PV="${PV/_/}"
-MY_P="${P/_/.}"
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/"
-SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-	doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
-
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-	lto lua nls opencl openmp openexr system-lua tools webp
-	${LANGS// / l10n_}"
-
-REQUIRED_USE="system-lua? ( lua ${LUA_REQUIRED_USE} )"
-
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-COMMON_DEPEND="
-	dev-db/sqlite:3
-	dev-libs/json-glib
-	dev-libs/libxml2:2
-	>=dev-libs/pugixml-1.8:0=
-	gnome-base/librsvg:2
-	>=media-gfx/exiv2-0.25-r2:0=[xmp]
-	media-libs/lcms:2
-	>=media-libs/lensfun-0.2.3:0=
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	net-libs/libsoup:2.4
-	net-misc/curl
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/pango
-	colord? ( x11-libs/colord-gtk:0= )
-	cups? ( net-print/cups )
-	flickr? ( media-libs/flickcurl )
-	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	gmic? ( media-gfx/gmic )
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	system-lua? ( ${LUA_DEPS} )
-	webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	opencl? (
-		>=sys-devel/clang-4
-		>=sys-devel/llvm-4
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/"${PN}"-find-opencl-header.patch
-	"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
-	"${FILESDIR}"/${PN}-3.0.2_jsonschema-automagic.patch
-)
-
-S="${WORKDIR}/${P/_/~}"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# Bug #695658
-		if tc-is-gcc; then
-			test-flags-CC -floop-block &> /dev/null || \
-				die "Please switch to a gcc version built with USE=graphite"
-		fi
-
-		if use openmp ; then
-			tc-has-openmp || die "Please switch to an openmp compatible compiler"
-		fi
-	fi
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse3 && append-flags -msse3
-
-	sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# As of darktable-3.2.1, AVIF support is not compatible with >=media-libs/libavif-0.8.0; see Bug #751352.
-	local mycmakeargs=(
-		-DBUILD_CURVE_TOOLS=$(usex tools)
-		-DBUILD_NOISE_TOOLS=$(usex tools)
-		-DBUILD_PRINT=$(usex cups)
-		-DCUSTOM_CFLAGS=ON
-		-DDONT_USE_INTERNAL_LUA=$(usex system-lua)
-		-DRAWSPEED_ENABLE_LTO=$(usex lto)
-		-DUSE_AVIF=no
-		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-		-DUSE_COLORD=$(usex colord)
-		-DUSE_FLICKR=$(usex flickr)
-		-DUSE_GMIC=$(usex gmic)
-		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DUSE_KWALLET=$(usex kwallet)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_LUA=$(usex lua)
-		-DUSE_MAP=$(usex geolocation)
-		-DUSE_NLS=$(usex nls)
-		-DUSE_OPENCL=$(usex opencl)
-		-DUSE_OPENEXR=$(usex openexr)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENMP=$(usex openmp)
-		-DUSE_WEBP=$(usex webp)
-	)
-	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
-
-	if use nls ; then
-		for lang in ${LANGS} ; do
-			if ! use l10n_${lang}; then
-				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog
-	elog "When updating a major version,"
-	elog "please bear in mind that your edits will be preserved during this process,"
-	elog "but it will not be possible to downgrade any more."
-	elog
-	ewarn "It will not be possible to downgrade!"
-	ewarn
-}
diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
index 94d8c6574379..8405fd125512 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -3,25 +3,45 @@
 
 EAPI=7
 
-inherit cmake flag-o-matic git-r3 toolchain-funcs xdg
+LUA_COMPAT=( lua5-3 )
 
-EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
 
 DESCRIPTION="A virtual lighttable and darkroom for photographers"
 HOMEPAGE="https://www.darktable.org/"
-
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
-#KEYWORDS="~amd64 ~arm64"
-LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW"
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-	lto lua nls opencl openmp openexr tools webp
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
+
+	LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW"
+else
+	DOC_PV="3.4.0"
+	MY_PV="${PV/_/}"
+	MY_P="${P/_/.}"
+
+	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+		doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
+
+	KEYWORDS="~amd64 ~arm64"
+	LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
+fi
+
+IUSE="avif colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
+	lto lua nls opencl openmp openexr test tools webp
 	${LANGS// / l10n_}"
 
-BDEPEND=">=dev-python/jsonschema-3.2.0
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
 	dev-util/intltool
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
+	test? ( >=dev-python/jsonschema-3.2.0 )
 "
 COMMON_DEPEND="
 	dev-db/sqlite:3
@@ -41,14 +61,17 @@ COMMON_DEPEND="
 	x11-libs/cairo
 	>=x11-libs/gtk+-3.22:3
 	x11-libs/pango
+	avif? ( >=media-libs/libavif-0.8.2 )
 	colord? ( x11-libs/colord-gtk:0= )
 	cups? ( net-print/cups )
 	flickr? ( media-libs/flickcurl )
 	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	gmic? ( media-gfx/gmic )
 	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
 	gphoto2? ( media-libs/libgphoto2:= )
 	graphicsmagick? ( media-gfx/graphicsmagick )
 	jpeg2k? ( media-libs/openjpeg:2= )
+	lua? ( ${LUA_DEPS} )
 	opencl? ( virtual/opencl )
 	openexr? ( media-libs/openexr:0= )
 	webp? ( media-libs/libwebp:0= )
@@ -65,8 +88,12 @@ RDEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/"${PN}"-find-opencl-header.patch
+	"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
+	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
 )
 
+S="${WORKDIR}/${P/_/~}"
+
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		# Bug #695658
@@ -81,6 +108,10 @@ pkg_pretend() {
 	fi
 }
 
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
 src_prepare() {
 	use cpu_flags_x86_sse3 && append-flags -msse3
 
@@ -90,17 +121,18 @@ src_prepare() {
 }
 
 src_configure() {
-	# TODO: switch to system Lua once 5.3 has been unmasked
 	local mycmakeargs=(
-		-DDONT_USE_INTERNAL_LUA=OFF
 		-DBUILD_CURVE_TOOLS=$(usex tools)
 		-DBUILD_NOISE_TOOLS=$(usex tools)
 		-DBUILD_PRINT=$(usex cups)
 		-DCUSTOM_CFLAGS=ON
+		-DDONT_USE_INTERNAL_LUA=ON
 		-DRAWSPEED_ENABLE_LTO=$(usex lto)
+		-DUSE_AVIF=$(usex avif)
 		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
 		-DUSE_COLORD=$(usex colord)
 		-DUSE_FLICKR=$(usex flickr)
+		-DUSE_GMIC=$(usex gmic)
 		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
 		-DUSE_KWALLET=$(usex kwallet)
 		-DUSE_LIBSECRET=$(usex gnome-keyring)
@@ -112,6 +144,7 @@ src_configure() {
 		-DUSE_OPENJPEG=$(usex jpeg2k)
 		-DUSE_OPENMP=$(usex openmp)
 		-DUSE_WEBP=$(usex webp)
+		-DWANT_JSON_VALIDATION=$(usex test)
 	)
 	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
 	cmake_src_configure
@@ -119,9 +152,10 @@ src_configure() {
 
 src_install() {
 	cmake_src_install
+	# This USE flag is masked for -9999
 	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
 
-	if use nls ; then
+	if use nls; then
 		for lang in ${LANGS} ; do
 			if ! use l10n_${lang}; then
 				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
@@ -129,3 +163,15 @@ src_install() {
 		done
 	fi
 }
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog
+	elog "When updating a major version,"
+	elog "please bear in mind that your edits will be preserved during this process,"
+	elog "but it will not be possible to downgrade any more."
+	elog
+	ewarn "It will not be possible to downgrade!"
+	ewarn
+}
diff --git a/media-gfx/darktable/files/darktable-3.4.0-xmmintrin-sse-only.patch b/media-gfx/darktable/files/darktable-3.4.0-xmmintrin-sse-only.patch
new file mode 100644
index 000000000000..2e13ad859c82
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-3.4.0-xmmintrin-sse-only.patch
@@ -0,0 +1,30 @@
+From d10c290fb3b47bbc8fd90d6d1d7935b900c1caf6 Mon Sep 17 00:00:00 2001
+From: Pascal Obry <pascal@obry.net>
+Date: Thu, 24 Dec 2020 16:17:19 +0100
+Subject: [PATCH] guided_filter: include xmmintrin.h only if SSE defined.
+
+Fixes #7428.
+---
+ src/common/guided_filter.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/common/guided_filter.h b/src/common/guided_filter.h
+index 36be0de04b9..59c8b2af999 100644
+--- a/src/common/guided_filter.h
++++ b/src/common/guided_filter.h
+@@ -18,6 +18,7 @@
+ 
+ #pragma once
+ 
++#if defined(__SSE__)
+ #ifdef __PPC64__
+ #ifdef NO_WARN_X86_INTRINSICS
+ #include <xmmintrin.h>
+@@ -29,6 +30,7 @@
+ #else
+ #include <xmmintrin.h>
+ #endif // __PPC64__
++#endif
+ 
+ #include "common/darktable.h"
+ #include "common/opencl.h"
diff --git a/media-gfx/darktable/files/darktable-3.4.0_jsonschema-automagic.patch b/media-gfx/darktable/files/darktable-3.4.0_jsonschema-automagic.patch
new file mode 100644
index 000000000000..45d61e6af6c2
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-3.4.0_jsonschema-automagic.patch
@@ -0,0 +1,25 @@
+jsonschema is only used at install time to validate a file that release
+tarballs already include, treat running it as a late part of tests.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -350,6 +350,9 @@
+ endif()
+ 
+ # we need jsonschema to check noiseprofiles.json
++# In case of Git clones this file is generated at build time, for releases
++# it is included in the tarball.
++if (WANT_JSON_VALIDATION)
+ find_program(jsonschema_BIN jsonschema)
+ if(${jsonschema_BIN} STREQUAL "jsonschema_BIN-NOTFOUND")
+   message(STATUS "Missing jsonschema, problems in noiseprofiles.json might go unnoticed")
+@@ -358,6 +361,9 @@
+   message(STATUS "Found jsonschema")
+   set(VALIDATE_JSON 1)
+ endif(${jsonschema_BIN} STREQUAL "jsonschema_BIN-NOTFOUND")
++else()
++  set(VALIDATE_JSON 0)
++endif()
+ 
+ # we need an XSLT interpreter to generate preferences_gen.h and darktablerc
+ find_program(Xsltproc_BIN xsltproc)
diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index 5661ac61bfdc..a46ea727d4c8 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Markus Meier</name>
 	</maintainer>
 	<use>
+		<flag name="avif">Support importing and exporting AVIF images</flag>
 		<flag name="flickr">Add support for uploading photos to flickr</flag>
 		<flag name="geolocation">Enable geotagging support</flag>
 		<flag name="gmic">Use the G'MIC image-processing framework (<pkg>media-gfx/gmic</pkg>), e.g. to support Colour LUTs compressed using their compression scheme</flag>
diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest
index 58c6002c10a2..529ec02fabc6 100644
--- a/media-gfx/dcraw/Manifest
+++ b/media-gfx/dcraw/Manifest
@@ -4,5 +4,5 @@ AUX dcwrap 437 BLAKE2B ec88784e059ab07990acf3a47517f243502a140b451040c77f9320bd7
 DIST dcraw-9.28.0.tar.gz 194193 BLAKE2B d39a2d76dbbe74a2aed21c6b132ac25c9dd17312813e7f640a4a6d4abd4e8f1868ad596296ca9bfe61427b8b4764821e32679128747ff5a9452988814b77c638 SHA512 04609c4ddd5d1c9fa0ee1617d2ef25efdc22451e1fa6cf669d93abb1fa630a18198b30a289400f1814c8dca285547da8b081a1b00b085c00bb9318ad25c48a30
 DIST parse-1.73.tar.bz2 8186 BLAKE2B 4d7d69bbaad3fd69caeae24e4dfc77fa580d969f903c925f76cf0a7bdb13ff34c96ab6dc9917609ce886365f6971290b3af63aec9fed43b1876aa44dd951521d SHA512 06ffaf72695dc86bfc2bdd10d4f732bc428b72d427f4c10e93fc58536513477cf297adb56fb9cfc5ba5fd5b6b4cd197c33d8dac957a0a1bbe65b23393b64278c
 DIST rawphoto-1.32.tar.bz2 3841 BLAKE2B db7a80af4b06fc3709a9ae69d9f166c3323097821bb561af4e0ac9a1ef677cab6cfd5cd7896d1e1fce85e6fab545ced7d00ce809f97332bec594b94a27f77e23 SHA512 6ee5b6c4e4266c8e04221c894c4e737f8a6d2c6f0cc9c82db73064afd68488bd60de19b86b2d7b82780283bbb9f8156ef3149c1c730f09a00dce632744b44d56
-EBUILD dcraw-9.28.0-r2.ebuild 2934 BLAKE2B 383b2322514a66cc883781cd9bef376609afc5d2e235fa06c53ac498acd511e6bdc5aa6a3a9365092257d0e021dd9578b71648d882751566e560e558c91088b2 SHA512 d7348bc90a14338bb39bc3ba9b48eed982e1e027a1c76ce97b0856a6306b269c1bd4480d9d9a58e3fe4b56c4e67560385af3cde99252022fa564220e1e9160b4
+EBUILD dcraw-9.28.0-r2.ebuild 2935 BLAKE2B 7791bcdf07ec06cb8af067f6b1816b7a9c846ea8e3eba0b657045711157556cdddc0befa17122e8319ade92b36a63addfe9f3be10b28ec1c6a34917682ab9ddc SHA512 ee72b2bf1bb645b5cb226f13ebc7027d793b6f8bd1ef79457189f60e15227db1a9eda240ad4bf8c487051afcd0934a714d2f691f3cbc79f4670b633f6676626b
 MISC metadata.xml 609 BLAKE2B a48ebce771f67412c53ed8d2ef83b44c1276600c5634c6f2ce51d677675d6c3f134d0ec7578fd777cd12dd7edd267a70529aa3ffc6875ffccc1ef97d93b72e52 SHA512 16d0cb26ad197852a44c84dbc87964ef441d850ea9fab643395edb027a2abf1a18aaa087890552f0be624678db239a9efbe384d4e3e9605a6fa2dfbf2543bf8d
diff --git a/media-gfx/dcraw/dcraw-9.28.0-r2.ebuild b/media-gfx/dcraw/dcraw-9.28.0-r2.ebuild
index 7163adea330f..49a9c411cf33 100644
--- a/media-gfx/dcraw/dcraw-9.28.0-r2.ebuild
+++ b/media-gfx/dcraw/dcraw-9.28.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW"
 IUSE="nls gimp jpeg lcms"
 
diff --git a/media-gfx/ebdftopcf/Manifest b/media-gfx/ebdftopcf/Manifest
index 7616c900d996..f3409dcdbc30 100644
--- a/media-gfx/ebdftopcf/Manifest
+++ b/media-gfx/ebdftopcf/Manifest
@@ -1,3 +1,3 @@
 DIST ebdftopcf-2.tar.bz2 7774 BLAKE2B 4dc1bde62b796f441332511e1b9206f9eadd216ab66dc1a6858dc467f9dfbbaaeb4a7de494eaae4584d8a57d59a0eb96f69047d1a57bd007cbb8e2f7aaccd1c6 SHA512 4631f1591290e0ddc778d5c557aff1e698d8dd7e5ac7e659fda7752642034fbabb091c840dcfad5695e9fc19909203a7fdc0b7a69d57a162ce6bb8fe710ef0f4
-EBUILD ebdftopcf-2.ebuild 632 BLAKE2B df4926970eea1c2007b86a0e2413b46f72095c2d08031c28f99b9269241f94642183ff1dafcb50859faddb87bd50aad14e6012a2da05050c7b34b1121ac5f92a SHA512 d4531f9fe0fb31c38ddf493877322ffc67ea462706a7a04c07741e7b5d51bd16eeb135fa8bc1945a4ab2d44c1e7626d04cb763dda0d7bf8d132aa6b7d02d711b
+EBUILD ebdftopcf-2.ebuild 633 BLAKE2B e995cfa268272c09afb2b1c46b5602190311840cb7fcb9efa1d6dc24491a7ee526cabaef3cf58925fa9e4683f2c68cf0b09c9b5f235c0b37d7e25fc7e415796b SHA512 2a7fd2486243bd02eaa850af85820c9b2f8b15aa8eb25b4e5bf7d41ac9a8ee1fee162de5beb055193c0512f67ddb1fb9c15202ce1bdd3fb162499215ec944d03
 MISC metadata.xml 310 BLAKE2B d6b0416573d232c5715df5dcb05139b22609ce8ffb46530c2fd7a0cecc87b37ce2ce286310a80244b1911d5750eb29b55eef6b8c01f6d62c8d007ad2a9b5aae2 SHA512 1923349dde66e8078b37566097a21ead2555a73fdfd97b89beb44a714958dc80f4387ceb642d238419ce0ec388c335ba5db1db5f23b380131f0fbbd51ecd8f22
diff --git a/media-gfx/ebdftopcf/ebdftopcf-2.ebuild b/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
index c906736906c8..1be22a2208cf 100644
--- a/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
+++ b/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 # these apps are used at runtime by ebdftopcf
diff --git a/media-gfx/exif/Manifest b/media-gfx/exif/Manifest
index e931ffdba10b..9069e31f6f2a 100644
--- a/media-gfx/exif/Manifest
+++ b/media-gfx/exif/Manifest
@@ -1,5 +1,5 @@
 DIST exif-0.6.21.tar.bz2 387531 BLAKE2B 494d4910af2e8f740aeebdeeaf8dec5ae638d3e78339c55d5acc38879ab4837164d2ef407bd07a2e36a00df15d53b132bb027e2e97e79c229c589819af3b7f7b SHA512 73b5b7df08462a6a084a8fb973c39197f5d64ed753a97cb2f94a4acf815fdf0313214c2c8e44a46a24a1f6304fdaa68a579b4a2e246cc095f6e9588e93368cdc
 DIST exif-0.6.22.tar.gz 569665 BLAKE2B 556927fca99416ff174c0c4403337f2f8b85cb14472d920a48a9598d8b7e3be6b800b0b37a764cd89fb45b62376a05ef1f0ae6b260a076f0949aadf8a441a2eb SHA512 b194bacb28ff2b910014edce732f97a875852abd486ce62bcf9274eb0ed668a0ee9c954cf60455191969aacb48d3d4d3172958a183b29f050c0bf8d55de14e7d
-EBUILD exif-0.6.21.ebuild 579 BLAKE2B 101f7246e7433ce0bd236426fe87ce1487c869163fc8371292360bf2dd04dd828ee1f84a95bfa29bc0ba8a66cddd44a3c24a4ed6961f8ece531a424fb744605d SHA512 3f1d1ac107570a81238d834852cc9b15fa98aa8a0e274aeb74ae6fb9a2f5b535e4d44ac382f0c4d9a464e99bb934faa9864e444edfea845b3301ac1677ca7520
+EBUILD exif-0.6.21.ebuild 580 BLAKE2B a08bd474a0ddba7e01b4ae9f6197c2690bf9a0a8cc9c2d64e84f083639d0b5d7826a00c891ea35dcc4afac01a60eedbd3d3371ee9ef15e320dc6967439d106da SHA512 aa147df8a0baeca94b88497e9fe801e56b5e4a42c2e8940a7ae8a8d03af90af760b7bfc19726f771d6bed3a3875cec226ead12876098b6e8556c3f3770eb4a33
 EBUILD exif-0.6.22.ebuild 666 BLAKE2B c11d6e590dda2e7c0f98c5f3c158d4dcf5a1548b7178992690758950a59cbb63f4501db1bb1c1e629181f979bfcdfc10f36d7a0e648c7abf6cced91759466d14 SHA512 0d9aafcbea0c99a8e6c1a02052edc6499fd6c935acb35263a85e7d015ba6549b42567a97a10360915f82efbcec3e419a834e8496cb174887c0e177722d10643d
 MISC metadata.xml 249 BLAKE2B d224cb8e5d2c5fce97a3b2e5ddd58eaf63652fbd198148263043184bb34e3ecfa58af4a54fcb3e8c388ba4a8c71f6882b9ff214f3f366d5333093e1e6b0d8394 SHA512 7721d48e6ecfe8212f06808ec8cb7cc6f9d3db63c71a3c348f9f1d7db9cc18d74ad70c474861631c08df354c7a57d37bd0cee1e4a0ee62e83296a35c90af0b7f
diff --git a/media-gfx/exif/exif-0.6.21.ebuild b/media-gfx/exif/exif-0.6.21.ebuild
index fe46fdf14145..379dfe2fbe3d 100644
--- a/media-gfx/exif/exif-0.6.21.ebuild
+++ b/media-gfx/exif/exif-0.6.21.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libexif/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="nls"
 
 BDEPEND="
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index 00e7a53fc240..e12dfb288568 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -3,10 +3,12 @@ DIST feh-3.3.tar.bz2 2112880 BLAKE2B 56042367c0acce966e115e77f3afa1acd3f942a956b
 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
+DIST feh-3.6.1.tar.bz2 2116064 BLAKE2B cae12f9475a2678c2f521baac9deb6668eae07811ae0904bbefef873fd54182b94532bf811394964e725f0e45890f65fcfc3dc988135d388ddcf625adbeca4e0 SHA512 b4350f1c5f66a450b2f088affea973abab9e184df110b693e46e1fc532d213d62a52bf08029f345daf92d45c828ff3bd380dcd7b167f319f1ff3b1d04150cd75
 DIST feh-3.6.tar.bz2 2116101 BLAKE2B 8ad47c6b456746d951728fd8a0ba1a2fed4ceb4a7e15554f68b4de071da7b3f4e9e16a10b1a05e51291b8b4127bab98f2b96231298fd181d8dc544bc089a772f SHA512 1df017adcf0650ff2cdc26556cbea5a6b8c9dad1dd44128cccc79312334d0140ab9e5c9c8bac7249dcfbdd7985ae75d847752eadad14216102d8ab7bcb2c42c7
 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
-EBUILD feh-3.6.ebuild 1473 BLAKE2B eb858644d7a10d27e7bc9258534312c8223431bc364a1714bf6189b8d910ba39fe89c3c78bc0163aeda4576afb8268931917b0137dd4f9fcf066836a9768dcf5 SHA512 acedb3528aeda464305fd704223bb42a6c6f45c10ac93a28b8a09a8097e08924b6a2beda5b7c1bbe71a2c4d08940d9e2c1d916f02a7ee65d477d18f9d0d07d4a
+EBUILD feh-3.6.1.ebuild 1473 BLAKE2B eb858644d7a10d27e7bc9258534312c8223431bc364a1714bf6189b8d910ba39fe89c3c78bc0163aeda4576afb8268931917b0137dd4f9fcf066836a9768dcf5 SHA512 acedb3528aeda464305fd704223bb42a6c6f45c10ac93a28b8a09a8097e08924b6a2beda5b7c1bbe71a2c4d08940d9e2c1d916f02a7ee65d477d18f9d0d07d4a
+EBUILD feh-3.6.ebuild 1472 BLAKE2B 9f5c818e6bf44e8699672ba6d373abd304ea9223cd69bedce1c87c1394e77e88352f0836ba2ffde521d85076abef1181a3755afb4ee3658547d36ace6fa7ad17 SHA512 3831009c62b2bea3b783923557457dfe6c7be1d3f565f3547db2399be6ab32bba7c8d15f76ffb15f12fab5f7fd21e21098441b34d48399d2a1f1de008f16c201
 MISC metadata.xml 252 BLAKE2B c64921f238c2751f1f0746df3d109951ebf79c5e1ed5a2fa6d9c33f5420a6ff87c52a5387048a35c148e8cdd29beb406001a9aca3f6cc0f396a78ccb37ae2e3e SHA512 39fbe572d744f1a6f2a23b85a7d62706c478d05f2c74c30e48ccfca5ffd8f26d968fe0869fb9eed4b6494c655f950ab6445346da6eacf85d10da0c1a627cf59b
diff --git a/media-gfx/feh/feh-3.6.1.ebuild b/media-gfx/feh/feh-3.6.1.ebuild
new file mode 100644
index 000000000000..7d87a35ace60
--- /dev/null
+++ b/media-gfx/feh/feh-3.6.1.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/feh/feh-3.6.ebuild b/media-gfx/feh/feh-3.6.ebuild
index 7d87a35ace60..77ced64eb4bc 100644
--- a/media-gfx/feh/feh-3.6.ebuild
+++ b/media-gfx/feh/feh-3.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
 
 LICENSE="feh"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
 IUSE="debug curl exif test xinerama"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest
index bcc8e47ad764..225b71af9f2c 100644
--- a/media-gfx/freewrl/Manifest
+++ b/media-gfx/freewrl/Manifest
@@ -1,4 +1,5 @@
+AUX freewrl-3.0.0-fno-common.patch 223 BLAKE2B 007d3fcb08acc5da859d28564e54558394a3f5fd23c1662e9d39e3c6d50c03cc5b024f7e4b72cdd6000249a67250a5c70e070c85d7e4f26e312e97a0895df54b SHA512 538bb6a1afdf7103e6ecc01dbd7005e33c14c01437f9c3666e1749bba8612c7cdb998bb4fb4e8d9e22663be97dfa991ac68a3e269c0817d71df8da54a5e417af
 DIST freewrl-3.0.0.tar.bz2 1567282 BLAKE2B 84bf924ce51d70aca0baa504dba0726af82b3d2ff93de87bd18ab772f6bdbcc50807a496c14264006894b6c52bfe9844e672412162f3df1107453fa1f8b066a3 SHA512 12e75c6891238fbc9c750a9449c8a6a9f4b86124ac12871adbfb3c68b7ef09f35d3709dcb63693e50f8ac824170aef3b97854a72de0b324e67fbbb7c081675a0
-EBUILD freewrl-3.0.0-r1.ebuild 4430 BLAKE2B 7145155adf968a057b3ab817fe496fd8fa7e618e53996a27967d7937ecaa1c0f45e318e83d470d9bfc225aca797675a95f78160e07aa46afbb81e98750fd389b SHA512 0a02299bc0698e022b8eaca0aa6e9151cdb08b16155137d05a4404a467ef66ff04e0d1e0a22b86ad9d557a61210966b7a960f63c6cc478cc889b93e39f775c3a
+EBUILD freewrl-3.0.0-r1.ebuild 4471 BLAKE2B a2b86cea4dab40bb502199808dda9cfba9d785acd89ba6f6c291fac5e914069156592391907af1022b8a0d8a21f8eeeb2acca0cd9601281d594adfa2f8953fe5 SHA512 0ce97c37fb2eda244645bf9b6e7c9e4fd83a6f3a0e203332062b634a37a012fc7aa0354862f9d9fe03254cc76bb6fb5448d13df1a6992893c0d42c71976d4ba5
 EBUILD freewrl-9999.ebuild 4489 BLAKE2B 8d5f07f5fbb46894e75b62994794738dcf50fa2025eeddc5a0c5c4aada55169e15c2ae5ec90434ed8f96a4a12f1f0b20b1195eee7ffc4a391280f1b9842d56c6 SHA512 9d9dd93cdc9e6dae64d0bdb068b56fa2c6a0f478708be6e48aa771e10526b30c73ae039cc83fe3f62d00bab2571e60bb013ee796c7cd613c8b3c7fa8a7cc60dc
 MISC metadata.xml 1302 BLAKE2B eb8522dbaadd9c9ebc8d3b5e03072fc7b57f6d87046f52104985a5e0e8f40669b53906921286d1d2c79e393853cac4c88f5a351c7bd0c38e3b9905308c0a890e SHA512 f7581007975722b3d16cf349c55ab67b5cf92a47316399adefb38a9413669f544c9fa5cc922f02f5a7473d4570d884d561dc8ef397347eca80494964f2f4faf0
diff --git a/media-gfx/freewrl/files/freewrl-3.0.0-fno-common.patch b/media-gfx/freewrl/files/freewrl-3.0.0-fno-common.patch
new file mode 100644
index 000000000000..e3fbc2d736e5
--- /dev/null
+++ b/media-gfx/freewrl/files/freewrl-3.0.0-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/lib/desktop.c
++++ b/src/lib/desktop.c
+@@ -233,7 +233,7 @@ enum {
+ 	url2file_task_spawn,
+ } url2file_task_tactic;
+ 
+-enum {
++typedef enum {
+ 	file2blob_task_chain,
+ 	file2blob_task_spawn,
+ 	file2blob_task_enqueue,
diff --git a/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild b/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild
index 5ff59f6d8e1d..7f33a3b42a41 100644
--- a/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild
+++ b/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -57,6 +57,7 @@ RDEPEND="${COMMONDEPEND}
 
 src_prepare() {
 	epatch_user
+	epatch "${FILESDIR}"/${P}-fno-common.patch
 	eautoreconf
 }
 
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index ea50841bdde1..e18165260bc8 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -3,8 +3,11 @@ AUX gimp-2.99.2_fix_autoconf-2.70.patch 1913 BLAKE2B 779ce5a54150ee2a89507420931
 DIST gimp-2.10.20.tar.bz2 33108938 BLAKE2B 060c0e46e6f4ac861de265842d545285c2fa4590908172971ef240ae87f8caa2c015447deee810fef59c4869810676daae2e40aa611062168feffe38c7cd9b22 SHA512 7cd0b1833af87a167fdfee59fb491a72727fe3071c21c0de1813adb0f8272a92473e1e300517395b1b4593c8cb6781ee30f7a63966756e5a7f523a164308aba6
 DIST gimp-2.10.22.tar.bz2 33152226 BLAKE2B d11b0ee8f0f24934383028a0b21820af30da6133814d64b67981888086f3eaa4378e474ff801db046f2fe5d380325ac7279df6e749d100219e2f6558c9bdf10d SHA512 13841ac4a186df47e4155095ca888a903b2db9e25a73fbb834fe981ccf915cb67a3e08506e5c13b6c5f35e27b1de24befbccf871e438b1a35f67f069bebd8fd0
 DIST gimp-2.99.2.tar.bz2 32375596 BLAKE2B 3dc5af7935e3503106cf2020798974d68fe86e5034792b09683519502474022e3a7832f418dfcdb4a022e6ebe878bb567bfbbbe51a96f0ae76375adc0dfdd6e5 SHA512 0a773ab01427abfb1b7690e855a041dc4883630fc827ce9d83169ccc5b4f925ecb9a0a16928a9c0ed0592c2c351ced5832e212d3115475c0f7a6092822adc194
-EBUILD gimp-2.10.20-r3.ebuild 5652 BLAKE2B bc21e87460de992194034412240af90c0e35c15f311ddb55c191852512c8ca7472df32e7b3bea6717171a73f8faa8a486f311cad16da92b43bf8becbd9eb6b09 SHA512 2b03724793af7df9456bc7f491e075875fc5e49fc09c57d27513cf1efed44055986961b17164959cc6e3086e6593fa7c5ae20f02fd65a88d633880e4f3e172b5
-EBUILD gimp-2.10.22-r1.ebuild 5587 BLAKE2B 418e5b5cd0a3352fa8eb9362ffbdf4a6f6ffd658ad8337c5d7fdb2e19366d5be3e42d0da469ac6f0caf002b0fc385ad2bc627811785fe16fde384d4d02dd42de SHA512 2d027b4a6a7e3437feae6d4678fcc3aa9bae42fa9db413dbae5e05961860d717186aeebfecd396492903e69d78c81fe9e747e23cfae7093223eb2575aa935be6
-EBUILD gimp-2.99.2.ebuild 6485 BLAKE2B 95fba925bca3edd2582f9a478225a36acac50dd8d7911458499b9678469e1b9c466b1ced1b46c34aa0e5eb19f5eb9c19ff21d230c033634be66c4a3769caeaf7 SHA512 20bf106a3cad5d98afe3f0e5ee4e23d75bd9663e0f4fccb370d3bc9f97343f81a2680940f5fd78d1621feed62b98687ee5faf71bcc35c269404f03fafe1895f9
-EBUILD gimp-9999.ebuild 6772 BLAKE2B fb77a595d6a04d99dba7a511786dbf38414c2830e97643ee60329717b96da082077f51494e30dff0faba089057e7676358c5b11f97ae638cd400f492f6b93e02 SHA512 e8e22ad2ad22f94d988000d43c375d88a999ed8771d6c0ba1cc4a19e89c0cb5ad75a5026eac662d0548bbda11493ba4fe419d06d338283f78707c3987bddbfef
+DIST gimp-2.99.4.tar.bz2 30355676 BLAKE2B b982139e36809b7e149c1c055d7cf0506c0c00beda2745904c62f4b56f1f1605378358f29ab427f7df6c68251ce367e00d79a1b9b7b3d0fde22526895eb5ce27 SHA512 1abb6851f4c6af440d75d09c55dcb6bf6485739de1960fb536035935729331221265beef589386da685ad8ffbe83e0f0699cf2db55589953deae4d82aa99154b
+EBUILD gimp-2.10.20-r3.ebuild 5681 BLAKE2B b23d61ef44ec157981c4656bc9a8ee3fc0cbe34e208f27793f9295c952d1df329da2544718c8a1440e7e685339697c7e4110e292a3b2f1222b6ede6c0400c593 SHA512 7469fabcfa82c7fc513fe361ea03514ce142c3252123d5c9905c9d9aeb61099d47dc7dbb833d3fe7b3a2479261d6026121d43e100fdec21ffda8266c6e9153ef
+EBUILD gimp-2.10.22-r1.ebuild 5616 BLAKE2B d470f34e37338e55343ce471e51603c4ef779b04c47bc10fd364c4ff8a8f91d57421707ac87f22f8ac486b595b7a76fd5d7acb760d05542b8f3c3b3668cccc4e SHA512 9ba67887ea7b9fb6af3a382015c3c8cce5ea2cf84f04e52e8e39e3b840792a229cfd4679ab22cb70d12e7e8d4a825c0a2f532d3ae52812554c542325acfd7a8a
+EBUILD gimp-2.99.2-r100.ebuild 6734 BLAKE2B ec479165a988f22cdcaff9073627c84f9410a3adc557f17c35d9949fc4b15ce4cb862b048118dfdec203e791ecdcd51f2f762c3440d58a9c5dc3fe281c209593 SHA512 ac12d541eb64f5fa31fe8b11f1016fda791842575216073c12cec85e822238dd82712eda2d0a3b36657defab460010b34651d13ca2c3ade565a8ce18e3400d9c
+EBUILD gimp-2.99.2.ebuild 6514 BLAKE2B 413ca26220cf55f1e7c87a4b79a87ed3cbde37a5978683f2d7cbad6e3af0399491dd648b7fe4b9c5f33d45dbf266491e46134d5b7830f75b3ecf224a1c1fb9d1 SHA512 6c1d356d751d641c0dedb7373d62ddfa90679c4b3f90077e4ecfb8a92408e13cab1e58ac03e3deee5918777d71fe38d57d9bc48f708412d97eb114b82711cf54
+EBUILD gimp-2.99.4.ebuild 6555 BLAKE2B d0457e2f35b7d38d273650fbf1cddd7903a3aaf96330cc117ad800c46d85818c2e69b17cb1eaef2e6d7b866e8abe22e735720f08c1e47769ee313ab77108c71b SHA512 fd01d40c7283f154874bf93dde1c303bcf42918c96249786618468c62d214add14db645803c6bbe4e1b9e020903cbd5c09872d858529222e229f351baada6608
+EBUILD gimp-9999.ebuild 6992 BLAKE2B 0f63b8e2c4d34ac26a03ef339b1ff545b3b5a0bcb067b60f905403b7c875bcc8c4632a4d2a701c282991113958dd15c02ee272ef383df981b426f2e176da2c54 SHA512 578dd806786213d9b5a4bc18c28a72c8452972e8f7642f66b0fc48ae9b99a7719d1a23785072ef32e874d4195a15434af8afe3b3f1e2e4b23f48cd903d9e020d
 MISC metadata.xml 546 BLAKE2B 2d5b9a68c47a72325199586a142f1d8344bef770d24738169c80958f3def3a0f1ad0b4d23774d3c458d80f17a394033813e01fc5e24b8b62146d2c55b5f8c9b0 SHA512 f654d93c738c942605ae61fe0d76972a1b81bffaf4edc23a1f55bb65e71022df7f14e769a71c41e5c5c7307eef9618a667ae418dc9bc77d5ac1299bbe0c58834
diff --git a/media-gfx/gimp/gimp-2.10.20-r3.ebuild b/media-gfx/gimp/gimp-2.10.20-r3.ebuild
index b108c5a443af..c97aa67e769a 100644
--- a/media-gfx/gimp/gimp-2.10.20-r3.ebuild
+++ b/media-gfx/gimp/gimp-2.10.20-r3.ebuild
@@ -32,6 +32,7 @@ COMMON_DEPEND="
 	>=media-libs/fontconfig-2.12.4
 	>=media-libs/freetype-2.1.7
 	>=media-libs/gegl-0.4.24:0.4[cairo]
+	<media-libs/gegl-0.4.28:0.4
 	>=media-libs/gexiv2-0.10.6
 	>=media-libs/harfbuzz-0.9.19
 	>=media-libs/lcms-2.8:2
diff --git a/media-gfx/gimp/gimp-2.10.22-r1.ebuild b/media-gfx/gimp/gimp-2.10.22-r1.ebuild
index 97824d5c1abc..d0bc4bc4388f 100644
--- a/media-gfx/gimp/gimp-2.10.22-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.22-r1.ebuild
@@ -32,6 +32,7 @@ COMMON_DEPEND="
 	>=media-libs/fontconfig-2.12.4
 	>=media-libs/freetype-2.1.7
 	>=media-libs/gegl-0.4.26:0.4[cairo]
+	<media-libs/gegl-0.4.28:0.4
 	>=media-libs/gexiv2-0.10.6
 	>=media-libs/harfbuzz-0.9.19
 	>=media-libs/lcms-2.8:2
diff --git a/media-gfx/gimp/gimp-2.99.2-r100.ebuild b/media-gfx/gimp/gimp-2.99.2-r100.ebuild
new file mode 100644
index 000000000000..7dfb92eedca1
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.99.2-r100.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+GNOME2_EAUTORECONF=yes
+VALA_MIN_API_VERSION="0.40"
+VALA_USE_DEPEND=vapigen
+
+inherit autotools gnome2 lua-single python-single-r1 toolchain-funcs vala virtualx
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v2.99/${P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="0/3"
+#KEYWORDS="~amd64"
+
+IUSE="aalib alsa aqua debug doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+# media-libs/{babl,gegl} are required to be built with USE="introspection"
+# to fix the compilation checking of /usr/share/gir-1.0/{Babl-0.1gir,Gegl-0.4.gir}
+COMMON_DEPEND="
+	>=app-text/poppler-0.90.1[cairo]
+	>=app-text/poppler-data-0.4.9
+	>=dev-libs/atk-2.34.1
+	>=dev-libs/glib-2.62.6:2
+	>=dev-libs/json-glib-1.4.4
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.40.21:2
+	>=media-gfx/mypaint-brushes-2.0.2:=
+	>=media-libs/babl-0.1.78[introspection,lcms,vala?]
+	>=media-libs/fontconfig-2.12.6
+	>=media-libs/freetype-2.10.2
+	>=media-libs/gegl-0.4.26:0.4[cairo,introspection,lcms,vala?]
+	<media-libs/gegl-0.4.28:0.4
+	>=media-libs/gexiv2-0.10.10
+	>=media-libs/harfbuzz-2.6.5
+	>=media-libs/lcms-2.9:2
+	>=media-libs/libmypaint-1.6.1:=
+	>=media-libs/libpng-1.6.37:0=
+	>=media-libs/tiff-4.1.0:0
+	net-libs/glib-networking[ssl]
+	sys-libs/zlib
+	virtual/jpeg
+	>=x11-libs/cairo-1.16.0
+	>=x11-libs/gdk-pixbuf-2.40.0:2
+	>=x11-libs/gtk+-3.24.16:3
+	x11-libs/libXcursor
+	>=x11-libs/pango-1.42.4
+	aalib? ( media-libs/aalib )
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
+	heif? ( >=media-libs/libheif-1.7.0:= )
+	javascript? ( dev-libs/gjs )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )
+	lua? (
+		${LUA_DEPS}
+		$(lua_gen_cond_dep '
+			dev-lua/lgi[${LUA_USEDEP}]
+		')
+	)
+	mng? ( media-libs/libmng:= )
+	openexr? ( >=media-libs/openexr-2.3.0:= )
+	postscript? ( app-text/ghostscript-gpl )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/pygobject-3.0:3[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	udev? ( >=dev-libs/libgudev-167:= )
+	unwind? ( >=sys-libs/libunwind-1.1.0:= )
+	webp? ( >=media-libs/libwebp-0.6.0:= )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/hicolor-icon-theme
+	gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-lang/perl-5.30.3
+	>=dev-libs/appstream-glib-0.7.16
+	dev-util/gdbus-codegen
+	dev-util/gtk-update-icon-cache
+	>=dev-util/intltool-0.51.0
+	sys-apps/findutils
+	>=sys-devel/autoconf-2.54
+	>=sys-devel/automake-1.11
+	>=sys-devel/gettext-0.21
+	>=sys-devel/libtool-2.4.6
+	doc? (
+		>=dev-util/gtk-doc-1.32
+		dev-util/gtk-doc-am
+	)
+	vala? ( $(vala_depend) )
+"
+
+# TODO: there are probably more atoms in DEPEND which should be in BDEPEND now
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "AUTHORS" "HACKING" "NEWS" "README" "README.i18n" )
+
+# Bugs 685210 (and duplicate 691070)
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
+	"${FILESDIR}/${P}_fix_autoconf-2.70.patch"
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -i -e 's/\[gegl_micro_version\], \[27\]/\[gegl_micro_version\], \[26\]/' configure.ac || die
+
+	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
+
+	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
+
+	gnome2_src_prepare  # calls eautoreconf
+
+	use vala && vala_src_prepare
+
+	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
+	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+_adjust_sandbox() {
+	# Bugs #569738 and #591214
+	local nv
+	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+		# We do not check for existence as they may show up later
+		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+		addwrite "${nv}"
+	done
+
+	addwrite /dev/dri/  # bugs #574038 and #684886
+	addwrite /dev/ati/  # bug #589198
+	addwrite /proc/mtrr  # bug #589198
+}
+
+src_configure() {
+	_adjust_sandbox
+
+	local myconf=(
+		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+		GDBUS_CODEGEN="${EPREFIX}"/usr/bin/gdbus-codegen
+
+		--enable-default-binary
+
+		--disable-check-update
+		--enable-mp
+		--with-appdata-test
+		--with-bug-report-url=https://bugs.gentoo.org/
+		--with-xmc
+		--without-libbacktrace
+		--without-webkit
+		--without-xvfb-run
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable doc gtk_doc)
+		$(use_enable vector-icons)
+		$(use_with aalib aa)
+		$(use_with alsa)
+		$(use_with !aqua x)
+		$(use_with heif libheif)
+		$(use_with javascript)
+		$(use_with jpeg2k jpeg2000)
+		$(use_with lua)
+		$(use_with mng libmng)
+		$(use_with openexr)
+		$(use_with postscript gs)
+		$(use_with python)
+		$(use_with udev gudev)
+		$(use_with unwind libunwind)
+		$(use_with vala)
+		$(use_with webp)
+		$(use_with wmf)
+		$(use_with xpm libxpm)
+	)
+
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
+	gnome2_src_compile
+}
+
+# for https://bugs.gentoo.org/664938
+_rename_plugins() {
+	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
+	local prepend=gimp-org-
+	(
+		cd "${ED}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1
+		for plugin_slash in $(ls -d1 */); do
+		    plugin=${plugin_slash%/}
+		    if [[ -f ${plugin}/${plugin} ]]; then
+			# NOTE: Folder and file name need to match for Gimp to load that plug-in
+			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
+			mv ${plugin}/{,${prepend}}${plugin} || exit 1
+			mv {,${prepend}}${plugin} || exit 1
+		    fi
+		done
+	)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use python; then
+		python_optimize
+	fi
+
+	# Workaround for bug #321111 to give GIMP the least
+	# precedence on PDF documents by default
+	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+	mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die
+
+	_rename_plugins || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/media-gfx/gimp/gimp-2.99.2.ebuild b/media-gfx/gimp/gimp-2.99.2.ebuild
index f06290af12d5..4c66fd2a0ef0 100644
--- a/media-gfx/gimp/gimp-2.99.2.ebuild
+++ b/media-gfx/gimp/gimp-2.99.2.ebuild
@@ -38,6 +38,7 @@ COMMON_DEPEND="
 	>=media-libs/fontconfig-2.12.6
 	>=media-libs/freetype-2.10.2
 	>=media-libs/gegl-0.4.26:0.4[cairo,introspection,lcms,vala?]
+	<media-libs/gegl-0.4.28:0.4
 	>=media-libs/gexiv2-0.10.10
 	>=media-libs/harfbuzz-2.6.5
 	>=media-libs/lcms-2.9:2
diff --git a/media-gfx/gimp/gimp-2.99.4.ebuild b/media-gfx/gimp/gimp-2.99.4.ebuild
new file mode 100644
index 000000000000..62c7627d10a4
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.99.4.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+GNOME2_EAUTORECONF=yes
+VALA_MIN_API_VERSION="0.40"
+VALA_USE_DEPEND=vapigen
+
+inherit autotools gnome2 lua-single python-single-r1 toolchain-funcs vala virtualx
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v2.99/${P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="0/3"
+KEYWORDS=""
+
+IUSE="aalib alsa aqua debug doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+# media-libs/{babl,gegl} are required to be built with USE="introspection"
+# to fix the compilation checking of /usr/share/gir-1.0/{Babl-0.1gir,Gegl-0.4.gir}
+COMMON_DEPEND="
+	>=app-text/poppler-0.90.1[cairo]
+	>=app-text/poppler-data-0.4.9
+	>=dev-libs/atk-2.34.1
+	>=dev-libs/glib-2.62.6:2
+	>=dev-libs/json-glib-1.4.4
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.40.21:2
+	>=media-gfx/mypaint-brushes-2.0.2:=
+	>=media-libs/babl-0.1.84[introspection,lcms,vala?]
+	>=media-libs/fontconfig-2.12.6
+	>=media-libs/freetype-2.10.2
+	>=media-libs/gegl-0.4.28:0.4[cairo,introspection,lcms,vala?]
+	>=media-libs/gexiv2-0.10.10
+	>=media-libs/harfbuzz-2.6.5
+	>=media-libs/lcms-2.9:2
+	>=media-libs/libmypaint-1.6.1:=
+	>=media-libs/libpng-1.6.37:0=
+	>=media-libs/tiff-4.1.0:0
+	net-libs/glib-networking[ssl]
+	sys-libs/zlib
+	virtual/jpeg
+	>=x11-libs/cairo-1.16.0
+	>=x11-libs/gdk-pixbuf-2.40.0:2
+	>=x11-libs/gtk+-3.24.16:3
+	x11-libs/libXcursor
+	>=x11-libs/pango-1.44.7
+	aalib? ( media-libs/aalib )
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
+	heif? ( >=media-libs/libheif-1.7.0:= )
+	javascript? ( dev-libs/gjs )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )
+	lua? (
+		${LUA_DEPS}
+		$(lua_gen_cond_dep '
+			dev-lua/lgi[${LUA_USEDEP}]
+		')
+	)
+	mng? ( media-libs/libmng:= )
+	openexr? ( >=media-libs/openexr-2.3.0:= )
+	postscript? ( app-text/ghostscript-gpl )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/pygobject-3.0:3[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	udev? ( >=dev-libs/libgudev-167:= )
+	unwind? ( >=sys-libs/libunwind-1.1.0:= )
+	webp? ( >=media-libs/libwebp-0.6.0:= )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/hicolor-icon-theme
+	gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-lang/perl-5.30.3
+	>=dev-libs/appstream-glib-0.7.16
+	dev-util/gdbus-codegen
+	dev-util/gtk-update-icon-cache
+	>=dev-util/intltool-0.51.0
+	sys-apps/findutils
+	>=sys-devel/autoconf-2.54
+	>=sys-devel/automake-1.11
+	>=sys-devel/gettext-0.21
+	>=sys-devel/libtool-2.4.6
+	doc? (
+		>=dev-util/gtk-doc-1.32
+		dev-util/gtk-doc-am
+	)
+	vala? ( $(vala_depend) )
+"
+
+# TODO: there are probably more atoms in DEPEND which should be in BDEPEND now
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "AUTHORS" "HACKING" "NEWS" "README" "README.i18n" )
+
+# Bugs 685210 (and duplicate 691070)
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
+
+	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
+
+	gnome2_src_prepare  # calls eautoreconf
+
+	use vala && vala_src_prepare
+
+	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
+	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+_adjust_sandbox() {
+	# Bugs #569738 and #591214
+	local nv
+	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+		# We do not check for existence as they may show up later
+		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+		addwrite "${nv}"
+	done
+
+	addwrite /dev/dri/  # bugs #574038 and #684886
+	addwrite /dev/ati/  # bug #589198
+	addwrite /proc/mtrr  # bug #589198
+}
+
+src_configure() {
+	_adjust_sandbox
+
+	local myconf=(
+		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+		GDBUS_CODEGEN="${EPREFIX}"/usr/bin/gdbus-codegen
+
+		--enable-default-binary
+
+		--disable-check-update
+		--enable-mp
+		--with-appdata-test
+		--with-bug-report-url=https://bugs.gentoo.org/
+		--with-xmc
+		--without-libbacktrace
+		--without-webkit
+		--without-xvfb-run
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable doc gtk_doc)
+		$(use_enable vector-icons)
+		$(use_with aalib aa)
+		$(use_with alsa)
+		$(use_with !aqua x)
+		$(use_with heif libheif)
+		$(use_with javascript)
+		$(use_with jpeg2k jpeg2000)
+		$(use_with lua)
+		$(use_with mng libmng)
+		$(use_with openexr)
+		$(use_with postscript gs)
+		$(use_with python)
+		$(use_with udev gudev)
+		$(use_with unwind libunwind)
+		$(use_with vala)
+		$(use_with webp)
+		$(use_with wmf)
+		$(use_with xpm libxpm)
+	)
+
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
+	gnome2_src_compile
+}
+
+# for https://bugs.gentoo.org/664938
+_rename_plugins() {
+	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
+	local prepend=gimp-org-
+	(
+		cd "${ED}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1
+		for plugin_slash in $(ls -d1 */); do
+		    plugin=${plugin_slash%/}
+		    if [[ -f ${plugin}/${plugin} ]]; then
+			# NOTE: Folder and file name need to match for Gimp to load that plug-in
+			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
+			mv ${plugin}/{,${prepend}}${plugin} || exit 1
+			mv {,${prepend}}${plugin} || exit 1
+		    fi
+		done
+	)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use python; then
+		python_optimize
+	fi
+
+	# Workaround for bug #321111 to give GIMP the least
+	# precedence on PDF documents by default
+	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+	mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die
+
+	_rename_plugins || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 0d94d06ee022..04c9a09842a1 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
+LUA_COMPAT=( luajit )
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 GNOME2_EAUTORECONF=yes
 VALA_MIN_API_VERSION="0.40"
 VALA_USE_DEPEND=vapigen
 
-inherit autotools git-r3 gnome2 python-single-r1 toolchain-funcs vala virtualx
+inherit autotools git-r3 gnome2 lua-single python-single-r1 toolchain-funcs vala virtualx
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/"
@@ -19,7 +20,8 @@ SLOT="0/3"
 KEYWORDS=""
 
 IUSE="aalib alsa aqua debug doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
 
 RESTRICT="!test? ( test )"
 
@@ -35,10 +37,10 @@ COMMON_DEPEND="
 	dev-libs/libxslt
 	>=gnome-base/librsvg-2.40.21:2
 	>=media-gfx/mypaint-brushes-2.0.2:=
-	>=media-libs/babl-0.1.82[introspection,lcms,vala?]
+	>=media-libs/babl-0.1.84[introspection,lcms,vala?]
 	>=media-libs/fontconfig-2.12.6
 	>=media-libs/freetype-2.10.2
-	>=media-libs/gegl-0.4.27:0.4[cairo,introspection,lcms,vala?]
+	>=media-libs/gegl-0.4.28:0.4[cairo,introspection,lcms,vala?]
 	>=media-libs/gexiv2-0.10.10
 	>=media-libs/harfbuzz-2.6.5
 	>=media-libs/lcms-2.9:2
@@ -52,7 +54,7 @@ COMMON_DEPEND="
 	>=x11-libs/gdk-pixbuf-2.40.0:2
 	>=x11-libs/gtk+-3.24.16:3
 	x11-libs/libXcursor
-	>=x11-libs/pango-1.42.4
+	>=x11-libs/pango-1.44.7
 	aalib? ( media-libs/aalib )
 	alsa? ( >=media-libs/alsa-lib-1.0.0 )
 	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
@@ -60,8 +62,10 @@ COMMON_DEPEND="
 	javascript? ( dev-libs/gjs )
 	jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )
 	lua? (
-		dev-lang/luajit
-		dev-lua/lgi
+		${LUA_DEPS}
+		$(lua_gen_cond_dep '
+			dev-lua/lgi[${LUA_USEDEP}]
+		')
 	)
 	mng? ( media-libs/libmng:= )
 	openexr? ( >=media-libs/openexr-2.3.0:= )
@@ -97,7 +101,6 @@ DEPEND="
 	>=sys-devel/automake-1.11
 	>=sys-devel/gettext-0.21
 	>=sys-devel/libtool-2.4.6
-	virtual/pkgconfig
 	doc? (
 		>=dev-util/gtk-doc-1.32
 		dev-util/gtk-doc-am
@@ -105,6 +108,9 @@ DEPEND="
 	vala? ( $(vala_depend) )
 "
 
+# TODO: there are probably more atoms in DEPEND which should be in BDEPEND now
+BDEPEND="virtual/pkgconfig"
+
 DOCS=( "AUTHORS" "HACKING" "NEWS" "README" "README.i18n" )
 
 # Bugs 685210 (and duplicate 691070)
@@ -113,6 +119,8 @@ PATCHES=(
 )
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
+
 	if use python; then
 		python-single-r1_pkg_setup
 	fi
@@ -210,7 +218,7 @@ _rename_plugins() {
 	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
 	local prepend=gimp-org-
 	(
-		cd "${ED%/}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1
+		cd "${ED}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1
 		for plugin_slash in $(ls -d1 */); do
 		    plugin=${plugin_slash%/}
 		    if [[ -f ${plugin}/${plugin} ]]; then
@@ -236,12 +244,12 @@ src_install() {
 
 	# Workaround for bug #321111 to give GIMP the least
 	# precedence on PDF documents by default
-	mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
+	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
 
 	find "${D}" -name '*.la' -type f -delete || die
 
 	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	mv "${ED%/}"/usr/share/man/man1/gimp-console{-*,}.1 || die
+	mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die
 
 	_rename_plugins || die
 }
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 8d2494c9efc6..f21555bad55b 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -3,7 +3,10 @@ AUX graphicsmagick-1.3.19-perl.patch 491 BLAKE2B 6a6465162d9a4d7d09b1edb425cc711
 AUX graphicsmagick-1.3.35-CVE-2020-12672.patch 2753 BLAKE2B 864a77b650f5cec350d83bc5eec289736171a141e8609c41d4c66f49a58b2d332cb2ab343f557879a547e6a291665d16c5707ab7573bf48263a838ba24940475 SHA512 57387a3f1e2e07fdf4617b0fc73106b4f00fe1a7dc0d88919b39490213d42180a4617653b48e54749f7d2807dca4d1b052f14389c30b7a059f841c012ca2b1a6
 AUX graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch 988 BLAKE2B 4906fffe43150ef209c4d2f87d433cf78cd5e3c03a9db22426e3c3455028a5ff63c189ace1f46f47e1fa04fe8d78388b76dcabc288a9a75e57b7ebbb68f8c90d SHA512 95776534891eed617b09873fd70af020c6d6370a6765ba7aaf8185268e8b73b774ce2aeb1b284641fb12260ca0047c4543b17a18ed4ef28db725b75f988c7215
 AUX graphicsmagick-1.3.35-oss-fuzz-23042.patch 1350 BLAKE2B 415bd540a7aa194235ce1e6482035dd9b8ee4d4f5192f4d898e178875d453fd8b481efcbe139db602d411f788e3067a95106ba128ab14af63d3848f92c035405 SHA512 d345b54570e3396db81f0f60980633e139f90a54b579ad953a36aa5e16c1edfe7a5186b4e2d5a2e02f759544b372981278b06d2b688324e6b091c841a5bae133
+AUX graphicsmagick-1.3.36-flags.patch 2009 BLAKE2B 1d58f03cfeac9be92e2e85a2b6274ec22e3cb2c65d62e3095f2bb3da8f817ae52fdd6fe70e5da30bb8110202ec8c8268ffef7069c34d55ef7f7ccc3e53785418 SHA512 205694ea04e7b65c5519c564bbfa1ebd33ef4fa7800aec1a91439ed90794629dd54ab42c1c7f4f2f5ce3b7b078b3fffe76ce37c61643087f5cca244931b5bd3a
 DIST GraphicsMagick-1.3.35.tar.xz 5543224 BLAKE2B 8a284d85341c10939fdece5c565d5b881276afb9b4c5dfb2221b780a01b99f78ee62761722c372baf9155c63f7ef176b67310aeedcab0368f4f26f5b0150bcce SHA512 baae92089d52147ef961f93495abc8a9d8b1a963af61d87a650c1ab105d46816aa38c83f654edcb5a0e1b7f07ccc06eaeaa443b9bde3a63a0b9bfb45f3ae144c
+DIST GraphicsMagick-1.3.36.tar.xz 5600712 BLAKE2B 069ab4f9bb5beea3321860bf8e43c8a1b51ab102054e92486375209a86fd3c1c1fb44d4b2c43a65c78f36e9f37e09316fe77b4f261bfb0af3b2c2a86ff8b5aa5 SHA512 27ed5fcbfb0303436bdcb0f11d18257a967d471251b51e633e2c655b0a7e5ed01f61a61f9702cc7d4c02714e005ac18ca9ba0f690c0580e41d07947a03c5cbb4
 EBUILD graphicsmagick-1.3.35-r1.ebuild 3244 BLAKE2B 20a05ba460b52292328b8152c8b8991653bc5478dde0768085df9b1ed53e16aa74d485a6b49054d97fc4c30eadc7d8be959519711023c495208537d3387bf099 SHA512 a9f44ee9b36fc6859c30a46f6d61338ce5d4d5819508cb2c59e042fab00fbbcccab25219e292413536376e1a7fed734268c50cd1afa1ef68b0ef285a2543cf85
-EBUILD graphicsmagick-9999.ebuild 3103 BLAKE2B 89b885a1437aa55f10d47fe2485125fd3ec625b07afd0b9c1bc1ff59a927a035abfba5fc49f51e5259d5b12c261af0d3a79db8bcd4da6abc85afe62019d29821 SHA512 bffe1fa515705df9286a0c3aaf434e6e5950de445864da5ad9ece8ed4178d080c985b5f0ccdc08216f9c337ed71750c36452f2b64f4c22b9855fff6a33858e01
+EBUILD graphicsmagick-1.3.36.ebuild 3126 BLAKE2B 4ae429e70dcb36ac4aa03bc6dd0dc21f5540751faeb531e962cad24402e0ff1aa078193e3f9c2cd34d09858215041d4b03f61245636b43c1909e79eefbf43a84 SHA512 6a53a3861721ae9d305dee052da5637fc570c1ffe9c1f7588701a0f9c612740f1e75b3c6d931414f08ca2332b5b2ab8dd13c93e8570f41bc32490a23b9f861d0
+EBUILD graphicsmagick-9999.ebuild 3126 BLAKE2B 4ae429e70dcb36ac4aa03bc6dd0dc21f5540751faeb531e962cad24402e0ff1aa078193e3f9c2cd34d09858215041d4b03f61245636b43c1909e79eefbf43a84 SHA512 6a53a3861721ae9d305dee052da5637fc570c1ffe9c1f7588701a0f9c612740f1e75b3c6d931414f08ca2332b5b2ab8dd13c93e8570f41bc32490a23b9f861d0
 MISC metadata.xml 1071 BLAKE2B 899c521ae7916dc5702bada0b782b3020084f84397f0ab62aa4ac15d14d74045ee3dca8b9c9c98591481502694a59e33fcfd8467b7da836a8ee16fb16fbd4727 SHA512 50d6c48e7459d3772d0b804785f5b40cce16bc7a1ac6602a1d5475cd5616e725aa111385eab50a5347418073f1c7afc03f66aa4fd8959474835d899b22c9bca8
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-flags.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-flags.patch
new file mode 100644
index 000000000000..311cd7829258
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-flags.patch
@@ -0,0 +1,59 @@
+diff --git a/Magick++/bin/GraphicsMagick++-config.in b/Magick++/bin/GraphicsMagick++-config.in
+index 9733be2..4c49362 100755
+--- a/Magick++/bin/GraphicsMagick++-config.in
++++ b/Magick++/bin/GraphicsMagick++-config.in
+@@ -33,7 +33,7 @@ while test $# -gt 0; do
+       echo '@MAGICK_API_CPPFLAGS@'
+       ;;
+     --cxxflags)
+-      echo '@CXXFLAGS@'
++      echo '@MAGICK_API_CXXFLAGS@'
+       ;;
+     --ldflags)
+       echo '@MAGICK_API_LDFLAGS@'
+diff --git a/configure.ac b/configure.ac
+index d6a30f6..2f5ff6c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -335,6 +335,7 @@ fi
+ 
+ AC_OPENMP([C])
+ CFLAGS="$OPENMP_CFLAGS $CFLAGS"
++MAGICK_API_CFLAGS="$MAGICK_API_CFLAGS $OPENMP_CFLAGS"
+ #CXXFLAGS="$OPENMP_CXXFLAGS $CXXFLAGS"
+ #LDFLAGS="$LDFLAGS $OPENMP_CFLAGS"
+ AC_SUBST([OPENMP_CFLAGS])
+@@ -3689,9 +3690,10 @@ MAGICK_DEP_LIBS=`echo $MAGICK_DEP_LIBS | sed -e 's/  */ /g'`
+ MAGICK_EXTRA_DEP_LIBS=`echo $MAGICK_EXTRA_DEP_LIBS | sed -e 's/  */ /g'`
+ #LIBS=`echo $LIBS | sed -e 's/  */ /g'`
+ 
+-MAGICK_API_CFLAGS=$CFLAGS
++MAGICK_API_CFLAGS=`echo $MAGICK_API_CFLAGS | sed -e 's/  */ /g'`
+ MAGICK_API_CPPFLAGS=`echo $MAGICK_API_CPPFLAGS | sed -e 's/  */ /g'`
+-MAGICK_API_LDFLAGS="-L$LIB_DIR $LDFLAGS"
++MAGICK_API_CXXFLAGS=""
++MAGICK_API_LDFLAGS="-L$LIB_DIR"
+ MAGICK_API_DEP_LIBS="$MAGICK_DEP_LIBS"
+ MAGICK_API_LIBS="-lGraphicsMagick $MAGICK_API_DEP_LIBS $MAGICK_EXTRA_DEP_LIBS"
+ 
+@@ -3721,6 +3723,7 @@ AC_SUBST([X_CFLAGS])
+ 
+ AC_SUBST([MAGICK_API_CFLAGS])
+ AC_SUBST([MAGICK_API_CPPFLAGS])
++AC_SUBST(MAGICK_API_CXXFLAGS)
+ AC_SUBST([MAGICK_API_PC_CPPFLAGS])
+ AC_SUBST([MAGICK_API_LDFLAGS])
+ AC_SUBST([MAGICK_API_LIBS])
+diff --git a/magick/GraphicsMagick-config.in b/magick/GraphicsMagick-config.in
+index 8b2f016..3f66ae3 100644
+--- a/magick/GraphicsMagick-config.in
++++ b/magick/GraphicsMagick-config.in
+@@ -30,7 +30,7 @@ while test $# -gt 0; do
+       echo @PACKAGE_VERSION@
+       ;;
+     --cflags)
+-      echo '@CFLAGS@'
++      echo '@MAGICK_API_CFLAGS@'
+       ;;
+     --cppflags)
+       echo '@MAGICK_API_CPPFLAGS@'
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
new file mode 100644
index 000000000000..9881f65ad846
--- /dev/null
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+MY_P=${P/graphicsm/GraphicsM}
+DESCRIPTION="Collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.graphicsmagick.org/"
+LICENSE="MIT"
+SLOT="0/${PV%.*}"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit mercurial
+	EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
+else
+	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma
+	openmp perl png postscript q16 q32 static-libs svg threads tiff truetype
+	webp wmf X zlib"
+
+RDEPEND="dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	fpx? ( media-libs/libfpx )
+	imagemagick? ( !media-gfx/imagemagick )
+	jbig? ( media-libs/jbigkit )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	lzma? ( app-arch/xz-utils )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	svg? ( dev-libs/libxml2 )
+	tiff? ( media-libs/tiff:0 )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+	)
+	webp? ( media-libs/libwebp:= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libSM
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.36-flags.patch
+	"${FILESDIR}"/${PN}-1.3.19-perl.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local depth=8
+	use q16 && depth=16
+	use q32 && depth=32
+
+	local openmp=disable
+	if use openmp && tc-has-openmp; then
+		openmp=enable
+	fi
+
+	local myeconfargs=(
+		--${openmp}-openmp
+		--enable-largefile
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable debug prof)
+		$(use_enable debug gcov)
+		$(use_enable imagemagick magick-compat)
+		$(use_with threads)
+		$(use_with dynamic-loading modules)
+		--with-quantum-depth=${depth}
+		--without-frozenpaths
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options=INSTALLDIRS=vendor
+		$(use_with bzip2 bzlib)
+		$(use_with postscript dps)
+		$(use_with fpx)
+		$(use_with jbig)
+		$(use_with webp)
+		$(use_with jpeg)
+		--without-jp2
+		$(use_with lcms lcms2)
+		$(use_with lzma)
+		$(use_with png)
+		$(use_with tiff)
+		$(use_with truetype ttf)
+		$(use_with wmf)
+		--with-fontpath="${EPREFIX}"/usr/share/fonts
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		--with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts
+		$(use_with svg xml)
+		$(use_with zlib)
+		$(use_with X x)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+	use perl && emake perl-build
+}
+
+src_test() {
+	unset DISPLAY # some perl tests fail when DISPLAY is set
+	default
+}
+
+src_install() {
+	default
+
+	if use perl; then
+		emake -C PerlMagick DESTDIR="${D}" install
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die
+}
diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
index 5cde9ca89391..9881f65ad846 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools toolchain-funcs
 
 MY_P=${P/graphicsm/GraphicsM}
-
 DESCRIPTION="Collection of tools and libraries for many image formats"
 HOMEPAGE="http://www.graphicsmagick.org/"
 LICENSE="MIT"
@@ -16,7 +16,8 @@ if [[ ${PV} == "9999" ]] ; then
 	EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
 else
 	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma
@@ -39,20 +40,18 @@ RDEPEND="dev-libs/libltdl:0
 	truetype? (
 		media-fonts/urw-fonts
 		>=media-libs/freetype-2
-		)
+	)
 	webp? ( media-libs/libwebp:= )
 	wmf? ( media-libs/libwmf )
 	X? (
 		x11-libs/libSM
 		x11-libs/libXext
-		)
+	)
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${MY_P}
-
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.19-flags.patch
+	"${FILESDIR}"/${PN}-1.3.36-flags.patch
 	"${FILESDIR}"/${PN}-1.3.19-perl.patch
 )
 
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 4b36c628ec24..520010962213 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -4,9 +4,9 @@ DIST ImageMagick-6.9.11-46.tar.xz 9165256 BLAKE2B 5fb2c7ef90c165388bf9c9b42d7528
 DIST ImageMagick-6.9.11-52.tar.xz 9152084 BLAKE2B bc50767e3eacc06ccf6168d9cac5666a2836e3b2085ee834594da419c2912cafce7dee84573f1a2062e051afb066529ae79b7bea25242fb055fdd11e734ee0d7 SHA512 79e6ab62722060601283f4c172f7a27b7d3c00f5dbdfaea4c1f5c1940a681ab3fd53e4ea4b736adc3e0662ecccba13f7f86baada3d319733191eda37abee38a1
 DIST ImageMagick-7.0.10-46.tar.xz 9649132 BLAKE2B 8083aa4fa26d59c4bea4bd9a45ab5b1a46d3fe0ecdbb0090588d16bcc31ad044171a59dc7e8681c878e885d83c7b34a4bbfa21273d5711181bbefdee457ac895 SHA512 7008286a05a1794a3061bd598bf6acc70dcfe1aec3a6b5632dce9dd87bb6c28385af0d469b47996d5576c4b39c5d48a4fcd7752b9353ec28b7f7d8160f4c5023
 DIST ImageMagick-7.0.10-52.tar.xz 9642352 BLAKE2B c1a86214978da88d66ef90b91516482fe67ee5e215fd5d76c79dbbcd9e33cc2d417d8f5d8e29056743737dd2275fe7a8d891b6ad2f3c8d7d5ab0adfd83f60dd1 SHA512 da1a8d53af0dc8f0dc8f71a7d41c5277c1e17f81e03a3c54852ced65d5d379577989e274bac66926c8a10f4d2f2834f7456b79635007252308ca593e98ef6d43
-EBUILD imagemagick-6.9.11.46.ebuild 7047 BLAKE2B c8a589ac24fb824399cdf0459e46d52fa5aa08b184befdb8d7c991778e41fa91a30e89d6e1cab206969c47d9d438977528c6ad533da242398c380c434b0cf8db SHA512 ea9007174ea7d0eb0c583e659e761f25904f63981d88c41e03ffb6680e58885f8cc6faa6bb2f63686e69137b1ad0acd815e646993fe6b2ec7d25be51b6c5e3c9
-EBUILD imagemagick-6.9.11.52.ebuild 7054 BLAKE2B c1f4280b7d3380b01a44f33af60b062eeb2c98f0850dcd3d4fe88ebe292ad5c2e299c018983724b96f18461c0acdb6f9807ccaf8b233328a5ff2c00582734255 SHA512 9aa1c7e617fe258be2eb1f7f0f9d462a51d6d0884edab102fbfa70936891b3371e1d86fa059648fccfb52a25645fb6376171d55ce20f7d6de267445c0f958b97
-EBUILD imagemagick-7.0.10.46.ebuild 7356 BLAKE2B d2f907df96ed9c207652de11dc4178b3ac6c6ced8ee759a78bfeb7d8c8e152a73dbd03ff146a1dd8eb66155cc09612621c0c5aaee394461127b2f80707e20eab SHA512 26ee49e6b467c1c777ef2acfa5740601ae529b1a4aed6dd07c287ad2246d21edfa72285a63c4f27e1241e81b485b3ccad14ddf9aa58eea63949cb6f68c7e9c1b
-EBUILD imagemagick-7.0.10.52.ebuild 7364 BLAKE2B 5067a5a79b93c7ea8364940352cc4988393ceb86a08e617dd95a309022be37b60dd9ffd1621c1a799cb372608f75c213d7fc1ddb13340225ad4643c408630bc4 SHA512 85560f10889069420c6459e696aa96d7306486bea2410d8f3bdc9160995eaad65b10ca171c2a39a170ba21043bb4cd84f5e6e0776e020ecf1286b84611430981
-EBUILD imagemagick-9999.ebuild 7364 BLAKE2B 5067a5a79b93c7ea8364940352cc4988393ceb86a08e617dd95a309022be37b60dd9ffd1621c1a799cb372608f75c213d7fc1ddb13340225ad4643c408630bc4 SHA512 85560f10889069420c6459e696aa96d7306486bea2410d8f3bdc9160995eaad65b10ca171c2a39a170ba21043bb4cd84f5e6e0776e020ecf1286b84611430981
+EBUILD imagemagick-6.9.11.46.ebuild 7038 BLAKE2B fdd66cc09e3fdd176bcf98dfa84bb896df4c4c44a2e864d5fa0850e120dbd13ac281724eae11b158515f314ba4dcf8eaf1b2cf748804edd25b507c434ab90291 SHA512 02f25a733e4eb58b8fcfb1515430661eef04277fb3107f59f200d247188ee3448cd01258d168381d41bf9ef16f58bf4afb0c335be71716dcbf3d15c43de5a727
+EBUILD imagemagick-6.9.11.52.ebuild 7045 BLAKE2B 1031340ad6d88326937a11151b6e70106018d4ca75c55c1b875d46ade215e41e1d13e7998f9c9d72d0a7e3c35c912628856e969d234ab936a940853c24c57279 SHA512 0ee451f8b2e22dede6b10e5c824521ba6835ec0a364b5aa353576f2b6d988feb7c710ad891ec1891287fab13e4cc2c4dc274cc4cb92f1e2caf6f5805045f6d97
+EBUILD imagemagick-7.0.10.46.ebuild 7347 BLAKE2B 50f42acbdaa7c58df55ba7a425e54b0bd08a0e76f0439a01f4709073ead7339c96210f647cc157d49f060ea58fc04eab20c02a09a13d9ee23e5e4dd876c9b400 SHA512 f9f43c3dd0e4038bc9767e84565f75f534aa6d83ffc8223551b319b500b3b378c3b1ac8e454a2fe85bc1e0fef3b6057191280589902cc3e9e634e6761b366701
+EBUILD imagemagick-7.0.10.52.ebuild 7355 BLAKE2B aa992f2455179bab8ef57d471e8f185c357b406d6086194a6656764919500dfcf5de2bf6f61e44aa74317e4f35f6fcdf1699dcbad357d0f8efa32935d8cf9edc SHA512 8fb8b4145a9a75f1da248e6f4f2ebec6c8d617a57d757e53cd0777c78592c2415b6355fd3764555ebe0a6683c7a39226f7ee7f8d187a14e4933e42c2346c6f86
+EBUILD imagemagick-9999.ebuild 7355 BLAKE2B aa992f2455179bab8ef57d471e8f185c357b406d6086194a6656764919500dfcf5de2bf6f61e44aa74317e4f35f6fcdf1699dcbad357d0f8efa32935d8cf9edc SHA512 8fb8b4145a9a75f1da248e6f4f2ebec6c8d617a57d757e53cd0777c78592c2415b6355fd3764555ebe0a6683c7a39226f7ee7f8d187a14e4933e42c2346c6f86
 MISC metadata.xml 1106 BLAKE2B e77cabff89df6b98687290ef0ee06d85111a7ddca6f5e1e31f820e6d186a6510c2afd0b85ba31004f102fd7f7b88f46af101f4ba45011aac75afa40b0a714857 SHA512 68a5f9a80b1e3f2e3004252703f9b3176d7c59880a2724ae431fdfd97e8f2adcd7ff7ad2cd8ea8bd35645a3b559052f2c38713647ce7ae889ff1a6061e6b2d92
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.46.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.46.ebuild
index 2093cc705f7b..d866867b32bf 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.46.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.46.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/6.9.11-37"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 REQUIRED_USE="corefonts? ( truetype )
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild
index 671132b9e8fb..fe33a9dc492a 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.52.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/6.9.11-37"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 REQUIRED_USE="corefonts? ( truetype )
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.46.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.46.ebuild
index e5576b5108a8..3b34db05a92d 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.46.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.46.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild b/media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild
index c476290b8c6a..e4abcf9fbc53 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.52.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index c476290b8c6a..e4abcf9fbc53 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 25f30f86172a..b893667a068b 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,7 +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-1.0-r1.ebuild 3989 BLAKE2B ff43d507d1449c91a185b1f5dd05f5dc7ff1598f4056a8dec9211efc5325b3a18774874d6d5d1de3dfb145663dfcb7cb955bf47c146b3c8c51ede525be68f01d SHA512 04b37cb020dddc1e7eadaac23942a554b4eed376dacaeef4c71566753777d86a46ffcb3e3d4f2cb71f17e2a1cfb46e8cf94f028f6d6bef590bcbc24a3b26ac0f
+EBUILD inkscape-1.0.1.ebuild 3993 BLAKE2B d70645f882845e2edaeda53413986834f8d043c8d8c11a27fb10a3eb6dfa1c7fce068e5cf6f21479bf1517e224e982665fcee3be54606d19d8562a3aff927ea7 SHA512 35fbb8dae40bdde28884330a3c3c543430b601321e9863c9146aac2798291eee56a2d52185ad285391d42aa5982392f3a033adcb2967806d1e7ff8dd392dd25c
 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-r1.ebuild b/media-gfx/inkscape/inkscape-1.0-r1.ebuild
index 0e5ca71a8f9f..53bd4516401d 100644
--- a/media-gfx/inkscape/inkscape-1.0-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="xml"
 
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
diff --git a/media-gfx/inkscape/inkscape-1.0.1.ebuild b/media-gfx/inkscape/inkscape-1.0.1.ebuild
index c7b103100cf6..46527098d103 100644
--- a/media-gfx/inkscape/inkscape-1.0.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="xml"
 
 inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 17c7cedfbbd7..1e52307d2fcc 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -4,6 +4,6 @@ DIST libimagequant-2.11.7.tar.gz 74311 BLAKE2B 204fbe794014c11d767991a03e729b234
 DIST libimagequant-2.12.2.tar.gz 75611 BLAKE2B 23f5d3666fd21696d4f4dab9db3669642a9e3f6ca971804b914e845018df538136c3db900419ac35230be9fd487b48e0ab672b653e2ee82387c19569b49d6cfc SHA512 7e7bfcffd163d8b73a46d523dc441e4a4726f5dde804f306f13900f74afae6f6e7cf780bf157b5823a71c790bcdd0e9c9c34cf43f84a21289e470fc78835d8d8
 DIST libimagequant-2.12.3.tar.gz 75866 BLAKE2B 857a0e3f0187251e37e0c7f4f5f5cbf49266e4eb9f684118705778d9469330cf95780ea11b83d19e28251f047a7e9b8e7ac32ac4d9554cb5d9e1b3230d39e796 SHA512 4818b00b6f154407f3e402d56f4891c2d7594c8056fada0402d7fa0024ae50127340dd8295da5f5dca13fe1829670a3fa8793aa528f3e74a2294c9a7e37b7257
 EBUILD libimagequant-2.11.7.ebuild 1147 BLAKE2B 41943e15f697966749897fd14aec98dec919ce81189ec5f481517d14eb94a91b95b0b0cdc9f057854a745a2fea5ccf094411900db06eb54dc6aeba410521e871 SHA512 ec8d4ce66233a74974ff6edb4c67dcf5d7f12f4535001bb770d70a995cc5a9b2600f900777fc1996335d49f85efe10a3dc21e547c2b535c68720ee455ec4352f
-EBUILD libimagequant-2.12.2.ebuild 1402 BLAKE2B 78bc0307ce586509b1ad63f39c8defb47ee4e94624db279954a11ae0fca2b7511f1ba018f1c3ab72e26e89c29fe81b0c7ad8ae05f142dbfccbaa24793bc90e6a SHA512 f97cbf0ae7c7d293c5340fd996909229ce9cc5664f2f8aaf5409363d7f16e8a45313e8650f908a1965fd7445b931d09c643408b155409dd0fe9bdb91257f304c
+EBUILD libimagequant-2.12.2.ebuild 1403 BLAKE2B 40d79a5387b2091818a33cf3c5620558fa9543f9e75a76a7ed310ac751bd2a8b5f592340f591a831f68604873365b6141c7d388552d31162e1b259df8e7bfa57 SHA512 268b848f7d11fe9568b13a2b90b57e5f6369cad1f8043d47ef06c8ddd05909e9da83844b2ef6367125bf2c7e86a158fd82ab99ec257b5a290e90fbb9bdf5fb58
 EBUILD libimagequant-2.12.3.ebuild 1410 BLAKE2B 5e7c09cc1ea3218fc56e25d053409bf99112c567efe1ab9046b817f20703f06d3b7bfd8112be02b07882e3f32e9b660adcd57400fc0b3aaa555a1661eb5e10ea SHA512 06156624711397f8e90faf24040bdb9c877495d939e5a9b157152e5b827b00175a7d1dfcbe6bffc307c720a3b84229bcca8a037720d1f609e55f6c8402e6cec0
 MISC metadata.xml 430 BLAKE2B 026b07580a573d4221658d920a91ef9a48b74b1b3314250413e16027fb45ae30589ae800f064f8caaf3117b6e9439202554f04394fa3d30d419c61e8a60dd588 SHA512 968098402f9783f65232dda56e60013050eca50176347beb3f40814509f9540879480ce9dd5480c62f1ae9ec9e3059414b620314bff611830d4148974cbb1e5f
diff --git a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
index f14ba77a5424..5ecbf05fe927 100644
--- a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
 
 DEPEND=""
diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest
index d18182be825a..c43bfe5b1d56 100644
--- a/media-gfx/meshlab/Manifest
+++ b/media-gfx/meshlab/Manifest
@@ -22,7 +22,12 @@ AUX 2016.12/meshlab-2016.12-qt-includes.patch 521 BLAKE2B 44d8cd045180d25810beb7
 AUX 2016.12/meshlab-2016.12-remove-header.patch 1481 BLAKE2B c52f2eb980ebec98a534d2f5f6eadb9b89719e1d28d6fdc2912348fbe715103f2ca67684e29d1fa77b9b305cf552c12eb667634bfa22a0fad0312012e9b7b99d SHA512 ea0e24aa94d2595ed340c91c7a17e4028b2792bf316dfea0d8062324583dde62c03bb2d6af74317b9e448c657e5418100f40b18b172344697fe53e36657a45fc
 AUX 2016.12/remove-edit_mutualcorrs.patch 475 BLAKE2B 925756e7bed4fd9474b2a011f95118e00159457b91d04820166efae55d27eb19006af9ae92555b46adcd817646fcfcef82937221d59fef41899f94df1925a237 SHA512 03b4907fc484941d17d208d028b63cc0a1d1740fbdac8a6dd2b9ac8161efc5899d820cd0ec59b28ba1c39562ecd93c5e11e7b7af5564ee9aa429cb8745a4a5b9
 AUX 2016.12/remove-io_TXT.patch 416 BLAKE2B 60aa9c033a4902c4a9acb76b1ac130076cfdef314ac57a144c0a83d59e1d7f2aa5e55c01c41ba671661cdeef249aa09e021085440214910c8153fa6303833c2f SHA512 2ff0391e5c0bd171bb06fc61cbe84112f5e480667f7a7caacbb3b3a0e566c6c2f31f443d8c6026298c3a86bf2979db534989b4eab368baaee67491b95e76723a
+AUX meshlab-2020.12-disable-updates.patch 1005 BLAKE2B 61fe405555be9a1170f0044ad0e851b2c19e25545883f07c9094e39773f2774c14c4f7b95f8a079ca782378399313ba53ac94d87f7587a6b707b9fd70560fa59 SHA512 142ab31b1874f54a371ce79e6da9f017548448cb7d3d502408a0541c26b89aafe154a42bff45965288b945cc9f65b0280fb57ed8f90f11736fb247f50129de26
+AUX meshlab-2020.12-find-plugins.patch 1117 BLAKE2B 0c17b35288543cc3b84040851f5bfb30977677254a60cb3410c2ef65d10febe648541828a1b16ac6ba4db6ac92cc087a6256923d936ffe2f069edbdb29decd14 SHA512 b57ebd412475f22624b1f211000a020dd00628f2d197ba25942874324a34d6ed14ddcbd28f9819adc523657352ac024f23852ba83d4663e4dce794e0be96340f
 DIST meshlab-2016.12.tar.gz 94194402 BLAKE2B 53dda75b51198d529d35ae64e1b9d8ec240ec6031835e6cde2ff1ad21403086112a6f4b9acf5c6f53328787078b3e1a90cc177f5e009834b310cdf6b168c59b0 SHA512 68bf863fc390725a949578b545bc749bbe2c07ca75d1461772c7777fd6a4b095f11b64b5b0e8b729f83fea1bb9e3ca4b41123cdea3799a8eee0de587eb7bf1d8
+DIST meshlab-2020.12.tar.gz 111438055 BLAKE2B 4969c1f8f60be6ff55effd710c0bceb290ad6ac01153c233fd6a943f15e86189c04c06aa474ea89899d31b77d6960ffabbda6a12c3107d750469945e0c73c335 SHA512 0a00493f3e622a7bb0b70ddf0e1710376b47bd844aa785782a62f31a46ae1ee4b493c1e4ae0184f51f30be263f84efc0073e266d50748adc10ef229f107e4c87
 DIST vcglib-1.0.1.tar.gz 9063634 BLAKE2B 91fba7ebf1ac18d0dfb33d3e26656e546b7c35ae753777730c44ebdf327413dfe94dd5e84907eb7e1644d70bfdf7d00ae8ecd0a81587d790a31354f7db09d626 SHA512 55d1854054744abae2d41e7b5041df89253bae108df5fc1cfe777013de7192dce04bc474475cb11a1d0343ebcab1ea61b381d9d9c36c452528043e85e75bc211
+DIST vcglib-2020.12.tar.gz 6777201 BLAKE2B 9e2e3eb4ae7b930a8a334d58ee4bdadaf43e9a031d523471d17ca39d241c0dd66ec846a360cbcccd53d8728a2c7a6b6fa7d7a3efc04c01515ac3366b10f01aa8 SHA512 d7eec0c9c847e6ade7a3bee9aa1cddbb6855c388b15e2b35889ce998ea9a1c7afb0034ec31c38de3cbc2d867c8d8a474b13e4e2e3218e636926967abe4e54924
 EBUILD meshlab-2016.12-r4.ebuild 3652 BLAKE2B 5ea94dd176d7229e6e07ea102b130d8e97907edbcd630258f704b14f47179ba02fe5ae44485132372b2bdfeef14317e2e10904b027b1f1d0081ba23e9cdccf82 SHA512 5bc637d6299fa057dd4549d6559c20e0a8e91d441794fa54de5963288a067fa8f435f8f38b172c8869659b334c313a2b05f4ecbe6433a37f8a69bc14b9abb130
-MISC metadata.xml 729 BLAKE2B 5c89ef346791f1aaecf313a580c18e32d37a116e87aa5955d21445816fd7a9fae30af5763dafe32f019fcda1333b3bfe48280abb1845fe096f223642badb9629 SHA512 f1d3b39a1c612b895463f0cb674411fce2614ff55855b964dee1b9c999aa1ad4bb6ec0a000cab9a1767f54474597836a92fda48722a3d8a90d21f412316e2b71
+EBUILD meshlab-2020.12.ebuild 1330 BLAKE2B c3aad1e35889d24fb2e71d797d8719900fd060909a689a6240bf55356c1f710166f0270a97e327173471161d2746e34361d7b78439e59dfdff44e4e045febc41 SHA512 26b1502d2cd6070284314d8d5b1b0c7e3101a4e4f0b0bbdd8b53b25302dc06401f86a27bf508f521bfe3fbcb194cfe563a1f2860cdf3c5101e70595c0fad0c45
+MISC metadata.xml 996 BLAKE2B 87e7bef17518f533f64493c8eed41dc3c5817ea14cd301945e3efee70712cef35267b39d2d7b0fea41e9f848cf3f140f454e474adee6747b366c843fc62e9455 SHA512 0fe24a2782373ff75e17d359c6db5aafc489f6bb6a3ad079a484e7b32177a4b613f4c8b8bee2bf6480271c7ead24cbcbae4052b6f6ccec8713cd87991e042448
diff --git a/media-gfx/meshlab/files/meshlab-2020.12-disable-updates.patch b/media-gfx/meshlab/files/meshlab-2020.12-disable-updates.patch
new file mode 100644
index 000000000000..d8cadf06d9b7
--- /dev/null
+++ b/media-gfx/meshlab/files/meshlab-2020.12-disable-updates.patch
@@ -0,0 +1,38 @@
+--- a/meshlab/mainwindow_Init.cpp
++++ b/meshlab/mainwindow_Init.cpp
+@@ -607,7 +607,6 @@
+ 	helpMenu->addAction(onlineHelpAct);
+ 	helpMenu->addAction(onscreenHelpAct);
+ 	helpMenu->addAction(submitBugAct);
+-	helpMenu->addAction(checkUpdatesAct);
+
+ 	fillEditMenu();
+ 	fillRenderMenu();
+--- a/meshlab/mainwindow_RunTime.cpp
++++ b/meshlab/mainwindow_RunTime.cpp
+@@ -2623,7 +2623,9 @@
+
+ void MainWindow::helpOnline()
+ {
++#if defined(__ENABLE_AUTO_STATS__)
+ 	checkForUpdates(false);
++#endif
+ 	QDesktopServices::openUrl(QUrl("http://www.meshlab.net/#support"));
+ }
+
+@@ -2882,6 +2884,7 @@
+ void MainWindow::showEvent(QShowEvent * event)
+ {
+ 	QWidget::showEvent(event);
++#if defined(__ENABLE_AUTO_STATS__)
+ 	QSettings settings;
+ 	QSettings::setDefaultFormat(QSettings::NativeFormat);
+ 	const QString versioncheckeddatestring("lastTimeMeshLabVersionCheckedOnStart");
+@@ -2902,6 +2905,7 @@
+ 		settings.setValue(versioncheckeddatestring, todayStr);
+ 	}
+ 	sendUsAMail();
++#endif
+ }
+
+ void MainWindow::meshAdded(int mid)
diff --git a/media-gfx/meshlab/files/meshlab-2020.12-find-plugins.patch b/media-gfx/meshlab/files/meshlab-2020.12-find-plugins.patch
new file mode 100644
index 000000000000..0d3c4c118ceb
--- /dev/null
+++ b/media-gfx/meshlab/files/meshlab-2020.12-find-plugins.patch
@@ -0,0 +1,39 @@
+--- a/common/CMakeLists.txt
++++ b/common/CMakeLists.txt
+@@ -75,6 +75,11 @@
+ endif()
+ add_library(meshlab-common ${TARGET_TYPE} ${SOURCES} ${HEADERS} ${RESOURCES})
+
++if(NOT WIN32 AND NOT APPLE)
++    target_compile_definitions(
++        meshlab-common PRIVATE MESHLAB_LIB_INSTALL_DIR="${MESHLAB_LIB_INSTALL_DIR}")
++endif()
++
+ target_include_directories(meshlab-common PRIVATE ${EXTERNAL_DIR}/easyexif/)
+ target_link_libraries(
+ 	meshlab-common
+--- a/common/pluginmanager.cpp
++++ b/common/pluginmanager.cpp
+@@ -225,7 +225,21 @@ QMap<QString, RichParameterList> PluginManager::generateFilterParameterMap()
+ QString PluginManager::getBaseDirPath()
+ {
+ 	QDir baseDir(qApp->applicationDirPath());
+-	
++
++#if defined(Q_OS_LINUX)
++	if (baseDir.dirName() == "bin") {
++		baseDir.cdUp();
++#ifdef MESHLAB_LIB_INSTALL_DIR
++		baseDir.cd(MESHLAB_LIB_INSTALL_DIR);
++#else
++		baseDir.cd("lib");
++		if(baseDir.exists("meshlab")) {
++			baseDir.cd("meshlab");
++		}
++#endif // MESHLAB_LIB_INSTALL_DIR
++	}
++#endif
++
+ #if defined(Q_OS_WIN)
+ 	// Windows:
+ 	// during development with visual studio binary could be in the debug/release subdir.
diff --git a/media-gfx/meshlab/meshlab-2020.12.ebuild b/media-gfx/meshlab/meshlab-2020.12.ebuild
new file mode 100644
index 000000000000..53eb1c1ee974
--- /dev/null
+++ b/media-gfx/meshlab/meshlab-2020.12.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="A system for processing and editing unstructured 3D triangular meshes"
+HOMEPAGE="http://www.meshlab.net"
+VCG_VERSION="2020.12"
+SRC_URI="https://github.com/cnr-isti-vclab/meshlab/archive/Meshlab-${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/cnr-isti-vclab/vcglib/archive/${VCG_VERSION}.tar.gz -> vcglib-${VCG_VERSION}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="double-precision -minimal"
+
+DEPEND="
+	dev-cpp/eigen:3
+	dev-cpp/muParser
+	dev-libs/gmp
+	>=dev-qt/qtcore-5.12:5
+	>=dev-qt/qtopengl-5.12:5
+	>=dev-qt/qtscript-5.12:5
+	>=dev-qt/qtxmlpatterns-5.12:5
+	media-libs/glew:0
+	=media-libs/lib3ds-1*
+	media-libs/openctm
+	media-libs/qhull
+	sci-libs/levmar
+	sci-libs/mpir"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/meshlab-Meshlab-${PV}/src"
+
+PATCHES=(
+	"${FILESDIR}/${P}-disable-updates.patch"
+	"${FILESDIR}/${P}-find-plugins.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"
+	unpack vcglib-2020.12.tar.gz
+	mv vcglib-2020.12/* vcglib
+}
+
+src_configure() {
+	CMAKE_BUILD_TYPE=Release
+
+	local mycmakeargs=(
+		-DBUILD_MINI=$(usex minimal)
+		-DBUILD_WITH_DOUBLE_SCALAR=$(usex double-precision)
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/meshlab/metadata.xml b/media-gfx/meshlab/metadata.xml
index 5454c9e8ca1b..95901ec9bfc4 100644
--- a/media-gfx/meshlab/metadata.xml
+++ b/media-gfx/meshlab/metadata.xml
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>amynka@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>3dprint@gentoo.org</email>
 		<name>Gentoo 3D print</name>
 	</maintainer>
-	<longdescription lang="en">
-		Printrun is a set of G-code sending applications for RepRap.
-		It consists of printcore (dumb G-code sender), pronsole (featured command line
-		G-code sender), pronterface (featured G-code sender with graphical user
-		interface), and a small collection of helpful scripts.
+	<maintainer type="person">
+		<email>amynka@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		MeshLab is an open source, portable, and extensible system for the processing and editing of unstructured 3D
+		triangular meshes. The system is aimed to help the processing of the typical not-so-small unstructured models
+		arising in 3D scanning, providing a set of tools for editing, cleaning, healing, inspecting, rendering and
+		converting these kinds of meshes.
 	</longdescription>
+	<use>
+		<flag name="double-precision">Use double type instead of float type for scalars</flag>
+	</use>
 	<upstream>
-		<remote-id type="sourceforge">meshlab</remote-id>
+		<bugs-to>https://github.com/cnr-isti-vclab/meshlab/issues</bugs-to>
+		<remote-id type="github">cnr-isti-vclab/meshlab</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/opencsg/Manifest b/media-gfx/opencsg/Manifest
index fb2866fd4057..3bf40d98abad 100644
--- a/media-gfx/opencsg/Manifest
+++ b/media-gfx/opencsg/Manifest
@@ -1,4 +1,4 @@
 AUX opencsg-1.4.2-includepath.patch 537 BLAKE2B c54c3ff9bc802f34a92a72620fd20277d90174a3d0e69ec7d34987b387da44e37d1a6487f6c6063b555bca8c40a2d827d91b3ab0d9c0b8adbab5648fce90a639 SHA512 7ccc4b75560682ad7c3c340b8d8824d1339a8a1859f459139ad84d9a06e25072eba84a78c6d30aa4dbd72cf82465a176550a7e89b2590ccd85e4129511ad3893
 DIST OpenCSG-1.4.2.tar.gz 933135 BLAKE2B 20882afaddf40cc4e0c43c3e70bad334aae3885241a3993ce7083de20f9b10d6e6c4eb3a55abba2b1eca64fdae784c491492543a5012b8b2d67eb63a16dd693b SHA512 fbe6f925982717ecca7bd0eacc4fc5b362c80c7663b1ff0d9a228f2b5e1d3625d3e6d324d9e634665c74e9c0fc37d10290ece293e59a3eba67035b6b700b7778
 EBUILD opencsg-1.4.2-r1.ebuild 1245 BLAKE2B 29b8ca3a2f400d4ac9296acda2fe7aa25ec9d2de8a3d9efb798279aa6da4c623c2f151e385a035fc84a7596a81c665b84df9427758337a913be8cbbd15b6b570 SHA512 f2a0114ff5f19beab0941af6b67895b8a94372637fe7256f79577980aafec1792d79c3c1529c0bae9050a059a1e5e606e61d47102da3543b18719eb21281a0b2
-MISC metadata.xml 1289 BLAKE2B 7b2ca0df1bdec35319472bdc3b5e9e71412406d6c5bedfa4ceda553ab207e0b8c6027d7c2f4fad9b13c3d850aa976fa94c84b336e69b750f8fb71b0967ec50c6 SHA512 df8a5dc7d1a83728d9bba2be8cc843060c4cc34ff4d3c7e04b1aebd5a05b6c93d844a3e6442620a31760f7763946a1aaeda2cc1e5dc5b6902537425748be58e5
+MISC metadata.xml 1264 BLAKE2B b5ec9e7e27832a3f8ea90363ef0590a41695b1792b468a2d804fd6b7af0e8b76d3221d695620a61a74d9c2afa4f3552be48931ee6e4ea14d6d1697bbee9c6cb3 SHA512 4568f3cf0cc0e5d2e46c113657d29b9bf08b5a9ba3de24709d099d29bd2eacf358606ed46052f1fa3122e2671f006ad181c62a3b8a4d026cdaa93f0691c34d16
diff --git a/media-gfx/opencsg/metadata.xml b/media-gfx/opencsg/metadata.xml
index a6159b39f26b..a1b015f1f907 100644
--- a/media-gfx/opencsg/metadata.xml
+++ b/media-gfx/opencsg/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
-		<description>Gentoo Proxy Maintainer Team</description>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>
 		OpenCSG is a library that does image-based CSG rendering using
diff --git a/media-gfx/pencil/Manifest b/media-gfx/pencil/Manifest
index e936b1c16dfc..fc93d195caab 100644
--- a/media-gfx/pencil/Manifest
+++ b/media-gfx/pencil/Manifest
@@ -1,8 +1,4 @@
-AUX pencil-0.6.4-fixes-for-qt-5.15.0.patch 823 BLAKE2B ea39062880493e22b5c58c3864581a37a3db38e171a065230fc18cbe79e79db420992aec838972d99ac2b0a3a23a47035ffd6df7644d0fda4daae136fa1e158c SHA512 93138586a3e6f353712a2f3e0ff4abdd88e2224d996b3069fbe11f3b4cde2ecadec21a33b7ac5ac2de7a49727332e6155cb09154e179bc42e870aaba375eb0db
 AUX pencil-0.6.5-skip-building-tests.patch 1301 BLAKE2B c7bfb172e5050936a1cf7294d2992c580ffb0b337c879d60c42575c5dff7c0269a1e406eecf7e97871a6ab785c9910a5ffc47fa97b5f9881239debf294c6cf96 SHA512 c71e2cc135a267f79bffca15f3cafb4a7e6e4d3b0f3718f37551b6985a9264774c70974c22acbf591c7b204e9aa1ea46ca4d3b3722770931b000cc633f3f62aa
-DIST pencil-0.6.4.tar.gz 3397891 BLAKE2B cb3fc754cd9abc2944fd184ea61b057a784a5b9e3c42724ef50b117a933cad0b72456a32e849c2de3ae6a7eb8bc6bdeee3ed751e8a6c8c68a74130d03ba6f1de SHA512 da28bd6bcdb0336c81e0735bec261373cd1e5db06feb012d4bba098c9df2ebea6f5b763e9c5e5e17c1518efdd6b9cde634ecf2152b49c25cde6c93da63e6fde8
 DIST pencil-0.6.5.tar.gz 3714951 BLAKE2B 0b3ba5165f4a6778588eed3141c6260a29470ccf277e42612e68e8b4daf5b9cf32f6a4343c038d6014ceb1e99f7ce8c2a398130ea55e7ef16e2d006de3661625 SHA512 6d95dc4157ea0f5da829f40cdf99c682e560ca74af6964693d221321e7b3e923893957fc30475a725f09c18dc4667968ec6cd92e5ffb56999ea70a927266b637
-EBUILD pencil-0.6.4-r1.ebuild 1245 BLAKE2B 64ac22d27b4b39ed72aea5c885c4328f3078d3d1e278fae29547354274303da49deeb655081e1db182829cd6e1952e8a33cdc77ff0c1259bdf988bec195aa0c0 SHA512 ab3ee1d4ec5f3f7aa1b3356807564805bec48a3cb937b557e316364f5c52d379a590df3502f0224f350116d4c597bb5bb5ddc5575e8a43fb300d7f56bf457966
-EBUILD pencil-0.6.4.ebuild 1179 BLAKE2B 0527c9a25c2a5ece6d99a9032d1e9760170a3d479d812cd1704946d28805baf6cac08aead03e211d2f583387081dcd911e92bf5719495044ecb460d72c5cfbf5 SHA512 38f900e8f322fe4b4dd20fc0e12e466f35824b52aa5e98577db97eb297c8afdfe9182cc8edec1b2b85ee478c43dbb5ea6e739985665be398402a37219c302a01
 EBUILD pencil-0.6.5.ebuild 1054 BLAKE2B 553ebc52d60ecc1c8905bf7f002281c12e1df8f482e70a34adcab738b8620550c61965119d0c57715a8f35128238333dca584a10421cbe76a67f7bc6ace80243 SHA512 f5422c2bcd414eeeb566b01742de93114bde276c5e1c6c6cbd21cc9eea5cd1069bbaac733b1e36a19049e8abf98b3848032bca334e4b5601280947836a9ad8c5
 MISC metadata.xml 328 BLAKE2B d37566524ba0b352bca868e5a9db91ac4faf995bc4f9fca49be83be786c8e7b3ba305a10fcc1aea71b610a1442fa1b398ca549b9fcfccf0275c958d99e9d1279 SHA512 4e393e069c386f40fd7f817af383e3ee77d2f4592059a2b3cb54f68eae45eb665db9873971a29d94612dea0c8022bc0a3c2a01bac19e62d774739d3b666aac3e
diff --git a/media-gfx/pencil/files/pencil-0.6.4-fixes-for-qt-5.15.0.patch b/media-gfx/pencil/files/pencil-0.6.4-fixes-for-qt-5.15.0.patch
deleted file mode 100644
index cbbaf2b20658..000000000000
--- a/media-gfx/pencil/files/pencil-0.6.4-fixes-for-qt-5.15.0.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/core_lib/src/graphics/bitmap/bitmapimage.cpp
-+++ b/core_lib/src/graphics/bitmap/bitmapimage.cpp
-@@ -20,6 +20,7 @@ GNU General Public License for more details.
- #include <QDebug>
- #include <QtMath>
- #include <QFile>
-+#include <QPainterPath>
- #include "util.h"
- 
- BitmapImage::BitmapImage()
---- a/core_lib/src/graphics/vector/beziercurve.cpp
-+++ b/core_lib/src/graphics/vector/beziercurve.cpp
-@@ -22,6 +22,7 @@ GNU General Public License for more details.
-
- #include <cmath>
- #include <QList>
-+#include <QPainterPath>
- #include "object.h"
- #include "pencilerror.h"
- 
---- a/core_lib/src/managers/viewmanager.cpp
-+++ b/core_lib/src/managers/viewmanager.cpp
-@@ -15,6 +15,7 @@ GNU General Public License for more details.
- 
- */
- 
-+#include <QPainterPath>
- #include "viewmanager.h"
- #include "editor.h"
- #include "object.h"
diff --git a/media-gfx/pencil/pencil-0.6.4-r1.ebuild b/media-gfx/pencil/pencil-0.6.4-r1.ebuild
deleted file mode 100644
index e5623d010010..000000000000
--- a/media-gfx/pencil/pencil-0.6.4-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils xdg-utils
-
-DESCRIPTION="2D animation and drawing program based on Qt5"
-HOMEPAGE="https://www.pencil2d.org/"
-SRC_URI="https://github.com/pencil2d/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=( "${FILESDIR}"/pencil-0.6.4-fixes-for-qt-5.15.0.patch )
-
-src_prepare() {
-	default
-	sed -e "/^QT/s/xmlpatterns //" \
-		-i core_lib/core_lib.pro tests/tests.pro || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	einstalldocs
-
-	# install target not yet provided
-	# emake INSTALL_ROOT="${D}" install
-	newbin bin/pencil2d ${PN}
-
-	newicon app/data/icons/icon.png ${PN}.png
-	make_desktop_entry ${PN} pencil2d ${PN} Graphics
-
-	insinto /usr/share/mime/packages/
-	doins app/data/pencil2d.xml
-
-	# TODO: Install l10n files
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/pencil/pencil-0.6.4.ebuild b/media-gfx/pencil/pencil-0.6.4.ebuild
deleted file mode 100644
index 7a7001dd26d7..000000000000
--- a/media-gfx/pencil/pencil-0.6.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils xdg-utils
-
-DESCRIPTION="2D animation and drawing program based on Qt5"
-HOMEPAGE="https://www.pencil2d.org/"
-SRC_URI="https://github.com/pencil2d/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_prepare() {
-	default
-	sed -e "/^QT/s/xmlpatterns //" \
-		-i core_lib/core_lib.pro tests/tests.pro || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	einstalldocs
-
-	# install target not yet provided
-	# emake INSTALL_ROOT="${D}" install
-	newbin bin/pencil2d ${PN}
-
-	newicon app/data/icons/icon.png ${PN}.png
-	make_desktop_entry ${PN} pencil2d ${PN} Graphics
-
-	insinto /usr/share/mime/packages/
-	doins app/data/pencil2d.xml
-
-	# TODO: Install l10n files
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index b3757fb66d09..5da6f08f1257 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -3,5 +3,5 @@ AUX PrusaSlicer.desktop 401 BLAKE2B 1c9bded4dd9e5e0be33c1bfb66bf8b54adc7898595fb
 AUX prusaslicer-2.2.0-atomic.patch 200 BLAKE2B c8a4f2e3ce1974dbc3a1aba5805910796f533e85040e9886b8e6c395ba95578ddf1910f0ae35f5625a73b2c063a58cfb33409489169231983a1dea5f10edbde5 SHA512 8da19e19b7027e4f77d19c10a40796e2a9bd4776820cf1adb134dc53a487edbe8a297ba6ebc92c04a419ff5d69d14a2e6fb74b2c2a05e7066a0346015a14582c
 AUX prusaslicer-2.2.0-boost-1.73.patch 2383 BLAKE2B f8d96296c7802747ccfcd80adf9e2c954a33add590bb6fff7ef3e2e7c5334970009c63cab7d84adb7e9e0cc3b07a04200f3ea4c2c5dd9a1e1ebb5fe33ceebdde SHA512 36c325ce60c682ce1f5aeef02fc0b457a1e3ce60a2bfcc09e9ce78fddc6ee3452d100ac2a13e1d7454bfd7484d1f1c8d24a95feaa845ca784081dfefd15b2cdc
 DIST prusaslicer-2.2.0.tar.gz 30811929 BLAKE2B cde004add53ee025728d566cb7331cb7b1eac5412e9ad3bee037d13277c24dcdc6024c91f09bb9ef0653a12a3ee7c5cb5cec21e2a00825d185472ea7036e08f5 SHA512 5c8dc5b581e04208a1ae53771ef2607da189ee85aadf501ce1480008f5a6ddb10bb528ddc2608d3f04acd26c583ff895ad4148d6a1397f002292e20098971e1d
-EBUILD prusaslicer-2.2.0.ebuild 1551 BLAKE2B 30358dfa7e6c94ec6f459e7aa3c13ad87345c202bf4981000e3a1be98b37aedf20447d2f3c689866db4dca9fbd9620fee54b93de1dc6a538e1050dda705f05f9 SHA512 afd638ff936b6133be74aa3d7b06f9c0e713bfd8f4ac48e836c9f372bf9367a8f9bab984bd35e262ed54a2ee468f4dc12d8b3b4a73b684719e494e0b304847b6
+EBUILD prusaslicer-2.2.0-r1.ebuild 1553 BLAKE2B 0ef5f8d6f486980b3c3ac48e06c517bdf393efdcbe9621c6e1b36a89a985f9ec2fe4ea4891455672fffb8ae5f4c8ccef5afddf86fa90cff10945fcfdc6338a70 SHA512 f166da2aa6b6b7a8c8f2bbcad4f35d514961e957892b644ab4da41745b77781e3c0fb3465de5e0fcdf55bf87cdf26f9f8f7bfcfe4908dbecca757b17c9b6a46b
 MISC metadata.xml 830 BLAKE2B b0c07af4dcc135e6ce2a67137ff2373ca4f842ac1e2efdff44dad399c487b2d2c7e71bf9932a544d30bc5f0a1e5ccd64830645be647137dda0bb23d00c62575a SHA512 9441df6291bfc1f7c6c85479e8bbe14389e091a43f0bc2ac22eee68544f6868ebd0eb342c7b79316809d0bde1b15684c9ea59cd57252b59643bb735e0b87422c
diff --git a/media-gfx/prusaslicer/prusaslicer-2.2.0.ebuild b/media-gfx/prusaslicer/prusaslicer-2.2.0-r1.ebuild
index 24f2f870cb8d..f7714afa61d0 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.2.0.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.2.0-r1.ebuild
@@ -23,7 +23,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	dev-cpp/eigen:3
 	dev-cpp/tbb
-	>=dev-libs/boost-1.73.0[threads]
+	>=dev-libs/boost-1.73.0:=[threads]
 	dev-libs/cereal
 	dev-libs/expat
 	dev-libs/miniz
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index 4429c64c69a5..fcd6a487ecd9 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -1,3 +1,3 @@
 DIST qrencode-4.1.1.tar.bz2 461562 BLAKE2B ae3abb4a162518c0204d09c9df7434fb348e24c20e790a261841220b0a7165168137d5acbdbc53e40558724eac2e1e21786f11013f384b545d56a1c9caaff61d SHA512 981b3242c213e1b40ac88711912dd8c27ea11f3437d1a04b6b226499a6e991a8f0b3b10f818bcc104812192a1dac4ce05f16ecd847a50cb03d4859b84bad89b8
-EBUILD qrencode-4.1.1.ebuild 798 BLAKE2B 4e4401e03853b7dc705541352950a11f26b4c6d0bf1782c1fe6cef1f30a8cbfa92f6bd11f9cce1e50924e4b7b002f265d72af45d319b8ecffe8e1aab04c89e14 SHA512 9a48a486f86db49f998940767a1af249606c211079fcb7bbf1aec4f86631acb00004b866002a525b8b5ba18f7501e884a69daea55c1ac24546b1d936b405dda2
+EBUILD qrencode-4.1.1.ebuild 799 BLAKE2B 6aae652f09156896e9e746762f80df9e49b5433034f196aed56cfaf145289972806da4a899c7dee8eaeffd5a2e45fcb70c2d4ba344d37dc266d036096f3e593b SHA512 3227db2f0a07d5042be87a7c8e82d5516c6697df41312d78dec6a0c642cc02bd52b8685577c51f8b93173c7212bb8c7080bb057d687ab04ff729359683e3c280
 MISC metadata.xml 370 BLAKE2B af379243b15cc55c2e2c14bd20ec8b9bb41d4fbb6a87938aae5cbc39e17c78ac45b322d946eadec59fc48c13354fd9dfdffea8c2572301d8d4cb86f162d49bdc SHA512 f5987a8aab3b861bbe4961c69d0c72b07826c43320fd383075036ad63a070204c6ed41297b2490b4a14224f5c4269c37c40e5abc9bce4d1c5857e68e98d6428c
diff --git a/media-gfx/qrencode/qrencode-4.1.1.ebuild b/media-gfx/qrencode/qrencode-4.1.1.ebuild
index 0ab8038558c1..94c2c12fd48b 100644
--- a/media-gfx/qrencode/qrencode-4.1.1.ebuild
+++ b/media-gfx/qrencode/qrencode-4.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0/4"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index efbefafb22dc..9e0cc60f9f0b 100644
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@@ -1,4 +1,4 @@
 AUX sam2p-build-fixes.patch 1803 BLAKE2B d9c805da6c46f5457cc6006941a1331f0e46ed8fcadf7c73b9a11debfaa7e2f040beeae42aa9cf316a2df71ffe9d136808a1e9ebeea5c146851057a8addb7bf6 SHA512 fa32011db37a74f746542df82f29e7869412cf8ad93d0b4c3c6e100dda06c254f204671199db0d1abd6134975325cb939f65f0a22457a84a78b6b277411ea2f5
 DIST sam2p-0.49.4_p20190718.tar.gz 1816309 BLAKE2B 3d97e00c2bd6b6c292c051d4eb6b73549d1c82a5bd7be3d6b718d8e9d2e96b47657c184af43fa57c0ca4b2b8c26904fb42508d17f7dda715def7d2082affa8b6 SHA512 1c6074fabca6146e51fe0d5a10c912ec679cf122e10aab7bead9e35e3d007e79773aedb1f627572b1b88cacefe0e7edf72efd71d32c47731723b910667220c51
-EBUILD sam2p-0.49.4_p20190718-r1.ebuild 1217 BLAKE2B 729c4c96c26c8fb2ad9490a963d4d48623f3113502e232506eaa3953e6acaa01724d58a3fefd1fa1825d95ee1a44256a0eb805312a73a2e736e5ef22b0fb75fb SHA512 686c9c27eb9d01bf33eeaca50045c14862751c5efa732d28d75c13a96adc105dc1172714f253196d9b0780be12d774d8695baf1bdc318ec42d9f12f420cef912
+EBUILD sam2p-0.49.4_p20190718-r1.ebuild 1218 BLAKE2B 8ff23f43d569456c80b70b3e8b3296903f4feb7eb4837ffd16fa8033e6fb63306e02a7053d193877f6dae06eeffcff0a2690ed6a260f1e8fa2c07060281faff3 SHA512 200ab229ffbbdb64de5196a5e0e3c36ad0790bbfb95e42c8779f0697b6be67b01d2750d13dfbd22a5da09b2293a979ede57e12e6d68a2a21d5b5c19dc5642ed0
 MISC metadata.xml 373 BLAKE2B a0a62fca7fbcd916d83a6d7fa8f020c333b529ed06492cd8f52a8e04d228714bd53d1283e0b43f5a0c399aafdaf99b5caa5534a0ba54e1bff4958b4f28e899f7 SHA512 2bac0bb931232d7b994f24551d0fedccfcaf69932e4900264857e9ba09a9c32495ab743c1fe930e63adca3b7bc11efdea526982e6e27869033bc17731fa5c7fa
diff --git a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
index 7672df96d2c9..35793f715a14 100644
--- a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pts/sam2p/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE="examples gif"
 RESTRICT="test"
 
diff --git a/media-gfx/scour/Manifest b/media-gfx/scour/Manifest
index 5f32b0bcb4bd..5b8cc5561b83 100644
--- a/media-gfx/scour/Manifest
+++ b/media-gfx/scour/Manifest
@@ -1,3 +1,7 @@
 DIST scour-0.37.tar.gz 95478 BLAKE2B f3037b691b110f84266c742ac1212a8069e0ac1260f818610dfecc7ee64a257d9e0772c7c675e4062286cf4b719fe48782c416a0cb85a136ea315b22da58c460 SHA512 ffc9bd33eec038126d781dac50c89e4275d0d5e14ec2b2247a7727af91ac2ffe5522c69b5386f75df67a0b88f8ed62cb6a2ad47d600e55b123d937ba33e9e501
-EBUILD scour-0.37.ebuild 713 BLAKE2B de315366c00d8a003caf02d9b0720ee167612747e00e588a681130d631d62d24d8d70f49cf7af7d28f1c729593534b4ddb5a10471cac5e3af7115df2a3d3df75 SHA512 27b44365996613023de73b1c984a27ca0571c21b77644cc80dced11bb1ca6c5cb4114c859c74d01e5f73ffa8baad06b0ab9a65cf1d221d1eaad4007cb7976923
-MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
+DIST scour-0.38.1.tar.gz 99693 BLAKE2B 33c344bd68f54352723b769e289c0caf90d8de11e1a5ecc054b24cc2c26845d56602d4201961eebc406c95e6c1ac3334cb8302e800f66572297291b166b98505 SHA512 e25fc0313739c34a940133ddaa24bf07fad348e79d64250f4ee85cab726abf66d9caf9bed44a61ab9c55c8dc8ebe465a887d6192f8405b30fdc2a5985da92fe8
+DIST scour-0.38.2.tar.gz 99910 BLAKE2B 4273287b201ecea64cb2be666bb7de4fbadc3483935515de92ec8dfb39f3b856584e35ac877958efd798bb5840baba4fc4d40a376d2c9f3b0c52a679d7ded6df SHA512 a2c418e25283af399be032322b3af0c336c2392ba361681d4b133b64ebc441ac5beeed2b920f42316cef376c971b230681e306687786a875162d33b659d3fdeb
+EBUILD scour-0.37.ebuild 708 BLAKE2B eb167bbc3cd3d00b6cbca53f6bcefdf792bd47172476b0c0f996378ec52c4e1138e9306c5cb49c872a3731774632d2ed626a827f9714bc2698960d1fe7f0581a SHA512 22579cc30021e688528b9afb44240322946ca97a11bb0a3df876f38911f10fca7a2bbec8c78234aefec61093d83100b498577f02e8f919b8f532dd6cf18e4c0c
+EBUILD scour-0.38.1.ebuild 714 BLAKE2B 1091dd0238b572d62f3808fdaf913140d0bf72011a0a9afc912251fa67860f99f0c65a051a6473d7f4a6a9896fe78208bc4ce4536f64e525088c45954b149257 SHA512 8c27a9ddf4601cb7810d68b4e899435c91affb586acaf75fcbcd92736de2e0a5fa14b057eec7d69042e0b53584ba223c76080b955f7298703f12280c0c48b42b
+EBUILD scour-0.38.2.ebuild 714 BLAKE2B 1091dd0238b572d62f3808fdaf913140d0bf72011a0a9afc912251fa67860f99f0c65a051a6473d7f4a6a9896fe78208bc4ce4536f64e525088c45954b149257 SHA512 8c27a9ddf4601cb7810d68b4e899435c91affb586acaf75fcbcd92736de2e0a5fa14b057eec7d69042e0b53584ba223c76080b955f7298703f12280c0c48b42b
+MISC metadata.xml 193 BLAKE2B 7acb137a1e8618cd92414ef5f9b789a55acfd26c37e7cf00181c62dd8471e217e97670719fd5d6c00834cadb75a5ad8c8cac7fd06c87ea61551d77eb8af1e6e2 SHA512 e34d92e02e423c37397982d7865e381b6eacd66dec5dd4e360697cb8ea326638ca3b2b88c23277f7fa6248ed31081e2938fbe6fc5178ffc52bdc4798c027341b
diff --git a/media-gfx/scour/metadata.xml b/media-gfx/scour/metadata.xml
index 1b2becffa26c..8ae4eabc5162 100644
--- a/media-gfx/scour/metadata.xml
+++ b/media-gfx/scour/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
+  <stabilize-allarches/>
 </pkgmetadata>
diff --git a/media-gfx/scour/scour-0.37.ebuild b/media-gfx/scour/scour-0.37.ebuild
index 14ba7f0dcc4a..678e5f9f8ba7 100644
--- a/media-gfx/scour/scour-0.37.ebuild
+++ b/media-gfx/scour/scour-0.37.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
diff --git a/media-gfx/scour/scour-0.38.1.ebuild b/media-gfx/scour/scour-0.38.1.ebuild
new file mode 100644
index 000000000000..f03ccfc7acb5
--- /dev/null
+++ b/media-gfx/scour/scour-0.38.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Take an SVG file and produce a cleaner and more concise file"
+HOMEPAGE="https://github.com/scour-project/scour"
+SRC_URI="https://github.com/scour-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	"${EPYTHON}" test_scour.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/media-gfx/scour/scour-0.38.2.ebuild b/media-gfx/scour/scour-0.38.2.ebuild
new file mode 100644
index 000000000000..f03ccfc7acb5
--- /dev/null
+++ b/media-gfx/scour/scour-0.38.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Take an SVG file and produce a cleaner and more concise file"
+HOMEPAGE="https://github.com/scour-project/scour"
+SRC_URI="https://github.com/scour-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	"${EPYTHON}" test_scour.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index 2894b9bb6862..781744756644 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -6,6 +6,6 @@ AUX slic3r-1.3.1_pre20200824-boost-1.73.patch 3928 BLAKE2B 24c2e497a7dd80fa4212e
 DIST slic3r-1.3.0.tar.gz 2104094 BLAKE2B 74c58690cf196f89ecff5eec853215c87c648df5a504725fea9f14b0343bca105190de1d63e2e8e76d47fcaf8dbe7b6d26f61b304ce7336412effa1c9a3fba41 SHA512 ff0f7747e166826ff1c53220974ee9d3a217d0e19964dbe4a5fa3e81f262a6810a47632686b7f1b3128384ae05c6f98d8aab980524079bdf9811445fe23a0f0d
 DIST slic3r-1.3.1_pre20200824.tar.gz 2432288 BLAKE2B 37e767b6cb12909ea3a6411532103ea30500903cf3d6a221c2fa3d3109fb733db5d0cb0e9d0eec5033dad9acec2f89258242cdab316ea26392a8386097d9dd38 SHA512 fd7198f7c4a60911b2009f617d37485bf73964a626a53d02bd13baae963d28e74dc2f8314888e7c0fcacb389e0b481f3357c6ea595ac8f92d99f7a228c5cc2b7
 EBUILD slic3r-1.3.0-r3.ebuild 2748 BLAKE2B 823f3341684d705f34faa66ee361c91f0ca1b8916ca9773e5dd6817d06d5b0a4b048abd60f747670531969ca63a673ff228156f6e05f1a1b2c9d85d7e21fb7d3 SHA512 6937adaab0083e646c74fbf4b1c0a7daab521c37c160d5220ef6fb7cdaff44815388a7e449460bd56ab05b80c3714cb0f69e7452fe2ee1460344f4b58f69ecc5
-EBUILD slic3r-1.3.1_pre20200824.ebuild 2751 BLAKE2B 05edb3259beed74f87a666e4d06394e1a86a8fedb80d715e5b3b1e155541304bdbca067b45bba5629b40654ea8946c49c97776f96797f61d9fc7bb7a3733a036 SHA512 1e1b28d2fb58101122b08999c6d5ad76f3739b7efd9e492281bc223a714367e9314d3edd3359f05ee076df2ee0edc64a1759477bcbe48a2aad9e95bca366cf45
+EBUILD slic3r-1.3.1_pre20200824.ebuild 2784 BLAKE2B d3bee26847f0640e90e5df95c8c0f56976e220a3c5fc2c92b94eaf401da28ba14c0c19e04e68509b6e352b6aa6884061ac56feb0c9f42cd82c8d7030d69438cc SHA512 726a2f7f87652a160fbdfa437ab42001c13ea27361cc8818a5a725e2af8bef2a3099f836fa4cd4679eed6c0c0487f9781501b8433d3bd24b980165b44e77d139
 EBUILD slic3r-9999.ebuild 2758 BLAKE2B 2c49616aff2a3964f43d00f74aa014adfb364ee100b4f1dc6c7f86fe4469fa80e9f7eb311f4d9f27fe66a3de84d13c95a966acd7e29e7833a7a72882831f0a41 SHA512 0a77983538340eebcc19d9c3054104a8b4cfae18ac6f3eebe478b9ae99297b8ca5207b16699048b861f0f812892877850224f7b55f343c79ad683040cfd33920
-MISC metadata.xml 797 BLAKE2B bc34024c8f935d21985d572971a3c28b809dd54e8af65092c98f0f18e9229f9e945732bd36e9620c542260d692e3259aebc38de68c9baca8ba9fa67c3c312cc5 SHA512 13a72e511f2341c9cecc05eca767c348c595d77de4a41a154da93d6bcb31710f24bc51a23abefb08719718194ab3961d3f94697ed97319936e5d9ce625f82da5
+MISC metadata.xml 865 BLAKE2B ef9db95f1fa0e777afb72920bc276c2cd120e5a53d9d840131184b70e763e3d32a47e496f7a34a8de1fe6a306e6f811130ce9898be2ab851a6e13fc2288bc360 SHA512 4244599400fc0a1cf5fae81e86248d26701f333f42afb55dfb4c53aa66f6087962470117a6ca0dd0e6e92bf497514c1fc517528aaaab3990599184970b0602de
diff --git a/media-gfx/slic3r/metadata.xml b/media-gfx/slic3r/metadata.xml
index 49968e9fe3d2..c3ce8641cb63 100644
--- a/media-gfx/slic3r/metadata.xml
+++ b/media-gfx/slic3r/metadata.xml
@@ -12,7 +12,8 @@
     <longdescription lang="en">
         Slic3r is the tool you need to convert a 3D model into printing instructions for your 3D printer. It cuts the model into horizontal slices (layers), generates toolpaths to fill them and calculates the amount of material to be extruded.
     </longdescription>
-    <upstream>
-        <remote-id type="github">alexrj/Slic3r</remote-id>
+    <upstream >
+        <bugs-to>https://github.com/slic3r/Slic3r/issues</bugs-to>
+        <remote-id type="github">slic3r/Slic3r</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild b/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild
index c8ca66784afd..c9c2ba374c52 100644
--- a/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild
+++ b/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild
@@ -5,9 +5,11 @@ EAPI=7
 
 inherit desktop eutils perl-module
 
+COMMIT="92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d"
+
 DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
 HOMEPAGE="https://slic3r.org"
-SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/slic3r/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AGPL-3 CC-BY-3.0"
 SLOT="0"
@@ -15,7 +17,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+gui test"
 RESTRICT="!test? ( test )"
 
-# check Build.PL for dependencies
 RDEPEND="!=dev-lang/perl-5.16*
 	>=dev-libs/boost-1.55[threads]
 	dev-perl/Class-XSAccessor
@@ -103,7 +104,7 @@ src_install() {
 	exeinto "${VENDOR_LIB}"/Slic3r
 	doexe slic3r.pl
 
-	dosym "${VENDOR_LIB}/Slic3r/slic3r.pl" /usr/bin/slic3r.pl
+	dosym "${VENDOR_LIB}/Slic3r/slic3r.pl" "${EPREFIX}/usr/bin/slic3r.pl"
 
 	make_desktop_entry "slic3r.pl --gui %F" \
 		Slic3r \
diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest
index 2c27dcb0d717..b954929d745e 100644
--- a/media-gfx/transfig/Manifest
+++ b/media-gfx/transfig/Manifest
@@ -3,5 +3,5 @@ AUX transfig-3.2.5e-gcc10-fno-common.patch 939 BLAKE2B 70af7830470b5ed524d6b5df5
 DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980
 DIST transfig-3.2.5e-gentoo-patchset-r1.tar.bz2 21160 BLAKE2B 093020827fc0636f7549c3b325e4f148aa52407d8e288038dd02012875737523e83e0717662d04e463a01e8cfacfabffaaa4362b5bb1276c4f2052f6653fa26f SHA512 dbef1ca464929de45f3c706e76eb9f324ea9e692cc8c924893926e07ef7d4e0dbe597bcf465a9c7fc9fca22abe0acc6784ab09658a18aeff4ba44921b52b02ff
 DIST transfig.3.2.5e.tar.gz 531256 BLAKE2B 830a97cb801b9cb284f7746a7f4a9645263cc34fd35d904288143d730331901302b12223ba135d8fa936f5ca0eeccacd194bbe2e74dfcfbf0cf4aede273ab507 SHA512 ed1379f1112514d90a4b3eecd3222baad311d804b5090e8e66867ec299e4f9a5f8d83ef8939aa6ecaa85a18143b8fb9b97f78e078ac5eeb934a158c55de6bb1e
-EBUILD transfig-3.2.5e-r1.ebuild 3363 BLAKE2B f0aae4180c95c5db7d6e74098d500cbe217c1bd82d790943ad850fb24f7c5e41fd7d6777f58d3a2c69ebfe16ebc689f06d711aa5659b57427095d42cbbb4a73d SHA512 9e55173b88e516c4ebd5727ac48dd28c01b8cc733d26d84e667385d758774f1d37cf20cc97ad624db378ca5d0f9a64c11f549c5417ab1b5ec1ac22351eb5253e
+EBUILD transfig-3.2.5e-r1.ebuild 3364 BLAKE2B 7119adc188074ce2e556663972dee61e8ce30ff9045b05fc510693f75a02b3a5040728683c6cb84394097402ebe3d80da5346d94fc0ede4ae89a60e37ed59322 SHA512 2edfb807cd8218f7dbe1eb32afc4d091840f5202711e17341ba0c7be374330eb5f1319960d39b9d3b4893c0cd92041a1acb0d21a35ebb415ec21bd2ee95ed3fd
 MISC metadata.xml 238 BLAKE2B 60ff9cbe893ace8f33a3d44ee85a5c73c9bd5553478173bf92c4aa93398ae1140ba28673eb6c7373ac48ede6679546b57ea08b8e676ce5c7a47792a2ba8b3148 SHA512 65918555949ddfef068a9a197dffda69aee483ac55c1b52dcf19376aecf1cb53d8a3fc0931d4ebdbe64ba3341e2a2567d56c2830eb31e6746735449c53a1203c
diff --git a/media-gfx/transfig/transfig-3.2.5e-r1.ebuild b/media-gfx/transfig/transfig-3.2.5e-r1.ebuild
index b45a700dffdb..970a7b845cb4 100644
--- a/media-gfx/transfig/transfig-3.2.5e-r1.ebuild
+++ b/media-gfx/transfig/transfig-3.2.5e-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/mcj/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 RDEPEND="x11-libs/libXpm
 	virtual/jpeg
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 0aad9c529ae3..a34ba5cbd232 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -3,5 +3,7 @@ AUX tuxpaint-0.9.21-LDFLAGS.patch 853 BLAKE2B 2f68ff92e99697342b1046848b489c7281
 AUX tuxpaint-0.9.21-libpng1.5.patch 838 BLAKE2B bbc335be723205a673896279fdbe21c1b817214e54a470b06170c45e9e0ec78563a600b9251675063ba37a5d97fb63e2f13f37f3e50b0ffa3038e7027c0c0599 SHA512 c860141816023bf0d36d7aac33134e213d0dfb111d9e123c4e1470753eb2a34c6e93046def09ee2a566de1f7b6a9aeb1638f408f935ddbf9c62285129bee7d0a
 AUX tuxpaint-0.9.21-underlinking.patch 592 BLAKE2B 1af0a14e4512b748fb2294e9ebe7ce0f72fa7b9df269ff1ac6c7756327f7fa3728ffd2808e888ab035d6f56ddeae20b269a75ef76e1560b4ce391c60372ea02d SHA512 66f0cea73c2e89353bd0085ae9de280ccf197dd3e253e00b05f4c0aeac2e2489ec94e21ad26a41ca09cce717533bd0010c655498cf9267bba6019bf78e2a836f
 DIST tuxpaint-0.9.21.tar.gz 9543034 BLAKE2B 196a743542d72e3dc5cea69b9e66a3baecdde7e3b288cb6759632d2b472f69db8d70ad404737416afe7f2ef4d0c0d21c7b2caadb64ca8d21a909e275ee6fcc46 SHA512 fafd80fe7a5a4d65236c8b5a4f15c644c76180e0e4ed7e774795572b70cc38ddb3273be2a93f041d74a1e536a5a9386c18e51987425ea1a3ff910661e4b0afb3
+DIST tuxpaint-0.9.24.tar.gz 15561675 BLAKE2B 971baec8b7728cbb54a2a45b604c152a9620d0f6a1856cca99482ad0fd76f2a4493aab81f54e10e5da4d81800b0e3506cb73dda0e00510ef966b0c98f8aa5cb4 SHA512 a4ee9eea833f9a6313701a4686f9f276570df84436c68d9a3d04e9448a8ea00833207e1034965e15145be744194c7b9a7d3c91bdfa3489d06a61de84b64cc723
 EBUILD tuxpaint-0.9.21-r2.ebuild 1701 BLAKE2B 8d08863971b633e62022a4264bc3cb22bc20bd9469c35378960f07a0eb606481715ac6924d360648e75f27109283c4fb93de44ab504ee533a2ad6fa9bf06b737 SHA512 53ba744c47ab39730e6db19fea50e44818ed0fee483aa1e4e3a7e1d6cd8b679e1dfd453523956b0cbd447d92808c6c861dcb5109af2470a14fd228eb85d6b945
+EBUILD tuxpaint-0.9.24.ebuild 1711 BLAKE2B efac1148fd43904212bc217e54e586d640a693e18a433105eab6b8d95b65d5dd93aa7a7d93347372b4f85613718843e1c37a54f6ecd20eca0dbfd3fc44c36914 SHA512 0f3e69754ddf21410b9aec5ed2d1a37fbf5810884860379ca8c1c245c56fcf7142688ad3ddb89ce42a7f9ec49f706ca26c71db25635d3dc4288c714662177973
 MISC metadata.xml 618 BLAKE2B 41214f92d2223b2791c7f79b8add3c494549a9f7e4048d17ec74aa13a56c460d3c83df08bd2f93358e8aa4eb6b497a6f3b9e49cd422a6a17a211341bd44e4bdd SHA512 e1be803667ac0a7a2a364f05f08e0514826292f11b3ff261a215864cfa50d61538f4535a83b0903e85c942098155231725db6e664aee4cfca812a36d670c0f72
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
new file mode 100644
index 000000000000..731a8e2d3385
--- /dev/null
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs xdg
+
+DESCRIPTION="Drawing program designed for young children"
+HOMEPAGE="http://www.tuxpaint.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	app-text/libpaper
+	dev-libs/fribidi
+	gnome-base/librsvg:2
+	>=media-libs/libpng-1.2:0=
+	>=media-libs/freetype-2:2
+	media-libs/libsdl
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer
+	media-libs/sdl-pango
+	media-libs/sdl-ttf
+	x11-libs/cairo
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/gperf
+	media-gfx/imagemagick[png]
+	sys-devel/gettext
+"
+
+src_prepare() {
+	xdg_src_prepare
+	sed -i \
+		-e 's|linux_ARCH_INSTALL:=install-xdg|linux_ARCH_INSTALL:=|' \
+		-e "s|linux_PREFIX:=/usr/local|linux_PREFIX:=/usr|" \
+		-e "s:/lib/:/$(get_libdir)/:g" \
+		-e 's:/share/doc/tuxpaint-$(VER_VERSION)/:'"/share/doc/${PF}/:g" \
+		-e '/@gzip -f/d' \
+		-e '/@chmod a+rx,g-w,o-w $(MAN_PREFIX)/d' \
+		-e "s|linux_ARCH_CFLAGS:=|linux_ARCH_CFLAGS:= ${CFLAGS}|" \
+		Makefile || die
+}
+
+src_compile() {
+	# parallel build may break things
+	emake -j1 CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	local file size
+	for file in data/images/icon[0-9]*x[0-9]*.png; do
+		size=${file##*/icon}
+		size=${size%%x*}
+		newicon -s "${size}" "${file}" tux4kids-tuxpaint.png
+	done
+	newmenu src/tuxpaint.desktop tux4kids-tuxpaint.desktop
+	dodoc docs/*.txt
+	dodoc docs/en/*.txt
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if ! has_version "media-gfx/tuxpaint-stamps"; then
+		elog "For additional graphic stamps, you can emerge the"
+		elog "media-gfx/tuxpaint-stamps package."
+	fi
+}
diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest
index f044a1e53c05..f735ae50a7c2 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-5858.patch.bz2 4507 BLAKE2B 10bf1e48b9c822b5fecd040edea05a9fa16bc84d6d8a872a50329bd6b61ae250b489fbf71b19f0453ab5caea0bd7dc821d8c6fbe0fc24a6306d57ce5b34350f9 SHA512 037d2a5305d85d7d6be90c181ee6c39110a86c5f5d77c22453a2933e7d6a43c600f6ffb393015e98f9aab55b0d11291dca482352e1fc74f485578b65b3b84720
 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
+EBUILD valentina-0.6.1-r1.ebuild 2143 BLAKE2B 5f3b0e7038c3809c97ff5ab5ffc139897d68d822a201c792b0d235588f33a97dce4a3b1e260e05b19ce44a39bb2812659a960493febde39029837316220e50c4 SHA512 459aaa638771b0312dce45786b7f7074e74d7cc28115ba5d27080174c0695ffaf3ad00f07e3e5a41fc296b364fbd292943591349ae3326864680a2f3176fc0f5
+EBUILD valentina-9999.ebuild 1945 BLAKE2B ba3f8e84d5654d312910d83d7ba2a2d875477b08e85b140e3e9d9bbf43ae25dcc67b32cc3933dd66bb2201e464b853c935378d70583e7295c3c3269c32311a74 SHA512 10651225c740f0a513c3733b7f6a5417510062a30f08743c0d8e50fa6053ec708c29b7e2ec5740fc8ffbff7333b7a8ec987f758924a9bc25a401fb25dda2bb49
 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 ac59849d9eea..d6decfb393ab 100644
--- a/media-gfx/valentina/valentina-0.6.1-r1.ebuild
+++ b/media-gfx/valentina/valentina-0.6.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit qmake-utils gnome2-utils xdg
+inherit qmake-utils xdg
 
 DESCRIPTION="Cloth patternmaking software"
 HOMEPAGE="https://valentinaproject.bitbucket.io/"
@@ -21,24 +21,25 @@ for LANG in ${LANGS}; do
 	IUSE="${IUSE} l10n_${LANG}"
 done
 
-CDEPEND="
+RDEPEND="
 	app-text/poppler
-	dev-qt/linguist:5
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtopengl
+	dev-qt/qtopengl:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	dev-qt/qtxmlpatterns:5"
-RDEPEND="${CDEPEND}"
 DEPEND="
-	${CDEPEND}
+	${RDEPEND}
 	dev-qt/qttest:5
 "
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
 
 S=${WORKDIR}/${PN}-v${PV}
 
diff --git a/media-gfx/valentina/valentina-9999.ebuild b/media-gfx/valentina/valentina-9999.ebuild
index abe4eee7ed04..5a7446534735 100644
--- a/media-gfx/valentina/valentina-9999.ebuild
+++ b/media-gfx/valentina/valentina-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit qmake-utils gnome2-utils xdg git-r3
+inherit qmake-utils xdg git-r3
 
 DESCRIPTION="Cloth patternmaking software"
 HOMEPAGE="https://gitlab.com/smart-pattern/valentina"
@@ -21,24 +21,25 @@ for LANG in ${LANGS}; do
 	IUSE="${IUSE} l10n_${LANG}"
 done
 
-CDEPEND="
+RDEPEND="
 	app-text/poppler
-	dev-qt/linguist:5
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtopengl
+	dev-qt/qtopengl:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	dev-qt/qtxmlpatterns:5"
-RDEPEND="${CDEPEND}"
 DEPEND="
-	${CDEPEND}
+	${RDEPEND}
 	dev-qt/qttest:5
 "
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
 
 src_configure() {
 	local locales=""
diff --git a/media-gfx/xdot/Manifest b/media-gfx/xdot/Manifest
index fd10c5225b1f..3e4f237a3342 100644
--- a/media-gfx/xdot/Manifest
+++ b/media-gfx/xdot/Manifest
@@ -1,6 +1,6 @@
 DIST xdot-1.1.tar.gz 134215 BLAKE2B e241a4fb1ec69a8613f7813dc159761e6bffb82ea9f58876287d01946f4c93e66e5eef66e6844abb7738979412c2c7d2d26f76bc0563ad0c3c8550d9e8023b47 SHA512 d67c45c8c071013551f79d671a21ce546b680fac5997ba9631a882ffa3c44c15a69949643ed5e8211417006152575a1d99450ccfb6062427521d1e2bc0814f55
 DIST xdot-1.2.tar.gz 136057 BLAKE2B 484a3513ec3d67dbc6e167f171e7f70977ba2472766f25aa7cc088235f99470bfac5fac67368ea53b633320752a928634840ff3dcccc6b96795d3b7c203db922 SHA512 b4d3b15114b982c7c38cc71c0602f6d1ba9874c7315c2b8c4a8a48bf7674e9b38bf19a0d4a2d319acc9a29cf8f177a651d4e213761e88b0b3cb26e95e8a92dda
 EBUILD xdot-1.1.ebuild 1131 BLAKE2B 8cbb12c6cf8e7d4d9ae7f21519be9f512257dabb46f7cb18251c7128e318e1a0c3197df884362206a2a3d8c4ca868d46f9d312a74dfebd5d758905425813b48c SHA512 4d25cb15d1c705217272e38f3215a2b25a3610a84f26752cee69568e3dc8d329099d387d769dde6217262c42dc422f7adfa7a164fa9cf3624439e109e7864cec
-EBUILD xdot-1.2.ebuild 808 BLAKE2B e5c0d62e96490d5703e3eb20b7a6beb6afd1948d583daeb716195497f14210e25835e706a84293a600b34f78cd5297af85590afc1ad24a274e96ec750a27ec14 SHA512 784e9fc8f30e5fb769f3eeef850a894c889b5675d7883c9fab2ed21b86f766bf819920e3f28839a36038b135007635be9e65babd9a670ac91f602254b670692b
+EBUILD xdot-1.2.ebuild 805 BLAKE2B cb3c202e971bb34256bfeda6b4e421a1a524ec66441f89da86cbfda67f43e533eebfbc773593daad1522cf0be3fcad4a8ce621c6a18226348be54c0c2b8a20d0 SHA512 95da5332d30f398803f3e1a1bb72dfb0e89c6768117a60b0056c6e376504bf2aa213ed0bf63add4640bd897d0875624940586a69f4303d1ced0768d9b3000fb7
 EBUILD xdot-9999.ebuild 808 BLAKE2B e5c0d62e96490d5703e3eb20b7a6beb6afd1948d583daeb716195497f14210e25835e706a84293a600b34f78cd5297af85590afc1ad24a274e96ec750a27ec14 SHA512 784e9fc8f30e5fb769f3eeef850a894c889b5675d7883c9fab2ed21b86f766bf819920e3f28839a36038b135007635be9e65babd9a670ac91f602254b670692b
 MISC metadata.xml 398 BLAKE2B 4cfe399944032b70bb0092f9bd2f47b7e1f45cccfa75e2c8eea9dc41ae8456ffb450d5777a77218c22b8f97d57e0bd63956b63c345dba7167b1cfa8cfe3182aa SHA512 7afd30baf3ee9ec5c492659df23168d22c5a07381ed5972c8a02394a57dd332b86b59393b1bd16d2d365d61aa46839aafa78ff0386a92a26563139e31ed01a76
diff --git a/media-gfx/xdot/xdot-1.2.ebuild b/media-gfx/xdot/xdot-1.2.ebuild
index 0b806d655849..19689df035ea 100644
--- a/media-gfx/xdot/xdot-1.2.ebuild
+++ b/media-gfx/xdot/xdot-1.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~x86"
 	MY_P="${MY_PN}-${PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest
index cdade2829dd9..de0d36ae1381 100644
--- a/media-gfx/xfig/Manifest
+++ b/media-gfx/xfig/Manifest
@@ -3,5 +3,5 @@ AUX xfig-3.2.6a-solaris.patch 523 BLAKE2B eeae0cc11ae6e3fd6e8c157648d8663131d0d1
 AUX xfig-3.2.6a-urwfonts.patch 4933 BLAKE2B eb1edf6b30966864dbdf3e932f2cde231ff5777cdc0dff34cf047a169335ba78e493b10817e39aac72221d17d491138c3c28a3b293582d3808255140d5df6762 SHA512 29fea111b6c07f6ea28bc46259c0dc8d20b1bbf86e33d550037744b93d4f4de7ec9c4ea7fa14c5f91a4278848216d183ac841970c798140359e1fc317baac468
 AUX xfig-3.2.7b-ghostscript.patch 615 BLAKE2B 374bf50e43980ce3de7e60bdc0ddad5ded9306dfff137e2b644ed21dd201c34ab5b2c3ae57eaf102585333321e217a9d09936db247592b0d559f6bc5744235ad SHA512 7343433ce589495dcf653df678bf364d190dad28bd49d4608d589ab9fe6e385ac0c1e3ca040dacf75503dce9441fb741500cbb1143e248fe1893542c970e7d86
 DIST xfig-3.2.7b.tar.xz 5059984 BLAKE2B a22465e16019e9887e302ea308e250ad5d7ba0c49aec8f554a73d3b4489d803a05041cb7d267c543a7c0d3b78eac25077c628283f82767932afcc9d9750ce883 SHA512 f3396ebf8a5961909e58b05b60117fd7bbc8c24fabbd47f108eaea9586f4180af572faffe077b1a5dcbf669ebd69b1c2791f302c126dea62a44aa1592de66f73
-EBUILD xfig-3.2.7b.ebuild 1270 BLAKE2B 586982fcc8aeb6ad63677fa6c025dd2acc4faa2d4404c871d14e3a871ed5f6b9738f7893ac592c48f64a9eea436d23ddc16e355519fc5288af8ea505d0368e11 SHA512 c4bdf0ef73c9433b7bed3c8a9657eb12180342adb832ed0b06d96ace55062da4442aed85f610f9534323dddb2ecb56542305e5d00800c6851ac933a349ac9177
+EBUILD xfig-3.2.7b.ebuild 1271 BLAKE2B a8b8fae9ce11be231fee224497895f88d3d25e84e8ed508e90ce8a3fdb666f648a6eee452d386a73b638717fdee782034f369cfabc36e1670a404af8fe12b665 SHA512 f468a30ea9a48d4cb161c289a0773132d16f53946f3be243df445e28134c1520f897bf476bc17966a1ac6bedf20bec6a79d6bee59d1c608ea9f6cf48be193c18
 MISC metadata.xml 238 BLAKE2B 60ff9cbe893ace8f33a3d44ee85a5c73c9bd5553478173bf92c4aa93398ae1140ba28673eb6c7373ac48ede6679546b57ea08b8e676ce5c7a47792a2ba8b3148 SHA512 65918555949ddfef068a9a197dffda69aee483ac55c1b52dcf19376aecf1cb53d8a3fc0931d4ebdbe64ba3341e2a2567d56c2830eb31e6746735449c53a1203c
diff --git a/media-gfx/xfig/xfig-3.2.7b.ebuild b/media-gfx/xfig/xfig-3.2.7b.ebuild
index 3280bd7089f4..31a43f82d3a1 100644
--- a/media-gfx/xfig/xfig-3.2.7b.ebuild
+++ b/media-gfx/xfig/xfig-3.2.7b.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/mcj/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="jpeg nls postscript"
 
 RDEPEND="
diff --git a/media-gfx/xli/Manifest b/media-gfx/xli/Manifest
index 8e5d63df3fcd..1fdf1f43c051 100644
--- a/media-gfx/xli/Manifest
+++ b/media-gfx/xli/Manifest
@@ -3,5 +3,5 @@ AUX xli-1.17.0-fix-scale-zoom.patch 1942 BLAKE2B fefbcbec8d9dba30fc1435fc998e371
 AUX xli-1.17.0-libpng14.patch 241 BLAKE2B c4894ae4a5b879d8ac961d064da80d1518d0ed9a47946c21f9a701b89361e94f0d4d2b05926f6c14be4a558707601e84352bb689847a1f01d83cae6eb25c9d02 SHA512 e5a2de3525198d323ae6c89ab9b0455559761cd4f6b86b719934bc77e31582cd557090766875d97512cb60a42e88653f5dc204dffa9ae1370695c73bfc2231b1
 AUX xli-security-gentoo.diff 6940 BLAKE2B 907fd85a2b248083380ae2210665dd9c251a7d528a93b1e2dffd149827f4900cab54b84b8a0be67c198a73d180cf31f4c8cdd7c4a37a3a8c5b30718babd5b1bf SHA512 b992219eb4b89bfee57429afbf67be6d6a04051b50de6e814c84c1adb209494d2faff15a228b43a992530fbeac83f15a94e9c1988982f98eabf287c26716671e
 DIST xli-2005-02-27.tar.gz 201011 BLAKE2B c16f40368a7c55cb7d31777662e4e9c1515232904df4f6f0e7fdc4daf44fdafaa0a3d9d8298493dac9352fa10eaf5d2984f9e66832ca0bfd07d9e6d551f4dca5 SHA512 132b28396ebf3832dc35ff5fa7c102539ef30a194512fe6577ce1432bb84ecd7b4368e75eaf59f26a806900f63e1bfb9a93487ce1ebe3cfef2199256a783ccf7
-EBUILD xli-1.17.0-r5.ebuild 1962 BLAKE2B 8ce3029218540ae042b0cf1fc716a3c3b970bf7510249cd27ce193d91281eb89a65aaf950dead5816147ce05c85d12cdba2bc5f994522f16a159739d3c915d3f SHA512 f8be77b1d95c5a4b2e169fdd63b1b69e7494bb99614a24b349c23141d7f301968efb1ef220bc2d0db4fab5417c01b28c1b2e360ab7eeb7583f83fa741b2305b5
+EBUILD xli-1.17.0-r5.ebuild 1963 BLAKE2B a32ab627476c4f3776ce491de7ee2d840415d9f02da770a4294b0c3c7109541407f22b09091ed3e7bc620d0031e5d8d4c24665cb41c0a02be133483f244118dc SHA512 7cea668c01fcd5a484e38dda1b7ed0ed7acc52a06f6e3ea567e0eb242c6891499d137bfac72026e18a2ebf53aa140d50cc097709918ba6165cab6f1eb791f0ba
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/media-gfx/xli/xli-1.17.0-r5.ebuild b/media-gfx/xli/xli-1.17.0-r5.ebuild
index 7d885d6770dc..58bd30a92ada 100644
--- a/media-gfx/xli/xli-1.17.0-r5.ebuild
+++ b/media-gfx/xli/xli-1.17.0-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://pantransit.reptiles.org/prog/xli/xli-${SNAPSHOT}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 RDEPEND="app-arch/bzip2
 	>=media-libs/libpng-1.0.5
diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest
index 360ff0278fb3..4b9388b119f3 100644
--- a/media-gfx/xloadimage/Manifest
+++ b/media-gfx/xloadimage/Manifest
@@ -8,5 +8,5 @@ AUX xloadimage-4.1-zio-shell-meta-char.diff 1372 BLAKE2B 1c960ba7ae4da62eedcdfc2
 AUX xloadimage-gentoo.patch 8956 BLAKE2B 9834cb47e16fb20f970e9d33a6e42fef09d5a3d3cae3f5ab0db5c76661acb7c67a20115f4069bc2769b6d9f54acf4adea27e27b79495d74a77644db5281beba8 SHA512 8eba3107d81f0dc6caf749e9a9889f1662e5d1004e480a9a170533f3ee00c6f9f11d3c2008655322242ab61f31b676406fd44b97d83e4ce93b8f68a12397830b
 DIST xloadimage-4.1-gentoo-r1.diff.bz2 41535 BLAKE2B 77cdbb2e6d5dda6084aae2831bcb8750a027f59a673f5a1f8eeb61385bd21243d640bd13a3be7fb24d2ce2cb475a05cb04c91c2b53977c61fb3aa4416e67e112 SHA512 a1a52d576eb68c44e5ff3b68a6bd87cd9b8f21f6fa8edee2d7df2329002d40f6513df6c04ecd57f66018583d0251019bd02e15756dac705b8c9cb8470cb386e3
 DIST xloadimage.4.1.tar.gz 596021 BLAKE2B 3c22facf05167d1836c21243799d8f66c211e44d659b4397668ed604cdd82b3bd8f11ab7b3be5e87c59a9b3aa8569d0d3d2e474b572c3bca07b6437b293014bf SHA512 2c91699c8ef07c101ff9b458708ace01cab2979a5e88cf8a4e47ec971f7b4cb5571108afa3e53271ade4e8ccfdcf72ef9e2e09edfc0be6b8afaba50847aa0586
-EBUILD xloadimage-4.1-r12.ebuild 2504 BLAKE2B 9a14aeed6e18ba4d0a4037806bba53a66e0666c26494f15ceddb66baacb0a1791a0e7234a4c8af67180c65775356da87a053cc58fb7d7cdf52d9c4f2cce37874 SHA512 8b15c89bdbf40381dda09f0c1efd4f64716f1408e468775f248257fb45a94356d81c8e359f3a4c6e83da37be7694ae550de13bcbb7f97fb8f9333ceadff8314b
+EBUILD xloadimage-4.1-r12.ebuild 2505 BLAKE2B 78addb3d315fbbf4157778005f20ee8a6e0261fa925f2e49562ae9ee04c2b862b8edac29a7ccffe552a07805aa457c89dc71c03ddc4f3da341cae26a06f2772a SHA512 e7738fedf78e9b7d0132978d0c23ec170d07000b1b4faed1acce70eb8f79cfeb422aa6e2f646b4220072755d1914b01f5aa026ca1591679222d230e0946cc721
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
index 15cf216466d5..08077f10cde1 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="tiff jpeg png"
 
 RDEPEND="x11-libs/libX11
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index 04b8190d74d1..9b043a88083e 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -8,5 +8,5 @@ AUX xv-3.10a-wformat-security.patch 519 BLAKE2B 7b0ba8ee6dc33af787040e72fdfd4cf1
 DIST xv-3.10a-jumbo-patches-20070520.tar.gz 1363802 BLAKE2B 1a9f77b950dfa817aa861d9b2b6898d6e378b4a61a57c746a8822793a8e11e54165faf859e073ef99c9fbea5aa0c4c8caa4608ef03f553003b779a4bf59c3ab6 SHA512 e2ac5a3b4d743bf142c162b00815dd9d8dcaf345d0649016b2c6441fe2329879471b19453808e677c1a0b8eeb3468295dba160b1f30eacb2a7a9d8524ce03e75
 DIST xv-3.10a.png.bz2 3082 BLAKE2B 05f56053fc0a77bba155db306ae181f5404bced3b2c22a33b3a0a0750b84461ffec98934d3dbabd764fbb6ec95ce2851f4cf3959682a315fe6e6653cbaaa5ae4 SHA512 41e81c34e74a034292c2a8f525d1452614a2b42e980a1a2c93e3fcf990db528853d633496815e5fb2c897a780a2da171af590f436e2c7ef181eea00eb6922e9b
 DIST xv-3.10a.tar.gz 2259124 BLAKE2B 42cea578a879c819be8f42ffb1d247643904d8b462a4d6faa208185e49566798605c89006cbc190725fa6356b87da3375cf04d2ba86b559419cf8f7471c867e5 SHA512 5b8c5890503e2796638921cabae8967e458c73e332acea8561b1025ed13c771bc44c0e309b4592852e33726eeaa9784f933d1312073b0ba2e0b8c0cedabcaa3f
-EBUILD xv-3.10a-r19.ebuild 2452 BLAKE2B cc0b6912bd6dea69448b09c3d59d8456019350b5f59f4e8e8fb1f6a044cd7bef8a07fb5fbb6f3e093285f389c3b5ecc55b7bc4c6a5dbf882c669a4998607bddf SHA512 543fb3c725a155a829a81a053596ea46955ed8c5402760ff8fd8d0ead3b392254797bb585910f2d1fefbefbc15ab32ed9abe098e3c3abdbc39fcc14530ca603f
+EBUILD xv-3.10a-r19.ebuild 2453 BLAKE2B 121f3393b4b12c6cd1376eccd78a7acc8cda6c8860258c1b62a869878e4b743df06353cd93a4378f532ff6377e269072de805ebfe69758b7f7dc2b34531f44a3 SHA512 ded1eca8c5fc2774819331db81d605bde931befd79ecf484e3f6acbc838fdd88502356b90fb5ffaf4f707d7c7150c97225b3ffca5a4a797a36c4355715fcec0f
 MISC metadata.xml 249 BLAKE2B a10cceeac3a30f80ec870c8976e45bd2e0326e472b03cdfbe85b639f95dc7cdc8f372e5efafa5c9c8e679e77a24d5507f3a8f0dc97f2207252e280b3bb936662 SHA512 2250a3bff9eebe0962c70d89aed4f7e95dd3d33b5c3171f02bcf99d972d5242ec04b25d73b3ffd99ce96a641cf8eb78befb41941a352f4ff754702712b4e937d
diff --git a/media-gfx/xv/xv-3.10a-r19.ebuild b/media-gfx/xv/xv-3.10a-r19.ebuild
index c0755daeb2c1..1a71a973d04e 100644
--- a/media-gfx/xv/xv-3.10a-r19.ebuild
+++ b/media-gfx/xv/xv-3.10a-r19.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.gz
 
 LICENSE="xv"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="jpeg tiff png"
 
 DEPEND="x11-libs/libXt
diff --git a/media-gfx/yafaray/Manifest b/media-gfx/yafaray/Manifest
index 0e541819531e..cff6e6882a03 100644
--- a/media-gfx/yafaray/Manifest
+++ b/media-gfx/yafaray/Manifest
@@ -1,4 +1,4 @@
 AUX yafaray-3.4.1-0001-Respect-user-pre-defined-CXXFLAGS.patch 1160 BLAKE2B 2145d744a269b25dad27b78afb52baec14b23c7a90041263b907020145b51482165ccd4dd833c537dadd4ca0074cdd90fefb642d8fb3bb5853d37164f5e3f2eb SHA512 d6b327c887badb28685277487fcb76917206781aa5e1d6ebd0f6832a28d573945bca2cce5a0e856a1b573c103a696cf7b7b10a91bb6135649249e8ca143ff8fc
 DIST yafaray-core-3.4.1.tar.gz 1136077 BLAKE2B a2ce3945f52315084ee744ff4a6733255018196f0000ca6b1786fbd2ec49ade64cb62e98dfba95dca4dec361f47235d59a8c9bd95ee7d095214fc0afbdcb1ee4 SHA512 a9116273fbc2aaaadbc38a65b1eaaa502070ff06f8a2929e880714a9db57188e65cf319c20a3f96e08146af36a67aea139709a633eb024be65319a64330e6f68
 EBUILD yafaray-3.4.1.ebuild 3072 BLAKE2B 99207e9b3c330cc717af5649b951db81cedc259f27a18de0dd1092c9f895aa0ff1feec2cfc8eab2b24c32836b642fa2a0e5c85597f787ff2a35228f556189f23 SHA512 c3164f5fe95c9488a3dbd71bf81e724394dbc71a209153a89fbebff7345fe9102f5c2d8a316145b8359b868ebfd53120fd42de13b835dbac61421dd71d218cc0
-MISC metadata.xml 1058 BLAKE2B 6eba6592abe559d29863843dcbc69648b3789d3ce7f031d174db306ce001a381e9cb04232a40ac0ad167e21527a195bfab8e0603bd3d9be8782a54cc02c9b8d3 SHA512 f864ed542ec6cabe36bf92ae2dbb3f56cb0a38ab5967f032b7a1c8cd1d8b4ef9ceb2529448dce48d2397b1f25e0ceb5d657c1ec09ac8fc34d43131b43b4528cb
+MISC metadata.xml 1040 BLAKE2B ab9f09e8bc2c6ee6a4abcc94d70bfec3e64707ae65dbba76ea697e3f3a741c09f4f5ed7efdb5276dbe49e8fc9a73b55a6d1df305b959653006ed84457af1f334 SHA512 fa59f31692d42bb16139f5fb7948bf117a040203047dc2824c48cc56177545e0bdb87004836ba08a8ffd6f1c7f43f345e10064c648687a355679f913f1917b43
diff --git a/media-gfx/yafaray/metadata.xml b/media-gfx/yafaray/metadata.xml
index 24519079a75e..f4ad58bed544 100644
--- a/media-gfx/yafaray/metadata.xml
+++ b/media-gfx/yafaray/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
-		<description>Proxy Maintainer Team</description>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription lang="en">
 		YafaRay is a raytracing open source render engine. Raytracing is a rendering technique for generating realistic images by tracing the path of light through a 3D scene.
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
commit	129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree	53bf797418ac5e9b99c41ca0382c87b82421e5de /media-gfx
parent	441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)