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

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

7 files changed, 73 insertions, 34 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
diff --git a/sci-chemistry/icm/ChangeLog b/sci-chemistry/icm/ChangeLog
index 73bf0e91a543..2e7f2cb9c7b8 100644
--- a/sci-chemistry/icm/ChangeLog
+++ b/sci-chemistry/icm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/icm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/icm/ChangeLog,v 1.11 2013/02/20 13:15:45 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/icm/ChangeLog,v 1.12 2013/04/21 19:58:57 mgorny Exp $
+
+  21 Apr 2013; Michał Górny <mgorny@gentoo.org> icm-3.7.2d.ebuild,
+  icm-3.7.2e.ebuild:
+  Support multilib libraries alternatively to emul-linux-x86-xlibs.
 
 *icm-3.7.2e (20 Feb 2013)
 
diff --git a/sci-chemistry/icm/Manifest b/sci-chemistry/icm/Manifest
index 368bf5ef3eae..a0601d221d7e 100644
--- a/sci-chemistry/icm/Manifest
+++ b/sci-chemistry/icm/Manifest
@@ -5,24 +5,26 @@ AUX 90icm 84 SHA256 b08d5769a93a74350173395cc206426b9c373f32d2211852c83bc0d1d955
 AUX icm.xpm 12519 SHA256 9e96dc32ca7c39c1749f75fd24dfa5634a99eb4c465a6bba8451c9c341d1c287 SHA512 20246cb92124e2cd7fa282cf294be71f3cedd6e921a9b48d4dc6f095404a6bbdee03b814fb938aafafd80ee05624c509787b1ca6f07ff01b23b67661f577d89f WHIRLPOOL e4586aaedd4d752d3d5fcf78a944f1d3120cab094fb6ab736840d04f86bd742889e1ad4489110389183d2db1506574c7381334b91585d518f9e58058efdbb301
 DIST icm-3.7-2d-linux.sh 345655605 SHA256 368718e231c2d79cfab20b60863d84d24a64f8c7027241766b4b44cbe721c85d SHA512 2a64070a152d598f21c633a2e11cf8b6aed5da75dde04b063acfa152ebe05acb0376c1fd3884103cb916a9a27b81e0d6b42d233e722fdfc8c3c70cf69d245f7e WHIRLPOOL 95732c7014613aee6cd0ebd363cc3ec916a70c2d6a2cf481519c393327ef6918a3ff92aa57feb4289c051f0dd4834ae12fb10a4dcf2c03e27f6f7afc05c1b70b
 DIST icm-3.7-2e-linux.sh 345626160 SHA256 89e2db76b6dbe0b5305e7e5dd67c43c3850924eb2383732881599991083af0cf SHA512 996955f70f24605d705e9ce44397b26306808c8f6742ac38d7b0926c0df11ad678d365c3b25926765a286c20be9ea5f27acba25fa6281f4222ac7859e3593b77 WHIRLPOOL 16d0205fbf2dc72db1d36a537ee43778b4b597ec103497cad146c935b7ed1c3bde1eaed76afa41554504b899f8f5c3ec72e958d4de3c5f29526a05a9f278ab85
