--- monav-0.3.ebuild	2012-02-06 19:37:16.596000022 +0100
+++ monav-0.3-r1.ebuild	2012-06-06 12:56:13.611987490 +0200
@@ -26,22 +26,24 @@
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-qmake.patch || die
+	epatch \
+		"${FILESDIR}"/${P}-qmake.patch \
+		"${FILESDIR}"/${P}-mapnik2.patch
 }
 
 src_configure() {
-	eqmake4 "${S}"/monavroutingdaemon.pro CONFIG+=nogui -o "${S}"/Makefile.routingdaemon || die
+	eqmake4 "${S}"/monavroutingdaemon.pro CONFIG+=nogui -o "${S}"/Makefile.routingdaemon
 
 	if use preprocessor ; then
-		eqmake4 "${S}"/monavpreprocessor.pro CONFIG+=nogui -o "${S}"/Makefile.preprocessor || die
+		eqmake4 "${S}"/monavpreprocessor.pro CONFIG+=nogui -o "${S}"/Makefile.preprocessor
 	fi
 
 	if use preprocessor-gui ; then
-		eqmake4 "${S}"/monavpreprocessor-gui.pro -o	"${S}"/Makefile.preprocessor-gui || die
+		eqmake4 "${S}"/monavpreprocessor-gui.pro -o	"${S}"/Makefile.preprocessor-gui
 	fi
 
 	if use client ; then
-		eqmake4 "${S}"/monavclient.pro -o "${S}"/Makefile.client || die
+		eqmake4 "${S}"/monavclient.pro -o "${S}"/Makefile.client
 	fi
 }
 
@@ -49,31 +51,31 @@
 	emake -f "${S}"/Makefile.routingdaemon
 
 	if use preprocessor ; then
-		emake -f "${S}"/Makefile.preprocessor || die
+		emake -f "${S}"/Makefile.preprocessor
 	fi
 
 	if use preprocessor-gui ; then
-		emake -f "${S}"/Makefile.preprocessor-gui || die
+		emake -f "${S}"/Makefile.preprocessor-gui
 	fi
 
 	if use client ; then
-		emake -f "${S}"/Makefile.client || die
+		emake -f "${S}"/Makefile.client
 	fi
 }
 
 src_install() {
-	dobin bin/daemon-test || die
-	dobin bin/monav-daemon || die
+	dobin bin/daemon-test
+	dobin bin/monav-daemon
 
 	if use preprocessor ; then
-		dobin bin/monav-preprocessor || die
+		dobin bin/monav-preprocessor
 	fi
 
 	if use preprocessor-gui ; then
-		dobin bin/monav-preprocessor-gui || die
+		dobin bin/monav-preprocessor-gui
 	fi
 
 	if use client ; then
-		dobin bin/monav || die
+		dobin bin/monav
 	fi
 }