1 |
commit: c4558deb1c8f0b1a56eebf0e221c8cdc2aa5afe3 |
2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 1 21:36:44 2015 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 1 21:39:25 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4558deb |
7 |
|
8 |
app-admin/salt: clean out and unkeyword old versions |
9 |
|
10 |
This cleans out or unkeywords versions that leak credentials to the log |
11 |
in the git module (bug #558820). |
12 |
|
13 |
Reported-by: Agostino Sarubbo <ago <AT> gentoo.org> |
14 |
|
15 |
app-admin/salt/Manifest | 3 - |
16 |
app-admin/salt/salt-2014.7.4.ebuild | 108 --------------------------------- |
17 |
app-admin/salt/salt-2014.7.5.ebuild | 109 --------------------------------- |
18 |
app-admin/salt/salt-2015.5.1.ebuild | 117 ------------------------------------ |
19 |
app-admin/salt/salt-2015.5.3.ebuild | 2 +- |
20 |
5 files changed, 1 insertion(+), 338 deletions(-) |
21 |
|
22 |
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest |
23 |
index 4b83eea..6104f6d 100644 |
24 |
--- a/app-admin/salt/Manifest |
25 |
+++ b/app-admin/salt/Manifest |
26 |
@@ -1,6 +1,3 @@ |
27 |
-DIST salt-2014.7.4.tar.gz 3833928 SHA256 0adf4c138ebd26745b1d1157be0772d89da3582fe8a6622a8031cbe32a28e9f3 SHA512 8cbb9b26472b8980c36f0394a79bf872fd68a62bc886ba2a7fa35720db0a01c3a026e63c839a5c0dddc328c9555fa87aff4cfd71e3faaf01d6c1db01ae5bed64 WHIRLPOOL 1234c14e5fbb552cabb827d416e5ccbaccf9df03bac1ea72f32eeac33dc06d6afe0af0e83bff1682fbec0a52558a43945fccca8a9b08ace28c42a6c2c2016f01 |
28 |
-DIST salt-2014.7.5.tar.gz 3845643 SHA256 474d0a23866e42c664f46e04bc8ead87fc57ee16ff2cc8945248f1e0706f6eb8 SHA512 60e64db5125eb3c6f44cccf906ff0e8916cdcb31970e000785a81cf6ae95b38c681088f2fb3964fabc16667a26403ae30cb84cea3493d837d0b57aa86e771160 WHIRLPOOL b3600c1824cd49983cfe73567ec4a3861bdec88c5cc725ae8159e917e5074ade32aee29eafe5ec78fe4c87f2effc0f5f49627772e12468eb3a050b9395a45374 |
29 |
-DIST salt-2015.5.1.tar.gz 4970135 SHA256 0edb1d0584f53e805ad6ffc21c163a637b23d187052ba2dbb7e641c2d7099c4d SHA512 0de9b3391f33940e230b21841dca05943edcf7a890c0cae8efdd39bcbaf46c27f71cefaf73861dc5b59b567c40c2f0cada04ccedc73cffd905a449795b2f8ecb WHIRLPOOL 4aaa899fa6fd13b60daba7bbef692db24020ffc54e03e4c5d194e32aaa1580430a5fc7bb70f0b87e1ed2710428ed9aa8e729fa4e1144fb42754c740e3e45405e |
30 |
DIST salt-2015.5.3.tar.gz 5389038 SHA256 f8b04dc8bd4b00ce803d31ce5fba033c2f20fa38cdc5a3bf54b4c47362fbe853 SHA512 61203cb9b82fe8ab84fa36d06f442aebcf5c5decfacb99f8df6b52320979699d168f9df7e9e675a13a8078feabbe9210a40e526627a213239760ea43d85f1298 WHIRLPOOL 160455263ee1a95faec1f03dfcd16f9b811e5ecb961a2db5c9545070ed74786c83592e008c1ed70a6ea358ba2491128d6081d57bf7c0a679bb99abb1555bbd21 |
31 |
DIST salt-2015.5.5.tar.gz 5526444 SHA256 5cd8d317616abab691a83f7fd3f8bcf9ad8aecaa95fcfdc0f6d788de87f0beeb SHA512 263f772d403c0e841957342f552389914c563add3f774f26b5d9da81efa04330ec95349223f81e192a2a4789b2d565f7a67e9e3be564296d6235a47cb6657ac3 WHIRLPOOL 7b4f71d6a12b50f4f0a92bfd68c1df2cf8992481d17db984079d4a9cadd51de56d7390ea69c9b02055e747993818756af85f82538a4640e5fb831e4a1ee1cb57 |
32 |
DIST salt-vim-20141109.tar.gz 3783 SHA256 4989d111ad618ea3f5f7a7046a0ff6ce3ca6bc7f71fca90849f7c38947ab6d9a SHA512 d8d62ee827012e29586cf492f2881ee5870ed058828102f985e8b27300c115e01bb126f89decb15a19a8e206dc54c89856d4c31b3ff5320a36385cb5ed517a63 WHIRLPOOL 98026b2cdcb64665790475e3b20a7de294e5cefb390b414294756cad440bc040d9044ffd37a13f3c93af9be1a1bfd444710ff0df24895db624f49fddd16b5545 |
33 |
|
34 |
diff --git a/app-admin/salt/salt-2014.7.4.ebuild b/app-admin/salt/salt-2014.7.4.ebuild |
35 |
deleted file mode 100644 |
36 |
index 385fe0f..0000000 |
37 |
--- a/app-admin/salt/salt-2014.7.4.ebuild |
38 |
+++ /dev/null |
39 |
@@ -1,108 +0,0 @@ |
40 |
-# Copyright 1999-2015 Gentoo Foundation |
41 |
-# Distributed under the terms of the GNU General Public License v2 |
42 |
-# $Id$ |
43 |
- |
44 |
-EAPI=5 |
45 |
-PYTHON_COMPAT=(python2_7) |
46 |
- |
47 |
-inherit eutils distutils-r1 systemd |
48 |
- |
49 |
-DESCRIPTION="Salt is a remote execution and configuration manager" |
50 |
-HOMEPAGE="http://saltstack.org/" |
51 |
- |
52 |
-if [[ ${PV} == 9999* ]]; then |
53 |
- inherit git-r3 |
54 |
- EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" |
55 |
- EGIT_BRANCH="develop" |
56 |
- SRC_URI="" |
57 |
- KEYWORDS="" |
58 |
-else |
59 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
60 |
- KEYWORDS="~x86 ~amd64" |
61 |
-fi |
62 |
- |
63 |
-LICENSE="Apache-2.0" |
64 |
-SLOT="0" |
65 |
-IUSE="api ldap libcloud libvirt gnupg keyring mako mongodb mysql nova" |
66 |
-IUSE+=" openssl redis selinux timelib raet +zeromq test" |
67 |
- |
68 |
-RDEPEND="sys-apps/pciutils |
69 |
- dev-python/jinja[${PYTHON_USEDEP}] |
70 |
- >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] |
71 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
72 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
73 |
- >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
74 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
75 |
- libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
76 |
- mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
77 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
78 |
- openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] ) |
79 |
- libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) |
80 |
- raet? ( |
81 |
- dev-python/libnacl[${PYTHON_USEDEP}] |
82 |
- dev-python/ioflo[${PYTHON_USEDEP}] |
83 |
- dev-python/raet[${PYTHON_USEDEP}] |
84 |
- ) |
85 |
- zeromq? ( |
86 |
- >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] |
87 |
- >=dev-python/m2crypto-0.22.3[${PYTHON_USEDEP}] |
88 |
- dev-python/pycrypto[${PYTHON_USEDEP}] |
89 |
- ) |
90 |
- api? ( |
91 |
- || ( |
92 |
- dev-python/cherrypy[${PYTHON_USEDEP}] |
93 |
- www-servers/tornado[${PYTHON_USEDEP}] |
94 |
- ) |
95 |
- ) |
96 |
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
97 |
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
98 |
- mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) |
99 |
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
100 |
- selinux? ( sec-policy/selinux-salt ) |
101 |
- timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) |
102 |
- nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) |
103 |
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )" |
104 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
105 |
- test? ( |
106 |
- dev-python/pip[${PYTHON_USEDEP}] |
107 |
- dev-python/virtualenv[${PYTHON_USEDEP}] |
108 |
- dev-python/timelib[${PYTHON_USEDEP}] |
109 |
- >=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}] |
110 |
- ${RDEPEND} |
111 |
- )" |
112 |
- |
113 |
-DOCS=(README.rst AUTHORS) |
114 |
- |
115 |
-REQUIRED_USE="|| ( raet zeromq )" |
116 |
- |
117 |
-PATCHES=( |
118 |
- "${FILESDIR}/${PN}-2014.7.1-remove-pydsl-includes-test.patch" |
119 |
-) |
120 |
- |
121 |
-python_prepare() { |
122 |
- # this test fails because it trys to "pip install distribute" |
123 |
- rm tests/unit/{modules,states}/zcbuildout_test.py |
124 |
-} |
125 |
- |
126 |
-python_install_all() { |
127 |
- USE_SETUPTOOLS=1 distutils-r1_python_install_all |
128 |
- |
129 |
- for s in minion master syndic $(use api && echo api); do |
130 |
- newinitd "${FILESDIR}"/${s}-initd-3 salt-${s} |
131 |
- newconfd "${FILESDIR}"/${s}-confd-1 salt-${s} |
132 |
- systemd_dounit "${FILESDIR}"/salt-${s}.service |
133 |
- done |
134 |
- |
135 |
- insinto /etc/${PN} |
136 |
- doins -r conf/* |
137 |
-} |
138 |
- |
139 |
-python_test() { |
140 |
- # testsuite likes lots of files |
141 |
- ulimit -n 3072 |
142 |
- |
143 |
- # using ${T} for the TMPDIR makes some tests needs paths that exceed PATH_MAX |
144 |
- USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="/tmp" \ |
145 |
- ${EPYTHON} tests/runtests.py \ |
146 |
- --unit-tests --no-report --verbose || die "testing failed" |
147 |
-} |
148 |
|
149 |
diff --git a/app-admin/salt/salt-2014.7.5.ebuild b/app-admin/salt/salt-2014.7.5.ebuild |
150 |
deleted file mode 100644 |
151 |
index bfbff12..0000000 |
152 |
--- a/app-admin/salt/salt-2014.7.5.ebuild |
153 |
+++ /dev/null |
154 |
@@ -1,109 +0,0 @@ |
155 |
-# Copyright 1999-2015 Gentoo Foundation |
156 |
-# Distributed under the terms of the GNU General Public License v2 |
157 |
-# $Id$ |
158 |
- |
159 |
-EAPI=5 |
160 |
-PYTHON_COMPAT=(python2_7) |
161 |
- |
162 |
-inherit eutils distutils-r1 systemd |
163 |
- |
164 |
-DESCRIPTION="Salt is a remote execution and configuration manager" |
165 |
-HOMEPAGE="http://saltstack.org/" |
166 |
- |
167 |
-if [[ ${PV} == 9999* ]]; then |
168 |
- inherit git-r3 |
169 |
- EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" |
170 |
- EGIT_BRANCH="develop" |
171 |
- SRC_URI="" |
172 |
- KEYWORDS="" |
173 |
-else |
174 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
175 |
- KEYWORDS="~x86 ~amd64" |
176 |
-fi |
177 |
- |
178 |
-LICENSE="Apache-2.0" |
179 |
-SLOT="0" |
180 |
-IUSE="api ldap libcloud libvirt gnupg keyring mako mongodb mysql nova" |
181 |
-IUSE+=" openssl redis selinux timelib raet +zeromq test" |
182 |
- |
183 |
-RDEPEND="sys-apps/pciutils |
184 |
- dev-python/jinja[${PYTHON_USEDEP}] |
185 |
- >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] |
186 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
187 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
188 |
- >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
189 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
190 |
- libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
191 |
- mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
192 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
193 |
- openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] ) |
194 |
- libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) |
195 |
- raet? ( |
196 |
- dev-python/libnacl[${PYTHON_USEDEP}] |
197 |
- dev-python/ioflo[${PYTHON_USEDEP}] |
198 |
- dev-python/raet[${PYTHON_USEDEP}] |
199 |
- ) |
200 |
- zeromq? ( |
201 |
- >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] |
202 |
- >=dev-python/m2crypto-0.22.3[${PYTHON_USEDEP}] |
203 |
- dev-python/pycrypto[${PYTHON_USEDEP}] |
204 |
- ) |
205 |
- api? ( |
206 |
- || ( |
207 |
- dev-python/cherrypy[${PYTHON_USEDEP}] |
208 |
- www-servers/tornado[${PYTHON_USEDEP}] |
209 |
- ) |
210 |
- ) |
211 |
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
212 |
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
213 |
- mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) |
214 |
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
215 |
- selinux? ( sec-policy/selinux-salt ) |
216 |
- timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) |
217 |
- nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) |
218 |
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )" |
219 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
220 |
- test? ( |
221 |
- dev-python/pip[${PYTHON_USEDEP}] |
222 |
- dev-python/virtualenv[${PYTHON_USEDEP}] |
223 |
- dev-python/timelib[${PYTHON_USEDEP}] |
224 |
- >=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}] |
225 |
- ${RDEPEND} |
226 |
- )" |
227 |
- |
228 |
-DOCS=(README.rst AUTHORS) |
229 |
- |
230 |
-REQUIRED_USE="|| ( raet zeromq )" |
231 |
- |
232 |
-PATCHES=( |
233 |
- "${FILESDIR}/${PN}-2014.7.1-remove-pydsl-includes-test.patch" |
234 |
- "${FILESDIR}/${PN}-2014.7.5-archive-test.patch" |
235 |
-) |
236 |
- |
237 |
-python_prepare() { |
238 |
- # this test fails because it trys to "pip install distribute" |
239 |
- rm tests/unit/{modules,states}/zcbuildout_test.py |
240 |
-} |
241 |
- |
242 |
-python_install_all() { |
243 |
- USE_SETUPTOOLS=1 distutils-r1_python_install_all |
244 |
- |
245 |
- for s in minion master syndic $(use api && echo api); do |
246 |
- newinitd "${FILESDIR}"/${s}-initd-3 salt-${s} |
247 |
- newconfd "${FILESDIR}"/${s}-confd-1 salt-${s} |
248 |
- systemd_dounit "${FILESDIR}"/salt-${s}.service |
249 |
- done |
250 |
- |
251 |
- insinto /etc/${PN} |
252 |
- doins -r conf/* |
253 |
-} |
254 |
- |
255 |
-python_test() { |
256 |
- # testsuite likes lots of files |
257 |
- ulimit -n 3072 |
258 |
- |
259 |
- # using ${T} for the TMPDIR makes some tests needs paths that exceed PATH_MAX |
260 |
- USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="/tmp" \ |
261 |
- ${EPYTHON} tests/runtests.py \ |
262 |
- --unit-tests --no-report --verbose || die "testing failed" |
263 |
-} |
264 |
|
265 |
diff --git a/app-admin/salt/salt-2015.5.1.ebuild b/app-admin/salt/salt-2015.5.1.ebuild |
266 |
deleted file mode 100644 |
267 |
index 33404a8..0000000 |
268 |
--- a/app-admin/salt/salt-2015.5.1.ebuild |
269 |
+++ /dev/null |
270 |
@@ -1,117 +0,0 @@ |
271 |
-# Copyright 1999-2015 Gentoo Foundation |
272 |
-# Distributed under the terms of the GNU General Public License v2 |
273 |
-# $Id$ |
274 |
- |
275 |
-EAPI=5 |
276 |
-PYTHON_COMPAT=(python2_7) |
277 |
- |
278 |
-inherit eutils systemd vim-plugin distutils-r1 |
279 |
- |
280 |
-DESCRIPTION="Salt is a remote execution and configuration manager" |
281 |
-HOMEPAGE="http://saltstack.org/" |
282 |
-SALT_VIM_HASH="20695f68e5895e5ae2b5884b78f5a2cd29897b05" |
283 |
- |
284 |
-if [[ ${PV} == 9999* ]]; then |
285 |
- inherit git-r3 |
286 |
- EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" |
287 |
- EGIT_BRANCH="develop" |
288 |
- SRC_URI="" |
289 |
- KEYWORDS="" |
290 |
-else |
291 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
292 |
- KEYWORDS="~x86 ~amd64" |
293 |
-fi |
294 |
- |
295 |
-SRC_URI+=" vim-syntax? ( https://github.com/${PN}stack/${PN}-vim/archive/${SALT_VIM_HASH}.tar.gz -> salt-vim-20141109.tar.gz )" |
296 |
- |
297 |
-LICENSE="Apache-2.0" |
298 |
-SLOT="0" |
299 |
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" |
300 |
-IUSE+=" openssl redis selinux test timelib raet +zeromq vim-syntax" |
301 |
- |
302 |
-RDEPEND="sys-apps/pciutils |
303 |
- dev-python/jinja[${PYTHON_USEDEP}] |
304 |
- >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] |
305 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
306 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
307 |
- >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
308 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
309 |
- >=www-servers/tornado-4.0[${PYTHON_USEDEP}] |
310 |
- libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
311 |
- mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
312 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
313 |
- openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] ) |
314 |
- libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) |
315 |
- raet? ( |
316 |
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] |
317 |
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] |
318 |
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] |
319 |
- ) |
320 |
- zeromq? ( |
321 |
- >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] |
322 |
- >=dev-python/m2crypto-0.22.3[${PYTHON_USEDEP}] |
323 |
- dev-python/pycrypto[${PYTHON_USEDEP}] |
324 |
- ) |
325 |
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
326 |
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
327 |
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
328 |
- mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) |
329 |
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
330 |
- selinux? ( sec-policy/selinux-salt ) |
331 |
- timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) |
332 |
- nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) |
333 |
- neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) |
334 |
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )" |
335 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
336 |
- test? ( |
337 |
- dev-python/pip[${PYTHON_USEDEP}] |
338 |
- dev-python/virtualenv[${PYTHON_USEDEP}] |
339 |
- dev-python/mock[${PYTHON_USEDEP}] |
340 |
- dev-python/timelib[${PYTHON_USEDEP}] |
341 |
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
342 |
- >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
343 |
- >=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}] |
344 |
- ${RDEPEND} |
345 |
- )" |
346 |
- |
347 |
-DOCS=(README.rst AUTHORS) |
348 |
- |
349 |
-REQUIRED_USE="|| ( raet zeromq )" |
350 |
- |
351 |
-PATCHES=( |
352 |
- "${FILESDIR}/${PN}-2014.7.1-remove-pydsl-includes-test.patch" |
353 |
- "${FILESDIR}/${PN}-2015.5.0-archive-test.patch" |
354 |
- "${FILESDIR}/${PN}-2015.5.1-skip-libvirt-test-on-nonroot.patch" |
355 |
-) |
356 |
- |
357 |
-python_prepare() { |
358 |
- # this test fails because it trys to "pip install distribute" |
359 |
- rm tests/unit/{modules,states}/zcbuildout_test.py tests/unit/modules/{rh_ip,win_network}_test.py |
360 |
-} |
361 |
- |
362 |
-python_install_all() { |
363 |
- local svc |
364 |
- USE_SETUPTOOLS=1 distutils-r1_python_install_all |
365 |
- |
366 |
- for svc in minion master syndic api; do |
367 |
- newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} |
368 |
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
369 |
- systemd_dounit "${FILESDIR}"/salt-${svc}.service |
370 |
- done |
371 |
- |
372 |
- insinto /etc/${PN} |
373 |
- doins -r conf/* |
374 |
- |
375 |
- use vim-syntax && S="${WORKDIR}/salt-vim-${SALT_VIM_HASH}" \ |
376 |
- vim-plugin_src_install |
377 |
-} |
378 |
- |
379 |
-python_test() { |
380 |
- # testsuite likes lots of files |
381 |
- ulimit -n 3072 |
382 |
- |
383 |
- # using ${T} for the TMPDIR makes some tests needs paths that exceed PATH_MAX |
384 |
- USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="/tmp" \ |
385 |
- ${EPYTHON} tests/runtests.py \ |
386 |
- --unit-tests --no-report --verbose || die "testing failed" |
387 |
-} |
388 |
|
389 |
diff --git a/app-admin/salt/salt-2015.5.3.ebuild b/app-admin/salt/salt-2015.5.3.ebuild |
390 |
index 5f23c6b..37c2172 100644 |
391 |
--- a/app-admin/salt/salt-2015.5.3.ebuild |
392 |
+++ b/app-admin/salt/salt-2015.5.3.ebuild |
393 |
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999* ]]; then |
394 |
KEYWORDS="" |
395 |
else |
396 |
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
397 |
- KEYWORDS="~x86 ~amd64" |
398 |
+ KEYWORDS="" |
399 |
fi |
400 |
|
401 |
SRC_URI+=" vim-syntax? ( https://github.com/${PN}stack/${PN}-vim/archive/${SALT_VIM_HASH}.tar.gz -> salt-vim-20141109.tar.gz )" |