Added patch to resolve bug #121473.

Package-Manager: portage-2.1_pre4-r1

3 files changed, 25 insertions, 25 deletions

diff --git a/games-action/armagetronad/ChangeLog b/games-action/armagetronad/ChangeLog
index 99deeeb5726c..eae6ea580ed7 100644
--- a/games-action/armagetronad/ChangeLog
+++ b/games-action/armagetronad/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/armagetronad
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/armagetronad/ChangeLog,v 1.4 2006/02/06 17:39:38 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/armagetronad/ChangeLog,v 1.5 2006/02/10 16:35:26 wolf31o2 Exp $
+
+  10 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  armagetronad-0.2.7.1.ebuild:
+  Added patch to resolve bug #121473.
 
   06 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   armagetronad-0.2.7.1.ebuild:
diff --git a/games-action/armagetronad/Manifest b/games-action/armagetronad/Manifest
index 842bf9b194c1..3134d2b12be0 100644
--- a/games-action/armagetronad/Manifest
+++ b/games-action/armagetronad/Manifest
@@ -1,9 +1,9 @@
-MD5 029562c5e073c11e373dda9db0fb8bc3 ChangeLog 939
-RMD160 47e60ec5082ec645353f9fc313bf67db87bd6c26 ChangeLog 939
-SHA256 940ccd49ffad28fb3de2afb40ff3de60887a1382e0081fdf49c77bc6ad362767 ChangeLog 939
-MD5 57c64d46a4692cbbd59a3a26fcd257d3 armagetronad-0.2.7.1.ebuild 2136
-RMD160 56816178a4ebe02c2dc18d901de8a3b9ab765add armagetronad-0.2.7.1.ebuild 2136
-SHA256 f845e90c4679f4463d909209294b797bacd972a3c27fbbfb135df4a79d97059d armagetronad-0.2.7.1.ebuild 2136
+MD5 ae23c7b32f2c3e6d686c3b0c02809a29 ChangeLog 1063
+RMD160 b7a0542ecab17fa8dc4a9aad00ced19af38cb95d ChangeLog 1063
+SHA256 58fb3b33fd0b3487845118685537184319535bd0155384d5a1ca632534b080be ChangeLog 1063
+MD5 7cf5f4a1d194616d98e9a1e272f901fc armagetronad-0.2.7.1.ebuild 2041
+RMD160 755c03bf0793bd5fca41f9dee589e9b835eef8fe armagetronad-0.2.7.1.ebuild 2041
+SHA256 3f9ab00924ed7c9b567b5532003535bf8c94004fda12e82b2fa24ce53c80bc32 armagetronad-0.2.7.1.ebuild 2041
 MD5 617e831d7f4c02cd72d67800bcf0144f files/armagetronad 1102
 RMD160 e9a7852c6b03010e03d93f1c849e4c582338745b files/armagetronad 1102
 SHA256 b267de50ee8b41028b2fe3e441dd4049d3fd689cb3fa7788427ade03e7851579 files/armagetronad 1102
diff --git a/games-action/armagetronad/armagetronad-0.2.7.1.ebuild b/games-action/armagetronad/armagetronad-0.2.7.1.ebuild
index 5749770d21cc..4b16958fa9d6 100644
--- a/games-action/armagetronad/armagetronad-0.2.7.1.ebuild
+++ b/games-action/armagetronad/armagetronad-0.2.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/armagetronad/armagetronad-0.2.7.1.ebuild,v 1.7 2006/02/06 17:39:38 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/armagetronad/armagetronad-0.2.7.1.ebuild,v 1.8 2006/02/10 16:35:26 wolf31o2 Exp $
 
 
 inherit flag-o-matic eutils games
@@ -8,7 +8,7 @@ inherit flag-o-matic eutils games
 DESCRIPTION="3d tron lightcycles, just like the movie"
 HOMEPAGE="http://armagetronad.sourceforge.net/"
 SRC_URI="mirror://sourceforge/armagetronad/${P}.tar.bz2
-	opengl? (
+	!dedicated? (
 		http://armagetron.sourceforge.net/addons/moviesounds_fq.zip
 		http://armagetron.sourceforge.net/addons/moviepack.zip
 	)"
@@ -16,25 +16,23 @@ SRC_URI="mirror://sourceforge/armagetronad/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE="dedicated opengl"
+IUSE="dedicated"
 
-RDEPEND="sys-libs/zlib
-	opengl? (
+RDEPEND="
+	!dedicated? (
+		sys-libs/zlib
 		virtual/opengl
+		virtual/glu
 		media-libs/libsdl
 		media-libs/sdl-image
-		media-libs/sdl-mixer
 		media-libs/jpeg
 		media-libs/libpng )"
 DEPEND="${RDEPEND}
-	app-arch/unzip
-	|| (
-		x11-libs/libX11
-		virtual/x11 )"
+	!dedicated? ( app-arch/unzip )"
 
 src_compile() {
 	filter-flags -fno-exceptions
-	if use dedicated && ! use opengl; then
+	if use dedicated; then
 		egamesconf --disable-glout || die "egamesconf failed"
 	else
 		egamesconf || die "egamesconf failed"
@@ -49,18 +47,16 @@ src_install() {
 	dohtml doc/net/*.html
 	newicon tron.ico ${PN}.ico
 	exeinto "${GAMES_LIBDIR}/${PN}"
-	if use dedicated && ! use opengl; then
+	if use dedicated; then
 		doexe src/tron/${PN}-dedicated || die "copying files"
 	else
 		doexe src/tron/${PN} || die "copying files"
 	fi
 	doexe src/network/armagetronad-* || die "copying files"
 	insinto "${GAMES_DATADIR}/${PN}"
-	if use dedicated && ! use opengl; then
-		doins -r log language || die "copying files"
-	else
-		doins -r arenas models sound textures language log music \
-			|| die "copying files"
+	doins -r log language || die "copying files"
+	if ! use dedicated; then
+		doins -r arenas models sound textures music || die "copying files"
 	fi
 	insinto "${GAMES_SYSCONFDIR}/${PN}"
 	doins -r config/* || die "copying files"
@@ -69,7 +65,7 @@ src_install() {
 	fi
 	cd "${S}"
 	insinto "${GAMES_DATADIR}/${PN}"
-	if use opengl; then
+	if ! use dedicated; then
 		dogamesbin "${FILESDIR}/${PN}"
 		insinto "${GAMES_DATADIR}/${PN}"
 		doins -r ../moviepack ../moviesounds || die "copying movies"