gentoo resync : 13.11.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-11-13 13:10:00 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-11-13 13:10:00 +0000
commit: e9d044d4b9b71200a96adfa280848858c0f468c9 (patch)
tree: 1bd8ef816043a8cd340f1d774e79553a1a7d31d8 /media-gfx
parent: fc2f1018fc323ef2c6572734a9b130427cba76a6 (diff)
44 files changed, 295 insertions, 1676 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 6a801727cedd..498342956f09 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 83c89aad0f1f..deabbe10d054 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,18 +1,7 @@
-AUX blender-2.83.13-ffmpeg-4_4.patch 1102 BLAKE2B e035eab495dbbfc539f852619775f0be6c35cc3b120060fcea9839911404d2c2c11e54cacfd5dd1a4ef531f9ebff478ff7af3f3e35b387f1970dce9cb5063cc5 SHA512 28ad54493bb5385b9c116c349ffe2002997f88a70e1f30548ff57c9052fbb1398efcc82d031c3dbfd6cefdbdb8e24ada545ac5fd0717bdfb1be59b9928859299
-AUX blender-2.83.6-constraints_test.patch 706 BLAKE2B 13f31c98b537a09807fcd9bf7ca6033ebb6db36690fe08c71df726d67468eb747e9817306d434ec8b007f158b7670f00de6ac16a2d9c693d054627632c2eeb64 SHA512 96a660878dd65ea00bd263bd022d3c4b95a4c2dd5533d6bae55c87294296e794fa4e0a16f341d666ef62a2c09bef06fa4dc262792222a80b12e39e394bc2403f
-AUX blender-2.83.6-fix_opevdb_abi.patch 587 BLAKE2B 90f22c522f2626442b68e2cb89e6129988a66d5c775d4eaaa217be0b424ec5f2ce1f72eae277e0fad5d8f979b75d0b4a4c1c4956c16793339b0455ea30a8346b SHA512 08c452e1d05aca8c67aeb925388f23f1f2c3ebad3efe501f9c69758a70dfdd8132575e344012ae2a468d0ad7330d820bc8c77df61c38c42b0e97befaf8eec705
-AUX blender-2.83.6-libmv_eigen_alignment.patch 6777 BLAKE2B 5a7cc33dc599a58f15fcda2110d1c7be9dd3bab4427f5f0ab09a5645248e4585b4e183dcd38e5a39b0827a8ef529e74e59126bc7dcecf2c208b428b5ad264e26 SHA512 8b52ab1bdeaa585b2211aa4b3e9e9c2384867e4011ac20cc1fa712b3c8823c5f42359d5728a094e509a7f40cc166f308cd020da1d35f9e2b0bc20e7bb7e5a461
-DIST blender-2.83.1-tests.tar.bz2 266633785 BLAKE2B 8d8102c3107480de95dfd9ef9dabba1cd82893aad553af2ff5ef1afadc831dc5ccf5553c41466511ecb2a1435bc79c936ad64a78bdd4375e3e30af85b69807c6 SHA512 3ffba6fa8401bba3e2bdbccf7067761114d516371c7778a2f6604a243fd8610e26a30b88a32728c26f7e6274182d298752f32b5e76abf8216be0ec4b3ce38cd9
-DIST blender-2.83.15.tar.xz 39125740 BLAKE2B 687097b45b76b474b1c172c9b8ccf5da1bfc24539d0db894d04c7837572b16c1f552757fd1482219d58afa56c573229878fb43bbecd95e3d61314f2ab05efafa SHA512 2836533691bae0a7942197e67232b396b892cd95c0f07ab561f7de8458b354fe4045453855585484dd533ae76588ea3888f880763b042a264fb813a43933fc25
-DIST blender-2.83.16.tar.xz 39135184 BLAKE2B 2515822373f6a9343c760ad656de732094ee58a9354423e0f3d7bf1042220fc54af7e1d9f5b59a170a23e8b1b57a4b7f09867a000a57a6e4e820ff5c6cdd47b6 SHA512 ef78278387ae981972942ee4724abcb11ca19da2b88a3c8bbe1e9aafb93f28d84d4c79d01542e11218bd58bfec80fcfdbffdfd28896d146edd34181a7439dbd5
-DIST blender-2.83.17.tar.xz 39128468 BLAKE2B 3a20f6125f94e0d6de4d78e7a784c5a37faf23603e055a28ee67e48a41d09d3715222b2ac4f04ed38619dca686e7e0985ad60c983ee3a15c96042e419f152e69 SHA512 1e4c9a1f604802fb94c8e844f3878756e2ba0a6c29a6fb8863bc21ada1c8e14e775b203ab21bc4d53e85eb4e909e889204bb9f5befcff56cec3d56c2e987c2a0
 DIST blender-2.93.0-tests.tar.bz2 286918586 BLAKE2B a2c2c2e900e401a470208e8e5d0082d45e2f8db13b45213f31808d50ae5ea330360702b8e775bdb3307eb753aa7c3264803e9e470b3fb778f8bd87272cd72513 SHA512 0e5e4c67944c4f76df62cdbaf26ba284c415675074e66685c01ec9584a544c47f616bae8fb2ff2b7e03290620d54dc1033b4b0fc617acb1232a90439e96325fe
 DIST blender-2.93.0.tar.xz 42967016 BLAKE2B 1e7b54f08415de8a8908a285ae35c1e18558bf7cab42c5c135323d10ac9a73ec69aa0addd536355a4d19262438a615e03f09dc123b697cbab484e33350bb5ee3 SHA512 660962e5368c8ff52ed095aba97d63c22aa8e2fdcb2042b1299b6d6edeb7eb1f702a9ee95ee7e47824681f9f48b971d2e32ec32cc6264165a4196b5f36c4a66d
 DIST blender-2.93.1.tar.xz 42960100 BLAKE2B eda0a8c0414d1f7c89d21e34ba238b0cbe337ea755d6f10792e7c3bd5e15934184d3bd853ed636764776095ce1e3f081d63386b7c13fb7ac666580bf9eeb43c8 SHA512 b14e8cca248c53e4a93976d7fa1cd1ab92a7d18a3809b2a535881731aad2f68d8d155ad175b27aa1890714b81aa6648604a614cacc90e95b7269569661e393b1
 DIST blender-2.93.2.tar.xz 43028440 BLAKE2B 02ffc5be190445c97e3cb14e4635969df7a7aaf0100ee5ba50f2d283b077ffebf1f139aec86034ed2df03d94290d5a8bb369f88c734db5103869ffa1d3f588a6 SHA512 5dac627b0e5f38af1f861d4fddb01f4ba1e992c704337c56e2ebbfdcbd62e6de83195e3541342603a1ae966e89a06ff98764c817e282401edd792857d577b989
-EBUILD blender-2.83.15-r1.ebuild 11659 BLAKE2B eed6e7e609c6e1184541bfeb8c318a40793f9c33983b158b107c4dfeec30a5b1c0da7049799d58d65bac01d4069e92f1c3e0c8c92be82b503067f7a3b763326e SHA512 a26bf43c05b89fe648ae96fdfb2f9a80bc1a67fca5a9deb13f06ffbc0376c4ab4a960d1ae176500dfda4c1148792e76568ecb4eddf39426f279b47f1fe9828c4
-EBUILD blender-2.83.16-r1.ebuild 11660 BLAKE2B cc7fe1970a21f4c0d4c6a3cd5b4e1229cc80cd205e44edbdad137f4b7be173f5615014d1181a2f2f66fd86b6ba7e1a56bb627f645ca5a552a8d7327451a79054 SHA512 6471c4f4c8006e046eebdd8da3e2696053c6fdf380f7297f0724794cdb7212b8edd7cf16f945a619be4db2b74315f4556121c671efdaa1ca072b6e03feb4a5e5
-EBUILD blender-2.83.17-r1.ebuild 11624 BLAKE2B 1a5ba28affb5519563638f641021a87377ee6d0fbff6d433243649452fe22265c751b34a74fc65ba30af7d886362f873a44b4d99a39d96dd612e82eed6865eb7 SHA512 a2741c7721020d3003cbac6df0e832efe083990f5dcb4227c7b586ce96bf149596ad07dd624df0d848f4657effbc82732721cff87c8fcdb39a1582c815d668b2
 EBUILD blender-2.93.0-r1.ebuild 11815 BLAKE2B a7edc0c52fba0b9ebec6852aa84c264b28e4e2984ff47baf9d4117723d6a32634c976f4d80d0bd785a6d07b2fc08e6973d53f062505d3043eb7d56ca777acb73 SHA512 2eeae0099f41d11175502f000eb35a41f0351d358d9248f955168932cbfcfade48953a0c68456d3c75950d009f388ddebd8386368c274d3dc86ca820a1f09a7b
 EBUILD blender-2.93.1-r1.ebuild 11816 BLAKE2B 1044606914a9aa1f8bd00011addc31f71c3c9bed34e7b5215f4c15182fcfb895e248be3d55cbfc3d49ffea7a6212f38f232c410bf19c1634f3b1ef0c1392dd7a SHA512 b6ffc38f300260a66917c3507762e9830f6fbc0098e3f47c23e9d506ec201511aace83010c6213cc304c3643b63039ec54f3f7cbd9bc076383b0e3d6c1232419
 EBUILD blender-2.93.2-r1.ebuild 11833 BLAKE2B 70435289cbde457dc6dd5cf6c8f0ecdaeecd5e44bb9afda6c0f36b75d9cadfb03dc72f2c31a013c34a0fdc7bdb5319a348dd6a9be282821af2479e62dda30a7f SHA512 6deb41bcf414687a2f2243eb24b8a4106c62df8b81c2286f820e95410cf7103b724d959eab43e927a871f77d2a9cfa682cffb41642a9c082f5179f9941baf779
