Bump, see http://www.winehq.org/announce/1.5.10 for the announcement, thanks to Rafał Mużyło (bug #429386). Note that on amd64, osmesa support is for now win64-only.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

6 files changed, 328 insertions, 8 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 4a49d8cc55ac..97b49f1eeddf 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,14 @@
 # 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.422 2012/07/19 13:57:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.423 2012/08/07 08:06:43 tetromino Exp $
+
+*wine-1.5.10 (07 Aug 2012)
+
+  07 Aug 2012; Alexandre Rostovtsev <tetromino@gentoo.org> +wine-1.5.10.ebuild,
+  +files/wine-1.5.10-osmesa-check.patch, wine-9999.ebuild, metadata.xml:
+  Bump, see http://www.winehq.org/announce/1.5.10 for the announcement, thanks
+  to Rafał Mużyło (bug #429386). Note that on amd64, osmesa support is for
+  now win64-only.
 
   19 Jul 2012; Tomáš Chvátal <scarabeus@gentoo.org> wine-1.4.1.ebuild:
   Amd64 stable wrt bug#427060.
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 3a7e53e868f8..12475c0cc5e9 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX wine-1.1.15-winegcc.patch 1556 SHA256 dbd89db561d7583faf317d795b8c11231575d885e21c6414add39079604dbd0d SHA512 a6a6dbde16c1f850a5cb4d6b6fe1a8129bb267c44c19de63a4eb26933fd69ff98e440d257e467d766a6a6ac326d72dd621cae37fb593c8c62e43f588ccef3f25 WHIRLPOOL 3aea848b17217ab215f860c3526c44a5d9bd9e7adfe35c02bb5c841461bdaf4bd8ac4f8e8b990c0558980381fc1b2441b79edc3ff6dcde7455203fbd1fc3f49c
 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.10-osmesa-check.patch 1620 SHA256 3c6c5081cd28231e251c6bacdcee3042decf87ee985624ca76d7b9c1d35a0184 SHA512 79fba34bc250d84de51761de6aa01107f1004c0bb72d50cab1766358a26a9db3697ff89a6b537ed2674a8192633f57499055825889b0f59337852e416d99e148 WHIRLPOOL 07cbc825455e3c091e637e06732bdcbac4de1bb05d9db731209a65c0a0ada0921d40934967353b0efc82a01956aecdad8163c14388126bace3ed021b52c173e1
 DIST wine-1.2.1.tar.bz2 17629106 SHA256 43d1c4d8441221708e6e15ddcddf113308ce875c87f5a8c0f380c6a5b8b63701 SHA512 2efa9680c140270d0e20adba54ce3b1da64d42f53f86dab0aa9235f36ba7d7d9865a07a919ba4f2e6d535b268b84599deefe037cc66a5c215553d0fe3e8b1a4e WHIRLPOOL 871e40a73110980922617dc9df537c67eb672024dab1c1bf5a127955640465889f13d3db709ef08c297d2a1db7829e035fc2d3c0f600d31875c4665777201b84
 DIST wine-1.2.2.tar.bz2 17665449 SHA256 c3daead3d40a7c00111200a8e9271d4647369ee4eee2d5d866c2032ef37c09db SHA512 0482d795f80fb947237b8abac34491b9c1c7f226e6e553d5572650e62aebdcee98ae030a73672d8dfe2dc7f76835092c1a89fa0eee35cd3b5d4383755d68572b WHIRLPOOL 64c0bd475f9a6089d0d239740ec2338a43aa325cae64c81feb62594d3099e7316d419b7cba8ac6f3593a94b75b207b6892573ad9c521a9b85abca0cea416d232
 DIST wine-1.2.3.tar.bz2 17651336 SHA256 3fd8d3f2b466d07eb90b8198cdc9ec3005917a4533db7b8c6c69058a2e57c61f SHA512 602ae802aa6f94c4498ccae96a67e355a8aa5cdc1e9c1e0f29482f45a9e7cc7af766ade9f2f1fef77ee77d5bbfc5f34cd110b95db244b8cff42998b5b0cf708d WHIRLPOOL 02ac95d8c86d0f2d870c8e4c4789c1bef1ef965f8bb186de23fd3a949126ba2aadd5791d1908bdf11d946d5dc5348b085881c2594cf1b407fa0df44c1990ecd9
@@ -47,6 +51,7 @@ DIST wine-1.4.1.tar.bz2 20104401 SHA256 3c233e3811e42c2f3623413783dbcd0f2288014b
 DIST wine-1.4.tar.bz2 20035856 SHA256 99a437bb8bd350bb1499d59183635e58217e73d631379c43cfd0d6020428ee65 SHA512 15943f4edef92e29996b1cf5474570f52af49f4848a5c4f5aa4e51244c0f3052ef1ed8fe91392054157ff3364da9ee14b55df9965845ad28c17ebf5df4a3daf6 WHIRLPOOL 1e0bb02b98d2b0a63920ed023541d52617dd85609d286ebb3f5190ff75f705cf3dd016a554ea00fe4dd275cb3b20ef268f280086651515265e8f9937f83e7169
 DIST wine-1.5.0.tar.bz2 20132171 SHA256 ad15143d2f8b38e2b5b8569b46efd09f9d13ce558dad431e17c471ca1412742b SHA512 b300822c8d5f872601acd536f3ad18873b132dde01c8ab69aa5c32db29f82bdedf07b5ddde0996fc903f848bb662e6246611827b764626735249d93e269c3ce8 WHIRLPOOL e37c67c9a02a3f181ca74708783da58a375d5f37f21934b0bca1bbb871759111721dc1459b532f4446f4b371f3f84234551c602154e21e59cec18d052c90dd38
 DIST wine-1.5.1.tar.bz2 20078739 SHA256 6dc578f9afb3c9a0f2b773bbe09af20578ac6fa514dd0712ecc5d05c766045e6 SHA512 afae032255f227bb929d0c1f3e6997c776e0f13f544dfde5ac733edac7cce04f9b0d6b0d113a3ec8ff566d075fa3e9e6823dc0e8372b3f41229414cae85799ba WHIRLPOOL 02bed1c470654f0eaa62bf3e10dd244a096f80ecf1061eb8cfe6fc512ee0bc9b0677b11befe497471d5b28f6ed8d1d6f438f089717b1add3425d23b37debbd61
+DIST wine-1.5.10.tar.bz2 20510011 SHA256 f35e7a52faab23647fd15ab9b54ea7a390fc96159d4e9a17e22b118c186f9e13 SHA512 b740dafe11ad64e66f6527cb6c5fdfa33071df762ce69ad79c978486e69560ac54961d751ca92531cc667791468fd136f266fc225d04c28615ceb80850b2efaf WHIRLPOOL a9973a83ea00efeef74e1f50af46980ccf68f56bc3d079a7995422c6fb93e48db2c631ac757529f911e62c0e17f36122a44be857d13650a1b8b68dc531c39ef4
 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
@@ -69,6 +74,8 @@ DIST wine_gecko-1.5-x86.msi 15950848 SHA256 2e372a1b87ff2a22ad5127400ece4b09e555
 DIST wine_gecko-1.5-x86_64.msi 16345088 SHA256 762e80b41e6922849b28299dc5810a28634d484fe73fb7ca52804460588a1730 SHA512 4c78f63b2213d58293f94bb4ebb339811f61c38f62301078bbb65d5f790d52e10a1674d2a022e2d571f55cd9858bdea0fc0512e3fd15c6368669a46f91c0a50c WHIRLPOOL 76ffefbf44ed34afceb6f771c21db4c21be026b281ef76db44159f5eac08cfc5e5107c5dccaec752dd5ce787f3ccd661aa4eb5fb0e714b82b3bbd22e601183ec
 DIST wine_gecko-1.6-x86.msi 16802816 SHA256 1f2c201b970c2ec3dbfd35c29530edf4aaf1e82d45843f531fc43a03d7615e5d SHA512 29ad26bc37563d7dfe99b2c5b403a35f9d69787e456e9797596cea48c074f44dc38c2339ff208c7a53f30d0b4014a7ed27bffd13ccb1e0482540bbab689edc29 WHIRLPOOL d259fd4db5d452427bda31371dcd4211e21da4efdf3fb07200253fee14f9b6115836a666738613f1b5a7b1b5e4c5d8f0078aafdc1663f265e823c968e8884ed5
 DIST wine_gecko-1.6-x86_64.msi 17251328 SHA256 9f27fd2f67a10e01f9960707cbe365e795003050529af63fc68bc1192580801b SHA512 be49b579ed881fcf21980fa76e7be7891ebdfb6dd452646f8b7a8204e1b2ca1995e5d745252686fb4ccc25213e2aaf02a0d8a13b32e773095fbffba3878227df WHIRLPOOL 9ee867e2a6e25e3f90618a2cee7c32be639743454bf89429ed831aee04bdda6bb14cd3c5772bad1a3e8b9ac7758da9745cdf4f2470e859691b0f8fb0f76b367d
+DIST wine_gecko-1.7-x86.msi 16995328 SHA256 2ed524e79cc88137b28430389af19cb032989311921462a29f72d6f121954913 SHA512 c17308ebcaaa947729dcfcc73736ec4f0ed559744eb89fc7b60afab9bc6c67044dc4885209ac79104ef0f957e842162ad8beb1535236c0fa2ed0dab6b0133636 WHIRLPOOL cba9e7276783c3fa828a948c6c5bca3a01329dd768f0768f310624aab70bcafb94dca1789ad77670dfc5c737da0a21342641997c0697d7c2a337b9e15555363b
+DIST wine_gecko-1.7-x86_64.msi 17438720 SHA256 19d0364a43621738fa3fd1713ef9590ad0cc61ea4c8858ad3f8703a81b13c927 SHA512 04928aab0ba3ab90074085f9198e46372701249863b6710ed4ffc0c92e0ffc30348a41be528c7c1dec9007441cc1f3d3aa1193e469ac75f5ae635df52dac4dd7 WHIRLPOOL 389ae0eb32b2ea994cac9fdb0fd785bb457489063657040f54a5dd74c74483396772b18bbb0e7b4d86c1036d52a21d0d68610a458842e79e2c2567301d3e1659
 DIST winepulse-0.35-configure.ac.patch 2826 SHA256 837bffaaddb6b7b0a474c7262a57f12e250e135cf6228dde1a22849f66de1250 SHA512 cb7a86c75cfca401e12ab117407cbae95c7aecffed37d1843e5b58bfdeb54212cb7c4b783280cc94afa0f1c9e58ebb61e28627ed3b690e099cd539d052cbd3bc WHIRLPOOL eb03bfc3e01798c3203814f9b7cf73bf1839ae3563d464f569166285c035b9e2f5f2d74b1238dc141ae1ec67a9e6be4f87d558014f490f43fa990ad19dea5121
 DIST winepulse-0.36.patch 101815 SHA256 7508b171bfecb461ecb464426cb4bcd9c3ff77645b787fcbf61e27dd34fe1b05 SHA512 9b9ca1284c6f8f1108a0456989dd0e7a3a35a3075dd5e6601e84d91e65a60a263992736a16c432a7ca75f40e9dc904cdb546b51acd1508b78cbaff060a461d6f WHIRLPOOL d00f9ebd163b632c9cdf3d6581cc9c010b7c0db4c96666591dc4fc1aa48bac030def35964a4dca9c9405ab32b51eaecf2f392b0f57771bc2dd04f5bc2603e789
 DIST winepulse-0.38-winecfg.patch 13088 SHA256 051ef1cb5598c319152ad28b85733927a711b45e0bfa92f0b0b2331588f5894e SHA512 714358ec1c1251fde97430e6a3342a8a455f5bf56f1f57f895c6ebaf73e4c396f15f7b12d0f8e02822526e1b4d19a6f161b53ad7c7dd6db1cf8516c95352404f WHIRLPOOL 9e34956d2da028fed29112791bd8497fcdf8b7de8f5f04903b411f091bbe57a8b8ea647a829ab04fcf08ebc5e59d96029e855fbd20a99ae222aad9b322925ab0
@@ -119,6 +126,7 @@ EBUILD wine-1.4.1.ebuild 6166 SHA256 d82d888577ae2183bd8611e758828d329ee307d3b1f
 EBUILD wine-1.4.ebuild 6161 SHA256 3ed7089d464c395395eaa80fb39d4abd7aaf7db303564c9acfbcd9e684f50f37 SHA512 d1fb6bc0726ac113b0b5222a62ce1695f10b3eebc8f4f84cf20929ca67177a97f280814993d25b4d85c49e7115ee40a5f315d5cad10b51b20764c47fd5ad44a6 WHIRLPOOL 19ea6efacf75d46011b80cdcdb1f767c3becea8c38cc8a652be27a72bc95ad6d586eaf502e5aae4f9ae0e440b72c0361465cc62d03c342d8ce2139b847addc1f
 EBUILD wine-1.5.0.ebuild 6168 SHA256 5007b718e2d4fef6ef8a106f4c80b7f773983e665bf778e831153f38956d93da SHA512 7c82cefc6e0a8d3aa83ad5bbca7a9a7597bf07620841aa2b4449f296398b8c42199debeb172654e05fa855550d4e4298b1c046337c7479267982403df12b244b WHIRLPOOL 373cd6aeb7b8d4175210719f74af3324856d5145bbd896c226315b7e0b15a9074149247498b386950c4793555bb4608a282c0cb22154b3048be4154f23675fef
 EBUILD wine-1.5.1.ebuild 6168 SHA256 1b4578b46c22cb3b3e00732425044c343388187473f5b83800dd08ca056d7f31 SHA512 ffbb65f2d26939f872d679816fd2f96185ddca0f0938a93613c6d521266a847c591721efa4f6820ed7a28fca61916c2100f625cc17acd683fcd51ad7ce3278bf WHIRLPOOL 9be4022a2716036424d170f0be15726dd001c983ed2c81bc36bf746d846de7a9eccf6e899c2c1cbd520b7aaa2b4b0d552678d9384158e8ea1e487ae613c4db0f
+EBUILD wine-1.5.10.ebuild 6976 SHA256 3f2e1028f0020f954570cc78b96b4facfb6c07710430d8b770a18da8d60cf2f2 SHA512 c0e31668379f53d890c984168b9c01f23a1206ffa508df10168cdeb4157f811d7cb3b03fb10e8209544ca355968b663e7fb0ec9811ae0a4b01a308f5674544ae WHIRLPOOL bc32776fc8747121669b404785c767e8e1817ff56d07075e14581a1f1cda06dab452731f7edaf094d507242d9edc99861387cb285f3aad1bf6814f205d343d7c
 EBUILD wine-1.5.2.ebuild 6168 SHA256 24f5fb3449dcccfc011bb4fbd391f957a698d443b545e24b3329f58a683ce0b5 SHA512 6f5cfe07929f2eb3783c756625aa92c35a4b6b0ff286db3ae1396d749bf4970e509a3a673dea7aee94ec1ba41aa959e4a2856810095ec77ae4ce93d1b9a4cf42 WHIRLPOOL 367e2616283503820e9685a987e65b9cc9cb794d16d8895038a26ef0b63c5caa92201d1ed4f6c163fee61b0a25464d5ee226d25b017d6c448364e61c09f3d18d
 EBUILD wine-1.5.3.ebuild 6168 SHA256 f1c72d6ad0c1c1efdb7f9a0efa83491ac0aa296fee9c97c52358d8f96675c71c SHA512 4c21afb6d493726d301c6ac013996d21a7008ba54ebd82da8ab89f08c2bbbd1507adc6d86ab575aed8b42d4f8b5b73ee2611e62773743eb2d4d688c998441db2 WHIRLPOOL 018b932321b8df14c91f6d1255889d6aecd1eb627c1b9e92a8b4426c4dea648c3a2486f7f019786ab5b083f926b1981a91ed27bd76f3f253f37fa49f4c72cb7f
 EBUILD wine-1.5.4.ebuild 6168 SHA256 a49530a2e7532464764a0c08aa9a70ed7eac9bebf7d86ff11ff091a5db1f365a SHA512 109b72133cad73c15fc338b6d85f1b4dc379213698c30713fb4a81fcda93d93074a447bd3193bde49066b64f27cabb00717914fbb053699476da32114bbfb609 WHIRLPOOL 583f8ec9bd15d260d883ed897982374ea5c3f88de76dc2ccb0f047b7f4d0c78021dccd535efd2a83b1fb0d1ebe12873460c56009ae70ac2384e6c79fdaa80a64
@@ -127,6 +135,17 @@ EBUILD wine-1.5.6.ebuild 6388 SHA256 ad0e78717839519b785eb161af385953029ab13adf7
 EBUILD wine-1.5.7.ebuild 6636 SHA256 337b351c376da2e5f7beda7f80f7d3cd90ccdec45d1c61451f1f3d92373688b0 SHA512 3b5a2162f1c8ecf1663a46b3e5d3f2bc005582d149510e8ba8d461b8ff52bee9e6c76477a6105ebbc19b52c4cd8cee5f61163544bdc523b3c139df0652534138 WHIRLPOOL dd9e63d015831297249b2df55ea90ce0be0dbd2a659d33f857d7c798de53bcdef8afe40d54299aed4314e82ac7d47f12b47d7510b5152b78bc0293a9135b5361
 EBUILD wine-1.5.8.ebuild 6636 SHA256 d52d5d7c579a176b679febb6095d979b4556e51b7974a5e733be72376f53d26b SHA512 6e64bcc04897b79d4425693559ab776295faf3a8fc9e271feed44d8ec7eeb228ad8259555d951e76afc567582ea35a992cbe83ca51c01add2d50b3f2f6d013e8 WHIRLPOOL 7fa42bfb7902c59cbe0cd237df99c56c4823198c537a4a1b8392c00c6eb2938802b8b1552be7334f237c7e3c8c069819eaeddef9fa951887a7f371bb4df07947
 EBUILD wine-1.5.9.ebuild 6636 SHA256 e8ef01ff86e89f2bcac401d070b1256b53e99a041ef3bb9d54ddfa5f1547521c SHA512 1870202b108fe166bfeddb0b18ccf7d2d2209627b0edd29fa71fee2614d1c0c7450b6489259b231e69ac347fac64134ca1738f6b90139f0b1a55c7835781259f WHIRLPOOL f8c33000dfd9a7726af39e66e3431fb2dcbae9ae62f84030710e5217bcd0b30fbbbc0295b925ae8b4620f9d597a2b53595a2b7f4ba9f7d2d79f079d56666a92a
-EBUILD wine-9999.ebuild 6637 SHA256 655000e05ecd28f7f60a58b9609b32d963d0c01d96eb49bd1acfdff11760b582 SHA512 48937423fa781309bd740e8fe22d003e355e4f1873ded1f6044c95310bd4170b02cde5216f9312c2d5c006b285df745a371a9b47fed862e3f06899f77e29c3fb WHIRLPOOL cffb6b3e4216c14ff08d4f962ec93b28c7b8882a5beebf2590891d97c18929cbb77eff6b00ba3e4fac1d9e62a9decf1ea097afe9dba7597599aeba975bb92437
-MISC ChangeLog 91357 SHA256 916f6dcb4126ab6cf5d96605dadcd386b6a977391d373f7038b79e565a822827 SHA512 71570cfef3d1b476449ae49803583684c318debcb0615d525ac1a80d3c419cc42af30fdb887e52c9e7617e1a3746dc8540ba586d46706638789e9049789fdb66 WHIRLPOOL cac1d6471bf946da61c856ee2e2a0345b26ef09df09f1c93df57c7bc7702490ce804dd865d0c0cf2c702ab6e778f0c9ac43dd570b5d1d8606afa512d1bcbd0d2
-MISC metadata.xml 1630 SHA256 ca6f4da7dcf285cf27f919b0262f5cd5d4471ac4c66963015c1cabc379094a07 SHA512 397dfc2598b9e9f186db2a9705f0494a86f2431b5e69898521b85aaeec76a20930b1342bfc24f9914641120a01242862c8a6edb3be65fe63398a6e90ae8793fe WHIRLPOOL 97ca4d0423ab7cbd36180285f34fb3a46e2ec40a9bd406476af16aafacef25b7dae88143f48b79534244ce051ea9b20a32aff46bd680ea688736bbee51bae57e
+EBUILD wine-9999.ebuild 6976 SHA256 9eb4ae90add5daebf8d55fe0e31f901706eda5e7e38565c8b2b7d4cd7fa4736c SHA512 9eefa0f9a1586afcd0723df2e4104e0ac9cc08e05ed9cfe71502d427f661e57bacf99b2adfe4ae93d213e0d6b5def96a7ebbc297b6dbb04cdf4baa00b5cce638 WHIRLPOOL 421ce12bf6caa1d6c27452f7a3dc516db7f00aaa8c16af393ddb126274479f2e4e47ccaeec5d1a24ca8fec7058540533d9d16106d2ecb039ef3ca6b01dc48811
+MISC ChangeLog 91714 SHA256 d9721139e63cb29e79cc910f44b0160681cf3503dec4c33b1c1e456f53c94abe SHA512 2e9c6e2238a94bc1462a717996415536d779f89d66eddf397c773f1791c32917fea3d7024336047e38a1cebe5788f15b4928d0799e7dc8ebc0e35a709b498373 WHIRLPOOL 5ab2d8b4a2d60ed22f0a126c6cf2d597a4b9a205d550aa8fef759dbb64c3a41fc368c5d82552754dfad46c6c2681ab6519177da5bd0734aaa56ffbb7e6487bd6
+MISC metadata.xml 1708 SHA256 3540876c7e1eeb0411e86068a8888ac4ed2dd276a16b9df121bb9ab0b643db2e SHA512 6b76c93bf232384ff7259b40931abb4c97d96dc5fde76849835f1727295c5929ff9628091f94dc00b1c7114a5760772e6bd3189c0cf0166eaabaed67b8589d2a WHIRLPOOL d98cfe4b446364b17ccb6bb679fcbed06b0611829451dff8f25746a42437dafbfbb20217582fe4033342bad609cce3867b37c7524a13764202066198adef58e6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQIMyhAAoJEJ0WA1zPCt1hp+cH/0dSJMKnRO1aMKy0K0rItC9T
+st2CBZKxCHOTXGdS3OmbixghLql1u8zjYfyORNJuNPlFH1OiJzrwrxshRltvMDNO
+bJZ2Fwl1EP8NSP01iUpOYCTy6V9Qo3XZtCUUrlxZ+W8csYtbF2IM9bgO7Fh4YO0P
+sQzFxnbqMVK8sAxcaeh/5tki7/CzQxwnKgaBnsftjy9w2kqIvakrRotpiEU0MxNr
+09unltOih48bpbKEZq+0ogWZkSITC3HpREDvxrstZR2UmTmSukXsjOrSPGTPtJML
+z+Cb3HtOXGOMC6VVYwjsgWXKgUQElxSErLAiDjWFRWKM2J2sVEYxWr9cWt/kZto=
+=usHX
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/files/wine-1.5.10-osmesa-check.patch b/app-emulation/wine/files/wine-1.5.10-osmesa-check.patch
new file mode 100644
index 000000000000..86d90ca5bc4c
--- /dev/null
+++ b/app-emulation/wine/files/wine-1.5.10-osmesa-check.patch
@@ -0,0 +1,33 @@
+From a233e35ca650db2758de0fd31450b8ce2d86d5e3 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
+---
+ configure.ac |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4bd43d1..c7a718f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1132,7 +1132,10 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
+ 
+                  if test "$ac_cv_header_GL_osmesa_h" = "yes"
+                  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
++                       WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[-lglapi $X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
++                    fi
+                  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.])
+-- 
+1.7.8.6
+
diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml
index 0b3398a84335..0cbb443104d1 100644
--- a/app-emulation/wine/metadata.xml
+++ b/app-emulation/wine/metadata.xml
@@ -13,6 +13,7 @@ Think of Wine as a compatibility layer for running Windows programs. Wine does n
 	<flag name='gecko'>Add support for the Gecko engine when using iexplore</flag>
 	<flag name='mono'>Add support for .NET using Wine's Mono add-on</flag>
 	<flag name='opencl'>Enable OpenCL support</flag>
