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

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

10 files changed, 160 insertions, 41 deletions

diff --git a/sci-geosciences/googleearth/ChangeLog b/sci-geosciences/googleearth/ChangeLog
index 05a049d86fab..93f7c2680555 100644
--- a/sci-geosciences/googleearth/ChangeLog
+++ b/sci-geosciences/googleearth/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-geosciences/googleearth
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.48 2013/03/02 23:20:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/ChangeLog,v 1.49 2013/04/21 19:21:12 mgorny Exp $
+
+  21 Apr 2013; Michał Górny <mgorny@gentoo.org>
+  googleearth-5.1.3535.3218-r1.ebuild, googleearth-5.2.1.1588.ebuild,
+  googleearth-6.0.2.2074.ebuild, googleearth-6.0.3.2197.ebuild,
+  googleearth-6.2.2.6613.ebuild, googleearth-7.0.2.8415-r2.ebuild,
+  googleearth-7.0.2.8415.ebuild, googleearth-7.0.3.8542.ebuild:
+  Support multilib libraries alternatively to emul-linux-x86-xlibs.
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org>
   googleearth-5.1.3535.3218-r1.ebuild, googleearth-5.2.1.1588.ebuild,
diff --git a/sci-geosciences/googleearth/Manifest b/sci-geosciences/googleearth/Manifest
index 5ecef382aa1b..e857cf1763d4 100644
--- a/sci-geosciences/googleearth/Manifest
+++ b/sci-geosciences/googleearth/Manifest
@@ -17,32 +17,32 @@ DIST GoogleEarthLinux-7.0.3.8542_amd64.deb 30671794 SHA256 b3d8e11d3fd8db6e70e4c
 DIST GoogleEarthLinux-7.0.3.8542_i386.deb 30675086 SHA256 706bf8a74b87dbafc2529e508fd8bb11276b2f8d6bc7524ef2b888761c46bf67 SHA512 476cda1ced6522a6a0d417300354fae815c140eb72f83fd3ab0ee2d5b1b28a3f1ed11491e1ac4d6a9791c97be88ee4521fd550a613ede52831b2a4f7092fee02 WHIRLPOOL a0ca3985bbd71c8adf8c7335eb4d5b2baaf65f73e64c0705e50c049afaf7acfcf137dd4c24779f7d628feffcc424c3caa2445def76d5b7e113217743eef2d5bc
 DIST GoogleEarthLnux-6.2.2.6613_i386.deb 25620810 SHA256 e309ce1493dec6abc742037b1e6822b08771827db59ee7e5d5da56cb40c92111
 DIST googleearth-libexpat-2.1.0-novisibility.tar.xz 54812 SHA256 f300a3f76ef8350a9e681005c4d6ec5ba086e7f12acc7b83b68445e770dec6c9 SHA512 21f0510f391e242a2a87191ecb53f45bf837801b8e8e937dd50b6ff454b52d0dd4d31f32461add7604226d786a188a3a2a8dd86c86f9678c8d317b0d432f91e3 WHIRLPOOL 55440c3924735cf03b8c283c7f4787b735fa5dad62dfa753332b5c149ebe9a4734a24924a6a12b12a43c7292d544d0e971fd92d84ebe751fa439afffc54f1dae
