Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug #513718.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

7 files changed, 59 insertions, 53 deletions

diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog
index 494cb31b76cf..71771164ca9d 100644
--- a/net-im/skype/ChangeLog
+++ b/net-im/skype/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/skype
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.154 2014/01/29 15:55:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.155 2014/06/18 20:33:44 mgorny Exp $
+
+  18 Jun 2014; 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, skype-4.2.0.11-r1.ebuild,
+  skype-4.2.0.11.ebuild, skype-4.2.0.13.ebuild:
+  Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug
+  #513718.
 
 *skype-4.2.0.13 (29 Jan 2014)
 
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 0d67dfc7a93e..b5e970277742 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
+# Copyright 1999-2014 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.11 2013/09/08 21:17:44 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.2.0.35-r99.ebuild,v 1.12 2014/06/18 20:33:44 mgorny Exp $
 
 EAPI=4
 inherit eutils gnome2-utils qt4-r2 pax-utils
@@ -29,16 +29,16 @@ RDEPEND="
 		>=app-emulation/emul-linux-x86-soundlibs-${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]
+				>=x11-libs/libX11-1.6.2[abi_x86_32]
+				>=x11-libs/libXext-1.3.2[abi_x86_32]
+				>=x11-libs/libXScrnSaver-1.2.2-r1[abi_x86_32]
+				>=x11-libs/libXv-1.0.10[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]
+					>=media-libs/fontconfig-2.10.92[abi_x86_32]
+					>=media-libs/freetype-2.5.0.1[abi_x86_32]
+					>=x11-libs/libICE-1.0.8-r1[abi_x86_32]
+					>=x11-libs/libSM-1.2.1-r1[abi_x86_32]
+					>=x11-libs/libXrender-0.9.8[abi_x86_32]
 				)
 			)
 			>=app-emulation/emul-linux-x86-xlibs-${EMUL_VER}
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 3001a1944123..f5fb8836bf1f 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
+# Copyright 1999-2014 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.6 2013/09/08 21:17:44 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.0.0.8-r1.ebuild,v 1.7 2014/06/18 20:33:44 mgorny Exp $
 
 EAPI=4
 inherit eutils gnome2-utils pax-utils
@@ -27,16 +27,16 @@ RDEPEND="virtual/ttf-fonts
 		>=app-emulation/emul-linux-x86-soundlibs-${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]
+				>=x11-libs/libX11-1.6.2[abi_x86_32]
+				>=x11-libs/libXext-1.3.2[abi_x86_32]
+				>=x11-libs/libXScrnSaver-1.2.2-r1[abi_x86_32]
+				>=x11-libs/libXv-1.0.10[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]
+					>=x11-libs/libICE-1.0.8-r1[abi_x86_32]
+					>=x11-libs/libSM-1.2.1-r1[abi_x86_32]
+					>=x11-libs/libXrender-0.9.8[abi_x86_32]
+					>=media-libs/fontconfig-2.10.92[abi_x86_32]
+					>=media-libs/freetype-2.5.0.1[abi_x86_32]
 				)
 			)
 			>=app-emulation/emul-linux-x86-xlibs-${EMUL_X86_VER}
diff --git a/net-im/skype/skype-4.1.0.20.ebuild b/net-im/skype/skype-4.1.0.20.ebuild
index 252c20904c30..986446b1960c 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
+# Copyright 1999-2014 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.6 2013/09/08 21:17:44 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.1.0.20.ebuild,v 1.7 2014/06/18 20:33:44 mgorny Exp $
 
 EAPI=5
 inherit eutils gnome2-utils pax-utils
@@ -26,10 +26,10 @@ RDEPEND="virtual/ttf-fonts
 		>=app-emulation/emul-linux-x86-soundlibs-${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]
+				>=x11-libs/libX11-1.6.2[abi_x86_32]
+				>=x11-libs/libXext-1.3.2[abi_x86_32]
+				>=x11-libs/libXScrnSaver-1.2.2-r1[abi_x86_32]
+				>=x11-libs/libXv-1.0.10[abi_x86_32]
 			)
 			>=app-emulation/emul-linux-x86-xlibs-${EMUL_X86_VER}
 		)
diff --git a/net-im/skype/skype-4.2.0.11-r1.ebuild b/net-im/skype/skype-4.2.0.11-r1.ebuild
index c79d8d7f589a..58487ec6f0d4 100644
--- a/net-im/skype/skype-4.2.0.11-r1.ebuild
+++ b/net-im/skype/skype-4.2.0.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.2.0.11-r1.ebuild,v 1.5 2014/01/29 15:55:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.2.0.11-r1.ebuild,v 1.6 2014/06/18 20:33:44 mgorny Exp $
 
 EAPI=5
 inherit eutils gnome2-utils pax-utils
