gentoo resync : 05.04.2019

5 files changed, 25 insertions, 549 deletions

diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 08e3885d465c..ac1a94321437 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1,14 +1,12 @@
-DIST keystone-12.0.2.tar.gz 1492547 BLAKE2B 2f7b8b5535cb75dd846a1570fabf95c47e64b162d70c4af3e66d5f379c1a45d383b0ac9fce0a7b48875c210e9c4306476938fe8ddbb04dfc9f75cfc51ce10856 SHA512 8468ef9967b95cc75b02c5b9c66ff71033853674c5012aecf37b98c71af72451e8cdbb4070c1a9197c404f97a5948f214adf6911a3ac5d5ee23c75ec3593433b
-DIST keystone-13.0.2.tar.gz 1462728 BLAKE2B 8bcdbaecf79e2f5e1fbcd840dd27967312320c5f0fe45ed40aa1b339f627cb96ce8186ece9c0b6ab40e66e3699e5be25b0978af056aa86f6da4d5e9b6031285a SHA512 d600ea56acb14a9d34461e599375d6f1b62deb8e8cc33c939e8dec885539aaaa6f57e86e4d8334b92ecd00a68f881f3dd4805feca5cdb3de808743893ce07c68
 DIST keystone-14.0.1.tar.gz 1526741 BLAKE2B 5ae1a6f0e7a7ce737b3a0fdbd2900e8cb1541ec3b1e08228d4abf58d8021a06a6c9db654ef71c22636436f2601bd49d4934f24650e2a44c101c9610ed7b011af SHA512 87065a16ca70dc9115d331f1e0f3669ac9661f5172f9e8afbecef48e7dd9a4726438b4d757fa54bbd6095a5543427dc913f90a765e83ffb30284b1f8dbfbb8e7
+DIST keystone-14.1.0.tar.gz 1467270 BLAKE2B ed4bd8a109fe80577d210a09ddb1e49d61cee329f52ded02dfa36d7996089b62b7570bdea3d4afd69d51e91183f6011b6ab69842d4b0463efc22e5140be7e02b SHA512 ab2462f7d4bec19b37e0a482f19fd6cac3559d3fcb2422488646f18590a955bf324c260ca69f34c192508833378bba56c5ef21ee44c653dec50e3dc6e7b65425
 DIST keystone.conf.sample-14.0.1 119794 BLAKE2B 3f3c43b0972230a57b444ffe3ca41fa94a0886831941c8c259738e6575b74776a6add907fac833ba178769bbecd4bc16fe383b53344c1e3cebf3d4eacdbcb50d SHA512 5513b4e3bed869d6fa56bf6163355de2dcbf859dd8f7e76ffa3a0e7b644fe367bbde75a4e090098faba473e1fb26b061d434771e9e6bb8cb105ca609c161e5c1
+DIST keystone.conf.sample-14.1.0 119794 BLAKE2B 3f3c43b0972230a57b444ffe3ca41fa94a0886831941c8c259738e6575b74776a6add907fac833ba178769bbecd4bc16fe383b53344c1e3cebf3d4eacdbcb50d SHA512 5513b4e3bed869d6fa56bf6163355de2dcbf859dd8f7e76ffa3a0e7b644fe367bbde75a4e090098faba473e1fb26b061d434771e9e6bb8cb105ca609c161e5c1
 DIST keystone.conf.sample-2018.2.9999 119794 BLAKE2B 3f3c43b0972230a57b444ffe3ca41fa94a0886831941c8c259738e6575b74776a6add907fac833ba178769bbecd4bc16fe383b53344c1e3cebf3d4eacdbcb50d SHA512 5513b4e3bed869d6fa56bf6163355de2dcbf859dd8f7e76ffa3a0e7b644fe367bbde75a4e090098faba473e1fb26b061d434771e9e6bb8cb105ca609c161e5c1
 DIST keystone.policy.yaml.sample-14.0.1 38318 BLAKE2B a27e4ea59c99dc91dde9d1cc62340faa4b91e644dc6b8725c2d7de731e44684d8d59571e6470da3ab9fa191087a890a0b417b58b1473038bf39cfc75e5b2bad4 SHA512 95fad079d1fb77d15b9f8e507be8b1e01b493c3f1dd4e992567fe9c905bae01a058e93d59677d472ae47856b13d5cffa213d89e8e267f081a2bad1bf8e1f6036
