gentoo resync : 29.01.2021

5 files changed, 21 insertions, 125 deletions

diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index 895bd9426a5b..aa97d1979600 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -1,9 +1,7 @@
 AUX lynx-2.8.6-mint.patch 1001 BLAKE2B 960b2401c262d2b3cb46a443eaa1bf0e8f890745aa2dd8b2455304ff3add46152e3844639fc033d686d0d473e8abc1ba148dbaeecbbd8965e6d941cc75564ca8 SHA512 c3f99d760886139c85aca68d99e4a51d57690c02348c6a5c42bbd640cb848682070e6ca7f13ae7a85ec58659765cb4dc8c58f66919d9276c96dc93f5f31f6674
 AUX lynx-2.8.9_p1-parallel.patch 2127 BLAKE2B f78dd62fdf81dfa3403ad358286dc2e27d76b2bb7a65d877317a22635931499687ac75fea6d02866295a65851cfcd7c5ebf5474e1120104d998119eed132e82b SHA512 fe5ea8caab053c0d4240d34c63ee7cfb81254851eaad7e206e2b840b963ad160982566ba5cbee5fa98c732b3ddd3ff8ed88e3b2b8e6328aaa9d8b5350e2d97bc
-DIST lynx2.8.9rel.1.tar.bz2 2689171 BLAKE2B 7cff536660e8fe77d40a56262c2f12e2093ffbb3e22a5ac8e7eab4410f0255e98df19e51f0c98d53aeb3ba63d0d1c2fcabe145242811bebcafb6e548a162a9fb SHA512 61edbe082684fcbd91bdbf4f4d27c3baf92358811aaffc2f8af46adf23ca7b48aede1520fc5f2a8fc974a2f4bbf4e57e7e6027a187bfc6101e56878c98178e6d
-DIST lynx2.9.0dev.4.tar.bz2 2723001 BLAKE2B aad4a5ad357d77b5f7e6d342178f0fe400d5494f5da8f394f05ff0363b5c09235ce17cba524a008aac821b23174f11528f6f4f8d504acd867449a4ebaa8fd039 SHA512 ea07de2d3d14bc5c79e308ba06436d7b9e37b6f316214821e539a454d0e2989327e2073757b951a7c82fb8db09d8867062a263fd684e1c49d89b8efa27fd611b
 DIST lynx2.9.0dev.5.tar.bz2 2725365 BLAKE2B 0c8529c301796c66211120faeca204beac79b611efb367ab7861736f8d4bcd5e6f287c07d3ef8c56e7137f6b1ea9fbc0b6f31870d02ea62c4a32ffc1b921aacf SHA512 b5ce8afdab835cb65452c9bc016b861db84d8a971f1e5175118ad481708dfbe6cbd336b49602dd92a4db28ecb407ba472e839115b21ab36f5abf4a9057e1b159
