Version bumped.

4 files changed, 128 insertions, 3 deletions

diff --git a/net-www/w3m-m17n/ChangeLog b/net-www/w3m-m17n/ChangeLog
index 115cc397674c..9136152b084d 100644
--- a/net-www/w3m-m17n/ChangeLog
+++ b/net-www/w3m-m17n/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/w3m-m17n
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m-m17n/ChangeLog,v 1.5 2003/08/21 17:56:47 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m-m17n/ChangeLog,v 1.6 2003/09/20 17:51:14 usata Exp $
+
+*w3m-m17n-20030916 (21 Sep 2003)
+
+  21 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-m17n-20030916.ebuild:
+  Version bumped to the latest CVS snapshot. Rewrote econf part. Added
+  gtk, xface and ipv6 IUSE flag. Now DEPENDs on dev-libs/boehm-gc.
 
 *w3m-m17n-0.4.1.20030308-r2 (22 Aug 2003)
 
diff --git a/net-www/w3m-m17n/Manifest b/net-www/w3m-m17n/Manifest
index 3b52fbcd37a4..63deca37ba8a 100644
--- a/net-www/w3m-m17n/Manifest
+++ b/net-www/w3m-m17n/Manifest
@@ -1,6 +1,6 @@
-MD5 a25a098836bfe21480440d8750ad21fa ChangeLog 1633
+MD5 eeafa3ea5abe30e93a7a3c658326dd67 ChangeLog 1633
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 68a2148b386d8074a5ce956134b54f01 w3m-m17n-20030916.ebuild 3069
+MD5 a8294317c97e58397044414b0175117b w3m-m17n-20030916.ebuild 3063
 MD5 01f54e4d61e2a9e4832cdc4b7612b6cd w3m-m17n-0.4.1.20030308.ebuild 2233
 MD5 f009aa4395e47aa9e4d90a9a8a7d544e w3m-m17n-20030308.ebuild 2246
 MD5 0c6edb2ab326fee131964fb38787e3fa w3m-m17n-20030308-r1.ebuild 2526
