Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www-client/elinks/ChangeLog7
-rw-r--r--www-client/elinks/elinks-0.11.5.ebuild148
-rw-r--r--www-client/elinks/elinks-0.11.6.ebuild141
-rw-r--r--www-client/elinks/files/elinks-0.10.1-utf_8_io-default.patch11
-rw-r--r--www-client/elinks/files/elinks-po-path.patch34
5 files changed, 6 insertions, 335 deletions
diff --git a/www-client/elinks/ChangeLog b/www-client/elinks/ChangeLog
index 5668d6c8cf12..9264231e32fc 100644
--- a/www-client/elinks/ChangeLog
+++ b/www-client/elinks/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for www-client/elinks
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.132 2011/01/06 21:01:04 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.133 2011/01/06 21:37:25 spock Exp $
+
+ 06 Jan 2011; Michał Januszewski <spock@gentoo.org>
+ -files/elinks-0.10.1-utf_8_io-default.patch, -elinks-0.11.5.ebuild,
+ -elinks-0.11.6.ebuild, -files/elinks-po-path.patch:
+ Remove old ebuilds.
06 Jan 2011; Michał Januszewski <spock@gentoo.org> elinks-0.11.5.ebuild,
elinks-0.11.6.ebuild, elinks-0.11.7.ebuild, elinks-0.12_pre5.ebuild,
diff --git a/www-client/elinks/elinks-0.11.5.ebuild b/www-client/elinks/elinks-0.11.5.ebuild
deleted file mode 100644
index d09a2b13a40b..000000000000
--- a/www-client/elinks/elinks-0.11.5.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.5.ebuild,v 1.9 2011/01/06 21:01:04 spock Exp $
-
-inherit eutils autotools flag-o-matic
-
-MY_P="${P/_/}"
-DESCRIPTION="Advanced and well-established text-mode web browser"
-HOMEPAGE="http://elinks.or.cz/"
-SRC_URI="http://elinks.or.cz/download/${MY_P}.tar.bz2
- http://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="bittorrent bzip2 debug finger ftp gopher gpm guile idn ipv6 \
- javascript lua nls nntp perl ruby ssl unicode X zlib"
-RESTRICT="test"
-
-DEPEND=">=dev-libs/expat-1.95.4
- bzip2? ( >=app-arch/bzip2-1.0.2 )
- ssl? ( >=dev-libs/openssl-0.9.6g )
- X? ( x11-libs/libX11 x11-libs/libXt )
- zlib? ( >=sys-libs/zlib-1.1.4 )
- lua? ( >=dev-lang/lua-5 )
- gpm? ( >=sys-libs/ncurses-5.2 >=sys-libs/gpm-1.20.0-r5 )
- guile? ( >=dev-scheme/guile-1.6.4-r1 )
- idn? ( net-dns/libidn )
- perl? ( sys-devel/libperl )
- ruby? ( dev-lang/ruby dev-ruby/rubygems )
- javascript? ( dev-lang/spidermonkey )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- if use guile && has_version ">dev-scheme/guile-1.6.8" &&
- ! built_with_use -a dev-scheme/guile deprecated discouraged; then
- eerror "To install elinks with the 'guile' USE flag, dev-scheme/guile has to"
- eerror "be built with 'deprecated' and 'discouraged' USE flags."
- die "dev-scheme/guile not built with deprecated/discouraged"
- fi
-}
-
-src_unpack() {
- unpack ${A}
- epatch "${FILESDIR}"/${PN}-0.10.4.conf-syscharset.diff
- mv "${PN}-0.10.4.conf" "${PN}.conf"
- if ! use ftp ; then
- sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' ${PN}.conf
- fi
- sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' ${PN}.conf
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-0.11.3-lua-5.patch
-
- if use lua && has_version ">=dev-lang/lua-5.1"; then
- epatch "${FILESDIR}"/${PN}-0.11.2-lua-5.1.patch
- fi
-
- if use unicode ; then
- epatch "${FILESDIR}"/elinks-0.10.1-utf_8_io-default.patch
- fi
-
- epatch "${FILESDIR}"/elinks-0.11.5-makefile.patch
-
- sed -i -e 's/-Werror//' configure*
- eautoreconf
-}
-
-src_compile() {
- # NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
- # As GNUTLS is not yet 100% stable and its support in ELinks is not so well
- # tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible.
- local myconf=""
-
- if use debug ; then
- myconf="--enable-debug"
- else
- myconf="--enable-fastmem"
- fi
-
- if use ssl ; then
- myconf="${myconf} --with-openssl"
- else
- myconf="${myconf} --without-openssl --without-gnutls"
- fi
-
- econf \
- --sysconfdir=/etc/elinks \
- --enable-leds \
- --enable-88-colors \
- --enable-256-colors \
- --enable-html-highlight \
- $(use_with gpm) \
- $(use_with zlib) \
- $(use_with bzip2 bzlib) \
- $(use_with X x) \
- $(use_with lua) \
- $(use_with guile) \
- $(use_with perl) \
- $(use_with ruby) \
- $(use_with idn) \
- $(use_with javascript spidermonkey) \
- $(use_enable bittorrent) \
- $(use_enable nls) \
- $(use_enable ipv6) \
- $(use_enable ftp) \
- $(use_enable gopher) \
- $(use_enable nntp) \
- $(use_enable finger) \
- ${myconf} || die
- emake || die "compile problem"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die
-
- insopts -m 644 ; insinto /etc/elinks
- doins "${WORKDIR}"/elinks.conf
- newins contrib/keybind-full.conf keybind-full.sample
- newins contrib/keybind.conf keybind.conf.sample
-
- dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
- docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*}
- insinto /usr/share/doc/${PF}/contrib/lua ; doins contrib/lua/{*.lua,elinks-remote}
- insinto /usr/share/doc/${PF}/contrib/conv ; doins contrib/conv/*.*
- insinto /usr/share/doc/${PF}/contrib/guile ; doins contrib/guile/*.scm
-
- # Remove some conflicting files on OSX. The files provided by OSX 10.4
- # are more or less the same. -- Fabian Groffen (2005-06-30)
- rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
-}
-
-pkg_postinst() {
- einfo "This ebuild provides a default config for ELinks."
- einfo "Please check /etc/elinks/elinks.conf"
- einfo
- einfo "You may want to convert your html.cfg and links.cfg of"
- einfo "Links or older ELinks versions to the new ELinks elinks.conf"
- einfo "using /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"
- einfo
- einfo "Please have a look at /etc/elinks/keybind-full.sample and"
- einfo "/etc/elinks/keybind.conf.sample for some bindings examples."
- einfo
- einfo "You will have to set your TERM variable to 'xterm-256color'"
- einfo "to be able to use 256 colors in elinks."
- echo
-}
diff --git a/www-client/elinks/elinks-0.11.6.ebuild b/www-client/elinks/elinks-0.11.6.ebuild
deleted file mode 100644
index 99943d63e720..000000000000
--- a/www-client/elinks/elinks-0.11.6.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.6.ebuild,v 1.4 2011/01/06 21:01:04 spock Exp $
-
-EAPI="2"
-
-inherit eutils autotools flag-o-matic
-
-MY_P="${P/_/}"
-DESCRIPTION="Advanced and well-established text-mode web browser"
-HOMEPAGE="http://elinks.or.cz/"
-SRC_URI="http://elinks.or.cz/download/${MY_P}.tar.bz2
- http://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="bittorrent bzip2 debug finger ftp gopher gpm guile idn ipv6 \
- javascript lua nls nntp perl ruby ssl unicode X zlib"
-RESTRICT="test"
-
-DEPEND=">=dev-libs/expat-1.95.4
- bzip2? ( >=app-arch/bzip2-1.0.2 )
- ssl? ( >=dev-libs/openssl-0.9.6g )
- X? ( x11-libs/libX11 x11-libs/libXt )
- zlib? ( >=sys-libs/zlib-1.1.4 )
- lua? ( >=dev-lang/lua-5 )
- gpm? ( >=sys-libs/ncurses-5.2 >=sys-libs/gpm-1.20.0-r5 )
- guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] )
- idn? ( net-dns/libidn )
- perl? ( sys-devel/libperl )
- ruby? ( dev-lang/ruby dev-ruby/rubygems )
- javascript? ( dev-lang/spidermonkey )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- epatch "${FILESDIR}"/${PN}-0.10.4.conf-syscharset.diff
- mv "${PN}-0.10.4.conf" "${PN}.conf"
- if ! use ftp ; then
- sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' ${PN}.conf
- fi
- sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' ${PN}.conf
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-0.11.3-lua-5.patch
-
- if use lua && has_version ">=dev-lang/lua-5.1"; then
- epatch "${FILESDIR}"/${PN}-0.11.2-lua-5.1.patch
- fi
-
- if use unicode ; then
- epatch "${FILESDIR}"/elinks-0.10.1-utf_8_io-default.patch
- fi
-
- epatch "${FILESDIR}"/elinks-0.11.5-makefile.patch
-
- sed -i -e 's/-Werror//' configure*
- eautoreconf
-}
-
-src_compile() {
- # NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
- # As GNUTLS is not yet 100% stable and its support in ELinks is not so well
- # tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible.
- local myconf=""
-
- if use debug ; then
- myconf="--enable-debug"
- else
- myconf="--enable-fastmem"
- fi
-
- if use ssl ; then
- myconf="${myconf} --with-openssl"
- else
- myconf="${myconf} --without-openssl --without-gnutls"
- fi
-
- econf \
- --sysconfdir=/etc/elinks \
- --enable-leds \
- --enable-88-colors \
- --enable-256-colors \
- --enable-html-highlight \
- $(use_with gpm) \
- $(use_with zlib) \
- $(use_with bzip2 bzlib) \
- $(use_with X x) \
- $(use_with lua) \
- $(use_with guile) \
- $(use_with perl) \
- $(use_with ruby) \
- $(use_with idn) \
- $(use_with javascript spidermonkey) \
- $(use_enable bittorrent) \
- $(use_enable nls) \
- $(use_enable ipv6) \
- $(use_enable ftp) \
- $(use_enable gopher) \
- $(use_enable nntp) \
- $(use_enable finger) \
- ${myconf} || die
- emake || die "compile problem"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die
-
- insopts -m 644 ; insinto /etc/elinks
- doins "${WORKDIR}"/elinks.conf
- newins contrib/keybind-full.conf keybind-full.sample
- newins contrib/keybind.conf keybind.conf.sample
-
- dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
- docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*}
- insinto /usr/share/doc/${PF}/contrib/lua ; doins contrib/lua/{*.lua,elinks-remote}
- insinto /usr/share/doc/${PF}/contrib/conv ; doins contrib/conv/*.*
- insinto /usr/share/doc/${PF}/contrib/guile ; doins contrib/guile/*.scm
-
- # Remove some conflicting files on OSX. The files provided by OSX 10.4
- # are more or less the same. -- Fabian Groffen (2005-06-30)
- rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
-}
-
-pkg_postinst() {
- einfo "This ebuild provides a default config for ELinks."
- einfo "Please check /etc/elinks/elinks.conf"
- einfo
- einfo "You may want to convert your html.cfg and links.cfg of"
- einfo "Links or older ELinks versions to the new ELinks elinks.conf"
- einfo "using /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"
- einfo
- einfo "Please have a look at /etc/elinks/keybind-full.sample and"
- einfo "/etc/elinks/keybind.conf.sample for some bindings examples."
- einfo
- einfo "You will have to set your TERM variable to 'xterm-256color'"
- einfo "to be able to use 256 colors in elinks."
- echo
-}
diff --git a/www-client/elinks/files/elinks-0.10.1-utf_8_io-default.patch b/www-client/elinks/files/elinks-0.10.1-utf_8_io-default.patch
deleted file mode 100644
index e0f59cda3264..000000000000
--- a/www-client/elinks/files/elinks-0.10.1-utf_8_io-default.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- elinks-0.10.1/src/config/options.inc.utf_8_io-default 2005-01-04 01:42:56.000000000 +0100
-+++ elinks-0.10.1/src/config/options.inc 2005-01-28 17:54:42.568968720 +0100
-@@ -747,7 +747,7 @@
- "terminal.")),
-
- INIT_OPT_BOOL("terminal._template_", N_("UTF-8 I/O"),
-- "utf_8_io", 0, 0,
-+ "utf_8_io", 0, 1,
- N_("Enable I/O in UTF8 for Unicode terminals. Note that currently,\n"
- "only the subset of UTF8 according to terminal codepage is used.")),
-
diff --git a/www-client/elinks/files/elinks-po-path.patch b/www-client/elinks/files/elinks-po-path.patch
deleted file mode 100644
index ce4305de6d9b..000000000000
--- a/www-client/elinks/files/elinks-po-path.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Jonas Fonseca <fonseca@diku.dk>
-Date: Thu, 3 May 2007 06:46:29 +0000 (+0200)
-Subject: Check if the program path contains "src/" before using ../po files
-X-Git-Tag: elinks-0.11rc0
-X-Git-Url: http://pasky.or.cz/gitweb.cgi?p=elinks.git;a=commitdiff;h=928f364ba2803f98d71775dc03b694d6403c0754
-
-Check if the program path contains "src/" before using ../po files
-
-Don't look for gettext message catalogs in ../po/ unless ELinks is being
-run as src/elinks, ./src/elinks, or .../src/elinks.
-
-Discovered by Arnaud Giersch, this alternate fix (than what is in debian
-package 0.11.1-1.4) closes debian bug #417789 and redhat bug #235411.
-Also reported in: CVE-2007-2027.
-
-Restricting it to only work with --enable-debug was also considered,
-however, it is an important feature for translaters so this less
-paranoid fix was chosen.
----
-
---- a/src/intl/gettext/loadmsgcat.c
-+++ b/src/intl/gettext/loadmsgcat.c
-@@ -212,6 +212,11 @@ add_filename_to_string(struct string *st
- unsigned char *slash = strrchr(program.path, '/');
- size_t dirnamelen = (slash ? slash - program.path + 1 : 0);
-
-+ /* Check if elinks is being run from the source tree. */
-+ if (dirnamelen < 4
-+ || strncmp(program.path + dirnamelen - 4, "src", 3))
-+ return NULL;
-+
- if ((dirnamelen && !add_bytes_to_string(str, program.path, dirnamelen))
- || !add_to_string(str, "../po/")
- || !add_bytes_to_string(str,