diff options
| author |   Tristan Heaven <nyhm@gentoo.org> | 2006-09-26 19:40:46 +0000 |
|---|---|---|
| committer | Tristan Heaven <nyhm@gentoo.org> | 2006-09-26 19:40:46 +0000 |
| commit | 619cfc3b9d809c86fc4e07e13bc0bb7c645783d3 (patch) | |
| tree | fe7b37a99c031af5793fea9e2b5b559742b7e419 /games-action | |
| parent | Stable on hppa wrt #148768 (diff) | |
| download | gentoo-2-619cfc3b9d809c86fc4e07e13bc0bb7c645783d3.tar.gz gentoo-2-619cfc3b9d809c86fc4e07e13bc0bb7c645783d3.tar.bz2 gentoo-2-619cfc3b9d809c86fc4e07e13bc0bb7c645783d3.zip | |
Check for nvidia-drivers instead of nvidia-glx, bug #146452
(Portage version: 2.1.2_pre1-r3)
Diffstat (limited to 'games-action')
| -rw-r--r-- | games-action/glaxium/ChangeLog | 5 | ||||
| -rw-r--r-- | games-action/glaxium/glaxium-0.5.ebuild | 23 |
2 files changed, 16 insertions, 12 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/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" } |