summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Jolly <kangie@gentoo.org>2024-11-04 17:24:14 +1000
committerMatt Jolly <kangie@gentoo.org>2024-11-09 16:25:41 +1000
commit01ba4dc61965ef7658a24728841c04c9a1ce4871 (patch)
treea2a6b927779e5990ff87ec4589373d1d89129a63 /gnome-base
parentprofiles: mask dev-lang/starlark-rust (diff)
downloadgentoo-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 'gnome-base')
-rw-r--r--gnome-base/librsvg/librsvg-2.57.3-r1.ebuild (renamed from gnome-base/librsvg/librsvg-2.57.3.ebuild)6
-rw-r--r--gnome-base/librsvg/librsvg-2.58.2-r1.ebuild (renamed from gnome-base/librsvg/librsvg-2.58.2.ebuild)12
2 files changed, 14 insertions, 4 deletions
diff --git a/gnome-base/librsvg/librsvg-2.57.3.ebuild b/gnome-base/librsvg/librsvg-2.57.3-r1.ebuild
index f58cadb63b5c..f6643f2a0d2d 100644
--- a/gnome-base/librsvg/librsvg-2.57.3.ebuild
+++ b/gnome-base/librsvg/librsvg-2.57.3-r1.ebuild
@@ -277,7 +277,10 @@ CRATES="
yeslogic-fontconfig-sys@4.0.1
"
-inherit cargo gnome2 multilib-minimal python-any-r1 rust-toolchain vala
+RUST_MAX_VER="1.79.0"
+RUST_USEDEP='${MULTILIB_USEDEP}'
+
+inherit multilib-minimal cargo gnome2 python-any-r1 rust-toolchain vala
DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME/librsvg"
@@ -312,7 +315,6 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
BDEPEND="
- >=virtual/rust-1.70.0[${MULTILIB_USEDEP}]
x11-libs/gdk-pixbuf
${PYTHON_DEPS}
$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
diff --git a/gnome-base/librsvg/librsvg-2.58.2.ebuild b/gnome-base/librsvg/librsvg-2.58.2-r1.ebuild
index fadc212ccc81..68c84dd678aa 100644
--- a/gnome-base/librsvg/librsvg-2.58.2.ebuild
+++ b/gnome-base/librsvg/librsvg-2.58.2-r1.ebuild
@@ -288,7 +288,11 @@ CRATES="
zune-inflate@0.2.54
"
-inherit cargo gnome2 multilib-minimal python-any-r1 rust-toolchain vala
+RUST_MAX_VER="1.79.0"
+RUST_MIN_VER="1.71.1"
+RUST_USEDEP='${MULTILIB_USEDEP}'
+
+inherit multilib-minimal cargo gnome2 python-any-r1 rust-toolchain vala
DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME/librsvg"
@@ -323,7 +327,6 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
BDEPEND="
- >=virtual/rust-1.70.0[${MULTILIB_USEDEP}]
x11-libs/gdk-pixbuf
${PYTHON_DEPS}
$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
@@ -341,6 +344,11 @@ QA_FLAGS_IGNORED="
usr/lib.*/librsvg.*
"
+pkg_setup() {
+ rust_pkg_setup
+ python-any-r1_pkg_setup
+}
+
src_prepare() {
use vala && vala_setup
gnome2_src_prepare