gentoo resync : 02.02.2022

93 files changed, 2764 insertions, 837 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index b0aeab92dfc9..26b909eeb063 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/ahoviewer/Manifest b/media-gfx/ahoviewer/Manifest
index 9018ca3f6250..cabfb0d72ba6 100644
--- a/media-gfx/ahoviewer/Manifest
+++ b/media-gfx/ahoviewer/Manifest
@@ -1,5 +1,7 @@
 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
 MISC metadata.xml 432 BLAKE2B 865f9803f9a469564f6d4fee9bffa7eb94d268db2358281cc8b744f5de2b88dc9abcd69b8610113c797bd0eeb574985d3775f9259884f57cbe9eda47aa051ac7 SHA512 60ecc403ad49d4a774ec98ef8850041f358d1903d345eaf63d7429e6c96e11a34e3dc5ed7e1470fb851fbdef9b3b2d965d9d04303c1b8f61691857354cca5924
diff --git a/media-gfx/ahoviewer/ahoviewer-2.0.0_pre20220124.ebuild b/media-gfx/ahoviewer/ahoviewer-2.0.0_pre20220124.ebuild
new file mode 100644
index 000000000000..582df8de4359
--- /dev/null
+++ b/media-gfx/ahoviewer/ahoviewer-2.0.0_pre20220124.ebuild
@@ -0,0 +1,81 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+MY_COMMIT="420959bef25d069424244b1fbd788e6b7eedd903"
+
+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/ansilove/Manifest b/media-gfx/ansilove/Manifest
index d2bcefb83852..a570e58eedd1 100644
--- a/media-gfx/ansilove/Manifest
+++ b/media-gfx/ansilove/Manifest
@@ -1,4 +1,4 @@
 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 1125 BLAKE2B 31e6d5d634610b818cd0bdc5b93f37613499492d7f2366d10f40149a64b7b44806db396d118175e296a3d709f4a283ca8c06bafcbac6901d6fd2176ba5a9b9c1 SHA512 53407cbca0a8fea14265519645230b0baddea348fc4cc2008ab963019c26eb83004e7cacef0415e139049fa5d9316f6d2933628d437aa886954ed2270c8a9be8
+MISC metadata.xml 1126 BLAKE2B e3ad801523284ff073a1fd847c9638c8217132d44b09ce0a3efb7aab8857afc744b2a949e9650d866e2d125988fa0931bf518467802d3f865d041dade8bdeba3 SHA512 6ec0008f1cf002663a8c159b50dd9fec63a3bea1a36f4225d1c98caaa29b9941663250e769a33e765b15fa55704998cf6f01f097f78ce9e2fc10b028a9d0ba3e
diff --git a/media-gfx/ansilove/metadata.xml b/media-gfx/ansilove/metadata.xml
index 30ea50ab6723..c686ffe8bebb 100644
--- a/media-gfx/ansilove/metadata.xml
+++ b/media-gfx/ansilove/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
   <maintainer type="person">
diff --git a/media-gfx/brscan4/Manifest b/media-gfx/brscan4/Manifest
index 5f8c03d8aa96..76361221783e 100644
--- a/media-gfx/brscan4/Manifest
+++ b/media-gfx/brscan4/Manifest
@@ -1,7 +1,4 @@
-DIST brscan4-0.4.10-1.i386.rpm 100151 BLAKE2B 94fd7daa5682b294740a6e1345c4ab8d488589896c3fa34eafc131b1cdc2ef2e022e11795ebc261538c6107583602a9622946ea049a3cfbbeb547e7e9c8825ad SHA512 5daeb9a1304f3aeb0a2e17823887a546ff872dfb42bf08ab403539815553da597504ac7afcbb2a34fbcfd8d973c03c8ca2c62617f8c499b9fc44b1719e4f2611
-DIST brscan4-0.4.10-1.x86_64.rpm 118863 BLAKE2B 1e518122b049a6cd594e4603311d37f289aef4ad3973cbe846700c2a5c0c8f0ec994f6608817a1c12d6494c3ae78178b43f4ba8450ab00153e27f533ec1957c8 SHA512 c648db8d8543dec9e1cd556f2e0415c170c06935febd1373d783191b159ed9ed67043644ef81fb18027de89270e10a5cedcee11ea66ee262df1a2d4f006e4875
 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.10.1.ebuild 1999 BLAKE2B b8b5f6ffbd1957599c4e1dc97ca3c6f71408cbe1dd7ba7fb59771a7a7320509f682836f4aca3e929c975c54f1e41626bafe397e0408c3ff489b9494ae94741a2 SHA512 206279557c150d4a0bf9fc6906f4f2fd560623b1dcfbf315abceadc2ad9ec3b648ac8ec6b0c042c13881d3f84f41bb6fcbd52e03d7ea71a25c171cb89b7a64ac
-EBUILD brscan4-0.4.11.1.ebuild 1999 BLAKE2B cd871cadaa3fce01528b7863f279ba0971e0f64aa2cef662dae55b1d73b2060ad5e89682d35a4c954fe69ec0d83ae4ebab3762f40413417e43334d38738ad8ee SHA512 c2a33e54071ab971e8a5dfe05f43641312d43eb2e7eddb319cf3a10822dc94a07b016cceef95eaaec0052cad45557e4520af1927eb1e7db2cb7bf691ed4332bc
+EBUILD brscan4-0.4.11.1.ebuild 2015 BLAKE2B e3eb90bb02f981354f9b178d53061cbeea0d2428efbdb7a05a54b8d58fe81ade4efc7068e9404d7c5f84a62eaee8ece1ce1fa47ad910d457fbfd616a5e816d7b SHA512 7e2796401a67b96656d8c1e774c0a37494740cd264c16fb0a5c62d67469a1f90283e4998dfd1e5b170d400f72e40330af48863cb5edd48071fd014d69d46ef41
 MISC metadata.xml 291 BLAKE2B 0743394c83c6ca0d593442aba2267e89843d6add29077ed21585fc94ae5844dbe99959f37c041ae67282e19c4cfd5a883e2defdba7394f041775b300cd4cb64e SHA512 e21a50d3094f9005676ebce4152259b719232293070710cae7d3ccc4139e391336761a9ac4141873e8f6e0c548ea4cee0de6a30a22f15c0804675f4cee7ff3f8
diff --git a/media-gfx/brscan4/brscan4-0.4.10.1.ebuild b/media-gfx/brscan4/brscan4-0.4.10.1.ebuild
deleted file mode 100644
index ef415a9e04c5..000000000000
--- a/media-gfx/brscan4/brscan4-0.4.10.1.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
-
-inherit eapi8-dosym readme.gentoo-r1 rpm
-
-MY_P="${PN}-${PV%.*}-${PV##*.}"
-DESCRIPTION="Brother scanner driver"
-HOMEPAGE="https://www.brother.com/"
-SRC_URI="
-	amd64? ( https://download.brother.com/welcome/dlf105203/${MY_P}.x86_64.rpm )
-	x86? ( https://download.brother.com/welcome/dlf105202/${MY_P}.i386.rpm )"
-S="${WORKDIR}/opt/brother/scanner/${PN}"
-
-LICENSE="Brother"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="zeroconf"
-RESTRICT="strip"
-
-RDEPEND="media-gfx/sane-backends
-	virtual/libusb:0
-	zeroconf? ( net-dns/avahi )"
-
-QA_PREBUILT="opt/brother/*"
-
-src_install() {
-	local dest=/opt/brother/scanner/${PN}
-	local lib=$(get_libdir)
-
-	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
-
-	exeinto ${dest}
-	doexe brsaneconfig4
-	dosym8 -r {${dest},/usr/bin}/brsaneconfig4
-
-	if use zeroconf; then
-		doexe brscan_cnetconfig
-		# Don't install brscan_gnetconfig because it depends on gtk+:2
-	fi
-
-	into ${dest}
-	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 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
-
-	insinto /etc/sane.d/dll.d
-	newins - ${PN} <<< "brother4"
-
-	local DOC_CONTENTS="If want to use a remote scanner over the network,
-		you will have to add it with \"brsaneconfig4\"."
-	use zeroconf || DOC_CONTENTS+="\\n\\nNote that querying the network
-		(\"brsaneconfig4 -q\") will not work unless you emerge ${PN} with
-		the zeroconf flag enabled."
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-gfx/brscan4/brscan4-0.4.11.1.ebuild b/media-gfx/brscan4/brscan4-0.4.11.1.ebuild
index 7473ad81942d..380e46ee92f1 100644
--- a/media-gfx/brscan4/brscan4-0.4.11.1.ebuild
+++ b/media-gfx/brscan4/brscan4-0.4.11.1.ebuild
@@ -20,6 +20,7 @@ IUSE="zeroconf"
 RESTRICT="strip"
 
 RDEPEND="media-gfx/sane-backends
+	sys-libs/glibc
 	virtual/libusb:0
 	zeroconf? ( net-dns/avahi )"
 
diff --git a/media-gfx/cropgui/Manifest b/media-gfx/cropgui/Manifest
index d9ba7c59c87c..baaa788596c4 100644
--- a/media-gfx/cropgui/Manifest
+++ b/media-gfx/cropgui/Manifest
@@ -3,5 +3,6 @@ DIST cropgui-0.5.tar.gz 853934 BLAKE2B ac7cf32495e3ac728223994f79252fd98a0a5cf7d
 DIST cropgui-0.6.tar.gz 855329 BLAKE2B d54098cdf8d8a0eb863ba7cf13d798db8102e147c30d64d246fc9955c4ee5aead253273fd66f0f2cd2d5aaf7abd10cfed01936c08daccdd92e342a56923bd95b SHA512 dff9b1ea832c657c4407aea7ddeac880faaa4647bfe51ed43f9c1658f848cf9b6f9608451dcc006fe735012b52d318ebe5b59a31dc293cfabfb5ec5772612b68
 EBUILD cropgui-0.4.1.ebuild 1096 BLAKE2B 2005691ab239e023ca2a4d864744f9bae1348e3c7d6fe43925359fd119a53ea5562e3daade2c9d929296c7b61cd6e46a8ed978d8defd1c928e568ac36e8e6eea SHA512 59a123bd2e8d6c69bbf8aaf3f4f1cbe67de5834dda7439f76a3ca31da46048aaf5e78c32c3b438400fc128bfa42a295b10f468e507349c7f2cae66c6a9b0df9d
 EBUILD cropgui-0.5.ebuild 1098 BLAKE2B 3318e877827c04f942ce5963567524659b6db686d7f27be34f7a9da79af855213aa065d42f1741a769a42cb027a7019197eb42da18b0c1253a7bf633d5246de0 SHA512 89c2284f236870bfcfa46e1b2842cc9b4fa56447e318fdbab67c7160ce6146668d74ef7431d621969523b905345e63f68faf6bab38f61d7ce38be12b414e7e89
+EBUILD cropgui-0.6-r1.ebuild 1101 BLAKE2B 6ef2cc900438afa4f8139d2e6d2767a5bf120eb1d342b27e12a3c58ed1603dd820657ea488c3b43c927e1f94a2bfb62135094d489f354bb70861d3f339f18f2f SHA512 e06a3cd5620942bf25eeb4113be9aa817bc6ecfdc2b1b84620437dfc80e0a7dd7967b64bc305ed00ed853240a7ad8474ba98b1276505b4d04c296f080b668a36
 EBUILD cropgui-0.6.ebuild 1098 BLAKE2B f9ce8fa8320eefae10367d16b93067c7f701bda080f1ca930bf27ea5749bd527e8fe9ad545954d9b166bb577a05750b517f176d329aecf65dc00b55fc7c05946 SHA512 6177045e980293670ef084b8e2fdd057ec85a8d359fd6f82f3f3e6dee546a5807c1ed0eb2cd9b5e19e5a474faa90fddf4c3bb0cc5100b9571af2a3cf4147ddda
 MISC metadata.xml 323 BLAKE2B 4f4655c7441d04e7d3840d96e9230c3f479955d01b44344b2b424af910b48e60fdf33a21c5ba6cc5490255a38bcb7f6359516e41ac5569446c7e000e23dda693 SHA512 b40805e072a6f3588784f689fcf6c90525f1b9c23c20570ecc5e647e6d151ab3fd81b953a0263a3c0429947cfca5ef23f2a48a242ee9aa789e2c543ca29eaf86
diff --git a/media-gfx/cropgui/cropgui-0.6-r1.ebuild b/media-gfx/cropgui/cropgui-0.6-r1.ebuild
new file mode 100644
index 000000000000..c0f740961d3c
--- /dev/null
+++ b/media-gfx/cropgui/cropgui-0.6-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+inherit eutils python-r1 desktop xdg-utils
+
+DESCRIPTION="GUI for lossless cropping of jpeg images"
+HOMEPAGE="https://emergent.unpythonic.net/01248401946"
+SRC_URI="https://github.com/jepler/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]"
+
+install_cropgui_wrapper() {
+	python_domodule cropgtk.py cropgui_common.py filechooser.py cropgui.glade
+	make_wrapper "${PN}.tmp" "${PYTHON} $(python_get_sitedir)/${PN}/cropgtk.py"
+	python_newexe "${ED}/usr/bin/${PN}.tmp" "${PN}"
+	rm "${ED}/usr/bin/${PN}.tmp" || die
+}
+
+src_install() {
+	python_moduleinto "${PN}"
+	python_foreach_impl install_cropgui_wrapper
+
+	domenu "${PN}.desktop"
+	doicon "${PN}.png"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 39b70e011ff6..0948c93383a3 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,3 +1,3 @@
 DIST cura-4.9.1.tar.gz 47870392 BLAKE2B 2471c8461f73ad2343f4c3315994c5f63781ae1e49cb4699cd66e7e77c25a93916931fbaa6598c4144707dbc7778c902dad3a25839c0523aaf51ed39aacd2463 SHA512 436b8e33514de67d6d680fe59ab9599a75a86caa7e63fbcd05297b12a435483ec0c9ca90557fe23f25590a24e533294915fc18a665fd5cdb77fcc3a05a9076bf
-EBUILD cura-4.9.1.ebuild 2091 BLAKE2B e3975d79b705b1747cf1e3b7b75af8ea0309930ff3ff67a2104966f58c06cfb4706427fe059e91eb618240ad998a669aba5a423a60b13a24eaab6c6ea5e99860 SHA512 ba9546fda3d7b27a031c93887e62589f209b0f500b8c3417d13750ebcb21bfdf30b54d78e16ddf7b043667f5f5f42d16db6cad5524eefa982ccae06b2ac70d52
+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.9.1.ebuild b/media-gfx/cura/cura-4.9.1.ebuild
index edbbb3c17dd2..219edd85cc71 100644
--- a/media-gfx/cura/cura-4.9.1.ebuild
+++ b/media-gfx/cura/cura-4.9.1.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_{8..9})
+PYTHON_COMPAT=( python3_{8..9} )
 inherit cmake desktop python-single-r1 xdg
 
 MY_PN=Cura
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 024230137298..1536e0aec105 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -13,6 +13,5 @@ DIST darktable-usermanual-3.8.fr.pdf 33479509 BLAKE2B 988824b60277ea0264fec61a11
 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.6.1-r3.ebuild 4851 BLAKE2B de2ab5411fc69f7d9cc97bebe15c9645a521daec063d03f4eeac366c8cb102053d2dee56b39c13cfd6e28b34def5f5d08034b918d387e5b9d55bc1c0b42cd5cc SHA512 e20509c07903607e9f4029b9419fedbfea3c7312faebd9ee25f7d38dd7000fc30c86ac1ab691798d914322d80e2a685a98c17b17a8b4ebb7f1ca4616933425f1
 EBUILD darktable-3.8.0-r2.ebuild 5193 BLAKE2B 2db6226a7c29a0f31568d530ce7f950369ea49f434846defacf8438d3d8cc27fc94b1b40207ba7573954dc45aead92458f873a25faccaa09802bb62ddd1ce51c SHA512 b75febae3ad0a76b61ea48d26941299a33ba5aa7934a730ad91e6f37452a905847d1eaab4ab2cb4d98496b1a6eb4136d4a0ecbec4d5e05addcc7295f8437ec54
 MISC metadata.xml 1378 BLAKE2B 7373550c5362c32832830bd94dbd712f963246805af5119214a43cfe4dfb1aac9e7bb03d4af6f4f1dfae3cc44e09d6ba8baff53d67b5ddd96115c460b5e19ad9 SHA512 ffdc1ff8eb068372b1f24691bb0832d5a845e49b41adf211dec1c2faf0d1a573a0e4c62c38e97758a8f87de15569ce6f3cd2c7a768c95eb0d2b166e30b20ae3a
diff --git a/media-gfx/darktable/darktable-3.6.1-r3.ebuild b/media-gfx/darktable/darktable-3.6.1-r3.ebuild
deleted file mode 100644
index 12c0099cc5d1..000000000000
--- a/media-gfx/darktable/darktable-3.6.1-r3.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-3 )
-
-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="3.6"
-	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}.pdf )"
-
-	KEYWORDS="~amd64 ~arm64 -x86"
-	LANGS=" af de eo es fr he hu it nl pt-BR ru sl uk"
-fi
-
-IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-	lto lua 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 )
-	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	gmic? ( media-gfx/gmic )
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lua? ( ${LUA_DEPS} )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:= )
-	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
-)
-
-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() {
-	if use cpu_flags_x86_avx; then
-		append-flags -mavx
-		# Bug #828992. clang does not support this flag so users building darktable
-		# with it will have to live with this bug (assuming they have suffered
-		# from it in the first place, as it might be specific to gcc-11) - this
-		# has already been fixed upstream and it looks like we won't have to wait
-		# much longer for 3.8.0.
-		tc-is-gcc && append-flags -mprefer-avx128
-	fi
-	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_WEBP=$(usex webp)
-		-DWANT_JSON_VALIDATION=$(usex test)
-	)
-	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
-	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 5eb7cccbdac7..f00ea23b5ee4 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,7 +1,6 @@
-AUX digikam-7.3.0-akonadi-21.12.0.patch 933 BLAKE2B 67e962c10aea81d29f4ca41e9ca316990384798227b170dc597b381b47ce689663fdb8df9a1ebd5353268f6f734604f6f2f669ecf605bc293bf71c2fdc2c2032 SHA512 0ba385af8369623444c0f8dadd4ed285e6d03bc43ead34c149e1fe8599c25d35cad5e8102ca6a9863cc6629e41fa8b32794ffde645612a5246a1e635d121ea20
 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.3.0.tar.xz 256985340 BLAKE2B 9eb9802340f4d071a8378019eba007a25f1e5eeaf9d6acfa9b062c5ecf308a4e59408e078e53cea4d4ed3624d73181f3bb7973622512167bcc44748e063b13ed SHA512 71cb07de32fb9b07e0f9989a718b2a307618eaaeba6566dc6802b79e48c61f3ab00ca44e12c3971c2efc41448192a2e5a652d2cfd09be058d2bc98f40b5ebaad
-EBUILD digikam-7.3.0-r1.ebuild 4090 BLAKE2B e002e678d8fd2f0df0a05be025df05f17edd8be0ed3383839ff8d8b5d00aeada62bc418e6db21156b8fe00102ec3f36b99a5f440914c81f5a77fcdb5accd6991 SHA512 40eb1bafc37691da3a77a5c162b38a1e7521651598b4b17d84d972b441481cda30aee14198b26c46bb69aaede8f1f2cd7d09177345d7023053d5ac28eff9c7ab
-EBUILD digikam-7.4.0-r1.ebuild 4030 BLAKE2B e0a8a7d8a93ca946d2dc793585a43f5d5a9d361534b96cf04399de39864482149fb9d73b29fce0e98e64036258541ca4b161401e7fdeeadabcdf228ad7cef817 SHA512 a2a60ca8b7a8cc92e3a164764f2e9850338b5f286fb797bef614d8795533288444260f8e4abd77fbf47cb3a5b051d741f75577541b7d77096f3fa51ed6a13757
+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
 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
index b9ebebffc487..1c774239c811 100644
--- a/media-gfx/digikam/digikam-7.4.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-7.4.0-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=8
@@ -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
 
@@ -139,7 +139,7 @@ src_configure() {
 		$(cmake_use_find_package opengl OpenGL)
 		$(cmake_use_find_package panorama KF5ThreadWeaver)
 		$(cmake_use_find_package scanner KF5Sane)
-		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
+		-DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
 		$(cmake_use_find_package X X11)
 	)
 
diff --git a/media-gfx/digikam/digikam-7.3.0-r1.ebuild b/media-gfx/digikam/digikam-7.5.0.ebuild
index 46f064167d80..ec7d91762b05 100644
--- a/media-gfx/digikam/digikam-7.3.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-7.5.0.ebuild
@@ -1,22 +1,21 @@
-# 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
 
-KFMIN=5.74.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org toolchain-funcs
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	MY_P=${PN}-${PV/_/-}
-	if [[ ${PV} =~ rc[0-9]*$ ]]; then
+	if [[ ${PV} =~ beta[0-9]$ ]]; then
 		SRC_URI="mirror://kde/unstable/${PN}/"
 	else
 		SRC_URI="mirror://kde/stable/${PN}/${PV}/"
 	fi
-	SRC_URI+="${MY_P}.tar.xz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/${MY_P}"
+	SRC_URI+="digiKam-${PV/_/-}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${PV/_/-}"
 fi
 
 DESCRIPTION="Digital photo management application"
@@ -27,16 +26,8 @@ SLOT="5"
 IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop X"
 
 # bug 366505
-RESTRICT+=" test"
+RESTRICT="test"
 
-BDEPEND="
-	>=dev-util/cmake-3.14.3
-	sys-devel/gettext
-	panorama? (
-		sys-devel/bison
-		sys-devel/flex
-	)
-"
 COMMON_DEPEND="
 	dev-libs/expat
 	>=dev-qt/qtconcurrent-${QTMIN}:5
@@ -107,11 +98,15 @@ RDEPEND="${COMMON_DEPEND}
 	mysql? ( virtual/mysql[server(+)] )
 	panorama? ( media-gfx/hugin )
 "
+BDEPEND="
+	sys-devel/gettext
+	panorama? (
+		sys-devel/bison
+		sys-devel/flex
+	)
+"
 
