Version bump, see http://www.winehq.org/announce/1.7.21 for the announcement. Apply experimental gstreamer fix only when USE=gstreamer because it has been reported to cause crashes in Bioshock (thanks to David Heidelberger).

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

4 files changed, 534 insertions, 27 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index f80571f0f473..0def8fe117ce 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,14 @@
 # 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.516 2014/06/18 19:08:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.517 2014/06/29 00:42:47 tetromino Exp $
+
+*wine-1.7.21 (29 Jun 2014)
+
+  29 Jun 2014; Alexandre Rostovtsev <tetromino@gentoo.org> +wine-1.7.21.ebuild,
+  wine-9999.ebuild:
+  Version bump, see http://www.winehq.org/announce/1.7.21 for the announcement.
+  Apply experimental gstreamer fix only when USE=gstreamer because it has been
+  reported to cause crashes in Bioshock (thanks to David Heidelberger).
 
   18 Jun 2014; Michał Górny <mgorny@gentoo.org> wine-1.6.1.ebuild,
   wine-1.6.2.ebuild, wine-1.6.ebuild, wine-1.7.0.ebuild, wine-1.7.10.ebuild,
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 09d7d4264238..f9199f820c89 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -64,12 +64,14 @@ DIST wine-1.7.17.tar.bz2 21531865 SHA256 bb6fbd7fd70f9aafba557995d9ce537ded56e75
 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.21.tar.bz2 21635330 SHA256 a14723104135c21414c61e146144a2c527430057255f8c35a3a7d354e68b9401 SHA512 73db3256d04c681ea7a4524767f9f93c24a4cc96aa901c6fdfd700c7e8968cdb127a110df56f10423cac90aadc783ceafcd0dc571e36ea096c1de03c619164d8 WHIRLPOOL 32bcf10f8665dab43339e79240b534f3fa29087787acd752553b4b717f6c26f8e98d36185f61e928e2c5ef9a3663b9eac7ec42cd9898800ba12efab74c78634c
 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-compholio-daily-1.7.21.tar.gz 883833 SHA256 eda345e48ca4b1ff8c191703b3d853fab39527543e96e41bbe0f253b21b9ab68 SHA512 96dea0b5e8d448ef6e54497c222c4c5b5ab3ed727dececfaf1af11f9695749fe53cf52c9f5ecdc9b454ed0fc01a30d0ebae3847bd99e527b99c63fa4942380e8 WHIRLPOOL 3a837e6f0e399db889c8428e01fd52d78dae002f212c570ca1dfa6841dd33a89214913977a2f280fd6363c8a21d27973e20c43f481bfbc02cd7882a9d2d79bc7
 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
@@ -114,6 +116,7 @@ DIST winepulse-patches-1.7.0.tar.bz2 48368 SHA256 280f8583574d5f0ef437e15790f96d
 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.21.tar.bz2 52679 SHA256 38daf95ea99cf831c56634e1dd4a4ea5fa4c11f570dfbddff06ceb7cd05e7303 SHA512 8feb729461a0e9791eeae11bd354407bdb389aefd1d30454781cd56072deeb507dccf5a825e580194d1a26c2c83b631d38967011c5360c46340dc3ceb7c0096d WHIRLPOOL e5cd496a7a66036825cff73dcdb76d787948b05d604b26042b024f7c9e991f4ea61efbd41a53fe667bd023e04cd5763f806166ab3aa9de757105ee3fbe6f65e8
 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
@@ -168,30 +171,23 @@ EBUILD wine-1.7.17.ebuild 13116 SHA256 e0a2059cda4ab4f7ccbc4bb986c55699951813e9c
 EBUILD wine-1.7.18.ebuild 13116 SHA256 918377ce31c6dc8eb243786fc28c83af3984b6c382b6a1cb21d342e960e56b36 SHA512 215ce0de8e01913e4ca523c8b42304255ebe995e441362bf3435fd825a1aad16777419b37427daea0871b0628b8d35f6b060414928c0e0a8fcb463b849a3a871 WHIRLPOOL 89e81b9522c958971fbf9033944b931bbb78022fda3bee516276976bb0891c565200cc7dceb916810411cce138a072f7c76e3216b59acb0575498cc8fd1042e5
 EBUILD wine-1.7.19-r1.ebuild 15481 SHA256 8d778dbe1fb7a071903b7c42e48dfa69cf55b318c9f7c4b00f574076feaa1c50 SHA512 6ceb9bd9def23164f76328ed783c155f40f2183cc1e95b316ba6475b384a73731565fb436581dfb6e85a439848fc079dddce5baa169b96b0170f2f3849c5170d WHIRLPOOL 0628f471b4ad7477ffe061c31a15107fba7046ec12b9be1c190300b937cd45b5e71fa5d10bf5313450cff80c8348f1a575e8658b5db471d1cf7f5b51bdd192fa
 EBUILD wine-1.7.20.ebuild 15306 SHA256 eb41d4a542dfca79889b2f6e929cd745a002bb5571e070ab656223625ee4a828 SHA512 054fcf1fd262144daa88a51db7f696d7a775426889d12e25a5b8b607d88ffe744b1714bf4ef93eb87abf011e1f4fd9074bbd977baacbda412db522b3a6409ff3 WHIRLPOOL 0ee594393cbdb86317f31df0b307e903bd62734c6a5e92f4fbc40657414ed08aaa5f1dc1d7fcb7da1071a3fb5678e3ba9aaeb29f6d5fb16fe9923d6a0eb71ef6
