x11-drivers/nvidia-drivers: minor style adjustments

Signed-off-by: Ionen Wolkens <ionen@gentoo.org>

5 files changed, 70 insertions, 40 deletions

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
index fce832416735..6adc3f8615de 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
@@ -16,9 +16,10 @@ SRC_URI="
 	amd64? ( ${NV_URI}Linux-x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run )
 	x86? ( ${NV_URI}Linux-x86/${PV}/NVIDIA-Linux-x86-${PV}.run )
 	$(printf "${NV_URI}%s/%s-${PV}.tar.bz2 " \
-		nvidia-{installer,modprobe,persistenced,settings,xconfig}{,})"
+		nvidia-{installer,modprobe,persistenced,settings,xconfig}{,})
+"
 # nvidia-installer is unused but here for GPL-2's "distribute sources"
-S="${WORKDIR}"
+S=${WORKDIR}
 
 LICENSE="NVIDIA-r2 BSD BSD-2 GPL-2 MIT"
 SLOT="0/${PV%%.*}"
@@ -43,7 +44,8 @@ COMMON_DEPEND="
 		x11-libs/libXext
 		x11-libs/libXxf86vm
 		x11-libs/pango
-	)"
+	)
+"
 RDEPEND="
 	${COMMON_DEPEND}
 	sys-libs/glibc
@@ -51,7 +53,8 @@ RDEPEND="
 		media-libs/libglvnd[X,abi_x86_32(-)?]
 		x11-libs/libX11[abi_x86_32(-)?]
 		x11-libs/libXext[abi_x86_32(-)?]
-	)"
+	)
+"
 DEPEND="
 	${COMMON_DEPEND}
 	static-libs? (
@@ -65,10 +68,12 @@ DEPEND="
 		x11-libs/libXrandr
 		x11-libs/libXv
 		x11-libs/libvdpau
-	)"
+	)
+"
 BDEPEND="
 	sys-devel/m4
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 QA_PREBUILT="opt/bin/* usr/lib*"
 
@@ -92,7 +97,8 @@ pkg_setup() {
 		~!AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT
 		~!LOCKDEP
 		~!X86_KERNEL_IBT
-		!DEBUG_MUTEXES"
+		!DEBUG_MUTEXES
+	"
 
 	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
 	of drivers (no custom config), and optional nvidia-drm.modeset=1.
@@ -176,7 +182,7 @@ src_compile() {
 	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig
 
 	if use tools; then
-		# cflags: avoid noisy logs, only use here and set first to let override
+		# avoid noisy *very* noisy logs with deprecation warnings
 		CFLAGS="-Wno-deprecated-declarations ${CFLAGS}" \
 			emake "${NV_ARGS[@]}" -C nvidia-settings
 	elif use static-libs; then
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.199.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.199.02.ebuild
index 59cdea3c4d44..eca9160ac8de 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.199.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.199.02.ebuild
@@ -15,9 +15,10 @@ HOMEPAGE="https://www.nvidia.com/download/index.aspx"
 SRC_URI="
 	${NV_URI}Linux-x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run
 	$(printf "${NV_URI}%s/%s-${PV}.tar.bz2 " \
-		nvidia-{installer,modprobe,persistenced,settings,xconfig}{,})"
+		nvidia-{installer,modprobe,persistenced,settings,xconfig}{,})
+"
 # nvidia-installer is unused but here for GPL-2's "distribute sources"
-S="${WORKDIR}"
+S=${WORKDIR}
 
 LICENSE="NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
 SLOT="0/${PV%%.*}"
@@ -42,7 +43,8 @@ COMMON_DEPEND="
 		x11-libs/libXext
 		x11-libs/libXxf86vm
 		x11-libs/pango
-	)"
+	)
+"
 RDEPEND="
 	${COMMON_DEPEND}
 	sys-libs/glibc
