gentoo auto-resync : 07:01:2025 - 06:41:06

6 files changed, 342 insertions, 68 deletions

diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 2d2e12536e47..94ca76a342f9 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,7 +1,9 @@
 DIST osl-1.12.14.0.tar.gz 20555853 BLAKE2B 4f6bc2084e4c1b25e707a37830961f20926e6ab5cb915c763cbd8126127e70f6368832077729ab5e044f573e8c38c4afb413eff8adccee5ea1ae96cb9be43b6e SHA512 51641e58fb0bba042853e3976c104decc788f1b1d3ec2e33a3f5504b11b05950dc38766ffb066b0f76edc4e0a8829d6b7dd408d9288b74d69380395b1d991bd5
 DIST osl-1.13.10.0.tar.gz 21776721 BLAKE2B 6b40adcf50403292003ae8216e60328d5af6d25bf22cd241aeb4f99b1d39c628c78fe1bc8372226c984ca38b6e08427525f12dc38e5b6d3355de02cbc71f1b7b SHA512 f005b8797a7bb882bcdf4fd644551d42c150956baa8dd9deff39ff1121321f33b8e144a9a96ac940ae6bf60985c6131457131baa87c73c2b498298aaa77c3c7d
-EBUILD osl-1.12.14.0-r1.ebuild 9915 BLAKE2B c95259a1d5bac311f49ab0c4bbac05d913d7bd01431975f4c5e8b8bc1c41e58ddc0539a577c8712a178dfac00c2567b3c5e5d974d5fecde536ea35f1702cec30 SHA512 cf5216cbfd6a3d4f33f240f3c817612fbd47e1699ad49791aeae4f13071d99b255867cc366cc3a92330d5957a10e27c0ad9963fff9410056788c6343b0cfd89f
+DIST osl-1.13.12.0.tar.gz 21824352 BLAKE2B 0d5c1d166afc347a515187c34d60c0a2be99e8a1b7078a388190f2232ee545654e3c1fea829dfabb7b0a105d69d3d98cc5dae4fa8f4db1a2228f9f258b34e76b SHA512 152a1b085c4ea88c86bc0ccbd694b848b9f50bd91f1a165899c2c3999042e413e54cdfb83dd90ea23daeeb2a3b65f794b8b2c19e9629bbda266971dcd6e3b5e7
+EBUILD osl-1.12.14.0-r2.ebuild 9647 BLAKE2B 2fa1118e970336fcbbdf499c4c584bd7edff4d7e2978f2368a70323bd11f64834a1a5d43fe6b4399bafe6b6b59f00e8ad1a5746204e9bff0b7bd724858d44385 SHA512 6becb0eb838e9dad30fb1644fd0578a190364a6d3f6812437f94c4cbfaf3c7e6059021d0255ac6c885ac9494e4cde0e08cc929c392687283f4b54b27c846d167
 EBUILD osl-1.12.14.0.ebuild 3906 BLAKE2B 59228846da135c84663ff3d4a12f3370de16f281bf7f03dbd14668581c2b8fd010de16129f1e1957c51da5d83a0c1d9541ad1713ff5b938c22021ff9b84eb74b SHA512 e557e55accb7b1a5b5b07c1198fe92547d067d6687100f4ef54be38e20488bdda2cb7809e218aa7f207358ab6a1dc157d1bf5581a7db42180ed2fd4927f42c22
