1 |
commit: 5ed75a45b3a1cbc104cc3c598e42a0dceb241fdb |
2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 2 18:55:54 2022 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 2 23:40:09 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ed75a45 |
7 |
|
8 |
app-admin/salt: revbump 3004.2 to force <importlib_metadata-5 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/875389 |
11 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
12 |
|
13 |
app-admin/salt/Manifest | 1 + |
14 |
app-admin/salt/salt-3004.1-r4.ebuild | 207 --------------------- |
15 |
...salt-3004.2-r1.ebuild => salt-3004.2-r2.ebuild} | 3 +- |
16 |
3 files changed, 3 insertions(+), 208 deletions(-) |
17 |
|
18 |
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest |
19 |
index ac5e98e099a2..1b9f3acc66a0 100644 |
20 |
--- a/app-admin/salt/Manifest |
21 |
+++ b/app-admin/salt/Manifest |
22 |
@@ -1,4 +1,5 @@ |
23 |
DIST salt-3002.9.tar.gz 15817470 BLAKE2B 31fb6dbb61a9f0ab22ca761810a934792e9fa9c78628f925e63d3d54d00fa4ea0b4aa806ba3ea92f7397ba3291281bf8989d9a288fb3114c7911cdebfc9acd6a SHA512 f34fd05960a68cba51f34cf8b7c737bd84d00472cec80628f082d16e54cf70705e191ac4b6690bf406a8a11e26c8155e4bdbdec34ede5f0721fd9b5e637a0ed1 |
24 |
DIST salt-3003.4.tar.gz 16031515 BLAKE2B 34902aba7ab64f4ddbacbad1b776b9b2218caf22fb843879a80bd5c30b6c28f4c22a050bbaf0e9735507a78c887f52bcae7d1833ffeb51a543ec22fda79252e6 SHA512 35419fbb3f9a0f3e87579f740b717d6902cab0d85397b16d1e94d9516bf5f5d269b4f8bca370fd376abd9b7c8a6ad7ef4c8e8a8fdd31655fd17c810989e79693 |
25 |
DIST salt-3003.5.tar.gz 16056545 BLAKE2B ede3f0c63175f093dca07bee1bfb659cc608336ae92f532fc45868bd7eca659498c42e5d44324492744b802ade088adac869277679989550e217c1a135d6566d SHA512 ebda2056b4d6d216a0689b919d00aa78f615c355d21703d1939dbb6b00e9ad9347be4ee5b861282521f2d337bf7bf2fdc85e6942016358088a094d854fb33be9 |
26 |
+DIST salt-3004.2.tar.gz 17685127 BLAKE2B a42e31d8a006488b3a6f341f817cde21ff86248d2b548d9914c429c62d7570cdf46cf2b41311cbb08ced7f9518e68156c6df3eb78e55cacfd4d40a4e7a54f52b SHA512 b2fa434f1d25eabac51d65d75bb020943eb71aff113d683e6f436a0f205bd3c7682b1b7acd4d9a62bf37a47eb0561293d263f3174d5e266f0998a1652fcae2ef |
27 |
DIST salt-3005.tar.gz 17894520 BLAKE2B 67e755bdbe772991f620d09f61836f8ccfa2039722c3281ec4cfaa8ef76e34c57e4db861cc652545e37eb965ab765f6b6ba0250407d7d7448aa5d4685ad9492a SHA512 c2019a97a5a98b4810cdace826d5e0a6d2890a984da4b95109c1b9328a2fd11cafd2fb0ef9752adeea1d36f8b2a69b3a4a6a5a092b6a7f050c60ec52da314a18 |
28 |
|
29 |
diff --git a/app-admin/salt/salt-3004.1-r4.ebuild b/app-admin/salt/salt-3004.1-r4.ebuild |
30 |
deleted file mode 100644 |
31 |
index 5352a20caf11..000000000000 |
32 |
--- a/app-admin/salt/salt-3004.1-r4.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,207 +0,0 @@ |
35 |
-# Copyright 1999-2022 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=8 |
39 |
-PYTHON_COMPAT=( python3_{8..10} ) |
40 |
- |
41 |
-inherit systemd distutils-r1 |
42 |
- |
43 |
-DESCRIPTION="Salt is a remote execution and configuration manager" |
44 |
-HOMEPAGE="https://www.saltstack.com/resources/community/ |
45 |
- https://github.com/saltstack" |
46 |
- |
47 |
-if [[ ${PV} == 9999* ]]; then |
48 |
- inherit git-r3 |
49 |
- EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" |
50 |
- EGIT_BRANCH="develop" |
51 |
- SRC_URI="" |
52 |
-else |
53 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
54 |
- KEYWORDS="amd64 ~arm ~arm64 ~riscv x86" |
55 |
-fi |
56 |
- |
57 |
-LICENSE="Apache-2.0" |
58 |
-SLOT="0" |
59 |
-IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako |
60 |
- mongodb neutron nova openssl portage profile redis selinux test raet |
61 |
- +zeromq vim-syntax" |
62 |
- |
63 |
-RDEPEND=" |
64 |
- sys-apps/pciutils |
65 |
- >=dev-python/distro-1.5[${PYTHON_USEDEP}] |
66 |
- >=dev-python/jinja-3.0[${PYTHON_USEDEP}] |
67 |
- dev-python/libnacl[${PYTHON_USEDEP}] |
68 |
- >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] |
69 |
- >=dev-python/psutil-5.0.0[${PYTHON_USEDEP}] |
70 |
- >=dev-python/pycryptodome-3.9.8[${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 |
- >=dev-python/toml-0.10.2[${PYTHON_USEDEP}] |
76 |
- dev-python/watchdog[${PYTHON_USEDEP}] |
77 |
- libcloud? ( >=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}] ) |
78 |
- mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
79 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
80 |
- libvirt? ( |
81 |
- $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8) |
82 |
- ) |
83 |
- openssl? ( |
84 |
- dev-libs/openssl:0=[-bindist(-)] |
85 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
86 |
- ) |
87 |
- raet? ( |
88 |
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] |
89 |
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] |
90 |
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] |
91 |
- ) |
92 |
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
93 |
- cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] ) |
94 |
- genshi? ( dev-python/genshi[${PYTHON_USEDEP}] ) |
95 |
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
96 |
- portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
97 |
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
98 |
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
99 |
- selinux? ( sec-policy/selinux-salt ) |
100 |
- nova? ( |
101 |
- $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8) |
102 |
- ) |
103 |
- neutron? ( |
104 |
- $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8) |
105 |
- ) |
106 |
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
107 |
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
108 |
- vim-syntax? ( app-vim/salt-vim ) |
109 |
- zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] ) |
110 |
-" |
111 |
-BDEPEND=" |
112 |
- test? ( |
113 |
- ${RDEPEND} |
114 |
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
115 |
- >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] |
116 |
- dev-python/mako[${PYTHON_USEDEP}] |
117 |
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] |
118 |
- >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
119 |
- dev-python/passlib |
120 |
- dev-python/pip[${PYTHON_USEDEP}] |
121 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
122 |
- dev-python/pytest[${PYTHON_USEDEP}] |
123 |
- >=dev-python/pytest-salt-factories-1.0.0_rc13[${PYTHON_USEDEP}] |
124 |
- dev-python/pytest-tempdir[${PYTHON_USEDEP}] |
125 |
- dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] |
126 |
- dev-python/pytest-subtests[${PYTHON_USEDEP}] |
127 |
- dev-python/flaky[${PYTHON_USEDEP}] |
128 |
- dev-python/libcloud[${PYTHON_USEDEP}] |
129 |
- net-dns/bind-tools |
130 |
- >=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}] |
131 |
- !x86? ( >=dev-python/boto3-1.17.67[${PYTHON_USEDEP}] ) |
132 |
- )" |
133 |
- |
134 |
-DOCS=( README.rst AUTHORS ) |
135 |
- |
136 |
-REQUIRED_USE="|| ( raet zeromq ) |
137 |
- test? ( cheetah genshi )" |
138 |
-RESTRICT="!test? ( test ) x86? ( test )" |
139 |
- |
140 |
-PATCHES=( |
141 |
- "${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch" |
142 |
- "${FILESDIR}/salt-3003-gentoolkit-revdep.patch" |
143 |
- "${FILESDIR}/salt-3002-tests.patch" |
144 |
- "${FILESDIR}/salt-3003.1-tests.patch" |
145 |
- "${FILESDIR}/salt-3004.1-jinja-3.patch" |
146 |
- "${FILESDIR}/salt-3004.1-tests.patch" |
147 |
- "${FILESDIR}/salt-3004.1-relax-pyzmq-dep.patch" |
148 |
- "${FILESDIR}/salt-3004.1-py310.patch" |
149 |
-) |
150 |
- |
151 |
-python_prepare_all() { |
152 |
- # remove tests with external dependencies that may not be available, and |
153 |
- # tests that don't work in sandbox |
154 |
- rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die |
155 |
- rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die |
156 |
- rm tests/unit/states/test_boto_vpc.py || die |
157 |
- rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die |
158 |
- rm tests/pytests/functional/transport/server/test_req_channel.py || die |
159 |
- |
160 |
- # tests that require network access |
161 |
- rm tests/unit/{states,modules}/test_zcbuildout.py || die |
162 |
- rm -r tests/integration/cloud || die |
163 |
- rm -r tests/kitchen/tests/wordpress/tests || die |
164 |
- rm tests/kitchen/test_kitchen.py || die |
165 |
- rm tests/unit/modules/test_network.py || die |
166 |
- rm tests/pytests/functional/modules/test_pip.py || die |
167 |
- rm tests/pytests/unit/client/ssh/test_ssh.py || die |
168 |
- |
169 |
- # tests require root access |
170 |
- rm tests/integration/pillar/test_git_pillar.py || die |
171 |
- rm tests/integration/states/test_supervisord.py || die |
172 |
- |
173 |
- # make sure pkg_resources doesn't bomb because pycrypto isn't installed |
174 |
- find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die |
175 |
- # pycryptodome rather than pycryptodomex |
176 |
- find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die |
177 |
- |
178 |
- distutils-r1_python_prepare_all |
179 |
-} |
180 |
- |
181 |
-python_prepare() { |
182 |
- einfo "Fixing collections.abc warnings for ${EPYTHON}" |
183 |
- local abc |
184 |
- abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die |
185 |
- find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die |
186 |
- |
187 |
- # removes contextvars, see bug: https://bugs.gentoo.org/799431 |
188 |
- sed -i '/^contextvars/d' requirements/base.txt || die |
189 |
-} |
190 |
- |
191 |
-python_install_all() { |
192 |
- local svc |
193 |
- USE_SETUPTOOLS=1 distutils-r1_python_install_all |
194 |
- |
195 |
- for svc in minion master syndic api; do |
196 |
- newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} |
197 |
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
198 |
- systemd_dounit "${FILESDIR}"/salt-${svc}.service |
199 |
- done |
200 |
- |
201 |
- insinto /etc/${PN} |
202 |
- doins -r conf/* |
203 |
-} |
204 |
- |
205 |
-python_test() { |
206 |
- # testsuite likes lots of files |
207 |
- ulimit -n 4096 || die |
208 |
- |
209 |
- # ${T} is too long a path for the tests to work |
210 |
- local TMPDIR |
211 |
- TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" |
212 |
- ( |
213 |
- export TMPDIR |
214 |
- cleanup() { rm -rf "${TMPDIR}" || die; } |
215 |
- |
216 |
- trap cleanup EXIT |
217 |
- |
218 |
- addwrite "${TMPDIR}" |
219 |
- |
220 |
- USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ |
221 |
- "${EPYTHON}" -m pytest -vv \ |
222 |
- || die "testing failed with ${EPYTHON}" |
223 |
- ) |
224 |
-} |
225 |
- |
226 |
-pkg_postinst() { |
227 |
- if use python_targets_python3_8; then |
228 |
- if use nova; then |
229 |
- ewarn "Salt's nova functionality will not work with python3.8 since" |
230 |
- ewarn "dev-python/python-novaclient does not support it yet" |
231 |
- fi |
232 |
- if use neutron; then |
233 |
- ewarn "Salt's neutron functionality will not work with python3.8 since" |
234 |
- ewarn "dev-python/python-neutronclient does not support it yet" |
235 |
- fi |
236 |
- if use libvirt; then |
237 |
- ewarn "Salt's libvirt functionality will not work with python3.8 since" |
238 |
- ewarn "dev-python/libvirt-python does not support it yet" |
239 |
- fi |
240 |
- fi |
241 |
-} |
242 |
|
243 |
diff --git a/app-admin/salt/salt-3004.2-r1.ebuild b/app-admin/salt/salt-3004.2-r2.ebuild |
244 |
similarity index 98% |
245 |
rename from app-admin/salt/salt-3004.2-r1.ebuild |
246 |
rename to app-admin/salt/salt-3004.2-r2.ebuild |
247 |
index c1dde00d1ca1..1e3ce475d192 100644 |
248 |
--- a/app-admin/salt/salt-3004.2-r1.ebuild |
249 |
+++ b/app-admin/salt/salt-3004.2-r2.ebuild |
250 |
@@ -38,11 +38,12 @@ RDEPEND=" |
251 |
dev-python/markupsafe[${PYTHON_USEDEP}] |
252 |
>=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
253 |
dev-python/setuptools[${PYTHON_USEDEP}] |
254 |
- >=dev-python/toml-0.10.2[${PYTHON_USEDEP}] |
255 |
+ dev-python/tomli[${PYTHON_USEDEP}] |
256 |
dev-python/watchdog[${PYTHON_USEDEP}] |
257 |
libcloud? ( >=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}] ) |
258 |
mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
259 |
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
260 |
+ <dev-python/importlib_metadata-5[${PYTHON_USEDEP}] |
261 |
libvirt? ( |
262 |
$(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8) |
263 |
) |