Drop old ebuilds incompatible with new multilib (bug #543336).

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

9 files changed, 25 insertions, 1564 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 1bf9da39788d..d6cfd6b516f9 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.532 2015/04/10 06:24:37 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.533 2015/04/18 23:43:08 tetromino Exp $
+
+  18 Apr 2015; Alexandre Rostovtsev <tetromino@gentoo.org> -wine-1.2.3.ebuild,
+  -wine-1.3.28.ebuild, -wine-1.4.1.ebuild, -files/wine-1.1.15-winegcc.patch,
+  -files/wine-1.2.3-msxml3-libxml2-headers.patch,
+  -files/wine-1.5.23-winebuild-CCAS.patch, metadata.xml:
+  Drop old ebuilds incompatible with new multilib (bug #543336).
 
 *wine-1.7.40 (10 Apr 2015)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 2682be6d09ed..0bef621b353b 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,11 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX wine-1.1.15-winegcc.patch 1556 SHA256 dbd89db561d7583faf317d795b8c11231575d885e21c6414add39079604dbd0d SHA512 a6a6dbde16c1f850a5cb4d6b6fe1a8129bb267c44c19de63a4eb26933fd69ff98e440d257e467d766a6a6ac326d72dd621cae37fb593c8c62e43f588ccef3f25 WHIRLPOOL 3aea848b17217ab215f860c3526c44a5d9bd9e7adfe35c02bb5c841461bdaf4bd8ac4f8e8b990c0558980381fc1b2441b79edc3ff6dcde7455203fbd1fc3f49c
-AUX wine-1.2.3-msxml3-libxml2-headers.patch 14328 SHA256 0a046e532343f9a4508307434a2f39e0a3a50a66c165b69e56dd671488d4ba7d SHA512 837bde9cfefa12b81197c9fa2978c8b17f760594eb9d6b8fe96ab4baf2f34b5d2330db245c0ee180a9d5aa59657f52b8500fd976bb70b111d0f32d4103f71f94 WHIRLPOOL e74ff9ad63b95878337d4eac342e9abbc60c73af2f4017cdd87671c472c49bee953759b9786d5b245669352dc23ac338178b415d2c4f01516c385fee66a167b5
 AUX wine-1.4_rc2-multilib-portage.patch 1256 SHA256 9d0acd304d11d1bf73f56699754aaa1bfe1facba90648ee330fdbe08d9ff4938 SHA512 ac0b29e2b4c9b04bb6694a4e4da654446f68efbf90cda6809b45dad51e6679ac5410398763fde7e9505ef959493a037aa588cee58d14906563a4746702d2b0e9 WHIRLPOOL 8ea26266c327bc8313eca9b5d39c9741b226037750ca2d1d33262420093e05c306e7f004656c362c3c50b330d050cf9e5fceaa2b024a82809aae8b3617b0ae18
 AUX wine-1.5.17-osmesa-check.patch 1774 SHA256 dc7dde67c416bb067e528b85228cff01833a2a20c802248ef56d74184014e50e SHA512 12325e75db5e63e1d4c4e2463c3e164b1eba0d3d88455cfcd698a8bb790d7c0b3c947a06e7a09e232b1a14202e64ea2dc9331cbc4b503833f78a7c1034410c79 WHIRLPOOL 2d9bb86a5d683301c75ea275302f67616a8e9c6ebfc436b05f8f1b3d5d815c310999ca9518747abcf4d248bd18f34388dcb323c526d633c50e66ffb4bf94e5d6
-AUX wine-1.5.23-winebuild-CCAS.patch 6101 SHA256 34143c55618870dd31eea1e260ae973572d99557a20f24a4f217bb0ff1d615eb SHA512 f44580efcf4a406517a2fc65d7509a42b0b0b180a4c63f5980c894e708934d60155d87634e406763426415d00c1ea2f8f3894ac4797a2e2527ca0d9ed23430af WHIRLPOOL d62fb5c27fba3b8297ae2151a432f80d9655c0c2ccee9dee12beea84a2186c0e7965a6902d6bc5638cdb1c853c188a49b790825c8741a9dc4bb1516ff6ca9a53
 AUX wine-1.5.26-winegcc.patch 1808 SHA256 91c1012059b93a421b2eae9f2ea46b7b327d6d3d58ba0cb47021c8a57f6d8228 SHA512 fce9daf40a96f4a7502c249a30107c8dfc5d8edd4a171b863d2bf14c3ad46d18e4c29932ab4a6ede7da5d589d777b962d2f577f5360ee4db8019d71362c51d47 WHIRLPOOL 71cbe36c6bac87071472541b7f5cd3ed1b08f05479bc0016262b3f86e75738e467dad197563b4898f2b24fd0ab4e27c40dce04f244a3e7f5ea1582b4db1c5cc2
 AUX wine-1.6-memset-O3.patch 695 SHA256 1f04496713e8a401ba068702c5c3e104b18635bfb54808e5641a3c48a9b9bad4 SHA512 ad7231f8dedf98f9e9b91fcb8bbe72a716d78285127b0c33396de0b1e17a191f91f9a4a377c0e90671bb5f4e57bfb087ef7e80c9537c6c73b3c9bb90b3885968 WHIRLPOOL 91689c31054b896609493e2b0b4fe67e3d752d889f4ccae9c3e15229543341998809fd19a2040457e04fbdbd45505f0f2b49052844004193872713053d7239f8
 AUX wine-1.7.12-osmesa-check.patch 1722 SHA256 42648efa15040011ef868f92fd615924a83b5a30dab25505928226d8bc48159d SHA512 faca80f9747f3d7bfd05c3410bcccfaf17b3f397e30dd9ec382eccc326de346d195d6a184ec78e44b26d5e5e4b2af749ce58a0e6bad0b15a4fd1f2ea610d3124 WHIRLPOOL c5314849d15a53dc00af80f44249c10107b17825c4a2ab4510a5799b154bb1cdb516b3b632e1e959802588f673b9eac8ed6de2dfb59bde34acdd5b752115f695
@@ -14,9 +11,6 @@ AUX wine-1.7.38-gstreamer-v5-staging-post.patch 2187 SHA256 5dcd005d410f834e89b1
 AUX wine-1.7.38-gstreamer-v5-staging-pre.patch 1529 SHA256 891819135df197282e9e5ae4077f2e5ec29f2b50386a0cedaa0cc85633e31988 SHA512 62b55f7330939081aa3c854bfa57107a7e1d930e0ec2bda45fa66af887aec6a7663be1e36b5b6deeeec8f84aa70cbd8221ad83148e702716fecdf7d2c54ee7a1 WHIRLPOOL adc11e3ede16249da846d9980f681458827710db190a7b5e23f87bda8fe4945c655cf21f1dc0de0ce3145ae6d7606bebd4f598892a516f2b78d093c40a79f997
 AUX wine-1.7.39-gstreamer-v5-staging-post.patch 1175 SHA256 034dc11ef6ecb9d4d8a9734266f612e9154f155f80085d05ab0d45e9b237d386 SHA512 c8e64722a8be5725515a568534fe052c8714859d030be102b823588c117ae9649c3637fe905a8c52c8df676d6a1f7cc22dd3d25a1dd397edef516eb07906c776 WHIRLPOOL 9bd0dd5d38b3ebd03f2115f505266baa96b95de9764c57596366ea935f2bca570f9b896de3ce1af53f6d80557a537a8a2630654e1b788b588f335625e63aa4ac
 AUX wine-1.7.39-gstreamer-v5-staging-pre.patch 1237 SHA256 2d5ba5b40d4e6ea48906f48d098fca05ad98ad75bf58f3b5a86f1dbf8353e7bf SHA512 4e0b0a64ae591307569db840968059dd22d3e06fbc766b7215d3b7b6ec01f989bf25a95c3674263b669fa142c2a0736a71cba2de5a57becef0eab40df480fe39 WHIRLPOOL 83f20e69af5f4c17e7fd7c3a3befa9517b4e021d3a5acc6854648647a503cbfafee82a959f67e38e4b5fafc52088f6b94d9f451793ebe88bee937b80c1ab15f6
-DIST wine-1.2.3.tar.bz2 17651336 SHA256 3fd8d3f2b466d07eb90b8198cdc9ec3005917a4533db7b8c6c69058a2e57c61f SHA512 602ae802aa6f94c4498ccae96a67e355a8aa5cdc1e9c1e0f29482f45a9e7cc7af766ade9f2f1fef77ee77d5bbfc5f34cd110b95db244b8cff42998b5b0cf708d WHIRLPOOL 02ac95d8c86d0f2d870c8e4c4789c1bef1ef965f8bb186de23fd3a949126ba2aadd5791d1908bdf11d946d5dc5348b085881c2594cf1b407fa0df44c1990ecd9
-DIST wine-1.3.28.tar.bz2 19626794 SHA256 9a311124a1a911066ab9d3a742dda888487ee516a18eda946be105a1d1135a38 SHA512 b8fb881cf03dce1a40a9212bc6170858ddde38cd2fc282b455ab94cee7ee2e78f5043fee72df3b1e7566c29fb8c8a43726953a8bc5eb22d3ab7f869e6f4e9722 WHIRLPOOL acb6b8b978541e1b0f95f124e95ad9823e73590229515fd40e4e59d5af21c414c4824490710b436370b4d3fda3c477d6c4b626f89c6cc90e2fcf066355c3bee9
-DIST wine-1.4.1.tar.bz2 20104401 SHA256 3c233e3811e42c2f3623413783dbcd0f2288014b5645211f669ffd0ba6ae1856 SHA512 a0fe7f36325a51d9b381ab09a4460cdf59b12b810722d28aa8e98a3d6c3de29bfc62dd0f0d4e5336bfa82a6b549e45c313a714b6d43f562c45ffadb47874058a WHIRLPOOL 81f837ecd31902bc769065de353a92bcdfa1b59b3cd53e700e345b24480260c68daf7075fec685a948a46e66e6f4470ff4158df92e132760013b17ad6690885b
 DIST wine-1.6.2.tar.bz2 21252985 SHA256 f0ab9eede5a0ccacbf6e50682649f9377b9199e49cf55641f1787cf72405acbe SHA512 81c83566dc2cab276ab7b9cfb5edc5fbca0f003dcb78044a0197c9a4d9a05a40f9045e5b4981c9219c3c39dab52fe519ef3cb338d79ee01e1fe66e3c056e8397 WHIRLPOOL 7d2d995a9996d63e17ff3ef5871f3818945dcd90c4a22798506f0d0c31ed999462bc5718f5cc562b9da64fdd7af6b240380bfa2901eabd23fb036aebfc7c554c
 DIST wine-1.7.0.tar.bz2 21217085 SHA256 0106ba3c8f0699cc7ae6edfcf505f7709c9e6d963bf32ff9c690607def9d4d77 SHA512 0e730aff64fd026b6fcb3a8b7e2440fbb673c892f5124611a001af5264f2ec1ddfdc94d7b78ffe3080008b0ec0658da0131d680c5e2d80f5c655b6abeb8379b4 WHIRLPOOL 3c607d0f7537815020af28f539699f8290e3d64291422f9f58bda5b836fe083224ed6108aca3147d713491183866fa57ed9964cb4a255d4980ae27180f2a29f4
 DIST wine-1.7.10.tar.bz2 21312974 SHA256 44270e4b97ef930e4e4b59088e6e3972e91e85bacf9a9a4d8712a877c9d5cbdb SHA512 157fe4146df3c174643cc1ac29748778aa90fb9e602b417ad772d3da2af3a86307ca818ded860722513efdba57b85e06a2db2869a69a3f579255829dc3d8ac55 WHIRLPOOL eaba07f65c416ce93b9243df402ad0fb5a2f5e7bce43f40b73941f2ea7baddbcab9ce3a999d9086faeaead7552f5d34234cc3b3f3798db2fb98982ef22a98b71
@@ -60,11 +54,6 @@ DIST wine-staging-1.7.33.tar.gz 8759402 SHA256 30b7ecee549514ecd186689ae8eac15ed
 DIST wine-staging-1.7.38.tar.gz 9047747 SHA256 b77fc0913c972c0cb2b3fcc3d7627a838ba05cb876396cab526f518564f2f936 SHA512 125937505308a974840d810beb9df10d57cf488b173836c5debf71a96cc11cd3dfee666960768db361edd3b280858f2e6db5eaa8d81f4b487b7c53a0f8fef13c WHIRLPOOL c5cb14dd7527752a0496e343d7b12a53c9df629c027d746e33ac3c25ad20bfebd22c40ceb31bd5e70d3ea2a9188efe076eceab30c3c3f2d519fb31164f189f5a
 DIST wine-staging-1.7.39.tar.gz 9096658 SHA256 b7b3ba39e2a8829a6fd6aef4b3701dd0009eebc85539ac946e31de6d7fe36649 SHA512 d14780c30303a17f575f22adeab5cc026c2f41520d47dbb7ec70b939252eae656070eb8532cf1a42cca2b1c9c589a44081d12b2647b0d97c3c90b896a7433d23 WHIRLPOOL 8d71a49c3172261e83193ccfe85dfbd94421ee20063f4127ecb328450916cddbea742c59c09c34e10035d9f2fa0df0ebd0d68bbc6e90b92c1aa1a1071a26b055
 DIST wine-staging-1.7.40.tar.gz 9129843 SHA256 d2cafa5e847e1aecb82bb1dd42ea7729f749176c3ddc549c6b422c8ba74b89d5 SHA512 7688f9e2178335b8c1606673921368faa1532c766bf2a60c9be1d9640719acf024122270084afc892195878bfcadb6aea6cbf971a6bb2112260b3840d94ab994 WHIRLPOOL b58e5dcdbbb1632ed8d8bf98c34396c0a8e1d108d557d130ab9aceaa9efd9b9002eef38c7829196eae0736c1002a1e1c723bcdcf0a819e48a1394e615c997262
-DIST wine_gecko-1.0.0-x86.cab 8119486 SHA256 7ddf697677506fb164c52771864e32dd69a359ed855b2efbc51340de2376c99c SHA512 0b8f778698f04ed2c01c25a866e54752ff67ad42099179c3c4d161b7f2cba92f262ee6ad909b382e57038428eacddf519b77934c079451eb0cbab6a030eee307 WHIRLPOOL d77903a7fecbc3ecc2d0ddb58fbc98fb401a796fc4d21b216de12702aef38a120c2e7d6f8279308a1d96b66b230973f076f267f246b3b1c02b40e40a518a57e7
-DIST wine_gecko-1.3-x86.msi 13609984 SHA256 4b7559e889eff5ed924d25ce49297aff55f43c4b9d34dafa970261d88c40b5ae SHA512 4d45ec762eba1fc2cc8ac1f6672e88ef392395ecd97a48038845c2dd7b40a49df7460cd88aff432b75bfe75231108710901a4759d2ab3998ed7052130d6bc46b WHIRLPOOL d9afae5ab439612e509fbe2b8a405a0252f872e826b0b6cb2c739c1cea0eb4c3a35e5152ac1ad583d17c21fec5c013a43f13779e92929b93e51ee819b70e73d7
-DIST wine_gecko-1.3-x86_64.msi 13835776 SHA256 07e9885d15ad22629c3854d6bd77094c3f4db1028ebda408ec87b101fa135d75 SHA512 26e596e498368f8307435a85e440205c1105e10538f8e6ddbb24fd022eed495e4f2d7f09b6b06d26b5a3cf1eb8d629f9baf342fcd239b3aeb16f08324e376e01 WHIRLPOOL 9f3502cf8514873ad3fb49aff0c63eda2b8fa3659d4dbecdb3366d4949cc0b256fcfa0e4269f011887e856113a3bf74dfc365348b9ab1a2c78eac98ab990d3ee
-DIST wine_gecko-1.4-x86.msi 14732288 SHA256 b30e0ac29a91a6fc40c73b5b760a56360a1d5323282545e32efaa40c75d8986d SHA512 dcc4846bdcc4b2b7dff98a7b3f4f27eb1a63e78a136ebbdf1bf5f62386955d0b92c4f20853a31936c8c52217033d0a456d3ad2fdb71cc5482880633b57d21fbb WHIRLPOOL 50f58bebe1451cff2fce07c6ac53ee6d5200a217419e6d795fd16dd96ca0e8d8e1ba2dcdb1e9b410917d1ef195858cd494b71dc12554acb4560ab7021482f896
-DIST wine_gecko-1.4-x86_64.msi 14980096 SHA256 ceab7f1866e85175ed4cd3b5d081ee4f77c8d32ac7adf489a19c1f7329187219 SHA512 b910256124e75e38cca09ac8f7479866e860b8a117d4e876f8c2950da25d2a8246632f81c8ff39fc8d69aab4cb4c64eae1b5963064cd5e06bb13ac9d5423b337 WHIRLPOOL b7cb7b81216bd4c3b5e6480943acd75f0b1ebc7ef377ca7dbcb449c873d09140bf17170f35c88ffbfb75ecd2d59182f1f37f6cd693e26cd477f893575624e026
 DIST wine_gecko-2.21-x86.msi 20871680 SHA256 f01fafa6d7aab995c38add77315c4cbc2f32f52d5d6a9350056f42b62d631fd8 SHA512 f4ca9ca5b876dc39e906991e58c6da8ef4103782f83ba781ff27556c0ebdab7fe10c14f0551e900442a5d57a2c619da6e5ed6ed42323edcdd55ce9789c4c83ac WHIRLPOOL d1db97175b047652499c97c968b71c08c5b44774423f22ae626f89b4dde3d03b46295e5caae228f1f8614209e943e8246854b478eef3abb186e8de4c341b0a0d
 DIST wine_gecko-2.21-x86_64.msi 21646336 SHA256 bc370bdc899f66d98f31c4d410a6952aa82c0c9c0a0ec27f2a11243c9b412c3f SHA512 2a48a7697beba4e45816a9eff09e181de353d8c93e02a70108fa77d27136cd5cd75b21c42caa7702a09f86544669ae2bbfc6975b1fc0d7fcb20150a4bc4ea514 WHIRLPOOL 2fce9b9a190a52c173551d47428dd8b8dc54d5878682733e0006a3f06f216cd9f47a88ada49f92fa5697ece8b2942a88f937bd2722b4cb85d2c35c19bda29b85
 DIST wine_gecko-2.24-x86.msi 22373888 SHA256 6e38acae87ea66e2c1e8f2f0afe88f89eed3e6e0b431cd3da38dea814b71202c SHA512 f158d28ca09bc900a2680892e7ac10770e06050a9251e1ec3a953fee0bf9b1c326e166f92fb88a4648297b6587c91a5ef5af35f267bb2ba5f679da4c8fdb6898 WHIRLPOOL bbe7a2572d89dc5e0347ba11b2014bac79fc4427d7551655313a46b147a79c1607b7f46596877c459ddaa0e202337fb3d217429ddd6a4df49ee33b373a788487
@@ -73,9 +62,6 @@ DIST wine_gecko-2.34-x86.msi 28269568 SHA256 956c26bf302b1864f4d7cb6caee4fc83d4c
 DIST wine_gecko-2.34-x86_64.msi 29802496 SHA256 0f2c1b24c4cd1b3fa3fb3fe31dcd9ee162446b1f3370c0a18c8cb03a0c1a1070 SHA512 6bc69e1c8612533b3f37c16782833bca0e3aaa8ae872fe9f347ee081575c55c03866d6c71a5fb767bf4c3b012ae72f7d9c384d6d25c2584bf349126521e8f463 WHIRLPOOL a03df2c16088cf573c9273a59ba6998455917a49e0bf84028136d0ecff65a91f20edbecec55455b742682dcee5f5e618b8f2e8c15c71625642cd8b67a7774bd0
 DIST wine_gecko-2.36-x86.msi 29718016 SHA256 afa457ce8f9885225b6e549dd6f154713ce15bf063c23e38c1327d2f869e128a SHA512 6099240fb76368ed9bb6b775d5972b6124972ace92ccfe1051caeb8884d9e12d40c35220419f0d02443584bf2d82799dfca8206410d171470ce15903703924f0 WHIRLPOOL 4b8fc20a8b228268f3407ca425427a2d91f81ff9e6f0860d4f3eb156c97e3ec1ea83ca3510ee10bfb37598f91c3323a46ba75eace3334632b26cbd45959dc908
 DIST wine_gecko-2.36-x86_64.msi 31222784 SHA256 701b84004bf584a2dae7c1296121172c933321cb795c3817b64435fd3364ed44 SHA512 814b13268beeac4d0ace4ab62dbc29ccd92fc13a135499b8ea5a14355992d576268e1e401b28906e8379a826159c5bb051ad274a1e64dd0d5424d495f8e10e10 WHIRLPOOL dbd0e275bdca2ff7a1930daa62d23fd438a90f71b0fed1096b34b8d00a3f51cb91468ce61acaa9361a57deb9f3cfe70a21d16fc23de95cb4e0f7f957d4727010
-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
 DIST winepulse-patches-1.7.0.tar.bz2 48368 SHA256 280f8583574d5f0ef437e15790f96d0ade9bd4b5cc44771ec89023f76728ba73 SHA512 67c36d380c40d3a8144fd5f9e5bf5eea6adfdd178a6ebf3727e281938bdaffddfcc2f49cb30837195cf47f4c176c1812f0ab64bc36c8981611fc86dc5a8266bc WHIRLPOOL d8775bfff9bac174cb91550643a1994a3d0ea2e22a24c05d46ca2a7a7521ff53f481880c2e0191c4f0494acf11a05a8183abca033aa58ac58bbc8bd762d02a5b
 DIST winepulse-patches-1.7.10.tar.bz2 49205 SHA256 7330b4552b572244bbe99c16005d725eaf382995c986add170474381b90df468 SHA512 ef3a5477bc5803bfba609dc3299a7c07833958628d1aff01d100da57c0d270344ee326649206708c50c2a12b025f987a4e0f1dee9126e52e2778b256c45ba567 WHIRLPOOL b40088d8665f3cc57b4936774ac6dc2e6b005d75aa7c7385248ce35e5cf6e168ae212771f771b68dbf91fc5034b7ba54f907e93283cc2eddaa18e825d9b734a9
 DIST winepulse-patches-1.7.12.tar.bz2 49171 SHA256 6c5b3f46ea1c4615c49ee0f6f65936cf650cce6640f0feb4236c707064a9d392 SHA512 ec41f6024d6e2325f14f8caa15bbe38c8dca6c69beb5343063365f58dd8b7edbbc4d24ad176de72cf0e37acae03eb9769b68fcbd40a672680e06156f4a59b12c WHIRLPOOL de8a33ee784606e76a60166e3e29a1fb748ce4b3af1db136558888bd09bb0a044e4a1a9a61ce3de59d55f93c98575ac8d77c3ff17de4d69cda3b8fbd8f6c33c5
@@ -84,9 +70,6 @@ DIST winepulse-patches-1.7.21.tar.bz2 52679 SHA256 38daf95ea99cf831c56634e1dd4a4
 DIST winepulse-patches-1.7.3.tar.bz2 49163 SHA256 893dc6251984f6a7306dc8064c50a6a605921094f84feb436c23be3b9e5d077a SHA512 f04b33479c92ce31df74ea49b8582cee2f9d7a4cdf132f212f021da89b19dda8e5a4b0daaec81533b100ef0af023157cf43581ab75fa263da3c1a5d712ec3e9d WHIRLPOOL ae2a599d7bdb49ce77cc56844ff74c7fd62b1f1164e9f7fdec499244fd609799c0fd7421d29ffda7e9fb599962f75c2ebe44ce72e0f0a80677e140f759ab22f9
 DIST winepulse-patches-1.7.4.tar.bz2 49182 SHA256 26cc1ab6d91c45b4d83f07bbd7f43c9824470700a58325f0a1bfc1b76bfe419f SHA512 55095dcd3ebd1560316382ee5f625203589ba8ac2437f7993bee0edf61004d3c0cdba0aabc2e9aed3d195d8eda4088241766dde4c44564e81ea99cc47404cdff WHIRLPOOL 978f3bcc3cc14098b604cd737d9fa6911a5c3b76773a060586ba183a055cdc25e3b436c262c813094c7c2158ae607bcb3020738da16bbe2c48c595728755f98c
 DIST winepulse-patches-1.7.8.tar.bz2 49140 SHA256 0fd31ea7fec8817561a7b304bbfad6bdd014eb566b0c533e15773064bca555ad SHA512 18c88d4da37714d0216c01929eb92c99161fdf7024d8516512fc2585bc8d5a700fb1b5eb9fb667149e104305f366c867973f41b688a04f63e7cce76f5d85389a WHIRLPOOL 60dfeeb1d51c9ea7730ff1e9263d44fbcf3509e6ae68df1e3d30d965999f19525979f64617494bb1c3e1712c7117f30bebfbcbc75b1b08ba1f1e033720b0cacc
-EBUILD wine-1.2.3.ebuild 6231 SHA256 c88d99114dd0035217cde201370213461b434b8248545606d7076667a3423983 SHA512 c614d4abf5eff854b94d5237551f2f511ada51277bf8eb95cefd01063cde128e780316df69dcb89176d00d2a916f5dd241606aa826b5f55f0124285f4e073dd7 WHIRLPOOL 2ec91e7189bce498cd46c63dc41daec149460e5c7b208393a00defffd8d464e8c1fa45579064a4bef97601c21159e4888fe95360c4c13d5bf1f171ec8e5d39fd
-EBUILD wine-1.3.28.ebuild 5747 SHA256 568f3774462c6d5a747ec19a0cf5c743e72327d60c5c5aee458f63ae0cd8c400 SHA512 cab44c2567bcd728eb4982c3bcaa734c3933f0ae0d5fed1fe3f98c100e3bf0872ce7d4bc2c9d931354cc73f662de83081744004350aab56712a1cd29fab0ecc2 WHIRLPOOL 09ecfb355315d2062fd05c93abf1c1bca8b8df12c25a3ff1954ff780c5a74eccf137db38c5feca58d18990ad4d5fe00d24d9d2ca5466982efc7b3fd4612d3725
-EBUILD wine-1.4.1.ebuild 6673 SHA256 4901b722e654a81075013db338a4a0fcd11a8699737b5a74fc44e8e5447d748c SHA512 a48f614d1036f7cf65c5a996923c9873ee8afa8432e59429105c1ad940623312181a980c29f2892b4698d373e202e6e3bf8f36561fb11ba96f0d3a1dc9ea6112 WHIRLPOOL a1a6ac5634619f9fe19defcd03fe376e511940f07f0e641eae97692d6ca9e523aea4e79878eda6d91b9d7a1059d1d69da66447525eac9f3a6a117700966bce05
 EBUILD wine-1.6.2.ebuild 13832 SHA256 0223d8294f7052d6048b81c34ad6455d16880f6adc45d72a2daf471db897cfd9 SHA512 75eaf67ccc06df99916c76f88b4b360ea6e6af2449d0313c35334d5c812cefe12385c62e6c6f015f6d13d5146c6027abd3119cd0cf20e45989a620bb0f931f58 WHIRLPOOL 82a6c64a6f4e2b6834ae955bdf7d111ec28e41067ab19ebbdd2285cc023b734e39a1f1615c3ce3ba6fbdb3c229c5cde09e43e66571fffe62304b56c9a23f1bf9
 EBUILD wine-1.7.0.ebuild 13775 SHA256 0240b3560bb1bf9e4c85f7a7cc0468fde5acdc00c5e5cdf2de3fadf17e264db3 SHA512 d61127857e34949506479f6f93bc135c3ac16751dbd850e1b5b7d5683e86e7baeaca3ef5875be5f48d030cb73d1cf65ea0b008789e97c58fd4300aaccaa8e601 WHIRLPOOL 7631ba78d85314238807298a40e8852cb4c6ce12cbc9d943dc3ac46780af56fe78a49e62f2854253420faa07d33dbcdd3478b1b225fae299ccd1a3150062d5a6
 EBUILD wine-1.7.10.ebuild 14081 SHA256 bf1da1977b0d3ecf1a59287a4d763fe6f16ecb9f58bebfde8c6e724620058887 SHA512 b7bae2199a574347cbfc46ad71c1ceafe3bb20f0a79d7178611b3d9bec87b93abd8216f989eeb4c277fe7f3587ec12286c61c5b329fb412e5e7dd59b759cb7c4 WHIRLPOOL 068b70f0aa86aab92dd6496c0f3283b35fcd2f998c0b628556f4fc1cce778db16f0265f162ff4679fc3eb3aab24e5477276f7584645b22b8391696b4a5dece6c
@@ -113,13 +96,25 @@ EBUILD wine-1.7.40.ebuild 16830 SHA256 b257089b2b87b117a6b7413c6e7d349537a2c597b
 EBUILD wine-1.7.8.ebuild 14079 SHA256 834e1a1d3f52e88f56b1d039d786e135a2b9841846b74b76a344e9538690cdeb SHA512 25d96cb05fd39d185afb9c3623fe6e7d9179b387e90714d126e9efd538beaf4be8f6c80971ed3b8217bfeecbe366f82bd1f4347abb30aceb9a46393f9551b8b9 WHIRLPOOL 7e05523f1e531faa813881fc3f0c00a561830c3db02928b164fd0b51167dfdc287cdc7a1b85a5c2095890937a36025075472b33291d8aa498e694ea0f4d5d80f
 EBUILD wine-1.7.9.ebuild 14079 SHA256 23fcbdbc8a3123ba66b5a9ff9b0eb8939c45da7fd520cbb3cea29c96b47462a7 SHA512 7b199fcc1ddd9b9a9a23633906c371e8a083ab66c4c62c7c50e90121e78181cdd56aba0705274ad6df93dcb06002d21c0040a6fbc2562b15a0f22a32becc969d WHIRLPOOL 4d0ee99f9b0c81e57dff869892a96d9bf0cfda7585dff1de68657d62ef987e8fed982cc5b15035299b5b122720c664b187336d7ea11e0a904dc790ad60c74b60
 EBUILD wine-9999.ebuild 16832 SHA256 5f4e705703fd31e3d76f22d665d02d9ca4921c97301a3eb5d01cd3328dd8bfeb SHA512 79e220ad9a18c6579214e0ad70aa38fd4310652613f41bc5a2fd04eb4aab7f51c2bb478087a6aa63ca389e1590acd8411cb64e3dc58123c5a3b8b13186a09be0 WHIRLPOOL a7afe6bfbef17f70cede80089aebd5efa8f457a42cf9cc138f3cd0fd94e54e0a10058cbb4beebbf1d4afa59bfd94254f64f893014880389371d94ec1937304b8
-MISC ChangeLog 29000 SHA256 f2122e3b82296566b7d0f43354f7f6f6e3fc9833c0cf0209e01b7ef2e93f3a15 SHA512 1f01ff9b13b464a119e361a2994e8f5557982a2be029f4fea356b7b3678eef919c098a1ef004eb21a0b46c682f3fc55cc55a3786125c95dd3c4b5ea48e30d2bf WHIRLPOOL 0ce5faf19cd3561c50f1e4b72a21def55b046dd9fa7c0f9aca8080eb9b8c24a49648f15376ed70fdd63b6eb1006d11f7f574495131e3e15164a1dd8983ecb6e2
+MISC ChangeLog 29331 SHA256 e07b799e588f6c86b95ccb0a9e55f4074e47d277bf8ad76f8d4d388df84fe88e SHA512 966a5076998f34cf4563990042dad9cf9a77d2c6fc3e262ade6d42df9694032cf26820a54b90e21b774c031a781025f998a945912350fe7706e27c758eaa4edb WHIRLPOOL 6227fdf0f1ee65988a1f03434f5f4d1a6781f49ebb8d7b817dd742ddc2d6909725fee8b9b922c7a9d8ffe5c36ed54c3d5e53e1646e569b6bc9124555f66a9c0b
 MISC ChangeLog-2012 100362 SHA256 8e70fc54e7945c1f41e3e0b64fef6b9a7fe89acdaf8c79a06a16048fe8d2e26c SHA512 ca875e847ba100e1f19774b31a2b45a81d776275e3d11944be8a7b01dfcdbf4265b1a340d691bc4fe4054fea006059a06ed52bc0516b1f8b44a1772a1c813278 WHIRLPOOL 36ec708601a25cb8fa93b471112538480b6ef82cc4e6703b3d045f883078b49209ceaeef7bafa8417b881c2d11df84df9c83d1985d0d687a11f3db3de5abb014
-MISC metadata.xml 2753 SHA256 e52a7b0f8c694e3fb8624f80f05fbd19ad0e3e9af654fac7e5ada9596361de3f SHA512 1de3e621614dfd1529e158743c6959834f10a885c0e5efc74bad445ec5930bfd86b999122f5a978f0fc0ac8e64927a02919fb766fe6a701362f9e3e4fe8ffc94 WHIRLPOOL b838c0d1beb4978ad96e280a1a77625c26adb90f0e0f3484acd49c21fa9a2182237ac1d723badafe23f5d82123e187c629ccdc0385cdc6347e7c0c8bfa5921a9
+MISC metadata.xml 2585 SHA256 8c17f880333a1153db219ded505c4fd559cb115277151171424e5491e414fdf2 SHA512 b6c74bf51e3e815556495fe647e7d812b45d9bd1cad0ddd5ca2c30a06a758f699411b776aaf2c6c94ac78556b4542acc9e348a1d8bca1ad6d180bb9ea090651c WHIRLPOOL c94c2966cfc4ff47aaf366b2fe4414e1681b966d60e33248fdbf3312c2c8b49d0e52b2beaaa435991b8d426afb01d598c40ed48eef39d7d1fc458635c47d062c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUnbLUACgkQso7CE7gHKw3RMwCgkT19TVnL/QgdTjzOrKPG4KnS
-w0QAnjSzXQuuVzXALfi5kQmXOhzLBtad
-=1Nz8
+iQJ8BAEBCABmBQJVMuwNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNcaYP/3qZ6YHOs9QGm6D5Ci1B/3VZ
+gb7I30mp6b3385aZzqKdytsJn/Y+T56j4dfL1b7r8so2Ozy5eqKPT1lTIcLIpLQ1
+aPJBzyQrP1hNfqGTB5hU6pJ5a7G3DkwgzIiQ9NzjqGoN/TyKq59vB3M5E1komPh1
+7n1dVHp5iOL8F8Jdd+Ml0hBexNvVTm8QAT6F+/fvk5UKyjCueRMeaKUtc5Og7KXM
+lWBgMf609o6aprKMiU5r0EL+44qMEw+il/t5+C5MCSgpco1Az4y9sZ/yGFwlwz5F
+eR+wshIl3bMQ37ouX+iEKjoLi+O19UD7SqFTmpLdeqg7kkVZ1VnvbWtMuBOpzH++
+QuQce31Jn3nLiWwQ+DPVZhDu0dqChpaOl4B7aq9C9dOUAIlr/NRjxRC3xFEIUtxm
+YwrxYEFcm4bJQMQ1wWiKsEob+LYLu1T1MrSqAhGgS491DOuEtWdpE3+mF5/aBgj+
+FCVsZPn14gR3IuTd6n4ZQUALnFo0lyBCjO7hWEsepDT4V+RZ4pWOOLmZAG5sxBV+
+laKxPTJRohbREwY9JlrmnmBN6WlUSTXzStsHgN/NP4k6ZE25+e0RtQc6OwgpyIFf
+PhEhFOjBrW3KgZLq3SoZ1cGDi5ATIXhut4eU4HHEGZ/agKPDhvow/qYUfVBvRVWr
+Fi8qDcEGhSZfqNzsQYWm
+=ylxZ
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/files/wine-1.1.15-winegcc.patch b/app-emulation/wine/files/wine-1.1.15-winegcc.patch
deleted file mode 100644
index a1cd8907a887..000000000000
--- a/app-emulation/wine/files/wine-1.1.15-winegcc.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-http://bugs.gentoo.org/260726
-
---- wine-1.1.15/tools/winegcc/winegcc.c
-+++ wine-1.1.15/tools/winegcc/winegcc.c
-@@ -215,10 +215,13 @@
-     strarray* files;
- };
- 
-+#undef FORCE_POINTER_SIZE
- #ifdef __i386__
- static const enum target_cpu build_cpu = CPU_x86;
-+#define FORCE_POINTER_SIZE
- #elif defined(__x86_64__)
- static const enum target_cpu build_cpu = CPU_x86_64;
-+#define FORCE_POINTER_SIZE
- #elif defined(__sparc__)
- static const enum target_cpu build_cpu = CPU_SPARC;
- #elif defined(__ALPHA__)
-@@ -968,6 +971,9 @@
-     opts.linker_args = strarray_alloc();
-     opts.compiler_args = strarray_alloc();
-     opts.winebuild_args = strarray_alloc();
-+#ifdef FORCE_POINTER_SIZE
-+    opts.force_pointer_size = sizeof(size_t);
-+#endif
- 
-     /* determine the processor type */
-     if (strendswith(argv[0], "winecpp")) opts.processor = proc_cpp;
---- wine-1.1.15/tools/winebuild/main.c
-+++ wine-1.1.15/tools/winebuild/main.c
-@@ -50,10 +50,13 @@
- int link_ext_symbols = 0;
- int force_pointer_size = 0;
- 
-+#undef FORCE_POINTER_SIZE
- #ifdef __i386__
- enum target_cpu target_cpu = CPU_x86;
-+#define FORCE_POINTER_SIZE
- #elif defined(__x86_64__)
- enum target_cpu target_cpu = CPU_x86_64;
-+#define FORCE_POINTER_SIZE
- #elif defined(__sparc__)
- enum target_cpu target_cpu = CPU_SPARC;
- #elif defined(__ALPHA__)
-@@ -574,6 +577,10 @@
-     signal( SIGTERM, exit_on_signal );
-     signal( SIGINT, exit_on_signal );
- 
-+#ifdef FORCE_POINTER_SIZE
-+    force_pointer_size = sizeof(size_t);
-+#endif
-+
-     output_file = stdout;
-     argv = parse_options( argc, argv, spec );
- 
diff --git a/app-emulation/wine/files/wine-1.2.3-msxml3-libxml2-headers.patch b/app-emulation/wine/files/wine-1.2.3-msxml3-libxml2-headers.patch
deleted file mode 100644
index c1a80d3c408a..000000000000
--- a/app-emulation/wine/files/wine-1.2.3-msxml3-libxml2-headers.patch
+++ /dev/null
@@ -1,574 +0,0 @@
-From 26603f25f73142a45b5b964bb9bb2e59bc0908d4 Mon Sep 17 00:00:00 2001
-From: Alexandre Julliard <julliard@winehq.org>
-Date: Thu, 24 Feb 2011 13:11:53 +0100
-Subject: [PATCH] msxml3: Include the system libxml headers before the Windows
- headers.
-
-[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to wine-1.2.3]
----
- dlls/msxml3/attribute.c     |    6 ++++++
- dlls/msxml3/bsc.c           |    6 ++++++
- dlls/msxml3/cdata.c         |    5 +++++
- dlls/msxml3/comment.c       |    5 +++++
- dlls/msxml3/dispex.c        |    5 +++++
- dlls/msxml3/docfrag.c       |    5 +++++
- dlls/msxml3/domdoc.c        |   11 +++++++++--
- dlls/msxml3/domimpl.c       |    5 +++++
- dlls/msxml3/element.c       |    5 +++++
- dlls/msxml3/entityref.c     |    5 +++++
- dlls/msxml3/factory.c       |    5 +++++
- dlls/msxml3/httprequest.c   |    6 ++++++
- dlls/msxml3/main.c          |   15 +++++++++++++++
- dlls/msxml3/msxml_private.h |   23 -----------------------
- dlls/msxml3/node.c          |   31 +++++++++++++++++++++++++++----
- dlls/msxml3/nodelist.c      |    5 +++++
- dlls/msxml3/nodemap.c       |    5 +++++
- dlls/msxml3/parseerror.c    |    5 +++++
- dlls/msxml3/pi.c            |    5 +++++
- dlls/msxml3/queryresult.c   |    9 +++++++--
- dlls/msxml3/regsvr.c        |    4 ++++
- dlls/msxml3/saxreader.c     |   10 +++++++---
- dlls/msxml3/schema.c        |   12 ++++++++++++
- dlls/msxml3/text.c          |    5 +++++
- dlls/msxml3/xmldoc.c        |    5 +++++
- dlls/msxml3/xmlelem.c       |    5 +++++
- 26 files changed, 174 insertions(+), 34 deletions(-)
-
-diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c
-index d78fa47..3df93d6 100644
---- a/dlls/msxml3/attribute.c
-+++ b/dlls/msxml3/attribute.c
-@@ -23,6 +23,12 @@
- #include "config.h"
- 
- #include <stdarg.h>
-+#ifdef HAVE_LIBXML2
-+# include <libxml/parser.h>
-+# include <libxml/xmlerror.h>
-+# include <libxml/HTMLtree.h>
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c
-index b24e04c..01a09a5 100644
---- a/dlls/msxml3/bsc.c
-+++ b/dlls/msxml3/bsc.c
-@@ -23,6 +23,12 @@
- 
- #include <stdarg.h>
- #include <assert.h>
-+#ifdef HAVE_LIBXML2
-+# include <libxml/parser.h>
-+# include <libxml/xmlerror.h>
-+# include <libxml/HTMLtree.h>
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c
-index 3fba66c..caf8cd8 100644
---- a/dlls/msxml3/cdata.c
-+++ b/dlls/msxml3/cdata.c
-@@ -23,6 +23,11 @@
- #include "config.h"
- 
- #include <stdarg.h>
-+#ifdef HAVE_LIBXML2
-+# include <libxml/parser.h>
-+# include <libxml/xmlerror.h>
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c
-index e74de07..1cabfa3 100644
---- a/dlls/msxml3/comment.c
-+++ b/dlls/msxml3/comment.c
-@@ -23,6 +23,11 @@
- #include "config.h"
- 
- #include <stdarg.h>
-+#ifdef HAVE_LIBXML2
-+# include <libxml/parser.h>
-+# include <libxml/xmlerror.h>
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c
-index 09b71fe..6b01b15 100644
---- a/dlls/msxml3/dispex.c
-+++ b/dlls/msxml3/dispex.c
-@@ -22,6 +22,11 @@
- 
- #include <stdarg.h>
- #include <assert.h>
-+#ifdef HAVE_LIBXML2
-+# include <libxml/parser.h>
-+# include <libxml/xmlerror.h>
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c
-index fff3f62..bebd252 100644
---- a/dlls/msxml3/docfrag.c
-+++ b/dlls/msxml3/docfrag.c
-@@ -23,6 +23,11 @@
- #include "config.h"
- 
- #include <stdarg.h>
-+#ifdef HAVE_LIBXML2
-+# include <libxml/parser.h>
-+# include <libxml/xmlerror.h>
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
-index 0007503..e6a61e4 100644
---- a/dlls/msxml3/domdoc.c
-+++ b/dlls/msxml3/domdoc.c
-@@ -25,6 +25,15 @@
- 
- #include <stdarg.h>
- #include <assert.h>
-+#ifdef HAVE_LIBXML2
-+# include <libxml/parser.h>
-+# include <libxml/xmlerror.h>
-+# include <libxml/xpathInternals.h>
-+# include <libxml/xmlsave.h>
-+# include <libxml/SAX2.h>
-+# include <libxml/parserInternals.h>
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-@@ -47,8 +56,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml);
- 
- #ifdef HAVE_LIBXML2
- 
--#include <libxml/xmlsave.h>
--
- /* not defined in older versions */
- #define XML_SAVE_FORMAT     1
- #define XML_SAVE_NO_DECL    2
-diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c
-index dd518a1..c6794ac 100644
---- a/dlls/msxml3/domimpl.c
-+++ b/dlls/msxml3/domimpl.c
-@@ -23,6 +23,11 @@
- #include "config.h"
- 
- #include <stdarg.h>
-+#ifdef HAVE_LIBXML2
-+# include <libxml/parser.h>
-+# include <libxml/xmlerror.h>
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c
-index 617c008..1b5c693 100644
---- a/dlls/msxml3/element.c
-+++ b/dlls/msxml3/element.c
-@@ -23,6 +23,11 @@
- #include "config.h"
- 
- #include <stdarg.h>
-+#ifdef HAVE_LIBXML2
-+# include <libxml/parser.h>
-+# include <libxml/xmlerror.h>
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c
-index db46193..1baea6e 100644
---- a/dlls/msxml3/entityref.c
-+++ b/dlls/msxml3/entityref.c
-@@ -23,6 +23,11 @@
- #include "config.h"
- 
- #include <stdarg.h>
-+#ifdef HAVE_LIBXML2
-+# include <libxml/parser.h>
-+# include <libxml/xmlerror.h>
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c
-index 3fd229c..45df9f0 100644
---- a/dlls/msxml3/factory.c
-+++ b/dlls/msxml3/factory.c
-@@ -24,6 +24,11 @@
- #include "config.h"
- 
- #include <stdarg.h>
-+#ifdef HAVE_LIBXML2
-+# include <libxml/parser.h>
-+# include <libxml/xmlerror.h>
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c
-index 4585484..be1a5f7 100644
---- a/dlls/msxml3/httprequest.c
-+++ b/dlls/msxml3/httprequest.c
-@@ -22,6 +22,12 @@
- #include "config.h"
- 
- #include <stdarg.h>
-+#ifdef HAVE_LIBXML2
-+# include <libxml/parser.h>
-+# include <libxml/xmlerror.h>
-+# include <libxml/encoding.h>
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c
-index 60b0cbd..47a89b1 100644
---- a/dlls/msxml3/main.c
-+++ b/dlls/msxml3/main.c
-@@ -25,6 +25,21 @@
- #define COBJMACROS
- 
- #include <stdarg.h>
-+#ifdef HAVE_LIBXML2
-+# include <libxml/parser.h>
-+# include <libxml/xmlerror.h>
-+# ifdef SONAME_LIBXSLT
-+#  ifdef HAVE_LIBXSLT_PATTERN_H
-+#   include <libxslt/pattern.h>
-+#  endif
-+#  ifdef HAVE_LIBXSLT_TRANSFORM_H
-+#   include <libxslt/transform.h>
-+#  endif
-+#  include <libxslt/xsltutils.h>
-+#  include <libxslt/xsltInternals.h>
-+# endif
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h
-index e0279f1..e1fbb59 100644
---- a/dlls/msxml3/msxml_private.h
-+++ b/dlls/msxml3/msxml_private.h
-@@ -102,10 +102,6 @@ BOOL dispex_query_interface(DispatchEx*,REFIID,void**);
- 
- #ifdef HAVE_LIBXML2
- 
--#ifdef HAVE_LIBXML_PARSER_H
--#include <libxml/parser.h>
--#endif
--
- /* constructors */
- extern IUnknown         *create_domdoc( xmlNodePtr document );
- extern IUnknown         *create_xmldoc( void );
-@@ -184,25 +180,6 @@ static inline BSTR bstr_from_xmlChar(const xmlChar *str)
- 
- #endif
- 
--void* libxslt_handle;
--#ifdef SONAME_LIBXSLT
--# ifdef HAVE_LIBXSLT_PATTERN_H
--#  include <libxslt/pattern.h>
--# endif
--# ifdef HAVE_LIBXSLT_TRANSFORM_H
--#  include <libxslt/transform.h>
--# endif
--# include <libxslt/xsltutils.h>
--# include <libxslt/xsltInternals.h>
--
--# define MAKE_FUNCPTR(f) extern typeof(f) * p##f
--MAKE_FUNCPTR(xsltApplyStylesheet);
--MAKE_FUNCPTR(xsltCleanupGlobals);
--MAKE_FUNCPTR(xsltFreeStylesheet);
--MAKE_FUNCPTR(xsltParseStylesheetDoc);
--# undef MAKE_FUNCPTR
--#endif
--
- extern IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR srcText,
-                                              LONG line, LONG linepos, LONG filepos );
- extern HRESULT DOMDocument_create( IUnknown *pUnkOuter, LPVOID *ppObj );
-diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c
-index bbdcb5d..2980566 100644
---- a/dlls/msxml3/node.c
-+++ b/dlls/msxml3/node.c
-@@ -24,6 +24,23 @@
- 
- #include <stdarg.h>
- #include <assert.h>
-+
-+#ifdef HAVE_LIBXML2
-+# include <libxml/parser.h>
-+# include <libxml/xmlerror.h>
-+# include <libxml/HTMLtree.h>
-+# ifdef SONAME_LIBXSLT
-+#  ifdef HAVE_LIBXSLT_PATTERN_H
-+#   include <libxslt/pattern.h>
-+#  endif
-+#  ifdef HAVE_LIBXSLT_TRANSFORM_H
-+#   include <libxslt/transform.h>
-+#  endif
-+#  include <libxslt/xsltutils.h>
-+#  include <libxslt/xsltInternals.h>
-+# endif
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-@@ -33,16 +50,22 @@
- 
- #include "msxml_private.h"
- 
--#ifdef HAVE_LIBXML2
--# include <libxml/HTMLtree.h>
--#endif
--
- #include "wine/debug.h"
- 
- WINE_DEFAULT_DEBUG_CHANNEL(msxml);
- 
- #ifdef HAVE_LIBXML2
- 
-+#ifdef SONAME_LIBXSLT
-+extern void* libxslt_handle;
-+# define MAKE_FUNCPTR(f) extern typeof(f) * p##f
-+MAKE_FUNCPTR(xsltApplyStylesheet);
-+MAKE_FUNCPTR(xsltCleanupGlobals);
-+MAKE_FUNCPTR(xsltFreeStylesheet);
-+MAKE_FUNCPTR(xsltParseStylesheetDoc);
-+# undef MAKE_FUNCPTR
-+#endif
-+
- static const WCHAR szBinBase64[]  = {'b','i','n','.','b','a','s','e','6','4',0};
- static const WCHAR szString[]     = {'s','t','r','i','n','g',0};
- static const WCHAR szNumber[]     = {'n','u','m','b','e','r',0};
-diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c
-index f643c5e..4b2bba9 100644
---- a/dlls/msxml3/nodelist.c
-+++ b/dlls/msxml3/nodelist.c
-@@ -23,6 +23,11 @@
- #include "config.h"
- 
- #include <stdarg.h>
-+#ifdef HAVE_LIBXML2
-+# include <libxml/parser.h>
-+# include <libxml/xmlerror.h>
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c
-index 7d23ec8..d3d9c38 100644
---- a/dlls/msxml3/nodemap.c
-+++ b/dlls/msxml3/nodemap.c
-@@ -23,6 +23,11 @@
- #define COBJMACROS
- 
- #include <stdarg.h>
-+#ifdef HAVE_LIBXML2
-+# include <libxml/parser.h>
-+# include <libxml/xmlerror.h>
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c
-index 4b0dc57..89f14ca 100644
---- a/dlls/msxml3/parseerror.c
-+++ b/dlls/msxml3/parseerror.c
-@@ -25,6 +25,11 @@
- 
- #include <stdarg.h>
- #include <assert.h>
-+#ifdef HAVE_LIBXML2
-+# include <libxml/parser.h>
-+# include <libxml/xmlerror.h>
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winerror.h"
-diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c
-index 0baefe4..3ebc1bf 100644
---- a/dlls/msxml3/pi.c
-+++ b/dlls/msxml3/pi.c
-@@ -23,6 +23,11 @@
- #include "config.h"
- 
- #include <stdarg.h>
-+#ifdef HAVE_LIBXML2
-+# include <libxml/parser.h>
-+# include <libxml/xmlerror.h>
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c
-index 2c6f23e..8613b20 100644
---- a/dlls/msxml3/queryresult.c
-+++ b/dlls/msxml3/queryresult.c
-@@ -24,6 +24,13 @@
- #include "config.h"
- 
- #include <stdarg.h>
-+#ifdef HAVE_LIBXML2
-+# include <libxml/parser.h>
-+# include <libxml/xmlerror.h>
-+# include <libxml/xpath.h>
-+# include <libxml/xpathInternals.h>
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-@@ -48,8 +55,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml);
- 
- #ifdef HAVE_LIBXML2
- 
--#include <libxml/xpath.h>
--
- typedef struct _queryresult
- {
-     DispatchEx dispex;
-diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c
-index 415e5af..864d61e 100644
---- a/dlls/msxml3/regsvr.c
-+++ b/dlls/msxml3/regsvr.c
-@@ -24,6 +24,10 @@
- 
- #include <stdarg.h>
- #include <string.h>
-+#ifdef HAVE_LIBXML2
-+# include <libxml/parser.h>
-+# include <libxml/xmlerror.h>
-+#endif
- 
- #define COBJMACROS
- 
-diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c
-index eca9f1d..f2d340e 100644
---- a/dlls/msxml3/saxreader.c
-+++ b/dlls/msxml3/saxreader.c
-@@ -24,6 +24,13 @@
- 
- #include <stdarg.h>
- #include <assert.h>
-+#ifdef HAVE_LIBXML2
-+# include <libxml/parser.h>
-+# include <libxml/xmlerror.h>
-+# include <libxml/SAX2.h>
-+# include <libxml/parserInternals.h>
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-@@ -43,9 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml);
- 
- #ifdef HAVE_LIBXML2
- 
--#include <libxml/SAX2.h>
--#include <libxml/parserInternals.h>
--
- typedef struct _saxreader
- {
-     const struct IVBSAXXMLReaderVtbl *lpVBSAXXMLReaderVtbl;
-diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c
-index 72d7854..c1465c0 100644
---- a/dlls/msxml3/schema.c
-+++ b/dlls/msxml3/schema.c
-@@ -23,6 +23,18 @@
- #include "config.h"
- 
- #include <stdarg.h>
-+#ifdef HAVE_LIBXML2
-+# include <libxml/parser.h>
-+# include <libxml/xmlerror.h>
-+# include <libxml/tree.h>
-+# include <libxml/xmlschemas.h>
-+# include <libxml/schemasInternals.h>
-+# include <libxml/hash.h>
-+# include <libxml/parser.h>
-+# include <libxml/parserInternals.h>
-+# include <libxml/xmlIO.h>
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c
-index fdcb06b..72b2ffd 100644
---- a/dlls/msxml3/text.c
-+++ b/dlls/msxml3/text.c
-@@ -24,6 +24,11 @@
- #include "config.h"
- 
- #include <stdarg.h>
-+#ifdef HAVE_LIBXML2
-+# include <libxml/parser.h>
-+# include <libxml/xmlerror.h>
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c
-index d1a010f..0d1006e 100644
---- a/dlls/msxml3/xmldoc.c
-+++ b/dlls/msxml3/xmldoc.c
-@@ -23,6 +23,11 @@
- #include "config.h"
- 
- #include <stdarg.h>
-+#ifdef HAVE_LIBXML2
-+# include <libxml/parser.h>
-+# include <libxml/xmlerror.h>
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
-diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c
-index a71b18b..a818d14 100644
---- a/dlls/msxml3/xmlelem.c
-+++ b/dlls/msxml3/xmlelem.c
-@@ -23,6 +23,11 @@
- #include "config.h"
- 
- #include <stdarg.h>
-+#ifdef HAVE_LIBXML2
-+# include <libxml/parser.h>
-+# include <libxml/xmlerror.h>
-+#endif
-+
- #include "windef.h"
- #include "winbase.h"
- #include "winuser.h"
--- 
-1.7.8.3
-
diff --git a/app-emulation/wine/files/wine-1.5.23-winebuild-CCAS.patch b/app-emulation/wine/files/wine-1.5.23-winebuild-CCAS.patch
deleted file mode 100644
index 3971ddd362c9..000000000000
--- a/app-emulation/wine/files/wine-1.5.23-winebuild-CCAS.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From 57c57e9dfae50f045503ae9f3107fa3748512483 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 3 Feb 2013 19:19:36 -0500
-Subject: [PATCH] winebuild: Use $CCAS to assemble if found
-
-Commit c14bdaf1 made winebuild use Clang to assemble if found.
-
-However, just because a user has some version of Clang installed, it
-does not mean that she wants to use Clang to assemble Wine. For example,
-a user who has both Clang and GAS installed may want to use GAS to avoid
-textrels (see https://bugs.gentoo.org/show_bug.cgi?id=455308).
-
-This patch allows the user to override which assembler gets used by
-exporting CCAS at Wine configure time; the name CCAS was chosen for
-compatibility with automake's standard AM_PROG_AS macro.
----
- configure                   | 106 ++++++++++++++++++++++++++++++++++++++++++++
- configure.ac                |   4 ++
- tools/winebuild/Makefile.in |   5 ++-
- tools/winebuild/utils.c     |  12 +++++
- 4 files changed, 126 insertions(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index e3253ee..d0b7777 100755
---- a/configure
-+++ b/configure
-@@ -732,6 +732,8 @@ FLEX
- TOOLSDIR
- WOW64_DISABLE
- TARGETFLAGS
-+ac_ct_CCAS
-+CCAS
- CPPBIN
- ac_ct_CXX
- CXXFLAGS
-@@ -861,6 +863,7 @@ CPPFLAGS
- CXX
- CXXFLAGS
- CCC
-+CCAS
- CPP
- XMKMF'
- 
-@@ -1549,6 +1552,7 @@ Some influential environment variables:
-               you have headers in a nonstandard directory <include dir>
-   CXX         C++ compiler command
-   CXXFLAGS    C++ compiler flags
-+  CCAS        Assembler command
-   CPP         C preprocessor
-   XMKMF       Path to xmkmf, Makefile generator for X Window System
- 
-@@ -4075,6 +4079,108 @@ cat >>confdefs.h <<_ACEOF
- _ACEOF
- 
- 
-+
-+if test -n "$ac_tool_prefix"; then
-+  for ac_prog in clang gas as
-+  do
-+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_prog_CCAS+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CCAS"; then
-+  ac_cv_prog_CCAS="$CCAS" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_CCAS="$ac_tool_prefix$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CCAS=$ac_cv_prog_CCAS
-+if test -n "$CCAS"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CCAS" >&5
-+$as_echo "$CCAS" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+    test -n "$CCAS" && break
-+  done
-+fi
-+if test -z "$CCAS"; then
-+  ac_ct_CCAS=$CCAS
-+  for ac_prog in clang gas as
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_prog_ac_ct_CCAS+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_CCAS"; then
-+  ac_cv_prog_ac_ct_CCAS="$ac_ct_CCAS" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_ac_ct_CCAS="$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_CCAS=$ac_cv_prog_ac_ct_CCAS
-+if test -n "$ac_ct_CCAS"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CCAS" >&5
-+$as_echo "$ac_ct_CCAS" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  test -n "$ac_ct_CCAS" && break
-+done
-+
-+  if test "x$ac_ct_CCAS" = x; then
-+    CCAS=""$CC""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CCAS=$ac_ct_CCAS
-+  fi
-+fi
-+
-+
- case $host in
-   *-darwin*)
-     if test "x$enable_win64" = "xyes"
-diff --git a/configure.ac b/configure.ac
-index c93cd08..760f325 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -126,6 +126,10 @@ dnl We can't use AC_PROG_CPP for winegcc, it uses by default $(CC) -E
- AC_CHECK_TOOL(CPPBIN,cpp,cpp)
- AC_DEFINE_UNQUOTED(EXEEXT,["$ac_exeext"],[Define to the file extension for executables.])
- 
-+dnl Analogous to AM_PROG_AS
-+AC_ARG_VAR([CCAS],[Assembler command])
-+AC_CHECK_TOOLS(CCAS,[clang gas as],["$CC"])
-+
- case $host in
-   *-darwin*)
-     if test "x$enable_win64" = "xyes"
-diff --git a/tools/winebuild/Makefile.in b/tools/winebuild/Makefile.in
-index 2017129..3fe47a3 100644
---- a/tools/winebuild/Makefile.in
-+++ b/tools/winebuild/Makefile.in
-@@ -1,4 +1,7 @@
--DEFS      = -D__WINESRC__ $(EXTRADEFS)
-+DEFS      = \
-+	-DCCAS="\"@CCAS@\"" \
-+	-D__WINESRC__ \
-+	$(EXTRADEFS)
- 
- PROGRAMS = winebuild$(EXEEXT)
- MANPAGE  = winebuild.man
-diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c
-index 262ff3a..1c5f918 100644
---- a/tools/winebuild/utils.c
-+++ b/tools/winebuild/utils.c
-@@ -352,6 +352,18 @@ struct strarray *get_as_command(void)
-     static int as_is_clang = 0;
-     struct strarray *args = strarray_init();
- 
-+    if (!as_command && strlen( CCAS ))
-+    {
-+        struct stat st;
-+
-+        if (!stat( CCAS, &st ))
-+            as_command = CCAS;
-+        else
-+            as_command = find_tool( CCAS, NULL );
-+
-+        if (as_command && strstr( as_command, "clang" )) as_is_clang = 1;
-+    }
-+
-     if (!as_command)
-     {
-         as_command = find_tool( "clang", NULL );
--- 
-1.8.1.2
-
diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml
index 34b2fcd2361d..c14be1c7c846 100644
--- a/app-emulation/wine/metadata.xml
+++ b/app-emulation/wine/metadata.xml
@@ -33,7 +33,5 @@ Think of Wine as a compatibility layer for running Windows programs. Wine does n
 		http://wiki.winehq.org/NtlmAuthSetupGuide and
 		http://wiki.winehq.org/NtlmSigningAndSealing</flag>
 	<flag name='staging'>Apply unofficial Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet</flag>
-	<flag name='win32'>Build a 32bit version of Wine (won't run Win64 binaries)</flag>
-	<flag name='win64'>Build a 64bit version of Wine (won't run Win32 binaries)</flag>
 </use>
 </pkgmetadata>
diff --git a/app-emulation/wine/wine-1.2.3.ebuild b/app-emulation/wine/wine-1.2.3.ebuild
deleted file mode 100644
index b1ab41d246b7..000000000000
--- a/app-emulation/wine/wine-1.2.3.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.3.ebuild,v 1.28 2015/01/01 21:01:23 ryao Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
-	inherit git-2 autotools
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	AUTOTOOLS_AUTO_DEPEND="no"
-	inherit autotools
-	MY_P="${PN}-${PV/_/-}"
-	SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
-	KEYWORDS="-* amd64 x86 ~x86-fbsd"
-	S=${WORKDIR}/${MY_P}
-fi
-
-pulse_patches() { echo "$1"/winepulse-{0.36,0.35-configure.ac,0.38-winecfg}.patch ; }
-GV="1.0.0-x86"
-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}.cab )
-	pulseaudio? ( `pulse_patches http://art.ified.ca/downloads/winepulse` )"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm jack jpeg ldap mp3 nas ncurses openal +opengl +oss +perl png +prelink pulseaudio samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #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 )
-	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 )
-	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:= )
-	jack? ( media-sound/jack-audio-connection-kit )
-	openal? ( media-libs/openal:= )
-	dbus? ( sys-apps/dbus )
-	gnutls? ( net-libs/gnutls:= )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXcursor
-		x11-libs/libXrandr
-		x11-libs/libXi
-		x11-libs/libXxf86vm
-	)
-	xinerama? ( x11-libs/libXinerama )
-	alsa? ( media-libs/alsa-lib )
-	nas? ( media-libs/nas )
-	cups? ( net-print/cups:= )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	gsm? ( media-sound/gsm:= )
-	jpeg? ( virtual/jpeg:0= )
-	ldap? ( net-nds/openldap:= )
-	mp3? ( >=media-sound/mpg123-1.5.0 )
-	samba? ( >=net-fs/samba-3.0.25 )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:0= )
-	png? ( media-libs/libpng:0= )
-	v4l? ( media-libs/libv4l )
-	!win64? ( ${MLIB_DEPS} )
-	win32? ( ${MLIB_DEPS} )
-	xcomposite? ( x11-libs/libXcomposite )"
-DEPEND="${RDEPEND}
-	pulseaudio? ( ${AUTOTOOLS_DEPEND} )
-	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"
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use win64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
-		eerror "You need gcc-4.4+ to build 64-bit wine"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${MY_P}.tar.bz2
-	fi
-}
-
-src_prepare() {
-	local md5="$(md5sum server/protocol.def)"
-	if use pulseaudio ; then
-		EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
-		eautoreconf
-	fi
-	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
-	epatch "${FILESDIR}"/${PN}-1.2.3-msxml3-libxml2-headers.patch #397993
-	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
-	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) \
-		--without-cms \
-		$(use_with cups) \
-		$(use_with ncurses curses) \
-		--without-esd \
-		$(use_with fontconfig) \
-		$(use_with gnutls) \
-		$(use_with gphoto2 gphoto) \
-		$(use_with gsm) \
-		--without-hal \
-		$(use_with jack) \
-		$(use_with jpeg) \
-		$(use_with ldap) \
-		$(use_with mp3 mpg123) \
-		$(use_with nas) \
-		$(use_with openal) \
-		$(use_with opengl) \
-		$(use_with ssl openssl) \
-		$(use_with oss) \
-		$(use_with png) \
-		$(use_with threads pthread) \
-		$(use pulseaudio && 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}.cab
-	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
-}
-
-pkg_postinst() {
-	paxctl -psmr "${ROOT}"/usr/bin/wine{,-preloader} 2>/dev/null #255055
-}
diff --git a/app-emulation/wine/wine-1.3.28.ebuild b/app-emulation/wine/wine-1.3.28.ebuild
deleted file mode 100644
index b8fa465cda24..000000000000
--- a/app-emulation/wine/wine-1.3.28.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.28.ebuild,v 1.20 2015/01/01 21:01:23 ryao Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic multilib
-
-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.3"
-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 )
-	)"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer jpeg ldap mp3 ncurses nls openal opencl +opengl +oss +perl png +prelink samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #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 )
-	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 )
-	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:= )
-	dbus? ( sys-apps/dbus )
-	gnutls? ( net-libs/gnutls:= )
-	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXcursor
-		x11-libs/libXrandr
-		x11-libs/libXi
-		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:0= )
-	ldap? ( net-nds/openldap:= )
-	mp3? ( >=media-sound/mpg123-1.5.0 )
-	nls? ( sys-devel/gettext )
-	samba? ( >=net-fs/samba-3.0.25 )
-	xml? ( dev-libs/libxml2 dev-libs/libxslt )
-	scanner? ( media-gfx/sane-backends:= )
-	ssl? ( dev-libs/openssl:0= )
-	png? ( media-libs/libpng:0= )
-	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 )
-	prelink? ( 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 [[ ${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_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
-	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) \
-		--without-cms \
-		$(use_with cups) \
-		$(use_with ncurses curses) \
-		$(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 gettextpo) \
-		$(use_with openal) \
-		$(use_with opencl) \
-		$(use_with opengl) \
-		$(use_with ssl openssl) \
-		$(use_with oss) \
-		$(use_with png) \
-		$(use_with threads pthread) \
-		$(use_with scanner sane) \
-		$(use_enable test tests) \
-		$(use_with truetype freetype) \
-		$(use_with v4l) \
-		$(use_with X x) \
-		$(use_with xcomposite) \
-		$(use_with xinerama) \
-		$(use_with xml) \
-		$(use_with xml xslt) \
-		$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 perl ; then
-		rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
-	fi
-}
-
-pkg_postinst() {
-	paxctl -psmr "${ROOT}"/usr/bin/wine{,-preloader} 2>/dev/null #255055
-}
diff --git a/app-emulation/wine/wine-1.4.1.ebuild b/app-emulation/wine/wine-1.4.1.ebuild
deleted file mode 100644
index f366993f966f..000000000000
--- a/app-emulation/wine/wine-1.4.1.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.4.1.ebuild,v 1.15 2015/01/01 21:01:23 ryao Exp $
-
-EAPI="5"
-
-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.4"
-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 )
-	)"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer jpeg ldap mp3 ncurses nls odbc openal opencl +opengl +oss +perl png +prelink samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
-REQUIRED_USE="elibc_glibc? ( threads )" #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 )
-	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 )
-	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:0
-	)
-	gnutls? ( net-libs/gnutls:= )
-	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXcursor
-		x11-libs/libXrandr
-		x11-libs/libXi
-		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:0= )
-	ldap? ( net-nds/openldap:= )
-	mp3? ( >=media-sound/mpg123-1.5.0 )
-	nls? ( sys-devel/gettext )
-	odbc? ( dev-db/unixODBC:= )
-	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:0= )
-	png? ( media-libs/libpng:0= )
-	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 )
-	prelink? ( sys-devel/prelink )
-	virtual/pkgconfig
-	virtual/yacc
-	sys-devel/flex"
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use win64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
-		eerror "You need gcc-4.4+ to build 64-bit wine"
-		eerror
-		return 1
-	fi
-
-	if use win32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-}
-
-src_unpack() {
-	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_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) \
-		--without-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 oss) \
-		$(use_with png) \
-		$(use_with threads pthread) \
-		$(use_with scanner sane) \
-		$(use_enable test tests) \
-		$(use_with truetype freetype) \
-		$(use_with v4l) \
-		$(use_with X x) \
-		$(use_with xcomposite) \
-		$(use_with xinerama) \
-		$(use_with xml) \
-		$(use_with xml xslt) \
-		$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 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
-}