Bump, see http://www.winehq.org/announce/1.5.17 for the announcement.

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

5 files changed, 318 insertions, 13 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 8e3f3062d0d3..51b9324ef084 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.436 2012/10/29 23:36:46 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.437 2012/11/09 23:24:07 tetromino Exp $
+
+*wine-1.5.17 (09 Nov 2012)
+
+  09 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org> +wine-1.5.17.ebuild,
+  +files/wine-1.5.17-osmesa-check.patch, wine-9999.ebuild:
+  Bump, see http://www.winehq.org/announce/1.5.17 for the announcement.
 
 *wine-1.5.16-r1 (29 Oct 2012)
 *wine-1.5.15-r2 (29 Oct 2012)
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index b8f2aa4d013e..38a092fc40a9 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -5,6 +5,7 @@ AUX wine-1.1.15-winegcc.patch 1556 SHA256 dbd89db561d7583faf317d795b8c11231575d8
 AUX wine-1.2.3-msxml3-libxml2-headers.patch 14328 SHA256 0a046e532343f9a4508307434a2f39e0a3a50a66c165b69e56dd671488d4ba7d SHA512 837bde9cfefa12b81197c9fa2978c8b17f760594eb9d6b8fe96ab4baf2f34b5d2330db245c0ee180a9d5aa59657f52b8500fd976bb70b111d0f32d4103f71f94 WHIRLPOOL e74ff9ad63b95878337d4eac342e9abbc60c73af2f4017cdd87671c472c49bee953759b9786d5b245669352dc23ac338178b415d2c4f01516c385fee66a167b5
 AUX wine-1.4_rc2-multilib-portage.patch 1256 SHA256 9d0acd304d11d1bf73f56699754aaa1bfe1facba90648ee330fdbe08d9ff4938 SHA512 ac0b29e2b4c9b04bb6694a4e4da654446f68efbf90cda6809b45dad51e6679ac5410398763fde7e9505ef959493a037aa588cee58d14906563a4746702d2b0e9 WHIRLPOOL 8ea26266c327bc8313eca9b5d39c9741b226037750ca2d1d33262420093e05c306e7f004656c362c3c50b330d050cf9e5fceaa2b024a82809aae8b3617b0ae18
 AUX wine-1.5.11-osmesa-check.patch 1888 SHA256 8aa70a10a215d5a10e70a404701cf70c0efc674ca6e2f093bbd243f70153e3bb SHA512 5c53e19efa4e080e4bc46c955d2f53beaaa55726e3ee528a5d41374452d6a75817f2145df4a2b05e0d168ed78fe81da35bab1322d6fcc736bf59ba6282e7ff9b WHIRLPOOL d35b52ddcace0fcb043894f00b14a90ecef8af87ff16d2ff091e64b34d8629a5d49ff59cae355c0457b7b9213f1ec66ae53747cb096b23c4f0a2ec8b7c8c8431
+AUX wine-1.5.17-osmesa-check.patch 1774 SHA256 dc7dde67c416bb067e528b85228cff01833a2a20c802248ef56d74184014e50e SHA512 12325e75db5e63e1d4c4e2463c3e164b1eba0d3d88455cfcd698a8bb790d7c0b3c947a06e7a09e232b1a14202e64ea2dc9331cbc4b503833f78a7c1034410c79 WHIRLPOOL 2d9bb86a5d683301c75ea275302f67616a8e9c6ebfc436b05f8f1b3d5d815c310999ca9518747abcf4d248bd18f34388dcb323c526d633c50e66ffb4bf94e5d6
 DIST wine-1.2.3.tar.bz2 17651336 SHA256 3fd8d3f2b466d07eb90b8198cdc9ec3005917a4533db7b8c6c69058a2e57c61f SHA512 602ae802aa6f94c4498ccae96a67e355a8aa5cdc1e9c1e0f29482f45a9e7cc7af766ade9f2f1fef77ee77d5bbfc5f34cd110b95db244b8cff42998b5b0cf708d WHIRLPOOL 02ac95d8c86d0f2d870c8e4c4789c1bef1ef965f8bb186de23fd3a949126ba2aadd5791d1908bdf11d946d5dc5348b085881c2594cf1b407fa0df44c1990ecd9
 DIST wine-1.3.28.tar.bz2 19626794 SHA256 9a311124a1a911066ab9d3a742dda888487ee516a18eda946be105a1d1135a38 SHA512 b8fb881cf03dce1a40a9212bc6170858ddde38cd2fc282b455ab94cee7ee2e78f5043fee72df3b1e7566c29fb8c8a43726953a8bc5eb22d3ab7f869e6f4e9722 WHIRLPOOL acb6b8b978541e1b0f95f124e95ad9823e73590229515fd40e4e59d5af21c414c4824490710b436370b4d3fda3c477d6c4b626f89c6cc90e2fcf066355c3bee9
 DIST wine-1.4.1.tar.bz2 20104401 SHA256 3c233e3811e42c2f3623413783dbcd0f2288014b5645211f669ffd0ba6ae1856 SHA512 a0fe7f36325a51d9b381ab09a4460cdf59b12b810722d28aa8e98a3d6c3de29bfc62dd0f0d4e5336bfa82a6b549e45c313a714b6d43f562c45ffadb47874058a WHIRLPOOL 81f837ecd31902bc769065de353a92bcdfa1b59b3cd53e700e345b24480260c68daf7075fec685a948a46e66e6f4470ff4158df92e132760013b17ad6690885b
