gentoo resync : 25.09.2021

43 files changed, 505 insertions, 167 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index ea1f28d0c21a..3130193b3edf 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 7612c7d1e8eb..3744316184f2 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -15,6 +15,6 @@ EBUILD blender-2.83.16.ebuild 11648 BLAKE2B b2cc50214b9430bb0692978eb3e6d593b509
 EBUILD blender-2.83.17.ebuild 11612 BLAKE2B ba8efd31631332441f6af8a60ff6e8ec79ab60abdb5dfdb7fd1ed364230e0a5fc3ed8ba6993d14682523eee81f9694a1161e585a6fc370e618b3d224560b28da SHA512 7732c5538fdf6bd112169a84bda960324d31a0d6376e20f71394668ecde182ebe8d4039212b9bc9e8b3b9f0b60235391bf95ffa77b10e323efb1486b5e97d39c
 EBUILD blender-2.93.0.ebuild 11804 BLAKE2B 18040f539463ff3e853f998bb2ae0c5597b1b1181765c9d29ac84ba0f0f0b0d29ec39559c2c6cac44a17b43b1644aeef394f3dfa4f3d38f49071d9602dd6fcdd SHA512 2aa637e5833c7d9081aedd75cda876a40280e4c0071cbed07b1c66ef0d1f0c9489a4c52eae64429049d52460bf09951fe16839597a6dc59580764562ea5b1cf0
 EBUILD blender-2.93.1.ebuild 11804 BLAKE2B 18040f539463ff3e853f998bb2ae0c5597b1b1181765c9d29ac84ba0f0f0b0d29ec39559c2c6cac44a17b43b1644aeef394f3dfa4f3d38f49071d9602dd6fcdd SHA512 2aa637e5833c7d9081aedd75cda876a40280e4c0071cbed07b1c66ef0d1f0c9489a4c52eae64429049d52460bf09951fe16839597a6dc59580764562ea5b1cf0
-EBUILD blender-2.93.2.ebuild 11809 BLAKE2B 21c520dae1f927c99e33bb21a65efc207980a3f74cb26b34b2d8234bab47e8881658d85a2949ba04f07fb68cb80eb3eeb91b9bba8fc7127aa7dd7d8822acb4e1 SHA512 f0eade803234f6b307b542227160565ebdd16f13d8a7642d394e004665745630e02a5e9a8bb91ffffaec039852d27b939ec51113bc07833e01503b8c75ea9780
+EBUILD blender-2.93.2.ebuild 11821 BLAKE2B 881083352d4401da05a37142093855b41b0d2bad55d0cc934b544a768c63a004cb380819929b967174b66f3a930d9e14ee7ab330d85259df13f74cc2f98ec26e SHA512 fbdb7297f87ef59f810c2dc8750537334603f75678baa6544760e2624af122ccd01588b0b889c96c76e334f9b82ba3ab8d5d6bbbcec477ccb96c94bc53b3faa3
 EBUILD blender-9999.ebuild 11789 BLAKE2B 6205ac694d12f81dc90ca921a0b2669ae459a6196d5590c79f2bf53651e40588cf54398fc92d7bfa440e1ed69a5377c77bff1420303d88f37c5149f046dc52a4 SHA512 05aea1059e56bf7df93bfc65757006ea3157443dd975ff9ad4b97de87a3199daed1e57abfa776aca461be540b75f3476a0d46746cc428d48c8ad220a72e810ac
 MISC metadata.xml 3163 BLAKE2B dcebffc7d37a5e2214121c5dbee2f81f3c6e9bafcbf58c6f9d0c38e6ab5fcef25e314fe7ab9d8127bf69cf6bf05b4b8bcff28973229e4587a7b3231f9384f08a SHA512 7ad59b0bc1d3c8ed4cf6528c74eb348b2ede12eda4f012d7961b25a3dfc398a8abf75f033d94c8b7c92684b0769e8fe439b3e85dd082f4ea68f87f1851639dc5
diff --git a/media-gfx/blender/blender-2.93.2.ebuild b/media-gfx/blender/blender-2.93.2.ebuild
index e71a2a7ce9f9..d8f42c666bb4 100644
--- a/media-gfx/blender/blender-2.93.2.ebuild
+++ b/media-gfx/blender/blender-2.93.2.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://download.blender.org/source/${P}.tar.xz"
 	TEST_TARBALL_VERSION=2.93.0
 	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2 )"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm ~arm64"
 fi
 
 SLOT="${PV%.*}"
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 9eb4ebf03fb6..96bee14767cf 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -4,8 +4,10 @@ AUX darktable-3.4.1_libxcf-cmake.patch 788 BLAKE2B b6ecb84de804b0bf16f907f825d93
 AUX darktable-find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b59cc73834d734c454a7c561654bc27f052de55db6c62f454927b2c701b7f4f6c52d5d2fac0b7c230b90ef89bdc9431856bd4ae69a SHA512 93023a318158850a5bac4a1d871ea6e69a3c9f2bc57f8af47bc83bb131f96e8972c23b07945df2eddfb05bffdd950e8250da77c47d1543b776a7e9405adad020
 DIST darktable-3.4.1.tar.xz 4456192 BLAKE2B 7b573db69cb32496ad79d6636b50d3b2db471376c2486d356e1da2740d48644821265c3249a40603a521d588ef89cee33e31d7a6b216f106625ca2aa3f8bfb68 SHA512 3376c5e2aa52d02fcfc45d9efb1a60a7bee6210dc81e1131f2c163ca2059860f7e3a64b5cfd05117dcaaf8c7810d08a84058a0b64ef6fd24c90bbafde7ca4f6f
 DIST darktable-3.6.0.tar.xz 4691608 BLAKE2B ecbb6b4b4aba1f499f8d459304f174f348c19304c0efb898260d3037bfb9c82ea51a92e3dd98c8b0d2dc525276a91419b41b3c610f4a18b905cda7ccd1bfc554 SHA512 8e458406c3004a52cde096039358eb044d370e8b9d5cb70a6457fc1ad165f062af073b3f0c8da92b463db5a4df37e7a4ee32eb5ce9dfbfeec3e0c13c70ec5f8a
+DIST darktable-3.6.1.tar.xz 4685928 BLAKE2B 8ff6224e21b44f9e881adb8f020a2ea5ff5abb2c38da1aeaed312f89e548918c6d3bba210dbb4fb6901fbf0872c6e14c2e12c5b5b27932914a00428a709e8965 SHA512 d53eb8472531c62ceebe97769c6e53f7c9ed6efb404905295f00b5bf547fd0f0c395b8b926ccafc78d6cf9fed0745da655a77eeb84d92fce5d6a7a576f277416
 DIST darktable-usermanual-3.4.0.pdf 16241791 BLAKE2B d6fc232c3eddb5474e36ce1fbc02c3472291e5ebdf2eae09c419215263f615546a79f88ee9d252b387fc5e4f2c9714398deab8de176b3d928b6a17c2878cef56 SHA512 fd154c02d5e0c63d9698b2f80a7439a191f4582b717b2f163923eda40aae1ebe8aeaf1a70efdc423eb8c8269d74fc0e23df8c9c0269ee8f5a357611501c3547e
 DIST darktable-usermanual-3.6.pdf 34290182 BLAKE2B 407223f6dfc25e53e2de31a05b0468a3d50ec5ccf836fa4cca61b16d43e91827c0276027ea73dd543750f240889b7325538eb474e19df86eeff4d380bf0b8829 SHA512 62c2723e5fc0434703f21bc4f5efdb997db1c0cfb800a9df217d6682325949ce18ab458a179bd20a888b73a7bd384bbbb2ea8888cba26278510abaab1e0cc335
 EBUILD darktable-3.4.1.ebuild 4458 BLAKE2B 232c71684688619c4f6248325b4805f2fec2840fd3198651c871eb9c73f0ef82e85ed0a985a89c5de3133939b469e40bd40091d72a612172b775a2d3c6217e4a SHA512 0264c756bc1dee91a6d6a447975fb0bad98995cd4974cde9686a0cdea3858b8a01498f3619286bd9d7651f4ded636e6236493605735a4394d300c4927536eb4b
-EBUILD darktable-3.6.0.ebuild 4429 BLAKE2B 7050dd4ed9f6d822c0f37a39fbc03bc092708c49a6529407cc9aac514e3691cb3f11145dfe4d8793f8901126b99ab40ba92aa9a6b18ea3e859657de0bc9957b1 SHA512 1a7ee2c8ebe3de019e4bb1962b76fa1a2df3c7c20891d1c8d217b0c9ceba30668415951ab7e3c85c39e8790a0af1620e9b67a1b103d50171d9ca52cf59957650
+EBUILD darktable-3.6.0.ebuild 4427 BLAKE2B e5b2ab93edd3ce2b9669991549d0b7e91c935bb68c06142600e0c09c44b8bee5e6a7edcea3e9dbad9e9a3a5fdf3688be429d976bc8c3989b88ba43ebb5044980 SHA512 58169157c246db68d2ffea5ef93101886ea36a7f1175a2c854a1483459f4b3e1ebbed790dd810af3c0cb2fcceb6a7e260d95766ac4dfac3b5fb603e0452ef422
+EBUILD darktable-3.6.1.ebuild 4429 BLAKE2B d1d41fe243e1da3ac5860760d205e34b3df3e835e40c4162542a5287cec2bf2463b3f873d60ba10648c13267e5d08a7dcab1d8a0343ad75e270c202da3ae87a1 SHA512 ba41b8fe4340fad5f51bd63e73a5ad8b1142f70aa7ac644ccc5e3cf477d842f30299997d8b879d306e93e89e17f3f422af4db3ea948abf13310af0bbdc699eae
 MISC metadata.xml 1152 BLAKE2B c43582dd3a0607de751a816c9856738d73b504422d6b21745a8f7948e2238a6be5c178bb224d787eb712aef222a592c6a712239a4a8dada4c66a453e158fc5de SHA512 8a20f53798359fec9eb45c1d2fdbe6cca623b2308f8391ece25c4100161a2056b52c44f3eba91d6d3c083f49843bac8e355982998d2c4217efdc976eb0d1a14c
