Support multilib libraries alternatively to emul-linux-x86-xlibs.

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x9627F456F9DA7643!

3 files changed, 39 insertions, 12 deletions

diff --git a/sci-chemistry/cara-bin/ChangeLog b/sci-chemistry/cara-bin/ChangeLog
index e6cfd64e8c44..bb2c0c1e1825 100644
--- a/sci-chemistry/cara-bin/ChangeLog
+++ b/sci-chemistry/cara-bin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/cara-bin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cara-bin/ChangeLog,v 1.6 2012/09/10 16:20:51 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cara-bin/ChangeLog,v 1.7 2013/04/21 19:55:14 mgorny Exp $
+
+  21 Apr 2013; Michał Górny <mgorny@gentoo.org> cara-bin-1.8.4.ebuild:
+  Support multilib libraries alternatively to emul-linux-x86-xlibs.
 
   10 Sep 2012; Justin Lecher <jlec@gentoo.org> cara-bin-1.8.4.ebuild:
   Add QA_PREBUILT beause we are binary
@@ -21,4 +24,3 @@
   07 Mar 2010; Justin Lecher <jlec@gentoo.org>
   +cara-bin-1.8.4.ebuild, +metadata.xml:
   New addition for NMR assignment software, bug 209124
-
diff --git a/sci-chemistry/cara-bin/Manifest b/sci-chemistry/cara-bin/Manifest
index b585275f404f..4951baff7c01 100644
--- a/sci-chemistry/cara-bin/Manifest
+++ b/sci-chemistry/cara-bin/Manifest
@@ -3,14 +3,25 @@ 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.ebuild 1220 SHA256 ef5b68c8472cebe39985056943960b0f02ffa878b6334cd0620cd1e0666cf66a SHA512 c130d323e78e07acb5b1270e9aff4103eb5762d823ffbbc192243899d7ce878ef0a87a39f5133219cd3033a2e85a4b440db566d8e85234c5f50065b86c078acf WHIRLPOOL 7c07e17ab15f7f9f2423acc240e61090f1c8f8588b639ee35f871283620cd11c9b05f4867499c0b4026b5fe5ef0a42453a630cf13269608ff4830a61cde2488e
-MISC ChangeLog 820 SHA256 8f103b959cc45bcc29c66360e22d588d0139e273ddd62913fde98516c0b9eb01 SHA512 93754bd8198b7bc4bc40be80c5995bc2b95da602d34de42ba19f286b2b2424eec44e0b542ca997ee7e4746562d9b6dcc8d7bff6f682da5acf344a38cec0298a6 WHIRLPOOL 8e2106651115033da53a770279259e9b7ccef89da39c84564ff0b094fc857f641a3df2979c43c2ad5f134fc54dbafbeafee8ffc2fb710f5a17fe4dc6db75fa87
+EBUILD cara-bin-1.8.4.ebuild 1584 SHA256 af3aad92daf5b6f469c7e8e4fa83656414540a8db275ce35336e76500a09229f SHA512 71f485684b396667005ede72ea896767cf1c92912c1124d32b788bf3b337251f8e88783902002bdafc8246707cb3326992baac8964d92c9923b3a7dd41d261b9 WHIRLPOOL e7617b68baea0b3b284f4fe525887f394392734033bb40beb905effc87e69d7b3114d196e8a85a94245d8f01d79f7fcbf09919ebcd98ed5405adbee65e1a9b50
+MISC ChangeLog 963 SHA256 3d5df0737f8259a2b5d2b54a34b800c24af1b0f7d64f8913379fa7202a1798e7 SHA512 3ffa93e667f9947f150b059fe675d2ab6d47ceeca55c67ef302b5f7604fe19d6e5076725f24a5f40c1cf3d2a4f42c24bade0372c52faa23822b00ca12343ff4c WHIRLPOOL c79a2fb2e3b27114e12e9995441165d3638d8897b41659be013502b3ae44142030c224f227970fb665c2448b42d79b516875925a64b076ad357a37000b91e996
 MISC metadata.xml 201 SHA256 180014e727f4e39b95bfeadf7661f97f2a0c8fe30658a82cd676fac065c7b3c9 SHA512 c45946956d014075402c211931232b5a97bbd98b69acf7ce1ce999183890293f712166c6c8f65f3c79284a3184c18aab30506812a2ca819ae0cf77fde3c99602 WHIRLPOOL 540f634e659cae0c137b620aa023ac8909019a135ca9a6d8722fe46ffaed948dc124d483c4c6aa1bf4acc7ad52eb05d0cd5fbb1b3b6b39325fca48ff94b63d3b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAlBOE2gACgkQgAnW8HDreRYwKwCff0yE0/6CeImOoEHqtPxDEXU3
