Move cross-emul-linux deps to !abi_x86_32?.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

12 files changed, 122 insertions, 71 deletions

diff --git a/app-emulation/emul-linux-x86-opengl/ChangeLog b/app-emulation/emul-linux-x86-opengl/ChangeLog
index 0d1dc41410fa..fa365a540e69 100644
--- a/app-emulation/emul-linux-x86-opengl/ChangeLog
+++ b/app-emulation/emul-linux-x86-opengl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/emul-linux-x86-opengl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/ChangeLog,v 1.39 2014/05/08 21:46:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/ChangeLog,v 1.40 2014/06/15 15:51:52 mgorny Exp $
+
+  15 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  emul-linux-x86-opengl-20140508.ebuild:
+  Move cross-emul-linux deps to !abi_x86_32?.
 
 *emul-linux-x86-opengl-20140508 (08 May 2014)
 
diff --git a/app-emulation/emul-linux-x86-opengl/Manifest b/app-emulation/emul-linux-x86-opengl/Manifest
index e89d1e5d0cf1..8f4107ba04c0 100644
--- a/app-emulation/emul-linux-x86-opengl/Manifest
+++ b/app-emulation/emul-linux-x86-opengl/Manifest
@@ -6,13 +6,25 @@ DIST emul-linux-x86-opengl-20140406.tar.xz 76722156 SHA256 356ab424e5ecb136d16c2
 DIST emul-linux-x86-opengl-20140508.tar.xz 49217580 SHA256 ec95363752b345fac84cdedd63cf7741895b3ad43763b5a367847c42d9274f80 SHA512 e9d4458793b086c39afe55a3f21d2d9702b41241b49275c8e70bf859c082ae3222557bf2a524fee0fc0b6f4719b45f325d69c258b4b26a961b5d0464170f8ddc WHIRLPOOL d7fcaa5cbaee3ee9d96a8e12a3ed11d7753ebfbe8c1c43cad2bdafd1a23697c565c79fc27aac05b45086ef2620842f09399ab9f3ce4ddea9b5362679558485d7
 EBUILD emul-linux-x86-opengl-20131008.ebuild 1356 SHA256 ad585824915873efc994dd2631b6a3c8820721bed7bfac448ceae04909b3ba87 SHA512 aa9d87051d6fb5713d5a1b11ee10c0d466a596db0e08652c10b4c60fb8529f93ced5a33529d2a9156c197fcd5a16b42e92b334d5366f3be2a091e55b429f45e7 WHIRLPOOL cb9e3b81a7b533486af402ba4cdc9db3841b6f0bfae867c5f15198e92735ce28546082116704a2909ca4885a779a8b12309efaf1a765bd2015a62f85c59a5631
 EBUILD emul-linux-x86-opengl-20140406.ebuild 1356 SHA256 e5a765bb80a54589393c2e0f1e4409601c95489f0dfa28902c1c30cf5c0b851e SHA512 cbc64d6045eb2861cd7283ffad22f11fbb40a5cf02d9f06f102f7807e0db713b6dfb8d141b26e2f3a382d4b2f9b0512072b5fe5eab7d5e67b9b2acf4ec23da66 WHIRLPOOL 129b3bbac834cf944ef50373c455eaf412ba6727fcdc07961f5013c3b4d7a3bf4707083d70b7cb838b82d4c6d56c15d910ec84e2ed2f8cda46948983c01e3739
