gentoo auto-resync : 16:12:2023 - 14:53:46

3 files changed, 9 insertions, 115 deletions

diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index d1119d3bfbb9..2dfb030e7c4d 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -1,12 +1,7 @@
 AUX lynx-2.9.0_pre9-mint.patch 434 BLAKE2B 90b070232eca8f6e8b1cbbd44aff0f6a9c9403c1321db54b14fc468845248285b45dc5a8e57e1ce9021b4ffe517814c5c0ae7c1c270d7db8c1790b417b2806cb SHA512 0ca26d35c8f5493e720913caf5289e89ec7238b0615a7b4198c8cd1e070afc3f776c8e5bdabbf6d252a4060b486e0333f2f94244163413443504979f5cf32fcc
 AUX lynx-2.9.0_pre9-parallel.patch 2625 BLAKE2B aca2c28c6d73f0b22fe378fdad533264580b9cbbf4fc27b780f6063791b473c10b968a5d20a7d0224006b9a8f2446d2a5e49d82b5ebf6dd72ea27c0439f4ecb1 SHA512 e5bc3076deb0766a5c9f388f92d9aed13e20f01a2e5713bb0c17f3bc20c0949e81d5fa399ceb0941dafaa7e54fbcae39617a135fcad233a384b1d7c366a31e70
-DIST lynx2.9.0dev.10.tar.bz2 2748823 BLAKE2B d4d5625091dd19fcbb245b51faca0913241491cc5c176702d04fb967abd960cee8a70ceb0fe769978a954cbf8a3bb3eae6cf096e2af600cb5916988a183479bd SHA512 afc8bbd241045a530d2c869b268fce708077024fea4363902d258a174994424e6cc64f066c63db82f08bb7e368647cbed1d420d596a494982f09ae05ec9e8bf5
-DIST lynx2.9.0dev.10.tar.bz2.asc 729 BLAKE2B 80c7cfa5e91e3b66af3bce2034c435e3bebbd4601034887bafdcad910619fc7141108f994ad4b095b28042e1f412549ab57182da09710f22e1a37f3249204c12 SHA512 386f1ce3d65db6275f999c3e6b9e4af31ca1f8c7bd2577fa0d130df3eb15685c0badc92b1b853805151b30ddda35f6423ad89f62b4983ad102ede770d6b15e60
-DIST lynx2.9.0dev.11.tar.bz2 2761964 BLAKE2B e5830aa84749b693ccf715b6492b9b2613c313770a3e161f6ff0b816d702a2cdb891486849a9cd2a86a534972bd8ec4dbfb6b70485d98ac714ab7d210f9da2b7 SHA512 d7eaf567f145b31fe3ab827768326c0af28c1ef891c280fa45041184a8f3b4e310a9f8c192d1495b55fb0bf5cb2a08e7310aec728a1f906a3d3d391448ae4121
-DIST lynx2.9.0dev.11.tar.bz2.asc 729 BLAKE2B 7eda78aa36b8f4cb8fd72e107e74ad95977a858297b63f11cb6788282d9471751a6d50dca197f30370b4eddd8c4d3f517da25383470057666b0c2de22c1d38f4 SHA512 e6242445a408b8e3c9740e413f84c27573f8f8d7c40c34d258b4ed6637143d3c6e4483ff587e7cf08b5e337642dc54ebf03d7bef24f009fa10c015ac5e3100ff
 DIST lynx2.9.0dev.12.tar.bz2 2762036 BLAKE2B 93bf762271b0419be73b11066b68dcf65e59f4eb1a5c221f0482bc0cad5e88e1cc83eb24c4c40316c37183c37db1178985d4478a2659c9e1b8322e8b6a4c6ff0 SHA512 9dd85d335a0b2c4c28f362cbcbe6499662696286fcc78e827bfafe2787d4a7fcd3faec78a115df8c14ea6e4314a5ea272f5b6353cb13224ecaebb61ae271701b
 DIST lynx2.9.0dev.12.tar.bz2.asc 729 BLAKE2B 0e24df945b714acafc17974a908ca0246e4e4f506416cdb4fedb50a0b081fb87ac2b5e272fc27bbb1eee0aeef69ebb99b75583184e434e017b0edae3d9bde4d8 SHA512 fecfcbbf41f83285019a93b59d3ee38263aa0b8fc03914d41af1f9f3f77e1e376c8c686754d3e1a777d6aa853b4f3cfdca5d2a4ffa2ab3fe6ae4952e61a22e16
-EBUILD lynx-2.9.0_pre10.ebuild 2640 BLAKE2B ecdf1b949ebbe95b9b088c7244af638be4b87ed08c620c7418f4e53ef00cbf21aac2592e9b7cf011a0c635ef3434353eacdc774843be1816165641035087c592 SHA512 8be5d89e47cfd350120109f145fddaaaf4496cad3b8b2277c4acbcfe1e02293d5b6cac8bd6bbb4dbf9dcb6ec77ccddb88ee8689e19b55cb08b33ecf133a871e3
-EBUILD lynx-2.9.0_pre11.ebuild 2699 BLAKE2B ec895a749344273559d638b6b814e8451902df49bcbde40ea27a01d61568d60ee923a29c1d50ca866ccf4e1d7c7e419ca77c6acbf2c9d70307dfe4cbdc8276c5 SHA512 9b65aa2ef898642a92e266cd527c386470c2dfc66601fdb284891c674b2cde5b04273cbdfece788aadfbf6a8a6f0ffeb083c64b1a983942ebaebfbc8c94c5555
 EBUILD lynx-2.9.0_pre12-r1.ebuild 2700 BLAKE2B 752284fdf420a670614bd762d043d72354b787719ebdc7dc032836d761434d99cc0a6a31aa46035f8ef1fde2138eecde234499c0b80e4cbf3c25fb7d32751825 SHA512 4f924b8c10696b8e1c0df5b8f74316bacce31b2a1fa9e9ee28bc46acfc581701fe532829b5c284ce57a0334dfe5d96c0b608111d7e4bab0c79298d3e5480b2b7
