1 |
commit: 8820cb7bb1f236f498fa79062e0e1b6cf332ff56 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jun 30 16:08:27 2017 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 30 16:12:03 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8820cb7b |
7 |
|
8 |
sys-cluster/swift: 2.13.1 and 2.10.2 stable amd64 and x86 with cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
11 |
|
12 |
sys-cluster/swift/Manifest | 2 - |
13 |
sys-cluster/swift/swift-2.10.1.ebuild | 116 ---------------------------------- |
14 |
sys-cluster/swift/swift-2.10.2.ebuild | 2 +- |
15 |
sys-cluster/swift/swift-2.13.0.ebuild | 113 --------------------------------- |
16 |
sys-cluster/swift/swift-2.13.1.ebuild | 2 +- |
17 |
5 files changed, 2 insertions(+), 233 deletions(-) |
18 |
|
19 |
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest |
20 |
index 37f5bb7634b..f4b371e58e4 100644 |
21 |
--- a/sys-cluster/swift/Manifest |
22 |
+++ b/sys-cluster/swift/Manifest |
23 |
@@ -1,4 +1,2 @@ |
24 |
-DIST swift-2.10.1.tar.gz 1882648 SHA256 11efe34c68a3fee908b434ede79cdb387862e724971b44e9e02083117aea5d95 SHA512 8307ed1f014f502a6e2d63b1b9c28f3229c035e34397a9c5369470085c6e54a9ac33fde0106beee975bd860c4be169f4da7231b7991ab6472596f6c5b614b178 WHIRLPOOL bc010464b00bb8a7eed96767ec7fccb99baf03250ab64728bc712054276b4c2b28e1432bde76687451ebef26663d2f64335f6e90471e2666f7ca207e5acf7f4b |
25 |
DIST swift-2.10.2.tar.gz 1899226 SHA256 310d0c762fc4bfae7beaa7a2a1d7cddcc7478e817f40b5322f9b7403772ce53b SHA512 9efcb764d18524327a1e3164bcf79fbeb25fefafb7b8cf24dda22477d5d08e9d9a76c851d3b51c86e22a02f30004d5421500150c42f5963e15882aec894e09e8 WHIRLPOOL ded7d106277a8c493a494633039b19eae6d8e3783d9a4a05f73ed75869402758e3650a292f6758334d45197d4995a08d6b6f1cc88fd68b6a005c3e026a460159 |
26 |
-DIST swift-2.13.0.tar.gz 1928128 SHA256 166cf5181a1cad5a564fab3b387297a431e2ef9fb224753f64cc4ba04016fb48 SHA512 e8f26ede5d51282ca18c72e5b66579236ccce2416441381c60089365f197324af05538de5788df4e81c5dacfe808a7b6fdbaa43de19b3a5319b794ff13211710 WHIRLPOOL 3bbd9714b6ef36f968847fff95f013c60de48671af102c36ede437c72e5143d894f9934f4aa622e6d5334e8601ee6396db6efc2b9f3639e0b4b6faf87b3ec4b5 |
27 |
DIST swift-2.13.1.tar.gz 1940686 SHA256 785a098b93eceeb745fe85bafba8a8bda20a6aec64f76fb9e4d58bb671eb2bab SHA512 6f08239bbeebfd213d2d7bb23c83507bf033288bb5125f5fd7f37517d8b3ad0b050220c1ad03632c1ab4723a98a9068b146e38c360e6786159a6f8638f4d5d79 WHIRLPOOL 016ddab1201c0895b00b05a1c5a84628e3f69f306780e730ada5c8cae63e75c0959cec8be8c170abba42ea6b63bd32dd5ed6d9b6d37f72534c3a05f3c2cea4e4 |
28 |
|
29 |
diff --git a/sys-cluster/swift/swift-2.10.1.ebuild b/sys-cluster/swift/swift-2.10.1.ebuild |
30 |
deleted file mode 100644 |
31 |
index 564cd0a1638..00000000000 |
32 |
--- a/sys-cluster/swift/swift-2.10.1.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,116 +0,0 @@ |
35 |
-# Copyright 1999-2017 Gentoo Foundation |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=5 |
39 |
-PYTHON_COMPAT=( python2_7 ) |
40 |
- |
41 |
-inherit distutils-r1 eutils linux-info user |
42 |
- |
43 |
-DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store" |
44 |
-HOMEPAGE="https://launchpad.net/swift" |
45 |
-SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz" |
46 |
- |
47 |
-LICENSE="Apache-2.0" |
48 |
-SLOT="0" |
49 |
-KEYWORDS="amd64 ~arm64 x86" |
50 |
-IUSE="proxy account container object +memcached" |
51 |
-REQUIRED_USE="|| ( proxy account container object )" |
52 |
- |
53 |
-CDEPEND=" |
54 |
- >=dev-python/pbr-0.8.0[${PYTHON_USEDEP}] |
55 |
- <dev-python/pbr-2.0[${PYTHON_USEDEP}]" |
56 |
-DEPEND=" |
57 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
58 |
- ${CDEPEND}" |
59 |
- |
60 |
-RDEPEND=" |
61 |
- ${CDEPEND} |
62 |
- virtual/python-dnspython[${PYTHON_USEDEP}] |
63 |
- >=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}] |
64 |
- >=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}] |
65 |
- >=dev-python/netifaces-0.5[${PYTHON_USEDEP}] |
66 |
- !~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}] |
67 |
- !~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}] |
68 |
- >=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}] |
69 |
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}] |
70 |
- dev-python/pyxattr[${PYTHON_USEDEP}] |
71 |
- >=dev-python/PyECLib-1.2.0[${PYTHON_USEDEP}] |
72 |
- >=dev-python/cryptography-1.0[${PYTHON_USEDEP}] |
73 |
- !~dev-python/cryptography-1.3.0[${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' swift.egg-info/requires.txt || die |
96 |
- sed -i 's/xattr/pyxattr/g' requirements.txt || die |
97 |
- sed -i '/^hacking/d' test-requirements.txt || die |
98 |
- distutils-r1_python_prepare_all |
99 |
-} |
100 |
- |
101 |
-src_test () { |
102 |
- # https://bugs.launchpad.net/swift/+bug/1249727 |
103 |
- find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die |
104 |
- SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die |
105 |
-} |
106 |
- |
107 |
-python_install_all() { |
108 |
- distutils-r1_python_install_all |
109 |
- keepdir /etc/swift |
110 |
- insinto /etc/swift |
111 |
- |
112 |
- newins "etc/swift.conf-sample" "swift.conf" |
113 |
- newins "etc/rsyncd.conf-sample" "rsyncd.conf" |
114 |
- newins "etc/mime.types-sample" "mime.types-sample" |
115 |
- newins "etc/memcache.conf-sample" "memcache.conf-sample" |
116 |
- newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample" |
117 |
- newins "etc/dispersion.conf-sample" "dispersion.conf-sample" |
118 |
- |
119 |
- if use proxy; then |
120 |
- newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy" |
121 |
- newins "etc/proxy-server.conf-sample" "proxy-server.conf" |
122 |
- if use memcached; then |
123 |
- sed -i '/depend/a\ |
124 |
- need memcached' "${D}/etc/init.d/swift-proxy" |
125 |
- fi |
126 |
- fi |
127 |
- if use account; then |
128 |
- newinitd "${FILESDIR}/swift-account.initd" "swift-account" |
129 |
- newins "etc/account-server.conf-sample" "account-server.conf" |
130 |
- fi |
131 |
- if use container; then |
132 |
- newinitd "${FILESDIR}/swift-container.initd" "swift-container" |
133 |
- newins "etc/container-server.conf-sample" "container-server.conf" |
134 |
- fi |
135 |
- if use object; then |
136 |
- newinitd "${FILESDIR}/swift-object.initd" "swift-object" |
137 |
- newins "etc/object-server.conf-sample" "object-server.conf" |
138 |
- newins "etc/object-expirer.conf-sample" "object-expirer.conf" |
139 |
- fi |
140 |
- |
141 |
- fowners swift:swift "/etc/swift" || die "fowners failed" |
142 |
-} |
143 |
- |
144 |
-pkg_postinst() { |
145 |
- elog "Openstack swift will default to using insecure http unless a" |
146 |
- elog "certificate is created in /etc/swift/cert.crt and the associated key" |
147 |
- elog "in /etc/swift/cert.key. These can be created with the following:" |
148 |
- elog " * cd /etc/swift" |
149 |
- elog " * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key" |
150 |
-} |
151 |
|
152 |
diff --git a/sys-cluster/swift/swift-2.10.2.ebuild b/sys-cluster/swift/swift-2.10.2.ebuild |
153 |
index 9d13b7d3dda..e5bdbb87d5e 100644 |
154 |
--- a/sys-cluster/swift/swift-2.10.2.ebuild |
155 |
+++ b/sys-cluster/swift/swift-2.10.2.ebuild |
156 |
@@ -12,7 +12,7 @@ SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz" |
157 |
|
158 |
LICENSE="Apache-2.0" |
159 |
SLOT="0" |
160 |
-KEYWORDS="~amd64 ~arm64 ~x86" |
161 |
+KEYWORDS="amd64 ~arm64 x86" |
162 |
IUSE="proxy account container object +memcached" |
163 |
REQUIRED_USE="|| ( proxy account container object )" |
164 |
|
165 |
|
166 |
diff --git a/sys-cluster/swift/swift-2.13.0.ebuild b/sys-cluster/swift/swift-2.13.0.ebuild |
167 |
deleted file mode 100644 |
168 |
index 4a220c73103..00000000000 |
169 |
--- a/sys-cluster/swift/swift-2.13.0.ebuild |
170 |
+++ /dev/null |
171 |
@@ -1,113 +0,0 @@ |
172 |
-# Copyright 1999-2017 Gentoo Foundation |
173 |
-# Distributed under the terms of the GNU General Public License v2 |
174 |
- |
175 |
-EAPI=6 |
176 |
-PYTHON_COMPAT=( python2_7 ) |
177 |
- |
178 |
-inherit distutils-r1 eutils linux-info user |
179 |
- |
180 |
-DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store" |
181 |
-HOMEPAGE="https://launchpad.net/swift" |
182 |
-SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz" |
183 |
- |
184 |
-LICENSE="Apache-2.0" |
185 |
-SLOT="0" |
186 |
-KEYWORDS="amd64 ~arm64 x86" |
187 |
-IUSE="proxy account container object +memcached" |
188 |
-REQUIRED_USE="|| ( proxy account container object )" |
189 |
- |
190 |
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]" |
191 |
-DEPEND=" |
192 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
193 |
- ${CDEPEND}" |
194 |
- |
195 |
-RDEPEND=" |
196 |
- ${CDEPEND} |
197 |
- >=dev-python/dnspython-1.14.0:0[${PYTHON_USEDEP}] |
198 |
- >=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}] |
199 |
- >=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}] |
200 |
- >=dev-python/netifaces-0.5[${PYTHON_USEDEP}] |
201 |
- !~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}] |
202 |
- !~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}] |
203 |
- >=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}] |
204 |
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}] |
205 |
- dev-python/pyxattr[${PYTHON_USEDEP}] |
206 |
- >=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}] |
207 |
- >=dev-python/cryptography-1.0[${PYTHON_USEDEP}] |
208 |
- !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}] |
209 |
- memcached? ( net-misc/memcached ) |
210 |
- net-misc/rsync[xattr]" |
211 |
- |
212 |
-pkg_pretend() { |
213 |
- linux-info_pkg_setup |
214 |
- CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR |
215 |
- ~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR |
216 |
- ~ZFS" |
217 |
- if linux_config_exists; then |
218 |
- for module in ${CONFIG_CHECK}; do |
219 |
- linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled" |
220 |
- done |
221 |
- fi |
222 |
-} |
223 |
- |
224 |
-pkg_setup() { |
225 |
- enewuser swift |
226 |
- enewgroup swift |
227 |
-} |
228 |
- |
229 |
-src_prepare() { |
230 |
- sed -i 's/xattr/pyxattr/g' requirements.txt || die |
231 |
- sed -i '/^hacking/d' test-requirements.txt || die |
232 |
- distutils-r1_python_prepare_all |
233 |
-} |
234 |
- |
235 |
-src_test () { |
236 |
- # https://bugs.launchpad.net/swift/+bug/1249727 |
237 |
- find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die |
238 |
- SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die |
239 |
-} |
240 |
- |
241 |
-python_install_all() { |
242 |
- distutils-r1_python_install_all |
243 |
- keepdir /etc/swift |
244 |
- insinto /etc/swift |
245 |
- |
246 |
- newins "etc/swift.conf-sample" "swift.conf" |
247 |
- newins "etc/rsyncd.conf-sample" "rsyncd.conf" |
248 |
- newins "etc/mime.types-sample" "mime.types-sample" |
249 |
- newins "etc/memcache.conf-sample" "memcache.conf-sample" |
250 |
- newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample" |
251 |
- newins "etc/dispersion.conf-sample" "dispersion.conf-sample" |
252 |
- |
253 |
- if use proxy; then |
254 |
- newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy" |
255 |
- newins "etc/proxy-server.conf-sample" "proxy-server.conf" |
256 |
- if use memcached; then |
257 |
- sed -i '/depend/a\ |
258 |
- need memcached' "${D}/etc/init.d/swift-proxy" |
259 |
- fi |
260 |
- fi |
261 |
- if use account; then |
262 |
- newinitd "${FILESDIR}/swift-account.initd" "swift-account" |
263 |
- newins "etc/account-server.conf-sample" "account-server.conf" |
264 |
- fi |
265 |
- if use container; then |
266 |
- newinitd "${FILESDIR}/swift-container.initd" "swift-container" |
267 |
- newins "etc/container-server.conf-sample" "container-server.conf" |
268 |
- fi |
269 |
- if use object; then |
270 |
- newinitd "${FILESDIR}/swift-object.initd" "swift-object" |
271 |
- newins "etc/object-server.conf-sample" "object-server.conf" |
272 |
- newins "etc/object-expirer.conf-sample" "object-expirer.conf" |
273 |
- fi |
274 |
- |
275 |
- fowners swift:swift "/etc/swift" || die "fowners failed" |
276 |
-} |
277 |
- |
278 |
-pkg_postinst() { |
279 |
- elog "Openstack swift will default to using insecure http unless a" |
280 |
- elog "certificate is created in /etc/swift/cert.crt and the associated key" |
281 |
- elog "in /etc/swift/cert.key. These can be created with the following:" |
282 |
- elog " * cd /etc/swift" |
283 |
- elog " * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key" |
284 |
-} |
285 |
|
286 |
diff --git a/sys-cluster/swift/swift-2.13.1.ebuild b/sys-cluster/swift/swift-2.13.1.ebuild |
287 |
index 6ce4c0551b2..4a220c73103 100644 |
288 |
--- a/sys-cluster/swift/swift-2.13.1.ebuild |
289 |
+++ b/sys-cluster/swift/swift-2.13.1.ebuild |
290 |
@@ -12,7 +12,7 @@ SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz" |
291 |
|
292 |
LICENSE="Apache-2.0" |
293 |
SLOT="0" |
294 |
-KEYWORDS="~amd64 ~arm64 ~x86" |
295 |
+KEYWORDS="amd64 ~arm64 x86" |
296 |
IUSE="proxy account container object +memcached" |
297 |
REQUIRED_USE="|| ( proxy account container object )" |