Added SRC_URI for 1.4-full version to pull in the GOTY maps.

8 files changed, 25 insertions, 36 deletions

diff --git a/games-fps/rtcw/ChangeLog b/games-fps/rtcw/ChangeLog
index a58f73fb3a21..4ad5e8c100f7 100644
--- a/games-fps/rtcw/ChangeLog
+++ b/games-fps/rtcw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/rtcw
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcw/ChangeLog,v 1.14 2004/07/01 11:17:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcw/ChangeLog,v 1.15 2004/07/13 15:22:19 wolf31o2 Exp $
+
+*rtcw-1.41-r1 (13 Jul 2004)
+
+  13 Jul 2004; Chris Gianelloni <wolf31o2@gentoo.org> -files/wolf,
+  -files/wolf-ded, -files/wolfsp, +rtcw-1.41-r1.ebuild, -rtcw-1.41.ebuild:
+  Added SRC_URI for 1.4-full version to pull in the GOTY maps.
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> rtcw-1.41.ebuild:
   virtual/glibc -> virtual/libc
diff --git a/games-fps/rtcw/Manifest b/games-fps/rtcw/Manifest
index cd30623d9601..043b9f1442b1 100644
--- a/games-fps/rtcw/Manifest
+++ b/games-fps/rtcw/Manifest
@@ -1,8 +1,5 @@
-MD5 fe9cb9001f479fff4ed28eee10364ecf ChangeLog 2442
+MD5 ea1c6093545ed03e5d9218c28897dd5a rtcw-1.41-r1.ebuild 2481
+MD5 8f3a09c979f1b96c3ffa1d95a919c247 ChangeLog 2675
 MD5 1a77de647b19faf58f4561b4b22e675d metadata.xml 1053
-MD5 186b765109d07bcf05832889893417f3 rtcw-1.41.ebuild 2544
-MD5 a2322c3035847b2aa159fd3296181296 files/digest-rtcw-1.41 71
-MD5 d2276d598779fa002d6432a5155c0e51 files/wolf 45
-MD5 4a1d56772b4785b78b72797a2aa67167 files/wolf-ded 46
-MD5 51ab952676cc3382535c481247d808a5 files/wolf-ded.rc 582
-MD5 0c659dcd63e884a6b2d7b030e25424c1 files/wolfsp 47
+MD5 25b7486541e3311209ee1f10511aac37 files/wolf-ded.rc 583
+MD5 cad536776a9823b9aa825b7bc95ad2ab files/digest-rtcw-1.41-r1 145
diff --git a/games-fps/rtcw/files/digest-rtcw-1.41 b/games-fps/rtcw/files/digest-rtcw-1.41
deleted file mode 100644
index e7e02cb19228..000000000000
--- a/games-fps/rtcw/files/digest-rtcw-1.41
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1db2a23a9548c8d84c8f9dbe87963842 wolf-linux-1.41-3.x86.run 8513720
diff --git a/games-fps/rtcw/files/digest-rtcw-1.41-r1 b/games-fps/rtcw/files/digest-rtcw-1.41-r1
new file mode 100644
index 000000000000..b2c0e44a8c45
--- /dev/null
+++ b/games-fps/rtcw/files/digest-rtcw-1.41-r1
@@ -0,0 +1,2 @@
+MD5 87c3ebf106b107b60b472863aeec20c4 wolf-linux-1.4-full.x86.run 73536309
+MD5 1db2a23a9548c8d84c8f9dbe87963842 wolf-linux-1.41-3.x86.run 8513720
diff --git a/games-fps/rtcw/files/wolf b/games-fps/rtcw/files/wolf
deleted file mode 100644
index 5f9265dfa3da..000000000000
--- a/games-fps/rtcw/files/wolf
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd GENTOO_DIR
-exec ./wolf.x86 "$@"
diff --git a/games-fps/rtcw/files/wolf-ded b/games-fps/rtcw/files/wolf-ded
deleted file mode 100644
index fafa1c464703..000000000000
--- a/games-fps/rtcw/files/wolf-ded
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd GENTOO_DIR
-exec ./wolfded.x86 $*
diff --git a/games-fps/rtcw/files/wolfsp b/games-fps/rtcw/files/wolfsp
deleted file mode 100644
index 493206713ce6..000000000000
--- a/games-fps/rtcw/files/wolfsp
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd GENTOO_DIR
-exec ./wolfsp.x86 "$@"
diff --git a/games-fps/rtcw/rtcw-1.41.ebuild b/games-fps/rtcw/rtcw-1.41-r1.ebuild
index b023afb847d6..1e2a721f6f26 100644
--- a/games-fps/rtcw/rtcw-1.41.ebuild
+++ b/games-fps/rtcw/rtcw-1.41-r1.ebuild
@@ -1,13 +1,16 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcw/rtcw-1.41.ebuild,v 1.17 2004/07/01 11:17:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcw/rtcw-1.41-r1.ebuild,v 1.1 2004/07/13 15:22:19 wolf31o2 Exp $
 
 inherit games
 
 DESCRIPTION="Return to Castle Wolfenstein - Long awaited sequel to Wolfenstein 3D"
 HOMEPAGE="http://games.activision.com/games/wolfenstein/"
