gentoo resync : 15.09.2018

30 files changed, 576 insertions, 284 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index c7a04b8624e3..df5787a91225 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible-cmdb/Manifest b/app-admin/ansible-cmdb/Manifest
new file mode 100644
index 000000000000..50686ee4477a
--- /dev/null
+++ b/app-admin/ansible-cmdb/Manifest
@@ -0,0 +1,3 @@
+DIST ansible-cmdb-1.28.tar.gz 177437 BLAKE2B d3faa6cccdaa0825318bc9df09ad28b15d1a70ac25281f283e65ed760698c06db582d6954f19efe6cdde8e7ab103a915e663659cc64d72851ed830c817a700b7 SHA512 d8f87b7e2c664aec20585c34a83271ea4ec397c70ff1114e2b3669ba17903ed8f57ddf774b74d3d267a423bb71bf6d9fd6e59aa497f4b17449104db6ac71b38a
+EBUILD ansible-cmdb-1.28.ebuild 553 BLAKE2B fccec4a9b1a068d4e5d1299fc981563488b74d888d044285d3668ead8e2644523fddedae4f1a16fbecc9389146e84aa0dc8acde1a14f3051a47ed191de176fe3 SHA512 54e7c7b0a5cdbe63b3caf5582ae17a372d47a12c87b91f76e84a3cc360bc975e426d937c68d3654c5b38351dd5cb8c02fd55e1feeb5308cf28479012aef4840c
+MISC metadata.xml 488 BLAKE2B a8a8c5d397c1876289b718d4dc8688d5a001ee63eaad76b0b4eed91d5d89e15235e592f3282b3543382e9d9d26bff129fdb4b7a8cb008414d014084f61ede918 SHA512 fd2903178cc9dddb523ee35a711e5289ab7908b0b749ce96aaeaf924b848e407fb733831124517fed054bfef68420ce2e401bd77afa1966cc978a39f0d146f51
diff --git a/app-admin/ansible-cmdb/ansible-cmdb-1.28.ebuild b/app-admin/ansible-cmdb/ansible-cmdb-1.28.ebuild
new file mode 100644
index 000000000000..2abde982dcb3
--- /dev/null
+++ b/app-admin/ansible-cmdb/ansible-cmdb-1.28.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Ansible Configuration Management Database"
+HOMEPAGE="https://github.com/fboender/ansible-cmdb"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/jsonxs[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]"
diff --git a/app-admin/ansible-cmdb/metadata.xml b/app-admin/ansible-cmdb/metadata.xml
new file mode 100644
index 000000000000..8c687a7584d8
--- /dev/null
+++ b/app-admin/ansible-cmdb/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">fboender/ansible-cmdb</remote-id>
+		<remote-id type="pypi">ansible-cmdb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 5e54ea40c061..3cab9e590899 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,6 +1,7 @@
 DIST ansible-2.5.6.tar.gz 10157989 BLAKE2B 07341ab7a087e3139442d5420b461ca332f3a9e550874a746f43904763660ef12c9a2041bb991eeb315abdc7f6e31e3615d9283f407003eddddf2b661331c59a SHA512 169badaa6a94d1ea2d16cb97c7e5eb0b8c225a455edfa95f3ad9e4ec968d5b9525dec4732b60e5ba5f92412f87d8aacc0b2299f2595f3bb820ad8604be8e76d6
 DIST ansible-2.5.7.tar.gz 10162406 BLAKE2B 1374b0fba39f0cb263a24425d9ebcd9087c0dbad869ddaa1491465db60a80a1a3b82858c80d2d4fc1d03db05d94840f2eeddd4c5a13632426fac178663b7baca SHA512 1be274b080dcc4aba40c884ba45b1403788aadb1f14bd00fd52283bc6e691ec7863f061cb4b7d70965d48cdb49c6b849e9b2e49dd7dd6dd5d8788f2d637960b1
 DIST ansible-2.5.8.tar.gz 10169397 BLAKE2B 7cb0abb168af25a3cd7b94880309cf19f018a68277472afb24811bb4ccc329c129f754d2b97626f71052712690e372856bfb62345cdae74165eca38066e86779 SHA512 8de8ddf1925ef1465654f4bc1d54fd9f5f9d700ef2c5a4982684f3a4560ac933b05ff0661c34e61235006abc64fd6acf299d0c45f7b5796c3a89dda5382099ed
+DIST ansible-2.5.9.tar.gz 10165368 BLAKE2B 10d30d3200702958e15695d8fb0aa84ee89b65f966b2879f3d9e89c1bae9d38bffa5936f88dbd7e3b0329f07e523677898230fff424d0d61f03cbe2dab8f3020 SHA512 0962d2f30030889b07e72346452f21cdc99305920bb8e246fc19d37ca4c837dbfba3230634db398b74959a6a67f4ed9dd097eb7783a2854f0969aeeab7e00341
 DIST ansible-2.6.1.tar.gz 10724749 BLAKE2B af4523ab904660fa3369bdae2839ab4b2f386235be5a004e1f9a9a5f7c555a2e6fe82319abe20ecbf7e74152f8e2ad5060fda2c2af0f5d62fdd9416901c9072c SHA512 1235e12a510317665956bfae9e0d03814083a24ba6e5c98072437e50b4a596437a173b32d9d5af37b4b9e168e35045fdb65e65276fdc830f473ab1f42dcba2d2
 DIST ansible-2.6.2.tar.gz 10738149 BLAKE2B ac46fe99da9aba55702c578c6d177b7cb1bcd17fb73f08f160afbbcb6a868de721202492e8198e8cb8c68a1ce771572ce0bb598cd310f2ce35d08b0aeeee3f8d SHA512 2283d69be267474e839af44e0e7a14a5532cadef7d65baa2af4045cb93d88b76890b735a78cce348916c04f5dc3c2ed78deb22bb8d94d0c0c0306180d79b1a9b
 DIST ansible-2.6.3.tar.gz 10748570 BLAKE2B ff27e46771ab5c574202a195bdddb2affc256ba67de98627ef07d3899a1b6bbdb742a71deff63ad6a22aa53298eb22a22a44a885f53098e2404823565fbc513c SHA512 f34052379b892d5dff5e170e4237d4595ecf9d951226cc928fc092e253f5fa9f492a6e953ff09ed63b19ddb0f2b8df66ac738c2f48923e6d5b1dcc96fc2799c9
@@ -8,6 +9,7 @@ DIST ansible-2.6.4.tar.gz 10751810 BLAKE2B 16a01b76387b6fb0c6554861fd02a57858cf2
 EBUILD ansible-2.5.6.ebuild 1636 BLAKE2B 8c6498794147e6fc8c2cf50429a44f481f1244d532cb0205f6c0828bfceda1690264e78621fc74d75a03f3521600cc81f9f78afcba60a9e089b3472d9f4fa687 SHA512 5b90735e77ea2e0f47b6744f179ad555da406a6efa1a0137e590fe6e22cba1406aa925dd175a421fe7499ba2cdf9a8666673118700c046f9512d0572c6ec6fb6
 EBUILD ansible-2.5.7.ebuild 1626 BLAKE2B 99e0d3c67631e1f0c5c2e5118728ba06ad2fb26f6b0b689ca8541ac5f03611b5ec516a23ac7f2dfe73a677f0047e51291e83d03e820420e430276f0f844305fd SHA512 9e1a627f40a7a87abb811eaeb37601836324db2d292f4fae990aea3d6b3a5d30f739b1f4a198c5542cf0fbc1f836e9d96a8e67938fb6c3d9709800138a47ca9c
 EBUILD ansible-2.5.8.ebuild 1626 BLAKE2B 99e0d3c67631e1f0c5c2e5118728ba06ad2fb26f6b0b689ca8541ac5f03611b5ec516a23ac7f2dfe73a677f0047e51291e83d03e820420e430276f0f844305fd SHA512 9e1a627f40a7a87abb811eaeb37601836324db2d292f4fae990aea3d6b3a5d30f739b1f4a198c5542cf0fbc1f836e9d96a8e67938fb6c3d9709800138a47ca9c
+EBUILD ansible-2.5.9.ebuild 1626 BLAKE2B 99e0d3c67631e1f0c5c2e5118728ba06ad2fb26f6b0b689ca8541ac5f03611b5ec516a23ac7f2dfe73a677f0047e51291e83d03e820420e430276f0f844305fd SHA512 9e1a627f40a7a87abb811eaeb37601836324db2d292f4fae990aea3d6b3a5d30f739b1f4a198c5542cf0fbc1f836e9d96a8e67938fb6c3d9709800138a47ca9c
 EBUILD ansible-2.6.1.ebuild 1636 BLAKE2B 8c6498794147e6fc8c2cf50429a44f481f1244d532cb0205f6c0828bfceda1690264e78621fc74d75a03f3521600cc81f9f78afcba60a9e089b3472d9f4fa687 SHA512 5b90735e77ea2e0f47b6744f179ad555da406a6efa1a0137e590fe6e22cba1406aa925dd175a421fe7499ba2cdf9a8666673118700c046f9512d0572c6ec6fb6
 EBUILD ansible-2.6.2.ebuild 1626 BLAKE2B 99e0d3c67631e1f0c5c2e5118728ba06ad2fb26f6b0b689ca8541ac5f03611b5ec516a23ac7f2dfe73a677f0047e51291e83d03e820420e430276f0f844305fd SHA512 9e1a627f40a7a87abb811eaeb37601836324db2d292f4fae990aea3d6b3a5d30f739b1f4a198c5542cf0fbc1f836e9d96a8e67938fb6c3d9709800138a47ca9c
 EBUILD ansible-2.6.3.ebuild 1626 BLAKE2B 99e0d3c67631e1f0c5c2e5118728ba06ad2fb26f6b0b689ca8541ac5f03611b5ec516a23ac7f2dfe73a677f0047e51291e83d03e820420e430276f0f844305fd SHA512 9e1a627f40a7a87abb811eaeb37601836324db2d292f4fae990aea3d6b3a5d30f739b1f4a198c5542cf0fbc1f836e9d96a8e67938fb6c3d9709800138a47ca9c
