From e4bbab1cd0cd5138799f6b15011c398e28181c38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 22 Nov 2024 16:58:22 +0100 Subject: [PATCH] eclass: Update for RUST_DEPEND MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- src/pkgcheck/checks/eclass.py | 6 +++--- .../EclassManualDepsCheck/RustMissingDeps/fix.patch | 2 +- .../dev-lang/rust-bin/rust-bin-1.81.0.ebuild | 4 ++++ .../dev-lang/rust-bin/rust-bin-1.82.0.ebuild | 4 ++++ .../repos/standalone/dev-lang/rust/rust-1.81.0.ebuild | 4 ++++ .../repos/standalone/dev-lang/rust/rust-1.82.0.ebuild | 4 ++++ testdata/repos/standalone/eclass/cargo.eclass | 2 ++ testdata/repos/standalone/eclass/rust.eclass | 10 ++++++++++ testdata/repos/standalone/virtual/rust/rust-0.ebuild | 2 -- 9 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 testdata/repos/standalone/dev-lang/rust-bin/rust-bin-1.81.0.ebuild create mode 100644 testdata/repos/standalone/dev-lang/rust-bin/rust-bin-1.82.0.ebuild create mode 100644 testdata/repos/standalone/dev-lang/rust/rust-1.81.0.ebuild create mode 100644 testdata/repos/standalone/dev-lang/rust/rust-1.82.0.ebuild create mode 100644 testdata/repos/standalone/eclass/rust.eclass delete mode 100644 testdata/repos/standalone/virtual/rust/rust-0.ebuild diff --git a/src/pkgcheck/checks/eclass.py b/src/pkgcheck/checks/eclass.py index 52bcea6ee..f806e50e5 100644 --- 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 index 08394782e..5d75114ec 100644 --- 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 new file mode 100644 index 000000000..2c6d46284 --- /dev/null +++ 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 new file mode 100644 index 000000000..2c6d46284 --- /dev/null +++ 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 new file mode 100644 index 000000000..2c6d46284 --- /dev/null +++ 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 new file mode 100644 index 000000000..2c6d46284 --- /dev/null +++ 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 index 217dc8e8d..04deb1f4e 100644 --- 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 new file mode 100644 index 000000000..b85f9bde8 --- /dev/null +++ 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 deleted file mode 100644 index 9c2ce2e95..000000000 --- a/testdata/repos/standalone/virtual/rust/rust-0.ebuild +++ /dev/null @@ -1,2 +0,0 @@ -DESCRIPTION="Stub ebuild" -SLOT="0"