commit: 8245626370c10dc3a9d29e860d2777896db0eb02 Author: Tim Harder <radhermit <AT> gentoo <DOT> org> AuthorDate: Thu Dec 13 07:10:21 2018 +0000 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> CommitDate: Thu Dec 13 07:15:14 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82456263
www-client/lynx: version bump to 2.8.9_p1 Closes: https://bugs.gentoo.org/661366 Signed-off-by: Tim Harder <radhermit <AT> gentoo.org> www-client/lynx/Manifest | 1 + www-client/lynx/files/lynx-2.8.9_p1-parallel.patch | 57 +++++++++++ www-client/lynx/lynx-2.8.9_p1.ebuild | 105 +++++++++++++++++++++ 3 files changed, 163 insertions(+) diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest index 21206aafe91..cded1c6e17f 100644 --- a/www-client/lynx/Manifest +++ b/www-client/lynx/Manifest @@ -1,2 +1,3 @@ DIST lynx2.8.9dev.11.tar.bz2 2665470 BLAKE2B 3fa28252ff619bc7d82d4e1460b7407b6f2f40bb111b8b54ce478327a023748c51e45dbd8e0ae74daff24d59fc3b6a5776a78057c846b8f3bbb153b4c4b92f17 SHA512 702be6cb4f97bae4765d3de3d6ef1cd09e2ef27b570dfbea4f26a411f5bba2ab6d16aee5dbec0ebe63533de17664684ff42fb857b2d17d416774777b38083f50 DIST lynx2.8.9dev.16.tar.bz2 2674662 BLAKE2B 3771199e4d74dcc38c15b8b75207810d3a4f3afabb76d5d8dc7dcd33c5dd0119f0f28a1a719f54df7ed0ecdfb972942c6439536486f99a685febbc252127cc3f SHA512 6aa5e869924c6e42aa68113985aecfb75dc6eb68d5d7db8cedb9843621d29c36c17078e7a692f472e3e7f1edf7ca666e3614bc3bdb092a3631877733d5e3d518 +DIST lynx2.8.9rel.1.tar.bz2 2689171 BLAKE2B 7cff536660e8fe77d40a56262c2f12e2093ffbb3e22a5ac8e7eab4410f0255e98df19e51f0c98d53aeb3ba63d0d1c2fcabe145242811bebcafb6e548a162a9fb SHA512 61edbe082684fcbd91bdbf4f4d27c3baf92358811aaffc2f8af46adf23ca7b48aede1520fc5f2a8fc974a2f4bbf4e57e7e6027a187bfc6101e56878c98178e6d diff --git a/www-client/lynx/files/lynx-2.8.9_p1-parallel.patch b/www-client/lynx/files/lynx-2.8.9_p1-parallel.patch new file mode 100644 index 00000000000..6197456f7ce --- /dev/null +++ b/www-client/lynx/files/lynx-2.8.9_p1-parallel.patch @@ -0,0 +1,57 @@ +--- lynx2.8.9rel.1/makefile.in ++++ lynx2.8.9rel.1/makefile.in +@@ -200,10 +200,10 @@ + + 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) $@ +@@ -241,8 +241,8 @@ + 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/*/*~ +@@ -297,7 +297,7 @@ + @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" +--- lynx2.8.9rel.1/src/makefile.in ++++ lynx2.8.9rel.1/src/makefile.in +@@ -118,7 +118,7 @@ + @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)" \ +@@ -210,7 +210,7 @@ + $(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.8.9_p1.ebuild b/www-client/lynx/lynx-2.8.9_p1.ebuild new file mode 100644 index 00000000000..1d868b5c7b8 --- /dev/null +++ b/www-client/lynx/lynx-2.8.9_p1.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2018 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="http://lynx.invisible-island.net/"; +SRC_URI="http://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 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 +}