-PATCHES=(
-	"${FILESDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${P}-akonadi-21.12.0.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-7.3.0-cmake.patch" )
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -131,7 +126,6 @@ src_configure() {
 		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
 		-DENABLE_QWEBENGINE=ON
 		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
-		-DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
 		$(cmake_use_find_package calendar KF5CalendarCore)
 		$(cmake_use_find_package gphoto2 Gphoto2)
 		$(cmake_use_find_package heif X265)
@@ -145,6 +139,7 @@ src_configure() {
 		$(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)
 	)
 
diff --git a/media-gfx/digikam/files/digikam-7.3.0-akonadi-21.12.0.patch b/media-gfx/digikam/files/digikam-7.3.0-akonadi-21.12.0.patch
deleted file mode 100644
index 6e4dd25a4028..000000000000
--- a/media-gfx/digikam/files/digikam-7.3.0-akonadi-21.12.0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 95a8ece964681fc6823e968541da2da2da06b3dd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20USTA?= <omerusta@gmail.com>
-Date: Sat, 2 Oct 2021 21:50:04 +0300
-Subject: [PATCH] Fix compile for newer Akonadi Build Versions
-
----
- core/utilities/extrasupport/addressbook/akonadiiface.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/core/utilities/extrasupport/addressbook/akonadiiface.cpp b/core/utilities/extrasupport/addressbook/akonadiiface.cpp
-index 8e43dad0da..cb38036e39 100644
---- a/core/utilities/extrasupport/addressbook/akonadiiface.cpp
-+++ b/core/utilities/extrasupport/addressbook/akonadiiface.cpp
-@@ -41,7 +41,14 @@
- #endif
- 
- #include <kjob.h>
-+#include <akonadi_version.h>
-+
-+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
-+#include <Akonadi/Item>
-+#else
- #include <AkonadiCore/Item>
-+#endif
-+
- #include <Akonadi/Contact/ContactSearchJob>
- #include <KContacts/Addressee>
- 
--- 
-2.34.1
-
diff --git a/media-gfx/entangle/Manifest b/media-gfx/entangle/Manifest
index b28760afab03..46673afd2e5a 100644
--- a/media-gfx/entangle/Manifest
+++ b/media-gfx/entangle/Manifest
@@ -1,3 +1,4 @@
+AUX entangle-3.0-fix-meson-0.61-build.patch 810 BLAKE2B 4b4eac6fbddba41e6f6cdd2afa4f0db1b603bc96b1c281fde415cd71826ae15cb839b267a138229dd59e280459f7cc3cd1538e32357b0bab74b1a5a9507a9caa SHA512 fb2196fc1ec125c6b8ba237c74e9495d8e0e22bd584948a385d3ee906fd32ad9887d02093b3c690e5de90fa19e7d7e538aed9e1f8ede433e15bdd6ad80639ff1
 DIST entangle-3.0.tar.xz 518808 BLAKE2B fe2bf4b114bc04fdc56792f984ae7387b70d693fa82f8deaa2023de71a8bba72bc95d4bfc430cdfaf5244e9114b4f7e8bb2e17f3b86de6529037519fa3877899 SHA512 8c6d7e067f88a770c63b76fde2a6ae71894aae95477fcf66b4670697889fdf7939d3f95532626d6f4ca7ae75841d8f247f6bcf78a1ce195b540989f1bfe5ebdd
-EBUILD entangle-3.0.ebuild 1634 BLAKE2B 5f22a861ef53689b4165f032617f25b5b22568a4abdd1225bbb2c141e5ce4bdabafeb1bbfe18a5c7a737833c4ff2f76afbb7c8dbe91215c2474a3b6a45839ea5 SHA512 c26f758dc92410e43c72b8c8c316c11391c95c83c180f237a957e70b3ca2ecd0b74dcf944c7e467dd8359fa7adaee7f378d3a5f18299d6c4b1c6e09685467e7f
+EBUILD entangle-3.0.ebuild 1694 BLAKE2B ff360a0323773c177c889d45d50ab899e1d0bde23177e9811dfe8585eae54c01d40233531403760ff6d2eb6496e2f19f1a1d8ad8a490df0e56b86ce3dff96448 SHA512 b01561a66afe3c0b8f4d4bc5dff077d48c6c90d3f031dcdfe2584734a59205a85b752930811a6b2d43444163e6efcb233fdc7b454e7776ff0f1bfc7b2ea2b7b0
 MISC metadata.xml 447 BLAKE2B dd2c9401bd2d866158d724e74423fe837963707e1aeaef52ee3a611b66f60e5388a43d5491f41036997e8115dc7569ca92fdd3f3ea58b89bbac82f9ff836b286 SHA512 eb9dfef9d08aaadb9767cd2793722c304350a3cdcd71d80fa7b6fbf3eb52c8eb7669575e4a25d3debc95b184f138656190fe1a340e6370cef7623a6ec70bd443
diff --git a/media-gfx/entangle/entangle-3.0.ebuild b/media-gfx/entangle/entangle-3.0.ebuild
index a86a9e92e53b..cc06e89278bc 100644
--- a/media-gfx/entangle/entangle-3.0.ebuild
+++ b/media-gfx/entangle/entangle-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
@@ -45,6 +45,10 @@ BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-meson-0.61-build.patch
+)
+
 src_compile() {
 	# prevent gst from loading system plugins which causes
 	# sandbox violations on device access
diff --git a/media-gfx/entangle/files/entangle-3.0-fix-meson-0.61-build.patch b/media-gfx/entangle/files/entangle-3.0-fix-meson-0.61-build.patch
new file mode 100644
index 000000000000..ba2d1addfb13
--- /dev/null
+++ b/media-gfx/entangle/files/entangle-3.0-fix-meson-0.61-build.patch
@@ -0,0 +1,32 @@
+https://gitlab.com/entangle/entangle/-/commit/54795d275a93e94331a614c8712740fcedbdd4f0.patch
+https://bugs.gentoo.org/831581
+
+From: EorlBruder <eorl@bruder.space>
+Date: Wed, 12 Jan 2022 11:27:50 +0100
+Subject: [PATCH] meson: fix build for meson >=0.60.0
+
+Replaced the positional arguments in i18n.merge_files with the
+data_dirs-keyword
+
+Fixes #67
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -40,7 +40,7 @@ appname = 'org.entangle_photo.Manager'
+ desktop = appname + '.desktop'
+ 
+ i18n.merge_file (
+-  desktop,
++  data_dirs: desktop,
+   type: 'desktop',
+   input: desktop,
+   output: desktop,
+@@ -60,7 +60,7 @@ metainfotmp = custom_target('gen-metadata',
+ 		 '@INPUT@', '@OUTPUT@'])
+ 
+ i18n.merge_file(
+-  metainfo,
++  data_dirs: metainfo,
+   input: metainfotmp,
+   output: metainfo,
+   install: true,
+GitLab
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 2be7b921803d..9e940dc0440c 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,7 +1,5 @@
-DIST eog-40.2.tar.xz 3601788 BLAKE2B ab66481d8fa5c076f0e12c3f16ff4a67d3a544b7483a2791833ea7d7f605898b20e8d8ed100a538e7a7f21a1359c74b96fa81aaf8712bfdb419df37fe711f7bf SHA512 e28c2deb320436606ebf0a971d845e536197ea23c2e7869d3d10dfe5174c8177c7977da37bf01178dc87f875cff2c3f0fbdad63c77578c2334dbfd9d354c19ad
 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.2.ebuild 1591 BLAKE2B b021bdc30c23209e66970052e2a05b295013fd53765e966436cad01af8d33084306accddecca864ed3ea07fb97dd675b74b6e76d15a761f0a1f9fd8eca82d311 SHA512 38158a2a01bae2503b81aa8ed540c7b0f45a138915d1fdf5eb5cf3d4e661769cf2d92d89f743256922436dd2ff1a69a21902dafbcb6de89627d6bfe3d0b6d598
 EBUILD eog-40.3.ebuild 1639 BLAKE2B 9272d903acbbacfedd2ae50a1cbcaee4a689a52d550b5e23a835e40f4371808ee24ecb6a0442f3e7fb663f90977a3817ea169e1115f4b95d2819662b21eb105f SHA512 e372591952896fa5c450ea38a7c78a6914a3239451cf588edff609946a1c6396accba65d44875bdf37815f805ca5f31a0ddacbf489b631ca32c0bbcf828c1fc7
 EBUILD eog-41.1.ebuild 1641 BLAKE2B 080fc46945631d0aa9b03952c8ced75cb7761bedcc80d536d63c4f5e95134b8bea992e1b4d94ea3857c5fc2e30499822fa377867d37efabf837aae3a974eaf5b SHA512 f162b6aaeefb003a6e3a8e0f9a0c90cafc7ec14b7d867e8376c2d03a08616b028dfc0775462a25945a8dca7b02394ea94cd5c983467f6ab95e558c8b9d3118ae
 MISC metadata.xml 482 BLAKE2B 03780ad7b79dd3b35ee6a9b3ee95bceb94ebbd97de711912ba0f5e61ef4e25d9a20a474011cd3c5261c82757105bed5383f16259468dee80bfd6cdcec13b5828 SHA512 0c51ba4ac4859bc5e6361862282a76a98343ad3e46dfac04e088c79ec25683e820ea907991212979b5fffa0b757a66ea33ddfcff7a8012e42e81dba0e943ea39
diff --git a/media-gfx/eog/eog-40.2.ebuild b/media-gfx/eog/eog-40.2.ebuild
deleted file mode 100644
index 8b0331ef5a00..000000000000
--- a/media-gfx/eog/eog-40.2.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 ~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 # Not packaged
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index 8552778f9f05..70c22fb23901 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -11,6 +11,6 @@ EBUILD feh-3.6.2.ebuild 1510 BLAKE2B 4f025973871e4f60fd467603e58df078db0cd93ab24
 EBUILD feh-3.6.3.ebuild 1510 BLAKE2B 4f025973871e4f60fd467603e58df078db0cd93ab240a8ce320b3c50034c907cf6729f5c36185c376581236d4bce6913224e842ba711e6c481409e7691a307c4 SHA512 54677a9d00d4135041ed124893bb9fe7e36af5f2afe8d9baca2e52deb8a5bf1a6347a1b597ce938873d2caa54f3ed9c5ef1428760e10fe566ebe65edacc5ccc2
 EBUILD feh-3.6.ebuild 1469 BLAKE2B a4e68a319f63055c4997c72abf39c49c0373b47465873539edf872ed282c5012ae40ddc7cac10968d757b6f9e775bd754a069aac2e42945650e50c6d7be968e1 SHA512 3bca9ab073f234d23d2609e755bc6741742150ac3d3df22e3c831b674d79f7d893ce2b3bcf3b86399b051fe754f8de9e349d5884564bed1cd6b7a1cf1c24c1a5
 EBUILD feh-3.7.1.ebuild 1508 BLAKE2B 5a9c85a66b898188667ff222c686abf8002548c20e0b642471d6ce3a7fff6426c580a8b7bc0c103267b73ec12515767772b02e7784170b4428df57382528c990 SHA512 35bc572448d0738dd19500d2c1a1d2e9597a25767ee963c05caa34f1c0ff9c759f70ddf02c5161628d4ef8cb3b24141fa17cc3b7d2eba5ab59f926b79454471d
-EBUILD feh-3.7.2.ebuild 1515 BLAKE2B 67ecdd1281ba33a13b51fc2c23b4c8efcca57cc678f5cfb77850dd7495cf6a0463db0af547f4c9c7cac74467b063f724b679814e498887eb3431ac1068d8bf47 SHA512 4cde105c3719d084c150a1777b3134fd382f66e55f2df003c5d3e3458168b38dc89598446f2840f4d527a5beae539e620e246803e296d9d33f5884062add972e
+EBUILD feh-3.7.2.ebuild 1511 BLAKE2B 4ea7b87f2abf97391df8d688bea31fa816725c716e8060c100fb3409eec59d5249ed6388b45eea434e348d75f66398ef644aef039a6fc59e211b63b427eda8a0 SHA512 c0a276d82a9f51eafcab4152091d4eee0daade48c0b18c4317e88d9de97cc295e18ed01bac02e29690d754d15efacc011d7b6a13ed6837a12f9d2066060fa800
 EBUILD feh-3.7.ebuild 1508 BLAKE2B 5a9c85a66b898188667ff222c686abf8002548c20e0b642471d6ce3a7fff6426c580a8b7bc0c103267b73ec12515767772b02e7784170b4428df57382528c990 SHA512 35bc572448d0738dd19500d2c1a1d2e9597a25767ee963c05caa34f1c0ff9c759f70ddf02c5161628d4ef8cb3b24141fa17cc3b7d2eba5ab59f926b79454471d
 MISC metadata.xml 253 BLAKE2B ac07d0a4457abddec76b322a6e7f175661559091067a6f3d92658d4e6c2f1f90a57f5d0c139de0a91a19a5a797fed39fc66fd90ca25bfd0c66497ee8e4088810 SHA512 40abc637528fae614d2eb151b5834c323cb151d5c9ebbee415d70efb4603df0fa7483e0d689ea1658a424ac1e54fb944d8eca37a4bd80bbc15222ed9259096df
diff --git a/media-gfx/feh/feh-3.7.2.ebuild b/media-gfx/feh/feh-3.7.2.ebuild
index 33b646356d2a..92720f85d06b 100644
--- a/media-gfx/feh/feh-3.7.2.ebuild
+++ b/media-gfx/feh/feh-3.7.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
@@ -10,7 +10,7 @@ SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
 
 LICENSE="feh"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 ~riscv x86"
 IUSE="debug curl exif test xinerama inotify"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index 1e1b2c35c81c..d85c980586cf 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,6 +1,8 @@
 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
 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
 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
new file mode 100644
index 000000000000..852e25423552
--- /dev/null
+++ b/media-gfx/fotoxx/fotoxx-22.11.ebuild
@@ -0,0 +1,81 @@
+# 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/freecad/Manifest b/media-gfx/freecad/Manifest
index a79f3fc8f701..6500fcd4c52d 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -8,7 +8,6 @@ AUX freecad-0.19.2-0007-fix-build-failure-with-opencascade-7.5.2.patch 1054 BLAK
 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
-DIST freecad-9999-Gentoo-specific-fix-install-locations-of-Ext-and-Mod.patch.xz 4144 BLAKE2B bfd9a0fcd9a6a5fb4c9ef2d5e88e69b869f908142cedf5dd1449b917d90e36187ce6227af99613efedd05eb3218d17e9e6df4430ea0413988340c91c111bbe4e SHA512 5d452eca6bc88fb50ae47a6b6127e39f3d17a60498627920b13273e6afaceaca64e47ade4d1fce18b3bfbcdf4eb13565244ecc575707f1aedf3bb1d6dfc7e89e
 EBUILD freecad-0.19.2-r5.ebuild 10917 BLAKE2B 35866de96fe9b930182522f3728adad45342c15eacebfc798ff294b884b1fcbaebe9158765fd0d1bb2ae99b5894413cec1c6fecfb88e6ce7e64dee809f971840 SHA512 6fd55da6d9b1b4f0b6a68ae6dc1c2c1b40dedf298988dd873500a6da6ba02bc4eb8aeb6eff69f0bbc9e85e4b4ed63fc54e7cc87173c05ba745a28f3c094a523f
-EBUILD freecad-9999.ebuild 10822 BLAKE2B 89e8e85ab4e3d80ee7d3d346de53fda3adb07a5ea057324409ca52f91f5542569b7476b602999aca056088b66f6c51f75822ff4668aeff89ba53965ec280d716 SHA512 a92798699ab2349b3b1bd694a787935a4a01df88ca0ba669a45d96b5b9bb395db412ded3ed399607a7479886b9389ce42b27550e186fe2e40ff166d2c4e1383a
+EBUILD freecad-9999.ebuild 10642 BLAKE2B 2504f33a116f9d10dafcf611eba5673131141077898769011066540a59c9abf5f617f0ab6dad2a35ae2aa2c89295f1babbd4d8b651fb921042e90ddd85f50e85 SHA512 b9216438a9c59c2947945c97c5ff9eb2eb10971208f42e731767f11193e23862487ad8035b558f04a5913b22c1737cfc670ead890c0e1fbdd85974e09f4cca53
 MISC metadata.xml 3268 BLAKE2B 4e99f8237c96f96500ec15a0e175684f445c9a68e1080f6f61538ae4e99cb2afccc14d50c626c44764ea4362ed82cc2ccf74f8ae53d713d70b21860eeb39650d SHA512 fbc87f4a401c33de8033b54213026631a9f956918cc256eb9a10cec88b316f71fd98959c79f58acc3d4a75d28117097ea0cc4ee33f333923d4387e9d3af43bb5
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 2852f295c8e1..97ada209ae61 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-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
@@ -11,12 +11,10 @@ DESCRIPTION="QT based Computer Aided Design application"
 HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD"
 
 MY_PN=FreeCAD
-MY_PATCH="${P}-Gentoo-specific-fix-install-locations-of-Ext-and-Mod"
 
 if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
-	SRC_URI="https://raw.githubusercontent.com/waebbl/waebbl-gentoo/master/patches/${MY_PATCH}.patch.xz"
 	S="${WORKDIR}/freecad-${PV}"
 else
 	MY_PV=$(ver_cut 1-2)
@@ -139,11 +137,6 @@ pkg_setup() {
 	[[ -z ${CASROOT} ]] && die "\${CASROOT} not set, plesae run eselect opencascade"
 }
 
-src_unpack() {
-	git-r3_src_unpack
-	unpack ${MY_PATCH}.patch.xz
-}
-
 src_prepare() {
 	# the upstream provided file doesn't find the coin doc tag file,
 	# but cmake ships a working one, so we use this.
@@ -153,13 +146,6 @@ src_prepare() {
 	sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die
 
 	cmake_src_prepare
-
-	# Fix line endings on a few files for patching
-	for f in src/Mod/{Cloud,Inspection,Start/StartPage}/CMakeLists.txt; do
-		dos2unix -q ${f}
-	done
-
-	eapply "${WORKDIR}"/${P}-Gentoo-specific-fix-install-locations-of-Ext-and-Mod.patch
 }
 
 src_configure() {
@@ -210,10 +196,10 @@ src_configure() {
 		-DBUILD_WEB=ON							# needed by start workspace
 		-DBUILD_WITH_CONDA=OFF
 
-		-DCMAKE_INSTALL_DATADIR=share/${PN}/data
-		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-		-DCMAKE_INSTALL_INCLUDEDIR=include/${PN}
-		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)/${PN}
+		-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
 
@@ -275,6 +261,12 @@ src_install() {
 
 	dobin src/Tools/freecad-thumbnailer
 
+	if ! use headless; then
+		dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
+		mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || die "failed to move shared resources"
+	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
diff --git a/media-gfx/frogr/Manifest b/media-gfx/frogr/Manifest
index 664fda2f06be..55c2e4bae6a1 100644
--- a/media-gfx/frogr/Manifest
+++ b/media-gfx/frogr/Manifest
@@ -1,6 +1,7 @@
+AUX frogr-1.5-meson-0.61-build.patch 1341 BLAKE2B d1c1cdc5eb3f479ae16cc8e5bc5c164904c63d802e5ae2de5fe29d3209462fc65f2750a80ac95a7a3f83c9edd4ebf9067e80166f3ffa18d8380ae221d1312e11 SHA512 b46c7c8d42a9be4bfd90797d2ac77b7f18c2d7e5c571f3a19830849265915389c9c756199297ba6f8969074064beddeb96e87bb1dbbdcf3f9310240a783a0d30
 AUX frogr-1.5-warning-level.patch 752 BLAKE2B b0fd94da39939daa195bd4da03b6701b6336e49a7f60fdfe703853d27a562b8dd29bc923cecf08f13acb3200935dfdb43ff1bcf16cda78d80e6980654da4bde5 SHA512 3aa0522da679eba07f3f32134a19adaa6ffdb25bec46c4202e8caf2c38c93749c565f315d5265fca56a618a60d01fe11ef04f971a6c5168a33a42f0187182fbd
 DIST frogr-1.3.tar.xz 2552456 BLAKE2B 562f88898fec153c50696dce59b5396b6f9e88bc68cbf264e7954c2d2f402cb44cb2e6bf3c1c786d50285532c66167678f0fde053c317a0d23b6f4b210e69fa1 SHA512 82ca3ff1e97e7ff45bce1915f629809cc9efa6d33735b0e41b17bb8f69a31a2b035dd53045a3e56e7769d379b534a2468e37a684505438cfea70cc141103d1cb
 DIST frogr-1.5.tar.xz 2233600 BLAKE2B aeb04db0d5d57f470d377986f2e857ee63b47df85e9c3251cdfac8585efa19491650ecede0bfa95c157c2584298dc02173afec624bc439dcd8b52d101c465d54 SHA512 f4af5ec82ad1771e71387c40467fc697c7e3edff9f76ecd0f762e446d136a293477867cb7b6bc6d10bc0fdd95210b25f515eb56bf2d456f79009884019c44dd4
 EBUILD frogr-1.3.ebuild 626 BLAKE2B 9e17e2f7206f357020256d796ffc92b2f3bb63d3b5f8b52209289628d8ee76cf6ac18e84d5982ddd4828437275f2cefd039025d9104ce0d0f3ab958b9bf2cb96 SHA512 8b2eaa44c95a0266e1568becdc8fccca0dec6de3e31d9cd71a228fa068a361ea223efdc39b318459abb68c285efb9ef688cf5b44eed79f1d79e4db76b6d7427d
-EBUILD frogr-1.5.ebuild 984 BLAKE2B 716e96ad03a810f1f7356d6498fa06a1ec7c2751c10e4181cd9685022a07a8f9c2b7241f29fd3300241cd0cb04a171673e8416f3fbf9c0ea1a95d4f4fa9eaf9d SHA512 17e7fdf4ce73c2310b4568107b15da36006501a00c690908ef4fce99cf53b14e1bfc7f475a2ca9a98384a7b1e0eb9e4f32e0248db7b5595971ecaca2fafc9d40
+EBUILD frogr-1.5.ebuild 1032 BLAKE2B c869110134432232342eac8241cf02899a416161e785a44a85effb66d079a35c083e8b27813bf2b01121614142e8a253eb7d7be363668126655554b5a03f74ce SHA512 92c67f30df546b8f45875b33c662452b547c678794b6f792bd61aac7a48aed66aeb6ac5de9f6369e23bb757d189c1948f58f81610009a06ae2a1eb06f63a8cd4
 MISC metadata.xml 387 BLAKE2B b08b71b2565331e07ca5b0c99cd8fcb57f6d0f584eb70798ddf20b6e74bc58f1e3d79f354c4bd0b72d26a85dffda4ca87e44a18345ce497020406ce0958bb092 SHA512 cb8c90665280861d2310256c59783f68126d8a24f994bb011487a3509d3ca418605b5e5c89da520204eb646fb4d920c6e8bc8c868b0faffc764832ff2fcc3d92
diff --git a/media-gfx/frogr/files/frogr-1.5-meson-0.61-build.patch b/media-gfx/frogr/files/frogr-1.5-meson-0.61-build.patch
new file mode 100644
index 000000000000..cb72250ae72f
--- /dev/null
+++ b/media-gfx/frogr/files/frogr-1.5-meson-0.61-build.patch
@@ -0,0 +1,33 @@
+https://gitlab.gnome.org/GNOME/frogr/-/merge_requests/5
+https://bugs.gentoo.org/831497
+
+From 1eeb32b94b9e14e7ea2b9267e3378bae9e3e852d Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 12:22:25 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:32:0: ERROR: Function does not take positional arguments.
+data/meson.build:42:0: ERROR: Function does not take positional arguments.
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -29,7 +29,7 @@ data_conf.set('BINDIR', join_paths(prefix, bindir))
+ generated_desktop = configure_file(input: 'org.gnome.frogr.desktop.in.in',
+                                    output: 'org.gnome.frogr.desktop.in',
+                                    configuration: data_conf)
+-i18n.merge_file('desktop',
++i18n.merge_file(
+                 input: generated_desktop,
+                 output: 'org.gnome.frogr.desktop',
+                 install: true,
+@@ -39,7 +39,7 @@ i18n.merge_file('desktop',
+ 
+ # Appdata XML file
+ appdatadir = join_paths(datadir, 'metainfo')
+-i18n.merge_file('appdata',
++i18n.merge_file(
+                 input: 'org.gnome.frogr.appdata.xml.in',
+                 output: 'org.gnome.frogr.appdata.xml',
+                 install: true,
+GitLab
diff --git a/media-gfx/frogr/frogr-1.5.ebuild b/media-gfx/frogr/frogr-1.5.ebuild
index 011ea5c4f2b7..7d0577497123 100644
--- a/media-gfx/frogr/frogr-1.5.ebuild
+++ b/media-gfx/frogr/frogr-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="6"
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/frogr-1.5-warning-level.patch"
+	"${FILESDIR}/frogr-1.5-meson-0.61-build.patch"
 )
 
 src_configure() {
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 64efffdc7453..76fc0e844970 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -3,8 +3,10 @@ AUX geeqie-1.6-yelp.patch 1044 BLAKE2B be5523c05bf0bc9a416b843a3fea8f5722272e138
 DIST geeqie-1.5.1.tar.xz 1587116 BLAKE2B f8742a88eefd90fb1e7e1d1365058cef190b6231fcb001faa9f110676e8403c8e5959f9af398d6fa1ddc4e4c62439728904c6c39f5095f476014a5b7b74b4d16 SHA512 265eade90afe45856855e856c5f640786ca2e3add57c3ade8ca380d075297f96bf44c6e0c4fd6eabbc2666a37f898b50d37dd2e01d77875b8a622d72d8a0e6ac
 DIST geeqie-1.6.tar.xz 1693488 BLAKE2B ee5369884c4c0e60fe827d43ef336c5aaa89d55aec8905bb8cdd4edb2ee12e15d525577a3c85403e2e8955a08c817007b72d1d1e3614063377a21aaba317acee SHA512 4acd05c6012c80581e9c594c7dc7d12265528aa8d3868afef9def36798945afb851da9376bbe5f205ac3c5e1e2362188cc0e2891b49f3ea4396bbc6974c143ef
 DIST geeqie-1.6_p20211016.tar.xz 36433388 BLAKE2B e8932398ce7354c08ad4199834870e2844555ee1a8ae2beebd9a512100784a5cb62e00993b3ef1854a7ab1bd37eb0742ebcfc17605429f99b61e1af2fbaf859e SHA512 9e536beac39028fdcbe04d014460de2b02039b2c027f9603a71554339b2d14116f8dff11bb09c6e73d51550188daf40031535f978fbbc2d355d30593f4f29e9d
+DIST geeqie-1.7.2.tar.xz 1949240 BLAKE2B 4dde2c902151da677470dca359b321978afe861cafddb7baf76e68acc8a9cf7943ce8ebd8e46aa007a773cce62444d16908d1b8b1339de58587c98d911775ec7 SHA512 07b06ef51cb520b91b9097bbe06d170af39d3d513d9853c912e1b60bd5b47e0ae3571f6ac449c9f9c6cee4d227fc4c906ee5f90f7498cd0b2119d12ff4673c4d
 EBUILD geeqie-1.5.1-r1.ebuild 2280 BLAKE2B 9653c0f0ac69e5a18812a86534e5ff6025e754545f2d53e3f06e538f59a600c98b27fff34f425e1d342a3c0ac8ef229f58ef8da99b9cd4c5f1f54e91246eead9 SHA512 26a4d709e1c8c6f3a6db159d4e912def9ce7ed7cb7a7d1a261d2428b46440aad882d450b1f8d54f513fd02a1f637bd0328403c9c143281b889dc3f34dfca7a31
 EBUILD geeqie-1.6-r1.ebuild 2087 BLAKE2B b72278d1f36cbaed2cd0eccf1f2d8c8126ffd798c476b7432e7695221f1524f14b07d0ff98fbe281bb911cb94f80a5c8142bf2f8ad667e3aa3192bdeca8950de SHA512 d8280d69c8638a192c2875f10e807e0286d09f8820dfc91a47b62f495a508770a394bd33dd1fdfc077a6f4581d8069a7bc33edae239ad754d6f6427253d7fa19
 EBUILD geeqie-1.6_p20211016.ebuild 2412 BLAKE2B ec74ea03a4f7d9431b2fa1fa8eb474ac4c8a1e8a46b1887d7f7a67bc4af1b389c4581299aff6a301e490958412bf91561294bc8dd015220b7ad6e5e470d7e213 SHA512 23a6a0c2d60d4498b99195a87e158683a312276c1d0b29d0dbd3ca334eb0ac96e19e3985a9be1c88fce9d528ca0a74c41a739dd90bde3d3b04728321d5f94fa4
+EBUILD geeqie-1.7.2.ebuild 2324 BLAKE2B 973682fbaacbf054ad6033b45e4ec4f79f2e0ccfa2a4e7e88dd73f2dc61adaba8f0010c6190f3ea9bc16b3939974216bf19b0127c59810dc41a5d05dd6a4e3c8 SHA512 f136a470d8ffa269f47af621cf13c5f9c2a87b0dc3a0a75fb1a325ad94ccf0a7cd6d1cc789241210e18e9ab8ffc326f9c1d6d66539f86592922cc02ad0938d5a
 EBUILD geeqie-9999.ebuild 2260 BLAKE2B fb20a91012f7771197f763e9cfbda5c201c51241e494dca0d6e499d9f6e7a8bc2887ed8c4efabfbcdcb86dd0cc7a4463506b8a7cb31c261a6c4cc82d1cce634d SHA512 4a0efeda56009c9dea7a5bcab831b251b54070a370d2f915bbb3f74be3e727e5cae1c0e8aaa0f239aa7208e052548b69e605a2b97ef817dceb78d4d5e8b49ea8
 MISC metadata.xml 924 BLAKE2B 9bafd79f0d60d1237da4b35aeb2142384c188b503c151f8e0a26cd6ea9a2658876c66fb6f248af34eb33f6d2218bafeb1f34521d23c55e244c7ee1b4c0234dda SHA512 73f82d929d6479d81dde14c922ac048feaccf4bf5ea8ffe8aea56cf7cbe0cc8f76c528f3363bbbad3e881640608265a2e583d8b675fce3aa43ad7646023167fc
diff --git a/media-gfx/geeqie/geeqie-1.7.2.ebuild b/media-gfx/geeqie/geeqie-1.7.2.ebuild
new file mode 100644
index 000000000000..60becabb68fa
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-1.7.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+LUA_COMPAT=( lua5-{1..3} )
+
+inherit autotools lua-single xdg
+
+DESCRIPTION="A lightweight GTK image viewer forked from GQview"
+HOMEPAGE="http://www.geeqie.org"
+SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc exif ffmpegthumbnailer gpu-accel jpeg lcms lirc lua map nls pdf tiff xmp"
+
+RDEPEND="
+	virtual/libintl
+	x11-libs/gtk+:3
+	doc? ( app-text/gnome-doc-utils )
+	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
+	gpu-accel? ( media-libs/clutter-gtk )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	lirc? ( app-misc/lirc )
+	lua? ( ${LUA_DEPS} )
+	map? ( media-libs/libchamplain:0.12 )
+	pdf? ( >=app-text/poppler-0.62[cairo] )
+	tiff? ( media-libs/tiff:0 )
+	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
+	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	map? ( gpu-accel )"
+
+src_prepare() {
+	default
+
+	# Remove -Werror (gcc changes may add new warnings)
+	sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die
+
+	# Remove force rebuild of Lua API ref
+	sed -e 's#./create-doxygen-lua-api.sh##' -i doc/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
+		--enable-gtk3
+		$(use_enable debug debug-log)
+		$(use_enable ffmpegthumbnailer)
+		$(use_enable gpu-accel)
+		$(use_enable jpeg)
+		$(use_enable lcms)
+		$(use_enable lua)
+		$(use_enable lirc)
+		$(use_enable map)
+		$(use_enable nls)
+		$(use_enable pdf)
+		$(use_enable tiff)
+	)
+
+	if use exif || use xmp; then
+		myeconfargs+=( --enable-exiv2 )
+	else
+		myeconfargs+=( --disable-exiv2)
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	rm -f "${D}/usr/share/doc/${PF}/COPYING" || die
+	# Application needs access to the uncompressed file
+	docompress -x /usr/share/doc/${PF}/README.md
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "Some plugins may require additional packages"
+	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
+	elog "- RAW images plugin: media-gfx/ufraw"
+}
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 2e3082c37557..281e8403e01c 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -10,7 +10,7 @@ EBUILD gimp-2.10.22-r3.ebuild 5618 BLAKE2B ce5a7d64257677255daa60f7df99d1e035d54
 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-r1.ebuild 6791 BLAKE2B 2e315e24ce3e3f5499c420885ebd9914778c91336c622e865abbffe3b300c321d4689ee7e2ab7e04454bf44c99862541cf097200ce3bbce683474926f757fdd7 SHA512 e5104fb0dc0b16ae20c853b11fae1ceee2bd3ee6e21da3853bc4cb8a073f609aca559a094f3df548194d098f064e333dda5a074272df0d52f0c2430af6b6cdfe
-EBUILD gimp-2.99.8.ebuild 6791 BLAKE2B c6fa0f2e50657c2812464a62d0e1bb0b051b3c74b7e0f08b0f031ec00b8550bca2a0ae92fd1de53a4824332c837610bee308be2f26afcab744bc6e3cd2172ae0 SHA512 ad6752b563bd5c873fd6fec0c0e56bef60485ebb84b2c4617246cb8062ba988b29244407e4ccae6344aec659621681303c6f3d047957cb20bce680fd50cc939f
-EBUILD gimp-9999.ebuild 6941 BLAKE2B 1c66f72babf48bd0b279500e49583a93a51d4ada21d5c9fe164d34a3fbcc567561b818c6596747e47fcf4ac416ccf391260957df53803052129bda0703415cca SHA512 a4bded9bab442512818e5f1af12ec52e4cc59aae06bfc6144ede721a92d201fd10858dc73b192b1d1a28703261c4f679e7761f510c21cf698025e403e0df3a49
+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
 MISC metadata.xml 577 BLAKE2B a8bfdc064608bf0bb4a2f81a5de928d7eb35da9eaf2db64198ca34ca8b2542116ed1f341fe822354fa60b8d447676eb892c38dc4093b4b9db16622fe9d64bba8 SHA512 12e030815c13bc253aa877c7da837e01f8d259a6297807c0543f05e21edb92fda38b3a54a064b4721172fcc3db9d0ed2ae580118d51f03fc37f6ac4bacde5154
diff --git a/media-gfx/gimp/gimp-2.99.6-r1.ebuild b/media-gfx/gimp/gimp-2.99.6-r2.ebuild
index fc3c341fc69c..38dfe146fb0c 100644
--- a/media-gfx/gimp/gimp-2.99.6-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.99.6-r2.ebuild
@@ -30,6 +30,7 @@ RESTRICT="!test? ( test )"
 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
@@ -51,8 +52,8 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	virtual/jpeg
 	>=x11-libs/cairo-1.16.0
-	>=x11-libs/gdk-pixbuf-2.40.0:2
-	>=x11-libs/gtk+-3.24.16:3
+	>=x11-libs/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 )
@@ -92,7 +93,6 @@ RDEPEND="
 DEPEND="
 	${COMMON_DEPEND}
 	>=dev-lang/perl-5.30.3
-	>=dev-libs/appstream-glib-0.7.16
 	dev-util/gdbus-codegen
 	dev-util/gtk-update-icon-cache
 	>=dev-util/intltool-0.51.0
diff --git a/media-gfx/gimp/gimp-2.99.8.ebuild b/media-gfx/gimp/gimp-2.99.8-r1.ebuild
index 535d6a06550a..ec80a0eb960b 100644
--- a/media-gfx/gimp/gimp-2.99.8.ebuild
+++ b/media-gfx/gimp/gimp-2.99.8-r1.ebuild
@@ -30,6 +30,7 @@ RESTRICT="!test? ( test )"
 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.68.0:2
 	>=dev-libs/json-glib-1.4.4
@@ -51,8 +52,8 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	virtual/jpeg
 	>=x11-libs/cairo-1.16.0
-	>=x11-libs/gdk-pixbuf-2.40.0:2
-	>=x11-libs/gtk+-3.24.16:3
+	>=x11-libs/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 )
@@ -92,7 +93,6 @@ RDEPEND="
 DEPEND="
 	${COMMON_DEPEND}
 	>=dev-lang/perl-5.30.3
-	>=dev-libs/appstream-glib-0.7.16
 	dev-util/gdbus-codegen
 	dev-util/gtk-update-icon-cache
 	>=dev-util/intltool-0.51.0
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 7659852820b6..c7e793bb2d56 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -31,6 +31,7 @@ RESTRICT="!test? ( test )"
 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.68.0:2
 	>=dev-libs/json-glib-1.4.4
@@ -38,10 +39,10 @@ COMMON_DEPEND="
 	dev-libs/libxslt
 	>=gnome-base/librsvg-2.40.21:2
 	>=media-gfx/mypaint-brushes-2.0.2:=
-	>=media-libs/babl-0.1.86[introspection,lcms,vala?]
+	>=media-libs/babl-0.1.88[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/gegl-0.4.34:0.4[cairo,introspection,lcms,vala?]
 	>=media-libs/gexiv2-0.10.10
 	>=media-libs/harfbuzz-2.6.5:=
 	>=media-libs/lcms-2.9:2
@@ -52,8 +53,8 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	virtual/jpeg
 	>=x11-libs/cairo-1.16.0
-	>=x11-libs/gdk-pixbuf-2.40.0:2
-	>=x11-libs/gtk+-3.24.16:3
+	>=x11-libs/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 )
@@ -93,7 +94,6 @@ RDEPEND="
 DEPEND="
 	${COMMON_DEPEND}
 	>=dev-lang/perl-5.30.3
-	>=dev-libs/appstream-glib-0.7.16
 	dev-util/gdbus-codegen
 	dev-util/gtk-update-icon-cache
 	>=dev-util/intltool-0.51.0
@@ -101,10 +101,7 @@ DEPEND="
 	>=sys-devel/automake-1.11
 	>=sys-devel/gettext-0.21
 	>=sys-devel/libtool-2.4.6
-	doc? (
-		>=dev-util/gtk-doc-1.32
-		dev-util/gtk-doc-am
-	)
+	doc? ( dev-util/gi-docgen )
 	vala? ( $(vala_depend) )
 "
 
@@ -132,14 +129,6 @@ src_prepare() {
 	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
 
-	# Fix checking of gtk-doc.make if USE="-doc" like autogen.sh
-	# USE="doc" is currently broken for gimp-9999 due to absence of appropriate *.m4 file
-	if ! use doc ; then
-		echo "EXTRA_DIST = missing-gtk-doc" > gtk-doc.make
-		sed -i -e "/CLEANFILES/s/^/#/g" \
-		"${S}"/devel-docs/{libgimp,libgimpbase,libgimpcolor,libgimpconfig,libgimpmath,libgimpmodule,libgimpthumb,libgimpwidgets}/Makefile.am || die
-	fi
-
 	gnome2_src_prepare  # calls eautoreconf
 
 	use vala && vala_src_prepare
@@ -184,7 +173,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 gi-docgen)
 		$(use_enable vector-icons)
 		$(use_with aalib aa)
 		$(use_with alsa)
diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest
index bd2c2f76b4dc..c62915cf517d 100644
--- a/media-gfx/gnome-font-viewer/Manifest
+++ b/media-gfx/gnome-font-viewer/Manifest
@@ -1,5 +1,6 @@
+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 708 BLAKE2B f724f45d51354b37a82a32ee7c378d85b77d54d51ef9a6fd9a7f4af9bf44329f122cedf9b2ea37beaa887346e6cb6014459cde33774c4d6aa8c0d85e4015efcf SHA512 b2e6736f77574b7e21c8f0d9803b92b601ade1bf5c172ba1d996262744dbc26cbcc0e3f82a6ecb26d24c303bff266569284dca611adfb30e4eef63dc77634514
+EBUILD gnome-font-viewer-41.0.ebuild 768 BLAKE2B 76a3993ef8d211ef65b1704f8bacd52826aa09b3304e312f48d80f9e0d16e7b12ef3f9b6c751fccebb6e857b9b7a83e7ea5c1b838642c2de44f7dec42cdf76be SHA512 68113b0a971dd79a2d35a24270b637b5ac464550c16aa843c8477a1bbd9579676ca5c032ae9bdb763819b81806fe805c53832ebc464cb8682a1696451f66db9f
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-gfx/gnome-font-viewer/files/gnome-font-viewer-41.0-fix-meson-0.61-build.patch b/media-gfx/gnome-font-viewer/files/gnome-font-viewer-41.0-fix-meson-0.61-build.patch
new file mode 100644
index 000000000000..545f294206a7
--- /dev/null
+++ b/media-gfx/gnome-font-viewer/files/gnome-font-viewer-41.0-fix-meson-0.61-build.patch
@@ -0,0 +1,31 @@
+https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/commit/218166246e29a39e2eac8d3f06976038571b0603
+https://bugs.gentoo.org/831639
+
+From: r-value <i@rvalue.moe>
+Date: Thu, 30 Dec 2021 17:14:47 +0800
+Subject: [PATCH] Fix meson build with meson 0.60.0+
+
+`i18n.merge_file` has been ignoring positional arguments for a time
+and explicitly rejects with error since meson 0.60.0
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,6 +1,6 @@
+ appdatadir = join_paths(datadir, 'metainfo')
+ appdata_file = 'org.gnome.font-viewer.appdata.xml'
+-merged_appdata = i18n.merge_file(appdata_file,
++merged_appdata = i18n.merge_file(
+   input: appdata_file + '.in',
+   output: appdata_file,
+   po_dir: '../po',
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -39,7 +39,7 @@ desktop_file = 'org.gnome.font-viewer.desktop'
+ desktop_conf = configuration_data()
+ desktop_conf.set('VERSION', meson.project_version())
+ desktop_conf.set('APPLICATION_ID', application_id)
+-i18n.merge_file(desktop_file,
++i18n.merge_file(
+   input: configure_file(input: desktop_file + '.in.in',
+     output: desktop_file + '.in',
+     configuration: desktop_conf),
+GitLab
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 44bd6932c563..8198ca052745 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
@@ -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
@@ -27,3 +27,7 @@ BDEPEND="
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-meson-0.61-build.patch
+)
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index 46ef5e8b0020..f7a7c51655a7 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,3 +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 2426 BLAKE2B 44675ac89e656fc79a4940ca8bebcbfb09b56ec493b04a7702107b6b329b1b21a12f941d29eb3d016524ed61f60a130b16fb34562da9c46e51946b26a4dd4526 SHA512 d88388a40c4536fd3b2650504cb0d88793a7f39b858ba9f38e152450580a0dc30f4ee895518aad3da1c886ddcd1d431fab8f3f42e5a0d551bd804afd39b481cf
+EBUILD gnome-photos-40.0.ebuild 2494 BLAKE2B bc43ce338ed54d1dd9a6e10c8a21a9e368d777189f13353c368bb76edc869722256acfa8f7ea04df69c17d3cef0ff93bfd47a0da668bb5bf4d816aa4e21ed6b2 SHA512 8322244c02ba16047cbdec6510e9f9a5b6e5419599a8bf6a1d90c80b80b53c0254a6cf2f4c752cfcc28235384127dedca6557e01633b2e7dcbb4314b55cfae8c
 MISC metadata.xml 993 BLAKE2B 19e15d88f2176fa80739650a2d3ae57e34a662e5a4424a00a33bc785e4e4a35d57fc28d678885e4e18564318e93957b689ff36ea96bea69038a377400c6217f2 SHA512 19300545f23b83e06df0db74a605b48a62f5dd462db1ef69de903123209b50331ceffec783bd9564a15ee10dd1f0a6fc9e396f1384e56f7bb0cc83af08d1fda4
diff --git a/media-gfx/gnome-photos/files/40.0-fix-build-with-meson-0.61.1.patch b/media-gfx/gnome-photos/files/40.0-fix-build-with-meson-0.61.1.patch
new file mode 100644
index 000000000000..dbd8d72ffb67
--- /dev/null
+++ b/media-gfx/gnome-photos/files/40.0-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,34 @@
+https://gitlab.gnome.org/GNOME/gnome-photos/-/commit/a0ac868a19d55dc52100e54fe4b2d29041bc6752
+https://bugs.gentoo.org/831933
+
+From: rvalue <i@rvalue.moe>
+Date: Fri, 21 Jan 2022 12:36:02 +0000
+Subject: [PATCH] meson: remove incorrect args for i18n.merge_file
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 6e7192e0..94271de2 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -3,7 +3,6 @@ subdir('icons')
+ appdata = photos_namespace + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: appdata,
+   po_dir: po_dir,
+@@ -23,7 +22,6 @@ desktop_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: desktop_in,
+   output: desktop,
+-- 
+GitLab
+
diff --git a/media-gfx/gnome-photos/gnome-photos-40.0.ebuild b/media-gfx/gnome-photos/gnome-photos-40.0.ebuild
index 3e60765e15a2..b3eaa56efd2a 100644
--- a/media-gfx/gnome-photos/gnome-photos-40.0.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-40.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
@@ -59,6 +59,10 @@ BDEPEND="
 	test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
+)
+
 DOCS=() # meson installs docs itself
 
 python_check_deps() {
diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest
index daf9daa4e2f1..4ef81fead47b 100644
--- a/media-gfx/gnome-screenshot/Manifest
+++ b/media-gfx/gnome-screenshot/Manifest
@@ -1,6 +1,7 @@
 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 1409 BLAKE2B 67767e77b119c5fc9fbc452a7bba6ec81bdd222f82fb9723ee62004e6a0c4ae50ce0545b13715ca52b377646d27982559e16b2cd3184df845bba255e06ce1d67 SHA512 39a1dc5cf1f5d6519cdede12cbd1ab9ab939c1f2b6d1e4ab4cc2ffac9e9de9dfba22a8594fc177427160c54de1e47821883caf08741b10fc06f4bbdae99130c7
+EBUILD gnome-screenshot-41.0.ebuild 1457 BLAKE2B c3893b238a63eb32861006fb71aa394910c371e2cf623bb83f821e84aa90bc5bc7a925da5a0d5b737ead11f42c5a89bdae8d81a1e31102bd079acc3b7af23317 SHA512 68fb91e2957cfa8eaebe50a25f707d852a43019fafeba10b68fcd3e7cf9c0cc95071c6b619ccab8c03be52cfed366e0ffc41b1b2b703ed37e23b1728c8d5869a
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-gfx/gnome-screenshot/files/gnome-screenshot-41.0-fix-meson-0.61-build.patch b/media-gfx/gnome-screenshot/files/gnome-screenshot-41.0-fix-meson-0.61-build.patch
new file mode 100644
index 000000000000..3d06a0e70388
--- /dev/null
+++ b/media-gfx/gnome-screenshot/files/gnome-screenshot-41.0-fix-meson-0.61-build.patch
@@ -0,0 +1,30 @@
+https://gitlab.gnome.org/GNOME/gnome-screenshot/-/commit/b60dad3c2536c17bd201f74ad8e40eb74385ed9f.patch
+https://bugs.gentoo.org/831745
+
+From: Jack Hill <jackhill@jackhill.us>
+Date: Thu, 18 Nov 2021 00:46:58 -0500
+Subject: [PATCH] meson: remove extraneous positional argument
+
+* data/meson.build (desktop_file)
+  (metainfo_file): Remove extraneous positional argument.
+
+Closes #186
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,7 +1,6 @@
+ gnome = import('gnome')
+ 
+ desktop_file = i18n.merge_file(
+-  'desktop',
+   type: 'desktop',
+   input: 'org.gnome.Screenshot.desktop.in',
+   output: 'org.gnome.Screenshot.desktop',
+@@ -23,7 +22,6 @@ if desktop_file_validate.found()
+ endif
+ 
+ metainfo_file = i18n.merge_file(
+-  'appdata',
+   input: 'org.gnome.Screenshot.metainfo.xml.in',
+   output: 'org.gnome.Screenshot.metainfo.xml',
+   po_dir: join_paths(meson.current_source_dir(), '../po'),
+GitLab
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild
index 2ae3882d508d..9c0e2fba9bbf 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-41.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
@@ -36,6 +36,8 @@ PATCHES=(
 	# Fix HiDPI handling in X11 fallback
 	# https://gitlab.gnome.org/GNOME/gnome-screenshot/-/issues/128
 	"${FILESDIR}"/${PN}-40.0-fix-hidpi.patch
+
+	"${FILESDIR}"/${P}-fix-meson-0.61-build.patch
 )
 
 DOC_CONTENTS="${P} saves screenshots in ~/Pictures/ and defaults to
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 2dfb6db446c9..0b396a1b7b20 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -4,6 +4,6 @@ AUX graphicsmagick-1.3.36-flags.patch 2009 BLAKE2B 1d58f03cfeac9be92e2e85a2b6274
 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 3194 BLAKE2B 5637fb015a1fdbe686160a69b8010cdcff8a0b89c9ec90809007a26dcacdd077e99bebf668148830a56b4ba8d4eb72ecb0e6f0f1ef39a5244b279c920db73941 SHA512 9fab453650cbfcdfaab5f16e568413261074bebeea8a5e693c58ac97d0b0a4b835558c694cf2bb50f1b03c6241c0454e2e32e3e9746f721beea62f5f27254e93
+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/graphicsmagick-1.3.37.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild
index ff928ccc7da9..03a95689ff0e 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild
@@ -16,7 +16,7 @@ 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"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="MIT"
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 10a0c19255b3..b15e813594ec 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -1,9 +1,11 @@
 AUX graphite2-1.3.14-fix-cmake-files-libdir.patch 637 BLAKE2B 5bf2dfae7cf3af8a99a5095f618d3625d6f0f3b07f714c1101ac77058aa5ab969115cf2ce6a6164666488183fb5482d3f8b6fd8dea4df3ca1ecba9adb02788f2 SHA512 55805cecf9cde48079a81c8ffd93503dd9302f28140b640971ddee29e7a7da38840c826af072b5780372b56c0f0269cbda802e3e233139f086f5194cd8eb33a5
+AUX graphite2-1.3.14-fix-nodefaultlibs.patch 2396 BLAKE2B 0f845e6556486cfe5320d51fd0f5338caa8a068e84b48f60d09291659e70520ae3303c0d06050c5ff2a3c713919d835a615d2c0ad79c11aad4504375d8e3eb63 SHA512 d7e1c97ef8b4bc871075e61d58934b612ae7330a34b26aee1c3701e90d0d46bafb431c32c740ae276e5c153e330d8e9c27d4df6e2fdeee61dd229e6b6655aebd
 AUX graphite2-1.3.14-no-libtool-file.patch 2336 BLAKE2B a349e721264de1477aee5aa3e62d264b26c4665383fbe564de7b3a0420b77fcf8ce90a65a650fc9e2144969a2f00abe7ff7c9ebe6f53c7b2fdc3271fbd55f6ce SHA512 3553e237808bf981cf35e9fa8de7b77fa1ce87c72733c806df8e523ea624a0e5e2ad87a0b4cfb9330e7cace0fb016c2c729085de2d21e959790955fd370f378e
 AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3bcaf0af3e6b29a0269581390f64950e42e41280e482fc9cfda9bfe24ef166eb6c24d21377a15fca4264fec69d902d8ba18810bdb01 SHA512 26ab6dda13d758a5e4237c8b5d207d3c5111afbb11b2c3984cd742913c3c7932559b23b5ea9f774f1c6373eb0f761a9400dccc95876740b3cd06c44084a10965
 AUX graphite2-1.35-fix-gcc-linking.patch 697 BLAKE2B 3f4f181477e5f2f5db85f0b5c76dfb2b471c41cb42bfce9a4663fc8aab7035371690077c45cff580c6a700a65466f866944e34127b307f6ef44035f47a65fabd SHA512 f8a8481f5e8e0178e38e8b8dff2e2b1d2f3143d1f1eca6b3b2ea15ea087651dff150fae8166ceaf18eb3995bb480f09e185ddf89b4ad6e352e1085d4655c71b7
 DIST graphite2-1.3.14.tgz 6630061 BLAKE2B 72bf6736aaa8476a89e44ef53c5b6c94f45d815fe1a451ba6b3696bfe023971210975dee4a9c8cb3042f36442e4efecf5baf171ef4230ad2b10694a89865f918 SHA512 14b5eb2ba8158b8b62ffa7fb142100a0af1de0f0c45b2673801b636714a106b46fcd423b05c722d963c9543fafcf10fec811975308211a54f20a3ba322d7b295
 DIST graphite2-1.3.14_p20210810.tar.gz 6656693 BLAKE2B 63a7d96b58f2779d8a4a353e1a986212b884fdf780fedcb83b22dcef2f7678d44c88c14ece2d09dc745df505a4a3825ce61d7c84bd05fd4e98c23d6e86e9326d SHA512 be54c1386578970cf65c1860336a113268181753c1e2a139e37ceeafcfa76e3162086879c54094d70cd0d36ad5852a95390aaa69572d875921e9481f1ae508ff
 EBUILD graphite2-1.3.14-r1.ebuild 2994 BLAKE2B 85a0519e9610d966b043b1ac73c58d17a1cd4729e71369dca175e3ca283a273ae2e00c552372258c20f862c250846d7f29bd252b187a2c12bbaf87595b09d5fa SHA512 8bebde5715ed78ffa35d3466638a00a57009fb16f38c330d1214e6237b4543eac9fa9b3e3919251425699641d504d13262dfd2a8042b8254da04dca6a18c7805
+EBUILD graphite2-1.3.14_p20210810-r1.ebuild 3076 BLAKE2B 6deb2640eff017328f3d38bf8b921085d2a20f15e6e3e1ae381938a275fb1c9df225a5ea8b60dd402afc085a6eaf7c7960c54f360b22c7866a2c6039e2a9a802 SHA512 0d294aa41791c19f6092d37fa2b24836a021c5ad33e587d3e33fced0eb82b52eec5d3cb2bd0fe41db60a0c79746d55f64cbb5783c92c55c7452f87d35574cc43
 EBUILD graphite2-1.3.14_p20210810.ebuild 3024 BLAKE2B f99caacdcf8a058683ef8e2ab0d1c26ce783ced212c2bea130193dfa735e0276980d76ba359aba48dab757e37c005e45f89c1c19b6c23743747620985df63ed0 SHA512 e02a9f36ba1a9f9645b5f8132991c4c28342a7d590982afcbe70120f3bfc17518f7e75260590a05fb8bd037932b8e10e2fe871f00e0a414e8b29af92423feccf
 MISC metadata.xml 337 BLAKE2B a406b2f1af9217abda601c1a860904b7897c5646bc145befae7e87038a42e6b60f5290cb7258469de61761b67f74e12eef1e5a632aad219978d021e045eaa6da SHA512 1d7d7bc940d89cad512580d43120946e028c7866f844dbbc9242b0c29bdb1058f181c38eb63bdd50007afb0e95adade98e5a5f234964c1e1dfb8d15bda961c2f
diff --git a/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs.patch b/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs.patch
new file mode 100644
index 000000000000..a7e5804319d7
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs.patch
@@ -0,0 +1,45 @@
+https://bugs.gentoo.org/829690
+
+See https://github.com/silnrsi/graphite/pull/44.
+
+Drop -nodefaultlibs:
+- graphite is written in C++ which makes avoiding libstdc++ (or libc++) a dubious
+  goal;
+- this ends up breaking e.g. x86/musl because we need to inject -lssp_nonshared,
+  but it wouldn't be surprising if it broke other exotic targets too.
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -105,7 +105,7 @@ set_target_properties(graphite2 PROPERTIES  PUBLIC_HEADER "${GRAPHITE_HEADERS}"
+ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+     set_target_properties(graphite2 PROPERTIES
+         COMPILE_FLAGS   "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wctor-dtor-privacy -Wnon-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden"
+-        LINK_FLAGS      "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}"
++        LINK_FLAGS      "${GRAPHITE_LINK_FLAGS}"
+         LINKER_LANGUAGE C)
+     if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86")
+         add_definitions(-mfpmath=sse -msse2)
+@@ -135,7 +135,6 @@ endif()
+ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+     set_target_properties(graphite2 PROPERTIES
+         COMPILE_FLAGS   "-Wall -Wextra -Wno-unknown-pragmas -Wimplicit-fallthrough -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden"
+-        LINK_FLAGS      "-nodefaultlibs"
+         LINKER_LANGUAGE C)
+     if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86")
+         add_definitions(-mfpmath=sse -msse2)
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -47,12 +47,12 @@ else (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+     set_target_properties(graphite2-base PROPERTIES
+         COMPILE_FLAGS       "-Wall -Wextra -Wno-class-memaccess -fno-rtti -fno-exceptions"
+         COMPILE_DEFINITIONS "GRAPHITE2_NTRACING"
+-        LINK_FLAGS          "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}"
++        LINK_FLAGS          "${GRAPHITE_LINK_FLAGS}"
+         LINKER_LANGUAGE     C)
+     set_target_properties(graphite2-file PROPERTIES
+         COMPILE_FLAGS       "-Wall -Wextra  -Wno-class-memaccess -fno-rtti -fno-exceptions"
+         COMPILE_DEFINITIONS "GRAPHITE2_NTRACING${TELEMETRY}"
+-        LINK_FLAGS          "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}"
++        LINK_FLAGS          "${GRAPHITE_LINK_FLAGS}"
+         LINKER_LANGUAGE     C)
+ endif()
+ 
diff --git a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r1.ebuild b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r1.ebuild
new file mode 100644
index 000000000000..cdccddf64039
--- /dev/null
+++ b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT=80c52493ef42e6fe605a69dcddd2a691cd8a1380
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit perl-module python-any-r1 cmake-multilib
+
+DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems"
+HOMEPAGE="https://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_home"
+SRC_URI="https://github.com/silnrsi/graphite/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/graphite-${COMMIT}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="perl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="perl? ( dev-lang/perl:= )"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/glib:2 )
+"
+BDEPEND="
+	perl? (
+		dev-lang/perl
+		dev-perl/Locale-Maketext-Lexicon
+		dev-perl/Module-Build
+	)
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/fonttools[${PYTHON_USEDEP}]')
+		media-libs/fontconfig
+		perl? ( virtual/perl-Test-Simple )
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.5-includes-libs-perl.patch"
+	"${FILESDIR}/${PN}-1.35-fix-gcc-linking.patch"
+	"${FILESDIR}/${PN}-1.3.14-fix-cmake-files-libdir.patch"
+	"${FILESDIR}/${PN}-1.3.14-no-libtool-file.patch"
+	"${FILESDIR}/${PN}-1.3.14-fix-nodefaultlibs.patch"
+)
+
+pkg_setup() {
+	use perl && perl_set_version
+	use test && python-any-r1_pkg_setup
+}
+
+python_check_deps() {
+	has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	cmake_src_prepare
+	use test || cmake_comment_add_subdirectory tests
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		# Renamed VM_MACHINE_TYPE to GRAPHITE2_VM_TYPE
+		-DGRAPHITE2_VM_TYPE=direct
+	)
+	# https://sourceforge.net/p/silgraphite/bugs/49/
+	[[ ${CHOST} == powerpc*-apple* ]] && mycmakeargs+=(
+		-DGRAPHITE2_NSEGCACHE:BOOL=ON
+	)
+
+	if use elibc_musl ; then
+		# bug #829690
+		if use ppc || use x86 ; then
+			sed -e 's:${GRAPHITE_LINK_FLAGS}:-lssp_nonshared &:' \
+				-i "${S}"/src/CMakeLists.txt || die
+		fi
+	fi
+
+	cmake_src_configure
+
+	# fix perl linking
+	if multilib_is_native_abi && use perl; then
+		# we rely on the fact that cmake_src_configure sets BUILD_DIR
+		sed -e "s:@BUILD_DIR@:\"${BUILD_DIR}/src\":" \
+			-i "${S}"/contrib/perl/Build.PL || die
+	fi
+}
+
+src_compile() {
+	cmake-multilib_src_compile
+	if use perl; then
+		cd contrib/perl || die
+		perl-module_src_configure
+		perl-module_src_compile
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		cmake_src_test
+	else
+		einfo "Cannot test since python is not multilib."
+	fi
+}
+
+src_test() {
+	cmake-multilib_src_test
+	if use perl; then
+		# Perl tests fail due to missing POD coverage...
+		perl_rm_files "contrib/perl/t/pod.t" "contrib/perl/t/pod-coverage.t"
+		cd contrib/perl || die
+		perl-module_src_test
+	fi
+}
+
+src_install() {
+	cmake-multilib_src_install
+	if use perl; then
+		cd contrib/perl || die
+		perl-module_src_install
+		perl_delete_localpod
+	fi
+}
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 353b0bfb1504..d182a9319cd6 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,5 +1,3 @@
-DIST gthumb-3.10.3.tar.xz 7582472 BLAKE2B 1e8274720428db05d4e14bb6a37ff55a74fe009ea551bda6fe75506f7187e03685903c2743fb6e66a33da73c974188528afad866c568bb14cc6f05749e08af7c SHA512 2d157644c6efbf4f4ab31c525a4eecc69fbdf31003f922d5fdf8866ca6bbb44e5b8bd7f809be12de41178ddcef30bb49029ea06eb4feb8398a6aa1b052c6ae38
 DIST gthumb-3.10.4.tar.xz 7581416 BLAKE2B 7afc94c18d819a5eef7d075489533cf99e7f6d5eaf409b163524a2f62d9c22a40edbc114b16d6d7b7960df53d49cefda9196ebeaa2bc0c19e5760f584628209b SHA512 90f7d83d2fb6db12ef16e5ce29d9310ed5aaccb269004d72df985dda839c1ce738354942f537a23f63cbe724a351a0f13f2eb1e659ada50196af1bc60d5c5d27
-EBUILD gthumb-3.10.3.ebuild 2341 BLAKE2B 6cbfaeb1e30c5a1ad00512dcd5c67d97fc6ae29f90d354df65fee9b476985547fbed6e92561ee6eb6e585bb765c5d5d5a6ce7ac80bb39bbec914db16af958e7a SHA512 1ada649377e6c9e073ca5c9e85d10010533492192cba33a8aa4baad70a259aa3c24792aab04b5f042e1280ac2186b0240e85b28243ff7afdbb085e338d13b8e0
 EBUILD gthumb-3.10.4.ebuild 2348 BLAKE2B bdbd9aedb683d9a02e2731418c175405d50ce3388400970d944dbc119af902e57bcf735c2ee4bd7744be41b2fa77bc5ae22edf148061fcf29ccaa35825bed17c SHA512 aaac5963f3b6d12596c6b216fb29a2269d322013f8db95a45b38abf07053087d6132725985b5781bbf9e2b1804597700172da0179144c3511653614e44530ced
 MISC metadata.xml 421 BLAKE2B 4b3895ebffd9ff5b3b63f7b32cd30e4e36f1156a9201b1e8d4cac7de62bd1cf72b2d11e321bae2dffe0818c6140170f6b14249ce4a38f0e65a78139f98316f06 SHA512 91e93d9d56d9254c80723c864178ba2f0e31e7d2fd998ccece63c8d225bff0c5b3477c98c94deb3c768a6e150dbbd3eff7d8c0d9f0abf31bab9207b0161eab10
diff --git a/media-gfx/gthumb/gthumb-3.10.3.ebuild b/media-gfx/gthumb/gthumb-3.10.3.ebuild
deleted file mode 100644
index 98453f4bdf2a..000000000000
--- a/media-gfx/gthumb/gthumb-3.10.3.ebuild
+++ /dev/null
@@ -1,97 +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} )
-inherit gnome.org gnome2-utils meson python-any-r1 xdg
-
-DESCRIPTION="Image viewer and browser for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/gthumb"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="cdr colord exif gnome-keyring gstreamer http lcms raw slideshow svg tiff webp"
-
-RDEPEND="
-	>=dev-libs/glib-2.54.0:2
-	>=x11-libs/gtk+-3.16.0:3
-	exif? ( >=media-gfx/exiv2-0.21:= )
-	slideshow? (
-		>=media-libs/clutter-1.12.0:1.0
-		>=media-libs/clutter-gtk-1:1.0
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-plugins/gst-plugins-gtk:1.0
-	)
-	raw? ( >=media-libs/libraw-0.14:=
-		<media-libs/libraw-0.21 )
-	http? (
-		>=net-libs/libsoup-2.42.0:2.4
-		>=dev-libs/json-glib-0.15.0
-		>=net-libs/webkit-gtk-1.10.0:4
-	)
-	gnome-keyring? ( >=app-crypt/libsecret-0.11 )
-	cdr? ( >=app-cdr/brasero-3.2.0 )
-	svg? ( >=gnome-base/librsvg-2.34:2 )
-	webp? ( >=media-libs/libwebp-0.2.0:= )
-	lcms? ( >=media-libs/lcms-2.6:2 )
-	colord? (
-		>=x11-misc/colord-1.3
-		>=media-libs/lcms-2.6:2
-	)
-
-	sys-libs/zlib
-	virtual/jpeg:0=
-	tiff? ( media-libs/tiff:= )
-	media-libs/libpng:0=
-	>=gnome-base/gsettings-desktop-schemas-0.1.4
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/glib-utils
-	dev-util/itstool
-	sys-devel/bison
-	sys-devel/flex
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Drun-in-place=false
-		$(meson_use exif exiv2)
-		$(meson_use slideshow clutter)
-		$(meson_use gstreamer)
-		-Dlibchamplain=false # Upstream still doesn't seem to consider this ready
-		$(meson_use colord)
-		$(meson_use tiff libtiff)
-		$(meson_use webp libwebp)
-		$(meson_use raw libraw)
-		$(meson_use svg librsvg)
-		$(meson_use gnome-keyring libsecret)
-		$(meson_use http webservices)
-		$(meson_use cdr libbrasero)
-	)
-
-	# colord pulls in lcms2 anyway, so enable lcms with USE="colord -lcms"; some of upstream HAVE_COLORD code depends on HAVE_LCMS2
-	if use lcms || use colord; then
-		emesonargs+=( -Dlcms2=true )
-	else
-		emesonargs+=( -Dlcms2=false )
-	fi
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 1d66ea334ad6..420c383b8fb2 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-463.tar.gz 39435289 BLAKE2B d6e2f97f12b8141019012a0c86e3f99f2c1041cb70aff1e8c4aab3d1a6594d68f415afd8059a91407d151d72820b71dbb10516f5b717b0f7665563c1cd4f302c SHA512 3dcf2fb0107459171ce227edb1031c8478e20919e163d1c5779d524e3fcd66a038d4c278c29fc98ce34884e75a1ee50a22c0211f272afb1a4d1e7a977890202b
 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
-EBUILD hydrus-463.ebuild 4098 BLAKE2B a6b0a5817e577b1539d2b3a047f7253ba6bfe0babcf637f583daae1fe67b51da9350a846f27d04ca492e15e6de7a5a7375d0db31267fba89a52e3bba4690a5e7 SHA512 6be825a196983e5c4888e9a5877a48aea7119b300f068ac3961efc919e12bc8da60a413de8db277f7972765a3e32cec78b179fe6f17ac0596e31d97c7cbed53a
+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.ebuild 4098 BLAKE2B 06af752b10b68099c338a4de0389154fa965fcc73bf58a745a00aa7c2feca46f55d81855c024c01d487fc13be3401ce2cad52cc5e9c03ca34ad7b26bc1c8f6ca SHA512 befb01f8efa6bb5bc225de34028a64ecf819c0c93838df9997498c9267cff399deb7a0ce7706c9a19cd5820464188240f94b67407fae016102f4f964013575e9
+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
 MISC metadata.xml 751 BLAKE2B 05dfcd30440ca7bc1375206469123c5bb93ff7fbb7612191faabee7abe87334bfb4f25db3291cd3a989264516c315eeb489eaac2c83c95b2436446966ba27880 SHA512 f2e7c839e4567355bb6ff1cdbf1355ab7a2fbf166a3f87ac7a8af92fc80efa7833010376317a38e2594a203be66bfcb3e0df9dc7346ac3d37d8466bb0368b50e
diff --git a/media-gfx/hydrus/hydrus-468.ebuild b/media-gfx/hydrus/hydrus-468-r1.ebuild
index 8ce7aabfa36d..f45dbc3ac8ef 100644
--- a/media-gfx/hydrus/hydrus-468.ebuild
+++ b/media-gfx/hydrus/hydrus-468-r1.ebuild
@@ -41,7 +41,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}]
diff --git a/media-gfx/hydrus/hydrus-463.ebuild b/media-gfx/hydrus/hydrus-469.ebuild
index af8a34decb6b..f45dbc3ac8ef 100644
--- a/media-gfx/hydrus/hydrus-463.ebuild
+++ b/media-gfx/hydrus/hydrus-469.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+EAPI=7
 
 PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
@@ -41,7 +41,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}]
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index c510799d77e0..f3cc92b1ac8e 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -2,11 +2,15 @@ AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
 DIST ImageMagick-6.9.12-28.tar.xz 9181044 BLAKE2B 2efc03da9e4c53b82479badfcc9a25f05e2d9766031807500a6bb39cba2a800c39a93a16864ca9af3a0b33d0c1c95cb2f33264c7e00149204ca742673c3d07ff SHA512 ec96fca6b385379873ead007b011d87fb3939ed4e3631d2a9401f1467db59d1d1ced072fd4fefe1577d04302a1060dbc324631b420f41a99bf32465b540ec979
 DIST ImageMagick-6.9.12-29.tar.xz 9179740 BLAKE2B 9d1e03c309c8c83b872de19c381810a9dcd9b3e9dd2c40dda872786af47d415986f9c73ce317eba84431e3635635d39c86ff5dfa22ee9b616c22c6e4bf113cfb SHA512 2f1c6f102e0893a07bb8d1cdc0acc646acc4a3db9c19bf3bf89e9a23962a8b91bd9deab24256dcb7c9bf7adaf6ed719a9dea96790bea09a028a50b14b2f4b032
+DIST ImageMagick-6.9.12-35.tar.xz 9178620 BLAKE2B 8bcf8bcc8bee8fe3d996a3b9388fdc20a6bbd45dda35121a9fb84804277286cb17c3b6cf2e6096765aefe20a31f819f8bcf094b0b3b1c68b683b50ddc415b398 SHA512 ba1f49570d1f890bc313d4e58c53c2b7388108c64cd2c5ef7586a7568f72d5655fced1a22085e27858cffcf86b7548376970fc6947fccb36f4cfba48327089e6
 DIST ImageMagick-7.1.0-13.tar.xz 10311564 BLAKE2B 7cb3e58f548cbe0b9e1239df47ff4f42af2cd0b6ff4c417a62515ff9bd434ecabed2cc7f7cb7cf8880f20af3f6d7de33d7368f146b9ac7668149959966a463d8 SHA512 dac1fc229599a63703fc3aa1378de313dc94dfbfa71913dc408ef65c88ef33820b5ddab4c9a064a86cc35c0abb0136f0adb626bff9e227b52ed0d90993688044
 DIST ImageMagick-7.1.0-14.tar.xz 10318332 BLAKE2B ca8db5d53c05099ab8fe0e6d810cebfb3614962e197d4fda7d958f1f7f469e2be461980578049753c5a3f5f0d656ca0d816abae51dd5dab44910e8d82c8d9fb0 SHA512 ca07ec69acee4f82baf3056116f6d1272eabd38acd55c67cab5c15cdd4b5b601f5b060b36943c0ae24f100ea47e0aa0af5862aae3b43e9477163e08dbde32f1d
+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.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.ebuild 7407 BLAKE2B 9488dd72e898a148ee4b58112764f64df4927b3eda0ef8c6b31dfec9a8b80f36b303ba0c3f7370ac9efcffd70b983cceaccac2487f075d39d6af8e3d977dfa9c SHA512 3765419540bd0daf103da72f7a20cc1f03f24f200d7f2b337a19b58ba0ea7ea412a19da798329f252590c498191e2b9b3c030de163a0ab42755f784174a85d37
 EBUILD imagemagick-9999.ebuild 7401 BLAKE2B 177c88bf09323bc3898bc99c79051f8c73450cc19e063f04f91b079172c22e02d845b94084afd5fd26143aa7f95f670bb7319b80a27dadf83a3650607dc45468 SHA512 4c087fd762f72d88baa8bf8564b3245bd21ca4cf99d009b3537bccba1638ec79623c27cabeec8570f8058e16057ed66b260889db653a949d78c36970796381f0
 MISC metadata.xml 1227 BLAKE2B de893eae7e8f8e299ae10df13d202819b60df3b85858eacbe3455c4f27627689e7790a6fdded32d11d3157c35b5a2e08cab958e84b8f5799bb298deca15a1d4c SHA512 726e0c2cea973806fef1a3f51da11fb525b6a2e75bf2221a0939adbe50d2d8e267c5e627eca571e39769e4c14b134d2b9be3792047523540620c2eac149dd066
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.35.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.35.ebuild
new file mode 100644
index 000000000000..eef825d2f2f3
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.35.ebuild
@@ -0,0 +1,262 @@
+# 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
+
+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 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# 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
+		--with-gcc-arch=no-automagic
+	)
+	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.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.20.ebuild
new file mode 100644
index 000000000000..5e98ec4873eb
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.1.0.20.ebuild
@@ -0,0 +1,269 @@
+# 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
+
+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 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# 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
+		--with-gcc-arch=no-automagic
+	)
+	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/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 6ef737ae2820..4f33b58c10c7 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,6 +1,8 @@
 AUX inkscape-1.1-poppler-21.11.0.patch 690 BLAKE2B 61fbaf22fa86170d1a72393795fb195b5c93d1c9f3e512751d4a9a355acda28656978529c1022caf9df701bc86e3c2b6e50b14eeed5d0c013013090b51ff6716 SHA512 9c7a312de85d11aa8ff3f7347a5c08ef84050522bc8ab59f9aa1aa84c405ddb707275cab7d447e34b1593d633b99fb8e482864e9397c576d688dcd7d34035c6d
 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.tar.xz 34203156 BLAKE2B 38896509dcdcf1ef18523c790855035ef16dfae75e27c2d69f782270f52a579557edcb790bef30f3210b9f797a619369d7d16dd23f098debdd8e5b6abf9b30aa SHA512 54b75f8794d748ef59d5b719ea04e3debadc1a5cf3f62f14254502567973bbd634850edd0a3bc082be878dacf041e9bd10982c4846bf154f89aa5319eda4ee80
 EBUILD inkscape-1.1-r1.ebuild 4365 BLAKE2B 1a575b33c2b7a90851560291a17ffaeac85287c6dc1289c096a06e9a21da4490b8cd72590e61e390aad50542a0d18bd941c62e32ff625700071ec97383003461 SHA512 2f387d0c8283204aa667ba103274527b4ea9e97daef7775bab8b2cce42d44da5ad4b50ec1e4ae49d0409dd4c2f3c63a29f224451c8569497851113abf34fab2d
-EBUILD inkscape-9999.ebuild 4224 BLAKE2B ae54a77ce4d1aab3e2f9c550017632f54ccb1e41cccc4b32b3769afc934d5bbafe3f4935c24e61610bed7e8578e20b4eeb96f50248d819263d8476312ef3af0d SHA512 fe29d3e89ccdcac3088a7c369353d70eeee54b6e1c8e0b9716377e240f3ebbe498dd7ac8244f8e9f376eda86a0932ad65d9a76f05696d81992c7e39eefc25c37
+EBUILD inkscape-1.1.1.ebuild 4198 BLAKE2B 25d7e6a67d7971b573a498f26a487d318d2f1e751d6c7a16afc13cb68c60f8a6402190e42534c443f98432390e98ec8a46562a72dbe2a744570da3cc64e4adab SHA512 5033c65432b52f8674654514043b62c342f39fbaf98acaeee3a823b988c644cd73442c7a8c4e9bc2ff46f307355102b14b3d8258e0c82cfa835f92ace64d194d
+EBUILD inkscape-9999.ebuild 4498 BLAKE2B cec5ba92467d97f7a6732f16f95dff330645f4b65e7bcde7fe0b82e08b264762950971fb8be08f99261fca734f5c99711dc502d47707fd5eb1008ae2bb8fca02 SHA512 17ccd273ee58f91004335e433dc8a130bff50c2ead9e80e17839a117a3ab1231f2b83b357a77f5060b777a4cc5b104a34c8ba0626d66b4316d57f82724076d32
 MISC metadata.xml 984 BLAKE2B 8aee1f973005f9587571770eb14ccf725bf3ba9034d9935b029f776e64e17a9e156ec864e1150b259d2a983aec6e53b10791be4f1a3b67d5aa465ee115d966f0 SHA512 7ee7c7d473ae2120b9f592777b08d77899c6bf7f750f09cc334dc76a997a472e2593442fb281a9984d77e1aa4eca39e389484405e0aa8b5614da0f718c713fc0
diff --git a/media-gfx/inkscape/inkscape-1.1.1.ebuild b/media-gfx/inkscape/inkscape-1.1.1.ebuild
new file mode 100644
index 000000000000..080afaf78213
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-1.1.1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
+
+inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
+
+DESCRIPTION="SVG based generic vector-drawing program"
+HOMEPAGE="https://inkscape.org/"
+SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
+openmp postscript readline spell svg2 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}"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}_2021-09-20_3bf5ae0d25"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-1.1-poppler-21.11.0.patch
+
+	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
+		-DBUILD_TESTING=OFF
+		-DWITH_LIBCDR=$(usex cdr)
+		-DWITH_DBUS=$(usex dbus)
+		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
+		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
+		-DWITH_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_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 c77a2bc64410..863a38c311f8 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -1,22 +1,28 @@
-# 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_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml"
 MY_P="${P/_/}"
-inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 git-r3
+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="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
 
 DESCRIPTION="SVG based generic vector-drawing program"
 HOMEPAGE="https://inkscape.org/"
-EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
-openmp postscript readline spell static-libs svg2 test visio wpg"
+openmp postscript readline spell svg2 test visio wpg"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -105,6 +111,15 @@ pkg_pretend() {
 	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
@@ -130,7 +145,7 @@ src_configure() {
 		-DWITH_JEMALLOC=$(usex jemalloc)
 		-DENABLE_LCMS=ON
 		-DWITH_OPENMP=$(usex openmp)
-		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DBUILD_SHARED_LIBS=ON
 		-DWITH_SVG2=$(usex svg2)
 		-DWITH_LIBVISIO=$(usex visio)
 		-DWITH_LIBWPG=$(usex wpg)
@@ -152,7 +167,6 @@ src_install() {
 
 	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
 
-	# No extensions are present in beta1
 	local extdir="${ED}"/usr/share/${PN}/extensions
 
 	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index cc9ef1c869a1..10f3c480fffa 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -3,6 +3,6 @@ AUX librecad-2.1.3-gcc-9.patch 8494 BLAKE2B 85f7cfd7822d27c4b76b6cc9b71f9667b912
 AUX librecad-2.1.3-qt-5.11.patch 1396 BLAKE2B 80e637b724df81dce60c17354bed56a2329dd4c3f445b40ea18a4a49614f2ee34114e1b6cc008b29e2dbd7b65c53340aaa447173f6f4d23d80e1a8809131aae7 SHA512 5e4ae43ac89fc8acf779fec9e062cac3896f0e41b0bf7fdab91ef128ab1a20a4ecda71ef332d9af7403f11a813323cc509e0682e5ffdf97786599271a2711f25
 AUX librecad-2.1.3-qt-5.15.patch 1270 BLAKE2B 0947b13ff328e4f1c3ac04d846e7ed372d76d4858cecff5fe4ff8fc8c3c1558cd0e9ac53354e1f0b5b1d137db09c8205f034df9356b9b9e3206a611608fb8166 SHA512 b1a5afe1d22b7725c7d10a10bed5e52495cda7699ff20bd0f75bbfe28f7131a3d9cd5ec0a1ae7fd329196d2f88bb4b8336301fdb6efa073d773f31340a062ba0
 DIST librecad-2.1.3.tar.gz 22415288 BLAKE2B fb920113a7e4b2e9e7e3425f77364c36f6be676a3cd109798786b06d31698fd11437bc7f50cb843ca02d761730e83db7fde475d1bce6a65336a845b5b0114918 SHA512 246cffcc1ea3389997b4a738ab5e3d78e8c1096817ecb1ca28f38d601bc5d1a95f60798ac82308914a34da7b5dbc302b8363cf8b58a97221fdc8ee63010adc6c
-EBUILD librecad-2.1.3-r6.ebuild 1247 BLAKE2B 8e485f4201300cd7f2f0bdfeac80ffe6f817bd8ffd84ebb09bb25040ebd117f5a8dc9479dbe9774eb404472019a75afa0040dd6040fc54928901b76b715ed155 SHA512 647bb8b6030ac9cd5a5f1bc45b411a4df611bad6f17d43272c5b0b673335371d44637d7902c224424fe4fe14aa92d5dcb6d891fcacd8b7a23a428cdaf3119e8b
-EBUILD librecad-9999.ebuild 1184 BLAKE2B 885ffdfa84fe6474aa6e8b37c155b3541368ccdc74a300d9051cb8660d089366c0438c7da072025ef1c337d498df31e816e3588056b61d1b769c38f5e20a6c27 SHA512 97c0ba730cd9887409ce3f0b413e966402cb12d988fae0a0bcf1486842260492e89a5c7fb707f77bc99993f8c9b319cebbf89d8d88743cfc39db6c567723f6b1
+EBUILD librecad-2.1.3-r6.ebuild 1254 BLAKE2B d6d75d7b1aadc436b633af6cd4134fffccf7571c3b8c065b80790986d025eb37adcd5afd66102d6bbe8aaa9d712eb28ebf54a293f57907e32ec55a2efff0bca3 SHA512 82b25277f0de277d7884d52520e67503c413ad8ad65b8df64024f5dcdf8704a481c11ede8185014964b7aaa9e0abe3e775043c6e976c5eae8c43cbc9e14e8e7a
+EBUILD librecad-9999.ebuild 1191 BLAKE2B 3e8277ba06d2de3b30f1e7325f01e4a9cc64538ff2a3fef3c2f844785a4a77db33993b2839c04e12c20808aa5307f000856dd1934276ff66eaaac4e938a8b378 SHA512 75d1796d6521cb3cc72eae6d0437d8548a315d538a13fd42cebd847fc7c4f671edf802377467af44322399ab2d1d0c2479944c1f5cc3d290aad40c90531e1200
 MISC metadata.xml 333 BLAKE2B 2790ea3fb043f1d8393fd715b4669edab3229e1de59e27cc70f3fd3cc13f83964ad1dc6a5534af981111b4ba1a2c7d29501015459e300905574fbc59fce88ee2 SHA512 bf932b64f53780d10e7e64845f4d50f1726f9d57e4625cb94ed2dcc761a0d7f409731b9e9cd1475880b283b43d7b0b979493b984cb243f09954a38f39baac5b9
diff --git a/media-gfx/librecad/librecad-2.1.3-r6.ebuild b/media-gfx/librecad/librecad-2.1.3-r6.ebuild
index 9e36da264e46..f068df1cafc4 100644
--- a/media-gfx/librecad/librecad-2.1.3-r6.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r6.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 @@ SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc tools"
 
 RDEPEND="
diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild
index 4f1a71b35035..445cd8eabb8a 100644
--- a/media-gfx/librecad/librecad-9999.ebuild
+++ b/media-gfx/librecad/librecad-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/LibreCAD-${PV}"
-	KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest
index 3be6611ff826..a1cf4356b351 100644
--- a/media-gfx/lximage-qt/Manifest
+++ b/media-gfx/lximage-qt/Manifest
@@ -1,3 +1,5 @@
 DIST lximage-qt-0.17.0.tar.xz 109772 BLAKE2B e49c6fb2b3db9b5ff829f7003862ab8124773d82a540019f2ba64c48fa4fffff0eb5f317b8222be95b1b030b5d64a961d4c96298275a835f56816dc857cc6e27 SHA512 fb7867f5589fa45f3e2d37dcd0733c49fb5439206b11d2a43020305c5c7d222796aa0cf2dbf19d5fc7829a34d3877241cb4bb36ea2883a41503eadd39deaf8e0
+DIST lximage-qt-1.0.0.tar.xz 819396 BLAKE2B b4445145319f755b6c6303fac98e3941c22aae66883bbb4d7c1b8f5d5a552c8b3242ef1ca701d01c930afaf97cf59bbff8b15a5481543945c6abccd0241abbe2 SHA512 b78ef64316978a91ab350ab4588b0e5a7d1cfd2cda90ceac739ed8e1668cd6e34a164bb1cd818ca8175a5677d8bff8a50cd7c6aa2cd99ad87116a6da969534cb
 EBUILD lximage-qt-0.17.0.ebuild 943 BLAKE2B 7df4a44f76b273986f3dedcd7ddc9dee2cbbd04d337cb87611336dcb1b9e2991220446b589fb33caf4e4abeb6defb172c16a342a43f5c1e247a68acc55e23bcc SHA512 f2bd743477b7fac27d2224bec1c37e20c7733367a0b3a9ab09ae60efda553feb867a7cf5fd64225690963fbeab9703701b8141c3c300f130f500290061361ea6
+EBUILD lximage-qt-1.0.0.ebuild 1083 BLAKE2B 734ee0618a450e4db9859a6e6f87a4bf145fb62491696beed58d9612a6f3ed55b9ab88991c0ac2421a3e3c16915e747f04d5622854ab68e488745942b60049de SHA512 8e6605755582803fc18347cbb0a6488ded731b1c7124baace16004ace9e19948d2714e94bccb2128020c8f1887c0fc91b17707acfd71cb213fefdc9c689c1404
 MISC metadata.xml 317 BLAKE2B f63e3e91e5dc9fcc6113bf1ae9c9bb5680d2b7cf40359eaa058dcbc247f3b2f43f540ffa6525935220d52c3e8b94ee3629ce237c788c8e4f0946dddbf610680e SHA512 74c882b00f38c28d8546d31c59636252b2627053143a1bea3551c4bc507a63361c88bc555ea15760395f995c6d20dd6fe6adf65f11d42cc90ffd8378aae03f1f
diff --git a/media-gfx/lximage-qt/lximage-qt-1.0.0.ebuild b/media-gfx/lximage-qt/lximage-qt-1.0.0.ebuild
new file mode 100644
index 000000000000..bff81bd1d821
--- /dev/null
+++ b/media-gfx/lximage-qt/lximage-qt-1.0.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="$(ver_cut 1-2)"
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Qt Image Viewer"
+HOMEPAGE="https://lxqt-project.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+
+BDEPEND="
+	>=dev-qt/linguist-tools-5.15:5
+	>=dev-util/lxqt-build-tools-0.10.0
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/glib:2
+	>=dev-qt/qtcore-5.15:5
+	>=dev-qt/qtdbus-5.15:5
+	>=dev-qt/qtgui-5.15:5
+	>=dev-qt/qtnetwork-5.15:5
+	>=dev-qt/qtprintsupport-5.15:5
+	>=dev-qt/qtsvg-5.15:5
+	>=dev-qt/qtwidgets-5.15:5
+	>=dev-qt/qtx11extras-5.15:5
+	media-libs/libexif
+	=x11-libs/libfm-qt-${MY_PV}*:=
+	x11-libs/libX11
+	x11-libs/libXfixes
+"
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/media-gfx/mcomix/Manifest b/media-gfx/mcomix/Manifest
index 5df817fda5c4..92b89d197043 100644
--- a/media-gfx/mcomix/Manifest
+++ b/media-gfx/mcomix/Manifest
@@ -1,6 +1,6 @@
-DIST mcomix-1.3.0_pre20200206.tar.gz 3292571 BLAKE2B ad76316020645495042d27bf831588e628da11077efe29b302a57be4e688558b4db8d3f850200bf4a54b84b428a16a52f88ea5e20be85b628ef3630a5f624643 SHA512 c98d4a7022993af3a5c0b5425df52f14b586549472bcd4576a72039c8c6d4fde31df4255df45ab7467acb0280bda02b92d4803b7f92b7c1c818b58df7b52a3ff
 DIST mcomix-1.3.0_pre20201123.tar.gz 3888279 BLAKE2B 0bce5d8b3d6e20fc3c422d137963fa8cf506ce969bb5c8062b1db4dcd85d5c1912352fa1eb8c752719b0ac95715486ae47d56e0bf24119f9f55af56f6fbf657c SHA512 24b470e1dca266851bb241f109b39c785443ece36d12a01e579c8a59cb7585ad3978b3696829318f04d4b172cfcf57cf100d76c7c25765260bf26f698d85ba2a
-EBUILD mcomix-1.3.0_pre20200206.ebuild 1797 BLAKE2B 414154723a7dacda417fe9b2fd5a50d10e5b344a848f3580f833e6a5e7b3db112f93aa0a62d14606f9db6d8891797f36a2763f410d22cef37c912addd50d7325 SHA512 005c5a4ffcade8056c8c2af61359cb319a02ccb63e2514e4becb32345042be1d6e16444d0e688158317753367f78a5e7dfd42b8c40717cb168bf9d0e86738a82
+DIST mcomix-1.3.0_pre20211015.tar.gz 3888967 BLAKE2B 16275b5e63dbedb481dba34e787681a9bbc0615c53c71a0037f7d15fa5ee135b5c2508bbf4ef7fddeb45b65c291d5651d81b2e0a180de26054cdbe994ceab028 SHA512 93092a8ec992922bd2327c33a5ab86edbffcdc66e9da5b443d7e4131686b2c3b47017aa4f02b0ca991b6d08dd68e6578137bbf6028ca274efcd2679a12cfe05d
 EBUILD mcomix-1.3.0_pre20201123.ebuild 1748 BLAKE2B 14e8e0f23724d9493a9f2bd964c6719bd315b3e3073af7511ced836eb2b7c333f5817446ea297cb7ca8c586703f61f105b21081432622859d544a2a027897b25 SHA512 22dc9acd9097ad888b5711121b5d61b6044bf016548fc733f875b4b748e9798fe5c38321cd360ede2268bea6baa3f3e562a57c0a54c163864274e7ecc40666af
+EBUILD mcomix-1.3.0_pre20211015.ebuild 1750 BLAKE2B 06c5cbd95d41463b23bd254ed97d2155866dcf728caa9ebb90af3ff5d6067c29e124b7525bfddcd47cb59ba37f6a4fd91198a605eaea48de00ed0b8231f61ef7 SHA512 aac8d7fb19235655800210742b11b26577cd8b021162561704eeffb9093754c09b8142bcc1428d99debaffd74a1705a0a2c9d9fcbaa5fd46c9acd8f2c162aaa5
 EBUILD mcomix-9999.ebuild 1586 BLAKE2B aaf82b982a929793c956cbf20ec77287222c5f8baadc3478da3f174f67be7d0705528c492155ed2ddbfb0250b10e77d07bdf5facaa01672a5b40c177e7e17d24 SHA512 c4b9b32b436bd55ee7f87cea3e29c4ea1968c5d28a6a4ecf7cf36f010e134fc2a11ed5cff43699e28c42bd6870e8652a1154a3b1b2fbb4709b2c2f7499144431
 MISC metadata.xml 398 BLAKE2B 1595be3107e03d5ea0602c77d75d0d5b10c6c36307edaa979b64ce3418c674cd3905578ea098159493860ea4b3fb3c297da24b281869dedf92b7eec8f70d32c8 SHA512 4783cdb12689f0e346769eebd4da9a14e40225c30f6afed9b7058a6ac6eb3591b39990c70f2b57339582f27a71c2fa9f88390401f51cb5f7d43cc8c0d9a39205
diff --git a/media-gfx/mcomix/mcomix-1.3.0_pre20200206.ebuild b/media-gfx/mcomix/mcomix-1.3.0_pre20211015.ebuild
index fe0ef2ebb67b..095d015ca001 100644
--- a/media-gfx/mcomix/mcomix-1.3.0_pre20200206.ebuild
+++ b/media-gfx/mcomix/mcomix-1.3.0_pre20211015.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 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_{7,8} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit desktop python-r1 xdg
 
 # Hash used for this version
-GIT_PV="b80f3485b6ec324aec1dc20f28296a8891ad70dd"
+GIT_PV="483f4b3f2d9a125606d47597ae7eff3b38e5bf9d"
 
 DESCRIPTION="GTK image viewer for comic book archives"
 HOMEPAGE="https://github.com/multiSnow/mcomix3"
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/multiSnow/mcomix3/archive/${GIT_PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
@@ -57,9 +57,6 @@ src_install() {
 	insinto /usr/share/metainfo
 	doins mime/mcomix.appdata.xml
 
-	insinto /usr/share/mime/packages
-	doins mime/mcomix.xml
-
 	dodoc README.rst TODO
 }
 
diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 450ea1d5e09e..3ea25f012872 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,5 +1,6 @@
+AUX nomacs-3.16.224-DkMath-ostream.patch 626 BLAKE2B 249c6092e77c784b70ce38e9c56e8e263684b3b7eae4a91e23444ede548b0b7a1773c95da4307bdb2179538ee9324145a8aec74af71cec153c40159e02f9b8ec SHA512 fe68ceb1498324be52974b0960c9e50b607f8e4cd364d658da0252ebcf80924becd3da002992b92114570bced57b3345372324998b2f5460983e83132e421575
 AUX nomacs-3.16.224-quazip1.patch 3844 BLAKE2B 5d92aa57971f137e5009db945f739eaff57bbf2a5ea6ce842dafd51f0107f6c6dfb349da719e935e732cb7736d9a97d96806ee48fdd97ff953863ba920aff2ab SHA512 888c8125edcbbbc3034b132f776bf59e53e6259e66c55f4df4e9c7fa8a874928a2ea766b52c6ef8dcc0d493f81982ca4cb6ac737f677e3948dcedb9052603e9f
 DIST nomacs-3.16.224.tar.gz 1932366 BLAKE2B 4a2dc6ef70b0ae5dc9c9397bd2c88ede0db2bb8660e1907d08b36c4a9cf5a9bd151180aa4b2d6b5f529c1786004a6621eff88fa4bc851d60835e8ba6d6269602 SHA512 7ca8e713eedd71bc3dd3804a9a09ece15badb74949b155ea4da72a0ea129be173c8d0951604a6139d4490525cd420da8635773c11f0d133f666a48dcd9064257
 DIST nomacs-plugins-3.16.tar.gz 561522 BLAKE2B 2bda4f36d56709653f6696af3404e416fd2d9fe7fa11de9636643c728028018ac769df3e2e519799322c5c42006cdc114d0e6406f9f60294234b07d9fd8d8409 SHA512 cd72f6ddbe3e07d7ed97f08405bac7574f4f3285c81e835f5630e011c8a9b105f23d892fed8084cb35ce521aca5524db071d0edb8bb04850dd2209d9ed019747
-EBUILD nomacs-3.16.224-r2.ebuild 1913 BLAKE2B f323b444154ad4823aad776cff0abf91922a45ea030a53f4994f368949e5e95c94c629aa2620e5dafbda14ccc9b02a1c97b6e9b0e7654dbe95225f755897410f SHA512 a86d797f1ae0992cf81f725443d5836546ad56a2c3c4e0bad35b009277785c5eb6d2b26066ac7520c030e73156aa7953e06ffe7b0bb2b3abee2d01cd3ad927b4
+EBUILD nomacs-3.16.224-r2.ebuild 1955 BLAKE2B 6ea0f1d8831b2427b1e126e872bb0534075ab136e98e7cbee7c6de8c88c43100ff1daf4d0a1f8cb920e27e9f9bbdb4e98170567ebb2bf6b96715de2f89fa8049 SHA512 0e5fb4cc513c822a0806069dd5ff57289660d789e86ce4a3055ca895c7b2d7f55b00cce028056449f625c0e2c4a5480fe8dbf4948ab69f90a2a6987b1edcfe5d
 MISC metadata.xml 595 BLAKE2B 92cdef0b718d658f88fb62f16ae0255b65e9acaa264216d0ff2b9c277ae02c5f006d2c4f88ff665dd6aba9d36bbd6286a3aa8be7365d428ec38d90515625b14b SHA512 f0af8c71d02a6397f7c65a24fa9c635efcce189b32b12286c299d24ddb459d4d05efcbb541234cac0ebb55824dc8d2b21e16b9081d31420a1544a90c5c6dfca1
diff --git a/media-gfx/nomacs/files/nomacs-3.16.224-DkMath-ostream.patch b/media-gfx/nomacs/files/nomacs-3.16.224-DkMath-ostream.patch
new file mode 100644
index 000000000000..318953f7896a
--- /dev/null
+++ b/media-gfx/nomacs/files/nomacs-3.16.224-DkMath-ostream.patch
@@ -0,0 +1,24 @@
+From aca8443079ff926be873a77e3077b249a12487dd Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <sultan@gentoo.org>
+Date: Sun, 23 Jan 2022 18:51:56 +0100
+Subject: [PATCH] IWYU: add missing ostream in DkMath
+
+---
+ src/DkCore/DkMath.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/DkCore/DkMath.h b/src/DkCore/DkMath.h
+index c37ef23..2c3a5be 100644
+--- a/src/DkCore/DkMath.h
++++ b/src/DkCore/DkMath.h
+@@ -30,6 +30,7 @@
+ #pragma warning(push, 0)	// no warnings from includes - begin

+ #include <cmath>

+ #include <float.h>

++#include <ostream>

+ #include <QDebug>

+ #include <QPointF>

+ #include <QPolygonF>

+-- 
+2.34.1
+
diff --git a/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild b/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild
index bab73e326784..0102090380d2 100644
--- a/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild
+++ b/media-gfx/nomacs/nomacs-3.16.224-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=7
@@ -48,7 +48,10 @@ S="${WORKDIR}/${P}/ImageLounge"
 
 DOCS=( src/changelog.txt )
 
-PATCHES=( "${FILESDIR}"/${P}-quazip1.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-quazip1.patch
+	"${FILESDIR}"/${P}-DkMath-ostream.patch
+)
 
 src_prepare() {
 	if use plugins ; then
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 22c00a4083ec..b6f5a8c09e59 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,9 +1,11 @@
+AUX 66-saned.rules 176 BLAKE2B c9c6ba224b9b27f4ecc6b1ded6621a8abb52b1ded2d9078e4cad31177290b788e286fad74545a5cb09e1f6726515adc22003988eb646dc986e87f1a8061a0e27 SHA512 d0d1b6bd6fbb04d610e7186e26d04c2233a620cc7c731ca3acd7fb860dd033fbe99d8974ffa1dd59c8affcc4aa2664d76ab3dfd6f7b2a734b31d7e3832359c41
 AUX sane-backends-1.0.24-saned_pidfile_location.patch 345 BLAKE2B dcf7cbd5787c7a225450e03663e7c1ca69dd40fc58e3de9d994fde6a66635d6a3ca20d2886fe7cbc6a7ed3202f8f3a8c7e3d9ea4072b4418a7a43048427a06c3 SHA512 49519b8fea68292b8cbd7bdcaf5b4803a1b890800e17015ace1d662e4503cc0844f191793c8f42cd6aa7e9922ee9f961d4784e30f22abc497973be1978bf1b24
 AUX sane-backends-1.0.27-disable-usb-tests.patch 336 BLAKE2B 00fd225a4426405d515f5b6641c86e6d9035a588a776aaec26eaa4e10beebf0a9fd97da991646b7964a867c422da2bc1cf93560d1ba326f0086675036338ff00 SHA512 64cce489e87de31e1a865b86d5829ae4914a30f47e27b07fba68629261cefcd617b8eed272c94b7554545e4802283c5bd5b53f79f54403d875726b38378ae74d
 AUX sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch 459 BLAKE2B d127c054b3e4f8aca5de54888e7a37c986515350aac84bb66ca195fca57138cbe3ac3f29b0982e4019b5b599b81984dceacd5523f794a04cfb5d416a051a1e61 SHA512 d9bcce33482db2f15ee094a244359fafdce196984a799509d9b16e24f46feb3aecd419520e65ca9513b40ff4975d793bec05924bfdd69586d9a6f3feb42cccc3
 AUX sane-backends-1.0.31-autoconf-2.70.patch 2629 BLAKE2B 30579b5075b850fc5b3f421880f8545def8dac69e274fb7bb756c3dcf0f0b93b91c4aa231bc74ee923721a832c7b5d187e3b074a926224cad99291139bff2a6f SHA512 7c4395d715ef699788f3cede0b89540dc53c1aa8e771efebf59b1e7a978f96506d2f3b4df72990967fd254dfc076c092674ef6d2019ca8426593474c8e033d26
 AUX sane-backends-1.0.31-backend_pot_input.patch 1155 BLAKE2B 0882b8291db5eab404abad4ec2c6332f77405ffc39ba3639bd279d8cc5857888ff13d87bb1d37d4ce1cd6272d3f0f1cc0ffddd6ba4d2780b47717ee0a5905ae4 SHA512 4447a39892aef52dad3ede292973a444675b2eb0f6086fb1ab45106a32aa4474e3970582b831efaf7474abbf78d5ce694f1e751c229101140ffda8800bfd5210
 AUX sane-backends-1.0.31-udev_rules_update.patch 2537 BLAKE2B 37ae4b905f331e9b024e712010a6e2dde19d3d0a700267fac4e5b11648f851253759ca4d58b200501816c7352d12427b8584b75e405ae7a7509b1771e3417e3f SHA512 55536f477ed67a73c0d5414b5018f1ebe47301ec4fa8613a50a1105d96eadb3fb2809f784a340f29ca37894b8f0b9bc10e8f2eedda3fa15fa4111af5dc57c095
+AUX sane-backends-1.1.1-genesys-gl845-crash.patch 553 BLAKE2B 8fafda9bf9904733c02db56975c0e6d7c594140f2c568f7d46524e726b69ebd33b4487fb9b5b7d701a4ddacf079ac75b1315139c4e377caf414211ac02652764 SHA512 a07a82d25e009b30056965974d6d3088772803632aa57030a4261ebf596f7cdf0a468212dd234a5dda7821ee75ff665dbcf66df43b1d3c9c10a649ad5e36483c
 AUX saned 150 BLAKE2B 306d57a0c09856b387c3c50eb27aaafdb194972c2fdb5d1cb7de3118f0c71cf234898ce958f0d6bd17a5e1f2b5bde458e014a7bfdec52403a6204ebf51aee039 SHA512 26f3d66c6b1e75d87d7d430518aa878c77d5ab8d76a45847cef3ff15566341938eedf46c50d0fa8cdeef828df9cddefdd6fdd767c5de30d3aa7d64ed1911d910
 AUX saned.confd 76 BLAKE2B cac74b6f117f7f78a71b951433bc6b155f8641e2cf1bd747871165764e97ed368d10551075761c34ff01f51f7cae1b8a9c5692fb9666a300b45134fe255ea3c1 SHA512 8f4a99ef24c19b3a7213b3d25ea16f5bca8623735cf25d21e3a706e9e0135ac8cce5d0b8fb8728845977f41dcefe6bd858076d755515fc91b00e05ee5817d751
 AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b5a546d61133522cdc98c7011669feaadc2d030ffeb49a86130075f22a18edab5f4c925780681 SHA512 655200141339f14bf7fc6f4fff3403cf9504809b7f023aa5425aad691c5baa65772100da0a6311669f83ed1dce73b7d65ca20aa31345b13c48dfdb1b30ce5dbd
@@ -11,6 +13,10 @@ AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3
 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965
 DIST backends-1.0.31.tar.gz 5731445 BLAKE2B d70691acbd3f5788a26bab6b35eeb243801b435272b57e3fa568127562ff57797452e396e6e5f058c33d3bce0f99b672542fb89bc8eb4d36cbe82ccc20b8f298 SHA512 d8ef05cc3aa9c4fa42c9241e1e61fc93e7959df3746a3a2cfaa6e4fb26dfd0911b4d3227b2da28852f8630fa17ad3432a1230a6f4425340e79a3b82ec5eaa9eb
 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.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.ebuild 8440 BLAKE2B b14c51c8dd771e70117410a05a8eacd130d0a4d0970024352f22ca95710225882ab9742027124cd48ee64518f16f7d1bc0cd8a2380100708ec9f9f5d7042ed48 SHA512 6a8175155ce2b837d31d81efb9d5b0ba994966bffa6e99e9eb527abe5decde19ed518e52e2c3a533a93cc03f912391477a02aafb23148a0effc5ea79165c354e
 MISC metadata.xml 267 BLAKE2B cf3ca2583acfc7c5d4b3e053cef4d72bf240aa58c54e8a0f72b9393ee8587bd587d4a88bad4b041cfd50d4465879ed546afa71b6e4570477b376a92ab47bb415 SHA512 d471748b0a9f7d7d4aca203c6bd1ff222f3faa455e7d1df2f8437a188922a40e3a656a5e20032256caf58d664e0f723e25055871e62d102e0c677264942b6fb1
diff --git a/media-gfx/sane-backends/files/66-saned.rules b/media-gfx/sane-backends/files/66-saned.rules
new file mode 100644
index 000000000000..3c9ec85d4822
--- /dev/null
+++ b/media-gfx/sane-backends/files/66-saned.rules
@@ -0,0 +1,2 @@
+# udev rule for saned (SANE scanning daemon) to be able to write on usb port
+ENV{libsane_matched}=="yes", ENV{DEVNAME}!="", RUN+="/usr/bin/setfacl -m g:saned:rw $env{DEVNAME}"
diff --git a/media-gfx/sane-backends/files/sane-backends-1.1.1-genesys-gl845-crash.patch b/media-gfx/sane-backends/files/sane-backends-1.1.1-genesys-gl845-crash.patch
new file mode 100644
index 000000000000..f63a8e2100b9
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.1.1-genesys-gl845-crash.patch
@@ -0,0 +1,12 @@
+diff --git a/backend/genesys/genesys.cpp b/backend/genesys/genesys.cpp
+index 9552fa9..c95de7b 100644
+--- a/backend/genesys/genesys.cpp
++++ b/backend/genesys/genesys.cpp
+@@ -367,6 +367,7 @@ void sanei_genesys_create_default_gamma_table(Genesys_Device* dev,
+         }
+         max = size - 1;
+     } else if (dev->model->asic_type == AsicType::GL124 ||
++               dev->model->asic_type == AsicType::GL845 ||
+                dev->model->asic_type == AsicType::GL846 ||
+                dev->model->asic_type == AsicType::GL847) {
+         size = 257;
diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..fd756b73c128
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r1.ebuild
@@ -0,0 +1,363 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+# python-any-r1 required for a script in
+# backends/pixma/scripts/
+inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 systemd toolchain-funcs udev
+
+# gphoto and v4l are handled by their usual USE flags.
+# The pint backend was disabled because I could not get it to compile.
+IUSE_SANE_BACKENDS=(
+	abaton
+	agfafocus
+	apple
+	artec
+	artec_eplus48u
+	as6e
+	avision
+	bh
+	canon
+	canon630u
+	canon_dr
+	canon_lide70
+	canon_pp
+	cardscan
+	coolscan
+	coolscan2
+	coolscan3
+	dc210
+	dc240
+	dc25
+	dell1600n_net
+	dmc
+	epjitsu
+	epson
+	epson2
+	escl
+	fujitsu
+	genesys
+	gt68xx
+	hp
+	hp3500
+	hp3900
+	hp4200
+	hp5400
+	hp5590
+	hpljm1005
+	hpsj5s
+	hs2p
+	ibm
+	kodak
+	kodakaio
+	kvs1025
+	kvs20xx
+	kvs40xx
+	leo
+	lexmark
+	ma1509
+	magicolor
+	matsushita
+	microtek
+	microtek2
+	mustek
+	mustek_pp
+	mustek_usb
+	mustek_usb2
+	nec
+	net
+	niash
+	p5
+	pie
+	pieusb
+	pixma
+	plustek
+	plustek_pp
+	pnm
+	qcam
+	ricoh
+	ricoh2
+	rts8891
+	s9036
+	sceptre
+	sharp
+	sm3600
+	sm3840
+	snapscan
+	sp15c
+	st400
+	stv680
+	tamarack
+	teco1
+	teco2
+	teco3
+	test
+	u12
+	umax
+	umax1220u
+	umax_pp
+	xerox_mfp
+)
+
+IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
+
+for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do
+	case ${GBACKEND} in
+	# Disable backends that require parallel ports as no one has those anymore.
+	canon_pp|hpsj5s|mustek_pp|\
+	pnm|mustek_usb2|kvs40xx)
+		IUSE+=" sane_backends_${GBACKEND}"
+		;;
+	*)
+		IUSE+=" +sane_backends_${GBACKEND}"
+	esac
+done
+
+REQUIRED_USE="
+	sane_backends_escl? ( zeroconf )
+	sane_backends_kvs40xx? ( threads )
+	sane_backends_mustek_usb2? ( threads )
+"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/"
+SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b6a58d64b43/${P}.tar.gz"
+
+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"
+
+# For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
+RDEPEND="
+	acct-user/saned
+	gphoto2? (
+		>=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
+		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+	)
+	sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	sane_backends_dell1600n_net? (
+		>=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
+		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+	)
+	sane_backends_escl? (
+		app-text/poppler[cairo]
+		|| (
+			net-dns/avahi[dbus]
+			net-dns/avahi[gtk]
+		)
+		net-dns/avahi[${MULTILIB_USEDEP}]
+		net-misc/curl[${MULTILIB_USEDEP}]
+	)
+	sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_pixma? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	snmp? ( net-analyzer/net-snmp:0= )
+	systemd? ( sys-apps/systemd:0= )
+	usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] )
+	v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	xinetd? ( sys-apps/xinetd )
+	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	dev-libs/libxml2
+	v4l? ( sys-kernel/linux-headers )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-devel/autoconf-archive
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
+	"${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch
+	"${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/sane-config
+)
+
+src_prepare() {
+	default
+
+	# Patch out the git reference so we can run eautoreconf
+	sed \
+		-e "s/m4_esyscmd_s(\[git describe --dirty\])/${PV}/" \
+		-e '/^AM_MAINTAINER_MODE/d' \
+		-i configure.ac || die
+	eautoreconf
+
+	# Fix for "make check".  Upstream sometimes forgets to update this.
+	local ver=$(./configure --version | awk '{print $NF; exit 0}')
+	sed -i \
+		-e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \
+		testsuite/tools/data/html* || die
+
+	# don't bleed user LDFLAGS into pkgconfig files
+	sed 's|@LDFLAGS@ ||' -i tools/*.pc.in || die
+
+	# Needed for udev rules generation/installation
+	multilib_copy_sources
+}
+
+src_configure() {
+	# From Fedora
+	append-flags -fno-strict-aliasing
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# the blank is intended - an empty string would result in building ALL backends.
+	local lbackends=" "
+
+	use gphoto2 && lbackends="gphoto2"
+	use v4l && lbackends+=" v4l"
+	use sane_backends_escl && multilib_is_native_abi && lbackends+=" escl"
+	local backend
+	for backend in ${IUSE_SANE_BACKENDS[@]} ; do
+		if use "sane_backends_${backend}" && [[ "${backend}" != pnm ]] && [[ "${backend}" != escl ]] ; then
+			lbackends+=" ${backend}"
+		fi
+	done
+
+	local myconf=(
+		$(use_with usb)
+		$(multilib_native_use_with snmp)
+
+		$(multilib_native_use_with sane_backends_escl poppler-glib)
+		# you can only enable this backend, not disable it...
+		$(usex sane_backends_pnm --enable-pnm-backend '')
+		$(usex sane_backends_mustek_pp --enable-parport-directio '')
+	)
+
+	if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ; } ; then
+		myconf+=( sane_cv_use_libieee1284=no )
+	fi
+
+	# relative path must be used for tests to work properly
+	# All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory
+	# that break in many ways, bug #636202, #668232, #668350
+	# People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html
+	myconf+=(
+		--disable-locking
+		$(use_with gphoto2)
+		$(multilib_native_use_with systemd)
+		$(use_with v4l)
+		$(use_enable ipv6)
+		$(use_enable threads pthread)
+		$(use_with zeroconf avahi)
+	)
+	ECONF_SOURCE="${S}" \
+	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
+	BACKENDS="${lbackends}" \
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake VARTEXFONTS="${T}/fonts"
+
+	if tc-is-cross-compiler ; then
+		pushd "${BUILD_DIR}"/tools >/dev/null || die
+
+		# The build system sucks and doesn't handle this properly.
+		# https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366
+		tc-export_build_env BUILD_CC
+		${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \
+			-I. -I../include -I"${S}"/include \
+			"${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \
+			"${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die
+		local dirs=( hal hotplug hotplug-ng udev )
+		local targets=(
+			hal/libsane.fdi
+			hotplug/libsane.usermap
+			hotplug-ng/libsane.db
+			udev/libsane.rules
+		)
+		mkdir -p "${dirs[@]}" || die
+		emake "${targets[@]}"
+
+		popd >/dev/null || die
+	fi
+
+	if use usb ; then
+		sed -i -e '/^$/d' \
+			tools/hotplug/libsane.usermap || die
+	fi
+}
+
+multilib_src_install() {
+	emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
+		docdir="${EPREFIX}"/usr/share/doc/${PF}
+
+	if multilib_is_native_abi ; then
+		if use usb ; then
+			insinto /etc/hotplug/usb
+			doins tools/hotplug/libsane.usermap
+		fi
+
+		insinto "/usr/share/pkgconfig"
+		doins tools/sane-backends.pc
+
+		# From Fedora and Arch, prevent permission conflicts
+		# https://github.com/OpenPrinting/cups/issues/314
+		# https://gitlab.com/sane-project/backends/-/issues/546
+		#
+		# Generate udev udev+hwdb, not needing scanner group
+		install -vdm 755 "${ED}/$(get_udevdir)/rules.d/" || die
+		tools/sane-desc -m udev+hwdb -s doc/descriptions/ > "${ED}/$(get_udevdir)/rules.d/65-${PN}.rules" || die
+		tools/sane-desc -m udev+hwdb -s doc/descriptions-external/ >> "${ED}/$(get_udevdir)/rules.d/65-${PN}.rules" || die
+		# generate udev hwdb
+		install -vdm 755 "${ED}/$(get_udevdir)/hwdb.d/" || die
+		tools/sane-desc -m hwdb -s doc/descriptions/ > "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb"
+		# NOTE: an empty new line is required between the two .desc collections
+		printf "\n" >> "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" || die
+		tools/sane-desc -m hwdb -s doc/descriptions-external/ >> "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" || die
+		# udev rule for saned (SANE scanning daemon) to be able to write on usb port
+		udev_dorules "${FILESDIR}/66-saned.rules"
+	fi
+}
+
+multilib_src_install_all() {
+	dodir /etc/env.d
+
+	if use systemd ; then
+		systemd_newunit "${FILESDIR}"/saned_at.service "saned@.service"
+		systemd_newunit "${FILESDIR}"/saned.socket saned.socket
+	fi
+
+	if use usb ; then
+		exeinto /etc/hotplug/usb
+		doexe tools/hotplug/libusbscanner
+		newdoc tools/hotplug/README README.hotplug
+	fi
+
+	dodoc NEWS AUTHORS PROBLEMS README README.linux
+	find "${ED}" -name '*.la' -delete || die
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		doins "${FILESDIR}"/saned
+	fi
+
+	newinitd "${FILESDIR}"/saned.initd saned
+	newconfd "${FILESDIR}"/saned.confd saned
+}
+
+pkg_postinst() {
+	optfeature "Network scanner backend" media-gfx/sane-airscan
+	optfeature "Epson-specific backend" media-gfx/iscan
+	optfeature "HP-specific backend" net-print/hplip
+
+	if use xinetd ; then
+		elog "If you want remote clients to connect, edit"
+		elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
+	fi
+}
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
new file mode 100644
index 000000000000..010ba000e55f
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r2.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+# python-any-r1 required for a script in
+# backends/pixma/scripts/
+inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 systemd toolchain-funcs udev
+
+# gphoto and v4l are handled by their usual USE flags.
+# The pint backend was disabled because I could not get it to compile.
+IUSE_SANE_BACKENDS=(
+	abaton
+	agfafocus
+	apple
+	artec
+	artec_eplus48u
+	as6e
+	avision
+	bh
+	canon
+	canon630u
+	canon_dr
+	canon_lide70
+	canon_pp
+	cardscan
+	coolscan
+	coolscan2
+	coolscan3
+	dc210
+	dc240
+	dc25
+	dell1600n_net
+	dmc
+	epjitsu
+	epson
+	epson2
+	escl
+	fujitsu
+	genesys
+	gt68xx
+	hp
+	hp3500
+	hp3900
+	hp4200
+	hp5400
+	hp5590
+	hpljm1005
+	hpsj5s
+	hs2p
+	ibm
+	kodak
+	kodakaio
+	kvs1025
+	kvs20xx
+	kvs40xx
+	leo
+	lexmark
+	ma1509
+	magicolor
+	matsushita
+	microtek
+	microtek2
+	mustek
+	mustek_pp
+	mustek_usb
+	mustek_usb2
+	nec
+	net
+	niash
+	p5
+	pie
+	pieusb
+	pixma
+	plustek
+	plustek_pp
+	pnm
+	qcam
+	ricoh
+	ricoh2
+	rts8891
+	s9036
+	sceptre
+	sharp
+	sm3600
+	sm3840
+	snapscan
+	sp15c
+	st400
+	stv680
+	tamarack
+	teco1
+	teco2
+	teco3
+	test
+	u12
+	umax
+	umax1220u
+	umax_pp
+	xerox_mfp
+)
+
+IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
+
+for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do
+	case ${GBACKEND} in
+	# Disable backends that require parallel ports as no one has those anymore.
+	canon_pp|hpsj5s|mustek_pp|\
+	pnm|mustek_usb2|kvs40xx)
+		IUSE+=" sane_backends_${GBACKEND}"
+		;;
+	*)
+		IUSE+=" +sane_backends_${GBACKEND}"
+	esac
+done
+
+REQUIRED_USE="
+	sane_backends_escl? ( zeroconf )
+	sane_backends_kvs40xx? ( threads )
+	sane_backends_mustek_usb2? ( threads )
+"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/"
+SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b6a58d64b43/${P}.tar.gz"
+
+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"
+
+# For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
+RDEPEND="
+	acct-user/saned
+	gphoto2? (
+		>=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
+		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+	)
+	sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	sane_backends_dell1600n_net? (
+		>=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
+		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+	)
+	sane_backends_escl? (
+		app-text/poppler[cairo]
+		|| (
+			net-dns/avahi[dbus]
+			net-dns/avahi[gtk]
+		)
+		net-dns/avahi[${MULTILIB_USEDEP}]
+		net-misc/curl[${MULTILIB_USEDEP}]
+	)
+	sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_pixma? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	snmp? ( net-analyzer/net-snmp:0= )
+	systemd? ( sys-apps/systemd:0= )
+	usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] )
+	v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	xinetd? ( sys-apps/xinetd )
+	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	dev-libs/libxml2
+	v4l? ( sys-kernel/linux-headers )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-devel/autoconf-archive
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
+	"${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch
+	"${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch
+	# https://gitlab.com/sane-project/backends/-/merge_requests/688
+	"${FILESDIR}"/${PN}-1.1.1-genesys-gl845-crash.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/sane-config
+)
+
+src_prepare() {
+	default
+
+	# Patch out the git reference so we can run eautoreconf
+	sed \
+		-e "s/m4_esyscmd_s(\[git describe --dirty\])/${PV}/" \
+		-e '/^AM_MAINTAINER_MODE/d' \
+		-i configure.ac || die
+	eautoreconf
+
+	# Fix for "make check".  Upstream sometimes forgets to update this.
+	local ver=$(./configure --version | awk '{print $NF; exit 0}')
+	sed -i \
+		-e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \
+		testsuite/tools/data/html* || die
+
+	# don't bleed user LDFLAGS into pkgconfig files
+	sed 's|@LDFLAGS@ ||' -i tools/*.pc.in || die
+
+	# Needed for udev rules generation/installation
+	multilib_copy_sources
+}
+
+src_configure() {
+	# From Fedora
+	append-flags -fno-strict-aliasing
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# the blank is intended - an empty string would result in building ALL backends.
+	local lbackends=" "
+
+	use gphoto2 && lbackends="gphoto2"
+	use v4l && lbackends+=" v4l"
+	use sane_backends_escl && multilib_is_native_abi && lbackends+=" escl"
+	local backend
+	for backend in ${IUSE_SANE_BACKENDS[@]} ; do
+		if use "sane_backends_${backend}" && [[ "${backend}" != pnm ]] && [[ "${backend}" != escl ]] ; then
+			lbackends+=" ${backend}"
+		fi
+	done
+
+	local myconf=(
+		$(use_with usb)
+		$(multilib_native_use_with snmp)
+
+		$(multilib_native_use_with sane_backends_escl poppler-glib)
+		# you can only enable this backend, not disable it...
+		$(usex sane_backends_pnm --enable-pnm-backend '')
+		$(usex sane_backends_mustek_pp --enable-parport-directio '')
+	)
+
+	if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ; } ; then
+		myconf+=( sane_cv_use_libieee1284=no )
+	fi
+
+	# relative path must be used for tests to work properly
+	# All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory
+	# that break in many ways, bug #636202, #668232, #668350
+	# People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html
+	myconf+=(
+		--disable-locking
+		$(use_with gphoto2)
+		$(multilib_native_use_with systemd)
+		$(use_with v4l)
+		$(use_enable ipv6)
+		$(use_enable threads pthread)
+		$(use_with zeroconf avahi)
+	)
+	ECONF_SOURCE="${S}" \
+	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
+	BACKENDS="${lbackends}" \
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake VARTEXFONTS="${T}/fonts"
+
+	if tc-is-cross-compiler ; then
+		pushd "${BUILD_DIR}"/tools >/dev/null || die
+
+		# The build system sucks and doesn't handle this properly.
+		# https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366
+		tc-export_build_env BUILD_CC
+		${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \
+			-I. -I../include -I"${S}"/include \
+			"${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \
+			"${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die
+		local dirs=( hal hotplug hotplug-ng udev )
+		local targets=(
+			hal/libsane.fdi
+			hotplug/libsane.usermap
+			hotplug-ng/libsane.db
+			udev/libsane.rules
+		)
+		mkdir -p "${dirs[@]}" || die
+		emake "${targets[@]}"
+
+		popd >/dev/null || die
+	fi
+
+	if use usb ; then
+		sed -i -e '/^$/d' \
+			tools/hotplug/libsane.usermap || die
+	fi
+}
+
+multilib_src_install() {
+	emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
+		docdir="${EPREFIX}"/usr/share/doc/${PF}
+
+	if multilib_is_native_abi ; then
+		if use usb ; then
+			insinto /etc/hotplug/usb
+			doins tools/hotplug/libsane.usermap
+		fi
+
+		insinto "/usr/share/pkgconfig"
+		doins tools/sane-backends.pc
+
+		# From Fedora and Arch, prevent permission conflicts
+		# https://github.com/OpenPrinting/cups/issues/314
+		# https://gitlab.com/sane-project/backends/-/issues/546
+		#
+		# Generate udev udev+hwdb, not needing scanner group
+		install -vdm 755 "${ED}/$(get_udevdir)/rules.d/" || die
+		tools/sane-desc -m udev+hwdb -s doc/descriptions/ > "${ED}/$(get_udevdir)/rules.d/65-${PN}.rules" || die
+		tools/sane-desc -m udev+hwdb -s doc/descriptions-external/ >> "${ED}/$(get_udevdir)/rules.d/65-${PN}.rules" || die
+		# generate udev hwdb
+		install -vdm 755 "${ED}/$(get_udevdir)/hwdb.d/" || die
+		tools/sane-desc -m hwdb -s doc/descriptions/ > "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb"
+		# NOTE: an empty new line is required between the two .desc collections
+		printf "\n" >> "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" || die
+		tools/sane-desc -m hwdb -s doc/descriptions-external/ >> "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" || die
+		# udev rule for saned (SANE scanning daemon) to be able to write on usb port
+		udev_dorules "${FILESDIR}/66-saned.rules"
+	fi
+}
+
+multilib_src_install_all() {
+	dodir /etc/env.d
+
+	if use systemd ; then
+		systemd_newunit "${FILESDIR}"/saned_at.service "saned@.service"
+		systemd_newunit "${FILESDIR}"/saned.socket saned.socket
+	fi
+
+	if use usb ; then
+		exeinto /etc/hotplug/usb
+		doexe tools/hotplug/libusbscanner
+		newdoc tools/hotplug/README README.hotplug
+	fi
+
+	dodoc NEWS AUTHORS PROBLEMS README README.linux
+	find "${ED}" -name '*.la' -delete || die
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		doins "${FILESDIR}"/saned
+	fi
+
+	newinitd "${FILESDIR}"/saned.initd saned
+	newconfd "${FILESDIR}"/saned.confd saned
+}
+
+pkg_postinst() {
+	optfeature "Network scanner backend" media-gfx/sane-airscan
+	optfeature "Epson-specific backend" media-gfx/iscan
+	optfeature "HP-specific backend" net-print/hplip
+
+	if use xinetd ; then
+		elog "If you want remote clients to connect, edit"
+		elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
+	fi
+}
diff --git a/media-gfx/sane-backends/sane-backends-1.1.1.ebuild b/media-gfx/sane-backends/sane-backends-1.1.1.ebuild
new file mode 100644
index 000000000000..0453269675fb
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.1.1.ebuild
@@ -0,0 +1,353 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+# python-any-r1 required for a script in
+# backends/pixma/scripts/
+inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 systemd toolchain-funcs udev
+
+# gphoto and v4l are handled by their usual USE flags.
+# The pint backend was disabled because I could not get it to compile.
+IUSE_SANE_BACKENDS=(
+	abaton
+	agfafocus
+	apple
+	artec
+	artec_eplus48u
+	as6e
+	avision
+	bh
+	canon
+	canon630u
+	canon_dr
+	canon_lide70
+	canon_pp
+	cardscan
+	coolscan
+	coolscan2
+	coolscan3
+	dc210
+	dc240
+	dc25
+	dell1600n_net
+	dmc
+	epjitsu
+	epson
+	epson2
+	escl
+	fujitsu
+	genesys
+	gt68xx
+	hp
+	hp3500
+	hp3900
+	hp4200
+	hp5400
+	hp5590
+	hpljm1005
+	hpsj5s
+	hs2p
+	ibm
+	kodak
+	kodakaio
+	kvs1025
+	kvs20xx
+	kvs40xx
+	leo
+	lexmark
+	ma1509
+	magicolor
+	matsushita
+	microtek
+	microtek2
+	mustek
+	mustek_pp
+	mustek_usb
+	mustek_usb2
+	nec
+	net
+	niash
+	p5
+	pie
+	pieusb
+	pixma
+	plustek
+	plustek_pp
+	pnm
+	qcam
+	ricoh
+	ricoh2
+	rts8891
+	s9036
+	sceptre
+	sharp
+	sm3600
+	sm3840
+	snapscan
+	sp15c
+	st400
+	stv680
+	tamarack
+	teco1
+	teco2
+	teco3
+	test
+	u12
+	umax
+	umax1220u
+	umax_pp
+	xerox_mfp
+)
+
+IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
+
+for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do
+	case ${GBACKEND} in
+	# Disable backends that require parallel ports as no one has those anymore.
+	canon_pp|hpsj5s|mustek_pp|\
+	pnm|mustek_usb2|kvs40xx)
+		IUSE+=" sane_backends_${GBACKEND}"
+		;;
+	*)
+		IUSE+=" +sane_backends_${GBACKEND}"
+	esac
+done
+
+REQUIRED_USE="
+	sane_backends_escl? ( zeroconf )
+	sane_backends_kvs40xx? ( threads )
+	sane_backends_mustek_usb2? ( threads )
+"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/"
+SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b6a58d64b43/${P}.tar.gz"
+
+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"
+
+# For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
+RDEPEND="
+	acct-group/scanner
+	acct-user/saned
+	gphoto2? (
+		>=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
+		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+	)
+	sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	sane_backends_dell1600n_net? (
+		>=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
+		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
+	)
+	sane_backends_escl? (
+		app-text/poppler[cairo]
+		|| (
+			net-dns/avahi[dbus]
+			net-dns/avahi[gtk]
+		)
+		net-dns/avahi[${MULTILIB_USEDEP}]
+		net-misc/curl[${MULTILIB_USEDEP}]
+	)
+	sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_pixma? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	snmp? ( net-analyzer/net-snmp:0= )
+	systemd? ( sys-apps/systemd:0= )
+	usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] )
+	v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	xinetd? ( sys-apps/xinetd )
+	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	dev-libs/libxml2
+	v4l? ( sys-kernel/linux-headers )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-devel/autoconf-archive
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
+	"${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch
+	"${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/sane-config
+)
+
+src_prepare() {
+	default
+
+	# Patch out the git reference so we can run eautoreconf
+	sed \
+		-e "s/m4_esyscmd_s(\[git describe --dirty\])/${PV}/" \
+		-e '/^AM_MAINTAINER_MODE/d' \
+		-i configure.ac || die
+	eautoreconf
+
+	# Fix for "make check".  Upstream sometimes forgets to update this.
+	local ver=$(./configure --version | awk '{print $NF; exit 0}')
+	sed -i \
+		-e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \
+		testsuite/tools/data/html* || die
+
+	# don't bleed user LDFLAGS into pkgconfig files
+	sed 's|@LDFLAGS@ ||' -i tools/*.pc.in || die
+}
+
+src_configure() {
+	# From Fedora
+	append-flags -fno-strict-aliasing
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# the blank is intended - an empty string would result in building ALL backends.
+	local lbackends=" "
+
+	use gphoto2 && lbackends="gphoto2"
+	use v4l && lbackends+=" v4l"
+	use sane_backends_escl && multilib_is_native_abi && lbackends+=" escl"
+	local backend
+	for backend in ${IUSE_SANE_BACKENDS[@]} ; do
+		if use "sane_backends_${backend}" && [[ "${backend}" != pnm ]] && [[ "${backend}" != escl ]] ; then
+			lbackends+=" ${backend}"
+		fi
+	done
+
+	local myconf=(
+		$(use_with usb)
+		$(multilib_native_use_with snmp)
+
+		$(multilib_native_use_with sane_backends_escl poppler-glib)
+		# you can only enable this backend, not disable it...
+		$(usex sane_backends_pnm --enable-pnm-backend '')
+		$(usex sane_backends_mustek_pp --enable-parport-directio '')
+	)
+
+	if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ; } ; then
+		myconf+=( sane_cv_use_libieee1284=no )
+	fi
+
+	# relative path must be used for tests to work properly
+	# All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory
+	# that break in many ways, bug #636202, #668232, #668350
+	# People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html
+	myconf+=(
+		--disable-locking
+		$(use_with gphoto2)
+		$(multilib_native_use_with systemd)
+		$(use_with v4l)
+		$(use_enable ipv6)
+		$(use_enable threads pthread)
+		$(use_with zeroconf avahi)
+	)
+	ECONF_SOURCE="${S}" \
+	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
+	BACKENDS="${lbackends}" \
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake VARTEXFONTS="${T}/fonts"
+
+	if tc-is-cross-compiler ; then
+		pushd "${BUILD_DIR}"/tools >/dev/null || die
+
+		# The build system sucks and doesn't handle this properly.
+		# https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366
+		tc-export_build_env BUILD_CC
+		${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \
+			-I. -I../include -I"${S}"/include \
+			"${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \
+			"${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die
+		local dirs=( hal hotplug hotplug-ng udev )
+		local targets=(
+			hal/libsane.fdi
+			hotplug/libsane.usermap
+			hotplug-ng/libsane.db
+			udev/libsane.rules
+		)
+		mkdir -p "${dirs[@]}" || die
+		emake "${targets[@]}"
+
+		popd >/dev/null || die
+	fi
+
+	if use usb ; then
+		sed -i -e '/^$/d' \
+			tools/hotplug/libsane.usermap || die
+	fi
+}
+
+multilib_src_install() {
+	emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
+		docdir="${EPREFIX}"/usr/share/doc/${PF}
+
+	if multilib_is_native_abi ; then
+		if use usb ; then
+			insinto /etc/hotplug/usb
+			doins tools/hotplug/libsane.usermap
+		fi
+
+		udev_newrules tools/udev/libsane.rules 41-libsane.rules
+		insinto "/usr/share/pkgconfig"
+		doins tools/sane-backends.pc
+	fi
+}
+
+multilib_src_install_all() {
+	keepdir /var/lib/lock/sane
+	fowners root:scanner /var/lib/lock/sane
+	fperms g+w /var/lib/lock/sane
+	dodir /etc/env.d
+
+	if use systemd ; then
+		systemd_newunit "${FILESDIR}"/saned_at.service "saned@.service"
+		systemd_newunit "${FILESDIR}"/saned.socket saned.socket
+	fi
+
+	if use usb ; then
+		exeinto /etc/hotplug/usb
+		doexe tools/hotplug/libusbscanner
+		newdoc tools/hotplug/README README.hotplug
+	fi
+
+	dodoc NEWS AUTHORS PROBLEMS README README.linux
+	find "${ED}" -name '*.la' -delete || die
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		doins "${FILESDIR}"/saned
+	fi
+
+	newinitd "${FILESDIR}"/saned.initd saned
+	newconfd "${FILESDIR}"/saned.confd saned
+}
+
+pkg_postinst() {
+	optfeature "Network scanner backend" media-gfx/sane-airscan
+	optfeature "Epson-specific backend" media-gfx/iscan
+	optfeature "HP-specific backend" net-print/hplip
+
+	if use xinetd ; then
+		elog "If you want remote clients to connect, edit"
+		elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
+	fi
+
+	if ! use systemd ; then
+		elog "If you are using a USB scanner, add all users who want"
+		elog "to access your scanner to the \"scanner\" group."
+	fi
+}
diff --git a/media-gfx/sfftobmp/Manifest b/media-gfx/sfftobmp/Manifest
index 7c73ecff11e6..bdd7a8b6c430 100644
--- a/media-gfx/sfftobmp/Manifest
+++ b/media-gfx/sfftobmp/Manifest
@@ -2,5 +2,5 @@ AUX sfftobmp-3.1.1-gcc44-and-boost-1_37.patch 749 BLAKE2B 3bd8d52ed467c188f8b054
 AUX sfftobmp-3.1.2-Wformat.patch 342 BLAKE2B 1e6db3a432fce740f34f2cb2a3f3662f59c0fedd84e6b63a1cc58dbf2f5d9e48858ad0f1e25e0a9b2ef493eec4cdc8587cb24430026ad3c51190ddaf2213e8b3 SHA512 afde9e1a0acabe7d4fa51b6a533f09afe93deb5c8015c1cb322849feb543ccd45bf0639a61928c6c8641a741b348e119528ba1a03d6c201d12b4be98d49eb85e
 AUX sfftobmp-3.1.2-boost_fs3.patch 542 BLAKE2B 032a3f526407bb7e4c94176b914b8dfc298a250b468322561e6f0fa9b37578cd8872717080469eb147bd7fab2c9239d8a06ce9e2b937b87899355aa231e3a459 SHA512 1829c9cbfef93e9a019c2b92aa60e45c9f32498fba15ceac456ccd0fa6244e92aa8dc2b5ddff3cf56ad01e7e7111f0553807b4faa94c3d1ddeb2ab7328c8c915
 DIST sfftobmp3_1_2_src.zip 121478 BLAKE2B fe5e09d358cfa75a45a05e780fcf8b3409ae9791882c8c4ab3fe99b078cade57a75751343c42a5d7764702ca32565e8c97d417e3c095c10a01b6fcd0f09f03b3 SHA512 3c460dcd60486954f792ecc8e864d109dabbae30b56a6ba4b3228a42dd489fd88793e4d93e2d032e6cd1c552bf5e217bc2afb3eae85a1a4e1db340f7761905b7
-EBUILD sfftobmp-3.1.2-r1.ebuild 827 BLAKE2B bdc6c0a4f3d12d1bdfdfe6bd018d773958722e40102a25c5306ce0805a7d344fb7d06f7061456231bc2ce90e86f1ab48054add8ee3b33506b3a1f82ab4be35ac SHA512 3f4e8e8c92c9b1fb214ffa13ddec3715a1ad8696327926428262c9f835d7277b3d904bace7fa5902b819312e0be339539deaaf393e450f4b64a06713abe043a9
+EBUILD sfftobmp-3.1.2-r1.ebuild 827 BLAKE2B 13a3c3649fb2656048135a94acc817f39c08b298761ea73440eb944fb67fa4e67ec9f5652d4da2fd58a2cb08b87dce1e5c86474949ffce5caecebe66f267ffa3 SHA512 5615e483cf20e1daa6bd954cae200829c1c0a559f09bb34b93c009b140ef5f4781f4e674833507b50586e2798dff8f389f390aad0dbbf25d32a1102457421bb3
 MISC metadata.xml 246 BLAKE2B 7c25526b9240c42e9e0b41a00848ca2311c8edf487c120d4bdb03b78e15f3e773c8437e037ee3000ad437d5d12b237b2fb09e6c151f0be7e1cbe06f448f07a70 SHA512 f0ff62e58d57dded6e30f61f7734cdc744f9a727a7e2435f225b38990217690713eb50dff49920235efa94547e9a6aab32ba5c3a599fd80689e0c4d841eaa043
diff --git a/media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild b/media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild
index 1bc93102d377..8aa37d54a2a4 100644
--- a/media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild
+++ b/media-gfx/sfftobmp/sfftobmp-3.1.2-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=8
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic
 MY_P=${PN}${PV//./_}
 
 DESCRIPTION="sff to bmp converter"
-HOMEPAGE="http://sfftools.sourceforge.net/"
+HOMEPAGE="https://sfftools.sourceforge.io/"
 SRC_URI="mirror://sourceforge/sfftools/${MY_P}_src.zip"
 S="${WORKDIR}/${MY_P}"
 
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 6674e7e0e732..0851f8816cad 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,10 +1,5 @@
 AUX 40.0-add-control-optional-deps.patch 2713 BLAKE2B 594f076b9515697322711033a206eb6aa7ab8940c6d4ef5711af4bdaaa126b82738b2d300d97843a9c889c314d16873ea05ecb07e0c566e8a273289fc799f8aa SHA512 60bdf1653292f5e2b3ef435c35c81a5eb2963142ea14e2095c5c5673d776979053c65ef0e54f80b503489dcc6e93d1a2ab8d29711059c469ecebcb83ece5e42c
-DIST simple-scan-40.1.tar.xz 1471116 BLAKE2B 4e9071c497cf47600cef7dcbf4c47dff6f8cd8cbd8a72ae45e4ac68b749f5fc89d0e97912e174cab02959efe2e30451403ab0336221ead44fc87747dbe4e29e1 SHA512 1ccd512ce84ed0d2f97f4e2e5220a2e8a850e575cb9dac58ef446f8cc37575a72a2e80ffa240874532433667225b632cd1dd4e68f66dae3dd26be118f3ec21cf
-DIST simple-scan-40.5.tar.xz 1476536 BLAKE2B f386b2765b2479f1a41a7618a3f9f72c85d003c3ba1495012d59902059f348edb2897821a8ceaa631c2b9043a292ffceaf5bd4fc2f4442931120f3e9ff336f4b SHA512 cf87a0dbaea09ee0aa0333d487179dc1ab661a7c13321ff92cd7c7de62f6f9cdcf4a858e1fb24df07fe4b0cb01694bea915c61e2c7ce6e44ecf549613ccbfa6f
-DIST simple-scan-40.6.tar.xz 1479816 BLAKE2B 1fd9a28e30dc350594a051c389740a2770989f803800bd00b4e99383d3f15167a4b9a5445dbf7a877db1e4ea0e1d1291c2e48e0ddaf48fa5db6c34b6e566a127 SHA512 fc9a4e7899de0539b9f58faef29d5b7e185c4f9a5281e29a9bba0941ba1cfb1efd5f04b4d41920f55dd2ee812e032a1b92b2acd91d6a76114770b6e3a654125b
+AUX 40.7-fix-build-with-meson-0.61.1.patch 1470 BLAKE2B c7cc58450275777d5367063e92ea2c44b8f05e6e52e740a69e2baa0336a3164d8e2d8ad732248cddd9126a574e1b141e637475ce21a2af8edbc3638f7e066bbe SHA512 eb1007a284214716009356de7e40e9b14418aa76a8a9356feaf74ef2776035037430da49735305f8da885e4749d7add13f7f1bcfea2875543777705f6a69b4a4
 DIST simple-scan-40.7.tar.xz 1480288 BLAKE2B 8068105db77196157495cbb2eb4c3e6a82531ed4bb727c05884154a661a9669426047c6cbbcffdd696c8e4d27721f2ca6249be14b6b4cc62be96bdbfe1b67a4c SHA512 36dc321e83bdf02fb9267d299abeee7f56bb6ee786e09811ba1244a2cee2c3baa0c5bbf3a4d6a6eadfc093d0e792b3511855c7e32caa2f6864face620fa4e7f6
-EBUILD simple-scan-40.1.ebuild 1449 BLAKE2B 9db18c0d56c97dde6d9e503eb9502bff9a05739794b29f5fecbb0b01750b8939ea74b16012b2aa2adfd57de5580db7d7681e4faa872929cca562a933ef34bbf3 SHA512 f5fdc744882f5819ad050854392ff7885798eab8d470486e3257e1d567101721abf91c3d1955e37437586a5d467a7c794686d7c5a60d66b0898e6453ab9ca6ba
-EBUILD simple-scan-40.5.ebuild 1454 BLAKE2B 3bcef6fec47e329f3a9e12f5de11c1c3e2b9e8f3ce2291b302fad2da53e18fc6c515a744b83d022ac9da1a3c0e1057acf9caf5b6e57738936dff2c32824e0270 SHA512 6afb7164c60d5dc05dba8aec8cb93963078c1f5a36ca091c0ab0d63737411b0d4b35a1950d9ecdb395d922d3546a4c799b3eb0b7232eb9b1eeeaef5fa59c25e0
-EBUILD simple-scan-40.6-r1.ebuild 1454 BLAKE2B 3bcef6fec47e329f3a9e12f5de11c1c3e2b9e8f3ce2291b302fad2da53e18fc6c515a744b83d022ac9da1a3c0e1057acf9caf5b6e57738936dff2c32824e0270 SHA512 6afb7164c60d5dc05dba8aec8cb93963078c1f5a36ca091c0ab0d63737411b0d4b35a1950d9ecdb395d922d3546a4c799b3eb0b7232eb9b1eeeaef5fa59c25e0
-EBUILD simple-scan-40.7.ebuild 1461 BLAKE2B 75da5774e0a761b7aa5d42ed8fae05504a85a55430d663eccefa7f24705baaae72b2ceee524451d9f2f9ccc0503bcd4d74c90aee86a114d9676ec9bc4bd227d8 SHA512 df921f6bff966a2f14b2ae5ebb4a5e57a947d5b9ab836ed86c0dd7734eb8169f21c06762231e040fe8190a57d2f9019508ce3673ac62fd0c1d3b516ea7907625
+EBUILD simple-scan-40.7.ebuild 1512 BLAKE2B 9c59589c74f9227579d0446c58ff3a24bfc7c06647223f63311d67e748df54ea7f59f9db59e7bcc2a4dd8644150961ceb32bc9547837201b9df259aea9c2b5c3 SHA512 f8051b6a45824ec2e0ba3cf9390d8f3937bf755f95d1f0b65c72233bdafd33fe2e08f45b18eeec5deea236bf198fa47dbd5784fc45f4572f49f438b22c567b6c
 MISC metadata.xml 617 BLAKE2B 41b65f58d578371b4219664b11bf04f081e9a4dd6d146d977689708bdc4d847f85ef86cb4391eb45d24c21185889ff9e5122fd3b6658a24965d231f75ea5b8da SHA512 fb3e56709421b416cb42f1f025308404117c5cf0dfe37419c2d9fa5a18a7397e7f6f9117143df4fff1e2347fd65cfcb9e7007c6c9be56df79641b024d21c1db5
diff --git a/media-gfx/simple-scan/files/40.7-fix-build-with-meson-0.61.1.patch b/media-gfx/simple-scan/files/40.7-fix-build-with-meson-0.61.1.patch
new file mode 100644
index 000000000000..b1a161df922a
--- /dev/null
+++ b/media-gfx/simple-scan/files/40.7-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,39 @@
+https://gitlab.gnome.org/GNOME/simple-scan/-/commit/da6626debe00be1a0660f30cf2bf7629186c01d5
+https://bugs.gentoo.org/831891
+
+From: r-value <i@rvalue.moe>
+Date: Tue, 16 Nov 2021 02:43:11 +0800
+Subject: [PATCH] Remove incorrect i18n.merge_file argument
+
+The positional argument was being silently ignored until meson 0.60.0 where
+it fails with "ERROR: Function does not take positional arguments".
+---
+ data/meson.build | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 2b5a0ee3..cf6e4ae1 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -8,16 +8,14 @@ install_data ('org.gnome.SimpleScan.gschema.xml',
+               install_dir: join_paths (datadir, 'glib-2.0', 'schemas'))
+ meson.add_install_script ('meson_compile_gschema.py')
+ 
+-i18n.merge_file ('desktop-file',
+-                 input: 'simple-scan.desktop.in',
++i18n.merge_file (input: 'simple-scan.desktop.in',
+                  output: 'simple-scan.desktop',
+                  install: true,
+                  install_dir: join_paths (datadir, 'applications'),
+                  po_dir: '../po',
+                  type: 'desktop')
+ 
+-i18n.merge_file ('appdata-file',
+-                 input: 'simple-scan.appdata.xml.in',
++i18n.merge_file (input: 'simple-scan.appdata.xml.in',
+                  output: 'simple-scan.appdata.xml',
+                  install: true,
+                  install_dir: join_paths (datadir, 'metainfo'),
+-- 
+GitLab
+
diff --git a/media-gfx/simple-scan/simple-scan-40.1.ebuild b/media-gfx/simple-scan/simple-scan-40.1.ebuild
deleted file mode 100644
index ca6eee8059b1..000000000000
--- a/media-gfx/simple-scan/simple-scan-40.1.ebuild
+++ /dev/null
@@ -1,74 +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} )
-VALA_MIN_API_VERSION="0.34"
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Simple document scanning utility"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE="colord webp"
-
-DEPEND="
-	>=dev-libs/glib-2.38:2
-	>=x11-libs/gtk+-3.22:3
-	>=gui-libs/libhandy-1.1.90:1=
-	>=sys-libs/zlib-1.2.3.1:=
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	>=dev-libs/libgusb-0.2.7
-	colord? ( >=x11-misc/colord-0.1.24:=[udev(+)] )
-	webp? ( media-libs/libwebp )
-	>=media-gfx/sane-backends-1.0.20:=
-
-	virtual/jpeg:0=
-"
-# packagekit? ( >=app-admin/packagekit-base-1.1.5 )
-RDEPEND="${DEPEND}
-	x11-misc/xdg-utils
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gui-libs/libhandy:1[vala]
-	dev-libs/libgusb[vala]
-	colord? ( x11-misc/colord[vala] )
-"
-
-PATCHES=(
-	# Add control for optional dependencies
-	"${FILESDIR}"/40.0-add-control-optional-deps.patch
-)
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use colord)
-		-Dpackagekit=false
-		$(meson_use webp)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/simple-scan/simple-scan-40.5.ebuild b/media-gfx/simple-scan/simple-scan-40.5.ebuild
deleted file mode 100644
index 6647ed0c63da..000000000000
--- a/media-gfx/simple-scan/simple-scan-40.5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
-VALA_MIN_API_VERSION="0.34"
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Simple document scanning utility"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="colord webp"
-
-DEPEND="
-	>=dev-libs/glib-2.38:2
-	>=x11-libs/gtk+-3.22:3
-	>=gui-libs/libhandy-1.1.90:1=
-	>=sys-libs/zlib-1.2.3.1:=
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	>=dev-libs/libgusb-0.2.7
-	colord? ( >=x11-misc/colord-0.1.24:=[udev(+)] )
-	webp? ( media-libs/libwebp )
-	>=media-gfx/sane-backends-1.0.20:=
-
-	virtual/jpeg:0=
-"
-# packagekit? ( >=app-admin/packagekit-base-1.1.5 )
-RDEPEND="${DEPEND}
-	x11-misc/xdg-utils
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gui-libs/libhandy:1[vala]
-	dev-libs/libgusb[vala]
-	colord? ( x11-misc/colord[vala] )
-"
-
-PATCHES=(
-	# Add control for optional dependencies
-	"${FILESDIR}"/40.0-add-control-optional-deps.patch
-)
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use colord)
-		-Dpackagekit=false
-		$(meson_use webp)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/simple-scan/simple-scan-40.6-r1.ebuild b/media-gfx/simple-scan/simple-scan-40.6-r1.ebuild
deleted file mode 100644
index 6647ed0c63da..000000000000
--- a/media-gfx/simple-scan/simple-scan-40.6-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
-VALA_MIN_API_VERSION="0.34"
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Simple document scanning utility"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="colord webp"
-
-DEPEND="
-	>=dev-libs/glib-2.38:2
-	>=x11-libs/gtk+-3.22:3
-	>=gui-libs/libhandy-1.1.90:1=
-	>=sys-libs/zlib-1.2.3.1:=
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	>=dev-libs/libgusb-0.2.7
-	colord? ( >=x11-misc/colord-0.1.24:=[udev(+)] )
-	webp? ( media-libs/libwebp )
-	>=media-gfx/sane-backends-1.0.20:=
-
-	virtual/jpeg:0=
-"
-# packagekit? ( >=app-admin/packagekit-base-1.1.5 )
-RDEPEND="${DEPEND}
-	x11-misc/xdg-utils
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gui-libs/libhandy:1[vala]
-	dev-libs/libgusb[vala]
-	colord? ( x11-misc/colord[vala] )
-"
-
-PATCHES=(
-	# Add control for optional dependencies
-	"${FILESDIR}"/40.0-add-control-optional-deps.patch
-)
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use colord)
-		-Dpackagekit=false
-		$(meson_use webp)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/simple-scan/simple-scan-40.7.ebuild b/media-gfx/simple-scan/simple-scan-40.7.ebuild
index 6f4df2c8cd69..0b752878e6c9 100644
--- a/media-gfx/simple-scan/simple-scan-40.7.ebuild
+++ b/media-gfx/simple-scan/simple-scan-40.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="colord webp"
 
 DEPEND="
@@ -47,6 +47,7 @@ BDEPEND="
 PATCHES=(
 	# Add control for optional dependencies
 	"${FILESDIR}"/40.0-add-control-optional-deps.patch
+	"${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
 )
 
 src_prepare() {
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 68dbc86438f2..3d9233da1290 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,6 +1,6 @@
-AUX tuxpaint-0.9.27-Makefile.patch 5112 BLAKE2B fd6ddb8249373189bf577171d188af5b7f6afd662097f10a814ede17d9d39466d7919814935900cdcb96379f8a9a5f65def60a0ab12eae94b1d7d70c804d1c9e SHA512 5e543962d059c3825987f8c786888313f95e8f7b4a0910ef36b2e329055b0dff4acd06792665a3bacf27b2007080a84cb31901c4f659d72ec043f66962d3ac98
+AUX tuxpaint-0.9.27-Makefile.patch 6903 BLAKE2B dddb1788115b730648dbfdf87e78a70662b908322e773336feddb49044acf0f7019a5e06b80795fd3e7db66e861984b78995760d1f1257de279c94b9bb682f06 SHA512 a18bb8408163aee59aba9e70ffdb7f65a9db93ca3ea7516bbdea3b92b814477aed8c23ab4649669232aef3aba2ae21d8c8c32d6c11d647e3d5768509b1c55259
 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 1336 BLAKE2B 5288f5eb8c4084406d830a9c4c8aae37cb47bbe8068a453f03678d1af44485103a2399b69dbabb423ddbf3cc07ebc960d7c0d44dd29d8c61acce6750225f87a1 SHA512 96e42f2b031bea036a354bfad7a9ed2648f06e6e0248b7500e384b943d8567a115a00b2466d0c82749acb14bb83bcbc41bb67288c72880e92c538617866b4c63
-MISC metadata.xml 619 BLAKE2B 4e629db78effd65e82d1098d85a9faed8f36f008ff84f0b9e74dad49534f919e2247f1a58971fda9b4e4446c9447c49cf18b37df63eda6ffad756daec85e393f SHA512 350ca34e3a685c774bddd67663bb7e1c73505a86780ee556e8d7b8223bf4735ad356f947a26f642a7e504266e19e164b490a4bb5979007a4a026d2a49c10b3f2
+EBUILD tuxpaint-0.9.27.ebuild 1349 BLAKE2B 804d9d407cb6a128ca41f9bc1475aec72ad54d1df0a2cac4ec4fb82fd5ac17cd7ccbd1876e87733125706d55f72d95b85923fb343a29869d7d7fb8259d8ec586 SHA512 207b5d08297ea342c8b99b68720f45d1fb52e5c012fea3f0b4bacecac6f5e3f8501c55f3829a31096b767ca5eac448b82750dba2cfac81494ec3a1d903f5c13e
+MISC metadata.xml 846 BLAKE2B 41e02607ee8987a7663ba72e7459a1845b73d9992e4939322db2b4ce654d06efb0d5acc935decb776aa50a20990244d0e422e4c32532fa0f17a76a9a637ac734 SHA512 59465c99f8f91e4def6ffd37f7bcfd22cb208c1f9dcbdd11c764e4f55d1e9db75169254b9ca3ed7642f57d45d4d10e9f97c80d5139cb0b80ccd20dc540185ade
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch
index 7fd2e3ded8ec..fdbd5136f322 100644
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch
@@ -1,5 +1,5 @@
---- a./Makefile
-+++ b./Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -72,7 +72,7 @@ endif
  # <HOSTROOT> is the directory containing support files for building for <HOST>:
  #   <HOSTROOT>/include        Header files.
@@ -45,6 +45,15 @@
  MAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
  DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
  
+@@ -358,7 +358,7 @@ MOUSE_CFLAGS:=-Isrc/$(MOUSEDIR) -D$(CURSOR_SHAPES)_CURSOR_SHAPES
+ # are 132x80.  On larger screens, they will be bigger (since the New dialog
+ # is always 4x4 thumbnails); therefore, generating larger thumbs, which can
+ # be still be scaled down fairly quickly (esp. complicated SVG ones).
+-CONVERT_OPTS:=-alpha Background -alpha Off +depth -resize !264x160 -background white -interlace none
++CONVERT_OPTS:=-resize 264x160 -background white -extent 0x0 -interlace none
+ 
+ .SUFFIXES:
+ 
 @@ -545,7 +545,7 @@ trans:
  windows_ARCH_INSTALL:=install-dlls install-tpconf-i18n
  macos_ARCH_INSTALL:=install-macbundle TuxPaint.dmg install-man install-importscript install-bash-completion
@@ -73,6 +82,30 @@
  	-rm -f -r $(CONFDIR)
  	-rm $(COMPLETIONDIR)/tuxpaint-completion.bash
  	-rm -r $(MAGIC_PREFIX)
+@@ -791,11 +791,11 @@ $(THUMB_STARTERS):
+ 	@mkdir -p starters/.thumbs
+ 	@if [ "x" != "x"$(STARTER_BACK_NAME) ] ; \
+ 	then \
+-		composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp_$(notdir $(STARTER_NAME)).png ; \
+-		convert $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ 2> /dev/null ; \
++		gm composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp_$(notdir $(STARTER_NAME)).png 2> /dev/null ; \
++		gm convert $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ || echo "($@ failed)" ; \
+ 		rm obj/tmp_$(notdir $(STARTER_NAME)).png ; \
+ 	else \
+-		convert $(CONVERT_OPTS) $(STARTER_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \
++		gm convert $(CONVERT_OPTS) $(STARTER_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \
+ 	fi
+ 
+ $(INSTALLED_THUMB_STARTERS): $(DATA_PREFIX)/%: %
+@@ -850,7 +850,7 @@ TEMPLATE_NAME=$(or $(wildcard $(subst templates/.thumbs,templates,$(@:-t.png=.sv
+ $(THUMB_TEMPLATES):
+ 	@printf "."
+ 	@mkdir -p templates/.thumbs
+-	@convert $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \
++	@gm convert $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \
+ 
+ $(INSTALLED_THUMB_TEMPLATES): $(DATA_PREFIX)/%: %
+ 	@install -D -m 644 $< $@ || ( echo "NO THUMB $<" )
 @@ -962,9 +962,9 @@ install-dlls:
  	@cp -R win32/etc/ $(BIN_PREFIX)
  	@echo
diff --git a/media-gfx/tuxpaint/metadata.xml b/media-gfx/tuxpaint/metadata.xml
index b325571bdc70..ac2c835af229 100644
--- a/media-gfx/tuxpaint/metadata.xml
+++ b/media-gfx/tuxpaint/metadata.xml
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>
-  Tux Paint is a free drawing program designed for young children
-  (kids ages 3 and up). It has a simple, easy-to-use interface, fun
-  sound effects, and an encouraging cartoon mascot who helps guide
-  children as they use the program. It provides a blank canvas and a
-  variety of drawing tools to help your child be creative.
-</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">tuxpaint</remote-id>
-  </upstream>
+	<maintainer type="person" proxied="yes">
+		<email>rndxelement@protonmail.com</email>
+		<name>Philipp Rösner</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+	Tux Paint is a free drawing program designed for young children
+	(kids ages 3 and up). It has a simple, easy-to-use interface, fun
+	sound effects, and an encouraging cartoon mascot who helps guide
+	children as they use the program. It provides a blank canvas and a
+	variety of drawing tools to help your child be creative.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">tuxpaint</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
index 7a1dffc5100d..393cf77443e4 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/gperf
-	virtual/imagemagick-tools
+	media-gfx/graphicsmagick[jpeg,png,svg]
 	sys-devel/gettext
 "
 
diff --git a/media-gfx/viewnior/Manifest b/media-gfx/viewnior/Manifest
index 32fffb39cf34..97d85488a2ff 100644
--- a/media-gfx/viewnior/Manifest
+++ b/media-gfx/viewnior/Manifest
@@ -3,5 +3,5 @@ AUX viewnior-0.17-update_metadata_location.patch 1260 BLAKE2B c3b522f56bcc039978
 DIST viewnior-1.7.tar.gz 165719 BLAKE2B 906ab0b632fcc102ac62dd77d6742c2121c46cd92adc0dfe9ba772bf697eff356519dbb6219016a6470903c855aa4c9081f0d61ca1607d8d1b6d8e03236a19bc SHA512 5ba17d7b5ceeffa65b04213f179c1439b09ac44e412e0750dde159b118a714f28d3a290509a402b234e4e7ba5b185fc73eef65d418598f344911e4e2c1373fe5
 DIST viewnior-1.8.tar.gz 169219 BLAKE2B 6f6da16aa987acce8a48d24a645e1c033f113bb6e291da9f17810a7a04e5007d27c2f1afe3c62cc2d192003633a4128fb04a031160fbd51efbd0bb7dfabd8970 SHA512 0f9698801172ef6b8f5df4132526b2e605e9aa9fd69cf41a091a3623de9b2e84ca857e625aaa9e83f29df318f70a13fb458bac0df11ae46837b78ef257a00bee
 EBUILD viewnior-1.7-r2.ebuild 1167 BLAKE2B 138ed55bfa3439f8030218cb981459eeb4c5347e159f6628e7b22ec5a275892a1aafc85c8d19e34cafb0764284bb4001d7c25c22cdc53a3dc762b8e63a72051e SHA512 520c347b2388a4d31adbb90492ef32577223fa24bc4df6e3c05e316f9bc482ad424894054cf3424fd80d1fa17eef601211387cb70a460905eaba9a6405f08aef
-EBUILD viewnior-1.8.ebuild 1028 BLAKE2B bac983e60d6600280979b7a4942994a6ebe64a0de9d9e0a706606906073cfe0af0d4eae1be3a68de3174875d45c776bb945362aa14e845fe31b6ec75cfcd9827 SHA512 fa33261bbc86223974d8520d3160f1391ec428abd6865b695297a6cd52bae041ad994a2a7d4af095ceca408941522ab14abdcc9f09fc575c74698bbbb6ed90a6
+EBUILD viewnior-1.8.ebuild 1027 BLAKE2B 427897227918751fdaa92ae2395ce90c78d9bdc88fa3ff9c9547e7b7e067b9be4deb432be0f947f58995a2b458cc0197409e49f5252ac198ad7a014be8421282 SHA512 1daf715031ad705376d19321c1d493514157add317bb74449a967fe14d9183ca897e12b1b7e3cb223d94915ef4158fc17ce54541a4047268328ec172d5213a3c
 MISC metadata.xml 553 BLAKE2B 7fa77da8d1dcd0a0b6d53f1de26b13ead4edaf6be6ea93858328ce412c7c97e40240aebbedd68ccc66469992b637b11d14763435e3451ac16dc1a1a72e9f2e2a SHA512 e3b2daa2db92f02e6e2c7e51828a60acd9b74a99949643e1cdc429e9f02dacf0e3f7b7d7c8bc86c10eb46fe1aaa06f3b07d8e7ddc491951f8e14f881d69c61d0
diff --git a/media-gfx/viewnior/viewnior-1.8.ebuild b/media-gfx/viewnior/viewnior-1.8.ebuild
index 05444706ef80..3c7bc2cde40e 100644
--- a/media-gfx/viewnior/viewnior-1.8.ebuild
+++ b/media-gfx/viewnior/viewnior-1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hellosiyan/${PN^}/archive/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE=""
 
 RDEPEND="