+DIST keystone.policy.yaml.sample-14.1.0 38318 BLAKE2B a27e4ea59c99dc91dde9d1cc62340faa4b91e644dc6b8725c2d7de731e44684d8d59571e6470da3ab9fa191087a890a0b417b58b1473038bf39cfc75e5b2bad4 SHA512 95fad079d1fb77d15b9f8e507be8b1e01b493c3f1dd4e992567fe9c905bae01a058e93d59677d472ae47856b13d5cffa213d89e8e267f081a2bad1bf8e1f6036
 DIST keystone.policy.yaml.sample-2018.2.9999 38318 BLAKE2B a27e4ea59c99dc91dde9d1cc62340faa4b91e644dc6b8725c2d7de731e44684d8d59571e6470da3ab9fa191087a890a0b417b58b1473038bf39cfc75e5b2bad4 SHA512 95fad079d1fb77d15b9f8e507be8b1e01b493c3f1dd4e992567fe9c905bae01a058e93d59677d472ae47856b13d5cffa213d89e8e267f081a2bad1bf8e1f6036
-EBUILD keystone-12.0.2.ebuild 6277 BLAKE2B 116715b972cd3f39ef4f101df374075a8b679915d7ae02e8cafbc2162a08187d3cf60ae63182a8704ad982af357bb4c8def9e660c32644a68574a0b2b22fbbfb SHA512 cc9364a11ee6d0acbec1a7e6780ad697536984e800fc13ccc70862e6b15cd21092b422da4a063193acdb5c40be95366b32a5a05a2d12ca95a7ce6093a94aa694
-EBUILD keystone-13.0.2.ebuild 6182 BLAKE2B 2cb580380ec9d4cca95684475a24f970cf6b7598c0b33648aed1baa802925d254f11a5d1473a80f4bb89509332910050bc893deac0aaba62c06dba57f7aabffe SHA512 f3ab70a904ba15ce2c48ee05a3ae84e808b12e134206eb01f592d5cefbf48a8a5fe97b37e9f45adffc6a3819537e24364fcee3e1065c3cfd842577a0f0490f63
 EBUILD keystone-14.0.1.ebuild 6745 BLAKE2B dfa88d3773cd388b1f01fa03667b80643a3deb4cbfbbb4fa3d1febc3e53cb12a41560e92e9b275224a869b5c2c4c8f6479a0154c3b471827fc94fe506ba85242 SHA512 a194f98e0dc066a70dd4afd55d8f9aab68560087121c55cca2bf12b8bca7dcaffab2984eda0417bd2fe77b084a58d788244a3d58b796f8b17ffc3978c5c01c2f
-EBUILD keystone-2017.2.9999.ebuild 6298 BLAKE2B 0ffe1ffd9ce957b38693ae38470823461b2f88741e679788ab149d545584e12fd244c8f7c648bd3de0dd1903b9b12e029e7583087a3d4a4861dceacc63bbf6b3 SHA512 c1d8594a094dd25bbbb7119d41a9ce32d302b1af7b6ccf7e59fc1ecc7a2f72c99dfd07a40aed8e2338f20511d019592753c4bd491f9e3405557d694f0fbcf9c0
-EBUILD keystone-2018.1.9999.ebuild 6187 BLAKE2B 14d660926e2c4063ede68932eccf12a32a5ca8970d42b858614acb985167b797a9fd47d50ace7b06114f971243886ade20b1c32b5bac237cb36171d2657a8b43 SHA512 ff7fdb04866207596c3923a92b42fdab4bcf9ad1eb6ceb5958d23c0c6fb2eb98c2ca0ce06c92c1c4abfc0f8d561d8021a80acf0ad3c3d486e2223cc5075f8d93
+EBUILD keystone-14.1.0.ebuild 6747 BLAKE2B 8a8d06371fb4fda23f85607e8f3b3b9f3adc09d9cec54f9fad090b461cb39e3cf2a64e987423dc79ecd9422cb10f3983d7a63442f76d162428f3f4e048cee1b1 SHA512 40d46919457e4db06ad5ac798ac3f6e9d730763f9601ca7a063cc645e449e5964d97cb24e89c8024a689da805e4f4c7d1a01cabc03c5f728372db3fad16134f2
 EBUILD keystone-2018.2.9999.ebuild 6750 BLAKE2B 6036789299ec6679527ed0a862310ea34d85540d09c82ac13b5deae92dd55654b669bf46f6cc80a0e88c2abb9137713704290063dc65759abbbea11d5e3c05bb SHA512 c7394c367e842abcef65887f9dc66701352c50dd330f4f0738bf70c35fb6414028369426cfa19dd08b1e520db3c722c918182f256b15398ba9601b32caff33f6
 MISC metadata.xml 807 BLAKE2B 2e674e33b20a046cbe09e98474f3fc36dadac01f7438acbdc4bb8729b16cf8ca9bc8717b000b798d8d5501cdc14dd4365a5fa2f3e0326e160b74d7a0f8bcdbf7 SHA512 3738ac4fde08eb90daea5aeb9731cf6e303b3ad6838f07732e707d5597ee2d96ac6530f691b6ac8c0f347946b75695be98a19e224496d137bf1968bccfe156ad
diff --git a/sys-auth/keystone/keystone-12.0.2.ebuild b/sys-auth/keystone/keystone-12.0.2.ebuild
deleted file mode 100644
index 7948cd53978b..000000000000
--- a/sys-auth/keystone/keystone-12.0.2.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1 user
-
-DESCRIPTION="The Openstack authentication, authorization, and service catalog"
-HOMEPAGE="https://launchpad.net/keystone"
-SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+sqlite ldap memcached mongo mysql postgres test"
-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}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.6[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.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/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
-	>=dev-python/scrypt-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pysaml2-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/pysaml2-4.0.3[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
-	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	memcached? (
-		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
-	)
-	mongo? (
-		>=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
-		!~dev-python/pymongo-3.1[${PYTHON_USEDEP}]
-	)
-	ldap? (
-		>=dev-python/pyldap-2.4.20[${PYTHON_USEDEP}]
-		>=dev-python/ldappool-2.0.0[${PYTHON_USEDEP}]
-	)
-	|| (
-		www-servers/uwsgi[python,${PYTHON_USEDEP}]
-		www-apache/mod_wsgi[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)"
-
-#PATCHES=(
-#)
-
-pkg_setup() {
-	enewgroup keystone
-	enewuser keystone -1 -1 /var/lib/keystone keystone
-}
-
-python_prepare_all() {
-	# it's in git, but not in the tarball.....
-	sed -i '/^hacking/d' test-requirements.txt || die
-	mkdir -p ${PN}/tests/tmp/ || die
-	cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
-	sed -i 's|/usr/local|/usr|g' httpd/keystone-uwsgi-* || die
-	sed -i 's|python|python27|g' httpd/keystone-uwsgi-* || die
-	# allow useage of renamed msgpack
-	sed -i '/^msgpack/d' requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -I 'test_keystoneclient*' \
-		-e test_static_translated_string_is_Message \
-		-e test_get_token_id_error_handling \
-		-e test_provider_token_expiration_validation \
-		-e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	diropts -m 0750
-	keepdir /etc/keystone /var/log/keystone
-	insinto /etc/keystone
-	insopts -m0640 -okeystone -gkeystone
-	doins etc/keystone.conf.sample etc/logging.conf.sample
-	doins etc/default_catalog.templates
-	doins etc/policy.v3cloudsample.json etc/keystone-paste.ini
-	insinto /etc/keystone/httpd
-	doins httpd/*
-
-	fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone
-}
-
-pkg_postinst() {
-	elog "You might want to run:"
-	elog "emerge --config =${CATEGORY}/${PF}"
-	elog "if this is a new install."
-	elog "If you have not already configured your openssl installation"
-	elog "please do it by modifying /etc/ssl/openssl.cnf"
-	elog "BEFORE issuing the configuration command."
-	elog "Otherwise default values will be used."
-}
-
-pkg_config() {
-	if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then
-		einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
-		read
-		"${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
-	else
-		einfo "keystone PKI certificates directory already present, skipping configuration"
-	fi
-}
diff --git a/sys-auth/keystone/keystone-13.0.2.ebuild b/sys-auth/keystone/keystone-13.0.2.ebuild
deleted file mode 100644
index c808f34b6a0e..000000000000
--- a/sys-auth/keystone/keystone-13.0.2.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 user
-
-DESCRIPTION="The Openstack authentication, authorization, and service catalog"
-HOMEPAGE="https://launchpad.net/keystone"
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/openstack/keystone.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="+sqlite ldap memcached mongo mysql postgres test"
-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}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.9[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.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/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
-	>=dev-python/scrypt-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.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-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pysaml2-4.0.2[${PYTHON_USEDEP}]
-	<dev-python/pysaml2-4.0.3[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
-	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	memcached? (
-		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
-	)
-	mongo? (
-		>=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
-		!~dev-python/pymongo-3.1[${PYTHON_USEDEP}]
-	)
-	ldap? (
-		>=dev-python/pyldap-2.4.20[${PYTHON_USEDEP}]
-		>=dev-python/ldappool-2.0.0[${PYTHON_USEDEP}]
-	)
-	|| (
-		www-servers/uwsgi[python,${PYTHON_USEDEP}]
-		www-apache/mod_wsgi[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)"
-
-#PATCHES=(
-#)
-
-pkg_setup() {
-	enewgroup keystone
-	enewuser keystone -1 -1 /var/lib/keystone keystone
-}
-
-python_prepare_all() {
-	# it's in git, but not in the tarball.....
-	sed -i '/^hacking/d' test-requirements.txt || die
-	mkdir -p ${PN}/tests/tmp/ || die
-	cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
-	sed -i 's|/usr/local|/usr|g' httpd/keystone-uwsgi-* || die
-	sed -i 's|python|python27|g' httpd/keystone-uwsgi-* || die
-	# allow useage of renamed msgpack
-	sed -i '/^msgpack/d' requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -I 'test_keystoneclient*' \
-		-e test_static_translated_string_is_Message \
-		-e test_get_token_id_error_handling \
-		-e test_provider_token_expiration_validation \
-		-e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	diropts -m 0750
-	keepdir /etc/keystone /var/log/keystone
-	insinto /etc/keystone
-	insopts -m0640 -okeystone -gkeystone
-	doins etc/keystone.conf.sample etc/logging.conf.sample
-	doins etc/default_catalog.templates
-	doins etc/policy.v3cloudsample.json etc/keystone-paste.ini
-	insinto /etc/keystone/httpd
-	doins httpd/*
-
-	fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone
-}
-
-pkg_postinst() {
-	elog "You might want to run:"
-	elog "emerge --config =${CATEGORY}/${PF}"
-	elog "if this is a new install."
-	elog "If you have not already configured your openssl installation"
-	elog "please do it by modifying /etc/ssl/openssl.cnf"
-	elog "BEFORE issuing the configuration command."
-	elog "Otherwise default values will be used."
-}
-
-pkg_config() {
-	if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then
-		einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
-		read
-		"${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
-	else
-		einfo "keystone PKI certificates directory already present, skipping configuration"
-	fi
-}
diff --git a/sys-auth/keystone/keystone-2018.1.9999.ebuild b/sys-auth/keystone/keystone-14.1.0.ebuild
index 8d1bf3cc9713..428ffc5ea13e 100644
--- a/sys-auth/keystone/keystone-2018.1.9999.ebuild
+++ b/sys-auth/keystone/keystone-14.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,10 +11,14 @@ DESCRIPTION="The Openstack authentication, authorization, and service catalog"
 HOMEPAGE="https://launchpad.net/keystone"
 if [[ ${PV} == *9999 ]];then
 	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.conf.sample -> keystone.conf.sample-${PV}
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.policy.yaml.sample -> keystone.policy.yaml.sample-${PV}"
 	EGIT_REPO_URI="https://github.com/openstack/keystone.git"
-	EGIT_BRANCH="stable/queens"
+	EGIT_BRANCH="stable/rocky"
 else
-	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.conf.sample -> keystone.conf.sample-${PV}
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.policy.yaml.sample -> keystone.policy.yaml.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
@@ -33,11 +37,10 @@ RDEPEND="
 	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
 	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
 	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
 	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.9[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/flask-restful-0.3.5[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 	sqlite? (
 		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
@@ -71,21 +74,20 @@ RDEPEND="
 	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
 	>=dev-python/scrypt-0.8.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.21.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-messaging-5.29.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-log-3.38.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
 	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pysaml2-4.0.2[${PYTHON_USEDEP}]
-	<dev-python/pysaml2-4.0.3[${PYTHON_USEDEP}]
+	>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/pysaml2-4.5.0[${PYTHON_USEDEP}]
 	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
 	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
@@ -146,9 +148,12 @@ python_install_all() {
 	keepdir /etc/keystone /var/log/keystone
 	insinto /etc/keystone
 	insopts -m0640 -okeystone -gkeystone
-	doins etc/keystone.conf.sample etc/logging.conf.sample
+	newins "${DISTDIR}/keystone.conf.sample-${PV}" keystone.conf.sample
+	newins "${DISTDIR}/keystone.policy.yaml.sample-${PV}" keystone.policy.yaml.sample
+	doins etc/logging.conf.sample
 	doins etc/default_catalog.templates
-	doins etc/policy.v3cloudsample.json etc/keystone-paste.ini
+	doins etc/policy.v3cloudsample.json
+	doins etc/keystone-paste.ini
 	insinto /etc/keystone/httpd
 	doins httpd/*
 
diff --git a/sys-auth/keystone/keystone-2017.2.9999.ebuild b/sys-auth/keystone/keystone-2017.2.9999.ebuild
deleted file mode 100644
index e0508ad95831..000000000000
--- a/sys-auth/keystone/keystone-2017.2.9999.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 git-r3 user
-
-DESCRIPTION="The Openstack authentication, authorization, and service catalog"
-HOMEPAGE="https://launchpad.net/keystone"
-EGIT_REPO_URI="https://github.com/openstack/keystone.git"
-EGIT_BRANCH="stable/pike"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="+sqlite ldap memcached mongo mysql postgres test"
-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}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.6[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.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/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
-	>=dev-python/scrypt-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pysaml2-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/pysaml2-4.0.3[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
-	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	memcached? (
-		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
-	)
-	mongo? (
-		>=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
-		!~dev-python/pymongo-3.1[${PYTHON_USEDEP}]
-	)
-	ldap? (
-		>=dev-python/pyldap-2.4.20[${PYTHON_USEDEP}]
-		>=dev-python/ldappool-2.0.0[${PYTHON_USEDEP}]
-	)
-	|| (
-		www-servers/uwsgi[python,${PYTHON_USEDEP}]
-		www-apache/mod_wsgi[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)"
-
-#PATCHES=(
-#)
-
-pkg_setup() {
-	enewgroup keystone
-	enewuser keystone -1 -1 /var/lib/keystone keystone
-}
-
-python_prepare_all() {
-	# it's in git, but not in the tarball.....
-	sed -i '/^hacking/d' test-requirements.txt || die
-	mkdir -p ${PN}/tests/tmp/ || die
-	cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
-	sed -i 's|/usr/local|/usr|g' httpd/keystone-uwsgi-* || die
-	sed -i 's|python|python27|g' httpd/keystone-uwsgi-* || die
-	# allow useage of renamed msgpack
-	sed -i '/^msgpack/d' requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -I 'test_keystoneclient*' \
-		-e test_static_translated_string_is_Message \
-		-e test_get_token_id_error_handling \
-		-e test_provider_token_expiration_validation \
-		-e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	diropts -m 0750
-	keepdir /etc/keystone /var/log/keystone
-	insinto /etc/keystone
-	insopts -m0640 -okeystone -gkeystone
-	doins etc/keystone.conf.sample etc/logging.conf.sample
-	doins etc/default_catalog.templates
-	doins etc/policy.v3cloudsample.json etc/keystone-paste.ini
-	insinto /etc/keystone/httpd
-	doins httpd/*
-
-	fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone
-}
-
-pkg_postinst() {
-	elog "You might want to run:"
-	elog "emerge --config =${CATEGORY}/${PF}"
-	elog "if this is a new install."
-	elog "If you have not already configured your openssl installation"
-	elog "please do it by modifying /etc/ssl/openssl.cnf"
-	elog "BEFORE issuing the configuration command."
-	elog "Otherwise default values will be used."
-}
-
-pkg_config() {
-	if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then
-		einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
-		read
-		"${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
-	else
-		einfo "keystone PKI certificates directory already present, skipping configuration"
-	fi
-}