Check for nvidia-drivers instead of nvidia-glx, bug #146452

Package-Manager: portage-2.1.2_pre1-r3

3 files changed, 32 insertions, 31 deletions

diff --git a/games-action/glaxium/ChangeLog b/games-action/glaxium/ChangeLog
index fd19094e3677..ecd7b9d11985 100644
--- a/games-action/glaxium/ChangeLog
+++ b/games-action/glaxium/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-action/glaxium
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/glaxium/ChangeLog,v 1.12 2006/04/02 11:14:32 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/glaxium/ChangeLog,v 1.13 2006/09/26 19:40:46 nyhm Exp $
+
+  26 Sep 2006; Tristan Heaven <nyhm@gentoo.org> glaxium-0.5.ebuild:
+  Check for nvidia-drivers instead of nvidia-glx, bug #146452
 
   02 Apr 2006; <Tupone@gentoo.org> +files/glaxium-0.5-glx.patch,
   -files/0.5-another-glx.patch, -files/0.5-glx.patch,
diff --git a/games-action/glaxium/Manifest b/games-action/glaxium/Manifest
index 3117aa0d48d3..7f891817a168 100644
--- a/games-action/glaxium/Manifest
+++ b/games-action/glaxium/Manifest
@@ -1,31 +1,28 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8a1eba83cc23acd784070ff70f4e7635 ChangeLog 1598
-RMD160 0d91c05737d97497c732b6d3baacaa08406ff1fb ChangeLog 1598
-SHA256 6c9250f58bea8b77acf6783e04c99bbb37b656dbe09a4bfb16e017c9b2e8a81d ChangeLog 1598
+AUX 0.5-rc.patch 277 RMD160 fbbd6975b020d0220a96be5e23d95b6592976acc SHA1 c9863c1bfb18231bc34552c9da910b7f0289f7bd SHA256 a099ebd966a87adba98d6495533e3f2323020b6078e4f09ad66318d96521a815
 MD5 ab479510f01767b032042d1d964670cd files/0.5-rc.patch 277
 RMD160 fbbd6975b020d0220a96be5e23d95b6592976acc files/0.5-rc.patch 277
 SHA256 a099ebd966a87adba98d6495533e3f2323020b6078e4f09ad66318d96521a815 files/0.5-rc.patch 277
-MD5 bc92909e8ed1a74fc951d2ce7aedc9f3 files/digest-glaxium-0.5 238
-RMD160 0f80f6f684cb2603fb09e51864cc98e80a081757 files/digest-glaxium-0.5 238
-SHA256 4e59f1b6657fbd4ddec5ef58522bb6c5b37a33657975939d9242020f3313344a files/digest-glaxium-0.5 238
+AUX glaxium-0.5-gcc41.patch 808 RMD160 1943be88713d73836b32704b27a25473d94dec63 SHA1 97f9fbcfc3f1ca648c3d2e8a45f55e0a8bfefc67 SHA256 9e1ab3e231d583db0a8187dd86c6457ba80eef2ac3c539143229d11d75a86625
 MD5 57c59919852db441f8cdd5a0c38a682f files/glaxium-0.5-gcc41.patch 808
 RMD160 1943be88713d73836b32704b27a25473d94dec63 files/glaxium-0.5-gcc41.patch 808
 SHA256 9e1ab3e231d583db0a8187dd86c6457ba80eef2ac3c539143229d11d75a86625 files/glaxium-0.5-gcc41.patch 808
+AUX glaxium-0.5-glx.patch 2017 RMD160 e2e282f57c23de04c30d1d551efc30a937679812 SHA1 ed0514cc8abc3ee96a052b5486cc7f033b9ee33f SHA256 e9875901eae693bb62c3fe3871dce796b4a5325131d022e40779cb47bf3a3319
 MD5 bc74f1b2de241e6004a792b1e18cc457 files/glaxium-0.5-glx.patch 2017
 RMD160 e2e282f57c23de04c30d1d551efc30a937679812 files/glaxium-0.5-glx.patch 2017
 SHA256 e9875901eae693bb62c3fe3871dce796b4a5325131d022e40779cb47bf3a3319 files/glaxium-0.5-glx.patch 2017
