commit: 91e97ef23bc7cf5b6cec14cd326eba1d74305745
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Tue May 28 18:50:58 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> 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 <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> 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)
