Fixed w3mimgdisplay. Added imlib2 support with USE="-X".

7 files changed, 29 insertions, 389 deletions

diff --git a/net-www/w3m/ChangeLog b/net-www/w3m/ChangeLog
index d0b98c801dc3..d7353e64d1b7 100644
--- a/net-www/w3m/ChangeLog
+++ b/net-www/w3m/ChangeLog
@@ -1,9 +1,15 @@
 # ChangeLog for net-www/w3m
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/ChangeLog,v 1.35 2003/10/31 15:55:12 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/ChangeLog,v 1.36 2003/11/04 19:56:44 usata Exp $
 
 *w3m-0.4.2-r2 (01 Nov 2003)
 
+  05 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-0.4.2-r1.ebuild,
+  w3m-0.4.2-r2.ebuild, files/w3m-0.4.2-imglib-gentoo.diff,
+  files/w3m-0.4.2-w3mman-gentoo.diff:
+  Changed imglib to imagelib and fixed w3mimagefb breakage with gdk-pixbuf.
+  Support for imlib2 without X (using w3m under framebuffer).
+
   01 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-0.4.2-r2.ebuild:
   Updated to the latest snapshot
 
diff --git a/net-www/w3m/Manifest b/net-www/w3m/Manifest
index d38876231f94..8728777433c5 100644
--- a/net-www/w3m/Manifest
+++ b/net-www/w3m/Manifest
@@ -1,23 +1,17 @@
-MD5 802a66fc2a5db66b3bb69d08b5868186 ChangeLog 7149
-MD5 8f501d419f4a6270d4c7b0719d0ed3f3 w3m-0.4.2-r1.ebuild 4017
-MD5 48217de4a6358538fa8570dbc069a530 w3m-0.4.2-r2.ebuild 4014
+MD5 2154999be85215c83cbdaaddf01323b4 ChangeLog 7455
+MD5 67419148d63fdb8b8bc46b34725d741f w3m-0.4.2-r2.ebuild 4147
 MD5 ae37f0b018eb3457f9690ee35cefef0e w3m-0.4.2.ebuild 1939
 MD5 1f7b8fffb13d61fe43a3294dcf037926 w3m-0.3.2.2.ebuild 3732
-MD5 95fa07539873f43a21b679f242c5e7ed w3m-0.4.3_pre20031022.ebuild 4144
 MD5 003ecc09459bb3933a50d51c2b757630 w3m-0.4.ebuild 4437
 MD5 7676892f874fdeefb6cc8dac727f6558 w3m-0.4.1-r3.ebuild 2381
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 0fd075401455ce9205836b4267202e22 files/w3m-w3mman-gentoo.diff 1059
-MD5 4b53dc11bab12abac8cd96b1411221d3 files/digest-w3m-0.4.2-r1 72
-MD5 d77199cd1fb81fe35f5825adaf0626c6 files/w3m-0.4.2-imglib-gentoo.diff 5199
 MD5 40e3d07e75b9f601f7b33cc5336214e7 files/digest-w3m-0.4.2-r2 72
 MD5 df74b28e72e6c2140a1dd6e4ea042e58 files/digest-w3m-0.3.2.2 64
 MD5 b289d2ea47e3369102b13b53f2bc47ac files/digest-w3m-0.4 60
-MD5 afbfc3c7c8b7d4a207e43248d88d7a51 files/w3m-0.4.2-w3mman-gentoo.diff 2086
 MD5 eda1478628d2167faea12ad67bac87b0 files/w3m.sh 490
 MD5 f0c1541c47ce452829b6142a8f64f82e files/w3mbookmark.sh.in 432
 MD5 4859057a6b1661358f58f2fceebcbaa0 files/w3mhelperpanel.sh.in 489
 MD5 00a360d12cc07d61c5fd5df08a53d261 files/w3m-0.4-alpha.patch 930
 MD5 fd7a37dd6717b69b356f6179a19e17b7 files/digest-w3m-0.4.1-r3 62
 MD5 ccf8db4eb493664368e4e4c77cea99d4 files/digest-w3m-0.4.2 61
