Changed to use GAMES_CHECK_LICENSE and removed redundant pkg_setup. Also cleaned up after epkgmove.

Package-Manager: portage-2.1_pre7-r5

3 files changed, 20 insertions, 24 deletions

diff --git a/games-fps/postal2mp-demo/ChangeLog b/games-fps/postal2mp-demo/ChangeLog
index 16b30f08f23a..b3cfe19602db 100644
--- a/games-fps/postal2mp-demo/ChangeLog
+++ b/games-fps/postal2mp-demo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/postal2mpdemo
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/postal2mp-demo/ChangeLog,v 1.1 2006/04/13 20:47:24 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/postal2mp-demo/ChangeLog,v 1.2 2006/04/13 21:03:58 wolf31o2 Exp $
+
+  13 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  postal2mp-demo-1407.ebuild:
+  Changed to use GAMES_CHECK_LICENSE and removed redundant pkg_setup. Also
+  cleaned up after epkgmove.
 
 *postal2mp-demo-1407 (13 Apr 2006)
 
diff --git a/games-fps/postal2mp-demo/Manifest b/games-fps/postal2mp-demo/Manifest
index a89b648fdea2..e807afc02f35 100644
--- a/games-fps/postal2mp-demo/Manifest
+++ b/games-fps/postal2mp-demo/Manifest
@@ -1,15 +1,12 @@
-MD5 d6237b26a78ab4bd03b6fd926ba307c5 .postal2mp-demo-1407.ebuild.swp 12288
-RMD160 b6c0f7c78a9299f8027c578766a41aa47cf1bb8b .postal2mp-demo-1407.ebuild.swp 12288
-SHA256 d3f2c403734c2c66a50bda084c08fc1dd09b7ded301ec9af2d7046daf6247352 .postal2mp-demo-1407.ebuild.swp 12288
-MD5 4cae83ea72654171b189d29005448428 ChangeLog 1991
-RMD160 dccdb2422e0d9e19128de1328e307309706a71b6 ChangeLog 1991
-SHA256 669d41ba969432e4f99e4c345570399d34112294a3b330f1803fb786dfd2d715 ChangeLog 1991
+MD5 3342f3b7ebe31aacd0167bbb662ad910 ChangeLog 2180
+RMD160 a3707fd25d62de2867b561a427af3d229ae5cab0 ChangeLog 2180
+SHA256 377d9ccbe7f46d573908b58df08ee27d36f2dfa6aa599fb63c2c0646c9cfd0da ChangeLog 2180
 MD5 95f9a8e33b8f5731f8b4b59684b4a570 files/digest-postal2mp-demo-1407 280
 RMD160 1ceda605f0bbbc8849160c9eb4ce542de03d0991 files/digest-postal2mp-demo-1407 280
 SHA256 8df6f2af2ee0d31f2f40a970acded4497b6bd3de11984ba4616b90d6c8d4053e files/digest-postal2mp-demo-1407 280
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 f58f4fe4e5f407b0e961043ec53e9516 postal2mp-demo-1407.ebuild 1489
-RMD160 15bd384185334534cb2e188b16a338945ce51081 postal2mp-demo-1407.ebuild 1489
-SHA256 f84fb186cd65b70cd5d1d8d3d575ed1c4711bd732e6518256f11bc85c25b7d7f postal2mp-demo-1407.ebuild 1489
+MD5 47d7e0bc8913b6d62c6ce241285f39ad postal2mp-demo-1407.ebuild 1468
+RMD160 98d91f45dcbd16d50921e08a209e6b80cd484be1 postal2mp-demo-1407.ebuild 1468
+SHA256 3a7ce4887a90eeb38b40724f8c32fd98f4167f19650d2e053fb6eb92fe0d2c71 postal2mp-demo-1407.ebuild 1468
diff --git a/games-fps/postal2mp-demo/postal2mp-demo-1407.ebuild b/games-fps/postal2mp-demo/postal2mp-demo-1407.ebuild
index a8a21fb9c4f9..356d0da4501c 100644
--- a/games-fps/postal2mp-demo/postal2mp-demo-1407.ebuild
+++ b/games-fps/postal2mp-demo/postal2mp-demo-1407.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/postal2mp-demo/postal2mp-demo-1407.ebuild,v 1.1 2006/04/13 20:47:24 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/postal2mp-demo/postal2mp-demo-1407.ebuild,v 1.2 2006/04/13 21:03:58 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -19,39 +19,33 @@ RDEPEND="|| ( x11-libs/libXext
 	amd64? (
 		app-emulation/emul-linux-x86-baselibs
 		app-emulation/emul-linux-x86-xlibs
-		>=media-video/nvidia-glx-1.0.6629-r3
-	)"
+		>=media-video/nvidia-glx-1.0.6629-r3 )"
 
 S="${WORKDIR}"
+
+GAMES_CHECK_LICENSE="yes"
 dir="${GAMES_PREFIX_OPT}/${PN}"
 Ddir="${D}/${dir}"
 
-pkg_setup() {
-	check_license postal2
-	games_pkg_setup
-}
-
 src_unpack() {
 	unpack ${A}
 	unpack_makeself postal2mpdemo-lnx-${PV}.run
 	rm postal2mpdemo-lnx-${PV}.run
-}
-
-src_install() {
 	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"
+}
 
+src_install() {
 	insinto ${dir}
 	doins README.linux postal2mpdemo.xpm postal2mpdemo_eula.txt
 
 	exeinto ${dir}
 	doexe bin/postal2mpdemo || die "doexe failed"
 	dodir "${GAMES_BINDIR}"
-	dosym "${dir}/postal2mpdemo" "${GAMES_BINDIR}/postal2mpdemo"
+	dosym "${dir}/postal2mpdemo" "${GAMES_BINDIR}/postal2mp-demo"
 
-	doicon postal2mpdemo.xpm
+	newicon postal2mpdemo.xpm ${PN}.xpm
 	make_desktop_entry ${PN} "Postal 2: Share the Pain (Demo)" ${PN}.xpm
 
 	prepgamesdirs