Added acync patch

7 files changed, 151 insertions, 59 deletions

diff --git a/net-www/w3m/ChangeLog b/net-www/w3m/ChangeLog
index 655af885fd1e..a4cdaf812aab 100644
--- a/net-www/w3m/ChangeLog
+++ b/net-www/w3m/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/w3m
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/ChangeLog,v 1.37 2003/11/12 20:22:11 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/ChangeLog,v 1.38 2003/11/14 10:04:04 usata Exp $
+
+*w3m-0.4.2-r3 (14 Nov 2003)
+
+  14 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-0.4.2-r3.ebuild,
+  files/w3m.sh, files/w3mbookmark.sh.in, files/w3mhelperpanel.sh.in:
+  Added async patch.
 
 *w3m-0.4.2-r2 (01 Nov 2003)
 
diff --git a/net-www/w3m/Manifest b/net-www/w3m/Manifest
index 21ef3377533e..b9dee1bf2db9 100644
--- a/net-www/w3m/Manifest
+++ b/net-www/w3m/Manifest
@@ -1,5 +1,5 @@
-MD5 810dc2ce9d7810f521201397e3ca136f ChangeLog 7554
-MD5 e78aaa844c0d50350ffecfe2a0744f3f w3m-0.4.2-r3.ebuild 3617
+MD5 abb9bfca1278bca3c38c5d35444d896e ChangeLog 7744
+MD5 6379bf8220687c5df1df9a43b9b76fdc w3m-0.4.2-r3.ebuild 3621
 MD5 efd0e7ec20245e58a27edc22a41e8d04 w3m-0.4.2-r2.ebuild 3323
 MD5 ae37f0b018eb3457f9690ee35cefef0e w3m-0.4.2.ebuild 1939
 MD5 1f7b8fffb13d61fe43a3294dcf037926 w3m-0.3.2.2.ebuild 3732
@@ -11,9 +11,6 @@ MD5 1e0e222a0e5c3e7c2f9acca4fee13c7d files/digest-w3m-0.4.2-r3 208
 MD5 40e3d07e75b9f601f7b33cc5336214e7 files/digest-w3m-0.4.2-r2 72
 MD5 df74b28e72e6c2140a1dd6e4ea042e58 files/digest-w3m-0.3.2.2 64
 MD5 b289d2ea47e3369102b13b53f2bc47ac files/digest-w3m-0.4 60
-MD5 eda1478628d2167faea12ad67bac87b0 files/w3m.sh 490
-MD5 f0c1541c47ce452829b6142a8f64f82e files/w3mbookmark.sh.in 432
-MD5 4859057a6b1661358f58f2fceebcbaa0 files/w3mhelperpanel.sh.in 489
 MD5 00a360d12cc07d61c5fd5df08a53d261 files/w3m-0.4-alpha.patch 930
 MD5 fd7a37dd6717b69b356f6179a19e17b7 files/digest-w3m-0.4.1-r3 62
 MD5 ccf8db4eb493664368e4e4c77cea99d4 files/digest-w3m-0.4.2 61
