Support multilib libraries alternatively to emul-linux-x86-xlibs.

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)

6 files changed, 61 insertions, 11 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 85070d2d791e..086460515315 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.326 2013/04/20 20:27:33 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.327 2013/04/21 19:03:48 mgorny Exp $
+
+  21 Apr 2013; Michał Górny <mgorny@gentoo.org> ati-drivers-13.1.ebuild,
+  ati-drivers-13.1_pre897.ebuild, ati-drivers-13.2_beta7.ebuild,
+  ati-drivers-13.3_beta2.ebuild, ati-drivers-13.3_beta3.ebuild:
+  Support multilib libraries alternatively to emul-linux-x86-xlibs.
 
 *ati-drivers-13.3_beta3 (20 Apr 2013)
 
diff --git a/x11-drivers/ati-drivers/ati-drivers-13.1.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.1.ebuild
index 6b8bba8c1059..1183bac55c50 100644
--- a/x11-drivers/ati-drivers/ati-drivers-13.1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-13.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.1.ebuild,v 1.6 2013/03/19 11:54:39 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.1.ebuild,v 1.7 2013/04/21 19:03:48 mgorny Exp $
 
 EAPI=5
 
@@ -40,7 +40,16 @@ RDEPEND="
 	virtual/glu
 	multilib? (
 			app-emulation/emul-linux-x86-opengl
-			app-emulation/emul-linux-x86-xlibs
+			|| (
+				(
+					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
+			)
 	)
 	qt4? (
 			x11-libs/libICE
diff --git a/x11-drivers/ati-drivers/ati-drivers-13.1_pre897.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.1_pre897.ebuild
index b530632ff43d..b91743f24c7d 100644
--- a/x11-drivers/ati-drivers/ati-drivers-13.1_pre897.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-13.1_pre897.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.1_pre897.ebuild,v 1.6 2013/03/19 11:54:39 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.1_pre897.ebuild,v 1.7 2013/04/21 19:03:48 mgorny Exp $
 
 EAPI=5
 
@@ -40,7 +40,16 @@ RDEPEND="
 	virtual/glu
 	multilib? (
 			app-emulation/emul-linux-x86-opengl
-			app-emulation/emul-linux-x86-xlibs
+			|| (
+				(
+					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
+			)
 	)
 	qt4? (
 			x11-libs/libICE
diff --git a/x11-drivers/ati-drivers/ati-drivers-13.2_beta7.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.2_beta7.ebuild
index ccec3e50e40d..47c0757b8578 100644
--- a/x11-drivers/ati-drivers/ati-drivers-13.2_beta7.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-13.2_beta7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.2_beta7.ebuild,v 1.2 2013/03/19 10:02:38 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.2_beta7.ebuild,v 1.3 2013/04/21 19:03:48 mgorny Exp $
 
 EAPI=5
 
@@ -41,7 +41,16 @@ RDEPEND="
 	virtual/glu
 	multilib? (
 			app-emulation/emul-linux-x86-opengl
-			app-emulation/emul-linux-x86-xlibs
+			|| (
+				(
+					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
+			)
 	)
 	qt4? (
 			x11-libs/libICE
diff --git a/x11-drivers/ati-drivers/ati-drivers-13.3_beta2.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.3_beta2.ebuild
index 57aa92049309..e7120a2781a6 100644
--- a/x11-drivers/ati-drivers/ati-drivers-13.3_beta2.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-13.3_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.3_beta2.ebuild,v 1.1 2013/03/19 10:02:38 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.3_beta2.ebuild,v 1.2 2013/04/21 19:03:48 mgorny Exp $
 
 EAPI=5
 
@@ -41,7 +41,16 @@ RDEPEND="
 	virtual/glu
 	multilib? (
 			app-emulation/emul-linux-x86-opengl
-			app-emulation/emul-linux-x86-xlibs
+			|| (
+				(
+					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
+			)
 	)
 	qt4? (
 			x11-libs/libICE
diff --git a/x11-drivers/ati-drivers/ati-drivers-13.3_beta3.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.3_beta3.ebuild
index ab7a8e5be0e7..0a68de2950ae 100644
--- a/x11-drivers/ati-drivers/ati-drivers-13.3_beta3.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-13.3_beta3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.3_beta3.ebuild,v 1.1 2013/04/20 20:27:33 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.3_beta3.ebuild,v 1.2 2013/04/21 19:03:48 mgorny Exp $
 
 EAPI=5
 
@@ -41,7 +41,16 @@ RDEPEND="
 	virtual/glu
 	multilib? (
 			app-emulation/emul-linux-x86-opengl
-			app-emulation/emul-linux-x86-xlibs
+			|| (
+				(
+					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
+			)
 	)
 	qt4? (
 			x11-libs/libICE