--- /usr/portage/x11-misc/suxpanel/suxpanel-0.4b-r1.ebuild	2009-04-05 06:37:41.000000000 -0400
+++ suxpanel-0.4b-r2.ebuild	2010-02-06 15:39:43.000000000 -0500
@@ -1,7 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-misc/suxpanel/suxpanel-0.4b-r1.ebuild,v 1.2 2008/04/07 20:11:12 drac Exp $
 
+EAPI=2
+
 inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="SuxPanel is a complete rewrite of MacOS Style Panel, a light-weight X11 desktop panel"
@@ -19,17 +21,23 @@
 	dev-util/pkgconfig"
 
 src_unpack() {
-	unpack ${A}
-	cd "${S}"
+	default
+}
+
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-Makefile.in.patch
 	epatch "${FILESDIR}"/${P}-stdlib.patch
+	epatch "${FILESDIR}"/${P}-LIBDIR.patch
+}
+
+src_configure() {
+	default
 }
 
 src_compile() {
+	default
 	use amd64 && append-flags -O0
 	tc-export CC
-	econf
-	emake || die "emake failed."
 }
 
 src_install () {