diff --git a/media-gfx/darktable/darktable-3.6.0.ebuild b/media-gfx/darktable/darktable-3.6.0.ebuild
index 08c0e892bb98..a92c6759df40 100644
--- a/media-gfx/darktable/darktable-3.6.0.ebuild
+++ b/media-gfx/darktable/darktable-3.6.0.ebuild
@@ -23,7 +23,7 @@ else
 	MY_P="${P/_/.}"
 
 	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-		doc? ( https://www.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
+		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"
diff --git a/media-gfx/darktable/darktable-3.6.1.ebuild b/media-gfx/darktable/darktable-3.6.1.ebuild
new file mode 100644
index 000000000000..da867cb77ccf
--- /dev/null
+++ b/media-gfx/darktable/darktable-3.6.1.ebuild
@@ -0,0 +1,168 @@
+# 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 cups cpu_flags_x86_sse3 doc flickr geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
+	lto lua nls opencl openmp openexr test tools webp
+	${LANGS// / l10n_}"
+
+REQUIRED_USE="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-3.0.0:0= )
+	webp? ( media-libs/libwebp:0= )"
+RDEPEND="${DEPEND}
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-find-opencl-header.patch
+	"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
+	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
+	"${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
+)
+
+S="${WORKDIR}/${P/_/~}"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# Bug #695658
+		if tc-is-gcc; then
+			test-flags-CC -floop-block &> /dev/null || \
+				die "Please switch to a gcc version built with USE=graphite"
+		fi
+
+		if use openmp ; then
+			tc-has-openmp || die "Please switch to an openmp compatible compiler"
+		fi
+	fi
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse3 && append-flags -msse3
+
+	sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	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/eog/Manifest b/media-gfx/eog/Manifest
index fc40ece4b680..68e3309cc710 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,5 +1,5 @@
 DIST eog-40.2.tar.xz 3601788 BLAKE2B ab66481d8fa5c076f0e12c3f16ff4a67d3a544b7483a2791833ea7d7f605898b20e8d8ed100a538e7a7f21a1359c74b96fa81aaf8712bfdb419df37fe711f7bf SHA512 e28c2deb320436606ebf0a971d845e536197ea23c2e7869d3d10dfe5174c8177c7977da37bf01178dc87f875cff2c3f0fbdad63c77578c2334dbfd9d354c19ad
 DIST eog-40.3.tar.xz 3602276 BLAKE2B 56f0fee5677730e032420fbc53c5ae6e6a5e1461d66c2e8dfcc7e7f5055d704223005f6c5329fd3bae11a002f1429729820fa52077c63e2d91a55213200a130f SHA512 5c6af597b35adcc18846e2dbee80eaf4b3c07138826520a9f6c2567df50c20379f804f8b878c7da74dd6cab25249555113d785653c0239353e410506611ffbab
 EBUILD eog-40.2.ebuild 1591 BLAKE2B b021bdc30c23209e66970052e2a05b295013fd53765e966436cad01af8d33084306accddecca864ed3ea07fb97dd675b74b6e76d15a761f0a1f9fd8eca82d311 SHA512 38158a2a01bae2503b81aa8ed540c7b0f45a138915d1fdf5eb5cf3d4e661769cf2d92d89f743256922436dd2ff1a69a21902dafbcb6de89627d6bfe3d0b6d598
-EBUILD eog-40.3.ebuild 1593 BLAKE2B e40e84edd2b76c87e8fa42b84fa255d470c13fed651263c0237a8c645df7affd497b72394f79c143ceb1067c7aa871855a3331e1a2f1800904e2092356938907 SHA512 ff4b3988b9d508c1df713d2f720b36084c23dc50f57f20ddba970f543ac3ae45831553e46a2586c073d6af1cd4fde0816c40efffd67904f6546a5bc75e2c1d64
+EBUILD eog-40.3.ebuild 1634 BLAKE2B 74507934828e0dd523edc825d4944d35e7889cf5ab01b1ac76061fa4019438976cd4ca07f79c4ca4a9f08eade429cf41b7c2e0a464cba887a8390512d3c6cb81 SHA512 04e8c21ca043a61dc44210a0ddf5fe1b776fc57a5ca18001fff53843ede378a5fa54ee5bf6c220e8316b9e6197d9ab8dc012b8e8f91ad307dac53f897fc04011
 MISC metadata.xml 482 BLAKE2B 03780ad7b79dd3b35ee6a9b3ee95bceb94ebbd97de711912ba0f5e61ef4e25d9a20a474011cd3c5261c82757105bed5383f16259468dee80bfd6cdcec13b5828 SHA512 0c51ba4ac4859bc5e6361862282a76a98343ad3e46dfac04e088c79ec25683e820ea907991212979b5fffa0b757a66ea33ddfcff7a8012e42e81dba0e943ea39
diff --git a/media-gfx/eog/eog-40.3.ebuild b/media-gfx/eog/eog-40.3.ebuild
index e0fd2241d634..bde892982eaf 100644
--- a/media-gfx/eog/eog-40.3.ebuild
+++ b/media-gfx/eog/eog-40.3.ebuild
@@ -55,7 +55,7 @@ src_configure() {
 		$(meson_use gtk-doc gtk_doc)
 		$(meson_use introspection)
 		-Dinstalled_tests=false
-		-Dlibportal=false # Not packaged
+		-Dlibportal=false # As of 40.3, all libportal usages are flatpak-specific
 	)
 	meson_src_configure
 }
diff --git a/media-gfx/exact-image/Manifest b/media-gfx/exact-image/Manifest
index 92f2616437e8..7ec9b5343993 100644
--- a/media-gfx/exact-image/Manifest
+++ b/media-gfx/exact-image/Manifest
@@ -3,5 +3,5 @@ AUX exact-image-1.0.2-g++.patch 936 BLAKE2B 6ab787c1393228bb1671c8a2d7b76969fcd1
 AUX exact-image-1.0.2-gcc6.patch 2795 BLAKE2B 17282b91baa020b94654c92d87611001584f82360303a56e70cb8f081caf400394a367982e115bff094dfe11a0798503a606de106f1bf6427b57a9ede1cd6ed5 SHA512 ef42fccab6d0958df2dcf86578f9df1f84254515c2bea611f256e23227b9d6dc917467f2d8f54230f9386e9726152c6bbe4ab4f3d117e0da5a3e99b00e93e348
 AUX exact-image-1.0.2-php.patch 481 BLAKE2B bf9a3935813098c5248bac843c580d61266b60cf7063824c90e5b87df552d2b0fa125648f4ebcba46acc29d72f9bcd0a0c647467ebdc0d433616da5d8c16225f SHA512 b984095cc071558ce8b7d4b7db2915f793ed8d468f38757d2faab0f7ffc9e866a06838a5d0c578f67e9cc3e88f2bd07b0cde00ce95d909cdc07e5fbf24f3e62e
 DIST exact-image-1.0.2.tar.bz2 322174 BLAKE2B 67afefb4c5a52416459cd4ac6198012eb6d7895a73ea8363fae05286c7e7f62aa1a02166985f53b5638c7dc7b23b4dc1fb1c7b2272a9dc595ce329a7083ee1b9 SHA512 8ba5a198a236ddf5fa58f40c80f32ba9d300376c637a13a7acf3d2db7906fced373b33a7ecff9cff4d09d8b21de9ce1fb9f5bfb1f4522557bd01af0e3d6dcc65
-EBUILD exact-image-1.0.2-r2.ebuild 2414 BLAKE2B 8093c62f2d6fac896ca82b2a51e6c3b30224033eb176e8e7a6d891859020973215cbfae275ded00edfbb03ae43e0db69b0d034120b726a5a1bb9429b8106f8d5 SHA512 db192cd8b8859b873398ec1ed288a45ebc28a4476de6d9db8d80a41e0660d7f6f07200576208b0cb6495fb461fa21a3aa15cb6f440679bf7ee83d1c38ea95907
+EBUILD exact-image-1.0.2-r2.ebuild 2405 BLAKE2B fdb0b4bb689fb0ae31afaeb51e3e248c08dfbe2753040b12a49bafcb400e7cf34b3915cfe79175776efe6fd9faf06c930fea0ac4056d3e1b98f3d20a40e8fc67 SHA512 5745dd9e8f9fd8f3dbfa91b02028162360632bdb359d3747bce530e1e837bc54230dc7962b6c46441ffd2521bcfd1ee8153f0b0207c3fa4f6efc00a2e4762d91
 MISC metadata.xml 330 BLAKE2B 468dfd9c9bc2687f285c5a7496aa989843c32929b4c410253f1d046df2e2416604f6ff8b1cb4622e85e27f13f26cede91825d04b7748cb4f74fdff13478046c1 SHA512 01bc80b3dc7ed3ff2f3402ecd3214793d18267be1e1e4c4b42718b6f6a4982404e243771917fbbae7a1bd6b12a1cd80534d9738149ec9b2a88bbc1ad62fcdf14
diff --git a/media-gfx/exact-image/exact-image-1.0.2-r2.ebuild b/media-gfx/exact-image/exact-image-1.0.2-r2.ebuild
index d7c17e6ed530..32d67a26443a 100644
--- a/media-gfx/exact-image/exact-image-1.0.2-r2.ebuild
+++ b/media-gfx/exact-image/exact-image-1.0.2-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 LUA_COMPAT=( lua5-{1..4} luajit )
 
-inherit lua-single multilib toolchain-funcs
+inherit lua-single toolchain-funcs
 
 DESCRIPTION="A fast, modern and generic image processing library"
 HOMEPAGE="http://www.exactcode.de/site/open_source/exactimage/"
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 5b1b498bfd5b..aed11c21b5c3 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,4 +1,4 @@
 AUX exiv2-0.27.4-gtest-1.11.patch 1489 BLAKE2B b20cee53dfd712389f553402779d839dc6a946758400c47a0703e20a8480d8c15f0424b6a9c4adef82ea68be8e62931bdddfa26832dda539e64d18b6b959ccb0 SHA512 731b4a027b6241af31b911040432bc79794137146a71a3431a597b52d477ddaa5af0618f95a730ee672db00a6a2a7b6cd4c221443d45059ee7e92b84690739da
 DIST exiv2-0.27.4-Source.tar.gz 32055837 BLAKE2B 9c31c08fafb38895fa7812a8c7a195335e80a6b9c15f7b5f3750f5ab30903c4c3bbf9aee5a7293a7d437d15a49a9cb7b45a3133cbb36ee62081efae0dd67b61a SHA512 f6798baafb36a54ba5bc65c2d28d4f4469e298582c90b417eb437b5dbda8e11963fb3314e8419717b3815ee8c3a68955cddc79e45351d9f2c165a0b73eb7b7be
