Version bumped

4 files changed, 167 insertions, 7 deletions

diff --git a/net-www/w3m/ChangeLog b/net-www/w3m/ChangeLog
index 1b4b5008d397..c9b1db577722 100644
--- a/net-www/w3m/ChangeLog
+++ b/net-www/w3m/ChangeLog
@@ -1,6 +1,11 @@
 # 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.48 2004/02/17 13:40:58 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/ChangeLog,v 1.49 2004/03/21 19:21:18 usata Exp $
+
+*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)
 
diff --git a/net-www/w3m/Manifest b/net-www/w3m/Manifest
index 8f2a32dd529b..ce9bb56ea524 100644
--- a/net-www/w3m/Manifest
+++ b/net-www/w3m/Manifest
@@ -1,14 +1,16 @@
-MD5 8e10c8fb50097c894200b100a02601eb w3m-0.4.2.ebuild 1945
-MD5 bba18a825aba1531bd93647caf21aff3 w3m-0.4.2-r9.ebuild 4410
-MD5 67fc6ad42caf6416b463c2dce1ba87d4 ChangeLog 9479
 MD5 5a4fb2341659f69f82de81dc12da6e4d w3m-0.3.2.2.ebuild 3731
+MD5 bba18a825aba1531bd93647caf21aff3 w3m-0.4.2-r9.ebuild 4410
+MD5 f2510368a335349b461ae99885c0665d w3m-0.5.ebuild 4041
+MD5 04dfe663c639d48d171260309e63d2c3 ChangeLog 9587
+MD5 8e10c8fb50097c894200b100a02601eb w3m-0.4.2.ebuild 1945
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 ccf8db4eb493664368e4e4c77cea99d4 files/digest-w3m-0.4.2 61
-MD5 0fd075401455ce9205836b4267202e22 files/w3m-w3mman-gentoo.diff 1059
+MD5 6d3f53a7bb3e6e26f72fb257cad0541e files/digest-w3m-0.5 200
 MD5 7eaf4e81f63a7050a49996bf510d87be files/digest-w3m-0.4.2-r9 276
 MD5 838d56c55726f00c34b0c8649e948e3c files/w3m-0.4.2-form.diff 429
+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 df74b28e72e6c2140a1dd6e4ea042e58 files/digest-w3m-0.3.2.2 64
 MD5 00a360d12cc07d61c5fd5df08a53d261 files/w3m-0.4-alpha.patch 930
-MD5 5b34b82be16b1b02dd603acbfd11d9db files/w3m-libwc-gentoo.diff 437
 MD5 4deea28e3a4e09f22019b01b52273ab3 files/w3m-m17n-search-gentoo.diff 446
 MD5 ca82b0ff2fa196fadebdc71b825b4ccf files/w3m-0.4.2-async-m17n-gentoo.diff 1539
diff --git a/net-www/w3m/files/digest-w3m-0.5 b/net-www/w3m/files/digest-w3m-0.5
new file mode 100644
index 000000000000..5ef4a84bdb81
--- /dev/null
+++ b/net-www/w3m/files/digest-w3m-0.5
@@ -0,0 +1,3 @@
+MD5 31e470bcb09bad3150d73af760febe0c w3m-0.5.tar.gz 1889076
+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/w3m-0.5.ebuild b/net-www/w3m/w3m-0.5.ebuild
new file mode 100644
index 000000000000..5f5c63671052
--- /dev/null
+++ b/net-www/w3m/w3m-0.5.ebuild
@@ -0,0 +1,150 @@
+# 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.ebuild,v 1.1 2004/03/21 19:21:18 usata Exp $
+
+W3M_CVS_PV="1.890"
+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/"
+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-5.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_P}-canna.patch )
+
+LICENSE="w3m"
+SLOT="0"
+KEYWORDS="~x86 ~alpha ~ppc ~sparc"
+IUSE="X nopixbuf imlib imlib2 xface ssl migemo gpm cjk nls async"
+#IUSE="canna unicode"
+
+# 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"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.58"
+
+S=${WORKDIR}/${P}
+
+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 ${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 [ -n "`use async`" ] ; then
+		epatch ${DISTDIR}/${W3M_CVS_P}-async-5.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() {
+	export WANT_AUTOCONF=2.5
+	#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
+
+	# emacs-w3m doesn't like "--enable-m17n --disable-unicode,"
+	# so we better enable or disable both
+	if [ -n "`use cjk`" ] ; then
+		myconf="${myconf}
+			--enable-m17n
+			--enable-unicode
+			--enable-japanese=E
+			--with-charset=EUC-JP"
+	else
+		myconf="${myconf}
+			--disable-m17n
+			--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}" \
+		`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"
+}
+
+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
+}