diff --git a/app-admin/ansible/ansible-2.5.9.ebuild b/app-admin/ansible/ansible-2.5.9.ebuild
new file mode 100644
index 000000000000..6ca07021a91a
--- /dev/null
+++ b/app-admin/ansible/ansible-2.5.9.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index d6f248e572fe..c26148bfe9ca 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -7,5 +7,5 @@ DIST httpd-2.4.34.tar.bz2 6942969 BLAKE2B 02ecb9980f48bef7ac915077598560353e0682
 EBUILD apache-tools-2.2.34.ebuild 1977 BLAKE2B 792d6ea010621c815a13fa89db289cdb7d2f02cd4aecca6d032e21c2bd64af7c35a66ebe3b8102eb441d12a4b6b2ca6197e16f8479d72c82606b088b97dfc24a SHA512 4a71266da0e171579c5d9da9ed681ed5600d2d94ffb15761bbd7f28b60332158959156a65b27ac295869f647f624fe598bdf2e74aa3c7f8b16fef7cbb2dc9a52
 EBUILD apache-tools-2.4.27.ebuild 2653 BLAKE2B 00b1b5e96e7eab66981fc339faf6db5e40d05af2d819c92a5faff3ad2f60c566d0235cbf60ded1d5daa79cec7815534b96b53b8e8f00333d1a814058752dd011 SHA512 e23b494555f6685f482fcecc59b5e81147780bf399de740b91bc19de9197a3d6f9d32a701472ba6551a3039214adc2e0bfd4436e0b82edb388f26d4dc88bd110
 EBUILD apache-tools-2.4.33.ebuild 2577 BLAKE2B cb22dea646e2136f767d99f36d0f6fcd341f09ba8a38a278b33980e251b99dc8186d78287c47a698d3d5462089afdb1517191ab2bde3f8d93e1578a8bf7a798d SHA512 2e468db54aeb16e14b6bd65e13cf63ffb43b7428feaa83a6f13f66d6d2da710f40e30613a1a19102ea45ca7d270252196ae6cf98b20bee49ee78e5e55e0b3484
-EBUILD apache-tools-2.4.34.ebuild 2578 BLAKE2B 143b17d87a0f34d1c2ac131517762e92fa5847c33f762fe0367b07bfd1e2ff3a56233c1f38c1435b39af7f2f482dfbdac59d8c1b53d5adbb96f4c22bbc5c35eb SHA512 be6cd1fbb8fccc4fd9a21fcf0589f064cbe35e5602195f59cf20fa45e26af9b14f032765bd26589eb3dda5971db77d1c96120e6d1b76d8fd196d72eac43a4a0b
+EBUILD apache-tools-2.4.34.ebuild 2577 BLAKE2B f0fdcd492a7664ffb13db13ac6a2f8c63f6e191309db55c6f981fa1d48a544c7e38de5f8ce2e0e96743e51a4a38d82215764a2c79b830f82efc6adf570dac11f SHA512 1a7e33375e0355ad4df9ff742ccb55754d07134fd85c13ca0a753560554d7b775b79e7a1a1b1c575079e62b39d3aed2275ccd58b5d92450f06d21252edf42d48
 MISC metadata.xml 466 BLAKE2B 06dbc2df528810dc0aa7335271c987c6310ceb7d8b0db3dc74c6727c27d280e499ddd9ee75580dba63e0f33e24ce63ecfa40059a46ebdec80005769608cae82c SHA512 2820a1f104fbdc752196f600def1e0c56eed6025fa3e66b297077be7a6eb735a2009f1a57cc320e2cf0c2d6cebf9db8c338cf2c6cc9c746766ab99a0b49c63fe
diff --git a/app-admin/apache-tools/apache-tools-2.4.34.ebuild b/app-admin/apache-tools/apache-tools-2.4.34.ebuild
index eb02388d014f..93e1ddd7082d 100644
--- a/app-admin/apache-tools/apache-tools-2.4.34.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.34.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 IUSE="libressl ssl"
 RESTRICT="test"
 
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 2efef14ee095..83568f816ac0 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,9 +1,7 @@
 AUX conky-1.10.4-x11-build.patch 944 BLAKE2B eafeab1078e1c1c96190dce1207f49272a86fb964b153cd971d3e773ddfb8094a55b0c8e77f0d152c5cc4ec77f0863b694fca8d776208f2aae26d6366cc898ef SHA512 4ef0fb7467101befd1adbc0ae43268d69ceaa35af0185ade1f3b8ce4ebe8d8083cc6c71ddabae73bae1c5f92f5f95b0a4595dd92dd55bd9ffc4a34d10af26afa
 AUX conky-1.10.8-libical-3.patch 1395 BLAKE2B a42403799854d0c96e37b654ab1a72897e32cd176d4efee3aa3816f36b782d823502a4a1cb79646995e90c9ac25d9a4bcd6f1879abe365173c3e29fc8583f213 SHA512 40cdd81f975c5198149ac62066af1a7b8eaa2c722d896d71a88663bef5bfdda17521d841a4fa8e08b5c4cc9106929385d626afcbe65709360b669b10a118f397
 AUX conky-1.10.8-use-pkgconfig.patch 1115 BLAKE2B d951bdd32ee0e6eace1444d3b8a6453c6ba25c15df2cb5ca4e1ccbb2f7f86fb860e4b43e75d76b62f7d1d12e91018bb03fb3b0237ce1b1af239c53f0bffc832b SHA512 e4b73aa8c0cc917a87e1eaecc3a2e55058fa4ea0acee9c76e409cda29de0c430df3a13f8a6c3ac922dd0a11b6c4cfca781bef39c6d508e903ae81423144c86d4
-DIST conky-1.10.4.tar.gz 365145 BLAKE2B 60f6f53ef67a9958d4dd4c3f1ab53886235927ed457ad3e98d2f6f61568a14baa7cd2afa0d3ddde9ed5e16aae17891213d906f49c308269f678adf37ea627329 SHA512 665a3c2a9b150576d7c29964dafb7030f5aa5955530142cf0d00f0f49f4a3b320924d389b3a833ef6eb18468000f5c62d918e8f067c7b40cd9e205d0bf0d8e0c
 DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a
-EBUILD conky-1.10.4.ebuild 4850 BLAKE2B 4d7e00ca639cfc5eed0b80f2ddb473e2979014e2564c684a07e0d4647612ee53c0cee16e6d2806e25a70c0725521678a04d5e43cc3544d4612fee749bbf50510 SHA512 612694ed4db70e8198f6a5b4110f972ab09dff8e3f8619367db3e2697dce97d22fae09b971b3c7800b150f744e86a3268c0999f4e1f3ed3f3041bb32dbbb7663
 EBUILD conky-1.10.8-r1.ebuild 5183 BLAKE2B 3d7600107cf9f7059ab7d6200a2a9124e7ddb0a63714405138de09aed61cd48b9d8bc1ccf41d79d3a6c5ed91d60210e392665a0f9dd121aaef0a088b9ba77f3c SHA512 bb859214273725faac37daf0c88f299bc5a7a81ae55c26cc4920f908ef13deb3068aa30b4c3e5d1314e268c04c91b840f5783539d4613041cef4a7f2be297c39
 EBUILD conky-1.10.8-r2.ebuild 5226 BLAKE2B 141b71885b2fde6ba9c1c613527c0e94b4ace5d3fd341f34daace3735e3fc45ba6302f09592cc5bb4a692f60fcfe570f909c3f0e6faa84d2cec68ba4918b758a SHA512 fd863912a5b712cf8ab668ce91a53847c2c3caf4b6fd52fde903b9401d78d5cb6d5b8ae454a71023b126801af37a442b230bec338fcd2a80cbc7d57f0f3efa7f
 MISC metadata.xml 2525 BLAKE2B 805fd872d69f00911fa599d87f2c638b1126c438fd0c8ccdda84ff5cbddecbca882b74fa1828e703c32a4035a4223606a1da75bb27cc63ac19b8dd61f5f90b42 SHA512 ccfe5718005f521aa00e7a66429493ea1301f7691acf0cca2faa5372c5f1349ba62d5046b85059f395fe51b30130a06f6867e0736b80cf4b76f9388b05fa76bb