@@ -18,6 +19,7 @@ DIST wine-1.5.13.tar.bz2 20669180 SHA256 c05dd12ecc5256219d09cc1daad6f2153368d69
 DIST wine-1.5.14.tar.bz2 20745798 SHA256 3e70ff0f900bf459dd6fa767bdac5543a27b76364f8ef89088300b867351df42 SHA512 952dbf1aba41f4144411a3f670ffca1d6b331e60ca8cb6fc36bd590a5ad115920fc6fccddcf15d517e4c02bd28ea67ee8631098da73d81f3b92ed5a189942f85 WHIRLPOOL a369f7f1162ba275436dac9826f5f086ba07ba0f803d615e2a2f09043a651bf77b8c9a9f9394f114e93dc7e6ef868bf8fc07dfc75deed90497e5cd39e4d22e68
 DIST wine-1.5.15.tar.bz2 20844051 SHA256 2642698204bbc5d9fd04c30f3507fa08a62fa3b0a21e53cdfd2c5a4530b69454 SHA512 d9197f1930830bcbcf2f11c0e889e5a20c8a30b8b8c3ed451aefb34735417cbce6109b6985bf89451684b20f281e1ea722214b2e465ce21caf9f034f21291ed1 WHIRLPOOL 32264bc8fc6ed73e5123e0979c3c33488e6dccb7b8b2e7b3c5d61761784b99b0b51567b5f9e15c91d2565640ac19dff9ae91469ff8dfb72fafd99c47dbc5655b
 DIST wine-1.5.16.tar.bz2 20879326 SHA256 2f4df6ade18d636c892bee0feb6fd075eb3ad299e61d250ea359659d6411e723 SHA512 3d11366de619e3baff16fe7a53a33066983b3c5adcb173b742cf2e3ed5ebbfadf47eb217eef800d0137dd7e291e355c41be8c2d26ac5a1d44930fe44526e462d WHIRLPOOL 496fb886d692a1eed72c8b13b1b1bd39c425f59eefa82a5f8f9d64b9ca59b1ae5f393ac59834ae39e178afe67da95a1505ce9963674d8b54b47b384f6ce9242e
