gentoo auto-resync : 17:06:2023 - 19:45:55

11 files changed, 4 insertions, 546 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index b8c23a3f1928..ea772f54dd84 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index b90266113ab2..d38fb536ada3 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -2,11 +2,9 @@ AUX blender-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch 451
 AUX blender-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch 986 BLAKE2B 6055d38fded76be0c3f1f42f1e17e434ba69be90a0fb032856b1a339683a28c6786e945fc88d7b39006efc090e198586e5ebebb8fa542e93bcb07b9b91f6ce1f SHA512 8c5259d54e687ae03316fa69efcee02dbbf2a374de6fa9151484795af7d602c2d603900f1b38b7d4a09d8cb66e73666e500cb37004cbca5a13241d9cb5442ab0
 AUX blender-3.2.2-support-building-with-musl-libc.patch 5583 BLAKE2B 193548ea61608b6a355912cdd11eba60c58ac7975612890ff26b95b0d8974e3ed871e9e3d5437b7e36fc22b6a711e7af672b87a4e4f0b0765b95e4065dbcb934 SHA512 225065ac63344084918585272badfd58dc542e4b9370351fa4ff246fb8568d18027bd1d07fc139ac247236b75690578bb598731e00ea18767ed8e9d34d35b2fc
 AUX blender-3.3.0-fix-build-with-boost-1.81.patch 490 BLAKE2B ff9625bec6783a5a55d2d0a8b9afeae718e0c8d714aee42e89577158504b72f6cdc325a3aa4b21291319ed886f722d6216af8ba4680ff5cb046289c9f2dc9f61 SHA512 9a7bad9947c03e3265c07266fb901319665cb2869395c46e5a9a63953772a5af880b6f038e38a695bb9e0cbfaae1f1a08fa61b8a565d2081e6c8d9e6c7a80547
-DIST blender-3.3.5.tar.xz 41889880 BLAKE2B 145589da5170c760901bf1ca9e9dec8d0b05602aa975cb0e74aadbeb96f326ecd5e0f92cd329c4f70e17c9e3590cf9b1c6611e157c984acd1e9bd06134fee17e SHA512 021deb19cf5e1ccf30e41ff8635ba441d48eddcf4778a11f7c089e6b54f44197fb3679eb967d2ffce47884759b563f20dfbb9a3ee027f79ca78bc3080bd0e85f
 DIST blender-3.3.6.tar.xz 41912972 BLAKE2B 94f9dd1a7993f399d612275ed3cfc1d482b0778d2d0b50ae40b73714b6afce93e036915a5b8ea415b6642b1e2d0a281db15ba8addd95c23771c381050722aac7 SHA512 db453b9c7c0ad508e04f603c970e111afb577f3dc0bd25f2ce47312e8560223dcf0307b0a306014dd79adda76de49b6d26e6e63400cade1430568332fe5b2d57
 DIST blender-3.4.1.tar.xz 53666296 BLAKE2B ec5b2771c1b55ecdf3c2c86a413ae5599545800fc072eff45cf212b32c74af60fc3d650ad931fff221c1073adb2b447df3287a965f884a4760a5d972c9877aee SHA512 d6de3ec9cd1a1e4d4e4a838af0cfc113c91c3c1b66703027e0ed61bd818dafc4e4304fd041738ddea32fc76b1ad9b7737cbdcf74d56a0406a87c457375d907ab
 DIST blender-3.5.1.tar.xz 69780800 BLAKE2B 6961280b9d5fb606a35137ce355bf07b4dc16908d5d52cfd3a914907721da16108b8780b1894413a69ab69d455f5d1575697079a24c2bdcecb17174cf7a7c7c7 SHA512 7c9c03de8532884f8ab39fecf1450f8be4bc937a018bd14240ace81a89e422625aba9c4865f6efbb8371f5f01e930932fa5cf03c9d14d44c5312db33e3c56131
