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 6D603158083 for ; Wed, 18 Sep 2024 13:12:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 63FD6E29B7; Wed, 18 Sep 2024 13:12:29 +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 495CAE29B7 for ; Wed, 18 Sep 2024 13:12:29 +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 643DA340813 for ; Wed, 18 Sep 2024 13:12:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ABA0B27F9 for ; Wed, 18 Sep 2024 13:12:24 +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: <1726664801.e89d4ca4685cebe751b5b366b84fef8d1a64656e.arsen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/elinks/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/elinks/elinks-9999.ebuild X-VCS-Directories: www-client/elinks/ X-VCS-Committer: arsen X-VCS-Committer-Name: Arsen Arsenović X-VCS-Revision: e89d4ca4685cebe751b5b366b84fef8d1a64656e X-VCS-Branch: master Date: Wed, 18 Sep 2024 13:12:24 +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: 02daf8f0-4214-41b1-8fce-43fb23521bed X-Archives-Hash: 21e6678055477cfec3347a6c04d98a1d commit: e89d4ca4685cebe751b5b366b84fef8d1a64656e Author: Alfred Wingate protonmail com> AuthorDate: Wed Aug 28 09:15:51 2024 +0000 Commit: Arsen Arsenović gentoo org> CommitDate: Wed Sep 18 13:06:41 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e89d4ca4 www-client/elinks: update live to use new guile mechanism Signed-off-by: Alfred Wingate protonmail.com> Signed-off-by: Arsen Arsenović gentoo.org> 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 64da492dfd2a..d29570aecef2 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() {