1 |
commit: f46d27b8ae2a2403a993120c740b0ee362dfd668 |
2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 28 18:24:20 2022 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 28 18:24:30 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f46d27b8 |
7 |
|
8 |
app-admin/salt: drop versions |
9 |
|
10 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
11 |
|
12 |
app-admin/salt/Manifest | 5 - |
13 |
app-admin/salt/files/salt-3001.1-tests.patch | 151 -------------------- |
14 |
app-admin/salt/files/salt-3001.6-tests.patch | 18 --- |
15 |
app-admin/salt/salt-3001.8.ebuild | 188 ------------------------- |
16 |
app-admin/salt/salt-3002.7.ebuild | 196 -------------------------- |
17 |
app-admin/salt/salt-3002.8.ebuild | 200 -------------------------- |
18 |
app-admin/salt/salt-3003-r1.ebuild | 195 ------------------------- |
19 |
app-admin/salt/salt-3003.3-r1.ebuild | 203 --------------------------- |
20 |
app-admin/salt/salt-3003.3.ebuild | 202 -------------------------- |
21 |
9 files changed, 1358 deletions(-) |
22 |
|
23 |
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest |
24 |
index be95622da536..c25bbbf6d61c 100644 |
25 |
--- a/app-admin/salt/Manifest |
26 |
+++ b/app-admin/salt/Manifest |
27 |
@@ -1,10 +1,5 @@ |
28 |
-DIST salt-3001.8.tar.gz 15740488 BLAKE2B 77875a670b81438280becd1f29b64fbc766379192a9ca041568cd9360a3c4213bb3018063e88a297e9d1f637fb7ca3ef049a73a258022ec07e42f01a40bdf09a SHA512 8e90b2a1f82f951ab40a53a8af2ab421758ed8244f1881cc7aa71a8d9c2e2e6d892166ec8f8f6182966e56eb28c9aee6a060ee54b559b1d073fba97ad0afb013 |
29 |
-DIST salt-3002.7.tar.gz 15792124 BLAKE2B b4cb4a6d73c45f3c2183a7adfe8196bbc5788dce1995bd5c640cd9957bdfdba2e96deebaba927d6103fc50f4eaab86d51f4dd4594d25b7357db79ed67b39258e SHA512 c1e7bbcd39b5c2bef351bd74026346bf729839c4161f6eff8162620e9cb08a63073abeeb8af6bab635070386a883df494ef08cc07a84efa9aa7f2160b357a938 |
30 |
-DIST salt-3002.8.tar.gz 15798643 BLAKE2B 12280dfd29f46f9bb8b2df6fcef474c2c2237d6f9c71e1474caae58893605dd6f9fb4c4573f52765cb950cd15e31fc0fda2fa8dd1c87d48c1951d2812c1a3a81 SHA512 a88a6f77d2af2cff5d5244f38b16a1904da05bdfd45b2087691e41b07f21785b1838151314d7c80d3a33eebefe480c8f3678fa161e9ceaaa50c997022463c472 |
31 |
DIST salt-3002.9.tar.gz 15817470 BLAKE2B 31fb6dbb61a9f0ab22ca761810a934792e9fa9c78628f925e63d3d54d00fa4ea0b4aa806ba3ea92f7397ba3291281bf8989d9a288fb3114c7911cdebfc9acd6a SHA512 f34fd05960a68cba51f34cf8b7c737bd84d00472cec80628f082d16e54cf70705e191ac4b6690bf406a8a11e26c8155e4bdbdec34ede5f0721fd9b5e637a0ed1 |
32 |
-DIST salt-3003.3.tar.gz 16017984 BLAKE2B 9cd1e33a7b6dff4d3c6c5a87e1204f7f113b6190da8301061e26fcec178aba597a9e17ab60a54a67b52a895a9a8aef58bec70e9fdd8d8edc5a42945f6de21a58 SHA512 4fe50922833fce48fcc679adb16a0e1fe893531b2feb08b235a1461c58b8d9a72af2acd89fc0f712207fb0cd215d6b446e31a40001b46c43d0cc4ac827ce29e3 |
33 |
DIST salt-3003.4.tar.gz 16031515 BLAKE2B 34902aba7ab64f4ddbacbad1b776b9b2218caf22fb843879a80bd5c30b6c28f4c22a050bbaf0e9735507a78c887f52bcae7d1833ffeb51a543ec22fda79252e6 SHA512 35419fbb3f9a0f3e87579f740b717d6902cab0d85397b16d1e94d9516bf5f5d269b4f8bca370fd376abd9b7c8a6ad7ef4c8e8a8fdd31655fd17c810989e79693 |
34 |
DIST salt-3003.5.tar.gz 16056545 BLAKE2B ede3f0c63175f093dca07bee1bfb659cc608336ae92f532fc45868bd7eca659498c42e5d44324492744b802ade088adac869277679989550e217c1a135d6566d SHA512 ebda2056b4d6d216a0689b919d00aa78f615c355d21703d1939dbb6b00e9ad9347be4ee5b861282521f2d337bf7bf2fdc85e6942016358088a094d854fb33be9 |
35 |
-DIST salt-3003.tar.gz 15830910 BLAKE2B ea4f02eece951c3fb4fcc480d00f7b531ac549b2e23ff9a210b73f749f9ba83e0402e02a59028f41f94958d17512e417b7c1b7015e8ee3aeac55be9b1374fe6f SHA512 7f631466372f303c03f2852a5cfba1ee5c6ba1636a6fe1e1622e90d0b1376ef9f670aa1b4754f3d9c8c7fe1b99fe1b4c49e140dc86d90d157a1ec1e73ba43c38 |
36 |
DIST salt-3004.1.tar.gz 17685649 BLAKE2B 64950cdc8420228f935d4a21fc20872da9ecf7c51b866ec3c59b46486b84a739b002acc44fa909eed93ce3dc6bedc9804df05d3d9ee5a9a13cd9d041ba70f876 SHA512 9353a8dc2a1c6e272318c6f35059236c5d78b6c8930f715275b701c12fca3be1fe930eb533f3f0c22933ba60967b0980300b922fe486cee9a62e6cdb568bdf91 |
37 |
DIST salt-3004.2.tar.gz 17685127 BLAKE2B a42e31d8a006488b3a6f341f817cde21ff86248d2b548d9914c429c62d7570cdf46cf2b41311cbb08ced7f9518e68156c6df3eb78e55cacfd4d40a4e7a54f52b SHA512 b2fa434f1d25eabac51d65d75bb020943eb71aff113d683e6f436a0f205bd3c7682b1b7acd4d9a62bf37a47eb0561293d263f3174d5e266f0998a1652fcae2ef |
38 |
|
39 |
diff --git a/app-admin/salt/files/salt-3001.1-tests.patch b/app-admin/salt/files/salt-3001.1-tests.patch |
40 |
deleted file mode 100644 |
41 |
index ad32b611dfe2..000000000000 |
42 |
--- a/app-admin/salt/files/salt-3001.1-tests.patch |
43 |
+++ /dev/null |
44 |
@@ -1,151 +0,0 @@ |
45 |
-diff --git a/tests/integration/master/test_event_return.py b/tests/integration/master/test_event_return.py |
46 |
-index 1a97be0e5f..93c57f08ff 100644 |
47 |
---- a/tests/integration/master/test_event_return.py |
48 |
-+++ b/tests/integration/master/test_event_return.py |
49 |
-@@ -18,7 +18,7 @@ import time |
50 |
- import salt.ext.six as six |
51 |
- from salt.utils.nb_popen import NonBlockingPopen |
52 |
- from saltfactories.utils.ports import get_unused_localhost_port |
53 |
--from saltfactories.utils.processes.helpers import terminate_process |
54 |
-+from saltfactories.utils.processes import terminate_process |
55 |
- from tests.support.cli_scripts import ScriptPathMixin |
56 |
- from tests.support.mixins import AdaptedConfigurationTestCaseMixin |
57 |
- from tests.support.runtests import RUNTIME_VARS |
58 |
-diff --git a/tests/integration/utils/testprogram.py b/tests/integration/utils/testprogram.py |
59 |
-index 74bbc1cd90..be651591d1 100644 |
60 |
---- a/tests/integration/utils/testprogram.py |
61 |
-+++ b/tests/integration/utils/testprogram.py |
62 |
-@@ -30,7 +30,7 @@ import salt.utils.psutil_compat as psutils |
63 |
- import salt.utils.yaml |
64 |
- from salt.ext import six |
65 |
- from salt.ext.six.moves import range |
66 |
--from saltfactories.utils.processes.helpers import ( |
67 |
-+from saltfactories.utils.processes import ( |
68 |
- terminate_process, |
69 |
- terminate_process_list, |
70 |
- ) |
71 |
-diff --git a/tests/support/case.py b/tests/support/case.py |
72 |
-index 9017027ae3..517cefb64a 100644 |
73 |
---- a/tests/support/case.py |
74 |
-+++ b/tests/support/case.py |
75 |
-@@ -25,7 +25,7 @@ import time |
76 |
- from datetime import datetime, timedelta |
77 |
- |
78 |
- import salt.utils.files |
79 |
--from saltfactories.utils.processes.helpers import terminate_process |
80 |
-+from saltfactories.utils.processes import terminate_process |
81 |
- from tests.support.cli_scripts import ScriptPathMixin |
82 |
- from tests.support.helpers import RedirectStdStreams, requires_sshd_server |
83 |
- from tests.support.mixins import ( # pylint: disable=unused-import |
84 |
-diff --git a/tests/support/helpers.py b/tests/support/helpers.py |
85 |
-index bae2dceff4..93fbb66742 100644 |
86 |
---- a/tests/support/helpers.py |
87 |
-+++ b/tests/support/helpers.py |
88 |
-@@ -42,7 +42,7 @@ import salt.utils.versions |
89 |
- from salt.ext import six |
90 |
- from salt.ext.six.moves import builtins, range |
91 |
- from saltfactories.utils.ports import get_unused_localhost_port |
92 |
--from saltfactories.utils.processes.bases import ProcessResult |
93 |
-+from saltfactories.utils.processes import ProcessResult |
94 |
- from tests.support.mock import patch |
95 |
- from tests.support.runtests import RUNTIME_VARS |
96 |
- from tests.support.sminion import create_sminion |
97 |
-@@ -1674,7 +1674,7 @@ class VirtualEnv(object): |
98 |
- kwargs.setdefault("stderr", subprocess.PIPE) |
99 |
- kwargs.setdefault("universal_newlines", True) |
100 |
- proc = subprocess.run(args, check=False, **kwargs) |
101 |
-- ret = ProcessResult(proc.returncode, proc.stdout, proc.stderr, proc.args) |
102 |
-+ ret = ProcessResult(proc.returncode, proc.stdout, proc.stderr, cmdline=proc.args) |
103 |
- log.debug(ret) |
104 |
- if check is True: |
105 |
- proc.check_returncode() |
106 |
-diff --git a/tests/support/paths.py b/tests/support/paths.py |
107 |
-index 1e1e081dc4..981aa54eb7 100644 |
108 |
---- a/tests/support/paths.py |
109 |
-+++ b/tests/support/paths.py |
110 |
-@@ -49,14 +49,12 @@ if TESTS_DIR not in sys.path: |
111 |
- sys.path.insert(1, TESTS_DIR) |
112 |
- |
113 |
- SYS_TMP_DIR = os.path.abspath( |
114 |
-- os.path.realpath( |
115 |
-- # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long |
116 |
-- # for unix sockets: ``error: AF_UNIX path too long`` |
117 |
-- # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR} |
118 |
-- os.environ.get("TMPDIR", tempfile.gettempdir()) |
119 |
-- if not sys.platform.startswith("darwin") |
120 |
-- else "/tmp" |
121 |
-- ) |
122 |
-+ # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long |
123 |
-+ # for unix sockets: ``error: AF_UNIX path too long`` |
124 |
-+ # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR} |
125 |
-+ os.environ.get("TMPDIR", tempfile.gettempdir()) |
126 |
-+ if not sys.platform.startswith("darwin") |
127 |
-+ else "/tmp" |
128 |
- ) |
129 |
- TMP = os.path.join(SYS_TMP_DIR, "salt-tests-tmpdir") |
130 |
- TMP_ROOT_DIR = os.path.join(TMP, "rootdir") |
131 |
-diff --git a/tests/support/processes.py b/tests/support/processes.py |
132 |
-index 4f264862a4..7c93e48368 100644 |
133 |
---- a/tests/support/processes.py |
134 |
-+++ b/tests/support/processes.py |
135 |
-@@ -14,7 +14,7 @@ from __future__ import absolute_import |
136 |
- |
137 |
- import logging |
138 |
- |
139 |
--from saltfactories.utils.processes.helpers import ( # pylint: disable=unused-import |
140 |
-+from saltfactories.utils.processes import ( # pylint: disable=unused-import |
141 |
- collect_child_processes, |
142 |
- terminate_process, |
143 |
- terminate_process_list, |
144 |
-diff --git a/tests/unit/utils/scheduler/base.py b/tests/unit/utils/scheduler/base.py |
145 |
-index 5d7f161eb5..286e047e40 100644 |
146 |
---- a/tests/unit/utils/scheduler/base.py |
147 |
-+++ b/tests/unit/utils/scheduler/base.py |
148 |
-@@ -14,7 +14,7 @@ import salt.utils.platform |
149 |
- import salt.utils.schedule |
150 |
- from salt.modules.test import ping |
151 |
- from salt.utils.process import SubprocessList |
152 |
--from saltfactories.utils.processes.helpers import terminate_process |
153 |
-+from saltfactories.utils.processes import terminate_process |
154 |
- from tests.support.mixins import SaltReturnAssertsMixin |
155 |
- from tests.support.mock import MagicMock, patch |
156 |
- from tests.support.runtests import RUNTIME_VARS |
157 |
-diff --git a/tests/unit/utils/test_event.py b/tests/unit/utils/test_event.py |
158 |
-index 9a3b1c428d..dfcf1c5275 100644 |
159 |
---- a/tests/unit/utils/test_event.py |
160 |
-+++ b/tests/unit/utils/test_event.py |
161 |
-@@ -21,7 +21,7 @@ import zmq |
162 |
- import zmq.eventloop.ioloop |
163 |
- from salt.ext.six.moves import range |
164 |
- from salt.ext.tornado.testing import AsyncTestCase |
165 |
--from saltfactories.utils.processes.helpers import terminate_process |
166 |
-+from saltfactories.utils.processes import terminate_process |
167 |
- from tests.support.events import eventpublisher_process, eventsender_process |
168 |
- from tests.support.helpers import slowTest |
169 |
- from tests.support.runtests import RUNTIME_VARS |
170 |
-diff --git a/tests/unit/utils/test_verify.py b/tests/unit/utils/test_verify.py |
171 |
-index 5662cf621b..0339c353dc 100644 |
172 |
---- a/tests/unit/utils/test_verify.py |
173 |
-+++ b/tests/unit/utils/test_verify.py |
174 |
-@@ -343,7 +343,7 @@ class TestCleanPath(TestCase): |
175 |
- def test_clean_path_valid(self): |
176 |
- path_a = os.path.join(self.tmpdir, "foo") |
177 |
- path_b = os.path.join(self.tmpdir, "foo", "bar") |
178 |
-- assert clean_path(path_a, path_b) == path_b |
179 |
-+ assert clean_path(path_a, path_b) == os.path.realpath(path_b) |
180 |
- |
181 |
- def test_clean_path_invalid(self): |
182 |
- path_a = os.path.join(self.tmpdir, "foo") |
183 |
-@@ -398,10 +398,10 @@ class TestCleanPathLink(TestCase): |
184 |
- test_path = os.path.join(self.from_path, "test") |
185 |
- expect_path = os.path.join(self.to_path, "test") |
186 |
- ret = clean_path(self.from_path, test_path) |
187 |
-- assert ret == expect_path, "{} is not {}".format(ret, expect_path) |
188 |
-+ assert ret == os.path.realpath(expect_path), "{} is not {}".format(ret, expect_path) |
189 |
- |
190 |
- def test_clean_path_symlinked_tgt(self): |
191 |
- test_path = os.path.join(self.to_path, "test") |
192 |
- expect_path = os.path.join(self.to_path, "test") |
193 |
- ret = clean_path(self.from_path, test_path) |
194 |
-- assert ret == expect_path, "{} is not {}".format(ret, expect_path) |
195 |
-+ assert ret == os.path.realpath(expect_path), "{} is not {}".format(ret, expect_path) |
196 |
|
197 |
diff --git a/app-admin/salt/files/salt-3001.6-tests.patch b/app-admin/salt/files/salt-3001.6-tests.patch |
198 |
deleted file mode 100644 |
199 |
index d32977e4694b..000000000000 |
200 |
--- a/app-admin/salt/files/salt-3001.6-tests.patch |
201 |
+++ /dev/null |
202 |
@@ -1,18 +0,0 @@ |
203 |
---- salt-3001.6-python3_7/tests/unit/modules/test_cmdmod.py 2021-02-26 16:13:26.386553301 -0800 |
204 |
-+++ salt-3001.6/tests/unit/modules/test_cmdmod.py 2021-02-26 16:14:25.858150910 -0800 |
205 |
-@@ -437,6 +437,7 @@ |
206 |
- else: |
207 |
- raise RuntimeError |
208 |
- |
209 |
-+ @skipIf(True, "does not work with sandbox") |
210 |
- @skipIf(salt.utils.platform.is_windows(), "Do not run on Windows") |
211 |
- @skipIf(salt.utils.platform.is_darwin(), "Do not run on MacOS") |
212 |
- def test_run_cwd_in_combination_with_runas(self): |
213 |
-@@ -560,6 +561,7 @@ |
214 |
- |
215 |
- self.assertEqual(ret["stdout"], salt.utils.stringutils.to_unicode(stdout)) |
216 |
- |
217 |
-+ @skipIf(True, "does not work with sandbox") |
218 |
- def test_run_all_output_loglevel_debug(self): |
219 |
- """ |
220 |
- Test that specifying debug for loglevel |
221 |
|
222 |
diff --git a/app-admin/salt/salt-3001.8.ebuild b/app-admin/salt/salt-3001.8.ebuild |
223 |
deleted file mode 100644 |
224 |
index f5be15b9f74c..000000000000 |
225 |
--- a/app-admin/salt/salt-3001.8.ebuild |
226 |
+++ /dev/null |
227 |
@@ -1,188 +0,0 @@ |
228 |
-# Copyright 1999-2021 Gentoo Authors |
229 |
-# Distributed under the terms of the GNU General Public License v2 |
230 |
- |
231 |
-EAPI=7 |
232 |
-PYTHON_COMPAT=( python3_{7..8} ) |
233 |
- |
234 |
-inherit systemd distutils-r1 |
235 |
- |
236 |
-DESCRIPTION="Salt is a remote execution and configuration manager" |
237 |
-HOMEPAGE="https://www.saltstack.com/resources/community/ |
238 |
- https://github.com/saltstack" |
239 |
- |
240 |
-if [[ ${PV} == 9999* ]]; then |
241 |
- inherit git-r3 |
242 |
- EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" |
243 |
- EGIT_BRANCH="develop" |
244 |
- SRC_URI="" |
245 |
-else |
246 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
247 |
- KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
248 |
-fi |
249 |
- |
250 |
-LICENSE="Apache-2.0" |
251 |
-SLOT="0" |
252 |
-IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako |
253 |
- mongodb neutron nova openssl portage profile redis selinux test raet |
254 |
- +zeromq vim-syntax" |
255 |
- |
256 |
-RDEPEND=" |
257 |
- sys-apps/pciutils |
258 |
- dev-python/distro[${PYTHON_USEDEP}] |
259 |
- dev-python/jinja[${PYTHON_USEDEP}] |
260 |
- dev-python/libnacl[${PYTHON_USEDEP}] |
261 |
- >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] |
262 |
- >=dev-python/pycryptodome-3.9.7[${PYTHON_USEDEP}] |
263 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
264 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
265 |
- >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
266 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
267 |
- dev-python/toml[${PYTHON_USEDEP}] |
268 |
- dev-python/watchdog[${PYTHON_USEDEP}] |
269 |
- libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
270 |
- mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
271 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
272 |
- libvirt? ( |
273 |
- $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8) |
274 |
- ) |
275 |
- openssl? ( |
276 |
- dev-libs/openssl:0=[-bindist(-)] |
277 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
278 |
- ) |
279 |
- raet? ( |
280 |
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] |
281 |
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] |
282 |
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] |
283 |
- ) |
284 |
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
285 |
- cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] ) |
286 |
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
287 |
- portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
288 |
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
289 |
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
290 |
- selinux? ( sec-policy/selinux-salt ) |
291 |
- nova? ( |
292 |
- $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8) |
293 |
- ) |
294 |
- neutron? ( |
295 |
- $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8) |
296 |
- ) |
297 |
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
298 |
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
299 |
- vim-syntax? ( app-vim/salt-vim ) |
300 |
- zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] ) |
301 |
-" |
302 |
-BDEPEND=" |
303 |
- test? ( |
304 |
- ${RDEPEND} |
305 |
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
306 |
- >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] |
307 |
- >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] |
308 |
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] |
309 |
- >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
310 |
- dev-python/pip[${PYTHON_USEDEP}] |
311 |
- dev-python/psutil[${PYTHON_USEDEP}] |
312 |
- dev-python/pytest[${PYTHON_USEDEP}] |
313 |
- dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] |
314 |
- >=dev-python/pytest-salt-2020.1.27[${PYTHON_USEDEP}] |
315 |
- dev-python/pytest-salt-factories[${PYTHON_USEDEP}] |
316 |
- dev-python/pytest-tempdir[${PYTHON_USEDEP}] |
317 |
- >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] |
318 |
- >=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}] |
319 |
- net-dns/bind-tools |
320 |
- !x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] ) |
321 |
- )" |
322 |
- |
323 |
-DOCS=( README.rst AUTHORS ) |
324 |
- |
325 |
-REQUIRED_USE="|| ( raet zeromq ) |
326 |
- test? ( cheetah genshi )" |
327 |
-RESTRICT="!test? ( test ) x86? ( test )" |
328 |
- |
329 |
-PATCHES=( |
330 |
- "${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch" |
331 |
- "${FILESDIR}/salt-3001.1-tests.patch" |
332 |
- "${FILESDIR}/salt-3001.6-tests.patch" |
333 |
-) |
334 |
- |
335 |
-python_prepare_all() { |
336 |
- # remove tests with external dependencies that may not be available, and |
337 |
- # tests that don't work in sandbox |
338 |
- rm tests/unit/{test_{zypp_plugins,module_names},utils/test_{extend,cache}}.py || die |
339 |
- rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die |
340 |
- rm tests/unit/states/test_boto_vpc.py || die |
341 |
- rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die |
342 |
- |
343 |
- # tests that require network access |
344 |
- rm tests/unit/{states,modules}/test_zcbuildout.py || die |
345 |
- |
346 |
- # make sure pkg_resources doesn't bomb because pycrypto isn't installed |
347 |
- find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die |
348 |
- # pycryptodome rather than pycryptodomex |
349 |
- find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die |
350 |
- |
351 |
- distutils-r1_python_prepare_all |
352 |
-} |
353 |
- |
354 |
-python_prepare() { |
355 |
- einfo "Fixing collections.abc warnings for ${EPYTHON}" |
356 |
- local abc |
357 |
- abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die |
358 |
- find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die |
359 |
-} |
360 |
- |
361 |
-python_install_all() { |
362 |
- local svc |
363 |
- USE_SETUPTOOLS=1 distutils-r1_python_install_all |
364 |
- |
365 |
- for svc in minion master syndic api; do |
366 |
- newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} |
367 |
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
368 |
- systemd_dounit "${FILESDIR}"/salt-${svc}.service |
369 |
- done |
370 |
- |
371 |
- insinto /etc/${PN} |
372 |
- doins -r conf/* |
373 |
-} |
374 |
- |
375 |
-python_test() { |
376 |
- local tempdir |
377 |
- # testsuite likes lots of files |
378 |
- ulimit -n 3072 || die |
379 |
- |
380 |
- # ${T} is too long a path for the tests to work |
381 |
- tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" |
382 |
- mkdir "${T}/$(basename "${tempdir}")" |
383 |
- |
384 |
- ( |
385 |
- cleanup() { rm -f "${tempdir}" || die; } |
386 |
- |
387 |
- trap cleanup EXIT |
388 |
- |
389 |
- addwrite "${tempdir}" |
390 |
- ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die |
391 |
- |
392 |
- USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ |
393 |
- TMPDIR="${tempdir}" \ |
394 |
- ${EPYTHON} tests/runtests.py \ |
395 |
- --unit-tests --no-report --verbose \ |
396 |
- || die "testing failed with ${EPYTHON}" |
397 |
- ) |
398 |
-} |
399 |
- |
400 |
-pkg_postinst() { |
401 |
- if use python_targets_python3_8; then |
402 |
- if use nova; then |
403 |
- ewarn "Salt's nova functionality will not work with python3.8 since" |
404 |
- ewarn "dev-python/python-novaclient does not support it yet" |
405 |
- fi |
406 |
- if use neutron; then |
407 |
- ewarn "Salt's neutron functionality will not work with python3.8 since" |
408 |
- ewarn "dev-python/python-neutronclient does not support it yet" |
409 |
- fi |
410 |
- if use libvirt; then |
411 |
- ewarn "Salt's libvirt functionality will not work with python3.8 since" |
412 |
- ewarn "dev-python/libvirt-python does not support it yet" |
413 |
- fi |
414 |
- fi |
415 |
-} |
416 |
|
417 |
diff --git a/app-admin/salt/salt-3002.7.ebuild b/app-admin/salt/salt-3002.7.ebuild |
418 |
deleted file mode 100644 |
419 |
index ef104ec4d6b4..000000000000 |
420 |
--- a/app-admin/salt/salt-3002.7.ebuild |
421 |
+++ /dev/null |
422 |
@@ -1,196 +0,0 @@ |
423 |
-# Copyright 1999-2021 Gentoo Authors |
424 |
-# Distributed under the terms of the GNU General Public License v2 |
425 |
- |
426 |
-EAPI=7 |
427 |
-PYTHON_COMPAT=( python3_{7..9} ) |
428 |
- |
429 |
-inherit systemd distutils-r1 |
430 |
- |
431 |
-DESCRIPTION="Salt is a remote execution and configuration manager" |
432 |
-HOMEPAGE="https://www.saltstack.com/resources/community/ |
433 |
- https://github.com/saltstack" |
434 |
- |
435 |
-if [[ ${PV} == 9999* ]]; then |
436 |
- inherit git-r3 |
437 |
- EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" |
438 |
- EGIT_BRANCH="develop" |
439 |
- SRC_URI="" |
440 |
-else |
441 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
442 |
- KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
443 |
-fi |
444 |
- |
445 |
-LICENSE="Apache-2.0" |
446 |
-SLOT="0" |
447 |
-IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako |
448 |
- mongodb neutron nova openssl portage profile redis selinux test raet |
449 |
- +zeromq vim-syntax" |
450 |
- |
451 |
-RDEPEND=" |
452 |
- sys-apps/pciutils |
453 |
- >=dev-python/distro-1.5[${PYTHON_USEDEP}] |
454 |
- dev-python/jinja[${PYTHON_USEDEP}] |
455 |
- dev-python/libnacl[${PYTHON_USEDEP}] |
456 |
- >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] |
457 |
- >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}] |
458 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
459 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
460 |
- >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
461 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
462 |
- dev-python/toml[${PYTHON_USEDEP}] |
463 |
- dev-python/watchdog[${PYTHON_USEDEP}] |
464 |
- libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
465 |
- mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
466 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
467 |
- libvirt? ( |
468 |
- $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8) |
469 |
- ) |
470 |
- openssl? ( |
471 |
- dev-libs/openssl:0=[-bindist(-)] |
472 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
473 |
- ) |
474 |
- raet? ( |
475 |
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] |
476 |
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] |
477 |
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] |
478 |
- ) |
479 |
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
480 |
- cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] ) |
481 |
- genshi? ( dev-python/genshi[${PYTHON_USEDEP}] ) |
482 |
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
483 |
- portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
484 |
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
485 |
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
486 |
- selinux? ( sec-policy/selinux-salt ) |
487 |
- nova? ( |
488 |
- $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8) |
489 |
- ) |
490 |
- neutron? ( |
491 |
- $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8) |
492 |
- ) |
493 |
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
494 |
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
495 |
- vim-syntax? ( app-vim/salt-vim ) |
496 |
- zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] ) |
497 |
-" |
498 |
-BDEPEND=" |
499 |
- test? ( |
500 |
- ${RDEPEND} |
501 |
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
502 |
- >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] |
503 |
- >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] |
504 |
- dev-python/mako[${PYTHON_USEDEP}] |
505 |
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] |
506 |
- >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
507 |
- dev-python/pip[${PYTHON_USEDEP}] |
508 |
- dev-python/psutil[${PYTHON_USEDEP}] |
509 |
- dev-python/pytest[${PYTHON_USEDEP}] |
510 |
- dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] |
511 |
- >=dev-python/pytest-salt-factories-0.93.0[${PYTHON_USEDEP}] |
512 |
- dev-python/pytest-tempdir[${PYTHON_USEDEP}] |
513 |
- >=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}] |
514 |
- net-dns/bind-tools |
515 |
- !x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] ) |
516 |
- )" |
517 |
- |
518 |
-DOCS=( README.rst AUTHORS ) |
519 |
- |
520 |
-REQUIRED_USE=" |
521 |
- || ( raet zeromq ) |
522 |
- test? ( cheetah genshi ) |
523 |
-" |
524 |
-RESTRICT="!test? ( test ) x86? ( test )" |
525 |
- |
526 |
-PATCHES=( |
527 |
- "${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch" |
528 |
- "${FILESDIR}/salt-3002-dont-realpath-on-tmpdir.patch" |
529 |
- "${FILESDIR}/salt-3002-tests.patch" |
530 |
- "${FILESDIR}/salt-3002.5-tests.patch" |
531 |
- "${FILESDIR}/salt-3002.7-tests.patch" |
532 |
-) |
533 |
- |
534 |
-python_prepare_all() { |
535 |
- # remove tests with external dependencies that may not be available, and |
536 |
- # tests that don't work in sandbox |
537 |
- rm tests/unit/{test_{zypp_plugins,module_names},utils/test_{extend,cache}}.py || die |
538 |
- rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die |
539 |
- rm tests/unit/states/test_boto_vpc.py || die |
540 |
- rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die |
541 |
- |
542 |
- # tests that require network access |
543 |
- rm tests/unit/{states,modules}/test_zcbuildout.py || die |
544 |
- |
545 |
- sed -i 's:log.trace(:log.debug(:' \ |
546 |
- salt/fileserver/roots.py salt/grains/core.py salt/states/saltmod.py || die |
547 |
- |
548 |
- # make sure pkg_resources doesn't bomb because pycrypto isn't installed |
549 |
- # make sure pkg_resources doesn't bomb because pycrypto isn't installed |
550 |
- find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die |
551 |
- # pycryptodome rather than pycryptodomex |
552 |
- find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die |
553 |
- |
554 |
- distutils-r1_python_prepare_all |
555 |
-} |
556 |
- |
557 |
-python_prepare() { |
558 |
- einfo "Fixing collections.abc warnings for ${EPYTHON}" |
559 |
- local abc |
560 |
- abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die |
561 |
- find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die |
562 |
-} |
563 |
- |
564 |
-python_install_all() { |
565 |
- local svc |
566 |
- USE_SETUPTOOLS=1 distutils-r1_python_install_all |
567 |
- |
568 |
- for svc in minion master syndic api; do |
569 |
- newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} |
570 |
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
571 |
- systemd_dounit "${FILESDIR}"/salt-${svc}.service |
572 |
- done |
573 |
- |
574 |
- insinto /etc/${PN} |
575 |
- doins -r conf/* |
576 |
-} |
577 |
- |
578 |
-python_test() { |
579 |
- local tempdir |
580 |
- # testsuite likes lots of files |
581 |
- ulimit -n 3072 || die |
582 |
- |
583 |
- # ${T} is too long a path for the tests to work |
584 |
- tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" |
585 |
- mkdir "${T}/$(basename "${tempdir}")" |
586 |
- |
587 |
- ( |
588 |
- cleanup() { rm -f "${tempdir}" || die; } |
589 |
- |
590 |
- trap cleanup EXIT |
591 |
- |
592 |
- addwrite "${tempdir}" |
593 |
- ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die |
594 |
- |
595 |
- USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ |
596 |
- TMPDIR="${tempdir}" \ |
597 |
- ${EPYTHON} tests/runtests.py \ |
598 |
- --unit-tests --no-report --verbose \ |
599 |
- || die "testing failed with ${EPYTHON}" |
600 |
- ) |
601 |
-} |
602 |
- |
603 |
-pkg_postinst() { |
604 |
- if use python_targets_python3_8; then |
605 |
- if use nova; then |
606 |
- ewarn "Salt's nova functionality will not work with python3.8 since" |
607 |
- ewarn "dev-python/python-novaclient does not support it yet" |
608 |
- fi |
609 |
- if use neutron; then |
610 |
- ewarn "Salt's neutron functionality will not work with python3.8 since" |
611 |
- ewarn "dev-python/python-neutronclient does not support it yet" |
612 |
- fi |
613 |
- if use libvirt; then |
614 |
- ewarn "Salt's libvirt functionality will not work with python3.8 since" |
615 |
- ewarn "dev-python/libvirt-python does not support it yet" |
616 |
- fi |
617 |
- fi |
618 |
-} |
619 |
|
620 |
diff --git a/app-admin/salt/salt-3002.8.ebuild b/app-admin/salt/salt-3002.8.ebuild |
621 |
deleted file mode 100644 |
622 |
index 023fe6aa7470..000000000000 |
623 |
--- a/app-admin/salt/salt-3002.8.ebuild |
624 |
+++ /dev/null |
625 |
@@ -1,200 +0,0 @@ |
626 |
-# Copyright 1999-2022 Gentoo Authors |
627 |
-# Distributed under the terms of the GNU General Public License v2 |
628 |
- |
629 |
-EAPI=8 |
630 |
-PYTHON_COMPAT=( python3_{7..9} ) |
631 |
- |
632 |
-inherit systemd distutils-r1 |
633 |
- |
634 |
-DESCRIPTION="Salt is a remote execution and configuration manager" |
635 |
-HOMEPAGE="https://www.saltstack.com/resources/community/ |
636 |
- https://github.com/saltstack" |
637 |
- |
638 |
-if [[ ${PV} == 9999* ]]; then |
639 |
- inherit git-r3 |
640 |
- EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" |
641 |
- EGIT_BRANCH="develop" |
642 |
- SRC_URI="" |
643 |
-else |
644 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
645 |
- KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
646 |
-fi |
647 |
- |
648 |
-LICENSE="Apache-2.0" |
649 |
-SLOT="0" |
650 |
-IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako |
651 |
- mongodb neutron nova openssl portage profile redis selinux test raet |
652 |
- +zeromq vim-syntax" |
653 |
- |
654 |
-RDEPEND=" |
655 |
- sys-apps/pciutils |
656 |
- >=dev-python/distro-1.5[${PYTHON_USEDEP}] |
657 |
- dev-python/jinja[${PYTHON_USEDEP}] |
658 |
- dev-python/libnacl[${PYTHON_USEDEP}] |
659 |
- >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] |
660 |
- >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}] |
661 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
662 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
663 |
- >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
664 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
665 |
- dev-python/toml[${PYTHON_USEDEP}] |
666 |
- dev-python/watchdog[${PYTHON_USEDEP}] |
667 |
- libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
668 |
- mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
669 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
670 |
- libvirt? ( |
671 |
- $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8) |
672 |
- ) |
673 |
- openssl? ( |
674 |
- dev-libs/openssl:0=[-bindist(-)] |
675 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
676 |
- ) |
677 |
- raet? ( |
678 |
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] |
679 |
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] |
680 |
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] |
681 |
- ) |
682 |
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
683 |
- cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] ) |
684 |
- genshi? ( dev-python/genshi[${PYTHON_USEDEP}] ) |
685 |
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
686 |
- portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
687 |
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
688 |
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
689 |
- selinux? ( sec-policy/selinux-salt ) |
690 |
- nova? ( |
691 |
- $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8) |
692 |
- ) |
693 |
- neutron? ( |
694 |
- $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8) |
695 |
- ) |
696 |
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
697 |
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
698 |
- vim-syntax? ( app-vim/salt-vim ) |
699 |
- zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] ) |
700 |
-" |
701 |
-BDEPEND=" |
702 |
- test? ( |
703 |
- ${RDEPEND} |
704 |
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
705 |
- >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] |
706 |
- >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] |
707 |
- dev-python/mako[${PYTHON_USEDEP}] |
708 |
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] |
709 |
- >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
710 |
- dev-python/pip[${PYTHON_USEDEP}] |
711 |
- dev-python/psutil[${PYTHON_USEDEP}] |
712 |
- dev-python/pytest[${PYTHON_USEDEP}] |
713 |
- dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] |
714 |
- >=dev-python/pytest-salt-factories-0.93.0[${PYTHON_USEDEP}] |
715 |
- dev-python/pytest-tempdir[${PYTHON_USEDEP}] |
716 |
- >=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}] |
717 |
- net-dns/bind-tools |
718 |
- !x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] ) |
719 |
- )" |
720 |
- |
721 |
-DOCS=( README.rst AUTHORS ) |
722 |
- |
723 |
-REQUIRED_USE=" |
724 |
- || ( raet zeromq ) |
725 |
- test? ( cheetah genshi ) |
726 |
-" |
727 |
-RESTRICT="!test? ( test ) x86? ( test )" |
728 |
- |
729 |
-PATCHES=( |
730 |
- "${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch" |
731 |
- "${FILESDIR}/salt-3002-dont-realpath-on-tmpdir.patch" |
732 |
- "${FILESDIR}/salt-3002-tests.patch" |
733 |
- "${FILESDIR}/salt-3002.5-tests.patch" |
734 |
- "${FILESDIR}/salt-3002.7-tests.patch" |
735 |
- "${FILESDIR}/salt-3004.1-jinja-3.patch" |
736 |
- "${FILESDIR}/salt-3002.8-tests.patch" |
737 |
- "${FILESDIR}/salt-3002.8-relax-pyzmq-dep.patch" |
738 |
-) |
739 |
- |
740 |
-python_prepare_all() { |
741 |
- # remove tests with external dependencies that may not be available, and |
742 |
- # tests that don't work in sandbox |
743 |
- rm tests/unit/{test_{zypp_plugins,module_names},utils/test_{extend,cache}}.py || die |
744 |
- rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die |
745 |
- rm tests/unit/states/test_boto_vpc.py || die |
746 |
- rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die |
747 |
- rm salt/utils/virtualbox.py || die |
748 |
- |
749 |
- # tests that require network access |
750 |
- rm tests/unit/{states,modules}/test_zcbuildout.py || die |
751 |
- |
752 |
- sed -i 's:log.trace(:log.debug(:' \ |
753 |
- salt/fileserver/roots.py salt/grains/core.py salt/states/saltmod.py || die |
754 |
- |
755 |
- # make sure pkg_resources doesn't bomb because pycrypto isn't installed |
756 |
- # make sure pkg_resources doesn't bomb because pycrypto isn't installed |
757 |
- find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die |
758 |
- # pycryptodome rather than pycryptodomex |
759 |
- find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die |
760 |
- |
761 |
- distutils-r1_python_prepare_all |
762 |
-} |
763 |
- |
764 |
-python_prepare() { |
765 |
- einfo "Fixing collections.abc warnings for ${EPYTHON}" |
766 |
- local abc |
767 |
- abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die |
768 |
- find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die |
769 |
-} |
770 |
- |
771 |
-python_install_all() { |
772 |
- local svc |
773 |
- USE_SETUPTOOLS=1 distutils-r1_python_install_all |
774 |
- |
775 |
- for svc in minion master syndic api; do |
776 |
- newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} |
777 |
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
778 |
- systemd_dounit "${FILESDIR}"/salt-${svc}.service |
779 |
- done |
780 |
- |
781 |
- insinto /etc/${PN} |
782 |
- doins -r conf/* |
783 |
-} |
784 |
- |
785 |
-python_test() { |
786 |
- local tempdir |
787 |
- # testsuite likes lots of files |
788 |
- ulimit -n 3072 || die |
789 |
- |
790 |
- # ${T} is too long a path for the tests to work |
791 |
- tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" |
792 |
- mkdir "${T}/$(basename "${tempdir}")" |
793 |
- |
794 |
- ( |
795 |
- cleanup() { rm -f "${tempdir}" || die; } |
796 |
- |
797 |
- trap cleanup EXIT |
798 |
- |
799 |
- addwrite "${tempdir}" |
800 |
- ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die |
801 |
- |
802 |
- USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ |
803 |
- TMPDIR="${tempdir}" \ |
804 |
- ${EPYTHON} tests/runtests.py \ |
805 |
- --unit-tests --no-report --verbose \ |
806 |
- || die "testing failed with ${EPYTHON}" |
807 |
- ) |
808 |
-} |
809 |
- |
810 |
-pkg_postinst() { |
811 |
- if use python_targets_python3_8; then |
812 |
- if use nova; then |
813 |
- ewarn "Salt's nova functionality will not work with python3.8 since" |
814 |
- ewarn "dev-python/python-novaclient does not support it yet" |
815 |
- fi |
816 |
- if use neutron; then |
817 |
- ewarn "Salt's neutron functionality will not work with python3.8 since" |
818 |
- ewarn "dev-python/python-neutronclient does not support it yet" |
819 |
- fi |
820 |
- if use libvirt; then |
821 |
- ewarn "Salt's libvirt functionality will not work with python3.8 since" |
822 |
- ewarn "dev-python/libvirt-python does not support it yet" |
823 |
- fi |
824 |
- fi |
825 |
-} |
826 |
|
827 |
diff --git a/app-admin/salt/salt-3003-r1.ebuild b/app-admin/salt/salt-3003-r1.ebuild |
828 |
deleted file mode 100644 |
829 |
index a41257f8685b..000000000000 |
830 |
--- a/app-admin/salt/salt-3003-r1.ebuild |
831 |
+++ /dev/null |
832 |
@@ -1,195 +0,0 @@ |
833 |
-# Copyright 1999-2021 Gentoo Authors |
834 |
-# Distributed under the terms of the GNU General Public License v2 |
835 |
- |
836 |
-EAPI=7 |
837 |
-PYTHON_COMPAT=( python3_{7..9} ) |
838 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
839 |
-inherit systemd distutils-r1 |
840 |
- |
841 |
-DESCRIPTION="Salt is a remote execution and configuration manager" |
842 |
-HOMEPAGE="https://www.saltstack.com/resources/community/ |
843 |
- https://github.com/saltstack" |
844 |
- |
845 |
-if [[ ${PV} == 9999* ]]; then |
846 |
- inherit git-r3 |
847 |
- EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" |
848 |
- EGIT_BRANCH="develop" |
849 |
- SRC_URI="" |
850 |
-else |
851 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
852 |
- KEYWORDS="amd64 ~arm ~arm64 x86" |
853 |
-fi |
854 |
- |
855 |
-LICENSE="Apache-2.0" |
856 |
-SLOT="0" |
857 |
-IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako |
858 |
- mongodb neutron nova openssl portage profile redis selinux test raet |
859 |
- +zeromq vim-syntax" |
860 |
- |
861 |
-RDEPEND=" |
862 |
- sys-apps/pciutils |
863 |
- >=dev-python/distro-1.5[${PYTHON_USEDEP}] |
864 |
- dev-python/jinja[${PYTHON_USEDEP}] |
865 |
- dev-python/libnacl[${PYTHON_USEDEP}] |
866 |
- >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] |
867 |
- >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}] |
868 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
869 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
870 |
- >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
871 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
872 |
- >=dev-python/toml-0.10.2[${PYTHON_USEDEP}] |
873 |
- dev-python/watchdog[${PYTHON_USEDEP}] |
874 |
- libcloud? ( >=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}] ) |
875 |
- mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
876 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
877 |
- libvirt? ( |
878 |
- $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8) |
879 |
- ) |
880 |
- openssl? ( |
881 |
- dev-libs/openssl:0=[-bindist(-)] |
882 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
883 |
- ) |
884 |
- raet? ( |
885 |
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] |
886 |
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] |
887 |
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] |
888 |
- ) |
889 |
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
890 |
- cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] ) |
891 |
- genshi? ( dev-python/genshi[${PYTHON_USEDEP}] ) |
892 |
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
893 |
- portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
894 |
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
895 |
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
896 |
- selinux? ( sec-policy/selinux-salt ) |
897 |
- nova? ( |
898 |
- $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8) |
899 |
- ) |
900 |
- neutron? ( |
901 |
- $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8) |
902 |
- ) |
903 |
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
904 |
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
905 |
- vim-syntax? ( app-vim/salt-vim ) |
906 |
- zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] ) |
907 |
-" |
908 |
-BDEPEND=" |
909 |
- test? ( |
910 |
- ${RDEPEND} |
911 |
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
912 |
- >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] |
913 |
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] |
914 |
- >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
915 |
- dev-python/pip[${PYTHON_USEDEP}] |
916 |
- dev-python/psutil[${PYTHON_USEDEP}] |
917 |
- dev-python/pytest[${PYTHON_USEDEP}] |
918 |
- >=dev-python/pytest-salt-factories-0.121.1[${PYTHON_USEDEP}] |
919 |
- dev-python/pytest-tempdir[${PYTHON_USEDEP}] |
920 |
- dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] |
921 |
- dev-python/pytest-subtests[${PYTHON_USEDEP}] |
922 |
- dev-python/flaky[${PYTHON_USEDEP}] |
923 |
- dev-python/libcloud[${PYTHON_USEDEP}] |
924 |
- >=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}] |
925 |
- !x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] ) |
926 |
- )" |
927 |
- |
928 |
-DOCS=( README.rst AUTHORS ) |
929 |
- |
930 |
-REQUIRED_USE="|| ( raet zeromq ) |
931 |
- test? ( cheetah genshi )" |
932 |
-RESTRICT="!test? ( test ) x86? ( test )" |
933 |
- |
934 |
-PATCHES=( |
935 |
- "${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch" |
936 |
- "${FILESDIR}/salt-3003-gentoolkit-revdep.patch" |
937 |
- "${FILESDIR}/salt-3002-tests.patch" |
938 |
- "${FILESDIR}/salt-3003-tests.patch" |
939 |
-) |
940 |
- |
941 |
-python_prepare_all() { |
942 |
- # remove tests with external dependencies that may not be available, and |
943 |
- # tests that don't work in sandbox |
944 |
- rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die |
945 |
- rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die |
946 |
- rm tests/unit/states/test_boto_vpc.py || die |
947 |
- rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die |
948 |
- rm tests/pytests/functional/transport/server/test_req_channel.py || die |
949 |
- |
950 |
- # tests that require network access |
951 |
- rm tests/unit/{states,modules}/test_zcbuildout.py || die |
952 |
- rm -r tests/integration/cloud || die |
953 |
- rm -r tests/kitchen/tests/wordpress/tests || die |
954 |
- rm tests/kitchen/test_kitchen.py || die |
955 |
- rm tests/unit/modules/test_network.py || die |
956 |
- |
957 |
- # tests require root access |
958 |
- rm tests/integration/pillar/test_git_pillar.py || die |
959 |
- rm tests/integration/states/test_supervisord.py || die |
960 |
- rm tests/pytests/unit/client/test_ssh.py || die |
961 |
- |
962 |
- # make sure pkg_resources doesn't bomb because pycrypto isn't installed |
963 |
- find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die |
964 |
- # pycryptodome rather than pycryptodomex |
965 |
- find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die |
966 |
- |
967 |
- distutils-r1_python_prepare_all |
968 |
-} |
969 |
- |
970 |
-python_prepare() { |
971 |
- einfo "Fixing collections.abc warnings for ${EPYTHON}" |
972 |
- local abc |
973 |
- abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die |
974 |
- find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die |
975 |
-} |
976 |
- |
977 |
-python_install_all() { |
978 |
- local svc |
979 |
- USE_SETUPTOOLS=1 distutils-r1_python_install_all |
980 |
- |
981 |
- for svc in minion master syndic api; do |
982 |
- newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} |
983 |
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
984 |
- systemd_dounit "${FILESDIR}"/salt-${svc}.service |
985 |
- done |
986 |
- |
987 |
- insinto /etc/${PN} |
988 |
- doins -r conf/* |
989 |
-} |
990 |
- |
991 |
-python_test() { |
992 |
- # testsuite likes lots of files |
993 |
- ulimit -n 4096 || die |
994 |
- |
995 |
- # ${T} is too long a path for the tests to work |
996 |
- local TMPDIR |
997 |
- TMPDIR="$(mktemp --directory --tmpdir=/tmp ${P}-tests-XXXXX)" |
998 |
- ( |
999 |
- export TMPDIR |
1000 |
- cleanup() { rm -rf "${TMPDIR}" || die; } |
1001 |
- |
1002 |
- trap cleanup EXIT |
1003 |
- |
1004 |
- addwrite "${TMPDIR}" |
1005 |
- |
1006 |
- USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ |
1007 |
- "${EPYTHON}" -m pytest -vv \ |
1008 |
- || die "testing failed with ${EPYTHON}" |
1009 |
- ) |
1010 |
-} |
1011 |
- |
1012 |
-pkg_postinst() { |
1013 |
- if use python_targets_python3_8; then |
1014 |
- if use nova; then |
1015 |
- ewarn "Salt's nova functionality will not work with python3.8 since" |
1016 |
- ewarn "dev-python/python-novaclient does not support it yet" |
1017 |
- fi |
1018 |
- if use neutron; then |
1019 |
- ewarn "Salt's neutron functionality will not work with python3.8 since" |
1020 |
- ewarn "dev-python/python-neutronclient does not support it yet" |
1021 |
- fi |
1022 |
- if use libvirt; then |
1023 |
- ewarn "Salt's libvirt functionality will not work with python3.8 since" |
1024 |
- ewarn "dev-python/libvirt-python does not support it yet" |
1025 |
- fi |
1026 |
- fi |
1027 |
-} |
1028 |
|
1029 |
diff --git a/app-admin/salt/salt-3003.3-r1.ebuild b/app-admin/salt/salt-3003.3-r1.ebuild |
1030 |
deleted file mode 100644 |
1031 |
index fbccb4248798..000000000000 |
1032 |
--- a/app-admin/salt/salt-3003.3-r1.ebuild |
1033 |
+++ /dev/null |
1034 |
@@ -1,203 +0,0 @@ |
1035 |
-# Copyright 1999-2022 Gentoo Authors |
1036 |
-# Distributed under the terms of the GNU General Public License v2 |
1037 |
- |
1038 |
-EAPI=7 |
1039 |
-PYTHON_COMPAT=( python3_{7..9} ) |
1040 |
- |
1041 |
-inherit systemd distutils-r1 |
1042 |
- |
1043 |
-DESCRIPTION="Salt is a remote execution and configuration manager" |
1044 |
-HOMEPAGE="https://www.saltstack.com/resources/community/ |
1045 |
- https://github.com/saltstack" |
1046 |
- |
1047 |
-if [[ ${PV} == 9999* ]]; then |
1048 |
- inherit git-r3 |
1049 |
- EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" |
1050 |
- EGIT_BRANCH="develop" |
1051 |
- SRC_URI="" |
1052 |
-else |
1053 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
1054 |
- KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
1055 |
-fi |
1056 |
- |
1057 |
-LICENSE="Apache-2.0" |
1058 |
-SLOT="0" |
1059 |
-IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako |
1060 |
- mongodb neutron nova openssl portage profile redis selinux test raet |
1061 |
- +zeromq vim-syntax" |
1062 |
- |
1063 |
-RDEPEND=" |
1064 |
- sys-apps/pciutils |
1065 |
- >=dev-python/distro-1.5[${PYTHON_USEDEP}] |
1066 |
- dev-python/jinja[${PYTHON_USEDEP}] |
1067 |
- dev-python/libnacl[${PYTHON_USEDEP}] |
1068 |
- >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] |
1069 |
- >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}] |
1070 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
1071 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
1072 |
- >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
1073 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
1074 |
- >=dev-python/toml-0.10.2[${PYTHON_USEDEP}] |
1075 |
- dev-python/watchdog[${PYTHON_USEDEP}] |
1076 |
- libcloud? ( >=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}] ) |
1077 |
- mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
1078 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
1079 |
- libvirt? ( |
1080 |
- $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8) |
1081 |
- ) |
1082 |
- openssl? ( |
1083 |
- dev-libs/openssl:0=[-bindist(-)] |
1084 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
1085 |
- ) |
1086 |
- raet? ( |
1087 |
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] |
1088 |
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] |
1089 |
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] |
1090 |
- ) |
1091 |
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
1092 |
- cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] ) |
1093 |
- genshi? ( dev-python/genshi[${PYTHON_USEDEP}] ) |
1094 |
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
1095 |
- portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
1096 |
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
1097 |
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
1098 |
- selinux? ( sec-policy/selinux-salt ) |
1099 |
- nova? ( |
1100 |
- $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8) |
1101 |
- ) |
1102 |
- neutron? ( |
1103 |
- $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8) |
1104 |
- ) |
1105 |
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
1106 |
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
1107 |
- vim-syntax? ( app-vim/salt-vim ) |
1108 |
- zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] ) |
1109 |
-" |
1110 |
-BDEPEND=" |
1111 |
- test? ( |
1112 |
- ${RDEPEND} |
1113 |
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
1114 |
- >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] |
1115 |
- dev-python/mako[${PYTHON_USEDEP}] |
1116 |
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] |
1117 |
- >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
1118 |
- dev-python/pip[${PYTHON_USEDEP}] |
1119 |
- dev-python/psutil[${PYTHON_USEDEP}] |
1120 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
1121 |
- dev-python/pytest[${PYTHON_USEDEP}] |
1122 |
- >=dev-python/pytest-salt-factories-0.121.1[${PYTHON_USEDEP}] |
1123 |
- dev-python/pytest-tempdir[${PYTHON_USEDEP}] |
1124 |
- dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] |
1125 |
- dev-python/pytest-subtests[${PYTHON_USEDEP}] |
1126 |
- dev-python/flaky[${PYTHON_USEDEP}] |
1127 |
- dev-python/libcloud[${PYTHON_USEDEP}] |
1128 |
- net-dns/bind-tools |
1129 |
- >=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}] |
1130 |
- !x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] ) |
1131 |
- )" |
1132 |
- |
1133 |
-DOCS=( README.rst AUTHORS ) |
1134 |
- |
1135 |
-REQUIRED_USE="|| ( raet zeromq ) |
1136 |
- test? ( cheetah genshi )" |
1137 |
-RESTRICT="!test? ( test ) x86? ( test )" |
1138 |
- |
1139 |
-PATCHES=( |
1140 |
- "${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch" |
1141 |
- "${FILESDIR}/salt-3003-gentoolkit-revdep.patch" |
1142 |
- "${FILESDIR}/salt-3002-tests.patch" |
1143 |
- "${FILESDIR}/salt-3003.3-tests.patch" |
1144 |
- "${FILESDIR}/salt-3003.1-tests.patch" |
1145 |
- "${FILESDIR}/salt-3003.3-jinja.patch" |
1146 |
-) |
1147 |
- |
1148 |
-python_prepare_all() { |
1149 |
- # remove tests with external dependencies that may not be available, and |
1150 |
- # tests that don't work in sandbox |
1151 |
- rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die |
1152 |
- rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die |
1153 |
- rm tests/unit/states/test_boto_vpc.py || die |
1154 |
- rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die |
1155 |
- rm tests/pytests/functional/transport/server/test_req_channel.py || die |
1156 |
- |
1157 |
- # tests that require network access |
1158 |
- rm tests/unit/{states,modules}/test_zcbuildout.py || die |
1159 |
- rm -r tests/integration/cloud || die |
1160 |
- rm -r tests/kitchen/tests/wordpress/tests || die |
1161 |
- rm tests/kitchen/test_kitchen.py || die |
1162 |
- rm tests/unit/modules/test_network.py || die |
1163 |
- |
1164 |
- # tests require root access |
1165 |
- rm tests/integration/pillar/test_git_pillar.py || die |
1166 |
- rm tests/integration/states/test_supervisord.py || die |
1167 |
- rm tests/pytests/unit/client/test_ssh.py || die |
1168 |
- |
1169 |
- # make sure pkg_resources doesn't bomb because pycrypto isn't installed |
1170 |
- find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die |
1171 |
- # pycryptodome rather than pycryptodomex |
1172 |
- find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die |
1173 |
- |
1174 |
- distutils-r1_python_prepare_all |
1175 |
-} |
1176 |
- |
1177 |
-python_prepare() { |
1178 |
- einfo "Fixing collections.abc warnings for ${EPYTHON}" |
1179 |
- local abc |
1180 |
- abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die |
1181 |
- find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die |
1182 |
- |
1183 |
- # removes contextvars, see bug: https://bugs.gentoo.org/799431 |
1184 |
- sed -i '/^contextvars/d' requirements/base.txt || die |
1185 |
-} |
1186 |
- |
1187 |
-python_install_all() { |
1188 |
- local svc |
1189 |
- USE_SETUPTOOLS=1 distutils-r1_python_install_all |
1190 |
- |
1191 |
- for svc in minion master syndic api; do |
1192 |
- newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} |
1193 |
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
1194 |
- systemd_dounit "${FILESDIR}"/salt-${svc}.service |
1195 |
- done |
1196 |
- |
1197 |
- insinto /etc/${PN} |
1198 |
- doins -r conf/* |
1199 |
-} |
1200 |
- |
1201 |
-python_test() { |
1202 |
- # testsuite likes lots of files |
1203 |
- ulimit -n 4096 || die |
1204 |
- |
1205 |
- # ${T} is too long a path for the tests to work |
1206 |
- local TMPDIR |
1207 |
- TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" |
1208 |
- ( |
1209 |
- export TMPDIR |
1210 |
- cleanup() { rm -rf "${TMPDIR}" || die; } |
1211 |
- |
1212 |
- trap cleanup EXIT |
1213 |
- |
1214 |
- addwrite "${TMPDIR}" |
1215 |
- |
1216 |
- USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ |
1217 |
- "${EPYTHON}" -m pytest -vv \ |
1218 |
- || die "testing failed with ${EPYTHON}" |
1219 |
- ) |
1220 |
-} |
1221 |
- |
1222 |
-pkg_postinst() { |
1223 |
- if use python_targets_python3_8; then |
1224 |
- if use nova; then |
1225 |
- ewarn "Salt's nova functionality will not work with python3.8 since" |
1226 |
- ewarn "dev-python/python-novaclient does not support it yet" |
1227 |
- fi |
1228 |
- if use neutron; then |
1229 |
- ewarn "Salt's neutron functionality will not work with python3.8 since" |
1230 |
- ewarn "dev-python/python-neutronclient does not support it yet" |
1231 |
- fi |
1232 |
- if use libvirt; then |
1233 |
- ewarn "Salt's libvirt functionality will not work with python3.8 since" |
1234 |
- ewarn "dev-python/libvirt-python does not support it yet" |
1235 |
- fi |
1236 |
- fi |
1237 |
-} |
1238 |
|
1239 |
diff --git a/app-admin/salt/salt-3003.3.ebuild b/app-admin/salt/salt-3003.3.ebuild |
1240 |
deleted file mode 100644 |
1241 |
index ee153576a050..000000000000 |
1242 |
--- a/app-admin/salt/salt-3003.3.ebuild |
1243 |
+++ /dev/null |
1244 |
@@ -1,202 +0,0 @@ |
1245 |
-# Copyright 1999-2021 Gentoo Authors |
1246 |
-# Distributed under the terms of the GNU General Public License v2 |
1247 |
- |
1248 |
-EAPI=7 |
1249 |
-PYTHON_COMPAT=( python3_{7..9} ) |
1250 |
- |
1251 |
-inherit systemd distutils-r1 |
1252 |
- |
1253 |
-DESCRIPTION="Salt is a remote execution and configuration manager" |
1254 |
-HOMEPAGE="https://www.saltstack.com/resources/community/ |
1255 |
- https://github.com/saltstack" |
1256 |
- |
1257 |
-if [[ ${PV} == 9999* ]]; then |
1258 |
- inherit git-r3 |
1259 |
- EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" |
1260 |
- EGIT_BRANCH="develop" |
1261 |
- SRC_URI="" |
1262 |
-else |
1263 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
1264 |
- KEYWORDS="amd64 ~arm ~arm64 x86" |
1265 |
-fi |
1266 |
- |
1267 |
-LICENSE="Apache-2.0" |
1268 |
-SLOT="0" |
1269 |
-IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako |
1270 |
- mongodb neutron nova openssl portage profile redis selinux test raet |
1271 |
- +zeromq vim-syntax" |
1272 |
- |
1273 |
-RDEPEND=" |
1274 |
- sys-apps/pciutils |
1275 |
- >=dev-python/distro-1.5[${PYTHON_USEDEP}] |
1276 |
- dev-python/jinja[${PYTHON_USEDEP}] |
1277 |
- dev-python/libnacl[${PYTHON_USEDEP}] |
1278 |
- >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] |
1279 |
- >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}] |
1280 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
1281 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
1282 |
- >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
1283 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
1284 |
- >=dev-python/toml-0.10.2[${PYTHON_USEDEP}] |
1285 |
- dev-python/watchdog[${PYTHON_USEDEP}] |
1286 |
- libcloud? ( >=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}] ) |
1287 |
- mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
1288 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
1289 |
- libvirt? ( |
1290 |
- $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8) |
1291 |
- ) |
1292 |
- openssl? ( |
1293 |
- dev-libs/openssl:0=[-bindist(-)] |
1294 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
1295 |
- ) |
1296 |
- raet? ( |
1297 |
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] |
1298 |
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] |
1299 |
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] |
1300 |
- ) |
1301 |
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
1302 |
- cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] ) |
1303 |
- genshi? ( dev-python/genshi[${PYTHON_USEDEP}] ) |
1304 |
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
1305 |
- portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
1306 |
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
1307 |
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
1308 |
- selinux? ( sec-policy/selinux-salt ) |
1309 |
- nova? ( |
1310 |
- $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8) |
1311 |
- ) |
1312 |
- neutron? ( |
1313 |
- $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8) |
1314 |
- ) |
1315 |
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
1316 |
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
1317 |
- vim-syntax? ( app-vim/salt-vim ) |
1318 |
- zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] ) |
1319 |
-" |
1320 |
-BDEPEND=" |
1321 |
- test? ( |
1322 |
- ${RDEPEND} |
1323 |
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
1324 |
- >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] |
1325 |
- dev-python/mako[${PYTHON_USEDEP}] |
1326 |
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] |
1327 |
- >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
1328 |
- dev-python/pip[${PYTHON_USEDEP}] |
1329 |
- dev-python/psutil[${PYTHON_USEDEP}] |
1330 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
1331 |
- dev-python/pytest[${PYTHON_USEDEP}] |
1332 |
- >=dev-python/pytest-salt-factories-0.121.1[${PYTHON_USEDEP}] |
1333 |
- dev-python/pytest-tempdir[${PYTHON_USEDEP}] |
1334 |
- dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] |
1335 |
- dev-python/pytest-subtests[${PYTHON_USEDEP}] |
1336 |
- dev-python/flaky[${PYTHON_USEDEP}] |
1337 |
- dev-python/libcloud[${PYTHON_USEDEP}] |
1338 |
- net-dns/bind-tools |
1339 |
- >=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}] |
1340 |
- !x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] ) |
1341 |
- )" |
1342 |
- |
1343 |
-DOCS=( README.rst AUTHORS ) |
1344 |
- |
1345 |
-REQUIRED_USE="|| ( raet zeromq ) |
1346 |
- test? ( cheetah genshi )" |
1347 |
-RESTRICT="!test? ( test ) x86? ( test )" |
1348 |
- |
1349 |
-PATCHES=( |
1350 |
- "${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch" |
1351 |
- "${FILESDIR}/salt-3003-gentoolkit-revdep.patch" |
1352 |
- "${FILESDIR}/salt-3002-tests.patch" |
1353 |
- "${FILESDIR}/salt-3003.3-tests.patch" |
1354 |
- "${FILESDIR}/salt-3003.1-tests.patch" |
1355 |
-) |
1356 |
- |
1357 |
-python_prepare_all() { |
1358 |
- # remove tests with external dependencies that may not be available, and |
1359 |
- # tests that don't work in sandbox |
1360 |
- rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die |
1361 |
- rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die |
1362 |
- rm tests/unit/states/test_boto_vpc.py || die |
1363 |
- rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die |
1364 |
- rm tests/pytests/functional/transport/server/test_req_channel.py || die |
1365 |
- |
1366 |
- # tests that require network access |
1367 |
- rm tests/unit/{states,modules}/test_zcbuildout.py || die |
1368 |
- rm -r tests/integration/cloud || die |
1369 |
- rm -r tests/kitchen/tests/wordpress/tests || die |
1370 |
- rm tests/kitchen/test_kitchen.py || die |
1371 |
- rm tests/unit/modules/test_network.py || die |
1372 |
- |
1373 |
- # tests require root access |
1374 |
- rm tests/integration/pillar/test_git_pillar.py || die |
1375 |
- rm tests/integration/states/test_supervisord.py || die |
1376 |
- rm tests/pytests/unit/client/test_ssh.py || die |
1377 |
- |
1378 |
- # make sure pkg_resources doesn't bomb because pycrypto isn't installed |
1379 |
- find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die |
1380 |
- # pycryptodome rather than pycryptodomex |
1381 |
- find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die |
1382 |
- |
1383 |
- distutils-r1_python_prepare_all |
1384 |
-} |
1385 |
- |
1386 |
-python_prepare() { |
1387 |
- einfo "Fixing collections.abc warnings for ${EPYTHON}" |
1388 |
- local abc |
1389 |
- abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die |
1390 |
- find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die |
1391 |
- |
1392 |
- # removes contextvars, see bug: https://bugs.gentoo.org/799431 |
1393 |
- sed -i '/^contextvars/d' requirements/base.txt || die |
1394 |
-} |
1395 |
- |
1396 |
-python_install_all() { |
1397 |
- local svc |
1398 |
- USE_SETUPTOOLS=1 distutils-r1_python_install_all |
1399 |
- |
1400 |
- for svc in minion master syndic api; do |
1401 |
- newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc} |
1402 |
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
1403 |
- systemd_dounit "${FILESDIR}"/salt-${svc}.service |
1404 |
- done |
1405 |
- |
1406 |
- insinto /etc/${PN} |
1407 |
- doins -r conf/* |
1408 |
-} |
1409 |
- |
1410 |
-python_test() { |
1411 |
- # testsuite likes lots of files |
1412 |
- ulimit -n 4096 || die |
1413 |
- |
1414 |
- # ${T} is too long a path for the tests to work |
1415 |
- local TMPDIR |
1416 |
- TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" |
1417 |
- ( |
1418 |
- export TMPDIR |
1419 |
- cleanup() { rm -rf "${TMPDIR}" || die; } |
1420 |
- |
1421 |
- trap cleanup EXIT |
1422 |
- |
1423 |
- addwrite "${TMPDIR}" |
1424 |
- |
1425 |
- USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \ |
1426 |
- "${EPYTHON}" -m pytest -vv \ |
1427 |
- || die "testing failed with ${EPYTHON}" |
1428 |
- ) |
1429 |
-} |
1430 |
- |
1431 |
-pkg_postinst() { |
1432 |
- if use python_targets_python3_8; then |
1433 |
- if use nova; then |
1434 |
- ewarn "Salt's nova functionality will not work with python3.8 since" |
1435 |
- ewarn "dev-python/python-novaclient does not support it yet" |
1436 |
- fi |
1437 |
- if use neutron; then |
1438 |
- ewarn "Salt's neutron functionality will not work with python3.8 since" |
1439 |
- ewarn "dev-python/python-neutronclient does not support it yet" |
1440 |
- fi |
1441 |
- if use libvirt; then |
1442 |
- ewarn "Salt's libvirt functionality will not work with python3.8 since" |
1443 |
- ewarn "dev-python/libvirt-python does not support it yet" |
1444 |
- fi |
1445 |
- fi |
1446 |
-} |