1 |
commit: c5c4a2921e9670188d06558d48194c2d443680e7 |
2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
3 |
AuthorDate: Tue Dec 22 19:14:17 2020 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 22 19:14:17 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5c4a292 |
7 |
|
8 |
app-admin/salt: Get rid of pycryptodomex dep |
9 |
|
10 |
Copyright: Sony Interactive Entertainment Inc. |
11 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
12 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
13 |
|
14 |
app-admin/salt/Manifest | 1 - |
15 |
.../{salt-3001.4.ebuild => salt-3001.4-r1.ebuild} | 5 +- |
16 |
.../{salt-3002.1.ebuild => salt-3002.2-r1.ebuild} | 5 +- |
17 |
app-admin/salt/salt-3002.2.ebuild | 183 --------------------- |
18 |
4 files changed, 7 insertions(+), 187 deletions(-) |
19 |
|
20 |
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest |
21 |
index bfb640ee93e..8b84c3d584e 100644 |
22 |
--- a/app-admin/salt/Manifest |
23 |
+++ b/app-admin/salt/Manifest |
24 |
@@ -4,5 +4,4 @@ DIST salt-3000.2-py38-misc.patch.gz 6250 BLAKE2B 68fff80a042e6bf208ea2d9692da7a7 |
25 |
DIST salt-3000.5.tar.gz 15229450 BLAKE2B 135e9b9dcc461ac898231ce46e6a1359e6d60a43822320950bc0b83057f768dadf55320dd73df72d5bc917f324eef4661e6f75d8eb8e84aef958bd2df8924cfc SHA512 2579f65c24d22d77132057bd8cf37040d7d149624745dd68b4c44318be786580dcc34bf563f90d7de9ef5b726b2453bef4d8639bc8fbd9c5e691500520335317 |
26 |
DIST salt-3000.6.tar.gz 15236781 BLAKE2B 5a532a6915b331fb532dc6e1651cf8fca3e1a5e9f29f6d75260fdb1162dbfeec755c65f7c6fc28b1cc7dc3ace978547830af31aafc1eee8419bbc7e695725787 SHA512 739e3671766c45a0ef1eb45933c7f00f14586e91f4c4a79cbed913a48961a48baee853206ba569491756e8a872d22f3635eb6bc1a366020e551c567b2334c508 |
27 |
DIST salt-3001.4.tar.gz 15716372 BLAKE2B cc33b29b0da9cfaae22726b2b471245880aafa106187b531872a9ae5ee773a94e0d550a68b11b74826bc0b35197a311f690535f2280931ccb5050275ad967c2d SHA512 b7f343c65917280a96d8a3eaa6b508121b11b9f9b0bfffa5b4c79af0023bdecf4581f76014847d97f48d9677edb6f632adec3850153c3048c3114128a250b84b |
28 |
-DIST salt-3002.1.tar.gz 15753988 BLAKE2B d084dc650b8bc92b4ebdb145a41a39bfbd034064fad65e364260eca84d7105fb645ad8f6cea2cc1b6affb1abf21a9858ab6fb526eaf4ecd8f76c70d1384c7edc SHA512 8fc02d0b47dad60f96eb4442b0e8a31f04d796f12b845c8142135593af4c7ea9c2d9335a3f520f8858951f87b0e8cc6be70d383fde2d93a6d529e077bcc87114 |
29 |
DIST salt-3002.2.tar.gz 15765855 BLAKE2B b26895ababc8551e01baa806c5a0e41dab9a379e47d2289b5c3c529ef762c69631d7ed8b32339ec66c3929c5883782131eb56d1bfbcc743829c4f0199a900ca1 SHA512 0f617a07475347b1bb0d1c6059de541e102103182820dfd6f64f4c281d660e68358eb1ab7171a637e16cef9fea2517c8356df9c449f9bbc92538aa86c316f652 |
30 |
|
31 |
diff --git a/app-admin/salt/salt-3001.4.ebuild b/app-admin/salt/salt-3001.4-r1.ebuild |
32 |
similarity index 96% |
33 |
rename from app-admin/salt/salt-3001.4.ebuild |
34 |
rename to app-admin/salt/salt-3001.4-r1.ebuild |
35 |
index 1e5f20dbb50..eac0f2d28fd 100644 |
36 |
--- a/app-admin/salt/salt-3001.4.ebuild |
37 |
+++ b/app-admin/salt/salt-3001.4-r1.ebuild |
38 |
@@ -33,7 +33,6 @@ RDEPEND=" |
39 |
dev-python/libnacl[${PYTHON_USEDEP}] |
40 |
>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] |
41 |
>=dev-python/pycryptodome-3.9.7[${PYTHON_USEDEP}] |
42 |
- dev-python/pycryptodomex[${PYTHON_USEDEP}] |
43 |
dev-python/pyyaml[${PYTHON_USEDEP}] |
44 |
dev-python/markupsafe[${PYTHON_USEDEP}] |
45 |
>=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
46 |
@@ -115,7 +114,9 @@ python_prepare_all() { |
47 |
rm tests/unit/{states,modules}/test_zcbuildout.py || die |
48 |
|
49 |
# make sure pkg_resources doesn't bomb because pycrypto isn't installed |
50 |
- find . -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d' -i || die |
51 |
+ find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die |
52 |
+ # pycryptodome rather than pycryptodomex |
53 |
+ find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die |
54 |
|
55 |
distutils-r1_python_prepare_all |
56 |
} |
57 |
|
58 |
diff --git a/app-admin/salt/salt-3002.1.ebuild b/app-admin/salt/salt-3002.2-r1.ebuild |
59 |
similarity index 95% |
60 |
rename from app-admin/salt/salt-3002.1.ebuild |
61 |
rename to app-admin/salt/salt-3002.2-r1.ebuild |
62 |
index 59838e3e579..1da22d7dc94 100644 |
63 |
--- a/app-admin/salt/salt-3002.1.ebuild |
64 |
+++ b/app-admin/salt/salt-3002.2-r1.ebuild |
65 |
@@ -114,7 +114,10 @@ python_prepare_all() { |
66 |
rm tests/unit/{states,modules}/test_zcbuildout.py || die |
67 |
|
68 |
# make sure pkg_resources doesn't bomb because pycrypto isn't installed |
69 |
- find . -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d' -i || die |
70 |
+ # make sure pkg_resources doesn't bomb because pycrypto isn't installed |
71 |
+ find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die |
72 |
+ # pycryptodome rather than pycryptodomex |
73 |
+ find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die |
74 |
|
75 |
distutils-r1_python_prepare_all |
76 |
} |
77 |
|
78 |
diff --git a/app-admin/salt/salt-3002.2.ebuild b/app-admin/salt/salt-3002.2.ebuild |
79 |
deleted file mode 100644 |
80 |
index 59838e3e579..00000000000 |
81 |
--- a/app-admin/salt/salt-3002.2.ebuild |
82 |
+++ /dev/null |
83 |
@@ -1,183 +0,0 @@ |
84 |
-# Copyright 1999-2020 Gentoo Authors |
85 |
-# Distributed under the terms of the GNU General Public License v2 |
86 |
- |
87 |
-EAPI=7 |
88 |
-PYTHON_COMPAT=( python3_{7..8} ) |
89 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
90 |
-inherit systemd distutils-r1 |
91 |
- |
92 |
-DESCRIPTION="Salt is a remote execution and configuration manager" |
93 |
-HOMEPAGE="https://www.saltstack.com/resources/community/ |
94 |
- https://github.com/saltstack" |
95 |
- |
96 |
-if [[ ${PV} == 9999* ]]; then |
97 |
- inherit git-r3 |
98 |
- EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" |
99 |
- EGIT_BRANCH="develop" |
100 |
- SRC_URI="" |
101 |
-else |
102 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
103 |
- KEYWORDS="~amd64 ~x86" |
104 |
-fi |
105 |
- |
106 |
-LICENSE="Apache-2.0" |
107 |
-SLOT="0" |
108 |
-IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako |
109 |
- mongodb neutron nova openssl portage profile redis selinux test raet |
110 |
- +zeromq vim-syntax" |
111 |
- |
112 |
-RDEPEND=" |
113 |
- sys-apps/pciutils |
114 |
- >=dev-python/distro-1.5[${PYTHON_USEDEP}] |
115 |
- dev-python/jinja[${PYTHON_USEDEP}] |
116 |
- dev-python/libnacl[${PYTHON_USEDEP}] |
117 |
- >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] |
118 |
- >=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}] |
119 |
- dev-python/pycryptodomex[${PYTHON_USEDEP}] |
120 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
121 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
122 |
- >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
123 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
124 |
- dev-python/toml[${PYTHON_USEDEP}] |
125 |
- dev-python/watchdog[${PYTHON_USEDEP}] |
126 |
- libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
127 |
- mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
128 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
129 |
- libvirt? ( |
130 |
- $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_7) |
131 |
- ) |
132 |
- openssl? ( |
133 |
- dev-libs/openssl:0=[-bindist] |
134 |
- dev-python/pyopenssl[${PYTHON_USEDEP}] |
135 |
- ) |
136 |
- raet? ( |
137 |
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] |
138 |
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] |
139 |
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] |
140 |
- ) |
141 |
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
142 |
- cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] ) |
143 |
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
144 |
- portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
145 |
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
146 |
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
147 |
- selinux? ( sec-policy/selinux-salt ) |
148 |
- nova? ( |
149 |
- $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_7) |
150 |
- ) |
151 |
- neutron? ( |
152 |
- $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_7) |
153 |
- ) |
154 |
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
155 |
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
156 |
- vim-syntax? ( app-vim/salt-vim ) |
157 |
- zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] ) |
158 |
-" |
159 |
-BDEPEND=" |
160 |
- test? ( |
161 |
- ${RDEPEND} |
162 |
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
163 |
- >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}] |
164 |
- >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] |
165 |
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] |
166 |
- >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
167 |
- dev-python/pip[${PYTHON_USEDEP}] |
168 |
- dev-python/psutil[${PYTHON_USEDEP}] |
169 |
- dev-python/pytest[${PYTHON_USEDEP}] |
170 |
- dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] |
171 |
- >=dev-python/pytest-salt-factories-0.93.0[${PYTHON_USEDEP}] |
172 |
- dev-python/pytest-tempdir[${PYTHON_USEDEP}] |
173 |
- >=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}] |
174 |
- !x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] ) |
175 |
- )" |
176 |
- |
177 |
-DOCS=( README.rst AUTHORS ) |
178 |
- |
179 |
-REQUIRED_USE="|| ( raet zeromq ) |
180 |
- test? ( cheetah genshi )" |
181 |
-RESTRICT="!test? ( test ) x86? ( test )" |
182 |
- |
183 |
-PATCHES=( |
184 |
- "${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch" |
185 |
- "${FILESDIR}/salt-3002-dont-realpath-on-tmpdir.patch" |
186 |
- "${FILESDIR}/salt-3002-tests.patch" |
187 |
-) |
188 |
- |
189 |
-python_prepare_all() { |
190 |
- # remove tests with external dependencies that may not be available |
191 |
- rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die |
192 |
- rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die |
193 |
- rm tests/unit/states/test_boto_vpc.py || die |
194 |
- rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die |
195 |
- |
196 |
- # tests that require network access |
197 |
- rm tests/unit/{states,modules}/test_zcbuildout.py || die |
198 |
- |
199 |
- # make sure pkg_resources doesn't bomb because pycrypto isn't installed |
200 |
- find . -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d' -i || die |
201 |
- |
202 |
- distutils-r1_python_prepare_all |
203 |
-} |
204 |
- |
205 |
-python_prepare() { |
206 |
- einfo "Fixing collections.abc warnings for ${EPYTHON}" |
207 |
- local abc |
208 |
- abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die |
209 |
- find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die |
210 |
-} |
211 |
- |
212 |
-python_install_all() { |
213 |
- local svc |
214 |
- USE_SETUPTOOLS=1 distutils-r1_python_install_all |
215 |
- |
216 |
- for svc in minion master syndic api; do |
217 |
- newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} |
218 |
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
219 |
- systemd_dounit "${FILESDIR}"/salt-${svc}.service |
220 |
- done |
221 |
- |
222 |
- insinto /etc/${PN} |
223 |
- doins -r conf/* |
224 |
-} |
225 |
- |
226 |
-python_test() { |
227 |
- local tempdir |
228 |
- # testsuite likes lots of files |
229 |
- ulimit -n 3072 || die |
230 |
- |
231 |
- # ${T} is too long a path for the tests to work |
232 |
- tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" |
233 |
- mkdir "${T}/$(basename "${tempdir}")" |
234 |
- |
235 |
- ( |
236 |
- cleanup() { rm -f "${tempdir}" || die; } |
237 |
- |
238 |
- trap cleanup EXIT |
239 |
- |
240 |
- addwrite "${tempdir}" |
241 |
- ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die |
242 |
- |
243 |
- USE_SETUPTOOLS=1 SHELL="/bin/bash" \ |
244 |
- TMPDIR="${tempdir}" \ |
245 |
- ${EPYTHON} tests/runtests.py \ |
246 |
- --unit-tests --no-report --verbose \ |
247 |
- || die "testing failed with ${EPYTHON}" |
248 |
- ) |
249 |
-} |
250 |
- |
251 |
-pkg_postinst() { |
252 |
- if use python_targets_python3_8; then |
253 |
- if use nova; then |
254 |
- ewarn "Salt's nova functionality will not work with python3.8 since" |
255 |
- ewarn "dev-python/python-novaclient does not support it yet" |
256 |
- fi |
257 |
- if use neutron; then |
258 |
- ewarn "Salt's neutron functionality will not work with python3.8 since" |
259 |
- ewarn "dev-python/python-neutronclient does not support it yet" |
260 |
- fi |
261 |
- if use libvirt; then |
262 |
- ewarn "Salt's libvirt functionality will not work with python3.8 since" |
263 |
- ewarn "dev-python/libvirt-python does not support it yet" |
264 |
- fi |
265 |
- fi |
266 |
-} |