Version bump, see http://www.winehq.org/announce/1.6-rc4 for the announcement. Remove old RCs.

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

5 files changed, 24 insertions, 587 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 3893a9917aa0..306c361cfe17 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,14 @@
 # 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.469 2013/06/24 04:16:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.470 2013/06/30 02:27:50 tetromino Exp $
+
+*wine-1.6_rc4 (30 Jun 2013)
+
+  30 Jun 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -wine-1.6_rc1.ebuild, -wine-1.6_rc2.ebuild, +wine-1.6_rc4.ebuild,
+  -files/wine-1.6_rc1-pkg-config.patch:
+  Version bump, see http://www.winehq.org/announce/1.6-rc4 for the
+  announcement. Remove old RCs.
 
 *wine-1.6_rc3 (24 Jun 2013)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index eec42a01239c..2d5a2cfa55d7 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -10,7 +10,6 @@ AUX wine-1.5.23-winebuild-CCAS.patch 6101 SHA256 34143c55618870dd31eea1e260ae973
 AUX wine-1.5.26-winegcc.patch 1808 SHA256 91c1012059b93a421b2eae9f2ea46b7b327d6d3d58ba0cb47021c8a57f6d8228 SHA512 fce9daf40a96f4a7502c249a30107c8dfc5d8edd4a171b863d2bf14c3ad46d18e4c29932ab4a6ede7da5d589d777b962d2f577f5360ee4db8019d71362c51d47 WHIRLPOOL 71cbe36c6bac87071472541b7f5cd3ed1b08f05479bc0016262b3f86e75738e467dad197563b4898f2b24fd0ab4e27c40dce04f244a3e7f5ea1582b4db1c5cc2
 AUX wine-1.5.30-libwine.patch 1777 SHA256 2f0155c2c1d11fd9a06deab54dd753c1161e32217eae82604f8c1d542e87af4f SHA512 e6d566f75632065def197cf27b5705a3f2f736a7b3bb4ae03df19fea00fd980a5b5d0517981469fef0fa5347c1c3b9651894fb23d937b5dbbd993cd292f67183 WHIRLPOOL 62ed15db6bddda47dcf74d846e15a9904c11abdf63e0321e7e2bc3197f60c819992b3a95a4395f85edeef9181a1866749194b9744be8d42bd94acab37470aad6
 AUX wine-1.5.31-gnutls-3.2.0.patch 1616 SHA256 3ce82009b05fe997b0d198ad83533026d6410811ecfc6254c1505d0b9d18caf0 SHA512 09de6ff03da996197cd6833c1f53e9f39b43fc43e02ad3b4e12648a57288c1fa200886a805e6811372e12665f9a5d463603f9a9ba39cb1392b2cf4d11f3f9a65 WHIRLPOOL 590a9206913a51eae81e236057bbed346dae8f895575dcc948ba7168edf5c0605db6278344fad727c2a828a2aeef258f72a57a12b5dca244a3b7b82cfe43452a
