Fixing up executable stacks and closing bug #114894.

(Portage version: 2.1.2_rc2-r2)

5 files changed, 39 insertions, 10 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 57554008e054..0fd98f2e244d 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,11 @@
 # 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.29 2006/11/10 17:47:19 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.30 2006/12/04 16:22:08 wolf31o2 Exp $
+
+  04 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  nvidia-drivers-1.0.8774.ebuild, nvidia-drivers-1.0.8776.ebuild,
+  nvidia-drivers-1.0.9629.ebuild, nvidia-drivers-1.0.9742.ebuild:
+  Fixing up executable stacks and closing bug #114894.
 
   10 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   -files/1.0.9626/NVIDIA-1.0.9626-i2c.diff, -nvidia-drivers-1.0.9626.ebuild:
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 63c12c715b15..66c9a172c9c3 100644
--- 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.11 2006/10/20 18:47:54 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8774.ebuild,v 1.12 2006/12/04 16:22:08 wolf31o2 Exp $
 
 inherit eutils multilib versionator linux-mod
 
@@ -35,23 +35,29 @@ QA_TEXTRELS_x86="usr/lib/xorg/libXvMCNVIDIA.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/libXvMCNVIDIA.so.${PV}
+	usr/lib/xorg/modules/drivers/nvidia_drv.so
 	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/libXvMCNVIDIA.so.${PV}
+	usr/lib64/xorg/modules/drivers/nvidia_drv.so
 	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/libXvMCNVIDIA.so.${PV}
+	usr/lib32/xorg/modules/drivers/nvidia_drv.so
 	usr/lib32/opengl/nvidia/extensions/libglx.so"
 
 QA_EXECSTACK_amd64="usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8776.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8776.ebuild
index 6cc8f00ba649..7f1ada0e123f 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8776.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8776.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.8776.ebuild,v 1.4 2006/10/24 09:08:36 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8776.ebuild,v 1.5 2006/12/04 16:22:08 wolf31o2 Exp $
 
 inherit eutils multilib versionator linux-mod
 
@@ -35,23 +35,29 @@ QA_TEXTRELS_x86="usr/lib/xorg/libXvMCNVIDIA.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/libXvMCNVIDIA.so.${PV}
+	usr/lib/xorg/modules/drivers/nvidia_drv.so
 	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/libXvMCNVIDIA.so.${PV}
+	usr/lib64/xorg/modules/drivers/nvidia_drv.so
 	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/libXvMCNVIDIA.so.${PV}
+	usr/lib32/xorg/modules/drivers/nvidia_drv.so
 	usr/lib32/opengl/nvidia/extensions/libglx.so"
 
 QA_EXECSTACK_amd64="usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9629.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9629.ebuild
index 2434d91ee910..caae51ccee11 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9629.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9629.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.9629.ebuild,v 1.1 2006/11/09 03:09:32 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9629.ebuild,v 1.2 2006/12/04 16:22:08 wolf31o2 Exp $
 
 inherit eutils multilib versionator linux-mod
 
@@ -35,23 +35,29 @@ QA_TEXTRELS_x86="usr/lib/xorg/libXvMCNVIDIA.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/libXvMCNVIDIA.so.${PV}
+	usr/lib/xorg/modules/drivers/nvidia_drv.so
 	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/libXvMCNVIDIA.so.${PV}
+	usr/lib64/xorg/modules/drivers/nvidia_drv.so
 	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/libXvMCNVIDIA.so.${PV}
+	usr/lib32/xorg/modules/drivers/nvidia_drv.so
 	usr/lib32/opengl/nvidia/extensions/libglx.so"
 
 QA_EXECSTACK_amd64="usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
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 3b24f4af488c..81b4139da584 100644
--- 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.1 2006/11/09 03:09:32 augustus Exp $
+# $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 $
 
 inherit eutils multilib versionator linux-mod
 
@@ -19,7 +19,7 @@ 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 )
@@ -35,23 +35,29 @@ QA_TEXTRELS_x86="usr/lib/xorg/libXvMCNVIDIA.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/libXvMCNVIDIA.so.${PV}
+	usr/lib/xorg/modules/drivers/nvidia_drv.so
 	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/libXvMCNVIDIA.so.${PV}
+	usr/lib64/xorg/modules/drivers/nvidia_drv.so
 	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/libXvMCNVIDIA.so.${PV}
+	usr/lib32/xorg/modules/drivers/nvidia_drv.so
 	usr/lib32/opengl/nvidia/extensions/libglx.so"
 
 QA_EXECSTACK_amd64="usr/lib64/opengl/nvidia/lib/libGL.so.${PV}