diff options
author | Tim Harder <radhermit@gentoo.org> | 2015-01-28 01:37:52 +0000 |
---|---|---|
committer | Tim Harder <radhermit@gentoo.org> | 2015-01-28 01:37:52 +0000 |
commit | f77e457984507906b7905866031b854f146ee50b (patch) | |
tree | 0790d16421cd42da03c5ecc09eddab72700fa5f3 /www-client/lynx | |
parent | Version bump. (diff) | |
download | gentoo-2-f77e457984507906b7905866031b854f146ee50b.tar.gz gentoo-2-f77e457984507906b7905866031b854f146ee50b.tar.bz2 gentoo-2-f77e457984507906b7905866031b854f146ee50b.zip |
Remove old.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'www-client/lynx')
-rw-r--r-- | www-client/lynx/ChangeLog | 7 | ||||
-rw-r--r-- | www-client/lynx/files/lynx-2.8.7-configure-openssl.patch | 33 | ||||
-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_p1.ebuild | 98 | ||||
-rw-r--r-- | www-client/lynx/lynx-2.8.8_rc1.ebuild | 99 |
5 files changed, 6 insertions, 286 deletions
diff --git a/www-client/lynx/ChangeLog b/www-client/lynx/ChangeLog index 7b9a5a1c1e5a..7427702435dd 100644 --- a/www-client/lynx/ChangeLog +++ b/www-client/lynx/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-client/lynx # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.162 2015/01/28 01:36:17 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.163 2015/01/28 01:37:52 radhermit Exp $ + + 28 Jan 2015; Tim Harder <radhermit@gentoo.org> -lynx-2.8.8_rc1.ebuild, + -lynx-2.8.8_p1.ebuild, -files/lynx-2.8.7-configure-openssl.patch, + -files/lynx-2.8.8_pre14-parallel.patch: + Remove old. *lynx-2.8.9_pre4 (28 Jan 2015) diff --git a/www-client/lynx/files/lynx-2.8.7-configure-openssl.patch b/www-client/lynx/files/lynx-2.8.7-configure-openssl.patch deleted file mode 100644 index 55bbb695bfd6..000000000000 --- a/www-client/lynx/files/lynx-2.8.7-configure-openssl.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- configure.old 2009-07-31 00:12:26.000000000 -0700 -+++ configure 2009-07-31 00:10:05.000000000 -0700 -@@ -11763,16 +11763,23 @@ - if test -n "$cf_cflags_ssl" ; then - case "$cf_cflags_ssl" in #(vi - *-I*) #(vi -- cf_cv_header_path_ssl=`echo "$cf_cflags_ssl" | sed -e 's/^.*-I//' -e 's/ .*//'` -- ;; -- *) -- cf_cv_header_path_ssl=/usr/include -+ # if openssl pkg-config lists more than one includedir, -+ # primary one will be first -+ # (e.g. kerberos includedir may follow) -+ # so, pick out path following first '-I' -+ cf_cv_header_path_ssl=`echo "$cf_cflags_ssl" | sed -e 's/\(-I[^ ]*\).*/\1/' -e 's/.*-I//'` -+ cf_cv_header_path_ssl=$cf_cv_header_path_ssl/openssl - ;; - esac -- if test -d $cf_cv_header_path_ssl/openssl ; then -- cf_cv_header_path_ssl=$cf_cv_header_path_ssl/openssl -+ # try standard location if couldn't -+ # figure out path using pkg-config -+ if ! test -d "$cf_cv_header_path_ssl" ; then -+ if test -d "/usr/include/openssl" ; then -+ cf_cv_header_path_ssl=/usr/include/openssl -+ else -+ cf_cv_header_path_ssl=/usr/include -+ fi - fi -- - cf_fix_cppflags=no - cf_new_cflags= - cf_new_cppflags= 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 deleted file mode 100644 index ecc9dfdc94bc..000000000000 --- a/www-client/lynx/files/lynx-2.8.8_pre14-parallel.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- 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_p1.ebuild b/www-client/lynx/lynx-2.8.8_p1.ebuild deleted file mode 100644 index affea165a90f..000000000000 --- a/www-client/lynx/lynx-2.8.8_p1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2014 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_p1.ebuild,v 1.2 2014/04/06 15:12:46 vapier Exp $ - -EAPI=5 - -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 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~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:0 - >=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() { - epatch "${FILESDIR}"/${PN}-2.8.6-mint.patch - epatch "${FILESDIR}"/${P}-parallel.patch -} - -src_configure() { - 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) \ - $(usex ssl "--with-$(usex gnutls gnutls ssl)=${EPREFIX}/usr" "") \ - $(usex unicode "--with-screen=ncursesw" "") -} - -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 - docinto docs - dodoc docs/* - docinto lynx_help - dodoc lynx_help/*.txt - dohtml -r lynx_help/* -} diff --git a/www-client/lynx/lynx-2.8.8_rc1.ebuild b/www-client/lynx/lynx-2.8.8_rc1.ebuild deleted file mode 100644 index e62adea60f7e..000000000000 --- a/www-client/lynx/lynx-2.8.8_rc1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2014 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_rc1.ebuild,v 1.12 2014/04/06 15:12:46 vapier Exp $ - -EAPI=5 - -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 arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~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:0 - >=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}"/${PN}-2.8.8_pre14-parallel.patch -} - -src_configure() { - 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) \ - $(usex ssl "--with-$(usex gnutls gnutls ssl)=${EPREFIX}/usr" "") \ - $(usex unicode "--with-screen=ncursesw" "") -} - -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/* -} |