Enable osmesa for win32 on amd64 since emul-linux-x86-opengl-20121028 now includes libOSMesa.so

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

14 files changed, 563 insertions, 863 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index a9a9dbb5d247..8e3f3062d0d3 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,23 @@
 # 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.435 2012/10/26 20:35:36 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.436 2012/10/29 23:36:46 tetromino Exp $
+
+*wine-1.5.16-r1 (29 Oct 2012)
+*wine-1.5.15-r2 (29 Oct 2012)
+*wine-1.5.14-r1 (29 Oct 2012)
+*wine-1.5.13-r1 (29 Oct 2012)
+*wine-1.5.12-r1 (29 Oct 2012)
+*wine-1.5.11-r1 (29 Oct 2012)
+*wine-1.5.10-r1 (29 Oct 2012)
+
+  29 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org> -wine-1.5.10.ebuild,
+  +wine-1.5.10-r1.ebuild, -wine-1.5.11.ebuild, +wine-1.5.11-r1.ebuild,
+  -wine-1.5.12.ebuild, +wine-1.5.12-r1.ebuild, -wine-1.5.13.ebuild,
+  +wine-1.5.13-r1.ebuild, -wine-1.5.14.ebuild, +wine-1.5.14-r1.ebuild,
+  -wine-1.5.15.ebuild, -wine-1.5.15-r1.ebuild, +wine-1.5.15-r2.ebuild,
+  -wine-1.5.16.ebuild, +wine-1.5.16-r1.ebuild, wine-9999.ebuild, metadata.xml:
+  Enable osmesa for win32 on amd64 since emul-linux-x86-opengl-20121028 now
+  includes libOSMesa.so
 
 *wine-1.5.16 (26 Oct 2012)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 01f7fb417fab..b8f2aa4d013e 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -53,14 +53,13 @@ EBUILD wine-1.4.1.ebuild 6388 SHA256 17d903e09d738ebd872751d2da15a7d0786033ef5d5
 EBUILD wine-1.4.ebuild 6387 SHA256 16b1a8725a3e20b713a74f30d9140bb6288e21a29359eaf7973087d39035501d SHA512 f65ae0cf0c4b4214c0526f697183dfb0f0822516ad8a5f813bfa3a8d34d307bcf754a452fabb55ab9c8ed0f0544396a2b318d22153276b7a637a40c42c1a50a4 WHIRLPOOL 6f3e9d06be7117cd917952eb4f189b888eafea09ed2dbf871bfbdc932f51d54021a85b27edf5ce886197ef363521270ce53625fa3644c3c5796c1788c3964a1a
 EBUILD wine-1.5.0.ebuild 6390 SHA256 b204100db9d8fe47ec8043d6f6479fdd2f9d922190a004afe2172ab1b26bf23d SHA512 d78a8c39fd675b8a1347f2b1def7a81348aeb125ed3c481cc651128bc6141292c8aa5ffa7e9de706fdd178e247d783039dfe822ac9daa143540f6e9d7562dde6 WHIRLPOOL 7a1939ef22ba6d4cfb5daa29adceb00c79ec66cee7565aeb965686958057af799518a2b3dfa70fc29dbaf2052e43dbbf97a28dfff252185edbe20366dd71e29c
 EBUILD wine-1.5.1.ebuild 6390 SHA256 9f89a0d22e16092590647e08dbc7f4b8f5fa173aa427e4ce7ee4dd380cdb6b1b SHA512 b0156b81346fbffab803a589eee5efdfbc6985bf137f186f09450b4e25fd54862e3d7ad8a302c519e2b348ff987de7caa2724b1c9a913f1096f3d14769138032 WHIRLPOOL f62bf4b9f5c1be3b7b6668e1231542b2fa33afe60a9cc667f4a9fea7c8653d5987b7949ad7c7ab2238a9cfbcf8f5d1bf979f5e1ad5a7f375818a4575e6112ea2
