--- /usr/portage/games-fps/quake4-bin/quake4-bin-1.4.2.ebuild	2007-08-20 19:36:09.000000000 +0200
+++ /usr/local/portage/games-fps/quake4-bin/quake4-bin-1.4.2.ebuild	2008-01-11 21:17:59.000000000 +0100
@@ -6,7 +6,8 @@
 
 DESCRIPTION="Sequel to Quake 2, an id Software 3D first-person shooter"
 HOMEPAGE="http://www.quake4game.com/"
-SRC_URI="mirror://idsoftware/quake4/linux/quake4-linux-${PV}.x86.run"
+SRC_URI="mirror://idsoftware/quake4/linux/quake4-linux-${PV}.x86.run
+	http://wayofthemonkey.com/hicolor/48x48/apps/quake4.png"
 
 LICENSE="QUAKE4"
 SLOT="0"
@@ -66,7 +67,8 @@
 }
 
 src_unpack() {
-	unpack_makeself ${A}
+
+	unpack_makeself quake4-linux-${PV}.x86.run
 
 	mv q4icon.bmp quake4.bmp || die
 
@@ -106,13 +108,13 @@
 	fi
 
 	if use opengl || ! use dedicated ; then
-		doicon quake4.bmp || die "doicon"
+		doicon ${DISTDIR}/quake4.png || die "doicon failed"
 		games_make_wrapper quake4 "./quake4.x86" "${dir}" "${dir}"
 		games_make_wrapper quake4-smp ./quake4smp.x86 "${dir}" "${dir}"
 #		doicon ${FILESDIR}/quake4.png || die "copying icon"
 #		make_desktop_entry quake4 "Quake IV" quake4.png
 #		make_desktop_entry quake4-smp "Quake IV (SMP)" quake4.png
-		make_desktop_entry quake4 "Quake IV" /usr/share/pixmaps/quake4.bmp
+		make_desktop_entry quake4 "Quake IV" quake4
 	fi
 
 	prepgamesdirs