Version bump, see http://www.winehq.org/announce/1.7.10 for the announcement.

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

4 files changed, 459 insertions, 14 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index f255d649bbc2..1c7831d5c8bb 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,12 @@
 # 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.490 2013/12/24 22:50:44 tetromino Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.491 2014/01/04 03:49:37 tetromino Exp $
+
+*wine-1.7.10 (04 Jan 2014)
+
+  04 Jan 2014; Alexandre Rostovtsev <tetromino@gentoo.org> +wine-1.7.10.ebuild,
+  wine-9999.ebuild:
+  Version bump, see http://www.winehq.org/announce/1.7.10 for the announcement.
 
 *wine-1.7.9 (24 Dec 2013)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 45284450d9cb..1cfcfde53fa9 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -51,6 +51,7 @@ DIST wine-1.5.9.tar.bz2 20413229 SHA256 7bc25e7d0d8fec11a41fec89994dd65265b8fd10
 DIST wine-1.6.1.tar.bz2 21183636 SHA256 d5bc2c088b555caa60a7ba1156e6ed74d791ba3c438129c75ab53805215a384c SHA512 a2f2a97fc7ab93122886ed8846017a6e31de4a856d24baf8dca5ba50e8518c11db014d933f3e052bfa28ddb7ee0d6fa41653553c634948519a0d65085b086411 WHIRLPOOL a570601375dfa2928e5c5ae928bc17b066d7e65f064557e52a5cd8371d2477b511354f178b7ff1813c5f3e39436cbd7d677d22e6042ec51f47bfb7bba5e4f347
 DIST wine-1.6.tar.bz2 21124403 SHA256 e1f130efbdcbfa211ca56ee03357ccd17a31443889b4feebdcb88248520b42ae SHA512 f8a98d732547c685e20ec3b7c50b44943307396b93097ef53b01ab1919209a159b81bd1560d8b2f242cec7f7303e446a8632ddd238359fc1861acc555105c92a WHIRLPOOL a2852f766a982681f61c4e28b878a99eee30ce07b4be01ccb86e4aa5269b40b792521d38c0ba78955b198901f08a0823b61cfd35476086a6dd12c459a13c9ac8
 DIST wine-1.7.0.tar.bz2 21217085 SHA256 0106ba3c8f0699cc7ae6edfcf505f7709c9e6d963bf32ff9c690607def9d4d77 SHA512 0e730aff64fd026b6fcb3a8b7e2440fbb673c892f5124611a001af5264f2ec1ddfdc94d7b78ffe3080008b0ec0658da0131d680c5e2d80f5c655b6abeb8379b4 WHIRLPOOL 3c607d0f7537815020af28f539699f8290e3d64291422f9f58bda5b836fe083224ed6108aca3147d713491183866fa57ed9964cb4a255d4980ae27180f2a29f4
+DIST wine-1.7.10.tar.bz2 21312974 SHA256 44270e4b97ef930e4e4b59088e6e3972e91e85bacf9a9a4d8712a877c9d5cbdb SHA512 157fe4146df3c174643cc1ac29748778aa90fb9e602b417ad772d3da2af3a86307ca818ded860722513efdba57b85e06a2db2869a69a3f579255829dc3d8ac55 WHIRLPOOL eaba07f65c416ce93b9243df402ad0fb5a2f5e7bce43f40b73941f2ea7baddbcab9ce3a999d9086faeaead7552f5d34234cc3b3f3798db2fb98982ef22a98b71
 DIST wine-1.7.3.tar.bz2 21489049 SHA256 c66c93c2ffec8d1d9922fbaa226b169d62deb77fcbfd0fbd7379b77dbd97d47f SHA512 41109866b259a5f939c9ca4c26ed0a5ca74fa9cafa2f348b83510dd386459c87ac044a6f954f2f83ce00961d866a6e636ed96aa9e94584b7a79486d434b406cc WHIRLPOOL 90e6aed8930e3496701292415ce87f29a87870a1d00ad26d4f3c4adf33cd296093d0ef3d363bf5cead1ebd5ab4e86907ccb015c10d85f6f90d5f48cd81681b0f
 DIST wine-1.7.4.tar.bz2 21500746 SHA256 517b3465dbf5b516d3fe886c0f9d4f310dc1d4a38ca4e5580c5d66bab3fb6969 SHA512 4267eb43311fe53537a1864a70e88e4bf444b8979dc858725a1170ed06af4e727604a22bafb3deb448eeb62c170ce67ce8eb8082bce040f5488b1a4c4bc6bb95 WHIRLPOOL 7bb14e0dfd4f9a7411e1d5484dba62f8584a0e03997cc3c6192893dccbc7de316eb79a1e5b0ccf96d20e74cf512ebc79e760076ff4882625bc81b410ad8be0bf
 DIST wine-1.7.8.tar.bz2 21463503 SHA256 30e17f5f863a09416f3d229666566b318dbb40f683d4ca6630012c60bb511804 SHA512 1fdaddb7909f818050854bf351d20f445cf6a5906b1bcc789c96ee8d5058c90815a91bbbc6444f3e4527748764f03ab5297585c174b433093a3354a827402fea WHIRLPOOL 3b5b18384ff04b80b936160c2c6e03676d69663c023f484981305c9272d0601b74cda5c5f7d56008b3900d702b1a4fe1929f16b1fba304a6480b076ffede663a
