gentoo resync : 25.01.2019

16 files changed, 100 insertions, 312 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 3e6a70c026e5..8b53fed8037b 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/phpvirtualbox/Manifest b/app-emulation/phpvirtualbox/Manifest
index b6e74e42b436..e13ebaabd0d8 100644
--- a/app-emulation/phpvirtualbox/Manifest
+++ b/app-emulation/phpvirtualbox/Manifest
@@ -1,10 +1,5 @@
+AUX README.gentoo 607 BLAKE2B f6836398730c601219df5c5e293f0e693f9bd663a540f048fe911f3d1d3c1e01e235600ddfd05c2374591889415444f68b343397aadd95ffb80de499e8c66ba8 SHA512 d94fb5a595d54ee47c75a724c7c60d1b2b6a055ca2f56bc8ad3ec52807662bf115f87829f2b5f10faeb7dc06e03d900d8e5b11bac893ae1e97afee8b1e865b6b
 AUX vboxinit-initd 1137 BLAKE2B 6f9d010fa083da3a89648c9550e24080097c5b2314dd747f12d450d5de3d36bc952dc413e56e395673a97a2b232c9db42ffc5e287f2b3eda498c27d4d05043dd SHA512 f58deaa89e34a05664f072dea2602fbc08c29301d9501631ded31a4fb0d996e756e269cbebd357dcdf7758c1927602384de0bb2c65366e0a0a858cedb9288770
-DIST phpvirtualbox-4.2-7.zip 3425805 BLAKE2B c5e9bb629b346af378ee585b940c2f41cef4025caef66809212bab2f5cfd6621e3980fc2c7e5a9140fb3d16545df81af452d6733f2a3ba8f6f23d1a914472b6f SHA512 a066f127115a83c6061e8c0ff6447464818511f3ab7805c119f75ddc88459efd144d45fb358ce52959301f2f1a4f2609f7f42c2bb24213a5be98f2036085a81b
-DIST phpvirtualbox-4.3-0.zip 4231805 BLAKE2B 8f9c995c3c7112b6ec73a49b322f210ae2befcd711ac9459ea0eea9a7216c2e3322489ada69a91940af76a276a8c053384e0632b209250c7b3ca37291a574e57 SHA512 fd49a6a4c79d75f37fd40d74743f295a148548373ab046cf1f31ef7b982008ea6b9d2838cdad2dc37a1d266ed630cd2ddb7f7423ea62af1e0f8f9f76a12c0e9d
-DIST phpvirtualbox-5.0-3.zip 4092132 BLAKE2B c781b9d49ed20fb2748a7aa7d8685d5f2c10ba72268e6bbdb53a041873c6390605376a09bc4a7cfd5cca3de9d3045c60a2e515668ba1d5f49b623aee9e5cf568 SHA512 b632ff3be2028bd011ce27b580996638dfc89e09350c459f16bd1c8c5c3eefbab93f42d7facfb99279eb2ee1c6a38854ea999654ca2090a39c7bfa0afa7fe2d5
-DIST phpvirtualbox-5.0-5.zip 4093766 BLAKE2B 77c453a2d43558ae3db23c3b2b20d08b713731c5444c7613a2018edef77774e97d8dc25345606520df10df7802d86efedf38d73670ec0dacb48606e4785ed0cd SHA512 5478e4a5eb74786eb409a87e7c962c80df558655342f541dddceb7e4cf153a4e5f0bda9b83c2a8a921326f6210c2c3bd344c4a9ce30547f25acce5966c4d6135
-EBUILD phpvirtualbox-4.2.7.ebuild 1779 BLAKE2B cb00f1b29079bb61f1e6ebcdecb6a21b8ef48383a7bbd8dcb6b779343f73a2fb15828d11c51c69425da3555c3fe997c70a22ae850b84db12177189b79a41fa63 SHA512 d23aef6bd479d68d40e17a09d3d93930869e8e2cd2fe83047f82532a40919b36ed607c165b301595ac0e5f0bfd25123d99bd46b08439363c67fce981767688da
-EBUILD phpvirtualbox-4.3.0.ebuild 1771 BLAKE2B d6acaaf564ca5cd7e415d1c88a1a552a0addf35630e8c8d992fadbc1bb75d51ae579ef3254be9f297f1024c6f69abd595fa66a772142d0ade2503373c192ab45 SHA512 72cbe2fe6dca2e61fea66e5da7c10b844bf1a4f650ff9a32572b04136b06d989deb2aa110bdb63133ea9946a90103b6f2f3cc588b6f151e943e3175b2f7489fd
-EBUILD phpvirtualbox-5.0.3.ebuild 1779 BLAKE2B d28d5f08e63ee87387f3bcce1c3b99fe62848311b81095ff3b15f426dab4febf2787c0f919c4c00628432d757478b93ff84d2cfcbbaa46a9097ec0ae5488836b SHA512 ee7a040f11c7660fad03907e8e181620e066e7a7fc421b23e50f1e88b73e6288e47ff68f9a47c72d1e8be6c9b50cd4f5099f6e02f8fc2803a54820cb6cc76b3c
-EBUILD phpvirtualbox-5.0.5.ebuild 1777 BLAKE2B ab3e9649df822905f20c36e7d128b4a048b202ecb2f6d22742d8ae25ae786183732a0094f5302bfd781279e1712f72d050f6d80d3a10deb5f73f16d8698673e5 SHA512 faf7326b0df465ad260b07632bfb6b5a4c7f0e164d560d65956cffc17210ebd1d32fb14f6b082280afe7e73f44b9a5b84c4c2e99e2da3c4698275ab402f6be2d
+DIST phpvirtualbox-5.2-1.tar.gz 3882921 BLAKE2B 6eb76d3f4372bbd83648f4c1b1f37ec7478a1818e7dcef345bddf603d9ae51314f6fd0a448b42d7434389a364e4c8e177f4b13936f50c6c30a58e00aa0b714e7 SHA512 6805f58a3abdfdac9bb34170d3980ba3fae1118526bbb587b67a55032cc2c25923bf2d7bec01ed60439b3070f2e0668079f73e41ca29d18dd9e24abe3219830c
+EBUILD phpvirtualbox-5.2.1.ebuild 1276 BLAKE2B 922562a7dcb39c2fb6f6ccb15022e215d4349ca9dbaf93c9552ce69f34a740d16fbef971067f5d3e896a838666f6ae33c5c7f7274b61f375d3e70919d7d65ee2 SHA512 fe80198a4922228b11f532ba08e176889653ea44e467f2b43493c9bd391f8915baddfec6fa0526f121176c37350e258691ddfebbaf9543bb21f7529f75b0f18b
 MISC metadata.xml 308 BLAKE2B 15cefacb57d5c54d20459ab621b5fe04eb087955f51e427ccdf87c3739379999238939cdf6d2fd5113ad1e47d0d4d3732060f68cc8834a28a7a7d12c3f7cec49 SHA512 26be35e054b6129811d4144bf4f5f37f2a7dc7d1876635fe8e105dd96ff480914fcc71e05968e76f8f257de7779d399f5e95228d95640188e54846697ba13d52
