commit: 83a027aba68dcea2c64004ad8aa58e4bd6186c69
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 29 08:21:03 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jul 29 08:31:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83a027ab
x11-drivers/nvidia-drivers: Use multilib_get_enabled_abis
revdep-rebuild{,.sh} complain about missing dependencies for
nvidia-drivers' 32-bit libraries when USE=-abi_x86_32 because in that
case MULTILIB_USEDEP does not require those to install 32-bit libraries,
but nvidia-drivers' 32-bit libraries get installed anyway.
This happens because the ABI check that determines whether to install
those 32-bit libraries incorrectly uses the eclass function
get_install_abis from multilib.eclass instead of
multilib_get_enabled_abis from multilib-build.eclass.
Thanks to slyfox for the patch.
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Closes: https://bugs.gentoo.org/702804
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild | 2 +-
x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild | 2 +-
x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild | 2 +-
x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild | 2 +-
x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild | 2 +-
x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild | 2 +-
x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild | 2 +-
x11-drivers/nvidia-drivers/nvidia-drivers-450.57.ebuild | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild
b/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild
index 7ab4dac5757..6540569e813 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild
@@ -355,7 +355,7 @@ src_install() {
if has_multilib_profile && use multilib ; then
local OABI=${ABI}
- for ABI in $(get_install_abis) ; do
+ for ABI in $(multilib_get_enabled_abis) ; do
src_install-libs
done
ABI=${OABI}
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 7c7657ebc1d..7a80b3b1676 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild
@@ -395,7 +395,7 @@ src_install() {
if has_multilib_profile && use multilib; then
local OABI=${ABI}
- for ABI in $(get_install_abis); do
+ for ABI in $(multilib_get_enabled_abis); do
src_install-libs
done
ABI=${OABI}
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 7485e2d3b3f..9f8c321730d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild
@@ -404,7 +404,7 @@ src_install() {
if has_multilib_profile && use multilib; then
local OABI=${ABI}
- for ABI in $(get_install_abis); do
+ for ABI in $(multilib_get_enabled_abis); do
src_install-libs
done
ABI=${OABI}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild
b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild
index ce2ee50aa0b..ed44447cab6 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild
@@ -405,7 +405,7 @@ src_install() {
if has_multilib_profile && use multilib; then
local OABI=${ABI}
- for ABI in $(get_install_abis); do
+ for ABI in $(multilib_get_enabled_abis); do
src_install-libs
done
ABI=${OABI}
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 45000cee3af..c0d34244d9e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild
@@ -392,7 +392,7 @@ src_install() {
if has_multilib_profile && use multilib; then
local OABI=${ABI}
- for ABI in $(get_install_abis); do
+ for ABI in $(multilib_get_enabled_abis); do
src_install-libs
done
ABI=${OABI}
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 829f5b620a2..6f7f4849d83 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild
@@ -396,7 +396,7 @@ src_install() {
if has_multilib_profile && use multilib; then
local OABI=${ABI}
- for ABI in $(get_install_abis); do
+ for ABI in $(multilib_get_enabled_abis); do
src_install-libs
done
ABI=${OABI}
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 b3a49cea087..a612c0cf4ce 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild
@@ -399,7 +399,7 @@ src_install() {
if has_multilib_profile && use multilib; then
local OABI=${ABI}
- for ABI in $(get_install_abis); do
+ for ABI in $(multilib_get_enabled_abis); do
src_install-libs
done
ABI=${OABI}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-450.57.ebuild
b/x11-drivers/nvidia-drivers/nvidia-drivers-450.57.ebuild
index aeb2f5eaff9..df4d3027720 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-450.57.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-450.57.ebuild
@@ -400,7 +400,7 @@ src_install() {
if has_multilib_profile && use multilib; then
local OABI=${ABI}
- for ABI in $(get_install_abis); do
+ for ABI in $(multilib_get_enabled_abis); do
src_install-libs
done
ABI=${OABI}
