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 D68C81581D3 for ; Sun, 2 Jun 2024 00:55:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE9E0E29EC; Sun, 2 Jun 2024 00:55:11 +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 84701E29EC for ; Sun, 2 Jun 2024 00:55:11 +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 4498533BEB9 for ; Sun, 2 Jun 2024 00:55:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CD0311009 for ; Sun, 2 Jun 2024 00:55:08 +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: <1717289662.91e97ef23bc7cf5b6cec14cd326eba1d74305745.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/elinks/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/elinks/elinks-0.16.1.1-r3.ebuild www-client/elinks/elinks-9999.ebuild X-VCS-Directories: www-client/elinks/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 91e97ef23bc7cf5b6cec14cd326eba1d74305745 X-VCS-Branch: master Date: Sun, 2 Jun 2024 00:55:08 +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: ee0836d5-7bcd-4ed0-be0a-c88260358875 X-Archives-Hash: f6e3c51e767de2482836abcfbd18299d commit: 91e97ef23bc7cf5b6cec14cd326eba1d74305745 Author: Eli Schwartz gmail com> AuthorDate: Tue May 28 18:50:58 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jun 2 00:54:22 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91e97ef2 www-client/elinks: wire up the upstream support for python scripting Previously hard disabled, now available via USE=python. Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> ...links-9999.ebuild => elinks-0.16.1.1-r3.ebuild} | 23 ++++++++++++++-------- www-client/elinks/elinks-9999.ebuild | 15 ++++++++------ 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-0.16.1.1-r3.ebuild similarity index 91% copy from www-client/elinks/elinks-9999.ebuild copy to www-client/elinks/elinks-0.16.1.1-r3.ebuild index 7611b9f21af9..edfcfdf198e7 100644 --- a/www-client/elinks/elinks-9999.ebuild +++ b/www-client/elinks/elinks-0.16.1.1-r3.ebuild @@ -6,7 +6,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) LUA_COMPAT=( lua5-{1,2,3,4} luajit ) -inherit flag-o-matic meson lua-single python-any-r1 +inherit flag-o-matic meson lua-single python-single-r1 DESCRIPTION="Advanced and well-established text-mode web browser" HOMEPAGE="http://elinks.or.cz/" @@ -23,9 +23,12 @@ fi LICENSE="GPL-2" SLOT="0" IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn" -IUSE+=" javascript lua lzma +mouse nls nntp perl samba ssl test tre unicode X xml zlib zstd" +IUSE+=" javascript lua lzma +mouse nls nntp perl python samba ssl test tre unicode X xml zlib zstd" RESTRICT="!test? ( test )" -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} ) +" RDEPEND=" >=sys-libs/ncurses-5.2:=[unicode(+)] @@ -35,7 +38,7 @@ RDEPEND=" >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) - idn? ( net-dns/libidn2:= ) + idn? ( net-dns/libidn:= ) javascript? ( dev-cpp/libxmlpp:5.0 dev-lang/mujs:= @@ -43,6 +46,7 @@ RDEPEND=" lua? ( ${LUA_DEPS} ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} ) samba? ( net-fs/samba ) ssl? ( !gnutls? ( dev-libs/openssl:= ) @@ -60,18 +64,21 @@ RDEPEND=" DEPEND="${RDEPEND} X? ( x11-base/xorg-proto )" BDEPEND=" - ${PYTHON_DEPS} virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( - net-dns/libidn2 + net-dns/libidn ) " +PATCHES=( + "${FILESDIR}"/${PN}-0.16.1.1-perl-5.38.patch +) + pkg_setup() { use lua && lua-single_pkg_setup - python-any-r1_pkg_setup + use python && python-single-r1_pkg_setup } src_configure() { @@ -119,7 +126,7 @@ src_configure() { $(meson_use nls) $(meson_use nntp) $(meson_use perl) - -Dpython=false + $(meson_use python) -Dquickjs=false -Druby=false $(meson_use samba smb) diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild index 7611b9f21af9..5d89b59b7846 100644 --- a/www-client/elinks/elinks-9999.ebuild +++ b/www-client/elinks/elinks-9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) LUA_COMPAT=( lua5-{1,2,3,4} luajit ) -inherit flag-o-matic meson lua-single python-any-r1 +inherit flag-o-matic meson lua-single python-single-r1 DESCRIPTION="Advanced and well-established text-mode web browser" HOMEPAGE="http://elinks.or.cz/" @@ -23,9 +23,12 @@ fi LICENSE="GPL-2" SLOT="0" IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn" -IUSE+=" javascript lua lzma +mouse nls nntp perl samba ssl test tre unicode X xml zlib zstd" +IUSE+=" javascript lua lzma +mouse nls nntp perl python samba ssl test tre unicode X xml zlib zstd" RESTRICT="!test? ( test )" -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} ) +" RDEPEND=" >=sys-libs/ncurses-5.2:=[unicode(+)] @@ -43,6 +46,7 @@ RDEPEND=" lua? ( ${LUA_DEPS} ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} ) samba? ( net-fs/samba ) ssl? ( !gnutls? ( dev-libs/openssl:= ) @@ -60,7 +64,6 @@ RDEPEND=" DEPEND="${RDEPEND} X? ( x11-base/xorg-proto )" BDEPEND=" - ${PYTHON_DEPS} virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( @@ -71,7 +74,7 @@ BDEPEND=" pkg_setup() { use lua && lua-single_pkg_setup - python-any-r1_pkg_setup + use python && python-single-r1_pkg_setup } src_configure() { @@ -119,7 +122,7 @@ src_configure() { $(meson_use nls) $(meson_use nntp) $(meson_use perl) - -Dpython=false + $(meson_use python) -Dquickjs=false -Druby=false $(meson_use samba smb)