Removing sof script and changing to use games_make_wrapper. Added loki_patch dependency. General code cleanup.

Package-Manager: portage-2.0.51.21

4 files changed, 22 insertions, 25 deletions

diff --git a/games-fps/soldieroffortune/ChangeLog b/games-fps/soldieroffortune/ChangeLog
index 0dcc07fe5644..24343f379d9f 100644
--- a/games-fps/soldieroffortune/ChangeLog
+++ b/games-fps/soldieroffortune/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/soldieroffortune
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/ChangeLog,v 1.8 2005/03/07 13:55:38 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/ChangeLog,v 1.9 2005/05/04 13:07:07 wolf31o2 Exp $
+
+  04 May 2005; Chris Gianelloni <wolf31o2@gentoo.org> -files/sof,
+  soldieroffortune-1.06a.ebuild:
+  Removing sof script and changing to use games_make_wrapper. Added loki_patch
+  dependency. General code cleanup.
 
   07 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   soldieroffortune-1.06a.ebuild:
diff --git a/games-fps/soldieroffortune/Manifest b/games-fps/soldieroffortune/Manifest
index 6d0084b5c1ae..ad752c780a4c 100644
--- a/games-fps/soldieroffortune/Manifest
+++ b/games-fps/soldieroffortune/Manifest
@@ -1,5 +1,4 @@
-MD5 76a2880cec66d8b07e15cb23f1221169 soldieroffortune-1.06a.ebuild 1962
-MD5 f135a590fda822e43fa341859cca31a1 ChangeLog 1114
+MD5 f92885dc0bc45e8ab04c24edcb8ab9c4 soldieroffortune-1.06a.ebuild 1846
+MD5 84c6fbb816f073d5557438ad36a67bb1 ChangeLog 1329
 MD5 e055f0cedd35a8ca9240ec727e52acf2 metadata.xml 968
-MD5 58f9b2124d72bc96aa6f6867cf4e9e61 files/sof 38
 MD5 428261b94ec1355a846a1797056c894c files/digest-soldieroffortune-1.06a 70
diff --git a/games-fps/soldieroffortune/files/sof b/games-fps/soldieroffortune/files/sof
deleted file mode 100644
index 7f83b44bbdc4..000000000000
--- a/games-fps/soldieroffortune/files/sof
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd GENTOO_DIR
-exec ./sof $*
diff --git a/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild b/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild
index 513a52e96c2f..82785216b4cb 100644
--- a/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild
+++ b/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild,v 1.9 2005/03/07 13:55:38 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/soldieroffortune/soldieroffortune-1.06a.ebuild,v 1.10 2005/05/04 13:07:07 wolf31o2 Exp $
 
 inherit games
 
-DESCRIPTION="Soldier of Fortune - First-person shooter based on the mercenary trade"
+DESCRIPTION="First-person shooter based on the mercenary trade"
 HOMEPAGE="http://www.lokigames.com/products/sof/"
 SRC_URI="ftp://ftp.planetmirror.com/pub/lokigames/updates/sof/sof-${PV}-cdrom-x86.run
 	ftp://snuffleupagus.animearchive.org/loki/updates/sof/sof-${PV}-cdrom-x86.run"
@@ -15,9 +15,9 @@ KEYWORDS="x86"
 RESTRICT="nostrip"
 IUSE=""
 
-DEPEND="virtual/libc"
-RDEPEND="${DEPEND}
-	virtual/opengl"
+DEPEND="virtual/libc
+	games-util/loki_patch"
+RDEPEND="virtual/opengl"
 
 S=${WORKDIR}
 
@@ -40,28 +40,24 @@ src_install() {
 	exeinto ${dir}
 	doexe ${CDROM_ROOT}/bin/x86/glibc-2.1/sof
 	insinto ${dir}
+	doins ${CDROM_ROOT}/{README,kver.pub,sof.xpm}
 
-	cp ${CDROM_ROOT}/{README,kver.pub,sof.xpm} ${Ddir}
-
-	cd ${Ddir}
-
-	tar xzf ${CDROM_ROOT}/paks.tar.gz || die "uncompressing data"
-	tar xzf ${CDROM_ROOT}/binaries.tar.gz || die "uncompressing binaries"
+	tar xzf ${CDROM_ROOT}/paks.tar.gz -C ${Ddir} \
+		|| die "uncompressing data"
+	tar xzf ${CDROM_ROOT}/binaries.tar.gz -C ${Ddir} \
+		|| die "uncompressing binaries"
 
 	cd ${S}
-	bin/Linux/x86/loki_patch --verify patch.dat
-	bin/Linux/x86/loki_patch patch.dat ${Ddir} >& /dev/null || die "patching"
+	loki_patch --verify patch.dat
+	loki_patch patch.dat ${Ddir} >& /dev/null || die "patching"
 
 	# now, since these files are coming off a cd, the times/sizes/md5sums wont
 	# be different ... that means portage will try to unmerge some files (!)
 	# we run touch on ${D} so as to make sure portage doesnt do any such thing
 	find ${Ddir} -exec touch '{}' \;
 
-	dodir ${GAMES_BINDIR}
-	dogamesbin ${FILESDIR}/sof
-	dosed "s:GENTOO_DIR:${dir}:" ${GAMES_BINDIR}/sof
-	insinto /usr/share/pixmaps
-	doins ${CDROM_ROOT}/sof.xpm
+	games_make_wrapper sof ./sof ${dir}
+	doicon ${CDROM_ROOT}/sof.xpm
 
 	prepgamesdirs
 	make_desktop_entry sof "Soldier of Fortune" sof.xpm