-EBUILD wine-1.5.10.ebuild 7198 SHA256 af476309e3b344f027759940098cd0461771ee16608b823d39551e231b311dcf SHA512 cacfdc080b6320d471209d1d955e94988cdbefc76f26df1feddf94042b4d3820caea8839f611b59e13602095465a972d7f8cf5fe65c98dd378caa119fab26ad8 WHIRLPOOL a5a092ccf22c301cfdbe9079b3d576d045c5732ded154f89ae1015aa2cba40a78efb7d9d23c4f63c2c3b9f8d022f5bf747e234388d4ba89dd25319eef5de9c64
-EBUILD wine-1.5.11.ebuild 7198 SHA256 2d7a2da8630cf174c90a46ed7a027d8b726970e70c2be7b3c5cc9a15555cbcbb SHA512 8898d1721f2ca9e037935ccdeca85298dc65aa59014aaa4bc9f937bdcaff1b6d13f74ca5a92a3d7d6dc23b90fb3d52a059abc20655a5d2a4f5058c53c3b275ee WHIRLPOOL 3b8ddbd198d35f339fb7c1a52c80c837e9bb39ecea8b405b97bfb3c6829b258787a4e9bab1ed8b771b53e6b405619d416eabb38b48b8536f6dd4fe736d6fb6d0
-EBUILD wine-1.5.12.ebuild 7198 SHA256 34d5245d3577b0b39096b4762be288a3b62941a2d87c24bf72baf4ec2240d8d2 SHA512 995037ba9d740a99463fc13eadd2363c30b451979f6d79ad6aac0fb2b040eab012ba9b0129a2ce28ed1ed144d72c868659aa23d7d986b733f16a8deda5f97518 WHIRLPOOL 0b3e4c286bfa2f1f919b665648ad15f56f435eb4c14451de90316ed5ffe9587eec8d806b05e17d41edeaed585ec1da07b090ca630aab8e141aa8b11bb55aead8
-EBUILD wine-1.5.13.ebuild 7198 SHA256 aa1d2283de1ef365ceb1e3d3663fca0e67be889751d0b7aab5e82beb5facb4e1 SHA512 18f6c65ca6acec91d0f37b369679beef46c9c08e8a779652b9e1d25bc839bb911cfbf85c8ca38b2308d6c2fdf265bb4fe7585c5eaaf5d16d7c641ef5bb7eec4a WHIRLPOOL 98d4eec6645ce7b6e6b5d6a40500e74b7af559c9dda5efbe57e52aa810a2f0b4486c76c9950b8be0ea6083c49efbb3cc8bfd57606c2dbcce2d661102c944bb05
-EBUILD wine-1.5.14.ebuild 7198 SHA256 28db85276a6bfa57056e2eab9368d130da513d31bcd4235cc9cc459d273c4ede SHA512 343888659e8a68529fb21d62fca45c0234b5a060d3eb818845e95db4b0830d72fa1fa7b3e971b0bf85fb6a4c57ae02674c8eedc2574f8b43dcbacc0434da5c86 WHIRLPOOL c52e78fc83959103e88ec56fd2d1f69c42405775bdb6e052a9fb4d19c2fa292fdff8cbb6ad206dc3206713476c0e899232a991b2f66cdaea5de5f778675d6b00
-EBUILD wine-1.5.15-r1.ebuild 7366 SHA256 d0c3e38006ec58c7087a23b5a175a80a5dc0fe846bfdc223f20dc6d15d9bb913 SHA512 1c54be85f039d303545c52c79b15d33cc17ceee74a7325e3aa77d8d5ce25f3818c67e0cd31f9c3f82da1a9368014807738d6054c39354213e0ff7c032ac6c3f7 WHIRLPOOL 35182e2aa78f886a1c78f22812602170bd9d4535e5f72d6a77f4a24092e11761e79ac1e39e5cbab641bd0848f56041d1e4486d29fd7935eba84d188a8c412576
-EBUILD wine-1.5.15.ebuild 7293 SHA256 7fde6a0309013916fbfb8461d2202f2165c82b181a69ab7253d8bd189f811217 SHA512 146c6513b245d4e4376fe99bc901ec97bbc318e7db439dfd4f0b9b6b7cbe1a6e0b638afbcf00320cccef809ca53a7516610b60748773a90e007856818d069563 WHIRLPOOL ab6cd31ab0b72a0deaea2f8ca493feea350ec9a472ff78c6c4af011ca1ce38cfe5a7f75f84af596f52e8a3ec8edb6ced44716bd57865c36ff8af11f6da954074
-EBUILD wine-1.5.16.ebuild 7363 SHA256 a80bf576d957fa0f9aa835f2723afa7de937971c1ac03e23f0b863b9dcd8e1f1 SHA512 f474be2cb67a6677f4a6f8fced6477ade4def45e450793976296bbfdb4961b9cd9a1cfe67115cfb633ade42f0b41998ec90ce7517d8092620b39638581f7ac24 WHIRLPOOL a41f253af4f6db46feb25b3834f6d42d2bcbbb1d2639b2993851eed4ec67cb65afe6ac37c6d04c8716937d6e3c76c62beddfb59275977a1a05d369f9dd9cdc6e
+EBUILD wine-1.5.10-r1.ebuild 7071 SHA256 3d30ecb4b54c771974025c37c76e0cb7086e5c306f459a1aeb6b9fbb078355f0 SHA512 b75ea7170fe76ba497b577e443f9a67c2c59cf10fae18375d7945d1b301bfd05852f4911b92539fa08ff1e2051479b9d055c2a3f1e1d41b3acdec3c37d5e635c WHIRLPOOL 5be9990977b8594fe277bee1f27462aac5d4f9ce42b478335647e50a0e4e91529b31e4f5f9f95c2593bddf8ea3b5c403c217d9aef8ed42f7a1a5447e37b65b06
+EBUILD wine-1.5.11-r1.ebuild 7071 SHA256 411074a06786f53866e7235a551c15e5377369f63627736661529263f6170473 SHA512 a30eba29d47bde98f0371500220d210563c812d92b849912244ff75fff7980adf736f067108afc06b3b0202b65a0ee4ad89b80154fcae40799aea0947728e560 WHIRLPOOL 29a847aa96310285a16fc3b11b33235af996f6a9a849f2ca1571269debcbd0bf7b7f547ad9b042097ee76d621aadf601c48485a025c60aa25a2828d2e12facd1
+EBUILD wine-1.5.12-r1.ebuild 7071 SHA256 33a7a6effb63eb30ed52897f63febb47469c7814caf21f010acc0addadc576a0 SHA512 607d9529c521277f20186434364b18ac6bef1e6ddb8cf51fbd4c5a126695c6004354e14214609c9965bfe6cdd83b7a697c92e27cfeea5aad7e5b7dc24c9365f6 WHIRLPOOL cc26ddc811ee70b8355a988b88d858eb2e9957465a75734debddbbc594d03db84ef0ce279d19d009fdb0c577a56d82a6cebe739e363a1452c59268d0962780d6
+EBUILD wine-1.5.13-r1.ebuild 7071 SHA256 dbc2064cda0648b815aa9aa6ea095aec3190b1735c4b1ba68066618d3095cb48 SHA512 73ff42a823321842cc0c1af29fa40aceedf0b0d7f32f958b9062d5d20ceefddeebfbb99d0d46895c02e43ad8e637f5d59fc4daa772704d880630ed39ca1b1a91 WHIRLPOOL 9aa1714807d1fd2e42c0aa89479c641a9319cac1613d26541f75e0ba5ec74207b81d28e7cfa1c58ef002cab808df6e060955b70e8a5e05d496aec9758178226c
+EBUILD wine-1.5.14-r1.ebuild 7071 SHA256 74f5aa451ef47f557f79f2910cf946913195f75f9ebf55db60913575e6076f23 SHA512 eb7461b0e23374b28eb92c9232de5bdc28fed3563b9068dd70a0dc777b7928822d448ca7f48d4d513d5d3849673beb15b5f678119e09cf1a0179502d1a55d674 WHIRLPOOL 8b0db1dd206b2362d2b8d17fd9c899d510c543770386a5c6ea2205ac9eb98f5ceb0d79521ba69ca541ade4232f6dc84e2adf6093e79d0ad1d4ddf745b0a42942
+EBUILD wine-1.5.15-r2.ebuild 7160 SHA256 2a3b25509bcfdfd7752c83f9767ad8988db296d61d857f129b8e75fc9be33c20 SHA512 23032c1e002624d4b627085c6c68d632bb9cecca3edc9d78aa96d6b9d31d170a7f59ef846ec976b81d4b6ab84cc7bcf883738bf87e2a16bcf5e17487f3d7efd9 WHIRLPOOL b05f07f76bb159b76fdd9e9be0e672a9f0d9c84bdcfc4ce2b83dfb30b6243a48d9f7a0713ffbee5c427f47733387cab9e7a8d1c2ddc916cbfc3ee88677313ab4
+EBUILD wine-1.5.16-r1.ebuild 7160 SHA256 d144d8456a99b142d6aa4eb85e3d889cb849b14f9469d248a3df49096cf321f3 SHA512 baa8b8d8f134a08d9ed8bdebfeeb165e2ca6206ab7fa0a9281e70dd9701f1e8257dbee960fac6b1c5909923270c847a79ef87f6f9d8cfd57df50b35335c1822a WHIRLPOOL 5cb9e99e14198c64d5acfd38084da7945e368dbf03d932af6652084643ffee84d8d8be6cb5838c1b7e00779077d6fb282111e0e3cd721856a141ec1ba9db5c03
 EBUILD wine-1.5.2.ebuild 6390 SHA256 15c82300f8b1a81ab431e7db66cc707343a172e98e965f5506523787baebdc36 SHA512 5d114c41aebd5586507717ead272e8d657048d41417a3549ef023894b820c0eb47b26c69adf9eabc1921de85bcdcd3f86f9a0d9eb3bd660a7d0cb240754b6d2a WHIRLPOOL 1ede81cebfeabce2d1f4e117d9f66c2aac22a92e4d78b475ea56bbf1beab33660d637d588e69d743bef9587011357b0fa5c2f33f13a7b762f6563aa32eaaea88
 EBUILD wine-1.5.3.ebuild 6390 SHA256 8092714042282e8b8fbc9fa2347d8b577e3d0cb90d1920c1915545c044494b50 SHA512 1a882c8cd13fe3d0deeb2be1368eee8874c5d8475901ab15b079aa534116ab73c9598c1f43a8e17788c1e6ecab6c4e2a02b298da03dcde032f64eeb0b4170bdf WHIRLPOOL 4390f427a1e4cff09c7f9056895899dc9fec5f743a29f4a550415ccf384f58aa2f7ad343d543117481fb64510006b95ef2f70177940b3c5e2169df1e6dd33d6e
 EBUILD wine-1.5.4.ebuild 6390 SHA256 2af684a36d1fe4552a7ee9393c3bd20f3c98a5d2799fdc8c3f86191f1de842f1 SHA512 1b646382979eef997d99b19497f2ce231e5c56e17c1cd3f1e112fa11b7c425eeaffb9bb8aa3a7c978c37e0b3873136f8407b9f7ade31969511eda0ca50a0bb22 WHIRLPOOL 8d359e9b84667d372d87b2aaa898a03714875527ec19a1fc2feec1a02f6a96250411b7fb07f0cf0c2f7376909dd2a03a40df47bb00466fdaa02f18aa82b636f2
