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

[Matt Thode]

commit:     d3dddaeffd454ef56cdb9cac8d735f8623e46173
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 30 17:16:50 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Aug 30 17:16:50 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3dddaef

sys-cluster/swift: 2.19.0 rocky bump

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 sys-cluster/swift/Manifest                                            | 1 +
 sys-cluster/swift/{swift-2018.1.9999.ebuild => swift-2.19.0.ebuild}   | 2 ++
 sys-cluster/swift/swift-2018.1.9999.ebuild                            | 2 +-
 .../swift/{swift-2018.1.9999.ebuild => swift-2018.2.9999.ebuild}      | 4 +++-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 555ec0d2310..3ead5942947 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -1,2 +1,3 @@
 DIST swift-2.16.0.tar.gz 2466084 BLAKE2B 
9077e9745628ebd87f998ae963d19420e0410e29e02f8671dfb95b764d2bc4e5d97bd985e6d5d40496d152c6b931a03a789b372f94ad1b39cd17d3f0a6c9e658
 SHA512 
db67ee43931872dae9c8f7ff5732d0e075922e73a3660815f1ccb11a2310b94f887e293e9e5d4b1dda13c687365b7433ea9c575b209892f488647aed1a6f9696
 DIST swift-2.17.0.tar.gz 2527561 BLAKE2B 
baf8d2363bfd39062263542ddd01702e5f5847f3bbd2d227234da44ba742fa7e2bb6954569aab12082de67cfd785496a5530a0fc7613a0ad28d88bd62dbec9f8
 SHA512 
d5b13a63f549f1118eb1a27505a7444e09bedb532eed8e1ea34d370163dde2ce3e3911b9e4d6bea0d96f0a5c7d99bb103ed80ee8a547051fa29e9b4a09cced16
+DIST swift-2.19.0.tar.gz 2977206 BLAKE2B 
05f53e7deb7948924ed36f7fcef164dd72254a90329e88a20ffae1f97ca632967d2e4de34a95c29008f8d636ec95b6860238f77f28b2f9f7ebe78ddb8c784a6c
 SHA512 
fa6f08bacb7488762efaf8dd067cacd82adbc0ca773ee9b9c4a23d05d448eea9d79af2c9fbd619f4a458634e0af3cc3ce8fb8eb0d7cf0c10c7d3c28955000afd

diff --git a/sys-cluster/swift/swift-2018.1.9999.ebuild 
b/sys-cluster/swift/swift-2.19.0.ebuild
similarity index 97%
copy from sys-cluster/swift/swift-2018.1.9999.ebuild
copy to sys-cluster/swift/swift-2.19.0.ebuild
index 2cf086833fe..6e4ce71625c 100644
--- a/sys-cluster/swift/swift-2018.1.9999.ebuild
+++ b/sys-cluster/swift/swift-2.19.0.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
        ${CDEPEND}
        >=dev-python/dnspython-1.14.0:0[${PYTHON_USEDEP}]
        >=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+       !~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
        >=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
        >=dev-python/netifaces-0.5[${PYTHON_USEDEP}]
        !~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
@@ -41,6 +42,7 @@ RDEPEND="
        >=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}]
        >=dev-python/cryptography-1.6.0[${PYTHON_USEDEP}]
        !~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
+       >=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]
        memcached? ( net-misc/memcached )
        net-misc/rsync[xattr]"
 

diff --git a/sys-cluster/swift/swift-2018.1.9999.ebuild 
b/sys-cluster/swift/swift-2018.1.9999.ebuild
index 2cf086833fe..39349853cf6 100644
--- a/sys-cluster/swift/swift-2018.1.9999.ebuild
+++ b/sys-cluster/swift/swift-2018.1.9999.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://launchpad.net/swift";
 if [[ ${PV} == *9999 ]];then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/openstack/swift.git";
-       EGIT_BRANCH="stable/pike"
+       EGIT_BRANCH="stable/queens"
 else
        SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz";
        KEYWORDS="~amd64 ~arm64 ~x86"

diff --git a/sys-cluster/swift/swift-2018.1.9999.ebuild 
b/sys-cluster/swift/swift-2018.2.9999.ebuild
similarity index 96%
copy from sys-cluster/swift/swift-2018.1.9999.ebuild
copy to sys-cluster/swift/swift-2018.2.9999.ebuild
index 2cf086833fe..fc811ca9d0e 100644
--- a/sys-cluster/swift/swift-2018.1.9999.ebuild
+++ b/sys-cluster/swift/swift-2018.2.9999.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://launchpad.net/swift";
 if [[ ${PV} == *9999 ]];then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/openstack/swift.git";
-       EGIT_BRANCH="stable/pike"
+       EGIT_BRANCH="stable/rocky"
 else
        SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz";
        KEYWORDS="~amd64 ~arm64 ~x86"
@@ -31,6 +31,7 @@ RDEPEND="
        ${CDEPEND}
        >=dev-python/dnspython-1.14.0:0[${PYTHON_USEDEP}]
        >=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+       !~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
        >=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
        >=dev-python/netifaces-0.5[${PYTHON_USEDEP}]
        !~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
@@ -41,6 +42,7 @@ RDEPEND="
        >=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}]
        >=dev-python/cryptography-1.6.0[${PYTHON_USEDEP}]
        !~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
+       >=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]
        memcached? ( net-misc/memcached )
        net-misc/rsync[xattr]"