[gentoo-commits] repo/gentoo:master commit in: sys-cluster/swift/

[Matt Thode]

commit:     669caa90f439dc8f49b7891e7b717202a57697c9
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  5 14:42:58 2015 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Oct  5 14:43:47 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=669caa90

sys-cluster/swift: bup for liberty

Package-Manager: portage-2.2.20.1

 sys-cluster/swift/Manifest                                   | 2 +-
 sys-cluster/swift/{swift-2.4.0.ebuild => swift-2.5.0.ebuild} | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 5f51ec9..40007f7 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -1,2 +1,2 @@
 DIST swift-2.3.0.tar.gz 1346492 SHA256 
7225061f92597e7eaf6196c9336c5e590c7626b7e84126c51e8ca5bf5b7bdae1 SHA512 
cf8e1e640f1f679516ce1af772c93f860d7d1f1b6712fa9b89dda1688a4b02cd3fdadc443f4911be5927544f0cffe365ff4174ef6e44d118cb56c7b05cd630b9
 WHIRLPOOL 
aade05a7b8f23e680aa932150e8edbc2e9b6bb83528ffa62becdf4d29c8597b20e873017c3c6a95e66448c13c60531abee6ed0bd9b524b6319642c0436ad5e4c
-DIST swift-2.4.0.tar.gz 1418193 SHA256 
082b436e58684b5cf7682a175e56c3d7dbd24d72c0251ddf3074a8596e4abd40 SHA512 
f4ac4f0f866106d2c2bb8f38c0c3810efebf47738c000488041722250745e4d3f4d4a4c710388021c1cc44b6b372a5f6fd03fe9670e005345669bf6199e6e311
 WHIRLPOOL 
e3293d304a8a52146efa04d7fadd0ab11fed5d62127e1757b8701452719fa2839dbfe7a452e0677071c78eb32b832a732c978f6229b8c927c76632df4df44990
+DIST swift-2.5.0.tar.gz 1524422 SHA256 
ede167854a47577ebd98765cf31476f79045f0739fab65f59b37e0ec184d4a42 SHA512 
770d1aeb62803288b29edbac7576a8e870f09df5d111ba29d4845c755d65d66b501c9e95d6468e0c635625f04b7009fa2b6d769307348b66984f5cf5ea3481ed
 WHIRLPOOL 
ba00f4350c0f2b645f595b1dde8974dfdadcd66f33184776f478db123ec4dd5bb3c1e6cbe42b8cfb856391ceb6da3d1f212ceb3428280195c1993d2146ece435

diff --git a/sys-cluster/swift/swift-2.4.0.ebuild 
b/sys-cluster/swift/swift-2.5.0.ebuild
similarity index 98%
rename from sys-cluster/swift/swift-2.4.0.ebuild
rename to sys-cluster/swift/swift-2.5.0.ebuild
index e8772d4..a5018b9 100644
--- a/sys-cluster/swift/swift-2.4.0.ebuild
+++ b/sys-cluster/swift/swift-2.5.0.ebuild
@@ -17,10 +17,12 @@ KEYWORDS="~amd64 ~x86"
 IUSE="proxy account container object test +memcached"
 REQUIRED_USE="|| ( proxy account container object )"
 
+CDEPEND="
+       >=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
+       <dev-python/pbr-2.0[${PYTHON_USEDEP}]"
 DEPEND="
        dev-python/setuptools[${PYTHON_USEDEP}]
-       >=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
-       <dev-python/pbr-1.0[${PYTHON_USEDEP}]
+       ${CDEPEND}
        test? (
                ${RDEPEND}
                dev-python/coverage[${PYTHON_USEDEP}]
@@ -37,6 +39,7 @@ DEPEND="
        )"
 
 RDEPEND="
+       ${CDEPEND}
        >=dev-python/dnspython-1.9.4[${PYTHON_USEDEP}]
        >=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
        !~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]