Fixed output and made ebuild create 2 .desktop entries.

5 files changed, 13 insertions, 98 deletions

diff --git a/games-fps/rtcw/ChangeLog b/games-fps/rtcw/ChangeLog
index 15f406387551..cfadbcb992e2 100644
--- a/games-fps/rtcw/ChangeLog
+++ b/games-fps/rtcw/ChangeLog
@@ -1,6 +1,10 @@
 # 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.17 2004/09/20 03:53:13 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcw/ChangeLog,v 1.18 2004/12/30 20:28:19 wolf31o2 Exp $
+
+  30 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org> -rtcw-1.41-r1.ebuild,
+  rtcw-1.41-r2.ebuild:
+  Fixed output and made ebuild create 2 .desktop entries.
 
   19 Sep 2004; Travis Tilley <lv@gentoo.org> rtcw-1.41-r2.ebuild:
   added ~amd64 keyword
diff --git a/games-fps/rtcw/Manifest b/games-fps/rtcw/Manifest
index 52bf370305e4..e06c36f4e091 100644
--- a/games-fps/rtcw/Manifest
+++ b/games-fps/rtcw/Manifest
@@ -1,7 +1,5 @@
-MD5 917ee20a0bb3d303c69ebec7ef2a367d ChangeLog 2974
+MD5 8f8014c65b84aadf4a6f600a81f16a21 ChangeLog 3138
 MD5 1a77de647b19faf58f4561b4b22e675d metadata.xml 1053
-MD5 0761f2facd930b9ab342993bc89a5625 rtcw-1.41-r1.ebuild 2484
-MD5 1c35f4a877d06703e848ebbec7c0142f rtcw-1.41-r2.ebuild 2486
+MD5 cae0b7e57850a676a0b741d34590df90 rtcw-1.41-r2.ebuild 2584
 MD5 67696ed676f68f2946a0e7d392886af4 files/digest-rtcw-1.41-r2 146
 MD5 43f96538b54fb407adb6bbc3b30c207c files/wolf-ded.rc 574
-MD5 67696ed676f68f2946a0e7d392886af4 files/digest-rtcw-1.41-r1 146
diff --git a/games-fps/rtcw/files/digest-rtcw-1.41-r1 b/games-fps/rtcw/files/digest-rtcw-1.41-r1
deleted file mode 100644
index 11fd80d48ce3..000000000000
--- a/games-fps/rtcw/files/digest-rtcw-1.41-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 6ecac96fff91..000000000000
--- a/games-fps/rtcw/rtcw-1.41-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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.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-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"
-
-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}
-
-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() {
-	local dir=${GAMES_PREFIX_OPT}/${PN}
-	dodir ${dir}
-
-	cp -r main Docs pb ${D}/${dir}/
-
-	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
-}
diff --git a/games-fps/rtcw/rtcw-1.41-r2.ebuild b/games-fps/rtcw/rtcw-1.41-r2.ebuild
index 244c2cb22650..2e8471affbe8 100644
--- a/games-fps/rtcw/rtcw-1.41-r2.ebuild
+++ b/games-fps/rtcw/rtcw-1.41-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2004/09/20 03:53:13 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcw/rtcw-1.41-r2.ebuild,v 1.3 2004/12/30 20:28:19 wolf31o2 Exp $
 
 inherit games
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://3dgamers/pub/3dgamers5/games/returnwolfenstein/Missions/wolf-l
 
 LICENSE="RTCW"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 IUSE="opengl dedicated"
 RESTRICT="nostrip nomirror"
 
@@ -46,7 +46,7 @@ src_install() {
 	exeinto ${dir}
 	doexe bin/Linux/x86/*.x86 openurl.sh
 
-	games_make_wrapper wolf ./wolf.x86 ${dir}
+	games_make_wrapper wolfmp ./wolf.x86 ${dir}
 	games_make_wrapper wolfsp ./wolfsp.x86 ${dir}
 
 	if use dedicated;
@@ -60,10 +60,11 @@ src_install() {
 	insinto ${dir}
 	doins WolfMP.xpm WolfSP.xpm INSTALL QUICKSTART CHANGES RTCW-README-1.4.txt
 	insinto /usr/share/pixmaps
-	doins WolfMP.xpm
+	doins WolfMP.xpm WolfSP.xpm
 
 	prepgamesdirs
-	make_desktop_entry wolf "Return to Castle Wolfenstein" WolfMP.xpm
+	make_desktop_entry wolfmp "Return to Castle Wolfenstein (MP)" WolfMP.xpm
+	make_desktop_entry wolfsp "Return to Castle Wolfenstein (SP)" WolfSP.xpm
 }
 
 pkg_postinst() {