1 |
commit: b7c640db893832bb0f6cd568a0c415095be5258e |
2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jul 3 20:38:46 2018 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 3 21:18:16 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7c640db |
7 |
|
8 |
app-admin/salt: Version bump to 2017.7.7 |
9 |
|
10 |
Move to dev-python/pycryptodome as well |
11 |
|
12 |
Bug: https://bugs.gentoo.org/611576 |
13 |
Package-Manager: Portage-2.3.41, Repoman-2.3.9 |
14 |
|
15 |
app-admin/salt/Manifest | 1 + |
16 |
app-admin/salt/salt-2017.7.7.ebuild | 150 ++++++++++++++++++++++++++++++++++++ |
17 |
2 files changed, 151 insertions(+) |
18 |
|
19 |
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest |
20 |
index 9d529d359fe..47ae1b2933c 100644 |
21 |
--- a/app-admin/salt/Manifest |
22 |
+++ b/app-admin/salt/Manifest |
23 |
@@ -1,3 +1,4 @@ |
24 |
DIST salt-2016.11.9.tar.gz 10062996 BLAKE2B 5176d04d07a69de21c9c136c201d334614c5675fd78e306a0160fae829b633441cd859f4ba1a0822dfbb9ae716475c53f6eb058187d4acc8a5770dd4ceace577 SHA512 896fd27c111e926e246b51d00b69d41c8f4d25ec0c034c9ff3dc5414f5e93592fd637cdeaecf02b3b98a4e5a7ce478bfda86b15497961078374608d76516593d |
25 |
DIST salt-2017.7.5.tar.gz 11043026 BLAKE2B 9cae4e6ca3b0bac0dc0b9b9a5ae01e0bfb8e8b899aa029b324ac10c8c84024bbc419ace068cd0d2bff84ec6ddf1d13faf68ce34c68c19892c700c38e81da8c7c SHA512 684ffde7d98c73349b386c94de3d9fc09631a78c5d74e37e6dfd90fbb0c94decc529f56b1eba1559ce9932b16083f88e6495ff6cdf071b32a23028e9db47cc3d |
26 |
+DIST salt-2017.7.7.tar.gz 11131480 BLAKE2B ea01c8894433cf96697c830d58184bfefca52dcd1be9b1c398270acc229886eeb41edf83d1498fc500f23209fc4e56ba8471da88383bd4c1a9338262423477fb SHA512 01cba364e2dcb5021b2b3b738462645c84332bbf31c0fa82f017fc583a097dccde308fd86be54d2b429921f34c89a4a40b942385c3bc139eb11753d155664063 |
27 |
DIST salt-2018.3.2.tar.gz 12996445 BLAKE2B 8411fb0891e23ce8e35157662a0a45c0c5b13b62f3fd21cc4bbe5152f923a98b27cb5bee4fb8cb3e6ec5c9daed1afa27baf4b570b94f9f40eddc0891f72829e9 SHA512 142ebe13638d7e6dd0aecc9f0325002d30e115fe8688f5f74cbeb7ff21020327d65ded0dcd845e55362b97568b696887fa22243d66d5eadef65f97152d4775d3 |
28 |
|
29 |
diff --git a/app-admin/salt/salt-2017.7.7.ebuild b/app-admin/salt/salt-2017.7.7.ebuild |
30 |
new file mode 100644 |
31 |
index 00000000000..bb76353c1a4 |
32 |
--- /dev/null |
33 |
+++ b/app-admin/salt/salt-2017.7.7.ebuild |
34 |
@@ -0,0 +1,150 @@ |
35 |
+# Copyright 1999-2018 Gentoo Foundation |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+ |
38 |
+EAPI=6 |
39 |
+PYTHON_COMPAT=( python2_7 ) |
40 |
+ |
41 |
+inherit eutils systemd distutils-r1 |
42 |
+ |
43 |
+DESCRIPTION="Salt is a remote execution and configuration manager" |
44 |
+HOMEPAGE="http://saltstack.org/" |
45 |
+ |
46 |
+if [[ ${PV} == 9999* ]]; then |
47 |
+ inherit git-r3 |
48 |
+ EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" |
49 |
+ EGIT_BRANCH="develop" |
50 |
+ SRC_URI="" |
51 |
+ KEYWORDS="" |
52 |
+else |
53 |
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
54 |
+ KEYWORDS="~x86 ~amd64" |
55 |
+fi |
56 |
+ |
57 |
+LICENSE="Apache-2.0" |
58 |
+SLOT="0" |
59 |
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" |
60 |
+IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" |
61 |
+ |
62 |
+RDEPEND="sys-apps/pciutils |
63 |
+ dev-python/jinja[${PYTHON_USEDEP}] |
64 |
+ >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] |
65 |
+ dev-python/pyyaml[${PYTHON_USEDEP}] |
66 |
+ dev-python/markupsafe[${PYTHON_USEDEP}] |
67 |
+ >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
68 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
69 |
+ >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] |
70 |
+ <www-servers/tornado-5.0[${PYTHON_USEDEP}] |
71 |
+ virtual/python-futures[${PYTHON_USEDEP}] |
72 |
+ libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
73 |
+ mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
74 |
+ ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
75 |
+ libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) |
76 |
+ openssl? ( |
77 |
+ dev-libs/openssl:*[-bindist] |
78 |
+ dev-python/pyopenssl[${PYTHON_USEDEP}] |
79 |
+ ) |
80 |
+ raet? ( |
81 |
+ >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] |
82 |
+ >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] |
83 |
+ >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] |
84 |
+ ) |
85 |
+ zeromq? ( |
86 |
+ >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] |
87 |
+ dev-python/pycryptodome[${PYTHON_USEDEP}] |
88 |
+ ) |
89 |
+ cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
90 |
+ mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
91 |
+ portage? ( |
92 |
+ || ( |
93 |
+ sys-apps/portage[${PYTHON_USEDEP}] |
94 |
+ sys-apps/portage-mgorny[${PYTHON_USEDEP}] |
95 |
+ ) |
96 |
+ ) |
97 |
+ keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
98 |
+ mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) |
99 |
+ redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
100 |
+ selinux? ( sec-policy/selinux-salt ) |
101 |
+ timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) |
102 |
+ nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) |
103 |
+ neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) |
104 |
+ gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
105 |
+ profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
106 |
+ vim-syntax? ( app-vim/salt-vim )" |
107 |
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
108 |
+ test? ( |
109 |
+ dev-python/pytest-salt[${PYTHON_USEDEP}] |
110 |
+ dev-python/psutil[${PYTHON_USEDEP}] |
111 |
+ dev-python/pytest[${PYTHON_USEDEP}] |
112 |
+ dev-python/pip[${PYTHON_USEDEP}] |
113 |
+ dev-python/virtualenv[${PYTHON_USEDEP}] |
114 |
+ >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] |
115 |
+ dev-python/timelib[${PYTHON_USEDEP}] |
116 |
+ >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
117 |
+ !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] ) |
118 |
+ >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
119 |
+ >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] |
120 |
+ >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] |
121 |
+ ${RDEPEND} |
122 |
+ )" |
123 |
+ |
124 |
+DOCS=( README.rst AUTHORS ) |
125 |
+ |
126 |
+REQUIRED_USE="|| ( raet zeromq )" |
127 |
+RESTRICT="x86? ( test )" |
128 |
+ |
129 |
+PATCHES=( |
130 |
+ "${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch" |
131 |
+ "${FILESDIR}/${PN}-2017.7.3-tests.patch" |
132 |
+) |
133 |
+ |
134 |
+python_prepare() { |
135 |
+ rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die |
136 |
+ rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die |
137 |
+ rm tests/unit/states/test_boto_vpc.py || die |
138 |
+ rm tests/unit/modules/test_kubernetes.py || die |
139 |
+ # allow the use of the renamed msgpack |
140 |
+ sed -i '/^msgpack/d' requirements/base.txt || die |
141 |
+} |
142 |
+ |
143 |
+python_install_all() { |
144 |
+ local svc |
145 |
+ USE_SETUPTOOLS=1 distutils-r1_python_install_all |
146 |
+ |
147 |
+ for svc in minion master syndic api; do |
148 |
+ newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} |
149 |
+ newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
150 |
+ systemd_dounit "${FILESDIR}"/salt-${svc}.service |
151 |
+ done |
152 |
+ |
153 |
+ insinto /etc/${PN} |
154 |
+ doins -r conf/* |
155 |
+} |
156 |
+ |
157 |
+python_test() { |
158 |
+ local tempdir |
159 |
+ # testsuite likes lots of files |
160 |
+ ulimit -n 3072 || die |
161 |
+ |
162 |
+ # ${T} is too long a path for the tests to work |
163 |
+ tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" |
164 |
+ mkdir "${T}/$(basename "${tempdir}")" |
165 |
+ mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die |
166 |
+ |
167 |
+ ( |
168 |
+ cleanup() { |
169 |
+ rm -f "${tempdir}" |
170 |
+ rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die |
171 |
+ } |
172 |
+ |
173 |
+ trap cleanup EXIT |
174 |
+ |
175 |
+ addwrite "${tempdir}" |
176 |
+ ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" |
177 |
+ |
178 |
+ USE_SETUPTOOLS=1 SHELL="/bin/bash" \ |
179 |
+ TMPDIR="${tempdir}" \ |
180 |
+ ${EPYTHON} tests/runtests.py \ |
181 |
+ --unit-tests --no-report --verbose |
182 |
+ |
183 |
+ ) || die "testing failed" |
184 |
+} |