diff --git a/app-admin/conky/conky-1.10.4.ebuild b/app-admin/conky/conky-1.10.4.ebuild
deleted file mode 100644
index 38f3c714f274..000000000000
--- a/app-admin/conky/conky-1.10.4.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils linux-info readme.gentoo-r1
-
-DESCRIPTION="An advanced, highly configurable system monitor for X"
-HOMEPAGE="https://github.com/brndnmtthws/conky"
-SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 BSD LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86"
-IUSE="apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
-	lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
-	nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
-	weather-metar weather-xoap webserver wifi X xmms2"
-
-DEPEND_COMMON="
-	X? (
-		imlib? ( media-libs/imlib2[X] )
-		lua-cairo? (
-			>=dev-lua/toluapp-1.0.93
-			x11-libs/cairo[X] )
-		lua-imlib? (
-			>=dev-lua/toluapp-1.0.93
-			media-libs/imlib2[X] )
-		lua-rsvg? (
-			>=dev-lua/toluapp-1.0.93
-			gnome-base/librsvg )
-		nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
-		truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
-		x11-libs/libX11
-		x11-libs/libXdamage
-		x11-libs/libXinerama
-		x11-libs/libXfixes
-		x11-libs/libXext
-		audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 )
-		xmms2? ( media-sound/xmms2 )
-	)
-	cmus? ( media-sound/cmus )
-	curl? ( net-misc/curl )
-	eve? ( net-misc/curl dev-libs/libxml2 )
-	ical? ( dev-libs/libical )
-	iconv? ( virtual/libiconv )
-	irc? ( net-libs/libircclient )
-	mysql? ( >=virtual/mysql-5.0 )
-	ncurses? ( sys-libs/ncurses:= )
-	pulseaudio? ( media-sound/pulseaudio )
-	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
-	systemd? ( sys-apps/systemd )
-	wifi? ( net-wireless/wireless-tools )
-	weather-metar? ( net-misc/curl )
-	weather-xoap? ( dev-libs/libxml2 net-misc/curl )
-	webserver? ( net-libs/libmicrohttpd )
-	>=dev-lang/lua-5.1.4-r8:0
-	"
-RDEPEND="
-	${DEPEND_COMMON}
-	apcupsd? ( sys-power/apcupsd )
-	hddtemp? ( app-admin/hddtemp )
-	moc? ( media-sound/moc )
-	nano-syntax? ( app-editors/nano )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	"
-DEPEND="
-	${DEPEND_COMMON}
-	app-text/docbook2X
-	"
-
-CONFIG_CHECK=~IPV6
-
-DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
-
-PATCHES=( "${FILESDIR}"/${P}-x11-build.patch )
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}.
-To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf
-and edit it to your liking.
-
-There are pretty html docs available at the conky homepage
-or in ${ROOT%/}/usr/share/doc/${PF}/html.
-
-Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
-
-pkg_setup() {
-	use ipv6 && linux-info_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs
-
-	if use X; then
-		mycmakeargs=(
-			-DBUILD_X11=ON
-			-DOWN_WINDOW=ON
-			-DBUILD_XDAMAGE=ON
-			-DBUILD_XINERAMA=ON
-			-DBUILD_XDBE=ON
-			-DBUILD_XFT=$(usex truetype)
-			-DBUILD_IMLIB2=$(usex imlib)
-			-DBUILD_XSHAPE=ON
-			-DBUILD_ARGB=ON
-			-DBUILD_LUA_CAIRO=$(usex lua-cairo)
-			-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
-			-DBUILD_LUA_RSVG=$(usex lua-rsvg)
-			-DBUILD_NVIDIA=$(usex nvidia)
-			-DBUILD_AUDACIOUS=$(usex audacious)
-			-DBUILD_XMMS2=$(usex xmms2)
-		)
-	else
-		mycmakeargs=(
-			-DBUILD_X11=OFF
-			-DBUILD_NVIDIA=OFF
-			-DBUILD_LUA_CAIRO=OFF
-			-DBUILD_LUA_IMLIB2=OFF
-			-DBUILD_LUA_RSVG=OFF
-			-DBUILD_AUDACIOUS=OFF
-			-DBUILD_XMMS2=OFF
-		)
-	fi
-
-	mycmakeargs+=(
-		-DBUILD_APCUPSD=$(usex apcupsd)
-		-DBUILD_CMUS=$(usex cmus)
-		-DBUILD_CURL=$(usex curl)
-		-DBUILD_EVE=$(usex eve)
-		-DBUILD_HDDTEMP=$(usex hddtemp)
-		-DBUILD_IOSTATS=$(usex iostats)
-		-DBUILD_ICAL=$(usex ical)
-		-DBUILD_ICONV=$(usex iconv)
-		-DBUILD_IPV6=$(usex ipv6)
-		-DBUILD_IRC=$(usex irc)
-		-DBUILD_MATH=$(usex math)
-		-DBUILD_MOC=$(usex moc)
-		-DBUILD_MPD=$(usex mpd)
-		-DBUILD_MYSQL=$(usex mysql)
-		-DBUILD_NCURSES=$(usex ncurses)
-		-DBUILD_PORT_MONITORS=$(usex portmon)
-		-DBUILD_PULSEAUDIO=$(usex pulseaudio)
-		-DBUILD_RSS=$(usex rss)
-		-DBUILD_JOURNAL=$(usex systemd)
-		-DBUILD_IBM=$(usex thinkpad)
-		-DBUILD_WEATHER_METAR=$(usex weather-metar)
-		-DBUILD_WEATHER_XOAP=$(usex weather-xoap)
-		-DBUILD_HTTP=$(usex webserver)
-		-DBUILD_WLAN=$(usex wifi)
-		-DBUILD_BUILTIN_CONFIG=ON
-		-DBUILD_OLD_CONFIG=ON
-		-DBUILD_I18N=ON
-		-DMAINTAINER_MODE=OFF
-		-DRELEASE=ON
-		-DBUILD_BMPX=OFF
-		-DDOC_PATH=/usr/share/doc/${PF}
-	)
-	# -DMAINTAINER_MODE=OFF disables building documentation and fixes bug #486270
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
-
-		insinto /usr/share/vim/vimfiles/syntax
-		doins "${S}"/extras/vim/syntax/conkyrc.vim
-	fi
-
-	if use nano-syntax; then
-		insinto /usr/share/nano/
-		doins "${S}"/extras/nano/conky.nanorc
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index bb6265265d96..31365501331d 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,6 +1,6 @@
 DIST eselect-1.4.12.tar.xz 177520 BLAKE2B 0938fe9bd8785fe711edc1af63a9c318a4a5fe9141c61d7f1c4da0352242322f1e18e4f68f7e219a1aa2beae5b25ddac58d7c47d4272408fd8fe5207324ef7c7 SHA512 2ea182364dfb2333112e9eebe691e1963e95a4c9ab40945eb2e5bc8c81da76105c1ae6aa3d153b78dea6c1e0cadb9b0237f7556b8ceb9d48e0fba67a642d6081
 DIST eselect-1.4.13.tar.xz 177848 BLAKE2B 70e5a793759e16119f5233b2c974e0fcc8d213b2033e2b3b76e0a047797b1a0f2feb21ad3beda72f644b498725b4d8ff5c221dcd0870adf5197eaf81c6f3c895 SHA512 5ce10bd288268bc5b52031703f8ac8f3cf07bb22039339bb00c92583ed226162ea8865788f5c1ff4e058d38f0bf25e3557273fb1e839e0391c1fafb9f702bc11
 EBUILD eselect-1.4.12.ebuild 1623 BLAKE2B 6d8d236b4b11ec808ab1f95c0a1c295fc4ffff17f85151dd176354a1a1bb7459eb9d64f59411b7a7e3905a563884865c5dc23973f5d6674f13ebafde00ef3d0b SHA512 398ca70365af9bb0aef6807b8d797fe55c10afabe25b2e7a4657aba39b70748f04a5f94b24569701042399e9c4ffea1c48b824f7b179608d080981ff1159f2da
-EBUILD eselect-1.4.13.ebuild 1629 BLAKE2B c114ae399855fc76b3602dd1f7cf03ccb05f00367b05a84097305fc7840394201e75b5bd241ef623c32af89f4c0bc798b16be2aa117240215945fe0923559ad0 SHA512 f1e5461a7857848570a14f0f0e515939c7f864377b371dac5b4b437b98efbaafa551acc9420efc4d8212e99739c037ae77899082c71488584b9b64a433bada74
+EBUILD eselect-1.4.13.ebuild 1627 BLAKE2B 769d35007e7151d71ed91b649d1e631af8f90bf00d9eb38f23415fa00629793bcb5151d5dd23f5b63c866c5b39c878703db8bdc789436ebe61190a7e3002a83b SHA512 16c5c1e1288b1b00eba2be8414f5ea5f7c2475ed122b2571aac044968d6bf21cf17e022f469a6123f1cc1e0d8d88db021231e7de9f697525145e1792bcf4ee3b
 EBUILD eselect-9999.ebuild 1437 BLAKE2B a390e3198a7f7f52f48ef56bdb73a8075d5c4c1560c0df7971d32798f1296114053b16a8faeee2982b8e106be835e3b61c3655dc2de270b488259f185e8a8980 SHA512 06a5eb4f7bed5a17f9cd56fe497a7cadb7a153580fac6aeefd6f0762ed029c78c79e4f4a50301177eff4e50ac3ac5ddfae342eb0eb4b5c64aa6a840493fa5868
 MISC metadata.xml 272 BLAKE2B 68f9c1edf77cdf1dc46891129ed694307cab4e954c6cb002c3fc32fba216949c83a21dc0618f4bf24fd8e1da5558043709210e6697fda3881adeb69a30eb569f SHA512 55cba722900834986e0ea0c9cd8463c3b69d3ada26227d45c8cc3aa07f6ca40919457f80b03a559a8f9ad55636d931cc2101b928b438aeca19b0531c90ec40a3
diff --git a/app-admin/eselect/eselect-1.4.13.ebuild b/app-admin/eselect/eselect-1.4.13.ebuild
index a2ed05380965..bcd025bed27f 100644
--- a/app-admin/eselect/eselect-1.4.13.ebuild
+++ b/app-admin/eselect/eselect-1.4.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"
 
 RDEPEND="sys-apps/sed
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index b9b8284cb785..f42d44bb6dd6 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -7,10 +7,12 @@ DIST filebeat-6.1.1.tar.gz 17061456 BLAKE2B 5a5d23618f8140f3815c499305d99ae3dc4c
 DIST filebeat-6.2.4.tar.gz 19466271 BLAKE2B 417f1db19b7fdd9bcf66f2c3dcdf2aaa6be9ba5edff1c97a0b8f4a5d7953ef27bcbd860e097fb40e67b3b42b795b684dabb2995eee572243831f749a7184b625 SHA512 49293e28e4ca769a88f7b889ea888a559ae7e142698714e24bf5519d00c2030237cac591590aa284f17792906a6137333173716ddf5db4496217f8b5a054b19c
 DIST filebeat-6.3.1.tar.gz 20915568 BLAKE2B 048898bc4520c0dc2a0aa5257149ecb75abc0b52d9a8cae63fdfe9fc8c329b3fa30d7277ae0cb916a86477d60e82b63839956cfa7a1985961c5ee5f6622b9f83 SHA512 1c03cc8fd3b968ade678cf2290fd7bd8fed2f9daa64cd550455567296ff51517b502b54e1b2413820c25cf899b7759662c9c18278c78a2568c74a26841f5f525
 DIST filebeat-6.3.2.tar.gz 20923316 BLAKE2B 70ac7e574f94a6141a7c6a1bd0af45ddbda3d01d6ea006c90ea341d2df03cac320d53496833cace3b394b9433251ea68a248dafdc8e28a85a6014314d5a2f3c4 SHA512 3d6ed03c9286bc7784444ad979b1398fcd70d870be184f912202ee5fab7c0ff23df639f445ec14cfcfd4d41ef648f33e88c2959f3c5f966fd3986884a223623a
+DIST filebeat-6.4.0.tar.gz 21996282 BLAKE2B 892a7ff307af3370d8df3661490359b4984bb6eedaf688a9fb845531b3de4e7785081602c4071b244c4ed26021d7455e35745a1011f8830b69a9440affe46997 SHA512 c059428b6d4d85e061b9078955f56323e7f02c74495702dca318f8c53c3fb7c4244a86a388ab79c5288601fbd08963acf7959834b1f9cdeddfbb10011e9d8184
 EBUILD filebeat-5.5.2.ebuild 1646 BLAKE2B 37f6ac540ed27b471021be5666233d00ceacdcbdf6a32954c5987fa85c957223d84536dd5c0e93bf6acd988b01a061008cffff005806d8b2d8cee7f722884f33 SHA512 4b36e36a4f95c893bca863c4510e903f6265e4950fa000cae61896915c558beb4d8c4b10d8aa78d154bef7eb67886628f499153f988ff66e5b1066cb949b2029
 EBUILD filebeat-5.6.10.ebuild 1496 BLAKE2B cd528a4a68ef61ae3f5fea941e8a71e72002cb5b18814b3d9b3bdfdd86520f42ac87818acaf313807a2b7cdc1eef1f6ffa26d06d5190b9446c3f95b614718158 SHA512 0a7de42d1408d5c3a54836ebea8450e27b57f42824dbb1e2ce3d705123df752d8f68e8c40de2b17a6dae93307856eaa3898925994839e6d5e13e7275a30988f9
 EBUILD filebeat-6.1.1.ebuild 1303 BLAKE2B 9e3c7601566336639171e69171b51d1a7ca33d8636de2cca01709d1c97a65a82fda7b650efd682fd4d4909587a5868a84c4ea4053798b1daa73f11a036951a82 SHA512 fa282f9c87f051c0f33f0344f34d81c8dc9d8beb7d8b8d74ca8490bfb4f727f557145d138f7397452635b96b9be1a0a82e52f6b894a9e0b48cff16a11065491b
 EBUILD filebeat-6.2.4.ebuild 1216 BLAKE2B f3b33fcbe8ac9fae7bffe893254eed1c8daccb095cc04a9b8f07160afe029e6d960910aa0fa4805d61bb1649fb8de9f8f5f0016cba2cc8175651734937ae953c SHA512 4bbed842b8b59e0ddfce1b2ba4118692f03189908e957328f9a6db00e42b5901d32cc7dec8ae449bfdef6bbd8fa1abf06cf428def31070fdb0321ee7d2a55b8a
 EBUILD filebeat-6.3.1.ebuild 1323 BLAKE2B 2a6d030c2254e603df514bad88411f9436b618aa04193bfe007067046bfba03673db0ca4f46cb137d1de7b70d49b5039fec1f9afbc5ae7a801110a53b440b191 SHA512 a8bd4772445873378bdce0aa6ae31e04671b9ea79dee78c7299f718ac6ae11f27f4fb86d4f6ab4276b221af4aa7a4219b58538a61c483726c8538731da058c2e
 EBUILD filebeat-6.3.2.ebuild 1481 BLAKE2B a95db39be261a542f9e1c76b1c1394380e96d5f947255c30bb2fc07993d99deb79e2064016addcc9dc7dce13e6c223e7f97160cae9dcc722955a247a49d51dfa SHA512 6866f69ec58ab0531f7fd594fe0ee8555afdfe0cdccc8215a8317289102f76e4e2833f7ff0977fc309bb444288a01fe665d02a20fad9ee47cd73c771fd8f7874
+EBUILD filebeat-6.4.0.ebuild 1481 BLAKE2B a95db39be261a542f9e1c76b1c1394380e96d5f947255c30bb2fc07993d99deb79e2064016addcc9dc7dce13e6c223e7f97160cae9dcc722955a247a49d51dfa SHA512 6866f69ec58ab0531f7fd594fe0ee8555afdfe0cdccc8215a8317289102f76e4e2833f7ff0977fc309bb444288a01fe665d02a20fad9ee47cd73c771fd8f7874
 MISC metadata.xml 461 BLAKE2B 8bd064daf5ee2d3fe746a73bf36f01926fee1f9796b29499a7fb1db844aface3be7dfd137ed31f606e78834c1d7a135d0119f400244ba33ce3feb81fa792eb6e SHA512 903c43c9cf4b371e34afffd0b425086d5fba6f37af0d761fc0065d114dc843ea0dcdd439682e48749bdf2f9138bfc3dc6cfcc6490503daeb7a71ce5706a779d8
diff --git a/app-admin/filebeat/filebeat-6.4.0.ebuild b/app-admin/filebeat/filebeat-6.4.0.ebuild
new file mode 100644
index 000000000000..739d28056bb7
--- /dev/null
+++ b/app-admin/filebeat/filebeat-6.4.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/beats"
+SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.10.3"
+RDEPEND="!app-admin/filebeat-bin"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+S="${WORKDIR}/src/github.com/elastic/beats"
+
+src_unpack() {
+	mkdir -p "${S%/*}" || die
+	default
+	mv beats-${PV} "${S}" || die
+}
+
+src_prepare() {
+	default
+
+	# avoid Elastic license
+	rm -r x-pack || die
+
+	# use ${PV} instead of git commit id
+	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
+}
+
+src_install() {
+	keepdir /var/{lib,log}/${PN}
+
+	fperms 0750 /var/{lib,log}/${PN}
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
+
+	docinto examples
+	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
+
+	dobin filebeat/filebeat
+}
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		elog "Please read the migration guide at:"
+		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
+		elog ""
+	fi
+
+	elog "Example configurations:"
+	elog "${EROOT}/usr/share/doc/${PF}/examples"
+}
diff --git a/app-admin/lib_users/Manifest b/app-admin/lib_users/Manifest
index 1efc2ff5d28d..9badeb4ccd09 100644
--- a/app-admin/lib_users/Manifest
+++ b/app-admin/lib_users/Manifest
@@ -1,5 +1,5 @@
-DIST lib_users-0.10.tar.gz 25636 BLAKE2B 6e660b80ef75f71d47f4783dc741e8b0c17f3cfe31296c5624adcfed5836a0b86964f042eafb5b34e259a824c79efb537558d625bc16d07fb388d61ece7c6329 SHA512 dee8203457570f686df69dc91d71614b462845c848a3445fd9b9f94047fdba8171cc2555fa4299bc4c361905d488c1f17cee4ab0e99899f37995377d6011805a
 DIST lib_users-0.11.tar.gz 25660 BLAKE2B 8f5a827840d4074a0e8abd77e43f60eb09f199f58a2bde0c2bce7613d6ba1d9b12dd46adffa528ff351f54933c304f274abef9c35550d7af3519101dcec69d0a SHA512 a54fc8f57cffcd08e77e86eaf50ec6e68e45e1e9458e25e035af90e14be13980a400c4d264f70ef67e141e1d54581b0487b2b70dd084dc5840424221b46f644a
