Bump, see http://www.winehq.org/announce/1.5.22 for the announcement. Silence QA messages about Wine category in .desktop files.

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

8 files changed, 357 insertions, 24 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index a1de72bb1e4a..e6dbf8477e81 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,14 @@
 # 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.447 2013/01/06 03:09:25 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.448 2013/01/20 02:27:14 tetromino Exp $
+
+*wine-1.5.22 (20 Jan 2013)
+
+  20 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org> wine-1.5.18.ebuild,
+  wine-1.5.19.ebuild, wine-1.5.20.ebuild, wine-1.5.21.ebuild,
+  +wine-1.5.22.ebuild, wine-9999.ebuild:
+  Bump, see http://www.winehq.org/announce/1.5.22 for the announcement. Silence
+  QA messages about Wine category in .desktop files.
 
 *wine-1.5.21 (06 Jan 2013)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 8ebaedd420d0..069f5239eb44 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -25,6 +25,7 @@ DIST wine-1.5.19.tar.bz2 21013509 SHA256 51ad795ae62d8392ac6fbc3ad595ac57d44bcc7
 DIST wine-1.5.2.tar.bz2 20104652 SHA256 8ee6fdaf716b5a1c7ccf9be9dc6d9b7546944e79351c4806b2fa596da418342f SHA512 da949f1943a1af1f4f9d75d41d35b5a968b4bb792f25c5d3202de5be944a04deac7116261d70b5b90f233e9fb526ae8d073e2cdd03304ac0f736926108fec7d7 WHIRLPOOL 947bff2ccda47e548e6eec4a1b7cc738b943fbbdf000e5686aa440c9d45962b5dee47e7060e93895cc398c2c82d7dce06c370091859bd46a6d09864c191d357c
 DIST wine-1.5.20.tar.bz2 21012282 SHA256 75e3073a62a933af5beaa8e8591298325edb57f255ca5b0de55a0f29a4ba2430 SHA512 25de10f4e3f94d79391e61bdadf00af0e6f191b064f61948911d0de4b1c71ab3a727510b7ec4a52882aed0c59e75bb0cd3fb46a0a4da3dc3707045a3af517754 WHIRLPOOL f85ed944dce117761b6509f090161e9d071027571c87675c03f0f78fb29679bf4d4fb382038c5512588e346f8a242ae4a66fa32992a3bacd48af63417158efe2
 DIST wine-1.5.21.tar.bz2 21088257 SHA256 ac77c1dd1a31ccc67f0391b4965959096aeb98745f52c4d91b7bd280e3c8b350 SHA512 3d9847da09f5227d0118f0fc1468134e69ee66dfec3cfee5e069050a4e2b848647d2247264d7f2e9e35f434676be97f4104be170fd02915bb3061b4057c11bb9 WHIRLPOOL 67b5b0693cea4998e48d1e4163b1cd8506401252c268854d559c7a323af082cc635ec10752440e0945b7988b85537af92f204ef645e9e4916e01fc476d19eb85
+DIST wine-1.5.22.tar.bz2 21238224 SHA256 db08a40a5e6fce050b5cca7782d396ed3a9b1dfb23b9915dad93efb886fc6739 SHA512 19e337729542991d0b984c69657c4a3437cd17abe78e9ff21ccd7c1d96097598d790e9ea5d95def355ca4af58cfcbc1e61e15c9845a01e664303182878e456a0 WHIRLPOOL 77a5289705f7579b1d0bf6824031bdd7fa8a86913e438bfbf6bf938f9e7e1807b100b6caa46be9fe37cd0eae4547a5404f9f1dbb6f49e6e4c50b92b6e1445c09
 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
 DIST wine-1.5.5.tar.bz2 20158084 SHA256 e7d5ba716d2ac47193fa31eff66cc179145ddcb453c6923eaea70596a82b084e SHA512 f9d080cf3e17b73658222b95e15c353d40963aaaa9cbb4b6293ea69709e68715a97e89854c336288ba6a0a41cb0fc9e2713721705935835e4c9f53fa5b7a3e74 WHIRLPOOL 9f44bf75854410c142f94fe12e028ab120521ffd5b9de682c3eeb6690a35c8b4f5be2eecfd6e02e2bc28594f1524e2b6604035744d6b56a9c3d16d5c0cdc6d5d
