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

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

4 files changed, 46 insertions, 78 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/Manifest b/sci-chemistry/cara-bin/Manifest
index b50481348e55..ce4f014fed1c 100644
--- a/sci-chemistry/cara-bin/Manifest
+++ b/sci-chemistry/cara-bin/Manifest
@@ -1,28 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST Start1.2.cara.xz 43124 SHA256 c28321b051902bc020ea04a46b33ceb19b1b3d902264956474c90798f2d60d25 SHA512 26874d634491558dc593a0ec32e83d5cfceedc69bbf901f4d25d6b9515b84aebffbf495d1ac34b3664b8b5822954edf62c5b88dcca6bcfcb152715caa88f5f03 WHIRLPOOL 034e8b73354e7244e4fcc21c03da7b99c02019ebef1e0754dd9cb8249fe68b82be1e78db9848912fc48c8625b0f2acf0f41242d83949a117f0b8a648a930445e
 DIST cara_1.8.4_linux.gz 6677463 SHA256 5ba34cc8b0782e1791186cde5a02ec036665769df7f5c559db27377b6f3cc6d6 SHA512 e264cfbef640f267132dfd48b940203a319c8f34de71c5b786c6bfc2ab561bdf3fbd79516d619ca52b2aca64a2887f770fabfabedb76433c5f78aa02c65f898f WHIRLPOOL 5619c70bc31dfb328a72233c8fc3e3d8dcfdccc3db4e5a67430f0ebe8a0a474f998abb2a0ec56f4a3c2e6e4b95e324ec3c667864c81cb3531a1e162439c780da