-EBUILD googleearth-5.1.3535.3218-r1.ebuild 4332 SHA256 920eaa7c3a88a0f06ecbcf6c95d35a70a569f7cb0873226393c8a5cf1c4bb10f SHA512 f89aca4b0ca07a1147a21250d5d7701b88f523f26d7ff08d8b036faf24eb492e4862e2809b5cf7a41b75b4ce185c7dc2829a8e110b3da62c567f49b009ab4278 WHIRLPOOL 29706be3540a15d9f329a94b3831814afb689acea99fd8ef4c858c7ad5c85f926bab3d77c94b9b36358e7ca0333da48749962efe05d9225babb968664cd8d3ec
-EBUILD googleearth-5.2.1.1588.ebuild 5039 SHA256 034a24a86486ee2cd4ec01af59e160b5199a0e40ef40aef1b178dce92d4365f6 SHA512 6e9d45cdd3ca4d326def0862c5e65ec96b1a72b65b38fb6a65a5f0abe3e8105ee6ea26b067a3ffc40243874bceb53991278055c7c157271eec3c7f1fdf35caa9 WHIRLPOOL 88206e09e423da271a9046c002dd02573fa361d8cca68fc085fdd526f10bc89e5971415510be464dc52b123d36d31fa182c45702b720a92363ab71869a801148
-EBUILD googleearth-6.0.2.2074.ebuild 5587 SHA256 792852085b864b1e4ba7225aa3bfd96428fb305ddf86b6ef5a83ab1505b86077 SHA512 6834724e0848a0ba8fdda0ff0c4fd047040fdfe5f4be00aa17aa7ece5d3bd54c96096be9e0023c21a8b755899e9372dc3e57b10239c7fe6aed2f509cd32597be WHIRLPOOL cd0046309761c9720d60cdd95b6b42c7810124f6ccbc009151e6b5ce07cf110a3e65bc23c29a2f384fc3c662917db022f7f59ff0de09e5d296f4b5062c2b47c6
-EBUILD googleearth-6.0.3.2197.ebuild 5307 SHA256 b16f50568594db30b3e3582a30a45ad97579c82e4e66b63f1a9af36dadf831af SHA512 c08549da087b23fe7ebd1b1e8ee2ea808c7ad111f68fe8da8c67bb42b2959b8475cd128468cfe50e51614d40e2983b17afddea93db26a488257f2900c2e6c8fa WHIRLPOOL 72b085e80602e46597ed65c5bf80da191fdf9ff9c927c6ef09cb73f2c4b4e899d4fae6a7546e4eff66828d468f1f87ec23bff897f1fef49696b8d693972503dd
-EBUILD googleearth-6.2.2.6613.ebuild 5720 SHA256 d26d6060835596c8ddcba250f707676126c66f4b979650cfe8d8181c565515d1 SHA512 d664cb9bf9ac31ec2e6ec165f0d1a466dcefbc14b12626200e34411a2c3a4dc2dd476b7eb55bde9de1dec878a2fc5214706f2d5c113bf041a4e0e15776c57221 WHIRLPOOL 96459e1d5505bf778f8b2892eb1367a65c67778453e6197265cd412bf91bbb9d20bcdec0c6dd3d707f3c77d90beffadc47770b498e51e045bb9ef55b3198c4a1
-EBUILD googleearth-7.0.2.8415-r2.ebuild 5925 SHA256 a8edbcf8645872a2205b7560b9ba353dd5c3943a251f5c6c85cd8a9a92e84db7 SHA512 2b16c58f680f52dbc0d0e09b0976d7f9608487767ccac9d5fc325904403f072f1f0f2a6df36b56fe139f55019e00122420e8d4f9667627959e1120b777b83352 WHIRLPOOL a60a591916c46a281e227e055989f010541f3e83d74b19389e1fd14138e0424a959dec48cb55e56d364921408f4da09af447da6230bae0dc1a2a2b26d1249eb3
-EBUILD googleearth-7.0.2.8415.ebuild 5944 SHA256 7f2186252ec4cf395b5be98b35c87a381753c229504de3d20fd1bb33ebf38b3d SHA512 8165243404767f494ae80965a16778397fe1e1ce2632d9ff8a3a8a216eec2bbc23a621a1ad4dad152113a11c36cd7181b6eaa0f6ac1a1a223dd536ffea568642 WHIRLPOOL 1f32975c514a98e1aef5d9b74bce532d6eae35803a0350e33edb43d3ca480fdffb432ce879eb421cff5c1477079b6bb5c69437d5f5507ff212c41131fde434a3
-EBUILD googleearth-7.0.3.8542.ebuild 5922 SHA256 1f953d5407daa7f60ecd58b36c188b939f37ff1c9fd2f29e618fd817edf66ae0 SHA512 9a86b2caafca490d236227747f5d0d77b862dab81fc2e9273c6f523a9e23f38d0b29e9fcc9c903b83e6a9514948c4be5f82e493012b0d7080aef139ecfcaa59f WHIRLPOOL ed2ba0eec573aa9a9c71af270ffceb103ac31c79035e1ad7b82b7a7b8a21bbfe2395ed714ff6be81c5090248930390906204a7137526f6a015061a68d9403920
-MISC ChangeLog 20794 SHA256 d925d95033e9c718740d65276e97b7e1d70fe52f004df4af1ab6cd2873bf445f SHA512 0248de11d3f64cfb61a40f450fd579eab77e76e8b4e34214aacc931d30088f89dc3e18cac0290e7cc0875660d84db9427846463882ac86479ac1b29ca1206bf4 WHIRLPOOL 2ddd026d40bbda3299af286bfc7a4de60917a3b7e1c03fc01e7e05e760c8cf6c60351aa8b036f9857ae857208a79d65311a2dbb714d038f18c3c7ab1f5777854
+EBUILD googleearth-5.1.3535.3218-r1.ebuild 4687 SHA256 bf86008372aea9966e38a9e59659150fb9f5592fe0f7b2179797969af85d0876 SHA512 546edc89eeefc4bff4fef8548c2fa9931c6b369747760a6b25c6e206e39c4ffcb2aaf6d8f338f73daa3d5951a228e3af9509184ff1e427a7d0f1c71736dad96f WHIRLPOOL 217cc549518c530fa25bc82efa0908cd7e3beee6bb3a7e03979e7f6764645d2203ed6918b74153be451c7108f028ec0200102d5d667cef40b31af4f1b853dad5
+EBUILD googleearth-5.2.1.1588.ebuild 5394 SHA256 2d4f1fe84c24e8b28cf83c2ffd0b5a86dd6cbb31383f2f11bb3ccaf5efe9be79 SHA512 fc6415bed3cbf594c5a5e4de042444998590302517a6f225199fc22db2f7fc52bed80cecbd3577c24d4666418406aec3922699f703364e5d6139fc201b504f22 WHIRLPOOL 5a8ed968a99c9d855f8ae7ddfe575cbb89efab71018da7ab253be97074dc0e9c8cda36fc02e7aebd0a383c11258deb5563913d579cffa44b030392572375c995
+EBUILD googleearth-6.0.2.2074.ebuild 5943 SHA256 34b6784b2086e949b20eef0d4a72230322b280af6ac7600686ce595bd7865ed7 SHA512 d46ee6b842d6ebf5daffde6ddccb91c1a361e55d23efb6f59a4ac758ca5cb51189ee5f24396165c1e2b438fcce768987c3f5578bed85ec6b96416e97168bba5e WHIRLPOOL 60da57fdbf0c0c9ffe5fc73ccc7abbe838c8b6c5d4a0abf8f2599fe41d77f63e2684934976390861bb92dfbb4381914ff27c340d67e2deb8e36ed9d0c5a989b6
+EBUILD googleearth-6.0.3.2197.ebuild 5662 SHA256 2e19519f45bfd216a0bcc42085abbb32e898ed1f49f68d57d7ff41429329cc4a SHA512 b0b579c1aab72e3e08d5a9ffe19ba9fed1017211585dc7cccc16604b19a63e3d4601066fefff3c1c43c1991acd3dbcdcd8e6fa746d941ba13a7421dde6ab9159 WHIRLPOOL 4a39ce20eef29407a51821b8a243dde7b079bd969f1e8d2ee68059c61d3666f3086f9096d2aff4adefa0963ce7a071fb7d059f9f025fb9cb3334565b4671ae5c
+EBUILD googleearth-6.2.2.6613.ebuild 6075 SHA256 fad712b016e1d2009d466ba5991d4bf45f7ea48892b2f4e881cd6a8c0a15dfa1 SHA512 a177e015ccb9a2d5c594ab545a064cb6c786d7085dfe161e207dddee388670fca24cef800891c6e518ad6c8d85a528af91a4cfbed54ecaa185f7049834c9925a WHIRLPOOL be1e5763e88b76511c8c774ebd17de323e9de74c2363f08b7248892435f3633566a85f3a05fb4fff6d28262a808d64e86ce33a63dd9e14ceadd5c7462830e3d3
+EBUILD googleearth-7.0.2.8415-r2.ebuild 6280 SHA256 e97bd5f198b92a5e465eaa9cd6d2cb2356978cee5f17a989aff7fa4512e1f1fb SHA512 5b549ae6eef01c72e72a97d027691e10f66bfffae83d0000af4ae95591640a0e1a2ef580534ba493fb993a165cda4440da6c16fb2be8694ea48ec83384a7ec04 WHIRLPOOL 4a56a01aeac99f45fcd7210acab2a3b4deb8a69e2c557c52cff2c58a633510caae9d93656749125a70ff3d8a5be49e741f27e96ec916aadc407a07e80f2d75c7
+EBUILD googleearth-7.0.2.8415.ebuild 6299 SHA256 5dc23c1849f05d2d11dc71042075c01912cfa8b8e17503ecaae59b39d879b264 SHA512 59d301747bbb8847a664b124f94223632289f7fb40aaf52b4fc8dc4b530d3517adb103f4faab9249c65d4e950a8643f158217cf05d67561d7a60a8bacf5d744b WHIRLPOOL d2e2e7099904bb15e81ab55e8aaf128de159a889a21804afa1b80d790ccf64c745fbbc830d837dda80333fc77ae6b349cf927113adc1b549a33da5daa01ae8f4
+EBUILD googleearth-7.0.3.8542.ebuild 6277 SHA256 97f6de2a3ae46a509b8696a9225c95aea3bea71043c4f710393f51c2961e624d SHA512 6d582e6e5cedc31a827df6a6df92ed1e980c9d7f18548a8d7d6b7ed4df171f2ac1290d62cba40933b37af3b6aac8baa0a94c81d9f3e5be0f9d6a4b442ee9b927 WHIRLPOOL 7f2394c0592009dcabe1e461cf84d47b5093c89b4fa4b587f42410c9fdc5ef89e858c7ea47ecb0f3bc72fa0fe5dfa3efa668a9eb3bfa9181c2cceb0c2897c639
+MISC ChangeLog 21176 SHA256 d7731251e149a414adc599e9e643436cf6b515abaa332878ac99ba42e381e4b8 SHA512 8baadfbfff32abd88e6d640c1575fee534d8e1349e87a0af52a6498273d1e2fc18ecc06ccc0153ba88350f541b97845e74ccf31926fbc90a7aa10e458b5301d8 WHIRLPOOL 78ddee0465279f38f3f1f0f110cdf236031d09dbdc0738ccabc7a892a433e04d00f093cb18d7198083050078826fb88b04a7673af265e90938a2b84cf009bf8f
 MISC metadata.xml 689 SHA256 b3e9cd73f0f098add65660ab5cc1478c008150b83f473644cb1f0ecad75b5e3f SHA512 3be912460c770ff080d778024ea9ff3854498bf60a04eb8df3689f3b92678d7346f544e960134f2a8aea4ac2059f114734110563b7545f93f7c63ff5aff368d7 WHIRLPOOL bf0533862116669580d150da6199428beb7099c6566b58c172329e380876fbbb470440a5aba9961b9acce1d0cace01f7bc8e524dc45af2c75d622c49191ac5b2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMolGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun883vIP/2vaPw9NdXDvZMoNEok/fZeu
