gentoo (leap year) resync : 29.02.2020

12 files changed, 548 insertions, 30 deletions

diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 3f4687191ce0..8f3dfa2180fc 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -10,14 +10,16 @@ DIST wine-4.20.tar.xz 22314856 BLAKE2B c3734029583bf17929a92475f4ad3ac97df632d96
 DIST wine-4.21.tar.xz 22395844 BLAKE2B 1b9c1fd8f4a1ff0527b4d4a02b1dfffa4f6887f2f261b7d4b5afa12e65a8ea18f544c91397cfc71039db7736d33cd0219aaab82cc4564ecd0cb9c74a2e39d6e5 SHA512 f962e47577db2de4e74022b8d51e81e30a004f98b37d8eee5889334271f013123e3ff53e5ac1416c2dd93ec90bee8a2d300b3842c20124df99ef067ac5c72f53
 DIST wine-5.0.tar.xz 22469428 BLAKE2B d26938e707545d31ed932c67eaaa9fd137e42daa6facadeaea2897797ec816658edc1b89c649e0cb5c453ca53ebea5d7156fdd188f1afe2a55ca7834e012e276 SHA512 681de951804c3dd3ae8c677a0ea52d172b04cac58594698b191cd972b25899cd2030d01a25fc2ad2eb6b99976a30319d2bd5ba8b7ff98b1a8b43832fa6514b83
 DIST wine-5.1.tar.xz 22500180 BLAKE2B bf77f24e4be2402afd083c28624e41761d63c1248c314870e0c5a6879fb1393992fe9d99bcafcea0a91599500d745a3ad199e31e857590707f026f1cf740ad31 SHA512 b842b533884f15a8fb71373258671d74aee997d9ed9ee0fb36f945cd2006b494f6cc6c91a8ca47e0ea5b0b39b108f2c4f155918823a7ddf3cd44b4e26ede9171
