gentoo auto-resync : 01:05:2023 - 11:19:44

4 files changed, 185 insertions, 8 deletions

diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 67951efce19b..9155e548d2e8 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -5,8 +5,10 @@ AUX elinks-0.16.0-fix-tests.patch 694 BLAKE2B c56212b531da4ddf4500a1e995a064e39d
 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.tar.xz 2037112 BLAKE2B f09bc57e943628c519f2f64858afa6557e991faaf0b3239c9d9be2bfc8df38ee01989625f7ffd04d1872edcd28fde738002ec7b38ad9371f7890d2c232ed00dd SHA512 2f75dc15c401e9f73cfff76983d3fd8714f0b85ca03c9fafe14b3e590c3ee11704e81728640a6f45d683c87223bf5819f276678b9fab97e1f8668745fcb70e1c
 EBUILD elinks-0.13.5-r100.ebuild 3790 BLAKE2B c1d8ad4eddb3bd0e1c5486a6aeef0b4734a4ac7fb593755623aa1280b1990f004c391be93563b7c897f95cfe5b36c0b491dc0f6840e1a1b85fc1ce8a15b5cc4d SHA512 48d7c6bd01639a1eca8f06109fdd794a3bf5bcfa0da87f282bee8c4b8955af962b935b0e460a8f0163adb51698afce356e193591d6595c5c48da96b30e6f9eee
 EBUILD elinks-0.15.1-r1.ebuild 3978 BLAKE2B e68df736488a299e8d28d858ea2bda36b73c2e1215ba19a738ebf35a1926824895c0f0659a7ff9e0ef8a9da8eae962dd74cbb86c8bdfd5b6bb6761db9731228c SHA512 4f58d448a4bfeae77309062e5da0dbec2e42da7fc34b9b226d6e9d84f9e261ccfdb8e7c7171543bc8e0c97f8c371de0595110d524f66187bb36d76dcd8ca7302
-EBUILD elinks-0.16.0.ebuild 4183 BLAKE2B e1d487b85bc9fafd8c2d524698b3d4e467a5257635426d1d8494a1147b6bcd119dd28b3d716be08758fcfd13da4bbfcb792ae71065221c96228f5b0a1d2fff3f SHA512 485c6f31422c4322b88084f2364e95f5a385287fdf0255ce11b533e3f0c63eb6d9e72a1871085e17c78eb3455a9d4b4141bb1746c6933109be02aa3c61c8d266
-EBUILD elinks-9999.ebuild 4156 BLAKE2B c3eb23223a409e006b3d282e551b1f3728977c128c42d0e14d3b8378b9d8dcf449609f01083af4da3f149b007c475f9a7b69439895e54d984f5da2fe333e2854 SHA512 d9347f8d348b3bf8d2bbc7a30a023360559c58412495d81de19676b2baa047f67ad3289c6aca0873a8df0ed59e0137f7eb0608f8e316388c368a6c3c06467a89
+EBUILD elinks-0.16.0.ebuild 4206 BLAKE2B 0a993e57daaa63cba9960da81afaefb611b0b7b0e09f86d266d031712584d5e610e7750a3335085a254766f471466d26ab47e57999064b2088ad218ee5e3a2a0 SHA512 58eb19d58748958b0a099feae17a6feff2d8c8bedab0c8ccef4cec35f5583af1dc778a1afb0cda44ddb4bedd7c32a8ad800f2bdc5f25ef219572c16700f4402b
+EBUILD elinks-0.16.1.ebuild 4195 BLAKE2B bee28f81331258a40257f5ca084958f7c33ba2dd5f1b7e13c0e0feb72bd05e20c03e898eee675fec766a569f76371f068810ba0157c1737d4995ed5d75ec5ce7 SHA512 02af9bd1f83dcd404abdf759c231f53d522a598f0714f0f58a8b8201a48319da3680dc2afbee0eeafeaa1f45a4299866e82f8a8645eabdcb458b4d43f96d2191
+EBUILD elinks-9999.ebuild 4195 BLAKE2B bee28f81331258a40257f5ca084958f7c33ba2dd5f1b7e13c0e0feb72bd05e20c03e898eee675fec766a569f76371f068810ba0157c1737d4995ed5d75ec5ce7 SHA512 02af9bd1f83dcd404abdf759c231f53d522a598f0714f0f58a8b8201a48319da3680dc2afbee0eeafeaa1f45a4299866e82f8a8645eabdcb458b4d43f96d2191
 MISC metadata.xml 1005 BLAKE2B 1e40dd6ba072df609a2ec93e5ae5af079137e19d38b058df45dbe63e4ecfb6facc9d89a206991713616d9c0671eece6ebbe8eeaa9e4c284e982bada17c149570 SHA512 432636be610931a5087b3ebcf70d250b212b8c4f7c236679a2a5207996393329b3db31432228fa6ac2e2fd8348d8e2c04dba9b817526ecbe314276f55e0dfe2e
diff --git a/www-client/elinks/elinks-0.16.0.ebuild b/www-client/elinks/elinks-0.16.0.ebuild
index ee2c6e22b5ed..f491cf7e61f1 100644
--- a/www-client/elinks/elinks-0.16.0.ebuild
+++ b/www-client/elinks/elinks-0.16.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
 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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
@@ -60,8 +60,11 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	${PYTHON_DEPS}
-	nls? ( sys-devel/gettext )
 	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? (
+		net-dns/libidn
+	)
 "
 
 PATCHES=(
diff --git a/www-client/elinks/elinks-0.16.1.ebuild b/www-client/elinks/elinks-0.16.1.ebuild
new file mode 100644
index 000000000000..180537f142e7
--- /dev/null
+++ b/www-client/elinks/elinks-0.16.1.ebuild
@@ -0,0 +1,167 @@
+# 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 ~sparc-solaris ~x64-solaris ~x86-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/libidn2:= )
+	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/libidn2
+	)
+"
+
+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
+		-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-9999.ebuild b/www-client/elinks/elinks-9999.ebuild
index 887047f30005..180537f142e7 100644
--- a/www-client/elinks/elinks-9999.ebuild
+++ b/www-client/elinks/elinks-9999.ebuild
@@ -24,8 +24,7 @@ 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"
-# tests restricted for https://github.com/rkd77/elinks/issues/203
-RESTRICT="!test? ( test ) test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
 RDEPEND="
@@ -36,7 +35,7 @@ RDEPEND="
 		>=sys-libs/gpm-1.20.0-r5
 	)
 	guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] )
-	idn? ( net-dns/libidn:= )
+	idn? ( net-dns/libidn2:= )
 	javascript? (
 		dev-cpp/libxmlpp:5.0
 		dev-lang/mujs:=
@@ -61,8 +60,11 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	${PYTHON_DEPS}
-	nls? ( sys-devel/gettext )
 	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? (
+		net-dns/libidn2
+	)
 "
 
 pkg_setup() {
@@ -73,6 +75,9 @@ 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)