x11-drivers/nvidia-drivers: Run sanity checks twice as pkg_pretend log output is...

Package-Manager: Portage-2.3.5, Repoman-2.3.2

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.135.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.135.ebuild
index ec09f809357afdd2a0276e77f4c48b3fe8abc4d5..4a3c1c5a6129352386827cc4ed9a7d4f5140c738 100644 (file)
--- 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 f140c9b44f0f75954f4f4f66a7a0544404e61fa3..b683c4e9673263af84067d062db8a0123786a83e 100644 (file)
--- 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 40658cbfd7f8e862369038c6d8cd69acf6390664..9d9e55a65a689ce5ec83dc65d8ecb173ed596b1b 100644 (file)
--- 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 89663b7a7b49d948026c990423007a35d2b0413a..30637f9ee0b9257a29749f66cf54c07f129f6aa2 100644 (file)
--- 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 7e2fa870aefeffa8a8019ee5bc028cd86e0066df..dfff52a1e0e029daf5a2417a2811b14ef6469d61 100644 (file)
--- 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 7e2fa870aefeffa8a8019ee5bc028cd86e0066df..dfff52a1e0e029daf5a2417a2811b14ef6469d61 100644 (file)
--- 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