-EBUILD lib_users-0.10.ebuild 1117 BLAKE2B 511c6cc9302552d0f0c70221ed81079f64b8a8fc9bf35541d03130769981f5d96a2243fccaf122b9d2875d5fbc794e094ebbdd3a56a33ccbdf1f8b0ccd844033 SHA512 d5e8f63944f2b7e6cc6bb34b170f59b534cc5c6c8346ade237110a621e27dc2253969ec969321d5567e6d0e70dc9a3d57219321d41cbe27462e109b590c2a605
-EBUILD lib_users-0.11-r1.ebuild 1127 BLAKE2B 31a0e8bf4947d7b3a400db305ff513907b676a6b1be57ad1a69190db52ad944b94738866294d6cf679d5078e8df3e06685e2fb9cf617b192798ee10146a4408e SHA512 fc254dc1979cccd40f2ca494a7f8c7646299fade0889bb52b2a61f6b7b9880de076370db98f0b207152f6b72898ee97ad4099bcb753f4eb6a7b25ecc7ba20bef
+DIST lib_users-0.12.tar.gz 25688 BLAKE2B 415e3d387360c0e3a3d27ccab8e5a861ea41fceaefa756aa116266f5449856c51a4a7ec650a8665e73d3a74a9973662ea693308a0636fbd7fb8b5dd57dffea35 SHA512 cdd55fe971845be30fb83156c335bbb8d63815fe3b3f62b9689a7c68f402e89ad5b9c0ff805ed57766a5e5fcac598bc6fa1dc36cf65997ab495675d726304847
+EBUILD lib_users-0.11-r1.ebuild 1121 BLAKE2B 3033063c5a98e867590ce0d4eac740ede458cb2ec5abb00ae8f55afa405e1d6e811ea1b0e71d9f80cbe91fad32128a0bc3cb6242d510f733e1c176fe1ce7b952 SHA512 6e14ee67829db95b0441ea159368aaba00174d7523fe8bac7f5c023191638325c93059c2b46ec7a866b000d9ab4210366ddad8e3dbed1a1159e83527afa03b08
+EBUILD lib_users-0.12.ebuild 1127 BLAKE2B 31a0e8bf4947d7b3a400db305ff513907b676a6b1be57ad1a69190db52ad944b94738866294d6cf679d5078e8df3e06685e2fb9cf617b192798ee10146a4408e SHA512 fc254dc1979cccd40f2ca494a7f8c7646299fade0889bb52b2a61f6b7b9880de076370db98f0b207152f6b72898ee97ad4099bcb753f4eb6a7b25ecc7ba20bef
 MISC metadata.xml 454 BLAKE2B c545fd1db330988ad139de08b1890cfd9d6aac98947b954fb761515d314d8ebb941829e7767fe4fad6beb41caf3409111505d1a6378c852f15907933678ddd48 SHA512 c897ea5b6bed9fcc8715380a1b2756f376a095925a2c99a78ce6729cc9839683f40ce53f5faf0fb784169db5ef9162f1659ea6f24304bcc7cd47f90d49ec97dd
