| 1 |
commit: fab641fec8294c83697bd738b754f682fa0df587 |
| 2 |
Author: Matthew Thode <mthode <AT> mthode <DOT> org> |
| 3 |
AuthorDate: Fri Nov 23 21:35:38 2012 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 23 21:35:38 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=fab641fe |
| 7 |
|
| 8 |
test merge from alunduil |
| 9 |
|
| 10 |
--- |
| 11 |
sys-auth/keystone/Manifest | 2 +- |
| 12 |
sys-auth/keystone/keystone-2012.2.ebuild | 47 +++++++++++++++++------------ |
| 13 |
2 files changed, 28 insertions(+), 21 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest |
| 16 |
index 9e1ee8d..313a24a 100644 |
| 17 |
--- a/sys-auth/keystone/Manifest |
| 18 |
+++ b/sys-auth/keystone/Manifest |
| 19 |
@@ -3,6 +3,6 @@ AUX keystone.initd 1069 SHA256 70cbe2d37f139f4e7d99ac128b89d399e291cabd38b9db6e2 |
| 20 |
DIST keystone-2012.1.2.tar.gz 447876 SHA256 0634eac122f38af11f73e7e8ef67d4dbb27e4179a23e78682f6b5212f6619c90 |
| 21 |
DIST keystone-2012.2.tar.gz 547438 SHA256 1aed5911c00ebffea28cffbc4793921fb2a9c000e9bb967326b7db751c7281cc SHA512 bb6bb4499737474b49012fffffc4a7950a8427adb0b564f40d55bb7a43846e788266810d09ff54707709fba1db07a8b4b8d531e0547399490fe688e7b5d1fd32 WHIRLPOOL 825c9ac7357148cc0f9c732e946c6c07ccdf21ded3cf0f07d25c66615b991c6dcf72d48540c703c33addbf0e3c74c76a72709dd2ab4fe8b90c31addd92373912 |
| 22 |
EBUILD keystone-2012.1.2.ebuild 893 SHA256 daa985940f05c56592acbb7868d054613591e2aae12e4d2ef2eb3e092e263010 SHA512 f0de6f8ecb1f5e3d5a32eac209866406e60f5845a4c9520cf779a05f5b1606a2fce8c3675df013079bc2dc8b5604e38ece779cb3d8f1e6042a5601e5e827102c WHIRLPOOL bc2d5ac99d54323a4f77da5a71ffe1ada949c7fe88d2cc7f916d62a49330c76bcf5dbf05cc0d025334668d0fd4a9573763bb27737769a3f0f68f9a8370130bd2 |
| 23 |
-EBUILD keystone-2012.2.ebuild 1320 SHA256 d22062e8c34f88fd7ba05b4aad98e87a493b0c3ba02811025ea0732a1261bc9f SHA512 0c452d9b850e18c816486727f512883511ee0b6a5714bb804aabf392ed7ee6c84a1057af3774c954154c5c8bd82224a10ddf2a542c3a2c31d1ea38da66d47000 WHIRLPOOL f3e6900325b9be78a90bb1692cbd89113e2d8401e8a8c5d4cb8bf336e3ea10160e413b49ac23282180767b32e03d39e6012e924019476046bc243d2841564acb |
| 24 |
+EBUILD keystone-2012.2.ebuild 1517 SHA256 5464b09177279a4885095c67b90c136bdb9c2df680278e06a46117680011593d SHA512 2099544b23f5f74cfdaa4c8a1e7fe680f48ac65e400a75d83160989e089055838ba13683d0557d6629c17cfeae947f43b654a4f75e36404f9c218de3c74027d8 WHIRLPOOL 5620617bbd64924ea62f512bd5f669781c66a0f4a4bd2a479f31aac2a7ccb1b7a857e9a6545ac25e653a4ba6ceb4a652bbc16781a75a9e13dae5daad7b919e5f |
| 25 |
EBUILD keystone-9999.ebuild 715 SHA256 9279e0d0c9a4bfd2a4076f310136bcee661e69ec14fd35fa797366402e8ab4ae SHA512 b63f413aaa4a92d6fbfcc70a53d1b9e4b99264d37a2b79703b1a993c7470487f8a5cdb3009c8a88e30d99f2b4d6d3e04762caf1d8ce7ba1ffbdf3124c2ba2ebb WHIRLPOOL d8544675a75bcd978162e066298e01243e1596315953a267fb602470c578f1c2180218d055d20b778c00e9f0989d4a545abad1fe3dc7bd74c7fe04b96e9f6454 |
| 26 |
MISC metadata.xml 187 SHA256 773142fc211f4f8cd167704604281cbf366eabef6751c52a2895f63e9761a5a2 SHA512 81ef1f7d248dbdf4183b6700885e86071cee75bc1b69c3ed590c18193743da2562be527f212f088fe8ae9242b0aaaf7907912badae1264f14c2f5dde619c3fba WHIRLPOOL 32c1d67c8a74e4f3606e5aedc066ea7cdf09292beea0574c25d7448294b42ee9146a7724fcb9a7da04558e55c07619702e38e90656b962638cf747cb2c67ede3 |
| 27 |
|
| 28 |
diff --git a/sys-auth/keystone/keystone-2012.2.ebuild b/sys-auth/keystone/keystone-2012.2.ebuild |
| 29 |
index f95b377..2d12aeb 100644 |
| 30 |
--- a/sys-auth/keystone/keystone-2012.2.ebuild |
| 31 |
+++ b/sys-auth/keystone/keystone-2012.2.ebuild |
| 32 |
@@ -18,28 +18,34 @@ SRC_URI="http://launchpad.net/${PN}/folsom/${PV}/+download/${P}.tar.gz" |
| 33 |
LICENSE="Apache-2.0" |
| 34 |
SLOT="0" |
| 35 |
KEYWORDS="~amd64" |
| 36 |
-IUSE="" |
| 37 |
+IUSE="+sqlite mysql postgres ldap" |
| 38 |
|
| 39 |
#todo, seperate out rdepend via use flags |
| 40 |
-DEPEND="dev-python/setuptools |
| 41 |
- dev-python/pep8" |
| 42 |
-RDEPEND=" |
| 43 |
- dev-python/iso8601 |
| 44 |
- dev-python/lxml |
| 45 |
- dev-python/eventlet |
| 46 |
- dev-python/greenlet |
| 47 |
- dev-python/passlib |
| 48 |
- dev-python/paste |
| 49 |
- dev-python/pastedeploy |
| 50 |
- dev-python/python-daemon |
| 51 |
- dev-python/python-ldap |
| 52 |
- dev-python/python-keystoneclient |
| 53 |
- dev-python/python-pam |
| 54 |
- dev-python/routes |
| 55 |
- dev-python/sqlalchemy |
| 56 |
- dev-python/sqlalchemy-migrate |
| 57 |
- dev-python/webob |
| 58 |
- " |
| 59 |
+DEPEND="" |
| 60 |
+RDEPEND="${DEPEND} |
| 61 |
+ dev-python/eventlet |
| 62 |
+ dev-python/greenlet |
| 63 |
+ dev-python/iso8601 |
| 64 |
+ dev-python/lxml |
| 65 |
+ dev-python/passlib |
| 66 |
+ dev-python/paste |
| 67 |
+ dev-python/pastedeploy |
| 68 |
+ dev-python/python-daemon |
| 69 |
+ dev-python/python-pam |
| 70 |
+ dev-python/routes |
| 71 |
+ dev-python/sqlalchemy-migrate |
| 72 |
+ dev-python/webob |
| 73 |
+ sqlite? ( dev-python/sqlalchemy[sqlite] ) |
| 74 |
+ mysql? ( dev-python/sqlalchemy[mysql] ) |
| 75 |
+ postgres? ( dev-python/sqlalchemy[postgres] ) |
| 76 |
+ ldap? ( dev-python/python-ldap ) |
| 77 |
+ ( || ( |
| 78 |
+ sys-auth/keystone[sqlite] |
| 79 |
+ sys-auth/keystone[mysql] |
| 80 |
+ sys-auth/keystone[postgres] |
| 81 |
+ sys-auth/keystone[ldap] |
| 82 |
+ ) ) |
| 83 |
+ " |
| 84 |
|
| 85 |
src_install() { |
| 86 |
distutils_src_install |
| 87 |
@@ -48,6 +54,7 @@ src_install() { |
| 88 |
|
| 89 |
diropts -m 0750 |
| 90 |
dodir /var/run/keystone /var/log/keystone /etc/keystone |
| 91 |
+ keepdir /etc/keystone |
| 92 |
insinto /etc/keystone |
| 93 |
doins etc/keystone.conf.sample etc/logging.conf.sample |
| 94 |
doins etc/default_catalog.templates etc/policy.json |
Archives