From e89d4ca4685cebe751b5b366b84fef8d1a64656e Mon Sep 17 00:00:00 2001 From: Alfred Wingate Date: Wed, 28 Aug 2024 12:15:51 +0300 Subject: [PATCH] www-client/elinks: update live to use new guile mechanism MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alfred Wingate Signed-off-by: Arsen Arsenović --- www-client/elinks/elinks-9999.ebuild | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild index 64da492dfd2a3..d29570aecef2c 100644 --- a/www-client/elinks/elinks-9999.ebuild +++ b/www-client/elinks/elinks-9999.ebuild @@ -3,10 +3,12 @@ EAPI=8 +GUILE_REQ_USE="deprecated" +GUILE_COMPAT=( 2-2 3-0 ) PYTHON_COMPAT=( python3_{10..12} ) LUA_COMPAT=( lua5-{1,2,3,4} luajit ) -inherit flag-o-matic meson lua-single python-single-r1 +inherit flag-o-matic guile-single meson lua-single python-single-r1 DESCRIPTION="Advanced and well-established text-mode web browser" HOMEPAGE="http://elinks.or.cz/" @@ -26,6 +28,7 @@ IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn" IUSE+=" javascript lua lzma +mouse nls nntp perl python samba ssl test tre unicode X xml zlib zstd" RESTRICT="!test? ( test )" REQUIRED_USE=" + guile? ( ${GUILE_REQUIRED_USE} ) lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} ) " @@ -37,7 +40,7 @@ RDEPEND=" gpm? ( >=sys-libs/gpm-1.20.0-r5 ) - guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) + guile? ( ${GUILE_DEPS} ) idn? ( net-dns/libidn2:= ) javascript? ( dev-cpp/libxmlpp:5.0 @@ -72,11 +75,16 @@ BDEPEND=" " pkg_setup() { + use guile && guile-single_pkg_setup use lua && lua-single_pkg_setup - use python && python-single-r1_pkg_setup } +src_prepare() { + default + use guile && guile_bump_sources +} + src_configure() { # This file is severely broken w.r.t. strict-aliasing and upstream acknowledges it: # https://github.com/rkd77/elinks/blob/d05ce90b35d82109aab320b490e3ca54aa6df057/src/util/lists.h#L14 @@ -168,6 +176,8 @@ src_install() { # elinks uses an internal copy of gettext which ships files that may # collide with the system's gettext (https://bugs.gentoo.org/635090) rm -f "${ED}"/usr/{share/locale/locale,lib/charset}.alias || die + + use guile && guile_unstrip_ccache } pkg_postinst() {