--- wmitime-0.3.ebuild.orig	2008-11-28 17:54:45.764251234 +0000
+++ wmitime-0.3.ebuild	2008-11-28 17:54:55.932886818 +0000
@@ -2,10 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmitime/wmitime-0.3.ebuild,v 1.18 2008/11/25 23:59:19 tcunha Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
-S=${WORKDIR}/${PN}
-IUSE=""
 DESCRIPTION="Overglorified clock dockapp w/time, date, and internet time"
 HOMEPAGE="http://www.neotokyo.org/illusion/"
 SRC_URI="http://www.neotokyo.org/illusion/downloads/${P}.tar.gz"
@@ -13,6 +11,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
@@ -20,21 +19,21 @@
 DEPEND="${RDEPEND}
 	x11-proto/xextproto"
 
+S=${WORKDIR}/${PN}/${PN}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/makefile.diff
+
+	sed -i "s/cc/$(tc-getCC)/" Makefile || die "sed cc failed"
+	sed -i "s/-D\$(LANG)//" Makefile || die "sed lang failed"
 }
 
 src_compile() {
-	cd "${S}"/wmitime
-	make || die "make failed"
+	emake FLAGS="${CFLAGS}" || die "make failed"
 }
 
 src_install() {
-	cd "${S}"/wmitime
 	dobin wmitime
-
-	cd "${S}"
-	dodoc BUGS CHANGES README
+	dodoc ../{BUGS,CHANGES,README}
 }