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, 30 insertions, 22 deletions

diff --git a/net-print/cndrvcups-lb/ChangeLog b/net-print/cndrvcups-lb/ChangeLog
index fbe6dc5a7f0f..8c7cf375a909 100644
--- a/net-print/cndrvcups-lb/ChangeLog
+++ b/net-print/cndrvcups-lb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/cndrvcups-lb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cndrvcups-lb/ChangeLog,v 1.4 2014/09/25 09:28:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cndrvcups-lb/ChangeLog,v 1.5 2014/10/15 15:17:27 pacho Exp $
+
+  15 Oct 2014; Pacho Ramos <pacho@gentoo.org> cndrvcups-lb-2.70-r2.ebuild,
+  cndrvcups-lb-2.90.ebuild:
+  Support multilib providers for deps. Bump to EAPI=5.
 
 *cndrvcups-lb-2.90 (25 Sep 2014)
 
diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest
index 4e23b07fc20c..c79ec39d6bf1 100644
--- a/net-print/cndrvcups-lb/Manifest
+++ b/net-print/cndrvcups-lb/Manifest
@@ -3,14 +3,14 @@ Hash: SHA256
 
 DIST Linux_UFRII_PrinterDriver_V270_uk_EN.tar.gz 79196275 SHA256 282821cad7d0e0dacf9e49815cdc62f32404ea214fdab462e9e328fa9b1eea18 SHA512 6cb761db3873533772a770181e5383f9b9d5e2fd208edd0de8525faf4728111addb5720c86f5b8fdee876588c967acf168a64ae291b7cd202759c03b241cfe78 WHIRLPOOL 3092effe07cd042247e1f8f9de0752ee031f15eb51e539639a12f4fc81e1fabf874ee1fb4b515d4e7f2090405d0867eafe9439c93503fed4d0914fa5fa209655
 DIST Linux_UFRII_PrinterDriver_V290_uk_EN.tar.gz 90901373 SHA256 bcc9db26e261d239438aeb15f171b5b0e7fd305abd0729be0e806bb4c039654a SHA512 23181155f5719fa0a9c216c058be749b5faaa8ee745d260eba2e5e284ef4ff161e344289a7c301a2d74cc919c5031763b0daf41cd07686cfdce188492a9b34b2 WHIRLPOOL 82bb966d823f8019d6275d421ebd2ff848556415e1767bd8fc2638d97479e15029a48818e5b45e9210781f4f37fd269dde46763404314b6c47ee0b4670e03600
