Skip to content

Commit e4bbab1

Browse files
committed
eclass: Update for RUST_DEPEND
Signed-off-by: Michał Górny <mgorny@gentoo.org>
1 parent c32c3d4 commit e4bbab1

9 files changed

Lines changed: 32 additions & 6 deletions

File tree

src/pkgcheck/checks/eclass.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -516,9 +516,9 @@ class RubyMissingDeps(results.VersionResult, results.Warning):
516516

517517

518518
class RustMissingDeps(results.VersionResult, results.Warning):
519-
"""Package sets ``CARGO_OPTIONAL`` but does not depend on ``virtual/rust``."""
519+
"""Package sets ``CARGO_OPTIONAL`` but does not use ``${RUST_DEPEND}``."""
520520

521-
desc = "sets CARGO_OPTIONAL but does not depend on virtual/rust"
521+
desc = "sets CARGO_OPTIONAL but does not use ${RUST_DEPEND}"
522522

523523

524524
class TmpfilesMissingDeps(results.VersionResult, results.Warning):
@@ -542,7 +542,7 @@ class EclassManualDepsCheck(Check):
542542

543543
dependencies = (
544544
# eclass, variable, one of deps, class
545-
("cargo", "CARGO_OPTIONAL", {"virtual/rust"}, RustMissingDeps),
545+
("cargo", "CARGO_OPTIONAL", {"dev-lang/rust", "dev-lang/rust-bin"}, RustMissingDeps),
546546
("go-module", "GO_OPTIONAL", {"dev-lang/go"}, GoMissingDeps),
547547
(
548548
"ruby-ng",

testdata/data/repos/standalone/EclassManualDepsCheck/RustMissingDeps/fix.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ diff -Naur standalone/EclassManualDepsCheck/RustMissingDeps/RustMissingDeps-1.eb
66
LICENSE="BSD"
77
SLOT="0"
88
+
9-
+BDEPEND="virtual/rust"
9+
+BDEPEND="${RUST_DEPEND}"
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
DESCRIPTION="Stub ebuild"
2+
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
3+
LICENSE="BSD"
4+
SLOT="${PV}"
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
DESCRIPTION="Stub ebuild"
2+
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
3+
LICENSE="BSD"
4+
SLOT="${PV}"
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
DESCRIPTION="Stub ebuild"
2+
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
3+
LICENSE="BSD"
4+
SLOT="${PV}"
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
DESCRIPTION="Stub ebuild"
2+
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
3+
LICENSE="BSD"
4+
SLOT="${PV}"
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# cargo eclass
22

3+
inherit rust
4+
35
CARGO_CRATE_URIS=${CRATES}
46

57
cargo_crate_uris() { :; }
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# rust eclass
2+
3+
RUST_DEPEND="
4+
|| (
5+
dev-lang/rust-bin:1.82.0
6+
dev-lang/rust:1.82.0
7+
dev-lang/rust-bin:1.81.0
8+
dev-lang/rust:1.81.0
9+
)
10+
"

testdata/repos/standalone/virtual/rust/rust-0.ebuild

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)