Version bumped to new patch-level with alsa and amd64 support.

6 files changed, 25 insertions, 41 deletions

diff --git a/games-fps/doom3/ChangeLog b/games-fps/doom3/ChangeLog
index 670e97479532..a76e457c4cfa 100644
--- a/games-fps/doom3/ChangeLog
+++ b/games-fps/doom3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/doom3
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/ChangeLog,v 1.5 2004/11/09 22:44:37 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/ChangeLog,v 1.6 2004/11/26 21:28:57 wolf31o2 Exp $
+
+*doom3-1.1.1286 (26 Nov 2004)
+
+  26 Nov 2004; Chris Gianelloni <wolf31o2@gentoo.org> -files/doom3,
+  -doom3-1.1.1282.ebuild, +doom3-1.1.1286.ebuild:
+  Version bumped to new patch-level with alsa and amd64 support.
 
   09 Nov 2004; Chris Gianelloni <wolf31o2@gentoo.org> :
   Fixing digest
diff --git a/games-fps/doom3/Manifest b/games-fps/doom3/Manifest
index 44a442282ed9..bc93b4d798d5 100644
--- a/games-fps/doom3/Manifest
+++ b/games-fps/doom3/Manifest
@@ -1,5 +1,4 @@
-MD5 f198c7f25eb34c67b636da76dd5cfa32 ChangeLog 982
-MD5 b46ef818cb1d2c1e83831f685560bc73 doom3-1.1.1282.ebuild 2724
+MD5 38ca6e0dd821e261396da4b9715703d4 doom3-1.1.1286.ebuild 2768
+MD5 16a1d2b5e5d925b91f5738227ce68e0a ChangeLog 1197
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 740c27e3bf7fda97f408e7a6c66d3f7a files/digest-doom3-1.1.1282 126
-MD5 86cf7753a0c72772dcfd90b35765a3d1 files/doom3 382
+MD5 91ee8fec9a0c95f5df1d813212718bfa files/digest-doom3-1.1.1286 74
diff --git a/games-fps/doom3/doom3-1.1.1282.ebuild b/games-fps/doom3/doom3-1.1.1286.ebuild
index 95e0a24772f1..ac1e9c8d7d18 100644
--- a/games-fps/doom3/doom3-1.1.1282.ebuild
+++ b/games-fps/doom3/doom3-1.1.1286.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/doom3-1.1.1282.ebuild,v 1.5 2004/11/09 21:52:00 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/doom3-1.1.1286.ebuild,v 1.1 2004/11/26 21:28:57 wolf31o2 Exp $
 
 inherit games eutils
 
 DESCRIPTION="Doom III - 3rd installment of the classic id 3D first-person shooter"
 HOMEPAGE="http://www.doom3.com/"
 SRC_URI="ftp://ftp.idsoftware.com/idstuff/${PN}/linux/${PN}-linux-${PV}.x86.run
-	ftp://dl.xs4all.nl/pub/mirror/idsoftware/idstuff/${PN}/linux/${PN}-linux-${PV}.x86.run
-	mirror://gentoo/doom3.png"
+	ftp://dl.xs4all.nl/pub/mirror/idsoftware/idstuff/${PN}/linux/${PN}-linux-${PV}.x86.run"
 
 LICENSE="DOOM3"
 SLOT="0"
 KEYWORDS="-* x86 amd64"
-IUSE="cdinstall opengl dedicated"
+IUSE="cdinstall alsa opengl dedicated"
 RESTRICT="nostrip"
 
 DEPEND="app-arch/bzip2
@@ -21,6 +20,7 @@ DEPEND="app-arch/bzip2
 RDEPEND="virtual/libc
 	opengl? ( virtual/opengl )
 	dedicated? ( app-misc/screen )
+	alsa? ( >=media-libs/alsa-lib-1.0.6 )
 	amd64? ( app-emulation/emul-linux-x86-baselibs
 		app-emulation/emul-linux-x86-xlibs
 		app-emulation/emul-linux-x86-nvidia	)"
@@ -46,10 +46,17 @@ src_install() {
 	dodir ${dir}
 
 	insinto ${dir}
-	doins License.txt README version.info
+	doins License.txt README version.info doom3.png
 	exeinto ${dir}
 	doexe libgcc_s.so.1 libstdc++.so.5 || die "doexe libs"
-	doexe bin/Linux/x86/glibc-2.1/doom{,ded}.x86 || die "doexe exes"
+	doexe openurl.sh || die "openurl.sh"
+	if use x86; then
+		doexe bin/Linux/x86/doom{,ded}.x86 || die "doexe x86 exes"
+	elif use amd64; then
+		doexe bin/Linux/amd64/doom{,ded}.x86 || die "doexe amd64 exes"
+	else
+		die "Cannot copy executables!"
+	fi
 
 	insinto ${dir}/base
 	doins base/* || die "doins base"
@@ -73,7 +80,7 @@ src_install() {
 	use cdinstall && find ${Ddir} -exec touch '{}' \;
 
 	insinto /usr/share/pixmaps
-	doins ${DISTDIR}/doom3.png
+	doins doom3.png
 
 	prepgamesdirs
 	make_desktop_entry doom3 "Doom III" doom3.png
@@ -93,10 +100,4 @@ pkg_postinst() {
 		einfo "To play the game run:"
 		einfo " doom3"
 	fi
-
-	# IA32 Emulation required for amd64
-	if use amd64 ; then
-		echo
-		ewarn "NOTE: IA32 Emulation must be compiled into your kernel for Doom3 to run."
-	fi
 }
diff --git a/games-fps/doom3/files/digest-doom3-1.1.1282 b/games-fps/doom3/files/digest-doom3-1.1.1282
deleted file mode 100644
index 58490622c8a8..000000000000
--- a/games-fps/doom3/files/digest-doom3-1.1.1282
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 342bb266010e610226b254605903230e doom3-linux-1.1.1282.x86.run 7620643
-MD5 55544646b16644d7dfc0f4b15e6251a2 doom3.png 1148
diff --git a/games-fps/doom3/files/digest-doom3-1.1.1286 b/games-fps/doom3/files/digest-doom3-1.1.1286
new file mode 100644
index 000000000000..0e8174783692
--- /dev/null
+++ b/games-fps/doom3/files/digest-doom3-1.1.1286
@@ -0,0 +1 @@
+MD5 2a45d0769b39473887c61a11cbba981c doom3-linux-1.1.1286.x86.run 7941364
diff --git a/games-fps/doom3/files/doom3 b/games-fps/doom3/files/doom3
deleted file mode 100644
index c15b108352f1..000000000000
--- a/games-fps/doom3/files/doom3
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-cd "DIR"
-
-cd_check_file() {
-	local n="$1"
-	local cdrom="$2"
-
-	if [ ! -e "base/pak00${n}.pk4" ] ; then
-		echo "Please copy pak00${n}.pk4 from the DOOM3 CD #${cdrom}"
-		echo "to DIR/base/ and try again!"
-		exit 1
-	fi
-}
-cd_check_file 0 2
-cd_check_file 1 2
-cd_check_file 2 1
-cd_check_file 3 3
-cd_check_file 4 3
-
-export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:."
-exec ./EXE "$@"