@@ -96,6 +97,7 @@ DIST winepulse-patches-1.5.25.tar.bz2 46795 SHA256 375c94dc4d12ab6b41da478104a1c
 DIST winepulse-patches-1.5.30.tar.bz2 45835 SHA256 61f7cdee2c5cb21457a721752a4525c1c75257b18a3b19793934622136231a35 SHA512 90f2c4fd989260131570a5cc18f7304f641d7738bcafd284e1dae19767a8dfebd289c458eaba8efadef8a9dd9552f4a34be34f22d70b841484b0245559975f80 WHIRLPOOL 60fea09353f33f54ef4b19d34876ad307c17d6beab3733f439a5b2714c8de51bd8c69f0f7180f31e0378d857c0f1d1fcbb6f54fc2985f36b0dce9e37e0123d5f
 DIST winepulse-patches-1.6-rc1.tar.bz2 47873 SHA256 c963b08e520aafdc618caaa50044979ec573aa1862bc0637f1f4e381b3fc3665 SHA512 f5f9cbcb93ffcec8dc43bd8949d7f7ee71ab75771dc04ee1e28c3b4ba2ab3d7f7089ae2f872aed835979a94e51563e65e6fd8333104617c8e0465525c2854654 WHIRLPOOL ec38890c71a3e40d433c8e99f483f2453c2e88119d824aabebbc9c6cc95b3585ee8e1d47e1a00df795d6b731d041fd7e1b987781b76b66bf0dbf9f7cac4642e3
 DIST winepulse-patches-1.7.0.tar.bz2 48368 SHA256 280f8583574d5f0ef437e15790f96d0ade9bd4b5cc44771ec89023f76728ba73 SHA512 67c36d380c40d3a8144fd5f9e5bf5eea6adfdd178a6ebf3727e281938bdaffddfcc2f49cb30837195cf47f4c176c1812f0ab64bc36c8981611fc86dc5a8266bc WHIRLPOOL d8775bfff9bac174cb91550643a1994a3d0ea2e22a24c05d46ca2a7a7521ff53f481880c2e0191c4f0494acf11a05a8183abca033aa58ac58bbc8bd762d02a5b
