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!)

4 files changed, 50 insertions, 8 deletions

diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog
index 1c96ba6304d6..70fbf90aeaf6 100644
--- a/net-im/skype/ChangeLog
+++ b/net-im/skype/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/skype
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.145 2013/03/02 22:54:25 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.146 2013/04/21 20:41:03 mgorny Exp $
+
+  21 Apr 2013; Michał Górny <mgorny@gentoo.org> skype-2.2.0.35-r99.ebuild,
+  skype-4.0.0.8-r1.ebuild, skype-4.1.0.20.ebuild:
+  Support multilib libraries alternatively to emul-linux-x86-xlibs.
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> skype-2.2.0.35-r99.ebuild,
   skype-4.0.0.8-r1.ebuild, skype-4.1.0.20.ebuild:
diff --git a/net-im/skype/skype-2.2.0.35-r99.ebuild b/net-im/skype/skype-2.2.0.35-r99.ebuild
index b6d53340aeae..78359a4c48e9 100644
--- a/net-im/skype/skype-2.2.0.35-r99.ebuild
+++ b/net-im/skype/skype-2.2.0.35-r99.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/net-im/skype/skype-2.2.0.35-r99.ebuild,v 1.8 2013/03/02 22:54:25 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.2.0.35-r99.ebuild,v 1.9 2013/04/21 20:41:03 mgorny Exp $
 
 EAPI=4
 inherit eutils gnome2-utils qt4-r2 pax-utils
@@ -27,7 +27,22 @@ RDEPEND="
 	amd64? (
 		>=app-emulation/emul-linux-x86-baselibs-${EMUL_VER}
 		>=app-emulation/emul-linux-x86-soundlibs-${EMUL_VER}
-		>=app-emulation/emul-linux-x86-xlibs-${EMUL_VER}
+		|| (
+			(
+				x11-libs/libX11[abi_x86_32]
+				x11-libs/libXext[abi_x86_32]
+				x11-libs/libXScrnSaver[abi_x86_32]
+				x11-libs/libXv[abi_x86_32]
+				qt-static? (
+					media-libs/fontconfig[abi_x86_32]
+					>=media-libs/freetype-2[abi_x86_32]
+					x11-libs/libICE[abi_x86_32]
+					x11-libs/libSM[abi_x86_32]
+					x11-libs/libXrender[abi_x86_32]
+				)
+			)
+			>=app-emulation/emul-linux-x86-xlibs-${EMUL_VER}
+		)
 		!qt-static? ( >=app-emulation/emul-linux-x86-qtlibs-${EMUL_VER} )
 		)
 	x86? (
diff --git a/net-im/skype/skype-4.0.0.8-r1.ebuild b/net-im/skype/skype-4.0.0.8-r1.ebuild
index d1aa027d678a..88e1ae352cd0 100644
--- a/net-im/skype/skype-4.0.0.8-r1.ebuild
+++ b/net-im/skype/skype-4.0.0.8-r1.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/net-im/skype/skype-4.0.0.8-r1.ebuild,v 1.3 2013/03/02 22:54:25 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.0.0.8-r1.ebuild,v 1.4 2013/04/21 20:41:03 mgorny Exp $
 
 EAPI=4
 inherit eutils gnome2-utils pax-utils
@@ -25,7 +25,22 @@ RDEPEND="virtual/ttf-fonts
 	amd64? (
 		>=app-emulation/emul-linux-x86-baselibs-${EMUL_X86_VER}
 		>=app-emulation/emul-linux-x86-soundlibs-${EMUL_X86_VER}
-		>=app-emulation/emul-linux-x86-xlibs-${EMUL_X86_VER}
+		|| (
+			(
+				x11-libs/libX11[abi_x86_32]
+				x11-libs/libXext[abi_x86_32]
+				x11-libs/libXScrnSaver[abi_x86_32]
+				x11-libs/libXv[abi_x86_32]
+				qt-static? (
+					x11-libs/libICE[abi_x86_32]
+					x11-libs/libSM[abi_x86_32]
+					x11-libs/libXrender[abi_x86_32]
+					media-libs/fontconfig[abi_x86_32]
+					>=media-libs/freetype-2[abi_x86_32]
+				)
+			)
+			>=app-emulation/emul-linux-x86-xlibs-${EMUL_X86_VER}
+		)
 		!qt-static? ( >=app-emulation/emul-linux-x86-qtlibs-${EMUL_X86_VER} )
 	)
 	x86? (
diff --git a/net-im/skype/skype-4.1.0.20.ebuild b/net-im/skype/skype-4.1.0.20.ebuild
index 2325f50ab313..5b957900f62e 100644
--- a/net-im/skype/skype-4.1.0.20.ebuild
+++ b/net-im/skype/skype-4.1.0.20.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/net-im/skype/skype-4.1.0.20.ebuild,v 1.3 2013/03/02 22:54:25 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.1.0.20.ebuild,v 1.4 2013/04/21 20:41:03 mgorny Exp $
 
 EAPI=5
 inherit eutils gnome2-utils pax-utils
@@ -24,8 +24,16 @@ RDEPEND="virtual/ttf-fonts
 		>=app-emulation/emul-linux-x86-baselibs-${EMUL_X86_VER}
 		>=app-emulation/emul-linux-x86-qtlibs-${EMUL_X86_VER}
 		>=app-emulation/emul-linux-x86-soundlibs-${EMUL_X86_VER}
-		>=app-emulation/emul-linux-x86-xlibs-${EMUL_X86_VER}
+		|| (
+			(
+				x11-libs/libX11[abi_x86_32]
+				x11-libs/libXext[abi_x86_32]
+				x11-libs/libXScrnSaver[abi_x86_32]
+				x11-libs/libXv[abi_x86_32]
+			)
+			>=app-emulation/emul-linux-x86-xlibs-${EMUL_X86_VER}
 		)
+	)
 	!amd64? (
 		media-libs/alsa-lib
 		x11-libs/libX11
@@ -36,7 +44,7 @@ RDEPEND="virtual/ttf-fonts
 		dev-qt/qtdbus:4
 		dev-qt/qtgui:4[accessibility,dbus]
 		dev-qt/qtwebkit:4
-		)
+	)
 	selinux? ( sec-policy/selinux-skype )"
 
 src_compile() {