@@ -48,6 +49,8 @@ DIST wine_gecko-1.7-x86.msi 16995328 SHA256 2ed524e79cc88137b28430389af19cb03298
 DIST wine_gecko-1.7-x86_64.msi 17438720 SHA256 19d0364a43621738fa3fd1713ef9590ad0cc61ea4c8858ad3f8703a81b13c927 SHA512 04928aab0ba3ab90074085f9198e46372701249863b6710ed4ffc0c92e0ffc30348a41be528c7c1dec9007441cc1f3d3aa1193e469ac75f5ae635df52dac4dd7 WHIRLPOOL 389ae0eb32b2ea994cac9fdb0fd785bb457489063657040f54a5dd74c74483396772b18bbb0e7b4d86c1036d52a21d0d68610a458842e79e2c2567301d3e1659
 DIST wine_gecko-1.8-x86.msi 17774592 SHA256 28f3b7e497e1f884a64b2d982b61dda3167efac4c843de198654a1c9144ff9dc SHA512 81cfa990dde3f19e263ecf2957892201a88fd3c683d448d915348f7d8469e03d21c1c724b982f7a65b931857498822d8f6f6cc724205948b462013c0df6064dd WHIRLPOOL 98824a561892a3e0111d7a3becb9a8f4ac7e9dc02c4b612c7c074b2e77ea2f56d85c0666c9cb22f95f6a79b2f43c74f27b533837ffb0ae19e514f5709c2a24ea
 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 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
@@ -59,6 +62,7 @@ DIST winepulse-patches-1.5.18.tar.bz2 45298 SHA256 803a3ef5c9223dbb3ded3a2030945
 DIST winepulse-patches-1.5.19.tar.bz2 47081 SHA256 7fc8e5964bcd4cdd8f14b6a5d6d66d474b958084fd80fb0f0531b08eb7fdfc2a SHA512 54b593ce75ce1ecc8015c85e7de713ddea1331a2701a1ec81fab88dce90f41470469f05b4f2d924da824fc99b1b9c52ed6795158291d7e8f15b5b3c4341cb13f WHIRLPOOL 56b1506b0ffc60a052c923334d21e111707443caf138ba05c6708e4d652a5c7ee2d22d8a82862b1a87a12b49dc1c9bdd8d89000f529ddd8f06685ebbc03dd7f4
 DIST winepulse-patches-1.5.20_pre20121207.tar.bz2 47206 SHA256 7ce845841d1c53f5d2bee3e09e901598321362f8cabc32ff7012c24e366a47e6 SHA512 e0b575231b19c2231ec9648d9e128a2439c672221d579fa40adbe49218db0e98b548f562151cdcbe75a6f018ff9a1c57dbd048de2374ad0cb5748fc3da8060b7 WHIRLPOOL b5511237bac951b39c1fc707348593adc8e5c5b0bf0543e4714cab3e153b2a653fa7ce809097d8dd376cad6c20b1d5b5a9c06d655e0a28c5e035ae5eec761803
 DIST winepulse-patches-1.5.21.tar.bz2 46068 SHA256 038b672bed96cae5c89a854d2e2980bf37c887f50ace519ea62b1da6b3b351e2 SHA512 00ee2c2cf67b17c33a2e4a9cc1406e20d05fde33ce9f98fde37176b55a123b21f0e136b3cc9066a9b4d6062893db3cd60b4eb9574831aaaae4da757ece5ca003 WHIRLPOOL 21c0266ae03f4bfdf87ebdd8c5bedc98e6c1c6fda4fd0ce47a073a000e7aaf66a50a82bc77bd31649afd2837d35b6b6867a6d38c28df573ce5e1dbab6cb25dc8
