Version bump (bug #265302).

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 154 insertions, 6 deletions

diff --git a/www-client/elinks/ChangeLog b/www-client/elinks/ChangeLog
index 1c7e03a1472d..a6a2103ab213 100644
--- a/www-client/elinks/ChangeLog
+++ b/www-client/elinks/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/elinks
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.113 2009/03/22 08:24:14 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.114 2009/04/08 18:40:09 spock Exp $
+
+*elinks-0.11.6 (08 Apr 2009)
+
+  08 Apr 2009; Michał Januszewski <spock@gentoo.org> +elinks-0.11.6.ebuild:
+  Version bump (bug #265302).
 
   21 Mar 2009; Michał Januszewski <spock@gentoo.org> elinks-0.11.5.ebuild:
   Drop all AUTO* variables (bug #260784).
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 1ebca8098b62..aa867c57acc6 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -12,15 +12,17 @@ DIST elinks-0.10.4.conf.bz2 5370 RMD160 5a0935ed8b035cd2f7636516b0e226a8065d1c70
 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.5.tar.bz2 2589451 RMD160 397e5e94de8cd8c5dc9a1774b7485d6edf1a7c49 SHA1 90768912dbb7a77e328a25b43c3e484ae3e4be2f SHA256 f5ddb8f8c82d96c5d159bd01abd475a678fa15b8dba8f2d477b903b28f1204c3
+DIST elinks-0.11.6.tar.bz2 2577351 RMD160 b58477965684f77c852ea5275b4101eb84b37156 SHA1 c05e639cc656c2559a56e38f38b0cb40f19bc861 SHA256 9068f7160318cbee90f3218eb68cc341fff38b50f312da33a612e6352b4affa6
 EBUILD elinks-0.11.3.ebuild 4776 RMD160 412300bbcd459082558b716a8d25be3e6791300b SHA1 776340110a99c254fab6360cd82537e6988a7941 SHA256 35d0f826e81d2b18caa5edbd7654bc2f2788606ff6d975848c4f5d95e352bd32
 EBUILD elinks-0.11.4.ebuild 4744 RMD160 b982e4a4cbc2e11c4465e9503fd58e59b64f313c SHA1 c418cd87f82e5d42a03c906957a949815d70f528 SHA256 44bb979e895e6ab9df99a698600889cae04a5675544ea758311d1a6b1d528cab
 EBUILD elinks-0.11.5.ebuild 4700 RMD160 0596dde9f327083f3b77b56b9503f7a636b2f8dd SHA1 64d686e6c98a639cdb65f4f8c174b16451d06f0d SHA256 7a6af3656cbd5e7ce1f463d2b8ce517ef79cafd5aaf151bad89ca547bf4d3681
-MISC ChangeLog 22838 RMD160 cd1fd1d8e4a8d412a2189535ff69f45bd11c8b81 SHA1 4da0983903ccefbaee3a1fbdf36c256e9516dfd8 SHA256 aecdd6c3c7a8c76faf9793f90a7e476fc49d893ddb43f1a8205774a204c9022a
+EBUILD elinks-0.11.6.ebuild 4382 RMD160 c399f5ad41ff2da5e08a5a8fa981792c84dcf82f SHA1 91036ad55444ba5b63aa289a90197efb5f335910 SHA256 6120a5c13cb76e31ceb00c1e0927b6e8229cab4e869c42251d94e83c3469ea78
+MISC ChangeLog 22976 RMD160 44c79ac40d326ed60d06d51b5e131c646b004c3f SHA1 cf9cc00c5ded66480e98a5346ce82a220661a078 SHA256 76a403211bc210c377e0cb940a12d71a982c76fe3276556841d905f33077f979
 MISC metadata.xml 475 RMD160 e888de64596f6e3707ee9adb6e6f3612740f1c94 SHA1 5cb61eb3f8afb550f9de204bd4203833b0dfe024 SHA256 bec4875969a65fe6ea9c2187ecc644d6105279f04dd4f82fd30bef71e6692e2f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknF9cwACgkQchej4aZK9/e7qgCfb/9Y0fUdvViCsT8SWBfQtLOh
-g7YAn2eZrBtoQhVm/QiosYyw7u56LMul
-=KVIg
+iEYEARECAAYFAknc73kACgkQchej4aZK9/faQQCfY1ehlpQu3F2dH7CMf9f27DN9
++QgAn3L5PuC2SXD2ypfh8Zo/faS+O+vy
+=jP5L
 -----END PGP SIGNATURE-----
diff --git a/www-client/elinks/elinks-0.11.6.ebuild b/www-client/elinks/elinks-0.11.6.ebuild
new file mode 100644
index 000000000000..1fb6bd267f36
--- /dev/null
+++ b/www-client/elinks/elinks-0.11.6.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2009 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.1 2009/04/08 18:40:09 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 )
+	!hppa? ( !mips? ( !alpha? ( 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
+}