gentoo resync : 10.11.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-11-10 00:43:02 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-11-10 00:43:02 +0000
commit: a5332b59346f7cbf0fdbd148b54aa8a84aaf8190 (patch)
tree: e6d8d3589fcd01fbc3f1286185639163daa81424 /app-emulation/wine-staging
parent: fceeaf01a28ee71065cf3798b70b77d3bc4ef199 (diff)
22 files changed, 1002 insertions, 254 deletions
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 7a37ba32e64d..0b53e2edc855 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -10,6 +10,7 @@ DIST wine-2.15.tar.xz 19463720 SHA256 d82d500cbf81fb08c711d3619bd52373138a05574d
 DIST wine-2.16.tar.xz 19484716 SHA256 a561edcabecd6c44948e5b2ef11941b2ba047275240418fa2c98c1fdceda2c21 SHA512 749a36b536506c4b63ff7512e316f44503cdb0db46e38a124da86df638f3e8ff9c404b034ece5cbb95cf20c09bc46be9a38f2ee66480aa6a4f2385e2a7a7eea4 WHIRLPOOL 92ae0a427d89b24d41d4565e333cf3b7499c1dfedb6d2a204f934975c35cb589d38b4f669890c1fd6a37b9fe8f34d98be3e7d0986e9ff99516fe00a004574520
 DIST wine-2.17.tar.xz 19505528 SHA256 7edc95739043ccc55957af663fb910318283dc5d1db42cd7f0224e30acfcea69 SHA512 cb10c876e689aa601c68673aab32c0514dd174692a01bdb3afc78d5e6079b0e77f48783af2f54245f397c762da3b4e5f2c1d39d2ce7fdb3b117d338b95c24810 WHIRLPOOL 196427a68ab3b1261cb63bafd7f82b7a688ad439fa82ae3fc04b18c9da14cc8e95b827ca8ddd07124e1179c55ed0e0aba3bdcb4639b724a6dacf4952e8827e16
 DIST wine-2.18.tar.xz 19546360 SHA256 9f0931129878157d717cb39f16cd33bf49f40aac77331c93d0ad30f2ccac4f50 SHA512 61cc39fa3d2b0a0ab3c5d17579865e6aea76dd9513a4b3c45975a2d5c05f2b4ba952b97eef547131a014763c7f692a08df29bc2ebf7e4ac7e2616e6a7822ddb9 WHIRLPOOL e864dd1705c0480d3f3095aa02ab1e7bc5b41693cd6b791cdf05e636c7099562020ac3adcba6421653efdf5dbe232b5abe9071792785e008ea30dedbb63e080e
+DIST wine-2.19.tar.xz 19549464 SHA256 487131e69875ae9c2d042798f954160146e603e449c3c97981f29b42f4a66095 SHA512 83558231bdc592b1f69cfedf6c689063df7bd9fecdfafba6fb7f6a2c7fa7783973efb85a6a49305afc18b1aa268209ee5b9c0655756e05d7550468698dfa51ae WHIRLPOOL 123aec3a367e67353655d940ba2ffe9386a583afbd0961dd3f446a00b0cf82ad4ed590508e03bf2a4e60b11753f8f430e748e6614f476675423f3bdaf7089288
 DIST wine-2.2.tar.xz 18916364 SHA256 64cb57e1d8aa07f5c89ef26743b494f2d3ef9c0f4e50d3ee896a93535f7751f4 SHA512 0700868244d397c1442948716321e5ff030c667edce464570f76aa4340199489a422872aa3975bc0a57b8285c9d59fc04e223a4bde094169fc6db460acb626c4 WHIRLPOOL ffc3d357a76592651b589c6ac6608720d0258474890faf8fe3e20ac29cdd1496d569721256f9389d347bf2734a556099154fd18ef1b56f45bb46c4c15771d6ca
 DIST wine-2.3.tar.xz 18931732 SHA256 afc95c7a87cc8f0730b462c50a5dfc9c462eb02c6bf5874b4fa99946f49e067e SHA512 bea78e8468555ff9e08dedf3918da5ea82721549c43984869989bbdafeea00e454820ff9558aa29925c97a165a9b01e5cd1fd397f133833c58824984a6686171 WHIRLPOOL 1f5ec8e5c32d124277e4c71d95726d3a5337575757c3029567c77165d65fcfec2ddf33d3863b4bf55c9eff7c3582c1ec7dbd76d84ed8bbbe89dd16db6b0128c1
 DIST wine-2.4.tar.xz 18953748 SHA256 87b5df07e4781fecce2f92415a4717208ea253a20a0df8b36b9f90b69b72748e SHA512 15ae7e97dc72a8636b2c15c93803ed430fa456d673add61457cf3e479e769559c682b40949b5d38828f6681f13183e560fcb4a2eb0f0ba25e6eade46f7d3d7c0 WHIRLPOOL 558ab7b7517ad5e03366b4db974047eba776585e958a5b71bb2e93993e21bc725ea7a8bcf2a4354f34ca38c94ba99ccd15f2f8b5e4b58066bf339d3517eec56c
@@ -29,6 +30,7 @@ DIST wine-staging-2.15.tar.gz 10190900 SHA256 f2b5c43fbc185a6fd6399f4c351b83a172
 DIST wine-staging-2.16.tar.gz 10220855 SHA256 da0ef4b0eafe9cd1b9cf26a5b950088adf1308e17a0d6f4ae62516b6ee64248e SHA512 96585caf77569a31f516aefe230a8907ef91db29759f75075593b751985f294bf292a1c146d287a3f0859a6b6273560670c4bc734ef0fbecb0809574eb3f09ba WHIRLPOOL 66128c8d59593243e95d6765b9fd8ace59e85e365a5e8a41eeb17d370464005aef060ddf3d862d0a3638048fd92189860e69a3cbf7d24d3ce1e420200d4b3cf5
 DIST wine-staging-2.17.tar.gz 10211107 SHA256 f511bf3438dc418b4f667513bf1ae419255e4ee62229e9205c0c64b047222183 SHA512 b652f6a852a1382c1b8275e172b7ac7608749c34aef5c0c5387cf262bf0da8db67a77ce397d49e53f3e2a8f210a3dbea1a9b3f3feb15c7d5bad8952b6fb7b53c WHIRLPOOL c45dc5fc91bc774f9f28bb06dff959391829fafac398bef198755395afe5a65bb2d32ba3ce157607a6040481955926866ed8f0760850bfca821be8599f4d7b64
 DIST wine-staging-2.18.tar.gz 10243957 SHA256 69c75d3ca17b1c3617cd0934a9e9ad6fca37c6679900d2cb63f6981aa1026cc8 SHA512 fe18b53d4160596d134ceed392f6459e9c183381f4712add43d8422e77d7d5d89ff34a3bb3afbd7740f250d85dfda0f3501e9600a41270790ae02138ed6d7dc7 WHIRLPOOL 2dc1429a7a4f13ee01b1317f1937ef7ec6b42c3cfdd78ff78bb8273e1056751edb2ac119904ba48ab645b430f269a9361a6d42bcbb5dfb46bd15a129569d3194
+DIST wine-staging-2.19.tar.gz 10241240 SHA256 2fdb083a484708362433000f92b54a5d648df190b2ab084647c45f5624063bd2 SHA512 90916cb096bbfec35514eff4c1b6e2090b6e68e3e7af1164715f5abb1d255c5cfd6411f53c27cb277adcf0982fa6d6e508a7cdbc1404dcca6c2700b05c2c5483 WHIRLPOOL 3ed1a5d39d0ec186538e04ca09e4fa2729f356385523177b753e7c7183416f666f336bec7d4b606f29266cd227cf5e72f707c79adf510bc3899adb76ce3df84f
 DIST wine-staging-2.2.tar.gz 10078327 SHA256 9d3cbf7e5f12c623d275457b910a158e0b176fcf50c09a5f8425864de604bc1d SHA512 8ad3f8ba4c6439a9ec4884a55018a67c9e2c2384830074646aac7b70cb9f4f5a20f760247ab42dc3d2f697cdac7ea5322be8ed12c435cb0bc185ac08fdd4dd91 WHIRLPOOL a34c19aaace64307de56d935cb0cef17d7c066c39b83c51e70ea76a20083f928bea55fe38d62b7a8250b0a9e8f00e0d2b744f43fcab433069ffb96625d955303
 DIST wine-staging-2.3.tar.gz 10071742 SHA256 9a81be606836fab6203857f7937ff97575947f75d52c80fb5489418efb8b87e1 SHA512 8e8af1e36cc69c63ec3542f0ec4db18b6d8c16b5c9077eb211297f3a886519da71bcf72934bf8d6d72e44c7c9f765e1d00203d0d75cab8544f69f9b0c10a7133 WHIRLPOOL 50738a6e20890748d7eb01152244d34b259759f61b3587ba39815dc066fc8e2b66ce182e1ddbc912f50076a3599aa060ec6a94eeaab4513ce3a776711929b9b1
 DIST wine-staging-2.4.tar.gz 10067020 SHA256 709cab12c0ebf7cf9504fd4a67eb851272309e00066ad81f184b0f55c63e9deb SHA512 55d11851697836b582ba54696cadc812ef6b14872440f5c3ed6fbe30a05abcb8abe2ab31a11ea4daeb354854c7c0e6549401d4b26b26621808bdeb89aeb206f9 WHIRLPOOL 8d344b7e6e89322c8dbbe6fd211851c90a45a33b514c182609cc60dc21939f791abc71d8665cd66e5c5161f159fe24c4772b99405833e3d11985a644e1335eaf
