[QA] Remove emul-linux-x86-* from dependencies.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

6 files changed, 41 insertions, 76 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 14def0d2e61d..f7a48410d6c1 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.379 2015/06/01 16:09:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.380 2015/06/14 18:12:07 ulm Exp $
+
+  14 Jun 2015; Ulrich Müller <ulm@gentoo.org> ati-drivers-14.4_p1.ebuild,
+  ati-drivers-14.6_beta2.ebuild, ati-drivers-14.9-r2.ebuild,
+  ati-drivers-14.12-r2.ebuild, ati-drivers-14.12-r3.ebuild:
+  [QA] Remove emul-linux-x86-* from dependencies.
 
   01 Jun 2015; Michał Górny <mgorny@gentoo.org> -ati-drivers-13.12.ebuild,
   -ati-drivers-13.1_pre897.ebuild, -ati-drivers-13.4.ebuild,
diff --git a/x11-drivers/ati-drivers/ati-drivers-14.12-r2.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.12-r2.ebuild
index 09170707b2cb..9931122f2374 100644
--- a/x11-drivers/ati-drivers/ati-drivers-14.12-r2.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-14.12-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.12-r2.ebuild,v 1.3 2015/03/31 18:10:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.12-r2.ebuild,v 1.4 2015/06/14 18:12:07 ulm Exp $
 
 EAPI=5
 
