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

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

7 files changed, 120 insertions, 137 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/Manifest b/sci-electronics/eagle/Manifest
index 2448f4131e2a..5503c0a5327e 100644
--- a/sci-electronics/eagle/Manifest
+++ b/sci-electronics/eagle/Manifest
@@ -10,21 +10,17 @@ DIST eagle-lin-6.6.0.run 41425368 SHA256 1dd8f59a4c6b3a741e4c5e7eaa88347b9c12be8
 DIST eagle-lin-7.1.0.run 44697003 SHA256 1fa56d1185c6a993224020786bc21ce1f171566e30615dbbcb5b9aa27703d33b SHA512 6a196672088e451bfb708170e42d209e573e46c207bf341b875d6c0683c2c1ec552f1b0d2015291e7f50c81124f15ab14e105548e516590123ab85ca48cfb184 WHIRLPOOL 1c66558e46328ee71108f813008384273774ffc02acfee3175313afbc6f98512d07945b05f9ec327e4f1b232c596e1b7fd236081d1d7b14978e3e50e439b54bd
 DIST eagle-lin-eng-4.16r2.tgz 8922532 SHA256 dc71102780621022c5f3b124bbcde075f23d3e04d624a2985afa733fbae8c7e4
 DIST eagle-lin-ger-4.16r2.tgz 9018957 SHA256 6c570e41668da23e1f473da3bfd879cbeb76bea02d35ae13970db48b3aa36259
