gentoo resync : 25.08.2020

5 files changed, 191 insertions, 22 deletions

diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 8c0a98cab2d7..54c7ad07091b 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -5,11 +5,14 @@ AUX elinks-0.12_pre5-rand-egd.patch 738 BLAKE2B fb76450867476e21dbad27633d313359
 AUX elinks-0.12_pre5-ruby-1.9.patch 7131 BLAKE2B 5b65d975982986e85ae2f9f8a1a6ac96a49bbdbaaba23bc9bfb93c8b9a5ef3bf380a0752dd1c36b76772d7abd8cf0b37de4731ad4bd77d256749030bd22b8b0e SHA512 41f8b34f9666740fbadffc4e47467670c7766f3b8612933a08cc6febe975f9453c21c393a43927c11ffe7ef6e0875ef09e125c80e84caa9f0917f864cb1d35e6
 AUX elinks-0.12_pre5-sm185-jsval-fixes.patch 3921 BLAKE2B 133785ebccfcdcebf8f3ada684786f0b55109e46332115238b12aff92404f587186e7c1a434d004ae43df434f8cfb283c4746d6bf91d1b00556b06ebfd4ceab7 SHA512 62a96d53b529c409d81094899c75cd7943176628e2b7301a005c6ebf9f660e813fbf1f3df213c43148d425e933208f761090b23b6ae75da93a93b13a1e924a34
 AUX elinks-0.13-ruby.patch 6679 BLAKE2B aac1923c2115743fd29d94e67af069857e03896d5e970297ba84c250f3eef54df24324975639de14a732e84897d21637397b85eb4346dc005d99a252943718cf SHA512 df93eb589fb6d30bdc4ffac8c44a5b1f4db7565d7221f9aa1edb07809cb5ada0797f6a2128bb5c0083134fa2b58ef62a157e7aad32751821f87e15f5760e34ac
+AUX elinks-0.13.4-ruby-gcc10.patch 337 BLAKE2B 4b01f5cd0c311dca3dbc939157e9cb14b95da4a90782ce12ee4b524502852dade5a092c621c9bdc02f315721868237192028c85faceb13afb3d8633d6f1ccf29 SHA512 b40a69a53b48b957175dbab49566ecc73f1a9a77e7e4e1b824b4a5afcd08319842d6f530feeb2afa63e4854b7dd2e980933a481165c9d64289acf16d72f1bec9
 AUX elinks-9999-parallel-make.patch 1620 BLAKE2B d3b345813b9c9c82a93f2709036d9ae63f8014b6ff50d96f5534d1c08a0eaf73825da5cf1605d8a0997c6bd659b621b8f174a555f1adc026823fd2f87196eadb SHA512 bdd612c1ce226115170e97d70519b5ec4816d8469e0cd31ec66000b603c92913645f2b57eca9f030b90af811e43db5647928d27f7bc3a8c06560be40a8063248
 DIST elinks-0.12_pre5-js185-patches.tar.bz2 13820 BLAKE2B b850c66cc74d59c6cfb0c7c6ebaaddfe0706e8cdcc14b1df5232ba2b3c75bf632e3b3e398b200876d7e594b122c6b27227ca92729129ef955174b05e7f0e6a06 SHA512 1552aeacdecb0a2db357402e0474d6b4810c767609d1d399b3350a4bcdc21ba9c0bde5a5d0bffd1d7b27d41ac46e3e85ae2527d715a1645a2dd51ab14b8eab3c
 DIST elinks-0.12pre6.tar.bz2 2854500 BLAKE2B 3d91c2a4b03cf77a2a86131cfb5339a40c6e89c8aaab7293d5b7f6861f0b7647b1951f2bc15814e342c926a154707162a7814981cdc729329dfb04627133f3bf SHA512 bff70faafea7c4739695a7fad8f659109894b318588f5a035a5594a6053238789259ce6067c2f5cb97448f138db143adebb23f84bf689bea209ba37573484b7f