+DIST winepulse-patches-1.7.10.tar.bz2 49205 SHA256 7330b4552b572244bbe99c16005d725eaf382995c986add170474381b90df468 SHA512 ef3a5477bc5803bfba609dc3299a7c07833958628d1aff01d100da57c0d270344ee326649206708c50c2a12b025f987a4e0f1dee9126e52e2778b256c45ba567 WHIRLPOOL b40088d8665f3cc57b4936774ac6dc2e6b005d75aa7c7385248ce35e5cf6e168ae212771f771b68dbf91fc5034b7ba54f907e93283cc2eddaa18e825d9b734a9
 DIST winepulse-patches-1.7.3.tar.bz2 49163 SHA256 893dc6251984f6a7306dc8064c50a6a605921094f84feb436c23be3b9e5d077a SHA512 f04b33479c92ce31df74ea49b8582cee2f9d7a4cdf132f212f021da89b19dda8e5a4b0daaec81533b100ef0af023157cf43581ab75fa263da3c1a5d712ec3e9d WHIRLPOOL ae2a599d7bdb49ce77cc56844ff74c7fd62b1f1164e9f7fdec499244fd609799c0fd7421d29ffda7e9fb599962f75c2ebe44ce72e0f0a80677e140f759ab22f9
 DIST winepulse-patches-1.7.4.tar.bz2 49182 SHA256 26cc1ab6d91c45b4d83f07bbd7f43c9824470700a58325f0a1bfc1b76bfe419f SHA512 55095dcd3ebd1560316382ee5f625203589ba8ac2437f7993bee0edf61004d3c0cdba0aabc2e9aed3d195d8eda4088241766dde4c44564e81ea99cc47404cdff WHIRLPOOL 978f3bcc3cc14098b604cd737d9fa6911a5c3b76773a060586ba183a055cdc25e3b436c262c813094c7c2158ae607bcb3020738da16bbe2c48c595728755f98c
 DIST winepulse-patches-1.7.8.tar.bz2 49140 SHA256 0fd31ea7fec8817561a7b304bbfad6bdd014eb566b0c533e15773064bca555ad SHA512 18c88d4da37714d0216c01929eb92c99161fdf7024d8516512fc2585bc8d5a700fb1b5eb9fb667149e104305f366c867973f41b688a04f63e7cce76f5d85389a WHIRLPOOL 60dfeeb1d51c9ea7730ff1e9263d44fbcf3509e6ae68df1e3d30d965999f19525979f64617494bb1c3e1712c7117f30bebfbcbc75b1b08ba1f1e033720b0cacc
@@ -138,22 +140,23 @@ EBUILD wine-1.5.9.ebuild 7230 SHA256 817512124347085810db9c0528cbeffce07e2cc1ec5
 EBUILD wine-1.6.1.ebuild 12514 SHA256 673bfcffc745ba6e83f493edf95bde7772f1e3575ea23da70da2d4b4e85386ce SHA512 a4b2f302f9fdcbb8bfccad3c44a5e4e4373e51d97d437a340e05159191a5b64a74eceac6112deab6277d26a1bfa5f167a73c8a682ea10f8d27d8b6279d94194e WHIRLPOOL d68402ce54e014f5ecef5a0a8e25b3634831bbfbbda950cc017a5fa669efd5976e174aabb3afc28b06098bce7130194660649dc577f42b46bb49525e9dc4024f
 EBUILD wine-1.6.ebuild 12502 SHA256 5b27fc93d97379c12444b0c7a722545080ddfd0b663b01c926b5f9c24ac92b25 SHA512 4e406c3afa77d732d5262cf50f60a4661be2ee03ea4fdb442ab2b91d3cc69159038660cf72ef52fdd646758011543b71078f93479ae58066bef1c22e8456a860 WHIRLPOOL d681c965e9be48d434f713f3878825aa532140c43d3da496415b7442f906305c0aaf780d45af4a3621ccf2461445f3a6b026e50dce1d0792a2ce8330339a5a9e
 EBUILD wine-1.7.0.ebuild 12421 SHA256 411f57e42e30b82d4c1ac099689281582d6f88b6e1c8a55089e1736a369647fd SHA512 6de6f1aa8e9056b2281618fddc8f32cbee9b15d123dc5cc588e73ef68b254e6a8618380bd967de56635ec3a05849354e6da7d1fa2860bbd97430d2bb6782c9b5 WHIRLPOOL ee9bb901643bfde35a1ff5f615c30b24d9afe360e452c61eb6549a15867ec1c2947f6e662f6f15f1b28897921188bb52686a50d3a23828fe29ef335726f1f9a9