-EBUILD blender-3.3.5.ebuild 13245 BLAKE2B 9d353c3db3ec2796802c39d60948223c257fc20b363f34b36e5bfe606c1271c1f1108e67d9b7cdb0134613628681b3a303a5d7173d3faf539423ba1bce00b4ee SHA512 e0f272fedbdd9ce8f6041e437b42f42a18879dd62a6db7b676db23bd79184669f9658a3a7ef55133823fd50412e12b8be17f9aa96f878508272c4d7da8fc40fc
 EBUILD blender-3.3.6-r1.ebuild 13242 BLAKE2B 49afeb5ff02c1c5374cc78a351b372769d846316c63a20123a33a6ca3b697375c34e983b756aa34abd584f8d649371509b9b99dfa61217d8ba2d5b592266b4fb SHA512 788ab19bdb40dec682b940c733a9c9da159f5dd42628a39077c4e738b411f32b31c08a8c6df7f8f4c1f99053f976e5da84a64dfd2fc5d525b1bcfea7a233e65a
 EBUILD blender-3.4.1-r3.ebuild 13488 BLAKE2B d462a220475d41c214de0c4c0a3787a24de024f9bc2319a0f276f62ccba64f38caa22c7c139f3263af7afdaf8804002e44a023e563b539be3db39408042af0ff SHA512 f4f7c593ff0e91e05b56e6fb83feddbe5ffd151e9cbde68044a34c25e5d2f83d31d573d84be2ee297e2022643cc4e44f4b3898e4afd6a7f128c22de7605693f0
 EBUILD blender-3.5.1-r1.ebuild 13774 BLAKE2B 760feb5b5c241d0b2045895445e4376953c63407f8783c7754dd7e0e3b7c5e3d9626b38924e03c0d57b61f6ba0cd8c3ed62189f21b5e5d67c966aa9c88e29328 SHA512 3cf28808dacb489f19674ee20a67693925393726dd709a4836f522a0409b619ac8dc47a2718ee1bb526c503e20bccb27a1426214b8076058bf879ca1a10769d5
