1 |
commit: 0d9b5d118927d6a76e25b542d1097733f65d3730 |
2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 19 01:47:43 2016 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 19 01:47:43 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d9b5d11 |
7 |
|
8 |
app-admin/salt: version bump to 2015.8.7 |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
|
12 |
app-admin/salt/Manifest | 1 + |
13 |
app-admin/salt/salt-2015.8.7.ebuild | 134 ++++++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 135 insertions(+) |
15 |
|
16 |
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest |
17 |
index cfcd194..f286cff 100644 |
18 |
--- a/app-admin/salt/Manifest |
19 |
+++ b/app-admin/salt/Manifest |
20 |
@@ -2,3 +2,4 @@ DIST salt-2015.5.8.tar.gz 5741097 SHA256 07c3eb054ef214c17481fed1262a5e4fd3c429d |
21 |
DIST salt-2015.5.9.tar.gz 5689839 SHA256 71e1c31ebe73edf17b43afcee7de689bb39cc6e97742cd0e110386106fa3fc5b SHA512 389fa09e2e89bb0631f5a2f1d7ef363f8b3a260d466cd7b5fdf7bfc296f5fb64fa355dc56a401df326cefe43e63904061db4fc01a3b5c1cd54fa34ee102a6ad9 WHIRLPOOL 094350e78b96c2633dedb2c4ab0caa959a634e84bf2e92145880eec883ec076765c8b897c873e8f601325a69e7e3fe139163eec45fc6daa109edbd9a884b0dc2 |
22 |
DIST salt-2015.8.3.tar.gz 6757678 SHA256 2e9a262789b018f3443513105c0c6ae98934c9bc105a04cf9e5c073ef706218a SHA512 18a2c63d5e54d09468189450557974e47f87d8b7dde52beaae678120da1da1e7aecfff18cf0fdfb63a11cd5f6bab102c229462f0afe5e3e858c0c467761c7121 WHIRLPOOL 5f1e1562904aecf97027688adbe9a2eb1b910065e52a2e20e7bad67fc4e91660e3e1e04612ee3b18d9632f3ff782837336cf1a5d85d771b67071422a3cea9861 |
23 |
DIST salt-2015.8.5.tar.gz 6877624 SHA256 db395702f048ea384ccc440201c24d7044685977ae6a8588d0d0933246f0c673 SHA512 715709798fd1f4410ef204545a84e34d3ecc0f080905b7ae29ce19d273c1ed6865f56e025e59d2506301970ad05081ff119caec0ced03dcbe5803f9f00eb64f8 WHIRLPOOL 69dc332b21ade4735cd8e9d6a2cdfd61ee364a1c7aa3bf047c9d745b6135b94fdd6406117e056fbb6a8cb79dc3b07af5d2f7a781930255b1fe434838b8692de4 |
24 |
+DIST salt-2015.8.7.tar.gz 6877927 SHA256 61a2f9cff77dd11fc6bf7630d82d1955238818dfa7eedb53e6bf3edbbc9d6029 SHA512 b063c8e0f7cd1682fcb8f5a71fd9f2d71324070bcc4a88611bd4896a2de3269fa0cec1fe9698c74932d9f2a892816db2fc30612a2cbfcee64838ee73955d1a02 WHIRLPOOL 07e6c543e44c8a8a7413bc917bdc5754998285556ec8fda8fe4c278eaea0ca4abf4ae4bca617fca7fb34843408d30879bd880dbbe08197a74847337fa8eb6ef2 |
25 |
|
26 |
diff --git a/app-admin/salt/salt-2015.8.7.ebuild b/app-admin/salt/salt-2015.8.7.ebuild |
27 |
new file mode 100644 |
28 |
index 0000000..669ea91 |
29 |
--- /dev/null |
30 |
+++ b/app-admin/salt/salt-2015.8.7.ebuild |
31 |
@@ -0,0 +1,134 @@ |
32 |
+# Copyright 1999-2016 Gentoo Foundation |
33 |
+# Distributed under the terms of the GNU General Public License v2 |
34 |
+# $Id$ |
35 |
+ |
36 |
+EAPI=5 |
37 |
+PYTHON_COMPAT=(python2_7) |
38 |
+ |
39 |
+inherit eutils systemd distutils-r1 |
40 |
+ |
41 |
+DESCRIPTION="Salt is a remote execution and configuration manager" |
42 |
+HOMEPAGE="http://saltstack.org/" |
43 |
+ |
44 |
+if [[ ${PV} == 9999* ]]; then |
45 |
+ inherit git-r3 |
46 |
+ EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" |
47 |
+ EGIT_BRANCH="develop" |
48 |
+ SRC_URI="" |
49 |
+ KEYWORDS="" |
50 |
+else |
51 |
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
52 |
+ KEYWORDS="~x86 ~amd64" |
53 |
+fi |
54 |
+ |
55 |
+LICENSE="Apache-2.0" |
56 |
+SLOT="0" |
57 |
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" |
58 |
+IUSE+=" openssl profile redis selinux test timelib raet +zeromq vim-syntax" |
59 |
+ |
60 |
+RDEPEND="sys-apps/pciutils |
61 |
+ dev-python/jinja[${PYTHON_USEDEP}] |
62 |
+ >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] |
63 |
+ dev-python/pyyaml[${PYTHON_USEDEP}] |
64 |
+ dev-python/markupsafe[${PYTHON_USEDEP}] |
65 |
+ >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
66 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
67 |
+ >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] |
68 |
+ virtual/python-futures[${PYTHON_USEDEP}] |
69 |
+ libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
70 |
+ mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
71 |
+ ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
72 |
+ openssl? ( dev-python/pyopenssl[${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 |
+ keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
90 |
+ mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) |
91 |
+ redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
92 |
+ selinux? ( sec-policy/selinux-salt ) |
93 |
+ timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) |
94 |
+ nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) |
95 |
+ neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) |
96 |
+ gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
97 |
+ profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
98 |
+ vim-syntax? ( app-vim/salt-vim )" |
99 |
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
100 |
+ test? ( |
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 |
+ >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
107 |
+ >=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}] |
108 |
+ ${RDEPEND} |
109 |
+ )" |
110 |
+ |
111 |
+DOCS=(README.rst AUTHORS) |
112 |
+ |
113 |
+REQUIRED_USE="|| ( raet zeromq )" |
114 |
+ |
115 |
+PATCHES=( |
116 |
+ "${FILESDIR}/${PN}-2015.8.0-remove-buggy-tests.patch" |
117 |
+ "${FILESDIR}/${PN}-2015.5.5-auth-tests.patch" |
118 |
+ "${FILESDIR}/${PN}-2015.5.5-cron-tests.patch" |
119 |
+ "${FILESDIR}/${PN}-2015.5.5-remove-buggy-tests.patch" |
120 |
+ "${FILESDIR}/${PN}-2015.8.2-tmpdir.patch" |
121 |
+ "${FILESDIR}/${PN}-2015.8.4-boto-vpc-test.patch" |
122 |
+) |
123 |
+ |
124 |
+python_prepare() { |
125 |
+ # this test fails because it trys to "pip install distribute" |
126 |
+ rm tests/unit/{modules,states}/zcbuildout_test.py \ |
127 |
+ tests/unit/modules/{rh_ip,win_network,random_org}_test.py |
128 |
+} |
129 |
+ |
130 |
+python_install_all() { |
131 |
+ local svc |
132 |
+ USE_SETUPTOOLS=1 distutils-r1_python_install_all |
133 |
+ |
134 |
+ for svc in minion master syndic api; do |
135 |
+ newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} |
136 |
+ newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
137 |
+ systemd_dounit "${FILESDIR}"/salt-${svc}.service |
138 |
+ done |
139 |
+ |
140 |
+ insinto /etc/${PN} |
141 |
+ doins -r conf/* |
142 |
+} |
143 |
+ |
144 |
+python_test() { |
145 |
+ local tempdir |
146 |
+ # testsuite likes lots of files |
147 |
+ ulimit -n 3072 |
148 |
+ |
149 |
+ # ${T} is too long a path for the tests to work |
150 |
+ tempdir="$(mktemp -dup /tmp salt-XXX)" |
151 |
+ mkdir "${T}/$(basename "${tempdir}")" |
152 |
+ |
153 |
+ ( |
154 |
+ cleanup() { rm -f "${tempdir}"; } |
155 |
+ trap cleanup EXIT |
156 |
+ |
157 |
+ addwrite "${tempdir}" |
158 |
+ ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" |
159 |
+ |
160 |
+ USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="${tempdir}" \ |
161 |
+ ${EPYTHON} tests/runtests.py \ |
162 |
+ --unit-tests --no-report --verbose |
163 |
+ |
164 |
+ ) || die "testing failed" |
165 |
+} |