From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-934034-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id F0391139694
	for <garchives@archives.gentoo.org>; Thu, 23 Feb 2017 23:03:21 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 417ED21C253;
	Thu, 23 Feb 2017 23:03:21 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 133B121C253
	for <gentoo-commits@lists.gentoo.org>; Thu, 23 Feb 2017 23:03:20 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id AD0033416BD
	for <gentoo-commits@lists.gentoo.org>; Thu, 23 Feb 2017 23:03:19 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id BB8DF524B
	for <gentoo-commits@lists.gentoo.org>; Thu, 23 Feb 2017 23:03:16 +0000 (UTC)
From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" <jer@gentoo.org>
Message-ID: <1487890994.7de62d3895544144fe88b55a300a7c08cdb2b559.jer@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/
X-VCS-Repository: repo/gentoo
X-VCS-Files: x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r2.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-304.134-r1.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-304.135.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-340.101-r1.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-340.102.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-346.96-r7.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r5.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-355.11-r5.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r6.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-361.42-r1.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-361.45.18-r1.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-364.19-r2.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-367.57-r2.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-370.28-r2.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-375.26-r3.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-375.39.ebuild x11-drivers/nvidia-drivers/nvidia-driver
 s-378.13.ebuild
X-VCS-Directories: x11-drivers/nvidia-drivers/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: 7de62d3895544144fe88b55a300a7c08cdb2b559
X-VCS-Branch: master
Date: Thu, 23 Feb 2017 23:03:16 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 07e0e7ce-98fd-45e0-b5cb-e55eb31784fc
X-Archives-Hash: e76c5a8e0af099209ed9555cc02d3ead

commit:     7de62d3895544144fe88b55a300a7c08cdb2b559
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 23:02:56 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 23:03:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7de62d38

