gentoo auto-resync : 07:06:2024 - 00:08:01

9 files changed, 583 insertions, 6 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 9ec08533ab88..6f0ad1146681 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 1bb586c2be36..5c5c27f35546 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -5,7 +5,7 @@ DIST intel-gmmlib-22.3.18.tar.gz 846277 BLAKE2B 79485dfe33537053b9986f2f97771c55
 DIST intel-gmmlib-22.3.19.tar.gz 846342 BLAKE2B ce3c25740d9c3f556db31f880b47fba8358dd7d7d53d80bc9923bec8c67fdeee3ae4efa5465390c229bfdc2f6c64fa0a7963516f83d12061d34bf51102cb3a64 SHA512 804e4995983884832dbb6d08a4e3c8ca8d60e7ef2c5a0de12d0facfac1fdce619ad229ad1a6b62fdf0ba74a968caf3bb884e283af8cf38babacff350fc9728b9
 DIST intel-gmmlib-22.3.20.tar.gz 846257 BLAKE2B 04e17f6735cd2081d672c29de986331fb5ddc7d89d142bcc470ee48567762676d562620d0d1f9e2ab061ba96b299bc4b0f6416c17542a8d7f9288cdfb1d0a42f SHA512 d5a6da43f4bdcb2a138c249e197b2e441d0999e89867aa66dfa68cbfc6982e631a7df29fd213a72a57b31cb29366f654343cb6b77a46f22e54bfa5432310e053
 EBUILD gmmlib-22.3.18.ebuild 954 BLAKE2B e65b06b054ff521cc3ee3d2b95a6777a706fe03fa30cd7a369539d5ebc0b5aead789a8997d640f7a273f2ff9235b216cf1950c3d6f93f9349ac76348ed3de189 SHA512 c7bcd9d9ddd19d174d277a620a38b206d8e1796ad1dcde3ba61b34eaa92eb4d0ece070077e5cd744a38ed80317ea6715ce5d4a5a7cc8057672980d69060585cb
-EBUILD gmmlib-22.3.19.ebuild 955 BLAKE2B eba2f14d093a7b8b63a1cee0dff0fab805b9681bca014bd11cb2ff7682aec1b3adeaf41cac8b33a1d8a48c4c4420bfcc296a91429c3d55ab3e51581ee126adaa SHA512 f6f89934cf6bb49c453de13a599224d6415f494522f0ebc876cdecda9a061b9d41788ce3ae55d1c168c1f73d6d362403cb15b81067866e1554a4f57ff73c9494
+EBUILD gmmlib-22.3.19.ebuild 954 BLAKE2B e65b06b054ff521cc3ee3d2b95a6777a706fe03fa30cd7a369539d5ebc0b5aead789a8997d640f7a273f2ff9235b216cf1950c3d6f93f9349ac76348ed3de189 SHA512 c7bcd9d9ddd19d174d277a620a38b206d8e1796ad1dcde3ba61b34eaa92eb4d0ece070077e5cd744a38ed80317ea6715ce5d4a5a7cc8057672980d69060585cb
 EBUILD gmmlib-22.3.20.ebuild 955 BLAKE2B eba2f14d093a7b8b63a1cee0dff0fab805b9681bca014bd11cb2ff7682aec1b3adeaf41cac8b33a1d8a48c4c4420bfcc296a91429c3d55ab3e51581ee126adaa SHA512 f6f89934cf6bb49c453de13a599224d6415f494522f0ebc876cdecda9a061b9d41788ce3ae55d1c168c1f73d6d362403cb15b81067866e1554a4f57ff73c9494
 EBUILD gmmlib-9999.ebuild 955 BLAKE2B eba2f14d093a7b8b63a1cee0dff0fab805b9681bca014bd11cb2ff7682aec1b3adeaf41cac8b33a1d8a48c4c4420bfcc296a91429c3d55ab3e51581ee126adaa SHA512 f6f89934cf6bb49c453de13a599224d6415f494522f0ebc876cdecda9a061b9d41788ce3ae55d1c168c1f73d6d362403cb15b81067866e1554a4f57ff73c9494
 MISC metadata.xml 478 BLAKE2B 22fa7744f1f6ae793034225645314ed7f0a5499cc33b570a00aa2c076cb3fdc9c2663654df4998a30fc76f7d833ed4f2022fd8b2869539e25c47f64e6b0f438a SHA512 0c46a6af2f254ee9c314f08654739003f58283e3ec00a8a3e628225e14065d359d0816a05aba1754379dea826d1bf2d501fb35ba58c5020f036917771ea035d9