-EBUILD exiv2-0.27.4-r2.ebuild 2759 BLAKE2B 47b78b3c4f6fd121f946a943532c52c2db856dbcc2de8c53e1758c36d79b72da108bb779c494ee70b3c0046f6357f4c84051d411c5dc07b23f749c6b2072e264 SHA512 e5c22ef99eb75ce41fbc912af8a6c1841450f7584aa5a63a260f905242de60138d94f3a6eeee902df9b78ab2c9405b4f64537e4ceb444ffbdd57114b5649b094
-MISC metadata.xml 493 BLAKE2B 8cc9c37f27806361111ba86b8ae4c49bab5993e0983a9ed264eb1f2e2342e4d6bfbf15708f880c3d03525d99e84f458ea84f445ceef3ad75c857bf592d04873f SHA512 e065d21a7425f80b689ef4097f770af90d19e97dde812c67c7fe4868f492c7ac2a5a45cae1799084e0662765450328c2b6d3eb34976559991dc51d5429a58d0d
+EBUILD exiv2-0.27.4-r2.ebuild 2800 BLAKE2B e62691994eee7eece7b24fc4c7e13654e237a9d4858ff166550c4c14a4b01285b303370c98fdade67cc63b2f3ab4d19be7da0a05d6122de4ce451633652d2504 SHA512 74f303ba879c4480dcdfa1eb8a6a9eb718e4b394e1c79d9ba544651e69d07bc3ce0e0fa159ba0e79ea6d9c863c50286293ec01bf51cacb1ba7575468c53e0dc1
+MISC metadata.xml 555 BLAKE2B 307d753da1e5a2f09b4d95de756ad3f4ef905a1c2f9b2d7dc1cbc5e0e93718bb376dcbbd7f3abcee20697dce519ab795af7b71f8826ad7d55fa1cd13546dfbbc SHA512 4c504152172835df649036f2aa6f80a7ac12e2c034bc44e762c43bc39a72729e8c7a227ca59066c9b3ec3911b1c8f2a3633449cd611911f8f33a6c07f0a3420d
diff --git a/media-gfx/exiv2/exiv2-0.27.4-r2.ebuild b/media-gfx/exiv2/exiv2-0.27.4-r2.ebuild
index 1f03916fcf71..7acbc098873b 100644
--- a/media-gfx/exiv2/exiv2-0.27.4-r2.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.4-r2.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.exiv2.org/"
 
 LICENSE="GPL-2"
 SLOT="0/27"
