gentoo auto-resync : 30:09:2022 - 03:23:47

10 files changed, 540 insertions, 10 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 3264228b9642..48c0925250d6 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index f33bb813f1c0..fec1854ae8ca 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -15,11 +15,13 @@ DIST blender-3.2.0-tests.tar.xz 213772908 BLAKE2B 7a4713a3c1bb9f6bfe80b154b913a5
 DIST blender-3.2.0.tar.xz 41520000 BLAKE2B ff68c18bfef1ca6a989e46c8c9d3afa1cc13d6d70dfb6311d9d0742829af0a525531077f48c6a390667e266963e1e8671e370c475a9a8a21bc936d4feb04d248 SHA512 2e9c502fad6bbad7618caad393dfd21d2adc6df0a2de8581cea904cfe3588d783564f2d7ec5600d99d10307a81eb6bb56b31209bf34aae072fbc9a0d8ce54f81
 DIST blender-3.2.1.tar.xz 41497540 BLAKE2B bb9651a7135c3b8ebe03a6dee31b8681d548fc12c56d9de076510f22ff0c94e88b814b57d888ee83a6749c4c79a89288a6717f5fd50f430c88edd3c8411457b8 SHA512 fb496c47b2aebd403e00954d55d140ee9f0dc7733e1013b1665f9db83a132ad63a09226edc662871c8c1b6e2fbd8870954d86cb1324d0c44230f79d2b46aecef
 DIST blender-3.2.2.tar.xz 41510144 BLAKE2B 3859ad2625822a8b73009c4aa6e7ae41d6d9032d0e80027e9bc7c1d71225eebfd3ff539cd4ce6766ef90a5e3672a80b5fc0d44ac9b5e2100116a55b173c53d62 SHA512 963c8f6510503f861c55d900480c5e4cd643974fc88439a62c672c96e049ff222422ddb20d8e82932fd829c078aafd9ea6a7fcc16434d115f49f61b4943c0c04
+DIST blender-3.3.0.tar.xz 41887484 BLAKE2B ed370be06c12e11c08c3c1aea5074a2e162bc901dd457ed7582a580ae9bf894ec50e12dddcad3c6e736f2d59bcf13ea1a54009384050ac7a6e1ec2d6de079f5d SHA512 5257cbb410a26652077c4ccbfbe949ca9daf7d5f8cde5d518ac175dda6b103c56de08e1643fea1988296e04fa3232f21a9eec566c3eef5436960cdc88de19243
 EBUILD blender-2.93.10.ebuild 12557 BLAKE2B 4b78d38bb0fdaaa7d1da419495c97c8b04718503d528fe57ed01000daa32b1f283def2e5d8c1b178e8216cc1bc6cb309db417c77a5c6e9cfabe31246e8479370 SHA512 c7bfdc1edb97bf00ce4734d1d3bdfe2902476aa9252c999362ba75e8efd02ce22105a69b13042706afc47028bab3ea2aa444de7cb94eda57c1ce4f606f06bc68
 EBUILD blender-2.93.9.ebuild 12556 BLAKE2B 6a69144161a3fa171450242fdb7bb9cb6e9090965e698453f505644a584d9ed14f5383046a4e920eb0defbe0ecad8038d96704a39a2730e7697a0a959dd7bc41 SHA512 0cc86caee50787f6aa9aaf773291a8c26559c9449093197cfb780257c2d3809a27842483ae6d3eb798ddac288c5fbb1c856260c9537f308cb42e74db554cec1c
 EBUILD blender-3.1.2.ebuild 12657 BLAKE2B 32a9441cdc5de8c31b5279d783a78657d339efcbf7ab1de74eae72d532dab2fe60e32659b071447b447f5f4f7de682055e2abe490017356c1f3aa41183ba977e SHA512 05d73dbd51708aafc4c46c465f8b579f2fbeeb06d4b2bb10105419bf44ada646b8b935e3405927d7436a4a5920fd4abdec8a23393684af0308445e09f8a24480
 EBUILD blender-3.2.0.ebuild 12656 BLAKE2B 99a1dac1a65ffb9001cc3b5708e1b2aaaca1d072627687a0292e3b833aff728b2f31ce33dc0d48aff53a361b3e71995a79fd74b93ffc8d17006daa5e20ae86bc SHA512 e0e86db3571c7974d4412e43cc71810e8fd03b2089fe0d04d7c1c86d32be991d57249dc625e54ae78f267cc1b8397cf25f176a5921272a14cc0f4c40e03e2fb9
 EBUILD blender-3.2.1.ebuild 12660 BLAKE2B 4b898ea0493ef82750ea0c3a2cec91e7c9b35400aa998f7d1ce694b4483ac2174e6e207d7ab26779112fda2b01d96395ba15d31f6273251fbae8e50c2e5f2fd8 SHA512 6cf2db910ac26163f7045dbf9f37e1ada226d812912f3169ed205bae5e457bba697764ff58276d2265c636bffde4e75f34b756a4b1669cb49be1ee5fb77a5c98
 EBUILD blender-3.2.2.ebuild 13211 BLAKE2B 769a50f1aec4f42fe08a6d34e2a9cf48e9689e128607e234f05323e9a397211844cafd57e0b74b2166efc888554f928b28ac6137a68e87d0b415ae2fd30e4226 SHA512 0cd806a36f5e108a7834b97cd842919d3ad86ee76ba9439a78b7dd181beba6384e28a60ccbae6cce5dd397e8cd5d6f830816f0e324bd5c37848c2c1be3f6c0ee
