gentoo auto-resync : 11:03:2023 - 18:08:11

16 files changed, 63 insertions, 102 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 92fff70d8833..3d6281ad61aa 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 6c7c528b0e97..7b413f64f861 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,3 +1,5 @@
 DIST Image-ExifTool-12.42.tar.gz 5042086 BLAKE2B c518906dfc6c354a6bf834044322727ff0c6787f74c387fb24b2320072bb525fd8b0b55d74cc324ac6e2ad6e75de0f3c552db2f6a1e665ab4b1bed9117916c2b SHA512 f7d3dd98623f44473f67ccf740370fd7704b60274efe1272b5219599dba9fe312afe4107937c6d64c5ee11380914b6e97a5248a2abcf88820822f9947cae0f8f
+DIST Image-ExifTool-12.50.tar.gz 5088286 BLAKE2B bfc0eae786e1443df5f741f5deed339b76b3041ab939c45303775df9ad22d989bbd68b77c9b8f2259c493dd81828b31223e604ef8bb4867c952cfb892a38a9d5 SHA512 d95be3636ed139a41a14183fc31fa2ecb5ea71b570ccdd282b9f0bba84a264b2edff2c42b34ee1114a14b106383d5ab3b67b8e73642e534f4df3fa54082dba85
 EBUILD exiftool-12.42.ebuild 716 BLAKE2B 389db47f55145f349f8db0f5d2551c11287049f6d53fdbaa1bbd7ef62cf9e62158d62e381dc82daaf1828e8577795dc699bdccbc31f0c42a0b0f02e9a6e793aa SHA512 387c2df4caa3748e7a240160589dddae18db08c8d2c58dc699d55ab94ec48ba37416ad9a5c0d0a3ff6c4bea836671b77691ce454381b804ff4b0668ea3230c75
+EBUILD exiftool-12.50.ebuild 721 BLAKE2B e0522fce416d270a07e4a14e6c3565f96461e4d08adeb8dadd75fa3865ed548d6beb7416fef966f7f0739defe9af1458ed73b404dcab4f0cb103b0bf0382c2ea SHA512 f538a282a50640e46b6b4a26b635be565302bb1ed10211f99cc0d3874c9f293f7a6e4734793be79a089aa215b05eafd395c518a9e6315286d4c2d47a8d6b1b26
 MISC metadata.xml 10040 BLAKE2B 8bcecde1df2dd3e79c3bcfbd38dcd9d3db9564a7abd5a684e0204779bcb685946f2eeb83a62efaa03efc841f0414b82f1087a3da3c6bd5f43e85561e43d7fb3e SHA512 af79302b57833d1368eff738b2326dd9cd47de47baf42426bfb00f61c1c6f52fcdc41d74bf95d8f65b2b0b00578ce07c3471b8cf4923e2f47c2c0b9d58dea35f
diff --git a/media-libs/exiftool/exiftool-12.50.ebuild b/media-libs/exiftool/exiftool-12.50.ebuild
new file mode 100644
index 000000000000..4602af41803e
--- /dev/null
+++ b/media-libs/exiftool/exiftool-12.50.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Check https://exiftool.org/history.html for whether a release is 'production'
+# Ideally don't bump to non-production at all, but certainly don't stable.
+
+DIST_NAME=Image-ExifTool
+inherit perl-module
+
+DESCRIPTION="Read and write meta information in image, audio and video files"
+HOMEPAGE="https://exiftool.org/ http://exiftool.sourceforge.net"
+SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE="doc"
+
+src_install() {
+	perl-module_src_install
+	use doc && dodoc -r html/
+
+	insinto /usr/share/${PN}
+	doins -r fmt_files config_files arg_files
+}
diff --git a/media-libs/intel-mediasdk/Manifest b/media-libs/intel-mediasdk/Manifest
index 711c4517e027..fac47a4e24c8 100644
--- a/media-libs/intel-mediasdk/Manifest
+++ b/media-libs/intel-mediasdk/Manifest
@@ -1,6 +1,6 @@
 DIST intel-mediasdk-22.6.5.tar.gz 11657890 BLAKE2B 53b38f7b3757895f65badb7e43e5d1f1112f744dd4a43ea9313f7bfbdf889088310b2093ccd45794426f0ac5e38ca8d901790d4963945648a3b99922476d02e0 SHA512 af9a59a9a7e9477672a875f454988cc49d8b782b32701ba681efa6dda445239e133b00f9366fc58ddadf79beef0ee74f1165990f0b8194124a841b36d5dca6bc
 DIST intel-mediasdk-23.1.2.tar.gz 11658547 BLAKE2B fb4314bb539630090594835b869c19c639097305cb3b72a14fca2c8b0e429c1c73a9736460db5852d4e2899efbca9aac076f8ff37da0851ac078ece913dab6ad SHA512 1f6a31197fc1f2670f36e1602cc7a194a02cd809470c7f4de630d68f0cbf9b643207491ce2f3c5b2d94af8843bfb9383d202e0f2ea8552e48307b7ad15a0cbb6
