gentoo auto-resync : 23:01:2025 - 06:45:02

14 files changed, 610 insertions, 254 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index ab9dd72fb840..16cef68977c3 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index b9a972307374..69cc0b24366c 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,14 +1,8 @@
 AUX gmmlib-20.2.2_conditional_testing.patch 1151 BLAKE2B edeb2ff121efeb39e674bc6e4fc37e3603f98875e7d618f4a0bbad49d6d46745c2fdcc2405b3383443af767ab231cddeb1914ccbf0710190fe6c47a94033e638 SHA512 8f6a676104108161e5ca727d231789559bbf1c24b289b25b9809b5b70882e355af976051d31bd4a238df24b13fbe4a3324ce40c3ee3c592e650b34dde8d8a62b
 AUX gmmlib-20.3.2_cmake_project.patch 145 BLAKE2B f42306b41a0c62ea9d3d5bfe3d1e1f85c23028e632c44f1cfe41a5fa47c7e94416ac1e5c58a4018a5da024d65e662c301e8d935994f6b53b52414a5f8081208c SHA512 feafa316267e903a25e7889fcbcfb31bd77402715d84d82464ae25f2cf013866c812b1c37bc1d64a8c5e1a0dd3f00e9333658532ad6d7abebf4f67bd6fc46d64
 AUX gmmlib-22.1.1_custom_cflags.patch 2963 BLAKE2B af9979ee3c7977c93288b6afd0c0a65451f6f06cffbb00d32d53541410beded1feb6212bb0a5b7820e4ba8c4ee03656f274b94a26e0688e90e0ad140b37ee4a2 SHA512 933a9234f178ec566ca88fd3b48d746ac869936acfd5541d8b6b3cac3125c029054fe385101d734e5e35eeb9393f1609be96c9bcc2f1e0bb79a7295ccdd6c292
-DIST intel-gmmlib-22.5.2.tar.gz 867665 BLAKE2B 64559ec6489614df352ba58d25f8706c234f3cff008228a7056e29d92584fab27af311fdb3db8c2e4f6983598019c646df8761ed422a47bcdbff02e79896d613 SHA512 516e2cc0d678d8fd44d8d2b1bfdf61c05670c01c906bd7f55a807846cd6399d4b616f86e6a1d85e2a6a0480c4616a40e9d5b29a3f45fbf588cc4d725ada71d49
-DIST intel-gmmlib-22.5.3.tar.gz 867696 BLAKE2B e7fe7394e0e4ee319a35a551908649e209c28f62fc566eab522f7182a78771b35a58ae067118f198eaca2d4f9cbbf58e4f54b9c838b87eed6ac82f2dce7158f1 SHA512 6649f241096b3b81a63c7d29b42494f5621dd9988f2570eaeb7164a4e5a71083180d4a8634782c4831ab8cd22e6b736a2e45e1a52cd5b70f62fe892411362444
-DIST intel-gmmlib-22.5.4.tar.gz 868826 BLAKE2B 8a3d455a271d2e76e790e980e96ab0d9bd70854c039272b34eb605d8175749a9a561178ec022d197960bb4e9226217ed43c1a53f2598b1c6910931ca35d4c1c1 SHA512 08735c056a443f5f998b089e8a88bb61f1b0ceb2557971af3c9a0235aca3846888bd32ec42a9750e311d0575a84111c897a6417bcaf3ecf0eac60fa2549f5d93
 DIST intel-gmmlib-22.5.5.tar.gz 868894 BLAKE2B be17a0b1c16bf0ffcb37da3f63db20643803757ea42911f5666218e34bb3f59919bfa369749bef81598e8fb1855a8cad7347b6811791bc2c483b20a3e644e6dd SHA512 8603847f7d2daf0e7839973fea96fa552dbd8c25f29eb961a4f3c5918c70e61ed975a1f6f886547b605dd9f65a059e9decad6372a4269e2b61195259b049630e
 DIST intel-gmmlib-22.6.0.tar.gz 869017 BLAKE2B 8c17ecffb77150c4a2d97ccc13f86a75e2846eb8f3d61310452ad091d7d5f6375abc3e703b37a97ea8b6c18cd2f5adc52747cfa72b3fb9d3ad0785ef45b47dba SHA512 b4d7fb6bcc5827f5883f76fb7371ac17192c5278aa0f68650667f2257536bd0d01e1939927be0f7df4186aeb500eeb648d0336ac821a4f92bcfec75190c89fe1
