commit: bd5471bfd6e7c14facf9052c6bcf11835c8b1ff2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 02:03:32 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 02:03:32 2023 +0000
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 <sam <AT> 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..000000000000
--- 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} == *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 ~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)
- #-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)
- 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 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
-}
-
-pkg_postinst() {
- 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/elinks-0.16.1.1-r1.ebuild
b/www-client/elinks/elinks-0.16.1.1-r1.ebuild
deleted file mode 100644
index c3e902bb281e..000000000000
--- a/www-client/elinks/elinks-0.16.1.1-r1.ebuild
+++ /dev/null
@@ -1,168 +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} == *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 ~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
- )
-"
-
-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)
- 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 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
-}
-
-pkg_postinst() {
- 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.16.0-fix-build-mujs.patch
b/www-client/elinks/files/elinks-0.16.0-fix-build-mujs.patch
deleted file mode 100644
index 030280c61f1e..000000000000
--- a/www-client/elinks/files/elinks-0.16.0-fix-build-mujs.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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 <s...@gentoo.org>
-Date: Sat, 31 Dec 2022 21:06:57 +0000
-Subject: [PATCH] Fix build failures with mujs
-
-Closes: https://github.com/rkd77/elinks/issues/204
-Signed-off-by: Sam James <s...@gentoo.org>
---- 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 <libxml++/libxml++.h>
- #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 <stdbool.h>
-+
- #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
deleted file mode 100644
index 6b46b63afcdd..000000000000
--- a/www-client/elinks/files/elinks-0.16.0-fix-tests.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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 <wite...@poczta.onet.pl>
-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'})
-
-