-EBUILD intel-mediasdk-22.6.5.ebuild 1914 BLAKE2B 130c75db7637c111ebc9fa229436a7d6e52ecef7417690fb06fcbfd59b4f86c899ae2410f653ce69054e9190dd550edec9a6eb56cd62bc6b3433fcaf00678e10 SHA512 2413e454af5f17327e857b7af3f77d0fc79a23cec9673c47041d04590b0ff36baab12c5e58bc9bc0402d6350eca9b4c694ac25f95ef37c4596b9cef966eb4777
+EBUILD intel-mediasdk-22.6.5.ebuild 1960 BLAKE2B 759c7ebb495ff50f21f4b2675b3234f20883629b15db9704064ccdf36b18bbe35d7e5afe23dbd6a33e56577826baf672ab8e158e9232230ee7b2a6b4aafbf5d2 SHA512 a6373b9030a0b37504e075c1c20d8919f9881e9b4e006b18dbe3db31aa15f995c2c8a55ac48cf808d1c2d995ffbc43c99cf2a8a7a9a73e47a82d4424efef7c2f
 EBUILD intel-mediasdk-23.1.2.ebuild 1914 BLAKE2B 130c75db7637c111ebc9fa229436a7d6e52ecef7417690fb06fcbfd59b4f86c899ae2410f653ce69054e9190dd550edec9a6eb56cd62bc6b3433fcaf00678e10 SHA512 2413e454af5f17327e857b7af3f77d0fc79a23cec9673c47041d04590b0ff36baab12c5e58bc9bc0402d6350eca9b4c694ac25f95ef37c4596b9cef966eb4777
-EBUILD intel-mediasdk-9999.ebuild 1916 BLAKE2B 0afe7a7034386a2f32dd3a7b074dca39a8771439ff1502cca97baa08959c928aa62614211d500f8d280faca37fa39b68e5bbf95ab77168620432289dcea65e08 SHA512 9c90d66da6c5ff7a93a993d977d48e6a496c1ca872b96465d44c0e954d1678e9a72bbc5f11d54f8578a7bf0811a7a9b2d68d48e42d36cb9a5cb4ec02938b0f4c
+EBUILD intel-mediasdk-9999.ebuild 1960 BLAKE2B 759c7ebb495ff50f21f4b2675b3234f20883629b15db9704064ccdf36b18bbe35d7e5afe23dbd6a33e56577826baf672ab8e158e9232230ee7b2a6b4aafbf5d2 SHA512 a6373b9030a0b37504e075c1c20d8919f9881e9b4e006b18dbe3db31aa15f995c2c8a55ac48cf808d1c2d995ffbc43c99cf2a8a7a9a73e47a82d4424efef7c2f
 MISC metadata.xml 507 BLAKE2B 1e08efd32142406ac7fc4390a10f51b117bbaf56fc2006ed508bf026d2720447a782f2e86ba323017dc6388ca18e4743688eaf1a8fb7165bc6377194b4139d0b SHA512 ef8d11178dcded14cb74c49e01bedde8986ff8aa02641c275d5a36ca3973782955f90d0c25ef728ca120fc1a46f1f3965f4b5a36376203c6f6cb9b1411af52e1
diff --git a/media-libs/intel-mediasdk/intel-mediasdk-22.6.5.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-22.6.5.ebuild
index 27755b2b6e96..90efdf1fc399 100644
--- a/media-libs/intel-mediasdk/intel-mediasdk-22.6.5.ebuild
+++ b/media-libs/intel-mediasdk/intel-mediasdk-22.6.5.ebuild
@@ -30,7 +30,7 @@ IUSE="dri test +tools wayland X"
 # Test not working at the moment
 #RESTRICT="!test? ( test )"
 RESTRICT="test"
