From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 910DA158042 for ; Sat, 9 Nov 2024 09:49:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B405CE0869; Sat, 9 Nov 2024 09:49:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9A408E0869 for ; Sat, 9 Nov 2024 09:49:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C558733BE32 for ; Sat, 9 Nov 2024 09:49:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 35C9C18DD for ; Sat, 9 Nov 2024 09:49:28 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1731145743.b673ae2f19d960de7afaaf77349822dfee2f91f5.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/librsvg/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-base/librsvg/librsvg-2.57.3-r1.ebuild gnome-base/librsvg/librsvg-2.57.3-r2.ebuild gnome-base/librsvg/librsvg-2.58.2-r1.ebuild X-VCS-Directories: gnome-base/librsvg/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b673ae2f19d960de7afaaf77349822dfee2f91f5 X-VCS-Branch: master Date: Sat, 9 Nov 2024 09:49:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6e01b070-2a38-4d30-a01d-cc6931b116fb X-Archives-Hash: ae77c5ff9e56030d42fe6f9fa900ceb7 commit: b673ae2f19d960de7afaaf77349822dfee2f91f5 Author: Sam James gentoo org> AuthorDate: Sat Nov 9 09:44:04 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sat Nov 9 09:49:03 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b673ae2f gnome-base/librsvg: fix phase definitions The issue here is the same as with libdovi. If we change the inherit order back to before 01ba4dc61965ef7658a24728841c04c9a1ce4871, 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 gentoo.org> ...vg-2.57.3-r1.ebuild => librsvg-2.57.3-r2.ebuild} | 21 +++++++++++++++++++++ gnome-base/librsvg/librsvg-2.58.2-r1.ebuild | 16 ++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/gnome-base/librsvg/librsvg-2.57.3-r1.ebuild b/gnome-base/librsvg/librsvg-2.57.3-r2.ebuild similarity index 96% rename from gnome-base/librsvg/librsvg-2.57.3-r1.ebuild rename to gnome-base/librsvg/librsvg-2.57.3-r2.ebuild index f6643f2a0d2d..c5a49fa7c29d 100644 --- a/gnome-base/librsvg/librsvg-2.57.3-r1.ebuild +++ b/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 index 68c84dd678aa..d29d3b02aa5c 100644 --- 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 }