-EBUILD lynx-2.8.9_p1.ebuild 2527 BLAKE2B 4444286b1b27d23811bd3fa83cc0cf2e72a3b9ad9b5fd152dc8ba5e9bbcd9418a5c785d503c7ad118284975a2d53175d695a7e10f520895fcc7850d73a6b15c6 SHA512 3616b2b82f025a90c2bf672ca0ab1fd7ff6fdd77db074157a445e593a3377464f509d12227cba27e3610af02b5869c9cb1c95f55d75065c220e0c78496ca53ad
-EBUILD lynx-2.9.0_pre4.ebuild 2546 BLAKE2B 0f1ebe6e1cd66908652b37b2a10d90d435ea736286dd050debe6b2b3c744f5756559e02d855dd94cf0610986e90483be758cdbf371b7fb52f3980c47be139b6f SHA512 c8bbf5df26a52e116871335281e561c682d4a5f0a1973f9806aac6f64c504c896b6e978fd2d278e8d59f7944104f6227b9363952d9efb5be3fa390ef836f0561
-EBUILD lynx-2.9.0_pre5.ebuild 2546 BLAKE2B 0f1ebe6e1cd66908652b37b2a10d90d435ea736286dd050debe6b2b3c744f5756559e02d855dd94cf0610986e90483be758cdbf371b7fb52f3980c47be139b6f SHA512 c8bbf5df26a52e116871335281e561c682d4a5f0a1973f9806aac6f64c504c896b6e978fd2d278e8d59f7944104f6227b9363952d9efb5be3fa390ef836f0561
-MISC metadata.xml 348 BLAKE2B 579b933a675b5a84e1768be567d0ede438995c2f075519f214ff1d9430ff230058ed30a16b3d1ff58ea79a73d487db372cb4237d749be00ee4f8f86cbef153e1 SHA512 836cdc6de0757684512955ee56620611ea89f6d1f5fd9c0b2ee470fc2cf5d5bac75ccfec2ddbc083dd5ead28e4274784ad434b5c5c99de4de42b81ffaccb1ce8
+DIST lynx2.9.0dev.6.tar.bz2 2730690 BLAKE2B 2b176db49ac053e6c057b366b625883f0877f0bbf9bc2fbc0dfe6a13af48e0c9d5a64de52e794a4e771d7f6b160c74589a9275543f2657cb678bba149cdba38c SHA512 0c15e00a8e36e43671a093182c69593d50bc5c51a4acd92faa59416055bf4a1fd9ecde903a0209963f1f55d1fd85136e8448ca7867e198100ff749c53e1e1531
+EBUILD lynx-2.9.0_pre5.ebuild 2537 BLAKE2B 7e64a44023ecf2b8942f6fce75fde2e53fdd5032361605800381a39430faa6ea2a35c25854c813f6f608a3ab063a59e653a80bb4da9ab7b47ae29a06ea9c5247 SHA512 65e09ad40a225c819a6a81726d398a2f53e5f05a9a6f48c140d81d9adf7be972ee3263a775f381d277909f2e101a95f02f8a58fcf7fc44553e31312789d9dc55
+EBUILD lynx-2.9.0_pre6-r1.ebuild 2596 BLAKE2B ee6673e5b40b29fb620c677767f38bd572b91194f3322d151d827876b95bb2cb38a6d7b5c0010e19b855f04ad9fbe46d0384affd2e386d64beb9d8d624519152 SHA512 f114034e8c7cbc00bf926158b08b4f5ff5803094a75fff394a7dd749a03cf1c52f36e69183fd8def546b0919de912d44e3fae9b09b7a8b37a99624353da209f1
+MISC metadata.xml 432 BLAKE2B 8500ce18bf9e970a3f5e3daefad3145b9080453a0fdd9690bb9e9b4ce910f2a6a29128100dc3084b67da42541e7d3c1c7dc52996585dee8efead3a37a5d1b9bd SHA512 3719f07840adc1180e08d86b6ae6ad16e6ee437ca849f26389f11065559673ba3b29a845a7f57ebb0ae33f003baea81edca05efbb9b3f9da57c9f24478aaa96b
diff --git a/www-client/lynx/lynx-2.8.9_p1.ebuild b/www-client/lynx/lynx-2.8.9_p1.ebuild
deleted file mode 100644
index 2fca39ca5189..000000000000
--- a/www-client/lynx/lynx-2.8.9_p1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# VERSIONING SCHEME TRANSLATION
-# Upstream	:	Gentoo
-# rel.		:	_p
-# pre.		:	_rc
-# dev.		:	_pre
-
-case ${PV} in
-	*_pre*) MY_P="${PN}${PV/_pre/dev.}" ;;
-	*_rc*)  MY_P="${PN}${PV/_rc/pre.}" ;;
-	*_p*|*) MY_P="${PN}${PV/_p/rel.}" ;;
-esac
-
-DESCRIPTION="An excellent console-based web browser with ssl support"
-HOMEPAGE="https://lynx.invisible-island.net/"
-SRC_URI="https://invisible-mirror.net/archives/lynx/tarballs/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode libressl"
-
-RDEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	sys-libs/zlib
-	nls? ( virtual/libintl )
-	ssl? (
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-		gnutls? (
-			dev-libs/libgcrypt:0=
-			>=net-libs/gnutls-2.6.4:=
-		)
-	)
-	bzip2? ( app-arch/bzip2 )
-	idn? ( net-dns/libidn:0= )
-"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.8.6-mint.patch
-	"${FILESDIR}"/${P}-parallel.patch
-)
-
-pkg_setup() {
-	! use ssl && elog "SSL support disabled; you will not be able to access secure websites."
-}
-
-src_configure() {
-	local myconf=(
-		--enable-nested-tables
-		--enable-cgi-links
-		--enable-persistent-cookies
-		--enable-prettysrc
-		--enable-nsl-fork
-		--enable-file-upload
-		--enable-read-eta
-		--enable-color-style
-		--enable-scrollbar
-		--enable-included-msgs
-		--enable-externs
-		--with-zlib
-		$(use_enable nls)
-		$(use_enable idn idna)
-		$(use_enable ipv6)
-		$(use_enable cjk)
-		$(use_enable unicode japanese-utf8)
-		$(use_with bzip2 bzlib)
-		$(usex ssl "--with-$(usex gnutls gnutls ssl)=${EPREFIX}/usr" "")
-		--with-screen=$(usex unicode "ncursesw" "ncurses")
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	# generating translation files in parallel is currently broken
-	use nls && emake -C po -j1
-	emake
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	sed -i "s|^HELPFILE.*$|HELPFILE:file://localhost/usr/share/doc/${PF}/lynx_help/lynx_help_main.html|" \
-			"${ED}"/etc/lynx.cfg || die "lynx.cfg not found"
-	if use unicode ; then
-		sed -i '/^#CHARACTER_SET:/ c\CHARACTER_SET:utf-8' \
-				"${ED}"/etc/lynx.cfg || die "lynx.cfg not found"
-	fi
-
-	dodoc CHANGES COPYHEADER PROBLEMS README
-	dodoc -r docs lynx_help
-}
diff --git a/www-client/lynx/lynx-2.9.0_pre5.ebuild b/www-client/lynx/lynx-2.9.0_pre5.ebuild
index 0c9c22459e20..c82a90f70e34 100644
--- a/www-client/lynx/lynx-2.9.0_pre5.ebuild
+++ b/www-client/lynx/lynx-2.9.0_pre5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://invisible-mirror.net/archives/lynx/tarballs/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode libressl"
 
 RDEPEND="
diff --git a/www-client/lynx/lynx-2.9.0_pre4.ebuild b/www-client/lynx/lynx-2.9.0_pre6-r1.ebuild
index 0c9c22459e20..cdd4dff446f2 100644
--- a/www-client/lynx/lynx-2.9.0_pre4.ebuild
+++ b/www-client/lynx/lynx-2.9.0_pre6-r1.ebuild
@@ -3,12 +3,6 @@
 
 EAPI=7
 
-# VERSIONING SCHEME TRANSLATION
-# Upstream	:	Gentoo
-# rel.		:	_p
-# pre.		:	_rc
-# dev.		:	_pre
-
 case ${PV} in
 	*_pre*) MY_P="${PN}${PV/_pre/dev.}" ;;
 	*_rc*)  MY_P="${PN}${PV/_rc/pre.}" ;;