-EBUILD gmmlib-22.5.2.ebuild 954 BLAKE2B e65b06b054ff521cc3ee3d2b95a6777a706fe03fa30cd7a369539d5ebc0b5aead789a8997d640f7a273f2ff9235b216cf1950c3d6f93f9349ac76348ed3de189 SHA512 c7bcd9d9ddd19d174d277a620a38b206d8e1796ad1dcde3ba61b34eaa92eb4d0ece070077e5cd744a38ed80317ea6715ce5d4a5a7cc8057672980d69060585cb
-EBUILD gmmlib-22.5.3.ebuild 955 BLAKE2B eba2f14d093a7b8b63a1cee0dff0fab805b9681bca014bd11cb2ff7682aec1b3adeaf41cac8b33a1d8a48c4c4420bfcc296a91429c3d55ab3e51581ee126adaa SHA512 f6f89934cf6bb49c453de13a599224d6415f494522f0ebc876cdecda9a061b9d41788ce3ae55d1c168c1f73d6d362403cb15b81067866e1554a4f57ff73c9494
-EBUILD gmmlib-22.5.4.ebuild 955 BLAKE2B eba2f14d093a7b8b63a1cee0dff0fab805b9681bca014bd11cb2ff7682aec1b3adeaf41cac8b33a1d8a48c4c4420bfcc296a91429c3d55ab3e51581ee126adaa SHA512 f6f89934cf6bb49c453de13a599224d6415f494522f0ebc876cdecda9a061b9d41788ce3ae55d1c168c1f73d6d362403cb15b81067866e1554a4f57ff73c9494
 EBUILD gmmlib-22.5.5.ebuild 954 BLAKE2B 18a172f42aadea783ddeefee9b73f0b2f9231dc55eceaca62fb6a6682ff6fba2d2bada08cc72e462eadce8a11ec470aa21a779a90b3217a37c4626aaca21305d SHA512 ffb776fbae95a2415b658e68439b76bc0497f1aa2c33c0315984eb07172db8a7935c570dcaa715ad3aa0780887645d9af6b21cd61fc94be72d2dbb13efc24433
 EBUILD gmmlib-22.6.0.ebuild 955 BLAKE2B eba2f14d093a7b8b63a1cee0dff0fab805b9681bca014bd11cb2ff7682aec1b3adeaf41cac8b33a1d8a48c4c4420bfcc296a91429c3d55ab3e51581ee126adaa SHA512 f6f89934cf6bb49c453de13a599224d6415f494522f0ebc876cdecda9a061b9d41788ce3ae55d1c168c1f73d6d362403cb15b81067866e1554a4f57ff73c9494
 EBUILD gmmlib-9999.ebuild 955 BLAKE2B eba2f14d093a7b8b63a1cee0dff0fab805b9681bca014bd11cb2ff7682aec1b3adeaf41cac8b33a1d8a48c4c4420bfcc296a91429c3d55ab3e51581ee126adaa SHA512 f6f89934cf6bb49c453de13a599224d6415f494522f0ebc876cdecda9a061b9d41788ce3ae55d1c168c1f73d6d362403cb15b81067866e1554a4f57ff73c9494
diff --git a/media-libs/gmmlib/gmmlib-22.5.2.ebuild b/media-libs/gmmlib/gmmlib-22.5.2.ebuild
deleted file mode 100644
index 0a7ae2c25cdb..000000000000
--- a/media-libs/gmmlib/gmmlib-22.5.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-else
-	KEYWORDS="amd64"
-	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
-	S="${WORKDIR}/${PN}-intel-${P}"
-fi
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-
-LICENSE="MIT"
-SLOT="0/12.3"
-IUSE="+custom-cflags test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
-	"${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
-	"${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING="$(usex test)"
-		-DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
-	)
-
-	cmake_src_configure
-}
diff --git a/media-libs/gmmlib/gmmlib-22.5.3.ebuild b/media-libs/gmmlib/gmmlib-22.5.3.ebuild
deleted file mode 100644
index 2a09f24b8f3d..000000000000
--- a/media-libs/gmmlib/gmmlib-22.5.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
-	S="${WORKDIR}/${PN}-intel-${P}"
-fi
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-
-LICENSE="MIT"
-SLOT="0/12.3"
-IUSE="+custom-cflags test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
-	"${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
-	"${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING="$(usex test)"
-		-DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
-	)
-
-	cmake_src_configure
-}
diff --git a/media-libs/gmmlib/gmmlib-22.5.4.ebuild b/media-libs/gmmlib/gmmlib-22.5.4.ebuild
deleted file mode 100644
index 2a09f24b8f3d..000000000000
--- a/media-libs/gmmlib/gmmlib-22.5.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
-	S="${WORKDIR}/${PN}-intel-${P}"
-fi
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-
-LICENSE="MIT"
-SLOT="0/12.3"
-IUSE="+custom-cflags test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
-	"${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
-	"${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING="$(usex test)"
-		-DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
-	)
-
-	cmake_src_configure
-}
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 813bd3aae7d9..3ecb2826dbe9 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,4 +1,6 @@
 AUX hamlib-4.5.5-gcc14-fix.patch 224 BLAKE2B 882645207d62657b790e76d5e4d3a17be3aca9dfd978d5a2939bfc81a018788e6a2b3d1f37bf2d0e122740014e076820dfc9c626d24509741b1342ec700d2a75 SHA512 1529f2002de0e9c216dad0f4bcf0656fb70da543ab0f84d19e8a1621e87d9983f43f7bbc05cae09ab3a2310628b7522c152f15861f32adad05c9088e36b01acd
 DIST hamlib-4.5.5.tar.gz 2603846 BLAKE2B ad4a286a7aa1e972707cb9ed15a4268909a7d252a64b98b01d35c9d9e42c605cd600e819e195e49d501c1e135191fda585581e27801fa217c9141236a81ad770 SHA512 2cdff2630e89fa95c7ac40e998492e8a04e000fcca18b9491ddcb967927ffaa771ed2e6ac3232a060947883533a6ae7405042a2f8fdb1de157d71f74381f5899
+DIST hamlib-4.6.1.tar.gz 2909273 BLAKE2B d8ab443bd19068ec76fbe021f9dcdbaf3cead9a6eac1eab47c148c35fe7c98d294d50386cc3c386e8113ac26a9aa594f7a9d121e81601c84660350115566b1b6 SHA512 3363665e2fc5541e2bd68767e9c0d8c856a7d2ea9a7e4a2d7e79d6e7349150642cba4e96d27ab6dc029fd838e05c3f0f9f7acadcc7c8bc51bedaf61ef67e95ce
 EBUILD hamlib-4.5.5-r3.ebuild 2207 BLAKE2B 085c5dbad4fdaa2d4c6a7e2831aca85ae77de74d9b3d3167d382bff110804db87b85543c80ffa2407eaa1f562d570c9e2e9bcf272f92acae4ae8021d737694a4 SHA512 33a2f3843d80a1c29ab995e48c4c9c9913e26c2b204e75033bce9d9a1f01bbc650abb935bdfae85446ade5eff034b52263fe6124ca7525334c509aab52a0c811
