gentoo resync : 15.05.2018

22 files changed, 82 insertions, 105 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 28ce74b7155b..f70de0420fe1 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
new file mode 100644
index 000000000000..7b5ba7a3451a
--- /dev/null
+++ b/app-emulation/buildah/Manifest
@@ -0,0 +1,3 @@
+DIST buildah-1.0.tar.gz 2865669 BLAKE2B 7749ed00637fff9c2bcee63ef9e8985b3e6e2abff1c1f4787dc0730b9765576fac9173dd05cbc289aed3c0d20ff374a78976beb86c73adb221184415e4906a41 SHA512 17779e5bbc20fff6da607898620a8193e11ef13ddc033e7868776aab53a710e09428dca0450f11368d750bf7179fd4850ac3a8a445bd9537d987bd837853f4e5
+EBUILD buildah-1.0.ebuild 1030 BLAKE2B 6433baa65962203139b9ff71c665f46d7de0a6d74e90c55cf32c9a0559af94d3eb7b3707f4184c83902e92231bbdebae3769b83110dfe41570e5642e25b45a8d SHA512 207cb4e59bfa5f233fe0c97ddb967ff9521b4e16828e9a7186a2c93968b6c2e14d5dd41185bcd0e45096dde0d00eeb3c848490db1fe6400c35110786e21129f6
+MISC metadata.xml 330 BLAKE2B 0be4a049ad821a2355b1d5ac21ae58def26c7f3310a56c7b870c25e6c018f1bc6147c59bfdc42885ba4f8238538d69e31928f35f002ec5ba684da87673b8f87c SHA512 c8c1341578b493bc9b68d615fb68232bed4369a60b839e397ba03e330f452e23124e180ee804a3fb1708169382aa65046931bc480f2690f37c3f698c12a94963
diff --git a/app-emulation/buildah/buildah-1.0.ebuild b/app-emulation/buildah/buildah-1.0.ebuild
new file mode 100644
index 000000000000..baf50ef426d8
--- /dev/null
+++ b/app-emulation/buildah/buildah-1.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit bash-completion-r1 golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/projectatomic/buildah"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+EGO_PN="${HOMEPAGE#*//}"
+EGIT_COMMIT="v${PV}"
+GIT_COMMIT="1ab80bc"
+SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+RDEPEND="app-crypt/gpgme:=
+	app-emulation/skopeo
+	dev-libs/libgpg-error:=
+	dev-libs/libassuan:=
+	sys-fs/lvm2:=
+	sys-libs/libseccomp:="
+DEPEND="${RDEPEND}"
+RESTRICT="test"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+	default
+	sed -e 's|^\(GIT_COMMIT := \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}" emake all
+}
+
+src_install() {
+	dodoc README.md
+	doman docs/*.1
+	dodoc -r docs/tutorials
+	dobin ${PN} imgtype
+	dobashcomp contrib/completions/bash/buildah
+}
+
+src_test() {
+	GOPATH="${WORKDIR}/${P}" emake test-unit
+}
diff --git a/app-emulation/buildah/metadata.xml b/app-emulation/buildah/metadata.xml
new file mode 100644
index 000000000000..07a3ba13a110
--- /dev/null
+++ b/app-emulation/buildah/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">projectatomic/buildah</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index a45eb4919970..75e52f0a0f9b 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -1,7 +1,5 @@
 AUX free42-2.0.10-fix-build-intel-lib.patch 618 BLAKE2B 9039cdf8c78ff198ea9a4927621f7e23f362fffbd537a0a988030713fe061398d2b7b2fc6120cda280249807d9aee448095b1f5cdfb824909d7d381650daafbd SHA512 192eb5e78c50ce52449c5b859369ab7258a98162c5d924ab8b8f3566f52be7a3c4aba95c3cafd60af82d5dcf1b1ad784cf3fe6bf432839baa1b4ca994ddf416b
 AUX free42-2.0.10-fix-makefile.patch 1670 BLAKE2B 6170b3a2a1f397ab10f1d36fe26f55e2c430066fbf7f292240ee359d38b670b68b9f17696f466e4f913af314662de8cffb13b211adbd0977cfa20b331fe52f8a SHA512 8b234cd643dd760b290c3d6054afa799371d249dc23eba889a168eed413037b6463e5f2b1219b9dd4c350d3338aff5adf27b2ea413d229b961ed40d8388c6617
-DIST free42-nologo-2.0.17.tgz 7389996 BLAKE2B cc7c7bbe43eafc190fe0ce8921e032c2042290fe54a3153ba7568dae315de1356a9ee7f8ded4528788c677537138a5bd5556ad79dbd67ab8e41dd881a258312e SHA512 f73bfb2984fa4301c04d905fde6723583a57a1f663e012f965037067a7259961c0134fecb456118ec4b45956f7c8ccc16f0ec1db62e4cc705dc74ea563225872
 DIST free42-nologo-2.0.20.tgz 7390214 BLAKE2B 306f3378bcbb44fa7982c5d9c29bfbea62e915ca50ca5e5216f46fbf483f110a1288d4800991a74622a042517496ff8dd94c3fa3249e8bb4181957e6b23d5ea3 SHA512 9b540fbc50df2f94b135b5e778354f330df77a54ef2ad99b257b5b91d1e3e8d1241e8a834522fc46fe33571ea2695ad8889b427dbcf653870672e89cd56d60f5
-EBUILD free42-2.0.17.ebuild 1058 BLAKE2B 2aea0b1798c337318ea685808d0f2c44f78f7730fd5aebc107b90a42c4b1fa8a9924c34cbd2f1e494087fd5033f6071cf665c63e2289ad1a23568b2210595d1b SHA512 494fec4edfd65644cb55c53d31ab4789f2dd5cc051529fcbc8bc909eaa4a305ad02143b2c04745cdd11be1a0b7dececf2c595907ba883bbb39e7a1929b8f1539
-EBUILD free42-2.0.20.ebuild 950 BLAKE2B 9bc7e94b50e067507c33a467b99fd860c88b4d7cc7fddbd949a05b6584bd21f08657c22ff9c7d33cbf1ee5898d830c973d597db94dbd14e5895b1294e0c272c0 SHA512 c5e9ef21556bd9580f304f88c28c76a019cebafc340655152a02febc4e5ae87dbc9f8966e57b589e1e0020ae02166fc9e86fafecd74f3966b6672407c13482be
+EBUILD free42-2.0.20.ebuild 948 BLAKE2B 59ada24ef7746d402bfc2e9cb8ea80c23a68e3ffcd1a3da035281d7544422b21ee3c41fe005721672a180f97a850a7066f3a8087f4aa377fb4c0b4e6233fe49f SHA512 3c117630b0266091dff0b540c1975f6e5c69ec46d8a1f8ad55d7757147df9fc2a6bc9bd3bcfead241cfa8dde29deed727bc1bf39e1f833aab686f2c98504a123
 MISC metadata.xml 540 BLAKE2B de6a28fadb4dba9dac7c9aadbbd0972cb9583c8b1aac154ed9247199287c060adbf5df8a0639b7e4ff218da84a5e1c19e855e2c11688124c76c1cc07fca1e393 SHA512 88a7488f445dc2233eecb68e9100751da821c45ddb6c60a18600dabe7278681a3625abd59ed7088bc526d0853529c98bb84fdd76796a5cdd4a5379bd6e17b7cb
diff --git a/app-emulation/free42/free42-2.0.17.ebuild b/app-emulation/free42/free42-2.0.17.ebuild
deleted file mode 100644
index 5d440a08b23e..000000000000
--- a/app-emulation/free42/free42-2.0.17.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-MY_PV="${PN}-nologo-${PV}"
-
-DESCRIPTION="An HP-42S Calculator Simulator"
-HOMEPAGE="http://thomasokken.com/free42/"
-SRC_URI="http://thomasokken.com/free42/upstream/${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa"
-
-DEPEND="dev-libs/atk
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/pango
-	alsa? ( media-libs/alsa-lib )"
-
-RDEPEND="${DEPEND}
-	x11-libs/libX11
-	x11-libs/libXmu"
-
-S="${WORKDIR}/${MY_PV}"
-
-src_prepare() {
-	sed -i -e 's/print_gif_name\[FILENAMELEN\]/print_gif_name\[1000\]/' \
-		"${S}/gtk/shell_main.cc" || die
-	epatch "${FILESDIR}/${PN}-2.0.10-fix-makefile.patch"
-	epatch "${FILESDIR}/${PN}-2.0.10-fix-build-intel-lib.patch"
-	eapply_user
-}
-
-src_compile() {
-	local myconf
-	use alsa && myconf="AUDIO_ALSA=yes"
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C "${S}/gtk"
-}
-
-src_install() {
-	dodoc CREDITS HISTORY README
-	dobin gtk/free42dec
-}
diff --git a/app-emulation/free42/free42-2.0.20.ebuild b/app-emulation/free42/free42-2.0.20.ebuild
index e19a9ce48c9a..d9b18f97ed94 100644
--- a/app-emulation/free42/free42-2.0.20.ebuild
+++ b/app-emulation/free42/free42-2.0.20.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://thomasokken.com/free42/upstream/${MY_PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa"
 
 DEPEND="dev-libs/atk
diff --git a/app-emulation/kompose/Manifest b/app-emulation/kompose/Manifest
index 20b2882e5765..2e570bf2807f 100644
--- a/app-emulation/kompose/Manifest
+++ b/app-emulation/kompose/Manifest
@@ -1,7 +1,5 @@
-DIST kompose-1.10.0.tar.gz 5232838 BLAKE2B 145938e68ede3f956cf0a2c08066ec49257527357c1c032d265b39fc00f4c07da26fcc90f1e8999a755345715332dfb5f6df82f15e817c8460f2c9038ebbc1a5 SHA512 578348c5907344b47bac17b9d6a9d8c4ba5cce9fbe72ad3b65af60dcfb985bd39ee2973308dbfa45d4bd78467fa330621c16624cc7d92287b943ac02d0ae3e45
-DIST kompose-1.11.0.tar.gz 5233209 BLAKE2B 335281a1d311a41ef288236bc6796c2f8a70c7dfb7fc131f8baaaa845597f24c3e8200a67fad0d893f8f0da6f21c0eb6fc7fd416634e78cdd0212390ae814f26 SHA512 635297df08a6af107949bd39d3f8fb1a00eb1c1b7584b1f1e451a291df657709fb0998d155d6f4a6c12e3b716a7a8194eac57f654d8ad3f8f8f9b91011398aaa
 DIST kompose-1.12.0.tar.gz 5234150 BLAKE2B 0b046cc2fb9420a69bb8a2d82a7c4f8a62db74acfaa9cdc5dc16b3710cda7c03fb43651bdd1e43281502f4aa181b50168120375a7f0e298a1ba018ddb94cd43a SHA512 5467b8fa54fe9368f1f1627c04e4edab597822b7b2c3c101510379cceac8ca92e24540b81b82e947244b1b4056e2b1a5806220b38bbe5db5965c3f7aeff908ef
-EBUILD kompose-1.10.0.ebuild 889 BLAKE2B 2585d8d8f56f0e83512947d0808ce46bb61541d30bc426a661567730cba76bebc8e25d2222320aa889945ed18935230e41ad041106496b9d2a7ad8afea09dea7 SHA512 adb04fe9f1f4375e08bfe42c701714f59d37dbe32dd956856744d12abca9c60209241f91e4669fa14842596582fa0a3bf078500ee464ee1a475e94f328fcfb74
-EBUILD kompose-1.11.0.ebuild 889 BLAKE2B e0d58366ebb6005bcdc82e2e49067316371239c0bd6de9b19660e033fa716d0c47f70336de8067efdce69eb4016cb7a5be0565268eeb3d9f85b9b933a3db04b9 SHA512 fa2668c00534c1bed68f67f3d92bc78dee1299af163d2e76e4fc778a4c414be04c5faf73c29aa808a107a6126aa26131bce4b6a9dd82ffb578d5f65b85510668
+DIST kompose-1.13.0.tar.gz 5238799 BLAKE2B 8f51d9c4b162104636578b5b6b044060997d7c8fbd8a58fdf42d8db1e5fbce51cbfd2e010e84e80707462edc29603da3a6ac729f95873f2c84b7a43baeac8284 SHA512 6ec870f03762bde138e2c22e9b8a85a1e974897f3857f096e1fcd56bd402d1f3379936752b075ee57497e5d4f1c7c7d0c82b09d6c4e90860cc04aee434123419
 EBUILD kompose-1.12.0.ebuild 881 BLAKE2B 3f99cc757fdb901949f80216fca45c9de83fa3b54f0637055bc7d1670541cd85ed1e25244f9325e017470cf0f82edafc28ef4e2e9e3e9365c5eb5b6284768d0a SHA512 01e2b22e197dd52e7e3ad8c240150782d6de59d41da8cfb7d98aba2698a62c127a2fe837115cdb2ff5cea92f25b8e6e386bc5dfce1d6e95cb3d651887cddd73a
+EBUILD kompose-1.13.0.ebuild 914 BLAKE2B 3d7a24dac2a68fda2454e96b829dd4b8bfb330939cf136283fa52fe2ee5f9636077c08cc86d1aec9495faf18a99df4659435eaa2a473833858093ee727a7ad33 SHA512 4b245704d29c8ad0fda59264a777133b92b75bdc84813280afff3740cea4f1b53bcea556f0f55548f6cef3e81f0133d9faaed35392ceaec8994450bb96abfb89
 MISC metadata.xml 328 BLAKE2B ad1e8cb1083ed13de1f3f341fdbe9bba7ba3ab4364c8c36c9e3b63f63688da6926fc6bebc9f72aada52dfac1a4834b11cb27eee04aaaae484192b8ed74214aa6 SHA512 e2091ec84a909ad6c2453bd832817461e39b7c355c28bd99c19d9e85dc4a621606c34066f596a68585c3762b6b156455ca012495c5c336b9ba929d163b923042
diff --git a/app-emulation/kompose/kompose-1.11.0.ebuild b/app-emulation/kompose/kompose-1.11.0.ebuild
deleted file mode 100644
index 7d65e15046a5..000000000000
--- a/app-emulation/kompose/kompose-1.11.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/kubernetes/kompose"
-EGIT_COMMIT="v${PV}"
-KOMPOSE_COMMIT="39ad614"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Tool to move from docker-compose to Kubernetes"
-HOMEPAGE="https://github.com/kubernetes/kompose https://kompose.io"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-RESTRICT="test"
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	GOPATH="${S}" go build -v -ldflags="-X github.com/kubernetes/kompose/cmd.GITCOMMIT=${COMPOSE_KOMMIT}" -o bin/kompose src/${EGO_PN}/main.go || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/{docs,{README,RELEASE,ROADMAP,CHANGELOG,CONTRIBUTING}.md}
-}
diff --git a/app-emulation/kompose/kompose-1.10.0.ebuild b/app-emulation/kompose/kompose-1.13.0.ebuild
index 1ea7f4cafd75..7e7e3b6934b7 100644
--- a/app-emulation/kompose/kompose-1.10.0.ebuild
+++ b/app-emulation/kompose/kompose-1.13.0.ebuild
@@ -6,7 +6,7 @@ inherit golang-build golang-vcs-snapshot
 
 EGO_PN="github.com/kubernetes/kompose"
 EGIT_COMMIT="v${PV}"
-KOMPOSE_COMMIT="8bb0907"
+GIT_COMMIT="84fa8267f38abbdaa9b46fbb6f800ccb5c246da3"
 ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"
 
@@ -21,7 +21,7 @@ RESTRICT="test"
 
 src_compile() {
 	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	GOPATH="${S}" go build -v -ldflags="-X github.com/kubernetes/kompose/cmd.GITCOMMIT=${COMPOSE_KOMMIT}" -o bin/kompose src/${EGO_PN}/main.go || die
+	GOPATH="${S}" go build -v -ldflags="-X github.com/kubernetes/kompose/cmd.GITCOMMIT=${GIT_COMMIT}" -o bin/kompose src/${EGO_PN}/main.go || die
 }
 
 src_install() {
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 5050bd65b35e..8a29706ae2b9 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -9,5 +9,5 @@ AUX lxc_at.service.4 265 BLAKE2B 4454528e69a5c986c23c0c4ccc10ebe03a0650e47cd3020
 DIST lxc-2.1.1.tar.gz 1378640 BLAKE2B 5fca516540a886729434579ff99acf3baa06977fa0e0b6f24dbf15094626335fc073597d308276e3dd20e27ceabf1477cc8e99d1fd24cf50b9aed2720b887b69 SHA512 2989d57acddfe091adcf8031721c3c9a2f8eff5476bd6155366b76ea7511e0f6120e669276e056e3963863e0f0acf3b095d44c36fa6652e67c197671f28cbdd4
 DIST lxc-3.0.0.tar.gz 1233316 BLAKE2B ba726a07f48b1d32366012c8d885a853e33f88d8c45c910b061d9deecf472d940f7d45a1e742c8194517ba3231e1875a49bbf303b2c3fd2c9ece33b941670bb7 SHA512 21372e6fe4d38e2cf54707fab4133137793deff1dd500ed7ed02c03bbaa809de56c7490971594cddbdcb2b96f0c03ab5dfb43a8582a584598a12c5943b7ca490
 EBUILD lxc-2.1.1.ebuild 6763 BLAKE2B a4d6e09451ebb728147e1ebeca98292422472040eea4a7664e8659d2d00774933b16e264b2af3a0ad6a90750586369a02cc6149959bb3a218a528f4f8f0aa773 SHA512 e5838b9a63d096284905d3f000c268a6c398835c2054c2d0bb92e3e6ed2d0b3aaeb2a417d2c04b8182ced7447a47fa9e1340e89f92d0fd6dd48238544684a727
-EBUILD lxc-3.0.0.ebuild 5534 BLAKE2B b0ab7524c7e4d935b03ae4bb391aa1848c1ae514c93db089f7c202365d04566808f7370c2731273b83c7785874e078241d3d9fe5e072e8d543501a1a9ae19e24 SHA512 f900d99c1fba950ce7a9276961c1ab27ac035c0cd0760ef5c427dc9456161ff1a647454c801ab02d475b9ed7e5a9dde512a8e8fa317ece4edbbc46cceac22b05
+EBUILD lxc-3.0.0.ebuild 5546 BLAKE2B dbb5955ff8aa1a3de063548c6447f90d4f050ab08fe252662d5eaf29a64336660d40108aab32bcdf19d250d118c7ea39e7b3b567aea19aaa6ca942711874eb52 SHA512 395ae0dff135e503d20cdeb65782b67510c1fed00e21d88b00ebfd76457ae7506dd66d77ce7ad142b32c57de7faa074a807f486cdd6519197cec3c22093272ae
 MISC metadata.xml 811 BLAKE2B 433a5cbe39002614c88eae4829c998493e95cb0b8eeb0a9f546e08e33a82fe5edb384e9a9f747d1129e0cdb7b8a634bdf4a0b7cf385bc3d243dc83cab06b899c SHA512 fea5f647ca7eb616307378375af86051034e03170f6ce62e2219f78343797072902102515f93cc0f809558fbfbca88eb81e9f8d0fa621ae18381d39a12c31aa2
diff --git a/app-emulation/lxc/lxc-3.0.0.ebuild b/app-emulation/lxc/lxc-3.0.0.ebuild
index c6cd017971c9..4122c2e8599d 100644
--- a/app-emulation/lxc/lxc-3.0.0.ebuild
+++ b/app-emulation/lxc/lxc-3.0.0.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	selinux? ( sys-libs/libselinux )"
 
 DEPEND="${RDEPEND}
-	app-text/docbook-sgml-utils
+	>=app-text/docbook-sgml-utils-0.6.14-r2
 	>=sys-kernel/linux-headers-3.2"
 
 RDEPEND="${RDEPEND}
diff --git a/app-emulation/nemu/Manifest b/app-emulation/nemu/Manifest
index 3ee22499145e..004e99b1ffac 100644
--- a/app-emulation/nemu/Manifest
+++ b/app-emulation/nemu/Manifest
@@ -6,7 +6,7 @@ DIST nemu-1.4.1.tar.gz 82891 BLAKE2B 2f2d85631fbde50513b56e86deb87c7ab8bf5478473
 EBUILD nemu-1.1.0.ebuild 873 BLAKE2B e12690f1d1126c8dfd810b599e9b35e4ef8d01411609009761df056ae1c297f0ef0968f2e4a5e1a8ec6d905e0bbe168a3b8c2b8d478657f1a3b855512479374f SHA512 8639e85e33e4941e3425473e363c710d8e0cc1a09aed00d31c12a349065ba3be98392cfdb3fb2d82e1381caac17a07f6862733aed0215bff931e4dd33930a2b5
 EBUILD nemu-1.2.0.ebuild 873 BLAKE2B e12690f1d1126c8dfd810b599e9b35e4ef8d01411609009761df056ae1c297f0ef0968f2e4a5e1a8ec6d905e0bbe168a3b8c2b8d478657f1a3b855512479374f SHA512 8639e85e33e4941e3425473e363c710d8e0cc1a09aed00d31c12a349065ba3be98392cfdb3fb2d82e1381caac17a07f6862733aed0215bff931e4dd33930a2b5
 EBUILD nemu-1.3.0.ebuild 873 BLAKE2B e12690f1d1126c8dfd810b599e9b35e4ef8d01411609009761df056ae1c297f0ef0968f2e4a5e1a8ec6d905e0bbe168a3b8c2b8d478657f1a3b855512479374f SHA512 8639e85e33e4941e3425473e363c710d8e0cc1a09aed00d31c12a349065ba3be98392cfdb3fb2d82e1381caac17a07f6862733aed0215bff931e4dd33930a2b5
-EBUILD nemu-1.4.0.ebuild 1893 BLAKE2B 3adb826d01c70d26c25999091ed1e6fcf2a19bbf49e59553d413b0a2ec49a06178e3305df308c7fefc2af28cdb1892cc148a4ee7b14d2fdc63b0d3d0801e68f7 SHA512 ebf44232739c347797485731b839c3374043b539d254f04eb81c594542833c48e4722e0b64c0cac121314973dc76a15ac11c0bc56d2fd59ccbf80010870a9f99
+EBUILD nemu-1.4.0.ebuild 1891 BLAKE2B 27b52bc602b79f36049ef3c6d821bab4ea2d41d8d8b4e7db724471a70e57f31b00fb3e536d0f05e985bc0e9fb0bd108a81cedb06d1e7196b51d784fd3fefe64c SHA512 93f84ddd87c8796431d9e0bd42e437be3fd4cd774ba34252866dfba20ee8572a728578b05edda974af13977c42b60dadef2cd29208da568aba27e0f9bbaaebd3
 EBUILD nemu-1.4.1.ebuild 1677 BLAKE2B 86cda2a8ea881b7ad662a6a4cde1b167329d42343929556aeb2ed0df639a240e5775e92c6a866843691750a3efb7d1ede1e8d1c53a9ad956cdb1867b0879eaa9 SHA512 328d92af10ace6733a6cba58ede2bfe75fa464fc208fa81faf9a6c6e0d6e56ef7328dc4ec1e8295a6908fd9d438d0931dc84b59091e17d46c057d0e0dc48cb41
 EBUILD nemu-9999.ebuild 1916 BLAKE2B 232c49c84167c44c6fc3afd2e1b26cb6f820b53d345956c4d92058368f095206e3351ac431728a6f8847a88e53f09af7e39b5ff24874635b231b9a1ca6df7abc SHA512 87b016f6a485c921222428b96b11687cfb906118cfc398318b14f45ebd1c09aeb710b0cdea389a41e5936478e31645925599b32fe203fe07559debb54d7ed9b4
 MISC metadata.xml 499 BLAKE2B 2d190da58be258c1e5e997128bc65e9f928c9ec86e9be23d43cc881c92d9cd65e9cdee6db7afb92abf799aaa552ad5ddcf6dbdafd26d12c2521e8724f7f98471 SHA512 42e56aaad5eff7d180c6af0ef571f5fca4e101e934fc7506387456d89068ab8446e861dcd1124d85d962bf05b48a26833d0883b7c152c7214c79c324c18d236f
diff --git a/app-emulation/nemu/nemu-1.4.0.ebuild b/app-emulation/nemu/nemu-1.4.0.ebuild
index 490f99df8827..9dfc42f9867b 100644
--- a/app-emulation/nemu/nemu-1.4.0.ebuild
+++ b/app-emulation/nemu/nemu-1.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://lib.void.so/src/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+vnc-client +ovf savevm debug"
 
 RDEPEND="
diff --git a/app-emulation/wine-any/Manifest b/app-emulation/wine-any/Manifest
index 9bdbe13b7eab..e4e2bf83cfab 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-2.0.tar.bz2 23662707 BLAKE2B 1d485c1359ce8a0395a9f6378c1f8be33ea2836b80390d1eb1095057a0acedd21708daab16e1851a315391b9f9b0a360879b9d98c73bcc8371c5023e9a8037f5 SHA512 b0a57ba8202d9fc396e5bfb7a7718d6bababbed8f3351e7fdc36afa37f35a871e04903757618f73427aeb71a52b2d323977d79e48f8b38d636f23fd404441186
-DIST wine-3.5.tar.xz 19963436 BLAKE2B 83d7c0719a088f8c705f7a9d8a6df6b9ee5e0a5ffa57c0a921875097be29298bebb9025222039432c65da32359e187a93413e04a5bb73171f0033911595baf9f SHA512 c1e36f3db862fdedd00c3ac20c84c6eb799b53fe32e959b481a6168baf7d9725ed9bd0a97e7f9b651e3ccfba4f8fb623445369be03fde5010ed0fcb0a53e7d3f
 DIST wine-3.6.tar.xz 20005240 BLAKE2B 6dd48180b9aed8a3b69c40b3ed7b2ff5adbebfb591860dda6603d2219f9059bc069df000cd2614c80d34911c451388f0124af3dd8a11b806b227ca8e16659d71 SHA512 31d24cc78734bdb743afcec7df05b641ab0625568361401eaf8cd5e217719c8c51a0ef7ed737a560fe42cb9ecd88f10d35e62a98d9df69b966502a5b0dab5a22
 DIST wine-3.7.tar.xz 20454036 BLAKE2B 04ac94d5679377c5d0bb37a6d3e8e3ec7c09faa300f8422a09a22b14ef4244d2bb14c80a47cfca5e11526506a8064f0cfa4e28868d7f04669f85ab743dbbb36d SHA512 a699418574dd8f407c064421cf6cdfe3923562c8adf9a7749e716f3853291eab05358ea64f0217c303c26c0f8f59d2116024b7b6978f9a52a055147e689a8694
+DIST wine-3.8.tar.xz 20473392 BLAKE2B a7873dd15a373491703e16888044cf2ba00121f91a4583fe6dcf687b5179a2d926035cc86c75f70ceca03a508bd4712c58a1662186e0a6e0c139e63e686f8c5d SHA512 387c6bff3eafac7e92030d11c02b3461b4ead059d2aad7f6d903e176f304d2ac0a426132fcd452507868f0d22bb360a30734edf3e73dfd514037458f08406e98
 DIST wine-d3d9-2.0.tar.gz 48373 BLAKE2B 80370a7519141030a7e54c2ea5db410b2bf1cde8d8389618487c52e4ff40f87cf7b0f9087331bb43fa6436e1b9936de9cc00a02b9ab9ce6528635a245e6a8b3f SHA512 a9e2d1c9f2784128e4c53a8dc923070a5057b5ff3d83c2b536a2d2df0bc8433ac92b8ab1c3cdf34158c0e7bfe497ddb5974605fbc1736a92307639d59450c7a1
-DIST wine-d3d9-3.5.tar.gz 50711 BLAKE2B 701f9bcef8f9849c66b567d72b8055522d5a96e4a6581a0da9085df441e9a8907527059e250dfb5630bd605cf451c1f7c60b120f5ce333ff10730f301f7ba70d SHA512 4bde2b510f8726b002dd33af75884eb165b1050338ab553fee071653af343a08d27d338ee42b68600038171d6c645386cde8513fa80c805f8118eb0d9f6c5f4b
 DIST wine-d3d9-3.6.tar.gz 50706 BLAKE2B 6d7af8e428de4d0b3d7ec5fc5d157801d3e807cbf63603d8334a564e34b411f2eabba49744670840b12c54a341a9350d1a87f0260b963c9c9392bd81526350e5 SHA512 67ce67e99c0e1c53f9a81074520465e4c59b6c4bb9a9921ce477d65f4e25b62ae85aa32314cf14a1d10a647da9efc72944e5b1ef9bab344e0aac500589f24106
 DIST wine-d3d9-3.7.tar.gz 50699 BLAKE2B 1ab795a0636e7654cc1c96e2a0ba40ff7f89eaa2983d68c4a0eabf3a69355e68e833fee63fbbff67ba840a28d34724a841c1c3c6695ae2d8bcaf38f7fbf4fd16 SHA512 9a02e40bda9c26001857355ddfb1ba68afb518158260b0904c5aaef3991e19587dcc107cc34b01b9fbda7e710be488384b020bbf8d56632cce787ffb299bc3f3
+DIST wine-d3d9-3.8.tar.gz 50700 BLAKE2B 33b71ef6e8839e55a74afa10eaabdbfadee6a99c94d89c402b796516aaa72d094c024a253c9f06f4685b8453f097513fa88f6dc72a4fe230c44d0d960e6d44d3 SHA512 e036f9da5993732415752d1f076eba5fd378ad49949a12d094081ff02454dfd8ce2156a5f418b77aa1426772f0b0785f3b0ffb9fc84e80c6265b6e5b7226bf15
 DIST wine-staging-2.0.tar.gz 10182575 BLAKE2B 1de645f66fa3e5e0d8ceddf5439fd246510470f63d6331c7029abed7192180b7b8430e43a2e732a30a5fbe0c73ba39b7fafcfc08830c68e679dff90576c3a960 SHA512 51412299259d6e92c8993543d5fdb3239ebe31e0d1d715e0a9e8ce94b3139c0567b08ff1600d41be94f12427cbfccc2f6b6b2ed030535445c95618aaf6578580
-DIST wine-staging-3.5.tar.gz 10024748 BLAKE2B b5399bd22fd1edc1e22ee82e19bb9e54d4d12e771cfa0578dfc69d5cc18c0b6c1dba8e9c522ffddd14c187e012f33196738035dd34b45d71f48eac96997fd8b5 SHA512 39ce4fccac408d69c55fe53376744d218d546d09fc3fcaa5c8e87ba070de5ed52128ebdf0ed76cb5e3a5178a79c8fb25a8786b129e8b3eb59156732d7a4bf15c
 DIST wine-staging-3.6.tar.gz 9958882 BLAKE2B 9f7d3d6d748f7bceb08a584bc93a1ce97c09d13cf5448ed1fbe1981494e0009e4686f047d8005a059522ec78749dd120f29f7c6562da8578a95a5dda91c23895 SHA512 839731fa3dba91cefd9e0f036b4d688c4786fe8cb19143819457fb9e45a6c14ef3a70630b585abdd424a00036312114034a2529700012ea1863527e45fbfac2a
 DIST wine-staging-3.7.tar.gz 9951654 BLAKE2B 3d6c9a023f3a4f9da6e506a88490365d4f0959231e7f9e375e8ae46006c3cfd82ca4e65af9df79d9c54cf7ee5e53452b10ac5146f2c0de97a7c4946aefac3cd5 SHA512 4a00b7c61121798b6c4e918aadeb71865e359f6471035b9ed33ae242f3fe70f1977b1c0b3628fb244b5ba4942d771d2ee797bcc087d38192fcd9325e1886ed14
+DIST wine-staging-3.8.tar.gz 9957202 BLAKE2B 1f85ebc9cf8f5d3c684ce60a59783355ec558e62a8c93564107de2893e82257846be45b3f55fd23f9b317245acc04ee3c4884003572169d6f0efef30145e33f7 SHA512 46ba27b0b9fe5f86d1647f12050715b796604c91487cad6847dce5250ffcfdf8ccf44dcff79c88048221cbf58af92ed72523c09f3591e2c5306bba24ff9d154c
 EBUILD wine-any-2.0-r1.ebuild 20915 BLAKE2B 7ff1002e303dd2a083267fbf24e4b6cb0e3ff620d6bbf78b8fb15d66fb4d11669812233f1edeea0f46e75b9a0c8a9e63244aa4bebb594b95d158d55fc2506e6d SHA512 8e1bd0d4391f1e9336f9c39ce46d97f921f70cae75d961bc8fe8c7ec6c51bbba621c19a3171f0c351ce6e038d37a7f9a73f6f0bb4622f176e5a994e4a989b2e7
-EBUILD wine-any-3.5.ebuild 20861 BLAKE2B 0acb0152cb2d03946e6bab0bf75da0d90971500a076ecca9f2bea56c9b541c00c7839b94a417b8003de02c1fd5bce0e7fe39bc1abda52f3c4e1dabd75d0b8b52 SHA512 1c10d5aab4aa672bc9d42a3b4c530fd39c09b7d05708e2955899619327ffa70ca37cc3e1e88535e6ecc598ee870c30722a62b96b88a34f95e8a5c892fcaf489a
 EBUILD wine-any-3.6.ebuild 20861 BLAKE2B 0acb0152cb2d03946e6bab0bf75da0d90971500a076ecca9f2bea56c9b541c00c7839b94a417b8003de02c1fd5bce0e7fe39bc1abda52f3c4e1dabd75d0b8b52 SHA512 1c10d5aab4aa672bc9d42a3b4c530fd39c09b7d05708e2955899619327ffa70ca37cc3e1e88535e6ecc598ee870c30722a62b96b88a34f95e8a5c892fcaf489a
 EBUILD wine-any-3.7.ebuild 20861 BLAKE2B 0acb0152cb2d03946e6bab0bf75da0d90971500a076ecca9f2bea56c9b541c00c7839b94a417b8003de02c1fd5bce0e7fe39bc1abda52f3c4e1dabd75d0b8b52 SHA512 1c10d5aab4aa672bc9d42a3b4c530fd39c09b7d05708e2955899619327ffa70ca37cc3e1e88535e6ecc598ee870c30722a62b96b88a34f95e8a5c892fcaf489a
+EBUILD wine-any-3.8.ebuild 20861 BLAKE2B 0acb0152cb2d03946e6bab0bf75da0d90971500a076ecca9f2bea56c9b541c00c7839b94a417b8003de02c1fd5bce0e7fe39bc1abda52f3c4e1dabd75d0b8b52 SHA512 1c10d5aab4aa672bc9d42a3b4c530fd39c09b7d05708e2955899619327ffa70ca37cc3e1e88535e6ecc598ee870c30722a62b96b88a34f95e8a5c892fcaf489a
 EBUILD wine-any-9999.ebuild 20861 BLAKE2B 0acb0152cb2d03946e6bab0bf75da0d90971500a076ecca9f2bea56c9b541c00c7839b94a417b8003de02c1fd5bce0e7fe39bc1abda52f3c4e1dabd75d0b8b52 SHA512 1c10d5aab4aa672bc9d42a3b4c530fd39c09b7d05708e2955899619327ffa70ca37cc3e1e88535e6ecc598ee870c30722a62b96b88a34f95e8a5c892fcaf489a
 MISC metadata.xml 3759 BLAKE2B a21e9d2b06bc68c65eef244835d50873cbdd1a9684d344e57b41ab4fdebe3e103cec39ab564b1ac59c3d3fa333be7cb49f07094c93c18dde6d8dfef612908af0 SHA512 c255b1ff6adef135740f290e67633141907e3f18312a361390d2e30d76ff38db606aec544d92cd78bbb2f3f829c9a6b7ff63dc39748cc2244a3ab63b34557389
diff --git a/app-emulation/wine-any/wine-any-3.5.ebuild b/app-emulation/wine-any/wine-any-3.8.ebuild
index 11a4e315f58d..11a4e315f58d 100644
--- a/app-emulation/wine-any/wine-any-3.5.ebuild
+++ b/app-emulation/wine-any/wine-any-3.8.ebuild
diff --git a/app-emulation/wine-d3d9/Manifest b/app-emulation/wine-d3d9/Manifest
index 95abcdfa472e..985979287c45 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-2.0.tar.bz2 23662707 BLAKE2B 1d485c1359ce8a0395a9f6378c1f8be33ea2836b80390d1eb1095057a0acedd21708daab16e1851a315391b9f9b0a360879b9d98c73bcc8371c5023e9a8037f5 SHA512 b0a57ba8202d9fc396e5bfb7a7718d6bababbed8f3351e7fdc36afa37f35a871e04903757618f73427aeb71a52b2d323977d79e48f8b38d636f23fd404441186
-DIST wine-3.5.tar.xz 19963436 BLAKE2B 83d7c0719a088f8c705f7a9d8a6df6b9ee5e0a5ffa57c0a921875097be29298bebb9025222039432c65da32359e187a93413e04a5bb73171f0033911595baf9f SHA512 c1e36f3db862fdedd00c3ac20c84c6eb799b53fe32e959b481a6168baf7d9725ed9bd0a97e7f9b651e3ccfba4f8fb623445369be03fde5010ed0fcb0a53e7d3f
 DIST wine-3.6.tar.xz 20005240 BLAKE2B 6dd48180b9aed8a3b69c40b3ed7b2ff5adbebfb591860dda6603d2219f9059bc069df000cd2614c80d34911c451388f0124af3dd8a11b806b227ca8e16659d71 SHA512 31d24cc78734bdb743afcec7df05b641ab0625568361401eaf8cd5e217719c8c51a0ef7ed737a560fe42cb9ecd88f10d35e62a98d9df69b966502a5b0dab5a22
 DIST wine-3.7.tar.xz 20454036 BLAKE2B 04ac94d5679377c5d0bb37a6d3e8e3ec7c09faa300f8422a09a22b14ef4244d2bb14c80a47cfca5e11526506a8064f0cfa4e28868d7f04669f85ab743dbbb36d SHA512 a699418574dd8f407c064421cf6cdfe3923562c8adf9a7749e716f3853291eab05358ea64f0217c303c26c0f8f59d2116024b7b6978f9a52a055147e689a8694
+DIST wine-3.8.tar.xz 20473392 BLAKE2B a7873dd15a373491703e16888044cf2ba00121f91a4583fe6dcf687b5179a2d926035cc86c75f70ceca03a508bd4712c58a1662186e0a6e0c139e63e686f8c5d SHA512 387c6bff3eafac7e92030d11c02b3461b4ead059d2aad7f6d903e176f304d2ac0a426132fcd452507868f0d22bb360a30734edf3e73dfd514037458f08406e98
 DIST wine-d3d9-2.0.tar.gz 48373 BLAKE2B 80370a7519141030a7e54c2ea5db410b2bf1cde8d8389618487c52e4ff40f87cf7b0f9087331bb43fa6436e1b9936de9cc00a02b9ab9ce6528635a245e6a8b3f SHA512 a9e2d1c9f2784128e4c53a8dc923070a5057b5ff3d83c2b536a2d2df0bc8433ac92b8ab1c3cdf34158c0e7bfe497ddb5974605fbc1736a92307639d59450c7a1
-DIST wine-d3d9-3.5.tar.gz 50711 BLAKE2B 701f9bcef8f9849c66b567d72b8055522d5a96e4a6581a0da9085df441e9a8907527059e250dfb5630bd605cf451c1f7c60b120f5ce333ff10730f301f7ba70d SHA512 4bde2b510f8726b002dd33af75884eb165b1050338ab553fee071653af343a08d27d338ee42b68600038171d6c645386cde8513fa80c805f8118eb0d9f6c5f4b
 DIST wine-d3d9-3.6.tar.gz 50706 BLAKE2B 6d7af8e428de4d0b3d7ec5fc5d157801d3e807cbf63603d8334a564e34b411f2eabba49744670840b12c54a341a9350d1a87f0260b963c9c9392bd81526350e5 SHA512 67ce67e99c0e1c53f9a81074520465e4c59b6c4bb9a9921ce477d65f4e25b62ae85aa32314cf14a1d10a647da9efc72944e5b1ef9bab344e0aac500589f24106
 DIST wine-d3d9-3.7.tar.gz 50699 BLAKE2B 1ab795a0636e7654cc1c96e2a0ba40ff7f89eaa2983d68c4a0eabf3a69355e68e833fee63fbbff67ba840a28d34724a841c1c3c6695ae2d8bcaf38f7fbf4fd16 SHA512 9a02e40bda9c26001857355ddfb1ba68afb518158260b0904c5aaef3991e19587dcc107cc34b01b9fbda7e710be488384b020bbf8d56632cce787ffb299bc3f3
+DIST wine-d3d9-3.8.tar.gz 50700 BLAKE2B 33b71ef6e8839e55a74afa10eaabdbfadee6a99c94d89c402b796516aaa72d094c024a253c9f06f4685b8453f097513fa88f6dc72a4fe230c44d0d960e6d44d3 SHA512 e036f9da5993732415752d1f076eba5fd378ad49949a12d094081ff02454dfd8ce2156a5f418b77aa1426772f0b0785f3b0ffb9fc84e80c6265b6e5b7226bf15
 EBUILD wine-d3d9-2.0-r1.ebuild 18408 BLAKE2B d076c6114c7a8044803c22cc9e3b2ade886c2c5fe95f476fcb69558058733d1e75f178a956ebd5fde2c753690cc120df3c3161293af97031043d59a5f4ba4e7c SHA512 c6e0d90d32af5981ab83093680c0119c39c0843d818672270a83e9d40c5cf368641818fc8e82f29c7de07759cfc18d94990f400564987693c17bd24acb18f413
-EBUILD wine-d3d9-3.5.ebuild 18495 BLAKE2B dae0671629b084a1340625bfbb4a0159207b17085f1431081409abe71a1b7dcecc4f82660785cdba532df268028de31b38420d9e72910f90ff0ba8babef5371c SHA512 d06dd7491910b7524462f5f15c37c66cf99fd9fd882a2bd19c0dd464d0cdd6fdf955f679e333fed37235e0f2360ca9ddc0e1dec0a8256e91ee1d087b0d962283
 EBUILD wine-d3d9-3.6.ebuild 18495 BLAKE2B dae0671629b084a1340625bfbb4a0159207b17085f1431081409abe71a1b7dcecc4f82660785cdba532df268028de31b38420d9e72910f90ff0ba8babef5371c SHA512 d06dd7491910b7524462f5f15c37c66cf99fd9fd882a2bd19c0dd464d0cdd6fdf955f679e333fed37235e0f2360ca9ddc0e1dec0a8256e91ee1d087b0d962283
 EBUILD wine-d3d9-3.7.ebuild 18495 BLAKE2B dae0671629b084a1340625bfbb4a0159207b17085f1431081409abe71a1b7dcecc4f82660785cdba532df268028de31b38420d9e72910f90ff0ba8babef5371c SHA512 d06dd7491910b7524462f5f15c37c66cf99fd9fd882a2bd19c0dd464d0cdd6fdf955f679e333fed37235e0f2360ca9ddc0e1dec0a8256e91ee1d087b0d962283
+EBUILD wine-d3d9-3.8.ebuild 18495 BLAKE2B dae0671629b084a1340625bfbb4a0159207b17085f1431081409abe71a1b7dcecc4f82660785cdba532df268028de31b38420d9e72910f90ff0ba8babef5371c SHA512 d06dd7491910b7524462f5f15c37c66cf99fd9fd882a2bd19c0dd464d0cdd6fdf955f679e333fed37235e0f2360ca9ddc0e1dec0a8256e91ee1d087b0d962283
 EBUILD wine-d3d9-9999.ebuild 18495 BLAKE2B dae0671629b084a1340625bfbb4a0159207b17085f1431081409abe71a1b7dcecc4f82660785cdba532df268028de31b38420d9e72910f90ff0ba8babef5371c SHA512 d06dd7491910b7524462f5f15c37c66cf99fd9fd882a2bd19c0dd464d0cdd6fdf955f679e333fed37235e0f2360ca9ddc0e1dec0a8256e91ee1d087b0d962283
 MISC metadata.xml 3226 BLAKE2B 53375684e838aff002b377539525e9a5cd264c3ceb7598df727a4a6d3d9c22ea4a0aa40e6bc7cbdfc78179110ac90e3a1386b56c71916454b8f06d91831e9765 SHA512 39dd97318613ac08cf2515dd42e64406352c44787515eac72a6b0f699346e249379b5d8a81239aef7dc9ffc3480ce10d108ab2685224b0ab2120c34fc272166e
diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.5.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.8.ebuild
index 0fba831fcdee..0fba831fcdee 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.5.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.8.ebuild
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 5efc88a1b7f9..d2592881902e 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-2.0.tar.bz2 23662707 BLAKE2B 1d485c1359ce8a0395a9f6378c1f8be33ea2836b80390d1eb1095057a0acedd21708daab16e1851a315391b9f9b0a360879b9d98c73bcc8371c5023e9a8037f5 SHA512 b0a57ba8202d9fc396e5bfb7a7718d6bababbed8f3351e7fdc36afa37f35a871e04903757618f73427aeb71a52b2d323977d79e48f8b38d636f23fd404441186
-DIST wine-3.5.tar.xz 19963436 BLAKE2B 83d7c0719a088f8c705f7a9d8a6df6b9ee5e0a5ffa57c0a921875097be29298bebb9025222039432c65da32359e187a93413e04a5bb73171f0033911595baf9f SHA512 c1e36f3db862fdedd00c3ac20c84c6eb799b53fe32e959b481a6168baf7d9725ed9bd0a97e7f9b651e3ccfba4f8fb623445369be03fde5010ed0fcb0a53e7d3f
 DIST wine-3.6.tar.xz 20005240 BLAKE2B 6dd48180b9aed8a3b69c40b3ed7b2ff5adbebfb591860dda6603d2219f9059bc069df000cd2614c80d34911c451388f0124af3dd8a11b806b227ca8e16659d71 SHA512 31d24cc78734bdb743afcec7df05b641ab0625568361401eaf8cd5e217719c8c51a0ef7ed737a560fe42cb9ecd88f10d35e62a98d9df69b966502a5b0dab5a22
 DIST wine-3.7.tar.xz 20454036 BLAKE2B 04ac94d5679377c5d0bb37a6d3e8e3ec7c09faa300f8422a09a22b14ef4244d2bb14c80a47cfca5e11526506a8064f0cfa4e28868d7f04669f85ab743dbbb36d SHA512 a699418574dd8f407c064421cf6cdfe3923562c8adf9a7749e716f3853291eab05358ea64f0217c303c26c0f8f59d2116024b7b6978f9a52a055147e689a8694
+DIST wine-3.8.tar.xz 20473392 BLAKE2B a7873dd15a373491703e16888044cf2ba00121f91a4583fe6dcf687b5179a2d926035cc86c75f70ceca03a508bd4712c58a1662186e0a6e0c139e63e686f8c5d SHA512 387c6bff3eafac7e92030d11c02b3461b4ead059d2aad7f6d903e176f304d2ac0a426132fcd452507868f0d22bb360a30734edf3e73dfd514037458f08406e98
 DIST wine-staging-2.0.tar.gz 10182575 BLAKE2B 1de645f66fa3e5e0d8ceddf5439fd246510470f63d6331c7029abed7192180b7b8430e43a2e732a30a5fbe0c73ba39b7fafcfc08830c68e679dff90576c3a960 SHA512 51412299259d6e92c8993543d5fdb3239ebe31e0d1d715e0a9e8ce94b3139c0567b08ff1600d41be94f12427cbfccc2f6b6b2ed030535445c95618aaf6578580
-DIST wine-staging-3.5.tar.gz 10024748 BLAKE2B b5399bd22fd1edc1e22ee82e19bb9e54d4d12e771cfa0578dfc69d5cc18c0b6c1dba8e9c522ffddd14c187e012f33196738035dd34b45d71f48eac96997fd8b5 SHA512 39ce4fccac408d69c55fe53376744d218d546d09fc3fcaa5c8e87ba070de5ed52128ebdf0ed76cb5e3a5178a79c8fb25a8786b129e8b3eb59156732d7a4bf15c
 DIST wine-staging-3.6.tar.gz 9958882 BLAKE2B 9f7d3d6d748f7bceb08a584bc93a1ce97c09d13cf5448ed1fbe1981494e0009e4686f047d8005a059522ec78749dd120f29f7c6562da8578a95a5dda91c23895 SHA512 839731fa3dba91cefd9e0f036b4d688c4786fe8cb19143819457fb9e45a6c14ef3a70630b585abdd424a00036312114034a2529700012ea1863527e45fbfac2a
 DIST wine-staging-3.7.tar.gz 9951654 BLAKE2B 3d6c9a023f3a4f9da6e506a88490365d4f0959231e7f9e375e8ae46006c3cfd82ca4e65af9df79d9c54cf7ee5e53452b10ac5146f2c0de97a7c4946aefac3cd5 SHA512 4a00b7c61121798b6c4e918aadeb71865e359f6471035b9ed33ae242f3fe70f1977b1c0b3628fb244b5ba4942d771d2ee797bcc087d38192fcd9325e1886ed14
+DIST wine-staging-3.8.tar.gz 9957202 BLAKE2B 1f85ebc9cf8f5d3c684ce60a59783355ec558e62a8c93564107de2893e82257846be45b3f55fd23f9b317245acc04ee3c4884003572169d6f0efef30145e33f7 SHA512 46ba27b0b9fe5f86d1647f12050715b796604c91487cad6847dce5250ffcfdf8ccf44dcff79c88048221cbf58af92ed72523c09f3591e2c5306bba24ff9d154c
 EBUILD wine-staging-2.0-r1.ebuild 19947 BLAKE2B 44adc4926d0a93bdcb8ef176d0c058eb2a7ec6896ebc00f253e417f541fdd14e7236e4c1123b8aa93e7b386e15a34b356103e573e2a06ca2be4449073180d2ad SHA512 0d1173b27696344bd491f53fe2e6b11e88ba9d5d1b55869c9907ab292c20e248e48fc05b776c573a6f4dd6a49b8cbc247535e59c39990d80633bcbc55ef7c31c
-EBUILD wine-staging-3.5.ebuild 19893 BLAKE2B a82e6a10ef92b3ce1a79a75e205a8a146815e5a181c668d1278c6ceb0f6a36a6475ab8947bcfa1428cf5a47d48cb1fbed86a97f6b13dee55d36d11cb583c3212 SHA512 4de9bf77bf4f7678a95535b7733266d0ca81bdfabbae8a97424c1520226ae7d7a04a64d33455d45c7e5504248f139142269410854f67dea6b356d8ffbc7a611d
 EBUILD wine-staging-3.6.ebuild 19893 BLAKE2B a82e6a10ef92b3ce1a79a75e205a8a146815e5a181c668d1278c6ceb0f6a36a6475ab8947bcfa1428cf5a47d48cb1fbed86a97f6b13dee55d36d11cb583c3212 SHA512 4de9bf77bf4f7678a95535b7733266d0ca81bdfabbae8a97424c1520226ae7d7a04a64d33455d45c7e5504248f139142269410854f67dea6b356d8ffbc7a611d
 EBUILD wine-staging-3.7.ebuild 19893 BLAKE2B a82e6a10ef92b3ce1a79a75e205a8a146815e5a181c668d1278c6ceb0f6a36a6475ab8947bcfa1428cf5a47d48cb1fbed86a97f6b13dee55d36d11cb583c3212 SHA512 4de9bf77bf4f7678a95535b7733266d0ca81bdfabbae8a97424c1520226ae7d7a04a64d33455d45c7e5504248f139142269410854f67dea6b356d8ffbc7a611d
+EBUILD wine-staging-3.8.ebuild 19893 BLAKE2B a82e6a10ef92b3ce1a79a75e205a8a146815e5a181c668d1278c6ceb0f6a36a6475ab8947bcfa1428cf5a47d48cb1fbed86a97f6b13dee55d36d11cb583c3212 SHA512 4de9bf77bf4f7678a95535b7733266d0ca81bdfabbae8a97424c1520226ae7d7a04a64d33455d45c7e5504248f139142269410854f67dea6b356d8ffbc7a611d
 EBUILD wine-staging-9999.ebuild 19893 BLAKE2B a82e6a10ef92b3ce1a79a75e205a8a146815e5a181c668d1278c6ceb0f6a36a6475ab8947bcfa1428cf5a47d48cb1fbed86a97f6b13dee55d36d11cb583c3212 SHA512 4de9bf77bf4f7678a95535b7733266d0ca81bdfabbae8a97424c1520226ae7d7a04a64d33455d45c7e5504248f139142269410854f67dea6b356d8ffbc7a611d
 MISC metadata.xml 3412 BLAKE2B d140aed88a920d177f7d68afd8a489e01a58d3ead45db7d692c99f0d9040d7f9374168fd35f7e9e46acd6b6742893f597b80593df60ce126e51d7c13a39693b2 SHA512 c8a6b1ddfe466dae83d06ab74ced70da2b8f851568ecd94c8e42cc3e6b37047402d799f3cf76b8dfe7b7a118149c8d2b8ee4ac789592e84e070a4a5614a38ede
diff --git a/app-emulation/wine-staging/wine-staging-3.5.ebuild b/app-emulation/wine-staging/wine-staging-3.8.ebuild
index 7ba4e022173c..7ba4e022173c 100644
--- a/app-emulation/wine-staging/wine-staging-3.5.ebuild
+++ b/app-emulation/wine-staging/wine-staging-3.8.ebuild
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index f6446693b485..4410138ff623 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -5,17 +5,17 @@ DIST wine-2.0.3.tar.xz 18864648 BLAKE2B 0503a11e7545d5af805bfc3c2f614b6e35e39b7b
 DIST wine-2.0.4.tar.xz 18898148 BLAKE2B a21c920e1cf15e064bc6b37067a11a5568f8d1906783c200236456b73947bbd24212208ab1bcc2ca526ed40d8b2e80a2dc5d95db1a8d356a484213afb6897f59 SHA512 8fccb93e5ebe482ed81e948e3b7f87d4fe5b1f838a10f9cdcafa9561de4ef54b7d5acdc292bf28ad3aaf44be34c5ad8452ebbfc39f49f95fcbe9f9d0fcfc862c
 DIST wine-2.0.tar.bz2 23662707 BLAKE2B 1d485c1359ce8a0395a9f6378c1f8be33ea2836b80390d1eb1095057a0acedd21708daab16e1851a315391b9f9b0a360879b9d98c73bcc8371c5023e9a8037f5 SHA512 b0a57ba8202d9fc396e5bfb7a7718d6bababbed8f3351e7fdc36afa37f35a871e04903757618f73427aeb71a52b2d323977d79e48f8b38d636f23fd404441186
 DIST wine-3.0.tar.xz 19712932 BLAKE2B 4478c6781bb171ecca426d1fdc85e0d0bbe13b62b6c983933de55e2abdd0bda7a01cbf251c021824b00129ea6230d1d4e718a64b7d919bb5c07a106b8771adb6 SHA512 a51f41b66f4805e09b223528eff6670e94b9c0c0c947be647507baf9d8d9afe7c3fdc88684c2c8d3573b4739d9a086ab929a744a8594d3c8f6ceb52070f43f0a
-DIST wine-3.5.tar.xz 19963436 BLAKE2B 83d7c0719a088f8c705f7a9d8a6df6b9ee5e0a5ffa57c0a921875097be29298bebb9025222039432c65da32359e187a93413e04a5bb73171f0033911595baf9f SHA512 c1e36f3db862fdedd00c3ac20c84c6eb799b53fe32e959b481a6168baf7d9725ed9bd0a97e7f9b651e3ccfba4f8fb623445369be03fde5010ed0fcb0a53e7d3f
 DIST wine-3.6.tar.xz 20005240 BLAKE2B 6dd48180b9aed8a3b69c40b3ed7b2ff5adbebfb591860dda6603d2219f9059bc069df000cd2614c80d34911c451388f0124af3dd8a11b806b227ca8e16659d71 SHA512 31d24cc78734bdb743afcec7df05b641ab0625568361401eaf8cd5e217719c8c51a0ef7ed737a560fe42cb9ecd88f10d35e62a98d9df69b966502a5b0dab5a22
 DIST wine-3.7.tar.xz 20454036 BLAKE2B 04ac94d5679377c5d0bb37a6d3e8e3ec7c09faa300f8422a09a22b14ef4244d2bb14c80a47cfca5e11526506a8064f0cfa4e28868d7f04669f85ab743dbbb36d SHA512 a699418574dd8f407c064421cf6cdfe3923562c8adf9a7749e716f3853291eab05358ea64f0217c303c26c0f8f59d2116024b7b6978f9a52a055147e689a8694
+DIST wine-3.8.tar.xz 20473392 BLAKE2B a7873dd15a373491703e16888044cf2ba00121f91a4583fe6dcf687b5179a2d926035cc86c75f70ceca03a508bd4712c58a1662186e0a6e0c139e63e686f8c5d SHA512 387c6bff3eafac7e92030d11c02b3461b4ead059d2aad7f6d903e176f304d2ac0a426132fcd452507868f0d22bb360a30734edf3e73dfd514037458f08406e98
 EBUILD wine-vanilla-2.0-r1.ebuild 17165 BLAKE2B 355d7a3892b96a92d3f2336e6ae450407ebe8d1b73ad21910459855de6371fd8aca117c162601d0f303265e234c4d06f35339157bdcc0c1f03d5227f3a746777 SHA512 7d6d3d0659100bdd88a294c4728f95f985284e94d4c2e334d3e65ff26f231f33d6a7ab2f34a695683ac51a804a690621cc4d32bc3dec579003526f86ee9e9d69
 EBUILD wine-vanilla-2.0.1-r1.ebuild 17164 BLAKE2B 39c1a2facb2c155e5e5f511f6800af9c93c09cf4cd4ff428519448cdbdbc15afb87e58e12d051ddf0b672726841cce3aa7777aec1c72e19bc3e693c3cf53b4b2 SHA512 b6ff0335579045d560d4a30970b3b8150b07a5e2de086fe4b7377a151924fbb9abee62feddce77ab1c69133f70366640bdc43e0f58820fe7b7563c83bca225c1
 EBUILD wine-vanilla-2.0.2-r1.ebuild 17164 BLAKE2B 39c1a2facb2c155e5e5f511f6800af9c93c09cf4cd4ff428519448cdbdbc15afb87e58e12d051ddf0b672726841cce3aa7777aec1c72e19bc3e693c3cf53b4b2 SHA512 b6ff0335579045d560d4a30970b3b8150b07a5e2de086fe4b7377a151924fbb9abee62feddce77ab1c69133f70366640bdc43e0f58820fe7b7563c83bca225c1
 EBUILD wine-vanilla-2.0.3.ebuild 16974 BLAKE2B 61a9d93162ba22248f95f518026024c7c7844ea00278b0523d94e0e4306eb8fe4a1b22bfe82a08b4be87d97e174d2ef572cbd9d14bb0dc6a560395708a09bb63 SHA512 b3f1897e19623469dcafa4268cf6f57842c9945b15e395a8eeda77f92b63f2035d00d57fcbbb0d9fc5bf937e0b5e7a9b0a7b49a41588c548d4c91ba1f205b562
 EBUILD wine-vanilla-2.0.4.ebuild 16976 BLAKE2B a1b0391d257ffd77cf58bfe5c2614e85e421c5c4db3a1b3157b1a3176d47d6f02bf709c866df146b8cb6f17aa929752cbe9731119a32b83d66115860bc0755a6 SHA512 9b692447e013c31db521d4443b1b3f059279e8f5e0c9c17a629af38c5619a2481321a429f76e8543bac833a4483fcf33d085706672c3068f02b638fa12a93c6a
 EBUILD wine-vanilla-3.0.ebuild 17125 BLAKE2B 51d4eeb0ef880774cfd8ffce30c8482e9c0a847cbfbecb15159e95497c9a56f62a7ecb1c941bda4f31fe4d89bd11fb740d747f28df28275ead43503af994eaf5 SHA512 011941555712a3a02ff08bdab12b467da71a151efdeb0bce060b9c51c02f8ffec5368b70969a36424b9272ad981e2e8a4725f7de35a8d6064e9e8ad00ccb0f35
-EBUILD wine-vanilla-3.5.ebuild 17251 BLAKE2B 6f86d2c1eba973215361c17201fd31af1567a06e479310246ffa999bc1de381113ecb8f6a7c41ec9580fad3c2ae4e1bd7c2af9d6d408e0763242ce86c1ae3054 SHA512 72e6cc94623fecb0110f0097765accb9561af19831c9faa873a72f59344a8e203a69cc8f517395ae493094a9917e5a469e417a00c8d1f631151f1ae73ca0a8a0
 EBUILD wine-vanilla-3.6.ebuild 17251 BLAKE2B 6f86d2c1eba973215361c17201fd31af1567a06e479310246ffa999bc1de381113ecb8f6a7c41ec9580fad3c2ae4e1bd7c2af9d6d408e0763242ce86c1ae3054 SHA512 72e6cc94623fecb0110f0097765accb9561af19831c9faa873a72f59344a8e203a69cc8f517395ae493094a9917e5a469e417a00c8d1f631151f1ae73ca0a8a0
 EBUILD wine-vanilla-3.7.ebuild 17251 BLAKE2B 6f86d2c1eba973215361c17201fd31af1567a06e479310246ffa999bc1de381113ecb8f6a7c41ec9580fad3c2ae4e1bd7c2af9d6d408e0763242ce86c1ae3054 SHA512 72e6cc94623fecb0110f0097765accb9561af19831c9faa873a72f59344a8e203a69cc8f517395ae493094a9917e5a469e417a00c8d1f631151f1ae73ca0a8a0
+EBUILD wine-vanilla-3.8.ebuild 17251 BLAKE2B 6f86d2c1eba973215361c17201fd31af1567a06e479310246ffa999bc1de381113ecb8f6a7c41ec9580fad3c2ae4e1bd7c2af9d6d408e0763242ce86c1ae3054 SHA512 72e6cc94623fecb0110f0097765accb9561af19831c9faa873a72f59344a8e203a69cc8f517395ae493094a9917e5a469e417a00c8d1f631151f1ae73ca0a8a0
 EBUILD wine-vanilla-9999.ebuild 17251 BLAKE2B 6f86d2c1eba973215361c17201fd31af1567a06e479310246ffa999bc1de381113ecb8f6a7c41ec9580fad3c2ae4e1bd7c2af9d6d408e0763242ce86c1ae3054 SHA512 72e6cc94623fecb0110f0097765accb9561af19831c9faa873a72f59344a8e203a69cc8f517395ae493094a9917e5a469e417a00c8d1f631151f1ae73ca0a8a0
 MISC metadata.xml 2988 BLAKE2B d74eb87b6ee8b0ee42c2f6b20d2c3568052c9a5975a14a84182def2702fafe1707358c149fb0b05cd23a153628b08fe74d6b28e29763bbaf573bb979347331f8 SHA512 2ccedcfe2ba76a52cfb7078843d82bae9eab519c250b5f6b8ca38bcf164340cc5b0c1ccfcec7459981e7e2074a4e07ee85d896f27bc42496afa4f77e61cedf0c
diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.5.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.8.ebuild
index 9bebca2da60a..9bebca2da60a 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.5.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.8.ebuild