@@ -53,10 +47,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.8.9_p1-parallel.patch
 )
 
-pkg_setup() {
-	! use ssl && elog "SSL support disabled; you will not be able to access secure websites."
-}
-
 src_configure() {
 	local myconf=(
 		--enable-nested-tables
@@ -77,11 +67,21 @@ src_configure() {
 		$(use_enable cjk)
 		$(use_enable unicode japanese-utf8)
 		$(use_with bzip2 bzlib)
-		$(usex ssl "--with-$(usex gnutls gnutls ssl)=${EPREFIX}/usr" "")
-		--with-screen=$(usex unicode "ncursesw" "ncurses")
+		--with-screen=$(usex unicode ncursesw ncurses)
 	)
+	if use ssl; then
+		myconf+=(
+			--with-$(usex gnutls gnutls ssl)="${EPREFIX}/usr"
+		)
+	fi
 
 	econf "${myconf[@]}"
+
+	# Compared to openssl gnutls-openssl API does not use
+	# default trust store: bug #604526.
+	sed -e \
+		"s|#define SSL_CERT_FILE NULL|#define SSL_CERT_FILE \"${EPREFIX}/etc/ssl/certs/ca-certificates.crt\"|" \
+		-i userdefs.h || die
 }
 
 src_compile() {
diff --git a/www-client/lynx/metadata.xml b/www-client/lynx/metadata.xml
index e8c4509b9a49..65b058a0158a 100644
--- a/www-client/lynx/metadata.xml
+++ b/www-client/lynx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
 	<use>
 		<flag name="ssl">Enable HTTPS support.</flag>
 		<flag name="gnutls">Use gnutls library for HTTPS support (openssl is the default library for HTTPS support).</flag>