From 015fdd57022ab7a54e47dafe3e81ffc76e502a90 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 3 Sep 2023 10:18:28 +0100
Subject: gentoo auto-resync : 03:09:2023 - 10:18:27

---
 sys-fs/bcachefs-tools/Manifest                        |  4 ++--
 .../bcachefs-tools-1.2_p20230813.ebuild               | 18 +++++++++++++++---
 sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild      | 19 +++++++++++++++----
 3 files changed, 32 insertions(+), 9 deletions(-)

(limited to 'sys-fs/bcachefs-tools')

diff --git a/sys-fs/bcachefs-tools/Manifest b/sys-fs/bcachefs-tools/Manifest
index adda27d39cee..efeb895c38c2 100644
--- a/sys-fs/bcachefs-tools/Manifest
+++ b/sys-fs/bcachefs-tools/Manifest
@@ -106,6 +106,6 @@ DIST windows_i686_msvc-0.42.1.crate 722583 BLAKE2B e03978daa0ac95d7bd9f594b28360
 DIST windows_x86_64_gnu-0.42.1.crate 697614 BLAKE2B 3cef0a3da3ce142bbdf932dbb54eb6473070c5722c9ec791dc4077efe2d774d51f8b3d06b3321f8f21cc49764f44d54b3432ee7a0d9376925b422b197f5d557e SHA512 f4c16b587fe407dee1f39df029c52302a0fbd5f519816a8d974fe9c2f928043b14037c701c0f3c9cf2e5c765e82430fd4b71615fe63a66a88159f7b15506f892
 DIST windows_x86_64_gnullvm-0.42.1.crate 362788 BLAKE2B fff81e63b86ad04ce22ad3e05ec4cc02c0b791384c93bafb50832f6db9cb7fd9301ad3845339a08dd8cadac1d59f3e8dc9d5f56d7a987989dbfc16b9131af67b SHA512 8cc988b5995a4726bb7518b7fccff528274ad9b2b0160fe247eb240f9ced10db95afe7bff91bfc5a08ebd8237b6821e4a4abad1ff9da45022f1ce7e7586bcf05
 DIST windows_x86_64_msvc-0.42.1.crate 664606 BLAKE2B 6c460cfa392aad0d11add200d652a42ee1a60052570527c4e85405f765255375729d4e26287f5246dcad65fa89ccadea23c5135171b311e6da5027e33149c547 SHA512 a651b1a34f101125f929c1d1f5e933691c7a5c19d0bb0c501fb6812236d2771805428e3bd5e05be7d72715595f5fc9e7978dd7934e5d92e9b78a41c2ece695b2
-EBUILD bcachefs-tools-1.2_p20230813.ebuild 5580 BLAKE2B f221d49208f76a3e26ea862c26fd8b75dd0e8ce92242d0098de27f79784ec340bd0026c09d712e7d7060aa0a71c4a175291af931f347920f1d9e94b16979b89e SHA512 4b0415b9b47cd5f518dbad450de98529c9625206873d68bc451c28f98bed9e53b72b8c7881e1096c5972d60329f7eb6c0526e1b9f727f7acd827775c8160d156
-EBUILD bcachefs-tools-9999.ebuild 3514 BLAKE2B 4106c81feb8a879d7eda18d12e9101007c04cb1ff67b27331e05d383b549035ddfe2b1088f100f3dc98cd6559833e7fca2cb418defd7f4200435a622e69d9349 SHA512 4cb4d4673310d43c141ed7d9fa413065e2b15ce3f63fe3c87d05232144d7bf190e6d67b8edca6780d8b32df22d728277e27da0fbdd2105dd054537c4e93c5e82
+EBUILD bcachefs-tools-1.2_p20230813.ebuild 5819 BLAKE2B 9ee0ead2a1de12d09d83b84b897f642bb6b228cef70cfa27955a9d32c541c40073258125703e0568b4eb97070d8ff53d7d6b562e8859440d1af66f8f9f98d9b3 SHA512 50ec1c208fd5e8db98e3bed9b326ac93a7ed59a9c2fd53a996fca66439738b413befd73b9c22e3421d6d9f0dec931505a6b9f98c36dd5ffe02b36797b4d8d243
+EBUILD bcachefs-tools-9999.ebuild 3752 BLAKE2B 9f410de6dde603e5c409054163b3dd5a6af76a7e3aa738c00eaa23f044dcd34c063e5957d2ca5001f730225b67386fea45bd32e15acf111fe666c85c124752c5 SHA512 0e32fac298f9803eecb4f388fbeea837c1e3711bc98ed48062670fae0a7c00ea9cdfc7ee40b4939d87d8ed6d6cefa82905092579c9b8815c79ad70a3a63db540
 MISC metadata.xml 577 BLAKE2B dc7bd0022ed95397f18fd638d4417e848687fc6714a784c702a2889cc6b976ac046a5c688b68f3efbe54cbc7cfd78117778049c8519aa7db556b8b459a50be27 SHA512 e9c1566e2490665350e24689b2d9dfb9a653752e45a8018cbc982fa25842b3d6ae9af4046adf5caefc1d6389bee187e37cd3dcddb9c89d4b65620d1ee80e910e
diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-1.2_p20230813.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.2_p20230813.ebuild
index 35de8ac80ee3..5a6adc90c67f 100644
--- a/sys-fs/bcachefs-tools/bcachefs-tools-1.2_p20230813.ebuild
+++ b/sys-fs/bcachefs-tools/bcachefs-tools-1.2_p20230813.ebuild
@@ -117,9 +117,10 @@ declare -A GIT_CRATES=(
 	[bindgen]="https://gitlab.com/Matt.Jolly/rust-bindgen-bcachefs;f773267b090bf16b9e8375fcbdcd8ba5e88806a8;rust-bindgen-bcachefs-%commit%/bindgen"
 )
 
+LLVM_MAX_SLOT=17
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit cargo flag-o-matic multiprocessing python-any-r1 toolchain-funcs unpacker
+inherit cargo flag-o-matic llvm multiprocessing python-any-r1 toolchain-funcs unpacker
 
 DESCRIPTION="Tools for bcachefs"
 HOMEPAGE="https://bcachefs.org/"
@@ -153,6 +154,7 @@ DEPEND="
 
 RDEPEND="${DEPEND}"
 
+# Clang is required for bindgen
 BDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_any_dep '
@@ -163,10 +165,15 @@ BDEPEND="
 		)
 	')
 	$(unpacker_src_uri_depends)
-	sys-devel/clang
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1))
+	virtual/pkgconfig
 	virtual/rust
 "
 
+llvm_check_deps() {
+	has_version -b "sys-devel/clang:${LLVM_SLOT}"
+}
+
 python_check_deps() {
 	if use test; then
 		python_has_version \
@@ -177,12 +184,17 @@ python_check_deps() {
 
 }
 
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
 src_unpack() {
 	if [[ ${PV} == "9999" ]]; then
 		git-r3_src_unpack
 		S="${S}/rust-src" cargo_live_src_unpack
 	else
-		default
+		unpack ${P}.tar.gz
 		cargo_src_unpack
 	fi
 }
diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild
index e0dd0d66a627..b30dc1f3b7ae 100644
--- a/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild
+++ b/sys-fs/bcachefs-tools/bcachefs-tools-9999.ebuild
@@ -11,9 +11,10 @@ EAPI=8
 # 	[bindgen]="https://gitlab.com/Matt.Jolly/rust-bindgen-bcachefs;f773267b090bf16b9e8375fcbdcd8ba5e88806a8;rust-bindgen-bcachefs-%commit%/bindgen"
 # )
 
+LLVM_MAX_SLOT=17
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit cargo flag-o-matic multiprocessing python-any-r1 toolchain-funcs unpacker
+inherit cargo flag-o-matic llvm multiprocessing python-any-r1 toolchain-funcs unpacker
 
 DESCRIPTION="Tools for bcachefs"
 HOMEPAGE="https://bcachefs.org/"
@@ -34,6 +35,7 @@ IUSE="fuse test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
+	fuse? ( >=sys-fs/fuse-3.7.0 )
 	app-arch/lz4
 	dev-libs/libaio
 	dev-libs/libsodium
@@ -42,11 +44,11 @@ DEPEND="
 	sys-apps/util-linux
 	sys-libs/zlib
 	virtual/udev
-	fuse? ( >=sys-fs/fuse-3.7.0 )
 "
 
 RDEPEND="${DEPEND}"
 
+# Clang is required for bindgen
 BDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_any_dep '
@@ -57,10 +59,15 @@ BDEPEND="
 		)
 	')
 	$(unpacker_src_uri_depends)
-	sys-devel/clang
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1))
+	virtual/pkgconfig
 	virtual/rust
 "
 
+llvm_check_deps() {
+	has_version -b "sys-devel/clang:${LLVM_SLOT}"
+}
+
 python_check_deps() {
 	if use test; then
 		python_has_version \
@@ -68,7 +75,11 @@ python_check_deps() {
 			"dev-python/pytest-xdist[${PYTHON_USEDEP}]"
 	fi
 	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
+}
 
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
 }
 
 src_unpack() {
@@ -76,7 +87,7 @@ src_unpack() {
 		git-r3_src_unpack
 		S="${S}/rust-src" cargo_live_src_unpack
 	else
-		default
+		unpack ${P}.tar.gz
 		cargo_src_unpack
 	fi
 }
-- 
cgit v1.2.3