@@ -69,17 +68,17 @@ EBUILD wine-1.5.6.ebuild 6610 SHA256 2be441814933f6dbe0a76de573f33d8d68a33699fb9
 EBUILD wine-1.5.7.ebuild 6858 SHA256 9c532dfb312bb2fcc6bc52faea696927a69c87dee8e1da8cdec346709f8e838b SHA512 ac23ff2c19ba256d0b6f55c14323f3431bc7270973915a7c2549ddeb9cda4a723abbf7586505ce4623886a20be1bcbd9ff0d7d7f96c403cdb66fdbe151232103 WHIRLPOOL 3b8d02ec386f6f930ed9976ef7765a1fb3c3a1536cb1c48dc532cc8b8d7706d40b3bd832b8de925b7a499c4d6aa3c748843cc6e3a0beb9b5062a93cc5d99fb11
 EBUILD wine-1.5.8.ebuild 6858 SHA256 221ef4f2dbdb8f0521c6e6ff8048a6179a1e6819862677069fdd29d5984b232d SHA512 0fc4c55d64cf343fc0b2093394d5805e40f7cf1bb5a1192ec531c8477546577a1572eb8af0352c65da7a48765321d21cbca2a8ef21e1debf5a4e4172f915014f WHIRLPOOL 8bfc0c1c1122e067dcee44ce1949b688f0c8ec93427fc4df90f464e8683ed165904db5451e775924a192b88fc3834aa2a06803abe0f30ed1373b582a06d77738
 EBUILD wine-1.5.9.ebuild 6858 SHA256 5c003987ebe1c8c68658f16b25daed46ff238c25c5d6cf1d9a619057bb77d9ee SHA512 098d8dc69a031e02d35180bfa9e418de5eab65ec1fe3290d61b2a0a5971dc2c33376699bf97a4ec70e788dfd6d26df2473761a0a04fc4ac3139f721979f67f83 WHIRLPOOL 984b1e477bf9db3a8e48ba4e5f008da5a2025be23fc8598ce9d96a62eefb5abf63ca81e973ed251fbb664c6d11ea8186da66cce07796d940eb694dda1f4ebefc