+DIST wine-1.5.17.tar.bz2 20953751 SHA256 b15b4cbfab4b7f3d4cf80f88ea757e221feaefbd4e515edfb04cc57529464c15 SHA512 da0c28a4abbdcdd20c2d7d7807ce41c3431e3649aee8100e513d0dafea5c1f937e0eb92d3984277f005e385e394ac50a92db82a8ab2f53403b851ad8c6ef863e WHIRLPOOL 2ce0fc8522205725f7e0593ae68d1c63ffa99e439d8934f86c27ba1ce2b779b765fbb5af6a064eadf0c7046b5e5f35e9086beca47da5611f2e81f2c0f88e0f36
 DIST wine-1.5.2.tar.bz2 20104652 SHA256 8ee6fdaf716b5a1c7ccf9be9dc6d9b7546944e79351c4806b2fa596da418342f SHA512 da949f1943a1af1f4f9d75d41d35b5a968b4bb792f25c5d3202de5be944a04deac7116261d70b5b90f233e9fb526ae8d073e2cdd03304ac0f736926108fec7d7 WHIRLPOOL 947bff2ccda47e548e6eec4a1b7cc738b943fbbdf000e5686aa440c9d45962b5dee47e7060e93895cc398c2c82d7dce06c370091859bd46a6d09864c191d357c
 DIST wine-1.5.3.tar.bz2 20171697 SHA256 d3e8e484cbc2c4888bc880d0b0c8b52299d36a5cecc96d9367b59142345a1206 SHA512 947c20100d02ec6d393f9bdc1899ddeda21be7fa75869f91953e0eec30f2083b2a7fd31ad92c44765b417e3023914db9cc9945fd241207d8189f20ae92da100a WHIRLPOOL a2e2752731feae4d2a44dd0db1edabadd8c7530abd6e988e5c8f862ba70e234874e1a21ad8a25f4dc68e965d4b5122431278b3ed7674145f7fa935e0c78dcca5
 DIST wine-1.5.4.tar.bz2 20187597 SHA256 90b10450b1afb4d54dfd20529e040daa4ee901c52b2f3bc452a86c2e06b4b759 SHA512 cb58358a2af9e15d7ebff21f9f834d521736eeaa44ce0c36d88400f3d3667c5432711bea64322e77c166e024d2ea03d47f64a4fd648d0a802bc44da80e1eb2fe WHIRLPOOL e007bc572181745c585bf24c6aa6a87830df17b57384d180e932b229f89b55d38f2b673243e8b5a5243afb303a18c52092bfbe61f0b49473c7c85edb0056a068
@@ -47,6 +49,7 @@ DIST winepulse-0.38-winecfg.patch 13088 SHA256 051ef1cb5598c319152ad28b85733927a
 DIST winepulse-2012.06.15.patch 100596 SHA256 f6baf816e6170c406607d81e298fea2d175452ca822ee4cd2748fe4381ecd4dc SHA512 cd14a3407820d5d7b64a1ea19e41ae816a6a06888d57314cd7314192744574885501c98fa9e9f0fb102d3427d9f7bcc4f1a5ac532947b89db52ef731e071cb69 WHIRLPOOL 2dbb40afb633f5b1238d8849825b4711de865033ebb5c8f04c8e930a2974b8a5f4958fe87b5c1a9ccb1417ab1f4fbd2ed37feec11d2212efa01a6e05171a06a6
 DIST winepulse-patches-1.5.15.tar.bz2 39808 SHA256 373291b020308d639ee12a05cb94f74ad9bb7cdd1024d5406067421b0aac0713 SHA512 0bd2e04922a144aa5f1ddc6fea9deb383bce934176f3e485f41a77007512720e2d68131c1e6002167673a2df8431a820fb009afd440bf05123ff40872deffb2b WHIRLPOOL 96a6ce6b01a1a2137bbe6963734bd19b32f9b27e57b1dd81f9934e2f8718ec534815fd45f7c5a70389af69a6eceee2024dbc9d90833f8444699afe29c2e1df9d
 DIST winepulse-patches-1.5.16.tar.bz2 48482 SHA256 a186bb6bc07c11f03989c24159ffc86ade74cfa2050faaa399fd2c725116994c SHA512 9626d7756168c755075dd96b19432745c0b89724ccac369f213b026509327a6e99a0507a7390642ed930a65fdd63e6eafbeec3ecdb66d3505f3f25fe6feb2da5 WHIRLPOOL 8100b7bfdc3b8a61e9b80bb8bb247225b211b77b7198f7998d4d1ebce69812f8b5474c3ba8daec6c63b0758c39648f1210cae8b3dd08cfc6d71eba057c8a939d