+DIST winepulse-patches-1.5.22.tar.bz2 46325 SHA256 4850ffb54ee4062c14457a6282b432604272858decaa438d95334c164ca05948 SHA512 0f05afafae79288cc73f926280d20b3acfb8aa617ba9bbfc57529eeb7d0a2a3dc7e20b92bef9d2eb04b32c9a7f0c256a61a88faff5c1df41950aaa946bc748a0 WHIRLPOOL eed9896a75b2765dae03215c34807ed42a9d26828f25d9687983ebbabc1fbf3d757ea8ce4cc805343d1fca0463d8f49b9524175efb2af5cc5d6efc19e0b8e6d4
 EBUILD wine-1.2.3.ebuild 6064 SHA256 612864e3f7f26b0a3e7d68dca69965cc3dababe874e52dc4701da22f0cff7abd SHA512 0058238c12420c4f3c8551483d446f7a6b8cf86758aa7d6d78f50ea2acf627f34547fdfcdc0abda8642a499f3b4387ca806ef1a86c8b82a9ce872e6a32d0e01b WHIRLPOOL 72d763bdbb31f7f834e1103387d4ae9581cbc9421dacc1c192abfa4c9fc3ca679ccb717e69779e89c2a55d6e7bb794c9f25456ea8bf811837391e8fb78c6f81d
 EBUILD wine-1.3.28.ebuild 5770 SHA256 7e71ab0bdb37164c8ec707b85110eed2546166feb9467343675cff85f31a790a SHA512 a850ce3cd7c7d0a0a268f3ac6a155f601be35566095cd478dfeee469f47e8aec42a9cbb8ca0502ad52cd91c1ee06f5023d699b5e2311fc7e75bd23f3ef8a4e24 WHIRLPOOL 1b9269a13b6292c80cdc29b57dac6a026a5c93084f9aa148b9567d900704088991bbed13c9b6fd264b09de7c47e6b51ef02dd875d4f19ba8a4f8ad9a4252f62f
 EBUILD wine-1.4.1.ebuild 6383 SHA256 3542c74868d321840702877de8452bfd5d36612f45ae71fd8791365bec499403 SHA512 926d0b5f3d34ef0417d5a94467a5358477e25126458d5a264a4742b2aa2bc4ed7e4b610c813192b5c31204999d79995ff4e18933a9bea326cd0ed752eddee018 WHIRLPOOL 7f4d44cedd61347d5d43f711cec77ecc9a19dab1fd6c49b8f9d933177d695649a4491e0fc014f65064ae752dcde620cc9a8efd6342f3facec8d20c6f5828b86e
@@ -73,11 +77,12 @@ EBUILD wine-1.5.14-r1.ebuild 7066 SHA256 989602ce30538769b9028fe0d9aa790268693f5
 EBUILD wine-1.5.15-r2.ebuild 7155 SHA256 a27e80018266cb1ca2879237f2199a4d68c236f828acf4b34812751921e57b34 SHA512 3e3b33f07ac30e6ae6b3e73a0d79c09e3d6f609a8403e77fe1c52314294781e855d44219c0e754db5c5f5ea54b5b7a549788d694ed1f551787177788bcf26af0 WHIRLPOOL 52bc5810e8d25b12a5b438f93cdbb810f7539cfd9dfdf9a542c950f868ffd797c860db1f0817c89f41f5127b3bcabc0e3b6dd76e1dc0802490ab70d728a1f257
 EBUILD wine-1.5.16-r1.ebuild 7155 SHA256 5a3e705013f82fdb20987c05811d1a4847d4aabac83433b75e8d758a55b181b8 SHA512 cb9beef83c611d87978fc6c011beed84ea9aa7f246e3f7bd6fcc8ffdde76cbcd8f14fdcc29a12e2e61305d162db2f16cd689a42f8f2d1c3bbc8fb43b1c762b96 WHIRLPOOL 72ab0cb39f904cf71ee748b88d12f0b28bfcea984be96ae774fba691bcdfbbe4541bffb6bfec5d0f1474823c6184fc4468964621e25ae99cdb48f286b9e130ed
 EBUILD wine-1.5.17.ebuild 7152 SHA256 3be448145d08d3745610d245ea8cd6918f659b0f7a0e076b2e7c019fc3aaef4d SHA512 f67cc952ac2c75cddef3189ded2a36fc4c1204b6854cab3208d24b588c06d309ff5bad061c5c60a56f13873dacae0aae1651548295b13fd8da21509962ffeab5 WHIRLPOOL 83297fe2c14c9696ac395cd833c9c83bbad162d01d716b0d34f9004caadd8217c2659c0fc3d0798733bd627bfd9b6ba34cb07d75437692a965f2e2b47305af63
