From dbc979a5301335232aec825ba2b2bef042a7cb3a Mon Sep 17 00:00:00 2001 From: Matt Thode Date: Sun, 8 Feb 2015 01:59:16 +0000 Subject: [PATCH] fixing deps Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x33ED3FD25AFC78BA --- sys-auth/keystone/ChangeLog | 6 +- sys-auth/keystone/Manifest | 33 ++-- sys-auth/keystone/keystone-2014.2.2.ebuild | 51 ++---- sys-auth/keystone/keystone-2014.2.9999.ebuild | 122 ++++++------- sys-auth/keystone/keystone-9999.ebuild | 167 ------------------ 5 files changed, 88 insertions(+), 291 deletions(-) delete mode 100644 sys-auth/keystone/keystone-9999.ebuild diff --git a/sys-auth/keystone/ChangeLog b/sys-auth/keystone/ChangeLog index 3537b29ee739..6f5407dd5683 100644 --- a/sys-auth/keystone/ChangeLog +++ b/sys-auth/keystone/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-auth/keystone # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.86 2015/02/08 01:26:26 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.87 2015/02/08 01:59:11 prometheanfire Exp $ + + 08 Feb 2015; Matthew Thode -keystone-9999.ebuild, + keystone-2014.2.2.ebuild, keystone-2014.2.9999.ebuild: + fixing deps 08 Feb 2015; Matthew Thode keystone-2014.2.2.ebuild: diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest index 93912aacd056..9d8bab5269c1 100644 --- a/sys-auth/keystone/Manifest +++ b/sys-auth/keystone/Manifest @@ -5,25 +5,24 @@ AUX keystone.confd 124 SHA256 50daa09c5922190a6663e36a32e9b6e5c512672e5be776fcc9 AUX keystone.initd 674 SHA256 fc556365de7198de035ebf083b10f59043aa3266270d3ab708d613311f1a719a SHA512 10066c2197973aeee2444ae1bff0ffc3d2a7360a632b55b9c2f66bf064285491e698721ec1525a22b18c0b74a8a6c5c4b84d2cf73812a0f93b2dbfffba799718 WHIRLPOOL 7969003cec68ca8017de003e6a5cfb4bd239a149b06dd9304c9ba8200b4fedfe8ae7e8d3c443e741d1c19cedc5d67150f1d236eef565685a64aa4a998c1ec509 AUX no_admin_token_auth-paste.ini 2646 SHA256 f98d9151f222d2143820bdc98727ce0cf3f4450a4dbdc54f1fb6e36bb63bf2df SHA512 c855dd2bb05e765c6594359f55b76f7f6e0649c8e8f4517b274c7432f136e51c408168ec24e0074f4ebc49eb641d658acfda205aef97fe68fe8fc016be4cb08d WHIRLPOOL faad0f98d0684cf206e2f2afb5fba6c6aab73f97bcf63e38038be49a2ae1303e8cb5434d8fab34492888c666462dcd751c678c04cd0039d9024fd42ddde30646 DIST keystone-2014.2.2.tar.gz 942712 SHA256 5674c1ae0aa7203cca0aba634e939bcfb7e1e0f60f62a6d6fceeb05efb84980e SHA512 beed7e1869da96e7ce61f6712a95cf3b28fd9da5b07d8b4e0055556e9500c014845f180358e956bc0f696e7847f251b4a99ef8dec98488dc81c371b9b4cb0106 WHIRLPOOL 28b12bf072edc9a5e3258158ddcf21d3eccc37c55ae90a5241ed9d07b345e35cff1f10269e761d023b4ea26fde623dd8ec57fe644e944a755d8d45977b99d9ed -EBUILD keystone-2014.2.2.ebuild 6468 SHA256 7a7ad48bdde611de2e073293df193a7af8d484acbee989e2a359243c13a0b309 SHA512 2f1edf5b343edccef1d84428e1546ef69b30b2bd58dd533c341f49cd38e9826f2d8e6b8c7966d02c4d2608e5cc03b42c13754ddfc2caf3d0a7ba042a11e07b70 WHIRLPOOL 66e4df151e49c4b02535e6a6e6e7e076b2c2a253251e2390710887e17a81c6b99671da27ef3ed5e7257514f4d36b721a29d08f439d65ee3a821684042315dfd6 -EBUILD keystone-2014.2.9999.ebuild 6459 SHA256 7409255a6de367e0fe77bb6b5b81ab5e37b0028126454e46e3923e3c1fda9efe SHA512 2bd5c75ce81d9244bd6fcee9ca3aee1102331600a6f8918f6fb4e5ebf638734e590502e2a180242138e242580d82eddbc6a2c860285bfe7af11bbb8016dc1df7 WHIRLPOOL 159d8ad6261441cf2af13f4eab4007d2209bc562a299fd31ccfb3696f8bdfc22cabd83c704447ad0b113fbe83452a9c1a209235616fcff2b855ca12ce3fe0e2b -EBUILD keystone-9999.ebuild 6221 SHA256 43e52aca0fd2d106005fd0a668af717d3fcf592b8fecfa426a11f77e6bc92399 SHA512 8793eba2625b889ea507e9b1c037961b3258ec2d58e8e920d579ca4986da5042d72c5c4732f10a3ea4a216a859d7029df67748d187c5c9c05018eb3cbb01e702 WHIRLPOOL 7b8d035dfae545de6f70f621d8279d816cc00371e359a26f377860a13dcae101e743997d3200fd03fc350ad5e3a2baeb02fc21dfc1a5a5e63c0b2842f6494736 -MISC ChangeLog 18213 SHA256 27ec4f29f9312714b4d2435cb4eeb51c76d973bfd3c7bec8aaf032111dd3397b SHA512 13e54b7ba1c2f633eadc6e9d4ece3419733728a99e195064ed2d6f2a792787f36dde98e856f6cbfde9cf5c7bf2dfccc7784cce9679a1f9a1541da32bd3a68129 WHIRLPOOL 17297a7b6b1ead903c295e3bd913aaf79cad03ce0e6885eb8cc8345755aceb3f72cd6cce10cdf7c5a390940c498524d9aa5dafe0289a2914fe5d6527ebbc5482 +EBUILD keystone-2014.2.2.ebuild 6082 SHA256 868fb99147e869983f9a1d2890a7c3cf065d77c3a1467e291dc812a2ab03d6bf SHA512 62f5ab8869b91a400a900631a2d3c27669b8bd0ddcbedcdfce7635153d89d598fe3975d9ba6367a0eb9cbb31a5b227a422d98dd0a3d89d51fe502df8008903d5 WHIRLPOOL b06e9f16ee8b1360e16427fcb107e2a4630a07857c5b3126b0dc8413c00384bdd6840a6b90c4da9ad941d7f11b496661ba87211dfb3a1efad4b1c1afeaa47388 +EBUILD keystone-2014.2.9999.ebuild 6094 SHA256 585166d7583cbb2afdbf3f4ee930cafbb87b51f189929a7f033dc00936580c2a SHA512 35518b35bf871519ba771e85947efedbe5a6f374360cc1aae910838ef869c450b114521843b42f65872095ea1c790ec21550468071637702940bad3d42c65286 WHIRLPOOL cf4587c9c113b3b67901b79942028b1c6fa9adb56d8c94118f9f4a0f4cd6304c6d450505f0a3fc09c3436b6cc32bef2c288ed9b8efcfbed1d5b716d55b6cd415 +MISC ChangeLog 18365 SHA256 e2ec1af9c01f3dd52348564fd5baacc9bebaf9db1d48cc3343fa7e22d1f69b6b SHA512 ce442782e5fcfa601df891809f821141cfceaa78a900c82029aafd4fefdd8e778ac99fbc429b0dffbf552d195b868eefeded57f6fd7f4107d4c7c41d51813b7f WHIRLPOOL b5f8fa23ba9292c005b7c41a2c9ed5e423c77a1bd1470b6a0cf3a9c87a937b8b2784b2c192aa9d96a5bd4d7373e3846a1598af8e7462df552388a921688e0f85 MISC metadata.xml 424 SHA256 c89c0232e90df5d811d17941c1594e4c4c45db48c2b6240a3c62b232caad4e84 SHA512 9d7fcca89a6f35a93f1a57790103249cdc25424cbdb374bf26b691e81b27182dc3380a8ff67b77e7aabf4ce944e4a813d619838d4bc97086b4208e5312d76f11 WHIRLPOOL 4ec9d4c5ff5c484c341b06fe77fcac8e6fdd0e0b651dbd58b6f2d5aecd05db5bf70218b94733eb749ced7436f9df5ba5c93496bae06c0ff9a62b91ecb53ab77a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJU1rteAAoJEGSje+quGaToP2AP/AyP+H4SDOsb8wjkLh3Y0VQ2 -aa0rFFHxjj1fOfjvDxFPAqzvhBLr5w2hUebSsyPtGMDiDrw4bO376ki9J+NCxqbI -T1H+74CBeae8HDTJ6qSDZQawuDkH6xr41WqUbJ11Moe4OhX6PETK3+n09EPNrJJA -l2amW2b+uRFpV9B9ZmWtqM8znS1H51+AqF50QeSZpFDK7QiCKvFqfQUetLDJP95j -oR8/9cdHJt8hmKFukizFc6+abpKpX5Br5vU0AcUyTIfGYtEOL9IE/BtWjKhiei/c -16iwRhTafuMmL5kxekpLJ88kspA2ZCNiIeW7x/iAgX/VnoVOmC1ZLu5KbvwVVPZB -1ybagluyZ43yB2aRu94gj+XM7zjkTS5RSuL0wMkfYMSt1kB7AtakF6TFrp5OL2gU -T6spfa/b26hPmwzI+hGvKPuZ0aapo1jfb8lRvduelZfwLxfLI0rIKULDy4572bZ+ -ckBRlxc3bTHZFMCvYYveIJL+ByQHisQadUrOehvnt/FOIeo/BaKHrLEP+irxqNxs -BmPRNFjA1R5lDsZCz4SnM7lAtVB8G7E4+/kNGGKVGUKHqJLuWtZgc5oX5VTVCQTk -YbMuzgweO3c9y7RV9zTPcsp5HIC2kKdWEmflBDSiZZdovslanneljCL7/2NQUIqS -09M+btdjHHPVMwTGUVz0 -=kaic +iQIcBAEBCAAGBQJU1sMLAAoJEGSje+quGaToYCgP/i/PxbQhopMhRps3OqCSe/7T +lnsxV2uY0lhVh0uAl9CjRx1PdsSjZulAgJ4KhbOmCW5SBDXQRfHugv5kZS37Qsrn ++shGhB9Yza8NZJF2+y74KCbZCKXkuDB7dMwXlNCdoCi8chWl49eu5gm+T1Uan2kW +I7xAYfHtnytM74rfao0Z9D+NMuqqdEc7W54tgVO2oQK24c5sNwupbLhW6lfCi97t +Y41bqo33huUQdnpqoQuAvYXDWkqkm1b/R6KId6kt3Pob1mPsz+v1d0Dptf302T/g +f7WtPB1h6FcN6YLJfBVTcLSkeCVnPge0nwkrA92JZIYVejqBsEuIwqdczuQrpe5B +wCGAREyjwOk9hpXxXCAJanq7/S0zaOsUWauISxiCmIbOnUeQmZCQB+vosBV3sPWz +MQ/a87vIzTlq9L1F/ZndcoQLtcvbjL6IShY+/bR07wM+KmrIT7opVjqryxWT5IoZ +Ll7I8XCxkQZnkhN+oR+FsI6lt16lHRKOWfQkmVgnhnBtJkczTIfvDi1pvw23NlpB +aAP4F47onTWMkZToqnemg+ooY4dCRONEf1mzEwomviahvAsSLcQiCo4nGeuwxHTa +x72gaA9UZk+K3oToXgpFZSzSQGtXLkbnoQ3hkYCT5uBHWrxDDmBi/xLrNLgduDo5 +giU1QcLzGXibxQzOnacb +=xnS6 -----END PGP SIGNATURE----- diff --git a/sys-auth/keystone/keystone-2014.2.2.ebuild b/sys-auth/keystone/keystone-2014.2.2.ebuild index 2779f61bb6d6..b681782e8840 100644 --- a/sys-auth/keystone/keystone-2014.2.2.ebuild +++ b/sys-auth/keystone/keystone-2014.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2014.2.2.ebuild,v 1.2 2015/02/08 01:26:26 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2014.2.2.ebuild,v 1.3 2015/02/08 01:59:11 prometheanfire Exp $ EAPI=5 @@ -18,8 +18,8 @@ KEYWORDS="~amd64 ~x86" IUSE="+sqlite mysql postgres ldap test" REQUIRED_USE="|| ( mysql postgres sqlite )" -#todo, seperate out rdepend via use flags -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/pbr-0.6[${PYTHON_USEDEP}] !~dev-python/pbr-0.7[${PYTHON_USEDEP}] =dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}] >=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}] + =dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}] >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] @@ -70,45 +72,20 @@ RDEPEND=">=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}] !~dev-python/routes-2.0[${PYTHON_USEDEP}] >=dev-python/six-1.7.0[${PYTHON_USEDEP}] sqlite? ( - || ( - ( - >=dev-python/sqlalchemy-0.8.4[sqlite,${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.8.99[sqlite,${PYTHON_USEDEP}] - ) - ( - >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}] - ) - ) + >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}] + <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}] ) mysql? ( dev-python/mysql-python - || ( - ( - >=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}] - ) - ( - >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] - ) - ) + >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}] + <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] ) postgres? ( dev-python/psycopg:2 - || ( - ( - >=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}] - ) - ( - >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] - ) - ) + >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}] + <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] ) - >=dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}] - !~dev-python/sqlalchemy-migrate-0.9.2[${PYTHON_USEDEP}] + ~dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}] dev-python/passlib[${PYTHON_USEDEP}] >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}] >=dev-python/python-keystoneclient-0.10.0[${PYTHON_USEDEP}] @@ -116,7 +93,9 @@ RDEPEND=">=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}] >=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}] >=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}] !~dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}] + =dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}] + =dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}] >=dev-python/oslo-serialization-1.0.0[${PYTHON_USEDEP}] >=dev-python/oslo-utils-1.0.0[${PYTHON_USEDEP}] diff --git a/sys-auth/keystone/keystone-2014.2.9999.ebuild b/sys-auth/keystone/keystone-2014.2.9999.ebuild index 12b4d88741cb..1349eea1b2c9 100644 --- a/sys-auth/keystone/keystone-2014.2.9999.ebuild +++ b/sys-auth/keystone/keystone-2014.2.9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2014.2.9999.ebuild,v 1.3 2014/12/09 01:16:29 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2014.2.9999.ebuild,v 1.4 2015/02/08 01:59:11 prometheanfire Exp $ EAPI=5 @@ -19,47 +19,52 @@ KEYWORDS="" IUSE="+sqlite mysql postgres ldap test" REQUIRED_USE="|| ( mysql postgres sqlite )" -#todo, seperate out rdepend via use flags -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/pbr-0.6[${PYTHON_USEDEP}] !~dev-python/pbr-0.7[${PYTHON_USEDEP}] =dev-python/hacking-0.9.2[${PYTHON_USEDEP}] - =dev-python/bashate-0.2[${PYTHON_USEDEP}] - dev-lang/python[sqlite] - >=dev-python/python-memcached-1.48[${PYTHON_USEDEP}] - >=dev-python/pymongo-2.4[${PYTHON_USEDEP}] - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] - >=dev-python/ldappool-1.0[${PYTHON_USEDEP}] - ) - dev-python/pysaml2[${PYTHON_USEDEP}] - >=dev-python/coverage-3.6[${PYTHON_USEDEP}] - >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}] - >=dev-python/lxml-2.3[${PYTHON_USEDEP}] - >=dev-python/mock-1.0[${PYTHON_USEDEP}] - >=dev-python/oslotest-1.1.0[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] - !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] - =dev-python/webtest-2.0[${PYTHON_USEDEP}] - >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] - >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] - >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] - >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] - >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}] - >=dev-python/requests-1.2.1[${PYTHON_USEDEP}] - !~dev-python/requests-2.4.0[${PYTHON_USEDEP}] - >=dev-python/keyring-2.1[${PYTHON_USEDEP}] - !~dev-python/keyring-3.3[${PYTHON_USEDEP}] - >=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}] - >=dev-python/kombu-2.5.0[${PYTHON_USEDEP}] - >=dev-python/lockfile-0.8[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}] + test? ( + ${RDEPEND} + >=dev-python/hacking-0.9.2[${PYTHON_USEDEP}] + =dev-python/bashate-0.2[${PYTHON_USEDEP}] + dev-lang/python[sqlite] + >=dev-python/python-memcached-1.48[${PYTHON_USEDEP}] + >=dev-python/pymongo-2.4[${PYTHON_USEDEP}] + ldap? ( + dev-python/python-ldap[${PYTHON_USEDEP}] + >=dev-python/ldappool-1.0[${PYTHON_USEDEP}] + ) + dev-python/pysaml2[${PYTHON_USEDEP}] + >=dev-python/coverage-3.6[${PYTHON_USEDEP}] + >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}] + >=dev-python/lxml-2.3[${PYTHON_USEDEP}] + >=dev-python/mock-1.0[${PYTHON_USEDEP}] + >=dev-python/oslotest-1.1.0[${PYTHON_USEDEP}] + >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] + !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] + =dev-python/webtest-2.0[${PYTHON_USEDEP}] + >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] + >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] + >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] + !~dev-python/testtools-1.4.0[${PYTHON_USEDEP}] + >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] + >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}] + >=dev-python/requests-1.2.1[${PYTHON_USEDEP}] + !~dev-python/requests-2.4.0[${PYTHON_USEDEP}] + >=dev-python/keyring-2.1[${PYTHON_USEDEP}] + !~dev-python/keyring-3.3[${PYTHON_USEDEP}] + >=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}] + >=dev-python/kombu-2.5.0[${PYTHON_USEDEP}] + >=dev-python/lockfile-0.8[${PYTHON_USEDEP}] + >=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}] )" -RDEPEND=">=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}] +RDEPEND=" + >=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}] >=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}] + =dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}] >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] @@ -68,45 +73,20 @@ RDEPEND=">=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}] !~dev-python/routes-2.0[${PYTHON_USEDEP}] >=dev-python/six-1.7.0[${PYTHON_USEDEP}] sqlite? ( - || ( - ( - >=dev-python/sqlalchemy-0.8.4[sqlite,${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.8.99[sqlite,${PYTHON_USEDEP}] - ) - ( - >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}] - ) - ) + >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}] + <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}] ) mysql? ( dev-python/mysql-python - || ( - ( - >=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}] - ) - ( - >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] - ) - ) + >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}] + <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] ) postgres? ( dev-python/psycopg:2 - || ( - ( - >=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}] - ) - ( - >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] - ) - ) + >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}] + <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] ) - >=dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}] - !~dev-python/sqlalchemy-migrate-0.9.2[${PYTHON_USEDEP}] + ~dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}] dev-python/passlib[${PYTHON_USEDEP}] >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}] >=dev-python/python-keystoneclient-0.10.0[${PYTHON_USEDEP}] @@ -114,7 +94,9 @@ RDEPEND=">=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}] >=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}] >=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}] !~dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}] + =dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}] + =dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}] >=dev-python/oslo-serialization-1.0.0[${PYTHON_USEDEP}] >=dev-python/oslo-utils-1.0.0[${PYTHON_USEDEP}] diff --git a/sys-auth/keystone/keystone-9999.ebuild b/sys-auth/keystone/keystone-9999.ebuild deleted file mode 100644 index be7ae9490e09..000000000000 --- a/sys-auth/keystone/keystone-9999.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-9999.ebuild,v 1.20 2014/11/10 07:07:34 prometheanfire Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit git-2 distutils-r1 user - -DESCRIPTION="The Openstack authentication, authorization, and service catalog written in Python" -HOMEPAGE="https://launchpad.net/keystone" -EGIT_REPO_URI="https://github.com/openstack/keystone.git" -EGIT_BRANCH="master" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="" -IUSE="+sqlite mysql postgres ldap test" -REQUIRED_USE="|| ( mysql postgres sqlite )" - -#todo, seperate out rdepend via use flags -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/pbr-0.6[${PYTHON_USEDEP}] - !~dev-python/pbr-0.7[${PYTHON_USEDEP}] - =dev-python/hacking-0.9.2[${PYTHON_USEDEP}] - =dev-python/bashate-0.2[${PYTHON_USEDEP}] - dev-lang/python[sqlite] - >=dev-python/python-memcached-1.48[${PYTHON_USEDEP}] - >=dev-python/pymongo-2.4[${PYTHON_USEDEP}] - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] - >=dev-python/ldappool-1.0[${PYTHON_USEDEP}] - ) - dev-python/pysaml2[${PYTHON_USEDEP}] - >=dev-python/coverage-3.6[${PYTHON_USEDEP}] - >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}] - >=dev-python/lxml-2.3[${PYTHON_USEDEP}] - >=dev-python/mock-1.0[${PYTHON_USEDEP}] - >=dev-python/oslotest-1.1.0[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] - !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] - =dev-python/webtest-2.0[${PYTHON_USEDEP}] - >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] - >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] - >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] - >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] - >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}] - >=dev-python/requests-1.2.1[${PYTHON_USEDEP}] - !~dev-python/requests-2.4.0[${PYTHON_USEDEP}] - >=dev-python/keyring-2.1[${PYTHON_USEDEP}] - !~dev-python/keyring-3.3[${PYTHON_USEDEP}] - >=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}] - >=dev-python/kombu-2.5.0[${PYTHON_USEDEP}] - >=dev-python/lockfile-0.8[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}] - )" -RDEPEND=">=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}] - >=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}] - >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] - >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] - dev-python/paste[${PYTHON_USEDEP}] - >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] - !~dev-python/routes-2.0[${PYTHON_USEDEP}] - >=dev-python/six-1.7.0[${PYTHON_USEDEP}] - sqlite? ( - >=dev-python/sqlalchemy-0.8.4[sqlite,${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.8.99[sqlite,${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}] - ) - mysql? ( - dev-python/mysql-python - >=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] - ) - postgres? ( - dev-python/psycopg:2 - >=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] - ) - >=dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}] - !~dev-python/sqlalchemy-migrate-0.9.2[${PYTHON_USEDEP}] - dev-python/passlib[${PYTHON_USEDEP}] - >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}] - >=dev-python/python-keystoneclient-0.10.0[${PYTHON_USEDEP}] - >=dev-python/keystonemiddleware-1.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}] - >=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}] - >=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-1.0.0[${PYTHON_USEDEP}] - >=dev-python/Babel-1.3[${PYTHON_USEDEP}] - >=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}] - >=dev-python/dogpile-cache-0.5.3[${PYTHON_USEDEP}] - >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}] - =dev-python/pycadf-0.6.0[${PYTHON_USEDEP}] - dev-python/posix_ipc[${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..... - mkdir -p ${PN}/tests/tmp/ || die - cp etc/keystone-paste.ini ${PN}/tests/tmp/ || 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 - newconfd "${FILESDIR}/keystone.confd" keystone - newinitd "${FILESDIR}/keystone.initd" keystone - - diropts -m 0750 - keepdir /etc/keystone /var/log/keystone - insinto /etc/keystone - 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 - - fowners keystone:keystone /etc/keystone /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 -} -- 2.26.2