[gentoo-commits] repo/gentoo:master commit in: www-client/elinks/, www-client/elinks/files/

2025-02-16 Thread Sam James
commit: 502a517a17e8b3b37c35d09721a27bfa8bdd7945
Author: Felix Janda  posteo  de>
AuthorDate: Tue Jan 28 21:27:23 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 16 16:35:29 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=502a517a

www-client/elinks: drop 0.16.1.1

Signed-off-by: Felix Janda  posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/40354
Signed-off-by: Sam James  gentoo.org>

 www-client/elinks/Manifest |   1 -
 www-client/elinks/elinks-0.16.1.1-r100.ebuild  | 199 -
 ...-0.16.1.1-ecmascript-implicit-declaration.patch |  36 
 .../elinks/files/elinks-0.16.1.1-perl-5.38.patch   |  62 ---
 .../elinks/files/elinks-0.16.1.1-python-3.12.patch |  26 ---
 5 files changed, 324 deletions(-)

diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 8069f1174409..e17a01b55f1e 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,3 +1,2 @@
-DIST elinks-0.16.1.1.tar.xz 2037292 BLAKE2B 
05578eaa7a88f0abe4472b876a1f72645d32119ce807a61962f8d24a5b444240d3b94189bf25142c0e51e2d404d5992ace07ecc23ef1316d5f3942736b265267
 SHA512 
49e03ff4766e29b6fd4324d226e415ca1329a84d4a44fac40ecd72186dd104de88c3e541810a008dc6f1d1ed889a45edbef159cbc6ac3860756ca21261ffec8a
 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.16.1.1-r100.ebuild 
b/www-client/elinks/elinks-0.16.1.1-r100.ebuild
deleted file mode 100644
index d3602f9c3cfa..
--- a/www-client/elinks/elinks-0.16.1.1-r100.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2024 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_{10..12} )
-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} == * ]] ; 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 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} )
-"
-
-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/libidn:= )
-   javascript? (
-   dev-cpp/libxmlpp:5.0
-   dev-lang/mujs:=
-   )
-   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? ( >=sys-libs/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}"/${PN}-0.16.1.1-ecmascript-implicit-declaration.patch
-   "${FILESDIR}"/${PN}-0.16.1.1-perl-5.38.patch
-   "${FILESDIR}"/${PN}-0.16.1.1-python-3.12.patch
-)
-
-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

[gentoo-commits] repo/gentoo:master commit in: www-client/elinks/, www-client/elinks/files/

2025-01-22 Thread Sam James
commit: d0eb14e30572b2f1a60d7c40960eb962d6c4460f
Author: Felix Janda  posteo  de>
AuthorDate: Wed Jan 22 05:21:11 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 22 23:43:53 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0eb14e3

www-client/elinks: bump to 0.18.0

Signed-off-by: Felix Janda  posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/40252
Signed-off-by: Sam James  gentoo.org>

 www-client/elinks/Manifest |  1 +
 .../{elinks-.ebuild => elinks-0.18.0.ebuild}   | 17 +
 www-client/elinks/elinks-.ebuild   | 13 +
 www-client/elinks/files/elinks-0.18.0-sftp.patch   | 22 ++
 www-client/elinks/metadata.xml |  1 +
 5 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 5d822b1d34f3..8069f1174409 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,2 +1,3 @@
 DIST elinks-0.16.1.1.tar.xz 2037292 BLAKE2B 
05578eaa7a88f0abe4472b876a1f72645d32119ce807a61962f8d24a5b444240d3b94189bf25142c0e51e2d404d5992ace07ecc23ef1316d5f3942736b265267
 SHA512 
49e03ff4766e29b6fd4324d226e415ca1329a84d4a44fac40ecd72186dd104de88c3e541810a008dc6f1d1ed889a45edbef159cbc6ac3860756ca21261ffec8a
 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-.ebuild 
b/www-client/elinks/elinks-0.18.0.ebuild
similarity index 93%
copy from www-client/elinks/elinks-.ebuild
copy to www-client/elinks/elinks-0.18.0.ebuild
index daa906d436ce..5f0b41536b9e 100644
--- a/www-client/elinks/elinks-.ebuild
+++ b/www-client/elinks/elinks-0.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,20 +24,22 @@ 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"
+IUSE="bittorrent brotli bzip2 curl debug finger ftp gemini gopher gpm gnutls 
guile idn"
+IUSE+=" javascript libcss lua lzma +mouse nls nntp perl python samba sftp ssl 
test tre unicode X xml zlib zstd"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
guile? ( ${GUILE_REQUIRED_USE} )
-   javascript? ( libcss )
+   javascript? ( curl libcss )
lua? ( ${LUA_REQUIRED_USE} )
python? ( ${PYTHON_REQUIRED_USE} )
+   sftp? ( curl )
 "
 
 RDEPEND="
