gnome-base/librsvg: fix phase definitions

The issue here is the same as with libdovi. If we change the inherit order back to before 01ba4dc, then MULTILIB_USEDEP isn't defined so rust.eclass can't use it for generating the multilib dep on Rust itself. Also, add a missing rust_pkg_setup call in 2.57.3. Bug: https://bugs.gentoo.org/943110 Signed-off-by: Sam James <[email protected]>
hlein · Nov 9, 2024 · b673ae2 · b673ae2
1 parent 67175ee
commit b673ae2
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 0 deletions.
diff --git a/gnome-base/librsvg/librsvg-2.57.3-r1.ebuild → gnome-base/librsvg/librsvg-2.57.3-r2.ebuild b/gnome-base/librsvg/librsvg-2.57.3-r1.ebuild → gnome-base/librsvg/librsvg-2.57.3-r2.ebuild
@@ -332,11 +332,20 @@ 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
 }
 
+src_configure() {
+	multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
 	local myconf=(
 		--disable-static
@@ -365,10 +374,22 @@ multilib_src_configure() {
 	fi
 }
 
+src_compile() {
+	multilib-minimal_src_compile
+}
+
 multilib_src_compile() {
 	gnome2_src_compile
 }
 
+src_test() {
+	multilib-minimal_src_test
+}
+
+src_install() {
+	multilib-minimal_src_install
+}
+
 multilib_src_install() {
 	gnome2_src_install
 }

diff --git a/gnome-base/librsvg/librsvg-2.58.2-r1.ebuild b/gnome-base/librsvg/librsvg-2.58.2-r1.ebuild
@@ -354,6 +354,10 @@ src_prepare() {
 	gnome2_src_prepare
 }
 
+src_configure() {
+	multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
 	local myconf=(
 		--disable-static
@@ -382,10 +386,22 @@ multilib_src_configure() {
 	fi
 }
 
+src_compile() {
+	multilib-minimal_src_compile
+}
+
 multilib_src_compile() {
 	gnome2_src_compile
 }
 
+src_test() {
+	multilib-minimal_src_test
+}
+
+src_install() {
+	multilib-minimal_src_install
+}
+
 multilib_src_install() {
 	gnome2_src_install
 }