+EBUILD wine-1.7.10.ebuild 12756 SHA256 6241d5d9da059712d0f304ff5124f6321c0089d7294be673c20f67fa06f373ba SHA512 fc762b1eedbcfb0cbb204ce601975408d6595c243be22b732c890f093d7157a6a51567e7c74c3497ec0fef203f7a816a1a7fe2bbddd2ed063f2b80977a1b7107 WHIRLPOOL 7411c9db26a9987fcc901effe4d4935220374ae4424da1605c49bf75cbb6563c24068498fa0b1afd4f754ed5b43ea82b9c54bd5dd392dace4bee7d745e1ac2ed
 EBUILD wine-1.7.3.ebuild 12423 SHA256 58d6df01c3bede22cb1c84e2b682e273d73060bd869dad74a7d14aa94f2c2aa5 SHA512 5aea1a2b1fa41f3eb61936820aca4c96b7dd404671772894a199cbf12b721f9746ec837020d464c37f49d7da6a4cbd70ffa89746588854a8513a5d16b953d747 WHIRLPOOL 5f267b3b58f5b0e8b6780abf30229e292c836542f684c34042644e28642fab53dccadcb043a22f279e94d5a8f822f8ec2262e1b2cdcdff227c94bf4f13c02dec
 EBUILD wine-1.7.4.ebuild 12423 SHA256 7ef9808dc6efaf8c1fb60407b79ef3a19ab112a21d33f5e34188e3962641d2f9 SHA512 fe9281355ae372866431a68b276327cd3e5cf55887aee7eee6d989e1e6fe5e9f4f0fe9e2bcb3c681f886ca57ba26786cf09eee90f66a87d62fa4882775f5775b WHIRLPOOL e4247512391929136600c3d37ecfc6f757cc1a91ae179e73dc30e73d23f7cdaa4a3678d69bdb96951afa4b2a5a189fdb8ef22f5cbe736675839f58ccd916cdea
 EBUILD wine-1.7.8.ebuild 12754 SHA256 d6c8decb636bd23b1deba6677bf3167515bd9555ce86d91461c8d6595f17c412 SHA512 94622108c0733bce3c6f60cec2d2dc684228e77d2eaa6f90256e3070186881cd142084feec69098dc460727a06c0e9aed2a6ce9d4082023f0d03b24fb5be3d77 WHIRLPOOL bfd3793ff8530ddf5c76b543a16286af1fc841b6ba4e18573910b5ba6e3de663a180c699266a9dedec71f324b4eee15bc9b99c8acd1e50e9f4ca4bdbea1638bf
 EBUILD wine-1.7.9.ebuild 12754 SHA256 cde2305629c14b891331fc2953a5c32b8f7cc9da23e9ace13b5fd3a78100a5fc SHA512 0b5e5e5ec720a3a91e0e1605ed7de09cf2b86675b170293c1cade2a7e70d3d31b956013a36e216324e75845928f0c540584293775b9648831a790eb125bf2052 WHIRLPOOL db9a0dd9a4562eb6ba3172970a1e0e4d094107824b43fa5dade5787f6d3fe7d3e474247d4aec8f95b8c78b67123249fd82b9a67eeeb9573fad3ed0a2ab6eefaf
