gentoo auto-resync : 07:08:2024 - 12:37:20

3 files changed, 24 insertions, 26 deletions

diff --git a/media-sound/helvum/Manifest b/media-sound/helvum/Manifest
index ea153e75d64c..40baf69f79e2 100644
--- a/media-sound/helvum/Manifest
+++ b/media-sound/helvum/Manifest
@@ -142,6 +142,6 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST winnow-0.5.12.crate 144683 BLAKE2B 3d363754f2f37490a3fd812945408a626c5b17c460d732ef30c5c97a1487d02fd6a5c3632cbc59c1f9f367da996b7f58c8f281db4c45be8d300b5f214f8de055 SHA512 c51782ea9f14ccd76ead83df6562c2f5fbd76ec31d149aac83ef5ce8dd541b92156f1b2acb62f7af2886eb16e2ef419f5be703c96b378ee5b8558a751ebcb9f1
 DIST winnow-0.5.15.crate 145621 BLAKE2B 039262561227641c2d8b996ebb59c79718de3f2b7dd8e369fc3e341f3458b1e0213f35c575d615e87d5f89aad639c7a258e4efb2c10f58c2cd6e120482702cc2 SHA512 42dce18906f41e45e6dd75ba01af6a94501317dee8b45f4c7340f7c9c94f8935afe2536cd9ad5a91eef6f3a6135cab0a451d67a35b5a0fd69130a90e6aa47603
-EBUILD helvum-0.4.1.ebuild 3227 BLAKE2B 795f1b08fc7cafeac5591fc62a6a9967b5d292ec75673d51cbd7930b18e902e5a84ed3ef640d9390a10bf4ab84d855278dd5d1af59fddd6732ff57ba09db9bad SHA512 1e131401ce069b08d55ade8812a19c3e246345529b2155ed6e3d2fc2dd6c881ed57edb1bfa7eb0ac153b920002780bcf28d0d756a73cbb926eb8c1e7fb15025a
-EBUILD helvum-0.5.1-r2.ebuild 3296 BLAKE2B 2a266e057e7632a9165701f19370b2842a4ac9aadcf5120ac3a4edad34bb37aecf7bf2694b905f5a534cd20a08eaab51d4be71cd55e0a68f308c46a796eed8d6 SHA512 a40a4a5c0085c0a5f76eb93727d59b5819c8a3394dc990c235013f6763e09e1c5314ba89584752ecb1125e8bdfe5386931fde392f0b525a4561552fbf6c76b15
+EBUILD helvum-0.4.1-r1.ebuild 3236 BLAKE2B 460741f9631cbab6228a8ebd6758c26c0d8b8c57cf4c21d912e07b2f95752bc8061b2019d239b1b144265967a01c8a73b449d09ced8683f3816260b1f2c9dffe SHA512 d950c750a531e96e9202ea5b9fec7aaf5e4e96b72fe732d9895e60be4ee762d728b51eb0dedb8ac99ded950aa4a5b2062d69ac2d701b2337fa5a30befe4afee2
+EBUILD helvum-0.5.1-r3.ebuild 3325 BLAKE2B c4c02dd148910f0a52f38311b14b5644aa1270838c6c3cf3f92a861ee28fbc3d9ab0ddf134143fceb4c1796e0fdd8d77604bf3021c427c99165ddaf0bdf0583a SHA512 a3a7d3f43b552ef019cd902864d1270ea36db778f217a7b5ff542c3e9d8e871305a704389fd61a32db8cba2b959c03e7bcee7a4397fd6d01e5f2ec885e26c77e
 MISC metadata.xml 557 BLAKE2B 2e61649d978610875939163be573fe3799a015e736dc54f574de3be516926aaf58244a4892402476b056cda6f65c58e8d75aaf53be29fd00e6bf082c2c6e0bd1 SHA512 04b6a5220af171cfcd052c98df3e598869fc3069b8cd32b388764e34a128ba55493d16878a3b545775891470bc9057b08a5e5e1e13b731ddf6ca50b6fba0c950
