commit:     25c713f7264fb444a1107193f1079077e4172cb4
Author:     idealseal <realidealseal <AT> protonmail <DOT> com>
AuthorDate: Fri Jan  3 13:43:41 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 04:21:40 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25c713f7

dev-util/pkgcruft: properly setup bindgen environment

The bindgen crate requires LIBCLANG_PATH which is setup by the llvm
eclasses.

Signed-off-by: idealseal <realidealseal <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/39959
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/pkgcruft/pkgcruft-0.0.4.ebuild | 14 +++++++++++---
 dev-util/pkgcruft/pkgcruft-0.0.6.ebuild | 14 +++++++++++---
 dev-util/pkgcruft/pkgcruft-0.0.8.ebuild | 14 +++++++++++---
 dev-util/pkgcruft/pkgcruft-9999.ebuild  |  2 +-
 4 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/dev-util/pkgcruft/pkgcruft-0.0.4.ebuild 
b/dev-util/pkgcruft/pkgcruft-0.0.4.ebuild
index e97e461b06d5..7e174520f16f 100644
--- a/dev-util/pkgcruft/pkgcruft-0.0.4.ebuild
+++ b/dev-util/pkgcruft/pkgcruft-0.0.4.ebuild
@@ -1,12 +1,13 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 CRATES=" "
+LLVM_COMPAT=( {17..19} )
 RUST_MIN_VER="1.80.0"
 
-inherit cargo edo flag-o-matic toolchain-funcs
+inherit cargo edo flag-o-matic llvm-r2 toolchain-funcs
 
 DESCRIPTION="QA library and tools based on pkgcraft"
 HOMEPAGE="https://pkgcraft.github.io/";
@@ -33,12 +34,19 @@ RESTRICT="!test? ( test )"
 
 # clang needed for bindgen
 BDEPEND+="
-       llvm-core/clang
+       $(llvm_gen_dep '
+               llvm-core/clang:${LLVM_SLOT}
+       ')
        test? ( dev-util/cargo-nextest )
 "
 
 QA_FLAGS_IGNORED="usr/bin/pkgcruft"
 
+pkg_setup() {
+       llvm-r2_pkg_setup
+       rust_pkg_setup
+}
+
 src_unpack() {
        if [[ ${PV} == 9999 ]] ; then
                git-r3_src_unpack

diff --git a/dev-util/pkgcruft/pkgcruft-0.0.6.ebuild 
b/dev-util/pkgcruft/pkgcruft-0.0.6.ebuild
index e97e461b06d5..7e174520f16f 100644
--- a/dev-util/pkgcruft/pkgcruft-0.0.6.ebuild
+++ b/dev-util/pkgcruft/pkgcruft-0.0.6.ebuild
@@ -1,12 +1,13 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 CRATES=" "
+LLVM_COMPAT=( {17..19} )
 RUST_MIN_VER="1.80.0"
 
-inherit cargo edo flag-o-matic toolchain-funcs
+inherit cargo edo flag-o-matic llvm-r2 toolchain-funcs
 
 DESCRIPTION="QA library and tools based on pkgcraft"
 HOMEPAGE="https://pkgcraft.github.io/";
@@ -33,12 +34,19 @@ RESTRICT="!test? ( test )"
 
 # clang needed for bindgen
 BDEPEND+="
-       llvm-core/clang
+       $(llvm_gen_dep '
+               llvm-core/clang:${LLVM_SLOT}
+       ')
        test? ( dev-util/cargo-nextest )
 "
 
 QA_FLAGS_IGNORED="usr/bin/pkgcruft"
 
+pkg_setup() {
+       llvm-r2_pkg_setup
+       rust_pkg_setup
+}
+
 src_unpack() {
        if [[ ${PV} == 9999 ]] ; then
                git-r3_src_unpack

diff --git a/dev-util/pkgcruft/pkgcruft-0.0.8.ebuild 
b/dev-util/pkgcruft/pkgcruft-0.0.8.ebuild
index 85344d2bb45f..f48c110f0cab 100644
--- a/dev-util/pkgcruft/pkgcruft-0.0.8.ebuild
+++ b/dev-util/pkgcruft/pkgcruft-0.0.8.ebuild
@@ -1,12 +1,13 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 CRATES=" "
+LLVM_COMPAT=( {17..19} )
 RUST_MIN_VER="1.82.0"
 
-inherit cargo edo flag-o-matic shell-completion toolchain-funcs
+inherit cargo edo flag-o-matic llvm-r2 shell-completion toolchain-funcs
 
 DESCRIPTION="QA library and tools based on pkgcraft"
 HOMEPAGE="https://pkgcraft.github.io/";
@@ -33,12 +34,19 @@ RESTRICT="!test? ( test )"
 
 # clang needed for bindgen
 BDEPEND+="
-       llvm-core/clang
+       $(llvm_gen_dep '
+               llvm-core/clang:${LLVM_SLOT}
+       ')
        test? ( dev-util/cargo-nextest )
 "
 
 QA_FLAGS_IGNORED="usr/bin/pkgcruft"
 
+pkg_setup() {
+       llvm-r2_pkg_setup
+       rust_pkg_setup
+}
+
 src_unpack() {
        if [[ ${PV} == 9999 ]] ; then
                git-r3_src_unpack

diff --git a/dev-util/pkgcruft/pkgcruft-9999.ebuild 
b/dev-util/pkgcruft/pkgcruft-9999.ebuild
index 85344d2bb45f..2b67b397868f 100644
--- a/dev-util/pkgcruft/pkgcruft-9999.ebuild
+++ b/dev-util/pkgcruft/pkgcruft-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

Reply via email to