--- /usr/portage/games-fps/postal2mp-demo/postal2mp-demo-1407.ebuild	2006-07-07 20:35:49.000000000 +0100
+++ postal2mp-demo-1407.ebuild	2006-07-11 23:35:56.000000000 +0100
@@ -5,14 +5,14 @@
 inherit eutils games
 
 DESCRIPTION="You play the Postal Dude: POSTAL 2 is only as violent as you are."
-HOMEPAGE="http://www.gopostal.com/home/"
+HOMEPAGE="http://www.gopostal.com/"
 SRC_URI="mirror://3dgamers/postal2/Missions/postal2mpdemo-lnx-${PV}.tar.bz2"
 
 LICENSE="postal2"
 SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE=""
-RESTRICT="mirror"
+RESTRICT="mirror strip"
 
 RDEPEND="|| ( x11-libs/libXext
 			  virtual/x11 )
@@ -26,32 +26,28 @@
 			x11-drivers/nvidia-legacy-drivers
 			>=x11-drivers/ati-drivers-8.8.25-r1 ) )"
 
-S="${WORKDIR}"
+S=${WORKDIR}
 
 GAMES_CHECK_LICENSE="yes"
-dir="${GAMES_PREFIX_OPT}/${PN}"
-Ddir="${D}/${dir}"
+dir=${GAMES_PREFIX_OPT}/${PN}
 
 src_unpack() {
 	unpack ${A}
-	unpack_makeself postal2mpdemo-lnx-${PV}.run
-	rm postal2mpdemo-lnx-${PV}.run
-	dodir ${dir}
-	tar -xf postal2mpdemo.tar -C ${Ddir}/ || die "failed unpacking postal2mpdemo.tar"
-	tar -xf linux-specific.tar -C ${Ddir}/ || die "failed unpacking linux-specific.tar"
+	unpack_makeself postal2mpdemo-lnx-${PV}.run && rm $_
+	unpack ./postal2mpdemo.tar && rm $_
+	unpack ./linux-specific.tar && rm $_
+	rm -r bin setup* System/*.log
 }
 
 src_install() {
-	insinto ${dir}
-	doins README.linux postal2mpdemo.xpm postal2mpdemo_eula.txt
+	insinto "${dir}"
+	doins -r * || die "doins failed"
 
-	exeinto ${dir}
-	doexe bin/postal2mpdemo || die "doexe failed"
-	dodir "${GAMES_BINDIR}"
-	dosym "${dir}/postal2mpdemo" "${GAMES_BINDIR}/postal2mp-demo"
+	games_make_wrapper ${PN} ./postal2-bin "${dir}"/System
 
 	newicon postal2mpdemo.xpm ${PN}.xpm
 	make_desktop_entry ${PN} "Postal 2: Share the Pain (Demo)" ${PN}.xpm
 
+	fperms 750 "${dir}"/System/{postal2,ucc}-bin
 	prepgamesdirs
 }