-EBUILD wine-9999.ebuild 7363 SHA256 f26e0c471af96b48a26395a7d7714c917aeb4d24b7647f87aa3cb4910e435380 SHA512 05989c284d09fbc493fbd63b56e2914b197617d0b3058aae826bb277c2846d7f7bb04b4d3099f192a97bfaa055658bc794d9f49f0349357e6e855abac5c0e4c9 WHIRLPOOL edccd79d4d97619e9c7540b69a949ad6e94b7113f4e3888b1e72cd073d51ad828e74f5b223b3c10d5d23777e63c5d6e3b5ca8aad66f99b5eff7118f46cd07502
-MISC ChangeLog 97244 SHA256 1a8aad9bcbd1a7737c498312de10eb7ce06013b5f19cbee97c9f615931599214 SHA512 0ec2483001402dc0deba816cb45b6ca2eb6900ebab3e49b2504dcbe4ef89948f5b6560976a1fd63753ba95ed899c439d8e1c0539fd72238052fe9bb47fddd951 WHIRLPOOL 945aa1a2da2f109eb5ef69dddb6cb023c8fc22ec40d1d95148fa342a6f3dd7c6a8da1dbef7b95e7595f96cc2ff27b4425b6e44c1545503332a2556322f5b0de2
-MISC metadata.xml 1908 SHA256 0c2f8ace61499c12daaf6ff5317dbb53f86437d702875c9a9f63e209501fe214 SHA512 d30a4ee3a2a3b53d3622fb613143e74d945ebbe76d4cc04f2140c7b07d214f535f3468ffc7e5f078226b006940753098f5e4bcc9c867d50233c4801ad255b624 WHIRLPOOL 92d8335e734433471612a3d6bb565b35f9a2bcfef9f7c38f43081a387ab01bcce684fad1bfb9af5a208f1ed863ca6270ae4666ba23849793c7bc71f33267e887
+EBUILD wine-9999.ebuild 7157 SHA256 383d45533b7285a3118d77b996ddb83b55ac976edaff4390ebcac2dceb2b82d9 SHA512 920e1cbca42a51021cc0df651ad7af1251aee4e6b388ed6dd552fe3e36a7ce6fcdf4cc686c24da57dfff569d3e17f4578c1d74372e913ebb01f8c3fbfb216560 WHIRLPOOL 4fb390ae025edda8206cfd66e407b679803f143cbdb8b25de143600de40e8ea56fe392f94d9a59924be753b7f07aa18f1f77fdda52665adbfb27fd37c0d37789
+MISC ChangeLog 97996 SHA256 53a7095781cc52e2cd0eca7050693568fba8362f4517cb0d2dfcd02ebb6363b3 SHA512 7ece937961055cb1668e9b802cadacb4288a3191d6b9aee8fd60ed5114811d0ee3bcd8a4aa2765e456d9f257562e04db54ce5ed54c8fd33301c8654e30fa5b8b WHIRLPOOL 6654c2d35d1142d937be7e3990758bf8d0865c8dc040def901cdfcd330871f6d6026393321b37c74fee36ffa24a96ef148fca835aa8a016461f1d8ac75df8c76
+MISC metadata.xml 1708 SHA256 3540876c7e1eeb0411e86068a8888ac4ed2dd276a16b9df121bb9ab0b643db2e SHA512 6b76c93bf232384ff7259b40931abb4c97d96dc5fde76849835f1727295c5929ff9628091f94dc00b1c7114a5760772e6bd3189c0cf0166eaabaed67b8589d2a WHIRLPOOL d98cfe4b446364b17ccb6bb679fcbed06b0611829451dff8f25746a42437dafbfbb20217582fe4033342bad609cce3867b37c7524a13764202066198adef58e6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQivQZAAoJEJ0WA1zPCt1hA5wH/18mXljfqNfcVD7YMwEH9v78
-sLAF3FDTZGLFApVj719EzQ3a2PhkrC6AtUGF6K5EenstoNUt83hegQuBs8enNMFI
-stoEtXmSBmYsqFDPcTRcQgR0TuxxMFT2Os4JeUv74k9nYKMxBmtYcFsImSSVG2k+
-nJp5iiwOLBuFDCKuhRnJ1Xxp0fMn6Z6TiZJuX6lvf6eQe93z6fn+CFJZXz7IJuzn
-QwKVnR22BMVCeDB/mWH7M3qfYcmJ/F/z4bJBLj72PoDDb3mkVd5TuEXudAmivx8K
-wau14tQAEwv3dDxiRv0WaARboRd5ZWkBgwN4cidK9IVwORNiJAKwUhIKSwMUrxo=
-=Zi8n
+iQEcBAEBCAAGBQJQjxMQAAoJEJ0WA1zPCt1h52MH/1N5BMlZQcHzgyAB9U3X1195
+6NWlb3ksl3wO3IOZ8y5lRJ9gJZfPEYmDeJYkUYAyYIafCj9BonnPwVuuV/qywTGa
+A/e1pItjXRxx0N5f3NiSqZAvHdPI4ibBdf0pU+yBbeGmmomSbhJ2B+p+Y3EM7Lpu
+sRWkSJuCS14BP7kXJYfciDZwh9R15Xi+kcPheF8gXKt8M4d+l6H9NUbR+Mk8Jaxk
+f/D7nU+bzf6slNn7VqCNsmtv5eVjEH35I87y2YoCmVvbMfl4MxtxoIGj7MQHNFei
+wC/NPwplLjetS44ytHDLQdFI2qey0EgowEzs5SIcbEWBIjPvVor9Rm6aVUBRjNA=
+=KWGf
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml
index 431a68ec0f23..0cbb443104d1 100644
--- a/app-emulation/wine/metadata.xml
+++ b/app-emulation/wine/metadata.xml
@@ -14,9 +14,6 @@ Think of Wine as a compatibility layer for running Windows programs. Wine does n
 	<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='osmesa-multilib'>Enable libOSMesa support for Win32 on amd64.
-		WARNING: you must install an appropriate version of 32-bit libOSMesa manually
-		or from an overlay; see bug #430268</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-r1.ebuild
index f0ea18ebf082..250ecc602fe8 100644
--- a/app-emulation/wine/wine-1.5.10.ebuild
+++ b/app-emulation/wine/wine-1.5.10-r1.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-1.5.10.ebuild,v 1.6 2012/10/26 16:46:37 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.10-r1.ebuild,v 1.1 2012/10/29 23:36:46 tetromino Exp $
 
 EAPI="4"
 
@@ -49,6 +49,7 @@ MLIB_DEPS="amd64? (
 	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
