[gentoo-commits] repo/gentoo:master commit in: www-client/lynx/, www-client/lynx/files/

["Sam James" <sam@gentoo.org>]

commit:     6c5d635940af3f9a58e48f666befee9f7ba81903
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 02:49:50 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 02:51:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c5d6359

www-client/lynx: add 2.9.0

Bug: https://bugs.gentoo.org/918985
Closes: https://bugs.gentoo.org/898838
Signed-off-by: Sam James <sam <AT> gentoo.org>

 www-client/lynx/Manifest                        |   2 +
 www-client/lynx/files/lynx-2.9.0-mint.patch     |  11 +++
 www-client/lynx/files/lynx-2.9.0-parallel.patch |  64 ++++++++++++++
 www-client/lynx/lynx-2.9.0.ebuild               | 113 ++++++++++++++++++++++++
 4 files changed, 190 insertions(+)

diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index ab28fc800ff8..26bb57d01cbd 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -1,2 +1,4 @@
+DIST lynx2.9.0.tar.bz2 2781819 BLAKE2B 4380d46f28254bda241daae81c2072cd987cdbb4f161c1daa6a5ec8e2c05bb700e4e81d75bd2af744bc19c939638218149e9780cfa83779a9cc8dbdc4b292efb SHA512 4c716a246d80db0558dcdb6599bff9854a7356c43da94e0c854453e68b84e8de8a082c6c48e6329e8f4b6f70711ea41dad5a8f5669c782a8c9ce6351083b2df0
+DIST lynx2.9.0.tar.bz2.asc 729 BLAKE2B 3221a794194554bd7b6fa577e9455a034802de715e93a9b0046ec4d9e367f0bf3a92b5780a7026c2a4a10cab8076d63964fe02f09bafea4f8fab08b27e3c7f6a SHA512 f08e46bf960a54656045d0874a3dd9811511589147bfe764efce43f87eb62d4a3e448b31edad60a485fc51f57d27dc0b87aae9df2e4dce5fbd9dea2f776a8f5d
 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

diff --git a/www-client/lynx/files/lynx-2.9.0-mint.patch b/www-client/lynx/files/lynx-2.9.0-mint.patch
new file mode 100644
index 000000000000..1e934ed37f0f
--- /dev/null
+++ b/www-client/lynx/files/lynx-2.9.0-mint.patch
@@ -0,0 +1,11 @@
+--- a/WWW/Library/Implementation/www_tcp.h
++++ b/WWW/Library/Implementation/www_tcp.h
+@@ -105,7 +105,7 @@ Default values
+ # define STRUCT_DIRENT struct dirent64
+ #endif
+ 
+-#if !(defined(DOSPATH) || defined(__EMX__) || defined(__CYGWIN__))
++#if !(defined(DOSPATH) || defined(__EMX__) || defined(__CYGWIN__) || defined(__MINT__))
+ #define STRUCT_DIRENT__D_INO 1
+ #endif
+ 