-MD5 29ddf65eb9e469e5203aa89cab16ba13 glaxium-0.5.ebuild 1246
-RMD160 669d6d297ee21ec55977c3dceeeb69315e5643e0 glaxium-0.5.ebuild 1246
-SHA256 c4ce80325f91761b2ce880d055aba2ddf72bae690374ccfdf68d1cea98f70bb7 glaxium-0.5.ebuild 1246
+DIST glaxium_0.5.tar.gz 1692219 RMD160 5c988c53d4205ac80e0011a893a80daecf096c1f SHA1 42526a009a377a6fede7b7d343a0cd57c2f8e23e SHA256 78f5a9e1785e9e39f6dcb32134a3bd224372f572f191e7ed77bf50b109afb5f7
+EBUILD glaxium-0.5.ebuild 1248 RMD160 deece4f45acfbed6dab5968b85675390953a52c8 SHA1 78a8aef0cc5d6719b1864aa9739c6b3d6603be0c SHA256 925144414f00a4cc31a0e856512ce1209862f48f027b06a4877d9ddc46d8059f
+MD5 aa1f79d9ecb8906d2b9357cbfd5ffb4c glaxium-0.5.ebuild 1248
+RMD160 deece4f45acfbed6dab5968b85675390953a52c8 glaxium-0.5.ebuild 1248
+SHA256 925144414f00a4cc31a0e856512ce1209862f48f027b06a4877d9ddc46d8059f glaxium-0.5.ebuild 1248
+MISC ChangeLog 1727 RMD160 ab01b54680f66a99b787c503350e24ad9834bd98 SHA1 8e18300f6aecfd40003be27f932075b1e139c357 SHA256 1106f0f35a8b4b88a71ddd117b0e0fe437f431b11072efbd82c769a8a0ec63fd
+MD5 f91f3e5969356d25f8d5fcdcbbf1bb09 ChangeLog 1727
+RMD160 ab01b54680f66a99b787c503350e24ad9834bd98 ChangeLog 1727
+SHA256 1106f0f35a8b4b88a71ddd117b0e0fe437f431b11072efbd82c769a8a0ec63fd ChangeLog 1727
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEL7Iq2CTtIKiFlQIRAnfQAKCD7ck6qKLq2wgz4oTaBijvbZ42UwCdGK6n
-0QzDI8PFwmqhs5PJ2oW7OuA=
-=fjcp
------END PGP SIGNATURE-----
+MD5 bc92909e8ed1a74fc951d2ce7aedc9f3 files/digest-glaxium-0.5 238
+RMD160 0f80f6f684cb2603fb09e51864cc98e80a081757 files/digest-glaxium-0.5 238
+SHA256 4e59f1b6657fbd4ddec5ef58522bb6c5b37a33657975939d9242020f3313344a files/digest-glaxium-0.5 238
diff --git a/games-action/glaxium/glaxium-0.5.ebuild b/games-action/glaxium/glaxium-0.5.ebuild
index 04e90006221c..acec731e0c3c 100644
--- a/games-action/glaxium/glaxium-0.5.ebuild
+++ b/games-action/glaxium/glaxium-0.5.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/glaxium/glaxium-0.5.ebuild,v 1.14 2006/04/02 11:14:32 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/glaxium/glaxium-0.5.ebuild,v 1.15 2006/09/26 19:40:46 nyhm Exp $
 
 inherit eutils flag-o-matic toolchain-funcs games
 
@@ -10,27 +10,28 @@ SRC_URI="http://xhosxe.free.fr/glaxium/glaxium_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc amd64"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-RDEPEND=">=media-libs/libsdl-1.1.5
+DEPEND=">=media-libs/libsdl-1.1.5
 	>=media-libs/sdl-mixer-1.2.4
-	|| ( ( x11-libs/libXmu
-			x11-libs/libXi )
-		virtual/x11 )
+	x11-libs/libXmu
+	x11-libs/libXi
 	virtual/opengl
 	virtual/glu
 	virtual/glut
 	>=media-libs/libpng-1.0.0"
-DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${PN}_${PV}"
+S=${WORKDIR}/${PN}_${PV}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	has_version '>=media-video/nvidia-glx-1.0.5328' \
-		&& epatch "${FILESDIR}/${P}-glx.patch"
+	cd "${S}"
+	if has_version x11-drivers/nvidia-legacy-drivers || \
+		has_version x11-drivers/nvidia-drivers
+	then
+		epatch "${FILESDIR}/${P}-glx.patch"
+	fi
 	epatch "${FILESDIR}/${PV}-rc.patch" \
 		"${FILESDIR}/${P}-gcc41.patch"
 }