diff --git a/media-libs/gmmlib/gmmlib-22.3.19.ebuild b/media-libs/gmmlib/gmmlib-22.3.19.ebuild
index 2a09f24b8f3d..0a7ae2c25cdb 100644
--- a/media-libs/gmmlib/gmmlib-22.3.19.ebuild
+++ b/media-libs/gmmlib/gmmlib-22.3.19.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	fi
 	inherit git-r3
 else
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
 	S="${WORKDIR}/${PN}-intel-${P}"
 fi
diff --git a/media-libs/jbig2dec/Manifest b/media-libs/jbig2dec/Manifest
index 432ea3a0e71b..bcb7a8ad352e 100644
--- a/media-libs/jbig2dec/Manifest
+++ b/media-libs/jbig2dec/Manifest
@@ -1,4 +1,7 @@
 DIST jb2streams.zip 1285838 BLAKE2B 9a2b6047a7b970439693d6f5fdefb9488019a562e7f831288b27df09bb19dec2f84854cf7fea50b5b041d331e925145f37f2f89848058ecdc074e7d6c238033f SHA512 382890b36345b8aaebb3554e776a53f3276c6d835335ce41f3f41829ff62bba7ae646602544103ba8541a7a824dca92d682b682c254ab2918c7fe45b3e358b45
 DIST jbig2dec-0.19.tar.gz 149134 BLAKE2B 576f3a516499b6291d25dfdefe5af62899665167526dca11435bc07e04a3feb707f82d3a8bdda774f5cfe0d792c3147e77aa94fa57feac25ba1c0a7805c5fc58 SHA512 d5a27951cc9c06c184f454e258e81b6e4d5aa2742a4da821522b9a42ecc78e7e1b78058dabc23821618e62d62d8832011f16b5ef2d66beac463da6b809fd02af
-EBUILD jbig2dec-0.19.ebuild 1502 BLAKE2B 2a40291807a1097797d88aadd2543a3d48dfac829e408299a363fd9c5762358f6086e2a8ce3c904817ad460785d2799af8af4c119aca34163be81eb378b84d84 SHA512 462a3e268ce7d6fc8110d6ae09eed80cb316aa8da5353257fabda9488a48ca3fae80685a666a0f636c7994c23e389a3c08d2a4f76c30146c79b51c83b375830f
+DIST jbig2dec-0.20.tar.gz 149782 BLAKE2B 6e5a26b736bbc5dc25614e192855d74a59337f5e5aa82cd0882e42a34259295d7df7f8c7acfb88b53ac3817141459c6d6cc58c0d36c1c341e2afedbed8f7d83d SHA512 8b8a28b93b23e4284ca229e6c8935fd161ce5c597f7470a46ec06a3241d0ac23cf921aecdd4e0c1bd3c904591409054236f2ce25b6d8ae40db742559c7f4dbe9
+EBUILD jbig2dec-0.19-r1.ebuild 1512 BLAKE2B c05ac93f838135771088f893c511fe43e1050eca2f5443dee8c76f302c0695b1072626139806a855473117c6ffab15d7de05ae82f2f4672f32d52172b1fe4c56 SHA512 603d11524cfc9f865646db23038b618cbf069d383e48373ef019031c404d7ec24a3ed9d120893a3b8da579a9d53c8305955eaa5d5fc0a8d83a5d571ae7ca6b35
+EBUILD jbig2dec-0.19.ebuild 1504 BLAKE2B d12286cdd097af8f3af42ece3a96445821d45e0ff38f759f9fb106eca86db9bb45033dd155d35decaa047aebd8c869d3a71ce807b947a03b9c2a941f13a513c6 SHA512 957bde227033082ce14be1f5e0d9aeef4ddcf4f83d5d0ce5f36a3d2b3a8d2c708e6e1db64b982c4f58f1e14bae3f8438cc23c27a32e7feb9c554cefc6d436684
+EBUILD jbig2dec-0.20.ebuild 1512 BLAKE2B c05ac93f838135771088f893c511fe43e1050eca2f5443dee8c76f302c0695b1072626139806a855473117c6ffab15d7de05ae82f2f4672f32d52172b1fe4c56 SHA512 603d11524cfc9f865646db23038b618cbf069d383e48373ef019031c404d7ec24a3ed9d120893a3b8da579a9d53c8305955eaa5d5fc0a8d83a5d571ae7ca6b35
 MISC metadata.xml 414 BLAKE2B cae9b25dd53d68c263a4afe3c1a18c02923fd665b60791df7d0b9b55d82184159c5c1ced1786bd443d38668b1f12b083191cb1da4e9a576c5da5e4d36828d56c SHA512 1e5bcded3676b4d336781551dcd875e1d7cc5532eaf13cbf013799c225f94967c8f592707492cf8908a65d76e473452fa5b0419fbaea73f1c718660e65ffdcba