-AUX wine-1.6_rc1-pkg-config.patch 7527 SHA256 b1c84dbf9d8557d6290c06e08dbf3552c42a0eb42cc9bca70bbb8475dc500386 SHA512 dcf38fb4b7c795578566cd32167ceb92769cee102dd3b0ef95fedb9d1feb7cf1541eeb182cdf49d161f4f4480f09d53e7063f9b114efa186008d97b77e65ee1c WHIRLPOOL 77bef483525a05031a31d4d641ddb4877c4335bce6d1e5620bc656f385ea0a16fd5a541cd81b14516213d46f0880e104e76aee8a2f74bc5aa38df7acf7556185
 DIST wine-1.2.3.tar.bz2 17651336 SHA256 3fd8d3f2b466d07eb90b8198cdc9ec3005917a4533db7b8c6c69058a2e57c61f SHA512 602ae802aa6f94c4498ccae96a67e355a8aa5cdc1e9c1e0f29482f45a9e7cc7af766ade9f2f1fef77ee77d5bbfc5f34cd110b95db244b8cff42998b5b0cf708d WHIRLPOOL 02ac95d8c86d0f2d870c8e4c4789c1bef1ef965f8bb186de23fd3a949126ba2aadd5791d1908bdf11d946d5dc5348b085881c2594cf1b407fa0df44c1990ecd9
 DIST wine-1.3.28.tar.bz2 19626794 SHA256 9a311124a1a911066ab9d3a742dda888487ee516a18eda946be105a1d1135a38 SHA512 b8fb881cf03dce1a40a9212bc6170858ddde38cd2fc282b455ab94cee7ee2e78f5043fee72df3b1e7566c29fb8c8a43726953a8bc5eb22d3ab7f869e6f4e9722 WHIRLPOOL acb6b8b978541e1b0f95f124e95ad9823e73590229515fd40e4e59d5af21c414c4824490710b436370b4d3fda3c477d6c4b626f89c6cc90e2fcf066355c3bee9
 DIST wine-1.4.1.tar.bz2 20104401 SHA256 3c233e3811e42c2f3623413783dbcd0f2288014b5645211f669ffd0ba6ae1856 SHA512 a0fe7f36325a51d9b381ab09a4460cdf59b12b810722d28aa8e98a3d6c3de29bfc62dd0f0d4e5336bfa82a6b549e45c313a714b6d43f562c45ffadb47874058a WHIRLPOOL 81f837ecd31902bc769065de353a92bcdfa1b59b3cd53e700e345b24480260c68daf7075fec685a948a46e66e6f4470ff4158df92e132760013b17ad6690885b
@@ -47,9 +46,8 @@ DIST wine-1.5.6.tar.bz2 20380981 SHA256 b178bc34a69341a8f0a7ff73f7dadf2562ed2e5e
 DIST wine-1.5.7.tar.bz2 20386078 SHA256 c4cafaa6e8f67d548ee5f35cd486699350404b02b448dd8fd48d664b9c5f0b07 SHA512 2809ae5cf8695d0feefcee33d3ffb4bed58ad8a32edcee1fb9d1580f4f9dc2f9123a8f169284595f9041f8ffaa7e7fdbef4f6195de00d47f469f527d6764708d WHIRLPOOL e8783abb6a33ecb37d121f4f8b2b1f2d4ecdb57fbd0e53e3aaf4a157fc85ae150e245ddb9b238d533f3a9a6f565caf2ffdd0deab0d76d666b1ac3fb9d08e0b8b
 DIST wine-1.5.8.tar.bz2 20383248 SHA256 dff2bb0026dc155c0c8ae4fd4f87d4a9cd40496286af6ed05130c87d514fc543 SHA512 b34af3f5f26edf6a13e67d699247a82c1998eed8f28e495a65265f700b6fca436824f5bcebd52393d095e13564202874e420285044fa2feaca0a303e89d14f04 WHIRLPOOL 9844388a738ba6bfd88a5ca4b97f6f7902d66e7b3bc5054d642cfa6660ed2e5f861e8c67fb2351fb7afb2a7a9350ce87127b7f84022a72678336e3891e957ad9
 DIST wine-1.5.9.tar.bz2 20413229 SHA256 7bc25e7d0d8fec11a41fec89994dd65265b8fd1052ee82d5648232e646899cd3 SHA512 245b3819f6ca17f50ffedbac44e55a367cff16e3c0c3b28f701511e79c2c20d596e0ae7d4a4094c7203589915cf048e023dedbba9439e1e81bcc7681176dd33b WHIRLPOOL b10bb0606bb013f1a84e8bcfee184eb860d3df8be10b27ef7208d2eb73ed5b1a233be7be3831b61967cac11aa5ad76ab01e1638af860e6426347aec6c45d7c83
