[gentoo-commits] repo/gentoo:master commit in: sys-auth/keystone/

["Matt Thode" <prometheanfire@gentoo.org>]

commit:     02aab051b08d90f724cabadc739640c711cdcaa0
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 20 23:45:40 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 23:45:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02aab051

sys-auth/keystone: stable amd64 and x86

Package-Manager: portage-2.3.0

 sys-auth/keystone/Manifest              |   1 -
 sys-auth/keystone/keystone-9.1.0.ebuild | 166 --------------------------------
 sys-auth/keystone/keystone-9.2.0.ebuild |   2 +-
 3 files changed, 1 insertion(+), 168 deletions(-)

diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 46317f0..5c7fb71 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1,3 +1,2 @@
 DIST keystone-10.0.0.tar.gz 1355520 SHA256 5317c7a0c67ec5184e3efabd513ed7bd2eb3a5d537e24d781bc252035f46ae63 SHA512 de71ac4edda12def82885dd3a664d37cf5cd243e917dd5638164e2f331991ba0faae529b136beb4931949edf097441f327aca6238a20b9c6c6497bb66c266857 WHIRLPOOL 03e71774c6b6da9aa660ad6f285fd06b06a437111005ac8da23383abd39476639c660f1052d56536ac30870ed3710908e34bd765e9fefdb82d666bd447b2a288
-DIST keystone-9.1.0.tar.gz 1183959 SHA256 3828f8907d07901a3f0516b9ee99fbd42bd9d293e4fa137d850a46487c76bad3 SHA512 2326d3ef91e614df8c0cfc68c4c4ced5f28a9c2c07e7bf6b7e55078c12d00cbb910bb53e1aee9cfcded70cfd78ab250ae5316bfc40e79609e980f0512f308fc0 WHIRLPOOL 5f6fcdcd5e2bb6dd2f7a0feaf6645f06baa5cdcaa645dc18a6fc95d2eaddcc1d160d4735631c08a90103a392b502344e8d463b917fb78a286ac4dcc806f22029
 DIST keystone-9.2.0.tar.gz 1186091 SHA256 c2131d01a84cb430ab8cd842467a63ea759274935584ca83f7dda2f42ef0cbb0 SHA512 06e66853c7b1067f97b5cd09783a941393ec993a9b1d5c05cf4c4c41c96f4b09b1528dcfab4fa7eb08e2a372599e807fd8ac77b4e01fb1434c1e905a2c33a6c2 WHIRLPOOL d1936743cf992b086a6c5c707d2ec69c284d2b55e10f5826599f765a98dc9713f5aa6f61ecc7d63c8bf66452aff04bf316e0181e4791f74e7ef8e5029712d783

diff --git a/sys-auth/keystone/keystone-9.1.0.ebuild b/sys-auth/keystone/keystone-9.1.0.ebuild
deleted file mode 100644
index 75b0a4a..00000000
--- a/sys-auth/keystone/keystone-9.1.0.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-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-1.6[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	<=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	!~dev-python/routes-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-1.3.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.0[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		dev-python/mysql-python
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		dev-python/psycopg:2
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.6[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
-	<dev-python/python-keystoneclient-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.7.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.5.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.5.7[${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}]
-	memcached? (
-		>=dev-python/python-memcached-1.48[${PYTHON_USEDEP}]
-		<=dev-python/python-memcached-1.57[${PYTHON_USEDEP}]
-	)
-	mongo? (
-		>=dev-python/pymongo-2.6.3[${PYTHON_USEDEP}]
-		<dev-python/pymongo-3.2[${PYTHON_USEDEP}]
-	)
-	ldap? (
-		>=dev-python/python-ldap-2.4[$(python_gen_usedep 'python2_7')]
-		<=dev-python/python-ldap-2.4.20[$(python_gen_usedep 'python2_7')]
-		~dev-python/ldappool-1.0[$(python_gen_usedep 'python2_7')]
-	)
-	|| (
-		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
-	distutils-r1_python_prepare_all
-}
-
-# Ignore (naughty) test_.py files & 1 test that connect to the network
-#-I 'test_keystoneclient*' \
-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() {
-	distutils-r1_python_install
-
-	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 etc/policy.json
-	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-9.2.0.ebuild b/sys-auth/keystone/keystone-9.2.0.ebuild
index 06a1163..75b0a4a 100644
--- a/sys-auth/keystone/keystone-9.2.0.ebuild
+++ b/sys-auth/keystone/keystone-9.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+sqlite ldap memcached mongo mysql postgres test"
 REQUIRED_USE="|| ( mysql postgres sqlite )"