Fix deps again, bug #206378

Package-Manager: portage-2.1.4

3 files changed, 29 insertions, 22 deletions

diff --git a/games-fps/alienarena/ChangeLog b/games-fps/alienarena/ChangeLog
index a48fdf728c22..22c857e0ac87 100644
--- a/games-fps/alienarena/ChangeLog
+++ b/games-fps/alienarena/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/alienarena
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/ChangeLog,v 1.7 2007/11/23 06:33:09 nyhm Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/ChangeLog,v 1.8 2008/01/22 04:46:06 nyhm Exp $
+
+  22 Jan 2008; Tristan Heaven <nyhm@gentoo.org> alienarena-20071011.ebuild:
+  Fix deps again, bug #206378
 
 *alienarena-20071011 (23 Nov 2007)
 
diff --git a/games-fps/alienarena/Manifest b/games-fps/alienarena/Manifest
index b1225afd2d0f..5a18ba022966 100644
--- a/games-fps/alienarena/Manifest
+++ b/games-fps/alienarena/Manifest
@@ -6,14 +6,14 @@ MD5 5ebfdadc667e0822c2831a9847a82ac5 files/alienarena-20071011-paths.patch 614
 RMD160 6cce7779a54bff08a58a3a4fae2a3c0c0efbb624 files/alienarena-20071011-paths.patch 614
 SHA256 d85ec14925def732accbd7dd4594d7da90b0c6ff71bb6f04c8b257c2d05f66bd files/alienarena-20071011-paths.patch 614
 DIST alienarena2007-20071011-linux.zip 245067302 RMD160 838167095481bf77446fd1286f3c75ebdd2361ad SHA1 6af33de5013d84701c2143fe1836e0721af1817a SHA256 33036bd0dec77ae06c113d8e06718bd6f9e42efb634ee304c3fd9d48184c2e20
-EBUILD alienarena-20071011.ebuild 2498 RMD160 bf1ea43cbae66ae7b52778e3a1c0a2af450a23d3 SHA1 5442fed36ed66ef51f690cc19cbae5dc26d987ff SHA256 fbd86da9d83cb1cd0a49074f310632d3cc3a8b85b9942df4dd3c49db8a42d01c
-MD5 101adf014c90578f6c50cd5e965a3b5d alienarena-20071011.ebuild 2498
-RMD160 bf1ea43cbae66ae7b52778e3a1c0a2af450a23d3 alienarena-20071011.ebuild 2498
-SHA256 fbd86da9d83cb1cd0a49074f310632d3cc3a8b85b9942df4dd3c49db8a42d01c alienarena-20071011.ebuild 2498
-MISC ChangeLog 1646 RMD160 62c08c3471306080c7c6ead15278c159205e5551 SHA1 dcd90a33aa740deeb3c0db1fd8656a736a1d7539 SHA256 bca0477416bb4a5869849c61d75bfbe3a228a735e135764a16413b221909f3b3
-MD5 b7a7a8a58af3991bdbc005f85a766248 ChangeLog 1646
-RMD160 62c08c3471306080c7c6ead15278c159205e5551 ChangeLog 1646
-SHA256 bca0477416bb4a5869849c61d75bfbe3a228a735e135764a16413b221909f3b3 ChangeLog 1646
+EBUILD alienarena-20071011.ebuild 2611 RMD160 7131c7022c43c9013c042f00648af2c1ae607965 SHA1 b134fd33c1becd134c8413b3600e09d1f4b02e92 SHA256 bf921873ee21209889bc2f1a68e31ccf49f48e3b189d11767d64937417042748
+MD5 ee22944dedcd5878eed6c1bee816a266 alienarena-20071011.ebuild 2611
+RMD160 7131c7022c43c9013c042f00648af2c1ae607965 alienarena-20071011.ebuild 2611
+SHA256 bf921873ee21209889bc2f1a68e31ccf49f48e3b189d11767d64937417042748 alienarena-20071011.ebuild 2611
+MISC ChangeLog 1753 RMD160 9ea85f2c1d4c3332ed6d4feee9df48a77e85a9c2 SHA1 9d3b9add8ee49c893041c00799b7c6a6d6fe8732 SHA256 096413103ff5630bd7d455c3606957c8854d546420b8b3dee5a98e74f769d67a
+MD5 9ef018bd5cbc78ca5c6f74ee63c1b109 ChangeLog 1753
+RMD160 9ea85f2c1d4c3332ed6d4feee9df48a77e85a9c2 ChangeLog 1753
+SHA256 096413103ff5630bd7d455c3606957c8854d546420b8b3dee5a98e74f769d67a ChangeLog 1753
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -24,7 +24,7 @@ SHA256 ed352890483a77143541adb2f3255a0baf874769223ea1bd49af0896ee409d54 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHlXCldz7hIScOURERAn8nAJ9EEi0c4EDtiYXnJgcR3HcgXHiepwCg3Kj6
-uXYLjVoyquxSeQb1CiMqb+4=
-=C2Q9
+iD8DBQFHlXUgdz7hIScOURERAk7xAKDOaUrTrOe4hR8y/jno06QFR15TGQCg5166
+cBoG7B4Yl0sgyGpZsKDXdQ4=
+=bmT8
 -----END PGP SIGNATURE-----