-EBUILD wine-vanilla-4.0.1.ebuild 17341 BLAKE2B 1f2f32e3700cc344020182b55da4ee029dfebebadeb1d05d61d5cb4181feedd39d339cae2b7eabb0f91746dcc7e34c8cde1c4ae021c46f5d28cd64a6b3e673b1 SHA512 c03b8305a06c53d0bd073177cca5b342bcfea84a4b5c2d84ff74bfd957e61cd68582710cbc67f937723e2d16603866ebdda2fb36102d44544713edce9fb7440e
-EBUILD wine-vanilla-4.0.2.ebuild 17341 BLAKE2B 1f2f32e3700cc344020182b55da4ee029dfebebadeb1d05d61d5cb4181feedd39d339cae2b7eabb0f91746dcc7e34c8cde1c4ae021c46f5d28cd64a6b3e673b1 SHA512 c03b8305a06c53d0bd073177cca5b342bcfea84a4b5c2d84ff74bfd957e61cd68582710cbc67f937723e2d16603866ebdda2fb36102d44544713edce9fb7440e
-EBUILD wine-vanilla-4.0.3.ebuild 17343 BLAKE2B d9ba4bcfe18d936a7a55430a0825121bed49c5035686f99a1027e50826a9773b420febf2bfb43ee9ee56f50903c467cdd1d9f98dd7c22156298e02d210095caa SHA512 ae938f578a38a9a59d86039ecf0ed6b6e486e83da67c544996aed6fc1dd8b79b1e1ab23c4ffc550fa8475c5eb0c6370ba7e704cbf8c40cf9548a64b8206e0a4a
-EBUILD wine-vanilla-4.0.ebuild 17338 BLAKE2B 6ff4249d71a476f9091d8283a73d1ac59c6f5bce763df7ebdc914f53d08904e2f08267a552dc41484c31ef225035719a4b7a61fbc61a6b117869a8f32653a921 SHA512 871a995ecec28ff0eb8c043754d8fede16cc0c8dedb3e78296fff4956034fa19ba1c68c3d9bec1a82c41d7ea606952ae1773168f9560cce6f2425a97a51d3426
-EBUILD wine-vanilla-4.19.ebuild 17560 BLAKE2B c5e622bc679e860be31abcd4801333ecc21d809d619de2a03a57aa0e2a92b40934ce622b4c93ffbdde24432f4b96d258be4d21d883b350c3b273a46f4b244032 SHA512 940e9886c8f5589ff22f4d8377263458e3f3feb01174f12bd6fdf0a10a64cf9d5ab057088c0fedede9676e960f34a9655b066fdec8197b0f4d214fb1b4bb18bd
-EBUILD wine-vanilla-4.20.ebuild 17560 BLAKE2B ab29a23c532e9cd86a08bac6b2e5b4041317e95025ee3bd951a933caad16da4d2cd0d3787e6d7ab8b6aefe19d84c59dcf0d34ddb404ecc61272da5003dd74821 SHA512 80e07333ca0e80e6af6d68294896ffa21c0fdc5da6da16167235c9ab32a5756402f85e8532bb3c5b5635e2d1d11e9fda44cbe46450af505e1dbc0040afa0796a
-EBUILD wine-vanilla-4.21.ebuild 17560 BLAKE2B ab29a23c532e9cd86a08bac6b2e5b4041317e95025ee3bd951a933caad16da4d2cd0d3787e6d7ab8b6aefe19d84c59dcf0d34ddb404ecc61272da5003dd74821 SHA512 80e07333ca0e80e6af6d68294896ffa21c0fdc5da6da16167235c9ab32a5756402f85e8532bb3c5b5635e2d1d11e9fda44cbe46450af505e1dbc0040afa0796a
-EBUILD wine-vanilla-5.0.ebuild 17562 BLAKE2B 2e2787a3a414e206a464be85f56253ebf52064c3778449ef9556d63b06022aa2a5720d346a3f8c2698ed515d0c17355d20edfdfce85dc0c4f724322f3c156d87 SHA512 3fd536986fd019b83e2632ae7b1eaca0a39c839a0bef23fa0a229b3b957dacbe4de5e5ecbfab7f4b2c565e9a215d4e663ef9ec9e683f99b0b4d28d7a69d4edb4
-EBUILD wine-vanilla-5.1.ebuild 17562 BLAKE2B dd2351a990fcdd1e1e0a10df103a8b0bc65b38a732939d8e2baf519150b55ff6ae9524eeddfa8c6e84ff43f526c6dbb45fbe371c2445aaac8a673a79385ce636 SHA512 47922bdb6e1a926d7143ef33e4376d7017ec6e84070fc33b67842a245d730a11d2f92d1df320b35a0ee65667198e69ee17f59e554cb01e77f41eb1c0d1e4b973
-EBUILD wine-vanilla-9999.ebuild 17562 BLAKE2B dd2351a990fcdd1e1e0a10df103a8b0bc65b38a732939d8e2baf519150b55ff6ae9524eeddfa8c6e84ff43f526c6dbb45fbe371c2445aaac8a673a79385ce636 SHA512 47922bdb6e1a926d7143ef33e4376d7017ec6e84070fc33b67842a245d730a11d2f92d1df320b35a0ee65667198e69ee17f59e554cb01e77f41eb1c0d1e4b973
+DIST wine-5.2.tar.xz 22837712 BLAKE2B ee9d4d4dd6c0669d1585cc6988d933dbc7aa5277a0f13e965dd9eecb621e475d33a832b316e37f1372a965efe517efafa9f857a38d9bf081026d221db96b7a0d SHA512 57fa66885c3b5f43e51324e24b8524f663ad67ff15b464ac7d58096d5921f523a59ef5f1dc1ea7aa65fa10d64b7cd832f421c1b773c72bc312d8544a61c33f8f
+EBUILD wine-vanilla-4.0.1.ebuild 17271 BLAKE2B 0dc8b48e1686efa414ae9a6ea8291543507fd5caa46d9becd1739a26b5750d5a3bcbee297a7d36938667533e1bdf90cb8f84aa379da3e053d117f8e40bb4b17a SHA512 904d8f283ebe05ab6d819105c841ccb056ce1e0a688006136af8db70f11592b1492595afdfd3904f15cc669c121865473b7c646490af3fc7986212fc827f922d
+EBUILD wine-vanilla-4.0.2.ebuild 17271 BLAKE2B 0dc8b48e1686efa414ae9a6ea8291543507fd5caa46d9becd1739a26b5750d5a3bcbee297a7d36938667533e1bdf90cb8f84aa379da3e053d117f8e40bb4b17a SHA512 904d8f283ebe05ab6d819105c841ccb056ce1e0a688006136af8db70f11592b1492595afdfd3904f15cc669c121865473b7c646490af3fc7986212fc827f922d
+EBUILD wine-vanilla-4.0.3.ebuild 17273 BLAKE2B 31f49631a2eb96a0d20c98891c3ace1874bab916e8c75d6b6a003b7cf35b84f2014891c99defb1da6a77d2ce56353566e212282c4c4f607312245c6ec7e66803 SHA512 341f4e04041395f2b4a46dde9e46854e783936a4dbf0859946d4f7cb4b25072fb28f397b61c1916bb3aa9708d2e6a7a1e04ac157bd36f03be63b4d6180b9fb05
+EBUILD wine-vanilla-4.0.ebuild 17268 BLAKE2B a4d0bb90b8554762ae188f7261661d500c8fcf951a42ef4d5133dd45b22f28810e8794c36d290026b0fdc864ce497f9f3b3a08e67f923ed63f6e1a8fd74d4a1b SHA512 3c964ff70281401cce1fd39d9a0843321f5f1ae19a6d2bda4b3c478bb772ec064de76e143d676c37858b7d9252fe1f0cfb5460ba1148cb678e15fa7d9496c345
+EBUILD wine-vanilla-4.19.ebuild 17490 BLAKE2B 653b7dcebe4a67c6dcc715e9b5ad606e317af16770b18c053610c9461fb5c0b74085db83868e994f50578332bd836fb0b28f5d4f340bc9103747b4935ab7fb0e SHA512 195deaab85d0e2035c5bb984734ba4252b3b5cd1a94d42cbe4f03f308a1f2415fe4e4d0945a53146cd44b7f3d230388a20a9aa94537c4d63da0625db5330b61a
+EBUILD wine-vanilla-4.20.ebuild 17490 BLAKE2B 4323458dc46710a3a1c5e169d32083281ae53e9a24db5aa63ec3970a617ae2eec984fca6e6a4ef15b42f33bc34581dbf47c6f0cae9a2bd590ef984bb411cce83 SHA512 e6fb82362cb59a69c65d0f2502e499216546ce4b0dfb79c66db07794d86411e0951d2fb988afeead9f21634c0f7c48cfbbe478c874ec67e1eccf2b234e9a123d
+EBUILD wine-vanilla-4.21.ebuild 17490 BLAKE2B 4323458dc46710a3a1c5e169d32083281ae53e9a24db5aa63ec3970a617ae2eec984fca6e6a4ef15b42f33bc34581dbf47c6f0cae9a2bd590ef984bb411cce83 SHA512 e6fb82362cb59a69c65d0f2502e499216546ce4b0dfb79c66db07794d86411e0951d2fb988afeead9f21634c0f7c48cfbbe478c874ec67e1eccf2b234e9a123d
+EBUILD wine-vanilla-5.0.ebuild 17492 BLAKE2B 5e8cc9f593f96690437260afa02f23df732f926bb5c28d04ad9f2f8a9c620c80d062b0bff0bb334b0f8727b383719603920e91e664708ec9b96ce902aa5fe363 SHA512 fb703b58a7150b96fa4878d36d4288829d04462b39cfb6926d4dfcd4d8a918f0b0c07f71bb8d6a1045cb54193a78ddb3bce358ac0c60fea01aadf0f4cfa8d464
+EBUILD wine-vanilla-5.1.ebuild 17492 BLAKE2B 77a3c3c178c88ef38bc72c8f48d68f0db87eae2da51da6f91fa4b3db7a058c9ef77c18cc03d47d2e0f436ba5cb596fd104ba2a4912ec7f4d48a2d6d79e3c34d3 SHA512 17473cb6815eec76b4f9ba5f545d069fdd1aa731aea697993c384f7eb2ea18ba54214c1b20ef237b8a426bc5ef56e577fbd5be819f04db1ddf40a72771c73b75
+EBUILD wine-vanilla-5.2.ebuild 17484 BLAKE2B 66f8ae074ec3cd6f982864e3d7294aca5c1ffdfa517cc3df4a3de5262e5fb1d0758341b2d6a1cfbe76cb9b5e65b764ec453f3ace0b9975daee720b6838b97d0f SHA512 d76182430dfc766f78de84ed8bc427aee60146562e386ff7c2889eb518b862baabade4bed3c080ccccab515d4bebdc0f19eb9368a735e6828b735f826277f8f7
+EBUILD wine-vanilla-9999.ebuild 17492 BLAKE2B 77a3c3c178c88ef38bc72c8f48d68f0db87eae2da51da6f91fa4b3db7a058c9ef77c18cc03d47d2e0f436ba5cb596fd104ba2a4912ec7f4d48a2d6d79e3c34d3 SHA512 17473cb6815eec76b4f9ba5f545d069fdd1aa731aea697993c384f7eb2ea18ba54214c1b20ef237b8a426bc5ef56e577fbd5be819f04db1ddf40a72771c73b75
 MISC metadata.xml 3259 BLAKE2B b750a29db90841c9fa04e19ce9e5811945bb1d1d3b6a3b4a071087bf73f9386706ab28b7af29e7e89afcff2e1b68ca79944546e5f68c0d0f248b95fb1a5ac2fc SHA512 84fb94a9a9e4c9e8bf59391c9c1414e55994f80df0b264fdff77f43defa13ef0becdfc24316ef9eb3d824ea8edca5af3aed0586224a96b25fc3e90d7dfc32394
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild
index 40099e36b324..4f522c6c80e1 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild
@@ -272,7 +272,6 @@ pkg_setup() {
 	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}"