-EBUILD cndrvcups-lb-2.70-r2.ebuild 2729 SHA256 d1bbfedf334e2ee37eb65566be6d6e83d82122e92f2185b60169eb73fc0bddbd SHA512 28b1d1df30f8e3e1dbfead9e2f3fdac316c693d5a7a841048c6420cd5d686790d3843947ec7053d3c808b06dd33cc32fd17fbfbcca6cf87fa262c20faea698f1 WHIRLPOOL 57a33e17fe7989b5220aab352a143272afdc0a217c9aef86a9404722d807be5a581aa33ba35c2f051203a74fab537db94b7000ac2f6c0a7ed41c739f59b109a4
-EBUILD cndrvcups-lb-2.90.ebuild 2742 SHA256 deb6689ac878537cba8164cccbc8ca9edba62a21ab66b4275429a52605ce535c SHA512 03a9b05fcd3fbf73c92e1cd86b3afe9fa3be8c5682d89e972e23a968e17874b578ca71f2b0e7cdc1f1e0b154762d987eeb5d869d64eade5de28237164bbb7691 WHIRLPOOL 0d0d6f37444e288133681027fe5812d2d49bd6e90da24490f244863e269475e976619dbb00e1fb9f95d6987747780899bb0c73ffd4746044c714b695abdf5e76
-MISC ChangeLog 906 SHA256 e7fc7ea53a7a50c9dc2d7e25ea30285daeb43274f12f3c43e4e8edf56a53f992 SHA512 a18314db3191f2e4b9cbbfdc1e10a4fe1dbb373fe7085669210182e4962be596101f08123db99141c779c418382a8c4d5e9f944709df9c725b0f912129982273 WHIRLPOOL a29712fe0f332c00316c7d6fd9a120c91cdaf38d45c3103a42cb9a59b084d186b81e677e0c2b2dea3952452fb3dc8e40286715da311fa225d5c8b0d70bacebc7
+EBUILD cndrvcups-lb-2.70-r2.ebuild 2797 SHA256 28b5fef6ea57986b8558cb734e2c1aba1e1c7a53379f4b0c2d5c5dfe985bccb5 SHA512 65fb0c88c62fb7155543ea32e6cc0e380080021d0f6d67032364ec47486382b40f546fc5df9406ee516582d4b69c77e3cbec0b0cfcff30aac8a40d532463f22f WHIRLPOOL 3027f47bc937a063dc58acfb72966e891ab73486212da5b397c1fba2efc3d819feb9cda246ba7bff29e24f4a4821db5942ad6eafc1123efba62ba84c748361ee
+EBUILD cndrvcups-lb-2.90.ebuild 2810 SHA256 49c7182aefc340fb3c79383d450ef63d63fe46014ed5e293757e5cf548558a48 SHA512 9928a0270f8c20eb537b93518dae7cc2a10b21d6b70852fde702ffb742addf0e3701b239d3aa30e0e2b3e03835102a6a0590907d6acf88fd62f0c953744bfd24 WHIRLPOOL dbfa5a40c3dec1f9a54b04f0131bb84ad7274e583d08b3f945bb48378f5e1f65436542c2b6502c2b9e271bd6eedc16a0de271eeb629b22d612ebc7ac2a10a3cb
+MISC ChangeLog 1065 SHA256 4e9eac62e93d47aa517eb38b6f92ad4115d104bfbc29afb5e296d463ebe542ef SHA512 c11cc20f0e1160d0535dba2bfe6e9d7850cfaf3c593121b8c2320bc8285cdadf5f9dc421d467697f239265bea3de7fe12d32d696e82fd950c21129fce42e2083 WHIRLPOOL 969daa3248bc08fb1c1e5eec381b77fb7465146ef1a1482fadd2e41f03e0a7f35bf3fdeb364ec2b98f6deef13ec68c360049c6652920f561192022c8d3e007cf
 MISC metadata.xml 225 SHA256 b7e6e80900482385366b93aef14189e6565e20272c8b46f2154acd91d61b849b SHA512 5e7f3cbd2fd2c315291abc5f2901d239ccf2f589216df57fde05f734cef55324329691aab12a66ddec9e17f8fba405824d4f65423ce21020a56bea2403aad019 WHIRLPOOL b3c5b48a1636f90cb2721a7fe7fbc854c4d99422cc539c6da84368a3a5372e2dd9c6e582d45797f30544fdd475bbcf8673448b8a54007fbfb99088970e938a17
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQj4CkACgkQCaWpQKGI+9TKWwCdG/79lBCEL9jOKCE04+YZvaRA
-99oAn0GDA2XOld9LwIETzwk7UrtZTzN9
-=uBG+
+iEYEAREIAAYFAlQ+kAgACgkQCaWpQKGI+9Se/gCeLlZAu6UmRhPmACJP1hDR9wR4
+ePoAn3FQGWpOuNSL0saiV5tbY4lVs7SG
+=T70G
 -----END PGP SIGNATURE-----
diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-2.70-r2.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-2.70-r2.ebuild
index 73c1d882a79b..4f8aa61c16b1 100644
--- a/net-print/cndrvcups-lb/cndrvcups-lb-2.70-r2.ebuild
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-2.70-r2.ebuild
@@ -1,6 +1,6 @@
-# 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/net-print/cndrvcups-lb/cndrvcups-lb-2.70-r2.ebuild,v 1.1 2013/10/14 18:23:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cndrvcups-lb/cndrvcups-lb-2.70-r2.ebuild,v 1.2 2014/10/15 15:17:27 pacho Exp $
 
 EAPI=5
 inherit eutils autotools multilib versionator
@@ -25,12 +25,14 @@ RDEPEND="
 	net-print/cups
 	~net-print/cndrvcups-common-lb-${PV}
 	x11-libs/gtk+:2
-	amd64? (
-		app-emulation/emul-linux-x86-baselibs
-	)
-	x86? (
-		dev-libs/libxml2
-		virtual/jpeg:62
+	|| (
+		(
+			>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+			virtual/jpeg:62[abi_x86_32(-)]
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		)
 	)
 "
 DEPEND="${DEPEND}"
diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild
index 18c5067a1e9d..3f5dd9d37460 100644
--- a/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-2.90.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/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild,v 1.1 2014/09/25 09:28:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild,v 1.2 2014/10/15 15:17:27 pacho Exp $
 
 EAPI=5
 inherit eutils autotools multilib versionator
@@ -25,12 +25,14 @@ RDEPEND="
 	net-print/cups
 	~net-print/cndrvcups-common-lb-${PV}
 	x11-libs/gtk+:2
-	amd64? (
-		app-emulation/emul-linux-x86-baselibs
-	)
-	x86? (
-		dev-libs/libxml2
-		virtual/jpeg:62
+	|| (
+		(
+			>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+			virtual/jpeg:62[abi_x86_32(-)]
+		)
+		amd64? (
+			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		)
 	)
 "
 DEPEND="${DEPEND}"