gentoo auto-resync : 10:11:2024 - 03:03:09

28 files changed, 202 insertions, 85 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 8e0b814e9914..e0a05a951bd2 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index eced56bcd8b0..9bd0737444b1 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -4,5 +4,5 @@ DIST assimp-5.4.2.tar.gz 53807656 BLAKE2B cfa069cefdddcfdb756db6a72a5f67c528fa2c
 DIST assimp-5.4.3.tar.gz 53964510 BLAKE2B f08711881600d708ad523b2c36488c79a39463b5baa32261b674499582e0f4aa5fd4e8ade4bca0ceff93917f685f240b7dcee4d9140a65e3a9b888559a7b0433 SHA512 4738db84068d36face8caf61c0789178fdfc1310fa8e81ffb9b025e14183bde546b784d691c92438ab310a79ab7b75ab62ee0247d5f01e81ddf04fb94b7a9c0b
 EBUILD assimp-5.4.2-r1.ebuild 4135 BLAKE2B 609a17d3b1ee3ebf47a9351317640f41ef8075df413b4aeff56ec93d96f8ca529d4a80046db5c4b8a1fac1dc6f3468f87ce8455883fc99f0d17b17cdef831f82 SHA512 29a211cfc18319a165414ffb418acc631ef4c9f60fa007762b2841a1ff448317612fecb37fce08a477f559a3ef1d9ae9df37974f8d66c3b1fe7f5f9aaa4bd98c
 EBUILD assimp-5.4.2.ebuild 4110 BLAKE2B 331260ac82d44d82f9bda70c1ef725d026da3fea49cb92e9ad9e8ec9f268e12ae281693d2e0b3b1207b5372cb40aca331f43a000f37359ac667012dcdd61f781 SHA512 463148006ae5a61b3969a05f5ace1a5741a9f7a07dd3a27fe8938b519af90d357f2a59feb25ed7c14ab9a63aa0d6e0e9ab385a0bd5afec9caddcf14742ce6f17
-EBUILD assimp-5.4.3.ebuild 4131 BLAKE2B 93cb8cb54f8a850f6b00ece55cf3743ff95dc7a953ecec5115f60602050d0f6d3845b9b40039a8d41b54cc01a095544c23ee09bf2e787893b3f22faeb60c0c8e SHA512 623561482c28ef5a528d43582c0d785f728126787515a12241cdc463d291a07ae8049a240c460c8fb5c2a6081815ae66573d8570eddf8eac635207e66efc8cb1
+EBUILD assimp-5.4.3.ebuild 4130 BLAKE2B 158e109eb1f955258b23de1dc276fad0730e9fa5dac2b0fb394fa974532ee5ce2128ecc713251342616983426511dd376b51fb431bf7de09d4c87f12d03194d6 SHA512 7a460cdd89c4f9121180364eb63ed403fc9aac6344c3c2f45d056d3f04be754fa12007a37778700897bf2cb874e0d6940fea250247df00e8a9751b1ad86751e5
 MISC metadata.xml 718 BLAKE2B 8f29648faf86ab8d49a42c9aa01b7e164e599ab0815bb57ac4941b1df0dea31f753adb206d3137e7283443111f2c550cb8409b4fa5783340c261fc5fc84489c2 SHA512 ef8e22391931d5cab643ea2d9e83cebedcb21ca4ffb231b394205a9421895df0f2929b4c3a73863eda75a47d22e45751c538b74dbd39565bc1857ec65b4fe34b
diff --git a/media-libs/assimp/assimp-5.4.3.ebuild b/media-libs/assimp/assimp-5.4.3.ebuild
index e9818e399e12..147f25fbc2d9 100644
--- a/media-libs/assimp/assimp-5.4.3.ebuild
+++ b/media-libs/assimp/assimp-5.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~arm64 ~loong ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 IUSE="collada doc samples test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-libs/glycin-loaders/Manifest b/media-libs/glycin-loaders/Manifest
index f86e037ba24b..3e5fb9326d86 100644
--- a/media-libs/glycin-loaders/Manifest
+++ b/media-libs/glycin-loaders/Manifest
@@ -1,5 +1,5 @@
 DIST glycin-1.1.0.tar.xz 28570152 BLAKE2B 762c8208c5cc8bf6be93a8daa70cd22b1cbd93c60075ccf38225a10c303b2c503bdc1ec2e6efeb85f36f3787b45a6061926e314f44841a583e0e3cb3debc3d48 SHA512 6e4b84dceb8957f0ab6e840dbc60f6c9bb8179fde841075c614a9742282ea578a51a966eb8e7a2482daf631932e8ce5af2f1f41523f376f4d1a0a2069af94631
 DIST glycin-1.1.1.tar.xz 28914480 BLAKE2B ef39c3b15e9addd36c6bc7010bbdaf1d5efe7aeaf1a5562217c87310b16efae75b568ae0291f91815238bd4b01747cbc5d3eef26f945f0a21f008904cc382392 SHA512 ce3961b4cbe71739cdf24b985b5a609284e2cdb3869671606cbd0f31c5c99f80da7608f2e29df5a0cc7d7ef0f7bd5926eb3fff993e80cbd8ec03bf321b92b0f0
-EBUILD glycin-loaders-1.1.0.ebuild 1785 BLAKE2B ac9579cfa8d2241ad9a2c1b083877ef492a6fcfca67dc8c6250648758591a93363645c0943f0bd93bc2a3b3d6b11b85be985cbf092e35b53eca07b9f4aedf5da SHA512 eeed10c6a22241eb7779ebbe806bd33a8caaded237b60d8a6410e7fd92853c713013db8f7bad94398465f52762def1af22d62beac0b559ddffa48b3f9111b7cc
-EBUILD glycin-loaders-1.1.1.ebuild 1785 BLAKE2B ac9579cfa8d2241ad9a2c1b083877ef492a6fcfca67dc8c6250648758591a93363645c0943f0bd93bc2a3b3d6b11b85be985cbf092e35b53eca07b9f4aedf5da SHA512 eeed10c6a22241eb7779ebbe806bd33a8caaded237b60d8a6410e7fd92853c713013db8f7bad94398465f52762def1af22d62beac0b559ddffa48b3f9111b7cc
+EBUILD glycin-loaders-1.1.0-r1.ebuild 1785 BLAKE2B ac9579cfa8d2241ad9a2c1b083877ef492a6fcfca67dc8c6250648758591a93363645c0943f0bd93bc2a3b3d6b11b85be985cbf092e35b53eca07b9f4aedf5da SHA512 eeed10c6a22241eb7779ebbe806bd33a8caaded237b60d8a6410e7fd92853c713013db8f7bad94398465f52762def1af22d62beac0b559ddffa48b3f9111b7cc
+EBUILD glycin-loaders-1.1.1-r1.ebuild 1785 BLAKE2B ac9579cfa8d2241ad9a2c1b083877ef492a6fcfca67dc8c6250648758591a93363645c0943f0bd93bc2a3b3d6b11b85be985cbf092e35b53eca07b9f4aedf5da SHA512 eeed10c6a22241eb7779ebbe806bd33a8caaded237b60d8a6410e7fd92853c713013db8f7bad94398465f52762def1af22d62beac0b559ddffa48b3f9111b7cc
 MISC metadata.xml 334 BLAKE2B 40a37360358b501628e64a2278652edb17a57432f8dc36dd6c585761f59cbdaaa284760e27d9a33b8e7aa27e916df3112601b0b6141940a6b4aae4138af64883 SHA512 06b70f17068f327d4412a798b938e65ced583ab6e63e2dfc66135d8fa7f7e32316f53c1c2dc65a9482222a64fe8398929705bb16579cfd3ee5b2aa677db7dc1a
