gentoo auto-resync : 10:02:2024 - 17:34:25

6 files changed, 93 insertions, 90 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index c954227af296..1c29b2ee4e13 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libshumate/Manifest b/media-libs/libshumate/Manifest
index 3f794b09ed66..c2c863f15597 100644
--- a/media-libs/libshumate/Manifest
+++ b/media-libs/libshumate/Manifest
@@ -3,8 +3,10 @@ DIST libshumate-1.0.5.tar.xz 112008 BLAKE2B e20e53fdcd34aa67853f68d72801e7ef7dfc
 DIST libshumate-1.1.0.tar.xz 299096 BLAKE2B 111eaca1ed7d0abc9f4bc5d83c10bd84aadd42cf92d3a5ac37e00edd9b433c1db768686c9935f7f88b200c6a2b7c1898b0e96bcf036947bc7097e5ddfcd34d82 SHA512 138736090ad448cd73812e5b3da6d1e9199601ca7ee9b026a19586c680ccb306871fe2a779db4cffde822834974154ccd55117dd58ce849c655fde71dab0237a
 DIST libshumate-1.1.1.tar.xz 299200 BLAKE2B 763bba4c27d2e576b687120fff1d9dd07029307032618e4b629b1a5cd7091d46349cc3908388b84e7053b6e76d11ea0c646edbda2468bee5fc3c8cad874cfe3d SHA512 d39d47d7a41eb692b4f42c66ee4e4c84f028314d6bf8757b7c7803fb67eff72ad2af3b5cb5256b2325f39291df0b1440f64b685e5a98b7c3a3712977ff495c5e
 DIST libshumate-1.1.2.tar.xz 299324 BLAKE2B 8ccd692af5404c694198e41adc2543a140ef02abbe4b044f71575022aad027357a67f6a9f57c195e7fad6d2e619f91bfc06d9b9c5af68d57d3c11ac118ea6151 SHA512 371ac56493653a552ecaaf534065dba94c1a8a08d05432cb6a76f3d6cb7c4c3ead2a76459fa2bec49e7554492ffa67c2a8e6f85618ef23981db238efb6c52006
+DIST libshumate-1.1.3.tar.xz 299644 BLAKE2B f07a583e1fd142a0601c725840e84397ed04962f828cbc15217dcdc0d767015664a06252879416e9422cb32154406dae2742ffb511404c5923ce9acab7efae0c SHA512 163cce5c9aca2f3c52da3ecb3b4a651798e314d38a145ed4c69b0510303c72a0934c24084036ca2dfaab8b008753a37f7116b0bd2907cddc78a2aceee4f847d2
 EBUILD libshumate-1.0.5.ebuild 1606 BLAKE2B 41458e616204c3186740663a832c629f6bbc833e77332f3877edeac3e8cee47b6efa057e24be738658ea42489f66aa7c5aab5d4bd8e16b69e2c8e74caa420866 SHA512 1f144b1f20db28ac70d60d3482606e7be64307034a3c7bd457807644d3e76670175c81082bb134e2c24fcdadeab5fda0326587583cc26f2c91a2754ddba99dc9
 EBUILD libshumate-1.1.0.ebuild 1611 BLAKE2B 5bd5ef1724c4a7e262d79a633fe67385876a55fcf60412c90191f0a08c33be21c78b4430ebe108cc04d9cb0f8ff66ed406bee9bd2dc280667b8ec63c3c8483c9 SHA512 f49334b1ad65312e53b131ae156b021b22f3fbdba5ab6d2d58ffe5c72ec7be40a103a1e0c5fd7dff93b9f0c8d861fc00eaa1a7105fc9f8253f12755328b47092
 EBUILD libshumate-1.1.1.ebuild 1611 BLAKE2B 5bd5ef1724c4a7e262d79a633fe67385876a55fcf60412c90191f0a08c33be21c78b4430ebe108cc04d9cb0f8ff66ed406bee9bd2dc280667b8ec63c3c8483c9 SHA512 f49334b1ad65312e53b131ae156b021b22f3fbdba5ab6d2d58ffe5c72ec7be40a103a1e0c5fd7dff93b9f0c8d861fc00eaa1a7105fc9f8253f12755328b47092
 EBUILD libshumate-1.1.2.ebuild 1611 BLAKE2B 5bd5ef1724c4a7e262d79a633fe67385876a55fcf60412c90191f0a08c33be21c78b4430ebe108cc04d9cb0f8ff66ed406bee9bd2dc280667b8ec63c3c8483c9 SHA512 f49334b1ad65312e53b131ae156b021b22f3fbdba5ab6d2d58ffe5c72ec7be40a103a1e0c5fd7dff93b9f0c8d861fc00eaa1a7105fc9f8253f12755328b47092