>=sys-libs/ncurses-5.2:=[unicode(+)]
brotli? ( app-arch/brotli:= )
bzip2? ( >=app-arch/bzip2-1.0.2 )
+   curl? ( net-misc/curl[ssl] )
gpm? (
>=sys-libs/gpm-1.20.0-r5
)
@@ -79,6 +81,10 @@ BDEPEND="
)
 "
 
+PATCHES=(
+   "${FILESDIR}"/${P}-sftp.patch
+)
+
 pkg_setup() {
use guile && guile-single_pkg_setup
use lua && lua-single_pkg_setup
@@ -110,9 +116,11 @@ src_configure() {
-Dapidoc=false
-D88-colors=true
-D256-colors=true
+   -Dbacktrace=$(usex elibc_musl false true)
$(meson_use bittorrent)
$(meson_use brotli)
$(meson_use bzip2 bzlib)
+   $(meson_use curl libcurl)
$(usex debug '-Ddebug=true' '-Dfastmem=true')
$(meson_use finger)
$(meson_use ftp)
@@ -141,6 +149,7 @@ src_configure() {
-Dquickjs=false
-Druby=false
$(meson_use samba smb)
+   $(meson_use sftp)
-Dsm-scripting=false
-Dspidermonkey=false
-Dterminfo=true

diff --git a/www-client/elinks/elinks-.ebuild 
b/www-client/elinks/elinks-.ebuild
index daa906d436ce..780dfce3fd3a 100644
--- a/www-client/elinks/elinks-.ebuild
+++ b/www-client/elinks/elinks-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,20 +24,22 @@ 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 

[gentoo-commits] repo/gentoo:master commit in: www-client/elinks/, www-client/elinks/files/

2024-10-28 Thread Sam James
commit: a0994847954dbf35b3933d1ecb2332d1684602e7
Author: Felix Janda  posteo  de>
AuthorDate: Mon Oct 28 01:40:45 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 28 11:41:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0994847

www-client/elinks: various bugfixes

Closes: https://bugs.gentoo.org/933407
Closes: https://bugs.gentoo.org/942286
Closes: https://bugs.gentoo.org/942202
Closes: https://bugs.gentoo.org/942293
Signed-off-by: Felix Janda  posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/39134
Signed-off-by: Sam James  gentoo.org>

 www-client/elinks/elinks-0.17.1.1.ebuild   |  8 ++-
 www-client/elinks/elinks-.ebuild   |  4 +-
 www-client/elinks/files/elinks-0.17.1.1-sftp.patch | 63 +-
 3 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/www-client/elinks/elinks-0.17.1.1.ebuild 
b/www-client/elinks/elinks-0.17.1.1.ebuild
index ba0f3ed2a59c..9b8c200b66dd 100644
--- a/www-client/elinks/elinks-0.17.1.1.ebuild
+++ b/www-client/elinks/elinks-0.17.1.1.ebuild
@@ -29,6 +29,7 @@ IUSE+=" javascript libcss lua lzma +mouse nls nntp perl 
python samba ssl test tr
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
guile? ( ${GUILE_REQUIRED_USE} )
+   javascript? ( libcss )
lua? ( ${LUA_REQUIRED_USE} )
python? ( ${PYTHON_REQUIRED_USE} )
 "
@@ -86,12 +87,17 @@ PATCHES=(
 pkg_setup() {
use guile && guile-single_pkg_setup
use lua && lua-single_pkg_setup
-   use python && python-single-r1_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() {

diff --git a/www-client/elinks/elinks-.ebuild 
b/www-client/elinks/elinks-.ebuild
index 385322847846..daa906d436ce 100644
--- a/www-client/elinks/elinks-.ebuild
+++ b/www-client/elinks/elinks-.ebuild
@@ -29,6 +29,7 @@ IUSE+=" javascript libcss lua lzma +mouse nls nntp perl 
python samba ssl test tr
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
guile? ( ${GUILE_REQUIRED_USE} )
+   javascript? ( libcss )
lua? ( ${LUA_REQUIRED_USE} )
python? ( ${PYTHON_REQUIRED_USE} )
 "
@@ -81,12 +82,13 @@ BDEPEND="
 pkg_setup() {
use guile && guile-single_pkg_setup
use lua && lua-single_pkg_setup
-   use python && python-single-r1_pkg_setup
+   python-single-r1_pkg_setup
 }
 
 src_prepare() {
default
use guile && guile_bump_sources
+   python_fix_shebang .
 }
 
 src_configure() {

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
index 2607c90b4fbd..f8f1d5092bff 100644
--- a/www-client/elinks/files/elinks-0.17.1.1-sftp.patch
+++ b/www-client/elinks/files/elinks-0.17.1.1-sftp.patch
@@ -1,18 +1,7 @@
-From 1f0ee66aecbb52f8c423128aa7e0dd35822e989c Mon Sep 17 00:00:00 2001
-From: Witold Filipczyk 
-Date: Mon, 27 May 2024 10:23:46 +0200
-Subject: [PATCH] [protolcols] Do not compile-in SFTP when ftp was disabled.
- Refs #304
+Combination of upstream commits:
+1f0ee66aecbb52f8c423128aa7e0dd35822e989c
+a198d2da3cf958d7c1de3bc02a2ea49c25a3f785
 

- src/protocol/curl/ftp.c  | 42 +++-
- src/protocol/curl/http.c | 42 
- src/protocol/curl/sftp.h |  2 +-
- src/protocol/protocol.c  |  2 +-
- 4 files changed, 47 insertions(+), 41 deletions(-)
-
-diff --git a/src/protocol/curl/ftp.c b/src/protocol/curl/ftp.c
-index 5f3d462ac..73120a67d 100644
 --- a/src/protocol/curl/ftp.c
 +++ b/src/protocol/curl/ftp.c
 @@ -55,6 +55,8 @@
@@ -24,7 +13,16 @@ index 5f3d462ac..73120a67d 100644
  static char el_curlversion[256];
  
  static void
-@@ -641,45 +643,6 @@ ftp_curl_handle_error(struct connection *conn, CURLcode 
res)
+@@ -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));
  }
  
@@ -70,17 +68,36 @@ index 5f3d462ac..73120a67d 100644
  void
  ftpes_protocol_handler(struct connection *conn)
  {
-@@ -695,3 +658,4 @@ sftp_protocol_handler(struct connection *conn)
+@@ -689,3 +652,4 @@
do_ftpes(conn);
}
  }
 +#endif
 \ No newline at end of file
-diff --git a/src/protocol/curl/http.c b/src/protocol/curl/http.c
-index e2349489a..25d0eb36d 100644
+--- 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 
++#endif
++
+ #include "main/module.h"
+ #include "protocol/protocol.h"
+ 
+@@ -12

[gentoo-commits] repo/gentoo:master commit in: www-client/elinks/, www-client/elinks/files/

2024-07-16 Thread Conrad Kostecki
commit: 2d9fa2ef2f89fb72275dab73204ad2404b22d666
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Tue Jul 16 21:24:55 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Jul 16 21:24:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d9fa2ef

www-client/elinks: fix python3.12 support

Closes: https://bugs.gentoo.org/929876
Bug: https://bugs.gentoo.org/919372
Signed-off-by: Conrad Kostecki  gentoo.org>

 www-client/elinks/elinks-0.16.1.1-r3.ebuild|  2 ++
 ...-0.16.1.1-ecmascript-implicit-declaration.patch | 36 ++
 .../elinks/files/elinks-0.16.1.1-python-3.12.patch | 26 
 3 files changed, 64 insertions(+)

diff --git a/www-client/elinks/elinks-0.16.1.1-r3.ebuild 
b/www-client/elinks/elinks-0.16.1.1-r3.ebuild
index bef5b7bb9a45..a56703fb7e56 100644
--- a/www-client/elinks/elinks-0.16.1.1-r3.ebuild
+++ b/www-client/elinks/elinks-0.16.1.1-r3.ebuild
@@ -72,7 +72,9 @@ BDEPEND="
 "
 
 PATCHES=(
+   "${FILESDIR}"/${PN}-0.16.1.1-ecmascript-implicit-declaration.patch
"${FILESDIR}"/${PN}-0.16.1.1-perl-5.38.patch
+   "${FILESDIR}"/${PN}-0.16.1.1-python-3.12.patch
 )
 
 pkg_setup() {

diff --git 
a/www-client/elinks/files/elinks-0.16.1.1-ecmascript-implicit-declaration.patch 
b/www-client/elinks/files/elinks-0.16.1.1-ecmascript-implicit-declaration.patch
new file mode 100644
index ..58c98cc27da0
--- /dev/null
+++ 
b/www-client/elinks/files/elinks-0.16.1.1-ecmascript-implicit-declaration.patch
@@ -0,0 +1,36 @@
+--- elinks-0.16.1.1/src/document/html/parser/general.c 2024-06-06 
07:10:40.163191871 +0200
 elinks-0.16.1.1/src/document/html/parser/general.c 2024-06-06 
07:11:45.913711031 +0200
+@@ -38,6 +38,10 @@
+ #include "util/memory.h"
+ #include "util/string.h"
+ 
++#ifdef CONFIG_ECMASCRIPT
++#include "ecmascript/ecmascript.h"
++#endif
++
+ /* Unsafe macros */
+ #include "document/html/internal.h"
+ 
+--- elinks-0.16.1.1/src/document/html/parser/stack.c   2023-05-01 
10:45:22.0 +0200
 elinks-0.16.1.1/src/document/html/parser/stack.c   2024-06-06 
07:11:29.892765184 +0200
+@@ -24,6 +24,10 @@
+ #include "util/memory.h"
+ #include "util/string.h"
+ 
++#ifdef CONFIG_ECMASCRIPT
++#include "ecmascript/ecmascript.h"
++#endif
++
+ /* Unsafe macros */
+ #include "document/html/internal.h"
+ 
+--- elinks-0.16.1.1/src/ecmascript/ecmascript.h.orig   2024-06-06 
07:18:53.237018842 +0200
 elinks-0.16.1.1/src/ecmascript/ecmascript.h2024-06-06 
07:20:04.434093077 +0200
+@@ -26,6 +26,7 @@
+ #include "main/module.h"
+ #include "main/timer.h"
+ #include "util/time.h"
++#include 
+ 
+ //#define ECMASCRIPT_DEBUG 1
+ 

diff --git a/www-client/elinks/files/elinks-0.16.1.1-python-3.12.patch 
b/www-client/elinks/files/elinks-0.16.1.1-python-3.12.patch
new file mode 100644
index ..e6ac9f004463
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.16.1.1-python-3.12.patch
@@ -0,0 +1,26 @@
+From 2577da89420ce2a1d58fadd7f2e6809d2ba70dd8 Mon Sep 17 00:00:00 2001
+From: Witold Filipczyk 
+Date: Mon, 10 Jun 2024 13:07:23 +0200
+Subject: [PATCH] [python] module imp is deprecated. Refs #313
+
+---
+ src/scripting/python/core.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/scripting/python/core.c b/src/scripting/python/core.c
+index 185561108..4a69e4293 100644
+--- a/src/scripting/python/core.c
 b/src/scripting/python/core.c
+@@ -138,10 +138,10 @@ hooks_module_exists(void)
+* indicates that no such module was found; any other exception will
+* be reported as an error.
+*/
+-  imp_module = PyImport_ImportModule("imp");
++  imp_module = PyImport_ImportModule("importlib.util");
+   if (!imp_module) goto python_error;
+ 
+-  result = PyObject_CallMethod(imp_module, "find_module", "s", "hooks");
++  result = PyObject_CallMethod(imp_module, "find_spec", "s", "hooks");
+   if (result) {
+   found_hooks = 1;
+   goto end;



[gentoo-commits] repo/gentoo:master commit in: www-client/elinks/, www-client/elinks/files/

2023-07-03 Thread Sam James
commit: 4ac664e7d86ef49367178cfff9a03936e0fd8289
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul  3 15:10:22 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  3 15:10:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ac664e7

www-client/elinks: drop 0.13.5-r100, 0.15.1-r1

Signed-off-by: Sam James  gentoo.org>

 www-client/elinks/Manifest |   2 -
 www-client/elinks/elinks-0.13.5-r100.ebuild| 147 ---
 www-client/elinks/elinks-0.15.1-r1.ebuild  | 158 -
 .../elinks/files/elinks-0.13.5-parallel-make.patch |  51 ---
 .../files/elinks-0.15.1-no-mouse-build.patch   |  40 --
 5 files changed, 398 deletions(-)

diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 4eb6b44a6972..462b1a150161 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,4 +1,2 @@
-DIST elinks-0.13.5.tar.gz 3600196 BLAKE2B 
e1e51674b5630d6dab3de3030aee671876750fc97808bf4dca50b505fa2c31af669c4c3773b3830186fb98acda5c692ff1902c6e1240251ea699103a70bb4e43
 SHA512 
786f6142c03bca4a47a1043ca4f9c36aab431d192eb13bcad14c1da391f5746779a8f65e53eb781dff79f619ceb3ed30ef939eae8d81f64251fad9b803c0ae7b
-DIST elinks-0.15.1.tar.xz 1997208 BLAKE2B 
dcec7054d417842e709f26bab53ddb1bf43556de4c69d116ad1e049664bc7c5a5513f02cee500d591252b439a66f354079e2e3eff5692202102cb900e06340c2
 SHA512 
677ab3fc24dcfe4e7248a9c1a8e07083ebd13bd9923d89702a04dbe1c3e4d4038029c095881183d7f11ae2c5317ff7e5458320644fde0c176378b89068d8
 DIST elinks-0.16.0.tar.xz 2029708 BLAKE2B 
b81dfeb303d2e33c88f063925f61dbf50a1cf8462cf3d000b70e01b210855682352303646c7d4dc2c5bdd0de41c3ce33d222c636be4d8292cbe8379b4b043ef8
 SHA512 
b1d6040b691610d596e0d1eae26bfe52d702272c71a2e5100ab7d6b05b24a0b88524d4fc7be3f6371e0bada1e6f0992da7505a72419ca642dec778424629a522
 DIST elinks-0.16.1.1.tar.xz 2037292 BLAKE2B 
05578eaa7a88f0abe4472b876a1f72645d32119ce807a61962f8d24a5b444240d3b94189bf25142c0e51e2d404d5992ace07ecc23ef1316d5f3942736b265267
 SHA512 
49e03ff4766e29b6fd4324d226e415ca1329a84d4a44fac40ecd72186dd104de88c3e541810a008dc6f1d1ed889a45edbef159cbc6ac3860756ca21261ffec8a

diff --git a/www-client/elinks/elinks-0.13.5-r100.ebuild 
b/www-client/elinks/elinks-0.13.5-r100.ebuild
deleted file mode 100644
index 2724fdf1d0ab..
--- a/www-client/elinks/elinks-0.13.5-r100.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-LUA_COMPAT=( lua5-{1,2} )
-
-inherit autotools lua-single python-any-r1
-
-DESCRIPTION="Advanced and well-established text-mode web browser"
-HOMEPAGE="http://elinks.or.cz/";
-SRC_URI="https://github.com/rkd77/felinks/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/felinks-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="bittorrent brotli bzip2 debug finger ftp gopher gnutls gpm guile idn ipv6
-   lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib zstd"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-   brotli? ( app-arch/brotli:= )
-   bzip2? ( >=app-arch/bzip2-1.0.2 )
-   gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 )
-   guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] )
-   idn? ( net-dns/libidn:= )
-   lua? ( ${LUA_DEPS} )
-   perl? ( dev-lang/perl:= )
-   ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* )
-   samba? ( net-fs/samba )
-   ssl? (
-   !gnutls? (
-   dev-libs/openssl:0=
-   )
-   gnutls? ( net-libs/gnutls:= )
-   )
-   tre? ( dev-libs/tre )
-   X? (
-   x11-libs/libX11
-   x11-libs/libXt
-   )
-   xml? ( >=dev-libs/expat-1.95.4 )
-   zlib? ( >=sys-libs/zlib-1.1.4 )
-   zstd? ( app-arch/zstd:= )"
-DEPEND="${RDEPEND}
-   ${PYTHON_DEPS}"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-parallel-make.patch
-)
-
-src_prepare() {
-   default
-
-   sed -i -e 's/-Werror//' configure* || die
-
-   eautoreconf
-}
-
-src_configure() {
-   local myconf=(
-   --sysconfdir="${EPREFIX}"/etc/elinks
-   --enable-leds
-   --enable-88-colors
-   --enable-256-colors
-   --enable-true-color
-   --enable-html-highlight
-   --without-spidermonkey
-   $(use_with gpm)
-   $(use_with brotli)
-   $(use_with bzip2 bzlib)
-   $(use_with guile)
-   $(use_with idn)
-   $(use_with lua luapkg lua)
-   $(use_with perl)
-   $(use_with ruby)
-   $(use_with tre)
-   $(use_with X x)
-   $(use_with zlib)
-  

[gentoo-commits] repo/gentoo:master commit in: www-client/elinks/, www-client/elinks/files/

2022-10-13 Thread Sam James
commit: 8f806f078a5373d5be0af5a6ad6be23b7a851745
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct 13 19:55:51 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 13 19:55:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f806f07

www-client/elinks: rename old parallel-make patch

Signed-off-by: Sam James  gentoo.org>

 www-client/elinks/elinks-0.13.5-r100.ebuild   | 4 ++--
 ...nks--parallel-make.patch => elinks-0.13.5-parallel-make.patch} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-client/elinks/elinks-0.13.5-r100.ebuild 
b/www-client/elinks/elinks-0.13.5-r100.ebuild
index b4dfb74b0dae..a3b49623550e 100644
--- a/www-client/elinks/elinks-0.13.5-r100.ebuild
+++ b/www-client/elinks/elinks-0.13.5-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -49,7 +49,7 @@ DEPEND="${RDEPEND}
${PYTHON_DEPS}"
 
 PATCHES=(
-   "${FILESDIR}"/${PN}--parallel-make.patch
+   "${FILESDIR}"/${P}-parallel-make.patch
 )
 
 src_prepare() {

diff --git a/www-client/elinks/files/elinks--parallel-make.patch 
b/www-client/elinks/files/elinks-0.13.5-parallel-make.patch
similarity index 100%
rename from www-client/elinks/files/elinks--parallel-make.patch
rename to www-client/elinks/files/elinks-0.13.5-parallel-make.patch



[gentoo-commits] repo/gentoo:master commit in: www-client/elinks/, www-client/elinks/files/

2020-09-13 Thread Sam James
commit: 0e591ad37835503bffc0e506f0921616c471da5d
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 13 18:39:51 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 13 18:39:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e591ad3

www-client/elinks: cleanup old (inc. EAPI 4)

Closes: https://bugs.gentoo.org/648648
Closes: https://bugs.gentoo.org/730658
Closes: https://bugs.gentoo.org/739914
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 www-client/elinks/Manifest |   3 -
 www-client/elinks/elinks-0.12_pre6-r4.ebuild   | 155 -
 .../elinks/elinks-0.13_pre_pre20180225.ebuild  | 142 
 .../elinks/files/elinks-0.11.2-lua-5.1.patch   |  16 --
 .../files/elinks-0.12_pre5-compilation-fix.patch   |  12 --
 .../elinks/files/elinks-0.12_pre5-libressl.patch   |  29 
 .../elinks/files/elinks-0.12_pre5-rand-egd.patch   |  20 ---
 .../elinks/files/elinks-0.12_pre5-ruby-1.9.patch   | 187 -
 .../files/elinks-0.12_pre5-sm185-jsval-fixes.patch | 124 --
 www-client/elinks/files/elinks-0.13-ruby.patch | 183 
 www-client/elinks/metadata.xml |   1 -
 11 files changed, 872 deletions(-)

diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 51fa0ee2ac2..8a51cb8261c 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,4 +1 @@
-DIST elinks-0.12_pre5-js185-patches.tar.bz2 13820 BLAKE2B 
b850c66cc74d59c6cfb0c7c6ebaaddfe0706e8cdcc14b1df5232ba2b3c75bf632e3b3e398b200876d7e594b122c6b27227ca92729129ef955174b05e7f0e6a06
 SHA512 
1552aeacdecb0a2db357402e0474d6b4810c767609d1d399b3350a4bcdc21ba9c0bde5a5d0bffd1d7b27d41ac46e3e85ae2527d715a1645a2dd51ab14b8eab3c
-DIST elinks-0.12pre6.tar.bz2 2854500 BLAKE2B 
3d91c2a4b03cf77a2a86131cfb5339a40c6e89c8aaab7293d5b7f6861f0b7647b1951f2bc15814e342c926a154707162a7814981cdc729329dfb04627133f3bf
 SHA512 
bff70faafea7c4739695a7fad8f659109894b318588f5a035a5594a6053238789259ce6067c2f5cb97448f138db143adebb23f84bf689bea209ba37573484b7f
 DIST elinks-0.13.4.tar.gz 3594672 BLAKE2B 
67a44c05a24c200f7b472c6e7c3d0f0966c820ff6d7837ec2cf60e985f5b64cdd63f67103fcc897c293867174cf7162178c2b4af2ec2fdc261b130907cd7f8f7
 SHA512 
028ed8e6c00de5c65cde80b2e2c42a6568696d277dc8e5645130377d7bb5a3f6adacbea626b6e19ae3e756eb40b4dca5d642839d57943c1a04eb1fe65aa98fe6
-DIST elinks-0.13_pre_pre20180225.tar.gz 3518990 BLAKE2B 
89c95b1d6e438975f5711f2e83960c90ced451953f395f3d73eeca40e6187b423b3c7d50b065c11673ee9fe03e8ee99a4c7642ebc01eea888c417645a0e53d7d
 SHA512 
3f817768766e6dd6df042f7512163c5de70766e4d565fc081f4f755f7f7958d5487b9ff2ea29187a5cc813dc0841d75d440087fbdaf99f73d2a269dca70d5725

diff --git a/www-client/elinks/elinks-0.12_pre6-r4.ebuild 
b/www-client/elinks/elinks-0.12_pre6-r4.ebuild
deleted file mode 100644
index 5d39231f42a..000
--- a/www-client/elinks/elinks-0.12_pre6-r4.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eutils autotools flag-o-matic
-
-MY_P="${P/_/}"
-DESCRIPTION="Advanced and well-established text-mode web browser"
-HOMEPAGE="http://elinks.or.cz/";
-SRC_URI="http://elinks.or.cz/download/${MY_P}.tar.bz2
-   
https://dev.gentoo.org/~axs/distfiles/${PN}-0.12_pre5-js185-patches.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
-IUSE="bittorrent bzip2 debug finger ftp gc gopher gpm guile idn ipv6
- javascript libressl lua +mouse nls nntp perl ruby samba ssl tre 
unicode X xml zlib"
-RESTRICT="test"
-
-DEPEND="
-   bzip2? ( >=app-arch/bzip2-1.0.2 )
-   gc? ( dev-libs/boehm-gc )
-   gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 )
-   guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] )
-   idn? ( net-dns/libidn )
-   javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )
-   lua? ( >=dev-lang/lua-5:0= )
-   perl? ( dev-lang/perl:= )
-   ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* )
-   samba? ( net-fs/samba )
-   ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   )
-   tre? ( dev-libs/tre )
-   X? ( x11-libs/libX11 x11-libs/libXt )
-   xml? ( >=dev-libs/expat-1.95.4 )
-   zlib? ( >=sys-libs/zlib-1.1.4 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-PATCHES=(
-   "${FILESDIR}"/${PN}--parallel-make.patch
-   "${FILESDIR}"/${PN}-0.12_pre5-compilation-fix.patch
-   "${FILESDIR}"/${PN}-0.12_pre5-libressl.patch
-   "${FILESDIR}"/${PN}-0.12_pre5-rand-egd.patch
-   "${FILESDIR}"/${PN}-0.11.2-lua-5.1.patch
-   "${FILESDIR}"/${PN}-0.12_pre5-ruby-1.9.patch
-   "${WORKDIR}"/patches/

[gentoo-commits] repo/gentoo:master commit in: www-client/elinks/, www-client/elinks/files/

2018-03-26 Thread Jeroen Roovers
commit: 951209198db135ba00611ae2b54e300e022fbd10
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Mar 26 18:02:33 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Mar 26 18:07:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95120919

www-client/elinks: Fix ruby check/compat by Felix Janda (bug #649948).

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../elinks/elinks-0.13_pre_pre20180225.ebuild  |   3 +-
 www-client/elinks/files/elinks-0.13-ruby.patch | 183 +
 2 files changed, 185 insertions(+), 1 deletion(-)

diff --git a/www-client/elinks/elinks-0.13_pre_pre20180225.ebuild 
b/www-client/elinks/elinks-0.13_pre_pre20180225.ebuild
index a0b8366f121..9a4f291cc06 100644
--- a/www-client/elinks/elinks-0.13_pre_pre20180225.ebuild
+++ b/www-client/elinks/elinks-0.13_pre_pre20180225.ebuild
@@ -43,7 +43,8 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
"${FILESDIR}"/${PN}--parallel-make.patch
-   )
+   "${FILESDIR}"/${PN}-0.13-ruby.patch
+)
 
 src_prepare() {
default

diff --git a/www-client/elinks/files/elinks-0.13-ruby.patch 
b/www-client/elinks/files/elinks-0.13-ruby.patch
new file mode 100644
index 000..a716439b512
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.13-ruby.patch
@@ -0,0 +1,183 @@
+--- a/config/m4/ruby.m4
 b/config/m4/ruby.m4
+@@ -32,36 +32,40 @@ if test "$CONFIG_SCRIPTING_RUBY" = "yes"; then
+   if test "$CONFIG_SCRIPTING_RUBY" != "no"; then
+ 
+   AC_MSG_CHECKING(Ruby version)
+-  if $CONFIG_SCRIPTING_RUBY -e 'exit((VERSION or RUBY_VERSION) >= 
"1.6.0")' >/dev/null 2>/dev/null; then
++  if $CONFIG_SCRIPTING_RUBY -e 'exit((VERSION rescue 
RUBY_VERSION) >= "1.6.0")' >/dev/null 2>/dev/null; then
+   ruby_version=`$CONFIG_SCRIPTING_RUBY -e 'puts 
"#{VERSION rescue RUBY_VERSION}"'`
+   AC_MSG_RESULT($ruby_version)
+ 
+   AC_MSG_CHECKING(for Ruby header files)
+-  rubyhdrdir=`$CONFIG_SCRIPTING_RUBY -r mkmf -e 'print 
Config::CONFIG[["archdir"]] || $hdrdir' 2>/dev/null`
++  rubyhdrdir=`$CONFIG_SCRIPTING_RUBY -r mkmf -e 'print 
RbConfig::CONFIG[["rubyhdrdir"]] || RbConfig::CONFIG[["archdir"]] || $hdrdir' 
2>/dev/null`
+ 
+   if test "X$rubyhdrdir" != "X"; then
+   AC_MSG_RESULT($rubyhdrdir)
+   RUBY_CFLAGS="-I$rubyhdrdir"
+-  rubylibs=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 
'print Config::CONFIG[["LIBS"]]'`
++  rubyarch=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 
'print RbConfig::CONFIG[["arch"]]'`
++  if test -d "$rubyhdrdir/$rubyarch"; then
++  RUBY_CFLAGS="$RUBY_CFLAGS 
-I$rubyhdrdir/$rubyarch"
++  fi
++  rubylibs=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 
'print RbConfig::CONFIG[["LIBS"]]'`
+ 
+   if test "X$rubylibs" != "X"; then
+   RUBY_LIBS="$rubylibs"
+   fi
+ 
+-  librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig 
-e 'print Config.expand(Config::CONFIG[["LIBRUBYARG"]])'`
++  librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig 
-e 'print RbConfig.expand(RbConfig::CONFIG[["LIBRUBYARG"]])'`
+ 
+   if test -f "$rubyhdrdir/$librubyarg"; then
+   librubyarg="$rubyhdrdir/$librubyarg"
+ 
+   else
+-  rubylibdir=`$CONFIG_SCRIPTING_RUBY -r 
rbconfig -e 'print Config.expand(Config::CONFIG[["libdir"]])'`
++  rubylibdir=`$CONFIG_SCRIPTING_RUBY -r 
rbconfig -e 'print RbConfig.expand(RbConfig::CONFIG[["libdir"]])'`
+   if test -f "$rubylibdir/$librubyarg"; 
then
+   
librubyarg="$rubylibdir/$librubyarg"
+   elif test "$librubyarg" = "libruby.a"; 
then
+   dnl required on Mac OS 10.3 
where libruby.a doesn't exist
+   librubyarg="-lruby"
+   else
+-  
librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e "print 
'$librubyarg'.gsub(/-L\./, %'-L#{Config.expand(Config::CONFIG[\"libdir\"])}')"`
++  
librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e "print 
'$librubyarg'.gsub(/-L\./, 
%'-L#{RbConfig.expand(RbConfig::CONFIG[\"libdir\"])}')"`
+   fi
+   fi
+ 
+@@ -69,7 +73,7 @@ if test "$CONFIG_SCRIPTING_RUBY" = "yes"; then
+   

