Gentoo Archives: gentoo-commits

From: Matthew Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/swift/
Date: Wed, 04 Mar 2020 16:29:51
Message-Id: 1583339383.660fab2dfeee1e7e77845cdeba77b7e4d00a0f76.prometheanfire@gentoo
1 commit: 660fab2dfeee1e7e77845cdeba77b7e4d00a0f76
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 4 16:27:10 2020 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 4 16:29:43 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=660fab2d
7
8 sys-cluster/swift: 2.24.0 stable amd64/x86 with cleanup
9
10 Package-Manager: Portage-2.3.89, Repoman-2.3.20
11 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
12
13 sys-cluster/swift/Manifest | 1 -
14 sys-cluster/swift/swift-2.22.0-r1.ebuild | 123 -------------------------------
15 sys-cluster/swift/swift-2.24.0-r1.ebuild | 2 +-
16 3 files changed, 1 insertion(+), 125 deletions(-)
17
18 diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
19 index 71eb9fd78c4..cf21dc9fb82 100644
20 --- a/sys-cluster/swift/Manifest
21 +++ b/sys-cluster/swift/Manifest
22 @@ -1,3 +1,2 @@
23 -DIST swift-2.22.0.tar.gz 3070436 BLAKE2B 53049ba901cf5a46d4567c7fa3620b0ad486d88897beb75887d81c5beb747a08ff52e7eba93eab9e9e087c82447d99f0fd85c97211fb4e930ce5b27a1bba41f1 SHA512 855f9d35399251ac86d687b652a9372da4d2f03dff8dee1743357c14c79f6ea8903b7c67d99fed08b6b4cdfa2cfd6ecb78b010b2ee83195eda30c4a9463a5a0c
24 DIST swift-2.23.1.tar.gz 3044545 BLAKE2B b3b06aefa7c58b718f7d9c1c1b9bc92f442b83202b8d5c2dbbb777650088f2d939f5e9d0fbe83cea38fd6635d072cd8bb3894d64ed9767dde203064c1b81cfdb SHA512 48aa82b178f5e3901363c2b9eeeedeea12a58b1ba86cc46937dd9ec074ecc005b04a6ce732d4e9fce2497c6c62b659038da40ed43550256584bb371df4e596fb
25 DIST swift-2.24.0.tar.gz 3177018 BLAKE2B f465f0e8f58cc097b5b1fdbe5c9736ee3e2247d13d8ae1beeb7e736dd1246e7d8820cb7241afb67e651ad85c269a48d9dbeda3479dadd773bfc1fe3278731afe SHA512 f8e3b0fec06776e095067b2c12f782a9a787c814cea8039ec32930c562be5c74b4b2bf4cb9dad3481953e5163bd051fe32f3074be7776fd1af0be94982d113b6
26
27 diff --git a/sys-cluster/swift/swift-2.22.0-r1.ebuild b/sys-cluster/swift/swift-2.22.0-r1.ebuild
28 deleted file mode 100644
29 index 84ba4cd0845..00000000000
30 --- a/sys-cluster/swift/swift-2.22.0-r1.ebuild
31 +++ /dev/null
32 @@ -1,123 +0,0 @@
33 -# Copyright 1999-2020 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -PYTHON_COMPAT=( python3_6 python3_7 )
38 -
39 -inherit distutils-r1 eutils linux-info user
40 -
41 -DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store"
42 -HOMEPAGE="https://launchpad.net/swift"
43 -if [[ ${PV} == *9999 ]];then
44 - inherit git-r3
45 - EGIT_REPO_URI="https://github.com/openstack/swift.git"
46 - EGIT_BRANCH="stable/stein"
47 -else
48 - SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
49 - KEYWORDS="amd64 ~arm64 x86"
50 -fi
51 -
52 -LICENSE="Apache-2.0"
53 -SLOT="0"
54 -IUSE="account container doc +memcached object proxy"
55 -REQUIRED_USE="|| ( proxy account container object )"
56 -
57 -CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
58 -DEPEND="
59 - dev-python/setuptools[${PYTHON_USEDEP}]
60 - ${CDEPEND}"
61 -
62 -RDEPEND="
63 - ${CDEPEND}
64 - >=dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
65 - >=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
66 - >=dev-python/netifaces-0.8[${PYTHON_USEDEP}]
67 - !~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
68 - !~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}]
69 - >=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
70 - >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
71 - dev-python/pyxattr[${PYTHON_USEDEP}]
72 - >=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}]
73 - >=dev-python/cryptography-2.0.2[${PYTHON_USEDEP}]
74 - memcached? ( net-misc/memcached )
75 - net-misc/rsync[xattr]"
76 -
77 -pkg_pretend() {
78 - linux-info_pkg_setup
79 - CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
80 - ~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
81 - ~ZFS"
82 - if linux_config_exists; then
83 - for module in ${CONFIG_CHECK}; do
84 - linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
85 - done
86 - fi
87 -}
88 -
89 -pkg_setup() {
90 - enewuser swift
91 - enewgroup swift
92 -}
93 -
94 -src_prepare() {
95 - sed -i 's/xattr/pyxattr/g' requirements.txt || die
96 - sed -i '/^hacking/d' test-requirements.txt || die
97 - distutils-r1_python_prepare_all
98 -}
99 -
100 -src_test() {
101 - # https://bugs.launchpad.net/swift/+bug/1249727
102 - find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die
103 - SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die
104 -}
105 -
106 -python_install_all() {
107 - distutils-r1_python_install_all
108 - keepdir /etc/swift
109 - insinto /etc/swift
110 -
111 - newins "etc/swift.conf-sample" "swift.conf"
112 - newins "etc/rsyncd.conf-sample" "rsyncd.conf"
113 - newins "etc/mime.types-sample" "mime.types-sample"
114 - newins "etc/memcache.conf-sample" "memcache.conf-sample"
115 - newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
116 - newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
117 -
118 - if use proxy; then
119 - newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
120 - newins "etc/proxy-server.conf-sample" "proxy-server.conf"
121 - if use memcached; then
122 - sed -i '/depend/a\
123 - need memcached' "${D}/etc/init.d/swift-proxy"
124 - fi
125 - fi
126 - if use account; then
127 - newinitd "${FILESDIR}/swift-account.initd" "swift-account"
128 - newins "etc/account-server.conf-sample" "account-server.conf"
129 - fi
130 - if use container; then
131 - newinitd "${FILESDIR}/swift-container.initd" "swift-container"
132 - newins "etc/container-server.conf-sample" "container-server.conf"
133 - fi
134 - if use object; then
135 - newinitd "${FILESDIR}/swift-object.initd" "swift-object"
136 - newins "etc/object-server.conf-sample" "object-server.conf"
137 - newins "etc/object-expirer.conf-sample" "object-expirer.conf"
138 - fi
139 -
140 - if use doc; then
141 - doman doc/manpages/*
142 - dodoc -r doc/{s3api,saio,source}
143 - fi
144 -
145 - fowners root:swift "/etc/swift"
146 - fperms 0750 /etc/swift
147 -}
148 -
149 -pkg_postinst() {
150 - elog "Openstack swift will default to using insecure http unless a"
151 - elog "certificate is created in /etc/swift/cert.crt and the associated key"
152 - elog "in /etc/swift/cert.key. These can be created with the following:"
153 - elog " * cd /etc/swift"
154 - elog " * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
155 -}
156
157 diff --git a/sys-cluster/swift/swift-2.24.0-r1.ebuild b/sys-cluster/swift/swift-2.24.0-r1.ebuild
158 index dfb4786356f..0209967c131 100644
159 --- a/sys-cluster/swift/swift-2.24.0-r1.ebuild
160 +++ b/sys-cluster/swift/swift-2.24.0-r1.ebuild
161 @@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
162 EGIT_BRANCH="stable/train"
163 else
164 SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
165 - KEYWORDS="~amd64 ~arm64 ~x86"
166 + KEYWORDS="amd64 ~arm64 x86"
167 fi
168
169 LICENSE="Apache-2.0"