Removed virtual/x11 from dependencies, removed blocker on nvidia-kernel and nvidia...

Package-Manager: portage-2.1.2_pre1-r4

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 6762043760d2711cb61c6d3ad61b63fdb6a29fa3..311d4b9b5dcf7ac7eae298520c7b143f3f4186b6 100644 (file)
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,15 @@
 # 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.15 2006/10/04 20:45:32 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.16 2006/10/09 13:37:04 wolf31o2 Exp $
+
+  09 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  nvidia-drivers-1.0.8178.ebuild, -nvidia-drivers-1.0.8762.ebuild,
+  nvidia-drivers-1.0.8762-r1.ebuild, nvidia-drivers-1.0.8774.ebuild,
+  nvidia-drivers-1.0.9625.ebuild:
+  Removed virtual/x11 from dependencies, removed blocker on nvidia-kernel and
+  nvidia-glx, since they're no longer in the tree, changed nostrip to strip,
+  and added QA variables for TEXTRELS and EXECSTACK for amd64 and x86. Closing
+  bug #114894.
 
   04 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   nvidia-drivers-1.0.8178.ebuild, nvidia-drivers-1.0.8762.ebuild,

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8178.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8178.ebuild
index 01274d69253fc888aebe4e7c3db215d231a6a8e8..8c1dde38c934becbd0a0e3925d3be0cd0f4d4737 100644 (file)
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8178.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8178.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.8178.ebuild,v 1.4 2006/10/04 20:45:32 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8178.ebuild,v 1.5 2006/10/09 13:37:04 wolf31o2 Exp $
 
 inherit eutils multilib versionator linux-mod
 
@@ -21,19 +21,48 @@ LICENSE="NVIDIA"
 SLOT="0"
 KEYWORDS="-* amd64 x86 ~x86-fbsd"
 IUSE="dlloader"
-RESTRICT="nostrip multilib-pkg-force"
+RESTRICT="strip multilib-pkg-force"
 
 DEPEND="kernel_linux? ( virtual/linux-sources )"
 RDEPEND="kernel_linux? ( virtual/modutils )
-        || ( x11-base/xorg-server virtual/x11 )
-        !>=x11-base/xorg-server-1.0.99
-        || ( media-libs/mesa virtual/x11 )
-        app-admin/eselect-opengl
-        kernel_linux? ( !media-video/nvidia-kernel )
-        kernel_FreeBSD? ( !media-video/nvidia-freebsd )
-        !app-emulation/emul-linux-x86-nvidia
-        !x11-drivers/nvidia-legacy-drivers
-        !media-video/nvidia-glx"
+       x11-base/xorg-server
+       !>=x11-base/xorg-server-1.0.99
+       media-libs/mesa
+       app-admin/eselect-opengl
+       kernel_FreeBSD? ( !media-video/nvidia-freebsd )
+       !app-emulation/emul-linux-x86-nvidia
+       !x11-drivers/nvidia-legacy-drivers"
+
+QA_TEXTRELS_x86="usr/lib/xorg/libXvMCNVIDIA.so.${PV}
+       usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib/opengl/nvidia/tls/libnvidia-tls.so.${PV}
+       usr/lib/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
+       usr/lib/opengl/nvidia/extensions/libglx.so"
+QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib/opengl/nvidia/extensions/libglx.so"
+
+
+QA_TEXTRELS_amd64="usr/lib64/xorg/libXvMCNVIDIA.so.${PV}
+       usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib64/opengl/nvidia/tls/libnvidia-tls.so.${PV}
+       usr/lib64/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
+       usr/lib64/opengl/nvidia/extensions/libglx.so
+       usr/lib32/xorg/libXvMCNVIDIA.so.${PV}
+       usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib32/opengl/nvidia/tls/libnvidia-tls.so.${PV}
+       usr/lib32/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
+       usr/lib32/opengl/nvidia/extensions/libglx.so"
+
+QA_EXECSTACK_amd64="usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib64/opengl/nvidia/extensions/libglx.so
+       usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib32/opengl/nvidia/extensions/libglx.so"
 
 export _POSIX2_VERSION="199209"
 

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8762-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8762-r1.ebuild
index f99e75f243ec4f767229d2294c149f6fc42d02c5..4184261f02811a20df8717bea822535e32349b01 100644 (file)
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8762-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8762-r1.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.8762-r1.ebuild,v 1.6 2006/10/04 20:45:32 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8762-r1.ebuild,v 1.7 2006/10/09 13:37:04 wolf31o2 Exp $
 
 inherit eutils multilib versionator linux-mod
 