-MD5 d578796f5700d67f835a606ca437125d files/digest-w3m-0.4.3_pre20031022 135
diff --git a/net-www/w3m/files/digest-w3m-0.4.2-r1 b/net-www/w3m/files/digest-w3m-0.4.2-r1
deleted file mode 100644
index 12cd6153300a..000000000000
--- a/net-www/w3m/files/digest-w3m-0.4.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5295f01c22ea1fa4a48ee9e59449988c w3m-0.4.2+cvs-1.877.tar.gz 1887370
diff --git a/net-www/w3m/files/w3m-0.4.2-imglib-gentoo.diff b/net-www/w3m/files/w3m-0.4.2-imglib-gentoo.diff
deleted file mode 100644
index b72c80255159..000000000000
--- a/net-www/w3m/files/w3m-0.4.2-imglib-gentoo.diff
+++ /dev/null
@@ -1,136 +0,0 @@
-diff -urN w3m-0.4.2.ORIG/acinclude.m4 w3m-0.4.2/acinclude.m4
---- w3m-0.4.2.ORIG/acinclude.m4	2003-10-03 07:24:52.000000000 +0900
-+++ w3m-0.4.2/acinclude.m4	2003-10-05 04:18:31.000000000 +0900
-@@ -599,6 +599,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
-@@ -640,21 +646,27 @@
- 	[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"
-      IMGTARGETS="x11"    
--   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`"
-      IMGTARGETS="x11"    
--   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"
-@@ -666,14 +678,18 @@
-    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`"
-      IMGTARGETS="${IMGTARGETS} fb"
--   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-10-03 07:24:52.000000000 +0900
-+++ w3m-0.4.2/aclocal.m4	2003-10-05 04:22:54.000000000 +0900
-@@ -611,6 +611,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
-@@ -652,21 +658,27 @@
- 	[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"
-      IMGTARGETS="x11"    
--   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`"
-      IMGTARGETS="x11"    
--   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"
-@@ -678,14 +690,18 @@
-    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`"
-      IMGTARGETS="${IMGTARGETS} fb"
--   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/files/w3m-0.4.2-w3mman-gentoo.diff b/net-www/w3m/files/w3m-0.4.2-w3mman-gentoo.diff
deleted file mode 100644
index d78436cbca52..000000000000
--- a/net-www/w3m/files/w3m-0.4.2-w3mman-gentoo.diff
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -urN w3m-0.4.2.ORIG/Makefile.in w3m-0.4.2/Makefile.in
---- w3m-0.4.2.ORIG/Makefile.in	2003-09-25 00:36:41.000000000 +0900
-+++ w3m-0.4.2/Makefile.in	2003-09-25 03:27:57.000000000 +0900
-@@ -112,7 +112,7 @@
- HELP_ALLFILES=w3mhelp-w3m_en.html w3mhelp-w3m_ja.html \
- 	w3mhelp-lynx_en.html w3mhelp-lynx_ja.html
- 
--SCRIPTSUBDIRS= scripts
-+SCRIPTSUBDIRS= scripts scripts/multipart scripts/w3mman
- SUBDIRS = $(SCRIPTSUBDIRS) w3mimg libwc po
- 
- .PHONY: $(SUBDIRS)
-diff -urN w3m-0.4.2.ORIG/configure.in w3m-0.4.2/configure.in
---- w3m-0.4.2.ORIG/configure.in	2003-09-25 00:36:50.000000000 +0900
-+++ w3m-0.4.2/configure.in	2003-09-25 04:10:35.000000000 +0900
-@@ -138,6 +138,9 @@
- AC_W3M_SIGSETJMP
- AC_W3M_SIGNAL
- 
-+AC_SUBST(HELP_DIR)
-+HELP_DIR="/usr/share/w3m"
-+AC_DEFINE_UNQUOTED(HELP_DIR, "$HELP_DIR")
- AC_SUBST(RC_DIR)
- RC_DIR="~/.$PACKAGE"
- AC_DEFINE_UNQUOTED(RC_DIR, "$RC_DIR")
-diff -urN w3m-0.4.2.ORIG/scripts/w3mman/Makefile.in w3m-0.4.2/scripts/w3mman/Makefile.in
---- w3m-0.4.2.ORIG/scripts/w3mman/Makefile.in	2003-09-23 07:53:53.000000000 +0900
-+++ w3m-0.4.2/scripts/w3mman/Makefile.in	2003-09-25 03:46:38.000000000 +0900
-@@ -28,6 +28,7 @@
- RC_DIR = ~/.$(package)
- ETC_DIR = $(sysconfdir)
- CONF_DIR = $(sysconfdir)/$(package)
-+MAN1_DIR = $(mandir)/man1
- 
- TARGETS		= w3mman
- LIB_TARGETS	= w3mman2html.cgi
-@@ -37,17 +38,17 @@
- MKDIR		= mkdir -p
- INSTALL		= @INSTALL@
- INSTALL_SCRIPT	= @INSTALL_SCRIPT@
--INSTALL_MAN	= @INSTALL_MAN@
-+INSTALL_MAN	= @INSTALL_DATA@
- 
- all: $(TARGETS) $(LIB_TARGETS) $(MAN_TARGETS)
- 
- install: $(TARGETS) $(LIB_TARGETS) $(MAN_TARGETS)
--	-$(MKDIR) $(DESTDIR)$(BIN_DIR)
-+	-$(MKDIR) $(DESTDIR)$(bindir)
- 	-$(MKDIR) $(DESTDIR)$(LIB_DIR)
- 	-$(MKDIR) $(DESTDIR)$(MAN1_DIR)
- 	for file in $(TARGETS);     \
- 	do      \
--		$(INSTALL_SCRIPT) $$file $(DESTDIR)$(BIN_DIR);	\
-+		$(INSTALL_SCRIPT) $$file $(DESTDIR)$(bindir);	\
- 	done
- 	for file in $(LIB_TARGETS);     \
- 	do      \
-@@ -61,7 +62,7 @@
- uninstall:
- 	-for file in $(TARGETS);     \
- 	do      \
--		rm -f $(BIN_DIR)/$$file;	\
-+		rm -f $(bindir)/$$file;	\
- 	done
- 	-for file in $(LIB_TARGETS);     \
- 	do      \
diff --git a/net-www/w3m/w3m-0.4.2-r1.ebuild b/net-www/w3m/w3m-0.4.2-r1.ebuild
deleted file mode 100644
index 3cc7c4567548..000000000000
--- a/net-www/w3m/w3m-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# 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/w3m-0.4.2-r1.ebuild,v 1.3 2003/10/31 15:41:06 usata Exp $
-
-IUSE="X nopixbuf imlib imlib2 xface ssl migemo gpm cjk"
-
-W3M_CVS_PV="1.877"
-W3M_CVS_P="${P}+cvs-${W3M_CVS_PV}"
-
-DESCRIPTION="Text based WWW browser, supports tables and frames"
-SRC_URI="mirror://gentoo/${W3M_CVS_P}.tar.gz
-	http://dev.gentoo.org/~usata/distfiles/${W3M_CVS_P}.tar.gz"
-HOMEPAGE="http://w3m.sourceforge.net/"
-
-SLOT="0"
-LICENSE="w3m"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.57"
-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.0.5 )
-		imlib? ( >=media-libs/imlib-1.9.8 )
-		virtual/glibc )
-	)
-	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"
-
-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
-}
-
-w3m_src_compile() {
-
-	local myconf migemo_command imglib
-
-	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 [ -n "`use migemo`" ] ; then
-		migemo_command="migemo -t egrep /usr/share/migemo/migemo-dict"
-	else
-		migemo_command="no"
-	fi
-
-	# You can't disable nls and cjk at the moment(compile fails)
-	# `use_enable nls`
-	# `use_enable cjk m17n`
-	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
-
-	# emake borked
-	make all || die "make failed"
-	make all || die "make failed"
-}
-
-src_unpack() {
-
-	unpack ${W3M_CVS_P}.tar.gz
-	cd ${S}
-	#epatch ${FILESDIR}/${PF}-gentoo.diff
-	epatch ${FILESDIR}/${P}-w3mman-gentoo.diff
-	epatch ${FILESDIR}/${PN}-w3mman-gentoo.diff
-	epatch ${FILESDIR}/${P}-imglib-gentoo.diff
-}
-
-src_compile() {
-
-	export WANT_AUTOCONF_2_5=1
-	autoconf || die
-
-	if [ -n "`use cjk`" ] ; then
-
-		w3m_src_compile \
-			--enable-japanese=E \
-			--with-charset=EUC-JP \
-			--enable-messagel10n
-
-		mv w3mhelperpanel ${T}/w3mhelperpanel-ja
-		mv w3mbookmark ${T}/w3mbookmark-ja
-		mv w3m ${T}/w3m-ja
-
-		sed -e "s%@cgibindir@%/usr/libexec/w3m/cgi-bin%" \
-			${FILESDIR}/w3mhelperpanel.sh.in \
-			> ${T}/w3mhelperpanel.sh
-		sed -e "s%@cgibindir@%/usr/libexec/w3m/cgi-bin%" \
-			${FILESDIR}/w3mbookmark.sh.in \
-			> ${T}/w3mbookmark.sh
-
-		make clean
-	fi
-
-	w3m_src_compile --disable-japanese
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die "make install failed"
-
-	if [ -n "`use cjk`" ] ; then
-		mv ${D}/usr/bin/w3m{,-en}
-		mv ${D}/usr/libexec/w3m/cgi-bin/w3mhelperpanel{,-en}
-		mv ${D}/usr/libexec/w3m/cgi-bin/w3mbookmark{,-en}
-		dobin ${T}/w3m-ja
-		newbin ${FILESDIR}/w3m.sh w3m
-		exeinto /usr/libexec/w3m/cgi-bin
-		doexe ${T}/w3mhelperpanel-ja
-		doexe ${T}/w3mbookmark-ja
-		newexe ${T}/w3mhelperpanel.sh w3mhelperpanel
-		newexe ${T}/w3mbookmark.sh w3mbookmark
-	fi
-
-	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
-}
diff --git a/net-www/w3m/w3m-0.4.2-r2.ebuild b/net-www/w3m/w3m-0.4.2-r2.ebuild
index 8121c6b509f5..8e33a4636973 100644
--- a/net-www/w3m/w3m-0.4.2-r2.ebuild
+++ b/net-www/w3m/w3m-0.4.2-r2.ebuild
@@ -1,6 +1,6 @@
 # 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/w3m-0.4.2-r2.ebuild,v 1.1 2003/10/31 15:41:06 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.4.2-r2.ebuild,v 1.2 2003/11/04 19:56:44 usata Exp $
 
 IUSE="X nopixbuf imlib imlib2 xface ssl migemo gpm cjk"
 