-EBUILD wine-1.5.18.ebuild 7513 SHA256 932b9828767dbb09ee2408ec8270a50c378a1058bd42165e46db134153b5e6cc SHA512 ffb56e107091a7925d54dd5bc0c69918c0bfe259acdf574b3649acfe919d78742411996caff5f2e83ebceb8b1510f388d6333535605eaf26af65a265eaaa64c4 WHIRLPOOL 722231e0f1dc5eb28f82a60ee36e391d3591192e25ce9cfa7af300b62888b38ef172416a059b6a271b82351d0d7f12a649f00f6b67e147eaf7e57f9e8719f65d
-EBUILD wine-1.5.19.ebuild 7513 SHA256 f8f4cc49f87542723fe88dd7bf8367b470db764d8bf03f5fe3282737def8f0e4 SHA512 08951145a63b928ee509d2f540161bf3d1fe76aa98d876a71328c619f106b7ec4de4a26785881cc00f5985baf62ac6b2e0405701d2839ac76f3ad9af13f137cb WHIRLPOOL 9b7d0ba2a55cfa54bcb2cfa6fb8fac3d95cfc0b3a79cc3e2580fb049330dce88015987b687d7e03fe166df041989817128d2d317e0ac6e0f89f0ad9b896136ad
+EBUILD wine-1.5.18.ebuild 7825 SHA256 cbcc1418e8434160acc430aedb5cc4ca272be1903fa488e4d19d7108668efcaf SHA512 3891d098b24548b3255dcc909965d53e9ec70ef3081264db9ad04cc9da8b11fd4fdd952b0c463fe0fad2f3cf9ae6baf3ca97830cf1d0b897611441bbdfecb211 WHIRLPOOL 95e5d833e3fa45c6b42033709352d04eb594892256653fdb92ed840cd8a06d49d28c91bc34716e6e7c375a33585adf608de04f520020c8844f2d0307cef56976
+EBUILD wine-1.5.19.ebuild 7825 SHA256 1ee02ceba734524b73e1440c6db8262812c977dcccecf83872a75f8401524e3b SHA512 4087b3cb9b1688f31b9bfe80db9994377ff399d09fe89987054989723b63e000bc65dca17a2c892813e2055c3811fb51b88830bb5bfcab1d2db47d752588f0e8 WHIRLPOOL 546f3ff0bf0504e4eac6894b6dc5a467e2ec79b8c8dd7c9a5b4a9c4a09e9d9da4240a7bffeeb548506b5164597aeb82402f3198d0302b69d7aafac63199c1f50
 EBUILD wine-1.5.2.ebuild 6385 SHA256 bb1f7d43a9ca8e8da360046a8da4a1fede2c7c928a8e198a68f1624a71e4aecb SHA512 9551bef78f25feaf605a6d7c0547476e6bbc715a877cb1456736762249a0e137f1095c73e50579a4dc1ff08f0334cd2812f1a4974bc20052efeb6e7e661c92e0 WHIRLPOOL af65ae92f39da7804ec27e86cec315f38e3fabcfa95f0d1475ba36d971d682582c35926988e908c41499e9680ea00f132254263598f739a953d274236a153f10