diff --git a/media-libs/jbig2dec/jbig2dec-0.19-r1.ebuild b/media-libs/jbig2dec/jbig2dec-0.19-r1.ebuild
new file mode 100644
index 000000000000..32d59d523ce2
--- /dev/null
+++ b/media-libs/jbig2dec/jbig2dec-0.19-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit autotools python-any-r1
+
+DESCRIPTION="A decoder implementation of the JBIG2 image compression format"
+HOMEPAGE="https://jbig2dec.com/"
+SRC_URI="
+	https://github.com/ArtifexSoftware/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://jbig2dec.sourceforge.net/ubc/jb2streams.zip )
+"
+
+LICENSE="AGPL-3"
+SLOT="0/$(ver_cut 1-2)" #698428
+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"
+IUSE="png static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		app-arch/unzip
+		${PYTHON_DEPS}
+	)
+"
+RDEPEND="png? ( media-libs/libpng:= )"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES README )
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if use test; then
+		mkdir "${WORKDIR}/ubc" || die
+		mv -v "${WORKDIR}"/*.jb2 "${WORKDIR}/ubc/" || die
+		mv -v "${WORKDIR}"/*.bmp "${WORKDIR}/ubc/" || die
+	fi
+
+	# We only need configure.ac and config_types.h.in
+	sed -i \
+		-e '/^# do we need automake?/,/^autoheader/d' \
+		-e '/echo "  $AUTOM.*/,$d' \
+		autogen.sh \
+		|| die "failed to modify autogen.sh"
+
+	./autogen.sh || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with png libpng)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -exec rm {} + || die
+}
diff --git a/media-libs/jbig2dec/jbig2dec-0.19.ebuild b/media-libs/jbig2dec/jbig2dec-0.19.ebuild
index 315beae29304..9b7fa7056477 100644
--- a/media-libs/jbig2dec/jbig2dec-0.19.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.19.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit autotools python-any-r1
 
 DESCRIPTION="A decoder implementation of the JBIG2 image compression format"
 HOMEPAGE="https://jbig2dec.com/"
 SRC_URI="
 	https://github.com/ArtifexSoftware/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? ( http://jbig2dec.sourceforge.net/ubc/jb2streams.zip )
+	test? ( https://jbig2dec.sourceforge.net/ubc/jb2streams.zip )
 "
 
 LICENSE="AGPL-3"
diff --git a/media-libs/jbig2dec/jbig2dec-0.20.ebuild b/media-libs/jbig2dec/jbig2dec-0.20.ebuild
new file mode 100644
index 000000000000..32d59d523ce2
--- /dev/null
+++ b/media-libs/jbig2dec/jbig2dec-0.20.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit autotools python-any-r1
+
+DESCRIPTION="A decoder implementation of the JBIG2 image compression format"
+HOMEPAGE="https://jbig2dec.com/"
+SRC_URI="
+	https://github.com/ArtifexSoftware/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://jbig2dec.sourceforge.net/ubc/jb2streams.zip )
+"
+
+LICENSE="AGPL-3"
+SLOT="0/$(ver_cut 1-2)" #698428
+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"
+IUSE="png static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		app-arch/unzip
+		${PYTHON_DEPS}
+	)
+"
+RDEPEND="png? ( media-libs/libpng:= )"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES README )
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if use test; then
+		mkdir "${WORKDIR}/ubc" || die
+		mv -v "${WORKDIR}"/*.jb2 "${WORKDIR}/ubc/" || die
+		mv -v "${WORKDIR}"/*.bmp "${WORKDIR}/ubc/" || die
+	fi
+
+	# We only need configure.ac and config_types.h.in
+	sed -i \
+		-e '/^# do we need automake?/,/^autoheader/d' \
+		-e '/echo "  $AUTOM.*/,$d' \
+		autogen.sh \
+		|| die "failed to modify autogen.sh"
+
+	./autogen.sh || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with png libpng)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -exec rm {} + || die
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index f70266110f03..a3bf755c95dc 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,6 +1,7 @@
 AUX 24.0.4-dzn-Include-vulkan_core.h-instead-of-vulkan.h-in-the.patch 1088 BLAKE2B 87a70ee57b7a6c11479af58a649398125e8461bdfd5b2a3b8f875497425cecee5f359fb06a34b0d227ac8007ef89285814090e59127e5ef7f3c74a394f7d50b6 SHA512 1af6f99f66a4add4e3401ff4f9cb4e2e06adf89518ff754b94cfe078ee285c413ee63e6a434a66eb95f551cf0231249858b0ea428cb9ab473dca190983d98960
 DIST mesa-24.0.7.tar.xz 20144724 BLAKE2B d9438e533b471445b2403e01e1fd593d83c0013b0991585f718122f1cadc6ac6bb1fb913f0fb257354ae21ddd9fe1f970ad9ac46f05d756c223ed56a11b9c9ce SHA512 77b0fae80ab0a07e2e528c113eadef0e3004b8df3e6e98fffe6fc2d8ac39f5ce7fa38ebe5c2ae32bfbac993dd7cbe288ace18ebb03cf2fb445fe7114f74dd45c
 DIST mesa-24.0.8.tar.xz 20170168 BLAKE2B 1919e99e6ccbd51c8e74e55985ea9a3f47bf49c7e4260a195a609ce175eeded9fc5a56970ae35d21bc650e4bb802df484d2088b29ef3861d13942bd495891a9a SHA512 1e1be9b50c2a404a96960db87d2ba4cd1c602445f9ab8acfb6a8a023410063620c2ef891fe516afec3d830756e0b0f4309ef50c6caeefa44e164b414c4708b10