diff --git a/net-www/w3m/files/digest-w3m-0.4.2-r3 b/net-www/w3m/files/digest-w3m-0.4.2-r3
new file mode 100644
index 000000000000..913ddc6ed2f4
--- /dev/null
+++ b/net-www/w3m/files/digest-w3m-0.4.2-r3
@@ -0,0 +1,3 @@
+MD5 7246ebdcb27645a8a95beb64902068dd w3m-cvs-1.890.tar.gz 1888635
+MD5 3acc62da58551ce9991d234f19b8fe4d w3m-cvs-1.890-async-3.diff.gz 78562
+MD5 ef99c6a7e0a598de6f2bd759ffe07367 w3m-cvs-1.890-canna.patch 28293
diff --git a/net-www/w3m/files/w3m.sh b/net-www/w3m/files/w3m.sh
deleted file mode 100644
index 01079e62fba6..000000000000
--- a/net-www/w3m/files/w3m.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-# Copyright (c) 1999 Fumitoshi UKAI <ukai@debian.or.jp>
-# Copyright (c) 1999 Jacobo Tarrio Barreiro <jtarrio@iname.com>
-# This program is covered by the GNU General Public License version 2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/files/w3m.sh,v 1.1 2003/10/04 20:20:40 usata Exp $
-#
-
-W3M=/usr/bin/w3m-en
-eval `locale`
-locale=${LC_ALL:-$LANG}
-case X"$locale" in
-  Xja|Xja_JP|Xja_JP.*)
-    [ -x /usr/bin/w3m-ja ] && W3M=/usr/bin/w3m-ja
-    ;;
- *)
-    ;;
-esac
-exec $W3M "$@"
diff --git a/net-www/w3m/files/w3mbookmark.sh.in b/net-www/w3m/files/w3mbookmark.sh.in
deleted file mode 100644
index 8c7249f6e7b4..000000000000
--- a/net-www/w3m/files/w3mbookmark.sh.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# Copyright (c) 1999 Fumitoshi UKAI <ukai@debian.or.jp>
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/files/w3mbookmark.sh.in,v 1.1 2003/10/04 20:20:40 usata Exp $
-#
-
-W3MBOOKMARK=@cgibindir@/w3mbookmark-en
-eval `locale`
-locale=${LC_ALL:-$LANG}
-case X"$locale" in
-  Xja|Xja_JP|Xja_JP.*)
-    [ -x @cgibindir@/w3mbookmark-ja ] \
-      && W3MBOOKMARK=@cgibindir@/w3mbookmark-ja
-    ;;
- *)
-    ;;
-esac
-exec $W3MBOOKMARK "$@"
diff --git a/net-www/w3m/files/w3mhelperpanel.sh.in b/net-www/w3m/files/w3mhelperpanel.sh.in
deleted file mode 100644
index 4229d1d49644..000000000000
--- a/net-www/w3m/files/w3mhelperpanel.sh.in
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-# Copyright (c) 1999 Fumitoshi UKAI <ukai@debian.or.jp>
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/files/w3mhelperpanel.sh.in,v 1.1 2003/10/04 20:20:40 usata Exp $
-#
-
-W3MLIBEXEC=/usr/libexec/w3m/cgi-bin
-W3MHELPERPANEL=@cgibindir@/w3mhelperpanel-en
-eval `locale`
-locale=${LC_ALL:-$LANG}
-case X"$locale" in
-  Xja|Xja_JP|Xja_JP.*)
-    [ -x @cgibindir@/w3mhelperpanel-ja ] \
-      && W3MHELPERPANEL=@cgibindir@/w3mhelperpanel-ja
-    ;;
- *)
-    ;;
-esac
-exec $W3MHELPERPANEL "$@"
diff --git a/net-www/w3m/w3m-0.4.2-r3.ebuild b/net-www/w3m/w3m-0.4.2-r3.ebuild
new file mode 100644
index 000000000000..2f4a81db57bc
--- /dev/null
+++ b/net-www/w3m/w3m-0.4.2-r3.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.4.2-r3.ebuild,v 1.1 2003/11/14 10:04:04 usata Exp $
+
+IUSE="X nopixbuf imlib imlib2 xface ssl migemo gpm cjk canna"
+
+W3M_CVS_PV="1.890"
+W3M_CVS_P="${PN}-cvs-${W3M_CVS_PV}"
+
+DESCRIPTION="Text based WWW browser, supports tables and frames"
+SRC_URI="mirror://gentoo/${W3M_CVS_P}.tar.gz
+	http://dev.gentoo.org/~usata/distfiles/${W3M_CVS_P}.tar.gz
+	http://www.page.sannet.ne.jp/knabe/w3m/${W3M_CVS_P}-async-3.diff.gz"
+# canna? ( http://www.j10n.org/files/${W3M_CVS_P}-canna.patch )"
+
+HOMEPAGE="http://w3m.sourceforge.net/"
+
+SLOT="0"
+LICENSE="w3m"
+# since it is a CVS snapshot, we better not change keywords to stable
+KEYWORDS="~x86 ~alpha ~ppc ~sparc"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.57"
+# canna? ( app-i18n/canna )
+RDEPEND=">=sys-libs/ncurses-5.2-r3
+	>=sys-libs/zlib-1.1.3-r2
+	>=dev-libs/boehm-gc-6.2
+	X? ( || ( !nopixbuf? ( >=media-libs/gdk-pixbuf-0.22.0 )
+		imlib2? ( >=media-libs/imlib2-1.1.0-r2 )
+		imlib? ( >=media-libs/imlib-1.9.8 )
+		virtual/glibc )
+	)
+	!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"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+
+	if [ -n "`use X`" -a -n "`use nopixbuf`" -a -z "`use imlib2`" -a -z "`use imlib`" ] ; then
+		ewarn
+		ewarn "If you set USE=\"nopixbuf\" (disable gdk-pixbuf for w3mimgdisplay),"
+		ewarn "you need to enable either imlib2 or imlib USE flag."
+		ewarn
+		die "w3m requires gdk-pixbuf, imlib2 or imlib for image support."
+	fi
+}
+
+src_unpack() {
+
+	unpack ${W3M_CVS_P}.tar.gz
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-w3mman-gentoo.diff
+	epatch ${DISTDIR}/${W3M_CVS_P}-async-3.diff.gz
+	#use canna && epatch ${DISTDIR}/${W3M_CVS_P}-canna.patch
+}
+
+src_compile() {
+
+	export WANT_AUTOCONF_2_5=1
+	#autoconf || die "autoconf failed"
+
+	local myconf migemo_command imagelib
+
+	if [ -n "`use X`" ] ; then
+		myconf="${myconf} --enable-image=x11,fb `use_enable xface`"
+		if [ ! -n "`use nopixbuf`" ] ; then
+			imagelib="gdk-pixbuf"
+		elif [ -n "`use imlib2`" ] ; then
+			imagelib="imlib2"
+		elif [ -n "`use imlib`" ] ; then
+			imagelib="imlib"
+		else
+			# defaults to gdk-pixbuf
+			imagelib="gdk-pixbuf"
+		fi
+	else
+		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
+
+	if [ -n "`use cjk`" ] ; then
+		myconf="${myconf}
+			--enable-japanese=E
+			--with-charset=EUC-JP"
+	fi
+
+	# You can't disable cjk and nls at the moment(w3mhelper hangs)
+	# `use_enable nls` `use_enable cjk`
+	econf --enable-keymap=w3m \
+		--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 \
+		`use_enable gpm mouse` \
+		`use_enable ssl digest-auth` \
+		`use_with ssl` \
+		${myconf} "$@" || die
+		# `use_with canna`
+
+	# emake borked
+	make all || make 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
+}