diff --git a/media-libs/glycin-loaders/glycin-loaders-1.1.0.ebuild b/media-libs/glycin-loaders/glycin-loaders-1.1.0-r1.ebuild
index 0775282f7108..0775282f7108 100644
--- a/media-libs/glycin-loaders/glycin-loaders-1.1.0.ebuild
+++ b/media-libs/glycin-loaders/glycin-loaders-1.1.0-r1.ebuild
diff --git a/media-libs/glycin-loaders/glycin-loaders-1.1.1.ebuild b/media-libs/glycin-loaders/glycin-loaders-1.1.1-r1.ebuild
index 0775282f7108..0775282f7108 100644
--- a/media-libs/glycin-loaders/glycin-loaders-1.1.1.ebuild
+++ b/media-libs/glycin-loaders/glycin-loaders-1.1.1-r1.ebuild
diff --git a/media-libs/ksanecore/Manifest b/media-libs/ksanecore/Manifest
index 904782d623a0..2522b5a6db85 100644
--- a/media-libs/ksanecore/Manifest
+++ b/media-libs/ksanecore/Manifest
@@ -1,7 +1,5 @@
-DIST ksanecore-23.08.5.tar.xz 50052 BLAKE2B 500c574d40a8c927cd8568d3d0094789731b58cbe64de8ff04ee993adb8503cbb4d999d14c3222d142bb2485f1131dfe45c0a6a305347180e1021d1aa661d020 SHA512 93bbb6160c063e54be4cb115cf164354fb545ff458aa2066d98a38e81d48dfed4260a4b2afcb252ba43cf25ed102345018e0ad99b7ca66b9cb0b2fb64235b440
 DIST ksanecore-24.08.1.tar.xz 51164 BLAKE2B b4d9ecc8886b963efbbd5ed8dcca84cb7e0805726306ad942fbae9a73f1402e25851142893943b63c90e60c7d3b00542e0174fe9e07379146667d1383080cc8b SHA512 ebfccc54704438a9ec0fab2f8029c95745921438b63a8928a048f6f2cfcfea4c1f871fe7872331d8e9e7ac24a0a5e0df654b388430102f73027ee0afcf8ee002
 DIST ksanecore-24.08.3.tar.xz 51184 BLAKE2B 285285ece94d8c55a81be2cb932c1e34b2154d04101a4501fb2cc69c310656529eee7e3d612ff12a240009a86d22d5738352dbad408d8a7871fc66c378083077 SHA512 808c220cf01ec9de1fc5e6cf55f873fe6f70f8ab231e59b7c048db5a5b7ecde542e3291798118d0e65b99c4b627e34beceef38948ba208e9dfb2c992e65a06f8
-EBUILD ksanecore-23.08.5-r2.ebuild 639 BLAKE2B 29131577438d281cd2cb4832e9793d0589ede29e4457ebf2dea7c35cf39d95d925b693fa98fa5e38120765638fdf8f4511e557da986b8a70c1a8c8f0701f9d6f SHA512 94afb3aac2dd4282a78ab910dc21fa4aaf122e80ea87a7bf305a2d6a468087ebaa21d8a83371d27dc9983bda3b07bb02a283395f4bff27f136457059314386f8
 EBUILD ksanecore-24.08.1.ebuild 642 BLAKE2B b861222212cf1e437541bd3558de13f8aa57017721207d010f687f02864716a75b60834ab2d37e57c2ddbced478ffbd4450bd28d2ee5d8e507aee1ea3f9ffd7e SHA512 f298920b638e72fa325f4b636661c2510778153a0413483df7568cb4a221323aa7aa4773bef87516416e4c92a0ee47ead55b8503bdab2a89fc4391dc2a93b24b
 EBUILD ksanecore-24.08.3.ebuild 644 BLAKE2B 7983b4d938bf81160ca83fe41a07190b94d37de9cbeb455f96abfd07c0b9d5c8cff58b9bcdd2873ebc70f6c75c6a429a47a3164ec84d10dbc8b6588b46e5205f SHA512 c71602af4192e509a0c6267d4d7084915cabfafe198ff7b7d7d727486f3d60518257087b614f2e0df772750a49b3b3b5974b3dd1d84521f197d86b6238928aa8
 MISC metadata.xml 338 BLAKE2B a2597ee8510ec4e47f014dcf1d255490b5dae78003e5526665945d4092116cc4e3f2bf3d76e03b5fdcb8a70f872b35c70ca1d89f6c8b4f2d67f2d7bad6a502d5 SHA512 34040d0fa7bdbb70bce78cd8d543e69db0e835deb85c33055769277df44a5ed1b8efcb7ba5aeaeb1b389704b42b941279b9faabc8f476b87beb06bbb266217f8
diff --git a/media-libs/ksanecore/ksanecore-23.08.5-r2.ebuild b/media-libs/ksanecore/ksanecore-23.08.5-r2.ebuild
deleted file mode 100644
index 43036a353e7e..000000000000
--- a/media-libs/ksanecore/ksanecore-23.08.5-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm gear.kde.org
-
-DESCRIPTION="Qt-based interface for SANE library to control scanner hardware"
-HOMEPAGE="https://invent.kde.org/libraries/ksanecore
-https://api.kde.org/ksanecore/html/index.html"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	media-gfx/sane-backends
-"
-RDEPEND="${DEPEND}
-	${CATEGORY}/${PN}-common
-"
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_po_install
-}
diff --git a/media-libs/lib3ds/Manifest b/media-libs/lib3ds/Manifest
index afe1dd58e721..c4d72c471ac0 100644
--- a/media-libs/lib3ds/Manifest
+++ b/media-libs/lib3ds/Manifest
@@ -3,5 +3,5 @@ AUX lib3ds-1.3.0-pkgconfig.patch 2345 BLAKE2B 9d1fddb8a14ccaf5d2747c39113e809ca6
 DIST lib3ds-1.3.0.zip 443675 BLAKE2B 7e9aa3b7d0c74013264430be24b1f8417f5ff7754bd77508fb85fee227c8675c023b6b805b3cda57a1ea3c1bbc7b0fbd37df8ed1c4d00ac295a39ffb0e3c1219 SHA512 7c866ea9721a7a124c25b4962e933a7066ec2e3c7998e5ae2ba93727f19b91bdb103699bada6d1e04b67e0a54b9f58d09382093569114a1846d86bb03821b8ac
 DIST lib3ds-20080909.zip 427233 BLAKE2B 862a4606206c59e357b0b8805998a497de140b5e80aa3f6f7dd41288ebb1ffc12475b41d5327ee3c619a22c549897b28b444bac5df58192979af5c236859d86f SHA512 ba7166dbd9fb97edc0f5cf0df56747b7e3c5aa1e62334ca995020a6ccd77284abc58e3fba80ec96ecf3765f5ce3121612c9f8c7dfedb2322f1cd2af85d567f87
 EBUILD lib3ds-1.3.0-r2.ebuild 750 BLAKE2B 80525700489d42266f54a88bc5d0d488d0a86b9fcb2889d1afbbc03db58357e690049c573fe857caf8121f03ce42ec5abd8b1854553bb58423f051eaa708d08a SHA512 9e2faad79da1d9ac56a3b3f581adef3ab35e31c1de0ca3956348a2bd380fd27a7af0836772be180551d90fe10719ff3d37087aa18b9780a798b53c241c021b29
