Moved from w3m-m17n.

(Portage version: 2.0.51.19)

5 files changed, 263 insertions, 13 deletions

diff --git a/www-client/w3m/ChangeLog b/www-client/w3m/ChangeLog
index bfb6f4faf4e4..4c41b9f79b96 100644
--- a/www-client/w3m/ChangeLog
+++ b/www-client/w3m/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/w3m
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.9 2005/03/18 14:25:05 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.10 2005/03/21 16:51:41 usata Exp $
+
+*w3m-0.4.2-r10 (21 Mar 2005)
+
+  21 Mar 2005; Mamoru KOMACHI <usata@gentoo.org>
+  +files/w3m-0.4.2-imglib-gentoo.diff, +w3m-0.4.2-r10.ebuild:
+  Moved from w3m-m17n.
 
   18 Mar 2005; Mamoru KOMACHI <usata@gentoo.org>
   -files/w3m-libwc-gentoo.diff, -files/w3m-0.4.2-async-m17n-gentoo.diff,
diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
index d8fa3acb8802..59de6d37dadb 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 9f9c5fe8f57b5b2c56b1d283506edf43 ChangeLog 12616
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 679fca0ad473ebe33cabff225d2f9adb w3m-0.5.1-r1.ebuild 3503
 MD5 6dbb19793ae901d3aa90c1ef1dabdabb w3m-0.4.2.ebuild 1887
+MD5 8e23817d93548c8f47df2658f86b48bc w3m-0.4.2-r10.ebuild 3362
+MD5 679fca0ad473ebe33cabff225d2f9adb w3m-0.5.1-r1.ebuild 3503
 MD5 5b3c3211bf50e5551189d7b6d209267a w3m-0.5.1-r2.ebuild 3875
-MD5 3734d8d1d8c19bfa94a11477e6cc38cd files/digest-w3m-0.5.1-r1 201
 MD5 ccf8db4eb493664368e4e4c77cea99d4 files/digest-w3m-0.4.2 61