-DIST wine-1.6-rc1.tar.bz2 22294223 SHA256 7656c3600eaf5bb3eda05750f10f3f57954eaf11f7b8b2cb05507dc9e3ef245f SHA512 e357abd9be4a0b65ec590bf57317464f01440075db3b7d27425ba712d44fbcd6b3a505143bbe3a4f24406d5f5d7f6afffc57caaed183deb40bdf1b523768c4d2 WHIRLPOOL e48cb171f4ab2c4c127c1b3786274b113f70fcbd9c763622bceaeb160dc650d54bba086b1c8e7e1c73aaefd367d31d71f35d02f7eba84fd12c9f6367c7d756f7
-DIST wine-1.6-rc2.tar.bz2 22431011 SHA256 9d8f82f8a8d6190455b0d1a2b1528ba154ab03d9e65f518aded6046fa611c0ae SHA512 c45d23d65b9588b3145d1cab95b27d5d60440a4e50b004c0cb567f64fe86b44284764c5d3f94eb6aea493f9b479935cd16fcf186c7b7e478584da90ed478c0cd WHIRLPOOL f6119b65648431cabcbd332016f12fa0412af4f279b76ddbbac5529e9a25a6df381ca6fcc92194214a8329cd5b09b344c26d902078358a158f02245a16299bfd
 DIST wine-1.6-rc3.tar.bz2 22453577 SHA256 dd2881f59d5f5c90d57a17f503dcaf4911b3fa885bb36943924cc6c2a8a3aa44 SHA512 2e1d83f3ac37244e037dd4175f0dfe1cd3b9eeb71fae5a239f5295bad564a2c5265d4d0f7f216c330835f760536e539e48c5dc80b37d596f3e5a9a5b3fdb0fc8 WHIRLPOOL d969d8d3cb030b4183f8f33fcf1acf885e03c315e9998881b280f3d3fa80d7bc037aabc52a37141a14278f9e5edcb1d95e4d2fe241c7927f9bb977c356e31ef0
+DIST wine-1.6-rc4.tar.bz2 22693015 SHA256 f196819a836322bee96baaf2977068178fe262ff657afeb262989d657d4fc4f9 SHA512 f6fa6bdd7b2e34b4cba7f8ef04d288ff289061b9ee3c63c27c723bfcd88dbf1af2d683c2c504fbf8198293af2ee25b401ad92bb0d06f3c6fe4095b683db35d49 WHIRLPOOL 12fd6b9567aada5037dbbb4f0bfc8e629ff403fe85b5be4d280f4b114f889db503f4f0a221221ad8e76ea9a1887f9c0b0fa018d7f86fcc1917ff378e76fa2459
 DIST wine-gentoo-2012.11.24.tar.bz2 57481 SHA256 164248d7ff8cf06053576a3ecc1f6fe88a52763b04058ae53a9a4d5cfb6e7e22 SHA512 2a626ccbd408204dc6d1710ebb524a7961f4f417abc4cf1b65b4954a7b3033592febc8e9886ab47b000fc97dd3fe016a5833079f6bff84cd1d5aeb57a5167e07 WHIRLPOOL c638d0b0d8632d99f34cc4a294c4ddc7b69812af2ef536b3586fcfb41aab88a545d4c85c5a41020911dcb244eb7ed512cc6a957c6efd7ed06bd840f38e91f61d
 DIST wine-gentoo-2013.06.24.tar.bz2 85442 SHA256 bfbf6b25e98f717320de2ede467e3628fbc749d936b8449f8477c9dc6f41e04b SHA512 b6819889314f6a6ea16c1332f4b177c43623116763969c31b23b61754cd304dd085f5d3eafbe847159331eb97dddd9b4c10699430129ea4a71da418c1fe175f0 WHIRLPOOL 227e0ac6569736d4ad5813cef49f775dae956f4fc9255de95753d5d3cba1bf6cf3db31d23d3702bb54d2e60c5a6f779b602f0efb2096e4c827c924565b273d00
 DIST wine-mono-0.0.4.msi 44408320 SHA256 15d8a612cdeca4eff3137353f29fdeb7a99e055cd633844c91cd00e0186b8882 SHA512 a7a3d5a564bab68ec6f3b96dff53c7b1491ce6d53b9fa3c2f5770e3ada69ffdefcbdde340697e9916d8c487f748db22aae97803b21bd63e461149be1eac096e4 WHIRLPOOL dc3bfafb8768cbda124870fceb1389e34a7d8ff0b1bad3df7e05923ce2695a2b037467bfddd90e1726f3f64f79bfa9f64bf65054ae3355a69039026fabf1eb4a