+EBUILD libshumate-1.1.3.ebuild 1611 BLAKE2B 5dc2303798124fa9f570b592951c3b7820cde4847c4e7d1d6ae6877c7a811088597bc8fa4e5c40083c487afb38d78035a27c22dfe5c2d532a2329a61a226623a SHA512 25a71dfb501c443f83bc1486bf7fa6532eb04d28401bce4f54bbaae83cfd7d43660ebe2fa7d8e5565590332cd5712f181c8b1a8488080bccf3f3b50a02b8d0f6
 MISC metadata.xml 445 BLAKE2B 58a069a9ded7b8fab96c93fd3b11e1fd7b4ae4a58966f5bbeedb560547005a56f62167bc31aa5c05ca68f1855e12c2d915825922d5b6504e359893e0786579a5 SHA512 3e5352258641f4a9e6722777971cc3fb02359e831708c1749f2d77c7b15d147adbf54097d311435f5220cd49bab9e298b3379f4a59c0f4563a6706f608343299
diff --git a/media-libs/libshumate/libshumate-1.1.3.ebuild b/media-libs/libshumate/libshumate-1.1.3.ebuild
new file mode 100644
index 000000000000..94e5f6d11dba
--- /dev/null
+++ b/media-libs/libshumate/libshumate-1.1.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson vala virtualx
+
+DESCRIPTION="Shumate is a GTK toolkit providing widgets for embedded maps"
+HOMEPAGE="https://wiki.gnome.org/Projects/libshumate https://gitlab.gnome.org/GNOME/libshumate"
+
+SLOT="1.0/1"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+REQUIRED_USE="gtk-doc? ( introspection )"
+
+IUSE="gtk-doc +introspection sysprof vala" # vector-renderer is still experimental, maybe put in at a later release
+
+RDEPEND="
+	>=dev-libs/glib-2.68.0:2
+	>=x11-libs/cairo-1.4
+	>=dev-db/sqlite-1.12:3
+	>=gui-libs/gtk-4:4
+	>=net-libs/libsoup-3.0:3.0
+	introspection? ( >=dev-libs/gobject-introspection-0.6.3:= )
+"
+# vector-renderer? (
+#	>=dev-libs/json-glib-1.6.0[introspection?]
+#	dev-libs/protobuf-c
+# )
+
+DEPEND="${RDEPEND}
+	sysprof? ( dev-util/sysprof-capture:4 )
+"
+BDEPEND="
+	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
+	vala? ( $(vala_depend) )
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use introspection gir)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc gtk_doc)
+		-Ddemos=false # only built, not installed
+		# $(meson_use vector-renderer vector_renderer)
+		-Dvector_renderer=false
+		-Dlibsoup3=true
+		$(meson_feature sysprof)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+src_install() {
+	meson_src_install
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html || die
+		mv "${ED}"/usr/share/doc/libshumate-1.0 "${ED}"/usr/share/gtk-doc/html/libshumate-1.0 || die
+	fi
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 16dfa2019c2a..5eb407e6199e 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -10,6 +10,6 @@ EBUILD mesa-23.3.1.ebuild 12405 BLAKE2B 5de3b3e3351eace4405a8279aec2959848b733ac
 EBUILD mesa-23.3.3.ebuild 12449 BLAKE2B 7ba9ccd4a2006cbaff89b5179cfa8ff03ca2947948d78164b7c56065e11ddf364b5811503b04ad294a0673662643e45f974d73ba2127640ce255d5af6aef1faa SHA512 eb15ad6e7d9a606e642460f8d5171a161f3650dea984ac3321089e5efe71a60ab5b8e2828229ec627377e9abae194ff691e8f83c18cacf3d3a53a3cecd9b581d
 EBUILD mesa-23.3.4.ebuild 12331 BLAKE2B cc6bec787020cbda9333823a94aeead4c0390492e4e10485e7bc823735a1e37098066b55f607c9688959936ac81337b2b5a8b1fafd3bb4bb73ccbb1c4b6af8f9 SHA512 71855871d00f4b07c7ccbf1f01d2ee1df3c49efff17460669da7d057ce7af62d761f815e6873a3d8a55859f0125c66e488be74d0d56f712fe4e1ab12f795e621
 EBUILD mesa-23.3.5.ebuild 12331 BLAKE2B cc6bec787020cbda9333823a94aeead4c0390492e4e10485e7bc823735a1e37098066b55f607c9688959936ac81337b2b5a8b1fafd3bb4bb73ccbb1c4b6af8f9 SHA512 71855871d00f4b07c7ccbf1f01d2ee1df3c49efff17460669da7d057ce7af62d761f815e6873a3d8a55859f0125c66e488be74d0d56f712fe4e1ab12f795e621
-EBUILD mesa-24.0.0.ebuild 12450 BLAKE2B c6a2343a417cd730f1f5784d8c4f38500f5a96e5b78b94ae05733d3bc45b1e458a0e1ba8cec4c8d60dd65d6ad215cdc0e4b8051317e39ef56effcc99801f87ba SHA512 1cb89e320386bacd28f66050afffadb01508b5cc6c348fbe6b52abf44f726cc75075c06a0bc10a248dea2a726cf72d37d6ffc9c7f59235a08d45ef65a9a850d4
-EBUILD mesa-9999.ebuild 12450 BLAKE2B c6a2343a417cd730f1f5784d8c4f38500f5a96e5b78b94ae05733d3bc45b1e458a0e1ba8cec4c8d60dd65d6ad215cdc0e4b8051317e39ef56effcc99801f87ba SHA512 1cb89e320386bacd28f66050afffadb01508b5cc6c348fbe6b52abf44f726cc75075c06a0bc10a248dea2a726cf72d37d6ffc9c7f59235a08d45ef65a9a850d4
+EBUILD mesa-24.0.0.ebuild 11544 BLAKE2B 219b9c11840684766c0a1b5ea6f9cc61acee4a86878620fce178f8dd69fc652955b82acabedc00f2cc7b287d17e3e06bdf738875c5482086c3d58244ff9ca938 SHA512 bfbd0400e3208016e7e2c7dfbbb8f04296d6616230918c3fee2ffe9efe5a4a1173ad737071f435710ec253ac314f4753620b200b5944da97d497829de6bf3934
+EBUILD mesa-9999.ebuild 11544 BLAKE2B 219b9c11840684766c0a1b5ea6f9cc61acee4a86878620fce178f8dd69fc652955b82acabedc00f2cc7b287d17e3e06bdf738875c5482086c3d58244ff9ca938 SHA512 bfbd0400e3208016e7e2c7dfbbb8f04296d6616230918c3fee2ffe9efe5a4a1173ad737071f435710ec253ac314f4753620b200b5944da97d497829de6bf3934
 MISC metadata.xml 1435 BLAKE2B 53690878512b86ce0b8dce38b083684c85ad5c1a655d5a69cb3265e156869845263eb16f271691b66c9f0cd76e97b56908acf7a1792d6abac0ec99447826cbb5 SHA512 842106e5d6eb60ff33c8cae7f0d52983c4f7e104152718b50fc790cbcb2506551a6fc7841fe8e3c7963850c238f77505b0e49b10a3a936baf459e1acaf73e07f
diff --git a/media-libs/mesa/mesa-24.0.0.ebuild b/media-libs/mesa/mesa-24.0.0.ebuild
index 7d7f3b5ed165..0ef20b351970 100644
--- a/media-libs/mesa/mesa-24.0.0.ebuild
+++ b/media-libs/mesa/mesa-24.0.0.ebuild
@@ -3,9 +3,11 @@
 
 EAPI=8
 
+LLVM_COMPAT=( {15..17} )
+LLVM_OPTIONAL=1
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit llvm meson-multilib python-any-r1 linux-info
+inherit llvm-r1 meson-multilib python-any-r1 linux-info
 
 MY_P="${P/_/-}"
 
@@ -47,6 +49,7 @@ REQUIRED_USE="
 			video_cards_vmware
 		)
 	)