@@ -362,7 +361,6 @@ multilib_src_configure() {
 		--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}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild
index 40099e36b324..4f522c6c80e1 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild
@@ -272,7 +272,6 @@ pkg_setup() {
 	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}"
@@ -362,7 +361,6 @@ multilib_src_configure() {
 		--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}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.3.ebuild
index 57ac9d517e4c..f4c82a817bde 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.0.3.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.3.ebuild
@@ -272,7 +272,6 @@ pkg_setup() {
 	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}"
@@ -362,7 +361,6 @@ multilib_src_configure() {
 		--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}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild
index dd594852087f..52f615df89f1 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild
@@ -272,7 +272,6 @@ pkg_setup() {
 	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}"
@@ -362,7 +361,6 @@ multilib_src_configure() {
 		--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}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.19.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.19.ebuild
index 438bc6d053ab..877fa2af6347 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.19.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.19.ebuild
@@ -272,7 +272,6 @@ pkg_setup() {
 	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}"
@@ -362,7 +361,6 @@ multilib_src_configure() {
 		--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}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.20.ebuild
index 6478ce872398..0e637219f912 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.20.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.20.ebuild
@@ -272,7 +272,6 @@ pkg_setup() {
 	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}"
@@ -362,7 +361,6 @@ multilib_src_configure() {
 		--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}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.21.ebuild
