Added patch from Joshua Napoli <jnapoli@actuality-systems.com> to install libnvidia...

Package-Manager: portage-2.1.2_rc2-r2

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 2329af3e359cb942c76a6bd4cc5b32b0eda1997c..c33ba0ab47dd1f30033d2e1935f4c919034ea950 100644 (file)
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.33 2006/12/05 17:32:37 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.34 2006/12/06 21:59:55 wolf31o2 Exp $
+
+  06 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  -nvidia-drivers-1.0.9629.ebuild, nvidia-drivers-1.0.9742.ebuild:
+  Added patch from Joshua Napoli <jnapoli@actuality-systems.com> to install
+  libnvidia-wfb and closing bug #155532. Removing 9629, as it has problems
+  with NV2x cards.
 
   05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   files/NVIDIA_kernel-2.6.19.patch:

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9742.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9742.ebuild
index 81b4139da584be051e54a5b59c0ed1b79a2b645a..c0ae4a785ff02e87e0cd4261721df50fb270b0cd 100644 (file)
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9742.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9742.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/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9742.ebuild,v 1.2 2006/12/04 16:22:08 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9742.ebuild,v 1.3 2006/12/06 21:59:55 wolf31o2 Exp $
 
 inherit eutils multilib versionator linux-mod
 
@@ -257,8 +257,9 @@ src_install-libs() {
 
        local usrpkglibdir=usr/${pkglibdir}
        local libdir=usr/X11R6/${pkglibdir}
-       local drvdir=${libdir}/modules/drivers
-       local extdir=${libdir}/modules/extensions
+       local modules=${libdir}/modules
+       local drvdir=${modules}/drivers
+       local extdir=${modules}/extensions
        local incdir=usr/include/GL
        local sover=${PV}
        local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
@@ -342,6 +343,8 @@ src_install-libs() {
                        /usr/${inslibdir}/libXvMCNVIDIA.so
 
        exeinto ${NV_ROOT}/extensions
+       [[ -f ${modules}/libnvidia-wfb.so.${sover} ]] && \
+               newexe ${modules}/libnvidia-wfb.so.${sover} libwfb.so
        [[ -f ${extdir}/libglx.so.${sover} ]] && \
                newexe ${extdir}/libglx.so.${sover} libglx.so