| 1 |
commit: 4b15ab94a395f70ba7b24fa989dd2e06ee2202e1 |
| 2 |
Author: Matthew Thode <mthode <AT> mthode <DOT> org> |
| 3 |
AuthorDate: Fri Nov 23 21:59:44 2012 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 23 21:59:44 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=4b15ab94 |
| 7 |
|
| 8 |
re-inserting restrict on python3 |
| 9 |
|
| 10 |
--- |
| 11 |
dev-python/python-keystoneclient/Manifest | 2 +- |
| 12 |
.../python-keystoneclient-2012.2.ebuild | 8 +++----- |
| 13 |
sys-auth/keystone/Manifest | 4 ++-- |
| 14 |
sys-auth/keystone/files/keystone.initd | 4 ++-- |
| 15 |
sys-auth/keystone/keystone-2012.2.ebuild | 1 + |
| 16 |
5 files changed, 9 insertions(+), 10 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest |
| 19 |
index d43aa68..db1b925 100644 |
| 20 |
--- a/dev-python/python-keystoneclient/Manifest |
| 21 |
+++ b/dev-python/python-keystoneclient/Manifest |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
DIST python-keystoneclient-2012.2~f1.tar.gz 49802 SHA256 697ba984cae4485c2e768ed5fc98ed9347d28019af633d9f46d006f4e0c31019 SHA512 2e1d3f544943bb062902fcff78bfec1e935a41652e2a39c6bf02b4f0eb919fb5c42ac23463d4fd3ee7f1635e50c937f82a1331c24b36194d7645296e5c47681f WHIRLPOOL 12747ad3ff89e54f43e193d4fc3ec773bf7ab0aaef6b161f35aa4c9316523c51d2927f2458d62a466991b13c6b1b9b550e663aa94cb3e081509cd3ad070bcf38 |
| 24 |
-EBUILD python-keystoneclient-2012.2.ebuild 782 SHA256 ca12ef7ca8ee22cbb24e8e5f581bade9a1fdf314a9c5c35efece30a75dd6ed10 SHA512 3b93e22cb4ccef1717ef50372747fa7ad1b161146405815f34d9217efa519cd0b9a5f8dfcb3b381621d79546c884a0d1407ee1a0ccaeb90c6756b8de73c1c1af WHIRLPOOL b75e585868712e0c7e34abaafedc4e912c5a1a680c5fc54495ea1cc162969a50cbc013a15a0864db09d4083c401906f0642ff831f1d922874b31ec8b05479a67 |
| 25 |
+EBUILD python-keystoneclient-2012.2.ebuild 727 SHA256 ed469e5ea3ff96e0cd082af13894baf3d8bf08c4c633c40cb3208ca3b9818107 SHA512 2e085a0cdc7271f131ef8b6939bacd74ea70ac1299a143a2075471b12b95f1849069b999f8f2275c1350056d1d84ecd7e715b993cde1e0658813a17abe166abe WHIRLPOOL 177955fc2426fde1abbe79dcbbfc82dbbf9412b384afe86391c07cbc31b2ffd4ff50d4f8bec711ace4d6da8b87dcb8486b6c59bee40f3e4b647cfeaeb1d84ab5 |
| 26 |
EBUILD python-keystoneclient-9999.ebuild 723 SHA256 e723374dc97883a7f8d5e868c44df037163238e94d6fb926f874c62c5d5b67a8 SHA512 0cfc09dbc6519cbfea73f928d1eb1699ab55f385d844bcda07ade4f8833df164608a58cae28636d3cc19c9de5f3d40e8e5e67723aa0268d9857e55ee6c4b7cc8 WHIRLPOOL 93d715300d493ee01229a5a773041a2b92b30dad209b008706cb4a1ef4038ab38ab13a2609affe5bb3a2a2f848288fa51b1f6e831420beba05cdc4b7fd884eae |
| 27 |
MISC metadata.xml 187 SHA256 773142fc211f4f8cd167704604281cbf366eabef6751c52a2895f63e9761a5a2 SHA512 81ef1f7d248dbdf4183b6700885e86071cee75bc1b69c3ed590c18193743da2562be527f212f088fe8ae9242b0aaaf7907912badae1264f14c2f5dde619c3fba WHIRLPOOL 32c1d67c8a74e4f3606e5aedc066ea7cdf09292beea0574c25d7448294b42ee9146a7724fcb9a7da04558e55c07619702e38e90656b962638cf747cb2c67ede3 |
| 28 |
|
| 29 |
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-2012.2.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-2012.2.ebuild |
| 30 |
index 7d66646..4149826 100644 |
| 31 |
--- a/dev-python/python-keystoneclient/python-keystoneclient-2012.2.ebuild |
| 32 |
+++ b/dev-python/python-keystoneclient/python-keystoneclient-2012.2.ebuild |
| 33 |
@@ -2,7 +2,7 @@ |
| 34 |
# Distributed under the terms of the GNU General Public License v2 |
| 35 |
# $Header: $ |
| 36 |
|
| 37 |
-EAPI=3 |
| 38 |
+EAPI=4 |
| 39 |
PYTHON_DEPEND=2 |
| 40 |
SUPPORT_PYTHON_ABIS=1 |
| 41 |
RESTRICT_PYTHON_ABIS="3.*" |
| 42 |
@@ -19,9 +19,8 @@ SLOT="0" |
| 43 |
KEYWORDS="~amd64" |
| 44 |
IUSE="" |
| 45 |
|
| 46 |
-DEPEND="dev-python/setuptools |
| 47 |
- dev-python/argparse |
| 48 |
- dev-python/coverage |
| 49 |
+DEPEND="" |
| 50 |
+RDEPEND="dev-python/coverage |
| 51 |
dev-python/httplib2 |
| 52 |
dev-python/mock |
| 53 |
dev-python/mox |
| 54 |
@@ -29,4 +28,3 @@ DEPEND="dev-python/setuptools |
| 55 |
dev-python/pep8 |
| 56 |
dev-python/prettytable |
| 57 |
dev-python/simplejson" |
| 58 |
-RDEPEND="${DEPEND}" |
| 59 |
|
| 60 |
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest |
| 61 |
index d24a1ed..242d27d 100644 |
| 62 |
--- a/sys-auth/keystone/Manifest |
| 63 |
+++ b/sys-auth/keystone/Manifest |
| 64 |
@@ -1,8 +1,8 @@ |
| 65 |
AUX keystone.confd 67 SHA256 8faa32d3354df30b1d1c98cf481be162c27583b84e387f8da57611b689bc2448 SHA512 75b040eda6ef8701e8dac8f34b3dd3c96aedde3b005fac01f20592b3d8afb8bbce57fadc466cda69d7192f96460a5c704d941a16b96d02f3e80f1a3e264c2efe WHIRLPOOL 8e8cb4e8991ca8d8cf1e874bd2286900ca63379c73793bca906ecfc1318ee63a8af6d1f6090e9ef296bfbe5abf018368a5ad6430de1efdea0db626d8c697f3c4 |
| 66 |
-AUX keystone.initd 1077 SHA256 a58f2527f1efe7d027cd7fa1f59e490ae48c47f5ea944dd74fe003fae8316bba SHA512 1a1ad0e2d5e7e94ccd9fbf5a73f78d1b294d236555aaa2a33e33660f117095175ad1aec46d46a7c2e74f3513c9427f44236eef8fdc102d6686d4b47f3355ac0a WHIRLPOOL d383d908c4ab54ad88a141ed812de86f69de84afea936bab827ddb773c44384856bb2a2e194958c827fa2eb3b0addff72923ca175db11f58da47befa8764c67a |
| 67 |
+AUX keystone.initd 1069 SHA256 70cbe2d37f139f4e7d99ac128b89d399e291cabd38b9db6e25e9d462f61b3602 SHA512 1442b29fba14ecf055ebda63bfd89f128019be1cd5ae838e27bc91ae6d6902154bdc441a384ec1406915d471d9319f585086075faf2b326ba1f65a853314a88f WHIRLPOOL 97fe632d7977d95f87b42925f78c81b3c431180a94fbc984a949649c05b45da5172b093b3511d57edf1ab59fd90242f49486b83e769745dd329c7cd6e904d992 |
| 68 |
DIST keystone-2012.1.2.tar.gz 447876 SHA256 0634eac122f38af11f73e7e8ef67d4dbb27e4179a23e78682f6b5212f6619c90 |
| 69 |
DIST keystone-2012.2.tar.gz 547438 SHA256 1aed5911c00ebffea28cffbc4793921fb2a9c000e9bb967326b7db751c7281cc SHA512 bb6bb4499737474b49012fffffc4a7950a8427adb0b564f40d55bb7a43846e788266810d09ff54707709fba1db07a8b4b8d531e0547399490fe688e7b5d1fd32 WHIRLPOOL 825c9ac7357148cc0f9c732e946c6c07ccdf21ded3cf0f07d25c66615b991c6dcf72d48540c703c33addbf0e3c74c76a72709dd2ab4fe8b90c31addd92373912 |
| 70 |
EBUILD keystone-2012.1.2.ebuild 893 SHA256 daa985940f05c56592acbb7868d054613591e2aae12e4d2ef2eb3e092e263010 SHA512 f0de6f8ecb1f5e3d5a32eac209866406e60f5845a4c9520cf779a05f5b1606a2fce8c3675df013079bc2dc8b5604e38ece779cb3d8f1e6042a5601e5e827102c WHIRLPOOL bc2d5ac99d54323a4f77da5a71ffe1ada949c7fe88d2cc7f916d62a49330c76bcf5dbf05cc0d025334668d0fd4a9573763bb27737769a3f0f68f9a8370130bd2 |
| 71 |
-EBUILD keystone-2012.2.ebuild 1500 SHA256 b2aae5c2a73cd3ae4a06e8047e02237de8d988f362cbf455fc12ca85ab13a42c SHA512 cd2747f131c3e5bf14a6ca2ade321db6443639ef8113912cf3fa9ffb1a22cd9f211e9205ed3a4046e6d700283f483c0ce9a31ca7ec653511b643ad2b86c2e7ad WHIRLPOOL c0e627c8b8d6a83588e5506abb65fb0fa5ce64cb401cf0a6641776d0a4ce5cde50f3a51cfa9c31a9fe9484c3e4075095908d84973b07d65e9a38e0819da4aeb9 |
| 72 |
+EBUILD keystone-2012.2.ebuild 1527 SHA256 63fc00dabaa8022411a173b82c5e3850fb63dbf66a3ae372173c700b3f578b93 SHA512 70229d6accf98d16e234a3f33432bf178d34d20c443ee93cddc5ce01582c079c1d56b0967e813fa1c4f2590e4582ef221554fd4f2656e1feeda6b5bd94d227d8 WHIRLPOOL 7c32317645463a69f74925cac91f2dd0a86bfdf5268e979c7a604c0eea77cf26d6c85bb5021a0278c6087d038e164f3e5e3dd8d86b0607c5eab6172d905a3467 |
| 73 |
EBUILD keystone-9999.ebuild 715 SHA256 9279e0d0c9a4bfd2a4076f310136bcee661e69ec14fd35fa797366402e8ab4ae SHA512 b63f413aaa4a92d6fbfcc70a53d1b9e4b99264d37a2b79703b1a993c7470487f8a5cdb3009c8a88e30d99f2b4d6d3e04762caf1d8ce7ba1ffbdf3124c2ba2ebb WHIRLPOOL d8544675a75bcd978162e066298e01243e1596315953a267fb602470c578f1c2180218d055d20b778c00e9f0989d4a545abad1fe3dc7bd74c7fe04b96e9f6454 |
| 74 |
MISC metadata.xml 187 SHA256 773142fc211f4f8cd167704604281cbf366eabef6751c52a2895f63e9761a5a2 SHA512 81ef1f7d248dbdf4183b6700885e86071cee75bc1b69c3ed590c18193743da2562be527f212f088fe8ae9242b0aaaf7907912badae1264f14c2f5dde619c3fba WHIRLPOOL 32c1d67c8a74e4f3606e5aedc066ea7cdf09292beea0574c25d7448294b42ee9146a7724fcb9a7da04558e55c07619702e38e90656b962638cf747cb2c67ede3 |
| 75 |
|
| 76 |
diff --git a/sys-auth/keystone/files/keystone.initd b/sys-auth/keystone/files/keystone.initd |
| 77 |
index aa40783..dde18b0 100644 |
| 78 |
--- a/sys-auth/keystone/files/keystone.initd |
| 79 |
+++ b/sys-auth/keystone/files/keystone.initd |
| 80 |
@@ -32,7 +32,7 @@ start() { |
| 81 |
ebegin "Starting ${SVCNAME}" |
| 82 |
|
| 83 |
start-stop-daemon --start --quiet --make-pidfile --pidfile "${PID_PATH}/${SVCNAME}.pid" \ |
| 84 |
- --exec /usr/bin/${SVCNAME}-all-2.7 --background -- --config-file=${CONFIG_FILE} |
| 85 |
+ --exec /usr/bin/${SVCNAME}-all --background -- --config-file=${CONFIG_FILE} |
| 86 |
|
| 87 |
eend $? "Failed to start ${SVCNAME}" |
| 88 |
} |
| 89 |
@@ -44,7 +44,7 @@ stop() { |
| 90 |
ebegin "Stopping ${SVCNAME}" |
| 91 |
|
| 92 |
start-stop-daemon --stop --pidfile "${PID_PATH}/${SVCNAME}.pid" \ |
| 93 |
- --exec /usr/bin/${SVCNAME}-all-2.7 |
| 94 |
+ --exec /usr/bin/${SVCNAME}-all |
| 95 |
eend $? "Failed to stop ${SVCNAME}" |
| 96 |
} |
| 97 |
|
| 98 |
|
| 99 |
diff --git a/sys-auth/keystone/keystone-2012.2.ebuild b/sys-auth/keystone/keystone-2012.2.ebuild |
| 100 |
index 1f6936c..677b14c 100644 |
| 101 |
--- a/sys-auth/keystone/keystone-2012.2.ebuild |
| 102 |
+++ b/sys-auth/keystone/keystone-2012.2.ebuild |
| 103 |
@@ -6,6 +6,7 @@ EAPI=4 |
| 104 |
|
| 105 |
PYTHON_DEPEND="2" |
| 106 |
SUPPORT_PYTHON_ABIS="1" |
| 107 |
+RESTRICT_PYTHON_ABIS="3.*" |
| 108 |
|
| 109 |
inherit distutils |
Archives