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

[Matt Thode]

commit:     31b02c259eefff2b08cd18c4b771f98512799e4c
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 15:16:43 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 15:18:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31b02c25

sys-auth/keystone: readding mongo/memcached/ldap support

Package-Manager: portage-2.2.26

 sys-auth/keystone/keystone-2015.2.9999.ebuild | 28 +++++++++++++--------------
 sys-auth/keystone/keystone-2016.1.9999.ebuild | 17 ++++++++++++++--
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/sys-auth/keystone/keystone-2015.2.9999.ebuild 
b/sys-auth/keystone/keystone-2015.2.9999.ebuild
index 595da58..881e444 100644
--- a/sys-auth/keystone/keystone-2015.2.9999.ebuild
+++ b/sys-auth/keystone/keystone-2015.2.9999.ebuild
@@ -27,19 +27,6 @@ DEPEND="
                ${RDEPEND}
                >=dev-python/bashate-0.2[${PYTHON_USEDEP}]
                <=dev-python/bashate-0.3.2[${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')]
-               )
                >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
                <=dev-python/coverage-4.0.3[${PYTHON_USEDEP}]
                >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
@@ -159,7 +146,20 @@ RDEPEND="
        <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
        ~dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
        <=dev-python/pycadf-2.0.1[${PYTHON_USEDEP}]
-       ~dev-python/msgpack-0.4.6[${PYTHON_USEDEP}]"
+       ~dev-python/msgpack-0.4.6[${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')]
+       )"
 
 PATCHES=(
 )

diff --git a/sys-auth/keystone/keystone-2016.1.9999.ebuild 
b/sys-auth/keystone/keystone-2016.1.9999.ebuild
index bade3ef..b5fefc0 100644
--- a/sys-auth/keystone/keystone-2016.1.9999.ebuild
+++ b/sys-auth/keystone/keystone-2016.1.9999.ebuild
@@ -16,7 +16,7 @@ EGIT_BRANCH="stable/mitaka"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="+sqlite memcached mongo mysql postgres ldap test"
+IUSE="+sqlite ldap memcached mongo mysql postgres test"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
@@ -79,7 +79,20 @@ RDEPEND="
        <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/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')]
+       )"
 
 #PATCHES=(
 #)