Belated version bump (bug #490998, thanks to Frank Krömmelbein, Andreas Sturmlechner, Ryan Harris et al.); see http://www.winehq.org/announce/1.7.8 and http://www.winehq.org/announce/1.6.1 for the announcement. Pulseaudio patches are now applied only when USE=pulseaudio, since they apparently cause crashes in some applications when USE=-pulseaudio (bug #489004, thanks to Sebastian Parborg).

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

6 files changed, 919 insertions, 31 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 75c0a91ecfba..0b5bf4d73e85 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,18 @@
 # 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.486 2013/12/01 09:45:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.487 2013/12/16 00:28:21 tetromino Exp $
+
+*wine-1.7.8 (16 Dec 2013)
+*wine-1.6.1 (16 Dec 2013)
+
+  16 Dec 2013; Alexandre Rostovtsev <tetromino@gentoo.org> +wine-1.6.1.ebuild,
+  +wine-1.7.8.ebuild, wine-9999.ebuild, metadata.xml:
+  Belated version bump (bug #490998, thanks to Frank Krömmelbein, Andreas
+  Sturmlechner, Ryan Harris et al.); see http://www.winehq.org/announce/1.7.8
+  and http://www.winehq.org/announce/1.6.1 for the announcement. Pulseaudio
+  patches are now applied only when USE=pulseaudio, since they apparently cause
+  crashes in some applications when USE=-pulseaudio (bug #489004, thanks to
+  Sebastian Parborg).
 
   01 Dec 2013; Michał Górny <mgorny@gentoo.org> wine-1.7.4.ebuild,
   wine-9999.ebuild:
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 4ad9262c321c..95dc23486e0e 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -48,14 +48,17 @@ 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.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.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
 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
 DIST wine-mono-0.0.8.msi 46967296 SHA256 3dfc23bbc29015e4e538dab8b83cb825d3248a0e5cf3b3318503ee7331115402 SHA512 d3009f2301b0a006136e880025a736f24612faa7a954956896124ec7282d35b678f02658e8be12b1c02ee217e594a2c728a9258c36ccb346b186a4781951adbd WHIRLPOOL 1d4b2e88ebab1f603326a238cc908982c7e135a33340087e8645572838d2b6034764e9fe787bb890792dea4c0531d26f9a6a811a7c200edb99ab82f975179389
+DIST wine-mono-4.5.2.msi 52502528 SHA256 d9124edb41ba4418af10eba519dafb25ab4338c567d25ce0eb4ce1e1b4d7eaad SHA512 73c907f63b73836d5afd0753197358aaea43a74a47800f929ef0627112298256f1fa46d1b9ff297b117468d953cdeab21fb5962db13c5debbcb71004462df609 WHIRLPOOL 18d3544c6753c5a01917bfc1b694f31ce45213108527f13317ec0bb8b2d2339ce41800534967e067cd15cd186ef9e186a5d3252275e443dfa1a6ae3641d4d17c
 DIST wine_gecko-1.0.0-x86.cab 8119486 SHA256 7ddf697677506fb164c52771864e32dd69a359ed855b2efbc51340de2376c99c SHA512 0b8f778698f04ed2c01c25a866e54752ff67ad42099179c3c4d161b7f2cba92f262ee6ad909b382e57038428eacddf519b77934c079451eb0cbab6a030eee307 WHIRLPOOL d77903a7fecbc3ecc2d0ddb58fbc98fb401a796fc4d21b216de12702aef38a120c2e7d6f8279308a1d96b66b230973f076f267f246b3b1c02b40e40a518a57e7
 DIST wine_gecko-1.3-x86.msi 13609984 SHA256 4b7559e889eff5ed924d25ce49297aff55f43c4b9d34dafa970261d88c40b5ae SHA512 4d45ec762eba1fc2cc8ac1f6672e88ef392395ecd97a48038845c2dd7b40a49df7460cd88aff432b75bfe75231108710901a4759d2ab3998ed7052130d6bc46b WHIRLPOOL d9afae5ab439612e509fbe2b8a405a0252f872e826b0b6cb2c739c1cea0eb4c3a35e5152ac1ad583d17c21fec5c013a43f13779e92929b93e51ee819b70e73d7
 DIST wine_gecko-1.3-x86_64.msi 13835776 SHA256 07e9885d15ad22629c3854d6bd77094c3f4db1028ebda408ec87b101fa135d75 SHA512 26e596e498368f8307435a85e440205c1105e10538f8e6ddbb24fd022eed495e4f2d7f09b6b06d26b5a3cf1eb8d629f9baf342fcd239b3aeb16f08324e376e01 WHIRLPOOL 9f3502cf8514873ad3fb49aff0c63eda2b8fa3659d4dbecdb3366d4949cc0b256fcfa0e4269f011887e856113a3bf74dfc365348b9ab1a2c78eac98ab990d3ee
@@ -94,6 +97,7 @@ DIST winepulse-patches-1.6-rc1.tar.bz2 47873 SHA256 c963b08e520aafdc618caaa50044
 DIST winepulse-patches-1.7.0.tar.bz2 48368 SHA256 280f8583574d5f0ef437e15790f96d0ade9bd4b5cc44771ec89023f76728ba73 SHA512 67c36d380c40d3a8144fd5f9e5bf5eea6adfdd178a6ebf3727e281938bdaffddfcc2f49cb30837195cf47f4c176c1812f0ab64bc36c8981611fc86dc5a8266bc WHIRLPOOL d8775bfff9bac174cb91550643a1994a3d0ea2e22a24c05d46ca2a7a7521ff53f481880c2e0191c4f0494acf11a05a8183abca033aa58ac58bbc8bd762d02a5b
 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
 EBUILD wine-1.2.3.ebuild 6278 SHA256 ec9eb016245cd658db8599ce9463f001fbd12f6faac96b57688a86ed2a5b0409 SHA512 bebefc9fe86e82e06d18f02c18c92b8233a6a826361f3a2615a412aa7c68abd5e7d941c7fc2df69c221c3366d1a7bbf4f90c4aee7b0e44f2f73498a3ab099643 WHIRLPOOL 04cecb0c06f149355236faefeb662db84b7a383ea63c9676676b9b94c6201b397ce463f09ad63dfb179ea9eddf5aca224ffb78cec6440c1708eeabeee45d8ab5
 EBUILD wine-1.3.28.ebuild 5794 SHA256 8f431745c960072bd644b92aeab68dd9f23a752310f1f8288f0f6bd2a4461231 SHA512 ecfb8a4831f695fae93f283d55c16e3f5b795b4b34725b0778c381f5f7ac4031be42a89303f014848c231cf675e74b5247d7ba9ad706c264147ddd89645ece52 WHIRLPOOL 67dd67726a89c61b83a1c9b19c37c0695af449c5f726adf146810e8dce49ca6506d01b319f6058ad264aa1fe5fbca36056c0f82cd9dedea3f361da71c3c4cf98
 EBUILD wine-1.4.1.ebuild 6720 SHA256 e194a12bf7077bda6e387f76b4d724ad4a6cfab3f388d4ab21e4d9701104d47c SHA512 cbfb23af8db10ad33d0ae3505218163e5ebf9a4e82f5f417fcf93ea8636588ddb82421619f519a3302a2f4774f19ed03939e1cdb84ce8f2b4ecc66dbd7d349dc WHIRLPOOL a6263b7c3288d1a15700296e6a617d7bc100ccc97dc6696df1ad0a1b508f2176de2c7518617379f47db8c5aca9248b90c2b7c01956a374f8bb69d8be7fa0e67b
@@ -130,30 +134,24 @@ EBUILD wine-1.5.6.ebuild 6998 SHA256 e5b53be077c3f5b93e8c7d6613135ca537fb36d16d5
 EBUILD wine-1.5.7.ebuild 7230 SHA256 7adaf5bd12c8c1bdea2ef77621965d13b141314385eebc7fa9293b326f7188a6 SHA512 b4b4ef8f894527352c9a6affce27b08b6bf05843d700fcc4bc1387abf3f7d9118e465f1a695eda1f7f36b57d4e03a1608422e4dcdab6784051d75fa06c0da9d5 WHIRLPOOL 9566c9de567852bd234424138920cfad6d1e54bc0ecca2464c33a0a0a2194eaad1eeca687b1f2308970ed429ea32ac5fd3dbcde27965dcdb8331837d987822ea
 EBUILD wine-1.5.8.ebuild 7230 SHA256 726939d8ef8aa0131709a2b5da0d31d35e40f3f30f74257901c991c5dc35bf77 SHA512 408e64f289724abbf88a975464c99977e8358ddf0044798fb26bd584bccde6a56273730cbbe60de31dbaf33ed3cd30c3de8ad9ea30d6b5bcdd188c34f4e7060e WHIRLPOOL fa6ac4eb1fb90524ded60d9fdda4a6860d70a97eabbfa77775a1b697192fb57cb5c093185f3bd0ab569090efbb1a1093ffa43f1b61435613234015bc98457b14
 EBUILD wine-1.5.9.ebuild 7230 SHA256 817512124347085810db9c0528cbeffce07e2cc1ec516b8a7f44a427f52a69ed SHA512 07c87462e77fef0ce94c8b53e236be818a407cab570694d7d572b8252ad99d31b18bf631e8bd748ba7e631898f468dd889cef8afd1cb07673e7c7b6f7ae6395e WHIRLPOOL efbb94392064a0b47f06dc5c32ae83e601d42bbba229e05a2138dc7f1ce70fb342331c3ef27fec645e417fa9cad60ca83c69ff4c3174708f24af01e08dec0a36
+EBUILD wine-1.6.1.ebuild 12565 SHA256 8c70f125ac525c9c2f783ae2d84e7d99bb4afae2ec823fff9f927920b760c662 SHA512 b9cff8fe60431d81bed83da01658ee8d7b8694b4cac3a88f95bd9b60328cbbb739dd2692a1174b660afaa6e456c9ab8918dd836b2e16c94a8edafd3fa5f7abf9 WHIRLPOOL fe428ce804326f891840b623f34802ed019342b0546b5eb859c73042e342c11150d261f18ea94e537611a2d587b2bc5ebc191b8b9fecd2ab1ba02d1664d845fa
 EBUILD wine-1.6.ebuild 12643 SHA256 2c99b3d3ada5721969b7fc85af69b795497f96ef72ddfa4ad20e0acbacd920ec SHA512 6db088b339aa4a64f834c99deda6bf3ab599fe0aa25a70521168ecd17741f9e7168fc4e470448dd6f5dde61c22179b59649be89c04728d474ff69ef2d43d19a0 WHIRLPOOL 1d8da652577646133f26b259c8d871f414f437180ba81d5e67cf5db36dc831ba3513eced8de8bdb6447c74248decd4336e9a8e0f3ecee1dce8006f5e8d7898db
 EBUILD wine-1.7.0.ebuild 12562 SHA256 b060d125bdbc4aaedb6290f5271f3eddb45970c7814a007669c3311afa2d8262 SHA512 2714e9f4ceb9225e69cc6318541fafaef91179c7f1be4d3dcfef949490b25051fca4d0992df9d8dd9796e831b65fcf46275d839e6dbc93130e2d88813db0ffff WHIRLPOOL 9d502249055bdb68e1e630b88a299bd059f1beae18ca6e46f4ba59edb12bd3009e7b393550aa8bea8231651c6a072946c8a6357d3a3ad1ae99a2bdd54e6aff73
 EBUILD wine-1.7.3.ebuild 12564 SHA256 9fa4e02b7f5d5e261c042860993e875bd90355b984d47271d93a6974f7ca50ab SHA512 b9984e8fd0bd422425bdc24c9f3e3e00aa76989389a8bab9969617a472c780a693f5e1fc9537fa6cdfc9c215f6000d8308c49617a34c3f7e8e71a1b6e7ad9360 WHIRLPOOL 14f975ee68b970150ce4681db6b34fbb1c59d369d7895448fc3a7529abe35dfcb5bccc1bb357122035e3974dff217201c401262d3a0b0e333f6c5714305e2d1b
 EBUILD wine-1.7.4.ebuild 12623 SHA256 bfd515e4c98ac0ab01106e71b0182d3e832e62feb02ee0b940c191f660969a66 SHA512 69e50cdfd5195f13ded1c3799365794b946ac80cc8f902560258851e36152d639410cf6851d455e995df487f08cfdb5022000c7b27e59eece7a7d90385f229c4 WHIRLPOOL c3b1ec3503b17a0db7dbe2f2e4ca5dc2318ee4192e250a65704d1394defc4a25a2baa5cffe5cc54888c271a4bea38451f680fd3d98bee05783133fdc6c60cd42
-EBUILD wine-9999.ebuild 12624 SHA256 6b04457d96b8689025e152c0b762c18410f04700dabab0fa0ff1607bfa1cddf1 SHA512 402daa322e2ca30d5c865b9a86cfd9436e7938f544a11675783e17497752dd9676356af8a8badf32ff3b74c295da762b118e2588a5b5447eb1f3aa36486fe925 WHIRLPOOL 0193d90d62e4cc88428b84f97ecf545d3872fffb88ffe029e80bc9ade8bc9a095fad718ccc1bf2b952000670b31636079deb50a3578dc1c90f2bd1418c78ac3e
-MISC ChangeLog 14944 SHA256 0fce9c4dacf2780e60391d7c47a2882d5eb30b2a61fd5705f098ec097e41c12f SHA512 2ada41743ae14a9d996b4d0688e4888a311a51e49649f90043a57a2f648f7aeec91e31b48fa82bac74dad48bed9f31144745e4967d3d22429646e89c0143f3f7 WHIRLPOOL 98ca7007e34135c4c6c30ab98ba6741bbfdda9d4e9703ef98bf092038dfd4791de4ffe9e5fbfc1bb0589bf04fcd97362cd8cd92570f7b672d9142bd6e432f1f3
+EBUILD wine-1.7.8.ebuild 12717 SHA256 9117e739ceb8f1cb2eacbe3dcd9e98c333ecbb0dffaf319cc5985dab1e174bcc SHA512 e577c4cacf13c2f5cbb25ee216189c1c3adbe97070f76f1081cece0ce88a68de19bdd78e9761b46d66d42810ac042b8b704cfd84b53af8ec79fc0da36b98bbd0 WHIRLPOOL a2fa27f28345f8913094af0719e33e1f5f36b7722812a8f2980b465a877088ade252be2b7f459d06b7ba2b78d4db03f0edbd27fd6ed8b8d4efc255d76785d24f
+EBUILD wine-9999.ebuild 12718 SHA256 bc821d87c6711af902699520efefa12c3e20c9f1e47a0795ddbbe36a6a888056 SHA512 7b81cbec33fe1630775edd3b7b30485a37e0b355a55f87b9c2f6fea14d1032ae70826dc2a82170cd8b30d08c4d55dcfbb552139af90fb078a4fea96fcfff9418 WHIRLPOOL 23da091d380b8818e27af4e6330ae400a0fbbd32ce02b8127501d9b56bcf70955f963a5911463e6d09a9d361a5cb60031cc3c06a8301fafce7c2419d9b505ed5
+MISC ChangeLog 15541 SHA256 eb6d4c644b4b70fd2d74dabc14d0e0ab7b71e789ca20a586c987d1074af993aa SHA512 a7cb8e8f0b2ff06263d7547940e4134a2a8a8874ec19dc13688312d6b53fe278c6d25e705ef653d86deb28d09f3bc5bab257821decabec1ce296c9bf189556c0 WHIRLPOOL f50e82cba9743cf266e23da0326df6086308537ae2a3d58c83ff71d5d82dea55d653b6a3cd58612c7c969e1484081cb2398175150ba87e6f638c78fc714f1d09
 MISC ChangeLog-2012 100362 SHA256 8e70fc54e7945c1f41e3e0b64fef6b9a7fe89acdaf8c79a06a16048fe8d2e26c SHA512 ca875e847ba100e1f19774b31a2b45a81d776275e3d11944be8a7b01dfcdbf4265b1a340d691bc4fe4054fea006059a06ed52bc0516b1f8b44a1772a1c813278 WHIRLPOOL 36ec708601a25cb8fa93b471112538480b6ef82cc4e6703b3d045f883078b49209ceaeef7bafa8417b881c2d11df84df9c83d1985d0d687a11f3db3de5abb014
-MISC metadata.xml 2121 SHA256 89e8b63b2f497296c3c9728a03afcfbc65b234d64b8109aabb6d61aa75c1534e SHA512 f08d378bded55681c85067aafa352b81f2efd269f8e061f106ab9cfa9d2698255480ee85c3ff58f58670e0b7980d4ecb2bf9ec18c4d199e915cb4cae80caf930 WHIRLPOOL 6bdd7b61d48b1aef4263ad76faf3b137aa0a9e9d4bdc803d859478cbc8215d59c11c0a907eb40832a3ec4cbb5e19f25920e39c54019c9a69dbdc4b6fadda6c64
+MISC metadata.xml 2236 SHA256 2b4d3de73fa84f3f3d192e3d29d8fd22796d4c5630151a380c3c33597263436e SHA512 884a7aa53e7694cec121453103bf3873cba1a8323f8a6ee5fc5e326b05610f1c2d36c07bc357c12777749a33f0ebf986f78341fea5c752dc14f3ab4b90f137a5 WHIRLPOOL 3a2b66e0af17c2e260621e5e065ece87be1a355c8da5bf3c8638f360ed5d1dcd062c44b0e26e72a708e5bc4fb5d8e054e0049ab58b090fc2fe5ed6e2cdee9c19
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSmwUuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOjFYQAIUxCByEY965lBjWPEFNIolT
-0MPkqFrkCnWrzGxOwoxnIq9a3zQ7vDno5liKER3yRzvIK2tAxmyIj46K0Rjergej
-Fv+qHZB8bLCIrMwc62HDdnBvjTBo0jbDT3u6UevQMCtnmOBxi32osEYRlpnGVrb4
-M5lVjiRqiDzBhmmG39tydqLeO0dMMCCbk8AvYfsdodbyAU3MKY7CHN2FkjX6nZ1G
-3nWnWZE8QevQVAso89OyTGJEuXPsh0FVztPTcnIZj6Z2Dtqf9X6P1JpLUfLqFO7i
-6VnQMwidOlO1PyxzM+tOsOxE/Hdtep07tMwc4jcCUdYF7hEuZbf6sUFy/qrcG/El
-ih8onNRvIc/W95EOmsMB8IBlJcf9zZAaVJ6BuCtBzNwiXQICZnJOxwQdb62luRrM
-nAjcXTd6X9NELJFKXVoQ9eox4DDQMuTj+dcR4Q5Iy8CsnAIuQSdOO83iUrMIJ2Ye
-Wj1l9xxnmK1/e3sLhAbJO70Vfl7+MUR0AdX1jxaRIOTLseCYplNOumZodo7fgf4O
-s9rlHzAFB6c8rcySruRXteDY6zoPjKCAWO1qgOsHHby6thEHLxuWUXsLUXuD1zmF
-wzw2a87sCnXxd2VkaIjtTfU2vLxY7o1OZlMGe1Ve7Y8AFgxbSxFR/D5oUizNY/fV
-0+VUqK9lJfNk7ZqK6wUO
-=cbfb
+iQEcBAEBCAAGBQJSrkktAAoJEJ0WA1zPCt1hPhcH/izFQLaPGbu36d1VS54/C/lx
+PkTKcOjWk81lkDCZ8k0/JsHgBNDJI4O/ZYvhJ69w34SuSRekZH6YmZUQ69K9g1kD
+rNKjB1v3hvV9OA/qT2Xjz9xq+flTbVoMGtMl7z9691KJV0L2dMZUVXgHbCXBrVsB
+EUQ9hs48FaCU0u5qJMH2udyQsb/LWp6aStRMSj82PGzzUp6xVWWM9MDW1HLatWgP
+KdYWnd/cfCC2IuUqND10OTTpRKHXRUwWCPtMak95K3+GG0av4nUjntbLkgOsN4xp
+8A0kMVXysuPjhAwrPyySqgk93Ji8qGPBt2TK2kzjERHabcOIBs7kUQU/pK7hKAc=
+=w4ga
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml
index b30fa4315503..9cba69b92c9e 100644
--- a/app-emulation/wine/metadata.xml
+++ b/app-emulation/wine/metadata.xml
@@ -13,6 +13,7 @@ Think of Wine as a compatibility layer for running Windows programs. Wine does n
 	<flag name='dos'>Pull in <pkg>games-emulation/dosbox</pkg> to run DOS applications</flag>
 	<flag name='gecko'>Add support for the Gecko engine when using iexplore</flag>
 	<flag name='mono'>Add support for .NET using Wine's Mono add-on</flag>
+	<flag name='netapi'>Use libnetapi from <pkg>net-fs/samba</pkg> to support Windows networks in netapi32.dll</flag>
 	<flag name='opencl'>Enable OpenCL support</flag>
 	<flag name='osmesa'>Add support for OpenGL in bitmaps using libOSMesa</flag>
 	<flag name='perl'>Install helpers written in perl (winedump/winemaker)</flag>
diff --git a/app-emulation/wine/wine-1.6.1.ebuild b/app-emulation/wine/wine-1.6.1.ebuild
new file mode 100644
index 000000000000..ab4849778278
--- /dev/null
+++ b/app-emulation/wine/wine-1.6.1.ebuild
@@ -0,0 +1,432 @@
+# 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.1.ebuild,v 1.1 2013/12/16 00:28:21 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.21"
+MV="0.0.8"
+PULSE_PATCHES="winepulse-patches-1.6-rc1"
+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 )
+	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 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:0= )
+	mp3? ( >=media-sound/mpg123-1.5.0 )
+	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:0[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]
+			) )
+			xml? ( >=app-emulation/emul-linux-x86-baselibs-20130224[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]
+			) )
+		)
+	)"
+[[ ${PV} == "9999" ]] || COMMON_DEPEND="${COMMON_DEPEND}
+	amd64? ( abi_x86_32? ( pulseaudio? (
+		|| (
+			app-emulation/emul-linux-x86-soundlibs[development]
+			>=media-sound/pulseaudio-4.0-r1[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 )"
+[[ ${PV} == "9999" ]] || RDEPEND="${RDEPEND}
+	pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
+
+DEPEND="${COMMON_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
+			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)
+	)
+
+	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-1.7.8.ebuild b/app-emulation/wine/wine-1.7.8.ebuild
new file mode 100644
index 000000000000..728bcbf80447
--- /dev/null
+++ b/app-emulation/wine/wine-1.7.8.ebuild
@@ -0,0 +1,438 @@
+# 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.7.8.ebuild,v 1.1 2013/12/16 00:28:21 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.8"
+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 )
+	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]
+			) )
+			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]
+			) )
+		)
+	)"
+[[ ${PV} == "9999" ]] || COMMON_DEPEND="${COMMON_DEPEND}
+	amd64? ( abi_x86_32? ( pulseaudio? (
+		|| (
+			app-emulation/emul-linux-x86-soundlibs[development]
+			>=media-sound/pulseaudio-4.0-r1[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 )"
+[[ ${PV} == "9999" ]] || RDEPEND="${RDEPEND}
+	pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
+
+DEPEND="${COMMON_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
+			# 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 0c4711942b2b..4ace117b4d68 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.158 2013/12/01 09:45:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.159 2013/12/16 00:28:21 tetromino Exp $
 
 EAPI="5"
 
@@ -23,8 +23,8 @@ else
 fi
 
 GV="2.24"
-MV="0.0.8"
-PULSE_PATCHES="winepulse-patches-1.7.4"
+MV="4.5.2"
+PULSE_PATCHES="winepulse-patches-1.7.8"
 WINE_GENTOO="wine-gentoo-2013.06.24"
 DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
@@ -39,8 +39,7 @@ SRC_URI="${SRC_URI}
 
 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 nls odbc openal opencl +opengl osmesa oss +perl +png +prelink +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml"
-[[ ${PV} == "9999" ]] || IUSE="${IUSE} pulseaudio"
+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 )
@@ -80,17 +79,17 @@ NATIVE_DEPEND="
 	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 )"
-[[ ${PV} == "9999" ]] || NATIVE_DEPEND="${NATIVE_DEPEND}
-	pulseaudio? ( media-sound/pulseaudio )"
 
 COMMON_DEPEND="
 	!amd64? ( ${NATIVE_DEPEND} )
@@ -105,7 +104,10 @@ COMMON_DEPEND="
 				app-emulation/emul-linux-x86-baselibs[development]
 				sys-libs/ncurses[abi_x86_32]
 			) )
