diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2020-07-29 11:06:26 +0200 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2020-07-29 11:07:43 +0200 |
| commit | e79d02bbd2f23cb4c5853f2bc1658a04e8babc65 (patch) | |
| tree | df309ea7732a735b24e05c6de14cebdd86b8ad7b /x11-drivers/nvidia-drivers | |
| parent | x11-drivers/nvidia-drivers: Use multilib_get_enabled_abis (diff) | |
| download | gentoo-e79d02bbd2f23cb4c5853f2bc1658a04e8babc65.tar.gz gentoo-e79d02bbd2f23cb4c5853f2bc1658a04e8babc65.tar.bz2 gentoo-e79d02bbd2f23cb4c5853f2bc1658a04e8babc65.zip | |
x11-drivers/nvidia-drivers: Install 64-bit libs on non-multilib
Checking for has_multilib_profile is not required for installing 64-bit
libraries.
Thanks to jaynus in https://bugs.gentoo.org/690184#c1 for his admirable
patience.
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Closes: https://bugs.gentoo.org/690184
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
Diffstat (limited to 'x11-drivers/nvidia-drivers')
7 files changed, 14 insertions, 14 deletions
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild index 7a80b3b16760..9686b8841f96 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild @@ -466,14 +466,14 @@ src_install-libs() { "libvdpau_nvidia.so.${NV_SOVER}" ) - if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]]; + if use wayland && [[ ${ABI} == "amd64" ]]; then NV_GLX_LIBRARIES+=( "libnvidia-egl-wayland.so.1.0.2" ) fi - if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]]; + if use kernel_linux && [[ ${ABI} == "amd64" ]]; then NV_GLX_LIBRARIES+=( "libnvidia-wfb.so.${NV_SOVER}" diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild index 9f8c321730d4..4ae7ac3a591c 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild @@ -483,14 +483,14 @@ src_install-libs() { ) fi - if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]]; + if use wayland && [[ ${ABI} == "amd64" ]]; then NV_GLX_LIBRARIES+=( "libnvidia-egl-wayland.so.1.0.2" ) fi - if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]]; + if use kernel_linux && [[ ${ABI} == "amd64" ]]; then NV_GLX_LIBRARIES+=( "libnvidia-wfb.so.${NV_SOVER}" diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild index ed44447cab69..783dd93a4d22 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild @@ -484,14 +484,14 @@ src_install-libs() { ) fi - if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]]; + if use wayland && [[ ${ABI} == "amd64" ]]; then NV_GLX_LIBRARIES+=( "libnvidia-egl-wayland.so.1.0.2" ) fi - if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]]; + if use kernel_linux && [[ ${ABI} == "amd64" ]]; then NV_GLX_LIBRARIES+=( "libnvidia-wfb.so.${NV_SOVER}" diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild index c0d34244d9e7..201d54e65f36 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild @@ -464,7 +464,7 @@ src_install-libs() { "libvdpau_nvidia.so.${NV_SOVER}" ) - if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]]; + if use wayland && [[ ${ABI} == "amd64" ]]; then NV_GLX_LIBRARIES+=( "libnvidia-egl-wayland.so.1.1.2" @@ -484,7 +484,7 @@ src_install-libs() { ) fi - if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]]; + if use kernel_linux && [[ ${ABI} == "amd64" ]]; then NV_GLX_LIBRARIES+=( "libnvidia-cbl.so.${NV_SOVER}" diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild index 6f7f4849d837..904301e291d3 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild @@ -476,7 +476,7 @@ src_install-libs() { ) fi - if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]]; + if use wayland && [[ ${ABI} == "amd64" ]]; then NV_GLX_LIBRARIES+=( "libnvidia-egl-wayland.so.1.1.3" @@ -496,7 +496,7 @@ src_install-libs() { ) fi - if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]]; + if use kernel_linux && [[ ${ABI} == "amd64" ]]; then NV_GLX_LIBRARIES+=( "libnvidia-cbl.so.${NV_SOVER}" diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild index a612c0cf4ce1..f0e33105985a 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild @@ -479,7 +479,7 @@ src_install-libs() { ) fi - if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]]; + if use wayland && [[ ${ABI} == "amd64" ]]; then NV_GLX_LIBRARIES+=( "libnvidia-egl-wayland.so.1.1.4" @@ -499,7 +499,7 @@ src_install-libs() { ) fi - if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]]; + if use kernel_linux && [[ ${ABI} == "amd64" ]]; then NV_GLX_LIBRARIES+=( "libnvidia-cbl.so.${NV_SOVER}" diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-450.57.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-450.57.ebuild index df4d3027720c..15496d03ad62 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-450.57.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-450.57.ebuild @@ -481,7 +481,7 @@ src_install-libs() { ) fi - if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]]; + if use wayland && [[ ${ABI} == "amd64" ]]; then NV_GLX_LIBRARIES+=( "libnvidia-egl-wayland.so.1.1.4" @@ -501,7 +501,7 @@ src_install-libs() { ) fi - if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]]; + if use kernel_linux && [[ ${ABI} == "amd64" ]]; then NV_GLX_LIBRARIES+=( "libnvidia-cbl.so.${NV_SOVER}" |