-z+Wrwi/i0/sowmYrP8WQCALwBXFsgEo2T87mez037laEDS0q1JEiIa/jVOSi95Zl
-acyI/CCSHYEatzDNmDFVZCTUEu6hSFx6hD3moa/xzmCK6LusvtEplgivI19BrCmd
-+gtuzVfgtdnG37XSQ36PPj9WCti7p7X9t3ndBqmUTdbNGgxAT8xl4TpQ0uZtN9SC
-2livbOVHub8EquiIfv5kFzj/YW1mRSAdpiEVNYNBz+vBUmKrkWIYRC13QjfCKqiU
-rXMgDF6eyo4ndezJtn7M6G12mToj0QFp0gY21AYdLE3h2NquT0M4At8xF9sj7yso
-6MAZmWbUHt0BTac6mg7NYFHdwnxhPyTztGmHLFKjuwCy8rrZiish9PkN7pgoDguT
-yfM5E7YXwFpDxXaP6i98gul7fZhAdGjaerpBnhaN4ZhZ1wEUCU1YvIqIQl4o2Csh
-KbT9STr5tM1ZrelvIcG3OmBQ4VyldB0gZpp7Qwq/hZGx934iorQhlmWDgqXUKQnX
-78QOHQ/Qeox576+i6sg12pJkvjHpo7fEUk9akhh/5M3EB26AsEvsaLkmgraoNrEb
-mDyWwXnBrrKVq++rOH176j5W4bTJPW8EBRV5wku/I89NuRr8/LgC3T2i2OsBfdz+
-TXaMFV2JfxQ05FvSi+Lq
-=kQLL
+iQJ8BAEBCABmBQJRdDyAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDvycP/iVAwuGVVAo0e59zsYpXo0Sz
+HHhhNNdroUooo9KWZt0r4Q00y3s7OXhEFfmakiLF3RRhoNHi1Tc4ImxA+ljeEQ0F
+YevkW2UVoroIew9yCpeZUH7wR/OEsdR57AiddxJ1J7ym8/dN/YGoqLEq87QKhBkY
+d5q16LG8hDYOp5gdUl6Jmt29quOfjR4KBIaw0PjOf+hhzTmtWjMbOjf28Zps4Nk4
+QX6KNNEYavgls6/LeoQdhmcBypRHicvWWUN4kwCwmUDXtZDkbWaGR01WOye22nSA
+5vpR99gmd0ck32FqO8w2d2/SFGcyC5fyMA//qE7TLg6MNJhHWOOTLrht8ockUCiJ
+XC+R6xu1h975KUDYwMySIMFQkUvi1wrCoDl0fNpUsSxvo2ESSd03D/J+045+oN/o
+QTFW1kymy6lT+SfscZP9uB4aEdOufgjZ3U4T4x26GKaCTNTBbuMJkExcXnHJjTh+
+GHykEdRiXEsyOFOgEhoA0PYZLir4EImzq8u/otipbBNCfRZ1VOm6szbMkzHC87cD
+1MILQtekOts9EBHoIUzHGVpYeVR7aEU089aknQ3ojIzHYLVmKj+M5oLZq4/oGw4y
+cVppTBBFYJXdo8xqoFV4EgTYF7cqv2G1PMm+HwoQs6K4T4ryDYEHNWbFJSSumbYl
+swOfYM6HSzSwTeorXRbF
+=huBi
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild b/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild
index 7a0b55f668fd..ff3c03114fec 100644
--- a/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild
+++ b/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.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-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild,v 1.10 2013/03/02 23:20:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-5.1.3535.3218-r1.ebuild,v 1.11 2013/04/21 19:21:12 mgorny Exp $
 
 EAPI=2
 