+DIST elinks-0.13.4.tar.gz 3594672 BLAKE2B 67a44c05a24c200f7b472c6e7c3d0f0966c820ff6d7837ec2cf60e985f5b64cdd63f67103fcc897c293867174cf7162178c2b4af2ec2fdc261b130907cd7f8f7 SHA512 028ed8e6c00de5c65cde80b2e2c42a6568696d277dc8e5645130377d7bb5a3f6adacbea626b6e19ae3e756eb40b4dca5d642839d57943c1a04eb1fe65aa98fe6
 DIST elinks-0.13_pre_pre20180225.tar.gz 3518990 BLAKE2B 89c95b1d6e438975f5711f2e83960c90ced451953f395f3d73eeca40e6187b423b3c7d50b065c11673ee9fe03e8ee99a4c7642ebc01eea888c417645a0e53d7d SHA512 3f817768766e6dd6df042f7512163c5de70766e4d565fc081f4f755f7f7958d5487b9ff2ea29187a5cc813dc0841d75d440087fbdaf99f73d2a269dca70d5725
 EBUILD elinks-0.12_pre6-r4.ebuild 4885 BLAKE2B 9c245241dac08a450ee0c278efadda81f3c9c223b97f5571d01118d3ac51e1434f31a73d6e61121c2802429dc2af5e9052803f5e173a0f703a89b1fa25a8beea SHA512 3bb96ccf1729ccb84ed03c1c6c0fbfdd672506f8fe15e72e06c9fdbc34fa03893827198c88cd80dc5164701ff56b064fe34728457eeee1d1040ba94d413b405c
-EBUILD elinks-0.13_pre_pre20180225.ebuild 4016 BLAKE2B f158735d0c1a3d8e449ae50a8896c196ab87041753ea75beb8e36d4d5d596a47a96aa7587f32a90fa20cf35318ef7337d7103af8e950f957ce357a02dc014f67 SHA512 617191ffd9e5ca2d2d342190203fcd6a0e02e99d33a826dc318ba439c68b6b3d506d9accc63bc1082b1929b5716541c0fbb01a061939d971abc7efe5e3f0fa12
-EBUILD elinks-9999.ebuild 3733 BLAKE2B eb3b5c16cdc99b701350551c2c4da2cc4b20bd7ca66b2c8e4035bf51fce17c9bb36a9376840251c07a61c9280c84f5727131c0b71a7ea68869cab1510f73af89 SHA512 f858c2f1509d60766e57802638e890b88ae391e1cab12136aa11065c0298697754acb6230c669dc194cd6d98c2efc88dcb4d4371aaa6ec51c4ecd6eabf3c3721
+EBUILD elinks-0.13.4.ebuild 3842 BLAKE2B d0a5d415b95615e27eae8ecadf0e1b3aab9d951da9b6660bd4b022e00379409c9f9147aaedfe27f7837a3b5639865c378ca89d2be09b8332cc955e6308e4d047 SHA512 2edc9c4755cf13dfb4625451ba2c52a25081f2966128cb363dc36587a344501e701c031cc87e08f0452e75d4bedf3d5e5a0ac332f04af53bd0c6c6a36fabf98d
+EBUILD elinks-0.13_pre_pre20180225.ebuild 4050 BLAKE2B d0f842e3f37062d379145e459ec1bb08c7e424a7a54f18a691666a5dbbdb5f220987ea7c99c50e32492a0867d196c1c6cf05aef7e53de73aead3fd1ea06f3092 SHA512 2af2c070130b58cea5755fffc73c2e0333791614e42cb571bf7a2e6418ed83557a07d4934791d688f8cc8d564ce55a76b010120c773d62624499d0e2a062e2c4
+EBUILD elinks-9999.ebuild 3673 BLAKE2B 9769340042726a76591dbd245326471518007941d2f83458699da984cdd89788d906c49cc3860dd0c60d3956e7e3bb1f929538c27ba365446600ad9a48e15293 SHA512 7a487cfb5f176b950c80409327fb09dae7dedfb6d2f3bed5c03b7f171184185d739c85eedca0eb1ada90b0658fc1b8c1a42b1209df06211f4fe89175f8d7bbef
 MISC metadata.xml 989 BLAKE2B 4b2f65d67e922e7e9cce74761cebca030866842af469ef4776d7cf2f8e685a52f9cbdfee25fb6a29546543e71127f48f93f78593745f6ab151e49250fe1b0259 SHA512 66a3bb8694de90a61d37a4fe5029afc894b12eba7ce7832159f88ca3168ee99c324179b27edf2876f94b4465e81cc218f5d271fff92a495bed11dd6b8ffad990
