--- fbdesk-1.4.1.ebuild.old	2008-12-07 03:30:17.000000000 +0100
+++ fbdesk-1.4.1.ebuild	2008-12-07 03:44:17.000000000 +0100
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-misc/fbdesk/fbdesk-1.4.1.ebuild,v 1.8 2008/09/22 13:26:52 omp Exp $
 
+EAPI="2"
+
 inherit eutils
 
 DESCRIPTION="fluxbox-util application that creates and manage icons on your Fluxbox desktop"
@@ -11,31 +13,32 @@ SRC_URI="http://www.fluxbox.org/download
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ia64 ppc sparc x86"
-IUSE="debug png"
+IUSE="debug imlib png xft xrender xshape xmb "
 
 RDEPEND="png? ( media-libs/libpng )
-		media-libs/imlib2
-		x11-libs/libXpm
-		x11-libs/libXft"
-DEPEND="${RDEPEND}
-		x11-proto/xextproto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+	imlib? ( media-libs/imlib2[X] )
+	xrender? ( x11-libs/libXrender  )
+	xft? ( x11-libs/libXft )
+	xshape? ( x11-libs/libXext )
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
 
+src_prepare() {
 	epatch "${FILESDIR}/${P}-gcc-4.3.patch"
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		$(use_enable debug) \
-		$(use_enable png) || die "econf failed"
-
-	emake || die "emake failed"
+		$(use_enable imlib imlib2) \
+		$(use_enable png) \
+		$(use_enable xft) \
+		$(use_enable xrender) \
+		$(use_enable xshape shape) \
+		$(use_enable xmb)
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS ChangeLog README
+	dodoc AUTHORS ChangeLog README || die "dodoc failed"
 }