[gentoo-commits] repo/gentoo:master commit in: www-client/elinks/, www-client/elinks/files/

2017-10-22 Thread Patrice Clement
commit: 9f93ee632f0a851deddaa347bc933278a48f7f8d
Author: Felix Janda  posteo  de>
AuthorDate: Sat Oct 14 13:43:32 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Oct 22 16:55:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f93ee63

www-client/elinks-0.12_pre6-r2: fix compilation with libressl.

Closes: https://bugs.gentoo.org/584766
Closes: https://bugs.gentoo.org/609006

 www-client/elinks/elinks-0.12_pre6-r2.ebuild   |  2 ++
 .../elinks/files/elinks-0.12_pre5-libressl.patch   | 29 ++
 .../elinks/files/elinks-0.12_pre5-rand-egd.patch   | 20 +++
 3 files changed, 51 insertions(+)

diff --git a/www-client/elinks/elinks-0.12_pre6-r2.ebuild 
b/www-client/elinks/elinks-0.12_pre6-r2.ebuild
index ed3f69831bd..e9e8625888a 100644
--- a/www-client/elinks/elinks-0.12_pre6-r2.ebuild
+++ b/www-client/elinks/elinks-0.12_pre6-r2.ebuild
@@ -56,6 +56,8 @@ src_prepare() {
 
epatch "${FILESDIR}"/${PN}--parallel-make.patch
epatch "${FILESDIR}"/${PN}-0.12_pre5-compilation-fix.patch
+   epatch "${FILESDIR}"/${PN}-0.12_pre5-libressl.patch
+   epatch "${FILESDIR}"/${PN}-0.12_pre5-rand-egd.patch
 
if use javascript ; then
if has_version ">=dev-lang/spidermonkey-1.8"; then

diff --git a/www-client/elinks/files/elinks-0.12_pre5-libressl.patch 
b/www-client/elinks/files/elinks-0.12_pre5-libressl.patch
new file mode 100644
index 000..d41ab689e9f
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.12_pre5-libressl.patch
@@ -0,0 +1,29 @@
+Adapted from upstream
+commit 54ebe365b752f8969a67279d0d29552ab638e025
+Author: Witold Filipczyk 
+Date:   Mon Mar 6 17:39:36 2017 +0100
+
+Compilation fix for OpenSSL-1.1
+
+--- a/src/network/ssl/socket.c
 b/src/network/ssl/socket.c
+@@ -67,7 +67,9 @@
+ ssl_set_no_tls(struct socket *socket)
+ {
+ #ifdef CONFIG_OPENSSL
+-  ((ssl_t *) socket->ssl)->options |= SSL_OP_NO_TLSv1;
++#ifdef SSL_OP_NO_TLSv1
++  SSL_set_options((ssl_t *)socket->ssl, SSL_OP_NO_TLSv1);
++#endif
+ #elif defined(CONFIG_GNUTLS)
+   {
+   /* GnuTLS does not support SSLv2 because it is "insecure".
+@@ -145,7 +147,7 @@
+   }
+ 
+   if (client_cert) {
+-  SSL_CTX *ctx = ((SSL *) socket->ssl)->ctx;
++  SSL_CTX *ctx = SSL_get_SSL_CTX((SSL *) socket->ssl);
+ 
+   SSL_CTX_use_certificate_chain_file(ctx, client_cert);
+   SSL_CTX_use_PrivateKey_file(ctx, client_cert,

diff --git a/www-client/elinks/files/elinks-0.12_pre5-rand-egd.patch 
b/www-client/elinks/files/elinks-0.12_pre5-rand-egd.patch
new file mode 100644
index 000..6c5679a95bb
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.12_pre5-rand-egd.patch
@@ -0,0 +1,20 @@
+--- a/src/network/ssl/ssl.c
 b/src/network/ssl/ssl.c
+@@ -84,11 +84,16 @@ init_openssl(struct module *module)
+* cannot initialize the PRNG and so every attempt to use SSL fails.
+* It's actually an OpenSSL FAQ, and according to them, it's up to the
+* application coders to seed the RNG. -- William Yodlowsky */
+-  if (RAND_egd(RAND_file_name(f_randfile, sizeof(f_randfile))) < 0) {
++  RAND_file_name(f_randfile, sizeof(f_randfile));
++#ifdef HAVE_RAND_EGD
++  if (RAND_egd(f_randfile) < 0) {
+   /* Not an EGD, so read and write to it */
++#endif
+   if (RAND_load_file(f_randfile, -1))
+   RAND_write_file(f_randfile);
++#ifdef HAVE_RAND_EGD
+   }
++#endif
+ 
+   SSLeay_add_ssl_algorithms();
+   context = SSL_CTX_new(SSLv23_client_method());