commit: 7d67a4bad8f1c8f54ec60edfba092851743b4e2c Author: Arsen Arsenović <arsen <AT> gentoo <DOT> org> AuthorDate: Sat Oct 12 11:04:00 2024 +0000 Commit: Arsen Arsenović <arsen <AT> gentoo <DOT> 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ć <arsen <AT> 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 }
