Dont require multilib files when USE=win64 #269439 by Mikel Olasagasti.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
RepoMan-Options: --force

12 files changed, 51 insertions, 59 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 3beb04f83a76..7e020e673395 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.262 2009/05/08 20:46:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.263 2009/05/16 16:08:42 vapier Exp $
+
+  16 May 2009; Mike Frysinger <vapier@gentoo.org> wine-1.1.13.ebuild,
+  wine-1.1.14.ebuild, wine-1.1.15.ebuild, wine-1.1.16.ebuild,
+  wine-1.1.17.ebuild, wine-1.1.18.ebuild, wine-1.1.19.ebuild,
+  wine-1.1.20.ebuild, wine-1.1.21.ebuild, wine-9999.ebuild:
+  Dont require multilib files when USE=win64 #269439 by Mikel Olasagasti.
 
 *wine-1.1.21 (08 May 2009)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 68bc2dc3a00e..30c45f091401 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -7,13 +7,6 @@ AUX wine-1.1.15-configure-host.patch 314 RMD160 1c8d09d5265a23b1931eba949a614eae
 AUX wine-1.1.15-winegcc.patch 1550 RMD160 086fbdd7dbe5da98c3457f00cb30705150d58b1f SHA1 0aa5a9d0947e15af9fe103797a0c993cbb3eedab SHA256 fcf4a0578774d817b8de094abae85e370683a77805a59efe6c5f7b8b87935de9
 AUX wine-1.1.4-install-fix.patch 959 RMD160 b0b642ae38ac95d12af066e8bf466e2a604bbaac SHA1 693dcccf489a93d97c0a01f355aa1881b8e9e9e7 SHA256 5fc22bfa7f06b3f8e7a28fdd65a5209a7a417dfb77b76c2f5318e09d0c683e89
 AUX wine-gentoo-no-ssp.patch 532 RMD160 fd5de0dd965ec58aa53f0ec1fb74ce7cd498a24e SHA1 6fc776bd96438c65a44a03c8adb3fedb0aaa70bf SHA256 6408ae3ed9bacc895677a5b2302bc27afc549ea99f54a9ab4594afb34c629e9e
-DIST wine-0.9.60.tar.bz2 13809862 RMD160 66053099d18ed898759db99367db198bbd817cf4 SHA1 bc203cad74a97184e5f0fffa14edd243c42511af SHA256 fb5bd9d70746c1c0a0d5fb506bf2d0fdb36bceaf1a790964890e934148722948
-DIST wine-0.9.61.tar.bz2 13809378 RMD160 9be15012be98672d557f503d8d8c82ec9946c777 SHA1 d64ba532743cb2b9823808c5449eba1bc0cb4bb1 SHA256 3135c83bf7593500348c32033e2f2e196d02b4a83eb0b11bbf5cfd0e8dd7a8de
-DIST wine-1.0-rc1.tar.bz2 13898669 RMD160 fe374d1318401e5f71807d8c5dbcce6b4bad8665 SHA1 cff2cdf3971de24c35bfe27db1f5f7698d9a5333 SHA256 d56aebcbc0c21b64e7e31381803952dcdcf8a9a611e9a96b136fdd0b0bc4ddcc
-DIST wine-1.0-rc2.tar.bz2 13948521 RMD160 65880c7f668d97577adf568bd44037da28261e95 SHA1 255142b0ad1dce9e9cfa032239b886ef99e204e6 SHA256 06162318e68fe05e599df1e22e1395c5d08f728d333eab127e8e69b4318918b8
-DIST wine-1.0-rc3.tar.bz2 13991771 RMD160 5c50dfcba63e569d88b4b487f422a20e2205955a SHA1 b03514253b7218781b694004ac4640557b4d1f96 SHA256 b56b994e043d4a34bbda605ceba5607f699bdff68b8bbfd91e4e0701e4f6c5b6
-DIST wine-1.0-rc4.tar.bz2 13983809 RMD160 c6e26e6299e2068e928937bbde820c62ab768315 SHA1 c737110f51bbdd1451590722f1224013198ce8e1 SHA256 72afc4184606aa8cccdb356a3923414e3f8c626d1c037cae1792d0a146600c47
-DIST wine-1.0-rc5.tar.bz2 13971266 RMD160 76c1783d2cee3c39eb829f2910841a5c145d6e74 SHA1 67e78e6c32612e0e58fdd4df5472478c46637f51 SHA256 f4d33db7a98d096e449a4c35a690dc0df59d0fd43ae9340525c72b266b2bc3f9
 DIST wine-1.0.1.tar.bz2 13956805 RMD160 fecd2bf970c51c80fc02ca39631034f066da145e SHA1 0550b03bf7b314514a87b6abb2198da96ef83b22 SHA256 c04bb376c6a2bd2be3bd8d5b73aa6db2dda3960791ea5d36579499fe72903479
 DIST wine-1.0.tar.bz2 13981030 RMD160 1dbfa38e54e7d6269ad4110f22b2791393fd3b59 SHA1 84150abdda18bc34b187335c6862718a6e08d255 SHA256 27a31ffafd8f39dd7e434e6a9789f3b4c35145568ab79c3dc8120153469c6cdc
 DIST wine-1.1.0.tar.bz2 14016982 RMD160 688feb6967fb27906372d80dbdfc5882344ad0e1 SHA1 171d6541521d4579c7eaa1b7d751d674c64fdecb SHA256 e079cec1eb8bbcfb176674a0ab2454bb2b2d1b16e518a02a66eaaa6c4e1a3607
