1 |
commit: f34e5d1d1418191a29973189259ee7a835f22964 |
2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 24 21:45:37 2016 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 24 21:45:37 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f34e5d1d |
7 |
|
8 |
app-admin/salt: Version bump to 2015.8.12 |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
|
12 |
app-admin/salt/Manifest | 1 + |
13 |
app-admin/salt/salt-2015.8.12.ebuild | 140 +++++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 141 insertions(+) |
15 |
|
16 |
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest |
17 |
index ac7250a..717c19e 100644 |
18 |
--- a/app-admin/salt/Manifest |
19 |
+++ b/app-admin/salt/Manifest |
20 |
@@ -1,6 +1,7 @@ |
21 |
DIST salt-2015.5.10.tar.gz 5693422 SHA256 863a96e70f8521af35fe11b10d25b3205a0bfbba9a8aee02e2842aa7106496fd SHA512 78a4cbe5c771208e957360689a25ae4e44566987e07e7fda54e6db9028485eacc6ad016c65c981090f9b5d95331e46048a094aecc27703b3956c06ab6ebad95d WHIRLPOOL 805b48df07707d85d8338251f26c72164a5421731fc11f5c933b72af97348a2f11ee35889f72ec032acbea275e98575d35786b56fd84a7917f8fdbc30567ae86 |
22 |
DIST salt-2015.8.10.tar.gz 6972776 SHA256 4a81273ab4b01e0f1d29b28ab99a16eb94e5c430107b05491c94f3baf8b95c99 SHA512 e00eb6535defd883ed789b4b27fae020a8225cd1a3dd05cfa92d6320a4fe6930ecddf9914a572f64715656126107d61920d1b989451caa7ccdb28d969c41c64c WHIRLPOOL fa6beaee47c604cc1398ed803662dbd340cf9ab20664af6c903d7376abd3253522798c73c83b0c5b00f0db72fb4be20dae074c6d6fdd39026485f5050f108b2a |
23 |
DIST salt-2015.8.11.tar.gz 7083841 SHA256 7b38ab7433e67785ff231cfd604bc36652f4088f8b93e64d627e74242f4099d7 SHA512 0af029b30525a5be4ffa64ea33b4368b59a9ad64fe4f6cba3af1cf03b53e1c1e0e0fe50371c7e4762a0c3bcbefa7855b6f0b79702f3b146001a2b5484f1731f9 WHIRLPOOL 23af490fa47b84843cb36367aa76698f989e767c044477d0cfad22222f24a9b11c76de0617f4c4859b41094e2bedc4f6b2be331055c95bcd8327ca36e9878d6c |
24 |
+DIST salt-2015.8.12.tar.gz 7033938 SHA256 712f72b30a9555ea46a51bc677e05ffa2eefaeefa6b48d4f7ae45dbcb1073c69 SHA512 8ce940a413c740bd82c6c96103d48b376a47cb8161a5d72ece3f4bf6b39134bd722787a427249726dc137064d032fa913c7f6c6db22d0808ba1a829d4f25e9ec WHIRLPOOL 723660eac1346c3ba29b88c7db1a4485a194aebbdf33ea6dc411c420059767a3feb5c863941d772b504cede4a78a57e3ce696601872d21d29f4def373db697d4 |
25 |
DIST salt-2015.8.8.tar.gz 6982904 SHA256 b2ecce7bf562cfcd6586d66ade278f268bb89023f0fa0accaa55f90b8a668ef5 SHA512 add65951694bc9e3aaa6db69bf9ac7ed32a5c42822ae34281ca3ea1e7f393235cd6baa1905362d177c62505a514e1c4599751e1a8a913cc334f9ebe1d4ab7ed3 WHIRLPOOL 9d81b6153019ff0862c6ee0e3fa949810e8066798aabcc94f2b87893f51906e0e19e37aa26023ea578eb10ebb9816d30d12104fdc5018c7ce91790bd617b2bba |
26 |
DIST salt-2016.3.1.tar.gz 7932479 SHA256 e6bdba4693116430c2af57497eb63399e3a139ac0a7016fa0870b49fbe987f75 SHA512 74122020a83df79171b9aa3bc311d1b16930140ec6b063c888d41e10fb8e696f69188b62cf925045b40d8b8fe713759de08978b08bc3b8e1f12722de3a8ddb7b WHIRLPOOL f76afb4d9c6678edf48b608f6dbd27201656fd371b0df78a8a8db306a2cbf5b08fa2fd916e9fb5409b67cd05ab007a3684d91c1e0158416b12f014001de1506a |
27 |
DIST salt-2016.3.2.tar.gz 8014793 SHA256 6a84b724d02b0dba438dea57650724064675d82620e66749bd2fe8f21da71be0 SHA512 608e2a43bc8c55eeb8c9e0f9207306e591151940ad1ffb869ada12963c0790f37653936e539c0b70439c13180909de2c763db6c30e7f9e2087068985d1b3ff91 WHIRLPOOL 5e6f6dc9980ab6cd6e8c897d140241ce9e6dec8afd08274749a20260c6b871d6e52cd674ed8e838a4aa285bf45c49586d77bc2156f94ee26f4f776d9025040eb |
28 |
|
29 |
diff --git a/app-admin/salt/salt-2015.8.12.ebuild b/app-admin/salt/salt-2015.8.12.ebuild |
30 |
new file mode 100644 |
31 |
index 00000000..052b772 |
32 |
--- /dev/null |
33 |
+++ b/app-admin/salt/salt-2015.8.12.ebuild |
34 |
@@ -0,0 +1,140 @@ |
35 |
+# Copyright 1999-2016 Gentoo Foundation |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+# $Id$ |
38 |
+ |
39 |
+EAPI=5 |
40 |
+PYTHON_COMPAT=(python2_7) |
41 |
+ |
42 |
+inherit eutils systemd distutils-r1 |
43 |
+ |
44 |
+DESCRIPTION="Salt is a remote execution and configuration manager" |
45 |
+HOMEPAGE="http://saltstack.org/" |
46 |
+ |
47 |
+if [[ ${PV} == 9999* ]]; then |
48 |
+ inherit git-r3 |
49 |
+ EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" |
50 |
+ EGIT_BRANCH="develop" |
51 |
+ SRC_URI="" |
52 |
+ KEYWORDS="" |
53 |
+else |
54 |
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
55 |
+ KEYWORDS="~x86 ~amd64" |
56 |
+fi |
57 |
+ |
58 |
+LICENSE="Apache-2.0" |
59 |
+SLOT="0" |
60 |
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" |
61 |
+IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" |
62 |
+ |
63 |
+RDEPEND="sys-apps/pciutils |
64 |
+ dev-python/jinja[${PYTHON_USEDEP}] |
65 |
+ >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] |
66 |
+ dev-python/pyyaml[${PYTHON_USEDEP}] |
67 |
+ dev-python/markupsafe[${PYTHON_USEDEP}] |
68 |
+ >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
69 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
70 |
+ >=www-servers/tornado-4.2.1[${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/pycrypto-2.6.1[${PYTHON_USEDEP}] |
88 |
+ ) |
89 |
+ cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
90 |
+ mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
91 |
+ portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
92 |
+ keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
93 |
+ mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) |
94 |
+ redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
95 |
+ selinux? ( sec-policy/selinux-salt ) |
96 |
+ timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) |
97 |
+ nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) |
98 |
+ neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) |
99 |
+ gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
100 |
+ profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
101 |
+ vim-syntax? ( app-vim/salt-vim )" |
102 |
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
103 |
+ test? ( |
104 |
+ dev-python/psutil[${PYTHON_USEDEP}] |
105 |
+ dev-python/pip[${PYTHON_USEDEP}] |
106 |
+ dev-python/virtualenv[${PYTHON_USEDEP}] |
107 |
+ dev-python/mock[${PYTHON_USEDEP}] |
108 |
+ dev-python/timelib[${PYTHON_USEDEP}] |
109 |
+ >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
110 |
+ >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
111 |
+ >=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}] |
112 |
+ ${RDEPEND} |
113 |
+ )" |
114 |
+ |
115 |
+DOCS=(README.rst AUTHORS) |
116 |
+ |
117 |
+REQUIRED_USE="|| ( raet zeromq )" |
118 |
+ |
119 |
+PATCHES=( |
120 |
+ "${FILESDIR}/${PN}-2015.8.0-remove-buggy-tests.patch" |
121 |
+ "${FILESDIR}/${PN}-2015.5.5-auth-tests.patch" |
122 |
+ "${FILESDIR}/${PN}-2015.5.5-cron-tests.patch" |
123 |
+ "${FILESDIR}/${PN}-2015.5.5-remove-buggy-tests.patch" |
124 |
+ "${FILESDIR}/${PN}-2015.8.2-tmpdir.patch" |
125 |
+ "${FILESDIR}/${PN}-2015.8.10-remove-failing-boto-test.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 |
132 |
+} |
133 |
+ |
134 |
+python_install_all() { |
135 |
+ local svc |
136 |
+ USE_SETUPTOOLS=1 distutils-r1_python_install_all |
137 |
+ |
138 |
+ for svc in minion master syndic api; do |
139 |
+ newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} |
140 |
+ newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
141 |
+ if [[ -e pkg/salt-${svc}.service ]]; then |
142 |
+ sed -i -r 's/After=(.*)/After=syslog.target \1/' pkg/salt-${svc}.service || die |
143 |
+ systemd_dounit pkg/salt-${svc}.service |
144 |
+ elif [[ -e "${FILESDIR}"/salt-${svc}.service ]]; then |
145 |
+ systemd_dounit "${FILESDIR}"/salt-${svc}.service |
146 |
+ fi |
147 |
+ done |
148 |
+ |
149 |
+ insinto /etc/${PN} |
150 |
+ doins -r conf/* |
151 |
+} |
152 |
+ |
153 |
+python_test() { |
154 |
+ local tempdir |
155 |
+ # testsuite likes lots of files |
156 |
+ ulimit -n 3072 |
157 |
+ |
158 |
+ # ${T} is too long a path for the tests to work |
159 |
+ tempdir="$(mktemp -dup /tmp salt-XXX)" |
160 |
+ mkdir "${T}/$(basename "${tempdir}")" |
161 |
+ |
162 |
+ ( |
163 |
+ cleanup() { rm -f "${tempdir}"; } |
164 |
+ trap cleanup EXIT |
165 |
+ |
166 |
+ addwrite "${tempdir}" |
167 |
+ ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" |
168 |
+ |
169 |
+ USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="${tempdir}" \ |
170 |
+ ${EPYTHON} tests/runtests.py \ |
171 |
+ --unit-tests --no-report --verbose |
172 |
+ |
173 |
+ ) || die "testing failed" |
174 |
+} |