13 files changed, 32 insertions, 205 deletions
diff --git a/net-www/w3m/Manifest b/net-www/w3m/Manifest
index f1169910d661..4b06a68a2dd3 100644
--- a/net-www/w3m/Manifest
+++ b/net-www/w3m/Manifest
@@ -1,23 +1,17 @@
-MD5 80336cc333808be2244addf73f68a2eb w3m-0.4.2-r3.ebuild 3729
-MD5 1f7b8fffb13d61fe43a3294dcf037926 w3m-0.3.2.2.ebuild 3732
-MD5 003ecc09459bb3933a50d51c2b757630 w3m-0.4.ebuild 4437
-MD5 7676892f874fdeefb6cc8dac727f6558 w3m-0.4.1-r3.ebuild 2381
-MD5 efd0e7ec20245e58a27edc22a41e8d04 w3m-0.4.2-r2.ebuild 3323
-MD5 62b25788a9d5b45a468ab269b3ec45a5 w3m-0.4.2-r4.ebuild 3899
-MD5 e1809813737d3273b17639d3f9cccc2b w3m-0.4.2.ebuild 1949
-MD5 4f10dcbbe8981a41f5bd6ed455ff80ee ChangeLog 8421
+MD5 1c5e6bd9c59cff053e5d78a5321de411 w3m-0.3.2.2.ebuild 3729
+MD5 0d6d34cf6a68f6202657dc356c25c2a5 w3m-0.4.ebuild 4434
+MD5 c29cf4463ce57a177c3d0bbef16cb371 w3m-0.4.1-r3.ebuild 2381
+MD5 2c6621ced3716256e44a29ec22385775 w3m-0.4.2-r2.ebuild 3323
+MD5 8e10c8fb50097c894200b100a02601eb w3m-0.4.2.ebuild 1945
+MD5 df33f6d7fe273fa9e9e2be8055c71255 ChangeLog 8701
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 559efee45bae389a3f183f8d06492a9b w3m-0.4.2-r5.ebuild 4158
-MD5 ce76b382e8d84e666fe66e72f72e9ef0 files/w3m-async-dlpanel-gentoo.diff 334
+MD5 d13d74f6074b3b50fea4f165b705f559 w3m-0.4.2-r5.ebuild 4033
 MD5 fd7a37dd6717b69b356f6179a19e17b7 files/digest-w3m-0.4.1-r3 62
 MD5 40e3d07e75b9f601f7b33cc5336214e7 files/digest-w3m-0.4.2-r2 72
-MD5 1e0e222a0e5c3e7c2f9acca4fee13c7d files/digest-w3m-0.4.2-r3 208
-MD5 329f9c1f033fa05474bc76c9cf35075f files/digest-w3m-0.4.2-r4 139
 MD5 0fd075401455ce9205836b4267202e22 files/w3m-w3mman-gentoo.diff 1059
 MD5 ccf8db4eb493664368e4e4c77cea99d4 files/digest-w3m-0.4.2 61
 MD5 b289d2ea47e3369102b13b53f2bc47ac files/digest-w3m-0.4 60
 MD5 df74b28e72e6c2140a1dd6e4ea042e58 files/digest-w3m-0.3.2.2 64
 MD5 00a360d12cc07d61c5fd5df08a53d261 files/w3m-0.4-alpha.patch 930
 MD5 4deea28e3a4e09f22019b01b52273ab3 files/w3m-m17n-search-gentoo.diff 446
-MD5 26cf71e320adb7c19fd0bc71a9bb99fe files/w3m-async-gpm-gentoo.diff 370
 MD5 fdd23d795f443cd36b289ed9477d5e3c files/digest-w3m-0.4.2-r5 272