-EBUILD osl-1.13.10.0.ebuild 7681 BLAKE2B 52a7216fce0e543a85c07f40adc9777cc8e619d691ed50247db20d77976bd524bd194e4d33112faf125568e3bced119bd7a225f4e0bdf4174ceb365e34ca21b1 SHA512 9bcc7aea721f050971f327d04c0402478fa85d6d9ddad4e5437bcff6ab1c2c276f7f7fb264ef4c5ce3b3c932dcf0580d30df8d0d3f5f174157dd0d219012427a
-EBUILD osl-9999.ebuild 7682 BLAKE2B 645b27d0eb9c87aff57dfcb41b36fa500e7d1e2c59cad3066d64d35f81f8c16f25586d2d80834db707c06d4cbf7ef25a20e38078f515c4a6b1b7fb57c3c98ad3 SHA512 0b43980802be12e478a0bec279c20ba50051f3228db6432abba6096c0ec95d5d678d9e34e3ef5b011c411b7337db6d40fa2b0c93b95528090c561cc3d7abe7b1
-MISC metadata.xml 1167 BLAKE2B c6931d08976c0bf03bfe8138f4babe2f04b61ab486868d31bd37ed20433c5199d5c5e06f63845bb734ad8be017098afdc5c4e94388d56acb5b87727aed4ded61 SHA512 f55dfc1e4e4d8a5b25a04e2bb45a60320f4d472b523a4d3bbce2c47df9974178081db2e7ce8756d5f7116d8e433b2e1ea24faf0d58e2d4ef75d2ae51c97333a6
+EBUILD osl-1.13.10.0.ebuild 7413 BLAKE2B 41e145d8e5667e4d806d5866d6c0290f19acbe708b016defd8135d95789d4f90fbe1aa3752df7f0f77f44e74a0b48854529a0a54cf11f3c1304d7963de06ed9f SHA512 4705b288b171509af1e6ac213c3b1efeeffb57f82773dcbd60ff67fb91f13d955d0d271027e2028229bb4decdd0af40d55a7eacdc604c37bd3189c7485a5ad32
+EBUILD osl-1.13.12.0.ebuild 7414 BLAKE2B 9c6bb8ac71cfa7be1515560a996ac6a67ce92a7b6b984774a32eaa8019f536a02b2488cb9c66da3d21cfd61a5403a1e899be7280c2877f06ddc99c7e082c5811 SHA512 1301357bcfd76558740d00fc8fda5de4e49449155e27d014c243a8f3ee6561f3a01efac4dca4067187852b94f54bf89e5384fbf158c042be3a338519b86e46b9
+EBUILD osl-9999.ebuild 7414 BLAKE2B 9c6bb8ac71cfa7be1515560a996ac6a67ce92a7b6b984774a32eaa8019f536a02b2488cb9c66da3d21cfd61a5403a1e899be7280c2877f06ddc99c7e082c5811 SHA512 1301357bcfd76558740d00fc8fda5de4e49449155e27d014c243a8f3ee6561f3a01efac4dca4067187852b94f54bf89e5384fbf158c042be3a338519b86e46b9
+MISC metadata.xml 1095 BLAKE2B d9d1b720bceb0f61f6841ef3a2d7b222a952f4c96c6ab1ee61f8e28ddae0d470b49fce998d60afedc527c8776d3514268ba0f135fcba881252c512f26e2f3c74 SHA512 b4a36e79e830cf648e0de7fdd3f360cd41834de8ac491972609990386380960b34263fde6d3cd129d07d8032a7741b399880c3f24684ba5ea8beb6498da0189f
diff --git a/media-libs/osl/metadata.xml b/media-libs/osl/metadata.xml
index a0f31940cbeb..a62fb425a42a 100644
--- a/media-libs/osl/metadata.xml
+++ b/media-libs/osl/metadata.xml
@@ -15,12 +15,11 @@
 		lights, displacement, and pattern generation.
 	</longdescription>
 	<use>
-		<flag name="gui">Build the osltoy binary (with Qt5)</flag>
+		<flag name="gui">Build the osltoy binary</flag>
 		<flag name="libcxx">Build against <pkg>llvm-runtimes/libcxx</pkg> when using clang</flag>
 		<flag name="nofma">Do not use Fuse-Multiply-Add operations</flag>
 		<flag name="optix">Add support for NVIDIA's OptiX Raytracing Engine</flag>
 		<flag name="partio">Use <pkg>media-libs/partio</pkg></flag>
