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

[Matt Thode]

commit:     54f6802351c01c9fe1cff1c71dcfe93a61713bfb
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  1 23:27:00 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Jun  1 23:55:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54f68023

sys-cluster/swift: bup 2.10.2 and 2.13.1

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sys-cluster/swift/Manifest                         |   3 +-
 sys-cluster/swift/swift-2.10.0.ebuild              | 108 ---------------------
 ...{swift-2.10.1-r1.ebuild => swift-2.10.2.ebuild} |   0
 ...{swift-2.10.0-r1.ebuild => swift-2.13.1.ebuild} |  13 +--
 4 files changed, 7 insertions(+), 117 deletions(-)

diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 00a3b1401a4..37f5bb7634b 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -1,3 +1,4 @@
-DIST swift-2.10.0.tar.gz 1868659 SHA256 8f6f05c1571173dc1c159f74dfe92ac4bb5a0aa3c9adf43fb71c57e643e5e355 SHA512 7f3e3280f0ccc4d3733fc7cf9d4d348f80de4dcd832af8e19c35f04f9ab07afe5eb7af465f20f6a37c8d8b6373ff01d491afdf0cf841949ac0cb0a26c139afb8 WHIRLPOOL d5add284951af467337ce9f856d27d29b491b7fc40df034b7c1350b9a067e2b969bb0a5894ecc4c85a3df267ce746ec05938585408ccec64d82fe28d73db1e07
 DIST swift-2.10.1.tar.gz 1882648 SHA256 11efe34c68a3fee908b434ede79cdb387862e724971b44e9e02083117aea5d95 SHA512 8307ed1f014f502a6e2d63b1b9c28f3229c035e34397a9c5369470085c6e54a9ac33fde0106beee975bd860c4be169f4da7231b7991ab6472596f6c5b614b178 WHIRLPOOL bc010464b00bb8a7eed96767ec7fccb99baf03250ab64728bc712054276b4c2b28e1432bde76687451ebef26663d2f64335f6e90471e2666f7ca207e5acf7f4b
+DIST swift-2.10.2.tar.gz 1899226 SHA256 310d0c762fc4bfae7beaa7a2a1d7cddcc7478e817f40b5322f9b7403772ce53b SHA512 9efcb764d18524327a1e3164bcf79fbeb25fefafb7b8cf24dda22477d5d08e9d9a76c851d3b51c86e22a02f30004d5421500150c42f5963e15882aec894e09e8 WHIRLPOOL ded7d106277a8c493a494633039b19eae6d8e3783d9a4a05f73ed75869402758e3650a292f6758334d45197d4995a08d6b6f1cc88fd68b6a005c3e026a460159
 DIST swift-2.13.0.tar.gz 1928128 SHA256 166cf5181a1cad5a564fab3b387297a431e2ef9fb224753f64cc4ba04016fb48 SHA512 e8f26ede5d51282ca18c72e5b66579236ccce2416441381c60089365f197324af05538de5788df4e81c5dacfe808a7b6fdbaa43de19b3a5319b794ff13211710 WHIRLPOOL 3bbd9714b6ef36f968847fff95f013c60de48671af102c36ede437c72e5143d894f9934f4aa622e6d5334e8601ee6396db6efc2b9f3639e0b4b6faf87b3ec4b5
+DIST swift-2.13.1.tar.gz 1940686 SHA256 785a098b93eceeb745fe85bafba8a8bda20a6aec64f76fb9e4d58bb671eb2bab SHA512 6f08239bbeebfd213d2d7bb23c83507bf033288bb5125f5fd7f37517d8b3ad0b050220c1ad03632c1ab4723a98a9068b146e38c360e6786159a6f8638f4d5d79 WHIRLPOOL 016ddab1201c0895b00b05a1c5a84628e3f69f306780e730ada5c8cae63e75c0959cec8be8c170abba42ea6b63bd32dd5ed6d9b6d37f72534c3a05f3c2cea4e4

