Version bump, see http://www.winehq.org/announce/1.7.20 for the announcement. Use samba with ABI_X86="32 64" for win32 netapi support; note that there is no emul-linux-x86-* alternative for netapi. Switch to multilib-minimal.eclass (bugs #494394 and #511184, thanks to Michał Górny). Enable experimental pthreads patch from winepulse patchset, otherwise gstreamer support is simply broken with any version of dev-libs/glib we have in portage.

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

4 files changed, 629 insertions, 136 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index a44e6575226a..556bf82e97ad 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.513 2014/06/15 13:59:29 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.514 2014/06/16 12:08:06 tetromino Exp $
+
+*wine-1.7.20 (16 Jun 2014)
+
+  16 Jun 2014; Alexandre Rostovtsev <tetromino@gentoo.org> +wine-1.7.20.ebuild,
+  wine-9999.ebuild:
+  Version bump, see http://www.winehq.org/announce/1.7.20 for the announcement.
+  Use samba with ABI_X86="32 64" for win32 netapi support; note that there is
+  no emul-linux-x86-* alternative for netapi. Switch to multilib-minimal.eclass
+  (bugs #494394 and #511184, thanks to Michał Górny). Enable experimental
+  pthreads patch from winepulse patchset, otherwise gstreamer support is simply
+  broken with any version of dev-libs/glib we have in portage.
 
   15 Jun 2014; Michał Górny <mgorny@gentoo.org> wine-1.7.19-r1.ebuild:
   Disallow mixing of emul-linux-x86 with multilib dependencies, since all
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 70f548051fe1..6ffec9f6d57b 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -63,11 +63,13 @@ DIST wine-1.7.16.tar.bz2 21478085 SHA256 071ed89d9c76219aa73df6472b99f9f0b35e497
 DIST wine-1.7.17.tar.bz2 21531865 SHA256 bb6fbd7fd70f9aafba557995d9ce537ded56e750e0a89a062e3318d584a8abef SHA512 32ff77d201200cb8a159395fe5d410b118bf4db16a89a9708128dbb7c25e45457c80d76e2821edf06db99525e5a93b6b1a7ee7166d7972f7ceb7fc47aaf8784b WHIRLPOOL 55f6fe3fced59c6344b2656a22eeba478be4a138ec26c28306316cb0dfdaed0c41f71584dbda683070a1a03a45a010fdd2989a8cb95a81294fa2d8b13c55cbaf
 DIST wine-1.7.18.tar.bz2 21595718 SHA256 dab6d12e620e2097a6838a3f6928f3b2ca3aab0b70521b53107ee1998303d378 SHA512 059f60318508f158cceef029c111c2b11bdf334def95aa96361163358ad7632f87fe0d1d9a05060a5b76ddcb367d8490fd31a1b512ecf7cd01f7be82a8ff8677 WHIRLPOOL 8b2dfdb85a7271a447fc827f4afb697bebc3fa3f52463b0debb1631e3c156fe46b00839d94b7e27be1407009608f54f07acb211c68fb6448f7ad30ccbdacf55d
 DIST wine-1.7.19.tar.bz2 21633142 SHA256 c5ea9b00c9029ecf47a25881b284d8ea02079dfbabc22aa789d6d07e38b32ff2 SHA512 3bf6399027752150469046c3ea51ff0c7e56bca7ed8db7def16c16c41f31c118c5217bb67882b7de88eb710f2af4a89e2858b82071523d5f9cd00ec66dd0348c WHIRLPOOL b125e2ec48801349bc73483527213daee20674a2e93f30f41e6fe138884ec7a4dbe0698b15ed69ed1062f0a045e11526fab8f23ed701147c85ebc1db0afb7f2d
+DIST wine-1.7.20.tar.bz2 21635815 SHA256 9c431b0b96222d0c27a2c2326ed88298ac0dae50ea783ef764c48c4373bf5f15 SHA512 ffc168ff4342fb5d8fb4a4a242c37f91613e983d644bd6b6d8798110b12339806d58d3abca8856855c286e40b9e4344a17fc834731dd03a42ea0743d1f24bd44 WHIRLPOOL 5ad69f9355897b4ce72c18c239dca2909d0c6094ff2c763731834d5b313fe04806648966e9d60408a14c0cf0dcb981587ffc0edaec8af07fe0a138364062fa53
 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-1.7.9.tar.bz2 21323337 SHA256 79f99ecc24696915439c474c4953bb77652ab53f16b41daa4da270fe43279c5a SHA512 29f8aa715ebe47c8a06bd5f6a80cac3fb75b2ca7aa81648cc8aed5461cfd825e4da68b6209ca672dce42b968521cfd9bffffaadd2d85b904b55d99687a1c83d0 WHIRLPOOL 333fee72b2a0e9d6ab8a003712c38166bd27aaff384a2b940c089ecc846f7669c59efbeb5cdc2fc87a46d63b0d29d0335873bb7c22f05913bad430b81990241a
 DIST wine-compholio-daily-1.7.18-1.tar.gz 874844 SHA256 3b42267d2e8b06895cbd16b1941d933efa6d1c01f0a396a12dedbbfb3be4a41f SHA512 d33aed231c64e713967770e2b118fde03b14b6e32cea42037c4940ea9bdacfec2299e9253fe4cb67d557e77d695d5e3ad8363b2c7c8ab788e5e8914bb2102a06 WHIRLPOOL 5997677575dfd9823e6e14f0d4e668ccbf6b75a555e33692c1b986629f438271821c3d68de684202e9cf67d044643577cb63f46645e17386017afb6a68c0add1
+DIST wine-compholio-daily-1.7.20.tar.gz 887611 SHA256 d61244de8ed14bba4fff12b2c9fa8e16bef485efc60567019a18674444c691d9 SHA512 7eb763e908bf960060f7932273c330ac263290fbce0803ae1b4fbe000ec60cf7b3221749c4b5af7f7001963446c5b24484ec192bf13b28cdbf7953727b6e6132 WHIRLPOOL 49885b58eafebb756d15599dc3bfbd766b2557f157c27f735c5d73147ef74fcdef0ecbd8b724bf3e6a6a68eb36126af486e204ffb1afa1b31feacf6e1a9952cc
 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
@@ -111,6 +113,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.10.tar.bz2 49205 SHA256 7330b4552b572244bbe99c16005d725eaf382995c986add170474381b90df468 SHA512 ef3a5477bc5803bfba609dc3299a7c07833958628d1aff01d100da57c0d270344ee326649206708c50c2a12b025f987a4e0f1dee9126e52e2778b256c45ba567 WHIRLPOOL b40088d8665f3cc57b4936774ac6dc2e6b005d75aa7c7385248ce35e5cf6e168ae212771f771b68dbf91fc5034b7ba54f907e93283cc2eddaa18e825d9b734a9
 DIST winepulse-patches-1.7.12.tar.bz2 49171 SHA256 6c5b3f46ea1c4615c49ee0f6f65936cf650cce6640f0feb4236c707064a9d392 SHA512 ec41f6024d6e2325f14f8caa15bbe38c8dca6c69beb5343063365f58dd8b7edbbc4d24ad176de72cf0e37acae03eb9769b68fcbd40a672680e06156f4a59b12c WHIRLPOOL de8a33ee784606e76a60166e3e29a1fb748ce4b3af1db136558888bd09bb0a044e4a1a9a61ce3de59d55f93c98575ac8d77c3ff17de4d69cda3b8fbd8f6c33c5
+DIST winepulse-patches-1.7.20.tar.bz2 52583 SHA256 95d0febb72baa73d5faeb82de774b49eaa9e38aa74448ea313c62f6eb1f4faf3 SHA512 9d7108fd2076d9a19dff5e72a25aa57f0946e6d17cfcc07422cce3fca34dfe04521d09cbfe611701781e10ad1f0d00562cba974214a4d189b16f6ded96ef61bf WHIRLPOOL 815d1cbf43b64a7a1a3aae965c6521ee3c6147458913f13236ccec7848340663d8372280f53eed381f3f68969bb06b272c30c605c290e31a678fc8d01575a766
 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
@@ -164,30 +167,23 @@ EBUILD wine-1.7.16.ebuild 12899 SHA256 38860f0c1d1cbd4a8c7fdb23b098d0e59273632d0
 EBUILD wine-1.7.17.ebuild 12899 SHA256 dc110b7032383d59d4417dfa881b71b2a3777b7ae446fc2508687f596d52f2d4 SHA512 b0fe20e540fc7b2a7756d8e76a2f9eb4609e6a1b36d612029e7a407f3c39b4aefd8ac35f16973a2ee060dab58963a4b33593c3462ff067813a3391ca43af5516 WHIRLPOOL c69897371b9adb51989c741aed6e49cae5c1b626f88cfb565b6a44d52c513c5ef834cb38f83b6b11bae5bc8a4a85f97d377ac5904a481c58117ccf15ff9dedcd
 EBUILD wine-1.7.18.ebuild 12899 SHA256 2fe276899e605599e6b9d1a4ebdb7a4f91146b6b4001bd1364a18d89936768b9 SHA512 534ebf9e9d552cf84acaa6081be5505bd2ff4c7cb0eacbeb5f99b5c8f3c59c3f446cc71de2eae241581216da6ff56e06e5e5420ec18de7b7932307c6c2788db8 WHIRLPOOL 458f61c473487d1c926aaf5f67aaffb855841c52fba72aef9b4fe8f556fb0f59a2092408b8c7083d38d74442850edf0084bb3cd30b5c123854a4fed5a7736389
 EBUILD wine-1.7.19-r1.ebuild 15163 SHA256 b58bdc04801a3bd8015bcd6283d607ec156533132fb8a1b69dcbb3863766c749 SHA512 3efbe7114b98e8e4fc5dab2cf47c9b0cd7c7fca210d2ba99b1c3033660eca89c14276f9643fb1e2b474a3354052da1e98f94e8024cf4e65bc9ef197c8dc9a543 WHIRLPOOL 60fe7d6e13f55987b68399682444a252e9ff06f879ab27e10672fa1704d41a4f9037662275dafc46404be258c92814ee4959f0ba70a9e8365786a45439e5da15
+EBUILD wine-1.7.20.ebuild 14979 SHA256 3f317364b9a2c666341c98786563994556e04464a814655b85594942ef3ff24e SHA512 4f2ff8930b1c248c55fdcb1dd5ccf536ae92400e34470f9a082fcd5695fc3420433dc9ca5e755e07d943d611f000329ca979e3e33653f12fc79a2dae812398ca WHIRLPOOL a50f4b070e61ea5dc021256a8eaf6e3058afd44f37f4120fb556a259e9bf98d369567f3367c5c966165bb05eabd77b021996eb3f628c79a22150ef1d66953729
 EBUILD wine-1.7.3.ebuild 12565 SHA256 d4d42f201a5002b4b9544387d25852cb405f07b2b3aa73eeb10a0cecb803f9fa SHA512 471623eab39c56fa146b033f11101d0146dfaf6af799c0e6bdfc25cf383ac2287a8010fa92c6d1458aa04cc5771d0da0d10d9010755061ab1220955cdaba8d43 WHIRLPOOL d90283e6f9a137b5968f8a0b3a7666442ff1d9386da0faafb78b2de6042712954ea56e802a8e4aa029de2093aca4baa42fc772da7936b5302b5cad2f09b61485
 EBUILD wine-1.7.4.ebuild 12565 SHA256 48459fa1d9211d785b6ce3665d51f619ab2f45c50449a3d6ded5df9f17464ea2 SHA512 6265037bfd2440ffe3a2c0f4f7b281c36edc3207dbd3956da9ce596aa46b3f2ddde65d2f7ab39bc5518fddc980fa8578adb0b0a6d1187cedd710f8a85c7d9432 WHIRLPOOL 27df5ace4d2decef09b780e00ab857922b0e308e912484ffd60b57450d653daf9f254d8e2b594efee223fb96467016349282b59ee6e8eeaaa159998b4d943886
 EBUILD wine-1.7.8.ebuild 12896 SHA256 84904dbdcf3ecf20b67dacf66a9e2c49f5e58bec5e1e9b68e54f1f8712a22921 SHA512 b8d99f97dd6a271b4f3e7d91c6ef44db942db9fbc1e16058235ef2ac379749e8057e18cb8ba2d8060c215015b568e8432f3c11b94e57aaba8a194edf92d570e7 WHIRLPOOL 5d7e52d8311819473b6fc0507394a04bef4cb86bdf80c77f4341d43367a1a5b27c36f93087b48df92241bb00eb93398f593d9ad52ee3cdcac7f1e7372e20ed3e
 EBUILD wine-1.7.9.ebuild 12896 SHA256 1b0432f149e9525e7fc65d97a2f9b2f2aef3b8932cb5b73aa0481936f2e5abe0 SHA512 e59c3e4d7f9a9c290ea3494f90509463e85c37bb1eab7df7706e9bcfa636d9ab3b62ee528ea91dc94b90b8ebe61fafa81b29a371c3b1e7b8da55859a20d7b03e WHIRLPOOL 0eea56d13e09dbdb145cfc798c8f5a4bc507cef5a561ee82a0868fb8ffba0caeb994685b6bc91b47558b2af5fe6ad4ed190c476fe056dece17912950efb73a30
-EBUILD wine-9999.ebuild 14640 SHA256 2bcbc86742adfdc52b793974a23e6d6422c25ab5d209c6ef78c285b494bea211 SHA512 afc3de335050e9999a9b0e83ceaa9eca62052b8f5835f8a3e7952acf95953a0f7bb21ce25629c9a833c7b378569fcf44fe4ef1f7696deeeadaa73dbdeec01cd8 WHIRLPOOL 2cf8729accfc652804a40cc7f65dedd2a5cfd96e557b5a8d731c6594ec081bd30298a04065b2b78d4159d0cad4e7ac90b8e7a7708828eb000a4874652b1a3133
-MISC ChangeLog 20268 SHA256 2caf0f75695390c420d413620f5737bf2b7b00858eb7492121dbd9cade70d37c SHA512 c43e16aaf2c68a6ccedbeb7a8e4ab67afb8f847ffa1e901a2a076cd55a98d4904545f4d6657f0d461afc51b727d268cee990af99581b2cd132453a5972e1c415 WHIRLPOOL 95d5003e07a1a3cd16b0d74be3380cffd00e081d2c118210228697a529c1d12a0aa8b13fa43526d85836a5d9712c3652b3f370236c2898578631580a4b193ae4
+EBUILD wine-9999.ebuild 14979 SHA256 a1f70a4269e68ce12b48d0585be3f554796eda54119794e9aca5c061ef4d8267 SHA512 058acee2999d0df7af8963b46f9c7b11b5fed63f651a0395b5724dc922cbd9fa20c772c85916903c70ed7b9fba4fb2863da3889b84bf968715c82c54575c1b79 WHIRLPOOL 1b5fef554bd47c670ec29fdf8ba6539ea1f4dfa1f34f7f20c95ef4ddf40799a39181eea1484b5d0d086519c3d466d65ff06270f4baadd2c761346fb3eef3a254
+MISC ChangeLog 20857 SHA256 4552f475464bd863cf939af5da22670de40e5d65933d74c03bca7529375fff5c SHA512 11f2ba632681d21111e17f7fb17bdbcc85adaba8355f842c12bbf23a1d15286ea71261cc6ac67a4ace7779da357de2b500e933f66334055734c564edae399a7c WHIRLPOOL 7973d42d251abf6292d35d6acfd11ed394912cde5d4eb6a1e7961e9271e6a4b95fd347c4b506195c213482f0080428e183cb8fdee928c44d105abaccb2b17bdd
 MISC ChangeLog-2012 100362 SHA256 8e70fc54e7945c1f41e3e0b64fef6b9a7fe89acdaf8c79a06a16048fe8d2e26c SHA512 ca875e847ba100e1f19774b31a2b45a81d776275e3d11944be8a7b01dfcdbf4265b1a340d691bc4fe4054fea006059a06ed52bc0516b1f8b44a1772a1c813278 WHIRLPOOL 36ec708601a25cb8fa93b471112538480b6ef82cc4e6703b3d045f883078b49209ceaeef7bafa8417b881c2d11df84df9c83d1985d0d687a11f3db3de5abb014
 MISC metadata.xml 2361 SHA256 f225b49cac75fd5819b57d69269a33580d83982224d237eed598d2b596ad8939 SHA512 30b6f5748c91dd183628a39e4f9a6e6955bc8b97a27b65bcd8b8698dccaad85f4dbc37981d8080639387d5ae5171cb7685addd686abfefc2d74a9427533c181c WHIRLPOOL 1aeac34fa080dc115d8489e7937c5e06edb5f717f72fa98c10420088a94844fa34952d16976d7af69651dcc02b73e74a589c936926c2b686ebb1a429e6111bad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTnabDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOIosP+gI1cwEaWEZ/HKtXS+qqfWQW
-zUxLiWacjHvX2k9k31qn5IfAYG/0fRS759QCARzfdpOEBslr/ppe87Uqcbj5CYYf
-B1bYzxs00Wq8UztRZAC0FIIaNpRWVSTrRa3x67xeAFJJnCC7VQL8Mw2mHj3XnBCE
-c/nb8Z1s5IbGWa05dwCBLA1n1+QcOrBXxF6wX8e90FXTFCVsRnfZRTuVNt1GoxFb
-tOR/6NOyjybcAp2RHuSEGLKjIqyEB+R1PqhcE/J//1fOPWE/N/3k1XIxivPD9YSR
-iD3bseaFcFywp4wB5FdKo/lXRna/FkLzCpfq0/FZC2XVTXc6CMtqdw+x8oJhONPi
-iVU/aGIHsw6tQ88IeBhjJb3w8Y5lDf/NI5GEVwDKihQPsMtqUfwGrC4FyCyuPZqx
-/wWMtc+viq5dMkRBhMS36aQyDTlepyDaPo1H1+kD/5TwJPD4Kx50oflnXLHwrViu
-kXxJ6GslFdjw+HrEKargu15R+tDp6ayhSWF+41MAeEtDOixle8pQhiQgI7bxKoGK
-jclAaVeSmATJEDTNM9MeYtwktXqMBt5wgZ70+a3d1Ktib4jbzBKGyP7oMGMQSp63
-edJzHXQlXQb/BulfYADfw//q/bQCChaokHa1Iruh6Q++k0JrB8q8Tp1fN5Ww6wld
-6memjQIk3fbdq/wmFR+V
-=kdxL
+iQEcBAEBCAAGBQJTnt3tAAoJEJ0WA1zPCt1htqcH+gIMkrVubM88pCfUAsDxpWPa
+Opw5uzJAvok/b6XsmlWuuokBpR/5eywy6vSOvQHs1jZvOs+vLuIdN+0xXxblYlo7
+kjaHcIoYb2jDZ3ypwK79OW8n/2cNBdCVZE6Q8FVFzZnMxlRqLebPacaDguM/4tob
+xVswmH42VPqEAPc0Iy/wQ/TOoysvZ1s0M3jlAsCYRrQf2tgZ2+jDCOnpNYRL1HLH
+6X2czIuRh85ryQY7qpeCIQraVBJx/LO4VNMdAEJpCmGgPejO0secgSggikAqQjhn
+RINAKjGkb7q6LSgStI1L4hyHEKYUM+B3vGcXH01N7+LuOIpwRL6/BT+eq2GYdcY=
+=e2QB
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.7.20.ebuild b/app-emulation/wine/wine-1.7.20.ebuild
new file mode 100644
index 000000000000..f5aa74823233
--- /dev/null
+++ b/app-emulation/wine/wine-1.7.20.ebuild
@@ -0,0 +1,493 @@
+# 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.20.ebuild,v 1.1 2014/06/16 12:08:06 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-utils eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal 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.20"
+COMPHOLIOV="1.7.20"
+COMPHOLIO_PATCHES="wine-compholio-daily-${COMPHOLIOV}"
+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 )
+	pipelight? ( https://github.com/compholio/wine-compholio-daily/archive/v${COMPHOLIOV}.tar.gz -> ${COMPHOLIO_PATCHES}.tar.gz )
+	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 pipelight +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 )
+	gstreamer? ( pulseaudio )
+	mono? ( abi_x86_32 )
+	osmesa? ( opengl )" #286560
+# winepulse patches needed for gstreamer due to http://bugs.winehq.org/show_bug.cgi?id=30557
+
+# 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] )
+	pipelight? ( sys-apps/attr )
+	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,-abi_x86_32(-)]
+				>=media-libs/freetype-2.0.0[abi_x86_32(-)]
+			) )
+			ncurses? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				sys-libs/ncurses[abi_x86_32(-)]
+			) )
+			udisks? ( || (
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+				sys-apps/dbus[abi_x86_32(-)]
+			) )
+			fontconfig? ( || (
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				media-libs/fontconfig[abi_x86_32(-)]
+			) )
+			gphoto2? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				media-libs/libgphoto2[abi_x86_32(-)]
+			) )
+			openal? ( || (
+				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+				media-libs/openal[abi_x86_32(-)]
+			) )
+			gstreamer? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				(
+					media-libs/gstreamer:0.10[abi_x86_32(-)]
+					media-libs/gst-plugins-base:0.10[abi_x86_32(-)]
+				)
+			) )
+			X? ( || (
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				(
+					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,-abi_x86_32(-)]
+				x11-libs/libXinerama[abi_x86_32(-)]
+			) )
+			alsa? ( || (
+				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+				media-libs/alsa-lib[abi_x86_32(-)]
+			) )
+			cups? ( || (
+				app-emulation/emul-linux-x86-baselibs
+				net-print/cups[abi_x86_32(-)]
+			) )
+			opencl? ( virtual/opencl[abi_x86_32(-)] )
+			opengl? ( || (
+				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
+				(
+					virtual/glu[abi_x86_32(-)]
+					virtual/opengl[abi_x86_32(-)]
+				)
+			) )
+			gsm? ( || (
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				media-sound/gsm[abi_x86_32(-)]
+			) )
+			jpeg? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				virtual/jpeg:0[abi_x86_32(-)]
+			) )
+			ldap? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				net-nds/openldap:=[abi_x86_32(-)]
+			) )
+			lcms? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				media-libs/lcms:2[abi_x86_32(-)]
+			) )
+			mp3? ( || (
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/mpg123-1.5.0[abi_x86_32(-)]
+			) )
+			netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)] )
+			nls? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				sys-devel/gettext[abi_x86_32(-)]
+			) )
+			odbc? ( || (
+				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+				dev-db/unixODBC:=[abi_x86_32(-)]
+			) )
+			osmesa? ( || (
+				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+				media-libs/mesa[osmesa,abi_x86_32(-)]
+			) )
+			pipelight? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				sys-apps/attr[abi_x86_32(-)]
+			) )
+			pulseaudio? ( || (
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/pulseaudio-4.0-r1[abi_x86_32(-)]
+			) )
+			xml? ( || (
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
+				(
+					dev-libs/libxml2[abi_x86_32(-)]
+					dev-libs/libxslt[abi_x86_32(-)]
+				)
+			) )
+			scanner? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				media-gfx/sane-backends:=[abi_x86_32(-)]
+			) )
+			ssl? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				net-libs/gnutls:=[abi_x86_32(-)]
+			) )
+			png? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				media-libs/libpng:0[abi_x86_32(-)]
+			) )
+			v4l? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				media-libs/libv4l[abi_x86_32(-)]
+			) )
+			xcomposite? ( || (
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				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"
+	if use pipelight; then
+		unpack "${COMPHOLIO_PATCHES}.tar.gz"
+		# we use a separate pulseaudio patchset
+		rm -r "${COMPHOLIO_PATCHES}/patches/06-winepulse" || die
+		# ... and need special tools for binary patches
+		mv "${COMPHOLIO_PATCHES}/patches/10-Missing_Fonts" "${T}" || die
+	fi
+	unpack "${WINE_GENTOO}.tar.bz2"
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+	local md5="$(md5sum server/protocol.def)"
+	local f
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
+		"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
+		"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
+		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
+	)
+	use pulseaudio && PATCHES+=(
+		"../${PULSE_PATCHES}"/*.patch #421365
+	)
+	if use pipelight; then
+		PATCHES+=(
+			"../${COMPHOLIO_PATCHES}/patches"/*/*.patch #507950
+			"../${COMPHOLIO_PATCHES}/patches/patch-list.patch"
+		)
+		# epatch doesn't support binary patches
+		ebegin "Applying Compholio font patches"
+		for f in "${T}/10-Missing_Fonts"/*.patch; do
+			"../${COMPHOLIO_PATCHES}/debian/tools/gitapply.sh" < "${f}" || die "Failed to apply Compholio font patches"
+		done
+		eend
+	fi
+	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
+}
+
+src_configure() {
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--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 && myconf+=( --with-pulse )
+	use pipelight && myconf+=( --with-xattr )
+
+	local PKG_CONFIG AR RANLIB
+	# 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
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		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
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	local l
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	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
+
+	if use pipelight; then
+		ewarn "You installed Wine with the unofficial Compholio patchset for Pipelight"
+		ewarn "support, which is unsupported by Wine developers. Please don't report"
+		ewarn "bugs to Wine bugzilla unless you can reproduce them with USE=-pipelight"
+	fi
+}
+
+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 b9e6baff21f7..f348eba71dd1 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.169 2014/06/12 14:30:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.170 2014/06/16 12:08:06 tetromino Exp $
 
 EAPI="5"
 
@@ -8,7 +8,7 @@ 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
+inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -24,8 +24,8 @@ fi
 
 GV="2.24"
 MV="4.5.2"
-PULSE_PATCHES="winepulse-patches-1.7.12"
-COMPHOLIOV="1.7.18-1"
+PULSE_PATCHES="winepulse-patches-1.7.20"
+COMPHOLIOV="1.7.20"
 COMPHOLIO_PATCHES="wine-compholio-daily-${COMPHOLIOV}"
 WINE_GENTOO="wine-gentoo-2013.06.24"
 DESCRIPTION="Free implementation of Windows(tm) on Unix"
@@ -46,8 +46,10 @@ IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fon
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	test? ( abi_x86_32 )
 	elibc_glibc? ( threads )
+	gstreamer? ( pulseaudio )
 	mono? ( abi_x86_32 )
 	osmesa? ( opengl )" #286560
+# winepulse patches needed for gstreamer due to http://bugs.winehq.org/show_bug.cgi?id=30557
 
 # FIXME: the test suite is unsuitable for us; many tests require net access
 # or fail due to Xvfb's opengl limitations.
@@ -101,132 +103,133 @@ COMMON_DEPEND="
 		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]
+				>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
+				>=media-libs/freetype-2.0.0[abi_x86_32(-)]
 			) )
 			ncurses? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				sys-libs/ncurses[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				sys-libs/ncurses[abi_x86_32(-)]
 			) )
 			udisks? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20130224[development]
-				sys-apps/dbus[abi_x86_32]
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+				sys-apps/dbus[abi_x86_32(-)]
 			) )
 			fontconfig? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				media-libs/fontconfig[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				media-libs/fontconfig[abi_x86_32(-)]
 			) )
 			gphoto2? ( || (
-				app-emulation/emul-linux-x86-medialibs[development]
-				media-libs/libgphoto2[abi_x86_32]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				media-libs/libgphoto2[abi_x86_32(-)]
 			) )
 			openal? ( || (
-				app-emulation/emul-linux-x86-sdl[development]
-				media-libs/openal[abi_x86_32]
+				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+				media-libs/openal[abi_x86_32(-)]
 			) )
-			gstreamer? (
-				app-emulation/emul-linux-x86-medialibs[development]
+			gstreamer? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
 				(
-					media-libs/gstreamer:0.10[abi_x86_32]
-					media-libs/gst-plugins-base:0.10[abi_x86_32]
+					media-libs/gstreamer:0.10[abi_x86_32(-)]
+					media-libs/gst-plugins-base:0.10[abi_x86_32(-)]
 				)
-			)
+			) )
 			X? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
 				(
-					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]
+					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]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				x11-libs/libXinerama[abi_x86_32(-)]
 			) )
 			alsa? ( || (
-				app-emulation/emul-linux-x86-soundlibs[alsa,development]
-				media-libs/alsa-lib[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+				media-libs/alsa-lib[abi_x86_32(-)]
 			) )
 			cups? ( || (
 				app-emulation/emul-linux-x86-baselibs
-				net-print/cups[abi_x86_32]
+				net-print/cups[abi_x86_32(-)]
 			) )
-			opencl? ( virtual/opencl[abi_x86_32] )
+			opencl? ( virtual/opencl[abi_x86_32(-)] )
 			opengl? ( || (
-				app-emulation/emul-linux-x86-opengl[development]
+				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
 				(
-					virtual/glu[abi_x86_32]
-					virtual/opengl[abi_x86_32]
+					virtual/glu[abi_x86_32(-)]
+					virtual/opengl[abi_x86_32(-)]
 				)
 			) )
 			gsm? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				media-sound/gsm[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				media-sound/gsm[abi_x86_32(-)]
 			) )
 			jpeg? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				virtual/jpeg:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				virtual/jpeg:0[abi_x86_32(-)]
 			) )
 			ldap? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				net-nds/openldap:=[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				net-nds/openldap:=[abi_x86_32(-)]
 			) )
 			lcms? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				media-libs/lcms:2[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				media-libs/lcms:2[abi_x86_32(-)]
 			) )
 			mp3? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/mpg123-1.5.0[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/mpg123-1.5.0[abi_x86_32(-)]
 			) )
+			netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)] )
 			nls? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				sys-devel/gettext[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				sys-devel/gettext[abi_x86_32(-)]
 			) )
 			odbc? ( || (
-				app-emulation/emul-linux-x86-db[development]
-				dev-db/unixODBC:=[abi_x86_32]
+				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+				dev-db/unixODBC:=[abi_x86_32(-)]
 			) )
 			osmesa? ( || (
-				>=app-emulation/emul-linux-x86-opengl-20121028[development]
-				media-libs/mesa[osmesa,abi_x86_32]
+				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+				media-libs/mesa[osmesa,abi_x86_32(-)]
 			) )
 			pipelight? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				sys-apps/attr[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				sys-apps/attr[abi_x86_32(-)]
 			) )
 			pulseaudio? ( || (
-				app-emulation/emul-linux-x86-soundlibs[development]
-				>=media-sound/pulseaudio-4.0-r1[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/pulseaudio-4.0-r1[abi_x86_32(-)]
 			) )
 			xml? ( || (
-				>=app-emulation/emul-linux-x86-baselibs-20131008[development]
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
 				(
-					dev-libs/libxml2[abi_x86_32]
-					dev-libs/libxslt[abi_x86_32]
+					dev-libs/libxml2[abi_x86_32(-)]
+					dev-libs/libxslt[abi_x86_32(-)]
 				)
 			) )
 			scanner? ( || (
-				app-emulation/emul-linux-x86-medialibs[development]
-				media-gfx/sane-backends:=[abi_x86_32]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				media-gfx/sane-backends:=[abi_x86_32(-)]
 			) )
 			ssl? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				net-libs/gnutls:=[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				net-libs/gnutls:=[abi_x86_32(-)]
 			) )
 			png? ( || (
-				app-emulation/emul-linux-x86-baselibs[development]
-				media-libs/libpng:0[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				media-libs/libpng:0[abi_x86_32(-)]
 			) )
 			v4l? ( || (
-				app-emulation/emul-linux-x86-medialibs[development]
-				media-libs/libv4l[abi_x86_32]
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				media-libs/libv4l[abi_x86_32(-)]
 			) )
 			xcomposite? ( || (
-				app-emulation/emul-linux-x86-xlibs[development]
-				x11-libs/libXcomposite[abi_x86_32]
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				x11-libs/libXcomposite[abi_x86_32(-)]
 			) )
 		)
 	)"
@@ -346,33 +349,15 @@ src_prepare() {
 	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
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
 		--sysconfdir=/etc/wine
 		$(use_with alsa)
 		$(use_with capi)
@@ -409,46 +394,55 @@ src_configure() {
 		$(use_with xml xslt)
 	)
 
-	use pulseaudio && myeconfargs+=( --with-pulse )
-	use pipelight && myeconfargs+=( --with-xattr )
+	use pulseaudio && myconf+=( --with-pulse )
+	use pipelight && myconf+=( --with-xattr )
 
-	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
+	local PKG_CONFIG AR RANLIB
+	# 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
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
 	fi
 
-	multilib_parallel_foreach_abi do_configure
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
 }
 
-src_compile() {
-	autotools-multilib_src_compile depend
-	autotools-multilib_src_compile all
-}
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		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
 
-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
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
 	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() {
+multilib_src_install_all() {
 	local DOCS=( ANNOUNCE AUTHORS README )
 	local l
 	add_locale_docs() {
 		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS=( "${DOCS[@]}" ${locale_doc} )
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
 	l10n_for_each_locale_do add_locale_docs
-	autotools-multilib_src_install
+
+	einstalldocs
+	prune_libtool_files --all
 
 	emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
 	if use gecko ; then
@@ -476,7 +470,6 @@ src_install() {
 	for l in de fr pl; do
 		use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
 	done
-
 }
 
 pkg_preinst() {