--- /usr/portage/app-misc/endeavour/endeavour-2.7.3.ebuild	2009-01-18 18:05:41.000000000 -0500
+++ endeavour-2.7.3.ebuild	2010-08-22 00:33:06.000000000 -0400
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 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/endeavour/endeavour-2.7.3.ebuild,v 1.6 2009/01/18 22:42:04 angelos Exp $
 
@@ -28,35 +28,38 @@
 
 	epatch "${FILESDIR}/${P}-amd64-gtk-flags.patch" \
 		"${FILESDIR}"/${P}-asneeded.patch
+
+	sed -i '/Linking modules.../{n;s/$(CPP)/$(CPP) $(LDFLAGS)/}' \
+	endeavour2/makefile_append.ini || die
 }
 
 src_compile() {
 	./configure Linux --prefix=/usr $(use_enable joystick libjsw) || die
-	emake || die "Parallel make failed"
+	emake CC=$(tc-getCC) CPP=$(tc-getCXX) || die "Parallel make failed"
 }
 
 src_install() {
-	dodoc AUTHORS HACKING README TODO
+	dodoc AUTHORS HACKING README TODO || die
 
 	cd endeavour2
 	dobin endeavour2 || die
 	bunzip2 endeavour2.1.bz2
-	doman endeavour2.1
+	doman endeavour2.1 || die
 
-	dodir /usr/share/endeavour2
+	dodir /usr/share/endeavour2 || die
 	cp -R data/* "${D}"/usr/share/endeavour2 || die
-	dodir /usr/share/endeavour2/icons/
+	dodir /usr/share/endeavour2/icons/ || die
 	cp -R images/* "${D}"/usr/share/endeavour2/icons/
 
 	cd images
 	insinto /usr/share/icons
 	doins endeavour_48x48.xpm image_browser_48x48.xpm icon_trash_48x48.xpm \
-		icon_trash_empty_48x48.xpm
+		icon_trash_empty_48x48.xpm || die
 
 	# install mimetypes
 	cd "${WORKDIR}"/${M}
 	mv README README.mimetypes
-	dodoc README.mimetypes
+	dodoc README.mimetypes || die
 	insinto /usr/share/endeavour2/
-	doins mimetypes.ini
+	doins mimetypes.ini || die
 }