diff options
author | Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-05-26 04:27:57 +0000 |
---|---|---|
committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-05-26 04:27:57 +0000 |
commit | 5ce3b71a0e27608cc04f44a71343bc4d81e9fe16 (patch) | |
tree | a6b3297c47e22240f7f313b436656b5a9b947eab /app-emulation/wine | |
parent | version bump (diff) | |
download | historical-5ce3b71a0e27608cc04f44a71343bc4d81e9fe16.tar.gz historical-5ce3b71a0e27608cc04f44a71343bc4d81e9fe16.tar.bz2 historical-5ce3b71a0e27608cc04f44a71343bc4d81e9fe16.zip |
Version bump, see http://www.winehq.org/announce/1.5.31 for the announcement. Fix build failure with gnutls-3.2.0 (bug #471077, thanks to Ben Kohler).
Package-Manager: portage-2.2.0_alpha176/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61
Diffstat (limited to 'app-emulation/wine')
-rw-r--r-- | app-emulation/wine/ChangeLog | 9 | ||||
-rw-r--r-- | app-emulation/wine/Manifest | 27 | ||||
-rw-r--r-- | app-emulation/wine/files/wine-1.5.31-gnutls-3.2.0.patch | 44 | ||||
-rw-r--r-- | app-emulation/wine/wine-1.5.30.ebuild | 3 | ||||
-rw-r--r-- | app-emulation/wine/wine-1.5.31.ebuild | 318 | ||||
-rw-r--r-- | app-emulation/wine/wine-9999.ebuild | 5 |
6 files changed, 391 insertions, 15 deletions
diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog index 506470d7d44a..673bacf9811f 100644 --- a/app-emulation/wine/ChangeLog +++ b/app-emulation/wine/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-emulation/wine # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.463 2013/05/16 13:30:56 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.464 2013/05/26 04:27:24 tetromino Exp $ + +*wine-1.5.31 (26 May 2013) + + 26 May 2013; Alexandre Rostovtsev <tetromino@gentoo.org> wine-1.5.30.ebuild, + +wine-1.5.31.ebuild, wine-9999.ebuild, +files/wine-1.5.31-gnutls-3.2.0.patch: + Version bump, see http://www.winehq.org/announce/1.5.31 for the announcement. + Fix build failure with gnutls-3.2.0 (bug #471077, thanks to Ben Kohler). 16 May 2013; Alexandre Rostovtsev <tetromino@gentoo.org> wine-1.5.25.ebuild, wine-1.5.26.ebuild, wine-1.5.27.ebuild, wine-1.5.28.ebuild, diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest index 6af739541f23..76cf5a2fd8c2 100644 --- a/app-emulation/wine/Manifest +++ b/app-emulation/wine/Manifest @@ -9,6 +9,7 @@ AUX wine-1.5.17-osmesa-check.patch 1774 SHA256 dc7dde67c416bb067e528b85228cff018 AUX wine-1.5.23-winebuild-CCAS.patch 6101 SHA256 34143c55618870dd31eea1e260ae973572d99557a20f24a4f217bb0ff1d615eb SHA512 f44580efcf4a406517a2fc65d7509a42b0b0b180a4c63f5980c894e708934d60155d87634e406763426415d00c1ea2f8f3894ac4797a2e2527ca0d9ed23430af WHIRLPOOL d62fb5c27fba3b8297ae2151a432f80d9655c0c2ccee9dee12beea84a2186c0e7965a6902d6bc5638cdb1c853c188a49b790825c8741a9dc4bb1516ff6ca9a53 AUX wine-1.5.26-winegcc.patch 1808 SHA256 91c1012059b93a421b2eae9f2ea46b7b327d6d3d58ba0cb47021c8a57f6d8228 SHA512 fce9daf40a96f4a7502c249a30107c8dfc5d8edd4a171b863d2bf14c3ad46d18e4c29932ab4a6ede7da5d589d777b962d2f577f5360ee4db8019d71362c51d47 WHIRLPOOL 71cbe36c6bac87071472541b7f5cd3ed1b08f05479bc0016262b3f86e75738e467dad197563b4898f2b24fd0ab4e27c40dce04f244a3e7f5ea1582b4db1c5cc2 AUX wine-1.5.30-libwine.patch 1777 SHA256 2f0155c2c1d11fd9a06deab54dd753c1161e32217eae82604f8c1d542e87af4f SHA512 e6d566f75632065def197cf27b5705a3f2f736a7b3bb4ae03df19fea00fd980a5b5d0517981469fef0fa5347c1c3b9651894fb23d937b5dbbd993cd292f67183 WHIRLPOOL 62ed15db6bddda47dcf74d846e15a9904c11abdf63e0321e7e2bc3197f60c819992b3a95a4395f85edeef9181a1866749194b9744be8d42bd94acab37470aad6 +AUX wine-1.5.31-gnutls-3.2.0.patch 1616 SHA256 3ce82009b05fe997b0d198ad83533026d6410811ecfc6254c1505d0b9d18caf0 SHA512 09de6ff03da996197cd6833c1f53e9f39b43fc43e02ad3b4e12648a57288c1fa200886a805e6811372e12665f9a5d463603f9a9ba39cb1392b2cf4d11f3f9a65 WHIRLPOOL 590a9206913a51eae81e236057bbed346dae8f895575dcc948ba7168edf5c0605db6278344fad727c2a828a2aeef258f72a57a12b5dca244a3b7b82cfe43452a 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 @@ -38,6 +39,7 @@ DIST wine-1.5.28.tar.bz2 22151210 SHA256 0bf84b97213b07b7339543abcdfccc9da22bebc DIST wine-1.5.29.tar.bz2 22144030 SHA256 387c0ed440e1df2e94aa3630320949976a81725e48912f4d9856009d6b7888b1 SHA512 778a36e224a60a1e8be834944582c922f463e98e5d69c86416e94490a0492ea5f70b9c083fe9426f00268b0b292819bef77dbc9ccfe8df1b2f0190b8bb412ffa WHIRLPOOL 8274435b3fa5928c4c5e123dd30c341f8ef9f03449ea34042dc9285edb77440c6c7b043ae73319617a981354acacf8d4be3ce11e370ff530b0194f5fa4db9777 DIST wine-1.5.3.tar.bz2 20171697 SHA256 d3e8e484cbc2c4888bc880d0b0c8b52299d36a5cecc96d9367b59142345a1206 SHA512 947c20100d02ec6d393f9bdc1899ddeda21be7fa75869f91953e0eec30f2083b2a7fd31ad92c44765b417e3023914db9cc9945fd241207d8189f20ae92da100a WHIRLPOOL a2e2752731feae4d2a44dd0db1edabadd8c7530abd6e988e5c8f862ba70e234874e1a21ad8a25f4dc68e965d4b5122431278b3ed7674145f7fa935e0c78dcca5 DIST wine-1.5.30.tar.bz2 22149237 SHA256 0f6f92a5730037b85b75089af6817ae2ceffb335caa5077e2ab1b41944c452c3 SHA512 437c0c0eb508c7ef6d468d434d751b91ca1007231fcc1732aff00be6f0bcf0d96e207d5251f336345c2fea2f20035ce4cdbd51ed258baebb5c13734858868c97 WHIRLPOOL dbab130d71ef4b4d3f2141f327222fb569921c2adb5bad00dd1024abd401b61d1e26d7bb0aa86f4361aadd6e7e29a7207fd139ffdad2b5ef50db4ab7f156cb69 +DIST wine-1.5.31.tar.bz2 22171605 SHA256 462547451e17a3d2a287b2881731282da3b537bc2cf338e9c2ab86d8470e92c2 SHA512 94ef34710c9bd180ec359bc795ba3456fb50ecfa2911dbd0e28f47ebdb4c1cb26bad2062d8a693186bacefa117eb0e67c3e1320df14867d84a0fa788b2181284 WHIRLPOOL 5f772e7924bd531fcf45e608cb539e1abf738511d75c98060f00a5227b139e8944f8952ac5688707de992b95bda2bbef33d159b1ddc0dd53826ce8aef9a645bf DIST wine-1.5.4.tar.bz2 20187597 SHA256 90b10450b1afb4d54dfd20529e040daa4ee901c52b2f3bc452a86c2e06b4b759 SHA512 cb58358a2af9e15d7ebff21f9f834d521736eeaa44ce0c36d88400f3d3667c5432711bea64322e77c166e024d2ea03d47f64a4fd648d0a802bc44da80e1eb2fe WHIRLPOOL e007bc572181745c585bf24c6aa6a87830df17b57384d180e932b229f89b55d38f2b673243e8b5a5243afb303a18c52092bfbe61f0b49473c7c85edb0056a068 DIST wine-1.5.5.tar.bz2 20158084 SHA256 e7d5ba716d2ac47193fa31eff66cc179145ddcb453c6923eaea70596a82b084e SHA512 f9d080cf3e17b73658222b95e15c353d40963aaaa9cbb4b6293ea69709e68715a97e89854c336288ba6a0a41cb0fc9e2713721705935835e4c9f53fa5b7a3e74 WHIRLPOOL 9f44bf75854410c142f94fe12e028ab120521ffd5b9de682c3eeb6690a35c8b4f5be2eecfd6e02e2bc28594f1524e2b6604035744d6b56a9c3d16d5c0cdc6d5d DIST wine-1.5.6.tar.bz2 20380981 SHA256 b178bc34a69341a8f0a7ff73f7dadf2562ed2e5eb03dc0522b7c4d6002e53994 SHA512 5f258811a181232b8f171a4bdb88c6b8e62b039f19ca696b3f24a5f2f3aa2eda8c9989b6629df4f5dc32d6f191c3304caeb595752647583481cd31b51cdc8a64 WHIRLPOOL 032112e4da088824592392b82b2cb0ac4249ad9d066e4bdcd020b5537ef27f3306831377b6a1fbf89c4621386342576756ea4192511b298d9a9891b602c2a501 @@ -62,6 +64,8 @@ DIST wine_gecko-1.8-x86.msi 17774592 SHA256 28f3b7e497e1f884a64b2d982b61dda3167e DIST wine_gecko-1.8-x86_64.msi 18238976 SHA256 53a600a4767225469fd68431263baac0672ceaec29eb2c7747b4363fd2856db2 SHA512 336527adbc6342fe149d706a05e23a51eb25e54e8ce88e67aa98717a1486bc85d36989315b6a2a428ddc10844bbc9130e76625741d997230a541756b429db1e9 WHIRLPOOL 0f40c5d5177335c6736983d37ee677b4ea183260df07d516bca17ff8327d6024693dec3707db934632bf253cf94614127e60c4e7399de764a3a6c5d59e37c54d DIST wine_gecko-1.9-x86.msi 19060224 SHA256 2f1df59287a4f21ec0f1322ae10520c8e6a95de10f8ef7339ab217e4b46ce782 SHA512 6bbcbd79f4eb95bcc9ad1902b3b86059f18127c7fbff0f87f7875de2bcdd543441b9dad12d641926e22ba610df2801d82b3c63ef2b62323b5f4bc4f8bd85b124 WHIRLPOOL 5431d42abdefd48cefb5f6ead9324ba7d2a40a305393120beb544f83571974006f4208180c38ea800cc96157523cca16daec5b7b51ea8b5aead9379a4f6ec53a DIST wine_gecko-1.9-x86_64.msi 19622400 SHA256 0e5f87e5026f1f131fd595f11ae7ed5b5ba9978d917b96821d2ca34d3f91b1ea SHA512 426fe66d0b02ddb7e542db1ef5480867b9bbdd63e927ecba9f237991a2dc4fca119d24bd87dc2c372b90fe899a9f41306e90b3fadea6c69ec1f180f1af02576f WHIRLPOOL 8f7c38089fb89f48db2aa087a55953346a08988e0a0d3c0d215c968127f82f4de10b161fe7015e9114119d5f6f65b7b61bee1ce96720f7d7b7e6d3c1722eae2f +DIST wine_gecko-2.21-x86.msi 20871680 SHA256 f01fafa6d7aab995c38add77315c4cbc2f32f52d5d6a9350056f42b62d631fd8 SHA512 f4ca9ca5b876dc39e906991e58c6da8ef4103782f83ba781ff27556c0ebdab7fe10c14f0551e900442a5d57a2c619da6e5ed6ed42323edcdd55ce9789c4c83ac WHIRLPOOL d1db97175b047652499c97c968b71c08c5b44774423f22ae626f89b4dde3d03b46295e5caae228f1f8614209e943e8246854b478eef3abb186e8de4c341b0a0d +DIST wine_gecko-2.21-x86_64.msi 21646336 SHA256 bc370bdc899f66d98f31c4d410a6952aa82c0c9c0a0ec27f2a11243c9b412c3f SHA512 2a48a7697beba4e45816a9eff09e181de353d8c93e02a70108fa77d27136cd5cd75b21c42caa7702a09f86544669ae2bbfc6975b1fc0d7fcb20150a4bc4ea514 WHIRLPOOL 2fce9b9a190a52c173551d47428dd8b8dc54d5878682733e0006a3f06f216cd9f47a88ada49f92fa5697ece8b2942a88f937bd2722b4cb85d2c35c19bda29b85 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 @@ -105,25 +109,26 @@ EBUILD wine-1.5.27.ebuild 8857 SHA256 b4295c025abf7a6881833cfadba2a460c01473f5d4 EBUILD wine-1.5.28.ebuild 8807 SHA256 0f8300781431d1f414d2b29d846ead339cf88d8f6c9c698dc173ecb580683eee SHA512 511a38dcfbe58b45a59f96c958cbd17e58bbb4a6b4934a1a1e002f585e220935777f7726821b19853fecee1a1fb8eeafe7de0707cb27c9589f1c127b785482a0 WHIRLPOOL 41683521d7aa0aafc9623073eaf9dea7eece8454134c125cd9e09719a1eeea4392071b9d8a632eac260417282090e1e2976af398a9c359c9865e5f529e5f733c EBUILD wine-1.5.29.ebuild 8807 SHA256 972953db6a2d1f0e38dba175b40bd0d6027a8a98a2906f755030f3ea507203f1 SHA512 5601ae09e12efa0af6ebc8d87ab853814240e180523720798b144793c15d01b5ef2fe767238164913c94d3813e7834f05269cdda3db7db796555f2eb9069635d WHIRLPOOL d43a01661f367da1491ec2b3b8f4ef0911c013dbf645bed782bf02a8dbf5d8aa487312058054784d17c8f0e8df752246840480b43ac7005b073602d2026f71cf EBUILD wine-1.5.3.ebuild 6472 SHA256 a30de3a10bffde82ec8dbeb8e672bce3f856eaed01929ba96fb4b349b90b881e SHA512 c15a15bcafdd17781afde71b23ea2702fcbb59955d774c208a2d72f9850698c416a363dd87e8b4e61e54961b7d8eb1ab68bbc7a4b7f85ddc9e53733cb35111c5 WHIRLPOOL 3768fba372eb40db0f777e1e37ef48882b04be70566c93a0ec9b3fde0e8200f38a3fcfe8e434c2231635beab1b33a928b3c27686d7a7c3cde36c1b1b11b503f7 -EBUILD wine-1.5.30.ebuild 9363 SHA256 4fa70ce639f1ed4bc6d829bd0008563824b2a74e8b20b99cc6512b624afb1fca SHA512 1aa26cbb677d2fdd945c245d215602a7d82e6e9924aa4e3d7feb7931cb942611091e0877d3a7d56bb7a2b5377056c542fa8991065c523b639059b16d6c2abc21 WHIRLPOOL 32c0145fade4bd2e6e9d73542470fd1e19c92f7144113fbef8df7ff338576f8f770f6033c82e02ec718c68bf7966cb4e6195c70c24b3509d048b638ac856ad87 +EBUILD wine-1.5.30.ebuild 9457 SHA256 b03f94f44b1f7536444c9f9d1eb2adc5bd9ca8798200f61fdf949dc00580bd57 SHA512 222a7a1a3bc601cc2dfb1ec5d47ab3ca6adfd6c0c41eeba80f3d3f3d616525acc4c2a10e8bf242d5ec3a48b452ca9f212397c79cf4a45c202280781a523582a1 WHIRLPOOL 294bb1dd38aba7e7811ba973a46c244e25fd22e07af0a9bfd16934189787814b271ddc9d644938041c8fa4cb66f34d8e868b6400d4822dea6948130a4193974c +EBUILD wine-1.5.31.ebuild 9369 SHA256 0c27916d62b0dd841dfc2269238f2da9fe906b33907a2f5497f764a1cfa5a7f0 SHA512 d878e2f4c4f7c6a7d85e2659df557a74889f6c968e4cdf1a241f5a93123553b3b0ac2efec75c4adb9ee1c391e02558506747ee33e3bba0ac12f2719d82ad560f WHIRLPOOL 9efedd557116ea0d6186e96636d0602f53fd76ee1efa5ff6eac747a7891fcee4f3c024021b767b1f5caa306fe9688968bb88e108f8e2c6a9007abc265769b112 EBUILD wine-1.5.4.ebuild 6472 SHA256 ed7909b53cc4c1834aad421902dd6510084d6ab0d634d444bb78f28f478ec43c SHA512 d840732b25ad02aae9af364a5384db3d6ea69d1bbc71ee48118558f0e127d48c4b90b2ca64ba6d49a2a87a3892547d20c4d85484cf7af5b394be807acf72ab5d WHIRLPOOL def73de0006d9647e8f62e004a29d6a930b5a7e5d4961d33cb10198d694d32652643b0b58301b569499052a1702368d09d46cb4420dfd8ccbd09a213d2c849c0 EBUILD wine-1.5.5.ebuild 6415 SHA256 d247e6e7f72c925c847b37859e5a2b5fb74bcde5c662509d58248a6da8452631 SHA512 27c963d5f5f0f0b64d7b0689273fb9ef5067304468eb4ea865389562cbd3c8c9af4bb892bd6fc6d2c3fb5cf7502dab3410214ff8de274411338e3769949ba30f WHIRLPOOL d3944f8795a06b18db0ecec166f129c43e62390a7f588ec8eca50aa885191905636e55b1a587ce335b6842b8ed079428daf5440f1e18139f677200a1c819d76e EBUILD wine-1.5.6.ebuild 6691 SHA256 95e8af5853819ee4b4fa42ac1f272ba9e3255340dc75c2fa215d110d273d35a2 SHA512 c757e3cdaff40af8442dd84ae24b3df0c38bd2fbd2299d422749ae9d868af13a2bda6e3e179523654fe2709dab3e8208ec1c8e138a85338ed09115639e02b387 WHIRLPOOL 2e8634b5ef1dd0dbc1e992908610241ac6a1d0332985bd94b8e8b0d34774dca5995ca9460df0d2272ebc7ee09858c22a370c88f5240d160c9b1d29e2f1f94c74 EBUILD wine-1.5.7.ebuild 6923 SHA256 08ac49eccdb16bbe11e246e01c449b4a46df3fba01e73c68ccd9aaaf703a767f SHA512 59d1e91d36b116dfcc0fd004efb7146193cca51976f40c5fceca8d99dedfbc560954104d7eb92257f3f75b744d3f9563cc2f5611ce6823ff0131f946388dd202 WHIRLPOOL bc1e10b8f16fd1f45fac6d6f426e658976e85365a91721bf95a90b22926f46e2a0873f296d6e7cf303b58227d08a8ccb1c9b05e5092261d36dddb3f0822f83cc EBUILD wine-1.5.8.ebuild 6923 SHA256 29f247c643c007c3d45f4e1700d622879f2805935b0c04c8331d8931a523be35 SHA512 e8b0e8df2f18bb3d736091d0f26f6509861244d028b2cf5c5fd6f6fc5071cdcdfa526f1f5f3af7c316926fc0ab5bee2ff7174b3714eb1d06c03a3778f3de33ff WHIRLPOOL 7867d477b5239a283d43ef7c401c34869c969d6aac66c450a627d8d19dfe7e874020823b1f41944dfe4819ab92db81cb137b3a914b101809849267a3779e0eb7 EBUILD wine-1.5.9.ebuild 6923 SHA256 374268a106f968d93a5db63dcdb28b06a6682c30166b03835a18c8c5c70aead2 SHA512 ca61b5d254f015ca808dd665d4f6981090c1da004bc4f11cb5d1d6ea6f42b00763452a606346d1bfe9e60c35f9496bf4efc85ffd6a4cd4080cd7d515bb9d983b WHIRLPOOL e6453e640c3dbe82465e9232fc691b6f5c618f53d6d59794fd081a02112c384836e36551642e5b2430d5d2a7c5f715203b3e1f03667cfba458e96244ff9637e9 -EBUILD wine-9999.ebuild 9274 SHA256 de3da1dc7e47566e11d853d9b30022338282ddcc2308dd40be22f65b76ee8732 SHA512 d5faccbb61336dd984bf2fdaf90ac4f379ba07b2ac1352f32553344b94b4d5877b99f1a15f537ecefcfaf6e1896efa9b9e4ed44cd048a9b27b7cbc34b5e7e33d WHIRLPOOL 50b72126a3acc88725be608476c70a1b3a065ed99bc1b3ac2d9675e37cd5037e2c9a537e9ca8c284635adf0f84857f0f3ff5cf943afee5955cf3e834d209a9c3 -MISC ChangeLog 6342 SHA256 a7592cee8f8ff1c58dc730cba98dc1655e66f085e5792d7fa25288c51a977155 SHA512 4dc2c2249bf5542fac4655413f096f60bcf90b0a663a92081b1f43197b38b2abbc3b9e09f8c2bd5a095295a1ce2e6df6bcd238d16001636260ca08c51937c947 WHIRLPOOL 78e2ac3942828200ed6b31a4256411ea1132de44f227c3e7fd3afe6a8effdabc1bedab97acc1c35e63ccb1f81f1ded9b4b8df1b1ac29b30f093bf418fbd50a9a +EBUILD wine-9999.ebuild 9369 SHA256 3c57e811312ca246edf09f1f6fb41aa3b7c9b38680b02e5d8fb60849da4eeddf SHA512 24a41146d19e111086622deaf9152e05f4d4797ef2a1be2c2d8cb3a177ecc053249508bb464faa5d4c92d06637c9a7f581e8215f3b6671f648c68b3f7bfc627c WHIRLPOOL c33c768f74fa6d5b1e5058d33bb67a7c102b715c97b6192ccaa3be56effd3906991f4a4bcbac80c2a851bfa1672772a8718235db7344d760de54eb5bcfc71286 +MISC ChangeLog 6685 SHA256 c477ce2e256b574991c6a4fc2140f550518c8b3663a3527b76e82aab56151397 SHA512 6401d1bcb2caa7e3d8efce24dc17ffd09f357590617fb9340032a0b0e5b4cd45f7a0f4e8b06220cce6ded8c579081c80e1033ee066c6293a90647f4427343c39 WHIRLPOOL e49cae9785d8beadddd64bb45c4c38e788dbf3bf8a54d50feed87758a432c8d2d014334260ec455fb8e0da19156d38129a76a7a1f2e7dfd05941a539eefa31e9 MISC ChangeLog-2012 100362 SHA256 8e70fc54e7945c1f41e3e0b64fef6b9a7fe89acdaf8c79a06a16048fe8d2e26c SHA512 ca875e847ba100e1f19774b31a2b45a81d776275e3d11944be8a7b01dfcdbf4265b1a340d691bc4fe4054fea006059a06ed52bc0516b1f8b44a1772a1c813278 WHIRLPOOL 36ec708601a25cb8fa93b471112538480b6ef82cc4e6703b3d045f883078b49209ceaeef7bafa8417b881c2d11df84df9c83d1985d0d687a11f3db3de5abb014 MISC metadata.xml 1857 SHA256 8a16a223604fe47d86a35f79912e60aa419c467dd050ae21d96ea45d615f92ea SHA512 279a5169d2ab779ad41889f8d6b24e8d2de7bba3a611470d5d9cb6c5f27930d336de07bd2431ae9a0c9065887456c150fb2e3582201280945f8fb1520e0a3a3e WHIRLPOOL 1797da0945b3134c72ed15da155a26b24431f35051bc729edec9466a2db73a49a1919993a562e23c8315c362f10a43b3d26fd9fbec205518fadbf9b6324172d3 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.20 (GNU/Linux) -iQEcBAEBCAAGBQJRlN+UAAoJEJ0WA1zPCt1h/IkIAJlf/hTTm06XVH/Xal/CiCdI -PrAvVdwwGaTFyhP2Ds2yWeB1JUt495yHBvL5sykuDH0sGRxvl6ws5765/gjAjnWH -0USHC9qkyQrELeRp7PZTsLjLPk6CLxujbyER84CMFVafs4/VP5qotDGcLtg+v8zw -z32a9/5NzL7T4nlL5MR+DqlLDmD5bZ7k/ya1KjR/idNnMuFctlqQHOV2qGpx3znE -DxU1JYrDOd8ut4NMgD/To8aGxxcVh3fZ0J9h9iDi9SKmSkV6Mo3vYpcbJPuijWZv -zcoQx/CCt02eczdelzq+4U8N3t8Sfp2Ke2aAb0ZXXIvhm5/eqro7swPie3ELb1M= -=Xt7u +iQEcBAEBCAAGBQJRoY9DAAoJEJ0WA1zPCt1hsCMH/icAjyAuHLkUKitNn9j2mZsv +Xc1HoU8Y+CzgLueav3criSpdT1qABDPCWfyHTC6d4Ft5IpuHKdXH5yQjR7TIuoTz +iOXSKyj+Lc5Kua71eTGWJrOkHwc4Z2GDn+fp3inWrf+cnkKG/9dNWx0vG4W5RajF +efj7Adc2I2wGH+pDVxZDl28mTZEKE+F/FTgRpXAPPHl0XZ7Q0vP3AEVRTYLxM1la +5kZcjWloemoXRJKqtFCHV56zkEP5XBOXzCRnQSWflEFbVD8QiNkiqHV4Zs+//zY7 +sQDlLunX0AnEYY564Ea3/yTXnLjRPGtqTNjyvqdgzVP/1Gs7wg4qdVzI7ZnlzlA= +=CRSf -----END PGP SIGNATURE----- diff --git a/app-emulation/wine/files/wine-1.5.31-gnutls-3.2.0.patch b/app-emulation/wine/files/wine-1.5.31-gnutls-3.2.0.patch new file mode 100644 index 000000000000..5cd3d400813b --- /dev/null +++ b/app-emulation/wine/files/wine-1.5.31-gnutls-3.2.0.patch @@ -0,0 +1,44 @@ +From 9fb3de8e9268e8e81128fc77328495567140e082 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Sat, 25 May 2013 23:57:04 -0400 +Subject: [PATCH] configure, secur32: In gnutls-3.2, gnutls_mac_get_key_size() + moved to crypto.h + +Based on a patch by Ben Kohler <bkohler@gmail.com> + +https://bugs.gentoo.org/show_bug.cgi?id=471077 +http://bugs.winehq.org/show_bug.cgi?id=33649 +--- + configure.ac | 3 ++- + dlls/secur32/schannel_gnutls.c | 1 + + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 1941be1..2c10734 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1344,7 +1344,8 @@ then + ac_save_CPPFLAGS="$CPPFLAGS" + WINE_PACKAGE_FLAGS(GNUTLS,[gnutls]) + AC_CHECK_HEADER(gnutls/gnutls.h, +- [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])], ++ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h> ++#include <gnutls/crypto.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])], + [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS])])], + [GNUTLS_CFLAGS=""]) + CPPFLAGS="$ac_save_CPPFLAGS" +diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c +index 70b8276..cbe64e8 100644 +--- a/dlls/secur32/schannel_gnutls.c ++++ b/dlls/secur32/schannel_gnutls.c +@@ -25,6 +25,7 @@ + #include <stdarg.h> + #ifdef SONAME_LIBGNUTLS + #include <gnutls/gnutls.h> ++#include <gnutls/crypto.h> + #endif + + #include "windef.h" +-- +1.8.2.1 + diff --git a/app-emulation/wine/wine-1.5.30.ebuild b/app-emulation/wine/wine-1.5.30.ebuild index 4b59dc22f74c..615fae7ecfde 100644 --- a/app-emulation/wine/wine-1.5.30.ebuild +++ b/app-emulation/wine/wine-1.5.30.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.30.ebuild,v 1.2 2013/05/16 13:30:56 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.30.ebuild,v 1.3 2013/05/26 04:27:24 tetromino Exp $ EAPI="5" @@ -172,6 +172,7 @@ src_prepare() { "${FILESDIR}"/${PN}-1.5.17-osmesa-check.patch #429386 "${FILESDIR}"/${PN}-1.5.23-winebuild-CCAS.patch #455308 "${FILESDIR}"/${PN}-1.5.30-libwine.patch #http://bugs.winehq.org/show_bug.cgi?id=33560 + "${FILESDIR}"/${PN}-1.5.31-gnutls-3.2.0.patch #http://bugs.winehq.org/show_bug.cgi?id=33649 ) [[ ${PV} == "9999" ]] || PATCHES+=( "../${PULSE_PATCHES}"/*.patch #421365 diff --git a/app-emulation/wine/wine-1.5.31.ebuild b/app-emulation/wine/wine-1.5.31.ebuild new file mode 100644 index 000000000000..ed1ab6424f71 --- /dev/null +++ b/app-emulation/wine/wine-1.5.31.ebuild @@ -0,0 +1,318 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.31.ebuild,v 1.1 2013/05/26 04:27:24 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 hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW" +PLOCALE_BACKUP="en" + +inherit autotools-multilib eutils flag-o-matic gnome2-utils l10n multilib pax-utils toolchain-funcs virtualx + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://source.winehq.org/git/wine.git" + inherit git-2 + SRC_URI="" + #KEYWORDS="" +else + MY_P="${PN}-${PV/_/-}" + SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2" + KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" + S=${WORKDIR}/${MY_P} +fi + +GV="2.21" +MV="0.0.8" +PULSE_PATCHES="winepulse-patches-1.5.30" +WINE_GENTOO="wine-gentoo-2012.11.24" +DESCRIPTION="Free implementation of Windows(tm) on Unix" +HOMEPAGE="http://www.winehq.org/" +SRC_URI="${SRC_URI} + gecko? ( + abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi ) + abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi ) + ) + mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi ) + http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2 + http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="+abi_x86_32 +abi_x86_64 alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gphoto2 gsm gstreamer jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png +prelink samba scanner selinux ssl test +threads +truetype udisks v4l +X xcomposite xinerama xml" +[[ ${PV} == "9999" ]] || IUSE="${IUSE} pulseaudio" +REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) + test? ( abi_x86_32 ) + elibc_glibc? ( threads ) + mono? ( abi_x86_32 ) + osmesa? ( opengl )" #286560 + +# FIXME: the test suite is unsuitable for us; many tests require net access +# or fail due to Xvfb's opengl limitations. +RESTRICT="test" + +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 + ) + 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:0= ) + mp3? ( >=media-sound/mpg123-1.5.0 ) + nls? ( sys-devel/gettext ) + odbc? ( dev-db/unixODBC:= ) + osmesa? ( media-libs/mesa[osmesa] ) + 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? ( net-libs/gnutls:= ) + png? ( media-libs/libpng:0= ) + v4l? ( media-libs/libv4l ) + xcomposite? ( x11-libs/libXcomposite ) + amd64? ( + abi_x86_32? ( + gstreamer? ( + app-emulation/emul-linux-x86-gstplugins + app-emulation/emul-linux-x86-medialibs[development] + ) + truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] ) + X? ( + >=app-emulation/emul-linux-x86-xlibs-2.1[development] + >=app-emulation/emul-linux-x86-soundlibs-2.1[development] + ) + mp3? ( app-emulation/emul-linux-x86-soundlibs[development] ) + odbc? ( app-emulation/emul-linux-x86-db[development] ) + openal? ( app-emulation/emul-linux-x86-sdl[development] ) + opengl? ( app-emulation/emul-linux-x86-opengl[development] ) + osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028[development] ) + scanner? ( app-emulation/emul-linux-x86-medialibs[development] ) + v4l? ( app-emulation/emul-linux-x86-medialibs[development] ) + >=app-emulation/emul-linux-x86-baselibs-20130224[development] + >=sys-kernel/linux-headers-2.6 + ) + )" +[[ ${PV} == "9999" ]] || RDEPEND="${RDEPEND} + pulseaudio? ( + media-sound/pulseaudio + sys-auth/rtkit + )" +DEPEND="${RDEPEND} + X? ( + x11-proto/inputproto + x11-proto/xextproto + x11-proto/xf86vidmodeproto + ) + xinerama? ( x11-proto/xineramaproto ) + prelink? ( sys-devel/prelink ) + 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" + +src_unpack() { + if use abi_x86_64; then + [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \ + && die "you need gcc-4.4+ to build 64bit wine" + fi + + if use abi_x86_32 && use opencl; then + [[ x$(eselect opencl show) = "xintel" ]] && + die "Cannot build wine[opencl,abi_x86_32]: 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" + unpack "${WINE_GENTOO}.tar.bz2" + + l10n_find_plocales_changes "${S}/po" "" ".po" +} + +src_prepare() { + local md5="$(md5sum server/protocol.def)" + local PATCHES=( + "${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726 + "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615 + "${FILESDIR}"/${PN}-1.5.17-osmesa-check.patch #429386 + "${FILESDIR}"/${PN}-1.5.23-winebuild-CCAS.patch #455308 + "${FILESDIR}"/${PN}-1.5.31-gnutls-3.2.0.patch #http://bugs.winehq.org/show_bug.cgi?id=33649 + ) + [[ ${PV} == "9999" ]] || PATCHES+=( + "../${PULSE_PATCHES}"/*.patch #421365 + ) + + autotools-utils_src_prepare + + if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then + einfo "server/protocol.def was patched; running tools/make_requests" + tools/make_requests || die #432348 + fi + sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die + sed -i '/^MimeType/d' tools/wine.desktop || die #117785 + + l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS +} + +do_configure() { + local myeconfargs=( + "${myeconfargs[@]}" + CCAS="$(tc-getAS)" + ) + + if use amd64; then + if [[ ${ABI} == amd64 ]]; then + myeconfargs+=( --enable-win64 ) + else + myeconfargs+=( --disable-win64 ) + fi + + # Note: using --with-wine64 results in problems with multilib.eclass + # CC/LD hackery. We're using separate tools instead. + fi + + autotools-utils_src_configure +} + +src_configure() { + export LDCONFIG=/bin/true + use custom-cflags || strip-flags + + local myeconfargs=( # common + --sysconfdir=/etc/wine + $(use_with alsa) + $(use_with capi) + $(use_with lcms cms) + $(use_with cups) + $(use_with ncurses curses) + $(use_with udisks dbus) + $(use_with fontconfig) + $(use_with ssl gnutls) + $(use_with gphoto2 gphoto) + $(use_with gsm) + $(use_with gstreamer) + --without-hal + $(use_with jpeg) + $(use_with ldap) + $(use_with mp3 mpg123) + $(use_with nls gettext) + $(use_with openal) + $(use_with opencl) + $(use_with opengl) + $(use_with osmesa) + $(use_with oss) + $(use_with png) + $(use_with threads pthread) + $(use_with scanner sane) + $(use_enable test tests) + $(use_with truetype freetype) + $(use_with v4l) + $(use_with X x) + $(use_with xcomposite) + $(use_with xinerama) + $(use_with xml) + $(use_with xml xslt) + ) + + [[ ${PV} == "9999" ]] || myeconfargs+=( $(use_with pulseaudio pulse) ) + + multilib_parallel_foreach_abi do_configure +} + +src_compile() { + autotools-multilib_src_compile depend + autotools-multilib_src_compile all +} + +src_test() { + if [[ $(id -u) == 0 ]]; then + ewarn "Skipping tests since they cannot be run under the root user." + ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf" + return + fi + + # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader" + multilib_toolchain_setup x86 + local BUILD_DIR="${S}-${ABI}" + cd "${BUILD_DIR}" || die + WINEPREFIX="${T}/.wine-${ABI}" Xemake test +} + +src_install() { + local DOCS=( ANNOUNCE AUTHORS README ) + autotools-multilib_src_install + + emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}" + if use gecko ; then + insinto /usr/share/wine/gecko + use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi + use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi + fi + if use mono ; then + insinto /usr/share/wine/mono + doins "${DISTDIR}"/wine-mono-${MV}.msi + fi + if ! use perl ; then + rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die + fi + + use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055 + use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader} + + if use abi_x86_64 && ! use abi_x86_32; then + dosym /usr/bin/wine{64,} # 404331 + dosym /usr/bin/wine{64,}-preloader + fi + + # respect LINGUAS when installing man pages, #469418 + for l in de fr pl; do + use linguas_${l} || rm -r "${D}"usr/share/man/${l}* + done +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild index 9ce89498e9ce..a99baec397ee 100644 --- a/app-emulation/wine/wine-9999.ebuild +++ b/app-emulation/wine/wine-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.141 2013/05/16 13:30:56 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.142 2013/05/26 04:27:24 tetromino Exp $ EAPI="5" @@ -22,7 +22,7 @@ else S=${WORKDIR}/${MY_P} fi -GV="1.9" +GV="2.21" MV="0.0.8" PULSE_PATCHES="winepulse-patches-1.5.30" WINE_GENTOO="wine-gentoo-2012.11.24" @@ -171,6 +171,7 @@ src_prepare() { "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615 "${FILESDIR}"/${PN}-1.5.17-osmesa-check.patch #429386 "${FILESDIR}"/${PN}-1.5.23-winebuild-CCAS.patch #455308 + "${FILESDIR}"/${PN}-1.5.31-gnutls-3.2.0.patch #http://bugs.winehq.org/show_bug.cgi?id=33649 ) [[ ${PV} == "9999" ]] || PATCHES+=( "../${PULSE_PATCHES}"/*.patch #421365 |