-			udisks? ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] )
+			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]
@@ -257,7 +259,7 @@ src_unpack() {
 		unpack ${MY_P}.tar.bz2
 	fi
 
-	unpack "${PULSE_PATCHES}.tar.bz2"
+	use pulseaudio && unpack "${PULSE_PATCHES}.tar.bz2"
 	unpack "${WINE_GENTOO}.tar.bz2"
 
 	l10n_find_plocales_changes "${S}/po" "" ".po"
@@ -271,7 +273,7 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.7.2-osmesa-check.patch #429386
 		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
 	)
-	[[ ${PV} == "9999" ]] || PATCHES+=(
+	use pulseaudio && PATCHES+=(
 		"../${PULSE_PATCHES}"/*.patch #421365
 	)
 
@@ -299,7 +301,11 @@ do_configure() {
 		if [[ ${ABI} == amd64 ]]; then
 			myeconfargs+=( --enable-win64 )
 		else
-			myeconfargs+=( --disable-win64 )
+			# 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
@@ -330,6 +336,7 @@ src_configure() {
 		$(use_with jpeg)
 		$(use_with ldap)
 		$(use_with mp3 mpg123)
+		$(use_with netapi)
 		$(use_with nls gettext)
 		$(use_with openal)
 		$(use_with opencl)
@@ -349,7 +356,7 @@ src_configure() {
 		$(use_with xml xslt)
 	)
 
-	[[ ${PV} == "9999" ]] || myeconfargs+=( $(use_with pulseaudio pulse) )
+	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