@@ -123,21 +121,20 @@ EBUILD wine-1.5.6.ebuild 6691 SHA256 95e8af5853819ee4b4fa42ac1f272ba9e3255340dc7
 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 9607 SHA256 e6937391b4888a228026d698aee6b58d15c9cfd813828504bafda831cf80216d SHA512 2a6f00e2d4f2d8f40c2ffa59f1ee7a7c47625ffaf0db3b52d4544198c8c8984a2d2cfb48555cc05ac04ff89cdcaa1b01ba01b4326a5646e99aa22b55e6a5b332 WHIRLPOOL 2cce04c2a1ac73ea154257a0a2c95b43bd1fe754e575a98c41c5c44108cedb59de3e976ea223bf17365dfd6389735c1efb5fa928ae624dc6a9952d6d49e1c6e0
-EBUILD wine-1.6_rc2.ebuild 9461 SHA256 a0baffcf11c2462793b9cba24a1269da43554a7be9e5df214ac417dc54c6cf78 SHA512 818259b072170457f4949e575de193c348ccb0a61f09efd0b4894afb79c01c4f2760a12d085cbcaa8f81a9ffe9b12eb391ad5a60d00c209e4c1b800b0e280346 WHIRLPOOL 21c11b9f2ae2b86905d454448c27ec498aed7e916e0cf28d768b6edb27537945a0232f3f5d34f9ee734af4e37306163df28fe0696a4f2541e5bf60c0cb24e43a
 EBUILD wine-1.6_rc3.ebuild 9624 SHA256 694488c31e2b72d7197cf4535580d3ba41c66c24898bc0a4460994a1b8442c7e SHA512 9ae8cb5e5269dabe512292db2462793a33fb56b97ffbb86b5446b652e9f6aa57c3abe6c1353d47f0998b83ac4d6763bc10311a3c3699c6667ddaab0674d40ab4 WHIRLPOOL 96e4b6ed51895edff25165500361ee7ce0b80d5b3bbbc48d083e6e94ea02f640add98a5f445ab9835fba8cd232e73fdcf1639a5b197054c3de3931f88dd63e90
+EBUILD wine-1.6_rc4.ebuild 9624 SHA256 7972b6c359d6fa0b9e7332492ca57a373aacf823d764ac7588917e0f2467a7ea SHA512 7768d9a0c35a3ba564490f7c239f9dea32d63433bc4f7068d153a5d31de96791f3340481c0b638cfadfa55a3e99623602383c3658ec72c7d15e927c68f98641c WHIRLPOOL 7aa15b0dcdd1c45cae3336bb0e7f841a9d6dd98100c2dd84028ae072327e0527cd2f8bf65db23c662e74a8c878350b61e265779be4eaefb8df1db3e274c9be9f
 EBUILD wine-9999.ebuild 9623 SHA256 ffc057ac46aa40bc58c3cf199813873c6aa529d689ab3bbfee58c43b722c3c6f SHA512 8825576d1d870ff08931f075f1bc9035cb22595b3b7d66525f7ac4ba486c686d50b2b56b896908c2a995fe6533af6348883378d7dbdc5bff02cc475735488d87 WHIRLPOOL 2518ab174c767baf0159d32549cd5705b4bff5d10829565eb4783cd46f6e606a9538247eb2ec38d8f1a075c84598401bb935299448d1f29b7210b8c838cf4016