diff --git a/net-www/w3m-m17n/files/digest-w3m-m17n-20030916 b/net-www/w3m-m17n/files/digest-w3m-m17n-20030916
new file mode 100644
index 000000000000..a0b5554de75a
--- /dev/null
+++ b/net-www/w3m-m17n/files/digest-w3m-m17n-20030916
@@ -0,0 +1,3 @@
+MD5 ff72d5990a1c5f580b677c37019d2083 w3m-cvs-1.860.tar.gz 666079
+MD5 41677a08822d49baaf7e28cfc66206e1 w3m-cvs-1.859-m17n-1.diff.gz 86023
+MD5 5d9dd2828ecab3214a87454bbc2b10b4 libwc-20030224.tar.gz 1150077
diff --git a/net-www/w3m-m17n/w3m-m17n-20030916.ebuild b/net-www/w3m-m17n/w3m-m17n-20030916.ebuild
new file mode 100644
index 000000000000..9d6968ab4da5
--- /dev/null
+++ b/net-www/w3m-m17n/w3m-m17n-20030916.ebuild
@@ -0,0 +1,116 @@
+# 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-m17n/w3m-m17n-20030916.ebuild,v 1.1 2003/09/20 17:51:14 usata Exp $
+
+IUSE="imlib gtk xface gpm ssl ipv6"
+#IUSE="nls"
+
+W3M_CVS_PV="1.860"
+W3M_P="w3m-cvs-${W3M_CVS_PV}"
+
+W3M_M17N_CVS_PV="1.859"
+W3M_M17N_P="w3m-cvs-${W3M_M17N_CVS_PV}-m17n"
+LIBWC_PV="20030224"
+
+#GC_PV="6.3alpha1"
+#GC_P="gc${GC_PV}"
+
+DESCRIPTION="Lightweight text based WWW browser w3m with multilingual extension"
+HOMEPAGE="http://w3m.sourceforge.net/
+	http://www2u.biglobe.ne.jp/~hsaka/w3m/
+	http://www.page.sannet.ne.jp/knabe/w3m/w3m.html"
+SRC_URI="http://dev.gentoo.org/~usata/distfiles/${W3M_P}.tar.gz
+	http://www.page.sannet.ne.jp/knabe/w3m/${W3M_M17N_P}-1.diff.gz
+	http://dev.gentoo.org/~usata/distfiles/libwc-${LIBWC_PV}.tar.gz"
+#	nls? ( http://www.page.sannet.ne.jp/knabe/w3m/${W3M_M17N_P}-nls-1.diff.gz)
+#	http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/${GC_P}.tar.gz
+
+SLOT="0"
+LICENSE="w3m"
+KEYWORDS="~x86 ~alpha ~ppc ~sparc"
+
+DEPEND=">=sys-libs/ncurses-5.2-r3
+	>=sys-libs/zlib-1.1.3-r2
+	dev-lang/perl
+	>=dev-libs/boehm-gc-6.2
+	gtk? ( =x11-libs/gtk+-1.2*
+		media-libs/gdk-pixbuf )
+	!gtk? ( imlib? ( media-libs/imlib
+			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"
+
+S="${WORKDIR}/${W3M_P}"
+
+src_unpack() {
+
+	unpack ${W3M_P}.tar.gz
+	cd ${S}
+
+	#unpack ${GC_P}.tar.gz
+	#mv ${GC_P} gc
+
+	# libwc doesn't come with w3m-m17n now
+	unpack libwc-${LIBWC_PV}.tar.gz
+
+	epatch ${DISTDIR}/${W3M_M17N_P}-1.diff.gz
+	#use nls && epatch ${DISTDIR}/${W3M_M17N_P}-nls-1.diff.gz
+}
+
+src_compile() {
+
+	local myconf
+
+	if [ -n "`use imlib`" -o -n "`use gtk`" ] ; then
+		myconf="${myconf} --enable-image=x11,fb `use_enable xface`"
+	else
+		myconf="${myconf} --enable-image=no"
+	fi
+
+	#	--enable-japanese=m
+	econf --program-suffix=-m17n \
+		--enable-keymap=w3m \
+		--with-editor=/usr/bin/nano \
+		--with-mailer=/bin/mail \
+		--with-browser=/usr/bin/mozilla \
+		--with-termlib=ncurses \
+		`use_enable gpm mouse` \
+		`use_enable ipv6` \
+		`use_enable ssl digest-auth` \
+		`use_with ssl` \
+		${myconf} || die
+
+	emake package=w3m-m17n \
+		W3M=w3m-m17n \
+		MAN='env LC_MESSAGES=$${LC_MESSAGES:-$${LC_ALL:-$${LANG}}} LANG=C man'\
+		|| die "make failed"
+}
+
+src_install() {
+
+	make package=w3m-m17n DESTDIR=${D} install || die
+
+	# w3mman and manpages conflict with those from w3m
+	mv ${D}/usr/bin/w3mman{,-m17n}
+	mv ${D}/usr/share/man/man1/w3mman{,-m17n}.1
+	#mv ${D}/usr/share/man/man1/w3m{,-m17n}.1
+	#mv ${D}/usr/share/man/ja/man1/w3m{,-m17n}.1
+
+	if ! has_version 'net-www/w3m' ; then
+		dosym /usr/bin/w3m{-m17n,}
+		dosym /usr/bin/w3mman{-m17n,}
+		dosym /usr/share/man/ja/man1/w3m{-m17n,}.1
+		dosym /usr/share/man/man1/w3m{-m17n,}.1
+		dosym /usr/share/man/man1/w3mman{-m17n,}.1
+	fi
+
+	insinto /usr/share/${PN}/Bonus
+	doins Bonus/*
+	dodoc README NEWS TODO ChangeLog
+	docinto doc-en ; dodoc doc/*
+	docinto doc-jp ; dodoc doc-jp/*
+}