Changed to use separate GOTY map pack and patch downloads and closing bug #57305.

5 files changed, 105 insertions, 7 deletions

diff --git a/games-fps/rtcw/ChangeLog b/games-fps/rtcw/ChangeLog
index 4ad5e8c100f7..d857554fbcd5 100644
--- a/games-fps/rtcw/ChangeLog
+++ b/games-fps/rtcw/ChangeLog
@@ -1,6 +1,13 @@
 # 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.15 2004/07/13 15:22:19 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcw/ChangeLog,v 1.16 2004/08/22 17:50:19 wolf31o2 Exp $
+
+*rtcw-1.41-r2 (22 Aug 2004)
+
+  22 Aug 2004; Chris Gianelloni <wolf31o2@gentoo.org> rtcw-1.41-r1.ebuild,
+  +rtcw-1.41-r2.ebuild:
+  Changed to use separate GOTY map pack and patch downloads and closing bug
+  #57305.
 
 *rtcw-1.41-r1 (13 Jul 2004)
 
diff --git a/games-fps/rtcw/Manifest b/games-fps/rtcw/Manifest
index 70e56f4e22d5..0c571575ce02 100644
--- a/games-fps/rtcw/Manifest
+++ b/games-fps/rtcw/Manifest
@@ -1,5 +1,7 @@
-MD5 ea1c6093545ed03e5d9218c28897dd5a rtcw-1.41-r1.ebuild 2481
-MD5 8f3a09c979f1b96c3ffa1d95a919c247 ChangeLog 2675
+MD5 900f9968a8116f30562baa646a546c66 rtcw-1.41-r2.ebuild 2438
+MD5 0761f2facd930b9ab342993bc89a5625 rtcw-1.41-r1.ebuild 2484
+MD5 a375cbbfee0729291097f0e734bdbbf0 ChangeLog 2890
 MD5 1a77de647b19faf58f4561b4b22e675d metadata.xml 1053
 MD5 43f96538b54fb407adb6bbc3b30c207c files/wolf-ded.rc 574
 MD5 cad536776a9823b9aa825b7bc95ad2ab files/digest-rtcw-1.41-r1 145
+MD5 67696ed676f68f2946a0e7d392886af4 files/digest-rtcw-1.41-r2 146
diff --git a/games-fps/rtcw/files/digest-rtcw-1.41-r2 b/games-fps/rtcw/files/digest-rtcw-1.41-r2
new file mode 100644
index 000000000000..11fd80d48ce3
--- /dev/null
+++ b/games-fps/rtcw/files/digest-rtcw-1.41-r2
@@ -0,0 +1,2 @@
+MD5 9e3d7a7432d80e9b45b192ce51554608 wolf-linux-goty-maps.x86.run 51930759
+MD5 1db2a23a9548c8d84c8f9dbe87963842 wolf-linux-1.41-3.x86.run 8513720
diff --git a/games-fps/rtcw/rtcw-1.41-r1.ebuild b/games-fps/rtcw/rtcw-1.41-r1.ebuild
index 1e2a721f6f26..6ecac96fff91 100644
--- a/games-fps/rtcw/rtcw-1.41-r1.ebuild
+++ b/games-fps/rtcw/rtcw-1.41-r1.ebuild
@@ -1,13 +1,13 @@
 # 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-r1.ebuild,v 1.1 2004/07/13 15:22:19 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcw/rtcw-1.41-r1.ebuild,v 1.2 2004/08/22 17:50: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="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
+SRC_URI="mirror://3dgamers/pub/3dgamers5/games/returnwolfenstein/wolf-linux-goty-maps.x86.run
+	mirror://3dgamers/pub/3dgamers/games/returnwolfenstein/wolf-linux-goty-maps.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"
@@ -31,7 +31,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack_makeself wolf-linux-1.4-full.x86.run
+	unpack_makeself wolf-linux-goty-maps.x86.run
 	unpack_makeself wolf-linux-1.41-3.x86.run
 }
 
diff --git a/games-fps/rtcw/rtcw-1.41-r2.ebuild b/games-fps/rtcw/rtcw-1.41-r2.ebuild
new file mode 100644
index 000000000000..ec462b378e8d
--- /dev/null
+++ b/games-fps/rtcw/rtcw-1.41-r2.ebuild
@@ -0,0 +1,87 @@
+# 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-r2.ebuild,v 1.1 2004/08/22 17:50: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="mirror://3dgamers/pub/3dgamers5/games/returnwolfenstein/Missions/wolf-linux-goty-maps.x86.run
+	mirror://3dgamers/pub/3dgamers/games/returnwolfenstein/Missions/wolf-linux-goty-maps.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"
+KEYWORDS="~x86"
+IUSE="opengl dedicated"
+RESTRICT="nostrip nomirror"
+
+DEPEND="virtual/libc"
+RDEPEND="dedicated? ( app-misc/screen )
+	!dedicated? ( virtual/opengl )
+	opengl? ( virtual/opengl )"
+
+S=${WORKDIR}
+
+dir=${GAMES_PREFIX_OPT}/${PN}
+Ddir=${D}/${dir}
+
+pkg_setup() {
+	check_license || die "License check failed"
+	games_pkg_setup
+}
+
+src_unpack() {
+	unpack_makeself wolf-linux-goty-maps.x86.run
+	unpack_makeself wolf-linux-1.41-3.x86.run
+}
+
+src_install() {
+	dodir ${dir}
+
+	cp -r main Docs pb ${Ddir}
+
+	exeinto ${dir}
+	doexe bin/Linux/x86/*.x86 openurl.sh
+
+	games_make_wrapper wolf ./wolf.x86 ${dir}
+	games_make_wrapper wolfsp ./wolfsp.x86 ${dir}
+
+	if use dedicated;
+	then
+		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
+	fi
+
+	insinto ${dir}
+	doins WolfMP.xpm WolfSP.xpm INSTALL QUICKSTART CHANGES RTCW-README-1.4.txt
+	insinto /usr/share/pixmaps
+	doins WolfMP.xpm
+
+	prepgamesdirs
+	make_desktop_entry wolf "Return to Castle Wolfenstein" WolfMP.xpm
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	einfo "You need to copy pak0.pk3, mp_pak0.pk3, mp_pak1.pk3, mp_pak2.pk3,"
+	einfo "sp_pak1.pk3 and sp_pak2.pk3 from a Window installation into ${dir}/main/"
+	echo
+	einfo "To play the game run:"
+	einfo " wolfsp (single-player)"
+	einfo " wolfmp (multi-player)"
+	if use dedicated;
+	then
+		echo
+		einfo "To start a dedicated server run:"
+		einfo " /etc/init.d/wolf-ded start"
+		echo
+		einfo "To run the dedicated server at boot, type:"
+		einfo " rc-update add wolf-ded default"
+		echo
+		einfo "The dedicated server is started under the ${GAMES_USER_DED} user account"
+	fi
+}