x11-drivers/nvidia-drivers: Drop multilib USE dependencies from tools dependencies (bug #605664).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../nvidia-drivers-173.14.39-r2.ebuild             | 20 ++++++++--------
 .../nvidia-drivers-304.134-r1.ebuild               | 16 ++++++-------
 .../nvidia-drivers/nvidia-drivers-304.135.ebuild   | 16 ++++++-------
 .../nvidia-drivers-340.101-r1.ebuild               | 16 ++++++-------
 .../nvidia-drivers/nvidia-drivers-340.102.ebuild   | 16 ++++++-------
 .../nvidia-drivers/nvidia-drivers-346.96-r7.ebuild | 28 ++++++++++++----------
 .../nvidia-drivers/nvidia-drivers-352.79-r5.ebuild | 26 ++++++++++----------
 .../nvidia-drivers/nvidia-drivers-355.11-r5.ebuild | 20 +++++++++-------
 .../nvidia-drivers/nvidia-drivers-358.16-r6.ebuild | 28 ++++++++++++----------
 .../nvidia-drivers/nvidia-drivers-361.42-r1.ebuild | 28 ++++++++++++----------
 .../nvidia-drivers-361.45.18-r1.ebuild             | 28 ++++++++++++----------
 .../nvidia-drivers/nvidia-drivers-364.19-r2.ebuild | 28 ++++++++++++----------
 .../nvidia-drivers/nvidia-drivers-367.57-r2.ebuild | 28 ++++++++++++----------
 .../nvidia-drivers/nvidia-drivers-370.28-r2.ebuild | 28 ++++++++++++----------
 .../nvidia-drivers/nvidia-drivers-375.26-r3.ebuild | 28 ++++++++++++----------
 .../nvidia-drivers/nvidia-drivers-375.39.ebuild    | 28 ++++++++++++----------
 .../nvidia-drivers/nvidia-drivers-378.13.ebuild    | 28 ++++++++++++----------
 17 files changed, 217 insertions(+), 193 deletions(-)

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r2.ebuild
index 2b7f0ca23f..cae84a5678 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r2.ebuild
@@ -35,18 +35,18 @@ DEPEND="
 RDEPEND="
 	${COMMON}
 	<x11-base/xorg-server-1.15.99:=
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	sys-libs/zlib
+	>=x11-libs/libX11-1.6.2
+	>=x11-libs/libXext-1.3.2
 	acpi? ( sys-power/acpid )
 	tools? (
-		dev-libs/atk[${MULTILIB_USEDEP}]
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/pango[X,${MULTILIB_USEDEP}]
+		dev-libs/atk
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf[X]
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango[X]
 	)
 "
 

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.134-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.134-r1.ebuild
index 5579cb64e4..82b5c15081 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.134-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.134-r1.ebuild
@@ -33,14 +33,14 @@ COMMON="
 	app-eselect/eselect-opencl
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	tools? (
-		dev-libs/atk[${MULTILIB_USEDEP}]
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/pango[X,${MULTILIB_USEDEP}]
-		x11-libs/pangox-compat[${MULTILIB_USEDEP}]
+		dev-libs/atk
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf[X]
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango[X]
+		x11-libs/pangox-compat
 	)
 	X? (
 		>=app-eselect/eselect-opengl-1.0.9

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.135.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.135.ebuild
index 5579cb64e4..82b5c15081 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.135.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.135.ebuild
@@ -33,14 +33,14 @@ COMMON="
 	app-eselect/eselect-opencl
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	tools? (
-		dev-libs/atk[${MULTILIB_USEDEP}]
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/pango[X,${MULTILIB_USEDEP}]
-		x11-libs/pangox-compat[${MULTILIB_USEDEP}]
+		dev-libs/atk
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf[X]
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango[X]
+		x11-libs/pangox-compat
 	)
 	X? (
 		>=app-eselect/eselect-opengl-1.0.9

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.101-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.101-r1.ebuild
index 02f330e767..e7bfee6f07 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.101-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.101-r1.ebuild
@@ -33,14 +33,14 @@ COMMON="
 	app-eselect/eselect-opencl
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	tools? (
-		dev-libs/atk[${MULTILIB_USEDEP}]
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		dev-libs/jansson[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
-		>=x11-libs/gtk+-2.4:2[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/pango[X,${MULTILIB_USEDEP}]
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		x11-libs/gdk-pixbuf[X]
+		>=x11-libs/gtk+-2.4:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango[X]
 	)
 	X? (
 		>=app-eselect/eselect-opengl-1.0.9

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.102.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.102.ebuild
index 02f330e767..e7bfee6f07 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.102.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.102.ebuild
@@ -33,14 +33,14 @@ COMMON="
 	app-eselect/eselect-opencl
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	tools? (
-		dev-libs/atk[${MULTILIB_USEDEP}]
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		dev-libs/jansson[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
-		>=x11-libs/gtk+-2.4:2[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/pango[X,${MULTILIB_USEDEP}]
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		x11-libs/gdk-pixbuf[X]
+		>=x11-libs/gtk+-2.4:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango[X]
 	)
 	X? (
 		>=app-eselect/eselect-opengl-1.0.9

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-346.96-r7.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-346.96-r7.ebuild
index 0de544676b..fbed09e9a8 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-346.96-r7.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-346.96-r7.ebuild
@@ -39,19 +39,21 @@ COMMON="
 	app-eselect/eselect-opencl
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	tools? (
-		dev-libs/atk[${MULTILIB_USEDEP}]
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		dev-libs/jansson[${MULTILIB_USEDEP}]
-		gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[X,${MULTILIB_USEDEP}]
-		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXv[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/pango[X,${MULTILIB_USEDEP}]
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		gtk3? (
+			x11-libs/gtk+:3
+		)
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf[X]
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
 	)
 	X? (
 		>=app-eselect/eselect-opengl-1.0.9

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r5.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r5.ebuild
index 12a20926d2..c47ef997db 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r5.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r5.ebuild
@@ -39,21 +39,21 @@ COMMON="
 	app-eselect/eselect-opencl
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	tools? (
-		dev-libs/atk[${MULTILIB_USEDEP}]
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		dev-libs/jansson[${MULTILIB_USEDEP}]
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
 		gtk3? (
-			x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+			x11-libs/gtk+:3
 		)
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[X,${MULTILIB_USEDEP}]
-		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXv[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/pango[X,${MULTILIB_USEDEP}]
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf[X]
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
 	)
 	X? (
 		>=app-eselect/eselect-opengl-1.0.9

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-355.11-r5.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-355.11-r5.ebuild
index 35d15a9d00..62df5462a9 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-355.11-r5.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-355.11-r5.ebuild
@@ -50,14 +50,18 @@ RDEPEND="
 	${COMMON}
 	acpi? ( sys-power/acpid )
 	tools? (
-		dev-libs/atk[${MULTILIB_USEDEP}]
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
-		gtk2? ( >=x11-libs/gtk+-2.4:2[${MULTILIB_USEDEP}] )
-		gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/pango[X,${MULTILIB_USEDEP}]
+		dev-libs/atk
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf
+		gtk2? (
+			>=x11-libs/gtk+-2.4:2
+		)
+		gtk3? (
+			x11-libs/gtk+:3
+		)
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango[X]
 	)
 	X? (
 		<x11-base/xorg-server-1.18.99:=

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r6.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r6.ebuild
index 54bf6ccd2d..8d22e72df4 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r6.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r6.ebuild
@@ -39,19 +39,21 @@ COMMON="
 	app-eselect/eselect-opencl
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	tools? (
-		dev-libs/atk[${MULTILIB_USEDEP}]
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		dev-libs/jansson[${MULTILIB_USEDEP}]
-		gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[X,${MULTILIB_USEDEP}]
-		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXv[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/pango[X,${MULTILIB_USEDEP}]
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		gtk3? (
+			x11-libs/gtk+:3
+		)
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf[X]
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
 	)
 	X? (
 		>=app-eselect/eselect-opengl-1.0.9

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-361.42-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-361.42-r1.ebuild
index d27957674d..dbf51b62f4 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-361.42-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-361.42-r1.ebuild
@@ -39,19 +39,21 @@ COMMON="
 	app-eselect/eselect-opencl
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	tools? (
-		dev-libs/atk[${MULTILIB_USEDEP}]
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		dev-libs/jansson[${MULTILIB_USEDEP}]
-		gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[X,${MULTILIB_USEDEP}]
-		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXv[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/pango[X,${MULTILIB_USEDEP}]
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		gtk3? (
+			x11-libs/gtk+:3
+		)
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf[X]
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
 	)
 	X? (
 		>=app-eselect/eselect-opengl-1.0.9

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-361.45.18-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-361.45.18-r1.ebuild
index 4ea07c4717..0aab0b13de 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-361.45.18-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-361.45.18-r1.ebuild
@@ -39,19 +39,21 @@ COMMON="
 	app-eselect/eselect-opencl
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	tools? (
-		dev-libs/atk[${MULTILIB_USEDEP}]
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		dev-libs/jansson[${MULTILIB_USEDEP}]
-		gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[X,${MULTILIB_USEDEP}]
-		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXv[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/pango[X,${MULTILIB_USEDEP}]
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		gtk3? (
+			x11-libs/gtk+:3
+		)
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf[X]
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
 	)
 	X? (
 		>=app-eselect/eselect-opengl-1.0.9

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-364.19-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-364.19-r2.ebuild
index 25b606554d..21957fdc65 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-364.19-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-364.19-r2.ebuild
@@ -39,19 +39,21 @@ COMMON="
 	app-eselect/eselect-opencl
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	tools? (
-		dev-libs/atk[${MULTILIB_USEDEP}]
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		dev-libs/jansson[${MULTILIB_USEDEP}]
-		gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[X,${MULTILIB_USEDEP}]
-		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXv[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/pango[X,${MULTILIB_USEDEP}]
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		gtk3? (
+			x11-libs/gtk+:3
+		)
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf[X]
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
 	)
 	X? (
 		>=app-eselect/eselect-opengl-1.0.9

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-367.57-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-367.57-r2.ebuild
index 0343814b29..704f23248d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-367.57-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-367.57-r2.ebuild
@@ -41,19 +41,21 @@ COMMON="
 	app-eselect/eselect-opencl
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	tools? (
-		dev-libs/atk[${MULTILIB_USEDEP}]
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		dev-libs/jansson[${MULTILIB_USEDEP}]
-		gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[X,${MULTILIB_USEDEP}]
-		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXv[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/pango[X,${MULTILIB_USEDEP}]
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		gtk3? (
+			x11-libs/gtk+:3
+		)
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf[X]
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
 	)
 	X? (
 		>=app-eselect/eselect-opengl-1.0.9

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-370.28-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-370.28-r2.ebuild
index 891f6af32b..2b3f3eba92 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-370.28-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-370.28-r2.ebuild
@@ -41,19 +41,21 @@ COMMON="
 	app-eselect/eselect-opencl
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	tools? (
-		dev-libs/atk[${MULTILIB_USEDEP}]
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		dev-libs/jansson[${MULTILIB_USEDEP}]
-		gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[X,${MULTILIB_USEDEP}]
-		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXv[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/pango[X,${MULTILIB_USEDEP}]
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		gtk3? (
+			x11-libs/gtk+:3
+		)
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf[X]
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
 	)
 	X? (
 		>=app-eselect/eselect-opengl-1.0.9

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-375.26-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-375.26-r3.ebuild
index d40f96f0a3..6107d58760 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-375.26-r3.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-375.26-r3.ebuild
@@ -42,19 +42,21 @@ COMMON="
 	app-eselect/eselect-opencl
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	tools? (
-		dev-libs/atk[${MULTILIB_USEDEP}]
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		dev-libs/jansson[${MULTILIB_USEDEP}]
-		gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[X,${MULTILIB_USEDEP}]
-		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXv[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/pango[X,${MULTILIB_USEDEP}]
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		gtk3? (
+			x11-libs/gtk+:3
+		)
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf[X]
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
 	)
 	X? (
 		>=app-eselect/eselect-opengl-1.0.9

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-375.39.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-375.39.ebuild
index d40f96f0a3..6107d58760 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-375.39.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-375.39.ebuild
@@ -42,19 +42,21 @@ COMMON="
 	app-eselect/eselect-opencl
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	tools? (
-		dev-libs/atk[${MULTILIB_USEDEP}]
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		dev-libs/jansson[${MULTILIB_USEDEP}]
-		gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[X,${MULTILIB_USEDEP}]
-		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXv[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/pango[X,${MULTILIB_USEDEP}]
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		gtk3? (
+			x11-libs/gtk+:3
+		)
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf[X]
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
 	)
 	X? (
 		>=app-eselect/eselect-opengl-1.0.9

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-378.13.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-378.13.ebuild
index 5d27ec4b13..8365ff0bb6 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-378.13.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-378.13.ebuild
@@ -42,19 +42,21 @@ COMMON="
 	app-eselect/eselect-opencl
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	tools? (
-		dev-libs/atk[${MULTILIB_USEDEP}]
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		dev-libs/jansson[${MULTILIB_USEDEP}]
-		gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[X,${MULTILIB_USEDEP}]
-		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXv[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/pango[X,${MULTILIB_USEDEP}]
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		gtk3? (
+			x11-libs/gtk+:3
+		)
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf[X]
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
 	)
 	X? (
 		>=app-eselect/eselect-opengl-1.0.9