diff --git a/app-emulation/phpvirtualbox/files/README.gentoo b/app-emulation/phpvirtualbox/files/README.gentoo
new file mode 100644
index 000000000000..45699ef72f06
--- /dev/null
+++ b/app-emulation/phpvirtualbox/files/README.gentoo
@@ -0,0 +1,16 @@
+Local or remote virtualbox hosts must be compiled with
+'vboxwebsrv' useflag and the respective init script
+must be running to use this interface:
+/etc/init.d/vboxwebsrv start
+
+To enable the automatic startup mode feature uncomment the
+following line in the config.php file:
+var $startStopConfig = true;
+
+You should also add the /etc/init.d/vboxinit-@@SLOT@@ script to the
+default runlevel on the virtualbox host:
+`rc-update add vboxinit-@@SLOT@@ default`
+If the server is on a remote host, than the script must be
+copied manually from
+@@FILESDIR@@/vboxinit-initd to
+/etc/init.d/vboxinit on the remote host.
diff --git a/app-emulation/phpvirtualbox/phpvirtualbox-4.2.7.ebuild b/app-emulation/phpvirtualbox/phpvirtualbox-4.2.7.ebuild
deleted file mode 100644
index c87ab7614462..000000000000
--- a/app-emulation/phpvirtualbox/phpvirtualbox-4.2.7.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit versionator eutils webapp readme.gentoo
-
-MY_PV="$(replace_version_separator 2 '-')"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Web-based administration for VirtualBox in PHP"
-HOMEPAGE="https://sourceforge.net/projects/phpvirtualbox/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-lang/php[session,unicode,soap,gd]
-	virtual/httpd-php:*
-"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"/${MY_P}
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Local or remote virtualbox hosts must be compiled with
-'vboxwebsrv' useflag and the respective init script
-must be running to use this interface:
-/etc/init.d/vboxwebsrv start
-
-To enable the automatic startup mode feature uncomment the
-following line in the config.php file:
-var \$startStopConfig = true;
-
-You should also add the /etc/init.d/vboxinit script to the
-default runlevel on the virtualbox host:
-\`rc-update add vboxinit default\`
-If the server is on a remote host, than the script must be
-copied manually from
-'${FILESDIR}'/vboxinit-initd to
-/etc/init.d/vboxinit on the remote host."
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc CHANGELOG.txt LICENSE.txt README.txt
-	rm -f CHANGELOG.txt LICENSE.txt README.txt
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config.php-example
-	webapp_serverowned "${MY_HTDOCSDIR}"/config.php-example
-
-	webapp_src_install
-	if has_version app-emulation/virtualbox[vboxwebsrv] || \
-		has_version app-emulation/virtualbox-bin[vboxwebsrv]
-	then
-		newinitd "${FILESDIR}"/vboxinit-initd vboxinit
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/phpvirtualbox/phpvirtualbox-4.3.0.ebuild b/app-emulation/phpvirtualbox/phpvirtualbox-4.3.0.ebuild
deleted file mode 100644
index 05e465bd19fa..000000000000
--- a/app-emulation/phpvirtualbox/phpvirtualbox-4.3.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit versionator eutils webapp readme.gentoo
-
-MY_PV="$(replace_version_separator 2 '-')"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Web-based administration for VirtualBox in PHP"
-HOMEPAGE="https://sourceforge.net/projects/phpvirtualbox/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-lang/php[session,unicode,soap,gd]
-	virtual/httpd-php:*
-"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Local or remote virtualbox hosts must be compiled with
-'vboxwebsrv' useflag and the respective init script
-must be running to use this interface:
-/etc/init.d/vboxwebsrv start
-
-To enable the automatic startup mode feature uncomment the
-following line in the config.php file:
-var \$startStopConfig = true;
-
-You should also add the /etc/init.d/vboxinit script to the
-default runlevel on the virtualbox host:
-\`rc-update add vboxinit default\`
-If the server is on a remote host, than the script must be
-copied manually from
-'${FILESDIR}'/vboxinit-initd to
-/etc/init.d/vboxinit on the remote host."
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc CHANGELOG.txt LICENSE.txt README.txt
-	rm -f CHANGELOG.txt LICENSE.txt README.txt
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config.php-example
-	webapp_serverowned "${MY_HTDOCSDIR}"/config.php-example
-
-	webapp_src_install
-	if has_version app-emulation/virtualbox[vboxwebsrv] || \
-		has_version app-emulation/virtualbox-bin[vboxwebsrv]
-	then
-		newinitd "${FILESDIR}"/vboxinit-initd vboxinit
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/phpvirtualbox/phpvirtualbox-5.0.3.ebuild b/app-emulation/phpvirtualbox/phpvirtualbox-5.0.3.ebuild
deleted file mode 100644
index d299a2e28b04..000000000000
--- a/app-emulation/phpvirtualbox/phpvirtualbox-5.0.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit versionator eutils webapp readme.gentoo
-
-MY_PV="$(replace_version_separator 2 '-')"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Web-based administration for VirtualBox in PHP"
-HOMEPAGE="https://sourceforge.net/projects/phpvirtualbox/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-lang/php[session,unicode,soap,gd]
-	virtual/httpd-php:*
-"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${MY_P}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Local or remote virtualbox hosts must be compiled with
-'vboxwebsrv' useflag and the respective init script
-must be running to use this interface:
-/etc/init.d/vboxwebsrv start
-
-To enable the automatic startup mode feature uncomment the
-following line in the config.php file:
-var \$startStopConfig = true;
-
-You should also add the /etc/init.d/vboxinit script to the
-default runlevel on the virtualbox host:
-\`rc-update add vboxinit default\`
-If the server is on a remote host, than the script must be
-copied manually from
-'${FILESDIR}'/vboxinit-initd to
-/etc/init.d/vboxinit on the remote host."
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc CHANGELOG.txt LICENSE.txt README.txt
-	rm -f CHANGELOG.txt LICENSE.txt README.txt
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config.php-example
-	webapp_serverowned "${MY_HTDOCSDIR}"/config.php-example
-
-	webapp_src_install
-	if has_version app-emulation/virtualbox[vboxwebsrv] || \
-		has_version app-emulation/virtualbox-bin[vboxwebsrv]
-	then
-		newinitd "${FILESDIR}"/vboxinit-initd vboxinit
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/phpvirtualbox/phpvirtualbox-5.0.5.ebuild b/app-emulation/phpvirtualbox/phpvirtualbox-5.0.5.ebuild
deleted file mode 100644
index b6cb641a6e5a..000000000000
--- a/app-emulation/phpvirtualbox/phpvirtualbox-5.0.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit versionator eutils webapp readme.gentoo
-
-MY_PV="$(replace_version_separator 2 '-')"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Web-based administration for VirtualBox in PHP"
-HOMEPAGE="https://sourceforge.net/projects/phpvirtualbox/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-lang/php[session,unicode,soap,gd]
-	virtual/httpd-php:*
-"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${MY_P}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Local or remote virtualbox hosts must be compiled with
-'vboxwebsrv' useflag and the respective init script
-must be running to use this interface:
-/etc/init.d/vboxwebsrv start
-
-To enable the automatic startup mode feature uncomment the
-following line in the config.php file:
-var \$startStopConfig = true;
-
-You should also add the /etc/init.d/vboxinit script to the
-default runlevel on the virtualbox host:
-\`rc-update add vboxinit default\`
-If the server is on a remote host, than the script must be
-copied manually from
-'${FILESDIR}'/vboxinit-initd to
-/etc/init.d/vboxinit on the remote host."
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc CHANGELOG.txt LICENSE.txt README.md
-	rm -f CHANGELOG.txt LICENSE.txt README.md
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config.php-example
-	webapp_serverowned "${MY_HTDOCSDIR}"/config.php-example
-
-	webapp_src_install
-	if has_version app-emulation/virtualbox[vboxwebsrv] || \
-		has_version app-emulation/virtualbox-bin[vboxwebsrv]
-	then
-		newinitd "${FILESDIR}"/vboxinit-initd vboxinit
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/phpvirtualbox/phpvirtualbox-5.2.1.ebuild b/app-emulation/phpvirtualbox/phpvirtualbox-5.2.1.ebuild
new file mode 100644
index 000000000000..4738dfe6851e
--- /dev/null
+++ b/app-emulation/phpvirtualbox/phpvirtualbox-5.2.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver webapp readme.gentoo-r1
+
+MY_PV="$(ver_rs 2 '-')"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Web-based administration for VirtualBox in PHP"
+HOMEPAGE="https://sourceforge.net/projects/phpvirtualbox/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-lang/php:*[gd,session,soap,unicode]
+	virtual/httpd-php:*
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+
+	local DISABLE_AUTOFORMATTING="true"
+	local DOC_CONTENTS=$(sed -e "s;@@FILESDIR@@;${FILESDIR};" \
+				 -e "s;@@SLOT@@;${SLOT};" "${FILESDIR}/README.gentoo")
+
+	webapp_src_preinst
+
+	dodoc CHANGELOG.txt README.md
+	rm -f CHANGELOG.txt LICENSE.txt README.md
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config.php-example
+	webapp_serverowned "${MY_HTDOCSDIR}"/config.php-example
+
+	webapp_src_install
+	if has_version app-emulation/virtualbox[vboxwebsrv] || \
+		has_version app-emulation/virtualbox-bin[vboxwebsrv]
+	then
+		newinitd "${FILESDIR}"/vboxinit-initd vboxinit-${SLOT}
+	fi
+
+	readme.gentoo_create_doc
+
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/wine-any/Manifest b/app-emulation/wine-any/Manifest
index 15e89a3bc857..c46a9d700492 100644
--- a/app-emulation/wine-any/Manifest
+++ b/app-emulation/wine-any/Manifest
@@ -1,19 +1,19 @@
 DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
-DIST wine-3.18.tar.xz 21479964 BLAKE2B 226ec5df6fb5bd94ea4b994f9142ff725b04c4d92da45360f811533880aa3865715a5fe5bb11ce29a55ed2881974013d58479add90b6ba655b035e61eec149c1 SHA512 2137662ea69964a69d77ff5c05f271783bda49af65d605909074d465ed8087d84065156e5c509eae31b4c3a20e83a838fc71bd077b2267640b163acfa5f7366e
 DIST wine-3.19.tar.xz 21503304 BLAKE2B 0844970cd1f39daf51baf5aba537483d24ee5f5e6d188a1502367a7e2b121fea695cd6584cc87d50dfa32fb1f716387adb513b1645406dbcaed1731e1fd7d50f SHA512 84a1811b01024191959fd16a86bd532c96f16344feb4241954d0b5819ba1db8073dc7adcf1589b67169fb6089d2d501846f6fcbdc396c804f26c794cc4a1edd1
 DIST wine-3.20.tar.xz 21541928 BLAKE2B 9183dacd1c6ec15ae5283eca3d17db5a869bcba9a93800a422f0dea5d9cfb5d3124a3e942e8b6487cd4ba31cfeacdd66de39128dd66d64e1226d265eae922d3a SHA512 fb66d1d4b427f46dd048b13e53bcd15a5eaeb19039221fe98ec771140c33b3c245a974e52242eab5731ffa0de15f5932204032fe24f86e1a313ff8f11da59cc4
 DIST wine-3.21.tar.xz 21573872 BLAKE2B 54d8733b19f1377f856c9496f6263eef1916e03caf82c6fcfa39b3e7bec1fecd87466dc92f3739d704a9161a32d9ee680b2cc5e5cdf27a582dc1d89d0b1a6639 SHA512 dd64a6778bf1b848c8fe14dc26cfca21f6c1c92714ca1b2e932a28560a2adc1f69aa1b2cba250f49a5df4f91a4accde677a2afaf960c200d3998eac1957b5c6b
-DIST wine-d3d9-3.18.tar.gz 50540 BLAKE2B 53e292015f420657d5fa54e4fdd1fa86cb03c0ae7c092cb96642a211600fd96fcbe7fa2f8451248e4fb4b7a78bcc174a2db07c7a3ca15ed95a2e70bd4d35876b SHA512 f62b88572210f318da6ff010b4615d0edf215d15fb29292548f116685cb51fffd48aeb393f3471b01604aacbddaf3115522d678307e2c3f5405d1fd6a6f4503c
+DIST wine-4.0.tar.xz 21644692 BLAKE2B 9c426ef2249c16e908a3617c2844d8b12a2df843721338b1cfb69459815b902cfa0ddf3d74c09dc900fb2ceb003e54d97a7c0afaac51a9caab7d21beb82e26c3 SHA512 7607fa7a3d5f7bcd3d8c4c9e7bb6e1987466110bbfc672782ebe57c6d9da348c58e76abf40b0a70c725dfd703163db6e194ee0e3db11a47b6b60e225163308dd
 DIST wine-d3d9-3.19.tar.gz 50542 BLAKE2B 9914139b2657943182f1ac02c43f040669ff6f2e36eee3112267505bbd02969b567ffc23e6965dcb38bd27147f4b6c3630dfd9340b21dcdb6f222a2155fd1b8a SHA512 d8cc0fb98278763d60b4a00c68499aa498b14f12a03d607fa2a0765d26b231a8c270b2b61f7a89b767099ac02aa4e820020eb2dcd78f279885f539e3908362c8
 DIST wine-d3d9-3.20.tar.gz 50539 BLAKE2B 53549364113f9dd9d7c9383ec74cc7eafec61dca5bf1943bd87e51b810e6d85d5d0f86f426a22042ee8a23eb21b6b13c691c43d67de19e66550dd0abc3c0319b SHA512 67d452d46807ee9ca44414326a9b2b90403b5c4c611e34ade03a9b624066b62b056f3adde2c0b6d6bdd73066775a1b3eb43d7cf52f82456eb979f788c3e591b4
 DIST wine-d3d9-3.21.tar.gz 50545 BLAKE2B fec93df7a464feba5ebd5c1f9f9b511a89065cc668122c4ddb2c91027b68e2aa93fe58832c4e143832c5b5f4ace57c640ab218525f0749bd5f1c632e80009660 SHA512 b2263d26b671b45a59c03ca5dc88aff35444e4d47caccf3de1493fa86ac834bb178819b9a80aa52838e510f814ed404e6c3ce9724aa6eea6a6d5f019253e6248
-DIST wine-staging-3.18.tar.gz 9927742 BLAKE2B efd581555feacaac263e550c3a854b4a3ad92c72d7f81bb7cfc846a94d57decde1e82f38de4586eb824b2fe3574581621f0251cc1a126796f466e99e85e8e609 SHA512 d7c353b2302616b8ffe9f41090bc36c8869238410eda16072aed0b70e54c8a09b4a48d439fc9e4f211804945d55dc4a00a5d70efd2ca4a50f72db7607e6ef10e
+DIST wine-d3d9-4.0.tar.gz 50535 BLAKE2B a5815c4d1b8ea34a0afac565b01aaaa6af418a7d84bf12c4c0591e316d31987770d1d5e99837f1c63e91810db821a2cb76cba1b97c71d5fcee8060a48915e83d SHA512 98e2d4d47fdc376e4e8fed0624657d40ea0a077998baab1d89ef0320714e66f4899414b04fa747b78c172fb85732e9376553c0b20cfd1ae0807cb3de58cfe78a
 DIST wine-staging-3.19.tar.gz 9957279 BLAKE2B 323ce53df248b7ecc761332537590abcd63f3de9a834b752ca62a472c077d71278907a9758dcda879f50f9044620894e51dbca8702b39fe1a8938b983c568418 SHA512 c3e66c88b4baad4c854b8729ef58aabff587f16f0a13fe89396dd5d99c9b928c6e23ff15938dd40376ec76a40538bba950dd0e2b5b25ce1260de023bb1d17198
 DIST wine-staging-3.20.tar.gz 9950555 BLAKE2B ee66217b708287bd95d61e23fb92009d927a75556f22e89b9c5af66cb6c6445f77a1c3153da168da92ebac58606843c4639f1a99bd5089941595181f390980f0 SHA512 4b92e53e84046d99c3f7ec5e0d0d7e62fdb767b1c44e23605125744686439fe62991c8adea941950b390a01d251ecbb79f3b329cfe5a1b1fbc76c5372283579d
 DIST wine-staging-3.21.tar.gz 9945982 BLAKE2B 988927c644e9abf472c42021cae39f38cdae24b397072fb53dc803da32bc80e8b6256554d787db0b6bffafac4104a9abf4ab8fa6e78fd0a308bf8906d658a65d SHA512 17f8194954a420d1424d564ba9ad5e6d4dd574dc38da4895d5b6740c1990f8655cb573bd57c77ace2c78c71da4782b511a5ac937ca1f0fc958e3c925abaeefde
-EBUILD wine-any-3.18.ebuild 21113 BLAKE2B eacc4b21ddb034c5897a08e127a34eb5f7954557c46bccb0ef2198c098c892bba57c3c6a11978788b5d331081c9ba95b4e131a423693afdc9e2e77b534d9cb52 SHA512 7d46682ec57935c30ae0927ef6512c1436e750939c42c0648d09782b692a31a3d1dea4ad074b1af05cc14e913e214630d1d812b0db8bc9d89f9e356f50388afd
+DIST wine-staging-4.0.tar.gz 9945756 BLAKE2B bfd27d5677d01b4a14c4ef593b741b6fa6e75194de04a90659ecceaa8b087d594cafdd0a53cc2ad2d05e9c73928d70d0b6681ac0052df79f7b45cbb370b31d3d SHA512 4c2277449be17b83235bab7898818a886e84e82c0c5eb8216a5bc42e3d9a0e1dcf09d4522e1165d503fd9237673fa91c2c07d837cde58897f1b6fc8bc6fa5d33
 EBUILD wine-any-3.19.ebuild 21113 BLAKE2B eacc4b21ddb034c5897a08e127a34eb5f7954557c46bccb0ef2198c098c892bba57c3c6a11978788b5d331081c9ba95b4e131a423693afdc9e2e77b534d9cb52 SHA512 7d46682ec57935c30ae0927ef6512c1436e750939c42c0648d09782b692a31a3d1dea4ad074b1af05cc14e913e214630d1d812b0db8bc9d89f9e356f50388afd
 EBUILD wine-any-3.20.ebuild 21113 BLAKE2B eacc4b21ddb034c5897a08e127a34eb5f7954557c46bccb0ef2198c098c892bba57c3c6a11978788b5d331081c9ba95b4e131a423693afdc9e2e77b534d9cb52 SHA512 7d46682ec57935c30ae0927ef6512c1436e750939c42c0648d09782b692a31a3d1dea4ad074b1af05cc14e913e214630d1d812b0db8bc9d89f9e356f50388afd
 EBUILD wine-any-3.21.ebuild 21113 BLAKE2B eacc4b21ddb034c5897a08e127a34eb5f7954557c46bccb0ef2198c098c892bba57c3c6a11978788b5d331081c9ba95b4e131a423693afdc9e2e77b534d9cb52 SHA512 7d46682ec57935c30ae0927ef6512c1436e750939c42c0648d09782b692a31a3d1dea4ad074b1af05cc14e913e214630d1d812b0db8bc9d89f9e356f50388afd
+EBUILD wine-any-4.0.ebuild 21151 BLAKE2B fc9fc95cb7bd5b7e609d703deb6bbad51d44a8b76443818f975b83e6f3679785895bdb11a0f3b7e0f1a26a962ba6e15eb83b7ecc8de3ffeebdd1695d3ed9e004 SHA512 eca2b41c6f349e5deefdd54befbbd714088803a195bb383d9748aec20e0800dba93bd7ba4f578a9ac6597ff1a651457541e540a4ace0295c5dfe35c2a104e55d
 EBUILD wine-any-9999.ebuild 21153 BLAKE2B 097951ac2770e079194924c0aa294945c03a1e8cb829c246ae52201580841fada75a8922d163bb8982ec236f3f69deb603059d684a10e4b587eaf0b64bd822d5 SHA512 b9c3c8787c3d3f3d0decc6314aec412caf7c1b19e5efec206898d321dac1174bad5118e4364b5e062482193e4c26889033003dd5ca10a293e1e6613cc2d8c44e
 MISC metadata.xml 3844 BLAKE2B 95bb006c1635ae34e88097f588585809785bbe45b333eb618baa7ee71b64ada59b13c7d16bf138395e1e72ddecb430c07a75b3edbf4bd74948e97415a375fe78 SHA512 43160447d94163a67d9e356ad9fa887e35f2a27e8b496e034a3e8fb2b047b1cf1deda9596f6d7ea9b5f52cc7005ffd2e7fb37983d6ddd33fb699fab5fe6d50b2
diff --git a/app-emulation/wine-any/wine-any-3.18.ebuild b/app-emulation/wine-any/wine-any-4.0.ebuild
index 24ab26fa3a3c..6138610c446a 100644
--- a/app-emulation/wine-any/wine-any-3.18.ebuild
+++ b/app-emulation/wine-any/wine-any-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,8 @@ if [[ ${PV} == "9999" ]] ; then
 	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+        MINOR_V=$(ver_cut 2)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
 	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
 S="${WORKDIR}/${MY_P}"
diff --git a/app-emulation/wine-d3d9/Manifest b/app-emulation/wine-d3d9/Manifest
index 3b9dd28fc998..79dbca0d956d 100644
--- a/app-emulation/wine-d3d9/Manifest
+++ b/app-emulation/wine-d3d9/Manifest
@@ -1,15 +1,15 @@
 DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
-DIST wine-3.18.tar.xz 21479964 BLAKE2B 226ec5df6fb5bd94ea4b994f9142ff725b04c4d92da45360f811533880aa3865715a5fe5bb11ce29a55ed2881974013d58479add90b6ba655b035e61eec149c1 SHA512 2137662ea69964a69d77ff5c05f271783bda49af65d605909074d465ed8087d84065156e5c509eae31b4c3a20e83a838fc71bd077b2267640b163acfa5f7366e
 DIST wine-3.19.tar.xz 21503304 BLAKE2B 0844970cd1f39daf51baf5aba537483d24ee5f5e6d188a1502367a7e2b121fea695cd6584cc87d50dfa32fb1f716387adb513b1645406dbcaed1731e1fd7d50f SHA512 84a1811b01024191959fd16a86bd532c96f16344feb4241954d0b5819ba1db8073dc7adcf1589b67169fb6089d2d501846f6fcbdc396c804f26c794cc4a1edd1
 DIST wine-3.20.tar.xz 21541928 BLAKE2B 9183dacd1c6ec15ae5283eca3d17db5a869bcba9a93800a422f0dea5d9cfb5d3124a3e942e8b6487cd4ba31cfeacdd66de39128dd66d64e1226d265eae922d3a SHA512 fb66d1d4b427f46dd048b13e53bcd15a5eaeb19039221fe98ec771140c33b3c245a974e52242eab5731ffa0de15f5932204032fe24f86e1a313ff8f11da59cc4
 DIST wine-3.21.tar.xz 21573872 BLAKE2B 54d8733b19f1377f856c9496f6263eef1916e03caf82c6fcfa39b3e7bec1fecd87466dc92f3739d704a9161a32d9ee680b2cc5e5cdf27a582dc1d89d0b1a6639 SHA512 dd64a6778bf1b848c8fe14dc26cfca21f6c1c92714ca1b2e932a28560a2adc1f69aa1b2cba250f49a5df4f91a4accde677a2afaf960c200d3998eac1957b5c6b
-DIST wine-d3d9-3.18.tar.gz 50540 BLAKE2B 53e292015f420657d5fa54e4fdd1fa86cb03c0ae7c092cb96642a211600fd96fcbe7fa2f8451248e4fb4b7a78bcc174a2db07c7a3ca15ed95a2e70bd4d35876b SHA512 f62b88572210f318da6ff010b4615d0edf215d15fb29292548f116685cb51fffd48aeb393f3471b01604aacbddaf3115522d678307e2c3f5405d1fd6a6f4503c
+DIST wine-4.0.tar.xz 21644692 BLAKE2B 9c426ef2249c16e908a3617c2844d8b12a2df843721338b1cfb69459815b902cfa0ddf3d74c09dc900fb2ceb003e54d97a7c0afaac51a9caab7d21beb82e26c3 SHA512 7607fa7a3d5f7bcd3d8c4c9e7bb6e1987466110bbfc672782ebe57c6d9da348c58e76abf40b0a70c725dfd703163db6e194ee0e3db11a47b6b60e225163308dd
 DIST wine-d3d9-3.19.tar.gz 50542 BLAKE2B 9914139b2657943182f1ac02c43f040669ff6f2e36eee3112267505bbd02969b567ffc23e6965dcb38bd27147f4b6c3630dfd9340b21dcdb6f222a2155fd1b8a SHA512 d8cc0fb98278763d60b4a00c68499aa498b14f12a03d607fa2a0765d26b231a8c270b2b61f7a89b767099ac02aa4e820020eb2dcd78f279885f539e3908362c8
 DIST wine-d3d9-3.20.tar.gz 50539 BLAKE2B 53549364113f9dd9d7c9383ec74cc7eafec61dca5bf1943bd87e51b810e6d85d5d0f86f426a22042ee8a23eb21b6b13c691c43d67de19e66550dd0abc3c0319b SHA512 67d452d46807ee9ca44414326a9b2b90403b5c4c611e34ade03a9b624066b62b056f3adde2c0b6d6bdd73066775a1b3eb43d7cf52f82456eb979f788c3e591b4
 DIST wine-d3d9-3.21.tar.gz 50545 BLAKE2B fec93df7a464feba5ebd5c1f9f9b511a89065cc668122c4ddb2c91027b68e2aa93fe58832c4e143832c5b5f4ace57c640ab218525f0749bd5f1c632e80009660 SHA512 b2263d26b671b45a59c03ca5dc88aff35444e4d47caccf3de1493fa86ac834bb178819b9a80aa52838e510f814ed404e6c3ce9724aa6eea6a6d5f019253e6248
-EBUILD wine-d3d9-3.18.ebuild 18641 BLAKE2B 2d5d5e7c36a7260b390f3597996cf071167c3cfcc8542b02a043c568cd3f94155e651c0aa76f99988fa394756124e001c602995e2a2ec4d452596e93ae0a18a2 SHA512 80408733be2a6305866e082eea9f25e8a40aac554966d8a600025d64414270467852f27f6ae1bdfa288e8be5ae55301d6ffcdc8f3859f4cf9bc89f2b07a6fc0d
+DIST wine-d3d9-4.0.tar.gz 50535 BLAKE2B a5815c4d1b8ea34a0afac565b01aaaa6af418a7d84bf12c4c0591e316d31987770d1d5e99837f1c63e91810db821a2cb76cba1b97c71d5fcee8060a48915e83d SHA512 98e2d4d47fdc376e4e8fed0624657d40ea0a077998baab1d89ef0320714e66f4899414b04fa747b78c172fb85732e9376553c0b20cfd1ae0807cb3de58cfe78a
 EBUILD wine-d3d9-3.19.ebuild 18641 BLAKE2B 2d5d5e7c36a7260b390f3597996cf071167c3cfcc8542b02a043c568cd3f94155e651c0aa76f99988fa394756124e001c602995e2a2ec4d452596e93ae0a18a2 SHA512 80408733be2a6305866e082eea9f25e8a40aac554966d8a600025d64414270467852f27f6ae1bdfa288e8be5ae55301d6ffcdc8f3859f4cf9bc89f2b07a6fc0d
 EBUILD wine-d3d9-3.20.ebuild 18641 BLAKE2B 2d5d5e7c36a7260b390f3597996cf071167c3cfcc8542b02a043c568cd3f94155e651c0aa76f99988fa394756124e001c602995e2a2ec4d452596e93ae0a18a2 SHA512 80408733be2a6305866e082eea9f25e8a40aac554966d8a600025d64414270467852f27f6ae1bdfa288e8be5ae55301d6ffcdc8f3859f4cf9bc89f2b07a6fc0d
 EBUILD wine-d3d9-3.21.ebuild 18641 BLAKE2B 2d5d5e7c36a7260b390f3597996cf071167c3cfcc8542b02a043c568cd3f94155e651c0aa76f99988fa394756124e001c602995e2a2ec4d452596e93ae0a18a2 SHA512 80408733be2a6305866e082eea9f25e8a40aac554966d8a600025d64414270467852f27f6ae1bdfa288e8be5ae55301d6ffcdc8f3859f4cf9bc89f2b07a6fc0d
+EBUILD wine-d3d9-4.0.ebuild 18679 BLAKE2B c85203784df03e1087c42b0f73dd8f103732f54d1e2b74b15f551b364edc3da2915bbd0bf27bfbc296b81147a01fdd24c947a7fe8658c5f985a93d844276230a SHA512 9f58fe7fb75deb4cf1b945b79fc506f807d91c867bd1c924c2220b6b8c10c53e939f042696e115caf27416493f8cc4be76861e23abbaa3aaa6a6e730b72b93a0
 EBUILD wine-d3d9-9999.ebuild 18681 BLAKE2B bc9336a634dc6f216b1c10a4b7c0a692b48ad0501e6b854e18775840d1fb9a7707aa5493f764511b2a68ef42a6bac5d2af49352fd742f54f3fd2b82a78a5dc11 SHA512 0fe85ce775eb69a1197e71ec7b7f40bd0bedaf8657809b9aabb147099593672bc9e7805b77373926cc99ea58c5573653981ccd5ee10255272844a8ff4d2c19b4
 MISC metadata.xml 3451 BLAKE2B 83f6906b20cb3effb9c37152cc36c2d2853d3c313707151e5f1962ea51fbbf5983300edfb7282c367e393ef2ba09534277a4349ef6bdd630802fda04b4861357 SHA512 9c7fa199e699e6df3728c7f9e522a1bd64526198d0a96274d14da00627587c357f6d5ee9678770e2e150065b1246e1803c3a39f0fb6f01182a896a563f8205d6
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.18.ebuild b/app-emulation/wine-d3d9/wine-d3d9-4.0.ebuild
index fb4d194b4fbe..10ac0281dd46 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.18.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,8 @@ if [[ ${PV} == "9999" ]] ; then
 	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+        MINOR_V=$(ver_cut 2)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
 	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
 S="${WORKDIR}/${MY_P}"
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 17d53b2af76e..9c7ba108d4bb 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,15 +1,15 @@
 DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
-DIST wine-3.18.tar.xz 21479964 BLAKE2B 226ec5df6fb5bd94ea4b994f9142ff725b04c4d92da45360f811533880aa3865715a5fe5bb11ce29a55ed2881974013d58479add90b6ba655b035e61eec149c1 SHA512 2137662ea69964a69d77ff5c05f271783bda49af65d605909074d465ed8087d84065156e5c509eae31b4c3a20e83a838fc71bd077b2267640b163acfa5f7366e
 DIST wine-3.19.tar.xz 21503304 BLAKE2B 0844970cd1f39daf51baf5aba537483d24ee5f5e6d188a1502367a7e2b121fea695cd6584cc87d50dfa32fb1f716387adb513b1645406dbcaed1731e1fd7d50f SHA512 84a1811b01024191959fd16a86bd532c96f16344feb4241954d0b5819ba1db8073dc7adcf1589b67169fb6089d2d501846f6fcbdc396c804f26c794cc4a1edd1
 DIST wine-3.20.tar.xz 21541928 BLAKE2B 9183dacd1c6ec15ae5283eca3d17db5a869bcba9a93800a422f0dea5d9cfb5d3124a3e942e8b6487cd4ba31cfeacdd66de39128dd66d64e1226d265eae922d3a SHA512 fb66d1d4b427f46dd048b13e53bcd15a5eaeb19039221fe98ec771140c33b3c245a974e52242eab5731ffa0de15f5932204032fe24f86e1a313ff8f11da59cc4
 DIST wine-3.21.tar.xz 21573872 BLAKE2B 54d8733b19f1377f856c9496f6263eef1916e03caf82c6fcfa39b3e7bec1fecd87466dc92f3739d704a9161a32d9ee680b2cc5e5cdf27a582dc1d89d0b1a6639 SHA512 dd64a6778bf1b848c8fe14dc26cfca21f6c1c92714ca1b2e932a28560a2adc1f69aa1b2cba250f49a5df4f91a4accde677a2afaf960c200d3998eac1957b5c6b
-DIST wine-staging-3.18.tar.gz 9927742 BLAKE2B efd581555feacaac263e550c3a854b4a3ad92c72d7f81bb7cfc846a94d57decde1e82f38de4586eb824b2fe3574581621f0251cc1a126796f466e99e85e8e609 SHA512 d7c353b2302616b8ffe9f41090bc36c8869238410eda16072aed0b70e54c8a09b4a48d439fc9e4f211804945d55dc4a00a5d70efd2ca4a50f72db7607e6ef10e
+DIST wine-4.0.tar.xz 21644692 BLAKE2B 9c426ef2249c16e908a3617c2844d8b12a2df843721338b1cfb69459815b902cfa0ddf3d74c09dc900fb2ceb003e54d97a7c0afaac51a9caab7d21beb82e26c3 SHA512 7607fa7a3d5f7bcd3d8c4c9e7bb6e1987466110bbfc672782ebe57c6d9da348c58e76abf40b0a70c725dfd703163db6e194ee0e3db11a47b6b60e225163308dd
 DIST wine-staging-3.19.tar.gz 9957279 BLAKE2B 323ce53df248b7ecc761332537590abcd63f3de9a834b752ca62a472c077d71278907a9758dcda879f50f9044620894e51dbca8702b39fe1a8938b983c568418 SHA512 c3e66c88b4baad4c854b8729ef58aabff587f16f0a13fe89396dd5d99c9b928c6e23ff15938dd40376ec76a40538bba950dd0e2b5b25ce1260de023bb1d17198
 DIST wine-staging-3.20.tar.gz 9950555 BLAKE2B ee66217b708287bd95d61e23fb92009d927a75556f22e89b9c5af66cb6c6445f77a1c3153da168da92ebac58606843c4639f1a99bd5089941595181f390980f0 SHA512 4b92e53e84046d99c3f7ec5e0d0d7e62fdb767b1c44e23605125744686439fe62991c8adea941950b390a01d251ecbb79f3b329cfe5a1b1fbc76c5372283579d
 DIST wine-staging-3.21.tar.gz 9945982 BLAKE2B 988927c644e9abf472c42021cae39f38cdae24b397072fb53dc803da32bc80e8b6256554d787db0b6bffafac4104a9abf4ab8fa6e78fd0a308bf8906d658a65d SHA512 17f8194954a420d1424d564ba9ad5e6d4dd574dc38da4895d5b6740c1990f8655cb573bd57c77ace2c78c71da4782b511a5ac937ca1f0fc958e3c925abaeefde
-EBUILD wine-staging-3.18.ebuild 20048 BLAKE2B 5c160439d7bb0b560d06b4d9e6bbc9d8d73c34a3f20a667490d4ad5b45011464aed7ea2eb1b06ace2133f7920192accb099c256dacd6223c74ee0bafcfbcf717 SHA512 adf71cb35a4108c2010fb3f64f3837913ea2af1489a81ccd3ae903f1173232bfb97e0bc655076085e4f595ea91d851260798cc33a79f8c58a67d99c6ba0920bf
+DIST wine-staging-4.0.tar.gz 9945756 BLAKE2B bfd27d5677d01b4a14c4ef593b741b6fa6e75194de04a90659ecceaa8b087d594cafdd0a53cc2ad2d05e9c73928d70d0b6681ac0052df79f7b45cbb370b31d3d SHA512 4c2277449be17b83235bab7898818a886e84e82c0c5eb8216a5bc42e3d9a0e1dcf09d4522e1165d503fd9237673fa91c2c07d837cde58897f1b6fc8bc6fa5d33
 EBUILD wine-staging-3.19.ebuild 20048 BLAKE2B 5c160439d7bb0b560d06b4d9e6bbc9d8d73c34a3f20a667490d4ad5b45011464aed7ea2eb1b06ace2133f7920192accb099c256dacd6223c74ee0bafcfbcf717 SHA512 adf71cb35a4108c2010fb3f64f3837913ea2af1489a81ccd3ae903f1173232bfb97e0bc655076085e4f595ea91d851260798cc33a79f8c58a67d99c6ba0920bf
 EBUILD wine-staging-3.20.ebuild 20048 BLAKE2B 5c160439d7bb0b560d06b4d9e6bbc9d8d73c34a3f20a667490d4ad5b45011464aed7ea2eb1b06ace2133f7920192accb099c256dacd6223c74ee0bafcfbcf717 SHA512 adf71cb35a4108c2010fb3f64f3837913ea2af1489a81ccd3ae903f1173232bfb97e0bc655076085e4f595ea91d851260798cc33a79f8c58a67d99c6ba0920bf
 EBUILD wine-staging-3.21.ebuild 20048 BLAKE2B 5c160439d7bb0b560d06b4d9e6bbc9d8d73c34a3f20a667490d4ad5b45011464aed7ea2eb1b06ace2133f7920192accb099c256dacd6223c74ee0bafcfbcf717 SHA512 adf71cb35a4108c2010fb3f64f3837913ea2af1489a81ccd3ae903f1173232bfb97e0bc655076085e4f595ea91d851260798cc33a79f8c58a67d99c6ba0920bf
+EBUILD wine-staging-4.0.ebuild 20086 BLAKE2B f3df2595828bacd06ce12cf2b3f2846d89556cd013535bb6ad2bc8573a4b4436bee66d8259f10df65afb0883ddb0266381fd2403162cf19a9247dc3d3ee1c3c2 SHA512 acbd87f56155f8566388a122ef54363e658eb140e4f37f049e4566ffec495d5c3ea4e942b8796859173b385cb32e944c72d8e0a709d29d87e710b8b0ea6258ef
 EBUILD wine-staging-9999.ebuild 20088 BLAKE2B 7b45850fd943ab529ff442187bd04edc4ebef9092b20400586306ccb54b588b2346e41239b058a608f905fab4c7653eb6d056b31c63dbaf2e655ab2c409b144e SHA512 bc7152915add222360f2684494ff62ff8fcb0289654a8a83e53764c4eb6ad35f5dc10a17bbd790e6f3369b3b2d109b0e8ac09b5c89c158e83f86069a7b7255b0
 MISC metadata.xml 3610 BLAKE2B 6840ad896b4efc5cf532bbbb56c3610182b62b3063321378d16e418514ea372da30341e173975a2cc17b81774c0ecdfb11b52d12de6b4875cbac638a9f5a6a78 SHA512 b6372bfcb02b7917ac1d79a26639e9ca6440d373bfbd5688012d48344b4ad6966c23436853517fbe2236a720d77de71433edea1ddd6cb612f0fec65016ef91b2
diff --git a/app-emulation/wine-staging/wine-staging-3.18.ebuild b/app-emulation/wine-staging/wine-staging-4.0.ebuild
index 17d7b7dd2b8a..b0f4871a5bed 100644
--- a/app-emulation/wine-staging/wine-staging-3.18.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,8 @@ if [[ ${PV} == "9999" ]] ; then
 	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+        MINOR_V=$(ver_cut 2)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
 	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
 S="${WORKDIR}/${MY_P}"
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 3f6dad97fdc4..1efe0fd340b3 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,15 +1,15 @@
 DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
 DIST wine-3.0.3.tar.xz 19735412 BLAKE2B f0ccbe272f1013386f89805cf1573cf001eb875bccb31a1884fad1dff5f90caf727c460406af80f63db7a227d85f25f57c8e8e650a171adbe0c3f5178ddf17e8 SHA512 11043a9a9434681f9c73590688b600b3b9e3d311be2c4d97b5f58f0740500ebcfbdc826bd6584d5dd392dccbdd9389ffa04c8fedbba43a4df2e6aeb922414412
 DIST wine-3.0.4.tar.xz 20556944 BLAKE2B 122c06e38cae9f9d2358908d0d325ed4e0dc3d1bf3e189fcfd1a713ca147d5360934cc21c387939bb5ba6dec9410d85b586d95207089b6aa033eea15bfc209e3 SHA512 e1ce33bbc165a9c640a38965a229b757b67746f2150d545eb0e29ba6d21cdf150bd8eb9a450d8dd71733fbea3b2ac24839dd8e381b7da9cd15ddf98c59304198
-DIST wine-3.18.tar.xz 21479964 BLAKE2B 226ec5df6fb5bd94ea4b994f9142ff725b04c4d92da45360f811533880aa3865715a5fe5bb11ce29a55ed2881974013d58479add90b6ba655b035e61eec149c1 SHA512 2137662ea69964a69d77ff5c05f271783bda49af65d605909074d465ed8087d84065156e5c509eae31b4c3a20e83a838fc71bd077b2267640b163acfa5f7366e
 DIST wine-3.19.tar.xz 21503304 BLAKE2B 0844970cd1f39daf51baf5aba537483d24ee5f5e6d188a1502367a7e2b121fea695cd6584cc87d50dfa32fb1f716387adb513b1645406dbcaed1731e1fd7d50f SHA512 84a1811b01024191959fd16a86bd532c96f16344feb4241954d0b5819ba1db8073dc7adcf1589b67169fb6089d2d501846f6fcbdc396c804f26c794cc4a1edd1
 DIST wine-3.20.tar.xz 21541928 BLAKE2B 9183dacd1c6ec15ae5283eca3d17db5a869bcba9a93800a422f0dea5d9cfb5d3124a3e942e8b6487cd4ba31cfeacdd66de39128dd66d64e1226d265eae922d3a SHA512 fb66d1d4b427f46dd048b13e53bcd15a5eaeb19039221fe98ec771140c33b3c245a974e52242eab5731ffa0de15f5932204032fe24f86e1a313ff8f11da59cc4
 DIST wine-3.21.tar.xz 21573872 BLAKE2B 54d8733b19f1377f856c9496f6263eef1916e03caf82c6fcfa39b3e7bec1fecd87466dc92f3739d704a9161a32d9ee680b2cc5e5cdf27a582dc1d89d0b1a6639 SHA512 dd64a6778bf1b848c8fe14dc26cfca21f6c1c92714ca1b2e932a28560a2adc1f69aa1b2cba250f49a5df4f91a4accde677a2afaf960c200d3998eac1957b5c6b
+DIST wine-4.0.tar.xz 21644692 BLAKE2B 9c426ef2249c16e908a3617c2844d8b12a2df843721338b1cfb69459815b902cfa0ddf3d74c09dc900fb2ceb003e54d97a7c0afaac51a9caab7d21beb82e26c3 SHA512 7607fa7a3d5f7bcd3d8c4c9e7bb6e1987466110bbfc672782ebe57c6d9da348c58e76abf40b0a70c725dfd703163db6e194ee0e3db11a47b6b60e225163308dd
 EBUILD wine-vanilla-3.0.3.ebuild 17120 BLAKE2B a8cf3d4872ba5f91a691817bfc9421a6a5bc1079141c8c3d53dc5726bc2aacd46090d253390278ec5e8e19c63e613c1289a62957a75487f7dc10ee68b8e4778d SHA512 36c54300f1d396a0e5d990316525dd68103a5e25623e84134b35e708d35d7c8b4cbf6100e91396b29daed058fc64a51bac39b7b14684baffafe1e2f05f695b23
 EBUILD wine-vanilla-3.0.4.ebuild 17085 BLAKE2B d1831445374f36c0fd20b930b2786c79054473868b1d319d1824b935e5e3f2fd07aafa24948040ac1cade51e5748843438f51e473a385c654fa3fe282277e0d7 SHA512 20342989e375114278c77c3dbd8fc1e9483281ab4147006a5f7fc6e657287c327b25cf002581c1a94fec9e9e982710b179415af4cbcf9eebae708ac41079765e
-EBUILD wine-vanilla-3.18.ebuild 17308 BLAKE2B bdd30e07641146aabc517f4f46b34d71e4182428dae9e89f564eebd8f057e78cf4b6ea5b8bfcfe1172d95265cd3bc6c3f2d32ba29bed40c39a7b1f8b02cf5e40 SHA512 a2cbbba40bc4fb97ef5b730f26818fc9153c27b5fdf248b587d12ef63dbcfe6f0c98f0bf7efd421ef4bc0dec473a780d2913afb3b806c6a30f9ad73f546d9536
 EBUILD wine-vanilla-3.19.ebuild 17308 BLAKE2B bdd30e07641146aabc517f4f46b34d71e4182428dae9e89f564eebd8f057e78cf4b6ea5b8bfcfe1172d95265cd3bc6c3f2d32ba29bed40c39a7b1f8b02cf5e40 SHA512 a2cbbba40bc4fb97ef5b730f26818fc9153c27b5fdf248b587d12ef63dbcfe6f0c98f0bf7efd421ef4bc0dec473a780d2913afb3b806c6a30f9ad73f546d9536
 EBUILD wine-vanilla-3.20.ebuild 17308 BLAKE2B bdd30e07641146aabc517f4f46b34d71e4182428dae9e89f564eebd8f057e78cf4b6ea5b8bfcfe1172d95265cd3bc6c3f2d32ba29bed40c39a7b1f8b02cf5e40 SHA512 a2cbbba40bc4fb97ef5b730f26818fc9153c27b5fdf248b587d12ef63dbcfe6f0c98f0bf7efd421ef4bc0dec473a780d2913afb3b806c6a30f9ad73f546d9536
 EBUILD wine-vanilla-3.21.ebuild 17308 BLAKE2B bdd30e07641146aabc517f4f46b34d71e4182428dae9e89f564eebd8f057e78cf4b6ea5b8bfcfe1172d95265cd3bc6c3f2d32ba29bed40c39a7b1f8b02cf5e40 SHA512 a2cbbba40bc4fb97ef5b730f26818fc9153c27b5fdf248b587d12ef63dbcfe6f0c98f0bf7efd421ef4bc0dec473a780d2913afb3b806c6a30f9ad73f546d9536
+EBUILD wine-vanilla-4.0.ebuild 17346 BLAKE2B c5530dbd38c9750f69eabfe3fd21fe84af22368e266c050ba7782b34d90d3bc7cf0f7b53b3ac1389236e4095a7e463724e0bd75a5457a4ad67eaea1a4435017c SHA512 2eb2cf5565b47767ffa625800ffdf0230d63e7af5b43e8bad35c4e427aa05db42504476bec76ba0c15494860ff1509b3049abb3a9674891bd7b00a068fefd421
 EBUILD wine-vanilla-9999.ebuild 17348 BLAKE2B fb54a9a4fce1edfec32205a1d2ece604ac389debd6aed82807cec12b2fd4c958f44dabd1fa5b47177dc9ff43fc7ec1e424f84fc5a85a8c5f251f3b7fd7efcfe6 SHA512 0110604461c0ca846f96eb5271c7b9766d4d9f6083551793b13dcb5e283f5a7ca27ad3917f5cffcf2d6f113dd26d42d66b8bc063c5931749fe7d5fd3e42d035c
 MISC metadata.xml 3157 BLAKE2B 917ac49661429459c488ba4e4e83a0fb558dab3068635d2ac307eabd9e1576c9034fe53ec80bd71023be925d184aca442d8c61eb5ab788a947e22a0d2aa0882b SHA512 2709187f3765e00e14c19049fa81f920a8f8ef60dc4b36db17faccf26df8b04edd017368d820fce91c65836662ba21d29a104b6ac0ac17164047f29bb7c85d91
diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.18.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild
index 04acfab00725..416e5edd5f14 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.18.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,8 @@ if [[ ${PV} == "9999" ]] ; then
 	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+        MINOR_V=$(ver_cut 2)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
 	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
 S="${WORKDIR}/${MY_P}"