gentoo resync : 24.02.2018

29 files changed, 223 insertions, 151 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 3f8cbacc5042..b8f968ace0b6 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index 3e6042baef71..9df83b53d7fc 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,3 +1,5 @@
 DIST diskimage-builder-2.10.1.tar.gz 338370 BLAKE2B d2417af55924971ac6c8ee803c7c9bf788ecd9a16affe90077eff51a58924c81e82728eef344749b5687cc26ff9e355a7611f4e2a0a5501217344eb9bca2bb00 SHA512 4c9ff1b7182b3c207d769bdcd142f23a6d9e2a8f040694ab75d41284bb96ad07305ae78e486343f22d13d8c8cbef5c66eaaf4638f0fd8f7158cf3520da587e88
+DIST diskimage-builder-2.11.0.tar.gz 334400 BLAKE2B 0bb15b83b8fe1d5217197e491c83010b098f00ff13a8abf5da2890cdcb1b2a7cc81c8a5befea9b1c184ce10a35a73068ecc336594f813831584ca0b94b822ddb SHA512 3caa7809552c472e28906587889f1e310855ef4686d1da1adcb1dadb4cf3550ded30f7ec7483d4889f96a9e1d11b19dcb53b0458c75a801a378ac01e8b0d26e5
 EBUILD diskimage-builder-2.10.1.ebuild 1100 BLAKE2B 204c7a4b2bd37127b7f5187b55279195ce48c2b93fbcfc1b15d720648df6b0831121ba6846f08abad4c94f5ae5ab433ebe8cbf53bd35c9a9df00a6241f96fbfb SHA512 34488e929ade8540d8405adf071fb9e81dbffd4ae6efb24fa978fc3c407c739c7381898cc3e2639d8310f39f9af40507a10ed163798151e426a0579cd58a6b9a
+EBUILD diskimage-builder-2.11.0.ebuild 1102 BLAKE2B e46754ab805eb5ee798c4b5d1e0e1670d67e7c7f9ec3b6baad90786d5552ee914f31f3603f33b9f641629ab3860bcfbd84a1b4b73c95f3b3159d13a3967741fc SHA512 7e6d8694f39a60ad0d9f732af70ee37374361fcad94747caaabf83093b6c85daee790bac5c618770e8efcbcda53999cf6528efa523da6090666c7f14573f5f36
 MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.11.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.11.0.ebuild
new file mode 100644
index 000000000000..b7ce708c6881
--- /dev/null
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.11.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Golden Disk Image builder."
+HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+	<dev-python/networkx-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
+	<dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	app-emulation/qemu
+	sys-block/parted
+	sys-fs/multipath-tools
+	!dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index 84b8daeeb5bc..2306dbec65a9 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,3 +1,5 @@
 DIST docker-compose-1.18.0.tar.gz 231256 BLAKE2B be9b57dd89a81734b850f61622a924a3ace5ace907c4d1365a18315ddfbe3f1a9a56b222766980d16d5eddbe6818caf94a5833c5cddac082fa230bf290977ee3 SHA512 9cf29d892f6419e9ef639e1b9edddecb47ddb5ba7f97830f732e463ee510ac5464d6d81f58a2bf4ae5e7aee78b3d2d4afd59e6e1b53974899edb3e090bcb991f
+DIST docker-compose-1.19.0.tar.gz 238307 BLAKE2B 2a7bbcf50c2cc591eba1d59db30cb0341e33e3f1ebe948e0b6762d9bffcdcc72d98e2da19fc549c5fabda192fca69a9d54e016601ddb4f4a94f0dc1c93f99a29 SHA512 f1d522621580a5130378508e6b15ad2e4708e9c5ff713627ca54308ab3e6bf000e21c55bbdf9585b2116e73648fdc773500a5415ab81a72dd2c69c9c07e71581
 EBUILD docker-compose-1.18.0.ebuild 2422 BLAKE2B cf2b623a27b85b61e73bc93834b0027daa525a4c5d636dde1ab73573242330de8164a31528c76139ebef3467bde3c206d6865a2a9e58d0c8db37c505e5ed327d SHA512 48e9c336eea12efcfc1365e819ea09e6dfa0578545410f2a42f9c373780343bebb75e4579be0da71a9a02689ccbce5a42b87b2d97f4bbd46ae59c69d919b5218
+EBUILD docker-compose-1.19.0.ebuild 2422 BLAKE2B e1ae8b4b44640361fdc8fca0cdda1ce95340b3cfa564b2d6cf3e0785bf65057ea53e14b773204d1d7c93c142394b3800e78364eaa6cd0ce9372d24135ab73bff SHA512 1b283b87382f6cd0402dfdc4c97cbb16e1c2eb7da645b50bdcadd048054c769ddcf742b7067b686ab1d8288256e713f277d1e97b32c27821bd3c9ce507e4b7ee
 MISC metadata.xml 429 BLAKE2B 5fcdac021eec2c1a600a4aaaefde691120f47d20fe1d5b218153e933f92f42d1008fc832139100cde6267f41adc33944efc378fed4205fd68c9240a8bdb46a1c SHA512 f6a0d1a934d1f825144fadbee8ab0fccceaf40af59cc44a90caed059a503672b18a1c16fee9bb045a9ab272ad5553b1d49fff67d43c7a8ff97dc5c31cdea37b6
