Version bumped

4 files changed, 136 insertions, 2 deletions

diff --git a/net-www/w3m-m17n/Manifest b/net-www/w3m-m17n/Manifest
index 823e7648b1d1..5b13dccc41d8 100644
--- a/net-www/w3m-m17n/Manifest
+++ b/net-www/w3m-m17n/Manifest
@@ -1,9 +1,10 @@
-MD5 b517d1d20978b40579afe961badc6561 ChangeLog 2071
+MD5 33cae6f37ad5f7cfb4d2727b23f69bbd ChangeLog 2228
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 e98ed662d20aff454ace121087ce6801 w3m-m17n-20030916.ebuild 3015
-MD5 ee38f845d539ed1e55642cd63c49500e w3m-m17n-0.4.2.ebuild 3026
+MD5 2df19bfb59ed64f34127ddc5900f9693 w3m-m17n-0.4.2.ebuild 3079
 MD5 c2bb2e68c5a3b9e3e753aa39e9b1070c w3m-m17n-0.4.1.20030308-r2.ebuild 2715
 MD5 84a4529fdf4d9541fb3a111080687261 files/digest-w3m-m17n-0.4.2 210
+MD5 b7b8c0f9a0acc5f06cd4fe5473919c7b files/w3m-m17n-0.4.2-gentoo.diff 704
 MD5 1be9f4e35558ba722185319b64c707d8 files/digest-w3m-m17n-0.4.1.20030308-r2 146
 MD5 2df1dde324e4c58fe00c490180c587af files/digest-w3m-m17n-20030916 204
 MD5 0fd075401455ce9205836b4267202e22 files/w3m-w3mman-gentoo.diff 1059
diff --git a/net-www/w3m-m17n/files/digest-w3m-m17n-0.4.2 b/net-www/w3m-m17n/files/digest-w3m-m17n-0.4.2
new file mode 100644
index 000000000000..e165441e0855
--- /dev/null
+++ b/net-www/w3m-m17n/files/digest-w3m-m17n-0.4.2
@@ -0,0 +1,3 @@
+MD5 baa9d375997cf495edf25216e0e3f3aa w3m-0.4.2+cvs-1.862.tar.gz 672615
+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/files/w3m-m17n-0.4.2-gentoo.diff b/net-www/w3m-m17n/files/w3m-m17n-0.4.2-gentoo.diff
new file mode 100644
index 000000000000..fe58bc386109
--- /dev/null
+++ b/net-www/w3m-m17n/files/w3m-m17n-0.4.2-gentoo.diff
@@ -0,0 +1,15 @@
+--- w3m-cvs-1.859-m17n-1.diff.orig	2003-09-25 18:28:32.000000000 +0900
++++ w3m-cvs-1.859-m17n-1.diff	2003-09-25 18:30:20.000000000 +0900
+@@ -11704,9 +11704,9 @@
+ --- w3m/version.c.in	2003-03-10 04:33:30.000000000 +0900
+ +++ w3m-m17n/version.c.in	2003-07-17 23:09:05.000000000 +0900
+ @@ -1,5 +1,5 @@
+- /* $Id: w3m-m17n-0.4.2-gentoo.diff,v 1.1 2003/09/25 09:50:50 usata Exp $ */
+--#define CURRENT_VERSION "w3m/0.4.1+cvs"
+-+#define CURRENT_VERSION "w3m/0.4.1+cvs-m17n-20030308"
++ /* $Id: w3m-m17n-0.4.2-gentoo.diff,v 1.1 2003/09/25 09:50:50 usata Exp $ */
++-#define CURRENT_VERSION "w3m/0.4.2"
+++#define CURRENT_VERSION "w3m/0.4.2+cvs-m17n-20030308"
+  
+  #ifndef FM_H
+  char *w3m_version = CURRENT_VERSION;
diff --git a/net-www/w3m-m17n/w3m-m17n-0.4.2.ebuild b/net-www/w3m-m17n/w3m-m17n-0.4.2.ebuild
new file mode 100644
index 000000000000..c964a2519a2f
--- /dev/null
+++ b/net-www/w3m-m17n/w3m-m17n-0.4.2.ebuild
@@ -0,0 +1,115 @@
+# 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-0.4.2.ebuild,v 1.1 2003/09/25 09:50:50 usata Exp $
+
+IUSE="imlib gtk xface gpm ssl"
+#IUSE="nls"
+
+W3M_CVS_PV="1.862"
+W3M_P="${P/-m17n/}+cvs-${W3M_CVS_PV}"
+
+W3M_M17N_CVS_PV="1.859"
+W3M_M17N_P="w3m-cvs-${W3M_M17N_CVS_PV}-m17n"
+LIBWC_PV="20030224"
+
+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)
+
+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}/${P/-m17n/}"
+
+src_unpack() {
+
+	unpack ${W3M_P}.tar.gz
+	cd ${S}
+
+	# libwc doesn't come with w3m-m17n now
+	unpack libwc-${LIBWC_PV}.tar.gz
+
+	unpack ${W3M_M17N_P}-1.diff.gz
+	epatch ${FILESDIR}/${P}-gentoo.diff
+	epatch ${W3M_M17N_P}-1.diff
+
+	epatch ${FILESDIR}/w3m-w3mman-gentoo.diff
+	#use nls && epatch ${DISTDIR}/${W3M_M17N_P}-nls-1.diff.gz
+}
+
+src_compile() {
+
+	local myconf migemo_command
+
+	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
+
+	if has_version 'app-emacs/migemo' ; then
+		migemo_command="migemo -t egrep /usr/share/migemo/migemo-dict"
+	else
+		migemo_command="no"
+	fi
+
+	econf --program-suffix=-m17n \
+		--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
+
+	emake package=w3m-m17n W3M=w3m-m17n || 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/*
+}