Version bump.

Package-Manager: portage-2.1_pre3-r1

6 files changed, 197 insertions, 3 deletions

diff --git a/www-client/elinks/ChangeLog b/www-client/elinks/ChangeLog
index 4fe53cdcd49c..035c00d3e5fe 100644
--- a/www-client/elinks/ChangeLog
+++ b/www-client/elinks/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/elinks
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.33 2005/12/24 15:45:13 hansmi Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.34 2006/01/22 11:38:52 spock Exp $
+
+*elinks-0.11.0 (22 Jan 2006)
+
+  22 Jan 2006; Michał Januszewski <spock@gentoo.org>
+  +files/elinks-0.11.0-gcc4-inline.patch, +files/elinks-0.11.0-make.patch,
+  +elinks-0.11.0.ebuild:
+  Version bump.
 
   24 Dec 2005; Michael Hanselmann <hansmi@gentoo.org> elinks-0.10.6.ebuild:
   Stable on ppc.
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 46352e16c304..6baf897f5f8d 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,9 +1,23 @@
-MD5 9b171aeb6c55005ef8cf0bf2502504a3 ChangeLog 11900
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 aa52d2f60b314eaf4b2a61f783601c40 ChangeLog 12100
 MD5 460bf16e9409074244ba5f1c62f95b2e elinks-0.10.5-r1.ebuild 4025
 MD5 166bcca8eca86c5303b39043887e950b elinks-0.10.5.ebuild 3530
 MD5 6cf1be00849f929b10dc6c30e015030b elinks-0.10.6.ebuild 3911
+MD5 b4cb25337664eb8052a716142845486f elinks-0.11.0.ebuild 4234
 MD5 db4038d1a62b31535db38c97c40928d8 files/digest-elinks-0.10.5 132
 MD5 db4038d1a62b31535db38c97c40928d8 files/digest-elinks-0.10.5-r1 132
 MD5 a2f9214a88eeac493c0bbaef6c2bf76b files/digest-elinks-0.10.6 132
+MD5 9ca53bf2dc67fc8abf0deb36eb2526f8 files/digest-elinks-0.11.0 132
+MD5 52b202f65c123224829a121624237100 files/elinks-0.11.0-gcc4-inline.patch 388
+MD5 00327b0156863e33da85158f208fbf42 files/elinks-0.11.0-make.patch 916
 MD5 8641dcff9f251387e7eba19875a7077c files/elinks-osx-configure.diff 919
 MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD027kchej4aZK9/cRAqJSAJ47y6Bmo5nHxqtjY40F+sMm26nRMwCfTvis