@@ -37,24 +39,25 @@ DIST wine-staging-2.6.tar.gz 10034709 SHA256 ff86ddcceb7f6857bd415db3842ddf216a5
 DIST wine-staging-2.7.tar.gz 10018082 SHA256 3095f9c634f00b143c2407dce8c3f29c629ec95074cf14c8e8dc2e0cdba45b6d SHA512 0abc89af701ae1b95c0eb08e72894c7bc40bdfe792e05b8af9282eab8407bb90b7dfcd4eb3a193a88759ce5d6ea6c2aa9696cac2d744f543c92529bb0d2636ee WHIRLPOOL 6cc666f702ef1bd574ede54a7f6755e07d768c9fa549b9bdb9b5416288619347e0c1b9c70893b6300800d8e6c94e8d2396937f639d1e821945ba9fe144b32c95
 DIST wine-staging-2.8.tar.gz 10043842 SHA256 8680614be6c3b01c7c577eb6924fc05cc3de92394384939dd5b2e12e08235fff SHA512 af1707fe3119664a0d97d94fc4c955612d80cb76eae8c4248a268c0f6be9e659fccf7c26899c9e9ae5822f74474c0db5283b598dd4d9d69a3b108f947653217a WHIRLPOOL 7e9aa61a7666404475abb442304e63c76c2e6df26479711b7c08ebe7c15b9b53017e7a1d2dca4f9f8aeba78290df03f06076c99ac06c30d5ed893cfc3842107a
 DIST wine-staging-2.9.tar.gz 10062408 SHA256 cde0895142c0ca0be5b532560ec0546d6e4f655615572d80cfcce663f92c57f6 SHA512 7862a403817791c54c5c1b8f233b06a850500305c46283bccb9026fb6db041a8fba619d145ab21fe2fdc5f25ed3bbb75fde05245fbbbd67139a5f64b547b1196 WHIRLPOOL 52c0b9065cfa54f6b86b74f9a98c9d232e3a88aa9d61d06c6e01044122fab8b01a567e99f93014042031e9eb991fd9234c4a02ebe3d2aa8c042e5e769269095c
