diff options
-rw-r--r-- | www-client/lynx/ChangeLog | 8 | ||||
-rw-r--r-- | www-client/lynx/files/lynx-2.8.8_pre14-parallel.patch | 55 | ||||
-rw-r--r-- | www-client/lynx/lynx-2.8.8_pre14.ebuild | 120 |
3 files changed, 182 insertions, 1 deletions
diff --git a/www-client/lynx/ChangeLog b/www-client/lynx/ChangeLog index 9b8311373ace..ec617cd90410 100644 --- a/www-client/lynx/ChangeLog +++ b/www-client/lynx/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-client/lynx # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.131 2012/06/24 07:32:09 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.132 2012/09/27 04:29:22 radhermit Exp $ + +*lynx-2.8.8_pre14 (27 Sep 2012) + + 27 Sep 2012; Tim Harder <radhermit@gentoo.org> +lynx-2.8.8_pre14.ebuild, + +files/lynx-2.8.8_pre14-parallel.patch: + Version bump. 24 Jun 2012; Diego E. Pettenò <flameeyes@gentoo.org> +files/lynx-2.8.8_pre12-jobserver.patch, lynx-2.8.8_pre12.ebuild: diff --git a/www-client/lynx/files/lynx-2.8.8_pre14-parallel.patch b/www-client/lynx/files/lynx-2.8.8_pre14-parallel.patch new file mode 100644 index 000000000000..ecc9dfdc94bc --- /dev/null +++ b/www-client/lynx/files/lynx-2.8.8_pre14-parallel.patch @@ -0,0 +1,55 @@ +--- lynx2-8-8/makefile.in ++++ lynx2-8-8/makefile.in +@@ -199,9 +199,9 @@ + + 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 $(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 $(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/*/*~ +@@ -320,7 +320,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) install + @ECHO_CC@$(SHELL) -c \ + 'if test -f $(BINDIR)/$(binary_PROG) ; then \ + mv -f $(BINDIR)/$(binary_PROG) $(BINDIR)/lynx.old; fi' +--- lynx2-8-8/src/makefile.in ++++ lynx2-8-8/src/makefile.in +@@ -116,7 +116,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)" \ +@@ -207,7 +207,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.8_pre14.ebuild b/www-client/lynx/lynx-2.8.8_pre14.ebuild new file mode 100644 index 000000000000..3578cf089008 --- /dev/null +++ b/www-client/lynx/lynx-2.8.8_pre14.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.8_pre14.ebuild,v 1.1 2012/09/27 04:29:22 radhermit Exp $ + +EAPI=4 + +inherit eutils versionator + +# 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.isc.org/" +SRC_URI="http://lynx.isc.org/current/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~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" + +RDEPEND="sys-libs/ncurses[unicode?] + sys-libs/zlib + nls? ( virtual/libintl ) + ssl? ( + !gnutls? ( >=dev-libs/openssl-0.9.8 ) + gnutls? ( + dev-libs/libgcrypt + >=net-libs/gnutls-2.6.4 + ) + ) + bzip2? ( app-arch/bzip2 ) + idn? ( net-dns/libidn )" + +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext ) + virtual/pkgconfig" + +S="${WORKDIR}/${PN}$(replace_all_version_separators - $(get_version_component_range 1-3))" + +pkg_setup() { + ! use ssl && elog "SSL support disabled; you will not be able to access secure websites." +} + +src_prepare() { + # fix configure for openssl compiled with kerberos (bug #267749) + epatch "${FILESDIR}/lynx-2.8.7-configure-openssl.patch" + epatch "${FILESDIR}"/${PN}-2.8.6-mint.patch + epatch "${FILESDIR}"/${P}-parallel.patch +} + +src_configure() { + local myargs + + if use ssl ; then + # --with-gnutls and --with-ssl are alternatives, + # the latter enabling openssl support so it should be + # _not_ be used if gnutls ssl implementation is desired + if use gnutls ; then + # ssl implementation = gnutls + myargs+=" --with-gnutls=${EPREFIX}/usr" + else + # ssl implementation = openssl + myargs+=" --with-ssl=${EPREFIX}/usr" + fi + fi + + use unicode && myargs+=" --with-screen=ncursesw" + + econf \ + --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) \ + $myargs +} + +#src_compile() { +# # see bug #403905 +# emake -j1 +#} + +src_install() { + emake install DESTDIR="${D}" + + sed -i -e "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 -e '/^#CHARACTER_SET:/ c\CHARACTER_SET:utf-8' \ + "${ED}"/etc/lynx.cfg || die "lynx.cfg not found" + fi + dodoc CHANGES COPYHEADER PROBLEMS README + docinto docs + dodoc docs/* + docinto lynx_help + dodoc lynx_help/*.txt + dohtml -r lynx_help/* +} |