+	llvm? ( ${LLVM_REQUIRED_USE} )
 	vulkan-overlay? ( vulkan )
 	video_cards_lavapipe? ( llvm vulkan )
 	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
@@ -64,6 +67,13 @@ RDEPEND="
 	>=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_radeonsi? (
 			virtual/libelf:0=[${MULTILIB_USEDEP}]
 		)
@@ -109,37 +119,6 @@ RDEPEND="${RDEPEND}
 	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
 "
 
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. Specify LLVM_MAX_SLOT (inclusive), e.g. 17.
-# 2. Specify LLVM_MIN_SLOT (inclusive), e.g. 15.
-LLVM_MAX_SLOT="17"
-LLVM_MIN_SLOT="15"
-LLVM_USE_DEPS="llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}"
-PER_SLOT_DEPSTR="
-	(
-		!opencl? ( sys-devel/llvm:@SLOT@[${LLVM_USE_DEPS}] )
-		opencl? ( sys-devel/clang:@SLOT@[${LLVM_USE_DEPS}] )
-		opencl? ( dev-util/spirv-llvm-translator:@SLOT@ )
-	)
-"
-LLVM_DEPSTR="
-	|| (
-		$(for ((slot=LLVM_MAX_SLOT; slot>=LLVM_MIN_SLOT; slot--)); do
-			echo "${PER_SLOT_DEPSTR//@SLOT@/${slot}}"
-		done)
-	)
-	!opencl? ( <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${LLVM_USE_DEPS}] )
-	opencl? ( <sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=[${LLVM_USE_DEPS}] )
-"
-RDEPEND="${RDEPEND}
-	llvm? ( ${LLVM_DEPSTR} )
-"
-unset LLVM_MIN_SLOT {LLVM,PER_SLOT}_DEPSTR
-
 DEPEND="${RDEPEND}
 	video_cards_d3d12? ( >=dev-util/directx-headers-1.611.0[${MULTILIB_USEDEP}] )
 	valgrind? ( dev-debug/valgrind )