-MISC ChangeLog 8622 SHA256 f79cfe8daa8743f45c192ac8a1cea37db83f36bd43b6a901941c68ffa7d9d78d SHA512 be57cb947d17954ef141ea8ef1485b98b0d3a6f4f6b60b6ca87d11dc5b893ba62c27013f962a5cfb80685af09e6d35253d81acb87d4670b17c9c260b03e30341 WHIRLPOOL ffe89899f41569c4f285d14fca333494929d12c875def1c50cda699cce9c1aad00628db7b4c6f9df2a46efe90d6b49d4cb9870d30f3b9c46bbcc1b1db579245a
+MISC ChangeLog 8918 SHA256 7872269ee7317602e10d32cb651829901a21b4f2d7f37e0a8e7937fa214426b3 SHA512 b95f81d1402c7617030a38fe68cc6903e196ac717a8431e9376f33fdbf694db1b3b57ecffc980d2bc293d4c015208e1ac9b94bd5fe2a6f7856e31a4cee2f5f36 WHIRLPOOL 73c9ac65f511a318416994d028527cfaebd2bf420a53806e18b32b573f3deec9915399ac4487a344c3a6dfdc10e9aa485ec94219ed1fbcf4453d4f036e28f9b4
 MISC ChangeLog-2012 100362 SHA256 8e70fc54e7945c1f41e3e0b64fef6b9a7fe89acdaf8c79a06a16048fe8d2e26c SHA512 ca875e847ba100e1f19774b31a2b45a81d776275e3d11944be8a7b01dfcdbf4265b1a340d691bc4fe4054fea006059a06ed52bc0516b1f8b44a1772a1c813278 WHIRLPOOL 36ec708601a25cb8fa93b471112538480b6ef82cc4e6703b3d045f883078b49209ceaeef7bafa8417b881c2d11df84df9c83d1985d0d687a11f3db3de5abb014
 MISC metadata.xml 1932 SHA256 391c4192823b0613e5fa565dfbdf33c48fa04d5aabf672ab198e91c4a56f9b4e SHA512 f559e8fcb5f552a884cddaa8248b3b2e721d8f2bb8b650635517664c7e6ef5ff124832e09e1e12e7d0bb54bd68108f3139591fcda3b3411d0b63b3cdba9d241a WHIRLPOOL a87834a62b0755b3ac43e3e5409d104f5e0d5976caf5544bf0cc08d726aaa19efd94caedae27279182a9e52b70830c6a8726568aa4439d1156f82f640ad2fe9f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRx8gqAAoJEJ0WA1zPCt1hR2kIAJE8UJNwJ6sFybUT7+hqtgO9