@@ -41,30 +34,23 @@ DIST wine-1.1.9.tar.bz2 14731804 RMD160 3a366c6b5c8f07d61d67b278000bbe0131fa7d99
 DIST wine_gecko-0.1.0.cab 5746895 RMD160 61f85ee39e96f88783541460d2fce31db7cc0183 SHA1 c16f1072dc6b0ced20935662138dcf019a38cd56 SHA256 4ef0bffa49a9abc86f74257aa8d7f5db806e8e8bd780149244149aa3f9292d10
 DIST wine_gecko-0.9.0.cab 7806669 RMD160 6cd55a76dea2fa5b50adf98423d0e38a207fde92 SHA1 5cf410ff7fdd3f9d625f481f9d409968728d3d09 SHA256 8ed1aec2b9255cd1baaaf8933b7bdbc1ea20f1f1513797144ec5c9b9482d3d74
 DIST wine_gecko-0.9.1.cab 7806837 RMD160 8b16a4d065cd28d87a2e226400fa0a3ed600c2f1 SHA1 9a49fc691740596517e381b47096a4bdf19a87d8 SHA256 76345852b844c4b624a1beaf3f47f261ad956dbee97316ea26b3c587b363be84
-EBUILD wine-0.9.60.ebuild 3748 RMD160 2d20dc528063a5cda9faad27a881c3fdf35ac019 SHA1 4396579a22f2e50049763709dbf147b8bfa9b826 SHA256 17cbde7cebf2d9b916781887a9301308a4bab284ce53d930685e6a4c15566a03
-EBUILD wine-0.9.61.ebuild 3748 RMD160 76e3cb7a420c8a116ed646a48761e3120a12220e SHA1 e328370ca41ff0772511eb03dd505a70d1cbc26c SHA256 2f1ad64582d74fee52a46572589227a1eca9dc2f25f5723e7b8c5edb68ea4df7
 EBUILD wine-1.0.1.ebuild 3809 RMD160 cab5e28b42f7fddf68b6906aa01272e9ca4a9f49 SHA1 f2d9d34a72a78cf35e2780ccd91d39b06addaf64 SHA256 072448a2ac5fe5a5858c96cc76931fa7442d8026cdd0a6c6a179f525786d65cf
 EBUILD wine-1.0.ebuild 3805 RMD160 8e42ef7b6de9393f05a414c10480e2e6c09f9b9e SHA1 5be4697cf05f953493097642e343e74ddad1d94f SHA256 9bf9292ca6662aac67e760f94986209f9c8ceb58f93b416ac8b0f3600a3d85b2
