| 1 |
commit: 602cfa4ff490b20c9aacb710d53855b9727b9f86 |
| 2 |
Author: John Helmert III <ajak <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 29 22:13:32 2021 +0000 |
| 4 |
Commit: John Helmert III <ajak <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 29 22:22:04 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=602cfa4f |
| 7 |
|
| 8 |
www-client/lynx: add 2.9.0_pre9 |
| 9 |
|
| 10 |
Also update patches, bump to EAPI=8, drop USE={unicode,ipv6}. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/807073 |
| 13 |
Signed-off-by: John Helmert III <ajak <AT> gentoo.org> |
| 14 |
|
| 15 |
www-client/lynx/Manifest | 1 + |
| 16 |
www-client/lynx/files/lynx-2.9.0_pre9-mint.patch | 11 +++ |
| 17 |
.../lynx/files/lynx-2.9.0_pre9-parallel.patch | 69 +++++++++++++++ |
| 18 |
www-client/lynx/lynx-2.9.0_pre9.ebuild | 98 ++++++++++++++++++++++ |
| 19 |
4 files changed, 179 insertions(+) |
| 20 |
|
| 21 |
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest |
| 22 |
index 8046b917b1f..e2c27f3b9e3 100644 |
| 23 |
--- a/www-client/lynx/Manifest |
| 24 |
+++ b/www-client/lynx/Manifest |
| 25 |
@@ -1 +1,2 @@ |
| 26 |
DIST lynx2.9.0dev.6.tar.bz2 2730690 BLAKE2B 2b176db49ac053e6c057b366b625883f0877f0bbf9bc2fbc0dfe6a13af48e0c9d5a64de52e794a4e771d7f6b160c74589a9275543f2657cb678bba149cdba38c SHA512 0c15e00a8e36e43671a093182c69593d50bc5c51a4acd92faa59416055bf4a1fd9ecde903a0209963f1f55d1fd85136e8448ca7867e198100ff749c53e1e1531 |
| 27 |
+DIST lynx2.9.0dev.9.tar.bz2 2746988 BLAKE2B 6b5658b6bc224d02fe89fe31a1b8cdac5f736d68545fb6508f3a3b83e9c7537599dbacf5000320a019f0fab1059d5d4516e8d54341ef7d3384605d9e2f3c19da SHA512 ad343a7bc254cf287accde305db556101f7fa0f081e7c1c4327d7a4366c74cdbfb03ec003b0bc176768bbe726eae3e1bf8361416e0364ccdfe40d63fbc5b6dc4 |
| 28 |
|
| 29 |
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 |
| 30 |
new file mode 100644 |
| 31 |
index 00000000000..584402101c6 |
| 32 |
--- /dev/null |
| 33 |
+++ b/www-client/lynx/files/lynx-2.9.0_pre9-mint.patch |
| 34 |
@@ -0,0 +1,11 @@ |
| 35 |
+--- lynx2-8-6/WWW/Library/Implementation/www_tcp.h.old 2009-03-18 06:45:10.000000000 +0000 |
| 36 |
++++ lynx2-8-6/WWW/Library/Implementation/www_tcp.h 2009-03-18 06:45:22.000000000 +0000 |
| 37 |
+@@ -94,7 +94,7 @@ |
| 38 |
+ # endif |
| 39 |
+ #endif /* HAVE_DIRENT_H */ |
| 40 |
+ |
| 41 |
+-#if !(defined(DOSPATH) || defined(__EMX__) || defined(__CYGWIN__)) |
| 42 |
++#if !(defined(DOSPATH) || defined(__EMX__) || defined(__CYGWIN__) || defined(__MINT__)) |
| 43 |
+ #define STRUCT_DIRENT__D_INO 1 |
| 44 |
+ #endif |
| 45 |
+ |
| 46 |
|
| 47 |
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 |
| 48 |
new file mode 100644 |
| 49 |
index 00000000000..7e8d728ec8d |
| 50 |
--- /dev/null |
| 51 |
+++ b/www-client/lynx/files/lynx-2.9.0_pre9-parallel.patch |
| 52 |
@@ -0,0 +1,69 @@ |
| 53 |
+diff --git a/makefile.in b/makefile.in |
| 54 |
+index 3c42a3e..81142f3 100644 |
| 55 |
+--- a/makefile.in |
| 56 |
++++ b/makefile.in |
| 57 |
+@@ -199,10 +199,10 @@ binary_PROG = $(actual_PROG)$x |
| 58 |
+ |
| 59 |
+ all lynx$x: cfg_defs.h LYHelp.h |
| 60 |
+ @MSG_DIR_MAKE@ $(SHELL) $(scripts_dir)/fixtext.sh $(srcdir)/LYMessages_en.h >LYMessages.c |
| 61 |
+-@MSG_DIR_MAKE@ ( cd $(PO_DIR) && $(MAKE_RECUR) ) |
| 62 |
+- ( cd $(WWW_DIR) && $(MAKE_RECUR) $(WWW_CFLAGS) ) |
| 63 |
+- ( cd $(CHR_DIR) && $(MAKE_RECUR) all $(CHR_CFLAGS) ) |
| 64 |
+- ( cd $(SRC_DIR) && $(MAKE_RECUR) all $(SRC_CFLAGS) ) |
| 65 |
++@MSG_DIR_MAKE@ $(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(PO_DIR) |
| 66 |
++ $(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(WWW_DIR) $(WWW_CFLAGS) |
| 67 |
++ $(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(CHR_DIR) all $(CHR_CFLAGS) |
| 68 |
++ $(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(SRC_DIR) all $(SRC_CFLAGS) |
| 69 |
+ |
| 70 |
+ lint: |
| 71 |
+ ( cd $(WWW_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $(WWW_CFLAGS) $@ ) |
| 72 |
+@@ -243,8 +243,8 @@ clean: |
| 73 |
+ rm -f core *.core |
| 74 |
+ |
| 75 |
+ depend: cfg_defs.h LYHelp.h |
| 76 |
+- ( cd $(WWW_DIR) && $(MAKE_RECUR) $@ ) |
| 77 |
+- ( cd $(SRC_DIR) && $(MAKE_RECUR) $@ ) |
| 78 |
++ $(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(WWW_DIR) $@ |
| 79 |
++ $(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(SRC_DIR) $@ |
| 80 |
+ |
| 81 |
+ distclean: clean |
| 82 |
+ -rm -f WWW/Library/*/*~ |
| 83 |
+@@ -299,7 +299,7 @@ install-full: install install-help install-doc |
| 84 |
+ @echo "Full installation complete." |
| 85 |
+ |
| 86 |
+ install-bin: $(BINDIR) lynx$x |
| 87 |
+-@MSG_DIR_MAKE@ ( cd $(PO_DIR) && $(MAKE_RECUR) install ) |
| 88 |
++@MSG_DIR_MAKE@ $(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(PO_DIR) |
| 89 |
+ @ECHO_CC@$(SHELL) -c "P=$(binary_PROG); \ |
| 90 |
+ if test -f $(BINDIR)/$$P ; then \ |
| 91 |
+ mv -f $(BINDIR)/$$P $(BINDIR)/$$P.old; fi"; \ |
| 92 |
+diff --git a/src/makefile.in b/src/makefile.in |
| 93 |
+index 5246226..c4347cc 100644 |
| 94 |
+--- a/src/makefile.in |
| 95 |
++++ b/src/makefile.in |
| 96 |
+@@ -117,13 +117,13 @@ message: |
| 97 |
+ @echo "Compiling Lynx sources" |
| 98 |
+ |
| 99 |
+ do_chartrans_stuff: |
| 100 |
+- -( cd chrtrans && $(MAKE_RECUR) \ |
| 101 |
++ $(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C chrtrans \ |
| 102 |
+ SITE_DEFS="$(SITE_DEFS)" \ |
| 103 |
+ BUILD_CFLAGS="$(BUILD_CFLAGS)" \ |
| 104 |
+ BUILD_CPPFLAGS="$(BUILD_CPPFLAGS)" \ |
| 105 |
+ BUILD_LDFLAGS="$(BUILD_LDFLAGS)" \ |
| 106 |
+ BUILD_LIBS="$(BUILD_LIBS)" \ |
| 107 |
+- BUILD_CC="$(BUILD_CC)" tables ) |
| 108 |
++ BUILD_CC="$(BUILD_CC)" tables |
| 109 |
+ |
| 110 |
+ lint: |
| 111 |
+ $(LINT) $(LINTOPTS) $(CPP_OPTS) $(C_SRC) 2>&1 |tee $(top_builddir)/lint.lynx |
| 112 |
+@@ -209,7 +209,7 @@ TABLES= \ |
| 113 |
+ $(CHRTR)viscii_uni.h |
| 114 |
+ |
| 115 |
+ $(TABLES): |
| 116 |
+- -( cd chrtrans && $(MAKE_RECUR) tables ) |
| 117 |
++ $(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C chrtrans tables |
| 118 |
+ |
| 119 |
+ UCdomap$o : UCdomap.c \ |
| 120 |
+ chrtrans/UCkd.h \ |
| 121 |
+ |
| 122 |
|
| 123 |
diff --git a/www-client/lynx/lynx-2.9.0_pre9.ebuild b/www-client/lynx/lynx-2.9.0_pre9.ebuild |
| 124 |
new file mode 100644 |
| 125 |
index 00000000000..56f7032772c |
| 126 |
--- /dev/null |
| 127 |
+++ b/www-client/lynx/lynx-2.9.0_pre9.ebuild |
| 128 |
@@ -0,0 +1,98 @@ |
| 129 |
+# Copyright 1999-2021 Gentoo Authors |
| 130 |
+# Distributed under the terms of the GNU General Public License v2 |
| 131 |
+ |
| 132 |
+EAPI=8 |
| 133 |
+ |
| 134 |
+case ${PV} in |
| 135 |
+ *_pre*) MY_P="${PN}${PV/_pre/dev.}" ;; |
| 136 |
+ *_rc*) MY_P="${PN}${PV/_rc/pre.}" ;; |
| 137 |
+ *_p*|*) MY_P="${PN}${PV/_p/rel.}" ;; |
| 138 |
+esac |
| 139 |
+ |
| 140 |
+DESCRIPTION="An excellent console-based web browser with ssl support" |
| 141 |
+HOMEPAGE="https://lynx.invisible-island.net/" |
| 142 |
+SRC_URI="https://invisible-mirror.net/archives/lynx/tarballs/${MY_P}.tar.bz2" |
| 143 |
+ |
| 144 |
+LICENSE="GPL-2" |
| 145 |
+SLOT="0" |
| 146 |
+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" |
| 147 |
+IUSE="bzip2 cjk gnutls idn nls ssl" |
| 148 |
+ |
| 149 |
+RDEPEND="sys-libs/ncurses:=[unicode(+)] |
| 150 |
+ sys-libs/zlib |
| 151 |
+ bzip2? ( app-arch/bzip2 ) |
| 152 |
+ idn? ( net-dns/libidn:0= ) |
| 153 |
+ nls? ( virtual/libintl ) |
| 154 |
+ ssl? ( |
| 155 |
+ !gnutls? ( |
| 156 |
+ dev-libs/openssl:0= |
| 157 |
+ ) |
| 158 |
+ gnutls? ( |
| 159 |
+ dev-libs/libgcrypt:0= |
| 160 |
+ >=net-libs/gnutls-2.6.4:= |
| 161 |
+ ) |
| 162 |
+ )" |
| 163 |
+DEPEND="${RDEPEND} |
| 164 |
+ virtual/pkgconfig |
| 165 |
+ nls? ( sys-devel/gettext )" |
| 166 |
+ |
| 167 |
+S="${WORKDIR}/${MY_P}" |
| 168 |
+ |
| 169 |
+PATCHES=( |
| 170 |
+ "${FILESDIR}/${PN}-2.9.0_pre9-mint.patch" |
| 171 |
+ "${FILESDIR}/${PN}-2.9.0_pre9-parallel.patch" |
| 172 |
+) |
| 173 |
+ |
| 174 |
+src_configure() { |
| 175 |
+ local myconf=( |
| 176 |
+ --enable-cgi-links |
| 177 |
+ --enable-color-style |
| 178 |
+ --enable-externs |
| 179 |
+ --enable-file-upload |
| 180 |
+ --enable-included-msgs |
| 181 |
+ --enable-ipv6 |
| 182 |
+ --enable-nested-tables |
| 183 |
+ --enable-nsl-fork |
| 184 |
+ --enable-persistent-cookies |
| 185 |
+ --enable-prettysrc |
| 186 |
+ --enable-read-eta |
| 187 |
+ --enable-scrollbar |
| 188 |
+ --with-screen=ncursesw |
| 189 |
+ --with-zlib |
| 190 |
+ $(use_enable cjk) |
| 191 |
+ $(use_enable idn idna) |
| 192 |
+ $(use_enable nls) |
| 193 |
+ $(use_with bzip2 bzlib) |
| 194 |
+ ) |
| 195 |
+ if use ssl; then |
| 196 |
+ myconf+=( |
| 197 |
+ --with-$(usex gnutls gnutls ssl)="${EPREFIX}/usr" |
| 198 |
+ ) |
| 199 |
+ fi |
| 200 |
+ |
| 201 |
+ econf "${myconf[@]}" |
| 202 |
+ |
| 203 |
+ # Compared to openssl gnutls-openssl API does not use |
| 204 |
+ # default trust store: bug #604526. |
| 205 |
+ sed -e \ |
| 206 |
+ "s|#define SSL_CERT_FILE NULL|#define SSL_CERT_FILE \"${EPREFIX}/etc/ssl/certs/ca-certificates.crt\"|" \ |
| 207 |
+ -i userdefs.h || die |
| 208 |
+} |
| 209 |
+ |
| 210 |
+src_compile() { |
| 211 |
+ # generating translation files in parallel is currently broken |
| 212 |
+ use nls && emake -C po -j1 |
| 213 |
+ emake |
| 214 |
+} |
| 215 |
+ |
| 216 |
+src_install() { |
| 217 |
+ emake install DESTDIR="${D}" |
| 218 |
+ |
| 219 |
+ sed -i "s|^HELPFILE.*$|HELPFILE:file://localhost/usr/share/doc/${PF}/lynx_help/lynx_help_main.html|" \ |
| 220 |
+ "${ED}"/etc/lynx.cfg || die "lynx.cfg not found" |
| 221 |
+ sed -i '/^#CHARACTER_SET:/ c\CHARACTER_SET:utf-8' \ |
| 222 |
+ "${ED}"/etc/lynx.cfg || die "lynx.cfg not found" |
| 223 |
+ |
| 224 |
+ dodoc CHANGES COPYHEADER PROBLEMS README |
| 225 |
+ dodoc -r docs lynx_help |
| 226 |
+} |
Archives