+EBUILD hamlib-4.6.1.ebuild 2153 BLAKE2B a838be1a79f8ce5eaf5c6b104e0d0cf802141ce59e1e8b5c7acfc7ed45d2bae3591d17a22a97ff74c29a220d37d3e3600d93fc20b735f471a89a55d7f3d22006 SHA512 a3ce15e167e64623053e7ab1021f3af0dae8190cec608ca70eae37318eb886ad3c2b2a8a794563160f1b6d120b92d6aad5d5ae38abe38c99e9c3c920f30d24cd
 MISC metadata.xml 379 BLAKE2B 17bfaa1ae7f031e14bef4bad4d552e3d4b644b9578bd996a9e8454b6b55f4029c3395e8a1cfc5a2b27a5372cd1aea140e0aebe637f7eb7889008fb434897b681 SHA512 c8c7a37088c0da4952a557776db8b6b701df23c07c4b17c50b77a199a6e7740369e27254eabae4e504ecb07871d33aec008e54bc7a787030828616ab36dfcb93
diff --git a/media-libs/hamlib/hamlib-4.6.1.ebuild b/media-libs/hamlib/hamlib-4.6.1.ebuild
new file mode 100644
index 000000000000..0aa7bcf6e296
--- /dev/null
+++ b/media-libs/hamlib/hamlib-4.6.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+MY_P=${P/_rc2/~rc2}
+
+inherit autotools flag-o-matic python-single-r1
+
+DESCRIPTION="Ham radio backend rig control libraries"
+HOMEPAGE="https://www.hamlib.github.io"
+SRC_URI="https://downloads.sourceforge.net/hamlib/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0/4.2"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="doc perl python tcl"
+
+RESTRICT="test"
+
+RDEPEND="
+	=virtual/libusb-0*
+	dev-libs/libxml2
+	sys-libs/readline:0=
+	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS} )
+	tcl? ( dev-lang/tcl:0= )"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	dev-lang/swig
+	>=dev-build/libtool-2.2
+	doc? ( app-text/doxygen
+		dev-util/source-highlight )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Correct install target to whatever INSTALLDIRS says and use vendor
+	# installdirs everywhere (bug #611550)
+	sed -i -e "s#install_site#install#"	\
+	-e 's#MAKEFILE="Hamlib-pl.mk"#MAKEFILE="Hamlib-pl.mk" INSTALLDIRS=vendor#' \
+	bindings/Makefile.am || die "sed failed patching for perl"
+
+	# make building of documentation compatible with autotools-utils
+	sed -i -e "s/doc:/html:/g" doc/Makefile.am || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/926839
+	# https://github.com/Hamlib/Hamlib/issues/1524
+	filter-lto
+
+	econf \
+		--libdir=/usr/$(get_libdir)/hamlib \
+		--disable-static \
+		--with-xml-support \
+		$(use_with perl perl-binding) \
+		$(use_with python python-binding) \
+		$(use_with tcl tcl-binding)
+}
+
+src_compile() {
+	emake
+	use doc && emake html
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	use python && python_optimize
+
+	use doc && HTML_DOCS=( doc/html/ )
+	einstalldocs
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins hamlib.pc
+
+	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
+	doenvd "${T}"/73hamlib
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libva-intel-media-driver/Manifest b/media-libs/libva-intel-media-driver/Manifest
index 76c67450447c..36d013d57d39 100644
--- a/media-libs/libva-intel-media-driver/Manifest
+++ b/media-libs/libva-intel-media-driver/Manifest
@@ -1,13 +1,9 @@
 AUX libva-intel-media-driver-23.3.4-Remove-unwanted-CFLAGS.patch 1530 BLAKE2B 732af31ff06fc92c7fa5375e767dfbcf52805baa52a71f26b9b2b9687eda9fe60cf9b618030040e5595aba24c9c781eb26243a257a2f025f2427a1a9d2cbafa4 SHA512 eeba11f6c4922c909aef909f145213418c32e28c19bab9b5c6051e51de9482562f1229f2236f1ed0e7365d59359827c889cabc7f81566205e47152bcea380313
 AUX libva-intel-media-driver-23.3.4_testing_in_src_test.patch 2497 BLAKE2B 5db90e062447461d7310dc039f8969abd9618142b85b18d7b98dace6ef144df386f3cec3e3a1540588781ef1b92c7b6b276d8bddf30199cb0ff36dc3d7d88b3d SHA512 5a7b10a740e62c8729449d5f1d255621e5dadf944c3c9e13f8c8598c8e11c9b44b59844106825cc22d1fc30846e84539254a4c5b1295c5291638943cd314ca88
 AUX libva-intel-media-driver-24.4.4-c23-fix.patch 529 BLAKE2B d900912b2239c57ec1b92db104dad8d5299729012765d5144ae3f381d4b26adfa579a076bf0a8372bd86646201296f1d44c1f2973374c6e6546aa3aa7ac04284 SHA512 c3b8a74dc872dd68e0cdc6df7ff64753cd2bbf13a26d7a325de3bbbff0bdbc9aa23e73ca8940d1e378d0d7a228cafa424c0fb92ef8f008da4b6f4d4858a0e561
-DIST intel-media-24.3.4.tar.gz 27623962 BLAKE2B 0f4eb4321db0b3f1ce05461d0321777918dbb7ac1e28dc916040ca252441c7682650c6af0224588c445ccb06cc1c28b8d5ff47b7a0b271e83b1a97cf3af6e67d SHA512 015915b4265fafa5cb619ac69e1cbd3f17ac22fc51dcb9455782cad097dd494c28cdcc9c4c184c739216b419a5b1ec5730ee19d9dedfc83e20761803a3e89d81
-DIST intel-media-24.4.2.tar.gz 27670782 BLAKE2B a89df89b15cb800fd9e90e8ffaee6ee76cdaa3b97d49feacb0c40e2ff7ac44db38dd2ef4fd65b25bdc4450d95c20559b1a9cb3f87e9f7916568ef7fdea631685 SHA512 63f68c2fec1608082b5e1892b7f0cfadbd9e7c2ccacf681e2e596d020d15dbd8dd95bbff353cf7e987dc9a2638b498594b42c36b366ba9bc8cdf5795f38b23fe
-DIST intel-media-24.4.3.tar.gz 27695613 BLAKE2B 9f4201563d93a0bab5408161b5b418a163bca09f2c17734638817a4060444a321c06a95fbc81616140b55e46a2a1bf8267dba93e15c8f6a1368b8fd98497c4de SHA512 151416aa5e22c98a56d15a00cb8dd3a25cff4a8445b5106b77000d7cff4788736d0e0f4067121334bc3e7b4fba76e84a07b5ac318f12b0fa9a8f9c2317847ada
 DIST intel-media-24.4.4.tar.gz 27696988 BLAKE2B cf13b3d0feb005b204892a62402d2a044661279b419bbc47ac414691a5238ada5dc2d59e848a9d53219163420e6b2d364a563f57e10488325587405e2add8ef3 SHA512 0a34a707082a3d7032b472667640d40761f1c9425e291002d2bd2af42d57d69ec3cf6e835430e731ff6c7eb24b22b1843c0b83812001f4ed203fd55097a2c6dc
-EBUILD libva-intel-media-driver-24.3.4.ebuild 1512 BLAKE2B fbcaa3d74924d108719352a39e427cf67ac308f16c2241b72075651beebfb1a6b121c96f9c4e3866a5ebd5cbdafeee42f1cfa2cb01f76516bf86326133c99e67 SHA512 c24ac146c9bbd37b715697adfba21a486f3887197dde0d5bbd5362acdeddf88a540492b1d60720c96b3461da03b56b9b7de372f515b48898291f69b371ebbff0
-EBUILD libva-intel-media-driver-24.4.2.ebuild 1512 BLAKE2B f1b378ac51d69df8397517fe2d7429a93ff5e437748118686b9c2ad7c80d729093904569ae7ae1c2912c3a877525f21e59b6c3d518bf5effe431dc48dc4df9f8 SHA512 0f0eafab51e79227278db7286a8591c4e856f233336455299fdf4ef9542b69f3b32d50d4e0d260598d3a912a079aa8ed51b095c9e2c7683f2e0f5820c4937ece
-EBUILD libva-intel-media-driver-24.4.3.ebuild 1512 BLAKE2B f1b378ac51d69df8397517fe2d7429a93ff5e437748118686b9c2ad7c80d729093904569ae7ae1c2912c3a877525f21e59b6c3d518bf5effe431dc48dc4df9f8 SHA512 0f0eafab51e79227278db7286a8591c4e856f233336455299fdf4ef9542b69f3b32d50d4e0d260598d3a912a079aa8ed51b095c9e2c7683f2e0f5820c4937ece
+DIST intel-media-25.1.0.tar.gz 28243498 BLAKE2B 7b0982cf06c13754897c46ca3c54b3d0d0d9c1b8aff6066c148770946f83655185bc02f67d83c762a2843969f6f70b4fae56c6853930ff228059e6ff7484b7bd SHA512 20c0f7952a59ab86a6e6c1281c198961d835380e5d4f17fe2cc1c74a31da426560cc244950e6e91f0b4fb659133e461f5ba539c7000ad26e8032fc2aaf79c416
 EBUILD libva-intel-media-driver-24.4.4-r1.ebuild 1553 BLAKE2B 8a00e4f58d7a1b69ed18c191a03d1342bbd330af9fd76c66953ea7d5d343e3c56be2732390fa4598dfcbc271bda5709b0d0df20af478f76ebba5672af311c49f SHA512 9d2241aab18bcab1430901a8bbfa501bdd5e28a31df264579108382e309589e961d66beb29f0a1d60ef0f4905b8019ed4d5bce558a45d94fdbe42b777a8b9a87
-EBUILD libva-intel-media-driver-9999.ebuild 1512 BLAKE2B 25e0c97f2959ebf37f07d29c0b1a1f66a3f7d5585d7e6cd1f57d2415f3fe6c61485164b89c99362cb77277a734a5e6550bd0c1882de309dce73b18e65b74c84f SHA512 a076f652430635d0832f88bad42600a316f9eca8f0453a4af633d84ad238fc78e23236f443996e778279b72693508f7567bb690b4a7a230ba89e65c7872e81ce
+EBUILD libva-intel-media-driver-25.1.0.ebuild 1512 BLAKE2B 761266db69786809a3d777d5ef5c8698a5da93f5639b53227446a1ac5fc9f63a20a21ba4fe6e03495e05796b3f9cd768f68907f123a7a7fa49f6aa5ee1d3c01a SHA512 e1c28b94142609cf8b4eb29e18ba461ccb5fdf9b6a0b141a406b2ec0457d699faf06592d3d2eca4459c48b575e62b5bc0fc8387570bd7adf8902c635aa89ee0b
+EBUILD libva-intel-media-driver-9999.ebuild 1512 BLAKE2B 761266db69786809a3d777d5ef5c8698a5da93f5639b53227446a1ac5fc9f63a20a21ba4fe6e03495e05796b3f9cd768f68907f123a7a7fa49f6aa5ee1d3c01a SHA512 e1c28b94142609cf8b4eb29e18ba461ccb5fdf9b6a0b141a406b2ec0457d699faf06592d3d2eca4459c48b575e62b5bc0fc8387570bd7adf8902c635aa89ee0b
 MISC metadata.xml 565 BLAKE2B e630d474342839898d53aef1849b002ef651c9f4fe3bfcfe72e809012e6c65153b1a6c14db922a45440ffd5717b90dddd6973185f8a625906e9d5571e50728d9 SHA512 22227f8a9cc39fff74f0bf2cdc8953f110e94ce0ab107076269d604c3cf8ae46c8496c9bcf47598e351cb9714e427f213ade5e446a5e8c67acfc87db5530b370
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.3.4.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.3.4.ebuild
deleted file mode 100644
index 68e5df8b6f80..000000000000
--- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.3.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib flag-o-matic
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-else
-	MY_PV="${PV%_pre}"
-	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
-	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="amd64"
-	fi
-fi
-
-DESCRIPTION="Intel Media Driver for VA-API (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD redistributable? ( no-source-code )"
-SLOT="0"
-IUSE="+redistributable test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-22.3.20:=[${MULTILIB_USEDEP}]
-	>=media-libs/libva-2.22.0[X?,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-23.3.4-Remove-unwanted-CFLAGS.patch
-	"${FILESDIR}"/${PN}-23.3.4_testing_in_src_test.patch
-)
-
-multilib_src_configure() {
-	# https://github.com/intel/media-driver/issues/356
-	append-cxxflags -D_FILE_OFFSET_BITS=64
-
-	local mycmakeargs=(
-		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
-		-DMEDIA_RUN_TEST_SUITE=$(usex test)
-		-DBUILD_TYPE=Release
-		-DPLATFORM=linux
-		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X)
-		-DENABLE_NONFREE_KERNELS=$(usex redistributable)
-		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
-	)
-	local CMAKE_BUILD_TYPE="Release"
-	cmake_src_configure
-}
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.4.3.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.4.3.ebuild
deleted file mode 100644
index 42f6583e9710..000000000000
--- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.4.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib flag-o-matic
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-else
-	MY_PV="${PV%_pre}"
-	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
-	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="~amd64"
-	fi
-fi
-
-DESCRIPTION="Intel Media Driver for VA-API (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD redistributable? ( no-source-code )"
-SLOT="0"
-IUSE="+redistributable test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-22.5.0:=[${MULTILIB_USEDEP}]
-	>=media-libs/libva-2.22.0[X?,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-23.3.4-Remove-unwanted-CFLAGS.patch
-	"${FILESDIR}"/${PN}-23.3.4_testing_in_src_test.patch
-)
-
-multilib_src_configure() {
-	# https://github.com/intel/media-driver/issues/356
-	append-cxxflags -D_FILE_OFFSET_BITS=64
-
-	local mycmakeargs=(
-		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
-		-DMEDIA_RUN_TEST_SUITE=$(usex test)
-		-DBUILD_TYPE=Release
-		-DPLATFORM=linux
-		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X)
-		-DENABLE_NONFREE_KERNELS=$(usex redistributable)
-		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
-	)
-	local CMAKE_BUILD_TYPE="Release"
-	cmake_src_configure
-}
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.4.2.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-25.1.0.ebuild
index 42f6583e9710..a27f472ef10b 100644
--- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-24.4.2.ebuild
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-25.1.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
@@ -29,7 +29,7 @@ IUSE="+redistributable test X"
 
 RESTRICT="!test? ( test )"
 