-EBUILD wine-1.0_rc1.ebuild 3796 RMD160 69f9ed6501bd6fa5d468dd5f9de09870729897fb SHA1 1f1033ac0f638026699334d30b891b240ff0c869 SHA256 8ccd82d833264846cadedfde51bf26b41d53a6e923bf2724f1ac30491ab19c17
-EBUILD wine-1.0_rc2.ebuild 3809 RMD160 70bad18575d16295f1c179ef94ea656d7a586d77 SHA1 38646ab7de2cc4521848a3bdff5a928f1d4c378f SHA256 fed3db1b860ff4c317e19d1c4ee7a7146896e55eaddfa3fe00bb4e4b10dca09f
-EBUILD wine-1.0_rc3.ebuild 3858 RMD160 3e456a68e0dc5c9e1d127fe436a35e408b075fde SHA1 1eb404c3b5a7fd7a894a7e8071ef5580c2d487b3 SHA256 c89a0b5c19da1c257c461660805522408e826b53a92d833b23fc1aecddb6bd8c
-EBUILD wine-1.0_rc4.ebuild 3809 RMD160 9394a2982c7f0a7a548f1df79856d5190dd384af SHA1 40ab24a3123c94c93465064a25a97a2a152e22f9 SHA256 108dd4f2f337280d5ede27819ec0265ebed258e478c6084aad1d5334b129ebe9
-EBUILD wine-1.0_rc5.ebuild 3809 RMD160 fd5f274d82ff2da9695122f133ece97c29b01719 SHA1 ae441b57ec9cf1d2d9c6c6fec4cc7f3acf38ae7c SHA256 51d3a9c196fee177d92505a7c97e823a250891c84b8d1c622eb8f71220952ee1
 EBUILD wine-1.1.0.ebuild 3807 RMD160 15c7fde5f38ce41aae723c7f9c225c1e04fa96d7 SHA1 3a5407aeab57bc4dab89c6acfe5065dd63ace429 SHA256 f48ee3665b879e966b4f05949f31d2b4626ec28c024d2364746ccfc4a8e63a7c
 EBUILD wine-1.1.1.ebuild 3807 RMD160 378f4505c0abbb21118f7658fd0979b4de0b6a56 SHA1 36215fd285b092f4325f3f5de6828c79c54d05f6 SHA256 b09300ccbf2564abf6378bb1d1709cb77e12d64b4b8ab1497d449fa62dc0db3d
 EBUILD wine-1.1.10.ebuild 3840 RMD160 d9c4d0224a73ee023d7132ed0d21a1acd953387c SHA1 468e77e5dc0d0f6c1350052adec7879dd6a050b2 SHA256 832c387b33decdb57aeb374d59afc57bb2d02d2364e28539bec78709cf7d5712
 EBUILD wine-1.1.11.ebuild 3840 RMD160 7bbe7a6a827c5fd30dc739b64bf12c523eb43bde SHA1 59d0cf686ac80bbb97790847afa5afc628b90bf0 SHA256 f4614585a26eaafbfba53563fb5aa8a13569a46c7d50df81f9da0c987c227168
 EBUILD wine-1.1.12.ebuild 3855 RMD160 022d03664c4e022cdd2268963bb76f297c80f8d9 SHA1 b132229fb277422164576a8a90785aa1062f90ed SHA256 164d8266b924f2537c79d5765224128f3ceb87980fb9baad0d3a56da6b31b15d