@@ -14,6 +14,7 @@ HOMEPAGE="http://w3m.sourceforge.net/"
 
 SLOT="0"
 LICENSE="w3m"
+# since it is a CVS snapshot, we better not change keywords to stable
 KEYWORDS="~x86 ~alpha ~ppc ~sparc"
 
 DEPEND="${RDEPEND}
@@ -22,10 +23,11 @@ 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.0.5 )
+		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 )
@@ -49,22 +51,28 @@ pkg_setup() {
 
 w3m_src_compile() {
 
-	local myconf migemo_command imglib
+	local myconf migemo_command imagelib
 
 	if [ -n "`use X`" ] ; then
 		myconf="${myconf} --enable-image=x11,fb `use_enable xface`"
 		if [ ! -n "`use nopixbuf`" ] ; then
-			imglib="gdk_pixbuf"
+			imagelib="gdk-pixbuf"
 		elif [ -n "`use imlib2`" ] ; then
-			imglib="imlib2"
+			imagelib="imlib2"
 		elif [ -n "`use imlib`" ] ; then
-			imglib="imlib"
+			imagelib="imlib"
 		else
-			# defaults to gdk_pixbuf
-			imglib="gdk_pixbuf"
+			# defaults to gdk-pixbuf
+			imagelib="gdk-pixbuf"
 		fi
 	else
-		myconf="${myconf} --enable-image=no"
+		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
@@ -80,7 +88,7 @@ w3m_src_compile() {
 		--with-mailer=/bin/mail \
 		--with-browser=/usr/bin/mozilla \
 		--with-termlib=ncurses \
-		--with-imglib="${imglib}" \
+		--with-imagelib="${imagelib}" \
 		--with-migemo="${migemo_command}" \
 		`use_enable cjk m17n` \
 		`use_enable gpm mouse` \
@@ -89,24 +97,20 @@ w3m_src_compile() {
 		${myconf} "$@" || die
 
 	# emake borked
-	make all || die "make failed"
-	make all || die "make failed"
+	make all || make all || die "make failed"
 }
 
 src_unpack() {
 
 	unpack ${W3M_CVS_P}.tar.gz
 	cd ${S}
-	#epatch ${FILESDIR}/${PF}-gentoo.diff
-	#epatch ${FILESDIR}/${P}-w3mman-gentoo.diff
 	epatch ${FILESDIR}/${PN}-w3mman-gentoo.diff
-	#epatch ${FILESDIR}/${P}-imglib-gentoo.diff
 }
 
 src_compile() {
 
 	export WANT_AUTOCONF_2_5=1
-	autoconf || die
+	#autoconf || die "autoconf failed"
 
 	if [ -n "`use cjk`" ] ; then