-DEPEND=">=media-libs/gmmlib-22.5.0:=[${MULTILIB_USEDEP}]
+DEPEND=">=media-libs/gmmlib-22.6.0:=[${MULTILIB_USEDEP}]
 	>=media-libs/libva-2.22.0[X?,${MULTILIB_USEDEP}]
 "
 RDEPEND="${DEPEND}"
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
index ddc7213143ea..a27f472ef10b 100644
--- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
@@ -29,8 +29,8 @@ IUSE="+redistributable test X"
 
 RESTRICT="!test? ( test )"
 
-DEPEND=">=media-libs/gmmlib-22.5.4:=[${MULTILIB_USEDEP}]
-	>=media-libs/libva-2.21.0[X?,${MULTILIB_USEDEP}]
+DEPEND=">=media-libs/gmmlib-22.6.0:=[${MULTILIB_USEDEP}]
+	>=media-libs/libva-2.22.0[X?,${MULTILIB_USEDEP}]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 70a7b45162c8..904731c633ba 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -3,6 +3,7 @@ DIST mesa-24.2.8.tar.xz 29622208 BLAKE2B f71a1663f9637883b4c442ba8c68f7960c48c4f
 DIST mesa-24.3.1.tar.xz 30611028 BLAKE2B d3efc322388e29f651b15b0396fef8a6acc0cf24881165900845e429dd6cb53d51511f174d6a4017f48962b764b9a42f069825196af9f4ca969a4b46e1108a0e SHA512 deecf58e2c31e35d7c1943bb21184b52133a83fa472925128d3a03a57b26c92a476a6d3f7140ef2b78475b66affdabf97436ee8b324be204ce5bb940f78119c8
 DIST mesa-24.3.2.tar.xz 30640276 BLAKE2B d5973506983a23a95c360801a591e13945695e9a0c6f9f3bbb953865aa39ccfabaae624f4cd1edc8ecf479710856f5cc08e4f6374b107a06870906e934ecc5b8 SHA512 ea1065f7b466f1b2b3570c87585d6de15e3784a60d920c9f991c22720197d5947b598ac2c76773bed8150c91360ee5bbc77f3b48780a19502a8c4224baa728b9
 DIST mesa-24.3.3.tar.xz 30657916 BLAKE2B b973227885b3fd5fa6267c150a5e174f5e8a1c6378cf9326845ba75332084d7c914917c8e3b6d7b89f49ede0f5a5b453eb1ce42591e98b0cbad3f85bd3040035 SHA512 280d7a6dd64503ec398d449430270c78b5558c03bfeed3a42346573fd2db1aa3f96f5a212e49288718a7fe27447ee40235b066517622d68b0dfdd7b251a4e85f
