gentoo resync : 22.12.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-12-22 14:08:05 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-12-22 14:08:05 +0000
commit: 93a93e9a3b53c1a73142a305ea1f8136846942ee (patch)
tree: b9791a06ab3284e27b568412c59316c66240c682 /media-gfx
parent: 2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff)
106 files changed, 1430 insertions, 819 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index cf2a28ce01cb..730f2de51863 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest
index 280f974959e2..0812a0e16543 100644
--- a/media-gfx/chafa/Manifest
+++ b/media-gfx/chafa/Manifest
@@ -1,3 +1,3 @@
 DIST chafa-1.8.0.tar.xz 435712 BLAKE2B 15a6e64fff13ac32b2f828a68fb12c96856e175eae83c0396b07cbb2ce71d8c1c8eee67db00880372026fe91eaefac2b34376dee597108ffc07c706cf8c98682 SHA512 15ff08a0df82ae8517ac7744b81a39e1ae1eff8c9848128341cc25da94864e89b7101aabcff2d532bf11ea293bfc4c9e48b01f85388dafadbce2d2b2c8b7439d
-EBUILD chafa-1.8.0.ebuild 744 BLAKE2B f45a1b29f5d37253413c759b66888035e16a69318e95c4b46062549f441afecf3d43377d4132ad5c789cea2108fe4e25f69dfaeeb307a19b65cd9ce626f5f63a SHA512 336aa03393a3cccb5e44a317e66f50d0dd86bdec5bba2fd8550f78d0491ed262bb0292c5a23ad292430ab19f0e0063b46bccc93389ab2c77e046da25404c6c9e
+EBUILD chafa-1.8.0.ebuild 751 BLAKE2B 4e335f993bfa4595ecc45984d060bbd2a520edd587d3599699d5eff32355a62e4eb777157f3cdf1b44a72871bc482dca009386cee7954d99030c2c6d4dbbc659 SHA512 9bc26bf617961ef6532feaf247eff66e817171e3d20c5ef0ccfbeea7c1c5bf848c202d21d2b07219915ce02dee033836971ada2d72407636267af6d5fa797e50
 MISC metadata.xml 396 BLAKE2B fc22be32275227f194b224a340dcd08e55a565fa68b102eb9cb55406402ed38d4f593aa6f59f3c40a24480c8d002ea0ce4a9a831055bb6821fdbe1a1dfd103ff SHA512 46617cd84ec16190865a896432df30443d31123b790d871bf634cd446b520ed9b1728951e49217b0619a91d0d46d3013ce7f41e142893298ad7e8c2522d1552d
diff --git a/media-gfx/chafa/chafa-1.8.0.ebuild b/media-gfx/chafa/chafa-1.8.0.ebuild
index aaee185d5da3..8cd688d7009e 100644
--- a/media-gfx/chafa/chafa-1.8.0.ebuild
+++ b/media-gfx/chafa/chafa-1.8.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="+tools"
 
 RDEPEND="
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index a9f5fa9f3b51..0dc4bd0a3249 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -6,4 +6,5 @@ AUX darktable-3.6.1_openexr.patch 1806 BLAKE2B 3f05c8fbb4dd5a76e98ef3d9a9432fb2c
 DIST darktable-3.6.1.tar.xz 4685928 BLAKE2B 8ff6224e21b44f9e881adb8f020a2ea5ff5abb2c38da1aeaed312f89e548918c6d3bba210dbb4fb6901fbf0872c6e14c2e12c5b5b27932914a00428a709e8965 SHA512 d53eb8472531c62ceebe97769c6e53f7c9ed6efb404905295f00b5bf547fd0f0c395b8b926ccafc78d6cf9fed0745da655a77eeb84d92fce5d6a7a576f277416
 DIST darktable-usermanual-3.6.pdf 34290182 BLAKE2B 407223f6dfc25e53e2de31a05b0468a3d50ec5ccf836fa4cca61b16d43e91827c0276027ea73dd543750f240889b7325538eb474e19df86eeff4d380bf0b8829 SHA512 62c2723e5fc0434703f21bc4f5efdb997db1c0cfb800a9df217d6682325949ce18ab458a179bd20a888b73a7bd384bbbb2ea8888cba26278510abaab1e0cc335
 EBUILD darktable-3.6.1-r2.ebuild 4399 BLAKE2B 644124ce8549752a377e4f758a6e78a89e238cebe2deb07f1f214e7b2228d9f827f1bb24fc3a12aac6ce1ad8ae404d5cc183a1780d998cdb9998bde9deaaf53f SHA512 b8e3604d7c6fc288ef00d68e797144e20b9aabfc63202c3ba5aabfbdf891cc03342a60a71b2a2c05c43bc8ccf468b983345eb8524d24660e857012b93c78ff97
+EBUILD darktable-3.6.1-r3.ebuild 4848 BLAKE2B 45bc6ec76b9032b9da84ceec43705e83c98f4b5b48eedb3a6aee8c9575f6ed467a73a57b4d15bf9218240211978d54809bfbc7369d1c16ee86d7b3cfa1e2961a SHA512 f3b5bdded1c1a33c23cb1e46ef77898b348d80dd402ddee25464a0be89177b539fe5dabe0f083e27432518b7883b6479cd468b447c321ac5e4ba408a2162e6ce
 MISC metadata.xml 1152 BLAKE2B c43582dd3a0607de751a816c9856738d73b504422d6b21745a8f7948e2238a6be5c178bb224d787eb712aef222a592c6a712239a4a8dada4c66a453e158fc5de SHA512 8a20f53798359fec9eb45c1d2fdbe6cca623b2308f8391ece25c4100161a2056b52c44f3eba91d6d3c083f49843bac8e355982998d2c4217efdc976eb0d1a14c
diff --git a/media-gfx/darktable/darktable-3.6.1-r3.ebuild b/media-gfx/darktable/darktable-3.6.1-r3.ebuild
new file mode 100644
index 000000000000..746a8b4aaf9b
--- /dev/null
+++ b/media-gfx/darktable/darktable-3.6.1-r3.ebuild
@@ -0,0 +1,176 @@
+# 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}/${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 6f77a346e833..5eb7cccbdac7 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,3 +1,7 @@
+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.ebuild 4002 BLAKE2B 353ccc6cb8c0576a444c73024c48e091cb4bbaff09fbf5adaa38d452ad88c5c6efdf79c069cdc13a344a84364511712c98d0f360c6818b835390640198a54737 SHA512 d913e9908c8d45d08bce8be3239436fbc4a8fc036f2584cc8f351cc9f8e0b5e33f90889caa42696892fdf37f89b31e31852869b9bb6f05850eabf432b096d9f9
+EBUILD digikam-7.3.0-r1.ebuild 4090 BLAKE2B e002e678d8fd2f0df0a05be025df05f17edd8be0ed3383839ff8d8b5d00aeada62bc418e6db21156b8fe00102ec3f36b99a5f440914c81f5a77fcdb5accd6991 SHA512 40eb1bafc37691da3a77a5c162b38a1e7521651598b4b17d84d972b441481cda30aee14198b26c46bb69aaede8f1f2cd7d09177345d7023053d5ac28eff9c7ab
+EBUILD digikam-7.4.0-r1.ebuild 4030 BLAKE2B e0a8a7d8a93ca946d2dc793585a43f5d5a9d361534b96cf04399de39864482149fb9d73b29fce0e98e64036258541ca4b161401e7fdeeadabcdf228ad7cef817 SHA512 a2a60ca8b7a8cc92e3a164764f2e9850338b5f286fb797bef614d8795533288444260f8e4abd77fbf47cb3a5b051d741f75577541b7d77096f3fa51ed6a13757
 MISC metadata.xml 1166 BLAKE2B 022418e3ce42ac9ec248d5301d20786cd3ddedac61e85b934d9074d9e68fa9511720976620ae84dc2def3961fba307fa9c9d84e5bd90896da7b866b21dfbf7f9 SHA512 1e249e12495dcf72e0eb02f9fa7822112afba627a0b155a2188c382e69a3697cd186757484cd0f559a2985a83ace953a62cbb4e0afb4a6c9551d89053321b3c1
diff --git a/media-gfx/digikam/digikam-7.3.0.ebuild b/media-gfx/digikam/digikam-7.3.0-r1.ebuild
index bdb373353664..46f064167d80 100644
--- a/media-gfx/digikam/digikam-7.3.0.ebuild
+++ b/media-gfx/digikam/digikam-7.3.0-r1.ebuild
@@ -62,7 +62,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/solid-${KFMIN}:5
-	>=media-gfx/exiv2-0.27:=
+	>=media-gfx/exiv2-0.27:=[xmp]
 	media-libs/lcms:2
 	media-libs/liblqr
 	media-libs/libpng:0=
@@ -108,6 +108,11 @@ RDEPEND="${COMMON_DEPEND}
 	panorama? ( media-gfx/hugin )
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-cmake.patch"
+	"${FILESDIR}/${P}-akonadi-21.12.0.patch"
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 	ecm_pkg_pretend
@@ -126,6 +131,7 @@ 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)
@@ -139,7 +145,6 @@ 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)
 		$(cmake_use_find_package X X11)
 	)
 
diff --git a/media-gfx/digikam/digikam-7.4.0-r1.ebuild b/media-gfx/digikam/digikam-7.4.0-r1.ebuild
new file mode 100644
index 000000000000..b9ebebffc487
--- /dev/null
+++ b/media-gfx/digikam/digikam-7.4.0-r1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.88.0
+QTMIN=5.15.2
+inherit ecm kde.org toolchain-funcs
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	if [[ ${PV} =~ beta[0-9]$ ]]; then
+		SRC_URI="mirror://kde/unstable/${PN}/"
+	else
+		SRC_URI="mirror://kde/stable/${PN}/${PV}/"
+	fi
+	SRC_URI+="digiKam-${PV/_/-}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${PV/_/-}"
+fi
+
+DESCRIPTION="Digital photo management application"
+HOMEPAGE="https://www.digikam.org/"
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop X"
+
+# bug 366505
+RESTRICT="test"
+
+COMMON_DEPEND="
+	dev-libs/expat
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[mysql?]
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=media-gfx/exiv2-0.27:=[xmp]
+	media-libs/lcms:2
+	media-libs/liblqr
+	media-libs/libpng:0=
+	>=media-libs/opencv-3.3.0:=[contrib,contribdnn]
+	media-libs/tiff:0
+	virtual/jpeg:0
+	addressbook? (
+		>=kde-apps/akonadi-contacts-19.04.3:5
+		>=kde-frameworks/kcontacts-${KFMIN}:5
+	)
+	calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 )
+	gphoto2? ( media-libs/libgphoto2:= )
+	heif? ( media-libs/x265:= )
+	imagemagick? ( media-gfx/imagemagick:= )
+	lensfun? ( media-libs/lensfun )
+	marble? (
+		>=dev-qt/qtconcurrent-${QTMIN}:5
+		>=kde-apps/marble-19.04.3:5
+		>=kde-frameworks/kbookmarks-${KFMIN}:5
+	)
+	mediaplayer? (
+		media-libs/qtav[opengl(+)]
+		media-video/ffmpeg:=
+	)
+	opengl? (
+		>=dev-qt/qtopengl-${QTMIN}:5
+		virtual/opengl
+	)
+	panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
+	scanner? ( >=kde-apps/libksane-19.04.3:5 )
+	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+	dev-libs/boost[threads(+)]
+"
+RDEPEND="${COMMON_DEPEND}
+	mysql? ( virtual/mysql[server(+)] )
+	panorama? ( media-gfx/hugin )
+"
+BDEPEND="
+	sys-devel/gettext
+	panorama? (
+		sys-devel/bison
+		sys-devel/flex
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-7.3.0-cmake.patch" )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	ecm_pkg_pretend
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	ecm_pkg_setup
+}
+
+# FIXME: Unbundle libraw (libs/rawengine/libraw)
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=OFF # bug 698192
+		-DENABLE_APPSTYLES=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
+		-DENABLE_QWEBENGINE=ON
+		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
+		$(cmake_use_find_package calendar KF5CalendarCore)
+		$(cmake_use_find_package gphoto2 Gphoto2)
+		$(cmake_use_find_package heif X265)
+		$(cmake_use_find_package imagemagick ImageMagick)
+		$(cmake_use_find_package lensfun LensFun)
+		$(cmake_use_find_package marble Marble)
+		-DENABLE_MEDIAPLAYER=$(usex mediaplayer)
+		$(cmake_use_find_package mediaplayer QtAV)
+		-DENABLE_MYSQLSUPPORT=$(usex mysql)
+		-DENABLE_INTERNALMYSQL=$(usex mysql)
+		$(cmake_use_find_package opengl OpenGL)
+		$(cmake_use_find_package panorama KF5ThreadWeaver)
+		$(cmake_use_find_package scanner KF5Sane)
+		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
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
new file mode 100644
index 000000000000..6e4dd25a4028
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-7.3.0-akonadi-21.12.0.patch
@@ -0,0 +1,31 @@
+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/digikam/files/digikam-7.3.0-cmake.patch b/media-gfx/digikam/files/digikam-7.3.0-cmake.patch
new file mode 100644
index 000000000000..2b580f92a1cc
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-7.3.0-cmake.patch
@@ -0,0 +1,118 @@
+From 370308fb8381b55e7ebfcdd77f1361b49a288f88 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 17 Feb 2019 23:51:03 +0100
+Subject: [PATCH] Un-break optional Qt5/KF5 detection
+
+---
+ core/CMakeLists.txt | 58 ++++++++++++++++-----------------------------
+ 1 file changed, 20 insertions(+), 38 deletions(-)
+
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index 16bba83335..b8cdc59baa 100644
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -65,17 +65,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED
+ )
+ 
+ if(ENABLE_QWEBENGINE)
+-    find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS WebEngineWidgets)
++    find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} REQUIRED NO_MODULE)
+ else()
+-    find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS WebKitWidgets)
++    find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} REQUIRED NO_MODULE)
+ endif()
+ 
+-find_package(Qt5 ${QT_MIN_VERSION}
+-             OPTIONAL_COMPONENTS
+-             DBus
+-             OpenGL
+-             XmlPatterns                # For Rajce plugin
+-)
++find_package(Qt5DBus ${QT_MIN_VERSION})
++find_package(Qt5OpenGL ${QT_MIN_VERSION})
++find_package(Qt5XmlPatterns ${QT_MIN_VERSION}) # For Rajce plugin
+ 
+ if(ENABLE_DBUS)
+     if(NOT Qt5DBus_FOUND)
+@@ -86,16 +83,11 @@ endif()
+ # Dependencies For unit tests and CLI test tools
+ 
+ if(BUILD_TESTING)
+-    find_package(Qt5 ${QT_MIN_VERSION} REQUIRED
+-                 NO_MODULE COMPONENTS
+-                 Test
+-    )
+-
+-    find_package(Qt5 ${QT_MIN_VERSION}
+-                 QUIET
+-                 OPTIONAL_COMPONENTS
+-                 Qml WebView  # Optional, for 'sialis' O2 library test tool.
+-    )
++    find_package(Qt5Test ${QT_MIN_VERSION} NO_MODULE)
++    
++    # Optional, for 'sialis' O2 library test tool.
++    find_package(Qt5Qml ${QT_MIN_VERSION} QUIET NO_MODULE)
++    find_package(Qt5WebView ${QT_MIN_VERSION} QUIET NO_MODULE)
+ endif()
+ 
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
+@@ -113,38 +105,28 @@ find_package(KF5 ${KF5_MIN_VERSION} QUIET
+              OPTIONAL_COMPONENTS
+              KIO                    # For Desktop integration (Widgets only).
+              IconThemes             # For Desktop integration.
+-             FileMetaData           # For KDE file indexer support.
+              ThreadWeaver           # For Panorama tool.
+              NotifyConfig           # KDE desktop application notify configuration.
+              Notifications          # KDE desktop notifications integration.
+ )
+ 
+-find_package(KF5 ${AKONADI_MIN_VERSION} QUIET
+-             OPTIONAL_COMPONENTS
+-             AkonadiContact         # For KDE Mail Contacts support.
+-             Contacts               # API for contacts/address book data.
+-)
++find_package(KF5Sane ${KSANE_MIN_VERSION} QUIET) # For digital scanner support.
+ 
+-find_package(KF5 ${KSANE_MIN_VERSION} QUIET
+-             OPTIONAL_COMPONENTS
+-             Sane                   # For digital scanner support.
+-)
+-
+-find_package(KF5 ${CALENDAR_MIN_VERSION} QUIET
+-             OPTIONAL_COMPONENTS
+-             CalendarCore           # For Calendar tool.
+-)
++find_package(KF5CalendarCore ${CALENDAR_MIN_VERSION} QUIET) # For Calendar tool.
+ 
+ if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
+     set(HAVE_KCALENDAR_QDATETIME TRUE)
+ endif()
+ 
+-if(ENABLE_AKONADICONTACTSUPPORT AND (NOT KF5AkonadiContact_FOUND OR NOT KF5Contacts_FOUND))
+-    set(ENABLE_AKONADICONTACTSUPPORT OFF)
++if(ENABLE_AKONADICONTACTSUPPORT)
++    find_package(KF5 ${AKONADI_MIN_VERSION} REQUIRED
++                AkonadiContact         # For KDE Mail Contacts support.
++                Contacts               # API for contacts/address book data.
++    )
+ endif()
+ 
+-if(ENABLE_KFILEMETADATASUPPORT AND NOT KF5FileMetaData_FOUND)
+-    set(ENABLE_KFILEMETADATASUPPORT OFF)
++if(ENABLE_KFILEMETADATASUPPORT)
++    find_package(KF5FileMetaData ${KF5_MIN_VERSION} REQUIRED) # For KDE file indexer support.
+ endif()
+ 
+ # Check if KIO have been compiled with KIOWidgets. digiKam only needs this one.
+@@ -275,7 +257,7 @@ endif()
+ find_package(X11)
+ 
+ if(X11_FOUND)
+-    find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS X11Extras)
++    find_package(Qt5X11Extras ${QT_MIN_VERSION} NO_MODULE)
+     set(HAVE_X11 TRUE)
+ else()
+     set(HAVE_X11 FALSE)
+-- 
+2.34.1
+
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 204919c085c2..2be7b921803d 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,5 +1,7 @@
 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-41.1.ebuild b/media-gfx/eog/eog-41.1.ebuild
new file mode 100644
index 000000000000..27a90068e4a1
--- /dev/null
+++ b/media-gfx/eog/eog-41.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="The Eye of GNOME image viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
+
+LICENSE="GPL-2+"
+SLOT="1"
+
+IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
+REQUIRED_USE="exif? ( jpeg )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.53.4:2
+	>=dev-libs/libpeas-0.7.4:=[gtk]
+	>=gnome-base/gnome-desktop-2.91.2:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=x11-misc/shared-mime-info-0.20
+	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
+	>=x11-libs/gtk+-3.22.0:3[introspection,X]
+	sys-libs/zlib
+
+	exif? ( >=media-libs/libexif-0.6.14 )
+	lcms? ( media-libs/lcms:2 )
+	xmp? ( media-libs/exempi:2 )
+	jpeg? ( virtual/jpeg:0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	svg? ( >=gnome-base/librsvg-2.44.0:2 )
+
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? ( >=dev-util/gtk-doc-1.16
+		app-text/docbook-xml-dtd:4.1.2 )
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use exif libexif)
+		$(meson_use lcms cms)
+		$(meson_use xmp)
+		$(meson_use jpeg libjpeg)
+		$(meson_use svg librsvg)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		-Dinstalled_tests=false
+		-Dlibportal=false # As of 40.3, all libportal usages are flatpak-specific
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
index 982b7b98e73e..32f58c7bf600 100644
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@@ -2,5 +2,5 @@ AUX eom-1.24.0-add-gdk-includes.patch 798 BLAKE2B db2156dadd2458100624a01e0724f7
 DIST eom-1.24.1.tar.xz 2408284 BLAKE2B 70d660896dff42d5a91ea651697b50d4c90ced92023d5df48dfbed374c3777676f1f2dc99a0cb071a4eaa13353f31b11346136b963cf723397632cceafa64301 SHA512 70654b99f474d1b214cbbf8e799f82f3c38f47938df34cb5c8227c116b412364c568ae989b96d7082fb0d2fa319b3dba9b8dd499d19140a4d421bd09a46bffc0
 DIST eom-1.24.2.tar.xz 2428972 BLAKE2B 871cb98c4a308dbc4821e67bae41522dbebae446e64777d764d30ded2f0637bae33cb9090e813fd7e43206ba1a436f7795684c4c5e850a242e9db96804b08e81 SHA512 38497dc5fc42340ca1b356f40eab8c14c21b1467f82ec64024d633cfb7ebfc598020b35c02eedce4f73f7a5ecb9050b0f0af4ea00279a1a5e7a627e542f34951
 EBUILD eom-1.24.1.ebuild 1664 BLAKE2B f69a83f6925e9643f21c2ea2422cb994cbf72d1b7c7150c8df82889333226da23bbece1e3bd0ce6696dfc0ad06d725417e16a67776d8a1a605002431e8725830 SHA512 07bbb77b395b797a7927d74747335c5078f8c48a6ff6ab6abcbd372ebc445a0652d95a79c2a432bb3a8c2ad97f3a104943078d7aab3eef5351e71b99bad936f1
-EBUILD eom-1.24.2.ebuild 1673 BLAKE2B 34082962808ff72d9e922f49929d517fa15880c31386204ba787a6dff2559ca67a51c70afb4fc8ff2701efed38916ee471eda88f17ab7fb7f9cf07e795e009e1 SHA512 a0c2ea6125487cc6bda74b4fde2775aca1e8e5de387b4f9c965ec6357d3155130ad4e812722b569a823b81c4ede0f9b0388657a7386c6bd9fbdc868ce5c656ea
+EBUILD eom-1.24.2.ebuild 1671 BLAKE2B 79f787425f324d5e99f826b81f75930c4677d226b01c316d753d14538df4deac40b4b7c3ed1f804f40e4c20f0c626a0eb17b6fb3f149987326e2af1c7f79f3d6 SHA512 221e075180060204e530ec9c17b81c67c0d7f25d7bc8e0fbc601824266429f7f3a51b0ecdf552238ba7ec38c1ff450aa9c8315fd979130b5542b6b77e1f75970
 MISC metadata.xml 468 BLAKE2B 3dfeeca0297db2fc0dde74b8f23d365e6f33d53856bc32b568c2901a803097c69af05ecf881a9fd522a8f5a1e2a01e7aad496a8fd6571a1328746bf3376c541e SHA512 d605718c99007b9fb1b66b97f3078c7497b8bdeb46d3e487831d1b3e04dfe142d788ce83af67830d9f612c9077b69ee7eb197eef720b5da55327d9846d75478c
