gentoo resync : 12.05.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
committer: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
commit: 752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree: 330d16e6362a49cbed8875a777fe641a43376cd3 /media-gfx
parent: 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)
123 files changed, 2013 insertions, 4147 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 10b47b1ab46e..a9a69e540f9a 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 89e7f867d1ef..9200a43d824e 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -12,6 +12,7 @@ DIST blender-3.0.1.tar.xz 40155604 BLAKE2B b611f08617f1be217604e87cfafe88f6cc990
 DIST blender-3.1.0-tests.tar.bz2 643279044 BLAKE2B acbf0800c384f881c215ea22140b02e8e61c7395eb35fdb76fad3c785c565ecfc6c59d74848bdd3f9f9b762f86328f6b60cb7871e6ef4615db1ef03f2749b655 SHA512 9fd202c582576d170c29c8adbc9bc4a62b6d67a4a1500f6980201e3d904f4a4a15e5680530663382c34672bd634543dd330c5f75523cf0058928a549ff4a0782
 DIST blender-3.1.0.tar.xz 41017620 BLAKE2B f626266a41f9d72b03690fe8d7fe1f183ffdef01501ff6a458e5760eea66c959ca297d70dc541b27aa85466a7b8d65306e293c84487c1ff1467cd31cfdba0203 SHA512 354d4e7c92233e610d0e938c10d966aff7ee34fd21993b65b645b4d01e37f90f741206190817a7ab6932c5321d698827a09ec0e1d966c28596d130b4af2ce6bb
 DIST blender-3.1.1.tar.xz 41029004 BLAKE2B ca133349bfae52b36123da489ef7e50b30666b91d7961e9938932f5375a4d1129f3b15de59170ccf55723a08cbd0089bb7d73792c15221d91f2f83c40a2ebdb4 SHA512 88c339540a7b621b1771e1f17ecf7d4c21d86e05b83e395e15cd90b1347a50dda74ebaedd5ca178cabe6981b45244a64110ab855efdf74fe42f5bf45ffe811b1
+DIST blender-3.1.2.tar.xz 41014760 BLAKE2B 1e1476b7185005616fe3a647d5beea2c6cf975a418471d4632dc6f0367aea9505d0abfed79b063e81b090fe8f8e92d60840767e476534a5629def77a71495604 SHA512 e92aefbc020268e7347008e02d7fe2ef8670a568fab0ae2072ee82520ca67645e665e81ec2829b67a4de069ce1c0578bf2f7f4f783929e7574a8c9aef2f82a02
 EBUILD blender-2.93.0-r1.ebuild 11832 BLAKE2B 0054acfc65f0fd17f9a7eb190f4c65941ea72f73f9ee24b57ab98cd99a5842c1ad5694a11083d6b6ce3dc70c669f9ddddad05e609c774d39a2b186ef2b8818a9 SHA512 456c40233086a52b7c557bd187ab7821df0f2986c0edd21ca8e4b882c1744b21a08aad0ad0ff6e02162fefad66c259e280a0399e49cecb0b8a6bebff2542e3fb
 EBUILD blender-2.93.6.ebuild 12144 BLAKE2B aeea405155758ce88a20fb355719907aa70db1ea76bf93c69150e6cba7d392cdcfd68187f49589697b39b08ee9b6f29246b54618b3f7d26b89eedcbd7b7172eb SHA512 c4dd1d809777873d16dcda92ac3df7bf75a9ba915d2922abf371b5e62046870bba0bee4ddd90a9f9739c87794bf02fdfcbafb0cb6324bfc26e5f8981e81d3219
 EBUILD blender-2.93.8-r4.ebuild 12628 BLAKE2B 76dfd4e51521cf9f1736967742909813364bdccd6722fa1f74296cf6fe48e9dd3248dfe34a304d11b3d6353c4dfcc70b33e62853153984531a89d44e3af0fae6 SHA512 0c975b286150e3c70c7872d021b979a0ccd93d6264d581a39fb0067fd8a309310370bd49f16eb418276e169be02e3157883b05c55a0ffec4dbc2ada606cbe713
@@ -21,5 +22,6 @@ EBUILD blender-3.0.1-r4.ebuild 13050 BLAKE2B 7a3233d91abe7ec48a4bd8508fd58d32c2a
 EBUILD blender-3.0.1-r5.ebuild 13191 BLAKE2B 2f0c3433bf9ce8314f11e8d9bf60bc20972b23923ceb4c494f695c0267463a30de4286e577ed80917baf10623ef3bcd62caae8b83e5b3680dd3fcb389c51f98e SHA512 629c5333d0bc5e670a828143fa6ae82c5df6e4f9127910d329c00520d49b1c87b3bbd906448835ed9962cf31aef2d438e100bf06b69f30ebcb87f734446f9903
 EBUILD blender-3.1.0.ebuild 12862 BLAKE2B 6f70bcd89149fddd1918d9f17c1246e618bb62115d3e4aa437031ea3060f8e5ce5103b28f9e18e96d8268144e6b37719d0f8aece47c7152c6d30841ad513c33e SHA512 0eb804e9361b489c1c63d1d973fbc8921729d77a2fae1bc88b1d71cda7760929dda85a3476a852a7ec4e9b7395a106a89977553134a2f0100f59ff67f768bcab
 EBUILD blender-3.1.1.ebuild 12862 BLAKE2B 6f70bcd89149fddd1918d9f17c1246e618bb62115d3e4aa437031ea3060f8e5ce5103b28f9e18e96d8268144e6b37719d0f8aece47c7152c6d30841ad513c33e SHA512 0eb804e9361b489c1c63d1d973fbc8921729d77a2fae1bc88b1d71cda7760929dda85a3476a852a7ec4e9b7395a106a89977553134a2f0100f59ff67f768bcab
+EBUILD blender-3.1.2.ebuild 12918 BLAKE2B f4394b31bdeaa36b3e871d3454f036c48431d0175c2f936aca16578aa752f963b848fdab932ff32aa8c1477728128e922c917e919e9276a04f8c4516e754ef68 SHA512 0887c01aeaad99a8702f4a901d99266011ba5da8e27fdb4657cf79d5f8e58a028bceb33e175f0d2ead258d946fdd08e1cc1ff6d59b8bba3ef041b518b14972d8
 EBUILD blender-9999.ebuild 12853 BLAKE2B 40e0211501c6acc8ed4b0dc175a53023ed2ab29da05aa7cbbba85b2514ac90457687ebbdd0d628e150c9835e2c36ae47959d026c93edc5c433f27a8b0f7a1d73 SHA512 e898ca43b1245793fb3e65af49806935e78397938fbe07da329cfc3e72c4ecb7ba1f9ac30f7df91c5642cdd82983eb40279544520ea193a1e4f6d17bdd1ae4bd
 MISC metadata.xml 3288 BLAKE2B e1e1647de2fab3364578645599041b212214c726f4aeda5bee0423e09ef7895f627ea2cfb1118f474b148ba986a2d1b37186c25e5d069f3dbd000a1c3dc9b89f SHA512 9e64d1f6c1dff94a1cc20c97e26d4d43c694e9331e80334d85ddfbb6a76a8d39d1007d802dbce0f46f82f4d4fc3de871af3af8cfb7fd69a5aca31d4fd59bed44
diff --git a/media-gfx/blender/blender-3.1.2.ebuild b/media-gfx/blender/blender-3.1.2.ebuild
new file mode 100644
index 000000000000..402d1ca0b796
--- /dev/null
+++ b/media-gfx/blender/blender-3.1.2.ebuild
@@ -0,0 +1,405 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_10 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+
+if [[ ${PV} = *9999* ]] ; then
+	# Subversion is needed for downloading unit test files
+	inherit git-r3 subversion
+	EGIT_REPO_URI="https://git.blender.org/blender.git"
+else
+	SRC_URI="https://download.blender.org/source/${P}.tar.xz"
+	# Update these between major releases.
+	TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
+	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2 )"
+	KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+SLOT="${PV%.*}"
+LICENSE="|| ( GPL-3 BL )"
+IUSE="+bullet +dds +fluid +openexr +system-python +system-numpy +tbb \
+	alembic collada +color-management cuda +cycles \
+	debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
+	man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
+	+openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile standalone test +tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	alembic? ( openexr )
+	cuda? ( cycles )
+	cycles? ( openexr tiff openimageio )
+	fluid? ( tbb )
+	openvdb? ( tbb )
+	osl? ( cycles )
+	standalone? ( cycles )
+	test? ( color-management )"
+
+# Library versions for official builds can be found in the blender source directory in:
+# build_files/build_environment/install_deps.sh
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=[nls?,threads(+)]
+	dev-libs/lzo:2=
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/zstandard[${PYTHON_USEDEP}]
+	')
+	media-libs/freetype:=
+	media-libs/glew:*
+	media-libs/libpng:=
+	media-libs/libsamplerate
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/jpeg
+	virtual/libintl
+	virtual/opengl
+	alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
+	collada? ( >=media-libs/opencollada-1.6.68 )
+	color-management? ( >=media-libs/opencolorio-2.1.1-r7:= )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	embree? ( >=media-libs/embree-3.10.0[raymask] )
+	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+	fftw? ( sci-libs/fftw:3.0= )
+	gmp? ( dev-libs/gmp )
+	!headless? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( media-libs/openal )
+	oidn? ( >=media-libs/oidn-1.4.1 )
+	openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= )
+	openexr? (
+		>=dev-libs/imath-3.1.4-r2:=
+		>=media-libs/openexr-3:0=
+	)
+	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] )
+	openvdb? (
+		>=media-gfx/openvdb-9.0.0:=[nanovdb?]
+		dev-libs/c-blosc:=
+	)
+	osl? ( >=media-libs/osl-1.11.16.0-r3:= )
+	pdf? ( media-libs/libharu )
+	potrace? ( media-gfx/potrace )
+	pugixml? ( dev-libs/pugixml )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl2[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tbb? ( dev-cpp/tbb:= )
+	tiff? ( media-libs/tiff )
+	valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:=
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-python/sphinx[latex]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	nls? ( sys-devel/gettext )
+	system-numpy? ( system-python? ( dev-python/cython ) )
+"
+
+blender_check_requirements() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+blender_get_version() {
+	# Get blender version from blender itself.
+	BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert)
+	if ((${BV:0:1} < 3)) ; then
+		# Add period (290 -> 2.90).
+		BV=${BV:0:1}.${BV:1}
+	else
+		# Add period and skip the middle number (301 -> 3.1)
+		BV=${BV:0:1}.${BV:2}
+	fi
+}
+
+pkg_pretend() {
+	blender_check_requirements
+}
+
+pkg_setup() {
+	blender_check_requirements
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]] ; then
+		git-r3_src_unpack
+		if use test; then
+			TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests
+			subversion_fetch ${TESTS_SVN_URL} ../lib/tests
+		fi
+	else
+		default
+		if use test; then
+			#The tests are downloaded from: https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests
+			mkdir -p lib || die
+			mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die
+		fi
+	fi
+
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	blender_get_version
+
+	# Disable MS Windows help generation. The variable doesn't do what it
+	# it sounds like.
+	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
+		-i doc/doxygen/Doxyfile || die
+
+	# Prepare icons and .desktop files for slotting.
+	sed -e "s|blender.svg|blender-${BV}.svg|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i source/creator/CMakeLists.txt || die
+	sed -e "s|blender.desktop|blender-${BV}.desktop|" -i source/creator/CMakeLists.txt || die
+
+	sed -e "s|Name=Blender|Name=Blender ${PV}|" -i release/freedesktop/blender.desktop || die
+	sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die
+	sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die
+
+	mv release/freedesktop/icons/scalable/apps/blender.svg release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die
+	mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die
+	mv release/freedesktop/blender.desktop release/freedesktop/blender-${BV}.desktop || die
+
+	if use test; then
+		# Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests.
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i tests/CMakeLists.txt || die
+		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die
+	fi
+}
+
+src_configure() {
+	append-lfs-flags
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DWITH_ALEMBIC=$(usex alembic)
+		-DWITH_ASSERT_ABORT=$(usex debug)
+		-DWITH_BOOST=ON
+		-DWITH_BULLET=$(usex bullet)
+		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
+		-DWITH_CYCLES=$(usex cycles)
+		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+		-DWITH_CYCLES_EMBREE=$(usex embree)
+		-DWITH_CYCLES_OSL=$(usex osl)
+		-DWITH_CYCLES_STANDALONE=$(usex standalone)
+		-DWITH_CYCLES_STANDALONE_GUI=$(usex standalone)
+		-DWITH_DOC_MANPAGE=$(usex man)
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GMP=$(usex gmp)
+		-DWITH_GTESTS=$(usex test)
+		-DWITH_HARU=$(usex pdf)
+		-DWITH_HEADLESS=$(usex headless)
+		-DWITH_INSTALL_PORTABLE=OFF
+		-DWITH_IMAGE_DDS=$(usex dds)
+		-DWITH_IMAGE_OPENEXR=$(usex openexr)
+		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+		-DWITH_IMAGE_TIFF=$(usex tiff)
+		-DWITH_INPUT_NDOF=$(usex ndof)
+		-DWITH_INTERNATIONAL=$(usex nls)
+		-DWITH_JACK=$(usex jack)
+		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
+		-DWITH_MEM_VALGRIND=$(usex valgrind)
+		-DWITH_MOD_FLUID=$(usex fluid)
+		-DWITH_MOD_OCEANSIM=$(usex fftw)
+		-DWITH_NANOVDB=$(usex nanovdb)
+		-DWITH_OPENAL=$(usex openal)
+		-DWITH_OPENCOLLADA=$(usex collada)
+		-DWITH_OPENCOLORIO=$(usex color-management)
+		-DWITH_OPENIMAGEDENOISE=$(usex oidn)
+		-DWITH_OPENIMAGEIO=$(usex openimageio)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_OPENSUBDIV=$(usex opensubdiv)
+		-DWITH_OPENVDB=$(usex openvdb)
+		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
+		-DWITH_POTRACE=$(usex potrace)
+		-DWITH_PUGIXML=$(usex pugixml)
+		-DWITH_PULSEAUDIO=$(usex pulseaudio)
+		-DWITH_PYTHON_INSTALL=$(usex system-python OFF ON)
+		-DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON)
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_STATIC_LIBS=OFF
+		-DWITH_SYSTEM_EIGEN3=ON
+		-DWITH_SYSTEM_FREETYPE=ON
+		-DWITH_SYSTEM_GLEW=ON
+		-DWITH_SYSTEM_LZO=ON
+		-DWITH_TBB=$(usex tbb)
+		-DWITH_USD=OFF
+		-DWITH_XR_OPENXR=OFF
+	)
+
+	append-flags $(usex debug '-DDEBUG' '-DNDEBUG')
+
+	if tc-is-gcc ; then
+		# These options only exist when GCC is detected.
+		# We disable these to respect the user's choice of linker.
+		mycmakeargs+=(
+			-DWITH_LINKER_GOLD=OFF
+			-DWITH_LINKER_LLD=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# A lot of tests needs to have access to the installed data files.
+	# So install them into the image directory now.
+	cmake_src_install
+
+	blender_get_version
+	# Define custom blender data/script file paths not be able to find them otherwise during testing.
+	# (Because the data is in the image directory and it will default to look in /usr/share)
+	export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
+	export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+
+	# Sanity check that the script and datafile path is valid.
+	# If they are not vaild, blender will fallback to the default path which is not what we want.
+	[ -d "$BLENDER_SYSTEM_SCRIPTS" ] || die "The custom script path is invalid, fix the ebuild!"
+	[ -d "$BLENDER_SYSTEM_DATAFILES" ] || die "The custom datafiles path is invalid, fix the ebuild!"
+
+	cmake_src_test
+
+	# Clean up the image directory for src_install
+	rm -fr ${ED}/* || die
+}
+
+src_install() {
+	blender_get_version
+
+	# Pax mark blender for hardened support.
+	pax-mark m "${BUILD_DIR}"/bin/blender
+
+	if use standalone; then
+		dobin "${BUILD_DIR}"/bin/cycles
+	fi
+
+	cmake_src_install
+
+	if use man; then
+		# Slot the man page
+		mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die
+	fi
+
+	if use doc; then
+		# Define custom blender data/script file paths. Otherwise Blender will not be able to find them during doc building.
+		# (Because the data is in the image directory and it will default to look in /usr/share)
+		export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
+		export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
+
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+
+		docinto "html/API/python"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+		docinto "html/API/blender"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+	fi
+
+	# Fix doc installdir
+	docinto html
+	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -r "${ED}"/usr/share/doc/blender || die
+
+	python_optimize "${ED}/usr/share/blender/${BV}/scripts"
+
+	mv "${ED}/usr/bin/blender-thumbnailer" "${ED}/usr/bin/blender-${BV}-thumbnailer" || die
+	mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherent risks with running unknown python scripts."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "changing the 'Temporary Files' directory in Blender preferences."
+	elog
+	ewarn
+	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
+	ewarn "libraries which are shipped with blender. Note that"
+	ewarn "these have caused security issues in the past."
+	ewarn "If you are concerned about security, file a bug upstream:"
+	ewarn "  https://developer.blender.org/"
+	ewarn
+
+	if ! use python_single_target_python3_10; then
+		elog "You are building Blender with a newer python version than"
+		elog "supported by this version upstream."
+		elog "If you experience breakages with e.g. plugins, please switch to"
+		elog "python_single_target_python3_10 instead."
+		elog "Bug: https://bugs.gentoo.org/737388"
+		elog
+	fi
+
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	ewarn ""
+	ewarn "You may want to remove the following directory."
+	ewarn "~/.config/${PN}/${SLOT}/cache/"
+	ewarn "It may contain extra render kernels not tracked by portage"
+	ewarn ""
+}
diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest
index 0812a0e16543..ed7840726caf 100644
--- a/media-gfx/chafa/Manifest
+++ b/media-gfx/chafa/Manifest
@@ -1,3 +1,5 @@
-DIST chafa-1.8.0.tar.xz 435712 BLAKE2B 15a6e64fff13ac32b2f828a68fb12c96856e175eae83c0396b07cbb2ce71d8c1c8eee67db00880372026fe91eaefac2b34376dee597108ffc07c706cf8c98682 SHA512 15ff08a0df82ae8517ac7744b81a39e1ae1eff8c9848128341cc25da94864e89b7101aabcff2d532bf11ea293bfc4c9e48b01f85388dafadbce2d2b2c8b7439d
-EBUILD chafa-1.8.0.ebuild 751 BLAKE2B 4e335f993bfa4595ecc45984d060bbd2a520edd587d3599699d5eff32355a62e4eb777157f3cdf1b44a72871bc482dca009386cee7954d99030c2c6d4dbbc659 SHA512 9bc26bf617961ef6532feaf247eff66e817171e3d20c5ef0ccfbeea7c1c5bf848c202d21d2b07219915ce02dee033836971ada2d72407636267af6d5fa797e50
+DIST chafa-1.10.2.tar.xz 512468 BLAKE2B b1edec1ed687f2196a4693fa4cd08d8cabeb2b904abf387001c20ea3b5a9ca94c621bf45c467660342c3f0f049fb9706589c8b13643496b6fa2795276f032f0b SHA512 eaa0a13b1915774f25ed9fe6d7f465e695644c79e96387b71671c43876dad5f703383a876ad4ea2b5a13b2391056224cfe38cecba31264698da37af80ad540b9
+DIST chafa-1.10.3.tar.xz 512808 BLAKE2B cc0d18f06936d3c26a5d073cf8982c5c49bca307833885edf346e392987fb743ee560ca891db5533ee5e856dbeb4ca9f9a68d601961d0ab6b2dcb80c58fdda1d SHA512 29bcd5315a1c5bf08b214b9b58fabc64340e995a383b88e5f8245ba130b0506e4d13c34878d6cb32d1493fa1b8326520cbd176aeef22d932c72ede0430a38fda
+EBUILD chafa-1.10.2.ebuild 751 BLAKE2B 620759963bbe5fa317ad60b080f9138bc9cd1c151cb8ce5c2d6c2d5bd6d774ded495d3956fb6e5d4427740804e91cd326f5257f265f4dec0cdb9b3ec7666e262 SHA512 5c7fee149c9b2130f1d8678b83364257d3209ee3d25bcf4d497b000eb8d75cb2a872117322aa2c1037aea6f0620ae5caf0d45a1c0695d4adf57d877cbd07c47e
+EBUILD chafa-1.10.3.ebuild 754 BLAKE2B b3e92b1cd0f3c81e8626c27031e091ae76e044e15c03d38e1ac9d156a058941deb4a4dca69feca321207ed0738f8e4b0d3a955da340a5fcfd82b9f5be6778c5b SHA512 b9f94e704afcd7177e75c861b0ba9527e974dcb3105cd154ffa98f4a3d288fca9d2c2df360158e336a973fb222ba86fb57559b1fe0c4a767a3624608bdb54c26
 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.10.2.ebuild
index 8cd688d7009e..98ac22f2a0ca 100644
--- a/media-gfx/chafa/chafa-1.8.0.ebuild
+++ b/media-gfx/chafa/chafa-1.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/media-gfx/chafa/chafa-1.10.3.ebuild b/media-gfx/chafa/chafa-1.10.3.ebuild
new file mode 100644
index 000000000000..9a2b941734b1
--- /dev/null
+++ b/media-gfx/chafa/chafa-1.10.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="versatile and fast Unicode/ASCII/ANSI graphics renderer"
+HOMEPAGE="https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa"
+SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="+tools"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-gfx/imagemagick:0=
+	tools? ( >=media-libs/freetype-2.0.0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--disable-man \
+		$(use_with tools)
+}
+
+src_install() {
+	local DOCS=( AUTHORS NEWS README TODO )
+	default
+
+	use tools && doman docs/chafa.1
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 0054e3131a20..002c8f7d8ae9 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,8 +1,4 @@
 AUX cura-4.12.1-code-style-test.patch 406 BLAKE2B 66a94ddbb95402b2edbf2b149173f5f8ed63feaf468c3300e5d8d9cad2ca1c783d643e4e051d6994db46cc3fec853172b84f98d1c3366f995a831e7fa1b27019 SHA512 5c739fcd4c4259329f39e630d7c33e55b9a3910ec1ca778ba666e71f4087f1729c4f18b138301580f8cf8fb15b297855fe72337f2fa0b58454b8e0beecdccba3
-DIST cura-4.12.1.tar.gz 50021408 BLAKE2B 114bbe0cc022e33125486228db2eeaeacd9f4abeac8e65f3ed70231e05f4429062ce1cd49e1649959beb827b7a2d245f61c106529a18bd0cebbd0e8b9b8f883f SHA512 397048e1ed93d2e3ec326a3b0564db2b6ee2b239843346e2dd44470b11b5aea86f3f519534270789e020261c87a0100bf3bba39ddbd3a1d8be0e38e68fd7e0c0
 DIST cura-4.13.1.tar.gz 42339030 BLAKE2B e5c10ff03e42c0f88a2e7d827bf08f45c57142ca7b1dda6c00ccfbf0fd486dd366db23f00990ac5a021ecbfe038b2ca0247df8ea5130f2ee1efb766efc6f152c SHA512 6483fd6312bd2181cc812bce78aadc7e8532ecf292f09c75ce5e7870f7efddd63e84315ab40eb73c775b15c2ed2ce7fc804fcbefb73b3d8aaac77d8b22f0cbd0
-DIST cura-4.9.1.tar.gz 47870392 BLAKE2B 2471c8461f73ad2343f4c3315994c5f63781ae1e49cb4699cd66e7e77c25a93916931fbaa6598c4144707dbc7778c902dad3a25839c0523aaf51ed39aacd2463 SHA512 436b8e33514de67d6d680fe59ab9599a75a86caa7e63fbcd05297b12a435483ec0c9ca90557fe23f25590a24e533294915fc18a665fd5cdb77fcc3a05a9076bf
-EBUILD cura-4.12.1.ebuild 2412 BLAKE2B 9e7d5aa4c6a548d6b03af9595fae81e21515b3c24e2a7396a55fc6e44d36e76e6ce76ef88f953db43dfc921f028fc79d237fddc7cb964ec83b35ee364316eb7f SHA512 ffb203ad5fcaff50f6f7b4c66c771d67fed4abd5724ef345190d99a1fc3c7a5ddbe46e5c1a6d77afe0ca6e824d27b106790a49641c67985b9a22228e03647617
-EBUILD cura-4.13.1.ebuild 2562 BLAKE2B d2bacb4f5eacae22d1912c13ad796fb19dc4309ebe5542fc64e1bf6358d046cd97a5fc3c3586a72960408ab6fc723b644f483e38763c7b289f4349037d16954b SHA512 25efb45d58481d9981fdc4e8e708c208123298889b74309e7923f112ef6dc3dfbdbd78ecbe9f93f7251fe849c9a90780a4c9f009e223504515e1af89dfdd936a
-EBUILD cura-4.9.1.ebuild 2093 BLAKE2B cff46fb5b0a25cd65b7b37dfdb955ae275f049cfdf0602bf3418814a8be6a944caf83fe117547c3272d95052b624714b24079c4a2bc2c1b744d40b04340715f7 SHA512 313730100bd6d5f395017ad2422e5479d8e89e0b0d5a6afe100add25cabad76b11dd09402605dae4bb3e933a1216b756d0c2e2e79671b84f64b109c0f873526c
+EBUILD cura-4.13.1-r1.ebuild 2561 BLAKE2B 19d394ed7134b63387b26cedea00c438502fe685423326676ddfe0a0cc3470502a852127d6b98f172864760bb1b5a9e738a32bc6384b366697b95cc19a2e1bda SHA512 5f489d4dad73806098a68895cde061e4dd8e91a1aed4263395da48e500aa4307a83cb20732254ca511eb926f1892cb03304357a9b0a1db5bbdd3644d7ab44dd5
 MISC metadata.xml 1083 BLAKE2B 122f6c64557092750be93668e0cbd1e4b546cc711d572c0a14dae20426d722134570f7ad7cd25d769d96a264d3839b169b7c9f44f26fb0a5786c41a32c9e1f82 SHA512 1d60e79f32515d5017c17347000760702c250817c941ef0cb307ee8293c99882a4fa7c84263a7668aabb5aa5c433122c32fdd80b1dc47c32ef574c6d5e2301a0
diff --git a/media-gfx/cura/cura-4.12.1.ebuild b/media-gfx/cura/cura-4.12.1.ebuild
deleted file mode 100644
index 1017dfc52e54..000000000000
--- a/media-gfx/cura/cura-4.12.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake desktop python-single-r1 xdg
-
-MY_PN=Cura
-# No fdm-materials-4.12.1 upstream, 4.12.0 is followed by 4.13.0
-FDM_PV="4.12.0"
-
-DESCRIPTION="A 3D model slicing application for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/Cura"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="debug test +usb zeroconf"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
-	sys-devel/gettext
-	$(python_gen_cond_dep '
-		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	')
-"
-RDEPEND="${PYTHON_DEPS}
-	~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
-	~dev-libs/libcharon-${PV}[${PYTHON_SINGLE_USEDEP}]
-	~dev-libs/libsavitar-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
-	~dev-python/pynest2d-${PV}[${PYTHON_SINGLE_USEDEP}]
-	~dev-python/uranium-${PV}[${PYTHON_SINGLE_USEDEP}]
-	~media-gfx/curaengine-${PV}
-	~media-gfx/fdm-materials-${FDM_PV}
-	dev-qt/qtquickcontrols[widgets]
-	$(python_gen_cond_dep '
-			dev-python/importlib_metadata[${PYTHON_USEDEP}]
-			dev-python/keyring[${PYTHON_USEDEP}]
-			dev-python/mypy[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/PyQt5[-debug,${PYTHON_USEDEP}]
-			dev-python/PyQt5-sip[${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			dev-python/sentry-sdk[${PYTHON_USEDEP}]
-			dev-python/trimesh[${PYTHON_USEDEP}]
-			sci-libs/shapely[${PYTHON_USEDEP}]
-			usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
-			zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.12.1-code-style-test.patch
-)
-
-DOCS=(README.md)
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	sed -i -e "s:lib\${LIB_SUFFIX}/python\${Python3_VERSION_MAJOR}.\${Python3_VERSION_MINOR}/site-packages:$(python_get_sitedir):g" CMakeLists.txt || die
-
-	# Remove failing test.  Bug #693172.
-	rm -r plugins/VersionUpgrade/VersionUpgrade44to45/tests || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCURA_BUILDTYPE="ebuild"
-		-DCURA_VERSION=${PV}
-		-DCURA_DEBUGMODE=$(usex debug)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	doicon icons/*.png
-	python_fix_shebang "${D}/usr/bin/cura"
-	python_optimize "${D}${get_libdir}"
-}
diff --git a/media-gfx/cura/cura-4.13.1.ebuild b/media-gfx/cura/cura-4.13.1-r1.ebuild
index 060fa6170940..b9234606b66a 100644
--- a/media-gfx/cura/cura-4.13.1.ebuild
+++ b/media-gfx/cura/cura-4.13.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
 
 inherit cmake desktop python-single-r1 xdg
 
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/Ultimaker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="debug test +usb zeroconf"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-gfx/cura/cura-4.9.1.ebuild b/media-gfx/cura/cura-4.9.1.ebuild
deleted file mode 100644
index 219edd85cc71..000000000000
--- a/media-gfx/cura/cura-4.9.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit cmake desktop python-single-r1 xdg
-
-MY_PN=Cura
-
-DESCRIPTION="A 3D model slicing application for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/Cura"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug +usb zeroconf"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="sys-devel/gettext"
-RDEPEND="${PYTHON_DEPS}
-	~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
-	~dev-libs/libcharon-${PV}[${PYTHON_SINGLE_USEDEP}]
-	~dev-libs/libsavitar-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
-	~dev-python/pynest2d-${PV}[${PYTHON_SINGLE_USEDEP}]
-	~dev-python/uranium-${PV}[${PYTHON_SINGLE_USEDEP}]
-	~media-gfx/curaengine-${PV}
-	~media-gfx/fdm-materials-${PV}
-	dev-qt/qtquickcontrols[widgets]
-	$(python_gen_cond_dep '
-			dev-python/importlib_metadata[${PYTHON_USEDEP}]
-			dev-python/keyring[${PYTHON_USEDEP}]
-			dev-python/mypy[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/PyQt5[-debug,${PYTHON_USEDEP}]
-			dev-python/PyQt5-sip[${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			dev-python/sentry-sdk[${PYTHON_USEDEP}]
-			sci-libs/shapely[${PYTHON_USEDEP}]
-			usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
-			zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-DOCS=(README.md)
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	sed -i -e "s:lib\${LIB_SUFFIX}/python\${Python3_VERSION_MAJOR}.\${Python3_VERSION_MINOR}/site-packages:$(python_get_sitedir):g" CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# trimesh not available in portage
-	local mycmakeargs=(
-	  -DCURA_BUILDTYPE="ebuild"
-	  -DCURA_VERSION=${PV}
-		-DCURA_NO_INSTALL_PLUGINS="AMFReader;Toolbox;TrimeshReader"
-		-DCURA_DEBUGMODE=$(usex debug)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	doicon icons/*.png
-	python_fix_shebang "${D}/usr/bin/cura"
-	python_optimize "${D}${get_libdir}"
-}
diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest
index b0d38803191f..d02a1251c7d5 100644
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@@ -1,7 +1,3 @@
-DIST curaengine-4.12.1.tar.gz 1726565 BLAKE2B be231ec43792e1f27a6c720444c6755f71bbc3dbaea45b714c73f9b5b51753d58dafeef7ad2ed1bc21de1c39fe9f2a325ab8b85d3eb5b7f075a472dac98654b7 SHA512 c0c703ec9c7fb05389806f45174d45dd65bece169e3ad88aa1744091ce3c3c1e1e4f5af32cb55cfa9f1a4a8bffe0a008d5924a6e5d02baed00996c9112fbafef
 DIST curaengine-4.13.1.tar.gz 1727935 BLAKE2B d306f990b86e6120705b36eba6f3363adc67cf8c93c66c2da506c1ee461a5a6bdd27a4e04880daeb6cebab3ecc736d9a52eec27bf17aa9f032237a4c8ee1d2a3 SHA512 224379a40e26ae0026a3849d582353e49edf99520401e1fef56c9504638c68c62cfe394dab0eb40e4a447bfe0bfa506a880512e84fd6057a839b6384087c46d0
-DIST curaengine-4.9.1.tar.gz 1694141 BLAKE2B 84119a2dd66340bdc3a4bd58384f300fb839aa7c5920de87d070945d3c436ace0f8686cd907a204e5825bdc17809d9f9052e37fb96b37e34a20650ca625d7b1e SHA512 cfa918c6301c9948713306256d74a2a84a1fefbc0f85c7ac0eb182d8363f1eae97aecdcb91c207a2e7e1ab252f63cf4b513734b50d4229da7aa35e095ef88bee
-EBUILD curaengine-4.12.1.ebuild 2220 BLAKE2B 8827c7d543d55beb31f90606024fecc342c047c32936ceefade82379149b03013f7606dd9a0319b987babf765904682363d6125e795ba082e8478d87b13f2e2b SHA512 7998abd636444b16c46f162a7758381aa80785c8d8ff3d0759206205fb180393b733578cb0160ab562125a066298c50e5d1ff1ba8fda7b953205012caf487f24
-EBUILD curaengine-4.13.1.ebuild 2221 BLAKE2B 54990c7547fc08f3822b552db6a5acccae1e917eab49464a511fa7ad72cb08b5ec9c9f667284521da3a4c1ea4c2362919563defc75485f84461f1748178a70c1 SHA512 50b2d3cfb0c21eb6b515b6ce0c5672022b2345bab233ddb1e418fb69238a201bc5df9b48fa822ce01413f0a7b240138cfdf837a5b2a1cced43d079ce85f233a6
-EBUILD curaengine-4.9.1.ebuild 2237 BLAKE2B 274b913f4d176da6a60d9fc2512b0d8af969b725c12620ff80944e612a6d22914fad70c8797e97f4565c2fd899f6b968a0e187d7d600d83f6af1aac6a7714230 SHA512 7dfefefdb83de79c468015c8b5567177aec516fdc2f3279cdc221534e7ccfb30588744224201d6c19eee6bd4c27247137dfd3bcdf7c1ddbc002495fe305fd7a5
+EBUILD curaengine-4.13.1.ebuild 2220 BLAKE2B 8827c7d543d55beb31f90606024fecc342c047c32936ceefade82379149b03013f7606dd9a0319b987babf765904682363d6125e795ba082e8478d87b13f2e2b SHA512 7998abd636444b16c46f162a7758381aa80785c8d8ff3d0759206205fb180393b733578cb0160ab562125a066298c50e5d1ff1ba8fda7b953205012caf487f24
 MISC metadata.xml 1581 BLAKE2B c9ae9c37944858a1d85bbc2f8d2eef0be6a4a53be186f7bf189eb9d89880a4e4954c03e542fd3d7b641faf5352114453fc4a6b7bfbe4e59becb90be5bcda5c6e SHA512 a90487d6d8b44aa0e944e843e4e1d0b17dc49c82f61dbd053290a2e7caa5b175cb5d7d65eb623d28cddc5e5019b25444823d5dfee8bea30a7cb1669a9f865347
diff --git a/media-gfx/curaengine/curaengine-4.12.1.ebuild b/media-gfx/curaengine/curaengine-4.12.1.ebuild
deleted file mode 100644
index 98b1c9901eb8..000000000000
--- a/media-gfx/curaengine/curaengine-4.12.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_PN="CuraEngine"
-
-DESCRIPTION="A 3D model slicing engine for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="+arcus doc openmp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	arcus? (
-		~dev-libs/libarcus-${PV}:*
-		dev-libs/protobuf:=
-	)
-	dev-libs/clipper
-	dev-libs/rapidjson
-	dev-libs/stb"
-
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( README.md )
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	rm -r "${S}"/libs || die
-
-	# remove static linking
-	# respect cflags
-	sed -i \
-		-e "s/-static-libstdc++//g" \
-		-e 's/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")//g' \
-		-e 's/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE_INIT}")//g' \
-		CMakeLists.txt || die
-
-	if use test; then
-		find "${S}"/tests/arcus "${S}"/tests/integration "${S}"/tests/settings "${S}"/tests/utils \
-		 -type f -name '*.cpp' | xargs sed -i \
-			-e 's <../src/utils/AABB.h> "../../src/utils/AABB.h" g'\
-			-e 's <../src/utils/IntPoint.h> "../../src/utils/IntPoint.h" g' \
-			-e 's <../src/utils/polygon.h> "../../src/utils/polygon.h" g'\
-			-e 's <../src/utils/PolygonConnector.h> "../../src/utils/PolygonConnector.h" g'\
-			-e 's <../src/utils/polygonUtils.h> "../../src/utils/polygonUtils.h" g'\
-			-e 's <../src/utils/string.h> "../../src/utils/string.h" g' \
-			-e 's <../src/utils/SVG.h> "../../src/utils/SVG.h" g' \
-			-e 's#include "../src#include "../../src#g'|| die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test ON OFF)
-		-DENABLE_ARCUS=$(usex arcus ON OFF)
-		-DENABLE_MORE_COMPILER_OPTIMIZATION_FLAGS=OFF
-		-DENABLE_OPENMP=$(usex openmp ON OFF)
-		-DUSE_SYSTEM_LIBS=ON
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		doxygen || die "generating docs failed"
-		mv docs/html . || die
-		find html -type f '(' -name '*.md5' -o -name '*.map' ')' -delete || die
-		HTML_DOCS=( html/. )
-	fi
-}
diff --git a/media-gfx/curaengine/curaengine-4.13.1.ebuild b/media-gfx/curaengine/curaengine-4.13.1.ebuild
index 5d9281bd5518..98b1c9901eb8 100644
--- a/media-gfx/curaengine/curaengine-4.13.1.ebuild
+++ b/media-gfx/curaengine/curaengine-4.13.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="+arcus doc openmp test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/curaengine/curaengine-4.9.1.ebuild b/media-gfx/curaengine/curaengine-4.9.1.ebuild
deleted file mode 100644
index 16c9ac1b8576..000000000000
--- a/media-gfx/curaengine/curaengine-4.9.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs
-
-MY_PN="CuraEngine"
-
-DESCRIPTION="A 3D model slicing engine for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+arcus doc openmp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	arcus? (
-		~dev-libs/libarcus-${PV}:*
-		dev-libs/protobuf:=
-	)
-	dev-libs/clipper
-	dev-libs/rapidjson
-	dev-libs/stb"
-
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( README.md )
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	rm -r "${S}"/libs || die
-
-	# remove static linking
-	# respect cflags
-	sed -i \
-		-e "s/-static-libstdc++//g" \
-		-e 's/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")//g' \
-		-e 's/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE_INIT}")//g' \
-		CMakeLists.txt || die
-
-	if use test; then
-		find "${S}"/tests/arcus "${S}"/tests/integration "${S}"/tests/settings "${S}"/tests/utils \
-		 -type f -name '*.cpp' | xargs sed -i \
-			-e 's <../src/utils/AABB.h> "../../src/utils/AABB.h" g'\
-			-e 's <../src/utils/IntPoint.h> "../../src/utils/IntPoint.h" g' \
-			-e 's <../src/utils/polygon.h> "../../src/utils/polygon.h" g'\
-			-e 's <../src/utils/PolygonConnector.h> "../../src/utils/PolygonConnector.h" g'\
-			-e 's <../src/utils/polygonUtils.h> "../../src/utils/polygonUtils.h" g'\
-			-e 's <../src/utils/string.h> "../../src/utils/string.h" g' \
-			-e 's <../src/utils/SVG.h> "../../src/utils/SVG.h" g' \
-			-e 's#include "../src#include "../../src#g'|| die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test ON OFF)
-		-DENABLE_ARCUS=$(usex arcus ON OFF)
-		-DENABLE_MORE_COMPILER_OPTIMIZATION_FLAGS=OFF
-		-DENABLE_OPENMP=$(usex openmp ON OFF)
-		-DUSE_SYSTEM_LIBS=ON
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		doxygen || die "generating docs failed"
-		mv docs/html . || die
-		find html -type f '(' -name '*.md5' -o -name '*.map' ')' -delete || die
-		HTML_DOCS=( html/. )
-	fi
-}
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 5cf7c09cd8ee..6af1631c2d81 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -11,6 +11,6 @@ DIST darktable-usermanual-3.8.en.pdf 33484632 BLAKE2B 90a4e1021917f5fad7a5a9a58e
 DIST darktable-usermanual-3.8.fr.pdf 33479509 BLAKE2B 988824b60277ea0264fec61a1157a1de048cd512a172bc86276a043c06da3a684e971cef04c31122a78b3e7305157331e6cb86cfce7a4dc4dd9dc8697eddf743 SHA512 1383bb54face948bbbad895be2470c1b13ece71c325edf40402b3416a5d9653d2e1f8c4dbfa30edd10f02c1df8b8243c9e86948c5da8d2033e28ee3c6e04bbcc
 DIST darktable-usermanual-3.8.pt_br.pdf 33648057 BLAKE2B afb6d3c1ea6b709e535e10ae2a491fb6a87c84dcfe17823a518931bda0cd8595cda72905cffc01698e60c3df991451a5cccbfcdea82966a506b2d29d61298f09 SHA512 8734a9e6c57ba37f32966873b85584c50968c1c895fa4e9d953e129bb5834f254ca46e20741d5664429ef7d6379e5a35e59f8ecb517ca88ff536b49a8216b603
 DIST darktable-usermanual-3.8.uk.pdf 33663424 BLAKE2B abeb7a04b58e7ef508b415fe11073396c78964e91fbd3face8481cd6b09cf88525b1b6bdd2988bd57d25112cd59c8c05e209931f94004349cf5b8a7a3ca59e39 SHA512 e1a81771006f5d6b7e4088455b6b444ea87b27a788cc196c2bc0b0b5d0afde241ea9e2bdbd3ffe79871f39d756d710d8e16c082a21b1194efb71f78e8724af9a
-EBUILD darktable-3.8.0-r2.ebuild 5157 BLAKE2B 02f49ff54e774848d4d4b3dc81db1559f66b1550e8fe590ae15ea6859c938ed0e27f21619fc3652eb3ca465b2cbc49a56ea8453c5b002d3cd2e1da5b2b5b2899 SHA512 5d8acf4c1c7d5ce1d17e3c737c63417b766c7dbef73c8766841502ae0bce48b35eb0fd1ff39780a6e72f1eaaed3ec6fc8cb0d2c35157a966d26045deb9e319f9
+EBUILD darktable-3.8.0-r2.ebuild 5156 BLAKE2B f757e555ffaadec2babd0573626fc3d6e64d50445d8a77c10a78911f0892d3c19407a2b660617977bd7ffafe1c056b71faf1a32181a8cb3fa932cb40fbc10f12 SHA512 d6cc17680250b6f63f3126b17bb8154a0d6e302eed9fae46cda77d2d2f8c92793e80600033b8f49972f2750846bdadf50115ad5334256a5cbcfcc197e2b3620d
 EBUILD darktable-3.8.1.ebuild 5173 BLAKE2B f46b2bc8db594b896d10127a7f4d1535b6c4d5b17d09502a93d8717e8ff5c7c833152a51d5178b0e78eaa118774f0f1e75006ab0784d732884d7c6e21a85efb8 SHA512 5a7d928b92d08d5f48e9f362aa1e65bddff5eabeb97924182a5ab075189a9052538d3124b29e2ad23a8ad3651603133958611dd53e88ff1bb6cc16d5f3f06d89
 MISC metadata.xml 1378 BLAKE2B 7373550c5362c32832830bd94dbd712f963246805af5119214a43cfe4dfb1aac9e7bb03d4af6f4f1dfae3cc44e09d6ba8baff53d67b5ddd96115c460b5e19ad9 SHA512 ffdc1ff8eb068372b1f24691bb0832d5a845e49b41adf211dec1c2faf0d1a573a0e4c62c38e97758a8f87de15569ce6f3cd2c7a768c95eb0d2b166e30b20ae3a
diff --git a/media-gfx/darktable/darktable-3.8.0-r2.ebuild b/media-gfx/darktable/darktable-3.8.0-r2.ebuild
index 1b30a127d1b2..ffa6efdf9844 100644
--- a/media-gfx/darktable/darktable-3.8.0-r2.ebuild
+++ b/media-gfx/darktable/darktable-3.8.0-r2.ebuild
@@ -31,7 +31,7 @@ else
 			l10n_uk? ( https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.uk.pdf )
 		)"
 
-	KEYWORDS="amd64 ~arm64 -x86"
+	KEYWORDS="amd64 arm64 -x86"
 	LANGS=" de eo es fi fr he hu it ja pl pt-BR sl uk zh-CN"
 fi
 
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 51495925a6e8..c6153de02446 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,4 +1,5 @@
 AUX digikam-7.3.0-cmake.patch 4316 BLAKE2B 7da300081ad72f6a3c1f5dc4c5c04bbc67d5cc2b2a876dfe0c72dddde19274060c9f4fb8e723a9ebf023dbd1d7993ccfa96426a26ffd4bd736213a96058ad4df SHA512 a326826ff291e9facae55ad3bbc03e5d7173437c9b9734e3b48a5eb6c18ed2f3e1afcb44a3c0f3a2b77fb67f6d414da1dc03992fa9f70d7307e5864d66e2fff3
+AUX digikam-7.5.0-akonadi-22.04.0.patch 906 BLAKE2B 962e53ffd27428f41ee998b9bd6d94b4541d8f9d66e1e9005b071d8a6fc2250cd0f8cadd2685467c26d76f664dec98fcb0ce8737612d06bb57799097688be08a SHA512 44f33f77b327f384764d74aade0567560f2f8cf34f53a9391da42ade06b08d9edc858c8b48cb0f2677dce8fa195e31d866585ee287a49a765d3fd2f8d5ed3c41
 DIST digiKam-7.5.0.tar.xz 339573688 BLAKE2B 26014564e9f9d44db65d4588924da2c85897fb514df0a963f51b9fddb1f26ce3ddf18856b2d4b0eb140581ee7948f048986cf79687a31730e29017b5a811a3d6 SHA512 a2f5005b8f8b8cd9ef58a6bd563481a95004fbad7110d13f1ec4d8550311f1765410dda54f5b04c91bde7ec089e145656961c7c70b27242931e78abd698763e9
-EBUILD digikam-7.5.0.ebuild 4024 BLAKE2B 9c929b011bb0eba32e13947561e9390f88f246e8281d5bb57043b6e0366315f5696501a10fe131b9472bd0fad78777af44837ec7f22d699ec4a2bfee391199b8 SHA512 35a6318c5ac3bd55e1c49d768967bd40cf5b60fe0db51426a9beba25f88e3abc3e79e37e8fc39c5743fcf9896bba225623c1ff36bdbf9b89cbad410c55764446
+EBUILD digikam-7.5.0.ebuild 4090 BLAKE2B def4db51d90f1340f1ae42ef814c96ae98b2f7e68957bb4e6b317716a5742172da9014d4101c2bf1c8fa657f74cbb659d440ab61ac4f6ce86f72ea6183674439 SHA512 03e0239f98618fe9614204e33a179431ea57e8825965cc62c786e63e88bb406599713c0b2b5bc21c72c5835d0f520641f4624c9cf7d013409c030311dfc7f37c
 MISC metadata.xml 1166 BLAKE2B 022418e3ce42ac9ec248d5301d20786cd3ddedac61e85b934d9074d9e68fa9511720976620ae84dc2def3961fba307fa9c9d84e5bd90896da7b866b21dfbf7f9 SHA512 1e249e12495dcf72e0eb02f9fa7822112afba627a0b155a2188c382e69a3697cd186757484cd0f559a2985a83ace953a62cbb4e0afb4a6c9551d89053321b3c1
diff --git a/media-gfx/digikam/digikam-7.5.0.ebuild b/media-gfx/digikam/digikam-7.5.0.ebuild
index 1c774239c811..63edd26cbf88 100644
--- a/media-gfx/digikam/digikam-7.5.0.ebuild
+++ b/media-gfx/digikam/digikam-7.5.0.ebuild
@@ -106,7 +106,11 @@ BDEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}/${PN}-7.3.0-cmake.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-7.3.0-cmake.patch"
+	# upstream git master
+	"${FILESDIR}/${P}-akonadi-22.04.0.patch"
+)
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
diff --git a/media-gfx/digikam/files/digikam-7.5.0-akonadi-22.04.0.patch b/media-gfx/digikam/files/digikam-7.5.0-akonadi-22.04.0.patch
new file mode 100644
index 000000000000..a2933bc71d3f
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-7.5.0-akonadi-22.04.0.patch
@@ -0,0 +1,28 @@
+From 51efe295a222070743187af0367b0bf957879337 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Fri, 22 Apr 2022 19:13:28 +0200
+Subject: [PATCH] Fix build with akonadi-contacts 22.04
+
+---
+ core/utilities/extrasupport/addressbook/akonadiiface.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/core/utilities/extrasupport/addressbook/akonadiiface.cpp b/core/utilities/extrasupport/addressbook/akonadiiface.cpp
+index 6a78863cf6..8e65a405da 100644
+--- a/core/utilities/extrasupport/addressbook/akonadiiface.cpp
++++ b/core/utilities/extrasupport/addressbook/akonadiiface.cpp
+@@ -49,7 +49,11 @@
+ #include <AkonadiCore/Item>
+ #endif
+ 
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 80)
++#include <Akonadi/ContactSearchJob>
++#else
+ #include <Akonadi/Contact/ContactSearchJob>
++#endif
+ #include <KContacts/Addressee>
+ 
+ #if defined(Q_OS_DARWIN) && defined(Q_CC_CLANG)
+-- 
+GitLab
+
diff --git a/media-gfx/ditaa/Manifest b/media-gfx/ditaa/Manifest
index 8d99cafd76f2..fba02463b60b 100644
--- a/media-gfx/ditaa/Manifest
+++ b/media-gfx/ditaa/Manifest
@@ -1,41 +1,45 @@
+AUX ditaa-0.11.0-batik-1.14.patch 813 BLAKE2B 072b432e22531919b96c9e81d195cc4f1195dc922ca18cf01bf14dcd59dd3f2fab872cc5f3ccbcba1d3373eb1f3c2775f15bc7b803d8e776d111360493440a3e SHA512 3223ce9a028815843d4fe119e8d2bcc479afedf91433390b7fdb4cb25d59984252d5216c7f3311cd8c956fe95c9e4a51833c549f251e0736e72efe77f6465fe5
 DIST apache-18.pom 15667 BLAKE2B ebe956b864cf02ad67caa9626a5644b6acdffec62a65930490754ba96d50807e9e8bedd502b15736263af515dfa6e3f685feeab653b08612971ecf63cefb75bd SHA512 9ef6f99b30fe2603ad8f2c88116072de36bd2dc99590fd9e7eecf153dbf50cbd766694d861e666138d2a26137be69fe98cc38a491f6a2a68e8d421d656731ed1
 DIST apache-3.pom 3430 BLAKE2B 58c252c7cc69cc1ea86c671586cbf4f5a406f4bcab5447e4faa6a415d1021efa652c377e240f46242593e1df187dafea0f1d6bd0e813d1da3d12796a6149a575 SHA512 2e07dc80988c9cc3ddef4d31dba266aa71f01f25e1e8bf541d3c538c8d7c9c19c7d3c8bcd2a7e19693da311d32911dd677fb4a44e48ceaae25d5ff91cc77bcf7
 DIST apache-4.pom 4495 BLAKE2B e5208233aa81d207235fc1667b607016b3da338f1ebff83867551b4b719606ae6a3cce0a3ca44edefeb79b2192656cadd584374a1f7161a0d128abca93e3d16b SHA512 866f80b02dcfa294fbc77dee0c14e019f5b9fd0d7cdf893c2269e93b17b9b6ac49af76ad30952e87b55c8ea5896d812842ff2f05c69a1553b6eebe0a11a5b4fc
 DIST apache-7.pom 14430 BLAKE2B 6a76bb9ad4723d026e51b826a9dc886b3491a6b42d175389c1178a0148a8275250aef924044cdc024986d7b4dc6c60861726f7fdca5b8e4286416329f2186b52 SHA512 99a60915e419d1c05d2bcc98dcf61b53d0216e99c7306fb40279993a48664352c59600d6947fe06dce4f524a72c4502b45a146be0742f7fddd7a3d76b177bebd
-DIST batik-anim-1.9.jar 478686 BLAKE2B 56aa12f8f7f9a0361a6d1ee394d003f74636d1eb3c228bf416a12504ba677c6d17b8cd668a0ec8a9a9e1e7d19168083506477c3b48300bae8ea5ff79067f375e SHA512 50702bd37c1877ba5e106e31baddecbbbe7fd961b9cee60fc1c7eb803f39f4fc117e37c2253623a573beb908405306a0adf341e5b40780e40168dd42681f602e
-DIST batik-anim-1.9.pom 4404 BLAKE2B ee9cc583a604b7c0af408c9ce3878887cd560f7d33e3f5c9920b014de9e38013b31164b9c7895c1140a6aad4b22abb5603fca55d60294942e4121751033e8894 SHA512 beddfe9568d845bb949cd3e6270dfc366e61d5c47ebfebcda0c01d39a0c1047967e27202a317cce43d8b1534179cc450c4a8e6c6d82d0261f4104aaa3c9fd34b
-DIST batik-awt-util-1.9.jar 421002 BLAKE2B 3321d019530567865ec7f791a09014d2e62e354dbb7ceabd31dc2fd3236756bb499fb892f13ac6b8e84844b99ac8bd7e8c258e63bf268b610012fec375f3749c SHA512 c1bbd632a8db688d1cf34eeb55e3785aa86c7ce6726ef84de217818ebd1dd3236b57025bf47046ba5d2fd9efd70b5aeca2b47d20fde977548ecc30e9e6dcd74d
-DIST batik-awt-util-1.9.pom 3189 BLAKE2B 83d96583d56234997726ed31581a245f08284f32fe042d973edc847a07fc2f8aa24672d5af4d63e7fc494a75b63ff38f70e87f1a541786015b558f61c41aba03 SHA512 a457cf97e2762c4a9d4ce11708991b0d4d7606d94bb978e5afd2e323667f98150b3a85e8bfa8d9bf974007962e8dad3a9642bc31d1ae1027f3b96b50a5be9f06
-DIST batik-bridge-1.9.jar 695031 BLAKE2B ff4258969486249c7c61a76bdfe7f9c6d80e2b4cb99d1e00c9787ddb27235d49e2eb006c26f9532e3a8cb9551fc199524a47a718cd7b46f78955e67d32b2625a SHA512 e3b0eda20a7df0560015d54f8ca0682e54e8337b74d2da256bc36ad7ef444af2428b13b87ef1c02b2648965457b082e124c3de387d7a224efa4ad901dea2655c
-DIST batik-bridge-1.9.pom 5154 BLAKE2B 336667be4ed0cc0fbe7b7d83f14c393d232eb446b7cfe6787e2b2f4790b16a89d20077652d6fe4bb7ec6a613bcd24b7ec565a8b657826441116c73feb2f5b91b SHA512 4521876016d25c6fe75f8f204328ab53bca97e87e9639224926d0681b4b20dd4b076dfd9cd48358e93c1109c4607743783c0edc258a222e353c462d9f96e330e
-DIST batik-codec-1.9.jar 111695 BLAKE2B ed4e2e623f536ba4a99cdcc08cfb943034cbeef96e805d961e5ec23fd0ec05c4c7a6943f7880c47033ddfbb64e97052b5663b422eb5f2762672b61e2ca06a087 SHA512 62b40070367e168e9fb608506e1149ea147c9ab8529679437f0e75a9a42aa3b4fc9355e2a3bb66f8fd0a0b5dd6c4ad56bcd8872f8d1846e3c59b508b9791e9aa
-DIST batik-codec-1.9.pom 3800 BLAKE2B d4f57dde7bae8159a14608226877cfd59a204d7bb86fdbeaf41058ce99a77d9829611e19d5147f12327357824eeff4385be049eb166a0a9cbeff66d603a47d05 SHA512 4749463adcbd1ba7f0d718920a7df34bfb4c03d1336d62ca52f0908aceca8e1a9abb7943a2823255880f29801260e5d77e30ef309380a524fdb49e2475c2519a
-DIST batik-constants-1.9.jar 8243 BLAKE2B 321d29c19e521d535cd14d428e88986063b0b5c0829409c2ab8657b760d9a0bf21cfaf613a1f91f5e0d08367784294e1e3dbc28b77423af8bf37c8017e2af313 SHA512 22661d26d5b3f71292e54d8d8a35063cc3e918cd2bc41cacfe25197ea0d50283d0cd704a142476857fd3c42f4df98e7530d767c3f8738c6cd8e34255fbd1b83d
-DIST batik-constants-1.9.pom 3004 BLAKE2B 01fedfe6ef7c580bf922fd365ade4b63013f19ca1a41ab3ad79a9903e6236104b4e27acde89aa70120874930798be38a7955e684c86d4c8d55be8041df118f8a SHA512 b3d0092c9de92fc9001464169e6295fb7a4d72510a961bf270cb1e5d447ac7d7d6500c6c3dfcbdb06386b8bdd18c3f10100e18eabaa80457df4abf1b33f08b78
-DIST batik-css-1.9.jar 324858 BLAKE2B e4dade4bf013b1a70ec1b9f2a21e8f681d9da8ee66bd39a792e2ccd9bb00d1f06effe8e3f2cb8332b61bb6f07ffe570963269790a09228cd611e2619a2d2382d SHA512 3a66f108eb4a86e8b6cb08b3f97a236285509022c6e7fc3f957541b70cbbbb75d718a4fea338c03a3a277a6ef82401a2b719f4067a3346eab1a5ae3d0df5a665
-DIST batik-css-1.9.pom 3630 BLAKE2B 1e9035b788769d95f3ddbb1e2c8ff7e967d9bbddf109ec670d87f3690bd26d513e7a2163cc54d9c28032d29e4ef94033a60a645c97670853598d87d72460a68a SHA512 a7e8736ccc71d5dd8bc6d1ff669a658f520c016f3e442ce9a7b975e051135c14f0a62c9e2c60e4e90257ce9e5628e848314405f6295dcfd93146ffa471432d97
-DIST batik-dom-1.9.jar 184081 BLAKE2B ef1b5dc6188192897e4202a5775ab9b5c83de7d98bb0ee4bfd723bfe2299fe79b74cf59a7aecd018fbf528a8b2422fa0b05993205adb29cbfa3d4b391c865618 SHA512 25c5a384ad15f8ac4dbfd791fe9e2c23029d2df8f4198ddcb3bb4594738c6cca5e0b4dc41c7883433cf25553f6cfce86e92000b70dd58c33dbaae779c7468132
-DIST batik-dom-1.9.pom 4068 BLAKE2B 84973793d1af933d8d58514c1d89f90a6783a41d4c7dd3b289d68b35226d5847aba1d799ecf83db47cb7458895197d8c0c07086c2a43af7729a3f9ed6d5f424b SHA512 4c651f06b8847e827b321297c6f6214243b4d48b7e4175b2eadc88a969e4eb93c9a8e8dc8dcc37d21c2b00f02b3b3a196be081cf808b3d0da6d40ffdaccdcaa0
-DIST batik-ext-1.9.jar 13018 BLAKE2B 141e559043c41d167216b75a1e6f0a94d8865f94e41b3c631e79dbcf5ae8c0025c92856c4e86cfe45f0376c30fcaa5b8da5566573876cefae3104d1dfb0effdd SHA512 471db357d2893e7e0669f18eed152855292dcb286292d251eefa52f22cd6330b3c24ca2713c95496d2e8e9e3b5108b8793ea6af7c37dd7937e585974945e6663
-DIST batik-ext-1.9.pom 3030 BLAKE2B 03381d4c07012dcc7c573de966f81aee871f1af6684ab9ab45aa72dbc896487d98426cde51ee71661146290415197467047550d6a40569e6e0754d2bed37d905 SHA512 0253b02c34ab22f6b03fd03c710e9f3cbfa65370bc5d304d734f1771d441e4548968c8dc9188f0c6f454bde88e9347fb852d5ae0cf0224e30a3d9013275315bc
-DIST batik-gvt-1.9.jar 190589 BLAKE2B eaaf9b58b8af3140986bcf67b15e1528c4b675e0c4c6548eabbbf0b779aae8e1b17b82e321798f1142c269e5619e62ae5ad65a9264e8885d0848cebe59a2625f SHA512 734a87015effce44fdb1c0593fbd9076618a2cee9289a2b32603e6b34f64c3d287971ba722d6fe0c1bd93dbcf39574e2a99dd108e73dc3edec424afe45627073
-DIST batik-gvt-1.9.pom 3355 BLAKE2B 8f422eff0bacdf9f702a695bc0782543a2b7162a7ab88e85de1f936f1e5c56773aac044dc9d8fa22b5cc0c3264e79357bf256732421e03318898a5a8ea4a063e SHA512 e837112a1fb5f4108df1c567cb51a8c43f0c93587da5db0b323633cd0bf036bc8a92a8122b186869d639ff4c1b27d3602ba2adbcf373ec0453d84c376f0a1b7e
-DIST batik-i18n-1.9.jar 11285 BLAKE2B 453e56509b2dde28e4332adcf33a0222767c27c7435b4c0dde62a4aa4b25ec56c91bb8aac8cc0cd8725bf9bf879594b3b69dd1aecc26587b6c7222a5a7b7d4e3 SHA512 a17d621efe9746d3b6ae57c93ce72d131c7c03c6e0229ac4e0deeec09124f38a0f5281674deff868cd242755aee8365a366b6e1aef36d4c9ba41e0264b7abcdf
-DIST batik-i18n-1.9.pom 2994 BLAKE2B adea4794a946b99ad0ef3f732cb64c69983ef6c29150f153413a51b4eba16f2024e55c1e0dc4551f1039b2cf87a50660b1570c0f7d6d0f87dece77ed98e76563 SHA512 6bea0363d4c307f35941536e80b6b0abc810f52ee5c8f3020d0224cb044903409d1a1e93a4f712d64b5948d79c842a8f722503a8adbaa42c965c3e0399675c95
-DIST batik-parser-1.9.jar 76381 BLAKE2B d86318822c1ea56199039e3039b8c217aa8bfae21d101506b5ef51101f2d992d4e73a000e8f1d285d5967cbcb88c418c1ed64cf33261c8188a7b9f179625c803 SHA512 9d481d4704912d6dfda6bba026cbeb323f78402f4e46e48806f74d9115258021afa50013a3055b333ebcfb90db979be58d8d695de3d33a99bea7676590c9af57
-DIST batik-parser-1.9.pom 3801 BLAKE2B 67417881ce8c73facdb7f799c6653650f92e865e01c1b63f85fe660411ac4e71800747836a7d1fedfd116b93160033d05a394e77202bf6b098222f220bb06545 SHA512 ceddfc00595f0c685a93f537a7c502a2d8bc8218b1014157089e4089f913dbe2bc88b1dfd1c673d0fad0a31cb82700014a44dad6840cadc3f0c7c0bad69b8321
-DIST batik-script-1.9.jar 25675 BLAKE2B 98e08ef3b28f658aec08a959f6a306a7c0fa4cfbe1710e165c0153d5614489c58043ecd9c934b9df53576a3605679e41824b679f01cfdf20d27877d7bb86c1c4 SHA512 5200f7f6de7a6beefb3542b8c011ddb2365c7a888af09459e53017cc4b27e2d1a27e1bee7654fd7c7157ba3602eaa511974ef798bcd1b847a5376c8ecabddc62
-DIST batik-script-1.9.pom 3495 BLAKE2B d9383d1910d5a732be915dbc60dcf6933c239bf101723ca1df333aecb1f33fea4c6eea3851b468075b72c53e54c32a59f5ef548c75ed8cc26d31193feb514eb5 SHA512 cda9ef5b35526748597003dff5ed4744a97e2f1b0e20cc40c5c7a3b44fad51fa0214dbd07b321640baa21630caff4278bdd842dcb91b66c567f12a70890f5566
-DIST batik-svg-dom-1.9.jar 232616 BLAKE2B 0a6b9aa93b727d4e2c78dd48882cc2755552bde6503d00abb10e7fd2ad05f7461e6853cbba291761fd9677ed7370e380973d9fb121982a1d4d749110841a25a1 SHA512 34154755f0c9012040c312ba4cac759195383343227796d40234a46c8c52e37bb99082201be96f9a24d300c2f6a1628e27cc3f9be3b337274c00b5250669a48d
-DIST batik-svg-dom-1.9.pom 4256 BLAKE2B 404f52a801b0989ea7379e9ad6dd974722a7affef742bf1db33f5c967f4005187f58a1deb1758dd86ac82bd49fba7ea304b75a07fe9a4cb8928430205b077f39 SHA512 e87146f8952f7c96a733c47889db9a2fb98647ed69732744e46a587ee71f3165e7b8167dca056444ccd635b8934b07dc273ae29206ca68a71dc75c4e95fa81b9
-DIST batik-svggen-1.9.jar 224365 BLAKE2B 451c46272114adf32f9827332b17e6d2302d5ca8e4a31bda72ee997b0c09abf21f5d5d4d9f429ddffbb074645149f9a53f86632db6298d1cc5ca5eee77d7347c SHA512 bc62f5aa887eb952fe040bff3beece433119f36f2d00a8b50ac345a7a6720e71050ad6bd3a75294bcff320fee93e5b5eb9004e9b0bca65ad4079376c2a66c933
-DIST batik-svggen-1.9.pom 3493 BLAKE2B ea177a10f11c8930dbd8e846880d892634428b3022460086d0a8d43ad5ce788ed4da2a45b750fa8ae4152d9dcbcad07e9a453a3b33ed248cab222c05ec3bc8e1 SHA512 9aa897d2b1dd2377969b210b78045fe1fdbdffaafe7e4df577324e8e76a74e99a245ae87a72b54a01954625408e993ca33b42ff8812f033b7511d676e7955710
-DIST batik-transcoder-1.9.jar 127932 BLAKE2B c28702487cf3af4449d8856ca6eb370d7bc6b5b5b635381c4b05d9b7fa3bdeb6dde06243421d10fb3df0f85bd9ce1e4406164f5a86b3ec94e07706680d4c2fc4 SHA512 8c1d9eb730c918655718a825b73f8fdc649848f73eda43c53370411cd0a295f9f42c0d4292d463e3fe93afb451b5b0b91fd8aa27001aa09148fb32c58353af11
-DIST batik-transcoder-1.9.pom 4569 BLAKE2B 87efe8e542dc1868b53d0e4ec3030c34fef6bd148f3cafc63e3db53becae163e84637ba963e09d801046746d40973d7ee671a06f01f885d9917d8c99e13e5cf3 SHA512 b4dfed7a535e4201d07fa25de261362236ef67164b717d2ed4ec72531a4f6e5134e42248932e9998d4721ef93356bbb95b00b6036a3b7c6290b42ed568c798d9
-DIST batik-util-1.9.jar 126821 BLAKE2B 1df3f66224299b8ebc43cba9e699ed55cf9e22df1b5ad56a6cdc8fd46b33780e1b064f99f40590aa09cb961a4b6f92f6a08b1b525db98cc29394a1726304cb8d SHA512 42ca50f24f9c50bf22066a15eb8c84bcd907596a0eb0eff7057b5845b62cee6efb8e4353d4f53a4805df2872ecbbc9df0259d8e25119dde757bb6264ae578d36
-DIST batik-util-1.9.pom 3346 BLAKE2B f34c4f5e414129a82b91556df9b3b8fef13f51e917419123d7a96656998a43b949c82704875cdeebd1b6ebdd63ffc1079382ec8c625626fc91dda1d8f263a440 SHA512 88a888a545c07484c5ca4e593e9a5f36291f116e811e46ad7faeea2a09b37d543674f5e2041f089f34b03db95eb35b373089485df446a8718a08a08aecc43d63
-DIST batik-xml-1.9.jar 33463 BLAKE2B dce3ce848545541fd59e334913dffb92330dba547c4aa1025ffcb1bf8288492dcf835a4112a8bc9575b71be64c8decefa4540477b6f4aff9de65d1296efcbb2a SHA512 1f867ad7b0c3e21a99221bd810d008de05241bfc4e9609a8477e0b3c482225ba1c6ac2cb35af667ac9aa9fcb50b65ad6b832176e3775738354c78766fdc754af
-DIST batik-xml-1.9.pom 3190 BLAKE2B 362d0f62c87aa1aba68fcea8df55c3edc3dc9453390c103d68c51301c0d0b471c5654bc31a8cdf3ac081c12a7f1328ea0d9336bc72ea9ce79319534b86e16160 SHA512 bef4f5700809854e4ab5e2e102b80f5f44c7445a29f933e7650475051c35625f42d3b1240628099eefff432b69a176ff0653609b75c3972ed78baecb2453c578
+DIST batik-1.14.pom 7210 BLAKE2B 2db977ce961c247c1312384c60d9b7dd186a55b6770041d2dbdf4b9e53794a769928f0bceab5106719a032829f675bbbb9ebce6286d849ed70020715c21a63f8 SHA512 21bc4855e8ef9d6245cfffa3877d86f72722221b0496aae5246a54cf261d70bd32e25d08181ab80b8671a079afb2a67dde535fb9bf6f5b53042f8453b629cc01
+DIST batik-anim-1.14.jar 485809 BLAKE2B cf8e2197415977ab831e3a1b80d6ee1c3d3f6813abdbd21cafb3837c42b01fbc182f5e8a7e8b17f37002aa91ae6676fc8a6ed25520b049693c68fe0e6c8e5dfa SHA512 a8313841cabc1ff2173cefa9128ae96038114a35b5d95e723fd36c6fdef1ce1c03045491e7f74edc26bae80a64be8f1e8af1e59ad556d7e0e1cd6bb43a10f2d3
+DIST batik-anim-1.14.pom 3725 BLAKE2B 7a8b972d231328b1863808f9811135d61b88e47a3f94fa1a9fe579d4de62c08be938d485fe9cf8ff1c93a61a55aa3e0172d854d1044c18c04f253eef931c5e2c SHA512 330f2dd1bb9f54ba3cf18bdb03d93f971157454d111d2d3e0402dad5f8a6ed123173cbbdeb214852f59f0e75f05ec12a7bcdab6a574c5c775f1fc1e9ba2f63b2
+DIST batik-awt-util-1.14.jar 424624 BLAKE2B 153430e8986acb6f42409a31a93b73bb6dde9233785100b0e3330a2cf81e07ad2ab7c9aa7fd6547bd07ce4609806e46ab311b090f26234713b19b775e835b757 SHA512 ca51d78991c2e10e602f7223a61507ea2dcdc7e62f266f803aecd63de6f7819e565ce9ad36adbe54ce733962a60b2708b3cdba0c583cacb9cd38d3db7762f32f
+DIST batik-awt-util-1.14.pom 2756 BLAKE2B a1103ff7d0c4f2697f486cb6ad63892ccf2e747385f92eaf9c16133f0b7ab17af312e532a29713a268d7f309e88a377aefd29539da98fff9139e28c46bc4bc00 SHA512 9cc9886b14c6b9182966d5bf4b1ad7368b63b290f22dbf132f3d3995b266e805b18cec81ffd55ea79d401c219040243a92df4a0a808414ec315d2fd7178e8a53
+DIST batik-bridge-1.14.jar 703757 BLAKE2B 0342b85ed9171516224146461d649b41f837a6cd0bc7e7c16d1706786bde03c1ee4e49440d7548319ac03d8f05777a91f6aa53a5cd995f2e25bcbae6fffbe3ca SHA512 4af09e06ad4bee6f6fa63e4ffd3a9996c7425f71e96a0324cf9068e95180585c709e3b917734887afc0d0ce53e175dfe864a575ad5aca6734f9ad9f08de7f7da
+DIST batik-bridge-1.14.pom 4582 BLAKE2B 0209d3981dedb4881aca4094fcbd44991515a0c47d45b7a2f70708100f5253c758ff8b4e26e064334824b056f46f58bc10befee15d541e572e4821a9f05a12f4 SHA512 cdf88ca67758da83088e858ba41e4b170bee6e213f412534bb4abdd0e1673a61e757b2fb0075945b56841d63c820cc2b3cd4ca76fdc85d31645aa59fab4bd453
+DIST batik-codec-1.14.jar 112373 BLAKE2B 990177fdcd497d85ad95984d6a1370b0924759fe5f7f9bddf4630176a268971de4eebff7433c67d88ca579db6583f87d82e7a709f7d2537a635b1cadb3e179bb SHA512 ec7c7006373d077080098fb129368a419bb47dbb326b51ebb70f246fb2b462eaaeaa4d98a09d20709b6a2b17e332a49326f6bd6f080725f308ac7925700f385e
+DIST batik-codec-1.14.pom 3073 BLAKE2B 341e603892b079872a007d141531a961d603f9cc9ade721b7f79f433b4f4739b0d3eb1b7bf3d9e987785f73ef5e165586d27f8c428d3c9ba14baa09ad62935b0 SHA512 5aa3a0ca3f46023660fd39de99adaf5c8cea58886670dce43fba720e7efe969f6a76834fbb4bf44524608790d9808662984eec9afd033dfa590a12601818e954
+DIST batik-constants-1.14.jar 8433 BLAKE2B f3934d49490c45cb32fe038062c50b409d85566cd6be8b71a13525a46671c5a5525c9fe3ad3c230fa9cfcd7651d4dc12a5b0eb3038c5f6c3374afca5057ea16c SHA512 b6e859e4cdb0c6f338955d5aacf26b08a24dea4ee043258a2e1ea84690f5c4fa219c1f5cabb7bc40499144a0c4fdcd964479c0afe7e09eac471490b67cb40bc8
+DIST batik-constants-1.14.pom 2410 BLAKE2B 35e0306eb13ff6af0e861a527d82bd0ca203cb90a3032a0119d3a02bddb199ee966ff8a4d10b34823cf8bc1b7c6fd3409d3ece246d3066a4d3d46c5eb4f75fa6 SHA512 2c41ed57ec653d511166db401734738dd0feffa9ceb95e6e06cf794d075b94d056015e63b9045aa87da6fdc57c6a29cac7b2c8ebf404c626a9be9ad2afb17009
+DIST batik-css-1.14.jar 330318 BLAKE2B a13793aa49c2b22b37c51b1d8636c6f03b2beee71c3ed6c6eeafb5f710d3d66d9279fbb1152df0e2c6e03c24ddee1faeebd43731344efe00ccffddcc39f32a0c SHA512 1cb0993d79793be9d66e9cb346abecc15a0fe27ca39290a3a2a9627b8b77f438590097c3d1ec1c37b112c28eb13700853586a000d244c1b2b06e03410da2b52a
+DIST batik-css-1.14.pom 2908 BLAKE2B 4d3b6acbe8301f8ec2294736ec8258625c38b6a43b24c91f4aa78f6ff19eaba3b935488a40a14a34c0c4f3fba03ba8bd1452f3f68a09a929c3caf1aa787d5e58 SHA512 369e0fa3042405a75414b3c17562c2f405ef9eabedd1a2e8e0990a420e0bc915971861736c5ecaf6ef62272050519882b0c2dd446854a1f55068b2c583b451cf
+DIST batik-dom-1.14.jar 184487 BLAKE2B f84d5dbd60ed82e1bb68ac447f5b95f4ee54a315dcaff40c516a341aa06ee768207ca8bdf1b95c6ada8cb8f0b234c178192eac52f87bfcd844f66a9efbfd51ad SHA512 923ecb2e19576180dd212681416414f6d546d22df8af34ce88e493f6f45b2c4267d812531bba7304df36690c334f87db1eba63c08314f131114fb2ae0ad7aa16
+DIST batik-dom-1.14.pom 3520 BLAKE2B 310c896aebd793125658a3a7ec84e0518573361ef0988e0ad58ce56b9043c1375102fe0651767b779e4c6837269cb7d3823551d6abeebd8ca605f88e6c294068 SHA512 7ce67cfc43e9a7dc8aba7ceacbbae1d8d1892a386838f2e24ca94e402a8d846b4d2171d9114e8e681bf8bf6749b48fc3067c9ab028fdfa1fe0762869b9226823
+DIST batik-ext-1.14.jar 10238 BLAKE2B ec95f8d9aec587187775fea227aed9902a22ca8b549a2cbece7d0a7641d23297d8ee24069cf88517dac2f64932f874d977cce6eb39349aa7d74f080130d1cbe6 SHA512 ea86979d559ac16fb09bd49984ffc2f13ebdbf5e4bd054d3620b01e923afc0c189fdb47485a440507c456a752b228ffa1a7413169f2faaf9f3fa80946ca5ae44
+DIST batik-ext-1.14.pom 2400 BLAKE2B 857ebe8995440b0bf8e864a657af982ed385663beaf4c8c618f4f9f771c9522f92dfecf44bdada1ee543d143cd07fbf47c5566083c995141535489fa4466ddcf SHA512 666a4a6a00fcaf06be0575248d09f7b4f40f4244e89ee95068ab1a2fdc5562fa4272d721f028cc943b2dd0d3133a1609b09f1b8275231ce341ac39e40655c5b2
+DIST batik-gvt-1.14.jar 192087 BLAKE2B 2d497605983ffdddab9a798f593a2d08c77eb57ee6ce1ef2970bbe5f029aed1972b480ee38d7e067078cfe510035edd72b64a95581cd0c57d23751133802225e SHA512 fec7964d731dc975fc59acb7709452cc7b800ac153a1582d3e67184c940a4d300570bb3872a66c17a8e8af2b82d2c1858ed7d3a31e4c273171898b0f1369e761
+DIST batik-gvt-1.14.pom 2747 BLAKE2B 8cc18aa1e1ee8666971ea1310d61fad0ead47b1fca2d0580fe5e8d80523276918b05aee6d75c4c77ca9edf78ffb62db33aba0a3f15254fdfe2cc49c5d255924a SHA512 31a4a91e6447483f71de90fb9eadcc76d1f226a42f7b0eca4f7dc65276b61bdfdf6fc5ae8318f5a9e53e54bbc901887841774e96335bfc901498de2003705723
+DIST batik-i18n-1.14.jar 11466 BLAKE2B 48ce80015d4457008b0f4efbb6c383025181fc7f8a0429bcca7cd3d18f391bb8941d2bbdb11013bd52b1c0ffe0429147ea404d12f36cf64ae41adf953529cad1 SHA512 1631b8ccf27ea201c595cdf11f78a6ab0bbafd89e1e2ca2c55a4a5dd8ea200d09128fd5464a1c03ff9813a431407d6e21dc1c0351dfd1812d9af63bb24a8c111
+DIST batik-i18n-1.14.pom 2404 BLAKE2B 9b0f58f6db0c1814226b74628c9512774b90eaef3bd6b9191f3ad5f31d123e97e22f5e5bb4fe96d81008a252f55d4ddd7952237d3b1fb43ca34db71a57628180 SHA512 48e2170150c2fb14c59efd3469cd9205f79390a760995336b70919e16b3b5eba120ef31f40ef3d90bc1f8f2e1403d99633d132fdcd364451fbcfd088127b54c2
+DIST batik-parser-1.14.jar 76875 BLAKE2B da727cf4bd650eb87f059d6a3bba307cf188718fbc6db055993522828a8df3926f90b83bbadf8336f486570624a92bd3cbb573ff2cfcbc1f5b7a8a1dfcc19d1e SHA512 f343f11211e14506a39eb730246fb204dbf9bb6bd7c20536c7082f2b738aaf1c2b7320525865af7d3ad3c01f4f87249ed21c4c30cb89fa4973ece36663f78b3f
+DIST batik-parser-1.14.pom 3070 BLAKE2B a0df5b4ec11c9c29f79289f479bd5c53b828c43aefc8ebf207c915d2fe47b1cdcc8c4ac73180c4fcbe9c6ec4e41f0fe931bafed5201a15a8affc4c8c731ad9e1 SHA512 6f349132b25fcd78b0354f57e389e38be2e1624e1f984bb4834be75e0be0a39bc381223a69a74b7ca72639588d9c8db7bb0420b54e52395e14ac29f1ef1dc4ff
+DIST batik-script-1.14.jar 25876 BLAKE2B 567c951df0c600d2f8a00dc0d443fa906f2c27a4b7b949e064d5a62a1a276f97242dc24b35619f3bea9b0fe4bd931102810f72bbe9c1e21885b8c792175828ed SHA512 9f8596ee485ac98ad17efc5956f1ad58d5339f7fcbaf6252c53a92e0256e00ce2aab8ac7591915924f91b6fa1050a0a5a5d002fa97dbe8d74fbb40ceaa3f9ab0
+DIST batik-script-1.14.pom 3399 BLAKE2B 3416dc60095d4760d183b35ec1f047d262748f1fc4417680dbc5110920b94a2078de82a657bf700eda473bd2ee00da2456b315025deb1b6bc3adefeb3e146cdb SHA512 c737f2242372b978d9e51368002854877611ce08a0360d6456d6e99f5f033090516bcbf044dbecca997afe17047f86456b2e0c4b2512b7dedc5eae565632a8cc
+DIST batik-shared-resources-1.14.jar 6663 BLAKE2B 0ee3023271bdd13a65af7360b3fba85006364e5cdfa7f4fbe9b30dbfe48ebfe7e8a1f7b31e526016320ce8c3d33fd171d3c217ab9352053a7f24aebaddd4d6ba SHA512 53fe996f79f97a2b4c8d2fb88d0765954e5676ddf9701147d20c06f08254554620fb87ae9ffe72652f351867f7d56af101301414d7b68260ac091a854b08b198
+DIST batik-shared-resources-1.14.pom 1681 BLAKE2B c8630518a316b3f2f5cb1a23381a31d9a8e35048530dbcdb2e28f43578deba1586a73a203245016c88acaa2c8244ab449e1573213255792816c6676ea0b1d12b SHA512 81843067b4442704952ecd291c51c60a58ccc4f16de53ae1b8041a81983681d92c42526c0d17eeae38b5d8897ff1bdbefdf1e02ad5500314132359c05faad57f
+DIST batik-svg-dom-1.14.jar 232734 BLAKE2B 16df5799fd86683ba23c7adc5b3c83912230ebc43ee3325d45a289194e2c892b32794e692b6ef3049050794977d79fb4ab204837e1fa61c7d3c0c471e4b4b277 SHA512 6a6c524bc1e594de86cc17bde901207936e6f6d2cf4d3bf57523e9f35fdd63c6b4cbb5dfb5677116079f714617f8b0c7c2ffd92a2a96b8de570b94b85064816a
+DIST batik-svg-dom-1.14.pom 3566 BLAKE2B f282271d4920952ea99b1d8fe010305521e5788cea93bc72be397d7dfaacad550a75be29faeb4cbe36675014d53560ebfff4f6c5352c56699834bf83cc557f8d SHA512 d0d56620ece6a00d5672a7f0e77f4ea685630558079623ef1200e227072df45e013fdd99710387d3d8c5f3c143c975eac3c243e6fc6b3b52208e2d888a6890cc
+DIST batik-svggen-1.14.jar 227514 BLAKE2B 10742c52bbaafdcdd82cb0b50f584cdc07f6f1dbfe05b6a8a49675050fceaf30ce5c3f63e66d8b40a3766cd8839044cdef33a5399fd87e41745334cb620d027f SHA512 40c87d3d25182ecd2490890100f70a4cd53523fda59438d2df9229f55d04f9c0f45757142a214b37b701290e23468df4061d00daa5cbcb533f95cca36cec4343
+DIST batik-svggen-1.14.pom 2744 BLAKE2B 21ed28cfe716a1cd68955a613afc053270db97fee71a882ef181c9fc1af6ba6fd4e8d19cf3b607c31e606c4ec353508370a6b3b16209eb57bc16d6ad56522c55 SHA512 663d79add1ceb04d18cb0b0b76f09c8b781482b3d9530d00b06b678439e941206329853d2b3f0db3c547ae1ebd11190548ff19c824f0005ae0c5e83ef38328c2
+DIST batik-transcoder-1.14.jar 129300 BLAKE2B 3c152a4ee26d5a4e5f3db73779c012a700a7a29fd801b9957f627e655bd3f0a9e97756fcf31024d77ad07d82a03f01fb6855378b0cd6c90121350f4fdbd022a6 SHA512 ae69c6a9cdcc93f8bf0e8279c7bb421b3d7f957fe96c0395896ae63fafd5d7ca29fc1c12aca8857706c2cda11059270f762752eef25ec04eca00aae22f6de625
+DIST batik-transcoder-1.14.pom 3925 BLAKE2B 34648926fdbc0b811affc4e0387abce9e4774517703debda8b635f75f117198ad015afcd5339ba5d81927285902928ff0782dca44d7938d1788d4bb6ffd0bcd6 SHA512 54c27f39462b18b28aabb56938c3a0a9599655d95917802568cbb95d74a68141140bf619f46f898f3bf52b14506f26717a274f6027a08d72edc7c1128f3ae38f
+DIST batik-util-1.14.jar 127477 BLAKE2B e69b56805cfbc7db77b805e1b37421b26d0b6a6df42041b825656da2c9cc60beca12b8c069e8b75ebfb89778557883eefa1f52c92191033401a386a486360e7b SHA512 6dca37c52f954c677ca003e6f7c7c43a553d73883d936a71497fb3484d277def9a13bda35e857ff61ff724c8dfb257e636a9d11d9163f1cd313d86394fe6d176
+DIST batik-util-1.14.pom 3870 BLAKE2B ae89e39a9724592316c8a3c14320268d367ac9a03e1af52ef06656279790647cff9c3545ff76f45d54cc498cbb3776c03105670593939ec91272ba15e3829bf5 SHA512 059d7cfcb6d8dc015d56c4bc1a67b2ebe25a746cd621d55ba1a7575da5813bfa9c8477b2c04d16d34ac436e9700d737afd70ce294ab23e0c530b911d35df0feb
+DIST batik-xml-1.14.jar 33866 BLAKE2B 21d0cd58e787651aa363e54ff8b4e0af29c883d044a090a85503480d7931664942cacf40e119e7ba9f5cf864e32b94b35612c0238a5b8df27cdefe8bc8361d86 SHA512 0fa51a33cae4d36f18e5709647d96204eb0ca2327a7d9434f5210c1c6730006094656c067f961d508cc1780fc565b59df1546fab39abf58311cfbe4248eb092b
+DIST batik-xml-1.14.pom 2565 BLAKE2B cc4506e38796b1da98892e171164d312f89d1e469167c343725f3833e418659f67c2862c8ecc8b5dbf2f1c455fedb9b098e8469824868ae21e837ea14c5546a3 SHA512 569b30ec06193047f6796fd3976205596e79967313f5ea4024497d763e01cff016a69a6293bc1dcb07c2528bc31c3b61b5b289517ab055dea69d2d8c2201b3c6
 DIST clojure-1.9.0.jar 3688794 BLAKE2B c73a947ed90b40d517d827d2045a9fb283370f1935e95dd78cdd054d7260770a9a0df77f0832b573733c0176493749a77409de5e74d3678cd4e752da7977a217 SHA512 7fdcc6fe280c44966cbe38b2758cacb3eadfade07eca9ce0a50bbf71129a6ce0e7b1959067f6b7f47500b30bdf7a68891e18600d5b1c2afc7288f0bbb330ec2f
 DIST clojure-1.9.0.pom 10055 BLAKE2B a6cafc7b7bb587f1661941f0c670c58f597941ac7d6f22b6a58366670436e25d89b1018f6770d0e51a7f894748860608965f24c29d0fcd11c7d12b68d1291e17 SHA512 29d6210fd67c5552b1d4d3afa628c40cbfb321b2663ca8d204ef1a488599054b0611f03c6ef184cf15c94fdafd4b971e4a1e9cf2f7f0d1341f801d98a008e7cb
 DIST commons-cli-1.4.jar 53820 BLAKE2B dcb5aa30dba82596277d165de51532a9e0027eb9c1d53946851068f7acaef68fae5c6431a1ef5a465f34ed51011ded904ec50325b29d2e4123b7ae02e5b6e36c SHA512 fa769a08a118141831cd4eaf2ce4f3f65855b8aeee86fbf3e07b4c619facf801f8b55c14c5e56a154cd14f438a8f120bb59a20c1b6be04979501e362f252ca48
@@ -47,7 +51,6 @@ DIST commons-logging-1.0.4.pom 5264 BLAKE2B 9043130bebbc9df98500cfdcde7dd3895652
 DIST commons-parent-42.pom 67956 BLAKE2B 9d00c017420c825a85584c18e15a080ba98eb166a7a62fd685b7e483d943436464c998d8469c699323718f9ef60305278da7bc5c2008009234ded1c2eca9813e SHA512 a35d1f7919551adbeada88d9f47a4d6de200380aa43266f91d4b65255120cbf4b11f73bb3f9b98eeb960fd9f1b0793dd48095b46270ed2376ce3b122861a94d6
 DIST core.specs.alpha-0.1.24.jar 4236 BLAKE2B c70795b7c1ae1959bca231b3294e26ef8c8dcd17bf8ee3b215165275ab47a983ac20492f7e74e78a715bdd4b1743a0c3bd0009c8cc111dfeb316de9330537616 SHA512 b4f5eee01da39914e6024dd529d1f72952d5a9dae65e1e41bf386b1e86a004a0d197b5be95aa70e7e8d6438c92b7fa8fc0c5039f2013e97c0b91c22d86fb7968
 DIST core.specs.alpha-0.1.24.pom 2845 BLAKE2B dcd50ffba6f33e8685cfadb748ea53a9faf31cf34498ce18be6e95512539e2ceed180e400fd1e3ac2adcf680656a23369f381033f777a41ed573c099e3f7aba1 SHA512 14965a5e65c000ba8fa4753be3246514f29c43eb1eaf120e967d6b85a59dd44611a91273f47663aba244fcf87dc53f34cfdd82d6e5d81b018f807ac665d6806d
-DIST ditaa-0.10.tar.gz 4514464 BLAKE2B e5d21ec0ae1e2410fc77f21cdda45924be61824354ad3e3264f95ac7a40a473e7c96d4b101d2938ed564066650ae7a66b3f4c7b89ddb0462eb817063d9bee2c0 SHA512 0abd70657d53ddf222d6a86b0c68064d1da093e421b060f59f73b91dccfdf7764beaad96bb1553c0d4b1c8a57b4922de63b20196a1ce3929b4a2e68b6f2a793c
 DIST ditaa-0.11.0.tar.gz 534679 BLAKE2B 3613b74d9d339688ad35c13c9e2f2bd7ead927ce860e7387bbb9fbb5b011ba9503dae58dba9ec523a3ec49886bdc9885c6c156dfe574335873c5edbe0b072611 SHA512 fde75a33300000c68eca499d54400beb108220022cd1982ab9c1a1ce6f48eb57bca8bffecb52b69cab75c646d9eb951434067cec6ff98044adb177e8ec7ed560
 DIST jericho-html-3.4.jar 238398 BLAKE2B 3d22115a5608ab1bb2dccb8412a672e97b8132dd7aa3f0cfdc827b465b48b3b6412a71cc660adce2722c0446d96ebfb12f3b0ba8d009493aad11ab4899c7eb24 SHA512 7dab0cc8fe3d48afb948f8f35e787d5843e8e7e0982426278342a4855998fbe974e7e5b1448043813edfe8c08dc757174bcf882d6a19941e337d79ea5ecde9a9
 DIST jericho-html-3.4.pom 2634 BLAKE2B 5c0a069238ca9e6e7662b37f9d8c087f5b449179f39694f65a2661d29b780b5d2d447c3781742e5c2143e14e67574418ff1ccb8f0b6627d52d909c8f37c966de SHA512 0e35349315527d80f69f6d8a65cb51ef460250ac11ac97c823ddac5b70fb3f016263b5489318ba47ad28f0f40114121e49350b025a694cccd94e86a03b2a1e85
@@ -58,12 +61,12 @@ DIST spec.alpha-0.1.143.jar 591287 BLAKE2B bd6bf420b4e648daec555eabea298a9f66156
 DIST spec.alpha-0.1.143.pom 3532 BLAKE2B 28e7e5d69983e17a7e17f149ada808208212db75adeb16101d837b44a38d4f14bc53a55ca125a4477952b9f95dad1d95ecb7bcd0e8fd65e210ba01bc47949351 SHA512 f0e2a521cfb9eb2b1f61189a12c81cd5046fa4a26501bf040e67e8bdfb66e74df2d9021631c1407b7d6c876f33d8913aefb871aa7c4b46cb87837ba336e37584
 DIST xalan-2.7.2.jar 3154938 BLAKE2B 8448f397c7c4503a536ea195f751230aa17a95c454ab28f7608e9aa38a009c1a8265d850559a6c76daadd262e2abcbb69ef59987670b75b9d1bf8e543e0acc02 SHA512 00f859c5bd65f6dc91e396ce91fe2f6d30b2354d6b419cd9ea96984c5403e5cd1342bb9362b0ae1f2792612f0df731c4f7ac92f16a825bb7e22089c27a129c6c
 DIST xalan-2.7.2.pom 1277 BLAKE2B d6168dc0d946431df8b94a674a802252bb6c6a97d0dd8c1e8373a8c4e1937f1edd8dbe1dec7fec37a2974271925eea9aef977b73bc81c2bf6d8b6bdfdfedc2ec SHA512 4b95e3eb3a2ab262c9a27040a5214cfb8c49c36ece8e71a933074eb063205ef96deff351f017b034c9c97d43d77b020482aade7bc01e1245d8ee10a51269c5ce
-DIST xml-apis-1.3.04.jar 194354 BLAKE2B 31db62e2922cfcec1872d53abfb4ca642fa9816eb46fdf325261bcb59b8849188128aa5ed48210123aa7d660a1c030c36e7ff2d711295523fb3f4e90caeff9d3 SHA512 1086a52924add2406e0b4ec7219a8783ac20e02a32a7a2461efbf092f0070501f7cade9c0588907c403352f1a48f80b950e6d40b2e4e3e9eb886e7db4e97bdec
 DIST xml-apis-1.3.04.pom 1822 BLAKE2B 409040fecc5d1837f84d176fe4a32bfbe21cebd585eea2b3b81eaac2a1d23c7e94cef562414c9ec4f5d21d0ca4337ec291202bcd79f8d87120d538ce53b81c5b SHA512 98efaaedfd6f663dcb7353c1f47dd4f6157c00eabd7f96beb37aad711ba2f380c087f45584757543ac6d566cd0b1f2d955b076dcdf48ffa22a770e3fc5d8e3c0
+DIST xml-apis-1.4.01.jar 220536 BLAKE2B f5570e9188faca296c1dbb2c466749b77d08569600bdab0720be7f1079da30e4c0bb1374c9db2ea361d9b66bab674572eef385d7e9572c242bd1d02d4dda9e86 SHA512 8db0283b6840cd6407957d296b802e3edf90653e2722f8e29f86c1c0b60996c4b43e9e065e6864dab89b2138ddb0174d9b4fdda4a93f94eeb884783db82f3268
+DIST xml-apis-1.4.01.pom 2661 BLAKE2B c509e115ef02292bdaa33a76532d5ce12d30159b4dbfe1df5ee9ad17fab1876178e7d7c778c8b2f41be1eae1a3df80c82e1bde24ba9e2d3f4203f1ba30f175fe SHA512 814138ba9398f277244281968ff82a3f772425b48a720d401ddfcefdab9becce0e87d3475838e07b5ba23383d2106e36c515f35868643079ebe8a37a4381f990
 DIST xml-apis-ext-1.3.04.jar 85686 BLAKE2B 8ab0f8e8ff2c944765261155fe26aae84807ac9a3ac7c123cb7b36836b36c224fe4bd2ae74c4d853a126f712fa495d868a80758de0dc992ea92b4a995392ca68 SHA512 ac0896b9a3fea71644330daef4eccb33005b5b7ac1e1d1d73eed2b2a1f4b2282057f3c0f3698b899e1c76b19c09c69bf4cd0ee548427b9bcc676b791db5c36bc
 DIST xml-apis-ext-1.3.04.pom 1837 BLAKE2B a1db75a095c5a007fe95088428aa84efc6d94ced3702470e24e324e7cee89aceb4508cbfad79486e2b2eecbf0453266c652c825e2e048919fc938ff92fc97721 SHA512 f5c4cc21a9b8f359e610c5661f866c2bbbe4f6e887dd678bee9036dd5ec0e6f771a7e0f302f00d10f7f454d1c7376f3813e880a3ad733449fc81927cd2384e17
-DIST xmlgraphics-commons-2.2.jar 646509 BLAKE2B d129509003efc96a737d90c8e0bf52cf0a7b8e75ecd6eac44f918022a88290d498430c6e0eb903c100a026e2b863e391b8b6f20e78bdb1c22c589557616e9e49 SHA512 77f07e7ccce8f55dfbddbc4a9777aaacebd13a55edb67124017683c0e0bbdcf5bfa54d91a86de700e3116fbabc066b1810d189c4832bf1464db9c52a3c9f554a
-DIST xmlgraphics-commons-2.2.pom 3480 BLAKE2B c4694909338261307bc5bffe3e0de003bcbffa7dbeac3f568022bd9a42f9ba6a3138858d2354de0a9ab21ab9219c8d8577cc4b440921b3727053dfd1df7bb95e SHA512 3fa756d43ffd9e2b50f804f63a412329e74c96e3487b97676882c574daa08a1167b41f438cc07b575816c6f6ddbac5d017d0a34a74218834aac4fa90baf98b95
-EBUILD ditaa-0.10.ebuild 877 BLAKE2B bfef9480532218b20fb76898966ccfe733ed35a66921657aaa2029f369d7bcd5a8960b762e05b2e7e07b099f6926581e2694f82ffa2d4db2727d504a17edebe8 SHA512 16a191d7bd8eb04a12f5099aab7103ced74004baafa67edd4567e410c33e538ce32a086f6ffb961ad210136dfd60ccee2919e7341709c41669945ad11378d6c2
-EBUILD ditaa-0.11.0.ebuild 7444 BLAKE2B 6c61e65f837c691293c5b39e8ea9407595d3f7a5ee6b9bf87a1740d9642c9c610494bda2275e748f00c640462fdb0a8312bacb7b2c0c79b7c48f34506121162b SHA512 3157bb91c4035de6807d8587d3a3b9c095bc3a6478145e733553981a481031b91d34ffbf56aa11709f399ea8c9824d3ab8ab4d366829a9bcbdf3cc68c04fcb67
+DIST xmlgraphics-commons-2.6.jar 674607 BLAKE2B fe2702760b6b2fb633254dbee49e9c72dc721db47d904e1297145ae8bdaec3006abcd1f2205da61ba89742cee7b97c2b2f35500bb74ec8596a8c23c1202ef448 SHA512 7df1eb0cd5a73ad78259f4905b8363610711cc660f3590133da8376f771ec5990e8dbea1b4d7e3a8264df17c632713a66610538916291a3ce91506de6d3a023c
+DIST xmlgraphics-commons-2.6.pom 3480 BLAKE2B 0185976d3673122b8f86fade7a1f965480ada78b54fbd1640690bcb5c7c20bd22dd141402d12209c8389ce1812ef0b694c1ecb402d6672cb84d3527f7b0ea65c SHA512 1a601a75035a19ba8c17ca4df936cfd891528a64093004b36dd373ad94c47c51a6deaf68c4c35d8cfd95309666049a25b9dd317df6f70ea3312c0ba130ec9091
+EBUILD ditaa-0.11.0-r1.ebuild 8040 BLAKE2B a8605dfb5911db9baa765cc73cf19cc111476171c6b8b305f65bf7ed7cd2bdfc0c49a011caa45379af27e363222a7b4696269ff39a98761e85c8881374267fe6 SHA512 de0dd1f965326b5e386a4f4fa6676fd411d7aae2ae83453b8e3a659ac240565263e5d796393bc146c5ff4ad03b13c55ad54dbf55f5d2a6b39bb62896789a63d8
 MISC metadata.xml 354 BLAKE2B 5a0b871f04047f94815dd840bebd1a68bc776965a70d9f346751681914edb5920c564a66df694d44cbd454477f53d046905e30fe45612149a8c5c9408b506b10 SHA512 98c30a65e92092662dc310d46570023bcf3e4a2069d9989cb425dc0053c908759e013c493811858cbee924334a52cadbb1d8073fb47bce95f955f89165787d0f
diff --git a/media-gfx/ditaa/ditaa-0.10.ebuild b/media-gfx/ditaa/ditaa-0.10.ebuild
deleted file mode 100644
index 2880c26215bb..000000000000
--- a/media-gfx/ditaa/ditaa-0.10.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2
-
-DESCRIPTION="A utility that converts ascii-art diagrams to bitmap diagrams"
-HOMEPAGE="https://github.com/stathissideris/ditaa"
-SRC_URI="https://github.com/stathissideris/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-java/ant-core:0
-	>=virtual/jdk-1.7:*"
-RDEPEND=">=virtual/jdk-1.7:*"
-
-src_prepare() {
-	default
-	sed "s:0_9:${PV/./_}:" -i build/release.xml || die
-	sed "s:version 0.9:version ${PV}:" -i \
-		src/org/stathissideris/ascii2image/core/CommandLineConverter.java || die
-}
-
-src_compile() {
-	mkdir bin || die
-	ant -buildfile build/release.xml release-jar || die
-}
-
-src_install() {
-	java-pkg_newjar releases/${PN}${PV/./_}.jar ${PN}.jar
-	java-pkg_dolauncher ${PN}
-}
diff --git a/media-gfx/ditaa/ditaa-0.11.0.ebuild b/media-gfx/ditaa/ditaa-0.11.0-r1.ebuild
index eecb078348d3..9c7d804181c5 100644
--- a/media-gfx/ditaa/ditaa-0.11.0.ebuild
+++ b/media-gfx/ditaa/ditaa-0.11.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit java-pkg-2
 
@@ -18,6 +18,8 @@ DEPEND="dev-java/leiningen-bin
 	>=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jdk-1.8:*"
 
+PATCHES=("${FILESDIR}"/ditaa-0.11.0-batik-1.14.patch)
+
 EMAVEN_VENDOR=(
 	"https://repo.maven.apache.org/maven2 commons-cli/commons-cli/1.4/commons-cli-1.4.jar"
 	"https://repo.maven.apache.org/maven2 commons-cli/commons-cli/1.4/commons-cli-1.4.pom"
@@ -27,47 +29,50 @@ EMAVEN_VENDOR=(
 	"https://repo.maven.apache.org/maven2 commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom"
 	"https://repo.maven.apache.org/maven2 net/htmlparser/jericho/jericho-html/3.4/jericho-html-3.4.jar"
 	"https://repo.maven.apache.org/maven2 net/htmlparser/jericho/jericho-html/3.4/jericho-html-3.4.pom"
-	"https://repo.maven.apache.org/maven2 org/apache/apache/18/apache-18.pom"
 	"https://repo.maven.apache.org/maven2 org/apache/apache/3/apache-3.pom"
 	"https://repo.maven.apache.org/maven2 org/apache/apache/4/apache-4.pom"
 	"https://repo.maven.apache.org/maven2 org/apache/apache/7/apache-7.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/apache/18/apache-18.pom"
 	"https://repo.maven.apache.org/maven2 org/apache/commons/commons-parent/42/commons-parent-42.pom"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-anim/1.9/batik-anim-1.9.jar"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-anim/1.9/batik-anim-1.9.pom"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-awt-util/1.9/batik-awt-util-1.9.jar"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-awt-util/1.9/batik-awt-util-1.9.pom"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-bridge/1.9/batik-bridge-1.9.jar"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-bridge/1.9/batik-bridge-1.9.pom"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-codec/1.9/batik-codec-1.9.jar"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-codec/1.9/batik-codec-1.9.pom"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-constants/1.9/batik-constants-1.9.jar"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-constants/1.9/batik-constants-1.9.pom"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-css/1.9/batik-css-1.9.jar"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-css/1.9/batik-css-1.9.pom"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-dom/1.9/batik-dom-1.9.jar"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-dom/1.9/batik-dom-1.9.pom"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-ext/1.9/batik-ext-1.9.jar"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-ext/1.9/batik-ext-1.9.pom"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-gvt/1.9/batik-gvt-1.9.jar"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-gvt/1.9/batik-gvt-1.9.pom"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-i18n/1.9/batik-i18n-1.9.jar"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-i18n/1.9/batik-i18n-1.9.pom"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-parser/1.9/batik-parser-1.9.jar"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-parser/1.9/batik-parser-1.9.pom"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-script/1.9/batik-script-1.9.jar"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-script/1.9/batik-script-1.9.pom"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-svg-dom/1.9/batik-svg-dom-1.9.jar"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-svg-dom/1.9/batik-svg-dom-1.9.pom"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-svggen/1.9/batik-svggen-1.9.jar"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-svggen/1.9/batik-svggen-1.9.pom"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-transcoder/1.9/batik-transcoder-1.9.jar"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-transcoder/1.9/batik-transcoder-1.9.pom"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-util/1.9/batik-util-1.9.jar"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-util/1.9/batik-util-1.9.pom"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-xml/1.9/batik-xml-1.9.jar"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-xml/1.9/batik-xml-1.9.pom"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/xmlgraphics-commons/2.2/xmlgraphics-commons-2.2.jar"
-	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/xmlgraphics-commons/2.2/xmlgraphics-commons-2.2.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-anim/1.14/batik-anim-1.14.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-anim/1.14/batik-anim-1.14.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-awt-util/1.14/batik-awt-util-1.14.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-awt-util/1.14/batik-awt-util-1.14.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-bridge/1.14/batik-bridge-1.14.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-bridge/1.14/batik-bridge-1.14.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-codec/1.14/batik-codec-1.14.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-codec/1.14/batik-codec-1.14.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-constants/1.14/batik-constants-1.14.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-constants/1.14/batik-constants-1.14.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-css/1.14/batik-css-1.14.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-css/1.14/batik-css-1.14.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-dom/1.14/batik-dom-1.14.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-dom/1.14/batik-dom-1.14.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-ext/1.14/batik-ext-1.14.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-ext/1.14/batik-ext-1.14.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-gvt/1.14/batik-gvt-1.14.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-gvt/1.14/batik-gvt-1.14.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-i18n/1.14/batik-i18n-1.14.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-i18n/1.14/batik-i18n-1.14.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-parser/1.14/batik-parser-1.14.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-parser/1.14/batik-parser-1.14.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-script/1.14/batik-script-1.14.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-script/1.14/batik-script-1.14.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-shared-resources/1.14/batik-shared-resources-1.14.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-shared-resources/1.14/batik-shared-resources-1.14.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-svggen/1.14/batik-svggen-1.14.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-svggen/1.14/batik-svggen-1.14.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-svg-dom/1.14/batik-svg-dom-1.14.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-svg-dom/1.14/batik-svg-dom-1.14.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-transcoder/1.14/batik-transcoder-1.14.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-transcoder/1.14/batik-transcoder-1.14.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-util/1.14/batik-util-1.14.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-util/1.14/batik-util-1.14.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-xml/1.14/batik-xml-1.14.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-xml/1.14/batik-xml-1.14.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik/1.14/batik-1.14.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/xmlgraphics-commons/2.6/xmlgraphics-commons-2.6.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/xmlgraphics-commons/2.6/xmlgraphics-commons-2.6.pom"
 	"https://repo.maven.apache.org/maven2 org/clojure/clojure/1.9.0/clojure-1.9.0.jar"
 	"https://repo.maven.apache.org/maven2 org/clojure/clojure/1.9.0/clojure-1.9.0.pom"
 	"https://repo.maven.apache.org/maven2 org/clojure/core.specs.alpha/0.1.24/core.specs.alpha-0.1.24.jar"
@@ -81,8 +86,9 @@ EMAVEN_VENDOR=(
 	"https://repo.maven.apache.org/maven2 xalan/xalan/2.7.2/xalan-2.7.2.pom"
 	"https://repo.maven.apache.org/maven2 xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04.jar"
 	"https://repo.maven.apache.org/maven2 xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04.pom"
-	"https://repo.maven.apache.org/maven2 xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar"
 	"https://repo.maven.apache.org/maven2 xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom"
+	"https://repo.maven.apache.org/maven2 xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar"
+	"https://repo.maven.apache.org/maven2 xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.pom"
 )
 
 __set_vendor_uri() {
@@ -108,6 +114,11 @@ src_unpack() {
 	done
 }
 
+src_prepare () {
+	default
+	java-pkg-2_src_prepare
+}
+
 src_compile() {
 	export HOME=${T}
 	mkdir ~/.lein || die
diff --git a/media-gfx/ditaa/files/ditaa-0.11.0-batik-1.14.patch b/media-gfx/ditaa/files/ditaa-0.11.0-batik-1.14.patch
new file mode 100644
index 000000000000..c1be8bedd25f
--- /dev/null
+++ b/media-gfx/ditaa/files/ditaa-0.11.0-batik-1.14.patch
@@ -0,0 +1,17 @@
+diff --git a/project.clj b/project.clj
+index df0aefe..759433b 100644
+--- a/project.clj
++++ b/project.clj
+@@ -7,9 +7,9 @@
+   :dependencies [[org.clojure/clojure "1.9.0"]
+                  [commons-cli/commons-cli "1.4"]
+                  [net.htmlparser.jericho/jericho-html "3.4"]
+-                 [org.apache.xmlgraphics/batik-gvt "1.9"]
+-                 [org.apache.xmlgraphics/batik-codec "1.9"]
+-                 [org.apache.xmlgraphics/batik-bridge "1.9"]]
++                 [org.apache.xmlgraphics/batik-gvt "1.14"]
++                 [org.apache.xmlgraphics/batik-codec "1.14"]
++                 [org.apache.xmlgraphics/batik-bridge "1.14"]]
+   :main org.stathissideris.ascii2image.core.CommandLineConverter
+   :java-source-paths ["src/java"]
+   :profiles {:dev {:dependencies      [[junit/junit "4.12"]]
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index a95b0cffd5cd..3f6a07be10e7 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,5 +1,7 @@
 DIST eog-plugins-3.26.8.tar.xz 479356 BLAKE2B ab781311473e045ffbb88e741427ac59f129fa53e6c551231d7b6edae81d21483dd1f1e7874561dfa29c9e9b2ba01fbdb174302bf8363478b785ec2ce38c53ec SHA512 a58aa849b09761dd0c7f7d31098560969872b03788f3f3ee81445dfb9be653b29e0e6646abc4e0164e4146abf7a9d2e6aadf56071f71c119493dcf1fd706a069
 DIST eog-plugins-42.0.tar.xz 132008 BLAKE2B 0dbe9ddcdf8f9a7f4da46caffe091a5d6e09327e1277b41474ecf8a3ec63ee7217fdc0cbafd1c47007f83b8ae30f30d91031c76f31473df79cda01aee23314ea SHA512 297b31fefa28f4eda73734ddcdb7702b9c9fa3493b4c13d3bf013e24ddb9015299bcd8f2af6a1976c4bf8c694fea0cc9699e82755d5e0689e71738a6d2fb2fe4
+DIST eog-plugins-42.1.tar.xz 131656 BLAKE2B e561e7b31daf950c1e1c1e1038bf40101b658583160439f7fd9050b52da2f6dd943105e1e1eeaefff7ed2aa759f8b96aad0a65130daba038733967db37158bfc SHA512 4688cb9cce044137717521a3ff2f769f960f12ec8b3f711971f276334f91915c8a3142aff2feb3d24d2eeb86223f040e9b699a1136e7fc7e96202a06b1cda1a8
 EBUILD eog-plugins-3.26.8.ebuild 1725 BLAKE2B f685d824292edc02b08cb0b2adc7d68fff1ef2868c742be61be0ff579795ebd3514f46a2594cc0d7d42eb8b95ee903a733ce88e9b2eca889944e08670c3480c2 SHA512 57604bd1094981357339c5a1382a21a517cd4538c09189a65e1927c61b63363ab36519c52cb99cf9a003e62ff887080b272a39bf4214050b7532749747da03c3
 EBUILD eog-plugins-42.0.ebuild 1681 BLAKE2B 95fdd675235a22c6800fff0d27f95ba3ec2e1c6802a7ded06e07c249a1c1e6c2d58c529c75c60bf1a8add7ec9d147de74226c6ec1df818c191dd0f949c3ef12c SHA512 a71006c09e8e82f7e6f2a8789f0ea0d893f6246f451b295f7093786eb84af307a9ec4098f2d35dbda371364ecc79801c2def9ea41bb9f239b820fc4f49c7dbdd
+EBUILD eog-plugins-42.1.ebuild 1724 BLAKE2B 51add057a8f5331f1fd0f00bfe1a9e223c185fc473c39e806fe4de30d6119cef7915c210a71ce92a4121d4ec41a5603d2bf7965710d9b86c603e232785c417e9 SHA512 2205791bf7d6c197a200c4f68074964a8c815d8173d4fb6d41452dbb54e9d8806f0d87b3decfd58697c60e685516f43cdeb2ba56cd882340b9da0aaf03713139
 MISC metadata.xml 429 BLAKE2B 61e0c5a268c0dbcb1a2b0a0e1d0ceb1b7795db34e022ba9229015ecf05210dcdd247c2c9867549f5c75028dcb20011f7757fd9b4ef507af65b80aa8aa1ca6f18 SHA512 d4b81d9f78bf49afe842990d9c1c9dde1c3f1bc68090f77dde1bd51b2be98ab647be10f8886da7dcc1831cabc4f7c81b18b7e6e5cadb2c5aeeec69db883509bf
diff --git a/media-gfx/eog-plugins/eog-plugins-42.1.ebuild b/media-gfx/eog-plugins/eog-plugins-42.1.ebuild
new file mode 100644
index 000000000000..ddb7d165e7af
--- /dev/null
+++ b/media-gfx/eog-plugins/eog-plugins-42.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org meson python-single-r1
+
+DESCRIPTION="Eye of GNOME plugins"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins https://gitlab.gnome.org/GNOME/eog-plugins"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+exif map picasa +python"
+REQUIRED_USE="
+	map? ( exif )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.53.4:2
+	>=dev-libs/libpeas-1.14.1:=
+	>=media-gfx/eog-41.0
+	exif? ( >=media-libs/libexif-0.6.16 )
+	map? (
+		media-libs/libchamplain:0.12[gtk]
+		>=media-libs/clutter-1.9.4:1.0
+		>=media-libs/clutter-gtk-1.1.2:1.0
+	)
+	picasa? ( >=dev-libs/libgdata-0.9.1:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/glib[dbus]
+		dev-libs/libpeas:=[gtk,python,${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+		')
+		gnome-base/gsettings-desktop-schemas
+		media-gfx/eog[introspection]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use exif plugin_exif-display)
+		$(meson_use python plugin_export-to-folder)
+		-Dplugin_fit-to-width=true
+		$(meson_use python plugin_fullscreenbg)
+		-Dplugin_light-theme=true
+		$(meson_use map plugin_map)
+		$(meson_use python plugin_maximize-windows)
+		$(meson_use picasa plugin_postasa)
+		-Dplugin_postr=false
+		$(meson_use python plugin_pythonconsole)
+		-Dplugin_send-by-mail=true
+		$(meson_use python plugin_slideshowshuffle)
+	)
+	meson_src_configure
+}
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 94f58cd3a3e8..1cc76895ee66 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,5 +1,7 @@
 DIST eog-41.1.tar.xz 3603320 BLAKE2B 8b0d7affe921bcb2c917f89dc3845360f784b5d5f394a7f94379c98cd905504cde7a8fb6f59aa09bc778e302113ad27ec5815e529b418d68a3012fbf9b018d65 SHA512 0fa514dd6ef195e449bbde183f94850dfca764815a95423376bc0da422d07b6cbd7b35bbdd5ba9d8f995f55aae1e1b65d57626d1809cccf95389767d0ed594e8
 DIST eog-42.0.tar.xz 4446392 BLAKE2B bb89eadaf2066f0ef3b6f99d47d75b438adfd3bca0451e8fa5d4513e98d1e8c6acc518eb7564f2768d43205a56843852edc1aa1ecce9fac8018ae4954376b852 SHA512 3901dbac9a371bac1e1bdc143e3d257a8e25fa2743a97bd9f9ecdb06e43cd5278edf33a46ab24c5e40babef6825181c986c99d9b4fafead71e04f51e65ae2acb
+DIST eog-42.1.tar.xz 4446444 BLAKE2B e500b3f96abfc72f56544c16254a99438137789be771310fd790c201451cf6a56fd9b6efc0ea8466dbb27be57cf0cd146d77c3e4917fda928ca02928ffaddea7 SHA512 12db6bb2218f9dcea0e0558b04c05f3f8eb298eb7170a9511a7996a37082667fe06994d1db3ee4fef759aeb763a9de87749c8defa8d749432b635d2b421d1c8a
 EBUILD eog-41.1.ebuild 1638 BLAKE2B 1a794ce6f1dad0814421a93c46b50fe01db32105f6f02ff5c0be382331abd2c830a836f293f879902e0cbff5cad17a79c011e8cac357f3673edec997b0ac9140 SHA512 007349404c2bbd0d24a9b84843e9c4ca6db8bc9c9c09fe7638234fe8dc022b6297fe4e903bd286c0c58fad566a43dee8711f256b45d2fad9db3fff3f4da2b18b
 EBUILD eog-42.0.ebuild 1669 BLAKE2B eec46e687c48aea2c7e8dfa64ac63dd411e7d254792684305455b8ed4be21fcc63114b94760e284ce149e999f97bf08aac339a8cf59d23f8e94681af88b21293 SHA512 a9cff1c2f4429660a79a162cb912897caacbf469d15bbe1b61796d9c95c1f7b71b800ae496442e9a03666bef6e824ed5d38d73a8f3d32fab24db9525941b0f25
+EBUILD eog-42.1.ebuild 1716 BLAKE2B 715428a0a75026bc322ef6218da388a9d2e7c999dde86deb13357717a148810e9ac04af7a4d65b6990252fa9c757c7e3c82c89dbe5d684570f4548cdab3577bc SHA512 e198cb9d5073ccb91ce2780a810976f3ea73278c2259f5c2e9f04ebddad86ce0200362e467c8840029c66410235a3a56ac328e08841b262ed1682833f94594a0
 MISC metadata.xml 482 BLAKE2B 03780ad7b79dd3b35ee6a9b3ee95bceb94ebbd97de711912ba0f5e61ef4e25d9a20a474011cd3c5261c82757105bed5383f16259468dee80bfd6cdcec13b5828 SHA512 0c51ba4ac4859bc5e6361862282a76a98343ad3e46dfac04e088c79ec25683e820ea907991212979b5fffa0b757a66ea33ddfcff7a8012e42e81dba0e943ea39
diff --git a/media-gfx/eog/eog-42.1.ebuild b/media-gfx/eog/eog-42.1.ebuild
new file mode 100644
index 000000000000..fb9dfdc4d3cc
--- /dev/null
+++ b/media-gfx/eog/eog-42.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="The Eye of GNOME image viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome https://gitlab.gnome.org/GNOME/eog"
+
+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-42_beta
+	>=x11-misc/shared-mime-info-0.20
+	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
+	>=x11-libs/gtk+-3.24.15:3[introspection,X]
+	>=gui-libs/libhandy-1.5.0:1
+	sys-libs/zlib
+
+	exif? ( >=media-libs/libexif-0.6.14 )
+	lcms? ( media-libs/lcms:2 )
+	xmp? ( media-libs/exempi:2 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	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/gi-docgen
+		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/fdm-materials/Manifest b/media-gfx/fdm-materials/Manifest
index 0775b888c42f..755995b3c883 100644
--- a/media-gfx/fdm-materials/Manifest
+++ b/media-gfx/fdm-materials/Manifest
@@ -1,7 +1,3 @@
-DIST fdm-materials-4.12.0.tar.gz 56076 BLAKE2B bf774ca70cc40da1b8c484198932d0c6bff01a35b5cba6a2e2112fd56b60bb3d51ddca6748716df9fd28c856311f38d13b48aa69f48a5d892e5f5870233d239d SHA512 891ba751dd94d5e733c2b283b39549dbdc075fcacbbc77598cdfcc944a225c9bded3c2f5ba75f5538bccfc8484cf7a7fcab869c199d81c047ac236225220f230
 DIST fdm-materials-4.13.0.tar.gz 58458 BLAKE2B a73e4eff8e6a8104b985d8c6b73739032bad7a2ad184a96c02df85e9f16e72fa7390b96f4cbd6fd9b38db440eefa83d22b42b6a6a7fc1b4b119f1400dd1a075c SHA512 12e08d3f0a7871b95f70ad0c5fae9027923de004595c0516df34dbe91b59ed13092b984cf1e11ac6162c577f157cb17195dcca9e4aa97e5c0fc9721a640a0a21
-DIST fdm-materials-4.9.1.tar.gz 46874 BLAKE2B 59aed353a7ed8cf1307de491f11a2b550df370553eee4ecfd803c07018f0a04a052653af49edc89a84172148b8ca1dac37a96236744d19d2f53fc320f42586bb SHA512 a615e1a75e0125642c348aeb28a1a52d1a32bec6946c8d4d6788455442cbdb2575326c7331c429df2031f1eb41b790dfd929792b40296262f18150decaf8baed
-EBUILD fdm-materials-4.12.0.ebuild 543 BLAKE2B 3912ac76bd5892d864e313d1f465ff8897d6844468073393ef7fc47481f9e27c3857210d1d797cf8cf47a2eff8e388f00d74fbbfcce0874d5c8067d20c2eef28 SHA512 84038ba978d7553dc7e7c7e045a1bb40aa4e2f92e1a8fa8f0bb41f5411184b4dcf3ad24d65bec40437dd99c8ee34bf86132912110b914120b08f8730b182611d
-EBUILD fdm-materials-4.13.0.ebuild 544 BLAKE2B 77363689855dff29a8fa09e878e2260415c8c6d6d6f4f3a906ed6ced91f32d5bf93ce7b47d103210ba99293367ee81ff5732d141a1992a98293480a1c50907ed SHA512 590f864a8bd4b065cd1566cd77a75364f67710d7dafbea46f1e995da7e936655a1f2080dd72b1c7f9cbe8e71dd344c5c131934cbe0bdae3873564e8154bd69f5
-EBUILD fdm-materials-4.9.1.ebuild 544 BLAKE2B 2cfa3bc8ac9e93c58ec68ac76a661f3e3c5f1fce3330950f231e4dcc39fabf7548c11488411d6906c336e0cca50f57be29d7e988514531be33c22031eb734660 SHA512 305011a3b0d2c853aee727cda629fa577121aafc21a4077557a34a0402dd4cfa41bf9987dc182eb9ddb7ea076238f705a82984e900a1c5fd2e14e93d650072be
+EBUILD fdm-materials-4.13.0.ebuild 543 BLAKE2B 3912ac76bd5892d864e313d1f465ff8897d6844468073393ef7fc47481f9e27c3857210d1d797cf8cf47a2eff8e388f00d74fbbfcce0874d5c8067d20c2eef28 SHA512 84038ba978d7553dc7e7c7e045a1bb40aa4e2f92e1a8fa8f0bb41f5411184b4dcf3ad24d65bec40437dd99c8ee34bf86132912110b914120b08f8730b182611d
 MISC metadata.xml 994 BLAKE2B 477271a4ea6891c6cdb09ff9d461487a8005004d412fb44a18f284b5dadf045ba1672c435dd8ba7c379eb1e183916fc1e7057c81deda8d937b62dc03f4585db0 SHA512 0373206da496595ad5f13617c66c620124f1c9eb9f186bb4f029d0fc2381db6345f5ef9f85607d999653be1bc3374bddb10605f55b0f7221ebb18653d46e99d9
diff --git a/media-gfx/fdm-materials/fdm-materials-4.12.0.ebuild b/media-gfx/fdm-materials/fdm-materials-4.12.0.ebuild
deleted file mode 100644
index 40f54fb77a6b..000000000000
--- a/media-gfx/fdm-materials/fdm-materials-4.12.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_PN="fdm_materials"
-
-DESCRIPTION="FDM materials for media-gfx/cura"
-HOMEPAGE="https://github.com/Ultimaker/fdm_materials"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="embedded"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DEMBEDDED=$(usex embedded on off)
-	)
-	cmake_src_configure
-}
diff --git a/media-gfx/fdm-materials/fdm-materials-4.13.0.ebuild b/media-gfx/fdm-materials/fdm-materials-4.13.0.ebuild
index 5a6f03ee8f5f..40f54fb77a6b 100644
--- a/media-gfx/fdm-materials/fdm-materials-4.13.0.ebuild
+++ b/media-gfx/fdm-materials/fdm-materials-4.13.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="embedded"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-gfx/fdm-materials/fdm-materials-4.9.1.ebuild b/media-gfx/fdm-materials/fdm-materials-4.9.1.ebuild
deleted file mode 100644
index 531b40cdc0a8..000000000000
--- a/media-gfx/fdm-materials/fdm-materials-4.9.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_PN="fdm_materials"
-
-DESCRIPTION="FDM materials for media-gfx/cura"
-HOMEPAGE="https://github.com/Ultimaker/fdm_materials"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="embedded"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DEMBEDDED=$(usex embedded on off)
-	)
-	cmake_src_configure
-}
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index bf50faf48ceb..c57d3c2a62a8 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,8 +1,6 @@
 AUX fotoxx-21.40-documentation.patch 1511 BLAKE2B da0443a6b1ff8684e43005239f0184c742cd59727e3c55460713680b14b5d39ba528b7a17a87b893a9585824f1e402b5f46bbe45451dd8888b62d1752524db44 SHA512 d0f79f986b605c3f981de99c533f57a60aac47844d1434482e507a7e7e4d2be2b581419e211f034213c7c23db0e56f4fe5d789f39624a33aee283c8b8a489509
 DIST fotoxx-21.60.tar.gz 8679841 BLAKE2B ec3dcbd0b937d730692e225fec7530ac46390328ae960e8960df7d252bc0cd8630de84bf47dfaf74c1e07855b4b0959e596e5e515ea00a6c430872359b2b4576 SHA512 ac999fcc70acd92c54e85ad276112aaa7f1b7606ea70381d6f833d829fd92c14aacad7a967838e5d28fce80cfa6da8ef05e0ee49b463210cb66a3f8ffc3d22e7
-DIST fotoxx-22.14.tar.gz 8815290 BLAKE2B fa6399454edebbbff6504fc9e7f8b27fbfecea0083a309cfeefd8d0f4834693a1c7eab8a689cb1a2135293e1290650cb44412375d20fe808014c5a5213c979d5 SHA512 7a0e412131a286ebc0ce8f5d7589ec135909a9d74e5a0f4a5367e58484462c23948c2b0ccc10c5197ba1014013f2d31999dd63d460daa4c4d4aa194313ee3c7b
-DIST fotoxx-22.15.tar.gz 8948263 BLAKE2B 99b4e6891751de62b880de6c51ee3ce2720f773ae03fad5d3b4c433e20cfb288efab9c5074841ba9c535374d3a9b860131c303f6539e889d7f747380d1c9f1db SHA512 4f317a34a72db2e6289e17c9d2d036150e0e633ac84a0bcd0dd8b00367a3c31ea6172b7cceab0f358c0db46057d9e0331e0f0a304ebe86b9a1b717f6fa4f54fd
+DIST fotoxx-22.16.tar.gz 8984376 BLAKE2B 4a5665313133405b4a53d7e40986e37601b5c9552f20c07d5f0889f3dacbabce1b4a712fcb216fe3358e7ad1de12da608961a996b081e4b3d644c5581ebcc6ee SHA512 ff78b0d7bbde0de5d98ac42d63c36f4bdcd425ae210dfcda6f64f4307be02dfca2966475df3f962751f73afc8e9442d2eb975725db31745109e174fe1665f804
 EBUILD fotoxx-21.60.ebuild 2260 BLAKE2B 5d3fecfa601f41c29f00474e810b928dc9bd12218be8d4acaa886640062b00966385884afb449b9fb15c804b1f3df11bda98bc4b2e70a68805411acec56163fc SHA512 342230c7481c9134b8ee93f774f9433c8ac4121714413cc518a2db1bfd3798e6a3a88c880bb035e4c55ca2e325f772ec04f4bbec3ce441894bed75e657ba0159
-EBUILD fotoxx-22.14.ebuild 2262 BLAKE2B f3f8a52c2487101ba3b99ff6ba234550f39df389198d43683cba6c573bf01786116b72ac6c642813061343db86f9bd16785524e08a01511c7e433c46d3657e65 SHA512 7c73f159b3931c4edd5ef61dea1f773f4d50f3f5f7aa22c412223ea591ff3f519c92827bcc20561465af532b50824fda75a58b49d4282dc65c760af1e5a5fdcb
-EBUILD fotoxx-22.15.ebuild 2262 BLAKE2B f3f8a52c2487101ba3b99ff6ba234550f39df389198d43683cba6c573bf01786116b72ac6c642813061343db86f9bd16785524e08a01511c7e433c46d3657e65 SHA512 7c73f159b3931c4edd5ef61dea1f773f4d50f3f5f7aa22c412223ea591ff3f519c92827bcc20561465af532b50824fda75a58b49d4282dc65c760af1e5a5fdcb
+EBUILD fotoxx-22.16.ebuild 2218 BLAKE2B 20d1c3ff49d1789dc4e1fd18851d8b2757a7ffe762e9b0d51ac9f76b0270bbb5454bcde816f079487b3ea8038a497da7256be4f11665d07696773b354c2c9e50 SHA512 7209da52ecff7f029b4e71a5c4a19d91baa918f44c15de91d86c1963d7ff0da76525c00438886e03c05f18bea9cab77cc9956892cdf17c7c02afc2816af9f642
 MISC metadata.xml 851 BLAKE2B a6c60b79fb5646c3bd7d6959d4a1b974ee714bf6ed64f205d9c00d684b3da94672005658336c1c5fcb903605d11c9a5607616151b2f6262f3173e15b8fc44655 SHA512 2794ae92afa076875c7f725969efdcf9cb84435d0ea033adc28f5860a69438b754f4d22b0db27dc7392683439e51b51ae581a6da450719276e8df51a2a306ad9
diff --git a/media-gfx/fotoxx/fotoxx-22.14.ebuild b/media-gfx/fotoxx/fotoxx-22.14.ebuild
deleted file mode 100644
index 852e25423552..000000000000
--- a/media-gfx/fotoxx/fotoxx-22.14.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature xdg-utils
-
-DESCRIPTION="Program for improving image files made with a digital camera"
-HOMEPAGE="https://kornelix.net/fotoxx/fotoxx.html"
-SRC_URI="https://kornelix.net/downloads/downloads/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-# For required dependencies read doc/README, for required tools read
-# data/userguide [INSTALLATION]. xdg-open (x11-misc/xdg-utils) is an
-# alternative to firefox and chromium-browser. `grep '"which ' * -R`
-# is helpful to report some required tools run via the shell.
-
-DEPEND="
-	media-libs/clutter
-	media-libs/clutter-gtk
-	media-libs/lcms:2
-	media-libs/libpng:0
-	media-libs/tiff:0
-	media-libs/libchamplain[gtk]
-	virtual/jpeg
-	x11-libs/gtk+:3"
-RDEPEND="
-	${DEPEND}
-	media-gfx/dcraw
-	media-libs/exiftool
-	x11-misc/xdg-utils
-"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-21.40-documentation.patch" )
-
-DOCS=()
-HTML_DOCS=()
-
-src_prepare() {
-	sed -i -e "/^DOCDIR/ s/${PN}$/${PF}/" Makefile || die
-	default
-}
-
-src_install() {
-	# For the Help menu items to work, *.html must be in /usr/share/doc/${PF},
-	# and README, changelog, copyright, license, etc. must not be compressed.
-	emake DESTDIR="${D}" install
-	rm -f "${D}"/usr/share/doc/${PF}/*.man || die
-	docompress -x /usr/share/doc
-}
-
-pkg_postinst() {
-	optfeature "HEIC file support" media-libs/libheif
-	optfeature "additional RAW file support" media-gfx/rawtherapee
-	optfeature "additional RAW file support" media-gfx/darktable
-	optfeature "video thumbnails & playback" media-video/ffmpeg
-	optfeature "copying images to optical media" app-cdr/dvd+rw-tools
-	optfeature "additional panorama support" media-gfx/hugin
-	optfeature "WEBP file support" media-libs/libwebp
-
-	elog
-	elog "Please read the Help > User Guide for details. The source location is"
-	elog "/usr/share/fotoxx/data/userguide and after running fotoxx a copy will"
-	elog "be placed at /home/<user>/.fotoxx/userguide."
-	elog
-	elog "To play videos, in Tools > Preferences set 'Video File Play Command'."
-	elog
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-gfx/fotoxx/fotoxx-22.15.ebuild b/media-gfx/fotoxx/fotoxx-22.16.ebuild
index 852e25423552..6444b3fb63f4 100644
--- a/media-gfx/fotoxx/fotoxx-22.15.ebuild
+++ b/media-gfx/fotoxx/fotoxx-22.16.ebuild
@@ -23,10 +23,10 @@ DEPEND="
 	media-libs/clutter
 	media-libs/clutter-gtk
 	media-libs/lcms:2
+	media-libs/libjpeg-turbo:=
 	media-libs/libpng:0
 	media-libs/tiff:0
 	media-libs/libchamplain[gtk]
-	virtual/jpeg
 	x11-libs/gtk+:3"
 RDEPEND="
 	${DEPEND}
@@ -61,7 +61,6 @@ pkg_postinst() {
 	optfeature "additional RAW file support" media-gfx/darktable
 	optfeature "video thumbnails & playback" media-video/ffmpeg
 	optfeature "copying images to optical media" app-cdr/dvd+rw-tools
-	optfeature "additional panorama support" media-gfx/hugin
 	optfeature "WEBP file support" media-libs/libwebp
 
 	elog
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index f97e7d267b6d..27429cf78d84 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -5,6 +5,6 @@ AUX freecad-0.19.4-backport-correctly-find-PySide2Tools.patch 4425 BLAKE2B 74920
 AUX freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch 881 BLAKE2B 8d8327a283fc46b9f195b4dfe68ac6594ed020154f5f65eab5fe86bde2d32bb3d1081fdf9c5d50e30c24ffdc0504a61c047088e24ab4c377aca6e8f5a14e9760 SHA512 17bdf85c6c25d38a46d643666cbf594f5d16952504344af34b1f4960b53a2a534ccac1594d6ae9b5f827fe3403e08a26edb0c40346a9837316307bd484f35088
 DIST freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz 5368 BLAKE2B 69bafefd049effe3c31719bb2c23d32e8ba7ad58235c58ac8279ba6c036feaf1b97d5751cf2d68896e7489803103b2d0f92f76e61b3ccc97ef05a95b337ca5c2 SHA512 66585cc13fb3b0b026cf9dbd761c8ba1c1fe4d4f7db2e144ddd97706e02ccd78f4a43ac7cd93ddcae6e73933bf41d4cbd4d94bcdff8804b81378a6d946c7b070
 DIST freecad-0.19.4.tar.gz 296990652 BLAKE2B 6b252198616f7731144d000307a7f186eb2b24e07b85e008d0aae0f60a732fef5598c06c5c66b70fa44114f05afbc7d81b15c71bbb147bc2e458ea90cc81ee45 SHA512 58e5e6bb4ed40ce7f3a0b653cdb0371208189b9ca266f1c29a8f9077c4e56861b3925f695718fba34781254220f8a8919a2e2a501d43573b2c733f8b21c12c1f
-EBUILD freecad-0.19.4.ebuild 10737 BLAKE2B 765a570400a39d1ce90acbc3636a17ea0e9084e4eb47b21ec28495f3836af62c09f8c7c0e573940c7bdf982764d6513cc0b63d5dbc7090473bfc90ac8cfc70ba SHA512 74e7e8bf1d38e0ac587575750ca6d6d9cd818f96a8b4ef9b1120956025ac620500a14ab96f145b95e7d5ecc8ba4554f3927f9c0a8082f912461a7fe3f9559ef6
+EBUILD freecad-0.19.4-r1.ebuild 10841 BLAKE2B c39c58ce57d7bdb508ef0298728490fabb8cf0258d9fbb07285ae22883723c8c2cea2ab89b024fc83f7c04145bdc699378d54d1d6d0181ba57fb6a934f68d2fa SHA512 8db5b2eeca5d45da588bda9cc6cd7e1074528b95afe38ead3fd368f0b564efb230b74fd2109080007269191b814f184d0b3134a5fc274cc9e4f6d73b95de9f12
 EBUILD freecad-9999.ebuild 10687 BLAKE2B 8750d9f805c932ded40a10403889b3b3f0c54fed0f1f2609a2c32c5dbbd93da0646baea52f4afb870d997a452106a36790c0e603b32e71b6f46e29ac64fb8d2a SHA512 d8c3a3b98d69df0513710955e5667326bc9c5b7b130bf9deccdac4c9bbf9dd80dd9196a1eb0b562c8e54dcc03edc06aee295fb2312e301a04a63a700a49e3373
 MISC metadata.xml 3712 BLAKE2B 1ad9603f7dd92dbbd8bfc77cb345c907c3e19a4a6cedfa3aab64abf5b8131de33c11adbc1cee7e2351f4da3046bfe5a2964a32262bc3e28706ac2704065b3fd1 SHA512 f9a47de41d6082d7e06795398161a79e88077bacae4d8d2006a24357a48624fcbb7afe8f69eff4ca17c7cb57dad5c5a609791967bbd689069b0a5a42059606f7
diff --git a/media-gfx/freecad/freecad-0.19.4.ebuild b/media-gfx/freecad/freecad-0.19.4-r1.ebuild
index fb3ed461c41c..44b0a46fcd71 100644
--- a/media-gfx/freecad/freecad-0.19.4.ebuild
+++ b/media-gfx/freecad/freecad-0.19.4-r1.ebuild
@@ -267,6 +267,7 @@ src_install() {
 
 	if ! use headless; then
 		dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
+		mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || die "failed to move shared resources"
 	fi
 	dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
 
diff --git a/media-gfx/frogr/Manifest b/media-gfx/frogr/Manifest
index 55c2e4bae6a1..26aa357fef7e 100644
--- a/media-gfx/frogr/Manifest
+++ b/media-gfx/frogr/Manifest
@@ -1,7 +1,5 @@
 AUX frogr-1.5-meson-0.61-build.patch 1341 BLAKE2B d1c1cdc5eb3f479ae16cc8e5bc5c164904c63d802e5ae2de5fe29d3209462fc65f2750a80ac95a7a3f83c9edd4ebf9067e80166f3ffa18d8380ae221d1312e11 SHA512 b46c7c8d42a9be4bfd90797d2ac77b7f18c2d7e5c571f3a19830849265915389c9c756199297ba6f8969074064beddeb96e87bb1dbbdcf3f9310240a783a0d30
 AUX frogr-1.5-warning-level.patch 752 BLAKE2B b0fd94da39939daa195bd4da03b6701b6336e49a7f60fdfe703853d27a562b8dd29bc923cecf08f13acb3200935dfdb43ff1bcf16cda78d80e6980654da4bde5 SHA512 3aa0522da679eba07f3f32134a19adaa6ffdb25bec46c4202e8caf2c38c93749c565f315d5265fca56a618a60d01fe11ef04f971a6c5168a33a42f0187182fbd
-DIST frogr-1.3.tar.xz 2552456 BLAKE2B 562f88898fec153c50696dce59b5396b6f9e88bc68cbf264e7954c2d2f402cb44cb2e6bf3c1c786d50285532c66167678f0fde053c317a0d23b6f4b210e69fa1 SHA512 82ca3ff1e97e7ff45bce1915f629809cc9efa6d33735b0e41b17bb8f69a31a2b035dd53045a3e56e7769d379b534a2468e37a684505438cfea70cc141103d1cb
 DIST frogr-1.5.tar.xz 2233600 BLAKE2B aeb04db0d5d57f470d377986f2e857ee63b47df85e9c3251cdfac8585efa19491650ecede0bfa95c157c2584298dc02173afec624bc439dcd8b52d101c465d54 SHA512 f4af5ec82ad1771e71387c40467fc697c7e3edff9f76ecd0f762e446d136a293477867cb7b6bc6d10bc0fdd95210b25f515eb56bf2d456f79009884019c44dd4
-EBUILD frogr-1.3.ebuild 626 BLAKE2B 9e17e2f7206f357020256d796ffc92b2f3bb63d3b5f8b52209289628d8ee76cf6ac18e84d5982ddd4828437275f2cefd039025d9104ce0d0f3ab958b9bf2cb96 SHA512 8b2eaa44c95a0266e1568becdc8fccca0dec6de3e31d9cd71a228fa068a361ea223efdc39b318459abb68c285efb9ef688cf5b44eed79f1d79e4db76b6d7427d
 EBUILD frogr-1.5.ebuild 1032 BLAKE2B c869110134432232342eac8241cf02899a416161e785a44a85effb66d079a35c083e8b27813bf2b01121614142e8a253eb7d7be363668126655554b5a03f74ce SHA512 92c67f30df546b8f45875b33c662452b547c678794b6f792bd61aac7a48aed66aeb6ac5de9f6369e23bb757d189c1948f58f81610009a06ae2a1eb06f63a8cd4
 MISC metadata.xml 387 BLAKE2B b08b71b2565331e07ca5b0c99cd8fcb57f6d0f584eb70798ddf20b6e74bc58f1e3d79f354c4bd0b72d26a85dffda4ca87e44a18345ce497020406ce0958bb092 SHA512 cb8c90665280861d2310256c59783f68126d8a24f994bb011487a3509d3ca418605b5e5c89da520204eb646fb4d920c6e8bc8c868b0faffc764832ff2fcc3d92
diff --git a/media-gfx/frogr/frogr-1.3.ebuild b/media-gfx/frogr/frogr-1.3.ebuild
deleted file mode 100644
index 1eb3c62f870f..000000000000
--- a/media-gfx/frogr/frogr-1.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit gnome2
-
-DESCRIPTION="flickr applications for GNOME"
-HOMEPAGE="https://live.gnome.org/Frogr"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=dev-libs/json-glib-0.12
-	>=x11-libs/gtk+-3.10:3[introspection]
-	>=media-libs/libexif-0.6.14
-	>=dev-libs/libxml2-2.6.8:2
-	media-libs/gstreamer:1.0
-	>=net-libs/libsoup-2.34:2.4
-	>=dev-libs/libgcrypt-1.5:*
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-#video and header bar are enabled by default
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 76fc0e844970..e79df73f9ce2 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -4,9 +4,11 @@ DIST geeqie-1.5.1.tar.xz 1587116 BLAKE2B f8742a88eefd90fb1e7e1d1365058cef190b623
 DIST geeqie-1.6.tar.xz 1693488 BLAKE2B ee5369884c4c0e60fe827d43ef336c5aaa89d55aec8905bb8cdd4edb2ee12e15d525577a3c85403e2e8955a08c817007b72d1d1e3614063377a21aaba317acee SHA512 4acd05c6012c80581e9c594c7dc7d12265528aa8d3868afef9def36798945afb851da9376bbe5f205ac3c5e1e2362188cc0e2891b49f3ea4396bbc6974c143ef
 DIST geeqie-1.6_p20211016.tar.xz 36433388 BLAKE2B e8932398ce7354c08ad4199834870e2844555ee1a8ae2beebd9a512100784a5cb62e00993b3ef1854a7ab1bd37eb0742ebcfc17605429f99b61e1af2fbaf859e SHA512 9e536beac39028fdcbe04d014460de2b02039b2c027f9603a71554339b2d14116f8dff11bb09c6e73d51550188daf40031535f978fbbc2d355d30593f4f29e9d
 DIST geeqie-1.7.2.tar.xz 1949240 BLAKE2B 4dde2c902151da677470dca359b321978afe861cafddb7baf76e68acc8a9cf7943ce8ebd8e46aa007a773cce62444d16908d1b8b1339de58587c98d911775ec7 SHA512 07b06ef51cb520b91b9097bbe06d170af39d3d513d9853c912e1b60bd5b47e0ae3571f6ac449c9f9c6cee4d227fc4c906ee5f90f7498cd0b2119d12ff4673c4d
+DIST geeqie-1.7.3.tar.xz 1949696 BLAKE2B c261a09446472f2decb0f332f227453e14fbffbc64bff77c538062d7cf57fd91efd7d30a121b2760795eb9c097e993a1dcbe5ead79cb32c200092e27422ad8b9 SHA512 5647422876dcd41ec369cc926783661e15f33c2794e073df98827b8fc030baf3ebf03587e42eef35caaddc3b315b74ee0f8c3a156422f72522ffbbb7ec0fd8d9
 EBUILD geeqie-1.5.1-r1.ebuild 2280 BLAKE2B 9653c0f0ac69e5a18812a86534e5ff6025e754545f2d53e3f06e538f59a600c98b27fff34f425e1d342a3c0ac8ef229f58ef8da99b9cd4c5f1f54e91246eead9 SHA512 26a4d709e1c8c6f3a6db159d4e912def9ce7ed7cb7a7d1a261d2428b46440aad882d450b1f8d54f513fd02a1f637bd0328403c9c143281b889dc3f34dfca7a31
 EBUILD geeqie-1.6-r1.ebuild 2087 BLAKE2B b72278d1f36cbaed2cd0eccf1f2d8c8126ffd798c476b7432e7695221f1524f14b07d0ff98fbe281bb911cb94f80a5c8142bf2f8ad667e3aa3192bdeca8950de SHA512 d8280d69c8638a192c2875f10e807e0286d09f8820dfc91a47b62f495a508770a394bd33dd1fdfc077a6f4581d8069a7bc33edae239ad754d6f6427253d7fa19
 EBUILD geeqie-1.6_p20211016.ebuild 2412 BLAKE2B ec74ea03a4f7d9431b2fa1fa8eb474ac4c8a1e8a46b1887d7f7a67bc4af1b389c4581299aff6a301e490958412bf91561294bc8dd015220b7ad6e5e470d7e213 SHA512 23a6a0c2d60d4498b99195a87e158683a312276c1d0b29d0dbd3ca334eb0ac96e19e3985a9be1c88fce9d528ca0a74c41a739dd90bde3d3b04728321d5f94fa4
 EBUILD geeqie-1.7.2.ebuild 2324 BLAKE2B 973682fbaacbf054ad6033b45e4ec4f79f2e0ccfa2a4e7e88dd73f2dc61adaba8f0010c6190f3ea9bc16b3939974216bf19b0127c59810dc41a5d05dd6a4e3c8 SHA512 f136a470d8ffa269f47af621cf13c5f9c2a87b0dc3a0a75fb1a325ad94ccf0a7cd6d1cc789241210e18e9ab8ffc326f9c1d6d66539f86592922cc02ad0938d5a
+EBUILD geeqie-1.7.3.ebuild 2324 BLAKE2B 973682fbaacbf054ad6033b45e4ec4f79f2e0ccfa2a4e7e88dd73f2dc61adaba8f0010c6190f3ea9bc16b3939974216bf19b0127c59810dc41a5d05dd6a4e3c8 SHA512 f136a470d8ffa269f47af621cf13c5f9c2a87b0dc3a0a75fb1a325ad94ccf0a7cd6d1cc789241210e18e9ab8ffc326f9c1d6d66539f86592922cc02ad0938d5a
 EBUILD geeqie-9999.ebuild 2260 BLAKE2B fb20a91012f7771197f763e9cfbda5c201c51241e494dca0d6e499d9f6e7a8bc2887ed8c4efabfbcdcb86dd0cc7a4463506b8a7cb31c261a6c4cc82d1cce634d SHA512 4a0efeda56009c9dea7a5bcab831b251b54070a370d2f915bbb3f74be3e727e5cae1c0e8aaa0f239aa7208e052548b69e605a2b97ef817dceb78d4d5e8b49ea8
 MISC metadata.xml 924 BLAKE2B 9bafd79f0d60d1237da4b35aeb2142384c188b503c151f8e0a26cd6ea9a2658876c66fb6f248af34eb33f6d2218bafeb1f34521d23c55e244c7ee1b4c0234dda SHA512 73f82d929d6479d81dde14c922ac048feaccf4bf5ea8ffe8aea56cf7cbe0cc8f76c528f3363bbbad3e881640608265a2e583d8b675fce3aa43ad7646023167fc
diff --git a/media-gfx/geeqie/geeqie-1.7.3.ebuild b/media-gfx/geeqie/geeqie-1.7.3.ebuild
new file mode 100644
index 000000000000..60becabb68fa
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-1.7.3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+LUA_COMPAT=( lua5-{1..3} )
+
+inherit autotools lua-single xdg
+
+DESCRIPTION="A lightweight GTK image viewer forked from GQview"
+HOMEPAGE="http://www.geeqie.org"
+SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc exif ffmpegthumbnailer gpu-accel jpeg lcms lirc lua map nls pdf tiff xmp"
+
+RDEPEND="
+	virtual/libintl
+	x11-libs/gtk+:3
+	doc? ( app-text/gnome-doc-utils )
+	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
+	gpu-accel? ( media-libs/clutter-gtk )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	lirc? ( app-misc/lirc )
+	lua? ( ${LUA_DEPS} )
+	map? ( media-libs/libchamplain:0.12 )
+	pdf? ( >=app-text/poppler-0.62[cairo] )
+	tiff? ( media-libs/tiff:0 )
+	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
+	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	map? ( gpu-accel )"
+
+src_prepare() {
+	default
+
+	# Remove -Werror (gcc changes may add new warnings)
+	sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die
+
+	# Remove force rebuild of Lua API ref
+	sed -e 's#./create-doxygen-lua-api.sh##' -i doc/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
+		--enable-gtk3
+		$(use_enable debug debug-log)
+		$(use_enable ffmpegthumbnailer)
+		$(use_enable gpu-accel)
+		$(use_enable jpeg)
+		$(use_enable lcms)
+		$(use_enable lua)
+		$(use_enable lirc)
+		$(use_enable map)
+		$(use_enable nls)
+		$(use_enable pdf)
+		$(use_enable tiff)
+	)
+
+	if use exif || use xmp; then
+		myeconfargs+=( --enable-exiv2 )
+	else
+		myeconfargs+=( --disable-exiv2)
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	rm -f "${D}/usr/share/doc/${PF}/COPYING" || die
+	# Application needs access to the uncompressed file
+	docompress -x /usr/share/doc/${PF}/README.md
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "Some plugins may require additional packages"
+	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
+	elog "- RAW images plugin: media-gfx/ufraw"
+}
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index f5ce75ad3103..0980d347b8a6 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -5,5 +5,5 @@ DIST gimp-2.99.10.tar.bz2 26782056 BLAKE2B 103e7fa2d04b1989e59fb03964a122891831d
 EBUILD gimp-2.10.28-r1.ebuild 5566 BLAKE2B 6475774d4d3af42eeb436c01b84fb14991c707b209e0b0aa3b9115d120cbc09f33c811a35e2e39a7ba373c0c3649f840527ac60fc42b8fa3dc1066d346e6d9fb SHA512 a956a96435e584b74166e0a015fbd376d0402f552f211dd0947a8b049d8cb3826a657de6ba3cf4697bd2e64638194d2692776897c8809f81d177fc8a78147bec
 EBUILD gimp-2.10.30.ebuild 5566 BLAKE2B ebd2a95b71587d02a31d422a405d3e3865ae89c4100b70e3c0a88912fb39a0436bad8bde3faab4d3337f20713a0ca251996cd7b57c5c3bbd568b2f1407b52f6a SHA512 28f5384828301e3c61a3698ebf7d465ae0f40d2776bdff808b45f5444917d8038d7938a9712180b8fae1fd33b48d1cd33debb5ed9bb1ffcb347175ebba8c7959
 EBUILD gimp-2.99.10-r1.ebuild 6611 BLAKE2B a4893c89c7dbe7c55a9cd68c6b56cbbd127c1af33b867b5524b338bdbd8592cd5d499b77503d3c4ecfac1136a9a677d31d877c4ab6793190c1b3874e291c520c SHA512 d17442f5add502c5163af5177e34eea28c9b17d7ef8a9f55cc9029d3dc1b6ecff313ec5143abd0c9ef3bbf7907e1fa245a851a1f43f56a65050032944d1abfb5
-EBUILD gimp-9999.ebuild 6642 BLAKE2B 6c76ac84a1a10b0b9fa6677b7048ec557374d903c087f35a7ad1931a806391a23220086941d81ba07d0c88789662246d0d016d08ba297551a5fbe34fd47cca92 SHA512 8b4be348bd2d139ed54a3e90a1d0fa299e85fe0d5059469ec841d181e8ea9347b213f31eafba7fad65c31ff4185dd0e6618bf60da69858b94dd484ae91fd1d96
+EBUILD gimp-9999.ebuild 6670 BLAKE2B 164dc9a5eca846eb488cd2ac83098222a8b4943d241e3093ee2388b806dcf02b5505bb16c0032a0e25f9ed07da39894eb9762d13a24db2d6d1d0fdf337b023c8 SHA512 92e1f3479def6969b004c30e4a06b69a5e50faee2d403f96bf128a2e85704654afb9467d8494cdf0bcd32b613f54f03a2b75d1c72a62a15f74c39c997c8b1c66
 MISC metadata.xml 646 BLAKE2B 167cb95fb064b2470cdbb6b625f7d6e24aacac57081a1177fdc9e878b4cf1a20c6b86a7e621530b45bc7db5f07e173a47829fd5be9dde6f9b9fcf54a39f24236 SHA512 9f6501b6a14f860be69e29baaace61fe4c964413b8c43882bf06144406333f4d69d6adaa315503dc83fbdb467cd47e3d752ed6abe4b78bd5cb32fb9f3be1ac1d
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index bcead23bec7b..d5fdda28f403 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -43,15 +43,15 @@ COMMON_DEPEND="
 	>=media-libs/fontconfig-2.12.6
 	>=media-libs/freetype-2.10.2
 	>=media-libs/gegl-0.4.36:0.4[cairo,introspection,lcms,vala?]
-	>=media-libs/gexiv2-0.12.2
+	>=media-libs/gexiv2-0.14.0
 	>=media-libs/harfbuzz-2.6.5:=
 	>=media-libs/lcms-2.9:2
+	media-libs/libjpeg-turbo
 	>=media-libs/libmypaint-1.6.1:=
 	>=media-libs/libpng-1.6.37:0=
 	>=media-libs/tiff-4.1.0:0
 	net-libs/glib-networking[ssl]
 	sys-libs/zlib
-	virtual/jpeg
 	>=x11-libs/cairo-1.16.0
 	>=x11-libs/gdk-pixbuf-2.40.0:2[introspection]
 	>=x11-libs/gtk+-3.24.16:3[introspection]
@@ -167,6 +167,7 @@ src_configure() {
 		--enable-mp
 		--with-appdata-test
 		--with-bug-report-url=https://bugs.gentoo.org/
+		--with-pdbgen
 		--with-xmc
 		--without-libbacktrace
 		--without-webkit
diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest
index 3c03baf5ca0b..5d36c00d6a68 100644
--- a/media-gfx/gnome-font-viewer/Manifest
+++ b/media-gfx/gnome-font-viewer/Manifest
@@ -2,5 +2,5 @@ AUX gnome-font-viewer-41.0-fix-meson-0.61-build.patch 1127 BLAKE2B 7cb4c294ea2a2
 DIST gnome-font-viewer-41.0.tar.xz 179672 BLAKE2B ce9e91b319ccf2e099cd30cf13e407270775950321e2bea69703050b5797ed879320939d260aba175f3ed6f5719e23f5628c6501f362c3e367ca5ddf70902037 SHA512 09d9ddcdd18fd0023dff46e7197988473119e0d753b7814fdca0116c6831a93146301dd56ee77546121c573c8d93801b5d8fed0c46da47052e31749058c21d50
 DIST gnome-font-viewer-42.0.tar.xz 287644 BLAKE2B 273328298187c1b77882638bb292ca9340a1dc57c917d9888abeadfe8ea01c27d0f59d382823b262323000da81457fb821aafa9b1ba50792ee75ce3dd8de4ee7 SHA512 231aaf594b22741f8a138c0a6c764244eb947f9cf30385353f4dea13cfc7929f21a291f9a56810eb24862310ecab6b4555147ef6be9e7a5d3057ae05ebba76ec
 EBUILD gnome-font-viewer-41.0.ebuild 765 BLAKE2B fd4fe11ea6248a29345ba3e233fcf3cf6c1af03931c20c19b03f85b88fba22dbae2329b54b55d2e438266d00d2a692ea1efa50b5037d8a4716c7efec9950a2e8 SHA512 c46a4053b7542e9a661cb437575ba7499dd5a9c4cf9b036f5ad37b7a93a69e389df482be1b6946d91686fbaa2fa6dc52c18b077f30e8cc2fba069fa98b069075
-EBUILD gnome-font-viewer-42.0.ebuild 676 BLAKE2B b3bd270a6056407cde2836aaf9619a5c616e3b20ee334a7ef18342430a8ba0a3921e6298985e30b206e10078d1f93f5bfc9b73fc0aca969ebfd55e0b0f980c8b SHA512 f81dbbeb77ed946186c79165a455d551f1e832ac08b3e4a86911f1e7f2b3fba2e71b8a1fcd2abd58f8f0cd4859bfc3d1861cc9b622574498966b1f007c1cc0a0
+EBUILD gnome-font-viewer-42.0.ebuild 694 BLAKE2B e3df1210f9a1bbd73cb51eefc735e3610fabfea72d32f74fb286a223657a488291f2560b829599ff2435b5080a8c8e6900f0c0afc54b8b16461b4e26bf885866 SHA512 f079d11068541e2f115e79c03d6bdf663daab19561402b4b9f7b5319ec4fb4f2d77d8ef72ebc6403ec7d964bc9adfed71c711b87a8e7933ab20043707f691dc9
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-42.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-42.0.ebuild
index 13695ffc5105..1e02263ec461 100644
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-42.0.ebuild
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-42.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-libs/glib-2.56.0:2
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 14b08e6ecd55..53442b99610d 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -4,6 +4,6 @@ DIST GraphicsMagick-1.3.37.tar.xz 5623688 BLAKE2B d6d5c8a07ec2aa2e60399887fa7887
 DIST GraphicsMagick-1.3.38.tar.xz 5958352 BLAKE2B 132c8b2303690dbe84b0e9ab33db0c0861845ef0260915e33197912dbcae02ae70c27bce634cfe0ab6b739ef6f3e828cbea9043fc90be993fb2c4a5e33e20ee9 SHA512 478f9e2907d4cb1099b0cbd1a73e4ab58aef94edf6cb1636ce48a378084ec1671599fd4f369455e5af898e94d1386f7149f6933b7c668027a6f6952bc763ec3a
 DIST GraphicsMagick-1.3.38.tar.xz.sig 119 BLAKE2B 166b7bb6de30af22d1f2317812f76dee43dd69c5557613deea35de3767624466c07001fe029ec9d33d0c61ed2fe5ca3f48bf435853374c722963a1293bfaa7a1 SHA512 c6dfee7e4b63b646460f9045ca5c8f3105d1a761ec3cd3471b53293178ed9a963884539c8026d934ce1915654d517a9b30232d7260a13f6d7dbeb5a592485b09
 EBUILD graphicsmagick-1.3.37.ebuild 3200 BLAKE2B dcc9f75b410f671a4aaa8da96bd40672e005cacc0f0138e42a7d20924738ae514845548d612d404a76069e2b604e7aacea0957b70d893e7eb07550886204bf5a SHA512 fcadc6d72188e1106b0374ecdbf6ea5c37b3fb8e24ef4e453e291c080ee95f51440360938872c86ca011a17f4945d97065836c3b06c6aabcb4f5c9b7ae7c762c
-EBUILD graphicsmagick-1.3.38.ebuild 3702 BLAKE2B ad030ead93c82ee5c4b24e514ae924ceadf0025e9bb379faec36d53c3c2c0fe3f294a54f0f6a07b020389597fa178fa0315731ef5421a3c9567814c720238d97 SHA512 80dfc7c235ec29ce90d0624346e55c9e87a151549542370b2f3f7b760bbe7aebfe96870c50f4348c010a1881b777cb35ea0e26075634850be4c10f0bbf679059
+EBUILD graphicsmagick-1.3.38.ebuild 3746 BLAKE2B 126886c157531dcf84278813df6c365a94992c753c865ad09cf897eee7f5e0b93458cde1676999539c99ff33cc7b2fafe8b830cb2ccfc4379f6479bcdddb8847 SHA512 118d0b3fe97b2dcfaea78c59b367986292b773165ba50a10e1c5ae3c1bf78e7704cc92b9c17e06d0b8b8fa2ad23c26c50f76e6279d0f8e6eeda6b5c8ca431507
 EBUILD graphicsmagick-9999.ebuild 3746 BLAKE2B 126886c157531dcf84278813df6c365a94992c753c865ad09cf897eee7f5e0b93458cde1676999539c99ff33cc7b2fafe8b830cb2ccfc4379f6479bcdddb8847 SHA512 118d0b3fe97b2dcfaea78c59b367986292b773165ba50a10e1c5ae3c1bf78e7704cc92b9c17e06d0b8b8fa2ad23c26c50f76e6279d0f8e6eeda6b5c8ca431507
 MISC metadata.xml 1405 BLAKE2B 450ce6e18c6debd66f923847912746cc3f522f923b2290e7815326cc9a8e4dfa9f57e0ed0d66ade4b09d71f6ecb2da810665530ae4876abcfd77dbbf0696829c SHA512 88d109fb876d4fef9dc7b9270c6418e8cc9820d6a085b0faabe647225ae4e5fa731335d7b45bb022a531eaf0ab4c9302be5a802603dd8ecc8ef484ba3bbf74ba
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild
index 42ffd6c74653..c640b1b4cc74 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI+=" verify-sig? ( mirror://sourceforge/${PN}/${MY_P}.tar.xz.sig )"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha ~amd64 ~hppa ~m68k ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )"
 fi
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index b15e813594ec..04eae1cda26c 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -6,6 +6,6 @@ AUX graphite2-1.35-fix-gcc-linking.patch 697 BLAKE2B 3f4f181477e5f2f5db85f0b5c76
 DIST graphite2-1.3.14.tgz 6630061 BLAKE2B 72bf6736aaa8476a89e44ef53c5b6c94f45d815fe1a451ba6b3696bfe023971210975dee4a9c8cb3042f36442e4efecf5baf171ef4230ad2b10694a89865f918 SHA512 14b5eb2ba8158b8b62ffa7fb142100a0af1de0f0c45b2673801b636714a106b46fcd423b05c722d963c9543fafcf10fec811975308211a54f20a3ba322d7b295
 DIST graphite2-1.3.14_p20210810.tar.gz 6656693 BLAKE2B 63a7d96b58f2779d8a4a353e1a986212b884fdf780fedcb83b22dcef2f7678d44c88c14ece2d09dc745df505a4a3825ce61d7c84bd05fd4e98c23d6e86e9326d SHA512 be54c1386578970cf65c1860336a113268181753c1e2a139e37ceeafcfa76e3162086879c54094d70cd0d36ad5852a95390aaa69572d875921e9481f1ae508ff
 EBUILD graphite2-1.3.14-r1.ebuild 2994 BLAKE2B 85a0519e9610d966b043b1ac73c58d17a1cd4729e71369dca175e3ca283a273ae2e00c552372258c20f862c250846d7f29bd252b187a2c12bbaf87595b09d5fa SHA512 8bebde5715ed78ffa35d3466638a00a57009fb16f38c330d1214e6237b4543eac9fa9b3e3919251425699641d504d13262dfd2a8042b8254da04dca6a18c7805
-EBUILD graphite2-1.3.14_p20210810-r1.ebuild 3076 BLAKE2B 6deb2640eff017328f3d38bf8b921085d2a20f15e6e3e1ae381938a275fb1c9df225a5ea8b60dd402afc085a6eaf7c7960c54f360b22c7866a2c6039e2a9a802 SHA512 0d294aa41791c19f6092d37fa2b24836a021c5ad33e587d3e33fced0eb82b52eec5d3cb2bd0fe41db60a0c79746d55f64cbb5783c92c55c7452f87d35574cc43
+EBUILD graphite2-1.3.14_p20210810-r1.ebuild 3083 BLAKE2B 8918442b2f8922fbd1f3467e7c2bb7d9a1437c3bcec15e2f88dbaf11fe2117a88b315489eaf76a439e95ef3f084986976388f28bf3b71317e61ea8e049dd8cb0 SHA512 e27158732ecaa1a04627705446a0c0516dd78d6dcad777b1495b239e0df7c9f5a28bd5528e143826bd1ec6899e6ff47e078c27a294b63cd03c7e18a0c15a1d97
 EBUILD graphite2-1.3.14_p20210810.ebuild 3024 BLAKE2B f99caacdcf8a058683ef8e2ab0d1c26ce783ced212c2bea130193dfa735e0276980d76ba359aba48dab757e37c005e45f89c1c19b6c23743747620985df63ed0 SHA512 e02a9f36ba1a9f9645b5f8132991c4c28342a7d590982afcbe70120f3bfc17518f7e75260590a05fb8bd037932b8e10e2fe871f00e0a414e8b29af92423feccf
 MISC metadata.xml 337 BLAKE2B a406b2f1af9217abda601c1a860904b7897c5646bc145befae7e87038a42e6b60f5290cb7258469de61761b67f74e12eef1e5a632aad219978d021e045eaa6da SHA512 1d7d7bc940d89cad512580d43120946e028c7866f844dbbc9242b0c29bdb1058f181c38eb63bdd50007afb0e95adade98e5a5f234964c1e1dfb8d15bda961c2f
diff --git a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r1.ebuild b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r1.ebuild
index cdccddf64039..db5ce2836552 100644
--- a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r1.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/graphite-${COMMIT}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="perl test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index c384232180b5..7a3a80de5ce0 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,13 +1,13 @@
 AUX hydrus-client 98 BLAKE2B c08af22c2ee9ea3d5c95ed3196ceb9b74b9c886bfa9b91141584f7ea884830fbdd300c948af199ac82a016e1a9dd7314e9c7fdfa8f47f07a9336eff9e2bd2ce1 SHA512 453ac6f9685325b6510c7f833b658491f01e92be213ae26da0d86490033951d3a825f9b15fd33d8a0727992cd83bf7ed491b88f0808674d6fdc23af90c7911a5
 AUX hydrus-server 62 BLAKE2B dac100012fb03c2a14438b67a1c68daa1673eb23dfe7725a941325eb67149064c1276f462732e62db294acce75d111f948599698615e9fa15be43fe74ce444cd SHA512 5b7f9ca4b364ff529e5f4feb6fb11c91aff9cf1ad3ae6c12ff301915fa1d7b9920d51028b820000635d071a049a4e98a0e4e815ffa6ca31d2e67bec5a78afdea
 AUX userpath-in-local-share.patch 443 BLAKE2B 2562bdb6207a35a872a7c1b22ee378504ec4f53ee7b64bdce31649d62780cae00b42be7297aa82e069a9df5e01f76c508d97c47a25a9dffec8cbf8829e7ff674 SHA512 f96cf0040a663c534bd539e40413c95928ea45238f765f741db3c251b7c141fe99989b092d4033695a99e7267fec7fac74641fdc4a0887e74d23d3695f8ce467
-DIST hydrus-474.tar.gz 40052948 BLAKE2B 7d323caf6dee2dc8a1dcf792a5c3383b395374d0e5a8fd88489b08a5b4ad295317cd5ae1da95d5435fb44ea8d4bbe4038d821c037c156e11d8b8c8a8582d67be SHA512 b73f5823ff84cf84710dd1fd9f9bfedffb6ce9ffaba8e4b23a7eda4a6a206aeaa8993632858fab9a5934f4c279fc23955cf045cd38af7ccf78b1eb73a0940bdb
-DIST hydrus-476.tar.gz 40139397 BLAKE2B 68a3f31a8f250b2c129a9f2562624ec98994e338112eba4f0953aa96dd95abdb97fc60f6a8f28efb5a660f543f596a344a13fe234b3ffb11e6a158b795b0a11c SHA512 5aa59cc2e4d72219d24de10eaeb99ad5b13c0de3af8d9c7e55e3ccea3b897077596401d4d034aac05c018a969f84507618f95ef70d422ac57075bf2d64a692c5
 DIST hydrus-478.tar.gz 40150962 BLAKE2B d654d2c12de8c8af6212679ed719892bcb6172d0b2120718e1bca7159ea3ab0f509dd01bf7c6f57f7da4d5e711c7b85cd0ce467ebc5fe0b08214085e3ca13cc5 SHA512 eb92071e0c9a0c3d04ef72336feaa55e47d28c523916484090220f30fa137c7d6b09b1d97e214fd191212a54e5d653eba08cfa1fe3f242a488d22cc331279e9b
 DIST hydrus-479.tar.gz 40164261 BLAKE2B 9c9b60c831a84414632a6ddbe51ece66d036aaa1f98cc74f112ee668583fb4ad95572a25e98cfc8d5c9d6886b55110b373534addb27bf9bec5f9bec53b69e8f7 SHA512 7f08fa62c7bcae17a80aca47dc5fcaf1641622590b08fecd3f38749467e7c595d5b49672145df00f480e99e3270e8bb4d98a21053d9eaeed0f0950956e3026ae
-EBUILD hydrus-474.ebuild 4103 BLAKE2B 30df6e6ffc773581481785c1515c42a2b93a3cb40238a2a72ce5a8a7b6b4a2d6de0816a81df801f1a7b9939a61a0611704d8eccc65be73b9c9f513f5f8b1bffe SHA512 1687bc474795a96137c8883237cf59157f00edc9d9e2c131d84b7f510d95d60ae1f63bcde1727f810f0f4f4d55faf5c813f07849815f194f47637fc3564a66b6
-EBUILD hydrus-476.ebuild 4426 BLAKE2B 9ab0625fa36a19dfbf75292f80c59905f79c7cbe79e5ca0349f44030e9ac90f08c87d7a4685ff6fcc29c46dd8ed2e3e7537cc013d556ef77f5c5598e4181f4a2 SHA512 55f3d3b3459947003c5914342ab18381a4cc2268ee659a8c610385f84db42b9ef6f5f50af1747e9735f208993782522ea64f90cc1e20ec2e2517416a1df8ac04
+DIST hydrus-481.tar.gz 40174593 BLAKE2B 8a5745803e0e461af550d2fa5bc430acc18e9d54bc2534d9b47ad237b41110cc4b2960dc06176c52b462f91a156d8e8bf2fe8dd15b62d58bb1ea4c0f02587ac7 SHA512 e96fae770003fe6128043a0ddff3c0c7fd5eae457970de3af6d3c4f4da207502cfd78cc6ea96c3284543ba509625376e19ca386db3933c07c2346321f81bfe10
+DIST hydrus-482.tar.gz 40181613 BLAKE2B bdb98ae88efb9e83bda28d01dcdb624ce884682893e84087bfc99420e82ff12c1543f89a5015ac997596188a3b32fec9e5776f1c89fe1864f55d73ae52ca19d7 SHA512 c99a0ea60c0b3a565b57b4f4201eb6ff732ea2fb9f419d8b9e8170476bb230bdf0e474e5f82f909b4aca0a442fe89e47d4d0f58b0e722b3f309940d98664ac51
 EBUILD hydrus-478.ebuild 4463 BLAKE2B b510bb557193669bc1d09a11ab66902f1f474878d8b740f9dff8746508264f225ad781f6e0058b0ef6d7fa2377da151734ff1cbae608e7587c46114b6c81bca5 SHA512 791eaac87779f9abe34fca92baad624b7c87dfa43fd1507cce6acad47c53e1acabe2f38e3e5cfba658ca5b3a013696db166fe66d332cb1ed63e69f3bd778cabd
 EBUILD hydrus-479.ebuild 4463 BLAKE2B b510bb557193669bc1d09a11ab66902f1f474878d8b740f9dff8746508264f225ad781f6e0058b0ef6d7fa2377da151734ff1cbae608e7587c46114b6c81bca5 SHA512 791eaac87779f9abe34fca92baad624b7c87dfa43fd1507cce6acad47c53e1acabe2f38e3e5cfba658ca5b3a013696db166fe66d332cb1ed63e69f3bd778cabd
+EBUILD hydrus-481.ebuild 4463 BLAKE2B b510bb557193669bc1d09a11ab66902f1f474878d8b740f9dff8746508264f225ad781f6e0058b0ef6d7fa2377da151734ff1cbae608e7587c46114b6c81bca5 SHA512 791eaac87779f9abe34fca92baad624b7c87dfa43fd1507cce6acad47c53e1acabe2f38e3e5cfba658ca5b3a013696db166fe66d332cb1ed63e69f3bd778cabd
+EBUILD hydrus-482.ebuild 4463 BLAKE2B b510bb557193669bc1d09a11ab66902f1f474878d8b740f9dff8746508264f225ad781f6e0058b0ef6d7fa2377da151734ff1cbae608e7587c46114b6c81bca5 SHA512 791eaac87779f9abe34fca92baad624b7c87dfa43fd1507cce6acad47c53e1acabe2f38e3e5cfba658ca5b3a013696db166fe66d332cb1ed63e69f3bd778cabd
 EBUILD hydrus-9999.ebuild 4463 BLAKE2B b510bb557193669bc1d09a11ab66902f1f474878d8b740f9dff8746508264f225ad781f6e0058b0ef6d7fa2377da151734ff1cbae608e7587c46114b6c81bca5 SHA512 791eaac87779f9abe34fca92baad624b7c87dfa43fd1507cce6acad47c53e1acabe2f38e3e5cfba658ca5b3a013696db166fe66d332cb1ed63e69f3bd778cabd
 MISC metadata.xml 751 BLAKE2B 05dfcd30440ca7bc1375206469123c5bb93ff7fbb7612191faabee7abe87334bfb4f25db3291cd3a989264516c315eeb489eaac2c83c95b2436446966ba27880 SHA512 f2e7c839e4567355bb6ff1cdbf1355ab7a2fbf166a3f87ac7a8af92fc80efa7833010376317a38e2594a203be66bfcb3e0df9dc7346ac3d37d8466bb0368b50e
diff --git a/media-gfx/hydrus/hydrus-476.ebuild b/media-gfx/hydrus/hydrus-481.ebuild
index 74762f9de40f..eeb2fa504f8a 100644
--- a/media-gfx/hydrus/hydrus-476.ebuild
+++ b/media-gfx/hydrus/hydrus-481.ebuild
@@ -39,6 +39,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
+		dev-python/cbor2[${PYTHON_USEDEP}]
 		dev-python/chardet[${PYTHON_USEDEP}]
 		dev-python/cloudscraper[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
diff --git a/media-gfx/hydrus/hydrus-474.ebuild b/media-gfx/hydrus/hydrus-482.ebuild
index f45dbc3ac8ef..eeb2fa504f8a 100644
--- a/media-gfx/hydrus/hydrus-474.ebuild
+++ b/media-gfx/hydrus/hydrus-482.ebuild
@@ -6,7 +6,10 @@ EAPI=7
 PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
 
-inherit python-single-r1 desktop optfeature
+DOCS_BUILDER=mkdocs
+DOCS_DEPEND="dev-python/mkdocs-material"
+
+inherit python-single-r1 desktop docs optfeature
 
 DESCRIPTION="A booru-like media organizer for the desktop"
 HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
@@ -36,6 +39,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
+		dev-python/cbor2[${PYTHON_USEDEP}]
 		dev-python/chardet[${PYTHON_USEDEP}]
 		dev-python/cloudscraper[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
@@ -82,14 +86,13 @@ src_prepare() {
 	rm -r bin/ || die
 	# Build files used for CI, not actually needed
 	rm -r static/build_files || die
-	# Duplicate license file, not needed
-	rm license.txt || die
 	# Python requirements files, not needed
 	rm requirements_*.txt || die
 }
 
 src_compile() {
 	python_optimize "${S}"
+	docs_compile
 }
 
 src_test() {
@@ -107,18 +110,23 @@ src_install() {
 
 	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
 
-	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
-	local HTML_DOCS=("${S}"/help/)
+	local DOCS=(COPYING README.md help_my_client_will_not_boot.txt db/)
 	einstalldocs
 
 	# Files only needed for testing
 	rm test.py hydrus/hydrus_test.py || die
 	rm -r hydrus/test/ static/testing/ || die
 
-	# These files are copied into doc
-	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
-	# The program expects to find documentation here, so add a symlink to doc
-	dosym "${doc}/html/help" /opt/hydrus/help
+	# ${DOCS[@]} files are copied into doc
+	# ${S}/docs/ is the markdown source code for documentation
+	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
+	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
+	if use doc; then
+		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
+		rm -r "${S}/_build" || die
+		# The program expects to find documentation here, so add a symlink to doc
+		dosym "${doc}/html" /opt/hydrus/help
+	fi
 
 	insinto /opt/hydrus
 	doins -r "${S}"/.
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 23f46333c697..27a86c06f7f6 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -2,18 +2,12 @@ AUX imagemagick-9999-nocputuning.patch 327 BLAKE2B 5b9b732a434733fa5ab1b554bf7e5
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
 DIST ImageMagick-6.9.12-28.tar.xz 9181044 BLAKE2B 2efc03da9e4c53b82479badfcc9a25f05e2d9766031807500a6bb39cba2a800c39a93a16864ca9af3a0b33d0c1c95cb2f33264c7e00149204ca742673c3d07ff SHA512 ec96fca6b385379873ead007b011d87fb3939ed4e3631d2a9401f1467db59d1d1ced072fd4fefe1577d04302a1060dbc324631b420f41a99bf32465b540ec979
-DIST ImageMagick-6.9.12-29.tar.xz 9179740 BLAKE2B 9d1e03c309c8c83b872de19c381810a9dcd9b3e9dd2c40dda872786af47d415986f9c73ce317eba84431e3635635d39c86ff5dfa22ee9b616c22c6e4bf113cfb SHA512 2f1c6f102e0893a07bb8d1cdc0acc646acc4a3db9c19bf3bf89e9a23962a8b91bd9deab24256dcb7c9bf7adaf6ed719a9dea96790bea09a028a50b14b2f4b032
 DIST ImageMagick-6.9.12-35.tar.xz 9178620 BLAKE2B 8bcf8bcc8bee8fe3d996a3b9388fdc20a6bbd45dda35121a9fb84804277286cb17c3b6cf2e6096765aefe20a31f819f8bcf094b0b3b1c68b683b50ddc415b398 SHA512 ba1f49570d1f890bc313d4e58c53c2b7388108c64cd2c5ef7586a7568f72d5655fced1a22085e27858cffcf86b7548376970fc6947fccb36f4cfba48327089e6
 DIST ImageMagick-7.1.0-13.tar.xz 10311564 BLAKE2B 7cb3e58f548cbe0b9e1239df47ff4f42af2cd0b6ff4c417a62515ff9bd434ecabed2cc7f7cb7cf8880f20af3f6d7de33d7368f146b9ac7668149959966a463d8 SHA512 dac1fc229599a63703fc3aa1378de313dc94dfbfa71913dc408ef65c88ef33820b5ddab4c9a064a86cc35c0abb0136f0adb626bff9e227b52ed0d90993688044
-DIST ImageMagick-7.1.0-14.tar.xz 10318332 BLAKE2B ca8db5d53c05099ab8fe0e6d810cebfb3614962e197d4fda7d958f1f7f469e2be461980578049753c5a3f5f0d656ca0d816abae51dd5dab44910e8d82c8d9fb0 SHA512 ca07ec69acee4f82baf3056116f6d1272eabd38acd55c67cab5c15cdd4b5b601f5b060b36943c0ae24f100ea47e0aa0af5862aae3b43e9477163e08dbde32f1d
 DIST ImageMagick-7.1.0-20.tar.xz 10339572 BLAKE2B 7e99a8b36089b1258f537dbdf8c674be17677da5450854e0dfe0ed3bd3722ec826099f7c22d615daece6d647e6c22f4d9aa7293fed9b4bebb77c163e3ac54bc3 SHA512 e07d8f8ede8f713f1c0bd571b6042062b154b95ab06b0479ec4162d242beba982bfa88438ac67985d4da6d18074bda4b0ac25a7c2ced44f19b54c21120441991
 EBUILD imagemagick-6.9.12.28.ebuild 7179 BLAKE2B c82d248b8debc199150564a6e426a7364f58694581bf2a36e883feb0da9dddbe093e58d51adbb1f2ada5ae1a0e651a8a16820c681097946c3fc63d13870fba04 SHA512 c5a8f6d240e17f2948a8fcf72bc74b2b54975301ebba4273b2f03094e60e975e9b318c633ffc1940cee6da2e2c3be35a3359d2028cf5a25eef4660bc399daf5b
-EBUILD imagemagick-6.9.12.29.ebuild 7187 BLAKE2B 0e3e44083e03f09b94d07e4f8012a62ee4b28835855507daf4375397e12b0f3369705df7b3f83048b0307a6849a8451bec62f066dc7449f20950524d3237f8f6 SHA512 2a8cda81018fb6f45b07026efdcf6e64f04ef82c1d11c56fb5948bab6cfc5f1ef46e3a53f9aadb409ab22524706439631ad581d6f023f19271f6f0e78e813325
 EBUILD imagemagick-6.9.12.35-r1.ebuild 7236 BLAKE2B 2466b01bcdaa6ec1d73ec16ca15899cfbcd0d61d6c5bf482e1f01e03db61f4c69c8710926287ebf8abd39f5543fa0eb6bcdc322116ee30e5407f693c2c7384ab SHA512 10419baaa82906ccc7ba5b8130183747936cf316a673f0f9584fa584c56be74c407a593f663c138299edd5e03c7fb69eb09c8b6eece78609fdaa241766575691
-EBUILD imagemagick-6.9.12.35.ebuild 7187 BLAKE2B 7604701bf4b0898c3cd5663bd62bff448910bfb29ebb662135b5c5b088b0db6d5d8742157df244af3587b8a2e10fd48c003932cd06b446667fa9b5be828e4040 SHA512 9ddcb8a8629fa49a67c69f019e9a4a554bf0b8b268f59b3ce32a7a6950423a2fe85d74981da7f39003d0a88589e233fd0fac66e03bfffb334f05d55b4d3c0859
 EBUILD imagemagick-7.1.0.13.ebuild 7393 BLAKE2B 62c865149f7d907244665fbfa78b0bb2eedfdf124ec59d72a2943bfdf0cc6b7de051965d5b63a8e117709346f70b7ce066736a647238026e054c67fe2d537009 SHA512 3a6523aa2cfdfebbc325ced0db16f48c0e17f586e41140a16fbaf66ad7c8079e33e3f4a31bd774b874f3816aceb6a01ae2be2edf8337e9d89b6b92959a83962b
-EBUILD imagemagick-7.1.0.14.ebuild 7407 BLAKE2B 9488dd72e898a148ee4b58112764f64df4927b3eda0ef8c6b31dfec9a8b80f36b303ba0c3f7370ac9efcffd70b983cceaccac2487f075d39d6af8e3d977dfa9c SHA512 3765419540bd0daf103da72f7a20cc1f03f24f200d7f2b337a19b58ba0ea7ea412a19da798329f252590c498191e2b9b3c030de163a0ab42755f784174a85d37
 EBUILD imagemagick-7.1.0.20-r1.ebuild 7456 BLAKE2B ba463b9b0c047982c3ae54669c435acfa1937c2abc32e3ea1159b91a4ad9efb699bc1caa579569a105c8029111e27f9ce259bfd0453583cb91054abe2b9c0c0a SHA512 354523f445ee8de722ba2ec1026b469b68c0f4261f3dc14762a32ec7de3fe53276ae363f5b02366cd8962706efc6e2fa4de4d79ebdf8bad28e2340b83c406347
-EBUILD imagemagick-7.1.0.20.ebuild 7407 BLAKE2B 9488dd72e898a148ee4b58112764f64df4927b3eda0ef8c6b31dfec9a8b80f36b303ba0c3f7370ac9efcffd70b983cceaccac2487f075d39d6af8e3d977dfa9c SHA512 3765419540bd0daf103da72f7a20cc1f03f24f200d7f2b337a19b58ba0ea7ea412a19da798329f252590c498191e2b9b3c030de163a0ab42755f784174a85d37
 EBUILD imagemagick-9999.ebuild 7456 BLAKE2B ba463b9b0c047982c3ae54669c435acfa1937c2abc32e3ea1159b91a4ad9efb699bc1caa579569a105c8029111e27f9ce259bfd0453583cb91054abe2b9c0c0a SHA512 354523f445ee8de722ba2ec1026b469b68c0f4261f3dc14762a32ec7de3fe53276ae363f5b02366cd8962706efc6e2fa4de4d79ebdf8bad28e2340b83c406347
 MISC metadata.xml 1227 BLAKE2B de893eae7e8f8e299ae10df13d202819b60df3b85858eacbe3455c4f27627689e7790a6fdded32d11d3157c35b5a2e08cab958e84b8f5799bb298deca15a1d4c SHA512 726e0c2cea973806fef1a3f51da11fb525b6a2e75bf2221a0939adbe50d2d8e267c5e627eca571e39769e4c14b134d2b9be3792047523540620c2eac149dd066
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.29.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.29.ebuild
deleted file mode 100644
index 2475294ebb28..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.12.29.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/6.9.11-60"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-	svg? ( xml )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:=[x265] )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.35.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.35.ebuild
deleted file mode 100644
index eef825d2f2f3..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.12.35.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/6.9.11-60"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-	svg? ( xml )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:=[x265] )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.14.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.14.ebuild
deleted file mode 100644
index 5e98ec4873eb..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.1.0.14.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/7.1.0-0"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-	svg? ( xml )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:=[x265] )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zip? ( dev-libs/libzip:= )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zip)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		--without-jxl
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	if [[ ${PV} == "9999" ]] ; then
-		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
-	else
-		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	fi
-	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.20.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.20.ebuild
deleted file mode 100644
index 5e98ec4873eb..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.1.0.20.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/7.1.0-0"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-	svg? ( xml )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:=[x265] )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zip? ( dev-libs/libzip:= )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zip)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		--without-jxl
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	if [[ ${PV} == "9999" ]] ; then
-		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
-	else
-		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	fi
-	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/img2pdf/Manifest b/media-gfx/img2pdf/Manifest
index 13afb91ca68d..95225686d214 100644
--- a/media-gfx/img2pdf/Manifest
+++ b/media-gfx/img2pdf/Manifest
@@ -1,7 +1,4 @@
 AUX img2pdf-0.4.3-test-gif-animation.patch 576 BLAKE2B 27b0357c0d1e307e54377fc3dd79c9ad1ae7864166ceab2efc518d9fa656e0685798a10da1dd488f1284a295fce2e0045f92e61e897431187f7083a4c95a9378 SHA512 edb0e95b8b126ddd8784ddb306b29173a2f22299016874e33eae0441837ca5a0f8608ed1a57f93b8a91a5f1723598e0a4f3fe94ab6eeff9ae372bdcd525a1c23
-DIST img2pdf-0.4.1-imagemagick-7-tests.patch.gz 2586 BLAKE2B 3d905b22c02fadf69e6329001cf7d6562d5809ba27842a5e630d87054979d953b641afb0b461f37bc9e379af808d0dc9e95478bdd5143047ea19d13d38e04593 SHA512 c9c5e88aea344a17bb57ff6b4540d7010537df0987cd3884e36220236753a42a71377468b556c17090ba22497a50c7d9365373aaeb007b75240ad55d21e9032a
-DIST img2pdf-0.4.1.tar.gz 96699 BLAKE2B f5a41a3a3d1b1ae7caadab4f37df644ad28a3ef4bd7a56a339253f0aead4d2427f05373dcfd16b10d82a6167243b3b03906e9f95b7ae0dcdbea6a666905c45a2 SHA512 e71833250509d52b8782a8bc9e12a8de6ab7ae06d5e6e235c0b3787bfad1070b5ed90934b21e4decc9b2c7008eeb0424f9df27e44ec66259916d3a2fdb73d1f1
 DIST img2pdf-0.4.3.tar.gz 98656 BLAKE2B ec7be83fa7fc38f94c7770a2566a49a39e5fd0abb715de74fc3f65d59087cecdd009f4284e647facaf6ae019a118b4bedf7ce8d4a09b8479a299c8404a8940d5 SHA512 00755788c7380e44733c5a309428894b6689e93d4d7cca8f84681d12977848971a6b1a7c92c7203258a529894e7a0debb5beaeb6b375de769a0d600ea8d65423
-EBUILD img2pdf-0.4.1-r1.ebuild 1484 BLAKE2B 4d08bcdebfa7374ee57e2cf83c0244dfc2237f57c040817173c22542f5fb488b2fa3517a38eda12c982f9085d0c9f7b85153a269845a274408f3c580b285d512 SHA512 1980c100b90c02d2d416ee86eb121619e9174346c8d74bd049b5cd5adff2c384f5dcb214b7b13cc40dc42f0c29b16373ff8ed47748e8b28bc04eb6de26ec29e3
 EBUILD img2pdf-0.4.3.ebuild 1456 BLAKE2B cdd2d23b78173ebafa8f2ad48a4bb430ac62ba153ca365fdce31a61b17e6b19017d22e8c45bfa1a5552d295c50bdc4aeaadd02bb05528b989c3180aeb0dffb65 SHA512 c5b2f2b6c797df6b2bd731df120811dedb19af9ae81a027afc54322daec5eca43fe8bf4b60bcc4272710f7d2b90b716564a2d0337d69e0d78d62647627c5eb27
 MISC metadata.xml 923 BLAKE2B fe0074db9549519b522f9d749388c5626b702dadba5a722444f652b203a60aea8e8ea5739c3c634076b42dddf24d17b4f449220de617224e59e5491893339901 SHA512 98fc799711e027afa40d2b9bf4558c38873d385920713f58d62782a986e72d1c9b04eb5591d4ec384bbf32376e2b03bf822bf5573015d003ff53ae0d4c7e6421
diff --git a/media-gfx/img2pdf/img2pdf-0.4.1-r1.ebuild b/media-gfx/img2pdf/img2pdf-0.4.1-r1.ebuild
deleted file mode 100644
index 8568129c5e2e..000000000000
--- a/media-gfx/img2pdf/img2pdf-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-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="Losslessly convert raster images to PDF"
-HOMEPAGE="https://gitlab.mister-muffin.de/josch/img2pdf"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~sbraz/${P}-imagemagick-7-tests.patch.gz
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gui"
-
-# pytest-xdist isn't really required but it helps speed up tests
-BDEPEND="
-	test? (
-		app-text/ghostscript-gpl
-		app-text/mupdf
-		app-text/poppler[cairo,png,tiff]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pdfrw[${PYTHON_USEDEP}]
-		dev-python/pillow[tiff,${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		media-gfx/imagemagick[jpeg,jpeg2k,lcms,png,-q8,-q32,tiff]
-		media-libs/exiftool
-		media-libs/netpbm[jpeg]
-	)
-"
-RDEPEND="
-	dev-python/pikepdf[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	gui? ( $(python_gen_impl_dep tk) )
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# Backport: commits from 853a1ec3634961ec1ebd5a06771d2770037ea802
-	# up to 152f6fb629581ab2f45a3b520f9468e99b0bc6b8
-	"${WORKDIR}/${P}-imagemagick-7-tests.patch"
-)
-
-src_prepare() {
-	distutils-r1_python_prepare_all
-
-	# Remove gui executable if there's no demand/support for it.
-	if ! use gui; then
-		sed -i '/gui_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	epytest -n auto
-}
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 4ad72c87227d..04895daf99ce 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,11 +1,14 @@
 AUX inkscape-1.1-poppler-21.11.0.patch 690 BLAKE2B 61fbaf22fa86170d1a72393795fb195b5c93d1c9f3e512751d4a9a355acda28656978529c1022caf9df701bc86e3c2b6e50b14eeed5d0c013013090b51ff6716 SHA512 9c7a312de85d11aa8ff3f7347a5c08ef84050522bc8ab59f9aa1aa84c405ddb707275cab7d447e34b1593d633b99fb8e482864e9397c576d688dcd7d34035c6d
 AUX inkscape-1.1.2-poppler-22.03.0.patch 1782 BLAKE2B 0cad51f92dd5427a07d8602237cec4937764e28be627a70e97a24535de2732dad7a15e7f0d0dd8b91f574e0a01aeced57d7dc54db7b340733f5395d14d6ab70d SHA512 5e04dfdffdca6acf18f869c6c385d808680261f3cbceb67a7dc3473bcef58c8e893ee7646f8b4027cb1287687dc6bff14fe6f9f3cdb32e5de91cc722b339be95
+AUX inkscape-1.1.2-r1-poppler-22.03.0.patch 1866 BLAKE2B f3f6ce5b6c5677999583af698b3984973b144125cad1801e33c4cce0b5f66739d7e3c178e27b2837da3a8dc8c5c1077c7f5d4afa1d62f76a99bbb1288e5b7933 SHA512 f2bec4d41ec707ac9617a59b02697c84c8a70ba96ee6efff39172ec54e16403a5416eb3f05590d3e23426168ad7307121739ae5ec5f99065e23b447e4de8fa2c
+AUX inkscape-1.1.2-r1-poppler-22.04.0.patch 4538 BLAKE2B bf60575e86dbfb3f483dc17c17f7cc42f9b947e64849b126a5fc4063036cfc14e93dcb2b2a6b16cf219033e59f890b0e4e58fe0014a382b77f056d87121355ff SHA512 043e2e85fecd8c657828871067801096e289a2b40c367c113047c0ec3a90b85436b6ca15df1a6cf8fef1a11e683033afda42098dc97b686d2d3ec7cd3a52e7af
 DIST inkscape-1.1-musl.txz 10820 BLAKE2B 3e7d346161d8c58436cae01227ce0eafc122276ba4b0483271cbb2e74447c7a89b2033bf709adb521abe2aebca79fffece183786071478b29aedbf3c742c4616 SHA512 8900863fb2d12cb6aea39b2e2ac8d32b512086aa3a26f3598d3117abd0b44f95b6001ea21ac02ce2368dd66dee0faefdef049c433f62380904770b7680680668
 DIST inkscape-1.1.1.tar.xz 34221284 BLAKE2B e628ead14f76fa3de929cfe14a6f085c5e9cd4304d2ee0a4b2046380284aacb8a32ff311c2e104f39f6abd0d080594ec4f9783fcaff183588107eedb49863c82 SHA512 22b1b584a344c4f4ebd0b6e84a4af44e472ef47b3971cb97cbb026a4bf7cb5bea49a7de0c2af2a9e439c7c794f775081c8d1904f33eadb49a5389ea01bc0896c
 DIST inkscape-1.1.2.tar.xz 34222832 BLAKE2B cb9bd271ff209055a6f5c2d99fd93dde29c7cb8c1b7caa7061dd1380ea914d5ccc6f5a91c5356c68bf0fd1462a3a5178e9774d0aeadcfceee9f0ea5f4beee73b SHA512 55884f34e6fcc604027e7ea60f67702a658d3838332c1f3b56ec2cb05ab44992df0651ed741d6e7e807848366b24ee7415d0908ed1143b0bfb33ddbf26ae5c16
 DIST inkscape-1.1.tar.xz 34203156 BLAKE2B 38896509dcdcf1ef18523c790855035ef16dfae75e27c2d69f782270f52a579557edcb790bef30f3210b9f797a619369d7d16dd23f098debdd8e5b6abf9b30aa SHA512 54b75f8794d748ef59d5b719ea04e3debadc1a5cf3f62f14254502567973bbd634850edd0a3bc082be878dacf041e9bd10982c4846bf154f89aa5319eda4ee80
-EBUILD inkscape-1.1-r1.ebuild 4511 BLAKE2B 5059c6574db7494c4535afe559b67800cfbc34552c5d559830eac2f62bbbcef1bdd9afc2ff2addb75c916bc96149ecc549a38d4b04405b8b0afa059a679e3edf SHA512 cc6bdf0092538fcbeb51ff0b9aa0e6883d687b4b3e01379ad0975a25c33a9fc544d0567ce590820ab1ebbbc689effc1113a14af9773de63cb79b2217732867c2
-EBUILD inkscape-1.1.1.ebuild 4301 BLAKE2B 78c6711dc8cb2b508da96d4276ea62033fd276d540ff89d4158eeb1477204efd5f0a38e7fb6847dc642b82312f5061d93cfaf186eb672942bbf5fb0fc506a935 SHA512 ecc5deb7dc582a3ddbedca78682f40437428b28e4be64054f838441bd80ae62f1248fc5761e94ad889a2b5b55f1505f4d1cf2e442ffe87d22682589a31cd1274
-EBUILD inkscape-1.1.2.ebuild 4608 BLAKE2B 2cc70aa8d3a507b646a9c194ade75387b587a594a19f473ed831be42b7c5ac4e3a2fc923c7829d571766c6ce529de6df4cb39df02deb8ef5431195085a338eb8 SHA512 f6404663e7448076c1fa6e17bb60329c4c0c3539647f6306a235c3b78d7a7c6ac375f9c09cce9cc2105681161f0e65214d2b21b649f0ed71d8563abec04d92a0
-EBUILD inkscape-9999.ebuild 4532 BLAKE2B 6962f87e98e8eedfe7550dc37f93e58fe8d7e7370ed91c49be9c547fb76ed1a0a5e86baef1235501ccb913a01b710af9abbc9f5819d807a9b0309afb353c6635 SHA512 5e8298c0811352290cc6a6c8e49faa7d40a356ca965e3916bd4a6379e7a8db9c8cad4bba963b9fe5629061dc9828eca617b6bcf9a1e21d88f801de36a8642b68
+EBUILD inkscape-1.1-r1.ebuild 4505 BLAKE2B 3d56782a93486ee21544f3bc51b9e403970398f1081788b7f633bf9509744cee828c3bd621f8986f8fbb61716da8d167077591a66728cf3dc1286d5ad8f1211b SHA512 f89a3e8287a56a157b28f7ec4b8b04d89eeafca7c342e4fe8c23b3c39da74a42630f62c98999de9826d400b9ce7523fe3000d419c4827d2438adab3e66761752
+EBUILD inkscape-1.1.1.ebuild 4295 BLAKE2B 1d499db24150d1f9ff856e4d2e5dc579a7b7c9e19cd4808bc4f3ea787c4420a5c17191fb41698d0974f90d3725d3fe352875837f9cf9f89acae48e48425eab4d SHA512 e29ee68de3757d1787c4e54544f1aea79e6951609bc23cfbb6f1c969f557118ce61e97d34da160d989858159ece82210d7e8f3a0117d740296b4268ef6124ce2
+EBUILD inkscape-1.1.2-r1.ebuild 4694 BLAKE2B e9b56f955395119ee8a3733ebd8a20138ce3194cdc38d43c90177a39df2abed233d96bf18800f15e6fa40658227d843d31f063c4c1f6b6d2cb94bee853ca87d6 SHA512 e7069d6310bd56deac5f58a244e62a12bb5641c75cc389001bb6135a53707ed09657b6f1cc8b66e6b89ec359edc74b4664a4d94e91f8783e2f36625a505d45ed
+EBUILD inkscape-1.1.2.ebuild 4602 BLAKE2B 33b923f83a927c7c0bf6337a892b5b3379c16438701f17cf67cd2007512b941ebd4368bf7e77412653ff7cabb62250830edcb1638dc16951f1adbdb0a7970e0e SHA512 cf4107138e553d2573ea5b5b290bd59cc66cd9ba32c1aad5ff5daca3ab07037acccfb14e8a76dd2a1e751a3c92ebe359cefc0493c106107fff2ef61b17535d2a
+EBUILD inkscape-9999.ebuild 4538 BLAKE2B 069d826b71e6af34385d1888995b394dc875d3c092ce04c0099a89892688441166897a9d58444f3371270de6da4a9864f21c270744ed78752dc568aaeecc1c8a SHA512 a2ad430a0866ff59cb303bcf4dc13f67a3e286d3e5d7b6cc34e89c6772409b9e319f2bc80f57f8d1a36b3e5bd0b3f980c6be8e06bf3dfb61603b985ea3355904
 MISC metadata.xml 984 BLAKE2B 8aee1f973005f9587571770eb14ccf725bf3ba9034d9935b029f776e64e17a9e156ec864e1150b259d2a983aec6e53b10791be4f1a3b67d5aa465ee115d966f0 SHA512 7ee7c7d473ae2120b9f592777b08d77899c6bf7f750f09cc334dc76a997a472e2593442fb281a9984d77e1aa4eca39e389484405e0aa8b5614da0f718c713fc0
diff --git a/media-gfx/inkscape/files/inkscape-1.1.2-r1-poppler-22.03.0.patch b/media-gfx/inkscape/files/inkscape-1.1.2-r1-poppler-22.03.0.patch
new file mode 100644
index 000000000000..4083c9426644
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-1.1.2-r1-poppler-22.03.0.patch
@@ -0,0 +1,43 @@
+https://gitlab.com/inkscape/inkscape/-/commit/f7857a4fc2b916e64d9689ccc89914ad19f3ef0a.patch
+https://bugs.gentoo.org/843275
+
+From f7857a4fc2b916e64d9689ccc89914ad19f3ef0a Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos@foutrelis.com>
+Date: Sun, 20 Mar 2022 22:41:51 -0300
+Subject: [PATCH] Ensure compatibility with Poppler 22.03 and later
+
+This change ensures that Inkscape will build against Poppler 22.03 after
+the changes that were made to the constructor of `PDFDoc`.
+
+See: https://gitlab.freedesktop.org/poppler/poppler/-/commit/4f2abd3ef
+
+Co-authored-by: Rafael Siejakowski <rs@rs-math.net>
+(cherry picked from commit a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75)
+--- a/src/extension/internal/pdfinput/pdf-input.cpp
++++ b/src/extension/internal/pdfinput/pdf-input.cpp
+@@ -668,8 +668,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
+ 
+     // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from
+     // glib gstdio.c
+-    GooString *filename_goo = new GooString(uri);
+-    pdf_doc = std::make_shared<PDFDoc>(filename_goo, nullptr, nullptr, nullptr);   // TODO: Could ask for password
++    pdf_doc = _POPPLER_MAKE_SHARED_PDFDOC(uri); // TODO: Could ask for password
+ 
+     if (!pdf_doc->isOk()) {
+         int error = pdf_doc->getErrorCode();
+--- a/src/extension/internal/pdfinput/poppler-transition-api.h
++++ b/src/extension/internal/pdfinput/poppler-transition-api.h
+@@ -14,6 +14,12 @@
+ 
+ #include <glib/poppler-features.h>
+ 
++#if POPPLER_CHECK_VERSION(22, 3, 0)
++#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
++#else
++#define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(new GooString(uri), nullptr, nullptr, nullptr)
++#endif
++
+ #if POPPLER_CHECK_VERSION(0, 83, 0)
+ #define _POPPLER_CONST_83 const
+ #else
+GitLab
diff --git a/media-gfx/inkscape/files/inkscape-1.1.2-r1-poppler-22.04.0.patch b/media-gfx/inkscape/files/inkscape-1.1.2-r1-poppler-22.04.0.patch
new file mode 100644
index 000000000000..8e507d0ebcf4
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-1.1.2-r1-poppler-22.04.0.patch
@@ -0,0 +1,130 @@
+https://gitlab.com/inkscape/inkscape/-/commit/a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75.patch
+https://bugs.gentoo.org/835661
+
+From 08b2f3d93c08bcf1e363f4284112fd14a7cbd09c Mon Sep 17 00:00:00 2001
+From: Rafael Siejakowski <rs@rs-math.net>
+Date: Mon, 4 Apr 2022 22:09:39 -0300
+Subject: [PATCH] Compatibility with Poppler 22.04
+
+Replace vanilla pointers with std::shared_ptr for pointers to fonts;
+eliminate manual ref-counting.
+Cherry-picked from 6a7b9ec0af088baa08b92fd76b33eca26537fb35.
+
+Fixes https://gitlab.com/inkscape/inkscape/-/issues/3387
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp
++++ b/src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -30,6 +30,7 @@
+ #include "Gfx.h"
+ #include "pdf-parser.h"
+ #include "util/units.h"
++#include "poppler-transition-api.h"
+ 
+ #include "glib/poppler-features.h"
+ #include "goo/gmem.h"
+@@ -2158,7 +2159,7 @@ void PdfParser::opSetCharSpacing(Object args[], int /*numArgs*/)
+ // TODO not good that numArgs is ignored but args[] is used:
+ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
+ {
+-  GfxFont *font = res->lookupFont(args[0].getName());
++  auto font = res->lookupFont(args[0].getName());
+ 
+   if (!font) {
+     // unsetting the font (drawing no text) is better than using the
+@@ -2179,7 +2180,9 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
+     fflush(stdout);
+   }
+ 
++#if !POPPLER_CHECK_VERSION(22, 4, 0)
+   font->incRefCnt();
++#endif
+   state->setFont(font, args[1].getNum());
+   fontChanged = gTrue;
+ }
+@@ -2373,7 +2376,6 @@ void PdfParser::doShowText(const GooString *s) {
+ #else
+ void PdfParser::doShowText(GooString *s) {
+ #endif
+-  GfxFont *font;
+   int wMode;
+   double riseX, riseY;
+   CharCode code;
+@@ -2392,7 +2394,7 @@ void PdfParser::doShowText(GooString *s) {
+ #endif
+   int len, n, uLen;
+ 
+-  font = state->getFont();
++  auto font = state->getFont();
+   wMode = font->getWMode();
+ 
+   builder->beginString(state);
+@@ -2445,10 +2447,10 @@ void PdfParser::doShowText(GooString *s) {
+       //out->updateCTM(state, 1, 0, 0, 1, 0, 0);
+       if (false){ /*!out->beginType3Char(state, curX + riseX, curY + riseY, tdx, tdy,
+ 			       code, u, uLen)) {*/
+-        _POPPLER_CALL_ARGS(charProc, ((Gfx8BitFont *)font)->getCharProc, code);
+-	if ((resDict = ((Gfx8BitFont *)font)->getResources())) {
++        _POPPLER_CALL_ARGS(charProc, _POPPLER_FONTPTR_TO_GFX8(font)->getCharProc, code);
++    if (resDict = _POPPLER_FONTPTR_TO_GFX8(font)->getResources()) {
+ 	  pushResources(resDict);
+-	}
++    }
+ 	if (charProc.isStream()) {
+ 	  //parse(&charProc, gFalse); // TODO: parse into SVG font
+ 	} else {
+--- a/src/extension/internal/pdfinput/poppler-transition-api.h
++++ b/src/extension/internal/pdfinput/poppler-transition-api.h
+@@ -14,6 +14,12 @@
+ 
+ #include <glib/poppler-features.h>
+ 
++#if POPPLER_CHECK_VERSION(22, 4, 0)
++#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr.get())
++#else
++#define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr)
++#endif
++
+ #if POPPLER_CHECK_VERSION(22, 3, 0)
+ #define _POPPLER_MAKE_SHARED_PDFDOC(uri) std::make_shared<PDFDoc>(std::make_unique<GooString>(uri))
+ #else
+--- a/src/extension/internal/pdfinput/svg-builder.cpp
++++ b/src/extension/internal/pdfinput/svg-builder.cpp
+@@ -108,7 +108,6 @@ SvgBuilder::~SvgBuilder() = default;
+ 
+ void SvgBuilder::_init() {
+     _font_style = nullptr;
+-    _current_font = nullptr;
+     _font_specification = nullptr;
+     _font_scaling = 1;
+     _need_font_update = true;
+@@ -1021,11 +1020,8 @@ void SvgBuilder::updateFont(GfxState *state) {
+     _need_font_update = false;
+     updateTextMatrix(state);    // Ensure that we have a text matrix built
+ 
+-    if (_font_style) {
+-        //sp_repr_css_attr_unref(_font_style);
+-    }
+     _font_style = sp_repr_css_attr_new();
+-    GfxFont *font = state->getFont();
++    auto font = state->getFont();
+     // Store original name
+     if (font->getName()) {
+         _font_specification = font->getName()->getCString();
+@@ -1171,7 +1167,6 @@ void SvgBuilder::updateFont(GfxState *state) {
+         sp_repr_css_set_property(_font_style, "writing-mode", "tb");
+     }
+ 
+-    _current_font = font;
+     _invalidated_style = true;
+ }
+ 
+--- a/src/extension/internal/pdfinput/svg-builder.h
++++ b/src/extension/internal/pdfinput/svg-builder.h
+@@ -203,7 +203,6 @@ private:
+     std::vector<SvgGraphicsState> _state_stack;
+ 
+     SPCSSAttr *_font_style;          // Current font style
+-    GfxFont *_current_font;
+     const char *_font_specification;
+     double _font_scaling;
+     bool _need_font_update;
+GitLab
diff --git a/media-gfx/inkscape/inkscape-1.1-r1.ebuild b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
index 64412bc803f8..70ed3359e180 100644
--- a/media-gfx/inkscape/inkscape-1.1-r1.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="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
 openmp postscript readline spell static-libs svg2 visio wpg"
 
diff --git a/media-gfx/inkscape/inkscape-1.1.1.ebuild b/media-gfx/inkscape/inkscape-1.1.1.ebuild
index a36c80fb7f88..b26f7a2e3ef9 100644
--- a/media-gfx/inkscape/inkscape-1.1.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
 openmp postscript readline spell svg2 visio wpg"
 
diff --git a/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..380722ee9a7b
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
+MY_P="${P/_/}"
+inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
+else
+	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="SVG based generic vector-drawing program"
+HOMEPAGE="https://inkscape.org/"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
+openmp postscript readline spell svg2 test visio wpg"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/poppler-0.57.0:=[cairo]
+	>=dev-cpp/cairomm-1.12:0
+	>=dev-cpp/glibmm-2.54.1:2
+	dev-cpp/gtkmm:3.0
+	>=dev-cpp/pangomm-2.40:1.4
+	>=dev-libs/boehm-gc-7.1:=
+	>=dev-libs/boost-1.65:=
+	dev-libs/double-conversion:=
+	>=dev-libs/glib-2.41
+	>=dev-libs/libsigc++-2.8:2
+	>=dev-libs/libxml2-2.7.4
+	>=dev-libs/libxslt-1.1.25
+	dev-libs/gdl:3
+	dev-libs/popt
+	media-gfx/potrace
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	media-libs/libpng:0=
+	net-libs/libsoup:2.4
+	sci-libs/gsl:=
+	x11-libs/libX11
+	>=x11-libs/pango-1.37.2
+	x11-libs/gtk+:3
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_USEDEP}]
+		media-gfx/scour[${PYTHON_USEDEP}]
+	')
+	cdr? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libcdr
+	)
+	dbus? ( dev-libs/dbus-glib )
+	exif? ( media-libs/libexif )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	readline? ( sys-libs/readline:= )
+	spell? ( app-text/gspell )
+	visio? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	wpg? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+"
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+	')
+	dia? ( app-office/dia )
+	postscript? ( app-text/ghostscript-gpl )
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.2-r1-poppler-22.03.0.patch" # bug 835424
+	"${FILESDIR}/${PN}-1.1.2-r1-poppler-22.04.0.patch" # bug 835661 / bug 843275
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} = 9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+	[[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
+		-DWITH_NLS=ON
+		-DENABLE_POPPLER=ON
+		-DENABLE_POPPLER_CAIRO=ON
+		-DWITH_PROFILING=OFF
+		-DWITH_INTERNAL_2GEOM=ON
+		-DBUILD_TESTING=$(usex test)
+		-DWITH_LIBCDR=$(usex cdr)
+		-DWITH_DBUS=$(usex dbus)
+		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
+		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
+		-DWITH_GNU_READLINE=$(usex readline)
+		-DWITH_GSPELL=$(usex spell)
+		-DWITH_JEMALLOC=$(usex jemalloc)
+		-DENABLE_LCMS=ON
+		-DWITH_OPENMP=$(usex openmp)
+		-DBUILD_SHARED_LIBS=ON
+		-DWITH_SVG2=$(usex svg2)
+		-DWITH_LIBVISIO=$(usex visio)
+		-DWITH_LIBWPG=$(usex wpg)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build -j1 check
+}
+
+src_install() {
+	cmake_src_install
+
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
+
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
+
+	local extdir="${ED}"/usr/share/${PN}/extensions
+
+	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
+		python_optimize "${ED}"/usr/share/${PN}/extensions
+	fi
+
+	# Empty directory causes sandbox issues, see bug #761915
+	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
+}
diff --git a/media-gfx/inkscape/inkscape-1.1.2.ebuild b/media-gfx/inkscape/inkscape-1.1.2.ebuild
index 5f461759e758..e5f882642e0f 100644
--- a/media-gfx/inkscape/inkscape-1.1.2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"
diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 58011f3429ba..77b4ae19423d 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"
@@ -73,7 +73,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
 	)
 	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	readline? ( sys-libs/readline:= )
 	spell? ( app-text/gspell )
 	visio? (
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 80e97ccd5f31..ac0eb28dd899 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -6,6 +6,8 @@ AUX krita-5.0.0-clang.patch 1645 BLAKE2B 9f02317b40b2408cab46acbe73797c2fea9b71c
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
 DIST krita-4.4.8.tar.gz 254887779 BLAKE2B 251c621a235b8d977c886d3d31f07187efb6d45eab1960eab84ba4078216a1ecf5c7f0b90bdbf791e0c219867c6df59bb99b47c4b23c7658e1d2990f3e869cdb SHA512 53b9814fcf61fbaee06e81f456aa9de7ab09df99e04932251984c8ae190248e48fa20762bdb7be503ea267e1fb835095b105ce4bf2078fd510ab5a8ef6d82f81
 DIST krita-5.0.2.tar.xz 179049488 BLAKE2B a58ee0e7d654f18509f970d32a680a9a993c7172a3818517ddf0a41f500c2d1f9102a432b728b9d9254f39f1be0c926602e3b1806ae19b6efc49f99becdffcdd SHA512 5dd2d6961feabf20dbcef49f3499281e34b409e96d379b0247eec70449f82c05ed3cf3ca09014535adb7ce66659d58e988f1f054364637c9851181fa8ee926a5
+DIST krita-5.0.6.tar.xz 179335700 BLAKE2B dc164fec0ed39d8c9fc8b3624d0ceaeeb25bb55b32cabf56f655116448cea94451421e67069de1d1fbaed1e949b88c982f3e01cf66de40518d1b4e2b9b079bdb SHA512 7ad92b750a1c54bf79b279730ad84119030ff532f5a8a77f2040776304dbb768a67dfa1bf67ac72c0c984b7e508e59476640f1b41ea38d3f525d52c7eb6cde9f
 EBUILD krita-4.4.8-r1.ebuild 3603 BLAKE2B e3d9d8a9d6060c2b1e621627623668ae29fce652769533ad898064e7f491ee9859fabd9df154bad3346aba37a8a5024061beca045547a87cfb6aa2d8b781ebc1 SHA512 3c3a5b4d98393c6ece66e15b6ca636689da97ce4423855d36d9c02e2fbaa71d51ad91873ae03e47f0fee3c0074307225189b8194a2fa1c4a3472cccb1a6b500d
 EBUILD krita-5.0.2.ebuild 3456 BLAKE2B 03fa9d1f87eea0812835aa88912f84ed9d25c738b71f0dc65f9075f2797d4d2e60824728347884dd69c23bce15666c30e6fd7e2dcdf967bc532f7df83494f3a8 SHA512 a0f4c50826a39e04cf87ace6eddd4a5ab37fdeea3d7c8f8bf53750abf69f1ba73b5c73b5fa0241f6d44ad6c4c2b504fec4a87831ac0c1be9e2045207be0da7a0
+EBUILD krita-5.0.6-r1.ebuild 3417 BLAKE2B a070340934c3359d0391cc9efe8a237a76324ba6bb0018fb2b8c3421cafc985b4492f713d5453cb1fe961683aebfda82c93daf8f8fdc1ce430e8bdb8ce89343c SHA512 2d9013ef45be7f4404e46c725ed711ef482dd4921acf7182553dc280b3884171883e4d3c0e87275a22ed706f5f8e2e6bde91d8aecb812271d21d508317f786dd
 MISC metadata.xml 877 BLAKE2B 529639e044480796204d2338601d4d10ccac0aa83565469b37d838446b4e924b8440c1c3d1eac1473a1220fedea2c49c392c5c99495c27ab7899ed7909666c32 SHA512 6f826baa1918ed944b22944f85304452d34b3a326c615ba8416589facc0208351b25d6eed9a3f8b0f3614db6c3ddd26b0b54554da95aee8ed332f1645d6fda0d
diff --git a/media-gfx/krita/krita-5.0.6-r1.ebuild b/media-gfx/krita/krita-5.0.6-r1.ebuild
new file mode 100644
index 000000000000..dd01742d3d40
--- /dev/null
+++ b/media-gfx/krita/krita-5.0.6-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+PYTHON_COMPAT=( python3_{8..10} )
+KFMIN=5.82.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/"
+
+LICENSE="GPL-3"
+SLOT="5"
+IUSE="color-management fftw gif +gsl heif +jpeg +mypaint-brush-engine openexr pdf qtmedia +raw vc webp"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# bug 630508
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=
+	dev-libs/quazip:0=
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[declarative,gui,widgets,${PYTHON_USEDEP}]
+		dev-python/sip:=[${PYTHON_USEDEP}]
+	')
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	media-gfx/exiv2:=
+	media-libs/lcms
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXi
+	color-management? ( >=media-libs/opencolorio-2.0.0 )
+	fftw? ( sci-libs/fftw:3.0= )
+	gif? ( media-libs/giflib )
+	gsl? ( sci-libs/gsl:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	heif? ( >=media-libs/libheif-1.11:= )
+	mypaint-brush-engine? ( media-libs/libmypaint:= )
+	openexr? ( media-libs/openexr:= )
+	pdf? ( app-text/poppler[qt5] )
+	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
+	raw? ( media-libs/libraw:= )
+	webp? ( >=media-libs/libwebp-1.2.0:= )
+"
+DEPEND="${RDEPEND}
+	vc? ( >=dev-libs/vc-1.1.0 )
+"
+BDEPEND="
+	dev-cpp/eigen:3
+	dev-lang/perl
+	sys-devel/gettext
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_configure() {
+	# Prevent sandbox violation from FindPyQt5.py module
+	# See Gentoo-bug 655918
+	addpredict /dev/dri
+
+	local mycmakeargs=(
+		-DENABLE_UPDATERS=OFF
+		-DFETCH_TRANSLATIONS=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged
+		$(cmake_use_find_package color-management OpenColorIO)
+		$(cmake_use_find_package fftw FFTW3)
+		$(cmake_use_find_package gif GIF)
+		$(cmake_use_find_package gsl GSL)
+		$(cmake_use_find_package heif HEIF)
+		$(cmake_use_find_package jpeg JPEG)
+		$(cmake_use_find_package mypaint-brush-engine LibMyPaint)
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package qtmedia Qt5Multimedia)
+		$(cmake_use_find_package raw LibRaw)
+		$(cmake_use_find_package vc Vc)
+		$(cmake_use_find_package webp WebP)
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/mandelbulber/Manifest b/media-gfx/mandelbulber/Manifest
index 11ded73bf717..ee2f00a863c6 100644
--- a/media-gfx/mandelbulber/Manifest
+++ b/media-gfx/mandelbulber/Manifest
@@ -1,7 +1,4 @@
 AUX mandelbulber-2.26-openexr-3-imath.patch 951 BLAKE2B 0c8c7bca6d5ebdee799fb43b0a39912966554c0d62917bb1de0c92f628cec2d71b9acd26123a102d27f96aee22f2ffa4897edd0eb808798f4f31c2da3d66a5ae SHA512 17d907693ab54aaf60ce61e36616660f925e656bf05de1183cf7127f1c67ae62439a20faa7277a099611129a4dc6aaaba744f1c4bc0e76a1b7e6e03e0ce58b07
-DIST mandelbulber2-2.12-1.tar.gz 47092910 BLAKE2B 1e5ca64a4819052882bc7cdc047c6d755046f2ceebcf7b26db41511fde219aa523a3c6884f0667aed1365104c4502a6e6b1b2d7d40a4a024fdb5051d5ac13cd2 SHA512 5dc8dcaa45bc8747024ed16379cc4d622535099c925abf3c2aa01c0338fe8c1f272e6113b6bf28da6a4bb087e6d6e6a4c6634feca993d2c89f12b79582ff271c
 DIST mandelbulber2-2.26.tar.gz 113563064 BLAKE2B 6fd333a42f5e4b106b950079277ff1bb6cc2395382e12ea37424df137ed11cf5fb103185b325d9615bd890404fe596133644a5cdd3911140eabb2f8c0c1d0e14 SHA512 cc547cab6e2b672a35be5d3d214ad3b292eaf1b3b06daf12cecce0f69e612fcfb4123cd837fd87003eea3103086947639fd04cae4b0ed7cd231d78e5d775e299
-EBUILD mandelbulber-2.12-r1.ebuild 1665 BLAKE2B 3177e407606884fef8231abbd645f3defa88693438d05a25e34f95656b0c5b2a35a4910fd668e69886e8870f3beed18b2c4e480c46449f22c048b9485cc87a0d SHA512 578355f308d9a58f3680272092349721dede622448ed87561de7ec7b26c0e8fbed39166c144acb433b1e194c735ebec8e6a99e5691120d49f07108b34d6a7fbd
 EBUILD mandelbulber-2.26-r1.ebuild 1975 BLAKE2B 1aee525c99fa0efbf96ef2908abd3b1e9db9e7215600c19bdfa5f7eb4bab58f224686557cd23fcc7c51ce457a506ff9ca547bde23715605ac04530e7b502df9a SHA512 a1ce3644a668490565f12ebfb15b92d0ff38461de2a992f260732fb5cef3b38961dadbc7caf03a8ad058a226949a8844b1cdb1a7d28a363725ca362cd15895bd
-EBUILD mandelbulber-2.26.ebuild 1924 BLAKE2B 86c47c6fce165f2b3bcb440fccdd83a9670cf270fc43e9e2e519206f34e3af1d638ffc12b4e6b21497b36105efc8479cc2d41917ea8835272d73394cb74e29ff SHA512 852bade0b1dd07e2a3d3c38a589495e0aac21af3ba613dfe2f4e8cf970daae42f462398c1a304d1920698225cb0f5c226b17a32861ffa4d670ca46dbaecc71da
 MISC metadata.xml 672 BLAKE2B 8b7d423df1cd3f405b43bbeea9f6de9438951cf55b2020016b3174376e5498f2bc903295afde6626bf342b77050210eec78db8672cf2555f344f12248f1e58be SHA512 4005cd3324e642b6ea382e992949c1a3f459cef6f6094eb896e58fbc5651cd1d88c6575ef76896673bd0589e46285d3df9858a110f9b4b4c867c797a329dee77
diff --git a/media-gfx/mandelbulber/mandelbulber-2.12-r1.ebuild b/media-gfx/mandelbulber/mandelbulber-2.12-r1.ebuild
deleted file mode 100644
index ae92b8fde4b8..000000000000
--- a/media-gfx/mandelbulber/mandelbulber-2.12-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}2-${PV}-1"
-inherit desktop qmake-utils xdg-utils
-
-DESCRIPTION="Tool to render 3D fractals"
-HOMEPAGE="https://www.mandelbulber.com"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="CC-BY-4.0 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="opencl openexr sndfile tiff"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-libs/lzo
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qttest:5
-	dev-qt/qtwidgets:5
-	media-libs/libpng:0=
-	sci-libs/gsl:=
-	opencl? ( virtual/opencl )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
-	)
-	sndfile? ( media-libs/libsndfile )
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${RDEPEND}
-	dev-qt/designer:5
-"
-
-src_prepare() {
-	default
-
-	# not packaged yet, but may be in the future
-	sed -i -e "s/qtHaveModule(gamepad)/false/" makefiles/common.pri || die
-
-	use openexr || sed -i -e "s/packagesExist(IlmBase)/false/" makefiles/common.pri || die
-	use sndfile || sed -i -e "s/packagesExist(sndfile)/false/" makefiles/common.pri || die
-	use tiff || sed -i -e "s/packagesExist(libtiff-4)/false/" makefiles/common.pri || die
-}
-
-src_configure() {
-	if use opencl; then
-		eqmake5 makefiles/${PN}-opencl.pro
-	else
-		eqmake5 makefiles/${PN}.pro
-	fi
-}
-
-src_install() {
-	dobin ${PN}2
-
-	dodoc README NEWS usr/share/doc/${PN}2/Mandelbulber_Manual.pdf
-
-	insinto /usr/share/${PN}2
-	doins -r usr/share/${PN}2/*
-
-	domenu ${PN}2.desktop
-
-	newicon -s 256 qt/icons/${PN}.png ${PN}2.png
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-gfx/mandelbulber/mandelbulber-2.26.ebuild b/media-gfx/mandelbulber/mandelbulber-2.26.ebuild
deleted file mode 100644
index 4995aa764c60..000000000000
--- a/media-gfx/mandelbulber/mandelbulber-2.26.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="${PN}2-${PV}"
-inherit desktop qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="Tool to render 3D fractals"
-HOMEPAGE="https://www.mandelbulber.com"
-SRC_URI="https://github.com/buddhi1980/${PN}2/releases/download/${PV}/${MY_P}.tar.gz mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="CC-BY-4.0 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="joystick opencl openexr sndfile tiff"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-libs/lzo
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qttest:5
-	dev-qt/qtwidgets:5
-	media-libs/libpng:0=
-	sci-libs/gsl:=
-	joystick? ( dev-qt/qtgamepad:5 )
-	opencl? (
-		dev-libs/clhpp
-		virtual/opencl
-	)
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
-	)
-	sndfile? ( media-libs/libsndfile )
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${RDEPEND}
-	dev-qt/designer:5
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
-}
-
-src_prepare() {
-	default
-
-	use joystick || sed -i -e "s/qtHaveModule(gamepad)/false/" makefiles/common.pri || die
-	use openexr || sed -i -e "s/packagesExist(IlmBase)/false/" makefiles/common.pri || die
-	use sndfile || sed -i -e "s/packagesExist(sndfile)/false/" makefiles/common.pri || die
-	use tiff || sed -i -e "s/packagesExist(libtiff-4)/false/" makefiles/common.pri || die
-}
-
-src_configure() {
-	if use opencl; then
-		eqmake5 makefiles/${PN}-opencl.pro
-	else
-		eqmake5 makefiles/${PN}.pro
-	fi
-}
-
-src_install() {
-	dobin ${PN}2
-
-	dodoc README NEWS usr/share/doc/${PN}2/Mandelbulber_Manual.pdf
-
-	insinto /usr/share/${PN}2
-	doins -r usr/share/${PN}2/*
-
-	domenu ${PN}2.desktop
-
-	newicon -s 256 qt/icons/${PN}.png ${PN}2.png
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-gfx/nvidia-texture-tools/Manifest b/media-gfx/nvidia-texture-tools/Manifest
index 67a7186bfae4..51748e21b80b 100644
--- a/media-gfx/nvidia-texture-tools/Manifest
+++ b/media-gfx/nvidia-texture-tools/Manifest
@@ -10,5 +10,5 @@ DIST nvidia-texture-tools-2.0.8-1.tar.gz 935227 BLAKE2B aef1801795f6102ac7c96df2
 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 1516 BLAKE2B 6607ec0e9e4c15a8a93a6887baee944472b84e1f29f03363ed2e74c818e7e4bb05e81d131070ecb5f0ed641c3a9732e7a6f91ac108a9e4b3120c7c748e7a11ad SHA512 5d8a2726931cce582b80bca0ea0b9c8eb3a533a9dfbbd94737eeab32e2525a9048006355ee2b339466009f7ed66c7745809fbe4218d618b7c152486830489b99
-EBUILD nvidia-texture-tools-2.1.2.ebuild 1131 BLAKE2B f8b96a5ede3ab92038fe4f6abaf5db46881fd07a69c5f875270757b8822279b0cb7a24516dde831a7e814fff6903784a5387b8e40853ee5b8388f2271cd9e1b9 SHA512 e518aaa97a8b342da6e8cb36880b6e4f4829697984c069576a3badaa3f320fca372c5ed743ce8520edf5791ff23fe7552e008018a54265ad7fca2c0fca330732
+EBUILD nvidia-texture-tools-2.1.2.ebuild 1154 BLAKE2B 7b134563c4013d8efe198ce8676f9d47d4e609f104d30e6ffa8937c4f01f14c224c39188bfdb9fb18b03ca6cffc49570cc0c627a85e832c1f3024345d4609967 SHA512 6d7bada47b7f3e3c22ba451f2937926c640eabdc162c9f30e4c27ed5e4365fee00dff0ba2d797b936ea5ec51fd8017e22542fda0a66db3cd954ce445da74dbb4
 MISC metadata.xml 549 BLAKE2B ebd2ca9d85f2e8b5621275c7bfd554ff0f9c721c73f203f9e1d3ba76cd6428d78169586b3ec418f95e0632d083f747fdbb8a487532f668cd525b58561f133078 SHA512 5631940e5c4c18bbf6bfca1645fc46f736d867f38417106930437f09f6a12964f8c1a65d8a6baba2bc2f2e77964f025bd604f1a48c2db2f10a13e0e163ca4b60
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 803456bf123a..0653f47f3995 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-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,9 +22,8 @@ RDEPEND="
 	virtual/jpeg:0
 	x11-libs/libX11
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-cmake.patch
@@ -33,9 +32,11 @@ PATCHES=(
 DOCS=( ChangeLog README.md )
 
 pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_configure() {
diff --git a/media-gfx/opencsg/Manifest b/media-gfx/opencsg/Manifest
index 86d89a2b8fca..e64c6e8123d9 100644
--- a/media-gfx/opencsg/Manifest
+++ b/media-gfx/opencsg/Manifest
@@ -1,4 +1,6 @@
 AUX opencsg-1.4.2-includepath.patch 537 BLAKE2B c54c3ff9bc802f34a92a72620fd20277d90174a3d0e69ec7d34987b387da44e37d1a6487f6c6063b555bca8c40a2d827d91b3ab0d9c0b8adbab5648fce90a639 SHA512 7ccc4b75560682ad7c3c340b8d8824d1339a8a1859f459139ad84d9a06e25072eba84a78c6d30aa4dbd72cf82465a176550a7e89b2590ccd85e4129511ad3893
 DIST OpenCSG-1.4.2.tar.gz 933135 BLAKE2B 20882afaddf40cc4e0c43c3e70bad334aae3885241a3993ce7083de20f9b10d6e6c4eb3a55abba2b1eca64fdae784c491492543a5012b8b2d67eb63a16dd693b SHA512 fbe6f925982717ecca7bd0eacc4fc5b362c80c7663b1ff0d9a228f2b5e1d3625d3e6d324d9e634665c74e9c0fc37d10290ece293e59a3eba67035b6b700b7778
+DIST OpenCSG-1.5.1.tar.gz 967182 BLAKE2B a24d7e736b58af78dfed218e7015c9a580c447b65367209fade0c90a36cf7bb638c4abe10cdf37a07c8f16d46389e92341ab72ea8d9c189e380502cbb2962d29 SHA512 aef3e785e730fd8f2ee06719d1c7a57c105e7432fb4dc6f4ad4305aabf1c7d4438ef869ae4eb840dc272b35f20c4ff296e6dd5418337230081e74ac4c91cd342
 EBUILD opencsg-1.4.2-r1.ebuild 1252 BLAKE2B f017fe212fb39da5b1fbd88aacf4e55f616be92388f52761f54bd1159ee7f4a0bbd3d9fd485f47de2c14677072c23a4f9c66d744b943c41e2347639a2e9a0f01 SHA512 c2a9a3bb21a3419a7f1a4896918c8ccb6383750802f1ab6efdc7186b09073260ee745394f1d5bc1c83a61c631f059fa5efe0b08b820de1ee8c8dfd3408c8e98e
+EBUILD opencsg-1.5.1-r1.ebuild 1160 BLAKE2B adc0bf1134e34bbba3b33f2d7bc359876022712d0b474d76e4bd13611b985e0520d115d58500a4eea7eaee67bb6879022bfb0a86f826ea07d25a79aed258589c SHA512 f6879e5f29fe5a379542e9b07ae78aa01b822dbc1a0a63e15c2498237a8051a203168779207acae6ee225656f3ca6279ff16e72fd05a4a904940ef59cf035319
 MISC metadata.xml 1303 BLAKE2B 39b12bf1071d488890726841c2e609023e99edc3387007408b1a332051cb7adb7faf71ea3e5afdc660ba9a62116a322addba637aa1a7dc78adcae4cf27ac6508 SHA512 5a56d0545ab79ed384f580aa97be7736ac844ed8951262d016b4eb43193c594fe889f067b1c7243346b8185c8e63d933457b9b1f1f1ae47d5e350fc93d65476c
diff --git a/media-gfx/opencsg/opencsg-1.5.1-r1.ebuild b/media-gfx/opencsg/opencsg-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..7792bedb9d2f
--- /dev/null
+++ b/media-gfx/opencsg/opencsg-1.5.1-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils
+
+MY_P="OpenCSG-${PV}"
+
+DESCRIPTION="The Constructive Solid Geometry rendering library"
+HOMEPAGE="https://www.opencsg.org"
+SRC_URI="https://www.opencsg.org/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2+"
+SLOT="0/1.5"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc"
+RESTRICT="test"
+
+RDEPEND="
+	media-libs/glew:0=
+	virtual/opengl
+"
+
+# qtgui is needed for opengles2 feature by
+# /usr/lib64/qt5/mkspecs/feature/unix/opengl.prf
+DEPEND="${RDEPEND}
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+"
+
+DOCS=( build.txt changelog.txt )
+
+PATCHES=( "${FILESDIR}"/${PN}-1.4.2-includepath.patch )
+
+src_prepare() {
+	default
+
+	# removes duplicated headers
+	rm -r glew || die "failed to remove bundled glew"
+}
+
+src_configure() {
+	eqmake5 opencsg.pro INSTALLDIR="${EPREFIX}/usr" LIBDIR="$(get_libdir)"
+}
+
+src_compile() {
+	# rebuild Makefiles in subdirs
+	emake INSTALLDIR="${EPREFIX}/usr" LIBDIR="$(get_libdir)" qmake_all
+	emake sub-src
+}
+
+src_install() {
+	emake -C src INSTALL_ROOT="${ED}" install
+	use doc && local HTML_DOCS=( doc/. )
+	einstalldocs
+}
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 79cd1e18c589..703b9f11acf7 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -2,6 +2,7 @@ AUX 50openscad-gentoo.el 167 BLAKE2B 36292439057e2b9a5993c73cf5d46e5b6b0b56695f4
 AUX openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch 790 BLAKE2B b08a024f81a29d7fb4e0860977b814d2ec6ce6dcbf8ab87655f5d36f51ea3bbce6559369363c33ca7593cbc3284de920f71be3c38e3ab7b5efa83d3466132b79 SHA512 2af887d7b085c49203e72ad41cb5c0e32b772a8abd35843485434cb11b263ba8a727a0ebc34c7138bff1e6852245f2bdaf7d91711184a5f16ed22603578a0892
 AUX openscad-2021.01-0002-fix-to-find-lib3mf-2.patch 1396 BLAKE2B a43872dd83427f28a48528fbac534924796db769bd0213ba1b6fca41a65c766aa3355aa9ee3f7d68dcbbf3d578cee984f2ad61f599fdf9551ef55724f460f4db SHA512 ffbf402976054c1e7294a0d661e0648bdb359cf57e676d818cf1140644b7a0d0943f5adf1d2f511ad17ca45a35e31785aae584dc7607f13bfc9d94795fc3812b
 DIST openscad-2021.01.tar.gz 15817555 BLAKE2B 417857d704fa3c14312641ebda983eb85a1e3bc0d517a235fa3bd2523fce6f93c1ea526c330179bc35f03e6c73d3cd7c4c57cd71480088c21bfc99bb020ab7cd SHA512 8deaa26bf4c295c12da38f323d2b2e6f827851337f5bc1cc9c79afc083c9f913c19a263086e6e853bf2c8434c1ccc705ea22ddb02dc99d39bb1e5e03fc58d128
-EBUILD openscad-2021.01.ebuild 2318 BLAKE2B 7d474960f76029b745bbcb26e6e4a6f2511f364bf10c85bcab9cf9ef4fc7bdc4b97402a602b59682e612af3cdb080e79abe24d06431c0a30c55c62daca9bbfaa SHA512 31a5481da0a65d589b0d4bbd41d76b77affcc2d1cf83fb1de91ea4766ac9ce74ba8a40e12ec7abadc823a7f30e51a93ac8b0871358adace7e9020003424a4a98
-EBUILD openscad-9999.ebuild 2506 BLAKE2B c9d1862b31eb6c82feaa038e0d3e13f1eb04f8b8567c2a7d8f4ccfded8aad77efdc4cac38d7e429e9c06acf1f0f17e8ffe9b45d65f37b354f715cfda3bc2807f SHA512 a8c53089c3c0ecbe0b53452dfe854477bd7bcb66d841f051b35d0d07401cd9dbad66ce3c6b1ace55e12f17bc2b613ba614c266ef0ea737ceba03003bc36b39ed
+EBUILD openscad-2021.01-r2.ebuild 2320 BLAKE2B 0e7bff7f92167eec53b96c8f71bb4bd3f6b336f9d632769ea98dad42af97519ef1003f760bc6dd2c8136fe515441c85cf298cfee4252b6f375cb828013815bd6 SHA512 54c9581deddb740d81b9cc17b4b0d3f6107935312208032da8c56ee13c0d7c81557c7500d73f562f8f2dcce2a783ac339bfed53c3c79c54f3dfe6eba661713f6
+EBUILD openscad-2021.01-r3.ebuild 2237 BLAKE2B 3253f0b6a454ef2387eef612f480fe51c39b174fd4926ba10979b1c179445cff60c783f7863b05f7ceb1cce5212c5bfc6c77152da192623a7717381d1fb2ecc7 SHA512 683b082cf5e8202bf220ff940f9b38f88ea6f613a5e953b7eed0140777c15d21b2909145924503e68404cd56e76ffb31caac23a37c18a26f3bc416fa1944d14c
+EBUILD openscad-9999.ebuild 2508 BLAKE2B f3842eee85e9da815b3dda59c553f4cd97193bd7732d2bd65820b7283a2e8699c352cf8643b67fc3c4e8e411628b2262998d65ede1ca1154c4c0cec3edcd4f5c SHA512 a214cdebcb5be8a052b78b9b34741cf0680d262ce07a740803ee9a351a63d0e0f03fd733d754c4cdc161ffa35e6713eb8cd2ffe7627014e0851d647360eeb418
 MISC metadata.xml 1348 BLAKE2B b15a74a20ef94a6a47de57826c5279a4e8c388a52bf9d1058a1ba0b347fcd77e0c8b79a42515f5411d0991fb8fb71c604f792dd2a2addaaca78bc85dbfc7a611 SHA512 fea109a00324f0bdcaae855e18fba456a449bb8192e633cfd5806fa1040fe3bba24f75493e0012d54afe8828073fc4d02ae01533b45648e05c575777b23572d1
diff --git a/media-gfx/openscad/openscad-2021.01.ebuild b/media-gfx/openscad/openscad-2021.01-r2.ebuild
index 31831701d921..2dce8f8df45c 100644
--- a/media-gfx/openscad/openscad-2021.01.ebuild
+++ b/media-gfx/openscad/openscad-2021.01-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,7 +38,7 @@ RDEPEND="
 	dev-qt/qtnetwork:5
 	dev-qt/qtopengl:5
 	dev-qt/qtwidgets:5
-	media-gfx/opencsg
+	media-gfx/opencsg:=
 	media-libs/fontconfig
 	media-libs/freetype
 	>=media-libs/glew-2.0.0:0=
diff --git a/media-gfx/openscad/openscad-2021.01-r3.ebuild b/media-gfx/openscad/openscad-2021.01-r3.ebuild
new file mode 100644
index 000000000000..2bb8a63e134f
--- /dev/null
+++ b/media-gfx/openscad/openscad-2021.01-r3.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common qmake-utils xdg
+
+SITEFILE="50${PN}-gentoo.el"
+
+DESCRIPTION="The Programmers Solid 3D CAD Modeller"
+HOMEPAGE="https://www.openscad.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="emacs"
+# tests are not fully working and need cmake which isn't yet
+# officially supported.
+RESTRICT="test"
+
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-libs/boost:=
+	dev-libs/double-conversion:=
+	dev-libs/glib:2
+	dev-libs/gmp:0=
+	dev-libs/hidapi
+	dev-libs/libspnav
+	dev-libs/libxml2
+	dev-libs/libzip:=
+	dev-libs/mpfr:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5[-gles2-only]
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
+	media-gfx/opencsg:=
+	media-libs/fontconfig
+	media-libs/freetype
+	>=media-libs/glew-2.0.0:0=
+	media-libs/harfbuzz:=
+	media-libs/lib3mf
+	sci-mathematics/cgal:=
+	x11-libs/cairo
+	>=x11-libs/qscintilla-2.10.3:=
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/itstool
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-0001-Gentoo-specific-Disable-ccache-building.patch
+	"${FILESDIR}"/${P}-0002-fix-to-find-lib3mf-2.patch
+)
+
+src_configure() {
+	if has ccache ${FEATURES}; then
+		eqmake5 "PREFIX = ${ESYSROOT}/usr" "CONFIG += ccache" "${PN}.pro"
+	else
+		eqmake5 "PREFIX = ${ESYSROOT}/usr" "${PN}.pro"
+	fi
+}
+
+src_compile() {
+	default
+
+	if use emacs ; then
+		elisp-compile contrib/*.el
+	fi
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		elisp-install ${PN} contrib/*.el contrib/*.elc
+	fi
+
+	mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales"
+	ln -sf ../locale "${ED}"/usr/share/openscad/locale || die
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index 996bf04653fb..425d55c09f81 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	dev-libs/glib:2
 	dev-libs/libxml2
 	dev-libs/libzip:=
-	media-gfx/opencsg
+	media-gfx/opencsg:=
 	media-libs/fontconfig
 	media-libs/freetype
 	media-libs/glew:0=
diff --git a/media-gfx/plantuml/Manifest b/media-gfx/plantuml/Manifest
index 4183a28a6d1d..a19f9657ebcc 100644
--- a/media-gfx/plantuml/Manifest
+++ b/media-gfx/plantuml/Manifest
@@ -1,7 +1,5 @@
-DIST plantuml-1.2022.2.tar.gz 5396602 BLAKE2B 5919495af6d15805ef379ae1a4630fa739620abe48ebef65ae034d16a9811233ae98d60e5ae2cc5e1b4a9d682bef34d70fd0ae42a0d16b5a6f44821df86ae63a SHA512 f61d7dbed7d7b6771d172ae8fb2a7af0c111a986330fddf5b8fbb36e7ebed8f598ff748d6f35b1c1ffa289b24fb699c572172316001bc571628ceeb8d0595d70
-DIST plantuml-1.2022.3.tar.gz 5399905 BLAKE2B 6dc48de057850a797de779c02e039abb3070239f2e7a907a1447b0a95ef3a869424e10fe5efd3e130f0f8042b40f07209e844677299363a010b0d7ee5727a7d2 SHA512 c90cc11686bff42f56ed35de90eb29a5bcb662c4d0003132b64f9913dff3caa52aed39ca269e2f42b45945a9cbe4713f8717c89af6a6ccd163fcbdf887e275fa
 DIST plantuml-1.2022.4.tar.gz 5400187 BLAKE2B 4fba7454c0e3f757afa757b4be27bd4878a516f981209c69350adaeb21b7e051323477da496aff18b41f001fc0f2ebc2368daf14aa55957fd5ae426275494371 SHA512 b4520d304b2d4893687d18438af38bd8c2639b3dde5cd5cf3bd6c2426efa4e022081e02d396dde96253ddafd48f488676ca76e2d124b00e61435b8d3ea9f16a2
-EBUILD plantuml-1.2022.2.ebuild 750 BLAKE2B fc8574f91fddc1a1c4643bcef80049a129bd3462c5d42a2eef297c5f7dfe45eca37b0db569a8c31899e4d296348710595ecbdc4ceb3e594b2ee9442e5b86565f SHA512 ec030e822f381dbf1b0fe822826afc3849ee56aeaada5429cf87192f0059d7f68f1ffb949a404f59c52f899e4d3b3d6b8959ef4f633c97c5661a90b4bfb6c77d
-EBUILD plantuml-1.2022.3.ebuild 751 BLAKE2B 118992e67563dedca5375ec285461a8826ab41fe337d69cd75e31edbc2999f8f0c1ec5ad101c856f25aa99810c7181a3037a10f4a38113542f7a53edb1957316 SHA512 2783b88dd3367bbae9d5c4ed3a93b647592822d9cde253fd3e23fb6ee351af15d221d7918876e582231b8b2a266941ac016c1c115fffa24db9012b5c74acbfd6
-EBUILD plantuml-1.2022.4.ebuild 751 BLAKE2B 118992e67563dedca5375ec285461a8826ab41fe337d69cd75e31edbc2999f8f0c1ec5ad101c856f25aa99810c7181a3037a10f4a38113542f7a53edb1957316 SHA512 2783b88dd3367bbae9d5c4ed3a93b647592822d9cde253fd3e23fb6ee351af15d221d7918876e582231b8b2a266941ac016c1c115fffa24db9012b5c74acbfd6
+DIST plantuml-1.2022.5.tar.gz 5413637 BLAKE2B f75891b5c03660c4783946cf502da2d26919483697223bfe3c5bbc2d868729e1831b7cb364ccf7c61f1e50a42ffc9db9c07e221450df6fbb63b122c9fda0f61a SHA512 9e69cc4bf5bcc993ee93569ee9149c564592090890e6f9e88a5ca600b46cc55118ec58bc771f51db76e2a7301fda9f32b57e28056a949c5f9ad886b94460d970
+EBUILD plantuml-1.2022.4.ebuild 750 BLAKE2B fc8574f91fddc1a1c4643bcef80049a129bd3462c5d42a2eef297c5f7dfe45eca37b0db569a8c31899e4d296348710595ecbdc4ceb3e594b2ee9442e5b86565f SHA512 ec030e822f381dbf1b0fe822826afc3849ee56aeaada5429cf87192f0059d7f68f1ffb949a404f59c52f899e4d3b3d6b8959ef4f633c97c5661a90b4bfb6c77d
+EBUILD plantuml-1.2022.5.ebuild 751 BLAKE2B 118992e67563dedca5375ec285461a8826ab41fe337d69cd75e31edbc2999f8f0c1ec5ad101c856f25aa99810c7181a3037a10f4a38113542f7a53edb1957316 SHA512 2783b88dd3367bbae9d5c4ed3a93b647592822d9cde253fd3e23fb6ee351af15d221d7918876e582231b8b2a266941ac016c1c115fffa24db9012b5c74acbfd6
 MISC metadata.xml 879 BLAKE2B b711489e5c713d9b6ee8489e7ca080b9af19965e10ce3795e3dd16e3cabd0b9284bb1a75646baf2c0134cce31189a9e7dea499129750e20f4971f53aee66feaf SHA512 cfde5b9a2e44e38bc2eca2d7e32e6d4a18d0413325e41b0823091fdefcd15b035f32572397c27173887d370b2cca7673638ccf32690447dcab91ff31bc309c76
diff --git a/media-gfx/plantuml/plantuml-1.2022.2.ebuild b/media-gfx/plantuml/plantuml-1.2022.2.ebuild
deleted file mode 100644
index 8ba5d39fd289..000000000000
--- a/media-gfx/plantuml/plantuml-1.2022.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="source"
-inherit java-pkg-2 java-ant-2 desktop xdg
-
-DESCRIPTION="Draw UML diagrams using a simple and human readable text description"
-HOMEPAGE="https://plantuml.com"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	dev-java/ant-core:0
-	media-gfx/graphviz"
-
-EANT_BUILD_TARGET="dist"
-EANT_GENTOO_CLASSPATH="ant-core"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	java-pkg_dolauncher ${PN} --jar ${PN}.jar
-	use source && java-pkg_dosrc src/*
-
-	make_desktop_entry plantuml PlantUML
-}
diff --git a/media-gfx/plantuml/plantuml-1.2022.4.ebuild b/media-gfx/plantuml/plantuml-1.2022.4.ebuild
index c1ad0e0aaa4f..8ba5d39fd289 100644
--- a/media-gfx/plantuml/plantuml-1.2022.4.ebuild
+++ b/media-gfx/plantuml/plantuml-1.2022.4.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.2022.3.ebuild b/media-gfx/plantuml/plantuml-1.2022.5.ebuild
index c1ad0e0aaa4f..c1ad0e0aaa4f 100644
--- a/media-gfx/plantuml/plantuml-1.2022.3.ebuild
+++ b/media-gfx/plantuml/plantuml-1.2022.5.ebuild
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index dca2cb9869df..7acdb5ce1d4e 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -5,6 +5,6 @@ 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 4583 BLAKE2B 0c44090841e9a6b22b4c9b89c161bbfbe0e4bd080e49a6d0bcbc14a177a565a5b45984661b66b428af3070e714eaca1e7d4c15c28e86ef44b76cee487ab46736 SHA512 e9ae09577410ecb5dc6f3eb68dae1e231fa118b180a6c737b612d6827c7e9c3cdcdb48a30b59e715265d142cc00992b4adf095bcfddd7d2a91e041b24312fec2
-EBUILD povray-3.7.0.0-r2.ebuild 4538 BLAKE2B 52ff4018c1a2be0c5d73fda678dc386bfc78ea6182795dcba9264a58b1b0eae006864681834afea21319f75dbbf83c90719c01e866c14af2eb5a7a0b2366995b SHA512 6c9f4e2b65abc4ae2b6134bf52ae4e4a13ecc289c9838338688f9d5f99e59018556ffecff1b33dd1dc2bd13f8994fc077ea5b92f5543aabb83f16a6704bc78aa
+EBUILD povray-3.7.0.0-r1.ebuild 4577 BLAKE2B c5edb1f915f7c15ffb8bebde40871f211cb45afc7b94e38f1ec4cfbee40eb6089d28513f5d82e123185c73703a329b0533f0e7605cbeb15e1a1f6d85ab4f14fe SHA512 4246b7b86fa1cb2807b5899580935055380b82ef861405f70700d1be90ba802ddc295424e6a9a16109d2bc90b28864b3ee56247097fc2c22f786039842dc0fd1
+EBUILD povray-3.7.0.0-r2.ebuild 4532 BLAKE2B 3d0da25887bedd5c518fda764a63b45798f3ee542d81261d0c06a79bc557e8bcfa0d59bd44c837403a1285a0833eb3ce17544bd32015693452dc25e6c305cb60 SHA512 8ba3beef14efab23e60afd31947f98a22d7624ae9ff0742ea074041e599c16c76da3d8c2f22fb2139203a376ffdf995cc6277ae4c5e124c8efa17a588fa44988
 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 5eab9b2b5c70..ff38982430aa 100644
--- a/media-gfx/povray/povray-3.7.0.0-r1.ebuild
+++ b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,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"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug +io-restrictions openexr tiff X"
 
 DEPEND="
diff --git a/media-gfx/povray/povray-3.7.0.0-r2.ebuild b/media-gfx/povray/povray-3.7.0.0-r2.ebuild
index 89abce251e24..a06a580bf170 100644
--- a/media-gfx/povray/povray-3.7.0.0-r2.ebuild
+++ b/media-gfx/povray/povray-3.7.0.0-r2.ebuild
@@ -21,7 +21,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"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug +io-restrictions tiff X"
 
 DEPEND="
diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 351d229644b7..7e9b006d7712 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,6 +1,11 @@
 AUX prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch 1601 BLAKE2B 0c30817c51c1cf2a914b1faad9923109cbae111e8538d6c7257885ab29b5944bdb97b0927ced972133ffd8fe12d2fe36f0826bb9839e3cbedd716719b0d26881 SHA512 21377080026fa43bf23dc06c4925decd6c6e7827599caebc2ba2e7b3f4f4428fcd6fe4044f3bc3d0f059cf2ede043cafe2928622046bf9443bdd3f21f1ff6c59
+AUX prusaslicer-boost-1.79.0-fixes.patch 1981 BLAKE2B de0f36edfa3d740ce2c5e3470e4ca7402f6b563ef06af098ac1249538b75652579cbf76629c4c5e2bbf3d5a147a81e1ff709fbd78ea390649a86d7f7d30d326c SHA512 67c16680c34c34fc9cbfb174b005e0dd95a72132f2afd33dda693698a30c5616046b2e503d27658320cc63fdff3fe2ca6bb9458d461a2394a58824eca6d304b7
 DIST prusaslicer-2.4.0.tar.gz 46397442 BLAKE2B 686232fddd3e2105db1325ab085b49f6f7a028a24ab90120daf94c53255f09b19411e0ff075bfe7abff138d3c276e8b5341ff6d59e267087bcd4568ac1113c47 SHA512 e923e4e6273dbcfc3e2bc0e28f9eb8cda8530747c0a834f48aea715d75ba1d02be9cfee043689efccdaee40de00114f7964e43accad245b9acd801b997868e3c
 DIST prusaslicer-2.4.1.tar.gz 55572739 BLAKE2B 8c6030560926e53c780847e7b8a0582055b59c6b8355a2bfff19552d730cc31fc929437aa6ed93fd38d024699129bd550a1b250523387658117d1f2764cfd2b7 SHA512 895388ec39e46e30ea7bdecba42793e898ceb6c6b331dad815a726ed2f7e2e8719c71c32c6ce7fff1781fa06aac8e9afb615784d3b2001bd0d6e24ba23f0866a
+DIST prusaslicer-2.4.2.tar.gz 47752224 BLAKE2B 27b00b766890f8675246eded75c51a671832a3abf518adf7b825dbe8396cbfd2d4b48f76d646675634af49ddbe4cd48ea8e533d66a131d14bff4e76bdd357545 SHA512 d480c608eadb58b53ee220317a749c0363db580759322ed7a9aebe2ea5c1acc30dbd3bdf9ed9849c23ba5c125ee6f923de6ac01987bf85abf7aeb3f91c2ae23f
+DIST prusaslicer-2.4.2_p20220506.tar.xz 29109336 BLAKE2B c8430b355a3d161c1aa9ab421edf1f291a7898d4fd2831fe924dc2d742bdb611d58d4e9f581c00fc37f18b6c54df2d82ca063091958ccb0859254014972a9477 SHA512 bf525e12fbc5a471fc28ffa048ec8628de892bfc7e65cb708266ef5d05692cf9c0755eae879b8fad0572d6af7368e2c251361941157ab2c9be73cb38c8962f72
 EBUILD prusaslicer-2.4.0-r2.ebuild 1676 BLAKE2B 596d5acea9300e6245f4d0879175c492f13485f2a6c5108d1b35a3e9b6b65867b6c7fb417c315aaea3f0661fd3e172fbd25fa5098f6612a7bb040af17502a12f SHA512 b7dba08d44dc5a3e835ec1376faf904a8c6f4c1f7b8f9a81979719766e4353305967bf4bb895973b8a258fe032ef4a57f2f7e1b56b3d47154d42ba03daf1b0b0
 EBUILD prusaslicer-2.4.1.ebuild 1684 BLAKE2B 3c3fe39d1dbf883743e9371eeae3d1f2f4ded1d0017e49847540808766dc1f48014842d5c9dff2ae973657aefd1bf61bddf73e69a812152093b8dbb1684b621c SHA512 f370197b41f4f21e2578f43c40bdcd9475544a8636b910ddd9a7597d1a70dced32a0e94b9ad4e5f891f286cb20e35d7ed1c1055ee374b3b18f3c6764d4443421
+EBUILD prusaslicer-2.4.2.ebuild 1684 BLAKE2B 3c3fe39d1dbf883743e9371eeae3d1f2f4ded1d0017e49847540808766dc1f48014842d5c9dff2ae973657aefd1bf61bddf73e69a812152093b8dbb1684b621c SHA512 f370197b41f4f21e2578f43c40bdcd9475544a8636b910ddd9a7597d1a70dced32a0e94b9ad4e5f891f286cb20e35d7ed1c1055ee374b3b18f3c6764d4443421
+EBUILD prusaslicer-2.4.2_p20220506.ebuild 1608 BLAKE2B ca2c8c6174367d3366fafb3955214f0cc9fe3ad3fe59c4debe448d145ca44b2d3a2beb7c1cfa0d6a668349f71ef0a1440ff2be42425661585e88f4a1683bc1e5 SHA512 15180ca71f9ece0782993b9f527fb4742349f40d7fdd3aaed53585e5e0ed806a0dfa799fc8a24472656b6cb3214af0b264b3340125eccc2f2c20d587e1d4aa80
 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512
diff --git a/media-gfx/prusaslicer/files/prusaslicer-boost-1.79.0-fixes.patch b/media-gfx/prusaslicer/files/prusaslicer-boost-1.79.0-fixes.patch
new file mode 100644
index 000000000000..1026d1263552
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-boost-1.79.0-fixes.patch
@@ -0,0 +1,52 @@
+diff --git a/src/slic3r/GUI/DesktopIntegrationDialog.cpp b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
+index 81c681bc3..7f99a505c 100644
+--- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
++++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
+@@ -10,6 +10,7 @@
+ #include "libslic3r/Platform.hpp"
+ #include "libslic3r/Config.hpp"
+ 
++#include <boost/nowide/fstream.hpp>
+ #include <boost/filesystem.hpp>
+ #include <boost/log/trivial.hpp>
+ #include <boost/dll/runtime_symbol_info.hpp>
+@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegrationDialog()
+ 
+ } // namespace GUI
+ } // namespace Slic3r
+-#endif // __linux__
+\ No newline at end of file
++#endif // __linux__
+diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
+index 8533854f4..4435f836b 100644
+--- a/src/slic3r/GUI/GUI_App.cpp
++++ b/src/slic3r/GUI/GUI_App.cpp
+@@ -13,6 +13,7 @@
+ #include <cstdlib>
+ #include <regex>
+ #include <string_view>
++#include <boost/nowide/fstream.hpp>
+ #include <boost/algorithm/string/predicate.hpp>
+ #include <boost/algorithm/string.hpp>
+ #include <boost/format.hpp>
+diff --git a/src/slic3r/Utils/AppUpdater.cpp b/src/slic3r/Utils/AppUpdater.cpp
+index 60739ccb3..80f31f69f 100644
+--- a/src/slic3r/Utils/AppUpdater.cpp
++++ b/src/slic3r/Utils/AppUpdater.cpp
+@@ -5,6 +5,7 @@
+ 
+ #include <boost/filesystem.hpp>
+ #include <boost/log/trivial.hpp>
++#include <boost/nowide/fstream.hpp>
+ #include <boost/nowide/convert.hpp>
+ #include <boost/property_tree/ini_parser.hpp> 
+ #include <curl/curl.h>
+@@ -242,7 +243,7 @@ boost::filesystem::path AppUpdater::priv::download_file(const DownloadAppData& d
+ 			tmp_path += format(".%1%%2%", get_current_pid(), ".download");
+ 			try
+ 			{
+-				boost::filesystem::fstream file(tmp_path, std::ios::out | std::ios::binary | std::ios::trunc);
++				boost::nowide::fstream file(tmp_path, std::ios::out | std::ios::binary | std::ios::trunc);
+ 				file.write(body.c_str(), body.size());
+ 				file.close();
+ 				boost::filesystem::rename(tmp_path, dest_path);
diff --git a/media-gfx/prusaslicer/prusaslicer-2.4.2.ebuild b/media-gfx/prusaslicer/prusaslicer-2.4.2.ebuild
new file mode 100644
index 000000000000..c402f1a876fd
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.4.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit cmake desktop wxwidgets xdg
+
+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="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-cpp/eigen:3
+	>=dev-cpp/tbb-2021.4.0:=
+	>=dev-libs/boost-1.73.0:=[nls,threads(+)]
+	dev-libs/cereal
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/gmp:=
+	dev-libs/mpfr:=
+	dev-libs/imath:=
+	>=media-gfx/openvdb-8.2:=
+	net-misc/curl
+	media-libs/glew:0=
+	media-libs/libpng:0=
+	media-libs/qhull:=
+	sci-libs/libigl
+	sci-libs/nlopt
+	>=sci-mathematics/cgal-5.0:=
+	sys-apps/dbus
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/opengl
+	x11-libs/gtk+:3
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+"
+DEPEND="${RDEPEND}
+	media-libs/qhull[static-libs]
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.0-fix-build-with-cereal-1.3.1.patch
+)
+
+S="${WORKDIR}/${MY_PN}-version_${PV}"
+
+src_prepare() {
+	sed -i -e 's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g' version.inc || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	CMAKE_BUILD_TYPE="Release"
+
+	setup-wxwidgets
+
+	local mycmakeargs=(
+		-DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB"
+
+		-DSLIC3R_BUILD_TESTS=$(usex test)
+		-DSLIC3R_FHS=ON
+		-DSLIC3R_GTK=3
+		-DSLIC3R_GUI=ON
+		-DSLIC3R_PCH=OFF
+		-DSLIC3R_STATIC=OFF
+		-DSLIC3R_WX_STABLE=ON
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
diff --git a/media-gfx/prusaslicer/prusaslicer-2.4.2_p20220506.ebuild b/media-gfx/prusaslicer/prusaslicer-2.4.2_p20220506.ebuild
new file mode 100644
index 000000000000..26052c4ee910
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.4.2_p20220506.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit cmake desktop wxwidgets xdg
+
+DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
+HOMEPAGE="https://www.prusa3d.com/prusaslicer/"
+SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz"
+
+LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-cpp/eigen:3
+	>=dev-cpp/tbb-2021.4.0:=
+	>=dev-libs/boost-1.73.0:=[nls,threads(+)]
+	dev-libs/cereal
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/gmp:=
+	dev-libs/mpfr:=
+	dev-libs/imath:=
+	>=media-gfx/openvdb-8.2:=
+	net-misc/curl
+	media-libs/glew:0=
+	media-libs/libpng:0=
+	media-libs/qhull:=
+	sci-libs/libigl
+	sci-libs/nlopt
+	>=sci-mathematics/cgal-5.0:=
+	sys-apps/dbus
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/opengl
+	x11-libs/gtk+:3
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+"
+DEPEND="${RDEPEND}
+	media-libs/qhull[static-libs]
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-boost-1.79.0-fixes.patch
+)
+
+S="${WORKDIR}"
+
+src_prepare() {
+	sed -i -e 's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g' version.inc || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	CMAKE_BUILD_TYPE="Release"
+
+	setup-wxwidgets
+
+	local mycmakeargs=(
+		-DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB"
+
+		-DSLIC3R_BUILD_TESTS=$(usex test)
+		-DSLIC3R_FHS=ON
+		-DSLIC3R_GTK=3
+		-DSLIC3R_GUI=ON
+		-DSLIC3R_PCH=OFF
+		-DSLIC3R_STATIC=OFF
+		-DSLIC3R_WX_STABLE=ON
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index ed3baf01fc0f..beedcbee427d 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -1,3 +1,3 @@
 DIST qrencode-4.1.1.tar.bz2 461562 BLAKE2B ae3abb4a162518c0204d09c9df7434fb348e24c20e790a261841220b0a7165168137d5acbdbc53e40558724eac2e1e21786f11013f384b545d56a1c9caaff61d SHA512 981b3242c213e1b40ac88711912dd8c27ea11f3437d1a04b6b226499a6e991a8f0b3b10f818bcc104812192a1dac4ce05f16ecd847a50cb03d4859b84bad89b8
-EBUILD qrencode-4.1.1.ebuild 843 BLAKE2B 5d4f0d1aaeb63da22f5f011be430b30e823290abaac9b2786d19c8af0599b1bb203bf41c30d6045591fbd9b2e6b6d9de613f4a026ac49701273016202976b6dc SHA512 32cbdcf4aa452d766faf2862fc97a78e7adc185376f34face82944a3eead4fde30cc767a040453dbacb4e29cf9c496b5dbe62a5de2d8c8e54eae18aa69563dbd
+EBUILD qrencode-4.1.1.ebuild 850 BLAKE2B 4ad013b1166c728f27e683c40a5fd2f266378c58bf8fbe3f2523548215f84e9fa6897ed61306bc56077153191a7fcfc31797149158a5c95708228d513854850b SHA512 f3ea2027a0df88edf0b55cbfe1fe4ac0375d7fa6db8ed1af5ebbf15812a0f3492413e8e45ca6c124ed54a3c4b8c43a8db7c168531d51f31457e40f9bf505a441
 MISC metadata.xml 459 BLAKE2B 6098078226f047222b6eaeed16e7e66ab8cee01d25b042b325746532c4903fe5ebe7b2e8456d40e74ad232138ae5b95f0d51957895f794cf9b78739f84d9811c SHA512 b94b87b44d4af45350129dd2879f6463b1fc9e3803615c7bef28529f63cb3dad419dce43fd285fab357163f2b0193a4a453ba6f888d2a3b33c835a16ed841497
diff --git a/media-gfx/qrencode/qrencode-4.1.1.ebuild b/media-gfx/qrencode/qrencode-4.1.1.ebuild
index 147bb0f0b5d4..7979ace5564d 100644
--- a/media-gfx/qrencode/qrencode-4.1.1.ebuild
+++ b/media-gfx/qrencode/qrencode-4.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0/4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE="png test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index cbb6e89ade5f..13943042b664 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 1880 BLAKE2B c6e391f30041771921a141125ae75607e673dc0980eb9fe931ad843384334a698fb4b0fd58c0330f367a80b0687f72532a99d0a7c77ddf8e9eaea5361ee98505 SHA512 01e0b8fb824157d89367512004a42bb3b701876da11ac53a8f7118fd6b1a9f03c009d4ce99ab79f1afd0d3bb35bce75a14aee460a18557947190cd59025238bc
+EBUILD rawtherapee-5.8-r1.ebuild 1874 BLAKE2B 4ad57ddd0c09f7f90c253264d54c8a3b5aba8eeced6e2395e9ddb0133c4a00a1e88505c2faed6e2ca20da359fee44d5052facfb90d6b1c7086e75c02e493fd1a SHA512 ed64180ffda45d0feb6b2eb51ce8832b69789b210a9d2499f54c542e3a70ede7dce7052db02b0dff42f9cae0fb82c0768ec273b559c04cb3c1aaba40f3031e8d
 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 211e0087f8e0..ea59ec8cbd19 100644
--- a/media-gfx/rawtherapee/rawtherapee-5.8-r1.ebuild
+++ b/media-gfx/rawtherapee/rawtherapee-5.8-r1.ebuild
@@ -42,8 +42,8 @@ BDEPEND="virtual/pkgconfig"
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-    "${FILESDIR}/RT_5.8_fix_crop.patch"
-    "${FILESDIR}/RT_5.8_glibc234.patch"
+	"${FILESDIR}/RT_5.8_fix_crop.patch"
+	"${FILESDIR}/RT_5.8_glibc234.patch"
 )
 
 pkg_pretend() {
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index c9d77bdc6f0f..e6b548e7d17d 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -2,21 +2,12 @@ AUX 66-saned.rules 176 BLAKE2B c9c6ba224b9b27f4ecc6b1ded6621a8abb52b1ded2d9078e4
 AUX sane-backends-1.0.24-saned_pidfile_location.patch 345 BLAKE2B dcf7cbd5787c7a225450e03663e7c1ca69dd40fc58e3de9d994fde6a66635d6a3ca20d2886fe7cbc6a7ed3202f8f3a8c7e3d9ea4072b4418a7a43048427a06c3 SHA512 49519b8fea68292b8cbd7bdcaf5b4803a1b890800e17015ace1d662e4503cc0844f191793c8f42cd6aa7e9922ee9f961d4784e30f22abc497973be1978bf1b24
 AUX sane-backends-1.0.27-disable-usb-tests.patch 336 BLAKE2B 00fd225a4426405d515f5b6641c86e6d9035a588a776aaec26eaa4e10beebf0a9fd97da991646b7964a867c422da2bc1cf93560d1ba326f0086675036338ff00 SHA512 64cce489e87de31e1a865b86d5829ae4914a30f47e27b07fba68629261cefcd617b8eed272c94b7554545e4802283c5bd5b53f79f54403d875726b38378ae74d
 AUX sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch 459 BLAKE2B d127c054b3e4f8aca5de54888e7a37c986515350aac84bb66ca195fca57138cbe3ac3f29b0982e4019b5b599b81984dceacd5523f794a04cfb5d416a051a1e61 SHA512 d9bcce33482db2f15ee094a244359fafdce196984a799509d9b16e24f46feb3aecd419520e65ca9513b40ff4975d793bec05924bfdd69586d9a6f3feb42cccc3
-AUX sane-backends-1.0.31-autoconf-2.70.patch 2629 BLAKE2B 30579b5075b850fc5b3f421880f8545def8dac69e274fb7bb756c3dcf0f0b93b91c4aa231bc74ee923721a832c7b5d187e3b074a926224cad99291139bff2a6f SHA512 7c4395d715ef699788f3cede0b89540dc53c1aa8e771efebf59b1e7a978f96506d2f3b4df72990967fd254dfc076c092674ef6d2019ca8426593474c8e033d26
-AUX sane-backends-1.0.31-backend_pot_input.patch 1155 BLAKE2B 0882b8291db5eab404abad4ec2c6332f77405ffc39ba3639bd279d8cc5857888ff13d87bb1d37d4ce1cd6272d3f0f1cc0ffddd6ba4d2780b47717ee0a5905ae4 SHA512 4447a39892aef52dad3ede292973a444675b2eb0f6086fb1ab45106a32aa4474e3970582b831efaf7474abbf78d5ce694f1e751c229101140ffda8800bfd5210
-AUX sane-backends-1.0.31-udev_rules_update.patch 2537 BLAKE2B 37ae4b905f331e9b024e712010a6e2dde19d3d0a700267fac4e5b11648f851253759ca4d58b200501816c7352d12427b8584b75e405ae7a7509b1771e3417e3f SHA512 55536f477ed67a73c0d5414b5018f1ebe47301ec4fa8613a50a1105d96eadb3fb2809f784a340f29ca37894b8f0b9bc10e8f2eedda3fa15fa4111af5dc57c095
 AUX sane-backends-1.1.1-genesys-gl845-crash.patch 553 BLAKE2B 8fafda9bf9904733c02db56975c0e6d7c594140f2c568f7d46524e726b69ebd33b4487fb9b5b7d701a4ddacf079ac75b1315139c4e377caf414211ac02652764 SHA512 a07a82d25e009b30056965974d6d3088772803632aa57030a4261ebf596f7cdf0a468212dd234a5dda7821ee75ff665dbcf66df43b1d3c9c10a649ad5e36483c
 AUX saned 150 BLAKE2B 306d57a0c09856b387c3c50eb27aaafdb194972c2fdb5d1cb7de3118f0c71cf234898ce958f0d6bd17a5e1f2b5bde458e014a7bfdec52403a6204ebf51aee039 SHA512 26f3d66c6b1e75d87d7d430518aa878c77d5ab8d76a45847cef3ff15566341938eedf46c50d0fa8cdeef828df9cddefdd6fdd767c5de30d3aa7d64ed1911d910
 AUX saned.confd 76 BLAKE2B cac74b6f117f7f78a71b951433bc6b155f8641e2cf1bd747871165764e97ed368d10551075761c34ff01f51f7cae1b8a9c5692fb9666a300b45134fe255ea3c1 SHA512 8f4a99ef24c19b3a7213b3d25ea16f5bca8623735cf25d21e3a706e9e0135ac8cce5d0b8fb8728845977f41dcefe6bd858076d755515fc91b00e05ee5817d751
 AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b5a546d61133522cdc98c7011669feaadc2d030ffeb49a86130075f22a18edab5f4c925780681 SHA512 655200141339f14bf7fc6f4fff3403cf9504809b7f023aa5425aad691c5baa65772100da0a6311669f83ed1dce73b7d65ca20aa31345b13c48dfdb1b30ce5dbd
 AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9 SHA512 a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093
 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965
-DIST backends-1.0.31.tar.gz 5731445 BLAKE2B d70691acbd3f5788a26bab6b35eeb243801b435272b57e3fa568127562ff57797452e396e6e5f058c33d3bce0f99b672542fb89bc8eb4d36cbe82ccc20b8f298 SHA512 d8ef05cc3aa9c4fa42c9241e1e61fc93e7959df3746a3a2cfaa6e4fb26dfd0911b4d3227b2da28852f8630fa17ad3432a1230a6f4425340e79a3b82ec5eaa9eb
-DIST sane-backends-1.0.32.tar.gz 7349442 BLAKE2B 8841542ffd520b38bbeb532eaae7cce803f0bd868cae7edc28d2138729dcffb5a2a0908b56c16c25ffbba539525331c12c259e1768e105de1bdd1419d29efe83 SHA512 416757d9a69bbc18678d1f16a024ba5a949c571204a68f36009d416be28723886ccea71daaa7da90d20eac9696cd44e567802d6c21c3fc5914b97213bbedb6d5
 DIST sane-backends-1.1.1.tar.gz 7447569 BLAKE2B 02ac1822beabb12f19ce2d7c053f0f727313d13e0f9380325492a2f0048094f78a118f7659b4c6e39b60c4ea319d862a242f8866a67c84e5649d9ae2691d9473 SHA512 25bd9f90d550cfe6a6d01c48e83716a53f4b0e3a294287e455ecb5e5b80c8fe1699f45c6c87f694475cceb85745c70597e18a7b1094669d5091c5fb183dfe94d
-EBUILD sane-backends-1.0.31-r2.ebuild 8554 BLAKE2B 20ef534583a3052e699693472bca958e49426353f6f1cf8e721690657c657e1411fcbf7c49ed28a84367afbd5e1f40a70bf3551a06d3d0e169b3dbdf6d89075e SHA512 690006aef47beaaad149199cef5ee694a6fa74913e30dc61d14aedd1558ef8e14f238e88d71c316a4c38f29f4e6a069f9ccd8508f5ec536864d192eb504105cf
-EBUILD sane-backends-1.0.32.ebuild 8433 BLAKE2B 171bfb4784cd459892eb1af18a388afa2179e7a6f25d593b4ea3472ee10e5053166388abc7852fa8dfabff77d89b148d603fe6b478fccae6fcc14c48c8e311af SHA512 791a43bb5c125eec8689d16de978f62ed935771a5a8e0dc8f23b7c30c6dd127197dc4d83472a7308d7287309b40206eadc7c756d0051983fc853d3bc80f14043
-EBUILD sane-backends-1.1.1-r1.ebuild 9238 BLAKE2B a5aa2ead9603d4a40398b72640e5eb03e8c58fbbf88e87b0b3104bae86255a752f06fc23ea2d6e4eb6b39265e2b9c89cd316fab8b00389193649af373b0372b4 SHA512 a957f5790f1f00019a285b45d187fcad2fa45bf71dac5e9086dc4cf612567bb45d4c1bc38b4c2cce834e8e7e98ab71694a3be5d8519bf1ecc1c684c133d5b633
 EBUILD sane-backends-1.1.1-r2.ebuild 9349 BLAKE2B 2e89b8f941354bd632ed5965cd6402b53a2db212e4050e1c618aa5e952c35fda2a9eb6769b26cc85b62dbcc6209ae7da8abf600a49afe2b3839020ad85cb504a SHA512 79605c0a0cb97d4c49c6f864de91a7824eea945ae2cd36346e81e3e61116816ae687525bcfae6a75c67857effa7e866aef3f7edc3fc0eb21f52226c16b4a9400
-EBUILD sane-backends-1.1.1.ebuild 8440 BLAKE2B b14c51c8dd771e70117410a05a8eacd130d0a4d0970024352f22ca95710225882ab9742027124cd48ee64518f16f7d1bc0cd8a2380100708ec9f9f5d7042ed48 SHA512 6a8175155ce2b837d31d81efb9d5b0ba994966bffa6e99e9eb527abe5decde19ed518e52e2c3a533a93cc03f912391477a02aafb23148a0effc5ea79165c354e
 MISC metadata.xml 267 BLAKE2B cf3ca2583acfc7c5d4b3e053cef4d72bf240aa58c54e8a0f72b9393ee8587bd587d4a88bad4b041cfd50d4465879ed546afa71b6e4570477b376a92ab47bb415 SHA512 d471748b0a9f7d7d4aca203c6bd1ff222f3faa455e7d1df2f8437a188922a40e3a656a5e20032256caf58d664e0f723e25055871e62d102e0c677264942b6fb1
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.31-autoconf-2.70.patch b/media-gfx/sane-backends/files/sane-backends-1.0.31-autoconf-2.70.patch
deleted file mode 100644
index f1fe4765bdd5..000000000000
--- a/media-gfx/sane-backends/files/sane-backends-1.0.31-autoconf-2.70.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 445b5bd7e19245c08de6a0e669dd9211d2597bfa Mon Sep 17 00:00:00 2001
-From: Olaf Meeuwissen <paddy-hack@member.fsf.org>
-Date: Fri, 1 Jan 2021 15:53:11 +0900
-Subject: [PATCH] Drop use of obsoleted autoconf AC_HEADER_STDC macro.  Fixes
- #409
-
-Use of the STDC_HEADER pre-processor macro that the autoconf macro
-used to define has been removed.  Conditionalized code is now used
-unconditionally.  This should be fine as the macro checks for ANSI
-C, i.e. C89 (ISO C90), compliant headers.  We already require C99.
----
- acinclude.m4        |  3 ---
- lib/md5.c           | 10 ++--------
- sanei/sanei_pa4s2.c |  8 +++-----
- sanei/sanei_pp.c    |  8 +++-----
- 4 files changed, 8 insertions(+), 21 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index e10f8ceb2..9393278c2 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -73,9 +73,6 @@ AC_DEFUN([SANE_CHECK_MISSING_HEADERS],
-   if test "${ac_cv_header_unistd_h}" != "yes" ; then
-     MISSING_HEADERS="${MISSING_HEADERS}\"unistd.h\" "
-   fi
--  if test "${ac_cv_header_stdc}" != "yes" ; then
--    MISSING_HEADERS="${MISSING_HEADERS}\"ANSI C headers\" "
--  fi
-   if test "${MISSING_HEADERS}" != "" ; then
-     echo "*** The following essential header files couldn't be found:"
-     echo "*** ${MISSING_HEADERS}"
-diff --git a/lib/md5.c b/lib/md5.c
-index 923a17c78..009c6d9a0 100644
---- a/lib/md5.c
-+++ b/lib/md5.c
-@@ -26,14 +26,8 @@
- 
- #include <sys/types.h>
- 
--#if STDC_HEADERS || defined _LIBC
--# include <stdlib.h>
--# include <string.h>
--#else
--# ifndef HAVE_MEMCPY
--#  define memcpy(d, s, n) bcopy ((s), (d), (n))
--# endif
--#endif
-+#include <stdlib.h>
-+#include <string.h>
- 
- #include "md5.h"
- 
-diff --git a/sanei/sanei_pa4s2.c b/sanei/sanei_pa4s2.c
-index b1d95fe02..5365151fd 100644
---- a/sanei/sanei_pa4s2.c
-+++ b/sanei/sanei_pa4s2.c
-@@ -150,11 +150,9 @@ static int sanei_pa4s2_dbg_init_called = SANE_FALSE;
- 
- #endif /* NDEBUG */
- 
--#if defined(STDC_HEADERS)
--# include <errno.h>
--# include <stdio.h>
--# include <stdlib.h>
--#endif
-+#include <errno.h>
-+#include <stdio.h>
-+#include <stdlib.h>
- #if defined(HAVE_STRING_H)
- # include <string.h>
- #elif defined(HAVE_STRINGS_H)
-diff --git a/sanei/sanei_pp.c b/sanei/sanei_pp.c
-index 3077342e4..752945a89 100644
---- a/sanei/sanei_pp.c
-+++ b/sanei/sanei_pp.c
-@@ -135,11 +135,9 @@ inb( u_long port )
- #include "../include/sane/sanei_debug.h"
- #include "../include/sane/sanei_pp.h"
- 
--#if defined(STDC_HEADERS)
--# include <errno.h>
--# include <stdio.h>
--# include <stdlib.h>
--#endif
-+#include <errno.h>
-+#include <stdio.h>
-+#include <stdlib.h>
- #if defined(HAVE_STRING_H)
- # include <string.h>
- #elif defined(HAVE_STRINGS_H)
--- 
-GitLab
-
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.31-backend_pot_input.patch b/media-gfx/sane-backends/files/sane-backends-1.0.31-backend_pot_input.patch
deleted file mode 100644
index 69585784c252..000000000000
--- a/media-gfx/sane-backends/files/sane-backends-1.0.31-backend_pot_input.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4846d36ad1e9ca709cb3a2eaa839c8c79effe34b Mon Sep 17 00:00:00 2001
-From: Olaf Meeuwissen <paddy-hack@member.fsf.org>
-Date: Sun, 13 Sep 2020 17:56:40 +0900
-Subject: [PATCH] po: Make sure all sane-backends.pot input are available
-
----
- po/Makevars | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/po/Makevars b/po/Makevars
-index ebff23f90..86f423ef3 100644
---- a/po/Makevars
-+++ b/po/Makevars
-@@ -1,5 +1,6 @@
- #  Makevars -- snippet for inclusion in po/ -*- Makefile -*-
--#  Copyright (C) 2016, 2019  Olaf Meeuwissen and the SANE developers
-+#  Copyright (C) 2016, 2019, 2020  Olaf Meeuwissen
-+#    and the SANE developers
- #
- #  This file is part of the SANE build infra-structure.  See the
- #  included LICENSE file for license information.
-@@ -47,3 +48,8 @@ width_options     = --width=75
- #  Locale categories, in addition to LC_MESSAGES, for which message
- #  catalogs are to be used.
- EXTRA_LOCALE_CATEGORIES =
-+
-+#  Selected files in POTFILES.in are generated.  Make sure they are
-+#  available when needed.
-+$(top_srcdir)/backend/pixma/pixma_sane_options.c:
-+	cd ../backend; make pixma/pixma_sane_options.c
--- 
-GitLab
-
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.31-udev_rules_update.patch b/media-gfx/sane-backends/files/sane-backends-1.0.31-udev_rules_update.patch
deleted file mode 100644
index 17ccb60755e0..000000000000
--- a/media-gfx/sane-backends/files/sane-backends-1.0.31-udev_rules_update.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-https://gitlab.com/sane-project/backends/-/merge_requests/541
-
---- sane-backends-1.0.31/testsuite/tools/data/udev+acl.ref
-+++ sane-backends-1.0.31/testsuite/tools/data/udev+acl.ref
-@@ -23,7 +23,7 @@
- # If the scanner is supported by sane-backends, please mail the entry to
- # the sane-devel mailing list (sane-devel@alioth-lists.debian.net).
- #
--ACTION!="add", GOTO="libsane_rules_end"
-+ACTION=="remove", GOTO="libsane_rules_end"
- ENV{DEVTYPE}=="usb_device", GOTO="libsane_create_usb_dev"
- SUBSYSTEMS=="scsi", GOTO="libsane_scsi_rules_begin"
- SUBSYSTEM=="usb_device", GOTO="libsane_usb_rules_begin"
---- sane-backends-1.0.31/testsuite/tools/data/udev+hwdb.ref
-+++ sane-backends-1.0.31/testsuite/tools/data/udev+hwdb.ref
-@@ -20,7 +20,7 @@
- # If the scanner is supported by sane-backends, please mail the entry to
- # the sane-devel mailing list (sane-devel@alioth-lists.debian.net).
- #
--ACTION!="add", GOTO="libsane_rules_end"
-+ACTION=="remove", GOTO="libsane_rules_end"
- 
- # The following rule will disable USB autosuspend for the device
- ENV{DEVTYPE}=="usb_device", ENV{libsane_matched}=="yes", TEST=="power/control", ATTR{power/control}="on"
---- sane-backends-1.0.31/testsuite/tools/data/udev.ref
-+++ sane-backends-1.0.31/testsuite/tools/data/udev.ref
-@@ -23,7 +23,7 @@
- # If the scanner is supported by sane-backends, please mail the entry to
- # the sane-devel mailing list (sane-devel@alioth-lists.debian.net).
- #
--ACTION!="add", GOTO="libsane_rules_end"
-+ACTION=="remove", GOTO="libsane_rules_end"
- ENV{DEVTYPE}=="usb_device", GOTO="libsane_create_usb_dev"
- SUBSYSTEMS=="scsi", GOTO="libsane_scsi_rules_begin"
- SUBSYSTEM=="usb_device", GOTO="libsane_usb_rules_begin"
---- sane-backends-1.0.31/tools/sane-desc.c
-+++ sane-backends-1.0.31/tools/sane-desc.c
-@@ -3496,7 +3496,7 @@
-   int i;
- 
-   print_udev_header ();
--  printf("ACTION!=\"add\", GOTO=\"libsane_rules_end\"\n"
-+  printf("ACTION==\"remove\", GOTO=\"libsane_rules_end\"\n"
- 	 "ENV{DEVTYPE}==\"usb_device\", GOTO=\"libsane_create_usb_dev\"\n"
- 	 "SUBSYSTEMS==\"scsi\", GOTO=\"libsane_scsi_rules_begin\"\n"
- 	 "SUBSYSTEM==\"usb_device\", GOTO=\"libsane_usb_rules_begin\"\n"
-@@ -3679,7 +3679,7 @@
-   int i;
- 
-   print_udevhwdb_header ();
--  printf("ACTION!=\"add\", GOTO=\"libsane_rules_end\"\n\n");
-+  printf("ACTION==\"remove\", GOTO=\"libsane_rules_end\"\n\n");
- 
-   printf("# The following rule will disable USB autosuspend for the device\n");
-   printf("ENV{DEVTYPE}==\"usb_device\", ENV{libsane_matched}==\"yes\", TEST==\"power/control\", ATTR{power/control}=\"on\"\n\n");
diff --git a/media-gfx/sane-backends/sane-backends-1.0.31-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.31-r2.ebuild
deleted file mode 100644
index fd7cd87c6000..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.31-r2.ebuild
+++ /dev/null
@@ -1,360 +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-any-r1 required for a script in
-# backends/pixma/scripts/
-inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 systemd toolchain-funcs udev
-
-# gphoto and v4l are handled by their usual USE flags.
-# The pint backend was disabled because I could not get it to compile.
-IUSE_SANE_BACKENDS=(
-	abaton
-	agfafocus
-	apple
-	artec
-	artec_eplus48u
-	as6e
-	avision
-	bh
-	canon
-	canon630u
-	canon_dr
-	canon_lide70
-	canon_pp
-	cardscan
-	coolscan
-	coolscan2
-	coolscan3
-	dc210
-	dc240
-	dc25
-	dell1600n_net
-	dmc
-	epjitsu
-	epson
-	epson2
-	escl
-	fujitsu
-	genesys
-	gt68xx
-	hp
-	hp3500
-	hp3900
-	hp4200
-	hp5400
-	hp5590
-	hpljm1005
-	hpsj5s
-	hs2p
-	ibm
-	kodak
-	kodakaio
-	kvs1025
-	kvs20xx
-	kvs40xx
-	leo
-	lexmark
-	ma1509
-	magicolor
-	matsushita
-	microtek
-	microtek2
-	mustek
-	mustek_pp
-	mustek_usb
-	mustek_usb2
-	nec
-	net
-	niash
-	p5
-	pie
-	pieusb
-	pixma
-	plustek
-	plustek_pp
-	pnm
-	qcam
-	ricoh
-	ricoh2
-	rts8891
-	s9036
-	sceptre
-	sharp
-	sm3600
-	sm3840
-	snapscan
-	sp15c
-	st400
-	stv680
-	tamarack
-	teco1
-	teco2
-	teco3
-	test
-	u12
-	umax
-	umax1220u
-	umax_pp
-	xerox_mfp
-)
-
-IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
-
-for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do
-	case ${GBACKEND} in
-	# Disable backends that require parallel ports as no one has those anymore.
-	canon_pp|hpsj5s|mustek_pp|\
-	pnm|mustek_usb2|kvs40xx)
-		IUSE+=" sane_backends_${GBACKEND}"
-		;;
-	*)
-		IUSE+=" +sane_backends_${GBACKEND}"
-	esac
-done
-
-REQUIRED_USE="
-	sane_backends_escl? ( zeroconf )
-	sane_backends_kvs40xx? ( threads )
-	sane_backends_mustek_usb2? ( threads )
-"
-
-MY_PN="${PN//sane-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.sane-project.org/"
-SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-# For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
-RDEPEND="
-	acct-group/scanner
-	acct-user/saned
-	gphoto2? (
-		>=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
-		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
-	)
-	sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	sane_backends_dell1600n_net? (
-		>=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
-		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
-	)
-	sane_backends_escl? (
-		app-text/poppler[cairo]
-		|| (
-			net-dns/avahi[dbus]
-			net-dns/avahi[gtk]
-		)
-		net-dns/avahi[${MULTILIB_USEDEP}]
-		net-misc/curl[${MULTILIB_USEDEP}]
-	)
-	sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	sane_backends_pixma? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	snmp? ( net-analyzer/net-snmp:0= )
-	systemd? ( sys-apps/systemd:0= )
-	usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] )
-	v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	xinetd? ( sys-apps/xinetd )
-	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	dev-libs/libxml2
-	v4l? ( sys-kernel/linux-headers )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	sys-devel/autoconf-archive
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
-	"${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch
-	"${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch
-	"${FILESDIR}"/${P}-autoconf-2.70.patch #750374
-	"${FILESDIR}"/${P}-udev_rules_update.patch
-	"${FILESDIR}"/${P}-backend_pot_input.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/sane-config
-)
-
-src_prepare() {
-	default
-
-	# Patch out the git reference so we can run eautoreconf
-	sed \
-		-e "s/m4_esyscmd_s(\[git describe --dirty\])/${PV}/" \
-		-e '/^AM_MAINTAINER_MODE/d' \
-		-i configure.ac || die
-	eautoreconf
-
-	# Fix for "make check".  Upstream sometimes forgets to update this.
-	local ver=$(./configure --version | awk '{print $NF; exit 0}')
-	sed -i \
-		-e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \
-		testsuite/tools/data/html* || die
-
-	# don't bleed user LDFLAGS into pkgconfig files
-	sed 's|@LDFLAGS@ ||' -i tools/*.pc.in || die
-}
-
-src_configure() {
-	# From Fedora
-	append-flags -fno-strict-aliasing
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# the blank is intended - an empty string would result in building ALL backends.
-	local lbackends=" "
-
-	use gphoto2 && lbackends="gphoto2"
-	use v4l && lbackends+=" v4l"
-	use sane_backends_escl && multilib_is_native_abi && lbackends+=" escl"
-	local backend
-	for backend in ${IUSE_SANE_BACKENDS[@]} ; do
-		if use "sane_backends_${backend}" && [[ "${backend}" != pnm ]] && [[ "${backend}" != escl ]] ; then
-			lbackends+=" ${backend}"
-		fi
-	done
-
-	local myconf=(
-		$(use_with usb)
-		$(multilib_native_use_with snmp)
-
-		$(multilib_native_use_with sane_backends_escl poppler-glib)
-		# you can only enable this backend, not disable it...
-		$(usex sane_backends_pnm --enable-pnm-backend '')
-		$(usex sane_backends_mustek_pp --enable-parport-directio '')
-	)
-
-	if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ; } ; then
-		myconf+=( sane_cv_use_libieee1284=no )
-	fi
-
-	# relative path must be used for tests to work properly
-	# All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory
-	# that break in many ways, bug #636202, #668232, #668350
-	# People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html
-	myconf+=(
-		--disable-locking
-		$(use_with gphoto2)
-		$(multilib_native_use_with systemd)
-		$(use_with v4l)
-		$(use_enable ipv6)
-		$(use_enable threads pthread)
-		$(use_with zeroconf avahi)
-	)
-	ECONF_SOURCE="${S}" \
-	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
-	BACKENDS="${lbackends}" \
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake VARTEXFONTS="${T}/fonts"
-
-	if tc-is-cross-compiler ; then
-		pushd "${BUILD_DIR}"/tools >/dev/null || die
-
-		# The build system sucks and doesn't handle this properly.
-		# https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \
-			-I. -I../include -I"${S}"/include \
-			"${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \
-			"${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die
-		local dirs=( hal hotplug hotplug-ng udev )
-		local targets=(
-			hal/libsane.fdi
-			hotplug/libsane.usermap
-			hotplug-ng/libsane.db
-			udev/libsane.rules
-		)
-		mkdir -p "${dirs[@]}" || die
-		emake "${targets[@]}"
-
-		popd >/dev/null || die
-	fi
-
-	if use usb ; then
-		sed -i -e '/^$/d' \
-			tools/hotplug/libsane.usermap || die
-	fi
-}
-
-multilib_src_install() {
-	emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
-		docdir="${EPREFIX}"/usr/share/doc/${PF}
-
-	if multilib_is_native_abi ; then
-		if use usb ; then
-			insinto /etc/hotplug/usb
-			doins tools/hotplug/libsane.usermap
-		fi
-
-		udev_newrules tools/udev/libsane.rules 41-libsane.rules
-		insinto "/usr/share/pkgconfig"
-		doins tools/sane-backends.pc
-	fi
-}
-
-multilib_src_install_all() {
-	keepdir /var/lib/lock/sane
-	fowners root:scanner /var/lib/lock/sane
-	fperms g+w /var/lib/lock/sane
-	dodir /etc/env.d
-
-	if use systemd ; then
-		systemd_newunit "${FILESDIR}"/saned_at.service "saned@.service"
-		systemd_newunit "${FILESDIR}"/saned.socket saned.socket
-	fi
-
-	if use usb ; then
-		exeinto /etc/hotplug/usb
-		doexe tools/hotplug/libusbscanner
-		newdoc tools/hotplug/README README.hotplug
-	fi
-
-	dodoc NEWS AUTHORS PROBLEMS README README.linux
-	find "${ED}" -name '*.la' -delete || die
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		doins "${FILESDIR}"/saned
-	fi
-
-	newinitd "${FILESDIR}"/saned.initd saned
-	newconfd "${FILESDIR}"/saned.confd saned
-}
-
-pkg_postinst() {
-	optfeature "Epson-specific backend" media-gfx/iscan
-	optfeature "HP-specific backend" net-print/hplip
-
-	if use xinetd ; then
-		elog "If you want remote clients to connect, edit"
-		elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
-	fi
-
-	if ! use systemd ; then
-		elog "If you are using a USB scanner, add all users who want"
-		elog "to access your scanner to the \"scanner\" group."
-	fi
-}
diff --git a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
deleted file mode 100644
index a1fde1572b8b..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-# python-any-r1 required for a script in
-# backends/pixma/scripts/
-inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 systemd toolchain-funcs udev
-
-# gphoto and v4l are handled by their usual USE flags.
-# The pint backend was disabled because I could not get it to compile.
-IUSE_SANE_BACKENDS=(
-	abaton
-	agfafocus
-	apple
-	artec
-	artec_eplus48u
-	as6e
-	avision
-	bh
-	canon
-	canon630u
-	canon_dr
-	canon_lide70
-	canon_pp
-	cardscan
-	coolscan
-	coolscan2
-	coolscan3
-	dc210
-	dc240
-	dc25
-	dell1600n_net
-	dmc
-	epjitsu
-	epson
-	epson2
-	escl
-	fujitsu
-	genesys
-	gt68xx
-	hp
-	hp3500
-	hp3900
-	hp4200
-	hp5400
-	hp5590
-	hpljm1005
-	hpsj5s
-	hs2p
-	ibm
-	kodak
-	kodakaio
-	kvs1025
-	kvs20xx
-	kvs40xx
-	leo
-	lexmark
-	ma1509
-	magicolor
-	matsushita
-	microtek
-	microtek2
-	mustek
-	mustek_pp
-	mustek_usb
-	mustek_usb2
-	nec
-	net
-	niash
-	p5
-	pie
-	pieusb
-	pixma
-	plustek
-	plustek_pp
-	pnm
-	qcam
-	ricoh
-	ricoh2
-	rts8891
-	s9036
-	sceptre
-	sharp
-	sm3600
-	sm3840
-	snapscan
-	sp15c
-	st400
-	stv680
-	tamarack
-	teco1
-	teco2
-	teco3
-	test
-	u12
-	umax
-	umax1220u
-	umax_pp
-	xerox_mfp
-)
-
-IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
-
-for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do
-	case ${GBACKEND} in
-	# Disable backends that require parallel ports as no one has those anymore.
-	canon_pp|hpsj5s|mustek_pp|\
-	pnm|mustek_usb2|kvs40xx)
-		IUSE+=" sane_backends_${GBACKEND}"
-		;;
-	*)
-		IUSE+=" +sane_backends_${GBACKEND}"
-	esac
-done
-
-REQUIRED_USE="
-	sane_backends_escl? ( zeroconf )
-	sane_backends_kvs40xx? ( threads )
-	sane_backends_mustek_usb2? ( threads )
-"
-
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.sane-project.org/"
-SRC_URI="https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f/${P}.tar.gz"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-# For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
-RDEPEND="
-	acct-group/scanner
-	acct-user/saned
-	gphoto2? (
-		>=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
-		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
-	)
-	sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	sane_backends_dell1600n_net? (
-		>=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
-		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
-	)
-	sane_backends_escl? (
-		app-text/poppler[cairo]
-		|| (
-			net-dns/avahi[dbus]
-			net-dns/avahi[gtk]
-		)
-		net-dns/avahi[${MULTILIB_USEDEP}]
-		net-misc/curl[${MULTILIB_USEDEP}]
-	)
-	sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	sane_backends_pixma? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	snmp? ( net-analyzer/net-snmp:0= )
-	systemd? ( sys-apps/systemd:0= )
-	usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] )
-	v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	xinetd? ( sys-apps/xinetd )
-	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	dev-libs/libxml2
-	v4l? ( sys-kernel/linux-headers )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	sys-devel/autoconf-archive
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
-	"${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch
-	"${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/sane-config
-)
-
-src_prepare() {
-	default
-
-	# Patch out the git reference so we can run eautoreconf
-	sed \
-		-e "s/m4_esyscmd_s(\[git describe --dirty\])/${PV}/" \
-		-e '/^AM_MAINTAINER_MODE/d' \
-		-i configure.ac || die
-	eautoreconf
-
-	# Fix for "make check".  Upstream sometimes forgets to update this.
-	local ver=$(./configure --version | awk '{print $NF; exit 0}')
-	sed -i \
-		-e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \
-		testsuite/tools/data/html* || die
-
-	# don't bleed user LDFLAGS into pkgconfig files
-	sed 's|@LDFLAGS@ ||' -i tools/*.pc.in || die
-}
-
-src_configure() {
-	# From Fedora
-	append-flags -fno-strict-aliasing
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# the blank is intended - an empty string would result in building ALL backends.
-	local lbackends=" "
-
-	use gphoto2 && lbackends="gphoto2"
-	use v4l && lbackends+=" v4l"
-	use sane_backends_escl && multilib_is_native_abi && lbackends+=" escl"
-	local backend
-	for backend in ${IUSE_SANE_BACKENDS[@]} ; do
-		if use "sane_backends_${backend}" && [[ "${backend}" != pnm ]] && [[ "${backend}" != escl ]] ; then
-			lbackends+=" ${backend}"
-		fi
-	done
-
-	local myconf=(
-		$(use_with usb)
-		$(multilib_native_use_with snmp)
-
-		$(multilib_native_use_with sane_backends_escl poppler-glib)
-		# you can only enable this backend, not disable it...
-		$(usex sane_backends_pnm --enable-pnm-backend '')
-		$(usex sane_backends_mustek_pp --enable-parport-directio '')
-	)
-
-	if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ; } ; then
-		myconf+=( sane_cv_use_libieee1284=no )
-	fi
-
-	# relative path must be used for tests to work properly
-	# All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory
-	# that break in many ways, bug #636202, #668232, #668350
-	# People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html
-	myconf+=(
-		--disable-locking
-		$(use_with gphoto2)
-		$(multilib_native_use_with systemd)
-		$(use_with v4l)
-		$(use_enable ipv6)
-		$(use_enable threads pthread)
-		$(use_with zeroconf avahi)
-	)
-	ECONF_SOURCE="${S}" \
-	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
-	BACKENDS="${lbackends}" \
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake VARTEXFONTS="${T}/fonts"
-
-	if tc-is-cross-compiler ; then
-		pushd "${BUILD_DIR}"/tools >/dev/null || die
-
-		# The build system sucks and doesn't handle this properly.
-		# https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \
-			-I. -I../include -I"${S}"/include \
-			"${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \
-			"${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die
-		local dirs=( hal hotplug hotplug-ng udev )
-		local targets=(
-			hal/libsane.fdi
-			hotplug/libsane.usermap
-			hotplug-ng/libsane.db
-			udev/libsane.rules
-		)
-		mkdir -p "${dirs[@]}" || die
-		emake "${targets[@]}"
-
-		popd >/dev/null || die
-	fi
-
-	if use usb ; then
-		sed -i -e '/^$/d' \
-			tools/hotplug/libsane.usermap || die
-	fi
-}
-
-multilib_src_install() {
-	emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
-		docdir="${EPREFIX}"/usr/share/doc/${PF}
-
-	if multilib_is_native_abi ; then
-		if use usb ; then
-			insinto /etc/hotplug/usb
-			doins tools/hotplug/libsane.usermap
-		fi
-
-		udev_newrules tools/udev/libsane.rules 41-libsane.rules
-		insinto "/usr/share/pkgconfig"
-		doins tools/sane-backends.pc
-	fi
-}
-
-multilib_src_install_all() {
-	keepdir /var/lib/lock/sane
-	fowners root:scanner /var/lib/lock/sane
-	fperms g+w /var/lib/lock/sane
-	dodir /etc/env.d
-
-	if use systemd ; then
-		systemd_newunit "${FILESDIR}"/saned_at.service "saned@.service"
-		systemd_newunit "${FILESDIR}"/saned.socket saned.socket
-	fi
-
-	if use usb ; then
-		exeinto /etc/hotplug/usb
-		doexe tools/hotplug/libusbscanner
-		newdoc tools/hotplug/README README.hotplug
-	fi
-
-	dodoc NEWS AUTHORS PROBLEMS README README.linux
-	find "${ED}" -name '*.la' -delete || die
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		doins "${FILESDIR}"/saned
-	fi
-
-	newinitd "${FILESDIR}"/saned.initd saned
-	newconfd "${FILESDIR}"/saned.confd saned
-}
-
-pkg_postinst() {
-	optfeature "Network scanner backend" media-gfx/sane-airscan
-	optfeature "Epson-specific backend" media-gfx/iscan
-	optfeature "HP-specific backend" net-print/hplip
-
-	if use xinetd ; then
-		elog "If you want remote clients to connect, edit"
-		elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
-	fi
-
-	if ! use systemd ; then
-		elog "If you are using a USB scanner, add all users who want"
-		elog "to access your scanner to the \"scanner\" group."
-	fi
-}
diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.1.1-r1.ebuild
deleted file mode 100644
index fd756b73c128..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,363 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-# python-any-r1 required for a script in
-# backends/pixma/scripts/
-inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 systemd toolchain-funcs udev
-
-# gphoto and v4l are handled by their usual USE flags.
-# The pint backend was disabled because I could not get it to compile.
-IUSE_SANE_BACKENDS=(
-	abaton
-	agfafocus
-	apple
-	artec
-	artec_eplus48u
-	as6e
-	avision
-	bh
-	canon
-	canon630u
-	canon_dr
-	canon_lide70
-	canon_pp
-	cardscan
-	coolscan
-	coolscan2
-	coolscan3
-	dc210
-	dc240
-	dc25
-	dell1600n_net
-	dmc
-	epjitsu
-	epson
-	epson2
-	escl
-	fujitsu
-	genesys
-	gt68xx
-	hp
-	hp3500
-	hp3900
-	hp4200
-	hp5400
-	hp5590
-	hpljm1005
-	hpsj5s
-	hs2p
-	ibm
-	kodak
-	kodakaio
-	kvs1025
-	kvs20xx
-	kvs40xx
-	leo
-	lexmark
-	ma1509
-	magicolor
-	matsushita
-	microtek
-	microtek2
-	mustek
-	mustek_pp
-	mustek_usb
-	mustek_usb2
-	nec
-	net
-	niash
-	p5
-	pie
-	pieusb
-	pixma
-	plustek
-	plustek_pp
-	pnm
-	qcam
-	ricoh
-	ricoh2
-	rts8891
-	s9036
-	sceptre
-	sharp
-	sm3600
-	sm3840
-	snapscan
-	sp15c
-	st400
-	stv680
-	tamarack
-	teco1
-	teco2
-	teco3
-	test
-	u12
-	umax
-	umax1220u
-	umax_pp
-	xerox_mfp
-)
-
-IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
-
-for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do
-	case ${GBACKEND} in
-	# Disable backends that require parallel ports as no one has those anymore.
-	canon_pp|hpsj5s|mustek_pp|\
-	pnm|mustek_usb2|kvs40xx)
-		IUSE+=" sane_backends_${GBACKEND}"
-		;;
-	*)
-		IUSE+=" +sane_backends_${GBACKEND}"
-	esac
-done
-
-REQUIRED_USE="
-	sane_backends_escl? ( zeroconf )
-	sane_backends_kvs40xx? ( threads )
-	sane_backends_mustek_usb2? ( threads )
-"
-
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.sane-project.org/"
-SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b6a58d64b43/${P}.tar.gz"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-# For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
-RDEPEND="
-	acct-user/saned
-	gphoto2? (
-		>=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
-		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
-	)
-	sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	sane_backends_dell1600n_net? (
-		>=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
-		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
-	)
-	sane_backends_escl? (
-		app-text/poppler[cairo]
-		|| (
-			net-dns/avahi[dbus]
-			net-dns/avahi[gtk]
-		)
-		net-dns/avahi[${MULTILIB_USEDEP}]
-		net-misc/curl[${MULTILIB_USEDEP}]
-	)
-	sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	sane_backends_pixma? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	snmp? ( net-analyzer/net-snmp:0= )
-	systemd? ( sys-apps/systemd:0= )
-	usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] )
-	v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	xinetd? ( sys-apps/xinetd )
-	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	dev-libs/libxml2
-	v4l? ( sys-kernel/linux-headers )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	sys-devel/autoconf-archive
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
-	"${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch
-	"${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/sane-config
-)
-
-src_prepare() {
-	default
-
-	# Patch out the git reference so we can run eautoreconf
-	sed \
-		-e "s/m4_esyscmd_s(\[git describe --dirty\])/${PV}/" \
-		-e '/^AM_MAINTAINER_MODE/d' \
-		-i configure.ac || die
-	eautoreconf
-
-	# Fix for "make check".  Upstream sometimes forgets to update this.
-	local ver=$(./configure --version | awk '{print $NF; exit 0}')
-	sed -i \
-		-e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \
-		testsuite/tools/data/html* || die
-
-	# don't bleed user LDFLAGS into pkgconfig files
-	sed 's|@LDFLAGS@ ||' -i tools/*.pc.in || die
-
-	# Needed for udev rules generation/installation
-	multilib_copy_sources
-}
-
-src_configure() {
-	# From Fedora
-	append-flags -fno-strict-aliasing
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# the blank is intended - an empty string would result in building ALL backends.
-	local lbackends=" "
-
-	use gphoto2 && lbackends="gphoto2"
-	use v4l && lbackends+=" v4l"
-	use sane_backends_escl && multilib_is_native_abi && lbackends+=" escl"
-	local backend
-	for backend in ${IUSE_SANE_BACKENDS[@]} ; do
-		if use "sane_backends_${backend}" && [[ "${backend}" != pnm ]] && [[ "${backend}" != escl ]] ; then
-			lbackends+=" ${backend}"
-		fi
-	done
-
-	local myconf=(
-		$(use_with usb)
-		$(multilib_native_use_with snmp)
-
-		$(multilib_native_use_with sane_backends_escl poppler-glib)
-		# you can only enable this backend, not disable it...
-		$(usex sane_backends_pnm --enable-pnm-backend '')
-		$(usex sane_backends_mustek_pp --enable-parport-directio '')
-	)
-
-	if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ; } ; then
-		myconf+=( sane_cv_use_libieee1284=no )
-	fi
-
-	# relative path must be used for tests to work properly
-	# All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory
-	# that break in many ways, bug #636202, #668232, #668350
-	# People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html
-	myconf+=(
-		--disable-locking
-		$(use_with gphoto2)
-		$(multilib_native_use_with systemd)
-		$(use_with v4l)
-		$(use_enable ipv6)
-		$(use_enable threads pthread)
-		$(use_with zeroconf avahi)
-	)
-	ECONF_SOURCE="${S}" \
-	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
-	BACKENDS="${lbackends}" \
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake VARTEXFONTS="${T}/fonts"
-
-	if tc-is-cross-compiler ; then
-		pushd "${BUILD_DIR}"/tools >/dev/null || die
-
-		# The build system sucks and doesn't handle this properly.
-		# https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \
-			-I. -I../include -I"${S}"/include \
-			"${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \
-			"${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die
-		local dirs=( hal hotplug hotplug-ng udev )
-		local targets=(
-			hal/libsane.fdi
-			hotplug/libsane.usermap
-			hotplug-ng/libsane.db
-			udev/libsane.rules
-		)
-		mkdir -p "${dirs[@]}" || die
-		emake "${targets[@]}"
-
-		popd >/dev/null || die
-	fi
-
-	if use usb ; then
-		sed -i -e '/^$/d' \
-			tools/hotplug/libsane.usermap || die
-	fi
-}
-
-multilib_src_install() {
-	emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
-		docdir="${EPREFIX}"/usr/share/doc/${PF}
-
-	if multilib_is_native_abi ; then
-		if use usb ; then
-			insinto /etc/hotplug/usb
-			doins tools/hotplug/libsane.usermap
-		fi
-
-		insinto "/usr/share/pkgconfig"
-		doins tools/sane-backends.pc
-
-		# From Fedora and Arch, prevent permission conflicts
-		# https://github.com/OpenPrinting/cups/issues/314
-		# https://gitlab.com/sane-project/backends/-/issues/546
-		#
-		# Generate udev udev+hwdb, not needing scanner group
-		install -vdm 755 "${ED}/$(get_udevdir)/rules.d/" || die
-		tools/sane-desc -m udev+hwdb -s doc/descriptions/ > "${ED}/$(get_udevdir)/rules.d/65-${PN}.rules" || die
-		tools/sane-desc -m udev+hwdb -s doc/descriptions-external/ >> "${ED}/$(get_udevdir)/rules.d/65-${PN}.rules" || die
-		# generate udev hwdb
-		install -vdm 755 "${ED}/$(get_udevdir)/hwdb.d/" || die
-		tools/sane-desc -m hwdb -s doc/descriptions/ > "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb"
-		# NOTE: an empty new line is required between the two .desc collections
-		printf "\n" >> "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" || die
-		tools/sane-desc -m hwdb -s doc/descriptions-external/ >> "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" || die
-		# udev rule for saned (SANE scanning daemon) to be able to write on usb port
-		udev_dorules "${FILESDIR}/66-saned.rules"
-	fi
-}
-
-multilib_src_install_all() {
-	dodir /etc/env.d
-
-	if use systemd ; then
-		systemd_newunit "${FILESDIR}"/saned_at.service "saned@.service"
-		systemd_newunit "${FILESDIR}"/saned.socket saned.socket
-	fi
-
-	if use usb ; then
-		exeinto /etc/hotplug/usb
-		doexe tools/hotplug/libusbscanner
-		newdoc tools/hotplug/README README.hotplug
-	fi
-
-	dodoc NEWS AUTHORS PROBLEMS README README.linux
-	find "${ED}" -name '*.la' -delete || die
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		doins "${FILESDIR}"/saned
-	fi
-
-	newinitd "${FILESDIR}"/saned.initd saned
-	newconfd "${FILESDIR}"/saned.confd saned
-}
-
-pkg_postinst() {
-	optfeature "Network scanner backend" media-gfx/sane-airscan
-	optfeature "Epson-specific backend" media-gfx/iscan
-	optfeature "HP-specific backend" net-print/hplip
-
-	if use xinetd ; then
-		elog "If you want remote clients to connect, edit"
-		elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
-	fi
-}
diff --git a/media-gfx/sane-backends/sane-backends-1.1.1.ebuild b/media-gfx/sane-backends/sane-backends-1.1.1.ebuild
deleted file mode 100644
index 0453269675fb..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.1.1.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-# python-any-r1 required for a script in
-# backends/pixma/scripts/
-inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 systemd toolchain-funcs udev
-
-# gphoto and v4l are handled by their usual USE flags.
-# The pint backend was disabled because I could not get it to compile.
-IUSE_SANE_BACKENDS=(
-	abaton
-	agfafocus
-	apple
-	artec
-	artec_eplus48u
-	as6e
-	avision
-	bh
-	canon
-	canon630u
-	canon_dr
-	canon_lide70
-	canon_pp
-	cardscan
-	coolscan
-	coolscan2
-	coolscan3
-	dc210
-	dc240
-	dc25
-	dell1600n_net
-	dmc
-	epjitsu
-	epson
-	epson2
-	escl
-	fujitsu
-	genesys
-	gt68xx
-	hp
-	hp3500
-	hp3900
-	hp4200
-	hp5400
-	hp5590
-	hpljm1005
-	hpsj5s
-	hs2p
-	ibm
-	kodak
-	kodakaio
-	kvs1025
-	kvs20xx
-	kvs40xx
-	leo
-	lexmark
-	ma1509
-	magicolor
-	matsushita
-	microtek
-	microtek2
-	mustek
-	mustek_pp
-	mustek_usb
-	mustek_usb2
-	nec
-	net
-	niash
-	p5
-	pie
-	pieusb
-	pixma
-	plustek
-	plustek_pp
-	pnm
-	qcam
-	ricoh
-	ricoh2
-	rts8891
-	s9036
-	sceptre
-	sharp
-	sm3600
-	sm3840
-	snapscan
-	sp15c
-	st400
-	stv680
-	tamarack
-	teco1
-	teco2
-	teco3
-	test
-	u12
-	umax
-	umax1220u
-	umax_pp
-	xerox_mfp
-)
-
-IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
-
-for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do
-	case ${GBACKEND} in
-	# Disable backends that require parallel ports as no one has those anymore.
-	canon_pp|hpsj5s|mustek_pp|\
-	pnm|mustek_usb2|kvs40xx)
-		IUSE+=" sane_backends_${GBACKEND}"
-		;;
-	*)
-		IUSE+=" +sane_backends_${GBACKEND}"
-	esac
-done
-
-REQUIRED_USE="
-	sane_backends_escl? ( zeroconf )
-	sane_backends_kvs40xx? ( threads )
-	sane_backends_mustek_usb2? ( threads )
-"
-
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.sane-project.org/"
-SRC_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b6a58d64b43/${P}.tar.gz"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-# For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
-RDEPEND="
-	acct-group/scanner
-	acct-user/saned
-	gphoto2? (
-		>=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
-		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
-	)
-	sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	sane_backends_dell1600n_net? (
-		>=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}]
-		>=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
-	)
-	sane_backends_escl? (
-		app-text/poppler[cairo]
-		|| (
-			net-dns/avahi[dbus]
-			net-dns/avahi[gtk]
-		)
-		net-dns/avahi[${MULTILIB_USEDEP}]
-		net-misc/curl[${MULTILIB_USEDEP}]
-	)
-	sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
-	sane_backends_pixma? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	snmp? ( net-analyzer/net-snmp:0= )
-	systemd? ( sys-apps/systemd:0= )
-	usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] )
-	v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	xinetd? ( sys-apps/xinetd )
-	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	dev-libs/libxml2
-	v4l? ( sys-kernel/linux-headers )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	sys-devel/autoconf-archive
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch
-	"${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch
-	"${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/sane-config
-)
-
-src_prepare() {
-	default
-
-	# Patch out the git reference so we can run eautoreconf
-	sed \
-		-e "s/m4_esyscmd_s(\[git describe --dirty\])/${PV}/" \
-		-e '/^AM_MAINTAINER_MODE/d' \
-		-i configure.ac || die
-	eautoreconf
-
-	# Fix for "make check".  Upstream sometimes forgets to update this.
-	local ver=$(./configure --version | awk '{print $NF; exit 0}')
-	sed -i \
-		-e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \
-		testsuite/tools/data/html* || die
-
-	# don't bleed user LDFLAGS into pkgconfig files
-	sed 's|@LDFLAGS@ ||' -i tools/*.pc.in || die
-}
-
-src_configure() {
-	# From Fedora
-	append-flags -fno-strict-aliasing
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# the blank is intended - an empty string would result in building ALL backends.
-	local lbackends=" "
-
-	use gphoto2 && lbackends="gphoto2"
-	use v4l && lbackends+=" v4l"
-	use sane_backends_escl && multilib_is_native_abi && lbackends+=" escl"
-	local backend
-	for backend in ${IUSE_SANE_BACKENDS[@]} ; do
-		if use "sane_backends_${backend}" && [[ "${backend}" != pnm ]] && [[ "${backend}" != escl ]] ; then
-			lbackends+=" ${backend}"
-		fi
-	done
-
-	local myconf=(
-		$(use_with usb)
-		$(multilib_native_use_with snmp)
-
-		$(multilib_native_use_with sane_backends_escl poppler-glib)
-		# you can only enable this backend, not disable it...
-		$(usex sane_backends_pnm --enable-pnm-backend '')
-		$(usex sane_backends_mustek_pp --enable-parport-directio '')
-	)
-
-	if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ; } ; then
-		myconf+=( sane_cv_use_libieee1284=no )
-	fi
-
-	# relative path must be used for tests to work properly
-	# All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory
-	# that break in many ways, bug #636202, #668232, #668350
-	# People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html
-	myconf+=(
-		--disable-locking
-		$(use_with gphoto2)
-		$(multilib_native_use_with systemd)
-		$(use_with v4l)
-		$(use_enable ipv6)
-		$(use_enable threads pthread)
-		$(use_with zeroconf avahi)
-	)
-	ECONF_SOURCE="${S}" \
-	SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
-	BACKENDS="${lbackends}" \
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake VARTEXFONTS="${T}/fonts"
-
-	if tc-is-cross-compiler ; then
-		pushd "${BUILD_DIR}"/tools >/dev/null || die
-
-		# The build system sucks and doesn't handle this properly.
-		# https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \
-			-I. -I../include -I"${S}"/include \
-			"${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \
-			"${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die
-		local dirs=( hal hotplug hotplug-ng udev )
-		local targets=(
-			hal/libsane.fdi
-			hotplug/libsane.usermap
-			hotplug-ng/libsane.db
-			udev/libsane.rules
-		)
-		mkdir -p "${dirs[@]}" || die
-		emake "${targets[@]}"
-
-		popd >/dev/null || die
-	fi
-
-	if use usb ; then
-		sed -i -e '/^$/d' \
-			tools/hotplug/libsane.usermap || die
-	fi
-}
-
-multilib_src_install() {
-	emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
-		docdir="${EPREFIX}"/usr/share/doc/${PF}
-
-	if multilib_is_native_abi ; then
-		if use usb ; then
-			insinto /etc/hotplug/usb
-			doins tools/hotplug/libsane.usermap
-		fi
-
-		udev_newrules tools/udev/libsane.rules 41-libsane.rules
-		insinto "/usr/share/pkgconfig"
-		doins tools/sane-backends.pc
-	fi
-}
-
-multilib_src_install_all() {
-	keepdir /var/lib/lock/sane
-	fowners root:scanner /var/lib/lock/sane
-	fperms g+w /var/lib/lock/sane
-	dodir /etc/env.d
-
-	if use systemd ; then
-		systemd_newunit "${FILESDIR}"/saned_at.service "saned@.service"
-		systemd_newunit "${FILESDIR}"/saned.socket saned.socket
-	fi
-
-	if use usb ; then
-		exeinto /etc/hotplug/usb
-		doexe tools/hotplug/libusbscanner
-		newdoc tools/hotplug/README README.hotplug
-	fi
-
-	dodoc NEWS AUTHORS PROBLEMS README README.linux
-	find "${ED}" -name '*.la' -delete || die
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		doins "${FILESDIR}"/saned
-	fi
-
-	newinitd "${FILESDIR}"/saned.initd saned
-	newconfd "${FILESDIR}"/saned.confd saned
-}
-
-pkg_postinst() {
-	optfeature "Network scanner backend" media-gfx/sane-airscan
-	optfeature "Epson-specific backend" media-gfx/iscan
-	optfeature "HP-specific backend" net-print/hplip
-
-	if use xinetd ; then
-		elog "If you want remote clients to connect, edit"
-		elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
-	fi
-
-	if ! use systemd ; then
-		elog "If you are using a USB scanner, add all users who want"
-		elog "to access your scanner to the \"scanner\" group."
-	fi
-}
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 8e4240d8d13b..2c4dfa4093af 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -2,6 +2,8 @@ AUX 40.0-add-control-optional-deps.patch 2713 BLAKE2B 594f076b9515697322711033a2
 AUX 40.7-fix-build-with-meson-0.61.1.patch 1470 BLAKE2B c7cc58450275777d5367063e92ea2c44b8f05e6e52e740a69e2baa0336a3164d8e2d8ad732248cddd9126a574e1b141e637475ce21a2af8edbc3638f7e066bbe SHA512 eb1007a284214716009356de7e40e9b14418aa76a8a9356feaf74ef2776035037430da49735305f8da885e4749d7add13f7f1bcfea2875543777705f6a69b4a4
 DIST simple-scan-40.7.tar.xz 1480288 BLAKE2B 8068105db77196157495cbb2eb4c3e6a82531ed4bb727c05884154a661a9669426047c6cbbcffdd696c8e4d27721f2ca6249be14b6b4cc62be96bdbfe1b67a4c SHA512 36dc321e83bdf02fb9267d299abeee7f56bb6ee786e09811ba1244a2cee2c3baa0c5bbf3a4d6a6eadfc093d0e792b3511855c7e32caa2f6864face620fa4e7f6
 DIST simple-scan-42.0.tar.xz 1097464 BLAKE2B e2ca253d6fcff9a320312bbf32e50242b64c22a1f89cf99aa705214c5a393f1e76fb14693f508d0bc7231b97d47a5b7fa3fe767527206615df361c9edf5315c6 SHA512 0ccbe82a85fa802f53899df6109be93d58adc5028e6d904da7fc91e25cfd225fff757a7b65380abd7d3e7dfd35feab586bcf5b7504cc46d42822d3b2179bdec0
+DIST simple-scan-42.1.tar.xz 1100296 BLAKE2B 86d22abb8e3f72f19ab856d8e3578f57f71bc8e34ee5bb6e3809f160bc733b7f5753b947cbd12714829b29662087cdb601687cdd9ca1b1cbba41e543ce033ed2 SHA512 c4919ade08a30ee185eb4c62f59777fc360aa35c009f033ee9a9d10e23104fc0c44016509551e3d8de2948a3657c6c4d6c2fbbd955c4c09c6698d6733a55cfce
 EBUILD simple-scan-40.7.ebuild 1512 BLAKE2B 9c59589c74f9227579d0446c58ff3a24bfc7c06647223f63311d67e748df54ea7f59f9db59e7bcc2a4dd8644150961ceb32bc9547837201b9df259aea9c2b5c3 SHA512 f8051b6a45824ec2e0ba3cf9390d8f3937bf755f95d1f0b65c72233bdafd33fe2e08f45b18eeec5deea236bf198fa47dbd5784fc45f4572f49f438b22c567b6c
 EBUILD simple-scan-42.0.ebuild 1469 BLAKE2B 1c1c6d63706893b43d2a1d6c698908613dbb86f3838870d40a66fef5855e4056af6e6c5b3c2394039ca6b6485b1bf9d42a00b56e37b73f0d3bd52c391ab88b85 SHA512 f0c988eb6655f0c3cf4ed0aa6c4864b21c22daffe21b4515a0b70701b2668da6c850754f743d9dca05eeade03dde902e3758e68b569a31486b92051d1528d656
+EBUILD simple-scan-42.1.ebuild 1417 BLAKE2B ecad26a79c0d2f5b87644df1935db293af7e3e7287ca400a3df8f88445690f781dbb683a4d663470559b48810abe2be35e5c1b55802dabb198b814f8018b9c2f SHA512 192ba0903c6d4900b3aac228c7643445d95f51841173b203895e93ed1fde9ff1b6104bd50721876604302212f29910276f2f40d4b1d00d05b82bd1a77b9ec5e7
 MISC metadata.xml 617 BLAKE2B 41b65f58d578371b4219664b11bf04f081e9a4dd6d146d977689708bdc4d847f85ef86cb4391eb45d24c21185889ff9e5122fd3b6658a24965d231f75ea5b8da SHA512 fb3e56709421b416cb42f1f025308404117c5cf0dfe37419c2d9fa5a18a7397e7f6f9117143df4fff1e2347fd65cfcb9e7007c6c9be56df79641b024d21c1db5
diff --git a/media-gfx/simple-scan/simple-scan-42.1.ebuild b/media-gfx/simple-scan/simple-scan-42.1.ebuild
new file mode 100644
index 000000000000..00ffa5ac377e
--- /dev/null
+++ b/media-gfx/simple-scan/simple-scan-42.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+VALA_MIN_API_VERSION="0.34"
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Simple document scanning utility"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="colord webp"
+
+DEPEND="
+	>=dev-libs/glib-2.38:2
+	>=x11-libs/gtk+-3.24:3
+	>=gui-libs/libhandy-1.5.0:1=
+	>=sys-libs/zlib-1.2.3.1:=
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	>=dev-libs/libgusb-0.2.7
+	colord? ( >=x11-misc/colord-0.1.24:=[udev(+)] )
+	webp? ( media-libs/libwebp )
+	>=media-gfx/sane-backends-1.0.20:=
+
+	virtual/jpeg:0=
+"
+RDEPEND="${DEPEND}
+	x11-misc/xdg-utils
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(vala_depend)
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gui-libs/libhandy:1[vala]
+	dev-libs/libgusb[vala]
+	colord? ( x11-misc/colord[vala] )
+"
+
+PATCHES=(
+	# Add control for optional dependencies
+	"${FILESDIR}"/40.0-add-control-optional-deps.patch
+)
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use colord)
+		-Dpackagekit=false
+		$(meson_use webp)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/skanpage/Manifest b/media-gfx/skanpage/Manifest
new file mode 100644
index 000000000000..cd208d64e053
--- /dev/null
+++ b/media-gfx/skanpage/Manifest
@@ -0,0 +1,3 @@
+DIST skanpage-22.04.0.tar.xz 389532 BLAKE2B f182723c53223bbc9a2d48a675a3cc97b489da37b5115d306d89b4b4b288c6ddcac6b8a2a475ff87fa105e5712cb4d683c128c3cda5a08e065c738bcd05e3838 SHA512 581cc7b009209356cd12c57b98081dae5f75b9813dbd5051bb38afe13b0510b803ab38d1b6cdc18935a48d6fa2c06ec2eb51b056e4b636e3693bae8ec17ee9e2
+EBUILD skanpage-22.04.0.ebuild 1091 BLAKE2B 862b1869434020003b0de89ff7323eb0f01cf08072997fcd3e8675189814f654c299232b92e013fb2739fc6cc5f39ca75ad8c2de5012cc89c91acb3064892ce5 SHA512 5181a23a0f0f261d4857311a25ec2402b5235a1962e2a536cc500d3c3079c8a0aacbdfb197d6e2fbebb260f3914dbb0063bfc386006e7fe6af8b6f6b21b50f16
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-gfx/skanpage/metadata.xml b/media-gfx/skanpage/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/media-gfx/skanpage/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-gfx/skanpage/skanpage-22.04.0.ebuild b/media-gfx/skanpage/skanpage-22.04.0.ebuild
new file mode 100644
index 000000000000..348cee24bc3a
--- /dev/null
+++ b/media-gfx/skanpage/skanpage-22.04.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY="utilities"
+KDE_GEAR="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.91
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Multi-page scanning application supporting image and pdf files"
+HOMEPAGE="https://apps.kde.org/skanpage/"
+
+LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/libksane-${PVCUT}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/purpose-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/media-gfx/ttfautohint/Manifest b/media-gfx/ttfautohint/Manifest
index ac4b403d0d68..ae4c5c288f4f 100644
--- a/media-gfx/ttfautohint/Manifest
+++ b/media-gfx/ttfautohint/Manifest
@@ -1,3 +1,3 @@
 DIST ttfautohint-1.8.4.tar.gz 3539332 BLAKE2B 314c5196f01828d180d3b3e9b09c66fad9c8a8958f36003c8ae0d54b945391cb53c40f92cf57ff70e57b5a21a6aa46bc14ff9419d4b877421fdc2500ce9004e3 SHA512 983517c360f8e65ccbf17f28f045f1c0a45078707f2e30f465a7b6df4014f0ec212780ea2703bc16be1a3c6ede70f71ea3051c067fbfd06eff40ae3b20840eec
-EBUILD ttfautohint-1.8.4-r2.ebuild 1138 BLAKE2B d1d65aa45c22ac6b010106764762df5923152998a846c16ef2fcd47ad2e27d917b14a2534e6e6e9cb681d2b885a01f94b4fe963dd62d66c9b869677fcf1487a6 SHA512 b1a852ba2ec01b791f5907bb9d820b6680c0f93c292166f9a915a3763a3d0702792e69607205189e1c57b8fe1eea1e10f37f35b02f963048c8d7b662f92573d9
+EBUILD ttfautohint-1.8.4-r2.ebuild 1137 BLAKE2B dc4adb35cf25551a2cc0560b34aee5e12bb6ef8f9ea520e022964b9c52f4ca1e00acd84e5712749246ee57ef1f66ca91efc94705e2f343f6f50d706a67bb4042 SHA512 873802f5015118eb22273120aa88e8695d5a3282821f3f09a0c2fa4a4c8f5d4b393fa81b096208d72d63bb1f270d488b3e13404c9d12389a0f1d005092506990
 MISC metadata.xml 451 BLAKE2B 3bfb21c66cf3e415000f370130a6771cefcc04e9dab8122fff9187c03bb622318104c0c927a340915f155a82e0022cf635d9567f1dc459645b6a33d61f5f9bc3 SHA512 d1488ee772b8f88f489b63c14abf58308e82337b693c4b72661d82c2f268ba8ef63f6bd1d8bd202c87ee0690e86c4d335707b4cb8d21a0d20a8fb24f0e044aff
diff --git a/media-gfx/ttfautohint/ttfautohint-1.8.4-r2.ebuild b/media-gfx/ttfautohint/ttfautohint-1.8.4-r2.ebuild
index 15534d9edc17..a15206b84bb9 100644
--- a/media-gfx/ttfautohint/ttfautohint-1.8.4-r2.ebuild
+++ b/media-gfx/ttfautohint/ttfautohint-1.8.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.savannah.gnu.org/releases/freetype/${P}.tar.gz"
 
 LICENSE="|| ( FTL GPL-2+ )"
 SLOT="0/1.0.3"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="qt5"
 
 RDEPEND="
diff --git a/media-gfx/waifu2x-ncnn-vulkan/Manifest b/media-gfx/waifu2x-ncnn-vulkan/Manifest
index 58a48bb9c9c0..b57357d71203 100644
--- a/media-gfx/waifu2x-ncnn-vulkan/Manifest
+++ b/media-gfx/waifu2x-ncnn-vulkan/Manifest
@@ -1,4 +1,6 @@
 AUX waifu2x-ncnn-vulkan-20210521-no-lto.patch 600 BLAKE2B a4fa9601b48d103c15ed8e93658e633cb0d63f304a5d5ad9336f0b1cdc05e58001fa80cd4ab50cb688d50037560446dd051256617dae51578dabd110586f13ab SHA512 c6bc6b33b26c9d4dbe6728685c9ff68b2b7b8bd1afdeae1e0d3283bc292eb1ccc81d7ba0cd7baaccdf4b367876140ed939e84b0dfe63e1eb1c1100094265e333
 DIST waifu2x-ncnn-vulkan-20210521.tar.gz 34076523 BLAKE2B d04c3ac1152be899292730fe06f317c92f1334ea3f91cc6208444574c271d401152b4432bf5293f7193f0c318ca1685145754dd78ad0a8523aefa0fd56d40b4a SHA512 b1a0202a94deb9faadda34c5d46bceabec7ee00960676ca98090af4101bb63648fdc266cc608bfc621a3ec65c8c5f9503a02a4db4e51e9b2048d574c7a7f368a
-EBUILD waifu2x-ncnn-vulkan-20210521.ebuild 1163 BLAKE2B f6256ef3bc34a273b96ebf5dab5dc544a7ddd98a818c55ea4b3929f9964b9c22fa8c49dd815aae854f0b648a7b5a40c3d687217879afd370d5bd8cade60aac61 SHA512 a3869d2c954e554fde32c2d675db2fef7770e0f9563edf1eba99699567ed33e54adab45478c1bd82bda1eabf5503559f166843cccb93fe7aea4beec295f7a031
+DIST waifu2x-ncnn-vulkan-20220419.tar.gz 34076913 BLAKE2B 0a8355d5b940e6371c49bf3b981a0dd7508b07ecd4d944da2a8a1f0a1ea7c77f61747bbb025c033781f032292e55ccccfa2a3b72684243973d132da99ed09ebf SHA512 fbb6491dddaea9806300cf3f5a582e25d7c644084d61cae33bb38339ac3cf47af03866a1f9bc4bd30f9270b68a945760ebb58535a19b5855a4a0824138ddb513
+EBUILD waifu2x-ncnn-vulkan-20210521-r1.ebuild 1098 BLAKE2B b52c68d10afabf8699f32bf4410864241570aefb120c99a7dd7a443b3aa2ffc419934dcf48c9ff8cd9c06c34689238428ffa0118c3106574d15fae2dff8c47f0 SHA512 8e3a0110b045afc88b1c3ec5c6ac0a2fc5b302385f088929f2e77ec93ab94a3b084461e6f491a2c03352f0227fe76f0cdfc3072a414c3a714993ba067498797c
+EBUILD waifu2x-ncnn-vulkan-20220419.ebuild 1096 BLAKE2B 44d7249858ebca3b5b08cfdddc40ba14ec1ff97da8d91076209d7bebfcabbf0ed647886f366e4a2981ff14b4e92710d2ff01f712d5f148a5f67f15ef3a708438 SHA512 c205ed9c61a7f761615ed346ac9b7302421bc8b3b10346e7a7a0c3d98325abd3dfd8a806dc11ff0b2997072700ba702eecefd7a3e2a302100629b08174e767ae
 MISC metadata.xml 449 BLAKE2B a1550ecad1311dd85b0ea9c0004205f001f9818c98636b3c5abaef1d4222c14336423ce3ba657b7465d46cdea4ee27ab5fb6bd46e4226c6f9500547205c7b527 SHA512 ec69b35edfcdced05b6903212db25626415162c780326142ffe784373410400f0c898300e001d7f50dd277af053effb9aee1d457fc653d058b864600c9edbb53
diff --git a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210521.ebuild b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210521-r1.ebuild
index cc5fc8bd42a0..ca5fdc679d96 100644
--- a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210521.ebuild
+++ b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210521-r1.ebuild
@@ -13,9 +13,8 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-# Pin dev-libs/ncnn near bundled copy until more stable.
 RDEPEND="
-	~dev-libs/ncnn-20210525[vulkan]
+	dev-libs/ncnn:=[vulkan]
 	dev-util/glslang
 	media-libs/libwebp:=
 	media-libs/vulkan-loader"
diff --git a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20220419.ebuild b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20220419.ebuild
new file mode 100644
index 000000000000..640620c62e2e
--- /dev/null
+++ b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20220419.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="waifu2x converter using ncnn and vulkan"
+HOMEPAGE="https://github.com/nihui/waifu2x-ncnn-vulkan"
+SRC_URI="https://github.com/nihui/waifu2x-ncnn-vulkan/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/ncnn:=[vulkan]
+	media-libs/libwebp:=
+	media-libs/vulkan-loader"
+DEPEND="
+	${RDEPEND}
+	dev-util/glslang
+	dev-util/vulkan-headers"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20210521-no-lto.patch
+)
+
+src_prepare() {
+	CMAKE_USE_DIR=${S}/src
+	cmake_src_prepare
+
+	# Update all paths to match installation for models.
+	sed "/PATHSTR\|model path/s|models-|${EPREFIX}/usr/share/${PN}/models-|" \
+		-i src/main.cpp || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
+		-DUSE_SYSTEM_NCNN=ON
+		-DUSE_SYSTEM_WEBP=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/waifu2x-ncnn-vulkan
+
+	insinto /usr/share/${PN}
+	doins -r models/.
+
+	einstalldocs
+}
diff --git a/media-gfx/yafaray/Manifest b/media-gfx/yafaray/Manifest
index 952c7aa7b56f..648214bec78d 100644
--- a/media-gfx/yafaray/Manifest
+++ b/media-gfx/yafaray/Manifest
@@ -1,7 +1,8 @@
 AUX yafaray-3.4.1-0001-Respect-user-pre-defined-CXXFLAGS.patch 1160 BLAKE2B 2145d744a269b25dad27b78afb52baec14b23c7a90041263b907020145b51482165ccd4dd833c537dadd4ca0074cdd90fefb642d8fb3bb5853d37164f5e3f2eb SHA512 d6b327c887badb28685277487fcb76917206781aa5e1d6ebd0f6832a28d573945bca2cce5a0e856a1b573c103a696cf7b7b10a91bb6135649249e8ca143ff8fc
 AUX yafaray-3.5.1-0001-respect-distribution-CFLAGS.patch 1541 BLAKE2B ea13c623fe025440481bfa8a68085d4bd0a46decb5dff9c6ce743ebc0dd30bcd8f3333fc45e041db19e420bc86ce1d1965a084a788882c7d68f1423c884ff8fe SHA512 861683353000e0c25991b64ab70af3839641d6e01f48756798acd5903124890d646fe4f9ef54f6c22c4d857994f2d0adc415dcd83534fb85300e6dbc5128631d
+AUX yafaray-3.5.1-add-missing-limits-header.patch 556 BLAKE2B ef63f5deba7c633917030b34ddf2c7a48bbcf412d99f48a1be89761c6dd19a67082560b2d0bb7dc440b7d0e9db73d708068eec7566ebc4038098faaf31aa269f SHA512 89ff060607e69a5ca0d2fb3ef2651e22e4a2ff5adae7351df2195267f2236792e7feae9a761882f3debc04bff4c83760a6704598643fb0a60ba37af698752032
 DIST yafaray-3.5.1.tar.gz 1136455 BLAKE2B 6002f3b96f3626b83f57015eaf3ddd53dcb6b6fd863277912f7fec06e4f176ec81dc48b889a068e6259edf17727dd04d4b1bbc51b571bfe6aad5e48148201e2e SHA512 3ead4d8becd2d524aa5bb4bbde4b9d98b56f8a38d872e7aa49ba19081094406336def02e9bf1503e424ca8e6cade0db4b042214cea8f9345bd4fc542c9346dbe
 DIST yafaray-core-3.4.1.tar.gz 1136077 BLAKE2B a2ce3945f52315084ee744ff4a6733255018196f0000ca6b1786fbd2ec49ade64cb62e98dfba95dca4dec361f47235d59a8c9bd95ee7d095214fc0afbdcb1ee4 SHA512 a9116273fbc2aaaadbc38a65b1eaaa502070ff06f8a2929e880714a9db57188e65cf319c20a3f96e08146af36a67aea139709a633eb024be65319a64330e6f68
 EBUILD yafaray-3.4.1.ebuild 3072 BLAKE2B 99207e9b3c330cc717af5649b951db81cedc259f27a18de0dd1092c9f895aa0ff1feec2cfc8eab2b24c32836b642fa2a0e5c85597f787ff2a35228f556189f23 SHA512 c3164f5fe95c9488a3dbd71bf81e724394dbc71a209153a89fbebff7345fe9102f5c2d8a316145b8359b868ebfd53120fd42de13b835dbac61421dd71d218cc0
-EBUILD yafaray-3.5.1-r1.ebuild 3110 BLAKE2B d5cf41be94638e0f2a7ce1e71bf4eb337490356903de173a6ad1b2c83899c023d8ad6bcdd19516ebbcaa396d9a2e3ebcebb2f021db9934ce69f76063dff3437d SHA512 e7ebc78775c2c4c4e34d174967cd5d2afc74cbdd5c57b2ede180048215c5e7724f7ff0050de589af5acde0c8b8b691ae158c9a715a975af52d5978073068f22f
+EBUILD yafaray-3.5.1-r1.ebuild 3164 BLAKE2B 3910145cea120b6375363b9f9e03aec7ce50f96f3817a91b0165a956fd23ef2de7eaba3c2c7b93e4abbd7936c1285517527adb02d89699faa78a42da1f0311be SHA512 0c79329142ee3d14ceda69eca5af243ff4f9c5c0d3e9198ef6e7aaa436fa64eac8ce35e1cc79bd370447b73d1d9f12c4d6a02295f768eb39c27c708f4064f681
 MISC metadata.xml 1090 BLAKE2B 7ce4d1b50e06300184c5cd969e0ba20c3c4ef63471d81646392411528599c429747a36eb5505a2f718867853c9ecd505a04d870ac0b29456f031dc32713606d3 SHA512 f1e56401173a07a15cd5fbce265d47ad09a8745300abffe77310c3eff8d8e18e3bfe2003750863c238e7f25c3e6009197c2fdf6e788c0767e1c4fffdc74ddea4
diff --git a/media-gfx/yafaray/files/yafaray-3.5.1-add-missing-limits-header.patch b/media-gfx/yafaray/files/yafaray-3.5.1-add-missing-limits-header.patch
new file mode 100644
index 000000000000..19ef77cbf829
--- /dev/null
+++ b/media-gfx/yafaray/files/yafaray-3.5.1-add-missing-limits-header.patch
@@ -0,0 +1,21 @@
+From f947af314bdfb8c5d5cb79a2a7877d9ad4d2f087 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Fri, 22 Apr 2022 08:23:48 +0200
+Subject: [PATCH] add missing limits header
+
+Bug: https://github.com/YafaRay/libYafaRay/issues/9
+Bug: https://bugs.gentoo.org/830949
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/include/core_api/surface.h
++++ b/include/core_api/surface.h
+@@ -24,6 +24,7 @@
+ #define Y_SURFACE_H
+ 
+ #include <yafray_constants.h>
++#include <limits>
+ #include "vector3d.h"
+ #include "color.h"
+ 
+-- 
+2.35.1
+
diff --git a/media-gfx/yafaray/yafaray-3.5.1-r1.ebuild b/media-gfx/yafaray/yafaray-3.5.1-r1.ebuild
index 2e4fb63fdf46..9053e381aba3 100644
--- a/media-gfx/yafaray/yafaray-3.5.1-r1.ebuild
+++ b/media-gfx/yafaray/yafaray-3.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -45,7 +45,11 @@ BDEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}"/${P}-0001-respect-distribution-CFLAGS.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-0001-respect-distribution-CFLAGS.patch
+	"${FILESDIR}"/${P}-add-missing-limits-header.patch
+)
+
 DOCS=( AUTHORS.md CHANGELOG.md CODING.md INSTALL.md README.md )
 
 pkg_setup() {
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 80ae9334b4bd..0532298ab547 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,15 +1,7 @@
-AUX zbar-0.23.1-autoconf-2.70.patch 1280 BLAKE2B c4e9fd97047c49599477e387590372404c47b66f960bf1e0ffd80c7c694cf59cf080660899e1abc0f33eadd7087e5ba6d40e55e853f0569374a3be0934001450 SHA512 e7317dcd5e3dacce52dd27ce8d37afd07d2b193fa8f40e237a5f4bca911bda1e38ac74b0fd770976c0659ccc44b576775ba291d8135e426ad7a793fbdb104401
-AUX zbar-0.23.1_fix_leftover_on_shell_compatibility.patch 877 BLAKE2B 6eb1778024ba3ab0df8bc64ae80987be0e17cd30b692f0e04766fcad3148fe1ce49f52f7ec147d3f22c34754288fe0f9721ffa91e3e78c5b357c167f372f4e5d SHA512 98c203f122811128e091f8cc31f0c92362cc8693e38f5cdd7a48cf6d5ef57889bd6ccf921631a1646214f070c3be2eb78f08c429351bec275f4b550b2e15b122
-AUX zbar-0.23.1_fix_unittest.patch 2703 BLAKE2B fcbde8262803be3a009a93d052d6866998ca0a214a64f0c2989ded4925394c3cc78755b539defd0560dbc01e318f12a89b16a6065e028eec58db16d58a8bdcb5 SHA512 cc867bcb92094edb94dc699c0929547dd7bf08f71579605b4817e1068da55e0c2455655e535fc560375c773c158f50a79f77846ef06a3566a0deec22a459e120
-AUX zbar-0.23.1_musl_include_locale_h.patch 512 BLAKE2B 9f675b24aecd0a65ef3a2d41731594c10b1086abbfac649b6eeca1ba873c1b54d8287bebb48b2119aa0638d60228f25714f7a1811f7645930bc003395489ca3e SHA512 6addf046928db5743cc58ec67aad891c199f9d839198181cfbf57912cc0780f53fdac9fa15b25e1ffd17cf0aaf74318094f3283facdff2fa259285a5bc2bb957
-AUX zbar-0.23.1_python_tp_print.patch 1671 BLAKE2B e7d869e64879fb77151b1e8d668659ed1b5ca8061a8b2d3f2bde1bd5ef3384dec208e5f43f6e326c173634e017dd1261ba1d725a68f7a3c5f384e5a2a84bae26 SHA512 67e87f27dd9149e5cf9503613d3458dff5a3fd97084858f5ca88335c5053e7eb9b000cdec215d7b38bf9dd344b2dd9c310de320c60fc308de0ff7c411dcbcb35
 AUX zbar-0.23.90-fix-gtk-default.patch 1222 BLAKE2B 5d7bb46e1d1eafa34c75818bce154dc54528f88140d7959c0e1849c01189dd7e2019d0b1c9b254662c408eee05acc3ccc2f1d26387096745005a34bddae2a2fa SHA512 a7c2f51bde791fbf906a6226af067065dce71efe942d1c26e62ac1005577d05574fb96c4e15ed394b12acec0ca2b225aa4a97c29d59ddb305c2ff076c61fdc48
 AUX zbar-0.23.90-fix-qt5x11extras-detect.patch 641 BLAKE2B ec0b86a83a149ef2a62585ea8a4db088e5fdc63ed28ff57f358b30372dff86b898364e6c0983a689efbbd6a4df82bc9764dc2dedf1f6beb68dcc1852336bce1b SHA512 5ca82734a32d12ac2aa451cba87081f44df46a4a9afc5ff8a60adf59cce30dbdca06866313b1a511c778e690f6e40994f22e868a7a9d098d69e4c62a9b26a004
 AUX zbar-0.23.90-fix-unittest.patch 2711 BLAKE2B 58d1bbebf60bb9533a7c2b40a29afa7e8229b79a925ebcd05e26c3a67c2144173baedc31f0d92d0341c51ccfb3763e95840ce2073012e7b61a0f252287d5d6b4 SHA512 cc5aaef37155ad72d6b72e05c2f53523268e15b84f573117e780e3f39cc4df3981d080558db83d0fb52d2daa47beeaab4f194e4f912e732648ac4c5bc683e11d
-AUX zbar-0.23_fix_Qt5X11Extras_detect.patch 643 BLAKE2B 27485c866503189670424eaf81a0a9b6aefa284576789ba6533af03cb1af59a2c531f22e09adcc8e2b9b6418f861f8b96a1bf602502d0e863ae9785ac2d336c7 SHA512 ee40586c64ded170e314ee2961588518234e22d9cee9e9a55f994231cd50b120e82225c551c5a2e85988de1c14a5c0baf6303fffea0663e2e4808df3a0c8421a
 AUX zbar-0.23_fix_python_detect.patch 351 BLAKE2B d5261e9adb3c9b43f1208a41a655718b952d06ce0ec003bb08bf30979d6c467b2b50e6fb9a6cd06f95230ed4ae55e14599c276f9f41f03677b4d18167c6665c4 SHA512 d24d75f840d84488986cede3378e067ac68d218acac34a8c34888c88611df8f4b1b397cfd5ecfcda82480fd56ea2bada29d8373cc6e93ae8050b84e801c36ca7
-DIST zbar-0.23.1.tar.gz 1019268 BLAKE2B 5aa8725a0945b6f50eb78bb7b8a61e5b46356b18f07e8af778a63d46b94c894d9e827ed71bd89060898ecbdaebc5b4bb6e638939d7bc0dede390f7137770049f SHA512 ae7741cf750a10cf53dc11abcd482c3885507153ee37f6e3364ed5ed72184ebb009560b8c40d8090603a551fb681700a962838a59ce77d005d080ee49fbfa54b
 DIST zbar-0.23.90.tar.gz 1005314 BLAKE2B 5d0c193509602dfb55741b421e1d28f1424ecec50aa3be584912544a587922c053284c41cf14ff0b4824095d0d376381ed055e7faf9ff394bd8d44fd9ed2971d SHA512 d73d71873bec68ee021997512a9edbd223f5f5fe43c66c4dd3502224ba6009be2e5e1714766cb8e1056244673e87e0939ed0319116f61d7371b5ab79fb5e04eb
-EBUILD zbar-0.23.1.ebuild 5372 BLAKE2B f9dc36d7e2418baf676c04b565581800750d3da8aaf830a21b1445358522b391f7a22a8b06c76c171402a79ef3a94763316c134cdf6d8fdf5d02d3f34833677b SHA512 41142df60af20c0a6e83731f029c2e77f8b9b2a046f1ac9f52a0c97209fb35441101182a1f18d122ec6a7185681470a8327cba0efd5b8993339a3028494d4275
 EBUILD zbar-0.23.90.ebuild 5281 BLAKE2B 34bd1339b94f540bbcb53581fad678514437d6e9f60da233a6ab8e06a61035358641913062e61c81ebad7960aa86e018da0338c8d080fbadf5c4738c5ef91208 SHA512 aa351ab9b6dac1787e8dd21cd0406a6e3fb64e36e30c773c2d06a95dfa52b52d9f477fef2be40a28e7f1a7747230ed6f456365e1c266b0a637f2b53de7710b17
 MISC metadata.xml 738 BLAKE2B a5f5f0f157f7339f3dd39dde18b79427b35c6ce0b079b1ed03a0f2de821bc14f3a9c76fbd68bfd836444a4750a604be0012e4501207e75dfe4fc39aef7e65827 SHA512 334a091fc54d950a8b3e7572af7ae9766d20fd0d49aaa9fd18f5ea75966b45a53a861e290bcf9ca0fd8cc160cba669185aa01a9c8e77a585f2cb84d10f3b1e80
diff --git a/media-gfx/zbar/files/zbar-0.23.1-autoconf-2.70.patch b/media-gfx/zbar/files/zbar-0.23.1-autoconf-2.70.patch
deleted file mode 100644
index be9547ead111..000000000000
--- a/media-gfx/zbar/files/zbar-0.23.1-autoconf-2.70.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://github.com/mchehab/zbar/commit/89e7900d85dd54ef351a7ed582aec6a5a5d7fa37
-https://bugs.gentoo.org/775656
-
-From 89e7900d85dd54ef351a7ed582aec6a5a5d7fa37 Mon Sep 17 00:00:00 2001
-From: Boyuan Yang <byang@debian.org>
-Date: Thu, 31 Dec 2020 12:56:26 -0500
-Subject: [PATCH] configure.ac: Fix quote issue (autoconf 2.70 compat)
-
-One of the AS_IF() macro was not properly quoted. This commit
-fixes that issue.
-
-This patch closes: #132 (fixes this bug report).
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index df0220a8..db4bc902 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -656,7 +656,7 @@ AS_IF([test "x$with_qt" != "xno"],
- 					    [with_qt="no"])])])
- 
- AS_IF([test "x$with_qt" != "xno"],
--   AS_IF([test "x$with_qt5" != "xno"],
-+   [AS_IF([test "x$with_qt5" != "xno"],
-     [AC_CHECK_PROGS(MOC, [moc-qt5 moc])
-      AC_MSG_NOTICE([using moc from $MOC])
-      QT_VERSION=`$PKG_CONFIG Qt5Gui --modversion`
-@@ -672,7 +672,7 @@ dnl -fPIC has no effect on Windows and breaks windres
-      QT_VERSION=`$PKG_CONFIG QtGui --modversion`
-      AC_MSG_NOTICE([using Qt version $QT_VERSION])
-      qt_pkgconfig_file="zbar-qt.pc"
--     ]))
-+     ])])
- 
- AM_CONDITIONAL([HAVE_QT], [test "x$with_qt" = "xyes"])
- 
diff --git a/media-gfx/zbar/files/zbar-0.23.1_fix_leftover_on_shell_compatibility.patch b/media-gfx/zbar/files/zbar-0.23.1_fix_leftover_on_shell_compatibility.patch
deleted file mode 100644
index 62993a8b2b25..000000000000
--- a/media-gfx/zbar/files/zbar-0.23.1_fix_leftover_on_shell_compatibility.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 8e74a2e223bd40e8cf95ac2580df56ac8500a859 Mon Sep 17 00:00:00 2001
-From: Boyuan Yang <byang@debian.org>
-Date: Wed, 22 Apr 2020 10:29:39 -0400
-Subject: [PATCH] configure.ac: Fix leftover on shell compatibility
-
-Uses "=" instead of "==" in string comparision for POSIX
-compatibility.  This is a leftover of previous similar fix.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 105da09..df0220a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -845,7 +845,7 @@ dnl summary log
- echo ""
- echo "please verify that the detected configuration matches your expectations:"
- echo "------------------------------------------------------------------------"
--AS_IF([test "x$USE_NLS" == "xyes"],
-+AS_IF([test "x$USE_NLS" = "xyes"],
-   [echo    "gettext                $USE_NLS"]
- )
- AS_IF([test "x$win32" != "xno"],
diff --git a/media-gfx/zbar/files/zbar-0.23.1_fix_unittest.patch b/media-gfx/zbar/files/zbar-0.23.1_fix_unittest.patch
deleted file mode 100644
index 3f538c81138f..000000000000
--- a/media-gfx/zbar/files/zbar-0.23.1_fix_unittest.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -ur a/configure.ac b/configure.ac
---- a/configure.ac	2020-04-21 00:09:21.000000000 +0300
-+++ b/configure.ac	2020-04-23 16:53:06.654339488 +0300
-@@ -336,6 +336,14 @@
-   AC_SUBST(DBUS_CONFDIR)
- ])
- 
-+dnl zbarimg tests
-+AC_ARG_WITH([zbarimg_tests],
-+  [AS_HELP_STRING([--without-zbarimg-tests],
-+    [disable tests for zbarimg])],
-+  [],
-+  [with_zbarimg_tests="yes"])
-+AM_CONDITIONAL([HAVE_ZBARIMG_TESTS], [test "x$with_zbarimg_tests" = "xyes"])
-+
- dnl libjpeg
- AC_ARG_WITH([jpeg],
-   [AS_HELP_STRING([--without-jpeg],
-@@ -724,25 +732,12 @@
- 
- AC_ARG_VAR([CLASSPATH], [Java class path (include JUnit to run java tests)])
- AS_IF([test "x$CLASSPATH" = "x"], [CLASSPATH="."])
-+AC_SUBST(CLASSPATH)
- 
--dnl Search for Java unit test library
--AS_IF([test -z "$JUNIT_HOME"],
--      [JUNIT_HOME="/usr/share/java"])
--
--AS_IF([test -f "$JUNIT_HOME/junit4.jar"],
--      [JUNIT="$JUNIT_HOME/junit4.jar"],
--      [AS_IF([test -f "$JUNIT_HOME/junit.jar"],
--	    [JUNIT="$JUNIT_HOME/junit.jar"])])
--
--AS_IF([test "x$JUNIT" != "x"],
--      [AS_IF([test -f "/usr/share/java/hamcrest/all.jar"],
--	     [CLASSPATH="$JUNIT:/usr/share/java/hamcrest/all.jar:$CLASSPATH"
--              AC_SUBST(CLASSPATH)
--              with_java_unit="yes"])],
--      [AS_IF([test -f "/usr/share/java/hamcrest-all.jar"],
--             [CLASSPATH="$JUNIT:/usr/share/java/hamcrest-all.jar:$CLASSPATH"
--              AC_SUBST(CLASSPATH)
--              with_java_unit="yes"])])
-+AC_ARG_WITH([java_unit],
-+  [AS_HELP_STRING([--without-java-unit],
-+    [Enable java unittest])],
-+  [with_java_unit="yes"])
- 
- AM_CONDITIONAL([HAVE_JAVA_UNIT], [test "x$with_java_unit" = "xyes"])
- 
-@@ -905,6 +900,8 @@
-   [echo "        => the Java interface will *NOT* be built"])
- AS_IF([test "x$with_java_unit" != "xyes"],
-   [echo "        => the Java unit test will *NOT* be enabled"])
-+AS_IF([test "x$with_zbarimg_tests" != "xyes"],
-+  [echo "        => zbarimg tests will *NOT* be enabled"])
- #echo "NPAPI Plugin     --with-npapi=$with_npapi"
- #AS_IF([test "x$with_mozilla" != "xyes"],
- #  [echo "       => the Mozilla/Firefox/OpenOffice plugin will *NOT* be built"])
-diff -ur a/test/Makefile.am.inc b/test/Makefile.am.inc
---- a/test/Makefile.am.inc	2020-04-21 00:09:21.000000000 +0300
-+++ b/test/Makefile.am.inc	2020-04-23 17:03:07.819999370 +0300
-@@ -91,11 +91,16 @@
- regress-decoder: test/test_decode
- 	@abs_top_builddir@/test/test_decode -q -n 100000
- 
-+if HAVE_ZBARIMG_TESTS
- check-images-py: zbarimg/zbarimg
- 	@PYTHON@ @abs_top_srcdir@/test/barcodetest.py
- 
- check-images: zbarimg/zbarimg
- 	@abs_top_builddir@/test/test_examples.sh
-+else
-+check-images-py:
-+check-images:
-+endif
- 
- check-convert: test/test_convert
- 	@abs_top_srcdir@/test/test_convert
diff --git a/media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch b/media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch
deleted file mode 100644
index 916dee61d431..000000000000
--- a/media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://github.com/mchehab/zbar/pull/115
---- a/zbarcam/zbarcam.c
-+++ b/zbarcam/zbarcam.c
-@@ -37,6 +37,7 @@
- #ifdef ENABLE_NLS
- #include "../zbar/gettext.h"
- # include <libintl.h>
-+# include <locale.h>
- # define _(string) gettext(string)
- #else
- # define _(string) string
---- a/zbarimg/zbarimg.c
-+++ b/zbarimg/zbarimg.c
-@@ -42,6 +42,7 @@
- #ifdef ENABLE_NLS
- #include "../zbar/gettext.h"
- # include <libintl.h>
-+# include <locale.h>
- # define _(string) gettext(string)
- #else
- # define _(string) string
--- 
-2.26.2
diff --git a/media-gfx/zbar/files/zbar-0.23.1_python_tp_print.patch b/media-gfx/zbar/files/zbar-0.23.1_python_tp_print.patch
deleted file mode 100644
index 8d4d821426d2..000000000000
--- a/media-gfx/zbar/files/zbar-0.23.1_python_tp_print.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 938d39716488b545b92c28f48acc94a7b8fc9138 Mon Sep 17 00:00:00 2001
-From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
-Date: Tue, 28 Jul 2020 10:27:30 +0200
-Subject: [PATCH] python: enum: make it compatible with Python 3.9
-
-As reported by:
-	https://github.com/mchehab/zbar/issues/92
-
-python bindings don't build with Python 3.9, because it is
-using tp_print, which has been silently ignored since Python
-3.0, according with[1]:
-
-	"The tp_print slot of PyTypeObject has been removed.
-	 It was used for printing objects to files in Python 2.7
-	 and before.
-	 Since Python 3.0, it has been ignored and unused."
-
-[1] https://docs.python.org/3.9/whatsnew/3.9.html#id3
-
-Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
----
- python/enum.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/python/enum.c b/python/enum.c
-index a1135531..dfe1b1ef 100644
---- a/python/enum.c
-+++ b/python/enum.c
-@@ -76,6 +76,8 @@ enumitem_str (zbarEnumItem *self)
-     return(self->name);
- }
- 
-+#if PY_MAJOR_VERSION < 3
-+/* tp_print was dropped on Python 3.9 */
- static int
- enumitem_print (zbarEnumItem *self,
-                 FILE *fp,
-@@ -83,6 +85,7 @@ enumitem_print (zbarEnumItem *self,
- {
-     return(self->name->ob_type->tp_print(self->name, fp, flags));
- }
-+#endif
- 
- static PyObject*
- enumitem_repr (zbarEnumItem *self)
-@@ -115,7 +118,9 @@ PyTypeObject zbarEnumItem_Type = {
-     .tp_new         = (newfunc)enumitem_new,
-     .tp_dealloc     = (destructor)enumitem_dealloc,
-     .tp_str         = (reprfunc)enumitem_str,
-+#if PY_MAJOR_VERSION < 3
-     .tp_print       = (printfunc)enumitem_print,
-+#endif
-     .tp_repr        = (reprfunc)enumitem_repr,
- };
- 
diff --git a/media-gfx/zbar/files/zbar-0.23_fix_Qt5X11Extras_detect.patch b/media-gfx/zbar/files/zbar-0.23_fix_Qt5X11Extras_detect.patch
deleted file mode 100644
index 7692db41e0da..000000000000
--- a/media-gfx/zbar/files/zbar-0.23_fix_Qt5X11Extras_detect.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur a/configure.ac b/configure.ac
---- a/configure.ac	2019-05-23 23:37:12.000000000 +0300
-+++ b/configure.ac	2020-01-22 12:27:14.190755156 +0300
-@@ -638,13 +638,9 @@
- 
- AC_ARG_VAR([MOC], [full path to Qt moc program])
- 
--AS_IF([test "x$have_x" = "xyes"],
--      [qt_extra="Qt5X11Extras >= 5.0"],
--      [qt_extra=""])
--
- AS_IF([test "x$with_qt" != "xno"],
-       [PKG_CHECK_MODULES([QT],
--		         [Qt5Core >= 5 Qt5Gui >= 5 Qt5Widgets >= 5.0 $qt_extra],,
-+		         [Qt5Core >= 5 Qt5Gui >= 5 Qt5Widgets >= 5.0 Qt5X11Extras >= 5.0],,
- 		         [with_qt5 = "no"
- 		          PKG_CHECK_MODULES([QT],
- 					    [QtCore >= 4 QtGui >= 4],,
diff --git a/media-gfx/zbar/zbar-0.23.1.ebuild b/media-gfx/zbar/zbar-0.23.1.ebuild
deleted file mode 100644
index 56e14bbc04eb..000000000000
--- a/media-gfx/zbar/zbar-0.23.1.ebuild
+++ /dev/null
@@ -1,229 +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} )
-
-inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 virtualx
-
-DESCRIPTION="Library and tools for reading barcodes from images or video"
-HOMEPAGE="https://github.com/mchehab/zbar"
-SRC_URI="https://github.com/mchehab/zbar/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg nls python qt5 static-libs test +threads v4l X xv"
-REQUIRED_USE="
-	introspection? ( gtk )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? (
-		${PYTHON_REQUIRED_USE}
-		X? ( imagemagick )
-	)
-	xv? ( X )"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	gtk? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-		introspection? ( dev-libs/gobject-introspection )
-	)
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:=[png,jpeg?] )
-		graphicsmagick? ( media-gfx/graphicsmagick:=[png,jpeg?] )
-	)
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-	)
-	v4l? ( media-libs/libv4l:0=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.8 )"
-
-DEPEND="${COMMON_DEPEND}
-	java? (
-		>=virtual/jdk-1.8
-		test? (
-			dev-java/hamcrest-core:1.3
-			dev-java/junit:4
-		)
-	)
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pillow[${PYTHON_USEDEP}]
-		')
-	)"
-
-BDEPEND="
-	app-text/xmlto
-	virtual/pkgconfig
-	gtk? ( dev-util/glib-utils )
-	nls? (
-		sys-devel/gettext
-		virtual/libiconv
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${P}_fix_leftover_on_shell_compatibility.patch"
-	"${FILESDIR}/${P}_fix_unittest.patch"
-	"${FILESDIR}/${P}_musl_include_locale_h.patch"
-	"${FILESDIR}/${PN}-0.23_fix_Qt5X11Extras_detect.patch"
-	"${FILESDIR}/${PN}-0.23_fix_python_detect.patch"
-	"${FILESDIR}/${P}-autoconf-2.70.patch"
-	"${FILESDIR}/${PN}-0.23.1_python_tp_print.patch"
-)
-
-DOCS=( README.md NEWS.md TODO.md HACKING.md TODO.md ChangeLog )
-
-pkg_setup() {
-	if use python || use test; then
-		python-single-r1_pkg_setup
-	fi
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if use python || use test; then
-		if use test; then
-			# make tests happy
-			# because one of the test requires loadable py module from the current ${BUILD_DIR}
-			sed -e "s|PYTHONPATH=@abs_top_srcdir@|PYTHONPATH=@builddir@|g" \
-				-i test/Makefile.am.inc || die
-		fi
-
-		python_fix_shebang \
-			examples/*.py \
-			test/{test_python,barcodetest}.py # test_pygtk.py — py2 only
-	fi
-
-	if use java; then
-		java-pkg-opt-2_src_prepare
-		sed -e "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
-			-i java/Makefile.am || die
-	fi
-
-	# do not install {LICENSE,INSTALL,etc} doc files with 'make install' (use DOCS=() instead)
-	sed -e "s|^dist_doc_DATA =\(.*\)|dist_doc_DATA =|" -i Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	append-cppflags -DNDEBUG
-
-	local myeconfargs=(
-		$(use_with dbus)
-		$(use_with gtk gtk gtk3) # default is gtk2
-		$(use_with jpeg)
-		$(multilib_native_use_with introspection gir)
-		$(multilib_native_use_with java)
-		$(multilib_native_use_with python python auto)
-		$(use_enable nls)
-		$(use_enable static-libs static)
-		$(use_enable threads pthread)
-		$(use_enable v4l video)
-		$(use_with X x)
-		$(use_with X xshm)
-		$(use_with xv xv)
-	)
-
-	if multilib_is_native_abi; then
-		# both must be enabled to use GraphicsMagick
-		if use graphicsmagick; then
-			myeconfargs+=(
-				--with-graphicsmagick
-				--without-imagemagick
-			)
-		elif use imagemagick; then
-			myeconfargs+=(
-				--with-imagemagick
-				--without-graphicsmagick
-			)
-		else
-			myeconfargs+=(
-				--without-imagemagick
-				--without-graphicsmagick
-			)
-		fi
-
-		if use java; then
-			export JAVACFLAGS="$(java-pkg_javac-args)"
-			append-cflags "$(java-pkg_get-jni-cflags)"
-			if use test; then # bug 629078
-				myeconfargs+=( --with-java-unit )
-				java-pkg_append_ CLASSPATH .
-				java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only junit-4 junit.jar)
-				java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)
-			fi
-		fi
-
-		if use qt5; then
-			myeconfargs+=(
-				--with-qt
-				--with-qt5
-			)
-		else
-			myeconfargs+=( --without-qt )
-		fi
-	else
-		myeconfargs+=(
-			--without-graphicsmagick
-			--without-imagemagick
-			--without-qt
-		)
-
-		# zbarimg tests with native abi only
-		# (this option from the patch above, stay up to date)
-		use test && myeconfargs+=( --without-zbarimg-tests )
-	fi
-
-	# use bash (bug 721370)
-	CONFIG_SHELL='/bin/bash' \
-	ECONF_SOURCE="${S}" \
-		econf "${myeconfargs[@]}"
-
-	# work around out-of-source build issues for multilib systems (bug 672184)
-	mkdir qt zbarcam || die
-}
-
-src_test() {
-	virtx multilib-minimal_src_test
-}
-
-src_install() {
-	if use qt5; then
-		local MULTILIB_WRAPPED_HEADERS=(
-			/usr/include/zbar/QZBar.h
-			/usr/include/zbar/QZBarImage.h
-		)
-	fi
-	multilib-minimal_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	use java && java-pkg-opt-2_pkg_preinst
-}
author	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
committer	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
commit	752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree	330d16e6362a49cbed8875a777fe641a43376cd3 /media-gfx
parent	0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)