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

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

5 files changed, 87 insertions, 42 deletions

diff --git a/app-emulation/crossover-office-bin/ChangeLog b/app-emulation/crossover-office-bin/ChangeLog
index 45ae4aa764f0..bfb104d3db64 100644
--- a/app-emulation/crossover-office-bin/ChangeLog
+++ b/app-emulation/crossover-office-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/crossover-office-bin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/ChangeLog,v 1.19 2012/05/10 02:13:15 tetromino Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/ChangeLog,v 1.20 2014/10/15 12:15:36 pacho Exp $
+
+  15 Oct 2014; Pacho Ramos <pacho@gentoo.org> crossover-office-bin-6.0.0.ebuild,
+  crossover-office-bin-6.0.1.ebuild, crossover-office-bin-6.1.0.ebuild,
+  crossover-office-bin-6.2.0.ebuild:
+  Support multilib providers for deps. Bump to EAPI=5.
 
   10 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   crossover-office-bin-6.0.0.ebuild, crossover-office-bin-6.0.1.ebuild,
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-6.0.0.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-6.0.0.ebuild
index 1a390bc75716..dcb84394782b 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-6.0.0.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-6.0.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.0.0.ebuild,v 1.6 2012/05/10 02:13:15 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.0.0.ebuild,v 1.7 2014/10/15 12:15:36 pacho Exp $
+
+EAPI=5
 
 inherit unpacker
 
@@ -14,15 +16,23 @@ KEYWORDS="-* amd64 x86"
 IUSE="nas"
 RESTRICT="fetch strip"
 
-RDEPEND="sys-libs/glibc
-	x11-libs/libXrandr
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXxf86dga
-	x11-libs/libXxf86vm
+RDEPEND="
 	dev-util/desktop-file-utils
-	nas? ( media-libs/nas )
-	amd64? ( app-emulation/emul-linux-x86-xlibs )"
+	sys-libs/glibc
+	|| (
+		(
+			x11-libs/libXrandr[abi_x86_32(-)]
+			x11-libs/libXi[abi_x86_32(-)]
+			x11-libs/libXmu[abi_x86_32(-)]
+			x11-libs/libXxf86dga[abi_x86_32(-)]
+			x11-libs/libXxf86vm[abi_x86_32(-)]
+			nas? ( media-libs/nas[abi_x86_32(-)] )
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		)
+	)
+"
 
 S=${WORKDIR}
 
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild
index 4a192b992700..c30deaff84c6 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild,v 1.6 2012/05/10 02:13:15 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild,v 1.7 2014/10/15 12:15:36 pacho Exp $
+
+EAPI=5
 
 inherit unpacker
 
@@ -14,15 +16,23 @@ KEYWORDS="-* amd64 x86"
 IUSE="nas"
 RESTRICT="fetch strip"
 
-RDEPEND="sys-libs/glibc
-	x11-libs/libXrandr
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXxf86dga
-	x11-libs/libXxf86vm
+RDEPEND="
 	dev-util/desktop-file-utils
-	nas? ( media-libs/nas )
-	amd64? ( app-emulation/emul-linux-x86-xlibs )"
+	sys-libs/glibc
+	|| (
+		(
+			x11-libs/libXrandr[abi_x86_32(-)]
+			x11-libs/libXi[abi_x86_32(-)]
+			x11-libs/libXmu[abi_x86_32(-)]
+			x11-libs/libXxf86dga[abi_x86_32(-)]
+			x11-libs/libXxf86vm[abi_x86_32(-)]
+			nas? ( media-libs/nas[abi_x86_32(-)] )
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		)
+	)
+"
 
 S=${WORKDIR}
 
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild
index ac6511b0d287..f4b2fdf5cc1c 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild,v 1.5 2012/05/10 02:13:15 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild,v 1.6 2014/10/15 12:15:36 pacho Exp $
+
+EAPI=5
 
 inherit unpacker
 
@@ -14,15 +16,23 @@ KEYWORDS="-* amd64 x86"
 IUSE="nas"
 RESTRICT="fetch strip"
 
-RDEPEND="sys-libs/glibc
-	x11-libs/libXrandr
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXxf86dga
-	x11-libs/libXxf86vm
+RDEPEND="
 	dev-util/desktop-file-utils
-	nas? ( media-libs/nas )
-	amd64? ( app-emulation/emul-linux-x86-xlibs )"
+	sys-libs/glibc
+	|| (
+		(
+			x11-libs/libXrandr[abi_x86_32(-)]
+			x11-libs/libXi[abi_x86_32(-)]
+			x11-libs/libXmu[abi_x86_32(-)]
+			x11-libs/libXxf86dga[abi_x86_32(-)]
+			x11-libs/libXxf86vm[abi_x86_32(-)]
+			nas? ( media-libs/nas[abi_x86_32(-)] )
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		)
+	)
+"
 
 S=${WORKDIR}
 
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild
index 7eebd2ce12f1..22b5bd028cf8 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild,v 1.6 2012/05/10 02:13:15 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild,v 1.7 2014/10/15 12:15:36 pacho Exp $
+
+EAPI=5
 
 inherit unpacker
 
@@ -14,15 +16,23 @@ KEYWORDS="-* amd64 x86"
 IUSE="nas"
 RESTRICT="fetch strip"
 
-RDEPEND="sys-libs/glibc
-	x11-libs/libXrandr
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXxf86dga
-	x11-libs/libXxf86vm
+RDEPEND="
 	dev-util/desktop-file-utils
-	nas? ( media-libs/nas )
-	amd64? ( app-emulation/emul-linux-x86-xlibs )"
+	sys-libs/glibc
+	|| (
+		(
+			x11-libs/libXrandr[abi_x86_32(-)]
+			x11-libs/libXi[abi_x86_32(-)]
+			x11-libs/libXmu[abi_x86_32(-)]
+			x11-libs/libXxf86dga[abi_x86_32(-)]
+			x11-libs/libXxf86vm[abi_x86_32(-)]
+			nas? ( media-libs/nas[abi_x86_32(-)] )
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		)
+	)
+"
 
 S=${WORKDIR}