1 |
commit: c1eb9a4ad70c162acd29847699a4ca5854d7f994 |
2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Mar 27 22:51:56 2017 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 27 22:53:01 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1eb9a4a |
7 |
|
8 |
app-admin/salt: Version bump to 2016.11.3 |
9 |
|
10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
11 |
|
12 |
app-admin/salt/Manifest | 1 + |
13 |
app-admin/salt/salt-2016.11.3.ebuild | 146 +++++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 147 insertions(+) |
15 |
|
16 |
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest |
17 |
index d7c5fdeb096..9b700a4c83e 100644 |
18 |
--- a/app-admin/salt/Manifest |
19 |
+++ b/app-admin/salt/Manifest |
20 |
@@ -1,5 +1,6 @@ |
21 |
DIST salt-2015.5.10.tar.gz 5693422 SHA256 863a96e70f8521af35fe11b10d25b3205a0bfbba9a8aee02e2842aa7106496fd SHA512 78a4cbe5c771208e957360689a25ae4e44566987e07e7fda54e6db9028485eacc6ad016c65c981090f9b5d95331e46048a094aecc27703b3956c06ab6ebad95d WHIRLPOOL 805b48df07707d85d8338251f26c72164a5421731fc11f5c933b72af97348a2f11ee35889f72ec032acbea275e98575d35786b56fd84a7917f8fdbc30567ae86 |
22 |
DIST salt-2015.8.13.tar.gz 7036243 SHA256 cca82c9a4f267692660b098c1f76e54ab6a24131391893719bde0eb3a1ed2959 SHA512 ec8626f7360542bfeea90fc3d6fd9d9d015da4c2a6adf9957c22501ed9531b0a44d2cbc4853c41856b4cd46c142d2441884ec99700f3c0a5310cc428f9f1ec2a WHIRLPOOL c21f3bdc5fd674ea664c7e8fd58ef6685328a6ee3679850f3e9a085b1e604e1224a3323b906b47075fb8dd39f373583fb549e7b0f3f725d44928bcf716955a10 |
23 |
DIST salt-2016.11.2.tar.gz 9114042 SHA256 f5c3d3cf4293d5b80a93790c76dec61421991c9c54222abd7327b3437ad13a43 SHA512 0dbc861424643af664edd2d9cb8bcbde7e9bcf7c1d202a5e844af83c21dc2d75fd7034db27dffc58dc2a6e47cfe2ea2c42e2a9af867c7ca78f93166eb4fd03ad WHIRLPOOL e1757de32d41e356a423ca347f59fdce05b574bb7bd9dbeffd34e7f6e90e8f0a2afb48ac209736fa6b7da86525c85e7ac5c7539dde621c533fa1e5b3475c5392 |
24 |
+DIST salt-2016.11.3.tar.gz 9163351 SHA256 9d5849f38a858288ebc6ef790ced86ae724e61b06e3ee27e6cecf3f6c1ecbc51 SHA512 24bc75c50b4d6bd38a6f2dedc0a8c12142cc1b9d551455e49ea0ede405c78eb6a939f741dd8c0cbb8f206937ee69582bebe2fc127a24a4c2cf06cf3c3c16e507 WHIRLPOOL eae74f912ac4da4484a7adf6e0ef317c303a250521032594a885731f444f60ed6ddc965463a79e97c4653c501696575510fa106f048911914189952bdf04bcdd |
25 |
DIST salt-2016.3.5.tar.gz 8405980 SHA256 fec215dfdec33ca6826453e5437656f9ed5e4a121ef3db6341f91f799cd3e751 SHA512 ca9ae85f8174aa55fefeaef70d65981d581f25f14f219f437ad4dc0db08e5944f356564c92aee46e796547db38312efedc8db5080576d578982f963a742635e6 WHIRLPOOL 72b504dd669adf4ffc6818083f40b07b78914c8f168ab496d628a3f5cd136d7c4266906007e095aff4c18e123dfcf03391f577fb09b841eb71bc30ea6a46de07 |
26 |
DIST salt-2016.3.6.tar.gz 8432840 SHA256 4cc45f48255b7e46631807b071674552872c322ab77f398c9beefbf14d6a212f SHA512 949d70504310cd88139c520812a870e4c68e6b0c7ec6decfd157283994d6be659e7823a4453d1b6464c24fc762bc9ba61d4f6a767c4d6f65e496c7f5b6589a8d WHIRLPOOL 3d5abdbe0e297cbfc1b0f7fce0d6959132bbe917abc80ad7bb368a2ec657c0c0019123a22558c3fbdec489cb20430243ff837658d55da6755a07d4ec4d35158c |
27 |
|
28 |
diff --git a/app-admin/salt/salt-2016.11.3.ebuild b/app-admin/salt/salt-2016.11.3.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..872e4bab594 |
31 |
--- /dev/null |
32 |
+++ b/app-admin/salt/salt-2016.11.3.ebuild |
33 |
@@ -0,0 +1,146 @@ |
34 |
+# Copyright 1999-2017 Gentoo Foundation |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI=6 |
38 |
+PYTHON_COMPAT=( python2_7 ) |
39 |
+ |
40 |
+inherit eutils systemd distutils-r1 |
41 |
+ |
42 |
+DESCRIPTION="Salt is a remote execution and configuration manager" |
43 |
+HOMEPAGE="http://saltstack.org/" |
44 |
+ |
45 |
+if [[ ${PV} == 9999* ]]; then |
46 |
+ inherit git-r3 |
47 |
+ EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" |
48 |
+ EGIT_BRANCH="develop" |
49 |
+ SRC_URI="" |
50 |
+ KEYWORDS="" |
51 |
+else |
52 |
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
53 |
+ KEYWORDS="~x86 ~amd64" |
54 |
+fi |
55 |
+ |
56 |
+LICENSE="Apache-2.0" |
57 |
+SLOT="0" |
58 |
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" |
59 |
+IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" |
60 |
+ |
61 |
+RDEPEND="sys-apps/pciutils |
62 |
+ dev-python/jinja[${PYTHON_USEDEP}] |
63 |
+ >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] |
64 |
+ dev-python/pyyaml[${PYTHON_USEDEP}] |
65 |
+ dev-python/markupsafe[${PYTHON_USEDEP}] |
66 |
+ >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
67 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
68 |
+ >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] |
69 |
+ virtual/python-futures[${PYTHON_USEDEP}] |
70 |
+ libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
71 |
+ mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
72 |
+ ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
73 |
+ libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) |
74 |
+ openssl? ( |
75 |
+ dev-libs/openssl:*[-bindist] |
76 |
+ dev-python/pyopenssl[${PYTHON_USEDEP}] |
77 |
+ ) |
78 |
+ raet? ( |
79 |
+ >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] |
80 |
+ >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] |
81 |
+ >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] |
82 |
+ ) |
83 |
+ zeromq? ( |
84 |
+ >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] |
85 |
+ >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] |
86 |
+ ) |
87 |
+ cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
88 |
+ mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
89 |
+ portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
90 |
+ keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
91 |
+ mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) |
92 |
+ redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
93 |
+ selinux? ( sec-policy/selinux-salt ) |
94 |
+ timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) |
95 |
+ nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) |
96 |
+ neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) |
97 |
+ gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
98 |
+ profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
99 |
+ vim-syntax? ( app-vim/salt-vim )" |
100 |
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
101 |
+ test? ( |
102 |
+ dev-python/psutil[${PYTHON_USEDEP}] |
103 |
+ dev-python/pip[${PYTHON_USEDEP}] |
104 |
+ dev-python/virtualenv[${PYTHON_USEDEP}] |
105 |
+ dev-python/mock[${PYTHON_USEDEP}] |
106 |
+ dev-python/timelib[${PYTHON_USEDEP}] |
107 |
+ >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
108 |
+ !x86? ( dev-python/boto3[${PYTHON_USEDEP}] ) |
109 |
+ >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
110 |
+ >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] |
111 |
+ >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] |
112 |
+ ${RDEPEND} |
113 |
+ )" |
114 |
+ |
115 |
+DOCS=( README.rst AUTHORS ) |
116 |
+ |
117 |
+REQUIRED_USE="|| ( raet zeromq )" |
118 |
+RESTRICT="x86? ( test )" |
119 |
+ |
120 |
+PATCHES=( |
121 |
+ "${FILESDIR}/${PN}-2016.11.0-tmpdir.patch" |
122 |
+ "${FILESDIR}/${PN}-2016.3.1-dont-realpath-tmpdir.patch" |
123 |
+ "${FILESDIR}/${PN}-2016.3.4-test-nonexist-dirs.patch" |
124 |
+ "${FILESDIR}/${PN}-2016.11.0-remove-file-tree-test.patch" |
125 |
+ "${FILESDIR}/${PN}-2016.11.0-broken-tests.patch" |
126 |
+) |
127 |
+ |
128 |
+python_prepare() { |
129 |
+ # this test fails because it trys to "pip install distribute" |
130 |
+ rm tests/unit/{modules,states}/zcbuildout_test.py \ |
131 |
+ tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die |
132 |
+ |
133 |
+ # https://github.com/saltstack/salt/issues/39095 |
134 |
+ rm tests/unit/utils/parsers_test.py |
135 |
+ |
136 |
+ # apparently libcloud does not know about this? |
137 |
+ rm tests/unit/cloud/clouds/dimensiondata_test.py || die |
138 |
+ |
139 |
+ # seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'" |
140 |
+ rm tests/unit/cloud/clouds/gce_test.py || 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 -dup /tmp salt-XXX)" |
164 |
+ mkdir "${T}/$(basename "${tempdir}")" |
165 |
+ |
166 |
+ ( |
167 |
+ cleanup() { rm -f "${tempdir}"; } |
168 |
+ trap cleanup EXIT |
169 |
+ |
170 |
+ addwrite "${tempdir}" |
171 |
+ ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" |
172 |
+ |
173 |
+ USE_SETUPTOOLS=1 SHELL="/bin/bash" \ |
174 |
+ TMPDIR="${tempdir}" \ |
175 |
+ ${EPYTHON} tests/runtests.py \ |
176 |
+ --unit-tests --no-report --verbose |
177 |
+ |
178 |
+ ) || die "testing failed" |
179 |
+} |