gentoo resync : 25.11.2020

4 files changed, 312 insertions, 9 deletions

diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 68298ed46eb6..63af33d3899c 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,6 +1,9 @@
 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.13.4.tar.gz 3594672 BLAKE2B 67a44c05a24c200f7b472c6e7c3d0f0966c820ff6d7837ec2cf60e985f5b64cdd63f67103fcc897c293867174cf7162178c2b4af2ec2fdc261b130907cd7f8f7 SHA512 028ed8e6c00de5c65cde80b2e2c42a6568696d277dc8e5645130377d7bb5a3f6adacbea626b6e19ae3e756eb40b4dca5d642839d57943c1a04eb1fe65aa98fe6
+DIST elinks-0.13.5.tar.gz 3600196 BLAKE2B e1e51674b5630d6dab3de3030aee671876750fc97808bf4dca50b505fa2c31af669c4c3773b3830186fb98acda5c692ff1902c6e1240251ea699103a70bb4e43 SHA512 786f6142c03bca4a47a1043ca4f9c36aab431d192eb13bcad14c1da391f5746779a8f65e53eb781dff79f619ceb3ed30ef939eae8d81f64251fad9b803c0ae7b
 EBUILD elinks-0.13.4-r1.ebuild 3779 BLAKE2B 5b30e6086b17eb7bd0696b1f3fbb277cc297730d396f13a0d709098323cd50bc3e284598941cc605598baae41eb3012f7e4e2d385758020b5c3fb69052d20cb6 SHA512 d283ed9034e413d565714558d1c906529352a8c77a8cd71f8449de4ddbd07f9457531c0b88af71d11face66cb2527aa10676070a8995ef5b5db3885578a2b54a
-EBUILD elinks-9999.ebuild 3617 BLAKE2B bb2028ca1dd4434a70e85cd9cc470ab6f95cba18425fc43f4a5ea6090e94bac90f319ad478bfaf70e1b36f899e665fe93b758e320cd3f48bd72c0298a914ae9c SHA512 3abc566d61ee77c57260e645a2cf70b8b28b7ddf578b6057b5ff44b0204abd4d6ff93d4ed15b757a746badcbf91699e02bb158325fb2dcf750dddaab93e7b90b
+EBUILD elinks-0.13.5-r100.ebuild 3870 BLAKE2B 43123c6cade590002c21091603edea982b7f1a3cb58b01f9fc4c270f9b61016a2eb8ec6d2c698b595d2e4a48faf42fd734f49b414ed4dde523426d311b63fcb8 SHA512 91e877d2193a439e6b325cc91778710135c4be5d0afd3869dec1eccc38c1f4f0b829ca4bbd512216aadb4a3c423dc2d1167e46166b32e867c11e28440d335e5b
+EBUILD elinks-0.13.5.ebuild 3797 BLAKE2B 82f8e655e14a8fe41a711668c533f4d9257890c87cf628c7c40713ee7f2848bc27ec46915197a866acdb1c9d541b9b9475249867adaf61bd688c99537016a1b8 SHA512 083cd1dc993c752c184f63b0332bbddaba1736dd295ca470efe07576107579240a31b54015c0eb12565a7df50d39a52a67d93b23056e78b3156cb737a8583822
+EBUILD elinks-9999.ebuild 3693 BLAKE2B 9ff813506cb2e0f251b0783c3b9bd3ecc9887c8048d890ae51a798dcfce765536b9c384ea61b0a91f0f6f5d892656617114353ee20795513d914d7b01c732aee SHA512 eb697d53cdc9e053709631f26ca48813014f0ac22b94c5ef52ba670fb6c58c4e74f90be804c135ac68fb58aa3bfcc80c455e1f8d50b7f970fc8b4b994878514e
 MISC metadata.xml 897 BLAKE2B 1a2d64f8a35ee418538530d129957ec313e8085281f0fa1b8711b3b1b4f378e4b8c18eecb999256b542644cd0b93968f4fc0e8ea48a6daf85afdd073d4c12aec SHA512 74993b896b204fe46cb62c718426bc0421ad49e3591620806f49023ed3c6d24d49b243a2d4cbe18c9aa7ceb5f955caff1480fe8e8e5b1619fd39ca9f21d1a3cb
diff --git a/www-client/elinks/elinks-0.13.5-r100.ebuild b/www-client/elinks/elinks-0.13.5-r100.ebuild
new file mode 100644
index 000000000000..d9da1270435e
--- /dev/null
+++ b/www-client/elinks/elinks-0.13.5-r100.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+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 ~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
+	libressl 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? (
+			!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 )
+	zstd? ( app-arch/zstd:= )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9999-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.13.5.ebuild b/www-client/elinks/elinks-0.13.5.ebuild
new file mode 100644
index 000000000000..278cf123dffe
--- /dev/null
+++ b/www-client/elinks/elinks-0.13.5.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,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
+	libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib zstd"
+
+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? ( >=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 )
+	zstd? ( app-arch/zstd:= )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9999-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-9999.ebuild b/www-client/elinks/elinks-9999.ebuild
index aec8f06d1856..1f801f564c3a 100644
--- a/www-client/elinks/elinks-9999.ebuild
+++ b/www-client/elinks/elinks-9999.ebuild
@@ -3,9 +3,10 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+LUA_COMPAT=( lua5-{1,2} )
 
-inherit autotools git-r3 python-any-r1
+inherit autotools git-r3 lua-single python-any-r1
 
 EGIT_REPO_URI="https://github.com/rkd77/felinks"
 
@@ -16,8 +17,9 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 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"
+	libressl 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:= )
@@ -25,7 +27,7 @@ RDEPEND="
 	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? ( >=dev-lang/lua-5:0= )
+	lua? ( ${LUA_DEPS} )
 	perl? ( dev-lang/perl:= )
 	ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* )
 	samba? ( net-fs/samba )
@@ -37,15 +39,18 @@ RDEPEND="
 		gnutls? ( net-libs/gnutls:= )
 	)
 	tre? ( dev-libs/tre )
-	X? ( x11-libs/libX11 x11-libs/libXt )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXt
+	)
 	xml? ( >=dev-libs/expat-1.95.4 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )"
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+	zstd? ( app-arch/zstd:= )"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-parallel-make.patch
-	"${FILESDIR}"/${PN}-0.13.4-ruby-gcc10.patch
 )
 
 src_unpack() {
@@ -75,12 +80,13 @@ src_configure() {
 		$(use_with bzip2 bzlib)
 		$(use_with guile)
 		$(use_with idn)
-		--with-luapkg=$(usev lua)
+		$(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)