commit: 7c6163bc23fcd5c6ffe4a56a54afe72256403657 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Sun Jun 12 16:38:15 2022 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Sun Jun 12 16:39:51 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c6163bc
x11-drivers/nvidia-drivers: cleanup old abi_x86_32 swap check Was to help reduce surprises when profile removed it as default, but been a while and should be little meaning to this now. README.Gentoo still warns about this for new installs. Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> x11-drivers/nvidia-drivers/nvidia-drivers-390.151.ebuild | 9 --------- x11-drivers/nvidia-drivers/nvidia-drivers-470.129.06.ebuild | 8 -------- x11-drivers/nvidia-drivers/nvidia-drivers-470.62.30.ebuild | 8 -------- x11-drivers/nvidia-drivers/nvidia-drivers-510.73.05-r1.ebuild | 8 -------- x11-drivers/nvidia-drivers/nvidia-drivers-515.48.07.ebuild | 8 -------- 5 files changed, 41 deletions(-) diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.151.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.151.ebuild index dc96bf8e147c..9a035a3042b7 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.151.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.151.ebuild @@ -414,8 +414,6 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"; } pkg_preinst() { - has_version "${CATEGORY}/${PN}[abi_x86_32]" && NV_HAD_ABI32= - use driver || return linux-mod_pkg_preinst @@ -436,11 +434,4 @@ pkg_postinst() { ewarn "libraries and may prevent launching GPU-accelerated applications." use driver && ewarn "The easiest way to fix this is usually to reboot." fi - - if use !abi_x86_32 && [[ -v NV_HAD_ABI32 ]]; then - elog - elog "USE=abi_x86_32 is disabled, 32bit applications will not be able to" - elog "use nvidia-drivers for acceleration without it (e.g. commonly used" - elog "with app-emulation/wine-* or steam). Re-enable if needed." - fi } diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.129.06.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.129.06.ebuild index 12467d8c7965..f799d6fa3f55 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.129.06.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.129.06.ebuild @@ -388,7 +388,6 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"; } pkg_preinst() { - has_version "${CATEGORY}/${PN}[abi_x86_32]" && NV_HAD_ABI32= has_version "${CATEGORY}/${PN}[wayland]" && NV_HAD_WAYLAND= use driver || return @@ -447,13 +446,6 @@ pkg_postinst() { ewarn "https://www.nvidia.com/object/IO_32667.html"; fi - if use !abi_x86_32 && [[ -v NV_HAD_ABI32 ]]; then - elog - elog "USE=abi_x86_32 is disabled, 32bit applications will not be able to" - elog "use nvidia-drivers for acceleration without it (e.g. commonly used" - elog "with app-emulation/wine-* or steam). Re-enable if needed." - fi - if use wayland && use driver && [[ ! -v NV_HAD_WAYLAND ]]; then elog elog "With USE=wayland, this version of ${PN} sets nvidia-drm.modeset=1" diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.30.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.30.ebuild index 427c1d1e5afb..ee448482ed44 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.30.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.30.ebuild @@ -384,7 +384,6 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"; } pkg_preinst() { - has_version "${CATEGORY}/${PN}[abi_x86_32]" && NV_HAD_ABI32= has_version "${CATEGORY}/${PN}[wayland]" && NV_HAD_WAYLAND= use driver || return @@ -443,13 +442,6 @@ pkg_postinst() { ewarn "https://www.nvidia.com/object/IO_32667.html"; fi - if use !abi_x86_32 && [[ -v NV_HAD_ABI32 ]]; then - elog - elog "USE=abi_x86_32 is disabled, 32bit applications will not be able to" - elog "use nvidia-drivers for acceleration without it (e.g. commonly used" - elog "with app-emulation/wine-* or steam). Re-enable if needed." - fi - if use wayland && use driver && [[ ! -v NV_HAD_WAYLAND ]]; then elog elog "With USE=wayland, this version of ${PN} sets nvidia-drm.modeset=1" diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-510.73.05-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-510.73.05-r1.ebuild index 91d0345da819..cba5ee54b035 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-510.73.05-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-510.73.05-r1.ebuild @@ -401,7 +401,6 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"; } pkg_preinst() { - has_version "${CATEGORY}/${PN}[abi_x86_32]" && NV_HAD_ABI32= has_version "${CATEGORY}/${PN}[wayland]" && NV_HAD_WAYLAND= use driver || return @@ -460,13 +459,6 @@ pkg_postinst() { ewarn "https://www.nvidia.com/object/IO_32667.html"; fi - if use !abi_x86_32 && [[ -v NV_HAD_ABI32 ]]; then - elog - elog "USE=abi_x86_32 is disabled, 32bit applications will not be able to" - elog "use nvidia-drivers for acceleration without it (e.g. commonly used" - elog "with app-emulation/wine-* or steam). Re-enable if needed." - fi - if use wayland && use driver && [[ ! -v NV_HAD_WAYLAND ]]; then elog elog "With USE=wayland, this version of ${PN} sets nvidia-drm.modeset=1" diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-515.48.07.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-515.48.07.ebuild index 2da13d432f23..42565f386668 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-515.48.07.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-515.48.07.ebuild @@ -424,7 +424,6 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"; } pkg_preinst() { - has_version "${CATEGORY}/${PN}[abi_x86_32]" && NV_HAD_ABI32= has_version "${CATEGORY}/${PN}[wayland]" && NV_HAD_WAYLAND= use driver || return @@ -494,13 +493,6 @@ pkg_postinst() { ewarn "Switch back to USE=-kernel-open to restore functionality if needed for now." fi - if use !abi_x86_32 && [[ -v NV_HAD_ABI32 ]]; then - elog - elog "USE=abi_x86_32 is disabled, 32bit applications will not be able to" - elog "use nvidia-drivers for acceleration without it (e.g. commonly used" - elog "with app-emulation/wine-* or steam). Re-enable if needed." - fi - if use wayland && use driver && [[ ! -v NV_HAD_WAYLAND ]]; then elog elog "With USE=wayland, this version of ${PN} sets nvidia-drm.modeset=1"