+DIST winepulse-patches-1.5.17.tar.bz2 48079 SHA256 8f82d47534c57e85db6502fdde394a4a44ab5f285250cc41439f2125e47f96f7 SHA512 150b9329e3382f3d08b33a8165e9738f23dab7ab942a931441c73d952449af6d7c33fc41b8f519e090706aa003accb1799b3cdeeebc8b9de3fea0c86cd1056cd WHIRLPOOL 9b9243ff47d9a713c4d40fe723e5c208c73d4ea0f208607422e34fcb679392a251050243ab818392065910729c550755a52625e50927e2660e892e36925f65ff
 EBUILD wine-1.2.3.ebuild 6069 SHA256 12c09c9540e500f8b61e811fa5789723bd19c03b86a0d87ab1c3fedd37e8335f SHA512 a5671a6c9a2f2543e8c7a3cd3a53834ff50b7b31ab4b343b97331f9e9ecdfb8a99b2a6a95d9aab223049215469d1cde912a5177ac33b2eccbb9b12f6f9759155 WHIRLPOOL 4aca7be22d5275f06393a3dddb66a51873862321d0d39b74556eec6bb40a7c3ecc3ce905bc0df49c375b992ff83dcf5cac570502f5a1d2c43bd70443c362efaa
 EBUILD wine-1.3.28.ebuild 5775 SHA256 7eea0273209bd14cb57883b56a058ef14846b3cd16dc660564efa78c75acd9d8 SHA512 3b3489d6677b1d79960bec32f90f4057c0ae5e89464dcc261afd3a385874153edec1d7717989c7060dda1922e5106774161512a06e76bbb0ca2da1b7599ed659 WHIRLPOOL c8042b574e34fbee3ac8057935b5c81a4fb2acac20831d271d7cd9fe044b10bc9e2f81ece0c79098203eaa3a2c2c32a82b6477bee2fe3ad8b29b3bbf243bbf3d
 EBUILD wine-1.4.1.ebuild 6388 SHA256 17d903e09d738ebd872751d2da15a7d0786033ef5d5313b9f6b0382b59517bb3 SHA512 f1db29aa52d9866d94e2967c9b8cb3c81f5e34c98cdf7c21053975c9ee89495f9e220a348dca693cd88e6f7be22f40aa83096deba52744ae946bc5ad859cdbeb WHIRLPOOL ec89f1f1390cc503a6607b26bbd6a64881b7942c4312d4d8e547020a7d303980b513d495107ce75e1430cc9917aa9b31d310ee42237947d429ea7e4b1a048251
@@ -60,6 +63,7 @@ EBUILD wine-1.5.13-r1.ebuild 7071 SHA256 dbc2064cda0648b815aa9aa6ea095aec3190b17
 EBUILD wine-1.5.14-r1.ebuild 7071 SHA256 74f5aa451ef47f557f79f2910cf946913195f75f9ebf55db60913575e6076f23 SHA512 eb7461b0e23374b28eb92c9232de5bdc28fed3563b9068dd70a0dc777b7928822d448ca7f48d4d513d5d3849673beb15b5f678119e09cf1a0179502d1a55d674 WHIRLPOOL 8b0db1dd206b2362d2b8d17fd9c899d510c543770386a5c6ea2205ac9eb98f5ceb0d79521ba69ca541ade4232f6dc84e2adf6093e79d0ad1d4ddf745b0a42942
 EBUILD wine-1.5.15-r2.ebuild 7160 SHA256 2a3b25509bcfdfd7752c83f9767ad8988db296d61d857f129b8e75fc9be33c20 SHA512 23032c1e002624d4b627085c6c68d632bb9cecca3edc9d78aa96d6b9d31d170a7f59ef846ec976b81d4b6ab84cc7bcf883738bf87e2a16bcf5e17487f3d7efd9 WHIRLPOOL b05f07f76bb159b76fdd9e9be0e672a9f0d9c84bdcfc4ce2b83dfb30b6243a48d9f7a0713ffbee5c427f47733387cab9e7a8d1c2ddc916cbfc3ee88677313ab4
 EBUILD wine-1.5.16-r1.ebuild 7160 SHA256 d144d8456a99b142d6aa4eb85e3d889cb849b14f9469d248a3df49096cf321f3 SHA512 baa8b8d8f134a08d9ed8bdebfeeb165e2ca6206ab7fa0a9281e70dd9701f1e8257dbee960fac6b1c5909923270c847a79ef87f6f9d8cfd57df50b35335c1822a WHIRLPOOL 5cb9e99e14198c64d5acfd38084da7945e368dbf03d932af6652084643ffee84d8d8be6cb5838c1b7e00779077d6fb282111e0e3cd721856a141ec1ba9db5c03
