gentoo auto-resync : 30:12:2022 - 02:16:21

3 files changed, 176 insertions, 4 deletions

diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index ae5d8d9bc137..27e88b549d4d 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -2,7 +2,9 @@ AUX elinks-0.13.5-parallel-make.patch 1620 BLAKE2B d3b345813b9c9c82a93f2709036d9
 AUX elinks-0.15.1-no-mouse-build.patch 1363 BLAKE2B 226f194389aa48520089c62a15c9c910aa7db9cac56c2922c321d5e7cda08df09a2075fd2a077dbe3fbaab5b4b60809d69e6536ae3f5a4ddfb64b97f60e30824 SHA512 faa9dcd6cce8dda22e4a9366b8b0af282b720b2232fa8012d15762cad233429ae4bb1c763a8cb630155d845e4c089e2f01bea3bce1529c5fb7a686170351d76d
 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
 EBUILD elinks-0.13.5-r100.ebuild 3790 BLAKE2B 776e05d0e117f418c3a6b287e458b7fc928769516b1212518c369f2f3c8fd060ae8650dfec516dde7181ae8baa03f607d4b67732af5c629e6c60b5dd856ef7e3 SHA512 e05697df2ea94642e0a5cc8a970b4a52e2bd50b4013d4db0f2dc8b6d9337f2dd8416fc4a1f8ae7e8cefc4087c595014d3a772c1344e08cac8a793808bd1badcc
 EBUILD elinks-0.15.1-r1.ebuild 3978 BLAKE2B 4f63ecb1b0014efaa34dd4ecac26df07b05e6e4d35a1cf71c4e5e957b4bf1d192875b108626730044aed00e96a6b965159d392433e3b591a7d7755c2b7052477 SHA512 3b2fe6c3bb9b56f9ecfe46f6b4b7e5ae5f779abb76747e67d303879edd91d31c6ca2237245b14683c969f4e2c87126ee2d9d41a2cbd90a5f8c31cbf187159130
-EBUILD elinks-9999.ebuild 3913 BLAKE2B 8aec699ce63d79d01874c1df8560e28b2f6ca92d1499f8a41c92aaa68d8e75d056273d4db8d3ba86503067bfefc961fd8b4f1481d1f4b8bee3886d0d53448346 SHA512 3c7c939b3b77df70d98f8ff2e55e7d1ab6bff5240cf9b5a3adba8f6872937598db928c2e862d278e855b81beacd1bb8239056bdae63b49946abf36f09d11a517
+EBUILD elinks-0.16.0.ebuild 4156 BLAKE2B 0146011c3ecbf5f8eec21e98c621a1dcbb7b18d9934ab6fc3a9aad80fe3a53c246ef645db25fa7044a02ee153bdf1ff5f088bae295a75bcc18ab9d4aa68a2f7b SHA512 65ebd103c7f61d855cdead32c27dbdc4f4ee8124b0c368eec8468158e7c681acba052ed7abee9eb69e930080b267d77664324ed1b8710e5d7852ebbc5e13114a
+EBUILD elinks-9999.ebuild 4156 BLAKE2B 0146011c3ecbf5f8eec21e98c621a1dcbb7b18d9934ab6fc3a9aad80fe3a53c246ef645db25fa7044a02ee153bdf1ff5f088bae295a75bcc18ab9d4aa68a2f7b SHA512 65ebd103c7f61d855cdead32c27dbdc4f4ee8124b0c368eec8468158e7c681acba052ed7abee9eb69e930080b267d77664324ed1b8710e5d7852ebbc5e13114a
 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
new file mode 100644
index 000000000000..4c021b32fc24
--- /dev/null
+++ b/www-client/elinks/elinks-0.16.0.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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 ~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"
+# tests restricted for https://github.com/rkd77/elinks/issues/203
+RESTRICT="!test? ( 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}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+
+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-9999.ebuild b/www-client/elinks/elinks-9999.ebuild
index 20caa1f92b40..4c021b32fc24 100644
--- a/www-client/elinks/elinks-9999.ebuild
+++ b/www-client/elinks/elinks-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-LUA_COMPAT=( lua5-{1,2} )
+LUA_COMPAT=( lua5-{1,2,3,4} luajit )
 
 inherit meson lua-single python-any-r1
 
@@ -22,8 +22,10 @@ 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"
+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"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
 RDEPEND="
@@ -35,6 +37,10 @@ RDEPEND="
 	)
 	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:= )
@@ -84,6 +90,7 @@ src_configure() {
 		-Dgssapi=false
 		-Dhtml-highlight=true
 		$(meson_use idn)
+		$(meson_use javascript mujs)
 		-Dipv6=true
 		-Dleds=true
 		-Dlibev=false
@@ -102,6 +109,7 @@ src_configure() {
 		-Dsm-scripting=false
 		-Dspidermonkey=false
 		-Dterminfo=true
+		$(meson_use test)
 		$(meson_use tre)
 		-Dtrue-color=true
 		$(meson_use xml xbel)