@@ -25,15 +25,44 @@ RESTRICT="nostrip multilib-pkg-force"
 
 DEPEND="kernel_linux? ( virtual/linux-sources )"
 RDEPEND="kernel_linux? ( virtual/modutils )
-        || ( x11-base/xorg-server virtual/x11 )
-        !>=x11-base/xorg-server-1.0.99
-        || ( media-libs/mesa virtual/x11 )
-        app-admin/eselect-opengl
-        kernel_linux? ( !media-video/nvidia-kernel )
-        kernel_FreeBSD? ( !media-video/nvidia-freebsd )
-        !app-emulation/emul-linux-x86-nvidia
-        !x11-drivers/nvidia-legacy-drivers
-        !media-video/nvidia-glx"
+       x11-base/xorg-server
+       !>=x11-base/xorg-server-1.0.99
+       media-libs/mesa
+       app-admin/eselect-opengl
+       kernel_FreeBSD? ( !media-video/nvidia-freebsd )
+       !app-emulation/emul-linux-x86-nvidia
+       !x11-drivers/nvidia-legacy-drivers"
+
+QA_TEXTRELS_x86="usr/lib/xorg/libXvMCNVIDIA.so.${PV}
+       usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib/opengl/nvidia/tls/libnvidia-tls.so.${PV}
+       usr/lib/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
+       usr/lib/opengl/nvidia/extensions/libglx.so"
+QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib/opengl/nvidia/extensions/libglx.so"
+
+
+QA_TEXTRELS_amd64="usr/lib64/xorg/libXvMCNVIDIA.so.${PV}
+       usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib64/opengl/nvidia/tls/libnvidia-tls.so.${PV}
+       usr/lib64/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
+       usr/lib64/opengl/nvidia/extensions/libglx.so
+       usr/lib32/xorg/libXvMCNVIDIA.so.${PV}
+       usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib32/opengl/nvidia/tls/libnvidia-tls.so.${PV}
+       usr/lib32/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
+       usr/lib32/opengl/nvidia/extensions/libglx.so"
+
+QA_EXECSTACK_amd64="usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib64/opengl/nvidia/extensions/libglx.so
+       usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib32/opengl/nvidia/extensions/libglx.so"
 
 export _POSIX2_VERSION="199209"
 

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8774.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8774.ebuild
index 5980098ac8d4ac4110d2cd51fe0f13274058b20e..dc755ca93b5e2feb0308b26197e9f930e9d0b436 100644 (file)
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8774.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8774.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.8774.ebuild,v 1.6 2006/10/04 20:45:32 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8774.ebuild,v 1.7 2006/10/09 13:37:04 wolf31o2 Exp $
 
 inherit eutils multilib versionator linux-mod
 
@@ -25,14 +25,43 @@ RESTRICT="nostrip multilib-pkg-force"
 
 DEPEND="kernel_linux? ( virtual/linux-sources )"
 RDEPEND="kernel_linux? ( virtual/modutils )
