x11-drivers/nvidia-drivers : avoid a circular dependency

6 files changed, 21 insertions, 15 deletions

diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157-r9 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157-r9
index 425c34ab..7b999526 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157-r9
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157-r9
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/m4 virtual/pkgconfig dev-util/pahole sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig ) virtual/pkgconfig
 DEFINED_PHASES=compile install postinst preinst prepare setup unpack
-DEPEND=acct-group/video persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( x11-misc/nvidia-settings:3 ) x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext tools? ( x11-misc/nvidia-settings:3 ) virtual/linux-sources
+DEPEND=acct-group/video persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext virtual/linux-sources
 DESCRIPTION=NVIDIA Accelerated Graphics Driver
 EAPI=8
 HOMEPAGE=https://www.nvidia.com/download/index.aspx
@@ -9,9 +9,10 @@ INHERIT=desktop flag-o-matic linux-mod-r1 multilib readme.gentoo-r1 systemd tool
 IUSE=abi_x86_32 abi_x86_64 +acpi +dkms +persistenced +tools +X dist-kernel modules-compress modules-sign +strip
 KEYWORDS=-* amd64
 LICENSE=NVIDIA-r2 BSD BSD-2 GPL-2 MIT
-RDEPEND=acct-group/video persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( x11-misc/nvidia-settings:3 ) sys-libs/glibc !!x11-drivers/nvidia-drivers:4 !!x11-drivers/nvidia-drivers:5 acpi? ( sys-power/acpid ) dkms? ( ~sys-kernel/nvidia-drivers-dkms-390.157:3 ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
+PDEPEND=tools? ( x11-misc/nvidia-settings:3 )
+RDEPEND=acct-group/video persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) sys-libs/glibc !!x11-drivers/nvidia-drivers:4 !!x11-drivers/nvidia-drivers:5 acpi? ( sys-power/acpid ) dkms? ( ~sys-kernel/nvidia-drivers-dkms-390.157:3 ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
 RESTRICT=strip
 SLOT=3
 SRC_URI=https://download.nvidia.com/XFree86/Linux-x86_64/390.157/NVIDIA-Linux-x86_64-390.157.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.157.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.157.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.157.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.157.tar.bz2
 _eclasses_=desktop	56973babb9c5f19cab0eeb53ece644c6	dist-kernel-utils	55a979ee597f57f3b478d503f9af23e4	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	linux-mod-r1	c3684e27e002b9857ed37bc4e877e47a	mount-boot-utils	69218c024651aa10db01df7e8a5b63e0	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	readme.gentoo-r1	32b48460d813533d85f082897cec1b80	systemd	0f241b5c9f3758c3d3423df59a7f655a	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	unpacker	fb4b84181244b3b9990fa0bf40232dd2	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=712f27bdba030e797f7f3270aa772cc1
+_md5_=ace33f8353d0895d546da8bf0c12d4b9
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.256.02 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.256.02
index 46158440..74c29b6f 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.256.02
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.256.02
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/m4 virtual/pkgconfig dev-util/pahole sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig ) virtual/pkgconfig
 DEFINED_PHASES=compile install postinst preinst prepare setup unpack
-DEPEND=acct-group/video persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( x11-misc/nvidia-settings:4 ) x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext tools? ( x11-misc/nvidia-settings:4 ) virtual/linux-sources
+DEPEND=acct-group/video persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext virtual/linux-sources
 DESCRIPTION=NVIDIA Accelerated Graphics Driver
 EAPI=8
 HOMEPAGE=https://www.nvidia.com/download/index.aspx
@@ -9,9 +9,10 @@ INHERIT=desktop flag-o-matic linux-mod-r1 multilib readme.gentoo-r1 systemd tool
 IUSE=abi_x86_32 abi_x86_64 +acpi +dkms +persistenced +tools +X dist-kernel modules-compress modules-sign +strip
 KEYWORDS=-* amd64
 LICENSE=NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl
-RDEPEND=acct-group/video persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( x11-misc/nvidia-settings:4 ) sys-libs/glibc !!x11-drivers/nvidia-drivers:3 !!x11-drivers/nvidia-drivers:5 acpi? ( sys-power/acpid ) dkms? ( ~sys-kernel/nvidia-drivers-dkms-470.256.02:4 ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
+PDEPEND=tools? ( x11-misc/nvidia-settings:4 )
+RDEPEND=acct-group/video persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) sys-libs/glibc !!x11-drivers/nvidia-drivers:3 !!x11-drivers/nvidia-drivers:5 acpi? ( sys-power/acpid ) dkms? ( ~sys-kernel/nvidia-drivers-dkms-470.256.02:4 ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
 RESTRICT=strip
 SLOT=4
 SRC_URI=https://download.nvidia.com/XFree86/Linux-x86_64/470.256.02/NVIDIA-Linux-x86_64-470.256.02.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-470.256.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-470.256.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-470.256.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-470.256.02.tar.bz2
 _eclasses_=desktop	56973babb9c5f19cab0eeb53ece644c6	dist-kernel-utils	55a979ee597f57f3b478d503f9af23e4	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	linux-mod-r1	c3684e27e002b9857ed37bc4e877e47a	mount-boot-utils	69218c024651aa10db01df7e8a5b63e0	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	readme.gentoo-r1	32b48460d813533d85f082897cec1b80	systemd	0f241b5c9f3758c3d3423df59a7f655a	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	unpacker	fb4b84181244b3b9990fa0bf40232dd2	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=3befca3eaadc7434083fdefa7e8e818e
+_md5_=f0d7c99467b4794339006acfea1ad76b
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-550.107.02 b/metadata/md5-cache/x11-drivers/nvidia-drivers-550.107.02
index 63358f03..62a81acb 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-550.107.02
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-550.107.02
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/m4 virtual/pkgconfig dev-util/pahole sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig ) virtual/pkgconfig
 DEFINED_PHASES=compile install postinst preinst prepare setup unpack