diff --git a/www-client/elinks/elinks-0.13.4.ebuild b/www-client/elinks/elinks-0.13.4.ebuild
new file mode 100644
index 000000000000..aa8b251b8b4f
--- /dev/null
+++ b/www-client/elinks/elinks-0.13.4.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit autotools 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bittorrent brotli bzip2 debug finger ftp gopher gnutls gpm guile idn ipv6
+	javascript libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib"
+
+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:= )
+	javascript? ( dev-lang/spidermonkey:17= )
+	lua? ( >=dev-lang/lua-5:0= )
+	perl? ( dev-lang/perl:= )
+	ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* )
+	samba? ( net-fs/samba )
+	ssl? (
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl: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 )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9999-parallel-make.patch
+	"${FILESDIR}"/${P}-ruby-gcc10.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
+		$(use_with gpm)
+		$(use_with brotli)
+		$(use_with bzip2 bzlib)
+		$(use_with guile)
+		$(use_with idn)
+		$(use_with javascript spidermonkey)
+		--with-luapkg=$(usev lua)
+		$(use_with perl)
+		$(use_with ruby)
+		$(use_with tre)
+		$(use_with X x)
+		$(use_with zlib)
+		$(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.13_pre_pre20180225.ebuild b/www-client/elinks/elinks-0.13_pre_pre20180225.ebuild
index 61aa540f93cf..cb8f0fdd3d86 100644
--- a/www-client/elinks/elinks-0.13_pre_pre20180225.ebuild
+++ b/www-client/elinks/elinks-0.13_pre_pre20180225.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
+
 inherit autotools python-any-r1
 
 EGIT_COMMIT="0dd3aaabe61fbc5ed0d9a74915678d11d00c2a1c"
@@ -19,12 +21,13 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~a
 IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm guile idn ipv6
 	javascript libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
-	brotli? ( app-arch/brotli )
+	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 )
+	idn? ( net-dns/libidn:= )
 	javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )
 	lua? ( >=dev-lang/lua-5:0= )
 	perl? ( dev-lang/perl:= )
diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild
index 0d10ee080caf..15f8ced61462 100644
--- a/www-client/elinks/elinks-9999.ebuild
+++ b/www-client/elinks/elinks-9999.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
 inherit autotools git-r3 python-any-r1
 
 EGIT_REPO_URI="https://github.com/rkd77/felinks"
@@ -14,23 +15,27 @@ HOMEPAGE="http://elinks.or.cz/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm guile idn ipv6
+IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn ipv6
 	javascript libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
-	brotli? ( app-arch/brotli )
+	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 )
-	javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )
+	idn? ( net-dns/libidn:= )
+	javascript? ( dev-lang/spidermonkey:17= )
 	lua? ( >=dev-lang/lua-5:0= )
 	perl? ( dev-lang/perl:= )
 	ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* )
 	samba? ( net-fs/samba )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+		gnutls? ( net-libs/gnutls:= )
 	)
 	tre? ( dev-libs/tre )
 	X? ( x11-libs/libX11 x11-libs/libXt )
@@ -41,7 +46,8 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${P}-parallel-make.patch
-	)
+	"${FILESDIR}"/${PN}-0.13.4-ruby-gcc10.patch
+)
 
 src_unpack() {
 	default
@@ -70,7 +76,7 @@ src_configure() {
 		$(use_with guile)
 		$(use_with idn)
 		$(use_with javascript spidermonkey)
-		$(use_with lua)
+		--with-luapkg=$(usev lua)
 		$(use_with perl)
 		$(use_with ruby)
 		$(use_with tre)
@@ -94,11 +100,12 @@ 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+=( --with-openssl="${EPREFIX}"/usr )
+		if use gnutls ; then
+			myconf+=( --with-gnutls )
+		else
+			myconf+=( --with-openssl="${EPREFIX}"/usr )
+		fi
 	else
 		myconf+=( --without-openssl --without-gnutls )
 	fi
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 000000000000..380dce51f0dc
--- /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);