1 |
commit: 6d6dd3a466ceb72c220850bab99909e0cdda9c87 |
2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Mar 27 22:52:37 2017 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 27 22:53:03 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d6dd3a4 |
7 |
|
8 |
app-admin/salt: Clean out old versions |
9 |
|
10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
11 |
|
12 |
app-admin/salt/Manifest | 2 - |
13 |
app-admin/salt/salt-2016.11.2.ebuild | 146 ----------------------------------- |
14 |
app-admin/salt/salt-2016.3.5.ebuild | 142 ---------------------------------- |
15 |
3 files changed, 290 deletions(-) |
16 |
|
17 |
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest |
18 |
index 9b700a4c83e..cc7be59f127 100644 |
19 |
--- a/app-admin/salt/Manifest |
20 |
+++ b/app-admin/salt/Manifest |
21 |
@@ -1,6 +1,4 @@ |
22 |
DIST salt-2015.5.10.tar.gz 5693422 SHA256 863a96e70f8521af35fe11b10d25b3205a0bfbba9a8aee02e2842aa7106496fd SHA512 78a4cbe5c771208e957360689a25ae4e44566987e07e7fda54e6db9028485eacc6ad016c65c981090f9b5d95331e46048a094aecc27703b3956c06ab6ebad95d WHIRLPOOL 805b48df07707d85d8338251f26c72164a5421731fc11f5c933b72af97348a2f11ee35889f72ec032acbea275e98575d35786b56fd84a7917f8fdbc30567ae86 |
23 |
DIST salt-2015.8.13.tar.gz 7036243 SHA256 cca82c9a4f267692660b098c1f76e54ab6a24131391893719bde0eb3a1ed2959 SHA512 ec8626f7360542bfeea90fc3d6fd9d9d015da4c2a6adf9957c22501ed9531b0a44d2cbc4853c41856b4cd46c142d2441884ec99700f3c0a5310cc428f9f1ec2a WHIRLPOOL c21f3bdc5fd674ea664c7e8fd58ef6685328a6ee3679850f3e9a085b1e604e1224a3323b906b47075fb8dd39f373583fb549e7b0f3f725d44928bcf716955a10 |
24 |
-DIST salt-2016.11.2.tar.gz 9114042 SHA256 f5c3d3cf4293d5b80a93790c76dec61421991c9c54222abd7327b3437ad13a43 SHA512 0dbc861424643af664edd2d9cb8bcbde7e9bcf7c1d202a5e844af83c21dc2d75fd7034db27dffc58dc2a6e47cfe2ea2c42e2a9af867c7ca78f93166eb4fd03ad WHIRLPOOL e1757de32d41e356a423ca347f59fdce05b574bb7bd9dbeffd34e7f6e90e8f0a2afb48ac209736fa6b7da86525c85e7ac5c7539dde621c533fa1e5b3475c5392 |
25 |
DIST salt-2016.11.3.tar.gz 9163351 SHA256 9d5849f38a858288ebc6ef790ced86ae724e61b06e3ee27e6cecf3f6c1ecbc51 SHA512 24bc75c50b4d6bd38a6f2dedc0a8c12142cc1b9d551455e49ea0ede405c78eb6a939f741dd8c0cbb8f206937ee69582bebe2fc127a24a4c2cf06cf3c3c16e507 WHIRLPOOL eae74f912ac4da4484a7adf6e0ef317c303a250521032594a885731f444f60ed6ddc965463a79e97c4653c501696575510fa106f048911914189952bdf04bcdd |
26 |
-DIST salt-2016.3.5.tar.gz 8405980 SHA256 fec215dfdec33ca6826453e5437656f9ed5e4a121ef3db6341f91f799cd3e751 SHA512 ca9ae85f8174aa55fefeaef70d65981d581f25f14f219f437ad4dc0db08e5944f356564c92aee46e796547db38312efedc8db5080576d578982f963a742635e6 WHIRLPOOL 72b504dd669adf4ffc6818083f40b07b78914c8f168ab496d628a3f5cd136d7c4266906007e095aff4c18e123dfcf03391f577fb09b841eb71bc30ea6a46de07 |
27 |
DIST salt-2016.3.6.tar.gz 8432840 SHA256 4cc45f48255b7e46631807b071674552872c322ab77f398c9beefbf14d6a212f SHA512 949d70504310cd88139c520812a870e4c68e6b0c7ec6decfd157283994d6be659e7823a4453d1b6464c24fc762bc9ba61d4f6a767c4d6f65e496c7f5b6589a8d WHIRLPOOL 3d5abdbe0e297cbfc1b0f7fce0d6959132bbe917abc80ad7bb368a2ec657c0c0019123a22558c3fbdec489cb20430243ff837658d55da6755a07d4ec4d35158c |
28 |
|
29 |
diff --git a/app-admin/salt/salt-2016.11.2.ebuild b/app-admin/salt/salt-2016.11.2.ebuild |
30 |
deleted file mode 100644 |
31 |
index 872e4bab594..00000000000 |
32 |
--- a/app-admin/salt/salt-2016.11.2.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,146 +0,0 @@ |
35 |
-# Copyright 1999-2017 Gentoo Foundation |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=6 |
39 |
-PYTHON_COMPAT=( python2_7 ) |
40 |
- |
41 |
-inherit eutils systemd distutils-r1 |
42 |
- |
43 |
-DESCRIPTION="Salt is a remote execution and configuration manager" |
44 |
-HOMEPAGE="http://saltstack.org/" |
45 |
- |
46 |
-if [[ ${PV} == 9999* ]]; then |
47 |
- inherit git-r3 |
48 |
- EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" |
49 |
- EGIT_BRANCH="develop" |
50 |
- SRC_URI="" |
51 |
- KEYWORDS="" |
52 |
-else |
53 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
54 |
- KEYWORDS="~x86 ~amd64" |
55 |
-fi |
56 |
- |
57 |
-LICENSE="Apache-2.0" |
58 |
-SLOT="0" |
59 |
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" |
60 |
-IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" |
61 |
- |
62 |
-RDEPEND="sys-apps/pciutils |
63 |
- dev-python/jinja[${PYTHON_USEDEP}] |
64 |
- >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] |
65 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
66 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
67 |
- >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
68 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
69 |
- >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] |
70 |
- virtual/python-futures[${PYTHON_USEDEP}] |
71 |
- libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
72 |
- mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
73 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
74 |
- libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) |
75 |
- openssl? ( |
76 |
- dev-libs/openssl:*[-bindist] |
77 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
78 |
- ) |
79 |
- raet? ( |
80 |
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] |
81 |
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] |
82 |
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] |
83 |
- ) |
84 |
- zeromq? ( |
85 |
- >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] |
86 |
- >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] |
87 |
- ) |
88 |
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
89 |
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
90 |
- portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
91 |
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
92 |
- mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) |
93 |
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
94 |
- selinux? ( sec-policy/selinux-salt ) |
95 |
- timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) |
96 |
- nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) |
97 |
- neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) |
98 |
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
99 |
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
100 |
- vim-syntax? ( app-vim/salt-vim )" |
101 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
102 |
- test? ( |
103 |
- dev-python/psutil[${PYTHON_USEDEP}] |
104 |
- dev-python/pip[${PYTHON_USEDEP}] |
105 |
- dev-python/virtualenv[${PYTHON_USEDEP}] |
106 |
- dev-python/mock[${PYTHON_USEDEP}] |
107 |
- dev-python/timelib[${PYTHON_USEDEP}] |
108 |
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
109 |
- !x86? ( dev-python/boto3[${PYTHON_USEDEP}] ) |
110 |
- >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
111 |
- >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] |
112 |
- >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] |
113 |
- ${RDEPEND} |
114 |
- )" |
115 |
- |
116 |
-DOCS=( README.rst AUTHORS ) |
117 |
- |
118 |
-REQUIRED_USE="|| ( raet zeromq )" |
119 |
-RESTRICT="x86? ( test )" |
120 |
- |
121 |
-PATCHES=( |
122 |
- "${FILESDIR}/${PN}-2016.11.0-tmpdir.patch" |
123 |
- "${FILESDIR}/${PN}-2016.3.1-dont-realpath-tmpdir.patch" |
124 |
- "${FILESDIR}/${PN}-2016.3.4-test-nonexist-dirs.patch" |
125 |
- "${FILESDIR}/${PN}-2016.11.0-remove-file-tree-test.patch" |
126 |
- "${FILESDIR}/${PN}-2016.11.0-broken-tests.patch" |
127 |
-) |
128 |
- |
129 |
-python_prepare() { |
130 |
- # this test fails because it trys to "pip install distribute" |
131 |
- rm tests/unit/{modules,states}/zcbuildout_test.py \ |
132 |
- tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die |
133 |
- |
134 |
- # https://github.com/saltstack/salt/issues/39095 |
135 |
- rm tests/unit/utils/parsers_test.py |
136 |
- |
137 |
- # apparently libcloud does not know about this? |
138 |
- rm tests/unit/cloud/clouds/dimensiondata_test.py || die |
139 |
- |
140 |
- # seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'" |
141 |
- rm tests/unit/cloud/clouds/gce_test.py || die |
142 |
-} |
143 |
- |
144 |
-python_install_all() { |
145 |
- local svc |
146 |
- USE_SETUPTOOLS=1 distutils-r1_python_install_all |
147 |
- |
148 |
- for svc in minion master syndic api; do |
149 |
- newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} |
150 |
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
151 |
- systemd_dounit "${FILESDIR}"/salt-${svc}.service |
152 |
- done |
153 |
- |
154 |
- insinto /etc/${PN} |
155 |
- doins -r conf/* |
156 |
-} |
157 |
- |
158 |
-python_test() { |
159 |
- local tempdir |
160 |
- # testsuite likes lots of files |
161 |
- ulimit -n 3072 || die |
162 |
- |
163 |
- # ${T} is too long a path for the tests to work |
164 |
- tempdir="$(mktemp -dup /tmp salt-XXX)" |
165 |
- mkdir "${T}/$(basename "${tempdir}")" |
166 |
- |
167 |
- ( |
168 |
- cleanup() { rm -f "${tempdir}"; } |
169 |
- trap cleanup EXIT |
170 |
- |
171 |
- addwrite "${tempdir}" |
172 |
- ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" |
173 |
- |
174 |
- USE_SETUPTOOLS=1 SHELL="/bin/bash" \ |
175 |
- TMPDIR="${tempdir}" \ |
176 |
- ${EPYTHON} tests/runtests.py \ |
177 |
- --unit-tests --no-report --verbose |
178 |
- |
179 |
- ) || die "testing failed" |
180 |
-} |
181 |
|
182 |
diff --git a/app-admin/salt/salt-2016.3.5.ebuild b/app-admin/salt/salt-2016.3.5.ebuild |
183 |
deleted file mode 100644 |
184 |
index 16ccbd833be..00000000000 |
185 |
--- a/app-admin/salt/salt-2016.3.5.ebuild |
186 |
+++ /dev/null |
187 |
@@ -1,142 +0,0 @@ |
188 |
-# Copyright 1999-2017 Gentoo Foundation |
189 |
-# Distributed under the terms of the GNU General Public License v2 |
190 |
- |
191 |
-EAPI=6 |
192 |
-PYTHON_COMPAT=( python2_7 ) |
193 |
- |
194 |
-inherit eutils systemd distutils-r1 |
195 |
- |
196 |
-DESCRIPTION="Salt is a remote execution and configuration manager" |
197 |
-HOMEPAGE="http://saltstack.org/" |
198 |
- |
199 |
-if [[ ${PV} == 9999* ]]; then |
200 |
- inherit git-r3 |
201 |
- EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" |
202 |
- EGIT_BRANCH="develop" |
203 |
- SRC_URI="" |
204 |
- KEYWORDS="" |
205 |
-else |
206 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
207 |
- KEYWORDS="~x86 ~amd64" |
208 |
-fi |
209 |
- |
210 |
-LICENSE="Apache-2.0" |
211 |
-SLOT="0" |
212 |
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" |
213 |
-IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" |
214 |
- |
215 |
-RDEPEND="sys-apps/pciutils |
216 |
- dev-python/jinja[${PYTHON_USEDEP}] |
217 |
- >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] |
218 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
219 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
220 |
- >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
221 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
222 |
- >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] |
223 |
- virtual/python-futures[${PYTHON_USEDEP}] |
224 |
- libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
225 |
- mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
226 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
227 |
- libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) |
228 |
- openssl? ( |
229 |
- dev-libs/openssl:*[-bindist] |
230 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
231 |
- ) |
232 |
- raet? ( |
233 |
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] |
234 |
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] |
235 |
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] |
236 |
- ) |
237 |
- zeromq? ( |
238 |
- >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] |
239 |
- >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] |
240 |
- ) |
241 |
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
242 |
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
243 |
- portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
244 |
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
245 |
- mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) |
246 |
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
247 |
- selinux? ( sec-policy/selinux-salt ) |
248 |
- timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) |
249 |
- nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) |
250 |
- neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) |
251 |
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
252 |
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
253 |
- vim-syntax? ( app-vim/salt-vim )" |
254 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
255 |
- test? ( |
256 |
- dev-python/psutil[${PYTHON_USEDEP}] |
257 |
- dev-python/pip[${PYTHON_USEDEP}] |
258 |
- dev-python/virtualenv[${PYTHON_USEDEP}] |
259 |
- dev-python/mock[${PYTHON_USEDEP}] |
260 |
- dev-python/timelib[${PYTHON_USEDEP}] |
261 |
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
262 |
- !x86? ( dev-python/boto3[${PYTHON_USEDEP}] ) |
263 |
- >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
264 |
- >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] |
265 |
- >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] |
266 |
- ${RDEPEND} |
267 |
- )" |
268 |
- |
269 |
-DOCS=( README.rst AUTHORS ) |
270 |
- |
271 |
-REQUIRED_USE="|| ( raet zeromq )" |
272 |
-RESTRICT="x86? ( test )" |
273 |
- |
274 |
-PATCHES=( |
275 |
- "${FILESDIR}/${PN}-2016.3.5-tmpdir.patch" |
276 |
- "${FILESDIR}/${PN}-2016.3.1-dont-realpath-tmpdir.patch" |
277 |
- "${FILESDIR}/${PN}-2016.3.4-test-nonexist-dirs.patch" |
278 |
- "${FILESDIR}/${PN}-2016.3.4-dont-test-ordering.patch" |
279 |
-) |
280 |
- |
281 |
-python_prepare() { |
282 |
- # this test fails because it trys to "pip install distribute" |
283 |
- rm tests/unit/{modules,states}/zcbuildout_test.py \ |
284 |
- tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die |
285 |
- |
286 |
- # apparently libcloud does not know about this? |
287 |
- rm tests/unit/cloud/clouds/dimensiondata_test.py || die |
288 |
- |
289 |
- # seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'" |
290 |
- rm tests/unit/cloud/clouds/gce_test.py || die |
291 |
-} |
292 |
- |
293 |
-python_install_all() { |
294 |
- local svc |
295 |
- USE_SETUPTOOLS=1 distutils-r1_python_install_all |
296 |
- |
297 |
- for svc in minion master syndic api; do |
298 |
- newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} |
299 |
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
300 |
- systemd_dounit "${FILESDIR}"/salt-${svc}.service |
301 |
- done |
302 |
- |
303 |
- insinto /etc/${PN} |
304 |
- doins -r conf/* |
305 |
-} |
306 |
- |
307 |
-python_test() { |
308 |
- local tempdir |
309 |
- # testsuite likes lots of files |
310 |
- ulimit -n 3072 || die |
311 |
- |
312 |
- # ${T} is too long a path for the tests to work |
313 |
- tempdir="$(mktemp -dup /tmp salt-XXX)" |
314 |
- mkdir "${T}/$(basename "${tempdir}")" |
315 |
- |
316 |
- ( |
317 |
- cleanup() { rm -f "${tempdir}"; } |
318 |
- trap cleanup EXIT |
319 |
- |
320 |
- addwrite "${tempdir}" |
321 |
- ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" |
322 |
- |
323 |
- USE_SETUPTOOLS=1 SHELL="/bin/bash" \ |
324 |
- TMPDIR="${tempdir}" \ |
325 |
- ${EPYTHON} tests/runtests.py \ |
326 |
- --unit-tests --no-report --verbose |
327 |
- |
328 |
- ) || die "testing failed" |
329 |
-} |