diff --git a/media-gfx/eom/eom-1.24.2.ebuild b/media-gfx/eom/eom-1.24.2.ebuild
index 5a08348e2126..5d7659c7581f 100644
--- a/media-gfx/eom/eom-1.24.2.ebuild
+++ b/media-gfx/eom/eom-1.24.2.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 fi
 
 DESCRIPTION="The MATE image viewer"
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index c26ff5c72d44..c9929fb6b012 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -4,5 +4,5 @@ DIST geeqie-1.5.1.tar.xz 1587116 BLAKE2B f8742a88eefd90fb1e7e1d1365058cef190b623
 DIST geeqie-1.6.tar.xz 1693488 BLAKE2B ee5369884c4c0e60fe827d43ef336c5aaa89d55aec8905bb8cdd4edb2ee12e15d525577a3c85403e2e8955a08c817007b72d1d1e3614063377a21aaba317acee SHA512 4acd05c6012c80581e9c594c7dc7d12265528aa8d3868afef9def36798945afb851da9376bbe5f205ac3c5e1e2362188cc0e2891b49f3ea4396bbc6974c143ef
 EBUILD geeqie-1.5.1-r1.ebuild 2280 BLAKE2B 9653c0f0ac69e5a18812a86534e5ff6025e754545f2d53e3f06e538f59a600c98b27fff34f425e1d342a3c0ac8ef229f58ef8da99b9cd4c5f1f54e91246eead9 SHA512 26a4d709e1c8c6f3a6db159d4e912def9ce7ed7cb7a7d1a261d2428b46440aad882d450b1f8d54f513fd02a1f637bd0328403c9c143281b889dc3f34dfca7a31
 EBUILD geeqie-1.6.ebuild 2278 BLAKE2B 73e0b1ea05b4b92f7408bbb7dc12cfaa555eb7210a0235d1ce7a039c1b68be65615479975bbabf3809b76f6f562e8e9eb3b542359c6f0223fc449cf8a82fdd5e SHA512 74f04c2ccc000a26a6c649703275fb1efdc9101aa0b9c3c88500c4978b68bc8fabea61a669ba288c0dab36d22ae0d393e9dbcb955f1088e88adbd37a92c9f6f5
-EBUILD geeqie-9999.ebuild 2330 BLAKE2B 5663c258cc045098f835f35484648755e87b7223f4caee2bacc746c78bbeaa683e3fa5b7ad8bef4198853bb1628c09e103df94e8d0a98b2961d2a1a36fbbc104 SHA512 e911efd079f9b6c8455302d2f02f55de4050ecda2a17beb2ab945753c8e1c6ce0fb1947f107e4218354441b912970d5687c0ac5c72b5e87346dfc06668a6c2b2
+EBUILD geeqie-9999.ebuild 2260 BLAKE2B fb20a91012f7771197f763e9cfbda5c201c51241e494dca0d6e499d9f6e7a8bc2887ed8c4efabfbcdcb86dd0cc7a4463506b8a7cb31c261a6c4cc82d1cce634d SHA512 4a0efeda56009c9dea7a5bcab831b251b54070a370d2f915bbb3f74be3e727e5cae1c0e8aaa0f239aa7208e052548b69e605a2b97ef817dceb78d4d5e8b49ea8
 MISC metadata.xml 924 BLAKE2B 9bafd79f0d60d1237da4b35aeb2142384c188b503c151f8e0a26cd6ea9a2658876c66fb6f248af34eb33f6d2218bafeb1f34521d23c55e244c7ee1b4c0234dda SHA512 73f82d929d6479d81dde14c922ac048feaccf4bf5ea8ffe8aea56cf7cbe0cc8f76c528f3363bbbad3e881640608265a2e583d8b675fce3aa43ad7646023167fc
diff --git a/media-gfx/geeqie/geeqie-9999.ebuild b/media-gfx/geeqie/geeqie-9999.ebuild
index b9db7c038a20..e97db26b4d23 100644
--- a/media-gfx/geeqie/geeqie-9999.ebuild
+++ b/media-gfx/geeqie/geeqie-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 LUA_COMPAT=( lua5-{1..3} )
 
 inherit autotools git-r3 lua-single xdg
@@ -15,15 +15,14 @@ EGIT_REPO_URI="https://github.com/BestImageViewer/geeqie.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug doc exif ffmpegthumbnailer gpu-accel +gtk3 jpeg lcms lirc lua map nls pdf tiff xmp"
+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 )
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
 	jpeg? ( virtual/jpeg:0 )
 	lcms? ( media-libs/lcms:2 )
 	lirc? ( app-misc/lirc )
@@ -41,7 +40,6 @@ BDEPEND="
 	nls? ( sys-devel/gettext )"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	gpu-accel? ( gtk3 )
 	map? ( gpu-accel )"
 
 src_prepare() {
@@ -56,10 +54,10 @@ src_prepare() {
 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 gtk3)
 		$(use_enable jpeg)
 		$(use_enable lcms)
 		$(use_enable lua)
diff --git a/media-gfx/gifsicle/Manifest b/media-gfx/gifsicle/Manifest
index 88d06b4073b0..5d287fd5bdf3 100644
--- a/media-gfx/gifsicle/Manifest
+++ b/media-gfx/gifsicle/Manifest
@@ -1,5 +1,3 @@
-DIST gifsicle-1.92.tar.gz 575199 BLAKE2B 53716621846b14c0727e05893cb1876572ab80aa4d444c2b75499b541a19a5e45738b817c203b3926301378b2211a3263311c424cd8dd53e71d2b60f28ecdfb3 SHA512 5d9539eb5a6a8b87aed49ff3ca3d62e337845edbd05459b002369d571f74878c99740c34f50b4c86e5b8787ff189d4c21230e4f9019cd96a09db603afd7563dc
 DIST gifsicle-1.93.tar.gz 578194 BLAKE2B c5635fc736e2fd97278ab97377663f9702d2891cab5e19b16fa1aa53412ae48945d82ee42e9690208532cb854c99397ec4c1a11d4521454d8d40efd9adfd9d2a SHA512 1ace2c9597a405d69bb9dfa24764a3d7c7dd9864e1832d25a4a7ad2e32780038206b889711846d6e4dbc7189482d0d03874f18d86966ebffbc4ee10569c390d3
-EBUILD gifsicle-1.92.ebuild 650 BLAKE2B 0d9ff8115ef3c7b970fce293ebe3c7ac2d59064885e8aa4f5289652d02234c4772406a0e650305c783aa408926db6fe37a1c3c3cf3f221d6e7d88a7a30cf28f3 SHA512 eb99c7394bf33c104412f73c9e3c2b08564c0ad9164e26484c8f8530064d0a2780ef7c4690e764bef942be600118b605f8d5890c16fd9708fec23499c567666c
-EBUILD gifsicle-1.93.ebuild 642 BLAKE2B 21e2b2c1b724c6c4dc063aabe842ad94cf50717fbc6a1432c43d45e52e57ebe0308865b0ee1c6eda6d3e957f796cb3be9ba0eb09b67ed18cd723c6c79f12267d SHA512 194263ac52acc7405c122c894f477fb9bf7dc3bbb01763dd21c7675475caa0391ee4bd0f1b41b41283ea228b2489839ba97a0f1b8f408e162d5cfffd2e2dc2d8
+EBUILD gifsicle-1.93.ebuild 639 BLAKE2B 9c8080193dfaf712da47ac9855142d171861e9568849065e30f03fcc6be0318afc62708f3b3795ba49ef0facc375c77f269a6da2915d055d7f85fca2dec683a1 SHA512 cd058a074484f0aab0730acc8b09b79443e8db055d3f0429279fb0f519cbfb1ea4620209fffaf5a2d0d30e2f44c057be7cb36214cf63afd1274c20c616928a2e
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/media-gfx/gifsicle/gifsicle-1.92.ebuild b/media-gfx/gifsicle/gifsicle-1.92.ebuild
deleted file mode 100644
index 6b7dc995375a..000000000000
--- a/media-gfx/gifsicle/gifsicle-1.92.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Create, manipulate, and optimize GIF images and animations"
-HOMEPAGE="https://www.lcdf.org/~eddietwo/gifsicle/ https://github.com/kohler/gifsicle"
-SRC_URI="https://www.lcdf.org/~eddietwo/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="X"
-
-RDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-"
-DEPEND="
-	${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-DOCS=(
-	NEWS.md
-	README.md
-)
-
-src_configure() {
-	econf $(usex X "" "--disable-gifview")
-}
diff --git a/media-gfx/gifsicle/gifsicle-1.93.ebuild b/media-gfx/gifsicle/gifsicle-1.93.ebuild
index 72395ff30f1d..7e6ed5347c40 100644
--- a/media-gfx/gifsicle/gifsicle-1.93.ebuild
+++ b/media-gfx/gifsicle/gifsicle-1.93.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.lcdf.org/~eddietwo/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="X"
 
 RDEPEND="
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 16fd694e4054..b478513d78ca 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,4 +1,7 @@
 AUX gmic-2.9.2_ipa-sra.patch 665 BLAKE2B b61fa87ac2da5fd5956c89cb4a6c128f266a175dca70cd34ff4bed0483c934241a375131eaddd6ebd5f3afb52e694d4fc6839d20718bc06463c0e263f15b6d5a SHA512 6f04cac4de5914cedd269655fe58ca406199c042bdbab6e706cfea49516d0a7e1234e61c51b6a142341a7984dd96e97c4b8f13c2efbe427627be26539af8653e
+AUX gmic-3.0.0_ipa-sra.patch 665 BLAKE2B d1b47e2f0e8e63251172ee6cbc2c5b1bd86d100904a3d7bb0c5df39c051769b8b6c0aa0bb1f81010fd9ca195886a0dbce41528d31a811627ee28d1af58a83432 SHA512 4677fc93e72ed5e71a91197d364a04e1f8c6c13bb3f5b6eb5402a03c0d6ab395b54788669e028b932e207986121138419a58ed5f4333c0a45cbe6c0b9638ed96
 DIST gmic_2.9.9.tar.gz 7325061 BLAKE2B 256b4f1180edfc8ebb3a3e7f7666c7b44d95cd36a52c1b5539a355f022471eeef776c77b820864ca05b2ccc4a58a2e85970994cfdbce9e55aff31112af4e6000 SHA512 fcc129f5acfb32a3154d4c987f574c18ad68dd35e9e357fdc391166211747f5d7eed63a2fcde29c110a79e8665f2a6d1e70b68c81e19bb02be43a84ec7f1cc64
+DIST gmic_3.0.0.tar.gz 10225122 BLAKE2B 1066c62c2c56fafbfd11608eb9e3b7c7e9a87b404aae1e7e673e21d9b7b76a599e241f16656786bfa35687f3b3921fcba96368227753105aa25e2fa451962bfa SHA512 89353d16d6304e322400c93bafb50f7557df93c933ed2994f33a17d877e4e12ec511a355b38058680f356bccab5aa84b607fab225354c19d4b8ab3e64424c87c
 EBUILD gmic-2.9.9.ebuild 4259 BLAKE2B 5958f96d7bab5481fe3b3800a2f7327e1d4d6fe4b46e318206379ecf3b4b2e6e6a34963568eafe35e9426732a9fe81d6b45be6f80d6f2385a6f44b1fb3210234 SHA512 01867f8b3377db39ffb365033d2545bd2c73a4684bd4e3fd1a3b1b8ad4996f7a2fb036a44096aaee09123e9596ba635f9435a04791b973c40f084bef7c05bdb0
+EBUILD gmic-3.0.0.ebuild 4207 BLAKE2B 2c57f970c3267a82f13cab009ba59285f95db21baeeccf8a0eb84e1026341e2d8be1f7429513dc2cc903751d1ed77bd0b94bb5a456af819a75f888664b771253 SHA512 076726fa59a2b6d083ea0ef855532305d914611c081cb1967783b31ca9a7059e3b0842280257460bd8a66be8d41e14418c08976e9a5b79ee46a5039fa4708c74
 MISC metadata.xml 534 BLAKE2B f229329b6cd7c9a79b7be93c64ce6e84e65391084c7d76b99ada95762c643fc445fe12fa55acc9b355b5f1fb86de7c0845ec34f921494df8cba3d90ca8c2a408 SHA512 e36403a679467cba0b0580810a27076214d676a74deb09a55f13a38bc06f5ff0999560e1ae00629047a682bcbf3b9e73243db8da3eaa24b275c24a0d1995fe3c
diff --git a/media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch b/media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch
new file mode 100644
index 000000000000..04cfa560f193
--- /dev/null
+++ b/media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch
@@ -0,0 +1,16 @@
+A GCC-specific setting from years ago. gcc-9 quietly ignores it (the
+resulting binaries appear to be the same whether -fno-ipa-sra has been
+specified or not), clang fails on it as not recognised.
+Just get rid of it altogether.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -100,7 +100,7 @@
+ if(APPLE)
+     list(APPEND GMIC_CXX_COMPILE_FLAGS -mmacosx-version-min=10.8 -stdlib=libc++ -Wno-error=c++11-narrowing -Wc++11-extensions -fpermissive)
+ else()
+-    list(APPEND GMIC_CXX_COMPILE_FLAGS -Wno-error=narrowing -fno-ipa-sra -fpermissive)
++    list(APPEND GMIC_CXX_COMPILE_FLAGS -Wno-error=narrowing -fpermissive)
+ endif()
+ 
+ if(NOT "${PRERELEASE_TAG}" STREQUAL "")
diff --git a/media-gfx/gmic/gmic-3.0.0.ebuild b/media-gfx/gmic/gmic-3.0.0.ebuild
new file mode 100644
index 000000000000..8f9fa857f2b0
--- /dev/null
+++ b/media-gfx/gmic/gmic-3.0.0.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake bash-completion-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 tiff X zlib"
+REQUIRED_USE="
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		media-gfx/gimp:0/2
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.0_ipa-sra.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use openmp; then
+			tc-has-openmp || die "Please switch to an openmp compatible compiler"
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use gimp || use krita || use qt5; then
+		# respect user flags
+		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
+			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
+			-i gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		# Bug #753377
+		local PATCHES=()
+		cmake_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=no
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_cluts.gmz
+
+	# install gmic-qt frontends
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}
diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest
index 168e1a2985ae..bd2c2f76b4dc 100644
--- a/media-gfx/gnome-font-viewer/Manifest
+++ b/media-gfx/gnome-font-viewer/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-font-viewer-40.0.tar.xz 175396 BLAKE2B 33e10646fe31f76696867c0c5e7a99385064f09049390adb78149141f906958a6f14c3e29a9fbbfe8c48879f4600963ec66e9753018d9d7d658f4111c6dad120 SHA512 c82044e6750494d693cf631abe7fb76c655b58965ccd1ca08f512f0e79c40e9f207997465908b99e5813f350ca05ea8e76f029be79f3008173c49f3c5a4ee23d
-EBUILD gnome-font-viewer-40.0-r1.ebuild 699 BLAKE2B 5a55f830912dd510f25383881ae27694ebc25ee361522b2ca5289969c3d63e1c68557477c0b8886c32869f7be587e9302dc7f64ca4f4e4f8996ddc60c03f13f5 SHA512 d82268dd1af89a786dce1184a394fb3a259a4a04f0e309424fa76bf029fc8801b8c876ff57cfa723621632995b4869f08a5c512a60f27328d7b884b9f47862bd
+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
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0-r1.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0-r1.ebuild
index 3780d534f0b7..55c0af0cc18e 100644
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0-r1.ebuild
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-libs/glib-2.56.0:2
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-41.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-41.0.ebuild
new file mode 100644
index 000000000000..44bd6932c563
--- /dev/null
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-41.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org meson xdg
+
+DESCRIPTION="Font viewer utility for GNOME"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-libs/glib-2.56.0:2
+	>=x11-libs/gtk+-3.24.1:3
+	>=gui-libs/libhandy-1.0.0:1=
+	>=media-libs/harfbuzz-0.9.9:=
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	gnome-base/gnome-desktop:3=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest
index 5a0d6c7f7a61..daf9daa4e2f1 100644
--- a/media-gfx/gnome-screenshot/Manifest
+++ b/media-gfx/gnome-screenshot/Manifest
@@ -1,4 +1,6 @@
 AUX gnome-screenshot-40.0-fix-hidpi.patch 1351 BLAKE2B a94ce580d6f4af9e7945bdb13b3ba5b13787b564954e0933f9324c9d086e04f6efcb0affafc8775d2b41004f9c501edbe380e869723e038355c6c6ce7cb8b43b SHA512 68e8d178800036025a03786e8842aadfce0eaec61e36405406909ba8055db86d31350bae201226e54e667879da4610d5ea94df05fcf419f6609202a8c00d9c64
 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
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild
new file mode 100644
index 000000000000..2ae3882d508d
--- /dev/null
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
+
+DESCRIPTION="Screenshot utility for GNOME"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="X"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	>=dev-libs/glib-2.35.1:2[dbus]
+	>=x11-libs/gtk+-3.12.0:3
+	>=gui-libs/libhandy-1:1=
+"
+RDEPEND="${DEPEND}
+	>=gnome-base/gsettings-desktop-schemas-0.1.0
+"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	# Fix HiDPI handling in X11 fallback
+	# https://gitlab.gnome.org/GNOME/gnome-screenshot/-/issues/128
+	"${FILESDIR}"/${PN}-40.0-fix-hidpi.patch
+)
+
+DOC_CONTENTS="${P} saves screenshots in ~/Pictures/ and defaults to
+	non-interactive mode when launched from a terminal. If you want to choose
+	where to save the screenshot, run 'gnome-screenshot --interactive'"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature X x11)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 4904c084f9d2..7428356236de 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -2,6 +2,8 @@ AUX graphicsmagick-1.3.19-perl.patch 491 BLAKE2B 6a6465162d9a4d7d09b1edb425cc711
 AUX graphicsmagick-1.3.36-bzip-no-zlib.patch 693 BLAKE2B 75c49bf8db7dd7095f58ab67e138e860a1106d3e38d05c69333e63157ae55e98ef33b3f166e446321137ca0f4fffa67a6a7bba3dc264854ff6100f25c92d9bd9 SHA512 5d77818733d800f861ab3a1ef2ece0d47fcebb4690b714dce5fb3d74276ddfc400f16e871f7769703e696d3ca56692a2dd20fcfd97f0f1787b0876bb401f9084
 AUX graphicsmagick-1.3.36-flags.patch 2009 BLAKE2B 1d58f03cfeac9be92e2e85a2b6274ec22e3cb2c65d62e3095f2bb3da8f817ae52fdd6fe70e5da30bb8110202ec8c8268ffef7069c34d55ef7f7ccc3e53785418 SHA512 205694ea04e7b65c5519c564bbfa1ebd33ef4fa7800aec1a91439ed90794629dd54ab42c1c7f4f2f5ce3b7b078b3fffe76ce37c61643087f5cca244931b5bd3a
 DIST GraphicsMagick-1.3.36.tar.xz 5600712 BLAKE2B 069ab4f9bb5beea3321860bf8e43c8a1b51ab102054e92486375209a86fd3c1c1fb44d4b2c43a65c78f36e9f37e09316fe77b4f261bfb0af3b2c2a86ff8b5aa5 SHA512 27ed5fcbfb0303436bdcb0f11d18257a967d471251b51e633e2c655b0a7e5ed01f61a61f9702cc7d4c02714e005ac18ca9ba0f690c0580e41d07947a03c5cbb4
+DIST GraphicsMagick-1.3.37.tar.xz 5623688 BLAKE2B d6d5c8a07ec2aa2e60399887fa788751104c6917af295bb5a7bb1281d4a547462dd76cdde98f09cc00322bc3d7c89258dcd9d50506cfcec47a606efd90163b2a SHA512 971e05480a65eb99ff3c0d874675bcbffc24eafec1cacd03f5ef410ae014f82329f3590393100927f753feb183be1105fe0cfc5b0f775a30b0e6dc0c6b8a77af
 EBUILD graphicsmagick-1.3.36.ebuild 3221 BLAKE2B 570b421b5a082c202cd00722dd458c4ca359879431d8d1f33287605ab6646dcb80e15c0367f4054bc294730b2cf80c46d5193f8c33e80d4b80e794c3769c038a SHA512 d042c1a723260fe4b9061855983cfdabaf8a4e36d2cafc47579a90c33143086c3efeff74ff380b7fef5efefcb50a2d9c9a8b9ed4f98eea0ae28826e73ea18df5
-EBUILD graphicsmagick-9999.ebuild 3182 BLAKE2B 95963ce267c90bc2b5b367a854b26c2b408c9d434c83dad5bd2138ad2dce0cb60478579f23f37585d2cb392233666a8efff912bfb71da2e7bfd87cc0426d00f8 SHA512 8a91d847e6cb7358141eeff10cbc723145362a620d5460e97d0b3b3f582b5da292d44662327eef7e1c8e1561a0e357b7b4194c31a6b9f049e38acf71921b6fcf
+EBUILD graphicsmagick-1.3.37.ebuild 3202 BLAKE2B 10299dd255c1e21bcc3cef07aa11e332fa7ec1888028acaf6786a92ef89a3a1b21dd80d7297f2b48dae4881a0989e05390a233e6db657afaec4e7b69503e1e7b SHA512 9d597c5794cf006f6ae6c48ab6e6f0b1ca3dceb70f3a0b068c4a54ca5db2c6204d13476248f30e6bfd997ed2045ae9e5119b14bbaaf815c1e5fad1317db43f9d
+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
new file mode 100644
index 000000000000..981796d97f33
--- /dev/null
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+MY_P=${P/graphicsm/GraphicsM}
+DESCRIPTION="Collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.graphicsmagick.org/ http://hg.code.sf.net/p/graphicsmagick/code/"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit mercurial
+	EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
+else
+	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+	S="${WORKDIR}/${MY_P}"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+LICENSE="MIT"
+SLOT="0/${PV%.*}"
+
+IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma"
+IUSE+=" openmp perl png postscript q16 q32 static-libs svg threads tiff truetype"
+IUSE+=" webp wmf X zlib"
+
+RDEPEND="dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	fpx? ( media-libs/libfpx )
+	imagemagick? ( !media-gfx/imagemagick )
+	jbig? ( media-libs/jbigkit )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	lzma? ( app-arch/xz-utils )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	svg? ( dev-libs/libxml2 )
+	tiff? ( media-libs/tiff:0 )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+	)
+	webp? ( media-libs/libwebp:= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libSM
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.36-flags.patch
+	"${FILESDIR}"/${PN}-1.3.19-perl.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local depth=8
+	use q16 && depth=16
+	use q32 && depth=32
+
+	local openmp=disable
+	if use openmp && tc-has-openmp ; then
+		openmp=enable
+	fi
+
+	local myeconfargs=(
+		--${openmp}-openmp
+		--enable-largefile
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable debug prof)
+		$(use_enable debug gcov)
+		$(use_enable imagemagick magick-compat)
+		$(use_with threads)
+		$(use_with dynamic-loading modules)
+		--with-quantum-depth=${depth}
+		--without-frozenpaths
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options=INSTALLDIRS=vendor
+		$(use_with bzip2 bzlib)
+		$(use_with postscript dps)
+		$(use_with fpx)
+		$(use_with jbig)
+		$(use_with webp)
+		$(use_with jpeg)
+		--without-jp2
+		$(use_with lcms lcms2)
+		$(use_with lzma)
+		$(use_with png)
+		$(use_with tiff)
+		$(use_with truetype ttf)
+		$(use_with wmf)
+		--with-fontpath="${EPREFIX}"/usr/share/fonts
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		--with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts
+		$(use_with svg xml)
+		$(use_with zlib)
+		$(use_with X x)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	use perl && emake perl-build
+}
+
+src_test() {
+	unset DISPLAY # some perl tests fail when DISPLAY is set
+
+	default
+}
+
+src_install() {
+	default
+
+	if use perl ; then
+		emake -C PerlMagick DESTDIR="${D}" install
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die
+}
diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
index 900a55abda11..903411326261 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
@@ -8,8 +8,6 @@ inherit autotools toolchain-funcs
 MY_P=${P/graphicsm/GraphicsM}
 DESCRIPTION="Collection of tools and libraries for many image formats"
 HOMEPAGE="http://www.graphicsmagick.org/ http://hg.code.sf.net/p/graphicsmagick/code/"
