Avoid crossdev's i686-pc-linux-gnu-pkg-config when building wine32 on amd64 (bug #472038, thanks to Dmitry Derevyanko). Update live ebuild's patches.

Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

11 files changed, 61 insertions, 29 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 6752d62ae2e2..7689035a375a 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.465 2013/06/11 04:12:24 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.466 2013/06/12 03:41:43 tetromino Exp $
+
+  12 Jun 2013; Alexandre Rostovtsev <tetromino@gentoo.org> wine-1.5.25.ebuild,
+  wine-1.5.26.ebuild, wine-1.5.27.ebuild, wine-1.5.28.ebuild,
+  wine-1.5.29.ebuild, wine-1.5.30.ebuild, wine-1.5.31.ebuild,
+  wine-1.6_rc1.ebuild, wine-9999.ebuild:
+  Avoid crossdev's i686-pc-linux-gnu-pkg-config when building wine32 on amd64
+  (bug #472038, thanks to Dmitry Derevyanko). Update live ebuild's patches.
 
 *wine-1.6_rc1 (11 Jun 2013)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 55134c8a52de..95639cc487ab 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -106,33 +106,33 @@ EBUILD wine-1.5.21.ebuild 8067 SHA256 df765ad105dd45b920578df470f279f6458cf4f890
 EBUILD wine-1.5.22.ebuild 8067 SHA256 c1e8741ea0351ec750777f4eaaf3ee64629ffdf821849b70995bcd8afb7cfd9b SHA512 c461060411b1c3d2bdbe9b3f4d31050845d45414d64760fac61eebe23b715a1f393b6f23c3076b9c6d5077dab3262ed83f1a803838125c50a52c5618ca65a18b WHIRLPOOL 8b633f0ff99a1e7e4e9cd8d5d6ac403cd95772dcc89e2d0692cef8ccfef2bb5714a4954ffffddbad3ab89f64540fb14b245816c6fba6ffff75182f1c28447f66
 EBUILD wine-1.5.23-r1.ebuild 8161 SHA256 faab900381aa485011ac2d09b2a93fbf669750d43d8cd768014f6e8f06958247 SHA512 996c8e5fc5677c1628aef2b65a106347c6f29da2bfc4dda8e3b5158895af92c3bc59d5bc72068ff059dee03a6b1c4925065d8eaa5b4a2ed1786e356ca6e3b738 WHIRLPOOL 7769955d219240c3da8be85a9ce24bfa9c63a85d82827ee6521cf13d20651006dd7cfcbb0ac35a55b43247b5cd2e1c5275195f4488684eae28d09e7beb28e337
 EBUILD wine-1.5.24.ebuild 8158 SHA256 554cbf69aea2116db721fad15b25f3051791681b4cd58707d2bec1a581ad938c SHA512 7b0a1c9a124d57d3cb4e46500d7a32c3a4d9fc6d70254148f492859d5385daf41047bac5f93e68f04248d17d6a2d14e1472f39872c076e3320a15a749975f488 WHIRLPOOL c2a098543d72fdd9c8fb85bd8e96347201318c292fc3f6011273719d4d654a14b31371cab8cef1582c263d275ae238e5706333aff076666c1c9b67d324d781a7
-EBUILD wine-1.5.25.ebuild 8857 SHA256 8c882560bd9a4d002eeb513f9495f4e7048662266f1aa4628cf726a73f9fbcf7 SHA512 5c9a9dc77b675308c1a11249b567dee0b9b39e710e77a8b4775520e66042d93284327de0d5afda56ede7b026621810fb4b866195ca8ec6a235fb2b1a06e8741e WHIRLPOOL 9fe84bf5ac2537bcddb0425d47c644ced0d7eca9dcaacf88ad326635815f976c76b9301d5428fad5d8d6d9ae70940ba1766bb23fd902540fbc27c790ee0ca1cc
-EBUILD wine-1.5.26.ebuild 8857 SHA256 603eec49df7c2f4c1ac9c2694ccf03fb1a585d3800b3b0134efee0afcb060274 SHA512 97a358f28c69eb82f9b2094df7483215ccd2991209abc9136784747c34fe4b405d775c43757bc55cb8369a94eedd19436a2625a4d2c9b09d25cd17589401537d WHIRLPOOL c122b67f2ee8364a86353d1e271690cacdd61021269d35924021996fa98881270023d25b70fdd91c395b1b2d5f1b65ade688a7fc09404649f220e01bc99200a9
-EBUILD wine-1.5.27.ebuild 8857 SHA256 b4295c025abf7a6881833cfadba2a460c01473f5d433d08415970735083ea7cd SHA512 b28fd68ccb36c2a574eb0ab42d52242a44df189ce1c2d0fc01ba2e2fd6c0a382030fde1fb205558afc4d39deb726e62547724044ab9d90c4352ff46c0233f48b WHIRLPOOL 1b5e2b64b8c0fc6ad5dd2ef6669079dfbac4af6c0b6d3873987187cac97532bfeb94a3c7aa94d09c2bfb51b2483bc367462e701afcb06550f3d77c32e7c7ec00
-EBUILD wine-1.5.28.ebuild 8807 SHA256 0f8300781431d1f414d2b29d846ead339cf88d8f6c9c698dc173ecb580683eee SHA512 511a38dcfbe58b45a59f96c958cbd17e58bbb4a6b4934a1a1e002f585e220935777f7726821b19853fecee1a1fb8eeafe7de0707cb27c9589f1c127b785482a0 WHIRLPOOL 41683521d7aa0aafc9623073eaf9dea7eece8454134c125cd9e09719a1eeea4392071b9d8a632eac260417282090e1e2976af398a9c359c9865e5f529e5f733c
-EBUILD wine-1.5.29.ebuild 8807 SHA256 972953db6a2d1f0e38dba175b40bd0d6027a8a98a2906f755030f3ea507203f1 SHA512 5601ae09e12efa0af6ebc8d87ab853814240e180523720798b144793c15d01b5ef2fe767238164913c94d3813e7834f05269cdda3db7db796555f2eb9069635d WHIRLPOOL d43a01661f367da1491ec2b3b8f4ef0911c013dbf645bed782bf02a8dbf5d8aa487312058054784d17c8f0e8df752246840480b43ac7005b073602d2026f71cf
+EBUILD wine-1.5.25.ebuild 8997 SHA256 d756cc6fb36f1fe6778260d3b8df9d88cf14ca6cea38b0287e42da4d3da9cc8f SHA512 bcb61592a2eb371159d5b4f9092e33f420cb7ef721e2baad46d2f573c65ea8e954959810a4aa39599082fb88b9da432ba942fee7b283becae32659fb27860551 WHIRLPOOL a046cc1da41123f80bb6078b3a1b06e443919da69af523fb44a1f53244cd2c1bac5262325a12d8b365909cbab32c2d190d8037fdc57ea7b0e548bf7531ae8998
+EBUILD wine-1.5.26.ebuild 8997 SHA256 208147aeb2b6a046edbd6700a585907dae13578fc8ee19a409947f4c353a5e57 SHA512 9de6ce90919a7e3f6c48394e450658ef97d314de0a66f3eea3eefd1d4bf3db8d56eac3279e1ae3deb8637b5ccc974de5be526a31a211a475bc7d2b1744092c09 WHIRLPOOL f757a41395507fd02c7f250c6f9ea2c167bde6d89cdd11bd43b0f2a2847d2543aef679270e3d0dfcd8267cf954f98163b9dfb426f1334bf4a76c44ec0f887e19
+EBUILD wine-1.5.27.ebuild 8997 SHA256 daa10a82f8acc72789915a71bdeaf1c1e75ccc590a722bb6c0433e6ac2b3cb08 SHA512 1d5d0df213e4ad67b900b8641e6eb8becea93ded3a26ed3db44806db5b5ce673a8f9632ca7d466a3281385ace16d2f63c7d43550456efc62c41f1167cf9e1c71 WHIRLPOOL 20cb0819b3855e73192423b242f4fa2a36350b560cf4639efa1ccc7d9e7836b0c8fe0f22d8ab50cc8f3acda9d0d9fa838c3815e60482bc8867daa409cae1659b
+EBUILD wine-1.5.28.ebuild 8947 SHA256 d071b9e6c6ca2c56fe6c4f19075f4c76ccc6705e20169f508e6d4b90a563e0be SHA512 90c34bddcfa58604236ce9947386e0da80e325923553b45f17cd3e02625d4fc3dd52b9452eb268c567df1ee8288ca019f95c0a784a3ae9e2a339684b42eb0ddb WHIRLPOOL 2e447b14306e18c43b73b5fa6226707f2731c27cf73a5408762c729a143b12f825f56fbe09cf61ffc52413af0cf35b1a37685f11d11bcd82105d7e1907373e51
+EBUILD wine-1.5.29.ebuild 8947 SHA256 e2441294a4a2ef9de34527eeec7a37572f6561398da81d340c3f324d031acd2f SHA512 c21fb92ec38b3df607aa6b7867ee72712f09f03f9b64311127c50e085a108efed58adc8c4cf6934a764e90e43cea82cd2d6311ba95d37f828936275ec35bbd33 WHIRLPOOL 43649a076e13a4a9c912b2b16c845ee11b3d7a166695fbf632d04c3d1c930cd9646b933d7d644fb4d61a264e9614f5a1ddc0be8d09ac04210b68befa02b5f361
 EBUILD wine-1.5.3.ebuild 6472 SHA256 a30de3a10bffde82ec8dbeb8e672bce3f856eaed01929ba96fb4b349b90b881e SHA512 c15a15bcafdd17781afde71b23ea2702fcbb59955d774c208a2d72f9850698c416a363dd87e8b4e61e54961b7d8eb1ab68bbc7a4b7f85ddc9e53733cb35111c5 WHIRLPOOL 3768fba372eb40db0f777e1e37ef48882b04be70566c93a0ec9b3fde0e8200f38a3fcfe8e434c2231635beab1b33a928b3c27686d7a7c3cde36c1b1b11b503f7
-EBUILD wine-1.5.30.ebuild 9457 SHA256 b03f94f44b1f7536444c9f9d1eb2adc5bd9ca8798200f61fdf949dc00580bd57 SHA512 222a7a1a3bc601cc2dfb1ec5d47ab3ca6adfd6c0c41eeba80f3d3f3d616525acc4c2a10e8bf242d5ec3a48b452ca9f212397c79cf4a45c202280781a523582a1 WHIRLPOOL 294bb1dd38aba7e7811ba973a46c244e25fd22e07af0a9bfd16934189787814b271ddc9d644938041c8fa4cb66f34d8e868b6400d4822dea6948130a4193974c
-EBUILD wine-1.5.31.ebuild 9369 SHA256 0c27916d62b0dd841dfc2269238f2da9fe906b33907a2f5497f764a1cfa5a7f0 SHA512 d878e2f4c4f7c6a7d85e2659df557a74889f6c968e4cdf1a241f5a93123553b3b0ac2efec75c4adb9ee1c391e02558506747ee33e3bba0ac12f2719d82ad560f WHIRLPOOL 9efedd557116ea0d6186e96636d0602f53fd76ee1efa5ff6eac747a7891fcee4f3c024021b767b1f5caa306fe9688968bb88e108f8e2c6a9007abc265769b112
+EBUILD wine-1.5.30.ebuild 9597 SHA256 40f4a0635096fbd8a3ba2785b25e4c15b56daf3d285ff21867667ea2cfcc9c08 SHA512 c0211aa20bc3b1a6e1fdf9a879a7d4f655e0c923f840cee890bd9554c6fb5bc243c55a7a95b38557ddacaef747f14867a9a61d53bebc2d9a65dc94e6646c8a8f WHIRLPOOL cf4686aa9737dd09f3ecc83cbb196a9740eaac7c3baba853dedaf47656208d0c63dce2d211d0d3b71b95bc7e17fa2bec1876da8cb4ec1f5338f5b00e64814f94
+EBUILD wine-1.5.31.ebuild 9509 SHA256 77b2b7c765bbd27ba93d0a9e23d25df1152b80f00ebe0ae3cf91610b17377bd6 SHA512 fd0f21cbca7fdf22345223059bdf27d930c46cddab267cd01b4f6e3651e4da359032fa8cc0f42691f64d181381c334d6e185d624b3f25d49489b400df7d9b27a WHIRLPOOL bffd914e27eef0ae4b483b042544bc6be3bcdacc7f2aed2952cc45934dc330f9242bd67c07dba69a708e01faa245ab058afb28b7d4f3bc839a0b6bea2b0f0f26
 EBUILD wine-1.5.4.ebuild 6472 SHA256 ed7909b53cc4c1834aad421902dd6510084d6ab0d634d444bb78f28f478ec43c SHA512 d840732b25ad02aae9af364a5384db3d6ea69d1bbc71ee48118558f0e127d48c4b90b2ca64ba6d49a2a87a3892547d20c4d85484cf7af5b394be807acf72ab5d WHIRLPOOL def73de0006d9647e8f62e004a29d6a930b5a7e5d4961d33cb10198d694d32652643b0b58301b569499052a1702368d09d46cb4420dfd8ccbd09a213d2c849c0
 EBUILD wine-1.5.5.ebuild 6415 SHA256 d247e6e7f72c925c847b37859e5a2b5fb74bcde5c662509d58248a6da8452631 SHA512 27c963d5f5f0f0b64d7b0689273fb9ef5067304468eb4ea865389562cbd3c8c9af4bb892bd6fc6d2c3fb5cf7502dab3410214ff8de274411338e3769949ba30f WHIRLPOOL d3944f8795a06b18db0ecec166f129c43e62390a7f588ec8eca50aa885191905636e55b1a587ce335b6842b8ed079428daf5440f1e18139f677200a1c819d76e
 EBUILD wine-1.5.6.ebuild 6691 SHA256 95e8af5853819ee4b4fa42ac1f272ba9e3255340dc75c2fa215d110d273d35a2 SHA512 c757e3cdaff40af8442dd84ae24b3df0c38bd2fbd2299d422749ae9d868af13a2bda6e3e179523654fe2709dab3e8208ec1c8e138a85338ed09115639e02b387 WHIRLPOOL 2e8634b5ef1dd0dbc1e992908610241ac6a1d0332985bd94b8e8b0d34774dca5995ca9460df0d2272ebc7ee09858c22a370c88f5240d160c9b1d29e2f1f94c74
 EBUILD wine-1.5.7.ebuild 6923 SHA256 08ac49eccdb16bbe11e246e01c449b4a46df3fba01e73c68ccd9aaaf703a767f SHA512 59d1e91d36b116dfcc0fd004efb7146193cca51976f40c5fceca8d99dedfbc560954104d7eb92257f3f75b744d3f9563cc2f5611ce6823ff0131f946388dd202 WHIRLPOOL bc1e10b8f16fd1f45fac6d6f426e658976e85365a91721bf95a90b22926f46e2a0873f296d6e7cf303b58227d08a8ccb1c9b05e5092261d36dddb3f0822f83cc
 EBUILD wine-1.5.8.ebuild 6923 SHA256 29f247c643c007c3d45f4e1700d622879f2805935b0c04c8331d8931a523be35 SHA512 e8b0e8df2f18bb3d736091d0f26f6509861244d028b2cf5c5fd6f6fc5071cdcdfa526f1f5f3af7c316926fc0ab5bee2ff7174b3714eb1d06c03a3778f3de33ff WHIRLPOOL 7867d477b5239a283d43ef7c401c34869c969d6aac66c450a627d8d19dfe7e874020823b1f41944dfe4819ab92db81cb137b3a914b101809849267a3779e0eb7
 EBUILD wine-1.5.9.ebuild 6923 SHA256 374268a106f968d93a5db63dcdb28b06a6682c30166b03835a18c8c5c70aead2 SHA512 ca61b5d254f015ca808dd665d4f6981090c1da004bc4f11cb5d1d6ea6f42b00763452a606346d1bfe9e60c35f9496bf4efc85ffd6a4cd4080cd7d515bb9d983b WHIRLPOOL e6453e640c3dbe82465e9232fc691b6f5c618f53d6d59794fd081a02112c384836e36551642e5b2430d5d2a7c5f715203b3e1f03667cfba458e96244ff9637e9
-EBUILD wine-1.6_rc1.ebuild 9467 SHA256 1ffbfae3d15bc7a110addc88f2e39c4fcd89104430c35e86a80f4ab62ffc60c9 SHA512 69fdf2bede64ee450fdb88dbfded7aa753c49f09bb37c21fcb596125fc343c6bed60ad917f1810440b412b7350f70e4c74c2e9980166e0c982856e6a031d84b3 WHIRLPOOL 35c605aee09199b4a62feb8b242a54a0f6c3905f5a0b513047fb42093316a95bae8c7940edde8f4d376f2002b461937061779d109c3e2783678cc2baf2955b05
-EBUILD wine-9999.ebuild 9466 SHA256 9b784c0688af06b07ca8e7bfb376c2fded589b657a8f39d381bdfc005444d260 SHA512 3f7798b5a38bfc09fd3ceee06153f2f4a9d37c103b150154e5f45ba59e2ea691ac1cd027d25dedbf2588df74341d5404c339e5dfc9fb81fda7b194655e26bdaf WHIRLPOOL 3c0461dd63b75534a6f306096403ae8dfb4da370315258c45510d58c35b04334f326681cfacaf2470c16e2a4250fcaf59be58f6fb43e0e0016c971adf15ac553
-MISC ChangeLog 7053 SHA256 ff729a93e121d42c34117c522c41d97733f6bfe36be89886da3b9f277d5d7c50 SHA512 c4d2126d9cac2f55e2f12b07f76940e7382ab7873f990581f716b6cc30b2b548caa2ed1a79c7ae9c865911bbb8992b8c05f086a4f9f7812b298679c5a3db9490 WHIRLPOOL 777b0504133aa64cf48ce8842005842b2b4e98200dcca2f8d2195804a2688ea8ada0c7785b9e291b4ea8391eb9cfc5019b4fa12e56b737888e4c86d0951f3e09
+EBUILD wine-1.6_rc1.ebuild 9607 SHA256 e6937391b4888a228026d698aee6b58d15c9cfd813828504bafda831cf80216d SHA512 2a6f00e2d4f2d8f40c2ffa59f1ee7a7c47625ffaf0db3b52d4544198c8c8984a2d2cfb48555cc05ac04ff89cdcaa1b01ba01b4326a5646e99aa22b55e6a5b332 WHIRLPOOL 2cce04c2a1ac73ea154257a0a2c95b43bd1fe754e575a98c41c5c44108cedb59de3e976ea223bf17365dfd6389735c1efb5fa928ae624dc6a9952d6d49e1c6e0
+EBUILD wine-9999.ebuild 9419 SHA256 e8fc2b055c397a12d3c0897153cce0d6af7fa7991fa72f8b1966c8dc75b435aa SHA512 5ecf4b4322bbf65ae3607b71f84c96a3829260e5917578123ff7f0ef371fbfd1e71408de8b52547656a4c0b1da940642cef20db7ccfc5417084a29bee2ce394e WHIRLPOOL 822f63b6cef6441facb9035778ddb383a1fa25a8e27262f71de85b472a0c4ad1b688ecaa367b90c76b60f5f8a45b944ef7f9eeb5c41384f37ca687adf58dbd45
+MISC ChangeLog 7452 SHA256 7f817fe7e7787cd8cfc5421922cf528e4eeb0e89a005c93965f0f8b6a6ce2a92 SHA512 04ede7630f11322d9bc7cee8a056d7bb1c0b01cb6e0d4e810e93bd1f48463586da4e25a407e95102598e31c0451834ff0b451eeffb6f7472729a61ddcd2b6a92 WHIRLPOOL 78264bb968aab773c263158da143a8a9a88281db0fb74b4d52b64a3391e8edf7355333eaac1e66a2ad169b6f729ccbeba5d5b19ff0a12e6553f0dddb1cfe9afc
 MISC ChangeLog-2012 100362 SHA256 8e70fc54e7945c1f41e3e0b64fef6b9a7fe89acdaf8c79a06a16048fe8d2e26c SHA512 ca875e847ba100e1f19774b31a2b45a81d776275e3d11944be8a7b01dfcdbf4265b1a340d691bc4fe4054fea006059a06ed52bc0516b1f8b44a1772a1c813278 WHIRLPOOL 36ec708601a25cb8fa93b471112538480b6ef82cc4e6703b3d045f883078b49209ceaeef7bafa8417b881c2d11df84df9c83d1985d0d687a11f3db3de5abb014
 MISC metadata.xml 1857 SHA256 8a16a223604fe47d86a35f79912e60aa419c467dd050ae21d96ea45d615f92ea SHA512 279a5169d2ab779ad41889f8d6b24e8d2de7bba3a611470d5d9cb6c5f27930d336de07bd2431ae9a0c9065887456c150fb2e3582201280945f8fb1520e0a3a3e WHIRLPOOL 1797da0945b3134c72ed15da155a26b24431f35051bc729edec9466a2db73a49a1919993a562e23c8315c362f10a43b3d26fd9fbec205518fadbf9b6324172d3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRtqOwAAoJEJ0WA1zPCt1hy3oH/16jiD33uHEwdDQBq9dI5y5a
-IggKBWcQ/tdlLN2LY1MofsEWHkOTDI36Sp3A1SQ2T0mJ/dwQ7bJR6NNjolhH3Ogv
-/inYCGMVSI9zZlzoM42KlXAWK4GEdGPhozleBYB5KOOUmk2MUfWvE/UA0y11aRdW
-xWCnfGH0BOGM+7d0gqvNtYxOjtPmvZ6tZQ7cbzci4NdkQMu4aBOAYVylNARPSh+c
-7gDYo34xYRq/ukQssAMb0D/s4Hhcp5WBPPToBSyH8gLCfh1O/hnFNlJdeUa6tsRR
-/arPJ3XiRqkO2MMWKP5iR+tFul30akoIBrYti24Y60sb/oPeuCyHFCQ5HfauQ7g=
-=ynFP
+iQEcBAEBCAAGBQJRt+36AAoJEJ0WA1zPCt1hHd4H/Ay4hbZBVQXjnepNTi/l4EVR
+gUMOOIp7bf+AyMr51HafjlUDHi/9Af1XIUHrS+Wt/vHUtI8UywvEXW9fg+JCB/Fu
+wKeKEZpcRExHOlis3LnJ46DJPuwhT7dJJyeS0VZ3muJEWk5f+jaRBMKpNt952jKK
+ywzJ7f+OgRxppKtmEAvGCJO8pgAPIriOS/CqZ9pOvNyffrqHnuDdzFL2hWDhnZIW
++ELm63hokBWyFvqOLuCYtkKBUcwOtH2/ni780p6uZIs5wMtvx4px0eL/4ZgPiKnI
+9qA/hDgPoVEyhKtrIeZLhg6AfzcDgAvOFMufBwCGSK64NRyLBUGVR0nPgI9YuL8=
+=neBn
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.5.25.ebuild b/app-emulation/wine/wine-1.5.25.ebuild
index ddfbb4197a53..130bd1bae4e5 100644
--- a/app-emulation/wine/wine-1.5.25.ebuild
+++ b/app-emulation/wine/wine-1.5.25.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/app-emulation/wine/wine-1.5.25.ebuild,v 1.4 2013/05/16 13:30:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.25.ebuild,v 1.5 2013/06/12 03:41:43 tetromino Exp $
 
 EAPI="5"
 
@@ -246,6 +246,9 @@ src_configure() {
 
 	[[ ${PV} == "9999" ]] || myeconfargs+=( $(use_with pulseaudio pulse) )
 
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	use amd64 && use abi_x86_32 && tc-export PKG_CONFIG
+
 	multilib_parallel_foreach_abi do_configure
 }
 
diff --git a/app-emulation/wine/wine-1.5.26.ebuild b/app-emulation/wine/wine-1.5.26.ebuild
index 72e9ff032df4..d5fb405f1411 100644
--- a/app-emulation/wine/wine-1.5.26.ebuild
+++ b/app-emulation/wine/wine-1.5.26.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/app-emulation/wine/wine-1.5.26.ebuild,v 1.2 2013/05/16 13:30:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.26.ebuild,v 1.3 2013/06/12 03:41:43 tetromino Exp $
 
 EAPI="5"
 
@@ -246,6 +246,9 @@ src_configure() {
 
 	[[ ${PV} == "9999" ]] || myeconfargs+=( $(use_with pulseaudio pulse) )
 
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	use amd64 && use abi_x86_32 && tc-export PKG_CONFIG
+
 	multilib_parallel_foreach_abi do_configure
 }
 
diff --git a/app-emulation/wine/wine-1.5.27.ebuild b/app-emulation/wine/wine-1.5.27.ebuild
index 3aca50bc4660..9387fbd9bbe1 100644
--- a/app-emulation/wine/wine-1.5.27.ebuild
+++ b/app-emulation/wine/wine-1.5.27.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/app-emulation/wine/wine-1.5.27.ebuild,v 1.2 2013/05/16 13:30:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.27.ebuild,v 1.3 2013/06/12 03:41:43 tetromino Exp $
 
 EAPI="5"
 
@@ -246,6 +246,9 @@ src_configure() {
 
 	[[ ${PV} == "9999" ]] || myeconfargs+=( $(use_with pulseaudio pulse) )
 
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	use amd64 && use abi_x86_32 && tc-export PKG_CONFIG
+
 	multilib_parallel_foreach_abi do_configure
 }
 
diff --git a/app-emulation/wine/wine-1.5.28.ebuild b/app-emulation/wine/wine-1.5.28.ebuild
index bab69b2c3560..2cb380a9919b 100644
--- a/app-emulation/wine/wine-1.5.28.ebuild
+++ b/app-emulation/wine/wine-1.5.28.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/app-emulation/wine/wine-1.5.28.ebuild,v 1.2 2013/05/16 13:30:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.28.ebuild,v 1.3 2013/06/12 03:41:43 tetromino Exp $
 
 EAPI="5"
 
@@ -243,6 +243,9 @@ src_configure() {
 
 	[[ ${PV} == "9999" ]] || myeconfargs+=( $(use_with pulseaudio pulse) )
 
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	use amd64 && use abi_x86_32 && tc-export PKG_CONFIG
+
 	multilib_parallel_foreach_abi do_configure
 }
 
diff --git a/app-emulation/wine/wine-1.5.29.ebuild b/app-emulation/wine/wine-1.5.29.ebuild
index 7728bba7faf2..af22b99d23ce 100644
--- a/app-emulation/wine/wine-1.5.29.ebuild
+++ b/app-emulation/wine/wine-1.5.29.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/app-emulation/wine/wine-1.5.29.ebuild,v 1.2 2013/05/16 13:30:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.29.ebuild,v 1.3 2013/06/12 03:41:43 tetromino Exp $
 
 EAPI="5"
 
@@ -243,6 +243,9 @@ src_configure() {
 
 	[[ ${PV} == "9999" ]] || myeconfargs+=( $(use_with pulseaudio pulse) )
 
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	use amd64 && use abi_x86_32 && tc-export PKG_CONFIG
+
 	multilib_parallel_foreach_abi do_configure
 }
 
diff --git a/app-emulation/wine/wine-1.5.30.ebuild b/app-emulation/wine/wine-1.5.30.ebuild
index 615fae7ecfde..26b3340ade01 100644
--- a/app-emulation/wine/wine-1.5.30.ebuild
+++ b/app-emulation/wine/wine-1.5.30.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/app-emulation/wine/wine-1.5.30.ebuild,v 1.3 2013/05/26 04:27:24 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.30.ebuild,v 1.4 2013/06/12 03:41:43 tetromino Exp $
 
 EAPI="5"
 
@@ -252,6 +252,9 @@ src_configure() {
 
 	[[ ${PV} == "9999" ]] || myeconfargs+=( $(use_with pulseaudio pulse) )
 
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	use amd64 && use abi_x86_32 && tc-export PKG_CONFIG
+
 	multilib_parallel_foreach_abi do_configure
 }
 
diff --git a/app-emulation/wine/wine-1.5.31.ebuild b/app-emulation/wine/wine-1.5.31.ebuild
index ed1ab6424f71..863882b83837 100644
--- a/app-emulation/wine/wine-1.5.31.ebuild
+++ b/app-emulation/wine/wine-1.5.31.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/app-emulation/wine/wine-1.5.31.ebuild,v 1.1 2013/05/26 04:27:24 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.31.ebuild,v 1.2 2013/06/12 03:41:43 tetromino Exp $
 
 EAPI="5"
 
@@ -251,6 +251,9 @@ src_configure() {
 
 	[[ ${PV} == "9999" ]] || myeconfargs+=( $(use_with pulseaudio pulse) )
 
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	use amd64 && use abi_x86_32 && tc-export PKG_CONFIG
+
 	multilib_parallel_foreach_abi do_configure
 }
 
diff --git a/app-emulation/wine/wine-1.6_rc1.ebuild b/app-emulation/wine/wine-1.6_rc1.ebuild
index 18b7706eec62..01ef8aae85b1 100644
--- a/app-emulation/wine/wine-1.6_rc1.ebuild
+++ b/app-emulation/wine/wine-1.6_rc1.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/app-emulation/wine/wine-1.6_rc1.ebuild,v 1.1 2013/06/11 04:12:24 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6_rc1.ebuild,v 1.2 2013/06/12 03:41:43 tetromino Exp $
 
 EAPI="5"
 
@@ -252,6 +252,9 @@ src_configure() {
 
 	[[ ${PV} == "9999" ]] || myeconfargs+=( $(use_with pulseaudio pulse) )
 
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	use amd64 && use abi_x86_32 && tc-export PKG_CONFIG
+
 	multilib_parallel_foreach_abi do_configure
 }
 
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index d31851f9e4ff..f276578c421e 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.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/app-emulation/wine/wine-9999.ebuild,v 1.143 2013/06/11 04:12:24 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.144 2013/06/12 03:41:43 tetromino Exp $
 
 EAPI="5"
 
@@ -171,8 +171,6 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
 		"${FILESDIR}"/${PN}-1.5.17-osmesa-check.patch #429386
 		"${FILESDIR}"/${PN}-1.5.23-winebuild-CCAS.patch #455308
-		"${FILESDIR}"/${PN}-1.5.31-gnutls-3.2.0.patch #http://bugs.winehq.org/show_bug.cgi?id=33649
-		"${FILESDIR}"/${PN}-1.6_rc1-pkg-config.patch #http://bugs.winehq.org/show_bug.cgi?id=33780
 	)
 	[[ ${PV} == "9999" ]] || PATCHES+=(
 		"../${PULSE_PATCHES}"/*.patch #421365
@@ -252,6 +250,9 @@ src_configure() {
 
 	[[ ${PV} == "9999" ]] || myeconfargs+=( $(use_with pulseaudio pulse) )
 
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	use amd64 && use abi_x86_32 && tc-export PKG_CONFIG
+
 	multilib_parallel_foreach_abi do_configure
 }