-IUSE="doc examples nls +png test webready +xmp"
+IUSE="+bmff doc examples nls +png test webready +xmp"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -78,6 +78,7 @@ multilib_src_configure() {
 		-DEXIV2_ENABLE_SSH=$(usex webready)
 		-DEXIV2_ENABLE_WEBREADY=$(usex webready)
 		-DEXIV2_ENABLE_XMP=$(usex xmp)
+		-DEXIV2_ENABLE_BMFF=$(usex bmff)
 		$(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO)
 		$(multilib_is_native_abi && echo -DEXIV2_BUILD_DOC=$(usex doc))
 		$(multilib_is_native_abi && echo -DEXIV2_BUILD_UNIT_TESTS=$(usex test))
diff --git a/media-gfx/exiv2/metadata.xml b/media-gfx/exiv2/metadata.xml
index 1acfecb60cd3..06b54e427aa0 100644
--- a/media-gfx/exiv2/metadata.xml
+++ b/media-gfx/exiv2/metadata.xml
@@ -10,6 +10,7 @@
 		write EXIF, IPTC and XMP image metadata.
 	</longdescription>
 	<use>
+		<flag name="bmff">Add support for the ISOBMFF format</flag>
 		<flag name="webready">Support reading metadata over the internet</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index e187e6527e5b..f1252900e327 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -5,6 +5,6 @@ DIST fotoxx-21.50.tar.gz 8693590 BLAKE2B d3bed82c3e856d6ce2433e0357955f32d462d0d
 DIST fotoxx-21.52.tar.gz 8666385 BLAKE2B 3d994cdc7ca80029df00b661409d9ce64de6f568e90840d92576ffeee9f305175875a5b506a91ab9be394850817d64541c96d8e2cf10fac5a9b0afa3ebd4855f SHA512 da73c176456ff904093c648565cc69d270e5282df5687a8302614624ceac565b3131f035190ef7b6d84f937b84409cdc02a650bfbe7d9051200d19b22bf0d0f6
 EBUILD fotoxx-21.41.ebuild 2260 BLAKE2B 5d3fecfa601f41c29f00474e810b928dc9bd12218be8d4acaa886640062b00966385884afb449b9fb15c804b1f3df11bda98bc4b2e70a68805411acec56163fc SHA512 342230c7481c9134b8ee93f774f9433c8ac4121714413cc518a2db1bfd3798e6a3a88c880bb035e4c55ca2e325f772ec04f4bbec3ce441894bed75e657ba0159
 EBUILD fotoxx-21.44.ebuild 2262 BLAKE2B 5716c0160390c9ca7efb4b12208249d96ffb6751220d4153bbb428927e279842d1a8cacef93524ab46b326a64193c248966711fa0bbda551d836bbde85c624ac SHA512 7fb41c1418894314bbc8e5b06101ed27d3231d245cbfa8366bdb3bcd28a310e673c2cfdfca4be2c3900e6ae6a3bdc42359f383e619f03d54e529c7cf9dc14918
-EBUILD fotoxx-21.50.ebuild 2262 BLAKE2B 5716c0160390c9ca7efb4b12208249d96ffb6751220d4153bbb428927e279842d1a8cacef93524ab46b326a64193c248966711fa0bbda551d836bbde85c624ac SHA512 7fb41c1418894314bbc8e5b06101ed27d3231d245cbfa8366bdb3bcd28a310e673c2cfdfca4be2c3900e6ae6a3bdc42359f383e619f03d54e529c7cf9dc14918
+EBUILD fotoxx-21.50.ebuild 2260 BLAKE2B 5d3fecfa601f41c29f00474e810b928dc9bd12218be8d4acaa886640062b00966385884afb449b9fb15c804b1f3df11bda98bc4b2e70a68805411acec56163fc SHA512 342230c7481c9134b8ee93f774f9433c8ac4121714413cc518a2db1bfd3798e6a3a88c880bb035e4c55ca2e325f772ec04f4bbec3ce441894bed75e657ba0159
 EBUILD fotoxx-21.52.ebuild 2262 BLAKE2B 5716c0160390c9ca7efb4b12208249d96ffb6751220d4153bbb428927e279842d1a8cacef93524ab46b326a64193c248966711fa0bbda551d836bbde85c624ac SHA512 7fb41c1418894314bbc8e5b06101ed27d3231d245cbfa8366bdb3bcd28a310e673c2cfdfca4be2c3900e6ae6a3bdc42359f383e619f03d54e529c7cf9dc14918
 MISC metadata.xml 851 BLAKE2B a6c60b79fb5646c3bd7d6959d4a1b974ee714bf6ed64f205d9c00d684b3da94672005658336c1c5fcb903605d11c9a5607616151b2f6262f3173e15b8fc44655 SHA512 2794ae92afa076875c7f725969efdcf9cb84435d0ea033adc28f5860a69438b754f4d22b0db27dc7392683439e51b51ae581a6da450719276e8df51a2a306ad9
diff --git a/media-gfx/fotoxx/fotoxx-21.50.ebuild b/media-gfx/fotoxx/fotoxx-21.50.ebuild
index 12a78336fe75..d9e91deab328 100644
--- a/media-gfx/fotoxx/fotoxx-21.50.ebuild
+++ b/media-gfx/fotoxx/fotoxx-21.50.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://kornelix.net/downloads/downloads/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 # For required dependencies read doc/README, for required tools read
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 711ca7857e3d..e04036d96fde 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -2,11 +2,11 @@ AUX gimp-2.10_fix_test-appdata.patch 902 BLAKE2B 2b1a131d874d65422d8bdd44732b984
 AUX gimp-2.99.2_fix_autoconf-2.70.patch 1913 BLAKE2B 779ce5a54150ee2a89507420931f255c09602af36ab8176f7ae9f18a7c1feb12451e817d2a89251d0366af6db90f602a107108227c98ac99b73e16ddb7b1fd05 SHA512 efa8882896335d3ac4ae7fb8874b5bd568472ccdcaeaf1d771f6c6b815b138186016f39f5f2f30fa01c1018ad583649fcf564cc5a8bcece741092f7dbc22f5fa
 DIST gimp-2.10.22.tar.bz2 33152226 BLAKE2B d11b0ee8f0f24934383028a0b21820af30da6133814d64b67981888086f3eaa4378e474ff801db046f2fe5d380325ac7279df6e749d100219e2f6558c9bdf10d SHA512 13841ac4a186df47e4155095ca888a903b2db9e25a73fbb834fe981ccf915cb67a3e08506e5c13b6c5f35e27b1de24befbccf871e438b1a35f67f069bebd8fd0
 DIST gimp-2.10.24.tar.bz2 31546295 BLAKE2B e2b873313b41799cb9461f6cd2ec45dcb0d3f51fe3e2710e47be99be868fba962cb75afb47bc2f12e2d6090993d70f560f4d58d2614939a0d36cadc9191fa2a7 SHA512 828350ad5c53b8409463c24693821d78a1940f18c221249ae7b864ad9db5cf01ab41d6ec5bbefd96115f0e91809ecdc61451d71881b56b07920c442f4a514936
-DIST gimp-2.10.26.tar.bz2 31665981 BLAKE2B 150ae935a84aadea98d58d61e8c5ed3ec3d0083202085c8b75cfcd6de34f3b30bc402baa49111c208af2144e3006f162072cd2fd8027404e64c23d54d84d5daa SHA512 d99f4f3ff23faa9bd7e6a40123d22af7620e51dc7d01c4605b8fbd44fe9069f0753e69adceb0bdb24d93537e2fbdf83f9cac46aa9afe1d234a6cb679335ef966
+DIST gimp-2.10.28.tar.bz2 31675862 BLAKE2B b491b55d5adf08221feb7cee8b3adc1d8b090901e8f43b93a4d2c3d935ce1ca45072b0ccd6840e06b329fbfafc8fe5e3d6056381c5129203fa3c5e781cab0453 SHA512 587f6f46741672f0700fd642a5b779694d2d8bc8ad70e7677ccdbfc2266dc62203ed347d6aaffaa4b8e7d84a84a25f7d5a51507dfd64b21b4c05970856d3ab94
 DIST gimp-2.99.6.tar.bz2 30663040 BLAKE2B ccbdc2baa9e99a94e85345ce90bcba6ca56c0f264d3248d198009b730a5c810997b76c7d7a3cf131374316298d719a3e70c81ee7bc0a5e34beda1b112921807a SHA512 51ada696693ac51624ba222d1fff54d39bdc72a06de54f7c244b89740b77f7205aab44f1cec90785ca4196cab32f817e7390b4287a30f5024606163f24222961
 EBUILD gimp-2.10.22-r2.ebuild 5636 BLAKE2B ab208d7b8c28b52eee77ed8ba150264e7939308474a6adffa7372589f5b4d1347b1d25145d1f91aae4a05731d1a050e99cfe7700ae2ff455a67eca1cb61dfe8d SHA512 d9646bd07e014e6efa79782665b0d095b95476ede9ce15222428c53c91609b5837d925923aae8f3cad92b20043f0db98993a4b037e6bd866cd467753c49f20be
 EBUILD gimp-2.10.24.ebuild 5581 BLAKE2B 7639817275bc53b7e08b8f190aa11b2be6d62f2c12f46474fe67c74409fdbb0a4cc2bcaa8c7bdd04721f111ea52d3c8a950efb9d85ee1d22cbaab687207fcbe7 SHA512 c22ff9efa6044e6f0fba4094b0bd9debfb9752464357dbbe7c760ba9901ad36d479c1bbecfcae8c7c6b0bfecb8084cab970d8ee1d458122b2eb9f0b40a0b8054
-EBUILD gimp-2.10.26.ebuild 5581 BLAKE2B 6d8eaf4a6ecb37437f48b9d8648d50fc673d1f16b0660b9e948b323832501f6ea925cb52f33dda150d911c7a526a8a8b4322ed00be1c051fc155ee92fd56051b SHA512 b9a71feb722a970668561225c82c15a31728f93ceb63c6a6503a57e769af05fc1e28ac6c15fee65a4a38257c76a4ca3ca76ed31f14f79c9c468c6aacd83ad8ed
+EBUILD gimp-2.10.28.ebuild 5581 BLAKE2B 6d8eaf4a6ecb37437f48b9d8648d50fc673d1f16b0660b9e948b323832501f6ea925cb52f33dda150d911c7a526a8a8b4322ed00be1c051fc155ee92fd56051b SHA512 b9a71feb722a970668561225c82c15a31728f93ceb63c6a6503a57e769af05fc1e28ac6c15fee65a4a38257c76a4ca3ca76ed31f14f79c9c468c6aacd83ad8ed
 EBUILD gimp-2.99.6.ebuild 6827 BLAKE2B 9ea9ca8d05654e6e569e42930e3f65c23629ad0218aa26d7368963cf3675237ac7b85c61c745c1d8d97f77ab824f676289c4508618366d4e12084a7b8e021129 SHA512 feb1d24d9ff9a72e0f400a6215254ff780df2c4660b3b4f4e31ea56bbc8da4bed9b6dbe2b518eae91d2963ff9ee7df832a50336e2713c7576ac399f8c9bbc5cc
 EBUILD gimp-9999.ebuild 6995 BLAKE2B 77775a32a461e6147afe35b5e43c540101810dcfe437ff68783d05ce282992eebc9cf7af948bd87a9f1f7b7a73ced2e6ce603e89b4d55a8881c6228a9a5bbdbe SHA512 61a0c945a463f4885cff848d523d17fa1c6ca5b885687244e0d54a7babea76427d67e39c6275788a2ddfc0aeedc8db9dea6d72c0ffd97ec1e33036dc1aeb7fdd
 MISC metadata.xml 577 BLAKE2B a8bfdc064608bf0bb4a2f81a5de928d7eb35da9eaf2db64198ca34ca8b2542116ed1f341fe822354fa60b8d447676eb892c38dc4093b4b9db16622fe9d64bba8 SHA512 12e030815c13bc253aa877c7da837e01f8d259a6297807c0543f05e21edb92fda38b3a54a064b4721172fcc3db9d0ed2ae580118d51f03fc37f6ac4bacde5154
diff --git a/media-gfx/gimp/gimp-2.10.26.ebuild b/media-gfx/gimp/gimp-2.10.28.ebuild
index 09172d13d44c..09172d13d44c 100644
--- a/media-gfx/gimp/gimp-2.10.26.ebuild
+++ b/media-gfx/gimp/gimp-2.10.28.ebuild
diff --git a/media-gfx/gpicview/Manifest b/media-gfx/gpicview/Manifest
index 933e9033cf13..1cd186798e44 100644
--- a/media-gfx/gpicview/Manifest
+++ b/media-gfx/gpicview/Manifest
@@ -1,6 +1,4 @@
 AUX Fix-displaying-images-with-GTK3.patch 6119 BLAKE2B 84733027ba1740eb78e4d62e67b6ca0dbae58dfac1c3bf44b1dd07a7b33248a255728e2b9c6b87f534ef1463b20d2f5df8f2e07bb619b97b428fc14e9f8939e4 SHA512 6eb044a143acc0decd64f90578b98a41a82c05a0bbf90e35646af1007e685d0d37a08ad3e90674bc6b5fedf460695b27f771a2776bfb391af03f6c1674592060
 DIST gpicview-0.2.5.tar.xz 349536 BLAKE2B c215e812693a30d55d3e606b9958d308b5d7f564ba0c3fc60e7606c492ec3ddd9997ae63f0865a6bebdf79c0a18e6a8b26a1e2c8d5dd7e2174d211130dbbe817 SHA512 afc7e67c7ae1252f9c1816ee46fe69e96ea7be9a60e03406a539f17b2e4f0e4b93a028c6f3f1c455f5433d6d7d78a58dcee2cb0ac91ea53093a21935bf454afd
-EBUILD gpicview-0.2.5-r1.ebuild 652 BLAKE2B 543b90065074488e91faa5ae0f310d10a0bcd84913c3a0143f9fce8c367c8a6b1659c69c2b824c012b889163a5afce282d5b49f38fa7c7352ebcda245fb448d8 SHA512 5b7a0856bb9cfa2296c4d588bb4e2232204c50955928a10f6c94507aba495452937b89ba5d49bb32fcbdeb7a92ad938aa70ba638e14ddf41396972f0e47b053c
 EBUILD gpicview-0.2.5-r2.ebuild 582 BLAKE2B 1447a4671f6caba214cad345256b43506a7be995c088fe8b7349366708cb3650bacb1cecf57c207f0650caf9e927b25db8727e62ee1753d6becb7434cff8f857 SHA512 76ab57176af07ce67815f4d620dd7a2374e189c2e26404ec829637c51b36d4cac3b3741d5c3e0651693b8f31570f978e70d482de45b082cf1c73643c86012e44
-EBUILD gpicview-0.2.5.ebuild 548 BLAKE2B 7402a49ee6252fdc380528d96b8fb251da0f2f10c21c87867f8376630bceeaf025c26a2cf9b926be879184849c5786d752a4f42570e7f9b1a5de6feffd86ed5d SHA512 c65d2217ad28d00169b53997497ed000d0fd90d42c121071a69e7c7ff5d4305d8169c3b749409afa0aaa1fd3a3bea76a2ab33ad5e92e45940a7f93d24f6e00b0
 MISC metadata.xml 327 BLAKE2B 93cbf29b7a893563c1fa010df02cb4926683a5a2401a89bcbddfcfdf9e4010b8f2a8518a05bf96f207d14b7d907fac0bd498a8719776d814cc8f7dc7bf2b2b97 SHA512 7240a47ab4c047c2c763be0287ee1fd17b95b15d26650894f039b183438d2622489ac92f08023194ed05c4c713a1ff8932a9f888852a4f490dd32239675701ed
diff --git a/media-gfx/gpicview/gpicview-0.2.5-r1.ebuild b/media-gfx/gpicview/gpicview-0.2.5-r1.ebuild
deleted file mode 100644
index 03518f32a401..000000000000
--- a/media-gfx/gpicview/gpicview-0.2.5-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="A Simple and Fast Image Viewer for X"
-HOMEPAGE="http://lxde.sourceforge.net/gpicview"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ppc x86 ~x86-linux"
-
-RDEPEND="virtual/jpeg:0
-	>=x11-libs/gtk+-2.6:2"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/gpicview/gpicview-0.2.5.ebuild b/media-gfx/gpicview/gpicview-0.2.5.ebuild
deleted file mode 100644
index 129a3c80b690..000000000000
--- a/media-gfx/gpicview/gpicview-0.2.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A Simple and Fast Image Viewer for X"
-HOMEPAGE="http://lxde.sourceforge.net/gpicview"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~x86-linux"
-IUSE=""
-
-RDEPEND="virtual/jpeg:0
-	>=x11-libs/gtk+-2.6:2"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS
-}
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index e8aa21062058..4904c084f9d2 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,6 +1,7 @@
 AUX graphicsmagick-1.3.19-perl.patch 491 BLAKE2B 6a6465162d9a4d7d09b1edb425cc7114cd4e0fc65e48f15c8c2a854fe835fd1fe94c56611c6d2744d9e26884c57b1f67353bfd32abe2f25a145dd7abbf5479f0 SHA512 da114b891ec923253048d90ee14f136742072bcb70e512e8d2838bbcac57b5fe6ea580cdccfd1bba5156777623c43e946ce2a8661f88612d4c24849bef0fb865