-EBUILD wine-1.5.20.ebuild 7710 SHA256 fa6f728b6372e7d48d0d0fbcee9befa306dd40d1f77b3a14ce299cab23aaa273 SHA512 e350278e04f2252494491639d9ae1f3ae07780d670f33411e8b5c6cd10044ff18a500f79d60f31b12241ab4c5805f362bf011415065a7ec71ea0dc05ecedbc1c WHIRLPOOL d434419b57592d7923fefb62a432e7a3f8195a0bd24e24123f80039e6589632f574dd22ff0f18ba47368c51cd760c64a7f4fdef668f3bd061e966f461ea25491
-EBUILD wine-1.5.21.ebuild 7698 SHA256 378c6af2d5bd53dbe2889d4344f3a9d00ecaadf58349375ac9cf95bb52fb59f4 SHA512 83d906f25a1ecf3e8fffee46ab8a3c21d983d9ab4f9e743077db5df0263b9a7557ad226c00a1199e6c34e8bf1e7e5fd88e055bae28c65da75f54b29306d8c8ad WHIRLPOOL e2e22514929999ac00a04407bcfd75eca80849980bbcc4f7d70a1155852b323d00dabe0574b7052fc95358f8a5d504120ca31a973075882f479544c33333ba42
+EBUILD wine-1.5.20.ebuild 8019 SHA256 a606a3b18bf3709ca5d80c78a46680f7257e3f7644e4eb211f4e3e4467051cfb SHA512 a203d965867c9bd4ff8d6867af4959c7242da29dd3eff3f5cb6391221de8892b57c6f4794864ff6c724c5481f3438b241f50470ec727f81fd7002bdd070935a1 WHIRLPOOL 52b731780c3c599177547cf5351af275e9fb72a4e6b0fbf6a56032dc2fe54cd4a1251728f31045f45286768615d17a3fb045ab216f93355236dd5516010a37f7
+EBUILD wine-1.5.21.ebuild 8007 SHA256 4fd76dc3dd874af438e909699306e6dbe61213b1081a30e133baf2b7e4287880 SHA512 2f39a52b9a508b5e680448caa4b632a0dc7f3c71e5cfafc78d2975ebec9f6bc96158403bcbb860e57257d43c2a6b9087393462da82f9c827809959b22d03caa2 WHIRLPOOL edf65255b8685fa8160bd9346a16e55528943966209186fe0d2c97dcb709fc93d85cf810c452e599d6ea40bb80c7c08d1fa1f8d69bf3d1074a72db49a62d14af
+EBUILD wine-1.5.22.ebuild 8007 SHA256 ec3515b8425cafeb32cec889d5794af6bd1ab4969e574ae5ec348ad6bbadc174 SHA512 ac539e24a88e38707e26e8499b7c2809434656daa96f6bfb0c5c46881eae3c57f418e00ff450044dfaa232cc1fedf77ea7fe38703be269d420b6f553470be29c WHIRLPOOL 5873a2f646ac493d438739bf4d5cf2f1369780ef9c3d37ec6482098fa358c024668b2cd3b98a144d79b7006d19f1edd98e4f359ee44b9774a0a81e7f3e26088c
 EBUILD wine-1.5.3.ebuild 6385 SHA256 80c5a8c0a390c5e1676b7c0458a9e96631e57e7733fce5e5d9fd3c8694d778b5 SHA512 9154d918c65cdc973ab6ff956f70d8069c026126013313f0d6865d9dee0ff2282db1196493d2f8aeaabd0bb4b220017e80a6f239e3ca3bf9f4d368fab6795c46 WHIRLPOOL 9097656a9940331808440dfcbb48c5f5735b9a8b2173906a6c29b4c10a5fa7a7d579966447b2d76cfa6cc9e27355bab3266aa38839f7b38007b93923d587dbb3
 EBUILD wine-1.5.4.ebuild 6385 SHA256 b858e0aae1f76726a338d2b4754c829416d5f709aaa6565930ba58b0927b2021 SHA512 6757b1c4e738201861af63afd1f7e1920068bcefbbc4b27d2738f93e363cceef38f5806dabf349563261a755264c65cfc2bd4ff00a5cedb8951645759e36812c WHIRLPOOL f8c00af6e3b94553bd989ca4e6d0304c8a57284d6691cd13546f3275c719f65462c7a207b0345a1ac5becddaba68b16a094b4463f8f0c5528ad2928501c47eec
 EBUILD wine-1.5.5.ebuild 6385 SHA256 9c904c72aa65b0d5b88bd156fe0a0a11241dd79bf8efe64d14f662351d022922 SHA512 e9008d1c3880304b5de4209138bc0180d3dbd462548aa7d4e462e66ac0a3b2793b4deb77f39855440e103d9ea9ad8d4493869aa70742f0f856b87a173bec751f WHIRLPOOL 5538cd92f06ddad637de46bbb28fffb3de42d77eead310d7cdedd2e6a11b5cc968f9d6be97855bd79e228c2ac6019cb3b4e8b8a1f2d645f16e47cbd901e08046
@@ -85,18 +90,18 @@ EBUILD wine-1.5.6.ebuild 6605 SHA256 89bb5d1c80780c2015f246195a3d1dc52ac84e194ca
 EBUILD wine-1.5.7.ebuild 6853 SHA256 eb4e0bb4f1932685c7fb91ea08cc4d0f116bc137155bc66c521581e40f1fd207 SHA512 8f80e298b45addec8e1054da647e76c10eeb1ed89545343d45470628650f9f6257086555c681e71fbdeca794630fbf74dab562030448885d5a2794f1232d2d96 WHIRLPOOL ae6637106e12d7c494af047bf889d31e82fec3dfc7573163a7c828c64121b060684ad05a5f9d5dc8bf82823b2d1d0f17465b1dcbb305b8bf556bc59ce4c48d28
 EBUILD wine-1.5.8.ebuild 6853 SHA256 b4bfb67e1245c06c2569c5ff2824cd1e94a18736f3dd5eb8757a9cf46932ee0d SHA512 b073a3149056e958cfc47580341e6849c93674bd48e7f0ab94fe5c2f28978ee554e8613c6de1c131e82c133d97a8bcfce46558754bbd4ee40377bced5d19f132 WHIRLPOOL f83e2e736857ff5f06c83956a3339ad842ab8d22f3094d7911e817235128d5307751d86f9ea49babd1b6299fbe726750ee8f6a497b59cd4971b79780913f3437
 EBUILD wine-1.5.9.ebuild 6853 SHA256 a9d570b694ec03450b0e0b7aaad8f5b6224c5ffddf5c54b1907bdfd3de4631d8 SHA512 eccbb58860ef6cabff4d43b1133eb128bb12add39dcc5a71198bde41be971300db80df3e6a4f7c2d82512ee3e55481042dfd91ac514e5a6ecd7eb47bfe43396b WHIRLPOOL 1c0dca8e7c9b0cf224f0857c858f66d3f9853677b5cf68522e9ed64143e5083d38432f91150a3e826328ec95e11c5ade1dbd5cedee8e2b0933e7828b1f31b1bd
-EBUILD wine-9999.ebuild 7698 SHA256 22584a78abab5c646c38b2ebfa70792340015817a78d08aefdeaff33998cf13c SHA512 21a010c2b8c6fabe4602881ece9d8a809130582cf936ca188d614c6ab134766acf7bedec29fa9aedc2951729191ef14f48aa417f066b8637cbbd7af4e129f8ca WHIRLPOOL f2b596a13dd2684879d02943cd2061bb271672b787c33644412ee8adddcaece650e619bafacde62f594fe4b7f2e3edfcdfebe4d7cf718a1944dee33cb6511da4
-MISC ChangeLog 561 SHA256 f5b23c2dd55d3781bceff01f01e969d0a7540de600944796eccf5ba315b4d393 SHA512 18ed9f45181ee8fda46950382c75d539d819d88e90aa32127178ff06a2fc9efc07aaf97d4e2b5c407a34fcf399164faed4566d53e518313ebf358c9bfa8fa16f WHIRLPOOL c15f1b1c917e294d4709b57fd5e726b93f2bf0ff61ee1837a2777e006a833cbfed3048184e7a2ecc24c9fee240e43086a95f4b697556a528f00c372f2ec6824c
+EBUILD wine-9999.ebuild 8007 SHA256 d007f618a00f3d83c279d7c93a1b1b80dd708c4bd2d4454bebfc755375202ca5 SHA512 3de90d5367c958b7f370feed9435288f85a55c27fd0a047c2fb14619197bd5d2482ed10255426edc6eaa78676ac8dfa1ce2b09af3219c5a652f66a88b0c2c754 WHIRLPOOL 87395867c591b0dc893ddebf74c1117183a4d64538fb1137a6634e685f96fb4fdaf672012e69aefad7c52dbe03386bd3296c26806a93251931635231fe7b8363
+MISC ChangeLog 905 SHA256 15c30a9d3a3e374b1321822c5b6a2c42dd141774792499d219a884907c24ce0c SHA512 b1a648b5e6b71d12429933f1146809727783a634f4feba024ae1933438589cc9f0ad4f81017619eb426403edf72f5be003be7e65942977a6f7d7eab14c5675cd WHIRLPOOL 3a9e34d39ea74b2307632401c47d3a35cc734fad4d311c6cac4b90ffae1519330e3c83a6ee62a5b17989bb187192b5e6effaaaff87fab5aaecc6a8fd7698e048
 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)
 
-iQEcBAEBCAAGBQJQ6OrmAAoJEJ0WA1zPCt1huEwH/0a75Ock/flq7xZzL1JZ8RaD
-z3iUNmtJt09L3vcI5TKU+bBrtmcT9BgtcisD8rv4GxFwmxMDidgvZUW1G2WfCtbd
-RfjBrbbMrW5bPsWbjmgTUFpx8lJyC25ZSWHXvq3rcxqNVe6vMmoJ7b2BkrhGvTJu
-P2BIXz/JGwMPdOD0f+397QNDPKmbbmdLmf92uukiY4r9KGC1FeXKF7eZnmmhRClR
-P/Tmsqcpbfd4/TTrOTe4e29gq0er3hpolYfMbMpK0jXq+r16aq5O9joCRG69la+X
-h0wfjgPO9oSDDObb99+zrkPEV3GqfXfoyc0XmoR4ZZw/UUFozTm5PS18x6HpaxU=
-=V4SI
+iQEcBAEBCAAGBQJQ+1YFAAoJEJ0WA1zPCt1hxOUIAId4w7Y2ppjD8dm1+Y4p0gvW
+fQqAoIFdfHjcLBh3Iy6MoRu9vy+pJxAhFuBxVCGJ3tEdmMMaC6InVBfQvYs7+oiI
+qrDJwKxR+HhXQzGiHBQGQTX+FJ5EOD/v8Vdy+NJVuv7y87Q/yAfTsUw0qDDbrp0A
+uNFaDx1V2Xk0wL/x6JlHt0x+7ygHpc0jdMLIw8zTV0wHYZX3/zSpEALpRs0aMAHc
+oawpuKha8kBPizMc8mxKGWqgX/c3ZF94Ww7iysJblsBWnaXGtVrsxNqbVV5r/SZ4
+neMNlq3xnqp8LwWcmv/r0gwY8rvVqKP+kqfRy75uRxmG32e8JHX60VfSFLhiRiw=
+=ZbvU
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.5.18.ebuild b/app-emulation/wine/wine-1.5.18.ebuild
index 8d9ee365ec29..ad4fa355fcf3 100644
--- a/app-emulation/wine/wine-1.5.18.ebuild
+++ b/app-emulation/wine/wine-1.5.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.18.ebuild,v 1.2 2012/12/26 22:19:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.18.ebuild,v 1.3 2013/01/20 02:27:14 tetromino Exp $
 
 EAPI="4"
 
