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

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

6 files changed, 111 insertions, 124 deletions

diff --git a/sci-electronics/eagle/ChangeLog b/sci-electronics/eagle/ChangeLog
index e9d6964bc572..c7295013d11b 100644
--- a/sci-electronics/eagle/ChangeLog
+++ b/sci-electronics/eagle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-electronics/eagle
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/ChangeLog,v 1.61 2014/08/11 20:18:31 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/ChangeLog,v 1.62 2014/10/15 21:05:09 pacho Exp $
+
+  15 Oct 2014; Pacho Ramos <pacho@gentoo.org> eagle-4.16_p2-r2.ebuild,
+  eagle-5.11.0.ebuild, eagle-5.12.0.ebuild, eagle-6.6.0.ebuild,
+  eagle-7.1.0.ebuild:
+  Support multilib providers for deps. Bump to EAPI=5.
 
 *eagle-7.1.0 (11 Aug 2014)
 *eagle-6.6.0 (11 Aug 2014)
diff --git a/sci-electronics/eagle/eagle-4.16_p2-r2.ebuild b/sci-electronics/eagle/eagle-4.16_p2-r2.ebuild
index 2a30d4f37e3b..c5fdfc327ed6 100644
--- a/sci-electronics/eagle/eagle-4.16_p2-r2.ebuild
+++ b/sci-electronics/eagle/eagle-4.16_p2-r2.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/sci-electronics/eagle/eagle-4.16_p2-r2.ebuild,v 1.6 2012/09/24 00:47:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-4.16_p2-r2.ebuild,v 1.7 2014/10/15 21:05:09 pacho Exp $
+
+EAPI=5
 
 inherit eutils
 
@@ -29,13 +31,20 @@ SRC_URI="linguas_de? ( ftp://ftp.cadsoft.de/pub/program/${MY_PV}/${PN}-lin-ger-$
 	!linguas_de? ( ftp://ftp.cadsoft.de/pub/program/${MY_PV}/${PN}-lin-eng-${MY_PV}.tgz
 			doc? ( mirror://gentoo/${MANDOC}-eng-${MANVER}.pdf ) )"
 
-RDEPEND="sys-libs/glibc
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	amd64? ( app-emulation/emul-linux-x86-baselibs
-		 app-emulation/emul-linux-x86-xlibs )"
+RDEPEND="
+	sys-libs/glibc
+	|| (
+		(
+			x11-libs/libXext[abi_x86_32(-)]
+			x11-libs/libX11[abi_x86_32(-)]
+			x11-libs/libXau[abi_x86_32(-)]
+			x11-libs/libXdmcp[abi_x86_32(-)]
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		)
+	)
+"
 
 INSTALLDIR="/opt/eagle"
 case "${LINGUAS}" in
diff --git a/sci-electronics/eagle/eagle-5.11.0.ebuild b/sci-electronics/eagle/eagle-5.11.0.ebuild
index fcd3f2da6d21..6efde0b2aeff 100644
--- a/sci-electronics/eagle/eagle-5.11.0.ebuild
+++ b/sci-electronics/eagle/eagle-5.11.0.ebuild
@@ -1,8 +1,8 @@
-# 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/sci-electronics/eagle/eagle-5.11.0.ebuild,v 1.5 2013/08/01 20:52:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-5.11.0.ebuild,v 1.6 2014/10/15 21:05:09 pacho Exp $
 
-EAPI="1"
+EAPI=5
 
 inherit eutils
 
@@ -19,16 +19,24 @@ SRC_URI="ftp://ftp.cadsoft.de/eagle/program/${PV%\.[0-9]}/${PN}-lin-${PV}.run"
 
 QA_FLAGS_IGNORED="opt/eagle-${PV}/bin/eagle"
 
-RDEPEND="sys-libs/glibc
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x86? ( || ( virtual/jpeg:62  media-libs/jpeg:62 )
-		media-libs/libpng:1.2
-		=dev-libs/openssl-0.9.8* )
-	amd64? ( app-emulation/emul-linux-x86-baselibs
-		app-emulation/emul-linux-x86-xlibs )"
+RDEPEND="
+	sys-libs/glibc
+	|| (
+		(
+			|| ( virtual/jpeg:62[abi_x86_32(-)]  media-libs/jpeg:62[abi_x86_32(-)] )
+			>=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)]
+			>=dev-libs/openssl-0.9.8z_p1-r2:0.9.8[abi_x86_32(-)]
+			x11-libs/libXext[abi_x86_32(-)]
+			x11-libs/libX11[abi_x86_32(-)]
+			x11-libs/libXau[abi_x86_32(-)]
+			x11-libs/libXdmcp[abi_x86_32(-)]
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		)
+	)
+"
 
 # Append ${PV} since that's what upstream installs to
 INSTALLDIR="/opt/eagle-${PV}"
diff --git a/sci-electronics/eagle/eagle-5.12.0.ebuild b/sci-electronics/eagle/eagle-5.12.0.ebuild
index 01413ea80228..335e6eedb7f6 100644
--- a/sci-electronics/eagle/eagle-5.12.0.ebuild
+++ b/sci-electronics/eagle/eagle-5.12.0.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-electronics/eagle/eagle-5.12.0.ebuild,v 1.1 2014/08/11 20:18:31 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-5.12.0.ebuild,v 1.2 2014/10/15 21:05:09 pacho Exp $
 
 EAPI="5"
 
