Moved from net-www/w3m to www-client/w3m.

14 files changed, 932 insertions, 0 deletions

diff --git a/www-client/w3m/ChangeLog b/www-client/w3m/ChangeLog
new file mode 100644
index 000000000000..6ac39cb6b114
--- /dev/null
+++ b/www-client/w3m/ChangeLog
@@ -0,0 +1,322 @@
+# ChangeLog for www-client/w3m
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.1 2004/09/08 14:16:49 usata Exp $
+
+*w3m-0.5-r2 (08 Sep 2004)
+
+  08 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> +metadata.xml,
+  +files/w3m-0.4.2-async-m17n-gentoo.diff, +files/w3m-libwc-gentoo.diff,
+  +files/w3m-m17n-search-gentoo.diff, +files/w3m-w3mman-gentoo.diff,
+  +w3m-0.4.2.ebuild, +w3m-0.5-r2.ebuild, +w3m-0.5.1-r1.ebuild,
+  +w3m-0.5.1.ebuild:
+  Moved from net-www/w3m to www-client/w3m.
+
+  07 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> w3m-0.5.1.ebuild:
+  Sync IUSE.
+
+  26 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> w3m-0.5.1-r1.ebuild:
+  Stable on x86, alpha and ppc.
+
+  08 Aug 2004; Tom Gall <tgall@gentoo.org> w3m-0.5.1-r1.ebuild:
+  stable on ppc64, bug #57676
+
+  07 Aug 2004; Tom Martin <slarti@gentoo.org> w3m-0.5.1-r1.ebuild:
+  Marked ~amd64.
+
+  14 Jun 2004; Aron Griffis <agriffis@gentoo.org> w3m-0.4.2.ebuild,
+  w3m-0.5-r2.ebuild, w3m-0.5.1-r1.ebuild, w3m-0.5.1.ebuild:
+  Fix use invocation
+
+  06 Jun 2004; Jason Wever <weeve@gentoo.org> w3m-0.5.1.ebuild:
+  Stable on sparc.
+
+*w3m-0.5.1-r1 (30 May 2004)
+
+  30 May 2004; Mamoru KOMACHI <usata@gentoo.org> w3m-0.3.2.2.ebuild,
+  w3m-0.5.1-r1.ebuild, w3m-0.5.1.ebuild:
+  Added async patch. Marked 0.5.1 stable on x86, ppc and alpha.
+  Removed 0.3.2.2 from CVS tree
+
+  03 May 2004; Jason Wever <weeve@gentoo.org> w3m-0.5-r2.ebuild:
+  Stable on sparc.
+
+*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:
+  Stable on x86 and alpha. IUSE cleanup.
+
+*w3m-0.5-r2 (08 Apr 2004)
+
+  08 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> w3m-0.5-r2.ebuild:
+  Enables m17n and unicode by default, see bug #47046
+
+*w3m-0.5-r1 (25 Mar 2004)
+
+  25 Mar 2004; Mamoru KOMACHI <usata@gentoo.org> w3m-0.5-r1.ebuild:
+  Updated async and nls patch.
+
+*w3m-0.5 (22 Mar 2004)
+
+  22 Mar 2004; Mamoru KOMACHI <usata@gentoo.org> w3m-0.5.ebuild:
+  Version bumped.
+
+*w3m-0.4.2-r9 (17 Feb 2004)
+
+  17 Feb 2004; Mamoru KOMACHI <usata@gentoo.org> w3m-0.4.2-r9.ebuild,
+  files/w3m-0.4.2-async-m17n-gentoo.diff:
+  Fixed compile error when USE="async -cjk". Closing bug #40774
+
+*w3m-0.4.2-r8 (07 Feb 2004)
+
+  07 Feb 2004; Mamoru KOMACHI <usata@gentoo.org> w3m-0.4.2-r8,
+  files/w3m-0.4.2-form.diff:
+  Fixed form rendering bug when --disable-m17n
+
+*w3m-0.4.2-r7 (22 Jan 2004)
+
+  22 Jan 2004; Mamoru KOMACHI <usata@gentoo.org> w3m-0.4.2-r5.ebuild,
+  w3m-0.4.2-r6.ebuild, w3m-0.4.2-r7.ebuild:
+  Removed unicode IUSE flag for the sake of emacs-w3m, see bug #38795
+
+*w3m-0.4.2-r6 (12 Jan 2004)
+
+  12 Jan 2004; Mamoru KOMACHI <usata@gentoo.org> w3m-0.4.2-r6.ebuild:
+  files/w3m-libwc-gentoo.diff:
+  Updated CVS snapshot. Added unicode and nls IUSE flags.
+
+*w3m-0.4.2-r5 (05 Jan 2004)
+
+  05 Jan 2004; Mamoru KOMACHI <usata@gentoo.org> w3m-0.4.2-r3.ebuild,
+  w3m-0.4.2-r4.ebuild, w3m-0.4.2-r5.ebuild,
+  files/w3m-async-dlpanel-gentoo.diff, files/w3m-async-gpm-gentoo.diff:
+  Added async local USE flag and updated async and nls patches.
+
+*w3m-0.4.2-r4 (27 Nov 2003)
+
+  30 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-0.4.2-r4.ebuild,
+  files/w3m-m17n-search-gentoo.diff:
+  Added a patch to fix m17n search
+
+  27 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-0.4.2-r4.ebuild:
+  Fixed strange character problem
+
+  14 Nov 2003; Brad House <brad_mssw@gentoo.org> w3m-0.4.2.ebuild:
+  mark stable on amd64
+
+*w3m-0.4.2-r3 (14 Nov 2003)
+
+  23 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-0.4.2-r3.ebuild,
+  files/w3m-async-dlpanel-gentoo.diff:
+  Added a patch to fix ordering of download list panel
+
+  20 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-0.4.2-r3.ebuild,
+  files/w3m-async-gpm-gentoo.diff:
+  Fixed build failure when USE="-gpm"
+
+  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)
+
+  09 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-0.4.2-r2.ebuild:
+  Added --enable-m17n back.
+
+  05 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-0.4.2-r1.ebuild,
+  w3m-0.4.2-r2.ebuild, files/w3m-0.4.2-imglib-gentoo.diff,
+  files/w3m-0.4.2-w3mman-gentoo.diff:
+  Changed imglib to imagelib and fixed w3mimagefb breakage with gdk-pixbuf.
+  Support for imlib2 without X (using w3m under framebuffer).
+
+  01 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-0.4.2-r2.ebuild:
+  Updated to the latest snapshot
+
+*w3m-0.4.2-r1 (05 Oct 2003)
+
+  01 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-0.4.2-r1.ebuild:
+  Added a notice for those who set USE="nopixbuf -imlib -imlib2"
+
+  05 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-0.4.2-r1.ebuild:
+  Fixed wrong DEPEND to gtk+
+
+  05 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-0.4.2-r1.ebuild,
+  files/w3m-0.4.2-imglib-gentoo.diff, files/w3m-0.4.2-w3mman-gentoo.diff,
+  files/w3m.sh, files/w3mbookmark.sh.in, files/w3mhelperpanel.sh.in:
+  New CVS snapshot. -m17n is enabled by default. Added nopixbuf,
+  imlib2 and migemo USE flag.  Added scripts (taken from Debian) to
+  support pseudo-nls.
+
+  25 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-0.4.1-r3.ebuild,
+  w3m-0.4.2.ebuild, files/w3m-w3mman-gentoo.diff:
+  Enables migemo if app-emacs/migemo is installed. Split w3mman patch
+  rather than writing down variables directly to ebuilds.
+
+  23 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-0.2.2-r1.ebuild,
+  w3m-0.3-r2.ebuild, w3m-0.3-r6.ebuild, w3m-0.3.2.1.ebuild,
+  w3m-0.4.1-r1.ebuild, w3m-0.4.1-r2.ebuild, w3m-0.4.1.ebuild,
+  files/config.param, files/w3m-0.1.10.diff.gz:
+  Cleaned out old versions and patches. <net-www/w3m-0.3.2.2 had
+  security hole and w3m-0.4.1{,-r1,-r2} are somewhat redundant.
+
+*w3m-0.4.2 (23 Sep 2003)
+
+  01 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-0.4.2.ebuild:
+  Considered as stable
+
+  23 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-0.4.2.ebuild:
+  Version bumped. Rewrote econf part according to new configure.
+  Added gtk and xface IUSE flags. Added dev-libs/boehm-gc to DEPEND list
+  (boehm-gc is not included in w3m distribution anymore). Installs
+  Bonus cgi-scripts, Japanese docs if USE="cjk" is set.
+  Removed eutils inheritance (0.4.2 ebuild no longer uses epatch)
+
+*w3m-0.4.1-r3 (22 Aug 2003)
+
+  23 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-0.4.1-r3.ebuild:
+  Stable bump
+
+  22 Aug 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-0.4.1-r3.ebuild:
+  Fixed a problem of viewing Japanese manpages with w3mman.  Added libungif
+  to DEPEND (w3m-img freezes when you visit a page with animation gif
+  if it is not build with libungif).  PROVIDEs virtual/w3m
+
+*w3m-0.4.1-r2 (29 Jun 2003)
+
+  29 Jun 2003; Aron Griffis <agriffis@gentoo.org> w3m-0.4.1-r2.ebuild:
+  Fix bug 23714 by setting set "use_ssl_verify=y" when USE=ssl
+
+  24 Jun 2003; Patrick Kursawe <phosphan@gentoo.org> w3m-0.4.1-r1.ebuild:
+  Stable for x86, ~alpha (alpha reported working on stable.gentoo.org)
+
+*w3m-0.4.1-r1 (12 May 2003)
+
+  12 May 2003; Patrick Kursawe <phosphan@gentoo.org> w3m-0.4.1-r1.ebuild:
+  Fix to actually use SSL if in USE, provided in bug 20636 by Mamoru KOMACHI
+  <usata@sodan.ecc.u-tokyo.ac.jp>
+
+*w3m-0.4.1 (07 May 2003)
+
+  07 May 2003; Patrick Kursawe <phosphan@gentoo.org> w3m-0.4.1.ebuild:
+  Version bump and configure re-write by Mamoru KOMACHI
+  <usata@sodan.ecc.u-tokyo.ac.jp> in bug 20576
+
+*w3m-0.4 (05 Mar 2003)
+
+  30 Mar 2003; Christian Birchinger <joker@gentoo.org> w3m-0.4.ebuild:
+  Added sparc stable keyword
+
+  10 Mar 2003; Aron Griffis <agriffis@gentoo.org> w3m-0.4.ebuild:
+  Fix bug #17205 by answering compface question conditionally on "use imlib".
+  Thanks to Yamakura Makoto for that fix. Also respect $EDITOR at Seemant's
+  request.
+
+  07 Mar 2003; Aron Griffis <agriffis@gentoo.org> w3m-0.4.ebuild:
+  Fix bug #16946 for when USE=-gpm.  Thanks to Robert Gill for catching this one.
+
+  05 Mar 2003; Aron Griffis <agriffis@gentoo.org> w3m-0.4.ebuild,
+  files/w3m-0.4-alpha.patch:
+  Fix bug #16905 by adding a patch for alpha.  Mark alpha stable.
+
+  05 Mar 2003; Aron Griffis <agriffis@gentoo.org> w3m-0.4.ebuild:
+  Updated to 0.4. Fixed bug #16868 by updating the configuration monologue and
+  adding a sanity check at the end. Fixed bug #8879 by adding dep on
+  media-libs/compface, thanks to Lim Swee Tat for the heads-up.
+
+*w3m-0.3.2.2 (17 Feb 2003)
+
+  17 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Security update.
+
+  12 Feb 2003; Aron Griffis <agriffis@gentoo.org> w3m-0.3-r6.ebuild :
+  Add alpha to KEYWORDS
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*w3m-0.3.2.1 (02 Dec 2002)
+  
+  02 Dec 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump
+
+w3m-0.3-r6 (18 Aug 2002)
+
+  29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> w3m-0.3-r2.ebuild
+  w3m-0.3-r6.ebuild w3m-0.2.2-r1.ebuild :
+
+  PROVIDE="virtual/textbrowser"
+
+  18 Aug 2002; Michael Nazaroff <naz@gentoo.org> w3m-0.3-r6.ebuild:
+
+  Removed the r5 ebuild, Added some fix's to ebuild to take care of bug 5905.
+  YAMAKURA Makoto sent in the patch to fix the ebuild and take care of
+  the problem <makoto@dsb.club.ne.jp>.
+
+w3m-0.3-r5 (28 Jul 2002)
+
+  28 Jul 2002; Michael Nazaroff <naz@gentoo.org.org> w3m-0.3-r5.ebuild:
+
+  Removed some of the old dirty ebuilds since it was getting cluttered around
+  here.  Keeping one old one for future reference since I still need to work on
+  the gpm issue mentioned earlier in this ChangeLog.  Updated imlib use variable
+  so it pulls down the needed version.
+
+w3m-0.3-r5 (20 Jul 2002)
+
+  20 Jul 2002; Michael Nazaroff <naz@gentoo.org.org> w3m-0.3-r5.ebuild:
+
+  Updated the build to allow w3m to use ANSI color escapes during
+  the compile, making it inifinitely more useable.  Thanx to CJ 
+  Kucera <pez@apocalyptech.com> for the suggestion.
+
+* w3m-0.3-r4 (18 Jul 2002)
+
+  18 Jul 2002; Stuart Bouyer <stubear@gentoo.org>  w3m-0.3-r4.ebuild:
+
+  Update the ebuild to add support for Japanese using new "cjk" USE flag.
+  
+
+*w3m-0.3-r2 (07 Jun 2002)
+
+    14 Jul 2002; Michael Nazaroff <naz@gentoo.org> w3m-0.3-r3.ebuild:
+
+	Updated the ebuild and changed the configure options so mouse support
+	is always on.  This should take care of bug 4701.  I probably need to 
+	look at a patch so we can have a gpm use variable in this ebuild, since
+	it still is flaky.
+
+
+*w3m-0.3-r2 (07 Jun 2002)
+
+    07 Jun 2002; Michael Nazaroff <naz@gentoo.org> w3m-0.3-r2.ebuild:
+
+	Updated the ebuild and changed to the Customize configure option so I
+	could add a gpm use variable to the ebuild. This takes care of bug 3264.
+           
+
+*w3m-0.3-r1, w3m-0.2.2-r1 (03 May 2002)
+
+    03 May 2002; pvdabeel <pvdabeel@gentoo.org>	w3m-0.3-r1.ebuild, w3m-0.2.2-r1 :
+	ppc fix
+
+*w3m-0.3 (26 Apr 2002)
+
+	26 Apr 2002; Aron Griffis <agriffis@gentoo.org> w3m-0.3.ebuild :
+
+	Updated to version 0.3 with optional image support (depends on "use
+	imlib").
+
+*w3m-0.2.2 (1 Feb 2002)
+
+	1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+
+	Added initial ChangeLog which should be updated whenever the package is
+	updated in any way. This changelog is targetted to users. This means that
+	the comments should well explained and written in clean English. The
+	details about writing correct changelogs are explained in the
+	skel.ChangeLog file which you can find in the root directory of the
+	portage repository.
diff --git a/www-client/w3m/files/digest-w3m-0.4.2 b/www-client/w3m/files/digest-w3m-0.4.2
new file mode 100644
index 000000000000..517e99daf74e
--- /dev/null
+++ b/www-client/w3m/files/digest-w3m-0.4.2
@@ -0,0 +1 @@
+MD5 56b8948468a19778fce0b1653579775a w3m-0.4.2.tar.gz 660889
diff --git a/www-client/w3m/files/digest-w3m-0.5-r2 b/www-client/w3m/files/digest-w3m-0.5-r2
new file mode 100644
index 000000000000..43ccd5139db3
--- /dev/null
+++ b/www-client/w3m/files/digest-w3m-0.5-r2
@@ -0,0 +1,3 @@
+MD5 31e470bcb09bad3150d73af760febe0c w3m-0.5.tar.gz 1889076
+MD5 31e137778606614afe20e94eaea162ce w3m-cvs-1.912-async-1.diff.gz 76557
+MD5 83c4903221284ec5f92f19a285b2d86e w3m-cvs-1.912-nlscharset-1.diff 4027
diff --git a/www-client/w3m/files/digest-w3m-0.5.1 b/www-client/w3m/files/digest-w3m-0.5.1
new file mode 100644
index 000000000000..d4ed82f6c51a
--- /dev/null
+++ b/www-client/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/www-client/w3m/files/digest-w3m-0.5.1-r1 b/www-client/w3m/files/digest-w3m-0.5.1-r1
new file mode 100644
index 000000000000..bf3e849b0db5
--- /dev/null
+++ b/www-client/w3m/files/digest-w3m-0.5.1-r1
@@ -0,0 +1,3 @@
+MD5 0678b72e07e69c41709d71ef0fe5da13 w3m-0.5.1.tar.gz 1892121
+MD5 c049959aa669b79ace40aa3099563723 w3m-0.5.1-async-1.diff.gz 72956
+MD5 10edbf22ab53c97dd83b6b6114a3c530 w3m-cvs-1.916-nlsfix-2.diff 4843
diff --git a/www-client/w3m/files/w3m-0.4.2-async-m17n-gentoo.diff b/www-client/w3m/files/w3m-0.4.2-async-m17n-gentoo.diff
new file mode 100644
index 000000000000..ebc5fbb84768
--- /dev/null
+++ b/www-client/w3m/files/w3m-0.4.2-async-m17n-gentoo.diff
@@ -0,0 +1,45 @@
+diff -urN w3m.orig/file.c w3m/file.c
+--- w3m.orig/file.c	2004-02-17 19:10:27.055076000 +0900
++++ w3m/file.c	2004-02-17 22:00:49.578016400 +0900
+@@ -652,13 +652,11 @@
+ 		cont = TRUE;
+ #ifdef USE_M17N
+ 	    lineBuf2 = decodeMIME(lineBuf2, &mime_charset);
++#endif
+ 	    lineBuf2 = convertLine(NULL, lineBuf2, RAW_MODE,
+ 				   mime_charset ? &mime_charset : &newBuf->document_charset,
+ 				   mime_charset ? mime_charset
+ 				   : DocumentCharset);
+-#else
+-	    lineBuf2 = convertLine(NULL, lineBuf2, &newBuf->document_code, RAW_MODE);
+-#endif
+ 	    /* separated with line and stored */
+ 	    tmp = Strnew_size(lineBuf2->length);
+ 	    for (p = lineBuf2->ptr; *p; p = q) {
+@@ -6772,13 +6770,11 @@
+ 	}
+ #endif
+ 	if (!newBuf->internal) {
+-#ifdef USE_M17N
+ 	    lineBuf2 = convertLine(f, lineBuf2, HTML_MODE, &newBuf->document_charset, newBuf->document_charset);
++#ifdef USE_M17N
+ #ifdef USE_IMAGE
+ 	    h_env->document_charset = newBuf->document_charset;
+ #endif
+-#else
+-	    lineBuf2 = convertLine(f, lineBuf2, &newBuf->document_code, HTML_MODE);
+ #endif
+ 	}
+ 	HTMLlineproc0(lineBuf2->ptr, h_env, newBuf->internal);
+@@ -7497,11 +7493,7 @@
+ 	buf->nlines++;
+ 	buf->linelen += lineBuf2->length;
+ 	showProgressBuffer(buf);
+-#ifdef USE_M17N
+ 	lineBuf2 = convertLine(uf, lineBuf2, PAGER_MODE, &buf->document_charset, buf->document_charset);
+-#else
+-	lineBuf2 = convertLine(uf, lineBuf2, &buf->document_charset, PAGER_MODE);
+-#endif
+ 	if (squeezeBlankLine) {
+ 	    squeeze_flag = FALSE;
+ 	    if (lineBuf2->ptr[0] == '\n' && buf->pre_lbuf == '\n') {
diff --git a/www-client/w3m/files/w3m-libwc-gentoo.diff b/www-client/w3m/files/w3m-libwc-gentoo.diff
new file mode 100644
index 000000000000..978bfa508aaa
--- /dev/null
+++ b/www-client/w3m/files/w3m-libwc-gentoo.diff
@@ -0,0 +1,13 @@
+diff -urN libwc.ORIG/detect.c libwc/detect.c
+--- libwc.ORIG/detect.c	2002-11-20 03:04:00.000000000 +0900
++++ libwc/detect.c	2004-01-09 23:49:30.546004976 +0900
+@@ -63,7 +63,9 @@
+ 	    for (i = 0; i < 0x20; i++)
+ 		WC_DETECT_MAP[i] = 0;
+ 	    WC_DETECT_MAP[WC_C_HZ_TILDA] = (ces == WC_CES_HZ_GB_2312) ? 1 : 0;
++#ifdef USE_UNICODE
+ 	    WC_DETECT_MAP[WC_C_UTF7_PLUS] = (ces == WC_CES_UTF_7) ? 1 : 0;
++#endif
+ 	}
+ 	detect_ces = ces;
+     }
diff --git a/www-client/w3m/files/w3m-m17n-search-gentoo.diff b/www-client/w3m/files/w3m-m17n-search-gentoo.diff
new file mode 100644
index 000000000000..e5b1a5ef2b71
--- /dev/null
+++ b/www-client/w3m/files/w3m-m17n-search-gentoo.diff
@@ -0,0 +1,15 @@
+--- search.c.orig	2003-09-23 06:02:21.000000000 +0900
++++ search.c	2003-11-30 16:33:33.000000000 +0900
+@@ -69,6 +69,12 @@
+ 	}
+     }
+     tmp = Str_conv_from_system(Strfgets(migemor));
++#ifdef USE_M17N
++    if (SearchConv && !WcOption.pre_conv &&
++	Currentbuf->document_charset != DisplayCharset)
++	tmp = Strnew_charp(wtf_conv_fit(
++	    tmp->ptr, Currentbuf->document_charset));
++#endif
+     Strchop(tmp);
+     if (tmp->length == 0)
+ 	goto err;
diff --git a/www-client/w3m/files/w3m-w3mman-gentoo.diff b/www-client/w3m/files/w3m-w3mman-gentoo.diff
new file mode 100644
index 000000000000..be0f16e560fa
--- /dev/null
+++ b/www-client/w3m/files/w3m-w3mman-gentoo.diff
@@ -0,0 +1,23 @@
+diff -urN w3m-0.4.2.ORIG/scripts/w3mman/w3mman.in w3m-0.4.2/scripts/w3mman/w3mman.in
+--- w3m-0.4.2.ORIG/scripts/w3mman/w3mman.in	2003-09-25 00:58:27.000000000 +0900
++++ w3m-0.4.2/scripts/w3mman/w3mman.in	2003-09-25 03:12:38.000000000 +0900
+@@ -1,7 +1,7 @@
+ #!@PERL@
+ 
+ @W3M = split(' ', $ENV{'W3MMAN_W3M'} || '@W3M@');
+-$ENV{'W3MMAN_MAN'} ||= '@MAN@';
++$ENV{'W3MMAN_MAN'} ||= 'env LC_MESSAGES=${LC_MESSAGES:-${LC_ALL:-${LANG}}} LANG=C @MAN@';
+ $SCRIPT = 'file:///$LIB/w3mman2html.cgi';
+ 
+ sub usage {
+diff -urN w3m-0.4.2.ORIG/scripts/w3mman/w3mman2html.cgi.in w3m-0.4.2/scripts/w3mman/w3mman2html.cgi.in
+--- w3m-0.4.2.ORIG/scripts/w3mman/w3mman2html.cgi.in	2003-09-25 00:58:27.000000000 +0900
++++ w3m-0.4.2/scripts/w3mman/w3mman2html.cgi.in	2003-09-25 03:12:38.000000000 +0900
+@@ -1,6 +1,6 @@
+ #!@PERL@
+ 
+-$MAN = $ENV{'W3MMAN_MAN'} || '@MAN@';
++$MAN = $ENV{'W3MMAN_MAN'} || 'env LC_MESSAGES=${LC_MESSAGES:-${LC_ALL:-${LANG}}} LANG=C @MAN@';
+ $QUERY = $ENV{'QUERY_STRING'} || $ARGV[0];
+ $SCRIPT_NAME = $ENV{'SCRIPT_NAME'} || $0;
+ $CGI = "file://$SCRIPT_NAME";
diff --git a/www-client/w3m/metadata.xml b/www-client/w3m/metadata.xml
new file mode 100644
index 000000000000..2d5852c16c60
--- /dev/null
+++ b/www-client/w3m/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>cjk</herd>
+</pkgmetadata>
diff --git a/www-client/w3m/w3m-0.4.2.ebuild b/www-client/w3m/w3m-0.4.2.ebuild
new file mode 100644
index 000000000000..87a0c45d484d
--- /dev/null
+++ b/www-client/w3m/w3m-0.4.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.4.2.ebuild,v 1.1 2004/09/08 14:16:49 usata Exp $
+
+inherit eutils
+
+IUSE="gpm cjk gtk imlib xface ssl"
+
+DESCRIPTION="Text based WWW browser, supports tables and frames"
+SRC_URI="mirror://sourceforge/w3m/${P}.tar.gz"
+HOMEPAGE="http://w3m.sourceforge.net/"
+
+SLOT="0"
+LICENSE="w3m"
+KEYWORDS="x86 alpha ppc sparc amd64"
+
+DEPEND=">=sys-libs/ncurses-5.2-r3
+	>=sys-libs/zlib-1.1.3-r2
+	>=dev-libs/boehm-gc-6.2
+	gtk? ( =x11-libs/gtk+-1.2*
+		media-libs/gdk-pixbuf )
+	!gtk? ( imlib? ( >=media-libs/imlib-1.9.8
+		media-libs/libungif ) )
+	xface? ( media-libs/compface )
+	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
+	ssl? ( >=dev-libs/openssl-0.9.6b )"
+
+PROVIDE="virtual/textbrowser
+	virtual/w3m"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/w3m-w3mman-gentoo.diff
+}
+
+src_compile() {
+
+	local myconf migemo_command
+
+	use cjk && myconf="${myconf} --enable-japanese=E"
+
+	if use imlib || use gtk; then
+		myconf="${myconf} --enable-image=x11,fb `use_enable xface`"
+	else
+		myconf="${myconf} --enable-image=no"
+	fi
+
+	if has_version 'app-emacs/migemo' ; then
+		migemo_command="migemo -t egrep /usr/share/migemo/migemo-dict"
+	else
+		migemo_command="no"
+	fi
+
+	econf --enable-keymap=w3m \
+		--with-editor=/usr/bin/nano \
+		--with-mailer=/bin/mail \
+		--with-browser=/usr/bin/mozilla \
+		--with-termlib=ncurses \
+		--with-migemo="${migemo_command}" \
+		`use_enable gpm mouse` \
+		`use_enable ssl digest-auth` \
+		`use_with ssl` \
+		${myconf} || die
+
+	make || make || 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 use cjk ; then
+		docinto doc-jp ; dodoc doc-jp/*
+	else
+		rm -rf ${D}/usr/share/man/ja
+	fi
+}
diff --git a/www-client/w3m/w3m-0.5-r2.ebuild b/www-client/w3m/w3m-0.5-r2.ebuild
new file mode 100644
index 000000000000..090d300413d2
--- /dev/null
+++ b/www-client/w3m/w3m-0.5-r2.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5-r2.ebuild,v 1.1 2004/09/08 14:16:49 usata Exp $
+
+inherit eutils
+
+W3M_CVS_PV="1.912"
+W3M_CVS_P="${PN}-cvs-${W3M_CVS_PV}"
+
+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_P}-async-1.diff.gz )
+	nls? ( ${PATCH_PATH}/${W3M_CVS_P}-nlscharset-1.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_P}-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 async"
+#IUSE="canna unicode"
+
+# canna? ( app-i18n/canna )
+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 )
+			!imlib2? ( >=media-libs/imlib-1.9.8 ) )
+	)
+	!X? ( imlib2? ( >=media-libs/imlib2-1.1.0 ) )
+	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
+	epatch ${FILESDIR}/${PN}-m17n-search-gentoo.diff
+	epatch ${FILESDIR}/${PN}-libwc-gentoo.diff
+	if use nls ; then
+		#epatch ${DISTDIR}/${W3M_CVS_P}-bkmknls-1.diff
+		epatch ${DISTDIR}/${W3M_CVS_P}-nlscharset-1.diff
+	fi
+	if use async ; then
+		epatch ${DISTDIR}/${W3M_CVS_P}-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_P}-canna.patch
+}
+
+src_compile() {
+	local myconf migemo_command imagelib
+
+	if use X ; then
+		myconf="${myconf} --enable-image=x11,fb `use_enable xface`"
+		if use gtk ; then
+			imagelib="gdk-pixbuf"
+		elif use imlib2 ; then
+			imagelib="imlib2"
+		else
+			imagelib="imlib"
+		fi
+	else	# no X
+		if use imlib2 ; then
+			myconf="${myconf} --enable-image=fb"
+			imagelib="imlib2"
+		else
+			myconf="${myconf} --enable-image=no"
+			imagelib="no"
+		fi
+	fi
+
+	if 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 use cjk ; then
+		myconf="${myconf}
+			--enable-japanese=E
+			--with-charset=EUC-JP"
+	else
+		myconf="${myconf}
+			--with-charset=US-ASCII"
+	fi
+
+	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 \
+		--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 use cjk ; then
+		docinto doc-jp ; dodoc doc-jp/*
+	else
+		rm -rf ${D}/usr/share/man/ja
+	fi
+}
diff --git a/www-client/w3m/w3m-0.5.1-r1.ebuild b/www-client/w3m/w3m-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..aa7803b2d657
--- /dev/null
+++ b/www-client/w3m/w3m-0.5.1-r1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.1-r1.ebuild,v 1.1 2004/09/08 14:16: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}/${P}-async-1.diff.gz )
+	nls? ( ${PATCH_PATH}/w3m-cvs-1.916-nlsfix-2.diff )"
+# w3m color patch:
+#	http://homepage3.nifty.com/slokar/w3m/${P}_256-005.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 ~amd64 ppc64"
+IUSE="X gtk imlib imlib2 xface ssl migemo gpm cjk nls lynxkeymap async"
+#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 )
+			!imlib2? ( >=media-libs/imlib-1.9.8 ) )
+	)
+	!X? ( imlib2? ( >=media-libs/imlib2-1.1.0 ) )
+	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 use async ; then
+		epatch ${DISTDIR}/${P}-async-1.diff.gz
+	#	epatch ${FILESDIR}/${PN}-0.4.2-async-m17n-gentoo.diff
+	fi
+	#epatch ${DISTDIR}/${P}_256-005.patch.gz
+	#use canna && epatch ${DISTDIR}/w3m-cvs-1.914-canna.patch
+}
+
+src_compile() {
+
+	local myconf migemo_command imagelib
+
+	if use X ; then
+		myconf="${myconf} --enable-image=x11,fb `use_enable xface`"
+		if use gtk ; then
+			imagelib="gdk-pixbuf"
+		elif use imlib2 ; then
+			imagelib="imlib2"
+		else
+			imagelib="imlib"
+		fi
+	else	# no X
+		if use imlib2 ; then
+			myconf="${myconf} --enable-image=fb"
+			imagelib="imlib2"
+		else
+			myconf="${myconf} --enable-image=no"
+			imagelib="no"
+		fi
+	fi
+
+	if 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 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 use cjk ; then
+		docinto doc-jp ; dodoc doc-jp/*
+	else
+		rm -rf ${D}/usr/share/man/ja
+	fi
+}
diff --git a/www-client/w3m/w3m-0.5.1.ebuild b/www-client/w3m/w3m-0.5.1.ebuild
new file mode 100644
index 000000000000..a0b64cff3e3e
--- /dev/null
+++ b/www-client/w3m/w3m-0.5.1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.1.ebuild,v 1.1 2004/09/08 14:16: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
+	nls? ( ${PATCH_PATH}/w3m-cvs-1.916-nlsfix-2.diff )"
+# w3m async patch:
+#	async? ( ${PATCH_PATH}/w3m-cvs-1.912-async-1.diff.gz )
+# 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 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 )
+			!imlib2? ( >=media-libs/imlib-1.9.8 ) )
+	)
+	!X? ( imlib2? ( >=media-libs/imlib2-1.1.0 ) )
+	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 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 use X ; then
+		myconf="${myconf} --enable-image=x11,fb `use_enable xface`"
+		if use gtk ; then
+			imagelib="gdk-pixbuf"
+		elif use imlib2 ; then
+			imagelib="imlib2"
+		else
+			imagelib="imlib"
+		fi
+	else	# no X
+		if use imlib2 ; then
+			myconf="${myconf} --enable-image=fb"
+			imagelib="imlib2"
+		else
+			myconf="${myconf} --enable-image=no"
+			imagelib="no"
+		fi
+	fi
+
+	if 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 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 use cjk ; then
+		docinto doc-jp ; dodoc doc-jp/*
+	else
+		rm -rf ${D}/usr/share/man/ja
+	fi
+}