index 6478ce872398..0e637219f912 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.21.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.21.ebuild
@@ -272,7 +272,6 @@ pkg_setup() {
 	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}"
@@ -362,7 +361,6 @@ multilib_src_configure() {
 		--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}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.0.ebuild
index 18bdbc0c756b..152d8c0b6dde 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.0.ebuild
@@ -272,7 +272,6 @@ pkg_setup() {
 	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}"
@@ -362,7 +361,6 @@ multilib_src_configure() {
 		--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}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.1.ebuild
index f43c8882d2fe..ce3a2cfa3815 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.1.ebuild
@@ -272,7 +272,6 @@ pkg_setup() {
 	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}"
@@ -362,7 +361,6 @@ multilib_src_configure() {
 		--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}"
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.2.ebuild
new file mode 100644
index 000000000000..e7c7d4d37c7a
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.2.ebuild
@@ -0,0 +1,536 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar ast 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 si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx 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=$(ver_cut 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+GWP_V="20191222"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	osmesa? ( opengl )
+	test? ( abi_x86_32 )
+	vkd3d? ( vulkan )" # 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}] )
+	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gssapi? ( virtual/krb5[${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}] )
+	kerberos? ( virtual/krb5[${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}] )
+	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${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}] )
+	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${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}]
+	)"
+
+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.1[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:4.9.4 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	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-base/xorg-proto )
+	prelink? ( sys-devel/prelink )
+	xinerama? ( x11-base/xorg-proto )"
+
+# 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}-5.0-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-5.0-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+)
+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 ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environmental variables"
+		eerror "EGIT_OVERRIDE_COMMIT_WINE"
+		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_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}" git-r3_src_unpack
+	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)"
+
+	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
+
+	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
+	done
+	# Add wine64 manpages to Makefile
+	if use abi_x86_64; then
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
+	fi
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
+}
+
+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}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir="${EPREFIX}/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 faudio)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gssapi)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
+		$(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_with sdl)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with v4l v4l2)
+		$(use_with vkd3d)
+		$(use_with vulkan)
+		$(use_with X x)
+		$(use_with X xfixes)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	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}
+
+	# Avoid double prefix from dosym and make_wrapper
+	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
+	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 binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
+	# 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 "${ED%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+	eshopts_pop
+}
+
+pkg_postinst() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	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
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index f43c8882d2fe..ce3a2cfa3815 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -272,7 +272,6 @@ pkg_setup() {
 	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}"
@@ -362,7 +361,6 @@ multilib_src_configure() {
 		--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}"