@@ -18,43 +18,30 @@ SRC_URI="ftp://ftp.cadsoft.de/eagle/program/${PV%\.[0-9]}/${PN}-lin-${PV}.run"
 
 QA_PREBUILT="opt/${P}/bin/eagle"
 
-RDEPEND="sys-libs/glibc
-	x86? (
-		sys-libs/zlib
-		x11-libs/libXi
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrender
-		x11-libs/libXrandr
-		x11-libs/libXcursor
-		media-libs/freetype
-		media-libs/fontconfig
-		|| ( virtual/jpeg:62  media-libs/jpeg:62 )
-		media-libs/libpng:1.2
-	)
-	amd64? (
-		|| (
-			(
-				>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-				virtual/jpeg:62[-abi_x86_32(-)]
-				media-libs/libpng:1.2[-abi_x86_32(-)]
-			)
-			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+RDEPEND="
+	sys-libs/glibc
+	|| (
+		(
+			|| ( virtual/jpeg:62[abi_x86_32(-)]  media-libs/jpeg:62[abi_x86_32(-)] )
+			>=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)]
+			>=dev-libs/openssl-0.9.8z_p1-r2:0.9.8[abi_x86_32(-)]
+			>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+			>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
+			>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+			x11-libs/libXext[abi_x86_32(-)]
+			x11-libs/libX11[abi_x86_32(-)]
+			>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+			>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+			>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+			>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+
 		)
-		|| (
-			(
-				>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-				>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
-				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			)
+		amd64? (
+			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
 			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
 		)
-	)"
+	)
+"
 
 # Append ${PV} since that's what upstream installs to
 INSTALLDIR="/opt/eagle-${PV}"
diff --git a/sci-electronics/eagle/eagle-6.6.0.ebuild b/sci-electronics/eagle/eagle-6.6.0.ebuild
index e0c5a108d7e6..75029ce3c50c 100644
--- a/sci-electronics/eagle/eagle-6.6.0.ebuild
+++ b/sci-electronics/eagle/eagle-6.6.0.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-electronics/eagle/eagle-6.6.0.ebuild,v 1.1 2014/08/11 20:18:31 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-6.6.0.ebuild,v 1.2 2014/10/15 21:05:09 pacho Exp $
 
 EAPI="5"
 
@@ -17,41 +17,30 @@ IUSE="doc linguas_de linguas_zh"
 
 QA_PREBUILT="opt/eagle/bin/eagle"
 
-RDEPEND="sys-libs/glibc
-	x86? (
-		sys-libs/zlib
-		dev-libs/openssl
-		x11-libs/libXi
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrender
-		x11-libs/libXrandr
-		x11-libs/libXcursor
-		media-libs/freetype
-		media-libs/fontconfig
-	)
-	amd64? (
-		|| (
-			(
-				>=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)]
-				>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-			)
-			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+RDEPEND="
+	sys-libs/glibc
+	|| (
+		(
+			|| ( virtual/jpeg:62[abi_x86_32(-)]  media-libs/jpeg:62[abi_x86_32(-)] )
+			>=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)]
+			>=dev-libs/openssl-0.9.8z_p1-r2:0.9.8[abi_x86_32(-)]
+			>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+			>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
+			>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+			x11-libs/libXext[abi_x86_32(-)]
+			x11-libs/libX11[abi_x86_32(-)]
+			>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+			>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+			>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+			>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+
 		)
-		|| (
-			(
-				>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-				>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
-				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			)
+		amd64? (
+			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
 			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
 		)
-	)"
+	)
+"
 
 # Append ${PV} since that's what upstream installs to
 case "${LINGUAS}" in
diff --git a/sci-electronics/eagle/eagle-7.1.0.ebuild b/sci-electronics/eagle/eagle-7.1.0.ebuild
index 04a25eca0119..b2d6914a697b 100644
--- a/sci-electronics/eagle/eagle-7.1.0.ebuild
+++ b/sci-electronics/eagle/eagle-7.1.0.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-electronics/eagle/eagle-7.1.0.ebuild,v 1.1 2014/08/11 20:18:31 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-7.1.0.ebuild,v 1.2 2014/10/15 21:05:09 pacho Exp $
 
 EAPI="5"
 
@@ -17,41 +17,30 @@ IUSE="doc linguas_de linguas_zh"
 
 QA_PREBUILT="opt/eagle/bin/eagle"
 
-RDEPEND="sys-libs/glibc
-	x86? (
-		sys-libs/zlib
-		dev-libs/openssl
-		x11-libs/libXi
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrender
-		x11-libs/libXrandr
-		x11-libs/libXcursor
-		media-libs/freetype
-		media-libs/fontconfig
-	)
-	amd64? (
-		|| (
-			(
-				>=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)]
-				>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-			)
-			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+RDEPEND="
+	sys-libs/glibc
+	|| (
+		(
+			|| ( virtual/jpeg:62[abi_x86_32(-)]  media-libs/jpeg:62[abi_x86_32(-)] )
+			>=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)]
+			>=dev-libs/openssl-0.9.8z_p1-r2:0.9.8[abi_x86_32(-)]
+			>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+			>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
+			>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+			x11-libs/libXext[abi_x86_32(-)]
+			x11-libs/libX11[abi_x86_32(-)]
+			>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+			>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+			>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+			>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+
 		)
-		|| (
-			(
-				>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-				>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
-				>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-				>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-				>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			)
+		amd64? (
+			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
 			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
 		)
-	)"
+	)
+"
 
 # Append ${PV} since that's what upstream installs to
 case "${LINGUAS}" in