-		<flag name="qt6">Build the osltoy binary (with Qt6)</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">AcademySoftwareFoundation/OpenShadingLanguage</remote-id>
diff --git a/media-libs/osl/osl-1.12.14.0-r1.ebuild b/media-libs/osl/osl-1.12.14.0-r2.ebuild
index a5bef473888b..104c0702a449 100644
--- a/media-libs/osl/osl-1.12.14.0-r1.ebuild
+++ b/media-libs/osl/osl-1.12.14.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -32,7 +32,7 @@ X86_CPU_FEATURES=(
 )
 CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" )
 
-IUSE="debug doc gui libcxx nofma partio qt6 test ${CPU_FEATURES[*]%:*} python"
+IUSE="debug doc gui libcxx nofma partio test ${CPU_FEATURES[*]%:*} python"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -55,15 +55,7 @@ RDEPEND="
 	)
 	partio? ( media-libs/partio )
 	gui? (
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtopengl:5
-		)
-		qt6? (
-			dev-qt/qtbase:6[gui,widgets,opengl]
-		)
+		dev-qt/qtbase:6[gui,widgets,opengl]
 	)
 "
 
@@ -177,6 +169,7 @@ src_configure() {
 		-DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")"
 		-DUSE_LIBCPLUSPLUS="$(usex libcxx)"
 		-DUSE_OPTIX="no"
+		-DUSE_QT="$(usex gui)"
 
 		-DOpenImageIO_ROOT="${EPREFIX}/usr"
 	)
@@ -187,15 +180,6 @@ src_configure() {
 		)
 	fi
 
-	if use gui; then
-		mycmakeargs+=( -DUSE_QT="yes" )
-		if ! use qt6; then
-			mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6="yes" )
-		fi
-	else
-		mycmakeargs+=( -DUSE_QT="no" )
-	fi
-
 	if use partio; then
 		mycmakeargs+=(
 			-Dpartio_ROOT="${EPREFIX}/usr"
diff --git a/media-libs/osl/osl-1.13.10.0.ebuild b/media-libs/osl/osl-1.13.10.0.ebuild
index 1ab9bcdd3d56..bd2b569e7e9c 100644
--- a/media-libs/osl/osl-1.13.10.0.ebuild
+++ b/media-libs/osl/osl-1.13.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -32,7 +32,7 @@ X86_CPU_FEATURES=(
 )
 CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" )
 
-IUSE="debug doc gui libcxx nofma optix partio qt6 test ${CPU_FEATURES[*]%:*} python"
+IUSE="debug doc gui libcxx nofma optix partio test ${CPU_FEATURES[*]%:*} python"
 
 RESTRICT="!test? ( test )"
 
@@ -59,15 +59,7 @@ RDEPEND="
 	)
 	partio? ( media-libs/partio )
 	gui? (
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtopengl:5
-		)
-		qt6? (
-			dev-qt/qtbase:6[gui,widgets,opengl]
-		)
+		dev-qt/qtbase:6[gui,widgets,opengl]
 	)
 "
 
@@ -189,6 +181,7 @@ src_configure() {
 		-DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")"
 		-DUSE_LIBCPLUSPLUS="$(usex libcxx)"
 		-DOSL_USE_OPTIX="$(usex optix)"
+		-DUSE_QT="$(usex gui)"
 
 		-DOpenImageIO_ROOT="${EPREFIX}/usr"
 	)
@@ -199,15 +192,6 @@ src_configure() {
 		)
 	fi
 