+EBUILD wine-1.7.21.ebuild 15551 SHA256 73eee67d2f4e9fc9e9391ee757324ebab1ca84ee5c06b380eff32dc829c4b1db SHA512 1479d8db612f20510ec58bf7b51c27489b7e925c7d7d14d41acbb77a9fe8c605e02505fd83607cf2b666017b6a1bbdd75a6a8de28a68fb3b2333bc12ab668cc2 WHIRLPOOL aab6d2211e9eabd419e31baeb327bd03e9839d569612f5fb56d2c72105a4b9d2267880c086ef2b48ae005f9680e7facdcc48697d2ce18f06357805e798ce7336
 EBUILD wine-1.7.3.ebuild 12782 SHA256 b8e06428a9b9e86076713b6545cad0216e950b2cc987467092fa978b5f83fa53 SHA512 aca9cd6acaabd50aa2bebc85527d9f491a425270b6861fd1e214853246744cd5b42f657f706bd40c5c3ac83eeeed16bbfc79be8dc6222f8d2734eb6ef8ad6bb0 WHIRLPOOL e43a5fb6b68491755f55cf3565fc854bffd91fd5279edf3257fd3da7efe5926731875ab2c68b4a832e6e3ab7db7523aad24fe901f92c116b99aea93e88050017
 EBUILD wine-1.7.4.ebuild 12782 SHA256 b20dda84df7b2a77612ba8cc0f60b1d9dd2ccbedfacb57a0401f897a0c9a420c SHA512 541183ccd602ad07020b3932d70b24ba6b5ea10b8541bcc3865d180d70e92300d0a049379b0b3bf9b2f1a48452b8cabe5915c9bb50ca2e78af8640cb439f0bb4 WHIRLPOOL 3345620eced37eb8b06d880e7fb01bc9bd6bc6a17984a3e923b0a9874f5820d69b022a459d9ba66f51ae0c05166c9c3902d71eb85944cecff67a16c073c96ed9
 EBUILD wine-1.7.8.ebuild 13113 SHA256 0d58845c1d15b2340de6af172779dc27376f29bb8f42abafdaa81386375d0598 SHA512 2c8a0f86d154f180975afe5c7aa22e2cc600c005662f862a17b5594ddc0fb237f4948a7ce151abbf0d38ab887b3dbdf2135e1dca8594bb17b67ed4d1f8d36eff WHIRLPOOL ffc51d8f0f03d9b0cae0c35e9c1912c853b92c2d7f830d06226191c9c07a4762934d2641771c739ba2682f36939703c88c82fdd3c287d7be20c5db16fea0b7d2
 EBUILD wine-1.7.9.ebuild 13113 SHA256 edd703911ba7173872a7bc41d340c50541022c3b9ea1f68a4bc812cc77bec547 SHA512 8649a1eabc0afd34d9019242b7d15b417ea4b3a90b2d4f2c7438f00eae94aff96f89900d73c1356dec09f7d094ba69c741898ca1342f2bbbb4e03ae88d73877c WHIRLPOOL 5fd76f74f84c2d4f06e150f4e83c6012e37bb8c4252f2e74438d25aae12f206f61afe787961141c088298e8cfdc5d15ea68821a148688ac749a9905854dc315f