-EBUILD cara-bin-1.8.4-r1.ebuild 1560 SHA256 a9b60fc300025d2ccbe1980cc8a4fb86e7631bb8607e4ba43ef57a0d1b65d3b8 SHA512 7454d032bd4d1054f3aeeb3f521948586da7766d7024da6d0f282242255bb9a6325267104abef35ae02d3be3b87e5a442025fe90cd59b812af8484885eb67ee3 WHIRLPOOL ea15a3a46553595382294f588bc0aaa4a5cb07abfdc762d4b6c513c762fab0b436abb93c00cd56fe474ecf16434483ddef2e8f4305d25edd14fdb9735209e917
-EBUILD cara-bin-1.8.4.ebuild 1635 SHA256 128b14975b357e26059735aa5c62e370285ec0b026431af8028743802c9916d2 SHA512 59c27dd61d063a6228512b760f15713b22aebe08dfe61403a977c88abfc5bd5b76ab543fe1f1e9cb1709f92c09451f52f5169ff8df258f8dce60a4ae6ea33208 WHIRLPOOL e487d750773c0a02079a98da12f53c10b941970c3e91bb61d236ae4cff473e0c188bba202a5575377f3ce89d9ebc03a2587d8e5967fe5b8c8161c0116b02e55a
-MISC ChangeLog 1423 SHA256 39c8c4aec986876464531c4e9af9b9d88c768f4601c8121702fb957dc3af5455 SHA512 1c4c9a852b5b7fb99edc4f6d8859151e4b151f30d5cc3bfc32f24d774ff9b76f22e5c383e19bf3e02b44904ddd8ebe19e0e6b075c45061d9dcadedec462e1e7b WHIRLPOOL bb7bef6e5c9d3fd90fe50cd8f477a568fd138ec3713ae06ad4d016a6b206392e43ef6ae5b703acc60bc191443676abe4490bdddb196dd95e529b05395c2a1b71
+EBUILD cara-bin-1.8.4-r1.ebuild 1384 SHA256 80dfe3d6512f26ea26c2b0cb2425353280caa5d16b8b83f952dddfdedfb3aaf4 SHA512 d99bd302ef491a554b2f190adc20acf416eff5d4adcfe103e956b428a1b28bb112267dd910ad79b916348c3234941addb237aea490b0eee2b608c2cdd517d8be WHIRLPOOL c430d2534ab222dddae34a025ae2a8461ba5ad3700016b0c8ccbe06f29582f3df367f06eee7e50bc230e0a754f8a64851ea155ec4e155440265df234a61991a2
+EBUILD cara-bin-1.8.4.ebuild 1460 SHA256 26b6b69030bb5197b7bff01784ff30e570f1fed23f125bcaf9c3eba68150e274 SHA512 d0002bfe2349d0af1cc33fff6b6e91d0d7d439a7aadd6b0a460a73a95d4cc982863c6ac5b708f7e51179db93303c7a57becfb9eb59e6fbc49d75fe82d18e3049 WHIRLPOOL 534271189161e392c0b5c4cecc60eae18467412a56f371e278136b8b5d5738814a86dfa6fb3bf77367d5e818108ebfd5c57dd73926d75fc66bae0f2aaf96ab7e
+MISC ChangeLog 1577 SHA256 13fa4fa215ecef20d83d6fa6828ba161624a3d6e400988791056f89e2b114777 SHA512 ba8952fe9be515239b890edcd96446ab050fd4d71fc20083f6c157b221e20253e229c014091c5b43dae5635e45afdbdbd5de2f3defce875fc8b876571e03c839 WHIRLPOOL 2d9c0b264adede10c542153c5f9dfe9b362f49bad8d2a745bef4926923c307027b113d20cc25e974b0e7201e2bc1eeb82bb7bec09b5d56ab0e136cdc0302c8e3
 MISC metadata.xml 205 SHA256 b4660d1f4b47c8c40fc6f986791c6da3f0d7513fe4489a0d2bbb83346dcb1f5b SHA512 0e0b6e89b125b4849b4164e7cabb5297ae930c4db499c6685c3852a60e209418c26eb33e452a0a78e800c960ac5032f97d436bc3b7266a0ac76092f6f2595d11 WHIRLPOOL dc3dc7c840a6640b42e3fc981c95d0a8e43d3b5834f447a09deebc1b35dbb26e48c3d85db73725c42d2036edd9f141fb02a3a9d61522861f4e97e3e974987473
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJUPNZgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirg0sP/jcxvVTCFWexYAkzKZ/3WrsI
-GiGR24WbyrsBvrqFA2i1R0r+LUl24+C1MZf1Ihg4RxcQkY7Pr11GNcecjAypYFag
-F4/pAXAREg3ixi1zg6jVSpeJtXWJCqndb9w8V64UY5VT/oH0qeKgAVg2gZc91BNy
-zsR7lqkeBZpSoyx2qKsqdGlXt/Rs81g8DXR+IjrdHl2ZwsLn3hlRPmM8zlG53xfL
-KBB7T1OX59xhcaf3mak2WA6nD1/eiUwW/H9eNVsp+HJ7lEntpP0Dh6vQx8MrI/Rt
-0xYUB4dsGvMISH3R5RkAxV81XUbYmoEsi6FKN8yN8IAbRvaWqkTHWHaxxn7doXjq
-5QeuTNRM6HZhzQae5UBY33QbJ+cCqn3fZipTRUw2fGsNYwQN/9a0LmAqSoix1lme
-R9gDXwUXWh9w5O4lgBqR/wq6+3186RXLncD/Ubd0kxz9KXDmexjYQbGRhEx+g5rk
-hlSN4bnIU1eLNQwvKhMforVjurFeUNrULXOF5Y8vnQ0XwtDWVhyPyAvEtGKsZPLT
-E/i37V7hjpwr1Ig1Dc+HV3b7u1sKuOeTCcM1lztyrswJgfBAin6XbWzhUXeR5AtA
-WrfOuN1mpLkDSKYoyuhEJkpc4Ef7dU7sd+GB+kPWv/E9yoNGrFFboWvYfGW+IkQO
-t1b/8+G9Zcd9Vcs2Hb7g
-=ZRN8
+iEYEAREIAAYFAlQ+liEACgkQCaWpQKGI+9QRAACdHCVni0iybb3bs/LK6ovoxoAy
+st8An3d1PA+fAdSV2AQGi9AhuvPr6IzW
+=b1CA
 -----END PGP SIGNATURE-----
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 )"