+AUX graphicsmagick-1.3.36-bzip-no-zlib.patch 693 BLAKE2B 75c49bf8db7dd7095f58ab67e138e860a1106d3e38d05c69333e63157ae55e98ef33b3f166e446321137ca0f4fffa67a6a7bba3dc264854ff6100f25c92d9bd9 SHA512 5d77818733d800f861ab3a1ef2ece0d47fcebb4690b714dce5fb3d74276ddfc400f16e871f7769703e696d3ca56692a2dd20fcfd97f0f1787b0876bb401f9084
 AUX graphicsmagick-1.3.36-flags.patch 2009 BLAKE2B 1d58f03cfeac9be92e2e85a2b6274ec22e3cb2c65d62e3095f2bb3da8f817ae52fdd6fe70e5da30bb8110202ec8c8268ffef7069c34d55ef7f7ccc3e53785418 SHA512 205694ea04e7b65c5519c564bbfa1ebd33ef4fa7800aec1a91439ed90794629dd54ab42c1c7f4f2f5ce3b7b078b3fffe76ce37c61643087f5cca244931b5bd3a
 DIST GraphicsMagick-1.3.36.tar.xz 5600712 BLAKE2B 069ab4f9bb5beea3321860bf8e43c8a1b51ab102054e92486375209a86fd3c1c1fb44d4b2c43a65c78f36e9f37e09316fe77b4f261bfb0af3b2c2a86ff8b5aa5 SHA512 27ed5fcbfb0303436bdcb0f11d18257a967d471251b51e633e2c655b0a7e5ed01f61a61f9702cc7d4c02714e005ac18ca9ba0f690c0580e41d07947a03c5cbb4