+DIST mesa-24.3.4.tar.xz 30691532 BLAKE2B a5cf1f49c6d809d19510793f5d1dcec1a3842495d3b4166e303d7f2d4744d179811697d264c5c9b39f2819ebc64a76357195b3eae6b1d2a83128de141354e3c2 SHA512 9c23cd86fda4cf0289c5a78b08ceea8b01e5b141d86ee3e659fa46e62ff9586ff92a4984d2a340b5bf209c4c7f3414bf99f3ced19feee8fb39ef99fe572dbd55
 DIST paste-1.0.14.crate 18157 BLAKE2B 35e8548611c51ee75f4d04926149e5e54870d7073d9b635d550a6fa0f85891f57f326bdbcff3dd8618cf40f8e08cf903ef87d9c034d5921d8b91e1db842cdd7c SHA512 3a793f0e5e773a7f7defc798a4c17ae9a40d715144632ea6cb0a8c785e14c4212046491df016bb9838281f8eaf327a79f01c1e2ac5f26785c028bc880faff9ee
 DIST proc-macro2-1.0.70.crate 44343 BLAKE2B fff0dec06b21e391783cc136790238acb783780eaedcf14875a350e7ceb46fdc100c8b9e3f09fb7f4c2196c25d4c6b61e574c0dad762d94533b628faab68cf5c SHA512 ae9366856853f7d96caf7a7581843d36bfc7843f8683897b19ffc666c03b0b1eff502ddb18ca4c1c1a239a368f03f6cc258b0e2795f64b61c6a31404462eec5f
 DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