+DIST mesa-24.0.9.tar.xz 20197892 BLAKE2B 3c68e544898031fe76a57ea754f46ede5b105c259d13dd484eaa63fe51b7d52cf76a4084529b11a586c4d8d06f4cb32f993fd1ea4e6ccc4cbc91e78fe755743a SHA512 de2ee6c9df1fc106ee10befe0a76be1e9cfe83d65dbdb83bad6d8d7cfaa085232fb115293a1a790b37b50b1fe14bd58aafbcfe5a15e953b5901a7105d57569a5
 DIST mesa-24.1.0.tar.xz 28994008 BLAKE2B 1558d20d426162bfe8cccf96107ddbf1373c8322f87f48daec73e23b283e00f95d6efd073cad9b92065928af4b9b4a339ff2d204412070eca903f77ca366e619 SHA512 4b7ed1940fc812ef4efb55978d3ffe3d0e2ae53d5b57a3baca10a52db2ba5852c5ee7e75c3739bd8d384c80bf1cba970a384250050f01f03bba98f255e12cec5
 DIST mesa-24.1.1.tar.xz 29019256 BLAKE2B 152ce5f4847a321689bf4aa88529963278f7dd24097c4c3de2b3a9164d06cd23d7cccd96bd31fea88311ded576c834a73e2d669e6d290404283f33f92b9bf262 SHA512 a23fc2fe479f21027095a7791042148586b23da848474209ca4fecfe5c4d499e66fff0ebfa06d07ed9f16b5d6a2ef755b362cb6079141aff5fdc47cc571e3b1d
 DIST paste-1.0.14.tar.gz 18429 BLAKE2B 88f533fd336bbbe24872b100777703832ff46b52970b94981fea202726de35ac0d3466f96370fa89c966b33e0f13c75cbf7f5f88bba290dc490a63c9e08a0b16 SHA512 0ec40c228afe645cb027a99c8bd8f7c65158aab48655018a45736727906b05f7354df114405f2eae88c4eba73dec62e8228f8be9834afa0f22b5f31c18006d34
