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