-DEPEND=acct-group/video X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( x11-misc/nvidia-settings:5 ) x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext tools? ( x11-misc/nvidia-settings:5 ) virtual/linux-sources
+DEPEND=acct-group/video X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext virtual/linux-sources
 DESCRIPTION=NVIDIA Accelerated Graphics Driver
 EAPI=8
 HOMEPAGE=https://www.nvidia.com/download/index.aspx
@@ -9,9 +9,10 @@ INHERIT=desktop flag-o-matic linux-mod-r1 readme.gentoo-r1 systemd toolchain-fun
 IUSE=abi_x86_32 abi_x86_64 +acpi +dkms +persistenced +powerd +tools +wayland +X dist-kernel modules-compress modules-sign +strip
 KEYWORDS=-* amd64
 LICENSE=NVIDIA-r2 Apache-2.0 BSD BSD-2 GPL-2 MIT ZLIB curl openssl
-RDEPEND=acct-group/video X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( x11-misc/nvidia-settings:5 ) dev-libs/openssl:0/3 sys-libs/glibc !!x11-drivers/nvidia-drivers:3 !!x11-drivers/nvidia-drivers:4 acpi? ( sys-power/acpid ) dkms? ( ~sys-kernel/nvidia-drivers-dkms-550.107.02:5 ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) powerd? ( sys-apps/dbus[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 ) sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
+PDEPEND=tools? ( x11-misc/nvidia-settings:5 )
+RDEPEND=acct-group/video X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) dev-libs/openssl:0/3 sys-libs/glibc !!x11-drivers/nvidia-drivers:3 !!x11-drivers/nvidia-drivers:4 acpi? ( sys-power/acpid ) dkms? ( ~sys-kernel/nvidia-drivers-dkms-550.107.02:5 ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) powerd? ( sys-apps/dbus[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 ) sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
 RESTRICT=strip
 SLOT=5
 SRC_URI=https://download.nvidia.com/XFree86/Linux-x86_64/550.107.02/NVIDIA-Linux-x86_64-550.107.02.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-550.107.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-550.107.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-550.107.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-550.107.02.tar.bz2
 _eclasses_=desktop	56973babb9c5f19cab0eeb53ece644c6	dist-kernel-utils	55a979ee597f57f3b478d503f9af23e4	edo	367e103a74bf77e6a8da7894d999fa3c	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	linux-info	ea4122ba1d8791a12b78e53f9510a2e3	linux-mod-r1	c3684e27e002b9857ed37bc4e877e47a	mount-boot-utils	69218c024651aa10db01df7e8a5b63e0	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	readme.gentoo-r1	32b48460d813533d85f082897cec1b80	systemd	0f241b5c9f3758c3d3423df59a7f655a	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	unpacker	fb4b84181244b3b9990fa0bf40232dd2	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=2fac562d64e7307936878520e0cccdfd
+_md5_=cac15a46cb19d17ce3dd4c471b1c7676
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157-r9.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157-r9.ebuild
index 8bc1497d..84bd1996 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157-r9.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157-r9.ebuild
@@ -30,7 +30,6 @@ COMMON_DEPEND="
 		acct-user/nvpd
 		net-libs/libtirpc:=
 	)
-	tools? ( x11-misc/nvidia-settings:${SLOT} )
 "
 RDEPEND="
 	${COMMON_DEPEND}
@@ -50,12 +49,14 @@ DEPEND="
 	x11-base/xorg-proto
 	x11-libs/libX11
 	x11-libs/libXext
-	tools? ( x11-misc/nvidia-settings:${SLOT} )
 "
 BDEPEND="
 	sys-devel/m4
 	virtual/pkgconfig
 "
+PDEPEND="
+	tools? ( x11-misc/nvidia-settings:${SLOT} )
+"
 
 QA_PREBUILT="opt/bin/* usr/lib*"
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02.ebuild
index 20ee3656..73d0f707 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02.ebuild
@@ -30,7 +30,6 @@ COMMON_DEPEND="
 		acct-user/nvpd
 		net-libs/libtirpc:=
 	)
-	tools? ( x11-misc/nvidia-settings:${SLOT} )
 "
 RDEPEND="
 	${COMMON_DEPEND}
@@ -50,12 +49,14 @@ DEPEND="
 	x11-base/xorg-proto
 	x11-libs/libX11
 	x11-libs/libXext
-	tools? ( x11-misc/nvidia-settings:${SLOT} )
 "
 BDEPEND="
 	sys-devel/m4
 	virtual/pkgconfig
 "
+PDEPEND="
+	tools? ( x11-misc/nvidia-settings:${SLOT} )
+"
 
 QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02.ebuild
index 180c5bee..352e5451 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02.ebuild
@@ -31,7 +31,6 @@ COMMON_DEPEND="
 		acct-user/nvpd
 		net-libs/libtirpc:=
 	)
-	tools? ( x11-misc/nvidia-settings:${SLOT} )
 "
 RDEPEND="
 	${COMMON_DEPEND}
@@ -57,12 +56,14 @@ DEPEND="
 	x11-base/xorg-proto
 	x11-libs/libX11
 	x11-libs/libXext
-	tools? ( x11-misc/nvidia-settings:${SLOT} )
 "
 BDEPEND="
 	sys-devel/m4
 	virtual/pkgconfig
 "
+PDEPEND="
+	tools? ( x11-misc/nvidia-settings:${SLOT} )
+"
 
 QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"