-LICENSE="MIT"
-SLOT="0/${PV%.*}"
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit mercurial
@@ -17,15 +15,18 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
 	S="${WORKDIR}/${MY_P}"
+
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
-IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma
-	openmp perl png postscript q16 q32 static-libs svg threads tiff truetype
-	webp wmf X zlib"
+LICENSE="MIT"
+SLOT="0/${PV%.*}"
+
+IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma"
+IUSE+=" openmp perl png postscript q16 q32 static-libs svg threads tiff truetype"
+IUSE+=" webp wmf X zlib"
 
-RDEPEND="
-	dev-libs/libltdl:0
+RDEPEND="dev-libs/libltdl:0
 	bzip2? ( app-arch/bzip2 )
 	fpx? ( media-libs/libfpx )
 	imagemagick? ( !media-gfx/imagemagick )
@@ -58,6 +59,7 @@ PATCHES=(
 
 src_prepare() {
 	default
+
 	eautoreconf
 }
 
@@ -106,16 +108,19 @@ src_configure() {
 		$(use_with zlib)
 		$(use_with X x)
 	)
+
 	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
 	default
+
 	use perl && emake perl-build
 }
 
 src_test() {
 	unset DISPLAY # some perl tests fail when DISPLAY is set
+
 	default
 }
 
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 11f97522ae8a..c0f5c5d5fb32 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -1,4 +1,6 @@
+AUX graphite2-1.3.14-fix-cmake-files-libdir.patch 637 BLAKE2B 5bf2dfae7cf3af8a99a5095f618d3625d6f0f3b07f714c1101ac77058aa5ab969115cf2ce6a6164666488183fb5482d3f8b6fd8dea4df3ca1ecba9adb02788f2 SHA512 55805cecf9cde48079a81c8ffd93503dd9302f28140b640971ddee29e7a7da38840c826af072b5780372b56c0f0269cbda802e3e233139f086f5194cd8eb33a5
 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
-EBUILD graphite2-1.3.14.ebuild 2708 BLAKE2B 1d605d46854dcca980e3caf2b516340a64b8e360ece6d1eae8971845f397cc1723a886fcda134707abebc295882898535affcc38a72a1af6851f724f3779f4c5 SHA512 f5678dd86f300c802ab7798e90e418fd9e4bd530adb1c1ba5556b370974a89833c74c5a16e577dd95cd4e1cf82447171253a20a143c83223b7acb6e9191fd9fe
+EBUILD graphite2-1.3.14-r1.ebuild 2991 BLAKE2B 18853295573eddc23ee6d327b4e64589ff9c2bd9215404d3a4f1779bf028658f148fc4dd7062bba612add101b47c2b68a36ca28554681357d8bb5e5410d11168 SHA512 ee7aacf9557277a5345cd8367fc014cb224624c2313962ae8f3e645adeb2fdd67333f8c93a3116a2695f71283127175c8ba8b187fec1966e15666011d268cff5
 MISC metadata.xml 337 BLAKE2B a406b2f1af9217abda601c1a860904b7897c5646bc145befae7e87038a42e6b60f5290cb7258469de61761b67f74e12eef1e5a632aad219978d021e045eaa6da SHA512 1d7d7bc940d89cad512580d43120946e028c7866f844dbbc9242b0c29bdb1058f181c38eb63bdd50007afb0e95adade98e5a5f234964c1e1dfb8d15bda961c2f
