commit: 10a1ce19538cb5ac8bd9f84508afd0765cf74115
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 15 12:05:11 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 15 12:07:39 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10a1ce19
www-client/elinks: drop 0.17.1.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
www-client/elinks/Manifest | 1 -
www-client/elinks/elinks-0.17.1.1.ebuild | 211 ---------------------
.../elinks/files/elinks-0.17.1.1-gettext.patch | 73 -------
www-client/elinks/files/elinks-0.17.1.1-sftp.patch | 181 ------------------
4 files changed, 466 deletions(-)
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index e17a01b55f1e..2e1ff074f8aa 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,2 +1 @@
-DIST elinks-0.17.1.1.tar.xz 2001036 BLAKE2B
2158e7630e64977b5250d544159bff0b90953ef7d51870d5e96ce8e36858596e6341bf774ad1717ed4808859d4be316fe75587552e61a8bbfcb00a0366a85e81
SHA512
7ad78f7d6a43341ae252c29f0c338e466cbedf8b40aefa9fa1939dbc62a9c9307b0a423b17181fce3bce1364fe6b6bdb80509ed90719965de174c9258b90902f
DIST elinks-0.18.0.tar.xz 2078656 BLAKE2B
84ad13a1f374d85bb74d57fe905df4f2f1d062acb89a43197e0f0767cce3779749f4cee7ad15655fe35bc6545799b5f8264498f05a47eca6cb571541e3bcef1c
SHA512
e0ff737e06d4b591d362257b9a375b938f9d6222cf6ee4df2065c7b47f883a5eacf76dabae8fc7c0b32cf9b7df56267752217d6999b0ae24c2482763b5b0ccb9
diff --git a/www-client/elinks/elinks-0.17.1.1.ebuild
b/www-client/elinks/elinks-0.17.1.1.ebuild
deleted file mode 100644
index a93beb9eacbc..000000000000
--- a/www-client/elinks/elinks-0.17.1.1.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-GUILE_REQ_USE="deprecated"
-GUILE_COMPAT=( 2-2 3-0 )
-PYTHON_COMPAT=( python3_{11..13} )
-LUA_COMPAT=( lua5-{1,2,3,4} luajit )
-
-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/";
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/rkd77/felinks";
- inherit git-r3
-else
-
SRC_URI="https://github.com/rkd77/elinks/releases/download/v${PV}/${P}.tar.xz";
-
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="bittorrent brotli bzip2 debug finger ftp gemini gopher gpm gnutls guile
idn"
-IUSE+=" javascript libcss 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} )
- javascript? ( libcss )
- lua? ( ${LUA_REQUIRED_USE} )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
- >=sys-libs/ncurses-5.2:=[unicode(+)]
- brotli? ( app-arch/brotli:= )
- bzip2? ( >=app-arch/bzip2-1.0.2 )
- gpm? (
- >=sys-libs/gpm-1.20.0-r5
- )
- guile? ( ${GUILE_DEPS} )
- idn? ( net-dns/libidn2:= )
- javascript? (
- dev-cpp/libxmlpp:5.0
- dev-lang/mujs:=
- )
- libcss? (
- >=dev-libs/libcss-0.9.2
- >=net-libs/libdom-0.4.2
- )
- lua? ( ${LUA_DEPS} )
- lzma? ( app-arch/xz-utils )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- samba? ( net-fs/samba )
- ssl? (
- !gnutls? ( dev-libs/openssl:= )
- gnutls? ( net-libs/gnutls:= )
- )
- tre? ( dev-libs/tre )
- X? (
- x11-libs/libX11
- x11-libs/libXt
- )
- xml? ( >=dev-libs/expat-1.95.4 )
- zlib? ( >=virtual/zlib-1.1.4:= )
- zstd? ( app-arch/zstd:= )
-"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )"
-BDEPEND="
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? (
- net-dns/libidn
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-gettext.patch
- "${FILESDIR}"/${P}-sftp.patch
-)
-
-pkg_setup() {
- use guile && guile-single_pkg_setup
- use lua && lua-single_pkg_setup
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
- use guile && guile_bump_sources
- python_fix_shebang .
-
- # https://bugs.gentoo.org/show_bug.cgi?id=942286
- sed -i -e '/find_library/s/, dirs: \[[^]]*\]//' \
- meson.build || die
-}
-
-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
- #
https://github.com/rkd77/elinks/blob/d05ce90b35d82109aab320b490e3ca54aa6df057/src/meson.build#L44
- #
- # Although they force fno-strict-aliasing, they do so inconsistently
and not for the testsuite (!!!).
- # Just add it again.
- #
- # DO not trust the LTO either.
- append-flags -fno-strict-aliasing
- filter-lto
-
- local emesonargs=(
- -Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
- -Dhtmldoc=false
- -Dpdfdoc=false
- -Dapidoc=false
- -D88-colors=true
- -D256-colors=true
- $(meson_use bittorrent)
- $(meson_use brotli)
- $(meson_use bzip2 bzlib)
- $(usex debug '-Ddebug=true' '-Dfastmem=true')
- $(meson_use finger)
- $(meson_use ftp)
- -Dfsp=false
- $(meson_use gemini)
- $(meson_use nls gettext)
- $(meson_use gopher)
- $(meson_use gpm)
- $(meson_use guile)
- -Dgssapi=false
- -Dhtml-highlight=true
- $(meson_use idn)
- $(meson_use javascript mujs)
- -Dipv6=true
- -Dleds=true
- $(meson_use libcss)
- -Dlibev=false
- -Dlibevent=false
- -Dluapkg=$(usex lua ${ELUA:-0} '')
- $(meson_use lzma)
- $(meson_use mouse)
- $(meson_use nls)
- $(meson_use nntp)
- $(meson_use perl)
- $(meson_use python)
- -Dquickjs=false
- -Druby=false
- $(meson_use samba smb)
- -Dsm-scripting=false
- -Dspidermonkey=false
- -Dterminfo=true
- $(meson_use test)
- $(meson_use tre)
- -Dtrue-color=true
- $(meson_use xml xbel)
- $(meson_use X x)
- $(meson_use zlib)
- $(meson_use zstd)
- )
-
- if use ssl ; then
- if use gnutls ; then
- emesonargs+=( -Dgnutls=true )
- else
- emesonargs+=( -Dopenssl=true)
- fi
- else
- emesonargs+=( -Dgnutls=false -Dopenssl=false )
- fi
-
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- insinto /etc/elinks
- newins contrib/keybind-full.conf keybind-full.sample
- newins contrib/keybind.conf keybind.conf.sample
-
- dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README.md SITES THANKS TODO
doc/*.*
- docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*}
- docinto contrib/lua ; dodoc contrib/lua/{*.lua,elinks-remote}
- docinto contrib/conv ; dodoc contrib/conv/*.*
- docinto contrib/guile ; dodoc contrib/guile/*.scm
-
- # 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() {
- elog "If upgrading from a version prior to 0.17.0, you will need to
move"
- elog "your configuration from ~/.elinks to \${XDG_CONFIG_HOME}/elinks"
- elog
- elog "You may want to convert your html.cfg and links.cfg of"
- elog "Links or older ELinks versions to the new ELinks elinks.conf"
- elog "using
${EROOT}/usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"
- elog
- elog "Please have a look at ${EROOT}/etc/elinks/keybind-full.sample and"
- elog "${EROOT}/etc/elinks/keybind.conf.sample for some bindings
examples."
- elog
- elog "You will have to set your TERM variable to 'xterm-256color'"
- elog "to be able to use 256 colors in elinks."
-}
diff --git a/www-client/elinks/files/elinks-0.17.1.1-gettext.patch
b/www-client/elinks/files/elinks-0.17.1.1-gettext.patch
deleted file mode 100644
index 32ab21b64cdb..000000000000
--- a/www-client/elinks/files/elinks-0.17.1.1-gettext.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-commit 8a7413665f7e9a6ca135c79486f0277f0dde9f7a
-Author: Witold Filipczyk <[email protected]>
-Date: Wed Sep 11 09:34:16 2024 +0200
-
- [meson] Detect if gettext has _nl_msg_cat_cntr . Refs #325
-
-diff --git a/config2.h.in b/config2.h.in
-index 41f2552a..1e6e138d 100644
---- a/config2.h.in
-+++ b/config2.h.in
-@@ -616,6 +616,9 @@
- file. */
- #mesondefine HAVE_NSS_COMPAT_OSSL_NSS_COMPAT_OSSL_H
-
-+/* Define to 1 if gettext has _nl_msg_cat_cntr */
-+#mesondefine HAVE_NL_MSG_CAT_CNTR
-+
- /* Define if you have off_t */
- #mesondefine HAVE_OFF_T
-
-diff --git a/meson.build b/meson.build
-index e0e4d634..572b5e0e 100644
---- a/meson.build
-+++ b/meson.build
-@@ -987,6 +987,16 @@ if compiler.compiles('int a; typeof(a) b;')
- conf_data.set('HAVE_TYPEOF', 1)
- endif
-
-+if conf_data.get('CONFIG_GETTEXT') and conf_data.get('CONFIG_NLS')
-+ code = '''#include <libintl.h>
-+ extern int _nl_msg_cat_cntr;
-+ void main() { _nl_msg_cat_cntr = 1; }
-+ '''
-+ if compiler.links(code, name: 'test')
-+ conf_data.set('HAVE_NL_MSG_CAT_CNTR', 1)
-+ endif
-+endif
-+
- conf_data.set('ICONV_CONST', true)
-
- sysconfdir = get_option('prefix') / get_option('sysconfdir')/'elinks'
-diff --git a/src/intl/libintl.c b/src/intl/libintl.c
-index f07c538d..a30d4ab8 100644
---- a/src/intl/libintl.c
-+++ b/src/intl/libintl.c
-@@ -217,8 +217,12 @@ set_language(int language)
- }
- }
- env_set("LANGUAGE", LANGUAGE, -1);
--
-- _nl_msg_cat_cntr++;
-+ {
-+#ifdef HAVE_NL_MSG_CAT_CNTR
-+ extern int _nl_msg_cat_cntr;
-+ _nl_msg_cat_cntr++;
-+#endif
-+ }
- }
-
- static void
-diff --git a/src/intl/libintl.h b/src/intl/libintl.h
-index 324fe79f..c07e6e10 100644
---- a/src/intl/libintl.h
-+++ b/src/intl/libintl.h
-@@ -13,8 +13,6 @@ extern "C" {
- extern struct module gettext_module;
-
- #ifdef CONFIG_GETTEXT
--extern int _nl_msg_cat_cntr;
--
- #include <libintl.h>
-
- extern int current_charset;
diff --git a/www-client/elinks/files/elinks-0.17.1.1-sftp.patch
b/www-client/elinks/files/elinks-0.17.1.1-sftp.patch
deleted file mode 100644
index f756cf5e2d5d..000000000000
--- a/www-client/elinks/files/elinks-0.17.1.1-sftp.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-Combination of upstream commits:
-1f0ee66aecbb52f8c423128aa7e0dd35822e989c
-a198d2da3cf958d7c1de3bc02a2ea49c25a3f785
-
---- a/src/protocol/curl/ftp.c
-+++ b/src/protocol/curl/ftp.c
-@@ -55,6 +55,8 @@
- #include "util/memory.h"
- #include "util/string.h"
-
-+#ifdef CONFIG_FTP
-+
- static char el_curlversion[256];
-
- static void
-@@ -616,7 +618,7 @@
- abort_connection(conn, connection_state(S_OK));
- }
-
--static void
-+void
- ftp_curl_handle_error(struct connection *conn, CURLcode res)
- {
- if (res == CURLE_OK) {
-@@ -635,45 +637,6 @@
- abort_connection(conn, connection_state(S_CURL_ERROR - res));
- }
-
--/* Check for completed transfers, and remove their easy handles */
--void
--check_multi_info(GlobalInfo *g)
--{
-- //char *eff_url;
-- CURLMsg *msg;
-- int msgs_left;
-- struct connection *conn;
-- CURL *easy;
-- CURLcode res;
--
-- //fprintf(stderr, "REMAINING: %d\n", g->still_running);
--
-- while ((msg = curl_multi_info_read(g->multi, &msgs_left))) {
-- if (msg->msg == CURLMSG_DONE) {
-- easy = msg->easy_handle;
-- res = msg->data.result;
-- curl_easy_getinfo(easy, CURLINFO_PRIVATE, &conn);
--
-- if (conn->uri->protocol == PROTOCOL_HTTP ||
conn->uri->protocol == PROTOCOL_HTTPS) {
-- http_curl_handle_error(conn, res);
-- continue;
-- }
--
-- if (conn->uri->protocol == PROTOCOL_FTP ||
conn->uri->protocol == PROTOCOL_FTPES || conn->uri->protocol == PROTOCOL_SFTP) {
-- ftp_curl_handle_error(conn, res);
-- continue;
-- } else {
-- abort_connection(conn, connection_state(S_OK));
-- }
-- }
-- }
--#if 0
-- if (g->still_running == 0 && g->stopped) {
-- event_base_loopbreak(g->evbase);
-- }
--#endif
--}
--
- void
- ftpes_protocol_handler(struct connection *conn)
- {
-@@ -689,3 +652,4 @@
- do_ftpes(conn);
- }
- }
-+#endif
-\ No newline at end of file
---- a/src/protocol/curl/ftpes.h
-+++ b/src/protocol/curl/ftpes.h
-@@ -1,6 +1,10 @@
- #ifndef EL__PROTOCOL_CURL_FTPES_H
- #define EL__PROTOCOL_CURL_FTPES_H
-
-+#ifdef CONFIG_LIBCURL
-+#include <curl/curl.h>
-+#endif
-+
- #include "main/module.h"
- #include "protocol/protocol.h"
-
-@@ -12,6 +16,7 @@
-
- #if defined(CONFIG_FTP) && defined(CONFIG_LIBCURL)
- extern protocol_handler_T ftpes_protocol_handler;
-+void ftp_curl_handle_error(struct connection *conn, CURLcode res);
- #else
- #define ftpes_protocol_handler NULL
- #endif
---- a/src/protocol/curl/http.c
-+++ b/src/protocol/curl/http.c
-@@ -461,3 +461,45 @@
- do_http(conn);
- }
- }
-+
-+/* Check for completed transfers, and remove their easy handles */
-+void
-+check_multi_info(GlobalInfo *g)
-+{
-+ //char *eff_url;
-+ CURLMsg *msg;
-+ int msgs_left;
-+ struct connection *conn;
-+ CURL *easy;
-+ CURLcode res;
-+
-+ //fprintf(stderr, "REMAINING: %d\n", g->still_running);
-+
-+ while ((msg = curl_multi_info_read(g->multi, &msgs_left))) {
-+ if (msg->msg == CURLMSG_DONE) {
-+ easy = msg->easy_handle;
-+ res = msg->data.result;
-+ curl_easy_getinfo(easy, CURLINFO_PRIVATE, &conn);
-+
-+ if (conn->uri->protocol == PROTOCOL_HTTP ||
conn->uri->protocol == PROTOCOL_HTTPS) {
-+ http_curl_handle_error(conn, res);
-+ continue;
-+ }
-+
-+#ifdef CONFIG_FTP
-+ if (conn->uri->protocol == PROTOCOL_FTP ||
conn->uri->protocol == PROTOCOL_FTPES || conn->uri->protocol == PROTOCOL_SFTP) {
-+ ftp_curl_handle_error(conn, res);
-+ continue;
-+ }
-+#endif
-+ else {
-+ abort_connection(conn, connection_state(S_OK));
-+ }
-+ }
-+ }
-+#if 0
-+ if (g->still_running == 0 && g->stopped) {
-+ event_base_loopbreak(g->evbase);
-+ }
-+#endif
-+}
---- a/src/protocol/curl/http.h
-+++ b/src/protocol/curl/http.h
-@@ -19,6 +19,10 @@ extern protocol_handler_T http_curl_prot
-
- void http_curl_handle_error(struct connection *conn, CURLcode res);
-
-+#ifdef CONFIG_FTP
-+void ftp_curl_handle_error(struct connection *conn, CURLcode res);
-+#endif
-+
- #endif
-
- #ifdef __cplusplus
-
---- a/src/protocol/curl/sftp.h
-+++ b/src/protocol/curl/sftp.h
-@@ -10,7 +10,7 @@
-
- extern struct module sftp_protocol_module;
-
--#if defined(CONFIG_LIBCURL)
-+#if defined(CONFIG_FTP) && defined(CONFIG_LIBCURL)
- extern protocol_handler_T sftp_protocol_handler;
- #else
- #define sftp_protocol_handler NULL
---- a/src/protocol/protocol.c
-+++ b/src/protocol/protocol.c
-@@ -336,7 +336,7 @@
- #ifdef CONFIG_NNTP
- &nntp_protocol_module,
- #endif
--#if defined(CONFIG_LIBCURL)
-+#if defined(CONFIG_FTP) && defined(CONFIG_LIBCURL)
- &sftp_protocol_module,
- #endif
- #ifdef CONFIG_SMB
