1 |
commit: 8becf0b0a61a4d82e0fc0a073ec9526196e15676 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 27 00:59:40 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 27 01:00:11 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8becf0b0 |
7 |
|
8 |
app-admin/salt: drop 3001.6-r1, 3002.5-r1, 3003.1-r1 |
9 |
|
10 |
Shadowed versions. |
11 |
|
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
app-admin/salt/Manifest | 3 - |
15 |
app-admin/salt/salt-3001.6-r1.ebuild | 187 -------------------------------- |
16 |
app-admin/salt/salt-3002.5-r1.ebuild | 187 -------------------------------- |
17 |
app-admin/salt/salt-3003.1-r1.ebuild | 201 ----------------------------------- |
18 |
4 files changed, 578 deletions(-) |
19 |
|
20 |
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest |
21 |
index b0cefc2f51d6..74cedfb26638 100644 |
22 |
--- a/app-admin/salt/Manifest |
23 |
+++ b/app-admin/salt/Manifest |
24 |
@@ -1,10 +1,7 @@ |
25 |
DIST salt-3000.2-py38-misc.patch.gz 6250 BLAKE2B 68fff80a042e6bf208ea2d9692da7a7b1e29572f1ec3c850c14743bbf2821d231f933ec4e6d6eaad12acee0b7666888a37a72872b2b082c92d8db9de988fbbec SHA512 6d4a66323a423e630f7cc73b566ed96c452c8fc3d72c25a2dd86033c4774c1c8e8b8701e1d4ee92994d4148c398d704f419023e26d8b40c8fdd63f9d79d9d52f |
26 |
DIST salt-3000.8.tar.gz 15249139 BLAKE2B df306669ba11dd650621222ff9c69f5a6e16b6f431e9d93e6712ee95da43091bfe28416fe0d71988ed9ee70cb347755b779a356c50fa59c63c67a874ed1906f4 SHA512 a18d5bea3b3835f83d5b1e5315990d83f6c58c36df5589d5de0f8cc3a46db4c960b58032e29d56841a160b9b170cdbb81bca38dbbd72ccb5866ccc8a7da6e800 |
27 |
DIST salt-3000.9.tar.gz 15250432 BLAKE2B b76c166363b0b0fd3e3aa4b5306ba8280a2c99fbc7fd9866d957406bba8e6fcc03b769b53dbb80b115f9fa9f1fdc93e1eb257f4bf04283e414a309c16e4f078f SHA512 94214f20a8a080ebdcbb7e3351f60a466c3a92cc85d177c2ea677192a63e58b0f9cacfb1af04e14022a7ac570ebd0b931722d1d001a7655dcd7502813c29a092 |
28 |
-DIST salt-3001.6.tar.gz 15736056 BLAKE2B 00e7674452e9d61c3cd487d27a3a1f3435c6b12dcc89008aa63c96814957b6ce8654f4d4d51dbce7b14027f0cee66fd2ea9602f6be18bf2f4beac11ae164f89f SHA512 e45c9cfddb64ab1c9d66b6b6b3e5ff8d9010c01307161e5013140b4362ee630cf912ab153d1afa72f56d18fc5353293b2f4b449caf8ee384d1e93204d490bf4c |
29 |
DIST salt-3001.8.tar.gz 15740488 BLAKE2B 77875a670b81438280becd1f29b64fbc766379192a9ca041568cd9360a3c4213bb3018063e88a297e9d1f637fb7ca3ef049a73a258022ec07e42f01a40bdf09a SHA512 8e90b2a1f82f951ab40a53a8af2ab421758ed8244f1881cc7aa71a8d9c2e2e6d892166ec8f8f6182966e56eb28c9aee6a060ee54b559b1d073fba97ad0afb013 |
30 |
-DIST salt-3002.5.tar.gz 15784880 BLAKE2B baa90bb0caea572dfbe12d92fb488ee0c4adef9a07221f394009cd43a62ffef18c57f2e7cdcfcd923807c7a3d02ce6833480f74d70250c29d311420f30514300 SHA512 dda2caa338f646ec51d2de6b0df10fbb27eceddbe8c797ae192b9ef1312d566ae71a243a3a95918fa375b125089aa29a73b1b908c5cc1b0451dccb582a4978a1 |
31 |
DIST salt-3002.7.tar.gz 15792124 BLAKE2B b4cb4a6d73c45f3c2183a7adfe8196bbc5788dce1995bd5c640cd9957bdfdba2e96deebaba927d6103fc50f4eaab86d51f4dd4594d25b7357db79ed67b39258e SHA512 c1e7bbcd39b5c2bef351bd74026346bf729839c4161f6eff8162620e9cb08a63073abeeb8af6bab635070386a883df494ef08cc07a84efa9aa7f2160b357a938 |
32 |
-DIST salt-3003.1.tar.gz 16010476 BLAKE2B 3cd141061d8fa6ad00fe60615e8d36fda9fb26264adb2722d34e0b93c626fe09d78c3b9280ad8fe98924469a1ede1ad93cc06bde24a121c3db8c957be0ab7d75 SHA512 bf5ec7f1d16c776be5c2e90bff30e11817f369c3b08c0fe8bd991e7be31179b10cbd244048fb08c05aff30d7b6037c0575c311da4a0f300ce02bcf677aa6616f |
33 |
DIST salt-3003.3.tar.gz 16017984 BLAKE2B 9cd1e33a7b6dff4d3c6c5a87e1204f7f113b6190da8301061e26fcec178aba597a9e17ab60a54a67b52a895a9a8aef58bec70e9fdd8d8edc5a42945f6de21a58 SHA512 4fe50922833fce48fcc679adb16a0e1fe893531b2feb08b235a1461c58b8d9a72af2acd89fc0f712207fb0cd215d6b446e31a40001b46c43d0cc4ac827ce29e3 |
34 |
DIST salt-3003.tar.gz 15830910 BLAKE2B ea4f02eece951c3fb4fcc480d00f7b531ac549b2e23ff9a210b73f749f9ba83e0402e02a59028f41f94958d17512e417b7c1b7015e8ee3aeac55be9b1374fe6f SHA512 7f631466372f303c03f2852a5cfba1ee5c6ba1636a6fe1e1622e90d0b1376ef9f670aa1b4754f3d9c8c7fe1b99fe1b4c49e140dc86d90d157a1ec1e73ba43c38 |
35 |
|
36 |
diff --git a/app-admin/salt/salt-3001.6-r1.ebuild b/app-admin/salt/salt-3001.6-r1.ebuild |
37 |
deleted file mode 100644 |
38 |
index f7f0572e44ba..000000000000 |
39 |
--- a/app-admin/salt/salt-3001.6-r1.ebuild |
40 |
+++ /dev/null |
41 |
@@ -1,187 +0,0 @@ |
42 |
-# Copyright 1999-2021 Gentoo Authors |
43 |
-# Distributed under the terms of the GNU General Public License v2 |
44 |
- |
45 |
-EAPI=7 |
46 |
-PYTHON_COMPAT=( python3_{7..8} ) |
47 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
48 |
-inherit systemd distutils-r1 |
49 |
- |
50 |
-DESCRIPTION="Salt is a remote execution and configuration manager" |
51 |
-HOMEPAGE="https://www.saltstack.com/resources/community/ |
52 |
- https://github.com/saltstack" |
53 |
- |
54 |
-if [[ ${PV} == 9999* ]]; then |
55 |
- inherit git-r3 |
56 |
- EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" |
57 |
- EGIT_BRANCH="develop" |
58 |
- SRC_URI="" |
59 |
-else |
60 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
61 |
- KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
62 |
-fi |
63 |
- |
64 |
-LICENSE="Apache-2.0" |
65 |
-SLOT="0" |
66 |
-IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako |
67 |
- mongodb neutron nova openssl portage profile redis selinux test raet |
68 |
- +zeromq vim-syntax" |
69 |
- |
70 |
-RDEPEND=" |
71 |
- sys-apps/pciutils |
72 |
- dev-python/distro[${PYTHON_USEDEP}] |
73 |
- dev-python/jinja[${PYTHON_USEDEP}] |
74 |
- dev-python/libnacl[${PYTHON_USEDEP}] |
75 |
- >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] |
76 |
- >=dev-python/pycryptodome-3.9.7[${PYTHON_USEDEP}] |
77 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
78 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
79 |
- >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
80 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
81 |
- dev-python/toml[${PYTHON_USEDEP}] |
82 |
- dev-python/watchdog[${PYTHON_USEDEP}] |
83 |
- libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
84 |
- mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
85 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
86 |
- libvirt? ( |
87 |
- $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8) |
88 |
- ) |
89 |
- openssl? ( |
90 |
- dev-libs/openssl:0=[-bindist(-)] |
91 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
92 |
- ) |
93 |
- raet? ( |
94 |
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] |
95 |
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] |
96 |
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] |
97 |
- ) |
98 |
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
99 |
- cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] ) |
100 |
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
101 |
- portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
102 |
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
103 |
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
104 |
- selinux? ( sec-policy/selinux-salt ) |
105 |
- nova? ( |
106 |
- $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8) |
107 |
- ) |
108 |
- neutron? ( |
109 |
- $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8) |
110 |
- ) |
111 |
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
112 |
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
113 |
- vim-syntax? ( app-vim/salt-vim ) |
114 |
- zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] ) |
115 |
-" |
116 |
-BDEPEND=" |
117 |
- test? ( |
118 |
- ${RDEPEND} |
119 |
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
120 |
- >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] |
121 |
- >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] |
122 |
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] |
123 |
- >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
124 |
- dev-python/pip[${PYTHON_USEDEP}] |
125 |
- dev-python/psutil[${PYTHON_USEDEP}] |
126 |
- dev-python/pytest[${PYTHON_USEDEP}] |
127 |
- dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] |
128 |
- >=dev-python/pytest-salt-2020.1.27[${PYTHON_USEDEP}] |
129 |
- dev-python/pytest-salt-factories[${PYTHON_USEDEP}] |
130 |
- dev-python/pytest-tempdir[${PYTHON_USEDEP}] |
131 |
- >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] |
132 |
- >=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}] |
133 |
- !x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] ) |
134 |
- )" |
135 |
- |
136 |
-DOCS=( README.rst AUTHORS ) |
137 |
- |
138 |
-REQUIRED_USE="|| ( raet zeromq ) |
139 |
- test? ( cheetah genshi )" |
140 |
-RESTRICT="!test? ( test ) x86? ( test )" |
141 |
- |
142 |
-PATCHES=( |
143 |
- "${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch" |
144 |
- "${FILESDIR}/salt-3001.1-tests.patch" |
145 |
- "${FILESDIR}/salt-3001.6-tests.patch" |
146 |
-) |
147 |
- |
148 |
-python_prepare_all() { |
149 |
- # remove tests with external dependencies that may not be available, and |
150 |
- # tests that don't work in sandbox |
151 |
- rm tests/unit/{test_{zypp_plugins,module_names},utils/test_{extend,cache}}.py || die |
152 |
- rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die |
153 |
- rm tests/unit/states/test_boto_vpc.py || die |
154 |
- rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die |
155 |
- |
156 |
- # tests that require network access |
157 |
- rm tests/unit/{states,modules}/test_zcbuildout.py || die |
158 |
- |
159 |
- # make sure pkg_resources doesn't bomb because pycrypto isn't installed |
160 |
- find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die |
161 |
- # pycryptodome rather than pycryptodomex |
162 |
- find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die |
163 |
- |
164 |
- distutils-r1_python_prepare_all |
165 |
-} |
166 |
- |
167 |
-python_prepare() { |
168 |
- einfo "Fixing collections.abc warnings for ${EPYTHON}" |
169 |
- local abc |
170 |
- abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die |
171 |
- find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die |
172 |
-} |
173 |
- |
174 |
-python_install_all() { |
175 |
- local svc |
176 |
- USE_SETUPTOOLS=1 distutils-r1_python_install_all |
177 |
- |
178 |
- for svc in minion master syndic api; do |
179 |
- newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} |
180 |
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
181 |
- systemd_dounit "${FILESDIR}"/salt-${svc}.service |
182 |
- done |
183 |
- |
184 |
- insinto /etc/${PN} |
185 |
- doins -r conf/* |
186 |
-} |
187 |
- |
188 |
-python_test() { |
189 |
- local tempdir |
190 |
- # testsuite likes lots of files |
191 |
- ulimit -n 3072 || die |
192 |
- |
193 |
- # ${T} is too long a path for the tests to work |
194 |
- tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" |
195 |
- mkdir "${T}/$(basename "${tempdir}")" |
196 |
- |
197 |
- ( |
198 |
- cleanup() { rm -f "${tempdir}" || die; } |
199 |
- |
200 |
- trap cleanup EXIT |
201 |
- |
202 |
- addwrite "${tempdir}" |
203 |
- ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die |
204 |
- |
205 |
- USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ |
206 |
- TMPDIR="${tempdir}" \ |
207 |
- ${EPYTHON} tests/runtests.py \ |
208 |
- --unit-tests --no-report --verbose \ |
209 |
- || die "testing failed with ${EPYTHON}" |
210 |
- ) |
211 |
-} |
212 |
- |
213 |
-pkg_postinst() { |
214 |
- if use python_targets_python3_8; then |
215 |
- if use nova; then |
216 |
- ewarn "Salt's nova functionality will not work with python3.8 since" |
217 |
- ewarn "dev-python/python-novaclient does not support it yet" |
218 |
- fi |
219 |
- if use neutron; then |
220 |
- ewarn "Salt's neutron functionality will not work with python3.8 since" |
221 |
- ewarn "dev-python/python-neutronclient does not support it yet" |
222 |
- fi |
223 |
- if use libvirt; then |
224 |
- ewarn "Salt's libvirt functionality will not work with python3.8 since" |
225 |
- ewarn "dev-python/libvirt-python does not support it yet" |
226 |
- fi |
227 |
- fi |
228 |
-} |
229 |
|
230 |
diff --git a/app-admin/salt/salt-3002.5-r1.ebuild b/app-admin/salt/salt-3002.5-r1.ebuild |
231 |
deleted file mode 100644 |
232 |
index f5d17b9155a1..000000000000 |
233 |
--- a/app-admin/salt/salt-3002.5-r1.ebuild |
234 |
+++ /dev/null |
235 |
@@ -1,187 +0,0 @@ |
236 |
-# Copyright 1999-2021 Gentoo Authors |
237 |
-# Distributed under the terms of the GNU General Public License v2 |
238 |
- |
239 |
-EAPI=7 |
240 |
-PYTHON_COMPAT=( python3_{7..9} ) |
241 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
242 |
-inherit systemd distutils-r1 |
243 |
- |
244 |
-DESCRIPTION="Salt is a remote execution and configuration manager" |
245 |
-HOMEPAGE="https://www.saltstack.com/resources/community/ |
246 |
- https://github.com/saltstack" |
247 |
- |
248 |
-if [[ ${PV} == 9999* ]]; then |
249 |
- inherit git-r3 |
250 |
- EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" |
251 |
- EGIT_BRANCH="develop" |
252 |
- SRC_URI="" |
253 |
-else |
254 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
255 |
- KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
256 |
-fi |
257 |
- |
258 |
-LICENSE="Apache-2.0" |
259 |
-SLOT="0" |
260 |
-IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako |
261 |
- mongodb neutron nova openssl portage profile redis selinux test raet |
262 |
- +zeromq vim-syntax" |
263 |
- |
264 |
-RDEPEND=" |
265 |
- sys-apps/pciutils |
266 |
- >=dev-python/distro-1.5[${PYTHON_USEDEP}] |
267 |
- dev-python/jinja[${PYTHON_USEDEP}] |
268 |
- dev-python/libnacl[${PYTHON_USEDEP}] |
269 |
- >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] |
270 |
- >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}] |
271 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
272 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
273 |
- >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
274 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
275 |
- dev-python/toml[${PYTHON_USEDEP}] |
276 |
- dev-python/watchdog[${PYTHON_USEDEP}] |
277 |
- libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
278 |
- mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
279 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
280 |
- libvirt? ( |
281 |
- $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8) |
282 |
- ) |
283 |
- openssl? ( |
284 |
- dev-libs/openssl:0=[-bindist(-)] |
285 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
286 |
- ) |
287 |
- raet? ( |
288 |
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] |
289 |
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] |
290 |
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] |
291 |
- ) |
292 |
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
293 |
- cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] ) |
294 |
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
295 |
- portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
296 |
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
297 |
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
298 |
- selinux? ( sec-policy/selinux-salt ) |
299 |
- nova? ( |
300 |
- $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8) |
301 |
- ) |
302 |
- neutron? ( |
303 |
- $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8) |
304 |
- ) |
305 |
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
306 |
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
307 |
- vim-syntax? ( app-vim/salt-vim ) |
308 |
- zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] ) |
309 |
-" |
310 |
-BDEPEND=" |
311 |
- test? ( |
312 |
- ${RDEPEND} |
313 |
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
314 |
- >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] |
315 |
- >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] |
316 |
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] |
317 |
- >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
318 |
- dev-python/pip[${PYTHON_USEDEP}] |
319 |
- dev-python/psutil[${PYTHON_USEDEP}] |
320 |
- dev-python/pytest[${PYTHON_USEDEP}] |
321 |
- dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] |
322 |
- >=dev-python/pytest-salt-factories-0.93.0[${PYTHON_USEDEP}] |
323 |
- dev-python/pytest-tempdir[${PYTHON_USEDEP}] |
324 |
- >=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}] |
325 |
- !x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] ) |
326 |
- )" |
327 |
- |
328 |
-DOCS=( README.rst AUTHORS ) |
329 |
- |
330 |
-REQUIRED_USE="|| ( raet zeromq ) |
331 |
- test? ( cheetah genshi )" |
332 |
-RESTRICT="!test? ( test ) x86? ( test )" |
333 |
- |
334 |
-PATCHES=( |
335 |
- "${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch" |
336 |
- "${FILESDIR}/salt-3002-dont-realpath-on-tmpdir.patch" |
337 |
- "${FILESDIR}/salt-3002-tests.patch" |
338 |
- "${FILESDIR}/salt-3002.5-tests.patch" |
339 |
-) |
340 |
- |
341 |
-python_prepare_all() { |
342 |
- # remove tests with external dependencies that may not be available, and |
343 |
- # tests that don't work in sandbox |
344 |
- rm tests/unit/{test_{zypp_plugins,module_names},utils/test_{extend,cache}}.py || die |
345 |
- rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die |
346 |
- rm tests/unit/states/test_boto_vpc.py || die |
347 |
- rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die |
348 |
- |
349 |
- # tests that require network access |
350 |
- rm tests/unit/{states,modules}/test_zcbuildout.py || die |
351 |
- |
352 |
- # make sure pkg_resources doesn't bomb because pycrypto isn't installed |
353 |
- # make sure pkg_resources doesn't bomb because pycrypto isn't installed |
354 |
- find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die |
355 |
- # pycryptodome rather than pycryptodomex |
356 |
- find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die |
357 |
- |
358 |
- distutils-r1_python_prepare_all |
359 |
-} |
360 |
- |
361 |
-python_prepare() { |
362 |
- einfo "Fixing collections.abc warnings for ${EPYTHON}" |
363 |
- local abc |
364 |
- abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die |
365 |
- find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die |
366 |
-} |
367 |
- |
368 |
-python_install_all() { |
369 |
- local svc |
370 |
- USE_SETUPTOOLS=1 distutils-r1_python_install_all |
371 |
- |
372 |
- for svc in minion master syndic api; do |
373 |
- newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} |
374 |
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
375 |
- systemd_dounit "${FILESDIR}"/salt-${svc}.service |
376 |
- done |
377 |
- |
378 |
- insinto /etc/${PN} |
379 |
- doins -r conf/* |
380 |
-} |
381 |
- |
382 |
-python_test() { |
383 |
- local tempdir |
384 |
- # testsuite likes lots of files |
385 |
- ulimit -n 3072 || die |
386 |
- |
387 |
- # ${T} is too long a path for the tests to work |
388 |
- tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" |
389 |
- mkdir "${T}/$(basename "${tempdir}")" |
390 |
- |
391 |
- ( |
392 |
- cleanup() { rm -f "${tempdir}" || die; } |
393 |
- |
394 |
- trap cleanup EXIT |
395 |
- |
396 |
- addwrite "${tempdir}" |
397 |
- ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die |
398 |
- |
399 |
- USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ |
400 |
- TMPDIR="${tempdir}" \ |
401 |
- ${EPYTHON} tests/runtests.py \ |
402 |
- --unit-tests --no-report --verbose \ |
403 |
- || die "testing failed with ${EPYTHON}" |
404 |
- ) |
405 |
-} |
406 |
- |
407 |
-pkg_postinst() { |
408 |
- if use python_targets_python3_8; then |
409 |
- if use nova; then |
410 |
- ewarn "Salt's nova functionality will not work with python3.8 since" |
411 |
- ewarn "dev-python/python-novaclient does not support it yet" |
412 |
- fi |
413 |
- if use neutron; then |
414 |
- ewarn "Salt's neutron functionality will not work with python3.8 since" |
415 |
- ewarn "dev-python/python-neutronclient does not support it yet" |
416 |
- fi |
417 |
- if use libvirt; then |
418 |
- ewarn "Salt's libvirt functionality will not work with python3.8 since" |
419 |
- ewarn "dev-python/libvirt-python does not support it yet" |
420 |
- fi |
421 |
- fi |
422 |
-} |
423 |
|
424 |
diff --git a/app-admin/salt/salt-3003.1-r1.ebuild b/app-admin/salt/salt-3003.1-r1.ebuild |
425 |
deleted file mode 100644 |
426 |
index e173766c185d..000000000000 |
427 |
--- a/app-admin/salt/salt-3003.1-r1.ebuild |
428 |
+++ /dev/null |
429 |
@@ -1,201 +0,0 @@ |
430 |
-# Copyright 1999-2021 Gentoo Authors |
431 |
-# Distributed under the terms of the GNU General Public License v2 |
432 |
- |
433 |
-EAPI=7 |
434 |
-PYTHON_COMPAT=( python3_{7..9} ) |
435 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
436 |
-inherit systemd distutils-r1 |
437 |
- |
438 |
-DESCRIPTION="Salt is a remote execution and configuration manager" |
439 |
-HOMEPAGE="https://www.saltstack.com/resources/community/ |
440 |
- https://github.com/saltstack" |
441 |
- |
442 |
-if [[ ${PV} == 9999* ]]; then |
443 |
- inherit git-r3 |
444 |
- EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" |
445 |
- EGIT_BRANCH="develop" |
446 |
- SRC_URI="" |
447 |
-else |
448 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
449 |
- KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
450 |
-fi |
451 |
- |
452 |
-LICENSE="Apache-2.0" |
453 |
-SLOT="0" |
454 |
-IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako |
455 |
- mongodb neutron nova openssl portage profile redis selinux test raet |
456 |
- +zeromq vim-syntax" |
457 |
- |
458 |
-RDEPEND=" |
459 |
- sys-apps/pciutils |
460 |
- >=dev-python/distro-1.5[${PYTHON_USEDEP}] |
461 |
- dev-python/jinja[${PYTHON_USEDEP}] |
462 |
- dev-python/libnacl[${PYTHON_USEDEP}] |
463 |
- >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] |
464 |
- >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}] |
465 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
466 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
467 |
- >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
468 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
469 |
- >=dev-python/toml-0.10.2[${PYTHON_USEDEP}] |
470 |
- dev-python/watchdog[${PYTHON_USEDEP}] |
471 |
- libcloud? ( >=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}] ) |
472 |
- mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
473 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
474 |
- libvirt? ( |
475 |
- $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8) |
476 |
- ) |
477 |
- openssl? ( |
478 |
- dev-libs/openssl:0=[-bindist(-)] |
479 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
480 |
- ) |
481 |
- raet? ( |
482 |
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] |
483 |
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] |
484 |
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] |
485 |
- ) |
486 |
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
487 |
- cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] ) |
488 |
- genshi? ( dev-python/genshi[${PYTHON_USEDEP}] ) |
489 |
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
490 |
- portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
491 |
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
492 |
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
493 |
- selinux? ( sec-policy/selinux-salt ) |
494 |
- nova? ( |
495 |
- $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8) |
496 |
- ) |
497 |
- neutron? ( |
498 |
- $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8) |
499 |
- ) |
500 |
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
501 |
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
502 |
- vim-syntax? ( app-vim/salt-vim ) |
503 |
- zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] ) |
504 |
-" |
505 |
-BDEPEND=" |
506 |
- test? ( |
507 |
- ${RDEPEND} |
508 |
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
509 |
- >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] |
510 |
- dev-python/mako[${PYTHON_USEDEP}] |
511 |
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] |
512 |
- >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
513 |
- dev-python/pip[${PYTHON_USEDEP}] |
514 |
- dev-python/psutil[${PYTHON_USEDEP}] |
515 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
516 |
- dev-python/pytest[${PYTHON_USEDEP}] |
517 |
- >=dev-python/pytest-salt-factories-0.121.1[${PYTHON_USEDEP}] |
518 |
- dev-python/pytest-tempdir[${PYTHON_USEDEP}] |
519 |
- dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] |
520 |
- dev-python/pytest-subtests[${PYTHON_USEDEP}] |
521 |
- dev-python/flaky[${PYTHON_USEDEP}] |
522 |
- dev-python/libcloud[${PYTHON_USEDEP}] |
523 |
- >=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}] |
524 |
- !x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] ) |
525 |
- )" |
526 |
- |
527 |
-DOCS=( README.rst AUTHORS ) |
528 |
- |
529 |
-REQUIRED_USE="|| ( raet zeromq ) |
530 |
- test? ( cheetah genshi )" |
531 |
-RESTRICT="!test? ( test ) x86? ( test )" |
532 |
- |
533 |
-PATCHES=( |
534 |
- "${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch" |
535 |
- "${FILESDIR}/salt-3003-gentoolkit-revdep.patch" |
536 |
- "${FILESDIR}/salt-3002-tests.patch" |
537 |
- "${FILESDIR}/salt-3003-tests.patch" |
538 |
- "${FILESDIR}/salt-3003.1-tests.patch" |
539 |
-) |
540 |
- |
541 |
-python_prepare_all() { |
542 |
- # remove tests with external dependencies that may not be available, and |
543 |
- # tests that don't work in sandbox |
544 |
- rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die |
545 |
- rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die |
546 |
- rm tests/unit/states/test_boto_vpc.py || die |
547 |
- rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die |
548 |
- rm tests/pytests/functional/transport/server/test_req_channel.py || die |
549 |
- |
550 |
- # tests that require network access |
551 |
- rm tests/unit/{states,modules}/test_zcbuildout.py || die |
552 |
- rm -r tests/integration/cloud || die |
553 |
- rm -r tests/kitchen/tests/wordpress/tests || die |
554 |
- rm tests/kitchen/test_kitchen.py || die |
555 |
- rm tests/unit/modules/test_network.py || die |
556 |
- |
557 |
- # tests require root access |
558 |
- rm tests/integration/pillar/test_git_pillar.py || die |
559 |
- rm tests/integration/states/test_supervisord.py || die |
560 |
- rm tests/pytests/unit/client/test_ssh.py || die |
561 |
- |
562 |
- # make sure pkg_resources doesn't bomb because pycrypto isn't installed |
563 |
- find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die |
564 |
- # pycryptodome rather than pycryptodomex |
565 |
- find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die |
566 |
- |
567 |
- distutils-r1_python_prepare_all |
568 |
-} |
569 |
- |
570 |
-python_prepare() { |
571 |
- einfo "Fixing collections.abc warnings for ${EPYTHON}" |
572 |
- local abc |
573 |
- abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die |
574 |
- find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die |
575 |
- |
576 |
- # removes contextvars, see bug: https://bugs.gentoo.org/799431 |
577 |
- sed -i '/^contextvars/d' requirements/base.txt || die |
578 |
-} |
579 |
- |
580 |
-python_install_all() { |
581 |
- local svc |
582 |
- USE_SETUPTOOLS=1 distutils-r1_python_install_all |
583 |
- |
584 |
- for svc in minion master syndic api; do |
585 |
- newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} |
586 |
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
587 |
- systemd_dounit "${FILESDIR}"/salt-${svc}.service |
588 |
- done |
589 |
- |
590 |
- insinto /etc/${PN} |
591 |
- doins -r conf/* |
592 |
-} |
593 |
- |
594 |
-python_test() { |
595 |
- # testsuite likes lots of files |
596 |
- ulimit -n 4096 || die |
597 |
- |
598 |
- # ${T} is too long a path for the tests to work |
599 |
- local TMPDIR |
600 |
- TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" |
601 |
- ( |
602 |
- export TMPDIR |
603 |
- cleanup() { rm -rf "${TMPDIR}" || die; } |
604 |
- |
605 |
- trap cleanup EXIT |
606 |
- |
607 |
- addwrite "${TMPDIR}" |
608 |
- |
609 |
- USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ |
610 |
- "${EPYTHON}" -m pytest -vv \ |
611 |
- || die "testing failed with ${EPYTHON}" |
612 |
- ) |
613 |
-} |
614 |
- |
615 |
-pkg_postinst() { |
616 |
- if use python_targets_python3_8; then |
617 |
- if use nova; then |
618 |
- ewarn "Salt's nova functionality will not work with python3.8 since" |
619 |
- ewarn "dev-python/python-novaclient does not support it yet" |
620 |
- fi |
621 |
- if use neutron; then |
622 |
- ewarn "Salt's neutron functionality will not work with python3.8 since" |
623 |
- ewarn "dev-python/python-neutronclient does not support it yet" |
624 |
- fi |
625 |
- if use libvirt; then |
626 |
- ewarn "Salt's libvirt functionality will not work with python3.8 since" |
627 |
- ewarn "dev-python/libvirt-python does not support it yet" |
628 |
- fi |
629 |
- fi |
630 |
-} |