-SRC_URI="ftp://ftp.idsoftware.com/idstuff/wolf/linux/wolf-linux-1.41-3.x86.run
-	ftp://3dgamers.in-span.net/pub/3dgamers4/games/returnwolfenstein/wolf-linux-1.41-3.x86.run"
+SRC_URI="mirror://3dgamers/pub/3dgamers5/games/returnwolfenstein/wolf-linux-1.4-full.x86.run
+	mirror://3dgamers/pub/3dgamers/games/returnwolfenstein/wolf-linux-1.4-full.x86.run
+	ftp://ftp.idsoftware.com/idstuff/wolf/linux/wolf-linux-1.41-3.x86.run
+	mirror://3dgamers/pub/3dgamers5/games/returnwolfenstein/wolf-linux-1.41-3.x86.run
+	mirror://3dgamers/pub/3dgamers/games/returnwolfenstein/wolf-linux-1.41-3.x86.run"
 
 LICENSE="RTCW"
 SLOT="0"
@@ -28,7 +31,8 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack_makeself ${A}
+	unpack_makeself wolf-linux-1.4-full.x86.run
+	unpack_makeself wolf-linux-1.41-3.x86.run
 }
 
 src_install() {
@@ -39,23 +43,13 @@ src_install() {
 
 	exeinto ${dir}
 	doexe bin/Linux/x86/*.x86 openurl.sh
-	if use dedicated;
-	then
-		doexe ${FILESDIR}/wolf-ded
-		dosed "s:GENTOO_DIR:${dir}:" ${dir}/wolf-ded
-		dogamesbin ${FILESDIR}/wolf-ded
-		dosed "s:GENTOO_DIR:${dir}:" ${GAMES_BINDIR}/wolf-ded
-	fi
-	dogamesbin ${FILESDIR}/wolf ${FILESDIR}/wolfsp
-	dosed "s:GENTOO_DIR:${dir}:" ${GAMES_BINDIR}/wolf
-	dosed "s:GENTOO_DIR:${dir}:" ${GAMES_BINDIR}/wolfsp
+
+	games_make_wrapper wolf ./wolf.x86 ${dir}
+	games_make_wrapper wolfsp ./wolfsp.x86 ${dir}
 
 	if use dedicated;
 	then
-		doexe ${FILESDIR}/wolf-ded
-		dosed "s:GENTOO_DIR:${dir}:" ${dir}/wolf-ded
-		dogamesbin ${FILESDIR}/wolf-ded
-		dosed "s:GENTOO_DIR:${dir}:" ${GAMES_BINDIR}/wolf-ded
+		games_make_wrapper wolf-ded ./wolfded.x86 ${dir}
 		exeinto /etc/init.d
 		newexe ${FILESDIR}/wolf-ded.rc wolf-ded
 		dosed "s:GENTOO_DIR:${dir}:" /etc/init.d/wolf-ded