commit: 0d9369e74f5b6674374c17ccf3a6c91f7cabea18 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Wed Jun 14 16:23:06 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Wed Jun 14 16:37:14 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d9369e7
x11-drivers/nvidia-drivers: minor ebuild nitpicks Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild | 6 +++--- x11-drivers/nvidia-drivers/nvidia-drivers-470.182.03-r2.ebuild | 6 +++--- x11-drivers/nvidia-drivers/nvidia-drivers-515.105.01-r2.ebuild | 6 +++--- x11-drivers/nvidia-drivers/nvidia-drivers-525.116.04-r2.ebuild | 6 +++--- x11-drivers/nvidia-drivers/nvidia-drivers-525.47.26-r2.ebuild | 6 +++--- x11-drivers/nvidia-drivers/nvidia-drivers-530.41.03-r2.ebuild | 6 +++--- x11-drivers/nvidia-drivers/nvidia-drivers-535.43.02-r2.ebuild | 6 +++--- x11-drivers/nvidia-drivers/nvidia-drivers-535.54.03.ebuild | 6 +++--- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild index 4395ca7609bb..782cd04ec2cb 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild @@ -392,14 +392,14 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"; VULKAN_ICD_JSON) m[0]=${m[0]%.template};; esac - if [[ -v paths[${m[2]}] ]]; then + if [[ -v 'paths[${m[2]}]' ]]; then into=${paths[${m[2]}]} - elif [[ ${m[2]} =~ _BINARY$ ]]; then + elif [[ ${m[2]} == *_BINARY ]]; then into=/opt/bin elif [[ ${m[3]} == COMPAT32 ]]; then use abi_x86_32 || continue into=/usr/${libdir32} - elif [[ ${m[2]} =~ _LIB$|_SYMLINK$ ]]; then + elif [[ ${m[2]} == *_@(LIB|SYMLINK) ]]; then into=/usr/${libdir} else die "No known installation path for ${m[0]}" diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.182.03-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.182.03-r2.ebuild index f92cf1cc0973..c81eb65e5664 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.182.03-r2.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.182.03-r2.ebuild @@ -366,14 +366,14 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"; VDPAU_SYMLINK) m[4]=vdpau/; m[5]=${m[5]#vdpau/};; # .so to vdpau/ esac - if [[ -v paths[${m[2]}] ]]; then + if [[ -v 'paths[${m[2]}]' ]]; then into=${paths[${m[2]}]} - elif [[ ${m[2]} =~ _BINARY$ ]]; then + elif [[ ${m[2]} == *_BINARY ]]; then into=/opt/bin elif [[ ${m[3]} == COMPAT32 ]]; then use abi_x86_32 || continue into=/usr/${libdir32} - elif [[ ${m[2]} =~ _LIB$|_SYMLINK$ ]]; then + elif [[ ${m[2]} == *_@(LIB|SYMLINK) ]]; then into=/usr/${libdir} else die "No known installation path for ${m[0]}" diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-515.105.01-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-515.105.01-r2.ebuild index 69acddc4ff35..69bf55511e3f 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-515.105.01-r2.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-515.105.01-r2.ebuild @@ -412,14 +412,14 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"; VDPAU_SYMLINK) m[4]=vdpau/; m[5]=${m[5]#vdpau/};; # .so to vdpau/ esac - if [[ -v paths[${m[2]}] ]]; then + if [[ -v 'paths[${m[2]}]' ]]; then into=${paths[${m[2]}]} - elif [[ ${m[2]} =~ _BINARY$ ]]; then + elif [[ ${m[2]} == *_BINARY ]]; then into=/opt/bin elif [[ ${m[3]} == COMPAT32 ]]; then use abi_x86_32 || continue into=/usr/${libdir32} - elif [[ ${m[2]} =~ _LIB$|_SYMLINK$ ]]; then + elif [[ ${m[2]} == *_@(LIB|SYMLINK) ]]; then into=/usr/${libdir} else die "No known installation path for ${m[0]}" diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.116.04-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.116.04-r2.ebuild index b821ca109c90..2abd1c113768 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.116.04-r2.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.116.04-r2.ebuild @@ -410,14 +410,14 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"; VDPAU_SYMLINK) m[4]=vdpau/; m[5]=${m[5]#vdpau/};; # .so to vdpau/ esac - if [[ -v paths[${m[2]}] ]]; then + if [[ -v 'paths[${m[2]}]' ]]; then into=${paths[${m[2]}]} - elif [[ ${m[2]} =~ _BINARY$ ]]; then + elif [[ ${m[2]} == *_BINARY ]]; then into=/opt/bin elif [[ ${m[3]} == COMPAT32 ]]; then use abi_x86_32 || continue into=/usr/${libdir32} - elif [[ ${m[2]} =~ _LIB$|_SYMLINK$ ]]; then + elif [[ ${m[2]} == *_@(LIB|SYMLINK) ]]; then into=/usr/${libdir} else die "No known installation path for ${m[0]}" diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.26-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.26-r2.ebuild index 43bc207ec36d..6b8d1b4212dc 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.26-r2.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.26-r2.ebuild @@ -411,14 +411,14 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"; VDPAU_SYMLINK) m[4]=vdpau/; m[5]=${m[5]#vdpau/};; # .so to vdpau/ esac - if [[ -v paths[${m[2]}] ]]; then + if [[ -v 'paths[${m[2]}]' ]]; then into=${paths[${m[2]}]} - elif [[ ${m[2]} =~ _BINARY$ ]]; then + elif [[ ${m[2]} == *_BINARY ]]; then into=/opt/bin elif [[ ${m[3]} == COMPAT32 ]]; then use abi_x86_32 || continue into=/usr/${libdir32} - elif [[ ${m[2]} =~ _LIB$|_SYMLINK$ ]]; then + elif [[ ${m[2]} == *_@(LIB|SYMLINK) ]]; then into=/usr/${libdir} else die "No known installation path for ${m[0]}" diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-530.41.03-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-530.41.03-r2.ebuild index 377300e2f9df..6a9917b328fe 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-530.41.03-r2.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-530.41.03-r2.ebuild @@ -410,14 +410,14 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"; VDPAU_SYMLINK) m[4]=vdpau/; m[5]=${m[5]#vdpau/};; # .so to vdpau/ esac - if [[ -v paths[${m[2]}] ]]; then + if [[ -v 'paths[${m[2]}]' ]]; then into=${paths[${m[2]}]} - elif [[ ${m[2]} =~ _BINARY$ ]]; then + elif [[ ${m[2]} == *_BINARY ]]; then into=/opt/bin elif [[ ${m[3]} == COMPAT32 ]]; then use abi_x86_32 || continue into=/usr/${libdir32} - elif [[ ${m[2]} =~ _LIB$|_SYMLINK$ ]]; then + elif [[ ${m[2]} == *_@(LIB|SYMLINK) ]]; then into=/usr/${libdir} else die "No known installation path for ${m[0]}" diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.02-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.02-r2.ebuild index 908c41c31895..2acdb9d60c34 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.02-r2.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.02-r2.ebuild @@ -420,14 +420,14 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"; VDPAU_SYMLINK) m[4]=vdpau/; m[5]=${m[5]#vdpau/};; # .so to vdpau/ esac - if [[ -v paths[${m[2]}] ]]; then + if [[ -v 'paths[${m[2]}]' ]]; then into=${paths[${m[2]}]} - elif [[ ${m[2]} =~ _BINARY$ ]]; then + elif [[ ${m[2]} == *_BINARY ]]; then into=/opt/bin elif [[ ${m[3]} == COMPAT32 ]]; then use abi_x86_32 || continue into=/usr/${libdir32} - elif [[ ${m[2]} =~ _LIB$|_SYMLINK$ ]]; then + elif [[ ${m[2]} == *_@(LIB|SYMLINK) ]]; then into=/usr/${libdir} else die "No known installation path for ${m[0]}" diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.54.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.54.03.ebuild index d4a196a32485..947c9a90fc72 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.54.03.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.54.03.ebuild @@ -419,16 +419,16 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"; VDPAU_SYMLINK) m[4]=vdpau/; m[5]=${m[5]#vdpau/};; # .so to vdpau/ esac - if [[ -v paths[${m[2]}] ]]; then + if [[ -v 'paths[${m[2]}]' ]]; then into=${paths[${m[2]}]} elif [[ ${m[2]} == EXPLICIT_PATH ]]; then into=${m[3]} - elif [[ ${m[2]} =~ _BINARY$ ]]; then + elif [[ ${m[2]} == *_BINARY ]]; then into=/opt/bin elif [[ ${m[3]} == COMPAT32 ]]; then use abi_x86_32 || continue into=/usr/${libdir32} - elif [[ ${m[2]} =~ _LIB$|_SYMLINK$ ]]; then + elif [[ ${m[2]} == *_@(LIB|SYMLINK) ]]; then into=/usr/${libdir} else die "No known installation path for ${m[0]}"