-# Most of these flags only have an effect on the tools
+# # Most of these flags only have an effect on the tools
 REQUIRED_USE="
 	dri? ( X )
 	wayland? ( tools )
@@ -39,22 +39,29 @@ REQUIRED_USE="
 
 # x11-libs/libdrm[video_cards_intel] for intel_bufmgr.h in samples
 # bug #805224
-DEPEND="
+RDEPEND="
 	x11-libs/libpciaccess
 	>=media-libs/libva-intel-media-driver-${PV}
 	media-libs/libva[X?,wayland?]
 	x11-libs/libdrm[video_cards_intel]
 	wayland? (
 		dev-libs/wayland
-		dev-util/wayland-scanner
-		dev-libs/wayland-protocols
 	)
 	X? (
 		x11-libs/libX11
 		x11-libs/libxcb
 	)
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	wayland? (
+		dev-libs/wayland-protocols
+	)
+"
+BDEPEND="
+	wayland? (
+		dev-util/wayland-scanner
+	)
+"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
index a42d8290d2f3..90efdf1fc399 100644
--- a/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
+++ b/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -39,22 +39,29 @@ REQUIRED_USE="
 
 # x11-libs/libdrm[video_cards_intel] for intel_bufmgr.h in samples
 # bug #805224
-DEPEND="
+RDEPEND="
 	x11-libs/libpciaccess
 	>=media-libs/libva-intel-media-driver-${PV}
 	media-libs/libva[X?,wayland?]
 	x11-libs/libdrm[video_cards_intel]
 	wayland? (
 		dev-libs/wayland
-		dev-util/wayland-scanner
-		dev-libs/wayland-protocols
 	)
 	X? (
 		x11-libs/libX11
 		x11-libs/libxcb
 	)
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	wayland? (
+		dev-libs/wayland-protocols
+	)
+"
+BDEPEND="
+	wayland? (
+		dev-util/wayland-scanner
+	)
+"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index c489261f0c9c..d6cf29d4d9ec 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -8,13 +8,13 @@ DIST mesa-23.0.0-rc3.tar.xz 17427732 BLAKE2B dfa4f77b7e43ed505c6cb00806965fa4a80
 DIST mesa-23.0.0-rc4.tar.xz 17440412 BLAKE2B 879619965527a7e80edf05ef7431344590f4d67cc462bbce1db207420d7613e986ac96a504beabafa98cfab743ae18ca6d2d84bc2ae7feacbc11e72fb62a0438 SHA512 463dad021bffd1b6cae8eb540ea0f51da8753e5f5295f5d1ab6398ed6eb140ccef7ba62b458c099cc19a26d6dcb4b620280893425572fae75fe7e880d8e3a403
 DIST mesa-23.0.0.tar.xz 17492236 BLAKE2B f543856c9d85411c86b4ce28cfd412762726c60a3381c7e3f81f70479ff8c01a597279b6a18225b41db51cf5e8786f6955cd3127c8c3244422bc1bca4bc0dfa8 SHA512 127e2759a2a31cacd65a0891719ab7bb4a9188844022b4bccaebbedce9c550b9ccb160ad519178ea0d851c4bcb8f0f56febda248ed2ba82b5ddf804855e4694b
 EBUILD mesa-22.2.5.ebuild 12662 BLAKE2B e7fec8b5b563e96173125e559fe4bc8222e59f8371217a32a76768906fbe1a5cc6d13d4830ed37ba7eb8b07689f2d33970533a6db89a9f00926921da98c44fac SHA512 de9088f4d19d360be2516360da5b6fa21f2aa659b856f025917efe68dc5815c7bc3cea6f5d5957f562cc0cc15839fe9226d3a70ed69e90fbdfc043e89cd9e8c2