-EBUILD icm-3.7.2d.ebuild 3482 SHA256 633cd72d2bf0b680291b1a932d8a7469ca028f44a244f75c964645239c2ec810 SHA512 33ec87a6be9fd8544e483041dbfe343782a9643ed57d1ada80b3ddf15943956671d89d0b14fb0d40538f7cbcd0434d6bf5606ee18ac7e9105b691f8fb3884021 WHIRLPOOL 2091a2949fea433d2ebe3810fab0687bdce86e05a5cc8abce9f116435fb46ed84fe200902403bcaeea0ee345f2454725099756b3aad7638737461d8f1f1d68af
-EBUILD icm-3.7.2e.ebuild 3482 SHA256 ae13f2f7839c70ab156472c9c6464ffb5c87df4405415134598e74192f996aea SHA512 85cee7557d24eac03c0a29561b7fbbf571316a503a3657e823e84197c62709e989e2e0045643ea0d466efd2e1c7b0755711e9beb61d36e97bf74f1e2255cb751 WHIRLPOOL 47a20d4ae6034d4e6957a55f10506cb55606e951dc486c1e79a48804b412559ef21d5674f3fe9dab314f14fdf0fae55a1b051aa2f0469675daf112fc17db8dc3
-MISC ChangeLog 1778 SHA256 5b1fb5279b193a639a31897b570092dd13f78c37757d126818dce7ca597d1041 SHA512 17cb1dcc3fb1299385ab64e18ca958935eb538e5386097c95659e39c0e1b6c3a145f6ac6cbcbdf2d4edf419d96b890a7951ee2c701150920e12d460863da0396 WHIRLPOOL 9e87ff1727f747e4806ea8f3a58d70e087ba2aaefb4349512b2e96cd04a52322b36d87374a0705bc3f20126c72cd4b148a30b2cd62ba35c80271f3fd6be6849f
+EBUILD icm-3.7.2d.ebuild 3534 SHA256 96a641b9f251e346a300789e2fd2bbe9536a604b2323622a422180f54d57999c SHA512 66ef1411a3cc73af3caaa39d4ca797a4ea1ded403877eddd86866f83669556fb3e0c50345928326f5f25f1007720546fdcc4c7a1faacd77cdfa8757669540ab2 WHIRLPOOL 7a772ac58fc71be75ca2252639121a606e261a729a783b5acb549f57afe4ea4221a32d6f191110f620e07ff80e9e2215d6998c2a6af9f99d56b65ca05dd6fe4a
+EBUILD icm-3.7.2e.ebuild 3534 SHA256 f1f5c3fa4e3eae73ea49a3fee5987424bba43a6a455c6b4dcb528330ffaa06c7 SHA512 68d2512cf6af2360d851ecd5a1079e0fa2c7be9d55a097f287fe2815727f9d90cbd0ab2a6b6e9db7c9de3b4b0d69028e3da05c37a2249a05d9ecf444f7c36cca WHIRLPOOL 0f664ea7856e20bdc8149a54598bcafd749d4c7d4481d5f7010318c03f5fe2c24eb049e5b8c05570f317f70b796d73f4b867b6d663164f77e269375ea0d9977b
+MISC ChangeLog 1937 SHA256 fd9e78ad51415af58c126d4a8a59d234da09847c2e379773bcfc1e4fad9bd873 SHA512 667f773075607ad6cdc8f28d83f7493f43b58b4948e7c2b561154ff48f83ca8014660b0047137d5c296f6c4b9c7b8b97318303782ff3d1cf75f10bb834322a3e WHIRLPOOL cc9e8c9721f806170afcb164623c57006f3bd436b1fc73d2a41c019f829adc2426470d09cf8eecd56a0808bf8c8d117934d655a3a0870e77dbecb073936659be
 MISC metadata.xml 425 SHA256 132af744d7ff0b383f7ae14d370de075d59d9eea0d4db32fbbb0e20213315749 SHA512 1503a11fe96b289d7c38b04e507af8085e6bdc6a55de45e007d748506184c6cfbed824c12a6368e73b88528d59b36f6d9790a73b45ef6b88be13896c04c7a529 WHIRLPOOL 8b44469af516a05228bf0288a6f57447227e72b590b1edd099820e2bd503e7fc733a4a39a0c203176ad23544330f7615b65b3b233a29363a5f00d118e3730527
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRJMyQAAoJEOf+E+/4L5Lm92UQAJMf/B8Jya5CB3u3KU+Mbl2o
-u1YmJY0Urey2GU+iI8b/AlQpfE0qCrhJ3gJ6ucX2sChD/AJA4bojMHwJ/TUTbaKI
-MwzFiqbuTGBm3KUj7CTLFcRGkS6sHmoXU++JiQu0bAP2P+tmBC16tlPqBTrugnHo
-HRnt4oDCDTUavYBdycjGnW8E41Uz0jz2VN5n8lqgPTGIS89kxnFvRazOufO6ekZo
-GFrCKxrOUJt4k9XfqM+R1hBxYS8rGXuamblm+kmt4mC10FHxXN9c+QjBCvXOJj/W
-4sxYiDru76wfxzu7e53+DZ3THvgTMDWUplRd6MeIclWMRVM9KBYb+F5kJ/nbbAJL
-EMXNnmq9WSoqQYYYA2PaZLYlgRY4veNK45fYyUTPkkKuXHhDePXMbbcfjTaoWt/A
-YnzAh/znqZCk11FfPmp+SDFCH+D8rWH2D0Y9ZBLNfswt0lNuLFpuaJpH7dqq+7y+
-TS8KgkqlJZguaGZ4W5KS2y2e7UopSiWVVOXBb7ClQy1diMfvWwEiXdnJDH6p0AuX
-Y3fH2zBW7RdeYe8DpBGFk9uWZusFUbzDy/AMjHPGCb8Lq61irCtc6CSdoE71pcjC
-3QZupXot6arbh/6CX7yYVNlG+/4l1oqkNP2yxDhmcJAZhkmHwCn9Vhzn87CKQQOO
-LUsKIdOyzdAMEN/xWr6p
-=2epr
+iQJ8BAEBCABmBQJRdEVWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDC+0QAJzm+42qCpsYFCPSzsl1r6+0
+Angb3efOL/r11JoNfZVtULVFOJocfTplsQuvMqm2pEfHWiSBLScyMy8jqIRmzarU
+3cBaXWv18MeG2wh7vj2lX/NDUUEuDrKoabEl9p2xqtcfdM8TX8NOIGFfRYXeEVoI
+pNHXLJYgbY0CyyHadKfzWUqcMa0YcD6AVrc/YqKJALFVmh34t61ES9Xm7Y8YlSP3
+SLWMW1LhdH74Bl73Y9latLv4ZLaguWYCXSQ0WpqoKtaNIKsi73EZiglwgrwIdUHL
+jLO2/0lVvOJ8WteZkHFT6HlPsZX9LWGSvcKAS4FSJoJIaZGxKoxyJFKrzqWWOSzZ
+/+U7yqfXIZWz1vk2aVgr3jbPrN4YWlervDqt+t1G/I2mNXhodU/7aBQfarsUH/UJ
+QjIx+82VAZA46TgoOGTBqG/nrq3hExFiwDP0BLPPIA4Kmo8bJePdKIqytGcxCQht
+3lT3X5wIRHm0V8cX7IZ9QX1k/+UvlS7UPIIUzJqmdQEGBDtaE4xYfy7HbA3zITG+
+l5ZICgEjjz/FaTnwIEI/+xMgAmjXFQQeitnTT/5vJqIyGYV5rOVPUx/kHt+YNd+3
+85haqcq4jYNmQC5dyo978NsEcfDlsdJcnncwH3H6HQnV/ttIBFvaGMWQ8oPyKNUb
+AXEbmD/t3Fmt/VzCLJ/N
+=m6W3
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/icm/icm-3.7.2d.ebuild b/sci-chemistry/icm/icm-3.7.2d.ebuild
index d0bc7d37d08e..088e8b28fc22 100644
--- a/sci-chemistry/icm/icm-3.7.2d.ebuild
+++ b/sci-chemistry/icm/icm-3.7.2d.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/icm/icm-3.7.2d.ebuild,v 1.1 2012/10/19 09:09:23 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/icm/icm-3.7.2d.ebuild,v 1.2 2013/04/21 19:58:57 mgorny Exp $
 
 EAPI="4"
 
