Version bump (bug #230081).

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26-rc8 x86_64

3 files changed, 163 insertions, 6 deletions

diff --git a/www-client/elinks/ChangeLog b/www-client/elinks/ChangeLog
index bafae53e48ad..8c5aea312de7 100644
--- a/www-client/elinks/ChangeLog
+++ b/www-client/elinks/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/elinks
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.98 2008/03/11 19:57:00 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.99 2008/07/05 16:13:38 spock Exp $
+
+*elinks-0.11.4 (05 Jul 2008)
+
+  05 Jul 2008; Michał Januszewski <spock@gentoo.org> +elinks-0.11.4.ebuild:
+  Version bump (bug #230081).
 
 *elinks-0.11.4_rc1 (11 Mar 2008)
 
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 50bb7ae8b081..ed4dd9f5bce4 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -14,19 +14,21 @@ AUX elinks-po-path.patch 1387 RMD160 47b0d596a607c476b94e88d8fe4e65ca0bbf6174 SH
 DIST elinks-0.10.4.conf.bz2 5370 RMD160 5a0935ed8b035cd2f7636516b0e226a8065d1c70 SHA1 7f7b009b1b6cb746e90835d2b612f1aa6b5d3a1e SHA256 cb0fcd10cc592697de5d8d9358447a770d2b4613b17b629c0f0e05965baa6209
 DIST elinks-0.11.2.tar.bz2 2497270 RMD160 a9d938cfdfa71be282b7596e1fed5797f2efd6a5 SHA1 47669c38e1e5ebb35015a9a9a8f9c898821bd408 SHA256 91ac894715efcde78548dfe4703ae702f08fb4a94187288eb9ba2b30258d5585
 DIST elinks-0.11.3.tar.bz2 2516793 RMD160 936f0cd4dbc69f70c329cf0ef5d7acd722652b6e SHA1 e4d8b0edd5fa4ec4310662242f0b5cf32864ed11 SHA256 c10e657fbd884eae4f01b91b32407bbfcbcae0ad5017fb24ea365aebc71d2af1
+DIST elinks-0.11.4.tar.bz2 2479650 RMD160 0341c01b4727d76d864cbaa8a7c6ebb637cdea1c SHA1 4eddfcd79da3e0e3da1c186668ef804f5fec50cd SHA256 586e095668ced8fb9f2958c6b8da66245255d2f77f600755e6b6d00b4b7057b4
 DIST elinks-0.11.4rc0.tar.bz2 2518118 RMD160 dec7db92878055f48b34337bd6fc67421b0cae1f SHA1 0b70bdd8446ae476e49c26bd0d1a2ebbca36e9be SHA256 8b28af50a1b9ebfcefc700c2dd69d837d7344d355f6173e2cf659abde29e54d0
 DIST elinks-0.11.4rc1.tar.bz2 2516890 RMD160 9c4457f83748949d8a3caf7e19fa8c7ab1e9d6d1 SHA1 cc13b1fde81bb210ea2fe3581d2e94cc9d2030c9 SHA256 ef274cd38813dd4bbb6908ff2f6dfb478ab569ac230bf7f397d8c5b4ff03ad39
 EBUILD elinks-0.11.2-r1.ebuild 4868 RMD160 06d138b99f4d2082ad9d4f0f8c431d1c7ab9fc94 SHA1 c914b2a781068d61427d113fc43a8d62903713e7 SHA256 7522bad02b85c0a52b2a1c0d6dc8e7bea48c15ff8eeb5c6796d3a67e2f173548
 EBUILD elinks-0.11.2.ebuild 4824 RMD160 3432b6f27c9648be53643e450f6068520bd8bb33 SHA1 2b161d7fdc1e698ebc378642f6c46fa2405e0840 SHA256 10e12ada02eca0ceb3ff84e33c8c9f7f976b206d8b06e68b42729ce9337ef8dc
 EBUILD elinks-0.11.3.ebuild 4727 RMD160 db071d1f32cd51d0cbad6af1d313cf459abdc825 SHA1 e0ceef26ae9049484353f2e8f59459f2dd8785b6 SHA256 b78fa304f2f9083e69049bd346930001700ad8a822c8e9c5cf1d5f558f32a809
+EBUILD elinks-0.11.4.ebuild 4700 RMD160 1c6d71b1f9b8d7f989d789febd532327e0e0cf31 SHA1 bffcfa2dfec63e23c6c49e7d48d911bdb511ee22 SHA256 c37b2265ce7e806fef1cc8fce4fa0bfc2f807a396a671df3ec470a51884cb160
 EBUILD elinks-0.11.4_rc0.ebuild 4704 RMD160 e320d880aa2893dc7904737e6eaf55ca236e480d SHA1 9e8833056f1ebe24c86ecd7112390367f1cce287 SHA256 db573f72734659fa070b8e5020ceb8a2a810e33dd4d811af8b2f032820eaa502
 EBUILD elinks-0.11.4_rc1.ebuild 4704 RMD160 6e1a03a90c084d558499808187b90181142be596 SHA1 74ebf2d4986810d32131b4088628420809c965e7 SHA256 922ec117c81023f4b7ca4072bfeff6aa0070d41c8952c3c396486478b1b0092c
-MISC ChangeLog 20739 RMD160 b77305ce7fe5c7097cef8d160ab31c2c68c7623c SHA1 6c40762414f902b1d19ee06d58547518008f4e55 SHA256 35ea634ee58541bb1e41d955f75714d28105430cc88d116213af8bf4662db0de
+MISC ChangeLog 20877 RMD160 b52a3b9c813559c73f2d63c4b99a1401bfa8211c SHA1 267d6207fd43fe73fcf899e2aa0ad1f700f9ed19 SHA256 06e664924110be87f0085cca3ad1b4b7bb6af0b30a06521e346782a35d1a4905
 MISC metadata.xml 255 RMD160 399f78e98260d4f311124e71c6d294e368a76976 SHA1 61f663af9ea0cb4967a12878352e65b095dcd473 SHA256 b2dfe92cb4cae7ec4ecb4af91e94b9aa507a3c8214af32f75cf44f6011a13cc5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH1uQZchej4aZK9/cRAqb6AKCER8f1bOYult6oRriaYjZEWodTnQCfaAx+
-LqtRbTrytovz5bHy3iIcnSI=
-=0Zej
+iEYEARECAAYFAkhvnZgACgkQchej4aZK9/e9LACgheEZ4LADW4weYTmnKDSTmU8l
+WNsAn2EabxwtVvN96BAjn9sYaPNYizjM
+=uWMZ
 -----END PGP SIGNATURE-----
diff --git a/www-client/elinks/elinks-0.11.4.ebuild b/www-client/elinks/elinks-0.11.4.ebuild
new file mode 100644
index 000000000000..740f2d7fb108
--- /dev/null
+++ b/www-client/elinks/elinks-0.11.4.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.4.ebuild,v 1.1 2008/07/05 16:13:38 spock Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="1.4"
+
+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 )
+	!hppa? ( !mips? ( !alpha? ( 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
+
+	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
+}