-EBUILD mesa-22.3.2.ebuild 12462 BLAKE2B d43a4976f031cf9de1095665f70d2a4a6973ba29ee101412f088fa6246411aa35d73aebbcdcb24b413d14a7184980ce584b5061d3a626fcfa32049f13fd4f55e SHA512 593dbf8c3343ec14e8505b18f6883d709b22ec2e5b9d4b92dac9f4c7ca6b6dab9bc0ebcfc65eade4b1cb28211b92e73f64f0d4d1788482c7eb9d14804adb35b6
-EBUILD mesa-22.3.3.ebuild 12462 BLAKE2B d43a4976f031cf9de1095665f70d2a4a6973ba29ee101412f088fa6246411aa35d73aebbcdcb24b413d14a7184980ce584b5061d3a626fcfa32049f13fd4f55e SHA512 593dbf8c3343ec14e8505b18f6883d709b22ec2e5b9d4b92dac9f4c7ca6b6dab9bc0ebcfc65eade4b1cb28211b92e73f64f0d4d1788482c7eb9d14804adb35b6
-EBUILD mesa-22.3.5.ebuild 12382 BLAKE2B 883a782e0d028cd6834b116a1f925a9ebe6caadc6b84e13ac4292bf01856b08d72a5abb9e1f3aa7f45ed79cf1fe99ad54b9f8504839816cc84785e559c2e1234 SHA512 05ae527c57274805e81b0bd73560bc11e4b0caadeafd4a2ad82d6c6737243411463e51ccdbcff38b594fbcc16b4a10b040b5fadbd4ae4d48124a95c9c2312128
-EBUILD mesa-22.3.6.ebuild 12375 BLAKE2B 5427698047a112725050e8152499b4656def79c2f2747bcc0c3d7f61644adffb5f31b2b51bc1f19fa9ae1857f32321a6123b8deac69261c135fa0ed511b1987d SHA512 3060948ddd1c209339c41f01d26c89221733c0ff4f5258a7435ef37d61dfc35cd74a35b19de928b5f7826a143826ba0fbca417b5266e81cde400e767febb5a62
-EBUILD mesa-22.3.7-r1.ebuild 12394 BLAKE2B e0ba5c5647c4834595555deb453e57b91d68072c65892dfe2c33fb5b140b0e183fa8bda88bb38cb9567b1e5fa8acf75921dd3d28b0e7b66776334350c1a375db SHA512 d1cb6c0e18674bde94e3ca082e4cb04a460485718aff3c21281614a7249983f68190c1668e0dd8faf2ff8d463cd93c96a213dccbfdedf2cbf3ffd9e49690e1f8
-EBUILD mesa-23.0.0-r1.ebuild 12394 BLAKE2B e0ba5c5647c4834595555deb453e57b91d68072c65892dfe2c33fb5b140b0e183fa8bda88bb38cb9567b1e5fa8acf75921dd3d28b0e7b66776334350c1a375db SHA512 d1cb6c0e18674bde94e3ca082e4cb04a460485718aff3c21281614a7249983f68190c1668e0dd8faf2ff8d463cd93c96a213dccbfdedf2cbf3ffd9e49690e1f8
-EBUILD mesa-23.0.0_rc3.ebuild 12382 BLAKE2B 883a782e0d028cd6834b116a1f925a9ebe6caadc6b84e13ac4292bf01856b08d72a5abb9e1f3aa7f45ed79cf1fe99ad54b9f8504839816cc84785e559c2e1234 SHA512 05ae527c57274805e81b0bd73560bc11e4b0caadeafd4a2ad82d6c6737243411463e51ccdbcff38b594fbcc16b4a10b040b5fadbd4ae4d48124a95c9c2312128
-EBUILD mesa-23.0.0_rc4.ebuild 12382 BLAKE2B 883a782e0d028cd6834b116a1f925a9ebe6caadc6b84e13ac4292bf01856b08d72a5abb9e1f3aa7f45ed79cf1fe99ad54b9f8504839816cc84785e559c2e1234 SHA512 05ae527c57274805e81b0bd73560bc11e4b0caadeafd4a2ad82d6c6737243411463e51ccdbcff38b594fbcc16b4a10b040b5fadbd4ae4d48124a95c9c2312128
-EBUILD mesa-9999.ebuild 12394 BLAKE2B e0ba5c5647c4834595555deb453e57b91d68072c65892dfe2c33fb5b140b0e183fa8bda88bb38cb9567b1e5fa8acf75921dd3d28b0e7b66776334350c1a375db SHA512 d1cb6c0e18674bde94e3ca082e4cb04a460485718aff3c21281614a7249983f68190c1668e0dd8faf2ff8d463cd93c96a213dccbfdedf2cbf3ffd9e49690e1f8
+EBUILD mesa-22.3.2.ebuild 12206 BLAKE2B de55502727c793477cfc7b3eeae4b51b183ef7171d3b71d61d4a689f0968a838e2d6df695421631eba84f4881e595b0362e20b30c4c4636eeba47e6c5d49d962 SHA512 d518e2c689da185eb7ff85a98660bdc1213cee15dd1f0f013c4fba28b4024f65976b9cf5a8f4929cc6e5ec5f90f5c1a3b873775cbb1d7cc25e5003d971d9f53e
+EBUILD mesa-22.3.3.ebuild 12206 BLAKE2B de55502727c793477cfc7b3eeae4b51b183ef7171d3b71d61d4a689f0968a838e2d6df695421631eba84f4881e595b0362e20b30c4c4636eeba47e6c5d49d962 SHA512 d518e2c689da185eb7ff85a98660bdc1213cee15dd1f0f013c4fba28b4024f65976b9cf5a8f4929cc6e5ec5f90f5c1a3b873775cbb1d7cc25e5003d971d9f53e
+EBUILD mesa-22.3.5.ebuild 12126 BLAKE2B 56d727f1549aa9f74fb2fdb0e3932a960f001a84c7f7069c549fe84fa561c5b30ceb088c35e3f94b75531dd91d466e6fc0ee0d0681cf42e8327dd850a9da8ccc SHA512 6047f3eecf0c855341a82d454291ce736b83160b3d595ba3c52d256ba6c67c41e80a87d757425d0a9d2bbcb68ccbef252e4e1b7e1559b007e9000b034efd8104
+EBUILD mesa-22.3.6.ebuild 12119 BLAKE2B 7116ced1c513d5666d26b9f4eac532e55c5d01a168b16159ba3283bd35c7640643fe9503a5d2b312cb42cfe9ca03e3ba847347a132cb3b7481f1487303389c34 SHA512 d682b4daa8383cbcc840264346cd9ef86cc69a688c70150d26856e64bb30e7db6e75d3d5c85898771aa6f19407f94f446aa937b0701c450f2ca2a98951232543
+EBUILD mesa-22.3.7-r1.ebuild 12138 BLAKE2B 9f9c5def8533c2589aa5af2aca1e70f54d16388f10cf76da91e2dbeed7b97199a5cd3ef3cc902dfc9d71e0f122fc24df1ea535b14ccbe752168f8cf5dbcdae15 SHA512 36fc3c4da06305020c079911ae35a2de45fb2da229e0e78dad98d8e6f1c6db9c366e83ca960dc0b22afcde21d26b00c1ad26895707452c75212126cf2e7eae8f
+EBUILD mesa-23.0.0-r1.ebuild 12138 BLAKE2B 9f9c5def8533c2589aa5af2aca1e70f54d16388f10cf76da91e2dbeed7b97199a5cd3ef3cc902dfc9d71e0f122fc24df1ea535b14ccbe752168f8cf5dbcdae15 SHA512 36fc3c4da06305020c079911ae35a2de45fb2da229e0e78dad98d8e6f1c6db9c366e83ca960dc0b22afcde21d26b00c1ad26895707452c75212126cf2e7eae8f
+EBUILD mesa-23.0.0_rc3.ebuild 12126 BLAKE2B 56d727f1549aa9f74fb2fdb0e3932a960f001a84c7f7069c549fe84fa561c5b30ceb088c35e3f94b75531dd91d466e6fc0ee0d0681cf42e8327dd850a9da8ccc SHA512 6047f3eecf0c855341a82d454291ce736b83160b3d595ba3c52d256ba6c67c41e80a87d757425d0a9d2bbcb68ccbef252e4e1b7e1559b007e9000b034efd8104
+EBUILD mesa-23.0.0_rc4.ebuild 12126 BLAKE2B 56d727f1549aa9f74fb2fdb0e3932a960f001a84c7f7069c549fe84fa561c5b30ceb088c35e3f94b75531dd91d466e6fc0ee0d0681cf42e8327dd850a9da8ccc SHA512 6047f3eecf0c855341a82d454291ce736b83160b3d595ba3c52d256ba6c67c41e80a87d757425d0a9d2bbcb68ccbef252e4e1b7e1559b007e9000b034efd8104
+EBUILD mesa-9999.ebuild 12138 BLAKE2B 9f9c5def8533c2589aa5af2aca1e70f54d16388f10cf76da91e2dbeed7b97199a5cd3ef3cc902dfc9d71e0f122fc24df1ea535b14ccbe752168f8cf5dbcdae15 SHA512 36fc3c4da06305020c079911ae35a2de45fb2da229e0e78dad98d8e6f1c6db9c366e83ca960dc0b22afcde21d26b00c1ad26895707452c75212126cf2e7eae8f
 MISC metadata.xml 1705 BLAKE2B d00c5edf48d5fb9c7485958569d8be761b0a8a79b893d50347687d2fd1c4ffac1325bbc32254737f8249e8b2cef2e86ae7b06a3c6351f7a03844f48ce1df428d SHA512 5c67ebd046a486e5e45864f79233ce659e0fa1d4c30284e9f3908c73d2f3480af50dddcf0676b8ed0ffe60a991ed4b59ce199d7ea16d6520a191ad076c5a9ec0