-EBUILD lib3ds-2.0.0_rc1-r1.ebuild 747 BLAKE2B ed6105f62519bea5c9bdbd71db6b2af5c13047eb32d6e6f2aae50f4c1d85543cee559023c422b98b5b9d9bfe610a650310b2a449f06bcb134190ac2f0472dc36 SHA512 72be544f25339a50792aa737db4862b1e6925d00e33519d3c516bde70c51666bc2b753d9d4d8de66c603862f12ca334dbddad1c56386b3f953ac64732e609225
+EBUILD lib3ds-2.0.0_rc1-r1.ebuild 746 BLAKE2B fd7b1990bf699bb5d399f49c06e8713b67659c6a5b5eef390813661c2fc9c358bf6b6424e8d48a2e13b4145bab5824c5ad1db2ae3ea77e046d403e246d872add SHA512 30c1cd4a1a76a3abc0e938015dfb5d0b8160379e43784547b9d4005b5c58ab692fb23b8bb2900e7257a1d22f6eea2a6b332b07940ad361ba6fb2a84e73ad2259
 MISC metadata.xml 597 BLAKE2B f36443b4e7047530b32949750b0b0c3e3b7163243c93e38390379bda9e5d08dd5c9da9f7a6df8c51c2c08b6206ffd15f31f63590f4a2e2b901ccad2268892298 SHA512 c91019a51555c0f26cacca2bf6f68e3d47d2d94b243127703f042219f71c60df91676f8c8a826797a003ed1d1435d64706ef19b8eb8c307102014c95f7e28dc3
diff --git a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
index e61cba3cbdec..c9fba63c91b6 100644
--- a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
+++ b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://lib3ds.googlecode.com/files/${MY_P}.zip"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="static-libs"
 
 BDEPEND="app-arch/unzip"
diff --git a/media-libs/libdovi/Manifest b/media-libs/libdovi/Manifest
index 616ad6adf5af..bb10e1db51a9 100644
--- a/media-libs/libdovi/Manifest
+++ b/media-libs/libdovi/Manifest
@@ -83,5 +83,5 @@ DIST windows_x86_64_gnu-0.52.6.crate 836363 BLAKE2B e2335829155cdbd4a55cc9f9babc
 DIST windows_x86_64_gnullvm-0.52.6.crate 435707 BLAKE2B ab77dccd06328cdb00175f41cdbc120594050a9678b7f9820444391fb50aada3911a91ea00f3a6db2b4fa1820fd23bc9a007dfbe65ad41417c26ee1137ef9b96 SHA512 67681f5859e249c56b0183181811f6212cc7008d6471dad78aecc7ebe3d027686b19210b8aa9014c554410f69f913d21ce2aca928eea905eab779bea26464cbd
 DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cacd575474e7a8a3d883c67b02132af5d3fc99d03cd5f7a4dd666a3947451d11218e6acc6eb5e2526f012481106cc13453839719 SHA512 21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7
 DIST wyz-0.5.1.crate 18790 BLAKE2B 07ac1435a812d2f50309348ef8378ea4955c001f01edaf2ffab108f7d524ee731f06b22fd42c043349a4a2271ec47ea203e89562076e8c7c1719112b0214c89a SHA512 15d86c167145c90e3fbabcefd11754fb1cb835896e32d1bb7f4b027e5b2092f5fdbdca4062c129bc38e655cb87c6a3f4e181747ee25d89db5e01fb1fcac18fe9
-EBUILD libdovi-3.3.1.ebuild 2852 BLAKE2B 46d07bf408d7ec505fef70e097ea5d05dc4929c31ce6047cd285c3ade6390413eaf80024d48a18602b5393a5486e8b5a3f2b4ba83bbcc0ca90bb8b6f086b94e2 SHA512 5c335be563f70bf8f65a015ee6525d8adc5321f59daedcb81cea2f0e9f0e2c04440ea2556fefe8115d8af4b739bce81f8e33d02e9eb8211bf74cde50badd9d45
+EBUILD libdovi-3.3.1-r1.ebuild 3114 BLAKE2B 949b037b6718abd145eafeb7d5590f9acb2b02518ee1148bc6ab75405c60a323a3920ad7e224b0c89822db0dcbb5e2abf13bb52ba747f27adc197269f6451dba SHA512 b0dd154179e1c436dc7f20e8f5884c8f6400247fb85ad6c4fe826cbd022969105801dd6ff2a1b0bcf7aeb60981251e44a023de814639d74830f5b7e4c643e851
 MISC metadata.xml 330 BLAKE2B 58eecc5643c7be5713145bff679903a5d34827b4cf976255bf573cfa488a2277ce773538297e3fb728ef8b90eb266a68a8329d80295240ccc2fbe4647c0ff566 SHA512 f083788feca4bafdd0376759f15ba6ff48121abd6ad98fb235142e415a089238efb570c564d0425d0099f3dcf9131cff56eed1e6d605716608cf3ea881ba4487
diff --git a/media-libs/libdovi/libdovi-3.3.1.ebuild b/media-libs/libdovi/libdovi-3.3.1-r1.ebuild
index c8d73ea5f7ba..6a4caf5acf88 100644
--- a/media-libs/libdovi/libdovi-3.3.1.ebuild
+++ b/media-libs/libdovi/libdovi-3.3.1-r1.ebuild
@@ -89,7 +89,8 @@ CRATES="
 	windows_x86_64_msvc@0.52.6
 	wyz@0.5.1
 "
-inherit cargo edo multilib-minimal rust-toolchain
+RUST_USEDEP='${MULTILIB_USEDEP}'
+inherit multilib-minimal cargo edo rust-toolchain
 
 DESCRIPTION="Dolby Vision metadata parsing and writing"
 HOMEPAGE="https://github.com/quietvoid/dovi_tool/"
@@ -116,28 +117,42 @@ src_prepare() {
 	multilib_copy_sources
 }
 
