Updated CVS snapshot. Added unicode and nls IUSE flags. w3mhelperpanel no longer hangs when you disable unicode or nls.

10 files changed, 66 insertions, 283 deletions

diff --git a/net-www/w3m/ChangeLog b/net-www/w3m/ChangeLog
index 730297414f28..d618776fe54e 100644
--- a/net-www/w3m/ChangeLog
+++ b/net-www/w3m/ChangeLog
@@ -1,6 +1,12 @@
 # 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.44 2004/01/04 18:35:30 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/ChangeLog,v 1.45 2004/01/11 18:32:54 usata Exp $
+
+*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)
 
diff --git a/net-www/w3m/Manifest b/net-www/w3m/Manifest
index aa3adafed8f7..1d19f7868b64 100644
--- a/net-www/w3m/Manifest
+++ b/net-www/w3m/Manifest
@@ -1,21 +1,14 @@
-MD5 2663e8b3d0dd5876df6ab8c6f537ffed w3m-0.4.2-r6.ebuild 4333
+MD5 f99791a6ad2c38664be59a118d229e77 w3m-0.4.2-r6.ebuild 4336
 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 6b91e408e12d1fce633e1747f755ee5d ChangeLog 8890
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 d13d74f6074b3b50fea4f165b705f559 w3m-0.4.2-r5.ebuild 4033
 MD5 7eaf4e81f63a7050a49996bf510d87be files/digest-w3m-0.4.2-r6 276
-MD5 fd7a37dd6717b69b356f6179a19e17b7 files/digest-w3m-0.4.1-r3 62
-MD5 40e3d07e75b9f601f7b33cc5336214e7 files/digest-w3m-0.4.2-r2 72
 MD5 5b34b82be16b1b02dd603acbfd11d9db files/w3m-libwc-gentoo.diff 437
 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 19cf524ce092ae74e9229e4548b3a3ad files/w3m-0.4.2-m17n-gentoo.diff 354
 MD5 fdd23d795f443cd36b289ed9477d5e3c files/digest-w3m-0.4.2-r5 272