diff --git a/app-emulation/docker-compose/docker-compose-1.19.0.ebuild b/app-emulation/docker-compose/docker-compose-1.19.0.ebuild
new file mode 100644
index 000000000000..c457bb00d6d2
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.19.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit bash-completion-r1 distutils-r1 vcs-snapshot
+
+MY_PV=${PV/_/}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://www.docker.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+CDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+	<dev-python/cached-property-2[${PYTHON_USEDEP}]
+	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+	<dev-python/dockerpty-0.5[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.7.0[${PYTHON_USEDEP}]
+	<dev-python/docker-py-3.0[${PYTHON_USEDEP}]
+	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+	<dev-python/docopt-0.7[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+	!~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
+	<dev-python/PySocks-2[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-4[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
+	<dev-python/requests-2.19[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/six-2[${PYTHON_USEDEP}]
+	>=dev-python/texttable-0.9[${PYTHON_USEDEP}]
+	<dev-python/texttable-0.10[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+	<dev-python/websocket-client-1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
+	$(python_gen_cond_dep '<dev-python/enum34-2[${PYTHON_USEDEP}]' 'python2_7' )
+	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
+	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
+"
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_test() {
+	${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/*
+
+	distutils-r1_python_install_all
+}
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index 8f97a1073cfb..5aa32728afc9 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -1,13 +1,13 @@
 AUX free42-2.0.10-fix-build-intel-lib.patch 690 BLAKE2B f385747de929bb5963f9dccd8b44c79cc3b57a2842650792f1b20e31ff59ec30ab4cc8ec27f15b8fd134005b568da1e928722c04ff9e58d30751b7b761403b93 SHA512 5888aa234e102135659599babcc3bf765d1076813e6a1b6600236a698fc369f8800212da60027fa2c3428f8c49934563f0f602828f059d57367b2b6e9387147c
 AUX free42-2.0.10-fix-makefile.patch 1742 BLAKE2B 89e7ca26a56b335b15da74d97cd2ef57495cdb09c8cb1189246e31df171fc16f4dc043e60dcb7854c9ea593d38c6c5d89a01818a93e4033544736e7e2ecb66e8 SHA512 36906f03461ac391766b833fe0ccd59919799fe33e3cf4bd975a03f18d1f6ef26934a34e1df2eeb6d42afa147b7bfb5bf93d8ea13283033c96c49d284df52862
-AUX free42-2.0.12-fix-build-intel-lib.patch 690 BLAKE2B f385747de929bb5963f9dccd8b44c79cc3b57a2842650792f1b20e31ff59ec30ab4cc8ec27f15b8fd134005b568da1e928722c04ff9e58d30751b7b761403b93 SHA512 5888aa234e102135659599babcc3bf765d1076813e6a1b6600236a698fc369f8800212da60027fa2c3428f8c49934563f0f602828f059d57367b2b6e9387147c
-AUX free42-2.0.12-fix-makefile.patch 1742 BLAKE2B 89e7ca26a56b335b15da74d97cd2ef57495cdb09c8cb1189246e31df171fc16f4dc043e60dcb7854c9ea593d38c6c5d89a01818a93e4033544736e7e2ecb66e8 SHA512 36906f03461ac391766b833fe0ccd59919799fe33e3cf4bd975a03f18d1f6ef26934a34e1df2eeb6d42afa147b7bfb5bf93d8ea13283033c96c49d284df52862
+AUX free42-2.0.15-fix-build-intel-lib.patch 690 BLAKE2B f385747de929bb5963f9dccd8b44c79cc3b57a2842650792f1b20e31ff59ec30ab4cc8ec27f15b8fd134005b568da1e928722c04ff9e58d30751b7b761403b93 SHA512 5888aa234e102135659599babcc3bf765d1076813e6a1b6600236a698fc369f8800212da60027fa2c3428f8c49934563f0f602828f059d57367b2b6e9387147c
+AUX free42-2.0.15-fix-makefile.patch 1742 BLAKE2B 89e7ca26a56b335b15da74d97cd2ef57495cdb09c8cb1189246e31df171fc16f4dc043e60dcb7854c9ea593d38c6c5d89a01818a93e4033544736e7e2ecb66e8 SHA512 36906f03461ac391766b833fe0ccd59919799fe33e3cf4bd975a03f18d1f6ef26934a34e1df2eeb6d42afa147b7bfb5bf93d8ea13283033c96c49d284df52862
 AUX free42-2.0.6-fix-build-intel-lib.patch 690 BLAKE2B 0d8de8c32f92c01174e420e0dc74880bd3c3316c36dc947f84803a8f61ad491a0de9d27fa45ed7c72992b4e22c5e204bce27d47ec976048c4eff655d14312839 SHA512 624cf0af83f02b3a43231739de3d84e76cbdfe49becd219c9211cbc8ba7fc7d3474fc465edbf7e707f1474844e109d5d30361c7e15e3799db48bf0dda068d5ed
 AUX free42-2.0.6-fix-makefile.patch 1742 BLAKE2B 239bbb40c70a3627cf08859397bace5ecd6bbd215cc06f6d82862b908169af4851002fbb3cb7059aa553c3b7da266e5b0b2a1dede891a4f085822a2e731a9399 SHA512 d3add6369d6f2b5d4690355d93cfff903866f24aeed7d73246a79b4ba7b2551fec4ec61cf2d8c80d089194bf39f0c3a1faa4c6d1829f81b6c636b8f5d132b2bd
 DIST free42-nologo-2.0.10.tgz 7389429 BLAKE2B a633a78ed5974e327aafa9d783c04bdcaa895940580c595c9c67ab0181ec7000efaa92021a485199268341f15f4c4bafe3964d4118c068e8abbfa2f358045b5a SHA512 4f03b9b206ef17e71295f0baac96ca26f34a00844cee6cad254f8ab798d3d0c724788200f3f207a3301f62eb0960707a23e6bcbb2ac924a78b0f0e1c78e70e6d
-DIST free42-nologo-2.0.12.tgz 7389088 BLAKE2B 4f205439e7f642e266ec3f4b5032c9b48c2b726f5cce80a5a855b925ae7ff8cccbba1ce066f54af37b87f28a13f5c92e724d35ee71aa1439b3934b370662c3ca SHA512 b04d5c104deda8cb15d0a77186c55ae6270568255f4a6ad62ede33e0a154c42f5dce53456d60f434df04f46a0bb824caf45e58ce7c75f5a69102a7952defc611
+DIST free42-nologo-2.0.15.tgz 7389800 BLAKE2B f78a925459f7eea3347d5394cdde47cd7318770895ea0c375b14c5855ff9d08db86c72324122c15792db8e457fa6bfb8039a911de240e23269bf87def58381cf SHA512 533528b651b408156fb069e4969f35a1d365be84a7fc63d0d40a35ace75592dd88cc20def3dff2de4b7a7e3eeaeab99bb89ad333135be90dab13b52ac6af804b
 DIST free42-nologo-2.0.6.tgz 7348647 BLAKE2B 708c88b4903358c23989d515c61884ffc9feae3d43fc54f1ac8a18779cfe8aa2d0e1a2ec667e24f78da58cd94ad515399191b7dc968adbc59bb97517b34680be SHA512 078a79cc4dfa36ae7342be5b90350f4b7269f4e71777f2620c2043510d6313acbc1fa9415b75f8b01bebb2de747b9af8a26738f877c34a4d82a1fdd52c75a61d
-EBUILD free42-2.0.10.ebuild 1044 BLAKE2B c4c0605c674b6168c07d5696eab9186f1fa4734e87b9a3ce0ccb7deb0a35320050b2221d6293d39e95f2863ea680fb945a2cb4fe9cc9825335c9e5825113f86c SHA512 56023c7c1d1d87ca4fdecfc8b28512373bce0e59fdf1d264c2b2e981a7ac1471bd8c3e48cfda94ae7d2971fa01920485cb2d755a3dc6a51607202541160da0bc
-EBUILD free42-2.0.12.ebuild 1044 BLAKE2B c4c0605c674b6168c07d5696eab9186f1fa4734e87b9a3ce0ccb7deb0a35320050b2221d6293d39e95f2863ea680fb945a2cb4fe9cc9825335c9e5825113f86c SHA512 56023c7c1d1d87ca4fdecfc8b28512373bce0e59fdf1d264c2b2e981a7ac1471bd8c3e48cfda94ae7d2971fa01920485cb2d755a3dc6a51607202541160da0bc
+EBUILD free42-2.0.10.ebuild 1042 BLAKE2B 7019cd43b5bf6029a900fa386aa6300185a279d6b746d36211413da76107309f425257273b70db78f89349adf37a2b14f31369059d3562e8ab6f015ae6b2c34b SHA512 2556155fff2e04f13be2561dc46b1dd4f8f860a5d29c5062635c767c8a163eac795a736e4f948134faeaab88f6d7b7574e52b8242bbd1ffd0dd3f3f84235ec01
+EBUILD free42-2.0.15.ebuild 1044 BLAKE2B c4c0605c674b6168c07d5696eab9186f1fa4734e87b9a3ce0ccb7deb0a35320050b2221d6293d39e95f2863ea680fb945a2cb4fe9cc9825335c9e5825113f86c SHA512 56023c7c1d1d87ca4fdecfc8b28512373bce0e59fdf1d264c2b2e981a7ac1471bd8c3e48cfda94ae7d2971fa01920485cb2d755a3dc6a51607202541160da0bc
 EBUILD free42-2.0.6.ebuild 1043 BLAKE2B b36c46e0cbc518ff8b016e78850a8f50694d82e79f0105af11d3a550ab6edabd8d49f64f089c286b95edd4609e0daa99feacf90a8304525275fd08b88a9ede92 SHA512 fd74b7b6fc40bf7e72e6af0cbc5e376dc08d2b687c751f899dad78a62783463d23b917a27ab663d5c94dc063b8910d5e3f992b7d0847b0434db15f70ce68c900
 MISC metadata.xml 540 BLAKE2B de6a28fadb4dba9dac7c9aadbbd0972cb9583c8b1aac154ed9247199287c060adbf5df8a0639b7e4ff218da84a5e1c19e855e2c11688124c76c1cc07fca1e393 SHA512 88a7488f445dc2233eecb68e9100751da821c45ddb6c60a18600dabe7278681a3625abd59ed7088bc526d0853529c98bb84fdd76796a5cdd4a5379bd6e17b7cb
diff --git a/app-emulation/free42/files/free42-2.0.12-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-2.0.15-fix-build-intel-lib.patch
index a321b1d714b8..a321b1d714b8 100644
--- a/app-emulation/free42/files/free42-2.0.12-fix-build-intel-lib.patch
+++ b/app-emulation/free42/files/free42-2.0.15-fix-build-intel-lib.patch
diff --git a/app-emulation/free42/files/free42-2.0.12-fix-makefile.patch b/app-emulation/free42/files/free42-2.0.15-fix-makefile.patch
index 7642316920f4..7642316920f4 100644
--- a/app-emulation/free42/files/free42-2.0.12-fix-makefile.patch
+++ b/app-emulation/free42/files/free42-2.0.15-fix-makefile.patch
diff --git a/app-emulation/free42/free42-2.0.10.ebuild b/app-emulation/free42/free42-2.0.10.ebuild
index ce44a72c5aed..467f13b38067 100644
--- a/app-emulation/free42/free42-2.0.10.ebuild
+++ b/app-emulation/free42/free42-2.0.10.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/free42/free42-2.0.12.ebuild b/app-emulation/free42/free42-2.0.15.ebuild
index ce44a72c5aed..ce44a72c5aed 100644
--- a/app-emulation/free42/free42-2.0.12.ebuild
+++ b/app-emulation/free42/free42-2.0.15.ebuild
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 060a4ff1490b..70e96014cfd1 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -95,5 +95,5 @@ DIST lxd-2.19.tar.gz 756698 BLAKE2B 71c6d829735255cf6ac0e76db1157374bcc8f8138b18
 DIST lxd-2.21.tar.gz 882352 BLAKE2B 80542bcc03c05667ee0207dfbfd2bf41c5a6ef69178aec06ad62fe3521ed012ed9b82c68c0254e0299e8e1dfd274a0622f32bde730480a950ab6ba15ddae5f4b SHA512 9a8ec3a97e4c861a80311dbdecbf5a485c0af85d6ba6b20680ca17e6ac877de3f27cfdcf0a111ba0db2b7c562dfe2f41336b562b7c13350c4543505b3c17357e
 EBUILD lxd-2.14-r1.ebuild 6704 BLAKE2B 99a46d88f25e2c7d090278e12c680f81242fea55aad14643964c6cc41bf03de1ccb3f467de82ab9cbef0b01d616bfdb6b1f6a73d89c9bdda037641bd3bdd554d SHA512 be9283675d4a47dbe425a449d331918121fd5b5da60a1797020e89053089757da7c637cdb0db2967565d1440018db19c705d5fd8112a9208905f50c99ca2b66c
 EBUILD lxd-2.19.ebuild 6605 BLAKE2B c39104cd32ac100377c6486219af4c7c8e448594501991f89314f9b6275a83080fa5adf956794efc3e36ab72205a42b8c642f04800f09a5995b3db4a391d4206 SHA512 45388ffb9cf442c6a0eb645f5302e48cce7aa721d6e016b953c730e63a1b2769cce2975f2edfb9162afaa196045363027e51bb09759428f0be0233d4260a7dff
-EBUILD lxd-2.21.ebuild 7884 BLAKE2B cf447bd093ccc4bd67d09ef4010461e2449d0cfbb3c62ed0023de38343fe90f10765ca44d7f684e5613f5f036cc0b560bc24b5ea786b959b2e79dab08f0186db SHA512 b68848e6e2673f4fc293634311db928c936ef1013fdc2d89313282a2f0a7407271ce732289d28bf8b2e660fd849fc20b226ea073773ef15e80b4a18d6a99b072
+EBUILD lxd-2.21.ebuild 7883 BLAKE2B f933f15dd551c335bbe7cf95a9dbe35f4b272ff720e7aa080f984705e899e5da47c4e6f0617860896467bcec481a50591f6f3c0f731f1f2ff2df0178aaaf8882 SHA512 27167d7c8a2dc7aa988016cbb90bd3ae272732a709d8938ae3b77ffbacf12b818df27bf1ddaec9c3372403ad1380dcc7b9df6f8bce237742d02fb881b60aa552
 MISC metadata.xml 952 BLAKE2B 1d16ed30ed5222c36a5ccd6355ad5f036fad77152533d8c0fb66fd2a43ad34c8136cb8044f9b5d2c8806d08711b20f7dcd883db57fde229c869382775a5bddff SHA512 962339d8aff6dd9c44e7642449468ffff20dccbdc45bdb614199d576ed4595edac356dd216ebaac50290ca7383630ab8e5355eeb05a76d91ad542cab7cd8a456
diff --git a/app-emulation/lxd/lxd-2.21.ebuild b/app-emulation/lxd/lxd-2.21.ebuild
index 02be044835f8..caefa812216a 100644
--- a/app-emulation/lxd/lxd-2.21.ebuild
+++ b/app-emulation/lxd/lxd-2.21.ebuild
@@ -59,7 +59,7 @@ EGO_VENDOR=(
 ARCHIVE_URI="https://${EGO_PN}/archive/${P}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="+daemon +ipv6 +dnsmasq nls test"
 
diff --git a/app-emulation/nemu/Manifest b/app-emulation/nemu/Manifest
index 55eeb8d693b9..448bf87b2c6b 100644
--- a/app-emulation/nemu/Manifest
+++ b/app-emulation/nemu/Manifest
@@ -1,8 +1,10 @@
 DIST nemu-1.1.0.tar.gz 52456 BLAKE2B cc8d0619aaba914cd182714ac3b3c63add58d92ac8eb41457c195310b47d133ebc0f995a122e0ebd56dad17f118c4f573006d76fdfc8c8ad2310be4df12bba24 SHA512 d0eb1b0df61f417fe25295c4f2d0c54d8f11153f03afd8e2fb5f59122558f1e5d1021d73b0b6a4e13dc80c4eabb8a20eabccf472ff4d5c82f27eefa83a5c773d
 DIST nemu-1.2.0.tar.gz 61953 BLAKE2B fa5c323b5d4808c812361ec49e1cb4d91f12f0da102a80868ec016d5284806d4fabb3dfdc100b43276bba71f03534b9c1703c2ef57c044e4ed36d7833506c64f SHA512 a91c31c4161369d42cb1b9e66c312db760b899c5f444a4d1d22cda39036a14b1a2c83e6fee5470282e13555771ce6704258da0ce6f76ae10343bb5f581eab514
 DIST nemu-1.3.0.tar.gz 70769 BLAKE2B 73108346c70f7ececd2b20cc91da323f2ecb40491400cd135825b44cfa7dbd3285b3a6de36d815c46d9655a7c23571084b321bc3deca5a6f564dae852b846120 SHA512 0ca74a3d0ef1f8032d74cecef71518c18b839dcab5deb2ec221aa47159bf40345517d1b8ec80bf1ff268b9b7dbcd90301ad3594583ddf75d517a23545db23c26
+DIST nemu-1.4.0.tar.gz 84398 BLAKE2B 46ed3dfa392e8be472047612f4131e80ae3675c30b975320dbd21672bb8c5b3fc74dc0c5d1c4a5397f04c4bd725902d3f9b7d10808cab10fc89bb8199568cc10 SHA512 262b2eb7ead79b644110ecd4ea1858ef8d9775f3076e4df9f9c83149c148baf2b6db4645395301fabbda07f1e9e5577fe4f56a7eee010433ce02aa298fcee1a5
 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-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
new file mode 100644
index 000000000000..490f99df8827
--- /dev/null
+++ b/app-emulation/nemu/nemu-1.4.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils linux-info
+
+DESCRIPTION="ncurses interface for QEMU"
+HOMEPAGE="https://lib.void.so/nemu"
+SRC_URI="http://lib.void.so/src/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+vnc-client +ovf savevm debug"
+
+RDEPEND="
+	virtual/udev:=
+	dev-db/sqlite:3=
+	virtual/libusb:1
+	app-emulation/qemu[vnc,virtfs]
+	sys-libs/ncurses:0=[unicode]
+	ovf? (
+		dev-libs/libxml2
+		app-arch/libarchive
+	)
+	vnc-client? ( net-misc/tigervnc )"
+
+DEPEND="
+	${RDEPEND}
+	sys-devel/gettext"
+
+src_configure() {
+	local mycmakeargs=(
+		-DNM_WITH_VNC_CLIENT=$(usex vnc-client)
+		-DNM_DEBUG=$(usex debug)
+		-DNM_SAVEVM_SNAPSHOTS=$(usex savevm)
+		-DNM_WITH_OVF_SUPPORT=$(usex ovf)
+	)
+	cmake-utils_src_configure
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel"
+		else
+			CONFIG_CHECK="~VETH ~MACVTAP"
+			ERROR_VETH="You will need the Virtual ethernet pair device driver compiled"
+			ERROR_VETH+=" into your kernel or loaded as a module to use the"
+			ERROR_VETH+=" local network settings feature."
+			ERROR_MACVTAP="You will also need support for MAC-VLAN based tap driver."
+
+			check_extra_config
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog "Old database is not supported (nEMU versions < 1.0.0)."
+	elog "You will need to delete current database."
+	elog "If upgraded from 1.0.0, execute script:"
+	elog "/usr/share/nemu/scripts/upgrade_db.sh"
+	elog ""
+	elog "For non-root usage execute script:"
+	elog "/usr/share/nemu/scripts/setup_nemu_nonroot.sh linux <username>"
+	elog "and add udev rule:"
+	elog "cp /usr/share/nemu/scripts/42-net-macvtap-perm.rules /lib/udev/rules.d"
+	if use savevm; then
+		elog ""
+		elog "QEMU must be patched with qemu-qmp-savevm-VERSION.patch"
+		elog "Get this patch from nEMU repository"
+	fi
+}
diff --git a/app-emulation/q4wine/Manifest b/app-emulation/q4wine/Manifest
index 8562abfadd19..01d6771b3c77 100644
--- a/app-emulation/q4wine/Manifest
+++ b/app-emulation/q4wine/Manifest
@@ -1,5 +1,5 @@
 DIST q4wine-1.3.5.tar.bz2 2862445 BLAKE2B 0de9e61f18c8dedccfa3fc1f42eb6f26b0a99534cb3ad3cc5da06ea2f2fdfcb8d164a05a591a1bc6c959cdc183d98696dee50c78eb73e430198dc901137729f4 SHA512 54fb7bce28750cb71589f6a94658f61369c7777cf7865b71d2feea4ac1221714d861a781fbd1325ee3d21f124162fd2eedc2780ab2bd0af93864eefebcde5f4c
 DIST q4wine-1.3.6.tar.bz2 2867547 BLAKE2B b35a638e514108e4ee4be34b446a7d2d5ba00415d8f54cfee293988707b637d41945d3197a2132147e09d5a05153fd47a55701dcba358f3a2b3a2e6037f78aaa SHA512 1ff0ea2a4523fc5582ec67f5e305622653c4e387ac5f2cecde52289117ef879a60261fdbf9ddf421812765539124d4c5b6b37ff401530d3e061723a3c35d57f8
 EBUILD q4wine-1.3.5.ebuild 1367 BLAKE2B 62b13635313e6331c83288fdf10658a5d6cc06c96f4646dd6557762443212687e86dc2ae308c13653910e546f6899e276619f720e6940d82950957bff08ba452 SHA512 7dfcf91ef9d44aea2b80f16d981e59fac08c1acc5bd8816597c22638957a3d60aa34ff7c4ce287b719a14b23883bebdd55862f078aa85c8e76f1fc49ce0481a1
-EBUILD q4wine-1.3.6.ebuild 1358 BLAKE2B f8ffb01d63ecd4de8800ff4620f6164e4a976a57d66d019edf2aa2f36a6825657295cd5c0c29018fdd7b4b796d02e23daec9bcc196fff24e252068fb19fe07ff SHA512 cd1cf5b30da9cfb9a50fedb5b8d6beac26924116def2e1aa549e5da4acaec92def28573f25cde17b0b228aafb7d2d5ed291e78bd8074498cb40656596714d147
+EBUILD q4wine-1.3.6-r1.ebuild 1361 BLAKE2B aa0cade4cb6d5df8ac8d9f0bc87ffc63a3fb227d2af48999644e8ded7412629f1c18b3922c49334478b2ec22122c44f18c5b213f50e071bdf9ebaa0e140f1be7 SHA512 b074df92a7c040b45dc950bbd001f5d67cca4fb8b7f4437b200caf719aa698b1a45d79c040086d3c348b0f8aa50239548022613613d935470049387db80a0a22
 MISC metadata.xml 752 BLAKE2B f976286507d460c2af485d59e23ce2af28037e104482fc2eef65d221b0426b0aff585b94eb9767a0aee469797dc091ac1584466521c35d705449dc132fb621a3 SHA512 ccd0facc9545646763dccfe146cc12bea33818a15c99a23930c684114c0a62fd93969611aa5f0a340dff709e09e203cd0e63490ca147b3253e5977216d1d74bd
diff --git a/app-emulation/q4wine/q4wine-1.3.6.ebuild b/app-emulation/q4wine/q4wine-1.3.6-r1.ebuild
index 8af3f42924e7..7eaab2690481 100644
--- a/app-emulation/q4wine/q4wine-1.3.6.ebuild
+++ b/app-emulation/q4wine/q4wine-1.3.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ CDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
-	dev-qt/qtsingleapplication[qt5,X]
+	dev-qt/qtsingleapplication[qt5(+),X]
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 91c7142e8142..7093c5024308 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -11,8 +11,8 @@ DIST qemu-2.11.0-patches-r0.tar.xz 16140 BLAKE2B 2e23908075195a7c28df574525a159e
 DIST qemu-2.11.0.tar.bz2 32816398 BLAKE2B 2014a8246f3cba9069186629d9ec8c221672fcfd3e8cd28a7e57f467add81f7bd84363183ef5cc5d18af91bde9186a4da49c0133c8ead83eae4626b9fc364e99 SHA512 3681700833573c0aa6283af950bfa298970056f1b44489088d8863840a7694512138321f86961ef43b256abf15eddd2612fb9cdbe3d9a358542d4e7037cc2004
 DIST qemu-2.11.1-patches-r0.tar.xz 1640 BLAKE2B 8402a0bd086307413c3f088b7b2523adda5f370e3ce8e9ec39db905a5df495842cc2168b93b57e8516e98703ee1620e7cad77740529959a09a1d4224988829bc SHA512 2906f9497e61799da8efca0dac4a19addd3bf59770c742e3ed1600143b69397bbc4eecb2c1f64aef0e103447966d47ced1ec6908f78a793b8d06f99a0aa6dc4a
 DIST qemu-2.11.1.tar.bz2 32819412 BLAKE2B 6b6d4e7b8dcf33aeedb0b33bad267da07ad17c2eeeb5fbd2c038d760bc03224e55ba0f03eb248c62bc0e8636c2c660ea76b367eaea96bee16388053f82c8b8a9 SHA512 1b692bbdfc3dc785738c7192aa2a3f9cf53d9f5bf3b3f49fa8692050dc50f7056c8a4d1b527d48ffb2a674a0fd3a46d87addd1eaaa758f35eec1ab5adfe32354
-EBUILD qemu-2.11.0-r50.ebuild 23612 BLAKE2B 3f45d2b14cf4fc8d106c11e87e18e04c08e9d312df157241067d161cb078723de2a7cd581b09c807d322fe6694b72503396715eb939a830b1e964676318953de SHA512 a563f940264702d5f96ae57793b2cc8829d534d2ec5b1033463e23d40d277f3e0afcc59cb72811467cef5914b9ec06a110164d855dfb18b7e03737a16d227fdc
-EBUILD qemu-2.11.0.ebuild 23580 BLAKE2B 46b02ace6b5c108412ddd2b955e9774e72b6543b2812448fad079322c177825a182c3a900d6b867455100f5454b85b0e4f729108254f17bde07c6c73539f9588 SHA512 7e59f1bb80e42fdc3e6a2641a3edb497a38ac7c912606066255ab9cca9b4509bcb17a440b811df2a899a8efd2b84582b0db9f7f636ecad5bf91d87c3493b740a
+EBUILD qemu-2.11.0-r50.ebuild 23662 BLAKE2B d75c61bbf66d63b77ac32fd70075865fe0b468fd081e17c2b13b9d75bb6f1d011ab78ca2fa40fb889e875f087428cffb83e71d0a3fd18e8bb34cd78542d2a41a SHA512 478c89435d04e3535cb7d403ec5aa2928a647984806c3009ca740c8d7e3312d41b148cfaa80bc4b6081fc63727b0f0fcb769481f97f3a0b770383d0e88f45505
+EBUILD qemu-2.11.0.ebuild 23630 BLAKE2B 0a6a289e37840774e92c506ad332d39213dc692ea5cfab4b3f54c45e159e0c3eb07f4831b27a808aefa1184697810336985cc79039773d40e1a50fd6780e6013 SHA512 74cb6375469740801198daa99606f26cf570a2298c8cd78eff362105474128d082d59aaefef627abb16484feee901f53c3b37b958d8c32843437dadb1655cb0e
 EBUILD qemu-2.11.1.ebuild 23584 BLAKE2B 8b1db2fbffccbcbdb18282258a3e6e08fb7b6ead21381cbde62d98cd6f03e32d2dcfecb47458ad8c9431923537a183629b7a7fbbbc2c2c845b3dda7e9aec47ff SHA512 3258d4095ab1f941970eff407cf4cb883f5b8d1f4418b50ec935e4f9bb2fe5fdcd711ddf2784c5ea0027d06db900faa3d6652a2828417fc51f3c2931982b3001
-EBUILD qemu-9999.ebuild 23422 BLAKE2B abe0fbfd0cde763379dd647b73ccd5139c01a7867da41ba28d9c15130181340878c5b2db4758c89d420cb2cdba53e2aa32458534312262271a08decefc3bd991 SHA512 cf7489a649e1b749cc15b773c64d0c9d6ee9806f109eb99f812c3bb9fa05f272258a8827f3caa369eb4d2fa354b209a9a77c8a2a9ce0ba78abee6da827d69d16
+EBUILD qemu-9999.ebuild 23472 BLAKE2B 41fa80019ffdf4df222a5cc024437ca8f7b174da0c0c7a60b1306debfcd9311193597e7d749bdc5f9d626cd4b31912f5c696e8df14a959ec2796089ba4688a0f SHA512 ff3c02a211739470fa1f412df69ac4e190decc96629e28828a6b4a23840dc0b1b23bb8ee6c06bec79ef0e244fdef26dd422087a6fff4cf9a4e884a5cc5275ec7
 MISC metadata.xml 3794 BLAKE2B 626ed8aa0c868513122b44083f2c76fc758f09624600770b1b267328b08335cc60b4167b37a4f418985c810dfea23bb7792c9b874166842e8fd34ba2c24a146a SHA512 10f130f225b90dacf8262247d795a247abfdcbf3ad5fbe0693e8d4db79f755984f690cb150a7eb5a8e5d669ce404145c4fbb6b200d6362319be74759fd78b6d3
diff --git a/app-emulation/qemu/qemu-2.11.0-r50.ebuild b/app-emulation/qemu/qemu-2.11.0-r50.ebuild
index b055fef920a7..0ad79b0aea25 100644
--- a/app-emulation/qemu/qemu-2.11.0-r50.ebuild
+++ b/app-emulation/qemu/qemu-2.11.0-r50.ebuild
@@ -531,6 +531,9 @@ qemu_src_configure() {
 		tc-enables-pie && conf_opts+=( --enable-pie )
 	fi
 
+	#bug #647570
+	conf_opts+=( --disable-capstone )
+
 	echo "../configure ${conf_opts[*]}"
 	cd "${builddir}"
 	../configure "${conf_opts[@]}" || die "configure failed"
diff --git a/app-emulation/qemu/qemu-2.11.0.ebuild b/app-emulation/qemu/qemu-2.11.0.ebuild
index 5a2f53f7be59..237bb73e4b39 100644
--- a/app-emulation/qemu/qemu-2.11.0.ebuild
+++ b/app-emulation/qemu/qemu-2.11.0.ebuild
@@ -530,6 +530,9 @@ qemu_src_configure() {
 		tc-enables-pie && conf_opts+=( --enable-pie )
 	fi
 
+	#bug #647570
+	conf_opts+=( --disable-capstone )
+
 	echo "../configure ${conf_opts[*]}"
 	cd "${builddir}"
 	../configure "${conf_opts[@]}" || die "configure failed"
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index cf81dc0a7aa4..9bba915ab0dc 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -525,6 +525,9 @@ qemu_src_configure() {
 		tc-enables-pie && conf_opts+=( --enable-pie )
 	fi
 
+	#bug #647570
+	conf_opts+=( --disable-capstone )
+
 	echo "../configure ${conf_opts[*]}"
 	cd "${builddir}"
 	../configure "${conf_opts[@]}" || die "configure failed"
diff --git a/app-emulation/qtemu/Manifest b/app-emulation/qtemu/Manifest
deleted file mode 100644
index 1b4147e47fc3..000000000000
--- a/app-emulation/qtemu/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 1.0.5-help_and_translation_paths.patch 2730 BLAKE2B 45e60c51dc6f8862619e6d391f6cc1805572ffa3a5aaaeb20fd45ab8cae6f7aac9783c358e26fb16a68b772852ae644bca95bd77d8cbdc4a46e85ecec5ae2ed7 SHA512 f9e83597f05717196b1fa3eedd951aaa12e69cf5a66b296481463a96877e556f61fcab247e2cf3e476aec96e6dcfb70f3968b4458e95b288985f68f3d85a8aaa
-DIST qtemu-1.0.5.tar.bz2 555872 BLAKE2B 546a1ec0071ef42b2782df5970b563e48b2dd659cf02a0e27dfdfed1df1f43f1d503dc379195eef9390c7098d826454a80f65fa6913506fb1ca4be05eecd79d2 SHA512 c8380acea500453053d8d2a9cc3eecb51c766d5743a22a7fbe13d3bd5d543ab63ab715ac2ffbd2389f24c699ea81ca3e0584c7578a9799300cef514886d1cee8
-EBUILD qtemu-1.0.5.ebuild 697 BLAKE2B 0a1e84a910cf26010e2d31f20cc0608fe74724f22ff695c5299078c7c8c38dd95f938c231a0e39c3ff5615618589f14aeb46a17e6e35bf63b8cc85316967b005 SHA512 a523434e18e5e8a483a6544d50d8090c4a71607ded0ebd30d8c976e87d9c83a0d939d4676b3ed7a30aa6b3df0fba247df8125a316ca2e406d40348a85c842c4e
-MISC metadata.xml 242 BLAKE2B 23374b7610555573df9aa7e4a3f5a780393cf58d4d9fb7ffc2272ccd9cd234a238d7e44886ddad41a7df4c3b6669d17ba687e92c425670c9f657649b9055a3d5 SHA512 fc51131611752aad3076c1c9708e486471670e5c726f341f8f9c13b001282fb5972305accddeba1a7b3affbab60a8b91f0f7320a85dcfc9631f8c81140ab186b
diff --git a/app-emulation/qtemu/files/1.0.5-help_and_translation_paths.patch b/app-emulation/qtemu/files/1.0.5-help_and_translation_paths.patch
deleted file mode 100644
index 8fc1680aacb0..000000000000
--- a/app-emulation/qtemu/files/1.0.5-help_and_translation_paths.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Naur qtemu-1.0.5.orig/CMakeLists.txt qtemu-1.0.5/CMakeLists.txt
---- qtemu-1.0.5.orig/CMakeLists.txt	2008-02-22 19:32:43.000000000 +0100
-+++ qtemu-1.0.5/CMakeLists.txt	2008-02-22 19:35:29.000000000 +0100
-@@ -114,7 +114,7 @@
-                    DEPENDS ${QM_FILES})
- 
- INSTALL (FILES ${QM_FILES}
--         DESTINATION translations)
-+         DESTINATION share/qtemu/translations)
- # translation end
- 
- SET(QT_USE_QTXML)
-@@ -146,13 +146,13 @@
- )
- 
- FILE(GLOB helpfiles "${CMAKE_CURRENT_SOURCE_DIR}/help/*.png")
--INSTALL(FILES ${helpfiles} DESTINATION help)
-+INSTALL(FILES ${helpfiles} DESTINATION share/qtemu/help)
- 
--INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/help/main.htm DESTINATION help)
-+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/help/main.htm DESTINATION share/qtemu/help)
- 
- FILE(GLOB helpfiles_de "${CMAKE_CURRENT_SOURCE_DIR}/help/de/*.png")
--INSTALL(FILES ${helpfiles_de} DESTINATION help/de)
-+INSTALL(FILES ${helpfiles_de} DESTINATION share/qtemu/help/de)
- 
--INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/help/de/main.htm DESTINATION help/de)
-+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/help/de/main.htm DESTINATION share/qtemu/help/de)
- 
- INSTALL(TARGETS qtemu DESTINATION bin)
-diff -Naur qtemu-1.0.5.orig/helpwindow.cpp qtemu-1.0.5/helpwindow.cpp
---- qtemu-1.0.5.orig/helpwindow.cpp	2008-02-22 19:32:44.000000000 +0100
-+++ qtemu-1.0.5/helpwindow.cpp	2008-02-22 19:33:26.000000000 +0100
-@@ -80,7 +80,7 @@
-             return testUrl;
-     
-         //check for case when qtemu executable is in bin/ (installed on linux)
--        testUrl = QUrl(QCoreApplication::applicationDirPath()+"/../help/" + locale + "/main.htm");
-+        testUrl = QUrl(QCoreApplication::applicationDirPath()+"/../share/qtemu/help/" + locale + "/main.htm");
-         if (QFile::exists(testUrl.toString()))
-             return testUrl;
-     }
-@@ -96,7 +96,7 @@
-         return testUrl;
- 
-     //check for case when qtemu executable is in bin/ (installed on linux)
--    testUrl = QUrl(QCoreApplication::applicationDirPath()+"/../help/main.htm");
-+    testUrl = QUrl(QCoreApplication::applicationDirPath()+"/../share/qtemu/help/main.htm");
-     if (QFile::exists(testUrl.toString()))
-         return testUrl;
- 
-diff -Naur qtemu-1.0.5.orig/main.cpp qtemu-1.0.5/main.cpp
---- qtemu-1.0.5.orig/main.cpp	2008-02-22 19:32:43.000000000 +0100
-+++ qtemu-1.0.5/main.cpp	2008-02-22 19:36:32.000000000 +0100
-@@ -45,7 +45,7 @@
-         translator.load(path);
-     else
-     {
--        path = QCoreApplication::applicationDirPath()+"/../translations/qtemu_" + locale + ".qm";
-+        path = QCoreApplication::applicationDirPath()+"/../share/qtemu/translations/qtemu_" + locale + ".qm";
-         if (QFile::exists(path))
-             translator.load(path);
-     }
diff --git a/app-emulation/qtemu/metadata.xml b/app-emulation/qtemu/metadata.xml
deleted file mode 100644
index e2c549e0585f..000000000000
--- a/app-emulation/qtemu/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">qtemu</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-emulation/qtemu/qtemu-1.0.5.ebuild b/app-emulation/qtemu/qtemu-1.0.5.ebuild
deleted file mode 100644
index 41282431fae0..000000000000
--- a/app-emulation/qtemu/qtemu-1.0.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils cmake-utils
-
-DESCRIPTION="A graphical user interface for QEMU written in Qt4"
-HOMEPAGE="http://qtemu.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4"
-RDEPEND="${DEPEND}
-	app-emulation/qemu"
-
-DOCS=( ChangeLog README )
-PATCHES=(
-	"${FILESDIR}/${PV}-help_and_translation_paths.patch"
-)
-
-src_install() {
-	cmake-utils_src_install
-	doicon "${S}/images/${PN}.ico"
-	make_desktop_entry "qtemu" "QtEmu" "${PN}.ico" "Qt;Utility;Emulator"
-}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 110f4912207e..8473c344c175 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -5,13 +5,13 @@ AUX vboxwebsrv-initd 646 BLAKE2B d71673a3afea56aea69ab1d795d8b265bb5fc62296e35d6
 AUX virtualbox-4-config 38 BLAKE2B 8eab341f3264a056a89633fe43dd58f274d0d877602156d97a4dcc6260dd8e446509173742988fa40346e62b1fe9368ff3fc9a97e3316cb919962d9a03340d52 SHA512 5455b70b8ac6f25365bae776b78c3ef5710ae2d5a9e939c7013d72c35f65f178268966ebd291a42666913e45f43c7196f8953331be0b0cc88eba66df39205b08
 AUX virtualbox-5-localconfig 1553 BLAKE2B dc1e946e97eb6b19a99b5ecf34640ef09c444637c19ea55ae7f0e34583a048b20ea4049e83ef3714a51e44545c50922b1f2758210145319f9881ca71b7d561d4 SHA512 1ec62f872a19ad76ce7d10ed70ee0503c65e817e123d82c20753e6ae4ac7d2ceb4e236da6be1fe3d63b0b104dd355de2cffd6e9d0ec0603c82fbf89662eeb34b
 AUX virtualbox-5.1.4-paxmark-bldprogs.patch 2642 BLAKE2B f8c25139dc58f6f2a9def4c3535457013a8f9ab9065d23ab858daede5d32b90a6387a0daab1fa39fad706f809799ba58405c2994c902d224cbf07118fe1af5b9 SHA512 40971ee2a2453cd830b118ee2d1d05468beec60b5c15fc36b2a01c30a454823bfc666149671f03ccbfd82abe1041e50c7d36d670da506cfb9b9faab9edcc83ee
-AUX virtualbox-detect-usb-fix.patch 852 BLAKE2B eeb9c8cbb3c4a9b4bca264a4915e015ebc7768d199ee7dd2f3d316226f967c56bfcba9c58d0911cfa95e68541be3ba394868c8ff714c6f6ca915821b23b3d02e SHA512 e03a32f398a2adf231393a18be1345fe50a1932e20e69ec3ab62977ab6b920c79622e4d6b26604f60e13a5604d919a5b6f757083bff370b8d12c71f6bab1a7b4
 AUX virtualbox-ose-5-wrapper 3405 BLAKE2B 92001ed3397a22abb5955617451bfb78d1f1f62f9be99cf87c57c42d118abb42b9436a0a83736d882b34360c9f8e67f9a8adaeffe7e9a3456c4ddc93a7850e53 SHA512 96f9ab8e2a83b5aebbb66916cbca0a7af0e2d69285296fe87869f096149791e0491dec2408f21f7249b68d928eebe396ab710a4ec6b6d6bc9c67120d323effa0
 AUX virtualbox-ose.desktop-2 201 BLAKE2B 05fbf657e8c1d8ec46f1b88e681efd50a4e5ab2a0f32f3fd25ca956e1e9bff6357c69a96628e3eba26b01869b6dc596f68f739f9330fa3018c186dfa0fdcea06 SHA512 a678e237ad0451e8785f242ebf822b4f3b03d2e2280a62f71728f79bdcfc84d3465ee60cad90db75e64b2c89a1b0b224de00519728fb605df67ca7c9aee0874c
+AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
 DIST VirtualBox-5.1.32.tar.bz2 117268301 BLAKE2B 336df054e3407d7e701d6719258cfcba9beec1439cbe94f137570cfcbdea02df3e34374ac36d3b4387c47ebafd17a0f05c2fb710eb4f140d8200117b505aba98 SHA512 052ac1672515a36c4138e2d52672a466d4c768f219f52eefe98e747a292ebebe04e7de35547eae6803654be5dc937b8e6f4d358a65fd4f49a8333eac8862d138
 DIST VirtualBox-5.2.6.tar.bz2 118530572 BLAKE2B 19d32a9252e9594a4c09828bc2bc739c46daf409745c01f764fb54bc17faa667081a27534ac11666cbf1b417057cb99a416faa42e3986ce4d2c08378e7e7240c SHA512 ed6f801c055e9b8e152118a1ebfecdc15c310fac2b007ea3cd4a404d17cbbbc83782a3baa76b979c72b9399616844291576846d820f8aefb7c4b4ec2eaf36482
 DIST virtualbox-5.1.32-patches-01.tar.xz 2464 BLAKE2B 28f461634ac7f200b74d961e56f56aea486445bdb8d1490000bd34393b4873ee058d1dc9db6c32084921bd7d51a92be1e38b1b098385f443f41b9231c1489829 SHA512 08782c8eecc0cbb370f21fb3951af449ed1c8174a7184210de376a7d4ca5d64b14b2619d121aacef1c85982c8b485e545e260d3c0fc1f95769093efa23cd2cd2
 DIST virtualbox-5.2.0-patches-01.tar.xz 2460 BLAKE2B d3f973dc7ee0557c360f801c3bf84065a7e7bc9960984398b8f86d71fab32c59774e970c6cf873be07bcb9666af168570e8a78705a5999b1fc5d863dbbc6e538 SHA512 b91278dd81a50e412f5a281c72949f591a1c53303080549b74b28763cab9e3948948afb0256e0453d17736683cca3372a8e9c6d63f02f3eff3ef92c2a1ea332b
-EBUILD virtualbox-5.1.32.ebuild 13833 BLAKE2B 843b58959bed9188c41e07d1803e0bb544951d68f55fa33dd581de20a83aeecbfdb11f7114e8b9a8d7dfb620869d1bfdf01be34ea743043803e1a1cd03ffb57d SHA512 7d82de2232678045015a16b72faea3db334506b67542dffa2df0da35dca2d1cbb1543d61eb3ec3b90f136860f0d886fac08d8514535cc074db528a0fd805ef21
-EBUILD virtualbox-5.2.6.ebuild 13823 BLAKE2B 6319e252b6f6682db8c5780e8e9df7d9ee34ec894741795ab0d33615ba0b6e04e8cb519aedf40f6f72e057a59a6ca4160ca46eeeb991bc6ba85f5397fe3ee1b5 SHA512 f8e68510edaf4fe3db317a32fbc9456a6cf24ec93ec547da46acefc15f94c28c20c23247cd7b89ba69e1c47de020555d090fbed7edfe0de7ce337b7321b960b3
+EBUILD virtualbox-5.1.32.ebuild 13927 BLAKE2B cdadc8c398f855ce9773e445c564dea60b3c88e299fd32499ce701419362ee7baa295cec9c29fa20eedb887e975d7e586e833c1cb65a5f0b3570e8a2664eafa8 SHA512 c8885403b6f3ea6eb8385efa4fcd995d9cdf4292c61b0e1edb6e65c82d4399468f2fe7b64d6a24068018f5a9b66c7c36a092a43382494ed132a6bf160e0f60d7
+EBUILD virtualbox-5.2.6.ebuild 13917 BLAKE2B db1e9a47350e95ff6e088760074d31e792a7044d17d083e7afbe48f2820a3946de7c829adb30598ae140033eed8141aee9f1f143b4c96da52d28b9027f055edb SHA512 8893fcd7272a1acab01620b07bf8bdc50f750cf8cfcd092ad2d2ef156fb46d1ec4e12986cbb1d7b5ecf07a0ee376c662f61dd103ca8feaf6b84467e3784e50a9
 MISC metadata.xml 886 BLAKE2B b8d7691c820ac4d8b0aa2033037a9229ebf68ba005b5c870e6d14dee4fbb9b5c0992904223caeb869fc265d48c57cd7f486d628cc4018cc018e8e32999175df3 SHA512 954d38fbbf08cce200af437ee3a0167bd39b4554c53b93d8f8961ac16e21a173fe4c4271fa8bf0ce2e354437c066e0ab4133131b03dac6ffcc2c92564584d081
diff --git a/app-emulation/virtualbox/files/virtualbox-detect-usb-fix.patch b/app-emulation/virtualbox/files/virtualbox-detect-usb-fix.patch
deleted file mode 100644
index bbb28943c129..000000000000
--- a/app-emulation/virtualbox/files/virtualbox-detect-usb-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Patch by Maciej S. Szmigiero to make the script work even if no USB device was
-plugged in before virtualbox got started.
-
-https://bugs.gentoo.org/639352
-
---- a/src/VBox/Installer/linux/VBoxCreateUSBNode.sh
-+++ b/src/VBox/Installer/linux/VBoxCreateUSBNode.sh
-@@ -32,13 +32,13 @@
- devpath="`printf "/dev/vboxusb/%.3d/%.3d" $bus $device`"
- case "$do_remove" in
-   0)
-+  case "$group" in "") group="vboxusers";; esac
-+  mkdir /dev/vboxusb -m 0750 2>/dev/null
-+  chown root:$group /dev/vboxusb 2>/dev/null
-   if test -n "$class" -a "$class" -eq "$usb_class_hub"
-   then
-       exit 0
-   fi
--  case "$group" in "") group="vboxusers";; esac
--  mkdir /dev/vboxusb -m 0750 2>/dev/null
--  chown root:$group /dev/vboxusb 2>/dev/null
-   mkdir "$devdir" -m 0750 2>/dev/null
-   chown root:$group "$devdir" 2>/dev/null
-   mknod "$devpath" c $1 $2 -m 0660 2>/dev/null
diff --git a/app-emulation/virtualbox/files/virtualbox-vboxusb_tmpfilesd b/app-emulation/virtualbox/files/virtualbox-vboxusb_tmpfilesd
new file mode 100644
index 000000000000..39378536a8b2
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-vboxusb_tmpfilesd
@@ -0,0 +1 @@
+d /dev/vboxusb 0750 root vboxusers
diff --git a/app-emulation/virtualbox/virtualbox-5.1.32.ebuild b/app-emulation/virtualbox/virtualbox-5.1.32.ebuild
index 08304b19cae9..e45e584a3a8f 100644
--- a/app-emulation/virtualbox/virtualbox-5.1.32.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.1.32.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 toolchain-funcs udev xdg-utils
+inherit eutils flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils
 
 MY_PV="${PV/beta/BETA}"
 MY_PV="${MY_PV/rc/RC}"
@@ -193,7 +193,6 @@ src_prepare() {
 	fi
 
 	eapply "${WORKDIR}/patches"
-	eapply "${FILESDIR}/${PN}-detect-usb-fix.patch"
 
 	eapply_user
 }
@@ -416,6 +415,8 @@ src_install() {
 	if use doc ; then
 		dodoc UserManual.pdf
 	fi
+
+	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
 }
 
 pkg_postinst() {
@@ -426,6 +427,8 @@ pkg_postinst() {
 			&& udevadm trigger --subsystem-match=usb
 	fi
 
+	tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf
+
 	if ! use headless && use qt5 ; then
 		elog "To launch VirtualBox just type: \"virtualbox\"."
 	fi
diff --git a/app-emulation/virtualbox/virtualbox-5.2.6.ebuild b/app-emulation/virtualbox/virtualbox-5.2.6.ebuild
index 7133045118bf..e40976f0165e 100644
--- a/app-emulation/virtualbox/virtualbox-5.2.6.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 toolchain-funcs udev xdg-utils
+inherit eutils flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils
 
 MY_PV="${PV/beta/BETA}"
 MY_PV="${MY_PV/rc/RC}"
@@ -193,7 +193,6 @@ src_prepare() {
 	fi
 
 	eapply "${WORKDIR}/patches"
-	eapply "${FILESDIR}/${PN}-detect-usb-fix.patch"
 
 	eapply_user
 }
@@ -416,6 +415,8 @@ src_install() {
 	if use doc ; then
 		dodoc UserManual.pdf
 	fi
+
+	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
 }
 
 pkg_postinst() {
@@ -426,6 +427,8 @@ pkg_postinst() {
 			&& udevadm trigger --subsystem-match=usb
 	fi
 
+	tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf
+
 	if ! use headless && use qt5 ; then
 		elog "To launch VirtualBox just type: \"virtualbox\"."
 	fi