-EBUILD wine-staging-2.0-r1.ebuild 19983 SHA256 c9d8a2e794b3c0640c1ba5c7586af532a20bd988456c848eda9af862b54b30e5 SHA512 86966519d6944d7bc32cc7984cacf0c0a885c9dcde629e8ccef76a31a1dc13acfa25fb8cf2f7c6253c1f222f3f4506040f4b8ecaf6ea46a07b12c9afb45170a7 WHIRLPOOL 0ce90e8d5136ba399a5fe72a1c55659621ecc848838c643d17028eede77dbeeb4c73aea3308108fb8a866135619d638d5d09fb76353c197e1223e078bbc749e3
-EBUILD wine-staging-2.1-r1.ebuild 19982 SHA256 e33c8f8e5d60b7addb4d4a4be6ab72594953f6cd912432f484128a603fd1ab11 SHA512 a52d95f7bb9515a061c079f3c1be7f867574be9399c99b7d48312bb718a01c050cd79dc5c1baf3a7ab99aedd63d6c23c19cc698d245687cdda27685ddf84ef0a WHIRLPOOL a138efdf7731e635feefb0d70e99475255dff2642dcff847907c2fc0421af0025c3c81f8aba8ef415b81250bbc37ee4b5eb0259845919150f097f43a9caaf20c
-EBUILD wine-staging-2.10-r1.ebuild 19982 SHA256 17f8bce5e24aa140bbab385666fcddc562a585d12abdfce16ecc5065a0d57b6e SHA512 5d1fd68c6873b4e30a596be0509977e11513426bc4c3f942e1544fb628a43cefb52348bafb9573952a7989371581ee104acb67ecf99306d91ff8d55d81614e9c WHIRLPOOL 32f7760267d2aae8f7663de860d272ac9c1749170092168fb526358acc1b111d956ab31099e1b0b4a9dad81a93f571ec0b3bf09627b04c3942afd6969366b6e1
-EBUILD wine-staging-2.11-r1.ebuild 19982 SHA256 17f8bce5e24aa140bbab385666fcddc562a585d12abdfce16ecc5065a0d57b6e SHA512 5d1fd68c6873b4e30a596be0509977e11513426bc4c3f942e1544fb628a43cefb52348bafb9573952a7989371581ee104acb67ecf99306d91ff8d55d81614e9c WHIRLPOOL 32f7760267d2aae8f7663de860d272ac9c1749170092168fb526358acc1b111d956ab31099e1b0b4a9dad81a93f571ec0b3bf09627b04c3942afd6969366b6e1
-EBUILD wine-staging-2.12-r1.ebuild 19982 SHA256 17f8bce5e24aa140bbab385666fcddc562a585d12abdfce16ecc5065a0d57b6e SHA512 5d1fd68c6873b4e30a596be0509977e11513426bc4c3f942e1544fb628a43cefb52348bafb9573952a7989371581ee104acb67ecf99306d91ff8d55d81614e9c WHIRLPOOL 32f7760267d2aae8f7663de860d272ac9c1749170092168fb526358acc1b111d956ab31099e1b0b4a9dad81a93f571ec0b3bf09627b04c3942afd6969366b6e1
-EBUILD wine-staging-2.13-r1.ebuild 19982 SHA256 17f8bce5e24aa140bbab385666fcddc562a585d12abdfce16ecc5065a0d57b6e SHA512 5d1fd68c6873b4e30a596be0509977e11513426bc4c3f942e1544fb628a43cefb52348bafb9573952a7989371581ee104acb67ecf99306d91ff8d55d81614e9c WHIRLPOOL 32f7760267d2aae8f7663de860d272ac9c1749170092168fb526358acc1b111d956ab31099e1b0b4a9dad81a93f571ec0b3bf09627b04c3942afd6969366b6e1
-EBUILD wine-staging-2.14-r1.ebuild 19982 SHA256 7866a109eab8da015f1f3d44c67a61d145815b89143fee4dfce041dbc899d335 SHA512 940cb4906a24edadf552d1f3bbdecd79881374a5740ed7c082aa23c04e1519420a7f3375e285d56beb3cbab6bbaf6450240d096d305b1416856b17c3970ce638 WHIRLPOOL 44a5e60f344eaac880a37624dd9201086b8df1452cfac88431b6c8a595501a6dd326fa7a7016229570c1d2657f9adb4074acb4053cc466e24f969d262670615c
-EBUILD wine-staging-2.15-r1.ebuild 19982 SHA256 7866a109eab8da015f1f3d44c67a61d145815b89143fee4dfce041dbc899d335 SHA512 940cb4906a24edadf552d1f3bbdecd79881374a5740ed7c082aa23c04e1519420a7f3375e285d56beb3cbab6bbaf6450240d096d305b1416856b17c3970ce638 WHIRLPOOL 44a5e60f344eaac880a37624dd9201086b8df1452cfac88431b6c8a595501a6dd326fa7a7016229570c1d2657f9adb4074acb4053cc466e24f969d262670615c
-EBUILD wine-staging-2.16-r1.ebuild 19982 SHA256 7866a109eab8da015f1f3d44c67a61d145815b89143fee4dfce041dbc899d335 SHA512 940cb4906a24edadf552d1f3bbdecd79881374a5740ed7c082aa23c04e1519420a7f3375e285d56beb3cbab6bbaf6450240d096d305b1416856b17c3970ce638 WHIRLPOOL 44a5e60f344eaac880a37624dd9201086b8df1452cfac88431b6c8a595501a6dd326fa7a7016229570c1d2657f9adb4074acb4053cc466e24f969d262670615c
-EBUILD wine-staging-2.17-r1.ebuild 19982 SHA256 7866a109eab8da015f1f3d44c67a61d145815b89143fee4dfce041dbc899d335 SHA512 940cb4906a24edadf552d1f3bbdecd79881374a5740ed7c082aa23c04e1519420a7f3375e285d56beb3cbab6bbaf6450240d096d305b1416856b17c3970ce638 WHIRLPOOL 44a5e60f344eaac880a37624dd9201086b8df1452cfac88431b6c8a595501a6dd326fa7a7016229570c1d2657f9adb4074acb4053cc466e24f969d262670615c
-EBUILD wine-staging-2.18.ebuild 19790 SHA256 cda795f03527229a2f2be75c85f785f250c97c9ecfe82ef86b83d14401313db0 SHA512 86e3bf6fba538cf5f36f25cf892dc449fd24963256099e2a1cb2f4f8b61de1bc15c823ddd07686fc718c98b57d8baa3b0342bd1a33eee9dfbfdf7951f7fce5ae WHIRLPOOL 0d773a4b627819e99ce22ea66f36acbb554f52b3c005c852853b418eecdb754f8f4fa28e67738cc62f7c7395da504bf6a8507822a0bc32a7c3240373e6673eb9
-EBUILD wine-staging-2.2-r1.ebuild 19982 SHA256 e33c8f8e5d60b7addb4d4a4be6ab72594953f6cd912432f484128a603fd1ab11 SHA512 a52d95f7bb9515a061c079f3c1be7f867574be9399c99b7d48312bb718a01c050cd79dc5c1baf3a7ab99aedd63d6c23c19cc698d245687cdda27685ddf84ef0a WHIRLPOOL a138efdf7731e635feefb0d70e99475255dff2642dcff847907c2fc0421af0025c3c81f8aba8ef415b81250bbc37ee4b5eb0259845919150f097f43a9caaf20c
-EBUILD wine-staging-2.3-r1.ebuild 19982 SHA256 e33c8f8e5d60b7addb4d4a4be6ab72594953f6cd912432f484128a603fd1ab11 SHA512 a52d95f7bb9515a061c079f3c1be7f867574be9399c99b7d48312bb718a01c050cd79dc5c1baf3a7ab99aedd63d6c23c19cc698d245687cdda27685ddf84ef0a WHIRLPOOL a138efdf7731e635feefb0d70e99475255dff2642dcff847907c2fc0421af0025c3c81f8aba8ef415b81250bbc37ee4b5eb0259845919150f097f43a9caaf20c
-EBUILD wine-staging-2.4-r1.ebuild 19982 SHA256 17f8bce5e24aa140bbab385666fcddc562a585d12abdfce16ecc5065a0d57b6e SHA512 5d1fd68c6873b4e30a596be0509977e11513426bc4c3f942e1544fb628a43cefb52348bafb9573952a7989371581ee104acb67ecf99306d91ff8d55d81614e9c WHIRLPOOL 32f7760267d2aae8f7663de860d272ac9c1749170092168fb526358acc1b111d956ab31099e1b0b4a9dad81a93f571ec0b3bf09627b04c3942afd6969366b6e1
-EBUILD wine-staging-2.5-r1.ebuild 19982 SHA256 17f8bce5e24aa140bbab385666fcddc562a585d12abdfce16ecc5065a0d57b6e SHA512 5d1fd68c6873b4e30a596be0509977e11513426bc4c3f942e1544fb628a43cefb52348bafb9573952a7989371581ee104acb67ecf99306d91ff8d55d81614e9c WHIRLPOOL 32f7760267d2aae8f7663de860d272ac9c1749170092168fb526358acc1b111d956ab31099e1b0b4a9dad81a93f571ec0b3bf09627b04c3942afd6969366b6e1
-EBUILD wine-staging-2.6-r1.ebuild 19982 SHA256 17f8bce5e24aa140bbab385666fcddc562a585d12abdfce16ecc5065a0d57b6e SHA512 5d1fd68c6873b4e30a596be0509977e11513426bc4c3f942e1544fb628a43cefb52348bafb9573952a7989371581ee104acb67ecf99306d91ff8d55d81614e9c WHIRLPOOL 32f7760267d2aae8f7663de860d272ac9c1749170092168fb526358acc1b111d956ab31099e1b0b4a9dad81a93f571ec0b3bf09627b04c3942afd6969366b6e1
-EBUILD wine-staging-2.7-r1.ebuild 19982 SHA256 17f8bce5e24aa140bbab385666fcddc562a585d12abdfce16ecc5065a0d57b6e SHA512 5d1fd68c6873b4e30a596be0509977e11513426bc4c3f942e1544fb628a43cefb52348bafb9573952a7989371581ee104acb67ecf99306d91ff8d55d81614e9c WHIRLPOOL 32f7760267d2aae8f7663de860d272ac9c1749170092168fb526358acc1b111d956ab31099e1b0b4a9dad81a93f571ec0b3bf09627b04c3942afd6969366b6e1
-EBUILD wine-staging-2.8-r1.ebuild 19982 SHA256 17f8bce5e24aa140bbab385666fcddc562a585d12abdfce16ecc5065a0d57b6e SHA512 5d1fd68c6873b4e30a596be0509977e11513426bc4c3f942e1544fb628a43cefb52348bafb9573952a7989371581ee104acb67ecf99306d91ff8d55d81614e9c WHIRLPOOL 32f7760267d2aae8f7663de860d272ac9c1749170092168fb526358acc1b111d956ab31099e1b0b4a9dad81a93f571ec0b3bf09627b04c3942afd6969366b6e1
-EBUILD wine-staging-2.9-r1.ebuild 19982 SHA256 17f8bce5e24aa140bbab385666fcddc562a585d12abdfce16ecc5065a0d57b6e SHA512 5d1fd68c6873b4e30a596be0509977e11513426bc4c3f942e1544fb628a43cefb52348bafb9573952a7989371581ee104acb67ecf99306d91ff8d55d81614e9c WHIRLPOOL 32f7760267d2aae8f7663de860d272ac9c1749170092168fb526358acc1b111d956ab31099e1b0b4a9dad81a93f571ec0b3bf09627b04c3942afd6969366b6e1
-EBUILD wine-staging-9999.ebuild 19790 SHA256 cda795f03527229a2f2be75c85f785f250c97c9ecfe82ef86b83d14401313db0 SHA512 86e3bf6fba538cf5f36f25cf892dc449fd24963256099e2a1cb2f4f8b61de1bc15c823ddd07686fc718c98b57d8baa3b0342bd1a33eee9dfbfdf7951f7fce5ae WHIRLPOOL 0d773a4b627819e99ce22ea66f36acbb554f52b3c005c852853b418eecdb754f8f4fa28e67738cc62f7c7395da504bf6a8507822a0bc32a7c3240373e6673eb9
+EBUILD wine-staging-2.0-r1.ebuild 20089 SHA256 069f85b408ae7121e82714dfa6a0d50e0d78ed12bfcdbddde7c8e5f49cb21857 SHA512 9339464de99f783e23bf3ac0e7af811cad51f3d30e5060abd60244b0f859645910fa76b1ef29f0129c87f57dd0a5ad54ba067b3a8ab91501309a4e7a7fd6f790 WHIRLPOOL 88f2d030f8bd8f3170509955da37cd23ed16a2e575c7618e97fd3e5bce670e1bb798d4a6f6c5587d56949f7035675cc9e4665a8541cc916ec9c2479bcd13cc9c
+EBUILD wine-staging-2.1-r1.ebuild 20088 SHA256 a6c8dae23ed0754b5217497bacd522067c98db77047769e5e126165726f54a63 SHA512 b7bf86d5a1b9a3b311d1336da744a6106569d0a56d6d0b5d1b167f3878e5c713956b1ffa3737462239bb563b511875f3577181e0b82f60b904daa3152b2f8823 WHIRLPOOL d303a38c7407bc11ebc017519fd750d52516035ad3611a83294b2e2a2df57551f8f213c475fe2f8c73b6729884c538651140b3175ca9a0e9aa18749f8f36c460
+EBUILD wine-staging-2.10-r1.ebuild 20152 SHA256 d664c61ac1b740442b0649fe9c412b116040b62890cfccd6f7e004dddc08cd25 SHA512 8c7ee8121a9738c6b1ccf2a17c765cb117ef767659182e0d746f87eef59d1a40618d24f6bd94619079267635303bd124ccab68857410260eebdd9eeca605a06b WHIRLPOOL dcea236785aed4e816177d0638cb97dd703f11a8a57924250a651499b5aca8f3397ce5207e9325e835eab622d5d2c1858af3ecbdf4944d1c6c8211e9e6074a0a
+EBUILD wine-staging-2.11-r1.ebuild 20152 SHA256 d664c61ac1b740442b0649fe9c412b116040b62890cfccd6f7e004dddc08cd25 SHA512 8c7ee8121a9738c6b1ccf2a17c765cb117ef767659182e0d746f87eef59d1a40618d24f6bd94619079267635303bd124ccab68857410260eebdd9eeca605a06b WHIRLPOOL dcea236785aed4e816177d0638cb97dd703f11a8a57924250a651499b5aca8f3397ce5207e9325e835eab622d5d2c1858af3ecbdf4944d1c6c8211e9e6074a0a
+EBUILD wine-staging-2.12-r1.ebuild 20152 SHA256 d664c61ac1b740442b0649fe9c412b116040b62890cfccd6f7e004dddc08cd25 SHA512 8c7ee8121a9738c6b1ccf2a17c765cb117ef767659182e0d746f87eef59d1a40618d24f6bd94619079267635303bd124ccab68857410260eebdd9eeca605a06b WHIRLPOOL dcea236785aed4e816177d0638cb97dd703f11a8a57924250a651499b5aca8f3397ce5207e9325e835eab622d5d2c1858af3ecbdf4944d1c6c8211e9e6074a0a
+EBUILD wine-staging-2.13-r1.ebuild 20152 SHA256 d664c61ac1b740442b0649fe9c412b116040b62890cfccd6f7e004dddc08cd25 SHA512 8c7ee8121a9738c6b1ccf2a17c765cb117ef767659182e0d746f87eef59d1a40618d24f6bd94619079267635303bd124ccab68857410260eebdd9eeca605a06b WHIRLPOOL dcea236785aed4e816177d0638cb97dd703f11a8a57924250a651499b5aca8f3397ce5207e9325e835eab622d5d2c1858af3ecbdf4944d1c6c8211e9e6074a0a
+EBUILD wine-staging-2.14-r1.ebuild 20152 SHA256 338eb55f59bd3c81041f31724f87b65aa1648a4c9f66b9668ad131db6ea36657 SHA512 39d12656be030af0218a3944bbf6754149cbd9dcb95545b7738ed7c467ae129eba0e0735e2516f3fa668efee423b160a961e028ee087ecd9ec8bf6292a80a6b4 WHIRLPOOL 70e74db0e7def46ce8c171256d6de7c6b0b771138557032afc715f02f0c2dc55fc9970e3a41fcd3da1fa11a2a2f4385bad866729c820bc4599ebac189c4c0910
+EBUILD wine-staging-2.15-r1.ebuild 20152 SHA256 338eb55f59bd3c81041f31724f87b65aa1648a4c9f66b9668ad131db6ea36657 SHA512 39d12656be030af0218a3944bbf6754149cbd9dcb95545b7738ed7c467ae129eba0e0735e2516f3fa668efee423b160a961e028ee087ecd9ec8bf6292a80a6b4 WHIRLPOOL 70e74db0e7def46ce8c171256d6de7c6b0b771138557032afc715f02f0c2dc55fc9970e3a41fcd3da1fa11a2a2f4385bad866729c820bc4599ebac189c4c0910
+EBUILD wine-staging-2.16-r1.ebuild 20152 SHA256 338eb55f59bd3c81041f31724f87b65aa1648a4c9f66b9668ad131db6ea36657 SHA512 39d12656be030af0218a3944bbf6754149cbd9dcb95545b7738ed7c467ae129eba0e0735e2516f3fa668efee423b160a961e028ee087ecd9ec8bf6292a80a6b4 WHIRLPOOL 70e74db0e7def46ce8c171256d6de7c6b0b771138557032afc715f02f0c2dc55fc9970e3a41fcd3da1fa11a2a2f4385bad866729c820bc4599ebac189c4c0910
+EBUILD wine-staging-2.17-r1.ebuild 20152 SHA256 338eb55f59bd3c81041f31724f87b65aa1648a4c9f66b9668ad131db6ea36657 SHA512 39d12656be030af0218a3944bbf6754149cbd9dcb95545b7738ed7c467ae129eba0e0735e2516f3fa668efee423b160a961e028ee087ecd9ec8bf6292a80a6b4 WHIRLPOOL 70e74db0e7def46ce8c171256d6de7c6b0b771138557032afc715f02f0c2dc55fc9970e3a41fcd3da1fa11a2a2f4385bad866729c820bc4599ebac189c4c0910
+EBUILD wine-staging-2.18.ebuild 19962 SHA256 c0d7627ff8b93f348fceae4688a7196a011c2e0062d2ed38994705df8495b0b7 SHA512 7cbaa98a77a0cb848585e57389de6a15f3fc7629b0b8b8e4591ed6f7b9279202e2bbe00fcd9f1c257b5d722cbfd169abb0ca52d5066c49fff4e99aaee180ab84 WHIRLPOOL ee8ee4774787038210a3059f6eb241103705c9c2848344455e42975eb7022707f0a756fdb38e259dea15eaa46746555e883f1892801e634330507c885d959143
+EBUILD wine-staging-2.19.ebuild 19962 SHA256 c0d7627ff8b93f348fceae4688a7196a011c2e0062d2ed38994705df8495b0b7 SHA512 7cbaa98a77a0cb848585e57389de6a15f3fc7629b0b8b8e4591ed6f7b9279202e2bbe00fcd9f1c257b5d722cbfd169abb0ca52d5066c49fff4e99aaee180ab84 WHIRLPOOL ee8ee4774787038210a3059f6eb241103705c9c2848344455e42975eb7022707f0a756fdb38e259dea15eaa46746555e883f1892801e634330507c885d959143
+EBUILD wine-staging-2.2-r1.ebuild 20088 SHA256 a6c8dae23ed0754b5217497bacd522067c98db77047769e5e126165726f54a63 SHA512 b7bf86d5a1b9a3b311d1336da744a6106569d0a56d6d0b5d1b167f3878e5c713956b1ffa3737462239bb563b511875f3577181e0b82f60b904daa3152b2f8823 WHIRLPOOL d303a38c7407bc11ebc017519fd750d52516035ad3611a83294b2e2a2df57551f8f213c475fe2f8c73b6729884c538651140b3175ca9a0e9aa18749f8f36c460
+EBUILD wine-staging-2.3-r1.ebuild 20088 SHA256 a6c8dae23ed0754b5217497bacd522067c98db77047769e5e126165726f54a63 SHA512 b7bf86d5a1b9a3b311d1336da744a6106569d0a56d6d0b5d1b167f3878e5c713956b1ffa3737462239bb563b511875f3577181e0b82f60b904daa3152b2f8823 WHIRLPOOL d303a38c7407bc11ebc017519fd750d52516035ad3611a83294b2e2a2df57551f8f213c475fe2f8c73b6729884c538651140b3175ca9a0e9aa18749f8f36c460
+EBUILD wine-staging-2.4-r1.ebuild 20088 SHA256 98ec66f0b6ca03a0baaaa39cdaf20b9757fb595ce448e5c5648f7cc253aa4400 SHA512 dadb02b3a648a09a04a2bc46c226ed2e57a61727fd9df891f7137308625330670dbf7c20cbb85f099eede40c8579e653af13de06f453b129c94a638e8651877a WHIRLPOOL 5df6a2e9d9aa5f66bd30a0e54342ecf593076568b6045b39d8ac404ad02926adbd6d4e5f03752b9bff8438a52db16904b8342adff1001f49d1d024dd07a339ae
+EBUILD wine-staging-2.5-r1.ebuild 20088 SHA256 98ec66f0b6ca03a0baaaa39cdaf20b9757fb595ce448e5c5648f7cc253aa4400 SHA512 dadb02b3a648a09a04a2bc46c226ed2e57a61727fd9df891f7137308625330670dbf7c20cbb85f099eede40c8579e653af13de06f453b129c94a638e8651877a WHIRLPOOL 5df6a2e9d9aa5f66bd30a0e54342ecf593076568b6045b39d8ac404ad02926adbd6d4e5f03752b9bff8438a52db16904b8342adff1001f49d1d024dd07a339ae
+EBUILD wine-staging-2.6-r1.ebuild 20088 SHA256 98ec66f0b6ca03a0baaaa39cdaf20b9757fb595ce448e5c5648f7cc253aa4400 SHA512 dadb02b3a648a09a04a2bc46c226ed2e57a61727fd9df891f7137308625330670dbf7c20cbb85f099eede40c8579e653af13de06f453b129c94a638e8651877a WHIRLPOOL 5df6a2e9d9aa5f66bd30a0e54342ecf593076568b6045b39d8ac404ad02926adbd6d4e5f03752b9bff8438a52db16904b8342adff1001f49d1d024dd07a339ae
+EBUILD wine-staging-2.7-r1.ebuild 20088 SHA256 98ec66f0b6ca03a0baaaa39cdaf20b9757fb595ce448e5c5648f7cc253aa4400 SHA512 dadb02b3a648a09a04a2bc46c226ed2e57a61727fd9df891f7137308625330670dbf7c20cbb85f099eede40c8579e653af13de06f453b129c94a638e8651877a WHIRLPOOL 5df6a2e9d9aa5f66bd30a0e54342ecf593076568b6045b39d8ac404ad02926adbd6d4e5f03752b9bff8438a52db16904b8342adff1001f49d1d024dd07a339ae
+EBUILD wine-staging-2.8-r1.ebuild 20088 SHA256 98ec66f0b6ca03a0baaaa39cdaf20b9757fb595ce448e5c5648f7cc253aa4400 SHA512 dadb02b3a648a09a04a2bc46c226ed2e57a61727fd9df891f7137308625330670dbf7c20cbb85f099eede40c8579e653af13de06f453b129c94a638e8651877a WHIRLPOOL 5df6a2e9d9aa5f66bd30a0e54342ecf593076568b6045b39d8ac404ad02926adbd6d4e5f03752b9bff8438a52db16904b8342adff1001f49d1d024dd07a339ae
+EBUILD wine-staging-2.9-r1.ebuild 20152 SHA256 d664c61ac1b740442b0649fe9c412b116040b62890cfccd6f7e004dddc08cd25 SHA512 8c7ee8121a9738c6b1ccf2a17c765cb117ef767659182e0d746f87eef59d1a40618d24f6bd94619079267635303bd124ccab68857410260eebdd9eeca605a06b WHIRLPOOL dcea236785aed4e816177d0638cb97dd703f11a8a57924250a651499b5aca8f3397ce5207e9325e835eab622d5d2c1858af3ecbdf4944d1c6c8211e9e6074a0a
+EBUILD wine-staging-9999.ebuild 19962 SHA256 c0d7627ff8b93f348fceae4688a7196a011c2e0062d2ed38994705df8495b0b7 SHA512 7cbaa98a77a0cb848585e57389de6a15f3fc7629b0b8b8e4591ed6f7b9279202e2bbe00fcd9f1c257b5d722cbfd169abb0ca52d5066c49fff4e99aaee180ab84 WHIRLPOOL ee8ee4774787038210a3059f6eb241103705c9c2848344455e42975eb7022707f0a756fdb38e259dea15eaa46746555e883f1892801e634330507c885d959143
 MISC metadata.xml 3027 SHA256 1af7a4f4f402a4e1b807a9c5380701a87161a523afd4ba28012b868227edac0a SHA512 d1c58d449c2b9ab201da4338718b724cfb7d282b22b506375a7d9531d64d601414f2ac734e5cc2cb812cc4904351cacac731456596818201cd9361bbb1393d20 WHIRLPOOL f3bd4a2f90f3fe63add81b143aa6a0002199ae7cb0e8002de195ea07141148d9b4a65ffaf26c2ad4a79a3da6f6c75236043acd4e8e8371d6754591035a028035
