--- /usr/portage/x11-misc/x2x/x2x-1.27-r2.ebuild	2009-05-05 14:37:14.000000000 -0400
+++ ./x2x-1.27-r2.ebuild	2010-09-02 13:20:27.000000000 -0400
@@ -4,6 +4,8 @@
 
 inherit eutils
 
+EAPI=2
+
 DESCRIPTION="An utility to connect the Mouse and KeyBoard to another X"
 HOMEPAGE="http://www.the-labs.com/X11/#x2x"
 LICENSE="as-is"
@@ -28,22 +30,30 @@
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
+}
+src_configure(){
 	# Patch from Debian to add -north and -south, among other fixes
-	epatch "${DISTDIR}"/x2x_1.27-8.diff.gz
+	epatch "${DISTDIR}"/x2x_1.27-8.diff.gz ||die "debian patch failed"
 
 	# Fix variable initialization in Debian patch
-	epatch "${DISTDIR}"/x2x_1.27-8-initvars.patch.gz
+	epatch "${DISTDIR}"/x2x_1.27-8-initvars.patch.gz || die "initialization patch failed"
 
 	# Patch to add LICENSE
-	epatch "${DISTDIR}"/${P}-license.patch.gz
+	epatch "${DISTDIR}"/${P}-license.patch.gz || die "LICENSE patch failed"
 
 	# Patch to fix bug #126939
 	# AltGr does not work in x2x with different keymaps:
-	epatch "${DISTDIR}"/${P}-keymap.diff.gz
+	epatch "${DISTDIR}"/${P}-keymap.diff.gz || die "AltGr patch failed"
 
+	# sed to fix calling gcc directly, fix LDFLAGS and fix cflags
+	sed -i Imakefile -e "s/gcc/$(tc-getCC)/" \
+			 -e "s:CFLAGS =:CFLAGS +=:" \
+			 -e "s/CDEBUGFLAGS = -O/CDEBUGFLAGS += -O \n LDOPTIONS += ${LDFLAGS}/"\
+			 || die "sed failed"
+	
 	# Man-page is packaged as x2x.1 but needs to be x2x.man for building
-	mv x2x.1 x2x.man
+	mv x2x.1 x2x.man || die
+	
 }
 
 src_compile() {