@@ -185,14 +164,6 @@ x86? (
 	usr/lib/libGLX_mesa.so.0.0.0
 )"
 
-llvm_check_deps() {
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${LLVM_USE_DEPS}]" || return 1
-		has_version "dev-util/spirv-llvm-translator:${LLVM_SLOT}" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${LLVM_USE_DEPS}]"
-}
-
 pkg_pretend() {
 	if use vulkan; then
 		if ! use video_cards_d3d12 &&
@@ -268,9 +239,7 @@ pkg_setup() {
 		linux-info_pkg_setup
 	fi
 
-	if use llvm; then
-		llvm_pkg_setup
-	fi
+	use llvm && llvm-r1_pkg_setup
 	python-any-r1_pkg_setup
 }
 
@@ -363,7 +332,7 @@ multilib_src_configure() {
 	fi
 
 	if use llvm && use opencl; then
-		PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig"
+		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)
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 7d7f3b5ed165..0ef20b351970 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -3,9 +3,11 @@
 
 EAPI=8
 
+LLVM_COMPAT=( {15..17} )
+LLVM_OPTIONAL=1
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit llvm meson-multilib python-any-r1 linux-info
+inherit llvm-r1 meson-multilib python-any-r1 linux-info
 
 MY_P="${P/_/-}"
 
@@ -47,6 +49,7 @@ REQUIRED_USE="
 			video_cards_vmware
 		)
 	)
+	llvm? ( ${LLVM_REQUIRED_USE} )
 	vulkan-overlay? ( vulkan )
 	video_cards_lavapipe? ( llvm vulkan )
 	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
@@ -64,6 +67,13 @@ RDEPEND="
 	>=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_radeonsi? (
 			virtual/libelf:0=[${MULTILIB_USEDEP}]
 		)
@@ -109,37 +119,6 @@ RDEPEND="${RDEPEND}
 	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
 "
 
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. Specify LLVM_MAX_SLOT (inclusive), e.g. 17.
-# 2. Specify LLVM_MIN_SLOT (inclusive), e.g. 15.
-LLVM_MAX_SLOT="17"
-LLVM_MIN_SLOT="15"
-LLVM_USE_DEPS="llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}"
-PER_SLOT_DEPSTR="
-	(
-		!opencl? ( sys-devel/llvm:@SLOT@[${LLVM_USE_DEPS}] )
-		opencl? ( sys-devel/clang:@SLOT@[${LLVM_USE_DEPS}] )
-		opencl? ( dev-util/spirv-llvm-translator:@SLOT@ )
-	)
-"
-LLVM_DEPSTR="
-	|| (
-		$(for ((slot=LLVM_MAX_SLOT; slot>=LLVM_MIN_SLOT; slot--)); do
-			echo "${PER_SLOT_DEPSTR//@SLOT@/${slot}}"
-		done)
-	)
-	!opencl? ( <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${LLVM_USE_DEPS}] )
-	opencl? ( <sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=[${LLVM_USE_DEPS}] )
-"
-RDEPEND="${RDEPEND}
-	llvm? ( ${LLVM_DEPSTR} )
-"
-unset LLVM_MIN_SLOT {LLVM,PER_SLOT}_DEPSTR
-
 DEPEND="${RDEPEND}
 	video_cards_d3d12? ( >=dev-util/directx-headers-1.611.0[${MULTILIB_USEDEP}] )
 	valgrind? ( dev-debug/valgrind )
@@ -185,14 +164,6 @@ x86? (
 	usr/lib/libGLX_mesa.so.0.0.0
 )"
 
-llvm_check_deps() {
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${LLVM_USE_DEPS}]" || return 1
-		has_version "dev-util/spirv-llvm-translator:${LLVM_SLOT}" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${LLVM_USE_DEPS}]"
-}
-
 pkg_pretend() {
 	if use vulkan; then
 		if ! use video_cards_d3d12 &&
@@ -268,9 +239,7 @@ pkg_setup() {
 		linux-info_pkg_setup
 	fi
 
-	if use llvm; then
-		llvm_pkg_setup
-	fi
+	use llvm && llvm-r1_pkg_setup
 	python-any-r1_pkg_setup
 }
 
@@ -363,7 +332,7 @@ multilib_src_configure() {
 	fi
 
 	if use llvm && use opencl; then
-		PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig"
+		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)