-        || ( x11-base/xorg-server virtual/x11 )
-        || ( media-libs/mesa virtual/x11 )
-        app-admin/eselect-opengl
-        kernel_linux? ( !media-video/nvidia-kernel )
-        kernel_FreeBSD? ( !media-video/nvidia-freebsd )
-        !app-emulation/emul-linux-x86-nvidia
-        !x11-drivers/nvidia-legacy-drivers
-        !media-video/nvidia-glx"
+       x11-base/xorg-server
+       media-libs/mesa
+       app-admin/eselect-opengl
+       kernel_FreeBSD? ( !media-video/nvidia-freebsd )
+       !app-emulation/emul-linux-x86-nvidia
+       !x11-drivers/nvidia-legacy-drivers"
+
+QA_TEXTRELS_x86="usr/lib/xorg/libXvMCNVIDIA.so.${PV}
+       usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib/opengl/nvidia/tls/libnvidia-tls.so.${PV}
+       usr/lib/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
+       usr/lib/opengl/nvidia/extensions/libglx.so"
+QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib/opengl/nvidia/extensions/libglx.so"
+
+
+QA_TEXTRELS_amd64="usr/lib64/xorg/libXvMCNVIDIA.so.${PV}
+       usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib64/opengl/nvidia/tls/libnvidia-tls.so.${PV}
+       usr/lib64/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
+       usr/lib64/opengl/nvidia/extensions/libglx.so
+       usr/lib32/xorg/libXvMCNVIDIA.so.${PV}
+       usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib32/opengl/nvidia/tls/libnvidia-tls.so.${PV}
+       usr/lib32/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
+       usr/lib32/opengl/nvidia/extensions/libglx.so"
+
+QA_EXECSTACK_amd64="usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib64/opengl/nvidia/extensions/libglx.so
+       usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib32/opengl/nvidia/extensions/libglx.so"
 
 export _POSIX2_VERSION="199209"
 

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9625.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9625.ebuild
index 9ead6ba859e472ef3d3711d9deef718824a2a271..641ee765c811d3a78a780b346b29eeacf0581d30 100644 (file)
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9625.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9625.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.9625.ebuild,v 1.4 2006/10/04 20:45:32 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9625.ebuild,v 1.5 2006/10/09 13:37:04 wolf31o2 Exp $
 
 inherit eutils multilib versionator linux-mod
 
@@ -25,14 +25,43 @@ RESTRICT="nostrip multilib-pkg-force"
 
 DEPEND="kernel_linux? ( virtual/linux-sources )"
 RDEPEND="kernel_linux? ( virtual/modutils )
-        || ( x11-base/xorg-server virtual/x11 )
-        || ( media-libs/mesa virtual/x11 )
-        app-admin/eselect-opengl
-        kernel_linux? ( !media-video/nvidia-kernel )
-        kernel_FreeBSD? ( !media-video/nvidia-freebsd )
-        !app-emulation/emul-linux-x86-nvidia
-        !x11-drivers/nvidia-legacy-drivers
-        !media-video/nvidia-glx"
+       x11-base/xorg-server
+       media-libs/mesa
+       app-admin/eselect-opengl
+       kernel_FreeBSD? ( !media-video/nvidia-freebsd )
+       !app-emulation/emul-linux-x86-nvidia
+       !x11-drivers/nvidia-legacy-drivers"
+
+QA_TEXTRELS_x86="usr/lib/xorg/libXvMCNVIDIA.so.${PV}
+       usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib/opengl/nvidia/tls/libnvidia-tls.so.${PV}
+       usr/lib/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
+       usr/lib/opengl/nvidia/extensions/libglx.so"
+QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib/opengl/nvidia/extensions/libglx.so"
+
+
+QA_TEXTRELS_amd64="usr/lib64/xorg/libXvMCNVIDIA.so.${PV}
+       usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib64/opengl/nvidia/tls/libnvidia-tls.so.${PV}
+       usr/lib64/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
+       usr/lib64/opengl/nvidia/extensions/libglx.so
+       usr/lib32/xorg/libXvMCNVIDIA.so.${PV}
+       usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib32/opengl/nvidia/tls/libnvidia-tls.so.${PV}
+       usr/lib32/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
+       usr/lib32/opengl/nvidia/extensions/libglx.so"
+
+QA_EXECSTACK_amd64="usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib64/opengl/nvidia/extensions/libglx.so
+       usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib32/opengl/nvidia/extensions/libglx.so"
 
 export _POSIX2_VERSION="199209"
 

diff --git a/x11-drivers/nvidia-legacy-drivers/ChangeLog b/x11-drivers/nvidia-legacy-drivers/ChangeLog
index bc87f917f34ac2fbf9d54853cd43d10e3447207e..5df42f41acbd094c61801c224bbded5dc2438eec 100644 (file)
--- a/x11-drivers/nvidia-legacy-drivers/ChangeLog
+++ b/x11-drivers/nvidia-legacy-drivers/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/nvidia-legacy-drivers
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-legacy-drivers/ChangeLog,v 1.9 2006/10/04 20:46:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-legacy-drivers/ChangeLog,v 1.10 2006/10/09 13:36:18 wolf31o2 Exp $
+
+  09 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  nvidia-legacy-drivers-1.0.7184.ebuild:
+  Removed virtual/x11 from dependencies, removed blocker on nvidia-kernel and
+  nvidia-glx, since they're no longer in the tree, changed nostrip to strip,
+  and added QA variables for TEXTRELS and EXECSTACK for amd64 and x86. Closing
+  bug #114894.
 
   04 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   -nvidia-legacy-drivers-1.0.7182.ebuild,

diff --git a/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-1.0.7184.ebuild b/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-1.0.7184.ebuild
index 21fc70d398e3ff45e7746cfbdafe872ee6c587cb..ba93a6bdccd18831f00e0bd88dc5b9a587324336 100644 (file)
--- a/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-1.0.7184.ebuild
+++ b/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-1.0.7184.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-legacy-drivers/nvidia-legacy-drivers-1.0.7184.ebuild,v 1.4 2006/10/04 20:46:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-1.0.7184.ebuild,v 1.5 2006/10/09 13:36:18 wolf31o2 Exp $
 
 inherit eutils multilib versionator linux-mod
 
@@ -13,26 +13,53 @@ AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
 DESCRIPTION="NVIDIA X11 driver and GLX libraries for older NVIDIA cards"
 HOMEPAGE="http://www.nvidia.com/"
 SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
-        amd64? (
-                        http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run
-                        )"
+        amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
 
 LICENSE="NVIDIA"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
 IUSE="dlloader"
-RESTRICT="nostrip multilib-pkg-force"
+RESTRICT="strip multilib-pkg-force"
 
 DEPEND="virtual/linux-sources"
 RDEPEND="virtual/modutils
-        || ( x11-base/xorg-server virtual/x11 )
-        || ( media-libs/mesa virtual/x11 )
-        app-admin/eselect-opengl
-        kernel_linux? ( !media-video/nvidia-kernel )
-        kernel_FreeBSD? ( !media-video/nvidia-freebsd )
-        !app-emulation/emul-linux-x86-nvidia
-        !x11-drivers/nvidia-drivers
-        !media-video/nvidia-glx"
+       x11-base/xorg-server
+       media-libs/mesa
+       app-admin/eselect-opengl
+       kernel_FreeBSD? ( !media-video/nvidia-freebsd )
+       !app-emulation/emul-linux-x86-nvidia
+       !x11-drivers/nvidia-drivers"
+
+QA_TEXTRELS_x86="usr/lib/xorg/libXvMCNVIDIA.so.${PV}
+       usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib/opengl/nvidia/tls/libnvidia-tls.so.${PV}
+       usr/lib/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
+       usr/lib/opengl/nvidia/extensions/libglx.so"
+QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib/opengl/nvidia/extensions/libglx.so"
+
+
+QA_TEXTRELS_amd64="usr/lib64/xorg/libXvMCNVIDIA.so.${PV}
+       usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib64/opengl/nvidia/tls/libnvidia-tls.so.${PV}
+       usr/lib64/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
+       usr/lib64/opengl/nvidia/extensions/libglx.so
+       usr/lib32/xorg/libXvMCNVIDIA.so.${PV}
+       usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib32/opengl/nvidia/tls/libnvidia-tls.so.${PV}
+       usr/lib32/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
+       usr/lib32/opengl/nvidia/extensions/libglx.so"
+
+QA_EXECSTACK_amd64="usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib64/opengl/nvidia/extensions/libglx.so
+       usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+       usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+       usr/lib32/opengl/nvidia/extensions/libglx.so"
 
 export _POSIX2_VERSION="199209"