@@ -15,5 +16,6 @@ EBUILD mesa-24.2.8.ebuild 13854 BLAKE2B f375b50f7d2329f70302f08d9c96ee24ae60d782
 EBUILD mesa-24.3.1.ebuild 13530 BLAKE2B b904449f3bfcec35b69fddff80d21700ae036de68a1aabe9ab4667bd5e6af770ae509695314b09aba889085f0245697cd44c5e6da6daf6093e1cd1b9a71ed11e SHA512 4a8a3dc06d41b5b12c4881dac86cc9f88aa0273bb9933410228fbd52e33e440082617865498b33d34b28d02a20ef6afa38d4dba1862db3c242f59ffcf33c764b
 EBUILD mesa-24.3.2.ebuild 13685 BLAKE2B 6a5cce38e17ecf21830cd3883e6d6fe7e961cd43c4068a9442aaedfc858eb8e41d4570b1b51f588dc0740aa36a8668e606f7c903c884de38a42f9db7aa746c4e SHA512 da93c1d1a944f70dc761da029c0301aa3314cedc39d5ba59346de492be4d319197e4e13bfe028c4e87c3d65cbe514ab834a5ea995a311d8e7c4e0dce6d188078
 EBUILD mesa-24.3.3.ebuild 13729 BLAKE2B d77a5bbbaaa625c3189c383c97f2c3d1751bd64a364ada1f7968c126fdbea632a3af41c8c13b5525e08e5a8647f356d8b1c37f27a8808bade18b35d2489d69d8 SHA512 0b655780b02637d6fddd2984fcf9c137ea5dac67ef8584bb04f0d53a8a91698eda154cb459cb9d4196646931adaa3286471aee8a1c383b02903b8f8f890bda38
+EBUILD mesa-24.3.4.ebuild 13732 BLAKE2B fad5020f3dd1bbc5605e4f49b022abe107ab5ae46ad19c750070be178ccc1b976d71bbf7640ce9ae5a68323fea35998015df9f1c516c8f338dad0f11d251b517 SHA512 baabaf8b2932e38b003477736638fb79c5ccca16520c06ec9d008a2df68140a30def0138ce8ceb511440dea6d2759281c87a98360234d293db64543b25a3426f
 EBUILD mesa-9999.ebuild 13751 BLAKE2B 4912218217a296c479fec5a5d8eae21af441c2c6a83f39ad5381e3554b6b160b4abfacfdcdf6fc13d4fbcb4ed42364a4d98ba49727f2f2f349f810c3f4e9ed23 SHA512 df53d6518b4c49763eb5af3a9e91aa28d833559358670b7994c9507d0d6873a750f792c9f69040876d6b7667149b9edc3b0b636e9f72aa30e6e327433328bd05
 MISC metadata.xml 1303 BLAKE2B 348e84a15156bd8ae4634c1866f83f1b283b77f8478e66e57dd3f047a6346d1cc67a7c808ce159b82d292dfab62e8b6c4d17cefcae7aea6fa38739667947258b SHA512 448c3d73ded90117f38cec7c80eead4bdac1599c563798c91c96bca8543b9db2e5c2a06f26f9b7496af085a964aff51ed8b0882aa88f18404b64447de2f65598
