--- /usr/portage/games-emulation/mupen64/mupen64-0.5.ebuild	2006-01-27 23:31:55.000000000 +0000
+++ mupen64-0.5.ebuild	2006-06-24 13:19:06.000000000 +0100
@@ -13,8 +13,7 @@
 KEYWORDS="-amd64 ~x86"
 IUSE=""
 
-RDEPEND="sys-libs/zlib
-	>=x11-libs/gtk+-2
+RDEPEND=">=x11-libs/gtk+-2
 	media-libs/libsdl"
 DEPEND="${RDEPEND}
 	 dev-util/pkgconfig"
@@ -26,11 +25,13 @@
 	epatch "${FILESDIR}/${PN}-gentoo.patch"
 
 	cd "${S}"
+	rm {plugins,save}/empty
 
-	sed -i "s:#undef WITH_HOME:#define WITH_HOME \"/usr/games/\":" config.h \
-		|| die "sed failed"
+	sed -i "s:#undef WITH_HOME:#define WITH_HOME \"${GAMES_PREFIX}/\":" \
+		config.h || die "sed failed"
 
 	sed -i \
+		-e '/strip/d' \
 		-e "s:CFLAGS.*=\(.*\):CFLAGS=-fPIC ${CFLAGS}:" \
 		-e "s:CXXFLAGS.*=\(.*\):CXXFLAGS=-fPIC ${CXXFLAGS}:" \
 		Makefile \
@@ -38,43 +39,32 @@
 }
 
 src_compile() {
-	emake mupen64 || die "emake failed on $d"
-	emake mupen64_nogui || die "emake failed"
-	emake plugins/mupen64_input.so || die "emake failed"
-	emake plugins/mupen64_hle_rsp_azimer.so || die "emake failed"
-	emake plugins/dummyaudio.so || die "emake failed"
-	emake plugins/mupen64_audio.so || die "emake failed"
+	emake mupen64 && \
+	emake mupen64_nogui && \
+	emake plugins/mupen64_input.so && \
+	emake plugins/mupen64_hle_rsp_azimer.so && \
+	emake plugins/dummyaudio.so && \
+	emake plugins/mupen64_audio.so && \
 	emake plugins/mupen64_soft_gfx.so || die "emake failed"
 }
 
 src_install() {
-	local dir=${GAMES_LIBDIR}/${PN}
-
-	exeinto "${GAMES_BINDIR}"
-	doexe mupen64 || die "doexe failed"
-	doexe mupen64_nogui || die "doexe failed"
-
-	insinto "${dir}"
-	doins mupen64.ini || "doins failed"
-
-	dodir ${dir}/save
-
-	cp -r lang roms plugins "${D}/${dir}/" \
-		|| die "cp failed"
-
-	rm "${D}/${dir}/plugins/empty"
-	dodoc *.txt
-	cp doc/readme.pdf "${D}/usr/share/doc/${PF}"
+	insinto "${GAMES_LIBDIR}"/${PN}
+	doins -r ${PN}.ini lang plugins roms || die "doins failed"
+	
+	dogamesbin ${PN}{,_nogui} || die "dogamesbin failed"
+	dodoc whatsnew.txt doc/readme.pdf
 
+	dodir "${GAMES_LIBDIR}"/${PN}/save
 	prepgamesdirs
 }
 
 pkg_postinst() {
 	games_pkg_postinst
 	echo
-	ewarn "If you are upgrading from previous version of mupen64"
-	ewarn "backup your saved games then do a rm -rf on your"
-	ewarn ".mupen64 directory. After launching then new mupen copy"
-	ewarn "your saved games to the original place."
+	ewarn "If you are upgrading from a previous version of mupen64,"
+	ewarn "backup your saved games then run rm -rf on your"
+	ewarn ".mupen64 directory. After launching the new version, copy"
+	ewarn "your saved games to their original place."
 	echo
 }