-EBUILD wine-1.1.13.ebuild 3365 RMD160 d12feab6721833ab2e53bb9eac59085c0e2dae88 SHA1 f18f0b2e73c7749f6208b345b5d38d2e0dcecf0c SHA256 3e5112452d5894fc4c63be15884bd25194e7976bfe985782ffa02dd9ec2e6144
-EBUILD wine-1.1.14.ebuild 3364 RMD160 8de860403d610429d50e188c200a81f290d5d168 SHA1 fb94195034b80c7ec0b07efe920cb9a43ddea87c SHA256 6666b66ff82da8a935713458597fec37715d58435d92b514c94e4ddaafa2b614
-EBUILD wine-1.1.15.ebuild 3484 RMD160 656617e06c3bec12c2b94292cda34ee6432958af SHA1 2fc1f56669edb2ad49139623800f94d63d5a2b76 SHA256 3ae2a3eeca8df85a29f96386e7db1a2d828037d41ac0b18c2e9cd5c1bff24984
-EBUILD wine-1.1.16.ebuild 3428 RMD160 18ead84b31edb861e43daef206849d9af3f22634 SHA1 812742f7a11c3cd35ccc3cbf958e0f42abc8e497 SHA256 7d7624f63d7a225a2bfde2a6a00921dcc6525f4fe7d8d6958796c6d58a511c3e
-EBUILD wine-1.1.17.ebuild 3428 RMD160 f3b560af7cccebe07971973aab681816f08e673e SHA1 ecc542c06374c057403781a2d1c770f88bf2dc25 SHA256 ab89a1f98934190c35b1df1f66a037f610ab61365a3fe03c197a1e11c23fc936
-EBUILD wine-1.1.18.ebuild 3428 RMD160 dfb7907fc0876d0b7f68b707629f7c5bbd92d7e2 SHA1 fd2006a6466bfbdaae511fb348d4a5173c5a3f99 SHA256 d00f10b39f3114785e8c437e66a7e1093ea0dad28fcbac0bedb245772f6a9ad1
-EBUILD wine-1.1.19.ebuild 3428 RMD160 b08c5110a59171f0f30e2187d6ebb9acccf7dee0 SHA1 37d6f2314bdfc8877454cb61dfbe05d59e3a91f1 SHA256 fb80cf14b83f61cdcfa0e94d34d4ec8bc098fb51d95bee10877453946880f1a1
+EBUILD wine-1.1.13.ebuild 3376 RMD160 58a673aa2abff7ad973d896ca92ff555aafc25d4 SHA1 4290ed5ff5f61b2fa8c813b48222d918941a122c SHA256 e4dec01922b58d66c76421bec4a277b04607ef598bb5771ae072ec3f5a7d524f
+EBUILD wine-1.1.14.ebuild 3375 RMD160 8f7acaa411e2b8aa7d3d490454720b79578da8ef SHA1 d2f5401a1b0ed46566ed0d9e30d87f9974852351 SHA256 6794891c7fe0abdd5b07ca32857ec6d38141ec228907a166032b715ff8445795
+EBUILD wine-1.1.15.ebuild 3495 RMD160 2be4f1c0b9d2f3d50f51081bc7059b1067c495f1 SHA1 72e8b2100d5dc7f20a94cc4f0e3852ec20808eab SHA256 4a84c9c0cef50f560e5bb15b3067993d096df7745bb68e4a1d08d27df41ddc27
+EBUILD wine-1.1.16.ebuild 3439 RMD160 f48980ff9140fb6ebf315cf0bf4b6762a590de18 SHA1 801f8e0cebc77d9fb51c95206198b19bcfac2bc4 SHA256 aefa78dd452e2c53140579e772ee37a6f4df269701222aa38b412ae65df07b93
+EBUILD wine-1.1.17.ebuild 3439 RMD160 4bacf3da86a21875d328d7dcbe23d754d862bacf SHA1 c220236901d3f2eba18ecc0f0c6529b3820f057c SHA256 46821d5c721a1f4d8f612223983899e8bf51dd3a5796c13c310a42a217ee0fa9
+EBUILD wine-1.1.18.ebuild 3439 RMD160 bcff9480ced560d550423296019db8b24ffbc3dd SHA1 e346a4d74997411a2c2de1a77236349bb9f20b8f SHA256 7c95a09d148db522bbc43e8e126af6fbc10e6db5b363018b381411c51582d192
+EBUILD wine-1.1.19.ebuild 3439 RMD160 73816bec54d11cea07088ef9f7e0d9eb8fef55e2 SHA1 431045029d041b7f4955c7a34d6b6fdf6a30cbc9 SHA256 43a784393e16f409caea6a665c9bcb24443ec306e3343580f6fcf5b607836766
 EBUILD wine-1.1.2.ebuild 3807 RMD160 386c3292a0952a7a80457033286b0ef1f588ee63 SHA1 c076cb27557f1c0bc3c42cda2d95bc8ae11a0af0 SHA256 84f34447782b2ea92527c8ae43c9e728f8df747d8ece12955e091acb25027730