+MD5 f818841f47776f4cdfe686de95223019 files/digest-w3m-0.4.2-r10 210
+MD5 3734d8d1d8c19bfa94a11477e6cc38cd files/digest-w3m-0.5.1-r1 201
 MD5 0fd075401455ce9205836b4267202e22 files/w3m-w3mman-gentoo.diff 1059
 MD5 c6c17e9ab9b7b1e694542f4fb51fa8f2 files/digest-w3m-0.5.1-r2 205
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCOuMOVWNWqTUmv+0RApQLAJ40dsE2SDRbsARNK703fT5Hcn9SdgCeJVt6
-ba6Ugx9rXF07+o6QWECV05k=
-=wxyR
------END PGP SIGNATURE-----
diff --git a/www-client/w3m/files/digest-w3m-0.4.2-r10 b/www-client/w3m/files/digest-w3m-0.4.2-r10
new file mode 100644
index 000000000000..a8657a4f7a27
--- /dev/null
+++ b/www-client/w3m/files/digest-w3m-0.4.2-r10
@@ -0,0 +1,3 @@
+MD5 baa9d375997cf495edf25216e0e3f3aa w3m-0.4.2+cvs-1.862.tar.gz 672615
+MD5 5d9dd2828ecab3214a87454bbc2b10b4 libwc-20030224.tar.gz 1150077
+MD5 41677a08822d49baaf7e28cfc66206e1 w3m-cvs-1.859-m17n-1.diff.gz 86023
diff --git a/www-client/w3m/files/w3m-0.4.2-imglib-gentoo.diff b/www-client/w3m/files/w3m-0.4.2-imglib-gentoo.diff
new file mode 100644
index 000000000000..c74bdc2cecdf
--- /dev/null
+++ b/www-client/w3m/files/w3m-0.4.2-imglib-gentoo.diff
@@ -0,0 +1,130 @@
+diff -urN w3m-0.4.2.ORIG/acinclude.m4 w3m-0.4.2/acinclude.m4
+--- w3m-0.4.2.ORIG/acinclude.m4	2003-09-25 18:16:27.000000000 +0900
++++ w3m-0.4.2/acinclude.m4	2003-10-05 07:02:28.000000000 +0900
+@@ -515,6 +515,12 @@
+ 	  enable_image=x11,fb
+         fi;;
+     esac
++    AC_ARG_WITH(imglib,
++    [  --with-imglib=IMGLIB	image library to link
++			(IMGLIB should be either gdk_pixbuf, imlib or imlib2.
++			Note that you need to use gdk_pixbuf or imlib2 to enable
++			inline image handler support for framebuffer device.)],
++    [test x"$with_imglib" = xyes || imglib="$with_imglib"])
+   fi   
+   save_ifs="$IFS"; IFS=",";
+   for img in $enable_image; do
+@@ -555,19 +561,25 @@
+ 	[have_imlib2="yes"],
+ 	[have_imlib2="no"])])
+   if test x"$x11" = xyes; then
+-   if test x"$have_gdkpixbuf" = xyes; then
++   if test x"$have_gdkpixbuf" = xyes \
++     -a -z "$with_imglib" \
++     -o x"$with_imglib" = xgdk_pixbuf; then
+      AC_DEFINE(USE_W3MIMG_X11)
+      AC_DEFINE(USE_GDKPIXBUF)
+      IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
+      IMGX11CFLAGS="`${GDKPIXBUF_CONFIG} --cflags`"
+      IMGX11LDFLAGS="`${GDKPIXBUF_CONFIG} --libs` -lgdk_pixbuf_xlib"
+-   elif test x"$have_imlib" = xyes; then
++   elif test x"$have_imlib" = xyes \
++     -a -z "$with_imglib" \
++     -o x"$with_imglib" = ximlib; then
+      AC_DEFINE(USE_W3MIMG_X11)
+      AC_DEFINE(USE_IMLIB)
+      IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
+      IMGX11CFLAGS="`${IMLIB_CONFIG} --cflags`"
+      IMGX11LDFLAGS="`${IMLIB_CONFIG} --libs`"
+-   elif test x"$have_imlib2" = xyes; then
++   elif test x"$have_imlib2" = xyes \
++     -a -z "$with_imglib" \
++     -o x"$with_imglib" = ximlib2; then
+      AC_DEFINE(USE_W3MIMG_X11)
+      AC_DEFINE(USE_IMLIB2)
+      IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
+@@ -578,13 +590,17 @@
+    fi
+   fi
+   if test x"$fb" = xyes; then
+-   if test x"$have_gdkpixbuf" = xyes; then
++   if test x"$have_gdkpixbuf" = xyes \
++     -a -z "$with_imglib" \
++     -o x"$with_imglib" = xgdk_pixbuf; then
+      AC_DEFINE(USE_W3MIMG_FB)
+      AC_DEFINE(USE_GDKPIXBUF)
+      IMGOBJS="$IMGOBJS w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
+      IMGFBCFLAGS="`${GDKPIXBUF_CONFIG} --cflags`"
+      IMGFBLDFLAGS="`${GDKPIXBUF_CONFIG} --libs`"
+-   elif test x"$have_imlib2" = xyes; then
++   elif test x"$have_imlib2" = xyes \
++     -a -z "$with_imglib" \
++     -o x"$with_imglib" = ximlib2; then
+      AC_DEFINE(USE_W3MIMG_FB)
+      AC_DEFINE(USE_IMLIB2)
+      IMGOBJS="$IMGOBJS w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
+diff -urN w3m-0.4.2.ORIG/aclocal.m4 w3m-0.4.2/aclocal.m4
+--- w3m-0.4.2.ORIG/aclocal.m4	2003-09-25 18:16:27.000000000 +0900
++++ w3m-0.4.2/aclocal.m4	2003-10-05 07:03:49.000000000 +0900
+@@ -527,6 +527,12 @@
+ 	  enable_image=x11,fb
+         fi;;
+     esac
++    AC_ARG_WITH(imglib,
++    [  --with-imglib=IMGLIB	image library to link
++				(IMGLIB should be either gdk_pixbuf, imlib or imlib2.
++				Note that you need to use gdk_pixbuf or imlib2 to enable
++				inline image handler support for framebuffer device.)],
++    [test x"$with_imglib" = xyes || imglib="$with_imglib"])
+   fi   
+   save_ifs="$IFS"; IFS=",";
+   for img in $enable_image; do
+@@ -567,19 +573,25 @@
+ 	[have_imlib2="yes"],
+ 	[have_imlib2="no"])])
+   if test x"$x11" = xyes; then
+-   if test x"$have_gdkpixbuf" = xyes; then
++   if test x"$have_gdkpixbuf" = xyes \
++     -a -z "$with_imglib" \
++     -o x"$with_imglib" = xgdk_pixbuf; then
+      AC_DEFINE(USE_W3MIMG_X11)
+      AC_DEFINE(USE_GDKPIXBUF)
+      IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
+      IMGX11CFLAGS="`${GDKPIXBUF_CONFIG} --cflags`"
+      IMGX11LDFLAGS="`${GDKPIXBUF_CONFIG} --libs` -lgdk_pixbuf_xlib"
+-   elif test x"$have_imlib" = xyes; then
++   elif test x"$have_imlib" = xyes \
++     -a -z "$with_imglib" \
++     -o x"$with_imglib" = ximlib; then
+      AC_DEFINE(USE_W3MIMG_X11)
+      AC_DEFINE(USE_IMLIB)
+      IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
+      IMGX11CFLAGS="`${IMLIB_CONFIG} --cflags`"
+      IMGX11LDFLAGS="`${IMLIB_CONFIG} --libs`"
+-   elif test x"$have_imlib2" = xyes; then
++   elif test x"$have_imlib2" = xyes \
++     -a -z "$with_imglib" \
++     -o x"$with_imglib" = ximlib2; then
+      AC_DEFINE(USE_W3MIMG_X11)
+      AC_DEFINE(USE_IMLIB2)
+      IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
+@@ -590,13 +602,17 @@
+    fi
+   fi
+   if test x"$fb" = xyes; then
+-   if test x"$have_gdkpixbuf" = xyes; then
++   if test x"$have_gdkpixbuf" = xyes \
++     -a -z "$with_imglib" \
++     -o x"$with_imglib" = xgdk_pixbuf; then
+      AC_DEFINE(USE_W3MIMG_FB)
+      AC_DEFINE(USE_GDKPIXBUF)
+      IMGOBJS="$IMGOBJS w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
+      IMGFBCFLAGS="`${GDKPIXBUF_CONFIG} --cflags`"
+      IMGFBLDFLAGS="`${GDKPIXBUF_CONFIG} --libs`"
+-   elif test x"$have_imlib2" = xyes; then
++   elif test x"$have_imlib2" = xyes \
++     -a -z "$with_imglib" \
++     -o x"$with_imglib" = ximlib2; then
+      AC_DEFINE(USE_W3MIMG_FB)
+      AC_DEFINE(USE_IMLIB2)
+      IMGOBJS="$IMGOBJS w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
diff --git a/www-client/w3m/w3m-0.4.2-r10.ebuild b/www-client/w3m/w3m-0.4.2-r10.ebuild
new file mode 100644
index 000000000000..6f3c876b4f0d
--- /dev/null
+++ b/www-client/w3m/w3m-0.4.2-r10.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.4.2-r10.ebuild,v 1.1 2005/03/21 16:51:41 usata Exp $
+
+inherit eutils
+
+W3M_CVS_PV="1.862"
+W3M_P="${P}+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="mirror://gentoo/${W3M_P}.tar.gz
+	cjk? ( mirror://gentoo/libwc-${LIBWC_PV}.tar.gz
+		http://www.page.sannet.ne.jp/knabe/w3m/${W3M_M17N_P}-1.diff.gz
+	)"
+#	nls? ( http://www.page.sannet.ne.jp/knabe/w3m/${W3M_M17N_P}-nls-1.diff.gz)
+
+LICENSE="w3m"
+SLOT="0"
+KEYWORDS="x86 alpha ppc sparc"
+IUSE="X cjk imlib imlib2 xface migemo gpm ssl"
+#IUSE="nls"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r3
+	>=sys-libs/zlib-1.1.3-r2
+	dev-lang/perl
+	>=dev-libs/boehm-gc-6.2
+	X? ( gtk? ( >=media-libs/gdk-pixbuf-0.22.0 )
+		!gtk? ( imlib2? ( >=media-libs/imlib2-1.0.5 )
+			!imlib2? ( >=media-libs/imlib-1.9.8 ) )
+	)
+	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 )"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	>=sys-devel/autoconf-2.58"
+
+PROVIDE="virtual/textbrowser
+	virtual/w3m"
+
+src_unpack() {
+	unpack ${W3M_P}.tar.gz
+	cd ${S}
+
+	if use cjk ; then
+		# libwc doesn't come with w3m-m17n now
+		unpack libwc-${LIBWC_PV}.tar.gz
+
+		unpack ${W3M_M17N_P}-1.diff.gz
+		sed -i -e "/^--- w3m\/version.c.in/,+8d" ${W3M_M17N_P}-1.diff || die
+		epatch ${W3M_M17N_P}-1.diff
+		sed -i -e "s/0.4.2/0.4.2-m17n-20030308/" version.c.in || die
+	fi
+
+	epatch ${FILESDIR}/w3m-w3mman-gentoo.diff
+	#use nls && epatch ${DISTDIR}/${W3M_M17N_P}-nls-1.diff.gz
+	epatch ${FILESDIR}/${P}-imglib-gentoo.diff
+}
+
+src_compile() {
+	local myconf migemo_command imglib
+
+	if use X ; then
+		myconf="${myconf} --enable-image=x11,fb $(use_enable xface)"
+		if use gtk ; then
+			imglib="gdk_pixbuf"
+		elif use imlib2 ; then
+			imglib="imlib2"
+		else
+			imglib="imlib"
+		fi
+	else
+		myconf="${myconf} --enable-image=no"
+	fi
+
+	if use migemo ; then
+		migemo_command="migemo -t egrep /usr/share/migemo/migemo-dict"
+	else
+		migemo_command="no"
+	fi
+
+	export WANT_AUTOCONF=2.5
+	autoconf || die
+
+	econf \
+		--enable-keymap=w3m \
+		--with-editor=/usr/bin/nano \
+		--with-mailer=/bin/mail \
+		--with-browser=/usr/bin/mozilla \
+		--with-termlib=ncurses \
+		--with-imglib="${imglib}" \
+		--with-migemo="${migemo_command}" \
+		$(use_enable gpm mouse) \
+		$(use_enable ssl digest-auth) \
+		$(use_with ssl) \
+		${myconf} || die
+
+	# make borks
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	insinto /usr/share/${PN}/Bonus
+	doins Bonus/*
+	dodoc README NEWS TODO ChangeLog
+	docinto doc-en ; dodoc doc/*
+	docinto doc-jp ; dodoc doc-jp/*
+}