--- links-2.3_pre1.ebuild	2010-04-11 22:31:14.000000000 +0200
+++ links-2.3_pre1-r1.ebuild	2010-06-19 23:12:08.358452746 +0200
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.3_pre1.ebuild,v 1.1 2010/04/11 20:31:14 vanquirius Exp $
+# $Header: $
+
+EAPI="2"
 
-WANT_AUTOCONF=latest
 WANT_AUTOMAKE=none
 
 inherit eutils toolchain-funcs autotools
@@ -17,7 +18,7 @@
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 directfb fbcon gpm jpeg livecd png sdl ssl svga tiff unicode X zlib"
+IUSE="bzip2 directfb fbcon gpm jpeg livecd ssl svga tiff unicode X zlib"
 
 # Note: if X or fbcon usegflag are enabled, links will be built in graphic
 # mode. libpng is required to compile links in graphic mode
@@ -27,7 +28,6 @@
 
 RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6c )
 	gpm? ( sys-libs/gpm )
-	png? ( >=media-libs/libpng-1.2.1 )
 	jpeg? ( >=media-libs/jpeg-6b )
 	fbcon? ( >=media-libs/libpng-1.2.1
 		>=media-libs/jpeg-6b
@@ -38,7 +38,6 @@
 	X? ( x11-libs/libXext
 		>=media-libs/libpng-1.2.1 )
 	directfb? ( dev-libs/DirectFB )
-	sdl? ( >=media-libs/libsdl-1.2.0 )
 	sys-libs/ncurses
 	livecd? ( >=media-libs/libpng-1.2.1
 		>=media-libs/jpeg-6b
@@ -47,9 +46,7 @@
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_unpack (){
-	unpack ${A}; cd "${S}"
-
+src_prepare (){
 	epatch "${FILESDIR}"/configure-LANG.patch #131440
 
 	if use unicode ; then
@@ -61,7 +58,7 @@
 	eautoconf || die "autoconf failed"
 }
 
-src_compile (){
+src_configure (){
 	local myconf
 
 	if use X || use fbcon || use directfb || use svga || use livecd; then
@@ -92,17 +89,14 @@
 
 	econf \
 		$(use_with X x) \
-		$(use_with png libpng) \
 		$(use_with jpeg libjpeg) \
 		$(use_with tiff libtiff) \
 		$(use_with svga svgalib) \
 		$(use_with directfb) \
 		$(use_with ssl) \
-		$(use_with sdl) \
 		$(use_with zlib) \
 		$(use_with bzip2) \
 		${myconf} || die "configure failed"
-	emake || die "make failed"
 }
 
 src_install() {