-OjYosZ2I5JssmDbI3OZ2ifZjStBJTmeyhMgiHZdlPykVjmLUfszzYS7ChetY0w2i
-uK73Nli6B3vKcimUP5J/vasfOPio4LX5nIDute1/JUn/7MVUgscNsOnUvaGh39hh
-MqIH5c+ljOZT/W76HTwAJLMMI8u+fffPqoZkuEoLT5/rAEkX29gDP2wjONYvy/5L
-lD1+aj3HGsME91/0JXFI/d9zokm8L6IMH8OtggQKutPUDGf68VEouJZfUTFbRkGr
-y5CjRe7lzRzcl1VsYif4PXLqxhlMWYMuXaeSB+IsDWfI4sHOqeywuNkfU1TrE5g=
-=yTQk
+iQEcBAEBCAAGBQJRz5enAAoJEJ0WA1zPCt1h1/AH/0SMuGVGnUfmC/H8GnXkoK9E
+i0CyNpnuXpKGK3v22GI35L2n6z6cezn8sGvP8zBx6T6q8PFrDfXoQpI0MLPMDPmS
+MXA0iib3TTEU+vL1+Jb6aYBJE9MpTZC3iIgA6OuRapW2RJW4rtk9p7RLYq1IFsre
+GYRz+z+1RZwz/4sVyoVRsF2pn+stsOR4QAdAE2idG483nKxAUYiflM9z/LX1rPIZ
+TaTBy0QgGNq21d32G8c+RgAosaDXqjHdDKJ1VSfXbEIebaJW30gnhJEHN36998RN
+8aJwTnrh3FtdBWzsP2F0wbI63cTA68RiDn8DkOiIQgK/lHfgYVAxQy4KzLZWDGQ=
+=2Aey
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/files/wine-1.6_rc1-pkg-config.patch b/app-emulation/wine/files/wine-1.6_rc1-pkg-config.patch
deleted file mode 100644
index 3a96b2c492b6..000000000000
--- a/app-emulation/wine/files/wine-1.6_rc1-pkg-config.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-From 4a2e919fb7e425adc4d58c4c4c00e3e32ac1709a Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 10 Jun 2013 23:29:48 -0400
-Subject: [PATCH] configure: always check for pkg-config (Bug 33780)
-
-AC_REQUIRE([WINE_PATH_PKG_CONFIG]) in WINE_PACKAGE_FLAGS is not
-sufficient because it gets expanded only at the first occurrence of
-WINE_PACKAGE_FLAGS in configure.ac's text - which happens to be inside a
-shell conditional.
----
- configure    | 188 +++++++++++++++++++++++++++++------------------------------
- configure.ac |   1 +
- 2 files changed, 95 insertions(+), 94 deletions(-)
-
-diff --git a/configure b/configure
-index 3a551e8..670c4a4 100755
---- a/configure
-+++ b/configure
-@@ -672,7 +672,6 @@ XSLT_LIBS
- XSLT_CFLAGS
- XML2_LIBS
- XML2_CFLAGS
--PKG_CONFIG
- X_EXTRA_LIBS
- X_LIBS
- X_PRE_LIBS
-@@ -711,6 +710,7 @@ CPP
- OPENGL_LIBS
- XLIB
- MAINTAINER_MODE
-+PKG_CONFIG
- MSGFMT
- ICOTOOL
- CONVERT
-@@ -5152,6 +5152,98 @@ fi
- done
- test -n "$MSGFMT" || MSGFMT="false"
- 
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_prog_PKG_CONFIG+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$PKG_CONFIG"; then
-+  ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
-+if test -n "$PKG_CONFIG"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-+$as_echo "$PKG_CONFIG" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_PKG_CONFIG"; then
-+  ac_ct_PKG_CONFIG=$PKG_CONFIG
-+  # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_PKG_CONFIG"; then
-+  ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
-+if test -n "$ac_ct_PKG_CONFIG"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
-+$as_echo "$ac_ct_PKG_CONFIG" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_PKG_CONFIG" = x; then
-+    PKG_CONFIG=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    PKG_CONFIG=$ac_ct_PKG_CONFIG
-+  fi
-+else
-+  PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
-+fi
-+
- 
- if test "x$enable_maintainer_mode" != "xyes"
- then
-@@ -9500,99 +9592,7 @@ test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" != xyes && enable_opencl=${enable_op
- if test "x$with_xml" != "xno"
- then
-     ac_save_CPPFLAGS="$CPPFLAGS"
--    if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
--set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_prog_PKG_CONFIG+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  if test -n "$PKG_CONFIG"; then
--  ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--fi
--fi
--PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--fi
--if test -z "$ac_cv_prog_PKG_CONFIG"; then
--  ac_ct_PKG_CONFIG=$PKG_CONFIG
--  # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  if test -n "$ac_ct_PKG_CONFIG"; then
--  ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--fi
--fi
--ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
--if test -n "$ac_ct_PKG_CONFIG"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
--$as_echo "$ac_ct_PKG_CONFIG" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--  if test "x$ac_ct_PKG_CONFIG" = x; then
--    PKG_CONFIG=""
--  else
--    case $cross_compiling:$ac_tool_warned in
--yes:)
--{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
--ac_tool_warned=yes ;;
--esac
--    PKG_CONFIG=$ac_ct_PKG_CONFIG
--  fi
--else
--  PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
--fi
--
--if test -n "$XML2_CFLAGS"; then :
-+    if test -n "$XML2_CFLAGS"; then :
- 
- elif test -n "$PKG_CONFIG"; then :
-   XML2_CFLAGS=`$PKG_CONFIG --cflags libxml-2.0 2>/dev/null`
-diff --git a/configure.ac b/configure.ac
-index 57d76d9..5f3f98a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -288,6 +288,7 @@ AC_CHECK_PROGS(RSVG, rsvg, false)
- AC_CHECK_PROGS(CONVERT, convert, false)
- AC_CHECK_PROGS(ICOTOOL, icotool, false)
- AC_CHECK_PROGS(MSGFMT, msgfmt, false)
-+WINE_PATH_PKG_CONFIG
- 
- if test "x$enable_maintainer_mode" != "xyes"
- then
--- 
-1.8.2.1
-
diff --git a/app-emulation/wine/wine-1.6_rc1.ebuild b/app-emulation/wine/wine-1.6_rc1.ebuild
deleted file mode 100644
index 01ef8aae85b1..000000000000
--- a/app-emulation/wine/wine-1.6_rc1.ebuild
+++ /dev/null
@@ -1,322 +0,0 @@
-# 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.2 2013/06/12 03:41:43 tetromino Exp $
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools-multilib eutils flag-o-matic gnome2-utils l10n multilib pax-utils toolchain-funcs virtualx
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git-2
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MY_P="${PN}-${PV/_/-}"
-	SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-	S=${WORKDIR}/${MY_P}
-fi
-
-GV="2.21"
-MV="0.0.8"
-PULSE_PATCHES="winepulse-patches-1.6-rc1"
-WINE_GENTOO="wine-gentoo-2012.11.24"
-DESCRIPTION="Free implementation of Windows(tm) on Unix"
-HOMEPAGE="http://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	gecko? (
-		abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi )
-		abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
-	)
-	mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
-	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2
-	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gphoto2 gsm gstreamer jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png +prelink samba scanner selinux ssl test +threads +truetype udisks v4l +X xcomposite xinerama xml"
-[[ ${PV} == "9999" ]] || IUSE="${IUSE} pulseaudio"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	test? ( abi_x86_32 )
-	elibc_glibc? ( threads )
-	mono? ( abi_x86_32 )
-	osmesa? ( opengl )" #286560
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
-	perl? ( dev-lang/perl dev-perl/XML-Simple )
-	capi? ( net-dialup/capi4k-utils )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	fontconfig? ( media-libs/fontconfig:= )
-	gphoto2? ( media-libs/libgphoto2:= )
-	openal? ( media-libs/openal:= )
-	udisks? (
-		sys-apps/dbus
-		sys-fs/udisks:2
-	)
-	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
-	X? (
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXrandr
-		x11-libs/libXi
-		x11-libs/libXmu
-		x11-libs/libXxf86vm
-	)
-	xinerama? ( x11-libs/libXinerama )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups:= )
-	opencl? ( virtual/opencl )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	gsm? ( media-sound/gsm:= )
-	jpeg? ( virtual/jpeg:= )
-	ldap? ( net-nds/openldap:= )
-	lcms? ( media-libs/lcms:0= )
-	mp3? ( >=media-sound/mpg123-1.5.0 )
-	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC:= )
-	osmesa? ( media-libs/mesa[osmesa] )
-	samba? ( >=net-fs/samba-3.0.25 )
-	selinux? ( sec-policy/selinux-wine )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( net-libs/gnutls:= )
-	png? ( media-libs/libpng:0= )
-	v4l? ( media-libs/libv4l )
-	xcomposite? ( x11-libs/libXcomposite )
-	amd64? (
-		abi_x86_32? (
-			gstreamer? (
-				app-emulation/emul-linux-x86-gstplugins
-				app-emulation/emul-linux-x86-medialibs[development]
-			)
-			truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] )
-			X? (
-				>=app-emulation/emul-linux-x86-xlibs-2.1[development]
-				>=app-emulation/emul-linux-x86-soundlibs-2.1[development]
-			)
-			mp3? ( app-emulation/emul-linux-x86-soundlibs[development] )
-			odbc? ( app-emulation/emul-linux-x86-db[development] )
-			openal? ( app-emulation/emul-linux-x86-sdl[development] )
-			opengl? ( app-emulation/emul-linux-x86-opengl[development] )
-			osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028[development] )
-			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
-			v4l? ( app-emulation/emul-linux-x86-medialibs[development] )
-			>=app-emulation/emul-linux-x86-baselibs-20130224[development]
-			>=sys-kernel/linux-headers-2.6
-		)
-	)"
-[[ ${PV} == "9999" ]] || RDEPEND="${RDEPEND}
-	pulseaudio? (
-		media-sound/pulseaudio
-		sys-auth/rtkit
-	)"
-DEPEND="${RDEPEND}
-	X? (
-		x11-proto/inputproto
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-	)
-	xinerama? ( x11-proto/xineramaproto )
-	prelink? ( sys-devel/prelink )
-	virtual/pkgconfig
-	virtual/yacc
-	sys-devel/flex"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-src_unpack() {
-	if use abi_x86_64; then
-		[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
-			&& die "you need gcc-4.4+ to build 64bit wine"
-	fi
-
-	if use abi_x86_32 && use opencl; then
-		[[ x$(eselect opencl show) = "xintel" ]] &&
-			die "Cannot build wine[opencl,abi_x86_32]: intel-ocl-sdk is 64-bit only" # 403947
-	fi
-
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${MY_P}.tar.bz2
-	fi
-
-	unpack "${PULSE_PATCHES}.tar.bz2"
-	unpack "${WINE_GENTOO}.tar.bz2"
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-	local md5="$(md5sum server/protocol.def)"
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
-		"${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
-	)
-
-	autotools-utils_src_prepare
-
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
-
-	l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
-}
-
-do_configure() {
-	local myeconfargs=(
-		"${myeconfargs[@]}"
-		CCAS="$(tc-getAS)"
-	)
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myeconfargs+=( --enable-win64 )
-		else
-			myeconfargs+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	autotools-utils_src_configure
-}
-
-src_configure() {
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	local myeconfargs=( # common
-		--sysconfdir=/etc/wine
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with ldap)
-		$(use_with mp3 mpg123)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with png)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with v4l)
-		$(use_with X x)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	[[ ${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
-}
-
-src_compile() {
-	autotools-multilib_src_compile depend
-	autotools-multilib_src_compile all
-}
-
-src_test() {
-	if [[ $(id -u) == 0 ]]; then
-		ewarn "Skipping tests since they cannot be run under the root user."
-		ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
-		return
-	fi
-
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	multilib_toolchain_setup x86
-	local BUILD_DIR="${S}-${ABI}"
-	cd "${BUILD_DIR}" || die
-	WINEPREFIX="${T}/.wine-${ABI}" Xemake test
-}
-
-src_install() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	autotools-multilib_src_install
-
-	emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
-	if use gecko ; then
-		insinto /usr/share/wine/gecko
-		use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
-		use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
-	fi
-	if use mono ; then
-		insinto /usr/share/wine/mono
-		doins "${DISTDIR}"/wine-mono-${MV}.msi
-	fi
-	if ! use perl ; then
-		rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym /usr/bin/wine{64,} # 404331
-		dosym /usr/bin/wine{64,}-preloader
-	fi
-
-	# respect LINGUAS when installing man pages, #469418
-	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
-	done
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-emulation/wine/wine-1.6_rc2.ebuild b/app-emulation/wine/wine-1.6_rc4.ebuild
index 251d45b3f802..23e273f37618 100644
--- a/app-emulation/wine/wine-1.6_rc2.ebuild
+++ b/app-emulation/wine/wine-1.6_rc4.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_rc2.ebuild,v 1.2 2013/06/15 12:35:57 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6_rc4.ebuild,v 1.1 2013/06/30 02:27:50 tetromino Exp $
 
 EAPI="5"
 
@@ -25,7 +25,7 @@ fi
 GV="2.21"
 MV="0.0.8"
 PULSE_PATCHES="winepulse-patches-1.6-rc1"
-WINE_GENTOO="wine-gentoo-2012.11.24"
+WINE_GENTOO="wine-gentoo-2013.06.24"
 DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
@@ -186,6 +186,9 @@ src_prepare() {
 		sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 	fi
 
+	# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
+
 	l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
 }