@@ -23,23 +23,23 @@ RDEPEND="virtual/ttf-fonts
 	amd64? (
 		|| (
 			(
-				dev-qt/qtcore:4[abi_x86_32(-)]
+				>=dev-qt/qtcore-4.8.5-r1:4[abi_x86_32(-)]
 				dev-qt/qtdbus:4[abi_x86_32(-)]
-				dev-qt/qtgui:4[accessibility,abi_x86_32(-)]
-				dev-qt/qtwebkit:4[abi_x86_32(-)]
+				>=dev-qt/qtgui-4.8.5-r2:4[accessibility,abi_x86_32(-)]
+				>=dev-qt/qtwebkit-4.8.5:4[abi_x86_32(-)]
 			)
 			>=app-emulation/emul-linux-x86-qtlibs-${EMUL_X86_VER}
 		)
 		|| (
-			media-libs/alsa-lib[abi_x86_32(-)]
+			>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
 			>=app-emulation/emul-linux-x86-soundlibs-${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(-)]
+				>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXScrnSaver-1.2.2-r1[abi_x86_32(-)]
+				>=x11-libs/libXv-1.0.10[abi_x86_32(-)]
 			)
 			>=app-emulation/emul-linux-x86-xlibs-${EMUL_X86_VER}
 		)
diff --git a/net-im/skype/skype-4.2.0.11.ebuild b/net-im/skype/skype-4.2.0.11.ebuild
index b0a7e4a88c7b..a691287bcb34 100644
--- a/net-im/skype/skype-4.2.0.11.ebuild
+++ b/net-im/skype/skype-4.2.0.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.2.0.11.ebuild,v 1.4 2013/09/08 21:17:44 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.2.0.11.ebuild,v 1.5 2014/06/18 20:33:44 mgorny Exp $
 
 EAPI=5
 inherit eutils gnome2-utils pax-utils
@@ -26,10 +26,10 @@ RDEPEND="virtual/ttf-fonts
 		>=app-emulation/emul-linux-x86-soundlibs-${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]
+				>=x11-libs/libX11-1.6.2[abi_x86_32]
+				>=x11-libs/libXext-1.3.2[abi_x86_32]
+				>=x11-libs/libXScrnSaver-1.2.2-r1[abi_x86_32]
+				>=x11-libs/libXv-1.0.10[abi_x86_32]
 			)
 			>=app-emulation/emul-linux-x86-xlibs-${EMUL_X86_VER}
 		)
diff --git a/net-im/skype/skype-4.2.0.13.ebuild b/net-im/skype/skype-4.2.0.13.ebuild
index c10127f4c6fb..34ee50ef3908 100644
--- a/net-im/skype/skype-4.2.0.13.ebuild
+++ b/net-im/skype/skype-4.2.0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.2.0.13.ebuild,v 1.1 2014/01/29 15:55:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.2.0.13.ebuild,v 1.2 2014/06/18 20:33:44 mgorny Exp $
 
 EAPI=5
 
@@ -25,23 +25,23 @@ RDEPEND="
 	amd64? (
 		|| (
 			(
-				dev-qt/qtcore:4[abi_x86_32(-)]
+				>=dev-qt/qtcore-4.8.5-r1:4[abi_x86_32(-)]
 				dev-qt/qtdbus:4[abi_x86_32(-)]
-				dev-qt/qtgui:4[accessibility,abi_x86_32(-)]
-				dev-qt/qtwebkit:4[abi_x86_32(-)]
+				>=dev-qt/qtgui-4.8.5-r2:4[accessibility,abi_x86_32(-)]
+				>=dev-qt/qtwebkit-4.8.5:4[abi_x86_32(-)]
 			)
 			>=app-emulation/emul-linux-x86-qtlibs-${EMUL_X86_VER}
 		)
 		|| (
-			media-libs/alsa-lib[abi_x86_32(-)]
+			>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
 			>=app-emulation/emul-linux-x86-soundlibs-${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(-)]
+				>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXScrnSaver-1.2.2-r1[abi_x86_32(-)]
+				>=x11-libs/libXv-1.0.10[abi_x86_32(-)]
 			)
 			>=app-emulation/emul-linux-x86-xlibs-${EMUL_X86_VER}
 		)