[gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/

[David Seifert]

commit:     81d05a05a541e4d9ccb8a9bd765ff9224444f2d0
Author:     Ionen Wolkens <sudinave <AT> gmail <DOT> com>
AuthorDate: Sat Apr  3 19:02:45 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Apr  3 19:02:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81d05a05

x11-drivers/nvidia-drivers: use clearer x86 abi check

May or may not help multilib-portage users a bit (bug #778986),
but note that this isn't really being supported.

390.xx handled slightly differently because of x86 keyword.

Closes: https://bugs.gentoo.org/778986
Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild    | 6 +++---
 x11-drivers/nvidia-drivers/nvidia-drivers-450.102.04-r1.ebuild | 6 +++---
 x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild        | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild
index bff5e56f68c..d4e9ad71748 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.141-r1.ebuild
@@ -226,13 +226,13 @@ src_install() {
                fi
 
                local libdir=.
-               if multilib_is_native_abi; then
+               if [[ -d 32 && ${ABI} == x86 ]]; then
+                       libdir+=/32
+               else
                        libs+=(
                                nvidia-cfg
                                nvidia-wfb
                        )
-               else
-                       libdir+=/32
                fi
 
                local lib soname

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-450.102.04-r1.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-450.102.04-r1.ebuild
index a425556ec3c..8626b1e7821 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-450.102.04-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-450.102.04-r1.ebuild
@@ -219,7 +219,9 @@ src_install() {
                fi
 
                local libdir=.
-               if multilib_is_native_abi; then
+               if [[ ${ABI} == x86 ]]; then
+                       libdir+=/32
+               else
                        libs+=(
                                nvidia-cbl
                                nvidia-cfg
@@ -227,8 +229,6 @@ src_install() {
                                nvoptix
                        )
                        use amd64 && libs+=( nvidia-ngx )
-               else
-                       libdir+=/32
                fi
 
                local lib soname

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild
index 5f88085c134..d50b8ea65b6 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild
@@ -224,7 +224,9 @@ src_install() {
                fi
 
                local libdir=.
-               if multilib_is_native_abi; then
+               if [[ ${ABI} == x86 ]]; then
+                       libdir+=/32
+               else
                        libs+=(
                                nvidia-cbl
                                nvidia-cfg
@@ -232,8 +234,6 @@ src_install() {
                                nvoptix
                        )
                        use amd64 && libs+=( nvidia-ngx )
-               else
-                       libdir+=/32
                fi
 
                local lib soname