+EBUILD wine-1.5.17.ebuild 7157 SHA256 dbb99f2084ebfa49d0902dc44dfa2a42f46b8dd186807bef2e207d7572000bc3 SHA512 8124e15adf99f1acc779f5e4c75f2c1c39f157df4c2a103b7beb4f4e6f4b7c19e6bda40f14ebbe168d52c8bdf0933cce332353dbc1286ac20dd6fe3670c7ad5f WHIRLPOOL d124b60271b56b41b3eb424698e41b03f0893a85c07cf9cbdc0a5a2f827e0f0beae8448a323c58b16a644e4e444794d6150665d360f47c26bd27469d1fbdfc41
 EBUILD wine-1.5.2.ebuild 6390 SHA256 15c82300f8b1a81ab431e7db66cc707343a172e98e965f5506523787baebdc36 SHA512 5d114c41aebd5586507717ead272e8d657048d41417a3549ef023894b820c0eb47b26c69adf9eabc1921de85bcdcd3f86f9a0d9eb3bd660a7d0cb240754b6d2a WHIRLPOOL 1ede81cebfeabce2d1f4e117d9f66c2aac22a92e4d78b475ea56bbf1beab33660d637d588e69d743bef9587011357b0fa5c2f33f13a7b762f6563aa32eaaea88
 EBUILD wine-1.5.3.ebuild 6390 SHA256 8092714042282e8b8fbc9fa2347d8b577e3d0cb90d1920c1915545c044494b50 SHA512 1a882c8cd13fe3d0deeb2be1368eee8874c5d8475901ab15b079aa534116ab73c9598c1f43a8e17788c1e6ecab6c4e2a02b298da03dcde032f64eeb0b4170bdf WHIRLPOOL 4390f427a1e4cff09c7f9056895899dc9fec5f743a29f4a550415ccf384f58aa2f7ad343d543117481fb64510006b95ef2f70177940b3c5e2169df1e6dd33d6e
 EBUILD wine-1.5.4.ebuild 6390 SHA256 2af684a36d1fe4552a7ee9393c3bd20f3c98a5d2799fdc8c3f86191f1de842f1 SHA512 1b646382979eef997d99b19497f2ce231e5c56e17c1cd3f1e112fa11b7c425eeaffb9bb8aa3a7c978c37e0b3873136f8407b9f7ade31969511eda0ca50a0bb22 WHIRLPOOL 8d359e9b84667d372d87b2aaa898a03714875527ec19a1fc2feec1a02f6a96250411b7fb07f0cf0c2f7376909dd2a03a40df47bb00466fdaa02f18aa82b636f2
@@ -68,17 +72,17 @@ EBUILD wine-1.5.6.ebuild 6610 SHA256 2be441814933f6dbe0a76de573f33d8d68a33699fb9
 EBUILD wine-1.5.7.ebuild 6858 SHA256 9c532dfb312bb2fcc6bc52faea696927a69c87dee8e1da8cdec346709f8e838b SHA512 ac23ff2c19ba256d0b6f55c14323f3431bc7270973915a7c2549ddeb9cda4a723abbf7586505ce4623886a20be1bcbd9ff0d7d7f96c403cdb66fdbe151232103 WHIRLPOOL 3b8d02ec386f6f930ed9976ef7765a1fb3c3a1536cb1c48dc532cc8b8d7706d40b3bd832b8de925b7a499c4d6aa3c748843cc6e3a0beb9b5062a93cc5d99fb11
 EBUILD wine-1.5.8.ebuild 6858 SHA256 221ef4f2dbdb8f0521c6e6ff8048a6179a1e6819862677069fdd29d5984b232d SHA512 0fc4c55d64cf343fc0b2093394d5805e40f7cf1bb5a1192ec531c8477546577a1572eb8af0352c65da7a48765321d21cbca2a8ef21e1debf5a4e4172f915014f WHIRLPOOL 8bfc0c1c1122e067dcee44ce1949b688f0c8ec93427fc4df90f464e8683ed165904db5451e775924a192b88fc3834aa2a06803abe0f30ed1373b582a06d77738
 EBUILD wine-1.5.9.ebuild 6858 SHA256 5c003987ebe1c8c68658f16b25daed46ff238c25c5d6cf1d9a619057bb77d9ee SHA512 098d8dc69a031e02d35180bfa9e418de5eab65ec1fe3290d61b2a0a5971dc2c33376699bf97a4ec70e788dfd6d26df2473761a0a04fc4ac3139f721979f67f83 WHIRLPOOL 984b1e477bf9db3a8e48ba4e5f008da5a2025be23fc8598ce9d96a62eefb5abf63ca81e973ed251fbb664c6d11ea8186da66cce07796d940eb694dda1f4ebefc