-EBUILD blender-9999.ebuild 12918 BLAKE2B 15a9dcc0a510b166b25106beae65f555681d7cfaf8881416b20ca94994549f9e0429e2457ad0c5c57ad9ff22add39cc0eb5063d44756f77b7f52c86feb901c46 SHA512 b5dcf7c3056f73ec085a65cc91e853cbb849b404e2f26f8869c472df74499f2a728352a5a47d3d96097563afbdafd68e505338033e035999f2d52d8b35eb3992
+EBUILD blender-3.3.0.ebuild 13174 BLAKE2B 0decb5d9a939094101b0572d154777236e07d451bf40f0e2c178fbe10b3b5d21065b046555673c11c30d9ded1f3971fc995ee6b3547a5051b15f0d32b3c8d050 SHA512 e4df8aa24b9d8054979f69cb39394cdd68cea82141cbd52867761e956bb6e59db2cca692088dd898e5a28360f795f94efb27e664f88b666cc3bf57e7f490fb92
+EBUILD blender-9999.ebuild 12904 BLAKE2B 8fa7f44b796dc1fd162c401b96a20a7313e8de0aa16eacf1f4ab85cde0f0614faefe8195c0db052016ae588526ff7fce2b1ce473d1fc7ff521a32d65d283f196 SHA512 7f50e267c69e5f2211d208c202d04b9f9578f907ac7a9f4c79cb4cc231e0cf2e77bc0a058c0d3b0b9d9cb5cfa7b455a83ac333a1ccee880cea74a48dd4372e54
 MISC metadata.xml 3083 BLAKE2B 6ba639c8ecc383f3ebf51eaf9a3c323d1154868647317c084fd374512e99bcb3a91496e54079d3ec6b41167043529eac95c263240602bf13e0cf2627e65bec27 SHA512 41d73d22d9f35d17cabc45a1784901ce1c5596c791abc6f828590ce886f7ab17491304e49614df8506cef0dc7bd732899cb945e53a0c57d302fc3480e91e04a0