diff --git a/media-gfx/graphite2/files/graphite2-1.3.14-fix-cmake-files-libdir.patch b/media-gfx/graphite2/files/graphite2-1.3.14-fix-cmake-files-libdir.patch
new file mode 100644
index 000000000000..d4ae9846dce4
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-1.3.14-fix-cmake-files-libdir.patch
@@ -0,0 +1,13 @@
+Fix CMake install path. Noticed as part of the SSP patch (which we handle in
+the ebuild instead).
+
+https://git.alpinelinux.org/aports/tree/main/graphite2/cmake.patch?h=3.15-stable
+https://bugs.gentoo.org/829690
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -156,4 +152,4 @@ endif()
+ 
+ 
+ install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin)
+-install(EXPORT graphite2 DESTINATION share/graphite2 NAMESPACE gr2_)
++install(EXPORT graphite2 DESTINATION lib${LIB_SUFFIX}/cmake/graphite2 NAMESPACE gr2_)
diff --git a/media-gfx/graphite2/files/graphite2-1.35-fix-gcc-linking.patch b/media-gfx/graphite2/files/graphite2-1.35-fix-gcc-linking.patch
new file mode 100644
index 000000000000..b162ca9aa6f9
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-1.35-fix-gcc-linking.patch
@@ -0,0 +1,18 @@
+https://src.fedoraproject.org/rpms/graphite2/raw/41fb7c104c8f9293254abaa91bbda1daafb458cd/f/graphite-arm-nodefaultlibs.patch
+https://bugs.gentoo.org/829690
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -120,11 +120,7 @@
+     if (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
+         target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32)
+     else (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
+-        if (GRAPHITE2_SANITIZERS)
+-            target_link_libraries(graphite2 c gcc_s)
+-        else ()
+-            target_link_libraries(graphite2 c gcc)
+-        endif ()
++	target_link_libraries(graphite2 c gcc_s)
+     endif()
+     include(Graphite)
+     if (BUILD_SHARED_LIBS)
+
diff --git a/media-gfx/graphite2/graphite2-1.3.14.ebuild b/media-gfx/graphite2/graphite2-1.3.14-r1.ebuild
index 3f1a3d4d8c22..1aae2996d981 100644
--- a/media-gfx/graphite2/graphite2-1.3.14.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.14-r1.ebuild
@@ -20,7 +20,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="perl? ( dev-lang/perl:= )"
 DEPEND="
-	perl? ( dev-lang/perl )
+	perl? ( dev-lang/perl:= )
 	test? ( dev-libs/glib:2 )
 "
 BDEPEND="
@@ -37,7 +37,11 @@ BDEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}/${PN}-1.3.5-includes-libs-perl.patch" )
+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"
+)
 
 pkg_setup() {
 	use perl && perl_set_version
@@ -45,7 +49,7 @@ pkg_setup() {
 }
 
 python_check_deps() {
-	has_version "dev-python/fonttools[${PYTHON_USEDEP}]"
+	has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]"
 }
 
 src_prepare() {
@@ -67,6 +71,13 @@ multilib_src_configure() {
 		-DGRAPHITE2_NSEGCACHE:BOOL=ON
 	)
 
+	if use elibc_musl ; then
+		# bug #829690
+		if use ppc || use x86 ; then
+			sed -i -e 's:${GRAPHITE_LINK_FLAGS}:-lssp_shared &:' "${S}"/src/CMakeLists.txt || die
+		fi
+	fi
+
 	cmake_src_configure
 
 	# fix perl linking
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index b93449c698fc..279bb69de9d1 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,3 +1,3 @@
 DIST graphviz-2.49.0.tar.xz 23040392 BLAKE2B 74bc90e433c29662b292c0f086777648db4cded69b7640586647f46e3df46137044fa287d170a780e58f552289fec2d65e10def9ed68095bd4ec8efe9208f929 SHA512 5396b6cb4615ba509233a5a079956aef014245cac64635f01467dcb26e9d6e4b1d044110bc3a85132c747ba410597fa289bef3e503e84fa000c845e1e75c89b0
-EBUILD graphviz-2.49.0.ebuild 7681 BLAKE2B b622bfd68d9acb26102fae34d7c70ade52789bddcfc7a59b04abc7187f5686e41046d132a80f8e302914a9807ca39d2b6bdf1fb4ea73a2bec9cccd3464d2c8f9 SHA512 dc74f353b58cd95ac0802269ee7833c85f12f5732dd4436d854809991339be4934dd49fa3c6618afc71649c26ce3e1def614ce435aa5fd7fb2a842d0db520910
+EBUILD graphviz-2.49.0.ebuild 7612 BLAKE2B 4ff4591e9ab9b0201c1eaa3f684e41dcfaa798f4acb14a2da38a81dd0e0e12263fa5b1e63083996fa62e3cd7fb611fc0ce846223af9a07789659e7e6fd09cca2 SHA512 9b1d0840d5b7b99dc42f8d2c809d8ddb1c351392db521c6714776afec4781476b6ce8a67f374e52890ac9a36dad19e8a38ef94b85c298af438dcd8fcef8aa4fd
 MISC metadata.xml 2381 BLAKE2B 97971708021091d2d53c49f2f83751cea0aa7e2e0d4c5c9f09fc6e4c187bd23d1bf29b79b953e40601492365b2e592b2481946c53d15190c64a80aeeeffc3992 SHA512 6baa00b4838adda1093799bd773f242258bf0900c9b211336888c94a0c6d4f58d5749552cf0acea79329e0ebcf2f0cf63ae933fa13ed6497d94ea63f961b812f
diff --git a/media-gfx/graphviz/graphviz-2.49.0.ebuild b/media-gfx/graphviz/graphviz-2.49.0.ebuild
index a2585988d8bb..f4eaa25110c0 100644
--- a/media-gfx/graphviz/graphviz-2.49.0.ebuild
+++ b/media-gfx/graphviz/graphviz-2.49.0.ebuild
@@ -188,7 +188,6 @@ src_configure() {
 	local myconf=(
 		--disable-static
 		--enable-ltdl
-		--enable-gdk-pixbuf
 		$(use_with cairo pangocairo)
 		$(use_with devil)
 		$(use_with gtk)
@@ -209,7 +208,6 @@ src_configure() {
 		--with-sfdp
 		--without-ming
 		# new/experimental features, to be tested, disable for now
-		--with-cgraph
 		--without-glitz
 		--without-ipsepcola
 		--without-smyrna
@@ -218,7 +216,6 @@ src_configure() {
 		$(use_enable guile)
 		$(use_enable java)
 		$(use_enable perl)
-		$(use_enable python python2)
 		$(use_enable python python3)
 		$(use_enable ruby)
 		$(use_enable tcl)
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index 8d67acd1ed61..decb7ae1259a 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -2,6 +2,6 @@ DIST gscan2pdf-2.12.3.tar.xz 504168 BLAKE2B f3c8b27903db733163114c5c8ea93b109697
 DIST gscan2pdf-2.12.4.tar.xz 503792 BLAKE2B e5b54158b5b47bd2f255c3529e132695c1735e9da92d6a426f7f5b9a9e880bd2d1a0655faf065385224892abe992156c667e50aea1f1091ac6d872b8c163c92f SHA512 f904e2fe3ec0ed829eb9166a42c7c10b56e99e1a7558c7d0014efc530d5f4d3873e9097f28372412073cbb6040bd00570f1acbb6582f5ea87485f0a0ace6f486
 DIST gscan2pdf-2.9.1.tar.xz 484740 BLAKE2B e75ac6a5296ba2f89838ae9c95dc0ceb592ea8ffaf8d89a0635043e07fedbdcf97df26ac810556da7d0e0306eb7aaff76dc18162c6a5f89cb1953bd623a594a3 SHA512 4fc3107c871a7915ebdc023476b1159c0fe03934f1a52a417a5bc285be46f7db0ed38ec4cf015b15953c728ef19d1f4f30207d418b655c950bfb64ddc5d23237
 EBUILD gscan2pdf-2.12.3.ebuild 2981 BLAKE2B 72ddfd255baa1aedfee6a3a51faf8d71d5732f47cc3ec55a3a4c6a2f4688c332064377c9935e097b649ce4326a2dc60c96836af3abf2412590a5ee76318d759a SHA512 2726e25fed0a753a083462540e9e69a221de079fe28adf5bb679ade98d007a34c9766991fdf29a750e6ed933dcbcd0d306d82a98c55caf1c10460ac0b1b69f20
-EBUILD gscan2pdf-2.12.4.ebuild 2990 BLAKE2B 4fb9ae397c7c998961bd91a44b297d971b1e311296cc1eeca9d431b8bd51730e6f2f11a88b5b36b27c4d274ad82a1b7f8e3f44bac8c13a436ce4413b65867fea SHA512 e63a46046f2e036adf1bc5406b72208a1d0a8b248f63345a0022fec3801ec60fc2ca3318cf195e650ea0031ddd0e40bf7d2e30fc245ecd97ad1619dc5980b4b5
+EBUILD gscan2pdf-2.12.4.ebuild 2989 BLAKE2B b7fcd6ab0a47acca89f44a1c012b71e78d56669f90fdf529af9cb521fedf5f836f2008e9ee2fd9405300873a1a8685a58aa4e6b62cad31d4254ce9961ca80166 SHA512 c84f71d496aed72176bdc50fa3c47b787f10c80b26497b335c58b26ef1b52fee346fd8f489e8cde22cc5bdd4e2db08a79da13ecef38f0907471e69866374ce9f
 EBUILD gscan2pdf-2.9.1.ebuild 2801 BLAKE2B 5ec319fceae00a20a15caae9cf019691523680bfa734bae36c8cac7117455438beed4c56fc79a570e87b2d4860b12a62c0fe6fdb49e1e26b24c7a58b493cfa91 SHA512 9f7b98317da72d4abeb6cd64719ddb9de39fa5505d955c6543b7ab76ba0db18c0a7e20261c6c0b7e025272d336c98126bc87c2a32f84a811d6d11649a7dd0aec
 MISC metadata.xml 470 BLAKE2B d9a9ad2f443b0bca02e6b8e91c96f22430543ee82fe8a1174739d4ad59225f73b975d31316fecd4dde6f26002ef6ba9fd39bf5d4adfd2bc82540d14e90d623a6 SHA512 ecd2fe9215c3a65760b8c101989772a73a7e9975dc38a1b11b0334cf6e1d001ccebfca1bc6d7631eb3b3e3e03d1736205563b0c836a2aea026fdfe552d72cbe0
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.12.4.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.12.4.ebuild
index 95400d8c0659..400949439485 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.12.4.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.12.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 9be8fccebd71..353b0bfb1504 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,5 +1,5 @@
 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 2341 BLAKE2B bbed16d718c669c35b5d9a004bffd0724d9ebc98f122dbce21d852f9df2f50a5d41b9347815cb6af677c40352885147d532d5010ff28069d8c09904a8ebe62c6 SHA512 0f2237aab648b1d0cf577cb889fff16177b453baf2c87cd6ea11423d860fff2d15987d7acee22617b9a40e55bf0e70b1ecc2ecddb92a0fc237314e3fd7b81f4e
+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.4.ebuild b/media-gfx/gthumb/gthumb-3.10.4.ebuild
index d04ede00e330..01175894449c 100644
--- a/media-gfx/gthumb/gthumb-3.10.4.ebuild
+++ b/media-gfx/gthumb/gthumb-3.10.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gthumb"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="cdr colord exif gnome-keyring gstreamer http lcms raw slideshow svg tiff webp"
 
 RDEPEND="
diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest
index ec42114844c3..2428f538ed09 100644
--- a/media-gfx/imv/Manifest
+++ b/media-gfx/imv/Manifest
@@ -1,4 +1,4 @@
-DIST imv-4.3.0.tar.gz 79031 BLAKE2B f620e1d05827f93eae03a01f62cbb1426a623b4ef2e758a5fea2539193292fada0b8bf34276443d787b5a1537e92cd66e94b574a646319c3c37fbf2557bda4eb SHA512 1735c03c48888004b11b3aaf0215a9530c035468a8efdb210d856551ebb75030c906eee2b6ab80e5d3646206e6051a73a8c5e15c010dd09bca7f9e90f9b0e34b
-EBUILD imv-4.3.0.ebuild 1871 BLAKE2B 2956967880cc581a052436dfa76b36e57e61f7b4c02daba8414f8093f7d87531971eb1b6dfa263e55090ef37d5b137b2b758793f6fc99f269551256c08f8d30a SHA512 11582014cd24f2e6dc378061df0c4cfc580e8dd6b7a1224dde177b6eb0bf5d4876ca8f6caddf565ab736c63707ebc63a9cc4fe6db4098b0a452baa7f8e69c1bf
-EBUILD imv-9999.ebuild 1871 BLAKE2B 2956967880cc581a052436dfa76b36e57e61f7b4c02daba8414f8093f7d87531971eb1b6dfa263e55090ef37d5b137b2b758793f6fc99f269551256c08f8d30a SHA512 11582014cd24f2e6dc378061df0c4cfc580e8dd6b7a1224dde177b6eb0bf5d4876ca8f6caddf565ab736c63707ebc63a9cc4fe6db4098b0a452baa7f8e69c1bf
+DIST imv-4.3.1.tar.gz 79123 BLAKE2B 9c818a5a29457313c3d0ed1a8558555b2069aec837939dc1d2b71668ec2fd39867c8ad4fcf8605243ded96e27d346af4307d83c8854538981b62c968e9ec0ede SHA512 f70b95f3f99d7d6a9276370650cef0885938464e3a40ab1768231292ba35d9040f7196a5853ea1268fe6d47cf08d129b3fbae1ca215df96d12ccd85b7efd1ee6
+EBUILD imv-4.3.1.ebuild 1902 BLAKE2B f6cef60be53aa50373da462d9e6ec06385efd29ba14cbf7fca938cc56e16d6098065e9fc0c6a0f4a0cc92dc2b79f6d7173c166fafed8c2c2f0fee73e4b1a2a64 SHA512 26f48f3423d11b4cbb2dd7b584ba57c0e8b445594eae64cdb182fc8d8b915fbf8facaa63044f86dd87305e7be00a6f70f6f601176263dac27ff77207cbe5974f
+EBUILD imv-9999.ebuild 1902 BLAKE2B f6cef60be53aa50373da462d9e6ec06385efd29ba14cbf7fca938cc56e16d6098065e9fc0c6a0f4a0cc92dc2b79f6d7173c166fafed8c2c2f0fee73e4b1a2a64 SHA512 26f48f3423d11b4cbb2dd7b584ba57c0e8b445594eae64cdb182fc8d8b915fbf8facaa63044f86dd87305e7be00a6f70f6f601176263dac27ff77207cbe5974f
 MISC metadata.xml 413 BLAKE2B 308cfef3e62870d9f6536cdc9de04c24ea419e6eb7877f607608fd915840d70cb8f6eb763ef80fa6dcfd6eb583b8f090665c5737e8d7c55663040c8a1dcd18c0 SHA512 f866c12cf896c7b44f04f25123f52a3e86399fd5ba9e4da67233ab5ced4b4ee1453d28a6618935658ba5ecb4523017c84d73d60f5a21975527211c57e8dc4bdf
diff --git a/media-gfx/imv/imv-4.3.0.ebuild b/media-gfx/imv/imv-4.3.1.ebuild
index 992772d5dd6e..55cdc69ad90e 100644
--- a/media-gfx/imv/imv-4.3.0.ebuild
+++ b/media-gfx/imv/imv-4.3.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson xdg
 
@@ -9,7 +9,8 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.sr.ht/~exec64/imv/"
 else
-	SRC_URI="https://github.com/eXeC64/imv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://git.sr.ht/~exec64/imv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -39,7 +40,7 @@ RDEPEND="
 	heif? ( media-libs/libheif:= )
 	jpeg? ( media-libs/libjpeg-turbo:= )
 	png? ( media-libs/libpng:= )
-	svg? ( >=gnome-base/librsvg-2.44 )
+	svg? ( >=gnome-base/librsvg-2.44:2 )
 	tiff? ( media-libs/tiff )
 	wayland? ( dev-libs/wayland )
 	!sys-apps/renameutils"
diff --git a/media-gfx/imv/imv-9999.ebuild b/media-gfx/imv/imv-9999.ebuild
index 992772d5dd6e..55cdc69ad90e 100644
--- a/media-gfx/imv/imv-9999.ebuild
+++ b/media-gfx/imv/imv-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson xdg
 
@@ -9,7 +9,8 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.sr.ht/~exec64/imv/"
 else
-	SRC_URI="https://github.com/eXeC64/imv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://git.sr.ht/~exec64/imv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -39,7 +40,7 @@ RDEPEND="
 	heif? ( media-libs/libheif:= )
 	jpeg? ( media-libs/libjpeg-turbo:= )
 	png? ( media-libs/libpng:= )
-	svg? ( >=gnome-base/librsvg-2.44 )
+	svg? ( >=gnome-base/librsvg-2.44:2 )
 	tiff? ( media-libs/tiff )
 	wayland? ( dev-libs/wayland )
 	!sys-apps/renameutils"
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 12f18fa3e212..86f877c49603 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,9 +1,6 @@
-AUX glib-2.67.3.patch 1945 BLAKE2B 8093eb444a360481e0f6fd89334f4ca6a693c6df0d0cdc5bee0bfcc308fc9e8b8090c3ca8c7c772ad7ac074d56e81ff3202f1bfd4ee526e0927b28118d27d53c SHA512 c355c7e67acb29fe41c50af4ac8724c636516394c33e9d529eed23eb6d7bbf014bb0f2f9981ccea9e1b3b98a3f87dc256dc385099eb218353e2b220a3d130172
 AUX inkscape-1.1-poppler-21.11.0.patch 690 BLAKE2B 61fbaf22fa86170d1a72393795fb195b5c93d1c9f3e512751d4a9a355acda28656978529c1022caf9df701bc86e3c2b6e50b14eeed5d0c013013090b51ff6716 SHA512 9c7a312de85d11aa8ff3f7347a5c08ef84050522bc8ab59f9aa1aa84c405ddb707275cab7d447e34b1593d633b99fb8e482864e9397c576d688dcd7d34035c6d
-DIST inkscape-1.0.2.tar.xz 32421620 BLAKE2B c3f9c37b15343ba0955a6d06810aef5fb9e035a240f99579301b8cd93858a62b5ed1a3ff528a9642ec74b8900305495236cf7f4c672864369a4e33dca3b34bd4 SHA512 f4fbc627c0f07db11194715c505b771a60af29a9a7f8be0232e4f7eb6b1c5814c3f160c2003d64ec62aeb92ef44174320a47aa6b6abc7a67cc27c996cba9522d
 DIST inkscape-1.1-musl.txz 10820 BLAKE2B 3e7d346161d8c58436cae01227ce0eafc122276ba4b0483271cbb2e74447c7a89b2033bf709adb521abe2aebca79fffece183786071478b29aedbf3c742c4616 SHA512 8900863fb2d12cb6aea39b2e2ac8d32b512086aa3a26f3598d3117abd0b44f95b6001ea21ac02ce2368dd66dee0faefdef049c433f62380904770b7680680668
 DIST inkscape-1.1.tar.xz 34203156 BLAKE2B 38896509dcdcf1ef18523c790855035ef16dfae75e27c2d69f782270f52a579557edcb790bef30f3210b9f797a619369d7d16dd23f098debdd8e5b6abf9b30aa SHA512 54b75f8794d748ef59d5b719ea04e3debadc1a5cf3f62f14254502567973bbd634850edd0a3bc082be878dacf041e9bd10982c4846bf154f89aa5319eda4ee80
-EBUILD inkscape-1.0.2-r2.ebuild 4143 BLAKE2B 3ed501bf97ae01e72dcd644110f2dab770757eac39f5ec10cb89f7900a55ead460b4f712a9dc0266fdadb297e7a063a245e4a24cf841b9619996886678f6843d SHA512 7c57ca4263c701aa524eb5de03900ca95ad5135a6acd1a5c041f23f8c459efc1086c6e8f74f599ff57ad8a215b0eabebd29e80e54b855a21e818ea5d9e3548dd
-EBUILD inkscape-1.1.ebuild 4345 BLAKE2B 3a5c39b0167d5d65f51f6b3485502877f37ecb39c077ff95d673d8e39cf981180e0128023c1709416c5c7259bf2845be98b0212dd15824cdbfd4c4a041f11016 SHA512 d96c03de624ce12d6d557dfba90a7dd95a6bb439d24dfd8eb1c0f9b465566c9e4e4ea40981587b3d51b091adeda0de03a2733a586a3c43bbecfcc8cfff09d819
-EBUILD inkscape-9999.ebuild 4222 BLAKE2B f81dc2dd761939360a098e581fe0ed6eed633b3a93ad8a3898490f04b6213b8d629fa8a32f15c9d1934c393dad8e6f999bf7470e0c3f0167e7066295f6fb6b2d SHA512 147de0d941987a6ff35e1a2fefc07457fd05097150509128cea74a09faf676ae419b41fe0a036e632c68be18a5380b2468c45567c9040eab5374ad56f2dd47ad
+EBUILD inkscape-1.1-r1.ebuild 4358 BLAKE2B fc260280a82a33d0d81cb8f980dfcd3279fb018531a967c488525dc4b9b32ed27259691f623dafb97adcb7144d624b62e710532b65dd74f49b9c21fb9b8b93b8 SHA512 594c36bbc6c8e2f32794c44a1d2311fdee1eed00b9168ad68c679a804486ebc5edb87f5d0eb3c7586bd389779942aed8bc4cf857b262430674ca38e73cfc6c31
+EBUILD inkscape-9999.ebuild 4224 BLAKE2B ae54a77ce4d1aab3e2f9c550017632f54ccb1e41cccc4b32b3769afc934d5bbafe3f4935c24e61610bed7e8578e20b4eeb96f50248d819263d8476312ef3af0d SHA512 fe29d3e89ccdcac3088a7c369353d70eeee54b6e1c8e0b9716377e240f3ebbe498dd7ac8244f8e9f376eda86a0932ad65d9a76f05696d81992c7e39eefc25c37
 MISC metadata.xml 984 BLAKE2B 8aee1f973005f9587571770eb14ccf725bf3ba9034d9935b029f776e64e17a9e156ec864e1150b259d2a983aec6e53b10791be4f1a3b67d5aa465ee115d966f0 SHA512 7ee7c7d473ae2120b9f592777b08d77899c6bf7f750f09cc334dc76a997a472e2593442fb281a9984d77e1aa4eca39e389484405e0aa8b5614da0f718c713fc0
diff --git a/media-gfx/inkscape/files/glib-2.67.3.patch b/media-gfx/inkscape/files/glib-2.67.3.patch
deleted file mode 100644
index b959bcd76fdc..000000000000
--- a/media-gfx/inkscape/files/glib-2.67.3.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From eb24388f1730918edd9565d9e5d09340ec0b3b08 Mon Sep 17 00:00:00 2001
-From: Harald van Dijk <harald@gigawatt.nl>
-Date: Wed, 17 Feb 2021 09:13:49 +0000
-Subject: [PATCH] Fix build with glib 2.67.3.
-
-As of glib 2.67.3, <glib.h> can no longer be included in extern "C"
-blocks. It was indirectly included by both "types.h" and "color.h".
-"types.h" already does not need to be wrapped in an extern "C" block,
-"color.h" does but can be modified not to, so with that changed they can
-be moved out.
----
- src/3rdparty/autotrace/autotrace.h | 6 +++---
- src/3rdparty/autotrace/color.h     | 7 +++++++
- 2 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/src/3rdparty/autotrace/autotrace.h b/src/3rdparty/autotrace/autotrace.h
-index 2ce6f272a9..e56be9a74c 100644
---- a/src/3rdparty/autotrace/autotrace.h
-+++ b/src/3rdparty/autotrace/autotrace.h
-@@ -23,6 +23,9 @@
- 
- #include <stdio.h>
- 
-+#include "types.h"
-+#include "color.h"
-+
- #ifdef __cplusplus
- extern "C" {
- #endif                          /* __cplusplus */
-@@ -35,9 +38,6 @@ extern "C" {
-  * Typedefs
-  * ===================================================================== */
- 
--#include "types.h"
--#include "color.h"
--
- /* Third degree is the highest we deal with.  */
-   enum _at_polynomial_degree {
-     AT_LINEARTYPE = 1,
-diff --git a/src/3rdparty/autotrace/color.h b/src/3rdparty/autotrace/color.h
-index e50ab30ae0..88651db9f7 100644
---- a/src/3rdparty/autotrace/color.h
-+++ b/src/3rdparty/autotrace/color.h
-@@ -24,6 +24,10 @@
- #include <glib.h>
- #include <glib-object.h>
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif                          /* __cplusplus */
-+
- typedef struct _at_color at_color;
- struct _at_color {
-   guint8 r;
-@@ -43,4 +47,7 @@ void at_color_free(at_color * color);
- GType at_color_get_type(void);
- #define AT_TYPE_COLOR (at_color_get_type ())
- 
-+#ifdef __cplusplus
-+}
-+#endif                          /* __cplusplus */
- #endif /* not AT_COLOR_H */
--- 
-GitLab
-
diff --git a/media-gfx/inkscape/inkscape-1.0.2-r2.ebuild b/media-gfx/inkscape/inkscape-1.0.2-r2.ebuild
deleted file mode 100644
index 0a9dc6de2d53..000000000000
--- a/media-gfx/inkscape/inkscape-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-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://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${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 lcms
-openmp postscript spell static-libs 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/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/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 )
-	lcms? ( media-libs/lcms:2 )
-	spell? (
-		app-text/aspell
-		app-text/gtkspell:3
-	)
-	visio? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	wpg? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-"
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-	')
-	dia? ( app-office/dia )
-	postscript? ( app-text/ghostscript-gpl )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.65
-"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${P}_2021-01-15_e86c870879
-
-PATCHES=(
-	"${FILESDIR}"/glib-2.67.3.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
-		-DENABLE_POPPLER=ON
-		-DWITH_NLS=ON
-		-DENABLE_POPPLER_CAIRO=ON
-		-DWITH_PROFILING=OFF
-		-DWITH_LIBCDR=$(usex cdr)
-		-DWITH_DBUS=$(usex dbus)
-		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
-		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
-		-DWITH_JEMALLOC=$(usex jemalloc)
-		-DENABLE_LCMS=$(usex lcms)
-		-DWITH_OPENMP=$(usex openmp)
-		-DBUILD_SHARED_LIBS=$(usex !static-libs)
-		-DWITH_SVG2=$(usex svg2)
-		-DWITH_LIBVISIO=$(usex visio)
-		-DWITH_LIBWPG=$(usex wpg)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
-
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
-
-	local extdir="${ED}"/usr/share/${PN}/extensions
-
-	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
-		python_optimize "${ED}"/usr/share/${PN}/extensions
-	fi
-
-	# 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-1.1.ebuild b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
index a1f3e81bfcda..c713d8b4e707 100644
--- a/media-gfx/inkscape/inkscape-1.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+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 static-libs svg2 visio wpg"
 
@@ -36,6 +36,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	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
@@ -93,9 +94,7 @@ RDEPEND="${COMMON_DEPEND}
 	dia? ( app-office/dia )
 	postscript? ( app-text/ghostscript-gpl )
 "
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.65
-"
+DEPEND="${COMMON_DEPEND}"
 
 RESTRICT="test"
 
diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 05de5cb6c18a..c77a2bc64410 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -33,6 +33,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	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
@@ -91,7 +92,6 @@ RDEPEND="${COMMON_DEPEND}
 	postscript? ( app-text/ghostscript-gpl )
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.65
 	test? ( dev-cpp/gtest )
 "
 
@@ -139,6 +139,10 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_test() {
+	cmake_build -j1 check
+}
+
 src_install() {
 	cmake_src_install
 
@@ -158,7 +162,3 @@ src_install() {
 	# Empty directory causes sandbox issues, see bug #761915
 	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
 }
-
-src_test() {
-	cmake_build -j1 check
-}
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 5d071a26140c..5d6219dda371 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -15,12 +15,10 @@ AUX iscan-3.62.0-tests-boost.patch 2819 BLAKE2B 8c11f7bd80c5cbc0c34c0aacf605a914
 AUX iscan-3.62.0-tests-linkage.patch 3921 BLAKE2B 0dedae75fbbe387d2db900eb88b0e839746cfcbfa2b2ed7d52f9fd1b6756f14aa8fc53708ab2d1e461dff25ebe4e73e97f647ba4792bd263021f9b94f7b50139 SHA512 0b84829871ef45acf0ac209a0ba315b88409429c454b4655a4004c9d1afddf88d1ae0b1fff891078f5cf68541f7a8d896d50a550b650f1157517d5dbc99bfbd4
 AUX iscan-3.62.0-tests-tesseract.patch 3825 BLAKE2B ee16bab5f36e866d2a212f832f90b8fa078cfea51dd81ae8175086ce896b718c52f2dd5c56ba15ddf89427abde6231b93672a71467d18fc47c45fdd166efce54 SHA512 63cf6b7f42f6cc1dfc05e9a5d333514aa56ba658e96a860b753d9a120df79a41abbd0fcc04070e103908bf05648dcdff96eab343981fa0f5293aee4258309980
 AUX iscan-3.63.0-autoconf-2.70.patch 1147 BLAKE2B d87e32fa8510096fe965ec24a21276e0c7ba0b838cb2eb5228bb0a336db037dd77240895d61eb574abbc03334d44b0c1467c4bf1dc48a69c72518cfd64d90a51 SHA512 6a58a0df2cd579ea85ea30c263d4538dae8abbfc65d3e102ac546e282bbc8ef72762894c926fc0500322b99364b815f29eb86a098989e4c67675d5d92efa304a
-DIST imagescan_3.63.0.orig.tar.gz 12776113 BLAKE2B d1a9f1d60ba4a2239c6ed74f7f9e0da078e2743e78e0abb67a69506bf90ac35b069f84b5a092a6eb8fd73f60eb668e78b4c7fae56b3a65b6b3d8600f082c064a SHA512 3c9b18e630d6fb1c042244542675e89a8b467469d7212ab684f72100810d1f7d0ec16d13c472a83ca05a3a4fc44e366f692a36cd6b0e81c9a332dd3b40de9535
 DIST imagescan_3.65.0.orig.tar.gz 12651383 BLAKE2B e1436b6d6bf9fc3fc4e5185706fc814e1a4351bf37cd733a3fb88cd16a1c3422ebe0bf4cca77ac00c431edc990aaa50b8994e3bc0f72acba3b0e0608882b63ae SHA512 c719ac540af496efe72b2be87a2b89cbec8eee61a2a985574d0db766c00b7187315378382d8501e26dad132e93de3d3e9431c8e679b569f3c35ea8181b1ca022
 DIST iscan_2.30.4-2.tar.gz 1236167 BLAKE2B 598e55aa7099f7973b38f5c3227415c8ddfa7e8c645521981b4e8979047ab692427f5c1719fd83fe0635f2d4604f32f0baff8542f3e1a333298799c4cad7b980 SHA512 b12f374ff8ee1e1879fc6dbc579de39d7bcd4777ec7ad6e4345046f77b4ec13ae45ebdc2803d6907bc2747776aa7e32c313866138c7b8c7bcb53110a214154d2
 DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
 DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
 EBUILD iscan-2.30.4.2-r1.ebuild 4000 BLAKE2B 9d315f3c51ba848fda0feea5a22d004cb6010112cba8dda3372bac5a9b9ecb6ee7aec3d9cee254ba0e77305eee99be1bb342180c71a6a8048c0625cbe1b10aa6 SHA512 b42e39b888418f016a2a147aba40a3241a75d7930132a8290163d2ea4e57ee7bf57125d6382229440cf3078482f3a7f2158575d28353ae1d7d9a69bb5f389043
-EBUILD iscan-3.63.0.ebuild 2899 BLAKE2B fa560b7857120e9180165b2d72161cdd3705fa8002b93022ef675a2df1ed22852453a72199e67e2bbe3ec08402860700eff9c76f6d0bd406441dfd64a57ea150 SHA512 72991e80c75e6d86362adedf76c63827b0752da2815ccdbbe72ecd84c621a5f733f3a8491b07a0452ac09f236fd24c866f52a03d46dca5b72e200c29bfe3ed30
-EBUILD iscan-3.65.0.ebuild 2899 BLAKE2B cd559e4c31210618297d7a70f4713a8b9d806f80eb20f508b1af1e27a4abb03755edc9654fbf8b0c835f5f41b72a4ce3e3d4a2592d1c7c1d5ce08200793b21b1 SHA512 b5a93e50d29d8a3ed3d85377affc23a3710a0e7392a7e15025ecde99969f544699a6d35a1efcc4f7515e59b51444010289a7a0f85e4a834fb48a4c43968d218d
+EBUILD iscan-3.65.0.ebuild 2898 BLAKE2B 3a21f260a47ada35cbd8367bd4e0a9696ab62716ddeb3a7ed39f9d0ef846d307402713b38ac6df18c153ec0d9c5a30814d396ed02a1996f5ae1491cc82118492 SHA512 c3a905daac7976c6f387407651b9a7ebd0cf265b06720582225580601293226f5c01ed080d9480989372b79e3da958134361378cce12c2325a9419f3c3013e3a
 MISC metadata.xml 961 BLAKE2B b9c6fb04e94844fb8e7f1d60c5287809c61c3f642f86f55e88ba09a489ebe2b90a698b8a7f5d7c04d38324b97d746f68004c662839862f84a3d1e66cd56c998e SHA512 93c00c3fd4b23cab80f46e3f2a8bedaf92e97473fbdcc707034d86a01ff11269fe6a67648e7a369d71fd60e31d902bc8c94510b37c293df90934a6b2b38cf7f1
diff --git a/media-gfx/iscan/iscan-3.63.0.ebuild b/media-gfx/iscan/iscan-3.63.0.ebuild
deleted file mode 100644
index aa9f572ec9db..000000000000
--- a/media-gfx/iscan/iscan-3.63.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop flag-o-matic udev xdg-utils
-
-DESCRIPTION="EPSON Image Scan v3 for Linux"
-HOMEPAGE="https://support.epson.net/linux/en/imagescanv3.php https://gitlab.com/utsushi/utsushi"
-SRC_URI="https://support.epson.net/linux/src/scanner/imagescanv3/common/imagescan_${PV}.orig.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="graphicsmagick gui test"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	dev-libs/boost:=
-	media-gfx/sane-backends
-	media-libs/tiff
-	virtual/jpeg
-	virtual/libusb:1
-	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-	gui? ( dev-cpp/gtkmm:2.4 )
-"
-# Disable opencl as during reorient.utr test it produces inconsistent results
-DEPEND="${RDEPEND}
-	test? (
-		app-text/tesseract[png,tiff,training,-opencl]
-		media-fonts/dejavu
-		virtual/imagemagick-tools[png,tiff]
-	)
-"
-RESTRICT="!test? ( test )"
-S="${WORKDIR}/utsushi-0.$(ver_cut 2-3)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.61.0-ijg-libjpeg.patch
-	"${FILESDIR}"/${PN}-3.61.0-imagemagick-7.patch
-	"${FILESDIR}"/${PN}-3.62.0-gcc-10.patch
-	"${FILESDIR}"/${PN}-3.62.0-boost-1.73.patch
-	"${FILESDIR}"/${PN}-3.62.0-fix-symbols.patch
-	"${FILESDIR}"/${PN}-3.62.0-tests-boost.patch
-	"${FILESDIR}"/${PN}-3.62.0-tests-tesseract.patch
-	"${FILESDIR}"/${PN}-3.62.0-tests-linkage.patch
-	"${FILESDIR}"/${PN}-3.63.0-autoconf-2.70.patch
-)
-
-src_prepare() {
-	default
-
-	# Remove vendored libraries
-	rm -r upstream/boost || die
-	# Workaround for deprecation warnings:
-	# https://gitlab.com/utsushi/utsushi/issues/90
-	sed -e 's|=-Werror|="-Werror -Wno-error=deprecated-declarations"|g' -i configure.ac || die
-	# Disable check-soname test
-	sed -e '/SANE_BACKEND_SANITY_CHECKS +=/d' -i sane/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	# Workaround for:
-	# /usr/lib64/utsushi/libutsushi.so.0: undefined symbol: libcnx_usb_LTX_factory
-	append-ldflags $(no-as-needed)
-	# https://bugs.gentoo.org/720994
-	append-ldflags -pthread
-	local myconf=(
-		$(use_with gui gtkmm)
-		--enable-sane-config
-		--enable-udev-config
-		--with-boost=yes
-		--with-jpeg
-		--with-magick=$(usex graphicsmagick GraphicsMagick ImageMagick)
-		--with-magick-pp=$(usex graphicsmagick GraphicsMagick ImageMagick)
-		--with-sane
-		--with-tiff
-		--with-udev-confdir="$(get_udevdir)"
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	dodoc lib/devices.conf
-	find "${ED}" -name '*.la' -delete || die
-	if use gui; then
-		newicon -s scalable doc/icon.svg "${PN}".svg
-		make_desktop_entry utsushi "Image Scan"
-	fi
-}
-
-pkg_postinst() {
-	use gui && xdg_icon_cache_update
-	elog "If you encounter problems with media-gfx/xsane when scanning (e.g., bad resolution),"
-	elog "please try the built-in GUI and kde-misc/skanlite first before reporting bugs."
-}
-
-pkg_postrm() {
-	use gui && xdg_icon_cache_update
-}
diff --git a/media-gfx/iscan/iscan-3.65.0.ebuild b/media-gfx/iscan/iscan-3.65.0.ebuild
index f143a5474646..d33a5f40eeb2 100644
--- a/media-gfx/iscan/iscan-3.65.0.ebuild
+++ b/media-gfx/iscan/iscan-3.65.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://support.epson.net/linux/src/scanner/imagescanv3/common/imagesca
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="graphicsmagick gui test"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 BDEPEND="virtual/pkgconfig"
 RDEPEND="
diff --git a/media-gfx/mcomix/Manifest b/media-gfx/mcomix/Manifest
index ef473c587161..5df817fda5c4 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
-EBUILD mcomix-1.3.0_pre20201123.ebuild 1741 BLAKE2B 87e695cfaa001b8dbc0351af3d330a5bc13bf1f7996ec9eb73626f93f01a30a133a7c9bedd6378e9cd420648593ea1a9499e0fe3945efb4440561e0b04c6fe3a SHA512 1d676f12a99bbc54e0c7539cfe263f545d0d678bd7cd57b369264387c39989579e0326c4ef2c124941d122b02bf24c85df2387b01bad1f4f2bd240da1e76df8a
+EBUILD mcomix-1.3.0_pre20201123.ebuild 1748 BLAKE2B 14e8e0f23724d9493a9f2bd964c6719bd315b3e3073af7511ced836eb2b7c333f5817446ea297cb7ca8c586703f61f105b21081432622859d544a2a027897b25 SHA512 22dc9acd9097ad888b5711121b5d61b6044bf016548fc733f875b4b748e9798fe5c38321cd360ede2268bea6baa3f3e562a57c0a54c163864274e7ecc40666af
 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_pre20201123.ebuild b/media-gfx/mcomix/mcomix-1.3.0_pre20201123.ebuild
index 7b7476ac7a62..97e14612d38e 100644
--- a/media-gfx/mcomix/mcomix-1.3.0_pre20201123.ebuild
+++ b/media-gfx/mcomix/mcomix-1.3.0_pre20201123.ebuild
@@ -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}"
diff --git a/media-gfx/mkbold-mkitalic/Manifest b/media-gfx/mkbold-mkitalic/Manifest
index 5ab9aeae172c..ae368f552a45 100644
--- a/media-gfx/mkbold-mkitalic/Manifest
+++ b/media-gfx/mkbold-mkitalic/Manifest
@@ -1,3 +1,3 @@
 DIST mkbold-mkitalic-0.11.tar.bz2 21922 BLAKE2B 90473ee9ce751f491a36b18b4adcfc15a64535ca11b7394a2d46b48a144394ae549133635f898b8b16d87eb3271439fc425cee3cb05e4559818ab00a7d054e3d SHA512 fe40693bc5d73aaf45daf1bbd22f8107fb61604cd4ff0ec09e8bd63029be811a2b1bb46a3ce214954841c5d074e9ec23c150006d9a2c8ffe633e93801c2d7345
-EBUILD mkbold-mkitalic-0.11.ebuild 745 BLAKE2B 7577daa8e7c7620367cf2b9036d32d62b3b8b3a22e1626c9124e8d3e3e575ee65e59173388b38655831fca780460b738a3ea5d546917d6de8a593b80e2cf9ae2 SHA512 3321b4f69ca24ad9df50bd5efa76d6b2ac7a79c9c78c801ab8c54d2b53c5138c7dfc79cc3d240d04b54afaddd17d44bf2c4bef75aa30d96d32e130bb73e9a81a
+EBUILD mkbold-mkitalic-0.11.ebuild 747 BLAKE2B bec93e19c8868f72b62f41e4e7805c6b67423b9397f772516700582dccc6d572eb58c6c07793279dce0153474e059c7caff8a1376124b66040fa86d0fee81286 SHA512 866e8b8eb1954bb1f75881af93683ff0ff9a33478c6b216d321a714c879c1c675f4c6fc68e84452b750d0306b3245ab55f4f398612213253bc672bc103191804
 MISC metadata.xml 249 BLAKE2B a37da98d387308dab889eab2665b67e4176707f3c115a7a69cb7f4b19f9864b96bc2fe70efa105e627c4b57a7d626f6b23dc2709a225a9debada3356f3cf32a0 SHA512 a5095fb01e05f24583a962e36131b2f02cf2d1dd7a97051200e465ad97db014721de7c1857f5eb736cb0290682e8de833cb4c735f7de8d98cdfae1aed6d3d549
diff --git a/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild b/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild
index 26a687302657..bf082f37691d 100644
--- a/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild
+++ b/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://hp.vector.co.jp/authors/VA013651/lib/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~ia64 ppc ~riscv ~s390 sparc x86"
 
 DEPEND=""
 RDEPEND=""
diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 0d5f78e20252..450ea1d5e09e 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,5 +1,5 @@
 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 1906 BLAKE2B 9832da7bd304ba68983a470c0a190cb25b9960ff168a2ef57e4859c24b0220834714788d3c122875504b4fa203a3c811582b2571541c97c100c0f7b39fd12740 SHA512 00271ea0a48a50396038dcca7f08442ebcb63676eaf8fbd5a5c54412a8b238d3f2d1bf4f2e11561f35576b25fe487a979004738aa5ad04edd97429f34d820fa2
+EBUILD nomacs-3.16.224-r2.ebuild 1913 BLAKE2B f323b444154ad4823aad776cff0abf91922a45ea030a53f4994f368949e5e95c94c629aa2620e5dafbda14ccc9b02a1c97b6e9b0e7654dbe95225f755897410f SHA512 a86d797f1ae0992cf81f725443d5836546ad56a2c3c4e0bad35b009277785c5eb6d2b26066ac7520c030e73156aa7953e06ffe7b0bb2b3abee2d01cd3ad927b4
 MISC metadata.xml 595 BLAKE2B 92cdef0b718d658f88fb62f16ae0255b65e9acaa264216d0ff2b9c277ae02c5f006d2c4f88ff665dd6aba9d36bbd6286a3aa8be7365d428ec38d90515625b14b SHA512 f0af8c71d02a6397f7c65a24fa9c635efcce189b32b12286c299d24ddb459d4d05efcbb541234cac0ebb55824dc8d2b21e16b9081d31420a1544a90c5c6dfca1
diff --git a/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild b/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild
index 9c6f50df1606..bab73e326784 100644
--- a/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild
+++ b/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild
@@ -13,7 +13,7 @@ plugins? ( https://github.com/${PN}/${PN}-plugins/archive/$(ver_cut 1-2).tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~riscv x86 ~amd64-linux"
 IUSE="+jpeg +opencv plugins raw +tiff zip"
 
 REQUIRED_USE="
diff --git a/media-gfx/nvidia-cg-toolkit/Manifest b/media-gfx/nvidia-cg-toolkit/Manifest
index 5d3a399476c0..3a06b837aa29 100644
--- a/media-gfx/nvidia-cg-toolkit/Manifest
+++ b/media-gfx/nvidia-cg-toolkit/Manifest
@@ -4,6 +4,5 @@ AUX nvidia-cg-toolkit-gl.pc.in 278 BLAKE2B ef0bfb9b76386c078e36b700166069fd961b0
 AUX nvidia-cg-toolkit.pc.in 242 BLAKE2B 45f19a2791310975169f8a31bf65d77a86b4e4487502c40101622070a28e316ae3bb910e7bb3d8af0073ac281ab4ca0786a081e1c1ff8955c125bd3fe1b5403b SHA512 601505a228eb4f70813d3ab6346a51c1552751278549c81b7721273dd58c053639cad49cfe82982455b1399d8b494f8351a0a479efbdb33171d28c3dd0b69073
 DIST Cg-3.1_April2012_x86.tgz 23332348 BLAKE2B e8253cfd1b569e1eb083ca394ae969ca43677641763eb77c24381198914cb1508bd41489224d8cc1afefca2affb485320022bd35e7ffaa48aaadafcf42f89183 SHA512 7b2addad157e151eb42b320aea31ccddfd53ec5640cb97bc86a3d461c1b08a2dff280bfc3f7859d124c311e1710e39d40405c387e5724ebc82d95303b250837a
 DIST Cg-3.1_April2012_x86_64.tgz 24829131 BLAKE2B f1425f391022aa57fe2b23581786576ab8762a48e9ffc875853d55399d3a996ac85debb099d0b906dcce6c95989a06c3980bfb59dc69edc16d1378ba5dc89c73 SHA512 591b51195193e7e3bbb9f1c2579336d24a179b0a88b955a01f4661bda55543fbccd73cac53033912f2eea8a1068e4c1394c6d286f195963cfb33a0d8b4428e27
-EBUILD nvidia-cg-toolkit-3.1.0013-r5.ebuild 2922 BLAKE2B 5af69be5db5e7bde21b3503e0e65703c03e6473eabf7e48539fc035f917564c57c89433d5df153b46553ddb6a75db5d69f6c1c5bb4b0cfa6f86eae86cdc4244f SHA512 0d438981abc65c0e53f758488372059c12c10b466a8b23a136ef482df219452635db7fd59500d43520d05f50584ce5fdc32a4b718dd3079a84864a2f57e8514f
-EBUILD nvidia-cg-toolkit-3.1.0013-r6.ebuild 2881 BLAKE2B fe92f0c380d34697fdae0c33a4e5f16f4b66336854ca4df69edba3ff8440919cb038d5e41856b6e974cd0e227374e5561d8ad83e721fc373de5e5d6c06d86b4e SHA512 91f051a0e56a648567bd0c84e3f149a661816325ad4646bd43055981f2e9ce9e129e63a1fcd6f8b7a92691f34f0faa01a827a64c26ed81718422a831d9f2cb48
+EBUILD nvidia-cg-toolkit-3.1.0013-r6.ebuild 2879 BLAKE2B 06f54df10206181375027be9a4f2e7039c9b0e85fcf8285d7a42df2d7bf6a7723d11cf6b4492fddb3aff749d9aef82aa33b1d7c449b0b96c838dc6c43bb7dd97 SHA512 1325f44274bc39a2147d92cd6019369a7b9ba4f124225fc2b9e911c7f38cdd9f42aaebfd9e4f5da370e9ea2ca5cb03ff8473ac745ec4b42a957b06d46958ba05
 MISC metadata.xml 556 BLAKE2B a480fdc63faf7dbaf64c54fb70e033e7e32de1c149a89840e1a3a9a345b00dd3586431c3ac9e10f1a649940508ef308a7b5aff326d31f4a18c9b6c97d1d1a7eb SHA512 0ec1f9415029c86117aea79751d1e0bae7057cf6700a4d06a65d84a1a674dbdfdb91d0a7d0a66d5cedf0db033b8059ad65aa3e40d3295d9dae95d031c5179f58
diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r5.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r5.ebuild
deleted file mode 100644
index d1edb0448661..000000000000
--- a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r5.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-
-inherit eutils multilib multilib-minimal prefix versionator
-
-MY_PV="$(get_version_component_range 1-2)"
-MY_DATE="April2012"
-
-DESCRIPTION="NVIDIA's C graphics compiler toolkit"
-HOMEPAGE="http://developer.nvidia.com/cg_toolkit"
-SRC_URI="
-	abi_x86_32? (
-		http://developer.download.nvidia.com/cg/Cg_${MY_PV}/Cg-${MY_PV}_${MY_DATE}_x86.tgz
-	)
-	abi_x86_64? (
-		http://developer.download.nvidia.com/cg/Cg_${MY_PV}/Cg-${MY_PV}_${MY_DATE}_x86_64.tgz
-	)"
-
-LICENSE="NVIDIA-r1"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples multilib"
-
-RESTRICT="strip"
-
-RDEPEND="
-	>=media-libs/glu-9.0.0-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	amd64? (
-		abi_x86_32? (
-			>=media-libs/freeglut-2.8.1[abi_x86_32(-)]
-		)
-	)"
-DEPEND=""
-
-S=${WORKDIR}
-
-DEST=/opt/${PN}
-
-QA_PREBUILT="${DEST}/.* /usr/share/.*"
-
-src_unpack() {
-	multilib_src_unpack() {
-		mkdir -p "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local i
-		for i in ${A}; do
-			if [[ ${i} == *x86_64* && ${ABI} == amd64 ]]; then
-				unpack "${i}"
-			elif [[ ${i} != *x86_64* && ${ABI} != amd64 ]]; then
-				unpack "${i}"
-			fi
-		done
-	}
-
-	multilib_foreach_abi multilib_src_unpack
-}
-
-install_pkgconfig() {
-	# One arg: .pc file
-	insinto /usr/$(get_libdir)/pkgconfig
-	sed \
-		-e "s:GENTOO_LIBDIR:$(get_libdir):g" \
-		-e "s:DESCRIPTION:${DESCRIPTION}:g" \
-		-e "s:VERSION:${PV}:g" \
-		-e "s|HOMEPAGE|${HOMEPAGE}|g" \
-		-e "s:SUFFIX::g" \
-		"${FILESDIR}/${1}.in" > "${T}/${1}" || die
-		eprefixify "${T}/${1}"
-	doins "${T}/${1}"
-}
-
-src_install() {
-	local LDPATH=()
-
-	multilib-minimal_src_install
-}
-
-multilib_src_install() {
-	LDPATH+=( "${EPREFIX}${DEST}/$(get_libdir)" )
-	into ${DEST}
-
-	if [[ ${ABI} == amd64 ]]; then
-		dolib usr/lib64/*
-	else
-		dolib usr/lib/*
-	fi
-	install_pkgconfig nvidia-cg-toolkit.pc
-	install_pkgconfig nvidia-cg-toolkit-gl.pc
-
-	insinto ${DEST}/include
-	doins -r usr/include/Cg
-
-	if multilib_is_native_abi; then
-		dobin usr/bin/{cgc,cgfxcat,cginfo}
-
-		insinto ${DEST}
-		dodoc usr/local/Cg/README
-		if use doc; then
-			DOCS=( usr/local/Cg/docs/*.{txt,pdf} )
-			HTML_DOCS=( usr/local/Cg/docs/html/. )
-			einstalldocs
-		fi
-		if use examples; then
-			dodir /usr/share/${PN}
-			mv usr/local/Cg/examples "${ED}"/usr/share/${PN}/
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	local ldpath=${LDPATH[*]}
-
-	sed \
-		-e "s|ELDPATH|${ldpath// /:}|g" \
-		"${FILESDIR}"/80cgc-opt-2 > "${T}"/80cgc-opt || die
-	eprefixify "${T}"/80cgc-opt
-	doenvd "${T}"/80cgc-opt
-}
diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r6.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r6.ebuild
index d480e93dbdbf..41568efe3593 100644
--- a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r6.ebuild
+++ b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r6.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="NVIDIA-r1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples multilib"
 
 RESTRICT="strip"
diff --git a/media-gfx/opencsg/Manifest b/media-gfx/opencsg/Manifest
index ff6dba7993e8..86d89a2b8fca 100644
--- a/media-gfx/opencsg/Manifest
+++ b/media-gfx/opencsg/Manifest
@@ -1,4 +1,4 @@
 AUX opencsg-1.4.2-includepath.patch 537 BLAKE2B c54c3ff9bc802f34a92a72620fd20277d90174a3d0e69ec7d34987b387da44e37d1a6487f6c6063b555bca8c40a2d827d91b3ab0d9c0b8adbab5648fce90a639 SHA512 7ccc4b75560682ad7c3c340b8d8824d1339a8a1859f459139ad84d9a06e25072eba84a78c6d30aa4dbd72cf82465a176550a7e89b2590ccd85e4129511ad3893
 DIST OpenCSG-1.4.2.tar.gz 933135 BLAKE2B 20882afaddf40cc4e0c43c3e70bad334aae3885241a3993ce7083de20f9b10d6e6c4eb3a55abba2b1eca64fdae784c491492543a5012b8b2d67eb63a16dd693b SHA512 fbe6f925982717ecca7bd0eacc4fc5b362c80c7663b1ff0d9a228f2b5e1d3625d3e6d324d9e634665c74e9c0fc37d10290ece293e59a3eba67035b6b700b7778
-EBUILD opencsg-1.4.2-r1.ebuild 1245 BLAKE2B 29b8ca3a2f400d4ac9296acda2fe7aa25ec9d2de8a3d9efb798279aa6da4c623c2f151e385a035fc84a7596a81c665b84df9427758337a913be8cbbd15b6b570 SHA512 f2a0114ff5f19beab0941af6b67895b8a94372637fe7256f79577980aafec1792d79c3c1529c0bae9050a059a1e5e606e61d47102da3543b18719eb21281a0b2
+EBUILD opencsg-1.4.2-r1.ebuild 1252 BLAKE2B f017fe212fb39da5b1fbd88aacf4e55f616be92388f52761f54bd1159ee7f4a0bbd3d9fd485f47de2c14677072c23a4f9c66d744b943c41e2347639a2e9a0f01 SHA512 c2a9a3bb21a3419a7f1a4896918c8ccb6383750802f1ab6efdc7186b09073260ee745394f1d5bc1c83a61c631f059fa5efe0b08b820de1ee8c8dfd3408c8e98e
 MISC metadata.xml 1303 BLAKE2B 39b12bf1071d488890726841c2e609023e99edc3387007408b1a332051cb7adb7faf71ea3e5afdc660ba9a62116a322addba637aa1a7dc78adcae4cf27ac6508 SHA512 5a56d0545ab79ed384f580aa97be7736ac844ed8951262d016b4eb43193c594fe889f067b1c7243346b8185c8e63d933457b9b1f1f1ae47d5e350fc93d65476c
diff --git a/media-gfx/opencsg/opencsg-1.4.2-r1.ebuild b/media-gfx/opencsg/opencsg-1.4.2-r1.ebuild
index 7471f56363b9..dbd6994433fe 100644
--- a/media-gfx/opencsg/opencsg-1.4.2-r1.ebuild
+++ b/media-gfx/opencsg/opencsg-1.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="http://www.opencsg.org/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="doc"
 RESTRICT="test"
 
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index e45b4cb90d01..84314810fb10 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -6,7 +6,7 @@ AUX openvdb-8.1.0-glfw-libdir.patch 742 BLAKE2B 2ab1de05da49480584e373dba0f4a850
 AUX openvdb-8.2.0-fix-finding-ilmbase-if-imath-and-ilmbase-are-installed.patch 1351 BLAKE2B 0a63f9c2c3fd44cfe8013e2c73c3f311d92fee2b6828801175969a0f7123401c21ad11325788ba8b38716a6d21ccf9bd0e685e0c3bb51d6c3f0a0bd3fcdb409b SHA512 5443a3204c9f8b6b8ae9e533ee8c18d6e82463cb3c5be1e3664ab2067a7ba2c9d99f17263204d6be940db3dcd1d8721b359ac0de698f760d23ba05a68e03f1e9
 AUX openvdb-8.2.0-unconditionally-search-Python-interpreter.patch 1390 BLAKE2B 58e1ed82abe0e2a50ba7861188d65baa48e6c6273bcdbacccf92923de88359d6b08fa52eb6bc8d0b4f144b360680f52a94c696abcfcbb3e1c9045ba830c03646 SHA512 ddedfeae9a68c57c4de14ffdf05f952611fe72fd089320fba5f432d5562a09c661750eca4d0e256be1a3f0ac3e141b26db8d738df5b3a2ddb58a747331c90729
 AUX openvdb-9.0.0-numpy.patch 6113 BLAKE2B 4424e930ddaa3863245fc8f32954b5732aaba84792f930cc25f8598cbe0282c68540eaf7f2721959841ec3f40bbe5ed1f770c5c90425389a3a0646ebe3b75c9d SHA512 23b53db3895f1b44605e002e1b3649fe1101844f1ac864cf6083c19fdb4ab40701ee20177d7095c7a8e683e01a3e4fad1fa5087207580dd64e6f5adf4f14fdbc
-AUX openvdb-9.0.0-unconditionally-search-Python-interpreter.patch 1558 BLAKE2B eec71d9e4436ff141a85c9fdfd50b4e4883cfda9e8819ff02acf976c5e4e74aa2f44a57353600256b52806be8fe577e705900c2216cbd68945df3175831415cd SHA512 2ea6cbd9d7497ea06e0766c1b311905bb26908df43f1960bb0c3e676257b8793fd024d615c532c38ae53c0fa313a15e4cd214bd1d174f19ba4de31244c0f970a
+AUX openvdb-9.0.0-unconditionally-search-Python-interpreter.patch 1471 BLAKE2B e13ad11bfcb13a763bc73f2a26dbc11d1967098942d6f685cbd9fa2de467ac64c71d093e267db1d2d15e40ac3ab25d9b3995e40cc58d069109ded5abdd8ecb3f SHA512 137f96d8d906f2ea321670823c6fb80256b98179e7d4e044e78e62417d7489eae464f9596f13e80fd2dcafbcd946cf94e192965de48d900e061418f39f16c39c
 DIST openvdb-7.0.0.tar.gz 1872744 BLAKE2B e3a8c8d51f77e115d3d397abde0860a6322d56eb6c4795c1ba39539a23aab6cf37602ce7122965fbc3098b15b118b25010263f567e8003363b78c9b7d9d5dfd8 SHA512 f5321b22b10e192012d544cc02921d3d52f621778ec5aa21ba6d450f3e29f2fdbd76486ad390a0c008394dbc6ee4aeecc04527ef30e73adf71c1a08a021746b7
 DIST openvdb-7.1.0.tar.gz 1956052 BLAKE2B 7778d67bcc65ecb17b86f6e67a9e5f2d6574de5869a0a9c675ad7bc8540154c0f249a91c68a9da9068a3951b3e919e5676450fcaf13921c6263e7c87012a2f29 SHA512 49806375f7e6d7b12eaba24e672a068531d2f8a05f12eba29069710d2682f9983f9e6ad26047eed4b28e337f8d0e738b90130582863c710e8dd1e720bf0addad
 DIST openvdb-8.0.1.tar.gz 2299276 BLAKE2B e65bd4710ff65e20570013399d1e71a32e8f80c5e3b5527fc17d23c7f86ead7e04483cf7ba5266f26343604677d3a0dcafc01474baf7ef09b98f1f41a66119a2 SHA512 6a5a8b637429295efa72494aef82ff92dd83092591b713f56930ccf4aab3a33806d1263bfd090c27239eab97b4fdc053288dc545e631f8a7d4ca180a32331be2
@@ -18,5 +18,5 @@ EBUILD openvdb-7.1.0-r5.ebuild 2936 BLAKE2B 08764ebb2337dc453144526e5beb5c022eb2
 EBUILD openvdb-8.0.1-r4.ebuild 3034 BLAKE2B ef40d732555b406d4e81c7ad4500033073c10f5b8d81a0c7032d0c02369879fcadbfcbbb0fa4f344ca251fee47ceebe938acd47c70c2a3db2bca405da9cd2526 SHA512 5df7e6f71b8306ec28278839e7dee2ff09b8a7d1555f88a0c0f6ca7f9b5be20f1e572a0b0df6689817fb5fb378b5fc2d1a9729247aa6caf51c942e06fef1d0c6
 EBUILD openvdb-8.1.0.ebuild 3209 BLAKE2B 0db931c94e28135dd1819758f4459588c14498c2bc3121b7d61d223ddb6fb32873f22bf269f1b2afb15a3c1a612cb151b515a54eca2d6e73e56e6406b3df635c SHA512 840c7aac5df4a6cd6edde07c79702cdfb49f70e0b09dd023842884ccd62745202f0e956697ced9fe58cdffc345eba1330c0c006e6b248e60020d5b3193992faf
 EBUILD openvdb-8.2.0-r1.ebuild 3474 BLAKE2B 650cde4a8f46ef313025bbaba7f7f9698c1f0fa8347fa6aa1e2e3afb05904da49974d695e6578d2ce39c6bb8d2a331a3a7188837d85a3f090690c98797469527 SHA512 be60e550c9a334a05092bc95090ee5044f07d777484cc6efef050237c9b5f337182b4e1b1219b3290bc4d214a37fc83cb9baca3b2bb7872c3a0efe13bc968810
-EBUILD openvdb-9.0.0.ebuild 3382 BLAKE2B a2b5ecaabb519d92d23e2c5a6411f4c0c6ef5f806583f44f938a0cce97763f2bd4987636d6de0bdbe42e4ed27cd5e327910fbb1b2c1b5d207dd58a6e1f39585b SHA512 0e22e8b90ab0fa2a8fee36f16b5d649984b9ea489832c107879876073bd6c884d3cb9a1892171895849e477e5d49a59bd581f31ffb4ba01ecdf1356453257a75
+EBUILD openvdb-9.0.0.ebuild 3347 BLAKE2B e2bf412d66dfd7b8b4fdaa356a61381bcad5311d759902e007d8d66dbe7f5bfc3ae878f7a93983c592ffccc54db6f3f8378ddab2c2fa5f31a8a08c7427bc7e85 SHA512 5ce547ff60fe80d650dcb7674b2c42e457f56203208e1fc521ce3c475b08e7e5c202575a0d730528c6b3d1ef5596434fc921a4943b34bd44dc7857d049153c4f
 MISC metadata.xml 1646 BLAKE2B 9e25b791388076b419596924e5860d79b1e96503dc8d6e2e6894182919590c9688728636f08162f6cc63a75343c34cab88d62046b573e554d6321444b9ea1be0 SHA512 39c3c0a8f7c94081dba88317ecc11cbdce2fa192373daf2ae62867204d6928ed69687935df05bbd033dc643f01168aec98230909d3c69021eedc489a9f007fbc
diff --git a/media-gfx/openvdb/files/openvdb-9.0.0-unconditionally-search-Python-interpreter.patch b/media-gfx/openvdb/files/openvdb-9.0.0-unconditionally-search-Python-interpreter.patch
index 66c50b485d70..1a24f4c535c3 100644
--- a/media-gfx/openvdb/files/openvdb-9.0.0-unconditionally-search-Python-interpreter.patch
+++ b/media-gfx/openvdb/files/openvdb-9.0.0-unconditionally-search-Python-interpreter.patch
@@ -1,40 +1,35 @@
-From e9b193cc3481c4e157aa39e753ce49a0da69bb2b Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Thu, 2 Dec 2021 02:16:15 +0000
-Subject: [PATCH] cmake: unconditionally search for Python interpreter
+https://bugs.gentoo.org/790350
+https://github.com/AcademySoftwareFoundation/openvdb/pull/1275
 
-When setting PYOPENVDB_INSTALL_DIRECTORY, CMake would fail with:
-```
--- Could NOT find Python (missing: Python_LIBRARIES Development Development.Module Development.Embed) (found version "3.9.9")
-CMake Error at openvdb/openvdb/python/CMakeLists.txt:65 (message):
-  Could NOT find Python::Module (Required is at least version "2.7")
-Call Stack (most recent call first):
-  openvdb/openvdb/python/CMakeLists.txt:112 (openvdb_check_python_version)
-```
+From 86cbe16b5f8bf9df2c3825d7d7d90c58bc0d3391 Mon Sep 17 00:00:00 2001
+From: Nick Avramoussis <4256455+Idclip@users.noreply.github.com>
+Date: Wed, 8 Dec 2021 16:57:58 +0000
+Subject: [PATCH] Fixed an issue with find_python and cmake 3.18
 
-It seems like we always need to search for the interpreter.
-
-Bug: https://bugs.gentoo.org/790350
-Signed-off-by: Sam James <sam@gentoo.org>
+Signed-off-by: Nick Avramoussis <4256455+Idclip@users.noreply.github.com>
 ---
- openvdb/openvdb/python/CMakeLists.txt | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
+ openvdb/openvdb/python/CMakeLists.txt | 10 +++++++++-
+ pendingchanges/cmake_python.txt       |  2 ++
+ 2 files changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/openvdb/openvdb/python/CMakeLists.txt b/openvdb/openvdb/python/CMakeLists.txt
-index 2821efb5..af93976a 100644
+index 2821efb5d..179c0c57d 100644
 --- a/openvdb/openvdb/python/CMakeLists.txt
 +++ b/openvdb/openvdb/python/CMakeLists.txt
-@@ -98,9 +98,7 @@ endfunction()
+@@ -97,7 +97,15 @@ endfunction()
+ #   target but this was only added in CMake 3.15. See:
  #      https://github.com/AcademySoftwareFoundation/openvdb/issues/886
  set(OPENVDB_PYTHON_DEPS)
- set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development)
--if(NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY)
--  list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter)
--endif()
-+list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter)
- 
- if(USE_NUMPY)
-   list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS NumPy)
--- 
-2.34.1
-
+-set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development)
++
++# @note  explicitly only search for Development.Module from 3.18 as searching
++#   Development.Embed can cause issues on linux systems where it doesn't exist
++if(${CMAKE_VERSION} VERSION_LESS 3.18)
++  set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development)
++else()
++  set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development.Module)
++endif()
++
+ if(NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY)
+   list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter)
+ endif()
diff --git a/media-gfx/openvdb/openvdb-9.0.0.ebuild b/media-gfx/openvdb/openvdb-9.0.0.ebuild
index 60c18372ac5d..e40833eff061 100644
--- a/media-gfx/openvdb/openvdb-9.0.0.ebuild
+++ b/media-gfx/openvdb/openvdb-9.0.0.ebuild
@@ -121,7 +121,6 @@ src_configure() {
 			-DUSE_NUMPY=$(usex numpy)
 			-DOPENVDB_BUILD_PYTHON_UNITTESTS=$(usex test)
 			-DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
-			-DPython_EXECUTABLE="${PYTHON}"
 			-DPython_INCLUDE_DIR="$(python_get_includedir)"
 		)
 	fi
diff --git a/media-gfx/plantuml/Manifest b/media-gfx/plantuml/Manifest
index d9f986aa45ea..2ab4f73bf0ae 100644
--- a/media-gfx/plantuml/Manifest
+++ b/media-gfx/plantuml/Manifest
@@ -1,7 +1,7 @@
-DIST plantuml-1.2021.13.tar.gz 4742792 BLAKE2B 3ad1d593e63472c12f3242ef10a9e3b63fcb2d1dad3c7cf64cad8cc12a15526dab3f88d75d95b030be3aa505bed0464d08f69c00ea509cecb73cae7ba84ed752 SHA512 9bb2da04fc4b1cdbd372edb7a63bef67723456141b47419b692e1da0cc3d28fe61020f8fa03da340a57909e621abca0bac46bfbbc4bc6afe8f0d1cae58577eed
 DIST plantuml-1.2021.14.tar.gz 4756407 BLAKE2B 86261a79ed24cff626fd4c0a9a64f3912251ea0ef2a5724ceceda1daf93d8c50eebd42e8b6d1b3eb2d67a6ad62496d6b47ef92b50e2bbebb9e39270dee27eac7 SHA512 18abfb402f93a63be0ba02e6fe028bc99d25502714e4a2d92c8b7227088f6af4a10a1a8b63c001a0c2d2f5386385a7e22e1daa787617faf78efe2732cf029f50
 DIST plantuml-1.2021.15.tar.gz 4769780 BLAKE2B 7878d71964513e77d1f1412ab2e1e06db6a34863f9bd67868b915d86d38ee6ef6225af6f10b69d36825a768bb7f5a7f1baae0b33d329a385c1751ac4cbdaf58d SHA512 3918d6bb67eb142a9bafd399d2ae7b0b512bb3affcad31135970de5e54e23b7a7c5821f456c0f595958965eb9e957b855fd103e49187ee34b27bd5bd800e6932
-EBUILD plantuml-1.2021.13.ebuild 750 BLAKE2B c6f294d0ebcea2df17681fa103506693d6698b7ab87befaeafd5a67a351faedbaa4241cfbd1a38ef1b42d55bb34d20d09dfda65b18890a32669c868262b1f301 SHA512 5986d587915b3c0d5bf8733311848c78d0c0203a8e4b7d0f9281a7c2717f4275fb3311faad5625c53607fddbf2b8b74b7e5c3368450e6de207f2e07438801aa2
-EBUILD plantuml-1.2021.14.ebuild 751 BLAKE2B 893f8f933be06f96283feb2fa5ed98ec01db76209ad246710d48b83e60de122e6d1e2b32879ff20de051b5789562621b9dff77a27bf1b327410129dfbc150cc4 SHA512 d0f8074c7588849c330c9c5259092348ba4df4ca5d0de4d122ae1123e183b63893d8754419a7fa74faf6ecc42ce66a73ecbdbda307559c0f9d1f94bdeafcdeb7
+DIST plantuml-1.2021.16.tar.gz 5378332 BLAKE2B 717ada64ab3664eb790089520ed70106f45eb82186bd26471dcbc732ca0edf6df6d9e55598810c7b208ac5be5efd69452d48f1553b8cd13275ee7d4f0778b603 SHA512 70a0bd0453ed2457fc16a7544a82b53d45e42d3d3fe3d647e1f1509a25135b9adf3fbee70a8e64394829fc941cd5beb66494d8281431fdfe0595cdf2450cc1ec
+EBUILD plantuml-1.2021.14.ebuild 750 BLAKE2B c6f294d0ebcea2df17681fa103506693d6698b7ab87befaeafd5a67a351faedbaa4241cfbd1a38ef1b42d55bb34d20d09dfda65b18890a32669c868262b1f301 SHA512 5986d587915b3c0d5bf8733311848c78d0c0203a8e4b7d0f9281a7c2717f4275fb3311faad5625c53607fddbf2b8b74b7e5c3368450e6de207f2e07438801aa2
 EBUILD plantuml-1.2021.15.ebuild 751 BLAKE2B 893f8f933be06f96283feb2fa5ed98ec01db76209ad246710d48b83e60de122e6d1e2b32879ff20de051b5789562621b9dff77a27bf1b327410129dfbc150cc4 SHA512 d0f8074c7588849c330c9c5259092348ba4df4ca5d0de4d122ae1123e183b63893d8754419a7fa74faf6ecc42ce66a73ecbdbda307559c0f9d1f94bdeafcdeb7
+EBUILD plantuml-1.2021.16.ebuild 751 BLAKE2B 893f8f933be06f96283feb2fa5ed98ec01db76209ad246710d48b83e60de122e6d1e2b32879ff20de051b5789562621b9dff77a27bf1b327410129dfbc150cc4 SHA512 d0f8074c7588849c330c9c5259092348ba4df4ca5d0de4d122ae1123e183b63893d8754419a7fa74faf6ecc42ce66a73ecbdbda307559c0f9d1f94bdeafcdeb7
 MISC metadata.xml 822 BLAKE2B 2b2fbd2c5cac001a33c087d4fd4d3e3bd7349ede7af50e08a838a0f395375a627717e80afd658d2ce7211b0adeba2acc88f868eb5e40915c1fe35526c710e79f SHA512 9f3c1d975ce742b95c3be9c049b99a7bdb8e4f1e8eab0da18fa331214c1ef6c66263ed1226554ab0581289bf9d45b5aa7f947ec3bb64e629817d3a2333c13eae
diff --git a/media-gfx/plantuml/plantuml-1.2021.14.ebuild b/media-gfx/plantuml/plantuml-1.2021.14.ebuild
index 6ff07a08c731..2293ae97609b 100644
--- a/media-gfx/plantuml/plantuml-1.2021.14.ebuild
+++ b/media-gfx/plantuml/plantuml-1.2021.14.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://plantuml.com"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 
diff --git a/media-gfx/plantuml/plantuml-1.2021.13.ebuild b/media-gfx/plantuml/plantuml-1.2021.16.ebuild
index 2293ae97609b..6ff07a08c731 100644
--- a/media-gfx/plantuml/plantuml-1.2021.13.ebuild
+++ b/media-gfx/plantuml/plantuml-1.2021.16.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://plantuml.com"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 
diff --git a/media-gfx/pngcrush/Manifest b/media-gfx/pngcrush/Manifest
index 28782943051a..710fd37c46e0 100644
--- a/media-gfx/pngcrush/Manifest
+++ b/media-gfx/pngcrush/Manifest
@@ -1,3 +1,3 @@
 DIST pngcrush-1.8.13-nolib.tar.xz 66104 BLAKE2B dad0bce2e8f2a135d085343da98ebecfb78a6b05019d43be1b0b1f940ce23ffa980bcb08e8948b6b8cc3efc04bc6ae92a0b9cf8ea8183e27eebfae4c6c48e31e SHA512 c073d573e9b13b72fa39b178271ce65d1a19fef35943ef0a9e6121a5c66d9db212aaad38ab777c5b44e20a107eb677003acbdb4a354bcb2dc40f535a97d9df0e
-EBUILD pngcrush-1.8.13.ebuild 767 BLAKE2B aa8815851ef85072963b0be45c0664965f58698df0683d1313e53a17410ea034333f2d1aa1846f88e3ed39c6609c8fe1443c69c3552a5d1a4a95ea79f1b0189e SHA512 95c0c83c2f5ed2dd6325c95a776893cf81092a95ac797e24955756ee147a51e21683052fbc1075070800f83bed0227cf533eac656f96598604c6ce7786378218
+EBUILD pngcrush-1.8.13.ebuild 774 BLAKE2B 6db57e0260b3bf35e92f2d9b025d1ff8622692b95d01d7b6ef09020fa2b056984f01ce526d81a5770d858af5f955675495eb98d095f95c35a1248727964938cc SHA512 79d634bbed765f418eaf4df3d32cb4f1741c0f81725f41155c63a886e4dc8acc0570e617f613e84e5baf15b3cec6810e64986a656550098722af2d86bcfbfd34
 MISC metadata.xml 497 BLAKE2B 64ba5278890618c7265d12404ae37dad4d0c0c061a2634e2d152c9669afdf551ca6e0f6efb81972175ab3cd42f41a2eea0f290fdd22d76e66d2752a84154ca5b SHA512 edecab96bc356d34f62bbda506c6288a981881a9534ebc9f3f6d13e20e4380ae997f219dc78fb76035668a33d0ea01f628266430a58a657575a1ce6b18a599ca
diff --git a/media-gfx/pngcrush/pngcrush-1.8.13.ebuild b/media-gfx/pngcrush/pngcrush-1.8.13.ebuild
index 6feab4e1d8d3..c9d91857b7ab 100644
--- a/media-gfx/pngcrush/pngcrush-1.8.13.ebuild
+++ b/media-gfx/pngcrush/pngcrush-1.8.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pmt/${P}-nolib.tar.xz"
 
 LICENSE="pngcrush"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="media-libs/libpng:0=
 	sys-libs/zlib:="
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index 3bb34cd43696..f2ebdc8d779c 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -5,5 +5,5 @@ AUX povray-3.7.0.0-user-conf.patch 1491 BLAKE2B ee99672c70a5d7e12048acbfc50a3ef4
 AUX povray-3.7.0_rc6-darwin-defaults.patch 920 BLAKE2B 9cffcda18626cfdbea9a6b00ae99ee300d6b29a79e22229e35d116070b4a1ac1fbb4869242a043155a4fa189f701e6bc318cd3ba8fbc743d497db26c763926c8 SHA512 17ae635430f0d57157c9915ce5b25a88afcb34f6dd9552b27a42b32d638fdfbcb8b4e41ec89b52048db9d054812535b7b41f328ffe4554e719e4a3de21cbfdee
 DIST povray-3.7.0.0.tar.gz 38191521 BLAKE2B 5d936bdcdf9910ede2247cfa5e3881211da00762ac4bc08225dc6b53addc9e09546de9493e642b5d41228d81a50a4bcfbb5e606eb8bd9a224bb1afc5fc82db6e SHA512 82e3dbcd58b7ae921fe3b953815ca4dbbfb22eda434554baee4accabd1455b18cb511061f1cf9cf93128fab0a042df374fe2f68186d78c19853a465bd4bcbe10
 DIST povray-3.7.0.0_p20160914-fix-c++14.patch.bz2 12876 BLAKE2B b1c458764f04a57420a4562e9faacae4ae955c3d9ce4343ffd49176bb575f63830fcd58d0777dea22b975df118aa14e2bdd91509758d33d659daa3fbbaba5880 SHA512 3329da12a822762559445e208a746ff208c39f7b63e27ba84a390074bb52a105c9a2f66180e58c5157795bb16346e11b5b05efaf077ee0d8246179975a692b04
-EBUILD povray-3.7.0.0-r1.ebuild 4611 BLAKE2B 83dec3e35bfdeff46ec156f9c746fcca4c86608bf00344ff290ba1ebf9786812db0777a9f4cd2c0de760350fc95c8d8da62e12f5f407fae339bfb21b92a400e2 SHA512 70f40fabf0e3a04b4bc978ee4976cd673745b90d7061397bb7027f4115277678182b633af938ce8015e7356ca5da8b65bf9abf95cd89e3a95a04883061c8fc17
+EBUILD povray-3.7.0.0-r1.ebuild 4583 BLAKE2B 0c44090841e9a6b22b4c9b89c161bbfbe0e4bd080e49a6d0bcbc14a177a565a5b45984661b66b428af3070e714eaca1e7d4c15c28e86ef44b76cee487ab46736 SHA512 e9ae09577410ecb5dc6f3eb68dae1e231fa118b180a6c737b612d6827c7e9c3cdcdb48a30b59e715265d142cc00992b4adf095bcfddd7d2a91e041b24312fec2
 MISC metadata.xml 410 BLAKE2B e2d166cc7ed5872c7e0bdcf69c7856bd8218b059e9b0444a68930216c423ef7c8922ad963cfc3dc56f0d997c1a6372a04058815eb2b36487d07dbc6752908e2d SHA512 c159e2c730bba95d7c65525d62af05bd5b9d873a519e734010a8e5bc597590147accfe02e23946f0349c0be31a10b3e578d035bc3ff8d11a11274c1957a834be
diff --git a/media-gfx/povray/povray-3.7.0.0-r1.ebuild b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
index f6193beca6b2..5eab9b2b5c70 100644
--- a/media-gfx/povray/povray-3.7.0.0-r1.ebuild
+++ b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/POV-Ray/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug +io-restrictions openexr static-libs tiff X"
+IUSE="debug +io-restrictions openexr tiff X"
 
 DEPEND="
 	>=dev-libs/boost-1.50.0:=[threads(+)]
@@ -112,11 +112,11 @@ src_configure() {
 		$(use_with tiff libtiff "${EPREFIX}/usr/$(get_libdir)") \
 		$(use_with X libsdl "${EPREFIX}/usr/$(get_libdir)") \
 		$(use_with X x "${EPREFIX}/usr/$(get_libdir)") \
-		$(use_enable static-libs static) \
 		$(usex tiff "" "NON_REDISTRIBUTABLE_BUILD=yes") \
 		--with-boost-libdir="${EPREFIX}/usr/$(get_libdir)" \
 		--without-libmkl \
 		--disable-pipe \
+		--disable-static \
 		--disable-strip \
 		--disable-optimiz \
 		--disable-optimiz-arch
diff --git a/media-gfx/pqiv/Manifest b/media-gfx/pqiv/Manifest
index 5a7e3ae45ae2..dc768a620a34 100644
--- a/media-gfx/pqiv/Manifest
+++ b/media-gfx/pqiv/Manifest
@@ -1,4 +1,4 @@
 DIST pqiv-2.11.tar.gz 139825 BLAKE2B 981d472ccd3284b2e9ad3da8e84233c95555a927af797f8421ac820225d3d39cab2275f01269a986bab54994e0fce2095b7c33b1201e7a6117e1c8399617341b SHA512 6017a9d7ed332915a9f6fa788bb02c3b9d4d83c2ae2f9a8ab7d7738caa14ba3e9d253906f2e73fdfd368bb5e7bc51380ee9906fd9921e5f7f113811fd3da66f7
-EBUILD pqiv-2.11.ebuild 1735 BLAKE2B 4807d79e856314ae9562de15bd7a13a985d651d3faa2fa5e5aff6f950fe716f2aeabc234cfb3dbf5d4c4143de8e5515fe94084e96771ad88e3ff6cc804171181 SHA512 f6b08179cc084a3ec3b9714c1158a804a3726509e8dabc13069f0a119135cd6a4760f4c15a63e24581ff72b82f7ea1aa5073f487cfa564102895f2c7ba70c82d
+EBUILD pqiv-2.11.ebuild 1742 BLAKE2B 1ddfcfd6b623c380b15c0e933ee21718d184fbe6f0edc1ce65a2dec6ce5978fd1f8e4469d73da4e47a84af9b35749a9442fcc024bc643b22e5e7752615f1716b SHA512 189a93d54f638f67d90536836d851e100da16fd2fe750efd83c394a716290604ed6634375125ccdf76f5416ff243bbc0753b82199ea5292fbf0a1bcb653c42e0
 EBUILD pqiv-9999.ebuild 1730 BLAKE2B 078594b0e5901d7d8657ebd799431aef03418d501df182fabee3f4a288fc402c8938280ad932026668322f82e2823ee6bf6fa1d46b940d1d6dad7acdfc385dfa SHA512 472c909163057c8f0063d14a15b8614ab3d7dcd0b8ceb205c97c679a2cccca3607e8188d2984003665b0ae458658047cd0ee7d6fafca68913bbe7e45b7a920e4
 MISC metadata.xml 488 BLAKE2B f2e983c8214ea274f0920a2f3449b1ed3cad7246a1ba60ea976063ee5f11d6a827d9be993cdaedcaeb1f86cfeaf6301e7826f60dafc4eebd5b10c5890cec9966 SHA512 45e5496e534774e3b892576823d37f49a6cb0486287b8a8149964cf513b524205b0abd4b04f644702c741f3c5ca495de26ddc150c212ca1ace67bb720e573859
diff --git a/media-gfx/pqiv/pqiv-2.11.ebuild b/media-gfx/pqiv/pqiv-2.11.ebuild
index a339c0069333..942361957382 100644
--- a/media-gfx/pqiv/pqiv-2.11.ebuild
+++ b/media-gfx/pqiv/pqiv-2.11.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/phillipberndt/pqiv/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="amd64 ~arm64 ~riscv x86"
 fi
 
 DESCRIPTION="powerful GTK 3 based command-line image viewer with a minimal UI"
diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index a865695a00d6..b06542f5daf8 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -1,6 +1,6 @@
 AUX RT_5.8_fix_crop.patch 9040 BLAKE2B 740d181229fc5677735870d5b4f1b1887ae63aeb7242a038de15c726ee00b3e7b975ba099c2cb3d0e874790fcb8813cf7ab0418e2dddba17227afb6d7ab37d19 SHA512 0d62164d24a87318c7eac65003ede4b05845286dc1d39395239ee713d66011e3aba5caf18bc9e3240caacfa5cebd00b329e4e82fe9a8dccc5643538de0aa0538
 AUX RT_5.8_glibc234.patch 20080 BLAKE2B b6712195ba1d44c7c01d86b8d67c3649d13d3bb74077d2bb78741a99b1f9ee4a0aa1bbfe36488127a8982d50e36de09e26419cb02c979e7aa6362c3232232af1 SHA512 330ee4b1ef29dc6ec3e58dd3f5686f0ee935a2efbfb3ba55a9eeeac4ece7ff5594b7adfe7a9272d342fa5cbbe0387869a234e20baff25e4263963778015f4a4d
 DIST rawtherapee-5.8.tar.xz 12653148 BLAKE2B f6d4b9b177ad3b6a32b460ecfc7caf5d42a01b5dd4f24da29739f5a2e5936a8d36f9857c0e24bca11f077ab0626f08bbad59ef756792d12f93ef9516427cd2c4 SHA512 bc79586cd937dcaefc053e65faa2162de887d514e44980956d937c157c6d55c4f6e6a7a9b8f91f2d657ed2054814737b96d5d741674c1e5a961d7177433efe4e
-EBUILD rawtherapee-5.8-r1.ebuild 1882 BLAKE2B 43b86daa429381bf0f8fc5ee556a86acef6f7668d64a97ebdd05b93114c8f1d4400e866ca98268c6f2cd6a38f4f5187f64ed36b4fb34fc5e3e75f0e28b2a151c SHA512 17fc8d43418c808104b026dd0aa71780cd844c5e7fa76ae3be35f2d44e74876d0ebeafdef1379958dda2229da714c3f5ae9b42033712825618b2b71bed1d8fb1
+EBUILD rawtherapee-5.8-r1.ebuild 1881 BLAKE2B 89c72bc95616a18f77de4c957eb2e7165385e0abbb0ac29baad40c3020008aad76cf7a0cfc78477cabbd9624491622c15b5442e47636793c2d1e0af1a5879fe3 SHA512 3951959131230719e2d1b8b67a6331e71368c61119769871d98c3298b6986bd49c7040f8b90d4a0968f30486b62d1dbed164ab1b9efd2a09841c152c745d07cb
 EBUILD rawtherapee-5.8.ebuild 1697 BLAKE2B f2eb2c24f9cfdf7444026bf750c0fe68e13054f4d2926addbc8d41a02d0e6277a9099f28eae53ad35087e1ca7351225a8cd20005996e6464b9162fe516b92d56 SHA512 181b057cf7a23818a0756416e67cbb8ecc5d4c5951342237a8e5f13d7f72b1488b42ed9c2ae20dd76c77a62347a5220b68394fbe5b0726e19994629a0be14158
 MISC metadata.xml 396 BLAKE2B 21d743fc4870d7d6aa5a712581eff1e2d1a200718008c450f10a41ad7c95008cb1a45f882db1fbc98a9561645f27cee31c1f077d12b9e359a8527b31ce2785bc SHA512 174b118efc92edf6e412e3b0720d850ce65683b3025a7dec30596c82de071b05a25d796df2159a6e81a3571704984d53710999431d53e163207e77d95ceda2b7
diff --git a/media-gfx/rawtherapee/rawtherapee-5.8-r1.ebuild b/media-gfx/rawtherapee/rawtherapee-5.8-r1.ebuild
index 9986f490f4b0..355493cb4aa7 100644
--- a/media-gfx/rawtherapee/rawtherapee-5.8-r1.ebuild
+++ b/media-gfx/rawtherapee/rawtherapee-5.8-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://rawtherapee.com/shared/source/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="openmp tcmalloc"
 
 RDEPEND="
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index bf7ab2504cd6..0221af55e651 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,7 +1,3 @@
-DIST ristretto-0.11.0.tar.bz2 589169 BLAKE2B f1a0a28e7fdf83f05fc3b0a99f0c4ac0e48d07af3f9ff46f849e3768ce7b7978873cef8d028a74f5eff806cc0305d36c57e7ace99d56b61cc7acb3645e501161 SHA512 d38e3c488f106f5a060478e08fbba75fd0420fe1d1af40383118c9674f8acc079da6efdae4f41366d4cc8f34dce61e8eba89342e56747e697fd9c89b2689267f
-DIST ristretto-0.12.0.tar.bz2 600522 BLAKE2B 3af1c81ee881148b44637262aa45aec071b281be227a29a23d3baae10963e7bc328acd2ba875dd2ff2e3f3eed109e63f0af3d35f727237cd6f3ce54bcaa02495 SHA512 24782959f8560c6b3d78725b7bf99f61c5d4b16abb196d3b9d0fcc542de938ac1a26b0c76f5671149a1f1a9e0925e71b7000b1abc12e658470beb48cc51d5193
 DIST ristretto-0.12.1.tar.bz2 610696 BLAKE2B 60aede252a7817ad1b008e01ce15e371aad13fcb2bea9b61dbca3ceffdae18d5fd2c4c1690bb699648a64769ba9d06b6b9d8eaa3b08ed56cdd15682f6d785f43 SHA512 58e61b7ead3f78770132d1ba3b480f0300279dd42bf78c248d7927c0a6703c75edce051bcaa23acd46d92865c4f5e03fd085bcc6cfdc3fe2bd2b4abd4eb3fa3c
-EBUILD ristretto-0.11.0.ebuild 874 BLAKE2B 0b4d7463db35d79714c33d1f294d055e0940cdb1a6b65e5c1fee2e6b579c33aa35669616d90e3eac4fc8c2a4a8e2f8db14f2ce9d13927465aae3d2e90b8b7830 SHA512 02a09ed5cac0e73aa4317b2ab61f0fcd3430f0f524f60aa1255d4455e156de4c602d882b5fb708a7399fff9646961605d5a6a64442a574f20c3a21ce4cf5f659
-EBUILD ristretto-0.12.0.ebuild 886 BLAKE2B 116a3cb9f8cb99942e8e64f09f7918ed2c080be76a1d3fcb5da4d644368017377c1dcd3c2e4306954017a093e285cef76daf8a7a58b0fcd543399079544e890f SHA512 80e0d3625002b7da7b4f5f7adf815b5b21327740fb5ed57a73fa639083c9e72c1bdb5a9d5529af71c25e8830b5d2e41d63ea2fc8965574b34382f50666ab0a5b
-EBUILD ristretto-0.12.1.ebuild 886 BLAKE2B 875719da1f77eb1c88478efafd3201f00a4bd0059f4587a9006d663ba6aac06fe509495abe0d2e9d76f11a7bead759b3e0b3a02f725c6ea81970bcc2ea630242 SHA512 18c50cc52874f26433738fbd27cf6617fd3c1c8f8aebd3704187179aba468b2a87cf34683441fe63d6a0d2581b390f3372804f30c0364d70d8b6261d69929bb9
+EBUILD ristretto-0.12.1.ebuild 891 BLAKE2B f38ee36065007c1a66de6c9138e87e7e6ae9d1488b021426d39d7b7252ea54b4403ce7a57b3bd7ce6fe2d0f7a933bab7950c16a7f958f0aed00de29569b78784 SHA512 11e2354b059d6e164e7bbc7dc9092c47a114eaabc4d767cd634b9cb09da223f5db1903ac3111bbd6383b28bbd297e9a687dd06123d8137107c8aabfa60d13a2f
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/media-gfx/ristretto/ristretto-0.11.0.ebuild b/media-gfx/ristretto/ristretto-0.11.0.ebuild
deleted file mode 100644
index 0023c6284f53..000000000000
--- a/media-gfx/ristretto/ristretto-0.11.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="A fast and lightweight picture viewer for Xfce"
-HOMEPAGE="https://docs.xfce.org/apps/ristretto/start"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.42:2
-	media-libs/libexif:0=
-	sys-apps/file
-	x11-libs/cairo:0
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libX11:0=
-	>=xfce-base/libxfce4ui-4.10:0=
-	>=xfce-base/libxfce4util-4.10:0=
-	>=xfce-base/xfconf-4.12.1:0="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/media-gfx/ristretto/ristretto-0.12.0.ebuild b/media-gfx/ristretto/ristretto-0.12.0.ebuild
deleted file mode 100644
index 9bc62d72c2bf..000000000000
--- a/media-gfx/ristretto/ristretto-0.12.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit xdg-utils
-
-DESCRIPTION="A fast and lightweight picture viewer for Xfce"
-HOMEPAGE="https://docs.xfce.org/apps/ristretto/start"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.42:2
-	media-libs/libexif:0=
-	sys-apps/file
-	x11-libs/cairo:0
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libX11:0=
-	>=xfce-base/libxfce4ui-4.16:0=
-	>=xfce-base/libxfce4util-4.16:0=
-	>=xfce-base/xfconf-4.12.1:0="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/media-gfx/ristretto/ristretto-0.12.1.ebuild b/media-gfx/ristretto/ristretto-0.12.1.ebuild
index e28247ce894c..2092c4f0a67a 100644
--- a/media-gfx/ristretto/ristretto-0.12.1.ebuild
+++ b/media-gfx/ristretto/ristretto-0.12.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.44:2
diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index 3d3c8289fb5c..240869d76124 100644
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@@ -1,5 +1,5 @@
 AUX sam2p-0.49.4_p20190718-fix-configure-clang.patch 353 BLAKE2B dcb39280fc99bc1d21e9ec9627d976844ed6ec9d14dda61c471766687ae3816c5672dd2b980665252bb22da4a345322e69accec719c86fdd5bfcbbec6d7b8284 SHA512 c351987915fc1b2051f55b9a80478b0ad400aa140e986b3a1dd0d8ae6b55252036f1038236d25456b9fcd604e863169ea5dfa329f5a180eeaccfcf4a58622a0d
 AUX sam2p-build-fixes.patch 1803 BLAKE2B d9c805da6c46f5457cc6006941a1331f0e46ed8fcadf7c73b9a11debfaa7e2f040beeae42aa9cf316a2df71ffe9d136808a1e9ebeea5c146851057a8addb7bf6 SHA512 fa32011db37a74f746542df82f29e7869412cf8ad93d0b4c3c6e100dda06c254f204671199db0d1abd6134975325cb939f65f0a22457a84a78b6b277411ea2f5
 DIST sam2p-0.49.4_p20190718.tar.gz 1816309 BLAKE2B 3d97e00c2bd6b6c292c051d4eb6b73549d1c82a5bd7be3d6b718d8e9d2e96b47657c184af43fa57c0ca4b2b8c26904fb42508d17f7dda715def7d2082affa8b6 SHA512 1c6074fabca6146e51fe0d5a10c912ec679cf122e10aab7bead9e35e3d007e79773aedb1f627572b1b88cacefe0e7edf72efd71d32c47731723b910667220c51
-EBUILD sam2p-0.49.4_p20190718-r1.ebuild 1297 BLAKE2B d04ddf12f9a50d85d386aaace9acd17898b1245d12d983d6ad06c5ef2e22b0a948480a257d6744a43807d19c41b429128776ea4b8005ce0e894916e8356f837d SHA512 eb8f25109b9052ed954512cd59a9570951a1ba1c670e90e877fdcadbcc328b71b380c57cd74a0aafa696124e1bee718c5de88ffe6af1ac2cf5f55d311f547fb3
+EBUILD sam2p-0.49.4_p20190718-r1.ebuild 1296 BLAKE2B 32c18587747d68ebc798827ea39cf82d8c6731001e1ab07502f57df1cd7fab7bc322cc21c5dd033253447cc72dd81a5eb039ca7a3a3606f52b4b4c1460724798 SHA512 11bccb53c2c6699525344def4cb4568336f1ebe694883c040f2338268ba2db2d551e5e92df51319ccb5faf1b6255db8eea3e083db7e33d7c7111ff12f2037aa3
 MISC metadata.xml 374 BLAKE2B d19b7ae3a43094549eb9f02ddbab8077ebdb9b18fd2a608e038de18e1ade6824857899b1f7a19bb835ea2bfa3ae4e2d10c1cd67b38fe0d6d5927150f5b8644dd SHA512 900c1194a51963456c5f22c9eecf95645eda39e189cf72c89b63767c73027ebc152b5e67007047ada223f5b67671490cf75f3caa2989ec645b48bf4c81fdfcba
diff --git a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
index 3adddb11fdbc..e9ea5ad08de4 100644
--- a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pts/sam2p/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="examples gif"
 RESTRICT="test"
 
diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index 0f79a40d8551..887b33356526 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -1,6 +1,10 @@
 AUX ax_prefix_config_h.m4 8195 BLAKE2B d2eb17b7730a216f8fa88585b7dce51d641fb9e801a77d8059329a3838a8ce0d4eac02e1229cd087cdbac9f47c7bcfe99bfe0a14e8c4db233c6c4e066ea09b81 SHA512 cf70c3e909da9379ebed51a66fe94cbd7a068574e0ba0da5690f917523b090f29eb23f0464849d6364adc28411258483b0d773ed3488c9e9328d5a1f732427c4
 AUX scrot-1.2.bash-completion 1990 BLAKE2B 6c99578185f7d69581854372344088398279af8227fccccff07dcb590ae1a90d6ef9122ba3cf02b0db634fe68554818e63d1cfa54bae0fb1ccb65cf0f84769b4 SHA512 76880911e6799894d68aae78313a114fc18c6bf2f0411a0fdce3f30d33c8ff266290aed9570a546c3a05a71503a130c5cbe2cb6e0f92c240edbc8e9f19362db4
+AUX scrot-1.7-fix-docdir.patch 1794 BLAKE2B b55621bbf24cca877c9d50119bb0eeaf40e5372c9ff5b21c0de1620f37deb2c6d6a069b16355c01844387709f475e29a97f66bdc4b1aaea84cbeafc9ff46119b SHA512 4b28c1458bebb22b1d6dfdbfe2478e0e829a73f641b1b7b5b8140bee4d7384f84d3d7b538f0a7b9f89a824bd255af1158611fd7a3f8787797a111641e2dfeaff
+AUX scrot-1.7.bash-completion 2622 BLAKE2B febdade3f2b5cb094d9162e66d3b0d0b8ad72659e33ca9b6c55c4888ef3122c8f16430cc5f74d32367ea7a74905e3c8c49e9570d996c1324ffd9b72f42e9f534 SHA512 c0a6ac7347164e007eef219b567a554b5aac91c4afdc585d2ed299f46880a46343e3aef83ad8fe50e090ed8521ca241b7e3661a59511064a43164fbe366e1ebb
 DIST scrot-1.4.tar.gz 157779 BLAKE2B ba844f8bc500c468d028ce62ae57bd6a9fa0e403df6f05dd217722a9115456b70a38aabd7ccb0da53d855b9971d0f5948f82545ca0c8cceb75ede0d4546e27c1 SHA512 8423e7b2658f3e0ccf30f61e122016469226328adf8b1e511aeb031dd2655ae66582651e2d046c7c35d23efb98656369a02b59e711980481ddc4db24c299ee11
+DIST scrot-1.7.tar.gz 178463 BLAKE2B 021c68c5ebd19ec08c072cff73fe1ebb7ffd179dfcde6e13656779e2ee1357cf0fdbba1d4beb2fc5dc9c8c4cd28008acaa462068eec3192cea6687ac58cd653a SHA512 3ef2b547d561a85213ef0075af3034020f00168253d3b84ef94578f0b8534f9a7389c808f8fcd0c619358a14f41601fee407d08d63c397b9892ba9fc2db23f88
 EBUILD scrot-1.4.ebuild 1041 BLAKE2B 102bdca2640dbf9f60dcd2ce84ccb3de19ac324c7c414dc100497330211cf94ef0561196105371d4e693bf14811327f44f180db60439e34998c9e26749f8fbd9 SHA512 497beb7ba0f8d166fc2fba6a56e2b1b5fdda555f6ce61d0710e9f6fdc1f42a8c522312b0b9e7ace764e15c75df116607270e59a2513d7648c8c670a63c4039b6
-EBUILD scrot-9999.ebuild 962 BLAKE2B bd263137adf2fa88b029f8b38b92d86219308cdf290b775334fd28bd0f4e51b2a10bb6726b8f6c568a5fa5b309ec7b71199958b7030374bdfb6cb83ede7a0121 SHA512 2eddd1a3086c9b834ead426e1df2c0aa84a85021aa7606d30d92a23ad0e2869a99a9ff248f6af960a28082555f68a823d448837a9f70892c49ec9a8ea5bd9903
+EBUILD scrot-1.7-r2.ebuild 1302 BLAKE2B defeac3087442ab4f00ce5358db0a204f7386f8aade58376a7975a49275798dce76c44ba01247c07a5762b87cae364d1caea31273348db01404cae154d2de871 SHA512 97d7540e3a2249d2974795775271d58784e46d5820a782e0483ee29f6cb49d5976d44625ff35e7eba474d9389b18ffaf91842554693f1c679842ee16dd96f2e9
+EBUILD scrot-9999.ebuild 1142 BLAKE2B a819b2a28a10a06938b17340bb2abe23cb8e0e6723ed1dabac4b1a7ef00c4fbb44776b25ad8621a42e76bffff97727043d13668341fcc264cd8e8f930e2bb6b4 SHA512 eaf6c790a31412eccfed31cbab17941570d75f123b79cf68e6b8c69983f8b09e0bae2369be8f7fbca85ba6feae9afaafab0d87c0a7cdcbc921fe69d0607f9eb5
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/media-gfx/scrot/files/scrot-1.7-fix-docdir.patch b/media-gfx/scrot/files/scrot-1.7-fix-docdir.patch
new file mode 100644
index 000000000000..3e0fb09da85d
--- /dev/null
+++ b/media-gfx/scrot/files/scrot-1.7-fix-docdir.patch
@@ -0,0 +1,65 @@
+https://github.com/resurrecting-open-source-projects/scrot/pull/175
+
+From: Sam James <sam@gentoo.org>
+Date: Sun, 19 Dec 2021 23:59:45 +0000
+Subject: [PATCH 1/2] build: respect docdir
+
+Before this patch with --docdir=/usr/share/doc/scrot-1.7-r1 (example downstream
+versioning for patches):
+```
+>>> /usr/share/doc/scrot-1.7-r1/
+>>> /usr/share/doc/scrot-1.7-r1/README.md.bz2
+>>> /usr/share/doc/scrot-1.7-r1/ChangeLog.bz2
+>>> /usr/share/doc/scrot-1.7-r1/AUTHORS.bz2
+>>> /usr/share/doc/scrot/
+>>> /usr/share/doc/scrot/scrot.png
+>>> /usr/share/doc/scrot/README.md.bz2
+>>> /usr/share/doc/scrot/ChangeLog.bz2
+>>> /usr/share/doc/scrot/AUTHORS.bz2
+```
+
+After:
+```
+>>> /usr/share/doc/scrot-1.7-r1/scrot.png
+>>> /usr/share/doc/scrot-1.7-r1/README.md.bz2
+>>> /usr/share/doc/scrot-1.7-r1/ChangeLog.bz2
+>>> /usr/share/doc/scrot-1.7-r1/AUTHORS.bz2
+```
+
+This avoids installing duplicate files & installs them to the
+same location but it's overridable by --docdir in ./configure which
+helps downstreams.
+
+Bug: https://bugs.gentoo.org/828928
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -34,10 +34,9 @@ MAINTAINERCLEANFILES = Makefile.in
+ 
+ man_MANS = man/scrot.1
+ 
+-docs_DATA = README.md AUTHORS ChangeLog doc/scrot.png
+-docsdir = $(prefix)/share/doc/scrot
++doc_DATA = README.md AUTHORS ChangeLog doc/scrot.png
+ 
+-EXTRA_DIST = man/scrot.1 $(docs_DATA)
++EXTRA_DIST = man/scrot.1
+ 
+ SUBDIRS = src
+ 
+From: Sam James <sam@gentoo.org>
+Date: Mon, 20 Dec 2021 00:03:35 +0000
+Subject: [PATCH 2/2] build: simplify man page installation
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -36,7 +36,7 @@ man_MANS = man/scrot.1
+ 
+ doc_DATA = README.md AUTHORS ChangeLog doc/scrot.png
+ 
+-EXTRA_DIST = man/scrot.1
++EXTRA_DIST = $(man_MANS)
+ 
+ SUBDIRS = src
+ 
diff --git a/media-gfx/scrot/files/scrot-1.7.bash-completion b/media-gfx/scrot/files/scrot-1.7.bash-completion
new file mode 100644
index 000000000000..06bc7ac7fad3
--- /dev/null
+++ b/media-gfx/scrot/files/scrot-1.7.bash-completion
@@ -0,0 +1,48 @@
+# bash-completion script for scrot
+# place this in /etc/bash_completion.d
+
+_scrot() {
+	local cur prev opts
+	COMPREPLY=()
+	cur=${COMP_WORDS[COMP_CWORD]}
+	prev=${COMP_WORDS[COMP_CWORD-1]}
+	opts="
+		-h --help -v --version -a --autoselect -b --border -c --count -d
+		--delay -e --exec -q --quality -m --multidisp -s --select -u --focused
+		-t --thumb -z --silent -p --pointer -f --freeze -o --overwrite -l --line
+		-n --note -C --class -i --ignorekeyboard -F --file -shole --select=hole
+		-shide --select=hide -sblur --select=blur
+	"
+
+	if [[ "${cur}" == -* ]] || [[ ${COMP_CWORD} -eq 1 ]]; then
+		COMPREPLY=($(compgen -W "${opts}" -- "${cur}"))
+	fi
+
+	case "${prev}" in
+		-h|--help) COMPREPLY=($(compgen -W "${opts/-h --help}" -- "${cur}")) ;;
+		-v|--version) COMPREPLY=($(compgen -W "${opts/-v --version}" -- "${cur}")) ;;
+		-a|--autoselect) COMPREPLY=($(compgen -W "${opts/-a --autoselect}" -- "${cur}")) ;;
+		-b|--border) COMPREPLY=($(compgen -W "${opts/-b --border}" -- "${cur}")) ;;
+		-c|--count) COMPREPLY=($(compgen -W "${opts/-c --count}" -- "${cur}")) ;;
+		-d|--delay) COMPREPLY=($(compgen -W "${opts/-d --delay}" -- "${cur}")) ;;
+		-e|--exec) COMPREPLY=($(compgen -A command -- "${cur}")) ;;
+		-q|--quality) COMPREPLY=($(compgen -W "${opts/-q --quality}" -- "${cur}")) ;;
+		-m|--multidisp) COMPREPLY=($(compgen -W "${opts/-m --multidisp}" -- "${cur}")) ;;
+		-s|--select) COMPREPLY=($(compgen -W "${opts/-s --select}" -- "${cur}")) ;;
+		-u|--focused) COMPREPLY=($(compgen -W "${opts/-u --focused}" -- "${cur}")) ;;
+		-t|--thumb) COMPREPLY=($(compgen -W "${opts/-t --thumb}" -- "${cur}")) ;;
+		-z|--silent) COMPREPLY=($(compgen -W "${opts/-z --silent}" -- "${cur}")) ;;
+		-p|--pointer) COMPREPLY=($(compgen -W "${opts/-p --pointer}" -- "${cur}")) ;;
+		-f|--freeze) COMPREPLY=($(compgen -W "${opts/-f --freeze}" -- "${cur}")) ;;
+		-o|--overwrite) COMPREPLY=($(compgen -W "${opts/-o --overwrite}" -- "${cur}")) ;;
+		-l|--line) COMPREPLY=($(compgen -W "${opts/-l --line}" -- "${cur}")) ;;
+		-n|--note) COMPREPLY=($(compgen -W "${opts/-n --note}" -- "${cur}")) ;;
+		-C|--class)COMPREPLY=($(compgen -W "${opts/-C --class}" -- "${cur}")) ;;
+		-i|--ignorekeyboard)COMPREPLY=($(compgen -W "${opts/-i --ignorekeyboard}" -- "${cur}")) ;;
+		-F|--file)COMPREPLY=($(compgen -W "${opts/-F --file}" -- "${cur}")) ;;
+		-shole|--select=hole)COMPREPLY=($(compgen -W "${opts/-shole --select=hole}" -- "${cur}")) ;;
+		-shide|--select=hide)COMPREPLY=($(compgen -W "${opts/-shide --select=hide}" -- "${cur}")) ;;
+		-sblur|--select=blur)COMPREPLY=($(compgen -W "${opts/-sblur --select=blur}" -- "${cur}")) ;;
+	esac
+}
+complete -F _scrot scrot
diff --git a/media-gfx/scrot/scrot-1.7-r2.ebuild b/media-gfx/scrot/scrot-1.7-r2.ebuild
new file mode 100644
index 000000000000..3aa2ef8c7e06
--- /dev/null
+++ b/media-gfx/scrot/scrot-1.7-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Need autotools for docdir patch for now
+inherit autotools bash-completion-r1
+
+DESCRIPTION="Screen capture utility using imlib2 library"
+HOMEPAGE="https://github.com/resurrecting-open-source-projects/scrot"
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/resurrecting-open-source-projects/${PN}"
+	inherit autotools git-r3
+else
+	SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="feh LGPL-2+"
+SLOT="0"
+
+RDEPEND="
+	dev-libs/libbsd
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXfixes
+	|| (
+		media-libs/imlib2[gif]
+		media-libs/imlib2[jpeg]
+		media-libs/imlib2[png]
+		media-libs/imlib2[tiff]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+"
+
+DOCS=(
+	AUTHORS ChangeLog README.md
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7-fix-docdir.patch
+)
+
+src_prepare() {
+	default
+
+	# Needed for 1.7 for the docdir patch
+	eautoreconf
+	#[[ ${PV} == *9999* ]] && eautoreconf
+}
+
+src_install() {
+	default
+
+	newbashcomp "${FILESDIR}"/${PN}-1.7.bash-completion ${PN}
+}
diff --git a/media-gfx/scrot/scrot-9999.ebuild b/media-gfx/scrot/scrot-9999.ebuild
index 605a004b7102..80d7728667d6 100644
--- a/media-gfx/scrot/scrot-9999.ebuild
+++ b/media-gfx/scrot/scrot-9999.ebuild
@@ -1,19 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit autotools bash-completion-r1 git-r3
+EAPI=8
+
+inherit bash-completion-r1
 
 DESCRIPTION="Screen capture utility using imlib2 library"
 HOMEPAGE="https://github.com/resurrecting-open-source-projects/scrot"
-EGIT_REPO_URI="https://github.com/resurrecting-open-source-projects/${PN}"
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/resurrecting-open-source-projects/${PN}"
+	inherit autotools git-r3
+else
+	SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
 
 LICENSE="feh LGPL-2+"
 SLOT="0"
-KEYWORDS=""
 
 RDEPEND="
-	>=media-libs/giblib-1.2.3
+	dev-libs/libbsd
+	x11-libs/libXext
 	x11-libs/libX11
 	x11-libs/libXcomposite
 	x11-libs/libXfixes
@@ -28,21 +36,23 @@ DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto
 "
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+"
+
 DOCS=(
-	AUTHORS ChangeLog CONTRIBUTING.md README.md TODO
+	AUTHORS ChangeLog README.md
 )
 
 src_prepare() {
-	sed -i -e 's#-g -O3##g' src/Makefile.am || die
-	cat "${FILESDIR}"/ax_prefix_config_h.m4 >> acinclude.m4 || die
-
 	default
 
-	eautoreconf
+	[[ ${PV} == *9999* ]] && eautoreconf
 }
 
 src_install() {
 	default
 
-	newbashcomp "${FILESDIR}"/${PN}-1.2.bash-completion ${PN}
+	newbashcomp "${FILESDIR}"/${PN}-1.7.bash-completion ${PN}
 }
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index a0cd374293de..e0dd10c2f29c 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,5 +1,4 @@
-DIST shotwell-0.30.12.tar.xz 6519996 BLAKE2B 7417f1bf0057b4974b45be675b177f6fba232d60d56c3d98cc6d5a7a95a31281add5190a04eab965739759aa7d826515996f2fd62350352a54ebf969dc732d95 SHA512 3274f15969be7f75ad2fa44e78773b76e11ee6cf8d4990c7f658fa8ce7e84a8fa5f06542fbab4b585c70e41c097c7b07ba702540102e4d0dfca8e927e00180cf
+AUX 0.30.14-vala-0.52.8-compat.patch 650 BLAKE2B eda8739a4f8f6fad9ad026c97542d2ec3683f3fdf86ce34be9235a49a5569ad0a67b1ab454eba6c5d13bf9a3fb2a1cefb52d8d0a6103d4d84e2d0efbafd55e0f SHA512 0736a02880c5db69a85cc3eedc444aa6d95f96e3e31695b078a416384f9751d8c8cc550d42ba6dfc1a59f98b0b30b6f87ea5136988d404ee08fe9e6b0c752ec9
 DIST shotwell-0.30.14.tar.xz 6524680 BLAKE2B 321406d3731a4baa333c3820ee46e8dc12ca9a340c7f1ac3824ee894fa2826b7efa3ee7a27f551d62043e5f22199042befb5063cc67cefd27830e19db7d7f661 SHA512 bd899ac099ec4760f6119804812ef9314c9261c18273309abfb1dccc675b9e4a561c0abea1c46ea0dbbab9f5c00301d840b52714f97ec06548c180a77871db7c
-EBUILD shotwell-0.30.12.ebuild 1769 BLAKE2B ce81642084c5b8ac1b41b72842ac4c798ab3a2a136e95f899735bd4dbab8d013809c1a0b6139f366b2f0e6a76d7a26a314b80ea453405e2a2f4eb1dbfd2e5d3a SHA512 e8aab87360f510ee71ae3b06f9904a7895223ea31ec1b7a5e29f9f8238668e523d5654bad84c4f459fdad78cc6853f4478994c2383535b834c342a4c6469e081
-EBUILD shotwell-0.30.14.ebuild 1769 BLAKE2B ce81642084c5b8ac1b41b72842ac4c798ab3a2a136e95f899735bd4dbab8d013809c1a0b6139f366b2f0e6a76d7a26a314b80ea453405e2a2f4eb1dbfd2e5d3a SHA512 e8aab87360f510ee71ae3b06f9904a7895223ea31ec1b7a5e29f9f8238668e523d5654bad84c4f459fdad78cc6853f4478994c2383535b834c342a4c6469e081
+EBUILD shotwell-0.30.14.ebuild 1924 BLAKE2B 621a5b324cea63f36f9c2304f92e38dfcb1a58b8fac99089bb525b63f97c616516f21996468f8c9df6df353b40287267311255718c7dde7e78aa367a8c01ee75 SHA512 0d18fa262a44118c9ac26bce8abdd5c02e4094d9782a070db9831efc4718d73cd469ea219aa3f8beac9ff6800d42e318eb692e37105b98abb616f21a30a1f19b
 MISC metadata.xml 796 BLAKE2B e0c9ab623e0fdaa1df57951920708e41359ae3d2d8335ebb4012c5428a965d426698adb4a8e0815116a07b03e55e3d44aa11e5dcffe4d82bac8e733eaf302995 SHA512 c21d7613c7f200cdd15bf45d201a83c38fa5fc52f40c833d638afc48cef17a8e9db016b29ec3ff95e625cfc750e8bff7603a4fe2ea26fbad1504b581da43c165
diff --git a/media-gfx/shotwell/files/0.30.14-vala-0.52.8-compat.patch b/media-gfx/shotwell/files/0.30.14-vala-0.52.8-compat.patch
new file mode 100644
index 000000000000..0aef3e4eea96
--- /dev/null
+++ b/media-gfx/shotwell/files/0.30.14-vala-0.52.8-compat.patch
@@ -0,0 +1,13 @@
+diff --git a/src/dialogs/ExportDialog.vala b/src/dialogs/ExportDialog.vala
+index 5a61dc4a..c8011b7f 100644
+--- a/src/dialogs/ExportDialog.vala
++++ b/src/dialogs/ExportDialog.vala
+@@ -23,7 +23,7 @@ public class ExportDialog : Gtk.Dialog {
+ 
+     private static ScaleConstraint current_constraint = ScaleConstraint.ORIGINAL;
+     private static ExportFormatParameters current_parameters = ExportFormatParameters.current();
+-    private static int current_scale = DEFAULT_SCALE;
++    private static int current_scale = 1200; //FIXME not needed with vala 0.54+
+ 
+     private Gtk.Grid table = new Gtk.Grid();
+     private Gtk.ComboBoxText quality_combo;
diff --git a/media-gfx/shotwell/shotwell-0.30.12.ebuild b/media-gfx/shotwell/shotwell-0.30.12.ebuild
deleted file mode 100644
index 46f2f6e7fac2..000000000000
--- a/media-gfx/shotwell/shotwell-0.30.12.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86"
-IUSE="opencv udev"
-
-DEPEND="
-	>=x11-libs/gtk+-3.22.0:3
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/libgee-0.8.5:0.8
-	>=net-libs/webkit-gtk-2.26:4
-	>=dev-libs/json-glib-0.7.6
-	>=dev-libs/libxml2-2.6.32:2
-	x11-libs/gdk-pixbuf:2
-	>=dev-db/sqlite-3.5.9:3
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-libs/libgphoto2-2.5:=
-	udev? ( >=dev-libs/libgudev-145:= )
-	>=media-libs/gexiv2-0.10.4
-	>=media-libs/libraw-0.13.2:=
-	>=media-libs/libexif-0.6.16:=
-	dev-libs/libgdata
-	>=app-crypt/gcr-3:=[gtk]
-	x11-libs/cairo
-	opencv? ( >=media-libs/opencv-2.3.0:= )
-"
-RDEPEND="${DEPEND}
-	media-plugins/gst-plugins-gdkpixbuf:1.0
-	media-plugins/gst-plugins-meta:1.0
-"
-BDEPEND="
-	$(vala_depend)
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	net-libs/libsoup:2.4[vala]
-	media-libs/gexiv2[vala]
-	app-crypt/gcr[vala]
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dunity-support=false
-		# -Dpublishers # In 0.30.2 all get compiled in anyways, even if restricted list, affects only runtime support
-		-Dextra-plugins=true
-		#trace
-		#measure
-		-Ddupe-detection=true
-		$(meson_use udev)
-		-Dinstall-apport-hook=false
-		$(meson_use opencv face-detection)
-		-Dfatal_warnings=false
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/shotwell/shotwell-0.30.14.ebuild b/media-gfx/shotwell/shotwell-0.30.14.ebuild
index 46f2f6e7fac2..d0ee07286e10 100644
--- a/media-gfx/shotwell/shotwell-0.30.14.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.14.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc x86"
 IUSE="opencv udev"
 
 DEPEND="
@@ -50,6 +50,11 @@ BDEPEND="
 	app-crypt/gcr[vala]
 "
 
+PATCHES=(
+	# Fix build against vala-0.52.8. Isn't needed once we use 0.54+ or drop vala:0.52 slots
+	"${FILESDIR}"/${PV}-vala-0.52.8-compat.patch
+)
+
 src_prepare() {
 	xdg_src_prepare
 	vala_src_prepare
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 0739aa49f7e8..234332e6e787 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -2,7 +2,7 @@ AUX 40.0-add-control-optional-deps.patch 2713 BLAKE2B 594f076b9515697322711033a2
 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
-EBUILD simple-scan-40.1.ebuild 1446 BLAKE2B d337303876bb8b236326f29bf4324f34c8a9e59bb6f0bafd8bb2ead1797484d6de9a5dc6525120afdaca61cb6a0d0ebfd630f36274596c2592f22cc972ed3fd2 SHA512 80bf6ab5a88eeb60094495f151e1155b96c426c41eea747ead16a6afdb7b1299a75c6a293941162d140b9572fb32ed6c36ec1ee0e21ec06be2455c13618b30b5
-EBUILD simple-scan-40.5.ebuild 1451 BLAKE2B 7fb4fdd28d38cacc4ca03c4e3ab57930c5b4fe58aa61d60f2f0dccd3669c9fa5c02c141b7e555fc3f166da8e4866ff9ce9135484122fca78c7a53d23644f5cca SHA512 92491ae8c1424e0abd5a0b035069f5a6f5f23aae234d7cd66ee405958f55597afd774cc7550e4055b1a8a2f5d9f2b7bcf243c8bc9ee0c1b3422724481c1b1ad2
-EBUILD simple-scan-40.6.ebuild 1451 BLAKE2B 7fb4fdd28d38cacc4ca03c4e3ab57930c5b4fe58aa61d60f2f0dccd3669c9fa5c02c141b7e555fc3f166da8e4866ff9ce9135484122fca78c7a53d23644f5cca SHA512 92491ae8c1424e0abd5a0b035069f5a6f5f23aae234d7cd66ee405958f55597afd774cc7550e4055b1a8a2f5d9f2b7bcf243c8bc9ee0c1b3422724481c1b1ad2
+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
 MISC metadata.xml 617 BLAKE2B 41b65f58d578371b4219664b11bf04f081e9a4dd6d146d977689708bdc4d847f85ef86cb4391eb45d24c21185889ff9e5122fd3b6658a24965d231f75ea5b8da SHA512 fb3e56709421b416cb42f1f025308404117c5cf0dfe37419c2d9fa5a18a7397e7f6f9117143df4fff1e2347fd65cfcb9e7007c6c9be56df79641b024d21c1db5
diff --git a/media-gfx/simple-scan/simple-scan-40.1.ebuild b/media-gfx/simple-scan/simple-scan-40.1.ebuild
index 802c4565cc4a..ca6eee8059b1 100644
--- a/media-gfx/simple-scan/simple-scan-40.1.ebuild
+++ b/media-gfx/simple-scan/simple-scan-40.1.ebuild
@@ -22,7 +22,7 @@ DEPEND="
 	x11-libs/cairo:=
 	x11-libs/gdk-pixbuf:2
 	>=dev-libs/libgusb-0.2.7
-	colord? ( >=x11-misc/colord-0.1.24:=[udev] )
+	colord? ( >=x11-misc/colord-0.1.24:=[udev(+)] )
 	webp? ( media-libs/libwebp )
 	>=media-gfx/sane-backends-1.0.20:=
 
diff --git a/media-gfx/simple-scan/simple-scan-40.5.ebuild b/media-gfx/simple-scan/simple-scan-40.5.ebuild
index 9389dd00888b..6647ed0c63da 100644
--- a/media-gfx/simple-scan/simple-scan-40.5.ebuild
+++ b/media-gfx/simple-scan/simple-scan-40.5.ebuild
@@ -22,7 +22,7 @@ DEPEND="
 	x11-libs/cairo:=
 	x11-libs/gdk-pixbuf:2
 	>=dev-libs/libgusb-0.2.7
-	colord? ( >=x11-misc/colord-0.1.24:=[udev] )
+	colord? ( >=x11-misc/colord-0.1.24:=[udev(+)] )
 	webp? ( media-libs/libwebp )
 	>=media-gfx/sane-backends-1.0.20:=
 
diff --git a/media-gfx/simple-scan/simple-scan-40.6.ebuild b/media-gfx/simple-scan/simple-scan-40.6-r1.ebuild
index 9389dd00888b..6647ed0c63da 100644
--- a/media-gfx/simple-scan/simple-scan-40.6.ebuild
+++ b/media-gfx/simple-scan/simple-scan-40.6-r1.ebuild
@@ -22,7 +22,7 @@ DEPEND="
 	x11-libs/cairo:=
 	x11-libs/gdk-pixbuf:2
 	>=dev-libs/libgusb-0.2.7
-	colord? ( >=x11-misc/colord-0.1.24:=[udev] )
+	colord? ( >=x11-misc/colord-0.1.24:=[udev(+)] )
 	webp? ( media-libs/libwebp )
 	>=media-gfx/sane-backends-1.0.20:=
 
diff --git a/media-gfx/svg2rlg/Manifest b/media-gfx/svg2rlg/Manifest
index 0fb205eb4882..24791e0f3bcf 100644
--- a/media-gfx/svg2rlg/Manifest
+++ b/media-gfx/svg2rlg/Manifest
@@ -1,3 +1,3 @@
 DIST svg2rlg-0.4.0.tar.gz 504861 BLAKE2B bfd147d824d5a49f8621e705f6bdeefdaa571918db94afea8e839d048d2089a8c8ebf8e2763caa9866f55a7142e1bb3522b01f53eaf5b8343164a08ee0983ef3 SHA512 e3813a22784c2199a1df69574c64093347a153fa2b7a40e2f38f52e5d46d7ca8d6e8e3bbe54ab59381f6c7246352c016ff3e19b1278c6f2c8dcfbe8bd7017b12
-EBUILD svg2rlg-0.4.0.ebuild 754 BLAKE2B 6c9fba4ab5dafbe4b21eab2003234771bab7422de6e95d72f8d20b0dd51d35cfda041140b51719b46b839c9227a8c1c7e08bffa7f6e8eecce958d236919f6319 SHA512 b92746089cac33f6c40924767b450ff87f4041c91b65b6a21bd4058ca5aa1f9d95dde12468f624bcafa2f9e064a11e56e94d238bff30abd86243c6b1d4ef2634
+EBUILD svg2rlg-0.4.0.ebuild 761 BLAKE2B bba55bb06407c1c7ad581bd8b92c3da529dd39e7bcb063619faf6c901ca889986f17cc635a0ae1de1c604ef67ea32979e05abd98dca8f1fa197011a4f00aadb7 SHA512 c016b034bcc7d5edda641c7c736b3609bab097764fa1008dee627aa73b7e50bf2153756232b7058fb628d583282979734c6ee06ba09c9ce7120d18b69205f897
 MISC metadata.xml 248 BLAKE2B b8c3f3218b1a5b5a815a2a09751730237a898cdfe3b4efddbbe6cf0289c4784c1317447a7d511af25cd83e9b24cf0a1d2ead158ffd3917f2e83d83ff9868743b SHA512 403566e808f63d98634f04fa0953a6e1ec6d679a2d68cc88d38c8b150388bc93960ce9ef3134d16d72602a531ffa4dde18c8bb09c1f1d82658e381e514c859af
diff --git a/media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild b/media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild
index 6be2f1ffbe8d..54e19aeeca83 100644
--- a/media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild
+++ b/media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/sarnold/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="BSD"
diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest
index 445e0de11cb6..50df75e80c24 100644
--- a/media-gfx/sxiv/Manifest
+++ b/media-gfx/sxiv/Manifest
@@ -1,5 +1,5 @@
 AUX sxiv-25-makefile.patch 251 BLAKE2B 05b96799c7e94c2a907158becfbd3d0844a3919f75e7c4e6e8f994ec2881f173919c34625d80357882b28157f72ea6d0bbd6331473c6b213857c3e8a5db92bad SHA512 8e7b30bb73b87981b2d2c4e9bff8f62b5e59d341410dee0d4ecb889a0f39cfb38539a8d6ef2a738517ab5034c035e6588a4d2b7220bd408a2dd040f6cb8d7088
 DIST sxiv-26.tar.gz 48569 BLAKE2B a73707e2fd699b53e38ddc48710a73b945d4e102743567283d7351c92c513e4e57a32c409267593a2c5808caf811b7caeb555f8ba2762f1cc76a421aceff0e95 SHA512 c4bd56ea14e520ea9b116e275009f2089e5c434d6894281215b09d07572b2d3190c3c3eca015a2933328d704afb7d443a66e858b4e6904a3d4d45378b35d22cb
-EBUILD sxiv-26.ebuild 1253 BLAKE2B 2d1902c7b886d7ad406ca58000b5f7b4ac5f54120f1ffde485beb61037721be7fe2fb2daa71b6946c985036873193c69e25c0f434989c70f079e5dba59817fc8 SHA512 91f8c4a001aa5dbbafb581e1f01fad0976153a3bbac738dde5f3b5063b570a05deee87fd488d18eb329978f1f65335491af36cff10755460883c68695713e044
+EBUILD sxiv-26.ebuild 1260 BLAKE2B 5633e12f06e9ed05d1d7a2b1fe0e9d6e0a7bf4a703d72863667391bd0d7d0d72ed951fef4575110851f1a3603c9ebe9f06295f4fa7ce660ce2c4344cc099e71b SHA512 6458250f764b7addbe29a6bcdee9834e7b3408bd6cd22c6ce9363c91c2a0699ce23878b926021335863fb9d961de44e8f3e5a9fbf1787e079534c6c442c4db20
 EBUILD sxiv-9999.ebuild 1257 BLAKE2B a68f1d5869ee8b5ddf8fdf3ed2f82b993259fbe934cffd6d759e451e0f872f6b61f5eec19229f5dd680f4ffa693dfb6477dc0a4115b74c11b4c48b2fe77fc4b5 SHA512 c67ffdfa3e6ca0b664cd1e997d2dd5d6c40d56922e67b7da084bce6ec34144785120c8e7058190e46e076354401340738962747d2e92e1a36de08376de6da4fb
 MISC metadata.xml 330 BLAKE2B f62a202c3b6038a813d234030e90aef9a653535a6b51cd70bfd0a72dc757ebadd61b2b54d305880d6245dcf92de13d42a3d71557bed05e2ec2e30d271b22880c SHA512 acfcb0221253901ec0dfcf0b6541f1f6dc5cae89d27c508bcf8ab6d6cb664658e047c3914c3ae476ce4a23cedde746139b66c23e5586fa50fdc401deebb6ffdf
diff --git a/media-gfx/sxiv/sxiv-26.ebuild b/media-gfx/sxiv/sxiv-26.ebuild
index 5c0a4169043c..49baff22c64b 100644
--- a/media-gfx/sxiv/sxiv-26.ebuild
+++ b/media-gfx/sxiv/sxiv-26.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/muennich/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ppc64 x86"
+	KEYWORDS="amd64 arm64 ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Simple (or small or suckless) X Image Viewer"
diff --git a/media-gfx/ueberzug/Manifest b/media-gfx/ueberzug/Manifest
new file mode 100644
index 000000000000..10463df4ed9d
--- /dev/null
+++ b/media-gfx/ueberzug/Manifest
@@ -0,0 +1,3 @@
+DIST ueberzug-18.1.9.tar.gz 36411 BLAKE2B 96a925cc2212512dcbf05aa47015c2611f9f36bcf3dcf65d62dc6212c567165faeb798abff55b092f174fd57ff5740734dde74006af8cd7e974598813c8c3adb SHA512 ac28081a26ad025f8caf34d694c0b56efccaac376d7cd181ab7df3f3b435fd521a263defcd749bd3b2fff62cc3139e26054cccfe0fc76bd9cd2ccaaf34a7e0ed
+EBUILD ueberzug-18.1.9.ebuild 676 BLAKE2B da1e0fdd6b79888de55646421ce0c52702e14724aa632a1ab22df7521d5146df54deba09fe814ef7ec221f8b89309c1a38da190ba66441ac3a5d180c054776ba SHA512 a1d66dd5c257e781a0975960f45fd94a7386201ffb5bd996fbae2de0e895f8a53ed6a47d829668c633cec4f213e0cce2a3b8bb0364291cb78ed7528b5478077c
+MISC metadata.xml 372 BLAKE2B cf6850d70cb7a2653872a3d11bafb347a2359adcae22450d0d25fe94a392b3b2faeb1b5d914a41d69e16bbdfa3a42df6c0285784924bfbbf8908cdb5925e89ed SHA512 505f0cebc12b2afcd7db5623d3354890c710e3b5ba0564d0d65dad7524e68b83c11269d321194ae844835aa1e132ff08221b25d1ccedcbc961d75f267d000d82
diff --git a/media-gfx/ueberzug/metadata.xml b/media-gfx/ueberzug/metadata.xml
new file mode 100644
index 000000000000..8c2e145137ab
--- /dev/null
+++ b/media-gfx/ueberzug/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">seebye/ueberzug</remote-id>
+		<remote-id type="pypi">ueberzug</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-gfx/ueberzug/ueberzug-18.1.9.ebuild b/media-gfx/ueberzug/ueberzug-18.1.9.ebuild
new file mode 100644
index 000000000000..b51f5eed87f3
--- /dev/null
+++ b/media-gfx/ueberzug/ueberzug-18.1.9.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Command line util to draw images on terminals by using child windows"
+HOMEPAGE="https://github.com/seebye/ueberzug/"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	x11-libs/libX11
+	x11-libs/libXext"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/docopt[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/python-xlib[${PYTHON_USEDEP}]"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto"
diff --git a/media-gfx/viewnior/Manifest b/media-gfx/viewnior/Manifest
index 1e243432643b..55e01376ec61 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 1022 BLAKE2B 2fed3ab9103e8f4c46b52f5818087778e496dad4f979d456f003e9d2e4b8704168ef6954128a692df28043241000d0291ece9baf559246beb4f7735a1e728693 SHA512 0b28968d170e34e7500451e22fecc10adac21d847131999fd23995a5ced06aa4c5cf3faa3340f5e06a05e7ebc06b5a5a8bbd9ac5140f04e493464ff1e1973ab1
+EBUILD viewnior-1.8.ebuild 1029 BLAKE2B 96cb9f5ec298026cdc64e03830f7d5397bd735aea277f3407d940c74cb35981ae6bbad253e227481a37d534b066ab62ed35e77158ed4813e9c866fc27a4cfc63 SHA512 104eca03037e51324dfce39b5bf9460f76f876e757095b93211a49a613a033af60d811b1b40e2b926885a76e8fc1a01a741ff4188184b30dd3405f8b2478f196
 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 bfc5e7d7d105..176819f4274c 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 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-gfx/xli/Manifest b/media-gfx/xli/Manifest
index e33590b430cc..657c5ddcecfe 100644
--- a/media-gfx/xli/Manifest
+++ b/media-gfx/xli/Manifest
@@ -3,5 +3,5 @@ AUX xli-1.17.0-fix-scale-zoom.patch 1942 BLAKE2B fefbcbec8d9dba30fc1435fc998e371
 AUX xli-1.17.0-libpng14.patch 245 BLAKE2B 681fd31f8d7f812272e54dc67de31ece9a936f4608d339e9d63fe7bdc2ba257d20d7ce01fb00b120662557bdfa44b908bbeb4e136665abdadeb062c1425e7af7 SHA512 079162bfd639994ea6553b49f9370faf5becee8ec1e99a1e71f43e32968f244c5a393433fba8920a399a9eb8bc4a3ec6097903bd2eaff46bdeef55f1f90d1fcf
 AUX xli-security-gentoo.diff 6940 BLAKE2B 907fd85a2b248083380ae2210665dd9c251a7d528a93b1e2dffd149827f4900cab54b84b8a0be67c198a73d180cf31f4c8cdd7c4a37a3a8c5b30718babd5b1bf SHA512 b992219eb4b89bfee57429afbf67be6d6a04051b50de6e814c84c1adb209494d2faff15a228b43a992530fbeac83f15a94e9c1988982f98eabf287c26716671e
 DIST xli-2005-02-27.tar.gz 201011 BLAKE2B c16f40368a7c55cb7d31777662e4e9c1515232904df4f6f0e7fdc4daf44fdafaa0a3d9d8298493dac9352fa10eaf5d2984f9e66832ca0bfd07d9e6d551f4dca5 SHA512 132b28396ebf3832dc35ff5fa7c102539ef30a194512fe6577ce1432bb84ecd7b4368e75eaf59f26a806900f63e1bfb9a93487ce1ebe3cfef2199256a783ccf7
-EBUILD xli-1.17.0-r5.ebuild 2070 BLAKE2B 924a33bcab38adf00affd98b624a622b1972731d1ba29febe8ab4a03b733cd9e37f2a04facc68c9a2d34274d269c36217ce05a5b0518edc52561b30d403e55e3 SHA512 5e86436169daab208443f43119c8823d3bc3a82525c25c1211333e0d23a22d9901c7b5acd6211d16ac1982cca3e4405c4fa49546f0bd11318cb0ece5dc25caaa
+EBUILD xli-1.17.0-r5.ebuild 2077 BLAKE2B c6ef0bf5fcaf4d33a04f783c54f55e0f6eae2c0eaa40f633cbc9340e7af6ff6cd6ba0b11534fc558b850c6f2294852805f495648e7f86a12ea106b1a2b90e6ee SHA512 b510552f84f5c4110bd93be54b83a10a5a79e12770ed620f5e061777b176d978131c32021d78621c709e7a25cd25b96a506dd25a15779ee7c67c7d79f7cefd91
 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/media-gfx/xli/xli-1.17.0-r5.ebuild b/media-gfx/xli/xli-1.17.0-r5.ebuild
index c04527ac7b8b..a62e12b505df 100644
--- a/media-gfx/xli/xli-1.17.0-r5.ebuild
+++ b/media-gfx/xli/xli-1.17.0-r5.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${SNAPSHOT}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	app-arch/bzip2:=
author	V3n3RiX <venerix@koprulu.sector>	2021-12-22 14:08:05 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-12-22 14:08:05 +0000
commit	93a93e9a3b53c1a73142a305ea1f8136846942ee (patch)
tree	b9791a06ab3284e27b568412c59316c66240c682 /media-gfx
parent	2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff)