Version bumped. Added lynxkeymap IUSE flag. Thanks to Tom Martin <tom@edgeoftheinterweb.org.uk> for this feature. Closing bug #49397. async IUSE flag is removed for the moment.

6 files changed, 152 insertions, 45 deletions

diff --git a/net-www/w3m/ChangeLog b/net-www/w3m/ChangeLog
index 576d945117de..faebdf16223d 100644
--- a/net-www/w3m/ChangeLog
+++ b/net-www/w3m/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/w3m
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/ChangeLog,v 1.52 2004/04/28 19:58:30 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/ChangeLog,v 1.53 2004/04/30 17:36:49 usata Exp $
+
+*w3m-0.5.1 (01 May 2004)
+
+  01 May 2004; Mamoru KOMACHI <usata@gentoo.org> w3m-0.5.1.ebuild:
+  Version bumped. Added lynxkeymap IUSE flag. Thanks to Tom Martin
+  <tom@edgeoftheinterweb.org.uk> for this feature. Closing bug #49397.
+  async IUSE flag is removed for the moment.
 
   29 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> w3m-0.5-r1.ebuild,
   w3m-0.5-r2.ebuild:
diff --git a/net-www/w3m/Manifest b/net-www/w3m/Manifest
index 13f790d00a01..114d4fdbc150 100644
--- a/net-www/w3m/Manifest
+++ b/net-www/w3m/Manifest
@@ -1,8 +1,10 @@
+MD5 99a45b5c0218f785628902c03faf7b35 w3m-0.5.1.ebuild 3852
 MD5 5a4fb2341659f69f82de81dc12da6e4d w3m-0.3.2.2.ebuild 3731
 MD5 d1152514d88a9f03e3498f4bbb382f11 ChangeLog 9995
 MD5 8e10c8fb50097c894200b100a02601eb w3m-0.4.2.ebuild 1945
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 2d5c1c9e6b4eec04118721c4fc0e8bbb w3m-0.5-r2.ebuild 3788
+MD5 292a9e6f9df534134608fea83f535968 files/digest-w3m-0.5.1 205
 MD5 838d56c55726f00c34b0c8649e948e3c files/w3m-0.4.2-form.diff 429
 MD5 5b34b82be16b1b02dd603acbfd11d9db files/w3m-libwc-gentoo.diff 437
 MD5 0fd075401455ce9205836b4267202e22 files/w3m-w3mman-gentoo.diff 1059
diff --git a/net-www/w3m/files/digest-w3m-0.5.1 b/net-www/w3m/files/digest-w3m-0.5.1
new file mode 100644
index 000000000000..d4ed82f6c51a
--- /dev/null
+++ b/net-www/w3m/files/digest-w3m-0.5.1
@@ -0,0 +1,3 @@
+MD5 0678b72e07e69c41709d71ef0fe5da13 w3m-0.5.1.tar.gz 1892121
+MD5 31e137778606614afe20e94eaea162ce w3m-cvs-1.912-async-1.diff.gz 76557
+MD5 10edbf22ab53c97dd83b6b6114a3c530 w3m-cvs-1.916-nlsfix-2.diff 4843
diff --git a/net-www/w3m/files/w3m-0.4-alpha.patch b/net-www/w3m/files/w3m-0.4-alpha.patch
deleted file mode 100644
index 399990e56364..000000000000
--- a/net-www/w3m/files/w3m-0.4-alpha.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- w3m-0.4/gc/if_mach.c	2001-11-08 23:59:18.000000000 -0500
-+++ w3m-0.4.new/gc/if_mach.c	2003-03-05 12:12:44.000000000 -0500
-@@ -1,5 +1,6 @@
- /* Conditionally execute a command based on machine and OS from gcconfig.h */
- 
-+typedef char * ptr_t;
- # include "private/gcconfig.h"
- # include <stdio.h>
- # include <string.h>
---- w3m-0.4/gc/if_not_there.c	2001-11-08 23:59:18.000000000 -0500
-+++ w3m-0.4.new/gc/if_not_there.c	2003-03-05 12:13:10.000000000 -0500
-@@ -1,5 +1,7 @@
- /* Conditionally execute a command based if the file argv[1] doesn't exist */
- /* Except for execvp, we stick to ANSI C.				   */
-+
-+typedef char * ptr_t;
- # include "private/gcconfig.h"
- # include <stdio.h>
- # include <stdlib.h>
---- w3m-0.4/gc/threadlibs.c	2002-07-10 10:21:16.000000000 -0400
-+++ w3m-0.4.new/gc/threadlibs.c	2003-03-05 12:13:42.000000000 -0500
-@@ -1,3 +1,4 @@
-+typedef char * ptr_t;
- # include "private/gcconfig.h"
- # include <stdio.h>
- 
diff --git a/net-www/w3m/files/w3m-0.4.2-form.diff b/net-www/w3m/files/w3m-0.4.2-form.diff
deleted file mode 100644
index c70a7ef912e7..000000000000
--- a/net-www/w3m/files/w3m-0.4.2-form.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: form.c
-===================================================================
-RCS file: /cvsroot/w3m/w3m/form.c,v
-retrieving revision 1.33
-retrieving revision 1.34
-diff -u -r1.33 -r1.34
---- form.c	26 Sep 2003 17:59:51 -0000	1.33
-+++ form.c	5 Feb 2004 17:23:07 -0000	1.34
-@@ -360,6 +360,9 @@
- 	else {
- 	    if (w + c_width > width)
- 		break;
-+#else
-+	}
-+	else {
- #endif
- 	    buf[pos] = *p;
- 	    prop[pos] = effect | c_type;
diff --git a/net-www/w3m/w3m-0.5.1.ebuild b/net-www/w3m/w3m-0.5.1.ebuild
new file mode 100644
index 000000000000..feb69c01ff54
--- /dev/null
+++ b/net-www/w3m/w3m-0.5.1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.5.1.ebuild,v 1.1 2004/04/30 17:36:49 usata Exp $
+
+inherit eutils
+
+DESCRIPTION="Text based WWW browser, supports tables and frames"
+HOMEPAGE="http://w3m.sourceforge.net/
+	http://www.page.sannet.ne.jp/knabe/w3m/w3m.html"
+PATCH_PATH="http://www.page.sannet.ne.jp/knabe/w3m/"
+SRC_URI="mirror://sourceforge/w3m/${P}.tar.gz
+	async? ( ${PATCH_PATH}/w3m-cvs-1.912-async-1.diff.gz )
+	nls? ( ${PATCH_PATH}/w3m-cvs-1.916-nlsfix-2.diff )"
+# w3m color patch:
+#	http://homepage3.nifty.com/slokar/w3m/${P}-cvs-1.895_256-001.patch.gz
+# w3n canna inline patch:
+#	canna? ( http://www.j10n.org/files/w3m-cvs-1.914-canna.patch )
+# w3m bookmark charset patch:
+#	nls? ( ${PATCH_PATH}/${W3M_CVS_P}-bkmknls-1.diff )
+
+LICENSE="w3m"
+SLOT="0"
+KEYWORDS="~x86 ~alpha ~ppc ~sparc"
+IUSE="X gtk imlib imlib2 xface ssl migemo gpm cjk nls lynxkeymap"
+#IUSE="canna unicode"
+
+# canna? ( app-i18n/canna )
+# removed nopixbuf IUSE flag as we now have per package USE flag.
+# if you don't want to pull in gtk1, set -gtk for this package in
+# /etc/portage/package.use.
+DEPEND=">=sys-libs/ncurses-5.2-r3
+	>=sys-libs/zlib-1.1.3-r2
+	>=dev-libs/boehm-gc-6.2
+	X? ( gtk? ( >=media-libs/gdk-pixbuf-0.22.0 )
+		!gtk? ( imlib2? ( >=media-libs/imlib2-1.1.0-r2 )
+			!imlib2? ( >=media-libs/imlib-1.9.8 ) )
+	)
+	!X? ( imlib2? ( >=media-libs/imlib2-1.1.0-r2 ) )
+	xface? ( media-libs/compface )
+	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
+	migemo? ( >=app-text/migemo-0.40 )
+	ssl? ( >=dev-libs/openssl-0.9.6b )"
+PROVIDE="virtual/textbrowser
+	virtual/w3m"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-w3mman-gentoo.diff
+	#if [ -n "`use async`" ] ; then
+	#	epatch ${DISTDIR}/w3m-cvs-1.912-async-1.diff.gz
+	#	epatch ${FILESDIR}/${PN}-0.4.2-async-m17n-gentoo.diff
+	#fi
+	#epatch ${DISTDIR}/${P}-cvs-1.895_256-001.patch.gz
+	#use canna && epatch ${DISTDIR}/w3m-cvs-1.914-canna.patch
+}
+
+src_compile() {
+
+	local myconf migemo_command imagelib
+
+	if [ -n "`use X`" ] ; then
+		myconf="${myconf} --enable-image=x11,fb `use_enable xface`"
+		if [ -n "`use gtk`" ] ; then
+			imagelib="gdk-pixbuf"
+		elif [ -n "`use imlib2`" ] ; then
+			imagelib="imlib2"
+		else
+			imagelib="imlib"
+		fi
+	else	# no X
+		if [ -n "`use imlib2`" ] ; then
+			myconf="${myconf} --enable-image=fb"
+			imagelib="imlib2"
+		else
+			myconf="${myconf} --enable-image=no"
+			imagelib="no"
+		fi
+	fi
+
+	if [ -n "`use migemo`" ] ; then
+		migemo_command="migemo -t egrep /usr/share/migemo/migemo-dict"
+	else
+		migemo_command="no"
+	fi
+
+	# emacs-w3m doesn't like "--enable-m17n --disable-unicode,"
+	# so we better enable or disable both. Default to enable
+	# m17n and unicode, see bug #47046.
+	if [ -n "`use cjk`" ] ; then
+		myconf="${myconf}
+			--enable-japanese=E
+			--with-charset=EUC-JP"
+	else
+		myconf="${myconf}
+			--with-charset=US-ASCII"
+	fi
+
+	# lynxkeymap IUSE flag. bug #49397
+	if use lynxkeymap ; then
+		myconf="${myconf} --enable-keymap=lynx"
+	else
+		myconf="${myconf} --enable-keymap=w3m"
+	fi
+
+	econf \
+		--with-editor=/usr/bin/nano \
+		--with-mailer=/bin/mail \
+		--with-browser=/usr/bin/mozilla \
+		--with-termlib=ncurses \
+		--with-imagelib="${imagelib}" \
+		--with-migemo="${migemo_command}" \
+		--enable-m17n \
+		--enable-unicode \
+		`use_enable gpm mouse` \
+		`use_enable ssl digest-auth` \
+		`use_with ssl` \
+		`use_enable nls` \
+		${myconf} "$@" || die
+		# `use_with canna`
+
+	# emake borked
+	emake -j1 all || die "make failed"
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die "make install failed"
+
+	insinto /usr/share/${PN}/Bonus
+	doins Bonus/*
+	dodoc README NEWS TODO ChangeLog
+	docinto doc-en ; dodoc doc/*
+	if [ -n "`use cjk`" ] ; then
+		docinto doc-jp ; dodoc doc-jp/*
+	else
+		rm -rf ${D}/usr/share/man/ja
+	fi
+}