[patch] nvidia-drivers ebuild dependency patch (option 1)

nvidia-drivers.diff (text/plain), 5.31 KB, created by Maciej Mrozowski on 2012-05-05 12:59:59 UTC

Index: nvidia-drivers-173.14.31.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.31.ebuild,v
retrieving revision 1.6
diff -u -B -r1.6 nvidia-drivers-173.14.31.ebuild
--- nvidia-drivers-173.14.31.ebuild	25 Apr 2012 17:16:27 -0000	1.6
+++ nvidia-drivers-173.14.31.ebuild	5 May 2012 12:57:31 -0000
@@ -25,7 +25,6 @@
 
 COMMON="<x11-base/xorg-server-1.11
 	gtk? (
-		!media-video/nvidia-settings
 		dev-libs/atk
 		dev-libs/glib
 		x11-libs/gdk-pixbuf
@@ -40,7 +39,8 @@
 DEPEND="${COMMON}
 	kernel_linux? ( virtual/linux-sources )"
 RDEPEND="${COMMON}
-	acpi? ( sys-power/acpid )"
+	acpi? ( sys-power/acpid )
+	gtk? ( !media-video/nvidia-settings )"
 
 QA_TEXTRELS_x86="usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
 	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
Index: nvidia-drivers-290.10-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-290.10-r2.ebuild,v
retrieving revision 1.2
diff -u -B -r1.2 nvidia-drivers-290.10-r2.ebuild
--- nvidia-drivers-290.10-r2.ebuild	11 Apr 2012 17:48:11 -0000	1.2
+++ nvidia-drivers-290.10-r2.ebuild	5 May 2012 12:57:31 -0000
@@ -29,15 +29,14 @@
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 <sys-libs/glibc-2.15 )
 	multilib? ( app-emulation/emul-linux-x86-xlibs )
 	>=app-admin/eselect-opengl-1.0.9
-	app-admin/eselect-opencl
-	!<media-video/nvidia-settings-256.52"
+	app-admin/eselect-opencl"
 DEPEND="${COMMON}
 	kernel_linux? ( virtual/linux-sources )"
 RDEPEND="${COMMON}
 	x11-libs/libXvMC
-	acpi? ( sys-power/acpid )"
-PDEPEND=">=x11-libs/libvdpau-0.3-r1
-	gtk? ( media-video/nvidia-settings )"
+	acpi? ( sys-power/acpid )
+	gtk? ( !media-video/nvidia-settings )"
+PDEPEND=">=x11-libs/libvdpau-0.3-r1"
 
 QA_TEXTRELS_x86="
 	usr/lib/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
Index: nvidia-drivers-290.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-290.10.ebuild,v
retrieving revision 1.6
diff -u -B -r1.6 nvidia-drivers-290.10.ebuild
--- nvidia-drivers-290.10.ebuild	11 Apr 2012 17:48:11 -0000	1.6
+++ nvidia-drivers-290.10.ebuild	5 May 2012 12:57:31 -0000
@@ -28,15 +28,14 @@
 COMMON="<x11-base/xorg-server-1.11.99
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 <sys-libs/glibc-2.15 )
 	multilib? ( app-emulation/emul-linux-x86-xlibs )
-	>=app-admin/eselect-opengl-1.0.9
-	!<media-video/nvidia-settings-256.52"
+	>=app-admin/eselect-opengl-1.0.9"
 DEPEND="${COMMON}
 	kernel_linux? ( virtual/linux-sources )"
 RDEPEND="${COMMON}
 	x11-libs/libXvMC
-	acpi? ( sys-power/acpid )"
-PDEPEND=">=x11-libs/libvdpau-0.3-r1
-	gtk? ( media-video/nvidia-settings )"
+	acpi? ( sys-power/acpid )
+	gtk? ( !media-video/nvidia-settings )"
+PDEPEND=">=x11-libs/libvdpau-0.3-r1"
 
 QA_TEXTRELS_x86="
 	usr/lib/libOpenCL.so.1.0.0
Index: nvidia-drivers-295.20-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.20-r1.ebuild,v
retrieving revision 1.6
diff -u -B -r1.6 nvidia-drivers-295.20-r1.ebuild
--- nvidia-drivers-295.20-r1.ebuild	11 Apr 2012 17:48:11 -0000	1.6
+++ nvidia-drivers-295.20-r1.ebuild	5 May 2012 12:57:31 -0000
@@ -29,15 +29,14 @@
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 <sys-libs/glibc-2.15 )
 	multilib? ( app-emulation/emul-linux-x86-xlibs )
 	>=app-admin/eselect-opengl-1.0.9
-	app-admin/eselect-opencl
-	!<media-video/nvidia-settings-256.52"
+	app-admin/eselect-opencl"
 DEPEND="${COMMON}
 	kernel_linux? ( virtual/linux-sources )"
 RDEPEND="${COMMON}
 	x11-libs/libXvMC
-	acpi? ( sys-power/acpid )"
-PDEPEND=">=x11-libs/libvdpau-0.3-r1
-	gtk? ( media-video/nvidia-settings )"
+	acpi? ( sys-power/acpid )
+	gtk? ( !media-video/nvidia-settings )"
+PDEPEND=">=x11-libs/libvdpau-0.3-r1"
 
 QA_TEXTRELS_x86="
 	usr/lib/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
Index: nvidia-drivers-295.40.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.40.ebuild,v
retrieving revision 1.4
diff -u -B -r1.4 nvidia-drivers-295.40.ebuild
--- nvidia-drivers-295.40.ebuild	24 Apr 2012 14:04:07 -0000	1.4
+++ nvidia-drivers-295.40.ebuild	5 May 2012 12:57:31 -0000
@@ -32,9 +32,9 @@
 	kernel_linux? ( virtual/linux-sources )"
 RDEPEND="${COMMON}
 	x11-libs/libXvMC
-	acpi? ( sys-power/acpid )"
-PDEPEND=">=x11-libs/libvdpau-0.3-r1
-	gtk? ( media-video/nvidia-settings )"
+	acpi? ( sys-power/acpid )
+	gtk? ( !media-video/nvidia-settings )"
+PDEPEND=">=x11-libs/libvdpau-0.3-r1"
 
 QA_TEXTRELS_x86="
 	usr/lib/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
Index: nvidia-drivers-295.49.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild,v
retrieving revision 1.2
diff -u -B -r1.2 nvidia-drivers-295.49.ebuild
--- nvidia-drivers-295.49.ebuild	4 May 2012 14:58:57 -0000	1.2
+++ nvidia-drivers-295.49.ebuild	5 May 2012 12:57:31 -0000
@@ -32,7 +32,8 @@
 	kernel_linux? ( virtual/linux-sources )"
 RDEPEND="${COMMON}
 	x11-libs/libXvMC
-	acpi? ( sys-power/acpid )"
+	acpi? ( sys-power/acpid )
+	gtk? ( !media-video/nvidia-settings )"
 PDEPEND=">=x11-libs/libvdpau-0.3-r1"
 
 QA_TEXTRELS_x86="