-EBUILD wine-9999.ebuild 12755 SHA256 699b9c1bbee6b65951416239b54331dc494e6be09bf198a21086b4d80c070130 SHA512 a4d0ce05a25dc48cdb71c577086ed0950ce9507d61c9b4537433082c932d3798d183a8b9a2b488f21c0ab7ae97f1f07123715ea0c5c77f5c480f468446c5f295 WHIRLPOOL 46bd3b226b6caa33a81159bfdd6922e51ed60434552b341544cdf195c794fbee5a6c82521ff123bbe9a7fcf249c0ae08afa06e68fb66398d687261b11b9bf0ba
-MISC ChangeLog 16230 SHA256 69c8c0062e81f53e0847863b11e0d85286afe14775df3b2cec0dd9a0ca60750d SHA512 5404a309bab4050f16cc67fbb1151d44bebc39e3a88ba71139b057db7c4d2c51360ebe30545a862843033089ce65b9b0ec5e98d64c768e99012163b263c573fd WHIRLPOOL 1156588d674bf0f52885cdad526359d791fd842c056f664fd4e02427b0fe3419c029d00b68955081fa54cd26f8d0dcc97ba31fe33f0fc9dc3f71f6967f616a88
+EBUILD wine-9999.ebuild 12756 SHA256 47815cf8e17c0ae1e07ecd77c120bd4d3fe5a0fb3075aa4377fc742e0a5766cf SHA512 be66fec6f67a5a9346c129161addb204998b95fda60eb3269f62f47f114043c96030cc0a0be2d5b523fe56f041abaee8031239eb8b76b45958ea6cc8dc894a78 WHIRLPOOL 770a74fb6c59d5d2f19b966fedee1242cd81c0a302f1b5aea1f51f192cef2dfd20590c9f16620d700c18c6579e495cf3e7df721470fb3a8bcbabda575b27d1b3
+MISC ChangeLog 16439 SHA256 b6b1a79d4b110386027c33b8e39f6d9c4e2eda6b90d9b5649613642261f6a611 SHA512 d3cc36a455946653ea2bc8a140a50a70da9924a37e3f4fae3460e2e5590b70c46a2c6b35931f44fda85935825cac9c36d128256dd0deb55e6d40cacaa9ec953b WHIRLPOOL b42a98df186df67d255560e775f9ef3aa5b3b6f1f302a735a886c3471ee62e21313d69dd070ed472ad510b4b3abccb75d1ae850559f5041e63920ab67b91eccd
 MISC ChangeLog-2012 100362 SHA256 8e70fc54e7945c1f41e3e0b64fef6b9a7fe89acdaf8c79a06a16048fe8d2e26c SHA512 ca875e847ba100e1f19774b31a2b45a81d776275e3d11944be8a7b01dfcdbf4265b1a340d691bc4fe4054fea006059a06ed52bc0516b1f8b44a1772a1c813278 WHIRLPOOL 36ec708601a25cb8fa93b471112538480b6ef82cc4e6703b3d045f883078b49209ceaeef7bafa8417b881c2d11df84df9c83d1985d0d687a11f3db3de5abb014
 MISC metadata.xml 2236 SHA256 2b4d3de73fa84f3f3d192e3d29d8fd22796d4c5630151a380c3c33597263436e SHA512 884a7aa53e7694cec121453103bf3873cba1a8323f8a6ee5fc5e326b05610f1c2d36c07bc357c12777749a33f0ebf986f78341fea5c752dc14f3ab4b90f137a5 WHIRLPOOL 3a2b66e0af17c2e260621e5e065ece87be1a355c8da5bf3c8638f360ed5d1dcd062c44b0e26e72a708e5bc4fb5d8e054e0049ab58b090fc2fe5ed6e2cdee9c19
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSug/LAAoJEJ0WA1zPCt1hcxwIAIqaZQlsn1+ArMduthrrzFN6
-E9YR/fu3DVXMzaoC6SWgzsSKH7ipkqo0d+UEgLf1Yj70PavzWGQ5PHHs836bU3cP
-+noZwYJc31R1COrUaTIgDx2lQxkzHWcY76yj51HZ1cSLzTUZceWgNkeseS2pBhDf
-qns+xbVJV7fMdx+rMtZeOAC/D1IoFaVmnDGmc8gnusu/MPAveUbN/BlQZLJWaFKi
-AJ/5EJLqsLFz/uhrLaO4h6KHgpYL6Nf4rUP+PnidlNToRtkSKWhy22O833kYs7Ae
-T38cH6e/7Uz4jJ1OrHlIUbW3JfPNjnR8+Z1Y/SetoKNzcLt1piu6SwGwn93JB8o=
-=n4ST
+iQEcBAEBCAAGBQJSx4TSAAoJEJ0WA1zPCt1hZucIAI25qo6yAJqK84H1Lg2iOoNa
+rmEgzIUvDEq8kW/aLqSS2rCfZ28WdKlu6xPgZ9ltJdC3UZIUW5YYz/hGFHSM3esC
+eQoZ0eusM8FBRPqzLFqkrFuIREIEUAYXke4Lk2DDkJvKwaI4dVvjJH6fZYB8eAvc
+TJgGUlDOfN//W9i2CRM1vS0nUhmh9l43qYl2S/7tRZHAkZaRdhz/NOAMyCTwGKD+
+l7qEkM4MMVbQWhsXj4dGS786w1/SzyxWVwjH6iiH3mikwS6kKiTOifROlw88b7+8
+uUtPVqf+/KRDbwozsYBEDJBzZSs8ycNQFjEXpGI/zqU7C7GGZ2crsXbKVXYcuts=
+=+4lB
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.7.10.ebuild b/app-emulation/wine/wine-1.7.10.ebuild
new file mode 100644
index 000000000000..0b4a1d4a83f9
--- /dev/null
+++ b/app-emulation/wine/wine-1.7.10.ebuild
@@ -0,0 +1,436 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.10.ebuild,v 1.1 2014/01/04 03:49:37 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 fdo-mime 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.24"
+MV="4.5.2"
+PULSE_PATCHES="winepulse-patches-1.7.10"
+WINE_GENTOO="wine-gentoo-2013.06.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 )
+	pulseaudio? ( 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 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml"
+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"
+
+NATIVE_DEPEND="
+	truetype? ( >=media-libs/freetype-2.0.0  )
+	capi? ( net-dialup/capi4k-utils )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	udisks? ( sys-apps/dbus )
+	fontconfig? ( media-libs/fontconfig:= )
+	gphoto2? ( media-libs/libgphoto2:= )
+	openal? ( media-libs/openal:= )
+	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/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:0= )
+	ldap? ( net-nds/openldap:= )
+	lcms? ( media-libs/lcms:2= )
+	mp3? ( >=media-sound/mpg123-1.5.0 )
+	netapi? ( net-fs/samba[netapi(+)] )
+	nls? ( sys-devel/gettext )
+	odbc? ( dev-db/unixODBC:= )
+	osmesa? ( media-libs/mesa[osmesa] )
+	pulseaudio? ( media-sound/pulseaudio )
+	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 )"
+
+COMMON_DEPEND="
+	!amd64? ( ${NATIVE_DEPEND} )
+	amd64? (
+		abi_x86_64? ( ${NATIVE_DEPEND} )
+		abi_x86_32? (
+			truetype? ( || (
+				>=app-emulation/emul-linux-x86-xlibs-2.1[development]
+				>=media-libs/freetype-2.0.0[abi_x86_32]
+			) )
+			ncurses? ( || (
+				app-emulation/emul-linux-x86-baselibs[development]
+				sys-libs/ncurses[abi_x86_32]
+			) )
+			udisks? ( || (
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
+				sys-apps/dbus[abi_x86_32]
+			) )
+			fontconfig? ( || (
+				app-emulation/emul-linux-x86-xlibs[development]
+				media-libs/fontconfig[abi_x86_32]
+			) )
+			gphoto2? (
+				app-emulation/emul-linux-x86-medialibs[development]
+			)
+			openal? ( || (
+				app-emulation/emul-linux-x86-sdl[development]
+				media-libs/openal[abi_x86_32]
+			) )
+			gstreamer? (
+				app-emulation/emul-linux-x86-gstplugins
+				app-emulation/emul-linux-x86-medialibs[development]
+			)
+			X? ( || (
+				app-emulation/emul-linux-x86-xlibs[development]
+				(
+					x11-libs/libXcursor[abi_x86_32]
+					x11-libs/libXext[abi_x86_32]
+					x11-libs/libXrandr[abi_x86_32]
+					x11-libs/libXi[abi_x86_32]
+					x11-libs/libXxf86vm[abi_x86_32]
+				)
+			) )
+			xinerama? ( || (
+				app-emulation/emul-linux-x86-xlibs[development]
+				x11-libs/libXinerama[abi_x86_32]
+			) )
+			alsa? ( || (
+				app-emulation/emul-linux-x86-soundlibs[alsa,development]
+				media-libs/alsa-lib[abi_x86_32]
+			) )
+			cups? ( app-emulation/emul-linux-x86-baselibs )
+			opencl? ( virtual/opencl[abi_x86_32] )
+			opengl? ( || (
+				app-emulation/emul-linux-x86-opengl[development]
+				(
+					virtual/glu[abi_x86_32]
+					virtual/opengl[abi_x86_32]
+				)
+			) )
+			gsm? ( || (
+				app-emulation/emul-linux-x86-soundlibs[development]
+				media-sound/gsm[abi_x86_32]
+			) )
+			jpeg? ( || (
+				app-emulation/emul-linux-x86-baselibs[development]
+				virtual/jpeg:0[abi_x86_32]
+			) )
+			ldap? ( app-emulation/emul-linux-x86-baselibs[development] )
+			lcms? ( || (
+				app-emulation/emul-linux-x86-baselibs[development]
+				media-libs/lcms:2[abi_x86_32]
+			) )
+			mp3? ( || (
+				app-emulation/emul-linux-x86-soundlibs[development]
+				>=media-sound/mpg123-1.5.0[abi_x86_32]
+			) )
+			nls? ( app-emulation/emul-linux-x86-baselibs[development] )
+			odbc? ( app-emulation/emul-linux-x86-db[development] )
+			osmesa? ( || (
+				>=app-emulation/emul-linux-x86-opengl-20121028[development]
+				media-libs/mesa[osmesa,abi_x86_32]
+			) )
+			pulseaudio? ( || (
+				app-emulation/emul-linux-x86-soundlibs[development]
+				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
+			) )
+			xml? ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] )
+			scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
+			ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
+			png? ( || (
+				app-emulation/emul-linux-x86-baselibs[development]
+				media-libs/libpng:0[abi_x86_32]
+			) )
+			v4l? ( || (
+				app-emulation/emul-linux-x86-medialibs[development]
+				media-libs/libv4l[abi_x86_32]
+			) )
+			xcomposite? ( || (
+				app-emulation/emul-linux-x86-xlibs[development]
+				x11-libs/libXcomposite[abi_x86_32]
+			) )
+		)
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	dos? ( games-emulation/dosbox )
+	perl? ( dev-lang/perl dev-perl/XML-Simple )
+	samba? ( >=net-fs/samba-3.0.25 )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )
+	pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
+
+DEPEND="${COMMON_DEPEND}
+	amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) )
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	xinerama? ( x11-proto/xineramaproto )
+	prelink? ( sys-devel/prelink )
+	>=sys-kernel/linux-headers-2.6
+	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"
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
+		eerror "You need gcc-4.4+ to build 64-bit wine"
+		eerror
+		return 1
+	fi
+
+	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-2_src_unpack
+	else
+		unpack ${MY_P}.tar.bz2
+	fi
+
+	use pulseaudio && 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.7.2-osmesa-check.patch #429386
+		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
+	)
+	use pulseaudio && 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
+	if ! use run-exes; then
+		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
+}
+
+do_configure() {
+	local myeconfargs=( "${myeconfargs[@]}" )
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myeconfargs+=( --enable-win64 )
+		else
+			use netapi && ewarn "Disabling netapi in wine32; see https://bugs.gentoo.org/494394"
+			# We currently don't have 32-bit libnetapi on amd64; #494394
+			myeconfargs+=(
+				--without-netapi
+				--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 netapi)
+		$(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)
+	)
+
+	use pulseaudio && myeconfargs+=( --with-pulse )
+
+	if use amd64 && use abi_x86_32; then
+		# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+		# set AR and RANLIB to make QA scripts happy; #483342
+		tc-export PKG_CONFIG AR RANLIB
+	fi
+
+	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 )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS=( "${DOCS[@]}" ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+	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
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index dacdaf5b5743..64ef6e5af884 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.161 2013/12/17 12:33:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.162 2014/01/04 03:49:37 tetromino Exp $
 
 EAPI="5"
 
@@ -24,7 +24,7 @@ fi
 
 GV="2.24"
 MV="4.5.2"
-PULSE_PATCHES="winepulse-patches-1.7.8"
+PULSE_PATCHES="winepulse-patches-1.7.10"
 WINE_GENTOO="wine-gentoo-2013.06.24"
 DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"