gentoo resync : 02.03.2018

35 files changed, 359 insertions, 397 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 6305fc77a9f1..51b00041d1e8 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 1171bc8f17a3..d13bd0694802 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,9 +1,7 @@
-DIST ansible-2.4.1.0.tar.gz 6675552 BLAKE2B 00497b33e833149510669c9e481b0893a2d016caf2949fa064ca0a2e4f62a6c5a3f94597673822418253b85abaf380308115dfaa4c1acd88f0c73322d87822d4 SHA512 86bda43d912fc6b9cbf662e7e9e3ca3178ac577bc7857c5dfc0e68a7083d76ad405b0ca9b34f680a0d635b87e0bf5dc8cbdeefb93174242e1942eabb74b07f1d
 DIST ansible-2.4.2.0.tar.gz 6503595 BLAKE2B df4ec4e24671f1488950f2d9eb7705fbad4e035d6ac67d5017417281455cc44cde1290976a9ed16675c0cc19a9190200b95b29890725c56df5f2699398accd6b SHA512 32a075959dca01e184d9c3988fc9c491e904e7627a38e3527c37a8b26340f331bd294cacfe7353d339d15488857ba5ee1b36d9ae4ebeb8b5827934a73f4b42b0
 DIST ansible-2.4.3.0.tar.gz 6511115 BLAKE2B d43679c651f6aa5fd86c797a204645a8ee98efbcde9abaa25385aeb6f1d7c8b4ad74185434bfd159dbf673fe9339ef8f915f78238f8b8a5caf924b54cb9bdd52 SHA512 a7cda358c67c519c7e5ba248bf47070f21a27203fb29d70d9d75ecf027ba1275d71c0f96493e047281211d172a3be8273d7e08144446284695fb0bc8b94daa82
-EBUILD ansible-2.4.1.0-r1.ebuild 1441 BLAKE2B c7d99a3d842b55015f0839ec115c341fd5e543c5b045573681a071d956fa74931135388f9cf081a26b80a40db0040fb63c2a6037d5cf496a5d39945eed955f2b SHA512 611e6a76d51e16fdfb0131862c39935938b439ed36e0bc5724bbc78f3944d9048e33c277120a6f681a647102c648dbcf2052f7008960cd97ee7afa133f16c41c
 EBUILD ansible-2.4.2.0-r1.ebuild 1406 BLAKE2B 9f63cd0a25a4ada0913f0e94c5dc221043936b60a0287d32668f3b9ede027f4b32695d527d5b6402252c5294e3bedc00d2ccdb3f8b0d8f892a9c6c003f81d73e SHA512 492cb42bc894ed7b07275828117689901b90574135397b73bbe9b7447a06df6024a18f9cc61bd48ac8d2f3ead9b0555ad79c708d275894725aa6ed1548a00fb7
 EBUILD ansible-2.4.2.0.ebuild 1445 BLAKE2B f00ce2aaff90cbdff9a6eee800a61bfca78491671a3b8e7c931fe8f24cced9b6b8bb5552f42d34b106d8b101173c373f4ee69f8dba8738936af3866e946164df SHA512 2f731321ff758ca6db6cd90701ae234cd63fb84f8dcfe730c6b2cf824fb8f801ceb174e1bde7b3f3e9d14723574ff5c18d5ca68c82b27192aef3d4b355df5ff0
-EBUILD ansible-2.4.3.0.ebuild 1406 BLAKE2B 9f63cd0a25a4ada0913f0e94c5dc221043936b60a0287d32668f3b9ede027f4b32695d527d5b6402252c5294e3bedc00d2ccdb3f8b0d8f892a9c6c003f81d73e SHA512 492cb42bc894ed7b07275828117689901b90574135397b73bbe9b7447a06df6024a18f9cc61bd48ac8d2f3ead9b0555ad79c708d275894725aa6ed1548a00fb7
+EBUILD ansible-2.4.3.0.ebuild 1404 BLAKE2B 520e1d8270be10a88249acf994577545b9b2e41289446b2bd5f164a1a5ea3e9b19a7d522dd57a732abbdfe0b8d2439cd4aaa9d7c46cd79a8bea3fed2fdd856fa SHA512 c72349eb645c40f7399975a12f1fb9daacdabee4dc9d801e8bc7c4ac8bffeae178906481eb6e69fe2dc81505179092ca30f4b7c7e0a92715e14f2d93f3143c7e
 EBUILD ansible-9999.ebuild 1475 BLAKE2B f2718a27295c6d9ce5ad4415573558ab2e651f52dae85ae9dc79a3e39e5692a29279b5d6a96166c91b7d0b1a389915848e7e9480979c4fa3e0878ae6b2fdc662 SHA512 a1c816593bb2052ce3f89c37fa44322b25af436bf6f3bbbfb8c87e1b1ed33aac880e8e3499fcbc52a0d0bd85db6ad0ac48a858400b1806ae4b61beb66a634244
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.4.1.0-r1.ebuild b/app-admin/ansible/ansible-2.4.1.0-r1.ebuild
deleted file mode 100644
index c152c19afeb7..000000000000
--- a/app-admin/ansible/ansible-2.4.1.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1 eutils versionator
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="http://ansible.com/"
-SRC_URI="http://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
-IUSE="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}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		<dev-python/mock-1.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_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.4.3.0.ebuild b/app-admin/ansible/ansible-2.4.3.0.ebuild
index 346b2f5aea95..04013883c1a9 100644
--- a/app-admin/ansible/ansible-2.4.3.0.ebuild
+++ b/app-admin/ansible/ansible-2.4.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/app-admin/augeas/Manifest b/app-admin/augeas/Manifest
index c045432efbb8..d65f3e2722a2 100644
--- a/app-admin/augeas/Manifest
+++ b/app-admin/augeas/Manifest
@@ -1,7 +1,5 @@
 DIST augeas-1.10.1.tar.gz 2289207 BLAKE2B 6e3cf750c4d3faf7dc472ec7bfe3c46f5babca294d2bd5169cca419c2f93e21bdd656bbc44b30ab66c00fb793df1aa045f60c1260963901773c334b9019eff0b SHA512 382e8ef6a5bd3d12d7d2e0d2987f39c04ff7df3f07cd68aa732bf266b89d5d59a85be63921a7ff70f9219dbc6bb8547f80528242caa9417e08a008d1721cb1d2
 DIST augeas-1.8.1.tar.gz 2165325 BLAKE2B aa309984b5b11441fd2b10f3dc0b4a5f79a39038c1a71af6f7ef68b4fc24074db0bbcfd97341828211cc63d60d4b814515b119d0305367e9594cd5aa5159b822 SHA512 80be6dc75e86e2a00c56cb668824ffbe54105b64fad64a2737d980c8ee5ba347a97ddd190a1c712bd07a768ed23a8d07b0eb676033b367632036a8e7f98c976b
-DIST augeas-1.9.0.tar.gz 2199534 BLAKE2B 174d3da7f4c7da3146e4bf21245533fdb0cf6927c160153013e0b7d1afac54088daa1e14eecaaed6412fa9c5e353e944eba48013d69fd997ba9c30f609f159e3 SHA512 340aed78ac2df455770735b41f3c10a1cbe40f160e236a735d4580edf5b635afeaf7ddadc10e759e9197c4b233e98b3b6b94a3c2f072aa765c104d64371ce171
-EBUILD augeas-1.10.1.ebuild 1007 BLAKE2B 28cbb683fd12dd15ac1047e207d745d902600665c2fa67f828effd7b54dbfa5e7a02cb397bf13be2234ad088ac1223dd5f743e302c85bbe5e9175bca00514357 SHA512 db2d5a5d287994e5135ae9234e430c9c970fb4107f9ba6c6cfe261cfe282f268f6e9042032e8608820b0e4b587b07803d3db18768bab6dad905ea54b7c375c89
+EBUILD augeas-1.10.1.ebuild 1000 BLAKE2B c6d0e200c970a67013c4495d5018f622a947c96de0f3f6435b9b8ae193335a5c7181e33debab36db20fe96fcdd87ce1e4e4b00ea2a22c3ebb37aa6e46e906608 SHA512 85322cb00d04bf5b8c9b7534126ed6c966b73f094b63afc211345d80ee83a836d90bec866168107d390072c2f0d90ea113b4fa1b525c54d4c3d820bafa704b9a
 EBUILD augeas-1.8.1.ebuild 1000 BLAKE2B 601f1da391549d104db635310c3fbc7ce590c0b14428b4059e6f32c4f5265a3821eb28f7581766cc773572646e67434d3114ba8d2959cf15a4418884f18e482b SHA512 47871941fbcb08efce33560c5e8d857fef6e2dff1cdde7c31af6b205517af837840b83664fde9b6943b5ee3c3a367a7709c603b9409397cb79d7f879fedde1a0
-EBUILD augeas-1.9.0.ebuild 1005 BLAKE2B 49f621d5a5e3317a7c50e0ed60e38fc912ba1c1f9f8daacf2975d58d9b420755d6eb828c1f0db8f6e1702ef1d78596b5f6b1fcafade89b5ac398b3eab60f5c4f SHA512 8283b10f74ea521f7241ecd2b6bf1cac084a337e7f411ff3b665ba429a018336cd71e3ef53e69308c4c371985417e6f16ddd201f9da2409030aa1d794d625622
 MISC metadata.xml 693 BLAKE2B c47bd36818c81a0fcb3d8f2e18e7a48797038c8a4a93302d592140faaed41d093523b6ad407b58dc7ae8c5f81c999c04e8514511b685e2a9b7d556dea177bde8 SHA512 1fcdcea259ed6cb652d08e763ccc67bee7bd5da9a7d3600dd492beaec7300868a47a7afdd71950ca8631886042428fce36cc17602a0776a9fa489f0fa2d27436
diff --git a/app-admin/augeas/augeas-1.10.1.ebuild b/app-admin/augeas/augeas-1.10.1.ebuild
index 3ea24d340802..da590fa69145 100644
--- a/app-admin/augeas/augeas-1.10.1.ebuild
+++ b/app-admin/augeas/augeas-1.10.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.augeas.net/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 sparc x86"
 IUSE="static-libs test"
 
 RDEPEND="
diff --git a/app-admin/augeas/augeas-1.9.0.ebuild b/app-admin/augeas/augeas-1.9.0.ebuild
deleted file mode 100644
index fb4630713038..000000000000
--- a/app-admin/augeas/augeas-1.9.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A library for changing configuration files"
-HOMEPAGE="http://augeas.net/"
-SRC_URI="http://download.augeas.net/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="static-libs test"
-
-RDEPEND="
-	dev-libs/libxml2
-	sys-libs/readline:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=app-doc/NaturalDocs-1.40
-	test? ( dev-lang/ruby )"
-
-PATCHES=(
-)
-
-src_prepare() {
-	if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
-		addwrite /usr/share/NaturalDocs/Config/Languages.txt
-	fi
-	if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
-		addwrite /usr/share/NaturalDocs/Config/Topics.txt
-	fi
-	default
-}
-
-src_configure() {
-	# Needs to implemented
-	local myeconfargs="--without-selinux
-	$(use_enable !static-libs shared)
-	$(use_enable static-libs static)"
-	eautoreconf
-	econf ${myeconfargs}
-	default
-}
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 54567cb5f1f7..13d98df35bd3 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1,8 +1,10 @@
 AUX glance.initd 375 BLAKE2B 3d061f0357b8782e6abb0e2f6c779d8901fc7211238b877f3078cea66bc6086e80a530729b6484f110c02e23375fddde7f0ddfd22a6451ef84d9ec3caaa9d6cc SHA512 c6c433334bb337c708e31fac7869bf29e89516b857800d7cb77d264766483f54976dda6d83460078eed0dee14f0770a31adce344ec7fca04c2040b21dcf239b5
 DIST glance-15.0.0.tar.gz 1803491 BLAKE2B 70e0f1f7eab6aa0066d16e30e9325ac45d9c0eb9df875e3b26e90463e10299d6c7c272c0b070137f27332bdfcb33abeda68e3375e2562c83942ca72fcb24de38 SHA512 beb5744f9e8b296356cb731c79f1efd7b60408c1282e8a64ab7d414929c447c4f2ff0562a0d59c0a05f828d420ba190946866543a37dbd2df73ae322cbcabab5
 DIST glance-15.0.1.tar.gz 1815463 BLAKE2B ec6e51340fc4d737e2bd777baf03163a0b515d19c1dc8e5203918e07b304a9539f47ba763207e26def985c6a384d21250ffe1386b433d8b606b55d3d70e4431a SHA512 2da3ada256424a7817d0c49aac0940443cbefcfff3df77a623d7099badf356808b5df59f109ac233f84ac561b7310d3b8d53cafd6c9955a8e2b296a1655cedd3
+DIST glance-16.0.0.tar.gz 1956293 BLAKE2B 457f18412885287d8a3ea1b702af0e7b826eeeaf93ce8b1b7456a42d3a84594cfe270670ac35e9c63d8fbb464a3ed0db823a6949fbfa37f993b260681222d9c1 SHA512 20ff8ba74eee3a5b69f7e357f69870398e96341831bea56bbad61314d3eff9d6767dfd48634d04f96cfbc4cc96c7eff3ab900748461ecaa14e2cf329aec40481
 EBUILD glance-15.0.0.ebuild 5135 BLAKE2B 0b2055f6e1ffb2cf59eec038d8656ca51aa80227c2698b0fd139119b1f3c7dff9cc8e23081c31852150cbb95693f46b7e5252b8f203362b70a33e3c8a0415e9b SHA512 b8291f97a9cbfc2336fa596c23142ae8ddb74a929e109cecc1f8195cf07b0e6070bd987b7b063be01b66fdafb155a1f7e8655a968f5caba105bf452457f8ce42
 EBUILD glance-15.0.1.ebuild 5277 BLAKE2B b6b68c59d4d45ee94c78ffd465c38d3d3f1dce98fc4b71051d23b1858a7cdc199dc1ab64f6153c9f5a75c4263528cf75334f085a1b556a37220619d1d11e6fd2 SHA512 f79d9aaccc149061028bc1a4fa8ba131fcdbe2f7b708da4dc71d91c78bc26e8f2e8102ebd62fd7aafac0f58e73e5aea19b62a00dfdd0af372ebd3d1e980e6147
+EBUILD glance-16.0.0.ebuild 5041 BLAKE2B 95bf44041a4e387394ffe140a08699aa895dd8b99e1d28ddc1f35700840e530555134885bad23e03771e6ac29ea66471eb4ae38f83d8e7a3b9cdb077b88f3386 SHA512 4408e7cdc946b1f1ac47a259f87ac68ba3d5e1756da49cbc2260f92c7c5e6533b511283b013f0d2585c9ccbbd712fbed03b82689b8410e240eb09c476557b0f7
 EBUILD glance-2017.2.9999.ebuild 5277 BLAKE2B b6b68c59d4d45ee94c78ffd465c38d3d3f1dce98fc4b71051d23b1858a7cdc199dc1ab64f6153c9f5a75c4263528cf75334f085a1b556a37220619d1d11e6fd2 SHA512 f79d9aaccc149061028bc1a4fa8ba131fcdbe2f7b708da4dc71d91c78bc26e8f2e8102ebd62fd7aafac0f58e73e5aea19b62a00dfdd0af372ebd3d1e980e6147
 EBUILD glance-2018.1.9999.ebuild 5041 BLAKE2B 95bf44041a4e387394ffe140a08699aa895dd8b99e1d28ddc1f35700840e530555134885bad23e03771e6ac29ea66471eb4ae38f83d8e7a3b9cdb077b88f3386 SHA512 4408e7cdc946b1f1ac47a259f87ac68ba3d5e1756da49cbc2260f92c7c5e6533b511283b013f0d2585c9ccbbd712fbed03b82689b8410e240eb09c476557b0f7
 MISC metadata.xml 786 BLAKE2B 2d0d8d4d270200eafcb2570528bfc0fb0f3932295550186f9cf930c05d7ade06faf004d159047fe347716249166cf9f595c2512cea86aa86fc2c604582380106 SHA512 eed1ca2a7e15b1844de0a3a35453ab5890622cf161407df5ccb9d21ab2634691c94237496ddc8ab02881a687e16f8378f37817b20705112e11ee55d2a813f99a
diff --git a/app-admin/glance/glance-16.0.0.ebuild b/app-admin/glance/glance-16.0.0.ebuild
new file mode 100644
index 000000000000..a3a068b143c5
--- /dev/null
+++ b/app-admin/glance/glance-16.0.0.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1 user
+
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
+HOMEPAGE="https://launchpad.net/glance"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openstack/glance.git"
+	EGIT_BRANCH="stable/queens"
+else
+	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc mysql postgres +sqlite +swift"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/glance_store-0.22.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.9[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	enewgroup glance
+	enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+	sed -i '/xattr/d' test-requirements.txt || die
+	sed -i '/pysendfile/d' test-requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newinitd "${FILESDIR}/glance.initd" glance-api
+
+	diropts -m 0750 -o glance -g glance
+	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+	keepdir /etc/glance
+	keepdir /var/log/glance
+	keepdir /var/lib/glance/images
+	keepdir /var/lib/glance/scrubber
+
+	insinto /etc/glance
+	insopts -m 0640 -o glance -g glance
+	doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
+
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index b2fb74a6f6f0..869d9ed08fe2 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -1,7 +1,5 @@
 AUX keepass-2.36-xsl-path-detection.patch 1446 BLAKE2B 15c9d15b44b0748bc114ff45dadb5824f369a454a1126cb61293d55f86f9f01fb659932729dbc205a522aab32343dd87b74662927d60edc50750af602a959cc9 SHA512 6e1279363bf355be8846c012840271525dcbeccfaa9dc9d1bc4b39068ed58dae4fc421fed4f0fd5d0d2311436d35648f04539fa122066222cb15a66c3383ceae
 AUX keepass.xml 275 BLAKE2B 8e64d7e60b0808b9505387caf97c9198d14ead3510c72d3a62cb747a2f09a64f63360f95df12043a97262fde8fd1b6882fe86d07d4ec483cf30788391be8f940 SHA512 a6055604ff4ff9e905012b5f8448540ea3b3fa8527ce1fd247fe4e5329e6861e5e7a01ea5ed907c41c073d81ee02452392ea0b0d61bf1119dadd300911a450fb
-DIST KeePass-2.37-Source.zip 5080663 BLAKE2B bf74c93eb732d607fe87dc29d3e429b37f1052b258e980127ce1f687423a790bfe298f06c1c459888c60b066a45053447fbaed730e3d38cd6b6dd48d53fbdc34 SHA512 d094793a3216181ae375fb1343a809a20c358786bdf369c0171e5b7ca17a74bada314875cf410d84efaa4fa2b13e199de9be3c60f5f4e2c189241e4fffec8ad8
 DIST KeePass-2.38-Source.zip 5091900 BLAKE2B 22e3f7046984204a3e0c4a1c6d8303661048bc0fee4bcdb7999b521d0ed6e5463d89044d2897cfec0c932349cc80a7b43d4c8dfbceb4f2e88041c642e0c0d231 SHA512 42fa7274874d4858da360a6772eb25adbf3a6dafe375093459d9a25903d8c159360ea722e969fe8b330bccf62ee5d381e131bd0ba075445932d8019eee19bf20
-EBUILD keepass-2.37.ebuild 3037 BLAKE2B 3fe5b971d8336ffdc3f9b520ac3c4530cdee3555c3e20cf7658ddb6fc874b28d1ee5710d76de2282128e83c84f05b5b2435db657e9be278ce4ed7ea107b6829a SHA512 f2f473c7fcde5e11711c3519c72ad78f2853ac6e7c242da2be9aa34e74e8d7962e2416e48a827b5a6d6e9b6f91314b426e662cbdc2e01e9c2d8e9331120f10a7
-EBUILD keepass-2.38.ebuild 3039 BLAKE2B 56adc392b5ef836fa8fbc8a13632fa74ae2d02e71e1da37b8c0d07aff1e77c7240d14517a11de6fb5a75dec4b03a9c58518bea03ad63178bccf777731f708d14 SHA512 9291806ddc3129b52b3b3107cdc9d94aff9a258ea3d2a6a8e0d2103f66231a70ef47a9b6a6ec646bc017cc8ae8edd7d387998ff5617ceefa53a9b3d602397316
+EBUILD keepass-2.38.ebuild 3037 BLAKE2B 3fe5b971d8336ffdc3f9b520ac3c4530cdee3555c3e20cf7658ddb6fc874b28d1ee5710d76de2282128e83c84f05b5b2435db657e9be278ce4ed7ea107b6829a SHA512 f2f473c7fcde5e11711c3519c72ad78f2853ac6e7c242da2be9aa34e74e8d7962e2416e48a827b5a6d6e9b6f91314b426e662cbdc2e01e9c2d8e9331120f10a7
 MISC metadata.xml 651 BLAKE2B 058fa70fb6ce35fb52464a84cf506ad117343a1376a40b003c4f55bdf94369136276d8bbb67f30490eb73cba4df6b03d78e8c2a65cf8141dd6cf64654c9b6358 SHA512 6251f546e631decbc7692ab00900d722031ce638f3d878771a2bcfebedba8e1fee9b3e54dfd4c3ae3c711006099fc5a772555ea7cc018d012de164755ba8b52c
diff --git a/app-admin/keepass/keepass-2.37.ebuild b/app-admin/keepass/keepass-2.37.ebuild
deleted file mode 100644
index 4b997c59a7eb..000000000000
--- a/app-admin/keepass/keepass-2.37.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils xdg-utils
-
-MY_PN="KeePass"
-DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
-HOMEPAGE="https://keepass.info/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="aot"
-
-COMMON_DEPEND="dev-lang/mono"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-dotnet/libgdiplus[cairo]
-"
-
-S="${WORKDIR}"
-PATCHES=( "${FILESDIR}/${PN}-2.36-xsl-path-detection.patch" )
-
-src_prepare() {
-	# KeePass looks for some XSL files in the same folder as the executable,
-	# we prefer to have it in /usr/share/KeePass. Apply patch using base function.
-	# This XSL file will not be upstreamed since the KeePass creator said that
-	# including this patch would break the Portable USB version of KeePass
-	# (which keeps/looks for xsl files in its own folder)
-	default
-
-	# Switch into build dir so the mono prepration script works correctly
-	cd Build || die
-	source PrepMonoDev.sh || die
-	cd ../ || die
-}
-
-src_compile() {
-	# Build with Release target
-	xbuild /target:KeePass /property:Configuration=Release || die
-
-	# Run Ahead Of Time compiler on the binary
-	if use aot; then
-		cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
-		mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
-	fi
-}
-
-src_install() {
-	# Wrapper script to launch mono
-	make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
-
-	# Some XSL files
-	insinto "/usr/share/${PN}/XSL"
-	doins Ext/XSL/*
-
-	insinto "/usr/$(get_libdir)/${PN}/"
-	exeinto "/usr/$(get_libdir)/${PN}/"
-
-	doins Ext/KeePass.exe.config
-
-	# Default configuration, simply says to use user-specific configuration
-	doins Ext/KeePass.config.xml
-
-	# The actual executable
-	doexe Build/KeePass/Release/KeePass.exe
-
-	# Copy the AOT compilation result
-	if use aot; then
-		doexe Build/KeePass/Release/KeePass.exe.so
-	fi
-
-	# Prepare the icons
-	newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
-	newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
-
-	# Create a desktop entry and associate it with the KeePass mime type
-	make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;"
-
-	# MIME descriptor for .kdbx files
-	insinto /usr/share/mime/packages/
-	doins "${FILESDIR}/${PN}.xml"
-
-	# sed, because patching this really sucks
-	sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	if ! has_version x11-misc/xdotool ; then
-		elog "Optional dependencies:"
-		elog "	x11-misc/xdotool (enables autotype/autofill)"
-	fi
-
-	elog "Some systems may experience issues with copy and paste operations."
-	elog "If you encounter this, please install x11-misc/xsel."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-admin/keepass/keepass-2.38.ebuild b/app-admin/keepass/keepass-2.38.ebuild
index 741800f82fde..4b997c59a7eb 100644
--- a/app-admin/keepass/keepass-2.38.ebuild
+++ b/app-admin/keepass/keepass-2.38.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="aot"
 
 COMMON_DEPEND="dev-lang/mono"
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index f7760b6be626..a28e792ab612 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,8 +1,8 @@
 DIST keepassxc-2.1.4.tar.gz 3345520 BLAKE2B d599321a412abc05ad0a911b8fe4d14e840d491e59d3f33172a5e6b10812fe8e00d03f23abcc9637be1b8c16b5c7ec640bbc2af63059dc0dd25c99f0bdacfce9 SHA512 48030eb6df595c73644f43d6222654c5f76962ae5aa2f44ca4dc9c8e45726380c6be4300af7a8279b07c06b70912da444f2b17c5b6c37a91cb239d695e7518d8
-DIST keepassxc-2.2.2.tar.gz 3885990 BLAKE2B 2eb70217a4b73daac3f8eaf797c2c5c5dc6b2d8b7a76a91f45a036da034335937f3f21e48590d8493dcaa4f6079897440338650f14e75fa1884585d36d946bb4 SHA512 73a167a79af56d4b6dbef7ce4050ca599f2c107a5c8af3b9e28241504572988b2d8b258135b7a34dfceae5a18cbda26b97ed513bbde14fe3d38e3f41b882d34b
 DIST keepassxc-2.2.4.tar.gz 3895421 BLAKE2B 0de35f394dae8cf8d70f75d73783965826cc03ac9f0921afa547d02e61cb04be167891d92aa0db09f007c47e96a5a7e5793772c50de14bf65a7f80a603ca6611 SHA512 f3308138d63b65a8b384a52f4723507be921d7bbf19031724886fcd12266bf2683326f5531c8f665b0e98ff63cd97251694199ef748191e59a5a8cceb3710025
+DIST keepassxc-2.3.0-src.tar.xz 3803400 BLAKE2B 1e9d72bb71e3db0f7f4662bca22affe68c0ac857ce3b7b67924949622edf3a4d2f54717c1c629d79c2cfeccd29d0f1906a8f43e49483980d11afbb654a132f4f SHA512 44721a4dd9364898c69a10d73ceb3fce9b8e83bbe261d9bc656897bc01f37e9b65b923867e18d3c3269773075ad846a0e1195d8b7bf574fcbce7bef9a5778888
 EBUILD keepassxc-2.1.4-r1.ebuild 1540 BLAKE2B f16a6d6a45eca3926735ce4857c8007c421594e1e41a1d87feb75ce6234b92760a9221cd81734f5a8e1a55fef4f36f6faa0acba0b786dfd7c81d9f3f2c9f280c SHA512 7dcda961fda3b3166b2e38a878e2b2782e604c3373b67c358347746fccfa781082ce1c3417aeb8c1b76b8fc5ae94b38bff1442fc2477267b4a5096afdf1803ea
-EBUILD keepassxc-2.2.2.ebuild 1544 BLAKE2B b0e6a6a0b5efeee5ca105a7ee9b8bbe674a9c1f0fc7a17a090c07a9287aba00c3c36f7bf8e41fb820d4056a92259151ba047ffa555a10df9639445f6d3083c84 SHA512 5695e22f30dc7e60c463ea4a0703111839345facb251e896526e4d5cb5d566516b939bc440c94e0a1b68272eeb458f47b8ddf1e529e5eb7037dca4b6698517a8
 EBUILD keepassxc-2.2.4.ebuild 1544 BLAKE2B b0e6a6a0b5efeee5ca105a7ee9b8bbe674a9c1f0fc7a17a090c07a9287aba00c3c36f7bf8e41fb820d4056a92259151ba047ffa555a10df9639445f6d3083c84 SHA512 5695e22f30dc7e60c463ea4a0703111839345facb251e896526e4d5cb5d566516b939bc440c94e0a1b68272eeb458f47b8ddf1e529e5eb7037dca4b6698517a8
-EBUILD keepassxc-9999.ebuild 1659 BLAKE2B 40546fd9968d261d57030c80b997ed2088cee96a773eb53e11b4b35fadcb3ed8786ea0e4c9f27aba90be2109c0c00e0ea3326de78e214a15c957bff2e99284c4 SHA512 c46e86fb182d9218f0b22496a1875f4fa48f3a916556f6e039145be238f2e6c225542cc24170b6618d876e5c31f887afcb12ced36cfbab282743ff064cbdfe38
+EBUILD keepassxc-2.3.0.ebuild 1735 BLAKE2B d563e0a1470e6d2192e1a6741e63ead96638f29093eefd2e2ab15bd06904f17f8a1fd3a4f408180598a3727c10afef31054f7f294de4a18d5121f560482c1385 SHA512 8f29bbe8395d7ead800eea057d515ead2126eeea45e198b4d9d4ed21f4e0b1d3e920a7102cd7c8e05471e4c9511df35316da2cac29af922729a01e4f8b41f519
+EBUILD keepassxc-9999.ebuild 1735 BLAKE2B d563e0a1470e6d2192e1a6741e63ead96638f29093eefd2e2ab15bd06904f17f8a1fd3a4f408180598a3727c10afef31054f7f294de4a18d5121f560482c1385 SHA512 8f29bbe8395d7ead800eea057d515ead2126eeea45e198b4d9d4ed21f4e0b1d3e920a7102cd7c8e05471e4c9511df35316da2cac29af922729a01e4f8b41f519
 MISC metadata.xml 937 BLAKE2B 21a284b7ee94184c22cdb740d9a24f8371cfb6f62d97361cb3a2f853409b3044e8ddad30f58f4f8ad27277739533972d22c7009808c7ae9e6a1c4b8e02003d7b SHA512 bd2e47e2ba3911323f0b5bee78e9e394edef7722e934c70a1e7d3509044d566b2e6d46fd77bde2c303d0c97a8ce4f756e0b32b476af253274a3a941b059da3f9
diff --git a/app-admin/keepassxc/keepassxc-2.2.2.ebuild b/app-admin/keepassxc/keepassxc-2.3.0.ebuild
index 15016b6c462e..6207e109fd62 100644
--- a/app-admin/keepassxc/keepassxc-2.2.2.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.3.0.ebuild
@@ -1,28 +1,28 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-SCM=""
-[[ "${PV}" == 9999 ]] && SCM="git-r3"
-inherit cmake-utils gnome2-utils xdg-utils ${SCM}
-unset SCM
+inherit cmake-utils gnome2-utils xdg-utils
 
 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org"
 
 if [[ "${PV}" != 9999 ]] ; then
-	SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
 	KEYWORDS="~amd64 ~x86"
 else
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
 fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
 SLOT="0"
-IUSE="autotype debug http test yubikey"
+IUSE="autotype browser debug network test yubikey"
 
 RDEPEND="
+	app-crypt/argon2:=
 	dev-libs/libgcrypt:=
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -36,6 +36,7 @@ RDEPEND="
 		x11-libs/libXi
 		x11-libs/libXtst
 	)
+	browser? ( >=dev-libs/libsodium-1.0.12 )
 	yubikey? ( sys-auth/ykpers )
 "
 
@@ -58,7 +59,9 @@ src_configure() {
 		-DWITH_GUI_TESTS=OFF
 		-DWITH_TESTS="$(usex test)"
 		-DWITH_XC_AUTOTYPE="$(usex autotype)"
-		-DWITH_XC_HTTP="$(usex http)"
+		-DWITH_XC_HTTP=OFF
+		-DWITH_XC_NETWORKING="$(usex network)"
+		-DWITH_XC_BROWSER="$(usex browser)"
 		-DWITH_XC_YUBIKEY="$(usex yubikey)"
 	)
 	cmake-utils_src_configure
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index 96bd13881e8c..6207e109fd62 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -3,24 +3,23 @@
 
 EAPI=6
 
-SCM=""
-[[ "${PV}" == 9999 ]] && SCM="git-r3"
-inherit cmake-utils gnome2-utils xdg-utils ${SCM}
-unset SCM
+inherit cmake-utils gnome2-utils xdg-utils
 
 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org"
 
 if [[ "${PV}" != 9999 ]] ; then
-	SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
 	KEYWORDS="~amd64 ~x86"
 else
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
 fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
 SLOT="0"
-IUSE="autotype browser debug http network test yubikey"
+IUSE="autotype browser debug network test yubikey"
 
 RDEPEND="
 	app-crypt/argon2:=
@@ -37,6 +36,7 @@ RDEPEND="
 		x11-libs/libXi
 		x11-libs/libXtst
 	)
+	browser? ( >=dev-libs/libsodium-1.0.12 )
 	yubikey? ( sys-auth/ykpers )
 "
 
@@ -59,7 +59,7 @@ src_configure() {
 		-DWITH_GUI_TESTS=OFF
 		-DWITH_TESTS="$(usex test)"
 		-DWITH_XC_AUTOTYPE="$(usex autotype)"
-		-DWITH_XC_HTTP="$(usex http)"
+		-DWITH_XC_HTTP=OFF
 		-DWITH_XC_NETWORKING="$(usex network)"
 		-DWITH_XC_BROWSER="$(usex browser)"
 		-DWITH_XC_YUBIKEY="$(usex yubikey)"
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index aedad7f312f4..9690a75677de 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -1,20 +1,16 @@
 AUX mongo-tools-3.2.10-pie.patch 551 BLAKE2B 74fc48378747c5d9a0a9ac0c14a6747d05cadcce91b97eb9392a95a3b59037268a7a76eb38706e7ed5be1fe0442e8b939e1a2466e5a02832b94d9937039f8030 SHA512 9a309e8d4d3776fef5209bdaedf416f3a43d51ffacff8fa602dacc288b1413dfb7eeca2cbd88a976a1648161bd671321e8f333a6843ee0477ea41cfcad040d1b
 DIST mongo-tools-3.0.14.tar.gz 2413148 BLAKE2B a085b452019f7354a8f2fcb4d7a493746fd6504dc836b3bc522bca6dfd054dc4940db1b07021b305c52bc12da076220c3e137507b656a00ca1330ba336532458 SHA512 0e77417b2c36080515a2ff611427cb18f6d6c2432159c2a09af8d6ff14ae7f25ecbfe0a6631eeb7de084fdfe517a09364d731f5b63923404b6319fc1ca44b840
 DIST mongo-tools-3.0.15.tar.gz 2413131 BLAKE2B 5f971d6b47685ef8db246a71f59a31a722e84b8191639fe7da849162701c944325bc4cbdb9a27b7a6ae32f1a8ccedac91d6a485dfbe54dd17b8735d5b32e4f2c SHA512 b5baeea89f5287e055c43c58cfc31e4618df2b7b7fffd7d77248131daf503522b1d041253df8d3ad2ffa22efff344334dc05e3a3462cf7c646d4e83040bd95dc
-DIST mongo-tools-3.2.12.tar.gz 2712079 BLAKE2B 173301fb4b47460eb9674ba80540c9a2f42688a4753576ca5fe08c199a63ec71b1d50d3ed9291eede05e4de6540a654e5bcd8d65bc739ecdb7ed1b36114430f9 SHA512 66f7beb85a83ad6a217e65bba97ace6ad0bf84688f40e598e5fb1cf4bbe481b4069e1247d6829f8d06c8230d33c3e0c8bd8465a975576cad584065c361b6fb72
-DIST mongo-tools-3.2.13.tar.gz 2712076 BLAKE2B 66e76e049b6a322e05dea21c241d983ebecb0005ceba915d9990b1d5b059a5b56ba7f7e52d9e5e54619a66e64cc57cb3db3265543f3ebd110197d97a01cd3cc6 SHA512 caa0ba0f1452a16921c187cb407258326324b7222af91b1cd1b870ee2c9e6909d4fa94087a6da148a807f75b40f0bb97808a85804134d53cdab7970d8adf59f8
-DIST mongo-tools-3.2.16.tar.gz 2720003 BLAKE2B e5cb694549b5c70cd07fc8e891b1a78cffec0f99aab62978c70d38c01d9b1ae9c401f9618d24d9afc036ae66657eac40f710076d177497b51c97b963cff31d86 SHA512 61c8cfd04a36e329c3573b73945d20a5623e1aa0a3430b309530e85e4289a27a46a850ec48ede7f04e66e67e23745ef26f5f4ddcf68ffeb647128e3d2526a724
 DIST mongo-tools-3.2.17.tar.gz 2719970 BLAKE2B 666b67d8abdd10f7fa7c557e3c3906fb3cc6bcfa0b97a05e39e5f1ea923d2beb5ec249b3b0a521c4cce4bd595bf18672d8bce38152f84825bb3fffb058fd3b29 SHA512 62c2540027e07b8276621e08d13657864d16021030e3c8f9bc0d351454319d448f889cf6a48b8467ea3270365376ed0c3beb42ceae3f28357910148c6b4054b2
 DIST mongo-tools-3.4.10.tar.gz 4719399 BLAKE2B 8165248bf58f2ea2b02e365a3609c72b72e98dd5902f176e251fa2add1ad26e90900e06c35dc6db4dbe161e541bedfc1776f5e15bbb41dcc9a7be17800424362 SHA512 b861bb3fb1a32c3aa2efefcf6a13bb6d4783ac1a9b006c477fd04deb338cbf6b7adc3944bc6919513b92bd96b8500813ff4af49c9dec0719ebd2fdaa99bc39a5
 DIST mongo-tools-3.4.13.tar.gz 4719488 BLAKE2B 27c7716b21f1a23408d0f31aee111c5877f5172121a987c234ff01eb2690bbc71bca4e00fc13b701ca6b91dce0c9aaae43c2239a60a52e130e1390bf5bafef60 SHA512 c233268328ef868ec06c9a9d83009141b39c84ba642e7de7dece3210717ba8de600f39896a30ed23d1577db9f4697c3a8d720cf35248bca2b00a17642b043237
 DIST mongo-tools-3.6.2.tar.gz 4693924 BLAKE2B 61c44d579f6eb4013ee6c0118ebe89a2d454ef8cf6ad933479885cb71d169185272b03d9c63fa738d67bbd1b9efd4bc964eb17adcc5002508589d198cdb17752 SHA512 5ac2b1d2b33271f63c406c69bd8a576a21f4dcaa6f75839e0f907ebc9968f0e121eb3800e88da050c120856e7ddda4f12d551bb731d4acac0f5cf09f66fc948a
+DIST mongo-tools-3.6.3.tar.gz 4693833 BLAKE2B fc7139984cf3dcb7b4ce6f6c2028296651aa59ac68d7068bdf748e28eeb65b1fd9b07580d0c93f3f41dbb01030a12433a07a04deadf28e0ff792387fa78ae4aa SHA512 7dba782c84a728aa9ceb28cbd9934f58b615dccfb238a9dbd63b18661ba4e74ddba21f93d9f12e6d80d293ebe42a82d31fa64448aacdba75bd07d964a5f631fc
 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.12.ebuild 1198 BLAKE2B 3db31f3d6fde60f2f482a92415c93bfbb8f964e140353ad7ac025a5105e84f88688785b8777787abca5fd99c7358bd7395742f8340323bf4f918aee47543ca55 SHA512 f71ff59918d4d8278bae4408ff7649fdda928980d1cc08ab169391c5adbabed4e2d1ba0f4cfd23a8b0f05be1850c2037b971f99fd2ee2557ae76dfdae89e2d15
-EBUILD mongo-tools-3.2.13.ebuild 1198 BLAKE2B 3db31f3d6fde60f2f482a92415c93bfbb8f964e140353ad7ac025a5105e84f88688785b8777787abca5fd99c7358bd7395742f8340323bf4f918aee47543ca55 SHA512 f71ff59918d4d8278bae4408ff7649fdda928980d1cc08ab169391c5adbabed4e2d1ba0f4cfd23a8b0f05be1850c2037b971f99fd2ee2557ae76dfdae89e2d15
-EBUILD mongo-tools-3.2.16.ebuild 1198 BLAKE2B 3db31f3d6fde60f2f482a92415c93bfbb8f964e140353ad7ac025a5105e84f88688785b8777787abca5fd99c7358bd7395742f8340323bf4f918aee47543ca55 SHA512 f71ff59918d4d8278bae4408ff7649fdda928980d1cc08ab169391c5adbabed4e2d1ba0f4cfd23a8b0f05be1850c2037b971f99fd2ee2557ae76dfdae89e2d15
 EBUILD mongo-tools-3.2.17.ebuild 1221 BLAKE2B 7943f052ee8a6b2fefb1c84233d87f7b3189ba6eee59d764cd2af46d9350d697ee3379405b40be77cc751fdcfccbf0f3aa61640d0e5fd0aafbfe5bac34ae7519 SHA512 1bb25c1e8c72fcc6fe0374ea3469634dfbdf3fa37d41a91bf9e562d16031a23ec227d3a402a0eeb1e66742773db983e823f68f7334c734638620f1040cefe87f
 EBUILD mongo-tools-3.4.10.ebuild 1237 BLAKE2B 27690fa59a8165db8200ec332171396d23ab2084a4b42382b592622030e6b4a9e148b652b412448a1897b90beab3c684aeb570b7facac3d1f6047063b8f29312 SHA512 252ec56015e29597eb8f5cd1c5b63939276734f0459ed6b16fba1faf3eb82b4a88d707324c8010453c791b911a2bdfe14325b4604d6ddcd4259e160d0677dbd8
 EBUILD mongo-tools-3.4.13.ebuild 1217 BLAKE2B b0a7490c786d39639f0b018887f5e9b111279bc80d440a6c49fe8d6444642c61d7700b5865a3e8b9ce28c5af187e47b57a0f79240ea8582a2663f02d01fa2d76 SHA512 f4f00020f3cc9250078770423d40dabfc8054b4205b946c9fc10d580ef5dfcc9a0fec86173c12f3942e332d5c5cac882fc9a23b0fa4944446402a87cd68e77a4
 EBUILD mongo-tools-3.6.2.ebuild 1257 BLAKE2B c9f6bf6e4e5aaf602e65f9dae6dc406506e4d590e392bc96cba776eaed1c4053e596ed6b1f55664b474e7b302d2032a9627fcf01b237ce06ec214275715d9fc2 SHA512 12eca5b3936d64a8cf0252c3cfa10594be9a7c5bfb22b4734c0ebbd9782e13249a9b389fd2e5d338cef721b4b1cf90c15237b8fda37b1e7e5a58a423a26af97c
+EBUILD mongo-tools-3.6.3.ebuild 1257 BLAKE2B c9f6bf6e4e5aaf602e65f9dae6dc406506e4d590e392bc96cba776eaed1c4053e596ed6b1f55664b474e7b302d2032a9627fcf01b237ce06ec214275715d9fc2 SHA512 12eca5b3936d64a8cf0252c3cfa10594be9a7c5bfb22b4734c0ebbd9782e13249a9b389fd2e5d338cef721b4b1cf90c15237b8fda37b1e7e5a58a423a26af97c
 MISC metadata.xml 463 BLAKE2B 1e4d37c222538ce5d55e6f5c05ecbe85f57ac74eacaf5935540797f03c4c069b2ce2bd0cbb6b433eb86de9b2480058013759db3d504982df908c2ba9e1b4d2ec SHA512 f09474b3932dd6ae36da20c64a394acf65ad1e3a875e7ca743efa22db8b7e3109c9ebe4c489e62eda12c5bdd4d689ede61eca8a4cc89c42d0a08a270f041fcdc
diff --git a/app-admin/mongo-tools/mongo-tools-3.2.12.ebuild b/app-admin/mongo-tools/mongo-tools-3.2.12.ebuild
deleted file mode 100644
index 1978809739ac..000000000000
--- a/app-admin/mongo-tools/mongo-tools-3.2.12.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-MY_PV=${PV/_rc/-rc}
-MY_P=${PN}-r${MY_PV}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="http://www.mongodb.org"
-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 ~x86"
-IUSE="sasl ssl"
-
-# Maintainer note:
-# openssl DEPEND constraint, see:
-# https://github.com/mongodb/mongo-tools/issues/11
-
-RDEPEND="!<dev-db/mongodb-3.0.0"
-DEPEND="${RDEPEND}
-	dev-lang/go:=
-	net-libs/libpcap
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? ( dev-libs/openssl )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -e 's|go build .*|go build -o "bin/$i" -tags "$tags" "$i/main/$i.go"|g' -i build.sh || die
-
-	# ensure we use bash wrt #582906
-	sed -e 's@/bin/sh@/bin/bash@g' -i build.sh || die
-
-	epatch "${FILESDIR}/${PN}-3.2.10-pie.patch"
-}
-
-src_compile() {
-	local myconf
-
-	if use sasl; then
-	  myconf="${myconf} sasl"
-	fi
-
-	if use ssl; then
-	  myconf="${myconf} ssl"
-	fi
-
-	./build.sh ${myconf} || die "build failed"
-}
-
-src_install() {
-	dobin bin/*
-}
diff --git a/app-admin/mongo-tools/mongo-tools-3.2.16.ebuild b/app-admin/mongo-tools/mongo-tools-3.2.16.ebuild
deleted file mode 100644
index 1978809739ac..000000000000
--- a/app-admin/mongo-tools/mongo-tools-3.2.16.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-MY_PV=${PV/_rc/-rc}
-MY_P=${PN}-r${MY_PV}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="http://www.mongodb.org"
-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 ~x86"
-IUSE="sasl ssl"
-
-# Maintainer note:
-# openssl DEPEND constraint, see:
-# https://github.com/mongodb/mongo-tools/issues/11
-
-RDEPEND="!<dev-db/mongodb-3.0.0"
-DEPEND="${RDEPEND}
-	dev-lang/go:=
-	net-libs/libpcap
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? ( dev-libs/openssl )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -e 's|go build .*|go build -o "bin/$i" -tags "$tags" "$i/main/$i.go"|g' -i build.sh || die
-
-	# ensure we use bash wrt #582906
-	sed -e 's@/bin/sh@/bin/bash@g' -i build.sh || die
-
-	epatch "${FILESDIR}/${PN}-3.2.10-pie.patch"
-}
-
-src_compile() {
-	local myconf
-
-	if use sasl; then
-	  myconf="${myconf} sasl"
-	fi
-
-	if use ssl; then
-	  myconf="${myconf} ssl"
-	fi
-
-	./build.sh ${myconf} || die "build failed"
-}
-
-src_install() {
-	dobin bin/*
-}
diff --git a/app-admin/mongo-tools/mongo-tools-3.2.13.ebuild b/app-admin/mongo-tools/mongo-tools-3.6.3.ebuild
index 1978809739ac..f8c4a23a746a 100644
--- a/app-admin/mongo-tools/mongo-tools-3.2.13.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-3.6.3.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=6
 
 MY_PV=${PV/_rc/-rc}
 MY_P=${PN}-r${MY_PV}
 
 DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="http://www.mongodb.org"
+HOMEPAGE="https://www.mongodb.org"
 SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
 
 LICENSE="Apache-2.0"
@@ -17,40 +15,45 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="sasl ssl"
 
-# Maintainer note:
-# openssl DEPEND constraint, see:
-# https://github.com/mongodb/mongo-tools/issues/11
-
 RDEPEND="!<dev-db/mongodb-3.0.0"
 DEPEND="${RDEPEND}
 	dev-lang/go:=
 	net-libs/libpcap
 	sasl? ( dev-libs/cyrus-sasl )
-	ssl? ( dev-libs/openssl )"
+	ssl? ( dev-libs/openssl:0= )"
 
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	sed -e 's|go build .*|go build -o "bin/$i" -tags "$tags" "$i/main/$i.go"|g' -i build.sh || die
+	default
 
-	# ensure we use bash wrt #582906
-	sed -e 's@/bin/sh@/bin/bash@g' -i build.sh || die
+	# do not substitute version because it uses git
+	sed -i '/^sed/,+3d' build.sh || die
+	sed -i '/^stty/d' build.sh || die
+	sed -i '/^mv/d' build.sh || die
 
-	epatch "${FILESDIR}/${PN}-3.2.10-pie.patch"
+	# 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
+
+	# ensure we use bash wrt #582906
+	sed -i 's@/bin/sh@/bin/bash@g' build.sh || die
 }
 
 src_compile() {
-	local myconf
+	local myconf=()
 
 	if use sasl; then
-	  myconf="${myconf} sasl"
+	  myconf+=(sasl)
 	fi
 
 	if use ssl; then
-	  myconf="${myconf} ssl"
+	  myconf+=(ssl)
 	fi
 
-	./build.sh ${myconf} || die "build failed"
+	./build.sh ${myconf[@]} || die "build failed"
 }
 
 src_install() {
diff --git a/app-admin/mongodb_exporter/Manifest b/app-admin/mongodb_exporter/Manifest
new file mode 100644
index 000000000000..9e46d955213d
--- /dev/null
+++ b/app-admin/mongodb_exporter/Manifest
@@ -0,0 +1,5 @@
+AUX mongodb_exporter.confd 94 BLAKE2B 25c98466e22b137a33f347d2c8c53fb15e0727423b6e0d8d804547a9b4220ca1c742cfdea6f6afbbb1fc6a38adafda56d1d372b5175bf3293ee5094ba2c835d5 SHA512 3ead6c80528042a436d8b0d013998e410c9a4216f532876766b7631187051b29b37bc4d834dcdc1483b1575dfa3b975baaef03e0637e63e279a5fbd9b3b75073
+AUX mongodb_exporter.initd 609 BLAKE2B 21f2130b139aa6a42fecbe388caf0b1d237c6bdd840247c66dfcc0423fa5988624936b38a76dca8500cb4e35913e6e62d62b70d8a52ab0a2437ca37485ac07a5 SHA512 6d37475feb73d5b8cfa1b5c32e9de8ce3201ae3b16c56b379f986780815d342cdd20983172bc6bb63ee653fda3ac764344f8b31a8b544a46243a97c61f86edc5
+DIST mongodb_exporter-0.4.0.tar.gz 3386266 BLAKE2B a6bebada2792e620b2107b72b3ab8b2a4e7a08fc53747f266b30a3cf2fe42ed7e09e3be9aa36332cba2df124947064f545821f355726e09649509c671a56c30b SHA512 0db1abd8c7439239cf59b24968ef33f83c6609a9deaed250315dd7fcb6844ef3d0d0c1f50b979f931beb539038a13eb7b88c03c899333d981112695be2e031b3
+EBUILD mongodb_exporter-0.4.0.ebuild 1110 BLAKE2B 5ad73d6b2c0cea692de28c2bac400beca74be721fe4c0766d8f12fede1f598e45f91f29ef001ec21a72a25884a2bc789ed51771ebeac751d63d22de4316e0b92 SHA512 75956d5f16c5723cfc2e2f7758f4645d87d6539bd8a3f5dbd0244d1985ece9372df28d9747ffec068c7bb352fc236abc25f0f0edea66e41c5d9477ac6ac7d581
+MISC metadata.xml 334 BLAKE2B d5ba9240caf276981ccc375de2ff7d205b0a04bd58903fa60a486d26cb099f5c32d1921fcc433b091bf30fddf20196deb8dbfb3f5e76cffe951cf170e79d6202 SHA512 e854872327de5d18b24ce3b6d5f93f35e44f4cdff88018b8e7aafdc1cdc4953820ef855b5d1be1d53dd8ede67119399c39e52fff04fe928ba2847467cbecf613
diff --git a/app-admin/mongodb_exporter/files/mongodb_exporter.confd b/app-admin/mongodb_exporter/files/mongodb_exporter.confd
new file mode 100644
index 000000000000..bd85fa288304
--- /dev/null
+++ b/app-admin/mongodb_exporter/files/mongodb_exporter.confd
@@ -0,0 +1,2 @@
+# arguments for prometheus mongodb exporter
+command_args="-mongodb.uri=http://localhost:9200"
diff --git a/app-admin/mongodb_exporter/files/mongodb_exporter.initd b/app-admin/mongodb_exporter/files/mongodb_exporter.initd
new file mode 100644
index 000000000000..2a2c985c4f64
--- /dev/null
+++ b/app-admin/mongodb_exporter/files/mongodb_exporter.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 2016-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus MongoDB exporter"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-${RC_SVCNAME}}
+group=${group:-${RC_SVCNAME}}
+
+command="/usr/bin/mongodb_exporter"
+command_args="${command_args:--mongodb.uri=http://localhost:27017}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+	--stdout /var/log/elasticsearch_exporter/${RC_SVCNAME}.log \
+	--stderr /var/log/elasticsearch_exporter/${RC_SVCNAME}.log"
+
+depend() {
+	after net
+}
diff --git a/app-admin/mongodb_exporter/metadata.xml b/app-admin/mongodb_exporter/metadata.xml
new file mode 100644
index 000000000000..b54031048cbc
--- /dev/null
+++ b/app-admin/mongodb_exporter/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">percona/mongodb_exporter</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/mongodb_exporter/mongodb_exporter-0.4.0.ebuild b/app-admin/mongodb_exporter/mongodb_exporter-0.4.0.ebuild
new file mode 100644
index 000000000000..5ea07ecd61c8
--- /dev/null
+++ b/app-admin/mongodb_exporter/mongodb_exporter-0.4.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/percona/mongodb_exporter"
+EXPORTER_COMMIT="01f0ef9"
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus exporter for MongoDB"
+HOMEPAGE="https://github.com/percona/mongodb_exporter"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-util/promu"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "/-s$/d" -e "s/{{.Revision}}/${EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	mkdir -p bin || die
+	GOPATH="${S}" promu build -v --prefix bin || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin bin/mongodb_exporter
+	dodoc {README,CHANGELOG}.md
+	popd || die
+	keepdir /var/log/mongodb_exporter
+	fowners ${PN}:${PN} /var/log/mongodb_exporter
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-admin/packagekit-qt/Manifest b/app-admin/packagekit-qt/Manifest
index 62bb46c99b8d..3f05853e8c8f 100644
--- a/app-admin/packagekit-qt/Manifest
+++ b/app-admin/packagekit-qt/Manifest
@@ -2,6 +2,6 @@ DIST PackageKit-Qt-0.9.6.tar.xz 43288 BLAKE2B 7f00595ae91163346b1bd5b80da0f24338
 DIST packagekit-qt-1.0.0.tar.gz 53495 BLAKE2B a19ff095ec42bc16e498455323a4046365f6ae144fdfc998dee799df9f4ea022696ab30682316b6417c8a96e80e75db31704e36e43c1a5eddd0a7d86309adada SHA512 4109117a94c47180cff0f073c03820ac39a139b6b3ac88dec82758fffe01271f7a3dae85d94e86a4a1167f4660326adc1d58dc6eb0fd164bd0aefee2e412dad4
 DIST packagekit-qt-1.0.1.tar.gz 53503 BLAKE2B af96899e520f4139d6025746c2a2e7a65c67c2900cdf4fbdb410c12e33f494343d078ec24e7dcdb33749b1d5206b0bf622809827ed64beae162888e48d0aaec0 SHA512 e1291545b496571c00a6a24586c45b7173e85e3704d419af6a0ec47ea5ce256c8ec7e887721b1bf8038cb967ceb82726925800ab06aa784b2bdd560e49be724a
 EBUILD packagekit-qt-0.9.6.ebuild 600 BLAKE2B 08678d739d7dcfc84ed766939393c14121248c9533bc80d327081060b0c5aa0f0fbe912090036aed39d754652ddb6544e0c6e31944e78cf0de248d4a7ed07816 SHA512 314156c2fea244321fe3e4dec1e3d4e85654562865ebea6932b8ce559a7e31c485ef6a1719faae0dfc4651dd9cc6998151c936bc2e36f447f79a38f4b96f747f
-EBUILD packagekit-qt-1.0.0.ebuild 572 BLAKE2B 4399aabe8816217f2800c7fed49a060baf32c3b28750839a48f01d969f68374671a60b8e105d26d411d7e3f7252137ed6d51704e9371b8505e0763ce9c93e609 SHA512 d4a568c6bdf9703031d63e2eef7833fafdfadfdc865344b494303fabcf1ca6f5646105565e63068ef89e091a8cb1ab948d08e813dd2c66fb2ff5986598570865
+EBUILD packagekit-qt-1.0.0.ebuild 571 BLAKE2B c727718b29d9defc285a177eb4eb1c3d4f31d9f153e636efbd1d9d7508b47602d425ea75ad4061b1c8ed7107c1af6a644065564764093497d456327fe03110ee SHA512 e55e2dae9a6bd9a40526eb451f1b2b0a4df166bed31a839e6857311bf25f9a5fdda748935aed51050dd4c956af35a9f70212de63f5abf0cef0f17d66f00994e7
 EBUILD packagekit-qt-1.0.1.ebuild 573 BLAKE2B 00cfe9c488622ff84ef1dd979ef3c0475105a86348eca5d72ff862ef8c5fcee233b78a8f037a55e3b2e4c03d9a900619cacdfc33c5ef9766f1684567752db719 SHA512 73cbce3de7c9f7cef8ab4e08dcb1b70bd7f01ae79609caa9606ac42ac3de7aa3c8ddd67ab0464ad3302ccd3bf4e669248188ace3c5eefc70a786e011ae17f544
 MISC metadata.xml 551 BLAKE2B 2a6881f45a4f44ea61556de150346743992c914d56673e51160a8fbf708a0cd22dfd3c0a89b272122a003af150e6f8311e7d472bd9696770481fe0c1e93778d3 SHA512 bebe5e7a9945182bf7650f762be1cd319a8ecd17a0f8822ad584ff67c363f87125e5f08b3f8a9934875f28c732451a6d9ac84b9b3b57284b799c76fa73415b70
diff --git a/app-admin/packagekit-qt/packagekit-qt-1.0.0.ebuild b/app-admin/packagekit-qt/packagekit-qt-1.0.0.ebuild
index 91b5e37b34ac..eddd9dc3a44e 100644
--- a/app-admin/packagekit-qt/packagekit-qt-1.0.0.ebuild
+++ b/app-admin/packagekit-qt/packagekit-qt-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hughsie/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1"
 SLOT="0/1"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 57bcdbc6dcea..21f133737c9d 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -34,10 +34,10 @@ AUX syndic-initd-4 311 BLAKE2B aab3b44f65dedb30ea4eb573872c0253e4d7b438a533f22a4
 DIST salt-2016.11.8.tar.gz 10142142 BLAKE2B e6805dae84c0d2e39109c95f603fcb54e1b7d7ff6c27ce555379b69274b3a5d72a1e372081a62c18440deb0955c1ef24a41c5d855a5e622f2ffe51276bd87b25 SHA512 0adc544ca460d13d2adb11b04575bd079a3dad1be3468bea7d32d0b74416b78546e4c86c75551bba09786be8e9810a6e30232414c4f5851cbc9a0fb4b894e0de
 DIST salt-2016.11.9.tar.gz 10062996 BLAKE2B 5176d04d07a69de21c9c136c201d334614c5675fd78e306a0160fae829b633441cd859f4ba1a0822dfbb9ae716475c53f6eb058187d4acc8a5770dd4ceace577 SHA512 896fd27c111e926e246b51d00b69d41c8f4d25ec0c034c9ff3dc5414f5e93592fd637cdeaecf02b3b98a4e5a7ce478bfda86b15497961078374608d76516593d
 DIST salt-2017.7.2.tar.gz 11471191 BLAKE2B 0b7184eb4dcb29f2a9603117d1c6fb9c729093c1ff11e18370929ec3fdbfe7bf8c0914f17260c3f613842c23359205a4a84d3e0bcd67476705e50f805bcd7b69 SHA512 959cec404f0fa7c00f78427cba902b8b9c2c0d95016fc70925d8da6d0b97a0284fc034ac92a5c5c313763db4fdcbd1b0391318596b77fe8e0cd1c7e4b3fa928b
-DIST salt-2017.7.3.tar.gz 36461646 BLAKE2B 560038b8cd49dadec3f37e3864054f32d6d6544b0f48704e94a05b83f9d6277ce456ee36813a23844b93e338ca117ad0ee605dad49e77816810f1e7244b20b27 SHA512 0452ad6cf2a9bcecd0056f0a6f4871e36bf2abe8c207c93f79e1e9ace608b7ba2158e958a71121f230969ff0b32ffd26f048e369003f844eaf3f4f9dd4b4a19a
+DIST salt-2017.7.4.tar.gz 11718327 BLAKE2B c197284ee56d039ee7942534af979f0606093ebdf40e0b11a55ca28a2f64c4b584b09b0901d5cb2c350f4ede52636e7927bbed48355d731472970eda5e32632f SHA512 79d7853c2614ed581e441babe6fbb73809816ec53aa47016b5066b771de449d4dcc999927d7e1c92c5ca68c816d27779e34e31ec1408d473a07120d62846de73
 EBUILD salt-2016.11.8.ebuild 4623 BLAKE2B e01c069e867334c3312df92d6235c85124ae2bf2d1ac591e083e928f3522bdf3a4bc77351170721b2b290356776bb82ec8ca0afd894a1d28deb46df25d2831e2 SHA512 946eccb7bbe7175d81fa3746e6c87d7880ede9ed9c1f27106c2d6d782cbc001b05976fa113e2c5dc8b03c8b5d9a6ebfb0dd739250f82bf623ae4ab0f799f6738
 EBUILD salt-2016.11.9.ebuild 4623 BLAKE2B 921ffcd61f97d98f56c6335cd4d4f87de25fe653644736ebf4ed1c214410c395fe4462fadbbcb58ef9b8716cc5bc34bb6d0becfcb17f9f246fecee8e2ab99149 SHA512 c4f1e95a633b29d711388ccd8609a8e27cdfcac908e0686ba98e9f4b94fc6c8badd11e8d684dab70aea73730409d059e1a8757aa7605f46f18e423545c99f4bf
 EBUILD salt-2017.7.2-r1.ebuild 4381 BLAKE2B e8f1a417b75b19e24474b96d8681b477045d19c1dbca1c3b4fd5e90e9aca7fa2d7f3bfa6223a8e508fd8695875e268bb12a246c4217376a3c37d6faba45e243d SHA512 2976747e1d16c4d3eb0868f489feba22fad18ce74543c6ffed5fd25d760594f1871e90ee0e6a8cf0827f131d7581cb6e50921ef9997e5f2cda32f4610cccf603
 EBUILD salt-2017.7.2.ebuild 4331 BLAKE2B fa924819154053c76ac002074d0d31867e7cd9b98b4abdae7a00a9aefd5281649d1924dc833c2f3ef8123796baec48d77c547ebcc410ce988a252986b9005486 SHA512 91f78244df90369ca0f1251618c463ef0c5ae34c2a7569c8cc23dd2cd5d4fc9000c0da521846a82d938fd1a49506d567307898c1368ffeb98babc93eabe6821b
-EBUILD salt-2017.7.3.ebuild 4422 BLAKE2B c898504a81427dd6360b979eeb65ff90b181b39b6f681c3d10d8b408eb928e58a37b31be720c9f5a2a3bfae76b05cc66cf9a139ed16487cbd42747c7f4f56326 SHA512 98a6a493a7d303b65831c96dbeb88e44afaef03a8ab9441177efc6389b901560d74c3b187abda7d28e4e224217d7001f8c513054cf1a6290a2e442d5dbe8c1f8
+EBUILD salt-2017.7.4.ebuild 4466 BLAKE2B a8364703700e39e57f6b3edfee662393b6cfa0ac5a2ed305ecdd1e4e5273389f734623bbaae847f9ec336e8343902ecffe99f5e47c7a72e8c5ee695275bfddbe SHA512 d19fd10da3d7e2a2d5bc6c4185f3cd9726aa804df44ab40ff1670a103df15a8abb08d1f87b3fa853090aad31e39aec0f64f3a7443846871b4696ab69f9392d21
 MISC metadata.xml 2288 BLAKE2B dbe7f76af8cd8a97d852536684e914e3759bd1f17e4bdea3c8c16da7c6485eee08151a8d4e41919c1ae89ba4f786783f899e23147159a4bade0009c7a668f741 SHA512 fdcea2f80fc87ab2a0db1643d71dd6d54e91d898594570af6a7505343c5d9a5a0ce4803d11460d7d3f6f533509b072819f958cbe31ca9183fabf811982526969
diff --git a/app-admin/salt/salt-2017.7.3.ebuild b/app-admin/salt/salt-2017.7.4.ebuild
index f31e0c09a66f..6dd2b29b1855 100644
--- a/app-admin/salt/salt-2017.7.3.ebuild
+++ b/app-admin/salt/salt-2017.7.4.ebuild
@@ -33,6 +33,7 @@ RDEPEND="sys-apps/pciutils
 	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
+	<www-servers/tornado-5.0[${PYTHON_USEDEP}]
 	virtual/python-futures[${PYTHON_USEDEP}]
 	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
 	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index e88693cf861a..4a897d9f4f3a 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -9,6 +9,6 @@ DIST setools-4.0.1.tar.gz 399888 BLAKE2B 688a5ed18b197391b43a89375818b50b47dda58
 DIST setools-4.1.1.tar.gz 461649 BLAKE2B a753718aa6a5de889ba7a2eea921340061edf1bcb0b572a365e858949a92d2f8a92a876be2e4bc539d85fa6029511ab6afabfbe8138cdb5a73b587a9b58551bb SHA512 2e55a3b07e2f94d7c84054f31d266567b9acc708fe2b0e16ac3ea24e8301c712bcf564ff915a6135a1a6ba6822682bb3a6530dae20161a832fb7048364acbd04
 EBUILD setools-3.3.8-r7.ebuild 3686 BLAKE2B 440799c9f4d5a944adb5bbe4f6826c1445835db6a6c0ff3a3278f516fc67b4aac83f535dbb4b306524766f947dd40dcb4ff9edd2b24ffae13a85e92c62eaca9e SHA512 984ceb81a0fd293e16097cbbf8aba94ad2418095cd21de4ac322c02ea77d1a64cce97ddceaa8495b1f6a02fe927511532d54572a8c88888014796529ade6126c
 EBUILD setools-4.0.1.ebuild 1245 BLAKE2B 93963b8a7f7a82c105d52e23645f6b81097df55095141b72d0216a66333a90cce40b0afac652bc243d98b872301a1c5fcbcd474dcf6e9fa81ed753d12c682853 SHA512 1803bfdb18d0fb1278c24ed5272bbb55327381debc023fce62f9897c1d863a8afe4d509c0514bd24f52ac77ba7d64702ee6bce4ed33467bf0bf72a3ba778efb3
-EBUILD setools-4.1.1.ebuild 1332 BLAKE2B f6da35b0c3b00d49cde181a8a2db68472fa3ef7c2811a4eea03a39c6f82c876db649cae40bfa8dd7f63719de26c60351206bccb7bbbafb401a3b70d28545feae SHA512 ed772cbd7c472a013640c352282d5686e24816dea756121dd01667608496b2bb181f4eea71a0fcd2a273d70e6703a7acfd9f4009f7ef30b721a63ef226f5b51d
-EBUILD setools-9999.ebuild 1311 BLAKE2B c287cedf48779a0ef27a08b3675642ade46079fc3e63445fd13849d0f8e5fdc65a417c3af9073799101638b8000a1fc9e17fce3c3da6269367dd516dc0df2325 SHA512 8eaf4dc0b43c38adc6e206eccb60f52e34e1049e29a8ba51ce035f61307ee28a513867732ac8fe03f0a6e02adadc9c9b7afdd3f1edecd2f5e7918a64bbf2b9e6
+EBUILD setools-4.1.1.ebuild 1342 BLAKE2B 4b30ee50bae7f8317b43c9b825e27383ddabe8a9be69345accde5485f06a1d7848f072270a82ed7196feb6a78ffae7b9fd045ad7f2bed859ec649413cc1c5706 SHA512 5ba23ec96a9ae926899e25c65c8b8455a6e6da9f76d66df91799b240ecde048fae0816db82cdb83dba99718b8f07d5d00cec7646f5d86e9972a5539c37bc2821
+EBUILD setools-9999.ebuild 1344 BLAKE2B 1ece52a683c8d99a436655acd639ac78f81e7ecc7a08730ea87bd8dcea8379738d9fe4ae1926ffefb8726f2d080ee40135f5c649fe8e8a4a911990dc1a7694d1 SHA512 c7507642de4d6a100982d6da702a47fc6a47ca9f106b248aac8c158be0fc77d1a9d4af8727f531e80570710f94260a68702f8a4892970b4b76a97ba9bc40fb81
 MISC metadata.xml 403 BLAKE2B 954bfb344e48933f43c746ed626da3851b9e887b9d1c68541fa97356992c2e80f0626198d2170b431d32489347bb6e5ee46d2577a5d672940892ec5d5fd87e4e SHA512 be645abfaf1149e2f2a9b7f0613b61f015df81a16bc6dde593513aa2ba7b4a9a8fba65520b53a2511ba65c022258f48bcd2aed3f85c273a35c94359e358a8fa6
diff --git a/app-admin/setools/setools-4.1.1.ebuild b/app-admin/setools/setools-4.1.1.ebuild
index 28df40b3ee55..f9967bce90f1 100644
--- a/app-admin/setools/setools-4.1.1.ebuild
+++ b/app-admin/setools/setools-4.1.1.ebuild
@@ -1,8 +1,8 @@
-# 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=( python2_7 python3_4 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild
index f1e79d0d9367..bc6d48e45d58 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@@ -1,8 +1,8 @@
-# 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=( python2_7 python3_4 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
 
 inherit distutils-r1
 
@@ -39,12 +39,13 @@ DEPEND="${RDEPEND}
 	test? (
 		python_targets_python2_7? ( dev-python/mock[${PYTHON_USEDEP}] )
 		dev-python/tox[${PYTHON_USEDEP}]
+		sys-apps/checkpolicy
 	)"
 
 python_prepare_all() {
 	sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
 
-	use X || local PATCHES=( "${FILESDIR}"/setools-4.1.0-remove-gui.patch )
+	use X || local PATCHES=( "${FILESDIR}"/setools-4.1.1-remove-gui.patch )
 	distutils-r1_python_prepare_all
 }
 
diff --git a/app-admin/sxid/Manifest b/app-admin/sxid/Manifest
index 571ddd8c39b5..92159ca1ded3 100644
--- a/app-admin/sxid/Manifest
+++ b/app-admin/sxid/Manifest
@@ -1,4 +1,4 @@
 DIST sxid-4.2.tar.gz 41827 BLAKE2B c436ffd1b05306508c0ab0e4236cb3968d4456ae0686357a3a2c2a587fdbdaf8e760d5ff8198188c23854b080a91a35fc27a9717ab28f6907deb887a7b455cea SHA512 ed2832a0ffa89a41eba39e116122878b830c46ee7bfb906652606cff61fe16bc28ab6e6b4a802cc2436d9b3a7bdd734a827f007e6f1ce14ca84a9015d3a37a69
 EBUILD sxid-4.2-r1.ebuild 739 BLAKE2B 73a6885a13d9fc488d24c88f2dd46e1837fa9cf2e1f26cb19bfd7255602cc0404d2a597f94852d7282d16829f05aca36ee15a25d1f344413b966eb74fa02e418 SHA512 cc0118b764ca45567a04920b8263b2f10596f18fa458b007b5648094b254307dd440cbe33b5e441496a1f0669e235d11fe732d6ea2e59e91f4a3c72e094cff3c
-EBUILD sxid-4.2-r2.ebuild 744 BLAKE2B 408f70659edf725e1ae29753f76e3ef82ddf1ffd5baed84762d01b5a22344330322342b26465283d7631f0dfabdbce9531488e0b7773f49a7dd7eb690f5ddbba SHA512 8b5d9bf40a5474495a8cc98bca0902e6ac29322ee5598e12e2998b8d5e2ee3f1f077c68a807c1f64830fed7a37cfb7390834453cd7d4062f5e181d468d666725
+EBUILD sxid-4.2-r2.ebuild 743 BLAKE2B 20616515b67bc2d1a2816db81b02fa39d8a90b8643f931d8aa7d37ff314ba1b734181e1de92eaaca74ca5faa13bde30286fb0c6d3a16cac3e3cc628f049b56e0 SHA512 9a2b80cfa3c5a03cc4717df6b2df7f114d043f7d40507d0d488675c812b01347f734131db4376498cab406f2ee2ebbcfc9dcd2896f3e35bb8e6c8ea6b7dbee93
 MISC metadata.xml 239 BLAKE2B 2c20ec7073e95bd9e1cc847b1e1fa0e79e8f22177834ae4ec3c9f4f6599ef0b626fe6eb76aa8684fe5e6493278a508f3c48552d8184a1da955078848df42a1c6 SHA512 78b96763365234c0639c1b756aad62686435ddb7c52aaa88b2afe19c978eb7cf1e0f5d16ea1f7f394d77491fa6b0d978e42d208f4fa1255d1e265432c4642323
diff --git a/app-admin/sxid/sxid-4.2-r2.ebuild b/app-admin/sxid/sxid-4.2-r2.ebuild
index a796015e62fa..2fc3745c93db 100644
--- a/app-admin/sxid/sxid-4.2-r2.ebuild
+++ b/app-admin/sxid/sxid-4.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://linukz.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="virtual/mailx"
 
diff --git a/app-admin/systemrescuecd-x86/Manifest b/app-admin/systemrescuecd-x86/Manifest
index fe74defce754..dfab588b47a3 100644
--- a/app-admin/systemrescuecd-x86/Manifest
+++ b/app-admin/systemrescuecd-x86/Manifest
@@ -30,6 +30,7 @@ DIST systemrescuecd-x86-5.1.0.iso 505047040 BLAKE2B 3653bdd2733cfe214275ab8d3a95
 DIST systemrescuecd-x86-5.1.1.iso 517359616 BLAKE2B f139a521076f0345a65bddfd999f7dd4479a9fd26e3621f2c419804228922af53f2e6d99a97919db0041e4199a95ea745d674a7b0a61f86dc5d9e10ff562d314 SHA512 a4063305da50ea8b73fb7157f46bf386b80d3ef777adabdcdd944814c801d078fe63778f166b80788b0851549b35bf6ada5940ca5a40a6c1a3e0f4c66efbea91
 DIST systemrescuecd-x86-5.1.2.iso 523479040 BLAKE2B abf6f1e3e05e382b48dcfd4ecde9f70896462418cf36057e3a42dc2366e0b56133deeb6f00363d15d94238c22fb8ac5c88b57ca6c213c9dcc299fa04def5e2cd SHA512 516e60632459dd5408f83035aa265ed4169b13f978a23960a85837c9c8b5bbab70776e22a6e6727184bd9df81cbbeff4a5819d5927ff0ff3a79036bc4c54cfdc
 DIST systemrescuecd-x86-5.2.0.iso 569669632 BLAKE2B fe31a68df650b46bd875b91c643c8f1daaa60042ea6c59ac452bb99a2792dcdcee62f1b60c329a70c95689af22c1a0fc52a966631af347258d665f55d2f6d8c0 SHA512 42da80a419aa27bea891339dc163a62bff8ba34d74c202a7fd0317592e8870a71ddc7fa9e9ded5e9d2f75dc36ec8417673074ffde60ea472815405456e34876c
+DIST systemrescuecd-x86-5.2.1.iso 570523648 BLAKE2B 9bb6b2ff7b9930f658baddbf60ef89e86171febcfb48eb0a6ce1bfea8fd3348773a9da948370f9f310dd0e992c40aa64a4ef1442f5cd7f408f847d147074cf1f SHA512 6820f079c9e97ac0d383ed9096a120e7e31771e1d41465f4cf7f5db36a7cb83ccfaae5c5e561181c3b3cb169d4cc4a9a6904a707ecde06a6de4f2456d2a658e4
 EBUILD systemrescuecd-x86-4.4.1.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
 EBUILD systemrescuecd-x86-4.5.0.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
 EBUILD systemrescuecd-x86-4.5.1.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
@@ -62,4 +63,5 @@ EBUILD systemrescuecd-x86-5.1.0.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e
 EBUILD systemrescuecd-x86-5.1.1.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e618cd04e75f1592bda9f3b5075e48fd9d9e8b53e03e47692a662f613a5e7c0802f546e463a726cd53c1ad10694269e13edba SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c
 EBUILD systemrescuecd-x86-5.1.2.ebuild 1588 BLAKE2B 88c93971c0fd71928de91c7d2d37079ef46537e92abdf7f8aeba30b272325ab3cd889a64f16aef63226bc59dd690ec9b545c0c78cba361a1c156a45560aaab5d SHA512 0a36c0954f88b29305844d133ee8d3171a8be0bbc66e22595daca50568a9ba50d715829d0deec34babeba5791819d89a767c1a197c7efd64b776b3c2f5f1fa5d
 EBUILD systemrescuecd-x86-5.2.0.ebuild 1590 BLAKE2B 5d509c43812e1012ecd4ae154caf450b27713e03a0005926aff8995d098bf49ce487c4f090b5032b5e2bf25fe03174199e7af1ad4608de955e8aadc464b86ed4 SHA512 087629ec3bee8ab3326df039262db4a07ebf9bbb98ebc9cfa00056f4fdc08f069c49a8cfecc5b2e6bb0c355037b1d34a754294339a8df9a3f0db9619117761f6
+EBUILD systemrescuecd-x86-5.2.1.ebuild 1590 BLAKE2B 5d509c43812e1012ecd4ae154caf450b27713e03a0005926aff8995d098bf49ce487c4f090b5032b5e2bf25fe03174199e7af1ad4608de955e8aadc464b86ed4 SHA512 087629ec3bee8ab3326df039262db4a07ebf9bbb98ebc9cfa00056f4fdc08f069c49a8cfecc5b2e6bb0c355037b1d34a754294339a8df9a3f0db9619117761f6
 MISC metadata.xml 585 BLAKE2B e0ce16c78e84339e1171bbf2e0aee7e27c3c32d4f795b1d176d872596330c531e6f960acd52526707464da2ad8d058035c42f3b9ff440bce139ce4b5703933d6 SHA512 51a7820398c4c637017c4a38bc0cd7b8b157e5dca57af0495a05c3df0bf09662287954bc04b24995585e8ecf3ff510177561db4dae3fadc64490d184319c18b6
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.1.ebuild
new file mode 100644
index 000000000000..7bfc35a7dd27
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+
+	if use isohybrid; then
+		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+		echo "${@}"
+		"${@}" || die "${*} failed"
+	fi
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}