diff --git a/net-www/w3m/files/digest-w3m-0.4 b/net-www/w3m/files/digest-w3m-0.4
deleted file mode 100644
index 7c45a16add42..000000000000
--- a/net-www/w3m/files/digest-w3m-0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 15d530510918c8271528386450aa4acd w3m-0.4.tar.gz 1256357
diff --git a/net-www/w3m/files/digest-w3m-0.4.1-r3 b/net-www/w3m/files/digest-w3m-0.4.1-r3
deleted file mode 100644
index 61a1d9de1887..000000000000
--- a/net-www/w3m/files/digest-w3m-0.4.1-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b496ec119dc9734059035e70988dd470 w3m-0.4.1.tar.gz 1250762
diff --git a/net-www/w3m/files/digest-w3m-0.4.2-r2 b/net-www/w3m/files/digest-w3m-0.4.2-r2
deleted file mode 100644
index eb5629c56b03..000000000000
--- a/net-www/w3m/files/digest-w3m-0.4.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 24e9b407164b2cc12d35f9d7ec9a3aa2 w3m-0.4.2+cvs-1.890.tar.gz 1888870
diff --git a/net-www/w3m/files/digest-w3m-0.4.2-r6 b/net-www/w3m/files/digest-w3m-0.4.2-r6
new file mode 100644
index 000000000000..2b2d4cf7adbb
--- /dev/null
+++ b/net-www/w3m/files/digest-w3m-0.4.2-r6
@@ -0,0 +1,4 @@
+MD5 7246ebdcb27645a8a95beb64902068dd w3m-cvs-1.890.tar.gz 1888635
+MD5 a6249d537160e169de2648e68a059236 w3m-cvs-1.890-1.896.diff.gz 2860
+MD5 a7160717037be0c2cd204614cf9c20b9 w3m-cvs-1.890-async-5.diff.gz 79246
+MD5 c3d412a682f5fdf3a42c229834a5c7fe w3m-cvs-1.890-nls-4.diff 4172
diff --git a/net-www/w3m/files/w3m-libwc-gentoo.diff b/net-www/w3m/files/w3m-libwc-gentoo.diff
new file mode 100644
index 000000000000..978bfa508aaa
--- /dev/null
+++ b/net-www/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/net-www/w3m/w3m-0.4.1-r3.ebuild b/net-www/w3m/w3m-0.4.1-r3.ebuild
deleted file mode 100644
index ece3dcc517d1..000000000000
--- a/net-www/w3m/w3m-0.4.1-r3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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.5 2004/01/04 18:35:30 usata Exp $
-
-inherit eutils
-
-IUSE="gpm cjk imlib 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"
-
-DEPEND=">=sys-libs/ncurses-5.2-r3
-	>=sys-libs/zlib-1.1.3-r2
-	imlib? ( >=media-libs/imlib-1.9.8
-		media-libs/compface
-		media-libs/libungif )
-	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}
-	if use alpha; then
-		epatch ${FILESDIR}/w3m-0.4-alpha.patch || die "epatch failed"
-	fi
-	epatch ${FILESDIR}/w3m-w3mman-gentoo.diff
-}
-
-src_compile() {
-	local myuse
-	myuse="use_cookie=y use_ansi_color=y"
-
-	local myconf
-	myconf="-prefix=/usr -mandir=/usr/share/man -sysconfdir=/etc/w3m \
-		-cflags=${CFLAGS} -model=custom -nonstop"
-
-	if use cjk &>/dev/null; then
-		myconf="${myconf} -lang=ja -code=E"
-	else
-		myconf="${myconf} -lang=en"
-	fi
-
-	if use ssl &>/dev/null; then
-		myconf="${myconf} --ssl-includedir=/usr/include/openssl --ssl-libdir=/usr/lib"
-		myuse="${myuse} use_ssl=y use_ssl_verify=y use_digest_auth=y"
-	else
-		myuse="${myuse} use_ssl=n"
-	fi
-
-	if use gpm &>/dev/null; then
-		myuse="${myuse} use_mouse=y"
-	else
-		myuse="${myuse} use_mouse=n"
-	fi
-
-	if use imlib &>/dev/null; then
-		myuse="${myuse} use_image=y use_w3mimg_x11=y use_w3mimg_fb=y w3mimgdisplay_setuid=n use_xface=y"
-	else
-		myuse="${myuse} use_image=n"
-	fi
-
-	if has_version 'app-emacs/migemo' ; then
-		myuse="${myuse} use_migemo=y"
-		export def_migemo_command="migemo -t egrep /usr/share/migemo/migemo-dict"
-	else
-		myuse="${myuse} use_migemo=n"
-	fi
-
-	env ${myuse} ./configure ${myconf} || die "configure failed"
-
-	# Test to make sure the above configuration was sane
-	grep -q "dcc='gcc'" config.param || \
-		die "configure out of sync; ebuild needs an update"
-
-	# binary executables come prebuilt for 80386!
-	# clean it up and be sure to remake for ANY arch
-	cd ${S}/gc
-	make clean
-	cd -
-
-	make || make || die "make failed"
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die "make install failed"
-
-	dodoc doc/* README*
-	#doman doc/w3m.1
-}
diff --git a/net-www/w3m/w3m-0.4.2-r2.ebuild b/net-www/w3m/w3m-0.4.2-r6.ebuild
index b13e090fd50f..9c12c6f9981c 100644
--- a/net-www/w3m/w3m-0.4.2-r2.ebuild
+++ b/net-www/w3m/w3m-0.4.2-r6.ebuild
@@ -1,15 +1,25 @@
 # 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.4 2004/01/04 18:35:30 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.4.2-r6.ebuild,v 1.1 2004/01/11 18:32:54 usata Exp $
 
-IUSE="X nopixbuf imlib imlib2 xface ssl migemo gpm cjk"
+IUSE="X nopixbuf imlib imlib2 xface ssl migemo gpm cjk unicode nls async"
+#IUSE="canna"
 
 W3M_CVS_PV="1.890"
-W3M_CVS_P="${P}+cvs-${W3M_CVS_PV}"
+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://dev.gentoo.org/~usata/distfiles/${W3M_CVS_P}.tar.gz
+	http://dev.gentoo.org/~usata/distfiles/${W3M_CVS_P}-1.896.diff.gz
+	async? ( ${PATCH_PATH}/${W3M_CVS_P}-async-5.diff.gz )
+	${PATCH_PATH}/${W3M_CVS_P}-nls-4.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 )
+
 HOMEPAGE="http://w3m.sourceforge.net/"
 
 SLOT="0"
@@ -19,6 +29,7 @@ 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
@@ -36,7 +47,7 @@ RDEPEND=">=sys-libs/ncurses-5.2-r3
 PROVIDE="virtual/textbrowser
 	virtual/w3m"
 
-S="${WORKDIR}/${P}"
+S="${WORKDIR}/${PN}"
 
 pkg_setup() {
 
@@ -53,7 +64,15 @@ src_unpack() {
 
 	unpack ${W3M_CVS_P}.tar.gz
 	cd ${S}
+	epatch ${DISTDIR}/${W3M_CVS_P}-1.896.diff.gz
 	epatch ${FILESDIR}/${PN}-w3mman-gentoo.diff
+	epatch ${FILESDIR}/${PN}-m17n-search-gentoo.diff
+	epatch ${FILESDIR}/${PN}-libwc-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
+	#epatch ${DISTDIR}/${P}-cvs-1.895_256-001.patch.gz
+	#use canna && epatch ${DISTDIR}/${W3M_CVS_P}-canna.patch
 }
 
 src_compile() {
@@ -93,12 +112,24 @@ src_compile() {
 
 	if [ -n "`use cjk`" ] ; then
 		myconf="${myconf}
+			--enable-m17n
 			--enable-japanese=E
 			--with-charset=EUC-JP"
+	else
+		myconf="${myconf}
+			--disable-m17n
+			--with-charset=US-ASCII"
+	fi
+
+	if [ -n "`use unicode`" ] ; then
+		myconf="${myconf}
+			--enable-m17n
+			--enable-unicode"
+	else
+		myconf="${myconf}
+			--disable-unicode"
 	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 \
@@ -106,11 +137,12 @@ src_compile() {
 		--with-termlib=ncurses \
 		--with-imagelib="${imagelib}" \
 		--with-migemo="${migemo_command}" \
-		--enable-m17n \
 		`use_enable gpm mouse` \
 		`use_enable ssl digest-auth` \
 		`use_with ssl` \
+		`use_enable nls` \
 		${myconf} "$@" || die
+		# `use_with canna`
 
 	# emake borked
 	make all || make all || die "make failed"
diff --git a/net-www/w3m/w3m-0.4.ebuild b/net-www/w3m/w3m-0.4.ebuild
deleted file mode 100644
index 45d79e23f6b1..000000000000
--- a/net-www/w3m/w3m-0.4.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# 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.7 2004/01/04 18:35:30 usata Exp $
-
-inherit eutils
-
-IUSE="gpm cjk imlib ssl"
-
-S=${WORKDIR}/${P}
-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 sparc alpha ~ppc"
-
-DEPEND=">=sys-libs/ncurses-5.2-r3
-	>=sys-libs/zlib-1.1.3-r2
-	imlib? ( >=media-libs/imlib-1.9.8 media-libs/compface )
-	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
-
-PROVIDE="virtual/textbrowser"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	if use alpha; then
-		epatch ${FILESDIR}/w3m-0.4-alpha.patch || die "epatch failed"
-	fi
-}
-
-src_compile() {
-	# It seems to be hard to configure this program in any reasonable
-	# way.
-	(
-		# Which directory do you want to put the binary?
-		echo /usr/bin
-		# Which directory do you want to put the support binary files?
-		echo /usr/lib/w3m
-		# Which directory do you want to use local cgi?
-		echo /usr/lib/w3m/cgi-bin
-		# Which directory do you want to put the helpfile?
-		echo /usr/share/w3m
-		# Which directory do you want to put the manfile?
-		echo /usr/share/man
-		# Which directory do you want to put the system wide w3m
-		# configuration file?
-		echo /etc/w3m
-		# Which language do you prefer?
-		#  1 - Japanese (charset ISO-2022-JP, EUC-JP, Shift_JIS)
-		#  2 - English (charset US_ASCII, ISO-8859-1, etc.)
-		if use cjk &>/dev/null; then
-			echo 1
-			# What is your Kanji display
-			echo E
-			# Use 2-byte character for table border, etc
-			echo n
-		else
-			echo 2
-		fi
-		# Use Lynx-like key binding as default [n]?
-		echo n
-		# Let's do some configurations. Choose config option among the list.
-		#
-		# 1 - Baby model    (no color, no menu, no mouse, no cookie, no SSL)
-		# 2 - Little model  (color, menu, no mouse, no cookie, no SSL)
-		# 3 - Mouse model   (color, menu, mouse, no cookie, no SSL)
-		# 4 - Cookie model  (color, menu, mouse, cookie, no SSL)
-		# 5 - Monster model (with everything; you need openSSL library)
-		# 6 - Customize
-		#
-		# Which?
-		echo 6
-		# Do you want color ESC sequence for Kterm/pxvt
-		echo y
-		# Use mouse (requires xterm/kterm/gpm/sysmouse)
-		use gpm &>/dev/null && echo y || echo n
-		# Use popup menu
-		echo y
-		# Use cookie
-		echo y
-		# Do you want SSL verification support?
-		# (Your SSL library must be version 0.8 or later)
-		if use ssl &>/dev/null; then
-			echo y
-			# (ssl) SSL verification support (SSL library >= version 0.8) [n]?
-			echo n
-			# (ssl) Digest Auth support [y]?
-			echo y
-		else
-			echo n
-		fi
-		# Inline image support?
-		if use imlib &>/dev/null; then
-			echo y
-			# X11 inline image support (you need Imlib, Imlib2 or
-			# GdkPixbuf library) [y]?
-			echo y
-			# Linux Framebuffer inline image support (you need Imlib2
-			# or GdkPixbuf) [n]?
-			echo y
-			# setuid w3mimgdisplay to open /dev/fb0? [y]?
-			echo n
-		else
-			echo n
-		fi
-		# ANSI color escape sequences support [n]?
-		echo y
-		# Use Migemo (Roma-ji search; Please see
-		# http://migemo.namazu.org/) [n]?
-		echo n
-		# External URI loader support [y]?
-		echo y
-		# Use w3mmail.cgi [y]?
-		echo y
-		# NNTP support [y]?
-		echo n
-		# Gopher support [y]?
-		echo n
-		# Use alarm support code [y]?
-		echo y
-		# Use mark operation [y]?
-		echo y
-		if use imlib &>/dev/null; then
-			# X-Face support (you need uncompface) [n]?
-			echo y
-		fi
-		# Input your favorite editor program.
-		echo ${EDITOR:-/usr/bin/nano}
-		# Input your favorite external browser program.
-		echo /usr/bin/mozilla
-		# Input your favorite C-compiler.
-		echo gcc
-		# Input your favorite C flags.
-		printf "%s\n" "$CFLAGS"
-		# Which terminal library do you want to use? (type "none" if you
-		# do not need one)
-		echo
-		#printf "%s\n" "-lncurses"
-		# Input additional LD flags other than listed above, if any:
-		# (default: -lncurses) :
-		echo
-	) | ./configure || die "configure failed"
-
-	# Test to make sure the above configuration was sane
-	grep -q "dcc='gcc'" config.param || \
-		die "configure out of sync; ebuild needs an update"
-
-	# binary executables come prebuilt for 80386!
-	# clean it up and be sure to remake for ANY arch
-	cd ${S}/gc
-	make clean
-	cd -
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc doc/* README*
-	doman doc/w3m.1
-}