diff --git a/net-www/w3m/files/digest-w3m-0.4.2-r3 b/net-www/w3m/files/digest-w3m-0.4.2-r3
deleted file mode 100644
index 913ddc6ed2f4..000000000000
--- a/net-www/w3m/files/digest-w3m-0.4.2-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-w3m-0.4.2-r4 b/net-www/w3m/files/digest-w3m-0.4.2-r4
deleted file mode 100644
index c33d4a0f18ca..000000000000
--- a/net-www/w3m/files/digest-w3m-0.4.2-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7246ebdcb27645a8a95beb64902068dd w3m-cvs-1.890.tar.gz 1888635
-MD5 3acc62da58551ce9991d234f19b8fe4d w3m-cvs-1.890-async-3.diff.gz 78562
diff --git a/net-www/w3m/files/digest-w3m-0.4.2-r5 b/net-www/w3m/files/digest-w3m-0.4.2-r5
new file mode 100644
index 000000000000..6353c813082e
--- /dev/null
+++ b/net-www/w3m/files/digest-w3m-0.4.2-r5
@@ -0,0 +1,4 @@
+MD5 7246ebdcb27645a8a95beb64902068dd w3m-cvs-1.890.tar.gz 1888635
+MD5 a7160717037be0c2cd204614cf9c20b9 w3m-cvs-1.890-async-5.diff.gz 79246
+MD5 c3d412a682f5fdf3a42c229834a5c7fe w3m-cvs-1.890-nls-4.diff 4172
+MD5 0631258269b88bb22cbcc68e702b39f2 w3m-cvs-1.890-ja.po.diff 945
diff --git a/net-www/w3m/files/w3m-async-dlpanel-gentoo.diff b/net-www/w3m/files/w3m-async-dlpanel-gentoo.diff
deleted file mode 100644
index 9c56f4ba8b57..000000000000
--- a/net-www/w3m/files/w3m-async-dlpanel-gentoo.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- main.c.ORIG	2003-11-20 00:20:23.000000000 +0900
-+++ main.c	2003-11-20 11:38:09.000000000 +0900
-@@ -6779,7 +6779,7 @@
- 	    n = atoi(&arg->arg[2]);
- 	else
- 	    continue;
--	for (i = 0, d = FirstDL; d; i++, d = d->next) {
-+	for (i = 0, d = LastDL; d; i++, d = d->next) {
- 	    if (i == n) {
- 		if (stop)
- 		    stopDownloadList(d);
diff --git a/net-www/w3m/files/w3m-async-gpm-gentoo.diff b/net-www/w3m/files/w3m-async-gpm-gentoo.diff
deleted file mode 100644
index c1c557fe53e3..000000000000
--- a/net-www/w3m/files/w3m-async-gpm-gentoo.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- terms.c.ORIG	2003-11-20 00:20:23.000000000 +0900
-+++ terms.c	2003-11-20 01:21:30.000000000 +0900
-@@ -34,12 +34,12 @@
- #endif				/* use_SYSMOUSE */
- 
- static int is_xterm = 0;
--static char *term = NULL;
- 
- void mouse_init(), mouse_end();
- int mouseActive = 0;
- #endif				/* USE_MOUSE */
- 
-+static char *term = NULL;
- static char *title_str = NULL;
- 
- extern int tty;
diff --git a/net-www/w3m/w3m-0.3.2.2.ebuild b/net-www/w3m/w3m-0.3.2.2.ebuild
index d5da535aec3d..86a8459a3072 100644
--- a/net-www/w3m/w3m-0.3.2.2.ebuild
+++ b/net-www/w3m/w3m-0.3.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.3.2.2.ebuild,v 1.3 2003/09/06 01:54:09 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.3.2.2.ebuild,v 1.4 2004/01/04 18:35:30 usata Exp $
 
 IUSE="gpm cjk imlib ssl"
 
diff --git a/net-www/w3m/w3m-0.4.1-r3.ebuild b/net-www/w3m/w3m-0.4.1-r3.ebuild
index 7ad0bafbeba7..ece3dcc517d1 100644
--- a/net-www/w3m/w3m-0.4.1-r3.ebuild
+++ b/net-www/w3m/w3m-0.4.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.4.1-r3.ebuild,v 1.4 2003/09/25 08:45:00 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.4.1-r3.ebuild,v 1.5 2004/01/04 18:35:30 usata Exp $
 
 inherit eutils
 
diff --git a/net-www/w3m/w3m-0.4.2-r2.ebuild b/net-www/w3m/w3m-0.4.2-r2.ebuild
index e2e05dba1662..b13e090fd50f 100644
--- a/net-www/w3m/w3m-0.4.2-r2.ebuild
+++ b/net-www/w3m/w3m-0.4.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.4.2-r2.ebuild,v 1.3 2003/11/12 20:22:11 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.4.2-r2.ebuild,v 1.4 2004/01/04 18:35:30 usata Exp $
 
 IUSE="X nopixbuf imlib imlib2 xface ssl migemo gpm cjk"
 
diff --git a/net-www/w3m/w3m-0.4.2-r3.ebuild b/net-www/w3m/w3m-0.4.2-r3.ebuild
deleted file mode 100644
index 888afbb90bd9..000000000000
--- a/net-www/w3m/w3m-0.4.2-r3.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# 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.3 2003/11/23 08:24:56 usata Exp $
-
-IUSE="X nopixbuf imlib imlib2 xface ssl migemo gpm cjk"
-#IUSE="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
-	epatch ${FILESDIR}/${PN}-async-gpm-gentoo.diff
-	epatch ${FILESDIR}/${PN}-async-dlpanel-gentoo.diff
-	#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
-}
diff --git a/net-www/w3m/w3m-0.4.2-r4.ebuild b/net-www/w3m/w3m-0.4.2-r5.ebuild
index 28dfedbcbb2f..6a6f1522b446 100644
--- a/net-www/w3m/w3m-0.4.2-r4.ebuild
+++ b/net-www/w3m/w3m-0.4.2-r5.ebuild
@@ -1,17 +1,20 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.4.2-r4.ebuild,v 1.2 2003/11/30 08:11:17 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.4.2-r5.ebuild,v 1.1 2004/01/04 18:35:30 usata Exp $
 
-IUSE="X nopixbuf imlib imlib2 xface ssl migemo gpm cjk"
-#IUSE="canna"
+IUSE="X nopixbuf imlib imlib2 xface ssl migemo gpm cjk async"
+#IUSE="canna nls unicode"
 
 W3M_CVS_PV="1.890"
 W3M_CVS_P="${PN}-cvs-${W3M_CVS_PV}"
 
 DESCRIPTION="Text based WWW browser, supports tables and frames"
+PATCH_PATH="http://www.page.sannet.ne.jp/knabe/w3m/"
 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"
+	async? ( ${PATCH_PATH}/${W3M_CVS_P}-async-5.diff.gz )
+	${PATCH_PATH}/${W3M_CVS_P}-nls-4.diff
+	${PATCH_PATH}/${W3M_CVS_P}-ja.po.diff"
 # canna? ( http://www.j10n.org/files/${W3M_CVS_P}-canna.patch )"
 
 HOMEPAGE="http://w3m.sourceforge.net/"
@@ -60,9 +63,9 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-w3mman-gentoo.diff
 	epatch ${FILESDIR}/${PN}-m17n-search-gentoo.diff
-	epatch ${DISTDIR}/${W3M_CVS_P}-async-3.diff.gz
-	epatch ${FILESDIR}/${PN}-async-gpm-gentoo.diff
-	epatch ${FILESDIR}/${PN}-async-dlpanel-gentoo.diff
+	epatch ${DISTDIR}/${W3M_CVS_P}-nls-4.diff
+	epatch ${DISTDIR}/${W3M_CVS_P}-ja.po.diff
+	use async && epatch ${DISTDIR}/${W3M_CVS_P}-async-5.diff.gz
 	#use canna && epatch ${DISTDIR}/${W3M_CVS_P}-canna.patch
 }
 
diff --git a/net-www/w3m/w3m-0.4.2.ebuild b/net-www/w3m/w3m-0.4.2.ebuild
index 678f9a198492..9ffd1822b2be 100644
--- a/net-www/w3m/w3m-0.4.2.ebuild
+++ b/net-www/w3m/w3m-0.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.4.2.ebuild,v 1.4 2003/11/14 16:12:11 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.4.2.ebuild,v 1.5 2004/01/04 18:35:30 usata Exp $
 
 inherit eutils
 
diff --git a/net-www/w3m/w3m-0.4.ebuild b/net-www/w3m/w3m-0.4.ebuild
index c42829854b93..45d79e23f6b1 100644
--- a/net-www/w3m/w3m-0.4.ebuild
+++ b/net-www/w3m/w3m-0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.4.ebuild,v 1.6 2003/09/06 01:54:09 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.4.ebuild,v 1.7 2004/01/04 18:35:30 usata Exp $
 
 inherit eutils