--- /usr/portage/./sci-geosciences/merkaartor/merkaartor-0.12.ebuild	2009-01-10 18:06:57.000000000 +0100
+++ ./sci-geosciences/merkaartor/merkaartor-0.12.ebuild	2009-01-11 16:05:37.000000000 +0100
@@ -17,8 +17,6 @@
 	x11-libs/qt-gui:4
 	media-gfx/exiv2"
 
-S="${WORKDIR}/${P}"
-
 src_compile() {
 	if use nls; then
 		lrelease Merkaartor.pro || die "lrelease failed"
@@ -32,5 +30,5 @@
 	dodoc AUTHORS CHANGELOG HACKING || die "dodoc failed"
 
 	doicon Icons/Mercator_100x100.png
-	make_desktop_entry merkaartor "Merkaartor" /usr/share/pixmaps/Mercator_100x100.png "Science;Geoscience"
+	make_desktop_entry merkaartor "Merkaartor" /usr/share/pixmaps/Merkaartor_100x100.png "Science;Geoscience"
 }