Support multilib providers for deps. Bump to EAPI=5.

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 38 insertions, 58 deletions

diff --git a/sci-chemistry/cara-bin/ChangeLog b/sci-chemistry/cara-bin/ChangeLog
index 00f0b03882ba..2268531b0389 100644
--- a/sci-chemistry/cara-bin/ChangeLog
+++ b/sci-chemistry/cara-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/cara-bin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cara-bin/ChangeLog,v 1.10 2014/10/14 07:53:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cara-bin/ChangeLog,v 1.11 2014/10/15 15:43:28 pacho Exp $
+
+  15 Oct 2014; Pacho Ramos <pacho@gentoo.org> cara-bin-1.8.4-r1.ebuild,
+  cara-bin-1.8.4.ebuild:
+  Support multilib providers for deps. Bump to EAPI=5.
 
 *cara-bin-1.8.4-r1 (14 Oct 2014)
 
diff --git a/sci-chemistry/cara-bin/cara-bin-1.8.4-r1.ebuild b/sci-chemistry/cara-bin/cara-bin-1.8.4-r1.ebuild
index a53c60c83466..388b6211d259 100644
--- a/sci-chemistry/cara-bin/cara-bin-1.8.4-r1.ebuild
+++ b/sci-chemistry/cara-bin/cara-bin-1.8.4-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/sci-chemistry/cara-bin/cara-bin-1.8.4-r1.ebuild,v 1.1 2014/10/14 07:53:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cara-bin/cara-bin-1.8.4-r1.ebuild,v 1.2 2014/10/15 15:43:28 pacho Exp $
 
 EAPI=5
 
@@ -19,34 +19,22 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="lua"
 
 RDEPEND="
-	amd64? (
-		|| (
-			(
-				>=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/libX11-1.6.2[abi_x86_32]
-				>=x11-libs/libXcursor-1.1.14[abi_x86_32]
-				>=x11-libs/libXext-1.3.2[abi_x86_32]
-				>=x11-libs/libXi-1.7.2[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
+	|| (
+		(
+			>=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/libX11-1.6.2[abi_x86_32(-)]
+			>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+			>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+			>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+			>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+			>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
 		)
-	)
-	x86? (
-		media-libs/fontconfig
-		media-libs/freetype
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libXrender
 	)
 	virtual/libstdc++
 	lua? ( dev-lang/lua )"
diff --git a/sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild b/sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild
index 5caf2b9d98a6..51f2d250f8df 100644
--- a/sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild
+++ b/sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild,v 1.8 2014/09/07 15:25:22 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild,v 1.9 2014/10/15 15:43:28 pacho Exp $
 
-EAPI=4
+EAPI=5
 
 MY_PN="${PN%%-bin}"
 MY_P="${MY_PN}_${PV}"
@@ -19,34 +19,22 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="lua"
 
 RDEPEND="
-	amd64? (
-		|| (
-			(
-				>=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/libX11-1.6.2[abi_x86_32]
-				>=x11-libs/libXcursor-1.1.14[abi_x86_32]
-				>=x11-libs/libXext-1.3.2[abi_x86_32]
-				>=x11-libs/libXi-1.7.2[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
+	|| (
+		(
+			>=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/libX11-1.6.2[abi_x86_32(-)]
+			>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+			>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+			>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+			>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+			>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
 		)
-	)
-	x86? (
-		media-libs/fontconfig
-		media-libs/freetype
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libXrender
 	)
 	virtual/libstdc++
 	lua? ( dev-lang/lua )"