1 |
commit: 83c3b7ff1b9edab8f437aad399ec4b01c07395d2 |
2 |
Author: Aaron Bauman <bman <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 25 00:46:28 2018 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 25 00:46:28 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83c3b7ff |
7 |
|
8 |
app-admin/salt: cleanup vulnerable wrt bug #627928 |
9 |
|
10 |
app-admin/salt/Manifest | 3 - |
11 |
app-admin/salt/salt-2015.5.10.ebuild | 133 ----------------------------- |
12 |
app-admin/salt/salt-2015.8.13-r1.ebuild | 141 ------------------------------ |
13 |
app-admin/salt/salt-2015.8.13.ebuild | 140 ------------------------------ |
14 |
app-admin/salt/salt-2016.3.8.ebuild | 147 -------------------------------- |
15 |
5 files changed, 564 deletions(-) |
16 |
|
17 |
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest |
18 |
index ac42a2512d0..5d09e1c2ff3 100644 |
19 |
--- a/app-admin/salt/Manifest |
20 |
+++ b/app-admin/salt/Manifest |
21 |
@@ -1,5 +1,2 @@ |
22 |
-DIST salt-2015.5.10.tar.gz 5693422 BLAKE2B 99ba6321b998c111704178f55495327eb6b9122e4eb6efacab40eaa4d8be0cae91c6d72d6fb2732e4ae5c05170b4af772b6210d129e5849f86c7be6252768c67 SHA512 78a4cbe5c771208e957360689a25ae4e44566987e07e7fda54e6db9028485eacc6ad016c65c981090f9b5d95331e46048a094aecc27703b3956c06ab6ebad95d |
23 |
-DIST salt-2015.8.13.tar.gz 7036243 BLAKE2B 0b222f91d5bc42621c96fcd46223b064a480185d79b164e0f7ba8782b502f68edc21691b661dd9ec0547d1363320aae3c6560137875570a73c8536d6ea695603 SHA512 ec8626f7360542bfeea90fc3d6fd9d9d015da4c2a6adf9957c22501ed9531b0a44d2cbc4853c41856b4cd46c142d2441884ec99700f3c0a5310cc428f9f1ec2a |
24 |
DIST salt-2016.11.8.tar.gz 10142142 BLAKE2B e6805dae84c0d2e39109c95f603fcb54e1b7d7ff6c27ce555379b69274b3a5d72a1e372081a62c18440deb0955c1ef24a41c5d855a5e622f2ffe51276bd87b25 SHA512 0adc544ca460d13d2adb11b04575bd079a3dad1be3468bea7d32d0b74416b78546e4c86c75551bba09786be8e9810a6e30232414c4f5851cbc9a0fb4b894e0de |
25 |
-DIST salt-2016.3.8.tar.gz 8519835 BLAKE2B a3936f36a513dfd4a9fd1ece41bf7abfc893d1788c8e5e85b28a2898c321e1d9ab2141dc3ab346e243c0c9c5dbf119abf7506e1dbc6be66995e30d09a1723122 SHA512 bba41d4c70e278aa7196d292fb27b926dce32f4cc67c5b23b6c219ad59178b1a8b26e8adeb3a7bd587c25cc1c8ff36a207ea2a2f68d13d64f37a34f96f35ecd1 |
26 |
DIST salt-2017.7.2.tar.gz 11471191 BLAKE2B 0b7184eb4dcb29f2a9603117d1c6fb9c729093c1ff11e18370929ec3fdbfe7bf8c0914f17260c3f613842c23359205a4a84d3e0bcd67476705e50f805bcd7b69 SHA512 959cec404f0fa7c00f78427cba902b8b9c2c0d95016fc70925d8da6d0b97a0284fc034ac92a5c5c313763db4fdcbd1b0391318596b77fe8e0cd1c7e4b3fa928b |
27 |
|
28 |
diff --git a/app-admin/salt/salt-2015.5.10.ebuild b/app-admin/salt/salt-2015.5.10.ebuild |
29 |
deleted file mode 100644 |
30 |
index 24630f9f662..00000000000 |
31 |
--- a/app-admin/salt/salt-2015.5.10.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,133 +0,0 @@ |
34 |
-# Copyright 1999-2017 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=5 |
38 |
-PYTHON_COMPAT=(python2_7) |
39 |
- |
40 |
-inherit eutils systemd distutils-r1 |
41 |
- |
42 |
-DESCRIPTION="Salt is a remote execution and configuration manager" |
43 |
-HOMEPAGE="https://saltstack.com/community/" |
44 |
- |
45 |
-if [[ ${PV} == 9999* ]]; then |
46 |
- inherit git-r3 |
47 |
- EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" |
48 |
- EGIT_BRANCH="develop" |
49 |
- SRC_URI="" |
50 |
- KEYWORDS="" |
51 |
-else |
52 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
53 |
- KEYWORDS="~x86 ~amd64" |
54 |
-fi |
55 |
- |
56 |
-LICENSE="Apache-2.0" |
57 |
-SLOT="0" |
58 |
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" |
59 |
-IUSE+=" openssl portage redis selinux test timelib raet +zeromq vim-syntax" |
60 |
- |
61 |
-RDEPEND="sys-apps/pciutils |
62 |
- dev-python/jinja[${PYTHON_USEDEP}] |
63 |
- >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] |
64 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
65 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
66 |
- >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
67 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
68 |
- >=www-servers/tornado-4.0[${PYTHON_USEDEP}] |
69 |
- libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
70 |
- mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
71 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
72 |
- libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) |
73 |
- openssl? ( |
74 |
- dev-libs/openssl:*[-bindist] |
75 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
76 |
- ) |
77 |
- raet? ( |
78 |
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] |
79 |
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] |
80 |
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] |
81 |
- ) |
82 |
- zeromq? ( |
83 |
- >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] |
84 |
- >=dev-python/m2crypto-0.22.3[${PYTHON_USEDEP}] |
85 |
- dev-python/pycrypto[${PYTHON_USEDEP}] |
86 |
- ) |
87 |
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
88 |
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
89 |
- portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
90 |
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
91 |
- mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) |
92 |
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
93 |
- selinux? ( sec-policy/selinux-salt ) |
94 |
- timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) |
95 |
- nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) |
96 |
- neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) |
97 |
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
98 |
- vim-syntax? ( app-vim/salt-vim )" |
99 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
100 |
- test? ( |
101 |
- dev-python/pip[${PYTHON_USEDEP}] |
102 |
- dev-python/virtualenv[${PYTHON_USEDEP}] |
103 |
- dev-python/mock[${PYTHON_USEDEP}] |
104 |
- dev-python/timelib[${PYTHON_USEDEP}] |
105 |
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
106 |
- >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
107 |
- >=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}] |
108 |
- ${RDEPEND} |
109 |
- )" |
110 |
- |
111 |
-DOCS=(README.rst AUTHORS) |
112 |
- |
113 |
-REQUIRED_USE="|| ( raet zeromq )" |
114 |
- |
115 |
-PATCHES=( |
116 |
- "${FILESDIR}/${PN}-2014.7.1-remove-pydsl-includes-test.patch" |
117 |
- "${FILESDIR}/${PN}-2015.5.5-auth-tests.patch" |
118 |
- "${FILESDIR}/${PN}-2015.5.5-cron-tests.patch" |
119 |
- "${FILESDIR}/${PN}-2015.5.5-remove-buggy-tests.patch" |
120 |
- "${FILESDIR}/${PN}-2015.5.7-tmpdir.patch" |
121 |
- "${FILESDIR}/${PN}-2015.5.10-buggy-tests.patch" |
122 |
-) |
123 |
- |
124 |
-python_prepare() { |
125 |
- # this test fails because it trys to "pip install distribute" |
126 |
- rm tests/unit/{modules,states}/zcbuildout_test.py \ |
127 |
- tests/unit/modules/{rh_ip,win_network}_test.py \ |
128 |
- || die "Failed to remove broken tests" |
129 |
-} |
130 |
- |
131 |
-python_install_all() { |
132 |
- local svc |
133 |
- USE_SETUPTOOLS=1 distutils-r1_python_install_all |
134 |
- |
135 |
- for svc in minion master syndic api; do |
136 |
- newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} |
137 |
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
138 |
- systemd_dounit "${FILESDIR}"/salt-${svc}.service |
139 |
- done |
140 |
- |
141 |
- insinto /etc/${PN} |
142 |
- doins -r conf/* |
143 |
-} |
144 |
- |
145 |
-python_test() { |
146 |
- local tempdir |
147 |
- # testsuite likes lots of files |
148 |
- ulimit -n 3072 |
149 |
- |
150 |
- # ${T} is too long a path for the tests to work |
151 |
- tempdir="$(mktemp -dup /tmp salt-XXX)" |
152 |
- mkdir "${T}/$(basename "${tempdir}")" |
153 |
- |
154 |
- ( |
155 |
- cleanup() { rm -f "${tempdir}"; } |
156 |
- trap cleanup EXIT |
157 |
- |
158 |
- addwrite "${tempdir}" |
159 |
- ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" |
160 |
- |
161 |
- USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="${tempdir}" \ |
162 |
- ${EPYTHON} tests/runtests.py \ |
163 |
- --unit-tests --no-report --verbose |
164 |
- |
165 |
- ) || die "testing failed" |
166 |
-} |
167 |
|
168 |
diff --git a/app-admin/salt/salt-2015.8.13-r1.ebuild b/app-admin/salt/salt-2015.8.13-r1.ebuild |
169 |
deleted file mode 100644 |
170 |
index ed02341af26..00000000000 |
171 |
--- a/app-admin/salt/salt-2015.8.13-r1.ebuild |
172 |
+++ /dev/null |
173 |
@@ -1,141 +0,0 @@ |
174 |
-# Copyright 1999-2017 Gentoo Foundation |
175 |
-# Distributed under the terms of the GNU General Public License v2 |
176 |
- |
177 |
-EAPI=5 |
178 |
-PYTHON_COMPAT=(python2_7) |
179 |
- |
180 |
-inherit eutils systemd distutils-r1 |
181 |
- |
182 |
-DESCRIPTION="Salt is a remote execution and configuration manager" |
183 |
-HOMEPAGE="https://saltstack.com/community/" |
184 |
- |
185 |
-if [[ ${PV} == 9999* ]]; then |
186 |
- inherit git-r3 |
187 |
- EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" |
188 |
- EGIT_BRANCH="develop" |
189 |
- SRC_URI="" |
190 |
- KEYWORDS="" |
191 |
-else |
192 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
193 |
- KEYWORDS="~x86 ~amd64" |
194 |
-fi |
195 |
- |
196 |
-LICENSE="Apache-2.0" |
197 |
-SLOT="0" |
198 |
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" |
199 |
-IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" |
200 |
- |
201 |
-RDEPEND="sys-apps/pciutils |
202 |
- dev-python/jinja[${PYTHON_USEDEP}] |
203 |
- >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] |
204 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
205 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
206 |
- >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
207 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
208 |
- >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] |
209 |
- virtual/python-futures[${PYTHON_USEDEP}] |
210 |
- libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
211 |
- mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
212 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
213 |
- libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) |
214 |
- openssl? ( |
215 |
- dev-libs/openssl:*[-bindist] |
216 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
217 |
- ) |
218 |
- raet? ( |
219 |
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] |
220 |
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] |
221 |
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] |
222 |
- ) |
223 |
- zeromq? ( |
224 |
- >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] |
225 |
- >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] |
226 |
- ) |
227 |
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
228 |
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
229 |
- portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
230 |
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
231 |
- mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) |
232 |
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
233 |
- selinux? ( sec-policy/selinux-salt ) |
234 |
- timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) |
235 |
- nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) |
236 |
- neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) |
237 |
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
238 |
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
239 |
- vim-syntax? ( app-vim/salt-vim )" |
240 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
241 |
- test? ( |
242 |
- dev-python/psutil[${PYTHON_USEDEP}] |
243 |
- dev-python/pip[${PYTHON_USEDEP}] |
244 |
- dev-python/virtualenv[${PYTHON_USEDEP}] |
245 |
- dev-python/mock[${PYTHON_USEDEP}] |
246 |
- dev-python/timelib[${PYTHON_USEDEP}] |
247 |
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
248 |
- >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
249 |
- >=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}] |
250 |
- ${RDEPEND} |
251 |
- )" |
252 |
- |
253 |
-DOCS=(README.rst AUTHORS) |
254 |
- |
255 |
-REQUIRED_USE="|| ( raet zeromq )" |
256 |
- |
257 |
-PATCHES=( |
258 |
- "${FILESDIR}/${PN}-2015.8.0-remove-buggy-tests.patch" |
259 |
- "${FILESDIR}/${PN}-2015.5.5-auth-tests.patch" |
260 |
- "${FILESDIR}/${PN}-2015.5.5-cron-tests.patch" |
261 |
- "${FILESDIR}/${PN}-2015.5.5-remove-buggy-tests.patch" |
262 |
- "${FILESDIR}/${PN}-2015.8.2-tmpdir.patch" |
263 |
- "${FILESDIR}/${PN}-2015.8.10-remove-failing-boto-test.patch" |
264 |
- "${FILESDIR}/${PN}-2015.8.13-failing-gateway-tests.patch" |
265 |
- "${FILESDIR}/${PN}-2015.8.13-sanitize-minion-name.patch" |
266 |
-) |
267 |
- |
268 |
-python_prepare() { |
269 |
- # this test fails because it trys to "pip install distribute" |
270 |
- rm tests/unit/{modules,states}/zcbuildout_test.py \ |
271 |
- tests/unit/modules/{rh_ip,win_network,random_org}_test.py |
272 |
-} |
273 |
- |
274 |
-python_install_all() { |
275 |
- local svc |
276 |
- USE_SETUPTOOLS=1 distutils-r1_python_install_all |
277 |
- |
278 |
- for svc in minion master syndic api; do |
279 |
- newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} |
280 |
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
281 |
- if [[ -e pkg/salt-${svc}.service ]]; then |
282 |
- sed -i -r 's/After=(.*)/After=syslog.target \1/' pkg/salt-${svc}.service || die |
283 |
- systemd_dounit pkg/salt-${svc}.service |
284 |
- elif [[ -e "${FILESDIR}"/salt-${svc}.service ]]; then |
285 |
- systemd_dounit "${FILESDIR}"/salt-${svc}.service |
286 |
- fi |
287 |
- done |
288 |
- |
289 |
- insinto /etc/${PN} |
290 |
- doins -r conf/* |
291 |
-} |
292 |
- |
293 |
-python_test() { |
294 |
- local tempdir |
295 |
- # testsuite likes lots of files |
296 |
- ulimit -n 3072 |
297 |
- |
298 |
- # ${T} is too long a path for the tests to work |
299 |
- tempdir="$(mktemp -dup /tmp salt-XXX)" |
300 |
- mkdir "${T}/$(basename "${tempdir}")" |
301 |
- |
302 |
- ( |
303 |
- cleanup() { rm -f "${tempdir}"; } |
304 |
- trap cleanup EXIT |
305 |
- |
306 |
- addwrite "${tempdir}" |
307 |
- ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" |
308 |
- |
309 |
- USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="${tempdir}" \ |
310 |
- ${EPYTHON} tests/runtests.py \ |
311 |
- --unit-tests --no-report --verbose |
312 |
- |
313 |
- ) || die "testing failed" |
314 |
-} |
315 |
|
316 |
diff --git a/app-admin/salt/salt-2015.8.13.ebuild b/app-admin/salt/salt-2015.8.13.ebuild |
317 |
deleted file mode 100644 |
318 |
index 88256a21d76..00000000000 |
319 |
--- a/app-admin/salt/salt-2015.8.13.ebuild |
320 |
+++ /dev/null |
321 |
@@ -1,140 +0,0 @@ |
322 |
-# Copyright 1999-2017 Gentoo Foundation |
323 |
-# Distributed under the terms of the GNU General Public License v2 |
324 |
- |
325 |
-EAPI=5 |
326 |
-PYTHON_COMPAT=(python2_7) |
327 |
- |
328 |
-inherit eutils systemd distutils-r1 |
329 |
- |
330 |
-DESCRIPTION="Salt is a remote execution and configuration manager" |
331 |
-HOMEPAGE="https://saltstack.com/community/" |
332 |
- |
333 |
-if [[ ${PV} == 9999* ]]; then |
334 |
- inherit git-r3 |
335 |
- EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" |
336 |
- EGIT_BRANCH="develop" |
337 |
- SRC_URI="" |
338 |
- KEYWORDS="" |
339 |
-else |
340 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
341 |
- KEYWORDS="~x86 ~amd64" |
342 |
-fi |
343 |
- |
344 |
-LICENSE="Apache-2.0" |
345 |
-SLOT="0" |
346 |
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" |
347 |
-IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" |
348 |
- |
349 |
-RDEPEND="sys-apps/pciutils |
350 |
- dev-python/jinja[${PYTHON_USEDEP}] |
351 |
- >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] |
352 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
353 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
354 |
- >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
355 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
356 |
- >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] |
357 |
- virtual/python-futures[${PYTHON_USEDEP}] |
358 |
- libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
359 |
- mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
360 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
361 |
- libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) |
362 |
- openssl? ( |
363 |
- dev-libs/openssl:*[-bindist] |
364 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
365 |
- ) |
366 |
- raet? ( |
367 |
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] |
368 |
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] |
369 |
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] |
370 |
- ) |
371 |
- zeromq? ( |
372 |
- >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] |
373 |
- >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] |
374 |
- ) |
375 |
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
376 |
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
377 |
- portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
378 |
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
379 |
- mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) |
380 |
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
381 |
- selinux? ( sec-policy/selinux-salt ) |
382 |
- timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) |
383 |
- nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) |
384 |
- neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) |
385 |
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
386 |
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
387 |
- vim-syntax? ( app-vim/salt-vim )" |
388 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
389 |
- test? ( |
390 |
- dev-python/psutil[${PYTHON_USEDEP}] |
391 |
- dev-python/pip[${PYTHON_USEDEP}] |
392 |
- dev-python/virtualenv[${PYTHON_USEDEP}] |
393 |
- dev-python/mock[${PYTHON_USEDEP}] |
394 |
- dev-python/timelib[${PYTHON_USEDEP}] |
395 |
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
396 |
- >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
397 |
- >=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}] |
398 |
- ${RDEPEND} |
399 |
- )" |
400 |
- |
401 |
-DOCS=(README.rst AUTHORS) |
402 |
- |
403 |
-REQUIRED_USE="|| ( raet zeromq )" |
404 |
- |
405 |
-PATCHES=( |
406 |
- "${FILESDIR}/${PN}-2015.8.0-remove-buggy-tests.patch" |
407 |
- "${FILESDIR}/${PN}-2015.5.5-auth-tests.patch" |
408 |
- "${FILESDIR}/${PN}-2015.5.5-cron-tests.patch" |
409 |
- "${FILESDIR}/${PN}-2015.5.5-remove-buggy-tests.patch" |
410 |
- "${FILESDIR}/${PN}-2015.8.2-tmpdir.patch" |
411 |
- "${FILESDIR}/${PN}-2015.8.10-remove-failing-boto-test.patch" |
412 |
- "${FILESDIR}/${PN}-2015.8.13-failing-gateway-tests.patch" |
413 |
-) |
414 |
- |
415 |
-python_prepare() { |
416 |
- # this test fails because it trys to "pip install distribute" |
417 |
- rm tests/unit/{modules,states}/zcbuildout_test.py \ |
418 |
- tests/unit/modules/{rh_ip,win_network,random_org}_test.py |
419 |
-} |
420 |
- |
421 |
-python_install_all() { |
422 |
- local svc |
423 |
- USE_SETUPTOOLS=1 distutils-r1_python_install_all |
424 |
- |
425 |
- for svc in minion master syndic api; do |
426 |
- newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} |
427 |
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
428 |
- if [[ -e pkg/salt-${svc}.service ]]; then |
429 |
- sed -i -r 's/After=(.*)/After=syslog.target \1/' pkg/salt-${svc}.service || die |
430 |
- systemd_dounit pkg/salt-${svc}.service |
431 |
- elif [[ -e "${FILESDIR}"/salt-${svc}.service ]]; then |
432 |
- systemd_dounit "${FILESDIR}"/salt-${svc}.service |
433 |
- fi |
434 |
- done |
435 |
- |
436 |
- insinto /etc/${PN} |
437 |
- doins -r conf/* |
438 |
-} |
439 |
- |
440 |
-python_test() { |
441 |
- local tempdir |
442 |
- # testsuite likes lots of files |
443 |
- ulimit -n 3072 |
444 |
- |
445 |
- # ${T} is too long a path for the tests to work |
446 |
- tempdir="$(mktemp -dup /tmp salt-XXX)" |
447 |
- mkdir "${T}/$(basename "${tempdir}")" |
448 |
- |
449 |
- ( |
450 |
- cleanup() { rm -f "${tempdir}"; } |
451 |
- trap cleanup EXIT |
452 |
- |
453 |
- addwrite "${tempdir}" |
454 |
- ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" |
455 |
- |
456 |
- USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="${tempdir}" \ |
457 |
- ${EPYTHON} tests/runtests.py \ |
458 |
- --unit-tests --no-report --verbose |
459 |
- |
460 |
- ) || die "testing failed" |
461 |
-} |
462 |
|
463 |
diff --git a/app-admin/salt/salt-2016.3.8.ebuild b/app-admin/salt/salt-2016.3.8.ebuild |
464 |
deleted file mode 100644 |
465 |
index 655ea35eb46..00000000000 |
466 |
--- a/app-admin/salt/salt-2016.3.8.ebuild |
467 |
+++ /dev/null |
468 |
@@ -1,147 +0,0 @@ |
469 |
-# Copyright 1999-2017 Gentoo Foundation |
470 |
-# Distributed under the terms of the GNU General Public License v2 |
471 |
- |
472 |
-EAPI=6 |
473 |
-PYTHON_COMPAT=( python2_7 ) |
474 |
- |
475 |
-inherit eutils systemd distutils-r1 |
476 |
- |
477 |
-DESCRIPTION="Salt is a remote execution and configuration manager" |
478 |
-HOMEPAGE="https://saltstack.com/community/" |
479 |
- |
480 |
-if [[ ${PV} == 9999* ]]; then |
481 |
- inherit git-r3 |
482 |
- EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" |
483 |
- EGIT_BRANCH="develop" |
484 |
- SRC_URI="" |
485 |
- KEYWORDS="" |
486 |
-else |
487 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
488 |
- KEYWORDS="~x86 ~amd64" |
489 |
-fi |
490 |
- |
491 |
-LICENSE="Apache-2.0" |
492 |
-SLOT="0" |
493 |
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" |
494 |
-IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" |
495 |
- |
496 |
-RDEPEND="sys-apps/pciutils |
497 |
- dev-python/jinja[${PYTHON_USEDEP}] |
498 |
- >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] |
499 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
500 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
501 |
- >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
502 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
503 |
- >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] |
504 |
- virtual/python-futures[${PYTHON_USEDEP}] |
505 |
- libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
506 |
- mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
507 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
508 |
- libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) |
509 |
- openssl? ( |
510 |
- dev-libs/openssl:*[-bindist] |
511 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
512 |
- ) |
513 |
- raet? ( |
514 |
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] |
515 |
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] |
516 |
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] |
517 |
- ) |
518 |
- zeromq? ( |
519 |
- >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] |
520 |
- >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] |
521 |
- ) |
522 |
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
523 |
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
524 |
- portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
525 |
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
526 |
- mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) |
527 |
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
528 |
- selinux? ( sec-policy/selinux-salt ) |
529 |
- timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) |
530 |
- nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) |
531 |
- neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) |
532 |
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
533 |
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
534 |
- vim-syntax? ( app-vim/salt-vim )" |
535 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
536 |
- test? ( |
537 |
- dev-python/psutil[${PYTHON_USEDEP}] |
538 |
- dev-python/pip[${PYTHON_USEDEP}] |
539 |
- dev-python/virtualenv[${PYTHON_USEDEP}] |
540 |
- dev-python/mock[${PYTHON_USEDEP}] |
541 |
- dev-python/timelib[${PYTHON_USEDEP}] |
542 |
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
543 |
- !x86? ( dev-python/boto3[${PYTHON_USEDEP}] ) |
544 |
- >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
545 |
- >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] |
546 |
- >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] |
547 |
- ${RDEPEND} |
548 |
- )" |
549 |
- |
550 |
-DOCS=( README.rst AUTHORS ) |
551 |
- |
552 |
-REQUIRED_USE="|| ( raet zeromq )" |
553 |
-RESTRICT="x86? ( test )" |
554 |
- |
555 |
-PATCHES=( |
556 |
- "${FILESDIR}/${PN}-2016.3.5-tmpdir.patch" |
557 |
- "${FILESDIR}/${PN}-2016.3.1-dont-realpath-tmpdir.patch" |
558 |
- "${FILESDIR}/${PN}-2016.3.4-test-nonexist-dirs.patch" |
559 |
- "${FILESDIR}/${PN}-2016.3.4-dont-test-ordering.patch" |
560 |
-) |
561 |
- |
562 |
-python_prepare() { |
563 |
- # this test fails because it trys to "pip install distribute" |
564 |
- rm tests/unit/{modules,states}/zcbuildout_test.py \ |
565 |
- tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die |
566 |
- |
567 |
- # apparently libcloud does not know about this? |
568 |
- rm tests/unit/cloud/clouds/dimensiondata_test.py || die |
569 |
- |
570 |
- # seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'" |
571 |
- rm tests/unit/cloud/clouds/gce_test.py || die |
572 |
- |
573 |
- # needs network access |
574 |
- rm tests/unit/modules/boto_{vpc,elb,secgroup}_test.py || die |
575 |
- rm tests/unit/states/boto_vpc_test.py || die |
576 |
- rm tests/unit/transport/{zeromq,tcp,req}_test.py || die |
577 |
-} |
578 |
- |
579 |
-python_install_all() { |
580 |
- local svc |
581 |
- USE_SETUPTOOLS=1 distutils-r1_python_install_all |
582 |
- |
583 |
- for svc in minion master syndic api; do |
584 |
- newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} |
585 |
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
586 |
- systemd_dounit "${FILESDIR}"/salt-${svc}.service |
587 |
- done |
588 |
- |
589 |
- insinto /etc/${PN} |
590 |
- doins -r conf/* |
591 |
-} |
592 |
- |
593 |
-python_test() { |
594 |
- local tempdir |
595 |
- # testsuite likes lots of files |
596 |
- ulimit -n 3072 || die |
597 |
- |
598 |
- # ${T} is too long a path for the tests to work |
599 |
- tempdir="$(mktemp -dup /tmp salt-XXX)" |
600 |
- mkdir "${T}/$(basename "${tempdir}")" |
601 |
- |
602 |
- ( |
603 |
- cleanup() { rm -f "${tempdir}"; } |
604 |
- trap cleanup EXIT |
605 |
- |
606 |
- addwrite "${tempdir}" |
607 |
- ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" |
608 |
- |
609 |
- USE_SETUPTOOLS=1 SHELL="/bin/bash" \ |
610 |
- TMPDIR="${tempdir}" \ |
611 |
- ${EPYTHON} tests/runtests.py \ |
612 |
- --unit-tests --no-report --verbose |
613 |
- |
614 |
- ) || die "testing failed" |
615 |
-} |