[gentoo-commits] dev/prometheanfire:master commit in: sys-auth/keystone/files/, sys-auth/keystone/

[gentoo-commits] dev/prometheanfire:master commit in: sys-auth/keystone/files/, sys-auth/keystone/

[Matt Thode]

commit:     875bf7dc2c8ebdc814166d76f7d4c24a389eeff5
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Fri Nov 23 21:53:41 2012 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Nov 23 21:53:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=875bf7dc

got rid of python 3 badness

---
 sys-auth/keystone/Manifest               |    4 ++--
 sys-auth/keystone/files/keystone.initd   |    4 ++--
 sys-auth/keystone/keystone-2012.2.ebuild |    1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 993a909..d24a1ed 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1,8 +1,8 @@
 AUX keystone.confd 67 SHA256 8faa32d3354df30b1d1c98cf481be162c27583b84e387f8da57611b689bc2448 SHA512 75b040eda6ef8701e8dac8f34b3dd3c96aedde3b005fac01f20592b3d8afb8bbce57fadc466cda69d7192f96460a5c704d941a16b96d02f3e80f1a3e264c2efe WHIRLPOOL 8e8cb4e8991ca8d8cf1e874bd2286900ca63379c73793bca906ecfc1318ee63a8af6d1f6090e9ef296bfbe5abf018368a5ad6430de1efdea0db626d8c697f3c4
-AUX keystone.initd 1069 SHA256 70cbe2d37f139f4e7d99ac128b89d399e291cabd38b9db6e25e9d462f61b3602 SHA512 1442b29fba14ecf055ebda63bfd89f128019be1cd5ae838e27bc91ae6d6902154bdc441a384ec1406915d471d9319f585086075faf2b326ba1f65a853314a88f WHIRLPOOL 97fe632d7977d95f87b42925f78c81b3c431180a94fbc984a949649c05b45da5172b093b3511d57edf1ab59fd90242f49486b83e769745dd329c7cd6e904d992
+AUX keystone.initd 1077 SHA256 a58f2527f1efe7d027cd7fa1f59e490ae48c47f5ea944dd74fe003fae8316bba SHA512 1a1ad0e2d5e7e94ccd9fbf5a73f78d1b294d236555aaa2a33e33660f117095175ad1aec46d46a7c2e74f3513c9427f44236eef8fdc102d6686d4b47f3355ac0a WHIRLPOOL d383d908c4ab54ad88a141ed812de86f69de84afea936bab827ddb773c44384856bb2a2e194958c827fa2eb3b0addff72923ca175db11f58da47befa8764c67a
 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 1528 SHA256 619c9d407b7e3e0cb3027ff0ebc51d812d03d50d6ca4ae626d3eb882b929e814 SHA512 86a7098027434a09d568f9f6f1f63f36e93922992a686b57701fb03dc62ec584906b519cb4d1a3df27f6d82303ecd2a5220bb50a998a2a3fe373c2792e5341cd WHIRLPOOL 81939e84ff53ebcea63af0be4d03a4b492070ae2f594efb83e57eb7e39b1f2f138c905b11339ced8db64aee630f846c3cea3737abb8b964fb5ee549f38bc30f7
+EBUILD keystone-2012.2.ebuild 1500 SHA256 b2aae5c2a73cd3ae4a06e8047e02237de8d988f362cbf455fc12ca85ab13a42c SHA512 cd2747f131c3e5bf14a6ca2ade321db6443639ef8113912cf3fa9ffb1a22cd9f211e9205ed3a4046e6d700283f483c0ce9a31ca7ec653511b643ad2b86c2e7ad WHIRLPOOL c0e627c8b8d6a83588e5506abb65fb0fa5ce64cb401cf0a6641776d0a4ce5cde50f3a51cfa9c31a9fe9484c3e4075095908d84973b07d65e9a38e0819da4aeb9
 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/files/keystone.initd b/sys-auth/keystone/files/keystone.initd
index dde18b0..aa40783 100644
--- a/sys-auth/keystone/files/keystone.initd
+++ b/sys-auth/keystone/files/keystone.initd
@@ -32,7 +32,7 @@ start() {
 	ebegin "Starting ${SVCNAME}"
 	
 	start-stop-daemon --start --quiet --make-pidfile --pidfile "${PID_PATH}/${SVCNAME}.pid" \
-					  --exec /usr/bin/${SVCNAME}-all --background -- --config-file=${CONFIG_FILE}
+					  --exec /usr/bin/${SVCNAME}-all-2.7 --background -- --config-file=${CONFIG_FILE}
 	
 	eend $? "Failed to start ${SVCNAME}"
 }
@@ -44,7 +44,7 @@ stop() {
 	ebegin "Stopping ${SVCNAME}"
 	
 	start-stop-daemon --stop --pidfile "${PID_PATH}/${SVCNAME}.pid" \
-					  --exec /usr/bin/${SVCNAME}-all
+					  --exec /usr/bin/${SVCNAME}-all-2.7
 	eend $? "Failed to stop ${SVCNAME}"
 }
 

diff --git a/sys-auth/keystone/keystone-2012.2.ebuild b/sys-auth/keystone/keystone-2012.2.ebuild
index 2abf0c1..1f6936c 100644
--- a/sys-auth/keystone/keystone-2012.2.ebuild
+++ b/sys-auth/keystone/keystone-2012.2.ebuild
@@ -6,7 +6,6 @@ EAPI=4
 
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
-#RESTRICT_PYTHON_ABIS="3.*"
 
 inherit distutils