Updated to remove amd64-specific ALSA code which broke the game. I also added a ncie comment to pkg_postinst which will tell amd64 people how to get sound in this game.

3 files changed, 20 insertions, 22 deletions

diff --git a/games-fps/enemy-territory/ChangeLog b/games-fps/enemy-territory/ChangeLog
index 030ec15a5343..36983d93b37a 100644
--- a/games-fps/enemy-territory/ChangeLog
+++ b/games-fps/enemy-territory/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/enemy-territory
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/ChangeLog,v 1.17 2004/12/08 14:27:23 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/ChangeLog,v 1.18 2004/12/15 13:25:58 wolf31o2 Exp $
+
+  15 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  enemy-territory-2.56-r2.ebuild:
+  Updated to remove amd64-specific ALSA code which broke the game. I also
+  added a ncie comment to pkg_postinst which will tell amd64 people how to get
+  sound in this game.
 
   08 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
   enemy-territory-2.56-r2.ebuild:
diff --git a/games-fps/enemy-territory/Manifest b/games-fps/enemy-territory/Manifest
index d0b6bd1e6870..5920bc68d0f4 100644
--- a/games-fps/enemy-territory/Manifest
+++ b/games-fps/enemy-territory/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 138c7429be60684b9e5a9f3843e7a320 ChangeLog 2993
-MD5 f32ceb9c21a024f478ab56aea4f8bce2 enemy-territory-2.56-r2.ebuild 2609
+MD5 560073405936ed9e3d38fd2a4ca8e64f enemy-territory-2.56-r2.ebuild 2850
+MD5 ff6cf542f24b77e44d7d1e89397973cc ChangeLog 3255
 MD5 f414f5eb26874bc33efe3ac1f0beab5d metadata.xml 1049
-MD5 4923bd56bd1be4356324b1af17f47ac5 files/digest-enemy-territory-2.56-r2 71
 MD5 9706616a064d2425aa5d8d8775995955 files/et 43
 MD5 69d783cd9fed81e4aacd11281d36ebe9 files/et-ded 46
 MD5 51ae531a8796cf809651bae90f744db6 files/et-ded.conf.d 333
 MD5 579bf10dab41adc4d91b9981801e2770 files/et-ded.rc 874
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBtw9tArHZZzCEUG0RAkRCAJ9NmAhAvrlI3ehMsaF8FFBzLSwfXACeIDts
-DQgdhXFPBQqKMzbu1A1/zUE=
-=Kryy
------END PGP SIGNATURE-----
+MD5 4923bd56bd1be4356324b1af17f47ac5 files/digest-enemy-territory-2.56-r2 71
diff --git a/games-fps/enemy-territory/enemy-territory-2.56-r2.ebuild b/games-fps/enemy-territory/enemy-territory-2.56-r2.ebuild
index 97b2b79f309d..64609b9bdc93 100644
--- a/games-fps/enemy-territory/enemy-territory-2.56-r2.ebuild
+++ b/games-fps/enemy-territory/enemy-territory-2.56-r2.ebuild
@@ -1,8 +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/enemy-territory/enemy-territory-2.56-r2.ebuild,v 1.12 2004/12/08 14:27:23 eradicator Exp $
-
-IUSE="dedicated opengl alsa"
+# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/enemy-territory-2.56-r2.ebuild,v 1.13 2004/12/15 13:25:58 wolf31o2 Exp $
 
 inherit games
 
@@ -13,7 +11,10 @@ SRC_URI="mirror://3dgamers/pub/3dgamers4/games/wolfensteinet/et-linux-${PV}-2.x8
 
 LICENSE="RTCW-ETEULA"
 SLOT="0"
+# This game is actively maintained by a developer with both x86 and amd64 kit.
+# DO NOT TOUCH THIS EBUILD WITHOUT THE PERMISSION OF wolf31o2!!!
 KEYWORDS="x86 amd64"
+IUSE="dedicated opengl"
 RESTRICT="nomirror nostrip"
 
 DEPEND="virtual/libc"
@@ -48,10 +49,6 @@ src_install() {
 	dogamesbin "${FILESDIR}/et" || die "dogamesbin failed"
 	dosed "s:GENTOO_DIR:${dir}:" ${GAMES_BINDIR}/et
 
-	if use amd64 && use alsa; then
-		dosed 's:exec:aoss32 exec:' ${GAMES_BINDIR}/et
-	fi
-
 	if use dedicated ; then
 		dogamesbin "${FILESDIR}/et-ded" || die "dogamesbin failed"
 		dosed "s:GENTOO_DIR:${dir}:" "${GAMES_BINDIR}/et-ded"
@@ -78,7 +75,7 @@ pkg_postinst() {
 	einfo "To play the game run:"
 	einfo " et"
 
-	if use dedicated ; then
+	if use dedicated; then
 		echo
 		einfo "To start a dedicated server run:"
 		einfo " /etc/init.d/et-ded start"
@@ -88,4 +85,9 @@ pkg_postinst() {
 		echo
 		einfo "The dedicated server is started under the ${GAMES_USER_DED} user account"
 	fi
+	if use amd64; then
+		echo
+		einfo "If you are running an amd64 system and using ALSA, you must have"
+		einfo "ALSA 32-bit emulation enabled in your kernel for this to function properly."
+	fi
 }