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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9C275158046 for ; Sat, 12 Oct 2024 11:13:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D214FE2A1B; Sat, 12 Oct 2024 11:13:54 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B50A3E2A1B for ; Sat, 12 Oct 2024 11:13:54 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B8D15343264 for ; Sat, 12 Oct 2024 11:13:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0584F11DF for ; Sat, 12 Oct 2024 11:13:52 +0000 (UTC) From: "Arsen Arsenović" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arsen Arsenović" Message-ID: <1728731137.7d67a4bad8f1c8f54ec60edfba092851743b4e2c.arsen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-scheme/guile/guile-2.2.7-r101.ebuild dev-scheme/guile/guile-2.2.7-r102.ebuild X-VCS-Directories: dev-scheme/guile/ X-VCS-Committer: arsen X-VCS-Committer-Name: Arsen Arsenović X-VCS-Revision: 7d67a4bad8f1c8f54ec60edfba092851743b4e2c X-VCS-Branch: master Date: Sat, 12 Oct 2024 11:13:52 +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: 06fc0e17-402d-4fd2-bbe1-2f9f0c66d1f1 X-Archives-Hash: 4cddf6c72b77ffc43770ceb4a40fed0b commit: 7d67a4bad8f1c8f54ec60edfba092851743b4e2c Author: Arsen Arsenović gentoo org> AuthorDate: Sat Oct 12 11:04:00 2024 +0000 Commit: Arsen Arsenović gentoo org> CommitDate: Sat Oct 12 11:05:37 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d67a4ba dev-scheme/guile: fix PKG_CONFIG_PATH in 2.2 Closes: https://bugs.gentoo.org/941294 Signed-off-by: Arsen Arsenović gentoo.org> .../guile/{guile-2.2.7-r101.ebuild => guile-2.2.7-r102.ebuild} | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dev-scheme/guile/guile-2.2.7-r101.ebuild b/dev-scheme/guile/guile-2.2.7-r102.ebuild similarity index 93% rename from dev-scheme/guile/guile-2.2.7-r101.ebuild rename to dev-scheme/guile/guile-2.2.7-r102.ebuild index 5943491ede3e..1d15e85cfa4c 100644 --- a/dev-scheme/guile/guile-2.2.7-r101.ebuild +++ b/dev-scheme/guile/guile-2.2.7-r102.ebuild @@ -98,19 +98,23 @@ src_install() { # Move the pkg-config files to guile-data. In future versions, this # should be handled by --with-pkgconfigdir (patch waiting on # upstream). - local pcdir=/usr/share/guile-data/"${SLOT}" - mkdir -p "${ED}${pcdir}" || die + local datadir=/usr/share/guile-data/"${SLOT}" + local pcdir="${datadir}"/pkgconfig + mkdir -p "${ED}${datadir}" || die mv "${ED}"/usr/share/aclocal/guile{,-"${SLOT}"}.m4 || die mv "${ED}"/usr/$(get_libdir)/pkgconfig/ \ "${ED}/${pcdir}" || die + [[ -f "${pcdir}"/guile-2.2.pc ]] + assert "failed to install .pc file?" + guile_slot_info local major="$(ver_cut 1 "${SLOT}")" local minor="$(ver_cut 2 "${SLOT}")" local idx="$((99999-(major*1000+minor)))" newenvd - "50guile${idx}" <<-EOF - PKG_CONFIG_PATH="${datadir}/pkgconfig" + PKG_CONFIG_PATH="${pcdir}" INFOPATH="${GUILE_INFODIR}" EOF }