Bumped to latest Linux patch and closing bug #73228.

5 files changed, 22 insertions, 19 deletions

diff --git a/games-fps/doom3-demo/ChangeLog b/games-fps/doom3-demo/ChangeLog
index 93d4bf62647c..811a02837264 100644
--- a/games-fps/doom3-demo/ChangeLog
+++ b/games-fps/doom3-demo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/doom3-demo
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3-demo/ChangeLog,v 1.6 2004/11/09 22:44:16 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3-demo/ChangeLog,v 1.7 2004/12/04 14:27:51 wolf31o2 Exp $
+
+*doom3-demo-1.1.1286 (04 Dec 2004)
+
+  04 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  -doom3-demo-1.1.1282.ebuild, +doom3-demo-1.1.1286.ebuild:
+  Bumped to latest Linux patch and closing bug #73228.
 
   09 Nov 2004; Chris Gianelloni <wolf31o2@gentoo.org> :
   Fixing digest
diff --git a/games-fps/doom3-demo/Manifest b/games-fps/doom3-demo/Manifest
index 96d459c51793..fe87cd7a5196 100644
--- a/games-fps/doom3-demo/Manifest
+++ b/games-fps/doom3-demo/Manifest
@@ -1,4 +1,4 @@
-MD5 e4103b744aa9ec6507c38d8f75242c56 ChangeLog 1001
-MD5 b23edad8232c77f67a4d38129b9572c3 doom3-demo-1.1.1282.ebuild 1832
+MD5 9c224d0a33ec6ea5901adbfb7a1e2fb9 ChangeLog 1207
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 5fae99f1d4f21a1fdb8a676c894dc653 files/digest-doom3-demo-1.1.1282 133
+MD5 73f27e8e967676cfe645eb24b37c1125 doom3-demo-1.1.1286.ebuild 1688
+MD5 ef71dc715af854ef0c0953c7073847ac files/digest-doom3-demo-1.1.1286 133
diff --git a/games-fps/doom3-demo/doom3-demo-1.1.1282.ebuild b/games-fps/doom3-demo/doom3-demo-1.1.1286.ebuild
index 165adcee3d64..3fb7a6af4803 100644
--- a/games-fps/doom3-demo/doom3-demo-1.1.1282.ebuild
+++ b/games-fps/doom3-demo/doom3-demo-1.1.1286.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/doom3-demo/doom3-demo-1.1.1282.ebuild,v 1.5 2004/11/09 21:52:53 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3-demo/doom3-demo-1.1.1286.ebuild,v 1.1 2004/12/04 14:27:51 wolf31o2 Exp $
 
 inherit games eutils
 
@@ -20,10 +20,7 @@ DEPEND="app-arch/bzip2
 	app-arch/tar"
 RDEPEND="virtual/libc
 	opengl? ( virtual/opengl )
-	dedicated? ( app-misc/screen )
-	amd64? ( app-emulation/emul-linux-x86-baselibs
-		app-emulation/emul-linux-x86-xlibs
-		app-emulation/emul-linux-x86-nvidia	)"
+	dedicated? ( app-misc/screen )"
 
 S=${WORKDIR}
 
@@ -46,7 +43,13 @@ src_install() {
 	doins License.txt README version.info
 	exeinto ${dir}
 	doexe gamex86.so libgcc_s.so.1 libstdc++.so.5 || die "doexe libs"
-	doexe bin/Linux/x86/glibc-2.1/doom.x86 || die "doexe doom"
+	if use amd64; then
+		doexe bin/Linux/amd64/doom.x86 || die "doexe doom.x86"
+	elif use x86; then
+		doexe bin/Linux/x86/doom.x86 || die "doexe doom"
+	else
+		die "Platform not supported"
+	fi
 
 	insinto ${dir}/demo
 	doins demo/* || die "doins base"
@@ -57,7 +60,7 @@ src_install() {
 	newins ${DISTDIR}/doom3.png doom3-demo.png
 
 	prepgamesdirs
-	make_desktop_entry doom3-demo "Doom III Demo" doom3.png
+	make_desktop_entry doom3-demo "Doom III Demo" doom3-demo.png
 }
 
 pkg_postinst() {
@@ -65,10 +68,4 @@ pkg_postinst() {
 
 	einfo "To play the game run:"
 	einfo " doom3-demo"
-
-	# 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-demo/files/digest-doom3-demo-1.1.1282 b/games-fps/doom3-demo/files/digest-doom3-demo-1.1.1282
deleted file mode 100644
index 64a3a662b126..000000000000
--- a/games-fps/doom3-demo/files/digest-doom3-demo-1.1.1282
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 e08999ebe76e1870e08b24b964af9c07 doom3-linux-1.1.1282-demo.x86.run 485080148
-MD5 55544646b16644d7dfc0f4b15e6251a2 doom3.png 1148
diff --git a/games-fps/doom3-demo/files/digest-doom3-demo-1.1.1286 b/games-fps/doom3-demo/files/digest-doom3-demo-1.1.1286
new file mode 100644
index 000000000000..612ae50f1cca
--- /dev/null
+++ b/games-fps/doom3-demo/files/digest-doom3-demo-1.1.1286
@@ -0,0 +1,2 @@
+MD5 81dcf8ead198f14844c554b25e07abbe doom3-linux-1.1.1286-demo.x86.run 485257318
+MD5 55544646b16644d7dfc0f4b15e6251a2 doom3.png 1148