-EBUILD emul-linux-x86-opengl-20140508.ebuild 1357 SHA256 21dbc89816702734214e8241641baea9ef823f5a028aac92ae0571015838f1be SHA512 2079caddb1f48898e17bc4844b7c43667dd50036a82351ad14af56e148ad192dd7330186315aded7d1f0bc0ebbb9c0a4b1fe4232c166d391b6b4d19e6750d9cb WHIRLPOOL 2cb1c1b2291c8117e7d9778e2f764f7a814e57ac8241e8e7934c8eaf19843e7e273b7180818dbf433ea8357c8d2832467c4d97f0e978029136f4b99bfedb041a
-MISC ChangeLog 7880 SHA256 9c73d8af290cf7c320410a8e2cd9c7275e22c00dc25117d47efb35155f5379a8 SHA512 52b7979de5064ca6eabc4b23919d0d0970fddca126af6873d1256bf7834c9f1f92a544eb73003b901b848c7cc54e82c01043efc897e7fb8dafe1c0634b26a221 WHIRLPOOL d091003412dc4eb1a2471818ac35d09007ee77cb4cff4b66f6b22427072af7c54ac1b4d31ef7cb9c420399731f9ecf2b2daf9756e125dcbb40ef8ef1a9a03565
+EBUILD emul-linux-x86-opengl-20140508.ebuild 1386 SHA256 5960b6edb59da368da8bad802ca532b3656386a43d96f554ff2bed79b643015c SHA512 e418eb4a4a0b2dc3ef73e12bcfa59924724e7ea340eb0c1b4e0cae5eead72d72658cb405049620562685b3544813eb3f9789c522c086696f42529d3db2d9fca4 WHIRLPOOL e9d6773212fb85a1b6e9ed3c6e6b8095def1e3d50aa29dd28c8bdb7581c504220da366ec1175a971a1552e5d36c5c6f973e789a6740664b883fb08d0726cf5b6
+MISC ChangeLog 8019 SHA256 2a66953d46d247546ada3cbae3b75446240b539b6e5e163efed21d3b7d7de565 SHA512 11dc455f3668c0da89572db1549ad65683c15ca70e6d201ef982a94c5aaa7c548b4c2bec4c1ccbad8407c5fb708c3b127bd57371cf19f7800cd53926b844eed3 WHIRLPOOL 380c397c0ca2018a0bf7ff42fef0d74cd2873d5a1887eac004c993a3daee827c8d891ecc81ddacc045f79b27ea78a2996eadf689cfbe0e74255c058890778bbe
 MISC metadata.xml 312 SHA256 9d3f082956c89c24d50eacf1a35e6d3f7e7605a2b290b3ca01123c357595b680 SHA512 21f9fbd2145e18c319f089f1cb2f99cec289daac7e35c944335d979fca8ae595ac2ab81a025c55d56dde80ed7db88fdcd0b644bf2070b6eee7c26bf643fc4e19 WHIRLPOOL 5cfe4fa3453b53f0d056331b905da9584e13a48af3671f248b7ede707b587338b145613a77cf655af74734ae1e9d0dfe50f13d34a2cb069a73c76abc3a753262
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlNr+1MACgkQCaWpQKGI+9RktgCaA7JFBjaTu0OujL/v7f/tbqMn
-UdMAn3Gts1MNqjJPwGXt8hyYreF/4MHj
-=hR+S
+iQJ8BAEBCABmBQJTncEZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOgr0P/20/XavxV/vQRAGX5R84Jn3M
+YKmy0zEqTCGe9nmLP0rjFS3hS94YdwZgJefIiBfUm3FPr+8lSCcTaZsA/8lz9qol
+vuWbSHuYToCaxdKHKm40JCq4s3LopaqkvHvBkcgA9bc8GQ6X+/kQX6+NKb0eyS96
+/DfnSnZYjuXkOzaRedzuqBsYu4MH8g3f8LjrPV7nPiFtADU6cQs67xZgRAMOaalz
+YSjymU9LzwEMq7iqnN5AwHkZfm0ymSPUvQLTPmfpOg01oFjFZ4fxO44jNYHUR2oA
+f2aigqov1aSZobn4MDuSnYxBB+MaAw1CU7ucvW8X/V/pX7W5cC1gLtkLKH6Qg4lS
+G7sLuZHPgVjUucQuInCaj+G5YXNzNpEaZjzt9NW8jJtKRBt+zo7VUmjXhbFkw/Mz
+ehHFpWv5YnP1np9cV6xXnTo181d+MSHQ8A7r2cUkiTAJYGYiGfqkoOWMLYuAgXHc
+mDutZGvIPoz/9wyTi61nT5Enhy6SLpOEwEBOlwtgTVqithPIE7Lm+LSnuTcKV2cy
+Tw6MUrl0oHuch7h3KA4U9Eet81EDg1pelcibYXCT65xw50IvbhMbRZaE+cSlHfgo
+hUkrp6bbvR/SklKvfXD+N6wjsr6JLBbq/rETbHavnn6cPJQ23yT9XzUYrExzMLb0
+YJniIu9hqoG5nm1zEFp6
+=/34u
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140508.ebuild b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140508.ebuild
index 93dc5289bfa8..1419658b763c 100644
--- a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140508.ebuild
+++ b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140508.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/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140508.ebuild,v 1.1 2014/05/08 21:46:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140508.ebuild,v 1.2 2014/06/15 15:51:52 mgorny Exp $
 
 EAPI=5
 inherit emul-linux-x86
@@ -10,13 +10,17 @@ LICENSE="!abi_x86_32? ( BSD MIT LGPL-3 SGI-B-2.0 ) abi_x86_32? ( metapackage )"
 KEYWORDS="-* ~amd64 ~amd64-linux"
 IUSE="abi_x86_32"
 