diff --git a/media-sound/helvum/helvum-0.4.1.ebuild b/media-sound/helvum/helvum-0.4.1-r1.ebuild
index 09902d800f1e..62afda3e4583 100644
--- a/media-sound/helvum/helvum-0.4.1.ebuild
+++ b/media-sound/helvum/helvum-0.4.1-r1.ebuild
@@ -1,8 +1,6 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Autogenerated by pycargoebuild 0.10
-
 EAPI=8
 
 CRATES="
@@ -108,9 +106,9 @@ CRATES="
 	winnow@0.5.12
 "
 
-LLVM_MAX_SLOT=16
+LLVM_COMPAT=( {16..18} )
 
-inherit cargo desktop xdg llvm
+inherit cargo desktop llvm-r1 xdg
 
 DESCRIPTION="A GTK patchbay for pipewire"
 HOMEPAGE="https://gitlab.freedesktop.org/pipewire/helvum"
@@ -129,15 +127,19 @@ KEYWORDS="~amd64"
 
 # Clang needed for bindgen
 BDEPEND="
-	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1))
+	>=dev-build/meson-0.59.0
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}=
+		sys-devel/llvm:${LLVM_SLOT}=
+		virtual/rust:0/llvm-${LLVM_SLOT}
+	')
 	virtual/pkgconfig
-	>=virtual/rust-1.70
 "
 DEPEND="
-	dev-libs/glib:2
-	gui-libs/gtk:4
+	>=dev-libs/glib-2.66:2
+	>=gui-libs/gtk-4.4.0:4
 	media-libs/graphene
-	media-video/pipewire:=
+	>=media-video/pipewire-0.3:=
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	x11-libs/pango
@@ -146,10 +148,6 @@ RDEPEND="${DEPEND}"
 
 QA_FLAGS_IGNORED="usr/bin/${PN}"
 
-llvm_check_deps() {
-	has_version -b "sys-devel/clang:${LLVM_SLOT}"
-}
-
 src_install() {
 	cargo_src_install
 
diff --git a/media-sound/helvum/helvum-0.5.1-r2.ebuild b/media-sound/helvum/helvum-0.5.1-r3.ebuild
index f6a688ca6351..d43c13272c0f 100644
--- a/media-sound/helvum/helvum-0.5.1-r2.ebuild
+++ b/media-sound/helvum/helvum-0.5.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -109,9 +109,9 @@ CRATES="
 	winnow@0.5.15
 "
 
-LLVM_MAX_SLOT=17
+LLVM_COMPAT=( {16..18} )
 
-inherit cargo desktop xdg llvm
+inherit cargo desktop llvm-r1 xdg
 
 DESCRIPTION="A GTK patchbay for pipewire"
 HOMEPAGE="https://gitlab.freedesktop.org/pipewire/helvum"
@@ -131,14 +131,18 @@ KEYWORDS="~amd64"
 
 # Clang needed for bindgen
 BDEPEND="
-	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1))
+	>=dev-build/meson-0.59.0
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}=
+		sys-devel/llvm:${LLVM_SLOT}=
+		virtual/rust:0/llvm-${LLVM_SLOT}
+	')
 	virtual/pkgconfig
-	>=virtual/rust-1.70
 "
 DEPEND="
 	>=dev-libs/glib-2.66:2
 	>=gui-libs/gtk-4.4.0:4
-	>=gui-libs/libadwaita-1.3
+	>=gui-libs/libadwaita-1.3:1
 	media-libs/graphene
 	>=media-video/pipewire-0.3:=
 	x11-libs/cairo
@@ -149,10 +153,6 @@ RDEPEND="${DEPEND}"
 
 QA_FLAGS_IGNORED="usr/bin/${PN}"
 
-llvm_check_deps() {
-	has_version -b "sys-devel/clang:${LLVM_SLOT}"
-}
-
 src_install() {
 	cargo_src_install