-EBUILD eagle-4.16_p2-r2.ebuild 2752 SHA256 280c6f3b021cfe873dd2511942ac75dbce45d64d1b6bc479aa1f3581bb24ce3b SHA512 4a2ea6db7d7b699e5d0978e92d5f3da22d59b83922c37cd4b71be5330f1ede4347dba3c36a0e41c421d74d07da0a282ea1b4a3ec26a59c5d0e31c7982218c0b9 WHIRLPOOL 5be4c4227fc186d9d1310831e67dc2bc609a038475f02df8dec7d89f91b17dc746f29887f9c71c0bd7d0874deb9250a7fbcbe1bc7600b4a1cd9473939af29909
-EBUILD eagle-5.11.0.ebuild 3109 SHA256 9bc8d9b2be1d4f9618e16d859b226c92413d1969cc5db3227e2370312ed599d0 SHA512 ef7a7bd274d2977446373d3afe2499bfdfba5f65c9c53c546a85d669babd6c97a6c4a38400be90069c80e2569eb66c2be013f17dc96e89b71096d22d9a83d2ba WHIRLPOOL c6801730090efec64d8ee5739d79db9bad73ceef903b669dbce790001f39180db3343bb256153194707faecb9b1a9dee292748436469deb9ee5bcd2fe821f6aa
-EBUILD eagle-5.12.0.ebuild 3724 SHA256 5df51ea7a0ba95cdc55cab16b288fa7ff5eb9d5de249fb56df2695c823e5c2c9 SHA512 1d864a2daba41271be9ca7210af2ce4ef11d03d0ac79ac7d844ad2c18f6df1f2a57ba52603072f7a60c5a676f43ac3b85ae112a7dc85ebf87fc3ca2b603630c0 WHIRLPOOL e4a2a344a7a3125ecd52e395a8fa8ec438cd152b7c4e4deb5a8eeb0a6fc52f9c5ad2ec007f09bbfe914ae9ed8d47a52cc8435cabb9ae6eadb05195a26b7209c6
-EBUILD eagle-6.6.0.ebuild 3583 SHA256 49f59621aa4badf95f39b68337a68aaab964c2eab759aec892820af6aa58fda0 SHA512 b1ab828b51ed4f20789b28cc6e20ad5b89555500500ed0ee765fd24f06455ae4a832642e8d5e1821eb581da9cb56071bc1634b52d1bb0db56825568b4bdb5902 WHIRLPOOL f02c930e76c9b8ad77724ea12078fb7c8b82bd0125a806adfe9537e9d891db1774885ecd77c025287c6d0dfa2ad35899035c8e178b3d637cba880142d6d220e8
-EBUILD eagle-7.1.0.ebuild 3585 SHA256 449038d3ba7800640ce764951e365841b6470b57ff89ec04353b6d4d8ab25db3 SHA512 3e594819b75cc0fe52a4ee7356fff4b2789be1c061e93e8fc99bf605bb43987d75de107360a450e1f110c17ee8b3c9920161914eec6bdf06dd8ae1530552a4a7 WHIRLPOOL 6568094119a9b0a8c64afa334e6dccb439eaa1bf3aeae36c2d39c3abcc1ae6148814fc87f464c27d788247810601111e75bc1eb4eab496f21a6b1b608f76c03f
-MISC ChangeLog 10160 SHA256 a15b7366efd2325bfba15fbd995b4e80e17cd6ea35ac73290613f96c5f9d0e2e SHA512 6f2e49df32dc5db3762c32202d196270de83e1e6b4d90d27f5df10a9d16469275fc652d6ff3ac733b636a192ee077e5c895b30cca7474f291f72b885f08aa9e6 WHIRLPOOL 11bdaf14fe21f96f8454e106e66284e89ecf4c02974f075793620cac7b388d67c99d520d245a21b27e0f3dab793047d053b0ba342f275391f063c6c1cd74a20c
+EBUILD eagle-4.16_p2-r2.ebuild 2828 SHA256 16aa33f5f429750b551d4756f7d596c66d21610cd687530037143681992c3f58 SHA512 4ba96068d1630333f9764a11415f58623d958d94618526a052ba6016f101428bfebd59a811fccfb8a77a67d93fb424cd500ec6586f76fd96070a308c9d749088 WHIRLPOOL 4db7dc5b688defee17c4c87a76a8afc29483e25ebba4d333998f16fffffe50d74ee2fe29c9b2f64a7c12098014d4d35de0ff68b9918ed18d2131d571b278a34b
+EBUILD eagle-5.11.0.ebuild 3307 SHA256 6bddd962630f247f491e17468ab6ec5c0c26211a08477aedcfede292bbd88ba5 SHA512 4d426943235a64a803b375e005c563ca23430acc468436d8a87d1e4fff32a36617a71e99be50fb3c9d8f6b47c6c346eac2e2bd473c5d0644714284629718f330 WHIRLPOOL fe89a53352db60d26783390ba44062b92c1f68b24d7c4c2fb1eaa97a80c30955fc388c078e9d32cf6c6c6ccb18122a197f538198ebdd97639f5389a18959330b
+EBUILD eagle-5.12.0.ebuild 3522 SHA256 ade63505ea84b2042869ee0d89ca4cd328e5d2bdc80a1ec44ed8006191f5ae0b SHA512 724b5010bc90929cef337504e1731de12fce1acd5c55d717275d1a6fc12b6def2befc1c3774541fa36bfc2ca4412ad8f7edab7a5b7dcce55794c5a089725974b WHIRLPOOL a78658452fe3f28f3803b7b0d085c833441a687112d514fe7cc2923a25dfb638172676d346e5173768dbdbf16c3d4e63c8e07b05090cb7566a20fd5f3fd229a7
+EBUILD eagle-6.6.0.ebuild 3461 SHA256 4c8994f1cdd513ccd91120620c89faf5ad5b3d5d9f38d635d1fad8f109f29ea9 SHA512 57d14d7c7e6ca33186f8526bedfed20e040d27bcda1f9204d52ae8810ab7f31f67a090b4f8c21154bc70d6b6a93b2ca35600dec9547ff4bcdd45b013ef73f4f5 WHIRLPOOL 9c8e46f8211e9212c8842878c9cdb8d8f4956db36004c75619a57c148765e3ee2e80c3e9c92f82061d98f2105820ccc331d00fde91e6acb4680cabf805b3ee72
+EBUILD eagle-7.1.0.ebuild 3463 SHA256 db5939dfbbeb15d77cf93d9f286f19f2f6a93f07434ef3e967553cbf03ad7b09 SHA512 85c25e050b4087894d15c0545d676317d9e876f51c511435b329d35a53327f0d821805b42dae4b704ad93efce5b96a55fc200b0af2b1cb8dfb844969582d98a5 WHIRLPOOL 850e88fcabb9528de6a99dbc1e4b0cc35050dda53568262aaeb868b645263f3c61ad917377c20c09ae38bc910671d078a920e62fbefd30acd0df383b50fe45ce
+MISC ChangeLog 10373 SHA256 0049adb3c0c733b73248c4e5734c548acabd4be2098b6f154372a7b780a775a7 SHA512 8dceba35fb5ea90f34dca7c5428d62540ca72fe86005f8b30ca6ad204cd12639fc0f47c2510b18c915d330fc23eb29859bf94ff9cb8ea6c96f81707777f16b97 WHIRLPOOL 384359f00ff52d4df81cc895ec8df088a62e02f05d195b8d7b3788b630cea649c0edf840646cb5d3b9cca7c21b98e4c2a663eb1ccc3d6f2e7edc938977816152
 MISC metadata.xml 667 SHA256 e2b23272a937a4e4f89bf9f5af1be0cca6d5decee0041698c0b65f3ab1b9cd1c SHA512 8cae35fa452b5dbc51e4a5f5efd8c7927720b614f6f70579c5778f79f241ef71025af9240f723f11a4694229bb679a8f9b6effbb5516c2f6e593fcd518e44c9a WHIRLPOOL a9c92b8d95068b0f2cd7fe5b10b567ddeabeafaaff22aab26b44579d1ca9f00b43630a966bf9a2426a43c672db8780d32cc0a008655394c8b9b6b63feacc0625
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT6SUYAAoJEMOx0zmdw4Z1rQkH+wXLj7X2TkyQk6bkZ5OA3PH/
-fAkHXDrBdsaN4gsb9ZowIiftGSWcVF4KAzuTNvJ1/HZ2qS61riIhOHDJDvcLPRK8
-txgQysxmxsit6sFhddkETpRonEPPzAW78o2azwtTkJCjIEcWRY19lOxz1AHYUV8d
-EabB/Ny8iHaPo5SLmR99kQHIKfLjLYvIgAjJaiBuXEhgAerYu0u2XiMgZ8mGTgEp
-kZVWC165ZAFllfLcidLMJU+mslI2AnOsC0eowz1fBPiNZEYKvpnWu53K1XQHCc13
-w4Ni6EKhYJHYtXE0fOiBO6Uz/KKtUq7IYTapfw5MMROLJRER4PoIwY3HYqAYgbw=
-=V9V8
+iEYEAREIAAYFAlQ+4YYACgkQCaWpQKGI+9SYjwCeI4sxJhtzRY5mTUIdS3+Yewii
+Tj8An3tVA/TmQQugJni0Y+PSYIId+hno
+=nLDH
 -----END PGP SIGNATURE-----
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