commit:     6fb4442a069e85e55c1956f3236c24d577079fed
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  7 20:36:47 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Aug  7 20:37:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fb4442a

sys-auth/keystone: cleanup

Package-Manager: portage-2.2.28

 sys-auth/keystone/Manifest                 |   2 -
 sys-auth/keystone/keystone-9.0.0-r1.ebuild | 164 ----------------------------
 sys-auth/keystone/keystone-9.0.2.ebuild    | 166 -----------------------------
 3 files changed, 332 deletions(-)

diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 83bfd9e..a27f48d 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1,6 +1,4 @@
 DIST keystone-8.0.1.tar.gz 1067603 SHA256 
4d1a76e879eb5fc977692892d1dce46a0190bf17d57056d634d377ea4511b475 SHA512 
2b61b8dc38df3e3fa7c684b55f19b48391f087f00a6156732e1d6d207f36f6d23fff3adaaacbb4b7629686b4fce8a963189051bb0c2f0dad02c219832dc64af5
 WHIRLPOOL 
812c553d493a26adc0b6c76db3b9b8e7da35593425ac7bf986aa3b6e1b51f3816f95b4a84339902e16f8a3d61a6bd053ab4e310e77f8ce874ed4165395cd9799
 DIST keystone-8.1.0.tar.gz 1070643 SHA256 
2a068686c3392215547c51579b6ffe782c61629881b77c204340f942713395ba SHA512 
ae13a6f615e9afe10ca8ccbf47c2e1ded2804e2f185f6b96446bf02d4f428c461971614490fbf25220693fae79b478d4ff2a78c414f00d77b1f0014845bb72df
 WHIRLPOOL 
a6a66ccbe151d51189e0f2a5dd393766ab8cb39085bab985f6818e69c7448d145a8d0937c66399bcc15c298338021069d782f41102c6258ad15a546d32d5d4da
 DIST keystone-8.1.2.tar.gz 1073146 SHA256 
9871dcef23774e28cef590514d162b21ef375b4ebb871e68b70bdd9231eb8e38 SHA512 
e610ea2e3164d0f26eedf3c0b494d08b89023eb9579439793425d81e67e203ef2209192fb1d9028b6246b61069f580077184217ce5ef2745e2a28667e2675937
 WHIRLPOOL 
765f73ff0768498fdb67246a424dee8c8f2069fee709a3b0991000860e3802c1fde627cdbd2246198b60cc0b6069f5b061825a478ef886d85329f246431b6ccb
-DIST keystone-9.0.0.tar.gz 1181342 SHA256 
ff8e14ef7880bcfdb83a81815f4686f5484d68ecac9dce48155403781643fa91 SHA512 
08dbbb36f0cc22db8725797f75e88149777541a312484170cb2efb8f1cfe119ba385822f92674841745a41601d725db1f0b880710398ca69c3ad117b6e46607a
 WHIRLPOOL 
4b8151b5fe8f5cbf0ab68a5dda806fe59b4739687cc0cf2a13b62f005a337dc94f725046d3edb49c62797921e369468f0675956c29761361824cea2275c029f4
-DIST keystone-9.0.2.tar.gz 1180101 SHA256 
2420f3ac6dee1982708786827c676278976fc493f47e2d4a44421bc0f3f87a89 SHA512 
40143897a716c7dd331593f43a488e17ef56a9bb8622e40ef9bbaaa739b44fab281ea2d598727de80c7820bd6e028074c0104b304a47d8f9df8ec38e635fd2a0
 WHIRLPOOL 
dfdfcdcb0288413fcd6bc2566d427b06c7ffecfc53db7b717b36cd6df3d25a9f2562ee35051984456c438158026e877f8a9999c149e38a040c62594a9d78ad7c
 DIST keystone-9.1.0.tar.gz 1183959 SHA256 
3828f8907d07901a3f0516b9ee99fbd42bd9d293e4fa137d850a46487c76bad3 SHA512 
2326d3ef91e614df8c0cfc68c4c4ced5f28a9c2c07e7bf6b7e55078c12d00cbb910bb53e1aee9cfcded70cfd78ab250ae5316bfc40e79609e980f0512f308fc0
 WHIRLPOOL 
5f6fcdcd5e2bb6dd2f7a0feaf6645f06baa5cdcaa645dc18a6fc95d2eaddcc1d160d4735631c08a90103a392b502344e8d463b917fb78a286ac4dcc806f22029

diff --git a/sys-auth/keystone/keystone-9.0.0-r1.ebuild 
b/sys-auth/keystone/keystone-9.0.0-r1.ebuild
deleted file mode 100644
index 09bb4b1..0000000
--- a/sys-auth/keystone/keystone-9.0.0-r1.ebuild
+++ /dev/null
@@ -1,164 +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/cryptography-1.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/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.5.0[${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=(
-       "${FILESDIR}/CVE-2016-4911_9.0.0.patch"
-)
-
-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.0.2.ebuild 
b/sys-auth/keystone/keystone-9.0.2.ebuild
deleted file mode 100644
index b7cce24..0000000
--- a/sys-auth/keystone/keystone-9.0.2.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.5.0[${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
-}

Reply via email to