Skip to content

Commit 1f35e60

Browse files
committed
eclass: Support rust.eclass and RUST_OPTIONAL as well
Closes: #714 Signed-off-by: Michał Górny <mgorny@gentoo.org> Closes: #718 Signed-off-by: Michał Górny <mgorny@gentoo.org>
1 parent e4bbab1 commit 1f35e60

7 files changed

Lines changed: 53 additions & 2 deletions

File tree

src/pkgcheck/checks/eclass.py

Lines changed: 3 additions & 2 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 use ``${RUST_DEPEND}``."""
519+
"""Package sets ``RUST_OPTIONAL`` but does not use ``${RUST_DEPEND}``."""
520520

521-
desc = "sets CARGO_OPTIONAL but does not use ${RUST_DEPEND}"
521+
desc = "sets RUST_OPTIONAL (or CARGO_OPTIONAL) but does not use ${RUST_DEPEND}"
522522

523523

524524
class TmpfilesMissingDeps(results.VersionResult, results.Warning):
@@ -543,6 +543,7 @@ class EclassManualDepsCheck(Check):
543543
dependencies = (
544544
# eclass, variable, one of deps, class
545545
("cargo", "CARGO_OPTIONAL", {"dev-lang/rust", "dev-lang/rust-bin"}, RustMissingDeps),
546+
("rust", "RUST_OPTIONAL", {"dev-lang/rust", "dev-lang/rust-bin"}, RustMissingDeps),
546547
("go-module", "GO_OPTIONAL", {"dev-lang/go"}, GoMissingDeps),
547548
(
548549
"ruby-ng",
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
{"__class__": "RustMissingDeps", "category": "EclassManualDepsCheck", "package": "RustMissingDeps", "version": "1"}
2+
{"__class__": "RustMissingDeps", "category": "EclassManualDepsCheck", "package": "RustMissingDeps", "version": "3"}
3+
{"__class__": "RustMissingDeps", "category": "EclassManualDepsCheck", "package": "RustMissingDeps", "version": "4"}

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,21 @@ diff -Naur standalone/EclassManualDepsCheck/RustMissingDeps/RustMissingDeps-1.eb
77
SLOT="0"
88
+
99
+BDEPEND="${RUST_DEPEND}"
10+
diff -Naur standalone/EclassManualDepsCheck/RustMissingDeps/RustMissingDeps-3.ebuild fixed/EclassManualDepsCheck/RustMissingDeps/RustMissingDeps-3.ebuild
11+
--- standalone/EclassManualDepsCheck/RustMissingDeps/RustMissingDeps-3.ebuild
12+
+++ fixed/EclassManualDepsCheck/RustMissingDeps/RustMissingDeps-3.ebuild
13+
@@ -8,3 +8,5 @@ DESCRIPTION="Optional inherit without deps"
14+
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
15+
LICENSE="BSD"
16+
SLOT="0"
17+
+
18+
+BDEPEND="${RUST_DEPEND}"
19+
diff -Naur standalone/EclassManualDepsCheck/RustMissingDeps/RustMissingDeps-4.ebuild fixed/EclassManualDepsCheck/RustMissingDeps/RustMissingDeps-4.ebuild
20+
--- standalone/EclassManualDepsCheck/RustMissingDeps/RustMissingDeps-4.ebuild
21+
+++ fixed/EclassManualDepsCheck/RustMissingDeps/RustMissingDeps-4.ebuild
22+
@@ -8,3 +8,5 @@ DESCRIPTION="Optional inherit without deps"
23+
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
24+
LICENSE="BSD"
25+
SLOT="0"
26+
+
27+
+BDEPEND="${RUST_DEPEND}"
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
inherit rust
2+
3+
DESCRIPTION="Normal non-optional inherit"
4+
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
5+
LICENSE="BSD"
6+
SLOT="0"
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
EAPI=7
2+
3+
RUST_OPTIONAL=1
4+
5+
inherit rust
6+
7+
DESCRIPTION="Optional inherit without deps"
8+
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
9+
LICENSE="BSD"
10+
SLOT="0"
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
EAPI=7
2+
3+
RUST_OPTIONAL=1
4+
5+
inherit cargo
6+
7+
DESCRIPTION="Optional inherit without deps"
8+
HOMEPAGE="https://github.com/pkgcore/pkgcheck"
9+
LICENSE="BSD"
10+
SLOT="0"

testdata/repos/standalone/eclass/cargo.eclass

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# cargo eclass
22

3+
if [[ -n ${CARGO_OPTIONAL} ]]; then
4+
RUST_OPTIONAL=1
5+
fi
6+
37
inherit rust
48

59
CARGO_CRATE_URIS=${CRATES}

0 commit comments

Comments
 (0)