+	<flag name='osmesa'>Add support for OpenGL in bitmaps using libOSMesa</flag>
 	<flag name='perl'>Install helpers written in perl (winedump/winemaker)</flag>
 	<flag name='samba'>Add support for NTLM auth. see
 		http://wiki.winehq.org/NtlmAuthSetupGuide and
diff --git a/app-emulation/wine/wine-1.5.10.ebuild b/app-emulation/wine/wine-1.5.10.ebuild
new file mode 100644
index 000000000000..2ee37358f0c0
--- /dev/null
+++ b/app-emulation/wine/wine-1.5.10.ebuild
@@ -0,0 +1,249 @@
+# 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.10.ebuild,v 1.1 2012/08/07 08:06:43 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.7"
+MV="0.0.4"
+PULSE_PATCH="winepulse-2012.06.15.patch"
+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://source.winehq.org/patches/data/87234 -> ${PULSE_PATCH}"
+
+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 )
+	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 media-libs/gst-plugins-base )
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
+	)
+	xinerama? ( x11-libs/libXinerama )
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	opencl? ( virtual/opencl )
+	opengl? ( 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 )
+	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
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+	epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
+	epatch "${FILESDIR}"/${PN}-1.5.10-osmesa-check.patch #429386
+	epatch "${DISTDIR}/${PULSE_PATCH}" #421365
+	epatch_user #282735
+	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
+
+	with_osmesa=$(use_with osmesa)
+	if use osmesa && use amd64 && [[ $1 = 32 ]]; then #430268
+		elog "win32 osmesa support is disabled for now, see bug #430268"
+		with_osmesa=--without-osmesa
+	fi
+
+	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) \
+		${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 ac107810c2c0..4f17119ed9cc 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.110 2012/06/24 23:23:11 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.111 2012/08/07 08:06:43 tetromino Exp $
 
 EAPI="4"
 
@@ -18,7 +18,7 @@ else
 	S=${WORKDIR}/${MY_P}
 fi
 
-GV="1.6"
+GV="1.7"
 MV="0.0.4"
 PULSE_PATCH="winepulse-2012.06.15.patch"
 DESCRIPTION="free implementation of Windows(tm) on Unix"
@@ -33,9 +33,10 @@ SRC_URI="${SRC_URI}
 
 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 +oss +perl png pulseaudio samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
+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 ) )" #286560
+	mono? ( || ( win32 !win64 ) )
+	osmesa? ( opengl )" #286560
 RESTRICT="test" #72375
 
 MLIB_DEPS="amd64? (