diff --git a/media-libs/mesa/mesa-22.3.2.ebuild b/media-libs/mesa/mesa-22.3.2.ebuild
index eb3f9e101cf3..c9007bcc3ef8 100644
--- a/media-libs/mesa/mesa-22.3.2.ebuild
+++ b/media-libs/mesa/mesa-22.3.2.ebuild
@@ -410,15 +410,6 @@ multilib_src_configure() {
 	use vulkan-overlay && vulkan_layers+=",overlay"
 	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
 
-	# In LLVM 16, we've switched to building LLVM with EH/RTTI disabled
-	# to match upstream defaults.  Mesa requires being built the same way.
-	# https://bugs.gentoo.org/883955
-	if [[ ${LLVM_SLOT} -ge 16 ]]; then
-		emesonargs+=(
-			-Dcpp_rtti=false
-		)
-	fi
-
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
diff --git a/media-libs/mesa/mesa-22.3.3.ebuild b/media-libs/mesa/mesa-22.3.3.ebuild
index eb3f9e101cf3..c9007bcc3ef8 100644
--- a/media-libs/mesa/mesa-22.3.3.ebuild
+++ b/media-libs/mesa/mesa-22.3.3.ebuild
@@ -410,15 +410,6 @@ multilib_src_configure() {
 	use vulkan-overlay && vulkan_layers+=",overlay"
 	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
 
-	# In LLVM 16, we've switched to building LLVM with EH/RTTI disabled
-	# to match upstream defaults.  Mesa requires being built the same way.
-	# https://bugs.gentoo.org/883955
-	if [[ ${LLVM_SLOT} -ge 16 ]]; then
-		emesonargs+=(
-			-Dcpp_rtti=false
-		)
-	fi
-
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
diff --git a/media-libs/mesa/mesa-22.3.5.ebuild b/media-libs/mesa/mesa-22.3.5.ebuild
index e85c95eeb1ec..f53a757e471d 100644
--- a/media-libs/mesa/mesa-22.3.5.ebuild
+++ b/media-libs/mesa/mesa-22.3.5.ebuild
@@ -408,15 +408,6 @@ multilib_src_configure() {
 	use vulkan-overlay && vulkan_layers+=",overlay"
 	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
 
-	# In LLVM 16, we've switched to building LLVM with EH/RTTI disabled
-	# to match upstream defaults.  Mesa requires being built the same way.
-	# https://bugs.gentoo.org/883955
-	if [[ ${LLVM_SLOT} -ge 16 ]]; then
-		emesonargs+=(
-			-Dcpp_rtti=false
-		)
-	fi
-
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
diff --git a/media-libs/mesa/mesa-22.3.6.ebuild b/media-libs/mesa/mesa-22.3.6.ebuild
index a9ba50b52c7e..ff6a0226d392 100644
--- a/media-libs/mesa/mesa-22.3.6.ebuild
+++ b/media-libs/mesa/mesa-22.3.6.ebuild
@@ -408,15 +408,6 @@ multilib_src_configure() {
 	use vulkan-overlay && vulkan_layers+=",overlay"
 	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
 
-	# In LLVM 16, we've switched to building LLVM with EH/RTTI disabled
-	# to match upstream defaults.  Mesa requires being built the same way.
-	# https://bugs.gentoo.org/883955
-	if [[ ${LLVM_SLOT} -ge 16 ]]; then
-		emesonargs+=(
-			-Dcpp_rtti=false
-		)
-	fi
-
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
diff --git a/media-libs/mesa/mesa-22.3.7-r1.ebuild b/media-libs/mesa/mesa-22.3.7-r1.ebuild
index f998fdcc64bf..06b88a6fdeca 100644
--- a/media-libs/mesa/mesa-22.3.7-r1.ebuild
+++ b/media-libs/mesa/mesa-22.3.7-r1.ebuild
@@ -408,15 +408,6 @@ multilib_src_configure() {
 	use vulkan-overlay && vulkan_layers+=",overlay"
 	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
 
-	# In LLVM 16, we've switched to building LLVM with EH/RTTI disabled
-	# to match upstream defaults.  Mesa requires being built the same way.
-	# https://bugs.gentoo.org/883955
-	if [[ ${LLVM_SLOT} -ge 16 ]]; then
-		emesonargs+=(
-			-Dcpp_rtti=false
-		)
-	fi
-
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
diff --git a/media-libs/mesa/mesa-23.0.0-r1.ebuild b/media-libs/mesa/mesa-23.0.0-r1.ebuild
index f998fdcc64bf..06b88a6fdeca 100644
--- a/media-libs/mesa/mesa-23.0.0-r1.ebuild
+++ b/media-libs/mesa/mesa-23.0.0-r1.ebuild
@@ -408,15 +408,6 @@ multilib_src_configure() {
 	use vulkan-overlay && vulkan_layers+=",overlay"
 	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
 
-	# In LLVM 16, we've switched to building LLVM with EH/RTTI disabled
-	# to match upstream defaults.  Mesa requires being built the same way.
-	# https://bugs.gentoo.org/883955
-	if [[ ${LLVM_SLOT} -ge 16 ]]; then
-		emesonargs+=(
-			-Dcpp_rtti=false
-		)
-	fi
-
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
diff --git a/media-libs/mesa/mesa-23.0.0_rc3.ebuild b/media-libs/mesa/mesa-23.0.0_rc3.ebuild
index e85c95eeb1ec..f53a757e471d 100644
--- a/media-libs/mesa/mesa-23.0.0_rc3.ebuild
+++ b/media-libs/mesa/mesa-23.0.0_rc3.ebuild
@@ -408,15 +408,6 @@ multilib_src_configure() {
 	use vulkan-overlay && vulkan_layers+=",overlay"
 	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
 
-	# In LLVM 16, we've switched to building LLVM with EH/RTTI disabled
-	# to match upstream defaults.  Mesa requires being built the same way.
-	# https://bugs.gentoo.org/883955
-	if [[ ${LLVM_SLOT} -ge 16 ]]; then
-		emesonargs+=(
-			-Dcpp_rtti=false
-		)
-	fi
-
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
diff --git a/media-libs/mesa/mesa-23.0.0_rc4.ebuild b/media-libs/mesa/mesa-23.0.0_rc4.ebuild
index e85c95eeb1ec..f53a757e471d 100644
--- a/media-libs/mesa/mesa-23.0.0_rc4.ebuild
+++ b/media-libs/mesa/mesa-23.0.0_rc4.ebuild
@@ -408,15 +408,6 @@ multilib_src_configure() {
 	use vulkan-overlay && vulkan_layers+=",overlay"
 	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
 
-	# In LLVM 16, we've switched to building LLVM with EH/RTTI disabled
-	# to match upstream defaults.  Mesa requires being built the same way.
-	# https://bugs.gentoo.org/883955
-	if [[ ${LLVM_SLOT} -ge 16 ]]; then
-		emesonargs+=(
-			-Dcpp_rtti=false
-		)
-	fi
-
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index f998fdcc64bf..06b88a6fdeca 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -408,15 +408,6 @@ multilib_src_configure() {
 	use vulkan-overlay && vulkan_layers+=",overlay"
 	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
 
-	# In LLVM 16, we've switched to building LLVM with EH/RTTI disabled
-	# to match upstream defaults.  Mesa requires being built the same way.
-	# https://bugs.gentoo.org/883955
-	if [[ ${LLVM_SLOT} -ge 16 ]]; then
-		emesonargs+=(
-			-Dcpp_rtti=false
-		)
-	fi
-
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)