diff --git a/app-admin/lib_users/lib_users-0.11-r1.ebuild b/app-admin/lib_users/lib_users-0.11-r1.ebuild
index b1a72eed7a53..55a91485d77e 100644
--- a/app-admin/lib_users/lib_users-0.11-r1.ebuild
+++ b/app-admin/lib_users/lib_users-0.11-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/klausman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-admin/lib_users/lib_users-0.10.ebuild b/app-admin/lib_users/lib_users-0.12.ebuild
index 89d0f323c9a8..b1a72eed7a53 100644
--- a/app-admin/lib_users/lib_users-0.10.ebuild
+++ b/app-admin/lib_users/lib_users-0.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit python-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/klausman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index b4a4861825c0..6a858dbda6c6 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -7,13 +7,12 @@ AUX logstash.initd 2091 BLAKE2B 980722c1c3cd0cc60cf440d5a06185c66ac4348c0e899003
 AUX logstash.initd-r1 2176 BLAKE2B 37c05148d3789c69805ae5151bed5e297d71b9d60d71ff98ed411ac59b73c4a2a9462e6223a2c960301c6228c84879460ae0f793a24806768fb727b01d982709 SHA512 392c8297c6429e0384dd75073773e1f8f51dd62fd155b2a524efd9e862df114b13cc63cf37237526aebe838b5ff26a8f26a3ad08058a56a723e25025df9a16af
 AUX logstash.initd-r2 1989 BLAKE2B efa16227a2cf1a42f1f9e27e110dae64c7eb6547e22e89a71b3394fe587e0f83468e361d335e28b15a1507959dc26c019ae8ac9bc110f1b8a6896ceb7f3ceecc SHA512 77c69600f22d31e7e08c2d953c99bea8a24ad83c7abdd578526b850ca37c963a91cfd245b70e4ddb8d405135230fbc641768de2dc4dad096a0db3d40313acb2f
 AUX pipelines.yml 285 BLAKE2B d256148500854501d8e17c04a0abdcbf1be7aeea6d0e1eaa882023923967ebc012ef95185e06e33fbec60eaa949df650ebe4f9b18abaa7f4edab25d4e5b429f4 SHA512 9a9cff9472c7cd3164bdc73e37521489979106021b3d97fb2b005b74b150d2f2ee8df983219e01f8b5b00907008f4e9816fc303ace3b440a4b91dd178b6a098d
-DIST logstash-5.6.10.tar.gz 104373711 BLAKE2B 759bf003e1799aeaef0a1279b3c7cf5732126ae65e9ca0a3e315cb6f7a1b4e4417fad1fd86328a58be99e04e8053264d873b04cf43cac2b49490bbdc82c8e8b7 SHA512 9ba887da982755efd21b363e9c084660c9b7e6c042e00a8c599f60d6bba5621af7ede43957f6c3d976888f4c13e6ae17cc69afd184f2dcdd41a311972f59a745
-DIST logstash-6.2.4.zip 153969993 BLAKE2B 989f631484be14014b8230e09fa049a0e470078fed938f2df55134a27d5f4f2d8670187126d32c4933b77b496a6ed96e12d180922c2c318c67fb3dbeec5a5a3b SHA512 65f6e5accc4441cb930e5c45723edeea54ba034a25680ca34114296af5a2c456d4152f9b38469475e600fce27a27b0d9c1d206039d12f2ec9cfeb02942a5c189
+DIST logstash-5.6.11.tar.gz 104371822 BLAKE2B 3597b8ef661fa2bcbfd112966b11789925b1fafdc11991390c96d62af02d959cc251c59f352a949b14760df9f5eda5672ff407b70b3f361d4ec7ce3379eb7e5d SHA512 1e8f78fd76f637672bf18ec4b986c56c76be357788364e4dc863933f28982b988b147f31e091381e960c010ee4791e6f79914a75bacfe6b0482e573272bba749
 DIST logstash-6.3.2.tar.gz 144211416 BLAKE2B 8471fd0a920b4ef06cd775ceaafde33e16e5d1898c89339f4a039262a7a6472d6cb8dd2017db8811d6a827395a5b1e7040d9759c8734de2ccd1fc7e615345813 SHA512 11507b9177aa6cd4172eb825e395571de71bae8b0e39d7f700fe27c7219b22bc2b9a493e39016eead2d54407dc5e5cc20a0c6e4453140d628cadea076453308f
-DIST logstash-oss-6.3.1.tar.gz 143787612 BLAKE2B 2de3b991d27019b1c7df7cfa7152c009f2569e12562106babb56081be2a7ac7d94a967e7c52b58f721c2f70f1e8ec9c2730653ff094cf0dd3a9933486ac13be7 SHA512 959d9d5985e117d23ae12efe248a13ae33f8f3ede320fb3b6872e1c27738b601779f0e2402e7be4a2383cd0f220e50cdfd2d6b160d7f5805b2439cee4d8bd94c
+DIST logstash-6.4.0.tar.gz 153887188 BLAKE2B 36f6181d8f8e9c9d9a9f919c66c909fd3008d41b2de9bf014738ba6f3bd8f08204c2acc12c32a4978421476ddc45dc01269d8b145c2d863304d942a24b02a520 SHA512 6cb47370c757151fd7e2eed03b05d28492bfc0f5d397cf885ee6814965a83884716b39d3c9360341c3d4d029dc60d61502453defd42cc072c5ad3756bc2c654f
 DIST logstash-oss-6.3.2.tar.gz 144128583 BLAKE2B 99de9d375a06d132844ce63fa5d0e092bb05aedb93ff5e4a278ea75ca2fe68701afa3028af4f9c3e5b3b469e46faf4d6dc62d006e9dac3a9e9528ff94aa2dd47 SHA512 7fa97f0ca070677aaddc73ff900397ce4a45f4b02467917219acb3c414cf0cbf396b481f624d2ebc3f370b2e41120b3b103f6d080a9fafdce98b119eb8d27f5d
-EBUILD logstash-bin-5.6.10.ebuild 2198 BLAKE2B d271b016d5b4318124314f0df5ea9481197ee18c7f20183f731d0026d34356e3df80123174e733b009417984d81ac9f9eccc8c4e53e929a12e28ae28d6b43c3c SHA512 70df6a19cf77a14a9b0f80025cc42d1feb6fe2545dabf70e864b47f34b971d4b6ad1d70e4600eb684e656c2fd5827f98fcd06f319e6a483aab0e49e865e239bb
-EBUILD logstash-bin-6.2.4.ebuild 2219 BLAKE2B 7ddc549eabf27143b5951e0e92777609f5d14b76c80ee2b6f794679ef8af73d4a97e59ab106ee196b1df5ed1a1199427e9218db8efaf67d495c84594647e7aa2 SHA512 3fdf9156fe2d3baecf3a4599890a07e7aa572c08b72d173c79dc415ab7339d6e0c9050c73a4c74da0f6bcd412484f6534aea784bb9028ff661d1a700f0b4b18c
-EBUILD logstash-bin-6.3.1.ebuild 2065 BLAKE2B a5965944d381c1a0dc51578c22010cdb1ac1a877dd8a13f05e82901b54d54f562a5f77f1073ee475e053f75b6005ec7c77d0ac0a239e5013c6a9dc0012ba2288 SHA512 f86afac9ed0982801f794f36696c90773d96a548c6b3b1e5732f02f155fbfd7260261c797c51ccf5b7a27919ef8cdcddb1e17516a5a867a7bf4cc5ea6a0b0583
+DIST logstash-oss-6.4.0.tar.gz 153760331 BLAKE2B 7e519d9666d5fb98079c5eb721b1a4f721fbf0c871919d115e67ff00111d25184abf37bdcb3cacb1bc3eccbc779cc15a9324f72d5e02337ab6993a0d1a9dab18 SHA512 2261cffdb6ee7eba08d381f243e534b8d756c760ac40a5707a3abb4adca08c02c403a8c204dab2091bb46bb4be52b938867675041c49a25e3b1c98fb07f92b98
+EBUILD logstash-bin-5.6.11.ebuild 2198 BLAKE2B d271b016d5b4318124314f0df5ea9481197ee18c7f20183f731d0026d34356e3df80123174e733b009417984d81ac9f9eccc8c4e53e929a12e28ae28d6b43c3c SHA512 70df6a19cf77a14a9b0f80025cc42d1feb6fe2545dabf70e864b47f34b971d4b6ad1d70e4600eb684e656c2fd5827f98fcd06f319e6a483aab0e49e865e239bb
 EBUILD logstash-bin-6.3.2.ebuild 2188 BLAKE2B 7256bfb5ecd30e4cc14ff6173e3faf9631c51e8d7f57edd8c415b661ffd9bdcc8e3f793c0acd3320fd7bc4589a992889d215ab16ad26a8ace452a54f0f50f517 SHA512 5390442582c1a9c7a05b0709376fdb8be89cda413f201a25c3e80c74ec72328b9aee554e875293d824349139188ad29585374bb9077fcf4634145d9e18d5bc9d