@@ -54,7 +56,8 @@ RDEPEND="
 	wayland? (
 		~gui-libs/egl-wayland-1.1.7
 		media-libs/libglvnd
-	)"
+	)
+"
 DEPEND="
 	${COMMON_DEPEND}
 	static-libs? (
@@ -68,10 +71,12 @@ DEPEND="
 		x11-libs/libXrandr
 		x11-libs/libXv
 		x11-libs/libvdpau
-	)"
+	)
+"
 BDEPEND="
 	sys-devel/m4
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
 
@@ -94,7 +99,8 @@ pkg_setup() {
 		~!LOCKDEP
 		~!SLUB_DEBUG_ON
 		~!X86_KERNEL_IBT
-		!DEBUG_MUTEXES"
+		!DEBUG_MUTEXES
+	"
 
 	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
 	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
@@ -170,7 +176,7 @@ src_compile() {
 	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig
 
 	if use tools; then
-		# cflags: avoid noisy logs, only use here and set first to let override
+		# avoid noisy *very* noisy logs with deprecation warnings
 		CFLAGS="-Wno-deprecated-declarations ${CFLAGS}" \
 			emake "${NV_ARGS[@]}" -C nvidia-settings
 	elif use static-libs; then
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.125.06.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.125.06.ebuild
index e413c8fb10fd..31891a1fea7e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.125.06.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.125.06.ebuild
@@ -17,9 +17,10 @@ SRC_URI="
 	arm64? ( ${NV_URI}Linux-aarch64/${PV}/NVIDIA-Linux-aarch64-${PV}.run )
 	$(printf "${NV_URI}%s/%s-${PV}.tar.bz2 " \
 		nvidia-{installer,modprobe,persistenced,settings,xconfig}{,})
-	${NV_URI}NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-${PV}.tar.xz"
+	${NV_URI}NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-${PV}.tar.xz
+"
 # nvidia-installer is unused but here for GPL-2's "distribute sources"
-S="${WORKDIR}"
+S=${WORKDIR}
 
 LICENSE="NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
 SLOT="0/${PV%%.*}"
@@ -46,7 +47,8 @@ COMMON_DEPEND="
 		x11-libs/libXext
 		x11-libs/libXxf86vm
 		x11-libs/pango
-	)"
+	)
+"
 RDEPEND="
 	${COMMON_DEPEND}
 	sys-libs/glibc
@@ -59,7 +61,8 @@ RDEPEND="
 		gui-libs/egl-gbm
 		>=gui-libs/egl-wayland-1.1.10
 		media-libs/libglvnd
-	)"
+	)
+"
 DEPEND="
 	${COMMON_DEPEND}
 	static-libs? (
@@ -73,10 +76,12 @@ DEPEND="
 		x11-libs/libXrandr
 		x11-libs/libXv
 		x11-libs/libvdpau
-	)"
+	)
+"
 BDEPEND="
 	sys-devel/m4
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
 
@@ -97,7 +102,8 @@ pkg_setup() {
 		~SYSVIPC
 		~!LOCKDEP
 		~!SLUB_DEBUG_ON
-		!DEBUG_MUTEXES"
+		!DEBUG_MUTEXES
+	"
 
 	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
 	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
@@ -211,7 +217,7 @@ src_compile() {
 	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig
 
 	if use tools; then
-		# cflags: avoid noisy logs, only use here and set first to let override
+		# avoid noisy *very* noisy logs with deprecation warnings
 		CFLAGS="-Wno-deprecated-declarations ${CFLAGS}" \
 			emake "${NV_ARGS[@]}" -C nvidia-settings
 	elif use static-libs; then
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.113.01.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.113.01.ebuild
index a7401f2b31c2..93d0b980953a 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.113.01.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.113.01.ebuild
@@ -17,9 +17,10 @@ SRC_URI="
 	arm64? ( ${NV_URI}Linux-aarch64/${PV}/NVIDIA-Linux-aarch64-${PV}.run )
 	$(printf "${NV_URI}%s/%s-${PV}.tar.bz2 " \
 		nvidia-{installer,modprobe,persistenced,settings,xconfig}{,})
-	${NV_URI}NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-${PV}.tar.xz"
+	${NV_URI}NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-${PV}.tar.xz
+"
 # nvidia-installer is unused but here for GPL-2's "distribute sources"
-S="${WORKDIR}"
+S=${WORKDIR}
 
 LICENSE="NVIDIA-r2 Apache-2.0 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
 SLOT="0/${PV%%.*}"
@@ -46,7 +47,8 @@ COMMON_DEPEND="
 		x11-libs/libXext
 		x11-libs/libXxf86vm
 		x11-libs/pango
-	)"
+	)
+"
 RDEPEND="
 	${COMMON_DEPEND}
 	dev-libs/openssl:0/3
@@ -60,7 +62,8 @@ RDEPEND="
 		gui-libs/egl-gbm
 		>=gui-libs/egl-wayland-1.1.10
 		media-libs/libglvnd
-	)"
+	)
+"
 DEPEND="
 	${COMMON_DEPEND}
 	static-libs? (
@@ -74,10 +77,12 @@ DEPEND="
 		x11-libs/libXrandr
 		x11-libs/libXv
 		x11-libs/libvdpau
-	)"
+	)
+"
 BDEPEND="
 	sys-devel/m4
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
 
@@ -97,7 +102,8 @@ pkg_setup() {
 		~SYSVIPC
 		~!LOCKDEP
 		~!SLUB_DEBUG_ON
-		!DEBUG_MUTEXES"
+		!DEBUG_MUTEXES
+	"
 
 	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
 	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
@@ -211,7 +217,7 @@ src_compile() {
 	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig
 
 	if use tools; then
-		# cflags: avoid noisy logs, only use here and set first to let override
+		# avoid noisy *very* noisy logs with deprecation warnings
 		CFLAGS="-Wno-deprecated-declarations ${CFLAGS}" \
 			emake "${NV_ARGS[@]}" -C nvidia-settings
 	elif use static-libs; then
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.13.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.13.ebuild
index 8390b07c4393..8e35eaea07bc 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.13.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.43.13.ebuild
@@ -18,9 +18,10 @@ SRC_URI="
 	$(printf "https://download.nvidia.com/XFree86/%s/%s-${NV_PIN}.tar.bz2 " \
 		nvidia-{installer,modprobe,persistenced,settings,xconfig}{,})
 	https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${PV}.tar.gz
-		-> open-gpu-kernel-modules-${PV}.tar.gz"
+		-> open-gpu-kernel-modules-${PV}.tar.gz
+"
 # nvidia-installer is unused but here for GPL-2's "distribute sources"
-S="${WORKDIR}"
+S=${WORKDIR}
 
 LICENSE="NVIDIA-r2 Apache-2.0 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
 SLOT="0/vulkan"
@@ -49,7 +50,8 @@ COMMON_DEPEND="
 		x11-libs/libXext
 		x11-libs/libXxf86vm
 		x11-libs/pango
-	)"
+	)
+"
 RDEPEND="
 	${COMMON_DEPEND}
 	dev-libs/openssl:0/3
@@ -63,7 +65,8 @@ RDEPEND="
 		gui-libs/egl-gbm
 		>=gui-libs/egl-wayland-1.1.10
 		media-libs/libglvnd
-	)"
+	)
+"
 DEPEND="
 	${COMMON_DEPEND}
 	static-libs? (
@@ -77,10 +80,12 @@ DEPEND="
 		x11-libs/libXrandr
 		x11-libs/libXv
 		x11-libs/libvdpau
-	)"
+	)
+"
 BDEPEND="
 	sys-devel/m4
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
 
@@ -100,7 +105,8 @@ pkg_setup() {
 		~SYSVIPC
 		~!LOCKDEP
 		~!SLUB_DEBUG_ON
-		!DEBUG_MUTEXES"
+		!DEBUG_MUTEXES
+	"
 
 	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
 	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
@@ -214,7 +220,7 @@ src_compile() {
 	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig
 
 	if use tools; then
-		# cflags: avoid noisy logs, only use here and set first to let override
+		# avoid noisy *very* noisy logs with deprecation warnings
 		CFLAGS="-Wno-deprecated-declarations ${CFLAGS}" \
 			emake "${NV_ARGS[@]}" -C nvidia-settings
 	elif use static-libs; then