Added back async patch. Marked 0.5.1 stable on x86, ppc and alpha. Removed 0.3.2.2 from CVS tree.

7 files changed, 163 insertions, 138 deletions

diff --git a/net-www/w3m/ChangeLog b/net-www/w3m/ChangeLog
index 6e4816383163..c9b611e57471 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.54 2004/05/04 03:04:57 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/ChangeLog,v 1.55 2004/05/30 07:25:58 usata Exp $
+
+*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.
diff --git a/net-www/w3m/Manifest b/net-www/w3m/Manifest
index 865a2b1dc0cf..6d112df5979a 100644
--- a/net-www/w3m/Manifest
+++ b/net-www/w3m/Manifest
@@ -1,14 +1,16 @@
-MD5 2d4691696d7e0ff2b9931100a3ae339a ChangeLog 10357
-MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+MD5 5bf13137367531c62905aef69686ca54 w3m-0.5.1.ebuild 3818
 MD5 5a4fb2341659f69f82de81dc12da6e4d w3m-0.3.2.2.ebuild 3731
+MD5 2d4691696d7e0ff2b9931100a3ae339a ChangeLog 10357
 MD5 8e10c8fb50097c894200b100a02601eb w3m-0.4.2.ebuild 1945
-MD5 5bf13137367531c62905aef69686ca54 w3m-0.5.1.ebuild 3818
+MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 d790f1eded97ff472cf05bd9748200a8 w3m-0.5-r2.ebuild 3787
-MD5 df74b28e72e6c2140a1dd6e4ea042e58 files/digest-w3m-0.3.2.2 64
-MD5 ccf8db4eb493664368e4e4c77cea99d4 files/digest-w3m-0.4.2 61
+MD5 811ab2671b2e678a199b8bf855407bdb w3m-0.5.1-r1.ebuild 3777
 MD5 292a9e6f9df534134608fea83f535968 files/digest-w3m-0.5.1 205
-MD5 ca82b0ff2fa196fadebdc71b825b4ccf files/w3m-0.4.2-async-m17n-gentoo.diff 1539
+MD5 3734d8d1d8c19bfa94a11477e6cc38cd files/digest-w3m-0.5.1-r1 201
 MD5 5b34b82be16b1b02dd603acbfd11d9db files/w3m-libwc-gentoo.diff 437
-MD5 4deea28e3a4e09f22019b01b52273ab3 files/w3m-m17n-search-gentoo.diff 446
 MD5 0fd075401455ce9205836b4267202e22 files/w3m-w3mman-gentoo.diff 1059
+MD5 ccf8db4eb493664368e4e4c77cea99d4 files/digest-w3m-0.4.2 61
+MD5 df74b28e72e6c2140a1dd6e4ea042e58 files/digest-w3m-0.3.2.2 64
+MD5 4deea28e3a4e09f22019b01b52273ab3 files/w3m-m17n-search-gentoo.diff 446
+MD5 ca82b0ff2fa196fadebdc71b825b4ccf files/w3m-0.4.2-async-m17n-gentoo.diff 1539
 MD5 9cd600ff1ce23fc3ad6e0c17be3ac84e files/digest-w3m-0.5-r2 207
diff --git a/net-www/w3m/files/digest-w3m-0.3.2.2 b/net-www/w3m/files/digest-w3m-0.3.2.2
deleted file mode 100644
index 29448a5c7b4a..000000000000
--- a/net-www/w3m/files/digest-w3m-0.3.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e9787d822e7b4f9392cf9e3dacee4c10 w3m-0.3.2.2.tar.gz 1183530
diff --git a/net-www/w3m/files/digest-w3m-0.5.1-r1 b/net-www/w3m/files/digest-w3m-0.5.1-r1
new file mode 100644
index 000000000000..bf3e849b0db5
--- /dev/null
+++ b/net-www/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/net-www/w3m/w3m-0.3.2.2.ebuild b/net-www/w3m/w3m-0.3.2.2.ebuild
deleted file mode 100644
index 8ccb53be2e45..000000000000
--- a/net-www/w3m/w3m-0.3.2.2.ebuild
+++ /dev/null
@@ -1,125 +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.3.2.2.ebuild,v 1.5 2004/02/22 16:56:36 agriffis Exp $
-
-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 ~ppc"
-
-DEPEND=">=sys-libs/ncurses-5.2-r3
-	>=sys-libs/zlib-1.1.3-r2
-	imlib? ( >=media-libs/imlib-1.9.8 )
-	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
-
-PROVIDE="virtual/textbrowser"
-
-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 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.)
-		use cjk &>/dev/null && echo 1 || echo 2
-		# What is your Kanji display
-		use cjk &>/dev/null && echo E
-		# Use 2-byte character for table border, etc
-		use cjk &>/dev/null && echo n
-		# Do you want to use Lynx-like key binding?
-		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
-		# 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)
-		use ssl &>/dev/null && echo y || echo n
-		# (ssl) SSL verification support (SSL library >= version 0.8) [n]?
-		use ssl &>/dev/null && echo n
-		# (ssl) Digest Auth support [y]?
-		use ssl &>/dev/null && echo y
-		# Inline image support (you need Imlib library) [n]?
-		use imlib &>/dev/null && echo y || echo n
-		# 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
-		# Input your favorite editor program.
-		echo /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"
-
-	# 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
-}
diff --git a/net-www/w3m/w3m-0.5.1-r1.ebuild b/net-www/w3m/w3m-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..a9aff41187c7
--- /dev/null
+++ b/net-www/w3m/w3m-0.5.1-r1.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-r1.ebuild,v 1.1 2004/05/30 07:25:58 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"
+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 [ -n "`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 [ -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
+}
diff --git a/net-www/w3m/w3m-0.5.1.ebuild b/net-www/w3m/w3m-0.5.1.ebuild
index feb69c01ff54..f43901e1417f 100644
--- a/net-www/w3m/w3m-0.5.1.ebuild
+++ b/net-www/w3m/w3m-0.5.1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.5.1.ebuild,v 1.2 2004/05/30 07:25:58 usata Exp $
 
 inherit eutils
 
@@ -20,7 +20,7 @@ SRC_URI="mirror://sourceforge/w3m/${P}.tar.gz
 
 LICENSE="w3m"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc"
+KEYWORDS="x86 alpha ppc ~sparc"
 IUSE="X gtk imlib imlib2 xface ssl migemo gpm cjk nls lynxkeymap"
 #IUSE="canna unicode"
 
@@ -32,10 +32,10 @@ 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 )
+		!gtk? ( imlib2? ( >=media-libs/imlib2-1.1.0 )
 			!imlib2? ( >=media-libs/imlib-1.9.8 ) )
 	)
-	!X? ( imlib2? ( >=media-libs/imlib2-1.1.0-r2 ) )
+	!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 )