-multilib_src_configure() {
-	local -n cargoargs=${PN}_CARGOARGS_${ABI}
-
-	cargoargs=(
-		--prefix="${EPREFIX}/usr"
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		--library-type=cdylib
-		--target="$(rust_abi)"
-		# cargo cbuild --help claims dev is default but (currently) this seems
-		# to always use release unless --profile=dev is explicitly passed?
-		$(usex debug --profile=dev --release)
-	)
+src_configure() {
+	multilib_src_configure() {
+		local -n cargoargs=${PN}_CARGOARGS_${ABI}
+
+		cargoargs=(
+			--prefix="${EPREFIX}/usr"
+			--libdir="${EPREFIX}/usr/$(get_libdir)"
+			--library-type=cdylib
+			--target="$(rust_abi)"
+			# cargo cbuild --help claims dev is default but (currently) seems
+			# to always use release unless --profile=dev is explicitly passed?
+			$(usex debug --profile=dev --release)
+		)
+	}
+
+	multilib-minimal_src_configure
 }
 
-multilib_src_compile() {
-	local -n cargoargs=${PN}_CARGOARGS_${ABI}
+src_compile() {
+	multilib_src_compile() {
+		local -n cargoargs=${PN}_CARGOARGS_${ABI}
+
+		edo cargo cbuild "${cargoargs[@]}"
+	}
 
-	edo cargo cbuild "${cargoargs[@]}"
+	multilib-minimal_src_compile
 }
 
-multilib_src_install() {
-	local -n cargoargs=${PN}_CARGOARGS_${ABI}
+src_test() { :; } # no tests, and must not run cargo_src_test
+
+src_install() {
+	multilib_src_install() {
+		local -n cargoargs=${PN}_CARGOARGS_${ABI}
+
+		edo cargo cinstall --destdir="${D}" "${cargoargs[@]}"
+	}
 
-	edo cargo cinstall --destdir="${D}" "${cargoargs[@]}"
+	multilib-minimal_src_install
 }
diff --git a/media-libs/libopenraw/Manifest b/media-libs/libopenraw/Manifest
index 7f856fcbcf79..1cc2a9b37d18 100644
--- a/media-libs/libopenraw/Manifest
+++ b/media-libs/libopenraw/Manifest
@@ -1,4 +1,4 @@
 AUX libopenraw-0.3.7-slibtool.patch 605 BLAKE2B 0369ca04439c0b69548079dc6ce69fd562bb3bcdb15ec2f76eafb76260846af16bbd33c60aed89967b1bd29b4cccd6ec7985b101b7af43c8dc0160569404c385 SHA512 7ee3505a2690777218b558b1016d19e00d63153cfa4a2fdb125327fb0a1f59224703b0af16329936e08e7fca65e615a840cd61e4d24f246dc89d329e1b0c5593
 DIST libopenraw-0.3.7.tar.xz 2536380 BLAKE2B 22aacfb085c59fa4b763abc3454839812327d1b6506b2e531783b0529ca3a5e24605a010e6c510d942741d4f0afc208ca626bdef1a93ad42fbf0f5c1e347f5cb SHA512 0781e9377100e954f8a7f020da537ec2af033b23341a7944fc346a973fecb463ed29b375275ae8b4bd6f40721ee4f12480729df80337d57cac30627e084594d1
-EBUILD libopenraw-0.3.7.ebuild 1294 BLAKE2B 2475135c9c6f47dd0901546acccc9290541ab25bf83c5dac29163e47e3216904e5849feb16a40ec7b6310e3f3bf3a1822a857b209e0afabd1c290e4d585d3b2d SHA512 92c7b1c4dffefca22431cf92a0abb9c81f8c976fb475f394b1cb3b61aeb361f6e64a0a217a7b7d71fdce438458e67656fe0bf6e4c545a13bb30fdd6e6a770972
+EBUILD libopenraw-0.3.7-r1.ebuild 1329 BLAKE2B 0cfd6b81db164137cbbe5ecc645bd51c12b2150b8b545538b33b37507d1fa0f7a56196c2799f9c8edf07c402250f1e58a9d4abe2fb34a6125727b09e382c1354 SHA512 57f830dcaee0dc8a11287b4742cd3d156f35ae95bde833d191cbe3cb60303b63bcfa886299d7008ff72bcd1f25c9c34205d75fc4fbd9287b11b19354eae2add6
 MISC metadata.xml 327 BLAKE2B 535d53760f8b1440558a02aecb8ab27244d3583ded3843a38a8d418ae8a8a55859c08901a6fae91f8d63e7848a173e3e40b7ff168a0f86c710e53bcbe87f4161 SHA512 26f6a6a430380b878feabd5a692aed4cf6994701e935fda0f986b0b071702846389f8ada8f0c666f35a5107484879d7dce9f81b866081b0b06a1df1d02125cdb
diff --git a/media-libs/libopenraw/libopenraw-0.3.7.ebuild b/media-libs/libopenraw/libopenraw-0.3.7-r1.ebuild
index cbe9f9abf592..4825810f5604 100644
--- a/media-libs/libopenraw/libopenraw-0.3.7.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.3.7-r1.ebuild
@@ -4,6 +4,9 @@
 EAPI=8
 
 CRATES=" "
+# for stdsimd
+RUST_MAX_VER=1.77.1
+
 inherit autotools cargo gnome2-utils
 
 DESCRIPTION="RAW image formats decoding library"
diff --git a/media-libs/libsidplayfp/Manifest b/media-libs/libsidplayfp/Manifest
index dbecd089d079..d4f2e21b824a 100644
--- a/media-libs/libsidplayfp/Manifest
+++ b/media-libs/libsidplayfp/Manifest
@@ -2,7 +2,7 @@ DIST libsidplayfp-2.10.0.tar.gz 811416 BLAKE2B 5d81c1c74eccb5b4e176a82e1232eed7a
 DIST libsidplayfp-2.10.1.tar.gz 812511 BLAKE2B 7c4a8c276a0adf75f96cebaf7931f314bdc097df8e682d2894b9903b574e2a6dd5d9b6619243aceb3458e70d29041c4549aaefe45fb37bb9312333d5d03322f8 SHA512 b8a15b34b0c834b037fc35ae9c968505322f9fb4971313ca59a0a8d22e31580354e18fda530246c0086079a9f9ff40e9c54f93279831817dc377fa9c9894bb20
 DIST libsidplayfp-2.11.0.tar.gz 813488 BLAKE2B 6bb8f37e5272c166ba5fe804395c676becb366fbf2adff0831236eaa46f889811f9173f99a7b0e67f986dfbc8e58b4957b27a39c7b7da2571a7014776bc92c1b SHA512 5f8c32d6964cdd651db0718b8f02d7fcbf829c58ed15bc8fa07f5cc0a452954ec93b041f54641744b597a8e67b6c723df6031b00685231e931f6388c294ea172
 DIST libsidplayfp-2.9.0.tar.gz 807772 BLAKE2B 9ec5066a69f912c4183e98c4883875b646c9f6150ab4bd3c8d9a7110a9c75529cdb6f8aeac8d379ecacf2c0ec6181a8ee13ff93bcc53f296b8900b0e6c8d5281 SHA512 3d6b0b6ab5155da3ae4cface17a2fe85deb1dd8ab8076dba60f04e5df78b10dc9b756b408734a1012e254d3d24d8cfcf15b562fdb1f28edd756a5d63719595b0
-EBUILD libsidplayfp-2.10.0.ebuild 686 BLAKE2B e6c4af395d77de009ea3b72eb327f060b4e56a32bd4f69a3129e03b585531ca7e44fe67824ab1db1acf10758e5a79c64d382bc20837890865c820dd3efc04e2e SHA512 56cdbb7859d095a63d1881de04bf07a91166652f39e0a720e5862a1832ade762236d13404f585cd8e98bd6088c4d1a0624b1db9cd41251b456d9b8dc3021668e
+EBUILD libsidplayfp-2.10.0.ebuild 685 BLAKE2B dae51274f54b5fd7a13c1ae93a7421f1c19e00c65f06e91df328db88ab33d39dc13d2eb9926e6c422827054d62db69f6be80d75e0c311f5b56ac6ece4d90f6ff SHA512 b993aa6da66d5f33c3bec51b6b1e5565bcea2b862e61cdb8021f6a1dce403fed5ae28945d260efdcbb86a81c4a84b58f3ef3b3f6601d43032241cae59a652794
 EBUILD libsidplayfp-2.10.1.ebuild 687 BLAKE2B 89257d5934cd9327850f3719e4fa316f15b3d124c722a7b026689e099a12faa3eca8ecbd8bba245043ea15603ea223aea103986df2fa495982e09a11347c23bc SHA512 faa54ae1b2098e9f988edda7fa3dcaebfe9dd1af6d44e26dbcccf228e06bc980d14a387f4c1d361c6dea462c921f789fc214a9c86f00650c747f1f382d4b7538
 EBUILD libsidplayfp-2.11.0.ebuild 687 BLAKE2B 89257d5934cd9327850f3719e4fa316f15b3d124c722a7b026689e099a12faa3eca8ecbd8bba245043ea15603ea223aea103986df2fa495982e09a11347c23bc SHA512 faa54ae1b2098e9f988edda7fa3dcaebfe9dd1af6d44e26dbcccf228e06bc980d14a387f4c1d361c6dea462c921f789fc214a9c86f00650c747f1f382d4b7538
 EBUILD libsidplayfp-2.9.0.ebuild 685 BLAKE2B dae51274f54b5fd7a13c1ae93a7421f1c19e00c65f06e91df328db88ab33d39dc13d2eb9926e6c422827054d62db69f6be80d75e0c311f5b56ac6ece4d90f6ff SHA512 b993aa6da66d5f33c3bec51b6b1e5565bcea2b862e61cdb8021f6a1dce403fed5ae28945d260efdcbb86a81c4a84b58f3ef3b3f6601d43032241cae59a652794
diff --git a/media-libs/libsidplayfp/libsidplayfp-2.10.0.ebuild b/media-libs/libsidplayfp/libsidplayfp-2.10.0.ebuild
index 309628b09148..4eefc5282af5 100644
--- a/media-libs/libsidplayfp/libsidplayfp-2.10.0.ebuild
+++ b/media-libs/libsidplayfp/libsidplayfp-2.10.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/sidplay-residfp/${PN}/$(ver_cut 1-2)/
 
 LICENSE="GPL-2"
 SLOT="0/6"
-KEYWORDS="~amd64 ~hppa ~riscv x86"
+KEYWORDS="amd64 ~hppa ~riscv x86"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 3ffd2fe4fe7f..9d41d2c30122 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,3 +1,4 @@
+AUX 24.2.6-dril-Fixup-order-of-pixel-formats-in-drilConfigs.patch 3329 BLAKE2B e388372041292e744971d1af24a54a900a6050c71d2cd330bd041be838eec4e4afa3abbee33fc1108a8e54159b5c5865f454bf4ed0830563a8cc2c5b81b74ab6 SHA512 3ceb474d6750ace4c93db12d3f33d83fae541a2508cf5eb8a38f486d954f4c279181848a9981cb49a9e73bafb521b58be8ca72a4443cf8802c970adc02a479d0
 DIST mesa-24.1.7.tar.xz 29206724 BLAKE2B b3102fcf96c032d07826186c2d60dc93e5c17b26f725c20cf1e402d1cfbaaba9809bff7a04d3df0179d2ec8606bc9fb391761d17a148671b9270cf2aaca0324d SHA512 890f6387963bbb86a85305ea963cca326a3b3f8f8758ae2082fd62c52df77c2883a359341e91f36614fea59219394ef78f799a334080699a0bb71d984a68cb01
 DIST mesa-24.2.3.tar.xz 29465732 BLAKE2B 3c480bd9f5948ae4d66a833cfc059b1b872fca989296a070deaa46aeb72298eaca6a3fa9d13574859623cec4a6af978f44d2c9562b9757be2257364c27600be6 SHA512 7a1ace23568d1907b778a2859f97c8988a414ba74e02e1fb5af6f95f768e1b1a2dfdaf412b0d655678ed915d28273953fd1236ebcd87553a1880f1a7f3ea4d44
 DIST mesa-24.2.4.tar.xz 29510040 BLAKE2B a0a977e5032e1c9a5b59dc9212d50b6f023fb9d42d325e692a3c680e77a06e2ccd66843b9eaeeadbf3614b65798c5c4649fb0bb74f134334e662ee9dd47ac21f SHA512 f0f1c23591cce85966efaf3988afdb14b64ceb7216b3994e8fc50e8ddc62c35a84b2013285c84080d963aec2afb94dac345f5f00e7ccf9ae7e9ab3f5b9ba0bcb
@@ -10,10 +11,10 @@ DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d7
 DIST syn-2.0.39.crate 244129 BLAKE2B 2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01 SHA512 96cc347cfdb0f9ca0b6c7289279a1cad8fc401625783742292564f7ceca8237ced8d9a3f62069696f6132ed06092dff2baaf4be09ef53b21260d93785b0e27c3
 DIST syn-2.0.68.crate 265035 BLAKE2B 8bc6f68ed286bea617a2cfaf3949bb699d3a0466faeca735314a51596ce950e4ee57eda88154bd562c1728cfaff4cdb5bc1ba701b9d47a9c50d4c4f011bee975 SHA512 7b781f8ea2b0d01c06f47d165da99cd96e3b44a33de1d77c78a2cb37ebe3f8304f426ba3d0d1cf766241dcc0537908774504df7d455d63bf89ec22ac0499d372
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
-EBUILD mesa-24.1.7.ebuild 13660 BLAKE2B e94987284b4be2c8030f619a527d3b71f619db647ecacdf3316f7b0892f42faf5790fe491051c3b56c53fe494748244b7d6e1ae9732b4642759045370bec2ec3 SHA512 1955c9012fbb3b193ac0308a3a96510378ee122a309f43d5cd41a5fa167068a533ad05664a38fd362c414f8679b78c86c95e06519166e98fd9ffe9193c65be93
-EBUILD mesa-24.2.3.ebuild 13593 BLAKE2B d5bf49de60cc31698f6f80726f29248ed0be82586a6a99d90de07888a65f2864a34a29214f8b085f906ca3d10f0b710b1b01c1e828e5c16e1753fc43bc101380 SHA512 400a78f879b0ed486ae9e784ed7c54dceb508d61e6059b30131481eafa72f7491f7203236fdb559e41f2f17620f20569003ec88c5758fea4a2993d45c0feffaf
-EBUILD mesa-24.2.4.ebuild 13593 BLAKE2B d5bf49de60cc31698f6f80726f29248ed0be82586a6a99d90de07888a65f2864a34a29214f8b085f906ca3d10f0b710b1b01c1e828e5c16e1753fc43bc101380 SHA512 400a78f879b0ed486ae9e784ed7c54dceb508d61e6059b30131481eafa72f7491f7203236fdb559e41f2f17620f20569003ec88c5758fea4a2993d45c0feffaf
-EBUILD mesa-24.2.5.ebuild 13593 BLAKE2B d5bf49de60cc31698f6f80726f29248ed0be82586a6a99d90de07888a65f2864a34a29214f8b085f906ca3d10f0b710b1b01c1e828e5c16e1753fc43bc101380 SHA512 400a78f879b0ed486ae9e784ed7c54dceb508d61e6059b30131481eafa72f7491f7203236fdb559e41f2f17620f20569003ec88c5758fea4a2993d45c0feffaf
-EBUILD mesa-24.2.6.ebuild 13593 BLAKE2B d5bf49de60cc31698f6f80726f29248ed0be82586a6a99d90de07888a65f2864a34a29214f8b085f906ca3d10f0b710b1b01c1e828e5c16e1753fc43bc101380 SHA512 400a78f879b0ed486ae9e784ed7c54dceb508d61e6059b30131481eafa72f7491f7203236fdb559e41f2f17620f20569003ec88c5758fea4a2993d45c0feffaf
-EBUILD mesa-9999.ebuild 13421 BLAKE2B 141a670665141bfe0cdd11b88d991999092de8e391b4f18cf1a214adb5fcc68335b0443b05e67a8e9843579a9ae048824baa706049667391d837590580de1a29 SHA512 e8b1da20412c87131fc58abaa05b2e01e24e199ca2ffb7cfb627f15a48c97cc9ce2dffd181d98bb65476338d8b2ed350bb069c134acd156d9df197c0f4d15427
+EBUILD mesa-24.1.7-r1.ebuild 13767 BLAKE2B f76b17d363c4844428b0f71f0c1e23119d2dee61782c5f4887e0670dfdb8937806e5e6396a56c575ad2a5274f0fc2a89ca18e8000dff7743372b8eda44760867 SHA512 ec6e2b506ee8b39b31720f097a589cc9c66509e5e812228490e5528d5372c3c4cd9db8638098e75db0d631c960ed74e54d2bc1c1fc1fbb467b81fe3f03d81f29
+EBUILD mesa-24.2.3-r1.ebuild 13700 BLAKE2B e6a3a22762ac8951b9ef1ea3f4eeba42aec616e5f0c26ea0f527ded7d925071f255486e372a5a4c685a4c2090a8e574683fd9fefaec927453735e7548a9430d0 SHA512 5b81996aaa5cc12b6926fc5a2cf90d21d7d8fc8715e0fa54b86d752e3322965c591fc254167a65d865ed203b35078475564af69f5369c42418b5067538a5c543
+EBUILD mesa-24.2.4-r1.ebuild 13700 BLAKE2B e6a3a22762ac8951b9ef1ea3f4eeba42aec616e5f0c26ea0f527ded7d925071f255486e372a5a4c685a4c2090a8e574683fd9fefaec927453735e7548a9430d0 SHA512 5b81996aaa5cc12b6926fc5a2cf90d21d7d8fc8715e0fa54b86d752e3322965c591fc254167a65d865ed203b35078475564af69f5369c42418b5067538a5c543
+EBUILD mesa-24.2.5-r1.ebuild 13700 BLAKE2B e6a3a22762ac8951b9ef1ea3f4eeba42aec616e5f0c26ea0f527ded7d925071f255486e372a5a4c685a4c2090a8e574683fd9fefaec927453735e7548a9430d0 SHA512 5b81996aaa5cc12b6926fc5a2cf90d21d7d8fc8715e0fa54b86d752e3322965c591fc254167a65d865ed203b35078475564af69f5369c42418b5067538a5c543
+EBUILD mesa-24.2.6-r2.ebuild 13788 BLAKE2B ce28dfef9ba39e16239736543ea23033aa838508e8388a3dbac584840dd6a0f467aa06da378de06e9c1db78bb86b6807bcf11d39a96234646dfd07399b48c2e5 SHA512 fb8245c9e60822fd3fd1587764dcb9bed1385291832cf7a8152db95f2003968d062dd118f63eb1fe01d09f3d5fb4e9af49767305b606070e1fb41237e18b1d79
+EBUILD mesa-9999.ebuild 13528 BLAKE2B 321db8f541b45e4ffa9d54f6e4338d52aa7b8173964b4669e35ea290a45baf9f7e609e068a9fb79237761d45e96f2996a0b0b62bb1bc3031061131fdec5d36ce SHA512 a54a3acdb1f9a8c9043ea6cec25e40c7a35998070ab99d0da32afe0793f6646b9a8a18b0f5b299c0f67ea3c92a91d7f124d55eb5481501797d4776a9ac7f3b65
 MISC metadata.xml 1303 BLAKE2B 348e84a15156bd8ae4634c1866f83f1b283b77f8478e66e57dd3f047a6346d1cc67a7c808ce159b82d292dfab62e8b6c4d17cefcae7aea6fa38739667947258b SHA512 448c3d73ded90117f38cec7c80eead4bdac1599c563798c91c96bca8543b9db2e5c2a06f26f9b7496af085a964aff51ed8b0882aa88f18404b64447de2f65598
diff --git a/media-libs/mesa/files/24.2.6-dril-Fixup-order-of-pixel-formats-in-drilConfigs.patch b/media-libs/mesa/files/24.2.6-dril-Fixup-order-of-pixel-formats-in-drilConfigs.patch
new file mode 100644
index 000000000000..a0d3ef1af912
--- /dev/null
+++ b/media-libs/mesa/files/24.2.6-dril-Fixup-order-of-pixel-formats-in-drilConfigs.patch
@@ -0,0 +1,85 @@
+https://bugs.gentoo.org/939429
+
+From e1098310da6b9fa7e66dc3fe382ae08d88fd1352 Mon Sep 17 00:00:00 2001
+From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Date: Mon, 4 Nov 2024 17:45:45 +1100
+Subject: [PATCH] dril: Fixup order of pixel formats in drilConfigs
+
+Having the RGB* formats before the BGR* formats in the table causes
+problems where under some circumstances, some applications end up
+with the wrong colors.
+
+The repro case for me is: Xvnc + mutter + chromium
+
+There was an existing comment in dri_fill_in_modes() which explained
+the problem. This was lost when dril_target.c was created.
+
+Fixes: ec7afd2c24c ("dril: rework config creation")
+Fixes: 3de62b2f9a6 ("gallium/dril: Compatibility stub for the legacy DRI loader interface")
+
+Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31950>
+---
+ src/gallium/targets/dril/dril_target.c | 36 +++++++++++++++++++-------
+ 1 file changed, 27 insertions(+), 9 deletions(-)
+
+diff --git ./src/gallium/targets/dril/dril_target.c ./src/gallium/targets/dril/dril_target.c
+index 672d50a4182..583728e4093 100644
+--- ./src/gallium/targets/dril/dril_target.c
++++ ./src/gallium/targets/dril/dril_target.c
+@@ -47,25 +47,43 @@
+    CONFIG_ZS(color, PIPE_FORMAT_Z16_UNORM), \
+    CONFIG_ZS(color, PIPE_FORMAT_NONE) \
+ 
++/*
++ * (copy of a comment in dri_screen.c:dri_fill_in_modes())
++ *
++ * The 32-bit RGBA format must not precede the 32-bit BGRA format.
++ * Likewise for RGBX and BGRX.  Otherwise, the GLX client and the GLX
++ * server may disagree on which format the GLXFBConfig represents,
++ * resulting in swapped color channels.
++ *
++ * The problem, as of 2017-05-30:
++ * When matching a GLXFBConfig to a __DRIconfig, GLX ignores the channel
++ * order and chooses the first __DRIconfig with the expected channel
++ * sizes. Specifically, GLX compares the GLXFBConfig's and __DRIconfig's
++ * __DRI_ATTRIB_{CHANNEL}_SIZE but ignores __DRI_ATTRIB_{CHANNEL}_MASK.
++ *
++ * EGL does not suffer from this problem. It correctly compares the
++ * channel masks when matching EGLConfig to __DRIconfig.
++ */
++
+ static const struct gl_config drilConfigs[] = {
+-   CONFIG(PIPE_FORMAT_R8G8B8A8_UNORM),
+-   CONFIG(PIPE_FORMAT_R8G8B8X8_UNORM),
+    CONFIG(PIPE_FORMAT_B8G8R8A8_UNORM),
+    CONFIG(PIPE_FORMAT_B8G8R8X8_UNORM),
+-   CONFIG(PIPE_FORMAT_R10G10B10A2_UNORM),
+-   CONFIG(PIPE_FORMAT_R10G10B10X2_UNORM),
++   CONFIG(PIPE_FORMAT_R8G8B8A8_UNORM),
++   CONFIG(PIPE_FORMAT_R8G8B8X8_UNORM),
+    CONFIG(PIPE_FORMAT_B10G10R10A2_UNORM),
+    CONFIG(PIPE_FORMAT_B10G10R10X2_UNORM),
+-   CONFIG(PIPE_FORMAT_R5G6B5_UNORM),
+-   CONFIG(PIPE_FORMAT_R5G5B5A1_UNORM),
+-   CONFIG(PIPE_FORMAT_R5G5B5X1_UNORM),
+-   CONFIG(PIPE_FORMAT_R4G4B4A4_UNORM),
+-   CONFIG(PIPE_FORMAT_R4G4B4X4_UNORM),
++   CONFIG(PIPE_FORMAT_R10G10B10A2_UNORM),
++   CONFIG(PIPE_FORMAT_R10G10B10X2_UNORM),
+    CONFIG(PIPE_FORMAT_B5G6R5_UNORM),
+    CONFIG(PIPE_FORMAT_B5G5R5A1_UNORM),
+    CONFIG(PIPE_FORMAT_B5G5R5X1_UNORM),
+    CONFIG(PIPE_FORMAT_B4G4R4A4_UNORM),
+    CONFIG(PIPE_FORMAT_B4G4R4X4_UNORM),
++   CONFIG(PIPE_FORMAT_R5G6B5_UNORM),
++   CONFIG(PIPE_FORMAT_R5G5B5A1_UNORM),
++   CONFIG(PIPE_FORMAT_R5G5B5X1_UNORM),
++   CONFIG(PIPE_FORMAT_R4G4B4A4_UNORM),
++   CONFIG(PIPE_FORMAT_R4G4B4X4_UNORM),
+ };
+ 
+ #define RGB UTIL_FORMAT_COLORSPACE_RGB
+-- 
+2.45.2
+
diff --git a/media-libs/mesa/mesa-24.1.7.ebuild b/media-libs/mesa/mesa-24.1.7-r1.ebuild
index af5ee095a972..ebfcea5d7aac 100644
--- a/media-libs/mesa/mesa-24.1.7.ebuild
+++ b/media-libs/mesa/mesa-24.1.7-r1.ebuild
@@ -20,6 +20,9 @@ CRATES="
 	paste@1.0.14
 "
 
+RUST_MIN_VER="1.74.1"
+RUST_OPTIONAL=1
+
 inherit cargo
 
 DESCRIPTION="OpenGL-like graphic library for Linux"
@@ -154,7 +157,7 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	${PYTHON_DEPS}
 	opencl? (
-		>=virtual/rust-1.62.0
+		${RUST_DEPEND}
 		>=dev-util/bindgen-0.58.0
 	)
 	>=dev-build/meson-1.4.1
@@ -175,7 +178,7 @@ BDEPEND="
 		video_cards_nvk? (
 			>=dev-util/bindgen-0.68.1
 			>=dev-util/cbindgen-0.26.0
-			>=virtual/rust-1.74.1
+			${RUST_DEPEND}
 		)
 	)
 	wayland? ( dev-util/wayland-scanner )
@@ -291,6 +294,10 @@ pkg_setup() {
 
 	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() {
diff --git a/media-libs/mesa/mesa-24.2.6.ebuild b/media-libs/mesa/mesa-24.2.3-r1.ebuild
index a58a2652340e..3dd7cb3ad57b 100644
--- a/media-libs/mesa/mesa-24.2.6.ebuild
+++ b/media-libs/mesa/mesa-24.2.3-r1.ebuild
@@ -20,6 +20,9 @@ CRATES="
 	paste@1.0.14
 "
 
+RUST_MIN_VER="1.74.1"
+RUST_OPTIONAL=1
+
 inherit cargo
 
 DESCRIPTION="OpenGL-like graphic library for Linux"
@@ -156,7 +159,7 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	${PYTHON_DEPS}
 	opencl? (
-		>=virtual/rust-1.62.0
+		${RUST_DEPEND}
 		>=dev-util/bindgen-0.58.0
 	)
 	>=dev-build/meson-1.4.1
@@ -178,7 +181,7 @@ BDEPEND="
 		video_cards_nvk? (
 			>=dev-util/bindgen-0.68.1
 			>=dev-util/cbindgen-0.26.0
-			>=virtual/rust-1.74.1
+			${RUST_DEPEND}
 		)
 	)
 	wayland? ( dev-util/wayland-scanner )
@@ -295,6 +298,10 @@ pkg_setup() {
 
 	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() {
diff --git a/media-libs/mesa/mesa-24.2.3.ebuild b/media-libs/mesa/mesa-24.2.4-r1.ebuild
index a58a2652340e..3dd7cb3ad57b 100644
--- a/media-libs/mesa/mesa-24.2.3.ebuild
+++ b/media-libs/mesa/mesa-24.2.4-r1.ebuild
@@ -20,6 +20,9 @@ CRATES="
 	paste@1.0.14
 "
 
+RUST_MIN_VER="1.74.1"
+RUST_OPTIONAL=1
+
 inherit cargo
 
 DESCRIPTION="OpenGL-like graphic library for Linux"
@@ -156,7 +159,7 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	${PYTHON_DEPS}
 	opencl? (
-		>=virtual/rust-1.62.0
+		${RUST_DEPEND}
 		>=dev-util/bindgen-0.58.0
 	)
 	>=dev-build/meson-1.4.1
@@ -178,7 +181,7 @@ BDEPEND="
 		video_cards_nvk? (
 			>=dev-util/bindgen-0.68.1
 			>=dev-util/cbindgen-0.26.0
-			>=virtual/rust-1.74.1
+			${RUST_DEPEND}
 		)
 	)
 	wayland? ( dev-util/wayland-scanner )
@@ -295,6 +298,10 @@ pkg_setup() {
 
 	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() {
diff --git a/media-libs/mesa/mesa-24.2.4.ebuild b/media-libs/mesa/mesa-24.2.5-r1.ebuild
index a58a2652340e..3dd7cb3ad57b 100644
--- a/media-libs/mesa/mesa-24.2.4.ebuild
+++ b/media-libs/mesa/mesa-24.2.5-r1.ebuild
@@ -20,6 +20,9 @@ CRATES="
 	paste@1.0.14
 "
 
+RUST_MIN_VER="1.74.1"
+RUST_OPTIONAL=1
+
 inherit cargo
 
 DESCRIPTION="OpenGL-like graphic library for Linux"
@@ -156,7 +159,7 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	${PYTHON_DEPS}
 	opencl? (
-		>=virtual/rust-1.62.0
+		${RUST_DEPEND}
 		>=dev-util/bindgen-0.58.0
 	)
 	>=dev-build/meson-1.4.1
@@ -178,7 +181,7 @@ BDEPEND="
 		video_cards_nvk? (
 			>=dev-util/bindgen-0.68.1
 			>=dev-util/cbindgen-0.26.0
-			>=virtual/rust-1.74.1
+			${RUST_DEPEND}
 		)
 	)
 	wayland? ( dev-util/wayland-scanner )
@@ -295,6 +298,10 @@ pkg_setup() {
 
 	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() {
diff --git a/media-libs/mesa/mesa-24.2.5.ebuild b/media-libs/mesa/mesa-24.2.6-r2.ebuild
index a58a2652340e..4441b6cb0714 100644
--- a/media-libs/mesa/mesa-24.2.5.ebuild
+++ b/media-libs/mesa/mesa-24.2.6-r2.ebuild
@@ -20,6 +20,9 @@ CRATES="
 	paste@1.0.14
 "
 
+RUST_MIN_VER="1.74.1"
+RUST_OPTIONAL=1
+
 inherit cargo
 
 DESCRIPTION="OpenGL-like graphic library for Linux"
@@ -32,7 +35,7 @@ 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"
+	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,
@@ -156,7 +159,7 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	${PYTHON_DEPS}
 	opencl? (
-		>=virtual/rust-1.62.0
+		${RUST_DEPEND}
 		>=dev-util/bindgen-0.58.0
 	)
 	>=dev-build/meson-1.4.1
@@ -178,12 +181,16 @@ BDEPEND="
 		video_cards_nvk? (
 			>=dev-util/bindgen-0.68.1
 			>=dev-util/cbindgen-0.26.0
-			>=virtual/rust-1.74.1
+			${RUST_DEPEND}
 		)
 	)
 	wayland? ( dev-util/wayland-scanner )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-dril-Fixup-order-of-pixel-formats-in-drilConfigs.patch
+)
+
 QA_WX_LOAD="
 x86? (
 	usr/lib/libglapi.so.0.0.0
@@ -295,6 +302,10 @@ pkg_setup() {
 
 	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() {
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index e6207cf1ea28..ceba860297d1 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -20,6 +20,9 @@ CRATES="
 	paste@1.0.14
 "
 
+RUST_MIN_VER="1.74.1"
+RUST_OPTIONAL=1
+
 inherit cargo
 
 DESCRIPTION="OpenGL-like graphic library for Linux"
@@ -155,7 +158,7 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	${PYTHON_DEPS}
 	opencl? (
-		>=virtual/rust-1.62.0
+		${RUST_DEPEND}
 		>=dev-util/bindgen-0.58.0
 	)
 	>=dev-build/meson-1.4.1
@@ -177,7 +180,7 @@ BDEPEND="
 		video_cards_nvk? (
 			>=dev-util/bindgen-0.68.1
 			>=dev-util/cbindgen-0.26.0
-			>=virtual/rust-1.74.1
+			${RUST_DEPEND}
 		)
 	)
 	wayland? ( dev-util/wayland-scanner )
@@ -294,6 +297,10 @@ pkg_setup() {
 
 	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() {
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 615041cda6c0..f1f79eeab221 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -5,5 +5,5 @@ AUX mlt-7.28.0-fix-32bit.patch 3262 BLAKE2B 6842c442669b0abb1af2ef60892ee8cb494d
 DIST mlt-7.24.0.tar.gz 1662552 BLAKE2B f6e83b3c3fd9e3bf64366a6f6165b1839003b0fd058e1368e0648e011eff6da1a9af9fa7652aff032bc4ed4465be4648b5f1ae25fc102397aa9ae2d19981643a SHA512 a9e7fd5dc04152e523456bad244416b4fdeb5961ee7cadb816dd1393277d1d801200db595dcd28e520d76e6b2caca17e65c39b0256beb7c42a58ef241b85471d
 DIST mlt-7.28.0.tar.gz 1713069 BLAKE2B 5f9ec615324cd2095131a57b9dc0f79138d48eaa91b62574a028370be2d1c7ec6818ee2b5a9c123d35ec73993c8b2271c8dec4f039273a8443c2674c31e86fbf SHA512 a252da56b668968e56a7b0e81283b0b8e0ec8cd28502e3ab6e0aff67e22620ba61bf4feb88134e0d483884e31f2d18efe2d60b6badf0b6ffae4ad26ee646baf9
 EBUILD mlt-7.24.0.ebuild 4077 BLAKE2B 751b8720dba5aa2df8ce12cde88604983b25887b88abf4b8c8a7a97d0546993383d6a0112d73ca7f5641cf668e0b3c5d88248e32ff86073c2308e083dc5b2690 SHA512 f797e0200874a6ac284fee89abd7634b5c6b7710e170765cc0bb3884d6302af5ce796acd9a7d281b8a82b4d3b096ce35b2320882bc3d21517ae6b8b05b04838a
-EBUILD mlt-7.28.0.ebuild 4124 BLAKE2B 96c09c95f49d7a1c5cb2c4fc53e31c7f927dd5e0bf2ffe43a6f22e3fd76d337f9df50f8176fdb4b2e42bb1a1d8ea7ef252be6dc570f427cc137a267de599df0e SHA512 329b283671796a02eace44f9d00b01d3520c76b5ede5bc29ef2c28a6d5c115a529e42551f6eb085b8557c78b651ad279555e30d5e5e45ecabe165d2c4b2b194c
+EBUILD mlt-7.28.0-r1.ebuild 4126 BLAKE2B f59af4d6ef64d12a3ae15c6a108d58947a342a6f4f47e72eb776bf04901c1fa2d81794f86235bcfd3519a2b452b6c5064ccc6c92957fc4daea737d88e8eaba12 SHA512 76f6e472e53f39eefacf1f137f469502d4bff9bd9fb5aaec498c3bdaf62f9fdb68be3e4216bd5baebb3454f427ab335f0638a477c9dc10a7a7ec5af8fd722c4b
 MISC metadata.xml 1412 BLAKE2B 8d4eed394f1d1e95e5559466ef1840978966e8f1f7b89fdfd2549b2a35b6ce8f114c9373374fdaefe320cc34a4dc8cbd9f6c4433740d1ae9680de54484b5e3d1 SHA512 b19c711dc3798f952e0223dc0628b25aa3c9a296d66ee2f2b7f46a55b82e71c0c583ee64517be88dcc55eb1e9c31aa782b9043eb7630a853077afb1bf8b4dedd
diff --git a/media-libs/mlt/mlt-7.28.0.ebuild b/media-libs/mlt/mlt-7.28.0-r1.ebuild
index 65b63e9a0624..ee6fb6c20216 100644
--- a/media-libs/mlt/mlt-7.28.0.ebuild
+++ b/media-libs/mlt/mlt-7.28.0-r1.ebuild
@@ -61,7 +61,7 @@ DEPEND="
 		>=media-libs/rtaudio-4.1.2
 		kernel_linux? ( media-libs/alsa-lib )
 	)
-	rubberband? ( media-libs/rubberband )
+	rubberband? ( media-libs/rubberband:= )
 	sdl? (
 		media-libs/libsdl2[X,opengl,video]
 		media-libs/sdl2-image
diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index 944c7372ea6c..3c256183dc04 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -4,5 +4,5 @@ AUX opencollada-1.6.68-fix-null-conversion.patch 781 BLAKE2B ea4edb531f8075d8f70
 AUX opencollada-1.6.68-gcc13.patch 1263 BLAKE2B ecb12ae78a732d3e8a2d858d7a6ff1409e98f01dc23b94a376b9ceb3b76c076939054531a58781cfa378027f8bd5aa27c587185e66f80327a3d2d0e1981c85db SHA512 3b879549faf5261a30f141ea9a2b96701a4e02310156b602f47d507deadadc2db57e9f8ba20405d28f819d3886f9307d1e1736bc40b2cce62acd705dc86d63e8
 AUX opencollada-1.6.68-werror.patch 445 BLAKE2B 8b397bf950c8240e95214221f4fcfe0379fae3f31ce4cf3fb989f7c6b89f5432cf655202daf570cd3a692c0dd00b4efbeaa3b7c06de81ab034ad994727e9f798 SHA512 8fe614fe475a1a8b06cfcee2aaa1a666e1b4b42cfeaf5053cb23bbf056fafba6cf2cb13262cdd812f80bb8a4a63365f94e81aebeddc6c8d53f00c7f366f4776c
 DIST opencollada-1.6.68.tar.gz 12098718 BLAKE2B 45e0cd788b50a9a528b120e3cf8385803fa3dab0baaf8e28026cea8bf9afb0ab6b3d37f1d67803c9a48dae94d41efb9b5da119f75bd22a697c50c332d626cde2 SHA512 1b875ac2f59344aa33486f9e7479f76e94d58d5b567f17438c002cbfb36685fb38420467804c9eb28657d71d7efad550a24873dfe940d781c2a733c831532173
-EBUILD opencollada-1.6.68.ebuild 1966 BLAKE2B 66e78c20f7516e734e428b1137995448eab41d69f64458b105800525d6b1a0998fb395ba8dec9ac1ea37839c99f9f3f581b3063671cb125622b1838684792077 SHA512 8f9db8c739b213ef804f11571da0e7d506326fc514e56abe72282594b508803098b5b7a05d175f98feb9e1a97843ac71faca4c35fde300670cc341f6d333019f
+EBUILD opencollada-1.6.68.ebuild 1965 BLAKE2B 5e4df5ae04db0332d973abdc61d8a4970d1819107a0eb56d367c0407fc02b48c14762fdbc45e21934920e0f4b617bcdfe12faced451d7a2b77d20c2dc04ec696 SHA512 9cec5059fcc3f2fa2229282717bafed6468a253247a7479362d14d3ad870a51461ed549d569e3728c5d86d10f3c06e4de62f604a7e61cb5e5d018bf2f76fd817
 MISC metadata.xml 490 BLAKE2B 6c081a065f22f1571dda44dd1cd343b22611d8bc3becd93c78f8251676e977e2281aa3ab7757e09846238ffb40815c607e0bebdcccc97679f6e889eac6074bb7 SHA512 4e4b508fb8f14c521ab49a50fab3696b2583ea8c3700d18fdd94e8d0b576e54d904df1b207440ca36dc4898b68abfbd4bed68b967a0d5d6673bdd9e431562ecf
diff --git a/media-libs/opencollada/opencollada-1.6.68.ebuild b/media-libs/opencollada/opencollada-1.6.68.ebuild
index a6ea0264a82c..a6335f7755b5 100644
--- a/media-libs/opencollada/opencollada-1.6.68.ebuild
+++ b/media-libs/opencollada/opencollada-1.6.68.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="static-libs"
 
 RDEPEND="