+EBUILD logstash-bin-6.4.0.ebuild 2188 BLAKE2B 7256bfb5ecd30e4cc14ff6173e3faf9631c51e8d7f57edd8c415b661ffd9bdcc8e3f793c0acd3320fd7bc4589a992889d215ab16ad26a8ace452a54f0f50f517 SHA512 5390442582c1a9c7a05b0709376fdb8be89cda413f201a25c3e80c74ec72328b9aee554e875293d824349139188ad29585374bb9077fcf4634145d9e18d5bc9d
 MISC metadata.xml 648 BLAKE2B 1c6bd205971968cbbc720f093853d6f3eb069787447c3e4dcfb12bd345c75adfc7f47dc34a95d28f7bacc77f9e863c44880e15afbcb0fea5468d068b02a53923 SHA512 2fe18cd9d1ae40093e6187aad630c04d94c85e400808e74d3755c7591d260f86b00dff4f1cb7dbe905b014d1551ceeaff1ce4ca21e2c755097600733448453ab
diff --git a/app-admin/logstash-bin/logstash-bin-5.6.10.ebuild b/app-admin/logstash-bin/logstash-bin-5.6.11.ebuild
index b52e9f6f7bf8..b52e9f6f7bf8 100644
--- a/app-admin/logstash-bin/logstash-bin-5.6.10.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-5.6.11.ebuild
diff --git a/app-admin/logstash-bin/logstash-bin-6.2.4.ebuild b/app-admin/logstash-bin/logstash-bin-6.2.4.ebuild
deleted file mode 100644
index d1ce6cfb92d7..000000000000
--- a/app-admin/logstash-bin/logstash-bin-6.2.4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2 user
-
-MY_PN="${PN%-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.zip"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-DEPEND="app-arch/unzip"
-RDEPEND="virtual/jre:1.8"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
-}
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/lib/${MY_PN}"
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/usr/share/${MY_PN}"
-	newins "${FILESDIR}/agent.conf.sample" agent.conf
-
-	rm -v config/startup.options || die
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	rm -rv config data || die
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
-
-	newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}"
-
-	insinto /usr/share/eselect/modules
-	doins "${FILESDIR}"/logstash-plugin.eselect
-}
-
-pkg_postinst() {
-	ewarn "The default pidfile directory has been changed from /run/logstash to /run."
-	ewarn "Please ensure any running logstash processes are shut down cleanly."
-	ewarn
-	ewarn "The default data directory has been moved from /opt/logstash/data to"
-	ewarn "/var/lib/logstash/data. Please check and move its contents as necessary."
-	ewarn
-	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
-	ewarn "Install the plugins via eselect module that will automatically re-install"
-	ewarn "all self installed plugins after Logstash upgrades."
-	elog
-	elog "Installing plugins:"
-	elog "eselect logstash-plugin install logstash-output-gelf"
-	elog
-
-	elog "Reinstalling self installed plugins (installed via eselect module):"
-	eselect logstash-plugin reinstall
-
-	elog
-	elog "Sample configuration:"
-	elog "${EROOT%/}/usr/share/${MY_PN}"
-}
diff --git a/app-admin/logstash-bin/logstash-bin-6.3.1.ebuild b/app-admin/logstash-bin/logstash-bin-6.4.0.ebuild
index a5c02ab91f8b..acbb17a3c74d 100644
--- a/app-admin/logstash-bin/logstash-bin-6.3.1.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-6.4.0.ebuild
@@ -10,12 +10,14 @@ MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Tool for managing events and logs"
 HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
 
 # source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 MIT"
+LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="x-pack"
 
 RESTRICT="strip"
 QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 92c686f3e6c3..894350b902eb 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -15,6 +15,7 @@ DIST mongo-tools-3.6.6.tar.gz 4723751 BLAKE2B 876d46c47190398d1218a760bdeb8167c9
 DIST mongo-tools-3.6.7.tar.gz 4723244 BLAKE2B 82a61b8e72122a9a2b80aceeaa6767fcb13740c324c83c53b18297d9138807950dc656506ffd8a694d2f697c934342541c0ca6f62539bb07be266093e82a17a6 SHA512 5367259f27cf21234db2f69693fc2e21051b42b1acc7eaf8f9b366ed264943cff179c8565239fe36bb1d5d21f5e08ec58ff0df5d4c60526d321d63389f37fac2
 DIST mongo-tools-4.0.0.tar.gz 10872217 BLAKE2B 84e92178c0e4827926de525a70d6124635d59e270a3d37e23ec8653cc64d99bb7489fa6266917437ca45aa3ca5e00bc59b81e65c5b72e717db2701c6f7327bec SHA512 d67c4aca9b41266109adc39bb1a642206738fda393e1f9f05570c02a00a02e29ec71c71e67ad232c72d66543ae7e7bfe07fbcf26958d48ed0e631da452c1904d
 DIST mongo-tools-4.0.1.tar.gz 10872813 BLAKE2B 21b36c550ee7147b013414d24042ca720d3fdb961759d8857b0ffb3ba1aa3f7f3bcb363c97287d1c7084dae246f9d7f49d2d0d5c8a11bc939fa9d3113b4c2b6e SHA512 69355ca7c8d97a9a8b257aa1cde672b3b4af7ceb5b37e2cf601746e102ca6ac290ec35c20728fdb6736dd28feb8e6b6e1b948e88fd2fb4c9b53c8a3cd3688d67
+DIST mongo-tools-4.0.2.tar.gz 10872395 BLAKE2B 6d02a51677509abb5a00f7f4f324a2c979d7e55ebd55754023c80e51e9e8121bea84692574739f83882c0426074c0a3a5c5df2cb8cba58ee80c06e5a75504a8d SHA512 45971d96c512a920c40052f0d11097e88db137e975125de375a63e8f0eefbe22ae5252d239455c60e12ef65e0abce7a658dfb9dda0cbcc153718bb6711cf5e43
 EBUILD mongo-tools-3.0.14.ebuild 1096 BLAKE2B c5cc1d28947e0453483d2429c1b1556e880c84e62d563505e420ba5ddf2b64ee1e54b9bdb609ae43091aec967d24cdd2c350c67f9b2f55347cbf334edd7c2004 SHA512 55b66e2872741425cccb75b367e37b4fca28404d63e77a39920246b6a946bf75335d55ea15c7878eb4382ade2cd95bedec4da9a647968a5e27e577073ff7e82f
 EBUILD mongo-tools-3.0.15.ebuild 1098 BLAKE2B ff13b5f35493bead934b47f56a302467346e50d3c6bbfe5958ece13d223da85aae0fa3dcaf991c79dd6694facd4a58657960260352ffa9ff395e4b0ec8dad6b4 SHA512 a36184581a7cff9543a4a63c13549e9096321c558a983a46bb4248541b777a5e4a2e1323f3c140b3fc2b8176a480042d2140e44b488ac69403524410b4115d8d
 EBUILD mongo-tools-3.2.17.ebuild 1221 BLAKE2B 7943f052ee8a6b2fefb1c84233d87f7b3189ba6eee59d764cd2af46d9350d697ee3379405b40be77cc751fdcfccbf0f3aa61640d0e5fd0aafbfe5bac34ae7519 SHA512 1bb25c1e8c72fcc6fe0374ea3469634dfbdf3fa37d41a91bf9e562d16031a23ec227d3a402a0eeb1e66742773db983e823f68f7334c734638620f1040cefe87f
@@ -31,4 +32,5 @@ EBUILD mongo-tools-3.6.6.ebuild 1213 BLAKE2B 32b017e79aade027f199eb34cf16f585238
 EBUILD mongo-tools-3.6.7.ebuild 1213 BLAKE2B 4ffad4a5674cc49f403657d622291f7da3a6c105ed55bbdb594f8d6ec06bde0c79a846271d49162e26371dcd2f061cd990874d7ba4c257beeffa56922f328c06 SHA512 fef373ec16a1ff39f7bce625b78e330d63dc9b37f3ecad00a17bacc2bfcc223e17ab1f970750ed1bc32e6df80bac0a8accc15fa418a8979b88ac5bb58f8b5bb1
 EBUILD mongo-tools-4.0.0.ebuild 1252 BLAKE2B af486064720907f298f0e22b075284696dd78c01a84fcf9e7a5a5767d11aeed929d57d2f6e6539934ad8083b271606aec522dde38cdb865cf917384e02646315 SHA512 94709a1740d7894b3143daf193c8f067d3e52ca4f7f3f4ae98aea4c63ea65c62178ff9db9f3a82cdd7ddea3e0cdb26162e5954a7b089434960eade7b39ae0b39
 EBUILD mongo-tools-4.0.1.ebuild 1213 BLAKE2B 32b017e79aade027f199eb34cf16f5852387c3dea2c1c1b57257c3634e7f39b0c31e939a00fe9985e5ed6c9629504ab76f5e38e7b14993cca235caaa1ae73563 SHA512 bdc2ce46cdf7dc56265ac5640b0ba69c17cbe37977828b2ab7167d35acae41a2fe0712b3eef65ba064b1166e6aee91c7c785e6a1adf54f780181890380356fc2
+EBUILD mongo-tools-4.0.2.ebuild 1213 BLAKE2B 4ffad4a5674cc49f403657d622291f7da3a6c105ed55bbdb594f8d6ec06bde0c79a846271d49162e26371dcd2f061cd990874d7ba4c257beeffa56922f328c06 SHA512 fef373ec16a1ff39f7bce625b78e330d63dc9b37f3ecad00a17bacc2bfcc223e17ab1f970750ed1bc32e6df80bac0a8accc15fa418a8979b88ac5bb58f8b5bb1
 MISC metadata.xml 463 BLAKE2B 1e4d37c222538ce5d55e6f5c05ecbe85f57ac74eacaf5935540797f03c4c069b2ce2bd0cbb6b433eb86de9b2480058013759db3d504982df908c2ba9e1b4d2ec SHA512 f09474b3932dd6ae36da20c64a394acf65ad1e3a875e7ca743efa22db8b7e3109c9ebe4c489e62eda12c5bdd4d689ede61eca8a4cc89c42d0a08a270f041fcdc