@@ -43,7 +43,10 @@ DEPEND="!sci-chemistry/icm-browser
 			)
 			32bit? (
 					app-emulation/emul-linux-x86-compat
-					app-emulation/emul-linux-x86-xlibs
+					|| (
+						x11-libs/libX11[abi_x86_32]
+						app-emulation/emul-linux-x86-xlibs
+					)
 			)
 		)
 		x86? (
diff --git a/sci-chemistry/icm/icm-3.7.2e.ebuild b/sci-chemistry/icm/icm-3.7.2e.ebuild
index f6f781457fb7..484079735d52 100644
--- a/sci-chemistry/icm/icm-3.7.2e.ebuild
+++ b/sci-chemistry/icm/icm-3.7.2e.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/icm/icm-3.7.2e.ebuild,v 1.1 2013/02/20 13:15:45 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/icm/icm-3.7.2e.ebuild,v 1.2 2013/04/21 19:58:57 mgorny Exp $
 
 EAPI="5"
 
@@ -43,7 +43,10 @@ DEPEND="!sci-chemistry/icm-browser
 			)
 			32bit? (
 					app-emulation/emul-linux-x86-compat
-					app-emulation/emul-linux-x86-xlibs
+					|| (
+						x11-libs/libX11[abi_x86_32]
+						app-emulation/emul-linux-x86-xlibs
+					)
 			)
 		)
 		x86? (