commit: 4ac664e7d86ef49367178cfff9a03936e0fd8289
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 3 15:10:22 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 3 15:10:22 2023 +0000
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 <sam <AT> 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
677eeeeab3fc24dcfe4e7248a9c1a8e07083ebd13bd9923d89702a04dbe1c3e4d4038029c095881183d7f11ae2c5317ff7e5458320644fde0c176378b89068d8
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..000000000000
--- 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)
- $(use_with zstd)
- $(use_enable bittorrent)
- $(use_enable finger)
- $(use_enable ftp)
- $(use_enable gopher)
- $(use_enable ipv6)
- $(use_enable mouse)
- $(use_enable nls)
- $(use_enable nntp)
- $(use_enable samba smb)
- $(use_enable xml xbel)
- )
-
- if use debug ; then
- myconf+=( --enable-debug )
- else
- myconf+=( --enable-fastmem )
- fi
-
- if use ssl ; then
- if use gnutls ; then
- myconf+=( --with-gnutls )
- else
- myconf+=( --with-openssl="${EPREFIX}"/usr )
- fi
- else
- myconf+=( --without-openssl --without-gnutls )
- fi
-
- econf "${myconf[@]}"
-}
-
-src_compile() {
- emake V=1
-}
-
-src_install() {
- emake V=1 DESTDIR="${D}" 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 /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"
- elog
- elog "Please have a look at /etc/elinks/keybind-full.sample and"
- elog "/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.15.1-r1.ebuild
b/www-client/elinks/elinks-0.15.1-r1.ebuild
deleted file mode 100644
index be981f99d36b..000000000000
--- a/www-client/elinks/elinks-0.15.1-r1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-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
- lua lzma +mouse nls nntp perl samba ssl tre unicode X xml zlib zstd"
-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:= )
- 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}
- nls? ( sys-devel/gettext )
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-no-mouse-build.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)
- -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 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.13.5-parallel-make.patch
b/www-client/elinks/files/elinks-0.13.5-parallel-make.patch
deleted file mode 100644
index 86aea5588a2f..000000000000
--- a/www-client/elinks/files/elinks-0.13.5-parallel-make.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/Makefile.lib 2014-05-30 13:45:11.756422117 -0400
-+++ b/Makefile.lib 2014-05-30 13:47:22.626423230 -0400
-@@ -117,7 +117,7 @@
- $(sort $(filter-out $(LIB_O_NAME),$(OBJS))) \
- $(foreach subdir,$(sort $(SUBDIRS)),$(wildcard $(subdir)/$(LIB_O_NAME)))
-
--$(LIB_O_NAME): $(LIB_O_DEPS)
-+$(LIB_O_NAME): all-recursive.built $(LIB_O_DEPS)
- $(call cmd,ld_objs)
-
- DEP_FILES_1 = $(foreach src,$(OBJS),.deps/$(src))
-@@ -260,21 +260,36 @@
- # remaining subdirectories, but return an error at the end.
- $(RULES_REC):
- ifneq (,$(findstring k,$(MAKEFLAGS)))
-- @suberr=0; \
-+ @+suberr=0; \
- $(foreach subdir,$(sort $(SUBDIRS)), \
- $(call ncmd,recmake,$(subdir),$(subst -recursive,,$@)) ||
suberr=1;) \
- exit $$suberr
- else
-- @$(foreach subdir,$(sort $(SUBDIRS)), \
-+ @+$(foreach subdir,$(sort $(SUBDIRS)), \
- $(call ncmd,recmake,$(subdir),$(subst -recursive,,$@)) || exit
1;)
- endif
-
-+all-recursive.built:
-+ifneq (,$(findstring k,$(MAKEFLAGS)))
-+ @+suberr=0; \
-+ $(foreach subdir,$(sort $(SUBDIRS)), \
-+ $(call ncmd,recmake,$(subdir),$(subst -recursive.built,,$@)) ||
suberr=1;) \
-+ [ $$suberr == 0 ] && touch $@; \
-+ exit $$suberr
-+else
-+ @+$(foreach subdir,$(sort $(SUBDIRS)), \
-+ $(call ncmd,recmake,$(subdir),$(subst -recursive.built,,$@)) ||
exit 1;) \
-+ touch $@
-+endif
-+
-+CLEAN += all-recursive.built
-+
- # Dummy -local rules
- $(RULES_LOCAL):
-
- # Default deps
- rule_deps = $(1)-recursive $(1)-default $(1)-local
--all: $(call rule_deps,all)
-+all: $(subst recursive,recursive.built,$(call rule_deps,all))
- install: $(call rule_deps,install)
- clean: $(call rule_deps,clean)
- cleanall: $(call rule_deps,cleanall)
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
deleted file mode 100644
index cee5bdac4a83..000000000000
--- a/www-client/elinks/files/elinks-0.15.1-no-mouse-build.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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 <[email protected]>
-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 },
- };
-