diff --git a/media-libs/mesa/mesa-24.3.4.ebuild b/media-libs/mesa/mesa-24.3.4.ebuild
new file mode 100644
index 000000000000..0aae9a9fc728
--- /dev/null
+++ b/media-libs/mesa/mesa-24.3.4.ebuild
@@ -0,0 +1,502 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..19} )
+LLVM_OPTIONAL=1
+CARGO_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info rust-toolchain
+
+MY_P="${P/_/-}"
+
+CRATES="
+	syn@2.0.68
+	proc-macro2@1.0.86
+	quote@1.0.33
+	unicode-ident@1.0.12
+	paste@1.0.14
+"
+
+RUST_MIN_VER="1.74.1"
+RUST_OPTIONAL=1
+
+inherit cargo
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	SRC_URI="
+		https://archive.mesa3d.org/${MY_P}.tar.xz
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+fi
+
+# This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
+# but there are "stale" distfiles on the mirrors with the wrong names.
+# export MESON_PACKAGE_CACHE_DIR="${DISTDIR}"
+SRC_URI+="
+	${CARGO_CRATE_URIS}
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+LICENSE="MIT SGI-B-2.0"
+SLOT="0"
+
+RADEON_CARDS="r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS}
+	d3d12 freedreno intel lavapipe lima nouveau nvk panfrost v3d vc4 virgl
+	vivante vmware zink"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	cpu_flags_x86_sse2 d3d9 debug +llvm
+	lm-sensors opencl +opengl osmesa +proprietary-codecs selinux
+	test unwind vaapi valgrind vdpau vulkan
+	wayland +X xa +zstd"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	d3d9? (
+		|| (
+			video_cards_freedreno
+			video_cards_intel
+			video_cards_nouveau
+			video_cards_panfrost
+			video_cards_r300
+			video_cards_r600
+			video_cards_radeonsi
+			video_cards_vmware
+			video_cards_zink
+		)
+	)
+	llvm? ( ${LLVM_REQUIRED_USE} )
+	video_cards_lavapipe? ( llvm vulkan )
+	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_zink? ( vulkan opengl )
+	video_cards_nvk? ( vulkan video_cards_nouveau )
+	vdpau? ( X )
+	xa? ( X )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.121"
+RDEPEND="
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.9[${MULTILIB_USEDEP}]
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	llvm? (
+		$(llvm_gen_dep "
+			llvm-core/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
+			opencl? (
+				dev-util/spirv-llvm-translator:\${LLVM_SLOT}
+				llvm-core/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
+				=llvm-core/libclc-\${LLVM_SLOT}*[spirv(-)]
+			)
+		")
+		video_cards_r600? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_radeon? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+	opencl? (
+		>=virtual/opencl-3
+		llvm-core/libclc[spirv(-)]
+		>=dev-util/spirv-tools-1.3.231.0
+		virtual/libelf:0=
+	)
+	vaapi? (
+		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+	)
+	vdpau? ( >=x11-libs/libvdpau-1.5:=[${MULTILIB_USEDEP}] )
+	video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
+	video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.17:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
+	)
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+DEPEND="${RDEPEND}
+	video_cards_d3d12? ( >=dev-util/directx-headers-1.614.1[${MULTILIB_USEDEP}] )
+	valgrind? ( dev-debug/valgrind )
+	wayland? ( >=dev-libs/wayland-protocols-1.38 )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		${RUST_DEPEND}
+		>=dev-util/bindgen-0.58.0
+	)
+	>=dev-build/meson-1.4.1
+	app-alternatives/yacc
+	app-alternatives/lex
+	virtual/pkgconfig
+	$(python_gen_any_dep "
+		>=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]
+		dev-python/packaging[\${PYTHON_USEDEP}]
+		dev-python/pyyaml[\${PYTHON_USEDEP}]
+	")
+	video_cards_intel? (
+		~dev-util/intel_clc-${PV}
+		llvm-core/libclc[spirv(-)]
+		$(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]")
+	)
+	vulkan? (
+		dev-util/glslang
+		video_cards_nvk? (
+			>=dev-util/bindgen-0.68.1
+			>=dev-util/cbindgen-0.26.0
+			${RUST_DEPEND}
+		)
+	)
+	wayland? ( dev-util/wayland-scanner )
+"
+
+QA_WX_LOAD="
+x86? (
+	usr/lib/libglapi.so.0.0.0
+	usr/lib/libOSMesa.so.8.0.0
+	usr/lib/libGLX_mesa.so.0.0.0
+)"
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		unpack ${MY_P}.tar.xz
+	fi
+
+	# We need this because we cannot tell meson to use DISTDIR yet
+	pushd "${DISTDIR}" >/dev/null || die
+	mkdir -p "${S}"/subprojects/packagecache || die
+	local i
+	for i in *.crate; do
+		ln -s "${PWD}/${i}" "${S}/subprojects/packagecache/${i/.crate/}.tar.gz" || die
+	done
+	popd >/dev/null || die
+}
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_freedreno &&
+		   ! use video_cards_intel &&
+		   ! use video_cards_lavapipe &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_nvk &&
+		   ! use video_cards_panfrost &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_v3d &&
+		   ! use video_cards_virgl; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, lavapipe, nouveau, nvk, panfrost, radeonsi, v3d, or virgl"
+		fi
+	fi
+
+	# VA
+	if use vaapi; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_virgl; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_virgl; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, nouveau, r600, radeonsi, or virgl"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_intel &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, intel, nouveau, or vmware"
+		fi
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+
+	if use osmesa && ! use llvm; then
+		ewarn "OSMesa will be slow without enabling USE=llvm"
+	fi
+}
+
+python_check_deps() {
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" || return 1
+	if use llvm && use vulkan && use video_cards_intel && use amd64; then
+		python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1
+	fi
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version llvm-core/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and llvm-core/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use video_cards_intel ||
+	   use video_cards_radeonsi; then
+		if kernel_is -ge 5 11 3; then
+			CONFIG_CHECK="~KCMP"
+		elif kernel_is -ge 5 11; then
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		elif kernel_is -ge 5 10 20; then
+			CONFIG_CHECK="~KCMP"
+		else
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		fi
+		linux-info_pkg_setup
+	fi
+
+	use llvm && llvm-r1_pkg_setup
+	python-any-r1_pkg_setup
+
+	if use opencl || (use vulkan && use video_cards_nvk); then
+		rust_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
+		bin/symbols-check.py || die # bug #830728
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	# bug #932591 and https://gitlab.freedesktop.org/mesa/mesa/-/issues/11140
+	filter-lto
+
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	emesonargs+=(-Dplatforms=${platforms#,})
+
+	if use video_cards_freedreno ||
+	   use video_cards_intel || # crocus i915 iris
+	   use video_cards_nouveau ||
+	   use video_cards_panfrost ||
+	   use video_cards_r300 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_vmware || # svga
+	   use video_cards_zink; then
+		emesonargs+=($(meson_use d3d9 gallium-nine))
+	else
+		emesonargs+=(-Dgallium-nine=false)
+	fi
+
+	if use video_cards_d3d12 ||
+	   use video_cards_nouveau ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_virgl; then
+		emesonargs+=($(meson_feature vaapi gallium-va))
+		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+	else
+		emesonargs+=(-Dgallium-va=disabled)
+	fi
+
+	if use video_cards_d3d12; then
+		emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
+	fi
+
+	if use video_cards_d3d12 ||
+	   use video_cards_nouveau ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_virgl; then
+		emesonargs+=($(meson_feature vdpau gallium-vdpau))
+	else
+		emesonargs+=(-Dgallium-vdpau=disabled)
+	fi
+
+	if use video_cards_freedreno ||
+	   use video_cards_intel ||
+	   use video_cards_nouveau ||
+	   use video_cards_vmware; then
+		emesonargs+=($(meson_feature xa gallium-xa))
+	else
+		emesonargs+=(-Dgallium-xa=disabled)
+	fi
+
+	gallium_enable !llvm softpipe
+	gallium_enable llvm llvmpipe
+	gallium_enable video_cards_d3d12 d3d12
+	gallium_enable video_cards_freedreno freedreno
+	gallium_enable video_cards_intel crocus i915 iris
+	gallium_enable video_cards_lima lima
+	gallium_enable video_cards_nouveau nouveau
+	gallium_enable video_cards_panfrost panfrost
+	gallium_enable video_cards_v3d v3d
+	gallium_enable video_cards_vc4 vc4
+	gallium_enable video_cards_virgl virgl
+	gallium_enable video_cards_vivante etnaviv
+	gallium_enable video_cards_vmware svga
+	gallium_enable video_cards_zink zink
+
+	gallium_enable video_cards_r300 r300
+	gallium_enable video_cards_r600 r600
+	gallium_enable video_cards_radeonsi radeonsi
+	if ! use video_cards_r300 &&
+	   ! use video_cards_r600; then
+		gallium_enable video_cards_radeon r300 r600
+	fi
+
+	if use llvm && use opencl; then
+		PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig"
+		# See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst
+		emesonargs+=(
+			$(meson_native_true gallium-rusticl)
+			-Drust_std=2021
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_d3d12 microsoft-experimental
+		vulkan_enable video_cards_freedreno freedreno
+		vulkan_enable video_cards_intel intel intel_hasvk
+		vulkan_enable video_cards_lavapipe swrast
+		vulkan_enable video_cards_panfrost panfrost
+		vulkan_enable video_cards_radeonsi amd
+		vulkan_enable video_cards_v3d broadcom
+		vulkan_enable video_cards_vc4 broadcom
+		vulkan_enable video_cards_virgl virtio
+		if use video_cards_nvk; then
+			vulkan_enable video_cards_nvk nouveau
+			if ! multilib_is_native_abi; then
+				echo -e "[binaries]\nrust = ['rustc', '--target=$(rust_abi $CBUILD)']" > "${T}/rust_fix.ini"
+				emesonargs+=(
+					--native-file "${T}"/rust_fix.ini
+				)
+			fi
+		fi
+
+		emesonargs+=(-Dvulkan-layers=device-select,overlay)
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	if use opengl && use X; then
+		emesonargs+=(-Dglx=dri)
+	else
+		emesonargs+=(-Dglx=disabled)
+	fi
+
+	if [[ "${ABI}" == amd64 ]]; then
+		emesonargs+=($(meson_feature video_cards_intel intel-rt))
+	fi
+
+	use debug && EMESON_BUILDTYPE=debug
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dshared-glapi=enabled
+		-Dexpat=enabled
+		$(meson_use opengl)
+		$(meson_feature opengl gbm)
+		$(meson_feature opengl gles1)
+		$(meson_feature opengl gles2)
+		$(meson_feature opengl glvnd)
+		$(meson_feature opengl egl)
+		$(meson_feature llvm)
+		$(meson_feature lm-sensors lmsensors)
+		$(meson_use osmesa)
+		$(meson_use selinux)
+		$(meson_feature unwind libunwind)
+		$(meson_feature zstd)
+		$(meson_use cpu_flags_x86_sse2 sse2)
+		-Dintel-clc=$(usex video_cards_intel system auto)
+		-Dvalgrind=$(usex valgrind auto disabled)
+		-Dvideo-codecs=$(usex proprietary-codecs "all" "all_free")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+
+	if ! multilib_is_native_abi && use video_cards_nvk; then
+		sed -i -E '{N; s/(rule rust_COMPILER_FOR_BUILD\n command = rustc) --target=[a-zA-Z0-9=:-]+ (.*) -C link-arg=-m[[:digit:]]+/\1 \2/g}' build.ninja || die
+	fi
+}
+
+multilib_src_compile() {
+	if [[ ${ABI} == x86 ]]; then
+		# Bug 939803
+		BINDGEN_EXTRA_CLANG_ARGS="-m32" meson_src_compile
+	else
+		meson_src_compile
+	fi
+}
+
+multilib_src_test() {
+	meson_src_test -t 100
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}