commit: 726e6054f6eec0592d3fc78b3bf550563fb4ca31
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 4 20:12:45 2020 +0000
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Feb 4 20:13:05 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=726e6054
sys-cluster/swift: 2.24.0 bump
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
sys-cluster/swift/Manifest | 1 +
.../{swift-2019.2.9999.ebuild => swift-2.24.0.ebuild} | 18 +++++++-----------
sys-cluster/swift/swift-2019.2.9999.ebuild | 18 +++++++-----------
3 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 68134a5f9e5..71eb9fd78c4 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -1,2 +1,3 @@
DIST swift-2.22.0.tar.gz 3070436 BLAKE2B
53049ba901cf5a46d4567c7fa3620b0ad486d88897beb75887d81c5beb747a08ff52e7eba93eab9e9e087c82447d99f0fd85c97211fb4e930ce5b27a1bba41f1
SHA512
855f9d35399251ac86d687b652a9372da4d2f03dff8dee1743357c14c79f6ea8903b7c67d99fed08b6b4cdfa2cfd6ecb78b010b2ee83195eda30c4a9463a5a0c
DIST swift-2.23.1.tar.gz 3044545 BLAKE2B
b3b06aefa7c58b718f7d9c1c1b9bc92f442b83202b8d5c2dbbb777650088f2d939f5e9d0fbe83cea38fd6635d072cd8bb3894d64ed9767dde203064c1b81cfdb
SHA512
48aa82b178f5e3901363c2b9eeeedeea12a58b1ba86cc46937dd9ec074ecc005b04a6ce732d4e9fce2497c6c62b659038da40ed43550256584bb371df4e596fb
+DIST swift-2.24.0.tar.gz 3177018 BLAKE2B
f465f0e8f58cc097b5b1fdbe5c9736ee3e2247d13d8ae1beeb7e736dd1246e7d8820cb7241afb67e651ad85c269a48d9dbeda3479dadd773bfc1fe3278731afe
SHA512
f8e3b0fec06776e095067b2c12f782a9a787c814cea8039ec32930c562be5c74b4b2bf4cb9dad3481953e5163bd051fe32f3074be7776fd1af0be94982d113b6
diff --git a/sys-cluster/swift/swift-2019.2.9999.ebuild
b/sys-cluster/swift/swift-2.24.0.ebuild
similarity index 93%
copy from sys-cluster/swift/swift-2019.2.9999.ebuild
copy to sys-cluster/swift/swift-2.24.0.ebuild
index c9ab6d0b2f7..f9125af321f 100644
--- a/sys-cluster/swift/swift-2019.2.9999.ebuild
+++ b/sys-cluster/swift/swift-2.24.0.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
PYTHON_COMPAT=( python3_6 python3_7 )
-inherit distutils-r1 eutils linux-info user
+inherit distutils-r1 eutils linux-info
DESCRIPTION="A highly available, distributed, and eventually consistent
object/blob store"
HOMEPAGE="https://launchpad.net/swift";
@@ -19,7 +19,7 @@ fi
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="account container doc +memcached object proxy"
+IUSE="account container doc +memcached +object proxy"
REQUIRED_USE="|| ( proxy account container object )"
CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
@@ -41,7 +41,9 @@ RDEPEND="
>=dev-python/cryptography-2.0.2[${PYTHON_USEDEP}]
>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]
memcached? ( net-misc/memcached )
- net-misc/rsync[xattr]"
+ net-misc/rsync[xattr]
+ acct-user/swift
+ acct-group/swift"
pkg_pretend() {
linux-info_pkg_setup
@@ -55,11 +57,6 @@ pkg_pretend() {
fi
}
-pkg_setup() {
- enewuser swift
- enewgroup swift
-}
-
src_prepare() {
sed -i 's/xattr/pyxattr/g' requirements.txt || die
sed -i '/^hacking/d' test-requirements.txt || die
@@ -88,8 +85,7 @@ python_install_all() {
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"
+ sed -i '/depend/a\nneed memcached'
"${D}/etc/init.d/swift-proxy"
fi
fi
if use account; then
diff --git a/sys-cluster/swift/swift-2019.2.9999.ebuild
b/sys-cluster/swift/swift-2019.2.9999.ebuild
index c9ab6d0b2f7..f9125af321f 100644
--- a/sys-cluster/swift/swift-2019.2.9999.ebuild
+++ b/sys-cluster/swift/swift-2019.2.9999.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
PYTHON_COMPAT=( python3_6 python3_7 )
-inherit distutils-r1 eutils linux-info user
+inherit distutils-r1 eutils linux-info
DESCRIPTION="A highly available, distributed, and eventually consistent
object/blob store"
HOMEPAGE="https://launchpad.net/swift";
@@ -19,7 +19,7 @@ fi
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="account container doc +memcached object proxy"
+IUSE="account container doc +memcached +object proxy"
REQUIRED_USE="|| ( proxy account container object )"
CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
@@ -41,7 +41,9 @@ RDEPEND="
>=dev-python/cryptography-2.0.2[${PYTHON_USEDEP}]
>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]
memcached? ( net-misc/memcached )
- net-misc/rsync[xattr]"
+ net-misc/rsync[xattr]
+ acct-user/swift
+ acct-group/swift"
pkg_pretend() {
linux-info_pkg_setup
@@ -55,11 +57,6 @@ pkg_pretend() {
fi
}
-pkg_setup() {
- enewuser swift
- enewgroup swift
-}
-
src_prepare() {
sed -i 's/xattr/pyxattr/g' requirements.txt || die
sed -i '/^hacking/d' test-requirements.txt || die
@@ -88,8 +85,7 @@ python_install_all() {
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"
+ sed -i '/depend/a\nneed memcached'
"${D}/etc/init.d/swift-proxy"
fi
fi
if use account; then
