eclass: Update for RUST_DEPEND

Signed-off-by: Michał Górny <[email protected]>
pkgcore · Nov 22, 2024 · e4bbab1 · e4bbab1
1 parent c32c3d4
commit e4bbab1
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 6 deletions.
diff --git a/src/pkgcheck/checks/eclass.py b/src/pkgcheck/checks/eclass.py
@@ -516,9 +516,9 @@ class RubyMissingDeps(results.VersionResult, results.Warning):
 
 
 class RustMissingDeps(results.VersionResult, results.Warning):
-    """Package sets ``CARGO_OPTIONAL`` but does not depend on ``virtual/rust``."""
+    """Package sets ``CARGO_OPTIONAL`` but does not use ``${RUST_DEPEND}``."""
 
-    desc = "sets CARGO_OPTIONAL but does not depend on virtual/rust"
+    desc = "sets CARGO_OPTIONAL but does not use ${RUST_DEPEND}"
 
 
 class TmpfilesMissingDeps(results.VersionResult, results.Warning):
@@ -542,7 +542,7 @@ class EclassManualDepsCheck(Check):
 
     dependencies = (
         # eclass, variable, one of deps, class
-        ("cargo", "CARGO_OPTIONAL", {"virtual/rust"}, RustMissingDeps),
+        ("cargo", "CARGO_OPTIONAL", {"dev-lang/rust", "dev-lang/rust-bin"}, RustMissingDeps),
         ("go-module", "GO_OPTIONAL", {"dev-lang/go"}, GoMissingDeps),
         (
             "ruby-ng",

diff --git a/testdata/data/repos/standalone/EclassManualDepsCheck/RustMissingDeps/fix.patch b/testdata/data/repos/standalone/EclassManualDepsCheck/RustMissingDeps/fix.patch
@@ -6,4 +6,4 @@ diff -Naur standalone/EclassManualDepsCheck/RustMissingDeps/RustMissingDeps-1.eb
  LICENSE="BSD"
  SLOT="0"
 +
-+BDEPEND="virtual/rust"
++BDEPEND="${RUST_DEPEND}"
diff --git a/testdata/repos/standalone/dev-lang/rust-bin/rust-bin-1.81.0.ebuild b/testdata/repos/standalone/dev-lang/rust-bin/rust-bin-1.81.0.ebuild
@@ -0,0 +1,4 @@
+DESCRIPTION="Stub ebuild"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+LICENSE="BSD"
+SLOT="${PV}"
diff --git a/testdata/repos/standalone/dev-lang/rust-bin/rust-bin-1.82.0.ebuild b/testdata/repos/standalone/dev-lang/rust-bin/rust-bin-1.82.0.ebuild
@@ -0,0 +1,4 @@
+DESCRIPTION="Stub ebuild"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+LICENSE="BSD"
+SLOT="${PV}"
diff --git a/testdata/repos/standalone/dev-lang/rust/rust-1.81.0.ebuild b/testdata/repos/standalone/dev-lang/rust/rust-1.81.0.ebuild
@@ -0,0 +1,4 @@
+DESCRIPTION="Stub ebuild"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+LICENSE="BSD"
+SLOT="${PV}"
diff --git a/testdata/repos/standalone/dev-lang/rust/rust-1.82.0.ebuild b/testdata/repos/standalone/dev-lang/rust/rust-1.82.0.ebuild
@@ -0,0 +1,4 @@
+DESCRIPTION="Stub ebuild"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+LICENSE="BSD"
+SLOT="${PV}"
diff --git a/testdata/repos/standalone/eclass/cargo.eclass b/testdata/repos/standalone/eclass/cargo.eclass
@@ -1,5 +1,7 @@
 # cargo eclass
 
+inherit rust
+
 CARGO_CRATE_URIS=${CRATES}
 
 cargo_crate_uris() { :; }
diff --git a/testdata/repos/standalone/eclass/rust.eclass b/testdata/repos/standalone/eclass/rust.eclass
@@ -0,0 +1,10 @@
+# rust eclass
+
+RUST_DEPEND="
+	|| (
+		dev-lang/rust-bin:1.82.0
+		dev-lang/rust:1.82.0
+		dev-lang/rust-bin:1.81.0
+		dev-lang/rust:1.81.0
+	)
+"
diff --git a/testdata/repos/standalone/virtual/rust/rust-0.ebuild b/testdata/repos/standalone/virtual/rust/rust-0.ebuild