Fixed compile time problem. Added nopixbuf, imlib2 and migemo IUSE flags.

5 files changed, 170 insertions, 30 deletions

diff --git a/net-www/w3m-m17n/ChangeLog b/net-www/w3m-m17n/ChangeLog
index 0290ab8a71c3..be3dc969aa34 100644
--- a/net-www/w3m-m17n/ChangeLog
+++ b/net-www/w3m-m17n/ChangeLog
@@ -1,9 +1,14 @@
 # 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.9 2003/09/25 09:50:50 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m-m17n/ChangeLog,v 1.10 2003/10/04 22:21:45 usata Exp $
 
 *w3m-m17n-0.4.2 (25 Sep 2003)
 
+  05 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-m17n-0.4.2.ebuild,
+  files/w3m-m17n-0.4.2-gentoo.diff, files/w3m-m17n-0.4.2-imglib-gentoo.diff:
+  Fixed compilation breakage (due to CVS Id expansion in a patch).
+  Added nopixmap, imlib2 and migemo IUSE flags.
+
   25 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-m17n-0.4.2.ebuild,
   files/w3m-m17n-0.4.2-gentoo.diff:
   Version bumped
diff --git a/net-www/w3m-m17n/Manifest b/net-www/w3m-m17n/Manifest
index 5b13dccc41d8..8ae17d8d6f20 100644
--- a/net-www/w3m-m17n/Manifest
+++ b/net-www/w3m-m17n/Manifest
@@ -1,10 +1,10 @@
-MD5 33cae6f37ad5f7cfb4d2727b23f69bbd ChangeLog 2228
+MD5 8c5aad8f065099f54f79bb55b974047b ChangeLog 2494
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 e98ed662d20aff454ace121087ce6801 w3m-m17n-20030916.ebuild 3015
-MD5 2df19bfb59ed64f34127ddc5900f9693 w3m-m17n-0.4.2.ebuild 3079
+MD5 fb0316ea50d3d6bcdbef7b512c5249a2 w3m-m17n-0.4.2.ebuild 3644
 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
+MD5 f91cc75929689839efc1a8dfb0dcbd83 files/w3m-m17n-0.4.2-imglib-gentoo.diff 5019
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
deleted file mode 100644
index fe58bc386109..000000000000
--- a/net-www/w3m-m17n/files/w3m-m17n-0.4.2-gentoo.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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/files/w3m-m17n-0.4.2-imglib-gentoo.diff b/net-www/w3m-m17n/files/w3m-m17n-0.4.2-imglib-gentoo.diff
new file mode 100644
index 000000000000..c74bdc2cecdf
--- /dev/null
+++ b/net-www/w3m-m17n/files/w3m-m17n-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/net-www/w3m-m17n/w3m-m17n-0.4.2.ebuild b/net-www/w3m-m17n/w3m-m17n-0.4.2.ebuild
index c964a2519a2f..b1d5e5c0c193 100644
--- a/net-www/w3m-m17n/w3m-m17n-0.4.2.ebuild
+++ b/net-www/w3m-m17n/w3m-m17n-0.4.2.ebuild
@@ -1,8 +1,8 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m-m17n/w3m-m17n-0.4.2.ebuild,v 1.2 2003/10/04 22:21:45 usata Exp $
 
-IUSE="imlib gtk xface gpm ssl"
+IUSE="X imlib imlib2 gtk xface migemo gpm ssl"
 #IUSE="nls"
 
 W3M_CVS_PV="1.862"
@@ -25,16 +25,20 @@ SLOT="0"
 LICENSE="w3m"
 KEYWORDS="~x86 ~alpha ~ppc ~sparc"
 
-DEPEND=">=sys-libs/ncurses-5.2-r3
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	>=sys-devel/autoconf-2.57"
+RDEPEND=">=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 ) )
+	X? ( || ( !nopixbuf? ( >=media-libs/gdk-pixbuf-0.22.0 )
+		imlib2? ( >=media-libs/imlib2-1.0.5 )
+		imlib? ( >=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 )"
 
 PROVIDE="virtual/textbrowser
@@ -51,35 +55,51 @@ src_unpack() {
 	unpack libwc-${LIBWC_PV}.tar.gz
 
 	unpack ${W3M_M17N_P}-1.diff.gz
-	epatch ${FILESDIR}/${P}-gentoo.diff
+	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
 
 	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
+	local myconf migemo_command imglib
 
-	if [ -n "`use imlib`" -o -n "`use gtk`" ] ; then
+	if [ -n "`use X`" ] ; then
 		myconf="${myconf} --enable-image=x11,fb `use_enable xface`"
+		if [ ! -n "`use nopixbuf`" ] ; then
+			imglib="gdk_pixbuf"
+		elif [ -n "`use imlib2`" ] ; then
+			imglib="imlib2"
+		elif [ -n "`use imlib`" ] ; then
+			imglib="imlib"
+		else
+			# defaults to gdk_pixbuf
+			imglib="gdk_pixbuf"
+		fi
 	else
 		myconf="${myconf} --enable-image=no"
 	fi
 
-	if has_version 'app-emacs/migemo' ; then
+	if [ -n "`use migemo`" ] ; then
 		migemo_command="migemo -t egrep /usr/share/migemo/migemo-dict"
 	else
 		migemo_command="no"
 	fi
 
+	export WANT_AUTOCONF_2_5=1
+	autoconf || die
+
 	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-imglib="${imglib}" \
 		--with-migemo="${migemo_command}" \
 		`use_enable gpm mouse` \
 		`use_enable ssl digest-auth` \