-	if use gui; then
-		mycmakeargs+=( -DUSE_QT="yes" )
-		if ! use qt6; then
-			mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6="yes" )
-		fi
-	else
-		mycmakeargs+=( -DUSE_QT="no" )
-	fi
-
 	if use optix; then
 		mycmakeargs+=(
 			-DOptiX_FIND_QUIETLY="no"
diff --git a/media-libs/osl/osl-1.13.12.0.ebuild b/media-libs/osl/osl-1.13.12.0.ebuild
new file mode 100644
index 000000000000..267c8484ce23
--- /dev/null
+++ b/media-libs/osl/osl-1.13.12.0.ebuild
@@ -0,0 +1,321 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+# Check this on updates
+LLVM_COMPAT=( {15..19} )
+
+inherit cmake cuda flag-o-matic llvm-r1 toolchain-funcs python-single-r1
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="https://www.imageworks.com/technology/opensource https://github.com/AcademySoftwareFoundation/OpenShadingLanguage"
+
+if [[ ${PV} = *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage.git"
+else
+	# If a development release, please don't keyword!
+	SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	S="${WORKDIR}/OpenShadingLanguage-${PV}"
+fi
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)" # based on SONAME
+
+X86_CPU_FEATURES=(
+	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" )
+
+IUSE="debug doc gui libcxx nofma optix partio test ${CPU_FEATURES[*]%:*} python"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# TODO optix
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/pugixml
+	>=media-libs/openexr-3:0=
+	>=media-libs/openimageio-2.4:=
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+		llvm-core/llvm:${LLVM_SLOT}
+	')
+	sys-libs/zlib:=
+	optix? ( dev-libs/optix[-headers-only] )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pybind11[${PYTHON_USEDEP}]
+			media-libs/openimageio[python,${PYTHON_SINGLE_USEDEP}]
+		')
+	)
+	partio? ( media-libs/partio )
+	gui? (
+		dev-qt/qtbase:6[gui,widgets,opengl]
+	)
+"
+
+DEPEND="${RDEPEND}
+	dev-util/patchelf
+	test? (
+		media-fonts/droid
+	)
+"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if use optix; then
+		cuda_src_prepare
+		cuda_add_sandbox -w
+	fi
+
+	sed -e "/^install.*llvm_macros.cmake.*cmake/d" -i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/875836
+	# https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1810
+	filter-lto
+
+	# pick the highest we support
+	local mysimd=()
+	if use cpu_flags_x86_avx512f; then
+		mysimd+=( avx512f )
+	elif use cpu_flags_x86_avx2 ; then
+		mysimd+=( avx2 )
+		if use cpu_flags_x86_f16c ; then
+			mysimd+=( f16c )
+		fi
+	elif use cpu_flags_x86_avx ; then
+		mysimd+=( avx )
+	elif use cpu_flags_x86_sse4_2 ; then
+		mysimd+=( sse4.2 )
+	elif use cpu_flags_x86_sse4_1 ; then
+		mysimd+=( sse4.1 )
+	elif use cpu_flags_x86_ssse3 ; then
+		mysimd+=( ssse3 )
+	elif use cpu_flags_x86_sse3 ; then
+		mysimd+=( sse3 )
+	elif use cpu_flags_x86_sse2 ; then
+		mysimd+=( sse2 )
+	fi
+
+	local mybatched=()
+	if use cpu_flags_x86_avx512f || use cpu_flags_x86_avx2 ; then
+		if use cpu_flags_x86_avx512f ; then
+			if use nofma; then
+				mybatched+=(
+					"b8_AVX512_noFMA"
+					"b16_AVX512_noFMA"
+				)
+			fi
+			mybatched+=(
+				"b8_AVX512"
+				"b16_AVX512"
+			)
+		fi
+		if use cpu_flags_x86_avx2 ; then
+			if use nofma; then
+				mybatched+=(
+					"b8_AVX2_noFMA"
+				)
+			fi
+			mybatched+=(
+				"b8_AVX2"
+			)
+		fi
+	fi
+	if use cpu_flags_x86_avx ; then
+		mybatched+=(
+			"b8_AVX"
+		)
+	fi
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z "${mysimd[*]}" ]] && mysimd=("0")
+	[[ -z "${mybatched[*]}" ]] && mybatched=("0")
+
+	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
+	# Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
+	use arm64 && append-flags -flax-vector-conversions
+
+	local gcc
+	gcc="$(tc-getCC)"
+
+	local mycmakeargs=(
+		-DCMAKE_POLICY_DEFAULT_CMP0146="OLD" # BUG FindCUDA
+
+		# std::tuple_size_v is c++17
+		-DCMAKE_CXX_STANDARD="17"
+
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DINSTALL_DOCS="$(usex doc)"
+		-DUSE_CCACHE="no"
+		-DLLVM_STATIC="no"
+		-DOSL_BUILD_TESTS="$(usex test)"
+		-DSTOP_ON_WARNING="no"
+		-DUSE_PARTIO="$(usex partio)"
+		-DUSE_PYTHON="$(usex python)"
+		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+		-DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")"
+		-DUSE_LIBCPLUSPLUS="$(usex libcxx)"
+		-DOSL_USE_OPTIX="$(usex optix)"
+		-DUSE_QT="$(usex gui)"
+
+		-DOpenImageIO_ROOT="${EPREFIX}/usr"
+	)
+
+	if use debug; then
+		mycmakeargs+=(
+			-DVEC_REPORT="yes"
+		)
+	fi
+
+	if use optix; then
+		mycmakeargs+=(
+			-DOptiX_FIND_QUIETLY="no"
+			-DCUDA_FIND_QUIETLY="no"
+
+			-DOPTIXHOME="${EPREFIX}/opt/optix"
+			-DCUDA_TOOLKIT_ROOT_DIR="${EPREFIX}/opt/cuda"
+
+			-DCUDA_NVCC_FLAGS="--compiler-bindir;$(cuda_gccdir)"
+			-DOSL_EXTRA_NVCC_ARGS="--compiler-bindir;$(cuda_gccdir)"
+			-DCUDA_VERBOSE_BUILD="yes"
+		)
+	fi
+
+	if use partio; then
+		mycmakeargs+=(
+			-Dpartio_DIR="${EPREFIX}/usr"
+		)
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			"-DPYTHON_VERSION=${EPYTHON#python}"
+			"-DPYTHON_SITE_DIR=$(python_get_sitedir)"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# A bunch of tests only work when installed.
+	# So install them into the temp directory now.
+	DESTDIR="${T}" cmake_build install
+
+	ln -s "${CMAKE_USE_DIR}/src/cmake/" "${BUILD_DIR}/src/cmake" || die
+
+	if use optix; then
+		cp \
+			"${BUILD_DIR}/src/liboslexec/shadeops_cuda.ptx" \
+			"${BUILD_DIR}/src/testrender/"{optix_raytracer,quad,rend_lib_testrender,sphere,wrapper}".ptx" \
+			"${BUILD_DIR}/src/testshade/"{optix_grid_renderer,rend_lib_testshade}".ptx" \
+			"${BUILD_DIR}/bin/" || die
+
+		# NOTE this should go to cuda eclass
+		addwrite /dev/nvidiactl
+		addwrite /dev/nvidia0
+		addwrite /dev/nvidia-uvm
+		addwrite /dev/nvidia-caps
+		addwrite "/dev/char/"
+	fi
+
+	CMAKE_SKIP_TESTS=(
+		"-broken$"
+		"^render"
+
+		# broken with in-tree <=dev-libs/optix-7.5.0 and out of date
+		"^example-cuda$"
+
+		# outright fail
+		"^testoptix.optix.opt$"
+		"^testoptix-noise.optix.opt$"
+		"^testoptix-reparam.optix.opt$"
+		"^transform-reg.regress.batched.opt$"
+		"^spline-reg.regress.batched.opt$"
+
+		# doesn't handle parameters
+		"^osl-imageio$"
+		"^osl-imageio.opt$"
+		"^osl-imageio.opt.rs_bitcode$"
+	)
+
+	myctestargs=(
+		# src/build-scripts/ci-test.bash
+		'--force-new-ctest-process'
+	)
+
+	local -x DEBUG CXXFLAGS LD_LIBRARY_PATH DIR OSL_DIR OSL_SOURCE_DIR PYTHONPATH
+	DEBUG=1 # doubles the floating point tolerance so we avoid FMA related issues
+	CXXFLAGS="-I${T}/usr/include"
+	LD_LIBRARY_PATH="${T}/usr/$(get_libdir)"
+	OSL_DIR="${T}/usr/$(get_libdir)/cmake/OSL"
+	OSL_SOURCE_DIR="${S}"
+
+	if use python; then
+		PYTHONPATH="${BUILD_DIR}/lib/python/site-packages"
+	fi
+
+	cmake_src_test
+
+	einfo ""
+	einfo "testing render tests in isolation"
+	einfo ""
+
+	CMAKE_SKIP_TESTS=(
+		"^render-background$"
+		"^render-mx-furnace-sheen$"
+		"^render-mx-burley-diffuse$"
+		"^render-mx-conductor$"
+		"^render-microfacet$"
+		"^render-veachmis$"
+		"^render-ward$"
+		"^render-raytypes.opt$"
+		"^render-raytypes.opt.rs_bitcode$"
+	)
+
+	myctestargs=(
+		# src/build-scripts/ci-test.bash
+		'--force-new-ctest-process'
+		--repeat until-pass:10
+		-R "^render"
+	)
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if [[ -d "${ED}/usr/build-scripts" ]]; then
+		rm -rf "${ED}/usr/build-scripts" || die
+	fi
+
+	for batched_lib in "${ED}/usr/$(get_libdir)/lib_"*"_oslexec.so"; do
+		patchelf --set-soname "$(basename "${batched_lib}")" "${batched_lib}" || die
+	done
+}
diff --git a/media-libs/osl/osl-9999.ebuild b/media-libs/osl/osl-9999.ebuild
index 40728570e380..267c8484ce23 100644
--- a/media-libs/osl/osl-9999.ebuild
+++ b/media-libs/osl/osl-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 # Check this on updates
-LLVM_COMPAT=( {15..18} )
+LLVM_COMPAT=( {15..19} )
 
 inherit cmake cuda flag-o-matic llvm-r1 toolchain-funcs python-single-r1
 