@@ -45,7 +45,21 @@ RDEPEND="|| ( >=sys-devel/gcc-${GCC_NEEDED}[cxx] >=sys-devel/gcc-${GCC_NEEDED}[-
 		!mdns-bundled? ( sys-auth/nss-mdns )
 	)
 	amd64? (
-		>=app-emulation/emul-linux-x86-xlibs-20081109
+		|| (
+			(
+				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/libXi[abi_x86_32]
+				x11-libs/libXext[abi_x86_32]
+				x11-libs/libXrender[abi_x86_32]
+				x11-libs/libXau[abi_x86_32]
+				x11-libs/libXdmcp[abi_x86_32]
+			)
+			>=app-emulation/emul-linux-x86-xlibs-20081109
+		)
 		>=app-emulation/emul-linux-x86-baselibs-20081109
 		app-emulation/emul-linux-x86-opengl
 		!qt-bundled? (
diff --git a/sci-geosciences/googleearth/googleearth-5.2.1.1588.ebuild b/sci-geosciences/googleearth/googleearth-5.2.1.1588.ebuild
index ef70b0f534fd..0940a1cd3301 100644
--- a/sci-geosciences/googleearth/googleearth-5.2.1.1588.ebuild
+++ b/sci-geosciences/googleearth/googleearth-5.2.1.1588.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-geosciences/googleearth/googleearth-5.2.1.1588.ebuild,v 1.7 2013/03/02 23:20:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-5.2.1.1588.ebuild,v 1.8 2013/04/21 19:21:12 mgorny Exp $
 
 EAPI=2
 
@@ -46,7 +46,21 @@ RDEPEND="|| ( >=sys-devel/gcc-${GCC_NEEDED}[cxx] >=sys-devel/gcc-${GCC_NEEDED}[-
 		!mdns-bundled? ( sys-auth/nss-mdns )
 	)
 	amd64? (
-		>=app-emulation/emul-linux-x86-xlibs-20081109
+		|| (
+			(
+				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/libXi[abi_x86_32]
+				x11-libs/libXext[abi_x86_32]
+				x11-libs/libXrender[abi_x86_32]
+				x11-libs/libXau[abi_x86_32]
+				x11-libs/libXdmcp[abi_x86_32]
+			)
+			>=app-emulation/emul-linux-x86-xlibs-20081109
+		)
 		>=app-emulation/emul-linux-x86-baselibs-20081109
 		app-emulation/emul-linux-x86-opengl
 		!qt-bundled? (
diff --git a/sci-geosciences/googleearth/googleearth-6.0.2.2074.ebuild b/sci-geosciences/googleearth/googleearth-6.0.2.2074.ebuild
index 4fc987131c9a..d513b76cfb01 100644
--- a/sci-geosciences/googleearth/googleearth-6.0.2.2074.ebuild
+++ b/sci-geosciences/googleearth/googleearth-6.0.2.2074.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-geosciences/googleearth/googleearth-6.0.2.2074.ebuild,v 1.9 2013/03/02 23:20:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-6.0.2.2074.ebuild,v 1.10 2013/04/21 19:21:12 mgorny Exp $
 
 EAPI=2
 
@@ -45,7 +45,21 @@ RDEPEND="|| ( >=sys-devel/gcc-${GCC_NEEDED}[cxx] >=sys-devel/gcc-${GCC_NEEDED}[-
 		!mdns-bundled? ( sys-auth/nss-mdns )
 	)
 	amd64? (
-		>=app-emulation/emul-linux-x86-xlibs-20081109
+		|| (
+			(
+				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/libXi[abi_x86_32]
+				x11-libs/libXext[abi_x86_32]
+				x11-libs/libXrender[abi_x86_32]
+				x11-libs/libXau[abi_x86_32]
+				x11-libs/libXdmcp[abi_x86_32]
+			)
+			>=app-emulation/emul-linux-x86-xlibs-20081109
+		)
 		>=app-emulation/emul-linux-x86-baselibs-20081109
 		app-emulation/emul-linux-x86-opengl
 		!qt-bundled? (
diff --git a/sci-geosciences/googleearth/googleearth-6.0.3.2197.ebuild b/sci-geosciences/googleearth/googleearth-6.0.3.2197.ebuild
index 9cad451a9e73..a3f7c7a82dce 100644
--- a/sci-geosciences/googleearth/googleearth-6.0.3.2197.ebuild
+++ b/sci-geosciences/googleearth/googleearth-6.0.3.2197.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-geosciences/googleearth/googleearth-6.0.3.2197.ebuild,v 1.6 2013/03/02 23:20:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-6.0.3.2197.ebuild,v 1.7 2013/04/21 19:21:12 mgorny Exp $
 
 EAPI=2
 
@@ -46,7 +46,21 @@ RDEPEND="|| ( >=sys-devel/gcc-${GCC_NEEDED}[cxx] >=sys-devel/gcc-${GCC_NEEDED}[-
 		!mdns-bundled? ( sys-auth/nss-mdns )
 	)
 	amd64? (
-		>=app-emulation/emul-linux-x86-xlibs-20081109
+		|| (
+			(
+				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/libXi[abi_x86_32]
+				x11-libs/libXext[abi_x86_32]
+				x11-libs/libXrender[abi_x86_32]
+				x11-libs/libXau[abi_x86_32]
+				x11-libs/libXdmcp[abi_x86_32]
+			)
+			>=app-emulation/emul-linux-x86-xlibs-20081109
+		)
 		>=app-emulation/emul-linux-x86-baselibs-20081109
 		app-emulation/emul-linux-x86-opengl
 		!qt-bundled? (
diff --git a/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild b/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild
index 53fe21e4099e..4049add7e40f 100644
--- a/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild
+++ b/sci-geosciences/googleearth/googleearth-6.2.2.6613.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-geosciences/googleearth/googleearth-6.2.2.6613.ebuild,v 1.6 2013/03/02 23:20:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-6.2.2.6613.ebuild,v 1.7 2013/04/21 19:21:12 mgorny Exp $
 
 EAPI="4"
 
@@ -48,7 +48,21 @@ RDEPEND="|| ( >=sys-devel/gcc-${GCC_NEEDED}[cxx] >=sys-devel/gcc-${GCC_NEEDED}[-
 		!mdns-bundled? ( sys-auth/nss-mdns )
 	)
 	amd64? (
-		>=app-emulation/emul-linux-x86-xlibs-20081109
+		|| (
+			(
+				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/libXi[abi_x86_32]
+				x11-libs/libXext[abi_x86_32]
+				x11-libs/libXrender[abi_x86_32]
+				x11-libs/libXau[abi_x86_32]
+				x11-libs/libXdmcp[abi_x86_32]
+			)
+			>=app-emulation/emul-linux-x86-xlibs-20081109
+		)
 		>=app-emulation/emul-linux-x86-baselibs-20081109
 		app-emulation/emul-linux-x86-opengl
 		!qt-bundled? (
diff --git a/sci-geosciences/googleearth/googleearth-7.0.2.8415-r2.ebuild b/sci-geosciences/googleearth/googleearth-7.0.2.8415-r2.ebuild
index 03cf9168a9fa..792f552a772b 100644
--- a/sci-geosciences/googleearth/googleearth-7.0.2.8415-r2.ebuild
+++ b/sci-geosciences/googleearth/googleearth-7.0.2.8415-r2.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-geosciences/googleearth/googleearth-7.0.2.8415-r2.ebuild,v 1.2 2013/03/02 23:20:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-7.0.2.8415-r2.ebuild,v 1.3 2013/04/21 19:21:12 mgorny Exp $
 
 EAPI=5
 
@@ -49,7 +49,21 @@ RDEPEND="|| ( >=sys-devel/gcc-${GCC_NEEDED}[cxx] >=sys-devel/gcc-${GCC_NEEDED}[-
 		system-mdns? ( sys-auth/nss-mdns )
 	)
 	amd64? (
-		>=app-emulation/emul-linux-x86-xlibs-20081109
+		|| (
+			(
+				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/libXi[abi_x86_32]
+				x11-libs/libXext[abi_x86_32]
+				x11-libs/libXrender[abi_x86_32]
+				x11-libs/libXau[abi_x86_32]
+				x11-libs/libXdmcp[abi_x86_32]
+			)
+			>=app-emulation/emul-linux-x86-xlibs-20081109
+		)
 		>=app-emulation/emul-linux-x86-baselibs-20081109
 		app-emulation/emul-linux-x86-opengl
 		system-qt? (
diff --git a/sci-geosciences/googleearth/googleearth-7.0.2.8415.ebuild b/sci-geosciences/googleearth/googleearth-7.0.2.8415.ebuild
index fc795129a174..54ebd8261f7c 100644
--- a/sci-geosciences/googleearth/googleearth-7.0.2.8415.ebuild
+++ b/sci-geosciences/googleearth/googleearth-7.0.2.8415.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-geosciences/googleearth/googleearth-7.0.2.8415.ebuild,v 1.4 2013/03/02 23:20:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-7.0.2.8415.ebuild,v 1.5 2013/04/21 19:21:12 mgorny Exp $
 
 EAPI=5
 
@@ -48,7 +48,21 @@ RDEPEND="|| ( >=sys-devel/gcc-${GCC_NEEDED}[cxx] >=sys-devel/gcc-${GCC_NEEDED}[-
 		!mdns-bundled? ( sys-auth/nss-mdns )
 	)
 	amd64? (
-		>=app-emulation/emul-linux-x86-xlibs-20081109
+		|| (
+			(
+				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/libXi[abi_x86_32]
+				x11-libs/libXext[abi_x86_32]
+				x11-libs/libXrender[abi_x86_32]
+				x11-libs/libXau[abi_x86_32]
+				x11-libs/libXdmcp[abi_x86_32]
+			)
+			>=app-emulation/emul-linux-x86-xlibs-20081109
+		)
 		>=app-emulation/emul-linux-x86-baselibs-20081109
 		app-emulation/emul-linux-x86-opengl
 		!qt-bundled? (
diff --git a/sci-geosciences/googleearth/googleearth-7.0.3.8542.ebuild b/sci-geosciences/googleearth/googleearth-7.0.3.8542.ebuild
index 8b86dcfb8538..7ef429385c9f 100644
--- a/sci-geosciences/googleearth/googleearth-7.0.3.8542.ebuild
+++ b/sci-geosciences/googleearth/googleearth-7.0.3.8542.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-geosciences/googleearth/googleearth-7.0.3.8542.ebuild,v 1.2 2013/03/02 23:20:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/googleearth/googleearth-7.0.3.8542.ebuild,v 1.3 2013/04/21 19:21:12 mgorny Exp $
 
 EAPI=5
 
@@ -49,7 +49,21 @@ RDEPEND="|| ( >=sys-devel/gcc-${GCC_NEEDED}[cxx] >=sys-devel/gcc-${GCC_NEEDED}[-
 		system-mdns? ( sys-auth/nss-mdns )
 	)
 	amd64? (
-		>=app-emulation/emul-linux-x86-xlibs-20081109
+		|| (
+			(
+				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/libXi[abi_x86_32]
+				x11-libs/libXext[abi_x86_32]
+				x11-libs/libXrender[abi_x86_32]
+				x11-libs/libXau[abi_x86_32]
+				x11-libs/libXdmcp[abi_x86_32]
+			)
+			>=app-emulation/emul-linux-x86-xlibs-20081109
+		)
 		>=app-emulation/emul-linux-x86-baselibs-20081109
 		app-emulation/emul-linux-x86-opengl
 		system-qt? (