-DEPEND="app-admin/eselect-opengl
-	>=app-admin/eselect-mesa-0.0.9"
-RDEPEND=">=app-emulation/emul-linux-x86-xlibs-20100611
-	!<app-emulation/emul-linux-x86-xlibs-20100611
-	media-libs/mesa
-
+DEPEND="
+	!abi_x86_32? (
+		app-admin/eselect-opengl
+		>=app-admin/eselect-mesa-0.0.9
+	)"
+RDEPEND="
 	!abi_x86_32? (
+		>=app-emulation/emul-linux-x86-xlibs-20100611
+		!<app-emulation/emul-linux-x86-xlibs-20100611
+		media-libs/mesa
+
 		!media-libs/freeglut[abi_x86_32(-)]
 		!media-libs/glew[abi_x86_32(-)]
 		!media-libs/glu[abi_x86_32(-)]
diff --git a/app-emulation/emul-linux-x86-sdl/ChangeLog b/app-emulation/emul-linux-x86-sdl/ChangeLog
index 28637332746e..a0a0e5775546 100644
--- a/app-emulation/emul-linux-x86-sdl/ChangeLog
+++ b/app-emulation/emul-linux-x86-sdl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/emul-linux-x86-sdl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-sdl/ChangeLog,v 1.82 2014/05/30 17:26:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-sdl/ChangeLog,v 1.83 2014/06/15 15:52:07 mgorny Exp $
+
+  15 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  emul-linux-x86-sdl-20140508.ebuild:
+  Move cross-emul-linux deps to !abi_x86_32?.
 
   30 May 2014; Michał Górny <mgorny@gentoo.org>
   emul-linux-x86-sdl-20140406-r2.ebuild:
diff --git a/app-emulation/emul-linux-x86-sdl/Manifest b/app-emulation/emul-linux-x86-sdl/Manifest
index 96452c83998b..464773e04e09 100644
--- a/app-emulation/emul-linux-x86-sdl/Manifest
+++ b/app-emulation/emul-linux-x86-sdl/Manifest
@@ -6,25 +6,25 @@ DIST emul-linux-x86-sdl-20140406.tar.xz 686532 SHA256 fa9a40e2d2e4a3f7f23df22fac
 DIST emul-linux-x86-sdl-20140508.tar.xz 690216 SHA256 07f7399d0c69b064357c60dc4dae8979cc08cd109bb6a839598f322b13b7f563 SHA512 806518448588417ae397dc377e406da34ecf2772168009eb35da1a213a7bfa68c39db7c6f171c3e66b3f8abe02e6baaee0f155d7fc4842ea56946fd59ff05e04 WHIRLPOOL e21cce37eaf76198ab78138fb48cb071f7ab2174e7672962f3f12932f7ffc770a8c42dfb5f6266ef1c27ef113fb5384d2b97ca67fc7514224b58f090759be0b7
 EBUILD emul-linux-x86-sdl-20131008.ebuild 534 SHA256 9c2d03450015500819b15ca55d4514474ec79500ca553e1167900aea72884b0a SHA512 fadcf1ee8a542c75c5c2e44ece7467e509ccbf43d3e3a596f24c96d6879a50effd3d0ad41ccd39c881d306481449eb237d50c66b8464ebb60bd1b72b8a7a97e2 WHIRLPOOL f8fa2915513cc8dc8808af2cd6366e281c2f15db2dc0b8d325a1c6bb678d620af5e099ce38892b8d02c1c22c80b0346607ad3786cd0f1ca4a3a8f1b3bcfaed99
 EBUILD emul-linux-x86-sdl-20140406-r2.ebuild 1229 SHA256 aaa61e01ad66a2d6473b601cbdc2c3bb51c9e08301c1674d2f7cdb8b4a810c2b SHA512 f958804b5dbd41428f61c7e43c538d7481dde21fc46592ceeff9ff323132e6c4ce6eeeda8ef19ce9ddf5eb286fe6f2d463a343a61d5a7ffefa5eb1f28edbd583 WHIRLPOOL a017da8ff6123699060665a9da20ffe3eddd03527169956c08d0c2ddbab797ac27f7adfef8f7975efe6a468dc03af9f4894e2d49088cff38793718d82e9e8d05
-EBUILD emul-linux-x86-sdl-20140508.ebuild 1224 SHA256 569519e24e32be59909a66f117b0faba5ee943137ab7a4ad9c0454f91443ea25 SHA512 7db5f59113b293ffa03999aa19588c8dad71654eea93511a99311fb8a6237df81c784a16d8caae88be4ff50d9c887fe81f72b936fd23030439f38440830b1649 WHIRLPOOL 162be7ebd6772214d1f4019bddc2645dfd99ad9b23f2b2d8e5b7bfd8e24e84f0459589c06af960199af0d8e7866e09f565c6e956954bfaeb6d2cd9a1e3771756
-MISC ChangeLog 13254 SHA256 545daed0006560d7dc94a2063b53192a0fb65915b0eca1dbf73ada27159ed87b SHA512 a1ce030dbc452ca079d89ea07b13ab38c1e7d5ceca77096bebb6d7caf2aa55606d6d04403adeccb09d61aae35c4be67bacefbeafe226d10aa922c34675845f3b WHIRLPOOL 215480300f1bd5db2737a908849645004ba17fbfe646ba1359562aadabc17492f68f53e09c844125eaf4df0f25f63425791a81ede676ff02c463c834c27342f1
+EBUILD emul-linux-x86-sdl-20140508.ebuild 1252 SHA256 c0e36e3efba57a9a968d2da443630d96425da6e748930b1a4403ea9179110803 SHA512 cd554f50fba71a0a6392ac81390a3aa77b94bc744491da608c0d1688aa85d6158d13cfb3cf5eaa01935c92939d950d58a793810b0b6457967ef7be62d50deaf6 WHIRLPOOL 26023f933870ce24c04dd1c8af000e3b38181579f28cd37876204ed13ab2f4e90505089d0f3973b73eca9d6a53c1ba605aa2c86f614dfbf1e743887161bc6d37
+MISC ChangeLog 13389 SHA256 0fcde0850d1669caa12f2cf919bae4394d9915cb0fb5e80fbf27e0760c8206e6 SHA512 321faad3fa6a13648ba57dbf427d290ff7f1bca6cc609622f6e444278ca48b3aa1371890f868225cfddf7f0d0d2d0e9c76f2692862389395c53fdaf076b447ea WHIRLPOOL 3eecf49bf5f469cc0262051b8b18e3916198e1c6d7cbe6cf0e3d099a8887448d58c5f64c91cb47e604930f8ab390565d8a1beb961920bf8991cf32782a44496a
 MISC metadata.xml 312 SHA256 9d3f082956c89c24d50eacf1a35e6d3f7e7605a2b290b3ca01123c357595b680 SHA512 21f9fbd2145e18c319f089f1cb2f99cec289daac7e35c944335d979fca8ae595ac2ab81a025c55d56dde80ed7db88fdcd0b644bf2070b6eee7c26bf643fc4e19 WHIRLPOOL 5cfe4fa3453b53f0d056331b905da9584e13a48af3671f248b7ede707b587338b145613a77cf655af74734ae1e9d0dfe50f13d34a2cb069a73c76abc3a753262
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTiL81XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTncEoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZORmwP/1vARDzzB/QFN1A3soMuOtEX
-17FcFJxaPXQUBXAq5B0eup/U3T11cBaJ4cYYIKk9V/wRSMoPNjh2gooLTZaQ+4U0
-0FiQZ7N3GjiL1Fp0eMPLPo08D3uyyx659nyWQ/JN2Uq1gr/i+tpSA8P5TKvDxeCM
-13G7BwMFEEbYbVWLqQ7jEiafRQZNnHfg7SetGILKSuc9iR0bz7u2VkI9b2g5s/vQ
-jJK+sPoWxqaE7bH67DGAiLfELONDLBNwuhpyV/ap7Rp7VINBq/Gww+cTpqlW2Z/c
-08aeTdEGLWUK8Zgd9ZPUbiWPayLAytKxpAFmr4PSyvsNs9mSA40plKg05sp6EpQq
-6wfBT+ZYc6hV2j4rquw2UDU76IGPhI0P3Y0ibxjOV3AGsTntFEwZK5sZK8xLOwTF
-Ej2CAwNxB9nfnePTRthyW7IWXeNzFuE8vzcQjIpUndU7e5hQiiVbpkVkPk5xvQyv
-oqSoEJ7pbvyUc5UAs1dxUh0cdyetNuk+rC2a7V5iYIMEREB0Sm88yalGK0oaa6aH
-Ex8eL0GDohzeC2oUhjOkLLrj/akoAzqQynbUtymwvlqhLLmGY1RBTkqeWrXEhUh2
-FKBpmdStUmjs90rMv4eu40bY5VNOpvcL6vrGNfm2J3UdYEspygw2uC6MugXbQJGa
-VpGCg0xkFUFfsNpX1TWV
-=i1qX
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO2QYP/25ooauDichyX/cXpPy3SHuw
+5bHdtiTD8Xs8DcoqBLiSrnXtQk7AhejHk3xbkuFWUAcplyQ49RVJv5tR7TJTjwtZ
+vltmOkp1Bv5cmAmcaU3LixYee3Ddk6t59LCdImGQKYKuumWhnC6x8ZN8NyuSr6bX
+t5DGqerC4WQLPcSwqbZrRDmEk3y69szj5y4XpgSrtoYT4RPFHSM813zSbRE6qmvo
+V0ILpfk/EOingkA8b/MQkx7YtnY4vIU9ChEoCpUCYx5SkICd9pt2wE+JevwY2iRJ
+AJp3RWBjUjcwXFchKx+s8pPr7gAs/wgFDCgy7CtbF3+5zKtyA/9BOMTrtFR2lH18
+kBLkwUdBBIRK8aoAqweZq+oeZCX2Aa4IFyirlYSzuDMg1/w1WlpP+5rq7e6iyoaj
+80jhMtnalZBoHrsNYTc3Skj14lgjDeK5Iy9yDpQWK3PoihFtAi05ETkyHSmK2wVj
+FOYQ0wUlSKkDyONjFae5OxU7v5kfGh9lHJr7UFQJklfhq2Tps0PN9LauKJJxKO28
+No6bwn+DfCVigExPy4IC4zzmthjzwxHsvZ0pfdoJZL94V7TUf784XgGN5jH2f1D1
+diLgVnfhSFd3VIfG42Vnm4UvAPgiDBic3gC/LkHcPAtwwasrf7enIaTSw2H4q4zG
+xadChp6MZ+5MwTN+rnon
+=T6uV
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20140508.ebuild b/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20140508.ebuild
index 274aa95a27b4..6ada5a2480ab 100644
--- a/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20140508.ebuild
+++ b/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20140508.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/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20140508.ebuild,v 1.2 2014/05/09 19:08:55 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-sdl/emul-linux-x86-sdl-20140508.ebuild,v 1.3 2014/06/15 15:52:07 mgorny Exp $
 
 EAPI=5
 inherit emul-linux-x86
@@ -10,10 +10,13 @@ KEYWORDS="-* ~amd64"
 IUSE="abi_x86_32"
 
 DEPEND=""
-RDEPEND="~app-emulation/emul-linux-x86-xlibs-${PV}
-	~app-emulation/emul-linux-x86-baselibs-${PV}
-	~app-emulation/emul-linux-x86-soundlibs-${PV}
-	~app-emulation/emul-linux-x86-medialibs-${PV}
+RDEPEND="
+	!abi_x86_32? (
+		~app-emulation/emul-linux-x86-xlibs-${PV}
+		~app-emulation/emul-linux-x86-baselibs-${PV}
+		~app-emulation/emul-linux-x86-soundlibs-${PV}
+		~app-emulation/emul-linux-x86-medialibs-${PV}
+	)
 	abi_x86_32? (
 		>=media-libs/openal-1.15.1-r1[abi_x86_32(-)]
 		>=media-libs/freealut-1.1.0-r3[abi_x86_32(-)]
diff --git a/app-emulation/emul-linux-x86-soundlibs/ChangeLog b/app-emulation/emul-linux-x86-soundlibs/ChangeLog
index 663fd06c783e..e7bf710c4188 100644
--- a/app-emulation/emul-linux-x86-soundlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-soundlibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/emul-linux-x86-soundlibs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.123 2014/05/29 18:49:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/ChangeLog,v 1.124 2014/06/15 15:56:58 mgorny Exp $
+
+  15 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  emul-linux-x86-soundlibs-20140508.ebuild:
+  Move cross-emul-linux deps to !abi_x86_32?.
 
   29 May 2014; Michał Górny <mgorny@gentoo.org>
   emul-linux-x86-soundlibs-20140406-r1.ebuild:
diff --git a/app-emulation/emul-linux-x86-soundlibs/Manifest b/app-emulation/emul-linux-x86-soundlibs/Manifest
index 3b9da3df9571..289828a660ee 100644
--- a/app-emulation/emul-linux-x86-soundlibs/Manifest
+++ b/app-emulation/emul-linux-x86-soundlibs/Manifest
@@ -7,25 +7,25 @@ DIST emul-linux-x86-soundlibs-20140406.tar.xz 7230696 SHA256 83585754db38294dbba
 DIST emul-linux-x86-soundlibs-20140508.tar.xz 7259656 SHA256 6d79654e4c93f1f7f289fdab3125aba80d66b08ef0677c6e46869ed2488320e0 SHA512 5ee5efeffdc74bdf5f98d9bf862de4a90b22d0bac4447919f044bbe4a2f66a672901c3dbf79a52cc302e27b06a03aa4266b7143918afa364e2d7623190c99cdb WHIRLPOOL 96412024eaa8814ed334ae1087c099b690dcc1b64fd105f246b6740f6679036d2c61420d76c034780084fd095648d879aa9522213bd2b134fd9afe74cbfcce9e
 EBUILD emul-linux-x86-soundlibs-20131008-r2.ebuild 2517 SHA256 4adf1813c750a07ecb1fe96aab0d11aabd7e375392b75a355ea9d2dc91be936b SHA512 155bb7b388b2b135a161c04216f6871e39ba55e5a5ec44cd2122e40f9026e81b5b8a8f8f05a8fd934662108ac4aa788dc9e2d3470f4423f093b49497fd7d1a08 WHIRLPOOL 9ff33c27e4807c233c4eb9abce15b83454f1b80ae185b12088ae1a9e1bfc686e225e18973b3fde46b9f3d226f96e87b986d26c553a3efb8ab533242dd57cb3ff
 EBUILD emul-linux-x86-soundlibs-20140406-r1.ebuild 2597 SHA256 96a63883ed84c1f598fa87a46b549dfa44464cb44e7a03fa0844a2d6538f6acf SHA512 c0ffdf2b3629682fcf0586f6ec5087a6ff5ee83b15552570964c79cbc1b315ca82b9d68ad176d2c862c9b8befa2b988e4fbd8b63f8a5c69b5659b99e11dbc56a WHIRLPOOL 4cf0dfab765280b2514a739d6db0297f0c6f6d7ae2f4451ce171495c3395a6da0bbf9a20f516744942f3b78198d85dba0f714dced5679ec61a3250c5e831c8e1
-EBUILD emul-linux-x86-soundlibs-20140508.ebuild 2595 SHA256 ce525df9033f37f5e2ed680982fa68b522763f3bf1ee30ba9b60818d2fc5d97e SHA512 6af248b8c9daf9260a02c7411df9e122abddf68e6f9df29b3c0f8068d31ec7fe261613d4b3e3cc9fc60e8b3ec32005d74965bca2fb4d6be2e0aeeb2bbc4d2db8 WHIRLPOOL a53dc3ab5a5729d1d2229750a39de9dce701b2cc89ec827adcb68cfa6fb844069989f4701e2d09ef581c344b87d81b10cbb865b4c127df7ce554ddd0e94bebf8
-MISC ChangeLog 24006 SHA256 8beadeebaa82ef0e8f3792b1fa1ef8973e9530cbb22b4f13ccdd494df885049a SHA512 dd58361d2f2887a0a48890c4f248a8977a9bb403570027e1561939bf24fddbe031aed2e1e4f284c4e12d86fd04b9c89cb4fae8785dac892967bde4fcef631c8b WHIRLPOOL e70426985f067f04f97b6c8600c4567de357e5beea6c579c6ef7501017626ea4fa6b67d40cedead2fb37835c16fb7944abae8d08995e9426b749969e28d7f9c5
+EBUILD emul-linux-x86-soundlibs-20140508.ebuild 2602 SHA256 3cf91882a4b1ba7908a2794133f1dc9b2586f77cc577d05da011ee9dbe57f026 SHA512 13d5674df9afd66ef6a383c9d55eac9bfc13840dd6c857ddbb1d9d3deb9ad6a8a09db194cef8528ceaa042b710ae0cc5a84feb1cb69e032e01ee22ea4c4f6884 WHIRLPOOL cbe1a14e1086cfbf5d3fa336a17ac4b5a03cee67a075ecd02ab066c11ed927def06a07a189ecb3671a778b87895a6772fc52e7597db0b8b0b181a7cfa46b0e69
+MISC ChangeLog 24147 SHA256 8cb6ab1972274014fda661d6a4cd189d446406660edf4d025f8b440a7e2d1784 SHA512 78f7b4b648f03dc752146c81199eafff07a1b01d44c5cf218b5da22cb91fd0ed759354e506b6136029842f4f388a1e661a4c666c20841b411a9297b348930e50 WHIRLPOOL 328ac8e12d1c633476657be56d7dbd9b3c3f779a98adcc21f1b355720ba8b37f63e96142f53a849afa1cda2718ed1eb5f1c662004051148a83be0bb85ae5af36
 MISC metadata.xml 393 SHA256 1c7a2ff2a63b40d4d163c62ec9b2a8734abefa33f9aa2fd514c51e62ba284a80 SHA512 ad676da46d237f6f3562a01055e935b4b5e04b95bf8b9e20a6b02562849627eac594d50146291c7434259440473b48bde16f4c5e985ef3ed7250275bfc47a6a6 WHIRLPOOL 2023a9f3b593d6f4d92f4e3a4fcc8e5ee4271911ebb1578323acb17b7e7e17230fcf3c342751bda7f9bcc149c956d169923d9f157e789eba3ccf03df374199a6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTh4FOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTncJLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOfFwQANSoxQ5QsuxMwh6AT/jAVw5V
-Rl0+ZKTMGNWdGEd8/9mpsj4vwFfhLjc5Mp4lM17xu76itenfsztIF6j3VxVYWxyy
-EwDbv7sUr/B42WS8dYtbQLKIQWQ9QkA0L2GloYlcrfEisU0PVeQSRDugU1eiUDLj
-vyMJPu31DnfYz84alBuQ/fCmRdIrm8ejc2dQqQ2/3BW3/dvmxztmxBEbhHP2geI3
-FLlYN1ldzi+DUeBhXSr6wKDWL+jc4nrMJVnT6sqsnZvP9BHxowBcwwIgfHqz7dam
-mjnIac1yPhbM6FMQ6PD7QYr3Z2SmLalMJrB8UmiZPXruUgwkRlkl50Ys6CXduqJS
-/PQ7rLotF1/YHCbOYviRvAXelbRGmkCLijuohiHqHiz93FyAlmz9kjMEXq605H+O
-eNWFAN84p/RbY+xTb0d1s1dQqu6XGUYr/3CK1xctXdpkuSQ1Q9VE40NSRR6QBSOU
-kEZOxC4uLmXj+j+PJGO1tWIwImiqJIWheg7ZrmaBMNEqo/I2amD2KgH7GaFyaYMM
-3IuChpOriRo2JvibFnUKU4IMHx90kQ4pro1hHArQOfi57t02kavXVQn2Z3uO7AzU
-W0V8RLWVXouBmvwXB+YQMRqneNSEtbK216iyvOHHRIg2kAvkrRIBPQd9Hso5HXOK
-DQ+BQeLa9+bo45Y9Y8vL
-=+EzN
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOGo4QAIppjJ49F7zf858mrBRYrDEN
++r3kJDRbaR/Z63jr6MiJ5KpR7qac58wU++yXNMcroQP++2xe5bE5CRWbWLfj3PET
+lqyIWu8txavPD3OkDzDPENXZv1PNnRMpYXjFi24nPOxYCVyL9qOGBnyZOxvpKQXx
+B/H80HEObEPyKBYsAveTBplszHUHRYyBhrSrc8GMsZiyRbaRBsH1XdDYVSDG0QCx
+arIqCElexqNI98YGvfUcddq1vEdt4i77c8v+FrsL4kWxUtGe1IoCTnFiUJ4nL+I1
+aWpVQbVWS66aXxMzLTNlwj9iLGIQSa3aDC5jO2rkQ7rnu+ZF2wN4aum7Z7cIXhKP
++ENnCKunjHhMMLD5KzCXfdbvtTPBxwImazbfqqUE4tXZqypnPYY4QQ3wp6kHWIL2
+Y0l3THTVz9flJdpOH3rZTK+KnnzJfXjO3J+kAffegCj5m6LB4+4+9vhQIFyM+P8C
+xfGRhIEZSv/D/kSuFDA6X6x9Ft0fBlBRG9ncQ3IPk2gVX8y3AE58aP6xyRh5wAiX
+3i62aLRuI/BcqWZ4NskVixTvx6xbkTQDGCd7OjiAdj3w/U9Oj5I29aAPz8xnuqIS
+TpFXVtU4offsg5/ayAx67UMRIn8uye25AKsaDszIMf9R06cJr7edQCM/9f6q0kXl
+ztm9tjoEjN6pEGHVdfGA
+=yGeT
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508.ebuild
index 9524c5943ec4..6737b19512f1 100644
--- a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508.ebuild
+++ b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508.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/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508.ebuild,v 1.4 2014/05/10 10:06:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140508.ebuild,v 1.5 2014/06/15 15:56:58 mgorny Exp $
 
 EAPI=5
 inherit emul-linux-x86
@@ -9,9 +9,12 @@ LICENSE="!abi_x86_32? ( BSD FDL-1.2 GPL-2 LGPL-2.1 LGPL-2 MIT gsm public-domain
 KEYWORDS="-* ~amd64"
 IUSE="abi_x86_32 alsa +pulseaudio"
 
-RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}[abi_x86_32=]
-	~app-emulation/emul-linux-x86-medialibs-${PV}[abi_x86_32=]
-	!abi_x86_32? ( !>=sci-libs/fftw-3.3.3-r1[abi_x86_32]
+RDEPEND="
+	!abi_x86_32? (
+		~app-emulation/emul-linux-x86-baselibs-${PV}[abi_x86_32=]
+		~app-emulation/emul-linux-x86-medialibs-${PV}[abi_x86_32=]
+
+		!>=sci-libs/fftw-3.3.3-r1[abi_x86_32]
 		!>=media-libs/libmikmod-3.2.0-r1[abi_x86_32] )
 	abi_x86_32? (
 		>=media-libs/libogg-1.3.1[abi_x86_32(-)]
diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog
index 92b6574b81bb..0912d15c9416 100644
--- a/app-emulation/emul-linux-x86-xlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-xlibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/emul-linux-x86-xlibs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.131 2014/05/08 21:49:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.132 2014/06/15 15:48:46 mgorny Exp $
+
+  15 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  emul-linux-x86-xlibs-20140508.ebuild:
+  Move cross-emul-linux deps to !abi_x86_32?.
 
 *emul-linux-x86-xlibs-20140508 (08 May 2014)
 
diff --git a/app-emulation/emul-linux-x86-xlibs/Manifest b/app-emulation/emul-linux-x86-xlibs/Manifest
index 2f9edf57b6d5..827cebfbefce 100644
--- a/app-emulation/emul-linux-x86-xlibs/Manifest
+++ b/app-emulation/emul-linux-x86-xlibs/Manifest
@@ -6,13 +6,25 @@ DIST emul-linux-x86-xlibs-20140406.tar.xz 2756568 SHA256 2c029d10160f5cf342c8450
 DIST emul-linux-x86-xlibs-20140508.tar.xz 2768084 SHA256 fb9db4f6eddd3e2102735e3921dddc48f285aeb8388cacb620da0f6d3844451d SHA512 fcfdfa87e169867d918d619b4b708b2d1dc5a9ec926cdb90c13ee6bb917838b4033f8f3e424ff48a5674bfe0fec13bae0de21e37131d76a81163962d6e31ec46 WHIRLPOOL b1a727d52987c43281265a04d963c55b4c03975e40b025007ef43fadd530672f7a1ba59e5ca4a1b61ecac5094ab33232d2180242c298e170a6630954ac136ac8
 EBUILD emul-linux-x86-xlibs-20131008.ebuild 2939 SHA256 4b0ef53e476b408bfdf9e45f1799e2ab16e1a0de3a8e65d7e27ce39a7202f68e SHA512 54d2cc0edae4311e6930c20cfbc7b2325c9ae90b6425427ca3f9bf286c890f3c43d63c14bcc84cc19f4cdf830af9da8738202fd43363b6be0c9800c2f14f6a0e WHIRLPOOL f425bb9f3279dc0004b5f7e5b38a358a75e8966e8deb0c1007e2ed2475778dec9b2c608072b93eca23aefe5d41030cfdfe410dbf999eff8eb4479fe6a37076ea
 EBUILD emul-linux-x86-xlibs-20140406.ebuild 2939 SHA256 f86b56cff2aa0df3cbd5209e0ed3c8db1461c72010971b3f4c92e1f3125ef977 SHA512 ce4d8f53cad5867d1646af18efe5c7a65023fe8915e62b41c804395dec7c169c245f8b29639adb4393cd010415a530c5a3ebffd0b93991807cf5d7ab34e7f092 WHIRLPOOL c910ebd43ea8916934d6b7622098324b94c9fe76e538a6e7af59feb7f4b27d5b45ae43228e641ce1b516598ee8292f667e0606b0f14ecaeb62ff47278804afaf
-EBUILD emul-linux-x86-xlibs-20140508.ebuild 2940 SHA256 ef3a7f47a8460223207edfc9a2edec944e019a5a8cc42480ec4bc297c1d08e71 SHA512 97acc34317fd44a0f8962983a4a836ca2c67303047d4c436a4cefd52b5aa2fb08dc6f8d734ae2e4968c28af63a033ae0fefb4a84c72fc4b4c339fbf221351ebc WHIRLPOOL f3eeb603ecb37225dca96fa025b330a18c1e6969a2a3253dd2ad84885e66d8181bbb95a5eca8352317e2fb41e62711d540636afa132c5c14ad6462efd97f80c8
-MISC ChangeLog 23840 SHA256 8a6aabc3e2edc387b60df40608c47c3688bd822d05c7e91003b1d39ad95b0a88 SHA512 0b7b4119eab5e84dd88798b260e841869b1ad2e8ce50a5a7b6f7c919e87d00013191987af15ba774ea8e6eddc56d041a017f8480f6f3e25dd5f13879f6ba70e6 WHIRLPOOL fc032c2356fdeade50b8e7453eb6c59cab7dcbc380d2fa1cc619aa29cf447f7c7139f0f7977540927c944cb90ddc186013aa9c3f03fdd88dc3ea5da3b6d857f8
+EBUILD emul-linux-x86-xlibs-20140508.ebuild 2946 SHA256 c5b987461a59db78ca25fe34060a8c979495b04dbf55f1b64c3d07bb55c2e7ff SHA512 c9d146e30f00864873684c6e426a9a7563da1cccb8d1494dffd3a9d65b4bcd3547cc6895ff3c406a0544508b5b79749b66ca02d176336b28f085013ed7709bd6 WHIRLPOOL 4ac95f9a2745ac679f733e429ab0bffd64ff73ba35e39aff04b7d29d373d00f0379abba308b492eb390d0f6977f453e9d370e81466dea62520c340306e510aa9
+MISC ChangeLog 23978 SHA256 de37429c048cfb6ff20a8b2ee91a2ec5f1270263bd9b1b9dad59af0c05c1ecef SHA512 037a33351cbd9c0bb9bb87314440f7147b8d44448d0fa4b1785c81bc04949ec550a4fc2e9923bd2ceaab3ad1b8a067663b3ba4a523b760f496c884cc965e434d WHIRLPOOL c353771bfd0c700fbcd00dff0c087936d3f16b07964ffd29d1b73386b121826b3014fbe0c7320a043945c26e1a74d61335af766e5ffe90bf6bd0534980501d88
 MISC metadata.xml 312 SHA256 9d3f082956c89c24d50eacf1a35e6d3f7e7605a2b290b3ca01123c357595b680 SHA512 21f9fbd2145e18c319f089f1cb2f99cec289daac7e35c944335d979fca8ae595ac2ab81a025c55d56dde80ed7db88fdcd0b644bf2070b6eee7c26bf643fc4e19 WHIRLPOOL 5cfe4fa3453b53f0d056331b905da9584e13a48af3671f248b7ede707b587338b145613a77cf655af74734ae1e9d0dfe50f13d34a2cb069a73c76abc3a753262
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlNr++YACgkQCaWpQKGI+9R0UgCffcgtRlNogOPdUFKE65yWKBWD
-askAnj9hrm+CRPYJL6tVjvv7JEetZG52
-=VDm5
+iQJ8BAEBCABmBQJTncBfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOFGcQAJB4OIF2Z9wXmXTf4nG5719T
+WtQAghAm1C8bnUXZzwpRG8/pejgbgQkRxU8JkmYWdn7/aJbbuLQmJP4OGgTO80Y7
+4oIcXYodwl2SS6J+POI0T8loEmSrvmnql+WDN5+O2Z+6y/4LGUg1UG2TBYy5VTIp
+Z5bYj/STteSiih9jJNgW8lwLumQNp/YDAR5fei6x5ni/ZhvqE4yb/SnkWZq9xWJo
+oYwZhdLNdus1BzlkbKF/9qgnrJ+P59H+uPsbihTMrciwyTYNby/8NUBmTfS9UNWD
+EL+61xd4yr/229X7CJ22sydBTK83iGMYZz4Af3NwjweYPhUPHbO3b67IPx3Fu3NC
+bt2HPr3sFKqKZ2ykbof6v/IZf2u63h93dxl+O6ILNwBYq7K119KGV1v8hUnwwr7I
+0jOFSVkdZZB4aIrTmLeO/0M8ejiECAb95N/CUhh8L0J++Ce/fF7IQuPFPvi7tfKB
+QUdnQh11tRaaO5VTIE0PWsOPJvCV5HjO0mvlpdfOECSqKQO62++RRepv+a0vpf0k
+UHU8JrPEUymhJ4dJlG8rBUp9jO37Edjsx4cyfbtzmZa4C1OLTuvZnKWyz/iGCm+o
+EQ1uC6i4h1nMeDL7Ss3gHWix/QgpRs1yVlb3WCBFlDAQlA8Yy0fC8+FIhjgPNFeo
+yKgFgLTqdiPs5zxchREn
+=qesZ
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140508.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140508.ebuild
index 5c2e00850b32..cf0b4fa728b5 100644
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140508.ebuild
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140508.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/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140508.ebuild,v 1.1 2014/05/08 21:49:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140508.ebuild,v 1.2 2014/06/15 15:48:46 mgorny Exp $
 
 EAPI=5
 inherit emul-linux-x86
@@ -11,11 +11,12 @@ KEYWORDS="-* ~amd64"
 IUSE="abi_x86_32 opengl"
 
 DEPEND=""
-RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
-	x11-libs/libX11
-	opengl? ( app-emulation/emul-linux-x86-opengl )
-
+RDEPEND="
 	!abi_x86_32? (
+		~app-emulation/emul-linux-x86-baselibs-${PV}
+		x11-libs/libX11
+		opengl? ( app-emulation/emul-linux-x86-opengl )
+
 		!media-libs/fontconfig[abi_x86_32(-)]
 		!media-libs/freetype[abi_x86_32(-)]
 		!x11-libs/libICE[abi_x86_32(-)]