diff --git a/media-gfx/blender/blender-3.3.0.ebuild b/media-gfx/blender/blender-3.3.0.ebuild
new file mode 100644
index 000000000000..a27d961ccf8a
--- /dev/null
+++ b/media-gfx/blender/blender-3.3.0.ebuild
@@ -0,0 +1,416 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_10 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+
+if [[ ${PV} = *9999* ]] ; then
+	# Subversion is needed for downloading unit test files
+	inherit git-r3 subversion
+	EGIT_REPO_URI="https://git.blender.org/blender.git"
+else
+	SRC_URI="https://download.blender.org/source/${P}.tar.xz"
+	# Update these between major releases.
+	TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
+	#SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.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/requests[${PYTHON_USEDEP}]
+		dev-python/zstandard[${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
+)
+
+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/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild
index 0426748b3a70..f903ad6cd28b 100644
--- a/media-gfx/blender/blender-9999.ebuild
+++ b/media-gfx/blender/blender-9999.ebuild
@@ -54,7 +54,7 @@ RDEPEND="${PYTHON_DEPS}
 		dev-python/zstandard[${PYTHON_USEDEP}]
 	')
 	media-libs/freetype:=[brotli]
-	media-libs/glew:*
+	media-libs/libepoxy:=
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:=
 	media-libs/libsamplerate
@@ -198,7 +198,7 @@ src_prepare() {
 
 	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|set(TEST_INSTALL_DIR.*|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
 }
@@ -261,7 +261,6 @@ src_configure() {
 		-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
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index d085b5954f5b..26ed33d8fcb7 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -23,5 +23,5 @@ EBUILD openvdb-8.1.0.ebuild 3209 BLAKE2B 0db931c94e28135dd1819758f4459588c14498c
 EBUILD openvdb-8.2.0-r3.ebuild 3303 BLAKE2B 696e71570894dbb83167c0dbf2edd4db5b06f410fb7af254718ff2d3f7f0cbb44ed4b3279e3c486b3d442e13614aab4f80ec0251e8e5653fd9ad3fd0b6e383f9 SHA512 912bb5c4e2a3214d71985440d695a14e333c52fa4828d687dfcbbaf13aa1e5d377081c7f8889a080a17c79096bbc766ecd587bbe58b89489024f08f6d79e6085
 EBUILD openvdb-8.2.0-r7.ebuild 3242 BLAKE2B 7c1f9ebebb936493a76380f42a4e2d1dc006e67b2f1c89283a09346e2a4400bd834e03dd6b06ea78a417bc09b537a8dbd62db89ad44aba4fb611446c7c1a2a7b SHA512 cbcb0b469f762ae4126d1bf048adc3126a84d246e9cc236bd2e494ae12064130ab4229770bd589a177d0b4ad1eb298682578cf1ff2ec47d1f4e4966d9e6df0cd
 EBUILD openvdb-9.0.0-r4.ebuild 3405 BLAKE2B 8b220e23e015105b665f10bde81d3f2376cece3d541b7241175ad3fdf88946103f8ca5c083056449363f844da9ef0425c410e24d79e7e59a747a3e5d091f227f SHA512 1b74daffb8a015aee84d31d5eb52b957b17d31683230b4f1123c6c3b5d18cf77a5f18c0f2eae506f78691cdb33d8abeec7247097f310b4c08b6c7952cabc1e8c
-EBUILD openvdb-9.1.0.ebuild 4173 BLAKE2B 4a5effec00fca551c6ac8b7ab1cc5bf9ffbbc0cc1a48012da4d73520d2ffd4256f91ddf37540e451e5ab9372caa2fd16a60c57fe2fa118ae08ad9c190a82b3f8 SHA512 2364da0c23dd90c9194c80388decaac5dd5ab18afa6af861dc603d9fbb8ebed9cbf1db4699c422969d163c89c8384b618763d85e34dda3ca03d93ac554e28ef3
+EBUILD openvdb-9.1.0-r1.ebuild 4175 BLAKE2B 364dd6a18ab24a60815e3d91c405bbfdb7a3adfe2d8c66f39758497d56b375134bf47bea9f7d9b3ab91b6da685bb4ba54cf9aff107eaac9528eb496fc6ab6c42 SHA512 7738a6fc4a56748d522ea3a1dcda17017bfc8c53ee41a36e51b0e15d7ca31287efd94de5e6f1ecb1607259180d8834e3603e32ba41f7a5d1d633b7c525934afd
 MISC metadata.xml 2098 BLAKE2B b0e8c528f40ab7b201da0767713f0813c805c4e33ea59a228c8738286a3d8405939c1ffa9295214f475b86d0a256f9b1b67d15e48fa1d912a7f5bd12c9ba43bd SHA512 fddfb2848681052efe3369c3e26050a49761a74f328f4ddfba199b1667f053db4eb1358d4c76e7a14791e564750546f0f41fcc6233477071b562465c40565d8e
diff --git a/media-gfx/openvdb/openvdb-9.1.0.ebuild b/media-gfx/openvdb/openvdb-9.1.0-r1.ebuild
index 752bb5b4afe0..c612f5b47ede 100644
--- a/media-gfx/openvdb/openvdb-9.1.0.ebuild
+++ b/media-gfx/openvdb/openvdb-9.1.0-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.openvdb.org"
 SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0"
-SLOT="0/9"
+SLOT="0/9.1"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="abi7-compat abi8-compat +abi9-compat ax +blosc cpu_flags_x86_avx cpu_flags_x86_sse4_2 cuda doc
 	+nanovdb numpy python static-libs test utils"
diff --git a/media-gfx/pngtools/Manifest b/media-gfx/pngtools/Manifest
index 5952bfb7eed2..9ec8397d02a3 100644
--- a/media-gfx/pngtools/Manifest
+++ b/media-gfx/pngtools/Manifest
@@ -1,6 +1,9 @@
 AUX pngtools-0.3-implicit-declarations.patch 1428 BLAKE2B 7e6cc10c336658e039de5f37416d9b0b696b731d12364dd72d119fb58edb04bf506eef32541615f98bc2a06b8d5841a705a316e6f9fd84e09ea591291be45be4 SHA512 80ac14a46940324dcd33f0f6f215e56888cc46a24d216d120339e026fa2ef0624511c262daa195308d420ffa773e2279b73d332316f626dac4ec3c96d6a2ee6c
 AUX pngtools-0.4-libpng14.patch 1265 BLAKE2B a959b83fe85a10348d815ccccaa17d2e46c03398a38cdffff52372a39419ef2ed70deb7e5751228066085c714969d755665801bf8b973d945622159af1937e03 SHA512 94940722266361f90239712875067ab0d82c18545300d9d604b76eb00ffdb8e82af0e0ab78966b645aba2dbdf59666a2da593365d5b9c9745def2b8ede0a4480
 AUX pngtools-0.4-libpng15-fixes.patch 6722 BLAKE2B 083318ef199f4c07ed1f44ddf95623fd198e10a2b939f86c1bf7a9995fac98080d0dbbe79e2e88817e8f07c5bd2f79ad80d7ee2d41cb0d03ca7aa46b8707ba64 SHA512 aafc4c746efc0ef00e9d9e59acf0dee58b56ce80a9f04ddfa9879f46f342170f4641f23081323299a143d4837367645240f823ba9900592fcfdec71961f3f330
+AUX pngtools-0.4_p20220314-docbook-dtd.patch 2482 BLAKE2B b6f48ff4fa4d3f20f3d720d7e03b37b2a9b4af5c0daabf73ef2f91a874106bb7b465f024c24c79516fd8a6c10a0569cab59ccde0afd1a21cf1c337e23801ffae SHA512 ee28229423354cd99bae0e964ddb6554e5c7eb61e3d2ccd0151ae68aa138ac1f6781746cb134a6a9e9af6c62bc58804b212f35a03757c5fed51e98a172c90a02
+DIST pngtools-0.4_p20220314.tar.gz 651338 BLAKE2B 9df108da4a52c6292c52a08ddc59163d386bc5de4aaaac96a166ba1e5dc38029b4261e80b8a186997d199ecd11b43fe9e46a41b6b25c65595b7baa4eab43376e SHA512 d1812051d4d1e6306805c96f686798e5af0a304ec045dbf02d77ab3f6432bc0f4e0c96c800bbb159d6ca9e83e8ef479c6d4ba742072fa897ec55808061001676
 DIST pngtools_0_4.tgz 1312178 BLAKE2B bff4be34b9a14a459cef2fb5cd1b70bb645c1fca8843bffc2a517b7f56e7a40e104b25b887f8bda227da2e12613c6c568b081b38bf70881b291bb5562eaeb6db SHA512 588b954c7c43ba48442ed4b22ad94fcfb456c7fc84a682e9126ca9d1c9b63dbb8f2d64e6e156664f327efbe11bb2ab1ac29d63ebb8a05329ac14200fb29f95a1
 EBUILD pngtools-0.4-r2.ebuild 703 BLAKE2B 2ce8afd2ce3d957fdd4bf77b3e1cc821523aadde6b2f4995928ece1cae9c633f4c3de60454589929536cc0299b257485de175e7fd73877e2f272f0a161a99086 SHA512 6c618d4ec7c027b1a621d879aa10ff27bab962ffbbe6de42031380fc1343b6a63f6f85a15385232765c9d46d5dc83ce616adcc1aebea8930259529fdb86b5788
-MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
+EBUILD pngtools-0.4_p20220314.ebuild 805 BLAKE2B 5b4746e920bf13aff4b28f06b628643823427c518a78782b8868d536c57a4d3de2d7367c99609ac88daa687fc19e0b5c50830cfe38b3f5646904a26d432f60cd SHA512 cb1f19ab0e8b575cd0e4f4cc1f067be04c4ac592260f6fff688881723c8f0933f8d8f0516eb4254157255a2e0ea4de172055910b8e65e472f6333064e76a487f
+MISC metadata.xml 303 BLAKE2B f87e0bb36559ffa7e785a019927f1f11d4d5de135c5b82331ee1a4acf21ceb94f8fd41486235be173e5e966b270b270772153ea74ec5a71036cec2f56b91ee8d SHA512 5ece8e5c353817fa3e6825116f62f610285cbb7ad4cc3b6b06d6d4136fd6969dc0662b92363bd2441d544038e438be721b00af4780420cb64547c01729db2b07
diff --git a/media-gfx/pngtools/files/pngtools-0.4_p20220314-docbook-dtd.patch b/media-gfx/pngtools/files/pngtools-0.4_p20220314-docbook-dtd.patch
new file mode 100644
index 000000000000..4523c4ac7208
--- /dev/null
+++ b/media-gfx/pngtools/files/pngtools-0.4_p20220314-docbook-dtd.patch
@@ -0,0 +1,67 @@
+https://sources.debian.org/patches/pngtools/0.5~git20220314.1ccca3a-2/bug1013909.patch/
+
+Description: Fix build failure without network access caused by missing local DTD.
+Author: Michael Schaller <misch@google.com>
+Bug-Debian: https://bugs.debian.org/1013909
+Forwarded: no
+Reviewed-By: Mathieu Malaterre <malat@debian.org>
+Last-Update: 2022-08-11
+
+--- pngtools-0.5~git20220314.1ccca3a.orig/man/docbook/head.sgml
++++ pngtools-0.5~git20220314.1ccca3a/man/docbook/head.sgml
+@@ -12,5 +12,4 @@
+      (c) Michael Still, 2001
+ -->
+ 
+-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook SGML V4.4//EN"
+-   "http://www.oasis-open.org/docbook/sgml/4.4/docbook.dtd">
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.4//EN" []>
+--- pngtools-0.5~git20220314.1ccca3a.orig/man/pngchunkdesc.sgml
++++ pngtools-0.5~git20220314.1ccca3a/man/pngchunkdesc.sgml
+@@ -12,8 +12,7 @@
+      (c) Michael Still, 2001
+ -->
+ 
+-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook SGML V4.4//EN"
+-   "http://www.oasis-open.org/docbook/sgml/4.4/docbook.dtd">
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.4//EN" []>
+ <refentry id="pngchunkdesc">
+ <refmeta>
+ <refentrytitle>pngchunkdesc</refentrytitle>
+--- pngtools-0.5~git20220314.1ccca3a.orig/man/pngchunks.sgml
++++ pngtools-0.5~git20220314.1ccca3a/man/pngchunks.sgml
+@@ -12,8 +12,7 @@
+      (c) Michael Still, 2001
+ -->
+ 
+-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook SGML V4.4//EN"
+-   "http://www.oasis-open.org/docbook/sgml/4.4/docbook.dtd">
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.4//EN" []>
+ <refentry id="pngchunkdesc">
+ <refmeta>
+ <refentrytitle>pngchunks</refentrytitle>
+--- pngtools-0.5~git20220314.1ccca3a.orig/man/pngcp.sgml
++++ pngtools-0.5~git20220314.1ccca3a/man/pngcp.sgml
+@@ -12,8 +12,7 @@
+      (c) Michael Still, 2001
+ -->
+ 
+-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook SGML V4.4//EN"
+-   "http://www.oasis-open.org/docbook/sgml/4.4/docbook.dtd">
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.4//EN" []>
+ <refentry id="pngcp">
+ <refmeta>
+ <refentrytitle>pngcp</refentrytitle>
+--- pngtools-0.5~git20220314.1ccca3a.orig/man/pnginfo.sgml
++++ pngtools-0.5~git20220314.1ccca3a/man/pnginfo.sgml
+@@ -12,8 +12,7 @@
+      (c) Michael Still, 2001
+ -->
+ 
+-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook SGML V4.4//EN"
+-   "http://www.oasis-open.org/docbook/sgml/4.4/docbook.dtd">
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.4//EN" []>
+ <refentry id="pnginfo">
+ <refmeta>
+ <refentrytitle>pnginfo</refentrytitle>
+
diff --git a/media-gfx/pngtools/metadata.xml b/media-gfx/pngtools/metadata.xml
index aaab041e8885..c8df55eac61d 100644
--- a/media-gfx/pngtools/metadata.xml
+++ b/media-gfx/pngtools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>robbat2@gentoo.org</email>
-</maintainer>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mikalstill/pngtools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/pngtools/pngtools-0.4_p20220314.ebuild b/media-gfx/pngtools/pngtools-0.4_p20220314.ebuild
new file mode 100644
index 000000000000..9fe86338be40
--- /dev/null
+++ b/media-gfx/pngtools/pngtools-0.4_p20220314.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_COMMIT="1ccca3a0f3f6882661bbafbfb62feb774ca195d1"
+DESCRIPTION="A series of tools for the PNG image format"
+HOMEPAGE="https://github.com/mikalstill/pngtools"
+SRC_URI="https://github.com/mikalstill/pngtools/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_COMMIT}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="media-libs/libpng:="
+DEPEND="${RDEPEND}"
+# https://github.com/mikalstill/pngtools/issues/14
+BDEPEND="app-text/docbook-sgml-utils"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4_p20220314-docbook-dtd.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	dodoc ABOUT chunks.txt
+
+	docinto examples
+	dodoc *.png
+}