diff --git a/app-admin/mongo-tools/mongo-tools-4.0.2.ebuild b/app-admin/mongo-tools/mongo-tools-4.0.2.ebuild
new file mode 100644
index 000000000000..8461951acd0c
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-4.0.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+	dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# 1) ensure we use bash wrt #582906
+	# 2) do not substitute version because it uses git
+	sed -e 's@/bin/sh@/bin/bash@g' \
+		-e '/^sed/,+3d' \
+		-e '/^stty/d' \
+		-e '/^mv/d' \
+		-i build.sh || die
+
+	# build pie to avoid text relocations wrt #582854
+	# skip on ppc64 wrt #610984
+	if ! use ppc64; then
+		sed -i 's/\(go build\)/\1 -buildmode=pie/g' build.sh || die
+	fi
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+		myconf+=(sasl)
+	fi
+
+	if use ssl; then
+		myconf+=(ssl)
+	fi
+
+	./build.sh "${myconf[@]}" || die "build failed"
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/pwman3/Manifest b/app-admin/pwman3/Manifest
new file mode 100644
index 000000000000..13c538797e85
--- /dev/null
+++ b/app-admin/pwman3/Manifest
@@ -0,0 +1,3 @@
+DIST pwman3-0.9.11.tar.gz 74364 BLAKE2B 9544b692e8853b7fb8e1b4d51093e72e04f8d82888a9278c94aaa27716026b348bb16f0fa9c52af2144395a4ffb242c8a48fc34252890e68477d2e3a70ea4a88 SHA512 2aa5a7b4d810d1bbc6aea34b728f89190570cbfbedc33f45cc1aa4d737ebbb9e993d2d372b44f956d5cdbc07f911f289fd77d7df167100e820455650f5b3e46a
+EBUILD pwman3-0.9.11.ebuild 874 BLAKE2B 0c277bf3e7dd26b5994aacc3f1cf35f8094742e413e0a690575d48e92d58e192470e5df6ab0a6a16440a1c0eedd96d5e658d0dfd4e46e5b5b483bc6f254d8ee3 SHA512 42fe1f9c023db25bba45da5903d327ab9cd11fe8df9b15d12929e27a98a8333492386d0b2fc5485c167350f1058d7e768f5a0208d4362494bbbaa3fb3cbcf603
+MISC metadata.xml 966 BLAKE2B a024e2324e8a57f790d36a0091050510babb8241de2112546f9d760e3d5495a910d6baf91caf447acdacb4d464934248db3dc3e4ac1188e56ab82635a3246679 SHA512 f82ac9dd866b16f6583266bb2b748f713389e517eb51229481e902d2a232e4715146c5d8aeb7d572fea10f13f15cf700910f7c04231cf662859f1aa258c7bdcc
diff --git a/app-admin/pwman3/metadata.xml b/app-admin/pwman3/metadata.xml
new file mode 100644
index 000000000000..9bb7c2866116
--- /dev/null
+++ b/app-admin/pwman3/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<name>Oz Tiram</name>
+	<email>oz.tiram@gmail.com</email>
+</maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+<use>
+	<flag name="mongodb">Add support for MongoDB</flag>
+</use>
+<longdescription lang="en">
+	A lightweight command line password manager, which can use different
+	databases to store your passwords (currently, SQLite, MySQL, Postgresql
+	and MongoDB are supported). Pwman3 can also copy passwords to the
+	clipboard without exposing them. Besides managing and storing passwords,
+	Pwman3 can also generate passwords using different algorithms.
+	Per default pwman3 uses a strong AES encryption algorithm to store the
+	data.
+</longdescription>
+<upstream>
+	<remote-id type="github">pwman3/pwman3</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-admin/pwman3/pwman3-0.9.11.ebuild b/app-admin/pwman3/pwman3-0.9.11.ebuild
new file mode 100644
index 000000000000..6fb41c3843e8
--- /dev/null
+++ b/app-admin/pwman3/pwman3-0.9.11.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_5 python3_6 )
+PYTHON_REQ_USE="sqlite?"
+inherit distutils-r1
+
+DESCRIPTION="A lightweight password-manager with multiple database backends"
+HOMEPAGE="https://pwman3.github.io"
+SRC_URI="https://github.com/pwman3/pwman3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="mongodb mysql postgres +sqlite test"
+
+COMMON="
+	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.0[${PYTHON_USEDEP}]
+	"
+
+DEPEND="
+	${COMMON}
+	test? ( dev-python/pexpect[${PYTHON_USEDEP}] )
+	"
+
+RDEPEND="
+	${COMMON}
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	mysql? ( dev-python/pymysql[${PYTHON_USEDEP}] )
+	postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )
+	"
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index a18edf8077a9..62db2d980041 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,8 +1,10 @@
 DIST sudo-1.8.23.tar.gz 3150674 BLAKE2B 11b1c7bfa372005cda8baf651c4662f6fd15e94ca77f7705b23ca6573424796d5c1f8e47e2874c4b54017141d01a632885ac60c92346d932537048373cad0ede SHA512 a9d61850a4857bfd075547a13efb13b054e4736e3ebe3c8a98a90a090b1d9b9688354ec9725fc99d1d256999b6f9c6ae6215ce9770fcdebd7f24731107b48342
 DIST sudo-1.8.24.tar.gz 3175719 BLAKE2B 61fc469e2d8146b8bb59709192dc33828f0065d4dcf9625e72ae1da9a2c1d6925a0201e5999e146e2e15f5a103ad5690a88fcabb75f57e76b779fe07de53b459 SHA512 ec6295a456a300e81ea2356080d51a57e3eb5d8070d8aab228cece0100ef54954f6c3dd458316b0c2da6839c0d8dab7cdc1a360aceb2594641e064465ecb1ee8
 DIST sudo-1.8.25.tar.gz 3189660 BLAKE2B 9eeab3ac4ea67a866071750a8cf19e0753ef1b59187f715c69547bbae8ee0039bf15116ef30ed5dc6fc11b17beeff174e08756b2d701e0f2668a05f2e318f623 SHA512 f3f0c9e315484e5ba2d535f41ab722881343b1fa299f75cfad456bd41a555d80080369677e62626307df792aeabc29ba450e6f0b9c284ea2cfb8dc5e3568f46d
+DIST sudo-1.8.25p1.tar.gz 3189951 BLAKE2B ebfedaad62e60f625db8c46a5c8f19977a5ec0a86bab3b34d91096c08e8b8ece056ba312f9fecd4cdd704fc17d49a36681b41cd40269df7c67cd66d80c0d8efb SHA512 b1445be688d3c1dd7efbdfab68977a7a9b6fd6887191dc99ca717117eec0a550492642556cd55ca5873d054ddc5ccc2b87b2c34602e1ffc729ab6fbc4e523a72
 EBUILD sudo-1.8.23-r2.ebuild 6366 BLAKE2B 54ac988d6be3e7e93dc13a45ada40a627e3ffeff4515d181a18ea9b2ad411d4c2a9e107fe718217668033bedec23e57216d4295d0df12c40ff5871c3ae9f9ec0 SHA512 3e7b3f21c550724a6ed048b0639d2630015c401dbe8c51d31310a26394b1a371ab18e438dc13357ff82b05715443f24f6cb42b1daac7ec5cc9d3776d6cbc96d7
 EBUILD sudo-1.8.24.ebuild 6379 BLAKE2B 9300c549acd5a013d3cfcbc0ce2fb0ae4375cf9858928dbc92f2fa7d1cb2979f19a7ec43026dcfab87a51bd87ce0f886030426a431c7acbe3bec3715b6778523 SHA512 f1c124e5658fd55d7bbb84b9d06d0cf123479cf96b1d95fae610d36fa583069d7ceab30b59116da18a71f3dc822aeef75bd099f93ac0f2e0fac92f0bd491ae8a
 EBUILD sudo-1.8.25.ebuild 6379 BLAKE2B 9300c549acd5a013d3cfcbc0ce2fb0ae4375cf9858928dbc92f2fa7d1cb2979f19a7ec43026dcfab87a51bd87ce0f886030426a431c7acbe3bec3715b6778523 SHA512 f1c124e5658fd55d7bbb84b9d06d0cf123479cf96b1d95fae610d36fa583069d7ceab30b59116da18a71f3dc822aeef75bd099f93ac0f2e0fac92f0bd491ae8a
+EBUILD sudo-1.8.25_p1.ebuild 6379 BLAKE2B 9300c549acd5a013d3cfcbc0ce2fb0ae4375cf9858928dbc92f2fa7d1cb2979f19a7ec43026dcfab87a51bd87ce0f886030426a431c7acbe3bec3715b6778523 SHA512 f1c124e5658fd55d7bbb84b9d06d0cf123479cf96b1d95fae610d36fa583069d7ceab30b59116da18a71f3dc822aeef75bd099f93ac0f2e0fac92f0bd491ae8a
 EBUILD sudo-9999.ebuild 6379 BLAKE2B 9300c549acd5a013d3cfcbc0ce2fb0ae4375cf9858928dbc92f2fa7d1cb2979f19a7ec43026dcfab87a51bd87ce0f886030426a431c7acbe3bec3715b6778523 SHA512 f1c124e5658fd55d7bbb84b9d06d0cf123479cf96b1d95fae610d36fa583069d7ceab30b59116da18a71f3dc822aeef75bd099f93ac0f2e0fac92f0bd491ae8a
 MISC metadata.xml 989 BLAKE2B c7f7d49fda7750b172dd4b2e5c3fc5f1f3dd602b6347479834bf6444c9311738bcd10fbbba100cee45c97bb899e53f3c113abc61ee89b3353b50876c30966589 SHA512 bc9addd017e474acbc753d6d2cce5d77281a3c1f0857de538168eb1a7b80e0d0b313ad2b03cc710b483cc9588dcaf0208a5b8aaccea18e2ca51b567020bea9ec
diff --git a/app-admin/sudo/sudo-1.8.25_p1.ebuild b/app-admin/sudo/sudo-1.8.25_p1.ebuild
new file mode 100644
index 000000000000..f4ab4527b4fc
--- /dev/null
+++ b/app-admin/sudo/sudo-1.8.25_p1.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils pam multilib libtool tmpfiles
+if [[ ${PV} == "9999" ]] ; then
+	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
+	inherit mercurial
+fi
+
+MY_P=${P/_/}
+MY_P=${MY_P/beta/b}
+
+uri_prefix=
+case ${P} in
+	*_beta*|*_rc*) uri_prefix=beta/ ;;
+esac
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="https://www.sudo.ws/"
+if [[ ${PV} != "9999" ]] ; then
+	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
+	fi
+fi
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+IUSE="gcrypt ldap nls offensive openssl pam sasl selinux +sendmail skey"
+
+CDEPEND="
+	sys-libs/zlib:=
+	gcrypt? ( dev-libs/libgcrypt:= )
+	ldap? (
+		>=net-nds/openldap-2.1.30-r1
+		dev-libs/cyrus-sasl
+	)
+	openssl? ( dev-libs/openssl:0= )
+	pam? ( virtual/pam )
+	sasl? ( dev-libs/cyrus-sasl )
+	skey? ( >=sys-auth/skey-1.1.5-r1 )
+"
+RDEPEND="
+	${CDEPEND}
+	>=app-misc/editor-wrapper-3
+	virtual/editor
+	ldap? ( dev-lang/perl )
+	pam? ( sys-auth/pambase )
+	selinux? ( sec-policy/selinux-sudo )
+	sendmail? ( virtual/mta )
+"
+DEPEND="
+	${CDEPEND}
+	sys-devel/bison
+"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	pam? ( !skey )
+	skey? ( !pam )
+	?? ( gcrypt openssl )
+"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+set_secure_path() {
+	# FIXME: secure_path is a compile time setting. using PATH or
+	# ROOTPATH is not perfect, env-update may invalidate this, but until it
+	# is available as a sudoers setting this will have to do.
+	einfo "Setting secure_path ..."
+
+	# first extract the default ROOTPATH from build env
+	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
+		echo "${ROOTPATH}")
+		case "${SECURE_PATH}" in
+			*/usr/sbin*) ;;
+			*) SECURE_PATH=$(unset PATH;
+				. "${EPREFIX}"/etc/profile.env; echo "${PATH}")
+				;;
+		esac
+	if [[ -z ${SECURE_PATH} ]] ; then
+		ewarn "	Failed to detect SECURE_PATH, please report this"
+	fi
+
+	# then remove duplicate path entries
+	cleanpath() {
+		local newpath thisp IFS=:
+		for thisp in $1 ; do
+			if [[ :${newpath}: != *:${thisp}:* ]] ; then
+				newpath+=:$thisp
+			else
+				einfo "   Duplicate entry ${thisp} removed..."
+			fi
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
+
+	# finally, strip gcc paths #136027
+	rmpath() {
+		local e newpath thisp IFS=:
+		for thisp in ${SECURE_PATH} ; do
+			for e ; do [[ $thisp == $e ]] && continue 2 ; done
+			newpath+=:$thisp
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+
+	einfo "... done"
+}
+
+src_configure() {
+	local SECURE_PATH
+	set_secure_path
+
+	# audit: somebody got to explain me how I can test this before I
+	# enable it.. - Diego
+	# plugindir: autoconf code is crappy and does not delay evaluation
+	# until `make` time, so we have to use a full path here rather than
+	# basing off other values.
+	myeconfargs=(
+		--enable-zlib=system
+		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
+		--with-editor="${EPREFIX}"/usr/libexec/editor
+		--with-env-editor
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
+		--with-rundir="${EPREFIX}"/run/sudo
+		--with-secure-path="${SECURE_PATH}"
+		--with-vardir="${EPREFIX}"/var/db/sudo
+		--without-linux-audit
+		--without-opie
+		$(use_enable gcrypt)
+		$(use_enable nls)
+		$(use_enable openssl)
+		$(use_enable sasl)
+		$(use_with offensive insults)
+		$(use_with offensive all-insults)
+		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
+		$(use_with ldap)
+		$(use_with pam)
+		$(use_with skey)
+		$(use_with selinux)
+		$(use_with sendmail)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use ldap ; then
+		dodoc README.LDAP
+
+		cat <<-EOF > "${T}"/ldap.conf.sudo
+		# See ldap.conf(5) and README.LDAP for details
+		# This file should only be readable by root
+
+		# supported directives: host, port, ssl, ldap_version
+		# uri, binddn, bindpw, sudoers_base, sudoers_debug
+		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
+		EOF
+
+		insinto /etc
+		doins "${T}"/ldap.conf.sudo
+		fperms 0440 /etc/ldap.conf.sudo
+
+		insinto /etc/openldap/schema
+		newins doc/schema.OpenLDAP sudo.schema
+	fi
+
+	pamd_mimic system-auth sudo auth account session
+
+	keepdir /var/db/sudo/lectured
+	fperms 0700 /var/db/sudo/lectured
+	fperms 0711 /var/db/sudo #652958
+
+	# Don't install into /run as that is a tmpfs most of the time
+	# (bug #504854)
+	rm -rf "${ED%/}"/run
+}
+
+pkg_postinst() {
+	tmpfiles_process sudo.conf
+
+	#652958
+	local sudo_db="${EROOT}/var/db/sudo"
+	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
+		chmod 711 "${sudo_db}" || die
+	fi
+
+	if use ldap ; then
+		ewarn
+		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
+		ewarn
+		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+			ewarn "configured in /etc/nsswitch.conf."
+			ewarn
+			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
+			ewarn "  sudoers: ldap files"
+			ewarn
+		fi
+	fi
+	if use prefix ; then
+		ewarn
+		ewarn "To use sudo, you need to change file ownership and permissions"
+		ewarn "with root privileges, as follows:"
+		ewarn
+		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
+		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
+		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
+		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+		ewarn
+	fi
+
+	elog "To use the -A (askpass) option, you need to install a compatible"
+	elog "password program from the following list. Starred packages will"
+	elog "automatically register for the use with sudo (but will not force"
+	elog "the -A option):"
+	elog ""
+	elog " [*] net-misc/ssh-askpass-fullscreen"
+	elog "     net-misc/x11-ssh-askpass"
+	elog ""
+	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+	elog "variable to the program you want to use."
+}
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 25b1db0e525b..f8c1e8cebcc0 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -8,5 +8,5 @@ DIST vault-0.10.4.tar.gz 19207588 BLAKE2B 035e83c1d119b266817490afd4506fee5e5cee
 DIST vault-0.11.0.tar.gz 24430984 BLAKE2B 0c1d40ed9f8dbc19ae7bce38308f7a55e12e8a907798022ce6b5783f2be9b9d7a9a1842683b8df411b3b754c716fd7366a0261d890e2153c64a70df6a3c6b844 SHA512 33e1e76a0e16803a8d0d6ed8ec0b6d1f8876d54ecf35a70bc4969404bd7991ef0cc5986eae958885d288bb316396e0594a5571b7a11f8b052b22b445388f03c7
 EBUILD vault-0.10.3.ebuild 1497 BLAKE2B 64f3a8547114277e0b30126447681868a2fda44bbe6351d161c3cea2e3b229864e807bff551ca3d4b98d3e450095b152067e171b28a123d72bab1b5e59dfbe24 SHA512 aeb5b5542b3f0138812059c5afaab24d322b68559c6b4bb75aec3241ef336bfbf82052d13f469712fdfb374350a742ede91aeb653ec231427559a10d9b5d7867
 EBUILD vault-0.10.4.ebuild 1497 BLAKE2B 64f3a8547114277e0b30126447681868a2fda44bbe6351d161c3cea2e3b229864e807bff551ca3d4b98d3e450095b152067e171b28a123d72bab1b5e59dfbe24 SHA512 aeb5b5542b3f0138812059c5afaab24d322b68559c6b4bb75aec3241ef336bfbf82052d13f469712fdfb374350a742ede91aeb653ec231427559a10d9b5d7867
-EBUILD vault-0.11.0.ebuild 1497 BLAKE2B 64f3a8547114277e0b30126447681868a2fda44bbe6351d161c3cea2e3b229864e807bff551ca3d4b98d3e450095b152067e171b28a123d72bab1b5e59dfbe24 SHA512 aeb5b5542b3f0138812059c5afaab24d322b68559c6b4bb75aec3241ef336bfbf82052d13f469712fdfb374350a742ede91aeb653ec231427559a10d9b5d7867
+EBUILD vault-0.11.0.ebuild 1623 BLAKE2B b20a2fb723fd052978e8a332e7393933c37afccc8e9cad3e63a184c46bc576c62bf31cd0ed8088d3ad3c5bf96e72f1acc7e0d69d99521f26bb1ff4b8cc0e65ff SHA512 adbc520dee1262a0b991adb67feb53d065593d1fedfb13968dc13565dc1b62ab509abcdd8c669e40d18539a4459374b727572c61099a35050b979704d08b0ebe
 MISC metadata.xml 306 BLAKE2B 882a83701d71a45cdc6fc00ba3da98ff7d7439c9f81ef0aa1655c49bd5e79b3e625858d33f4ac6d5157df6ef74c5dd00a2b8efb1fd5ee45f9a0ed785c90d8ebc SHA512 d1fc4040379fb33c7f193f37a1c044000408e47c9df8b17771ed7cb5194f9d8b8c062b8a6804e72fb5a666683a8d5b49ec5a6328394870d9bdc1b7f3e0e4e787
diff --git a/app-admin/vault/vault-0.11.0.ebuild b/app-admin/vault/vault-0.11.0.ebuild
index 2e6d92497501..ef100d79cc30 100644
--- a/app-admin/vault/vault-0.11.0.ebuild
+++ b/app-admin/vault/vault-0.11.0.ebuild
@@ -42,6 +42,9 @@ src_compile() {
 	mkdir bin || die
 	export GOPATH=${S}
 	cd src/${EGO_PN} || die
+	# The fmt target may need to be executed if it was previously
+	# executed by an older version of go (bug 665438).
+	emake fmt
 	XC_ARCH=$(go env GOARCH) \
 	XC_OS=$(go env GOOS) \
 	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \