diff options
| author |   Matt Jolly <kangie@gentoo.org> | 2024-11-04 17:24:14 +1000 |
|---|---|---|
| committer | Matt Jolly <kangie@gentoo.org> | 2024-11-09 16:25:41 +1000 |
| commit | 01ba4dc61965ef7658a24728841c04c9a1ce4871 (patch) | |
| tree | a2a6b927779e5990ff87ec4589373d1d89129a63 /sys-apps/uutils-findutils | |
| parent | profiles: mask dev-lang/starlark-rust (diff) | |
| download | gentoo-01ba4dc61965ef7658a24728841c04c9a1ce4871.tar.gz gentoo-01ba4dc61965ef7658a24728841c04c9a1ce4871.tar.bz2 gentoo-01ba4dc61965ef7658a24728841c04c9a1ce4871.zip | |
*/*: update for slotted Rust
Tidyups:
- $(cargo_crate_uris)
- Rust BDEPENDS come from the eclass except in very rare
circumstances (RUST_OPTIONAL=1)
- RUST_M{AX,IN}_VER where required.
- Suboptimal crate separator (`-` -> `@`)
Signed-off-by: Matt Jolly <kangie@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/39218
Signed-off-by: Matt Jolly <kangie@gentoo.org>
Diffstat (limited to 'sys-apps/uutils-findutils')
| -rw-r--r-- | sys-apps/uutils-findutils/uutils-findutils-0.4.2-r1.ebuild | 15 | ||||
| -rw-r--r-- | sys-apps/uutils-findutils/uutils-findutils-0.5.0-r1.ebuild (renamed from sys-apps/uutils-findutils/uutils-findutils-0.5.0.ebuild) | 6 | ||||
| -rw-r--r-- | sys-apps/uutils-findutils/uutils-findutils-9999.ebuild | 3 |
3 files changed, 17 insertions, 7 deletions
diff --git a/sys-apps/uutils-findutils/uutils-findutils-0.4.2-r1.ebuild b/sys-apps/uutils-findutils/uutils-findutils-0.4.2-r1.ebuild index c31dd891b770..c4c8d32c12b0 100644 --- a/sys-apps/uutils-findutils/uutils-findutils-0.4.2-r1.ebuild +++ b/sys-apps/uutils-findutils/uutils-findutils-0.4.2-r1.ebuild @@ -176,8 +176,9 @@ declare -A GIT_CRATES=( [onig_sys]="https://github.com/rust-onig/rust-onig;fa90c0e97e90a056af89f183b23cd417b59ee6a2;rust-onig-%commit%/onig_sys" ) -LLVM_MAX_SLOT=17 -inherit cargo llvm +LLVM_COMPAT=( 17 ) + +inherit cargo llvm-r1 DESCRIPTION="GNU findutils rewritten in Rust" HOMEPAGE="https://uutils.github.io/findutils/ https://github.com/uutils/findutils" @@ -208,8 +209,9 @@ fi RDEPEND=">=dev-libs/oniguruma-6.9.9:=" DEPEND="${RDEPEND}" BDEPEND=" - <sys-devel/clang-$((LLVM_MAX_SLOT + 1)) - >=virtual/rust-1.56.0 + $(llvm_gen_dep ' + sys-devel/clang:${LLVM_SLOT} + ') " QA_FLAGS_IGNORED=".*" @@ -218,6 +220,11 @@ PATCHES=( "${WORKDIR}"/${PN}-0.4.2-update-crates.patch ) +pkg_setup() { + llvm-r1_pkg_setup + rust_pkg_setup +} + src_unpack() { if [[ ${PV} == 9999 ]] ; then git-r3_src_unpack diff --git a/sys-apps/uutils-findutils/uutils-findutils-0.5.0.ebuild b/sys-apps/uutils-findutils/uutils-findutils-0.5.0-r1.ebuild index 68631a51d6bf..6c03da24e81d 100644 --- a/sys-apps/uutils-findutils/uutils-findutils-0.5.0.ebuild +++ b/sys-apps/uutils-findutils/uutils-findutils-0.5.0-r1.ebuild @@ -166,11 +166,15 @@ BDEPEND=" $(llvm_gen_dep ' sys-devel/clang:${LLVM_SLOT} ') - >=virtual/rust-1.70 " QA_FLAGS_IGNORED=".*" +pkg_setup() { + llvm-r1_pkg_setup + rust_pkg_setup +} + src_unpack() { if [[ ${PV} == 9999 ]] ; then git-r3_src_unpack diff --git a/sys-apps/uutils-findutils/uutils-findutils-9999.ebuild b/sys-apps/uutils-findutils/uutils-findutils-9999.ebuild index 68631a51d6bf..f8a83a5773bb 100644 --- a/sys-apps/uutils-findutils/uutils-findutils-9999.ebuild +++ b/sys-apps/uutils-findutils/uutils-findutils-9999.ebuild @@ -133,7 +133,7 @@ CRATES=" " LLVM_COMPAT=( {17..18} ) -inherit cargo llvm-r1 +inherit llvm-r1 cargo DESCRIPTION="GNU findutils rewritten in Rust" HOMEPAGE="https://uutils.github.io/findutils/ https://github.com/uutils/findutils" @@ -166,7 +166,6 @@ BDEPEND=" $(llvm_gen_dep ' sys-devel/clang:${LLVM_SLOT} ') - >=virtual/rust-1.70 " QA_FLAGS_IGNORED=".*" |