-EBUILD wine-1.1.20.ebuild 3428 RMD160 62ac6dc60794646af9466e907bed61e0ba78b2a2 SHA1 8cb82a6e9304237a9f0fdadd1cc817b4bc0f2c52 SHA256 2589e5ccacb24520f7107314f25d00ffbf84f873f183019a0956c2137da04878
-EBUILD wine-1.1.21.ebuild 3428 RMD160 17f6a162f47fb9ece6242a6a5e7729a704a766bd SHA1 68ef0eaeb237b5d3501f294e200a069d5132881e SHA256 62f1a3d2d65cea17994f5118380d40318f8b4c28c8831c858263a12b6f8ff876
+EBUILD wine-1.1.20.ebuild 3439 RMD160 c2faf428bb2f79088bd2cf5ecfa28b136034d1d4 SHA1 ea0089f24dddbad0ceef438b0c91646c443ab58b SHA256 893703b83e6980996db678565f7df581badca78ed322169156724b5291001059
+EBUILD wine-1.1.21.ebuild 3439 RMD160 54bd8056b35247a607f2094a5d3efb36fa26c76b SHA1 01f1e20742ce7d78930e4df792002d6b855bd5cf SHA256 2dcccbef4651d9db5c392ac351f999798bc95f475a33e809f7f76d6b02946d56
 EBUILD wine-1.1.3.ebuild 3807 RMD160 5bf8e7935e486e084124e146282703aa451fcadf SHA1 ac555b2294f86b51d90856d9f76fa86ed7034ec7 SHA256 5fa97d0b2a68196a3af55d293737198079c2863491ea25e6b01d0741506effbe
 EBUILD wine-1.1.4.ebuild 3833 RMD160 e0b7f6a001950cde3fd31fb18b6791aeb988fae7 SHA1 fef583fc9af5ef8a497211571b1b887d36010bc9 SHA256 7089b96fe8aa35787551688853b821be1106bc6a76745ae1b27a36e7d89b5512
 EBUILD wine-1.1.5.ebuild 3780 RMD160 d375108fd25c262aed00dcd73104ed940d310b41 SHA1 c554aece023a52e915a8169d3007f91d9bd4f163 SHA256 4dc3b64e845c03cdce3eab18e2ab617269708ddcf0a443f7ca4a06aa0868f809
@@ -72,13 +58,13 @@ EBUILD wine-1.1.6.ebuild 3816 RMD160 1b848581b69034aa3ff99c17419132d8c88bf02b SH
 EBUILD wine-1.1.7.ebuild 3839 RMD160 89806ca181642c43685805204a668fbf63d66b05 SHA1 9b8d8dc4b95a94db3946c6b4273f351264b4908d SHA256 e3fd3dad8ce513a4e0b08abb780cc6531e22b298d40c6525406353c2b76efdf9
 EBUILD wine-1.1.8.ebuild 3839 RMD160 e21be90b14430cde7cf15f0d8a50c7651e690378 SHA1 c7f508382e749290f752ccd357577a0f2511845d SHA256 9fb7de165a7dc8a84d6aaef20cd537a4ff1d7a2cd2583e9f9a62f6610377cbb5
 EBUILD wine-1.1.9.ebuild 3839 RMD160 eabc031df57ad0e9d33f616b6f5f7ee116a08eed SHA1 f4cd75385acdacbf0e47e2dc75f0bf06efc66480 SHA256 c667e6a433d115935428f05d67f4d7029953549fa724e05a4145f835f49328c1