@@ -11,6 +12,7 @@ DIST unicode-ident-1.0.12.tar.gz 50118 BLAKE2B 04e2651e14251d68f4e7e70e1e7a6d5ed
 EBUILD mesa-24.0.7.ebuild 11737 BLAKE2B c63e9edb6075b0af71fbcbc60eb6917468cad89ab245b8b0ef66dde87b85851966b98fd1b9730ce8e7f0e0423de7a44ee08807f2aa3842d44d4e2119b786d910 SHA512 dc68bed1f727ad15d1ab0a211b2fd377e554d2a11b3a7739f3ae7b2c2789a1981c46323464aeac5321bb65f5aa77d7639e0723f5f1374f8c8d4f6c1b92d04e60
 EBUILD mesa-24.0.8-r1.ebuild 11911 BLAKE2B ccbb733ee83f0f7869eaf08cfd48041adc3a49a27dd16169e7cf358f75fafb7088d3318313c279979df2e46d704f919cc4cb74ebe73cabdd88eeeba30023cea8 SHA512 fdcf5d16e88691846e38eb688889abdb559dba5e2c4545d5e4957ad66c1fd5836f37300940f74968cadb3f988a56642960c65dda268558b561901ebd66e39b6d
 EBUILD mesa-24.0.8.ebuild 11744 BLAKE2B fd8bd36715e2445ea0293040a7ee58aa0750506a775caaed4784c1ada06af600c50327631a6354403c056409cc677a5f07542f9b7c8674645e5a7e3a532efc58 SHA512 aca57c57340534506fc49ac0313d97017e53891d35bd4460908164056cdf441e7be3fbbfdbb5e9a216dde36b14d4728aa2b591593910ec5ad12d5f4f8269bcc5
+EBUILD mesa-24.0.9.ebuild 11911 BLAKE2B ccbb733ee83f0f7869eaf08cfd48041adc3a49a27dd16169e7cf358f75fafb7088d3318313c279979df2e46d704f919cc4cb74ebe73cabdd88eeeba30023cea8 SHA512 fdcf5d16e88691846e38eb688889abdb559dba5e2c4545d5e4957ad66c1fd5836f37300940f74968cadb3f988a56642960c65dda268558b561901ebd66e39b6d
 EBUILD mesa-24.1.0-r1.ebuild 14471 BLAKE2B f3bd8b5deb02aceacc0769de3e027fe56ad44cd7b8e0d88760b676d71ceae2c95e8773a284df54338204fb204d198f6ec648b0eabf30516d017ece9b385ecd33 SHA512 8a9dcd0566799621d95c9b1063096cc67a65c9e896ab4e3bb6d59711c4c39b633cfc692bc4f2702e474bd9633a3e446451b462bba164f235cc9d7b64a27065ca
 EBUILD mesa-24.1.0.ebuild 13591 BLAKE2B 25e06dfe37d5cad418b2caaadc7f3f22cb1842bd65d712d8e65bb348d26e51ed454755ae8dab6f6aeb803d0bb3df31113766eb0e60abb7493f339efee7cb4746 SHA512 b3d46efea43238b22eff219ef54af8a803e86b52e75e9cf9ccadc3e63fed3aa203721fa5aeeb2e7bcfdd4860baf66f41a0b1e672f5423c7f4e4b04620822bd9e
 EBUILD mesa-24.1.1.ebuild 14310 BLAKE2B 21c697eb3bcd4dddeec9877fcee16f819ca89f9eacbfbe6c7ca4868da32925a103f3051a87219d8e93440c669a435be388ed4206aead86e46119117fcd2e155f SHA512 1f12d36112aa3ddbf8e26e00899f662f40301c7bf60e86cec53f74e1f0c199c6d33f1f095691d0d20ef9de52411a84dcd90f7f8e45056950eea5f8730306f0c2
