--- /usr/portage/app-misc/mouseremote/mouseremote-0.90.ebuild	2009-04-05 04:08:24.000000000 -0400
+++ mouseremote-0.90.ebuild	2010-08-13 00:08:31.000000000 -0400
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-misc/mouseremote/mouseremote-0.90.ebuild,v 1.17 2007/04/22 15:16:40 phreak Exp $
 
@@ -16,26 +16,34 @@
 
 DEPEND="virtual/perl-Time-HiRes"
 
-src_compile() {
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+	
+	epatch "${FILESDIR}"/${P}-makefile.patch
 	epatch "${FILESDIR}"/${PN}-gentoo.diff
+}
+
+src_compile() {
 	cd MultiMouse && emake \
+		CC=$(tc-getCC) \
 		PREFIX=/usr \
 		LOCKDIR=/var/lock \
 	    JMANDIR=/usr/share/man/ja_JP.ujis || die
 }
 
 src_install() {
-	dobin MultiMouse/multimouse
-	dosbin MultiMouse/multimoused
+	dobin MultiMouse/multimouse || die
+	dosbin MultiMouse/multimoused || die
 
-	dodoc README MultiMouse/README.jis MultiMouse/README.newstuff
-	newdoc MultiMouse/README README.MultiMouse
-	newdoc client/MouseRemote.conf MouseRemote.conf.dist
-	newdoc client/MouseRemote.pl MouseRemote.pl.dist
-	newdoc client/MouseRemoteKeys.pl MouseRemoteKeys.pl.dist
+	dodoc README MultiMouse/README.jis MultiMouse/README.newstuff || die
+	newdoc MultiMouse/README README.MultiMouse || die
+	newdoc client/MouseRemote.conf MouseRemote.conf.dist || die
+	newdoc client/MouseRemote.pl MouseRemote.pl.dist || die
+	newdoc client/MouseRemoteKeys.pl MouseRemoteKeys.pl.dist || die
 
-	newinitd "${FILESDIR}"/mouseremote.start mouseremote
-	newconfd "${FILESDIR}"/mouseremote.conf mouseremote
+	newinitd "${FILESDIR}"/mouseremote.start mouseremote || die
+	newconfd "${FILESDIR}"/mouseremote.conf mouseremote || die
 }
 
 pkg_postinst() {