+EBUILD lynx-2.9.0_pre12-r2.ebuild 2929 BLAKE2B 039b2ce0e56bc94f5bc0b802cc4df57c3f1b519df4d4860d5aadc43b2a3a84d77d7f2626d699c8b0ef72f7e69d582d64e6009259aa1637b947e4a56912dfa4f7 SHA512 a1104580f1ced74a7e144680fc5c604ab7a2ee9ede1be3080464af3a447c7789b269197a454b9ff880c455db86bd0f09d03ad0ed7113e59d75b1a81e330c72ed
 MISC metadata.xml 521 BLAKE2B 1c520669081f0dfd89ddc4a9a9c121e02fa4e184d28ed796b7e8e160affff889cefedd23b4a0f38d4d4acd2c9e2e8426715a0b8d0f37fa14d4d12fb4f063a9d8 SHA512 2192536d199e0e00dc2add38560b72c8a772966192f394704bc9410674b413791d2d262fefe729a32726f2c9b166f52f7af54d5d71f0868072853c3cfea151b1
diff --git a/www-client/lynx/lynx-2.9.0_pre10.ebuild b/www-client/lynx/lynx-2.9.0_pre10.ebuild
deleted file mode 100644
index 99636f218975..000000000000
--- a/www-client/lynx/lynx-2.9.0_pre10.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc
-inherit verify-sig
-
-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/${PN}/tarballs/${MY_P}.tar.bz2"
-SRC_URI+=" verify-sig? ( https://invisible-mirror.net/archives/${PN}/tarballs/${MY_P}.tar.bz2.asc )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="bzip2 cjk gnutls idn nls ssl"
-
-RDEPEND="
-	sys-libs/ncurses:=[unicode(+)]
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	idn? ( net-dns/libidn:= )
-	nls? ( virtual/libintl )
-	ssl? (
-		!gnutls? (
-			dev-libs/openssl:=
-		)
-		gnutls? (
-			dev-libs/libgcrypt:=
-			>=net-libs/gnutls-2.6.4:=
-		)
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-thomasdickey )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.9.0_pre9-mint.patch"
-	"${FILESDIR}/${PN}-2.9.0_pre9-parallel.patch"
-)
-
-src_configure() {
-	local myconf=(
-		--enable-cgi-links
-		--enable-color-style
-		--enable-externs
-		--enable-file-upload
-		--enable-included-msgs
-		--enable-ipv6
-		--enable-nested-tables
-		--enable-nsl-fork
-		--enable-persistent-cookies
-		--enable-prettysrc
-		--enable-read-eta
-		--enable-scrollbar
-		--with-screen=ncursesw
-		--with-zlib
-		$(use_enable cjk)
-		$(use_enable idn idna)
-		$(use_enable nls)
-		$(use_with bzip2 bzlib)
-	)
-
-	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() {
-	# 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"
-	sed -i '/^#CHARACTER_SET:/ c\CHARACTER_SET:utf-8' \
-			"${ED}"/etc/lynx.cfg || die "lynx.cfg not found"
-
-	dodoc CHANGES COPYHEADER PROBLEMS README
-	dodoc -r docs lynx_help
-}
diff --git a/www-client/lynx/lynx-2.9.0_pre11.ebuild b/www-client/lynx/lynx-2.9.0_pre12-r2.ebuild
index 4c55f714d6ea..d4abe3135114 100644
--- a/www-client/lynx/lynx-2.9.0_pre11.ebuild
+++ b/www-client/lynx/lynx-2.9.0_pre12-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc
-inherit verify-sig
+inherit verify-sig flag-o-matic
 
 case ${PV} in
 	*_pre*) MY_P="${PN}${PV/_pre/dev.}" ;;
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="brotli bzip2 cjk gnutls idn nls ssl"
 
 RDEPEND="
@@ -28,7 +28,7 @@ RDEPEND="
 	sys-libs/zlib
 	brotli? ( app-arch/brotli:= )
 	bzip2? ( app-arch/bzip2 )
-	idn? ( net-dns/libidn:= )
+	idn? ( net-dns/libidn2:= )
 	nls? ( virtual/libintl )
 	ssl? (
 		!gnutls? (
@@ -52,6 +52,11 @@ PATCHES=(
 )
 
 src_configure() {
+	# Temporary fix for bug #918985; seems to be fixed in git but no
+	# development release has yet been made >lynx-2.9.0_pre12. Test if we can
+	# remove this on a newer release.
+	append-cppflags -D_GNU_SOURCE
+
 	local myconf=(
 		--enable-cgi-links
 		--enable-color-style