diff --git a/media-libs/mesa/mesa-24.0.9.ebuild b/media-libs/mesa/mesa-24.0.9.ebuild
new file mode 100644
index 000000000000..41c743d15fe6
--- /dev/null
+++ b/media-libs/mesa/mesa-24.0.9.ebuild
@@ -0,0 +1,438 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..17} )
+LLVM_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit flag-o-matic llvm-r1 meson-multilib python-any-r1 linux-info toolchain-funcs
+
+MY_P="${P/_/-}"
+
+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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+fi
+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 panfrost v3d vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
+	lm-sensors opencl +opengl osmesa +proprietary-codecs selinux
+	test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa zink +zstd"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	d3d9? (
+		|| (
+			video_cards_intel
+			video_cards_r300
+			video_cards_r600
+			video_cards_radeonsi
+			video_cards_nouveau
+			video_cards_vmware
+		)
+	)
+	llvm? ( ${LLVM_REQUIRED_USE} )
+	vulkan-overlay? ( vulkan )
+	video_cards_lavapipe? ( llvm vulkan )
+	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
+	vdpau? ( X )
+	xa? ( X )
+	X? ( gles1? ( opengl ) gles2? ( opengl ) )
+	zink? ( vulkan || ( opengl gles1 gles2 ) )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.119"
+RDEPEND="
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	llvm? (
+		$(llvm_gen_dep "
+			sys-devel/llvm:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
+			opencl? (
+				dev-util/spirv-llvm-translator:\${LLVM_SLOT}
+				sys-devel/clang:\${LLVM_SLOT}[llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}]
+			)
+		")
+		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
+		dev-libs/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.4:=[${MULTILIB_USEDEP}] )
+	video_cards_radeonsi? ( virtual/libelf:0=[${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.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
+	)
+	zink? ( media-libs/vulkan-loader:=[${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.611.0[${MULTILIB_USEDEP}] )
+	valgrind? ( dev-debug/valgrind )
+	wayland? ( >=dev-libs/wayland-protocols-1.30 )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=virtual/rust-1.62.0
+		>=dev-util/bindgen-0.58.0
+		>=dev-build/meson-1.3.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}]
+	")
+	vulkan? (
+		dev-util/glslang
+		llvm? (
+			video_cards_intel? (
+				amd64? (
+					$(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]")
+					~dev-util/intel_clc-${PV}
+					dev-libs/libclc[spirv(-)]
+				)
+			)
+		)
+	)
+	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
+)"
+
+PATCHES=(
+	"${FILESDIR}"/24.0.4-dzn-Include-vulkan_core.h-instead-of-vulkan.h-in-the.patch
+)
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_freedreno &&
+		   ! use video_cards_intel &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_v3d; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, radeonsi, or v3d"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, 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}]" || 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 sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/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
+}
+
+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
+	tc-is-gcc && [[ $(gcc-major-version) -ge 14 ]] && filter-lto
+
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	emesonargs+=(-Dplatforms=${platforms#,})
+
+	if use video_cards_intel ||
+	   use video_cards_r300 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_nouveau ||
+	   use video_cards_vmware; then
+		emesonargs+=($(meson_use d3d9 gallium-nine))
+	else
+		emesonargs+=(-Dgallium-nine=false)
+	fi
+
+	if use video_cards_d3d12 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_nouveau; 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_r300 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_nouveau; then
+		emesonargs+=($(meson_feature vdpau gallium-vdpau))
+	else
+		emesonargs+=(-Dgallium-vdpau=disabled)
+	fi
+
+	if use video_cards_freedreno ||
+	   use video_cards_nouveau ||
+	   use video_cards_vmware; then
+		emesonargs+=($(meson_feature xa gallium-xa))
+	else
+		emesonargs+=(-Dgallium-xa=disabled)
+	fi
+
+	if use video_cards_freedreno ||
+	   use video_cards_lima ||
+	   use video_cards_panfrost ||
+	   use video_cards_v3d ||
+	   use video_cards_vc4 ||
+	   use video_cards_vivante; then
+		gallium_enable -- kmsro
+	fi
+
+	gallium_enable -- swrast
+	gallium_enable video_cards_freedreno freedreno
+	gallium_enable video_cards_intel crocus i915 iris
+	gallium_enable video_cards_lima lima
+	gallium_enable video_cards_d3d12 d3d12
+	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 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_lavapipe swrast
+		vulkan_enable video_cards_freedreno freedreno
+		vulkan_enable video_cards_intel intel intel_hasvk
+		vulkan_enable video_cards_d3d12 microsoft-experimental
+		vulkan_enable video_cards_radeonsi amd
+		vulkan_enable video_cards_v3d broadcom
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	local vulkan_layers
+	use vulkan && vulkan_layers+="device-select"
+	use vulkan-overlay && vulkan_layers+=",overlay"
+	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
+
+	if use llvm && use vulkan && use video_cards_intel && use amd64; then
+		emesonargs+=(-Dintel-clc=system)
+	else
+		emesonargs+=(-Dintel-clc=disabled)
+	fi
+
+	if use opengl || use gles1 || use gles2; then
+		emesonargs+=(
+			-Degl=enabled
+			-Dgbm=enabled
+			-Dglvnd=true
+		)
+	else
+		emesonargs+=(
+			-Degl=disabled
+			-Dgbm=disabled
+			-Dglvnd=false
+		)
+	fi
+
+	if use opengl && use X; then
+		emesonargs+=(-Dglx=dri)
+	else
+		emesonargs+=(-Dglx=disabled)
+	fi
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dshared-glapi=enabled
+		-Ddri3=enabled
+		-Dexpat=enabled
+		$(meson_use opengl)
+		$(meson_feature gles1)
+		$(meson_feature gles2)
+		$(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)
+		-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[*]}")
+		-Dbuildtype=$(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+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
+}