-EBUILD wine-9999.ebuild 15306 SHA256 74d228a85e30d19658a4947b8b524a35536746fe0b14dfcb50aa3e3710bf46fb SHA512 f9ef99261d4508b6484136afee96c66a41ee25ea44bd0a26f5a8f1005f500915427174ce34e0b5fe3524f194cad4a6f83287bc4b696e9b1fe05f415fac6dfb5b WHIRLPOOL 70b36aeee0ebfd7b96a8da96c339b9481fb74ddbd3d1049c621bbdf23d628a065d293ad694b902274f4f7534460ea71bc5bd28aa955a3c2032f1961450fa5c47
-MISC ChangeLog 21498 SHA256 fff48f28d5414f429f5d5e9dfaa24b1b93417255d521f63bbde1541ec621f800 SHA512 312c8ebe036d4bb8f2777bbb72eac3c6b0e3744dd5851f29e0661522e34bab231fe03eccdf0b6d1116e8d99b2d7b73a4697c52306dc290ccc3908e1d1cfd6124 WHIRLPOOL e5fc76244e7cfd142a63a23cc7c0e90315e4a3443f69376a486a451aecd965fcb50f1d2d6bb91455eceabb96e45bc8df1539c984ebc1333f0278e882962dfa23
+EBUILD wine-9999.ebuild 15551 SHA256 371cd01fa5b92c9c5625bcfe7a1ead1419e25380a088a3d96ca887f2170c605f SHA512 11c13a375f419a8120502dc813bfd662cd682c044c80d6c57740863c6e3d3061079184beeadf2b9e202e52038eac95fad9e65b2940f01aeb59d347839ed35516 WHIRLPOOL 90975ddaeb6b0588a09f27a2d93fd00b595e5bc4836fd10412ffb5c9185c7b44592057e3f49d187d21ea9d4bddb484221800b151779c2afef85c16e9a8883445
+MISC ChangeLog 21861 SHA256 5e01007abfde76a4baa47a4210e0cbd6b5cea52664a244801fe32f55abf0d7c1 SHA512 fae8c533d9dc4df4be0a28a68c1c97d719918b87d5bc015ee4f712cc403974af85821e10c84eeb4cc91a8d8cbd13c1cbaad13c6d537fd800b5ee5f4d78ae158d WHIRLPOOL 72e4ea9c823e4051401d745a17db18da3611374887c3c85094b4cbe4aba224d1da73224085e7ebbbedec72b59f3742244254a65d8af81bdeab9e13f083a1dad8
 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
 
-iQJ8BAEBCABmBQJToePqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOvgsP/Ru0kc/B7kT5q01QH/M115fB
-ZnsGjbdi5IoJEvdIsR1u4JvFHCq3czj2XbBhOkY209w28MlgazHMmp0g05LRhVeg
-OKr1I0tB/pUD/r0RQJMvp9SxxeKWbBvUVEvLSq35Ap44roZB/H8WXrPLekQJqxcU
-3McF7BGKXGDS1voFE2R+Ip9jaiq2QfNO2o8rLh4P1hQTa7yNUdaXJylNom2Ega6z
-q9mD9EKm70J7F8j3kNpiMhF3Q1MsV++IFbfHimtdI3hjOIDGVojTYTgGuyUFHfU1
-dWMpUtPqw3WZ/XGh8urdmltTqShoM73aZ6Qd3h0SVigXkW0t1zw5XUM90BvKrPKR
-3Fp+j2liDJETeZopHhqsC929wfmJRt+p7n8xUqC9cWxpGZob0MyC4XgKkXoOVTBh
-65WiumHD4Cy3Nc0JMUY8FqnwnVNwua/+GEBUyIv8/3akE83QfieDazOCGUAg1UFY
-CrT58lwb0IlCHbYeX81IfICetPrKZaBogBsFIVqrTgiKZj1VdH2uy8V+kjlUeZ6r
-RfNuQo4zDjDVXAlKVDtvX0tt/SKmJ+oo25ifCqjnWiWw3FZg0BMSW84+FgD6wRRm
-jg++7j4W15Uk2EFXImEXNNHTEr/m4YSIqCgeUEUNicP/7/LAVgJtzXS7atv/dPUP
-MncMlGD34HlH/nIP8Pdt
-=vBku
+iQEcBAEBCAAGBQJTr2DBAAoJEJ0WA1zPCt1hyuIH/0CdOC3thneRt5qh+e/R1fME
+J7/OHFrNVIl3Ts/sA/oNk0tAvqw5IZzhQUstCSqMwpJGnl9K0H+OP+boCFLJ04JD
+Ir871bg06HcF6WxtSqfCQeB6nXYji+SkFh5J7dcBKq1/p7vPZFSRifE0OTzphYod
+D6XagvsQNITvnD52azIY8Ef4s3DxizVZeOTMR9Mm97gTIg+QuzrMV4tAe1X3k6EH
+rY1ZcWB/G4JZ+rpsiuSeRvCB3jEJOPK3cqebY2U7LmsyGnhtXr9G+XXRLy6o50yl
+KTu75QVyKtKZG7xoESCHNeueGL8366tkonWn75TlDifBTtORL/4POcMGScUUPVw=
+=lgdS
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.7.21.ebuild b/app-emulation/wine/wine-1.7.21.ebuild
new file mode 100644
index 000000000000..03d60fcb15ae
--- /dev/null
+++ b/app-emulation/wine/wine-1.7.21.ebuild
@@ -0,0 +1,498 @@
+# 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.21.ebuild,v 1.1 2014/06/29 00:42:47 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.21"
+COMPHOLIOV="1.7.21"
+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.5.0.1[abi_x86_32(-)]
+			) )
+			ncurses? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
+			) )
+			udisks? ( || (
+				>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+				>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
+			) )
+			fontconfig? ( || (
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+			) )
+			gphoto2? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
+			) )
+			openal? ( || (
+				app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+				>=media-libs/openal-1.15.1[abi_x86_32(-)]
+			) )
+			gstreamer? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				(
+					>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+					>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+				)
+			) )
+			X? ( || (
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				(
+					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+					>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+					>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+				)
+			) )
+			xinerama? ( || (
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
+			) )
+			alsa? ( || (
+				app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+				>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+			) )
+			cups? ( || (
+				app-emulation/emul-linux-x86-baselibs
+				>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
+			) )
+			opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
+			opengl? ( || (
+				app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
+				(
+					>=virtual/glu-9.0-r1[abi_x86_32(-)]
+					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+				)
+			) )
+			gsm? ( || (
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
+			) )
+			jpeg? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
+			) )
+			ldap? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
+			) )
+			lcms? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/lcms-2.5:2[abi_x86_32(-)]
+			) )
+			mp3? ( || (
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
+			) )
+			netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] )
+			nls? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
+			) )
+			odbc? ( || (
+				app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+				>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
+			) )
+			osmesa? ( || (
+				>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
+			) )
+			pipelight? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
+			) )
+			pulseaudio? ( || (
+				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
+			) )
+			xml? ( || (
+				>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
+				(
+					>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+					>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+				)
+			) )
+			scanner? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
+			) )
+			ssl? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
+			) )
+			png? ( || (
+				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+				>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
+			) )
+			v4l? ( || (
+				app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+				>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
+			) )
+			xcomposite? ( || (
+				app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+				>=x11-libs/libXcomposite-0.4.4-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 )
+	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 gstreamer; then
+		# See http://bugs.winehq.org/show_bug.cgi?id=30557
+		ewarn "Applying experimental patch to fix GStreamer support. Note that"
+		ewarn "this patch has been reported to cause crashes in certain games."
+
+		PATCHES+=( "../${PULSE_PATCHES}"/gstreamer/*.patch )
+	fi
+	if use pipelight; then
+		ewarn "Applying the unofficial Compholio patchset for Pipelight support,"
+		ewarn "which is unsupported by Wine developers. Please don't report bugs"
+		ewarn "to Wine bugzilla unless you can reproduce them with USE=-pipelight"
+
+		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
+}
+
+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 a27582124bcd..2469ee5f829d 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.171 2014/06/18 19:08:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.172 2014/06/29 00:42:47 tetromino Exp $
 
 EAPI="5"
 
@@ -24,8 +24,8 @@ fi
 
 GV="2.24"
 MV="4.5.2"
-PULSE_PATCHES="winepulse-patches-1.7.20"
-COMPHOLIOV="1.7.20"
+PULSE_PATCHES="winepulse-patches-1.7.21"
+COMPHOLIOV="1.7.21"
 COMPHOLIO_PATCHES="wine-compholio-daily-${COMPHOLIOV}"
 WINE_GENTOO="wine-gentoo-2013.06.24"
 DESCRIPTION="Free implementation of Windows(tm) on Unix"
@@ -320,7 +320,18 @@ src_prepare() {
 	use pulseaudio && PATCHES+=(
 		"../${PULSE_PATCHES}"/*.patch #421365
 	)
+	if use gstreamer; then
+		# See http://bugs.winehq.org/show_bug.cgi?id=30557
+		ewarn "Applying experimental patch to fix GStreamer support. Note that"
+		ewarn "this patch has been reported to cause crashes in certain games."
+
+		PATCHES+=( "../${PULSE_PATCHES}"/gstreamer/*.patch )
+	fi
 	if use pipelight; then
+		ewarn "Applying the unofficial Compholio patchset for Pipelight support,"
+		ewarn "which is unsupported by Wine developers. Please don't report bugs"
+		ewarn "to Wine bugzilla unless you can reproduce them with USE=-pipelight"
+
 		PATCHES+=(
 			"../${COMPHOLIO_PATCHES}/patches"/*/*.patch #507950
 			"../${COMPHOLIO_PATCHES}/patches/patch-list.patch"
@@ -479,12 +490,6 @@ pkg_preinst() {
 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() {