diff --git a/www-client/lynx/files/lynx-2.9.0-parallel.patch b/www-client/lynx/files/lynx-2.9.0-parallel.patch
new file mode 100644
index 000000000000..0f3e3a89bb05
--- /dev/null
+++ b/www-client/lynx/files/lynx-2.9.0-parallel.patch
@@ -0,0 +1,64 @@
+--- a/makefile.in
++++ b/makefile.in
+@@ -200,10 +200,10 @@ binary_PROG  = $(actual_PROG)$x
+ 
+ all lynx$x: cfg_defs.h LYHelp.h
+ @MSG_DIR_MAKE@	$(SHELL) $(scripts_dir)/fixtext.sh $(srcdir)/LYMessages_en.h >LYMessages.c
+-@MSG_DIR_MAKE@	( cd $(PO_DIR) && $(MAKE_RECUR) )
+-	( cd $(WWW_DIR) && $(MAKE_RECUR) $(WWW_CFLAGS) )
+-	( cd $(CHR_DIR) && $(MAKE_RECUR) all $(CHR_CFLAGS) )
+-	( cd $(SRC_DIR) && $(MAKE_RECUR) all $(SRC_CFLAGS) )
++@MSG_DIR_MAKE@	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(PO_DIR)
++	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(WWW_DIR) $(WWW_CFLAGS)
++	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(CHR_DIR) all $(CHR_CFLAGS)
++	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(SRC_DIR) all $(SRC_CFLAGS)
+ 
+ lint:
+ 	( cd $(WWW_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $(WWW_CFLAGS) $@ )
+@@ -244,8 +244,8 @@ clean:
+ 	rm -f core *.core
+ 
+ depend: cfg_defs.h LYHelp.h
+-	( cd $(WWW_DIR) && $(MAKE_RECUR) $@ )
+-	( cd $(SRC_DIR) && $(MAKE_RECUR) $@ )
++	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(WWW_DIR) $@
++	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(SRC_DIR) $@
+ 
+ distclean: clean
+ 	-rm -f WWW/Library/*/*~
+@@ -300,7 +300,7 @@ install-full: install install-help install-doc
+ 	@echo "Full installation complete."
+ 
+ install-bin: $(BINDIR) lynx$x
+-@MSG_DIR_MAKE@	( cd $(PO_DIR) && $(MAKE_RECUR) install )
++@MSG_DIR_MAKE@	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(PO_DIR)
+ 	@ECHO_CC@$(SHELL) -c "P=$(binary_PROG); \
+ 	if test -f $(BINDIR)/$$P ; then \
+ 	      mv -f $(BINDIR)/$$P $(BINDIR)/$$P.old; fi"; \
+--- a/src/makefile.in
++++ b/src/makefile.in
+@@ -117,13 +117,13 @@ message:
+ 	@echo "Compiling Lynx sources"
+ 
+ do_chartrans_stuff:
+-	-( cd chrtrans && $(MAKE_RECUR) \
++	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C chrtrans \
+ 		SITE_DEFS="$(SITE_DEFS)" \
+ 		BUILD_CFLAGS="$(BUILD_CFLAGS)" \
+ 		BUILD_CPPFLAGS="$(BUILD_CPPFLAGS)" \
+ 		BUILD_LDFLAGS="$(BUILD_LDFLAGS)" \
+ 		BUILD_LIBS="$(BUILD_LIBS)" \
+-		BUILD_CC="$(BUILD_CC)" tables )
++		BUILD_CC="$(BUILD_CC)" tables
+ 
+ lint:
+ 	$(LINT) $(LINTOPTS) $(CPP_OPTS) $(C_SRC)  2>&1 |tee $(top_builddir)/lint.lynx
+@@ -209,7 +209,7 @@ TABLES= \
+  $(CHRTR)viscii_uni.h
+ 
+ $(TABLES):
+-	-( cd chrtrans && $(MAKE_RECUR) tables )
++	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C chrtrans tables
+ 
+ UCdomap$o :	UCdomap.c \
+ 		chrtrans/UCkd.h \

diff --git a/www-client/lynx/lynx-2.9.0.ebuild b/www-client/lynx/lynx-2.9.0.ebuild
new file mode 100644
index 000000000000..58bb00043437
--- /dev/null
+++ b/www-client/lynx/lynx-2.9.0.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2024 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-island.net/archives/lynx/tarballs/${MY_P}.tar.bz2"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/lynx/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="brotli bzip2 cjk gnutls idn nls ssl"
+
+RDEPEND="
+	sys-libs/ncurses:=[unicode(+)]
+	sys-libs/zlib
+	brotli? ( app-arch/brotli:= )
+	bzip2? ( app-arch/bzip2 )
+	idn? ( net-dns/libidn2:= )
+	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-20240114 )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.9.0-mint.patch"
+	"${FILESDIR}/${PN}-2.9.0-parallel.patch"
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# Doesn't exist on Linux
+	arc4random_push
+)
+
+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 brotli)
+		$(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
+}