gentoo resync : 20.03.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
commit: 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree: 356496503d52354aa6d9f2d36126302fed5f3a73 /media-gfx
parent: fcc5224904648a8e6eb528d7603154160a20022f (diff)
234 files changed, 6741 insertions, 2626 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 26b909eeb063..04868939e596 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/ahoviewer/Manifest b/media-gfx/ahoviewer/Manifest
index cabfb0d72ba6..307bb652f2bc 100644
--- a/media-gfx/ahoviewer/Manifest
+++ b/media-gfx/ahoviewer/Manifest
@@ -1,7 +1,3 @@
-DIST ahoviewer-2.0.0_beta.tar.gz 488564 BLAKE2B 325d9689e13fc2847d00be3e77eb5cd8234c98d0c516d3427d4275beaf6cc08ba8a054dfa047ec5e00e4693f8b14f730694358dc22a15e8d503bf67f232c1772 SHA512 6a38da0810c93886233a41d1fdc3f9779158c54b328c13cb2eea9e921057913fd3bb48370b95526f2bc8635ca4ba0967e7edeb95052ea689b05fb8555d826cf0
-DIST ahoviewer-2.0.0_pre20211126.tar.gz 502643 BLAKE2B fdfb4def35f6f1024ae47c114395f45e86abfb23a54275abf98a16bc8b7bae879e57034401b5effb340a2855af64b66ae09d86bcbbdd50e39f43f4f300232e2f SHA512 4facaa1938308e82b1743cb97186925b18ee843456a75bb2639e303e35e40fbee4b6bdebf1aa977fed03b2a4cf6a2b558c488720156db5f821da30578362303f
 DIST ahoviewer-2.0.0_pre20220124.tar.gz 502882 BLAKE2B 9476c42dd36615f9106b6db0386b20c8922092fe68674f7a4439ca64458c00e3c1943a7402aed752ec91395e0684ce7cd89b0ac2de7f198edb39ebccef782fbd SHA512 0cf01c7011ae506fcff9700c46a06a57fdccc8f8a274d86a8438c926f0513e4e5851bdb37cb6ee7f8b673894938aafa7c2cb485773db04b977ec5f8b8634da3e
-EBUILD ahoviewer-2.0.0_beta.ebuild 1975 BLAKE2B f4ded42ed2acce53d6d72872e5f108f76bb58be7ac884b8b4db2943c949d2da3c270d956beb290f3fcebaf1e59466a7a2997a25bdb03f2ead3d4e7f1d874b92d SHA512 20eaa9a7b32ace00b176cf197cc2ed6da64268ba4f083512a7753bf32b3305a9922dbdf70e3b97792462830ff40cb1267ac2b496d0958dbc857082c15b895c5e
-EBUILD ahoviewer-2.0.0_pre20211126.ebuild 1862 BLAKE2B 8e556b630ead24875cd9a52611955c9686cb10555c2b78ee319718b0faffdda9408e15a8ce82639cfaaae900ff5beb9df0514b3b321be8104537b0c88dc0f68d SHA512 bbd04b293aa61d4855feee830284900eaad9b0d47a2da5f5ea8a2e82898bbf770c63b9d6e1ac75a1b242110f923748e17c80aeadc06be3f5a282e0fb2f12c4e2
-EBUILD ahoviewer-2.0.0_pre20220124.ebuild 1864 BLAKE2B 2ade906efc1b0bacab5bfc38654423978686b3a0dca849eab8cc74e243b218765e1660084c6bd1dbce840cb4a031379e44f76d768bad528a1bc5aab742d1eb79 SHA512 d3fb725e65b8b8f0a193939f819d2607d8511dd856fa16b13f31ce4342b3a1a6ab00fc6487e18f33537ceb0ca566bc44bc60d2c0e641e27b891ebddf316668e1
+EBUILD ahoviewer-2.0.0_pre20220124.ebuild 1862 BLAKE2B d0e14c5cbef7793057870b19d7fbd555449fa2f58ee6111770935da3ce0b7e495da9a40e341e6269b7cdf1eab45e72dbf9fa8d6e47e757c638a410cfd5043a5d SHA512 13ce96e650cadab10b0e6f6e33178efe37df14ed18f0fdb22cfea8c26eafeeeac4dcf88748c9687c154345cc8fe915a3d24ab65f95350867f7dce8a486807cfe
 MISC metadata.xml 432 BLAKE2B 865f9803f9a469564f6d4fee9bffa7eb94d268db2358281cc8b744f5de2b88dc9abcd69b8610113c797bd0eeb574985d3775f9259884f57cbe9eda47aa051ac7 SHA512 60ecc403ad49d4a774ec98ef8850041f358d1903d345eaf63d7429e6c96e11a34e3dc5ed7e1470fb851fbdef9b3b2d965d9d04303c1b8f61691857354cca5924
diff --git a/media-gfx/ahoviewer/ahoviewer-2.0.0_beta.ebuild b/media-gfx/ahoviewer/ahoviewer-2.0.0_beta.ebuild
deleted file mode 100644
index a1ed34a9932e..000000000000
--- a/media-gfx/ahoviewer/ahoviewer-2.0.0_beta.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg
-
-MY_PV="$(ver_rs 3 -)"
-
-DESCRIPTION="A GTK image viewer, manga reader, and booru browser"
-HOMEPAGE="https://github.com/ahodesuka/ahoviewer"
-SRC_URI="https://github.com/ahodesuka/ahoviewer/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnome-keyring gnutls +gstreamer plugins +rar +ssl +zip"
-
-DEPEND="dev-cpp/glibmm:=
-	dev-cpp/gtkmm:3.0=
-	dev-libs/libconfig:=[cxx]
-	dev-libs/libsigc++:2=
-	dev-libs/libxml2:2=
-	media-libs/libnsgif
-	net-misc/curl
-	x11-libs/gtk+:3
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? (
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gstreamer:1.0
-	)
-	plugins? ( dev-libs/libpeas )
-	rar? ( app-arch/unrar:= )
-	ssl? (
-		gnutls? (
-			dev-libs/libgcrypt:=
-			net-libs/gnutls:=
-			net-misc/curl[curl_ssl_gnutls]
-		)
-		!gnutls? (
-			dev-libs/openssl:=
-			net-misc/curl[curl_ssl_openssl]
-		)
-	)
-	zip? ( dev-libs/libzip )
-"
-RDEPEND="${DEPEND}
-	gstreamer? (
-		media-libs/gst-plugins-base:1.0[X]
-		media-libs/gst-plugins-good:1.0
-		|| (
-			media-plugins/gst-plugins-vpx
-			media-plugins/gst-plugins-libav
-		)
-	)"
-
-# In future (-beta), pull https://github.com/ahodesuka/ahoviewer-plugins
-# directly via SRC_URI="plugins? ( )", or add as a separate package. It
-# depends on how the plugins are handled.
-#PDEPEND="plugins? ( x11-misc/ahoviewer-plugins )"
-
-S="${WORKDIR}/ahoviewer-${MY_PV}"
-
-src_prepare() {
-	default
-
-	# Hopefully related to beta/git, incomplete release.
-	cat <<- EOF > src/version.h || die
-		#ifndef _VERSION_H_
-		#define AHOVIEWER_VERSION "${MY_PV}"
-		extern const char *const ahoviewer_version;
-		#endif // _VERSION_H_
-	EOF
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature gnome-keyring libsecret)
-		$(meson_feature gstreamer)
-		$(meson_feature plugins libpeas)
-		$(meson_feature rar libunrar)
-		$(meson_feature zip libzip)
-	)
-
-	meson_src_configure
-}
diff --git a/media-gfx/ahoviewer/ahoviewer-2.0.0_pre20211126.ebuild b/media-gfx/ahoviewer/ahoviewer-2.0.0_pre20211126.ebuild
deleted file mode 100644
index 881b2ea5efd6..000000000000
--- a/media-gfx/ahoviewer/ahoviewer-2.0.0_pre20211126.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson xdg
-
-MY_COMMIT="92f2b2f57c8a6ebf0d10cb95bfc9b685bf98be5c"
-
-DESCRIPTION="A GTK image viewer, manga reader, and booru browser"
-HOMEPAGE="https://github.com/ahodesuka/ahoviewer"
-SRC_URI="https://github.com/ahodesuka/ahoviewer/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnome-keyring gnutls +gstreamer plugins +rar +ssl +zip"
-
-DEPEND="dev-cpp/atkmm:0
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:3.0
-	dev-cpp/pangomm:1.4
-	dev-libs/glib:2
-	dev-libs/libconfig:=[cxx]
-	dev-libs/libsigc++:2
-	dev-libs/libxml2:2
-	media-libs/libnsgif
-	net-misc/curl
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? (
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gstreamer:1.0
-	)
-	plugins? (
-		dev-libs/gobject-introspection
-		dev-libs/libpeas
-	)
-	rar? ( app-arch/unrar:= )
-	ssl? (
-		gnutls? (
-			dev-libs/libgcrypt:=
-			net-libs/gnutls:=
-			net-misc/curl[curl_ssl_gnutls]
-		)
-		!gnutls? (
-			dev-libs/openssl:=
-			net-misc/curl[curl_ssl_openssl]
-		)
-	)
-	zip? ( dev-libs/libzip:= )
-"
-RDEPEND="${DEPEND}
-	gstreamer? (
-		media-libs/gst-plugins-base:1.0[X]
-		media-libs/gst-plugins-good:1.0
-		|| (
-			media-plugins/gst-plugins-vpx
-			media-plugins/gst-plugins-libav
-		)
-	)"
-
-# In future (-beta), pull https://github.com/ahodesuka/ahoviewer-plugins
-# directly via SRC_URI="plugins? ( )", or add as a separate package. It
-# depends on how the plugins are handled.
-#PDEPEND="plugins? ( x11-misc/ahoviewer-plugins )"
-
-S="${WORKDIR}/ahoviewer-${MY_COMMIT}"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature gnome-keyring libsecret)
-		$(meson_feature gstreamer)
-		$(meson_feature plugins libpeas)
-		$(meson_feature rar libunrar)
-		$(meson_feature zip libzip)
-	)
-
-	meson_src_configure
-}
diff --git a/media-gfx/ahoviewer/ahoviewer-2.0.0_pre20220124.ebuild b/media-gfx/ahoviewer/ahoviewer-2.0.0_pre20220124.ebuild
index 582df8de4359..3fb63efcf620 100644
--- a/media-gfx/ahoviewer/ahoviewer-2.0.0_pre20220124.ebuild
+++ b/media-gfx/ahoviewer/ahoviewer-2.0.0_pre20220124.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ahodesuka/ahoviewer/archive/${MY_COMMIT}.tar.gz -> $
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnome-keyring gnutls +gstreamer plugins +rar +ssl +zip"
 
 DEPEND="dev-cpp/atkmm:0
diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index c6049fa7bec9..4c4ecdb30436 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -1,7 +1,5 @@
 AUX alembic-1.8.0-0001-set-correct-libdir.patch 1879 BLAKE2B 2cbcdfee02094745544ebc67e467e452d225a8a9445481f984eaadf399544bfac24a410d8a7f4137f4b73d038e7f5eaf08ea492aa7bb95f15fede87fef081eb6 SHA512 d1ec399048a6baebdbd4eadb5be55281693455d0280dd3ff86d8747d2aaf52eede4c6848d71362e17de2d23d063357ff983bb3a8ecad28e81303f72a76f48a02
 AUX alembic-1.8.3-0001-find-py-ilmbase-in-config-mode.patch 4247 BLAKE2B 4c921f4774e20ec9739fd6afd0b6e4bdd7fe4cdf3374ef63d9c7ba1ac8d7255ca0bbca4c248465da7445f2b08c72e9425280e44dd64edec95088291c13dec0ed SHA512 45caa1fc850cf14eacef80f9271a07a8c502e1a098bb2cbdbd84bae0f9d80c819a4c058b5cb0d67f848eecd52de4cf9802f12e1c651c0bc2b826a9e56959a913
-DIST alembic-1.8.2.tar.gz 861796 BLAKE2B 9ea2dea33b3116331dd02802055e8db7faa736bc2674e6b30209a9e178877523d9f14516b35729eaf6fc348b89367e9830ca1b998a8c7d10766b9b2f265b97d8 SHA512 23fec3d51cfd8ac8bc02749550de53a7b699ebe67654336864a8208a6a1d4f69e8e1a2c8e07832665c203788cbabbb65f346582741bac10ceb0d56c16d6b4217
 DIST alembic-1.8.3.tar.gz 862221 BLAKE2B 81639b0968dbcaac0096eac83385b7d6b1dc27b4b1652ede8cf6b6cf3aa3eea3c6f5e53f033708b61f79d99ebfaa766a9cac3345a043d6cc0ba6d6c29dcb9ed0 SHA512 0049c72d93e66e12d704d27e7ba36cd9c718667f2ce4f7baa1bee1613ed88ba53abea98f457e14f7f2144cb353810a4108d26c7dd1a1543ec2af576272f19036
-EBUILD alembic-1.8.2.ebuild 1234 BLAKE2B 8fc18141031dcbf54bef2d0323c4a4e7f7315a7f2be9297c2af1683ac073530ae34271c97fb7d2f4961afb05baf5625bdb680caaf64f5da25cdc9dfdbaa55707 SHA512 7d2f20abc3d8d656dfe9b41528bf9ed494accd9678b46fd695637df4baa6bf116b770f21a1494f58370190f2af8ec20876b3e5639e9bd5f67bf15b055fdd9cfb
-EBUILD alembic-1.8.3-r1.ebuild 1721 BLAKE2B f8855a372c19dbdf6b1724936ecdcbc7ecf81e96391ee9fc48345bf7031a48b54b61cee12931ebbfd338529686b4bb1c0e2731306555bc4de0490c40cc92f404 SHA512 a44895fc2461407198b8108333564d362a0a907d20c6690ad29023c9bb3a6f310fe7e5c312321a4ce84d4eb92f08dd978e238fbe36c54ee6390126676325548b
+EBUILD alembic-1.8.3-r2.ebuild 1606 BLAKE2B ad0a0436be060eb8ef44cfd7873058b55c7577a5f205c827c017bf07c12585178c188a0c2543993f378fc3b98a39fe5f18e5d4c7aa9295e99c012b793677131d SHA512 bbe8cc6aa020e1e3570fa13e0c42638b690eb66c1a0d9b85d0551f324642d077dbf3fd90822151514f393ca5b3ba8dc3cc435752d155244f6927b94892c33660
 MISC metadata.xml 824 BLAKE2B 55b10435d032292b05af14bde6a69772eaf7993bd1686a0f1489313624d14b3572037d6ba7e9caab7bb69ed36cb61d5f1518d6c945e9e7c3853dcde1e80e3e0d SHA512 55c878337d8297cd8d811443d8821835e4ee5096364014bc43c798a34645076dc47ec405bdfd3c62a03481f8539cca9fadd8f7f15a2bb98471c9f7d0d57450a1
diff --git a/media-gfx/alembic/alembic-1.8.2.ebuild b/media-gfx/alembic/alembic-1.8.2.ebuild
deleted file mode 100644
index 70bbe084164e..000000000000
--- a/media-gfx/alembic/alembic-1.8.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Open framework for storing and sharing scene data"
-HOMEPAGE="https://www.alembic.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-# either pyilmbase or imath need to be keyworded for arm{,64} to re-add
-# python / pyalembic support
-IUSE="examples hdf5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	|| (
-		>=dev-libs/imath-3.0.1
-		>=media-libs/ilmbase-2.5.5
-	)
-	hdf5? (
-		>=sci-libs/hdf5-1.10.2:=[zlib(+)]
-		>=sys-libs/zlib-1.2.11-r1
-	)
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-1.8.0-0001-set-correct-libdir.patch" )
-
-DOCS=( ACKNOWLEDGEMENTS.txt FEEDBACK.txt NEWS.txt README.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-DALEMBIC_BUILD_LIBS=ON
-		-DALEMBIC_SHARED_LIBS=ON
-		# currently does nothing but require doxygen
-		-DDOCS_PATH=OFF
-		-DUSE_ARNOLD=OFF
-		-DUSE_BINARIES=ON
-		-DUSE_EXAMPLES=$(usex examples)
-		-DUSE_HDF5=$(usex hdf5)
-		-DUSE_MAYA=OFF
-		-DUSE_PRMAN=OFF
-		# TODO: needs imath keyworded for arm{,64}
-		-DUSE_PYALEMBIC=OFF
-		-DUSE_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/media-gfx/alembic/alembic-1.8.3-r1.ebuild b/media-gfx/alembic/alembic-1.8.3-r2.ebuild
index 909f899aa86f..55cf6d2bd757 100644
--- a/media-gfx/alembic/alembic-1.8.3-r1.ebuild
+++ b/media-gfx/alembic/alembic-1.8.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-single-r1
 
@@ -20,8 +20,8 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=media-libs/ilmbase-2.5.5:=
-	python? ( >=dev-python/pyilmbase-2.5.5[${PYTHON_SINGLE_USEDEP}] )
+	dev-libs/imath:=
+	python? ( dev-libs/imath:=[python,${PYTHON_SINGLE_USEDEP}] )
 	hdf5? (
 		>=sci-libs/hdf5-1.10.2:=[zlib(+)]
 		>=sys-libs/zlib-1.2.11-r1
@@ -45,10 +45,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		# Force falling back to ilmbase for now
-		# bug #818232
-		-DCMAKE_DISABLE_FIND_PACKAGE_Imath=ON
-
 		-DALEMBIC_BUILD_LIBS=ON
 		-DALEMBIC_SHARED_LIBS=ON
 		# currently does nothing but require doxygen
diff --git a/media-gfx/ansilove/Manifest b/media-gfx/ansilove/Manifest
index a570e58eedd1..f2b7957670dd 100644
--- a/media-gfx/ansilove/Manifest
+++ b/media-gfx/ansilove/Manifest
@@ -1,4 +1,6 @@
 DIST ansilove-4.1.5.tar.gz 41325 BLAKE2B fa0943406b5a905f30fd114ed9760a37da1bcb7bd8bb7575272d1cffadaf0302650c65af64e97f911cff7b9eb4283bedd6fc0fc13c9aa5be88c582c44925c30b SHA512 a84253b07d82b4d0598cf6936115476933636a978805fe243a671bbdbe15d0e589b45f9e4d7b6137e5f7ab22559b9d1a84a0508db5226ccc17e20687e190e553
-EBUILD ansilove-4.1.5.ebuild 655 BLAKE2B 7cc834fed7e11c03823a0d183b83bdf7c317824a621fe231479f8db015a5dc7f38ee764126ff9bc20492332e7171dc4cc7874baaee12e7ae5eced7bde8529cad SHA512 7b358acee93c27d8ade686d6d934fdf36a6f97a0dacde8eafadf4aac790813d13005f615075e5d10592182e2f3de21ad3adca0f968de7744b240e99fba8c5279
-EBUILD ansilove-9999.ebuild 643 BLAKE2B 50f0657591a07a80fb4390d0d3bb7a3bf29c6f0875bb32ef05eda7ffcf8b1e1a6004bbd58256884d8fd7d058deb1e47540a530e3f65b6903abe3008c0dccfc8b SHA512 17f01ca575484ec8c383272254b5e0526faff6e39211d46954423e9412364fac15f6100ee16935f37ce1f6e13bda7e8e6d566f5169cb5f070aadf48cad960e99
-MISC metadata.xml 1126 BLAKE2B e3ad801523284ff073a1fd847c9638c8217132d44b09ce0a3efb7aab8857afc744b2a949e9650d866e2d125988fa0931bf518467802d3f865d041dade8bdeba3 SHA512 6ec0008f1cf002663a8c159b50dd9fec63a3bea1a36f4225d1c98caaa29b9941663250e769a33e765b15fa55704998cf6f01f097f78ce9e2fc10b028a9d0ba3e
+DIST ansilove-4.1.6.tar.gz 40842 BLAKE2B 6445c1bf024b4f8210ec09d55eb8dd23f252aa3e727aa02b7afc7c6731833c9140839ba478e52ef487d3285fc6691d70a443939534279af640f5d15993e7f441 SHA512 9cacfcccd2a857841e82cede64efe84413d3467849c49b9f38eea8d2be5447bdf5a9f8432d96bfbe9e5ced1eda3cf1e3a5a7375c0d32f52b6b4e44c7002c20ba
+EBUILD ansilove-4.1.5.ebuild 660 BLAKE2B d4b052a4476e14a2d200eaa88ba0e76c8ddf412d3098b8233daca145a870bb566d36206ba907eed4891d0a1a30f35bb6ea6f2ddda0aff82cfe29fe85061d0fcc SHA512 ebe54c946a2343e8b4074a0156f474871c2483b11b10aa67b5a2678626b5d823a2b92c33ad8e220fb43309575e77db1dfc50f138ca1c7e6bc55e95555a009afb
+EBUILD ansilove-4.1.6.ebuild 660 BLAKE2B d4b052a4476e14a2d200eaa88ba0e76c8ddf412d3098b8233daca145a870bb566d36206ba907eed4891d0a1a30f35bb6ea6f2ddda0aff82cfe29fe85061d0fcc SHA512 ebe54c946a2343e8b4074a0156f474871c2483b11b10aa67b5a2678626b5d823a2b92c33ad8e220fb43309575e77db1dfc50f138ca1c7e6bc55e95555a009afb
+EBUILD ansilove-9999.ebuild 660 BLAKE2B d4b052a4476e14a2d200eaa88ba0e76c8ddf412d3098b8233daca145a870bb566d36206ba907eed4891d0a1a30f35bb6ea6f2ddda0aff82cfe29fe85061d0fcc SHA512 ebe54c946a2343e8b4074a0156f474871c2483b11b10aa67b5a2678626b5d823a2b92c33ad8e220fb43309575e77db1dfc50f138ca1c7e6bc55e95555a009afb
+MISC metadata.xml 1116 BLAKE2B 51506bc5f23cf31872943075b283f67439b60852067c77251d084e1464548f8a8cd414a5d058a579171726bd98b6ff466bbead4441a8008aff822e7c9ebf15f3 SHA512 00759cff3b4704e9774fe70e4f274b20b38299c2d971bc00c62218ad5bbc3c850fa7bef7bcb34a2f79a998e0097e0bd78bc0f1220549839a278d7b02e842500b
diff --git a/media-gfx/ansilove/ansilove-4.1.5.ebuild b/media-gfx/ansilove/ansilove-4.1.5.ebuild
index 37c8d92aff51..e593f48c0fb9 100644
--- a/media-gfx/ansilove/ansilove-4.1.5.ebuild
+++ b/media-gfx/ansilove/ansilove-4.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/ansilove/${PN}.git"
 else
 	SRC_URI="https://github.com/ansilove/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/media-gfx/ansilove/ansilove-4.1.6.ebuild b/media-gfx/ansilove/ansilove-4.1.6.ebuild
new file mode 100644
index 000000000000..e593f48c0fb9
--- /dev/null
+++ b/media-gfx/ansilove/ansilove-4.1.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="ANSI and ASCII art to PNG converter (using libansilove)"
+HOMEPAGE="https://github.com/ansilove/ansilove/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ansilove/${PN}.git"
+else
+	SRC_URI="https://github.com/ansilove/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+
+RDEPEND="dev-libs/libansilove"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_SECCOMP=NO
+	)
+	cmake_src_configure
+}
diff --git a/media-gfx/ansilove/ansilove-9999.ebuild b/media-gfx/ansilove/ansilove-9999.ebuild
index 31678da8b02c..e593f48c0fb9 100644
--- a/media-gfx/ansilove/ansilove-9999.ebuild
+++ b/media-gfx/ansilove/ansilove-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/ansilove/${PN}.git"
 else
 	SRC_URI="https://github.com/ansilove/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~riscv"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/media-gfx/ansilove/metadata.xml b/media-gfx/ansilove/metadata.xml
index c686ffe8bebb..271b7135eb4c 100644
--- a/media-gfx/ansilove/metadata.xml
+++ b/media-gfx/ansilove/metadata.xml
@@ -6,7 +6,7 @@
     <email>xgqt@gentoo.org</email>
     <name>Maciej Barć</name>
   </maintainer>
-  <longdescription lang="en">
+  <longdescription>
     AnsiLove is an ANSI and ASCII art to PNG converter, allowing to convert
     ANSI and artscene-related file formats into PNG images, supporting ANSI
     (.ANS), PCBoard (.PCB), Binary (.BIN), Artworx (.ADF), iCE Draw (.IDF),
diff --git a/media-gfx/apngasm/Manifest b/media-gfx/apngasm/Manifest
index 75f58e984692..70c89eb1eea9 100644
--- a/media-gfx/apngasm/Manifest
+++ b/media-gfx/apngasm/Manifest
@@ -1,7 +1,4 @@
-AUX apngasm-2.91-makefile.patch 585 BLAKE2B 8972e2c3b59f4d128f522309496ed643046a18684e003503046927db4e1be06219a9c6818b75bcb0497c7ef5057a91c5f4bee837abca95c89eb79fa8da0fa39e SHA512 f3b9b89ee3071c01bdc08f8a09864956d258abf14aac147a754f6259297ce8a479a067ee5d37225b7dee0f4f419bef53e127266ae770063cdafa478c78d6eda2
-AUX apngasm-3.1.10-static.patch 2156 BLAKE2B 872543f75d9824d7263653d92b9c83971397f36a46b7deeda2e804f7138dec932d2ca5969d802e211772138d63247763ee89e73cb904d0c71fe7c0d5474f8144 SHA512 3b79954d89f77dd8e49c3657babebb43598bbbb185a25d8617cbadd4c3a7e6179366ee8ece03bde5cec34bb39bbb36c3210fdf8b4c1e38147668028aa1d894cd
-DIST apngasm-2.91-src.zip 597267 BLAKE2B a34a765fef49aa0ac29973b8dc450bfcdfe7aa83dffe19919f916a136db3d0bfebf3c1fac79bfb81a3900cee87afd888469e5432500d181a9539696b4573a42b SHA512 2415389a989f7a7ff7f3e1328f7920c7515c9a492c89ef216ff53db68fe2f1a674ff60d5f4bfd5a8c710f625456557ae7d5b25f486ac826e3113976cd9fc11dc
+AUX apngasm-3.1.10-static.patch 2385 BLAKE2B aa44e300ece7c3d0efe86d6298211d8973455c7130817a8130c7dd9ddcdd858e963267edb1c656753ae2992569b75390171c87b632e294824c2b06c56e293aa0 SHA512 50cf959dc47c823d69697c7ea7c13605fa57451fcf5e845542d706bc501e4075cae3dccef4d3c56b4f8e8a697f056bd01872c69e025cb7cefaf32a8ae88d02a2
 DIST apngasm-3.1.10.tar.gz 620031 BLAKE2B 6885b87815e76e8b9eed58548568bf821dfdf61579f83fc1aa977638f34c2112ebbfebba3454b0a2cfc01b465e570a7976e0fb8046a0762e9d35cf30e3d3f4cd SHA512 670d75251ddc771f9b2b4a1f401066f2012a6814bec781b918f1d9e8960835654c66c3d19b4c8920d5186d85af12cdc4bba8b61c8f3d349b4fc70513d8ecb34e
-EBUILD apngasm-2.91-r1.ebuild 968 BLAKE2B 8b3580b03305a191fdda6d50cf8304f36acdb7acecae1bb4334d43942ec9d3361353b3cd03151d4a7c4bc413b010fcc86203d03f91b1288c9d92cf444a7b2f62 SHA512 d16cfe2ce71647e54e7ee4f1e33948ee6c30f3391b214c0784392a615aeda7758163facdee2c755833bac357121789d46b80f2b6b5c14084256a0b5f0b45ca13
-EBUILD apngasm-3.1.10.ebuild 738 BLAKE2B 806de8d8f336f18a1135ec5a8f7dac6d5db3a219386929e6476433dac32b84e38de1597f79d02d886d5a2656f4373e7e8a12f81d759477dea27829f7c933c246 SHA512 769ffbdfdb0e4f939bcfdb5f9477b818c51b17cf91c408335373cc194721644d812a7d8cc8426d07b0dbf157e2d137c600b67a2eecd006fb155f8542009a7c5a
-MISC metadata.xml 388 BLAKE2B 8f335a73605bdeb3d10c3417a9dbe2ca4d770e74a05fc89ab8fd89046c124dd0015850aacb7c7127549b1468098695a1ac8119747f2b897e6dd3fc13c132e9d3 SHA512 cf91d94546a2414239fd21cad04a026a7a40e72d7133966e20a098c81ce9ec8cfc190136534c9363b62d450e59d8b77f0bed85dd7d7a86efd8496bd0a56df77a
+EBUILD apngasm-3.1.10.ebuild 736 BLAKE2B 5bad70f229c826ad33c230c5f01ae536843890c78866b54d7bfcf8eaa257840fee2657115c19089fca577fb784a273cca0b5a4d22114fa78eb7e40cea23e0014 SHA512 e9c9760f062c0493ffa0c8af0601564b8ac93c4e3d818fafe4aa622c2f34f255acbc49fa827712e760f599c1a7ca8def17a1a84ab2d9ff2ce07fdd59454709b6
+MISC metadata.xml 245 BLAKE2B d5646f7765d15049bac6a19a46470bb3ba3c1198764b8f2ab40e2bfc6df3877c555163a85d0d410aa2b62bb83b85ee1865c0ab3c8ffd19f0071f797e3f5046fb SHA512 1173393301e862bc2513bd15ab8f24661ce574f530f36707e57c8a33e5b4efe01b561184a70fc1e464a7954b16b8bfbec80721a987e8eb01cef356effce10238
diff --git a/media-gfx/apngasm/apngasm-2.91-r1.ebuild b/media-gfx/apngasm/apngasm-2.91-r1.ebuild
deleted file mode 100644
index ef084fbd4c98..000000000000
--- a/media-gfx/apngasm/apngasm-2.91-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="create an APNG from multiple PNG files"
-HOMEPAGE="https://sourceforge.net/projects/apngasm/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-src.zip"
-
-LICENSE="ZLIB 7z? ( LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="7z zopfli"
-
-RDEPEND="media-libs/libpng:0=
-	sys-libs/zlib
-	zopfli? ( app-arch/zopfli:= )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-src_prepare() {
-	default
-
-	# remove bundled libs
-	rm -r zopfli zlib libpng || die
-
-	if use 7z; then
-		append-cflags -DFEATURE_7ZIP
-	else
-		sed -i '/^SRC_DIRS\s\+=/s/7z//' Makefile || die
-	fi
-
-	if use zopfli; then
-		append-cflags -DFEATURE_ZOPFLI
-		sed -i '/^LIBS\s\+=/s/$/ -lzopfli/' Makefile || die
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc readme.txt
-}
diff --git a/media-gfx/apngasm/apngasm-3.1.10.ebuild b/media-gfx/apngasm/apngasm-3.1.10.ebuild
index 15fc7a28415d..9200bae2d260 100644
--- a/media-gfx/apngasm/apngasm-3.1.10.ebuild
+++ b/media-gfx/apngasm/apngasm-3.1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.t
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-libs/boost:=
diff --git a/media-gfx/apngasm/files/apngasm-2.91-makefile.patch b/media-gfx/apngasm/files/apngasm-2.91-makefile.patch
deleted file mode 100644
index b9fb9c20ee89..000000000000
--- a/media-gfx/apngasm/files/apngasm-2.91-makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- apngasm-2.91-src/Makefile
-+++ apngasm-2.91-src/Makefile
-@@ -1,8 +1,7 @@
- PACKAGE    = apngasm
- CC         = gcc
--SRC_DIRS   = . 7z zopfli
--CFLAGS     = -Wall -pedantic -DFEATURE_7ZIP -DFEATURE_ZOPFLI
--CFLAGS_OPT = -O2
-+SRC_DIRS   = . 7z
-+CFLAGS     += -Wall -pedantic
- CFLAGS_7Z  = -Wno-sign-compare -Wno-reorder -Wno-maybe-uninitialized -Wno-parentheses
- LIBS       = -lstdc++ -lm -lpng -lz
- 
-@@ -16,7 +15,7 @@
- all : $(PACKAGE)
- 
- $(PACKAGE) : objdirs $(OBJECTS)
--	$(CC) -o $@ $(OBJECTS) -s $(LIBS)
-+	$(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(LIBS)
- 
- objdirs :
- 	mkdir -p $(OBJ_DIRS)
diff --git a/media-gfx/apngasm/files/apngasm-3.1.10-static.patch b/media-gfx/apngasm/files/apngasm-3.1.10-static.patch
index a624d03278f3..fdc4f5ea41e8 100644
--- a/media-gfx/apngasm/files/apngasm-3.1.10-static.patch
+++ b/media-gfx/apngasm/files/apngasm-3.1.10-static.patch
@@ -1,3 +1,14 @@
+--- a/cli/CMakeLists.txt
++++ b/cli/CMakeLists.txt
+@@ -51,7 +51,7 @@ set_target_properties(apngasm-cli
+ 
+ # Link to built apngasm library
+ target_link_libraries(apngasm-cli
+-  apngasm
++  apngasm-dynamic
+   ${Boost_LIBRARIES}
+ )
+ 
 --- a/lib/CMakeLists.txt
 +++ b/lib/CMakeLists.txt
 @@ -55,18 +55,6 @@ set_target_properties(${APNGASM_DYNAMIC_LIB_TARGET}
diff --git a/media-gfx/apngasm/metadata.xml b/media-gfx/apngasm/metadata.xml
index d31bd859a4ec..cff2266b257f 100644
--- a/media-gfx/apngasm/metadata.xml
+++ b/media-gfx/apngasm/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<use>
-		<flag name="7z">Enable support for 7zip compression</flag>
-		<flag name="zopfli">Enable support for Zopfli compression</flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">apngasm</remote-id>
 	</upstream>
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 191b9d8324ec..a8b2b35ed9bc 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -2,7 +2,9 @@ AUX 64asymptote-gentoo.el 337 BLAKE2B 56b028184573dd8db6babd90ae45838b9788671134
 AUX asymptote-2.70-info.patch 436 BLAKE2B 70eac7625341e21f9cf03cf1ea08e4864fe102627349f2411680b9c18f4df508f5cd6972f9e6dc719795f0323c51b6a5d096e9e3cae81cc1ee497f3f9325fafd SHA512 5b7494351bef5240bd4dba531a3eb68d3a6025990f32fe4064df31e351df9cfb27be29c69b16309929a63ec8d164eb4f2b14315406e546c7dba9dc416ae6b8d4
 AUX asymptote-2.70-xdg-utils.patch 791 BLAKE2B 971b2f1c6a4db7e39cc2d4bac0e3e6cc951733fb0718ace6e6807f63585fe8f4aa6f8519c6e03ed75f0176dca87e705d1b7175e0c1c7a1e79eb6c15dc4f2df76 SHA512 f78359aa71adfcea4ba31e3cae4c30aca47e39337b647f6fb2ad5264bd318a45071fcc47b1bbe5cc4c59c6b707b7b17461af62add2ee2477027d95d369f29994
 DIST asymptote-2.70.src.tgz 4674495 BLAKE2B 126b2e99222e6ae438aaef89df00b8eae19118c3ef42d2fab0b0117f343911939e680d22e903b784213186a5d2eeeecb112afba1467562e7127c34de4bc66773 SHA512 24d60af361e3f0309a896ce8163da6fc0a9d6587efe726c5acf874dcb74f4d51b4bad8146a615ff54173ef06dac53117fd1cc09c77940271adc9f64cac6bcfe6
-DIST asymptote-2.74.src.tgz 12510904 BLAKE2B 8c899f44c8572594fc1526204cfb8f4c3d503dcbd32ebf713eb507ab03966eb335fff8d1b071b568d226588e8b99a6c494b14602d30d1f654cb68b52874ff12e SHA512 cc9a4e6f4ceca5ed356b8ec0dd2d21c23fe19d28492e42cb9cc020759886aedcac1f909c35f6759a1cc6b2f8a2fe6569cc9f5e4686da139188354551e21c183b
+DIST asymptote-2.77.src.tgz 12519133 BLAKE2B afbd80b076348a12314a14511db4b369d8382b8da49b64b05e3d0c1c3f2546aa042a307b5f3eacbc3ecd7fd1b34d9aa34f83fd67c4d0bc240e44c49b058c9786 SHA512 1597543429a906927e20a2903c1a687ec19ef9467f6893760eed1896139379a964601ff057c8d3fd20b7bfbf0364827f53e768cc1d82498d078e3a69f88addec
+DIST asymptote-2.78.src.tgz 15274780 BLAKE2B 0c99aff54df79eabdf059cc0bb2cdd0832d7cc7ae83a2e3ab08116aa6bc75de44f7adfa096b7ed832fc96cd9db0bb41a490a8c5fd29716ad9a7852e52a98ad2b SHA512 dcc27ce608cb72b3979a87bd6e312774008a225b0936027c11bf1862e21dce5db6de9bf5db14c85ba1f7ed25ec77c3a57e2ecf58a73b46315daca11777910c24
 EBUILD asymptote-2.70-r1.ebuild 5403 BLAKE2B 0f0b33d281fb4c971ecd93b87ed42089892f070de136dc433b368eb9e0602844e09618b2290b112c16392668f5ae8724aa81bf0ab2115a38e79dda2e64098ea4 SHA512 9a6037b44a252dab2c24f0febd6089e87b4a023819485ba9506fd129d24c86b95a93fb82b007c8ce6f0ee4ca08194115ca6bce2295f8e86ae94ec1e98c10b13b
-EBUILD asymptote-2.74.ebuild 5510 BLAKE2B 90660ec67790a803c98bf4ebb25da8285cacecac45322a0c5deef710e521c5136456d14adbc0e0f21d44e3487919a7029bcaa7506c2fabcf1b3858e10afa7ccb SHA512 20e8c041842ba54d18dc4d517e5b8201187847e1573ac2710ac5a682082a4aaaa6bc23329c0c0473b8c82caf1420adcc7b7bc34e529985d97d8f9ed8532eb373
+EBUILD asymptote-2.77.ebuild 5511 BLAKE2B b5020deb432c51da20f3f2c29625619e89917476ba8faaed1be0ab7ce591e0b060e5ad99c96b75acd3168739966a5eaad2dda4023add7a95b611f084b8051c7c SHA512 a0e6bc5dcecb63f383e8b6264cbcf8083dde2938c90455a3b196a93bbe320fd7e50076c451d74c98f35e22dc11f4cdd01c923acaf1591959f7a93974b5d1881e
+EBUILD asymptote-2.78.ebuild 5511 BLAKE2B b5020deb432c51da20f3f2c29625619e89917476ba8faaed1be0ab7ce591e0b060e5ad99c96b75acd3168739966a5eaad2dda4023add7a95b611f084b8051c7c SHA512 a0e6bc5dcecb63f383e8b6264cbcf8083dde2938c90455a3b196a93bbe320fd7e50076c451d74c98f35e22dc11f4cdd01c923acaf1591959f7a93974b5d1881e
 MISC metadata.xml 1423 BLAKE2B 64dd5d6c928a11d4a47297362223164cb19d91f6a08a0582b66831e2e8e2d7594389c2244fa1527dfe945da0e67985f5c639e3dae2482f57b510bf828a4605ed SHA512 1561e416e56bca130a72f90886981f63224c21e2a077a7b93e6fdd877f38dd12dfa9e0b747840e7f459e2df16c5b08e0177d26c526eb21bebe00fa8c91326bc9
diff --git a/media-gfx/asymptote/asymptote-2.74.ebuild b/media-gfx/asymptote/asymptote-2.77.ebuild
index 78ed3422c1b1..f36cb494507d 100644
--- a/media-gfx/asymptote/asymptote-2.74.ebuild
+++ b/media-gfx/asymptote/asymptote-2.77.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit autotools elisp-common latex-package python-r1
 
diff --git a/media-gfx/asymptote/asymptote-2.78.ebuild b/media-gfx/asymptote/asymptote-2.78.ebuild
new file mode 100644
index 000000000000..f36cb494507d
--- /dev/null
+++ b/media-gfx/asymptote/asymptote-2.78.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit autotools elisp-common latex-package python-r1
+
+DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
+HOMEPAGE="https://asymptote.sourceforge.io/"
+SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="+boehm-gc context curl doc emacs examples fftw gsl +imagemagick latex lsp offscreen +opengl python sigsegv svg test vim-syntax X"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	offscreen? ( opengl )
+	doc? ( boehm-gc )"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.4-r5:0=
+	>=sys-libs/readline-4.3-r5:0=
+	net-libs/libtirpc:=
+	imagemagick? ( media-gfx/imagemagick[png] )
+	opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm )
+	offscreen? ( media-libs/mesa[osmesa] )
+	svg? ( app-text/dvisvgm )
+	sigsegv? ( dev-libs/libsigsegv )
+	boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] )
+	fftw? ( >=sci-libs/fftw-3.0.1:= )
+	gsl? ( sci-libs/gsl:= )
+	python? ( ${PYTHON_DEPS} )
+	curl? ( net-misc/curl )
+	lsp? (
+		dev-libs/boost
+		dev-libs/rapidjson
+		dev-libs/utfcpp
+	)
+	X? (
+		${PYTHON_DEPS}
+		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg]
+		dev-python/numpy
+		dev-python/pycson
+		>=gnome-base/librsvg-2.40
+	)
+	latex? (
+		virtual/latex-base
+		>=dev-texlive/texlive-latexextra-2013
+	)
+	context? ( dev-texlive/texlive-context )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	doc? (
+		media-gfx/imagemagick[png]
+		virtual/texi2dvi
+		virtual/latex-base
+		app-text/ghostscript-gpl )
+	test? ( app-text/ghostscript-gpl )"
+
+TEXMF=/usr/share/texmf-site
+
+PATCHES=(
+	# Changing pdf, ps, image viewers to xdg-open
+	"${FILESDIR}/${PN}-2.70-xdg-utils.patch"
+
+	# Bug #322473
+	"${FILESDIR}/${PN}-2.70-info.patch"
+)
+
+src_prepare() {
+	sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \
+		-i configure.ac \
+		|| die "sed configure.ac failed"
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# for the CPPFLAGS see
+	# https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349
+	econf \
+		CPPFLAGS=-DHAVE_SYS_TYPES_H \
+		CFLAGS="${CXXFLAGS}" \
+		--disable-gc-debug \
+		--disable-gc-full-debug \
+		--with-latex=/usr/share/texmf-site/tex/latex \
+		--with-context=/usr/share/texmf-site/tex/context \
+		$(use_enable boehm-gc gc system) \
+		$(use_enable curl) \
+		$(use_enable lsp) \
+		$(use_enable fftw) \
+		$(use_enable gsl) \
+		$(use_enable opengl gl) \
+		$(use_enable offscreen) \
+		$(use_enable sigsegv)
+}
+
+src_compile() {
+	default
+
+	cd doc || die
+	emake asy.1
+	einfo "Making info"
+	cd png || die
+	emake ${PN}.info
+	cd .. || die
+	if use doc; then
+		cd FAQ || die
+		emake
+		cd .. || die
+		# pdf
+		einfo "Making pdf docs"
+		export VARTEXFONTS="${T}"/fonts
+		# see bug #260606
+		emake -j1 asymptote.pdf
+		emake CAD.pdf asy-latex.pdf asyRefCard.pdf
+	fi
+	cd .. || die
+
+	if use emacs; then
+		einfo "Compiling emacs lisp files"
+		elisp-compile base/*.el
+	fi
+}
+
+src_install() {
+	# the program
+	dobin asy
+
+	# .asy files
+	insinto /usr/share/${PN}
+	doins -r base/*.asy base/*.js base/*.sh base/*.ps base/shaders base/webgl
+	chmod 755 "${D}"/usr/share/${PN}/shaders/*
+
+	# documentation
+	dodoc README ReleaseNotes ChangeLog
+	cd doc || die
+	doman asy.1
+	doinfo png/${PN}.info
+	if use doc; then
+		dodoc FAQ/asy-faq.ascii
+		dodoc CAD.pdf asy-latex.pdf asyRefCard.pdf asymptote.pdf
+	fi
+	cd .. || die
+
+	# asymptote.py
+	if use python; then
+		python_moduleinto ${PN}
+		python_foreach_impl python_domodule aspy.py
+		python_foreach_impl python_domodule base/${PN}.py
+	fi
+
+	# X GUI
+	if use X; then
+		cd GUI || die
+		python_setup
+		sed -e 1d -i xasy.py
+		echo "#!/usr/bin/env ${EPYTHON}" > xasy1
+		cat xasy1 xasy.py > xasy
+		rm xasy1 xasy.py
+		mv xasy xasy.py
+		cd .. || die
+		python_domodule GUI
+		chmod 755 "${D}/$(python_get_sitedir)/${PN}/GUI/xasy.py"
+		dosym "$(python_get_sitedir)/${PN}/GUI/xasy.py" /usr/bin/xasy
+		doman doc/xasy.1x
+	fi
+
+	# examples
+	if use examples; then
+		docinto examples
+		dodoc \
+			examples/*.asy \
+			examples/*.views \
+			examples/*.dat \
+			examples/*.bib \
+			examples/*.png \
+			examples/*.pdb1 \
+			doc/*.asy \
+			doc/*.csv \
+			doc/*.dat \
+			doc/pixel.pdf \
+			doc/extra/*.asy
+		docinto examples/animations
+		dodoc examples/animations/*.asy
+	fi
+
+	# LaTeX style
+	if use latex; then
+		cd doc || die
+		insinto "${TEXMF}"/tex/latex/${PN}
+		doins *.sty latexmkrc
+		if use examples; then
+			docinto examples
+			dodoc latexusage.tex externalprc.tex
+			docinto examples/animations
+			dodoc ../examples/animations/*.tex
+		fi
+		cd .. || die
+	fi
+
+	# ConTeXt
+	if use context; then
+		insinto /usr/share/texmf-site/tex/context
+		doins doc/colo-asy.tex
+	fi
+
+	# emacs mode
+	if use emacs; then
+		elisp-install ${PN} base/*.el base/*.elc asy-keywords.el
+		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
+	fi
+
+	# vim syntax
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins base/asy.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins base/asy_filetype.vim
+	fi
+}
+
+pkg_postinst() {
+	use latex && latex-package_rehash
+	use emacs && elisp-site-regen
+
+	elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
+	elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer'
+}
+
+pkg_postrm() {
+	use latex && latex-package_rehash
+	use emacs && elisp-site-regen
+}
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 90e7e3977d1b..d217fd643163 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,15 +1,23 @@
 AUX blender-3.0.0-intern-ghost-fix-typo-in-finding-XF86VMODE.patch 877 BLAKE2B 954cae23023e60ef38847927a8ddfc05a19f86c1b5f95a78227aba2af32707ca3490f815e370aa995944973d3ea44d58895817e3ac1ffbb006468ef33f3223a7 SHA512 f4d4e946ce177c82cbe63ab2beab05748e91786800885432f64c00b3ba93be3fec54f084663617dd1b877776d60c418da12cee9a3f4f59a447a3291d08eeba5e
+AUX blender-3.0.1-openexr.patch 4868 BLAKE2B eccd615d26ba6963220dd9128294d996890f5909707cae5b8b39a0b1e35147618ff2d92348c8e8613cea45c974442665be5036884c33737ccf4041eec5f0135c SHA512 f44288212a3e8e2ed04ced2e574ac240a18f90c3f6e28fabc9dc855545c9b28b216f9cc3ad70721dca754a0d032100fe2aa430eff54049f672219747728d5657
+AUX blender-3.0.1-openimageio-2.3.patch 927 BLAKE2B 02ed40bf291ac6ec935a7412c8c1681023fb1fac3bfe7a6ecdbaddfd895f48557274f466849f1aa35900c66dbba6724a29b7d5553fe914e5a3df0f93a9791acd SHA512 0edd3e3c3265694593b242db5c96d3c123630819ff07b906b7f86c15cdf60e4bf1e8b61d555241eadf842a2a33c1f4f1ad4cce0e7d07c8d7308d8a9d536bf512
 DIST blender-2.93.0-tests.tar.bz2 286918586 BLAKE2B a2c2c2e900e401a470208e8e5d0082d45e2f8db13b45213f31808d50ae5ea330360702b8e775bdb3307eb753aa7c3264803e9e470b3fb778f8bd87272cd72513 SHA512 0e5e4c67944c4f76df62cdbaf26ba284c415675074e66685c01ec9584a544c47f616bae8fb2ff2b7e03290620d54dc1033b4b0fc617acb1232a90439e96325fe
 DIST blender-2.93.0.tar.xz 42967016 BLAKE2B 1e7b54f08415de8a8908a285ae35c1e18558bf7cab42c5c135323d10ac9a73ec69aa0addd536355a4d19262438a615e03f09dc123b697cbab484e33350bb5ee3 SHA512 660962e5368c8ff52ed095aba97d63c22aa8e2fdcb2042b1299b6d6edeb7eb1f702a9ee95ee7e47824681f9f48b971d2e32ec32cc6264165a4196b5f36c4a66d
-DIST blender-2.93.1.tar.xz 42960100 BLAKE2B eda0a8c0414d1f7c89d21e34ba238b0cbe337ea755d6f10792e7c3bd5e15934184d3bd853ed636764776095ce1e3f081d63386b7c13fb7ac666580bf9eeb43c8 SHA512 b14e8cca248c53e4a93976d7fa1cd1ab92a7d18a3809b2a535881731aad2f68d8d155ad175b27aa1890714b81aa6648604a614cacc90e95b7269569661e393b1
-DIST blender-2.93.2.tar.xz 43028440 BLAKE2B 02ffc5be190445c97e3cb14e4635969df7a7aaf0100ee5ba50f2d283b077ffebf1f139aec86034ed2df03d94290d5a8bb369f88c734db5103869ffa1d3f588a6 SHA512 5dac627b0e5f38af1f861d4fddb01f4ba1e992c704337c56e2ebbfdcbd62e6de83195e3541342603a1ae966e89a06ff98764c817e282401edd792857d577b989
 DIST blender-2.93.6.tar.xz 43031980 BLAKE2B 235b9a08d9eb4ba83c30a4de333cc5b56eefe16209a96e2aeadbfb4d99b0add0031bbf3c4e0059833433475f07c03711ca773e19d57849ae83beb52a750fac48 SHA512 0f8e7686a141ba55be29c73f9b2fcd43b03f7551ec91d226f389295f4866926f9a81ddf627aef54f6d762271ca05ccdea1f80efc00cc52315925ad626b283aea
+DIST blender-2.93.8.tar.xz 43024356 BLAKE2B f69edf2bff0e97897d03b123516a66037fc690f518801dbb5f6851aa743c768bb1a56df2cc3e036d8fbae4ca3cfca295f34c7ae33dd37f0e16513c56f5d46572 SHA512 75213907ef7969f30468ce959a1da9287334b6f8b6edbf4b65e02d57a8b306fad6f86646d088eee8fd6f53f3e7511554b9a963f7a15527b17c3353db24f58249
 DIST blender-3.0.0-tests.tar.bz2 302064577 BLAKE2B c86a47231bb704124fe5ed59963176ca45ccc7e92bf8b00ce31d432cf6e35b9593ddb0d71f56aab0af6d1922f08eb158f9b7e355b5323d715b2b075ceafe9294 SHA512 e343f5da88aa7d2bc2a0758c01d3849b61c6ff3a0d65ac4d967aa02b701a5a02bfc8e7ed92b8f67af37e08f138987de8a27b8c7faa3cd8cfc3535adb8c624506
 DIST blender-3.0.0.tar.xz 40169212 BLAKE2B 0dd8327cb92d1d5b00ede020fa2fe07fc3f4d02b249e0ed528c330d6423ce28c731055bc623cffa66f2824c3ae667b5b84be2d6c5e2b01baf490468c4b6f42a2 SHA512 727d722e7b750b77b0fe691605a84de58baf15a3cc01af267be0440bd0879772e14dbdfdb16209023df3c28b94d8009b0c389915097cdb0b49bdf42c8de1ef21
-EBUILD blender-2.93.0-r1.ebuild 11815 BLAKE2B a7edc0c52fba0b9ebec6852aa84c264b28e4e2984ff47baf9d4117723d6a32634c976f4d80d0bd785a6d07b2fc08e6973d53f062505d3043eb7d56ca777acb73 SHA512 2eeae0099f41d11175502f000eb35a41f0351d358d9248f955168932cbfcfade48953a0c68456d3c75950d009f388ddebd8386368c274d3dc86ca820a1f09a7b
-EBUILD blender-2.93.1-r1.ebuild 11816 BLAKE2B 1044606914a9aa1f8bd00011addc31f71c3c9bed34e7b5215f4c15182fcfb895e248be3d55cbfc3d49ffea7a6212f38f232c410bf19c1634f3b1ef0c1392dd7a SHA512 b6ffc38f300260a66917c3507762e9830f6fbc0098e3f47c23e9d506ec201511aace83010c6213cc304c3643b63039ec54f3f7cbd9bc076383b0e3d6c1232419
-EBUILD blender-2.93.2-r1.ebuild 11833 BLAKE2B 70435289cbde457dc6dd5cf6c8f0ecdaeecd5e44bb9afda6c0f36b75d9cadfb03dc72f2c31a013c34a0fdc7bdb5319a348dd6a9be282821af2479e62dda30a7f SHA512 6deb41bcf414687a2f2243eb24b8a4106c62df8b81c2286f820e95410cf7103b724d959eab43e927a871f77d2a9cfa682cffb41642a9c082f5179f9941baf779
-EBUILD blender-2.93.6.ebuild 12128 BLAKE2B 7e5b5be14974794daae77b5f23c840ebb209787ef81581c157eb3534d85004ddbe760e899e4be5774fcb87370c2845f3116a59496c967a883b4e37803ad80125 SHA512 434841da2337747ce76ca26ad8cc10384a2a0551d63b6ed27bcf8738f7324e5cd55c8fd867e1d7fbbc523133f7b57ce6f9df35751c700ff2b1552171f9a4037a
-EBUILD blender-3.0.0.ebuild 12851 BLAKE2B 3258b9f8b55b0b5c12ff29bb10dc779dbc033975d222d84b19b4eef7c629bc93e905cdf489f8479da4b894c2d1151cc68c981a69b3e09499e03d51bfacb392ff SHA512 460ab53b027bfcf1f233ebaa2ada982ea7b9cd13686532d1d0d3251bb385e46199f4c8ac1725b3537d938ca7f04027a02d1e1f99aac4faec22437a31d970df86
-EBUILD blender-9999.ebuild 12775 BLAKE2B 999cf81184c119a196671441f9ea1ec723ca26566c86c350425d851f1f6c692c86deb58a9000fb2d3b5340d1afb44a971383a9c47fac60d26bbffeda9c588155 SHA512 5c67b239b5169ca5fe3074dee6c79e107b15ae0a5c94dbe169b49be3a6540c497b08a72b7fcf114f166f23e1bda0cebf27bdfaaca58c1923a3eab29569389a48
-MISC metadata.xml 3163 BLAKE2B dcebffc7d37a5e2214121c5dbee2f81f3c6e9bafcbf58c6f9d0c38e6ab5fcef25e314fe7ab9d8127bf69cf6bf05b4b8bcff28973229e4587a7b3231f9384f08a SHA512 7ad59b0bc1d3c8ed4cf6528c74eb348b2ede12eda4f012d7961b25a3dfc398a8abf75f033d94c8b7c92684b0769e8fe439b3e85dd082f4ea68f87f1851639dc5
+DIST blender-3.0.1-ffmpeg-5.0.patch.bz2 8198 BLAKE2B 2acb1e441bd17cf2d972f981358981d42742ad37656366a52b0adb52efb3f1a6cda0479e1c79d9327b51c8fd3d2c6cb291552adc7716e6a1938ac27b237186b9 SHA512 c09ca2d5a5b99652abcae827965304506e354fc6fc4d6d59c9433c8246e865a0622ddac3118009ad433292690212292a86f7e43e764583525555ca6d653da809
+DIST blender-3.0.1.tar.xz 40155604 BLAKE2B b611f08617f1be217604e87cfafe88f6cc9904ed6321a74bea4ee5ad14f3cf4002b12d82fa3b3c6111a681fd7e1c530f66be28c506973ff7722175a9036a19da SHA512 b9af6d49201eb26ec77a3cecdb9c0945ffc915d4eecaaa36091365340244bfd1565a7679c8b7a81d3335383f158dc01339ea8edc108730835d81db1de84049bf
+DIST blender-3.1.0-tests.tar.bz2 643279044 BLAKE2B acbf0800c384f881c215ea22140b02e8e61c7395eb35fdb76fad3c785c565ecfc6c59d74848bdd3f9f9b762f86328f6b60cb7871e6ef4615db1ef03f2749b655 SHA512 9fd202c582576d170c29c8adbc9bc4a62b6d67a4a1500f6980201e3d904f4a4a15e5680530663382c34672bd634543dd330c5f75523cf0058928a549ff4a0782
+DIST blender-3.1.0.tar.xz 41017620 BLAKE2B f626266a41f9d72b03690fe8d7fe1f183ffdef01501ff6a458e5760eea66c959ca297d70dc541b27aa85466a7b8d65306e293c84487c1ff1467cd31cfdba0203 SHA512 354d4e7c92233e610d0e938c10d966aff7ee34fd21993b65b645b4d01e37f90f741206190817a7ab6932c5321d698827a09ec0e1d966c28596d130b4af2ce6bb
+EBUILD blender-2.93.0-r1.ebuild 11832 BLAKE2B 0054acfc65f0fd17f9a7eb190f4c65941ea72f73f9ee24b57ab98cd99a5842c1ad5694a11083d6b6ce3dc70c669f9ddddad05e609c774d39a2b186ef2b8818a9 SHA512 456c40233086a52b7c557bd187ab7821df0f2986c0edd21ca8e4b882c1744b21a08aad0ad0ff6e02162fefad66c259e280a0399e49cecb0b8a6bebff2542e3fb
+EBUILD blender-2.93.6.ebuild 12144 BLAKE2B aeea405155758ce88a20fb355719907aa70db1ea76bf93c69150e6cba7d392cdcfd68187f49589697b39b08ee9b6f29246b54618b3f7d26b89eedcbd7b7172eb SHA512 c4dd1d809777873d16dcda92ac3df7bf75a9ba915d2922abf371b5e62046870bba0bee4ddd90a9f9739c87794bf02fdfcbafb0cb6324bfc26e5f8981e81d3219
+EBUILD blender-2.93.8-r4.ebuild 12628 BLAKE2B 76dfd4e51521cf9f1736967742909813364bdccd6722fa1f74296cf6fe48e9dd3248dfe34a304d11b3d6353c4dfcc70b33e62853153984531a89d44e3af0fae6 SHA512 0c975b286150e3c70c7872d021b979a0ccd93d6264d581a39fb0067fd8a309310370bd49f16eb418276e169be02e3157883b05c55a0ffec4dbc2ada606cbe713
+EBUILD blender-2.93.8-r5.ebuild 12769 BLAKE2B fb57feb959ccff16de6ca9cc582e7e1edbab02c365de48316eac49e4e059db4ac51785337d7555ecfa41fed30539b28b88a1edc8cef02d43e9aea8b333d55d9d SHA512 264fb3ecd41cc93ee057cc995e9891ea0010b4332af041fb6b256ca7759f74f6d24e03e15143ad0b65b8d681e883325542df41e8a596e95cf7d9c7780a9f3696
+EBUILD blender-3.0.0-r1.ebuild 12858 BLAKE2B 07e9471b1c144a085af7a75f7926a4e5532df9ba03a04afdf9ea23fb3413e543f319ddfe000fb667203d70bf47818a7feb54cb357e0a45c65ecb91978825e3d6 SHA512 36bb0b89eb50d99c172d32aab23f189bb593873150eac6172f3576a94697eef85e519e455ae5784395fe96ebd9dd468ac995793539d050392be6e7f858d08aa4
+EBUILD blender-3.0.1-r4.ebuild 13050 BLAKE2B 7a3233d91abe7ec48a4bd8508fd58d32c2ae447a40ac31125a3dcc69a97cf9b0792e97e5d5e0173388c64de0fbe58ffb4455f513bb44b2ecc0e4d27288c24b97 SHA512 645be8c2520e6eaa8b9dafa4bdfd866c08a8ae1f07317c172b22ab7f7f7b6feedaa5491b71e0c89d9bbe175dd75419acd654f3fd3770a07472e65a3d36e0944a
+EBUILD blender-3.0.1-r5.ebuild 13191 BLAKE2B 2f0c3433bf9ce8314f11e8d9bf60bc20972b23923ceb4c494f695c0267463a30de4286e577ed80917baf10623ef3bcd62caae8b83e5b3680dd3fcb389c51f98e SHA512 629c5333d0bc5e670a828143fa6ae82c5df6e4f9127910d329c00520d49b1c87b3bbd906448835ed9962cf31aef2d438e100bf06b69f30ebcb87f734446f9903
+EBUILD blender-3.1.0.ebuild 12862 BLAKE2B 6f70bcd89149fddd1918d9f17c1246e618bb62115d3e4aa437031ea3060f8e5ce5103b28f9e18e96d8268144e6b37719d0f8aece47c7152c6d30841ad513c33e SHA512 0eb804e9361b489c1c63d1d973fbc8921729d77a2fae1bc88b1d71cda7760929dda85a3476a852a7ec4e9b7395a106a89977553134a2f0100f59ff67f768bcab
+EBUILD blender-9999.ebuild 12853 BLAKE2B 40e0211501c6acc8ed4b0dc175a53023ed2ab29da05aa7cbbba85b2514ac90457687ebbdd0d628e150c9835e2c36ae47959d026c93edc5c433f27a8b0f7a1d73 SHA512 e898ca43b1245793fb3e65af49806935e78397938fbe07da329cfc3e72c4ecb7ba1f9ac30f7df91c5642cdd82983eb40279544520ea193a1e4f6d17bdd1ae4bd
+MISC metadata.xml 3288 BLAKE2B e1e1647de2fab3364578645599041b212214c726f4aeda5bee0423e09ef7895f627ea2cfb1118f474b148ba986a2d1b37186c25e5d069f3dbd000a1c3dc9b89f SHA512 9e64d1f6c1dff94a1cc20c97e26d4d43c694e9331e80334d85ddfbb6a76a8d39d1007d802dbce0f46f82f4d4fc3de871af3af8cfb7fd69a5aca31d4fd59bed44
diff --git a/media-gfx/blender/blender-2.93.0-r1.ebuild b/media-gfx/blender/blender-2.93.0-r1.ebuild
index 4498bca57a46..5759d72da06c 100644
--- a/media-gfx/blender/blender-2.93.0-r1.ebuild
+++ b/media-gfx/blender/blender-2.93.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_9 )
+PYTHON_COMPAT=( python3_9 python3_10 )
 
 inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils
 
@@ -63,7 +63,7 @@ RDEPEND="${PYTHON_DEPS}
 	color-management? ( >=media-libs/opencolorio-2.0.0 )
 	cuda? ( dev-util/nvidia-cuda-toolkit:= )
 	embree? ( >=media-libs/embree-3.10.0[raymask] )
-	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k,vpx,vorbis,opus,xvid] )
+	ffmpeg? ( <media-video/ffmpeg-5.0:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
 	fftw? ( sci-libs/fftw:3.0= )
 	gmp? ( dev-libs/gmp )
 	!headless? (
diff --git a/media-gfx/blender/blender-2.93.6.ebuild b/media-gfx/blender/blender-2.93.6.ebuild
index 6d17263b5759..712f73eaf47a 100644
--- a/media-gfx/blender/blender-2.93.6.ebuild
+++ b/media-gfx/blender/blender-2.93.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_9 )
+PYTHON_COMPAT=( python3_9 python3_10 )
 
 inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils
 
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://download.blender.org/source/${P}.tar.xz"
 	TEST_TARBALL_VERSION=2.93.0
 	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2 )"
-	KEYWORDS="~amd64 ~arm ~arm64"
+	KEYWORDS="amd64 ~arm ~arm64"
 fi
 
 SLOT="${PV%.*}"
@@ -64,7 +64,7 @@ RDEPEND="${PYTHON_DEPS}
 	color-management? ( >=media-libs/opencolorio-2.0.0 )
 	cuda? ( dev-util/nvidia-cuda-toolkit:= )
 	embree? ( >=media-libs/embree-3.10.0[raymask] )
-	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k,vpx,vorbis,opus,xvid] )
+	ffmpeg? ( <media-video/ffmpeg-5.0:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
 	fftw? ( sci-libs/fftw:3.0= )
 	gmp? ( dev-libs/gmp )
 	!headless? (
diff --git a/media-gfx/blender/blender-2.93.2-r1.ebuild b/media-gfx/blender/blender-2.93.8-r4.ebuild
index 84199a7c6e54..3e09ff2028a8 100644
--- a/media-gfx/blender/blender-2.93.2-r1.ebuild
+++ b/media-gfx/blender/blender-2.93.8-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_9 )
+PYTHON_COMPAT=( python3_9 python3_10 )
 
 inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils
 
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://download.blender.org/source/${P}.tar.xz"
 	TEST_TARBALL_VERSION=2.93.0
 	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2 )"
-	KEYWORDS="~amd64 ~arm ~arm64"
+	KEYWORDS="amd64 ~arm ~arm64"
 fi
 
 SLOT="${PV%.*}"
@@ -59,12 +59,12 @@ RDEPEND="${PYTHON_DEPS}
 	virtual/jpeg
 	virtual/libintl
 	virtual/opengl
-	alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] )
+	alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
 	collada? ( >=media-libs/opencollada-1.6.68 )
-	color-management? ( >=media-libs/opencolorio-2.0.0 )
+	color-management? ( >=media-libs/opencolorio-2.1.1-r7:= )
 	cuda? ( dev-util/nvidia-cuda-toolkit:= )
 	embree? ( >=media-libs/embree-3.10.0[raymask] )
-	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k,vpx,vorbis,opus,xvid] )
+	ffmpeg? ( <media-video/ffmpeg-5.0:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
 	fftw? ( sci-libs/fftw:3.0= )
 	gmp? ( dev-libs/gmp )
 	!headless? (
@@ -83,17 +83,17 @@ RDEPEND="${PYTHON_DEPS}
 	openal? ( media-libs/openal )
 	opencl? ( virtual/opencl )
 	oidn? ( >=media-libs/oidn-1.3.0 )
-	openimageio? ( >=media-libs/openimageio-2.2.13.1:= )
+	openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= )
 	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
+		>=dev-libs/imath-3.1.4-r2:=
+		>=media-libs/openexr-3:0=
 	)
 	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] )
 	openvdb? (
-		>=media-gfx/openvdb-7.1.0
+		>=media-gfx/openvdb-8.2.0-r2:=
 		dev-libs/c-blosc:=
 	)
-	osl? ( >=media-libs/osl-1.11.10.0 )
+	osl? ( >=media-libs/osl-1.11.16.0-r3:= )
 	pdf? ( media-libs/libharu )
 	potrace? ( media-gfx/potrace )
 	pugixml? ( dev-libs/pugixml )
@@ -123,6 +123,12 @@ BDEPEND="
 	nls? ( sys-devel/gettext )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.0-intern-ghost-fix-typo-in-finding-XF86VMODE.patch
+	"${FILESDIR}"/${PN}-3.0.1-openexr.patch
+	"${FILESDIR}"/${PN}-3.0.1-openimageio-2.3.patch
+)
+
 blender_check_requirements() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 
@@ -227,6 +233,7 @@ src_configure() {
 		-DWITH_HEADLESS=$(usex headless)
 		-DWITH_INSTALL_PORTABLE=OFF
 		-DWITH_IMAGE_DDS=$(usex dds)
+		-DOPENEXR_ROOT_DIR="${ESYSROOT}/usr/$(get_libdir)/OpenEXR-3"
 		-DWITH_IMAGE_OPENEXR=$(usex openexr)
 		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
 		-DWITH_IMAGE_TIFF=$(usex tiff)
@@ -263,30 +270,16 @@ src_configure() {
 	)
 	append-flags $(usex debug '-DDEBUG' '-DNDEBUG')
 
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		# Workaround for binary drivers.
-		addpredict /dev/ati
-		addpredict /dev/dri
-		addpredict /dev/nvidiactl
-
-		einfo "Generating Blender C/C++ API docs ..."
-		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
-		doxygen -u Doxyfile || die
-		doxygen || die "doxygen failed to build API docs."
-
-		cd "${CMAKE_USE_DIR}" || die
-		einfo "Generating (BPY) Blender Python API docs ..."
-		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
-
-		cd "${CMAKE_USE_DIR}"/doc/python_api || die
-		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+	if tc-is-gcc ; then
+		# These options only exist when GCC is detected.
+		# We disable these to respect the user's choice of linker.
+		mycmakeargs+=(
+			-DWITH_LINKER_GOLD=OFF
+			-DWITH_LINKER_LLD=OFF
+		)
 	fi
+
+	cmake_src_configure
 }
 
 src_test() {
@@ -316,7 +309,36 @@ src_install() {
 		dobin "${BUILD_DIR}"/bin/cycles
 	fi
 
+	cmake_src_install
+
+	if use man; then
+		# Slot the man page
+		mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die
+	fi
+
 	if use doc; then
+		# Define custom blender data/script file paths. Otherwise Blender will not be able to find them during doc building.
+		# (Because the data is in the image directory and it will default to look in /usr/share)
+		export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
+		export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+
 		docinto "html/API/python"
 		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
 
@@ -324,13 +346,6 @@ src_install() {
 		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
 	fi
 
-	cmake_src_install
-
-	if use man; then
-		# Slot the man page
-		mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die
-	fi
-
 	# Fix doc installdir
 	docinto html
 	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
diff --git a/media-gfx/blender/blender-2.93.1-r1.ebuild b/media-gfx/blender/blender-2.93.8-r5.ebuild
index 1bba33bcef4b..7112d2413a97 100644
--- a/media-gfx/blender/blender-2.93.1-r1.ebuild
+++ b/media-gfx/blender/blender-2.93.8-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_9 )
+PYTHON_COMPAT=( python3_9 python3_10 )
 
 inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils
 
@@ -11,13 +11,16 @@ DESCRIPTION="3D Creation/Animation/Publishing System"
 HOMEPAGE="https://www.blender.org"
 
 if [[ ${PV} = *9999* ]] ; then
-	inherit git-r3
+	# Subversion is needed for downloading unit test files
+	inherit git-r3 subversion
 	EGIT_REPO_URI="https://git.blender.org/blender.git"
 else
 	SRC_URI="https://download.blender.org/source/${P}.tar.xz"
+	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.0.1-ffmpeg-5.0.patch.bz2"
+
 	TEST_TARBALL_VERSION=2.93.0
 	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2 )"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64 ~arm ~arm64"
 fi
 
 SLOT="${PV%.*}"
@@ -58,12 +61,12 @@ RDEPEND="${PYTHON_DEPS}
 	virtual/jpeg
 	virtual/libintl
 	virtual/opengl
-	alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] )
+	alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
 	collada? ( >=media-libs/opencollada-1.6.68 )
-	color-management? ( >=media-libs/opencolorio-2.0.0 )
+	color-management? ( >=media-libs/opencolorio-2.1.1-r7:= )
 	cuda? ( dev-util/nvidia-cuda-toolkit:= )
 	embree? ( >=media-libs/embree-3.10.0[raymask] )
-	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k,vpx,vorbis,opus,xvid] )
+	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
 	fftw? ( sci-libs/fftw:3.0= )
 	gmp? ( dev-libs/gmp )
 	!headless? (
@@ -82,17 +85,17 @@ RDEPEND="${PYTHON_DEPS}
 	openal? ( media-libs/openal )
 	opencl? ( virtual/opencl )
 	oidn? ( >=media-libs/oidn-1.3.0 )
-	openimageio? ( >=media-libs/openimageio-2.2.13.1:= )
+	openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= )
 	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
+		>=dev-libs/imath-3.1.4-r2:=
+		>=media-libs/openexr-3:0=
 	)
 	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] )
 	openvdb? (
-		>=media-gfx/openvdb-7.1.0
+		>=media-gfx/openvdb-8.2.0-r2:=
 		dev-libs/c-blosc:=
 	)
-	osl? ( >=media-libs/osl-1.11.10.0 )
+	osl? ( >=media-libs/osl-1.11.16.0-r3:= )
 	pdf? ( media-libs/libharu )
 	potrace? ( media-gfx/potrace )
 	pugixml? ( dev-libs/pugixml )
@@ -100,7 +103,6 @@ RDEPEND="${PYTHON_DEPS}
 	sdl? ( media-libs/libsdl2[sound,joystick] )
 	sndfile? ( media-libs/libsndfile )
 	tbb? ( <dev-cpp/tbb-2021.4.0:= )
-	test? ( dev-vcs/subversion )
 	tiff? ( media-libs/tiff )
 	valgrind? ( dev-util/valgrind )
 "
@@ -123,6 +125,13 @@ BDEPEND="
 	nls? ( sys-devel/gettext )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.0-intern-ghost-fix-typo-in-finding-XF86VMODE.patch
+	"${FILESDIR}"/${PN}-3.0.1-openexr.patch
+	"${FILESDIR}"/${PN}-3.0.1-openimageio-2.3.patch
+	"${WORKDIR}"/${PN}-3.0.1-ffmpeg-5.0.patch
+)
+
 blender_check_requirements() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 
@@ -227,6 +236,7 @@ src_configure() {
 		-DWITH_HEADLESS=$(usex headless)
 		-DWITH_INSTALL_PORTABLE=OFF
 		-DWITH_IMAGE_DDS=$(usex dds)
+		-DOPENEXR_ROOT_DIR="${ESYSROOT}/usr/$(get_libdir)/OpenEXR-3"
 		-DWITH_IMAGE_OPENEXR=$(usex openexr)
 		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
 		-DWITH_IMAGE_TIFF=$(usex tiff)
@@ -261,35 +271,18 @@ src_configure() {
 		-DWITH_USD=OFF
 		-DWITH_XR_OPENXR=OFF
 	)
-	if ! use debug ; then
-		append-flags  -DNDEBUG
-	else
-		append-flags  -DDEBUG
+	append-flags $(usex debug '-DDEBUG' '-DNDEBUG')
+
+	if tc-is-gcc ; then
+		# These options only exist when GCC is detected.
+		# We disable these to respect the user's choice of linker.
+		mycmakeargs+=(
+			-DWITH_LINKER_GOLD=OFF
+			-DWITH_LINKER_LLD=OFF
+		)
 	fi
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
 
-	if use doc; then
-		# Workaround for binary drivers.
-		addpredict /dev/ati
-		addpredict /dev/dri
-		addpredict /dev/nvidiactl
-
-		einfo "Generating Blender C/C++ API docs ..."
-		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
-		doxygen -u Doxyfile || die
-		doxygen || die "doxygen failed to build API docs."
-
-		cd "${CMAKE_USE_DIR}" || die
-		einfo "Generating (BPY) Blender Python API docs ..."
-		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
-
-		cd "${CMAKE_USE_DIR}"/doc/python_api || die
-		sphinx-build sphinx-in BPY_API || die "sphinx failed."
-	fi
+	cmake_src_configure
 }
 
 src_test() {
@@ -319,7 +312,36 @@ src_install() {
 		dobin "${BUILD_DIR}"/bin/cycles
 	fi
 
+	cmake_src_install
+
+	if use man; then
+		# Slot the man page
+		mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die
+	fi
+
 	if use doc; then
+		# Define custom blender data/script file paths. Otherwise Blender will not be able to find them during doc building.
+		# (Because the data is in the image directory and it will default to look in /usr/share)
+		export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
+		export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+
 		docinto "html/API/python"
 		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
 
@@ -327,13 +349,6 @@ src_install() {
 		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
 	fi
 
-	cmake_src_install
-
-	if use man; then
-		# Slot the man page
-		mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die
-	fi
-
 	# Fix doc installdir
 	docinto html
 	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
diff --git a/media-gfx/blender/blender-3.0.0.ebuild b/media-gfx/blender/blender-3.0.0-r1.ebuild
index 65bfc2f8e6d4..f5bf0d9e9916 100644
--- a/media-gfx/blender/blender-3.0.0.ebuild
+++ b/media-gfx/blender/blender-3.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_9 )
+PYTHON_COMPAT=( python3_9 python3_10 )
 
 inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils
 
@@ -65,7 +65,7 @@ RDEPEND="${PYTHON_DEPS}
 	color-management? ( >=media-libs/opencolorio-2.0.0 )
 	cuda? ( dev-util/nvidia-cuda-toolkit:= )
 	embree? ( >=media-libs/embree-3.10.0[raymask] )
-	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k,vpx,vorbis,opus,xvid] )
+	ffmpeg? ( <media-video/ffmpeg-5.0:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
 	fftw? ( sci-libs/fftw:3.0= )
 	gmp? ( dev-libs/gmp )
 	!headless? (
@@ -100,7 +100,7 @@ RDEPEND="${PYTHON_DEPS}
 	pulseaudio? ( media-sound/pulseaudio )
 	sdl? ( media-libs/libsdl2[sound,joystick] )
 	sndfile? ( media-libs/libsndfile )
-	tbb? ( <dev-cpp/tbb-2021.4.0:= )
+	tbb? ( dev-cpp/tbb:= )
 	tiff? ( media-libs/tiff )
 	valgrind? ( dev-util/valgrind )
 "
diff --git a/media-gfx/blender/blender-3.0.1-r4.ebuild b/media-gfx/blender/blender-3.0.1-r4.ebuild
new file mode 100644
index 000000000000..c053c88dd0f4
--- /dev/null
+++ b/media-gfx/blender/blender-3.0.1-r4.ebuild
@@ -0,0 +1,410 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_9 python3_10 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+
+if [[ ${PV} = *9999* ]] ; then
+	# Subversion is needed for downloading unit test files
+	inherit git-r3 subversion
+	EGIT_REPO_URI="https://git.blender.org/blender.git"
+else
+	SRC_URI="https://download.blender.org/source/${P}.tar.xz"
+	# Update these between major releases.
+	TEST_TARBALL_VERSION="3.0.0"
+	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2 )"
+	KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+SLOT="${PV%.*}"
+LICENSE="|| ( GPL-3 BL )"
+IUSE="+bullet +dds +fluid +openexr +system-python +system-numpy +tbb \
+	alembic collada +color-management cuda +cycles \
+	debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
+	man ndof nls openal +oidn +openimageio +openmp +opensubdiv \
+	+openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile standalone test +tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	alembic? ( openexr )
+	cuda? ( cycles )
+	cycles? ( openexr tiff openimageio )
+	fluid? ( tbb )
+	openvdb? ( tbb )
+	osl? ( cycles )
+	standalone? ( cycles )
+	test? ( color-management )"
+
+# Library versions for official builds can be found in the blender source directory in:
+# build_files/build_environment/install_deps.sh
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=[nls?,threads(+)]
+	dev-libs/lzo:2=
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/zstandard[${PYTHON_USEDEP}]
+	')
+	media-libs/freetype:=
+	media-libs/glew:*
+	media-libs/libpng:=
+	media-libs/libsamplerate
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/jpeg
+	virtual/libintl
+	virtual/opengl
+	alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
+	collada? ( >=media-libs/opencollada-1.6.68 )
+	color-management? ( >=media-libs/opencolorio-2.1.1-r7:= )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	embree? ( >=media-libs/embree-3.10.0[raymask] )
+	ffmpeg? ( <media-video/ffmpeg-5.0:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+	fftw? ( sci-libs/fftw:3.0= )
+	gmp? ( dev-libs/gmp )
+	!headless? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( media-libs/openal )
+	oidn? ( >=media-libs/oidn-1.4.1 )
+	openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= )
+	openexr? (
+		>=dev-libs/imath-3.1.4-r2:=
+		>=media-libs/openexr-3:0=
+	)
+	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] )
+	openvdb? (
+		>=media-gfx/openvdb-8.2.0-r2:=
+		dev-libs/c-blosc:=
+	)
+	osl? ( >=media-libs/osl-1.11.16.0-r3:= )
+	pdf? ( media-libs/libharu )
+	potrace? ( media-gfx/potrace )
+	pugixml? ( dev-libs/pugixml )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl2[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tbb? ( dev-cpp/tbb:= )
+	tiff? ( media-libs/tiff )
+	valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:=
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-python/sphinx[latex]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.0-intern-ghost-fix-typo-in-finding-XF86VMODE.patch
+	"${FILESDIR}"/${PN}-3.0.1-openexr.patch
+	"${FILESDIR}"/${PN}-3.0.1-openimageio-2.3.patch
+)
+
+blender_check_requirements() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+blender_get_version() {
+	# Get blender version from blender itself.
+	BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert)
+	if ((${BV:0:1} < 3)) ; then
+		# Add period (290 -> 2.90).
+		BV=${BV:0:1}.${BV:1}
+	else
+		# Add period and skip the middle number (301 -> 3.1)
+		BV=${BV:0:1}.${BV:2}
+	fi
+}
+
+pkg_pretend() {
+	blender_check_requirements
+}
+
+pkg_setup() {
+	blender_check_requirements
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]] ; then
+		git-r3_src_unpack
+		if use test; then
+			TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests
+			subversion_fetch ${TESTS_SVN_URL} ../lib/tests
+		fi
+	else
+		default
+		if use test; then
+			#The tests are downloaded from: https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests
+			mkdir -p lib || die
+			mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die
+		fi
+	fi
+
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	blender_get_version
+
+	# Disable MS Windows help generation. The variable doesn't do what it
+	# it sounds like.
+	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
+		-i doc/doxygen/Doxyfile || die
+
+	# Prepare icons and .desktop files for slotting.
+	sed -e "s|blender.svg|blender-${BV}.svg|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender.desktop|blender-${BV}.desktop|" -i source/creator/CMakeLists.txt || die
+
+	sed -e "s|Name=Blender|Name=Blender ${PV}|" -i release/freedesktop/blender.desktop || die
+	sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die
+	sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die
+
+	mv release/freedesktop/icons/scalable/apps/blender.svg release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die
+	mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die
+	mv release/freedesktop/blender.desktop release/freedesktop/blender-${BV}.desktop || die
+
+	if use test; then
+		# Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests.
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i tests/CMakeLists.txt || die
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die
+	fi
+}
+
+src_configure() {
+	append-lfs-flags
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DWITH_ALEMBIC=$(usex alembic)
+		-DWITH_ASSERT_ABORT=$(usex debug)
+		-DWITH_BOOST=ON
+		-DWITH_BULLET=$(usex bullet)
+		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
+		-DWITH_CYCLES=$(usex cycles)
+		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+		-DWITH_CYCLES_EMBREE=$(usex embree)
+		-DWITH_CYCLES_OSL=$(usex osl)
+		-DWITH_CYCLES_STANDALONE=$(usex standalone)
+		-DWITH_CYCLES_STANDALONE_GUI=$(usex standalone)
+		-DWITH_DOC_MANPAGE=$(usex man)
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GMP=$(usex gmp)
+		-DWITH_GTESTS=$(usex test)
+		-DWITH_HARU=$(usex pdf)
+		-DWITH_HEADLESS=$(usex headless)
+		-DWITH_INSTALL_PORTABLE=OFF
+		-DWITH_IMAGE_DDS=$(usex dds)
+		-DOPENEXR_ROOT_DIR="${ESYSROOT}/usr/$(get_libdir)/OpenEXR-3"
+		-DWITH_IMAGE_OPENEXR=$(usex openexr)
+		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+		-DWITH_IMAGE_TIFF=$(usex tiff)
+		-DWITH_INPUT_NDOF=$(usex ndof)
+		-DWITH_INTERNATIONAL=$(usex nls)
+		-DWITH_JACK=$(usex jack)
+		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
+		-DWITH_MEM_VALGRIND=$(usex valgrind)
+		-DWITH_MOD_FLUID=$(usex fluid)
+		-DWITH_MOD_OCEANSIM=$(usex fftw)
+		-DWITH_NANOVDB=OFF
+		-DWITH_OPENAL=$(usex openal)
+		-DWITH_OPENCOLLADA=$(usex collada)
+		-DWITH_OPENCOLORIO=$(usex color-management)
+		-DWITH_OPENIMAGEDENOISE=$(usex oidn)
+		-DWITH_OPENIMAGEIO=$(usex openimageio)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_OPENSUBDIV=$(usex opensubdiv)
+		-DWITH_OPENVDB=$(usex openvdb)
+		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
+		-DWITH_POTRACE=$(usex potrace)
+		-DWITH_PUGIXML=$(usex pugixml)
+		-DWITH_PULSEAUDIO=$(usex pulseaudio)
+		-DWITH_PYTHON_INSTALL=$(usex system-python OFF ON)
+		-DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON)
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_STATIC_LIBS=OFF
+		-DWITH_SYSTEM_EIGEN3=ON
+		-DWITH_SYSTEM_GLEW=ON
+		-DWITH_SYSTEM_LZO=ON
+		-DWITH_TBB=$(usex tbb)
+		-DWITH_USD=OFF
+		-DWITH_XR_OPENXR=OFF
+	)
+
+	append-flags $(usex debug '-DDEBUG' '-DNDEBUG')
+
+	if tc-is-gcc ; then
+		# These options only exist when GCC is detected.
+		# We disable these to respect the user's choice of linker.
+		mycmakeargs+=(
+			-DWITH_LINKER_GOLD=OFF
+			-DWITH_LINKER_LLD=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# A lot of tests needs to have access to the installed data files.
+	# So install them into the image directory now.
+	cmake_src_install
+
+	blender_get_version
+	# Define custom blender data/script file paths not be able to find them otherwise during testing.
+	# (Because the data is in the image directory and it will default to look in /usr/share)
+	export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
+	export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+
+	# Sanity check that the script and datafile path is valid.
+	# If they are not vaild, blender will fallback to the default path which is not what we want.
+	[ -d "$BLENDER_SYSTEM_SCRIPTS" ] || die "The custom script path is invalid, fix the ebuild!"
+	[ -d "$BLENDER_SYSTEM_DATAFILES" ] || die "The custom datafiles path is invalid, fix the ebuild!"
+
+	cmake_src_test
+
+	# Clean up the image directory for src_install
+	rm -fr ${ED}/* || die
+}
+
+src_install() {
+	blender_get_version
+
+	# Pax mark blender for hardened support.
+	pax-mark m "${BUILD_DIR}"/bin/blender
+
+	if use standalone; then
+		dobin "${BUILD_DIR}"/bin/cycles
+	fi
+
+	cmake_src_install
+
+	if use man; then
+		# Slot the man page
+		mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die
+	fi
+
+	if use doc; then
+		# Define custom blender data/script file paths. Otherwise Blender will not be able to find them during doc building.
+		# (Because the data is in the image directory and it will default to look in /usr/share)
+		export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
+		export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+
+		docinto "html/API/python"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+		docinto "html/API/blender"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+	fi
+
+	# Fix doc installdir
+	docinto html
+	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -r "${ED}"/usr/share/doc/blender || die
+
+	python_optimize "${ED}/usr/share/blender/${BV}/scripts"
+
+	mv "${ED}/usr/bin/blender-thumbnailer" "${ED}/usr/bin/blender-${BV}-thumbnailer" || die
+	mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherent risks with running unknown python scripts."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "changing the 'Temporary Files' directory in Blender preferences."
+	elog
+	ewarn
+	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
+	ewarn "libraries which are shipped with blender. Note that"
+	ewarn "these have caused security issues in the past."
+	ewarn "If you are concerned about security, file a bug upstream:"
+	ewarn "  https://developer.blender.org/"
+	ewarn
+
+	if ! use python_single_target_python3_9; then
+		elog "You are building Blender with a newer python version than"
+		elog "supported by this version upstream."
+		elog "If you experience breakages with e.g. plugins, please switch to"
+		elog "python_single_target_python3_9 instead."
+		elog "Bug: https://bugs.gentoo.org/737388"
+		elog
+	fi
+
+	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
+
+	ewarn ""
+	ewarn "You may want to remove the following directory."
+	ewarn "~/.config/${PN}/${SLOT}/cache/"
+	ewarn "It may contain extra render kernels not tracked by portage"
+	ewarn ""
+}
diff --git a/media-gfx/blender/blender-3.0.1-r5.ebuild b/media-gfx/blender/blender-3.0.1-r5.ebuild
new file mode 100644
index 000000000000..f9c141963446
--- /dev/null
+++ b/media-gfx/blender/blender-3.0.1-r5.ebuild
@@ -0,0 +1,413 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_9 python3_10 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+
+if [[ ${PV} = *9999* ]] ; then
+	# Subversion is needed for downloading unit test files
+	inherit git-r3 subversion
+	EGIT_REPO_URI="https://git.blender.org/blender.git"
+else
+	SRC_URI="https://download.blender.org/source/${P}.tar.xz"
+	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.0.1-ffmpeg-5.0.patch.bz2"
+
+	# Update these between major releases.
+	TEST_TARBALL_VERSION="3.0.0"
+	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2 )"
+	KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+SLOT="${PV%.*}"
+LICENSE="|| ( GPL-3 BL )"
+IUSE="+bullet +dds +fluid +openexr +system-python +system-numpy +tbb \
+	alembic collada +color-management cuda +cycles \
+	debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
+	man ndof nls openal +oidn +openimageio +openmp +opensubdiv \
+	+openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile standalone test +tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	alembic? ( openexr )
+	cuda? ( cycles )
+	cycles? ( openexr tiff openimageio )
+	fluid? ( tbb )
+	openvdb? ( tbb )
+	osl? ( cycles )
+	standalone? ( cycles )
+	test? ( color-management )"
+
+# Library versions for official builds can be found in the blender source directory in:
+# build_files/build_environment/install_deps.sh
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=[nls?,threads(+)]
+	dev-libs/lzo:2=
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/zstandard[${PYTHON_USEDEP}]
+	')
+	media-libs/freetype:=
+	media-libs/glew:*
+	media-libs/libpng:=
+	media-libs/libsamplerate
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/jpeg
+	virtual/libintl
+	virtual/opengl
+	alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
+	collada? ( >=media-libs/opencollada-1.6.68 )
+	color-management? ( >=media-libs/opencolorio-2.1.1-r7:= )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	embree? ( >=media-libs/embree-3.10.0[raymask] )
+	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+	fftw? ( sci-libs/fftw:3.0= )
+	gmp? ( dev-libs/gmp )
+	!headless? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( media-libs/openal )
+	oidn? ( >=media-libs/oidn-1.4.1 )
+	openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= )
+	openexr? (
+		>=dev-libs/imath-3.1.4-r2:=
+		>=media-libs/openexr-3:0=
+	)
+	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] )
+	openvdb? (
+		>=media-gfx/openvdb-8.2.0-r2:=
+		dev-libs/c-blosc:=
+	)
+	osl? ( >=media-libs/osl-1.11.16.0-r3:= )
+	pdf? ( media-libs/libharu )
+	potrace? ( media-gfx/potrace )
+	pugixml? ( dev-libs/pugixml )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl2[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tbb? ( dev-cpp/tbb:= )
+	tiff? ( media-libs/tiff )
+	valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:=
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-python/sphinx[latex]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.0-intern-ghost-fix-typo-in-finding-XF86VMODE.patch
+	"${FILESDIR}"/${PN}-3.0.1-openexr.patch
+	"${FILESDIR}"/${PN}-3.0.1-openimageio-2.3.patch
+	"${WORKDIR}"/${PN}-3.0.1-ffmpeg-5.0.patch
+)
+
+blender_check_requirements() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+blender_get_version() {
+	# Get blender version from blender itself.
+	BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert)
+	if ((${BV:0:1} < 3)) ; then
+		# Add period (290 -> 2.90).
+		BV=${BV:0:1}.${BV:1}
+	else
+		# Add period and skip the middle number (301 -> 3.1)
+		BV=${BV:0:1}.${BV:2}
+	fi
+}
+
+pkg_pretend() {
+	blender_check_requirements
+}
+
+pkg_setup() {
+	blender_check_requirements
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]] ; then
+		git-r3_src_unpack
+		if use test; then
+			TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests
+			subversion_fetch ${TESTS_SVN_URL} ../lib/tests
+		fi
+	else
+		default
+		if use test; then
+			#The tests are downloaded from: https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests
+			mkdir -p lib || die
+			mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die
+		fi
+	fi
+
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	blender_get_version
+
+	# Disable MS Windows help generation. The variable doesn't do what it
+	# it sounds like.
+	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
+		-i doc/doxygen/Doxyfile || die
+
+	# Prepare icons and .desktop files for slotting.
+	sed -e "s|blender.svg|blender-${BV}.svg|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender.desktop|blender-${BV}.desktop|" -i source/creator/CMakeLists.txt || die
+
+	sed -e "s|Name=Blender|Name=Blender ${PV}|" -i release/freedesktop/blender.desktop || die
+	sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die
+	sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die
+
+	mv release/freedesktop/icons/scalable/apps/blender.svg release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die
+	mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die
+	mv release/freedesktop/blender.desktop release/freedesktop/blender-${BV}.desktop || die
+
+	if use test; then
+		# Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests.
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i tests/CMakeLists.txt || die
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die
+	fi
+}
+
+src_configure() {
+	append-lfs-flags
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DWITH_ALEMBIC=$(usex alembic)
+		-DWITH_ASSERT_ABORT=$(usex debug)
+		-DWITH_BOOST=ON
+		-DWITH_BULLET=$(usex bullet)
+		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
+		-DWITH_CYCLES=$(usex cycles)
+		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+		-DWITH_CYCLES_EMBREE=$(usex embree)
+		-DWITH_CYCLES_OSL=$(usex osl)
+		-DWITH_CYCLES_STANDALONE=$(usex standalone)
+		-DWITH_CYCLES_STANDALONE_GUI=$(usex standalone)
+		-DWITH_DOC_MANPAGE=$(usex man)
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GMP=$(usex gmp)
+		-DWITH_GTESTS=$(usex test)
+		-DWITH_HARU=$(usex pdf)
+		-DWITH_HEADLESS=$(usex headless)
+		-DWITH_INSTALL_PORTABLE=OFF
+		-DWITH_IMAGE_DDS=$(usex dds)
+		-DOPENEXR_ROOT_DIR="${ESYSROOT}/usr/$(get_libdir)/OpenEXR-3"
+		-DWITH_IMAGE_OPENEXR=$(usex openexr)
+		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+		-DWITH_IMAGE_TIFF=$(usex tiff)
+		-DWITH_INPUT_NDOF=$(usex ndof)
+		-DWITH_INTERNATIONAL=$(usex nls)
+		-DWITH_JACK=$(usex jack)
+		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
+		-DWITH_MEM_VALGRIND=$(usex valgrind)
+		-DWITH_MOD_FLUID=$(usex fluid)
+		-DWITH_MOD_OCEANSIM=$(usex fftw)
+		-DWITH_NANOVDB=OFF
+		-DWITH_OPENAL=$(usex openal)
+		-DWITH_OPENCOLLADA=$(usex collada)
+		-DWITH_OPENCOLORIO=$(usex color-management)
+		-DWITH_OPENIMAGEDENOISE=$(usex oidn)
+		-DWITH_OPENIMAGEIO=$(usex openimageio)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_OPENSUBDIV=$(usex opensubdiv)
+		-DWITH_OPENVDB=$(usex openvdb)
+		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
+		-DWITH_POTRACE=$(usex potrace)
+		-DWITH_PUGIXML=$(usex pugixml)
+		-DWITH_PULSEAUDIO=$(usex pulseaudio)
+		-DWITH_PYTHON_INSTALL=$(usex system-python OFF ON)
+		-DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON)
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_STATIC_LIBS=OFF
+		-DWITH_SYSTEM_EIGEN3=ON
+		-DWITH_SYSTEM_GLEW=ON
+		-DWITH_SYSTEM_LZO=ON
+		-DWITH_TBB=$(usex tbb)
+		-DWITH_USD=OFF
+		-DWITH_XR_OPENXR=OFF
+	)
+
+	append-flags $(usex debug '-DDEBUG' '-DNDEBUG')
+
+	if tc-is-gcc ; then
+		# These options only exist when GCC is detected.
+		# We disable these to respect the user's choice of linker.
+		mycmakeargs+=(
+			-DWITH_LINKER_GOLD=OFF
+			-DWITH_LINKER_LLD=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# A lot of tests needs to have access to the installed data files.
+	# So install them into the image directory now.
+	cmake_src_install
+
+	blender_get_version
+	# Define custom blender data/script file paths not be able to find them otherwise during testing.
+	# (Because the data is in the image directory and it will default to look in /usr/share)
+	export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
+	export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+
+	# Sanity check that the script and datafile path is valid.
+	# If they are not vaild, blender will fallback to the default path which is not what we want.
+	[ -d "$BLENDER_SYSTEM_SCRIPTS" ] || die "The custom script path is invalid, fix the ebuild!"
+	[ -d "$BLENDER_SYSTEM_DATAFILES" ] || die "The custom datafiles path is invalid, fix the ebuild!"
+
+	cmake_src_test
+
+	# Clean up the image directory for src_install
+	rm -fr ${ED}/* || die
+}
+
+src_install() {
+	blender_get_version
+
+	# Pax mark blender for hardened support.
+	pax-mark m "${BUILD_DIR}"/bin/blender
+
+	if use standalone; then
+		dobin "${BUILD_DIR}"/bin/cycles
+	fi
+
+	cmake_src_install
+
+	if use man; then
+		# Slot the man page
+		mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die
+	fi
+
+	if use doc; then
+		# Define custom blender data/script file paths. Otherwise Blender will not be able to find them during doc building.
+		# (Because the data is in the image directory and it will default to look in /usr/share)
+		export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
+		export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+
+		docinto "html/API/python"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+		docinto "html/API/blender"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+	fi
+
+	# Fix doc installdir
+	docinto html
+	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -r "${ED}"/usr/share/doc/blender || die
+
+	python_optimize "${ED}/usr/share/blender/${BV}/scripts"
+
+	mv "${ED}/usr/bin/blender-thumbnailer" "${ED}/usr/bin/blender-${BV}-thumbnailer" || die
+	mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherent risks with running unknown python scripts."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "changing the 'Temporary Files' directory in Blender preferences."
+	elog
+	ewarn
+	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
+	ewarn "libraries which are shipped with blender. Note that"
+	ewarn "these have caused security issues in the past."
+	ewarn "If you are concerned about security, file a bug upstream:"
+	ewarn "  https://developer.blender.org/"
+	ewarn
+
+	if ! use python_single_target_python3_9; then
+		elog "You are building Blender with a newer python version than"
+		elog "supported by this version upstream."
+		elog "If you experience breakages with e.g. plugins, please switch to"
+		elog "python_single_target_python3_9 instead."
+		elog "Bug: https://bugs.gentoo.org/737388"
+		elog
+	fi
+
+	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
+
+	ewarn ""
+	ewarn "You may want to remove the following directory."
+	ewarn "~/.config/${PN}/${SLOT}/cache/"
+	ewarn "It may contain extra render kernels not tracked by portage"
+	ewarn ""
+}
diff --git a/media-gfx/blender/blender-3.1.0.ebuild b/media-gfx/blender/blender-3.1.0.ebuild
new file mode 100644
index 000000000000..50be45a07af8
--- /dev/null
+++ b/media-gfx/blender/blender-3.1.0.ebuild
@@ -0,0 +1,404 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_10 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+
+if [[ ${PV} = *9999* ]] ; then
+	# Subversion is needed for downloading unit test files
+	inherit git-r3 subversion
+	EGIT_REPO_URI="https://git.blender.org/blender.git"
+else
+	SRC_URI="https://download.blender.org/source/${P}.tar.xz"
+	# Update these between major releases.
+	TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
+	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2 )"
+	KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+SLOT="${PV%.*}"
+LICENSE="|| ( GPL-3 BL )"
+IUSE="+bullet +dds +fluid +openexr +system-python +system-numpy +tbb \
+	alembic collada +color-management cuda +cycles \
+	debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
+	man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
+	+openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile standalone test +tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	alembic? ( openexr )
+	cuda? ( cycles )
+	cycles? ( openexr tiff openimageio )
+	fluid? ( tbb )
+	openvdb? ( tbb )
+	osl? ( cycles )
+	standalone? ( cycles )
+	test? ( color-management )"
+
+# Library versions for official builds can be found in the blender source directory in:
+# build_files/build_environment/install_deps.sh
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=[nls?,threads(+)]
+	dev-libs/lzo:2=
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/zstandard[${PYTHON_USEDEP}]
+	')
+	media-libs/freetype:=
+	media-libs/glew:*
+	media-libs/libpng:=
+	media-libs/libsamplerate
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/jpeg
+	virtual/libintl
+	virtual/opengl
+	alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
+	collada? ( >=media-libs/opencollada-1.6.68 )
+	color-management? ( >=media-libs/opencolorio-2.1.1-r7:= )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	embree? ( >=media-libs/embree-3.10.0[raymask] )
+	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+	fftw? ( sci-libs/fftw:3.0= )
+	gmp? ( dev-libs/gmp )
+	!headless? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( media-libs/openal )
+	oidn? ( >=media-libs/oidn-1.4.1 )
+	openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= )
+	openexr? (
+		>=dev-libs/imath-3.1.4-r2:=
+		>=media-libs/openexr-3:0=
+	)
+	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] )
+	openvdb? (
+		>=media-gfx/openvdb-9.0.0:=[nanovdb?]
+		dev-libs/c-blosc:=
+	)
+	osl? ( >=media-libs/osl-1.11.16.0-r3:= )
+	pdf? ( media-libs/libharu )
+	potrace? ( media-gfx/potrace )
+	pugixml? ( dev-libs/pugixml )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl2[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tbb? ( dev-cpp/tbb:= )
+	tiff? ( media-libs/tiff )
+	valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:=
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-python/sphinx[latex]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	nls? ( sys-devel/gettext )
+"
+
+blender_check_requirements() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+blender_get_version() {
+	# Get blender version from blender itself.
+	BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert)
+	if ((${BV:0:1} < 3)) ; then
+		# Add period (290 -> 2.90).
+		BV=${BV:0:1}.${BV:1}
+	else
+		# Add period and skip the middle number (301 -> 3.1)
+		BV=${BV:0:1}.${BV:2}
+	fi
+}
+
+pkg_pretend() {
+	blender_check_requirements
+}
+
+pkg_setup() {
+	blender_check_requirements
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]] ; then
+		git-r3_src_unpack
+		if use test; then
+			TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests
+			subversion_fetch ${TESTS_SVN_URL} ../lib/tests
+		fi
+	else
+		default
+		if use test; then
+			#The tests are downloaded from: https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests
+			mkdir -p lib || die
+			mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die
+		fi
+	fi
+
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	blender_get_version
+
+	# Disable MS Windows help generation. The variable doesn't do what it
+	# it sounds like.
+	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
+		-i doc/doxygen/Doxyfile || die
+
+	# Prepare icons and .desktop files for slotting.
+	sed -e "s|blender.svg|blender-${BV}.svg|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender.desktop|blender-${BV}.desktop|" -i source/creator/CMakeLists.txt || die
+
+	sed -e "s|Name=Blender|Name=Blender ${PV}|" -i release/freedesktop/blender.desktop || die
+	sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die
+	sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die
+
+	mv release/freedesktop/icons/scalable/apps/blender.svg release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die
+	mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die
+	mv release/freedesktop/blender.desktop release/freedesktop/blender-${BV}.desktop || die
+
+	if use test; then
+		# Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests.
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i tests/CMakeLists.txt || die
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die
+	fi
+}
+
+src_configure() {
+	append-lfs-flags
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DWITH_ALEMBIC=$(usex alembic)
+		-DWITH_ASSERT_ABORT=$(usex debug)
+		-DWITH_BOOST=ON
+		-DWITH_BULLET=$(usex bullet)
+		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
+		-DWITH_CYCLES=$(usex cycles)
+		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+		-DWITH_CYCLES_EMBREE=$(usex embree)
+		-DWITH_CYCLES_OSL=$(usex osl)
+		-DWITH_CYCLES_STANDALONE=$(usex standalone)
+		-DWITH_CYCLES_STANDALONE_GUI=$(usex standalone)
+		-DWITH_DOC_MANPAGE=$(usex man)
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GMP=$(usex gmp)
+		-DWITH_GTESTS=$(usex test)
+		-DWITH_HARU=$(usex pdf)
+		-DWITH_HEADLESS=$(usex headless)
+		-DWITH_INSTALL_PORTABLE=OFF
+		-DWITH_IMAGE_DDS=$(usex dds)
+		-DWITH_IMAGE_OPENEXR=$(usex openexr)
+		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+		-DWITH_IMAGE_TIFF=$(usex tiff)
+		-DWITH_INPUT_NDOF=$(usex ndof)
+		-DWITH_INTERNATIONAL=$(usex nls)
+		-DWITH_JACK=$(usex jack)
+		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
+		-DWITH_MEM_VALGRIND=$(usex valgrind)
+		-DWITH_MOD_FLUID=$(usex fluid)
+		-DWITH_MOD_OCEANSIM=$(usex fftw)
+		-DWITH_NANOVDB=$(usex nanovdb)
+		-DWITH_OPENAL=$(usex openal)
+		-DWITH_OPENCOLLADA=$(usex collada)
+		-DWITH_OPENCOLORIO=$(usex color-management)
+		-DWITH_OPENIMAGEDENOISE=$(usex oidn)
+		-DWITH_OPENIMAGEIO=$(usex openimageio)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_OPENSUBDIV=$(usex opensubdiv)
+		-DWITH_OPENVDB=$(usex openvdb)
+		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
+		-DWITH_POTRACE=$(usex potrace)
+		-DWITH_PUGIXML=$(usex pugixml)
+		-DWITH_PULSEAUDIO=$(usex pulseaudio)
+		-DWITH_PYTHON_INSTALL=$(usex system-python OFF ON)
+		-DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON)
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_STATIC_LIBS=OFF
+		-DWITH_SYSTEM_EIGEN3=ON
+		-DWITH_SYSTEM_FREETYPE=ON
+		-DWITH_SYSTEM_GLEW=ON
+		-DWITH_SYSTEM_LZO=ON
+		-DWITH_TBB=$(usex tbb)
+		-DWITH_USD=OFF
+		-DWITH_XR_OPENXR=OFF
+	)
+
+	append-flags $(usex debug '-DDEBUG' '-DNDEBUG')
+
+	if tc-is-gcc ; then
+		# These options only exist when GCC is detected.
+		# We disable these to respect the user's choice of linker.
+		mycmakeargs+=(
+			-DWITH_LINKER_GOLD=OFF
+			-DWITH_LINKER_LLD=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# A lot of tests needs to have access to the installed data files.
+	# So install them into the image directory now.
+	cmake_src_install
+
+	blender_get_version
+	# Define custom blender data/script file paths not be able to find them otherwise during testing.
+	# (Because the data is in the image directory and it will default to look in /usr/share)
+	export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
+	export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+
+	# Sanity check that the script and datafile path is valid.
+	# If they are not vaild, blender will fallback to the default path which is not what we want.
+	[ -d "$BLENDER_SYSTEM_SCRIPTS" ] || die "The custom script path is invalid, fix the ebuild!"
+	[ -d "$BLENDER_SYSTEM_DATAFILES" ] || die "The custom datafiles path is invalid, fix the ebuild!"
+
+	cmake_src_test
+
+	# Clean up the image directory for src_install
+	rm -fr ${ED}/* || die
+}
+
+src_install() {
+	blender_get_version
+
+	# Pax mark blender for hardened support.
+	pax-mark m "${BUILD_DIR}"/bin/blender
+
+	if use standalone; then
+		dobin "${BUILD_DIR}"/bin/cycles
+	fi
+
+	cmake_src_install
+
+	if use man; then
+		# Slot the man page
+		mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die
+	fi
+
+	if use doc; then
+		# Define custom blender data/script file paths. Otherwise Blender will not be able to find them during doc building.
+		# (Because the data is in the image directory and it will default to look in /usr/share)
+		export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
+		export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+
+		docinto "html/API/python"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+		docinto "html/API/blender"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+	fi
+
+	# Fix doc installdir
+	docinto html
+	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -r "${ED}"/usr/share/doc/blender || die
+
+	python_optimize "${ED}/usr/share/blender/${BV}/scripts"
+
+	mv "${ED}/usr/bin/blender-thumbnailer" "${ED}/usr/bin/blender-${BV}-thumbnailer" || die
+	mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherent risks with running unknown python scripts."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "changing the 'Temporary Files' directory in Blender preferences."
+	elog
+	ewarn
+	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
+	ewarn "libraries which are shipped with blender. Note that"
+	ewarn "these have caused security issues in the past."
+	ewarn "If you are concerned about security, file a bug upstream:"
+	ewarn "  https://developer.blender.org/"
+	ewarn
+
+	if ! use python_single_target_python3_10; then
+		elog "You are building Blender with a newer python version than"
+		elog "supported by this version upstream."
+		elog "If you experience breakages with e.g. plugins, please switch to"
+		elog "python_single_target_python3_10 instead."
+		elog "Bug: https://bugs.gentoo.org/737388"
+		elog
+	fi
+
+	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
+
+	ewarn ""
+	ewarn "You may want to remove the following directory."
+	ewarn "~/.config/${PN}/${SLOT}/cache/"
+	ewarn "It may contain extra render kernels not tracked by portage"
+	ewarn ""
+}
diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild
index 1ee78855efed..f79dd995b76e 100644
--- a/media-gfx/blender/blender-9999.ebuild
+++ b/media-gfx/blender/blender-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_9 )
+PYTHON_COMPAT=( python3_10 )
 
 inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils
 
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999* ]] ; then
 else
 	SRC_URI="https://download.blender.org/source/${P}.tar.xz"
 	# Update these between major releases.
-	#TEST_TARBALL_VERSION=SLOT_NUMBER
+	#TEST_TARBALL_VERSION="3.0.0"
 	#SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2 )"
 	KEYWORDS="~amd64 ~arm ~arm64"
 fi
@@ -27,7 +27,7 @@ LICENSE="|| ( GPL-3 BL )"
 IUSE="+bullet +dds +fluid +openexr +system-python +system-numpy +tbb \
 	alembic collada +color-management cuda +cycles \
 	debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
-	man ndof nls openal +oidn +openimageio +openmp +opensubdiv \
+	man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
 	+openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile standalone test +tiff valgrind"
 RESTRICT="!test? ( test )"
 
@@ -60,12 +60,12 @@ RDEPEND="${PYTHON_DEPS}
 	virtual/jpeg
 	virtual/libintl
 	virtual/opengl
-	alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] )
+	alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
 	collada? ( >=media-libs/opencollada-1.6.68 )
-	color-management? ( >=media-libs/opencolorio-2.0.0 )
+	color-management? ( >=media-libs/opencolorio-2.1.1-r7:= )
 	cuda? ( dev-util/nvidia-cuda-toolkit:= )
 	embree? ( >=media-libs/embree-3.10.0[raymask] )
-	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k,vpx,vorbis,opus,xvid] )
+	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
 	fftw? ( sci-libs/fftw:3.0= )
 	gmp? ( dev-libs/gmp )
 	!headless? (
@@ -83,24 +83,24 @@ RDEPEND="${PYTHON_DEPS}
 	nls? ( virtual/libiconv )
 	openal? ( media-libs/openal )
 	oidn? ( >=media-libs/oidn-1.4.1 )
-	openimageio? ( >=media-libs/openimageio-2.2.13.1:= )
+	openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= )
 	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
+		>=dev-libs/imath-3.1.4-r2:=
+		>=media-libs/openexr-3:0=
 	)
 	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] )
 	openvdb? (
-		>=media-gfx/openvdb-7.1.0
+		>=media-gfx/openvdb-9.0.0:=[nanovdb?]
 		dev-libs/c-blosc:=
 	)
-	osl? ( >=media-libs/osl-1.11.10.0 )
+	osl? ( >=media-libs/osl-1.11.16.0-r3:= )
 	pdf? ( media-libs/libharu )
 	potrace? ( media-gfx/potrace )
 	pugixml? ( dev-libs/pugixml )
 	pulseaudio? ( media-sound/pulseaudio )
 	sdl? ( media-libs/libsdl2[sound,joystick] )
 	sndfile? ( media-libs/libsndfile )
-	tbb? ( <dev-cpp/tbb-2021.4.0:= )
+	tbb? ( dev-cpp/tbb:= )
 	tiff? ( media-libs/tiff )
 	valgrind? ( dev-util/valgrind )
 "
@@ -239,7 +239,7 @@ src_configure() {
 		-DWITH_MEM_VALGRIND=$(usex valgrind)
 		-DWITH_MOD_FLUID=$(usex fluid)
 		-DWITH_MOD_OCEANSIM=$(usex fftw)
-		-DWITH_NANOVDB=OFF
+		-DWITH_NANOVDB=$(usex nanovdb)
 		-DWITH_OPENAL=$(usex openal)
 		-DWITH_OPENCOLLADA=$(usex collada)
 		-DWITH_OPENCOLORIO=$(usex color-management)
@@ -257,6 +257,7 @@ src_configure() {
 		-DWITH_SDL=$(usex sdl)
 		-DWITH_STATIC_LIBS=OFF
 		-DWITH_SYSTEM_EIGEN3=ON
+		-DWITH_SYSTEM_FREETYPE=ON
 		-DWITH_SYSTEM_GLEW=ON
 		-DWITH_SYSTEM_LZO=ON
 		-DWITH_TBB=$(usex tbb)
@@ -376,11 +377,11 @@ pkg_postinst() {
 	ewarn "  https://developer.blender.org/"
 	ewarn
 
-	if ! use python_single_target_python3_9; then
+	if ! use python_single_target_python3_10; then
 		elog "You are building Blender with a newer python version than"
 		elog "supported by this version upstream."
 		elog "If you experience breakages with e.g. plugins, please switch to"
-		elog "python_single_target_python3_9 instead."
+		elog "python_single_target_python3_10 instead."
 		elog "Bug: https://bugs.gentoo.org/737388"
 		elog
 	fi
diff --git a/media-gfx/blender/files/blender-3.0.1-openexr.patch b/media-gfx/blender/files/blender-3.0.1-openexr.patch
new file mode 100644
index 000000000000..435498cd8a3d
--- /dev/null
+++ b/media-gfx/blender/files/blender-3.0.1-openexr.patch
@@ -0,0 +1,190 @@
+https://src.fedoraproject.org/rpms/blender/blob/rawhide/f/blender-openexr.patch
+
+--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
++++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
+@@ -32,30 +32,31 @@
+ #include <stdexcept>
+ #include <string>
+ 
+-#include <Iex.h>
++#include <OpenEXR/Iex.h>
+ #include <ImathBox.h>
+-#include <ImfArray.h>
+-#include <ImfChannelList.h>
+-#include <ImfCompression.h>
+-#include <ImfCompressionAttribute.h>
+-#include <ImfIO.h>
+-#include <ImfInputFile.h>
+-#include <ImfOutputFile.h>
+-#include <ImfPixelType.h>
+-#include <ImfStandardAttributes.h>
+-#include <ImfStringAttribute.h>
+-#include <ImfVersion.h>
+-#include <half.h>
++#include <OpenEXR/ImfArray.h>
++#include <OpenEXR/ImfFrameBuffer.h>
++#include <OpenEXR/ImfChannelList.h>
++#include <OpenEXR/ImfCompression.h>
++#include <OpenEXR/ImfCompressionAttribute.h>
++#include <OpenEXR/ImfIO.h>
++#include <OpenEXR/ImfInputFile.h>
++#include <OpenEXR/ImfOutputFile.h>
++#include <OpenEXR/ImfPixelType.h>
++#include <OpenEXR/ImfStandardAttributes.h>
++#include <OpenEXR/ImfStringAttribute.h>
++#include <OpenEXR/ImfVersion.h>
++#include <Imath/half.h>
+ 
+ /* multiview/multipart */
+-#include <ImfInputPart.h>
+-#include <ImfMultiPartInputFile.h>
+-#include <ImfMultiPartOutputFile.h>
+-#include <ImfMultiView.h>
+-#include <ImfOutputPart.h>
+-#include <ImfPartHelper.h>
+-#include <ImfPartType.h>
+-#include <ImfTiledOutputPart.h>
++#include <OpenEXR/ImfInputPart.h>
++#include <OpenEXR/ImfMultiPartInputFile.h>
++#include <OpenEXR/ImfMultiPartOutputFile.h>
++#include <OpenEXR/ImfMultiView.h>
++#include <OpenEXR/ImfOutputPart.h>
++#include <OpenEXR/ImfPartHelper.h>
++#include <OpenEXR/ImfPartType.h>
++#include <OpenEXR/ImfTiledOutputPart.h>
+ 
+ #include "DNA_scene_types.h" /* For OpenEXR compression constants */
+ 
+@@ -131,12 +132,12 @@ class IMemStream : public Imf::IStream {
+     return false;
+   }
+ 
+-  Int64 tellg() override
++  uint64_t tellg() override
+   {
+     return _exrpos;
+   }
+ 
+-  void seekg(Int64 pos) override
++  void seekg(uint64_t pos) override
+   {
+     _exrpos = pos;
+   }
+@@ -146,8 +147,8 @@ class IMemStream : public Imf::IStream {
+   }
+ 
+  private:
+-  Int64 _exrpos;
+-  Int64 _exrsize;
++  uint64_t _exrpos;
++  uint64_t _exrsize;
+   unsigned char *_exrbuf;
+ };
+ 
+@@ -182,12 +183,12 @@ class IFileStream : public Imf::IStream
+     return check_error();
+   }
+ 
+-  Int64 tellg() override
++  uint64_t tellg() override
+   {
+     return std::streamoff(ifs.tellg());
+   }
+ 
+-  void seekg(Int64 pos) override
++  void seekg(uint64_t pos) override
+   {
+     ifs.seekg(pos);
+     check_error();
+@@ -231,19 +232,19 @@ class OMemStream : public OStream {
+     ibuf->encodedsize += n;
+   }
+ 
+-  Int64 tellp() override
++  uint64_t tellp() override
+   {
+     return offset;
+   }
+ 
+-  void seekp(Int64 pos) override
++  void seekp(uint64_t pos) override
+   {
+     offset = pos;
+     ensure_size(offset);
+   }
+ 
+  private:
+-  void ensure_size(Int64 size)
++  void ensure_size(uint64_t size)
+   {
+     /* if buffer is too small increase it. */
+     while (size > ibuf->encodedbuffersize) {
+@@ -254,7 +255,7 @@ class OMemStream : public OStream {
+   }
+ 
+   ImBuf *ibuf;
+-  Int64 offset;
++  uint64_t offset;
+ };
+ 
+ /* File Output Stream */
+@@ -284,12 +285,12 @@ class OFileStream : public OStream {
+     check_error();
+   }
+ 
+-  Int64 tellp() override
++  uint64_t tellp() override
+   {
+     return std::streamoff(ofs.tellp());
+   }
+ 
+-  void seekp(Int64 pos) override
++  void seekp(uint64_t pos) override
+   {
+     ofs.seekp(pos);
+     check_error();
+--- a/build_files/cmake/Modules/FindOpenEXR.cmake
++++ b/build_files/cmake/Modules/FindOpenEXR.cmake
+@@ -25,6 +25,7 @@
+ # see accompanying file BSD-3-Clause-license.txt for details.
+ #=============================================================================
+ 
++
+ # If OPENEXR_ROOT_DIR was defined in the environment, use it.
+ IF(NOT OPENEXR_ROOT_DIR AND NOT $ENV{OPENEXR_ROOT_DIR} STREQUAL "")
+   SET(OPENEXR_ROOT_DIR $ENV{OPENEXR_ROOT_DIR})
+@@ -33,6 +34,16 @@ ENDIF()
+ # Old versions (before 2.0?) do not have any version string, just assuming this should be fine though.
+ SET(_openexr_libs_ver_init "2.0")
+ 
++find_package(Imath CONFIG QUIET)
++if(TARGET Imath::Imath)
++SET(_openexr_FIND_COMPONENTS
++  Imath
++  Iex
++  OpenEXR
++  IlmThread
++)
++
++else()
+ SET(_openexr_FIND_COMPONENTS
+   Half
+   Iex
+@@ -40,6 +51,7 @@ SET(_openexr_FIND_COMPONENTS
+   IlmThread
+   Imath
+ )
++endif()
+ 
+ SET(_openexr_SEARCH_DIRS
+   ${OPENEXR_ROOT_DIR}
+@@ -121,6 +133,9 @@ IF(OPENEXR_FOUND)
+   SET(OPENEXR_LIBRARIES ${_openexr_LIBRARIES})
+   # Both include paths are needed because of dummy OSL headers mixing #include <OpenEXR/foo.h> and #include <foo.h> :(
+   SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}/OpenEXR)
++  if(TARGET Imath::Imath)
++	  list(APPEND OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR}/Imath)
++  endif()
+ ENDIF()
+ 
+ MARK_AS_ADVANCED(
diff --git a/media-gfx/blender/files/blender-3.0.1-openimageio-2.3.patch b/media-gfx/blender/files/blender-3.0.1-openimageio-2.3.patch
new file mode 100644
index 000000000000..3ba3000037d0
--- /dev/null
+++ b/media-gfx/blender/files/blender-3.0.1-openimageio-2.3.patch
@@ -0,0 +1,29 @@
+https://src.fedoraproject.org/rpms/blender/raw/rawhide/f/blender-oiio-2.3.patch
+https://bugs.gentoo.org/831357
+--- a/build_files/cmake/Modules/FindOpenImageIO.cmake
++++ b/build_files/cmake/Modules/FindOpenImageIO.cmake
+@@ -48,6 +48,15 @@ FIND_LIBRARY(OPENIMAGEIO_LIBRARY
+     lib64 lib
+   )
+ 
++FIND_LIBRARY(OPENIMAGEIO_UTIL_LIBRARY
++  NAMES
++    OpenImageIO_Util
++  HINTS
++    ${_openimageio_SEARCH_DIRS}
++  PATH_SUFFIXES
++    lib64 lib
++  )
++
+ FIND_FILE(OPENIMAGEIO_IDIFF
+   NAMES
+     idiff
+@@ -64,7 +73,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenIm
+     OPENIMAGEIO_LIBRARY OPENIMAGEIO_INCLUDE_DIR)
+ 
+ IF(OPENIMAGEIO_FOUND)
+-  SET(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY})
++  SET(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY} ${OPENIMAGEIO_UTIL_LIBRARY})
+   SET(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR})
+   IF(EXISTS ${OPENIMAGEIO_INCLUDE_DIR}/OpenImageIO/pugixml.hpp)
+     SET(OPENIMAGEIO_PUGIXML_FOUND TRUE)
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index 94f27ece6871..2fbad4b1909d 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -49,6 +49,9 @@
 		<flag name="headless">
 			Build without graphical support (renderfarm, server mode only).
 		</flag>
+		<flag name="nanovdb">
+			Enable nanoVDB support in Cycles. Uses less memory than regular openVDB when rendering.
+		</flag>
 		<flag name="ndof">
 			Enable NDOF input devices (SpaceNavigator and friends).
 		</flag>
diff --git a/media-gfx/brscan4/Manifest b/media-gfx/brscan4/Manifest
index 76361221783e..ba2cb1a68d1e 100644
--- a/media-gfx/brscan4/Manifest
+++ b/media-gfx/brscan4/Manifest
@@ -1,4 +1,4 @@
 DIST brscan4-0.4.11-1.i386.rpm 100453 BLAKE2B d3801d208faf203700a6723619b1999722225400c135c7c5e6cc3cfd8a963375c2094d518ae2d18be0e0d0fbff96b238de5fd89bfc82baad5bef25b1e9b83c25 SHA512 0c07311b2f7e728f876b52d3da1473942487d4ce7dfd65d3c7aef8ff2321ac1a1e904446a60738e38722217af35d9d6455ab2bb390305da8a3c548fb024f0b70
 DIST brscan4-0.4.11-1.x86_64.rpm 119016 BLAKE2B 9b43c1e10e5e0ee63b89999390d214d71f694c885749401ac676999ffabfcc24174098b09586bd148144dd6e83f89c52c251be293e428edf0f70b964d5d5042c SHA512 c97a7f51398e34783a7099a118bad320b01e220f6ba942504194d6d2e5e10164168594820232f3861458916be1985ed23560b9b635d2755f03551c663768ebf7
-EBUILD brscan4-0.4.11.1.ebuild 2015 BLAKE2B e3eb90bb02f981354f9b178d53061cbeea0d2428efbdb7a05a54b8d58fe81ade4efc7068e9404d7c5f84a62eaee8ece1ce1fa47ad910d457fbfd616a5e816d7b SHA512 7e2796401a67b96656d8c1e774c0a37494740cd264c16fb0a5c62d67469a1f90283e4998dfd1e5b170d400f72e40330af48863cb5edd48071fd014d69d46ef41
+EBUILD brscan4-0.4.11.1-r1.ebuild 1998 BLAKE2B db3d39c3c80e0892f3d6aac06285cda59f2d3cf5f43e76424814d5ae4cb7637c09fec8273f1c08c62c6b30c75223af36c7417b57cb82cd3de5db5151c180486c SHA512 8e14dcb847e4e266c7363ed72a5a7bfb39d07c47d8264a578331efaaae59569cd3ee93ecc1a787a4dd2094a514addc9035e6f47741f2b3f3e38a0170b34bbb88
 MISC metadata.xml 291 BLAKE2B 0743394c83c6ca0d593442aba2267e89843d6add29077ed21585fc94ae5844dbe99959f37c041ae67282e19c4cfd5a883e2defdba7394f041775b300cd4cb64e SHA512 e21a50d3094f9005676ebce4152259b719232293070710cae7d3ccc4139e391336761a9ac4141873e8f6e0c548ea4cee0de6a30a22f15c0804675f4cee7ff3f8
diff --git a/media-gfx/brscan4/brscan4-0.4.11.1.ebuild b/media-gfx/brscan4/brscan4-0.4.11.1-r1.ebuild
index 380e46ee92f1..fd5e746c9ae6 100644
--- a/media-gfx/brscan4/brscan4-0.4.11.1.ebuild
+++ b/media-gfx/brscan4/brscan4-0.4.11.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit eapi8-dosym readme.gentoo-r1 rpm
+inherit readme.gentoo-r1 rpm
 
 MY_P="${PN}-${PV%.*}-${PV##*.}"
 DESCRIPTION="Brother scanner driver"
@@ -33,13 +33,13 @@ src_install() {
 	insinto /etc${dest}
 	doins Brsane4.ini brsanenetdevice4.cfg
 	doins -r models4
-	dosym8 -r {/etc,}${dest}/Brsane4.ini
-	dosym8 -r {/etc,}${dest}/brsanenetdevice4.cfg
-	dosym8 -r {/etc,}${dest}/models4
+	dosym -r {/etc,}${dest}/Brsane4.ini
+	dosym -r {/etc,}${dest}/brsanenetdevice4.cfg
+	dosym -r {/etc,}${dest}/models4
 
 	exeinto ${dest}
 	doexe brsaneconfig4
-	dosym8 -r {${dest},/usr/bin}/brsaneconfig4
+	dosym -r {${dest},/usr/bin}/brsaneconfig4
 
 	if use zeroconf; then
 		doexe brscan_cnetconfig
@@ -50,7 +50,7 @@ src_install() {
 	dolib.so "${WORKDIR}"/usr/${lib}/sane/libsane-brother4.so.1.0.7
 	dosym libsane-brother4.so.1.0.7 ${dest}/${lib}/libsane-brother4.so.1
 	dosym libsane-brother4.so.1.0.7 ${dest}/${lib}/libsane-brother4.so
-	dosym8 -r {${dest}/${lib},/usr/${lib}/sane}/libsane-brother4.so.1.0.7
+	dosym -r {${dest}/${lib},/usr/${lib}/sane}/libsane-brother4.so.1.0.7
 	dosym libsane-brother4.so.1.0.7 /usr/${lib}/sane/libsane-brother4.so.1
 	dosym libsane-brother4.so.1.0.7 /usr/${lib}/sane/libsane-brother4.so
 
diff --git a/media-gfx/cairosvg/Manifest b/media-gfx/cairosvg/Manifest
index 4d265b61e24e..8b6c83176ad4 100644
--- a/media-gfx/cairosvg/Manifest
+++ b/media-gfx/cairosvg/Manifest
@@ -1,4 +1,4 @@
 AUX cairosvg-2.5.1-no-ref.patch 923 BLAKE2B 4a14bdd5f19f9abbb9415c19cb15aecc6dee8bf34feef0cb551f4185c16e4a93ac29d6e46f81dab03f479b2e982c9d0a85a622c1292cfe6d52c6acc1c896aa7f SHA512 f1a45ba47fc3f1f4b91799d6d45b2388a2ac6b0be08695f2507b4bf34818b6a7e8c23cbfbb270c3d603d81acbe3c9bc0a867e5864b684f67540b449d684e6f0e
 DIST CairoSVG-2.5.2.tar.gz 8397659 BLAKE2B f2f45aa01015f5ccebe3dede303b6a701c0183b7b53f0d69c8756d5f0e6c0898826939f0b5bcc9e00e4185c83ff507d6fa886a020ad0b63c80a565a181807f58 SHA512 070fbb549614401a7d8290497b0eb7702330ee264c5f625cd1e7aac4aea7d71ee7d2d8899297212e1a3c11c93903b191c0c699336d9000796318b11f4e075576
-EBUILD cairosvg-2.5.2.ebuild 1064 BLAKE2B bc2397faea5ba26a79ed7c44b197196636b436f5a1739fd9e105ed5f2d426c79b908ab1083de5380a19c998d6e78866f7fd639f2145ea743aaa4ce44b7fb3851 SHA512 e059668b4c4d162bf0e7e4d589120b5a0cbb4b98db1d2a63e5568d0c54562582376c3fba5db11f710c66ff619689fda8b02f3057fd5db2961ccd921757031f31
+EBUILD cairosvg-2.5.2.ebuild 1071 BLAKE2B b011e6c9dd76c3c705ff285fa038a2dcf8419a7c076da8e75c364253d6acb5bf9197211cfce1a5617cc1f6874e9574f39729bcce798d15a03f1020ecd5b6b890 SHA512 3bf7d1e24307953c24f8b134ffc02ac8b204fcfd1d43c7561f96baceb743a8b9976a4835e578641fe095a5877e923a96b3387563cd7d28cffca3f3cd38c02c3e
 MISC metadata.xml 354 BLAKE2B 01ecfbcda4662e6db257770b23748d81858cd91ac18524bbbc1b5758f6cc5733b9c93abc8ba2435b3e3c3e3d8be92d374699980b8fa89a76a44b1abb56d931db SHA512 74a398d386aa1bb1638005ef44fef0a99e4fcdde38a0efa95f94c9a52a76357262e50221afe7b9e2b05f0e7fed22c0a3823701957b741527dc0bbaf47e718a20
diff --git a/media-gfx/cairosvg/cairosvg-2.5.2.ebuild b/media-gfx/cairosvg/cairosvg-2.5.2.ebuild
index cc2283c89dd2..9ba5be70ee6a 100644
--- a/media-gfx/cairosvg/cairosvg-2.5.2.ebuild
+++ b/media-gfx/cairosvg/cairosvg-2.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	dev-python/cairocffi[${PYTHON_USEDEP}]
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 0948c93383a3..0054e3131a20 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,3 +1,8 @@
+AUX cura-4.12.1-code-style-test.patch 406 BLAKE2B 66a94ddbb95402b2edbf2b149173f5f8ed63feaf468c3300e5d8d9cad2ca1c783d643e4e051d6994db46cc3fec853172b84f98d1c3366f995a831e7fa1b27019 SHA512 5c739fcd4c4259329f39e630d7c33e55b9a3910ec1ca778ba666e71f4087f1729c4f18b138301580f8cf8fb15b297855fe72337f2fa0b58454b8e0beecdccba3
+DIST cura-4.12.1.tar.gz 50021408 BLAKE2B 114bbe0cc022e33125486228db2eeaeacd9f4abeac8e65f3ed70231e05f4429062ce1cd49e1649959beb827b7a2d245f61c106529a18bd0cebbd0e8b9b8f883f SHA512 397048e1ed93d2e3ec326a3b0564db2b6ee2b239843346e2dd44470b11b5aea86f3f519534270789e020261c87a0100bf3bba39ddbd3a1d8be0e38e68fd7e0c0
+DIST cura-4.13.1.tar.gz 42339030 BLAKE2B e5c10ff03e42c0f88a2e7d827bf08f45c57142ca7b1dda6c00ccfbf0fd486dd366db23f00990ac5a021ecbfe038b2ca0247df8ea5130f2ee1efb766efc6f152c SHA512 6483fd6312bd2181cc812bce78aadc7e8532ecf292f09c75ce5e7870f7efddd63e84315ab40eb73c775b15c2ed2ce7fc804fcbefb73b3d8aaac77d8b22f0cbd0
 DIST cura-4.9.1.tar.gz 47870392 BLAKE2B 2471c8461f73ad2343f4c3315994c5f63781ae1e49cb4699cd66e7e77c25a93916931fbaa6598c4144707dbc7778c902dad3a25839c0523aaf51ed39aacd2463 SHA512 436b8e33514de67d6d680fe59ab9599a75a86caa7e63fbcd05297b12a435483ec0c9ca90557fe23f25590a24e533294915fc18a665fd5cdb77fcc3a05a9076bf
+EBUILD cura-4.12.1.ebuild 2412 BLAKE2B 9e7d5aa4c6a548d6b03af9595fae81e21515b3c24e2a7396a55fc6e44d36e76e6ce76ef88f953db43dfc921f028fc79d237fddc7cb964ec83b35ee364316eb7f SHA512 ffb203ad5fcaff50f6f7b4c66c771d67fed4abd5724ef345190d99a1fc3c7a5ddbe46e5c1a6d77afe0ca6e824d27b106790a49641c67985b9a22228e03647617
+EBUILD cura-4.13.1.ebuild 2562 BLAKE2B d2bacb4f5eacae22d1912c13ad796fb19dc4309ebe5542fc64e1bf6358d046cd97a5fc3c3586a72960408ab6fc723b644f483e38763c7b289f4349037d16954b SHA512 25efb45d58481d9981fdc4e8e708c208123298889b74309e7923f112ef6dc3dfbdbd78ecbe9f93f7251fe849c9a90780a4c9f009e223504515e1af89dfdd936a
 EBUILD cura-4.9.1.ebuild 2093 BLAKE2B cff46fb5b0a25cd65b7b37dfdb955ae275f049cfdf0602bf3418814a8be6a944caf83fe117547c3272d95052b624714b24079c4a2bc2c1b744d40b04340715f7 SHA512 313730100bd6d5f395017ad2422e5479d8e89e0b0d5a6afe100add25cabad76b11dd09402605dae4bb3e933a1216b756d0c2e2e79671b84f64b109c0f873526c
 MISC metadata.xml 1083 BLAKE2B 122f6c64557092750be93668e0cbd1e4b546cc711d572c0a14dae20426d722134570f7ad7cd25d769d96a264d3839b169b7c9f44f26fb0a5786c41a32c9e1f82 SHA512 1d60e79f32515d5017c17347000760702c250817c941ef0cb307ee8293c99882a4fa7c84263a7668aabb5aa5c433122c32fdd80b1dc47c32ef574c6d5e2301a0
diff --git a/media-gfx/cura/cura-4.12.1.ebuild b/media-gfx/cura/cura-4.12.1.ebuild
new file mode 100644
index 000000000000..1017dfc52e54
--- /dev/null
+++ b/media-gfx/cura/cura-4.12.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake desktop python-single-r1 xdg
+
+MY_PN=Cura
+# No fdm-materials-4.12.1 upstream, 4.12.0 is followed by 4.13.0
+FDM_PV="4.12.0"
+
+DESCRIPTION="A 3D model slicing application for 3D printing"
+HOMEPAGE="https://github.com/Ultimaker/Cura"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~x86"
+IUSE="debug test +usb zeroconf"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+	sys-devel/gettext
+	$(python_gen_cond_dep '
+		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	')
+"
+RDEPEND="${PYTHON_DEPS}
+	~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+	~dev-libs/libcharon-${PV}[${PYTHON_SINGLE_USEDEP}]
+	~dev-libs/libsavitar-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+	~dev-python/pynest2d-${PV}[${PYTHON_SINGLE_USEDEP}]
+	~dev-python/uranium-${PV}[${PYTHON_SINGLE_USEDEP}]
+	~media-gfx/curaengine-${PV}
+	~media-gfx/fdm-materials-${FDM_PV}
+	dev-qt/qtquickcontrols[widgets]
+	$(python_gen_cond_dep '
+			dev-python/importlib_metadata[${PYTHON_USEDEP}]
+			dev-python/keyring[${PYTHON_USEDEP}]
+			dev-python/mypy[${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/PyQt5[-debug,${PYTHON_USEDEP}]
+			dev-python/PyQt5-sip[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			dev-python/sentry-sdk[${PYTHON_USEDEP}]
+			dev-python/trimesh[${PYTHON_USEDEP}]
+			sci-libs/shapely[${PYTHON_USEDEP}]
+			usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
+			zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )
+	')"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.12.1-code-style-test.patch
+)
+
+DOCS=(README.md)
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	sed -i -e "s:lib\${LIB_SUFFIX}/python\${Python3_VERSION_MAJOR}.\${Python3_VERSION_MINOR}/site-packages:$(python_get_sitedir):g" CMakeLists.txt || die
+
+	# Remove failing test.  Bug #693172.
+	rm -r plugins/VersionUpgrade/VersionUpgrade44to45/tests || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCURA_BUILDTYPE="ebuild"
+		-DCURA_VERSION=${PV}
+		-DCURA_DEBUGMODE=$(usex debug)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	doicon icons/*.png
+	python_fix_shebang "${D}/usr/bin/cura"
+	python_optimize "${D}${get_libdir}"
+}
diff --git a/media-gfx/cura/cura-4.13.1.ebuild b/media-gfx/cura/cura-4.13.1.ebuild
new file mode 100644
index 000000000000..060fa6170940
--- /dev/null
+++ b/media-gfx/cura/cura-4.13.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake desktop python-single-r1 xdg
+
+FDM_MATERIALS_PV=4.13.0
+LIBCHARON_PV=4.13.0
+LIBSAVITAR_PV=4.13.0
+PYNEST2D_PV=4.13_beta # never got tagged as 4.13.0 proper
+URANIUM_PV=4.13.0 # 4.13.1 is identical and so is not packaged in ::gentoo
+
+DESCRIPTION="A 3D model slicing application for 3D printing"
+HOMEPAGE="https://github.com/Ultimaker/Cura"
+SRC_URI="https://github.com/Ultimaker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug test +usb zeroconf"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+	sys-devel/gettext
+	$(python_gen_cond_dep '
+		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	')
+"
+RDEPEND="${PYTHON_DEPS}
+	~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+	~dev-libs/libcharon-${LIBCHARON_PV}[${PYTHON_SINGLE_USEDEP}]
+	~dev-libs/libsavitar-${LIBSAVITAR_PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+	~dev-python/pynest2d-${PYNEST2D_PV}[${PYTHON_SINGLE_USEDEP}]
+	~dev-python/uranium-${URANIUM_PV}[${PYTHON_SINGLE_USEDEP}]
+	~media-gfx/curaengine-${PV}
+	~media-gfx/fdm-materials-${FDM_MATERIALS_PV}
+	dev-qt/qtquickcontrols[widgets]
+	$(python_gen_cond_dep '
+			dev-python/importlib_metadata[${PYTHON_USEDEP}]
+			dev-python/keyring[${PYTHON_USEDEP}]
+			dev-python/mypy[${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/PyQt5[-debug,${PYTHON_USEDEP}]
+			dev-python/PyQt5-sip[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			dev-python/sentry-sdk[${PYTHON_USEDEP}]
+			dev-python/trimesh[${PYTHON_USEDEP}]
+			sci-libs/shapely[${PYTHON_USEDEP}]
+			usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
+			zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )
+	')"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.12.1-code-style-test.patch
+)
+
+DOCS=( README.md )
+S="${WORKDIR}"/Cura-${PV}
+
+src_prepare() {
+	sed -i -e "s:lib\${LIB_SUFFIX}/python\${Python3_VERSION_MAJOR}.\${Python3_VERSION_MINOR}/site-packages:$(python_get_sitedir):g" CMakeLists.txt || die
+
+	# Remove failing test.  Bug #693172.
+	rm -r plugins/VersionUpgrade/VersionUpgrade44to45/tests || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCURA_BUILDTYPE="ebuild"
+		-DCURA_VERSION=${PV}
+		-DCURA_DEBUGMODE=$(usex debug)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	doicon icons/*.png
+	python_fix_shebang "${D}/usr/bin/cura"
+	python_optimize "${D}${get_libdir}"
+}
diff --git a/media-gfx/cura/files/cura-4.12.1-code-style-test.patch b/media-gfx/cura/files/cura-4.12.1-code-style-test.patch
new file mode 100644
index 000000000000..dd17c6e6188a
--- /dev/null
+++ b/media-gfx/cura/files/cura-4.12.1-code-style-test.patch
@@ -0,0 +1,18 @@
+This is a test for developers, not end users.
+
+--- a/cmake/CuraTests.cmake
++++ b/cmake/CuraTests.cmake
+@@ -50,13 +50,6 @@
+ endfunction()
+ 
+ 
+-#Add code style test.
+-add_test(
+-    NAME "code-style"
+-    COMMAND ${Python3_EXECUTABLE} run_mypy.py
+-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+-)
+-
+ #Add test for import statements which are not compatible with all builds
+ add_test(
+     NAME "invalid-imports"
diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest
index 08e706a19776..b0d38803191f 100644
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@@ -1,3 +1,7 @@
+DIST curaengine-4.12.1.tar.gz 1726565 BLAKE2B be231ec43792e1f27a6c720444c6755f71bbc3dbaea45b714c73f9b5b51753d58dafeef7ad2ed1bc21de1c39fe9f2a325ab8b85d3eb5b7f075a472dac98654b7 SHA512 c0c703ec9c7fb05389806f45174d45dd65bece169e3ad88aa1744091ce3c3c1e1e4f5af32cb55cfa9f1a4a8bffe0a008d5924a6e5d02baed00996c9112fbafef
+DIST curaengine-4.13.1.tar.gz 1727935 BLAKE2B d306f990b86e6120705b36eba6f3363adc67cf8c93c66c2da506c1ee461a5a6bdd27a4e04880daeb6cebab3ecc736d9a52eec27bf17aa9f032237a4c8ee1d2a3 SHA512 224379a40e26ae0026a3849d582353e49edf99520401e1fef56c9504638c68c62cfe394dab0eb40e4a447bfe0bfa506a880512e84fd6057a839b6384087c46d0
 DIST curaengine-4.9.1.tar.gz 1694141 BLAKE2B 84119a2dd66340bdc3a4bd58384f300fb839aa7c5920de87d070945d3c436ace0f8686cd907a204e5825bdc17809d9f9052e37fb96b37e34a20650ca625d7b1e SHA512 cfa918c6301c9948713306256d74a2a84a1fefbc0f85c7ac0eb182d8363f1eae97aecdcb91c207a2e7e1ab252f63cf4b513734b50d4229da7aa35e095ef88bee
+EBUILD curaengine-4.12.1.ebuild 2220 BLAKE2B 8827c7d543d55beb31f90606024fecc342c047c32936ceefade82379149b03013f7606dd9a0319b987babf765904682363d6125e795ba082e8478d87b13f2e2b SHA512 7998abd636444b16c46f162a7758381aa80785c8d8ff3d0759206205fb180393b733578cb0160ab562125a066298c50e5d1ff1ba8fda7b953205012caf487f24
+EBUILD curaengine-4.13.1.ebuild 2221 BLAKE2B 54990c7547fc08f3822b552db6a5acccae1e917eab49464a511fa7ad72cb08b5ec9c9f667284521da3a4c1ea4c2362919563defc75485f84461f1748178a70c1 SHA512 50b2d3cfb0c21eb6b515b6ce0c5672022b2345bab233ddb1e418fb69238a201bc5df9b48fa822ce01413f0a7b240138cfdf837a5b2a1cced43d079ce85f233a6
 EBUILD curaengine-4.9.1.ebuild 2237 BLAKE2B 274b913f4d176da6a60d9fc2512b0d8af969b725c12620ff80944e612a6d22914fad70c8797e97f4565c2fd899f6b968a0e187d7d600d83f6af1aac6a7714230 SHA512 7dfefefdb83de79c468015c8b5567177aec516fdc2f3279cdc221534e7ccfb30588744224201d6c19eee6bd4c27247137dfd3bcdf7c1ddbc002495fe305fd7a5
 MISC metadata.xml 1581 BLAKE2B c9ae9c37944858a1d85bbc2f8d2eef0be6a4a53be186f7bf189eb9d89880a4e4954c03e542fd3d7b641faf5352114453fc4a6b7bfbe4e59becb90be5bcda5c6e SHA512 a90487d6d8b44aa0e944e843e4e1d0b17dc49c82f61dbd053290a2e7caa5b175cb5d7d65eb623d28cddc5e5019b25444823d5dfee8bea30a7cb1669a9f865347
diff --git a/media-gfx/curaengine/curaengine-4.12.1.ebuild b/media-gfx/curaengine/curaengine-4.12.1.ebuild
new file mode 100644
index 000000000000..98b1c9901eb8
--- /dev/null
+++ b/media-gfx/curaengine/curaengine-4.12.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN="CuraEngine"
+
+DESCRIPTION="A 3D model slicing engine for 3D printing"
+HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~x86"
+IUSE="+arcus doc openmp test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	arcus? (
+		~dev-libs/libarcus-${PV}:*
+		dev-libs/protobuf:=
+	)
+	dev-libs/clipper
+	dev-libs/rapidjson
+	dev-libs/stb"
+
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( README.md )
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	rm -r "${S}"/libs || die
+
+	# remove static linking
+	# respect cflags
+	sed -i \
+		-e "s/-static-libstdc++//g" \
+		-e 's/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")//g' \
+		-e 's/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE_INIT}")//g' \
+		CMakeLists.txt || die
+
+	if use test; then
+		find "${S}"/tests/arcus "${S}"/tests/integration "${S}"/tests/settings "${S}"/tests/utils \
+		 -type f -name '*.cpp' | xargs sed -i \
+			-e 's <../src/utils/AABB.h> "../../src/utils/AABB.h" g'\
+			-e 's <../src/utils/IntPoint.h> "../../src/utils/IntPoint.h" g' \
+			-e 's <../src/utils/polygon.h> "../../src/utils/polygon.h" g'\
+			-e 's <../src/utils/PolygonConnector.h> "../../src/utils/PolygonConnector.h" g'\
+			-e 's <../src/utils/polygonUtils.h> "../../src/utils/polygonUtils.h" g'\
+			-e 's <../src/utils/string.h> "../../src/utils/string.h" g' \
+			-e 's <../src/utils/SVG.h> "../../src/utils/SVG.h" g' \
+			-e 's#include "../src#include "../../src#g'|| die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test ON OFF)
+		-DENABLE_ARCUS=$(usex arcus ON OFF)
+		-DENABLE_MORE_COMPILER_OPTIMIZATION_FLAGS=OFF
+		-DENABLE_OPENMP=$(usex openmp ON OFF)
+		-DUSE_SYSTEM_LIBS=ON
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		doxygen || die "generating docs failed"
+		mv docs/html . || die
+		find html -type f '(' -name '*.md5' -o -name '*.map' ')' -delete || die
+		HTML_DOCS=( html/. )
+	fi
+}
diff --git a/media-gfx/curaengine/curaengine-4.13.1.ebuild b/media-gfx/curaengine/curaengine-4.13.1.ebuild
new file mode 100644
index 000000000000..5d9281bd5518
--- /dev/null
+++ b/media-gfx/curaengine/curaengine-4.13.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN="CuraEngine"
+
+DESCRIPTION="A 3D model slicing engine for 3D printing"
+HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+arcus doc openmp test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	arcus? (
+		~dev-libs/libarcus-${PV}:*
+		dev-libs/protobuf:=
+	)
+	dev-libs/clipper
+	dev-libs/rapidjson
+	dev-libs/stb"
+
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( README.md )
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	rm -r "${S}"/libs || die
+
+	# remove static linking
+	# respect cflags
+	sed -i \
+		-e "s/-static-libstdc++//g" \
+		-e 's/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")//g' \
+		-e 's/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE_INIT}")//g' \
+		CMakeLists.txt || die
+
+	if use test; then
+		find "${S}"/tests/arcus "${S}"/tests/integration "${S}"/tests/settings "${S}"/tests/utils \
+		 -type f -name '*.cpp' | xargs sed -i \
+			-e 's <../src/utils/AABB.h> "../../src/utils/AABB.h" g'\
+			-e 's <../src/utils/IntPoint.h> "../../src/utils/IntPoint.h" g' \
+			-e 's <../src/utils/polygon.h> "../../src/utils/polygon.h" g'\
+			-e 's <../src/utils/PolygonConnector.h> "../../src/utils/PolygonConnector.h" g'\
+			-e 's <../src/utils/polygonUtils.h> "../../src/utils/polygonUtils.h" g'\
+			-e 's <../src/utils/string.h> "../../src/utils/string.h" g' \
+			-e 's <../src/utils/SVG.h> "../../src/utils/SVG.h" g' \
+			-e 's#include "../src#include "../../src#g'|| die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test ON OFF)
+		-DENABLE_ARCUS=$(usex arcus ON OFF)
+		-DENABLE_MORE_COMPILER_OPTIMIZATION_FLAGS=OFF
+		-DENABLE_OPENMP=$(usex openmp ON OFF)
+		-DUSE_SYSTEM_LIBS=ON
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		doxygen || die "generating docs failed"
+		mv docs/html . || die
+		find html -type f '(' -name '*.md5' -o -name '*.map' ')' -delete || die
+		HTML_DOCS=( html/. )
+	fi
+}
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 1536e0aec105..2d76ccb83084 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -6,12 +6,14 @@ AUX darktable-3.6.1_openexr.patch 1806 BLAKE2B 3f05c8fbb4dd5a76e98ef3d9a9432fb2c
 AUX darktable-3.8.0_libs-deps-automagic.patch 1034 BLAKE2B faac12e0c8459f7d5d3291b128a5d43e468a1c0a94d45b1c5c0d0e3fcfc6b740e5522c0c26515fc510f91061ab3aafd861465470b37d053e9d5cbee83989a8b9 SHA512 d59c6f11bcec1480eaee488e48a34b99ebfb9a30c65b9111f6a6241f9264b3602f47fbffef17315cf103bc104a135a0c951dc8ab8fbe7419dd8faaa456c8c4a6
 DIST darktable-3.6.1.tar.xz 4685928 BLAKE2B 8ff6224e21b44f9e881adb8f020a2ea5ff5abb2c38da1aeaed312f89e548918c6d3bba210dbb4fb6901fbf0872c6e14c2e12c5b5b27932914a00428a709e8965 SHA512 d53eb8472531c62ceebe97769c6e53f7c9ed6efb404905295f00b5bf547fd0f0c395b8b926ccafc78d6cf9fed0745da655a77eeb84d92fce5d6a7a576f277416
 DIST darktable-3.8.0.tar.xz 5415532 BLAKE2B a2295d9145806720c702d30a334f4d1c483fc651dfda8a39617daed4a71a436bfaa5b6b379f5ec0ee4bbec5f6f5eabbcb589b63644b5698100dd1672710d1531 SHA512 ce95983cbe3ca899103b4f5ee560fdbeeb441dccd453ac4d858b14a25050229e1e780595c66bfb491c88db35c128054f649b365d701ef4b19cf252bd847ffa59
+DIST darktable-3.8.1.tar.xz 5514756 BLAKE2B e17bf4cc8f8d3f3fd6649c66c56777aa1e946a91cec1bc3b4c59ba1285aa16c608f725f549622b740417a8040a7bb5d63b2378997a05c2095f1b6814c05815de SHA512 8b1b0c9e1a0bd9b327d34d28fe33dd1a2c7255864f6fa0c15af364a029aaa3cff5e039ff6461e48d3b4327b7656efe70ad9da12245d3a01d7566545d191448ba
 DIST darktable-usermanual-3.6.pdf 34290182 BLAKE2B 407223f6dfc25e53e2de31a05b0468a3d50ec5ccf836fa4cca61b16d43e91827c0276027ea73dd543750f240889b7325538eb474e19df86eeff4d380bf0b8829 SHA512 62c2723e5fc0434703f21bc4f5efdb997db1c0cfb800a9df217d6682325949ce18ab458a179bd20a888b73a7bd384bbbb2ea8888cba26278510abaab1e0cc335
 DIST darktable-usermanual-3.8.de.pdf 32795040 BLAKE2B f8669e1982be19bc739add60d125a5818894a7a4a6414ba15aae5e5df41ec6729c99f907e3008c42acbd6f60bc4a5d33e20d7180621d135f9fd342e6190ae6a5 SHA512 ff77afcc9a20fec36891d4487d167e40d30a1deef6418dc6bb73c94d8171b42e5edc5420457c96e08ab8581175e691f8adf91ef5259367edba55f1441d4a86d3
 DIST darktable-usermanual-3.8.en.pdf 33484632 BLAKE2B 90a4e1021917f5fad7a5a9a58e2fec95af14119ca4b48325f3e5b55e96b89f9d82b8aaa676268a255fa97cf834a109b410004a549d16742a1b33db880c46fb67 SHA512 b21683f200daca3d0ed7c3364d0c6703d976fd800d1d2ffe51df1c6cfcf2188de681cdddbf92962629a3866e18014377a58ea0e54a9fa727b663972b7f1de79a
 DIST darktable-usermanual-3.8.fr.pdf 33479509 BLAKE2B 988824b60277ea0264fec61a1157a1de048cd512a172bc86276a043c06da3a684e971cef04c31122a78b3e7305157331e6cb86cfce7a4dc4dd9dc8697eddf743 SHA512 1383bb54face948bbbad895be2470c1b13ece71c325edf40402b3416a5d9653d2e1f8c4dbfa30edd10f02c1df8b8243c9e86948c5da8d2033e28ee3c6e04bbcc
 DIST darktable-usermanual-3.8.pt_br.pdf 33648057 BLAKE2B afb6d3c1ea6b709e535e10ae2a491fb6a87c84dcfe17823a518931bda0cd8595cda72905cffc01698e60c3df991451a5cccbfcdea82966a506b2d29d61298f09 SHA512 8734a9e6c57ba37f32966873b85584c50968c1c895fa4e9d953e129bb5834f254ca46e20741d5664429ef7d6379e5a35e59f8ecb517ca88ff536b49a8216b603
 DIST darktable-usermanual-3.8.uk.pdf 33663424 BLAKE2B abeb7a04b58e7ef508b415fe11073396c78964e91fbd3face8481cd6b09cf88525b1b6bdd2988bd57d25112cd59c8c05e209931f94004349cf5b8a7a3ca59e39 SHA512 e1a81771006f5d6b7e4088455b6b444ea87b27a788cc196c2bc0b0b5d0afde241ea9e2bdbd3ffe79871f39d756d710d8e16c082a21b1194efb71f78e8724af9a
-EBUILD darktable-3.6.1-r2.ebuild 4402 BLAKE2B cd7e0a3147afb25cf1382bd009daaf5dd3c3c79da8db38e7d4471e454806c66af2594d9f1d1601524156d319c514578f790221a6ce470acd0183a642f78350a6 SHA512 16c91c5684a8184a8d0826204bba9d010f9f83b03e5f0592572236c53584dd679e14d7f6a4303434070670d401aaefc60cae7e134dd9e2d70fa50120170b1ff3
-EBUILD darktable-3.8.0-r2.ebuild 5193 BLAKE2B 2db6226a7c29a0f31568d530ce7f950369ea49f434846defacf8438d3d8cc27fc94b1b40207ba7573954dc45aead92458f873a25faccaa09802bb62ddd1ce51c SHA512 b75febae3ad0a76b61ea48d26941299a33ba5aa7934a730ad91e6f37452a905847d1eaab4ab2cb4d98496b1a6eb4136d4a0ecbec4d5e05addcc7295f8437ec54
+EBUILD darktable-3.6.1-r2.ebuild 4367 BLAKE2B 0b4f52fc619ef862d439e36c99ffd57b76d1417cd757e2ab00fcc3a436d523da090f2808cc1860478d9406908da52a2d509d1510c8fb1f371c6c0b311ca32b35 SHA512 af92a55cb0a5668bb107b06d8915aedad20d7ffb07e6a3d18a14280cf55caf09b2c0f8fdb6325c222dfc61b9667561b11e011b706ca7ef1e7bf65be58744c709
+EBUILD darktable-3.8.0-r2.ebuild 5157 BLAKE2B 02f49ff54e774848d4d4b3dc81db1559f66b1550e8fe590ae15ea6859c938ed0e27f21619fc3652eb3ca465b2cbc49a56ea8453c5b002d3cd2e1da5b2b5b2899 SHA512 5d8acf4c1c7d5ce1d17e3c737c63417b766c7dbef73c8766841502ae0bce48b35eb0fd1ff39780a6e72f1eaaed3ec6fc8cb0d2c35157a966d26045deb9e319f9
+EBUILD darktable-3.8.1.ebuild 5158 BLAKE2B 312674fc0b736dfaa1d64aaaa4cf0ff723a9c4650a812bca1a414cdb33cf1be27bbf81298e66cfce40d862cdb586a1903d6b6bacee71bb06ec3920257d2a9ca9 SHA512 a1ec0c26617efec5ae48d40e3c3aa125da021999f937804f076fe0f7f334ebda0f604004bb8579ee82038aae6e73af1a28def9d88761836acbed4b572d4face8
 MISC metadata.xml 1378 BLAKE2B 7373550c5362c32832830bd94dbd712f963246805af5119214a43cfe4dfb1aac9e7bb03d4af6f4f1dfae3cc44e09d6ba8baff53d67b5ddd96115c460b5e19ad9 SHA512 ffdc1ff8eb068372b1f24691bb0832d5a845e49b41adf211dec1c2faf0d1a573a0e4c62c38e97758a8f87de15569ce6f3cd2c7a768c95eb0d2b166e30b20ae3a
diff --git a/media-gfx/darktable/darktable-3.6.1-r2.ebuild b/media-gfx/darktable/darktable-3.6.1-r2.ebuild
index ff087a4c98dc..1ade290e81bc 100644
--- a/media-gfx/darktable/darktable-3.6.1-r2.ebuild
+++ b/media-gfx/darktable/darktable-3.6.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -136,7 +136,6 @@ src_configure() {
 		-DUSE_WEBP=$(usex webp)
 		-DWANT_JSON_VALIDATION=$(usex test)
 	)
-	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
 	cmake_src_configure
 }
 
diff --git a/media-gfx/darktable/darktable-3.8.0-r2.ebuild b/media-gfx/darktable/darktable-3.8.0-r2.ebuild
index b972b07d4be7..1b30a127d1b2 100644
--- a/media-gfx/darktable/darktable-3.8.0-r2.ebuild
+++ b/media-gfx/darktable/darktable-3.8.0-r2.ebuild
@@ -31,7 +31,7 @@ else
 			l10n_uk? ( https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.uk.pdf )
 		)"
 
-	KEYWORDS="~amd64 ~arm64 -x86"
+	KEYWORDS="amd64 ~arm64 -x86"
 	LANGS=" de eo es fi fr he hu it ja pl pt-BR sl uk zh-CN"
 fi
 
@@ -147,7 +147,6 @@ src_configure() {
 		-DUSE_WEBP=$(usex webp)
 		-DWANT_JSON_VALIDATION=$(usex test)
 	)
-	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
 	cmake_src_configure
 }
 
diff --git a/media-gfx/darktable/darktable-3.8.1.ebuild b/media-gfx/darktable/darktable-3.8.1.ebuild
new file mode 100644
index 000000000000..67728867df09
--- /dev/null
+++ b/media-gfx/darktable/darktable-3.8.1.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+
+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"
+
+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=$(ver_cut 1-2)
+	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://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.en.pdf
+			l10n_de? ( https://docs.darktable.org/usermanual/${DOC_PV}/de/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.de.pdf )
+			l10n_fr? ( https://docs.darktable.org/usermanual/${DOC_PV}/fr/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.fr.pdf )
+			l10n_pt-BR? ( https://docs.darktable.org/usermanual/${DOC_PV}/pt_br/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.pt_br.pdf )
+			l10n_uk? ( https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.uk.pdf )
+		)"
+
+	KEYWORDS="~amd64 ~arm64 -x86"
+	LANGS=" de eo es fi fr he hu it ja pl pt-BR sl uk zh-CN"
+fi
+
+IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr gamepad geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet lto lua midi nls opencl openmp openexr test tools webp
+	${LANGS// / l10n_}"
+
+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 )"
+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
+	avif? ( >=media-libs/libavif-0.8.2:= )
+	colord? ( x11-libs/colord-gtk:0= )
+	cups? ( net-print/cups )
+	flickr? ( media-libs/flickcurl )
+	gamepad? ( media-libs/libsdl2 )
+	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} )
+	midi? ( media-libs/portmidi )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:= )
+	webp? ( media-libs/libwebp:0= )"
+RDEPEND="${DEPEND}
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.0_find-opencl-header.patch
+	"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
+	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
+	"${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
+	"${FILESDIR}"/${PN}-3.6.1_openexr.patch
+	"${FILESDIR}"/${PN}-3.8.0_libs-deps-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
+
+		use openmp && tc-check-openmp
+	fi
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	use cpu_flags_x86_avx && append-flags -mavx
+	use cpu_flags_x86_sse3 && append-flags -msse3
+
+	sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-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)
+		-DTESTBUILD_OPENCL_PROGRAMS=OFF
+		-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)
+		-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_PORTMIDI=$(usex midi)
+		-DUSE_SDL2=$(usex gamepad)
+		-DUSE_WEBP=$(usex webp)
+		-DWANT_JSON_VALIDATION=$(usex test)
+	)
+	cmake_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
+		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/digikam/Manifest b/media-gfx/digikam/Manifest
index f00ea23b5ee4..51495925a6e8 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,6 +1,4 @@
 AUX digikam-7.3.0-cmake.patch 4316 BLAKE2B 7da300081ad72f6a3c1f5dc4c5c04bbc67d5cc2b2a876dfe0c72dddde19274060c9f4fb8e723a9ebf023dbd1d7993ccfa96426a26ffd4bd736213a96058ad4df SHA512 a326826ff291e9facae55ad3bbc03e5d7173437c9b9734e3b48a5eb6c18ed2f3e1afcb44a3c0f3a2b77fb67f6d414da1dc03992fa9f70d7307e5864d66e2fff3
-DIST digiKam-7.4.0.tar.xz 339575096 BLAKE2B b7a556cd8d86bbc60530d697d8ffe42c497cd8ff5dd408f7a2afd1106c96804908e15b6faf1d8090f12aaea62e99d90751ea36c6e36a7bbec62b5f194452d0f1 SHA512 aea494c4636255e25db1cee7968cdec49530064f737897940b9e2184d214b77024f31226fa76e099362966e687e5ed05bc8486ae0645c2c18d9bbcc452dd1b6e
 DIST digiKam-7.5.0.tar.xz 339573688 BLAKE2B 26014564e9f9d44db65d4588924da2c85897fb514df0a963f51b9fddb1f26ce3ddf18856b2d4b0eb140581ee7948f048986cf79687a31730e29017b5a811a3d6 SHA512 a2f5005b8f8b8cd9ef58a6bd563481a95004fbad7110d13f1ec4d8550311f1765410dda54f5b04c91bde7ec089e145656961c7c70b27242931e78abd698763e9
-EBUILD digikam-7.4.0-r1.ebuild 4024 BLAKE2B 9c929b011bb0eba32e13947561e9390f88f246e8281d5bb57043b6e0366315f5696501a10fe131b9472bd0fad78777af44837ec7f22d699ec4a2bfee391199b8 SHA512 35a6318c5ac3bd55e1c49d768967bd40cf5b60fe0db51426a9beba25f88e3abc3e79e37e8fc39c5743fcf9896bba225623c1ff36bdbf9b89cbad410c55764446
-EBUILD digikam-7.5.0.ebuild 4026 BLAKE2B 8e2ebe5832740dc5f6705aebeb86ce185c26755394e2d0abc0b9f991ddc9fecab39bfbb5cd33ffc03a68b46200d8569015dec8f04bdfdbc535dd353574cb3e7e SHA512 c623c30094dbe477647f45f5f972fe4100f8044978d3f7d949dedfc275f2a2ad0225ead35280e44766448d92098eee7171ca426a05242176b43d7f4fcc3ddd0e
+EBUILD digikam-7.5.0.ebuild 4024 BLAKE2B 9c929b011bb0eba32e13947561e9390f88f246e8281d5bb57043b6e0366315f5696501a10fe131b9472bd0fad78777af44837ec7f22d699ec4a2bfee391199b8 SHA512 35a6318c5ac3bd55e1c49d768967bd40cf5b60fe0db51426a9beba25f88e3abc3e79e37e8fc39c5743fcf9896bba225623c1ff36bdbf9b89cbad410c55764446
 MISC metadata.xml 1166 BLAKE2B 022418e3ce42ac9ec248d5301d20786cd3ddedac61e85b934d9074d9e68fa9511720976620ae84dc2def3961fba307fa9c9d84e5bd90896da7b866b21dfbf7f9 SHA512 1e249e12495dcf72e0eb02f9fa7822112afba627a0b155a2188c382e69a3697cd186757484cd0f559a2985a83ace953a62cbb4e0afb4a6c9551d89053321b3c1
diff --git a/media-gfx/digikam/digikam-7.4.0-r1.ebuild b/media-gfx/digikam/digikam-7.4.0-r1.ebuild
deleted file mode 100644
index 1c774239c811..000000000000
--- a/media-gfx/digikam/digikam-7.4.0-r1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.88.0
-QTMIN=5.15.2
-inherit ecm kde.org toolchain-funcs
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	if [[ ${PV} =~ beta[0-9]$ ]]; then
-		SRC_URI="mirror://kde/unstable/${PN}/"
-	else
-		SRC_URI="mirror://kde/stable/${PN}/${PV}/"
-	fi
-	SRC_URI+="digiKam-${PV/_/-}.tar.xz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/"
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop X"
-
-# bug 366505
-RESTRICT="test"
-
-COMMON_DEPEND="
-	dev-libs/expat
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[mysql?]
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=media-gfx/exiv2-0.27:=[xmp]
-	media-libs/lcms:2
-	media-libs/liblqr
-	media-libs/libpng:0=
-	>=media-libs/opencv-3.3.0:=[contrib,contribdnn]
-	media-libs/tiff:0
-	virtual/jpeg:0
-	addressbook? (
-		>=kde-apps/akonadi-contacts-19.04.3:5
-		>=kde-frameworks/kcontacts-${KFMIN}:5
-	)
-	calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	heif? ( media-libs/x265:= )
-	imagemagick? ( media-gfx/imagemagick:= )
-	lensfun? ( media-libs/lensfun )
-	marble? (
-		>=dev-qt/qtconcurrent-${QTMIN}:5
-		>=kde-apps/marble-19.04.3:5
-		>=kde-frameworks/kbookmarks-${KFMIN}:5
-	)
-	mediaplayer? (
-		media-libs/qtav[opengl(+)]
-		media-video/ffmpeg:=
-	)
-	opengl? (
-		>=dev-qt/qtopengl-${QTMIN}:5
-		virtual/opengl
-	)
-	panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
-	scanner? ( >=kde-apps/libksane-19.04.3:5 )
-	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/eigen:3
-	dev-libs/boost[threads(+)]
-"
-RDEPEND="${COMMON_DEPEND}
-	mysql? ( virtual/mysql[server(+)] )
-	panorama? ( media-gfx/hugin )
-"
-BDEPEND="
-	sys-devel/gettext
-	panorama? (
-		sys-devel/bison
-		sys-devel/flex
-	)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-7.3.0-cmake.patch" )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	ecm_pkg_pretend
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	ecm_pkg_setup
-}
-
-# FIXME: Unbundle libraw (libs/rawengine/libraw)
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=OFF # bug 698192
-		-DENABLE_APPSTYLES=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
-		-DENABLE_QWEBENGINE=ON
-		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
-		$(cmake_use_find_package calendar KF5CalendarCore)
-		$(cmake_use_find_package gphoto2 Gphoto2)
-		$(cmake_use_find_package heif X265)
-		$(cmake_use_find_package imagemagick ImageMagick)
-		$(cmake_use_find_package lensfun LensFun)
-		$(cmake_use_find_package marble Marble)
-		-DENABLE_MEDIAPLAYER=$(usex mediaplayer)
-		$(cmake_use_find_package mediaplayer QtAV)
-		-DENABLE_MYSQLSUPPORT=$(usex mysql)
-		-DENABLE_INTERNALMYSQL=$(usex mysql)
-		$(cmake_use_find_package opengl OpenGL)
-		$(cmake_use_find_package panorama KF5ThreadWeaver)
-		$(cmake_use_find_package scanner KF5Sane)
-		-DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/digikam/digikam-7.5.0.ebuild b/media-gfx/digikam/digikam-7.5.0.ebuild
index ec7d91762b05..1c774239c811 100644
--- a/media-gfx/digikam/digikam-7.5.0.ebuild
+++ b/media-gfx/digikam/digikam-7.5.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
 		SRC_URI="mirror://kde/stable/${PN}/${PV}/"
 	fi
 	SRC_URI+="digiKam-${PV/_/-}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${PN}-${PV/_/-}"
 fi
 
diff --git a/media-gfx/engauge/Manifest b/media-gfx/engauge/Manifest
index 7c83d651c941..959507f6df0e 100644
--- a/media-gfx/engauge/Manifest
+++ b/media-gfx/engauge/Manifest
@@ -1,4 +1,6 @@
 AUX engauge-10.6-qt-5.11.patch 662 BLAKE2B 7f287da70c06f71bd115541f636e4b5803149c9a6a8855dad388be234ba6f2981f63dc6ad97f89a890d796f4138f4d1318be1d7994b31a23232071a5999a5527 SHA512 9056af93efa32bb8619820ae990abc4ab172b2ceecc262b1f41c2e33a4b08417a4793a201a7cb7c79c648688c6366b10cb1849e1f03f4c3b5407dc2544cd12ce
 DIST engauge-digitizer-10.6.tar.gz 68463313 BLAKE2B 2f939b383d2b2ca7d3ac73196ae6c9f4cd3380f7cb1bc7703d23ffe2554bfd6dfb6f206d3b9c33953757791855c908c7899f078c1c1472549859258d406e5796 SHA512 f571978298f0646f338ee786aae692800bd73242f68a4f35509023d3ea0daaa16ede6a1d45cbc28a31efc277697315c63fe3d2cce1f0cf80334bdeea11599a67
-EBUILD engauge-10.6.ebuild 2121 BLAKE2B 9e2b2a20d1cd0e0b9686803e8bb943af14d3b18aa0f7afe815bc096d9889a2c03904c0f8b6def8f3565c70d9d2b225f8dbaccdd12023bb8d4c94296bcbf5bef1 SHA512 f9bbef207118d99d05797fe9f9369cba0059e144ebf8a9dbd3bf43f117722c5c9d9d59acac0361dd58489e66218f80c94e803454bf1c7e5812abcde7d54b8653
+DIST engauge-digitizer-12.1.tar.gz 72358942 BLAKE2B c7581734f3c5591ee5c17e16f2e68d8f75fa083d4b53933d16ea15d36890664f375ac53b5e37872eb0d2ffb5980946fe920412ee56d8a1aa16b0a81e66fcb115 SHA512 54ae573eb1e82ec3a81403c3c64af43207e139a2d97eb633993ffe31e03fedb1c1a5fe63157011851ad4a89822a3109b87a2c90a71f77865b3629a517a353a61
+EBUILD engauge-10.6.ebuild 2037 BLAKE2B 0a1bc802686216484e86d1f78541411ec96065f71669a34eee5a8aa77d1d8df73a10d15a62c9d58f1903de07347f41d8c83d8b44a23df1f974d7011e32d4e39e SHA512 f5df8d4e5fba4b72f59e35660cb690daf4ad03d20224fd4dc806260b67d2516881bf8db7995d3443b41f876da04b829c791f7d03e80ab7a0fc0af5f1afb39daf
+EBUILD engauge-12.1.ebuild 2030 BLAKE2B 2366e9f9fe0d1902488d6117f6365c5514f47989aa94cbcccb2864ba1112e052acee72699462192def3d8538db0c00db3ed3dae4fe0974968c20c6d5ab1437c1 SHA512 721f9be4023e5d2a1cdf499724a019e610b7c6ab19d85d0806a6eda48b6238e865054a54fcc9c76fecf97d57f87f635920f5fc38360d599d2abca9dc51495aa8
 MISC metadata.xml 344 BLAKE2B 35482a9cb0cddfadc856560af8580bf70bc38715d15fa9df1e910299d9246ae795070707afd7eb8e4694cd9b24cd5e6c0be87a23f4a6e3de47d16961ee631a21 SHA512 09b55d6c5f904a9a0c3735f2df0fccc0ef44ab55f677b7f6d4ca1892c48c866a44ac7b72f57a254bdf982d62d84aa2003723df223cc23de5f96cb4c326247595
diff --git a/media-gfx/engauge/engauge-10.6.ebuild b/media-gfx/engauge/engauge-10.6.ebuild
index a1c0d06f4b6e..7edd5d1d42c9 100644
--- a/media-gfx/engauge/engauge-10.6.ebuild
+++ b/media-gfx/engauge/engauge-10.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -68,16 +68,12 @@ src_install() {
 	make_desktop_entry engauge "Engauge Digitizer" engauge-digitizer Graphics
 
 	# Install qt help files
-	insinto /usr/share/doc/${PF} # this must match sed expression in src_prepare
-	doins bin/documentation/engauge.{qch,qhc}
+	dodoc bin/documentation/engauge.{qch,qhc}
 	docompress -x "${EPREFIX}"/usr/share/doc/${PF}/engauge.{qch,qhc}
 
-	if use doc; then
-		pushd doc >/dev/null || die
-		doins -r .
-		popd >/dev/null || die
-	fi
+	use doc && dodoc -r doc/.
 	if use examples; then
-		doins -r samples
+		dodoc -r samples
+		docompress -x "${EPREFIX}"/usr/share/doc/${PF}/samples
 	fi
 }
diff --git a/media-gfx/engauge/engauge-12.1.ebuild b/media-gfx/engauge/engauge-12.1.ebuild
new file mode 100644
index 000000000000..39f94ddb1b7f
--- /dev/null
+++ b/media-gfx/engauge/engauge-12.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils xdg
+
+DESCRIPTION="Convert an image file showing a graph or map into numbers"
+HOMEPAGE="https://markummitchell.github.io/engauge-digitizer/"
+SRC_URI="https://github.com/markummitchell/engauge-digitizer/archive/v${PV}.tar.gz -> engauge-digitizer-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples jpeg2k pdf"
+
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-libs/log4cpp
+	media-libs/libpng:0=
+	sci-libs/fftw:3.0
+	virtual/jpeg
+	jpeg2k? ( media-libs/openjpeg:2 )
+	pdf? ( app-text/poppler[qt5] )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/engauge-digitizer-${PV}
+
+src_prepare() {
+	default
+
+	# Make sure the documentation is looked for in the proper directory
+	sed -e "s:engauge-digitizer/engauge.qhc:${PF}/engauge.qhc:" \
+		-i src/Help/HelpWindow.cpp || die
+
+	# This otherwise overrides user CFLAGS
+	sed -e '/QMAKE_CXXFLAGS_WARN_ON/s/-O1//' \
+		-i engauge.pro || die
+
+	# Neuter the non-pkg-config hackery
+	sed -e '/error.*OPENJPEG_/d' \
+		-e '/LIBS.*OPENJPEG_LIB/d' \
+		-e '/QMAKE_POST_LINK.*OPENJPEG_LIB/d' \
+		-e '/error.*POPPLER_/d' \
+		-e '/LIBS.*POPPLER_LIB/d' \
+		-i engauge.pro || die
+}
+
+src_configure() {
+	eqmake5 \
+		CONFIG+=link_pkgconfig \
+		$(usex jpeg2k "CONFIG+=jpeg2000 PKGCONFIG+=libopenjp2" "") \
+		$(usex pdf "CONFIG+=pdf PKGCONFIG+=poppler-qt5" "") \
+		engauge.pro
+	pushd help >/dev/null || die
+	./build_qt5_12_0.bash || die
+	popd >/dev/null || die
+}
+
+src_install() {
+	dobin bin/engauge
+	doicon src/img/engauge-digitizer.svg
+	make_desktop_entry engauge "Engauge Digitizer" engauge-digitizer Graphics
+
+	# Install qt help files
+	dodoc bin/documentation/engauge.qch
+	docompress -x "${EPREFIX}"/usr/share/doc/${PF}/engauge.qch
+
+	use doc && dodoc -r doc/.
+	if use examples; then
+		dodoc -r samples
+		docompress -x "${EPREFIX}"/usr/share/doc/${PF}/samples
+	fi
+}
diff --git a/media-gfx/entice/Manifest b/media-gfx/entice/Manifest
index 4cbb141fc2f9..edc4aa70764d 100644
--- a/media-gfx/entice/Manifest
+++ b/media-gfx/entice/Manifest
@@ -1,3 +1,3 @@
 DIST entice-0_pre20210919.tar.gz 102691 BLAKE2B 2967f34acad5900c798ec2fa776cc5722cf34f4f097e37dfce50749e80a02a422f77e93f2a2d149f2151512fa6ce8f51ca9a29650276eae8cb6609c2b0e2bf20 SHA512 8f38f00d344b8477a410176e7a1ecf75ffe46a413caca4b497d81440b2a48e52cd6da35305729fe971a955de2c613ab7f78ce5c6b60884b771e8298d12f0c782
-EBUILD entice-0_pre20210919-r1.ebuild 1411 BLAKE2B bc25d667136bf2fb01b206c5ea662c59e0fab11db8f8b47b9f97a2156f3d23230af3c63a81e0ff39a2d7e8b8b2d8960ed333bb80e2fd2c5161a2e3a7a50bb555 SHA512 0304e9d361031a6882438a8842ad6d770a3fc831293895802c2d0278453541fe031c9acca1fef9a7db05ce7271a7a988327ff42a4930b0c58879c1342eaa8241
+EBUILD entice-0_pre20210919-r1.ebuild 1409 BLAKE2B 26b3e69ecd81443dc1dc0b9f013a59b4e24d88eed01d296a9bbb7a878b248cc70070a580e133db6dfca7708aba8e3bca216461867c47940584dfc8d070062349 SHA512 b627ed199b0c301f3f84c34516ebc943d9422e096d4b271e1d56ac123af70d419819e5415dde9d25d48e6faafad5278074e03e6932a8f9c32c6729d98adce07b
 MISC metadata.xml 255 BLAKE2B 6fe10a1f843a8b2494606052a69206e32fdd5edf3ca6bdfb661cf6f8e39c0e16fb652acb8697d339770f3559c56a4ba964a0e959b3e0bb456d09ee7570f0d9e9 SHA512 235170971553178916cc484a07e1c665c94cd0a7ec442d2190d3608f7a3441dd2fe08fea666ca23d151077c10c908bc1da0e57355fab43be02711be35531b362
diff --git a/media-gfx/entice/entice-0_pre20210919-r1.ebuild b/media-gfx/entice/entice-0_pre20210919-r1.ebuild
index a11d1c9be8e4..1876aaec1865 100644
--- a/media-gfx/entice/entice-0_pre20210919-r1.ebuild
+++ b/media-gfx/entice/entice-0_pre20210919-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/vtorri/entice/archive/${MY_COMMIT}.tar.gz -> ${P}.ta
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
 	media-libs/libexif"
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index e70fbb24d907..330ed7da241d 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,5 +1,3 @@
-DIST eog-plugins-3.26.7.tar.xz 482336 BLAKE2B 9cd1d7e16f8e7f1fe06c3bc2ea79ab06c397beaf9d9bfb26568ad5fb90a144ceab11f6250c7dd51ebb5d3962fff47a4c855b85725b95abca07cdc4de739a2b7e SHA512 c9312eccc5529b01cb285a165c833243ea60bb12f8be6f40ccc6da0db1bd951916000a48aa31705b048659e8d637aa7e56d761fe0f9be720a4e0ce81289d2b83
 DIST eog-plugins-3.26.8.tar.xz 479356 BLAKE2B ab781311473e045ffbb88e741427ac59f129fa53e6c551231d7b6edae81d21483dd1f1e7874561dfa29c9e9b2ba01fbdb174302bf8363478b785ec2ce38c53ec SHA512 a58aa849b09761dd0c7f7d31098560969872b03788f3f3ee81445dfb9be653b29e0e6646abc4e0164e4146abf7a9d2e6aadf56071f71c119493dcf1fd706a069
-EBUILD eog-plugins-3.26.7.ebuild 1725 BLAKE2B 5063f5a3c9e9e9a55749b6df79a1b1dba448e071c517b8eac94dcea955db715f1c4ae979dd49b9c2e549c0b5ca85d6b86fa351936259e399efc3930105a48ac8 SHA512 b4ff645c5af1295765cd2f92bd44ed3fc5a188693e14e2237cd16f6a838940d3e9bc60e6b07e77818296a0ead6c8c0b102f798695c3b4d0092c24e2c7572972a
-EBUILD eog-plugins-3.26.8.ebuild 1727 BLAKE2B d11bdef0fbced2c5a08cc07e4aa37d4d8d175c381e887e9b661b30f49f1acec9c06db8bff60c5ff2c3b345006a77284ca0dbfd5a62915390e7999c09a8d536fd SHA512 8ef59b185005fbbe54c22b3265ff2c76bfe47c03882b14889e9a0dab051d159281f7148ca38f0826cb5421e9bf894cabf32d938cd1815c62a9e71f8689a90661
+EBUILD eog-plugins-3.26.8.ebuild 1725 BLAKE2B f685d824292edc02b08cb0b2adc7d68fff1ef2868c742be61be0ff579795ebd3514f46a2594cc0d7d42eb8b95ee903a733ce88e9b2eca889944e08670c3480c2 SHA512 57604bd1094981357339c5a1382a21a517cd4538c09189a65e1927c61b63363ab36519c52cb99cf9a003e62ff887080b272a39bf4214050b7532749747da03c3
 MISC metadata.xml 429 BLAKE2B 61e0c5a268c0dbcb1a2b0a0e1d0ceb1b7795db34e022ba9229015ecf05210dcdd247c2c9867549f5c75028dcb20011f7757fd9b4ef507af65b80aa8aa1ca6f18 SHA512 d4b81d9f78bf49afe842990d9c1c9dde1c3f1bc68090f77dde1bd51b2be98ab647be10f8886da7dcc1831cabc4f7c81b18b7e6e5cadb2c5aeeec69db883509bf
diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.7.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.7.ebuild
deleted file mode 100644
index 998f6cc3c250..000000000000
--- a/media-gfx/eog-plugins/eog-plugins-3.26.7.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Eye of GNOME plugins"
-HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="+exif map picasa +python"
-REQUIRED_USE="
-	map? ( exif )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libpeas-0.7.4:=
-	>=media-gfx/eog-3.15.90
-	>=x11-libs/gtk+-3.14:3
-	exif? ( >=media-libs/libexif-0.6.16 )
-	map? (
-		media-libs/libchamplain:0.12[gtk]
-		>=media-libs/clutter-1.9.4:1.0
-		>=media-libs/clutter-gtk-1.1.2:1.0 )
-	picasa? ( >=dev-libs/libgdata-0.9.1:= )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-libs/glib-2.32:2[dbus]
-		dev-libs/libpeas:=[gtk,python,${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-		')
-		gnome-base/gsettings-desktop-schemas
-		media-gfx/eog[introspection]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local plugins="fit-to-width,send-by-mail,hide-titlebar,light-theme"
-	use exif && plugins="${plugins},exif-display"
-	use map && plugins="${plugins},map"
-	use picasa && plugins="${plugins},postasa"
-	use python && plugins="${plugins},slideshowshuffle,pythonconsole,fullscreenbg,export-to-folder,maximize-windows"
-	gnome2_src_configure \
-		$(use_enable python) \
-		--with-plugins=${plugins}
-}
-
-src_install() {
-	default
-	mv "${ED}"/usr/share/{appdata,metainfo}
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.8.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.8.ebuild
index bb6d66aaee22..4bfe1d1968cd 100644
--- a/media-gfx/eog-plugins/eog-plugins-3.26.8.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-3.26.8.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="+exif map picasa +python"
 REQUIRED_USE="
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 9e940dc0440c..10750f51dc8e 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,5 +1,3 @@
-DIST eog-40.3.tar.xz 3602276 BLAKE2B 56f0fee5677730e032420fbc53c5ae6e6a5e1461d66c2e8dfcc7e7f5055d704223005f6c5329fd3bae11a002f1429729820fa52077c63e2d91a55213200a130f SHA512 5c6af597b35adcc18846e2dbee80eaf4b3c07138826520a9f6c2567df50c20379f804f8b878c7da74dd6cab25249555113d785653c0239353e410506611ffbab
 DIST eog-41.1.tar.xz 3603320 BLAKE2B 8b0d7affe921bcb2c917f89dc3845360f784b5d5f394a7f94379c98cd905504cde7a8fb6f59aa09bc778e302113ad27ec5815e529b418d68a3012fbf9b018d65 SHA512 0fa514dd6ef195e449bbde183f94850dfca764815a95423376bc0da422d07b6cbd7b35bbdd5ba9d8f995f55aae1e1b65d57626d1809cccf95389767d0ed594e8
-EBUILD eog-40.3.ebuild 1639 BLAKE2B 9272d903acbbacfedd2ae50a1cbcaee4a689a52d550b5e23a835e40f4371808ee24ecb6a0442f3e7fb663f90977a3817ea169e1115f4b95d2819662b21eb105f SHA512 e372591952896fa5c450ea38a7c78a6914a3239451cf588edff609946a1c6396accba65d44875bdf37815f805ca5f31a0ddacbf489b631ca32c0bbcf828c1fc7
-EBUILD eog-41.1.ebuild 1641 BLAKE2B 080fc46945631d0aa9b03952c8ced75cb7761bedcc80d536d63c4f5e95134b8bea992e1b4d94ea3857c5fc2e30499822fa377867d37efabf837aae3a974eaf5b SHA512 f162b6aaeefb003a6e3a8e0f9a0c90cafc7ec14b7d867e8376c2d03a08616b028dfc0775462a25945a8dca7b02394ea94cd5c983467f6ab95e558c8b9d3118ae
+EBUILD eog-41.1.ebuild 1638 BLAKE2B 1a794ce6f1dad0814421a93c46b50fe01db32105f6f02ff5c0be382331abd2c830a836f293f879902e0cbff5cad17a79c011e8cac357f3673edec997b0ac9140 SHA512 007349404c2bbd0d24a9b84843e9c4ca6db8bc9c9c09fe7638234fe8dc022b6297fe4e903bd286c0c58fad566a43dee8711f256b45d2fad9db3fff3f4da2b18b
 MISC metadata.xml 482 BLAKE2B 03780ad7b79dd3b35ee6a9b3ee95bceb94ebbd97de711912ba0f5e61ef4e25d9a20a474011cd3c5261c82757105bed5383f16259468dee80bfd6cdcec13b5828 SHA512 0c51ba4ac4859bc5e6361862282a76a98343ad3e46dfac04e088c79ec25683e820ea907991212979b5fffa0b757a66ea33ddfcff7a8012e42e81dba0e943ea39
diff --git a/media-gfx/eog/eog-40.3.ebuild b/media-gfx/eog/eog-40.3.ebuild
deleted file mode 100644
index 44cf8e5d944c..000000000000
--- a/media-gfx/eog/eog-40.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="The Eye of GNOME image viewer"
-HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
-
-LICENSE="GPL-2+"
-SLOT="1"
-
-IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
-REQUIRED_USE="exif? ( jpeg )"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.53.4:2
-	>=dev-libs/libpeas-0.7.4:=[gtk]
-	>=gnome-base/gnome-desktop-2.91.2:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=x11-misc/shared-mime-info-0.20
-	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
-	>=x11-libs/gtk+-3.22.0:3[introspection,X]
-	sys-libs/zlib
-
-	exif? ( >=media-libs/libexif-0.6.14 )
-	lcms? ( media-libs/lcms:2 )
-	xmp? ( media-libs/exempi:2 )
-	jpeg? ( virtual/jpeg:0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	svg? ( >=gnome-base/librsvg-2.44.0:2 )
-
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? ( >=dev-util/gtk-doc-1.16
-		app-text/docbook-xml-dtd:4.1.2 )
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use exif libexif)
-		$(meson_use lcms cms)
-		$(meson_use xmp)
-		$(meson_use jpeg libjpeg)
-		$(meson_use svg librsvg)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-		-Dinstalled_tests=false
-		-Dlibportal=false # As of 40.3, all libportal usages are flatpak-specific
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/eog/eog-41.1.ebuild b/media-gfx/eog/eog-41.1.ebuild
index 27a90068e4a1..64b5dc1b4a9b 100644
--- a/media-gfx/eog/eog-41.1.ebuild
+++ b/media-gfx/eog/eog-41.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SLOT="1"
 IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
 REQUIRED_USE="exif? ( jpeg )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.53.4:2
diff --git a/media-gfx/ephoto/Manifest b/media-gfx/ephoto/Manifest
index 3e2e4012d7b2..98195e349e51 100644
--- a/media-gfx/ephoto/Manifest
+++ b/media-gfx/ephoto/Manifest
@@ -1,5 +1,5 @@
 DIST ephoto-1.5-1.tar.xz 327004 BLAKE2B 73b6f72085c845e3bc39a70f1a5b087741ee9d2b6d0a7678af90b78dd08cd68defd7256a12e4ce2f9acab1fc93aafcfcac0f2ee689e9ef0b68f8837446fbf58d SHA512 2c56103e6018ef0252dd5efcb0996e9346c383887b6d272f4fddc0b22e0f98dc032049c8521bca6707f1a5d172abc2d6c8e037104f4aa7a5f920fd55a2fad23e
 DIST ephoto-1.6.0.tar.xz 141256 BLAKE2B 3dab78be3c6adeb07e9bec5f2130d126d8c41c76a3ba23917600b734df5d695acb417861924f46a4fea764e61483bd9e0504c23e627c04da09f12cc0f79ff41f SHA512 9e74857edbeb7b6999077a8108c7aa368c0c0bc7411891541f818eb428336f75e79bfeb5f5828b889ab5298542227dcefbf57893eb00a6136a895cc1eee9efe9
 EBUILD ephoto-1.5.ebuild 575 BLAKE2B 198c1646f1e6ffdfb63737d40b6b9b88a32f391070bce32c9ea96145442c39c35d8df651e43e9109ae267ee1b40811cb89845a11a939f3c43add9e2784508e68 SHA512 b27b0a09d84ccee58067bc8350daa09de38fd67d3afa068797207c63f7452c3b4021b0a213c1b9aab8384b4d14a421d6822e4246d75b8f638084d01eaa72223f
-EBUILD ephoto-1.6.0.ebuild 474 BLAKE2B e5f9686ca40b311a747fed1ca2037c100c49411b02ab46b59327acc92a5f3557d0a61d89179e976357afc5f740f5b39d84db863472d0efa8ff14a14aa95411f5 SHA512 b98b10e4aa9ea8e7eeeb78988f07e45f4a669d5c78f4f4b876ac2441c9415bcdc28a66a209036b003f5358295ab2edbd4dd5bb1e020c967da70e099ed8203d46
+EBUILD ephoto-1.6.0.ebuild 472 BLAKE2B 9d3a6358cf11ca40b443a0c723df17dcd2fd2dc18a37acf8538506c997c034a68a962eed1671c695ffb9fb59ff9e2a4a956982c02c01eb7aec0b2181472b2226 SHA512 d46f1e504553a9f4d8206ea65b6932e83707c23d68bbae9c9015212cafceffb22430273f54ffc415c0725fa4abaa5b937dee26500727e97fa9aa8ccaa40dec6e
 MISC metadata.xml 1114 BLAKE2B ea8d8b62aaee7bf216c1dc7b7cb4e8f9cfeb786d6d81c354fa265ff3c4563da36cdc492eac1c776dee17a50608080c1ffff360b4d78990c4d1e916d4bdde9680 SHA512 3b9d809c5a50a72a6c0fd25177e933925c03daf87cbf7d0ef98391a945f96071482cbc824fd7d1193427fdb41c137329530e234c2450710a36f54a4815423e0b
diff --git a/media-gfx/ephoto/ephoto-1.6.0.ebuild b/media-gfx/ephoto/ephoto-1.6.0.ebuild
index 8d0a1984e3ea..b0a746349e80 100644
--- a/media-gfx/ephoto/ephoto-1.6.0.ebuild
+++ b/media-gfx/ephoto/ephoto-1.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/ephoto/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=dev-libs/efl-1.26.1[eet,X]
 	media-libs/libexif"
diff --git a/media-gfx/exact-image/Manifest b/media-gfx/exact-image/Manifest
index 7ec9b5343993..efb379ded4a7 100644
--- a/media-gfx/exact-image/Manifest
+++ b/media-gfx/exact-image/Manifest
@@ -3,5 +3,6 @@ AUX exact-image-1.0.2-g++.patch 936 BLAKE2B 6ab787c1393228bb1671c8a2d7b76969fcd1
 AUX exact-image-1.0.2-gcc6.patch 2795 BLAKE2B 17282b91baa020b94654c92d87611001584f82360303a56e70cb8f081caf400394a367982e115bff094dfe11a0798503a606de106f1bf6427b57a9ede1cd6ed5 SHA512 ef42fccab6d0958df2dcf86578f9df1f84254515c2bea611f256e23227b9d6dc917467f2d8f54230f9386e9726152c6bbe4ab4f3d117e0da5a3e99b00e93e348
 AUX exact-image-1.0.2-php.patch 481 BLAKE2B bf9a3935813098c5248bac843c580d61266b60cf7063824c90e5b87df552d2b0fa125648f4ebcba46acc29d72f9bcd0a0c647467ebdc0d433616da5d8c16225f SHA512 b984095cc071558ce8b7d4b7db2915f793ed8d468f38757d2faab0f7ffc9e866a06838a5d0c578f67e9cc3e88f2bd07b0cde00ce95d909cdc07e5fbf24f3e62e
 DIST exact-image-1.0.2.tar.bz2 322174 BLAKE2B 67afefb4c5a52416459cd4ac6198012eb6d7895a73ea8363fae05286c7e7f62aa1a02166985f53b5638c7dc7b23b4dc1fb1c7b2272a9dc595ce329a7083ee1b9 SHA512 8ba5a198a236ddf5fa58f40c80f32ba9d300376c637a13a7acf3d2db7906fced373b33a7ecff9cff4d09d8b21de9ce1fb9f5bfb1f4522557bd01af0e3d6dcc65
-EBUILD exact-image-1.0.2-r2.ebuild 2405 BLAKE2B fdb0b4bb689fb0ae31afaeb51e3e248c08dfbe2753040b12a49bafcb400e7cf34b3915cfe79175776efe6fd9faf06c930fea0ac4056d3e1b98f3d20a40e8fc67 SHA512 5745dd9e8f9fd8f3dbfa91b02028162360632bdb359d3747bce530e1e837bc54230dc7962b6c46441ffd2521bcfd1ee8153f0b0207c3fa4f6efc00a2e4762d91
+EBUILD exact-image-1.0.2-r3.ebuild 2503 BLAKE2B 73421bd5bc02e7ff4dfa1ec67d946395a05b034e9df69325f7db24366ce99de682ccd2ade88a0393362a415b5499794aaafed8ebaf5c6a547b9cf95310038e34 SHA512 764bc63f1682a733c3971bcbfcfd27a69eed2c0f88cfa95a7c8c8fd1b289021ea9433cec84751df976cbc66fc7cf0b98ba3687db74dbbbba577c65506da6d536
+EBUILD exact-image-1.0.2-r4.ebuild 4108 BLAKE2B 867fb014c95adf5f31fd63d8df742d9e477a6547c6135d4736afad04cb00bbb801b7de9305fe5e3b664b92d44a58825af12eacb18e67637aa8148141f48dcce3 SHA512 9b56503e2deb901060252cb7a62afbdb3f5c5abe0b14a2ba1ac6ab6d17d87598a2f5bbabd46323bc220b9f6127d10ee392bb0d4bd7f795efe3dae9a30dd3b0dd
 MISC metadata.xml 330 BLAKE2B 468dfd9c9bc2687f285c5a7496aa989843c32929b4c410253f1d046df2e2416604f6ff8b1cb4622e85e27f13f26cede91825d04b7748cb4f74fdff13478046c1 SHA512 01bc80b3dc7ed3ff2f3402ecd3214793d18267be1e1e4c4b42718b6f6a4982404e243771917fbbae7a1bd6b12a1cd80534d9738149ec9b2a88bbc1ad62fcdf14
diff --git a/media-gfx/exact-image/exact-image-1.0.2-r2.ebuild b/media-gfx/exact-image/exact-image-1.0.2-r3.ebuild
index 32d67a26443a..700070540cde 100644
--- a/media-gfx/exact-image/exact-image-1.0.2-r2.ebuild
+++ b/media-gfx/exact-image/exact-image-1.0.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="expat jpeg lua openexr php perl png ruby swig tiff truetype X"
-REQUIRED_USE="lua? ( swig )"
+REQUIRED_USE="lua? ( swig ) perl? ( swig ) php? ( swig ) ruby? ( swig )"
 
 RDEPEND="
 	x11-libs/agg[truetype]
@@ -23,7 +23,7 @@ RDEPEND="
 	expat? ( dev-libs/expat )
 	jpeg? ( virtual/jpeg )
 	lua? ( ${LUA_DEPS} )
-	openexr? ( <media-libs/openexr-3.0.0:0= )
+	openexr? ( media-libs/openexr:= )
 	php? ( dev-lang/php:* )
 	perl? ( dev-lang/perl )
 	png? ( >=media-libs/libpng-1.2.43 )
@@ -35,8 +35,7 @@ RDEPEND="
 		x11-libs/libXt
 		x11-libs/libICE
 		x11-libs/libSM
-	)
-"
+	)"
 DEPEND="
 	${RDEPEND}
 	swig? ( dev-lang/swig )
@@ -72,6 +71,11 @@ src_prepare() {
 	sed -i \
 		-e 's/strcpy(\([^,]*\)\(,["a-zA-Z -]*\))/memcpy(\1\2, sizeof(\1))/' \
 		codecs/tga.cc || die
+
+	# openexr vers 3
+	sed -i \
+		-e 's:Int64:uint64_t:g' \
+		codecs/openexr.cc || die
 }
 
 src_configure() {
@@ -97,7 +101,6 @@ src_configure() {
 		--without-bardecode \
 		$(use_with lua) \
 		$(use_with swig) \
-		--without-python \
 		$(use_with perl) \
 		--without-python \
 		$(use_with php) \
diff --git a/media-gfx/exact-image/exact-image-1.0.2-r4.ebuild b/media-gfx/exact-image/exact-image-1.0.2-r4.ebuild
new file mode 100644
index 000000000000..f166ddcf3d83
--- /dev/null
+++ b/media-gfx/exact-image/exact-image-1.0.2-r4.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_NAME="exactimage"
+USE_PHP="php7-4"
+PHP_EXT_OPTIONAL_USE="php"
+PHP_EXT_SKIP_PATCHES="yes"
+PHP_EXT_SKIP_PHPIZE="yes"
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit php-ext-source-r3 lua-single toolchain-funcs
+
+DESCRIPTION="A fast, modern and generic image processing library"
+HOMEPAGE="https://exactcode.com/opensource/exactimage/"
+SRC_URI="http://dl.exactcode.de/oss/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="expat jpeg lua openexr php perl png ruby swig tiff truetype X"
+REQUIRED_USE="lua? ( swig ) perl? ( swig ) php? ( swig ) ruby? ( swig )"
+# Tests are broken; 'make check' fails and referenced testsuite dir not found
+RESTRICT="test"
+
+RDEPEND="
+	x11-libs/agg[truetype]
+	sys-libs/zlib
+	expat? ( dev-libs/expat )
+	jpeg? ( virtual/jpeg )
+	lua? ( ${LUA_DEPS} )
+	openexr? ( media-libs/openexr:= )
+	perl? ( dev-lang/perl )
+	png? ( >=media-libs/libpng-1.2.43 )
+	ruby? ( dev-lang/ruby:* )
+	tiff? ( media-libs/tiff )
+	truetype? ( >=media-libs/freetype-2 )
+	X? (
+		x11-libs/libXext
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+	)"
+DEPEND="
+	${RDEPEND}
+	swig? ( dev-lang/swig )
+"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc6.patch
+	"${FILESDIR}"/${P}-g++.patch
+	"${FILESDIR}"/${P}-dcraw.patch
+	"${FILESDIR}"/${P}-php.patch
+)
+
+src_prepare() {
+	default
+
+	# Respect user CFLAGS/CXXFLAGS.
+	sed -i \
+		-e '/C\(XX\)\?FLAGS =/s/-O2//' \
+		-e "\$aCFLAGS += ${CFLAGS}\nCXXFLAGS += ${CXXFLAGS}" \
+		Makefile || die
+
+	# Show commands.  Use qualified CC/CXX.
+	sed -i \
+		-e '/^Q =/d' \
+		-e '/^\t@echo /d' \
+		-e "\$aCC:=$(tc-getCC)\nCXX:=$(tc-getCXX)" \
+		build/bottom.make || die
+
+	# The copied string fits exactly.  Use memcpy to reflect that a null
+	# terminator is not needed.
+	sed -i \
+		-e 's/strcpy(\([^,]*\)\(,["a-zA-Z -]*\))/memcpy(\1\2, sizeof(\1))/' \
+		codecs/tga.cc || die
+
+	# openexr vers 3
+	sed -i \
+		-e 's:Int64:uint64_t:g' \
+		codecs/openexr.cc || die
+
+	# When using PHP, the php-config binary should be specified by slot
+	# Cannot be done in a patch as it is live
+	if use php ; then
+		php-ext-source-r3_src_prepare
+		local slot
+		for slot in $(php_get_slots); do
+			php_init_slot_env "${slot}"
+			sed -i "s~php-config~${PHPCONFIG}~" configure || die
+		done
+	fi
+}
+
+src_configure() {
+	# evas -> enlightenment overlay
+	# bardecode -> protected by custom license
+	# libungif -> not supported anymore
+	# python -> allegedly not python3, but python2 only
+
+	./configure \
+		--prefix=/usr \
+		--libdir=/usr/$(get_libdir) \
+		$(use_with X x11) \
+		$(use_with truetype freetype) \
+		--without-evas \
+		$(use_with jpeg libjpeg) \
+		$(use_with tiff libtiff) \
+		$(use_with png libpng) \
+		--without-libgif \
+		--without-jasper \
+		$(use_with openexr) \
+		$(use_with expat) \
+		--without-lcms \
+		--without-bardecode \
+		$(use_with lua) \
+		$(use_with swig) \
+		$(use_with perl) \
+		--without-python \
+		--without-php \
+		$(use_with ruby) || die
+	if use php; then
+		local slot
+		for slot in $(php_get_slots); do
+			php_init_slot_env "${slot}"
+			./configure \
+				--prefix=/usr \
+				--libdir=/usr/$(get_libdir) \
+				--without-x11 \
+				$(use_with truetype freetype) \
+				--without-evas \
+				$(use_with jpeg libjpeg) \
+				$(use_with tiff libtiff) \
+				$(use_with png libpng) \
+				--without-jasper \
+				--without-libgif \
+				$(use_with openexr) \
+				$(use_with expat) \
+				--without-lcms \
+				--without-bardecode \
+				--without-lua \
+				--with-swig \
+				--without-perl \
+				--without-python \
+				--with-php \
+				--without-ruby || die
+		done
+	fi
+}
+
+src_compile() {
+	default
+	if use php ; then
+		local slot
+		for slot in $(php_get_slots); do
+			php_init_slot_env "${slot}"
+			# Copy built objects from default
+			cp -a "${S}/objdir" . || die
+			emake
+		done
+	fi
+}
+
+src_install() {
+	default
+	if use php ; then
+		local slot
+		for slot in $(php_get_slots); do
+			php_init_slot_env "${slot}"
+			exeinto "${EXT_DIR#$EPREFIX}"
+			newexe objdir/api/php/ExactImage.so "${PHP_EXT_NAME}.so"
+		done
+		php-ext-source-r3_createinifiles
+	fi
+}
diff --git a/media-gfx/fdm-materials/Manifest b/media-gfx/fdm-materials/Manifest
index 0edf7e2aa9b1..0775b888c42f 100644
--- a/media-gfx/fdm-materials/Manifest
+++ b/media-gfx/fdm-materials/Manifest
@@ -1,3 +1,7 @@
+DIST fdm-materials-4.12.0.tar.gz 56076 BLAKE2B bf774ca70cc40da1b8c484198932d0c6bff01a35b5cba6a2e2112fd56b60bb3d51ddca6748716df9fd28c856311f38d13b48aa69f48a5d892e5f5870233d239d SHA512 891ba751dd94d5e733c2b283b39549dbdc075fcacbbc77598cdfcc944a225c9bded3c2f5ba75f5538bccfc8484cf7a7fcab869c199d81c047ac236225220f230
+DIST fdm-materials-4.13.0.tar.gz 58458 BLAKE2B a73e4eff8e6a8104b985d8c6b73739032bad7a2ad184a96c02df85e9f16e72fa7390b96f4cbd6fd9b38db440eefa83d22b42b6a6a7fc1b4b119f1400dd1a075c SHA512 12e08d3f0a7871b95f70ad0c5fae9027923de004595c0516df34dbe91b59ed13092b984cf1e11ac6162c577f157cb17195dcca9e4aa97e5c0fc9721a640a0a21
 DIST fdm-materials-4.9.1.tar.gz 46874 BLAKE2B 59aed353a7ed8cf1307de491f11a2b550df370553eee4ecfd803c07018f0a04a052653af49edc89a84172148b8ca1dac37a96236744d19d2f53fc320f42586bb SHA512 a615e1a75e0125642c348aeb28a1a52d1a32bec6946c8d4d6788455442cbdb2575326c7331c429df2031f1eb41b790dfd929792b40296262f18150decaf8baed
+EBUILD fdm-materials-4.12.0.ebuild 543 BLAKE2B 3912ac76bd5892d864e313d1f465ff8897d6844468073393ef7fc47481f9e27c3857210d1d797cf8cf47a2eff8e388f00d74fbbfcce0874d5c8067d20c2eef28 SHA512 84038ba978d7553dc7e7c7e045a1bb40aa4e2f92e1a8fa8f0bb41f5411184b4dcf3ad24d65bec40437dd99c8ee34bf86132912110b914120b08f8730b182611d
+EBUILD fdm-materials-4.13.0.ebuild 544 BLAKE2B 77363689855dff29a8fa09e878e2260415c8c6d6d6f4f3a906ed6ced91f32d5bf93ce7b47d103210ba99293367ee81ff5732d141a1992a98293480a1c50907ed SHA512 590f864a8bd4b065cd1566cd77a75364f67710d7dafbea46f1e995da7e936655a1f2080dd72b1c7f9cbe8e71dd344c5c131934cbe0bdae3873564e8154bd69f5
 EBUILD fdm-materials-4.9.1.ebuild 544 BLAKE2B 2cfa3bc8ac9e93c58ec68ac76a661f3e3c5f1fce3330950f231e4dcc39fabf7548c11488411d6906c336e0cca50f57be29d7e988514531be33c22031eb734660 SHA512 305011a3b0d2c853aee727cda629fa577121aafc21a4077557a34a0402dd4cfa41bf9987dc182eb9ddb7ea076238f705a82984e900a1c5fd2e14e93d650072be
 MISC metadata.xml 994 BLAKE2B 477271a4ea6891c6cdb09ff9d461487a8005004d412fb44a18f284b5dadf045ba1672c435dd8ba7c379eb1e183916fc1e7057c81deda8d937b62dc03f4585db0 SHA512 0373206da496595ad5f13617c66c620124f1c9eb9f186bb4f029d0fc2381db6345f5ef9f85607d999653be1bc3374bddb10605f55b0f7221ebb18653d46e99d9
diff --git a/media-gfx/fdm-materials/fdm-materials-4.12.0.ebuild b/media-gfx/fdm-materials/fdm-materials-4.12.0.ebuild
new file mode 100644
index 000000000000..40f54fb77a6b
--- /dev/null
+++ b/media-gfx/fdm-materials/fdm-materials-4.12.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN="fdm_materials"
+
+DESCRIPTION="FDM materials for media-gfx/cura"
+HOMEPAGE="https://github.com/Ultimaker/fdm_materials"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~x86"
+IUSE="embedded"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DEMBEDDED=$(usex embedded on off)
+	)
+	cmake_src_configure
+}
diff --git a/media-gfx/fdm-materials/fdm-materials-4.13.0.ebuild b/media-gfx/fdm-materials/fdm-materials-4.13.0.ebuild
new file mode 100644
index 000000000000..5a6f03ee8f5f
--- /dev/null
+++ b/media-gfx/fdm-materials/fdm-materials-4.13.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN="fdm_materials"
+
+DESCRIPTION="FDM materials for media-gfx/cura"
+HOMEPAGE="https://github.com/Ultimaker/fdm_materials"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="embedded"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DEMBEDDED=$(usex embedded on off)
+	)
+	cmake_src_configure
+}
diff --git a/media-gfx/flameshot/Manifest b/media-gfx/flameshot/Manifest
index f9fc49588dc4..b85a7456e48a 100644
--- a/media-gfx/flameshot/Manifest
+++ b/media-gfx/flameshot/Manifest
@@ -6,8 +6,10 @@ DIST flameshot-0.10.1.tar.gz 7726725 BLAKE2B 7045e7f86fc835a49a814b6fb86c2d41342
 DIST flameshot-0.10.2.tar.gz 7726687 BLAKE2B c7c7402d0cb6234473018571e67c39aebec3b4afa398fc2ef590f64527980ca218b1ebd8228ea47a3f9fd76e0edc2f8e1662965f79817bf6461bf0fc64d8b692 SHA512 b0eb1decd87dab1d4a375708448dd4c6f85c101d33814b76edbb328150d0e9ee7a588be698fddcb24e70e39cd4331f9aa2ff082525ff6975d52303a6d9c1ab12
 DIST flameshot-0.6.0.tar.gz 641561 BLAKE2B f9e87373d84c1a841f70cd9c13b504865a0ef23d0fb29848f2270171459afe9c6852e12c712ebdc7cf3cfc62214d7b7507b85cf21838d0ebed33bee1e39f4aad SHA512 194127032ab0f62a6ba2698688e11b2d4e6f0e04a282144f5fbb6c232eeebc71371af2d55abbb6e98b8649dee036e6f0a6ef55710e4321a60fd5ac6e453ab975
 DIST flameshot-0.9.0.tar.gz 7659641 BLAKE2B 38151bf333802ccbaa6c2292799958fe4c75f5a978eea9b2314c5eb264fb569cfcce73afac79b80423686d3a10ec54300ad4cacd3be9a6c6e58c72f59c23fb46 SHA512 888422cd66b7c90cd6da0e824a2c12c0ca7e3cfdfd0a0499868acf9609e6c3a0977f816c656690fa101971b98a3f560cf7849b93079c091b25155360cb20ea11
+DIST flameshot-11.0.0.tar.gz 12662479 BLAKE2B 1adef0196a449c33ea57ecd214ad890f44a8530c9c1116d5bdc29074835c040c8fbbec207501e597fb09887ab1e80e937e8412acdc7eb38c8619aa993f986018 SHA512 de13f3c5bc18f164c6e37c0b3f42c8693d3ebfaba5f3d54360899df6479390e2a0c38970fa2595c9293304b4e52ca2198477f4f317abcb11df4c30a24ab1909f
 EBUILD flameshot-0.10.1.ebuild 940 BLAKE2B f19894ce33d7f0579cfdf8bb08bafd8572dec7fcb5467cc6e51e7d51aa4490d8f2d1fbcce27691517a5c9a0c15c4fed0cd7ced4ed5edb8481f7307b6a727b45a SHA512 aa72e152dc21996cfc5536517ade866d4fe207d94eef6114b90cbcb52d1d3c40a3a54a8bb1231b4eb0736a992996592d3f3184fd3c1c97096de371319cfbbba4
-EBUILD flameshot-0.10.2.ebuild 940 BLAKE2B 6f12de8ec7174213b918ae8e1abaf2f9d63922a7bf3071969f477b8376097438d336f25f8262e506a98a1486c5ef84dcbf9c824587dcaf7e0ce46b1e56f9ada1 SHA512 195a95660159ded133a5adc2968feda8afc3b6771d02f53d738657e045450e50ceb5930b1ed52bbf6782faf04d9072a9db2f6e43f90c4e0440764ec559350a02
+EBUILD flameshot-0.10.2.ebuild 938 BLAKE2B 505886905aaff0562c06b3dc13e8b79394af3691f8d44931671089dda29de09962cba1a630c0e7275c7117143e63b566afbd1d19e8231c9d9da48f5334bc4b01 SHA512 6069cd9fd339931aa00d9f06125a8708605b978001fff5eb1f71994c54a680eac1231f320c06de92f1e96cc447578d4023aab45ae33c9d8920bff4488e464c68
 EBUILD flameshot-0.6.0-r1.ebuild 1173 BLAKE2B fe5f8d46a1293784a3ea53ea25dabd50945d541858df36779c05f05d985b14c829ad48bb1233f05864105dd9081373628e779592c8a60740fb2cc4d2ac838dd6 SHA512 eb2061def767077f861bbb00d4ca532e7b5f4b1282c15368fb471b325a1355ad61e0d584c209bd437b9dc947134266636a87b4babcbb75cd1740bebdb1643ca0
 EBUILD flameshot-0.9.0-r1.ebuild 1042 BLAKE2B a8ee64f229fc8c78ef88f35f8a3ce3aba82cebde8598ada39cb7f850d95f155c8b4c30eaec8ec1fb6953826b862d4af8f4e3888e21437c084b59d774cb531253 SHA512 f651b282bd68997f7e31a4b8d0a21fefd443a38a36bce136f1a9a11c80c1eb7c903e09aa22c74a4a2d372d0d2a92cd1605b133e6a61227820f285bc71403bb19
+EBUILD flameshot-11.0.0.ebuild 870 BLAKE2B c5e5fea8d2b32a01d098223db0c6a5d58624ac500bf2be34382a3740c9449212f355b1498345d4884a9bfb1d2a9837eb91751d931fdc41fc0f9ec5f2a4e33da5 SHA512 d9049678692def8377946b10929bbf244dc0b292720f8916e800ba968d90e19ed3cf76e9fb593544a30dbef06d6c146b285d4f2c003be50e69dd981e3fcdbc9b
 MISC metadata.xml 397 BLAKE2B fe5e79c5c48e1fb4feac428380c82f5cb0b2df39bc34aeafbcea452059a86bc4b117629c88212ee713d13dcc5aaabae2aa15c268196b7bdbc05c758dbc2a600a SHA512 5448da564fa737ad66ef33a482e363f2bd94714e84bd20e9e20afcab2a12d84030bd84e17c1d1dc874c1aee9c094b3c19fdc82dec167f4096d945a1df5f4bf3b
diff --git a/media-gfx/flameshot/flameshot-0.10.2.ebuild b/media-gfx/flameshot/flameshot-0.10.2.ebuild
index f7e216a175dc..9edb962ea42d 100644
--- a/media-gfx/flameshot/flameshot-0.10.2.ebuild
+++ b/media-gfx/flameshot/flameshot-0.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/flameshot-org/flameshot/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="Apache-2.0 Free-Art-1.3 GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	dev-qt/qtcore:5
diff --git a/media-gfx/flameshot/flameshot-11.0.0.ebuild b/media-gfx/flameshot/flameshot-11.0.0.ebuild
new file mode 100644
index 000000000000..cccbfdf33cd5
--- /dev/null
+++ b/media-gfx/flameshot/flameshot-11.0.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Powerful yet simple to use screenshot software"
+HOMEPAGE="https://flameshot.org https://github.com/flameshot-org/flameshot"
+SRC_URI="https://github.com/flameshot-org/flameshot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 Free-Art-1.3 GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	=dev-qt/qtsingleapplication-2.6*[qt5(+),X]
+	dev-qt/qtwidgets:5
+	dev-qt/qtsvg:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtdbus:5
+	sys-apps/dbus
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	rm -r external/singleapplication || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_EXTERNAL_SINGLEAPPLICATION=1
+		-DENABLE_CACHE=0
+	)
+
+	cmake_src_configure
+}
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 5dad218bfa8c..2e4784dd14bd 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -1,4 +1,6 @@
 AUX fontforge-doc-no-warn-error.patch 834 BLAKE2B c8bd1cfcf320b7831cc64d67d8de52b37e2f37bbac91d5df709d23e144ae33ec02907606348185eac7030f5151719e0023c0d9fda5395334a15c56f7174151c4 SHA512 6055f1696f1910e81ab1b84b48d336c1a097b53618a3a960e8ce2aeb57e05ad364848d48082b792cd4d5cc85fc95947cddd2e04e7a98c5ceb6f9ced14bd4e674
 DIST fontforge-20201107.tar.xz 14163424 BLAKE2B 8ce9148eef6e5b7206ab5c70310ff36fac67c392117e3c0b28060803a54306bf21c179b62b98734e11253739eac29e2ea8bcf3014c09432bb3a0b2b0f3ec631a SHA512 cf9666395405ab02943f0160959f04251bd2a80e279a8f60431089ad19a4c5a232efd42097050ed9f6c1fb39d01488176262949fd81f5f0960fe853b497437dc
+DIST fontforge-20220308.tar.xz 13719032 BLAKE2B 66939a77014b086b95ea21c3af2a2c910c19ebba000d50e514000667a6b193f5a90fc55b6046793811cac3a7330c479973746ac09041f21b0237047105f4d305 SHA512 9975cffec8aa47bcb8c22405bea544cd263dc939b253e8fba2fbaa3b90a60e05b98eaf58365db8ae854d1fff8e641866a7e2e027003ae03a77104d6650dafb6c
 EBUILD fontforge-20201107.ebuild 2863 BLAKE2B 1c6ca7f18f00c3f09f145593d391f074d9d76d6aec893fe4f871b554b053bbfa870901c49b182ef4c34176e5a2e793f88369746794ecdd94b0096378722a0ec5 SHA512 8f5baa9a193d1cd047fc33e6d9848f1cb4bb0be16a351c838ad0a0be0cae3a77c534f7638b4e6e93cfb2d7def79692e1222f91fd122f54950a1a07fe0454b645
+EBUILD fontforge-20220308.ebuild 2776 BLAKE2B 19ae1b59d880c9e3f660cf95ac9bb656ae5ca04156c72b9bc20195c531d105ba75e986f734b7afe6a0ead6b4c1dd6651867043f9046e3e7b5ac801d0e7fc6aa5 SHA512 454852cf8e9ac32f0346636c5934e5bde521ad6aeea37cac0da48ba11565be2530d9418d56a67afb3a31477e9ff30dc0f76b3c5ce9181befa820230b2e502bd2
 MISC metadata.xml 862 BLAKE2B bc7359c628af9d645b87f43a50a2f0f0d6ab1d80e3dbb0134f4b0d668990202276e4c66da640b7b63baa53d7ef7bdca90ad097566a995a02ab90efac88553884 SHA512 a6a55768f8e0a81591a44547ca0a135ad24833c0fec1f402348cb17512b8354c6c254f12a4fe62a615f955427a6893e12c9dc34d808e04a9d7065fbcf854a276
diff --git a/media-gfx/fontforge/fontforge-20220308.ebuild b/media-gfx/fontforge/fontforge-20220308.ebuild
new file mode 100644
index 000000000000..399f51098dac
--- /dev/null
+++ b/media-gfx/fontforge/fontforge-20220308.ebuild
@@ -0,0 +1,110 @@
+# Copyright 2004-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-single-r1 xdg cmake
+
+DESCRIPTION="postscript font editor and converter"
+HOMEPAGE="https://fontforge.org/"
+SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforge-${PV}.tar.xz"
+
+LICENSE="BSD GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc truetype-debugger gif gtk jpeg png +python readline test tiff svg woff2 X"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/glib-2.67:2
+	dev-libs/libltdl:0
+	dev-libs/libxml2:2=
+	>=media-libs/freetype-2.3.7:2=
+	gif? ( media-libs/giflib:0= )
+	jpeg? ( virtual/jpeg:0 )
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0= )
+	truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] )
+	gtk? ( >=x11-libs/gtk+-3.10:3 )
+	!gtk? (
+		X? (
+			>=x11-libs/cairo-1.6:0=
+			>=x11-libs/pango-1.10:0=[X]
+			x11-libs/libX11:0=
+			x11-libs/libXi:0=
+		)
+	)
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	woff2? ( media-libs/woff2:0= )
+"
+DEPEND="${RDEPEND}
+	!gtk? ( X? ( x11-base/xorg-proto ) )
+"
+BDEPEND="
+	sys-devel/gettext
+	doc? ( >=dev-python/sphinx-2 )
+	python? ( ${PYTHON_DEPS} )
+	test? ( ${RDEPEND} )
+"
+
+PATCHES=(
+	"${FILESDIR}"/fontforge-doc-no-warn-error.patch
+)
+
+pkg_setup() {
+	:
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOCS=$(usex doc ON OFF)
+		-DENABLE_LIBGIF=$(usex gif ON OFF)
+		-DENABLE_LIBJPEG=$(usex jpeg ON OFF)
+		-DENABLE_LIBPNG=$(usex png ON OFF)
+		-DENABLE_LIBREADLINE=$(usex readline ON OFF)
+		-DENABLE_LIBSPIRO=OFF # No package in Gentoo
+		-DENABLE_LIBTIFF=$(usex tiff ON OFF)
+		-DENABLE_MAINTAINER_TOOLS=OFF
+		-DENABLE_PYTHON_EXTENSION=$(usex python ON OFF)
+		-DENABLE_PYTHON_SCRIPTING=$(usex python ON OFF)
+		-DENABLE_TILE_PATH=ON
+		-DENABLE_WOFF2=$(usex woff2 ON OFF)
+	)
+
+	if use gtk || use X; then
+		mycmakeargs+=(
+			-DENABLE_GUI=ON
+			# Prefer GTK over X11 if both USE flage are enabled
+			-DENABLE_X11=$(usex gtk OFF ON)
+		)
+	else
+		mycmakeargs+=( -DENABLE_GUI=OFF )
+	fi
+
+	if use python; then
+		python_setup
+		mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
+	fi
+
+	if use truetype-debugger ; then
+		local ft2="${ESYSROOT}/usr/include/freetype2"
+		local ft2i="${ft2}/internal4fontforge"
+		mycmakeargs+=(
+			-DENABLE_FREETYPE_DEBUGGER="${ft2}"
+			-DFreeTypeSource_INCLUDE_DIRS="${ft2};${ft2i}/include;${ft2i}/include/freetype;${ft2i}/src/truetype"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	docompress -x /usr/share/doc/${PF}/html
+	einstalldocs
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index d85c980586cf..9b6cc64ef531 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,8 +1,6 @@
 AUX fotoxx-21.40-documentation.patch 1511 BLAKE2B da0443a6b1ff8684e43005239f0184c742cd59727e3c55460713680b14b5d39ba528b7a17a87b893a9585824f1e402b5f46bbe45451dd8888b62d1752524db44 SHA512 d0f79f986b605c3f981de99c533f57a60aac47844d1434482e507a7e7e4d2be2b581419e211f034213c7c23db0e56f4fe5d789f39624a33aee283c8b8a489509
 DIST fotoxx-21.60.tar.gz 8679841 BLAKE2B ec3dcbd0b937d730692e225fec7530ac46390328ae960e8960df7d252bc0cd8630de84bf47dfaf74c1e07855b4b0959e596e5e515ea00a6c430872359b2b4576 SHA512 ac999fcc70acd92c54e85ad276112aaa7f1b7606ea70381d6f833d829fd92c14aacad7a967838e5d28fce80cfa6da8ef05e0ee49b463210cb66a3f8ffc3d22e7
-DIST fotoxx-22.1.tar.gz 8801382 BLAKE2B 9090d2ea0ddfcb91758fbe0b8c6b81fd3c764eef1cac8098c5ae5f4dba37b5426bc4d5dee6b7d36519f62b28bee7f3f45aa29a7c6f92209f193a5a5f0775ae7b SHA512 41335113cd37490d02112760845b6e0bc631c448a0bdfe0435082836c86a1e125fbbe8a0efd30aae4ec7e86f43a67c9b6697e47263424e5093c7a475450ee7bc
-DIST fotoxx-22.11.tar.gz 8836130 BLAKE2B bb2c769a1f4840a026632c8d5aa27e49a78636c99924b41d2ddaa865f1bfe72ec0cbcee4d43a2a6b091ec7c279ca73dfb91bac672ad6fcc691a7d118169f7dc7 SHA512 666afc3fd3bb1015e45af4902fa11dce51f647b7398441ad620df228be110f558308e3629f597825ebd0e998ad7b7b66e5e0ac1d4e7648ffdef7c42e61531c9f
+DIST fotoxx-22.14.tar.gz 8815290 BLAKE2B fa6399454edebbbff6504fc9e7f8b27fbfecea0083a309cfeefd8d0f4834693a1c7eab8a689cb1a2135293e1290650cb44412375d20fe808014c5a5213c979d5 SHA512 7a0e412131a286ebc0ce8f5d7589ec135909a9d74e5a0f4a5367e58484462c23948c2b0ccc10c5197ba1014013f2d31999dd63d460daa4c4d4aa194313ee3c7b
 EBUILD fotoxx-21.60.ebuild 2260 BLAKE2B 5d3fecfa601f41c29f00474e810b928dc9bd12218be8d4acaa886640062b00966385884afb449b9fb15c804b1f3df11bda98bc4b2e70a68805411acec56163fc SHA512 342230c7481c9134b8ee93f774f9433c8ac4121714413cc518a2db1bfd3798e6a3a88c880bb035e4c55ca2e325f772ec04f4bbec3ce441894bed75e657ba0159
-EBUILD fotoxx-22.1.ebuild 2262 BLAKE2B f3f8a52c2487101ba3b99ff6ba234550f39df389198d43683cba6c573bf01786116b72ac6c642813061343db86f9bd16785524e08a01511c7e433c46d3657e65 SHA512 7c73f159b3931c4edd5ef61dea1f773f4d50f3f5f7aa22c412223ea591ff3f519c92827bcc20561465af532b50824fda75a58b49d4282dc65c760af1e5a5fdcb
-EBUILD fotoxx-22.11.ebuild 2262 BLAKE2B f3f8a52c2487101ba3b99ff6ba234550f39df389198d43683cba6c573bf01786116b72ac6c642813061343db86f9bd16785524e08a01511c7e433c46d3657e65 SHA512 7c73f159b3931c4edd5ef61dea1f773f4d50f3f5f7aa22c412223ea591ff3f519c92827bcc20561465af532b50824fda75a58b49d4282dc65c760af1e5a5fdcb
+EBUILD fotoxx-22.14.ebuild 2262 BLAKE2B f3f8a52c2487101ba3b99ff6ba234550f39df389198d43683cba6c573bf01786116b72ac6c642813061343db86f9bd16785524e08a01511c7e433c46d3657e65 SHA512 7c73f159b3931c4edd5ef61dea1f773f4d50f3f5f7aa22c412223ea591ff3f519c92827bcc20561465af532b50824fda75a58b49d4282dc65c760af1e5a5fdcb
 MISC metadata.xml 851 BLAKE2B a6c60b79fb5646c3bd7d6959d4a1b974ee714bf6ed64f205d9c00d684b3da94672005658336c1c5fcb903605d11c9a5607616151b2f6262f3173e15b8fc44655 SHA512 2794ae92afa076875c7f725969efdcf9cb84435d0ea033adc28f5860a69438b754f4d22b0db27dc7392683439e51b51ae581a6da450719276e8df51a2a306ad9
diff --git a/media-gfx/fotoxx/fotoxx-22.11.ebuild b/media-gfx/fotoxx/fotoxx-22.11.ebuild
deleted file mode 100644
index 852e25423552..000000000000
--- a/media-gfx/fotoxx/fotoxx-22.11.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature xdg-utils
-
-DESCRIPTION="Program for improving image files made with a digital camera"
-HOMEPAGE="https://kornelix.net/fotoxx/fotoxx.html"
-SRC_URI="https://kornelix.net/downloads/downloads/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-# For required dependencies read doc/README, for required tools read
-# data/userguide [INSTALLATION]. xdg-open (x11-misc/xdg-utils) is an
-# alternative to firefox and chromium-browser. `grep '"which ' * -R`
-# is helpful to report some required tools run via the shell.
-
-DEPEND="
-	media-libs/clutter
-	media-libs/clutter-gtk
-	media-libs/lcms:2
-	media-libs/libpng:0
-	media-libs/tiff:0
-	media-libs/libchamplain[gtk]
-	virtual/jpeg
-	x11-libs/gtk+:3"
-RDEPEND="
-	${DEPEND}
-	media-gfx/dcraw
-	media-libs/exiftool
-	x11-misc/xdg-utils
-"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-21.40-documentation.patch" )
-
-DOCS=()
-HTML_DOCS=()
-
-src_prepare() {
-	sed -i -e "/^DOCDIR/ s/${PN}$/${PF}/" Makefile || die
-	default
-}
-
-src_install() {
-	# For the Help menu items to work, *.html must be in /usr/share/doc/${PF},
-	# and README, changelog, copyright, license, etc. must not be compressed.
-	emake DESTDIR="${D}" install
-	rm -f "${D}"/usr/share/doc/${PF}/*.man || die
-	docompress -x /usr/share/doc
-}
-
-pkg_postinst() {
-	optfeature "HEIC file support" media-libs/libheif
-	optfeature "additional RAW file support" media-gfx/rawtherapee
-	optfeature "additional RAW file support" media-gfx/darktable
-	optfeature "video thumbnails & playback" media-video/ffmpeg
-	optfeature "copying images to optical media" app-cdr/dvd+rw-tools
-	optfeature "additional panorama support" media-gfx/hugin
-	optfeature "WEBP file support" media-libs/libwebp
-
-	elog
-	elog "Please read the Help > User Guide for details. The source location is"
-	elog "/usr/share/fotoxx/data/userguide and after running fotoxx a copy will"
-	elog "be placed at /home/<user>/.fotoxx/userguide."
-	elog
-	elog "To play videos, in Tools > Preferences set 'Video File Play Command'."
-	elog
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-gfx/fotoxx/fotoxx-22.1.ebuild b/media-gfx/fotoxx/fotoxx-22.14.ebuild
index 852e25423552..852e25423552 100644
--- a/media-gfx/fotoxx/fotoxx-22.1.ebuild
+++ b/media-gfx/fotoxx/fotoxx-22.14.ebuild
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 6500fcd4c52d..8297418982dd 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,13 +1,17 @@
-AUX 99freecad 82 BLAKE2B b0b4f8f9013952f686cd1e626efe221f3efa127c1417f8ce77fc640da439ac2bcd07a1b73f97ae52ee1fa1b77a21812f534b710d1ace63ca7e8093e76b6f5049 SHA512 c78d71004f103785ffe1133fea71c0baf5f1bad1037051e1c3a279b9fc8a346c7ec578b1508c1608470de8c199f7fd46378f2e851b01834e7749738c8eb70598
 AUX freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch 797 BLAKE2B 1bd09caaa265e370b70efe9dd23171a61a98920d659c2f19bb3ec07bf77b1d59712c135f421bbc3164bec6c2b19ac0886185bb6200c45cefaaaea94d5cf54222 SHA512 b449fc466a22300c8a4b0a5b223d68b0ef4437512abcdf875580efc364570b157a55e283faa0ddaad5fd4ce98585bf6dd043b4e7a2a7aa86e98bdb9e8a846a30
+AUX freecad-0.19.2-0001-Backport-of-0004809-Security-vulnerability-in-DWG-im.patch 2739 BLAKE2B ba07c87c1d70671d57b0830bf5d38a9856a20e2405fbecbd9a8520628aa0cc7e6d7889d8650552ec35b41bad873a5af75300f232447fe90bfd7922e52aaa49e5 SHA512 36d881cc5d93354fae442b096a5ce4f5a500a05a40a062be9a0d36b209318ee5ed66506136c7c0ce7d2849b97e41079d7d2916849bfc2499d4e5eadbbb5718a6
 AUX freecad-0.19.2-0001-fix-failing-test-workbench-testcase.patch 896 BLAKE2B f733e1bc8a95c87f0a831aba37616a36937909931005e5759f9ea63c84daaa5c742d43c9fe50023387a390bee69071f004faec2f4b081629e22a31ebc84c366c SHA512 0f30a2cc6a9fad0fdc94b90170ff6c0ef3817cb1f3b9d2c2bd3a9d7fdbd4ccfc22093b68ba9831682a5592d3bf2d064de94a81429be2ab71e041aa1561cab46d
+AUX freecad-0.19.2-0002-Backport-of-Use-run-instead-of-Popen-to-avoid-need-f.patch 1040 BLAKE2B 0b290afff96093958fb34dd6d71302bb9a28e02b1d2620f9424f3a70a444ca27292887e4786516f10452e6d345c0645d306f696ae06d43d874b874b3cdf3131c SHA512 3e7f91fca5af0430dcac3512d5b8e84f9ad956b760073216f49601703076fcc7b23c0fe1c32a311be746b44343ff05cc2c33a8c422c71a3245d98cceb5837340
 AUX freecad-0.19.2-0002-fix-femtest-failure-with-yaml-load.patch 907 BLAKE2B 154e46d923aa54f88d528eb460fc5b2caa16e536b66a126c7a2baf8c2227519bec2c831f5b0cc9bf9f7966e0c4be8edd807bbe0fb5a9019ac1d2da22f32d29a0 SHA512 a5e361bff8477e84f80837416635a3951d8b71f3cfcdb138d19bc7dd4c18961af6092a13c7a1925c7fc1e2ae1944fc7861ae2797050a7f5385987d2be8191ee2
 AUX freecad-0.19.2-0003-fix-test-when-built-without-GUI.patch 842 BLAKE2B d1eef077e3290bb469786a62c36d66f46f5016b2ed34065c0c3aa20a82cb451bb8a7242c3504113d924de2564b03fb1c581684d4b9da1325228ad2d82704a116 SHA512 2df1ad94c735c5f38eec0bcc24bf11a1d1814e991539082259983601352603273ae502856e41c0c737d65f9a488a676894d2f4d4d93cf8e2cbb1c3752f99aa7b
 AUX freecad-0.19.2-0006-add-boost-serialization-to-find_package.patch 1959 BLAKE2B 3863f4f311a4fba648d4503c6b3daecb87d233caea4ce7f22dff47f69435995ff422cd2ee97e8a491ddf85527b325d63543e041ccc91e5c844fede750c6764ef SHA512 b9af575349498393ee78e1c75247e736412d331fb872475c180c4828a6007f9a34ccd379eed8fe2551e53b88eee0b400202c63a1365df8b6069ce3b0727b2056
 AUX freecad-0.19.2-0007-fix-build-failure-with-opencascade-7.5.2.patch 1054 BLAKE2B d6a67b22390b64ed566c49af6117de2f34e0f57094a069ccae6cd15da5fa3a53a4cd71d94bd65a201c60042893da713a2d397890c7b072b197e101697cd388fd SHA512 beecd51a4b59890cd162eb76b726bd1e82a32da387ed67d886293930175deaf014445afd4db93e262daa06ced5b6c267218e4d777bd32c940fbc8b057b077fa1
+AUX freecad-0.19.4-Gentoo-specific-don-t-check-vcs.patch 701 BLAKE2B 963afb463acc00fc20f2ed2aa356c0bb9df8b359fb350e948fa7b23df6cd65db521ebd76d74fda53ca76ce0ba89e7ea3737e1903f850c5a04271eaeba45e5eaf SHA512 457f58461744d42db81db6868498b583ba9a4f599cc0cc1d8e98dae50f2d9d91216cd9787548ae83db57b4a8d056e0267e70055d3fba6405f51de80355eef18f
 AUX freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch 881 BLAKE2B 8d8327a283fc46b9f195b4dfe68ac6594ed020154f5f65eab5fe86bde2d32bb3d1081fdf9c5d50e30c24ffdc0504a61c047088e24ab4c377aca6e8f5a14e9760 SHA512 17bdf85c6c25d38a46d643666cbf594f5d16952504344af34b1f4960b53a2a534ccac1594d6ae9b5f827fe3403e08a26edb0c40346a9837316307bd484f35088
 DIST freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz 5368 BLAKE2B 69bafefd049effe3c31719bb2c23d32e8ba7ad58235c58ac8279ba6c036feaf1b97d5751cf2d68896e7489803103b2d0f92f76e61b3ccc97ef05a95b337ca5c2 SHA512 66585cc13fb3b0b026cf9dbd761c8ba1c1fe4d4f7db2e144ddd97706e02ccd78f4a43ac7cd93ddcae6e73933bf41d4cbd4d94bcdff8804b81378a6d946c7b070
 DIST freecad-0.19.2.tar.gz 296987961 BLAKE2B 3c21359c71f7ac5a49cc4b4be437dfce02f2af73dfc526a3955547718ee41c461fc787d029a9a77374d58516d7c56fec6982fe6d38ab17fbc30c0a94929136bf SHA512 420f00e696725cbd31c936c47b6ac226d866a17c7b7683ad381b8dd5edaffc7dfb1a3c4238c08e8b4fd34ef0c08d7c244cb7797012e596df1ce0a4f6e3be6b72
-EBUILD freecad-0.19.2-r5.ebuild 10917 BLAKE2B 35866de96fe9b930182522f3728adad45342c15eacebfc798ff294b884b1fcbaebe9158765fd0d1bb2ae99b5894413cec1c6fecfb88e6ce7e64dee809f971840 SHA512 6fd55da6d9b1b4f0b6a68ae6dc1c2c1b40dedf298988dd873500a6da6ba02bc4eb8aeb6eff69f0bbc9e85e4b4ed63fc54e7cc87173c05ba745a28f3c094a523f
-EBUILD freecad-9999.ebuild 10642 BLAKE2B 2504f33a116f9d10dafcf611eba5673131141077898769011066540a59c9abf5f617f0ab6dad2a35ae2aa2c89295f1babbd4d8b651fb921042e90ddd85f50e85 SHA512 b9216438a9c59c2947945c97c5ff9eb2eb10971208f42e731767f11193e23862487ad8035b558f04a5913b22c1737cfc670ead890c0e1fbdd85974e09f4cca53
-MISC metadata.xml 3268 BLAKE2B 4e99f8237c96f96500ec15a0e175684f445c9a68e1080f6f61538ae4e99cb2afccc14d50c626c44764ea4362ed82cc2ccf74f8ae53d713d70b21860eeb39650d SHA512 fbc87f4a401c33de8033b54213026631a9f956918cc256eb9a10cec88b316f71fd98959c79f58acc3d4a75d28117097ea0cc4ee33f333923d4387e9d3af43bb5
+DIST freecad-0.19.4.tar.gz 296990652 BLAKE2B 6b252198616f7731144d000307a7f186eb2b24e07b85e008d0aae0f60a732fef5598c06c5c66b70fa44114f05afbc7d81b15c71bbb147bc2e458ea90cc81ee45 SHA512 58e5e6bb4ed40ce7f3a0b653cdb0371208189b9ca266f1c29a8f9077c4e56861b3925f695718fba34781254220f8a8919a2e2a501d43573b2c733f8b21c12c1f
+EBUILD freecad-0.19.2-r7.ebuild 11054 BLAKE2B 958c386dd6f8e86ac1d5eec415a79aa0001b09d0c5fcfe6dcf48e8e1b48d5d8d6b961585ed927953ce9021558faf8eef1670383d064825f9a610884f8400eaad SHA512 4a08af063a47342ba6542a8413ce8d2130c041b890e77082ce1607878c26ad5384bec2842fb3eead15b32760bf08b0e60be8ce4e6f977af337cadb2756c20d07
+EBUILD freecad-0.19.4.ebuild 10672 BLAKE2B 53f9583f83e44b4e28cbc0e4b1a804c974bc521caa9f0f35a0969e5fb110c718dd6c3c18da6ee2df8639dab84e7d342b6893eef13709a1576ee6685aa1274911 SHA512 0f5f1343adcb6f3904f154ff587b057ce4fb9b3047700ba7d513b48b141365640c62f18568490e2e4938a38f656520317526c9fcf27bcd41146821f37033ccda
+EBUILD freecad-9999.ebuild 10632 BLAKE2B a37db2eb95f92e06a8b8716a65f451a4c791438988835400ae6b3506244baa991accf75f608fe0510cd8d3a25b999012b905a426f4d74f8054f7bef89a947cb7 SHA512 5dbc6938dd3a1d0b7a8bae296b98265b4e3328162989f1eb30c996b5d45cd261f1efcd98b0b158531f7277ad137573ce8046779f92076af323a5f760c8507392
+MISC metadata.xml 3572 BLAKE2B 308315ae5d33f9d041aad9f5bc8dd8b9aa337a57849ca02408c3907c55775a039b229d6f67fc3921623d2efd366f38672fbcaa4c73785493a7c13c88379b680d SHA512 ecb435d74013ad1b14d3a7134c89b0f0a9364c98b61aad5559d4812abadb4330520122b82a2f843977a985dc342963f5712c6e537e0740a80a08a725d2d26614
diff --git a/media-gfx/freecad/files/99freecad b/media-gfx/freecad/files/99freecad
deleted file mode 100644
index 81104107c22e..000000000000
--- a/media-gfx/freecad/files/99freecad
+++ /dev/null
@@ -1 +0,0 @@
-PYTHONPATH=/usr/lib64/freecad/Ext:/usr/lib64/freecad/Mod:/usr/lib64/freecad/lib64
diff --git a/media-gfx/freecad/files/freecad-0.19.2-0001-Backport-of-0004809-Security-vulnerability-in-DWG-im.patch b/media-gfx/freecad/files/freecad-0.19.2-0001-Backport-of-0004809-Security-vulnerability-in-DWG-im.patch
new file mode 100644
index 000000000000..2df44ff66ac8
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.19.2-0001-Backport-of-0004809-Security-vulnerability-in-DWG-im.patch
@@ -0,0 +1,59 @@
+From 4006e62860c73f0943e71c7da478256a7337941d Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Mon, 31 Jan 2022 08:12:35 +0100
+Subject: [PATCH 1/2] Backport of 0004809: Security vulnerability in DWG import
+ when using ODA file converter
+
+Original patch commit id 1742d7ff82af1653253c4a4183c262c9af3b26d6 by
+wmayer <wmayer@users.sourceforge.net>.
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/src/Mod/Draft/importDWG.py
++++ b/src/Mod/Draft/importDWG.py
+@@ -44,8 +44,6 @@ https://knowledge.autodesk.com/support/autocad/downloads/
+ # *                                                                         *
+ # ***************************************************************************
+ 
+-# TODO: use subprocess.popen() instead of subprocess.call()
+-
+ import six
+ import FreeCAD
+ from FreeCAD import Console as FCC
+@@ -217,15 +215,10 @@ def convertToDxf(dwgfilename):
+         indir = os.path.dirname(dwgfilename)
+         outdir = tempfile.mkdtemp()
+         basename = os.path.basename(dwgfilename)
+-        cmdline = ('"%s" "%s" "%s" "ACAD2000" "DXF" "0" "1" "%s"'
+-                   % (teigha, indir, outdir, basename))
+-        FCC.PrintMessage(translate("ImportDWG", "Converting: ")
+-                         + cmdline + "\n")
+-        if six.PY2:
+-            if isinstance(cmdline, six.text_type):
+-                encoding = sys.getfilesystemencoding()
+-                cmdline = cmdline.encode(encoding)
+-        subprocess.call(cmdline, shell=True)  # os.system(cmdline)
++        cmdline = [teigha, indir, outdir, "ACAD2000", "DXF", "0", "1", basename]
++        FCC.PrintMessage(translate("draft", "Converting:") + " " + str(cmdline) + "\n")
++        proc = subprocess.Popen(cmdline)
++        proc.communicate()
+         result = outdir + os.sep + os.path.splitext(basename)[0] + ".dxf"
+         if os.path.exists(result):
+             FCC.PrintMessage(translate("ImportDWG",
+@@ -270,10 +263,9 @@ def convertToDwg(dxffilename, dwgfilename):
+         indir = os.path.dirname(dxffilename)
+         outdir = os.path.dirname(dwgfilename)
+         basename = os.path.basename(dxffilename)
+-        cmdline = ('"%s" "%s" "%s" "ACAD2000" "DWG" "0" "1" "%s"'
+-                   % (teigha, indir, outdir, basename))
+-        FCC.PrintMessage(translate("ImportDWG", "Converting: ")
+-                         + cmdline + "\n")
+-        subprocess.call(cmdline, shell=True)  # os.system(cmdline)
++        cmdline = [teigha, indir, outdir, "ACAD2000", "DWG", "0", "1", basename]
++        FCC.PrintMessage(translate("draft", "Converting:") + " " + str(cmdline) + "\n")
++        proc = subprocess.Popen(cmdline)
++        proc.communicate()
+         return dwgfilename
+     return None
+-- 
+2.35.0
+
diff --git a/media-gfx/freecad/files/freecad-0.19.2-0002-Backport-of-Use-run-instead-of-Popen-to-avoid-need-f.patch b/media-gfx/freecad/files/freecad-0.19.2-0002-Backport-of-Use-run-instead-of-Popen-to-avoid-need-f.patch
new file mode 100644
index 000000000000..9b043bd34563
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.19.2-0002-Backport-of-Use-run-instead-of-Popen-to-avoid-need-f.patch
@@ -0,0 +1,25 @@
+From 937d8ca9bf4c50f8a7dc0fbcf9e6ac23b0fbe033 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Mon, 31 Jan 2022 08:17:24 +0100
+Subject: [PATCH 2/2] Backport of Use run() instead of Popen() to avoid need
+ for communicate
+
+Original patch commit id a65dbc6f8296562a12407a36f4931a80bbb628b7 by
+sliptonic <shopinthewoods@gmail.com>
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/src/Mod/Path/PathScripts/PathSanity.py
++++ b/src/Mod/Path/PathScripts/PathSanity.py
+@@ -412,8 +412,7 @@ class CommandPathSanity:
+             FreeCAD.Console.PrintMessage('asciidoc file written to {}\n'.format(reportraw))
+ 
+         try:
+-            result = os.system('asciidoctor {} -o {}'.format(reportraw,
+-                reporthtml))
++            result = subprocess.run(["asciidoctor", reportraw, "-o", reporthtml])
+             if str(result) == "32512":
+                 msg = "asciidoctor not found. html cannot be generated."
+                 QtGui.QMessageBox.information(None, "Path Sanity", msg)
+-- 
+2.35.0
+
diff --git a/media-gfx/freecad/files/freecad-0.19.4-Gentoo-specific-don-t-check-vcs.patch b/media-gfx/freecad/files/freecad-0.19.4-Gentoo-specific-don-t-check-vcs.patch
new file mode 100644
index 000000000000..62ae92392adf
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.19.4-Gentoo-specific-don-t-check-vcs.patch
@@ -0,0 +1,20 @@
+From 60ba533d21302b8a4c11ac06adb53b4041754b02 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Tue, 1 Mar 2022 18:22:00 +0100
+Subject: [PATCH] [Gentoo specific] don't check vcs
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/src/Tools/SubWCRev.py
++++ b/src/Tools/SubWCRev.py
+@@ -455,7 +455,7 @@ def main():
+         if o in ("-b", "--bindir"):
+             bindir = a
+ 
+-    vcs=[GitControl(), DebianGitHub(), BazaarControl(), Subversion(), MercurialControl(), DebianChangelog(), UnknownControl()]
++    vcs=[UnknownControl()]
+     for i in vcs:
+         if i.extractInfo(srcdir, bindir):
+             # Open the template file and the version file
+-- 
+2.35.1
+
diff --git a/media-gfx/freecad/freecad-0.19.2-r5.ebuild b/media-gfx/freecad/freecad-0.19.2-r7.ebuild
index 7ebeed8e3168..aa2041fd5f01 100644
--- a/media-gfx/freecad/freecad-0.19.2-r5.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -128,6 +128,8 @@ PATCHES=(
 	"${WORKDIR}"/${P}-0005-Make-smesh-compile-with-vtk9.patch
 	"${FILESDIR}"/${P}-0006-add-boost-serialization-to-find_package.patch
 	"${FILESDIR}"/${P}-0007-fix-build-failure-with-opencascade-7.5.2.patch
+	"${FILESDIR}"/${P}-0001-Backport-of-0004809-Security-vulnerability-in-DWG-im.patch
+	"${FILESDIR}"/${P}-0002-Backport-of-Use-run-instead-of-Popen-to-avoid-need-f.patch
 )
 
 DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )
@@ -271,8 +273,6 @@ src_install() {
 	python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
 	# compile main package in python site-packages as well
 	python_optimize
-
-	doenvd "${FILESDIR}/99${PN}"
 }
 
 pkg_postinst() {
diff --git a/media-gfx/freecad/freecad-0.19.4.ebuild b/media-gfx/freecad/freecad-0.19.4.ebuild
new file mode 100644
index 000000000000..cab7693eaacd
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.19.4.ebuild
@@ -0,0 +1,323 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit check-reqs cmake optfeature python-single-r1 xdg
+
+DESCRIPTION="QT based Computer Aided Design application"
+HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD"
+
+MY_PN=FreeCAD
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
+	S="${WORKDIR}/freecad-${PV}"
+else
+	MY_PV=$(ver_cut 1-2)
+	MY_PV=$(ver_rs 1 '_' ${MY_PV})
+	SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+		https://raw.githubusercontent.com/waebbl/waebbl-gentoo/master/patches/${PN}-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/FreeCAD-${PV}"
+fi
+
+# code is licensed LGPL-2
+# examples are licensed CC-BY-SA (without note of specific version)
+LICENSE="LGPL-2 CC-BY-SA-4.0"
+SLOT="0"
+IUSE="debug headless pcl test"
+RESTRICT="!test? ( test )"
+
+FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
+FREECAD_STABLE_MODULES="addonmgr drawing fem idf image inspection
+	material openscad part-design path points raytracing robot show
+	surface	techdraw tux"
+
+for module in ${FREECAD_STABLE_MODULES}; do
+	IUSE="${IUSE} +${module}"
+done
+for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
+	IUSE="${IUSE} ${module}"
+done
+unset module
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/OpenNI2[opengl(+)]
+	dev-libs/libspnav[X]
+	dev-libs/xerces-c[icu]
+	dev-qt/designer:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	>=media-libs/coin-4.0.0
+	media-libs/freetype
+	media-libs/qhull:=
+	sci-libs/flann[openmp]
+	sci-libs/hdf5:=[fortran,zlib]
+	>=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
+	<sci-libs/opencascade-7.6.0:=[vtk(+)]
+	sci-libs/orocos_kdl:=
+	sys-libs/zlib
+	virtual/glu
+	virtual/libusb:1
+	virtual/opengl
+	cloud? (
+		dev-libs/openssl:=
+		net-misc/curl
+	)
+	fem? ( sci-libs/vtk:=[boost(+),python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
+	openscad? ( media-gfx/openscad )
+	pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] )
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[python,threads(+),${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
+		dev-python/pybind11[${PYTHON_USEDEP}]
+		dev-python/pyside2[gui,svg,${PYTHON_USEDEP}]
+		dev-python/shiboken2[${PYTHON_USEDEP}]
+		addonmgr? ( dev-python/GitPython[${PYTHON_USEDEP}] )
+		fem? ( dev-python/ply[${PYTHON_USEDEP}] )
+	')
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-cpp/eigen-3.3.1:3
+"
+BDEPEND="
+	app-text/dos2unix
+	dev-lang/swig
+"
+
+# To get required dependencies:
+# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
+# We set the following requirements by default:
+# arch, draft, drawing, import, mesh, part, qt5, sketcher, spreadsheet, start, web.
+#
+# Additionally, we auto-enable mesh_part, flat_mesh and smesh
+# Fem actually needs smesh, but as long as we don't have a smesh package, we enable
+# smesh through the mesh USE flag. Note however, the fem<-smesh dependency isn't
+# reflected by the REQUIRES_MODS macro, but at
+# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187.
+#
+# The increase in auto-enabled workbenches is due to their need in parts of the
+# test suite when compiled with a minimal set of USE flags.
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	inspection? ( points )
+	path? ( robot )
+	ship? ( image plot )
+	techdraw? ( drawing )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-Gentoo-specific-don-t-check-vcs.patch
+	"${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
+	"${WORKDIR}"/${PN}-0.19.2-0005-Make-smesh-compile-with-vtk9.patch
+	"${FILESDIR}"/${PN}-0.19.2-0006-add-boost-serialization-to-find_package.patch
+)
+
+DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )
+
+CHECKREQS_DISK_BUILD="2G"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	python-single-r1_pkg_setup
+	[[ -z ${CASROOT} ]] && die "\${CASROOT} not set, plesae run eselect opencascade"
+}
+
+src_prepare() {
+	# the upstream provided file doesn't find the coin doc tag file,
+	# but cmake ships a working one, so we use this.
+	rm "${S}/cMake/FindCoin3D.cmake" || die
+
+	# Fix desktop file
+	sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die
+
+	find "${S}" -type f -exec dos2unix -q {} \; || die "failed to convert to unix line endings"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_ADDONMGR=$(usex addonmgr)
+		-DBUILD_ARCH=ON
+		-DBUILD_ASSEMBLY=OFF					# deprecated
+		-DBUILD_CLOUD=$(usex cloud)
+		-DBUILD_COMPLETE=OFF					# deprecated
+		-DBUILD_DRAFT=ON
+		-DBUILD_DRAWING=$(usex drawing)
+		-DBUILD_ENABLE_CXX_STD:STRING="C++17"	# needed for >=boost-1.77.0
+		-DBUILD_FEM=$(usex fem)
+		-DBUILD_FEM_NETGEN=OFF
+		-DBUILD_FLAT_MESH=ON
+		-DBUILD_FORCE_DIRECTORY=ON				# force building in a dedicated directory
+		-DBUILD_FREETYPE=ON						# automagic dep
+		-DBUILD_GUI=$(usex !headless)
+		-DBUILD_IDF=$(usex idf)
+		-DBUILD_IMAGE=$(usex image)
+		-DBUILD_IMPORT=ON						# import module for various file formats
+		-DBUILD_INSPECTION=$(usex inspection)
+		-DBUILD_JTREADER=OFF					# code has been removed upstream, but option is still there
+		-DBUILD_MATERIAL=$(usex material)
+		-DBUILD_MESH=ON
+		-DBUILD_MESH_PART=ON
+		-DBUILD_OPENSCAD=$(usex openscad)
+		-DBUILD_PART=ON
+		-DBUILD_PART_DESIGN=$(usex part-design)
+		-DBUILD_PATH=$(usex path)
+		-DBUILD_PLOT=$(usex plot)				# conflicts with possible external workbench
+		-DBUILD_POINTS=$(usex points)
+		-DBUILD_QT5=ON							# OFF means to use Qt4
+		-DBUILD_RAYTRACING=$(usex raytracing)
+		-DBUILD_REVERSEENGINEERING=OFF			# currently only an empty sandbox
+		-DBUILD_ROBOT=$(usex robot)
+		-DBUILD_SHIP=$(usex ship)				# conflicts with possible external workbench
+		-DBUILD_SHOW=$(usex show)
+		-DBUILD_SKETCHER=ON						# needed by draft workspace
+		-DBUILD_SMESH=ON
+		-DBUILD_SPREADSHEET=ON
+		-DBUILD_START=ON
+		-DBUILD_SURFACE=$(usex surface)
+		-DBUILD_TECHDRAW=$(usex techdraw)
+		-DBUILD_TEST=ON							# always build test workbench for run-time testing
+		-DBUILD_TUX=$(usex tux)
+		-DBUILD_VR=OFF
+		-DBUILD_WEB=ON							# needed by start workspace
+		-DBUILD_WITH_CONDA=OFF
+
+		-DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN}
+		-DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN}
+
+		-DFREECAD_BUILD_DEBIAN=OFF
+
+		-DFREECAD_USE_EXTERNAL_KDL=ON
+		-DFREECAD_USE_EXTERNAL_SMESH=OFF		# no package in Gentoo
+		-DFREECAD_USE_EXTERNAL_ZIPIOS=OFF		# doesn't work yet, also no package in Gentoo tree
+		-DFREECAD_USE_FREETYPE=ON
+		-DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
+		-DFREECAD_USE_PCL=$(usex pcl)
+		-DFREECAD_USE_PYBIND11=ON
+		-DFREECAD_USE_QT_FILEDIALOG=ON
+		-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
+
+		# install python modules to site-packages' dir. True only for the main package,
+		# sub-packages will still be installed inside /usr/lib64/freecad
+		-DINSTALL_TO_SITEPACKAGES=ON
+
+		# Use the version of shiboken2 that matches the selected python version
+		-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+		-DPython3_EXECUTABLE=${PYTHON}
+	)
+
+	if use debug; then
+		mycmakeargs+=(
+			-DBUILD_SANDBOX=ON
+			-DBUILD_TEMPLATE=ON
+		)
+	else
+		mycmakeargs+=(
+			-DBUILD_SANDBOX=OFF
+			-DBUILD_TEMPLATE=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+# We use the FreeCADCmd binary instead of the FreeCAD binary here
+# for two reasons:
+# 1. It works out of the box with USE=headless as well, not needing a guard
+# 2. We don't need virtualx.eclass and it's dependencies
+# The exported environment variables are needed, so freecad does know
+# where to save it's temporary files, and where to look and write it's
+# configuration. Without those, there are sandbox violation, when it
+# tries to create /var/lib/portage/home/.FreeCAD directory.
+src_test() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	export FREECAD_USER_HOME="${HOME}"
+	export FREECAD_USER_DATA="${T}"
+	export FREECAD_USER_TEMP="${T}"
+	nonfatal ./bin/FreeCADCmd --run-test 0
+	popd > /dev/null || die
+}
+
+src_install() {
+	cmake_src_install
+
+	dobin src/Tools/freecad-thumbnailer
+
+	if ! use headless; then
+		dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
+	fi
+	dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
+
+	python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
+	# compile main package in python site-packages as well
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use plot; then
+		einfo "Note: You are enabling the 'plot' USE flag."
+		einfo "This conflicts with the plot workbench that can be loaded"
+		einfo "via the addon manager! You can only install one of those."
+	fi
+
+	if use ship; then
+		einfo "Note: You are enabling the 'ship' USE flag."
+		einfo "This conflicts with the ship workbench that can be loaded"
+		einfo "via the addon manager! You can only install one of those."
+	fi
+
+	einfo "You can load a lot of additional workbenches using the integrated"
+	einfo "AddonManager."
+
+	# ToDo: check opencv, pysolar (::science), elmerfem (::science)
+	#		ifc++, ifcopenshell, netgen, z88 (no pkgs), calculix-ccx (::waebbl)
+	einfo "There are a lot of additional tools, for which FreeCAD has builtin"
+	einfo "support. Some of them are available in Gentoo. Take a look at"
+	einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD"
+	optfeature_header "Computational utilities"
+	optfeature "BLAS library" sci-libs/openblas
+	optfeature "Statistical computation with Python" dev-python/pandas
+	optfeature "Use scientific computation with Python" dev-python/scipy
+	optfeature "Use symbolic math with Python" dev-python/sympy
+	optfeature_header "Imaging, Plotting and Rendering utilities"
+	optfeature "Dependency graphs" media-gfx/graphviz
+	optfeature "PBR Rendering" media-gfx/povray
+	optfeature_header "Import / Export"
+	optfeature "Interact with git repositories" dev-python/GitPython
+	optfeature "Work with COLLADA documents" dev-python/pycollada
+	optfeature "YAML importer and emitter" dev-python/pyyaml
+	optfeature "Importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg
+	optfeature "Importing and exporting geospatial data formats" sci-libs/gdal
+	optfeature "Working with projection data" sci-libs/proj
+	optfeature_header "Meshing and FEM"
+	optfeature "FEM mesh generator" sci-libs/gmsh
+	optfeature "Triangulating meshes" sci-libs/gts
+	optfeature "Visualization" sci-visualization/paraview
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 97ada209ae61..377cf7cb37ba 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -87,7 +87,7 @@ RDEPEND="
 		dev-python/numpy[${PYTHON_USEDEP}]
 		>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
 		dev-python/pybind11[${PYTHON_USEDEP}]
-		dev-python/pyside2[gui,svg,${PYTHON_USEDEP}]
+		dev-python/pyside2[gui,svg,webchannel,webengine,${PYTHON_USEDEP}]
 		dev-python/shiboken2[${PYTHON_USEDEP}]
 		addonmgr? ( dev-python/GitPython[${PYTHON_USEDEP}] )
 		fem? ( dev-python/ply[${PYTHON_USEDEP}] )
@@ -270,8 +270,6 @@ src_install() {
 	python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
 	# compile main package in python site-packages as well
 	python_optimize
-
-	doenvd "${FILESDIR}/99${PN}"
 }
 
 pkg_postinst() {
diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml
index 57cb8fcbe607..44899f008bc0 100644
--- a/media-gfx/freecad/metadata.xml
+++ b/media-gfx/freecad/metadata.xml
@@ -18,6 +18,14 @@
 			Build the Cloud workbench, to access cloud providers (mostly
 			Amazon S3).
 		</flag>
+		<flag name="drawing">
+			Build the Drawing workbench, a predecessor to the TechDraw workbench.
+			Users are encouraged to learn how to use the TechDraw workbench and
+			switch to it instead.
+
+			This is a compatibility option and will be removed in a later (0.20+)
+			version of the package.
+		</flag>
 		<flag name="fem">
 			Build the FEM module and workbench which provides Finite Element 
 			Analysis (FEA) workflows
diff --git a/media-gfx/freepv/Manifest b/media-gfx/freepv/Manifest
index ed9e3993bd86..437134730923 100644
--- a/media-gfx/freepv/Manifest
+++ b/media-gfx/freepv/Manifest
@@ -5,5 +5,5 @@ AUX freepv-0.3.0-noplugin.patch 1099 BLAKE2B 41c3c76e19d058764a700665f7c139f3b1d
 AUX freepv-0.3.0-stringh.patch 273 BLAKE2B 16781116005749beead28a96190ae04f19808934c20d52f62c7c858a6eb42793b5de2bc394373499636b7367e48819e1e48fe4cf40dcb9de80c3001d395d34ae SHA512 b368117f3a675df53e76ada4b13aa6d99f2744f006b2a8d6e37c96c5a1c62f48383042a519e82d03bd569192615de94f1b87dfa851178924d6b002522372b67f
 AUX freepv-0.3.0-unsigned_short.patch 1787 BLAKE2B 975d3b534deb4198b505553cd05f34369db07a98706a2b6154891cc1d163e538ca9430d91db340fcf88ea2e9b6325c3047af4c24d0e248fb384da7a749ea2eff SHA512 aba4a7b0d882ebce73b5ec823e8a51cec2788efdc4d9000c9d48a3c07a77e88dbee1e24ffdb1a57b2a4ae45b9310b25cf0157c15d73f8fffdf0a2582e8b88078
 DIST freepv-0.3.0.tar.gz 175545 BLAKE2B 7169679ffb5eeaefb4f558056fc7abe9b8093722e21c0313bf22ad9839c8274d58f8123758a5842bfe06edd3fd9b84b927a25b932607efe7d0f67b772d99c8e3 SHA512 0b207dc25c51b19fd76637743adb8e395c6098d03611612086d66d3f1aa6e4d0c5700aa0e23210082d6aa7495f19d1c3d8f0f93ad11a5236df86d709d5f71a7d
-EBUILD freepv-0.3.0-r5.ebuild 1066 BLAKE2B e264f06842fbf7f1360d6b94cc1fc5014bee983314e3744f56233460ecda897e393ea4607712f528758e41a9d4cde9a13575f41d461486a53192b6545092be4d SHA512 c10e7c0f7b3d4dd01f5b3fbb08c67f9301cb3a27452ae942ae82c1db2ae993d09c19765d5384842b1baecb2baec7d2adbd6c0d988c17998009502ea913fef3ad
+EBUILD freepv-0.3.0-r5.ebuild 1048 BLAKE2B dec88a8cc63c943a082ce4ca57a6f84c674c83994c52c0826f410029c0944abd8057398fba89ee6d73287609580e9b87827fdddf25aeff8de9e8b950b74b8d04 SHA512 f76d3dded0fbc79280c38de95360b56dd0c3a85ea2e27a6240456f4c9708b72a084660f2803b96529fabcf55972bbae5a043fb5c56ce85d4a585c74e86bb6b03
 MISC metadata.xml 475 BLAKE2B e38ac7f63a2791acfddfbf0dbe32fea5a6e35fbb36e85be2232b300e0f12005ed9ebfd237890176b7ca465869f1976048d7a15b97ae4a350338cc5c3735421cb SHA512 87b4d02024ea61c4548b48cc047e9699b393c5dc76c46aeb40bce095671557fc6cd1a7a3a52bb7ab5166b34d56e878386f6948162e49ac72259774681ca06884
diff --git a/media-gfx/freepv/freepv-0.3.0-r5.ebuild b/media-gfx/freepv/freepv-0.3.0-r5.ebuild
index db82a97be089..919e20691724 100644
--- a/media-gfx/freepv/freepv-0.3.0-r5.ebuild
+++ b/media-gfx/freepv/freepv-0.3.0-r5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit cmake-utils flag-o-matic xdg
+EAPI=8
+inherit cmake flag-o-matic xdg
 
 DESCRIPTION="Panorama viewer (Quicktime, PangeaVR, GLPanoView formats)"
 HOMEPAGE="http://freepv.sourceforge.net/"
@@ -33,7 +33,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -e 's:jpeg_mem_src:freepv_jpeg_mem_src:g' \
 		-i src/libfreepv/JpegReader.cpp || die
@@ -46,5 +46,5 @@ src_configure() {
 	# bug 618856
 	append-cxxflags -std=c++14
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-gfx/gimp-arrow-brushes/Manifest b/media-gfx/gimp-arrow-brushes/Manifest
index 269f3ec77307..a19021e2ddf0 100644
--- a/media-gfx/gimp-arrow-brushes/Manifest
+++ b/media-gfx/gimp-arrow-brushes/Manifest
@@ -10,5 +10,5 @@ DIST circle_brushes-1.0.tar.bz2 42630 BLAKE2B dec1f22bdb9faa888aa2262dd92b3866ca
 DIST cursor_brushes-1.0.tar.bz2 18272 BLAKE2B 23dd380173e8962efd43367f7f0c61fec72d3208463423a834e4c4b9612dad46baa715635a509d4737bc40b491375b0b95847a062170fd389c1e7318ac327459 SHA512 e9fa944f9c210518c96929b6860c4234e9c7e69cada7fe85304043d5ef3118d40b3f90696057e28ab98cd4587d4aef8b150171863b5c1c1b51255b6cd23ad3ff
 DIST hand_pointer_brushes.tar.bz2 19068 BLAKE2B b662c0b1ef8a0639c1ce9e6d8d05637f4fa8db837c2ce5191c1cb4eb83a5388324afa02473f9235770f4978406ef9cdd38303acde0d6b2174b5fff0dcd5d84d5 SHA512 b072b58f7219057b682459b5b73d60e5cf26943436c1116dc4fb73076a32b02d0164f2f0506cb0cae4378c54bdfd2a66281c7fd42a7a6919afb19896e2193c34
 DIST star_brushes.tar.bz2 10610 BLAKE2B 40bef059e87d2ab162acff8b1525a89acf98a98c4e8b7e8b9bc7fc55341f4508e0c7c4eff5d49ebc4fafee9c2e4af0ba54d287f6a1ff0efe92831c7037f9be63 SHA512 31e8bb173363b455d89ad98846c7392f9f2b5b77e48d1f0afa114c54bfd40aa1b772f8d64de670209fa98a6bf68863e2424f5ce008e9c0e4942bb8bd6cf12e01
-EBUILD gimp-arrow-brushes-20190407.ebuild 1290 BLAKE2B f0416dd4dda056568d7e7b7f92f5c924292135c3d42503132206719cfbe7304476a41e476b28e1a0223c4867776d0555166ca0b8eb489d12d29347fe59a04e43 SHA512 c8373b857937d120c6efeaf29c7c6af9013272d9a748f3d8612ba1de95668d63e90ec69f25402b74985765cbe8be4428cb9256c89369762574de775deea53ad4
+EBUILD gimp-arrow-brushes-20190407.ebuild 1282 BLAKE2B 2e49bc91b1b906579a4ae4ce79a40d5e1aba78fa96b25ebea4cbf7ececec786395bbf41a254acef5774f79a23ef85022d8fda422f56f4d9044dd03bdcff6d89c SHA512 26d4900487e306aef2e930830378c2916c905baadbb280493599f100fc50d2ccf9482ff8e4a191b4190c98eb6e00f15cee2eec3f42cf0ad65709a33cfb896624
 MISC metadata.xml 240 BLAKE2B 1f4d972fe6e8f4096f8905fe5ec3f77b8689f3b0e01ac676ae4e55ce3aa66c18473cc82b5766131f155b9f4cd3fa6c541ab3bd32bfd233ff89722937105f968a SHA512 2e9f28bd0e525aa062cb098048dd176668b1ca2220e0018279ec4779eb80a2e8ad4f1ea73899aded97b7d27379e88d2f60cc80af4a6992880edf6e301b7e1090
diff --git a/media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20190407.ebuild b/media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20190407.ebuild
index 5958ac66e933..f56f4afcbd89 100644
--- a/media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20190407.ebuild
+++ b/media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20190407.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Brushes for GIMP with the styles arrow, handpointer, button arrow and cursor"
-HOMEPAGE="http://www.gimphelp.org/index.html"
+HOMEPAGE="https://www.gimphelp.org/"
+
 # http://www.gimphelp.org/DL/ refuses wget without user-agent
 SRC_URI="
 	https://dev.gentoo.org/~pacho/${PN}/arrow_brushes_color_1.tar.bz2
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 281e8403e01c..a0a13b257a37 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,16 +1,9 @@
 AUX gimp-2.10_fix_test-appdata.patch 902 BLAKE2B 2b1a131d874d65422d8bdd44732b9843d89a570a1ea3c058cdb2a424a7791c686aa0e2ae2a0b472f333f2465f6e1a26750a532e9003933c5dffa1af32343c1dc SHA512 2983e8572f5e8113c9e2f564d31c1a5fe7e11ef273c50d2be739089124c6ec1a457da28222020bbd6015b2cbbcbf403b88d8660b9b35241800deb4fb3ad79067
-AUX gimp-2.99.2_fix_autoconf-2.70.patch 1913 BLAKE2B 779ce5a54150ee2a89507420931f255c09602af36ab8176f7ae9f18a7c1feb12451e817d2a89251d0366af6db90f602a107108227c98ac99b73e16ddb7b1fd05 SHA512 efa8882896335d3ac4ae7fb8874b5bd568472ccdcaeaf1d771f6c6b815b138186016f39f5f2f30fa01c1018ad583649fcf564cc5a8bcece741092f7dbc22f5fa
-DIST gimp-2.10.22.tar.bz2 33152226 BLAKE2B d11b0ee8f0f24934383028a0b21820af30da6133814d64b67981888086f3eaa4378e474ff801db046f2fe5d380325ac7279df6e749d100219e2f6558c9bdf10d SHA512 13841ac4a186df47e4155095ca888a903b2db9e25a73fbb834fe981ccf915cb67a3e08506e5c13b6c5f35e27b1de24befbccf871e438b1a35f67f069bebd8fd0
-DIST gimp-2.10.24.tar.bz2 31546295 BLAKE2B e2b873313b41799cb9461f6cd2ec45dcb0d3f51fe3e2710e47be99be868fba962cb75afb47bc2f12e2d6090993d70f560f4d58d2614939a0d36cadc9191fa2a7 SHA512 828350ad5c53b8409463c24693821d78a1940f18c221249ae7b864ad9db5cf01ab41d6ec5bbefd96115f0e91809ecdc61451d71881b56b07920c442f4a514936
 DIST gimp-2.10.28.tar.bz2 31675862 BLAKE2B b491b55d5adf08221feb7cee8b3adc1d8b090901e8f43b93a4d2c3d935ce1ca45072b0ccd6840e06b329fbfafc8fe5e3d6056381c5129203fa3c5e781cab0453 SHA512 587f6f46741672f0700fd642a5b779694d2d8bc8ad70e7677ccdbfc2266dc62203ed347d6aaffaa4b8e7d84a84a25f7d5a51507dfd64b21b4c05970856d3ab94
 DIST gimp-2.10.30.tar.bz2 31731327 BLAKE2B 6d948e16fbf7bae7b514a60a44fc5eaac32bebb915de0dcb5120d10739501a01973cb1f5821699d94c4d4cc7ef86d0e5456674a87623b6996d9b276d83a6eb74 SHA512 02ca9e8846dc2ae856f720b92f3c6af69984cf0b3ce85ba5a67479e5c3c813315a0551b7d011dcf7a6c83dc771e550cc31041126bbea0be3fd483176e0eb2851
-DIST gimp-2.99.6.tar.bz2 30663040 BLAKE2B ccbdc2baa9e99a94e85345ce90bcba6ca56c0f264d3248d198009b730a5c810997b76c7d7a3cf131374316298d719a3e70c81ee7bc0a5e34beda1b112921807a SHA512 51ada696693ac51624ba222d1fff54d39bdc72a06de54f7c244b89740b77f7205aab44f1cec90785ca4196cab32f817e7390b4287a30f5024606163f24222961
-DIST gimp-2.99.8.tar.bz2 30799403 BLAKE2B a67863f5e7d40beca80f931973759dc4523718ac2740cac4924dae8e1611491e59c43436ca670643be1878e1d9ff1575174a59c919b33103128a812e7eba6042 SHA512 c603d9a315c21c9da716cc1d8c0c784061e7d0eac4b3d28467aabc3c63c950da0a52649e498049e0b8475933ef93d721a2b8423811b47b00c9490485d316345e
-EBUILD gimp-2.10.22-r3.ebuild 5618 BLAKE2B ce5a7d64257677255daa60f7df99d1e035d548d7554821fd052172733cb335044f100d0372b6275153c742cd7213a38b4f590c171321206a7cb71db06c95dcf0 SHA512 b2d3ae49649c81e9cb93f2cfe35b2da46f55da97dbf2a56a66d65af45d33efe21e5c02a1ce54140f9bb2a835bc36c00de19a86301a15b048fcc3c2ea59f03147
-EBUILD gimp-2.10.24-r1.ebuild 5563 BLAKE2B d703a4c206d0525d7cb6156137f3dae634a57ceeb91ba59f338a54266ec1c86cd7f03f6823cc1d2e74f2eef03581676a16b613ed40022036dbf0c71785df70ed SHA512 9bf9b2f6f49ef4a533c6634611bcd85a3ca3b699b73e83cfe41a56010c9c3c4d92757c37bf7bb3792637bf3fc84f82721f55c17b108b80860bdd7288f8d29fe0
-EBUILD gimp-2.10.28-r1.ebuild 5566 BLAKE2B 7f114e8d031afb5b77838c3757ef55d662e70ac09190cdbd2c37ef7aab6155dc524c64441d0fdd971a96f31abf803cad947ff513e19158f832f8e38b5de080e8 SHA512 7aa3287a23bd845b019954c7b6ff43bf5663eaf7b7e8bf3ace2e5c41c4e8142932fd24d1adc93130686625a1e49252929bf7761476808821cc4100a498151dbb
-EBUILD gimp-2.10.30.ebuild 5570 BLAKE2B 19c92d04da48c70110aa460a6ee8d34215fe78357becfed4f5837adaa2cdc9268ee10907fc71a95e125641fd3542be5d4575c0a32bf2ad892f055123a4136bfc SHA512 32e8ca70580a379ccb0a907f654cf1414b2b87d3477699806c2b619ec5804efe60cd3eefad0ffa341b9f24df513369c5a208d3e67b644cf7f731fb8ca898db1a
-EBUILD gimp-2.99.6-r2.ebuild 6821 BLAKE2B 03feae18f0208c4061a909f988853289c46c2cfad66fc3e3e8644884bd2b817104a87ed3c49f53fc4b23e40c95d36be0d2a135d5c8b0534e14c2f778eed87809 SHA512 2b510eceb3757c6c363cd65ca9d60fb1a57423e5028c86158d04d2d7d392bf3b6bc189d22693b12809fa08194550e9852a1638164449ed185c4cbc2d2e0628f1
-EBUILD gimp-2.99.8-r1.ebuild 6821 BLAKE2B 2887c37dc395ee6c4b289a1b831d8ccb4b377d49c8afea1781a1604a9ec2a974cd36234ef86d89aa91fe9f3729870cf3fd6fdd245a8ec9f6a2ae43c49bee838d SHA512 2d14d6d6451c565b55187e12a491071aad5b0a0694f9a6d302d27bbe49f7a4de5a8bba2c66a0182ad88f39385b21b432e8ee6c121a62437f2229d4c05f9941d6
-EBUILD gimp-9999.ebuild 6537 BLAKE2B 43f40fd2b457da251bff6d2a9efc22d0648a6473deeabd1ac02d791c293d68c2d23a8fccbb72f70901cc5abcf6ed01b40c28c6f01fedf2f831655d2242fd2842 SHA512 6962e8645a80f0010763237e3e325c5fcaef452aae91b706f34873f2a0231d8225f1bfb927db3e5d1e1c85c371028cf72128e42985a6ca518a9a9fe53362e5c9
+DIST gimp-2.99.10.tar.bz2 26782056 BLAKE2B 103e7fa2d04b1989e59fb03964a122891831d122cdc6dd3b7637f06cff28310e12d9a79678ac477b56728f4ceb53292001c53f026e94be417db76dd7e14740ab SHA512 898c1e1ffd2270ccc965db9a8263e04d95455535361b47f92256b4028808e1e91eb1924cf6cef7ff9e988194ebbc67535bd9cfbf0243159824e58551a2b91ba3
+EBUILD gimp-2.10.28-r1.ebuild 5566 BLAKE2B 6475774d4d3af42eeb436c01b84fb14991c707b209e0b0aa3b9115d120cbc09f33c811a35e2e39a7ba373c0c3649f840527ac60fc42b8fa3dc1066d346e6d9fb SHA512 a956a96435e584b74166e0a015fbd376d0402f552f211dd0947a8b049d8cb3826a657de6ba3cf4697bd2e64638194d2692776897c8809f81d177fc8a78147bec
+EBUILD gimp-2.10.30.ebuild 5566 BLAKE2B ebd2a95b71587d02a31d422a405d3e3865ae89c4100b70e3c0a88912fb39a0436bad8bde3faab4d3337f20713a0ca251996cd7b57c5c3bbd568b2f1407b52f6a SHA512 28f5384828301e3c61a3698ebf7d465ae0f40d2776bdff808b45f5444917d8038d7938a9712180b8fae1fd33b48d1cd33debb5ed9bb1ffcb347175ebba8c7959
+EBUILD gimp-2.99.10.ebuild 6542 BLAKE2B df05e1a2e301c88a892d8415dc82fc5b4e7a25df9b2c14fcb3f955230763eae67bbf7ca20e1d79ad27a31943c59e99d3243f11c6f8a26bde6b7454043f4d99ca SHA512 de9c1627f5f38fbb254ac019fe3f21c85337025df3b49e407963cc291a83b7f857e0876a3c1997652e356d55d2c6177036fdd73b29cd8ed20c2bde08b3c97390
+EBUILD gimp-9999.ebuild 6573 BLAKE2B ab7573eb230ad1553532ddfa3331f87de8d7ed93c1156fe243686bf5313652ad619813e1b1ce159ca6c2d0c7d364bbfc8517ba0ce6e46c21b1f559e06c7ffc13 SHA512 e3e39eb903626c5da6bc96714a3fee032c847e1a4fdaffb3670677190a848614711ab36589cd839414e0111bb9fc1c14db9d5f3b26229f199e387ca06c9a12fa
 MISC metadata.xml 577 BLAKE2B a8bfdc064608bf0bb4a2f81a5de928d7eb35da9eaf2db64198ca34ca8b2542116ed1f341fe822354fa60b8d447676eb892c38dc4093b4b9db16622fe9d64bba8 SHA512 12e030815c13bc253aa877c7da837e01f8d259a6297807c0543f05e21edb92fda38b3a54a064b4721172fcc3db9d0ed2ae580118d51f03fc37f6ac4bacde5154
diff --git a/media-gfx/gimp/files/gimp-2.99.2_fix_autoconf-2.70.patch b/media-gfx/gimp/files/gimp-2.99.2_fix_autoconf-2.70.patch
deleted file mode 100644
index 732cd9381ae3..000000000000
--- a/media-gfx/gimp/files/gimp-2.99.2_fix_autoconf-2.70.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From cebeb90a87105cd6e35bcb357d53cc04c828ca21 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sun, 25 Oct 2020 18:09:21 +0000
-Subject: [PATCH] configure.ac: fix `--with-linux-input` handling with upcoming
- autoconf-2.70
-
-Upcoming autoconf-2.70 exposes deficiency in configure.ac:
-
-```
-$ autoconf-2.70_beta2 && ./configure --host=x86_64-pc-linux-gnu
-./configure: line 1430: 5: Bad file descriptor
-checking whether  is declared... ./configure: line 1432: ${+y}: bad
-```
-
-It happens because macros are called with parameters using insufficient quoting.
-
-More details at https://lists.gnu.org/archive/html/bug-autoconf/2020-10/msg00027.html
-
-The fix only amends `--with-linux-input`. Other cases of underquoting
-will need to be handled separately.
-
-Fix-by: Zack Weinberg
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- configure.ac | 17 ++++++++---------
- 1 file changed, 8 insertions(+), 9 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 96312f706e..63b85be07a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2135,15 +2135,14 @@ fi
- AC_ARG_WITH(linux-input, [  --without-linux-input   don't build linux input event controller module])
- 
- have_linux_input="no (linux input support disabled)"
--if test "x$with_linux_input" != "xno"; then
--  AC_CHECK_HEADER(linux/input.h,
--	AC_CHECK_DECL(KEY_OK,
--		have_linux_input=yes,
--		have_linux_input="no (needs Linux 2.6)",
--		[#include <linux/input.h>]))
--fi
--
--AM_CONDITIONAL(HAVE_LINUX_INPUT, test "x$have_linux_input" = xyes)
-+AS_IF([test "x$with_linux_input" != "xno"],
-+  [AC_CHECK_HEADER([linux/input.h],
-+    [AC_CHECK_DECL([KEY_OK],
-+                   [have_linux_input=yes],
-+                   [have_linux_input="no (needs Linux 2.6)"],
-+                   [#include <linux/input.h>])])])
-+
-+AM_CONDITIONAL([HAVE_LINUX_INPUT], [test "x$have_linux_input" = xyes])
- 
- 
- ###############################
--- 
-GitLab
-
diff --git a/media-gfx/gimp/gimp-2.10.22-r3.ebuild b/media-gfx/gimp/gimp-2.10.22-r3.ebuild
deleted file mode 100644
index 1926eec2dcee..000000000000
--- a/media-gfx/gimp/gimp-2.10.22-r3.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME2_EAUTORECONF=yes
-WANT_AUTOMAKE=
-
-inherit autotools gnome2 toolchain-funcs virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
-
-IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=app-text/poppler-0.50[cairo]
-	>=app-text/poppler-data-0.4.7
-	>=dev-libs/atk-2.2.0
-	>=dev-libs/glib-2.56.2:2
-	>=dev-libs/json-glib-1.2.6
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.40.6:2
-	>=media-gfx/mypaint-brushes-2.0.2:=
-	>=media-libs/babl-0.1.78
-	>=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
-	>=media-libs/libmypaint-1.6.1:=
-	>=media-libs/libpng-1.6.25:0=
-	>=media-libs/tiff-3.5.7:0
-	net-libs/glib-networking[ssl]
-	sys-libs/zlib
-	virtual/jpeg
-	>=x11-libs/cairo-1.12.2
-	>=x11-libs/gdk-pixbuf-2.31:2
-	>=x11-libs/gtk+-2.24.32:2
-	x11-libs/libXcursor
-	>=x11-libs/pango-1.29.4
-	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
-	heif? ( >=media-libs/libheif-1.3.2:= )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
-	mng? ( media-libs/libmng:= )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
-	postscript? ( app-text/ghostscript-gpl )
-	udev? ( dev-libs/libgudev:= )
-	unwind? ( >=sys-libs/libunwind-1.1.0:= )
-	webp? ( >=media-libs/libwebp-0.6.0:= )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-themes/hicolor-icon-theme
-	gnome? ( gnome-base/gvfs )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	>=dev-lang/perl-5.10.0
-	dev-libs/appstream-glib
-	dev-util/gtk-update-icon-cache
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.19
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-"
-
-DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
-
-# Bugs 685210 (and duplicate 691070)
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
-	"${FILESDIR}/${PN}-2.99.2_fix_autoconf-2.70.patch"
-)
-
-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
-
-	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}"/bin/false
-
-		--enable-default-binary
-
-		--disable-check-update
-		--disable-python
-		--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 vector-icons)
-		$(use_with aalib aa)
-		$(use_with alsa)
-		$(use_with !aqua x)
-		$(use_with heif libheif)
-		$(use_with jpeg2k jpeg2000)
-		$(use_with mng libmng)
-		$(use_with openexr)
-		$(use_with postscript gs)
-		$(use_with udev gudev)
-		$(use_with unwind libunwind)
-		$(use_with webp)
-		$(use_with wmf)
-		$(use_with xpm libxpm)
-	)
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
-	gnome2_src_compile
-}
-
-# for https://bugs.gentoo.org/664938
-_rename_plugins() {
-	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
-	local prepend=gimp-org-
-	(
-		cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
-		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} || die
-			mv {,${prepend}}${plugin} || die
-		    fi
-		done
-	)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	gnome2_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
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(ver_cut 1-2)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	# Remove gimp devel-docs html files if user doesn't need it
-	if ! use doc; then
-		rm -r "${ED}"/usr/share/gtk-doc || die
-	fi
-
-	_rename_plugins || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.10.24-r1.ebuild b/media-gfx/gimp/gimp-2.10.24-r1.ebuild
deleted file mode 100644
index d0a03562d09b..000000000000
--- a/media-gfx/gimp/gimp-2.10.24-r1.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME2_EAUTORECONF=yes
-WANT_AUTOMAKE=
-
-inherit autotools gnome2 toolchain-funcs virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-
-IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=app-text/poppler-0.50[cairo]
-	>=app-text/poppler-data-0.4.7
-	>=dev-libs/atk-2.2.0
-	>=dev-libs/glib-2.56.2:2
-	>=dev-libs/json-glib-1.2.6
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.40.6:2
-	>=media-gfx/mypaint-brushes-2.0.2:=
-	>=media-libs/babl-0.1.86
-	>=media-libs/fontconfig-2.12.4
-	>=media-libs/freetype-2.1.7
-	>=media-libs/gegl-0.4.30:0.4[cairo]
-	>=media-libs/gexiv2-0.10.6
-	>=media-libs/harfbuzz-0.9.19:=
-	>=media-libs/lcms-2.8:2
-	>=media-libs/libmypaint-1.6.1:=
-	>=media-libs/libpng-1.6.25:0=
-	>=media-libs/tiff-3.5.7:0
-	net-libs/glib-networking[ssl]
-	sys-libs/zlib
-	virtual/jpeg
-	>=x11-libs/cairo-1.12.2
-	>=x11-libs/gdk-pixbuf-2.31:2
-	>=x11-libs/gtk+-2.24.32:2
-	x11-libs/libXcursor
-	>=x11-libs/pango-1.29.4
-	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
-	heif? ( >=media-libs/libheif-1.9.1:= )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
-	mng? ( media-libs/libmng:= )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
-	postscript? ( app-text/ghostscript-gpl )
-	udev? ( dev-libs/libgudev:= )
-	unwind? ( >=sys-libs/libunwind-1.1.0:= )
-	webp? ( >=media-libs/libwebp-0.6.0:= )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-themes/hicolor-icon-theme
-	gnome? ( gnome-base/gvfs )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	>=dev-lang/perl-5.10.0
-	dev-libs/appstream-glib
-	dev-util/gtk-update-icon-cache
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.19
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-"
-
-DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
-
-# Bugs 685210 (and duplicate 691070)
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
-)
-
-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
-
-	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}"/bin/false
-
-		--enable-default-binary
-
-		--disable-check-update
-		--disable-python
-		--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 debug)
-		$(use_enable vector-icons)
-		$(use_with aalib aa)
-		$(use_with alsa)
-		$(use_with !aqua x)
-		$(use_with heif libheif)
-		$(use_with jpeg2k jpeg2000)
-		$(use_with mng libmng)
-		$(use_with openexr)
-		$(use_with postscript gs)
-		$(use_with udev gudev)
-		$(use_with unwind libunwind)
-		$(use_with webp)
-		$(use_with wmf)
-		$(use_with xpm libxpm)
-	)
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
-	gnome2_src_compile
-}
-
-# for https://bugs.gentoo.org/664938
-_rename_plugins() {
-	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
-	local prepend=gimp-org-
-	(
-		cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
-		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} || die
-			mv {,${prepend}}${plugin} || die
-		    fi
-		done
-	)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	gnome2_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
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(ver_cut 1-2)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	# Remove gimp devel-docs html files if user doesn't need it
-	if ! use doc; then
-		rm -r "${ED}"/usr/share/gtk-doc || die
-	fi
-
-	_rename_plugins || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.10.28-r1.ebuild b/media-gfx/gimp/gimp-2.10.28-r1.ebuild
index fcd583b632bd..2937709c2d68 100644
--- a/media-gfx/gimp/gimp-2.10.28-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.28-r1.ebuild
@@ -31,7 +31,7 @@ COMMON_DEPEND="
 	>=media-libs/babl-0.1.88
 	>=media-libs/fontconfig-2.12.4
 	>=media-libs/freetype-2.1.7
-	>=media-libs/gegl-0.4.32:0.4[cairo]
+	>=media-libs/gegl-0.4.34:0.4[cairo]
 	>=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.30.ebuild b/media-gfx/gimp/gimp-2.10.30.ebuild
index 2363a4fe3c4e..b371f1779de4 100644
--- a/media-gfx/gimp/gimp-2.10.30.ebuild
+++ b/media-gfx/gimp/gimp-2.10.30.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv x86"
 
 IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
 
diff --git a/media-gfx/gimp/gimp-2.99.8-r1.ebuild b/media-gfx/gimp/gimp-2.99.10.ebuild
index ec80a0eb960b..75e77fab2cd0 100644
--- a/media-gfx/gimp/gimp-2.99.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.99.10.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( luajit )
 PYTHON_COMPAT=( python3_{8..10} )
@@ -38,11 +38,11 @@ COMMON_DEPEND="
 	dev-libs/libxslt
 	>=gnome-base/librsvg-2.40.21:2
 	>=media-gfx/mypaint-brushes-2.0.2:=
-	>=media-libs/babl-0.1.86[introspection,lcms,vala?]
+	>=media-libs/babl-0.1.90[introspection,lcms,vala?]
 	>=media-libs/fontconfig-2.12.6
 	>=media-libs/freetype-2.10.2
-	>=media-libs/gegl-0.4.32:0.4[cairo,introspection,lcms,vala?]
-	>=media-libs/gexiv2-0.10.10
+	>=media-libs/gegl-0.4.36:0.4[cairo,introspection,lcms,vala?]
+	>=media-libs/gexiv2-0.12.2
 	>=media-libs/harfbuzz-2.6.5:=
 	>=media-libs/lcms-2.9:2
 	>=media-libs/libmypaint-1.6.1:=
@@ -100,19 +100,14 @@ DEPEND="
 	>=sys-devel/automake-1.11
 	>=sys-devel/gettext-0.21
 	>=sys-devel/libtool-2.4.6
-	doc? (
-		app-text/yelp-tools
-		dev-libs/gobject-introspection[doctool]
-		>=dev-util/gtk-doc-1.32
-		dev-util/gtk-doc-am
-	)
+	doc? ( dev-util/gi-docgen )
 	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" )
+DOCS=( "AUTHORS" "devel-docs/CODING_STYLE.md" "devel-docs/HACKING.md" "NEWS" "README" "README.i18n" )
 
 # Bugs 685210 (and duplicate 691070)
 PATCHES=(
@@ -135,8 +130,6 @@ src_prepare() {
 
 	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
 
@@ -160,6 +153,8 @@ _adjust_sandbox() {
 src_configure() {
 	_adjust_sandbox
 
+	use vala && vala_setup
+
 	local myconf=(
 		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
 		GDBUS_CODEGEN="${EPREFIX}"/usr/bin/gdbus-codegen
@@ -177,8 +172,7 @@ src_configure() {
 		$(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 doc g-ir-doc)
+		$(use_enable doc gi-docgen)
 		$(use_enable vector-icons)
 		$(use_with aalib aa)
 		$(use_with alsa)
@@ -246,11 +240,6 @@ src_install() {
 	mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die
 
 	_rename_plugins || die
-
-	if use doc; then
-		mkdir "${ED}/usr/share/gtk-doc/html/gimp3_g-ir-docs" || die
-		cp -r "${S}/devel-docs/g-ir-docs/html/"{gjs,python} "${ED}/usr/share/gtk-doc/html/gimp3_g-ir-docs/" || die
-	fi
 }
 
 pkg_postinst() {
diff --git a/media-gfx/gimp/gimp-2.99.6-r2.ebuild b/media-gfx/gimp/gimp-2.99.6-r2.ebuild
deleted file mode 100644
index 38dfe146fb0c..000000000000
--- a/media-gfx/gimp/gimp-2.99.6-r2.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{8..10} )
-GNOME2_EAUTORECONF=yes
-VALA_MIN_API_VERSION="0.44"
-VALA_USE_DEPEND=vapigen
-
-inherit 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"
-
-IUSE="aalib alsa aqua 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/appstream-glib-0.7.16
-	>=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.86[introspection,lcms,vala?]
-	>=media-libs/fontconfig-2.12.6
-	>=media-libs/freetype-2.10.2
-	>=media-libs/gegl-0.4.30: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[introspection]
-	>=x11-libs/gtk+-3.24.16:3[introspection]
-	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.9.1:= )
-	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_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-util/gdbus-codegen
-	dev-util/gtk-update-icon-cache
-	>=dev-util/intltool-0.51.0
-	>=sys-devel/autoconf-2.54
-	>=sys-devel/automake-1.11
-	>=sys-devel/gettext-0.21
-	>=sys-devel/libtool-2.4.6
-	doc? (
-		app-text/yelp-tools
-		dev-libs/gobject-introspection[doctool]
-		>=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 doc g-ir-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
-
-	if use doc; then
-		mkdir "${ED}/usr/share/gtk-doc/html/gimp3_g-ir-docs" || die
-		cp -r "${S}/devel-docs/g-ir-docs/html/"{gjs,python} "${ED}/usr/share/gtk-doc/html/gimp3_g-ir-docs/" || die
-	fi
-}
-
-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 c7e793bb2d56..28a370966ece 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( luajit )
 PYTHON_COMPAT=( python3_{8..10} )
@@ -39,11 +39,11 @@ COMMON_DEPEND="
 	dev-libs/libxslt
 	>=gnome-base/librsvg-2.40.21:2
 	>=media-gfx/mypaint-brushes-2.0.2:=
-	>=media-libs/babl-0.1.88[introspection,lcms,vala?]
+	>=media-libs/babl-0.1.90[introspection,lcms,vala?]
 	>=media-libs/fontconfig-2.12.6
 	>=media-libs/freetype-2.10.2
-	>=media-libs/gegl-0.4.34:0.4[cairo,introspection,lcms,vala?]
-	>=media-libs/gexiv2-0.10.10
+	>=media-libs/gegl-0.4.36:0.4[cairo,introspection,lcms,vala?]
+	>=media-libs/gexiv2-0.12.2
 	>=media-libs/harfbuzz-2.6.5:=
 	>=media-libs/lcms-2.9:2
 	>=media-libs/libmypaint-1.6.1:=
@@ -108,7 +108,7 @@ 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" )
+DOCS=( "AUTHORS" "devel-docs/CODING_STYLE.md" "devel-docs/HACKING.md" "NEWS" "README" "README.i18n" )
 
 # Bugs 685210 (and duplicate 691070)
 PATCHES=(
@@ -131,8 +131,6 @@ src_prepare() {
 
 	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
 
@@ -156,6 +154,8 @@ _adjust_sandbox() {
 src_configure() {
 	_adjust_sandbox
 
+	use vala && vala_setup
+
 	local myconf=(
 		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
 		GDBUS_CODEGEN="${EPREFIX}"/usr/bin/gdbus-codegen
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index bcce2c0e1fec..08281488260e 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,7 +1,8 @@
-AUX gmic-2.9.2_ipa-sra.patch 665 BLAKE2B b61fa87ac2da5fd5956c89cb4a6c128f266a175dca70cd34ff4bed0483c934241a375131eaddd6ebd5f3afb52e694d4fc6839d20718bc06463c0e263f15b6d5a SHA512 6f04cac4de5914cedd269655fe58ca406199c042bdbab6e706cfea49516d0a7e1234e61c51b6a142341a7984dd96e97c4b8f13c2efbe427627be26539af8653e
 AUX gmic-3.0.0_ipa-sra.patch 665 BLAKE2B d1b47e2f0e8e63251172ee6cbc2c5b1bd86d100904a3d7bb0c5df39c051769b8b6c0aa0bb1f81010fd9ca195886a0dbce41528d31a811627ee28d1af58a83432 SHA512 4677fc93e72ed5e71a91197d364a04e1f8c6c13bb3f5b6eb5402a03c0d6ab395b54788669e028b932e207986121138419a58ed5f4333c0a45cbe6c0b9638ed96
+AUX gmic-3.0.1-openexr-3-imath.patch 1051 BLAKE2B 03d1cd6be5c5af76b6ecb071b46ee20abc4bd05d055fcd3ee21943ae5821c8c41e080b20d054b2f5e53cfbeb7326b8af6fa599182cdfd5e47679a57b47fa2f1d SHA512 83e9ec847328eef9f275f747ca6d2ac1071151cc7eb62ad70fa9de121d790e45d60514993274a44fe980537a793eaa56d397da5e207355fa2c9723bdafe7ff88
 DIST gmic_3.0.0.tar.gz 10225122 BLAKE2B 1066c62c2c56fafbfd11608eb9e3b7c7e9a87b404aae1e7e673e21d9b7b76a599e241f16656786bfa35687f3b3921fcba96368227753105aa25e2fa451962bfa SHA512 89353d16d6304e322400c93bafb50f7557df93c933ed2994f33a17d877e4e12ec511a355b38058680f356bccab5aa84b607fab225354c19d4b8ab3e64424c87c
 DIST gmic_3.0.1.tar.gz 10457923 BLAKE2B b495d10237abf5abe3d7df166119d2fc0b04142975d97db01ab0c5aa177f6e681931799fb392844e5c34d0503874a16d946a7146c5152cca1e64107948c02c03 SHA512 4bc08a3510e8987eea0463bfcf04de6dfd9a8ee8a38c14661ff201b8f563cab1b914dc60dc35b082cb5e868eb6232e2240a2d6703e0751215a82d6709236946a
 EBUILD gmic-3.0.0.ebuild 4218 BLAKE2B bc0d0cad2242cb4ff8e828c390cc17b3ebf8bd50e18d81acbab8e02cf74b0de9a0bafb16545205bdaca11dd81c89caa343cfc2aa89747ee5102d5cb022f95eaf SHA512 9975caa9e60ca817e0257c5c872233e112bfa0199ca17521d4bda8d398f1a08588be3f7493bc7f7d6e7714972e83567f20de0a5502e683b9e2897a9acff3f3ed
+EBUILD gmic-3.0.1-r1.ebuild 4242 BLAKE2B ce9af2b77e661c3f903882ffaa40a5ffc434ad52fcd7b2c3e5ffebbd8ffc0e3c3b96196a94e4f002f9b86e920fae50b40075770230ad40ebeff3e27a70b073e5 SHA512 57a9b5df6025c2e64c88d1ecae16429f3bd24b56f6bd787380fc49a3ff9375942346e91856d767b4f7974a4a18fcac5e697fac54624c0a1659604787524a148a
 EBUILD gmic-3.0.1.ebuild 4202 BLAKE2B fedf953be4fc0b777861128959cceaf68df2c08d73ca6c2f3c4f191ef110d6739e971959b26e31bc72132705b6adef83352b09e3d186ab125fb77120f16fd113 SHA512 9623391c7c58dce6be157c8c8e0917af2d1a0fdc853f28318e212cab6595fe94d84f9c4033d192d89c11e254c76d30bd47aed9d3b18a52b2fee24856aa611d18
 MISC metadata.xml 534 BLAKE2B f229329b6cd7c9a79b7be93c64ce6e84e65391084c7d76b99ada95762c643fc445fe12fa55acc9b355b5f1fb86de7c0845ec34f921494df8cba3d90ca8c2a408 SHA512 e36403a679467cba0b0580810a27076214d676a74deb09a55f13a38bc06f5ff0999560e1ae00629047a682bcbf3b9e73243db8da3eaa24b275c24a0d1995fe3c
diff --git a/media-gfx/gmic/files/gmic-2.9.2_ipa-sra.patch b/media-gfx/gmic/files/gmic-2.9.2_ipa-sra.patch
deleted file mode 100644
index 384856a0464f..000000000000
--- a/media-gfx/gmic/files/gmic-2.9.2_ipa-sra.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-A GCC-specific setting from years ago. gcc-9 quietly ignores it (the
-resulting binaries appear to be the same whether -fno-ipa-sra has been
-specified or not), clang fails on it as not recognised.
-Just get rid of it altogether.
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -100,7 +100,7 @@
- if(APPLE)
-    set(COMPILE_FLAGS "${COMPILE_FLAGS} -mmacosx-version-min=10.8 -stdlib=libc++ -Wno-error=c++11-narrowing -Wc++11-extensions -fpermissive")
- else()
--  set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-error=narrowing -fno-ipa-sra -fpermissive")
-+  set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-error=narrowing -fpermissive")
- endif()
- 
- if(NOT "${PRERELEASE_TAG}" STREQUAL "")
diff --git a/media-gfx/gmic/files/gmic-3.0.1-openexr-3-imath.patch b/media-gfx/gmic/files/gmic-3.0.1-openexr-3-imath.patch
new file mode 100644
index 000000000000..e97ef6bf6138
--- /dev/null
+++ b/media-gfx/gmic/files/gmic-3.0.1-openexr-3-imath.patch
@@ -0,0 +1,28 @@
+https://src.fedoraproject.org/rpms/gmic/raw/rawhide/f/gmic-openexr3.patch
+--- a/cmake/FindCImg.cmake
++++ b/cmake/FindCImg.cmake
+@@ -147,7 +147,10 @@ if(ENABLE_JPEG)
+ endif()
+ 
+ if(ENABLE_OPENEXR)
+-  find_package(OpenEXR)
++  find_package(OpenEXR CONFIG)
++  if(NOT TARGET OpenEXR::OpenEXR)
++    find_package(OpenEXR)
++  endif()
+ 
+   if(OpenEXR_FOUND)
+     list(APPEND CLI_COMPILE_FLAGS "cimg_use_openexr")
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -307,8 +307,8 @@
+ 
+ # Enable native support of EXR image files, using the OpenEXR library.
+ # (http://www.openexr.com/)
+-OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR || echo -I$(USR)/$(INCLUDE)/OpenEXR)
+-OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lIlmImf -lHalf)
++OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR || echo -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath)
++OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lOpenEXR -lImath)
+ 
+ # Enable Fast Fourier Transforms, using the FFTW3 library.
+ # (http://www.fftw.org/)
diff --git a/media-gfx/gmic/gmic-3.0.1-r1.ebuild b/media-gfx/gmic/gmic-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..2c806f819a10
--- /dev/null
+++ b/media-gfx/gmic/gmic-3.0.1-r1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake bash-completion-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X zlib"
+REQUIRED_USE="
+	gimp? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		media-gfx/gimp:0/2
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		dev-libs/imath:=
+		media-libs/openexr:=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	gimp? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.0_ipa-sra.patch
+	"${FILESDIR}"/${PN}-3.0.1-openexr-3-imath.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use openmp; then
+			tc-has-openmp || die "Please switch to an openmp compatible compiler"
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use gimp || use qt5; then
+		# respect user flags
+		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
+			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
+			-i gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		# Bug #753377
+		local PATCHES=()
+		cmake_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=no
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake_src_install
+
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_cluts.gmz
+
+	# install gmic-qt frontends
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -le "3.0.0"; then
+				einfo "Note that starting with version 3.0.1 ${CATEGORY}/${PN} no longer provides a Krita interface."
+				einfo "Please use the built-in G'MIC plugin provided with Krita 5, or use an older version."
+				break
+			fi
+		done
+	fi
+}
diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest
index c62915cf517d..d6736626126d 100644
--- a/media-gfx/gnome-font-viewer/Manifest
+++ b/media-gfx/gnome-font-viewer/Manifest
@@ -1,6 +1,4 @@
 AUX gnome-font-viewer-41.0-fix-meson-0.61-build.patch 1127 BLAKE2B 7cb4c294ea2a2e8b117a699008075435a8d60ad970db8afe9bbd86c6b5d7fd6b423b6c4535b6ee4c4475384a7749c2efdd0530f229f9d3b61f78a08f23a82cd6 SHA512 2f339dfb9f4a566a334273730cabf983deafc062221b6170d8858780bcee20e7cdffcf95fb159afeb0def7966c105267c9469f7c06542d4d2af208c5b895a68d
-DIST gnome-font-viewer-40.0.tar.xz 175396 BLAKE2B 33e10646fe31f76696867c0c5e7a99385064f09049390adb78149141f906958a6f14c3e29a9fbbfe8c48879f4600963ec66e9753018d9d7d658f4111c6dad120 SHA512 c82044e6750494d693cf631abe7fb76c655b58965ccd1ca08f512f0e79c40e9f207997465908b99e5813f350ca05ea8e76f029be79f3008173c49f3c5a4ee23d
 DIST gnome-font-viewer-41.0.tar.xz 179672 BLAKE2B ce9e91b319ccf2e099cd30cf13e407270775950321e2bea69703050b5797ed879320939d260aba175f3ed6f5719e23f5628c6501f362c3e367ca5ddf70902037 SHA512 09d9ddcdd18fd0023dff46e7197988473119e0d753b7814fdca0116c6831a93146301dd56ee77546121c573c8d93801b5d8fed0c46da47052e31749058c21d50
-EBUILD gnome-font-viewer-40.0-r1.ebuild 706 BLAKE2B c1bbe6bdf32929b50ee427b4d6ede320fad7c70d5cf79340a843491edb5ddbde4aa75f78dcd2020b6b6aeb22850d4ec49a03a1ddc9d649158b617218f17b8ee7 SHA512 b002c91fba2b1e43908b78fe8e97fdaf833595328e28299df2d701d3bac271de115b3ae028238d496ddf447a3277e5c19b07853dc4efe9931746bb18b54fb733
-EBUILD gnome-font-viewer-41.0.ebuild 768 BLAKE2B 76a3993ef8d211ef65b1704f8bacd52826aa09b3304e312f48d80f9e0d16e7b12ef3f9b6c751fccebb6e857b9b7a83e7ea5c1b838642c2de44f7dec42cdf76be SHA512 68113b0a971dd79a2d35a24270b637b5ac464550c16aa843c8477a1bbd9579676ca5c032ae9bdb763819b81806fe805c53832ebc464cb8682a1696451f66db9f
+EBUILD gnome-font-viewer-41.0.ebuild 765 BLAKE2B fd4fe11ea6248a29345ba3e233fcf3cf6c1af03931c20c19b03f85b88fba22dbae2329b54b55d2e438266d00d2a692ea1efa50b5037d8a4716c7efec9950a2e8 SHA512 c46a4053b7542e9a661cb437575ba7499dd5a9c4cf9b036f5ad37b7a93a69e389df482be1b6946d91686fbaa2fa6dc52c18b077f30e8cc2fba069fa98b069075
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0-r1.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0-r1.ebuild
deleted file mode 100644
index 55c0af0cc18e..000000000000
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org meson xdg
-
-DESCRIPTION="Font viewer utility for GNOME"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	>=dev-libs/glib-2.56.0:2
-	>=x11-libs/gtk+-3.24.1:3
-	>=gui-libs/libhandy-1.0.0:1=
-	>=media-libs/harfbuzz-0.9.9:=
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	gnome-base/gnome-desktop:3=
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-41.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-41.0.ebuild
index 8198ca052745..6b95fb99e771 100644
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-41.0.ebuild
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-41.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-libs/glib-2.56.0:2
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index f7a7c51655a7..d14ba3d5ea06 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,4 +1,4 @@
 AUX 40.0-fix-build-with-meson-0.61.1.patch 779 BLAKE2B 12af9247983044bf674c38f4011dc497e8f10f77dd46e87b4a2ae882922f8936a19bcda0cd440cb96f5be646852e27d0d994987ab0a070288193c76c04b33df6 SHA512 96fb1217b6265f229e0d70a65413fb0b56c110c28f300b26020cb7bf575cf1ec8dd8905bddae2e7c334f90b213f8a5bf208ce664e66343fda713ac98f472d6b4
 DIST gnome-photos-40.0.tar.xz 632440 BLAKE2B 4a3be35e627169afa4b3b9aca2c675f6035f3e46822450fc479550a3e48aebba6f9e335dc528a6593f1bd844fde501b8535ed368be9825f229280a08d5ead7e6 SHA512 70641e7fc6375e15cadc62ad75804d3ffb1d2193dd0bbed21b291b38f1d271ba7d34a4714a1658b9f13345f20e421190958b4713aae64f4f46913628079ba814
-EBUILD gnome-photos-40.0.ebuild 2494 BLAKE2B bc43ce338ed54d1dd9a6e10c8a21a9e368d777189f13353c368bb76edc869722256acfa8f7ea04df69c17d3cef0ff93bfd47a0da668bb5bf4d816aa4e21ed6b2 SHA512 8322244c02ba16047cbdec6510e9f9a5b6e5419599a8bf6a1d90c80b80b53c0254a6cf2f4c752cfcc28235384127dedca6557e01633b2e7dcbb4314b55cfae8c
+EBUILD gnome-photos-40.0.ebuild 2493 BLAKE2B 1d72bed250adf2098adeb9ec402751bd45817f3969cec39c459feaa3c93b066bbfc9c7f92a780f95e400cb4bac429db0c512464788e1fe6fdcccca27850e3c46 SHA512 e8dc79d269d3c1506dfaf16e03c87239a51f24c2d56f8b611c4d3f44a2cb7fffb0db9ee5af1b2a93b990c12363e7643bed58b1269c45662a7581f9beb763e973
 MISC metadata.xml 993 BLAKE2B 19e15d88f2176fa80739650a2d3ae57e34a662e5a4424a00a33bc785e4e4a35d57fc28d678885e4e18564318e93957b689ff36ea96bea69038a377400c6217f2 SHA512 19300545f23b83e06df0db74a605b48a62f5dd462db1ef69de903123209b50331ceffec783bd9564a15ee10dd1f0a6fc9e396f1384e56f7bb0cc83af08d1fda4
diff --git a/media-gfx/gnome-photos/gnome-photos-40.0.ebuild b/media-gfx/gnome-photos/gnome-photos-40.0.ebuild
index b3eaa56efd2a..915728b707fc 100644
--- a/media-gfx/gnome-photos/gnome-photos-40.0.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-40.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
 
 LICENSE="GPL-3+ LGPL-2+ CC0-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="flickr test upnp-av"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest
index 4ef81fead47b..3601e3622f56 100644
--- a/media-gfx/gnome-screenshot/Manifest
+++ b/media-gfx/gnome-screenshot/Manifest
@@ -1,7 +1,5 @@
 AUX gnome-screenshot-40.0-fix-hidpi.patch 1351 BLAKE2B a94ce580d6f4af9e7945bdb13b3ba5b13787b564954e0933f9324c9d086e04f6efcb0affafc8775d2b41004f9c501edbe380e869723e038355c6c6ce7cb8b43b SHA512 68e8d178800036025a03786e8842aadfce0eaec61e36405406909ba8055db86d31350bae201226e54e667879da4610d5ea94df05fcf419f6609202a8c00d9c64
 AUX gnome-screenshot-41.0-fix-meson-0.61-build.patch 898 BLAKE2B 9fc2ea6df76ca7db103a747df18e939e53f5ad78431e0c58fadb0826b2ef9686d4f14131fc06a4df3e98cd9b8833659d34a4c4a78c5e2db0f80d7941a40e1b90 SHA512 02020e4588b5bdcc15afce12c92ba261d0dae6d45c01b3b1a6c332f5eada34fa7c82df82aca8e0dd91e7bd66a5615266b581d76ca12bbf09fc8e06bf31132440
-DIST gnome-screenshot-40.0.tar.xz 358088 BLAKE2B cad407f471e953667946b741ed59fe210d7ba3d079f2db8101974e565a1d0bfaec0cb1b40791be0e183dd399a82db5f15bbbec741ef16b4b572b043fcaf8ea8e SHA512 0889d7701711f17de68f8a55f512b7764fed087b1b2f86b372d1a38ee956f05ca8c833ca16a1de2396b07c01de79204d988192036780f521b82733436d019cb0
 DIST gnome-screenshot-41.0.tar.xz 359500 BLAKE2B d3e44ab565815998327ddcbe80979acff3d690cfb0b7ae8f21910bafd21c9c7d3cd7af11e14b0522bb4d64ad2e27d5b6209c80208ea8fb03c465eb453ef8d47f SHA512 ab6c7e22cbca2739844707e59329ecd67901e04f968bd0b20a07dffff825e9772697ebf20a1ab2a920fa839ea40d0bd872d17db2b4cb7856a6f8ee4ec1426d19
-EBUILD gnome-screenshot-40.0-r1.ebuild 1407 BLAKE2B 65192134cdf21457912c0507d1371e83c5b4ab56c8c094c9ac88407ae857fa5fed3edc3dbe1ab0221aed091dcebac93cf77302bcc25e758edf341e4afa8be57e SHA512 6ea3906b0ae1557f10d21918c6162c6a2fca2017f288253ee4c855631fcb5f83d10321cee47547645aa1a401c5e440e68c9189145729341821568cd0e9bf4df1
-EBUILD gnome-screenshot-41.0.ebuild 1457 BLAKE2B c3893b238a63eb32861006fb71aa394910c371e2cf623bb83f821e84aa90bc5bc7a925da5a0d5b737ead11f42c5a89bdae8d81a1e31102bd079acc3b7af23317 SHA512 68fb91e2957cfa8eaebe50a25f707d852a43019fafeba10b68fcd3e7cf9c0cc95071c6b619ccab8c03be52cfed366e0ffc41b1b2b703ed37e23b1728c8d5869a
+EBUILD gnome-screenshot-41.0.ebuild 1454 BLAKE2B e15032436af7cbe4825bf3d6c21ba741ecd4dc3b3237f6a2a16a88c61a39585b18a5298a2e96ea1e6f53e4c68923d1b57ac7c13f2e77ac6f625d3f9a08b4c762 SHA512 5bdffe4f55cf7fc3e116cd24d28be2c174b397348b78372489c8a17fe8541fd45f5bdede77750a935b2d1483bdc752a3155a3fe2fdfc3a7236c549a94116ade7
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-40.0-r1.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-40.0-r1.ebuild
deleted file mode 100644
index 239f58245e4c..000000000000
--- a/media-gfx/gnome-screenshot/gnome-screenshot-40.0-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
-
-DESCRIPTION="Screenshot utility for GNOME"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="X"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	>=dev-libs/glib-2.35.1:2[dbus]
-	>=x11-libs/gtk+-3.12.0:3
-	>=gui-libs/libhandy-1:1=
-"
-RDEPEND="${DEPEND}
-	>=gnome-base/gsettings-desktop-schemas-0.1.0
-"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	# Fix HiDPI handling in X11 fallback
-	# https://gitlab.gnome.org/GNOME/gnome-screenshot/-/issues/128
-	"${FILESDIR}"/${PN}-40.0-fix-hidpi.patch
-)
-
-DOC_CONTENTS="${P} saves screenshots in ~/Pictures/ and defaults to
-	non-interactive mode when launched from a terminal. If you want to choose
-	where to save the screenshot, run 'gnome-screenshot --interactive'"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature X x11)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild
index 9c0e2fba9bbf..536f83cf2dfb 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="X"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	X? (
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 73d18adfde3d..209c1a0ee4ed 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,5 +1,3 @@
-DIST gphoto2-2.5.27.tar.bz2 803602 BLAKE2B ad62abc3e91ce3cee1edd8f991ac84616144997bff425eef5cea10c340f9c98694ecda783ec5762f4583d05f38cfecbb7b47e0884c05f114f931a7af8b0a676d SHA512 47001025d3647ac809ab7fd2d9319a2966d72b00471f9a9c865dfad7091c7cac2e299ecd41dfc7997a6665cf2612d4317591964f51a9d336f848e8199e3928b7
 DIST gphoto2-2.5.28.tar.bz2 797600 BLAKE2B 78a89eaf5f68f3b902751792404702fa656680e904bc750e6a51934b5cefd8458c95ffd553024e16977270f4b4806c5dc68d9e3accd8759b1357e0619a0dc6a3 SHA512 ca83c677bdaf7c16ed2bc22865bdcc24e1c5721dbcd36a76e2ebe8bb992d46614fd012cd8f38b37598b30b6b57e6bf533318f6a0d490e186f3026676249735c8
-EBUILD gphoto2-2.5.27.ebuild 1209 BLAKE2B f1f3547bffd426b36772ef930f7294f65f9877c23d4d7458185b75a1445dda1efd4a0ddabdee591354cb6ef5bbc9e2f795bf576f5ea4c1c49a44ff3d2a31ed4f SHA512 428e2f4abf2a68d3ed4db3be9041eca736ce0073e8d611e6f5bf69cc0b2afa6860861354c5bdb27f9b38c0284a3e334ad808f8c94f973fb3b7dd8463a70a620b
-EBUILD gphoto2-2.5.28.ebuild 1048 BLAKE2B 95b63ea934ff7481717ed63597011da47ea53efd994299f83deae611b07cf5e1607fd7874dd82abeee603843657a00730e47c65a6250333b17d91234c20b092d SHA512 39d6aaaf9a40ac770a4afe53c03ecd9cb58aa1d63bd7e7beb03a0f403980aa7720a9d7b61baf01c304d2fb034b123323a35950e990a6f7231396a4bcb55906bb
+EBUILD gphoto2-2.5.28.ebuild 1044 BLAKE2B 2b009db41989892a376436e08d9bc273d2cffa032e9387db0c3fca148e5b3fee9550a6de5bd825f17cea5995eee4aa393fe8316c35fff7918c87b1398f1eec1f SHA512 e7e25610b51f6d03cc5f30c4e2ed001fb35d640fe94e1830d45e7adbada7ef16ebdab59e547b9e4895d85c51f796120ff757e0caaeb15f33d7d1f4f75659d43a
 MISC metadata.xml 330 BLAKE2B 59a3975ec454edf5966f52db0edb971491c88b2e8777ad0aeb1b66e334ff70e1a7f30e0dafabdba5fb7122c2485f9c787d0bd0415f2242f4e327e66797091b6f SHA512 b86a7023ca0d70907981f5c9d4d134c48d794a9737338c8cda610cd5066f7432ada968f064a36f2b948314508811dc6eba8d9f68c3036d392cf41e57f98fc718
diff --git a/media-gfx/gphoto2/gphoto2-2.5.27.ebuild b/media-gfx/gphoto2/gphoto2-2.5.27.ebuild
deleted file mode 100644
index 7e2fd259acb4..000000000000
--- a/media-gfx/gphoto2/gphoto2-2.5.27.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="Free, redistributable digital camera software application"
-HOMEPAGE="http://www.gphoto.org/"
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~sparc x86"
-IUSE="aalib exif ncurses nls readline"
-
-# aalib -> needs libjpeg
-RDEPEND="
-	dev-libs/popt
-	>=media-libs/libgphoto2-2.5.17:=[exif?]
-	aalib? (
-		media-libs/aalib
-		virtual/jpeg:0 )
-	exif? (	media-libs/libexif )
-	ncurses? ( dev-libs/cdk:0= )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.14.1 )
-"
-
-src_prepare() {
-	default
-	if ! use exif ; then
-		# Remove tests that require EXIF to pass, bug 610024
-		rm "${S}"/tests/data/test0{35,36,37,40}* || die
-	fi
-	# Leave GCC debug builds under user control
-	sed -r '/(C|LD)FLAGS/ s/ -g( |")/\1/' \
-		-i configure{.ac,} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with aalib) \
-		$(use_with aalib jpeg) \
-		$(use_with exif libexif auto) \
-		$(use_with ncurses cdk) \
-		$(use_enable nls) \
-		$(use_with readline)
-}
diff --git a/media-gfx/gphoto2/gphoto2-2.5.28.ebuild b/media-gfx/gphoto2/gphoto2-2.5.28.ebuild
index d63911b2960c..1dd02fde6838 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.28.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.28.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="aalib ncurses nls readline"
 
 # aalib -> needs libjpeg
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 0b396a1b7b20..f852c8057966 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,9 +1,6 @@
 AUX graphicsmagick-1.3.19-perl.patch 491 BLAKE2B 6a6465162d9a4d7d09b1edb425cc7114cd4e0fc65e48f15c8c2a854fe835fd1fe94c56611c6d2744d9e26884c57b1f67353bfd32abe2f25a145dd7abbf5479f0 SHA512 da114b891ec923253048d90ee14f136742072bcb70e512e8d2838bbcac57b5fe6ea580cdccfd1bba5156777623c43e946ce2a8661f88612d4c24849bef0fb865
-AUX graphicsmagick-1.3.36-bzip-no-zlib.patch 693 BLAKE2B 75c49bf8db7dd7095f58ab67e138e860a1106d3e38d05c69333e63157ae55e98ef33b3f166e446321137ca0f4fffa67a6a7bba3dc264854ff6100f25c92d9bd9 SHA512 5d77818733d800f861ab3a1ef2ece0d47fcebb4690b714dce5fb3d74276ddfc400f16e871f7769703e696d3ca56692a2dd20fcfd97f0f1787b0876bb401f9084
 AUX graphicsmagick-1.3.36-flags.patch 2009 BLAKE2B 1d58f03cfeac9be92e2e85a2b6274ec22e3cb2c65d62e3095f2bb3da8f817ae52fdd6fe70e5da30bb8110202ec8c8268ffef7069c34d55ef7f7ccc3e53785418 SHA512 205694ea04e7b65c5519c564bbfa1ebd33ef4fa7800aec1a91439ed90794629dd54ab42c1c7f4f2f5ce3b7b078b3fffe76ce37c61643087f5cca244931b5bd3a
-DIST GraphicsMagick-1.3.36.tar.xz 5600712 BLAKE2B 069ab4f9bb5beea3321860bf8e43c8a1b51ab102054e92486375209a86fd3c1c1fb44d4b2c43a65c78f36e9f37e09316fe77b4f261bfb0af3b2c2a86ff8b5aa5 SHA512 27ed5fcbfb0303436bdcb0f11d18257a967d471251b51e633e2c655b0a7e5ed01f61a61f9702cc7d4c02714e005ac18ca9ba0f690c0580e41d07947a03c5cbb4
 DIST GraphicsMagick-1.3.37.tar.xz 5623688 BLAKE2B d6d5c8a07ec2aa2e60399887fa788751104c6917af295bb5a7bb1281d4a547462dd76cdde98f09cc00322bc3d7c89258dcd9d50506cfcec47a606efd90163b2a SHA512 971e05480a65eb99ff3c0d874675bcbffc24eafec1cacd03f5ef410ae014f82329f3590393100927f753feb183be1105fe0cfc5b0f775a30b0e6dc0c6b8a77af
-EBUILD graphicsmagick-1.3.36.ebuild 3221 BLAKE2B 570b421b5a082c202cd00722dd458c4ca359879431d8d1f33287605ab6646dcb80e15c0367f4054bc294730b2cf80c46d5193f8c33e80d4b80e794c3769c038a SHA512 d042c1a723260fe4b9061855983cfdabaf8a4e36d2cafc47579a90c33143086c3efeff74ff380b7fef5efefcb50a2d9c9a8b9ed4f98eea0ae28826e73ea18df5
 EBUILD graphicsmagick-1.3.37.ebuild 3200 BLAKE2B dcc9f75b410f671a4aaa8da96bd40672e005cacc0f0138e42a7d20924738ae514845548d612d404a76069e2b604e7aacea0957b70d893e7eb07550886204bf5a SHA512 fcadc6d72188e1106b0374ecdbf6ea5c37b3fb8e24ef4e453e291c080ee95f51440360938872c86ca011a17f4945d97065836c3b06c6aabcb4f5c9b7ae7c762c
 EBUILD graphicsmagick-9999.ebuild 3202 BLAKE2B 00c9664a42a33974782006a2d27043d7cce406ac6558b50af40eae04f6cabed858474223b7221ddafcb7a3b37ecbea45eedd64157a3134cbe9e85b16f88fc36d SHA512 6de55d703f28e0b87cfa6c16d952cc6cf56ad7ff967ac65ec9cb8c81fe696abbca2d62158467da7ce5d5aea96f0a10f27ef7c920ec7c1c4be4a522b29c896667
 MISC metadata.xml 1277 BLAKE2B 2dc552ca54b8776bbcf08f6939a7cd10fbae14a1b6062ffc3f4480b079d39caad022b1eac1eda95d03aaa30da01fd26da4fb59c5cf117300d446105f29b50a9c SHA512 8fa1382b7effbb5d8a56b3fbbb063abe5f60bcc85a57a834969878510be81fa255c1f09f8b5d839729e860c48b57d44a6666f3e89f4fba852b457df2940dcde0
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch
deleted file mode 100644
index 5a78527b2286..000000000000
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-http://hg.code.sf.net/p/graphicsmagick/code//rev/d9ec69e25e9e
-
-Sent upstream.
-
-# User Sam James <sam@gentoo.org>
-# Date 1631846586 -3600
-#      Fri Sep 17 03:43:06 2021 +0100
-magick/blob.c: Fix build with bzip2 enabled and zlib disabled
-
-Seems to be a typo.
-
-Bug: https://bugs.gentoo.org/641164
-
---- a/magick/blob.c
-+++ b/magick/blob.c
-@@ -5040,7 +5040,7 @@ MagickExport size_t WriteBlob(Image *ima
-             else
-               amount=(int) remaining;
- 
--            bz_count=BZ2_bzwrite(blob->handle.gz,
-+            bz_count=BZ2_bzwrite(blob->handle.bz,
-                                  (void *) ((unsigned char *) data+i),amount);
-             if (bz_count <= 0)
-               break;
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
deleted file mode 100644
index 45f73976f1ad..000000000000
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2021 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/ http://hg.code.sf.net/p/graphicsmagick/code/"
-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 ~riscv 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
-	"${FILESDIR}"/${PN}-1.3.36-bzip-no-zlib.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/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index 16ea9d8aa6aa..0b35c188a809 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -1,7 +1,5 @@
-DIST gscan2pdf-2.12.3.tar.xz 504168 BLAKE2B f3c8b27903db733163114c5c8ea93b10969791fbe04fb2111d1e090e8c627127150cd418eed693d3c61d18e8e6ecf08ddaeebc2ee5b5bc7b49dd633391480f12 SHA512 bb7c9bfd485ae24bbd56a5ca98682455e07fa44d02784a0f3b4b2d3995d704beb0ad146297e92e838dddf8bbdbc37b391e88bf50c98efcd3dfe6b10e761a0693
 DIST gscan2pdf-2.12.4.tar.xz 503792 BLAKE2B e5b54158b5b47bd2f255c3529e132695c1735e9da92d6a426f7f5b9a9e880bd2d1a0655faf065385224892abe992156c667e50aea1f1091ac6d872b8c163c92f SHA512 f904e2fe3ec0ed829eb9166a42c7c10b56e99e1a7558c7d0014efc530d5f4d3873e9097f28372412073cbb6040bd00570f1acbb6582f5ea87485f0a0ace6f486
-DIST gscan2pdf-2.9.1.tar.xz 484740 BLAKE2B e75ac6a5296ba2f89838ae9c95dc0ceb592ea8ffaf8d89a0635043e07fedbdcf97df26ac810556da7d0e0306eb7aaff76dc18162c6a5f89cb1953bd623a594a3 SHA512 4fc3107c871a7915ebdc023476b1159c0fe03934f1a52a417a5bc285be46f7db0ed38ec4cf015b15953c728ef19d1f4f30207d418b655c950bfb64ddc5d23237
-EBUILD gscan2pdf-2.12.3.ebuild 2981 BLAKE2B 72ddfd255baa1aedfee6a3a51faf8d71d5732f47cc3ec55a3a4c6a2f4688c332064377c9935e097b649ce4326a2dc60c96836af3abf2412590a5ee76318d759a SHA512 2726e25fed0a753a083462540e9e69a221de079fe28adf5bb679ade98d007a34c9766991fdf29a750e6ed933dcbcd0d306d82a98c55caf1c10460ac0b1b69f20
-EBUILD gscan2pdf-2.12.4.ebuild 2988 BLAKE2B 2307b5bb8396119e2f3af93ce1ad27adfaaf0597e8d97c9756faee7665727fc73f2f83b1200bd592c18950a47faa35883905debfd815b0ed1adf91eaaa3572fd SHA512 15757344d557b417a86404b54838b196232430ddbf1612d3430fdb216b062cc7bfbd27914921923b5f62c4e83f837edfff67d6505aee7b0bc6b259b6759e69e0
-EBUILD gscan2pdf-2.9.1.ebuild 2801 BLAKE2B 5ec319fceae00a20a15caae9cf019691523680bfa734bae36c8cac7117455438beed4c56fc79a570e87b2d4860b12a62c0fe6fdb49e1e26b24c7a58b493cfa91 SHA512 9f7b98317da72d4abeb6cd64719ddb9de39fa5505d955c6543b7ab76ba0db18c0a7e20261c6c0b7e025272d336c98126bc87c2a32f84a811d6d11649a7dd0aec
+DIST gscan2pdf-2.12.5.tar.xz 502636 BLAKE2B 5fb92a4e5dfdbd985119058ed86ca015a58e97fd73edae4d46279e482351f9b5514045a60bb67ca2bfb58fa1e4315bc03ca67a2f2e3ed0cd2c941d8ae755fdfa SHA512 eeeec0940ef4a40b8cb7e961758e9688c94d980842ab36c4e52384099d1e28773f2967a75eb7c024ab713b880c2538d8395021bfabd68cffa7b334fdd35d773b
+EBUILD gscan2pdf-2.12.4.ebuild 2995 BLAKE2B 96336de1a27929613f0734fd8013031cd8f6fd239f8c344d6f35fbc5385b1d280266d587e45714d4a5c740e2dc03df7ac28b07593f5b376729c041d4591cac92 SHA512 d5e143d4f92ff01ff47d8d8a7cb4d0147e11ec3dfaf3eb323638670faf5f105b5af222b312bf39f2984be36b51c4dbf809ad498c311ba2a0a1baa54f543cce3b
+EBUILD gscan2pdf-2.12.5.ebuild 2995 BLAKE2B 96336de1a27929613f0734fd8013031cd8f6fd239f8c344d6f35fbc5385b1d280266d587e45714d4a5c740e2dc03df7ac28b07593f5b376729c041d4591cac92 SHA512 d5e143d4f92ff01ff47d8d8a7cb4d0147e11ec3dfaf3eb323638670faf5f105b5af222b312bf39f2984be36b51c4dbf809ad498c311ba2a0a1baa54f543cce3b
 MISC metadata.xml 470 BLAKE2B d9a9ad2f443b0bca02e6b8e91c96f22430543ee82fe8a1174739d4ad59225f73b975d31316fecd4dde6f26002ef6ba9fd39bf5d4adfd2bc82540d14e90d623a6 SHA512 ecd2fe9215c3a65760b8c101989772a73a7e9975dc38a1b11b0334cf6e1d001ccebfca1bc6d7631eb3b3e3e03d1736205563b0c836a2aea026fdfe552d72cbe0
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.12.4.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.12.4.ebuild
index f821ad0cbd97..a9f6ec537bcc 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.12.4.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.12.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.12.3.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.12.5.ebuild
index c8c914513d5a..a9f6ec537bcc 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.12.3.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.12.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -60,7 +60,7 @@ BDEPEND="
 		app-text/poppler[utils]
 		app-text/tesseract[-opencl,osd(+),png,tiff]
 		app-text/unpaper
-		media-gfx/imagemagick[djvu,jpeg,png,tiff,perl,postscript]
+		media-gfx/imagemagick[djvu,jpeg,png,tiff,perl,postscript,truetype]
 		media-gfx/sane-backends[sane_backends_test]
 		media-gfx/sane-frontends
 	)"
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.9.1.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.9.1.ebuild
deleted file mode 100644
index b25b14de3434..000000000000
--- a/media-gfx/gscan2pdf/gscan2pdf-2.9.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_TEST="do"
-
-inherit optfeature perl-module virtualx xdg-utils
-
-DESCRIPTION="Scan documents, perform OCR, produce PDFs and DjVus"
-HOMEPAGE="http://gscan2pdf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/Config-General
-	dev-perl/Data-UUID
-	dev-perl/Date-Calc
-	dev-perl/Filesys-Df
-	dev-perl/glib-perl
-	dev-perl/GooCanvas2
-	dev-perl/Gtk3
-	dev-perl/Gtk3-SimpleList
-	dev-perl/HTML-Parser
-	dev-perl/Image-Sane
-	dev-perl/List-MoreUtils
-	dev-perl/Locale-Codes
-	dev-perl/Locale-gettext
-	dev-perl/Log-Log4perl
-	dev-perl/PDF-API2
-	dev-perl/Proc-ProcessTable
-	dev-perl/Readonly
-	dev-perl/Set-IntSpan
-	dev-perl/Try-Tiny
-	virtual/perl-Archive-Tar
-	virtual/perl-Carp
-	virtual/perl-Data-Dumper
-	virtual/perl-File-Temp
-	virtual/perl-Getopt-Long
-	virtual/perl-threads
-	virtual/perl-threads-shared
-	media-gfx/imagemagick[png,tiff,perl]
-	media-gfx/sane-backends
-	media-libs/tiff"
-
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-perl/Sub-Override
-		media-libs/fontconfig
-
-		app-text/djvu[jpeg,tiff]
-		app-text/poppler[utils]
-		app-text/tesseract[-opencl,osd(+),png,tiff]
-		app-text/unpaper
-		media-gfx/imagemagick[djvu,jpeg,png,tiff,perl,postscript]
-		media-gfx/sane-backends[sane_backends_test]
-		media-gfx/sane-frontends
-	)"
-
-PERL_RM_FILES=( t/{90_MANIFEST,91_critic,99_pod}.t )
-
-mydoc="History"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	optfeature "DjVu file support" "app-text/djvu[tiff] media-gfx/imagemagick[djvu]"
-	optfeature "encrypting PDFs" app-text/pdftk
-	optfeature "creating PostScript files from PDFs" app-text/poppler[utils]
-	optfeature "adding to an existing PDF" app-text/poppler[utils]
-	optfeature "Optical Character Recognition" app-text/tesseract[osd,tiff]
-	optfeature "scan post-processing" app-text/unpaper
-	optfeature "automatic document feeder support" media-gfx/sane-frontends
-	optfeature "sending PDFs as email attachments" x11-misc/xdg-utils
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
-
-src_test() {
-	echo "Using:"
-	echo "  $(best_version app-text/djvu)"
-	echo "  $(best_version app-text/poppler)"
-	echo "  $(best_version app-text/tesseract)"
-	echo "  $(best_version dev-perl/Image-Sane)"
-	echo "  $(best_version media-gfx/imagemagick)"
-	echo "  $(best_version media-gfx/sane-backends)"
-	echo "  $(best_version media-libs/tiff)"
-
-	local confdir="${HOME}/.config/ImageMagick"
-	mkdir -p "${confdir}" || die
-	cat > "${confdir}/policy.xml" <<-EOT || die
-		<policymap>
-			<policy domain="coder" rights="read|write" pattern="PDF" />
-			<policy domain="coder" rights="read" pattern="PS" />
-		</policymap>
-	EOT
-	NO_AT_BRIDGE=1 virtx perl-module_src_test
-}
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index d918bfd7f731..3a6e364244bf 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,6 +1,6 @@
 DIST hugin-2020.0.0.tar.bz2 10371301 BLAKE2B f5092dfe3c61344f8b03e14dd85903ae6f5170989b6824578bd3350408d7a11be2c2f9cd83d030a3967b81e4125cf97af075d79136a93e06de3fac8901859c6d SHA512 4c55767c630ea03faf359bda606e5e9e7709a47ab41e821772da8c6da0cf658b1d31d7d8e96ea1c41ec61bdeb2da8c86c92b5d6964a9301732a13137178ec04e
 DIST hugin-2021.0.0.tar.bz2 10333565 BLAKE2B 4bde9bb491074a2f49a34c9af0e90246095c390abf2c49e924d4412e6c00148ae013e10a885799b7eeb1cd9977922a77dc5ebe032a38e2153138632ec818f038 SHA512 fb491af2543dda8c6d3c9d125936a32a04109eec39e3091347ef2856073d4e1f04017686acb8000e50e29a0ac8dcfe463b63613b277f8fb4aec0537f58a6c853
 EBUILD hugin-2020.0.0-r1.ebuild 2120 BLAKE2B c7227cd28ae5f565fd7d0c3a6d929bc6b97b3405dda05ee392556df5d2d093f73740795ea67465f573bcd8002e936483285c07be594d589bbfacd56772b346b4 SHA512 1d37c7a20063e174f15e23ad2a16cebf8a82c95b4114bd6a71e3e949beba1a61628f0775a8d4f434caf9ea0e5b4f410717f3701a89b23649dfcac361371b0586
-EBUILD hugin-2021.0.0.ebuild 2124 BLAKE2B 21c9eede14c47d62a57ad009bfa67befd535beea86d71c9e01d62894b87d99e72004a455a763de0bc8f5ab10ebcebdbbf71b3bceb682579bac4d53b8e8653624 SHA512 1847aefcce2d7dc89a3c4a35c77f29da57d34d138aa173108bdd4cfbc7390634bffaeea91e22b834fae425588cf8424baa1d5bf2d76a1b5b3f6b771e5086d847
-EBUILD hugin-9999.ebuild 2062 BLAKE2B 4a24726bf47c3ff2911c29cf6c8fe8fd3632c82ca54a1fe60c562ea3e202260c93e38d76b5ea6a1d934b3ff036019110ee15d45067e91effc43a3aafd426b56a SHA512 359170dfbae430c9210dc75945cc883eea5b7928d22ea191f9179674032a06a3d84bccbf28cefaaafca1dc7b91c1c14040f4c26dad6d0c48506fae41b6f1817c
+EBUILD hugin-2021.0.0.ebuild 2124 BLAKE2B 1ac9a939b2c1dd2bd581591eeeef614d7c2380978e803652339a937f07be0daf8c7b010ba52f91705ad432cf73213546dfaa5052a57684c4e4ccf1cfe4f6c9b2 SHA512 638584018b33e70010641635b0b9efe9461fc8e73bb9364aca232f9df71c99069ddbfbd13b3d4c6c52667ccae0cec05395879e93dd3450e78b3694bef2123aec
+EBUILD hugin-9999.ebuild 2065 BLAKE2B 43a7416577d603dcf97bd0f64dd18a7721a4940b2bbfecd8c69d90af7ed5aa43d0b7511f0189dd665f37ada4019a9b321129e0ae0e78cd49494f93e90ef008fb SHA512 a21e591992f539dabbc36dc89907b73e18316b93c40a7da611e3ae257c79bf69b83f791e639211e4fdb69a5ebd2fe66d56fa5fb4323077d66a70889a9c958893
 MISC metadata.xml 547 BLAKE2B ea55ca44dac1ccf74d4af96d42af1d4efac2f9823304b529b96aea364ec4a6f8430fd130f54c064766f0c34f9060ca076aa43de664e37177b41cc2deed0207bc SHA512 5012cb4a58bdc374f89d1a2e81e8321ff25f2de2f5682a2f8859137aa3339ce059e7823e26642f58b939e6c1d7f428356a4df5311fca1105320ebcb417129cba
diff --git a/media-gfx/hugin/hugin-2021.0.0.ebuild b/media-gfx/hugin/hugin-2021.0.0.ebuild
index 94cb614e8887..742e8a51342c 100644
--- a/media-gfx/hugin/hugin-2021.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2021.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW"
 IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
@@ -32,7 +32,7 @@ CDEPEND="
 	media-libs/libpng:0=
 	media-libs/openexr:0=
 	media-libs/tiff:0
-	>=media-libs/vigra-1.11.0[openexr]
+	>=media-libs/vigra-1.11.1-r5[openexr]
 	sci-libs/fftw:3.0=
 	sci-libs/flann
 	sys-libs/zlib
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index 4ec32d7007d0..6762e901caa5 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,7 +34,7 @@ CDEPEND="
 	media-libs/libpng:0=
 	media-libs/openexr:=
 	media-libs/tiff:0
-	>=media-libs/vigra-1.11.0[openexr]
+	>=media-libs/vigra-1.11.1-r5[openexr]
 	sci-libs/fftw:3.0=
 	sci-libs/flann
 	sys-libs/zlib
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 420c383b8fb2..8a44d3d99ad3 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,13 +1,13 @@
 AUX hydrus-client 98 BLAKE2B c08af22c2ee9ea3d5c95ed3196ceb9b74b9c886bfa9b91141584f7ea884830fbdd300c948af199ac82a016e1a9dd7314e9c7fdfa8f47f07a9336eff9e2bd2ce1 SHA512 453ac6f9685325b6510c7f833b658491f01e92be213ae26da0d86490033951d3a825f9b15fd33d8a0727992cd83bf7ed491b88f0808674d6fdc23af90c7911a5
 AUX hydrus-server 62 BLAKE2B dac100012fb03c2a14438b67a1c68daa1673eb23dfe7725a941325eb67149064c1276f462732e62db294acce75d111f948599698615e9fa15be43fe74ce444cd SHA512 5b7f9ca4b364ff529e5f4feb6fb11c91aff9cf1ad3ae6c12ff301915fa1d7b9920d51028b820000635d071a049a4e98a0e4e815ffa6ca31d2e67bec5a78afdea
 AUX userpath-in-local-share.patch 443 BLAKE2B 2562bdb6207a35a872a7c1b22ee378504ec4f53ee7b64bdce31649d62780cae00b42be7297aa82e069a9df5e01f76c508d97c47a25a9dffec8cbf8829e7ff674 SHA512 f96cf0040a663c534bd539e40413c95928ea45238f765f741db3c251b7c141fe99989b092d4033695a99e7267fec7fac74641fdc4a0887e74d23d3695f8ce467
-DIST hydrus-466.tar.gz 39454888 BLAKE2B 12663c3781e71def858a262013018ce5ae29ce007a6755ae05abb8f44aa6c70a8b2f9c358dd8324f8148fa86d9d801121c1a6373d6faae1f9fec2bbf98aa0e7f SHA512 4e796a85f65d24f60e7a2e743b7924bb4ce40ab2f23b7816d0953dc696969d1c6690ae2384d71df5edfb6d9dc9fa548c41174c611c98c8ceb8a28c0453235d4c
-DIST hydrus-467.tar.gz 39386111 BLAKE2B 75c13f5aa3cb745c01d05fddb5e443b74a4c6cb09233d128f017f7741465215e4a62b402e222e974017486e7b75e6a1fd0ec0c61b58484897f7f74e712bf0e46 SHA512 af461003f1f1cc8eb93b0efdff609d184844ddd6defcda6d4cec8c1596a496d681ae383ea0d0a3ad71d3b841c1b68ad0480a3f726ad1fafdbc042ddbbbadc639
-DIST hydrus-468.tar.gz 39392634 BLAKE2B a6dd22e388a0f4d5b312985ea6686ee18fb51dd149188c3877ec3a44f1a2013617770a0b1234b862e9096ca1d61925fcf8dbd2f5871e44fdd695662651f5cec1 SHA512 0c6f6730304e1f48496bad0eae1694e2d5bb674bcf049555658f55246a03a9105e4e4a12534256c1c08e8337ed9dfaf0ae8f68a40b70a7e532df0ac6365e9fb6
-DIST hydrus-469.tar.gz 39398328 BLAKE2B e10791db063c9cde1e204c353f27f4f1875e8a1f6981cf2d4f79fa6dbe55958be2ec310bdf77d640ff7b0cb7528870e34209cfde00035e1b29c75def524aa1e2 SHA512 b9416c195490fb7bc87fcaab58d79c1b13a63e577d0496ffae22ea901dfdd445a2b7b3197f0cc97c60339455fd2c687679f392787af5595cc167777364551485
-EBUILD hydrus-466-r1.ebuild 4103 BLAKE2B 0d16586f4b28806e5d074c5b235b443825e5f053512d1eba67f7f16f40c0429e5b87bc26e873d87acb9518f9e6243a13e5b7f017d0ba571285c2d383d6f14fdb SHA512 42cdf6377c3e6468b667c0a556ca892690c28722500e0cb21c921d58184f4318a25bdaa8d0ff957dec7b90113d41bfbd56f4a4ae338b11b023e4250b0e4d0626
-EBUILD hydrus-467.ebuild 4103 BLAKE2B 0d16586f4b28806e5d074c5b235b443825e5f053512d1eba67f7f16f40c0429e5b87bc26e873d87acb9518f9e6243a13e5b7f017d0ba571285c2d383d6f14fdb SHA512 42cdf6377c3e6468b667c0a556ca892690c28722500e0cb21c921d58184f4318a25bdaa8d0ff957dec7b90113d41bfbd56f4a4ae338b11b023e4250b0e4d0626
-EBUILD hydrus-468-r1.ebuild 4103 BLAKE2B 30df6e6ffc773581481785c1515c42a2b93a3cb40238a2a72ce5a8a7b6b4a2d6de0816a81df801f1a7b9939a61a0611704d8eccc65be73b9c9f513f5f8b1bffe SHA512 1687bc474795a96137c8883237cf59157f00edc9d9e2c131d84b7f510d95d60ae1f63bcde1727f810f0f4f4d55faf5c813f07849815f194f47637fc3564a66b6
-EBUILD hydrus-469.ebuild 4103 BLAKE2B 30df6e6ffc773581481785c1515c42a2b93a3cb40238a2a72ce5a8a7b6b4a2d6de0816a81df801f1a7b9939a61a0611704d8eccc65be73b9c9f513f5f8b1bffe SHA512 1687bc474795a96137c8883237cf59157f00edc9d9e2c131d84b7f510d95d60ae1f63bcde1727f810f0f4f4d55faf5c813f07849815f194f47637fc3564a66b6
-EBUILD hydrus-9999.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e
+DIST hydrus-472.tar.gz 39421962 BLAKE2B 2e7ac5d5169aed1d9437434514d878ce175bfe13116f8972b2a21532e0058ce09d9a55744e17b71d1755ebc8436d6f2ff4995dd81c9a49844aff42e60cd2564f SHA512 5b3eecf724fd2e6dede39bbf33665607294d7f345baf052fe379a241d6ee157550ca390d32bb1b256c1fee2224190b54ba9d7d0718ec10b147580eb1f5216b34
+DIST hydrus-473.tar.gz 40044270 BLAKE2B 1aecc84aa60318fadffcf3ad3d8358fa4f537ca1ca55ae7ce02aade0e44b266f42ae94c423854874c471e1d8dc0988e232d19f2e5dd4e2d12834055b75814e9a SHA512 372e813deaef82fe02686e4d7fe5f9ab15476a954b53da8b3560a4cf45ad44209b22b727c32510714ff937b0e6116dae403b3a69954e51c5e62b67bea4eda808
+DIST hydrus-474.tar.gz 40052948 BLAKE2B 7d323caf6dee2dc8a1dcf792a5c3383b395374d0e5a8fd88489b08a5b4ad295317cd5ae1da95d5435fb44ea8d4bbe4038d821c037c156e11d8b8c8a8582d67be SHA512 b73f5823ff84cf84710dd1fd9f9bfedffb6ce9ffaba8e4b23a7eda4a6a206aeaa8993632858fab9a5934f4c279fc23955cf045cd38af7ccf78b1eb73a0940bdb
+DIST hydrus-476.tar.gz 40139397 BLAKE2B 68a3f31a8f250b2c129a9f2562624ec98994e338112eba4f0953aa96dd95abdb97fc60f6a8f28efb5a660f543f596a344a13fe234b3ffb11e6a158b795b0a11c SHA512 5aa59cc2e4d72219d24de10eaeb99ad5b13c0de3af8d9c7e55e3ccea3b897077596401d4d034aac05c018a969f84507618f95ef70d422ac57075bf2d64a692c5
+EBUILD hydrus-472.ebuild 4103 BLAKE2B 0d16586f4b28806e5d074c5b235b443825e5f053512d1eba67f7f16f40c0429e5b87bc26e873d87acb9518f9e6243a13e5b7f017d0ba571285c2d383d6f14fdb SHA512 42cdf6377c3e6468b667c0a556ca892690c28722500e0cb21c921d58184f4318a25bdaa8d0ff957dec7b90113d41bfbd56f4a4ae338b11b023e4250b0e4d0626
+EBUILD hydrus-473.ebuild 4103 BLAKE2B 0d16586f4b28806e5d074c5b235b443825e5f053512d1eba67f7f16f40c0429e5b87bc26e873d87acb9518f9e6243a13e5b7f017d0ba571285c2d383d6f14fdb SHA512 42cdf6377c3e6468b667c0a556ca892690c28722500e0cb21c921d58184f4318a25bdaa8d0ff957dec7b90113d41bfbd56f4a4ae338b11b023e4250b0e4d0626
+EBUILD hydrus-474.ebuild 4103 BLAKE2B 30df6e6ffc773581481785c1515c42a2b93a3cb40238a2a72ce5a8a7b6b4a2d6de0816a81df801f1a7b9939a61a0611704d8eccc65be73b9c9f513f5f8b1bffe SHA512 1687bc474795a96137c8883237cf59157f00edc9d9e2c131d84b7f510d95d60ae1f63bcde1727f810f0f4f4d55faf5c813f07849815f194f47637fc3564a66b6
+EBUILD hydrus-476.ebuild 4426 BLAKE2B 9ab0625fa36a19dfbf75292f80c59905f79c7cbe79e5ca0349f44030e9ac90f08c87d7a4685ff6fcc29c46dd8ed2e3e7537cc013d556ef77f5c5598e4181f4a2 SHA512 55f3d3b3459947003c5914342ab18381a4cc2268ee659a8c610385f84db42b9ef6f5f50af1747e9735f208993782522ea64f90cc1e20ec2e2517416a1df8ac04
+EBUILD hydrus-9999.ebuild 4426 BLAKE2B 9ab0625fa36a19dfbf75292f80c59905f79c7cbe79e5ca0349f44030e9ac90f08c87d7a4685ff6fcc29c46dd8ed2e3e7537cc013d556ef77f5c5598e4181f4a2 SHA512 55f3d3b3459947003c5914342ab18381a4cc2268ee659a8c610385f84db42b9ef6f5f50af1747e9735f208993782522ea64f90cc1e20ec2e2517416a1df8ac04
 MISC metadata.xml 751 BLAKE2B 05dfcd30440ca7bc1375206469123c5bb93ff7fbb7612191faabee7abe87334bfb4f25db3291cd3a989264516c315eeb489eaac2c83c95b2436446966ba27880 SHA512 f2e7c839e4567355bb6ff1cdbf1355ab7a2fbf166a3f87ac7a8af92fc80efa7833010376317a38e2594a203be66bfcb3e0df9dc7346ac3d37d8466bb0368b50e
diff --git a/media-gfx/hydrus/hydrus-466-r1.ebuild b/media-gfx/hydrus/hydrus-472.ebuild
index aa080605c68f..aa080605c68f 100644
--- a/media-gfx/hydrus/hydrus-466-r1.ebuild
+++ b/media-gfx/hydrus/hydrus-472.ebuild
diff --git a/media-gfx/hydrus/hydrus-467.ebuild b/media-gfx/hydrus/hydrus-473.ebuild
index aa080605c68f..aa080605c68f 100644
--- a/media-gfx/hydrus/hydrus-467.ebuild
+++ b/media-gfx/hydrus/hydrus-473.ebuild
diff --git a/media-gfx/hydrus/hydrus-468-r1.ebuild b/media-gfx/hydrus/hydrus-474.ebuild
index f45dbc3ac8ef..f45dbc3ac8ef 100644
--- a/media-gfx/hydrus/hydrus-468-r1.ebuild
+++ b/media-gfx/hydrus/hydrus-474.ebuild
diff --git a/media-gfx/hydrus/hydrus-469.ebuild b/media-gfx/hydrus/hydrus-476.ebuild
index f45dbc3ac8ef..74762f9de40f 100644
--- a/media-gfx/hydrus/hydrus-469.ebuild
+++ b/media-gfx/hydrus/hydrus-476.ebuild
@@ -6,7 +6,10 @@ EAPI=7
 PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
 
-inherit python-single-r1 desktop optfeature
+DOCS_BUILDER=mkdocs
+DOCS_DEPEND="dev-python/mkdocs-material"
+
+inherit python-single-r1 desktop docs optfeature
 
 DESCRIPTION="A booru-like media organizer for the desktop"
 HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
@@ -82,14 +85,13 @@ src_prepare() {
 	rm -r bin/ || die
 	# Build files used for CI, not actually needed
 	rm -r static/build_files || die
-	# Duplicate license file, not needed
-	rm license.txt || die
 	# Python requirements files, not needed
 	rm requirements_*.txt || die
 }
 
 src_compile() {
 	python_optimize "${S}"
+	docs_compile
 }
 
 src_test() {
@@ -107,18 +109,23 @@ src_install() {
 
 	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
 
-	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
-	local HTML_DOCS=("${S}"/help/)
+	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
 	einstalldocs
 
 	# Files only needed for testing
 	rm test.py hydrus/hydrus_test.py || die
 	rm -r hydrus/test/ static/testing/ || die
 
-	# These files are copied into doc
-	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
-	# The program expects to find documentation here, so add a symlink to doc
-	dosym "${doc}/html/help" /opt/hydrus/help
+	# ${DOCS[@]} files are copied into doc
+	# ${S}/docs/ is the markdown source code for documentation
+	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
+	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
+	if use doc; then
+		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
+		rm -r "${S}/_build" || die
+		# The program expects to find documentation here, so add a symlink to doc
+		dosym "${doc}/html" /opt/hydrus/help
+	fi
 
 	insinto /opt/hydrus
 	doins -r "${S}"/.
diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index 0915a2ae5436..74762f9de40f 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,10 @@ EAPI=7
 PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
 
-inherit python-single-r1 desktop optfeature
+DOCS_BUILDER=mkdocs
+DOCS_DEPEND="dev-python/mkdocs-material"
+
+inherit python-single-r1 desktop docs optfeature
 
 DESCRIPTION="A booru-like media organizer for the desktop"
 HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
@@ -41,7 +44,7 @@ RDEPEND="
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},lcms]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
@@ -82,14 +85,13 @@ src_prepare() {
 	rm -r bin/ || die
 	# Build files used for CI, not actually needed
 	rm -r static/build_files || die
-	# Duplicate license file, not needed
-	rm license.txt || die
 	# Python requirements files, not needed
 	rm requirements_*.txt || die
 }
 
 src_compile() {
 	python_optimize "${S}"
+	docs_compile
 }
 
 src_test() {
@@ -107,18 +109,23 @@ src_install() {
 
 	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
 
-	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
-	local HTML_DOCS=("${S}"/help/)
+	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
 	einstalldocs
 
 	# Files only needed for testing
 	rm test.py hydrus/hydrus_test.py || die
 	rm -r hydrus/test/ static/testing/ || die
 
-	# These files are copied into doc
-	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
-	# The program expects to find documentation here, so add a symlink to doc
-	dosym "${doc}/html/help" /opt/hydrus/help
+	# ${DOCS[@]} files are copied into doc
+	# ${S}/docs/ is the markdown source code for documentation
+	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
+	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
+	if use doc; then
+		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
+		rm -r "${S}/_build" || die
+		# The program expects to find documentation here, so add a symlink to doc
+		dosym "${doc}/html" /opt/hydrus/help
+	fi
 
 	insinto /opt/hydrus
 	doins -r "${S}"/.
diff --git a/media-gfx/igal/Manifest b/media-gfx/igal/Manifest
index f6134c6aa83f..01a77b4c303a 100644
--- a/media-gfx/igal/Manifest
+++ b/media-gfx/igal/Manifest
@@ -1,3 +1,5 @@
+DIST igal-3.1.tar.gz 29372 BLAKE2B bb83a13b082d4d94b0ff186ef34e9c670b5a49ba74ccd40675db6820931132697b886e58db9da7e620322fdb29a59437acd817d6ef69ea4cebdaa408d1fbe567 SHA512 28f036a5450d05c2d795355f52e0e3f5720d94e5e9d82d4b6bd53ff8ce5ea08352e3ec85ddbcca754e986a06fd205b1667b102981484c783add4496c50c102fe
 DIST igal2-2.0.tar.gz 27206 BLAKE2B 64683d32d0fc3c16d4e27f6dcd1acb3d1e1b55de8e4362065bda9b9b27e6d54409e115af46da2505dfe79f00e5004ebfb395dc4fe71d91b557c43a0c4d4f01e1 SHA512 663bc4f05fbb226c55c3304126ceb480f050715499a2849567ad1d33da568ed02f85b64ad176f6e1cb1c99c8f50650676a7323f0d0497880802a245274a77a0f
 EBUILD igal-2.0-r1.ebuild 873 BLAKE2B 044dbb37ce303cd88754f29c59f22dbff42d528f84df0d6dd7b3593092f4f86ea87ca90bc3e03e5c882069783eb3b12b4c9f017179f7c1b1582b7084bb624299 SHA512 00d0181d625e5d801c7e4da3fdcad6adbf2599a937586dcdc38f8a0da3f4e9abea462fa96961e96d6089e0cd5c982c20cca90d92f5504c897d762cf8c2eb1f20
+EBUILD igal-3.1.ebuild 948 BLAKE2B 7462bf6f90cf65c0888bfb6cd57b874c1b3dc7ca5a1454ed0d8099ed269a4eb4cef32e3d555e5ac1880b8c5176f497807d38a4a1d2baae925b0a08702c141d4e SHA512 c0f60c596a76ad4c536d74ec665d31035a78c6c68a118520cf90fdac0741ad854bbf56d44a771822832d790930bbb28f0b2f0042dcbf37a36f48d0b57cdd6e74
 MISC metadata.xml 424 BLAKE2B b23a44dc7349f80162b9ba66db70da14b3eebd76d33aaccaea95b944f58d96eba754710354901b711b6a5d58d631486b22b5bd5a715d913e16fb255e663793d3 SHA512 dfea71b53cc223a91d5dea1ac7cead82d3b2e63cd242f2d192c79747d88ebbea9e08758bc7e31aa3958fa81eb79ff91977ffc7fbf8f12f353c97ceb949df5489
diff --git a/media-gfx/igal/igal-3.1.ebuild b/media-gfx/igal/igal-3.1.ebuild
new file mode 100644
index 000000000000..6323fc514432
--- /dev/null
+++ b/media-gfx/igal/igal-3.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Static HTML image gallery generator"
+HOMEPAGE="https://igal.trexler.at/"
+SRC_URI="https://github.com/solbu/${PN}2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}2-${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+	dev-lang/perl
+	virtual/imagemagick-tools
+	virtual/jpeg"
+
+src_prepare() {
+	default
+	sed -i -e "s|/usr/local/lib/igal2|${EPREFIX}/usr/share/igal2|g" \
+		igal2 igal2.1 || die
+	sed -i -e "s|/usr/local/bin/igal2|exec ${EPREFIX}/usr/bin/igal2|" \
+		-e "1s|^#.*|#!${EPREFIX}/bin/bash|" \
+		utilities/igal2.sh || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	dobin igal2 utilities/igal2.sh
+	dosym igal2 /usr/bin/igal
+	doman igal2.1
+	dodoc ChangeLog README
+	insinto /usr/share/igal2
+	doins *.html tile.png igal2.css
+}
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index f3cc92b1ac8e..23f46333c697 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,3 +1,4 @@
+AUX imagemagick-9999-nocputuning.patch 327 BLAKE2B 5b9b732a434733fa5ab1b554bf7e5516260e8a8f243ab8bc61f95f6833185c3a997f5b046dc24690aeebfad925e0e180d98791aae1ad910e9aa069f0108dbd89 SHA512 647c367470deaaaa1ee14a02f80c8ed63de294ea7211a9010fad029bc9b254e27bc41c461561c28c2e24166fc17d0023238755160f8f22af641b0858e4bdceea
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
 DIST ImageMagick-6.9.12-28.tar.xz 9181044 BLAKE2B 2efc03da9e4c53b82479badfcc9a25f05e2d9766031807500a6bb39cba2a800c39a93a16864ca9af3a0b33d0c1c95cb2f33264c7e00149204ca742673c3d07ff SHA512 ec96fca6b385379873ead007b011d87fb3939ed4e3631d2a9401f1467db59d1d1ced072fd4fefe1577d04302a1060dbc324631b420f41a99bf32465b540ec979
@@ -8,9 +9,11 @@ DIST ImageMagick-7.1.0-14.tar.xz 10318332 BLAKE2B ca8db5d53c05099ab8fe0e6d810ceb
 DIST ImageMagick-7.1.0-20.tar.xz 10339572 BLAKE2B 7e99a8b36089b1258f537dbdf8c674be17677da5450854e0dfe0ed3bd3722ec826099f7c22d615daece6d647e6c22f4d9aa7293fed9b4bebb77c163e3ac54bc3 SHA512 e07d8f8ede8f713f1c0bd571b6042062b154b95ab06b0479ec4162d242beba982bfa88438ac67985d4da6d18074bda4b0ac25a7c2ced44f19b54c21120441991
 EBUILD imagemagick-6.9.12.28.ebuild 7179 BLAKE2B c82d248b8debc199150564a6e426a7364f58694581bf2a36e883feb0da9dddbe093e58d51adbb1f2ada5ae1a0e651a8a16820c681097946c3fc63d13870fba04 SHA512 c5a8f6d240e17f2948a8fcf72bc74b2b54975301ebba4273b2f03094e60e975e9b318c633ffc1940cee6da2e2c3be35a3359d2028cf5a25eef4660bc399daf5b
 EBUILD imagemagick-6.9.12.29.ebuild 7187 BLAKE2B 0e3e44083e03f09b94d07e4f8012a62ee4b28835855507daf4375397e12b0f3369705df7b3f83048b0307a6849a8451bec62f066dc7449f20950524d3237f8f6 SHA512 2a8cda81018fb6f45b07026efdcf6e64f04ef82c1d11c56fb5948bab6cfc5f1ef46e3a53f9aadb409ab22524706439631ad581d6f023f19271f6f0e78e813325
+EBUILD imagemagick-6.9.12.35-r1.ebuild 7236 BLAKE2B 2466b01bcdaa6ec1d73ec16ca15899cfbcd0d61d6c5bf482e1f01e03db61f4c69c8710926287ebf8abd39f5543fa0eb6bcdc322116ee30e5407f693c2c7384ab SHA512 10419baaa82906ccc7ba5b8130183747936cf316a673f0f9584fa584c56be74c407a593f663c138299edd5e03c7fb69eb09c8b6eece78609fdaa241766575691
 EBUILD imagemagick-6.9.12.35.ebuild 7187 BLAKE2B 7604701bf4b0898c3cd5663bd62bff448910bfb29ebb662135b5c5b088b0db6d5d8742157df244af3587b8a2e10fd48c003932cd06b446667fa9b5be828e4040 SHA512 9ddcb8a8629fa49a67c69f019e9a4a554bf0b8b268f59b3ce32a7a6950423a2fe85d74981da7f39003d0a88589e233fd0fac66e03bfffb334f05d55b4d3c0859
 EBUILD imagemagick-7.1.0.13.ebuild 7393 BLAKE2B 62c865149f7d907244665fbfa78b0bb2eedfdf124ec59d72a2943bfdf0cc6b7de051965d5b63a8e117709346f70b7ce066736a647238026e054c67fe2d537009 SHA512 3a6523aa2cfdfebbc325ced0db16f48c0e17f586e41140a16fbaf66ad7c8079e33e3f4a31bd774b874f3816aceb6a01ae2be2edf8337e9d89b6b92959a83962b
 EBUILD imagemagick-7.1.0.14.ebuild 7407 BLAKE2B 9488dd72e898a148ee4b58112764f64df4927b3eda0ef8c6b31dfec9a8b80f36b303ba0c3f7370ac9efcffd70b983cceaccac2487f075d39d6af8e3d977dfa9c SHA512 3765419540bd0daf103da72f7a20cc1f03f24f200d7f2b337a19b58ba0ea7ea412a19da798329f252590c498191e2b9b3c030de163a0ab42755f784174a85d37
+EBUILD imagemagick-7.1.0.20-r1.ebuild 7456 BLAKE2B ba463b9b0c047982c3ae54669c435acfa1937c2abc32e3ea1159b91a4ad9efb699bc1caa579569a105c8029111e27f9ce259bfd0453583cb91054abe2b9c0c0a SHA512 354523f445ee8de722ba2ec1026b469b68c0f4261f3dc14762a32ec7de3fe53276ae363f5b02366cd8962706efc6e2fa4de4d79ebdf8bad28e2340b83c406347
 EBUILD imagemagick-7.1.0.20.ebuild 7407 BLAKE2B 9488dd72e898a148ee4b58112764f64df4927b3eda0ef8c6b31dfec9a8b80f36b303ba0c3f7370ac9efcffd70b983cceaccac2487f075d39d6af8e3d977dfa9c SHA512 3765419540bd0daf103da72f7a20cc1f03f24f200d7f2b337a19b58ba0ea7ea412a19da798329f252590c498191e2b9b3c030de163a0ab42755f784174a85d37
-EBUILD imagemagick-9999.ebuild 7401 BLAKE2B 177c88bf09323bc3898bc99c79051f8c73450cc19e063f04f91b079172c22e02d845b94084afd5fd26143aa7f95f670bb7319b80a27dadf83a3650607dc45468 SHA512 4c087fd762f72d88baa8bf8564b3245bd21ca4cf99d009b3537bccba1638ec79623c27cabeec8570f8058e16057ed66b260889db653a949d78c36970796381f0
+EBUILD imagemagick-9999.ebuild 7456 BLAKE2B ba463b9b0c047982c3ae54669c435acfa1937c2abc32e3ea1159b91a4ad9efb699bc1caa579569a105c8029111e27f9ce259bfd0453583cb91054abe2b9c0c0a SHA512 354523f445ee8de722ba2ec1026b469b68c0f4261f3dc14762a32ec7de3fe53276ae363f5b02366cd8962706efc6e2fa4de4d79ebdf8bad28e2340b83c406347
 MISC metadata.xml 1227 BLAKE2B de893eae7e8f8e299ae10df13d202819b60df3b85858eacbe3455c4f27627689e7790a6fdded32d11d3157c35b5a2e08cab958e84b8f5799bb298deca15a1d4c SHA512 726e0c2cea973806fef1a3f51da11fb525b6a2e75bf2221a0939adbe50d2d8e267c5e627eca571e39769e4c14b134d2b9be3792047523540620c2eac149dd066
diff --git a/media-gfx/imagemagick/files/imagemagick-9999-nocputuning.patch b/media-gfx/imagemagick/files/imagemagick-9999-nocputuning.patch
new file mode 100644
index 000000000000..4a946dacc939
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-9999-nocputuning.patch
@@ -0,0 +1,14 @@
+See https://bugs.gentoo.org/678454
+
+diff --git a/configure.ac b/configure.ac
+index 5e7fb5875..b288327c8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -285,7 +285,6 @@ AC_PROG_AWK
+ AC_PROG_MKDIR_P
+ AM_WITH_DMALLOC
+ AX_C___ATTRIBUTE__
+-AX_GCC_ARCHFLAG([yes])
+ PKG_PROG_PKG_CONFIG([0.20])
+ AC_CANONICAL_BUILD
+ AC_CANONICAL_HOST
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.35-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.35-r1.ebuild
new file mode 100644
index 000000000000..5dfd56472f4f
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.35-r1.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools flag-o-matic libtool perl-functions toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+SLOT="0/6.9.11-60"
+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 )
+	svg? ( xml )
+	test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:=[x265] )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? (
+		gnome-base/librsvg
+		media-gfx/potrace
+		)
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	X? ( x11-base/xorg-proto )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-9999-nocputuning.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	eautoreconf
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.20-r1.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.20-r1.ebuild
new file mode 100644
index 000000000000..ce2194dd3355
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.1.0.20-r1.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools flag-o-matic libtool perl-functions toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+SLOT="0/7.1.0-0"
+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 zip zlib"
+
+REQUIRED_USE="corefonts? ( truetype )
+	svg? ( xml )
+	test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:=[x265] )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? (
+		gnome-base/librsvg
+		media-gfx/potrace
+		)
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zip? ( dev-libs/libzip:= )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	X? ( x11-base/xorg-proto )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-9999-nocputuning.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	eautoreconf
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zip)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		--without-jxl
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	if [[ ${PV} == "9999" ]] ; then
+		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+	else
+		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	fi
+	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index d47b238fb192..ce2194dd3355 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
-inherit flag-o-matic libtool perl-functions toolchain-funcs
+inherit autotools flag-o-matic libtool perl-functions toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
@@ -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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
@@ -79,10 +79,15 @@ DEPEND="${RDEPEND}
 	!media-gfx/graphicsmagick[imagemagick]
 	X? ( x11-base/xorg-proto )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-9999-nocputuning.patch"
+)
+
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	default
+	eautoreconf
 
 	# Apply hardening #664236
 	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
@@ -175,7 +180,6 @@ src_configure() {
 		$(use_with wmf)
 		$(use_with xml)
 		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
 	)
 	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
 }
diff --git a/media-gfx/img2pdf/Manifest b/media-gfx/img2pdf/Manifest
index ea6b1bf57d47..13afb91ca68d 100644
--- a/media-gfx/img2pdf/Manifest
+++ b/media-gfx/img2pdf/Manifest
@@ -1,5 +1,7 @@
+AUX img2pdf-0.4.3-test-gif-animation.patch 576 BLAKE2B 27b0357c0d1e307e54377fc3dd79c9ad1ae7864166ceab2efc518d9fa656e0685798a10da1dd488f1284a295fce2e0045f92e61e897431187f7083a4c95a9378 SHA512 edb0e95b8b126ddd8784ddb306b29173a2f22299016874e33eae0441837ca5a0f8608ed1a57f93b8a91a5f1723598e0a4f3fe94ab6eeff9ae372bdcd525a1c23
 DIST img2pdf-0.4.1-imagemagick-7-tests.patch.gz 2586 BLAKE2B 3d905b22c02fadf69e6329001cf7d6562d5809ba27842a5e630d87054979d953b641afb0b461f37bc9e379af808d0dc9e95478bdd5143047ea19d13d38e04593 SHA512 c9c5e88aea344a17bb57ff6b4540d7010537df0987cd3884e36220236753a42a71377468b556c17090ba22497a50c7d9365373aaeb007b75240ad55d21e9032a
 DIST img2pdf-0.4.1.tar.gz 96699 BLAKE2B f5a41a3a3d1b1ae7caadab4f37df644ad28a3ef4bd7a56a339253f0aead4d2427f05373dcfd16b10d82a6167243b3b03906e9f95b7ae0dcdbea6a666905c45a2 SHA512 e71833250509d52b8782a8bc9e12a8de6ab7ae06d5e6e235c0b3787bfad1070b5ed90934b21e4decc9b2c7008eeb0424f9df27e44ec66259916d3a2fdb73d1f1
+DIST img2pdf-0.4.3.tar.gz 98656 BLAKE2B ec7be83fa7fc38f94c7770a2566a49a39e5fd0abb715de74fc3f65d59087cecdd009f4284e647facaf6ae019a118b4bedf7ce8d4a09b8479a299c8404a8940d5 SHA512 00755788c7380e44733c5a309428894b6689e93d4d7cca8f84681d12977848971a6b1a7c92c7203258a529894e7a0debb5beaeb6b375de769a0d600ea8d65423
 EBUILD img2pdf-0.4.1-r1.ebuild 1484 BLAKE2B 4d08bcdebfa7374ee57e2cf83c0244dfc2237f57c040817173c22542f5fb488b2fa3517a38eda12c982f9085d0c9f7b85153a269845a274408f3c580b285d512 SHA512 1980c100b90c02d2d416ee86eb121619e9174346c8d74bd049b5cd5adff2c384f5dcb214b7b13cc40dc42f0c29b16373ff8ed47748e8b28bc04eb6de26ec29e3
-EBUILD img2pdf-0.4.1.ebuild 1196 BLAKE2B efc374a4b091c1f169dbf0f166ce1a753db695407150f98aca398e8569685f453263903eb8a2ccf0718dd6f06042305428a5ff4b755606838f8cbcc53e62e817 SHA512 3c7c2c21794fa6ec33b9dcf6e1d391ba5478e963d8f212d0d892fbe3fb4ae3697cff68d49eb3bfe28bddcdb75dfbbbe59a09ddf18d50f1253c5c0d213765aca9
-MISC metadata.xml 1151 BLAKE2B 6328d64e5b482ce348ac6d6ab2c78574578b663c76df2d5b98f9ebf5b5d103a81b972619228b6841bbcb100987789af95a08fa6b012d00e43b1755faf7cd2559 SHA512 7fd6234cf2d45ae3b9f86a2323da939c7d8c8f2ec188640cdc35f2fc95eb0853c532fb2be4ec4ac06f3a9328b21fa955f85a3bb6dec8e978300a42b6e558a3e9
+EBUILD img2pdf-0.4.3.ebuild 1456 BLAKE2B cdd2d23b78173ebafa8f2ad48a4bb430ac62ba153ca365fdce31a61b17e6b19017d22e8c45bfa1a5552d295c50bdc4aeaadd02bb05528b989c3180aeb0dffb65 SHA512 c5b2f2b6c797df6b2bd731df120811dedb19af9ae81a027afc54322daec5eca43fe8bf4b60bcc4272710f7d2b90b716564a2d0337d69e0d78d62647627c5eb27
+MISC metadata.xml 923 BLAKE2B fe0074db9549519b522f9d749388c5626b702dadba5a722444f652b203a60aea8e8ea5739c3c634076b42dddf24d17b4f449220de617224e59e5491893339901 SHA512 98fc799711e027afa40d2b9bf4558c38873d385920713f58d62782a986e72d1c9b04eb5591d4ec384bbf32376e2b03bf822bf5573015d003ff53ae0d4c7e6421
diff --git a/media-gfx/img2pdf/files/img2pdf-0.4.3-test-gif-animation.patch b/media-gfx/img2pdf/files/img2pdf-0.4.3-test-gif-animation.patch
new file mode 100644
index 000000000000..459746455c9a
--- /dev/null
+++ b/media-gfx/img2pdf/files/img2pdf-0.4.3-test-gif-animation.patch
@@ -0,0 +1,13 @@
+diff -r -U2 img2pdf-0.4.3.orig/src/img2pdf_test.py img2pdf-0.4.3/src/img2pdf_test.py
+--- img2pdf-0.4.3.orig/src/img2pdf_test.py	2021-10-24 20:46:53.000000000 +0700
++++ img2pdf-0.4.3/src/img2pdf_test.py	2022-02-08 23:20:27.584463297 +0700
+@@ -5613,8 +5613,5 @@
+ 
+ 
+-@pytest.mark.skipif(
+-    sys.platform in ["win32"],
+-    reason="test utilities not available on Windows and MacOS",
+-)
++@pytest.mark.skip(reason="gif animation test fails")
+ def test_gif_animation(tmp_path_factory, gif_animation_img, gif_animation_pdf):
+     tmpdir = tmp_path_factory.mktemp("gif_animation")
diff --git a/media-gfx/img2pdf/img2pdf-0.4.1.ebuild b/media-gfx/img2pdf/img2pdf-0.4.1.ebuild
deleted file mode 100644
index b4b9173611f3..000000000000
--- a/media-gfx/img2pdf/img2pdf-0.4.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Losslessly convert raster images to PDF"
-HOMEPAGE="https://gitlab.mister-muffin.de/josch/img2pdf"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gui"
-
-# missing dev-python/pdfrw dependency and
-# require old version of imagemagick
-# waiting new version
-RESTRICT="test"
-
-#BDEPEND="test? (
-#	dev-python/numpy[${PYTHON_USEDEP}]
-#	dev-python/pdfrw[${PYTHON_USEDEP}]
-#	dev-python/pikepdf[${PYTHON_USEDEP}]
-#	dev-python/pytest[${PYTHON_USEDEP}]
-#	dev-python/scipy[${PYTHON_USEDEP}]
-#	<media-gfx/imagemagick-7.0.0[jpeg,jpeg2k,png,q8,q32,tiff]
-#)"
-RDEPEND="dev-python/pikepdf[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	gui? ( $(python_gen_impl_dep tk) )"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_python_prepare_all
-
-	# Remove gui executable if there's no demand/support for it.
-	if ! use gui; then
-		sed -i '/gui_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	epytest src/img2pdf_test.py
-}
diff --git a/media-gfx/img2pdf/img2pdf-0.4.3.ebuild b/media-gfx/img2pdf/img2pdf-0.4.3.ebuild
new file mode 100644
index 000000000000..7900354a9775
--- /dev/null
+++ b/media-gfx/img2pdf/img2pdf-0.4.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Losslessly convert raster images to PDF"
+HOMEPAGE="https://gitlab.mister-muffin.de/josch/img2pdf"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gui"
+
+# pytest-xdist isn't really required but it helps speed up tests
+BDEPEND="
+	test? (
+		app-text/ghostscript-gpl
+		app-text/mupdf
+		app-text/poppler[cairo,png,tiff]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pdfrw[${PYTHON_USEDEP}]
+		dev-python/pillow[tiff,${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		media-gfx/imagemagick[jpeg,jpeg2k,lcms,png,-q8,-q32,tiff]
+		media-libs/exiftool
+		media-libs/netpbm[jpeg]
+	)
+"
+RDEPEND="
+	dev-python/pikepdf[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	gui? ( $(python_gen_impl_dep tk) )
+"
+
+# gif animation test fails
+PATCHES=( "${FILESDIR}"/${P}-test-gif-animation.patch )
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_python_prepare_all
+
+	# Remove gui executable if there's no demand/support for it.
+	if ! use gui; then
+		sed -i '/gui_scripts/d' setup.py || die
+	fi
+
+	# gif animation test fails
+	rm src/tests/input/animation.gif src/tests/output/animation.gif.pdf || die "rm animation gif failes"
+}
+
+python_test() {
+	epytest -n auto
+}
diff --git a/media-gfx/img2pdf/metadata.xml b/media-gfx/img2pdf/metadata.xml
index dae701da00f8..ab909682d5c4 100644
--- a/media-gfx/img2pdf/metadata.xml
+++ b/media-gfx/img2pdf/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>sir.suriv@gmail.com</email>
-		<name>Diogo Pereira</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<stabilize-allarches/>
 	<longdescription lang="en">
 	Losslessly convert raster images to PDF. The file size will not
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 4f33b58c10c7..4ad72c87227d 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,8 +1,11 @@
 AUX inkscape-1.1-poppler-21.11.0.patch 690 BLAKE2B 61fbaf22fa86170d1a72393795fb195b5c93d1c9f3e512751d4a9a355acda28656978529c1022caf9df701bc86e3c2b6e50b14eeed5d0c013013090b51ff6716 SHA512 9c7a312de85d11aa8ff3f7347a5c08ef84050522bc8ab59f9aa1aa84c405ddb707275cab7d447e34b1593d633b99fb8e482864e9397c576d688dcd7d34035c6d
+AUX inkscape-1.1.2-poppler-22.03.0.patch 1782 BLAKE2B 0cad51f92dd5427a07d8602237cec4937764e28be627a70e97a24535de2732dad7a15e7f0d0dd8b91f574e0a01aeced57d7dc54db7b340733f5395d14d6ab70d SHA512 5e04dfdffdca6acf18f869c6c385d808680261f3cbceb67a7dc3473bcef58c8e893ee7646f8b4027cb1287687dc6bff14fe6f9f3cdb32e5de91cc722b339be95
 DIST inkscape-1.1-musl.txz 10820 BLAKE2B 3e7d346161d8c58436cae01227ce0eafc122276ba4b0483271cbb2e74447c7a89b2033bf709adb521abe2aebca79fffece183786071478b29aedbf3c742c4616 SHA512 8900863fb2d12cb6aea39b2e2ac8d32b512086aa3a26f3598d3117abd0b44f95b6001ea21ac02ce2368dd66dee0faefdef049c433f62380904770b7680680668
 DIST inkscape-1.1.1.tar.xz 34221284 BLAKE2B e628ead14f76fa3de929cfe14a6f085c5e9cd4304d2ee0a4b2046380284aacb8a32ff311c2e104f39f6abd0d080594ec4f9783fcaff183588107eedb49863c82 SHA512 22b1b584a344c4f4ebd0b6e84a4af44e472ef47b3971cb97cbb026a4bf7cb5bea49a7de0c2af2a9e439c7c794f775081c8d1904f33eadb49a5389ea01bc0896c
+DIST inkscape-1.1.2.tar.xz 34222832 BLAKE2B cb9bd271ff209055a6f5c2d99fd93dde29c7cb8c1b7caa7061dd1380ea914d5ccc6f5a91c5356c68bf0fd1462a3a5178e9774d0aeadcfceee9f0ea5f4beee73b SHA512 55884f34e6fcc604027e7ea60f67702a658d3838332c1f3b56ec2cb05ab44992df0651ed741d6e7e807848366b24ee7415d0908ed1143b0bfb33ddbf26ae5c16
 DIST inkscape-1.1.tar.xz 34203156 BLAKE2B 38896509dcdcf1ef18523c790855035ef16dfae75e27c2d69f782270f52a579557edcb790bef30f3210b9f797a619369d7d16dd23f098debdd8e5b6abf9b30aa SHA512 54b75f8794d748ef59d5b719ea04e3debadc1a5cf3f62f14254502567973bbd634850edd0a3bc082be878dacf041e9bd10982c4846bf154f89aa5319eda4ee80
-EBUILD inkscape-1.1-r1.ebuild 4365 BLAKE2B 1a575b33c2b7a90851560291a17ffaeac85287c6dc1289c096a06e9a21da4490b8cd72590e61e390aad50542a0d18bd941c62e32ff625700071ec97383003461 SHA512 2f387d0c8283204aa667ba103274527b4ea9e97daef7775bab8b2cce42d44da5ad4b50ec1e4ae49d0409dd4c2f3c63a29f224451c8569497851113abf34fab2d
-EBUILD inkscape-1.1.1.ebuild 4198 BLAKE2B 25d7e6a67d7971b573a498f26a487d318d2f1e751d6c7a16afc13cb68c60f8a6402190e42534c443f98432390e98ec8a46562a72dbe2a744570da3cc64e4adab SHA512 5033c65432b52f8674654514043b62c342f39fbaf98acaeee3a823b988c644cd73442c7a8c4e9bc2ff46f307355102b14b3d8258e0c82cfa835f92ace64d194d
-EBUILD inkscape-9999.ebuild 4498 BLAKE2B cec5ba92467d97f7a6732f16f95dff330645f4b65e7bcde7fe0b82e08b264762950971fb8be08f99261fca734f5c99711dc502d47707fd5eb1008ae2bb8fca02 SHA512 17ccd273ee58f91004335e433dc8a130bff50c2ead9e80e17839a117a3ab1231f2b83b357a77f5060b777a4cc5b104a34c8ba0626d66b4316d57f82724076d32
+EBUILD inkscape-1.1-r1.ebuild 4511 BLAKE2B 5059c6574db7494c4535afe559b67800cfbc34552c5d559830eac2f62bbbcef1bdd9afc2ff2addb75c916bc96149ecc549a38d4b04405b8b0afa059a679e3edf SHA512 cc6bdf0092538fcbeb51ff0b9aa0e6883d687b4b3e01379ad0975a25c33a9fc544d0567ce590820ab1ebbbc689effc1113a14af9773de63cb79b2217732867c2
+EBUILD inkscape-1.1.1.ebuild 4301 BLAKE2B 78c6711dc8cb2b508da96d4276ea62033fd276d540ff89d4158eeb1477204efd5f0a38e7fb6847dc642b82312f5061d93cfaf186eb672942bbf5fb0fc506a935 SHA512 ecc5deb7dc582a3ddbedca78682f40437428b28e4be64054f838441bd80ae62f1248fc5761e94ad889a2b5b55f1505f4d1cf2e442ffe87d22682589a31cd1274
+EBUILD inkscape-1.1.2.ebuild 4608 BLAKE2B 2cc70aa8d3a507b646a9c194ade75387b587a594a19f473ed831be42b7c5ac4e3a2fc923c7829d571766c6ce529de6df4cb39df02deb8ef5431195085a338eb8 SHA512 f6404663e7448076c1fa6e17bb60329c4c0c3539647f6306a235c3b78d7a7c6ac375f9c09cce9cc2105681161f0e65214d2b21b649f0ed71d8563abec04d92a0
+EBUILD inkscape-9999.ebuild 4532 BLAKE2B 6962f87e98e8eedfe7550dc37f93e58fe8d7e7370ed91c49be9c547fb76ed1a0a5e86baef1235501ccb913a01b710af9abbc9f5819d807a9b0309afb353c6635 SHA512 5e8298c0811352290cc6a6c8e49faa7d40a356ca965e3916bd4a6379e7a8db9c8cad4bba963b9fe5629061dc9828eca617b6bcf9a1e21d88f801de36a8642b68
 MISC metadata.xml 984 BLAKE2B 8aee1f973005f9587571770eb14ccf725bf3ba9034d9935b029f776e64e17a9e156ec864e1150b259d2a983aec6e53b10791be4f1a3b67d5aa465ee115d966f0 SHA512 7ee7c7d473ae2120b9f592777b08d77899c6bf7f750f09cc334dc76a997a472e2593442fb281a9984d77e1aa4eca39e389484405e0aa8b5614da0f718c713fc0
diff --git a/media-gfx/inkscape/files/inkscape-1.1.2-poppler-22.03.0.patch b/media-gfx/inkscape/files/inkscape-1.1.2-poppler-22.03.0.patch
new file mode 100644
index 000000000000..5ec18157384e
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-1.1.2-poppler-22.03.0.patch
@@ -0,0 +1,38 @@
+From 15ab83e02b07018c3ffd4952a2623393187659e0 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos@foutrelis.com>
+Date: Wed, 2 Mar 2022 19:50:02 +0200
+Subject: [PATCH] Fix build with poppler 22.03.0
+
+PDFDoc's constructor now takes an std::unique_ptr as the filename and
+the rest of the parameters are std::optional and can be left out.
+
+Also, remove an obsolete comment regarding special handling on win32;
+the "ifndef _WIN32" it was referring to has been removed by commit
+ad8effaa6ec3 ("Fix PDF import with non-ASCII filename on Windows").
+---
+ src/extension/internal/pdfinput/pdf-input.cpp | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
+index 3dabc94ba2..63742d8c6d 100644
+--- a/src/extension/internal/pdfinput/pdf-input.cpp
++++ b/src/extension/internal/pdfinput/pdf-input.cpp
+@@ -686,10 +686,12 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
+     // PDFDoc is from poppler. PDFDoc is used for preview and for native import.
+     std::shared_ptr<PDFDoc> pdf_doc;
+ 
+-    // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from
+-    // glib gstdio.c
++#if POPPLER_CHECK_VERSION(22, 3, 0)
++    pdf_doc = std::make_shared<PDFDoc>(std::make_unique<GooString>(uri)); // TODO: Could ask for password
++#else
+     GooString *filename_goo = new GooString(uri);
+-    pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr);   // TODO: Could ask for password
++    pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr); // TODO: Could ask for password
++#endif
+ 
+     if (!pdf_doc->isOk()) {
+         int error = pdf_doc->getErrorCode();
+-- 
+GitLab
+
diff --git a/media-gfx/inkscape/inkscape-1.1-r1.ebuild b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
index acc281e6d6ee..64412bc803f8 100644
--- a/media-gfx/inkscape/inkscape-1.1-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
@@ -111,6 +111,9 @@ src_prepare() {
 	eapply "${WORKDIR}/inkscape-1.1-musl/"*.patch
 	eapply "${FILESDIR}"/${P}-poppler-21.11.0.patch
 
+	# Not yet accepted upstream but rather trivial
+	eapply "${FILESDIR}/${PN}-1.1.2-poppler-22.03.0.patch"  # bug 835424
+
 	cmake_src_prepare
 	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
 }
@@ -125,6 +128,7 @@ src_configure() {
 		-DENABLE_POPPLER=ON
 		-DENABLE_POPPLER_CAIRO=ON
 		-DWITH_PROFILING=OFF
+		-DWITH_INTERNAL_2GEOM=ON
 		-DBUILD_TESTING=OFF
 		-DWITH_LIBCDR=$(usex cdr)
 		-DWITH_DBUS=$(usex dbus)
diff --git a/media-gfx/inkscape/inkscape-1.1.1.ebuild b/media-gfx/inkscape/inkscape-1.1.1.ebuild
index 080afaf78213..a36c80fb7f88 100644
--- a/media-gfx/inkscape/inkscape-1.1.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.1.ebuild
@@ -97,6 +97,10 @@ RESTRICT="test"
 
 S="${WORKDIR}/${P}_2021-09-20_3bf5ae0d25"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.2-poppler-22.03.0.patch"  # bug 835424
+)
+
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
 		tc-has-openmp || die "Please switch to an openmp compatible compiler"
@@ -120,6 +124,7 @@ src_configure() {
 		-DENABLE_POPPLER=ON
 		-DENABLE_POPPLER_CAIRO=ON
 		-DWITH_PROFILING=OFF
+		-DWITH_INTERNAL_2GEOM=ON
 		-DBUILD_TESTING=OFF
 		-DWITH_LIBCDR=$(usex cdr)
 		-DWITH_DBUS=$(usex dbus)
diff --git a/media-gfx/inkscape/inkscape-1.1.2.ebuild b/media-gfx/inkscape/inkscape-1.1.2.ebuild
new file mode 100644
index 000000000000..5f461759e758
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-1.1.2.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
+MY_P="${P/_/}"
+inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
+else
+	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="SVG based generic vector-drawing program"
+HOMEPAGE="https://inkscape.org/"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
+openmp postscript readline spell svg2 test visio wpg"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/poppler-0.57.0:=[cairo]
+	>=dev-cpp/cairomm-1.12:0
+	>=dev-cpp/glibmm-2.54.1:2
+	dev-cpp/gtkmm:3.0
+	>=dev-cpp/pangomm-2.40:1.4
+	>=dev-libs/boehm-gc-7.1:=
+	>=dev-libs/boost-1.65:=
+	dev-libs/double-conversion:=
+	>=dev-libs/glib-2.41
+	>=dev-libs/libsigc++-2.8:2
+	>=dev-libs/libxml2-2.7.4
+	>=dev-libs/libxslt-1.1.25
+	dev-libs/gdl:3
+	dev-libs/popt
+	media-gfx/potrace
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	media-libs/libpng:0=
+	net-libs/libsoup:2.4
+	sci-libs/gsl:=
+	x11-libs/libX11
+	>=x11-libs/pango-1.37.2
+	x11-libs/gtk+:3
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_USEDEP}]
+		media-gfx/scour[${PYTHON_USEDEP}]
+	')
+	cdr? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libcdr
+	)
+	dbus? ( dev-libs/dbus-glib )
+	exif? ( media-libs/libexif )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	jpeg? ( virtual/jpeg:0 )
+	readline? ( sys-libs/readline:= )
+	spell? ( app-text/gspell )
+	visio? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	wpg? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+"
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+	')
+	dia? ( app-office/dia )
+	postscript? ( app-text/ghostscript-gpl )
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.2-poppler-22.03.0.patch"  # bug 835424
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} = 9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+	[[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
+		-DWITH_NLS=ON
+		-DENABLE_POPPLER=ON
+		-DENABLE_POPPLER_CAIRO=ON
+		-DWITH_PROFILING=OFF
+		-DWITH_INTERNAL_2GEOM=ON
+		-DBUILD_TESTING=$(usex test)
+		-DWITH_LIBCDR=$(usex cdr)
+		-DWITH_DBUS=$(usex dbus)
+		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
+		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
+		-DWITH_GNU_READLINE=$(usex readline)
+		-DWITH_GSPELL=$(usex spell)
+		-DWITH_JEMALLOC=$(usex jemalloc)
+		-DENABLE_LCMS=ON
+		-DWITH_OPENMP=$(usex openmp)
+		-DBUILD_SHARED_LIBS=ON
+		-DWITH_SVG2=$(usex svg2)
+		-DWITH_LIBVISIO=$(usex visio)
+		-DWITH_LIBWPG=$(usex wpg)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build -j1 check
+}
+
+src_install() {
+	cmake_src_install
+
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
+
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
+
+	local extdir="${ED}"/usr/share/${PN}/extensions
+
+	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
+		python_optimize "${ED}"/usr/share/${PN}/extensions
+	fi
+
+	# Empty directory causes sandbox issues, see bug #761915
+	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
+}
diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 863a38c311f8..58011f3429ba 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml"
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"
@@ -135,6 +135,7 @@ src_configure() {
 		-DENABLE_POPPLER=ON
 		-DENABLE_POPPLER_CAIRO=ON
 		-DWITH_PROFILING=OFF
+		-DWITH_INTERNAL_2GEOM=ON
 		-DBUILD_TESTING=$(usex test)
 		-DWITH_LIBCDR=$(usex cdr)
 		-DWITH_DBUS=$(usex dbus)
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 6c022e04454a..e2893a32ea83 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -15,10 +15,11 @@ AUX iscan-3.62.0-tests-boost.patch 2819 BLAKE2B 8c11f7bd80c5cbc0c34c0aacf605a914
 AUX iscan-3.62.0-tests-linkage.patch 3921 BLAKE2B 0dedae75fbbe387d2db900eb88b0e839746cfcbfa2b2ed7d52f9fd1b6756f14aa8fc53708ab2d1e461dff25ebe4e73e97f647ba4792bd263021f9b94f7b50139 SHA512 0b84829871ef45acf0ac209a0ba315b88409429c454b4655a4004c9d1afddf88d1ae0b1fff891078f5cf68541f7a8d896d50a550b650f1157517d5dbc99bfbd4
 AUX iscan-3.62.0-tests-tesseract.patch 3825 BLAKE2B ee16bab5f36e866d2a212f832f90b8fa078cfea51dd81ae8175086ce896b718c52f2dd5c56ba15ddf89427abde6231b93672a71467d18fc47c45fdd166efce54 SHA512 63cf6b7f42f6cc1dfc05e9a5d333514aa56ba658e96a860b753d9a120df79a41abbd0fcc04070e103908bf05648dcdff96eab343981fa0f5293aee4258309980
 AUX iscan-3.63.0-autoconf-2.70.patch 1147 BLAKE2B d87e32fa8510096fe965ec24a21276e0c7ba0b838cb2eb5228bb0a336db037dd77240895d61eb574abbc03334d44b0c1467c4bf1dc48a69c72518cfd64d90a51 SHA512 6a58a0df2cd579ea85ea30c263d4538dae8abbfc65d3e102ac546e282bbc8ef72762894c926fc0500322b99364b815f29eb86a098989e4c67675d5d92efa304a
+AUX iscan-3.65.0-sane-backends-1.1.patch 353 BLAKE2B 07ddf999ab1c3b1cd9fae482425ef86080dc07cb5323093cd89a9f0622db6efc0bb5473fd45d913459aebb2052eeb2b2c65dd2c0223b3be51d791fe28f688a39 SHA512 e88f6aa3b0f86153db1c24ad19862fe97dd6a71dcc5b822e643d50d0e0c82ec4cea1fa61f1809f382fd0abb7568ab3b42b1c8587d2f6e49cacb29a5b30c151c6
 DIST imagescan_3.65.0.orig.tar.gz 12651383 BLAKE2B e1436b6d6bf9fc3fc4e5185706fc814e1a4351bf37cd733a3fb88cd16a1c3422ebe0bf4cca77ac00c431edc990aaa50b8994e3bc0f72acba3b0e0608882b63ae SHA512 c719ac540af496efe72b2be87a2b89cbec8eee61a2a985574d0db766c00b7187315378382d8501e26dad132e93de3d3e9431c8e679b569f3c35ea8181b1ca022
 DIST iscan_2.30.4-2.tar.gz 1236167 BLAKE2B 598e55aa7099f7973b38f5c3227415c8ddfa7e8c645521981b4e8979047ab692427f5c1719fd83fe0635f2d4604f32f0baff8542f3e1a333298799c4cad7b980 SHA512 b12f374ff8ee1e1879fc6dbc579de39d7bcd4777ec7ad6e4345046f77b4ec13ae45ebdc2803d6907bc2747776aa7e32c313866138c7b8c7bcb53110a214154d2
 DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
 DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
 EBUILD iscan-2.30.4.2-r1.ebuild 4000 BLAKE2B 9d315f3c51ba848fda0feea5a22d004cb6010112cba8dda3372bac5a9b9ecb6ee7aec3d9cee254ba0e77305eee99be1bb342180c71a6a8048c0625cbe1b10aa6 SHA512 b42e39b888418f016a2a147aba40a3241a75d7930132a8290163d2ea4e57ee7bf57125d6382229440cf3078482f3a7f2158575d28353ae1d7d9a69bb5f389043
-EBUILD iscan-3.65.0.ebuild 2899 BLAKE2B cd559e4c31210618297d7a70f4713a8b9d806f80eb20f508b1af1e27a4abb03755edc9654fbf8b0c835f5f41b72a4ce3e3d4a2592d1c7c1d5ce08200793b21b1 SHA512 b5a93e50d29d8a3ed3d85377affc23a3710a0e7392a7e15025ecde99969f544699a6d35a1efcc4f7515e59b51444010289a7a0f85e4a834fb48a4c43968d218d
+EBUILD iscan-3.65.0.ebuild 2951 BLAKE2B 8bd31ec78915e7ad70204da3b8b1ca47610a5237b6f4a8a53a049c5f52d32e42750df4e12d3f0afb76770aba70ad349c887428ed7776cf1a47c8eee11b999ca8 SHA512 37ee5e001fa353e823b28e8e500b509cad00397dc4387ab1ca264942613ee55679a8015dff4ca409346438dcd885c86a2b1db2dffe4abbcb4539da44f4c4bfec
 MISC metadata.xml 961 BLAKE2B b9c6fb04e94844fb8e7f1d60c5287809c61c3f642f86f55e88ba09a489ebe2b90a698b8a7f5d7c04d38324b97d746f68004c662839862f84a3d1e66cd56c998e SHA512 93c00c3fd4b23cab80f46e3f2a8bedaf92e97473fbdcc707034d86a01ff11269fe6a67648e7a369d71fd60e31d902bc8c94510b37c293df90934a6b2b38cf7f1
diff --git a/media-gfx/iscan/files/iscan-3.65.0-sane-backends-1.1.patch b/media-gfx/iscan/files/iscan-3.65.0-sane-backends-1.1.patch
new file mode 100644
index 000000000000..97979c6a313a
--- /dev/null
+++ b/media-gfx/iscan/files/iscan-3.65.0-sane-backends-1.1.patch
@@ -0,0 +1,11 @@
+--- a/sane/version.hpp	2020-12-22 07:44:15.000000000 +0100
++++ b/sane/version.hpp	2022-01-22 22:47:47.508608348 +0100
+@@ -37,7 +37,7 @@
+ #include <sane/sane.h>
+ }
+ 
+-#if !((SANE_MAJOR == SANE_CURRENT_MAJOR) && (SANE_MINOR == 0))
++#if !(SANE_MAJOR == SANE_CURRENT_MAJOR)
+ #error "SANE installation violates versioning portability constraints."
+ #endif
+ 
diff --git a/media-gfx/iscan/iscan-3.65.0.ebuild b/media-gfx/iscan/iscan-3.65.0.ebuild
index f143a5474646..4d767c95e653 100644
--- a/media-gfx/iscan/iscan-3.65.0.ebuild
+++ b/media-gfx/iscan/iscan-3.65.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -46,6 +46,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.62.0-tests-tesseract.patch
 	"${FILESDIR}"/${PN}-3.62.0-tests-linkage.patch
 	"${FILESDIR}"/${PN}-3.63.0-autoconf-2.70.patch
+	"${FILESDIR}"/${PN}-3.65.0-sane-backends-1.1.patch
 )
 
 src_prepare() {
diff --git a/media-gfx/jp2a/Manifest b/media-gfx/jp2a/Manifest
index 934d2202da92..aa3107aa8b9c 100644
--- a/media-gfx/jp2a/Manifest
+++ b/media-gfx/jp2a/Manifest
@@ -1,3 +1,5 @@
 DIST jp2a-1.0.6.tar.bz2 306975 BLAKE2B 284925e791423a1871347f8dfc9574c209192c8a583a0b3221142adb35ad32c2d00a47412c85df038237f4e1adf604324fb15440c33ca06290ee382fd90930ff SHA512 00c7f7b62a3d1f4238d7513167eebd6ead9447ac90b66fd3f9529f6e99dd1a021385ff970aabd005a88db1614636be57547494dfe00c7e687a11953066a6ecce
+DIST jp2a-1.1.1.tar.gz 628052 BLAKE2B 7f999ff1c7f32b02007a8d0a2d5f1aed4d77a3e9ed6711566faf0169e8d0eb842b3b118c36671a98abd8ccbad100eace4f1053b6dc795071f30e70052488f141 SHA512 898141c4b2847049cc312995a4b18d0de3f62bf9cf5c45050df01007de42486c706ab4b63a30f13828807d7bf01680a0e391304d03ba2087a481d86668773dba
 EBUILD jp2a-1.0.6-r1.ebuild 526 BLAKE2B a160c878c48b3cad1f39de403b5bdb1287af5eb913a66bc8be06d52a906ba44d038595a4b4d242594eca23b3849209740dee6c9c7cf95c167b9a705b75562678 SHA512 01792bef0209bdd3c5f6161b29b0e421aa70eece0312ae7573f903d4b692cfd393f721b7b7dfb261e0b88335127c38b3b4f2c0c3074acf451015d9f54eb960d4
-MISC metadata.xml 247 BLAKE2B ac78a10f8067e3987fc42322edf53d5cad410691961c750e97013c8408b3067d8e103f8e4b4d4d8826a5db72660c4c5aa498349d146c17fb513730455777a409 SHA512 b2a12bd5a47b897e5ede96c3b67edf70e0b60c45ca1a627b94bc9b760ac4c8b59b23b1ce40e4206a6eaf2ce013c5406527f41e36e177d309d521c1b6956ec057
+EBUILD jp2a-1.1.1.ebuild 615 BLAKE2B cc7afafa9517d8437e3f2d7fd9e98a1ff5c9faed796eab479af5128a48a6d5e0fcfebb70474799800399b028f89df6ea95707a0a06b1c330724fd9b568f19647 SHA512 ba5fd7e85f77df4be0fcb4e80472d98d3696f2d64bffcdf35c522ffa25c8f6253d4938dd203208a3df91e2e148cfcc902958fe216a80c0f50d6ce1f7aecc62a0
+MISC metadata.xml 249 BLAKE2B 2572acca810424ee1967a908498b907de468a9fb1765d7bc11a5d1c6aa81294d962a224d7777fecc997fb3220613350618fb7edc9e65b66e9e8dc4a8d31e6313 SHA512 b13e4520e6f7e18c5b925bff00c9711a98d8e773aba54fbe527d95ba97ccd0bd6b58f91f6b01ad92f106bb56f671261de55aacf796db0086e700d9fd40a0d842
diff --git a/media-gfx/jp2a/jp2a-1.1.1.ebuild b/media-gfx/jp2a/jp2a-1.1.1.ebuild
new file mode 100644
index 000000000000..6b66aafdfe5b
--- /dev/null
+++ b/media-gfx/jp2a/jp2a-1.1.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="JPEG image to ASCII art converter"
+HOMEPAGE="https://github.com/Talinx/jp2a/"
+SRC_URI="https://github.com/Talinx/jp2a/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
+IUSE="curl"
+
+# TODO: restore ncurses support?
+# See https://github.com/gentoo/gentoo/pull/24218#issuecomment-1043795319
+RDEPEND="virtual/jpeg
+	curl? ( net-misc/curl )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf $(use_enable curl)
+}
diff --git a/media-gfx/jp2a/metadata.xml b/media-gfx/jp2a/metadata.xml
index e80f955030b2..dca33e49a101 100644
--- a/media-gfx/jp2a/metadata.xml
+++ b/media-gfx/jp2a/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
   <!-- maintainer-needed -->
   <upstream>
-    <remote-id type="sourceforge">jp2a</remote-id>
+    <remote-id type="github">Talinx/jp2a</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index f2a41dad6495..80e97ccd5f31 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -2,9 +2,10 @@ AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc
 AUX krita-4.4.2-quazip1.patch 1422 BLAKE2B 917bf30f1dc702276b524713b1ec01a4807f967bc974c0c9896e6972fc56554a4da954c690a0743a4d92d86e57d32028c809418cbf10b30294bf1412a1a08beb SHA512 7c55e371f4c6a5e6d3d275298bf22810b58cb845bf4abcdd3cecdd84cb228499c59e8f7e9902319009dc52ea4dde575de77668ab2d1e9cf076e8ffa6fba582b5
 AUX krita-4.4.7-pykrita-crash-on-exit.patch 1583 BLAKE2B 077ebf5108badd615d9bc1086f2890a8f45506ca8cf0b5abf089b68e469200513f9be0a5516bad17b131e4afecc9560c8903ed6b1aaecd7c245a432ac8a2cd02 SHA512 44f023f49a0c5bfd895f65a013787bf2870b06fbba6fe292fb97c791b05965de176184d6a669225748848bc0ae1c7984d0c8dfaf3fd3ccf5ae0dbee953a08f92
 AUX krita-4.4.8-prefer-newer-sip-to-build.patch 2000 BLAKE2B 762d2230e866f7db639802dcf55ba3ff57cd125d115246721e645458376e1a26864f4e0506338300c533f18b8ed52e96374d97d2da161987fc5f8786c59f0edd SHA512 da79a6c457e3b7e04370c5ff527f7ba34e49d0e2493ec747d76af5e728ca72372476dbf85a4b69064ce5cc2f6d20b028883028c0ae59c2c5af6dc2074c8bff9e
+AUX krita-5.0.0-clang.patch 1645 BLAKE2B 9f02317b40b2408cab46acbe73797c2fea9b71ca543e0c7787b2f66a088a79d121e80ee7f4d57cef125e7f73de438c60f6e24dfe00b179a1e4452058b12391e7 SHA512 b5ce85eb346e518f51c4b5c8a18056801839deeb9826e02625171e123e3d46bf8503c4d1ac49477d44231efc14e6fe8c85c79cc8cf262326cf10c364e89d1ebd
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
 DIST krita-4.4.8.tar.gz 254887779 BLAKE2B 251c621a235b8d977c886d3d31f07187efb6d45eab1960eab84ba4078216a1ecf5c7f0b90bdbf791e0c219867c6df59bb99b47c4b23c7658e1d2990f3e869cdb SHA512 53b9814fcf61fbaee06e81f456aa9de7ab09df99e04932251984c8ae190248e48fa20762bdb7be503ea267e1fb835095b105ce4bf2078fd510ab5a8ef6d82f81
 DIST krita-5.0.2.tar.xz 179049488 BLAKE2B a58ee0e7d654f18509f970d32a680a9a993c7172a3818517ddf0a41f500c2d1f9102a432b728b9d9254f39f1be0c926602e3b1806ae19b6efc49f99becdffcdd SHA512 5dd2d6961feabf20dbcef49f3499281e34b409e96d379b0247eec70449f82c05ed3cf3ca09014535adb7ce66659d58e988f1f054364637c9851181fa8ee926a5
 EBUILD krita-4.4.8-r1.ebuild 3603 BLAKE2B e3d9d8a9d6060c2b1e621627623668ae29fce652769533ad898064e7f491ee9859fabd9df154bad3346aba37a8a5024061beca045547a87cfb6aa2d8b781ebc1 SHA512 3c3a5b4d98393c6ece66e15b6ca636689da97ce4423855d36d9c02e2fbaa71d51ad91873ae03e47f0fee3c0074307225189b8194a2fa1c4a3472cccb1a6b500d
-EBUILD krita-5.0.2.ebuild 3397 BLAKE2B ebc0c001b90520ec8ca685c7a54a8f33588de92d1ffb25f74d6490ded4954c0b21a41b51b8add929567f86264a5a6f967df38ec137d0be6f173b1dd5c53bdcfa SHA512 76859ecf0b4acdbec51f7e9031b2ae1c509c8f570ad5ff797b23d091d9fb3f9d934d59733165a08192514983ccaed31c0683dea6652132b297e211a1ee8bd386
+EBUILD krita-5.0.2.ebuild 3456 BLAKE2B 03fa9d1f87eea0812835aa88912f84ed9d25c738b71f0dc65f9075f2797d4d2e60824728347884dd69c23bce15666c30e6fd7e2dcdf967bc532f7df83494f3a8 SHA512 a0f4c50826a39e04cf87ace6eddd4a5ab37fdeea3d7c8f8bf53750abf69f1ba73b5c73b5fa0241f6d44ad6c4c2b504fec4a87831ac0c1be9e2045207be0da7a0
 MISC metadata.xml 877 BLAKE2B 529639e044480796204d2338601d4d10ccac0aa83565469b37d838446b4e924b8440c1c3d1eac1473a1220fedea2c49c392c5c99495c27ab7899ed7909666c32 SHA512 6f826baa1918ed944b22944f85304452d34b3a326c615ba8416589facc0208351b25d6eed9a3f8b0f3614db6c3ddd26b0b54554da95aee8ed332f1645d6fda0d
diff --git a/media-gfx/krita/files/krita-5.0.0-clang.patch b/media-gfx/krita/files/krita-5.0.0-clang.patch
new file mode 100644
index 000000000000..6c9c71d4fca2
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.0.0-clang.patch
@@ -0,0 +1,50 @@
+From 0b755beaa1fdba03d38f887b93a15a58fc0830c7 Mon Sep 17 00:00:00 2001
+From: Sharaf Zaman <shzam@sdf.org>
+Date: Wed, 27 Oct 2021 22:19:07 +0000
+Subject: [PATCH] Fix build on linux clang targets
+
+In CheckAtomic.cmake we include is_lock_free because these routines
+don't seem to be included in the compiler's "simple atomics". This
+triggers a failure in clang toolchain, forcing it to link libatomic.
+
+Resulting in error: ld.lld: error: undefined symbol: __atomic_is_lock_free
+
+CCBUG:444247
+CCBUG:444547
+---
+ cmake/modules/CheckAtomic.cmake | 1 +
+ libs/image/CMakeLists.txt       | 6 ++----
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/modules/CheckAtomic.cmake b/cmake/modules/CheckAtomic.cmake
+index b061e2d65b..df6b70504c 100644
+--- a/cmake/modules/CheckAtomic.cmake
++++ b/cmake/modules/CheckAtomic.cmake
+@@ -46,6 +46,7 @@ function(check_working_cxx_atomics64 varname)
+ 	std::atomic<uint64_t> x (0);
+ 	int main() {
+ 		uint64_t i = x.load(std::memory_order_relaxed);
++		x.is_lock_free();
+ 		return 0;
+ 	}
+ 	" ${varname})
+diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
+index e883c7f1c8..43c945fad3 100644
+--- a/libs/image/CMakeLists.txt
++++ b/libs/image/CMakeLists.txt
+@@ -372,10 +372,8 @@ target_link_libraries(kritaimage
+ 
+ target_link_libraries(kritaimage PUBLIC ${Boost_SYSTEM_LIBRARY})
+ 
+-if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
+-    if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
+-        target_link_libraries(kritaimage PUBLIC atomic)
+-    endif()
++if(HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB)
++   target_link_libraries(kritaimage PUBLIC atomic)
+ endif()
+ 
+ if(OpenEXR_FOUND)
+-- 
+GitLab
+
diff --git a/media-gfx/krita/krita-5.0.2.ebuild b/media-gfx/krita/krita-5.0.2.ebuild
index e880d07ce0b2..0c5864b918f4 100644
--- a/media-gfx/krita/krita-5.0.2.ebuild
+++ b/media-gfx/krita/krita-5.0.2.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
@@ -86,7 +86,10 @@ BDEPEND="
 	sys-devel/gettext
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
+	"${FILESDIR}"/${PN}-5.0.0-clang.patch # bug 830225
+)
 
 pkg_setup() {
 	python-single-r1_pkg_setup
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 3ad65561c4fe..fad8649a8efd 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -1,11 +1,5 @@
-AUX libimagequant-2.12.2-fix-pkgconfig.patch 698 BLAKE2B e3e80b1904f7c683d12df2197a343df16f67eacda9941526622fe32623313f8e5ac6da8ed508a378f1e6002ebc03c96b87672b0dc70f00514b51f9afadebf82c SHA512 c49d32ce790d4771aa98f75e0fa4c729020b7bea388c7ee15534cca4c575a60934ce56e68fbbfd48e53b2702bfa843c0be9f2ce2e39a5ebeafa374408b0694c7
 AUX libimagequant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1070f90d4c59584a2b9dac062febb7bdeb1efbbd1cb4f39f8fd1aa94f81ac4318bd0413bdde44f75d418f69b916a70883220d9ef031 SHA512 68c2bf917d60da653abff4fc20c44a9f692213aed87a220a3ffb03ec308107eda7be1a6e135393658ef54d2d63bb0675f5e2a95bdf4b02628fcf5d367c0ce9ef
-AUX libimagequant-2.14.0-fix-openmp-pragma.patch 1051 BLAKE2B 5790e6ee46239fe3df00c6d8add3ca5b7e08818890443ca54e786d7dec6f7bbcdb557f65e6b6ebdfdb14bb072e274d8b05024c327150314e1add561d50cfc6a7 SHA512 3274ff5d3a461160e4f5e8f9e64dbad1ec1c68d22a7c3a13b380c05b808470c541531227768a77cb6b4bae9a8864296ecedf68d7b1c1f4c687ba5307e46f4ac8
 AUX libimagequant-2.15.1-fix-pkgconfig.patch 708 BLAKE2B e282ff891cee6f9a7ec16302932680d918564be3752beadbbf60ca9d14662836226715cc37d508646e8979a62183522307544e53d2f64b62de9e84095fc66ac7 SHA512 395af8861add7df7d9e81dc55046840c06c02fc0033faf072594320c9bf0ea994a4744bae20fe583954bdfde3a6eb044bf813bd55ec17c7d29484b53eefd6b20
-DIST libimagequant-2.12.3.tar.gz 75866 BLAKE2B 857a0e3f0187251e37e0c7f4f5f5cbf49266e4eb9f684118705778d9469330cf95780ea11b83d19e28251f047a7e9b8e7ac32ac4d9554cb5d9e1b3230d39e796 SHA512 4818b00b6f154407f3e402d56f4891c2d7594c8056fada0402d7fa0024ae50127340dd8295da5f5dca13fe1829670a3fa8793aa528f3e74a2294c9a7e37b7257
-DIST libimagequant-2.14.0.tar.gz 97471 BLAKE2B df6403aea0b0e3cbaf05c6c60726ac3de85195779e4829dd04acec28ba93ea8d629846fa71d765949e721f592300da1d35227ec7bb28e00c600c575ba3fdc4fe SHA512 d34aa2ac9f08eebd80fb9e3e7fe22a3f10ce840152c4192735d57ae37c223350af09eeff6870ee2634b3fc51b03d1663cd6afd17daeab923af3b5f60fbef57d4
 DIST libimagequant-2.15.1.tar.gz 98668 BLAKE2B cfa223f0ce8fdaac5d55b951507c040c064759756a5595719d02c0ec6983a70b08ad9d5df0176adb03269a9a1b7d39e9f0f7da884df214bd7994f4647e08a9c1 SHA512 56bc8b73859908774ce0a218cfbec81bfb8432c02ddce83880990b5f5ac89ac253ae64ecde43a9664aab3ac69d309bb9ef8ba2201be6c93aacb731b3214ff4b8
-EBUILD libimagequant-2.12.3.ebuild 1409 BLAKE2B 6a922a5bf768f0736c5aa8b22ae53255e6ea54ff577f66503e954ed2601cb26576f125200c922d940663a69dbc6335f6a4c5d372f0deda449e181a50311eb497 SHA512 2c5fa9f2d558d640adb39f3569a4f3b230210d5e18c0cada7a2bfdd56a3d98680b8d2d286c0aa17c06eb2dbf3c648281d13f887a9174de96a287f76da7907d77
-EBUILD libimagequant-2.14.0.ebuild 1240 BLAKE2B e14f9e27f965c6dcb30f1e33e9e849e184a88d1478539f4d9379649f11644a34cf9884a2f85e7f2fbe78d432f1e88fa2cd3342a72b13e3d7bf309e37570ff00b SHA512 20e69a655b9c8b5d9ed787298d1646bc71ae995006cd04ea727219af76a0e4008f31252708e4b5a0e8095100b8593f53015d634f4a942b5f371a410d4982a3fd
 EBUILD libimagequant-2.15.1.ebuild 1297 BLAKE2B cdda3622d7146ec9da303df5dc9e0145d0c609ccd49b8633ea2a4e9cc048dd2583afef65c44dad7f153444067402b8e0c535f95aecbfc341465b7c4defebe5d4 SHA512 5be647ff7803946178ba519a3bae576c1293fd5eaae5053bfb0836c9fbe6538103dfeb1376a3b298863e3fd7b40ac0672d8adef971760f85d3d96da7cc08d315
 MISC metadata.xml 431 BLAKE2B 19ce5c802fc25f17f74073dba0473b11ea6a5820ec0726d405701c1e6b8f0a64d7019f4fe56ff0e6e43aba6cb52c34a5ac821d4bfcb8d9d6a10d0945bafc8a90 SHA512 4e22cda189c98a07cab44be95311def7b6955025d320869b55006e0e09f98c7370de40f552b556c466013b0c68b04013f36559f4970ebfd79655faf446c1e166
diff --git a/media-gfx/libimagequant/files/libimagequant-2.12.2-fix-pkgconfig.patch b/media-gfx/libimagequant/files/libimagequant-2.12.2-fix-pkgconfig.patch
deleted file mode 100644
index ce9cc2b8c99f..000000000000
--- a/media-gfx/libimagequant/files/libimagequant-2.12.2-fix-pkgconfig.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -133,7 +133,7 @@ ifeq ($(filter %clean %distclean, $(MAKECMDGOALS)), )
- endif
- 
- $(PKGCONFIG): config.mk
--	sed 's|PREFIX|$(PREFIX)|;s|VERSION|$(VERSION)|' < imagequant.pc.in > $(PKGCONFIG)
-+	sed 's|PREFIX|$(PREFIX)|;s|VERSION|$(VERSION)|;s|LIBDIR|$(LIBDIR)|' < imagequant.pc.in > $(PKGCONFIG)
- 
- .PHONY: all static shared clean dist distclean dll java cargo
- .DELETE_ON_ERROR:
---- a/imagequant.pc.in
-+++ b/imagequant.pc.in
-@@ -1,6 +1,6 @@
- prefix=PREFIX
- includedir=${prefix}/include
--libdir=${prefix}/lib
-+libdir=LIBDIR
- 
- Name: imagequant
- Description: Small, portable C library for high-quality conversion of RGBA images to 8-bit indexed-color (palette) images.
diff --git a/media-gfx/libimagequant/files/libimagequant-2.14.0-fix-openmp-pragma.patch b/media-gfx/libimagequant/files/libimagequant-2.14.0-fix-openmp-pragma.patch
deleted file mode 100644
index f355453ece6c..000000000000
--- a/media-gfx/libimagequant/files/libimagequant-2.14.0-fix-openmp-pragma.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From 44525d34b738f733a81037286ece603ca0fdcf10 Mon Sep 17 00:00:00 2001
-From: Kornel <kornel@geekhood.net>
-Date: Wed, 27 Jan 2021 17:36:33 +0000
-Subject: [PATCH] Update OMP pragma
---- a/libimagequant.c
-+++ b/libimagequant.c
-@@ -1279,10 +1279,7 @@ LIQ_NONNULL static float remap_to_palette(liq_image *const input_image, unsigned
- 
- #if __GNUC__ >= 9 || __clang__
-     #pragma omp parallel for if (rows*cols > 3000) \
--        schedule(static) default(none) shared(acolormap,average_color,cols,input_image,map,n,output_pixels,rows,transparent_index) reduction(+:remapping_error)
--#else
--    #pragma omp parallel for if (rows*cols > 3000) \
--        schedule(static) default(none) shared(acolormap) shared(average_color) reduction(+:remapping_error)
-+        schedule(static) default(none) shared(background,acolormap,average_color,cols,input_image,map,n,output_pixels,rows,transparent_index) reduction(+:remapping_error)
- #endif
-     for(int row = 0; row < rows; ++row) {
-         const f_pixel *const row_pixels = liq_image_get_row_f(input_image, row);
diff --git a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
deleted file mode 100644
index a0eab3ab6c3b..000000000000
--- a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Palette quantization library that powers pngquant and other PNG optimizers"
-HOMEPAGE="https://pngquant.org/lib/"
-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 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/libimagequant-2.12.2-respect-CFLAGS.patch
-	"${FILESDIR}"/libimagequant-2.12.2-fix-pkgconfig.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
-	tc-export AR CC
-	# Hand rolled configure script, so not all flags are supported.
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		$(use debug && echo --enable-debug) \
-		$(use_enable cpu_flags_x86_sse2 sse) \
-		$(use_with openmp) \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_compile() {
-	emake shared imagequant.pc
-	use static-libs && emake static
-}
-
-src_install() {
-	dolib.so libimagequant.so
-	dolib.so libimagequant.so.*
-	use static-libs && dolib.a libimagequant.a
-	doheader libimagequant.h
-	einstalldocs
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins imagequant.pc
-}
diff --git a/media-gfx/libimagequant/libimagequant-2.14.0.ebuild b/media-gfx/libimagequant/libimagequant-2.14.0.ebuild
deleted file mode 100644
index 323f9b06c97d..000000000000
--- a/media-gfx/libimagequant/libimagequant-2.14.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Palette quantization library that powers pngquant and other PNG optimizers"
-HOMEPAGE="https://pngquant.org/lib/"
-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 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_sse2 debug openmp"
-
-PATCHES=(
-	"${FILESDIR}"/libimagequant-2.12.2-respect-CFLAGS.patch
-	"${FILESDIR}"/libimagequant-2.12.2-fix-pkgconfig.patch
-	"${FILESDIR}"/libimagequant-2.14.0-fix-openmp-pragma.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-	sed -i '/install.*STATICLIB/d' Makefile || die
-}
-
-src_configure() {
-	tc-export AR CC
-	# Hand rolled configure script, so not all flags are supported.
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		$(use_enable debug) \
-		$(use_enable cpu_flags_x86_sse2 sse) \
-		$(use_with openmp) \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" || die
-}
-
-src_compile() {
-	emake shared imagequant.pc
-}
diff --git a/media-gfx/libredwg/Manifest b/media-gfx/libredwg/Manifest
index edcfbbbbd20c..4ea0dd579cfc 100644
--- a/media-gfx/libredwg/Manifest
+++ b/media-gfx/libredwg/Manifest
@@ -1,3 +1,6 @@
 DIST libredwg-0.12.4.tar.gz 18318912 BLAKE2B 21ff443881c19782c747ddf880eba23090295432edf4367161472aeef970e1b93983967e667ca2c3e140bf0b97e7b238bbe4a342815df365cee10bde83a04178 SHA512 df9424f475be512a6e9e02a1156a7d6a966f684f5753f420843593ee9dc236bd33bd10dbd627bab1b9adab9b8e7cb3a6b464c15e643ae755bc7e11974c05cd7a
+DIST libredwg-0.12.5.tar.gz 16855123 BLAKE2B 2ca0bfafdb0ca6e412d3aaf7df21f80a2eed4bad795bffacc1c767f23dc555b35b2aeedb35dffab099c5dbab2890f9363cfc1508c3fec16a6ff51ce79a272e3e SHA512 0b5da6e863410d9ce012d311e921a39fa0d9cb6d96d17f1df70ca767c1768cd625e35503f24830a6a33400ede92d14b36ce87b92f177a5af7e6d4573920cf50c
+DIST libredwg-85695f3d5903b1cd5b4030efe50db3b4f5f3c928.tar.gz 12597 BLAKE2B cd01f6c446d5d129545fdae07c0101d133e1f4e69ee62e94c27c3c2853dcc30854f40aed0c6f38f6594c5f5eb9e7b2d18d3b2e4f487b7bf1a3f7f39facde38bc SHA512 1d08cfa6216e0fe671dab77a0bd0b4ef0c4eb174878eba909c680e0ee93a82079b3cbf60afe2de7b0078258de8bcc588961e59cf0c14fe5f2d1f70db639ef95a
 EBUILD libredwg-0.12.4.ebuild 1977 BLAKE2B c2bee6ce5a6807cb650689968faf922687e77547a0541d54beab6bd8a8eaf97ec018ba14da08d51508243d68e081f52cf2b85c32a99be429b43d3a01c94e46c2 SHA512 516860beaa723735a67322d52bed2168817a77bac2140cd93d39e8b272c41fa0ec036c50f9810c9df286bb4da805914de744bd9f8cc3be125f5e9dd0838fc709
+EBUILD libredwg-0.12.5.ebuild 2542 BLAKE2B 92420c01b1659c2d001f1b1d88de1185efa5d2195d26ad8d6df74110d8358fe6aab3e56d0187e1170dc28c11431cb2733ef07c56c95551e40ca5814c668e7c8a SHA512 ffdc9c6f859d91d8c1b2e1c2df7fa96489d73fd4d87c536e18b9db8c86268f16b6b304fbe40c8174bc6aee9e876c74dd9e95648a542eb54c6247bc3b5b2e6985
 MISC metadata.xml 406 BLAKE2B c39713a8733c296d7b9c8d87210f1bec2bcebf415d2dcb6e6326fd6a89e9b84b44bffd781cd953de35894220b51277d39c3fd80ad8c9fe8f22cb29fdb920467c SHA512 a474d5abfc3db689b006dad09dc5ab003526141269d30e6acb7c241054be518a21f6a034ed9939a75098386cd01012d460bf70e0c12f0f14023ac48682c44e81
diff --git a/media-gfx/libredwg/libredwg-0.12.5.ebuild b/media-gfx/libredwg/libredwg-0.12.5.ebuild
new file mode 100644
index 000000000000..8f14bdef8e11
--- /dev/null
+++ b/media-gfx/libredwg/libredwg-0.12.5.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DOCS_BUILDER="doxygen"
+# File is hardcoded to be run from ../ so we use this instead of DOCS_DIR
+DOCS_CONFIG_NAME="doc/Doxyfile"
+
+inherit autotools docs python-single-r1 perl-functions
+
+JSMN_COMMIT="85695f3d5903b1cd5b4030efe50db3b4f5f3c928"
+
+DESCRIPTION="C library to handle DWG files"
+HOMEPAGE="https://www.gnu.org/software/libredwg/"
+SRC_URI="
+	https://github.com/LibreDWG/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/zserge/jsmn/archive/${JSMN_COMMIT}.tar.gz -> ${PN}-${JSMN_COMMIT}.tar.gz
+"
+
+LICENSE="GPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# https://github.com/LibreDWG/libredwg/issues/342
+RESTRICT="test"
+
+IUSE="debug python perl static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	python? ( ${PYTHON_DEPS} )
+	perl? ( dev-lang/perl )
+	dev-libs/libpcre2
+	dev-libs/pslib
+"
+DEPEND="${RDEPEND}
+	python? ( dev-lang/swig )
+	perl? ( dev-lang/swig )
+"
+BDEPEND="|| (
+	sys-devel/gcc[sanitize]
+	sys-libs/compiler-rt-sanitizers[asan(-)]
+	)
+	dev-vcs/git
+"
+
+src_unpack() {
+	# Build system really wants jsmn to be here
+	default
+	rm -r "${S}/jsmn" || die
+	mv "${WORKDIR}/jsmn-${JSMN_COMMIT}" "${S}/jsmn" || die
+}
+
+src_prepare() {
+	default
+	# Fix variable references itself error, fails in src_install otherwise.
+	sed -i -e 's/TEXINPUTS="$(TEXINPUTS)$(PATH_SEPARATOR)$(TEXINFO_TEX_DIR)"/TEXINPUTS="$(PATH_SEPARATOR)$(TEXINFO_TEX_DIR)"/g' doc/Makefile.am || die
+	# https://github.com/LibreDWG/libredwg/issues/404
+	# Workaround: release tarball does not include dwg2ps.1.
+	# Upstream autotools stuff has to be run in git repo
+	git init -q || die
+	git config --global user.email "larry@gentoo.org" || die
+	git config --global user.name "Larry the Cow" || die
+	git add . || die
+	git commit -qm 'init' || die
+	git tag ${PV} || die
+	eautoreconf
+}
+
+src_configure() {
+	perl_set_version
+	local myconf=(
+		--enable-write
+		--enable-dxf
+		--enable-json
+		--disable-gcov
+		$(use_enable !debug release)
+		$(use_enable debug trace)
+		$(use_enable debug)
+		$(use_enable static-libs static)
+		$(use_enable python python "${EPYTHON}")
+		$(usex perl "--with-perl-install=vendor" "--with-perl-install=no")
+	)
+
+	if use python || use perl; then
+		myconf+=( --enable-bindings )
+	else
+		myconf+=( --disable-bindings )
+	fi
+
+	econf ${myconf[@]}
+}
+
+src_compile() {
+	perl_set_version
+	emake
+	docs_compile
+}
+
+src_install() {
+	perl_set_version
+	default
+	use python && python_optimize
+}
diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
index 4f702c71cbae..8c2756649545 100644
--- a/media-gfx/luminance-hdr/Manifest
+++ b/media-gfx/luminance-hdr/Manifest
@@ -2,6 +2,10 @@ AUX luminance-hdr-2.5.1-openmp-automagic.patch 1574 BLAKE2B e8c289b8a66e258dd0ea
 AUX luminance-hdr-2.6.0-cmake.patch 855 BLAKE2B 2656ec16d554199a8cb0dca0df77ab710b6c2b16f5ae006ab07c06d8898fe2c0048222b80714d0343f105a623acbd535119853831e2d207a50e6407e1de33aff SHA512 694106851d29a97485e7e438db206c5d08d37dc5d7a2c9a3f207f31c2b673d42b4c539429a658390d31f5f985bd8f330d9387f3eb19964aa4e5683f2031b0a33
 AUX luminance-hdr-2.6.0-docs.patch 948 BLAKE2B 5ac822b10ffc61c552292806adc3f5470a7f03a9b2df7ba385435904963e52af583a892762867abb6a76a5351ffbbf0ffbd67107310e84bab9b649cc33666e09 SHA512 2b242a558c3b734a653943f3128c4cbc2440f940407faa096505ac7abe945c729bd0b4c5e9d06f53141bdb1271b097d7de15e87cd31db75ef1e30839a64f32b0
 AUX luminance-hdr-2.6.0-no-git.patch 377 BLAKE2B 454a9973831aa3ba312926190a84622c8c3bd9481c67ece8ccf8916517f6b314931a09adf8a4168d8a1c7cd8a7694db27291009b9fae8a9cacc8356d32c7f5c3 SHA512 fba84a0415c8e514fb85b229adb29fbda238e8146d2dfff296d92fde33aeb22562e5ac98fed2422326354be9c0096cc2bd1b8947edfa9e7ca160d207ba0db476
+AUX luminance-hdr-2.6.1.1-fixheaders.patch 320 BLAKE2B 1037c958cb0eb08c186343c57bf530a2f8ed0b2cc9ef5b67f1363d9b595d267bd5f63a7fbca3d1b51ba4c3cbe3b92d6e56d6af28ee39333376d2411aae18c4d1 SHA512 6e5a51ba17648c619599b895ce9d2fd42b757652331e87799958372ad9c61f711619b0d5efac1d32fb8517732b3b3013fee1c86f0f4032531e390c1bfd229c06
+AUX luminance-hdr-2.6.1.1-openexr3.patch 1028 BLAKE2B fb0502bad89beafdd9cc6cd842e542d2cd9f7d4fc7fe6a29c9c1b67e3a0fc902c451650895c63e8405de82bb5e9e02fca3d1013227fc1a97220ebae245466889 SHA512 a040ee694fff2df06f0521db8c0bb98d4d80def4c342ea5997da535ea1b5e1634a4a9b26e7300476a061b7d7f2a90fc3d2b1cc4fca1c1df260b8847fef781060
 DIST luminance-hdr-2.6.0.tar.bz2 11556372 BLAKE2B 0026768202d35126b82101eb2dc7cdc2917728b519c1cadc62ffb6470204077b4b6ae220ebf09c7f903839fe0c714715efe796ee4830cc92174370cd2741d576 SHA512 6cfb21b1ddc9cac612e3d176323e34c5181333f1b52953c02ad5aec28cc86bf519ecede248847082085879c5c2fd2c5570b05f5d3bffa96ba3781ff8cd1967d1
+DIST luminance-hdr-2.6.1.1.tar.bz2 11569153 BLAKE2B bbeb991c05f1058fe9fde59014d4c6326283bad34d84dc0454a0b4df1b600b02835e6c3013199d2b2811d59409b892129c580e4a2a5cb00c8014e1267c16ab84 SHA512 9006339037aa3a0b7332cf71e1cf143d9e700eaae1102dfb8eccea8a9d97a5bcb6331202684adf76542116927dd9a69169882518af6ebb25c85d08057fdc552e
 EBUILD luminance-hdr-2.6.0-r1.ebuild 2076 BLAKE2B d22e0e67e352a2ff518999534223694a383e087250372d9d8b4909f6536df2680fd6c82d98bfab197ebe3964527f6d8d7733026e42eeb7fe15032dd3f7f0ded0 SHA512 09de47154150b2e7cbf1407f64f20b9d673ff4dc2f67abdbc074b224a3901b05ca36bc78b99370dbe33c25b196d73c6582c6fc916586d507faace9f4fea9c0d8
+EBUILD luminance-hdr-2.6.1.1.ebuild 2177 BLAKE2B dcfce415393738b77b0bd537c150ea47b2dd16555094dbed7f3543f7000ef3d2c5a27c214aea8889177775605671fa5d6e291898e8f870a41fdd4272d009718d SHA512 1db1a28c354d8a2098d866b788c7ca40c0b81dc26b56f672ce0f27ab2c88ba61ea6dfb55abda6fbcb0bd699c5c0c933482958315e01d7451c816872185be22d9
 MISC metadata.xml 1272 BLAKE2B 08d1f2e217eaffcb4419532ed41ba963a971b343e2d0ff7f3718c9df23ac9ffd5299264d5a87b66451acd231965f135bdeebf3b91244e3d9e51763c818b317f9 SHA512 98f1fa351c3e0bc7e47b30263093408cbbebacf8e0eb23d780cd704f5ddfff3d6939aee4d18c06cd083d90dc8a68ea51995352ab1f15ce75b0585230a3f9cbc8
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-fixheaders.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-fixheaders.patch
new file mode 100644
index 000000000000..58974ea998ee
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-fixheaders.patch
@@ -0,0 +1,15 @@
+Source: arch linux
+
+diff --git a/src/Common/init_fftw.h b/src/Common/init_fftw.h
+index af2fc02c..a4aad47f 100644
+--- a/src/Common/init_fftw.h
++++ b/src/Common/init_fftw.h
+@@ -22,7 +22,7 @@
+ #ifndef INIT_FFTW_H
+ #define INIT_FFTW_H
+ 
+-#include <boost/thread/mutex.hpp>
++#include <mutex>
+ 
+ class FFTW_MUTEX {
+    public:
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-openexr3.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-openexr3.patch
new file mode 100644
index 000000000000..9ab283298704
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-openexr3.patch
@@ -0,0 +1,28 @@
+Source: arch linux
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8ff498d0..23f5c387 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -191,7 +191,7 @@ INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR})
+ FIND_PACKAGE(PNG REQUIRED)
+ INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})
+ 
+-FIND_PACKAGE(OpenEXR REQUIRED)
++FIND_PACKAGE(OpenEXR CONFIG REQUIRED)
+ INCLUDE_DIRECTORIES(${OPENEXR_INCLUDE_DIR} "${OPENEXR_INCLUDE_DIR}/OpenEXR")
+ 
+ FIND_PACKAGE(GSL REQUIRED)
+diff --git a/src/Libpfs/CMakeLists.txt b/src/Libpfs/CMakeLists.txt
+index 80617998..ce3c746e 100644
+--- a/src/Libpfs/CMakeLists.txt
++++ b/src/Libpfs/CMakeLists.txt
+@@ -12,7 +12,7 @@ ADD_SUBDIRECTORY(colorspace)
+ ADD_SUBDIRECTORY(io)
+ 
+ ADD_LIBRARY(pfs STATIC ${LIBPFS_H} ${LIBPFS_HXX} ${LIBPFS_CPP})
+-TARGET_LINK_LIBRARIES(pfs Qt5::Core Qt5::Gui Qt5::Widgets)
++TARGET_LINK_LIBRARIES(pfs Qt5::Core Qt5::Gui Qt5::Widgets OpenEXR::OpenEXR)
+ 
+ SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} pfs PARENT_SCOPE)
+ SET(LUMINANCE_MODULES_CLI ${LUMINANCE_MODULES_CLI} pfs PARENT_SCOPE)
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1.ebuild
new file mode 100644
index 000000000000..063d91bee932
--- /dev/null
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs flag-o-matic xdg-utils
+
+DESCRIPTION="Graphical user interface that provides a workflow for HDR imaging"
+HOMEPAGE="http://qtpfsgui.sourceforge.net https://github.com/LuminanceHDR/LuminanceHDR"
+SRC_URI="mirror://sourceforge/qtpfsgui/${P/_/.}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="cpu_flags_x86_sse2 fits openmp test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+RDEPEND="
+	dev-libs/boost:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-gfx/exiv2:=
+	media-libs/lcms:2
+	media-libs/libpng:0=
+	media-libs/libraw:=
+	>=media-libs/openexr-3:0=
+	media-libs/tiff:0
+	sci-libs/fftw:3.0=[threads]
+	sci-libs/gsl:=
+	virtual/jpeg:0
+	fits? ( sci-libs/cfitsio:= )
+"
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:3
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-openexr3.patch
+	"${FILESDIR}"/${P}-fixheaders.patch
+	"${FILESDIR}"/${PN}-2.6.0-cmake.patch
+	"${FILESDIR}"/${PN}-2.6.0-no-git.patch
+	"${FILESDIR}"/${PN}-2.6.0-docs.patch
+	"${FILESDIR}"/${PN}-2.5.1-openmp-automagic.patch
+)
+
+pkg_pretend() {
+	if use cpu_flags_x86_sse2 ; then
+		append-flags -msse2
+	else
+		eerror "This package requires a CPU supporting the SSE2 instruction set."
+		die "SSE2 support missing"
+	fi
+
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	append-flags -std=c++17
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package fits CFITSIO)
+		-DUSE_OPENMP="$(usex openmp)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	mkdir -p "${D}/usr/share/metainfo" || die
+	mv "${D}/usr/share/appdata/"* "${D}/usr/share/metainfo/" || die
+	rmdir "${D}/usr/share/appdata" || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-gfx/mandelbulber/Manifest b/media-gfx/mandelbulber/Manifest
index d89b05ecebef..11ded73bf717 100644
--- a/media-gfx/mandelbulber/Manifest
+++ b/media-gfx/mandelbulber/Manifest
@@ -1,5 +1,7 @@
+AUX mandelbulber-2.26-openexr-3-imath.patch 951 BLAKE2B 0c8c7bca6d5ebdee799fb43b0a39912966554c0d62917bb1de0c92f628cec2d71b9acd26123a102d27f96aee22f2ffa4897edd0eb808798f4f31c2da3d66a5ae SHA512 17d907693ab54aaf60ce61e36616660f925e656bf05de1183cf7127f1c67ae62439a20faa7277a099611129a4dc6aaaba744f1c4bc0e76a1b7e6e03e0ce58b07
 DIST mandelbulber2-2.12-1.tar.gz 47092910 BLAKE2B 1e5ca64a4819052882bc7cdc047c6d755046f2ceebcf7b26db41511fde219aa523a3c6884f0667aed1365104c4502a6e6b1b2d7d40a4a024fdb5051d5ac13cd2 SHA512 5dc8dcaa45bc8747024ed16379cc4d622535099c925abf3c2aa01c0338fe8c1f272e6113b6bf28da6a4bb087e6d6e6a4c6634feca993d2c89f12b79582ff271c
 DIST mandelbulber2-2.26.tar.gz 113563064 BLAKE2B 6fd333a42f5e4b106b950079277ff1bb6cc2395382e12ea37424df137ed11cf5fb103185b325d9615bd890404fe596133644a5cdd3911140eabb2f8c0c1d0e14 SHA512 cc547cab6e2b672a35be5d3d214ad3b292eaf1b3b06daf12cecce0f69e612fcfb4123cd837fd87003eea3103086947639fd04cae4b0ed7cd231d78e5d775e299
-EBUILD mandelbulber-2.12-r1.ebuild 1698 BLAKE2B d0aa54f24759d1aee38d434d1e1fa73b36c6176ba917e5800bb28b871c2742c91bb2214070c58e44b69aa14a88383f90d7ea4356996cd44b30e2fdafbbd53bfe SHA512 17c92cd414b1dbbbfc371550bef8a3f4472805b40565e28563ac6fb11e336a02fa0c3ebe37a65a341540ca414086c616b2b537b43b62f022b36709a349093055
+EBUILD mandelbulber-2.12-r1.ebuild 1665 BLAKE2B 3177e407606884fef8231abbd645f3defa88693438d05a25e34f95656b0c5b2a35a4910fd668e69886e8870f3beed18b2c4e480c46449f22c048b9485cc87a0d SHA512 578355f308d9a58f3680272092349721dede622448ed87561de7ec7b26c0e8fbed39166c144acb433b1e194c735ebec8e6a99e5691120d49f07108b34d6a7fbd
+EBUILD mandelbulber-2.26-r1.ebuild 1975 BLAKE2B 1aee525c99fa0efbf96ef2908abd3b1e9db9e7215600c19bdfa5f7eb4bab58f224686557cd23fcc7c51ce457a506ff9ca547bde23715605ac04530e7b502df9a SHA512 a1ce3644a668490565f12ebfb15b92d0ff38461de2a992f260732fb5cef3b38961dadbc7caf03a8ad058a226949a8844b1cdb1a7d28a363725ca362cd15895bd
 EBUILD mandelbulber-2.26.ebuild 1924 BLAKE2B 86c47c6fce165f2b3bcb440fccdd83a9670cf270fc43e9e2e519206f34e3af1d638ffc12b4e6b21497b36105efc8479cc2d41917ea8835272d73394cb74e29ff SHA512 852bade0b1dd07e2a3d3c38a589495e0aac21af3ba613dfe2f4e8cf970daae42f462398c1a304d1920698225cb0f5c226b17a32861ffa4d670ca46dbaecc71da
 MISC metadata.xml 672 BLAKE2B 8b7d423df1cd3f405b43bbeea9f6de9438951cf55b2020016b3174376e5498f2bc903295afde6626bf342b77050210eec78db8672cf2555f344f12248f1e58be SHA512 4005cd3324e642b6ea382e992949c1a3f459cef6f6094eb896e58fbc5651cd1d88c6575ef76896673bd0589e46285d3df9858a110f9b4b4c867c797a329dee77
diff --git a/media-gfx/mandelbulber/files/mandelbulber-2.26-openexr-3-imath.patch b/media-gfx/mandelbulber/files/mandelbulber-2.26-openexr-3-imath.patch
new file mode 100644
index 000000000000..372b3e655536
--- /dev/null
+++ b/media-gfx/mandelbulber/files/mandelbulber-2.26-openexr-3-imath.patch
@@ -0,0 +1,32 @@
+https://github.com/buddhi1980/mandelbulber2/commit/4a90075d2ea3e7e3f1dd3430e6ba22b42d97b234.patch
+
+Slightly rebased.
+
+From 4a90075d2ea3e7e3f1dd3430e6ba22b42d97b234 Mon Sep 17 00:00:00 2001
+From: cagelight <cagelight@gmail.com>
+Date: Sat, 22 Jan 2022 00:13:52 -0500
+Subject: [PATCH] Upgrade build files for linking with OpenEXR 3
+
+---
+ mandelbulber2/qmake/common.pri     | 7 +++----
+ 2 files changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/mandelbulber2/qmake/common.pri b/mandelbulber2/qmake/common.pri
+index 2e579c5c1..17242e702 100644
+--- a/makefiles/common.pri
++++ b/makefiles/common.pri
+@@ -26,11 +26,10 @@ qtHaveModule(gamepad){
+ 	message("Use QtGamepad module")
+ }
+ 
+-packagesExist(IlmBase){
+-	PKGCONFIG += IlmBase
+-	LIBS += -lIlmImf -lHalf
++packagesExist(OpenEXR){
++	PKGCONFIG += OpenEXR
+ 	DEFINES += USE_EXR
+-	message("Use IlmBase library for EXR files")
++	message("Use OpenEXR libraries for EXR files")
+ }
+ 
+ packagesExist(libtiff-4){
diff --git a/media-gfx/mandelbulber/mandelbulber-2.12-r1.ebuild b/media-gfx/mandelbulber/mandelbulber-2.12-r1.ebuild
index b50cfb100e6b..ae92b8fde4b8 100644
--- a/media-gfx/mandelbulber/mandelbulber-2.12-r1.ebuild
+++ b/media-gfx/mandelbulber/mandelbulber-2.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,6 +9,7 @@ inherit desktop qmake-utils xdg-utils
 DESCRIPTION="Tool to render 3D fractals"
 HOMEPAGE="https://www.mandelbulber.com"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="CC-BY-4.0 GPL-3"
 SLOT="0"
@@ -40,8 +41,6 @@ DEPEND="${RDEPEND}
 	dev-qt/designer:5
 "
 
-S=${WORKDIR}/${MY_P}
-
 src_prepare() {
 	default
 
@@ -69,8 +68,7 @@ src_install() {
 	insinto /usr/share/${PN}2
 	doins -r usr/share/${PN}2/*
 
-	insinto /usr/share/applications
-	doins ${PN}2.desktop
+	domenu ${PN}2.desktop
 
 	newicon -s 256 qt/icons/${PN}.png ${PN}2.png
 }
diff --git a/media-gfx/mandelbulber/mandelbulber-2.26-r1.ebuild b/media-gfx/mandelbulber/mandelbulber-2.26-r1.ebuild
new file mode 100644
index 000000000000..ae58d3bf6c72
--- /dev/null
+++ b/media-gfx/mandelbulber/mandelbulber-2.26-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}2-${PV}"
+inherit desktop qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Tool to render 3D fractals"
+HOMEPAGE="https://www.mandelbulber.com"
+SRC_URI="https://github.com/buddhi1980/${PN}2/releases/download/${PV}/${MY_P}.tar.gz mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="CC-BY-4.0 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="joystick opencl openexr sndfile tiff"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-libs/lzo
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	media-libs/libpng:0=
+	sci-libs/gsl:=
+	joystick? ( dev-qt/qtgamepad:5 )
+	opencl? (
+		dev-libs/clhpp
+		virtual/opencl
+	)
+	openexr? (
+		dev-libs/imath:=
+		media-libs/openexr:=
+	)
+	sndfile? ( media-libs/libsndfile )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${RDEPEND}
+	dev-qt/designer:5
+"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-openexr-3-imath.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	use joystick || sed -i -e "s/qtHaveModule(gamepad)/false/" makefiles/common.pri || die
+	use openexr || sed -i -e "s/packagesExist(OpenEXR)/false/" makefiles/common.pri || die
+	use sndfile || sed -i -e "s/packagesExist(sndfile)/false/" makefiles/common.pri || die
+	use tiff || sed -i -e "s/packagesExist(libtiff-4)/false/" makefiles/common.pri || die
+}
+
+src_configure() {
+	if use opencl; then
+		eqmake5 makefiles/${PN}-opencl.pro
+	else
+		eqmake5 makefiles/${PN}.pro
+	fi
+}
+
+src_install() {
+	dobin ${PN}2
+
+	dodoc README NEWS usr/share/doc/${PN}2/Mandelbulber_Manual.pdf
+
+	insinto /usr/share/${PN}2
+	doins -r usr/share/${PN}2/*
+
+	domenu ${PN}2.desktop
+
+	newicon -s 256 qt/icons/${PN}.png ${PN}2.png
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-gfx/mkbold-mkitalic/Manifest b/media-gfx/mkbold-mkitalic/Manifest
index ae368f552a45..beecf06d3299 100644
--- a/media-gfx/mkbold-mkitalic/Manifest
+++ b/media-gfx/mkbold-mkitalic/Manifest
@@ -1,3 +1,3 @@
 DIST mkbold-mkitalic-0.11.tar.bz2 21922 BLAKE2B 90473ee9ce751f491a36b18b4adcfc15a64535ca11b7394a2d46b48a144394ae549133635f898b8b16d87eb3271439fc425cee3cb05e4559818ab00a7d054e3d SHA512 fe40693bc5d73aaf45daf1bbd22f8107fb61604cd4ff0ec09e8bd63029be811a2b1bb46a3ce214954841c5d074e9ec23c150006d9a2c8ffe633e93801c2d7345
-EBUILD mkbold-mkitalic-0.11.ebuild 747 BLAKE2B bec93e19c8868f72b62f41e4e7805c6b67423b9397f772516700582dccc6d572eb58c6c07793279dce0153474e059c7caff8a1376124b66040fa86d0fee81286 SHA512 866e8b8eb1954bb1f75881af93683ff0ff9a33478c6b216d321a714c879c1c675f4c6fc68e84452b750d0306b3245ab55f4f398612213253bc672bc103191804
+EBUILD mkbold-mkitalic-0.11.ebuild 754 BLAKE2B 6388ff7157040e64744e33753bff859ddae5b309f031b0459d0e1652811276169f16709cf79d8af6fbafaab385ed936e8cfea6156a541be573010fabe51d509d SHA512 1a7761f4feb59cfcc9616261a9c0a5ddfe33d5963444182c22a13a960d9ffce33243905cc3d3b2529dcb8a6955638907b0befc6e1d6080cd43fa1ef42e6c0517
 MISC metadata.xml 249 BLAKE2B a37da98d387308dab889eab2665b67e4176707f3c115a7a69cb7f4b19f9864b96bc2fe70efa105e627c4b57a7d626f6b23dc2709a225a9debada3356f3cf32a0 SHA512 a5095fb01e05f24583a962e36131b2f02cf2d1dd7a97051200e465ad97db014721de7c1857f5eb736cb0290682e8de833cb4c735f7de8d98cdfae1aed6d3d549
diff --git a/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild b/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild
index bf082f37691d..445a3f8347ff 100644
--- a/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild
+++ b/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -11,7 +11,7 @@ SRC_URI="https://hp.vector.co.jp/authors/VA013651/lib/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~ia64 ppc ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~riscv ~s390 sparc x86"
 
 DEPEND=""
 RDEPEND=""
diff --git a/media-gfx/openmesh/Manifest b/media-gfx/openmesh/Manifest
index 8b51186e520a..a62933a7517a 100644
--- a/media-gfx/openmesh/Manifest
+++ b/media-gfx/openmesh/Manifest
@@ -1,3 +1,3 @@
 DIST OpenMesh-7.1.tar.bz2 22855582 BLAKE2B 778b3a40c2e476cdb2f50b5b4a90f8b6ae7852f166087426ff1db25c829cb4172cd7ed14db1a22229f7b4447e7ebeb0d6116647d929b7dab43d565192a8ac48e SHA512 bca0f937e08fe512efb436f5b96b83a1ff7945640e18fb1bb083956f04609560e29b1c1f7e058840791df77df6859fdd20ff6f49d80b908e8c1c5542b8615e6d
-EBUILD openmesh-7.1.ebuild 1464 BLAKE2B 3d03850630cc8f0c7efc08efa89f889d1634ea8700f0410c133340218329f8f8e7fed5907f6f6ee7e2610fd22c8e67fbf7fb7fa22e851a8cb6f8085c802f84c9 SHA512 2f5610ece826ac6d17ec001d2f9018d26c04e867bdcde46ee2274ca6f7a003d7119f95f9a4fd0c22b4040c23894455d9fb3e4b52964646fa9b9687d77c9ea7c9
+EBUILD openmesh-7.1-r1.ebuild 1457 BLAKE2B c066180e93acccefecc3dba5599d06fe20e1ff4f623a80a0e442b7be3cbbd8e2e92237c358532cb5fcbcd5c71f1af9f43b8f768ef81f5eb3e2a8a0965b4ac8a0 SHA512 8489f8a1b395b4f4f036f9cefde9370d29e041daff0906a91c106574d1ba7692738859841c1a79ae917dd8982309a3394275de07541563446273b8767642bddc
 MISC metadata.xml 649 BLAKE2B 885190b0bcbd5eea997faf14865a5873839ce727d3a98dc36f712063f487271d2882c2d5ea08af9d019edd8e780640f2684905ac01de00163e06e832c9afdf60 SHA512 f1c2f1b486f851d8ebc796c8738d1842e12edfc5968fbeea7c150ce8bbf6be107c64a7de051326d485222210a2972868d71d9cd619aa8a3fa5eca8bdd02da68e
diff --git a/media-gfx/openmesh/openmesh-7.1.ebuild b/media-gfx/openmesh/openmesh-7.1-r1.ebuild
index 19b09a04fb5a..4f02e9b682d2 100644
--- a/media-gfx/openmesh/openmesh-7.1.ebuild
+++ b/media-gfx/openmesh/openmesh-7.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit cmake-utils
+inherit cmake
 
 MY_PN="OpenMesh"
 MY_PV="${PV/_rc/-RC}"
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Fix libdir and remove rpath.
 	sed -i \
@@ -57,10 +57,10 @@ src_configure() {
 		-DOPENMESH_BUILD_UNIT_TESTS=$(usex test)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
 	cd "${BUILD_DIR}" || die
-	LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${BUILD_DIR}/Build/$(get_libdir) ctest --verbose
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/Build/$(get_libdir)" cmake_src_test --verbose
 }
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index 84314810fb10..827e467c3070 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -5,6 +5,7 @@ AUX openvdb-8.0.1-glfw-libdir.patch 495 BLAKE2B 6a47bd300b3cd2186be8b749abd1e1fc
 AUX openvdb-8.1.0-glfw-libdir.patch 742 BLAKE2B 2ab1de05da49480584e373dba0f4a8504f6116ee22c46247f72802a9d412df43603b79b9620d0be2efe9745c30d962d1404325f3b09cae4ac9fe1e3bc0052d42 SHA512 beebad98890dc05c7c34594155fcdb163353b3a92c1571c7b017481b1fa167735ec54df019ed5d154e7d0973d3c1d9fd779508d2360f3306eefa6e45d3240d0b
 AUX openvdb-8.2.0-fix-finding-ilmbase-if-imath-and-ilmbase-are-installed.patch 1351 BLAKE2B 0a63f9c2c3fd44cfe8013e2c73c3f311d92fee2b6828801175969a0f7123401c21ad11325788ba8b38716a6d21ccf9bd0e685e0c3bb51d6c3f0a0bd3fcdb409b SHA512 5443a3204c9f8b6b8ae9e533ee8c18d6e82463cb3c5be1e3664ab2067a7ba2c9d99f17263204d6be940db3dcd1d8721b359ac0de698f760d23ba05a68e03f1e9
 AUX openvdb-8.2.0-unconditionally-search-Python-interpreter.patch 1390 BLAKE2B 58e1ed82abe0e2a50ba7861188d65baa48e6c6273bcdbacccf92923de88359d6b08fa52eb6bc8d0b4f144b360680f52a94c696abcfcbb3e1c9045ba830c03646 SHA512 ddedfeae9a68c57c4de14ffdf05f952611fe72fd089320fba5f432d5562a09c661750eca4d0e256be1a3f0ac3e141b26db8d738df5b3a2ddb58a747331c90729
+AUX openvdb-9.0.0-fix-atomic.patch 1548 BLAKE2B 718d9eb0511ea50733d7f11b6720a90fd052452f049afbeceecedb2612963f8dfa53d81030671dd426acb1b8d9280e780bfe39030660152b933c80c21c5e1fbd SHA512 316eb3253d53f7fda43f90e3e6f432aa8e5a687c535cefee04c5af682ede05e744513394f16569c50b4cb2baf142750ed19ae815141738d25babad41699e8a46
 AUX openvdb-9.0.0-numpy.patch 6113 BLAKE2B 4424e930ddaa3863245fc8f32954b5732aaba84792f930cc25f8598cbe0282c68540eaf7f2721959841ec3f40bbe5ed1f770c5c90425389a3a0646ebe3b75c9d SHA512 23b53db3895f1b44605e002e1b3649fe1101844f1ac864cf6083c19fdb4ab40701ee20177d7095c7a8e683e01a3e4fad1fa5087207580dd64e6f5adf4f14fdbc
 AUX openvdb-9.0.0-unconditionally-search-Python-interpreter.patch 1471 BLAKE2B e13ad11bfcb13a763bc73f2a26dbc11d1967098942d6f685cbd9fa2de467ac64c71d093e267db1d2d15e40ac3ab25d9b3995e40cc58d069109ded5abdd8ecb3f SHA512 137f96d8d906f2ea321670823c6fb80256b98179e7d4e044e78e62417d7489eae464f9596f13e80fd2dcafbcd946cf94e192965de48d900e061418f39f16c39c
 DIST openvdb-7.0.0.tar.gz 1872744 BLAKE2B e3a8c8d51f77e115d3d397abde0860a6322d56eb6c4795c1ba39539a23aab6cf37602ce7122965fbc3098b15b118b25010263f567e8003363b78c9b7d9d5dfd8 SHA512 f5321b22b10e192012d544cc02921d3d52f621778ec5aa21ba6d450f3e29f2fdbd76486ad390a0c008394dbc6ee4aeecc04527ef30e73adf71c1a08a021746b7
@@ -17,6 +18,7 @@ EBUILD openvdb-7.0.0-r4.ebuild 2923 BLAKE2B 789ef9fe451697a42848047a72a7dec59ba3
 EBUILD openvdb-7.1.0-r5.ebuild 2936 BLAKE2B 08764ebb2337dc453144526e5beb5c022eb2bfd2a68f752ccfb847057c53795ea3bd157f1527f6612bfbdc6faf927304f6dcd460901d4aff302c77a4613a24a6 SHA512 bc9bfbbb770fbafe7611d2df5d432db2d738c1f2118e922c921967328191954ed631a590411350ab15f50924b0b2f00d1501969e77a7c89e0f147e163e65d76c
 EBUILD openvdb-8.0.1-r4.ebuild 3034 BLAKE2B ef40d732555b406d4e81c7ad4500033073c10f5b8d81a0c7032d0c02369879fcadbfcbbb0fa4f344ca251fee47ceebe938acd47c70c2a3db2bca405da9cd2526 SHA512 5df7e6f71b8306ec28278839e7dee2ff09b8a7d1555f88a0c0f6ca7f9b5be20f1e572a0b0df6689817fb5fb378b5fc2d1a9729247aa6caf51c942e06fef1d0c6
 EBUILD openvdb-8.1.0.ebuild 3209 BLAKE2B 0db931c94e28135dd1819758f4459588c14498c2bc3121b7d61d223ddb6fb32873f22bf269f1b2afb15a3c1a612cb151b515a54eca2d6e73e56e6406b3df635c SHA512 840c7aac5df4a6cd6edde07c79702cdfb49f70e0b09dd023842884ccd62745202f0e956697ced9fe58cdffc345eba1330c0c006e6b248e60020d5b3193992faf
-EBUILD openvdb-8.2.0-r1.ebuild 3474 BLAKE2B 650cde4a8f46ef313025bbaba7f7f9698c1f0fa8347fa6aa1e2e3afb05904da49974d695e6578d2ce39c6bb8d2a331a3a7188837d85a3f090690c98797469527 SHA512 be60e550c9a334a05092bc95090ee5044f07d777484cc6efef050237c9b5f337182b4e1b1219b3290bc4d214a37fc83cb9baca3b2bb7872c3a0efe13bc968810
-EBUILD openvdb-9.0.0.ebuild 3347 BLAKE2B e2bf412d66dfd7b8b4fdaa356a61381bcad5311d759902e007d8d66dbe7f5bfc3ae878f7a93983c592ffccc54db6f3f8378ddab2c2fa5f31a8a08c7427bc7e85 SHA512 5ce547ff60fe80d650dcb7674b2c42e457f56203208e1fc521ce3c475b08e7e5c202575a0d730528c6b3d1ef5596434fc921a4943b34bd44dc7857d049153c4f
-MISC metadata.xml 1646 BLAKE2B 9e25b791388076b419596924e5860d79b1e96503dc8d6e2e6894182919590c9688728636f08162f6cc63a75343c34cab88d62046b573e554d6321444b9ea1be0 SHA512 39c3c0a8f7c94081dba88317ecc11cbdce2fa192373daf2ae62867204d6928ed69687935df05bbd033dc643f01168aec98230909d3c69021eedc489a9f007fbc
+EBUILD openvdb-8.2.0-r3.ebuild 3303 BLAKE2B 696e71570894dbb83167c0dbf2edd4db5b06f410fb7af254718ff2d3f7f0cbb44ed4b3279e3c486b3d442e13614aab4f80ec0251e8e5653fd9ad3fd0b6e383f9 SHA512 912bb5c4e2a3214d71985440d695a14e333c52fa4828d687dfcbbaf13aa1e5d377081c7f8889a080a17c79096bbc766ecd587bbe58b89489024f08f6d79e6085
+EBUILD openvdb-8.2.0-r7.ebuild 3242 BLAKE2B 7c1f9ebebb936493a76380f42a4e2d1dc006e67b2f1c89283a09346e2a4400bd834e03dd6b06ea78a417bc09b537a8dbd62db89ad44aba4fb611446c7c1a2a7b SHA512 cbcb0b469f762ae4126d1bf048adc3126a84d246e9cc236bd2e494ae12064130ab4229770bd589a177d0b4ad1eb298682578cf1ff2ec47d1f4e4966d9e6df0cd
+EBUILD openvdb-9.0.0-r4.ebuild 3361 BLAKE2B 57f6d1dc9940a02082bb67a6b8279f953ee7a3575b3cbe19223567095dc1b47000079f8323033efef779ed02cc1f80bf61cc78ce6b22dd80f71bab044cc583c8 SHA512 63b82acf0c48176475238afa751c046db5d21463b1a1c23b5e7f77c6de336a29436fb097e52302a20cdaef27a35b615197101c150bcfb4a25b5b3e9015477de7
+MISC metadata.xml 1956 BLAKE2B ac18ef2565209cbf43a84ddb7abacd711946799fa1f02fc1d336ed785f8ffed4cc207eaa88b1b57c9c8f3687776ae6dbf00fe316e096246ac9f41367ae8c9ac5 SHA512 cb2026ba7cf516a7cc2254090484e49fbd1fea99a81d4c0f17151a8c84d471c32c1026ca3f53531e85d875465f3ab3125ebe4abd5d17a36f63d75fbc0e230a4a
diff --git a/media-gfx/openvdb/files/openvdb-9.0.0-fix-atomic.patch b/media-gfx/openvdb/files/openvdb-9.0.0-fix-atomic.patch
new file mode 100644
index 000000000000..3885bb4ca453
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-9.0.0-fix-atomic.patch
@@ -0,0 +1,47 @@
+From 7ca53e00b5f85b8842a2a846f0026d63791498cc Mon Sep 17 00:00:00 2001
+From: Yixun Lan <dlan@gentoo.org>
+Date: Wed, 16 Feb 2022 22:24:16 +0800
+Subject: [PATCH] openvdb: fix missing atomic lib
+
+explicitly pass -pthread to work around pthread builtin since glibc-2.34,
+as we need -pthread to pull in libatomic for machines like riscv
+
+Bug: https://bugs.gentoo.org/833372
+Original-from: Alex Fan <alex.fan.q@gmail.com>
+Signed-off-by: Yixun Lan <dlan@gentoo.org>
+---
+ nanovdb/nanovdb/CMakeLists.txt | 3 +++
+ openvdb/openvdb/CMakeLists.txt | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/nanovdb/nanovdb/CMakeLists.txt b/nanovdb/nanovdb/CMakeLists.txt
+index 296dbb0..afc4f0c 100644
+--- a/nanovdb/nanovdb/CMakeLists.txt
++++ b/nanovdb/nanovdb/CMakeLists.txt
+@@ -69,6 +69,9 @@ if(UNIX)
+   # forces the compiler -pthread flag vs -lpthread
+   set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+   find_package(Threads REQUIRED)
++  if(CMAKE_USE_PTHREADS_INIT)
++    target_link_libraries(Threads::Threads INTERFACE -pthread)
++  endif()
+ endif()
+ 
+ if(NANOVDB_BUILD_UNITTESTS OR NANOVDB_BUILD_BENCHMARK)
+diff --git a/openvdb/openvdb/CMakeLists.txt b/openvdb/openvdb/CMakeLists.txt
+index 1d5b75f..22988b7 100644
+--- a/openvdb/openvdb/CMakeLists.txt
++++ b/openvdb/openvdb/CMakeLists.txt
+@@ -202,6 +202,9 @@ endif()
+ 
+ if(UNIX)
+   find_package(Threads REQUIRED)
++  if(CMAKE_USE_PTHREADS_INIT)
++    target_link_libraries(Threads::Threads INTERFACE -pthread)
++  endif()
+ endif()
+ 
+ # Set deps. Note that the order here is important. If we're building against
+-- 
+2.35.1
+
diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml
index a4302c6004d8..50b4f6e0bbd9 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -18,6 +18,12 @@
 		<flag name="blosc">
 			Allow using blosc compression via <pkg>dev-libs/c-blosc</pkg>
 		</flag>
+		<flag name="cuda">
+			Enable support for CUDA in NanoVDB.
+		</flag>
+		<flag name="nanovdb">
+			A lightweight, header only, and GPU friendly version of VDB.
+		</flag>
 		<flag restrict="&gt;=media-gfx/openvdb-7.0.0" name="numpy">
 			Build pyopenvdb with support for <pkg>dev-python/numpy</pkg>
 		</flag>
@@ -33,6 +39,9 @@
 		<flag restrict="&gt;=media-gfx/openvdb-8.0.0" name="abi8-compat">
 			Disables newer features to maintain compatibility with ABI8.
 		</flag>
+		<flag restrict="&gt;=media-gfx/openvdb-9.0.0" name="abi9-compat">
+			Disables newer features to maintain compatibility with ABI9.
+		</flag>
 		<flag restrict="&gt;=media-gfx/openvdb-7.0.0" name="utils">
 			Build utility binaries
 		</flag>
diff --git a/media-gfx/openvdb/openvdb-8.2.0-r1.ebuild b/media-gfx/openvdb/openvdb-8.2.0-r3.ebuild
index 1a4d9c0e36e9..c77a66b4a5b2 100644
--- a/media-gfx/openvdb/openvdb-8.2.0-r1.ebuild
+++ b/media-gfx/openvdb/openvdb-8.2.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,8 +22,6 @@ REQUIRED_USE="
 	^^ ( abi6-compat abi7-compat abi8-compat )
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
-# 8.2.0 should support OpenEXR 3 / imath but it's going to cause issues with Blender AFAIK
-# so let's avoid it for now.
 RDEPEND="
 	dev-cpp/tbb:=
 	dev-libs/boost:=
@@ -46,7 +44,7 @@ RDEPEND="
 	)
 	utils? (
 		media-libs/ilmbase:=
-		media-libs/openexr:0=
+		media-libs/openexr:=
 	)
 	zlib? ( sys-libs/zlib )
 "
@@ -106,7 +104,6 @@ src_configure() {
 		-DUSE_ZLIB=$(usex zlib)
 		-DUSE_CCACHE=OFF
 		-DUSE_COLORED_OUTPUT=ON
-		# Off for now until 9.0.0 for OpenEXR 3 support
 		-DUSE_IMATH_HALF=OFF
 		-DUSE_LOG4CPLUS=ON
 	)
diff --git a/media-gfx/openvdb/openvdb-8.2.0-r7.ebuild b/media-gfx/openvdb/openvdb-8.2.0-r7.ebuild
new file mode 100644
index 000000000000..93f4d80c9ce0
--- /dev/null
+++ b/media-gfx/openvdb/openvdb-8.2.0-r7.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="Library for the efficient manipulation of volumetric data"
+HOMEPAGE="https://www.openvdb.org"
+SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0/8"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 +blosc doc numpy python static-libs test +zlib abi6-compat abi7-compat +abi8-compat"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	blosc? ( zlib )
+	numpy? ( python )
+	^^ ( abi6-compat abi7-compat abi8-compat )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-cpp/tbb:=
+	dev-libs/boost:=
+	dev-libs/jemalloc:=
+	dev-libs/log4cplus:=
+	>=dev-libs/imath-3.1.4-r2:=
+	media-libs/glfw
+	media-libs/glu
+	>=media-libs/openexr-3:=
+	sys-libs/zlib:=
+	x11-libs/libXcursor
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	blosc? ( dev-libs/c-blosc:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}]
+			numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+		')
+	)
+	zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	test? ( dev-util/cppunit dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch"
+	"${FILESDIR}/${PN}-8.0.1-add-consistency-for-NumPy-find_package-call.patch"
+	"${FILESDIR}/${PN}-8.1.0-glfw-libdir.patch"
+	"${FILESDIR}/${PN}-8.2.0-fix-finding-ilmbase-if-imath-and-ilmbase-are-installed.patch"
+	"${FILESDIR}/${PN}-8.2.0-unconditionally-search-Python-interpreter.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myprefix="${EPREFIX}"/usr/
+
+	local version
+	if use abi6-compat; then
+		version=6
+	elif use abi7-compat; then
+		version=7
+	elif use abi8-compat; then
+		version=8
+	else
+		die "OpenVDB ABI version is not compatible"
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/"
+		-DOPENVDB_ABI_VERSION_NUMBER="${version}"
+		-DOPENVDB_BUILD_BINARIES=ON
+		-DOPENVDB_BUILD_DOCS=$(usex doc)
+		-DOPENVDB_BUILD_UNITTESTS=$(usex test)
+		-DOPENVDB_CORE_SHARED=ON
+		-DOPENVDB_CORE_STATIC=$(usex static-libs)
+		-DOPENVDB_ENABLE_RPATH=OFF
+		-DUSE_BLOSC=$(usex blosc)
+		-DUSE_ZLIB=$(usex zlib)
+		-DUSE_CCACHE=OFF
+		-DUSE_COLORED_OUTPUT=ON
+		-DUSE_IMATH_HALF=ON
+		-DUSE_LOG4CPLUS=ON
+	)
+
+	if use python; then
+		mycmakeargs+=(
+			-DOPENVDB_BUILD_PYTHON_MODULE=ON
+			-DOPENVDB_BUILD_PYTHON_UNITTESTS=$(usex test)
+			-DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
+			-DPython_EXECUTABLE="${PYTHON}"
+			-DPython_INCLUDE_DIR="$(python_get_includedir)"
+			-DUSE_NUMPY=$(usex numpy)
+		)
+	fi
+
+	mycmakeargs+=(
+		-DOPENVDB_BUILD_VDB_LOD=ON
+		-DOPENVDB_BUILD_VDB_RENDER=ON
+		-DOPENVDB_BUILD_VDB_VIEW=ON
+	)
+
+	if use cpu_flags_x86_avx; then
+		mycmakeargs+=( -DOPENVDB_SIMD=AVX )
+	elif use cpu_flags_x86_sse4_2; then
+		mycmakeargs+=( -DOPENVDB_SIMD=SSE42 )
+	fi
+
+	cmake_src_configure
+}
diff --git a/media-gfx/openvdb/openvdb-9.0.0.ebuild b/media-gfx/openvdb/openvdb-9.0.0-r4.ebuild
index e40833eff061..8ec379c61a6d 100644
--- a/media-gfx/openvdb/openvdb-9.0.0.ebuild
+++ b/media-gfx/openvdb/openvdb-9.0.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,30 +13,32 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.g
 
 LICENSE="MPL-2.0"
 SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 +blosc doc numpy python static-libs test utils zlib abi6-compat abi7-compat +abi8-compat"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 +blosc cuda doc +nanovdb numpy python static-libs test utils +zlib abi6-compat abi7-compat abi8-compat +abi9-compat"
 RESTRICT="!test? ( test )"
 
-REQUIRED_USE="
+REQUIRED_USE="blosc? ( zlib )
 	numpy? ( python )
-	^^ ( abi6-compat abi7-compat abi8-compat )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
+	cuda? ( nanovdb )
+	^^ ( abi6-compat abi7-compat abi8-compat abi9-compat )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
 RDEPEND="
-	>=dev-cpp/tbb-2021.4.0:=
+	>=dev-cpp/tbb-2020.3:=
 	dev-libs/boost:=
 	dev-libs/jemalloc:=
 	dev-libs/log4cplus:=
-	dev-libs/imath:=
+	>=dev-libs/imath-3.1.4-r2:=
 	media-libs/glfw
 	media-libs/glu
-	media-libs/openexr:3=
+	>=media-libs/openexr-3:=
 	sys-libs/zlib:=
 	x11-libs/libXcursor
 	x11-libs/libXi
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	blosc? ( dev-libs/c-blosc:= )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-11 )
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
@@ -62,8 +64,8 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch"
 	"${FILESDIR}/${PN}-8.1.0-glfw-libdir.patch"
+	"${FILESDIR}/${PN}-9.0.0-fix-atomic.patch"
 	"${FILESDIR}/${PN}-9.0.0-numpy.patch"
 	"${FILESDIR}/${PN}-9.0.0-unconditionally-search-Python-interpreter.patch"
 )
@@ -72,14 +74,6 @@ pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
-src_prepare() {
-	# Make sure we find our renamed Imath headers
-	# bug #820929
-	sed -i -e 's:#include <Imath/half.h>:#include <Imath-3/half.h>:' openvdb/openvdb/Types.h || die
-
-	cmake_src_prepare
-}
-
 src_configure() {
 	local myprefix="${EPREFIX}/usr/"
 
@@ -90,12 +84,12 @@ src_configure() {
 		version=7
 	elif use abi8-compat; then
 		version=8
+	elif use abi9-compat; then
+		version=9
 	else
 		die "OpenVDB ABI version is not compatible"
 	fi
 
-	# TODO: add NanoVDB?
-	# https://academysoftwarefoundation.github.io/openvdb/NanoVDB_HowToBuild.html
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/"
 		-DOPENVDB_ABI_VERSION_NUMBER="${version}"
@@ -113,8 +107,16 @@ src_configure() {
 		-DUSE_COLORED_OUTPUT=ON
 		-DUSE_IMATH_HALF=ON
 		-DUSE_LOG4CPLUS=ON
+		-DUSE_NANOVDB=$(usex nanovdb)
 	)
 
+	if use nanovdb; then
+		mycmakeargs+=(
+			-DNANOVDB_BUILD_UNITTESTS=$(usex test)
+			-DNANOVDB_USE_CUDA=$(usex cuda)
+		)
+	fi
+
 	if use python; then
 		mycmakeargs+=(
 			-DOPENVDB_BUILD_PYTHON_MODULE=ON
diff --git a/media-gfx/pencil/Manifest b/media-gfx/pencil/Manifest
index 709aef6c9391..6e375e93aff5 100644
--- a/media-gfx/pencil/Manifest
+++ b/media-gfx/pencil/Manifest
@@ -1,4 +1,7 @@
 AUX pencil-0.6.5-skip-building-tests.patch 1301 BLAKE2B c7bfb172e5050936a1cf7294d2992c580ffb0b337c879d60c42575c5dff7c0269a1e406eecf7e97871a6ab785c9910a5ffc47fa97b5f9881239debf294c6cf96 SHA512 c71e2cc135a267f79bffca15f3cafb4a7e6e4d3b0f3718f37551b6985a9264774c70974c22acbf591c7b204e9aa1ea46ca4d3b3722770931b000cc633f3f62aa
+DIST catch.hpp 656886 BLAKE2B 590fabc7970b97f333457f409276688f69a66de7fa3c43d767994ed212a3b5bde6e6c113c36a0ff03dd95bbb0cdb38cc12b43a96d16644525ea7425e028485a6 SHA512 ca401efb224e87c4f9d9f3bd58102d3223ef3356149837be2474fa2dbae645272c1ecb17d7db96c2b43b97034aacb63f840f4ebec16f2f3d447c1cc80a500d40
 DIST pencil-0.6.5.tar.gz 3714951 BLAKE2B 0b3ba5165f4a6778588eed3141c6260a29470ccf277e42612e68e8b4daf5b9cf32f6a4343c038d6014ceb1e99f7ce8c2a398130ea55e7ef16e2d006de3661625 SHA512 6d95dc4157ea0f5da829f40cdf99c682e560ca74af6964693d221321e7b3e923893957fc30475a725f09c18dc4667968ec6cd92e5ffb56999ea70a927266b637
+DIST pencil-0.6.6.tar.gz 3807612 BLAKE2B a4933399ea7f3103eb097756684f42061f5db4c419983458ce8ad317e7eab667ccc5c29c6bf9a3dec5fe57887c4456b64c6e93be889684bd2b567c247aa6dfeb SHA512 1cb976011a1270a2715568fc740db28e6b1a0f050ff7cc2630687edb6e4b57245bf8f58e69721dabab0a2bd65f58780176e2a59691ed0b19f7276c1aad950e7d
 EBUILD pencil-0.6.5.ebuild 1046 BLAKE2B 08898a58651463848a46e86257dba524cc964353cde956df1b2ef7737727c773e93e5fdd0691f887cbadb1333e0970dcc7a3ee7001ae110944cb93f0833ddc00 SHA512 0f994320ea1cc4e29b79b4045406eff65bcc1cbcd45315da9587949d547d389fbd4447c83195bda1e1395ea2156032da93d7fe873186f295e73379edd1164b61
+EBUILD pencil-0.6.6-r1.ebuild 1143 BLAKE2B 340348efb43e721af121328ca77e0a001cbf04e37537648db0b255f5095e4ca3b1be16efd59ee995b9fc957dcc563105af4072d67370dc9032f2fa86a29f136d SHA512 433bf1ac6a8fc8fb233352f3561a5e4d5be26a2a5e817a5a57db9df6e1d8041eb675ca36694d8182ea1cff48c4878939a2c795f00cb21e455a7361751870de56
 MISC metadata.xml 329 BLAKE2B 4c4c8b1438179f8c7fe76161333d68910b2e5742a010743f00a08995cff39f1b8dbcda76ee52c4bbdfeac8125f554d55355d7332b91c36e6eb614890634bce73 SHA512 ea2aa6eec0c3cfabdb683deba096d884aa80783354557a083b47142de408a6972d1476c6038b4e87c9f7055f488267cd4c1455f1b059c6ec7e907c1b3c9727dd
diff --git a/media-gfx/pencil/pencil-0.6.6-r1.ebuild b/media-gfx/pencil/pencil-0.6.6-r1.ebuild
new file mode 100644
index 000000000000..5eb1e6e06838
--- /dev/null
+++ b/media-gfx/pencil/pencil-0.6.6-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit 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
+	https://raw.githubusercontent.com/pencil2d/pencil/617c8868fd27ce540de285ff75c8946fba0c975b/tests/src/catch.hpp"
+
+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() {
+	cp "${DISTDIR}"/catch.hpp tests/src/
+	default
+	sed -e "/^QT/s/xmlpatterns //" \
+		-i core_lib/core_lib.pro tests/tests.pro || die
+}
+
+src_configure() {
+	eqmake5 PREFIX=/usr $(usex test "" "CONFIG+=NO_TESTS")
+}
+
+src_install() {
+	einstalldocs
+	emake INSTALL_ROOT="${D}" install
+	# TODO: Install l10n files
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/plantuml/Manifest b/media-gfx/plantuml/Manifest
index cc39e03370f8..df1bc29cd32a 100644
--- a/media-gfx/plantuml/Manifest
+++ b/media-gfx/plantuml/Manifest
@@ -1,5 +1,5 @@
-DIST plantuml-1.2021.16.tar.gz 5378332 BLAKE2B 717ada64ab3664eb790089520ed70106f45eb82186bd26471dcbc732ca0edf6df6d9e55598810c7b208ac5be5efd69452d48f1553b8cd13275ee7d4f0778b603 SHA512 70a0bd0453ed2457fc16a7544a82b53d45e42d3d3fe3d647e1f1509a25135b9adf3fbee70a8e64394829fc941cd5beb66494d8281431fdfe0595cdf2450cc1ec
-DIST plantuml-1.2022.0.tar.gz 5384395 BLAKE2B d6eae1d247aaded608d4e70e8eb97c242d95deb231d596c3069c695429345081dcad95436100b70dcccfa6bdfb2ad890009d2429d80d2f971df87de3e3cf6b95 SHA512 8fdead5696e6ddceb947a2d67aad4dce5d82511b795c5f5a5196fe8d7abc7c7de72f56d2982c82a3b784139dccaec53de7510f757eda758ab5f300b440a278b1
-EBUILD plantuml-1.2021.16.ebuild 750 BLAKE2B 865ccd939984bee0220611676d21df2d6d9b6696cffb9befcc071cf82863852f1209b0945f9ad8f811ab497323a995ce4e060504c5bfe12bd0d8d68a1e1939e5 SHA512 2221e07a0a3b0e2a20494f9792041da9d0969050f0d8666bc75eaacdad0833fd8193081a879ecb876addb1a084caaafa8c8cdde186cf204d4a7ae5905a104b6c
-EBUILD plantuml-1.2022.0.ebuild 751 BLAKE2B 118992e67563dedca5375ec285461a8826ab41fe337d69cd75e31edbc2999f8f0c1ec5ad101c856f25aa99810c7181a3037a10f4a38113542f7a53edb1957316 SHA512 2783b88dd3367bbae9d5c4ed3a93b647592822d9cde253fd3e23fb6ee351af15d221d7918876e582231b8b2a266941ac016c1c115fffa24db9012b5c74acbfd6
+DIST plantuml-1.2022.1.tar.gz 5395748 BLAKE2B 394280c9abf739f35ecf7e0ac84ccb1dba770ab0eff566a46c2e141227e556c17578ed3f5ccffffe7df82d7b7f3cd2d8a86c9d214d16557fe8e8b789a66acd7e SHA512 c510c1291dca58ef81626d3b416db5aeb5060958698cf37a6552a6eea820ce332d00f2b21cd382dadd18035b5f83a305973cfbe1137b09313ec63babeaad5660
+DIST plantuml-1.2022.2.tar.gz 5396602 BLAKE2B 5919495af6d15805ef379ae1a4630fa739620abe48ebef65ae034d16a9811233ae98d60e5ae2cc5e1b4a9d682bef34d70fd0ae42a0d16b5a6f44821df86ae63a SHA512 f61d7dbed7d7b6771d172ae8fb2a7af0c111a986330fddf5b8fbb36e7ebed8f598ff748d6f35b1c1ffa289b24fb699c572172316001bc571628ceeb8d0595d70
+EBUILD plantuml-1.2022.1.ebuild 750 BLAKE2B fc8574f91fddc1a1c4643bcef80049a129bd3462c5d42a2eef297c5f7dfe45eca37b0db569a8c31899e4d296348710595ecbdc4ceb3e594b2ee9442e5b86565f SHA512 ec030e822f381dbf1b0fe822826afc3849ee56aeaada5429cf87192f0059d7f68f1ffb949a404f59c52f899e4d3b3d6b8959ef4f633c97c5661a90b4bfb6c77d
+EBUILD plantuml-1.2022.2.ebuild 751 BLAKE2B 118992e67563dedca5375ec285461a8826ab41fe337d69cd75e31edbc2999f8f0c1ec5ad101c856f25aa99810c7181a3037a10f4a38113542f7a53edb1957316 SHA512 2783b88dd3367bbae9d5c4ed3a93b647592822d9cde253fd3e23fb6ee351af15d221d7918876e582231b8b2a266941ac016c1c115fffa24db9012b5c74acbfd6
 MISC metadata.xml 879 BLAKE2B b711489e5c713d9b6ee8489e7ca080b9af19965e10ce3795e3dd16e3cabd0b9284bb1a75646baf2c0134cce31189a9e7dea499129750e20f4971f53aee66feaf SHA512 cfde5b9a2e44e38bc2eca2d7e32e6d4a18d0413325e41b0823091fdefcd15b035f32572397c27173887d370b2cca7673638ccf32690447dcab91ff31bc309c76
diff --git a/media-gfx/plantuml/plantuml-1.2021.16.ebuild b/media-gfx/plantuml/plantuml-1.2022.1.ebuild
index dc4ec7f18aad..8ba5d39fd289 100644
--- a/media-gfx/plantuml/plantuml-1.2021.16.ebuild
+++ b/media-gfx/plantuml/plantuml-1.2022.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="source"
 inherit java-pkg-2 java-ant-2 desktop xdg
diff --git a/media-gfx/plantuml/plantuml-1.2022.0.ebuild b/media-gfx/plantuml/plantuml-1.2022.2.ebuild
index c1ad0e0aaa4f..c1ad0e0aaa4f 100644
--- a/media-gfx/plantuml/plantuml-1.2022.0.ebuild
+++ b/media-gfx/plantuml/plantuml-1.2022.2.ebuild
diff --git a/media-gfx/pngquant/Manifest b/media-gfx/pngquant/Manifest
index 0ea6ad8f020b..47b3a98e1560 100644
--- a/media-gfx/pngquant/Manifest
+++ b/media-gfx/pngquant/Manifest
@@ -1,6 +1,6 @@
 AUX pngquant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1070f90d4c59584a2b9dac062febb7bdeb1efbbd1cb4f39f8fd1aa94f81ac4318bd0413bdde44f75d418f69b916a70883220d9ef031 SHA512 68c2bf917d60da653abff4fc20c44a9f692213aed87a220a3ffb03ec308107eda7be1a6e135393658ef54d2d63bb0675f5e2a95bdf4b02628fcf5d367c0ce9ef
-DIST pngquant-2.12.3-src.tar.gz 143572 BLAKE2B 6f4cc9f36c9148f36734d9afa3765e206c09e833064cff5d98494d0d71610e857d7c605bc5673eb9fd5b38029ade60c9c1ffc18e745a3dfe5dbde6d39a81d0c7 SHA512 cf39f56750a49b2818fb86b168845e54f3797b664c3f49535ee93a3dc899299192a692039396ffcddc5988d040a778006c5f701f8bcd9f5c73583a47b711b01c
 DIST pngquant-2.12.6.tar.gz 69074 BLAKE2B 3573d54d94b0085de9ffd4dd34a8fd46c49a1e02d0a6419271c17bc7ac7ab6c05d811336a3a8a8ab21d4dea774c93ee1baae141b42c255838fb1eef9cdb1a871 SHA512 8ffff346df67edf1000c71b6d26371826bc4d236b3f57ef1ec73b3b61668cff9c3ca7d541417c39bc6c89e00176c91eb28867b7a91945ac84292ca0ac54984e9
-EBUILD pngquant-2.12.3.ebuild 1169 BLAKE2B 56452f5fa0d76b47151583ef5c4684781eeee2ad12736845790af6ac1a1bb06516c692156a54aa08bcafe5d9df3f5175e3be34e9564e79970ca43cb65428275f SHA512 648727074119405019a00eb3f252ff86e0157874821f3fb9e6025183937cb4639a8b15c19974ee31bb27313cf791a45c8569490e885f0a92b88b1b2d62eada44
+DIST pngquant-2.17.0.tar.gz 71209 BLAKE2B 0f625b6c27bc621fd5e1d9b4c5d3cbb7eda960a7afa8e6c6813c5d74e6f48055572dfacfcc93c694dc2d3fd8a107064c2a24c0845fc5339c0289b8527056d39a SHA512 7054cb6bdc547a6e00be1ab2363e2fa5367598593359ef23a91f3af8ff210b281e10f8721bc74d86f208f45336cd61292946c17dc5f26d292998eba95978dc0b
 EBUILD pngquant-2.12.6.ebuild 1333 BLAKE2B e6ec0875077a2ac52f565b8e71b6f25d4aadac284db3b2091ae36a68b42e576864c00308eff87d65987dcb942294a1559459bf4ba11611dc02be2074fbbeb576 SHA512 2585bc47839739c4e2883ba94f0656c62a7168ca2a5fc7a8a1f3c7d168904aff7538d0db139916dbbb83198cb378b32f47a2c45ed9a09c862af8fc47f8e5873e
+EBUILD pngquant-2.17.0.ebuild 1336 BLAKE2B 06191c627b0e0a0c65e60878cd96a9339468334506eef978cb7382a379bbb6330c07b18857aba179b66f18b6b4983ef645214257598c734fab116b4b4c6cd46d SHA512 6c723ef616c2761e9ed4d2275b55dfab888b1d7c1d68d43c13e0a8d2156f30d0b434d6da7f183ea21fc9a09ec357f121d32393aa7bc882f44991439da6b90f08
 MISC metadata.xml 261 BLAKE2B e57c0c3e4a59fdb630d23ae9d96afed10307c5308bace0cf58c22f41cbbf22fc82c5cd0d041800498570b1490a39f6c47547acfbb2766e21735820ae1c39bf8f SHA512 212dbdf6e688804621cd0ee28e47d3b9696182fe4850a87569e0727e5e811b7c4193807c2ecec65005e1689d4c0ba2c88fb67b29cc89928649e23d23a94d724b
diff --git a/media-gfx/pngquant/pngquant-2.12.3.ebuild b/media-gfx/pngquant/pngquant-2.17.0.ebuild
index fddd03b24f41..dff2d725f4fd 100644
--- a/media-gfx/pngquant/pngquant-2.12.3.ebuild
+++ b/media-gfx/pngquant/pngquant-2.17.0.ebuild
@@ -1,25 +1,32 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 inherit toolchain-funcs
 
-DESCRIPTION="command-line utility and library for lossy compression of PNG images"
-HOMEPAGE="https://pngquant.org/"
-SRC_URI="https://pngquant.org/${P}-src.tar.gz"
+DESCRIPTION="Command-line utility and library for lossy compression of PNG images"
+HOMEPAGE="https://pngquant.org/ https://github.com/kornelski/pngquant"
+SRC_URI="https://github.com/kornelski/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 HPND rwpng"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="debug lcms openmp cpu_flags_x86_sse2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
-RDEPEND="media-libs/libpng:0=
+IUSE="cpu_flags_x86_sse2 debug lcms openmp test"
+REQUIRED_USE="test? ( lcms )"
+
+RDEPEND="
+	media-libs/libpng:0=
 	media-gfx/libimagequant:=
 	sys-libs/zlib:=
-	lcms? ( media-libs/lcms:2 )"
+	lcms? ( media-libs/lcms:2 )
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.12.2-respect-CFLAGS.patch )
 
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index f2ebdc8d779c..dca2cb9869df 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -6,4 +6,5 @@ AUX povray-3.7.0_rc6-darwin-defaults.patch 920 BLAKE2B 9cffcda18626cfdbea9a6b00a
 DIST povray-3.7.0.0.tar.gz 38191521 BLAKE2B 5d936bdcdf9910ede2247cfa5e3881211da00762ac4bc08225dc6b53addc9e09546de9493e642b5d41228d81a50a4bcfbb5e606eb8bd9a224bb1afc5fc82db6e SHA512 82e3dbcd58b7ae921fe3b953815ca4dbbfb22eda434554baee4accabd1455b18cb511061f1cf9cf93128fab0a042df374fe2f68186d78c19853a465bd4bcbe10
 DIST povray-3.7.0.0_p20160914-fix-c++14.patch.bz2 12876 BLAKE2B b1c458764f04a57420a4562e9faacae4ae955c3d9ce4343ffd49176bb575f63830fcd58d0777dea22b975df118aa14e2bdd91509758d33d659daa3fbbaba5880 SHA512 3329da12a822762559445e208a746ff208c39f7b63e27ba84a390074bb52a105c9a2f66180e58c5157795bb16346e11b5b05efaf077ee0d8246179975a692b04
 EBUILD povray-3.7.0.0-r1.ebuild 4583 BLAKE2B 0c44090841e9a6b22b4c9b89c161bbfbe0e4bd080e49a6d0bcbc14a177a565a5b45984661b66b428af3070e714eaca1e7d4c15c28e86ef44b76cee487ab46736 SHA512 e9ae09577410ecb5dc6f3eb68dae1e231fa118b180a6c737b612d6827c7e9c3cdcdb48a30b59e715265d142cc00992b4adf095bcfddd7d2a91e041b24312fec2
+EBUILD povray-3.7.0.0-r2.ebuild 4538 BLAKE2B 52ff4018c1a2be0c5d73fda678dc386bfc78ea6182795dcba9264a58b1b0eae006864681834afea21319f75dbbf83c90719c01e866c14af2eb5a7a0b2366995b SHA512 6c9f4e2b65abc4ae2b6134bf52ae4e4a13ecc289c9838338688f9d5f99e59018556ffecff1b33dd1dc2bd13f8994fc077ea5b92f5543aabb83f16a6704bc78aa
 MISC metadata.xml 410 BLAKE2B e2d166cc7ed5872c7e0bdcf69c7856bd8218b059e9b0444a68930216c423ef7c8922ad963cfc3dc56f0d997c1a6372a04058815eb2b36487d07dbc6752908e2d SHA512 c159e2c730bba95d7c65525d62af05bd5b9d873a519e734010a8e5bc597590147accfe02e23946f0349c0be31a10b3e578d035bc3ff8d11a11274c1957a834be
diff --git a/media-gfx/povray/povray-3.7.0.0-r2.ebuild b/media-gfx/povray/povray-3.7.0.0-r2.ebuild
new file mode 100644
index 000000000000..89abce251e24
--- /dev/null
+++ b/media-gfx/povray/povray-3.7.0.0-r2.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic versionator virtualx
+
+POVRAY_MAJOR_VER=$(get_version_component_range 1-3)
+POVRAY_MINOR_VER=$(get_version_component_range 4)
+if [ -n "$POVRAY_MINOR_VER" ]; then
+	POVRAY_MINOR_VER=${POVRAY_MINOR_VER/rc/RC}
+	MY_PV="${POVRAY_MAJOR_VER}.${POVRAY_MINOR_VER}"
+else
+	MY_PV=${POVRAY_MAJOR_VER}
+fi
+
+DESCRIPTION="The Persistence of Vision Raytracer"
+HOMEPAGE="https://www.povray.org/"
+SRC_URI="https://github.com/POV-Ray/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~soap/distfiles/${P}_p20160914-fix-c++14.patch.bz2"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="debug +io-restrictions tiff X"
+
+DEPEND="
+	>=dev-libs/boost-1.50.0:=[threads(+)]
+	media-libs/libpng:0
+	sys-libs/zlib
+	virtual/jpeg:0
+	tiff? ( media-libs/tiff:0 )
+	X? ( media-libs/libsdl )"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	sys-devel/autoconf-archive"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-user-conf.patch
+	"${FILESDIR}"/${P}-automagic.patch
+	"${WORKDIR}"/${P}_p20160914-fix-c++14.patch
+	"${FILESDIR}"/${P}-gcc6-openexr.patch
+)
+
+src_prepare() {
+	[[ ${CHOST} == *-darwin* ]] && \
+		PATCHES+=( "${FILESDIR}"/${PN}-3.7.0_rc6-darwin-defaults.patch )
+	eapply "${FILESDIR}"/${P}-r1-boost-1.50.patch
+
+	pushd unix &>/dev/null || die
+		pushd config &>/dev/null || die
+		rm -rf \
+			acx_pthread.m4 \
+			ax_boost_base.m4 \
+			ax_boost_thread.m4 \
+			ax_compare_version.m4 \
+			ax_compiler_vendor.m4 \
+			ax_compiler_version.m4 || die
+		popd &>/dev/null || die
+	bash -x prebuild.sh || die
+	popd &>/dev/null || die
+
+	rm -rf libraries || die
+
+	# Change some directories that cannot be adjusted via configure
+	sed \
+		-e 's:${povsysconfdir}/$PACKAGE/$VERSION_BASE:${povsysconfdir}/'${PN}':g' \
+		-e 's:${povdatadir}/$PACKAGE-$VERSION_BASE:${povdatadir}/'${PN}':g' \
+		-e 's:${povdatadir}/doc/$PACKAGE-$VERSION_BASE:${povdatadir}/doc/'${PF}':g' \
+		-e 's:BOOST_THREAD_LIBS $LIBS:BOOST_THREAD_LIBS $LIBS -lboost_date_time:g' \
+		-e 's:"/usr/include":"'${EPREFIX}'/usr/include":' \
+		-e 's:"/usr/lib":"'${EPREFIX}'/usr/'$(get_libdir)'":' \
+		-i configure.ac || die
+
+	sed \
+		-e "s:^povlibdir = .*:povlibdir = @datadir@/${PN}:" \
+		-e "s:^povdocdir = .*:povdocdir = @datadir@/doc/${PF}:" \
+		-e "s:^povconfdir = .*:povconfdir = @sysconfdir@/${PN}:" \
+		-e 's:mkdir_p:MKDIR_P:g' \
+		-i Makefile.am || die
+
+	# The "+p" option on the test command line causes a pause and
+	# prompts the user to interact, so remove it.
+	sed -i -e "s:biscuit.pov -f +d +p:biscuit.pov -f +d:" Makefile.am || die
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# Fixes bug 71255
+	if [[ $(get-flag march) == k6-2 ]]; then
+		filter-flags -fomit-frame-pointer
+	fi
+
+	# The config files are installed correctly (e.g. povray.conf),
+	# but the code compiles using incorrect [default] paths
+	# (based on /usr/local...), so povray will not find the system
+	# config files without the following fix:
+	append-cppflags -DPOVLIBDIR=\\\"${EROOT}usr/share/${PN}\\\" -DPOVCONFDIR=\\\"${EROOT}etc/${PN}\\\"
+
+	# TODO: Restore OpenEXR if upstream start to support OpenEXR 3/imath
+	econf \
+		COMPILED_BY="Portage (Gentoo $(uname)) on $(hostname -f)" \
+		$(use_enable debug) \
+		$(use_enable io-restrictions) \
+		--without-openexr \
+		$(use_with tiff libtiff "${EPREFIX}/usr/$(get_libdir)") \
+		$(use_with X libsdl "${EPREFIX}/usr/$(get_libdir)") \
+		$(use_with X x "${EPREFIX}/usr/$(get_libdir)") \
+		$(usex tiff "" "NON_REDISTRIBUTABLE_BUILD=yes") \
+		--with-boost-libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--without-libmkl \
+		--disable-pipe \
+		--disable-static \
+		--disable-strip \
+		--disable-optimiz \
+		--disable-optimiz-arch
+}
+
+src_test() {
+	virtx default
+}
+
+pkg_preinst() {
+	# Copy the old config files if they are in the old location
+	# but do not yet exist in the new location.
+	# This way, they can be treated by CONFIG_PROTECT as normal.
+	local conf_file version_dir
+	for conf_file in "${ED}"/etc/"${PN}"/*; do
+		if [ ! -e "${EROOT}etc/${PN}/${conf_file}" ]; then
+			for version_dir in $(echo "${EROOT}"etc/"${PN}"/* | grep "^[0-9]" | sort -rn); do
+				if [ -e "${EROOT}etc/${PN}/${version_dir}/${conf_file}" ]; then
+					mv "${EROOT}etc/${PN}/${version_dir}/${conf_file}" "${EROOT}etc/${PN}" || die
+					elog "Note: ${conf_file} moved from ${EROOT}etc/povray/${version_dir}/ to ${EROOT}etc/povray/"
+					break
+				fi
+			done
+		fi
+	done
+}
diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index b414593f9cdc..e2d87e7f66e9 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,6 +1,6 @@
-AUX prusaslicer-2.3.0-miniz-zip-header.patch 284 BLAKE2B f73db5727dd6bffc39c658a291602ee6d86609244e9cd55a9eeb92a376cc4a579a94ef9f423e3072dbd01295b173c9291d615a56d5fb512cdccc93b205f665d0 SHA512 36e3c1e5d35f6cda26d8f74db3862cc5206478f7f79f35b28b3b3749291150764d1d907a3ccb67b4dcd1872fa5d0ac612791653dc67f3a56aeb98b68dc873f27
-DIST prusaslicer-2.3.3.tar.gz 40659538 BLAKE2B 1e1a1f7aeb34934bab03410e004a91e5ed76aaf930ff59e5b373b2e229018b6703d8da8ee7ab9085be25c5b3ce4ef39aeb38204336400867fac4a55f52c76bd4 SHA512 1f6b97e135202ad9de8f0bb212239ce2497de4205ea32f860b483473fb1f1783451d539a67cd97ef31f512a797b29c1067a1eff4134ea4a29b6218e5757657e2
+AUX prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch 1601 BLAKE2B 0c30817c51c1cf2a914b1faad9923109cbae111e8538d6c7257885ab29b5944bdb97b0927ced972133ffd8fe12d2fe36f0826bb9839e3cbedd716719b0d26881 SHA512 21377080026fa43bf23dc06c4925decd6c6e7827599caebc2ba2e7b3f4f4428fcd6fe4044f3bc3d0f059cf2ede043cafe2928622046bf9443bdd3f21f1ff6c59
 DIST prusaslicer-2.4.0.tar.gz 46397442 BLAKE2B 686232fddd3e2105db1325ab085b49f6f7a028a24ab90120daf94c53255f09b19411e0ff075bfe7abff138d3c276e8b5341ff6d59e267087bcd4568ac1113c47 SHA512 e923e4e6273dbcfc3e2bc0e28f9eb8cda8530747c0a834f48aea715d75ba1d02be9cfee043689efccdaee40de00114f7964e43accad245b9acd801b997868e3c
-EBUILD prusaslicer-2.3.3-r1.ebuild 2091 BLAKE2B b9193ade560bc73c04f5d09cf8ecf41ea58d18a4672df9244420935bea887a101847cc39e44f4bde6318c4091826f511890a2f48c05c682de3f11cebbea192cd SHA512 0892aa78102d8cc6984a379603ffec364750d82b34e07e0c618673e16c4185db8769a3808f3a77c267171537ce4600b2bf364d7755440a9e5c659712c758dd92
-EBUILD prusaslicer-2.4.0-r1.ebuild 1545 BLAKE2B 2254a52fa2a97ea6c96a24121fb69397fec2fe0fe7d61a81b96f509cb9268a03fc0fc83d4ff34d72fabb580b94a03b84cfb6b8b1234b289bd3392df07b6e57a3 SHA512 bf07c03079c87a822c688aaa0f1758828acfee6f079062ae1f341a2e352302185bcc60e5729cf0613865606dc1c51f5c710cb52f24a37c7af49d07317739a330
+DIST prusaslicer-2.4.1.tar.gz 55572739 BLAKE2B 8c6030560926e53c780847e7b8a0582055b59c6b8355a2bfff19552d730cc31fc929437aa6ed93fd38d024699129bd550a1b250523387658117d1f2764cfd2b7 SHA512 895388ec39e46e30ea7bdecba42793e898ceb6c6b331dad815a726ed2f7e2e8719c71c32c6ce7fff1781fa06aac8e9afb615784d3b2001bd0d6e24ba23f0866a
+EBUILD prusaslicer-2.4.0-r2.ebuild 1677 BLAKE2B 1dfd7abe15a808fce2e03d8b561e183e8174e5e3fa3655d760cf376b7b77042473ebcfc3bf648020002426f47b7a8bf599057da578b3a6027f95b7f4387a0d9a SHA512 0cd62a20ca04af6ca609a0020c3f80f300a7092b23b319b557ca557733d38bf6cecdad9889c8594f51b65a3d45f25d0930d4de59faa443be74171539a557b659
+EBUILD prusaslicer-2.4.1.ebuild 1684 BLAKE2B 3c3fe39d1dbf883743e9371eeae3d1f2f4ded1d0017e49847540808766dc1f48014842d5c9dff2ae973657aefd1bf61bddf73e69a812152093b8dbb1684b621c SHA512 f370197b41f4f21e2578f43c40bdcd9475544a8636b910ddd9a7597d1a70dced32a0e94b9ad4e5f891f286cb20e35d7ed1c1055ee374b3b18f3c6764d4443421
 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.3.0-miniz-zip-header.patch b/media-gfx/prusaslicer/files/prusaslicer-2.3.0-miniz-zip-header.patch
deleted file mode 100644
index 8fd587d3d481..000000000000
--- a/media-gfx/prusaslicer/files/prusaslicer-2.3.0-miniz-zip-header.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-https://bugs.gentoo.org/761541
---- a/src/libslic3r/miniz_extension.hpp	2021-01-11 08:01:51.000000000 -0500
-+++ b/src/libslic3r/miniz_extension.hpp	2021-01-12 01:16:10.503404521 -0500
-@@ -4,4 +4,5 @@
- #include <string>
- #include <miniz.h>
-+#include <miniz_zip.h>
- 
- namespace Slic3r {
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch b/media-gfx/prusaslicer/files/prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch
new file mode 100644
index 000000000000..d57eb8a31728
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch
@@ -0,0 +1,47 @@
+https://bugs.gentoo.org/834005
+https://github.com/prusa3d/PrusaSlicer/commit/0ffcfd8393457fd035576436752267c9a1e6bbcc
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -506,6 +506,9 @@ endif ()
+ 
+ # Find the Cereal serialization library
+ find_package(cereal REQUIRED)
++if (NOT TARGET cereal::cereal)
++    add_library(cereal::cereal ALIAS cereal)
++endif ()
+ 
+ # l10n
+ set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -126,7 +126,7 @@ if (NOT WIN32 AND NOT APPLE)
+     set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer")
+ endif ()
+ 
+-target_link_libraries(PrusaSlicer libslic3r cereal)
++target_link_libraries(PrusaSlicer libslic3r cereal::cereal)
+ if (APPLE)
+ #    add_compile_options(-stdlib=libc++)
+ #    add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
+--- a/src/libslic3r/CMakeLists.txt
++++ b/src/libslic3r/CMakeLists.txt
+@@ -358,7 +358,7 @@ find_package(JPEG REQUIRED)
+ target_link_libraries(libslic3r
+     libnest2d
+     admesh
+-    cereal
++    cereal::cereal
+     libigl
+     miniz
+     boost_libs
+--- a/src/slic3r/CMakeLists.txt
++++ b/src/slic3r/CMakeLists.txt
+@@ -270,7 +270,7 @@ endforeach()
+ 
+ encoding_check(libslic3r_gui)
+ 
+-target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
++target_link_libraries(libslic3r_gui libslic3r avrdude cereal::cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
+ 
+ if (MSVC)
+     target_link_libraries(libslic3r_gui Setupapi.lib)
diff --git a/media-gfx/prusaslicer/prusaslicer-2.4.0-r1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild
index 51a5b4378a17..f0e766df6b30 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.4.0-r1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,17 +22,17 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-cpp/eigen:3
-	>=dev-cpp/tbb-2021.4.0
+	>=dev-cpp/tbb-2021.4.0:=
 	>=dev-libs/boost-1.73.0:=[nls,threads(+)]
 	dev-libs/cereal
 	dev-libs/expat
 	dev-libs/glib:2
 	dev-libs/gmp:=
 	dev-libs/mpfr:=
-	>=media-gfx/openvdb-8.2
+	dev-libs/imath:=
+	>=media-gfx/openvdb-8.2:=
 	net-misc/curl
 	media-libs/glew:0=
-	media-libs/ilmbase:=
 	media-libs/libpng:0=
 	media-libs/qhull:=
 	sci-libs/libigl
@@ -49,6 +49,10 @@ DEPEND="${RDEPEND}
 	media-libs/qhull[static-libs]
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-build-with-cereal-1.3.1.patch
+)
+
 S="${WORKDIR}/${MY_PN}-version_${PV}"
 
 src_prepare() {
@@ -62,6 +66,8 @@ src_configure() {
 	setup-wxwidgets
 
 	local mycmakeargs=(
+		-DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB"
+
 		-DSLIC3R_BUILD_TESTS=$(usex test)
 		-DSLIC3R_FHS=ON
 		-DSLIC3R_GTK=3
diff --git a/media-gfx/prusaslicer/prusaslicer-2.3.3-r1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.4.1.ebuild
index 8504f9ddf60e..c402f1a876fd 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.3.3-r1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.4.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 WX_GTK_VER="3.0-gtk3"
 
-inherit xdg cmake desktop wxwidgets
+inherit cmake desktop wxwidgets xdg
 
 MY_PN="PrusaSlicer"
 
@@ -16,24 +16,23 @@ SRC_URI="https://github.com/prusa3d/${MY_PN}/archive/version_${PV}.tar.gz -> ${P
 LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gui test"
+IUSE="test"
 
-# tests fail to link with USE=-gui, bug #760096
-REQUIRED_USE="test? ( gui )"
 RESTRICT="!test? ( test )"
 
-# Please check if works with newer TBB on next release, bug #820785
 RDEPEND="
 	dev-cpp/eigen:3
-	<dev-cpp/tbb-2021.4.0:=
+	>=dev-cpp/tbb-2021.4.0:=
 	>=dev-libs/boost-1.73.0:=[nls,threads(+)]
 	dev-libs/cereal
 	dev-libs/expat
+	dev-libs/glib:2
 	dev-libs/gmp:=
-	>=dev-libs/miniz-2.1.0-r2
 	dev-libs/mpfr:=
-	>=media-gfx/openvdb-5.0.0
-	media-libs/ilmbase:=
+	dev-libs/imath:=
+	>=media-gfx/openvdb-8.2:=
+	net-misc/curl
+	media-libs/glew:0=
 	media-libs/libpng:0=
 	media-libs/qhull:=
 	sci-libs/libigl
@@ -41,26 +40,21 @@ RDEPEND="
 	>=sci-mathematics/cgal-5.0:=
 	sys-apps/dbus
 	sys-libs/zlib:=
-	gui? (
-		dev-libs/glib:2
-		media-libs/glew:0=
-		net-misc/curl
-		virtual/glu
-		virtual/opengl
-		x11-libs/gtk+:3
-		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	)
+	virtual/glu
+	virtual/opengl
+	x11-libs/gtk+:3
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
 "
 DEPEND="${RDEPEND}
 	media-libs/qhull[static-libs]
 "
 
-S="${WORKDIR}/${MY_PN}-version_${PV}"
-
 PATCHES=(
-	"${FILESDIR}/${PN}-2.3.0-miniz-zip-header.patch"
+	"${FILESDIR}"/${PN}-2.4.0-fix-build-with-cereal-1.3.1.patch
 )
 
+S="${WORKDIR}/${MY_PN}-version_${PV}"
+
 src_prepare() {
 	sed -i -e 's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g' version.inc || die
 	cmake_src_prepare
@@ -69,27 +63,20 @@ src_prepare() {
 src_configure() {
 	CMAKE_BUILD_TYPE="Release"
 
-	use gui && setup-wxwidgets
+	setup-wxwidgets
 
 	local mycmakeargs=(
+		-DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB"
+
 		-DSLIC3R_BUILD_TESTS=$(usex test)
 		-DSLIC3R_FHS=ON
 		-DSLIC3R_GTK=3
-		-DSLIC3R_GUI=$(usex gui)
+		-DSLIC3R_GUI=ON
 		-DSLIC3R_PCH=OFF
+		-DSLIC3R_STATIC=OFF
 		-DSLIC3R_WX_STABLE=ON
 		-Wno-dev
 	)
 
 	cmake_src_configure
 }
-
-src_install() {
-	cmake_src_install
-
-	if use gui; then
-		newicon -s 128 resources/icons/PrusaSlicer_128px.png PrusaSlicer.png
-		newicon -s 128 resources/icons/PrusaSlicer-gcodeviewer_128px.png PrusaSlicer-gcodeviewer.png
-		domenu src/platform/unix/Prusa{Slicer,Gcodeviewer}.desktop
-	fi
-}
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index d468716a32b4..ed3baf01fc0f 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 810 BLAKE2B fa910f059cc13a5c29c9a0cacb514b41951342f447f94a2475ca2dd1d3e7696e101e4d4bba128fa65bec3b945f6e06ce257d39d5839bb724d69525513c0c50c8 SHA512 9dae35f9d8d47ea645eae4e5d39eb940181dc17da2b117d1344566e45178b5e4205e3cad23c8289e3b2bf128763d7e48939a983fd393deb03798c1492740e017
-MISC metadata.xml 371 BLAKE2B b701f53c7e718867cc2f37c870352283ef41527cc475345ef9374678d684dccabf2451d0642d03784c6a04a4a2b66e1bbef9d1b189effa1bed010ed08723d2be SHA512 5527e74146c03c3fdf794b39767b225ea8619d87fb0197833cbda0208556bfce90b38f971a0714a312eb159f4ac7a5b6116e67456b0448e287987898fcf32d79
+EBUILD qrencode-4.1.1.ebuild 843 BLAKE2B 5d4f0d1aaeb63da22f5f011be430b30e823290abaac9b2786d19c8af0599b1bb203bf41c30d6045591fbd9b2e6b6d9de613f4a026ac49701273016202976b6dc SHA512 32cbdcf4aa452d766faf2862fc97a78e7adc185376f34face82944a3eead4fde30cc767a040453dbacb4e29cf9c496b5dbe62a5de2d8c8e54eae18aa69563dbd
+MISC metadata.xml 459 BLAKE2B 6098078226f047222b6eaeed16e7e66ab8cee01d25b042b325746532c4903fe5ebe7b2e8456d40e74ad232138ae5b95f0d51957895f794cf9b78739f84d9811c SHA512 b94b87b44d4af45350129dd2879f6463b1fc9e3803615c7bef28529f63cb3dad419dce43fd285fab357163f2b0193a4a453ba6f888d2a3b33c835a16ed841497
diff --git a/media-gfx/qrencode/metadata.xml b/media-gfx/qrencode/metadata.xml
index e13c48b5c567..f60e509e8b44 100644
--- a/media-gfx/qrencode/metadata.xml
+++ b/media-gfx/qrencode/metadata.xml
@@ -9,4 +9,7 @@
     <email>mgorny@gentoo.org</email>
     <name>Michał Górny</name>
   </maintainer>
+  <use>
+    <flag name="png">Enable PNG output support in qrencode tool</flag>
+  </use>
 </pkgmetadata>
diff --git a/media-gfx/qrencode/qrencode-4.1.1.ebuild b/media-gfx/qrencode/qrencode-4.1.1.ebuild
index e30ccba4b199..147bb0f0b5d4 100644
--- a/media-gfx/qrencode/qrencode-4.1.1.ebuild
+++ b/media-gfx/qrencode/qrencode-4.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,15 +10,17 @@ 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 ~x64-macos"
-IUSE="test"
+IUSE="png test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="media-libs/libpng:0="
+RDEPEND="
+	png? ( media-libs/libpng:0= )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_configure() {
 	local myconf=(
+		$(use_with png)
 		$(use_with test tests)
 		# TODO: figure out how to make SDL check fail as the SDL test
 		# program is not useful
diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index b06542f5daf8..cbb6e89ade5f 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -1,6 +1,6 @@
 AUX RT_5.8_fix_crop.patch 9040 BLAKE2B 740d181229fc5677735870d5b4f1b1887ae63aeb7242a038de15c726ee00b3e7b975ba099c2cb3d0e874790fcb8813cf7ab0418e2dddba17227afb6d7ab37d19 SHA512 0d62164d24a87318c7eac65003ede4b05845286dc1d39395239ee713d66011e3aba5caf18bc9e3240caacfa5cebd00b329e4e82fe9a8dccc5643538de0aa0538
 AUX RT_5.8_glibc234.patch 20080 BLAKE2B b6712195ba1d44c7c01d86b8d67c3649d13d3bb74077d2bb78741a99b1f9ee4a0aa1bbfe36488127a8982d50e36de09e26419cb02c979e7aa6362c3232232af1 SHA512 330ee4b1ef29dc6ec3e58dd3f5686f0ee935a2efbfb3ba55a9eeeac4ece7ff5594b7adfe7a9272d342fa5cbbe0387869a234e20baff25e4263963778015f4a4d
 DIST rawtherapee-5.8.tar.xz 12653148 BLAKE2B f6d4b9b177ad3b6a32b460ecfc7caf5d42a01b5dd4f24da29739f5a2e5936a8d36f9857c0e24bca11f077ab0626f08bbad59ef756792d12f93ef9516427cd2c4 SHA512 bc79586cd937dcaefc053e65faa2162de887d514e44980956d937c157c6d55c4f6e6a7a9b8f91f2d657ed2054814737b96d5d741674c1e5a961d7177433efe4e
-EBUILD rawtherapee-5.8-r1.ebuild 1881 BLAKE2B 89c72bc95616a18f77de4c957eb2e7165385e0abbb0ac29baad40c3020008aad76cf7a0cfc78477cabbd9624491622c15b5442e47636793c2d1e0af1a5879fe3 SHA512 3951959131230719e2d1b8b67a6331e71368c61119769871d98c3298b6986bd49c7040f8b90d4a0968f30486b62d1dbed164ab1b9efd2a09841c152c745d07cb
+EBUILD rawtherapee-5.8-r1.ebuild 1880 BLAKE2B c6e391f30041771921a141125ae75607e673dc0980eb9fe931ad843384334a698fb4b0fd58c0330f367a80b0687f72532a99d0a7c77ddf8e9eaea5361ee98505 SHA512 01e0b8fb824157d89367512004a42bb3b701876da11ac53a8f7118fd6b1a9f03c009d4ce99ab79f1afd0d3bb35bce75a14aee460a18557947190cd59025238bc
 EBUILD rawtherapee-5.8.ebuild 1697 BLAKE2B f2eb2c24f9cfdf7444026bf750c0fe68e13054f4d2926addbc8d41a02d0e6277a9099f28eae53ad35087e1ca7351225a8cd20005996e6464b9162fe516b92d56 SHA512 181b057cf7a23818a0756416e67cbb8ecc5d4c5951342237a8e5f13d7f72b1488b42ed9c2ae20dd76c77a62347a5220b68394fbe5b0726e19994629a0be14158
 MISC metadata.xml 396 BLAKE2B 21d743fc4870d7d6aa5a712581eff1e2d1a200718008c450f10a41ad7c95008cb1a45f882db1fbc98a9561645f27cee31c1f077d12b9e359a8527b31ce2785bc SHA512 174b118efc92edf6e412e3b0720d850ce65683b3025a7dec30596c82de071b05a25d796df2159a6e81a3571704984d53710999431d53e163207e77d95ceda2b7
diff --git a/media-gfx/rawtherapee/rawtherapee-5.8-r1.ebuild b/media-gfx/rawtherapee/rawtherapee-5.8-r1.ebuild
index 355493cb4aa7..211e0087f8e0 100644
--- a/media-gfx/rawtherapee/rawtherapee-5.8-r1.ebuild
+++ b/media-gfx/rawtherapee/rawtherapee-5.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://rawtherapee.com/shared/source/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="openmp tcmalloc"
 
 RDEPEND="
diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest
new file mode 100644
index 000000000000..da3a2fd0a9bb
--- /dev/null
+++ b/media-gfx/renderdoc/Manifest
@@ -0,0 +1,11 @@
+AUX renderdoc-1.18-analytics-off.patch 2552 BLAKE2B fbea7a5635acee3ae1f79850d0395ead2ef7e062c098b69458d56da0d41fdd1acbfbcc008317320767360450ac2d4b9eb0b026dad68599fe15cd7f1b0dd6e442 SHA512 1c3d73b0a5972f8fc7d6f9595ac032e3fc1709f2eced84f9f90ef35f543b908c9237f08e2933f10427e7facb609cf74d794aea8ecff72c72094ca53e3d1c1c7c
+AUX renderdoc-1.18-check-api-ver.patch 2745 BLAKE2B d438deba560c3ebcb7cf0ef1eb96d0d0ff8713f760138d15b6a0972d5afb051ff0e041df4a3aa4a8b08374bc9f1152d0f9f9b821d5e787d498163ef274b22888 SHA512 99d512192b5416e150171047ddb43ff258a3773d56c0172bc0d7ecc6b2748442fb41b84ebf2b497612b8861499522a88817e1cdd60f2fa2a78b1610c0bc7b61e
+AUX renderdoc-1.18-conditional-pyside.patch 2178 BLAKE2B b79e3fc960b83248a6991c0a5071e08e86e58bc9fd96a64f3d5bcdc392ac9104260c2159848d7def25ce3e6ef77d5003d537a469846ad0b859f5c415b012ae4f SHA512 9962aeb29c70711a922e9da5081ea8e73eb4d2acc055fa95298b4f6ac3bf8ce45ac61fa756948bc6e430d73153e28cdeea25437f057f7c6fe744ab9f53311f8b
+AUX renderdoc-1.18-env-home.patch 832 BLAKE2B f994893dceded797646b51f7e1a54cbd91c3175278f264c58bc13e67e22b5c2b085251a7b3e91923641e0566888d564145b3f67297fa623cba3a91034ac57208 SHA512 9a176468da8f5c5572349252a59def973ea178e15b7d5e5780cbd776c4ab08a8bf7939d0765f47386b60c582993d14ce5500fc788ce4d5395c6ef90c3f55801c
+AUX renderdoc-1.18-system-compress.patch 4699 BLAKE2B 4f37058deef1773a4a35b64415a8c8133b232374e419e490d81864ab0d1600b84a6f15a4760530078c489c97f7e12baff331cb845cdaced2fad4b2525987876d SHA512 08c38cbadb4cce24036dd22b185a78d4bca074c0d8caa44c1567aca414bc00a60a8adf73a2430930a620b624689be31f690fee92919d9245211f1189493ea091
+AUX renderdoc-1.18-system-flags.patch 845 BLAKE2B 0d4aae31af353b2d199ae66ec999beefa04e2105e6368305bb89359806fa99f4b7048c3d6c30a2787a3125718d3cbd7c97d3381f61f4f98a2e08730b5a22db02 SHA512 bd2692f14729360983f5ca4fb8af87085ab5bd209d82f3cfd99e7753d0dd406905a6280051aa5d1476b863566b385cdc28fbe9120d0d6f5efd78411af15b68ef
+AUX renderdoc-1.18-system-glslang.patch 9100 BLAKE2B a033377083705bbbccaa56657eccf632bcc5093bc86f319d3d30e94eed41bf849fe8e983dd9085b1628ecaed9ab0b358a487b40c8672239d4b32ee83e24ab1df SHA512 a0eea5b3c24092f30b2ec5c9fde327b4683839a34a5f11a64fb85b54d645f50b8e87f8fc59cb87450566caa3ad87aadc6baa7c8843256726cb8bd71fb0444dd0
+DIST renderdoc-1.18.tar.gz 46372788 BLAKE2B 3f07e29770e033d96f202fa143c7dd2e422750b28f33d14736c43f667fd45ec1b899e66136e415a2b947fbba7cdf0f822fe1dc6978c5146ae5432b44ed497a75 SHA512 4f7baba39ee8e346d00c2d80b5bf7370adebe0200ea2a95a339b3d207fc58f42bff109ffe922604ad49bcd3b5ff8d1ef2a282dd4aa16f09fd6b57aba06aa493d
+DIST swig-renderdoc-7.tar.gz 4006241 BLAKE2B 619f41239f4aef496264d61f44ae042cf80d3ff28491d452cf11ad07e898554c4a32df6119ee0e8e3de36e6bee61855358cd968ad01c9281976e24e9a6cac839 SHA512 5285a65924c069cfb9f73104ad8a95251badac4001293a1757b97ebead5953730c03289159741f82da4c5afe4f61f7c826b105eaf82df044ed2fa21810242c86
+EBUILD renderdoc-1.18-r1.ebuild 4806 BLAKE2B 37bafc11732e9930f1477ae614eb4e8be68394df82240cf2cdf68194aee393fe446a98d8e06578f7315205d07b2d39460e16541d5870b15dd657eee40bf05a88 SHA512 12813b7e5636f9c7b86f3022361a1c5fd44e075d633af4903f21b95cf0e74f169b1f7a2a2f316d24544f8d214f1d673cf8106dfd4cdeeb3cbd998d119519fce2
+MISC metadata.xml 551 BLAKE2B 6b04ab731ce0f9c836b958914e25fcd4a4b76032fd97ba41f6bda742e99a4b7404de51acac99fe4736ba87e488300e94dc1ef7621a780d0a8e453d0fde0430f2 SHA512 a1c2b5260d0265efe2e1294cb88aa1c43618654c7d989cd8f4bd6e919082ea1d37fed4df8a601a702b5b120d5fb5f6658d3e155c5346dacb17249fed629c04d0
diff --git a/media-gfx/renderdoc/files/renderdoc-1.18-analytics-off.patch b/media-gfx/renderdoc/files/renderdoc-1.18-analytics-off.patch
new file mode 100644
index 000000000000..4fd98c890bf4
--- /dev/null
+++ b/media-gfx/renderdoc/files/renderdoc-1.18-analytics-off.patch
@@ -0,0 +1,52 @@
+From 03d5a1f515bee326933e163eb3bd300deb4a5753 Mon Sep 17 00:00:00 2001
+From: Matthew Smith <matt@offtopica.uk>
+Date: Sun, 6 Feb 2022 09:54:17 +0000
+Subject: [PATCH 3/5] analytics: Default selection to off
+
+---
+ qrenderdoc/Code/Interface/PersistantConfig.h        | 4 ++--
+ qrenderdoc/Windows/Dialogs/AnalyticsPromptDialog.ui | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/qrenderdoc/Code/Interface/PersistantConfig.h b/qrenderdoc/Code/Interface/PersistantConfig.h
+index 5c074d27d..e37ecb3ce 100644
+--- a/qrenderdoc/Code/Interface/PersistantConfig.h
++++ b/qrenderdoc/Code/Interface/PersistantConfig.h
+@@ -588,8 +588,8 @@ DECLARE_REFLECTION_STRUCT(BugReport);
+       "``True`` if the user has selected to completely opt-out from and disable all analytics "    \
+       "collection and reporting.\n"                                                                \
+       "\n"                                                                                         \
+-      "Defaults to ``False``.");                                                                   \
+-  CONFIG_SETTING_VAL(public, bool, bool, Analytics_TotalOptOut, false)                             \
++      "Defaults to ``True``.");                                                                    \
++  CONFIG_SETTING_VAL(public, bool, bool, Analytics_TotalOptOut, true)                              \
+                                                                                                    \
+   DOCUMENT(                                                                                        \
+       "``True`` if the user has remained with analytics turned on, but has chosen to manually "    \
+diff --git a/qrenderdoc/Windows/Dialogs/AnalyticsPromptDialog.ui b/qrenderdoc/Windows/Dialogs/AnalyticsPromptDialog.ui
+index 5ec558161..e43574165 100644
+--- a/qrenderdoc/Windows/Dialogs/AnalyticsPromptDialog.ui
++++ b/qrenderdoc/Windows/Dialogs/AnalyticsPromptDialog.ui
+@@ -38,9 +38,6 @@
+         <property name="text">
+          <string>Gather anonymous low-detail statistics and submit automatically.</string>
+         </property>
+-        <property name="checked">
+-         <bool>true</bool>
+-        </property>
+        </widget>
+       </item>
+       <item>
+@@ -55,6 +52,9 @@
+         <property name="text">
+          <string>Do not gather or submit any statistics.</string>
+         </property>
++        <property name="checked">
++         <bool>true</bool>
++        </property>
+        </widget>
+       </item>
+      </layout>
+-- 
+2.35.1
+
diff --git a/media-gfx/renderdoc/files/renderdoc-1.18-check-api-ver.patch b/media-gfx/renderdoc/files/renderdoc-1.18-check-api-ver.patch
new file mode 100644
index 000000000000..a6af5645d14b
--- /dev/null
+++ b/media-gfx/renderdoc/files/renderdoc-1.18-check-api-ver.patch
@@ -0,0 +1,50 @@
+From 3d49524da4a28ecc1ee1a9b3f9ec455fc0263c81 Mon Sep 17 00:00:00 2001
+From: baldurk <baldurk@baldurk.org>
+Date: Mon, 31 Jan 2022 19:28:08 +0000
+Subject: [PATCH] Don't enable functionality not supported by the current
+ physical device
+
+---
+ .../driver/vulkan/wrappers/vk_device_funcs.cpp     | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp
+index 4d342e0123..a40c52d6ef 100644
+--- a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp
++++ b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp
+@@ -3171,7 +3171,7 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi
+         VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES_KHR,
+     };
+ 
+-    if(physProps.apiVersion >= VK_MAKE_VERSION(1, 2, 0))
++    if(RDCMIN(m_EnabledExtensions.vulkanVersion, physProps.apiVersion) >= VK_MAKE_VERSION(1, 2, 0))
+     {
+       VkPhysicalDeviceVulkan12Features avail12Features = {
+           VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_FEATURES,
+@@ -3376,11 +3376,13 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi
+ 
+     CheckDeviceExts();
+ 
++    uint32_t effectiveApiVersion = RDCMIN(m_EnabledExtensions.vulkanVersion, physProps.apiVersion);
++
+ #undef CheckExt
+-#define CheckExt(name, ver)                                                                      \
+-  if(!strcmp(createInfo.ppEnabledExtensionNames[i], "VK_" #name) || physProps.apiVersion >= ver) \
+-  {                                                                                              \
+-    m_EnabledExtensions.ext_##name = true;                                                       \
++#define CheckExt(name, ver)                                                                     \
++  if(!strcmp(createInfo.ppEnabledExtensionNames[i], "VK_" #name) || effectiveApiVersion >= ver) \
++  {                                                                                             \
++    m_EnabledExtensions.ext_##name = true;                                                      \
+   }
+ 
+     for(uint32_t i = 0; i < createInfo.enabledExtensionCount; i++)
+@@ -3391,7 +3393,7 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi
+     // for cases where a promoted extension isn't supported as the extension itself, manually
+     // disable them when the feature bit is false.
+ 
+-    if(physProps.apiVersion >= VK_MAKE_VERSION(1, 2, 0))
++    if(effectiveApiVersion >= VK_MAKE_VERSION(1, 2, 0))
+     {
+       if(supportedExtensions.find(VK_KHR_BUFFER_DEVICE_ADDRESS_EXTENSION_NAME) ==
+              supportedExtensions.end() &&
diff --git a/media-gfx/renderdoc/files/renderdoc-1.18-conditional-pyside.patch b/media-gfx/renderdoc/files/renderdoc-1.18-conditional-pyside.patch
new file mode 100644
index 000000000000..f09ff059528b
--- /dev/null
+++ b/media-gfx/renderdoc/files/renderdoc-1.18-conditional-pyside.patch
@@ -0,0 +1,54 @@
+From e6c0ee16967d3aa79f645a5a0aad0d50c20987f4 Mon Sep 17 00:00:00 2001
+From: Matthew Smith <matt@offtopica.uk>
+Date: Sun, 20 Feb 2022 09:19:03 +0000
+Subject: [PATCH] build: Only search for PySide2 if required
+
+---
+ qrenderdoc/CMakeLists.txt | 17 +++++++----------
+ 1 file changed, 7 insertions(+), 10 deletions(-)
+
+diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt
+index 05ad8ba89..e4470715e 100644
+--- a/qrenderdoc/CMakeLists.txt
++++ b/qrenderdoc/CMakeLists.txt
+@@ -154,9 +154,6 @@ ExternalProject_Add(custom_swig
+     BUILD_COMMAND ${GENERATOR_MAKE} ${GENERATOR_MAKE_PARAMS} > /dev/null 2>&1
+     INSTALL_COMMAND ${GENERATOR_MAKE} install > /dev/null 2>&1)
+ 
+-find_package(Shiboken2 QUIET)
+-find_package(PySide2 QUIET)
+-
+ set(PYTHON_LINK "${PYTHON_LIBRARY}")
+ 
+ # ensure we link the whole python library so that modules have all the exports they need
+@@ -251,7 +248,13 @@ option(QRENDERDOC_ENABLE_PYSIDE2 "Enable PySide2 if found" ON)
+ 
+ if(NOT QRENDERDOC_ENABLE_PYSIDE2)
+     message(STATUS "PySide2 integration disabled")
+-elseif(PySide2_FOUND AND Shiboken2_FOUND AND TARGET Shiboken2::libshiboken AND TARGET PySide2::pyside2)
++    file(APPEND
++         ${CMAKE_BINARY_DIR}/qrenderdoc/qrenderdoc_cmake.pri
++         "DEFINES+=PYSIDE2_ENABLED=0\n")
++else()
++    find_package(Shiboken2 QUIET REQUIRED)
++    find_package(PySide2 QUIET REQUIRED)
++
+     message(STATUS "Building with PySide2 ${PySide2_VERSION} from ${PySide2_DIR}")
+ 
+     if(NOT PYTHONLIBS_VERSION_STRING MATCHES "${SHIBOKEN_PYTHON_VERSION_MAJOR}.${SHIBOKEN_PYTHON_VERSION_MINOR}")
+@@ -280,12 +283,6 @@ elseif(PySide2_FOUND AND Shiboken2_FOUND AND TARGET Shiboken2::libshiboken AND T
+          "DEFINES+=PYSIDE2_ENABLED=1\n"
+          "DEFINES+=PYSIDE2_SYS_PATH=${PYSIDE_PYTHONPATH}\n"
+          "LIBS+=-lshiboken2${SHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX}\n")
+-else()
+-    message(STATUS "PySide2 not found - Qt will not be accessible in python scripting. See https://github.com/baldurk/renderdoc/wiki/PySide2")
+-
+-    file(APPEND
+-         ${CMAKE_BINARY_DIR}/qrenderdoc/qrenderdoc_cmake.pri
+-         "DEFINES+=PYSIDE2_ENABLED=0\n")
+ endif()
+ 
+ # generate the SWIG interface files
+-- 
+2.35.1
+
diff --git a/media-gfx/renderdoc/files/renderdoc-1.18-env-home.patch b/media-gfx/renderdoc/files/renderdoc-1.18-env-home.patch
new file mode 100644
index 000000000000..94ec9a9bbf14
--- /dev/null
+++ b/media-gfx/renderdoc/files/renderdoc-1.18-env-home.patch
@@ -0,0 +1,26 @@
+From 1a9c1bc02d2ed1b8e1723750d8e9eb9fa92fddef Mon Sep 17 00:00:00 2001
+From: Matthew Smith <matt@offtopica.uk>
+Date: Thu, 10 Feb 2022 18:02:37 +0000
+Subject: [PATCH] Use getenv("HOME") instead of getpwuid
+
+---
+ renderdoc/os/posix/linux/linux_stringio.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/renderdoc/os/posix/linux/linux_stringio.cpp b/renderdoc/os/posix/linux/linux_stringio.cpp
+index c704fc7fc..9a556ec16 100644
+--- a/renderdoc/os/posix/linux/linux_stringio.cpp
++++ b/renderdoc/os/posix/linux/linux_stringio.cpp
+@@ -595,8 +595,7 @@ rdcstr GetTempRootPath()
+ 
+ rdcstr GetAppFolderFilename(const rdcstr &filename)
+ {
+-  passwd *pw = getpwuid(getuid());
+-  const char *homedir = pw->pw_dir;
++  const char *homedir = getenv("HOME");
+ 
+   rdcstr ret = rdcstr(homedir) + "/.renderdoc/";
+ 
+-- 
+2.35.1
+
diff --git a/media-gfx/renderdoc/files/renderdoc-1.18-system-compress.patch b/media-gfx/renderdoc/files/renderdoc-1.18-system-compress.patch
new file mode 100644
index 000000000000..5b9a7472349b
--- /dev/null
+++ b/media-gfx/renderdoc/files/renderdoc-1.18-system-compress.patch
@@ -0,0 +1,142 @@
+From 8f16c974fc8ec0b286d803490baa6e00a83615cf Mon Sep 17 00:00:00 2001
+From: Matthew Smith <matt@offtopica.uk>
+Date: Sun, 30 Jan 2022 18:07:51 +0000
+Subject: [PATCH 2/3] build: Use system compression libs
+
+---
+ CMakeLists.txt                                |  6 +++
+ renderdoc/CMakeLists.txt                      | 48 +------------------
+ renderdoc/core/replay_proxy.cpp               |  2 +-
+ .../driver/shaders/dxbc/dxbc_container.cpp    |  2 +-
+ renderdoc/serialise/lz4io.h                   |  2 +-
+ 5 files changed, 10 insertions(+), 50 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cb0a2c7f6..0ee4fc629 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -419,6 +419,12 @@ elseif(UNIX)
+     endif()
+ endif()
+ 
++find_package(PkgConfig REQUIRED)
++find_package(miniz REQUIRED CONFIG)
++
++pkg_check_modules(lz4 REQUIRED IMPORTED_TARGET liblz4)
++pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)
++
+ # glslang package does not export a -config.cmake file.
+ option(GLSLANG_TARGET_DIR "Absolute path to glslangTargets.cmake directory")
+ include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake")
+diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt
+index 927e95fb9..5908be6de 100644
+--- a/renderdoc/CMakeLists.txt
++++ b/renderdoc/CMakeLists.txt
+@@ -218,56 +218,10 @@ set(sources
+     3rdparty/pugixml/pugixml.cpp
+     3rdparty/pugixml/pugixml.hpp
+     3rdparty/pugixml/pugiconfig.hpp
+-    3rdparty/lz4/lz4.c
+-    3rdparty/lz4/lz4.h
+     3rdparty/md5/md5.c
+     3rdparty/md5/md5.h
+-    3rdparty/miniz/miniz.c
+-    3rdparty/miniz/miniz.h
+     3rdparty/superluminal/superluminal.cpp
+     3rdparty/superluminal/superluminal.h
+-    3rdparty/zstd/bitstream.h
+-    3rdparty/zstd/compiler.h
+-    3rdparty/zstd/cpu.h
+-    3rdparty/zstd/debug.c
+-    3rdparty/zstd/debug.h
+-    3rdparty/zstd/entropy_common.c
+-    3rdparty/zstd/error_private.c
+-    3rdparty/zstd/error_private.h
+-    3rdparty/zstd/fse.h
+-    3rdparty/zstd/fse_compress.c
+-    3rdparty/zstd/fse_decompress.c
+-    3rdparty/zstd/hist.c
+-    3rdparty/zstd/hist.h
+-    3rdparty/zstd/huf.h
+-    3rdparty/zstd/huf_compress.c
+-    3rdparty/zstd/huf_decompress.c
+-    3rdparty/zstd/mem.h
+-    3rdparty/zstd/pool.c
+-    3rdparty/zstd/pool.h
+-    3rdparty/zstd/threading.c
+-    3rdparty/zstd/threading.h
+-    3rdparty/zstd/xxhash.c
+-    3rdparty/zstd/xxhash.h
+-    3rdparty/zstd/zstd.h
+-    3rdparty/zstd/zstd_common.c
+-    3rdparty/zstd/zstd_compress.c
+-    3rdparty/zstd/zstd_compress_internal.h
+-    3rdparty/zstd/zstd_decompress.c
+-    3rdparty/zstd/zstd_double_fast.c
+-    3rdparty/zstd/zstd_double_fast.h
+-    3rdparty/zstd/zstd_errors.h
+-    3rdparty/zstd/zstd_fast.c
+-    3rdparty/zstd/zstd_fast.h
+-    3rdparty/zstd/zstd_internal.h
+-    3rdparty/zstd/zstd_lazy.c
+-    3rdparty/zstd/zstd_lazy.h
+-    3rdparty/zstd/zstd_ldm.c
+-    3rdparty/zstd/zstd_ldm.h
+-    3rdparty/zstd/zstd_opt.c
+-    3rdparty/zstd/zstd_opt.h
+-    3rdparty/zstd/zstdmt_compress.c
+-    3rdparty/zstd/zstdmt_compress.h
+     3rdparty/stb/stb_image.h
+     3rdparty/stb/stb_image_write.h
+     3rdparty/stb/stb_image_resize.h
+@@ -580,7 +534,7 @@ endif()
+ add_library(renderdoc SHARED ${renderdoc_objects})
+ target_compile_definitions(renderdoc ${RDOC_DEFINITIONS})
+ target_include_directories(renderdoc ${RDOC_INCLUDES})
+-target_link_libraries(renderdoc ${RDOC_LIBRARIES} glslang SPIRV)
++target_link_libraries(renderdoc ${RDOC_LIBRARIES} glslang miniz::miniz PkgConfig::lz4 PkgConfig::zstd SPIRV)
+ 
+ add_dependencies(renderdoc renderdoc_libentry)
+ 
+diff --git a/renderdoc/core/replay_proxy.cpp b/renderdoc/core/replay_proxy.cpp
+index dea1e86cf..c9362e797 100644
+--- a/renderdoc/core/replay_proxy.cpp
++++ b/renderdoc/core/replay_proxy.cpp
+@@ -25,7 +25,7 @@
+ 
+ #include "replay_proxy.h"
+ #include <list>
+-#include "lz4/lz4.h"
++#include <lz4.h>
+ #include "replay/dummy_driver.h"
+ #include "serialise/lz4io.h"
+ 
+diff --git a/renderdoc/driver/shaders/dxbc/dxbc_container.cpp b/renderdoc/driver/shaders/dxbc/dxbc_container.cpp
+index ede1fdeb7..0c8fd4dfe 100644
+--- a/renderdoc/driver/shaders/dxbc/dxbc_container.cpp
++++ b/renderdoc/driver/shaders/dxbc/dxbc_container.cpp
+@@ -29,7 +29,7 @@
+ #include "common/common.h"
+ #include "core/settings.h"
+ #include "driver/shaders/dxil/dxil_bytecode.h"
+-#include "lz4/lz4.h"
++#include <lz4.h>
+ #include "md5/md5.h"
+ #include "serialise/serialiser.h"
+ #include "strings/string_utils.h"
+diff --git a/renderdoc/serialise/lz4io.h b/renderdoc/serialise/lz4io.h
+index 199fbbbc1..80fdf94f2 100644
+--- a/renderdoc/serialise/lz4io.h
++++ b/renderdoc/serialise/lz4io.h
+@@ -24,7 +24,7 @@
+ 
+ #pragma once
+ 
+-#include "lz4/lz4.h"
++#include <lz4.h>
+ #include "streamio.h"
+ 
+ class LZ4Compressor : public Compressor
+-- 
+2.35.1
+
diff --git a/media-gfx/renderdoc/files/renderdoc-1.18-system-flags.patch b/media-gfx/renderdoc/files/renderdoc-1.18-system-flags.patch
new file mode 100644
index 000000000000..64781875c3bd
--- /dev/null
+++ b/media-gfx/renderdoc/files/renderdoc-1.18-system-flags.patch
@@ -0,0 +1,26 @@
+From f83fea90e09d368cd3d8e119a2b3a6d7352d6de6 Mon Sep 17 00:00:00 2001
+From: Matthew Smith <matt@offtopica.uk>
+Date: Tue, 8 Feb 2022 18:42:02 +0000
+Subject: [PATCH] build: qrenderdoc: Respect CXX and LDFLAGS
+
+---
+ qrenderdoc/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt
+index 486832594..05ad8ba89 100644
+--- a/qrenderdoc/CMakeLists.txt
++++ b/qrenderdoc/CMakeLists.txt
+@@ -177,7 +177,9 @@ file(WRITE
+      "QMAKE_LINK=${CMAKE_CXX_COMPILER}\n"
+      "QMAKE_CXXFLAGS+=${warning_flags}\n"
+      "QMAKE_CXXFLAGS+=${QMAKE_CXXFLAGS}\n"
++     "QMAKE_CXXFLAGS+=${CMAKE_CXX_FLAGS}\n"
+      "QMAKE_LFLAGS+=${QMAKE_LDFLAGS}\n"
++     "QMAKE_LFLAGS+=${CMAKE_EXE_LINKER_FLAGS}\n"
+      "QMAKE_RPATHDIR+=${QMAKE_RPATHDIR}\n"
+      "\n"
+      "LIB_SUFFIX=${LIB_SUFFIX}\n"
+-- 
+2.35.1
+
diff --git a/media-gfx/renderdoc/files/renderdoc-1.18-system-glslang.patch b/media-gfx/renderdoc/files/renderdoc-1.18-system-glslang.patch
new file mode 100644
index 000000000000..12f6913002a0
--- /dev/null
+++ b/media-gfx/renderdoc/files/renderdoc-1.18-system-glslang.patch
@@ -0,0 +1,210 @@
+From 76052a739491c194e2d4aa3bace501083fb6c2a9 Mon Sep 17 00:00:00 2001
+From: Matthew Smith <matt@offtopica.uk>
+Date: Sun, 30 Jan 2022 17:19:47 +0000
+Subject: [PATCH 1/3] build: Use system glslang
+
+Requires -DGLSLANG_TARGET_DIR option.
+---
+ CMakeLists.txt                                | 11 +++
+ renderdoc/CMakeLists.txt                      |  2 +-
+ renderdoc/data/glsl_shaders.cpp               |  2 +-
+ renderdoc/driver/shaders/spirv/CMakeLists.txt | 91 +------------------
+ .../driver/shaders/spirv/glslang_compile.cpp  |  5 +-
+ .../driver/shaders/spirv/spirv_compile.cpp    |  4 +-
+ 6 files changed, 19 insertions(+), 96 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 127cee3fd..cb0a2c7f6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -419,6 +419,17 @@ elseif(UNIX)
+     endif()
+ endif()
+ 
++# glslang package does not export a -config.cmake file.
++option(GLSLANG_TARGET_DIR "Absolute path to glslangTargets.cmake directory")
++include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake")
++include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake")
++include("${GLSLANG_TARGET_DIR}/HLSLTargets.cmake")
++include("${GLSLANG_TARGET_DIR}/glslangTargets.cmake")
++include("${GLSLANG_TARGET_DIR}/SPIRVTargets.cmake")
++if(NOT TARGET glslang OR NOT TARGET SPIRV)
++  message(FATAL_ERROR "glslang or SPIRV target not found")
++endif()
++
+ add_subdirectory(renderdoc)
+ 
+ # these variables are handled within the CMakeLists.txt in qrenderdoc,
+diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt
+index 9174afb2a..927e95fb9 100644
+--- a/renderdoc/CMakeLists.txt
++++ b/renderdoc/CMakeLists.txt
+@@ -580,7 +580,7 @@ endif()
+ add_library(renderdoc SHARED ${renderdoc_objects})
+ target_compile_definitions(renderdoc ${RDOC_DEFINITIONS})
+ target_include_directories(renderdoc ${RDOC_INCLUDES})
+-target_link_libraries(renderdoc ${RDOC_LIBRARIES})
++target_link_libraries(renderdoc ${RDOC_LIBRARIES} glslang SPIRV)
+ 
+ add_dependencies(renderdoc renderdoc_libentry)
+ 
+diff --git a/renderdoc/data/glsl_shaders.cpp b/renderdoc/data/glsl_shaders.cpp
+index d11cd0b88..d33f18099 100644
+--- a/renderdoc/data/glsl_shaders.cpp
++++ b/renderdoc/data/glsl_shaders.cpp
+@@ -26,7 +26,7 @@
+ #include "common/common.h"
+ #include "common/formatting.h"
+ #include "driver/shaders/spirv/glslang_compile.h"
+-#include "glslang/glslang/Public/ShaderLang.h"
++#include <glslang/Public/ShaderLang.h>
+ #include "os/os_specific.h"
+ 
+ #define GLSL_HEADERS(HEADER) \
+diff --git a/renderdoc/driver/shaders/spirv/CMakeLists.txt b/renderdoc/driver/shaders/spirv/CMakeLists.txt
+index 68229cd36..088645fbe 100644
+--- a/renderdoc/driver/shaders/spirv/CMakeLists.txt
++++ b/renderdoc/driver/shaders/spirv/CMakeLists.txt
+@@ -1,91 +1,3 @@
+-set(glslang_dir ${RDOC_SOURCE_DIR}/3rdparty/glslang)
+-set(glslang_sources
+-    ${glslang_dir}/OGLCompilersDLL/InitializeDll.cpp
+-    ${glslang_dir}/OGLCompilersDLL/InitializeDll.h
+-    ${glslang_dir}/SPIRV/GlslangToSpv.cpp
+-    ${glslang_dir}/SPIRV/GlslangToSpv.h
+-    ${glslang_dir}/SPIRV/GLSL.std.450.h
+-    ${glslang_dir}/SPIRV/GLSL.ext.AMD.h
+-    ${glslang_dir}/SPIRV/GLSL.ext.EXT.h
+-    ${glslang_dir}/SPIRV/GLSL.ext.KHR.h
+-    ${glslang_dir}/SPIRV/GLSL.ext.NV.h
+-    ${glslang_dir}/SPIRV/hex_float.h
+-    ${glslang_dir}/SPIRV/InReadableOrder.cpp
+-    ${glslang_dir}/SPIRV/Logger.cpp
+-    ${glslang_dir}/SPIRV/Logger.h
+-    ${glslang_dir}/SPIRV/SpvBuilder.cpp
+-    ${glslang_dir}/SPIRV/SpvBuilder.h
+-    ${glslang_dir}/SPIRV/SpvTools.cpp
+-    ${glslang_dir}/SPIRV/SpvTools.h
+-    ${glslang_dir}/SPIRV/SpvPostProcess.cpp
+-    ${glslang_dir}/SPIRV/spvIR.h
+-    ${glslang_dir}/glslang/GenericCodeGen/CodeGen.cpp
+-    ${glslang_dir}/glslang/GenericCodeGen/Link.cpp
+-    ${glslang_dir}/glslang/Include/arrays.h
+-    ${glslang_dir}/glslang/Include/BaseTypes.h
+-    ${glslang_dir}/glslang/Include/Common.h
+-    ${glslang_dir}/glslang/Include/ConstantUnion.h
+-    ${glslang_dir}/glslang/Include/InfoSink.h
+-    ${glslang_dir}/glslang/Include/InitializeGlobals.h
+-    ${glslang_dir}/glslang/Include/intermediate.h
+-    ${glslang_dir}/glslang/Include/PoolAlloc.h
+-    ${glslang_dir}/glslang/Include/ResourceLimits.h
+-    ${glslang_dir}/glslang/Include/revision.h
+-    ${glslang_dir}/glslang/Include/ShHandle.h
+-    ${glslang_dir}/glslang/Include/Types.h
+-    ${glslang_dir}/glslang/MachineIndependent/Constant.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/glslang_tab.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/glslang_tab.cpp.h
+-    ${glslang_dir}/glslang/MachineIndependent/gl_types.h
+-    ${glslang_dir}/glslang/MachineIndependent/iomapper.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/iomapper.h
+-    ${glslang_dir}/glslang/MachineIndependent/gl_types.h
+-    ${glslang_dir}/glslang/MachineIndependent/InfoSink.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/Initialize.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/Initialize.h
+-    ${glslang_dir}/glslang/MachineIndependent/Intermediate.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/intermOut.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/IntermTraverse.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/limits.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/linkValidate.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/LiveTraverser.h
+-    ${glslang_dir}/glslang/MachineIndependent/localintermediate.h
+-    ${glslang_dir}/glslang/MachineIndependent/parseConst.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/ParseContextBase.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/ParseHelper.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/ParseHelper.h
+-    ${glslang_dir}/glslang/MachineIndependent/PoolAlloc.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/propagateNoContraction.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/propagateNoContraction.h
+-    ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpAtom.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpContext.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpContext.h
+-    ${glslang_dir}/glslang/MachineIndependent/preprocessor/Pp.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpScanner.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpTokens.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpTokens.h
+-    ${glslang_dir}/glslang/MachineIndependent/reflection.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/reflection.h
+-    ${glslang_dir}/glslang/MachineIndependent/RemoveTree.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/RemoveTree.h
+-    ${glslang_dir}/glslang/MachineIndependent/ScanContext.h
+-    ${glslang_dir}/glslang/MachineIndependent/Scan.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/Scan.h
+-    ${glslang_dir}/glslang/MachineIndependent/ShaderLang.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/SymbolTable.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/SymbolTable.h
+-    ${glslang_dir}/glslang/MachineIndependent/Versions.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/Versions.h
+-    ${glslang_dir}/glslang/MachineIndependent/attribute.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/attribute.h
+-    ${glslang_dir}/glslang/OSDependent/osinclude.h
+-    ${glslang_dir}/glslang/Public/ShaderLang.h)
+-
+-if(UNIX)
+-    list(APPEND glslang_sources
+-        ${glslang_dir}/glslang/OSDependent/Unix/ossource.cpp)
+-endif()
+-
+ set(sources
+     glslang_compile.cpp
+     glslang_compile.h
+@@ -108,8 +20,7 @@ set(sources
+     spirv_processor.h
+     spirv_disassemble.cpp
+     spirv_stringise.cpp
+-    var_dispatch_helpers.h
+-    ${glslang_sources})
++    var_dispatch_helpers.h)
+ 
+ add_definitions(-DAMD_EXTENSIONS)
+ add_definitions(-DNV_EXTENSIONS)
+diff --git a/renderdoc/driver/shaders/spirv/glslang_compile.cpp b/renderdoc/driver/shaders/spirv/glslang_compile.cpp
+index ee1b02c73..ec0db8345 100644
+--- a/renderdoc/driver/shaders/spirv/glslang_compile.cpp
++++ b/renderdoc/driver/shaders/spirv/glslang_compile.cpp
+@@ -29,8 +29,8 @@
+ #undef min
+ #undef max
+ 
+-#include "glslang/glslang/Include/Types.h"
+-#include "glslang/glslang/Public/ShaderLang.h"
++#include <glslang/Include/Types.h>
++#include <glslang/Public/ShaderLang.h>
+ 
+ static bool glslang_inited = false;
+ rdcarray<glslang::TShader *> *allocatedShaders = NULL;
+@@ -129,6 +129,7 @@ static TBuiltInResource DefaultResources = {
+     /*.maxTaskWorkGroupSizeY_NV =*/1,
+     /*.maxTaskWorkGroupSizeZ_NV =*/1,
+     /*.maxMeshViewCountNV =*/4,
++    /*.maxDualSourceDrawBuffersEXT =*/1,
+ 
+     /*.limits*/
+     {
+diff --git a/renderdoc/driver/shaders/spirv/spirv_compile.cpp b/renderdoc/driver/shaders/spirv/spirv_compile.cpp
+index a2cc2bec4..a494cc69d 100644
+--- a/renderdoc/driver/shaders/spirv/spirv_compile.cpp
++++ b/renderdoc/driver/shaders/spirv/spirv_compile.cpp
+@@ -31,8 +31,8 @@
+ #undef min
+ #undef max
+ 
+-#include "glslang/SPIRV/GlslangToSpv.h"
+-#include "glslang/glslang/Public/ShaderLang.h"
++#include <glslang/SPIRV/GlslangToSpv.h>
++#include <glslang/Public/ShaderLang.h>
+ 
+ rdcstr rdcspv::Compile(const rdcspv::CompilationSettings &settings, const rdcarray<rdcstr> &sources,
+                        rdcarray<uint32_t> &spirv)
+-- 
+2.35.1
+
diff --git a/media-gfx/renderdoc/metadata.xml b/media-gfx/renderdoc/metadata.xml
new file mode 100644
index 000000000000..81616f84b9f6
--- /dev/null
+++ b/media-gfx/renderdoc/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>matthew@gentoo.org</email>
+    <name>Matthew Smith</name>
+  </maintainer>
+  <use>
+    <flag name="pyside2">
+      Expose the QRenderdoc UI to Python scripting to allow for customisation
+    </flag>
+    <flag name="qt5">
+       Build and install the qrenderdoc GUI
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="github">baldurk/renderdoc</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-gfx/renderdoc/renderdoc-1.18-r1.ebuild b/media-gfx/renderdoc/renderdoc-1.18-r1.ebuild
new file mode 100644
index 000000000000..f669767e6d38
--- /dev/null
+++ b/media-gfx/renderdoc/renderdoc-1.18-r1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# The swig fork is required for compatibility with both provided and
+# 3rd-party Python scripts.  Required patch was sent to upstream in
+# 2014: https://github.com/swig/swig/pull/251
+MY_SWIG_VER=7
+MY_SWIG=swig-${PN}-${MY_SWIG_VER}
+
+AUTOTOOLS_AUTO_DEPEND="no"
+DOCS_BUILDER="sphinx"
+DOCS_DIR="docs"
+PYTHON_COMPAT=( python3_{9,10} )
+inherit autotools cmake optfeature python-single-r1 docs xdg
+
+DESCRIPTION="A stand-alone graphics debugging tool"
+HOMEPAGE="https://renderdoc.org https://github.com/baldurk/renderdoc"
+SRC_URI="
+	https://github.com/baldurk/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	qt5? ( https://github.com/baldurk/swig/archive/${PN}-modified-${MY_SWIG_VER}.tar.gz -> ${MY_SWIG}.tar.gz )
+"
+
+# renderdoc: MIT
+#   + cmdline: BSD (not compatible with upstream lib)
+#   + farm fresh icons: CC-BY-3.0
+#   + half: MIT (not compatible with system dev-libs/half)
+#   + include-bin ZLIB (upstream doesn't exist anymore, maintained in tree)
+#   + md5: public-domain
+#   + plthook: BSD-2
+#   + pugixml: MIT
+#   + radeon gpu analyzer: MIT
+#   + source code pro: OFL-1.1
+#   + stb: public-domain
+#   + tinyfiledialogs: ZLIB
+#   + docs? ( sphinx.paramlinks: MIT )
+# swig: GPL-3+ BSD BSD-2
+LICENSE="BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="pyside2 qt5"
+REQUIRED_USE="doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	app-arch/lz4:=
+	app-arch/zstd:=
+	dev-libs/miniz
+	dev-util/glslang
+	x11-libs/libX11
+	x11-libs/libxcb:=
+	x11-libs/xcb-util-keysyms
+	virtual/opengl
+	pyside2? (
+		$(python_gen_cond_dep '
+			dev-python/pyside2[${PYTHON_USEDEP}]
+		')
+	)
+	qt5? (
+		${PYTHON_DEPS}
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5[ssl]
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+	)
+"
+DEPEND="${RDEPEND}"
+# qtcore provides qmake, which is required to build the qrenderdoc gui.
+BDEPEND="
+	x11-base/xorg-proto
+	virtual/pkgconfig
+	qt5? (
+		${AUTOTOOLS_DEPEND}
+		${PYTHON_DEPS}
+		dev-libs/libpcre
+		dev-qt/qtcore:5
+		sys-devel/bison
+	)
+"
+
+PATCHES=(
+	# The analytics seem very reasonable, and even without this patch
+	# they are NOT sent before the user accepts.  But default the
+	# selection to off, just in case.
+	"${FILESDIR}"/${PN}-1.18-analytics-off.patch
+
+	# Only search for PySide2 if pyside2 USE flag is set.
+	# Bug #833627
+	"${FILESDIR}"/${PN}-1.18-conditional-pyside.patch
+
+	# Pass CXXFLAGS and LDFLAGS through to qmake when qrenderdoc is
+	# built.
+	"${FILESDIR}"/${PN}-1.18-system-flags.patch
+
+	# Needed to prevent sandbox violations during build.
+	"${FILESDIR}"/${PN}-1.18-env-home.patch
+
+	"${FILESDIR}"/${PN}-1.18-system-glslang.patch
+	"${FILESDIR}"/${PN}-1.18-system-compress.patch
+
+	# Check physical device API version and supported extensions.  Fixes
+	# segfault on some GPU/driver combinations.  Will be in release 1.19
+	"${FILESDIR}"/${PN}-1.18-check-api-ver.patch
+)
+
+DOCS=( util/LINUX_DIST_README )
+
+pkg_setup() {
+	use qt5 && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	# Do not unpack the swig sources here.  CMake will do that if
+	# required.
+	unpack ${P}.tar.gz
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Remove the calls to install the documentation files.  Instead,
+	# install them with einstalldocs.
+	sed -i '/share\/doc\/renderdoc/d' \
+		"${S}"/CMakeLists.txt "${S}"/qrenderdoc/CMakeLists.txt \
+		|| die 'sed remove doc install failed'
+
+	# Assumes that the build directory is "${S}"/build, which it is not.
+	sed -i "s|../build/lib|${BUILD_DIR}/lib|" \
+		"${S}"/docs/conf.py \
+		|| die 'sed patch doc sys.path failed'
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Build system does not know that this is a tagged release, as
+		# we just have the tarball and not the git repository.
+		-DBUILD_VERSION_STABLE=ON
+
+		-DENABLE_EGL=ON
+		-DENABLE_GL=ON
+		-DENABLE_GLES=ON
+		-DENABLE_PYRENDERDOC=$(usex qt5)
+		-DENABLE_QRENDERDOC=$(usex qt5)
+		-DENABLE_VULKAN=ON
+
+		# Upstream says that this option is unsupported and should not
+		# be used yet.
+		-DENABLE_WAYLAND=OFF
+
+		-DENABLE_XCB=ON
+		-DENABLE_XLIB=ON
+
+		# Path to glslang*.cmake.
+		-DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
+
+		# renderdoc_capture.json is installed here
+		-DVULKAN_LAYER_FOLDER="${EPREFIX}"/etc/vulkan/implicit_layer.d
+	)
+
+	use qt5 && mycmakeargs+=(
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DRENDERDOC_SWIG_PACKAGE="${DISTDIR}"/${MY_SWIG}.tar.gz
+		-DQRENDERDOC_ENABLE_PYSIDE2=$(usex pyside2)
+	)
+
+	use pyside2 && mycmakeargs+=( -DPYTHON_CONFIG_SUFFIX=-${EPYTHON} )
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	docs_compile
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "android remote contexts" dev-util/android-tools
+	optfeature "vulkan contexts" media-libs/vulkan-loader
+}
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index b6f5a8c09e59..c9d77bdc6f0f 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -15,8 +15,8 @@ DIST backends-1.0.31.tar.gz 5731445 BLAKE2B d70691acbd3f5788a26bab6b35eeb243801b
 DIST sane-backends-1.0.32.tar.gz 7349442 BLAKE2B 8841542ffd520b38bbeb532eaae7cce803f0bd868cae7edc28d2138729dcffb5a2a0908b56c16c25ffbba539525331c12c259e1768e105de1bdd1419d29efe83 SHA512 416757d9a69bbc18678d1f16a024ba5a949c571204a68f36009d416be28723886ccea71daaa7da90d20eac9696cd44e567802d6c21c3fc5914b97213bbedb6d5
 DIST sane-backends-1.1.1.tar.gz 7447569 BLAKE2B 02ac1822beabb12f19ce2d7c053f0f727313d13e0f9380325492a2f0048094f78a118f7659b4c6e39b60c4ea319d862a242f8866a67c84e5649d9ae2691d9473 SHA512 25bd9f90d550cfe6a6d01c48e83716a53f4b0e3a294287e455ecb5e5b80c8fe1699f45c6c87f694475cceb85745c70597e18a7b1094669d5091c5fb183dfe94d
 EBUILD sane-backends-1.0.31-r2.ebuild 8554 BLAKE2B 20ef534583a3052e699693472bca958e49426353f6f1cf8e721690657c657e1411fcbf7c49ed28a84367afbd5e1f40a70bf3551a06d3d0e169b3dbdf6d89075e SHA512 690006aef47beaaad149199cef5ee694a6fa74913e30dc61d14aedd1558ef8e14f238e88d71c316a4c38f29f4e6a069f9ccd8508f5ec536864d192eb504105cf
-EBUILD sane-backends-1.0.32.ebuild 8434 BLAKE2B 3266f481f30c51032f38e2fecffcb7da1c593796c0cc9dd3c37dd30b6e1e647555456c2ad15b2aeb99a02aef9175df9cf4fd615552cc0198055f0ed8264f6c06 SHA512 6d2b2cf5760dc6af74a633b1e4d8d3bcd9b3ab72263fc018c7cdb72710a03909ace6391c795ab5006bccc13b2197877d5c0b681f45c2f949b693c644cce1704a
+EBUILD sane-backends-1.0.32.ebuild 8433 BLAKE2B 171bfb4784cd459892eb1af18a388afa2179e7a6f25d593b4ea3472ee10e5053166388abc7852fa8dfabff77d89b148d603fe6b478fccae6fcc14c48c8e311af SHA512 791a43bb5c125eec8689d16de978f62ed935771a5a8e0dc8f23b7c30c6dd127197dc4d83472a7308d7287309b40206eadc7c756d0051983fc853d3bc80f14043
 EBUILD sane-backends-1.1.1-r1.ebuild 9238 BLAKE2B a5aa2ead9603d4a40398b72640e5eb03e8c58fbbf88e87b0b3104bae86255a752f06fc23ea2d6e4eb6b39265e2b9c89cd316fab8b00389193649af373b0372b4 SHA512 a957f5790f1f00019a285b45d187fcad2fa45bf71dac5e9086dc4cf612567bb45d4c1bc38b4c2cce834e8e7e98ab71694a3be5d8519bf1ecc1c684c133d5b633
-EBUILD sane-backends-1.1.1-r2.ebuild 9356 BLAKE2B 579607e4b73c21d5f205b8e5161616a81395b9527ee2c156f8909b7de84918404c08b410ab42a48ab615c3877c64a018a960073e0455eb4db81d86aa53654c1d SHA512 36e9089b1730411c55245154bef71c1f30ae8badab7693cfc4829c3d307549d19ebd1fe915f865efc3fc1adbfe0ed9a0af887cc02bca854d6ed82d8435800627
+EBUILD sane-backends-1.1.1-r2.ebuild 9349 BLAKE2B 2e89b8f941354bd632ed5965cd6402b53a2db212e4050e1c618aa5e952c35fda2a9eb6769b26cc85b62dbcc6209ae7da8abf600a49afe2b3839020ad85cb504a SHA512 79605c0a0cb97d4c49c6f864de91a7824eea945ae2cd36346e81e3e61116816ae687525bcfae6a75c67857effa7e866aef3f7edc3fc0eb21f52226c16b4a9400
 EBUILD sane-backends-1.1.1.ebuild 8440 BLAKE2B b14c51c8dd771e70117410a05a8eacd130d0a4d0970024352f22ca95710225882ab9742027124cd48ee64518f16f7d1bc0cd8a2380100708ec9f9f5d7042ed48 SHA512 6a8175155ce2b837d31d81efb9d5b0ba994966bffa6e99e9eb527abe5decde19ed518e52e2c3a533a93cc03f912391477a02aafb23148a0effc5ea79165c354e
 MISC metadata.xml 267 BLAKE2B cf3ca2583acfc7c5d4b3e053cef4d72bf240aa58c54e8a0f72b9393ee8587bd587d4a88bad4b041cfd50d4465879ed546afa71b6e4570477b376a92ab47bb415 SHA512 d471748b0a9f7d7d4aca203c6bd1ff222f3faa455e7d1df2f8437a188922a40e3a656a5e20032256caf58d664e0f723e25055871e62d102e0c677264942b6fb1
diff --git a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
index 151b7623b2af..a1fde1572b8b 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
@@ -128,7 +128,7 @@ SRC_URI="https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="
diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild
index 010ba000e55f..80b22961182a 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild
@@ -128,7 +128,7 @@ SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="
diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index 887b33356526..b843b190fa7e 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -5,6 +5,6 @@ AUX scrot-1.7.bash-completion 2622 BLAKE2B febdade3f2b5cb094d9162e66d3b0d0b8ad72
 DIST scrot-1.4.tar.gz 157779 BLAKE2B ba844f8bc500c468d028ce62ae57bd6a9fa0e403df6f05dd217722a9115456b70a38aabd7ccb0da53d855b9971d0f5948f82545ca0c8cceb75ede0d4546e27c1 SHA512 8423e7b2658f3e0ccf30f61e122016469226328adf8b1e511aeb031dd2655ae66582651e2d046c7c35d23efb98656369a02b59e711980481ddc4db24c299ee11
 DIST scrot-1.7.tar.gz 178463 BLAKE2B 021c68c5ebd19ec08c072cff73fe1ebb7ffd179dfcde6e13656779e2ee1357cf0fdbba1d4beb2fc5dc9c8c4cd28008acaa462068eec3192cea6687ac58cd653a SHA512 3ef2b547d561a85213ef0075af3034020f00168253d3b84ef94578f0b8534f9a7389c808f8fcd0c619358a14f41601fee407d08d63c397b9892ba9fc2db23f88
 EBUILD scrot-1.4.ebuild 1041 BLAKE2B 102bdca2640dbf9f60dcd2ce84ccb3de19ac324c7c414dc100497330211cf94ef0561196105371d4e693bf14811327f44f180db60439e34998c9e26749f8fbd9 SHA512 497beb7ba0f8d166fc2fba6a56e2b1b5fdda555f6ce61d0710e9f6fdc1f42a8c522312b0b9e7ace764e15c75df116607270e59a2513d7648c8c670a63c4039b6
-EBUILD scrot-1.7-r2.ebuild 1302 BLAKE2B defeac3087442ab4f00ce5358db0a204f7386f8aade58376a7975a49275798dce76c44ba01247c07a5762b87cae364d1caea31273348db01404cae154d2de871 SHA512 97d7540e3a2249d2974795775271d58784e46d5820a782e0483ee29f6cb49d5976d44625ff35e7eba474d9389b18ffaf91842554693f1c679842ee16dd96f2e9
-EBUILD scrot-9999.ebuild 1142 BLAKE2B a819b2a28a10a06938b17340bb2abe23cb8e0e6723ed1dabac4b1a7ef00c4fbb44776b25ad8621a42e76bffff97727043d13668341fcc264cd8e8f930e2bb6b4 SHA512 eaf6c790a31412eccfed31cbab17941570d75f123b79cf68e6b8c69983f8b09e0bae2369be8f7fbca85ba6feae9afaafab0d87c0a7cdcbc921fe69d0607f9eb5
+EBUILD scrot-1.7-r2.ebuild 1345 BLAKE2B c9cb2fe468199e582abc2f16267ac682297014b5b6a40bbd7071dc9f2981b47831cb351e8b9196d40cb03b1e8a16c6c08d7cb4607bc0afb1171694d4163a0e3b SHA512 e5a5d10cc618d778edcc787d66960103427e1b4e90693f6cd252791d3f85df86735f76103568789240b3a5bc6376b525982ea354db2d5e8af4e164ba6f222074
+EBUILD scrot-9999.ebuild 1185 BLAKE2B 34b75c4161a6779ba2c6ee4feab4746b9014969cad9a1b91c60dec6b54d718a3abb1ab690996eb3b87ef95e9a44c3feac8f91a4b2e3b327bb422512cb3129543 SHA512 ecd6ac7653c734327e20022dfe0e3841708356a833b47a8b211abea541a7b5e01212a4be99b6fe6f1e190e3d621d6150fb76943a6239e28db1d163ab8b7984dc
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/media-gfx/scrot/scrot-1.7-r2.ebuild b/media-gfx/scrot/scrot-1.7-r2.ebuild
index 3aa2ef8c7e06..80c9a38d57e0 100644
--- a/media-gfx/scrot/scrot-1.7-r2.ebuild
+++ b/media-gfx/scrot/scrot-1.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,6 +36,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto
+	elibc_musl? ( sys-libs/queue-standalone )
 "
 BDEPEND="
 	sys-devel/autoconf-archive
diff --git a/media-gfx/scrot/scrot-9999.ebuild b/media-gfx/scrot/scrot-9999.ebuild
index 80d7728667d6..1052ef88647a 100644
--- a/media-gfx/scrot/scrot-9999.ebuild
+++ b/media-gfx/scrot/scrot-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -35,6 +35,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto
+	elibc_musl? ( sys-libs/queue-standalone )
 "
 BDEPEND="
 	sys-devel/autoconf-archive
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index e0dd10c2f29c..581c12c481c7 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,4 +1,4 @@
 AUX 0.30.14-vala-0.52.8-compat.patch 650 BLAKE2B eda8739a4f8f6fad9ad026c97542d2ec3683f3fdf86ce34be9235a49a5569ad0a67b1ab454eba6c5d13bf9a3fb2a1cefb52d8d0a6103d4d84e2d0efbafd55e0f SHA512 0736a02880c5db69a85cc3eedc444aa6d95f96e3e31695b078a416384f9751d8c8cc550d42ba6dfc1a59f98b0b30b6f87ea5136988d404ee08fe9e6b0c752ec9
 DIST shotwell-0.30.14.tar.xz 6524680 BLAKE2B 321406d3731a4baa333c3820ee46e8dc12ca9a340c7f1ac3824ee894fa2826b7efa3ee7a27f551d62043e5f22199042befb5063cc67cefd27830e19db7d7f661 SHA512 bd899ac099ec4760f6119804812ef9314c9261c18273309abfb1dccc675b9e4a561c0abea1c46ea0dbbab9f5c00301d840b52714f97ec06548c180a77871db7c
-EBUILD shotwell-0.30.14.ebuild 1924 BLAKE2B 621a5b324cea63f36f9c2304f92e38dfcb1a58b8fac99089bb525b63f97c616516f21996468f8c9df6df353b40287267311255718c7dde7e78aa367a8c01ee75 SHA512 0d18fa262a44118c9ac26bce8abdd5c02e4094d9782a070db9831efc4718d73cd469ea219aa3f8beac9ff6800d42e318eb692e37105b98abb616f21a30a1f19b
+EBUILD shotwell-0.30.14.ebuild 1923 BLAKE2B 83b7923b289af84094f97e6b6ea7796b68f61c330fb3f74bc8ea19814dfe7f4ae043a26f012ac4b142c7c1d9d0f50be04d4853c7db703ceec28dcd6e91bd5f81 SHA512 2d06a80f5ac0cf2c590771fcc24e936f9ba531701b7facdd685fcddabf54eec5242b853bc0e5777ab1bd6b3f8092912eff20f9d47f6d7106a1c62e2bd880a593
 MISC metadata.xml 796 BLAKE2B e0c9ab623e0fdaa1df57951920708e41359ae3d2d8335ebb4012c5428a965d426698adb4a8e0815116a07b03e55e3d44aa11e5dcffe4d82bac8e733eaf302995 SHA512 c21d7613c7f200cdd15bf45d201a83c38fa5fc52f40c833d638afc48cef17a8e9db016b29ec3ff95e625cfc750e8bff7603a4fe2ea26fbad1504b581da43c165
diff --git a/media-gfx/shotwell/shotwell-0.30.14.ebuild b/media-gfx/shotwell/shotwell-0.30.14.ebuild
index d0ee07286e10..bdf8289fffc9 100644
--- a/media-gfx/shotwell/shotwell-0.30.14.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
 IUSE="opencv udev"
 
 DEPEND="
diff --git a/media-gfx/solvespace/Manifest b/media-gfx/solvespace/Manifest
index 6603861e83da..d44e67f03d32 100644
--- a/media-gfx/solvespace/Manifest
+++ b/media-gfx/solvespace/Manifest
@@ -1,9 +1,7 @@
-AUX solvespace-2.3-gcc11-missing-limits-inc.patch 490 BLAKE2B f06ccd75f0973a782c01fa3f4c61c0fa8512471ee9f04140040ebf7552424c0a67d602b39a72449cb00ee7019bd6f47f8c25b7d27cf098e8c6670ec18105a3c2 SHA512 d56d529956ec37f4e84924b570cc90082f7d806ddb35297ad8e9854a50b19e15ab5d62e9a18cfdcfef2f90ca6ac669b96ee32be265a9fba79f3cfc34e186bf78
+AUX solvespace-3.0-use-system-mimalloc.patch 2152 BLAKE2B 242a4aefcf2ebf985503b6574218ea01fa5b8e79c7e1c7f34e42ebbf5d01611d8b46fc27cf59e6cffc61c466bcba7f593686a4bed08dd90b96dcfe9a73ae5191 SHA512 460a94a41b8517e8ced27edde6a456b4d5bce03b72887a89022866fecc7e18930c81549542850a2b184a7f6282b754e3ab8292b542684dbde5986e3c36b29ef2
 DIST libdxfrw-0.6.3-0b7b7b709d9299565db603f878214656ef5e9ddf.tar.gz 691804 BLAKE2B 84c90a591fac71144e9e13aace7c1a00dfc1bd6f27b0bcde6b60541f5b5d3ccc04ae1c759f60cb467445cc884840d04bf4613b5cc553fbbf6951cac33a084d50 SHA512 9ab498aa7f369be79d800e8ca5ec55fa54be79d0778937b81d4c8da776b3419cb8a75400b54b205efc338da32e2e781afd0bed1bd8efed1a0b212dc8682a2615
-DIST libdxfrw-0.6.3-87ff1082f49b1286a033ac8f38fe8dde0975bb8b.tar.gz 691867 BLAKE2B bd3414930efe8cc1185a20f889dda3ec8ea46e40d3a1a4c24975683fc444161acdff576a1f40c34203e523e88bacf3841c50928340e7865650a113e65375f930 SHA512 0f8e2561887fbc5101787f0d7818328864b5c4a679ef539fcdbda8c124ab4a808663f9ba645d397f154596eab1eb7c6f0bdf3883bf6975392863e01bada3a1f0
 DIST mimalloc-2.0.1-dc6bce256d4f3ce87761f9337977dff3d8b1776c.tar.gz 912721 BLAKE2B 0129b7650303be9bd82e9a99f6a81cc5aacf93c4e2d36813520d59b61410c00c2b84979b9aa901dc9f67a88110115882987b4eceebe880c548adbab4a328c415 SHA512 bf1770ae0225207aa072a103cb13671ac8a759aeb8e81dec6b1bf4192dc87c927153c34a4d6c42075d021cdb4a294a2863e9f70eed386912ccc0699120bd967e
-DIST solvespace-2.3.tar.gz 2115940 BLAKE2B 67e2d81e0a609d0344a6f28d33a78609b01c7105785f93aa1124f0592fe0e31d4846e6dd406339b2ef2c5f3961f91302a73c5391fe2e0f435e78c3a97ed67612 SHA512 9d22e467337591cd9a4935124d18733b8337f5785ab5738f4a94300f283ffe7d313569e379ae77e509d14182ffde8c9db7beaebb46ea7c0507c6b05010fe1a56
 DIST solvespace-3.0.tar.gz 2734860 BLAKE2B 2efc9d98723c60abdb1c76ac086c40ff2f9b8bc9c315978731493d115fa55a080176ef48d930e3b503c0de0604dbfd2bc3bd99a581f359eb07a23034d09f84bf SHA512 b07b41fac1d67c5350082600a2f09e3fa611a1273e0c93ff93d11a7a1dbf550ff33465686eaff04fdb8350d1fe854ab0301d8723ef31cc65c687ba59cb89187f
-EBUILD solvespace-2.3.ebuild 1628 BLAKE2B 2763c9e29f727a538d7a3260579002e9ec9f572722c325e474a8404781173b31f69268f886d146d658ebcc62a2ce54e2cc6e35b03eec45e74c200c97ee6901f2 SHA512 57c8916c7a47cba610c7d31f94bce30e399945246c663f9341bf0bd6649488f631676b900f6ea5ab64643a4860d682166f369c52aa91e9f4a0f0901e95f63c18
-EBUILD solvespace-3.0.ebuild 2330 BLAKE2B a75e5bbe011ae3f4a6a835b54c0211ea2ee18fce7c47777bd842b79b66a0558ce450e80f0bb92ad31effcd6763304a69d4581c600227f5ce2a3bbe8aed497a90 SHA512 c89ce7412a40b0c91b13a34e461c7754f335ce5a45c7f8890b08de6bee67e60bea2f5de993f98b071e765d1762ce2c512438e8d647c2cb9b1a711bf674b52f80
-MISC metadata.xml 1286 BLAKE2B daef7a13ee9a34ffddfc1faf94210260d62c87c520e00ca510ee2970a05ad4fdda2c09d5b50fee275436db430ed7157aca8e335b3d94c8020d530aeb5a18d3cc SHA512 5ad429d9405de73e01659919586155c5869eee2f1439787d7b43be54283e5c551dd4a759584030ffa72eae16d3261c236365e4d45fb45e52640a27b645cbbea5
+EBUILD solvespace-3.0-r1.ebuild 1786 BLAKE2B 303a7d12a3ef91fc0520417d6ced7a21bdcfac79a2ef8e3e2d1a942809eea4dafa3cfd6b76a2e81e3f2debf0b5eeabc8aaecf41aae6dd21442b2b71b5a12412c SHA512 87e7e999c21d3817abc917803fdafd4e4a6724859d6cd3453a3a55c111c8435b4f57524aea844fe191ad21a522b9a00be4cbad288fa9ffe21154acde81e0ea64
+EBUILD solvespace-3.0.ebuild 2469 BLAKE2B f8d06068c8f416024b405da6211997f96cf1bda775d5babbfa56037f3464f6f89734ed0d1d390d07790e82afedd69a22f7d6c47eb7f848414c3ef3de0cea73af SHA512 365c4c221b45fe1c1a89752b3a27b8569fc9dd532c263861b18b5e7df1140e3f856b8f99a4da9095367ea11ef8d374595f38ec54bf456eeb9b0b0632b974c4b9
+MISC metadata.xml 1412 BLAKE2B 9e8d28887adc01031dcda861ff81f3305ccec16dac607507e5bf6709224a8a5ce386747aac79a3751f7f53705be33df437dca0a537e6c9ba0ac7970ec0d387c6 SHA512 3a45ceecede799ac90d01444561fb204e4f0b44fe9d5a309c00373e970b42a9f776a50fd5f54af744fb94fe28507b91686b5e9e3dda6175c93a8971710b7af1d
diff --git a/media-gfx/solvespace/files/solvespace-2.3-gcc11-missing-limits-inc.patch b/media-gfx/solvespace/files/solvespace-2.3-gcc11-missing-limits-inc.patch
deleted file mode 100644
index ecf02fc5c01e..000000000000
--- a/media-gfx/solvespace/files/solvespace-2.3-gcc11-missing-limits-inc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://bugs.gentoo.org/790776
---- a/src/exportvector.cpp
-+++ b/src/exportvector.cpp
-@@ -4,6 +4,7 @@
- // Copyright 2008-2013 Jonathan Westhues.
- //-----------------------------------------------------------------------------
- #include <libdxfrw.h>
-+#include <limits>
- #include "solvespace.h"
- 
- VectorFileWriter::~VectorFileWriter() {
---- a/src/importdxf.cpp
-+++ b/src/importdxf.cpp
-@@ -1,3 +1,5 @@
-+#include <limits>
-+
- #include "solvespace.h"
- #include "libdxfrw.h"
- #include "libdwgr.h"
diff --git a/media-gfx/solvespace/files/solvespace-3.0-use-system-mimalloc.patch b/media-gfx/solvespace/files/solvespace-3.0-use-system-mimalloc.patch
new file mode 100644
index 000000000000..485a870449b2
--- /dev/null
+++ b/media-gfx/solvespace/files/solvespace-3.0-use-system-mimalloc.patch
@@ -0,0 +1,74 @@
+From eb8cd7a379503a0206d6ff43a2ce0749a32f2a37 Mon Sep 17 00:00:00 2001
+From: Matthew Smith <matthew@gentoo.org>
+Date: Fri, 11 Mar 2022 18:11:27 +0000
+Subject: [PATCH] build: Use system mimalloc
+
+---
+ CMakeLists.txt     |  8 --------
+ src/CMakeLists.txt | 12 +++---------
+ 2 files changed, 3 insertions(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bdd3670..93485d7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -173,14 +173,6 @@ endif()
+ message(STATUS "Using in-tree libdxfrw")
+ add_subdirectory(extlib/libdxfrw)
+ 
+-message(STATUS "Using in-tree mimalloc")
+-set(MI_OVERRIDE OFF CACHE BOOL "")
+-set(MI_BUILD_SHARED OFF CACHE BOOL "")
+-set(MI_BUILD_OBJECT OFF CACHE BOOL "")
+-set(MI_BUILD_TESTS OFF CACHE BOOL "")
+-add_subdirectory(extlib/mimalloc EXCLUDE_FROM_ALL)
+-set(MIMALLOC_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/extlib/mimalloc/include)
+-
+ if(WIN32 OR APPLE)
+     # On Win32 and macOS we use vendored packages, since there is little to no benefit
+     # to trying to find system versions. In particular, trying to link to libraries from
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5ac7b41..9f4e2f7 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -55,10 +55,7 @@ target_include_directories(slvs
+ 
+ target_link_libraries(slvs
+     ${util_LIBRARIES}
+-    mimalloc-static)
+-
+-add_dependencies(slvs
+-    mimalloc-static)
++    mimalloc)
+ 
+ set_target_properties(slvs PROPERTIES
+     PUBLIC_HEADER ${CMAKE_SOURCE_DIR}/include/slvs.h
+@@ -213,9 +210,6 @@ add_library(solvespace-core STATIC
+     ${solvespace_core_HEADERS}
+     ${solvespace_core_SOURCES})
+ 
+-add_dependencies(solvespace-core
+-    mimalloc-static)
+-
+ target_link_libraries(solvespace-core
+     ${OpenMP_CXX_LIBRARIES}
+     dxfrw
+@@ -223,7 +217,7 @@ target_link_libraries(solvespace-core
+     ${ZLIB_LIBRARY}
+     ${PNG_LIBRARY}
+     ${FREETYPE_LIBRARY}
+-    mimalloc-static)
++    mimalloc)
+ 
+ if(Backtrace_FOUND)
+     target_link_libraries(solvespace-core
+@@ -430,4 +424,4 @@ if(APPLE)
+             COMMENT "Bundling executable solvespace-cli"
+             VERBATIM)
+     endif()
+-endif()
+\ No newline at end of file
++endif()
+-- 
+2.35.1
+
diff --git a/media-gfx/solvespace/metadata.xml b/media-gfx/solvespace/metadata.xml
index 854484aea793..b4f0df25e5ad 100644
--- a/media-gfx/solvespace/metadata.xml
+++ b/media-gfx/solvespace/metadata.xml
@@ -5,6 +5,10 @@
         <email>ktrace@yandex.ru</email>
         <name>Victor Kustov</name>
     </maintainer>
+    <maintainer type="person">
+        <email>matthew@gentoo.org</email>
+        <name>Matthew Smith</name>
+    </maintainer>
     <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
diff --git a/media-gfx/solvespace/solvespace-2.3.ebuild b/media-gfx/solvespace/solvespace-2.3.ebuild
deleted file mode 100644
index 25975546f2b6..000000000000
--- a/media-gfx/solvespace/solvespace-2.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DXFRW_COMMIT="87ff1082f49b1286a033ac8f38fe8dde0975bb8b"
-DXFRW_PV="0.6.3"
-DXFRW_P="libdxfrw-${DXFRW_PV}-${DXFRW_COMMIT}"
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Parametric 2d/3d CAD"
-HOMEPAGE="http://solvespace.com"
-SRC_URI="https://github.com/solvespace/solvespace/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/solvespace/libdxfrw/archive/${DXFRW_COMMIT}.tar.gz -> ${DXFRW_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-cpp/gtkmm:2.4=
-	dev-cpp/pangomm:1.4
-	dev-libs/json-c:=
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/glew:0=
-	media-libs/libpng:0=
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# NOTE: please keep commit hash actually when version up
-GIT_COMMIT_HASH="4d1e1341d926ac356b295d5cc3d61c7a6cd7d07d"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3-gcc11-missing-limits-inc.patch
-)
-
-src_prepare() {
-	rm -r "extlib/libdxfrw" || die  "rm extlib/libdxfrw failed"
-	mv "${WORKDIR}/libdxfrw-${DXFRW_COMMIT}" "extlib/libdxfrw" || die "move libdxfrw-${DXFRW_COMMIT} failed"
-	sed -i '/include(GetGitCommitHash)/d' CMakeLists.txt || die 'remove GetGitCommitHash by sed failed'
-	# fixed in master already
-	sed -i -e 's/CHAR_WIDTH/CHAR_WIDTH_/' src/textwin.cpp src/toolbar.cpp src/win32/w32main.cpp src/ui.h || die 'sed failed'
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DGIT_COMMIT_HASH="${GIT_COMMIT_HASH}"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/solvespace/solvespace-3.0-r1.ebuild b/media-gfx/solvespace/solvespace-3.0-r1.ebuild
new file mode 100644
index 000000000000..73b691667314
--- /dev/null
+++ b/media-gfx/solvespace/solvespace-3.0-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# solvespace's libdxfrw is quite heavily modified and incompatible with
+# the upstream libdxfrw.
+DXFRW_COMMIT="0b7b7b709d9299565db603f878214656ef5e9ddf"
+DXFRW_PV="0.6.3"
+DXFRW_P="libdxfrw-${DXFRW_PV}-${DXFRW_COMMIT}"
+
+inherit cmake toolchain-funcs xdg
+
+DESCRIPTION="Parametric 2d/3d CAD"
+HOMEPAGE="http://solvespace.com"
+SRC_URI="https://github.com/solvespace/solvespace/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/solvespace/libdxfrw/archive/${DXFRW_COMMIT}.tar.gz -> ${DXFRW_P}.tar.gz"
+
+# licenses
+# + SolveSpace (GPL-3+)
+# |- Bitstream Vera (BitstreamVera)
+# + libdxfrw (GPL-2+)
+
+IUSE="openmp"
+KEYWORDS="~amd64"
+LICENSE="BitstreamVera GPL-2+ GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	dev-cpp/atkmm:0
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:3.0
+	dev-cpp/pangomm:1.4
+	dev-libs/glib:2
+	dev-libs/json-c:=
+	dev-libs/libsigc++:2
+	dev-libs/libspnav
+	dev-libs/mimalloc:=
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libglvnd
+	media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/cairo
+	x11-libs/gtk+:3
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.0-use-system-mimalloc.patch )
+
+# This is shown to the user in the UI and --version.
+MY_HASH="0e0b0252e23dd5bd4ae82ababcc54c44aee036d6"
+
+pkg_pretend() {
+	if use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	rm -r extlib/libdxfrw || die
+	mv "${WORKDIR}"/libdxfrw-${DXFRW_COMMIT} extlib/libdxfrw || die
+
+	sed -i '/include(GetGitCommitHash)/d' CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_OPENMP=$(usex openmp)
+		-DGIT_COMMIT_HASH=${MY_HASH}
+	)
+
+	cmake_src_configure
+}
diff --git a/media-gfx/solvespace/solvespace-3.0.ebuild b/media-gfx/solvespace/solvespace-3.0.ebuild
index 81b40ddc7973..071b43161fe7 100644
--- a/media-gfx/solvespace/solvespace-3.0.ebuild
+++ b/media-gfx/solvespace/solvespace-3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,9 +19,15 @@ SRC_URI="https://github.com/solvespace/solvespace/archive/v${PV}.tar.gz -> ${P}.
 	https://github.com/solvespace/libdxfrw/archive/${DXFRW_COMMIT}.tar.gz -> ${DXFRW_P}.tar.gz
 	https://github.com/microsoft/mimalloc/archive/${MIMALLOC_COMMIT}.tar.gz -> ${MIMALLOC_P}.tar.gz"
 
+# licenses
+# + SolveSpace (GPL-3+)
+# |- Bitstream Vera (BitstreamVera)
+# + libdxfrw (GPL-2+)
+# + mimalloc (MIT)
+
 IUSE="openmp"
 KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-3"
+LICENSE="BitstreamVera GPL-2+ GPL-3+ MIT"
 SLOT="0"
 
 RDEPEND="dev-cpp/atkmm:=
diff --git a/media-gfx/ttfautohint/Manifest b/media-gfx/ttfautohint/Manifest
new file mode 100644
index 000000000000..fa31d7402d13
--- /dev/null
+++ b/media-gfx/ttfautohint/Manifest
@@ -0,0 +1,3 @@
+DIST ttfautohint-1.8.4.tar.gz 3539332 BLAKE2B 314c5196f01828d180d3b3e9b09c66fad9c8a8958f36003c8ae0d54b945391cb53c40f92cf57ff70e57b5a21a6aa46bc14ff9419d4b877421fdc2500ce9004e3 SHA512 983517c360f8e65ccbf17f28f045f1c0a45078707f2e30f465a7b6df4014f0ec212780ea2703bc16be1a3c6ede70f71ea3051c067fbfd06eff40ae3b20840eec
+EBUILD ttfautohint-1.8.4-r1.ebuild 1044 BLAKE2B b5d1552c9ee06e69fa6f4506629cc16044f3d45e582667f4c991e28e454a0faa2a53f5d795fd46f9a4c61ecbae96bb8c461d2e940bd10299f6577d0e73624054 SHA512 4c6309cb41788f6d0a8d59a574b3a947a7eda14d5a6fbccaa23e5d1b9a22c41ffe55086b0e285a53d84724723b2bbe05e9234dc09cd66c153f80a4c4de76c9ae
+MISC metadata.xml 451 BLAKE2B 3bfb21c66cf3e415000f370130a6771cefcc04e9dab8122fff9187c03bb622318104c0c927a340915f155a82e0022cf635d9567f1dc459645b6a33d61f5f9bc3 SHA512 d1488ee772b8f88f489b63c14abf58308e82337b693c4b72661d82c2f268ba8ef63f6bd1d8bd202c87ee0690e86c4d335707b4cb8d21a0d20a8fb24f0e044aff
diff --git a/media-gfx/ttfautohint/metadata.xml b/media-gfx/ttfautohint/metadata.xml
new file mode 100644
index 000000000000..f444ebcb9d85
--- /dev/null
+++ b/media-gfx/ttfautohint/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>matthew@gentoo.org</email>
+  <name>Matthew Smith</name>
+</maintainer>
+<maintainer type="person" proxied="yes">
+  <email>lssndrbarbieri@gmail.com</email>
+  <name>Alessandro Barbieri</name>
+</maintainer>
+<slots>
+  <subslots>reflect soname of libttfautohint</subslots>
+</slots>
+</pkgmetadata>
diff --git a/media-gfx/ttfautohint/ttfautohint-1.8.4-r1.ebuild b/media-gfx/ttfautohint/ttfautohint-1.8.4-r1.ebuild
new file mode 100644
index 000000000000..f24247ff6504
--- /dev/null
+++ b/media-gfx/ttfautohint/ttfautohint-1.8.4-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools qmake-utils
+
+DESCRIPTION="Application and libary for hinting TrueType fonts"
+HOMEPAGE="https://freetype.org/ttfautohint"
+SRC_URI="https://download.savannah.gnu.org/releases/freetype/${P}.tar.gz"
+
+LICENSE="|| ( FTL GPL-2+ )"
+SLOT="0/1.0.3"
+KEYWORDS="~amd64"
+IUSE="qt5"
+
+RDEPEND="
+	media-libs/freetype
+	media-libs/harfbuzz:=
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-apps/help2man
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	# Don't invoke git to get the version number.
+	sed "s|m4_esyscmd.*VERSION)|${PV//_/-}|" -i configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--without-doc
+		--with-qt="$(usex qt5 $(qt5_get_bindir) no)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	doman frontend/ttfautohint.1
+	use qt5 && doman frontend/ttfautohintGUI.1
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 3d9233da1290..d2630a62505f 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -2,5 +2,5 @@ AUX tuxpaint-0.9.27-Makefile.patch 6903 BLAKE2B dddb1788115b730648dbfdf87e78a706
 DIST tuxpaint-0.9.24.tar.gz 15561675 BLAKE2B 971baec8b7728cbb54a2a45b604c152a9620d0f6a1856cca99482ad0fd76f2a4493aab81f54e10e5da4d81800b0e3506cb73dda0e00510ef966b0c98f8aa5cb4 SHA512 a4ee9eea833f9a6313701a4686f9f276570df84436c68d9a3d04e9448a8ea00833207e1034965e15145be744194c7b9a7d3c91bdfa3489d06a61de84b64cc723
 DIST tuxpaint-0.9.27.tar.gz 14292992 BLAKE2B f1337b828604bac968325437eba21046f871a0e07e049f2d3568f44adac400e729f4c6d46bcba9eddf9078089aaf55aab7d0774fb5ab126b96d317b59e37ee00 SHA512 197c6e23fb772edd57614e34dec23e160ece528b58e4a17d67fe4100c58cbcd6c4b5efccfbb24ca760b3a20755230b47f4e3e49969e75ba04ce722102a7f2dd9
 EBUILD tuxpaint-0.9.24-r1.ebuild 1646 BLAKE2B 9c716616a56836e366dde79a3a944387a3dea15f54a20e95623234dbc9c75873166fcca9df3293cc5b3106618abbc09bb5ad8170433cceaaa5cdcf8babe05520 SHA512 aae79850b1e031edad079010423963491c4b2eacc0fa0a5e734a9ccdd318c667b8f5102ae626f994d7c9c1ce4c63680806690a5a77c31c1a87dae4163618f235
-EBUILD tuxpaint-0.9.27.ebuild 1349 BLAKE2B 804d9d407cb6a128ca41f9bc1475aec72ad54d1df0a2cac4ec4fb82fd5ac17cd7ccbd1876e87733125706d55f72d95b85923fb343a29869d7d7fb8259d8ec586 SHA512 207b5d08297ea342c8b99b68720f45d1fb52e5c012fea3f0b4bacecac6f5e3f8501c55f3829a31096b767ca5eac448b82750dba2cfac81494ec3a1d903f5c13e
+EBUILD tuxpaint-0.9.27.ebuild 1346 BLAKE2B 950329a51d3409e6950f500206cfa753f6a1893b8cec32e2d5501f8e0605f5a1f11a66d0f6e05ea177ca1615f60d9bbde9c93d5d7e597743a90506084a8a39ea SHA512 4b488c3739b21bfe29cb2b2d834e6b81425b5118b23313bb7e55ce24a9eba616935e3b7f0d030cb54820acd09dda6e0910274c8f2d9638f712b96a0e48d6495e
 MISC metadata.xml 846 BLAKE2B 41e02607ee8987a7663ba72e7459a1845b73d9992e4939322db2b4ce654d06efb0d5acc935decb776aa50a20990244d0e422e4c32532fa0f17a76a9a637ac734 SHA512 59465c99f8f91e4def6ffd37f7bcfd22cb208c1f9dcbdd11c764e4f55d1e9db75169254b9ca3ed7642f57d45d4d10e9f97c80d5139cb0b80ccd20dc540185ade
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
index 393cf77443e4..e66114bec40f 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
 	app-text/libpaper
author	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
commit	4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree	356496503d52354aa6d9f2d36126302fed5f3a73 /media-gfx
parent	fcc5224904648a8e6eb528d7603154160a20022f (diff)