diff --git a/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild
index 0c4b6b962ecf..1aeafd492e5a 100644
--- a/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild
@@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
 
 # tools/make_requests requires perl
 DEPEND="${COMMON_DEPEND}
-	dev-util/patchbin
 	sys-devel/flex
 	>=sys-kernel/linux-headers-2.6
 	virtual/pkgconfig
@@ -176,6 +175,23 @@ usr/share/applications/wine-notepad.desktop
 usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"
 
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
+	"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
+	"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
+)
+PATCHES_BIN=(
+	"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
+)
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
 wine_compiler_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
@@ -347,17 +363,7 @@ src_prepare() {
 	}
 
 	local md5="$(md5sum server/protocol.def)"
-	local PATCHES=(
-		"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-		"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-		"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-		"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-		"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-		"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-	)
-	local PATCHES_BIN=(
-		"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-	)
+
 	if use staging; then
 		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
 		ewarn "Wine bugzilla should explicitly state that staging was used."
diff --git a/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild
index 04fe221e5109..1177c5533ac8 100644
--- a/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild
@@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
 
 # tools/make_requests requires perl
 DEPEND="${COMMON_DEPEND}
-	dev-util/patchbin
 	sys-devel/flex
 	>=sys-kernel/linux-headers-2.6
 	virtual/pkgconfig
@@ -176,6 +175,23 @@ usr/share/applications/wine-notepad.desktop
 usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"
 
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
+	"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
+	"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
+)
+PATCHES_BIN=(
+	"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
+)
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
 wine_compiler_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