diff --git a/media-gfx/blender/blender-3.3.5.ebuild b/media-gfx/blender/blender-3.3.5.ebuild
deleted file mode 100644
index 7a781db97e77..000000000000
--- a/media-gfx/blender/blender-3.3.5.ebuild
+++ /dev/null
@@ -1,417 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_10 python3_11 )
-
-inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="https://www.blender.org"
-
-if [[ ${PV} = *9999* ]] ; then
-	# Subversion is needed for downloading unit test files
-	inherit git-r3 subversion
-	EGIT_REPO_URI="https://git.blender.org/blender.git"
-else
-	SRC_URI="https://download.blender.org/source/${P}.tar.xz"
-	# Update these between major releases.
-	TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
-	#SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )"
-	KEYWORDS="amd64 ~arm ~arm64"
-fi
-
-SLOT="${PV%.*}"
-LICENSE="|| ( GPL-3 BL )"
-IUSE="+bullet +dds +fluid +openexr +tbb \
-	alembic collada +color-management cuda +cycles \
-	debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
-	man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
-	+openvdb optix +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \
-	test +tiff valgrind"
-RESTRICT="!test? ( test ) test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	alembic? ( openexr )
-	cuda? ( cycles )
-	cycles? ( openexr tiff openimageio )
-	fluid? ( tbb )
-	openvdb? ( tbb )
-	optix? ( cuda )
-	osl? ( cycles )
-	test? ( color-management )"
-
-# Library versions for official builds can be found in the blender source directory in:
-# build_files/build_environment/install_deps.sh
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=[nls?]
-	dev-libs/lzo:2=
-	$(python_gen_cond_dep '
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/zstandard[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	')
-	media-libs/freetype:=[brotli]
-	media-libs/glew:*
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/libsamplerate
-	sys-libs/zlib:=
-	virtual/glu
-	virtual/libintl
-	virtual/opengl
-	alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
-	collada? ( >=media-libs/opencollada-1.6.68 )
-	color-management? ( >=media-libs/opencolorio-2.1.1-r7:= )
-	cuda? ( dev-util/nvidia-cuda-toolkit:= )
-	embree? ( >=media-libs/embree-3.10.0[raymask] )
-	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
-	fftw? ( sci-libs/fftw:3.0= )
-	gmp? ( dev-libs/gmp )
-	!headless? (
-		x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXxf86vm
-	)
-	jack? ( virtual/jack )
-	jemalloc? ( dev-libs/jemalloc:= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	ndof? (
-		app-misc/spacenavd
-		dev-libs/libspnav
-	)
-	nls? ( virtual/libiconv )
-	openal? ( media-libs/openal )
-	oidn? ( >=media-libs/oidn-1.4.1 )
-	openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= )
-	openexr? (
-		>=dev-libs/imath-3.1.4-r2:=
-		>=media-libs/openexr-3:0=
-	)
-	opensubdiv? ( >=media-libs/opensubdiv-3.4.0 )
-	openvdb? (
-		>=media-gfx/openvdb-9.0.0:=[nanovdb?]
-		dev-libs/c-blosc:=
-	)
-	optix? ( <dev-libs/optix-7.5.0 )
-	osl? ( >=media-libs/osl-1.11.16.0-r3:= )
-	pdf? ( media-libs/libharu )
-	potrace? ( media-gfx/potrace )
-	pugixml? ( dev-libs/pugixml )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl2[sound,joystick] )
-	sndfile? ( media-libs/libsndfile )
-	tbb? ( dev-cpp/tbb:= )
-	tiff? ( media-libs/tiff:= )
-	valgrind? ( dev-util/valgrind )
-"
-
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:=
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		dev-python/sphinx[latex]
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.2-support-building-with-musl-libc.patch
-	"${FILESDIR}"/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch
-	"${FILESDIR}"/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch
-	"${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.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)
-	if ((${BV:0:1} < 3)) ; then
-		# Add period (290 -> 2.90).
-		BV=${BV:0:1}.${BV:1}
-	else
-		# Add period and skip the middle number (301 -> 3.1)
-		BV=${BV:0:1}.${BV:2}
-	fi
-}
-
-pkg_pretend() {
-	blender_check_requirements
-}
-
-pkg_setup() {
-	blender_check_requirements
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} = *9999* ]] ; then
-		git-r3_src_unpack
-		if use test; then
-			TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests
-			subversion_fetch ${TESTS_SVN_URL} ../lib/tests
-		fi
-	else
-		default
-		if use test; then
-			#The tests are downloaded from: https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests
-			mkdir -p lib || die
-			mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die
-		fi
-	fi
-
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	blender_get_version
-
-	# Disable MS Windows help generation. The variable doesn't do what it
-	# it sounds like.
-	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
-		-i doc/doxygen/Doxyfile || die
-
-	# Prepare icons and .desktop files for slotting.
-	sed -e "s|blender.svg|blender-${BV}.svg|" -i source/creator/CMakeLists.txt || die
-	sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i source/creator/CMakeLists.txt || die
-	sed -e "s|blender.desktop|blender-${BV}.desktop|" -i source/creator/CMakeLists.txt || die
-
-	sed -e "s|Name=Blender|Name=Blender ${PV}|" -i release/freedesktop/blender.desktop || die
-	sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die
-	sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die
-
-	mv release/freedesktop/icons/scalable/apps/blender.svg release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die
-	mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die
-	mv release/freedesktop/blender.desktop release/freedesktop/blender-${BV}.desktop || die
-
-	if use test; then
-		# Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests.
-		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i tests/CMakeLists.txt || die
-		sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die
-	fi
-}
-
-src_configure() {
-	append-lfs-flags
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=OFF
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DPYTHON_VERSION="${EPYTHON/python/}"
-		-DWITH_ALEMBIC=$(usex alembic)
-		-DWITH_ASSERT_ABORT=$(usex debug)
-		-DWITH_BOOST=ON
-		-DWITH_BULLET=$(usex bullet)
-		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
-		-DWITH_CODEC_SNDFILE=$(usex sndfile)
-		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
-		-DWITH_CYCLES=$(usex cycles)
-		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
-		-DWITH_CYCLES_DEVICE_OPTIX=$(usex optix)
-		-DWITH_CYCLES_EMBREE=$(usex embree)
-		-DWITH_CYCLES_OSL=$(usex osl)
-		-DWITH_CYCLES_STANDALONE=OFF
-		-DWITH_CYCLES_STANDALONE_GUI=OFF
-		-DWITH_DOC_MANPAGE=$(usex man)
-		-DWITH_FFTW3=$(usex fftw)
-		-DWITH_GMP=$(usex gmp)
-		-DWITH_GTESTS=$(usex test)
-		-DWITH_HARU=$(usex pdf)
-		-DWITH_HEADLESS=$(usex headless)
-		-DWITH_INSTALL_PORTABLE=OFF
-		-DWITH_IMAGE_DDS=$(usex dds)
-		-DWITH_IMAGE_OPENEXR=$(usex openexr)
-		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
-		-DWITH_IMAGE_TIFF=$(usex tiff)
-		-DWITH_INPUT_NDOF=$(usex ndof)
-		-DWITH_INTERNATIONAL=$(usex nls)
-		-DWITH_JACK=$(usex jack)
-		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
-		-DWITH_MEM_VALGRIND=$(usex valgrind)
-		-DWITH_MOD_FLUID=$(usex fluid)
-		-DWITH_MOD_OCEANSIM=$(usex fftw)
-		-DWITH_NANOVDB=$(usex nanovdb)
-		-DWITH_OPENAL=$(usex openal)
-		-DWITH_OPENCOLLADA=$(usex collada)
-		-DWITH_OPENCOLORIO=$(usex color-management)
-		-DWITH_OPENIMAGEDENOISE=$(usex oidn)
-		-DWITH_OPENIMAGEIO=$(usex openimageio)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_OPENSUBDIV=$(usex opensubdiv)
-		-DWITH_OPENVDB=$(usex openvdb)
-		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
-		-DWITH_POTRACE=$(usex potrace)
-		-DWITH_PUGIXML=$(usex pugixml)
-		-DWITH_PULSEAUDIO=$(usex pulseaudio)
-		-DWITH_PYTHON_INSTALL=OFF
-		-DWITH_SDL=$(usex sdl)
-		-DWITH_STATIC_LIBS=OFF
-		-DWITH_SYSTEM_EIGEN3=ON
-		-DWITH_SYSTEM_FREETYPE=ON
-		-DWITH_SYSTEM_GLEW=ON
-		-DWITH_SYSTEM_LZO=ON
-		-DWITH_TBB=$(usex tbb)
-		-DWITH_USD=OFF
-		-DWITH_XR_OPENXR=OFF
-	)
-
-	if use optix; then
-		mycmakeargs+=(
-			-DCYCLES_RUNTIME_OPTIX_ROOT_DIR="${EPREFIX}"/opt/optix
-			-DOPTIX_ROOT_DIR="${EPREFIX}"/opt/optix
-		)
-	fi
-
-	append-flags $(usex debug '-DDEBUG' '-DNDEBUG')
-
-	if tc-is-gcc ; then
-		# These options only exist when GCC is detected.
-		# We disable these to respect the user's choice of linker.
-		mycmakeargs+=(
-			-DWITH_LINKER_GOLD=OFF
-			-DWITH_LINKER_LLD=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# A lot of tests needs to have access to the installed data files.
-	# So install them into the image directory now.
-	cmake_src_install
-
-	blender_get_version
-	# Define custom blender data/script file paths not be able to find them otherwise during testing.
-	# (Because the data is in the image directory and it will default to look in /usr/share)
-	export BLENDER_SYSTEM_SCRIPTS="${ED}"/usr/share/blender/${BV}/scripts
-	export BLENDER_SYSTEM_DATAFILES="${ED}"/usr/share/blender/${BV}/datafiles
-
-	# Sanity check that the script and datafile path is valid.
-	# If they are not vaild, blender will fallback to the default path which is not what we want.
-	[ -d "$BLENDER_SYSTEM_SCRIPTS" ] || die "The custom script path is invalid, fix the ebuild!"
-	[ -d "$BLENDER_SYSTEM_DATAFILES" ] || die "The custom datafiles path is invalid, fix the ebuild!"
-
-	cmake_src_test
-
-	# Clean up the image directory for src_install
-	rm -fr "${ED}"/* || die
-}
-
-src_install() {
-	blender_get_version
-
-	# Pax mark blender for hardened support.
-	pax-mark m "${BUILD_DIR}"/bin/blender
-
-	cmake_src_install
-
-	if use man; then
-		# Slot the man page
-		mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die
-	fi
-
-	if use doc; then
-		# Define custom blender data/script file paths. Otherwise Blender will not be able to find them during doc building.
-		# (Because the data is in the image directory and it will default to look in /usr/share)
-		export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts
-		export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles
-
-		# Workaround for binary drivers.
-		addpredict /dev/ati
-		addpredict /dev/dri
-		addpredict /dev/nvidiactl
-
-		einfo "Generating Blender C/C++ API docs ..."
-		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
-		doxygen -u Doxyfile || die
-		doxygen || die "doxygen failed to build API docs."
-
-		cd "${CMAKE_USE_DIR}" || die
-		einfo "Generating (BPY) Blender Python API docs ..."
-		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
-
-		cd "${CMAKE_USE_DIR}"/doc/python_api || die
-		sphinx-build sphinx-in BPY_API || die "sphinx failed."
-
-		docinto "html/API/python"
-		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
-
-		docinto "html/API/blender"
-		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
-	fi
-
-	# Fix doc installdir
-	docinto html
-	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
-	rm -r "${ED}"/usr/share/doc/blender || die
-
-	python_optimize "${ED}/usr/share/blender/${BV}/scripts"
-
-	mv "${ED}/usr/bin/blender-thumbnailer" "${ED}/usr/bin/blender-${BV}-thumbnailer" || die
-	mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
-}
-
-pkg_postinst() {
-	elog
-	elog "Blender uses python integration. As such, may have some"
-	elog "inherent risks with running unknown python scripts."
-	elog
-	elog "It is recommended to change your blender temp directory"
-	elog "from /tmp to /home/user/tmp or another tmp file under your"
-	elog "home directory. This can be done by starting blender, then"
-	elog "changing the 'Temporary Files' directory in Blender preferences."
-	elog
-	ewarn
-	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
-	ewarn "libraries which are shipped with blender. Note that"
-	ewarn "these have caused security issues in the past."
-	ewarn "If you are concerned about security, file a bug upstream:"
-	ewarn "  https://developer.blender.org/"
-	ewarn
-
-	if ! use python_single_target_python3_10; then
-		elog "You are building Blender with a newer python version than"
-		elog "supported by this version upstream."
-		elog "If you experience breakages with e.g. plugins, please switch to"
-		elog "python_single_target_python3_10 instead."
-		elog "Bug: https://bugs.gentoo.org/737388"
-		elog
-	fi
-
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-
-	ewarn ""
-	ewarn "You may want to remove the following directory."
-	ewarn "~/.config/${PN}/${SLOT}/cache/"
-	ewarn "It may contain extra render kernels not tracked by portage"
-	ewarn ""
-}
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 243fb12d0509..046b5431af59 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -12,7 +12,7 @@ EBUILD imagemagick-6.9.12.86.ebuild 7406 BLAKE2B 8ec5b53905aea991534d854fe060ed4
 EBUILD imagemagick-6.9.12.89-r1.ebuild 6444 BLAKE2B 7585630a40907f09e5216f96e7e41a481ad29bbdc8a34cc60f1f5e5c6a10a7ba4d2c9c1240e6f24ddb6be9fb0f441b03bfccdcb5751dcf059fad52b86a8eecbd SHA512 7a5ec731808e700e828b56968ddc761bf8295d16b2723bdec58f80e8e5a8adef5a9828145497ce8a3072163622ad8e52af026c2869fc979a0057525b955a4960
 EBUILD imagemagick-6.9.12.89.ebuild 7406 BLAKE2B 8ec5b53905aea991534d854fe060ed4112885fa49928da5eb94bcbf06e3a84faca7748a811f5a9381721848563b0fe0a1d41d0d6abee004a252246497d56fd1e SHA512 a96b9ac902a34e507361342c4a17469e681da09bd8cead4c254b4a5a5ce3909d5aeeb6b5fbd296b43c23cfa86d95c9a2a168daed410b5405a0cb378a44ef6d37
 EBUILD imagemagick-7.1.1.11-r1.ebuild 6804 BLAKE2B 6f33891f69fa5996457d4dd4c8f3282a5be9a59e95a3d6522af0925f52467ab20a0effd9eacd6720913e1d37ee794523eec5dc135f755d25d87e6a6141345ffd SHA512 f9ee698c763a68ece549146b450d78b57dcc1dc9eb2d271d311f4c451d6c6571ddd2d4adfa1e65e8b37dfa7dd0de0b516b219f04cf6b904d30dcb12b3c3136cc
-EBUILD imagemagick-7.1.1.11.ebuild 7765 BLAKE2B e8c7a695b1146ed85285b7101de2bbde79656eadf2e2787922dab218354f70d31bf355d5c50f26eca9fe06773e9ca21a50542dec9f154c761e268c0449dc336d SHA512 76c10adf3a68df1e9663e9b7acb6269165508f0b0e0c9b7eb7ab5a26021218bf18b15ceaac1bcaf737439efea91b8765b204aceb61abb35ab93f512d19ae2e5e
+EBUILD imagemagick-7.1.1.11.ebuild 7764 BLAKE2B 96f9739b94e381f53742a2285adb1e2e973c23e9b35bccb0fcb9d665102bc28370ea05d4518a4c78d17ad4c076c8c115db8b9fadcf84df3d37ca4b8708974141 SHA512 049af29d7c54ac16ab90a24ffc6333f660c9fbdc824bd58b8c047a473af971bb39a794ab94292cbe4736dd1cecfce59200a89e9287c55fd0de50a62531bbd107
 EBUILD imagemagick-7.1.1.6.ebuild 7744 BLAKE2B 1111c6eb68ebd7dfa390ffd6141735edef84fe0f1f8c911d288d6296986838d4c67535472724ba7ffe4fae5bfe22135a2c3fb1e6f21f7b8b9709d90a3a490d71 SHA512 ffc5d1b0a73c24480937522945281f316841cd800bc5086f4aa53a282d970092278b89d03badabd570dc71cec23240b1d370739e5f4f59952b943e988daa4c13
 EBUILD imagemagick-7.1.1.8.ebuild 7752 BLAKE2B 1c7099ff24e7881478887242c49b42217a9a3c9014af15c96ab0525b468bdb2182ce4032eac1b61a8b6a2b6f36b810ef5332264b14e6812e3296257584e49f2c SHA512 b16e3254e9d7bd3083f5198b3719c9a4ca0982eed25f60a1c559a04f765d6d73a352b02ea35ea8d391e18f5df12f5b87937f7062b3a21b0a4ddf53a29aa6bc0f
 EBUILD imagemagick-9999.ebuild 6791 BLAKE2B 910d0a94a459970fdd35e486bae9fac8dcb6d83c22d4ae7a9bac3e033c8bd34c13207601c0d91990a7d1a451e4f5072187eec6c536a8fdadc1eb71a1544b3764 SHA512 b48373dbc46cd99b3a7b336a1591132e1d19fab82ee950633dd7b4e607ec4f1ce4e87df06402e52079fb3d3bde1b215a2db485b2b8f4128e34d710bb5e37d1d2
diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild b/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild
index e6ea2a4d9f3c..f31710b03d00 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.11.ebuild
@@ -14,7 +14,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/photoqt/Manifest b/media-gfx/photoqt/Manifest
index c97140568a76..161307768966 100644
--- a/media-gfx/photoqt/Manifest
+++ b/media-gfx/photoqt/Manifest
@@ -1,8 +1,4 @@
-AUX photoqt-2.9.1-libmpv-api2.patch 927 BLAKE2B 5bc7066b172ebf8c5b044e83e66c0c4e529756dcc0d2e228fedadc7714690012ec431437a08e63509ce01ba3dd2c5792d695cf87aaab64bac43b46b519c9011e SHA512 57630f6c86ab3a32be443aea7299dcc39538973f2d3f1f03beedb1dbeb79dee4c38fc2889c306146c8fd78dff73de0a2d5d85372c983cf7ee9a615beb607d272
-AUX photoqt-2.9.1-libraw-0.21.patch 935 BLAKE2B 3437071bc0a62122d71b536ce2f211b53e1242f1aeb3837f22e92d48ee7ea75d6e26ab240e46d1f38d76fd3d456ddf22512508d6fea9f3e6e4d0f8a2909de06a SHA512 c45089079fabcd084476ee0d3440402eefddfddbcd1ae71ac6fd498a17531059ff51251bc757a4f988ccb1b138042fdcf3b49f74b85b1ea12646c8c126183714
 AUX photoqt-3.2-exiv2-0.28.patch 5700 BLAKE2B d7387019460ed5b0edf7a79050f0ea8be4a4320c39cc53567d68d25a5f99f87c99e7aaf4932d2b96f8c0af22c7221082ba7323f720f5ea61ec461fa457b1c6ff SHA512 eadcfe4c5583cc6b6b1ab5e4036410c347ffee577e7231570736af8b405a631ad8bb86660854d2102cc9150f4fa7e439e2a3faa583806cbd4a04ba45015e8134
-DIST photoqt-2.9.1.tar.gz 3708647 BLAKE2B dd8c958709ebd830558f150f59c90c317d3f5edb363f92e9fadcd1506de4c97a41f6766670e202081397081c231604028298771eb52911255dae53bfa92a1a8d SHA512 c2ac3bce2ffa0962b243808cdd2495d45af3bd5703389de5e9626a518a8edf25646a317ff420dc0fdd8dc60a53104b1b5ec7e473087454d5c2f0b967066dc192
 DIST photoqt-3.2.tar.gz 965895 BLAKE2B ae1e159401b24a1bede344e4d398dbd6c2ae13fd467a4eac9ef15ea2d15933dc1756325a5a4f305a5f447bfd1a9e2d636e0b9367d0201ca356393c033c4f2f0f SHA512 ab7030d0ed6edf79373b1a99b1b8469cd567f04e5c233a87496084424603d8c241f7b473c22d323f4df8480d3f74918a987d2d590ec5026f1b7ca2c92b5c6bba
-EBUILD photoqt-2.9.1-r2.ebuild 1835 BLAKE2B b0647232f94c3717f899a1e4c12ab7a05bc8ad39f3fbe3daf9f81aad0454c5d8239e9dcc9666a6f0c57a80271129c1956e97283c863a431e6d1d169eb3aac4eb SHA512 10ab70618ab15a0a412fa18d08d50cd06c6417a39a530d9f4ad9ff58636b72042ac5b5c77f301d45132b87f189a1cbcd88f2ac4026c134285bbbdf91317a37df
 EBUILD photoqt-3.2.ebuild 1871 BLAKE2B 8d34b625a17a7741bde801bc8ae5ec76872fabc7e9bf917b3bf0cc5afd45ffe0d30d5b4d90253b076d6da8161b4f08655923666779a7ba5fad3f30f5d5f3b2c1 SHA512 7615976119d9048e24d26f39b8e5736da06e6ef0a99c38a0510e535166ec771a7c9c8dbf517be24dc4583fef70eb7393b34fd9306ffc8106c70278273178d604
 MISC metadata.xml 623 BLAKE2B 6a893c8a21086ca6a7a8d85855b6558171077bff426ac322a13fb70d7e183452ebc68c1a25664b359c0c863415686ce94ffe0cf94bb80e264616b0cf684d2a57 SHA512 7e01a6495e1add1920d9b314dc5bf6732c35d78a4fa0413be8ddbda921136bb8a1acca5af56cee37a1c95b5ec60521c42c8d2580e22ac5d36f0f076f0bc49e08
diff --git a/media-gfx/photoqt/files/photoqt-2.9.1-libmpv-api2.patch b/media-gfx/photoqt/files/photoqt-2.9.1-libmpv-api2.patch
deleted file mode 100644
index 006b90a915b6..000000000000
--- a/media-gfx/photoqt/files/photoqt-2.9.1-libmpv-api2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://gitlab.com/lspies/photoqt/-/merge_requests/10
-From: Ionen Wolkens <ionen@gentoo.org>
-Date: Sun, 6 Nov 2022 13:22:36 -0500
-Subject: [PATCH] [libmpv] drop gl_init_params' deprecated parameter for api
- 2.0
-
-Fixes build issue with upcoming mpv-0.35.0 (libmpv.so.2),
-and remains compatible with current.
---- a/cplusplus/libmpv/mpvobject.cpp
-+++ b/cplusplus/libmpv/mpvobject.cpp
-@@ -74,7 +74,7 @@ public:
-     QOpenGLFramebufferObject * createFramebufferObject(const QSize &size) {
-         // init mpv_gl:
-         if (!obj->mpv_gl) {
--            mpv_opengl_init_params gl_init_params{get_proc_address_mpv, nullptr, nullptr};
-+            mpv_opengl_init_params gl_init_params{get_proc_address_mpv, nullptr};
-             mpv_render_param params[]{
-                 {MPV_RENDER_PARAM_API_TYPE, const_cast<char *>(MPV_RENDER_API_TYPE_OPENGL)},
-                 {MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params},
-GitLab
diff --git a/media-gfx/photoqt/files/photoqt-2.9.1-libraw-0.21.patch b/media-gfx/photoqt/files/photoqt-2.9.1-libraw-0.21.patch
deleted file mode 100644
index 683a72e65d71..000000000000
--- a/media-gfx/photoqt/files/photoqt-2.9.1-libraw-0.21.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/891325
-https://gitlab.com/lspies/photoqt/-/commit/a8908dbfac01886204a5d911106208bd0f15b467
-
-From a8908dbfac01886204a5d911106208bd0f15b467 Mon Sep 17 00:00:00 2001
-From: Lukas Spies <Lukas@photoqt.org>
-Date: Thu, 22 Dec 2022 03:07:40 -0600
-Subject: [PATCH] [PQLoadImageRAW] make raw loader work when libraw is compiled
- without rawspeed support. Not aware of macro to chewck at compile time, thsu
- disabled for now
-
---- a/cplusplus/imageprovider/loader/loadimage_raw.cpp
-+++ b/cplusplus/imageprovider/loader/loadimage_raw.cpp
-@@ -57,7 +57,6 @@ QImage PQLoadImageRAW::load(QString filename, QSize maxSize, QSize &origSize, bo
-     // Since we don't care about manipulating RAW images but only want to display
-     // them, we can optimise for speed
-     raw.imgdata.params.user_qual = 2;
--    raw.imgdata.params.use_rawspeed = 1;
-     raw.imgdata.params.use_camera_wb = 1;
- 
-     // Open the RAW image
--- 
-GitLab
diff --git a/media-gfx/photoqt/photoqt-2.9.1-r2.ebuild b/media-gfx/photoqt/photoqt-2.9.1-r2.ebuild
deleted file mode 100644
index 3d56e5fca782..000000000000
--- a/media-gfx/photoqt/photoqt-2.9.1-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_KDEINSTALLDIRS=false
-inherit ecm optfeature
-
-DESCRIPTION="Simple but powerful Qt-based image viewer"
-HOMEPAGE="https://photoqt.org/"
-SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="devil exif freeimage graphicsmagick imagemagick mpv pdf raw"
-
-COMMON_DEPEND="
-	app-arch/libarchive:=
-	app-arch/unrar
-	dev-libs/pugixml
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5[jpeg]
-	dev-qt/qtimageformats:5
-	dev-qt/qtmultimedia:5[qml]
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	devil? ( media-libs/devil )
-	exif? ( media-gfx/exiv2:= )
-	freeimage? ( media-libs/freeimage )
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	)
-	mpv? ( media-video/mpv:=[libmpv] )
-	pdf? ( app-text/poppler[qt5] )
-	raw? ( media-libs/libraw:= )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/qtconcurrent:5
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-qt/qtgraphicaleffects:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtquickcontrols2:5
-"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libmpv-api2.patch
-	"${FILESDIR}"/${P}-libraw-0.21.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCHROMECAST=OFF # TODO needs python
-		-DDEVIL=$(usex devil)
-		-DEXIV2=$(usex exif)
-		-DFREEIMAGE=$(usex freeimage)
-		-DGRAPHICSMAGICK=$(usex graphicsmagick $(usex imagemagick))
-		-DIMAGEMAGICK=$(usex imagemagick $(usex !graphicsmagick))
-		-DVIDEO_MPV=$(usex mpv)
-		-DPOPPLER=$(usex pdf)
-		-DRAW=$(usex raw)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	optfeature "additional image formats like AVIF, EPS, HEIF/HEIC, PSD, etc." kde-frameworks/kimageformats
-	ecm_pkg_postinst
-}
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 0e200b02b8f8..044ef099722a 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,5 +1,5 @@
 DIST shotwell-0.32.0.tar.xz 35326752 BLAKE2B a201e5cc910872730a902d43a8d8b16f882966100bcc061d8c88fcfd43b1d0db54b98691b2d4a40568ddcb9d9ec28ca31c7575db7ae5ee4db304a27d10999c3a SHA512 0ff24d70cc15b68d5c51bc3ff42a10873656e5e16bfa273bb928a68ae569898136a33df92468b682c2ebc662f0bfa53ac7748b4b140d03b9608b68447b738051
 DIST shotwell-0.32.1.tar.xz 35324252 BLAKE2B a8fd4195dcf495db8413586805f0d75d37759b62847c55dc8e81ed447c7d3c75e1f0f6b95f3982ee0712403b850d735962e4cd0f48ec41426e98c62555fdeb60 SHA512 1d487a0ea7ef0fb1b26d7c53b50e64b7d899bb9082744620dd421195b3ea90765633aac940695371d82fe5054f979e43cb587e726c4fa90712403ea9f60afcfe
 EBUILD shotwell-0.32.0.ebuild 1934 BLAKE2B e8549499b32a85b8866c1c3d7bfb13d9f349c13af02615eb00c1d951c6485a0e26259d95e753ce0b3bddd0b504781fb9dd80bf078cc2d36e5ffc91e1003cb28c SHA512 c1f55da12f1485f8e4fe4d5e76c30621a890b7c261444e0e2b0b034abed698f88c6c061da8e96c0d5096e5f3b4c2b4d3dfb8ffca2ca8c8e8705c82aa81c5100b
-EBUILD shotwell-0.32.1.ebuild 2193 BLAKE2B cc4f741e27b508a1b63f3cf6b557e808c729678f6b82ea808fecbbb6de029112067e4ce1feb2f18189d584eaa36ac57e6b50c7b3ae49c1d0d759a247bc0f65ff SHA512 abb319dcdc2c795016186efbc0fc74d91ee407699f81a4653e35abb6ea2665a7d8fede599d968ae484c82815980c99b63561450e372afd80126b49fb435b6620
+EBUILD shotwell-0.32.1.ebuild 2192 BLAKE2B abf263e31c586649c40152986db6d887708982201212e00933b73c68cb264c4da14a9016e47ae2470d4e3c7b611efbeb9cd90a66c53e1d34ca87bb31169ea572 SHA512 eae7930ffa03d8c30bec87b82e7af7f1ec1c4503cb28606e8bcd32ddee1a7cab26efd6149d03d762da738a0805171165e0a6220dcdb1bf87c1b4ff34a3ca4088
 MISC metadata.xml 794 BLAKE2B c1eb4a08828db11ba473fe21036201d3b57c2fa36a2bd39b18e7671cf5e4c42b2b9e82956456a0376a60bfc982d9af106577075d936dba3c0cb73947da46f427 SHA512 2c65cdf3c6d5a953b52ad81e0a85d1c1465f5c38c3475e5c1408baea0b14a053255e97c0efc560059c77c51dbe98b72a90c6164fe575e68cba3eb04d4774f490
diff --git a/media-gfx/shotwell/shotwell-0.32.1.ebuild b/media-gfx/shotwell/shotwell-0.32.1.ebuild
index 05e1019dc111..f24f91b9e9b8 100644
--- a/media-gfx/shotwell/shotwell-0.32.1.ebuild
+++ b/media-gfx/shotwell/shotwell-0.32.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
 IUSE="opencv udev"
 
 DEPEND="