@@ -37,20 +37,12 @@ RDEPEND="
 	x11-libs/libXrender
 	virtual/glu
 	abi_x86_32? (
-			|| (
-				virtual/glu[abi_x86_32]
-				app-emulation/emul-linux-x86-opengl
-			)
-			|| (
-				(
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-					x11-libs/libXinerama[abi_x86_32]
-					x11-libs/libXrandr[abi_x86_32]
-					x11-libs/libXrender[abi_x86_32]
-				)
-				app-emulation/emul-linux-x86-xlibs
-			)
+			virtual/glu[abi_x86_32]
+			x11-libs/libX11[abi_x86_32]
+			x11-libs/libXext[abi_x86_32]
+			x11-libs/libXinerama[abi_x86_32]
+			x11-libs/libXrandr[abi_x86_32]
+			x11-libs/libXrender[abi_x86_32]
 	)
 	qt4? (
 			x11-libs/libICE
diff --git a/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild
index 669c0e1b54f0..2d47bcd0eb7f 100644
--- a/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild,v 1.5 2015/03/31 18:10:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild,v 1.6 2015/06/14 18:12:07 ulm Exp $
 
 EAPI=5
 
@@ -38,20 +38,12 @@ RDEPEND="
 	virtual/glu
 	!x11-libs/xvba-video
 	abi_x86_32? (
-			|| (
-				virtual/glu[abi_x86_32]
-				app-emulation/emul-linux-x86-opengl
-			)
-			|| (
-				(
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-					x11-libs/libXinerama[abi_x86_32]
-					x11-libs/libXrandr[abi_x86_32]
-					x11-libs/libXrender[abi_x86_32]
-				)
-				app-emulation/emul-linux-x86-xlibs
-			)
+			virtual/glu[abi_x86_32]
+			x11-libs/libX11[abi_x86_32]
+			x11-libs/libXext[abi_x86_32]
+			x11-libs/libXinerama[abi_x86_32]
+			x11-libs/libXrandr[abi_x86_32]
+			x11-libs/libXrender[abi_x86_32]
 	)
 	qt4? (
 			x11-libs/libICE
diff --git a/x11-drivers/ati-drivers/ati-drivers-14.4_p1.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.4_p1.ebuild
index a78cc7e4a48c..820b615f79df 100644
--- a/x11-drivers/ati-drivers/ati-drivers-14.4_p1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-14.4_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.4_p1.ebuild,v 1.4 2015/03/31 18:10:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.4_p1.ebuild,v 1.5 2015/06/14 18:12:07 ulm Exp $
 
 EAPI=5
 
@@ -36,20 +36,12 @@ RDEPEND="
 	x11-libs/libXrender
 	virtual/glu
 	multilib? (
-			|| (
-				>=virtual/glu-9.0-r1[abi_x86_32]
-				app-emulation/emul-linux-x86-opengl
-			)
-			|| (
-				(
-					>=x11-libs/libX11-1.6.2[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-					>=x11-libs/libXinerama-1.1.3[abi_x86_32]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32]
-					>=x11-libs/libXrender-0.9.8[abi_x86_32]
-				)
-				app-emulation/emul-linux-x86-xlibs
-			)
+			>=virtual/glu-9.0-r1[abi_x86_32]
+			>=x11-libs/libX11-1.6.2[abi_x86_32]
+			>=x11-libs/libXext-1.3.2[abi_x86_32]
+			>=x11-libs/libXinerama-1.1.3[abi_x86_32]
+			>=x11-libs/libXrandr-1.4.2[abi_x86_32]
+			>=x11-libs/libXrender-0.9.8[abi_x86_32]
 	)
 	qt4? (
 			x11-libs/libICE
diff --git a/x11-drivers/ati-drivers/ati-drivers-14.6_beta2.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.6_beta2.ebuild
index ae79e6bc3a1d..3942da1e9dcb 100644
--- a/x11-drivers/ati-drivers/ati-drivers-14.6_beta2.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-14.6_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.6_beta2.ebuild,v 1.2 2015/03/31 18:10:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.6_beta2.ebuild,v 1.3 2015/06/14 18:12:07 ulm Exp $
 
 EAPI=5
 
@@ -36,20 +36,12 @@ RDEPEND="
 	x11-libs/libXrender
 	virtual/glu
 	multilib? (
-			|| (
-				virtual/glu[abi_x86_32]
-				app-emulation/emul-linux-x86-opengl
-			)
-			|| (
-				(
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-					x11-libs/libXinerama[abi_x86_32]
-					x11-libs/libXrandr[abi_x86_32]
-					x11-libs/libXrender[abi_x86_32]
-				)
-				app-emulation/emul-linux-x86-xlibs
-			)
+			virtual/glu[abi_x86_32]
+			x11-libs/libX11[abi_x86_32]
+			x11-libs/libXext[abi_x86_32]
+			x11-libs/libXinerama[abi_x86_32]
+			x11-libs/libXrandr[abi_x86_32]
+			x11-libs/libXrender[abi_x86_32]
 	)
 	qt4? (
 			x11-libs/libICE
diff --git a/x11-drivers/ati-drivers/ati-drivers-14.9-r2.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.9-r2.ebuild
index 67f7195cf12f..5e007ad32cf8 100644
--- a/x11-drivers/ati-drivers/ati-drivers-14.9-r2.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-14.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.9-r2.ebuild,v 1.2 2015/03/31 18:10:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.9-r2.ebuild,v 1.3 2015/06/14 18:12:07 ulm Exp $
 
 EAPI=5
 
@@ -37,20 +37,12 @@ RDEPEND="
 	x11-libs/libXrender
 	virtual/glu
 	abi_x86_32? (
-			|| (
-				virtual/glu[abi_x86_32]
-				app-emulation/emul-linux-x86-opengl
-			)
-			|| (
-				(
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-					x11-libs/libXinerama[abi_x86_32]
-					x11-libs/libXrandr[abi_x86_32]
-					x11-libs/libXrender[abi_x86_32]
-				)
-				app-emulation/emul-linux-x86-xlibs
-			)
+			virtual/glu[abi_x86_32]
+			x11-libs/libX11[abi_x86_32]
+			x11-libs/libXext[abi_x86_32]
+			x11-libs/libXinerama[abi_x86_32]
+			x11-libs/libXrandr[abi_x86_32]
+			x11-libs/libXrender[abi_x86_32]
 	)
 	qt4? (
 			x11-libs/libICE