-EBUILD graphicsmagick-1.3.36.ebuild 3174 BLAKE2B aeac2a0e04366dfa39a68e8eeab9de249e099361181f2e38dc23f3150e9abc4a7b7b47eee1aa6f92c32f253cff845f21ca99b7ccbfd2e8ef07182e8bfdab1611 SHA512 f1262f3b6e2c8f73afbf8bed38edf03b2a885150a88d3fbe54e2d7cdde7668f0cbc43c6c28962903a11be938a7e8bbcc2951074af6c2417c0ed10be0b59bb5c5
+EBUILD graphicsmagick-1.3.36.ebuild 3221 BLAKE2B 570b421b5a082c202cd00722dd458c4ca359879431d8d1f33287605ab6646dcb80e15c0367f4054bc294730b2cf80c46d5193f8c33e80d4b80e794c3769c038a SHA512 d042c1a723260fe4b9061855983cfdabaf8a4e36d2cafc47579a90c33143086c3efeff74ff380b7fef5efefcb50a2d9c9a8b9ed4f98eea0ae28826e73ea18df5
 EBUILD graphicsmagick-9999.ebuild 3182 BLAKE2B 95963ce267c90bc2b5b367a854b26c2b408c9d434c83dad5bd2138ad2dce0cb60478579f23f37585d2cb392233666a8efff912bfb71da2e7bfd87cc0426d00f8 SHA512 8a91d847e6cb7358141eeff10cbc723145362a620d5460e97d0b3b3f582b5da292d44662327eef7e1c8e1561a0e357b7b4194c31a6b9f049e38acf71921b6fcf
 MISC metadata.xml 1277 BLAKE2B 2dc552ca54b8776bbcf08f6939a7cd10fbae14a1b6062ffc3f4480b079d39caad022b1eac1eda95d03aaa30da01fd26da4fb59c5cf117300d446105f29b50a9c SHA512 8fa1382b7effbb5d8a56b3fbbb063abe5f60bcc85a57a834969878510be81fa255c1f09f8b5d839729e860c48b57d44a6666f3e89f4fba852b457df2940dcde0
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch
new file mode 100644
index 000000000000..5a78527b2286
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch
@@ -0,0 +1,24 @@
+http://hg.code.sf.net/p/graphicsmagick/code//rev/d9ec69e25e9e
+
+Sent upstream.
+
+# User Sam James <sam@gentoo.org>
+# Date 1631846586 -3600
+#      Fri Sep 17 03:43:06 2021 +0100
+magick/blob.c: Fix build with bzip2 enabled and zlib disabled
+
+Seems to be a typo.
+
+Bug: https://bugs.gentoo.org/641164
+
+--- a/magick/blob.c
++++ b/magick/blob.c
+@@ -5040,7 +5040,7 @@ MagickExport size_t WriteBlob(Image *ima
+             else
+               amount=(int) remaining;
+ 
+-            bz_count=BZ2_bzwrite(blob->handle.gz,
++            bz_count=BZ2_bzwrite(blob->handle.bz,
+                                  (void *) ((unsigned char *) data+i),amount);
+             if (bz_count <= 0)
+               break;
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
index 877d40264358..45f73976f1ad 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
@@ -54,6 +54,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.36-flags.patch
 	"${FILESDIR}"/${PN}-1.3.19-perl.patch
+	"${FILESDIR}"/${PN}-1.3.36-bzip-no-zlib.patch
 )
 
 src_prepare() {
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 1bea7d6ebfb7..291b47fedb41 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -7,5 +7,5 @@ DIST graphviz-2.49.0.tar.xz 23040392 BLAKE2B 74bc90e433c29662b292c0f086777648db4
 EBUILD graphviz-2.47.1-r1.ebuild 7746 BLAKE2B b5dc9125734820998a498d3fd48a811e90b88fe4d36b9bd694ac3f2c7134a11ebaea8694a4b0d131f8f6991d009b489dd9cb1bac2f27d0d8afe728a6d1322608 SHA512 11f479ccf853fd1d2e93a8efdb9baf56b00daeb8a8964479faf5b1fc7d77e941187b40519c0b52d1470972878e5ba14954b056e998ca15a5dddb54b098d0af52
 EBUILD graphviz-2.47.3.ebuild 7951 BLAKE2B ada464b9d2de919aa94e14183ef41939e25f55901d2a0ecd72312ab4efb2973f125280f96f348b8bbcc9571a0c280546916d3aca7ac9ee04e84a15c500726bd9 SHA512 7bfa0a63a185548c5c2ed5689b572fa8bdf32c5fb5ff14e15e5f234abd86dfdf6ac3c078de480c77ff7632f28ffe88742498bbcfdaae71f569031dc161b76fb3
 EBUILD graphviz-2.48.0.ebuild 7723 BLAKE2B ef50d78f842cb9eca2b22a2fd014952a80fed033df693261bc1a2fa2b7b19de3e5b10e2713267c8305041f446ccfd2326dc8dd1559ae02bb974474e61d5dcec1 SHA512 f6f75eff167ea686fd0e8ea733545766c5f79611b289874573d4bb383aa343d33fb6f4417ad562edd04fe7ea7eed14380c1170fa34d9e5e98258087b913a4237
-EBUILD graphviz-2.49.0.ebuild 7683 BLAKE2B 7c028bb1dbf62b75d5c8dd5fd7142203ffda95064e9a817bdf11f6f60dac2df5d1de1b81ddea39c855fd4c0456914789ab9ae5d45c5d07742f13b09abdce104f SHA512 e18a42b95f787a50e249f0f305648506c720afbd05db110383e299fd1d2ae602743283b2ee87dc53e072055fa9a729cb9cf4292da22fb959cceec3b7684d75db
+EBUILD graphviz-2.49.0.ebuild 7689 BLAKE2B 969de8ab1319f368e3610d61ddc0cbe319922c88293e308ce995c96fb0994a8d46c5bac909684f9ced1882a97a11f0f54ff79ae833fbaa041d7cb482cc53b9c3 SHA512 5bca460d8bb2a7619774f138ad347ed8fcfbb9c1dc02a6681c8421272accfe39a06da8037089978d508fea0b3aaa2ae57f3dc0284c243d031a6d3e0b4f875817
 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 39fe556e8152..ba7c9fb7dc05 100644
--- a/media-gfx/graphviz/graphviz-2.49.0.ebuild
+++ b/media-gfx/graphviz/graphviz-2.49.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-re
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
 IUSE="+cairo devil doc examples gtk gts guile java lasi lefty nls pdf perl postscript python qt5 ruby svg tcl webp X"
 
 REQUIRED_USE="
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 10064278f236..b00344d66507 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 2315 BLAKE2B e60ab33332e0296ef56c20420489a6b35d2c27372d263beb1007cf381988349d7219f6637dd7fc27576809cfba97bd78758def1659378dcfb418c72116e419ca SHA512 a47743acb43b1582085e769074e66d62b1b97fceeef388f714bb80497247d170b03f67ed74e27848c2071645233896c2b61ec06f05140a1499985f7a62ed6209
-EBUILD gthumb-3.10.4.ebuild 2317 BLAKE2B 32c04189936eafd18d6584bd118e36c7eaffee0a251cf6f78e8a061e26a133bea31b5f0846bbf60a23805b7f161a423d8d936497ccd7d71d71bc3da39c54d786 SHA512 4b918fa60d44212cbdaf4cfd9a4ae2d582e872ce1522b35d1fbed90094e3a888e4592810776879ae61752173951e6d73ea727ddb306220d3287e59560f0cebf0
+EBUILD gthumb-3.10.3.ebuild 2341 BLAKE2B 6cbfaeb1e30c5a1ad00512dcd5c67d97fc6ae29f90d354df65fee9b476985547fbed6e92561ee6eb6e585bb765c5d5d5a6ce7ac80bb39bbec914db16af958e7a SHA512 1ada649377e6c9e073ca5c9e85d10010533492192cba33a8aa4baad70a259aa3c24792aab04b5f042e1280ac2186b0240e85b28243ff7afdbb085e338d13b8e0
+EBUILD gthumb-3.10.4.ebuild 2343 BLAKE2B f59bcd1f6e13f2fc908da95c5223f83c75a8c350c7555c3527417d9dd86fddadfb56250bee24d5e97323a8337887adf8c147e44110d3cd9326a24d879e9f38c5 SHA512 57d2b6202ef2366ca763f2d0197fe77e91402d6f76eaa84102890d9ab54ad701cee45db6495f968a5438bd8820a1da4e6283c543578f1d405b500abc7e1b85ed
 MISC metadata.xml 421 BLAKE2B 4b3895ebffd9ff5b3b63f7b32cd30e4e36f1156a9201b1e8d4cac7de62bd1cf72b2d11e321bae2dffe0818c6140170f6b14249ce4a38f0e65a78139f98316f06 SHA512 91e93d9d56d9254c80723c864178ba2f0e31e7d2fd998ccece63c8d225bff0c5b3477c98c94deb3c768a6e150dbbd3eff7d8c0d9f0abf31bab9207b0161eab10
diff --git a/media-gfx/gthumb/gthumb-3.10.3.ebuild b/media-gfx/gthumb/gthumb-3.10.3.ebuild
index a8f88cc18f64..98453f4bdf2a 100644
--- a/media-gfx/gthumb/gthumb-3.10.3.ebuild
+++ b/media-gfx/gthumb/gthumb-3.10.3.ebuild
@@ -26,7 +26,8 @@ RDEPEND="
 		media-libs/gst-plugins-base:1.0
 		media-plugins/gst-plugins-gtk:1.0
 	)
-	raw? ( >=media-libs/libraw-0.14:= )
+	raw? ( >=media-libs/libraw-0.14:=
+		<media-libs/libraw-0.21 )
 	http? (
 		>=net-libs/libsoup-2.42.0:2.4
 		>=dev-libs/json-glib-0.15.0
diff --git a/media-gfx/gthumb/gthumb-3.10.4.ebuild b/media-gfx/gthumb/gthumb-3.10.4.ebuild
index 6d4489f581b1..e1f679c26dd4 100644
--- a/media-gfx/gthumb/gthumb-3.10.4.ebuild
+++ b/media-gfx/gthumb/gthumb-3.10.4.ebuild
@@ -26,7 +26,8 @@ RDEPEND="
 		media-libs/gst-plugins-base:1.0
 		media-plugins/gst-plugins-gtk:1.0
 	)
-	raw? ( >=media-libs/libraw-0.14:= )
+	raw? ( >=media-libs/libraw-0.14:=
+		<media-libs/libraw-0.21 )
 	http? (
 		>=net-libs/libsoup-2.42.0:2.4
 		>=dev-libs/json-glib-0.15.0
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index c8e680bd1e2a..bff735126361 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,5 +1,8 @@
 AUX glib-2.67.3.patch 1945 BLAKE2B 8093eb444a360481e0f6fd89334f4ca6a693c6df0d0cdc5bee0bfcc308fc9e8b8090c3ca8c7c772ad7ac074d56e81ff3202f1bfd4ee526e0927b28118d27d53c SHA512 c355c7e67acb29fe41c50af4ac8724c636516394c33e9d529eed23eb6d7bbf014bb0f2f9981ccea9e1b3b98a3f87dc256dc385099eb218353e2b220a3d130172
 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-9999.ebuild 4048 BLAKE2B 312994fd1988b8f14f681d8b8f68ad89d7a8787b8aa2a89cf746fb6dd06c8861d11609ea5c7d90991d2f1d9a9a548dd4db75ad11a69157eeed6d0cf7b3ee697f SHA512 95f72b8aa4d20a6c4b58741b36bea22f8b7cccd40380fa536849580f17c9463fe1e0bfe4e64ea8289716b3c226d5dc665e888e9caca6200f35278785224a01d5
+EBUILD inkscape-1.1.ebuild 4300 BLAKE2B 77b5e57c53d9801e3f999e469909e0088552c365d60fed0cf8db0c95cddb9d3912d2da1998f6a139e7284fbd08585bf4ec5c7729b6ed968c13f0f38fa152fb52 SHA512 dfbbae2a1149457ef4a460f4067f197fe77148d32833f8a85074aeb4f33437c38b0f645e5f4f1aa62a07c6e259ab942027a0e64204f0788b4e4dd6b0385dc302
+EBUILD inkscape-9999.ebuild 4222 BLAKE2B f81dc2dd761939360a098e581fe0ed6eed633b3a93ad8a3898490f04b6213b8d629fa8a32f15c9d1934c393dad8e6f999bf7470e0c3f0167e7066295f6fb6b2d SHA512 147de0d941987a6ff35e1a2fefc07457fd05097150509128cea74a09faf676ae419b41fe0a036e632c68be18a5380b2468c45567c9040eab5374ad56f2dd47ad
 MISC metadata.xml 984 BLAKE2B 8aee1f973005f9587571770eb14ccf725bf3ba9034d9935b029f776e64e17a9e156ec864e1150b259d2a983aec6e53b10791be4f1a3b67d5aa465ee115d966f0 SHA512 7ee7c7d473ae2120b9f592777b08d77899c6bf7f750f09cc334dc76a997a472e2593442fb281a9984d77e1aa4eca39e389484405e0aa8b5614da0f718c713fc0
diff --git a/media-gfx/inkscape/inkscape-1.1.ebuild b/media-gfx/inkscape/inkscape-1.1.ebuild
new file mode 100644
index 000000000000..e62f8efdec2c
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-1.1.ebuild
@@ -0,0 +1,164 @@
+# 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://media.inkscape.org/dl/resources/file/${P}.tar.xz
+	https://dev.gentoo.org/~dilfridge/distfiles/inkscape-1.1-musl.txz
+"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~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"
+
+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/lcms:2
+	media-libs/libpng:0=
+	net-libs/libsoup:2.4
+	sci-libs/gsl:=
+	x11-libs/libX11
+	>=x11-libs/pango-1.37.2
+	x11-libs/gtk+:3
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_USEDEP}]
+		media-gfx/scour[${PYTHON_USEDEP}]
+	')
+	cdr? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libcdr
+	)
+	dbus? ( dev-libs/dbus-glib )
+	exif? ( media-libs/libexif )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	jpeg? ( virtual/jpeg:0 )
+	readline? ( sys-libs/readline:= )
+	spell? ( app-text/gspell )
+	visio? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	wpg? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+"
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+	')
+	dia? ( app-office/dia )
+	postscript? ( app-text/ghostscript-gpl )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.65
+"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}_2021-05-24_c4e8f9ed74"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	# Backport from master
+	eapply "${WORKDIR}/inkscape-1.1-musl/"*.patch
+
+	cmake_src_prepare
+	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
+		-DWITH_NLS=ON
+		-DENABLE_POPPLER=ON
+		-DENABLE_POPPLER_CAIRO=ON
+		-DWITH_PROFILING=OFF
+		-DBUILD_TESTING=OFF
+		-DWITH_LIBCDR=$(usex cdr)
+		-DWITH_DBUS=$(usex dbus)
+		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
+		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
+		-DWITH_GNU_READLINE=$(usex readline)
+		-DWITH_GSPELL=$(usex spell)
+		-DWITH_JEMALLOC=$(usex jemalloc)
+		-DENABLE_LCMS=ON
+		-DWITH_OPENMP=$(usex openmp)
+		-DBUILD_SHARED_LIBS=$(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-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 6912d66bb360..05de5cb6c18a 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -15,8 +15,8 @@ EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
-openmp postscript spell static-libs svg2 visio wpg"
+IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
+openmp postscript readline spell static-libs svg2 test visio wpg"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -43,6 +43,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	media-gfx/potrace
 	media-libs/fontconfig
 	media-libs/freetype:2
+	media-libs/lcms:2
 	media-libs/libpng:0=
 	net-libs/libsoup:2.4
 	sci-libs/gsl:=
@@ -66,11 +67,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	)
 	jemalloc? ( dev-libs/jemalloc )
 	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	spell? (
-		app-text/aspell
-		app-text/gtkspell:3
-	)
+	readline? ( sys-libs/readline:= )
+	spell? ( app-text/gspell )
 	visio? (
 		app-text/libwpg:0.3
 		dev-libs/librevenge
@@ -94,9 +92,10 @@ RDEPEND="${COMMON_DEPEND}
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/boost-1.65
+	test? ( dev-cpp/gtest )
 "
 
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -121,12 +120,15 @@ src_configure() {
 		-DENABLE_POPPLER=ON
 		-DENABLE_POPPLER_CAIRO=ON
 		-DWITH_PROFILING=OFF
+		-DBUILD_TESTING=$(usex test)
 		-DWITH_LIBCDR=$(usex cdr)
 		-DWITH_DBUS=$(usex dbus)
 		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
 		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
+		-DWITH_GNU_READLINE=$(usex readline)
+		-DWITH_GSPELL=$(usex spell)
 		-DWITH_JEMALLOC=$(usex jemalloc)
-		-DENABLE_LCMS=$(usex lcms)
+		-DENABLE_LCMS=ON
 		-DWITH_OPENMP=$(usex openmp)
 		-DBUILD_SHARED_LIBS=$(usex !static-libs)
 		-DWITH_SVG2=$(usex svg2)
@@ -156,3 +158,7 @@ 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/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 966319841726..27cd1020dfa7 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,5 +1,3 @@
-DIST kphotoalbum-5.7.0.tar.xz 11784500 BLAKE2B 61b295178bac0724b1212c40ddb4178147183b7d982213077c82681e7480fc8344d5467851b839d06521f89bd8858a6c4727824e95ea712bb28c6e1bb2ce428d SHA512 36153fd946c7819540b1867a24b968103f7101d1d9ddc49a09b70df4b419380875b3016863417ba8326b50fd844d255888cd5b6f2d4ecf1e1a607d0c97e16851
 DIST kphotoalbum-5.8.1.tar.xz 11792320 BLAKE2B 0f9404bdb0713f824c1e8a448eee48255c1649281a720dac36d46065a8f65bae7eef9fe4057686d25df837411930b03ddc479082c433039f47d3af7539bdbf27 SHA512 3a9eec3a12cd95c7bb0806185d7937346acd68ff29858f3cbbe5d4c0c350ff84f55282231dd3800fc5393d72d5563aa7207ec68122057079ba20e82239c6181c
-EBUILD kphotoalbum-5.7.0.ebuild 1574 BLAKE2B 800f6a06118ddb5a1f51d286d5d08313ed29722cff38555688aa3bcb620fba32d7730edc5240d2d85fdfe8d612a899f67d4af584a91143c46722e86b63979caa SHA512 91ff5cb83b4b4dfb712ea90468f66f2d387dd0c5ea2dccf068f7f38d4586335f4a0a2c0f03f21f2c8446596950868d03399b6f65e6a867c66daa7be076e81d52
-EBUILD kphotoalbum-5.8.1.ebuild 1598 BLAKE2B a75951fd3a5994f589398262e44d1ae3cf3fe95a84af0e1404fc1b09816f92b19b5b77a338a2583c06260c196b2e0252a9e309980d441e981888af177f98ede0 SHA512 07d3c40fc660b08095b6e8d9f877e6eda6549b73e49d66e532b970c88f6772842a5ec377f8c53882e385caaa953b49b19e182f1e92bd9cd7758b44dcb0286efa
+EBUILD kphotoalbum-5.8.1.ebuild 1596 BLAKE2B 42fc45d378e6e858fa9554d44e870c8f00fed9d1911f5ada226fe1fe292edd7c4024fdc8d14afe3169c88e84140233fefde42019b798d83bf3f9b9c55052f014 SHA512 754d98971d89fbb3b8d9c8b1c54d7122a18d4b02d4004839b14ea43d1564f07c65bde5e07e9671be301d129c265a69911ef844d4aed96fd06691d7827756b530
 MISC metadata.xml 519 BLAKE2B cc5874959364018bdcb98942049ce40c07459d9c719d041d1b394d4f13b5e265e076b737e1522817344ddcc65307bac2518679770c34d620edd62be22d96462c SHA512 fde456bf1b2d4917b619c4f3da5875163652cb482df55d11f9f88e20c90f6071609a1a52728a1aa299a3f5d2f29c25a3ffb2de8c19ea778dbfd2f4beff9f0b1a
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild
deleted file mode 100644
index cac8efff8a79..000000000000
--- a/media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Tool for indexing, searching, and viewing images"
-HOMEPAGE="https://www.kphotoalbum.org/"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2+ FDL-1.2"
-SLOT="5"
-IUSE="map +raw share"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	media-gfx/exiv2:=
-	media-libs/phonon[qt5(+)]
-	virtual/jpeg:0
-	map? ( kde-apps/marble:5 )
-	raw? ( kde-apps/libkdcraw:5 )
-	share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	media-video/ffmpeg
-"
-
-DOCS=( ChangeLog README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package map Marble)
-		$(cmake_use_find_package raw KF5KDcraw)
-		$(cmake_use_find_package share KF5Purpose)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild
index 6efb942b548f..877ed523e72b 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kphotoalbum.org/"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2+ FDL-1.2"
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index c5345046d4a9..aca386ee7566 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -7,5 +7,5 @@ DIST libimagequant-2.14.0.tar.gz 97471 BLAKE2B df6403aea0b0e3cbaf05c6c60726ac3de
 DIST libimagequant-2.15.1.tar.gz 98668 BLAKE2B cfa223f0ce8fdaac5d55b951507c040c064759756a5595719d02c0ec6983a70b08ad9d5df0176adb03269a9a1b7d39e9f0f7da884df214bd7994f4647e08a9c1 SHA512 56bc8b73859908774ce0a218cfbec81bfb8432c02ddce83880990b5f5ac89ac253ae64ecde43a9664aab3ac69d309bb9ef8ba2201be6c93aacb731b3214ff4b8
 EBUILD libimagequant-2.12.3.ebuild 1409 BLAKE2B 6a922a5bf768f0736c5aa8b22ae53255e6ea54ff577f66503e954ed2601cb26576f125200c922d940663a69dbc6335f6a4c5d372f0deda449e181a50311eb497 SHA512 2c5fa9f2d558d640adb39f3569a4f3b230210d5e18c0cada7a2bfdd56a3d98680b8d2d286c0aa17c06eb2dbf3c648281d13f887a9174de96a287f76da7907d77
 EBUILD libimagequant-2.14.0.ebuild 1240 BLAKE2B e14f9e27f965c6dcb30f1e33e9e849e184a88d1478539f4d9379649f11644a34cf9884a2f85e7f2fbe78d432f1e88fa2cd3342a72b13e3d7bf309e37570ff00b SHA512 20e69a655b9c8b5d9ed787298d1646bc71ae995006cd04ea727219af76a0e4008f31252708e4b5a0e8095100b8593f53015d634f4a942b5f371a410d4982a3fd
-EBUILD libimagequant-2.15.1.ebuild 1292 BLAKE2B 80c7b697df673d2701d98d5e9a290864810d59e005d65f344a459c1eddf6fa7d3ec49d724c6a2b389e1444a87726e5b5bdd54e77bd5a4048f4618d007034b5a6 SHA512 d8022870ada54d2e225f57d4197067fae48679c2e9e58e48fa00e5ae1ce7a108817fc772f5e05b344df7b25fcdaebc7b31486ba7819bf05f78dddc6e710ee842
+EBUILD libimagequant-2.15.1.ebuild 1291 BLAKE2B 412a04b250f8e23388736ae9ae62c7d260cf0d036f05d0c9182d139eb309ccee99ba1ef97fa80790e6eeb0b2fd10bbf2af1255cad35fb5a093c849a16b006fa4 SHA512 c4fc084a1945f10a07c29eb1e87e26036c57e424c43a5d96639d794dd7a760827a2e0466f49f421a6017176aafe0cdd233245d8af53c7b0322aecebbf833a5b9
 MISC metadata.xml 431 BLAKE2B 19ce5c802fc25f17f74073dba0473b11ea6a5820ec0726d405701c1e6b8f0a64d7019f4fe56ff0e6e43aba6cb52c34a5ac821d4bfcb8d9d6a10d0945bafc8a90 SHA512 4e22cda189c98a07cab44be95311def7b6955025d320869b55006e0e09f98c7370de40f552b556c466013b0c68b04013f36559f4970ebfd79655faf446c1e166
diff --git a/media-gfx/libimagequant/libimagequant-2.15.1.ebuild b/media-gfx/libimagequant/libimagequant-2.15.1.ebuild
index 5acc0e108f84..b8c716a833cd 100644
--- a/media-gfx/libimagequant/libimagequant-2.15.1.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.15.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_sse2 openmp"
 
 PATCHES=(
diff --git a/media-gfx/nvidia-texture-tools/Manifest b/media-gfx/nvidia-texture-tools/Manifest
index 45ff3a0c853d..67a7186bfae4 100644
--- a/media-gfx/nvidia-texture-tools/Manifest
+++ b/media-gfx/nvidia-texture-tools/Manifest
@@ -9,6 +9,6 @@ AUX nvidia-texture-tools-2.1.2-test_path.patch 846 BLAKE2B 51a9014da038c9015b767
 DIST nvidia-texture-tools-2.0.8-1.tar.gz 935227 BLAKE2B aef1801795f6102ac7c96df236de0e8534bfacfc72d297ff3bcd13b530829e8848f33065477a1fb2ffaa35d75bd9e34913d3551469aa814cab8cb76f2f04e721 SHA512 8e7ac79daaa10a2b1b64cfc8d6b37b37698e2a46f925cc33cdfd8e4b36705db8836edec6f98c5d6da475d7773f4a5826b5cebc120b7c5a6f9515906e2e4fae9d
 DIST nvidia-texture-tools-2.0.8-patchset-1-r1.tar.xz 9604 BLAKE2B b93c9586688dd690668c9d57d533c3460b008cf357a202cc6dc315ab6d24cd3d796d8596024d193bdd9100fab52970b323f03dc16b4f72b3e551167bb46513b5 SHA512 988ea0731b7f98f804a715404fc8cb8a8956a6c6b795f0ce8570f800dac3319f222bac8f12ab6fde50bbec3d68926ed3b24516931f9aebe2a7ce0fcae0dc8e13
 DIST nvidia-texture-tools-2.1.2.tar.gz 45172897 BLAKE2B de1827ccf9900499e089e7f0ccdf2acab089afb2c4d8e41978c3cf653aca81f8d9136bdd0e4467e7f5534b44f7329883f1ca66508c289200b23dfdd1158a9fc6 SHA512 4285e1a348c6ab9abbc34a499879fe1c8ff6976da01d0397eb95e19ae7fb566f3efb57613d2cee31e6c694b497a28b050e377267e137a4d114d093d681824adb
-EBUILD nvidia-texture-tools-2.0.8-r4.ebuild 1509 BLAKE2B e225f9c2337221f96a95a991da54ea42d1c295b1e2514a34b7592d1b8186d044d637787a4957f19e3f0adedeafff0727f12bb4e50a558f8e6c6d66424c361f57 SHA512 571f32347ebca8009cff74ce1445cb6358e8613c19577b8824ab4da7a0ebf8f21ac526e202a95a13a6b653be1dfc86e55d8b1afdd35ad782c5be92c312d4b8d4
-EBUILD nvidia-texture-tools-2.1.2.ebuild 1124 BLAKE2B e4562a10601c49f9ef2d9a7332c027bca00049bfa03e12a7e744557d73ebd47bdac9b2f3569aa1ad96b59e6c77c00e48039780d440ef2a174e89e7b61d702865 SHA512 1717a44a98d3faed523f2727989dab39fa07554864ee5400c30e92030dab750c4182d68c167563d515c34b30120ff786cace46605e4dae15e38bef822a0ec0bf
+EBUILD nvidia-texture-tools-2.0.8-r4.ebuild 1516 BLAKE2B 6607ec0e9e4c15a8a93a6887baee944472b84e1f29f03363ed2e74c818e7e4bb05e81d131070ecb5f0ed641c3a9732e7a6f91ac108a9e4b3120c7c748e7a11ad SHA512 5d8a2726931cce582b80bca0ea0b9c8eb3a533a9dfbbd94737eeab32e2525a9048006355ee2b339466009f7ed66c7745809fbe4218d618b7c152486830489b99
+EBUILD nvidia-texture-tools-2.1.2.ebuild 1131 BLAKE2B f8b96a5ede3ab92038fe4f6abaf5db46881fd07a69c5f875270757b8822279b0cb7a24516dde831a7e814fff6903784a5387b8e40853ee5b8388f2271cd9e1b9 SHA512 e518aaa97a8b342da6e8cb36880b6e4f4829697984c069576a3badaa3f320fca372c5ed743ce8520edf5791ff23fe7552e008018a54265ad7fca2c0fca330732
 MISC metadata.xml 549 BLAKE2B ebd2ca9d85f2e8b5621275c7bfd554ff0f9c721c73f203f9e1d3ba76cd6428d78169586b3ec418f95e0632d083f747fdbb8a487532f668cd525b58561f133078 SHA512 5631940e5c4c18bbf6bfca1645fc46f736d867f38417106930437f09f6a12964f8c1a65d8a6baba2bc2f2e77964f025bd604f1a48c2db2f10a13e0e163ca4b60
diff --git a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild
index d0e927d8fc91..7ce85d72afbd 100644
--- a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild
+++ b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}-1.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 -riscv x86"
 IUSE="cg glew glut openexr"
 
 RDEPEND="
diff --git a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
index 8a3d4922c2b2..803456bf123a 100644
--- a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
+++ b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.1.2.ebuild
@@ -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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/castano/nvidia-texture-tools/archive/${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 -riscv ~x86"
 IUSE="cpu_flags_x86_sse2 openmp"
 
 RDEPEND="
diff --git a/media-gfx/pencil/Manifest b/media-gfx/pencil/Manifest
index d4e80fdef3f7..709aef6c9391 100644
--- a/media-gfx/pencil/Manifest
+++ b/media-gfx/pencil/Manifest
@@ -1,4 +1,4 @@
 AUX pencil-0.6.5-skip-building-tests.patch 1301 BLAKE2B c7bfb172e5050936a1cf7294d2992c580ffb0b337c879d60c42575c5dff7c0269a1e406eecf7e97871a6ab785c9910a5ffc47fa97b5f9881239debf294c6cf96 SHA512 c71e2cc135a267f79bffca15f3cafb4a7e6e4d3b0f3718f37551b6985a9264774c70974c22acbf591c7b204e9aa1ea46ca4d3b3722770931b000cc633f3f62aa
 DIST pencil-0.6.5.tar.gz 3714951 BLAKE2B 0b3ba5165f4a6778588eed3141c6260a29470ccf277e42612e68e8b4daf5b9cf32f6a4343c038d6014ceb1e99f7ce8c2a398130ea55e7ef16e2d006de3661625 SHA512 6d95dc4157ea0f5da829f40cdf99c682e560ca74af6964693d221321e7b3e923893957fc30475a725f09c18dc4667968ec6cd92e5ffb56999ea70a927266b637
-EBUILD pencil-0.6.5.ebuild 1054 BLAKE2B 553ebc52d60ecc1c8905bf7f002281c12e1df8f482e70a34adcab738b8620550c61965119d0c57715a8f35128238333dca584a10421cbe76a67f7bc6ace80243 SHA512 f5422c2bcd414eeeb566b01742de93114bde276c5e1c6c6cbd21cc9eea5cd1069bbaac733b1e36a19049e8abf98b3848032bca334e4b5601280947836a9ad8c5
+EBUILD pencil-0.6.5.ebuild 1046 BLAKE2B 08898a58651463848a46e86257dba524cc964353cde956df1b2ef7737727c773e93e5fdd0691f887cbadb1333e0970dcc7a3ee7001ae110944cb93f0833ddc00 SHA512 0f994320ea1cc4e29b79b4045406eff65bcc1cbcd45315da9587949d547d389fbd4447c83195bda1e1395ea2156032da93d7fe873186f295e73379edd1164b61
 MISC metadata.xml 329 BLAKE2B 4c4c8b1438179f8c7fe76161333d68910b2e5742a010743f00a08995cff39f1b8dbcda76ee52c4bbdfeac8125f554d55355d7332b91c36e6eb614890634bce73 SHA512 ea2aa6eec0c3cfabdb683deba096d884aa80783354557a083b47142de408a6972d1476c6038b4e87c9f7055f488267cd4c1455f1b059c6ec7e907c1b3c9727dd
diff --git a/media-gfx/pencil/pencil-0.6.5.ebuild b/media-gfx/pencil/pencil-0.6.5.ebuild
index e4872b8d9df9..93945b7a1e3e 100644
--- a/media-gfx/pencil/pencil-0.6.5.ebuild
+++ b/media-gfx/pencil/pencil-0.6.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop qmake-utils xdg-utils
+inherit qmake-utils xdg-utils
 
 DESCRIPTION="2D animation and drawing program based on Qt5"
 HOMEPAGE="https://www.pencil2d.org/"
diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 2007b81f82c7..598db73d6ebf 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,5 +1,7 @@
 AUX prusaslicer-2.3.0-miniz-zip-header.patch 284 BLAKE2B f73db5727dd6bffc39c658a291602ee6d86609244e9cd55a9eeb92a376cc4a579a94ef9f423e3072dbd01295b173c9291d615a56d5fb512cdccc93b205f665d0 SHA512 36e3c1e5d35f6cda26d8f74db3862cc5206478f7f79f35b28b3b3749291150764d1d907a3ccb67b4dcd1872fa5d0ac612791653dc67f3a56aeb98b68dc873f27
 AUX prusaslicer-2.3.1-gcc11-missing-include.patch 740 BLAKE2B 162981c4ddf74bf55f27adebc8603892da97e60eecc085649d508abf06731969643d0a043e275f8978318b9e2c2603557e03529f8017030da4503a71f5c60171 SHA512 bb7067b20ad07ca4aaa5a20583e8399d61f4e7ca2e9a04fda7bd8929e0b51aa908bfe7a546e82f1d688f2853d14f3c961c65296608aa2e14ccfa6c5e4d8f6a19
 DIST prusaslicer-2.3.1.tar.gz 39583385 BLAKE2B 0d0fa11d21ec3cc0decb2708a1b1866bbe0ec5719236433ef87807541ada8abc67091f219392a1ae21b4f35c3821dde94bfd6dac72ec6617c40b7fda05cfc082 SHA512 2722ee9d5331fe03423ce179cec68196320b48c65bd3c6795b93469268956fb309609462cc62bf3e2b4f30d2fe720d0a28a16c010993737c045d82956493a1e3
+DIST prusaslicer-2.3.3.tar.gz 40659538 BLAKE2B 1e1a1f7aeb34934bab03410e004a91e5ed76aaf930ff59e5b373b2e229018b6703d8da8ee7ab9085be25c5b3ce4ef39aeb38204336400867fac4a55f52c76bd4 SHA512 1f6b97e135202ad9de8f0bb212239ce2497de4205ea32f860b483473fb1f1783451d539a67cd97ef31f512a797b29c1067a1eff4134ea4a29b6218e5757657e2
 EBUILD prusaslicer-2.3.1-r1.ebuild 1877 BLAKE2B 7a0cb2b523c099df7897d98731e3af3382307909579ea317fbd9866d25dbebeded59847e4e2596e59213074f081cecb662b65352a44497078ec0f72af20da5ca SHA512 7b1e130b1d9ff7f33a1d3571ebdadd6503a7af5d4b2ae00cb2b73eac73aa15f3a9155d68cd948d2b475dc533fabca03a64297513043359f9449cf0944b4d2819
+EBUILD prusaslicer-2.3.3.ebuild 1822 BLAKE2B b09f101fc6f16eed0e514951d42109eaaaba22810c50da2b1844db52dce85b9f0d802293bac4321e94f19b3c92aa699f65fc2e1cc2073572b26df6ad23327898 SHA512 6a2bd537e22888e96ee6f9762357482c872a90a65e042f70eb78aff57d7055fc8359369429fe754b8dda1a256092bc0d3c82c16b2392c0114ee3e5b5e621d5cf
 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512
diff --git a/media-gfx/prusaslicer/prusaslicer-2.3.3.ebuild b/media-gfx/prusaslicer/prusaslicer-2.3.3.ebuild
new file mode 100644
index 000000000000..dd741d4ed3c7
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.3.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit xdg cmake desktop wxwidgets
+
+MY_PN="PrusaSlicer"
+
+DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
+HOMEPAGE="https://www.prusa3d.com/prusaslicer/"
+SRC_URI="https://github.com/prusa3d/${MY_PN}/archive/version_${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gui test"
+
+# tests fail to link with USE=-gui, bug #760096
+REQUIRED_USE="test? ( gui )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-cpp/tbb
+	>=dev-libs/boost-1.73.0:=[nls,threads(+)]
+	dev-libs/cereal
+	dev-libs/expat
+	dev-libs/gmp:=
+	>=dev-libs/miniz-2.1.0-r2
+	dev-libs/mpfr:=
+	>=media-gfx/openvdb-5.0.0
+	media-libs/ilmbase:=
+	media-libs/libpng:0=
+	media-libs/qhull:=
+	sci-libs/libigl
+	sci-libs/nlopt
+	>=sci-mathematics/cgal-5.0:=
+	sys-apps/dbus
+	sys-libs/zlib:=
+	gui? (
+		dev-libs/glib:2
+		media-libs/glew:0=
+		net-misc/curl
+		virtual/glu
+		virtual/opengl
+		x11-libs/gtk+:3
+		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	)
+"
+DEPEND="${RDEPEND}
+	media-libs/qhull[static-libs]
+"
+
+S="${WORKDIR}/${MY_PN}-version_${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.0-miniz-zip-header.patch"
+)
+
+src_configure() {
+	use gui && setup-wxwidgets
+
+	local mycmakeargs=(
+		-DSLIC3R_BUILD_TESTS=$(usex test)
+		-DSLIC3R_FHS=ON
+		-DSLIC3R_GTK=3
+		-DSLIC3R_GUI=$(usex gui)
+		-DSLIC3R_PCH=OFF
+		-DSLIC3R_WX_STABLE=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use gui; then
+		newicon -s 128 resources/icons/PrusaSlicer_128px.png PrusaSlicer.png
+		newicon -s 128 resources/icons/PrusaSlicer-gcodeviewer_128px.png PrusaSlicer-gcodeviewer.png
+		domenu src/platform/unix/Prusa{Slicer,Gcodeviewer}.desktop
+	fi
+}