-EBUILD wine-9999.ebuild 7157 SHA256 383d45533b7285a3118d77b996ddb83b55ac976edaff4390ebcac2dceb2b82d9 SHA512 920e1cbca42a51021cc0df651ad7af1251aee4e6b388ed6dd552fe3e36a7ce6fcdf4cc686c24da57dfff569d3e17f4578c1d74372e913ebb01f8c3fbfb216560 WHIRLPOOL 4fb390ae025edda8206cfd66e407b679803f143cbdb8b25de143600de40e8ea56fe392f94d9a59924be753b7f07aa18f1f77fdda52665adbfb27fd37c0d37789
-MISC ChangeLog 97996 SHA256 53a7095781cc52e2cd0eca7050693568fba8362f4517cb0d2dfcd02ebb6363b3 SHA512 7ece937961055cb1668e9b802cadacb4288a3191d6b9aee8fd60ed5114811d0ee3bcd8a4aa2765e456d9f257562e04db54ce5ed54c8fd33301c8654e30fa5b8b WHIRLPOOL 6654c2d35d1142d937be7e3990758bf8d0865c8dc040def901cdfcd330871f6d6026393321b37c74fee36ffa24a96ef148fca835aa8a016461f1d8ac75df8c76
+EBUILD wine-9999.ebuild 7157 SHA256 18dcd08cfe074e9438cfd9297d2bfbe01e8d2492c19df32a491c31824f8a1b38 SHA512 47b450ec19b5f6e2403b4df83ec18af1dce4ec823d1ed9f5f5a9f7e5c6f07ba8337431606358ded2a387a6bd631527290b10353c0aa9f749f4664dce98cd558b WHIRLPOOL 189e0b82172accbfb5f58aada2be75adec31864ae2da15c5ed8e5008806e7d3201a9b89c7ebb2585997f52fbad391e6ccf4bd485a531010ece7890947f8b8cee
+MISC ChangeLog 98236 SHA256 3952956b05fdd151f218c35ed2d2ec56db95e7d0923b649558afc2a9e312e678 SHA512 79a5385e1dab7e0a7cca8303cd7b988f288f8e8f39a53d4d45d7255aaade9e85d7661538acf735f4989685aac080ac09c5f0557b2138740e593a053c074123c9 WHIRLPOOL 308a2f4981a786fd4c506f389d3a3db1ebd36b6d2ae1c3bb6f05b872ff4869098cd3566d0540e5cf0e14948fdb714a371e03b4374fc1dde13b3d7037fcaf7856
 MISC metadata.xml 1708 SHA256 3540876c7e1eeb0411e86068a8888ac4ed2dd276a16b9df121bb9ab0b643db2e SHA512 6b76c93bf232384ff7259b40931abb4c97d96dc5fde76849835f1727295c5929ff9628091f94dc00b1c7114a5760772e6bd3189c0cf0166eaabaed67b8589d2a WHIRLPOOL d98cfe4b446364b17ccb6bb679fcbed06b0611829451dff8f25746a42437dafbfbb20217582fe4033342bad609cce3867b37c7524a13764202066198adef58e6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQjxMQAAoJEJ0WA1zPCt1h52MH/1N5BMlZQcHzgyAB9U3X1195