+OpkB/G46NDVhzkL4L4fM6HM=
+=up0f
+-----END PGP SIGNATURE-----
diff --git a/www-client/elinks/elinks-0.11.0.ebuild b/www-client/elinks/elinks-0.11.0.ebuild
new file mode 100644
index 000000000000..0ca5f6299200
--- /dev/null
+++ b/www-client/elinks/elinks-0.11.0.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.0.ebuild,v 1.1 2006/01/22 11:38:52 spock Exp $
+
+inherit eutils
+
+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"
+IUSE="bittorrent bzip2 debug finger ftp gnutls gopher gpm guile idn ipv6 \
+	  javascript lua nls nntp perl ruby samba ssl 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 )
+			virtual/x11 ) )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+	lua? ( >=dev-lang/lua-4 )
+	gpm? ( >=sys-libs/ncurses-5.2 >=sys-libs/gpm-1.20.0-r5 )
+	guile? ( >=dev-util/guile-1.6.4-r1 )
+	idn? ( net-dns/libidn )
+	perl? ( sys-devel/libperl )
+	ruby? ( dev-lang/ruby )
+	!mips? ( !alpha? ( javascript? ( dev-lang/spidermonkey ) ) )
+	samba? ( net-fs/samba )"
+PROVIDE="virtual/textbrowser"
+
+#|| ( ( x11-libs/libX11
+#				x11-libs/libXt
+#			  )
+
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	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}/${P}-gcc4-inline.patch
+	epatch ${FILESDIR}/${P}-make.patch
+}
+
+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
+
+	econf \
+		--sysconfdir=/etc/elinks \
+		--enable-leds \
+		--enable-256-colors \
+		--enable-html-highlight \
+		$(use_with gpm) \
+		$(use_with zlib) \
+		$(use_with bzip2 bzlib) \
+		$(use_with ssl openssl) \
+		$(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 samba smb) \
+		$(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."
+	if use guile ; then
+		einfo
+		einfo "Since you have compiled ELinks with Guile support, you will have to"
+		einfo "copy internal-hooks.scm and user-hooks.scm from"
+		einfo "/usr/share/doc/${PF}/contrib/guile/ to ~/.elinks/"
+	fi
+	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/digest-elinks-0.11.0 b/www-client/elinks/files/digest-elinks-0.11.0
new file mode 100644
index 000000000000..d40198c80b73
--- /dev/null
+++ b/www-client/elinks/files/digest-elinks-0.11.0
@@ -0,0 +1,2 @@
+MD5 09e76c99955076aac144e9097f22a36f elinks-0.10.4.conf.bz2 5370
+MD5 9154f493f544af31ae31ec1dd203d315 elinks-0.11.0.tar.bz2 2575870
diff --git a/www-client/elinks/files/elinks-0.11.0-gcc4-inline.patch b/www-client/elinks/files/elinks-0.11.0-gcc4-inline.patch
new file mode 100644
index 000000000000..85457f45ed9e
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.11.0-gcc4-inline.patch
@@ -0,0 +1,12 @@
+diff -Naurp elinks-0.11.0-orig/src/main/event.c elinks-0.11.0/src/main/event.c
+--- elinks-0.11.0-orig/src/main/event.c	2006-01-22 10:58:04.000000000 +0100
++++ elinks-0.11.0/src/main/event.c	2006-01-22 10:58:33.000000000 +0100
+@@ -149,7 +149,7 @@ get_event_name(int id)
+ 	return events[id].name;
+ }
+ 
+-static inline void
++static void
+ trigger_event_va(int id, va_list ap_init)
+ {
+ 	int i;
diff --git a/www-client/elinks/files/elinks-0.11.0-make.patch b/www-client/elinks/files/elinks-0.11.0-make.patch
new file mode 100644
index 000000000000..a864b608acaf
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.11.0-make.patch
@@ -0,0 +1,24 @@
+diff -Naurp elinks-0.11.0-orig/Makefile.config elinks-0.11.0-make/Makefile.config
+--- elinks-0.11.0-orig/Makefile.config	2006-01-22 10:58:05.000000000 +0100
++++ elinks-0.11.0-make/Makefile.config	2006-01-22 11:28:37.000000000 +0100
+@@ -16,7 +16,7 @@ top_srcdir = $(PATHPREFIX).
+ 
+ SRCPATH = $(shell cd $(top_srcdir)/$(RELPATH) && pwd)
+ ifeq ($(SRCPATH),$(CURPATH))
+-srcdir = 
++srcdir = $(CURPATH)/ 
+ else
+ srcdir = $(top_srcdir)/$(RELPATH)
+ endif
+diff -Naurp elinks-0.11.0-orig/Makefile.config.in elinks-0.11.0-make/Makefile.config.in
+--- elinks-0.11.0-orig/Makefile.config.in	2006-01-22 10:58:05.000000000 +0100
++++ elinks-0.11.0-make/Makefile.config.in	2006-01-22 11:28:24.000000000 +0100
+@@ -16,7 +16,7 @@ top_srcdir = $(PATHPREFIX)@top_srcdir@
+ 
+ SRCPATH = $(shell cd $(top_srcdir)/$(RELPATH) && pwd)
+ ifeq ($(SRCPATH),$(CURPATH))
+-srcdir = 
++srcdir = $(CURPATH)/
+ else
+ srcdir = $(top_srcdir)/$(RELPATH)
+ endif