diff --git a/media-gfx/blender/blender-2.83.15-r1.ebuild b/media-gfx/blender/blender-2.83.15-r1.ebuild
deleted file mode 100644
index 6175ce975261..000000000000
--- a/media-gfx/blender/blender-2.83.15-r1.ebuild
+++ /dev/null
@@ -1,380 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-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
-	inherit git-r3
-	EGIT_REPO_URI="https://git.blender.org/blender.git"
-else
-	SRC_URI="https://download.blender.org/source/${P}.tar.xz"
-	TEST_TARBALL_VERSION=2.83.1
-	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2 )"
-	KEYWORDS="amd64 ~x86"
-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 ffmpeg fftw headless jack jemalloc jpeg2k \
-	man ndof nls openal opencl openimageio openmp opensubdiv \
-	openvdb osl sdl sndfile standalone test tiff valgrind"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	alembic? ( openexr )
-	cuda? ( cycles )
-	cycles? ( openexr tiff openimageio )
-	fluid? ( tbb )
-	opencl? ( cycles )
-	openvdb? ( tbb )
-	osl? ( cycles )
-	standalone? ( cycles )
-	test? ( color-management osl )"
-
-# 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}]
-	')
-	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.7.12[boost(+),hdf(+)] )
-	collada? ( >=media-libs/opencollada-1.6.68 )
-	color-management? ( <media-libs/opencolorio-2.0.0 )
-	cuda? ( dev-util/nvidia-cuda-toolkit:= )
-	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k,vpx,vorbis,opus,xvid] )
-	fftw? ( sci-libs/fftw:3.0= )
-	!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 )
-	opencl? ( virtual/opencl )
-	openimageio? ( >=media-libs/openimageio-2.2.13.1:= )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
-	)
-	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] )
-	openvdb? (
-		>=media-gfx/openvdb-7.0.0
-		dev-libs/c-blosc:=
-	)
-	osl? ( <media-libs/osl-1.11.0 )
-	sdl? ( media-libs/libsdl2[sound,joystick] )
-	sndfile? ( media-libs/libsndfile )
-	tbb? ( <dev-cpp/tbb-2021.4.0:= )
-	tiff? ( media-libs/tiff )
-	valgrind? ( dev-util/valgrind )
-"
-
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:=
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		dev-python/sphinx[latex]
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
-	"${FILESDIR}/blender-2.83.6-libmv_eigen_alignment.patch"
-	"${FILESDIR}/blender-2.83.6-constraints_test.patch"
-	"${FILESDIR}/blender-2.83.6-fix_opevdb_abi.patch"
-	"${FILESDIR}/blender-2.83.13-ffmpeg-4_4.patch"
-)
-
-blender_check_requirements() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
-	if use doc; then
-		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
-	fi
-}
-
-blender_get_version() {
-	# Get blender version from blender itself.
-	BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert)
-	# Add period.
-	BV=${BV:0:1}.${BV:1}
-}
-
-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
-	else
-		default
-	fi
-
-	if use test; then
-		mkdir -p lib || die
-		mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die
-	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|blender-thumbnailer.py|blender-${BV}-thumbnailer.py|" -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
-	mv release/bin/blender-thumbnailer.py release/bin/blender-${BV}-thumbnailer.py || 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() {
-	# Without this the floating point math will differ when for example
-	# "-march=native" is set. This will make automated tests fail and we will
-	# not match the behaviour of some operators/modifiers with the official
-	# builds.
-	append-flags -ffp-contract=off
-	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_DEVICE_CUDA=$(usex cuda TRUE FALSE)
-		-DWITH_CYCLES=$(usex cycles)
-		-DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl)
-		-DWITH_CYCLES_STANDALONE=$(usex standalone)
-		-DWITH_CYCLES_STANDALONE_GUI=$(usex standalone)
-		-DWITH_CYCLES_OSL=$(usex osl)
-		-DWITH_DOC_MANPAGE=$(usex man)
-		-DWITH_FFTW3=$(usex fftw)
-		-DWITH_GTESTS=$(usex test)
-		-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_OPENAL=$(usex openal)
-		-DWITH_OPENCOLLADA=$(usex collada)
-		-DWITH_OPENCOLORIO=$(usex color-management)
-		-DWITH_OPENIMAGEIO=$(usex openimageio)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_OPENSUBDIV=$(usex opensubdiv)
-		-DWITH_OPENVDB=$(usex openvdb)
-		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
-		-DWITH_PYTHON_INSTALL=$(usex system-python OFF ON)
-		-DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON)
-		-DWITH_SDL=$(usex sdl)
-		-DWITH_STATIC_LIBS=OFF
-		-DWITH_SYSTEM_EIGEN3=ON
-		-DWITH_SYSTEM_GLEW=ON
-		-DWITH_SYSTEM_LZO=ON
-		-DWITH_TBB=$(usex tbb)
-		-DWITH_USD=OFF
-	)
-	if ! use debug ; then
-		append-flags  -DNDEBUG
-	else
-		append-flags  -DDEBUG
-	fi
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		# Workaround for binary drivers.
-		addpredict /dev/ati
-		addpredict /dev/dri
-		addpredict /dev/nvidiactl
-
-		einfo "Generating Blender C/C++ API docs ..."
-		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
-		doxygen -u Doxyfile || die
-		doxygen || die "doxygen failed to build API docs."
-
-		cd "${CMAKE_USE_DIR}" || die
-		einfo "Generating (BPY) Blender Python API docs ..."
-		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
-
-		cd "${CMAKE_USE_DIR}"/doc/python_api || die
-		sphinx-build sphinx-in BPY_API || die "sphinx failed."
-	fi
-}
-
-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
-
-	# NOTE: The 'modifiers' test will fail if opensubdiv was compiled with -march=native
-	# This this is fixed in blender version 2.92 and up."
-	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
-
-	if use doc; then
-		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
-
-	cmake_src_install
-
-	if use man; then
-		# Slot the man page
-		mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die
-	fi
-
-	# Fix doc installdir
-	docinto html
-	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
-	rm -r "${ED}"/usr/share/doc/blender || die
-
-	python_fix_shebang "${ED}/usr/bin/blender-${BV}-thumbnailer.py"
-	python_optimize "${ED}/usr/share/blender/${BV}/scripts"
-
-	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
-
-	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 download"
-	elog "the official Blender LTS binary release instead."
-	elog "Bug: https://bugs.gentoo.org/737388"
-	elog
-
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-
-	ewarn ""
-	ewarn "You may want to remove the following directory."
-	ewarn "~/.config/${PN}/${SLOT}/cache/"
-	ewarn "It may contain extra render kernels not tracked by portage"
-	ewarn ""
-}
diff --git a/media-gfx/blender/blender-2.83.16-r1.ebuild b/media-gfx/blender/blender-2.83.16-r1.ebuild
deleted file mode 100644
index 6f64aaa0992f..000000000000
--- a/media-gfx/blender/blender-2.83.16-r1.ebuild
+++ /dev/null
@@ -1,380 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-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
-	inherit git-r3
-	EGIT_REPO_URI="https://git.blender.org/blender.git"
-else
-	SRC_URI="https://download.blender.org/source/${P}.tar.xz"
-	TEST_TARBALL_VERSION=2.83.1
-	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2 )"
-	KEYWORDS="~amd64 ~x86"
-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 ffmpeg fftw headless jack jemalloc jpeg2k \
-	man ndof nls openal opencl openimageio openmp opensubdiv \
-	openvdb osl sdl sndfile standalone test tiff valgrind"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	alembic? ( openexr )
-	cuda? ( cycles )
-	cycles? ( openexr tiff openimageio )
-	fluid? ( tbb )
-	opencl? ( cycles )
-	openvdb? ( tbb )
-	osl? ( cycles )
-	standalone? ( cycles )
-	test? ( color-management osl )"
-
-# 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}]
-	')
-	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.7.12[boost(+),hdf(+)] )
-	collada? ( >=media-libs/opencollada-1.6.68 )
-	color-management? ( <media-libs/opencolorio-2.0.0 )
-	cuda? ( dev-util/nvidia-cuda-toolkit:= )
-	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k,vpx,vorbis,opus,xvid] )
-	fftw? ( sci-libs/fftw:3.0= )
-	!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 )
-	opencl? ( virtual/opencl )
-	openimageio? ( >=media-libs/openimageio-2.2.13.1:= )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
-	)
-	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] )
-	openvdb? (
-		>=media-gfx/openvdb-7.0.0
-		dev-libs/c-blosc:=
-	)
-	osl? ( <media-libs/osl-1.11.0 )
-	sdl? ( media-libs/libsdl2[sound,joystick] )
-	sndfile? ( media-libs/libsndfile )
-	tbb? ( <dev-cpp/tbb-2021.4.0:= )
-	tiff? ( media-libs/tiff )
-	valgrind? ( dev-util/valgrind )
-"
-
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:=
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		dev-python/sphinx[latex]
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
-	"${FILESDIR}/blender-2.83.6-libmv_eigen_alignment.patch"
-	"${FILESDIR}/blender-2.83.6-constraints_test.patch"
-	"${FILESDIR}/blender-2.83.6-fix_opevdb_abi.patch"
-	"${FILESDIR}/blender-2.83.13-ffmpeg-4_4.patch"
-)
-
-blender_check_requirements() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
-	if use doc; then
-		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
-	fi
-}
-
-blender_get_version() {
-	# Get blender version from blender itself.
-	BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert)
-	# Add period.
-	BV=${BV:0:1}.${BV:1}
-}
-
-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
-	else
-		default
-	fi
-
-	if use test; then
-		mkdir -p lib || die
-		mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die
-	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|blender-thumbnailer.py|blender-${BV}-thumbnailer.py|" -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
-	mv release/bin/blender-thumbnailer.py release/bin/blender-${BV}-thumbnailer.py || 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() {
-	# Without this the floating point math will differ when for example
-	# "-march=native" is set. This will make automated tests fail and we will
-	# not match the behaviour of some operators/modifiers with the official
-	# builds.
-	append-flags -ffp-contract=off
-	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_DEVICE_CUDA=$(usex cuda TRUE FALSE)
-		-DWITH_CYCLES=$(usex cycles)
-		-DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl)
-		-DWITH_CYCLES_STANDALONE=$(usex standalone)
-		-DWITH_CYCLES_STANDALONE_GUI=$(usex standalone)
-		-DWITH_CYCLES_OSL=$(usex osl)
-		-DWITH_DOC_MANPAGE=$(usex man)
-		-DWITH_FFTW3=$(usex fftw)
-		-DWITH_GTESTS=$(usex test)
-		-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_OPENAL=$(usex openal)
-		-DWITH_OPENCOLLADA=$(usex collada)
-		-DWITH_OPENCOLORIO=$(usex color-management)
-		-DWITH_OPENIMAGEIO=$(usex openimageio)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_OPENSUBDIV=$(usex opensubdiv)
-		-DWITH_OPENVDB=$(usex openvdb)
-		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
-		-DWITH_PYTHON_INSTALL=$(usex system-python OFF ON)
-		-DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON)
-		-DWITH_SDL=$(usex sdl)
-		-DWITH_STATIC_LIBS=OFF
-		-DWITH_SYSTEM_EIGEN3=ON
-		-DWITH_SYSTEM_GLEW=ON
-		-DWITH_SYSTEM_LZO=ON
-		-DWITH_TBB=$(usex tbb)
-		-DWITH_USD=OFF
-	)
-	if ! use debug ; then
-		append-flags  -DNDEBUG
-	else
-		append-flags  -DDEBUG
-	fi
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		# Workaround for binary drivers.
-		addpredict /dev/ati
-		addpredict /dev/dri
-		addpredict /dev/nvidiactl
-
-		einfo "Generating Blender C/C++ API docs ..."
-		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
-		doxygen -u Doxyfile || die
-		doxygen || die "doxygen failed to build API docs."
-
-		cd "${CMAKE_USE_DIR}" || die
-		einfo "Generating (BPY) Blender Python API docs ..."
-		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
-
-		cd "${CMAKE_USE_DIR}"/doc/python_api || die
-		sphinx-build sphinx-in BPY_API || die "sphinx failed."
-	fi
-}
-
-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
-
-	# NOTE: The 'modifiers' test will fail if opensubdiv was compiled with -march=native
-	# This this is fixed in blender version 2.92 and up."
-	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
-
-	if use doc; then
-		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
-
-	cmake_src_install
-
-	if use man; then
-		# Slot the man page
-		mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die
-	fi
-
-	# Fix doc installdir
-	docinto html
-	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
-	rm -r "${ED}"/usr/share/doc/blender || die
-
-	python_fix_shebang "${ED}/usr/bin/blender-${BV}-thumbnailer.py"
-	python_optimize "${ED}/usr/share/blender/${BV}/scripts"
-
-	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
-
-	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 download"
-	elog "the official Blender LTS binary release instead."
-	elog "Bug: https://bugs.gentoo.org/737388"
-	elog
-
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-
-	ewarn ""
-	ewarn "You may want to remove the following directory."
-	ewarn "~/.config/${PN}/${SLOT}/cache/"
-	ewarn "It may contain extra render kernels not tracked by portage"
-	ewarn ""
-}
diff --git a/media-gfx/blender/blender-2.83.17-r1.ebuild b/media-gfx/blender/blender-2.83.17-r1.ebuild
deleted file mode 100644
index 6c6548cf0f7c..000000000000
--- a/media-gfx/blender/blender-2.83.17-r1.ebuild
+++ /dev/null
@@ -1,377 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_8 )
-
-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
-	inherit git-r3
-	EGIT_REPO_URI="https://git.blender.org/blender.git"
-else
-	SRC_URI="https://download.blender.org/source/${P}.tar.xz"
-	TEST_TARBALL_VERSION=2.83.1
-	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2 )"
-	KEYWORDS="~amd64 ~x86"
-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 ffmpeg fftw headless jack jemalloc jpeg2k \
-	man ndof nls openal opencl openimageio openmp opensubdiv \
-	openvdb osl sdl sndfile standalone test tiff valgrind"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	alembic? ( openexr )
-	cuda? ( cycles )
-	cycles? ( openexr tiff openimageio )
-	fluid? ( tbb )
-	opencl? ( cycles )
-	openvdb? ( tbb )
-	osl? ( cycles )
-	standalone? ( cycles )
-	test? ( color-management osl )"
-
-# 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}]
-	')
-	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.7.12[boost(+),hdf(+)] )
-	collada? ( >=media-libs/opencollada-1.6.68 )
-	color-management? ( <media-libs/opencolorio-2.0.0 )
-	cuda? ( dev-util/nvidia-cuda-toolkit:= )
-	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k,vpx,vorbis,opus,xvid] )
-	fftw? ( sci-libs/fftw:3.0= )
-	!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 )
-	opencl? ( virtual/opencl )
-	openimageio? ( >=media-libs/openimageio-2.2.13.1:= )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
-	)
-	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] )
-	openvdb? (
-		>=media-gfx/openvdb-7.0.0
-		dev-libs/c-blosc:=
-	)
-	osl? ( <media-libs/osl-1.11.0 )
-	sdl? ( media-libs/libsdl2[sound,joystick] )
-	sndfile? ( media-libs/libsndfile )
-	tbb? ( <dev-cpp/tbb-2021.4.0:= )
-	tiff? ( media-libs/tiff )
-	valgrind? ( dev-util/valgrind )
-"
-
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:=
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		dev-python/sphinx[latex]
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
-	"${FILESDIR}/blender-2.83.6-libmv_eigen_alignment.patch"
-	"${FILESDIR}/blender-2.83.6-constraints_test.patch"
-	"${FILESDIR}/blender-2.83.6-fix_opevdb_abi.patch"
-	"${FILESDIR}/blender-2.83.13-ffmpeg-4_4.patch"
-)
-
-blender_check_requirements() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
-	if use doc; then
-		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
-	fi
-}
-
-blender_get_version() {
-	# Get blender version from blender itself.
-	BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert)
-	# Add period.
-	BV=${BV:0:1}.${BV:1}
-}
-
-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
-	else
-		default
-	fi
-
-	if use test; then
-		mkdir -p lib || die
-		mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die
-	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|blender-thumbnailer.py|blender-${BV}-thumbnailer.py|" -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
-	mv release/bin/blender-thumbnailer.py release/bin/blender-${BV}-thumbnailer.py || 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() {
-	# Without this the floating point math will differ when for example
-	# "-march=native" is set. This will make automated tests fail and we will
-	# not match the behaviour of some operators/modifiers with the official
-	# builds.
-	append-flags -ffp-contract=off
-	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_DEVICE_CUDA=$(usex cuda TRUE FALSE)
-		-DWITH_CYCLES=$(usex cycles)
-		-DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl)
-		-DWITH_CYCLES_STANDALONE=$(usex standalone)
-		-DWITH_CYCLES_STANDALONE_GUI=$(usex standalone)
-		-DWITH_CYCLES_OSL=$(usex osl)
-		-DWITH_DOC_MANPAGE=$(usex man)
-		-DWITH_FFTW3=$(usex fftw)
-		-DWITH_GTESTS=$(usex test)
-		-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_OPENAL=$(usex openal)
-		-DWITH_OPENCOLLADA=$(usex collada)
-		-DWITH_OPENCOLORIO=$(usex color-management)
-		-DWITH_OPENIMAGEIO=$(usex openimageio)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_OPENSUBDIV=$(usex opensubdiv)
-		-DWITH_OPENVDB=$(usex openvdb)
-		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
-		-DWITH_PYTHON_INSTALL=$(usex system-python OFF ON)
-		-DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON)
-		-DWITH_SDL=$(usex sdl)
-		-DWITH_STATIC_LIBS=OFF
-		-DWITH_SYSTEM_EIGEN3=ON
-		-DWITH_SYSTEM_GLEW=ON
-		-DWITH_SYSTEM_LZO=ON
-		-DWITH_TBB=$(usex tbb)
-		-DWITH_USD=OFF
-	)
-	append-flags $(usex debug '-DDEBUG' '-DNDEBUG')
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		# Workaround for binary drivers.
-		addpredict /dev/ati
-		addpredict /dev/dri
-		addpredict /dev/nvidiactl
-
-		einfo "Generating Blender C/C++ API docs ..."
-		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
-		doxygen -u Doxyfile || die
-		doxygen || die "doxygen failed to build API docs."
-
-		cd "${CMAKE_USE_DIR}" || die
-		einfo "Generating (BPY) Blender Python API docs ..."
-		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
-
-		cd "${CMAKE_USE_DIR}"/doc/python_api || die
-		sphinx-build sphinx-in BPY_API || die "sphinx failed."
-	fi
-}
-
-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
-
-	# NOTE: The 'modifiers' test will fail if opensubdiv was compiled with -march=native
-	# This this is fixed in blender version 2.92 and up."
-	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
-
-	if use doc; then
-		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
-
-	cmake_src_install
-
-	if use man; then
-		# Slot the man page
-		mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die
-	fi
-
-	# Fix doc installdir
-	docinto html
-	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
-	rm -r "${ED}"/usr/share/doc/blender || die
-
-	python_fix_shebang "${ED}/usr/bin/blender-${BV}-thumbnailer.py"
-	python_optimize "${ED}/usr/share/blender/${BV}/scripts"
-
-	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
-
-	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 download"
-	elog "the official Blender LTS binary release instead."
-	elog "Bug: https://bugs.gentoo.org/737388"
-	elog
-
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-
-	ewarn ""
-	ewarn "You may want to remove the following directory."
-	ewarn "~/.config/${PN}/${SLOT}/cache/"
-	ewarn "It may contain extra render kernels not tracked by portage"
-	ewarn ""
-}
diff --git a/media-gfx/blender/files/blender-2.83.13-ffmpeg-4_4.patch b/media-gfx/blender/files/blender-2.83.13-ffmpeg-4_4.patch
deleted file mode 100644
index bf8579675886..000000000000
--- a/media-gfx/blender/files/blender-2.83.13-ffmpeg-4_4.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 9cdf11676ecd753fd86c3d8057c2375174ef0a70 Mon Sep 17 00:00:00 2001
-From: Sebastian Parborg <darkdefende@gmail.com>
-Date: Fri, 7 May 2021 16:51:28 +0200
-Subject: [PATCH] Fix: No sound is exported with ffmpeg 4.4
-
-We were not assigning the amount of sound channels to the output frames.
-Newer ffmpeg releases has sanity checks in place and doesn't fall back
-to two channels anymore.
----
- source/blender/blenkernel/intern/writeffmpeg.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
-index 7fc9e8cc0ef..e5550cee124 100644
---- a/source/blender/blenkernel/intern/writeffmpeg.c
-+++ b/source/blender/blenkernel/intern/writeffmpeg.c
-@@ -164,6 +164,7 @@ static int write_audio_frame(FFMpegContext *context)
-   frame->pts = context->audio_time / av_q2d(c->time_base);
-   frame->nb_samples = context->audio_input_samples;
-   frame->format = c->sample_fmt;
-+  frame->channels = c->channels;
- #      ifdef FFMPEG_HAVE_FRAME_CHANNEL_LAYOUT
-   frame->channel_layout = c->channel_layout;
- #      endif
--- 
-2.26.3
-
diff --git a/media-gfx/blender/files/blender-2.83.6-constraints_test.patch b/media-gfx/blender/files/blender-2.83.6-constraints_test.patch
deleted file mode 100644
index ab1e9a6d2d4a..000000000000
--- a/media-gfx/blender/files/blender-2.83.6-constraints_test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tests/python/bl_constraints.py b/tests/python/bl_constraints.py
-index 323dd874ac0..7cbc46d680a 100644
---- a/tests/python/bl_constraints.py
-+++ b/tests/python/bl_constraints.py
-@@ -44,7 +44,7 @@ class AbstractConstraintTests(unittest.TestCase):
-             collection = top_collection.children[self.layer_collection]
-             collection.exclude = False
- 
--    def assert_matrix(self, actual_matrix, expect_matrix, object_name: str, places=6, delta=None):
-+    def assert_matrix(self, actual_matrix, expect_matrix, object_name: str, places=None, delta=1e-6):
-         """Asserts that the matrices almost equal."""
-         self.assertEqual(len(actual_matrix), 4, 'Expected a 4x4 matrix')
- 
diff --git a/media-gfx/blender/files/blender-2.83.6-fix_opevdb_abi.patch b/media-gfx/blender/files/blender-2.83.6-fix_opevdb_abi.patch
deleted file mode 100644
index b7537f97fc09..000000000000
--- a/media-gfx/blender/files/blender-2.83.6-fix_opevdb_abi.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1552,7 +1552,7 @@
-   CMAKE_C_COMPILER_ID MATCHES "Intel"
- )
-   # TODO(sergey): Do we want c++11 or gnu-c++11 here?
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
- else()
-   message(FATAL_ERROR "Unknown compiler ${CMAKE_C_COMPILER_ID}, can't enable C++11 build")
- endif()
---- a/extern/mantaflow/CMakeLists.txt
-+++ b/extern/mantaflow/CMakeLists.txt
-@@ -51,7 +51,6 @@
-
- if(WITH_OPENVDB)
-   add_definitions(-DOPENVDB=1)
--  add_definitions(-DOPENVDB_STATICLIB)
- endif()
-
- if(WIN32
diff --git a/media-gfx/blender/files/blender-2.83.6-libmv_eigen_alignment.patch b/media-gfx/blender/files/blender-2.83.6-libmv_eigen_alignment.patch
deleted file mode 100644
index 1392510a23a7..000000000000
--- a/media-gfx/blender/files/blender-2.83.6-libmv_eigen_alignment.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-diff --git a/intern/libmv/libmv/base/vector.h b/intern/libmv/libmv/base/vector.h
-index bdc4392155c..300291c5679 100644
---- a/intern/libmv/libmv/base/vector.h
-+++ b/intern/libmv/libmv/base/vector.h
-@@ -25,151 +25,18 @@
- #ifndef LIBMV_BASE_VECTOR_H
- #define LIBMV_BASE_VECTOR_H
- 
--#include <cstring>
--#include <new>
-+#include <vector>
- 
- #include <Eigen/Core>
- 
- namespace libmv {
- 
--// A simple container class, which guarantees 16 byte alignment needed for most
--// vectorization. Don't use this container for classes that cannot be copied
--// via memcpy.
--// FIXME: this class has some issues:
--// - doesn't support iterators.
--// - impede compatibility with code using STL.
--// - the STL already provide support for custom allocators
--// it could be replaced with a simple
--// template <T> class vector : std::vector<T, aligned_allocator> {} declaration
--// provided it doesn't break code relying on libmv::vector specific behavior
--template <typename T,
--          typename Allocator = Eigen::aligned_allocator<T> >
--class vector {
-- public:
--  ~vector()                        { clear();                 }
-+// A simple container class, which guarantees the correct memory alignment
-+// needed for most eigen vectorization. Don't use this container for classes
-+// that cannot be copied via memcpy.
- 
--  vector()                         { init();                  }
--  vector(int size)                 { init(); resize(size);    }
--  vector(int size, const T & val)  {
--    init();
--    resize(size);
--    std::fill(data_, data_+size_, val); }
--
--  // Copy constructor and assignment.
--  vector(const vector<T, Allocator> &rhs) {
--    init();
--    copy(rhs);
--  }
--  vector<T, Allocator> &operator=(const vector<T, Allocator> &rhs) {
--    if (&rhs != this) {
--      copy(rhs);
--    }
--    return *this;
--  }
--
--  /// Swaps the contents of two vectors in constant time.
--  void swap(vector<T, Allocator> &other) {
--    std::swap(allocator_, other.allocator_);
--    std::swap(size_, other.size_);
--    std::swap(capacity_, other.capacity_);
--    std::swap(data_, other.data_);
--  }
--
--        T *data()            const { return data_;            }
--  int      size()            const { return size_;            }
--  int      capacity()        const { return capacity_;        }
--  const T& back()            const { return data_[size_ - 1]; }
--        T& back()                  { return data_[size_ - 1]; }
--  const T& front()           const { return data_[0];         }
--        T& front()                 { return data_[0];         }
--  const T& operator[](int n) const { return data_[n];         }
--        T& operator[](int n)       { return data_[n];         }
--  const T& at(int n)         const { return data_[n];         }
--        T& at(int n)               { return data_[n];         }
--  const T * begin()          const { return data_;            }
--  const T * end()            const { return data_+size_;      }
--        T * begin()                { return data_;            }
--        T * end()                  { return data_+size_;      }
--
--  void resize(size_t size) {
--    reserve(size);
--    if (size > size_) {
--      construct(size_, size);
--    } else if (size < size_) {
--      destruct(size, size_);
--    }
--    size_ = size;
--  }
--
--  void push_back(const T &value) {
--    if (size_ == capacity_) {
--      reserve(size_ ? 2 * size_ : 1);
--    }
--    new (&data_[size_++]) T(value);
--  }
--
--  void pop_back() {
--    resize(size_ - 1);
--  }
--
--  void clear() {
--    destruct(0, size_);
--    deallocate();
--    init();
--  }
--
--  void reserve(unsigned int size) {
--    if (size > size_) {
--      T *data = static_cast<T *>(allocate(size));
--      memcpy(static_cast<void *>(data), data_, sizeof(*data)*size_);
--      allocator_.deallocate(data_, capacity_);
--      data_ = data;
--      capacity_ = size;
--    }
--  }
--
--  bool empty() {
--    return size_ == 0;
--  }
--
-- private:
--  void construct(int start, int end) {
--    for (int i = start; i < end; ++i) {
--      new (&data_[i]) T;
--    }
--  }
--  void destruct(int start, int end) {
--    for (int i = start; i < end; ++i) {
--      data_[i].~T();
--    }
--  }
--  void init() {
--    size_ = 0;
--    data_ = 0;
--    capacity_ = 0;
--  }
--
--  void *allocate(int size) {
--    return size ? allocator_.allocate(size) : 0;
--  }
--
--  void deallocate() {
--    allocator_.deallocate(data_, size_);
--    data_ = 0;
--  }
--
--  void copy(const vector<T, Allocator> &rhs) {
--    resize(rhs.size());
--    for (int i = 0; i < rhs.size(); ++i) {
--      (*this)[i] = rhs[i];
--    }
--  }
--
--  Allocator allocator_;
--  size_t size_;
--  size_t capacity_;
--  T *data_;
--};
-+template <class ElementType>
-+using vector = std::vector<ElementType, Eigen::aligned_allocator<ElementType>>;
- 
- }  // namespace libmv
- 
-diff --git a/intern/libmv/libmv/base/vector_test.cc b/intern/libmv/libmv/base/vector_test.cc
-index f17718c3926..44b9a152148 100644
---- a/intern/libmv/libmv/base/vector_test.cc
-+++ b/intern/libmv/libmv/base/vector_test.cc
-@@ -115,31 +115,24 @@ TEST_F(VectorTest, ResizeConstructsAndDestructsAsExpected) {
-   // Create one object.
-   v.resize(1);
-   EXPECT_EQ(1, v.size());
--  EXPECT_EQ(1, v.capacity());
-   EXPECT_EQ(1, foo_construct_calls);
--  EXPECT_EQ(0, foo_destruct_calls);
-   EXPECT_EQ(5, v[0].value);
- 
-   // Create two more.
-   v.resize(3);
-   EXPECT_EQ(3, v.size());
--  EXPECT_EQ(3, v.capacity());
-   EXPECT_EQ(3, foo_construct_calls);
--  EXPECT_EQ(0, foo_destruct_calls);
- 
-   // Delete the last one.
-   v.resize(2);
-   EXPECT_EQ(2, v.size());
-   EXPECT_EQ(3, v.capacity());
-   EXPECT_EQ(3, foo_construct_calls);
--  EXPECT_EQ(1, foo_destruct_calls);
- 
-   // Delete the remaining two.
-   v.resize(0);
-   EXPECT_EQ(0, v.size());
--  EXPECT_EQ(3, v.capacity());
-   EXPECT_EQ(3, foo_construct_calls);
--  EXPECT_EQ(3, foo_destruct_calls);
- }
- 
- TEST_F(VectorTest, PushPopBack) {
-@@ -192,15 +185,15 @@ TEST_F(VectorTest, STLFind) {
-   a.push_back(5);
-   a.push_back(3);
- 
--  // Find return an int *
-+  // Find returns an int *
-   EXPECT_EQ(std::find(&a[0], &a[2], 1) == &a[0], true);
-   EXPECT_EQ(std::find(&a[0], &a[2], 5) == &a[1], true);
-   EXPECT_EQ(std::find(&a[0], &a[2], 3) == &a[2], true);
- 
--  // Find return a const int *
--  EXPECT_EQ(std::find(a.begin(), a.end(), 1) == &a[0], true);
--  EXPECT_EQ(std::find(a.begin(), a.end(), 5) == &a[1], true);
--  EXPECT_EQ(std::find(a.begin(), a.end(), 3) == &a[2], true);
-+  // Find returns an interator
-+  EXPECT_EQ(std::find(a.begin(), a.end(), 1) == std::next(a.begin(), 0), true);
-+  EXPECT_EQ(std::find(a.begin(), a.end(), 5) == std::next(a.begin(), 1), true);
-+  EXPECT_EQ(std::find(a.begin(), a.end(), 3) == std::next(a.begin(), 2), true);
- 
-   // Search value that are not in the vector
-   EXPECT_EQ(std::find(a.begin(), a.end(), 0) == a.end(), true);
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 0e53ab5d7477..39b70e011ff6 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,3 +1,3 @@
 DIST cura-4.9.1.tar.gz 47870392 BLAKE2B 2471c8461f73ad2343f4c3315994c5f63781ae1e49cb4699cd66e7e77c25a93916931fbaa6598c4144707dbc7778c902dad3a25839c0523aaf51ed39aacd2463 SHA512 436b8e33514de67d6d680fe59ab9599a75a86caa7e63fbcd05297b12a435483ec0c9ca90557fe23f25590a24e533294915fc18a665fd5cdb77fcc3a05a9076bf
 EBUILD cura-4.9.1.ebuild 2091 BLAKE2B e3975d79b705b1747cf1e3b7b75af8ea0309930ff3ff67a2104966f58c06cfb4706427fe059e91eb618240ad998a669aba5a423a60b13a24eaab6c6ea5e99860 SHA512 ba9546fda3d7b27a031c93887e62589f209b0f500b8c3417d13750ebcb21bfdf30b54d78e16ddf7b043667f5f5f42d16db6cad5524eefa982ccae06b2ac70d52
-MISC metadata.xml 1083 BLAKE2B 75fb3be96068b8df6d06a6c4e6e389ed3167fe8d9a200fbc5a977750bac4d31e2cdfb8c88eba4ddc2ce9bda52c308054d5c8487d25166b0fb57c77c2903413a9 SHA512 e606d3aef884f7640491e318569a024101a15d550285f4c9805ece1bc1a84c15180b5629fd6bbf560c5415f7062f63190fc6f0144291f5930f0ddd6dc9bc50b4
+MISC metadata.xml 1083 BLAKE2B 122f6c64557092750be93668e0cbd1e4b546cc711d572c0a14dae20426d722134570f7ad7cd25d769d96a264d3839b169b7c9f44f26fb0a5786c41a32c9e1f82 SHA512 1d60e79f32515d5017c17347000760702c250817c941ef0cb307ee8293c99882a4fa7c84263a7668aabb5aa5c433122c32fdd80b1dc47c32ef574c6d5e2301a0
diff --git a/media-gfx/cura/metadata.xml b/media-gfx/cura/metadata.xml
index ae6a4e00a4fe..6bf1b5a4e99c 100644
--- a/media-gfx/cura/metadata.xml
+++ b/media-gfx/cura/metadata.xml
@@ -9,10 +9,6 @@
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<maintainer type="person" proxied="yes">
 		<email>mathy@vanvoorden.be</email>
 		<name>Mathy Vanvoorden</name>
@@ -21,6 +17,10 @@
 		<email>perlovka@gmail.com</email>
 		<name>Michael Perlov</name>
 	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<slots>
 		<subslots>soname major version number</subslots>
 	</slots>
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 96bee14767cf..79ef4e15fab2 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,13 +1,14 @@
 AUX darktable-3.0.2_cmake-march-autodetection.patch 908 BLAKE2B aa1c0cedfe1f267332f11b9a8f38ce368af02b7e4f9751b128b7af91dcdfb066a0529ae126d41a34bc3fc66f336924f3376f270674bcc7e0912d2e23d46ec83b SHA512 da1f10e86b7b9e2a3f317d620a58ebed156a5c6e0f22f429da617cb176d1c18d6d1b6706c1444c9007ccb776bc6b951e3560214e89e95b4050899ec692b74dde
 AUX darktable-3.4.0_jsonschema-automagic.patch 891 BLAKE2B b0abdd7ea80a446e2556daf06f78343deeb781a12b670f3c3d2f8a34ec9877e16991f6a105c90d58f437915b30bd8bddfb995d515bc73563a44f3807258c9fee SHA512 57cdf87586c6382347334577fff71d415be0123ad101c073535e9d4e87e7edac275272e0b3be91bd34965bacf1f6166cfc64af34b4cdedfb27b409e27bc3bdc9
 AUX darktable-3.4.1_libxcf-cmake.patch 788 BLAKE2B b6ecb84de804b0bf16f907f825d93d00a62c1d996077514b3e55f370347f47e561707cb8da6a270aa42c3320142437691cc8b132718c485b5b7df40068d41ee5 SHA512 d94247c4f2c3b4894bd6455cd036a62ef5edb90a77bf8f930efc3e540d00712000fe8eeb7d4c937fa826aef1dd129448223c8696ff094e823894b17ef2669a4e
+AUX darktable-3.6.1_openexr.patch 1806 BLAKE2B 3f05c8fbb4dd5a76e98ef3d9a9432fb2c3d98818b5773d0fc007d5203d32b43fea25ec7286f396b4fcb23e02b32ab911ca0c504e8d01c299899e729b02a81d94 SHA512 a782116aa340bd8fd8c1fd98094bee943100f85c1194010b7a92b3aa532ff658f07cddccacdf06b902b74ac86ef1ab3cd07c694c072312e51ddc058caefcb944
 AUX darktable-find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b59cc73834d734c454a7c561654bc27f052de55db6c62f454927b2c701b7f4f6c52d5d2fac0b7c230b90ef89bdc9431856bd4ae69a SHA512 93023a318158850a5bac4a1d871ea6e69a3c9f2bc57f8af47bc83bb131f96e8972c23b07945df2eddfb05bffdd950e8250da77c47d1543b776a7e9405adad020
 DIST darktable-3.4.1.tar.xz 4456192 BLAKE2B 7b573db69cb32496ad79d6636b50d3b2db471376c2486d356e1da2740d48644821265c3249a40603a521d588ef89cee33e31d7a6b216f106625ca2aa3f8bfb68 SHA512 3376c5e2aa52d02fcfc45d9efb1a60a7bee6210dc81e1131f2c163ca2059860f7e3a64b5cfd05117dcaaf8c7810d08a84058a0b64ef6fd24c90bbafde7ca4f6f
 DIST darktable-3.6.0.tar.xz 4691608 BLAKE2B ecbb6b4b4aba1f499f8d459304f174f348c19304c0efb898260d3037bfb9c82ea51a92e3dd98c8b0d2dc525276a91419b41b3c610f4a18b905cda7ccd1bfc554 SHA512 8e458406c3004a52cde096039358eb044d370e8b9d5cb70a6457fc1ad165f062af073b3f0c8da92b463db5a4df37e7a4ee32eb5ce9dfbfeec3e0c13c70ec5f8a
 DIST darktable-3.6.1.tar.xz 4685928 BLAKE2B 8ff6224e21b44f9e881adb8f020a2ea5ff5abb2c38da1aeaed312f89e548918c6d3bba210dbb4fb6901fbf0872c6e14c2e12c5b5b27932914a00428a709e8965 SHA512 d53eb8472531c62ceebe97769c6e53f7c9ed6efb404905295f00b5bf547fd0f0c395b8b926ccafc78d6cf9fed0745da655a77eeb84d92fce5d6a7a576f277416
 DIST darktable-usermanual-3.4.0.pdf 16241791 BLAKE2B d6fc232c3eddb5474e36ce1fbc02c3472291e5ebdf2eae09c419215263f615546a79f88ee9d252b387fc5e4f2c9714398deab8de176b3d928b6a17c2878cef56 SHA512 fd154c02d5e0c63d9698b2f80a7439a191f4582b717b2f163923eda40aae1ebe8aeaf1a70efdc423eb8c8269d74fc0e23df8c9c0269ee8f5a357611501c3547e
 DIST darktable-usermanual-3.6.pdf 34290182 BLAKE2B 407223f6dfc25e53e2de31a05b0468a3d50ec5ccf836fa4cca61b16d43e91827c0276027ea73dd543750f240889b7325538eb474e19df86eeff4d380bf0b8829 SHA512 62c2723e5fc0434703f21bc4f5efdb997db1c0cfb800a9df217d6682325949ce18ab458a179bd20a888b73a7bd384bbbb2ea8888cba26278510abaab1e0cc335
-EBUILD darktable-3.4.1.ebuild 4458 BLAKE2B 232c71684688619c4f6248325b4805f2fec2840fd3198651c871eb9c73f0ef82e85ed0a985a89c5de3133939b469e40bd40091d72a612172b775a2d3c6217e4a SHA512 0264c756bc1dee91a6d6a447975fb0bad98995cd4974cde9686a0cdea3858b8a01498f3619286bd9d7651f4ded636e6236493605735a4394d300c4927536eb4b
-EBUILD darktable-3.6.0.ebuild 4427 BLAKE2B e5b2ab93edd3ce2b9669991549d0b7e91c935bb68c06142600e0c09c44b8bee5e6a7edcea3e9dbad9e9a3a5fdf3688be429d976bc8c3989b88ba43ebb5044980 SHA512 58169157c246db68d2ffea5ef93101886ea36a7f1175a2c854a1483459f4b3e1ebbed790dd810af3c0cb2fcceb6a7e260d95766ac4dfac3b5fb603e0452ef422
-EBUILD darktable-3.6.1.ebuild 4429 BLAKE2B d1d41fe243e1da3ac5860760d205e34b3df3e835e40c4162542a5287cec2bf2463b3f873d60ba10648c13267e5d08a7dcab1d8a0343ad75e270c202da3ae87a1 SHA512 ba41b8fe4340fad5f51bd63e73a5ad8b1142f70aa7ac644ccc5e3cf477d842f30299997d8b879d306e93e89e17f3f422af4db3ea948abf13310af0bbdc699eae
+EBUILD darktable-3.4.1-r1.ebuild 4460 BLAKE2B cf563871d1445369bf83bacc69ce20df83520e41e3237dcd70c67fc3b2f5b57522d17dbd9730a4462afe82454e81f43a2da73292080b2d12610bbcd506ba26ef SHA512 e76a15203dff51d73c224166b7c0686ff1b27e9aa58582745adc8435402e9f60989744724da19e3232fc0d3ad952ea342a49590c387fac8b1c02f6de68f21209
+EBUILD darktable-3.6.0-r1.ebuild 4429 BLAKE2B d3ab8f9260ae4dcaf751e44d91c28720a80b63f677416d320f5b43082483a611478ac8c2c45d4fd455f797112f471afe09da77b9e73c154ee0b5622faafdfb09 SHA512 563e4a36b0b86768b96faa2c6e67beb0d4a88fd87c0fe0955c7907934e390e6c72c956d7aac81c46e26f7addc251c1ba9ddc31a70ee597204694688f6f7c0926
+EBUILD darktable-3.6.1-r1.ebuild 4472 BLAKE2B f68cd37bc20956276d29dff7195b07055b7a858ca61158010d10c13fc9437ad15205fa4eac7ad312c5278cbe81c4c453ad7f7cb829e7b395840794b98a5d526c SHA512 41b79c3fb838033f6c314a33bf59991e8f69e4409220f6b84d61ead9cb37c604f6a5d5f6e4af160429f03e0cbcf0a9895d2ebe0f90f1c8967c779bf6be213465
 MISC metadata.xml 1152 BLAKE2B c43582dd3a0607de751a816c9856738d73b504422d6b21745a8f7948e2238a6be5c178bb224d787eb712aef222a592c6a712239a4a8dada4c66a453e158fc5de SHA512 8a20f53798359fec9eb45c1d2fdbe6cca623b2308f8391ece25c4100161a2056b52c44f3eba91d6d3c083f49843bac8e355982998d2c4217efdc976eb0d1a14c
diff --git a/media-gfx/darktable/darktable-3.4.1.ebuild b/media-gfx/darktable/darktable-3.4.1-r1.ebuild
index 2f4bd3209de3..26f9c784538d 100644
--- a/media-gfx/darktable/darktable-3.4.1.ebuild
+++ b/media-gfx/darktable/darktable-3.4.1-r1.ebuild
@@ -58,7 +58,7 @@ DEPEND="dev-db/sqlite:3
 	x11-libs/cairo
 	>=x11-libs/gtk+-3.22:3
 	x11-libs/pango
-	avif? ( >=media-libs/libavif-0.8.2 )
+	avif? ( >=media-libs/libavif-0.8.2:= )
 	colord? ( x11-libs/colord-gtk:0= )
 	cups? ( net-print/cups )
 	flickr? ( media-libs/flickcurl )
diff --git a/media-gfx/darktable/darktable-3.6.0.ebuild b/media-gfx/darktable/darktable-3.6.0-r1.ebuild
index a92c6759df40..e5f7802a90a8 100644
--- a/media-gfx/darktable/darktable-3.6.0.ebuild
+++ b/media-gfx/darktable/darktable-3.6.0-r1.ebuild
@@ -58,7 +58,7 @@ DEPEND="dev-db/sqlite:3
 	x11-libs/cairo
 	>=x11-libs/gtk+-3.22:3
 	x11-libs/pango
-	avif? ( >=media-libs/libavif-0.8.2 )
+	avif? ( >=media-libs/libavif-0.8.2:= )
 	colord? ( x11-libs/colord-gtk:0= )
 	cups? ( net-print/cups )
 	flickr? ( media-libs/flickcurl )
diff --git a/media-gfx/darktable/darktable-3.6.1.ebuild b/media-gfx/darktable/darktable-3.6.1-r1.ebuild
index da867cb77ccf..ffafc552eddb 100644
--- a/media-gfx/darktable/darktable-3.6.1.ebuild
+++ b/media-gfx/darktable/darktable-3.6.1-r1.ebuild
@@ -58,7 +58,7 @@ DEPEND="dev-db/sqlite:3
 	x11-libs/cairo
 	>=x11-libs/gtk+-3.22:3
 	x11-libs/pango
-	avif? ( >=media-libs/libavif-0.8.2 )
+	avif? ( >=media-libs/libavif-0.8.2:= )
 	colord? ( x11-libs/colord-gtk:0= )
 	cups? ( net-print/cups )
 	flickr? ( media-libs/flickcurl )
@@ -80,6 +80,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
 	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
 	"${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
+	"${FILESDIR}"/${PN}-3.6.1_openexr.patch
 )
 
 S="${WORKDIR}/${P/_/~}"
diff --git a/media-gfx/darktable/files/darktable-3.6.1_openexr.patch b/media-gfx/darktable/files/darktable-3.6.1_openexr.patch
new file mode 100644
index 000000000000..a5b1fd173f84
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-3.6.1_openexr.patch
@@ -0,0 +1,65 @@
+https://bugs.gentoo.org/820041
+
+--- a/src/common/imageio_exr.cc
++++ b/src/common/imageio_exr.cc
+@@ -28,13 +28,13 @@
+ #include <stdio.h>
+ #include <string.h>
+ 
+-#include <OpenEXR/ImfChannelList.h>
+-#include <OpenEXR/ImfFrameBuffer.h>
+-#include <OpenEXR/ImfInputFile.h>
+-#include <OpenEXR/ImfStandardAttributes.h>
+-#include <OpenEXR/ImfTestFile.h>
+-#include <OpenEXR/ImfThreading.h>
+-#include <OpenEXR/ImfTiledInputFile.h>
++#include <ImfChannelList.h>
++#include <ImfFrameBuffer.h>
++#include <ImfInputFile.h>
++#include <ImfStandardAttributes.h>
++#include <ImfTestFile.h>
++#include <ImfThreading.h>
++#include <ImfTiledInputFile.h>
+ 
+ extern "C" {
+ #include "common/colorspaces.h"
+--- a/src/common/imageio_exr.hh
++++ b/src/common/imageio_exr.hh
+@@ -29,12 +29,12 @@
+ #include <tr1/memory>
+ #endif
+ 
+-#include <OpenEXR/ImfChannelList.h>
+-#include <OpenEXR/ImfFrameBuffer.h>
+-#include <OpenEXR/ImfInputFile.h>
+-#include <OpenEXR/ImfStandardAttributes.h>
+-#include <OpenEXR/ImfTestFile.h>
+-#include <OpenEXR/ImfTiledInputFile.h>
++#include <ImfChannelList.h>
++#include <ImfFrameBuffer.h>
++#include <ImfInputFile.h>
++#include <ImfStandardAttributes.h>
++#include <ImfTestFile.h>
++#include <ImfTiledInputFile.h>
+ 
+ #ifdef OPENEXR_IMF_INTERNAL_NAMESPACE
+ #define IMF_NS OPENEXR_IMF_INTERNAL_NAMESPACE
+--- a/src/imageio/format/exr.cc
++++ b/src/imageio/format/exr.cc
+@@ -23,11 +23,11 @@
+ #include <cstdlib>
+ #include <memory>
+ 
+-#include <OpenEXR/ImfChannelList.h>
+-#include <OpenEXR/ImfFrameBuffer.h>
+-#include <OpenEXR/ImfStandardAttributes.h>
+-#include <OpenEXR/ImfThreading.h>
+-#include <OpenEXR/ImfTiledOutputFile.h>
++#include <ImfChannelList.h>
++#include <ImfFrameBuffer.h>
++#include <ImfStandardAttributes.h>
++#include <ImfThreading.h>
++#include <ImfTiledOutputFile.h>
+ 
+ extern "C" {
+ #include "bauhaus/bauhaus.h"
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 53267fadeb87..a47f9bb354a8 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,5 +1,5 @@
 DIST eog-40.2.tar.xz 3601788 BLAKE2B ab66481d8fa5c076f0e12c3f16ff4a67d3a544b7483a2791833ea7d7f605898b20e8d8ed100a538e7a7f21a1359c74b96fa81aaf8712bfdb419df37fe711f7bf SHA512 e28c2deb320436606ebf0a971d845e536197ea23c2e7869d3d10dfe5174c8177c7977da37bf01178dc87f875cff2c3f0fbdad63c77578c2334dbfd9d354c19ad
 DIST eog-40.3.tar.xz 3602276 BLAKE2B 56f0fee5677730e032420fbc53c5ae6e6a5e1461d66c2e8dfcc7e7f5055d704223005f6c5329fd3bae11a002f1429729820fa52077c63e2d91a55213200a130f SHA512 5c6af597b35adcc18846e2dbee80eaf4b3c07138826520a9f6c2567df50c20379f804f8b878c7da74dd6cab25249555113d785653c0239353e410506611ffbab
 EBUILD eog-40.2.ebuild 1591 BLAKE2B b021bdc30c23209e66970052e2a05b295013fd53765e966436cad01af8d33084306accddecca864ed3ea07fb97dd675b74b6e76d15a761f0a1f9fd8eca82d311 SHA512 38158a2a01bae2503b81aa8ed540c7b0f45a138915d1fdf5eb5cf3d4e661769cf2d92d89f743256922436dd2ff1a69a21902dafbcb6de89627d6bfe3d0b6d598
-EBUILD eog-40.3.ebuild 1633 BLAKE2B 3f37b2fa29033a8a7e6699dcd40c25b738821432ada60e286692445d6aa86005bb32e1b07eb052d8cb97fa26b678c4eeba7d939280afabe9e5ba3e546df38729 SHA512 9b4602e96657b4498252443d8e1487c6be515b0e2cb2c9ec7553e5da73afc6043fd10e9fd6207f7be339a8dbb20ea2e3404458655d0a8a6f717c15b2b26ea77c
+EBUILD eog-40.3.ebuild 1632 BLAKE2B 84a134a2b9f31f0cbbfed6f3f8c3149d6dc99623c180bca5b30d51f85ee1a1ade7c96b4f0f0be0c0c06ede206e88c17b71c23dbfee13d41515ba23af21ff0c2c SHA512 dd376773672b2a8f1884fd57f173e259b12f2940f2e4caceef113aa4299d5fc0705a178e670aba05d75fe3c9bb26596d9184dfb7e43ecfb569636be10f2b4a01
 MISC metadata.xml 482 BLAKE2B 03780ad7b79dd3b35ee6a9b3ee95bceb94ebbd97de711912ba0f5e61ef4e25d9a20a474011cd3c5261c82757105bed5383f16259468dee80bfd6cdcec13b5828 SHA512 0c51ba4ac4859bc5e6361862282a76a98343ad3e46dfac04e088c79ec25683e820ea907991212979b5fffa0b757a66ea33ddfcff7a8012e42e81dba0e943ea39
diff --git a/media-gfx/eog/eog-40.3.ebuild b/media-gfx/eog/eog-40.3.ebuild
index 52fabba921b5..af9c70a389b4 100644
--- a/media-gfx/eog/eog-40.3.ebuild
+++ b/media-gfx/eog/eog-40.3.ebuild
@@ -14,7 +14,7 @@ SLOT="1"
 IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
 REQUIRED_USE="exif? ( jpeg )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.53.4:2
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index cc4eace2a80a..0f2fbe7aa23b 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,6 +1,3 @@
-AUX exiv2-0.27.4-gtest-1.11.patch 1489 BLAKE2B b20cee53dfd712389f553402779d839dc6a946758400c47a0703e20a8480d8c15f0424b6a9c4adef82ea68be8e62931bdddfa26832dda539e64d18b6b959ccb0 SHA512 731b4a027b6241af31b911040432bc79794137146a71a3431a597b52d477ddaa5af0618f95a730ee672db00a6a2a7b6cd4c221443d45059ee7e92b84690739da
-DIST exiv2-0.27.4-Source.tar.gz 32055837 BLAKE2B 9c31c08fafb38895fa7812a8c7a195335e80a6b9c15f7b5f3750f5ab30903c4c3bbf9aee5a7293a7d437d15a49a9cb7b45a3133cbb36ee62081efae0dd67b61a SHA512 f6798baafb36a54ba5bc65c2d28d4f4469e298582c90b417eb437b5dbda8e11963fb3314e8419717b3815ee8c3a68955cddc79e45351d9f2c165a0b73eb7b7be
 DIST exiv2-0.27.5-Source.tar.gz 32720608 BLAKE2B 803cb853fd049b28d309952c2332589a8544ff90c16fc1a588b6f1a2d4ae5e96da7ae746cf2247954ac54e155b84e0ad1f4f2d89f22d07e7bbd34038f0e292a5 SHA512 0f2d2dfbc976052a428dfeb597225d3ea3c725f584d05b99316bd4aa9cbf0ba5e1e37bcde71f9041975cf003b4fdb578c559adb144268d784bfd64494f451491
-EBUILD exiv2-0.27.4-r2.ebuild 2800 BLAKE2B e62691994eee7eece7b24fc4c7e13654e237a9d4858ff166550c4c14a4b01285b303370c98fdade67cc63b2f3ab4d19be7da0a05d6122de4ce451633652d2504 SHA512 74f303ba879c4480dcdfa1eb8a6a9eb718e4b394e1c79d9ba544651e69d07bc3ce0e0fa159ba0e79ea6d9c863c50286293ec01bf51cacb1ba7575468c53e0dc1
-EBUILD exiv2-0.27.5-r1.ebuild 2807 BLAKE2B 6d81ba0674156b72ac76cf5f004549649ed97b4c0cad43deb2747bbf78ccad07b36d4f83bb403223e264aa9da31374415476072a55122ae5435d00ec1c38688d SHA512 363a0142a1b79dea4d07482e17ba0a59d6280084431a942e924721711c2907c27ad59b4c3396213ca0a296e80e74fa4a08399d661a1adce92bba0492841c3c8d
+EBUILD exiv2-0.27.5-r1.ebuild 2800 BLAKE2B 631a024e8bde65a10d4a122feb8e7219d7a426b03edf1f8f7dc5459d2e01f525cf9ea23318592a945e6f2f3d680f3c8ebd879994e2b05d4fc4aac5b3ff7804ca SHA512 10ec51a45485672b6226d36ab7d7f849775c3f2cb8d42939d64adc6d74e224ca6616c3dcc98000122610dc63995d8119d91efa4591968a18c5d64325c7216842
 MISC metadata.xml 555 BLAKE2B 307d753da1e5a2f09b4d95de756ad3f4ef905a1c2f9b2d7dc1cbc5e0e93718bb376dcbbd7f3abcee20697dce519ab795af7b71f8826ad7d55fa1cd13546dfbbc SHA512 4c504152172835df649036f2aa6f80a7ac12e2c034bc44e762c43bc39a72729e8c7a227ca59066c9b3ec3911b1c8f2a3633449cd611911f8f33a6c07f0a3420d
diff --git a/media-gfx/exiv2/exiv2-0.27.4-r2.ebuild b/media-gfx/exiv2/exiv2-0.27.4-r2.ebuild
deleted file mode 100644
index 7acbc098873b..000000000000
--- a/media-gfx/exiv2/exiv2-0.27.4-r2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
-	inherit git-r3
-else
-	SRC_URI="https://exiv2.org/builds/${P}-Source.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-	S="${WORKDIR}/${P}-Source"
-fi
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
-HOMEPAGE="https://www.exiv2.org/"
-
-LICENSE="GPL-2"
-SLOT="0/27"
-IUSE="+bmff doc examples nls +png test webready +xmp"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	doc? (
-		${PYTHON_DEPS}
-		app-doc/doxygen
-		dev-libs/libxslt
-		media-gfx/graphviz
-		virtual/pkgconfig
-	)
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	png? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-	webready? (
-		>net-libs/libssh-0.9.1[sftp,${MULTILIB_USEDEP}]
-		net-misc/curl[${MULTILIB_USEDEP}]
-	)
-	xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-"
-DEPEND="${DEPEND}
-	test? ( dev-cpp/gtest )"
-
-DOCS=( README.md doc/ChangeLog doc/cmd.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.27.4-gtest-1.11.patch
-)
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# FIXME @upstream:
-	einfo "Converting doc/cmd.txt to UTF-8"
-	iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
-	mv -f doc/cmd.txt.tmp doc/cmd.txt || die
-
-	cmake_src_prepare
-
-	sed -e "/^include.*compilerFlags/s/^/#DONT /" -i CMakeLists.txt || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_CXX_STANDARD=14
-		-DEXIV2_BUILD_SAMPLES=NO
-		-DEXIV2_ENABLE_NLS=$(usex nls)
-		-DEXIV2_ENABLE_PNG=$(usex png)
-		-DEXIV2_ENABLE_CURL=$(usex webready)
-		-DEXIV2_ENABLE_SSH=$(usex webready)
-		-DEXIV2_ENABLE_WEBREADY=$(usex webready)
-		-DEXIV2_ENABLE_XMP=$(usex xmp)
-		-DEXIV2_ENABLE_BMFF=$(usex bmff)
-		$(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO)
-		$(multilib_is_native_abi && echo -DEXIV2_BUILD_DOC=$(usex doc))
-		$(multilib_is_native_abi && echo -DEXIV2_BUILD_UNIT_TESTS=$(usex test))
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-
-	if multilib_is_native_abi; then
-		use doc && eninja doc
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		cd "${BUILD_DIR}"/bin || die
-		./unit_tests || die "Failed to run tests"
-	fi
-}
-
-multilib_src_install_all() {
-	use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
-
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc samples/*.cpp
-	fi
-}
diff --git a/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild b/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild
index 1551fcc75e29..754fb2a9597e 100644
--- a/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://exiv2.org/builds/${P}-Source.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 	S="${WORKDIR}/${P}-Source"
 fi
 
diff --git a/media-gfx/exiv2/files/exiv2-0.27.4-gtest-1.11.patch b/media-gfx/exiv2/files/exiv2-0.27.4-gtest-1.11.patch
deleted file mode 100644
index bb368d367cb7..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.27.4-gtest-1.11.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://github.com/Exiv2/exiv2/pull/1722
-
-From f01805f68eb19f56b0415a50a1128cbbdd82bff4 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Fri, 18 Jun 2021 18:53:46 +0200
-Subject: [PATCH] Fix build with gtest 1.11
-
-INSTANTIATE_TYPED_TEST_CASE_P requires a non-empty prefix now
----
- unitTests/test_slice.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/unitTests/test_slice.cpp b/unitTests/test_slice.cpp
-index ccf80d98d..59171cfcf 100644
---- a/unitTests/test_slice.cpp
-+++ b/unitTests/test_slice.cpp
-@@ -440,12 +440,12 @@ REGISTER_TYPED_TEST_CASE_P(slice, atAccess, iteratorAccess, constructionFailsFro
-                            constMethodsPreserveConst);
- 
- typedef ::testing::Types<const std::vector<int>, std::vector<int>, int*, const int*> test_types_t;
--INSTANTIATE_TYPED_TEST_CASE_P(, slice, test_types_t);
-+INSTANTIATE_TYPED_TEST_CASE_P(slice, slice, test_types_t);
- 
- REGISTER_TYPED_TEST_CASE_P(mutableSlice, iterators, at);
- typedef ::testing::Types<std::vector<int>, int*> mut_test_types_t;
--INSTANTIATE_TYPED_TEST_CASE_P(, mutableSlice, mut_test_types_t);
-+INSTANTIATE_TYPED_TEST_CASE_P(slice, mutableSlice, mut_test_types_t);
- 
- REGISTER_TYPED_TEST_CASE_P(dataBufSlice, successfulConstruction, failedConstruction);
- typedef ::testing::Types<DataBuf&, const DataBuf&> data_buf_types_t;
--INSTANTIATE_TYPED_TEST_CASE_P(, dataBufSlice, data_buf_types_t);
-+INSTANTIATE_TYPED_TEST_CASE_P(slice, dataBufSlice, data_buf_types_t);
diff --git a/media-gfx/gnofract4d/Manifest b/media-gfx/gnofract4d/Manifest
index c15098e3be0e..c333d9b72c59 100644
--- a/media-gfx/gnofract4d/Manifest
+++ b/media-gfx/gnofract4d/Manifest
@@ -1,3 +1,5 @@
 DIST gnofract4d-4.3_p20201029.tar.gz 18270417 BLAKE2B 82d9f9528c33cf73478fa48d8692617237029944e68d9626d0c39e088b1b6aebc02a8c32a1a0e14c8d115cf3f0434940ec8a8c3d915fc9967b22f7e51353dd6b SHA512 f5844a88c41941429379efe99d1e0593a994a42d600e6e05f722c01c4ced48ceff730bf6bc797e083bd558931d39a31ffe86021eac0f0c6ec0f3047569962e3f
+DIST gnofract4d-4.3_p20211108.tar.gz 18271921 BLAKE2B b73fef616b8a91827edd514ec128bcb6d63a8fc8f1433989e31bd9f11711a9568a61358dcca23846bff461ef6a8addeae68cc5ab5f4ae29b6e9b2857bdbad2b8 SHA512 0d95f31ac9b1b82bfd459ac896c73bfcffb3b256750093cdccee976839112fcaeb42260c0eb48ef4f30dc0504f5b84cc425f6568997c05639993354756f9ef75
 EBUILD gnofract4d-4.3_p20201029.ebuild 1475 BLAKE2B f15026f582a54433bdee4b1f3dd30088b7b21b1760b905d8b20e205bc5301cd33aea19eb32d24e65787cd438cece03936abfe9618bf8d77dd15e8a7a9643250d SHA512 df41fc77faec92e3ad3e4ec4323b561471ee7affbf463851a46decec2f3a46e7a963481e1c5721942f9ffca62788d29c6e5edcc9e91af7656e5e0ad4f2e81031
+EBUILD gnofract4d-4.3_p20211108.ebuild 1478 BLAKE2B 1721206766be4b6ebcf6318b95ba37a07a8c4b2f2d424c6b872a435c861b9b8739ce15bf729a71cd24c24db53eedc63a442077a5b05c5db7bc4866e70e1023ae SHA512 05b3151c10771e521a3b9597c82c9b536e9a8ec76c7a0710bcb1fbc9439497e7dad5d9f92b5032bc36dc15cd736c1339e9d374c2d82367203268685c63ca5b2a
 MISC metadata.xml 474 BLAKE2B 6dcdd891ae9b2b69a1f7a2e3de6bc867894444743825642abddac1701d75bd2ec1542a5e6d4c86b76b2e209ccdc4db53e680692a0e6c7c99c280ff96fe6a13a2 SHA512 7b815ce8a870b158e39845840082ea3a87738d1f7c63b6aee869758deb3475f7f2c1c1f1831bfdc8af911c1f7825c514cf26c76af5bb32464e9fa2a308ba8a05
diff --git a/media-gfx/gnofract4d/gnofract4d-4.3_p20211108.ebuild b/media-gfx/gnofract4d/gnofract4d-4.3_p20211108.ebuild
new file mode 100644
index 000000000000..630443d5d244
--- /dev/null
+++ b/media-gfx/gnofract4d/gnofract4d-4.3_p20211108.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 optfeature virtualx xdg
+
+COMMIT="52410fec6cd9182048aed85e333876ddeaa9486a"
+
+DESCRIPTION="A program for drawing beautiful mathematically-based images known as fractals"
+HOMEPAGE="https://fract4d.github.io/gnofract4d/"
+SRC_URI="https://github.com/fract4d/gnofract4d/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	media-libs/libpng:0=
+	virtual/jpeg"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	')
+	x11-libs/gtk+:3[introspection]"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		media-video/ffmpeg[vpx,zlib]
+	)"
+
+distutils_enable_tests pytest
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_prepare() {
+	sed -i -e "s:share/doc/gnofract4d/:share/doc/${PF}/:" setup.py || die
+	# test_regress.py does not provide pytest with any tests and inspecting it requires dev-python/pillow
+	rm test_regress.py || die
+	# tests hanging with virtx
+	rm fract4dgui/tests/test_{director,gtkfractal}.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_compile_all() {
+	if use test; then
+		ln -s "${BUILD_DIR}"/lib/fract4d/*.so fract4d/ || die
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "creating videos" media-video/ffmpeg[vpx,zlib]
+}
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index ee07b6731fbe..9be8fccebd71 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,5 +1,5 @@
 DIST gthumb-3.10.3.tar.xz 7582472 BLAKE2B 1e8274720428db05d4e14bb6a37ff55a74fe009ea551bda6fe75506f7187e03685903c2743fb6e66a33da73c974188528afad866c568bb14cc6f05749e08af7c SHA512 2d157644c6efbf4f4ab31c525a4eecc69fbdf31003f922d5fdf8866ca6bbb44e5b8bd7f809be12de41178ddcef30bb49029ea06eb4feb8398a6aa1b052c6ae38
 DIST gthumb-3.10.4.tar.xz 7581416 BLAKE2B 7afc94c18d819a5eef7d075489533cf99e7f6d5eaf409b163524a2f62d9c22a40edbc114b16d6d7b7960df53d49cefda9196ebeaa2bc0c19e5760f584628209b SHA512 90f7d83d2fb6db12ef16e5ce29d9310ed5aaccb269004d72df985dda839c1ce738354942f537a23f63cbe724a351a0f13f2eb1e659ada50196af1bc60d5c5d27
 EBUILD gthumb-3.10.3.ebuild 2341 BLAKE2B 6cbfaeb1e30c5a1ad00512dcd5c67d97fc6ae29f90d354df65fee9b476985547fbed6e92561ee6eb6e585bb765c5d5d5a6ce7ac80bb39bbec914db16af958e7a SHA512 1ada649377e6c9e073ca5c9e85d10010533492192cba33a8aa4baad70a259aa3c24792aab04b5f042e1280ac2186b0240e85b28243ff7afdbb085e338d13b8e0
-EBUILD gthumb-3.10.4.ebuild 2342 BLAKE2B a0b46e99bbf9b49f197adc0dac54c6b2bff1406175df5c60a2386994e26457832862e5ba687f238a7723b14daba99962a2c2f4d4aa0cf7b1ada5acba0fb82410 SHA512 5dec75896e193384be59217ed2489434b5366e2f51194adc42029c24d28adfb0072f14185bbb1d8fb8ad11b533bbb4106fd92c797769f091d9756fe2baf5fa72
+EBUILD gthumb-3.10.4.ebuild 2341 BLAKE2B bbed16d718c669c35b5d9a004bffd0724d9ebc98f122dbce21d852f9df2f50a5d41b9347815cb6af677c40352885147d532d5010ff28069d8c09904a8ebe62c6 SHA512 0f2237aab648b1d0cf577cb889fff16177b453baf2c87cd6ea11423d860fff2d15987d7acee22617b9a40e55bf0e70b1ecc2ecddb92a0fc237314e3fd7b81f4e
 MISC metadata.xml 421 BLAKE2B 4b3895ebffd9ff5b3b63f7b32cd30e4e36f1156a9201b1e8d4cac7de62bd1cf72b2d11e321bae2dffe0818c6140170f6b14249ce4a38f0e65a78139f98316f06 SHA512 91e93d9d56d9254c80723c864178ba2f0e31e7d2fd998ccece63c8d225bff0c5b3477c98c94deb3c768a6e150dbbd3eff7d8c0d9f0abf31bab9207b0161eab10
diff --git a/media-gfx/gthumb/gthumb-3.10.4.ebuild b/media-gfx/gthumb/gthumb-3.10.4.ebuild
index f69717603d11..d04ede00e330 100644
--- a/media-gfx/gthumb/gthumb-3.10.4.ebuild
+++ b/media-gfx/gthumb/gthumb-3.10.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gthumb"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="cdr colord exif gnome-keyring gstreamer http lcms raw slideshow svg tiff webp"
 
 RDEPEND="
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 4ada5d1e999d..9c6ab26ba9a3 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-456.tar.gz 38899003 BLAKE2B 03e575034f2b4234c7f9ed3d4da59a3f94e9e2871440548b192b0898fa7e5d73bf7ab07f91a380db6e884449d6d86df9aed313238f28e1b3c4d7ae4a8f7f00f4 SHA512 de16874aa714a7e3640a9673a1445049256a2a05122f57a8646fd375a295f229c8b262e8c7862bbc7257d8db84a9e4ddf03cf841af307bed30e174e8f159508a
 DIST hydrus-457.tar.gz 38915780 BLAKE2B 56506ba2098198f42593a061a79f7f6521597f057d87c07eb66b3a213111a46caaf1e167e9f49deaf3d3ffe6259105b6d19cca8fb8fbd0d1c708d796eea63394 SHA512 2a653f69928f4b65cdde332e7be52861527237a284a61ddd0536b6e1db40f91424e78953910dacf494d947a57086cbfbf9588fe638143f386910fb1d7ba1e484
 DIST hydrus-458.tar.gz 38922758 BLAKE2B 3339e44498a606664cd54357cf285f96eb4f146673d9991b9b0fb82bc961b31f4f47c9f27616251b610c4e28664a6b4753aa99713e50d93e79121270796b1408 SHA512 0f2c419012c683c163fd180662eb9d2eb5610a6d87c0cbd42be91dbdf6101e747ba0c6238d1574084a30d1da1c7546a79b0e648fe55420c510d47ab26fad28c3
 DIST hydrus-459.3.tar.gz 38933609 BLAKE2B feb1888d63dc8b6df7f070115c541c2863442ba46d8cd47648ecb35c49cf8181879760197b200f2b968eca5d51a40522d7fdb8434c19b7c6e37d0ae08b0dce74 SHA512 45bcb9b6ad7ae529b980b6759ececaf4175750e775b9f01bae754eb25321d46e0dc4d7fd2723cd43a53aff2d37433a5fdde691f6f7c6e46fb35c8dd216f88157
-EBUILD hydrus-456.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e
+DIST hydrus-460.tar.gz 38935581 BLAKE2B f4b159f3f45e5f13867cdf163605389722d35616d5235bb64593125b83c7d9177ac590febce4beeb266be1524e106fd41c6badbc11775c6f8921c7647672ea34 SHA512 e01cc54f6906cded7760107d7874ca35f6336b9b3b673f59b5c75facbe63a7374780a92b09e51cf99052bf6149dd4df4cb9b84b768f4dd30411229e585e7a23d
 EBUILD hydrus-457.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e
 EBUILD hydrus-458.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e
 EBUILD hydrus-459.3.ebuild 4098 BLAKE2B a6b0a5817e577b1539d2b3a047f7253ba6bfe0babcf637f583daae1fe67b51da9350a846f27d04ca492e15e6de7a5a7375d0db31267fba89a52e3bba4690a5e7 SHA512 6be825a196983e5c4888e9a5877a48aea7119b300f068ac3961efc919e12bc8da60a413de8db277f7972765a3e32cec78b179fe6f17ac0596e31d97c7cbed53a
+EBUILD hydrus-460.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e
 EBUILD hydrus-9999.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e
 MISC metadata.xml 751 BLAKE2B 05dfcd30440ca7bc1375206469123c5bb93ff7fbb7612191faabee7abe87334bfb4f25db3291cd3a989264516c315eeb489eaac2c83c95b2436446966ba27880 SHA512 f2e7c839e4567355bb6ff1cdbf1355ab7a2fbf166a3f87ac7a8af92fc80efa7833010376317a38e2594a203be66bfcb3e0df9dc7346ac3d37d8466bb0368b50e
diff --git a/media-gfx/hydrus/hydrus-456.ebuild b/media-gfx/hydrus/hydrus-460.ebuild
index 0915a2ae5436..0915a2ae5436 100644
--- a/media-gfx/hydrus/hydrus-456.ebuild
+++ b/media-gfx/hydrus/hydrus-460.ebuild
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index bff735126361..435620453714 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,8 +1,9 @@
 AUX glib-2.67.3.patch 1945 BLAKE2B 8093eb444a360481e0f6fd89334f4ca6a693c6df0d0cdc5bee0bfcc308fc9e8b8090c3ca8c7c772ad7ac074d56e81ff3202f1bfd4ee526e0927b28118d27d53c SHA512 c355c7e67acb29fe41c50af4ac8724c636516394c33e9d529eed23eb6d7bbf014bb0f2f9981ccea9e1b3b98a3f87dc256dc385099eb218353e2b220a3d130172
+AUX inkscape-1.1-poppler-21.11.0.patch 690 BLAKE2B 61fbaf22fa86170d1a72393795fb195b5c93d1c9f3e512751d4a9a355acda28656978529c1022caf9df701bc86e3c2b6e50b14eeed5d0c013013090b51ff6716 SHA512 9c7a312de85d11aa8ff3f7347a5c08ef84050522bc8ab59f9aa1aa84c405ddb707275cab7d447e34b1593d633b99fb8e482864e9397c576d688dcd7d34035c6d
 DIST inkscape-1.0.2.tar.xz 32421620 BLAKE2B c3f9c37b15343ba0955a6d06810aef5fb9e035a240f99579301b8cd93858a62b5ed1a3ff528a9642ec74b8900305495236cf7f4c672864369a4e33dca3b34bd4 SHA512 f4fbc627c0f07db11194715c505b771a60af29a9a7f8be0232e4f7eb6b1c5814c3f160c2003d64ec62aeb92ef44174320a47aa6b6abc7a67cc27c996cba9522d
 DIST inkscape-1.1-musl.txz 10820 BLAKE2B 3e7d346161d8c58436cae01227ce0eafc122276ba4b0483271cbb2e74447c7a89b2033bf709adb521abe2aebca79fffece183786071478b29aedbf3c742c4616 SHA512 8900863fb2d12cb6aea39b2e2ac8d32b512086aa3a26f3598d3117abd0b44f95b6001ea21ac02ce2368dd66dee0faefdef049c433f62380904770b7680680668
 DIST inkscape-1.1.tar.xz 34203156 BLAKE2B 38896509dcdcf1ef18523c790855035ef16dfae75e27c2d69f782270f52a579557edcb790bef30f3210b9f797a619369d7d16dd23f098debdd8e5b6abf9b30aa SHA512 54b75f8794d748ef59d5b719ea04e3debadc1a5cf3f62f14254502567973bbd634850edd0a3bc082be878dacf041e9bd10982c4846bf154f89aa5319eda4ee80
 EBUILD inkscape-1.0.2-r2.ebuild 4143 BLAKE2B 3ed501bf97ae01e72dcd644110f2dab770757eac39f5ec10cb89f7900a55ead460b4f712a9dc0266fdadb297e7a063a245e4a24cf841b9619996886678f6843d SHA512 7c57ca4263c701aa524eb5de03900ca95ad5135a6acd1a5c041f23f8c459efc1086c6e8f74f599ff57ad8a215b0eabebd29e80e54b855a21e818ea5d9e3548dd
-EBUILD inkscape-1.1.ebuild 4300 BLAKE2B 77b5e57c53d9801e3f999e469909e0088552c365d60fed0cf8db0c95cddb9d3912d2da1998f6a139e7284fbd08585bf4ec5c7729b6ed968c13f0f38fa152fb52 SHA512 dfbbae2a1149457ef4a460f4067f197fe77148d32833f8a85074aeb4f33437c38b0f645e5f4f1aa62a07c6e259ab942027a0e64204f0788b4e4dd6b0385dc302
+EBUILD inkscape-1.1.ebuild 4347 BLAKE2B f5a03371d34e26b31cc77520c6fb683a9a8d6ad77b4eb3e561d3a98b8102b9e3c8de5ec751f0885056426e93e4b97da67e4160de7fe3586cf6ea523ec3c0e076 SHA512 7954f86e87fb472dad59ed28858ee8b8e145ff9d03b4baad3d379f57059dd7f80967a4af8c87318cc8c6c5c5c125d0de69bff05ea63314c1a272a9183d5ea028
 EBUILD inkscape-9999.ebuild 4222 BLAKE2B f81dc2dd761939360a098e581fe0ed6eed633b3a93ad8a3898490f04b6213b8d629fa8a32f15c9d1934c393dad8e6f999bf7470e0c3f0167e7066295f6fb6b2d SHA512 147de0d941987a6ff35e1a2fefc07457fd05097150509128cea74a09faf676ae419b41fe0a036e632c68be18a5380b2468c45567c9040eab5374ad56f2dd47ad
 MISC metadata.xml 984 BLAKE2B 8aee1f973005f9587571770eb14ccf725bf3ba9034d9935b029f776e64e17a9e156ec864e1150b259d2a983aec6e53b10791be4f1a3b67d5aa465ee115d966f0 SHA512 7ee7c7d473ae2120b9f592777b08d77899c6bf7f750f09cc334dc76a997a472e2593442fb281a9984d77e1aa4eca39e389484405e0aa8b5614da0f718c713fc0
diff --git a/media-gfx/inkscape/files/inkscape-1.1-poppler-21.11.0.patch b/media-gfx/inkscape/files/inkscape-1.1-poppler-21.11.0.patch
new file mode 100644
index 000000000000..7b02253d5f9a
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-1.1-poppler-21.11.0.patch
@@ -0,0 +1,20 @@
+From: Evangelos Foutras <evangelos@foutrelis.com>
+Date: Mon, 1 Nov 2021 21:45:38 +0200
+Subject: [PATCH] Fix build with poppler 21.11.0
+
+GfxFont::tag is now of type std::string instead of GooString *.
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp
++++ b/src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -2169,7 +2169,11 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/)
+   }
+   if (printCommands) {
+     printf("  font: tag=%s name='%s' %g\n",
++#if POPPLER_CHECK_VERSION(21,11,0)
++	   font->getTag().c_str(),
++#else
+ 	   font->getTag()->getCString(),
++#endif
+ 	   font->getName() ? font->getName()->getCString() : "???",
+ 	   args[1].getNum());
+     fflush(stdout);
+GitLab
diff --git a/media-gfx/inkscape/inkscape-1.1.ebuild b/media-gfx/inkscape/inkscape-1.1.ebuild
index e62f8efdec2c..e59037214266 100644
--- a/media-gfx/inkscape/inkscape-1.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
 openmp postscript readline spell static-libs svg2 visio wpg"
 
@@ -110,6 +110,7 @@ pkg_pretend() {
 src_prepare() {
 	# Backport from master
 	eapply "${WORKDIR}/inkscape-1.1-musl/"*.patch
+	eapply "${FILESDIR}"/${P}-poppler-21.11.0.patch
 
 	cmake_src_prepare
 	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
diff --git a/media-gfx/kgeotag/Manifest b/media-gfx/kgeotag/Manifest
index db0b83676041..13af3dc9f5a3 100644
--- a/media-gfx/kgeotag/Manifest
+++ b/media-gfx/kgeotag/Manifest
@@ -1,6 +1,3 @@
-AUX kgeotag-1.0.0-libera.patch 1142 BLAKE2B 8a99a340f2542f23314034e7bf3a8f88e9b017651039953ebd5eaf7d370383295838ac9c7b1744b23068aad2565d007bb9a87fc40157027c194604f8819497d6 SHA512 aeef253e1953fa3af659f75044a37652c18adb5e44ced94515ed9d117224916698504022f3651828afd10e212f7481f884188d1f9ef4ab62132f4b12c1f9955e
-DIST kgeotag-1.0.0.tar.xz 266488 BLAKE2B ff69ad02fc72766c4c8aa08dedba681cc6d73bfb9004ae8f12282b3cd09bb074acba2231f41ce4693929c3506a89ff90666c01e0c333450fd827eeb787d48c46 SHA512 8696ffe67abbfa2cefdc78c0bfed6894b3e376323a291b64e0aaf6d11eb8f5f2fc5bf1335ebdebc0f5e9d1c99f1c45972c193f7b91e71c14b1da63d5d845811e
 DIST kgeotag-1.1.0.tar.xz 282436 BLAKE2B 8d59665bc56147f1b1177c15ee5e67823cbff1ede19abcfa2c9c6d8f514a72c5d92a8216920fdfdc58a0880d093b570d61f3ec273868059a1182b9f444affa4c SHA512 b849cd43118f05253352a5059f0c29a9e3db59602455f3413ec5bcbe9c4b72c1e695f077089a2fe048443c04ec31be07540d42ab1f055bb32b3b459da7f7911a
-EBUILD kgeotag-1.0.0.ebuild 857 BLAKE2B af7eec9e333b28f1a6f54031844f36ea8fac6a47ed357b19fd2c2dc17e023bb46e264051d8f1d304801175d160fc9fda35b6b86eb2aaa0db59c3ddc817785f9f SHA512 99c62cc1ddff70adbf4c406dacbb32dd54784376f0665d81290f6c9a756f152b3815e31b780a4cacf057833d519d5375054abb1d60fec9eb36b4e7b4258b2cb4
 EBUILD kgeotag-1.1.0.ebuild 837 BLAKE2B 07604082a7fce27aa8b1ec5c302aa9e3e823188ea70f86d73ab06b33519b967458ecba533f19aa4c3fde3f57cd71655805a0184546842f12273e0a8fd8aef8f5 SHA512 77df24a4a158919b9c860085d236d2c21b658a0073c67f84c5159949ca3a1227577627643b99228b5a3e702a87ff0034670702d49fa55934c75845344a8e6f4c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/media-gfx/kgeotag/files/kgeotag-1.0.0-libera.patch b/media-gfx/kgeotag/files/kgeotag-1.0.0-libera.patch
deleted file mode 100644
index eda481559eb6..000000000000
--- a/media-gfx/kgeotag/files/kgeotag-1.0.0-libera.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e8e52e07b3ef08a169bb37affc6689d75b27613c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nicol=C3=A1s=20Alvarez?= <nicolas.alvarez@gmail.com>
-Date: Sun, 23 May 2021 23:35:41 -0300
-Subject: [PATCH] Update IRC network in the README
-
-KDE has moved from freenode to Libera Chat, update the link in the README
-to reflect this.
----
- README.md | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/README.md b/README.md
-index 831e9b0..46ab460 100644
---- a/README.md
-+++ b/README.md
-@@ -66,6 +66,6 @@ If a time drift has been identified and a deviation has been given, the images'
- 
- ## Getting in touch
- 
--The IRC channel of the project is [#kde-kgeotag](irc://chat.freenode.net/kde-kgeotag), and there's also a [mailing list](https://mail.kde.org/cgi-bin/mailman/listinfo/kgeotag/).
-+The IRC channel of the project is [#kde-kgeotag](irc://irc.libera.chat/kde-kgeotag), and there's also a [mailing list](https://mail.kde.org/cgi-bin/mailman/listinfo/kgeotag/).
- 
- Everybody is invited to participate in KGeoTag's development! You don't have to be able to write code to do so. All testing and feedback is greatly appreciated!
--- 
-GitLab
-
diff --git a/media-gfx/kgeotag/kgeotag-1.0.0.ebuild b/media-gfx/kgeotag/kgeotag-1.0.0.ebuild
deleted file mode 100644
index 4b1a02b654ed..000000000000
--- a/media-gfx/kgeotag/kgeotag-1.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Photo geotagging program"
-HOMEPAGE="https://apps.kde.org/kgeotag/"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3+"
-SLOT="5"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	kde-apps/libkexiv2:5
-	kde-apps/marble:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( ChangeLog.rst README.md )
-
-PATCHES=( "${FILESDIR}/${P}-libera.patch" )
diff --git a/media-gfx/mkbold-mkitalic/Manifest b/media-gfx/mkbold-mkitalic/Manifest
index 8ea84447c7ec..26d174e735f8 100644
--- a/media-gfx/mkbold-mkitalic/Manifest
+++ b/media-gfx/mkbold-mkitalic/Manifest
@@ -1,3 +1,3 @@
 DIST mkbold-mkitalic-0.11.tar.bz2 21922 BLAKE2B 90473ee9ce751f491a36b18b4adcfc15a64535ca11b7394a2d46b48a144394ae549133635f898b8b16d87eb3271439fc425cee3cb05e4559818ab00a7d054e3d SHA512 fe40693bc5d73aaf45daf1bbd22f8107fb61604cd4ff0ec09e8bd63029be811a2b1bb46a3ce214954841c5d074e9ec23c150006d9a2c8ffe633e93801c2d7345
-EBUILD mkbold-mkitalic-0.11.ebuild 723 BLAKE2B 42b437bde78d4b94f10bf25666f48fd217932269d214d2988beb56cf83ef154e58563633bf573f6c20fc944a72306d58ba4e72db2572db39f7a7ec945b6ba065 SHA512 0900b7eb446706a9090f9a1f3614e0b0f735581caad52c4d6085943cb660c0cc9bebc50c2c856c148460c0c90a68c82f32116a21d056343bf5476a3a1e63832a
+EBUILD mkbold-mkitalic-0.11.ebuild 728 BLAKE2B 3531a2515990e6583e3fb472a57c8057fb2e50b1614b17394d7e6a697dd33eff3c04f8501fc55d6d8026baee02762e0b74bf660dd5b6c2863460a686af1525bb SHA512 65760abe3325137b5f28d0889d3551f8e78a4052157d8fd09129cc3edb0bc02eaded07a5f2a4e163f3b2a01bafac41aa4dfc0ac89c6656dd8fc3dabbaed1d75e
 MISC metadata.xml 249 BLAKE2B a37da98d387308dab889eab2665b67e4176707f3c115a7a69cb7f4b19f9864b96bc2fe70efa105e627c4b57a7d626f6b23dc2709a225a9debada3356f3cf32a0 SHA512 a5095fb01e05f24583a962e36131b2f02cf2d1dd7a97051200e465ad97db014721de7c1857f5eb736cb0290682e8de833cb4c735f7de8d98cdfae1aed6d3d549
diff --git a/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild b/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild
index af4e08196143..28a205ef994b 100644
--- a/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild
+++ b/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://hp.vector.co.jp/authors/VA013651/lib/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
 
 DEPEND=""
 RDEPEND=""
diff --git a/media-gfx/plantuml/Manifest b/media-gfx/plantuml/Manifest
index 87d0f4bc68ae..8e9d08fad27f 100644
--- a/media-gfx/plantuml/Manifest
+++ b/media-gfx/plantuml/Manifest
@@ -1,5 +1,7 @@
 DIST plantuml-1.2021.12.tar.gz 4730150 BLAKE2B ea3614d1167d00364686ae3a7aa78fd596ed4235d8638bfa8272e9a75102b0f2a1a140fd4a6c5210c200c251a8a0a6f108a44cad5eab98a0e72e2a5a2a44f190 SHA512 bcd0fd84ff0874b09ab65a406487f445884b8b96fa4b9b840f70e232de9717c891fab19bc44bd0e2e9622bef8d0b988997876b04960875699515a6bd31355935
-DIST plantuml-1.2021.5.tar.gz 4632326 BLAKE2B 356830c8e8be3866fc8f7512d2fe07656cc21a01c6bad2dd5a01f990cc34e234be213a4402743359f528a2f018b2fa990addc25dbce9e096ccc34551d25d82e4 SHA512 b8d9868a05d79fe75671190a3a7f51a9ff018e5c659bd1144c02d5c860f96fb2a067cb802d40c2d0db7cb2268b291efc49337280154b8a43563696735be1caeb
-EBUILD plantuml-1.2021.12.ebuild 751 BLAKE2B 893f8f933be06f96283feb2fa5ed98ec01db76209ad246710d48b83e60de122e6d1e2b32879ff20de051b5789562621b9dff77a27bf1b327410129dfbc150cc4 SHA512 d0f8074c7588849c330c9c5259092348ba4df4ca5d0de4d122ae1123e183b63893d8754419a7fa74faf6ecc42ce66a73ecbdbda307559c0f9d1f94bdeafcdeb7
-EBUILD plantuml-1.2021.5.ebuild 750 BLAKE2B c6f294d0ebcea2df17681fa103506693d6698b7ab87befaeafd5a67a351faedbaa4241cfbd1a38ef1b42d55bb34d20d09dfda65b18890a32669c868262b1f301 SHA512 5986d587915b3c0d5bf8733311848c78d0c0203a8e4b7d0f9281a7c2717f4275fb3311faad5625c53607fddbf2b8b74b7e5c3368450e6de207f2e07438801aa2
+DIST plantuml-1.2021.13.tar.gz 4742792 BLAKE2B 3ad1d593e63472c12f3242ef10a9e3b63fcb2d1dad3c7cf64cad8cc12a15526dab3f88d75d95b030be3aa505bed0464d08f69c00ea509cecb73cae7ba84ed752 SHA512 9bb2da04fc4b1cdbd372edb7a63bef67723456141b47419b692e1da0cc3d28fe61020f8fa03da340a57909e621abca0bac46bfbbc4bc6afe8f0d1cae58577eed
+DIST plantuml-1.2021.14.tar.gz 4756407 BLAKE2B 86261a79ed24cff626fd4c0a9a64f3912251ea0ef2a5724ceceda1daf93d8c50eebd42e8b6d1b3eb2d67a6ad62496d6b47ef92b50e2bbebb9e39270dee27eac7 SHA512 18abfb402f93a63be0ba02e6fe028bc99d25502714e4a2d92c8b7227088f6af4a10a1a8b63c001a0c2d2f5386385a7e22e1daa787617faf78efe2732cf029f50
+EBUILD plantuml-1.2021.12.ebuild 750 BLAKE2B c6f294d0ebcea2df17681fa103506693d6698b7ab87befaeafd5a67a351faedbaa4241cfbd1a38ef1b42d55bb34d20d09dfda65b18890a32669c868262b1f301 SHA512 5986d587915b3c0d5bf8733311848c78d0c0203a8e4b7d0f9281a7c2717f4275fb3311faad5625c53607fddbf2b8b74b7e5c3368450e6de207f2e07438801aa2
+EBUILD plantuml-1.2021.13.ebuild 751 BLAKE2B 893f8f933be06f96283feb2fa5ed98ec01db76209ad246710d48b83e60de122e6d1e2b32879ff20de051b5789562621b9dff77a27bf1b327410129dfbc150cc4 SHA512 d0f8074c7588849c330c9c5259092348ba4df4ca5d0de4d122ae1123e183b63893d8754419a7fa74faf6ecc42ce66a73ecbdbda307559c0f9d1f94bdeafcdeb7
+EBUILD plantuml-1.2021.14.ebuild 751 BLAKE2B 893f8f933be06f96283feb2fa5ed98ec01db76209ad246710d48b83e60de122e6d1e2b32879ff20de051b5789562621b9dff77a27bf1b327410129dfbc150cc4 SHA512 d0f8074c7588849c330c9c5259092348ba4df4ca5d0de4d122ae1123e183b63893d8754419a7fa74faf6ecc42ce66a73ecbdbda307559c0f9d1f94bdeafcdeb7
 MISC metadata.xml 822 BLAKE2B 2b2fbd2c5cac001a33c087d4fd4d3e3bd7349ede7af50e08a838a0f395375a627717e80afd658d2ce7211b0adeba2acc88f868eb5e40915c1fe35526c710e79f SHA512 9f3c1d975ce742b95c3be9c049b99a7bdb8e4f1e8eab0da18fa331214c1ef6c66263ed1226554ab0581289bf9d45b5aa7f947ec3bb64e629817d3a2333c13eae
diff --git a/media-gfx/plantuml/plantuml-1.2021.12.ebuild b/media-gfx/plantuml/plantuml-1.2021.12.ebuild
index 6ff07a08c731..2293ae97609b 100644
--- a/media-gfx/plantuml/plantuml-1.2021.12.ebuild
+++ b/media-gfx/plantuml/plantuml-1.2021.12.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://plantuml.com"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 
diff --git a/media-gfx/plantuml/plantuml-1.2021.5.ebuild b/media-gfx/plantuml/plantuml-1.2021.13.ebuild
index 2293ae97609b..6ff07a08c731 100644
--- a/media-gfx/plantuml/plantuml-1.2021.5.ebuild
+++ b/media-gfx/plantuml/plantuml-1.2021.13.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://plantuml.com"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 
diff --git a/media-gfx/plantuml/plantuml-1.2021.14.ebuild b/media-gfx/plantuml/plantuml-1.2021.14.ebuild
new file mode 100644
index 000000000000..6ff07a08c731
--- /dev/null
+++ b/media-gfx/plantuml/plantuml-1.2021.14.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 3a7777927934..a0cd374293de 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,5 +1,5 @@
 DIST shotwell-0.30.12.tar.xz 6519996 BLAKE2B 7417f1bf0057b4974b45be675b177f6fba232d60d56c3d98cc6d5a7a95a31281add5190a04eab965739759aa7d826515996f2fd62350352a54ebf969dc732d95 SHA512 3274f15969be7f75ad2fa44e78773b76e11ee6cf8d4990c7f658fa8ce7e84a8fa5f06542fbab4b585c70e41c097c7b07ba702540102e4d0dfca8e927e00180cf
 DIST shotwell-0.30.14.tar.xz 6524680 BLAKE2B 321406d3731a4baa333c3820ee46e8dc12ca9a340c7f1ac3824ee894fa2826b7efa3ee7a27f551d62043e5f22199042befb5063cc67cefd27830e19db7d7f661 SHA512 bd899ac099ec4760f6119804812ef9314c9261c18273309abfb1dccc675b9e4a561c0abea1c46ea0dbbab9f5c00301d840b52714f97ec06548c180a77871db7c
 EBUILD shotwell-0.30.12.ebuild 1769 BLAKE2B ce81642084c5b8ac1b41b72842ac4c798ab3a2a136e95f899735bd4dbab8d013809c1a0b6139f366b2f0e6a76d7a26a314b80ea453405e2a2f4eb1dbfd2e5d3a SHA512 e8aab87360f510ee71ae3b06f9904a7895223ea31ec1b7a5e29f9f8238668e523d5654bad84c4f459fdad78cc6853f4478994c2383535b834c342a4c6469e081
-EBUILD shotwell-0.30.14.ebuild 1770 BLAKE2B e303b726fe6ecc295eaabcc65efe9d044dac4a51e0d51de54145d02aac7a9d2f790552b20549d76b1fe4bb5b22eaf008c7c5801ca4cd5767219f022ad520cb34 SHA512 e26e678c2cdd099df62e9e0782dde73883eea688a32a633871bd1c416b2b9a8f21fe51bec6eab482039392de678ba03ee90e4a63a4c4b9737e8aed286d9de03d
+EBUILD shotwell-0.30.14.ebuild 1769 BLAKE2B ce81642084c5b8ac1b41b72842ac4c798ab3a2a136e95f899735bd4dbab8d013809c1a0b6139f366b2f0e6a76d7a26a314b80ea453405e2a2f4eb1dbfd2e5d3a SHA512 e8aab87360f510ee71ae3b06f9904a7895223ea31ec1b7a5e29f9f8238668e523d5654bad84c4f459fdad78cc6853f4478994c2383535b834c342a4c6469e081
 MISC metadata.xml 796 BLAKE2B e0c9ab623e0fdaa1df57951920708e41359ae3d2d8335ebb4012c5428a965d426698adb4a8e0815116a07b03e55e3d44aa11e5dcffe4d82bac8e733eaf302995 SHA512 c21d7613c7f200cdd15bf45d201a83c38fa5fc52f40c833d638afc48cef17a8e9db016b29ec3ff95e625cfc750e8bff7603a4fe2ea26fbad1504b581da43c165
diff --git a/media-gfx/shotwell/shotwell-0.30.14.ebuild b/media-gfx/shotwell/shotwell-0.30.14.ebuild
index 5d0a000fcb6b..46f2f6e7fac2 100644
--- a/media-gfx/shotwell/shotwell-0.30.14.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.14.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86"
 IUSE="opencv udev"
 
 DEPEND="
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index d54e67a1504e..0739aa49f7e8 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,6 +1,8 @@
 AUX 40.0-add-control-optional-deps.patch 2713 BLAKE2B 594f076b9515697322711033a206eb6aa7ab8940c6d4ef5711af4bdaaa126b82738b2d300d97843a9c889c314d16873ea05ecb07e0c566e8a273289fc799f8aa SHA512 60bdf1653292f5e2b3ef435c35c81a5eb2963142ea14e2095c5c5673d776979053c65ef0e54f80b503489dcc6e93d1a2ab8d29711059c469ecebcb83ece5e42c
 DIST simple-scan-40.1.tar.xz 1471116 BLAKE2B 4e9071c497cf47600cef7dcbf4c47dff6f8cd8cbd8a72ae45e4ac68b749f5fc89d0e97912e174cab02959efe2e30451403ab0336221ead44fc87747dbe4e29e1 SHA512 1ccd512ce84ed0d2f97f4e2e5220a2e8a850e575cb9dac58ef446f8cc37575a72a2e80ffa240874532433667225b632cd1dd4e68f66dae3dd26be118f3ec21cf
 DIST simple-scan-40.5.tar.xz 1476536 BLAKE2B f386b2765b2479f1a41a7618a3f9f72c85d003c3ba1495012d59902059f348edb2897821a8ceaa631c2b9043a292ffceaf5bd4fc2f4442931120f3e9ff336f4b SHA512 cf87a0dbaea09ee0aa0333d487179dc1ab661a7c13321ff92cd7c7de62f6f9cdcf4a858e1fb24df07fe4b0cb01694bea915c61e2c7ce6e44ecf549613ccbfa6f
+DIST simple-scan-40.6.tar.xz 1479816 BLAKE2B 1fd9a28e30dc350594a051c389740a2770989f803800bd00b4e99383d3f15167a4b9a5445dbf7a877db1e4ea0e1d1291c2e48e0ddaf48fa5db6c34b6e566a127 SHA512 fc9a4e7899de0539b9f58faef29d5b7e185c4f9a5281e29a9bba0941ba1cfb1efd5f04b4d41920f55dd2ee812e032a1b92b2acd91d6a76114770b6e3a654125b
 EBUILD simple-scan-40.1.ebuild 1446 BLAKE2B d337303876bb8b236326f29bf4324f34c8a9e59bb6f0bafd8bb2ead1797484d6de9a5dc6525120afdaca61cb6a0d0ebfd630f36274596c2592f22cc972ed3fd2 SHA512 80bf6ab5a88eeb60094495f151e1155b96c426c41eea747ead16a6afdb7b1299a75c6a293941162d140b9572fb32ed6c36ec1ee0e21ec06be2455c13618b30b5
 EBUILD simple-scan-40.5.ebuild 1451 BLAKE2B 7fb4fdd28d38cacc4ca03c4e3ab57930c5b4fe58aa61d60f2f0dccd3669c9fa5c02c141b7e555fc3f166da8e4866ff9ce9135484122fca78c7a53d23644f5cca SHA512 92491ae8c1424e0abd5a0b035069f5a6f5f23aae234d7cd66ee405958f55597afd774cc7550e4055b1a8a2f5d9f2b7bcf243c8bc9ee0c1b3422724481c1b1ad2
+EBUILD simple-scan-40.6.ebuild 1451 BLAKE2B 7fb4fdd28d38cacc4ca03c4e3ab57930c5b4fe58aa61d60f2f0dccd3669c9fa5c02c141b7e555fc3f166da8e4866ff9ce9135484122fca78c7a53d23644f5cca SHA512 92491ae8c1424e0abd5a0b035069f5a6f5f23aae234d7cd66ee405958f55597afd774cc7550e4055b1a8a2f5d9f2b7bcf243c8bc9ee0c1b3422724481c1b1ad2
 MISC metadata.xml 617 BLAKE2B 41b65f58d578371b4219664b11bf04f081e9a4dd6d146d977689708bdc4d847f85ef86cb4391eb45d24c21185889ff9e5122fd3b6658a24965d231f75ea5b8da SHA512 fb3e56709421b416cb42f1f025308404117c5cf0dfe37419c2d9fa5a18a7397e7f6f9117143df4fff1e2347fd65cfcb9e7007c6c9be56df79641b024d21c1db5
diff --git a/media-gfx/simple-scan/simple-scan-40.6.ebuild b/media-gfx/simple-scan/simple-scan-40.6.ebuild
new file mode 100644
index 000000000000..9389dd00888b
--- /dev/null
+++ b/media-gfx/simple-scan/simple-scan-40.6.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
+VALA_MIN_API_VERSION="0.34"
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Simple document scanning utility"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="colord webp"
+
+DEPEND="
+	>=dev-libs/glib-2.38:2
+	>=x11-libs/gtk+-3.22:3
+	>=gui-libs/libhandy-1.1.90:1=
+	>=sys-libs/zlib-1.2.3.1:=
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	>=dev-libs/libgusb-0.2.7
+	colord? ( >=x11-misc/colord-0.1.24:=[udev] )
+	webp? ( media-libs/libwebp )
+	>=media-gfx/sane-backends-1.0.20:=
+
+	virtual/jpeg:0=
+"
+# packagekit? ( >=app-admin/packagekit-base-1.1.5 )
+RDEPEND="${DEPEND}
+	x11-misc/xdg-utils
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(vala_depend)
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gui-libs/libhandy:1[vala]
+	dev-libs/libgusb[vala]
+	colord? ( x11-misc/colord[vala] )
+"
+
+PATCHES=(
+	# Add control for optional dependencies
+	"${FILESDIR}"/40.0-add-control-optional-deps.patch
+)
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use colord)
+		-Dpackagekit=false
+		$(meson_use webp)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
author	V3n3RiX <venerix@koprulu.sector>	2021-11-13 13:10:00 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-11-13 13:10:00 +0000
commit	e9d044d4b9b71200a96adfa280848858c0f468c9 (patch)
tree	1bd8ef816043a8cd340f1d774e79553a1a7d31d8 /media-gfx
parent	fc2f1018fc323ef2c6572734a9b130427cba76a6 (diff)