diff --git a/sys-cluster/swift/swift-2.10.0.ebuild b/sys-cluster/swift/swift-2.10.0.ebuild
deleted file mode 100644
index 00065e0f077..00000000000
--- a/sys-cluster/swift/swift-2.10.0.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store"
-HOMEPAGE="https://launchpad.net/swift"
-SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="proxy account container object +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}]
-	${CDEPEND}"
-
-RDEPEND="
-	${CDEPEND}
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.17.4[${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}]
-	!~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	dev-python/pyxattr[${PYTHON_USEDEP}]
-	>=dev-python/PyECLib-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
-	memcached? ( net-misc/memcached )
-	net-misc/rsync[xattr]"
-
-CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
-~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
-~ZFS"
-
-pkg_setup() {
-	enewuser swift
-	enewgroup swift
-}
-
-src_prepare() {
-	sed -i 's/xattr/pyxattr/g' swift.egg-info/requires.txt || die
-	sed -i 's/xattr/pyxattr/g' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-src_test () {
-	# https://bugs.launchpad.net/swift/+bug/1249727
-	find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die
-	SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die
-}
-
-python_install() {
-	distutils-r1_python_install
-	keepdir /etc/swift
-	insinto /etc/swift
-
-	newins "etc/swift.conf-sample" "swift.conf"
-	newins "etc/rsyncd.conf-sample" "rsyncd.conf"
-	newins "etc/mime.types-sample" "mime.types-sample"
-	newins "etc/memcache.conf-sample" "memcache.conf-sample"
-	newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
-	newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
-
-	if use proxy; then
-		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
-		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
-		if use memcached; then
-			sed -i '/depend/a\
-    need memcached' "${D}/etc/init.d/swift-proxy"
-		fi
-	fi
-	if use account; then
-		newinitd "${FILESDIR}/swift-account.initd" "swift-account"
-		newins "etc/account-server.conf-sample" "account-server.conf"
-	fi
-	if use container; then
-		newinitd "${FILESDIR}/swift-container.initd" "swift-container"
-		newins "etc/container-server.conf-sample" "container-server.conf"
-	fi
-	if use object; then
-		newinitd "${FILESDIR}/swift-object.initd" "swift-object"
-		newins "etc/object-server.conf-sample" "object-server.conf"
-		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
-	fi
-
-	fowners swift:swift "/etc/swift" || die "fowners failed"
-}
-
-pkg_postinst() {
-	elog "Openstack swift will default to using insecure http unless a"
-	elog "certificate is created in /etc/swift/cert.crt and the associated key"
-	elog "in /etc/swift/cert.key.  These can be created with the following:"
-	elog "  * cd /etc/swift"
-	elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
-}

diff --git a/sys-cluster/swift/swift-2.10.1-r1.ebuild b/sys-cluster/swift/swift-2.10.2.ebuild
similarity index 100%
rename from sys-cluster/swift/swift-2.10.1-r1.ebuild
rename to sys-cluster/swift/swift-2.10.2.ebuild

diff --git a/sys-cluster/swift/swift-2.10.0-r1.ebuild b/sys-cluster/swift/swift-2.13.1.ebuild
similarity index 92%
rename from sys-cluster/swift/swift-2.10.0-r1.ebuild
rename to sys-cluster/swift/swift-2.13.1.ebuild
index dea08e05ae5..6ce4c0551b2 100644
--- a/sys-cluster/swift/swift-2.10.0-r1.ebuild
+++ b/sys-cluster/swift/swift-2.13.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 eutils linux-info user
@@ -16,16 +16,14 @@ KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="proxy account container object +memcached"
 REQUIRED_USE="|| ( proxy account container object )"
 
-CDEPEND="
-	>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	${CDEPEND}"
 
 RDEPEND="
 	${CDEPEND}
-	virtual/python-dnspython[${PYTHON_USEDEP}]
+	>=dev-python/dnspython-1.14.0:0[${PYTHON_USEDEP}]
 	>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
 	>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
 	>=dev-python/netifaces-0.5[${PYTHON_USEDEP}]
@@ -34,7 +32,7 @@ RDEPEND="
 	>=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 	dev-python/pyxattr[${PYTHON_USEDEP}]
-	>=dev-python/PyECLib-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
 	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
 	memcached? ( net-misc/memcached )
@@ -58,7 +56,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed -i 's/xattr/pyxattr/g' swift.egg-info/requires.txt || die
 	sed -i 's/xattr/pyxattr/g' requirements.txt || die
 	sed -i '/^hacking/d' test-requirements.txt || die
 	distutils-r1_python_prepare_all