@@ -32,7 +32,7 @@ X86_CPU_FEATURES=(
 )
 CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" )
 
-IUSE="debug doc gui libcxx nofma optix partio qt6 test ${CPU_FEATURES[*]%:*} python"
+IUSE="debug doc gui libcxx nofma optix partio test ${CPU_FEATURES[*]%:*} python"
 
 RESTRICT="!test? ( test )"
 
@@ -59,15 +59,7 @@ RDEPEND="
 	)
 	partio? ( media-libs/partio )
 	gui? (
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtopengl:5
-		)
-		qt6? (
-			dev-qt/qtbase:6[gui,widgets,opengl]
-		)
+		dev-qt/qtbase:6[gui,widgets,opengl]
 	)
 "
 
@@ -189,6 +181,7 @@ src_configure() {
 		-DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")"
 		-DUSE_LIBCPLUSPLUS="$(usex libcxx)"
 		-DOSL_USE_OPTIX="$(usex optix)"
+		-DUSE_QT="$(usex gui)"
 
 		-DOpenImageIO_ROOT="${EPREFIX}/usr"
 	)
@@ -199,15 +192,6 @@ src_configure() {
 		)
 	fi
 
-	if use gui; then
-		mycmakeargs+=( -DUSE_QT="yes" )
-		if ! use qt6; then
-			mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6="yes" )
-		fi
-	else
-		mycmakeargs+=( -DUSE_QT="no" )
-	fi
-
 	if use optix; then
 		mycmakeargs+=(
 			-DOptiX_FIND_QUIETLY="no"