-w9YAnRI4LkwdUZEfVm6AUSFItZNrbS/F
-=y+J6
+iQJ8BAEBCABmBQJRdER3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDGuUP/AsYApUZ/5p2a0Mlq70lcwnT
+FEargRpEQd/2gIo5pWTDS45IadB1IR5FhYbqWdW7xzdex1oz9q8k7qHvgvDjA0nU
+/b264+crPnALFmsWn8cahO+SltiXct5MhG/4hqyB3f8w4DGdtqnA4yS8WW0o1PH0
+qmbEhV9pWxUY6eeV3x5/TZrIGP6b1PgUtMjTV3Sz/FvMdpmQerxKKMGnOGQw1HlF
+a13LHkaujoBTa9404BlWPNc4Ie2WPpKNO6ABr+IVQqSfhCNW1tGgUpxALzN/Fdhs
+jAQGJ6+6Lk2eKmXqlWahJU0h7thmZAyk8bKSsr6FPVCrikamTwFNRhqFMUJVSBMs
+WQ0QjaL/XvVuz4/sDi0DsaQWvR/9dUO6tteCdONqOi07vkrVqD/fPpcY22c7tx3p
+gCoci89Z2tGoZADAal2TMIrJTF3pJE9eVYnc7yMiMCVLZUqInQxX4K/cNjlZX2yj
+Sy4uqkxsxzx5Eoa2ub1Eva/gLOD3/AUOHtGaH8K1OXmEpcacxKfSokqUJ/IiWWCA
+iIDmGJBhY6P1Yr2UaMaHRpMGlBT9VRg3Ke8Bd2ciLdDO4RRtarlem6XqVW4qsbdB
+KeGPtkfblWQYUUerkfeQn7scVULsRLkS6JTyIbYXD5pbtWeS89nJVayNb1DxcPCi
+7FU9j8qUb6vVU4V+tekW
+=8hE0
 -----END PGP SIGNATURE-----
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 2b5724f068e9..bd4f7a38cdea 100644
--- a/sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild
+++ b/sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.5 2012/09/10 16:20:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cara-bin/cara-bin-1.8.4.ebuild,v 1.6 2013/04/21 19:55:14 mgorny Exp $
 
 EAPI=4
 
@@ -20,7 +20,21 @@ IUSE="lua"
 
 RDEPEND="
 	amd64? (
-		app-emulation/emul-linux-x86-xlibs
+		|| (
+			(
+				media-libs/fontconfig[abi_x86_32]
+				media-libs/freetype[abi_x86_32]
+				x11-libs/libICE[abi_x86_32]
+				x11-libs/libSM[abi_x86_32]
+				x11-libs/libX11[abi_x86_32]
+				x11-libs/libXcursor[abi_x86_32]
+				x11-libs/libXext[abi_x86_32]
+				x11-libs/libXi[abi_x86_32]
+				x11-libs/libXrandr[abi_x86_32]
+				x11-libs/libXrender[abi_x86_32]
+			)
+			app-emulation/emul-linux-x86-xlibs
+		)
 		app-emulation/emul-linux-x86-compat )
 	x86? (
 		media-libs/fontconfig