commit: 2c97a76608ae27b38eea700cd5da6d279d81f612
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu May 18 22:06:31 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu May 18 22:18:01 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c97a766
x11-drivers/nvidia-drivers: Run sanity checks twice as pkg_pretend log output
is apparently buggy.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
x11-drivers/nvidia-drivers/nvidia-drivers-304.135.ebuild | 9 +++++++--
x11-drivers/nvidia-drivers/nvidia-drivers-340.102.ebuild | 8 +++++++-
x11-drivers/nvidia-drivers/nvidia-drivers-375.66.ebuild | 8 +++++++-
x11-drivers/nvidia-drivers/nvidia-drivers-378.13.ebuild | 8 +++++++-
x11-drivers/nvidia-drivers/nvidia-drivers-381.09.ebuild | 8 +++++++-
x11-drivers/nvidia-drivers/nvidia-drivers-381.22.ebuild | 8 +++++++-
6 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.135.ebuild
b/x11-drivers/nvidia-drivers/nvidia-drivers-304.135.ebuild
index ec09f809357..4a3c1c5a612 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.135.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.135.ebuild
@@ -72,8 +72,7 @@ QA_PREBUILT="opt/* usr/lib*"
S=${WORKDIR}/
-pkg_pretend() {
-
+nvidia_drivers_versions_check() {
if use amd64 && has_multilib_profile && \
[ "${DEFAULT_ABI}" != "amd64" ]; then
eerror "This ebuild doesn't currently support changing your
default ABI"
@@ -108,7 +107,13 @@ pkg_pretend() {
use kernel_linux && check_extra_config
}
+pkg_pretend() {
+ nvidia_drivers_versions_check
+}
+
pkg_setup() {
+ nvidia_drivers_versions_check
+
# try to turn off distcc and ccache for people that have a problem with
it
export DISTCC_DISABLE=1
export CCACHE_DISABLE=1
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.102.ebuild
b/x11-drivers/nvidia-drivers/nvidia-drivers-340.102.ebuild
index f140c9b44f0..b683c4e9673 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.102.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.102.ebuild
@@ -71,7 +71,7 @@ QA_PREBUILT="opt/* usr/lib*"
S=${WORKDIR}/
-pkg_pretend() {
+nvidia_drivers_versions_check() {
if use amd64 && has_multilib_profile && \
[ "${DEFAULT_ABI}" != "amd64" ]; then
eerror "This ebuild doesn't currently support changing your
default ABI"
@@ -106,7 +106,13 @@ pkg_pretend() {
use kernel_linux && check_extra_config
}
+pkg_pretend() {
+ nvidia_drivers_versions_check
+}
+
pkg_setup() {
+ nvidia_drivers_versions_check
+
# try to turn off distcc and ccache for people that have a problem with
it
export DISTCC_DISABLE=1
export CCACHE_DISABLE=1
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-375.66.ebuild
b/x11-drivers/nvidia-drivers/nvidia-drivers-375.66.ebuild
index 40658cbfd7f..9d9e55a65a6 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-375.66.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-375.66.ebuild
@@ -84,7 +84,7 @@ QA_PREBUILT="opt/* usr/lib*"
S=${WORKDIR}/
-pkg_pretend() {
+nvidia_drivers_versions_check() {
if use amd64 && has_multilib_profile && \
[ "${DEFAULT_ABI}" != "amd64" ]; then
eerror "This ebuild doesn't currently support changing your
default ABI"
@@ -119,7 +119,13 @@ pkg_pretend() {
use kernel_linux && check_extra_config
}
+pkg_pretend() {
+ nvidia_drivers_versions_check
+}
+
pkg_setup() {
+ nvidia_drivers_versions_check
+
# try to turn off distcc and ccache for people that have a problem with
it
export DISTCC_DISABLE=1
export CCACHE_DISABLE=1
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-378.13.ebuild
b/x11-drivers/nvidia-drivers/nvidia-drivers-378.13.ebuild
index 89663b7a7b4..30637f9ee0b 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-378.13.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-378.13.ebuild
@@ -84,7 +84,7 @@ QA_PREBUILT="opt/* usr/lib*"
S=${WORKDIR}/
-pkg_pretend() {
+nvidia_drivers_versions_check() {
if use amd64 && has_multilib_profile && \
[ "${DEFAULT_ABI}" != "amd64" ]; then
eerror "This ebuild doesn't currently support changing your
default ABI"
@@ -119,7 +119,13 @@ pkg_pretend() {
use kernel_linux && check_extra_config
}
+pkg_pretend() {
+ nvidia_drivers_versions_check
+}
+
pkg_setup() {
+ nvidia_drivers_versions_check
+
# try to turn off distcc and ccache for people that have a problem with
it
export DISTCC_DISABLE=1
export CCACHE_DISABLE=1
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-381.09.ebuild
b/x11-drivers/nvidia-drivers/nvidia-drivers-381.09.ebuild
index 7e2fa870aef..dfff52a1e0e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-381.09.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-381.09.ebuild
@@ -85,7 +85,7 @@ QA_PREBUILT="opt/* usr/lib*"
S=${WORKDIR}/
-pkg_pretend() {
+nvidia_drivers_versions_check() {
if use amd64 && has_multilib_profile && \
[ "${DEFAULT_ABI}" != "amd64" ]; then
eerror "This ebuild doesn't currently support changing your
default ABI"
@@ -120,7 +120,13 @@ pkg_pretend() {
use kernel_linux && check_extra_config
}
+pkg_pretend() {
+ nvidia_drivers_versions_check
+}
+
pkg_setup() {
+ nvidia_drivers_versions_check
+
# try to turn off distcc and ccache for people that have a problem with
it
export DISTCC_DISABLE=1
export CCACHE_DISABLE=1
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-381.22.ebuild
b/x11-drivers/nvidia-drivers/nvidia-drivers-381.22.ebuild
index 7e2fa870aef..dfff52a1e0e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-381.22.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-381.22.ebuild
@@ -85,7 +85,7 @@ QA_PREBUILT="opt/* usr/lib*"
S=${WORKDIR}/
-pkg_pretend() {
+nvidia_drivers_versions_check() {
if use amd64 && has_multilib_profile && \
[ "${DEFAULT_ABI}" != "amd64" ]; then
eerror "This ebuild doesn't currently support changing your
default ABI"
@@ -120,7 +120,13 @@ pkg_pretend() {
use kernel_linux && check_extra_config
}
+pkg_pretend() {
+ nvidia_drivers_versions_check
+}
+
pkg_setup() {
+ nvidia_drivers_versions_check
+
# try to turn off distcc and ccache for people that have a problem with
it
export DISTCC_DISABLE=1
export CCACHE_DISABLE=1
