--- /usr/portage/net-www/w3m/w3m-0.5-r2.ebuild	2004-04-28 21:02:21.000000000 +0100
+++ ./w3m-0.5-r2.ebuild	2004-04-29 18:16:54.763544968 +0100
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /home/cvsroot/gentoo-x86/net-www/w3m/w3m-0.5-r2.ebuild,v 1.2 2004/04/28 19:58:30 usata Exp $
+# $Header: /home/cvsroot/gentoo-x86/net-www/w3m/w3m-0.5-r2.ebuild,v 1.1 2004/04/07 16:40:26 usata Exp $
 
 inherit eutils
 
@@ -23,19 +23,20 @@
 
 LICENSE="w3m"
 SLOT="0"
-KEYWORDS="x86 alpha ~ppc ~sparc"
-IUSE="X gtk imlib imlib2 xface ssl migemo gpm cjk nls async"
+KEYWORDS="~x86 ~alpha ~ppc ~sparc"
+IUSE="X nopixbuf imlib imlib2 xface ssl migemo gpm cjk nls async lynxkeymap"
 #IUSE="canna unicode"
 
 # canna? ( app-i18n/canna )
-DEPEND=">=sys-libs/ncurses-5.2-r3
+RDEPEND=">=sys-libs/ncurses-5.2-r3
 	>=sys-libs/zlib-1.1.3-r2
 	>=dev-libs/boehm-gc-6.2
-	X? ( gtk? ( >=media-libs/gdk-pixbuf-0.22.0 )
-		!gtk? ( imlib2? ( >=media-libs/imlib2-1.1.0 )
-			!imlib2? ( >=media-libs/imlib-1.9.8 ) )
+	X? ( || ( !nopixbuf? ( >=media-libs/gdk-pixbuf-0.22.0 )
+		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 ) )
+	!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 )
@@ -43,6 +44,21 @@
 PROVIDE="virtual/textbrowser
 	virtual/w3m"
 
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.58"
+
+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
+}
+
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${S}
@@ -62,18 +78,24 @@
 }
 
 src_compile() {
+	export WANT_AUTOCONF=2.5
+	#autoconf || die "autoconf failed"
+
 	local myconf migemo_command imagelib
 
 	if [ -n "`use X`" ] ; then
 		myconf="${myconf} --enable-image=x11,fb `use_enable xface`"
-		if [ -n "`use gtk`" ] ; then
+		if [ ! -n "`use nopixbuf`" ] ; then
 			imagelib="gdk-pixbuf"
 		elif [ -n "`use imlib2`" ] ; then
 			imagelib="imlib2"
-		else
+		elif [ -n "`use imlib`" ] ; then
 			imagelib="imlib"
+		else
+			# defaults to gdk-pixbuf
+			imagelib="gdk-pixbuf"
 		fi
-	else	# no X
+	else
 		if [ -n "`use imlib2`" ] ; then
 			myconf="${myconf} --enable-image=fb"
 			imagelib="imlib2"
@@ -101,7 +123,15 @@
 			--with-charset=US-ASCII"
 	fi
 
-	econf --enable-keymap=w3m \
+	if [ -n "`use lynxkeymap`" ] ; then
+		myconf="${myconf}
+			--enable-keymap=lynx"
+	else
+		myconf="${myconf}
+			--enable-keymap=w3m"
+	fi
+
+	econf
 		--with-editor=/usr/bin/nano \
 		--with-mailer=/bin/mail \
 		--with-browser=/usr/bin/mozilla \