-EBUILD wine-9999.ebuild 3363 RMD160 2e92f110e129db84e3f6a8d251560a0ba8ce14d8 SHA1 502d46077c4eba7eea35ef54a6466e3b7a34031c SHA256 aac1c098d25d4f4b3178c16fda444626046655b8b1e18ef755a50419d90417a5
-MISC ChangeLog 45558 RMD160 aad9ba28a5ee7a8a3e946925f4cd49f533616470 SHA1 9df758d50ff4701ce191f1ca4da4952a70e0a19f SHA256 a481cb8139202d5dbece97f4b00c715413c3195fecace0d92c6d133144bb03c1
+EBUILD wine-9999.ebuild 3374 RMD160 9a8ff94049707b62a611bdd4acf4a85c47457ff9 SHA1 150a327798ee2c125c64cf27d5ffa16ce4da9522 SHA256 cc47305ae5a35e7608a60ec1c4c6ff2055d55d605904f00e140ab0c0f135b625
+MISC ChangeLog 45887 RMD160 99ac81dc557c0d96214271e61298d24d44c8e0a4 SHA1 bbfd362846eb6553b03d804cd569eac5b9066cbd SHA256 7da9d176bac5b659c2b7912509fa3657c3e34067b396032044832c4b845d0c0c
 MISC metadata.xml 1123 RMD160 168b7d83724ac65a23a10ad8bbe04d4dee180f6f SHA1 f8bb8f4eb1e4dab230f9f8d8b87fe04c6e638334 SHA256 eeee6aabb900286b05e81427597d143fb5fe74cc9b503d58464abd2534eaa569
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoEmnoACgkQn/5bYzqsSmHZBgCfYEuq4Euico61/cyNH9kb2oWC
-huwAoLvV7fb+fgkLahUrV2EvPmclurG1
-=xBmI
+iEYEARECAAYFAkoO5REACgkQn/5bYzqsSmHwkACfUN7stwY5WCc/o9OclW3A4VqS
+8IcAnjQm42aAxHIVVjdWY01Kf8F4oHIX
+=KXF4
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.1.13.ebuild b/app-emulation/wine/wine-1.1.13.ebuild
index 0e4d3d8b09d9..f579b82134ba 100644
--- a/app-emulation/wine/wine-1.1.13.ebuild
+++ b/app-emulation/wine/wine-1.1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.13.ebuild,v 1.10 2009/05/08 20:47:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.13.ebuild,v 1.11 2009/05/16 16:08:42 vapier Exp $
 
 EAPI="2"
 
@@ -60,14 +60,14 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ssl? ( dev-libs/openssl )
 	png? ( media-libs/libpng )
 	win64? ( >=sys-devel/gcc-4.4.0 )
