Change to use more built-in functions and to be a little cleaner.

Package-Manager: portage-2.1.4.4

5 files changed, 15 insertions, 29 deletions

diff --git a/games-fps/quake3-demo/ChangeLog b/games-fps/quake3-demo/ChangeLog
index 1a03379de3a4..28c9b5b12432 100644
--- a/games-fps/quake3-demo/ChangeLog
+++ b/games-fps/quake3-demo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/quake3-demo
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-demo/ChangeLog,v 1.20 2008/02/15 01:09:40 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-demo/ChangeLog,v 1.21 2008/03/04 01:18:09 wolf31o2 Exp $
+
+  04 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> -files/q3demo,
+  -files/q3demo-ded, quake3-demo-1.11.ebuild:
+  Change to use more built-in functions and to be a little cleaner.
 
   15 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   quake3-demo-1.11.ebuild:
diff --git a/games-fps/quake3-demo/Manifest b/games-fps/quake3-demo/Manifest
index 8f4b7fa3e497..8e004469b630 100644
--- a/games-fps/quake3-demo/Manifest
+++ b/games-fps/quake3-demo/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX q3demo 49 RMD160 6aeb62690024d442ab42ac2175a057823e38f7f8 SHA1 e73705206100a43c3d1b839692e6a02f97d0db2b SHA256 b53f3cb349e3511a986ede95d2a444c3ecf28424698a6475441fc51a127affd6
-AUX q3demo-ded 48 RMD160 778d20fd5bb41c267ee9e2ff3dd9e2d8b70dc285 SHA1 95dd276a939ee7bb4dd26625f8bb640fa192673e SHA256 ae86df3620d7c1e840c2f25be1ccb6a1e8a8d551672038a298a042cccca619d2
 DIST linuxq3ademo-1.11-6.x86.gz.sh 49289300 RMD160 4ec58cbf23c94003cdfe7e8f8c50ef5b8f8e8aff SHA1 7d305eed3fc896c874697278ec0fb746690e04d0 SHA256 64dee3f69b6e792d1da4fe0ac98fedc7eb1e37ea1027fb609a9fadd06150a4ec
-EBUILD quake3-demo-1.11.ebuild 1958 RMD160 f70ed883cfdd8257503eefc883bea92a58a57b35 SHA1 faa94c5839844fddbcdb999992830c7d8f633cf3 SHA256 4ec9e4e4147ee0ab055a3b3970a389668b61b32d9e820bdeb094a8fb26b3e374
-MISC ChangeLog 2804 RMD160 735e0750cbafc870ccdf9869233724e556ce8ff4 SHA1 1fbb597917dde45dc931026aa3e6aea21e6dbbaf SHA256 0f28c516de5895eeed14c4aab8c52815bd942b5c3cf629d1791d76905af1f8e8
+EBUILD quake3-demo-1.11.ebuild 1648 RMD160 ea698e575c256e824d774c3437f842af0ab4498c SHA1 0ea311b23184d3a263db898a7d9db63ccce97b57 SHA256 866644a24ccbfdbb8a3f240da572929dc5de56a63f2ee75a58913fb3c93d2663
+MISC ChangeLog 2988 RMD160 35a9336311a6a67e154b0de29c85f478bcf6d158 SHA1 10366f98c4ba5b2bfe0ce8463f64f9055b2d42e8 SHA256 bb5cefdf2b53a95f8f2f8dce06c4e4726fc48202482195597de15fe40300ae96
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHtOZXkT4lNIS36YERAtknAKCsaalS/hqAuS+1p7bnxQTO+cvGdQCdGFjL
-iKtmwQIuEDYBp88HZ+yJu1Y=
-=nNb7
+iD8DBQFHzKNRkT4lNIS36YERAol0AJ9nBRuf5SGnBkgIg6JvbYosw6/IBwCfcPn9
+OFpCPK+Isf/6NMZVIL9V2W8=
+=V77D
 -----END PGP SIGNATURE-----
diff --git a/games-fps/quake3-demo/files/q3demo b/games-fps/quake3-demo/files/q3demo
deleted file mode 100644
index 0e3d78b5cfa1..000000000000
--- a/games-fps/quake3-demo/files/q3demo
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd GENTOO_DIR
-exec ./q3demo.x86 "${@}"
diff --git a/games-fps/quake3-demo/files/q3demo-ded b/games-fps/quake3-demo/files/q3demo-ded
deleted file mode 100644
index e0b82394ebbc..000000000000
--- a/games-fps/quake3-demo/files/q3demo-ded
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd GENTOO_DIR
-exec ./q3ded.x86 "${@}"
diff --git a/games-fps/quake3-demo/quake3-demo-1.11.ebuild b/games-fps/quake3-demo/quake3-demo-1.11.ebuild
index a7f4e432a5f1..6a27d4e5a9bb 100644
--- a/games-fps/quake3-demo/quake3-demo-1.11.ebuild
+++ b/games-fps/quake3-demo/quake3-demo-1.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-demo/quake3-demo-1.11.ebuild,v 1.24 2008/02/15 01:09:40 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-demo/quake3-demo-1.11.ebuild,v 1.25 2008/03/04 01:18:09 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -46,26 +46,16 @@ src_unpack() {
 }
 
 src_install() {
-	dodir "${dir}"
-
-	cp -rf Help "${Ddir}"
-	cp -rf demoq3 "${Ddir}"
+	insinto "${dir}"
+	doins -r Help demoq3
+	doins README icon.*
 
 	exeinto "${dir}"
 	newexe bin/x86/glibc-2.0/q3ded q3ded.x86
 	newexe bin/x86/glibc-2.0/q3demo q3demo.x86
 	use 3dfx && doexe bin/x86/glibc-2.0/libMesaVoodooGL.so*
-	#use opengl && dosym /usr/lib/libGL.so "${dir}"/libGL.so
 
-	doexe "${FILESDIR}"/{q3demo,q3demo-ded}
-	dodir "${GAMES_BINDIR}"
-	dosym "${dir}"/q3demo "${GAMES_BINDIR}"/q3demo
-	dosym "${dir}"/q3demo-ded "${GAMES_BINDIR}"/q3demo-ded
-	dosed "s:GENTOO_DIR:${dir}:" "${dir}"/q3demo
-	dosed "s:GENTOO_DIR:${dir}:" "${dir}"/q3demo-ded
-
-	insinto "${dir}"
-	doins README icon.*
+	games_make_wrapper q3demo ./q3demo.x86 "${dir}" "${dir}"
 
 	make_desktop_entry q3demo "Quake III (Demo)"