commit: 602cfa4ff490b20c9aacb710d53855b9727b9f86
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 29 22:13:32 2021 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sun Aug 29 22:22:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=602cfa4f
www-client/lynx: add 2.9.0_pre9
Also update patches, bump to EAPI=8, drop USE={unicode,ipv6}.
Bug: https://bugs.gentoo.org/807073
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
www-client/lynx/Manifest | 1 +
www-client/lynx/files/lynx-2.9.0_pre9-mint.patch | 11 +++
.../lynx/files/lynx-2.9.0_pre9-parallel.patch | 69 +++++++++++++++
www-client/lynx/lynx-2.9.0_pre9.ebuild | 98 ++++++++++++++++++++++
4 files changed, 179 insertions(+)
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index 8046b917b1f..e2c27f3b9e3 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -1 +1,2 @@
DIST lynx2.9.0dev.6.tar.bz2 2730690 BLAKE2B
2b176db49ac053e6c057b366b625883f0877f0bbf9bc2fbc0dfe6a13af48e0c9d5a64de52e794a4e771d7f6b160c74589a9275543f2657cb678bba149cdba38c
SHA512
0c15e00a8e36e43671a093182c69593d50bc5c51a4acd92faa59416055bf4a1fd9ecde903a0209963f1f55d1fd85136e8448ca7867e198100ff749c53e1e1531
+DIST lynx2.9.0dev.9.tar.bz2 2746988 BLAKE2B
6b5658b6bc224d02fe89fe31a1b8cdac5f736d68545fb6508f3a3b83e9c7537599dbacf5000320a019f0fab1059d5d4516e8d54341ef7d3384605d9e2f3c19da
SHA512
ad343a7bc254cf287accde305db556101f7fa0f081e7c1c4327d7a4366c74cdbfb03ec003b0bc176768bbe726eae3e1bf8361416e0364ccdfe40d63fbc5b6dc4
diff --git a/www-client/lynx/files/lynx-2.9.0_pre9-mint.patch
b/www-client/lynx/files/lynx-2.9.0_pre9-mint.patch
new file mode 100644
index 00000000000..584402101c6
--- /dev/null
+++ b/www-client/lynx/files/lynx-2.9.0_pre9-mint.patch
@@ -0,0 +1,11 @@
+--- lynx2-8-6/WWW/Library/Implementation/www_tcp.h.old 2009-03-18
06:45:10.000000000 +0000
++++ lynx2-8-6/WWW/Library/Implementation/www_tcp.h 2009-03-18
06:45:22.000000000 +0000
+@@ -94,7 +94,7 @@
+ # endif
+ #endif /* HAVE_DIRENT_H */
+
+-#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_pre9-parallel.patch
b/www-client/lynx/files/lynx-2.9.0_pre9-parallel.patch
new file mode 100644
index 00000000000..7e8d728ec8d
--- /dev/null
+++ b/www-client/lynx/files/lynx-2.9.0_pre9-parallel.patch
@@ -0,0 +1,69 @@
+diff --git a/makefile.in b/makefile.in
+index 3c42a3e..81142f3 100644
+--- a/makefile.in
++++ b/makefile.in
+@@ -199,10 +199,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) $@ )
+@@ -243,8 +243,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/*/*~
+@@ -299,7 +299,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"; \
+diff --git a/src/makefile.in b/src/makefile.in
+index 5246226..c4347cc 100644
+--- 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_pre9.ebuild
b/www-client/lynx/lynx-2.9.0_pre9.ebuild
new file mode 100644
index 00000000000..56f7032772c
--- /dev/null
+++ b/www-client/lynx/lynx-2.9.0_pre9.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ~riscv
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 cjk gnutls idn nls ssl"
+
+RDEPEND="sys-libs/ncurses:=[unicode(+)]
+ sys-libs/zlib
+ bzip2? ( app-arch/bzip2 )
+ idn? ( net-dns/libidn:0= )
+ nls? ( virtual/libintl )
+ ssl? (
+ !gnutls? (
+ dev-libs/openssl:0=
+ )
+ gnutls? (
+ dev-libs/libgcrypt:0=
+ >=net-libs/gnutls-2.6.4:=
+ )
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+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
+}