-	amd64? (
+	win64? ( amd64? (
 		X? (
 			>=app-emulation/emul-linux-x86-xlibs-2.1
 			>=app-emulation/emul-linux-x86-soundlibs-2.1
 		)
 		app-emulation/emul-linux-x86-baselibs
 		>=sys-kernel/linux-headers-2.6
-	)"
+	) )"
 DEPEND="${RDEPEND}
 	X? (
 		x11-proto/inputproto
diff --git a/app-emulation/wine/wine-1.1.14.ebuild b/app-emulation/wine/wine-1.1.14.ebuild
index 26d3347c6046..64af8c541fc1 100644
--- a/app-emulation/wine/wine-1.1.14.ebuild
+++ b/app-emulation/wine/wine-1.1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.14.ebuild,v 1.5 2009/05/08 20:47:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.14.ebuild,v 1.6 2009/05/16 16:08:42 vapier Exp $
 
 EAPI="2"
 
@@ -60,14 +60,14 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ssl? ( dev-libs/openssl )
 	png? ( media-libs/libpng )
 	win64? ( >=sys-devel/gcc-4.4.0 )
-	amd64? (
+	win64? ( amd64? (
 		X? (
 			>=app-emulation/emul-linux-x86-xlibs-2.1
 			>=app-emulation/emul-linux-x86-soundlibs-2.1
 		)
 		app-emulation/emul-linux-x86-baselibs
 		>=sys-kernel/linux-headers-2.6
-	)"
+	) )"
 DEPEND="${RDEPEND}
 	X? (
 		x11-proto/inputproto
diff --git a/app-emulation/wine/wine-1.1.15.ebuild b/app-emulation/wine/wine-1.1.15.ebuild
index de83103517a5..17c07bec6197 100644
--- a/app-emulation/wine/wine-1.1.15.ebuild
+++ b/app-emulation/wine/wine-1.1.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.15.ebuild,v 1.7 2009/05/08 20:47:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.15.ebuild,v 1.8 2009/05/16 16:08:42 vapier Exp $
 
 EAPI="2"
 
@@ -60,14 +60,14 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ssl? ( dev-libs/openssl )
 	png? ( media-libs/libpng )
 	win64? ( >=sys-devel/gcc-4.4.0 )
-	amd64? (
+	win64? ( amd64? (
 		X? (
 			>=app-emulation/emul-linux-x86-xlibs-2.1
 			>=app-emulation/emul-linux-x86-soundlibs-2.1
 		)
 		app-emulation/emul-linux-x86-baselibs
 		>=sys-kernel/linux-headers-2.6
-	)"
+	) )"
 DEPEND="${RDEPEND}
 	X? (
 		x11-proto/inputproto
diff --git a/app-emulation/wine/wine-1.1.16.ebuild b/app-emulation/wine/wine-1.1.16.ebuild
index b3659c085483..5d90956ed109 100644
--- a/app-emulation/wine/wine-1.1.16.ebuild
+++ b/app-emulation/wine/wine-1.1.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.16.ebuild,v 1.6 2009/05/08 20:47:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.16.ebuild,v 1.7 2009/05/16 16:08:42 vapier Exp $
 
 EAPI="2"
 
@@ -60,14 +60,14 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ssl? ( dev-libs/openssl )
 	png? ( media-libs/libpng )
 	win64? ( >=sys-devel/gcc-4.4.0 )
-	amd64? (
+	win64? ( amd64? (
 		X? (
 			>=app-emulation/emul-linux-x86-xlibs-2.1
 			>=app-emulation/emul-linux-x86-soundlibs-2.1
 		)
 		app-emulation/emul-linux-x86-baselibs
 		>=sys-kernel/linux-headers-2.6
-	)"
+	) )"
 DEPEND="${RDEPEND}
 	X? (
 		x11-proto/inputproto
diff --git a/app-emulation/wine/wine-1.1.17.ebuild b/app-emulation/wine/wine-1.1.17.ebuild
index 712be0d45a09..178b937e0ab3 100644
--- a/app-emulation/wine/wine-1.1.17.ebuild
+++ b/app-emulation/wine/wine-1.1.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.17.ebuild,v 1.3 2009/05/08 20:47:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.17.ebuild,v 1.4 2009/05/16 16:08:42 vapier Exp $
 
 EAPI="2"
 
@@ -60,14 +60,14 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ssl? ( dev-libs/openssl )
 	png? ( media-libs/libpng )
 	win64? ( >=sys-devel/gcc-4.4.0 )
-	amd64? (
+	win64? ( amd64? (
 		X? (
 			>=app-emulation/emul-linux-x86-xlibs-2.1
 			>=app-emulation/emul-linux-x86-soundlibs-2.1
 		)
 		app-emulation/emul-linux-x86-baselibs
 		>=sys-kernel/linux-headers-2.6
-	)"
+	) )"
 DEPEND="${RDEPEND}
 	X? (
 		x11-proto/inputproto
diff --git a/app-emulation/wine/wine-1.1.18.ebuild b/app-emulation/wine/wine-1.1.18.ebuild
index 46bc1e6a5bdb..cb65da65106b 100644
--- a/app-emulation/wine/wine-1.1.18.ebuild
+++ b/app-emulation/wine/wine-1.1.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.18.ebuild,v 1.3 2009/05/08 20:47:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.18.ebuild,v 1.4 2009/05/16 16:08:42 vapier Exp $
 
 EAPI="2"
 
@@ -60,14 +60,14 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ssl? ( dev-libs/openssl )
 	png? ( media-libs/libpng )
 	win64? ( >=sys-devel/gcc-4.4.0 )
-	amd64? (
+	win64? ( amd64? (
 		X? (
 			>=app-emulation/emul-linux-x86-xlibs-2.1
 			>=app-emulation/emul-linux-x86-soundlibs-2.1
 		)
 		app-emulation/emul-linux-x86-baselibs
 		>=sys-kernel/linux-headers-2.6
-	)"
+	) )"
 DEPEND="${RDEPEND}
 	X? (
 		x11-proto/inputproto
diff --git a/app-emulation/wine/wine-1.1.19.ebuild b/app-emulation/wine/wine-1.1.19.ebuild
index 53ca7621d027..e9cad0a451f8 100644
--- a/app-emulation/wine/wine-1.1.19.ebuild
+++ b/app-emulation/wine/wine-1.1.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.19.ebuild,v 1.3 2009/05/08 20:47:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.19.ebuild,v 1.4 2009/05/16 16:08:42 vapier Exp $
 
 EAPI="2"
 
@@ -60,14 +60,14 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ssl? ( dev-libs/openssl )
 	png? ( media-libs/libpng )
 	win64? ( >=sys-devel/gcc-4.4.0 )
-	amd64? (
+	win64? ( amd64? (
 		X? (
 			>=app-emulation/emul-linux-x86-xlibs-2.1
 			>=app-emulation/emul-linux-x86-soundlibs-2.1
 		)
 		app-emulation/emul-linux-x86-baselibs
 		>=sys-kernel/linux-headers-2.6
-	)"
+	) )"
 DEPEND="${RDEPEND}
 	X? (
 		x11-proto/inputproto
diff --git a/app-emulation/wine/wine-1.1.20.ebuild b/app-emulation/wine/wine-1.1.20.ebuild
index 1a61e7fca46c..87558d7e151f 100644
--- a/app-emulation/wine/wine-1.1.20.ebuild
+++ b/app-emulation/wine/wine-1.1.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.20.ebuild,v 1.3 2009/05/08 20:47:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.20.ebuild,v 1.4 2009/05/16 16:08:42 vapier Exp $
 
 EAPI="2"
 
@@ -60,14 +60,14 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ssl? ( dev-libs/openssl )
 	png? ( media-libs/libpng )
 	win64? ( >=sys-devel/gcc-4.4.0 )
-	amd64? (
+	win64? ( amd64? (
 		X? (
 			>=app-emulation/emul-linux-x86-xlibs-2.1
 			>=app-emulation/emul-linux-x86-soundlibs-2.1
 		)
 		app-emulation/emul-linux-x86-baselibs
 		>=sys-kernel/linux-headers-2.6
-	)"
+	) )"
 DEPEND="${RDEPEND}
 	X? (
 		x11-proto/inputproto
diff --git a/app-emulation/wine/wine-1.1.21.ebuild b/app-emulation/wine/wine-1.1.21.ebuild
index 1738d307e4ae..3606c21ec4cd 100644
--- a/app-emulation/wine/wine-1.1.21.ebuild
+++ b/app-emulation/wine/wine-1.1.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.21.ebuild,v 1.2 2009/05/08 20:47:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.21.ebuild,v 1.3 2009/05/16 16:08:42 vapier Exp $
 
 EAPI="2"
 
@@ -60,14 +60,14 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ssl? ( dev-libs/openssl )
 	png? ( media-libs/libpng )
 	win64? ( >=sys-devel/gcc-4.4.0 )
-	amd64? (
+	win64? ( amd64? (
 		X? (
 			>=app-emulation/emul-linux-x86-xlibs-2.1
 			>=app-emulation/emul-linux-x86-soundlibs-2.1
 		)
 		app-emulation/emul-linux-x86-baselibs
 		>=sys-kernel/linux-headers-2.6
-	)"
+	) )"
 DEPEND="${RDEPEND}
 	X? (
 		x11-proto/inputproto
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 3a41ef5fa6a4..a3ff783e15e1 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.36 2009/05/08 20:47:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.37 2009/05/16 16:08:42 vapier Exp $
 
 EAPI="2"
 
@@ -60,14 +60,14 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ssl? ( dev-libs/openssl )
 	png? ( media-libs/libpng )
 	win64? ( >=sys-devel/gcc-4.4.0 )
-	amd64? (
+	win64? ( amd64? (
 		X? (
 			>=app-emulation/emul-linux-x86-xlibs-2.1
 			>=app-emulation/emul-linux-x86-soundlibs-2.1
 		)
 		app-emulation/emul-linux-x86-baselibs
 		>=sys-kernel/linux-headers-2.6
-	)"
+	) )"
 DEPEND="${RDEPEND}
 	X? (
 		x11-proto/inputproto