-6NWlb3ksl3wO3IOZ8y5lRJ9gJZfPEYmDeJYkUYAyYIafCj9BonnPwVuuV/qywTGa
-A/e1pItjXRxx0N5f3NiSqZAvHdPI4ibBdf0pU+yBbeGmmomSbhJ2B+p+Y3EM7Lpu
-sRWkSJuCS14BP7kXJYfciDZwh9R15Xi+kcPheF8gXKt8M4d+l6H9NUbR+Mk8Jaxk
-f/D7nU+bzf6slNn7VqCNsmtv5eVjEH35I87y2YoCmVvbMfl4MxtxoIGj7MQHNFei
-wC/NPwplLjetS44ytHDLQdFI2qey0EgowEzs5SIcbEWBIjPvVor9Rm6aVUBRjNA=
-=KWGf
+iQEcBAEBCAAGBQJQnZCZAAoJEJ0WA1zPCt1hBj4H/1IoS6Lq8OGA9bzsdWarw/Kk
+c0lVespZIbaXKQJVnT8xqgFJ/tRcovEKGU67rI1eojSDg9CgsQJbU8+hopmsvG+8
+y77qjVTcQ/h7U69+7PMM1Rilx6ibrWwjHYgANkX5MwY2KaiuO+JR0Zjkvua7GNuh
+pClq40XlbaWut5MrWw9wHb+M/yNFrJ13jb9QI0mFLFnaZvqQTEnPKWs9tX3D0YLE
+fZuPxlZOvAZzD29juw2H+9QTcmcVi6gFoiYnwUjzs1TCue4yvhuWxBrMgCuyqjIZ
+6mwPRODHlD54DSTs8857dN68r/j6JFJIJ14amHxm08CKGjj+tGdjqmOPvlAl+ew=
+=ls8e
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/files/wine-1.5.17-osmesa-check.patch b/app-emulation/wine/files/wine-1.5.17-osmesa-check.patch
new file mode 100644
index 000000000000..823619271315
--- /dev/null
+++ b/app-emulation/wine/files/wine-1.5.17-osmesa-check.patch
@@ -0,0 +1,38 @@
+From 1ede664b18bd8a88359a3cebb291ad49833ee033 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Tue, 7 Aug 2012 01:29:01 -0400
+Subject: [PATCH] Do not check for libGL symbols when checking libOSMesa
+
+If mesa had been built with shared glapi, glAccum is not available in
+libOSMesa without explicitly linking to libGL. In addition, in
+mesa-8.0.x and earlier, libOSMesa needs to be explicitly linked to
+libglapi if mesa was built with shared glapi, see
+https://bugs.gentoo.org/show_bug.cgi?id=399813
+And in mesa-8.1.x, libOSMesa in addition needs libdl, libpthread, and
+libstdc++, see https://bugs.gentoo.org/show_bug.cgi?id=431832
+---
+ configure.ac | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index cc32c24..275b792 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1128,7 +1128,13 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
+ 
+         if test "x$with_osmesa" != "xno"
+         then
+-            WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
++            WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[$X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
++            if test "x$ac_cv_lib_soname_OSMesa" = "x"; then
++                osmesa_save_CC=$CC
++                CC=$CXX
++                WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[-lglapi -lpthread -ldl $X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
++                CC=$osmesa_save_CC
++            fi
+             WINE_NOTICE_WITH(osmesa,[test "x$ac_cv_lib_soname_OSMesa" = "x"],
+                              [libOSMesa ${notice_platform}development files not found (or too old), OpenGL rendering in bitmaps won't be supported.])
+         fi
+-- 
+1.8.0
+
diff --git a/app-emulation/wine/wine-1.5.17.ebuild b/app-emulation/wine/wine-1.5.17.ebuild
new file mode 100644
index 000000000000..cb0f6220775f
--- /dev/null
+++ b/app-emulation/wine/wine-1.5.17.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.17.ebuild,v 1.1 2012/11/09 23:24:07 tetromino Exp $
+
+EAPI="4"
+
+inherit autotools eutils flag-o-matic multilib pax-utils
+
+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="1.8"
+MV="0.0.8"
+PULSE_PATCHES="winepulse-patches-1.5.17"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	gecko? (
+		mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi
+		win64? ( 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"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png pulseaudio samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
+REQUIRED_USE="elibc_glibc? ( threads )
+	mono? ( || ( win32 !win64 ) )
+	osmesa? ( opengl )" #286560
+RESTRICT="test" #72375
+
+MLIB_DEPS="amd64? (
+	truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
+	X? (
+		>=app-emulation/emul-linux-x86-xlibs-2.1
+		>=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?]
+	)
+	mp3? ( app-emulation/emul-linux-x86-soundlibs )
+	odbc? ( app-emulation/emul-linux-x86-db )
+	openal? ( app-emulation/emul-linux-x86-sdl )
+	opengl? ( app-emulation/emul-linux-x86-opengl )
+	osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 )
+	scanner? ( app-emulation/emul-linux-x86-medialibs )
+	v4l? ( app-emulation/emul-linux-x86-medialibs )
+	app-emulation/emul-linux-x86-baselibs
+	>=sys-kernel/linux-headers-2.6
+	)"
+RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
+	perl? ( dev-lang/perl dev-perl/XML-Simple )
+	capi? ( net-dialup/capi4k-utils )
+	ncurses? ( >=sys-libs/ncurses-5.2 )
+	fontconfig? ( media-libs/fontconfig )
+	gphoto2? ( media-libs/libgphoto2 )
+	openal? ( media-libs/openal )
+	udisks? (
+		sys-apps/dbus
+		sys-fs/udisks:2
+	)
+	gnutls? ( net-libs/gnutls )
+	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+	)
+	xinerama? ( x11-libs/libXinerama )
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	opencl? ( virtual/opencl )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	gsm? ( media-sound/gsm )
+	jpeg? ( virtual/jpeg )
+	ldap? ( net-nds/openldap )
+	lcms? ( =media-libs/lcms-1* )
+	mp3? ( >=media-sound/mpg123-1.5.0 )
+	nls? ( sys-devel/gettext )
+	odbc? ( dev-db/unixODBC )
+	osmesa? ( media-libs/mesa[osmesa] )
+	pulseaudio? (
+		media-sound/pulseaudio
+		sys-auth/rtkit
+	)
+	samba? ( >=net-fs/samba-3.0.25 )
+	selinux? ( sec-policy/selinux-wine )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
+	scanner? ( media-gfx/sane-backends )
+	ssl? ( dev-libs/openssl )
+	png? ( media-libs/libpng )
+	v4l? ( media-libs/libv4l )
+	!win64? ( ${MLIB_DEPS} )
+	win32? ( ${MLIB_DEPS} )
+	xcomposite? ( x11-libs/libXcomposite )"
+DEPEND="${RDEPEND}
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	xinerama? ( x11-proto/xineramaproto )
+	!hardened? ( sys-devel/prelink )
+	virtual/pkgconfig
+	virtual/yacc
+	sys-devel/flex"
+
+src_unpack() {
+	if use win64 ; then
+		[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
+			&& die "you need gcc-4.4+ to build 64bit wine"
+	fi
+
+	if use win32 && use opencl; then
+		[[ x$(eselect opencl show) = "xintel" ]] &&
+			die "Cannot build wine[opencl,win32]: intel-ocl-sdk is 64-bit only" # 403947
+	fi
+
+	if [[ ${PV} == "9999" ]] ; then
+		git-2_src_unpack
+	else
+		unpack ${MY_P}.tar.bz2
+	fi
+
+	unpack "${PULSE_PATCHES}.tar.bz2"
+}
+
+src_prepare() {
+	local md5="$(md5sum server/protocol.def)"
+	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+	epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
+	epatch "${FILESDIR}"/${PN}-1.5.17-osmesa-check.patch #429386
+	epatch "../${PULSE_PATCHES}"/*.patch #421365
+	epatch_user #282735
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	eautoreconf
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+}
+
+do_configure() {
+	local builddir="${WORKDIR}/wine$1"
+	mkdir -p "${builddir}"
+	pushd "${builddir}" >/dev/null
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--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 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 ssl openssl) \
+		$(use_with osmesa) \
+		$(use_with oss) \
+		$(use_with png) \
+		$(use_with threads pthread) \
+		$(use_with pulseaudio pulse) \
+		$(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) \
+		$2
+
+	emake -j1 depend
+
+	popd >/dev/null
+}
+
+src_configure() {
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	if use win64 ; then
+		do_configure 64 --enable-win64
+		use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
+	else
+		ABI=x86 do_configure 32 --disable-win64
+	fi
+}
+
+src_compile() {
+	local b
+	for b in 64 32 ; do
+		local builddir="${WORKDIR}/wine${b}"
+		[[ -d ${builddir} ]] || continue
+		emake -C "${builddir}" all
+	done
+}
+
+src_install() {
+	local b
+	for b in 64 32 ; do
+		local builddir="${WORKDIR}/wine${b}"
+		[[ -d ${builddir} ]] || continue
+		emake -C "${builddir}" install DESTDIR="${D}"
+	done
+	dodoc ANNOUNCE AUTHORS README
+	if use gecko ; then
+		insinto /usr/share/wine/gecko
+		doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
+		use win64 && 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
+
+	if use win32 || ! use win64; then
+		pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
+	fi
+	use win64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
+
+	if use win64 && ! use win32; then
+		dosym /usr/bin/wine{64,} # 404331
+		dosym /usr/bin/wine{64,}-preloader
+	fi
+}
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 561f7c7c636b..f7ac15a312de 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.120 2012/10/29 23:36:46 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.121 2012/11/09 23:24:07 tetromino Exp $
 
 EAPI="4"
 
@@ -20,7 +20,7 @@ fi
 
 GV="1.8"
 MV="0.0.8"
-PULSE_PATCHES="winepulse-patches-1.5.16"
+PULSE_PATCHES="winepulse-patches-1.5.17"
 DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
@@ -142,7 +142,7 @@ src_prepare() {
 	local md5="$(md5sum server/protocol.def)"
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
-	epatch "${FILESDIR}"/${PN}-1.5.11-osmesa-check.patch #429386
+	epatch "${FILESDIR}"/${PN}-1.5.17-osmesa-check.patch #429386
 	epatch "../${PULSE_PATCHES}"/*.patch #421365
 	epatch_user #282735
 	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then