@@ -347,17 +363,7 @@ src_prepare() {
 	}
 
 	local md5="$(md5sum server/protocol.def)"
-	local PATCHES=(
-		"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-		"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-		"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-		"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-		"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-		"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-	)
-	local PATCHES_BIN=(
-		"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-	)
+
 	if use staging; then
 		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
 		ewarn "Wine bugzilla should explicitly state that staging was used."
diff --git a/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild
index d41fb3977fc4..b119a5cd8635 100644
--- a/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild
@@ -63,6 +63,7 @@ COMMON_DEPEND="
 	X? (
 		x11-libs/libXcursor[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
 		x11-libs/libXrandr[${MULTILIB_USEDEP}]
 		x11-libs/libXi[${MULTILIB_USEDEP}]
 		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
@@ -152,7 +153,6 @@ RDEPEND="${COMMON_DEPEND}
 
 # tools/make_requests requires perl
 DEPEND="${COMMON_DEPEND}
-	dev-util/patchbin
 	sys-devel/flex
 	>=sys-kernel/linux-headers-2.6
 	virtual/pkgconfig
@@ -176,6 +176,23 @@ usr/share/applications/wine-notepad.desktop
 usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"
 
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
+	"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
+	"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
+)
+PATCHES_BIN=(
+	"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
+)
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
 wine_compiler_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
@@ -347,17 +364,7 @@ src_prepare() {
 	}
 
 	local md5="$(md5sum server/protocol.def)"
-	local PATCHES=(
-		"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-		"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-		"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-		"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-		"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-		"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-	)
-	local PATCHES_BIN=(
-		"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-	)
+
 	if use staging; then
 		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
 		ewarn "Wine bugzilla should explicitly state that staging was used."
@@ -454,6 +461,7 @@ multilib_src_configure() {
 		$(use_with udev)
 		$(use_with v4l)
 		$(use_with X x)
+		$(use_with X xfixes)
 		$(use_with xcomposite)
 		$(use_with xinerama)
 		$(use_with xml)
diff --git a/app-emulation/wine-staging/wine-staging-2.11-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.11-r1.ebuild
index d41fb3977fc4..b119a5cd8635 100644
--- a/app-emulation/wine-staging/wine-staging-2.11-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.11-r1.ebuild
@@ -63,6 +63,7 @@ COMMON_DEPEND="
 	X? (
 		x11-libs/libXcursor[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
 		x11-libs/libXrandr[${MULTILIB_USEDEP}]
 		x11-libs/libXi[${MULTILIB_USEDEP}]
 		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
@@ -152,7 +153,6 @@ RDEPEND="${COMMON_DEPEND}
 
 # tools/make_requests requires perl
 DEPEND="${COMMON_DEPEND}
-	dev-util/patchbin
 	sys-devel/flex
 	>=sys-kernel/linux-headers-2.6
 	virtual/pkgconfig
@@ -176,6 +176,23 @@ usr/share/applications/wine-notepad.desktop
 usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"
 
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
+	"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
+	"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
+)
+PATCHES_BIN=(
+	"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
+)
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
 wine_compiler_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
@@ -347,17 +364,7 @@ src_prepare() {
 	}
 
 	local md5="$(md5sum server/protocol.def)"
-	local PATCHES=(
-		"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-		"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-		"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-		"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-		"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-		"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-	)
-	local PATCHES_BIN=(
-		"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-	)
+
 	if use staging; then
 		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
 		ewarn "Wine bugzilla should explicitly state that staging was used."
@@ -454,6 +461,7 @@ multilib_src_configure() {
 		$(use_with udev)
 		$(use_with v4l)
 		$(use_with X x)
+		$(use_with X xfixes)
 		$(use_with xcomposite)
 		$(use_with xinerama)
 		$(use_with xml)
diff --git a/app-emulation/wine-staging/wine-staging-2.12-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.12-r1.ebuild
index d41fb3977fc4..b119a5cd8635 100644
--- a/app-emulation/wine-staging/wine-staging-2.12-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.12-r1.ebuild
@@ -63,6 +63,7 @@ COMMON_DEPEND="
 	X? (
 		x11-libs/libXcursor[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
 		x11-libs/libXrandr[${MULTILIB_USEDEP}]
 		x11-libs/libXi[${MULTILIB_USEDEP}]
 		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
@@ -152,7 +153,6 @@ RDEPEND="${COMMON_DEPEND}
 
 # tools/make_requests requires perl
 DEPEND="${COMMON_DEPEND}
-	dev-util/patchbin
 	sys-devel/flex
 	>=sys-kernel/linux-headers-2.6
 	virtual/pkgconfig
@@ -176,6 +176,23 @@ usr/share/applications/wine-notepad.desktop
 usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"
 
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
+	"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
+	"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
+)
+PATCHES_BIN=(
+	"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
+)
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
 wine_compiler_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
@@ -347,17 +364,7 @@ src_prepare() {
 	}
 
 	local md5="$(md5sum server/protocol.def)"
-	local PATCHES=(
-		"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-		"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-		"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-		"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-		"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-		"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-	)
-	local PATCHES_BIN=(
-		"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-	)
+
 	if use staging; then
 		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
 		ewarn "Wine bugzilla should explicitly state that staging was used."
@@ -454,6 +461,7 @@ multilib_src_configure() {
 		$(use_with udev)
 		$(use_with v4l)
 		$(use_with X x)
+		$(use_with X xfixes)
 		$(use_with xcomposite)
 		$(use_with xinerama)
 		$(use_with xml)
diff --git a/app-emulation/wine-staging/wine-staging-2.13-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.13-r1.ebuild
index d41fb3977fc4..b119a5cd8635 100644
--- a/app-emulation/wine-staging/wine-staging-2.13-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.13-r1.ebuild
@@ -63,6 +63,7 @@ COMMON_DEPEND="
 	X? (
 		x11-libs/libXcursor[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
 		x11-libs/libXrandr[${MULTILIB_USEDEP}]
 		x11-libs/libXi[${MULTILIB_USEDEP}]
 		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
@@ -152,7 +153,6 @@ RDEPEND="${COMMON_DEPEND}
 
 # tools/make_requests requires perl
 DEPEND="${COMMON_DEPEND}
-	dev-util/patchbin
 	sys-devel/flex
 	>=sys-kernel/linux-headers-2.6
 	virtual/pkgconfig
@@ -176,6 +176,23 @@ usr/share/applications/wine-notepad.desktop
 usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"
 
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
+	"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
+	"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
+)
+PATCHES_BIN=(
+	"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
+)
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
 wine_compiler_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
@@ -347,17 +364,7 @@ src_prepare() {
 	}
 
 	local md5="$(md5sum server/protocol.def)"
-	local PATCHES=(
-		"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-		"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-		"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-		"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-		"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-		"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-	)
-	local PATCHES_BIN=(
-		"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-	)
+
 	if use staging; then
 		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
 		ewarn "Wine bugzilla should explicitly state that staging was used."
@@ -454,6 +461,7 @@ multilib_src_configure() {
 		$(use_with udev)
 		$(use_with v4l)
 		$(use_with X x)
+		$(use_with X xfixes)
 		$(use_with xcomposite)
 		$(use_with xinerama)
 		$(use_with xml)
diff --git a/app-emulation/wine-staging/wine-staging-2.14-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.14-r1.ebuild
index 72cf8da0423d..9df84ca6f8f8 100644
--- a/app-emulation/wine-staging/wine-staging-2.14-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.14-r1.ebuild
@@ -63,6 +63,7 @@ COMMON_DEPEND="
 	X? (
 		x11-libs/libXcursor[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
 		x11-libs/libXrandr[${MULTILIB_USEDEP}]
 		x11-libs/libXi[${MULTILIB_USEDEP}]
 		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
@@ -152,7 +153,6 @@ RDEPEND="${COMMON_DEPEND}
 
 # tools/make_requests requires perl
 DEPEND="${COMMON_DEPEND}
-	dev-util/patchbin
 	sys-devel/flex
 	>=sys-kernel/linux-headers-2.6
 	virtual/pkgconfig
@@ -176,6 +176,23 @@ usr/share/applications/wine-notepad.desktop
 usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"
 
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
+	"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
+	"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
+)
+PATCHES_BIN=(
+	"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
+)
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
 wine_compiler_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
@@ -347,17 +364,7 @@ src_prepare() {
 	}
 
 	local md5="$(md5sum server/protocol.def)"
-	local PATCHES=(
-		"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-		"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-		"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-		"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-		"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-		"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-	)
-	local PATCHES_BIN=(
-		"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-	)
+
 	if use staging; then
 		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
 		ewarn "Wine bugzilla should explicitly state that staging was used."
@@ -454,6 +461,7 @@ multilib_src_configure() {
 		$(use_with udev)
 		$(use_with v4l)
 		$(use_with X x)
+		$(use_with X xfixes)
 		$(use_with xcomposite)
 		$(use_with xinerama)
 		$(use_with xml)
diff --git a/app-emulation/wine-staging/wine-staging-2.15-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.15-r1.ebuild
index 72cf8da0423d..9df84ca6f8f8 100644
--- a/app-emulation/wine-staging/wine-staging-2.15-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.15-r1.ebuild
@@ -63,6 +63,7 @@ COMMON_DEPEND="
 	X? (
 		x11-libs/libXcursor[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
 		x11-libs/libXrandr[${MULTILIB_USEDEP}]
 		x11-libs/libXi[${MULTILIB_USEDEP}]
 		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
@@ -152,7 +153,6 @@ RDEPEND="${COMMON_DEPEND}
 
 # tools/make_requests requires perl
 DEPEND="${COMMON_DEPEND}
-	dev-util/patchbin
 	sys-devel/flex
 	>=sys-kernel/linux-headers-2.6
 	virtual/pkgconfig
@@ -176,6 +176,23 @@ usr/share/applications/wine-notepad.desktop
 usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"
 
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
+	"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
+	"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
+)
+PATCHES_BIN=(
+	"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
+)
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
 wine_compiler_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
@@ -347,17 +364,7 @@ src_prepare() {
 	}
 
 	local md5="$(md5sum server/protocol.def)"
-	local PATCHES=(
-		"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-		"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-		"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-		"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-		"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-		"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-	)
-	local PATCHES_BIN=(
-		"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-	)
+
 	if use staging; then
 		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
 		ewarn "Wine bugzilla should explicitly state that staging was used."
@@ -454,6 +461,7 @@ multilib_src_configure() {
 		$(use_with udev)
 		$(use_with v4l)
 		$(use_with X x)
+		$(use_with X xfixes)
 		$(use_with xcomposite)
 		$(use_with xinerama)
 		$(use_with xml)
diff --git a/app-emulation/wine-staging/wine-staging-2.16-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.16-r1.ebuild
index 72cf8da0423d..9df84ca6f8f8 100644
--- a/app-emulation/wine-staging/wine-staging-2.16-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.16-r1.ebuild
@@ -63,6 +63,7 @@ COMMON_DEPEND="
 	X? (
 		x11-libs/libXcursor[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
 		x11-libs/libXrandr[${MULTILIB_USEDEP}]
 		x11-libs/libXi[${MULTILIB_USEDEP}]
 		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
@@ -152,7 +153,6 @@ RDEPEND="${COMMON_DEPEND}
 
 # tools/make_requests requires perl
 DEPEND="${COMMON_DEPEND}
-	dev-util/patchbin
 	sys-devel/flex
 	>=sys-kernel/linux-headers-2.6
 	virtual/pkgconfig
@@ -176,6 +176,23 @@ usr/share/applications/wine-notepad.desktop
 usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"
 
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
+	"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
+	"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
+)
+PATCHES_BIN=(
+	"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
+)
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
 wine_compiler_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
@@ -347,17 +364,7 @@ src_prepare() {
 	}
 
 	local md5="$(md5sum server/protocol.def)"
-	local PATCHES=(
-		"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-		"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-		"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-		"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-		"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-		"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-	)
-	local PATCHES_BIN=(
-		"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-	)
+
 	if use staging; then
 		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
 		ewarn "Wine bugzilla should explicitly state that staging was used."
@@ -454,6 +461,7 @@ multilib_src_configure() {
 		$(use_with udev)
 		$(use_with v4l)
 		$(use_with X x)
+		$(use_with X xfixes)
 		$(use_with xcomposite)
 		$(use_with xinerama)
 		$(use_with xml)
diff --git a/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild
index 72cf8da0423d..9df84ca6f8f8 100644
--- a/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild
@@ -63,6 +63,7 @@ COMMON_DEPEND="
 	X? (
 		x11-libs/libXcursor[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
 		x11-libs/libXrandr[${MULTILIB_USEDEP}]
 		x11-libs/libXi[${MULTILIB_USEDEP}]
 		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
@@ -152,7 +153,6 @@ RDEPEND="${COMMON_DEPEND}
 
 # tools/make_requests requires perl
 DEPEND="${COMMON_DEPEND}
-	dev-util/patchbin
 	sys-devel/flex
 	>=sys-kernel/linux-headers-2.6
 	virtual/pkgconfig
@@ -176,6 +176,23 @@ usr/share/applications/wine-notepad.desktop
 usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"
 
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
+	"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
+	"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
+)
+PATCHES_BIN=(
+	"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
+)
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
 wine_compiler_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
@@ -347,17 +364,7 @@ src_prepare() {
 	}
 
 	local md5="$(md5sum server/protocol.def)"
-	local PATCHES=(
-		"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-		"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-		"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-		"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-		"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-		"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-	)
-	local PATCHES_BIN=(
-		"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-	)
+
 	if use staging; then
 		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
 		ewarn "Wine bugzilla should explicitly state that staging was used."
@@ -454,6 +461,7 @@ multilib_src_configure() {
 		$(use_with udev)
 		$(use_with v4l)
 		$(use_with X x)
+		$(use_with X xfixes)
 		$(use_with xcomposite)
 		$(use_with xinerama)
 		$(use_with xml)
diff --git a/app-emulation/wine-staging/wine-staging-2.18.ebuild b/app-emulation/wine-staging/wine-staging-2.18.ebuild
index 64f408768d4c..7fc52bbe654b 100644
--- a/app-emulation/wine-staging/wine-staging-2.18.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.18.ebuild
@@ -63,6 +63,7 @@ COMMON_DEPEND="
 	X? (
 		x11-libs/libXcursor[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
 		x11-libs/libXrandr[${MULTILIB_USEDEP}]
 		x11-libs/libXi[${MULTILIB_USEDEP}]
 		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
@@ -152,7 +153,6 @@ RDEPEND="${COMMON_DEPEND}
 
 # tools/make_requests requires perl
 DEPEND="${COMMON_DEPEND}
-	dev-util/patchbin
 	sys-devel/flex
 	>=sys-kernel/linux-headers-2.6
 	virtual/pkgconfig
@@ -176,6 +176,19 @@ usr/share/applications/wine-notepad.desktop
 usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"
 
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
 wine_compiler_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
@@ -347,14 +360,7 @@ src_prepare() {
 	}
 
 	local md5="$(md5sum server/protocol.def)"
-	local PATCHES=(
-		"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-		"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-		"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-		"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-	)
-	local PATCHES_BIN=(
-	)
+
 	if use staging; then
 		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
 		ewarn "Wine bugzilla should explicitly state that staging was used."
@@ -451,6 +457,7 @@ multilib_src_configure() {
 		$(use_with udev)
 		$(use_with v4l)
 		$(use_with X x)
+		$(use_with X xfixes)
 		$(use_with xcomposite)
 		$(use_with xinerama)
 		$(use_with xml)
diff --git a/app-emulation/wine-staging/wine-staging-2.19.ebuild b/app-emulation/wine-staging/wine-staging-2.19.ebuild
new file mode 100644
index 000000000000..7fc52bbe654b
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-2.19.ebuild
@@ -0,0 +1,605 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(get_version_component_range 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+GWP_V="20170830"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+if [[ ${PV} == "9999" ]] ; then
+	STAGING_EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging.git"
+else
+	SRC_URI="${SRC_URI}
+	staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	osmesa? ( opengl )
+	pipelight? ( staging )
+	s3tc? ( staging )
+	test? ( abi_x86_32 )
+	themes? ( staging )
+	vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-baselibs-20140508-r14
+		!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-db-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-medialibs-20140508-r6
+		!app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-opengl-20140508-r1
+		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-sdl-20140508-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-soundlibs-20140508
+		!app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-xlibs-20140508
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:4.7.1 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	prelink? ( sys-devel/prelink )
+	staging? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	xinerama? ( x11-proto/xineramaproto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; 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
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${pn_live_val} ]]; then
+		if use staging; then
+			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
+			eerror "cannot be used to set the commit. Instead, you may use the"
+			eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT."
+			eerror
+			return 1
+		fi
+	fi
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environmental variables"
+		eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+		if use staging; then
+			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
+
+			git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}"
+			git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
+
+			local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
+
+			if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
+				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
+				einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
+				einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
+			fi
+		fi
+	fi
+
+	default
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+	eapply_bin(){
+		local patch
+		for patch in ${PATCHES_BIN[@]}; do
+			patchbin --nogit < "${patch}" || die
+		done
+	}
+
+	local md5="$(md5sum server/protocol.def)"
+
+	if use staging; then
+		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
+		ewarn "Wine bugzilla should explicitly state that staging was used."
+
+		local STAGING_EXCLUDE=""
+		STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132
+		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
+		ebegin "Running Wine-Staging patch installer"
+		(
+			set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
+			cd "${STAGING_DIR}/patches"
+			source "${STAGING_DIR}/patches/patchinstall.sh"
+		)
+		eend $? || die "Failed to apply Wine-Staging patches"
+	fi
+
+	default
+	eapply_bin
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	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
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with ldap)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with v4l)
+		$(use_with X x)
+		$(use_with X xfixes)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	use staging && myconf+=(
+		--with-xattr
+		$(use_with themes gtk3)
+		$(use_with vaapi va)
+	)
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X && ! use ncurses; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+		rm_wineconsole() {
+			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+		}
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+	fi
+
+	# Failglob for bin and man loops
+	local glob_state=$(shopt -p failglob)
+	shopt -s failglob
+
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${D%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+
+	# respect LINGUAS when installing man pages, #469418
+	local l
+	for l in de fr pl; do
+		use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+	done
+
+	eval "${glob_state}"
+}
+
+pkg_postinst() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	else
+		if use staging; then
+			eselect wine register --staging ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	xdg_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${P} || die
+	else
+		if use staging; then
+			eselect wine deregister --staging ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/wine-staging/wine-staging-2.2-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.2-r1.ebuild
index 04fe221e5109..1177c5533ac8 100644
--- a/app-emulation/wine-staging/wine-staging-2.2-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.2-r1.ebuild
@@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
 
 # tools/make_requests requires perl
 DEPEND="${COMMON_DEPEND}
-	dev-util/patchbin
 	sys-devel/flex
 	>=sys-kernel/linux-headers-2.6
 	virtual/pkgconfig
@@ -176,6 +175,23 @@ usr/share/applications/wine-notepad.desktop
 usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"
 
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
+	"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
+	"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
+)
+PATCHES_BIN=(
+	"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
+)
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
 wine_compiler_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
@@ -347,17 +363,7 @@ src_prepare() {
 	}
 
 	local md5="$(md5sum server/protocol.def)"
-	local PATCHES=(
-		"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-		"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-		"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-		"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-		"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-		"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-	)
-	local PATCHES_BIN=(
-		"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-	)
+
 	if use staging; then
 		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
 		ewarn "Wine bugzilla should explicitly state that staging was used."
diff --git a/app-emulation/wine-staging/wine-staging-2.3-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.3-r1.ebuild
index 04fe221e5109..1177c5533ac8 100644
--- a/app-emulation/wine-staging/wine-staging-2.3-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.3-r1.ebuild
@@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
 
 # tools/make_requests requires perl
 DEPEND="${COMMON_DEPEND}
-	dev-util/patchbin
 	sys-devel/flex
 	>=sys-kernel/linux-headers-2.6
 	virtual/pkgconfig
@@ -176,6 +175,23 @@ usr/share/applications/wine-notepad.desktop
 usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"
 
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
+	"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
+	"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
+)
+PATCHES_BIN=(
+	"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
+)
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
 wine_compiler_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
@@ -347,17 +363,7 @@ src_prepare() {
 	}
 
 	local md5="$(md5sum server/protocol.def)"
-	local PATCHES=(
-		"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-		"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-		"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-		"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-		"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-		"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-	)
-	local PATCHES_BIN=(
-		"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-	)
+
 	if use staging; then
 		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
 		ewarn "Wine bugzilla should explicitly state that staging was used."
diff --git a/app-emulation/wine-staging/wine-staging-2.4-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.4-r1.ebuild
index d41fb3977fc4..f4d14b26fc45 100644
--- a/app-emulation/wine-staging/wine-staging-2.4-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.4-r1.ebuild
@@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
 
 # tools/make_requests requires perl
 DEPEND="${COMMON_DEPEND}
-	dev-util/patchbin
 	sys-devel/flex
 	>=sys-kernel/linux-headers-2.6
 	virtual/pkgconfig
@@ -176,6 +175,23 @@ usr/share/applications/wine-notepad.desktop
 usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"
 
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
+	"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
+	"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
+)
+PATCHES_BIN=(
+	"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
+)
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
 wine_compiler_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
@@ -347,17 +363,7 @@ src_prepare() {
 	}
 
 	local md5="$(md5sum server/protocol.def)"
-	local PATCHES=(
-		"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-		"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-		"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-		"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-		"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-		"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-	)
-	local PATCHES_BIN=(
-		"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-	)
+
 	if use staging; then
 		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
 		ewarn "Wine bugzilla should explicitly state that staging was used."
diff --git a/app-emulation/wine-staging/wine-staging-2.5-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.5-r1.ebuild
index d41fb3977fc4..f4d14b26fc45 100644
--- a/app-emulation/wine-staging/wine-staging-2.5-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.5-r1.ebuild
@@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
 
 # tools/make_requests requires perl
 DEPEND="${COMMON_DEPEND}
-	dev-util/patchbin
 	sys-devel/flex
 	>=sys-kernel/linux-headers-2.6
 	virtual/pkgconfig
@@ -176,6 +175,23 @@ usr/share/applications/wine-notepad.desktop
 usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"
 
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
+	"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
+	"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
+)
+PATCHES_BIN=(
+	"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
+)
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
 wine_compiler_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
@@ -347,17 +363,7 @@ src_prepare() {
 	}
 
 	local md5="$(md5sum server/protocol.def)"
-	local PATCHES=(
-		"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-		"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-		"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-		"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-		"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-		"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-	)
-	local PATCHES_BIN=(
-		"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-	)
+
 	if use staging; then
 		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
 		ewarn "Wine bugzilla should explicitly state that staging was used."
diff --git a/app-emulation/wine-staging/wine-staging-2.6-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.6-r1.ebuild
index d41fb3977fc4..f4d14b26fc45 100644
--- a/app-emulation/wine-staging/wine-staging-2.6-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.6-r1.ebuild
@@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
 
 # tools/make_requests requires perl
 DEPEND="${COMMON_DEPEND}
-	dev-util/patchbin
 	sys-devel/flex
 	>=sys-kernel/linux-headers-2.6
 	virtual/pkgconfig
@@ -176,6 +175,23 @@ usr/share/applications/wine-notepad.desktop
 usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"
 
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
+	"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
+	"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
+)
+PATCHES_BIN=(
+	"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
+)
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
 wine_compiler_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
@@ -347,17 +363,7 @@ src_prepare() {
 	}
 
 	local md5="$(md5sum server/protocol.def)"
-	local PATCHES=(
-		"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-		"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-		"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-		"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-		"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-		"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-	)
-	local PATCHES_BIN=(
-		"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-	)
+
 	if use staging; then
 		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
 		ewarn "Wine bugzilla should explicitly state that staging was used."
diff --git a/app-emulation/wine-staging/wine-staging-2.7-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.7-r1.ebuild
index d41fb3977fc4..f4d14b26fc45 100644
--- a/app-emulation/wine-staging/wine-staging-2.7-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.7-r1.ebuild
@@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
 
 # tools/make_requests requires perl
 DEPEND="${COMMON_DEPEND}
-	dev-util/patchbin
 	sys-devel/flex
 	>=sys-kernel/linux-headers-2.6
 	virtual/pkgconfig
@@ -176,6 +175,23 @@ usr/share/applications/wine-notepad.desktop
 usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"
 
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
+	"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
+	"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
+)
+PATCHES_BIN=(
+	"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
+)
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
 wine_compiler_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
@@ -347,17 +363,7 @@ src_prepare() {
 	}
 
 	local md5="$(md5sum server/protocol.def)"
-	local PATCHES=(
-		"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-		"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-		"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-		"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-		"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-		"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-	)
-	local PATCHES_BIN=(
-		"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-	)
+
 	if use staging; then
 		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
 		ewarn "Wine bugzilla should explicitly state that staging was used."
diff --git a/app-emulation/wine-staging/wine-staging-2.8-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.8-r1.ebuild
index d41fb3977fc4..f4d14b26fc45 100644
--- a/app-emulation/wine-staging/wine-staging-2.8-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.8-r1.ebuild
@@ -152,7 +152,6 @@ RDEPEND="${COMMON_DEPEND}
 
 # tools/make_requests requires perl
 DEPEND="${COMMON_DEPEND}
-	dev-util/patchbin
 	sys-devel/flex
 	>=sys-kernel/linux-headers-2.6
 	virtual/pkgconfig
@@ -176,6 +175,23 @@ usr/share/applications/wine-notepad.desktop
 usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"
 
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
+	"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
+	"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
+)
+PATCHES_BIN=(
+	"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
+)
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
 wine_compiler_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
@@ -347,17 +363,7 @@ src_prepare() {
 	}
 
 	local md5="$(md5sum server/protocol.def)"
-	local PATCHES=(
-		"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-		"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-		"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-		"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-		"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-		"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-	)
-	local PATCHES_BIN=(
-		"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-	)
+
 	if use staging; then
 		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
 		ewarn "Wine bugzilla should explicitly state that staging was used."
diff --git a/app-emulation/wine-staging/wine-staging-2.9-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.9-r1.ebuild
index d41fb3977fc4..b119a5cd8635 100644
--- a/app-emulation/wine-staging/wine-staging-2.9-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.9-r1.ebuild
@@ -63,6 +63,7 @@ COMMON_DEPEND="
 	X? (
 		x11-libs/libXcursor[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
 		x11-libs/libXrandr[${MULTILIB_USEDEP}]
 		x11-libs/libXi[${MULTILIB_USEDEP}]
 		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
@@ -152,7 +153,6 @@ RDEPEND="${COMMON_DEPEND}
 
 # tools/make_requests requires perl
 DEPEND="${COMMON_DEPEND}
-	dev-util/patchbin
 	sys-devel/flex
 	>=sys-kernel/linux-headers-2.6
 	virtual/pkgconfig
@@ -176,6 +176,23 @@ usr/share/applications/wine-notepad.desktop
 usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"
 
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
+	"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
+	"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
+)
+PATCHES_BIN=(
+	"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
+)
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
 wine_compiler_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
@@ -347,17 +364,7 @@ src_prepare() {
 	}
 
 	local md5="$(md5sum server/protocol.def)"
-	local PATCHES=(
-		"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-		"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-		"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-		"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-		"${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676
-		"${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376
-	)
-	local PATCHES_BIN=(
-		"${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376
-	)
+
 	if use staging; then
 		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
 		ewarn "Wine bugzilla should explicitly state that staging was used."
@@ -454,6 +461,7 @@ multilib_src_configure() {
 		$(use_with udev)
 		$(use_with v4l)
 		$(use_with X x)
+		$(use_with X xfixes)
 		$(use_with xcomposite)
 		$(use_with xinerama)
 		$(use_with xml)
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 64f408768d4c..7fc52bbe654b 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -63,6 +63,7 @@ COMMON_DEPEND="
 	X? (
 		x11-libs/libXcursor[${MULTILIB_USEDEP}]
 		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
 		x11-libs/libXrandr[${MULTILIB_USEDEP}]
 		x11-libs/libXi[${MULTILIB_USEDEP}]
 		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
@@ -152,7 +153,6 @@ RDEPEND="${COMMON_DEPEND}
 
 # tools/make_requests requires perl
 DEPEND="${COMMON_DEPEND}
-	dev-util/patchbin
 	sys-devel/flex
 	>=sys-kernel/linux-headers-2.6
 	virtual/pkgconfig
@@ -176,6 +176,19 @@ usr/share/applications/wine-notepad.desktop
 usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"
 
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
 wine_compiler_check() {
 	[[ ${MERGE_TYPE} = "binary" ]] && return 0
 
@@ -347,14 +360,7 @@ src_prepare() {
 	}
 
 	local md5="$(md5sum server/protocol.def)"
-	local PATCHES=(
-		"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
-		"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
-		"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
-		"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch"
-	)
-	local PATCHES_BIN=(
-	)
+
 	if use staging; then
 		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
 		ewarn "Wine bugzilla should explicitly state that staging was used."
@@ -451,6 +457,7 @@ multilib_src_configure() {
 		$(use_with udev)
 		$(use_with v4l)
 		$(use_with X x)
+		$(use_with X xfixes)
 		$(use_with xcomposite)
 		$(use_with xinerama)
 		$(use_with xml)
author	V3n3RiX <venerix@redcorelinux.org>	2017-11-10 00:43:02 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-11-10 00:43:02 +0000
commit	a5332b59346f7cbf0fdbd148b54aa8a84aaf8190 (patch)
tree	e6d8d3589fcd01fbc3f1286185639163daa81424 /app-emulation/wine-staging
parent	fceeaf01a28ee71065cf3798b70b77d3bc4ef199 (diff)