summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode <mthode@mthode.org>2012-11-23 15:35:38 -0600
committerMatthew Thode <mthode@mthode.org>2012-11-23 15:35:38 -0600
commitfab641fec8294c83697bd738b754f682fa0df587 (patch)
tree78a4dbd5fa996f404cbc2a50712237b94ee857db
parentneed the PV too :D (diff)
downloadprometheanfire-fab641fec8294c83697bd738b754f682fa0df587.tar.gz
prometheanfire-fab641fec8294c83697bd738b754f682fa0df587.tar.bz2
prometheanfire-fab641fec8294c83697bd738b754f682fa0df587.zip
test merge from alunduil
-rw-r--r--sys-auth/keystone/Manifest2
-rw-r--r--sys-auth/keystone/keystone-2012.2.ebuild47
2 files changed, 28 insertions, 21 deletions
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 9e1ee8d..313a24a 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -3,6 +3,6 @@ AUX keystone.initd 1069 SHA256 70cbe2d37f139f4e7d99ac128b89d399e291cabd38b9db6e2
DIST keystone-2012.1.2.tar.gz 447876 SHA256 0634eac122f38af11f73e7e8ef67d4dbb27e4179a23e78682f6b5212f6619c90
DIST keystone-2012.2.tar.gz 547438 SHA256 1aed5911c00ebffea28cffbc4793921fb2a9c000e9bb967326b7db751c7281cc SHA512 bb6bb4499737474b49012fffffc4a7950a8427adb0b564f40d55bb7a43846e788266810d09ff54707709fba1db07a8b4b8d531e0547399490fe688e7b5d1fd32 WHIRLPOOL 825c9ac7357148cc0f9c732e946c6c07ccdf21ded3cf0f07d25c66615b991c6dcf72d48540c703c33addbf0e3c74c76a72709dd2ab4fe8b90c31addd92373912
EBUILD keystone-2012.1.2.ebuild 893 SHA256 daa985940f05c56592acbb7868d054613591e2aae12e4d2ef2eb3e092e263010 SHA512 f0de6f8ecb1f5e3d5a32eac209866406e60f5845a4c9520cf779a05f5b1606a2fce8c3675df013079bc2dc8b5604e38ece779cb3d8f1e6042a5601e5e827102c WHIRLPOOL bc2d5ac99d54323a4f77da5a71ffe1ada949c7fe88d2cc7f916d62a49330c76bcf5dbf05cc0d025334668d0fd4a9573763bb27737769a3f0f68f9a8370130bd2
-EBUILD keystone-2012.2.ebuild 1320 SHA256 d22062e8c34f88fd7ba05b4aad98e87a493b0c3ba02811025ea0732a1261bc9f SHA512 0c452d9b850e18c816486727f512883511ee0b6a5714bb804aabf392ed7ee6c84a1057af3774c954154c5c8bd82224a10ddf2a542c3a2c31d1ea38da66d47000 WHIRLPOOL f3e6900325b9be78a90bb1692cbd89113e2d8401e8a8c5d4cb8bf336e3ea10160e413b49ac23282180767b32e03d39e6012e924019476046bc243d2841564acb
+EBUILD keystone-2012.2.ebuild 1517 SHA256 5464b09177279a4885095c67b90c136bdb9c2df680278e06a46117680011593d SHA512 2099544b23f5f74cfdaa4c8a1e7fe680f48ac65e400a75d83160989e089055838ba13683d0557d6629c17cfeae947f43b654a4f75e36404f9c218de3c74027d8 WHIRLPOOL 5620617bbd64924ea62f512bd5f669781c66a0f4a4bd2a479f31aac2a7ccb1b7a857e9a6545ac25e653a4ba6ceb4a652bbc16781a75a9e13dae5daad7b919e5f
EBUILD keystone-9999.ebuild 715 SHA256 9279e0d0c9a4bfd2a4076f310136bcee661e69ec14fd35fa797366402e8ab4ae SHA512 b63f413aaa4a92d6fbfcc70a53d1b9e4b99264d37a2b79703b1a993c7470487f8a5cdb3009c8a88e30d99f2b4d6d3e04762caf1d8ce7ba1ffbdf3124c2ba2ebb WHIRLPOOL d8544675a75bcd978162e066298e01243e1596315953a267fb602470c578f1c2180218d055d20b778c00e9f0989d4a545abad1fe3dc7bd74c7fe04b96e9f6454
MISC metadata.xml 187 SHA256 773142fc211f4f8cd167704604281cbf366eabef6751c52a2895f63e9761a5a2 SHA512 81ef1f7d248dbdf4183b6700885e86071cee75bc1b69c3ed590c18193743da2562be527f212f088fe8ae9242b0aaaf7907912badae1264f14c2f5dde619c3fba WHIRLPOOL 32c1d67c8a74e4f3606e5aedc066ea7cdf09292beea0574c25d7448294b42ee9146a7724fcb9a7da04558e55c07619702e38e90656b962638cf747cb2c67ede3
diff --git a/sys-auth/keystone/keystone-2012.2.ebuild b/sys-auth/keystone/keystone-2012.2.ebuild
index f95b377..2d12aeb 100644
--- a/sys-auth/keystone/keystone-2012.2.ebuild
+++ b/sys-auth/keystone/keystone-2012.2.ebuild
@@ -18,28 +18,34 @@ SRC_URI="http://launchpad.net/${PN}/folsom/${PV}/+download/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"
-IUSE=""
+IUSE="+sqlite mysql postgres ldap"
#todo, seperate out rdepend via use flags
-DEPEND="dev-python/setuptools
- dev-python/pep8"
-RDEPEND="
- dev-python/iso8601
- dev-python/lxml
- dev-python/eventlet
- dev-python/greenlet
- dev-python/passlib
- dev-python/paste
- dev-python/pastedeploy
- dev-python/python-daemon
- dev-python/python-ldap
- dev-python/python-keystoneclient
- dev-python/python-pam
- dev-python/routes
- dev-python/sqlalchemy
- dev-python/sqlalchemy-migrate
- dev-python/webob
- "
+DEPEND=""
+RDEPEND="${DEPEND}
+ dev-python/eventlet
+ dev-python/greenlet
+ dev-python/iso8601
+ dev-python/lxml
+ dev-python/passlib
+ dev-python/paste
+ dev-python/pastedeploy
+ dev-python/python-daemon
+ dev-python/python-pam
+ dev-python/routes
+ dev-python/sqlalchemy-migrate
+ dev-python/webob
+ sqlite? ( dev-python/sqlalchemy[sqlite] )
+ mysql? ( dev-python/sqlalchemy[mysql] )
+ postgres? ( dev-python/sqlalchemy[postgres] )
+ ldap? ( dev-python/python-ldap )
+ ( || (
+ sys-auth/keystone[sqlite]
+ sys-auth/keystone[mysql]
+ sys-auth/keystone[postgres]
+ sys-auth/keystone[ldap]
+ ) )
+ "
src_install() {
distutils_src_install
@@ -48,6 +54,7 @@ src_install() {
diropts -m 0750
dodir /var/run/keystone /var/log/keystone /etc/keystone
+ keepdir /etc/keystone
insinto /etc/keystone
doins etc/keystone.conf.sample etc/logging.conf.sample
doins etc/default_catalog.templates etc/policy.json