diff --git a/games-fps/alienarena/alienarena-20071011.ebuild b/games-fps/alienarena/alienarena-20071011.ebuild
index 64c1c2053fb3..a0e39f12e0f5 100644
--- a/games-fps/alienarena/alienarena-20071011.ebuild
+++ b/games-fps/alienarena/alienarena-20071011.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/alienarena-20071011.ebuild,v 1.1 2007/11/23 06:33:09 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/alienarena-20071011.ebuild,v 1.2 2008/01/22 04:46:06 nyhm Exp $
 
 inherit eutils flag-o-matic toolchain-funcs games
 
@@ -14,17 +14,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl sdl"
 
-UIDEPEND="media-libs/jpeg
+UIRDEPEND="media-libs/jpeg
 	media-libs/libpng
 	virtual/glu
 	virtual/opengl
 	x11-libs/libXxf86dga
-	x11-libs/libXxf86vm"
-RDEPEND="!dedicated? ( ${UIDEPEND} )
-	opengl? ( ${UIDEPEND} )
-	sdl? ( ${UIDEPEND} media-libs/libsdl )
+	x11-libs/libXxf86vm
+	sdl? ( media-libs/libsdl )"
+RDEPEND="opengl? ( ${UIRDEPEND} )
+	!opengl? ( !dedicated? ( ${UIRDEPEND} ) )
 	net-misc/curl"
+UIDEPEND="x11-proto/xf86dgaproto
+	x11-proto/xf86vidmodeproto"
 DEPEND="${RDEPEND}
+	opengl? ( ${UIDEPEND} )
+	!opengl? ( !dedicated? ( ${UIDEPEND} ) )
 	app-arch/unzip"
 
 S=${WORKDIR}/${MY_PN}/source
@@ -68,13 +72,13 @@ src_install() {
 
 	if use opengl || ! use dedicated ; then
 		newgamesbin crx ${PN}-oss || die "newgamesbin crx failed"
-		make_desktop_entry ${PN}-oss "Alien Arena (OSS audio)" ${PN}.xpm
+		make_desktop_entry ${PN}-oss "Alien Arena (OSS audio)"
 		use sdl || dosym ${PN}-oss "${GAMES_BINDIR}"/${PN}
 	fi
 
 	if use sdl ; then
 		newgamesbin crx.sdl ${PN}-sdl || die "newgamesbin crx.sdl failed"
-		make_desktop_entry ${PN}-sdl "Alien Arena (SDL audio)" ${PN}.xpm
+		make_desktop_entry ${PN}-sdl "Alien Arena (SDL audio)"
 		dosym ${PN}-sdl "${GAMES_BINDIR}"/${PN}
 	fi