1 |
commit: 7b12ef45e0e512b697abe2dde8f684b61633390c |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 28 03:51:00 2018 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 28 04:13:06 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b12ef45 |
7 |
|
8 |
sys-cluster/swift: remove ocata |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
sys-cluster/swift/Manifest | 1 - |
13 |
sys-cluster/swift/swift-2.13.1-r1.ebuild | 114 ---------------------------- |
14 |
sys-cluster/swift/swift-2017.1.9999.ebuild | 115 ----------------------------- |
15 |
3 files changed, 230 deletions(-) |
16 |
|
17 |
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest |
18 |
index 95be42eded4..28c0025dc81 100644 |
19 |
--- a/sys-cluster/swift/Manifest |
20 |
+++ b/sys-cluster/swift/Manifest |
21 |
@@ -1,3 +1,2 @@ |
22 |
-DIST swift-2.13.1.tar.gz 1940686 BLAKE2B dde70b01c720acb4186f145fd6c80ae37a43f575e688e0875d66d5c1452547b4e16641183876e205ed659c75e3dd1bc3db834a4c6cb7e22424a35ee64ff3070c SHA512 6f08239bbeebfd213d2d7bb23c83507bf033288bb5125f5fd7f37517d8b3ad0b050220c1ad03632c1ab4723a98a9068b146e38c360e6786159a6f8638f4d5d79 |
23 |
DIST swift-2.15.1.tar.gz 2429235 BLAKE2B 4fd998e4f1f1eaab9eeb8f15bb9d159351feec3bc059d0174a6b3125267fcf77d976f8ae7b40d1944ccd4d2f62310ed59f3fbf110b436fac23e1ae7925c8bb5e SHA512 8b01831c6c9103953a3dd61fbaf0b18287af0ee3a2e4be376352266e8442bea54bcd32e7e6de89376feb5e492c5b49f623b8eda5e5ea3e58fe0dcea1547bc1ac |
24 |
DIST swift-2.16.0.tar.gz 2466084 BLAKE2B 9077e9745628ebd87f998ae963d19420e0410e29e02f8671dfb95b764d2bc4e5d97bd985e6d5d40496d152c6b931a03a789b372f94ad1b39cd17d3f0a6c9e658 SHA512 db67ee43931872dae9c8f7ff5732d0e075922e73a3660815f1ccb11a2310b94f887e293e9e5d4b1dda13c687365b7433ea9c575b209892f488647aed1a6f9696 |
25 |
|
26 |
diff --git a/sys-cluster/swift/swift-2.13.1-r1.ebuild b/sys-cluster/swift/swift-2.13.1-r1.ebuild |
27 |
deleted file mode 100644 |
28 |
index 20394c0afbb..00000000000 |
29 |
--- a/sys-cluster/swift/swift-2.13.1-r1.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,114 +0,0 @@ |
32 |
-# Copyright 1999-2017 Gentoo Foundation |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=6 |
36 |
-PYTHON_COMPAT=( python2_7 ) |
37 |
- |
38 |
-inherit distutils-r1 eutils linux-info user |
39 |
- |
40 |
-DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store" |
41 |
-HOMEPAGE="https://launchpad.net/swift" |
42 |
-SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz" |
43 |
- |
44 |
-LICENSE="Apache-2.0" |
45 |
-SLOT="0" |
46 |
-KEYWORDS="amd64 ~arm64 x86" |
47 |
-IUSE="proxy account container object +memcached" |
48 |
-REQUIRED_USE="|| ( proxy account container object )" |
49 |
- |
50 |
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]" |
51 |
-DEPEND=" |
52 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
53 |
- ${CDEPEND}" |
54 |
- |
55 |
-RDEPEND=" |
56 |
- ${CDEPEND} |
57 |
- >=dev-python/dnspython-1.14.0:0[${PYTHON_USEDEP}] |
58 |
- >=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}] |
59 |
- >=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}] |
60 |
- >=dev-python/netifaces-0.5[${PYTHON_USEDEP}] |
61 |
- !~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}] |
62 |
- !~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}] |
63 |
- >=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}] |
64 |
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}] |
65 |
- dev-python/pyxattr[${PYTHON_USEDEP}] |
66 |
- >=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}] |
67 |
- >=dev-python/cryptography-1.0[${PYTHON_USEDEP}] |
68 |
- !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}] |
69 |
- memcached? ( net-misc/memcached ) |
70 |
- net-misc/rsync[xattr]" |
71 |
- |
72 |
-pkg_pretend() { |
73 |
- linux-info_pkg_setup |
74 |
- CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR |
75 |
- ~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR |
76 |
- ~ZFS" |
77 |
- if linux_config_exists; then |
78 |
- for module in ${CONFIG_CHECK}; do |
79 |
- linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled" |
80 |
- done |
81 |
- fi |
82 |
-} |
83 |
- |
84 |
-pkg_setup() { |
85 |
- enewuser swift |
86 |
- enewgroup swift |
87 |
-} |
88 |
- |
89 |
-src_prepare() { |
90 |
- sed -i 's/xattr/pyxattr/g' requirements.txt || die |
91 |
- sed -i '/^hacking/d' test-requirements.txt || die |
92 |
- distutils-r1_python_prepare_all |
93 |
-} |
94 |
- |
95 |
-src_test () { |
96 |
- # https://bugs.launchpad.net/swift/+bug/1249727 |
97 |
- find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die |
98 |
- SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die |
99 |
-} |
100 |
- |
101 |
-python_install_all() { |
102 |
- distutils-r1_python_install_all |
103 |
- keepdir /etc/swift |
104 |
- insinto /etc/swift |
105 |
- |
106 |
- newins "etc/swift.conf-sample" "swift.conf" |
107 |
- newins "etc/rsyncd.conf-sample" "rsyncd.conf" |
108 |
- newins "etc/mime.types-sample" "mime.types-sample" |
109 |
- newins "etc/memcache.conf-sample" "memcache.conf-sample" |
110 |
- newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample" |
111 |
- newins "etc/dispersion.conf-sample" "dispersion.conf-sample" |
112 |
- |
113 |
- if use proxy; then |
114 |
- newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy" |
115 |
- newins "etc/proxy-server.conf-sample" "proxy-server.conf" |
116 |
- if use memcached; then |
117 |
- sed -i '/depend/a\ |
118 |
- need memcached' "${D}/etc/init.d/swift-proxy" |
119 |
- fi |
120 |
- fi |
121 |
- if use account; then |
122 |
- newinitd "${FILESDIR}/swift-account.initd" "swift-account" |
123 |
- newins "etc/account-server.conf-sample" "account-server.conf" |
124 |
- fi |
125 |
- if use container; then |
126 |
- newinitd "${FILESDIR}/swift-container.initd" "swift-container" |
127 |
- newins "etc/container-server.conf-sample" "container-server.conf" |
128 |
- fi |
129 |
- if use object; then |
130 |
- newinitd "${FILESDIR}/swift-object.initd" "swift-object" |
131 |
- newins "etc/object-server.conf-sample" "object-server.conf" |
132 |
- newins "etc/object-expirer.conf-sample" "object-expirer.conf" |
133 |
- fi |
134 |
- |
135 |
- fowners root:swift "/etc/swift" || die "fowners failed" |
136 |
- fperms 0750 /etc/swift |
137 |
-} |
138 |
- |
139 |
-pkg_postinst() { |
140 |
- elog "Openstack swift will default to using insecure http unless a" |
141 |
- elog "certificate is created in /etc/swift/cert.crt and the associated key" |
142 |
- elog "in /etc/swift/cert.key. These can be created with the following:" |
143 |
- elog " * cd /etc/swift" |
144 |
- elog " * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key" |
145 |
-} |
146 |
|
147 |
diff --git a/sys-cluster/swift/swift-2017.1.9999.ebuild b/sys-cluster/swift/swift-2017.1.9999.ebuild |
148 |
deleted file mode 100644 |
149 |
index 088cba57d7f..00000000000 |
150 |
--- a/sys-cluster/swift/swift-2017.1.9999.ebuild |
151 |
+++ /dev/null |
152 |
@@ -1,115 +0,0 @@ |
153 |
-# Copyright 1999-2017 Gentoo Foundation |
154 |
-# Distributed under the terms of the GNU General Public License v2 |
155 |
- |
156 |
-EAPI=6 |
157 |
-PYTHON_COMPAT=( python2_7 ) |
158 |
- |
159 |
-inherit distutils-r1 eutils git-r3 linux-info user |
160 |
- |
161 |
-DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store" |
162 |
-HOMEPAGE="https://launchpad.net/swift" |
163 |
-EGIT_REPO_URI="https://github.com/openstack/swift.git" |
164 |
-EGIT_BRANCH="stable/ocata" |
165 |
- |
166 |
-LICENSE="Apache-2.0" |
167 |
-SLOT="0" |
168 |
-KEYWORDS="" |
169 |
-IUSE="proxy account container object +memcached" |
170 |
-REQUIRED_USE="|| ( proxy account container object )" |
171 |
- |
172 |
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]" |
173 |
-DEPEND=" |
174 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
175 |
- ${CDEPEND}" |
176 |
- |
177 |
-RDEPEND=" |
178 |
- ${CDEPEND} |
179 |
- >=dev-python/dnspython-1.14.0:0[${PYTHON_USEDEP}] |
180 |
- >=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}] |
181 |
- >=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}] |
182 |
- >=dev-python/netifaces-0.5[${PYTHON_USEDEP}] |
183 |
- !~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}] |
184 |
- !~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}] |
185 |
- >=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}] |
186 |
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}] |
187 |
- dev-python/pyxattr[${PYTHON_USEDEP}] |
188 |
- >=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}] |
189 |
- >=dev-python/cryptography-1.0[${PYTHON_USEDEP}] |
190 |
- !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}] |
191 |
- memcached? ( net-misc/memcached ) |
192 |
- net-misc/rsync[xattr]" |
193 |
- |
194 |
-pkg_pretend() { |
195 |
- linux-info_pkg_setup |
196 |
- CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR |
197 |
- ~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR |
198 |
- ~ZFS" |
199 |
- if linux_config_exists; then |
200 |
- for module in ${CONFIG_CHECK}; do |
201 |
- linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled" |
202 |
- done |
203 |
- fi |
204 |
-} |
205 |
- |
206 |
-pkg_setup() { |
207 |
- enewuser swift |
208 |
- enewgroup swift |
209 |
-} |
210 |
- |
211 |
-src_prepare() { |
212 |
- sed -i 's/xattr/pyxattr/g' requirements.txt || die |
213 |
- sed -i '/^hacking/d' test-requirements.txt || die |
214 |
- distutils-r1_python_prepare_all |
215 |
-} |
216 |
- |
217 |
-src_test () { |
218 |
- # https://bugs.launchpad.net/swift/+bug/1249727 |
219 |
- find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die |
220 |
- SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die |
221 |
-} |
222 |
- |
223 |
-python_install_all() { |
224 |
- distutils-r1_python_install_all |
225 |
- keepdir /etc/swift |
226 |
- insinto /etc/swift |
227 |
- |
228 |
- newins "etc/swift.conf-sample" "swift.conf" |
229 |
- newins "etc/rsyncd.conf-sample" "rsyncd.conf" |
230 |
- newins "etc/mime.types-sample" "mime.types-sample" |
231 |
- newins "etc/memcache.conf-sample" "memcache.conf-sample" |
232 |
- newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample" |
233 |
- newins "etc/dispersion.conf-sample" "dispersion.conf-sample" |
234 |
- |
235 |
- if use proxy; then |
236 |
- newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy" |
237 |
- newins "etc/proxy-server.conf-sample" "proxy-server.conf" |
238 |
- if use memcached; then |
239 |
- sed -i '/depend/a\ |
240 |
- need memcached' "${D}/etc/init.d/swift-proxy" |
241 |
- fi |
242 |
- fi |
243 |
- if use account; then |
244 |
- newinitd "${FILESDIR}/swift-account.initd" "swift-account" |
245 |
- newins "etc/account-server.conf-sample" "account-server.conf" |
246 |
- fi |
247 |
- if use container; then |
248 |
- newinitd "${FILESDIR}/swift-container.initd" "swift-container" |
249 |
- newins "etc/container-server.conf-sample" "container-server.conf" |
250 |
- fi |
251 |
- if use object; then |
252 |
- newinitd "${FILESDIR}/swift-object.initd" "swift-object" |
253 |
- newins "etc/object-server.conf-sample" "object-server.conf" |
254 |
- newins "etc/object-expirer.conf-sample" "object-expirer.conf" |
255 |
- fi |
256 |
- |
257 |
- fowners root:swift "/etc/swift" || die "fowners failed" |
258 |
- fperms 0750 /etc/swift |
259 |
-} |
260 |
- |
261 |
-pkg_postinst() { |
262 |
- elog "Openstack swift will default to using insecure http unless a" |
263 |
- elog "certificate is created in /etc/swift/cert.crt and the associated key" |
264 |
- elog "in /etc/swift/cert.key. These can be created with the following:" |
265 |
- elog " * cd /etc/swift" |
266 |
- elog " * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key" |
267 |
-} |