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

2023-12-27 Thread Sam James 
commit: bd5471bfd6e7c14facf9052c6bcf11835c8b1ff2
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 28 02:03:32 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 28 02:03:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd5471bf

www-client/elinks: drop 0.16.0, 0.16.1.1-r1

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

 www-client/elinks/Manifest |   1 -
 www-client/elinks/elinks-0.16.0.ebuild | 169 -
 www-client/elinks/elinks-0.16.1.1-r1.ebuild| 168 
 .../files/elinks-0.16.0-fix-build-mujs.patch   |  47 --
 .../elinks/files/elinks-0.16.0-fix-tests.patch |  19 ---
 5 files changed, 404 deletions(-)

diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 462b1a150161..2ce6f1c7bd14 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,2 +1 @@
-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.16.0.ebuild 
b/www-client/elinks/elinks-0.16.0.ebuild
deleted file mode 100644
index 2ee2176e4676..
--- a/www-client/elinks/elinks-0.16.0.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-LUA_COMPAT=( lua5-{1,2,3,4} luajit )
-
-inherit meson lua-single python-any-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 ~ia64 ~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 samba ssl test tre unicode X 
xml zlib zstd"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="lua? ( ${LUA_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? ( >=dev-scheme/guile-1.6.4-r1[deprecated] )
-   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:= )
-   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}"
-BDEPEND="
-   ${PYTHON_DEPS}
-   virtual/pkgconfig
-   nls? ( sys-devel/gettext )
-   test? (
-   net-dns/libidn
-   )
-"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-fix-tests.patch
-   "${FILESDIR}"/${PN}-0.16.0-fix-build-mujs.patch
-)
-
-pkg_setup() {
-   use lua && lua-single_pkg_setup
-
-   python-any-r1_pkg_setup
-}
-
-src_configure() {
-   local emesonargs=(
-   -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
-   -Dgemini=false
-   -Dgettext=true
-   $(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
-   -Dlibev=false
-   -Dlibevent=false
-   -Dluapkg=$(usex lua ${ELUA:-0} '')
-   $(meson_use lzma)
-   $(meson_use mouse)
-

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

2023-07-03 Thread Sam James 
commit: dfefaa456bd69bc14e3a1c2c6c1b0cc19c6b0869
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul  3 15:15:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  3 15:15:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfefaa45

www-client/elinks: fix build w/ perl-5.38

Closes: https://bugs.gentoo.org/909042
Thanks-to: Azamat H. Hackimov  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 www-client/elinks/elinks-0.16.1.1-r2.ebuild| 172 +
 .../elinks/files/elinks-0.16.1.1-perl-5.38.patch   |  62 
 2 files changed, 234 insertions(+)

diff --git a/www-client/elinks/elinks-0.16.1.1-r2.ebuild 
b/www-client/elinks/elinks-0.16.1.1-r2.ebuild
new file mode 100644
index ..16b07eae2f9b
--- /dev/null
+++ b/www-client/elinks/elinks-0.16.1.1-r2.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+LUA_COMPAT=( lua5-{1,2,3,4} luajit )
+
+inherit meson lua-single python-any-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 ~ia64 ~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 samba ssl test tre unicode X 
xml zlib zstd"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="lua? ( ${LUA_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? ( >=dev-scheme/guile-1.6.4-r1[deprecated] )
+   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:= )
+   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="
+   ${PYTHON_DEPS}
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+   test? (
+   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
+}
+
+src_configure() {
+   local emesonargs=(
+   -Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+   -Dhtmldoc=false
+   -Dpdfdoc=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
+   -Dgemini=false
+   $(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
+   -Dlibev=false
+   -Dlibevent=false
+   -Dluapkg=$(usex lua ${ELUA:-0} '')
+   $(meson_use lzma)
+   $(meson_use mouse)
+   #-Dmujs=false
+   $(meson_use nls)
+   $(meson_use nntp)
+   $(meson_use perl)
+   -Dpython=false
+   -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)
+

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

2022-12-31 Thread Sam James 
commit: 88534051b733404af8dd28783a7e7d02ede98c4d
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec 31 22:40:23 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec 31 22:40:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88534051

www-client/elinks: add missing patches

Bug: https://bugs.gentoo.org/797427
Fixes: 032ff4acf3b23136f91f857252ff14abbf724aef
Signed-off-by: Sam James  gentoo.org>

 .../files/elinks-0.16.0-fix-build-mujs.patch   | 47 ++
 .../elinks/files/elinks-0.16.0-fix-tests.patch | 19 +
 2 files changed, 66 insertions(+)

diff --git a/www-client/elinks/files/elinks-0.16.0-fix-build-mujs.patch 
b/www-client/elinks/files/elinks-0.16.0-fix-build-mujs.patch
new file mode 100644
index ..030280c61f1e
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.16.0-fix-build-mujs.patch
@@ -0,0 +1,47 @@
+https://github.com/rkd77/elinks/issues/204
+https://github.com/rkd77/elinks/pull/205
+
+From 5cb602191830737531f8c715f47f7429959b2471 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Sat, 31 Dec 2022 21:06:57 +
+Subject: [PATCH] Fix build failures with mujs
+
+Closes: https://github.com/rkd77/elinks/issues/204
+Signed-off-by: Sam James 
+--- a/src/document/html/parser/general.c
 b/src/document/html/parser/general.c
+@@ -41,6 +41,9 @@
+ /* Unsafe macros */
+ #include "document/html/internal.h"
+ 
++#if defined(CONFIG_ECMASCRIPT_SMJS) || defined(CONFIG_QUICKJS) || 
defined(CONFIG_MUJS)
++#include "ecmascript/ecmascript.h"
++#endif
+ 
+ void
+ html_span(struct html_context *html_context, char *a,
+--- a/src/document/html/parser/stack.c
 b/src/document/html/parser/stack.c
+@@ -27,6 +27,10 @@
+ /* Unsafe macros */
+ #include "document/html/internal.h"
+ 
++#if defined(CONFIG_ECMASCRIPT_SMJS) || defined(CONFIG_QUICKJS) || 
defined(CONFIG_MUJS)
++#include "ecmascript/ecmascript.h"
++#endif
++
+ #if 0 //def CONFIG_XML
+ #include 
+ #endif
+--- a/src/ecmascript/ecmascript.h
 b/src/ecmascript/ecmascript.h
+@@ -5,6 +5,8 @@
+ /* In the future you will get DOM, a complete ECMAScript interface and free
+  * plasm displays for everyone. */
+ 
++#include 
++
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+

diff --git a/www-client/elinks/files/elinks-0.16.0-fix-tests.patch 
b/www-client/elinks/files/elinks-0.16.0-fix-tests.patch
new file mode 100644
index ..6b46b63afcdd
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.16.0-fix-tests.patch
@@ -0,0 +1,19 @@
+https://github.com/rkd77/elinks/issues/203
+https://github.com/rkd77/elinks/commit/aa8d7989815d48b6afdc3e321bd859f4453bacf2
+
+From aa8d7989815d48b6afdc3e321bd859f4453bacf2 Mon Sep 17 00:00:00 2001
+From: Witold Filipczyk 
+Date: Fri, 30 Dec 2022 09:35:41 +0100
+Subject: [PATCH] [test] Strange endif . Refs #203
+
+--- a/src/dom/test/meson.build
 b/src/dom/test/meson.build
+@@ -28,7 +28,6 @@ meson.source_root()+'/src/dom/sgml/xbel/xbel.c',
+ testdeps,
+ c_args:['-DHAVE_CONFIG_H'], cpp_args:['-DHAVE_CONFIG_H'], 
include_directories:['.', '../..', '../../..'],
+ build_by_default:false)
+-endif
+ 
+ test_lib = environment({'TEST_LIB': meson.source_root()+'/test/libtest.sh'})
+ 
+

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

2022-10-13 Thread Sam James 
commit: c668a56d7831a5fd719670df83ac86b5ae44b718
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct 13 19:54:54 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 13 19:54:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c668a56d

www-client/elinks: fix build w/ USE=-mouse

Closes: https://bugs.gentoo.org/876953
Signed-off-by: Sam James  gentoo.org>

 www-client/elinks/elinks-0.15.1-r1.ebuild  |  4 +++
 .../files/elinks-0.15.1-no-mouse-build.patch   | 40 ++
 2 files changed, 44 insertions(+)

diff --git a/www-client/elinks/elinks-0.15.1-r1.ebuild 
b/www-client/elinks/elinks-0.15.1-r1.ebuild
index 20caa1f92b40..655204af0f0f 100644
--- a/www-client/elinks/elinks-0.15.1-r1.ebuild
+++ b/www-client/elinks/elinks-0.15.1-r1.ebuild
@@ -59,6 +59,10 @@ BDEPEND="
virtual/pkgconfig
 "
 
+PATCHES=(
+   "${FILESDIR}"/${P}-no-mouse-build.patch
+)
+
 pkg_setup() {
use lua && lua-single_pkg_setup
 

diff --git a/www-client/elinks/files/elinks-0.15.1-no-mouse-build.patch 
b/www-client/elinks/files/elinks-0.15.1-no-mouse-build.patch
new file mode 100644
index ..cee5bdac4a83
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.15.1-no-mouse-build.patch
@@ -0,0 +1,40 @@
+https://bugs.gentoo.org/876953
+https://github.com/rkd77/elinks/issues/189
+https://github.com/rkd77/elinks/commit/d229ebe89cb2a5e08e9d0af98faaa59ba2089fb3
+
+From d229ebe89cb2a5e08e9d0af98faaa59ba2089fb3 Mon Sep 17 00:00:00 2001
+From: Witold Filipczyk 
+Date: Fri, 9 Sep 2022 11:30:21 +0200
+Subject: [PATCH] [options] Do not compile-in mouse related functions when
+ mouse support is disabled. Refs #189
+
+--- a/src/config/options.c
 b/src/config/options.c
+@@ -896,6 +896,7 @@ change_hook_ui_double_esc(struct session *ses, struct 
option *current, struct op
+   return 0;
+ }
+ 
++#ifdef CONFIG_MOUSE
+ static int
+ change_hook_ui_mouse_disable(struct session *ses, struct option *current, 
struct option *changed)
+ {
+@@ -911,7 +912,7 @@ change_hook_ui_mouse_disable(struct session *ses, struct 
option *current, struct
+   }
+   return 0;
+ }
+-
++#endif
+ 
+ /** Make option templates visible or invisible in the option manager.
+  * This is called once on startup, and then each time the value of the
+@@ -988,7 +989,9 @@ static const struct change_hook_info change_hooks[] = {
+   { "ui.colors",  change_hook_ui_colors },
+   { "ui.double_esc",  change_hook_ui_double_esc },
+   { "ui.language",change_hook_language },
++#ifdef CONFIG_MOUSE
+   { "ui.mouse_disable",   change_hook_ui_mouse_disable },
++#endif
+   { "ui", change_hook_ui },
+   { NULL, NULL },
+ };
+

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

2021-03-31 Thread Conrad Kostecki 
commit: 1a2cdb4f630c00f7d1271ce095a32fce5d95b637
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Mar 29 18:04:24 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Mar 31 19:50:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a2cdb4f

www-client/elinks: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/20185
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 www-client/elinks/files/elinks-0.13.4-ruby-gcc10.patch | 13 -
 1 file changed, 13 deletions(-)

diff --git a/www-client/elinks/files/elinks-0.13.4-ruby-gcc10.patch 
b/www-client/elinks/files/elinks-0.13.4-ruby-gcc10.patch
deleted file mode 100644
index 380dce51f0d..000
--- a/www-client/elinks/files/elinks-0.13.4-ruby-gcc10.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/rkd77/felinks/pull/61
-
 a/src/scripting/ruby/core.h
-+++ b/src/scripting/ruby/core.h
-@@ -21,7 +21,7 @@
- #define RB_ERRINFO (ruby_errinfo)
- #endif
- 
--VALUE erb_module;
-+extern VALUE erb_module;
- 
- void alert_ruby_error(struct session *ses, unsigned char *msg);
- void erb_report_error(struct session *ses, int state);

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

2020-08-07 Thread Sam James 
commit: 977cfe6dac1a14198581c281213d8cff4be1e9b5
Author: Felix Janda  posteo  de>
AuthorDate: Sun Aug  2 21:27:57 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Aug  7 17:57:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=977cfe6d

www-client/elinks: fix compilation with -fno-common/gcc10

Bug: https://bugs.gentoo.org/730658
Signed-off-by: Felix Janda  posteo.de>
Signed-off-by: Sam James  gentoo.org>

 www-client/elinks/elinks-0.13.4.ebuild |  1 +
 www-client/elinks/elinks-.ebuild   |  1 +
 www-client/elinks/files/elinks-0.13.4-ruby-gcc10.patch | 13 +
 3 files changed, 15 insertions(+)

diff --git a/www-client/elinks/elinks-0.13.4.ebuild 
b/www-client/elinks/elinks-0.13.4.ebuild
index 82731e98cab..c4b601e544b 100644
--- a/www-client/elinks/elinks-0.13.4.ebuild
+++ b/www-client/elinks/elinks-0.13.4.ebuild
@@ -46,6 +46,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
"${FILESDIR}"/${PN}--parallel-make.patch
+   "${FILESDIR}"/${P}-ruby-gcc10.patch
 )
 
 src_prepare() {

diff --git a/www-client/elinks/elinks-.ebuild 
b/www-client/elinks/elinks-.ebuild
index 16eb304d3e7..ce228d3832a 100644
--- a/www-client/elinks/elinks-.ebuild
+++ b/www-client/elinks/elinks-.ebuild
@@ -46,6 +46,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
"${FILESDIR}"/${P}-parallel-make.patch
+   "${FILESDIR}"/${PN}-0.13.4-ruby-gcc10.patch
 )
 
 src_unpack() {

diff --git a/www-client/elinks/files/elinks-0.13.4-ruby-gcc10.patch 
b/www-client/elinks/files/elinks-0.13.4-ruby-gcc10.patch
new file mode 100644
index 000..380dce51f0d
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.13.4-ruby-gcc10.patch
@@ -0,0 +1,13 @@
+https://github.com/rkd77/felinks/pull/61
+
+--- a/src/scripting/ruby/core.h
 b/src/scripting/ruby/core.h
+@@ -21,7 +21,7 @@
+ #define RB_ERRINFO (ruby_errinfo)
+ #endif
+ 
+-VALUE erb_module;
++extern VALUE erb_module;
+ 
+ void alert_ruby_error(struct session *ses, unsigned char *msg);
+ void erb_report_error(struct session *ses, int state);

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

2020-06-25 Thread Conrad Kostecki 
commit: c1e16c63ed685067d33b04dd48b9043dbc36daaf
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Jun 24 18:10:50 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Jun 25 07:30:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1e16c63

www-client/elinks: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/16400
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../files/elinks-0.10.4.conf-syscharset.diff   | 79 --
 .../elinks-0.12pre5-spidermonkey-callback.patch| 12 
 2 files changed, 91 deletions(-)

diff --git a/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff 
b/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
deleted file mode 100644
index 83accf4c2d9..000
--- a/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
+++ /dev/null
@@ -1,79 +0,0 @@
 a/elinks-0.10.4.conf   2005-04-08 15:29:49.0 -0700
-+++ b/elinks-0.10.4-syscharset.conf2006-11-04 00:26:26.0 -0800
-@@ -12,8 +12,6 @@
-   # obsolete config.saving_style. You shouldn't touch it.
-   set config.saving_style_w = 1
- 
--## terminal.linux.charset 
--set terminal.linux.charset = "us-ascii"
- ## terminal.linux.transparency [0|1]
- set terminal.linux.transparency = 1
- ## terminal.linux.colors [0|1]
-@@ -29,8 +27,6 @@
- ## terminal.linux.type 
- set terminal.linux.type = 2
- 
--## terminal.vt100.charset 
--set terminal.vt100.charset = "us-ascii"
- ## terminal.vt100.transparency [0|1]
- set terminal.vt100.transparency = 1
- ## terminal.vt100.colors [0|1]
-@@ -46,8 +42,6 @@
- ## terminal.vt100.type 
- set terminal.vt100.type = 1
- 
--## terminal.vt110.charset 
--set terminal.vt110.charset = "us-ascii"
- ## terminal.vt110.transparency [0|1]
- set terminal.vt110.transparency = 1
- ## terminal.vt110.colors [0|1]
-@@ -63,8 +57,6 @@
- ## terminal.vt110.type 
- set terminal.vt110.type = 1
- 
--## terminal.xterm.charset 
--set terminal.xterm.charset = "us-ascii"
- ## terminal.xterm.transparency [0|1]
- set terminal.xterm.transparency = 1
- ## terminal.xterm.colors [0|1]
-@@ -80,8 +72,6 @@
- ## terminal.xterm.type 
- set terminal.xterm.type = 1
- 
--## terminal.xterm-color.charset 
--set terminal.xterm-color.charset = "us-ascii"
- ## terminal.xterm-color.transparency [0|1]
- set terminal.xterm-color.transparency = 1
- ## terminal.xterm-color.colors [0|1]
-@@ -96,8 +86,7 @@
- set terminal.xterm-color.m11_hack = 0
- ## terminal.xterm-color.type 
- set terminal.xterm-color.type = 1
--## terminal.screen.charset 
--set terminal.screen.charset = "us-ascii"
-+
- ## terminal.screen.transparency [0|1]
- set terminal.screen.transparency = 1
- ## terminal.screen.colors [0|1]
-@@ -270,10 +259,6 @@
- 
- 
- 
--## document.codepage.assume 
--# Default document codepage.
--set document.codepage.assume = "ISO-8859-1"
--
- ## document.codepage.force_assumed [0|1]
- # Ignore charset info sent by server.
- set document.codepage.force_assumed = 0
-@@ -343,10 +328,6 @@
- 
- 
- 
--## document.dump.codepage 
--# Codepage used in dump output.
--set document.dump.codepage = "us-ascii"
--
- ## document.dump.width 
- # Width of screen in characters when dumping a HTML document.
- set document.dump.width = 80

diff --git 
a/www-client/elinks/files/elinks-0.12pre5-spidermonkey-callback.patch 
b/www-client/elinks/files/elinks-0.12pre5-spidermonkey-callback.patch
deleted file mode 100644
index b48ddaeecc4..000
--- a/www-client/elinks/files/elinks-0.12pre5-spidermonkey-callback.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurp elinks-0.12pre5-orig/src/ecmascript/spidermonkey.c 
elinks-0.12pre5/src/ecmascript/spidermonkey.c
 elinks-0.12pre5-orig/src/ecmascript/spidermonkey.c 2011-06-12 
01:03:02.427000686 +0200
-+++ elinks-0.12pre5/src/ecmascript/spidermonkey.c  2011-06-12 
01:03:31.368000736 +0200
-@@ -130,7 +130,7 @@ setup_safeguard(struct ecmascript_interp
- JSContext *ctx)
- {
-   interpreter->exec_start = time(NULL);
--  JS_SetBranchCallback(ctx, safeguard);
-+  JS_SetOperationCallback(ctx, safeguard);
- }
- 
-

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

2017-10-22 Thread Patrice Clement 
commit: f6c9ef19a22b679ef1b1a503b73631ca0d26e0ba
Author: Felix Janda  posteo  de>
AuthorDate: Sun Oct 15 00:53:29 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Oct 22 16:55:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6c9ef19

www-client/elinks: bump live ebuild to EAPI 6.

 www-client/elinks/elinks-.ebuild   | 47 +++---
 .../files/elinks-0.10.4.conf-syscharset.diff   |  4 +-
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/www-client/elinks/elinks-.ebuild 
b/www-client/elinks/elinks-.ebuild
index ca4b6b2466c..0cd77903130 100644
--- a/www-client/elinks/elinks-.ebuild
+++ b/www-client/elinks/elinks-.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
-inherit autotools eutils git-r3 flag-o-matic python-any-r1
+inherit autotools git-r3 python-any-r1
 
 EGIT_REPO_URI="git://repo.or.cz/elinks.git"
 
@@ -42,36 +42,39 @@ DEPEND="
javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+   "${FILESDIR}"/${P}-parallel-make.patch
+   )
+
 src_unpack() {
default
git-r3_src_unpack
 }
 
 src_prepare() {
-   mv "${WORKDIR}/${PN}-0.10.4.conf" "${WORKDIR}/${PN}.conf"
+   default
+
+   cd "${WORKDIR}" || die
+   eapply "${FILESDIR}"/${PN}-0.10.4.conf-syscharset.diff
+   mv ${PN}-0.10.4.conf ${PN}.conf || die
if ! use ftp ; then
-   sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' "${WORKDIR}"/${PN}.conf
+   sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' ${PN}.conf || die
fi
-   sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' 
"${WORKDIR}"/${PN}.conf
-   epatch "${FILESDIR}"/${P}-parallel-make.patch
-
-   epatch_user
+   sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' ${PN}.conf || die
+   cd "${S}" || die
 
# Regenerate acinclude.m4 - based on autogen.sh.
-   cat > acinclude.m4 <<- _EOF
+   cat > acinclude.m4 <<- _EOF || die
dnl Automatically generated from config/m4/ files.
dnl Do not modify!
_EOF
-   cat config/m4/*.m4 >> acinclude.m4
-   sed -i -e 's/-Werror//' configure*
+   cat config/m4/*.m4 >> acinclude.m4 || die
+   sed -i -e 's/-Werror//' configure* || die
 
eautoreconf
 }
 
 src_configure() {
-   # NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
-   # As GNUTLS is not yet 100% stable and its support in ELinks is not so 
well
-   # tested yet, it's recommended for users to give a strong preference to 
OpenSSL whenever possible.
local myconf=""
 
if use debug ; then
@@ -80,6 +83,9 @@ src_configure() {
myconf="--enable-fastmem"
fi
 
+   # NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
+   # As GNUTLS is not yet 100% stable and its support in ELinks is not so 
well
+   # tested yet, it's recommended for users to give a strong preference to 
OpenSSL whenever possible.
if use ssl ; then
myconf="${myconf} --with-openssl=${EPREFIX}/usr"
else
@@ -125,20 +131,16 @@ src_compile() {
 src_install() {
emake V=1 DESTDIR="${D}" install
 
-   insopts -m 644 ; insinto /etc/elinks
+   insinto /etc/elinks
doins "${WORKDIR}"/elinks.conf
newins contrib/keybind-full.conf keybind-full.sample
newins contrib/keybind.conf keybind.conf.sample
 
dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO 
doc/*.*
docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*}
-   insinto /usr/share/doc/${PF}/contrib/lua ; doins 
contrib/lua/{*.lua,elinks-remote}
-   insinto /usr/share/doc/${PF}/contrib/conv ; doins contrib/conv/*.*
-   insinto /usr/share/doc/${PF}/contrib/guile ; doins contrib/guile/*.scm
-
-   # Remove some conflicting files on OSX.  The files provided by OSX 10.4
-   # are more or less the same.  -- Fabian Groffen (2005-06-30)
-   rm -f "${ED}"/usr/share/locale/locale.alias 
"${ED}"/usr/lib/charset.alias || die
+   docinto contrib/lua ; dodoc contrib/lua/{*.lua,elinks-remote}
+   docinto contrib/conv ; dodoc contrib/conv/*.*
+   docinto contrib/guile ; dodoc contrib/guile/*.scm
 }
 
 pkg_postinst() {
@@ -154,5 +156,4 @@ pkg_postinst() {
einfo
einfo "You will have to set your TERM variable to 'xterm-256color'"
einfo "to be able to use 256 colors in elinks."
-   echo
 }

diff --git a/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff 
b/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
index dc64712b29a..83accf4c2d9 100644
--- a/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
+++ b/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
@@ -1,5

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

2017-02-14 Thread Patrice Clement 
commit: b1e78407cdca2d31fbbd9400812da3a182d4e1d5
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Tue Feb 14 19:14:25 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Feb 14 21:20:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1e78407

www-client/elinks: remove unused patch.

Closes: https://github.com/gentoo/gentoo/pull/3970

 .../elinks/files/elinks-0.11.5-makefile.patch  | 30 --
 1 file changed, 30 deletions(-)

diff --git a/www-client/elinks/files/elinks-0.11.5-makefile.patch 
b/www-client/elinks/files/elinks-0.11.5-makefile.patch
deleted file mode 100644
index beab9a9349..00
--- a/www-client/elinks/files/elinks-0.11.5-makefile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naurp elinks-0.11.5-orig/Makefile.lib elinks-0.11.5/Makefile.lib
 elinks-0.11.5-orig/Makefile.lib2008-11-30 13:30:08.0 +0100
-+++ elinks-0.11.5/Makefile.lib 2008-11-30 19:50:46.0 +0100
-@@ -95,9 +95,14 @@ endif
- 
- # All files in $(OBJS) and any $(subdir)/lib.o are linked into lib.o.
- # Sort them to filter out duplicated and get uniform order.
-+SUBDIR_LIB_O_DEPS = \
-+ $(foreach subdir,$(sort $(SUBDIRS)),$(subdir)/$(LIB_O_NAME))
-+
- LIB_O_DEPS = \
-- $(sort $(filter-out $(LIB_O_NAME),$(OBJS))) \
-- $(foreach subdir,$(sort $(SUBDIRS)),$(wildcard $(subdir)/$(LIB_O_NAME)))
-+ $(sort $(filter-out $(LIB_O_NAME),$(OBJS))) $(SUBDIR_LIB_O_DEPS)
-+
-+$(SUBDIR_LIB_O_DEPS):
-+  @$(call ncmd,recmake,$(subst /$(LIB_O_NAME),,$@),all) || exit 1;
- 
- $(LIB_O_NAME): $(LIB_O_DEPS)
-   $(call cmd,ld_objs)
-@@ -222,7 +227,8 @@ $(RULES_LOCAL):
- 
- # Default deps
- rule_deps = $(1)-recursive $(1)-default $(1)-local
--all:$(call rule_deps,all)
-+all:all-default all-local
-+  @$(MAKE) all-recursive
- install:  $(call rule_deps,install)
- clean:  $(call rule_deps,clean)
- cleanall: $(call rule_deps,cleanall)