@@ -120,6 +120,13 @@ DEPEND="${RDEPEND}
 	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 win64 ; then
 		[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
diff --git a/app-emulation/wine/wine-1.5.19.ebuild b/app-emulation/wine/wine-1.5.19.ebuild
index 808af2930255..475412bba953 100644
--- a/app-emulation/wine/wine-1.5.19.ebuild
+++ b/app-emulation/wine/wine-1.5.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.19.ebuild,v 1.2 2012/12/26 22:19:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.19.ebuild,v 1.3 2013/01/20 02:27:14 tetromino Exp $
 
 EAPI="4"
 
@@ -120,6 +120,13 @@ DEPEND="${RDEPEND}
 	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 win64 ; then
 		[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
diff --git a/app-emulation/wine/wine-1.5.20.ebuild b/app-emulation/wine/wine-1.5.20.ebuild
index 5a6dae5c3111..fa0eb0d934cf 100644
--- a/app-emulation/wine/wine-1.5.20.ebuild
+++ b/app-emulation/wine/wine-1.5.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.20.ebuild,v 1.4 2012/12/31 07:38:44 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.20.ebuild,v 1.5 2013/01/20 02:27:14 tetromino Exp $
 
 EAPI="5"
 
@@ -122,6 +122,13 @@ DEPEND="${RDEPEND}
 	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 win64 ; then
 		[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
diff --git a/app-emulation/wine/wine-1.5.21.ebuild b/app-emulation/wine/wine-1.5.21.ebuild
index 7223453ed6ff..d7f05fb676ee 100644
--- a/app-emulation/wine/wine-1.5.21.ebuild
+++ b/app-emulation/wine/wine-1.5.21.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.21.ebuild,v 1.1 2013/01/06 03:09:25 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.21.ebuild,v 1.2 2013/01/20 02:27:14 tetromino Exp $
 
 EAPI="5"
 
@@ -122,6 +122,13 @@ DEPEND="${RDEPEND}
 	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 win64 ; then
 		[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
diff --git a/app-emulation/wine/wine-1.5.22.ebuild b/app-emulation/wine/wine-1.5.22.ebuild
new file mode 100644
index 000000000000..460108e467e1
--- /dev/null
+++ b/app-emulation/wine/wine-1.5.22.ebuild
@@ -0,0 +1,285 @@
+# 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.22.ebuild,v 1.1 2013/01/20 02:27:14 tetromino Exp $
+
+EAPI="5"
+
+inherit autotools eutils flag-o-matic gnome2-utils 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.9"
+MV="0.0.8"
+PULSE_PATCHES="winepulse-patches-1.5.22"
+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? (
+		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
+	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls 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 +win32 +win64 +X xcomposite xinerama xml"
+[[ ${PV} == "9999" ]] || IUSE="${IUSE} pulseaudio"
+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
+	)
+	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: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? ( dev-libs/openssl:= )
+	png? ( media-libs/libpng:= )
+	v4l? ( media-libs/libv4l )
+	!win64? ( ${MLIB_DEPS} )
+	win32? ( ${MLIB_DEPS} )
+	xcomposite? ( x11-libs/libXcomposite )"
+[[ ${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 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"
+	unpack "${WINE_GENTOO}.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
+	[[ ${PV} == "9999" ]] || 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
+
+	local usepulse
+	[[ ${PV} == "9999" ]] || usepulse=$(use_with pulseaudio pulse)
+
+	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) \
+		${usepulse} \
+		$(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
+	emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
+	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
+}
+
+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 a902fb4c6c92..f3e3bb580689 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.128 2013/01/06 03:09:25 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.129 2013/01/20 02:27:14 tetromino Exp $
 
 EAPI="5"
 
@@ -18,9 +18,9 @@ else
 	S=${WORKDIR}/${MY_P}
 fi
 
-GV="1.8"
+GV="1.9"
 MV="0.0.8"
-PULSE_PATCHES="winepulse-patches-1.5.21"
+PULSE_PATCHES="winepulse-patches-1.5.22"
 WINE_GENTOO="wine-gentoo-2012.11.24"
 DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
@@ -122,6 +122,13 @@ DEPEND="${RDEPEND}
 	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 win64 ; then
 		[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \