gentoo resync : 03.11.2019

17 files changed, 615 insertions, 117 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 466add32f2e5..ca254fc347f8 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index feeefb95dd06..0b6b5bacb2d4 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1,15 +1,20 @@
 DIST keystone-14.1.0.tar.gz 1467270 BLAKE2B ed4bd8a109fe80577d210a09ddb1e49d61cee329f52ded02dfa36d7996089b62b7570bdea3d4afd69d51e91183f6011b6ab69842d4b0463efc22e5140be7e02b SHA512 ab2462f7d4bec19b37e0a482f19fd6cac3559d3fcb2422488646f18590a955bf324c260ca69f34c192508833378bba56c5ef21ee44c653dec50e3dc6e7b65425
 DIST keystone-15.0.0.tar.gz 1620138 BLAKE2B 35a8800bb25e40f01837624058d62bf829e50eefe20953785dbbb9afc646c0178031b3d8b7a02e6f9b2b273294f1acdb7ac2c17e8200929cf8dbaac5dbf284ed SHA512 b88f4ca95167a8cf0d1ed5891d692de43d43e95706b6efe8317ecc7356ee69eef85580d6f37dc9a31279c2127db946528fcd2b3612b43ccf6b952f88be097b01
+DIST keystone-16.0.0.tar.gz 1671648 BLAKE2B 172ce385a009c4c5fb83fa6fb7fa06d5be98e72064e21d4b5a62bb61bcbdfdce3702847820b71837ff54077b7b454fc0d2b95eabcbb2150f2919c7f9d3fc7299 SHA512 af4c977c4ef0fdcc89e94929c026daa1175caef96332f9dcb71a559659d8361467b2a40174847a8e7d7b70e1a151002cfe846a1be5fc7c5bfd1a8aeae3975397
 DIST keystone.conf.sample-14.1.0 119794 BLAKE2B 3f3c43b0972230a57b444ffe3ca41fa94a0886831941c8c259738e6575b74776a6add907fac833ba178769bbecd4bc16fe383b53344c1e3cebf3d4eacdbcb50d SHA512 5513b4e3bed869d6fa56bf6163355de2dcbf859dd8f7e76ffa3a0e7b644fe367bbde75a4e090098faba473e1fb26b061d434771e9e6bb8cb105ca609c161e5c1
 DIST keystone.conf.sample-15.0.0 109344 BLAKE2B 72542b4d42594bb86ba0afa4179705059c10f4d6978ae7081ba45762a4725c9340f8096099e0db6f6afc84e2b1d328b257f2f08cf25285f41032289458dfb92f SHA512 b73c232e7a58f1bdaf7c50fb6fa6e75edc14742c7e74f70a44fe8be55ac673ae851015ed24c31891647bbddfd9a6c67b57bba4ce2dc368c5cee63e9ab72c8ce9
+DIST keystone.conf.sample-16.0.0 104552 BLAKE2B 35ec8deb13239ba3d46c5ca78ea41372065a867e2715be3fb17cd43d65f1902f02d79d7bc6c6cb5c6aec19a3833d17e9dda12e8e0605919d3a28b6300d3f2cf3 SHA512 535c47e3ec39d454818c883599cf6fc304044208b71b822bdb67099728306235b2ad06ee60cfce9033375ae7b2338b03a0488267af65e900e80ed68e4fee8c5a
 DIST keystone.conf.sample-2018.2.9999 119794 BLAKE2B 3f3c43b0972230a57b444ffe3ca41fa94a0886831941c8c259738e6575b74776a6add907fac833ba178769bbecd4bc16fe383b53344c1e3cebf3d4eacdbcb50d SHA512 5513b4e3bed869d6fa56bf6163355de2dcbf859dd8f7e76ffa3a0e7b644fe367bbde75a4e090098faba473e1fb26b061d434771e9e6bb8cb105ca609c161e5c1
 DIST keystone.conf.sample-2019.1.9999 109344 BLAKE2B 72542b4d42594bb86ba0afa4179705059c10f4d6978ae7081ba45762a4725c9340f8096099e0db6f6afc84e2b1d328b257f2f08cf25285f41032289458dfb92f SHA512 b73c232e7a58f1bdaf7c50fb6fa6e75edc14742c7e74f70a44fe8be55ac673ae851015ed24c31891647bbddfd9a6c67b57bba4ce2dc368c5cee63e9ab72c8ce9
+DIST keystone.conf.sample-2019.2.9999 104552 BLAKE2B 35ec8deb13239ba3d46c5ca78ea41372065a867e2715be3fb17cd43d65f1902f02d79d7bc6c6cb5c6aec19a3833d17e9dda12e8e0605919d3a28b6300d3f2cf3 SHA512 535c47e3ec39d454818c883599cf6fc304044208b71b822bdb67099728306235b2ad06ee60cfce9033375ae7b2338b03a0488267af65e900e80ed68e4fee8c5a
 DIST keystone.policy.yaml.sample-14.1.0 38318 BLAKE2B a27e4ea59c99dc91dde9d1cc62340faa4b91e644dc6b8725c2d7de731e44684d8d59571e6470da3ab9fa191087a890a0b417b58b1473038bf39cfc75e5b2bad4 SHA512 95fad079d1fb77d15b9f8e507be8b1e01b493c3f1dd4e992567fe9c905bae01a058e93d59677d472ae47856b13d5cffa213d89e8e267f081a2bad1bf8e1f6036
 DIST keystone.policy.yaml.sample-15.0.0 6644 BLAKE2B f983189bc8e855db0b1ae92b1066840f3dd13545a1ce8af22be877df1630816fa8fae36217a828d483385e199ede73066b14beb421fe57316ae82a83e851e0f9 SHA512 e358661d4ec363ab11d7d78f6324bbe42c3382b02a1a8579de79686f7c91fe1a09b612ea81138bfcef73f0391262c9fceb3af14e8a8728839b203d281a989c4f
 DIST keystone.policy.yaml.sample-2018.2.9999 38318 BLAKE2B a27e4ea59c99dc91dde9d1cc62340faa4b91e644dc6b8725c2d7de731e44684d8d59571e6470da3ab9fa191087a890a0b417b58b1473038bf39cfc75e5b2bad4 SHA512 95fad079d1fb77d15b9f8e507be8b1e01b493c3f1dd4e992567fe9c905bae01a058e93d59677d472ae47856b13d5cffa213d89e8e267f081a2bad1bf8e1f6036
 DIST keystone.policy.yaml.sample-2019.1.9999 6644 BLAKE2B f983189bc8e855db0b1ae92b1066840f3dd13545a1ce8af22be877df1630816fa8fae36217a828d483385e199ede73066b14beb421fe57316ae82a83e851e0f9 SHA512 e358661d4ec363ab11d7d78f6324bbe42c3382b02a1a8579de79686f7c91fe1a09b612ea81138bfcef73f0391262c9fceb3af14e8a8728839b203d281a989c4f
 EBUILD keystone-14.1.0-r1.ebuild 6746 BLAKE2B e3aea1e8b18e544e209cfdeb652c71ca6089040babf2ab8e23a156252bdd0b7ff532c3b3e5247337fbf87dc8ea853289b2d9d3bb07c18f8d8bc3679191395054 SHA512 5f18e9605a44f88bb34c2fdbe500583c1758bf32c7d57645450fa846f343bd59ef3650908e69c7f119a358745ba9f2277547a48c4c0de1c8c72a1d21924c68ca
 EBUILD keystone-15.0.0.ebuild 6150 BLAKE2B c97ce39b6f2021bdb3814d0d8cdf416afd67e00067f0246e9b268768028d3e3c4a258f4d9e58ac66a171eed7054b6ff89c6c08821103ff26c0095872c8119ddf SHA512 ed2274713c53ffaa71e69a46bd46632356963f26671777e8b284a667745386e5d346b0201007cc77b572e4b95d8c1563ad1d34a2174e9806178421054917acd7
+EBUILD keystone-16.0.0.ebuild 5751 BLAKE2B 98fc9e9130eb4f532b486c83ce6d9bae681de22df517d8e3a7c10f9fe7d3ae15461f78b1b920f98a01d7e6e9d6a59503f0509a09b974a20743d4bfb943be2252 SHA512 345a69b7fd15d3e6ec11402e717c83998287ba93a8003694bb0c44ec652ad2113d99f3f55ad75f3df7da884375c69828f7dda89dccb2b563b491e5ac6ab073cd
 EBUILD keystone-2018.2.9999.ebuild 6748 BLAKE2B a6a42ae151558dd4fbfed30c15b4e4346dde0cb600a2f4fc13852305cdf1bcfbffa2ca64603ea35d4978e871e3156b86a1508a1012ff24effb2fb1991a31cd12 SHA512 8ca3b61a596b59d6e775f17e0c6366e4bb52a6ae67e9e7d759c49a5580fbf366d1097583a3e4e3648c8a81cb5e3e5a6be9463734de947ec78aad2bad1b309e18
 EBUILD keystone-2019.1.9999.ebuild 6152 BLAKE2B dc8cf65bf24f787e2bd6b7e382de13664d54b3557a356d989e80b49369219df8ef103c9a35a877efc2f2f6e790e4d1d56bd4d226a52cb86ea0af3d6137ee758a SHA512 080bc2fbb8711a9242bee0b080a0dca80591913aefd60d3b74bade94f332367e14ca1dd536fc0e01bc44f1aace547fb7fff29f3376f29b680305e5eeb8e46cce
+EBUILD keystone-2019.2.9999.ebuild 5751 BLAKE2B 98fc9e9130eb4f532b486c83ce6d9bae681de22df517d8e3a7c10f9fe7d3ae15461f78b1b920f98a01d7e6e9d6a59503f0509a09b974a20743d4bfb943be2252 SHA512 345a69b7fd15d3e6ec11402e717c83998287ba93a8003694bb0c44ec652ad2113d99f3f55ad75f3df7da884375c69828f7dda89dccb2b563b491e5ac6ab073cd
 MISC metadata.xml 807 BLAKE2B 2e674e33b20a046cbe09e98474f3fc36dadac01f7438acbdc4bb8729b16cf8ca9bc8717b000b798d8d5501cdc14dd4365a5fa2f3e0326e160b74d7a0f8bcdbf7 SHA512 3738ac4fde08eb90daea5aeb9731cf6e303b3ad6838f07732e707d5597ee2d96ac6530f691b6ac8c0f347946b75695be98a19e224496d137bf1968bccfe156ad
diff --git a/sys-auth/keystone/keystone-16.0.0.ebuild b/sys-auth/keystone/keystone-16.0.0.ebuild
new file mode 100644
index 000000000000..d46c5c4329c3
--- /dev/null
+++ b/sys-auth/keystone/keystone-16.0.0.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 user
+
+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/train/keystone.conf.sample -> keystone.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/keystone.git"
+	EGIT_BRANCH="stable/train"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/train/keystone.conf.sample -> keystone.conf.sample-${PV}
+	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/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.1.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.1.0[${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-7.0.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.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.22.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.44.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/pysaml2-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
+	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.5.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/python-ldap-3.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ldappool-2.3.1[${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
+	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
+	newins "${DISTDIR}/keystone.conf.sample-${PV}" keystone.conf.sample
+	doins etc/logging.conf.sample
+	doins etc/default_catalog.templates
+#	doins etc/policy.v3cloudsample.json
+	insinto /etc/keystone/httpd
+	doins httpd/*
+
+	fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone
+	# stupid python doing stupid things
+	rm -r "${ED}"/usr/etc
+}
+
+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-2019.2.9999.ebuild b/sys-auth/keystone/keystone-2019.2.9999.ebuild
new file mode 100644
index 000000000000..d46c5c4329c3
--- /dev/null
+++ b/sys-auth/keystone/keystone-2019.2.9999.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 user
+
+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/train/keystone.conf.sample -> keystone.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/keystone.git"
+	EGIT_BRANCH="stable/train"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/train/keystone.conf.sample -> keystone.conf.sample-${PV}
+	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/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.1.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.1.0[${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-7.0.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.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.22.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.44.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/pysaml2-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
+	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.5.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/python-ldap-3.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ldappool-2.3.1[${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
+	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
+	newins "${DISTDIR}/keystone.conf.sample-${PV}" keystone.conf.sample
+	doins etc/logging.conf.sample
+	doins etc/default_catalog.templates
+#	doins etc/policy.v3cloudsample.json
+	insinto /etc/keystone/httpd
+	doins httpd/*
+
+	fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone
+	# stupid python doing stupid things
+	rm -r "${ED}"/usr/etc
+}
+
+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/libnss-pgsql/Manifest b/sys-auth/libnss-pgsql/Manifest
index d2aefbdb7ff7..03d5131bead2 100644
--- a/sys-auth/libnss-pgsql/Manifest
+++ b/sys-auth/libnss-pgsql/Manifest
@@ -1,8 +1,4 @@
-AUX libnss-pgsql-1.4.0-gentoo.patch 398 BLAKE2B 653bc77470c93a281e991c7c518364c1aa7cf26cdb1edcf4027558646bde7c96ecf73276253a88f20490831500c5ebef8a99d3ab0f841ac175a9028c8af62131 SHA512 a9865c1d5325937d02f5684f1e69238a3e6b5a2234a36d60c1825285fbe6ea2612a9254d3d5312f6c804b488ecefc9425745ce4ca2ca333fc874dc1ba6e7ad05
-AUX libnss-pgsql-1.4.0-schema.patch 811 BLAKE2B 1dd879e4d7350ed48e5d823dff5ed8ff1192df90bfddac8035a0df3dea9953185eeae89779b80514b1bc059d1cdeac487a5a599e39bf067a8d224bea30da5c9a SHA512 07f08fdec30b46426a27a01dccc0d01dbe90a1d535333b6260fdf515e3159325b48994a98e12d9eee7fcbe6b3f63c71a187a327e0dab26a91208ff5531daf346
 AUX libnss-pgsql-1.5.0_beta-gentoo.patch 1479 BLAKE2B 12b62fa0402b595f2507af7b4a3a7f50341610439fccc773f7ad8a82a7cf40f255fa41ef01d1bf35422f9d5d09a1f831db58e1942dbd4cfa23f3894a3afd089d SHA512 b02b7cdfb711bf1b857c313df73c89544338917c0cccae2bedce43e85c0d6bfd3d15128c6024dad23f1ce23f9041e36f8c1644e3b5b24cbae9677b12c63e506b
-DIST libnss-pgsql-1.4.0.tgz 244076 BLAKE2B 9bdfbc7d4a6af547e033d6217a0241ace3520e7eab501187d65a69783ec329632821385863f2f544d057d895e1ee2ae84b4bc1d38521608fce77ba1fc849e1f0 SHA512 e7d0ea5198e44c1cad2c22f8346ff7198c028bf664fe5dbd23ec4d4a0ade32ba4aa5174eae071982a2cc385782d3d7e1a804650e4ed25c2b2b2fb5187bc8f5f8
 DIST libnss-pgsql-1.5.0-beta.tgz 305543 BLAKE2B a902315ba17539ac64caaad31cae68859bab3fff2df77ae23f4486ea6ab25db14e5d5787f4d5fcfb1ddebf0d6c58acbf66052b6d5ad4017aff810ba1bcb9f98b SHA512 cabc09337841aadb27790fb66bb55f7da70b52d4e28c717d83ad63b440ac65d8e72505e602b1324d8091ace8b9fe90510492ce0dec17148b74288a2524726cc8
-EBUILD libnss-pgsql-1.4.0.ebuild 1496 BLAKE2B 9fe460605a5aaedc76b1b5a159b4031ba581cccabf8a0af2615ecc134d64d4720f8e3d4ef233a9a0caac4bdbd239b2dfc0fdca4f1015d1b2d7ba42a2d7f4fd60 SHA512 14a152f5d7d35011fec80a152aa665e40b490d18029eb0716a22cca36b479d9d615194da116c93f6f8379822863e5ab7ca21f936a77748724b819008bdb0ab7c
-EBUILD libnss-pgsql-1.5.0_beta.ebuild 1379 BLAKE2B ffe7730ec36ecac30b3e510bad23c05695b814981ee00924df3b64f2b32bc38bae96f9f9b6ed63c8d1a5eaa3e744538d1ab0d39ce09bf860709dbe90c6098855 SHA512 3af67f8eec6894b46251586cf1e5b63751173d178e465097f570ef507d4a06dc4c447197396d9d58f69c650ad69cf63041b2ca01d28d37bdd338187f9704900a
+EBUILD libnss-pgsql-1.5.0_beta-r1.ebuild 1193 BLAKE2B 4396171cc79df8ae3fbd297a091f4bd867d6e7b3264bf7178ec8981cb0dc3458aa3edb935b900d2f90018d93064d068e12f7d81ee12fff58dfdea7f235fb0110 SHA512 0f8e69ac409249cfbadeaffc87fb6dd7122cae9a125a5312a81f9fad2fc5e615f70ff5c80f7345afbb4844ffac867ea116b9e11c7dffa2c35d897ad295761e78
 MISC metadata.xml 276 BLAKE2B a63605b4adfd773881595ba9e106b9a8c2d5591bbd49972039720418d7718d30d3b3a3675959e84259d0508c6adbfb8cf721561dcacedab2735028ad8113ab6a SHA512 9baebf6fa9794fac7cdd2157f9bddcf341cf8cbddcc63f24db64322a662eddb6ff9940d85b2f9fc7809af0554ae6a038b7916c5ccea7ccce30ff7bf6aca33db1
diff --git a/sys-auth/libnss-pgsql/files/libnss-pgsql-1.4.0-gentoo.patch b/sys-auth/libnss-pgsql/files/libnss-pgsql-1.4.0-gentoo.patch
deleted file mode 100644
index 7a2a938b5c78..000000000000
--- a/sys-auth/libnss-pgsql/files/libnss-pgsql-1.4.0-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur libnss-pgsql-1.4.0.orig/src/backend.c libnss-pgsql-1.4.0/src/backend.c
---- libnss-pgsql-1.4.0.orig/src/backend.c	2001-10-18 13:32:52.000000000 +0200
-+++ libnss-pgsql-1.4.0/src/backend.c	2003-11-28 16:14:38.000000000 +0100
-@@ -9,7 +9,7 @@
-  */
- 
- #include "nss-pgsql.h"
--#include <postgresql/libpq-fe.h>
-+#include <libpq-fe.h>
- #include <stdlib.h>
- #include <string.h>
- #include <stdio.h>
diff --git a/sys-auth/libnss-pgsql/files/libnss-pgsql-1.4.0-schema.patch b/sys-auth/libnss-pgsql/files/libnss-pgsql-1.4.0-schema.patch
deleted file mode 100644
index 6d2b338f45cf..000000000000
--- a/sys-auth/libnss-pgsql/files/libnss-pgsql-1.4.0-schema.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- conf/dbschema.sql.orig	2005-05-04 04:27:51.000000000 +0200
-+++ conf/dbschema.sql	2006-11-11 22:37:01.000000000 +0100
-@@ -19,15 +19,16 @@
- 	"gecos" character varying(128),
- 	"homedir" character varying(256) NOT NULL,
- 	"shell" character varying DEFAULT '/bin/bash' NOT NULL,
--	PRIMARY KEY ("username")
-+	PRIMARY KEY ("username"),
-+	UNIQUE ("uid")
- );
- 
- CREATE TABLE "usergroups" (
- 	"gid" int4 NOT NULL,
- 	"uid" int4 NOT NULL,
- 	PRIMARY KEY ("gid", "uid"),
--	CONSTRAINT "ug_gid_fkey" FOREIGN KEY ("gid") REFERENCES "groups"("gid"),
--	CONSTRAINT "ug_uid_fkey" FOREIGN KEY ("uid") REFERENCES "accounts"("uid")
-+	CONSTRAINT "ug_gid_fkey" FOREIGN KEY ("gid") REFERENCES "group_table"("gid"),
-+	CONSTRAINT "ug_uid_fkey" FOREIGN KEY ("uid") REFERENCES "passwd_table"("uid")
- );
-   
- CREATE TABLE "shadow_table" (
diff --git a/sys-auth/libnss-pgsql/libnss-pgsql-1.4.0.ebuild b/sys-auth/libnss-pgsql/libnss-pgsql-1.4.0.ebuild
deleted file mode 100644
index 8a9ab45b8768..000000000000
--- a/sys-auth/libnss-pgsql/libnss-pgsql-1.4.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit autotools eutils multilib
-
-KEYWORDS="~x86"
-
-DESCRIPTION="Name Service Switch module for use with PostgreSQL"
-HOMEPAGE="http://pgfoundry.org/projects/sysauth/"
-SRC_URI="http://pgfoundry.org/frs/download.php/605/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-db/postgresql
-		app-text/xmlto"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-schema.patch"
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		--libdir=/lib \
-		--with-docdir=/usr/share/doc/${PF}/html || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	insinto /$(get_libdir)
-	doins src/.libs/libnss_pgsql.so.2.0.0
-	dosym libnss_pgsql.so.2.0.0 /lib/libnss_pgsql.so.2
-	dosym libnss_pgsql.so.2.0.0 /lib/libnss_pgsql.so
-
-	dodoc AUTHORS ChangeLog NEWS README
-	dohtml doc/*.{png,html}
-	insinto /usr/share/doc/${PF}/examples
-	doins conf/*
-}
-
-pkg_postinst() {
-	elog "Next steps:"
-	elog "1. Create the required tables in the database:"
-	elog "   $ psql a_database -f ${ROOT}usr/share/${PN}/conf/dbschema.sql"
-	elog "2. Create the configuration file '/etc/nss-pgsql.conf'"
-	elog "   You can copy the example from ${ROOT}usr/share/doc/${PF}/examples/nss-pgsql.conf"
-	elog "3. Edit /etc/nsswitch.conf to use the NSS service 'pgsql'"
-	elog "   An example is available here: ${ROOT}usr/share/doc/${PF}/examples/nsswitch.conf"
-}
diff --git a/sys-auth/libnss-pgsql/libnss-pgsql-1.5.0_beta.ebuild b/sys-auth/libnss-pgsql/libnss-pgsql-1.5.0_beta-r1.ebuild
index a2176e41eb8f..cbf21a095fd5 100644
--- a/sys-auth/libnss-pgsql/libnss-pgsql-1.5.0_beta.ebuild
+++ b/sys-auth/libnss-pgsql/libnss-pgsql-1.5.0_beta-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit autotools eutils multilib
+inherit autotools
 
 KEYWORDS="~amd64 ~x86"
 
@@ -18,30 +18,23 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-db/postgresql"
+RDEPEND="dev-db/postgresql:*"
 DEPEND="${RDEPEND}
 		app-text/xmlto"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
+src_prepare() {
+	eapply "${FILESDIR}/${P}-gentoo.patch"
+	eapply_user
 	eautoreconf
 }
 
-src_compile() {
-	econf \
-		--htmldir=/usr/share/doc/${PF}/html || die "econf failed"
-	emake || die "emake failed"
-}
-
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 	find "${D}" -name '*.la' -delete || die
 
-	dodoc AUTHORS ChangeLog NEWS README || die
-	insinto /usr/share/doc/${PF}/examples
-	doins conf/* || die
+	dodoc AUTHORS ChangeLog NEWS README
+	docinto examples
+	dodoc conf/*
 }
 
 pkg_postinst() {
diff --git a/sys-auth/pam_p11/Manifest b/sys-auth/pam_p11/Manifest
index ba9a0353c4ae..0be264ca9e99 100644
--- a/sys-auth/pam_p11/Manifest
+++ b/sys-auth/pam_p11/Manifest
@@ -1,3 +1,5 @@
 DIST pam_p11-0.3.0.tar.gz 422806 BLAKE2B 60ac1cc0b8fff536553b2502f906f7730c1be760b2948389f5a6399979f994b3fcfa04226f1605c64d02bad47f46c9bd28fa076d819814b9121241b034407d4b SHA512 f89cf57f6365c25e54830d18180aad7d14b7eaef82eb0d419bcc3d8b881e1e07993a2c4e635e90b4f2fb779fec24fa0d912388f898d726e387bc0db63d772d49
+DIST pam_p11-0.3.1.tar.gz 422940 BLAKE2B b4c6d60a7ee31d808b9e928339f6e8aba3b56655b9f408ff7cd15ff4a397c89c00d00b0bbe70fc0b7bd6c6a246acd9c313c8f5b21a88e1474355c3407ff694f0 SHA512 caaa6882d4c007dfaba5974dc420bc45aa225f705679d170fdc9576aa49cbd24bba6985f14eb2bca97d4fe37aaf6088641add912dfbb93740b7d634f448addcf
 EBUILD pam_p11-0.3.0.ebuild 658 BLAKE2B 07d4d2bd9bedc19d3a34f5c0ad0dafaca7d9d2407f649f88fa4a6a437684dfae73a25b50e1c3f850131470686bbf644ef2d409ba62f373a5051689c70f3992e7 SHA512 44cc0e84a8113d123ffb6eeb82019f4e7acb0a86190080471c44245107e66ef2ea8bdfccdff037a7f5323e526e97a5143c682d61dfe8d32086fe7df184130b68
+EBUILD pam_p11-0.3.1.ebuild 662 BLAKE2B 8afdf6415b120513397f20b5eb1d2bcbd83cb6a5cab9c6ed947e35479e45b334d4c82abfe1a92ee49c5b0276c066a52d0b484731d02bd2a5fa743188b308173b SHA512 c01ee670b1bf2e1799a0ff590d93084f32b9672575e3210346db0a3529e12ba32b03a04c8b5e21082363676b5ae86cac7b4de2f9de22ff6aef7580ef127a3a37
 MISC metadata.xml 382 BLAKE2B 8617a56b292f5844a178afcbaaf56ad5e1c221871fba9012f19e2b94f2a745e2a39e0298d4edc1b30a4aa62bddfa0afef1751966292d2b9e3117832787e0da8d SHA512 1747f4d94dd0a90448d38557beae49c4532f752a33956a54795a58262d42c259d7371a9ebe5a5ac347a7d1178d7932c7f40bce363c476f7a199ff03129fdaf6c
diff --git a/sys-auth/pam_p11/pam_p11-0.3.1.ebuild b/sys-auth/pam_p11/pam_p11-0.3.1.ebuild
new file mode 100644
index 000000000000..95a5dbe668c4
--- /dev/null
+++ b/sys-auth/pam_p11/pam_p11-0.3.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools pam
+
+DESCRIPTION="PAM module for authenticating against PKCS#11 tokens"
+HOMEPAGE="https://github.com/opensc/pam_p11/wiki"
+SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+RDEPEND="sys-libs/pam
+	dev-libs/libp11:=
+	dev-libs/openssl:0="
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	econf --with-pamdir="$(getpam_mod_dir)"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sys-auth/pam_passwdqc/Manifest b/sys-auth/pam_passwdqc/Manifest
index 23e7dead0257..378ade47fed9 100644
--- a/sys-auth/pam_passwdqc/Manifest
+++ b/sys-auth/pam_passwdqc/Manifest
@@ -1,5 +1,5 @@
 AUX pam_passwdqc-1.0.5-makefile.patch 1245 BLAKE2B b0bca31fa21a9d05093093d04a045288c33a8f75fb366a09b54f64e438dfb83599ba064a56c4aa3d0833699dc8874c3ace562476b9eb938add899da39b4364b8 SHA512 d4c5ca882f17b51ababc62a863653f70603763de99a0b8db9129d319100dbe4055b3ad7a9dbdcc6f3bca0be06521a7b5ef20856ef8e5b954097040a91b850d35
 DIST pam_passwdqc-1.0.5.tar.gz 29973 BLAKE2B e2edce3fa63994afc1f1fe65709ad241662c81113b67f6d17e1c5b36d6ea48be1d7f2cde77766fe2b92da2c22546a71122b95dc70b193edacfbdfd219f56ca6c SHA512 8ae6cb4cc520b06b05fadf60ac360964721a8a1e4481aff9cd7247c203e62b58d3aed4c14ba687b303de820689e0f5cdcf070fd396b7e13b0aae4cc5d1442235
 EBUILD pam_passwdqc-1.0.5.ebuild 1092 BLAKE2B f1b6d6918ae6ebac764f7f2d5ca5fc113aa1846168d3126a13ffbf98b6dedf246b4cf7eb2dfc3a12b89b3e404a73df7dc3c17228ded5f060ce5573bfeb284e3e SHA512 5defeade0c95812092b7ae3a0fd43b406d65144ac31817c248da7d548ce340065c950c52f3e4c6e7d4e6ca4046ebf16f2210c65f807d31e6a8cd8e35db6f0b84
-EBUILD pam_passwdqc-1.3.0.ebuild 435 BLAKE2B 74e358f6be887bd722c617176d60e5285598c2466a433de5bcb8068583dd27c11c7d72148d5caadaed1587ba4ef5b398d848c5344ca9422da54d0edb777e798a SHA512 7fd1f068f84cf45bb4715a49d7ae1dd1560906acf40d448b63158a8eff10ea9b355f8125b26d9f7cf0a6d8bb4b87dc26050592f3f08ad3d706cbe96ff3cffbd4
+EBUILD pam_passwdqc-1.3.0.ebuild 432 BLAKE2B 50a89fe8b7c1046a88e545b6caee7734aab75ac7172ea3351dd75b301bb468056e9ad73f5848d404c54993df74872b89b5cbb89bc5a5ad6645504be1ce300da7 SHA512 562bac40aa344be7640b23edd8f3c9946c8a8aa3526d67d21f10d011bb95e948271bfb52896e05ada7fcb7a9dbb08d71d1ec01c926cb1f46b7da0f3374b04e1b
 MISC metadata.xml 533 BLAKE2B 4242a27a758a3c104ccf3ee1a3f15419d1870b299ded8f65ae5016ea5223eafbef03ecf7df0c2c5cfa8fc9269b43fa0a31d630e3e127daf0c9c970a84b6b4c5b SHA512 78bba55d003eb7fdfef30534078a683c16274db018ca16f89ecf4169a27dadfe56c84b140dbb30c2a4cd812a78c240518224d195197656669212e5aee7bb8356
diff --git a/sys-auth/pam_passwdqc/pam_passwdqc-1.3.0.ebuild b/sys-auth/pam_passwdqc/pam_passwdqc-1.3.0.ebuild
index 15bd0e7d6ceb..c029340e791e 100644
--- a/sys-auth/pam_passwdqc/pam_passwdqc-1.3.0.ebuild
+++ b/sys-auth/pam_passwdqc/pam_passwdqc-1.3.0.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.openwall.com/passwdqc/"
 
 LICENSE="Openwall BSD public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="sys-auth/passwdqc[pam]"
 RDEPEND="${DEPEND}"
diff --git a/sys-auth/passwdqc/Manifest b/sys-auth/passwdqc/Manifest
index 132416724835..5f8e696482d6 100644
--- a/sys-auth/passwdqc/Manifest
+++ b/sys-auth/passwdqc/Manifest
@@ -1,4 +1,4 @@
 AUX passwdqc-1.3.0-build.patch 1773 BLAKE2B e954aa56f4f12c57430b9c53cac9220360b6450a747fd50305db8838638833e5f76fc893be762593f89ab02b665499fbc4063dfd7ad3019134ef81771e3dcc50 SHA512 da43381deab4c39e8c905187f17e49379e44b96c729d229a1fa5aff067b510fae5cbb107896fd83273cc8f41e916023eff5d1b1f37ad739e4de3cf3945f289b8
 DIST passwdqc-1.3.0.tar.gz 48833 BLAKE2B bf6353749376ca8b52a8aac89b05561d4a0dde54133361b77228dd4d35f2e1e75f0b53a0f9c4fc2f6be5717110c1d762e2aa76f6461281b60fa3bdc9b19f2f7d SHA512 d9c2fd075ed4ff1f1dfa63fe40010d446abf8db306cacc77fd1e429fbd2dd1a6d2e4e91df46beb4c30bc30ff0cdd183ba85cefd362455ead9629d3a1c4eefece
-EBUILD passwdqc-1.3.0.ebuild 1715 BLAKE2B 3c2adf2387e8eee666951432427e8351baae7caef85af74152b4799b6cae016121904786e759423ee8fb602d440527f7b1a170f23c267faee69f87d8891ec948 SHA512 8e4b6caceb9e90f81cdb5d4c206719aac168ddb7efd440374a61a3fa94e1b6e6b391dde6f8421d66489471da4a4f1eaeb8bf5732107b3fc86be0266a1ef09703
+EBUILD passwdqc-1.3.0.ebuild 1712 BLAKE2B 1718f329b2210024cfa97f7af82008b4260b49ba16f59df043581341f169fadd33b47630afa4b1982595d15442a47a4569a37139609d7a076d1d1d3f1b192ec2 SHA512 17e4bf65f7e61bffd873f2e61837698c1c4d01b0e3b42968b2e223e6a63cf862963d988e58cd468c45dbbc0ba66a84a573e8a25f060114a1f8ea58bed52b6e34
 MISC metadata.xml 611 BLAKE2B 1ff77c9fbf801d78d8ec7fde035f0b9d2b738ae9b773f30716cdbf603024709406c83e5360d7217ed925ab3571e6eb488c092f6ac9582141f139ac9984f1a600 SHA512 6f21bb9ce2f16550d09e37bccb2979a4f7211ffbcca394903bbcd10391a49564bcf7b10907589a166fdb09c4c6c4e7040f00df951560a213f7f85fb945343d1d
diff --git a/sys-auth/passwdqc/passwdqc-1.3.0.ebuild b/sys-auth/passwdqc/passwdqc-1.3.0.ebuild
index a7ec87bbfa60..7a54c9af380a 100644
--- a/sys-auth/passwdqc/passwdqc-1.3.0.ebuild
+++ b/sys-auth/passwdqc/passwdqc-1.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.openwall.com/${PN}/${P}.tar.gz"
 
 LICENSE="Openwall BSD public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="pam utils"
 
 RDEPEND="
diff --git a/sys-auth/sssd/Manifest b/sys-auth/sssd/Manifest
index 4ccb53235afe..6642edea075c 100644
--- a/sys-auth/sssd/Manifest
+++ b/sys-auth/sssd/Manifest
@@ -6,7 +6,9 @@ AUX sssd.service 341 BLAKE2B 0cffcd43786633aa8e5bb42c54741cba676021c5a07554b0849
 DIST sssd-1.16.3.tar.gz 6217114 BLAKE2B eefaf8de466d0d76e9a4b60aefef6eb63c17a55b9a1f2e07e973a61d71cbe5432e92357656a1eb353d45bbc2fa92290cef45898d0b315d4a4c4074652ff25a23 SHA512 6165923f652f624bbe3ddc625ae682c4867eb7a20652d0cf74bbb8dda2307c917d3189ede26fd21a4fb5fd5926149271a65fa09f3affe928029ed99e6422b728
 DIST sssd-2.1.0.tar.gz 6463331 BLAKE2B 9226370dc384c58841d944bdf9b067d953bf138ee7a289f01a4b8bb5d09beee3b9f21609989123d8f4f9fc13237670d61e32dcb194555ddc6785c598ce78d08c SHA512 12a7e5b89d462350af3c43e15b24a437dd985ac4a2e419d5e52cc0d05c6eacb9319d39b23681595ef860120cd1ae6e5fb265054afeddcb05d3d5f5de5d6ffa63
 DIST sssd-2.2.0.tar.gz 6642715 BLAKE2B e6c16ca69effe59769fc166c02203faee445ebe2bf551c6a1460bdee2474ccbce1a38b3aa59b1ae4a79bb170696a784b800a9299025bf6a58bc9aeb94b946338 SHA512 9ebd8784e1f0c72cb808bbc153c0b0aa9bf507938f78336a260073a89b49350dc2c6172653509738ea7a50bb9da596725e1d6c92f99c7a03308aa42f6378dbbb
+DIST sssd-2.2.2.tar.gz 6767578 BLAKE2B e0eedaf1da1de953903730c96479af0709ee14dd83eca82a11316dc96c29573b5f3de5965f386d5c12a69e7d98b6168c9d197bbd46ac51f0122feababe52dfe1 SHA512 4cce8fdbcc05d1469dad5ba987cb0f9bc33702b37f85e8e248975461bb50b0740fec92ff213bdb640b506405be7ead936ff253ab02d4a27205ddf20cc0e54801
 EBUILD sssd-1.16.3-r3.ebuild 6052 BLAKE2B f1ee28213555ea2ab55d1249c4d27684b1f544130f1237efa14f573bba40ec43e6d496bb3a5b8c5728c3e3b75db125c10012af075b2369e03344d08a42e370fa SHA512 92ead153c2d436e3e13293b903130cdd425f62f1b37c32caa179cd251c9b83871cf04a858a1df1ce4dea340a5992b4bd06b7b21bb34ed0127153330c012efb11
 EBUILD sssd-2.1.0-r1.ebuild 5972 BLAKE2B 3bc60e481be6693f2651ea7b14ac810ea36287d634d9d5cd867244398701c72629a76b21746f9857f8c4b1fdef8562a42b3de9aebb8272b3dbd7a4f8459dfb2d SHA512 60649c34631d45abbc419e5ff6685279c1e2d821a2dc0f0b6cb721f5503c290e8f7f3274666f3435ec4ed7a6570459668eb320f376ffee55626233b44cd45ef9
 EBUILD sssd-2.2.0-r1.ebuild 5972 BLAKE2B 3bc60e481be6693f2651ea7b14ac810ea36287d634d9d5cd867244398701c72629a76b21746f9857f8c4b1fdef8562a42b3de9aebb8272b3dbd7a4f8459dfb2d SHA512 60649c34631d45abbc419e5ff6685279c1e2d821a2dc0f0b6cb721f5503c290e8f7f3274666f3435ec4ed7a6570459668eb320f376ffee55626233b44cd45ef9
+EBUILD sssd-2.2.2.ebuild 5972 BLAKE2B 3bc60e481be6693f2651ea7b14ac810ea36287d634d9d5cd867244398701c72629a76b21746f9857f8c4b1fdef8562a42b3de9aebb8272b3dbd7a4f8459dfb2d SHA512 60649c34631d45abbc419e5ff6685279c1e2d821a2dc0f0b6cb721f5503c290e8f7f3274666f3435ec4ed7a6570459668eb320f376ffee55626233b44cd45ef9
 MISC metadata.xml 1090 BLAKE2B 7085d66b3454b3756d7dab49b6d9525c4ba90156d07f2710f4eb3c5bf3bbd9d10412d511dc0fe091ac4c5291f87a258fac6adbe9732d20a96660f4e0a66cf247 SHA512 2cbf20cd206a45bd82b1416926a02de06bf40b1b4168f19202c367cf8e24d764745b8a5116366ee10520cae15800e17b43d3000995419117f02b2d37474f142e
diff --git a/sys-auth/sssd/sssd-2.2.2.ebuild b/sys-auth/sssd/sssd-2.2.2.ebuild
new file mode 100644
index 000000000000..e89158a50907
--- /dev/null
+++ b/sys-auth/sssd/sssd-2.2.2.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic linux-info multilib-minimal pam systemd toolchain-funcs
+
+DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
+HOMEPAGE="https://pagure.io/SSSD/sssd"
+SRC_URI="http://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl autofs +locator +netlink nfsv4 nls +manpages samba selinux sudo ssh test"
+
+COMMON_DEP="
+	>=sys-libs/pam-0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/popt-1.16
+	dev-libs/glib:2
+	>=dev-libs/ding-libs-0.2
+	>=sys-libs/talloc-2.0.7
+	>=sys-libs/tdb-1.2.9
+	>=sys-libs/tevent-0.9.16
+	>=sys-libs/ldb-1.1.17-r1:=
+	>=net-nds/openldap-2.4.30[sasl]
+	net-libs/http-parser
+	>=dev-libs/libpcre-8.30
+	>=app-crypt/mit-krb5-1.10.3
+	dev-libs/jansson
+	net-misc/curl
+	locator? (
+		>=app-crypt/mit-krb5-1.12.2[${MULTILIB_USEDEP}]
+		>=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}]
+	)
+	>=sys-apps/keyutils-1.5:=
+	>=net-dns/c-ares-1.7.4
+	>=dev-libs/nss-3.12.9
+	selinux? (
+		>=sys-libs/libselinux-2.1.9
+		>=sys-libs/libsemanage-2.1
+	)
+	>=net-dns/bind-tools-9.9[gssapi]
+	>=dev-libs/cyrus-sasl-2.1.25-r3[kerberos]
+	>=sys-apps/dbus-1.6
+	acl? ( net-fs/cifs-utils[acl] )
+	nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) )
+	nls? ( >=sys-devel/gettext-0.18 )
+	virtual/libintl
+	netlink? ( dev-libs/libnl:3 )
+	samba? ( >=net-fs/samba-4.10.2[winbind] )
+	"
+
+RDEPEND="${COMMON_DEP}
+	>=sys-libs/glibc-2.17[nscd]
+	selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
+	"
+DEPEND="${COMMON_DEP}
+	test? ( dev-libs/check )
+	manpages? (
+		>=dev-libs/libxslt-1.1.26
+		app-text/docbook-xml-dtd:4.4
+		)"
+
+CONFIG_CHECK="~KEYS"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/ipa_hbac.h
+	/usr/include/sss_idmap.h
+	/usr/include/sss_nss_idmap.h
+	/usr/include/wbclient_sssd.h
+	# --with-ifp
+	/usr/include/sss_sifp.h
+	/usr/include/sss_sifp_dbus.h
+	# from 1.15.3
+	/usr/include/sss_certmap.h
+)
+
+pkg_setup(){
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	sed -i 's:#!/sbin/runscript:#!/sbin/openrc-run:' \
+		"${S}"/src/sysv/gentoo/sssd.in || die "sed sssd.in"
+
+	default
+	eautoreconf
+	multilib_copy_sources
+}
+
+src_configure() {
+	local native_dbus_cflags=$($(tc-getPKG_CONFIG) --cflags dbus-1)
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# set initscript to sysv because the systemd option needs systemd to
+	# be installed. We provide our own systemd file anyway.
+	local myconf=()
+	#Work around linker dependency problem.
+	append-ldflags "-Wl,--allow-shlib-undefined"
+
+	myconf+=(
+		--localstatedir="${EPREFIX}"/var
+		--enable-nsslibdir="${EPREFIX}"/$(get_libdir)
+		--with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
+		--enable-pammoddir="${EPREFIX}"/$(getpam_mod_dir)
+		--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/samba/ldb
+		--with-os=gentoo
+		--with-nscd
+		--with-unicode-lib="glib2"
+		--disable-rpath
+		--disable-silent-rules
+		--sbindir=/usr/sbin
+		--without-kcm
+		$(use_with samba libwbclient)
+		--with-secrets
+		$(multilib_native_use_with samba)
+		$(multilib_native_use_enable acl cifs-idmap-plugin)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with selinux semanage)
+		$(use_enable locator krb5-locator-plugin)
+		$(multilib_native_use_with nfsv4 nfsv4-idmapd-plugin)
+		$(use_enable nls )
+		$(multilib_native_use_with netlink libnl)
+		$(multilib_native_use_with manpages)
+		$(multilib_native_use_with sudo)
+		$(multilib_native_use_with autofs)
+		$(multilib_native_use_with ssh)
+		--with-crypto="nss"
+		--with-initscript="sysv"
+		--without-python2-bindings
+		--without-python3-bindings
+
+		KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config
+	)
+
+	if ! multilib_is_native_abi; then
+		# work-around all the libraries that are used for CLI and server
+		myconf+=(
+			{POPT,TALLOC,TDB,TEVENT,LDB}_{CFLAGS,LIBS}=' '
+			# ldb headers are fine since native needs it
+			# ldb lib fails... but it does not seem to bother
+			{DHASH,COLLECTION,INI_CONFIG_V{0,1,1_1}}_{CFLAGS,LIBS}=' '
+			{PCRE,CARES,SYSTEMD_LOGIN,SASL,GLIB2,DBUS,CRYPTO}_{CFLAGS,LIBS}=' '
+
+			# use native include path for dbus (needed for build)
+			DBUS_CFLAGS="${native_dbus_cflags}"
+
+			# non-pkgconfig checks
+			ac_cv_lib_ldap_ldap_search=yes
+			--without-secrets
+			--without-libwbclient
+			--without-kcm
+			--with-crypto=""
+		)
+
+		use locator || myconf+=(
+				KRB5_CONFIG=/bin/true
+		)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake libnss_sss.la pam_sss.la
+		use locator && emake sssd_krb5_locator_plugin.la
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake -j1 DESTDIR="${D}" "${_at_args[@]}" install
+	else
+		# easier than playing with automake...
+		dopammod .libs/pam_sss.so
+
+		into /
+		dolib.so .libs/libnss_sss.so*
+
+		if use locator; then
+			exeinto /usr/$(get_libdir)/krb5/plugins/libkrb5
+			doexe .libs/sssd_krb5_locator_plugin.so
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	insinto /etc/sssd
+	insopts -m600
+	doins "${S}"/src/examples/sssd-example.conf
+
+	insinto /etc/logrotate.d
+	insopts -m644
+	newins "${S}"/src/examples/logrotate sssd
+
+	newconfd "${FILESDIR}"/sssd.conf sssd
+	newinitd "${FILESDIR}"/sssd sssd
+
+	keepdir /var/lib/sss/db
+	keepdir /var/lib/sss/deskprofile
+	keepdir /var/lib/sss/gpo_cache
+	keepdir /var/lib/sss/keytabs
+	keepdir /var/lib/sss/mc
+	keepdir /var/lib/sss/pipes/private
+	keepdir /var/lib/sss/pubconf/krb5.include.d
+	keepdir /var/lib/sss/secrets
+	keepdir /var/log/sssd
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+multilib_src_test() {
+	default
+}
+
+pkg_postinst(){
+	elog "You must set up sssd.conf (default installed into /etc/sssd)"
+	elog "and (optionally) configuration in /etc/pam.d in order to use SSSD"
+	elog "features. Please see howto in	https://docs.pagure.org/SSSD.sssd/design_pages/smartcard_authentication_require.html"
+}