From e79d02bbd2f23cb4c5853f2bc1658a04e8babc65 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Wed, 29 Jul 2020 11:06:26 +0200 Subject: [PATCH] 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 --- x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild | 4 ++-- x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild | 4 ++-- x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild | 4 ++-- x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild | 4 ++-- x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild | 4 ++-- x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild | 4 ++-- x11-drivers/nvidia-drivers/nvidia-drivers-450.57.ebuild | 4 ++-- 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 7a80b3b167604..9686b8841f964 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 9f8c321730d44..4ae7ac3a591ca 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 ed44447cab690..783dd93a4d22a 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 c0d34244d9e7e..201d54e65f360 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 6f7f4849d837d..904301e291d34 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 a612c0cf4ce15..f0e33105985a7 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 df4d3027720ca..15496d03ad621 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}"