summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2012-08-06 22:09:31 +0000
committerDoug Goldstein <cardoe@gentoo.org>2012-08-06 22:09:31 +0000
commitf3ed5fc40ac364781e93943178d653d57fb99fdb (patch)
tree89ee925105a279a0c91b13ddd356d1b39701cb8a /x11-drivers
parentBeta channel bump. (diff)
downloadgentoo-2-f3ed5fc40ac364781e93943178d653d57fb99fdb.tar.gz
gentoo-2-f3ed5fc40ac364781e93943178d653d57fb99fdb.tar.bz2
gentoo-2-f3ed5fc40ac364781e93943178d653d57fb99fdb.zip
Don't call 'use' in the global scope.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/nvidia-drivers/ChangeLog7
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-173.14.34.ebuild16
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-173.14.35.ebuild16
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-96.43.20.ebuild16
4 files changed, 15 insertions, 40 deletions
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 1f369cd6af5b..bbd321958f01 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.372 2012/08/05 22:43:04 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.373 2012/08/06 22:09:31 cardoe Exp $
+
+ 06 Aug 2012; Doug Goldstein <cardoe@gentoo.org>
+ nvidia-drivers-96.43.20.ebuild, nvidia-drivers-173.14.34.ebuild,
+ nvidia-drivers-173.14.35.ebuild:
+ Don't call 'use' in the global scope.
*nvidia-drivers-302.17-r1 (05 Aug 2012)
*nvidia-drivers-295.59-r1 (05 Aug 2012)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.34.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.34.ebuild
index 5f5f6c1bcc18..8bbf442b4f8c 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.34.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.34.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.34.ebuild,v 1.8 2012/07/22 17:10:06 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.34.ebuild,v 1.9 2012/08/06 22:09:31 cardoe Exp $
EAPI="2"
@@ -129,18 +129,7 @@ QA_DT_HASH_x86="usr/lib/libcuda.so.${PV}
opt/bin/nvidia-smi
opt/bin/nvidia-xconfig"
-if use x86; then
- PKG_V="-pkg0"
- NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
- PKG_V="-pkg2"
- NV_PACKAGE="${AMD64_NV_PACKAGE}"
-elif use x86-fbsd; then
- PKG_V=""
- NV_PACKAGE="${X86_FBSD_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}${PKG_V}"
+S="${WORKDIR}/"
mtrr_check() {
ebegin "Checking for MTRR support"
@@ -210,6 +199,7 @@ pkg_setup() {
# set variables to where files are in the package structure
if use kernel_FreeBSD; then
+ use x86-fbsd && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
NV_DOC="${S}/doc"
NV_EXEC="${S}/obj"
NV_LIB="${S}/obj"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.35.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.35.ebuild
index 25b2c296bff4..72ed8778d35c 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.35.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.35.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.35.ebuild,v 1.3 2012/07/22 17:10:06 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.35.ebuild,v 1.4 2012/08/06 22:09:31 cardoe Exp $
EAPI="2"
@@ -129,18 +129,7 @@ QA_DT_HASH_x86="usr/lib/libcuda.so.${PV}
opt/bin/nvidia-smi
opt/bin/nvidia-xconfig"
-if use x86; then
- PKG_V="-pkg0"
- NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
- PKG_V="-pkg2"
- NV_PACKAGE="${AMD64_NV_PACKAGE}"
-elif use x86-fbsd; then
- PKG_V=""
- NV_PACKAGE="${X86_FBSD_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}${PKG_V}"
+S="${WORKDIR}/"
mtrr_check() {
ebegin "Checking for MTRR support"
@@ -210,6 +199,7 @@ pkg_setup() {
# set variables to where files are in the package structure
if use kernel_FreeBSD; then
+ use x86-fbsd && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
NV_DOC="${S}/doc"
NV_EXEC="${S}/obj"
NV_LIB="${S}/obj"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.20.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.20.ebuild
index 274bd19adfe8..8f4a960dbd09 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.20.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.20.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.20.ebuild,v 1.7 2012/07/22 17:10:05 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.20.ebuild,v 1.8 2012/08/06 22:09:31 cardoe Exp $
EAPI="2"
@@ -130,18 +130,7 @@ QA_DT_HASH_x86="usr/lib/libcuda.so.${PV}
usr/bin/nvidia-smi
usr/bin/nvidia-xconfig"
-if use x86; then
- PKG_V="-pkg0"
- NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
- PKG_V="-pkg2"
- NV_PACKAGE="${AMD64_NV_PACKAGE}"
-elif use x86-fbsd; then
- PKG_V=""
- NV_PACKAGE="${X86_FBSD_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}${PKG_V}"
+S="${WORKDIR}/"
mtrr_check() {
ebegin "Checking for MTRR support"
@@ -206,6 +195,7 @@ pkg_setup() {
# set variables to where files are in the package structure
if use kernel_FreeBSD; then
+ use x86-fbsd && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
NV_DOC="${S}/doc"
NV_EXEC="${S}/obj"
NV_LIB="${S}/obj"