@@ -86,6 +87,7 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
 	mp3? ( >=media-sound/mpg123-1.5.0 )
 	nls? ( sys-devel/gettext )
 	odbc? ( dev-db/unixODBC )
+	osmesa? ( media-libs/mesa[osmesa] )
 	pulseaudio? ( media-sound/pulseaudio )
 	samba? ( >=net-fs/samba-3.0.25 )
 	selinux? ( sec-policy/selinux-wine )
@@ -130,6 +132,7 @@ src_unpack() {
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
+	epatch "${FILESDIR}"/${PN}-1.5.10-osmesa-check.patch #429386
 	epatch "${DISTDIR}/${PULSE_PATCH}" #421365
 	epatch_user #282735
 	eautoreconf
@@ -142,6 +145,12 @@ do_configure() {
 	mkdir -p "${builddir}"
 	pushd "${builddir}" >/dev/null
 
+	with_osmesa=$(use_with osmesa)
+	if use osmesa && use amd64 && [[ $1 = 32 ]]; then #430268
+		elog "win32 osmesa support is disabled for now, see bug #430268"
+		with_osmesa=--without-osmesa
+	fi
+
 	ECONF_SOURCE=${S} \
 	econf \
 		--sysconfdir=/etc/wine \
@@ -165,6 +174,7 @@ do_configure() {
 		$(use_with opencl) \
 		$(use_with opengl) \
 		$(use_with ssl openssl) \
+		${with_osmesa} \
 		$(use_with oss) \
 		$(use_with png) \
 		$(use_with threads pthread) \