@@ -152,12 +153,6 @@ 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 \
@@ -181,7 +176,7 @@ do_configure() {
 		$(use_with opencl) \
 		$(use_with opengl) \
 		$(use_with ssl openssl) \
-		${with_osmesa} \
+		$(use_with osmesa) \
 		$(use_with oss) \
 		$(use_with png) \
 		$(use_with threads pthread) \
diff --git a/app-emulation/wine/wine-1.5.11.ebuild b/app-emulation/wine/wine-1.5.11-r1.ebuild
index 0d5735ab798c..8447f189e35e 100644
--- a/app-emulation/wine/wine-1.5.11.ebuild
+++ b/app-emulation/wine/wine-1.5.11-r1.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-1.5.11.ebuild,v 1.5 2012/10/26 16:46:37 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.11-r1.ebuild,v 1.1 2012/10/29 23:36:46 tetromino Exp $
 
 EAPI="4"
 
@@ -49,6 +49,7 @@ MLIB_DEPS="amd64? (
 	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
@@ -152,12 +153,6 @@ 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 \
@@ -181,7 +176,7 @@ do_configure() {
 		$(use_with opencl) \
 		$(use_with opengl) \
 		$(use_with ssl openssl) \
-		${with_osmesa} \
+		$(use_with osmesa) \
 		$(use_with oss) \
 		$(use_with png) \
 		$(use_with threads pthread) \
diff --git a/app-emulation/wine/wine-1.5.12.ebuild b/app-emulation/wine/wine-1.5.12-r1.ebuild
index 09520db90eb2..6ed76fc97b70 100644
--- a/app-emulation/wine/wine-1.5.12.ebuild
+++ b/app-emulation/wine/wine-1.5.12-r1.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-1.5.12.ebuild,v 1.3 2012/10/26 16:46:37 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.12-r1.ebuild,v 1.1 2012/10/29 23:36:46 tetromino Exp $
 
 EAPI="4"
 
@@ -49,6 +49,7 @@ MLIB_DEPS="amd64? (
 	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
@@ -152,12 +153,6 @@ 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 \
@@ -181,7 +176,7 @@ do_configure() {
 		$(use_with opencl) \
 		$(use_with opengl) \
 		$(use_with ssl openssl) \
-		${with_osmesa} \
+		$(use_with osmesa) \
 		$(use_with oss) \
 		$(use_with png) \
 		$(use_with threads pthread) \
diff --git a/app-emulation/wine/wine-1.5.13.ebuild b/app-emulation/wine/wine-1.5.13-r1.ebuild
index 8f60c62d5ba6..050141f997cf 100644
--- a/app-emulation/wine/wine-1.5.13.ebuild
+++ b/app-emulation/wine/wine-1.5.13-r1.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-1.5.13.ebuild,v 1.2 2012/10/26 16:46:37 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.13-r1.ebuild,v 1.1 2012/10/29 23:36:46 tetromino Exp $
 
 EAPI="4"
 
@@ -49,6 +49,7 @@ MLIB_DEPS="amd64? (
 	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
@@ -152,12 +153,6 @@ 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 \
@@ -181,7 +176,7 @@ do_configure() {
 		$(use_with opencl) \
 		$(use_with opengl) \
 		$(use_with ssl openssl) \
-		${with_osmesa} \
+		$(use_with osmesa) \
 		$(use_with oss) \
 		$(use_with png) \
 		$(use_with threads pthread) \
diff --git a/app-emulation/wine/wine-1.5.14-r1.ebuild b/app-emulation/wine/wine-1.5.14-r1.ebuild
new file mode 100644
index 000000000000..e6f4ba91fc6f
--- /dev/null
+++ b/app-emulation/wine/wine-1.5.14-r1.ebuild
@@ -0,0 +1,251 @@
+# 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.14-r1.ebuild,v 1.1 2012/10/29 23:36:46 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 )
+	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/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+	)
+	xinerama? ( x11-libs/libXinerama )
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	opencl? ( virtual/opencl )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	gsm? ( media-sound/gsm )
+	jpeg? ( virtual/jpeg )
+	ldap? ( net-nds/openldap )
+	lcms? ( =media-libs/lcms-1* )
+	mp3? ( >=media-sound/mpg123-1.5.0 )
+	nls? ( sys-devel/gettext )
+	odbc? ( dev-db/unixODBC )
+	osmesa? ( media-libs/mesa[osmesa] )
+	pulseaudio? ( media-sound/pulseaudio )
+	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() {
+	local md5="$(md5sum server/protocol.def)"
+	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+	epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
+	epatch "${FILESDIR}"/${PN}-1.5.11-osmesa-check.patch #429386
+	epatch "${DISTDIR}/${PULSE_PATCH}" #421365
+	epatch_user #282735
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	eautoreconf
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+}
+
+do_configure() {
+	local builddir="${WORKDIR}/wine$1"
+	mkdir -p "${builddir}"
+	pushd "${builddir}" >/dev/null
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--sysconfdir=/etc/wine \
+		$(use_with alsa) \
+		$(use_with capi) \
+		$(use_with lcms cms) \
+		$(use_with cups) \
+		$(use_with ncurses curses) \
+		$(use_with udisks dbus) \
+		$(use_with fontconfig) \
+		$(use_with gnutls) \
+		$(use_with gphoto2 gphoto) \
+		$(use_with gsm) \
+		$(use_with gstreamer) \
+		--without-hal \
+		$(use_with jpeg) \
+		$(use_with ldap) \
+		$(use_with mp3 mpg123) \
+		$(use_with nls gettext) \
+		$(use_with openal) \
+		$(use_with opencl) \
+		$(use_with opengl) \
+		$(use_with ssl openssl) \
+		$(use_with osmesa) \
+		$(use_with oss) \
+		$(use_with png) \
+		$(use_with threads pthread) \
+		$(use_with pulseaudio pulse) \
+		$(use_with scanner sane) \
+		$(use_enable test tests) \
+		$(use_with truetype freetype) \
+		$(use_with v4l) \
+		$(use_with X x) \
+		$(use_with xcomposite) \
+		$(use_with xinerama) \
+		$(use_with xml) \
+		$(use_with xml xslt) \
+		$2
+
+	emake -j1 depend
+
+	popd >/dev/null
+}
+
+src_configure() {
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	if use win64 ; then
+		do_configure 64 --enable-win64
+		use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
+	else
+		ABI=x86 do_configure 32 --disable-win64
+	fi
+}
+
+src_compile() {
+	local b
+	for b in 64 32 ; do
+		local builddir="${WORKDIR}/wine${b}"
+		[[ -d ${builddir} ]] || continue
+		emake -C "${builddir}" all
+	done
+}
+
+src_install() {
+	local b
+	for b in 64 32 ; do
+		local builddir="${WORKDIR}/wine${b}"
+		[[ -d ${builddir} ]] || continue
+		emake -C "${builddir}" install DESTDIR="${D}"
+	done
+	dodoc ANNOUNCE AUTHORS README
+	if use gecko ; then
+		insinto /usr/share/wine/gecko
+		doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
+		use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+	fi
+	if use mono ; then
+		insinto /usr/share/wine/mono
+		doins "${DISTDIR}"/wine-mono-${MV}.msi
+	fi
+	if ! use perl ; then
+		rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
+	fi
+
+	if use win32 || ! use win64; then
+		pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
+	fi
+	use win64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
+
+	if use win64 && ! use win32; then
+		dosym /usr/bin/wine{64,} # 404331
+		dosym /usr/bin/wine{64,}-preloader
+	fi
+}
diff --git a/app-emulation/wine/wine-1.5.14.ebuild b/app-emulation/wine/wine-1.5.14.ebuild
deleted file mode 100644
index 756cda00494a..000000000000
--- a/app-emulation/wine/wine-1.5.14.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# 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.14.ebuild,v 1.2 2012/10/26 16:46:37 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:0.10 media-libs/gst-plugins-base:0.10 )
-	X? (
-		x11-libs/libXcursor
-		x11-libs/libXrandr
-		x11-libs/libXi
-		x11-libs/libXmu
-		x11-libs/libXxf86vm
-	)
-	xinerama? ( x11-libs/libXinerama )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	opencl? ( virtual/opencl )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
-	mp3? ( >=media-sound/mpg123-1.5.0 )
-	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
-	osmesa? ( media-libs/mesa[osmesa] )
-	pulseaudio? ( media-sound/pulseaudio )
-	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() {
-	local md5="$(md5sum server/protocol.def)"
-	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
-	epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
-	epatch "${FILESDIR}"/${PN}-1.5.11-osmesa-check.patch #429386
-	epatch "${DISTDIR}/${PULSE_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
-
-	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-1.5.15-r1.ebuild b/app-emulation/wine/wine-1.5.15-r1.ebuild
deleted file mode 100644
index f20f17092f1c..000000000000
--- a/app-emulation/wine/wine-1.5.15-r1.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# 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.15-r1.ebuild,v 1.2 2012/10/26 16:46:37 tetromino Exp $
-
-EAPI="4"
-
-inherit autotools eutils flag-o-matic multilib pax-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git-2
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MY_P="${PN}-${PV/_/-}"
-	SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-	S=${WORKDIR}/${MY_P}
-fi
-
-GV="1.8"
-MV="0.0.4"
-PULSE_PATCHES="winepulse-patches-1.5.15"
-DESCRIPTION="free implementation of Windows(tm) on Unix"
-HOMEPAGE="http://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	gecko? (
-		mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi
-		win64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
-	)
-	mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
-	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa osmesa-multilib +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:0.10 media-libs/gst-plugins-base:0.10 )
-	X? (
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXrandr
-		x11-libs/libXi
-		x11-libs/libXmu
-		x11-libs/libXxf86vm
-	)
-	xinerama? ( x11-libs/libXinerama )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	opencl? ( virtual/opencl )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
-	mp3? ( >=media-sound/mpg123-1.5.0 )
-	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
-	osmesa? ( media-libs/mesa[osmesa] )
-	pulseaudio? (
-		media-sound/pulseaudio
-		sys-auth/rtkit
-	)
-	samba? ( >=net-fs/samba-3.0.25 )
-	selinux? ( sec-policy/selinux-wine )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends )
-	ssl? ( dev-libs/openssl )
-	png? ( media-libs/libpng )
-	v4l? ( media-libs/libv4l )
-	!win64? ( ${MLIB_DEPS} )
-	win32? ( ${MLIB_DEPS} )
-	xcomposite? ( x11-libs/libXcomposite )"
-DEPEND="${RDEPEND}
-	X? (
-		x11-proto/inputproto
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-	)
-	xinerama? ( x11-proto/xineramaproto )
-	!hardened? ( sys-devel/prelink )
-	virtual/pkgconfig
-	virtual/yacc
-	sys-devel/flex"
-
-src_unpack() {
-	if use win64 ; then
-		[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
-			&& die "you need gcc-4.4+ to build 64bit wine"
-	fi
-
-	if use win32 && use opencl; then
-		[[ x$(eselect opencl show) = "xintel" ]] &&
-			die "Cannot build wine[opencl,win32]: intel-ocl-sdk is 64-bit only" # 403947
-	fi
-
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${MY_P}.tar.bz2
-	fi
-
-	unpack "${PULSE_PATCHES}.tar.bz2"
-}
-
-src_prepare() {
-	local md5="$(md5sum server/protocol.def)"
-	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
-	epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
-	epatch "${FILESDIR}"/${PN}-1.5.11-osmesa-check.patch #429386
-	epatch "../${PULSE_PATCHES}"/*.patch #421365
-	epatch_user #282735
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	eautoreconf
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
-}
-
-do_configure() {
-	local builddir="${WORKDIR}/wine$1"
-	mkdir -p "${builddir}"
-	pushd "${builddir}" >/dev/null
-
-	with_osmesa=$(use_with osmesa)
-	if use amd64 && [[ $1 = 32 ]]; then #430268
-		if use osmesa-multilib; then
-			with_osmesa=--with-osmesa
-		else
-			elog "win32 osmesa support is disabled for now, see bug #430268"
-			with_osmesa=--without-osmesa
-		fi
-	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-1.5.15-r2.ebuild b/app-emulation/wine/wine-1.5.15-r2.ebuild
new file mode 100644
index 000000000000..b5cead7b433d
--- /dev/null
+++ b/app-emulation/wine/wine-1.5.15-r2.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.15-r2.ebuild,v 1.1 2012/10/29 23:36:46 tetromino Exp $
+
+EAPI="4"
+
+inherit autotools eutils flag-o-matic multilib pax-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
+	inherit git-2
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MY_P="${PN}-${PV/_/-}"
+	SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	S=${WORKDIR}/${MY_P}
+fi
+
+GV="1.8"
+MV="0.0.4"
+PULSE_PATCHES="winepulse-patches-1.5.15"
+DESCRIPTION="free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	gecko? (
+		mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi
+		win64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+	)
+	mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
+	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png pulseaudio samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
+REQUIRED_USE="elibc_glibc? ( threads )
+	mono? ( || ( win32 !win64 ) )
+	osmesa? ( opengl )" #286560
+RESTRICT="test" #72375
+
+MLIB_DEPS="amd64? (
+	truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
+	X? (
+		>=app-emulation/emul-linux-x86-xlibs-2.1
+		>=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?]
+	)
+	mp3? ( app-emulation/emul-linux-x86-soundlibs )
+	odbc? ( app-emulation/emul-linux-x86-db )
+	openal? ( app-emulation/emul-linux-x86-sdl )
+	opengl? ( app-emulation/emul-linux-x86-opengl )
+	osmesa? ( >=app-emulation/emul-linux-x86-opengl-20121028 )
+	scanner? ( app-emulation/emul-linux-x86-medialibs )
+	v4l? ( app-emulation/emul-linux-x86-medialibs )
+	app-emulation/emul-linux-x86-baselibs
+	>=sys-kernel/linux-headers-2.6
+	)"
+RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
+	perl? ( dev-lang/perl dev-perl/XML-Simple )
+	capi? ( net-dialup/capi4k-utils )
+	ncurses? ( >=sys-libs/ncurses-5.2 )
+	fontconfig? ( media-libs/fontconfig )
+	gphoto2? ( media-libs/libgphoto2 )
+	openal? ( media-libs/openal )
+	udisks? (
+		sys-apps/dbus
+		sys-fs/udisks:2
+	)
+	gnutls? ( net-libs/gnutls )
+	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+	)
+	xinerama? ( x11-libs/libXinerama )
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	opencl? ( virtual/opencl )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	gsm? ( media-sound/gsm )
+	jpeg? ( virtual/jpeg )
+	ldap? ( net-nds/openldap )
+	lcms? ( =media-libs/lcms-1* )
+	mp3? ( >=media-sound/mpg123-1.5.0 )
+	nls? ( sys-devel/gettext )
+	odbc? ( dev-db/unixODBC )
+	osmesa? ( media-libs/mesa[osmesa] )
+	pulseaudio? (
+		media-sound/pulseaudio
+		sys-auth/rtkit
+	)
+	samba? ( >=net-fs/samba-3.0.25 )
+	selinux? ( sec-policy/selinux-wine )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
+	scanner? ( media-gfx/sane-backends )
+	ssl? ( dev-libs/openssl )
+	png? ( media-libs/libpng )
+	v4l? ( media-libs/libv4l )
+	!win64? ( ${MLIB_DEPS} )
+	win32? ( ${MLIB_DEPS} )
+	xcomposite? ( x11-libs/libXcomposite )"
+DEPEND="${RDEPEND}
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	xinerama? ( x11-proto/xineramaproto )
+	!hardened? ( sys-devel/prelink )
+	virtual/pkgconfig
+	virtual/yacc
+	sys-devel/flex"
+
+src_unpack() {
+	if use win64 ; then
+		[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
+			&& die "you need gcc-4.4+ to build 64bit wine"
+	fi
+
+	if use win32 && use opencl; then
+		[[ x$(eselect opencl show) = "xintel" ]] &&
+			die "Cannot build wine[opencl,win32]: intel-ocl-sdk is 64-bit only" # 403947
+	fi
+
+	if [[ ${PV} == "9999" ]] ; then
+		git-2_src_unpack
+	else
+		unpack ${MY_P}.tar.bz2
+	fi
+
+	unpack "${PULSE_PATCHES}.tar.bz2"
+}
+
+src_prepare() {
+	local md5="$(md5sum server/protocol.def)"
+	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+	epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
+	epatch "${FILESDIR}"/${PN}-1.5.11-osmesa-check.patch #429386
+	epatch "../${PULSE_PATCHES}"/*.patch #421365
+	epatch_user #282735
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	eautoreconf
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+}
+
+do_configure() {
+	local builddir="${WORKDIR}/wine$1"
+	mkdir -p "${builddir}"
+	pushd "${builddir}" >/dev/null
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--sysconfdir=/etc/wine \
+		$(use_with alsa) \
+		$(use_with capi) \
+		$(use_with lcms cms) \
+		$(use_with cups) \
+		$(use_with ncurses curses) \
+		$(use_with udisks dbus) \
+		$(use_with fontconfig) \
+		$(use_with gnutls) \
+		$(use_with gphoto2 gphoto) \
+		$(use_with gsm) \
+		$(use_with gstreamer) \
+		--without-hal \
+		$(use_with jpeg) \
+		$(use_with ldap) \
+		$(use_with mp3 mpg123) \
+		$(use_with nls gettext) \
+		$(use_with openal) \
+		$(use_with opencl) \
+		$(use_with opengl) \
+		$(use_with ssl openssl) \
+		$(use_with osmesa) \
+		$(use_with oss) \
+		$(use_with png) \
+		$(use_with threads pthread) \
+		$(use_with pulseaudio pulse) \
+		$(use_with scanner sane) \
+		$(use_enable test tests) \
+		$(use_with truetype freetype) \
+		$(use_with v4l) \
+		$(use_with X x) \
+		$(use_with xcomposite) \
+		$(use_with xinerama) \
+		$(use_with xml) \
+		$(use_with xml xslt) \
+		$2
+
+	emake -j1 depend
+
+	popd >/dev/null
+}
+
+src_configure() {
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	if use win64 ; then
+		do_configure 64 --enable-win64
+		use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
+	else
+		ABI=x86 do_configure 32 --disable-win64
+	fi
+}
+
+src_compile() {
+	local b
+	for b in 64 32 ; do
+		local builddir="${WORKDIR}/wine${b}"
+		[[ -d ${builddir} ]] || continue
+		emake -C "${builddir}" all
+	done
+}
+
+src_install() {
+	local b
+	for b in 64 32 ; do
+		local builddir="${WORKDIR}/wine${b}"
+		[[ -d ${builddir} ]] || continue
+		emake -C "${builddir}" install DESTDIR="${D}"
+	done
+	dodoc ANNOUNCE AUTHORS README
+	if use gecko ; then
+		insinto /usr/share/wine/gecko
+		doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
+		use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+	fi
+	if use mono ; then
+		insinto /usr/share/wine/mono
+		doins "${DISTDIR}"/wine-mono-${MV}.msi
+	fi
+	if ! use perl ; then
+		rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
+	fi
+
+	if use win32 || ! use win64; then
+		pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
+	fi
+	use win64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
+
+	if use win64 && ! use win32; then
+		dosym /usr/bin/wine{64,} # 404331
+		dosym /usr/bin/wine{64,}-preloader
+	fi
+}
diff --git a/app-emulation/wine/wine-1.5.15.ebuild b/app-emulation/wine/wine-1.5.15.ebuild
deleted file mode 100644
index c86e6fc310eb..000000000000
--- a/app-emulation/wine/wine-1.5.15.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# 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.15.ebuild,v 1.2 2012/10/26 16:46:37 tetromino Exp $
-
-EAPI="4"
-
-inherit autotools eutils flag-o-matic multilib pax-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git-2
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MY_P="${PN}-${PV/_/-}"
-	SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-	S=${WORKDIR}/${MY_P}
-fi
-
-GV="1.8"
-MV="0.0.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 osmesa-multilib +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:0.10 media-libs/gst-plugins-base:0.10 )
-	X? (
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXrandr
-		x11-libs/libXi
-		x11-libs/libXmu
-		x11-libs/libXxf86vm
-	)
-	xinerama? ( x11-libs/libXinerama )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	opencl? ( virtual/opencl )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	gsm? ( media-sound/gsm )
-	jpeg? ( virtual/jpeg )
-	ldap? ( net-nds/openldap )
-	lcms? ( =media-libs/lcms-1* )
-	mp3? ( >=media-sound/mpg123-1.5.0 )
-	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC )
-	osmesa? ( media-libs/mesa[osmesa] )
-	pulseaudio? ( media-sound/pulseaudio )
-	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() {
-	local md5="$(md5sum server/protocol.def)"
-	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
-	epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
-	epatch "${FILESDIR}"/${PN}-1.5.11-osmesa-check.patch #429386
-	epatch "${DISTDIR}/${PULSE_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
-
-	with_osmesa=$(use_with osmesa)
-	if use amd64 && [[ $1 = 32 ]]; then #430268
-		if use osmesa-multilib; then
-			with_osmesa=--with-osmesa
-		else
-			elog "win32 osmesa support is disabled for now, see bug #430268"
-			with_osmesa=--without-osmesa
-		fi
-	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-1.5.16.ebuild b/app-emulation/wine/wine-1.5.16-r1.ebuild
index 14174c2cd0e1..616b105f76f9 100644
--- a/app-emulation/wine/wine-1.5.16.ebuild
+++ b/app-emulation/wine/wine-1.5.16-r1.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-1.5.16.ebuild,v 1.1 2012/10/26 20:35:36 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.16-r1.ebuild,v 1.1 2012/10/29 23:36:46 tetromino Exp $
 
 EAPI="4"
 
@@ -33,7 +33,7 @@ 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 osmesa osmesa-multilib +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 ) )
 	osmesa? ( opengl )" #286560
@@ -49,6 +49,7 @@ MLIB_DEPS="amd64? (
 	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
@@ -158,16 +159,6 @@ do_configure() {
 	mkdir -p "${builddir}"
 	pushd "${builddir}" >/dev/null
 
-	with_osmesa=$(use_with osmesa)
-	if use amd64 && [[ $1 = 32 ]]; then #430268
-		if use osmesa-multilib; then
-			with_osmesa=--with-osmesa
-		else
-			elog "win32 osmesa support is disabled for now, see bug #430268"
-			with_osmesa=--without-osmesa
-		fi
-	fi
-
 	ECONF_SOURCE=${S} \
 	econf \
 		--sysconfdir=/etc/wine \
@@ -191,7 +182,7 @@ do_configure() {
 		$(use_with opencl) \
 		$(use_with opengl) \
 		$(use_with ssl openssl) \
-		${with_osmesa} \
+		$(use_with osmesa) \
 		$(use_with oss) \
 		$(use_with png) \
 		$(use_with threads pthread) \
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 717b66a602cf..561f7c7c636b 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.119 2012/10/26 20:35:36 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.120 2012/10/29 23:36:46 tetromino Exp $
 
 EAPI="4"
 
@@ -33,7 +33,7 @@ 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 osmesa osmesa-multilib +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 ) )
 	osmesa? ( opengl )" #286560
@@ -49,6 +49,7 @@ MLIB_DEPS="amd64? (
 	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
@@ -158,16 +159,6 @@ do_configure() {
 	mkdir -p "${builddir}"
 	pushd "${builddir}" >/dev/null
 
-	with_osmesa=$(use_with osmesa)
-	if use amd64 && [[ $1 = 32 ]]; then #430268
-		if use osmesa-multilib; then
-			with_osmesa=--with-osmesa
-		else
-			elog "win32 osmesa support is disabled for now, see bug #430268"
-			with_osmesa=--without-osmesa
-		fi
-	fi
-
 	ECONF_SOURCE=${S} \
 	econf \
 		--sysconfdir=/etc/wine \
@@ -191,7 +182,7 @@ do_configure() {
 		$(use_with opencl) \
 		$(use_with opengl) \
 		$(use_with ssl openssl) \
-		${with_osmesa} \
+		$(use_with osmesa) \
 		$(use_with oss) \
 		$(use_with png) \
 		$(use_with threads pthread) \