1 |
commit: 12b98a9257d9dd65e76edc87a40d4dc6e8ad303d |
2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 1 01:28:09 2017 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 1 01:28:09 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12b98a92 |
7 |
|
8 |
app-admin/salt: Version bump to 2017.7.0 |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
11 |
|
12 |
app-admin/salt/Manifest | 1 + |
13 |
.../files/salt-2017.7.0-dont-realpath-tmpdir.patch | 19 +++ |
14 |
app-admin/salt/salt-2017.7.0.ebuild | 138 +++++++++++++++++++++ |
15 |
3 files changed, 158 insertions(+) |
16 |
|
17 |
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest |
18 |
index 743950ce7d9..4b37df70080 100644 |
19 |
--- a/app-admin/salt/Manifest |
20 |
+++ b/app-admin/salt/Manifest |
21 |
@@ -4,3 +4,4 @@ DIST salt-2016.11.4.tar.gz 9360198 SHA256 fb4109b28d3fd898291c162e42ef843fbd4c3e |
22 |
DIST salt-2016.11.5.tar.gz 9246550 SHA256 b81427a4a3e47a98726f948bdc16a5b6b366f93fdac0b2c817e8f87d9036f8be SHA512 9afb40dbd3a508eacc43500566660763e2b219817d7de25ccf2d61d7f74b857238922ea40cc4c6372fd520bc6f524d84fb0a2d65f9890bedd79d0fc6c177edf9 WHIRLPOOL 684c8f147fbe38928b3f7510e704654270fcc4aacdf81c4f3b90a9f275566a2b8cf2155aff223d3ead2740d79e479d10cf233b4386b8e76ddb7b481f3471ebb6 |
23 |
DIST salt-2016.11.6.tar.gz 9410028 SHA256 9031af68d31d0416fe3161526ef122a763afc6182bd63fe48b6c4d0a16a0703a SHA512 8b375eeaf8380c750700ae9b500e012f0b8ae281c8b5aa68d3443393a5bb7dd46612f2aeb3ba01719dd28d9e128dc88f1faa8023f5f5e7ff684a1f0483c30120 WHIRLPOOL c74aa93b60851a4978746fd0fe60f4fcbe0e8bb447cb19fcd3eede9d5880ef3ece96b2d9dc4cab4d8f09f08ce9ad2fd9d4bb63c295aefcf25b178e4c3c77d992 |
24 |
DIST salt-2016.3.6.tar.gz 8432840 SHA256 4cc45f48255b7e46631807b071674552872c322ab77f398c9beefbf14d6a212f SHA512 949d70504310cd88139c520812a870e4c68e6b0c7ec6decfd157283994d6be659e7823a4453d1b6464c24fc762bc9ba61d4f6a767c4d6f65e496c7f5b6589a8d WHIRLPOOL 3d5abdbe0e297cbfc1b0f7fce0d6959132bbe917abc80ad7bb368a2ec657c0c0019123a22558c3fbdec489cb20430243ff837658d55da6755a07d4ec4d35158c |
25 |
+DIST salt-2017.7.0.tar.gz 11399842 SHA256 aaf45f8dcf95a20b56072e620100432d058ab297210c4902dc90e197b236b064 SHA512 21d8350413ad6a262d4c19c4cb3cbd4bc718f411bab49141626729b659c1ee72340542b342ec0fb012cb11c313bd56ec6534416d2128ae548ed8950affb6c834 WHIRLPOOL e9716b689069c79922c9e47d430ed16efc8adb9ba528202cfc86d00a39e746b3723e12f2f6abf443a8ae5adb64d81bbd916e395973ddf6639dcbc32d589b6881 |
26 |
|
27 |
diff --git a/app-admin/salt/files/salt-2017.7.0-dont-realpath-tmpdir.patch b/app-admin/salt/files/salt-2017.7.0-dont-realpath-tmpdir.patch |
28 |
new file mode 100644 |
29 |
index 00000000000..90a48a66299 |
30 |
--- /dev/null |
31 |
+++ b/app-admin/salt/files/salt-2017.7.0-dont-realpath-tmpdir.patch |
32 |
@@ -0,0 +1,19 @@ |
33 |
+diff --git a/tests/support/paths.py b/tests/support/paths.py |
34 |
+index da93c8e1e3..895c636fef 100644 |
35 |
+--- a/tests/support/paths.py |
36 |
++++ b/tests/support/paths.py |
37 |
+@@ -40,12 +40,12 @@ if CODE_DIR not in sys.path: |
38 |
+ if TESTS_DIR not in sys.path: |
39 |
+ sys.path.insert(1, TESTS_DIR) |
40 |
+ |
41 |
+-SYS_TMP_DIR = os.path.abspath(os.path.realpath( |
42 |
++SYS_TMP_DIR = os.path.abspath( |
43 |
+ # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long |
44 |
+ # for unix sockets: ``error: AF_UNIX path too long`` |
45 |
+ # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR} |
46 |
+ os.environ.get('TMPDIR', tempfile.gettempdir()) if not sys.platform.startswith('darwin') else '/tmp' |
47 |
+-)) |
48 |
++) |
49 |
+ TMP = os.path.join(SYS_TMP_DIR, 'salt-tests-tmpdir') |
50 |
+ FILES = os.path.join(INTEGRATION_TEST_DIR, 'files') |
51 |
+ PYEXEC = 'python{0}.{1}'.format(*sys.version_info) |
52 |
|
53 |
diff --git a/app-admin/salt/salt-2017.7.0.ebuild b/app-admin/salt/salt-2017.7.0.ebuild |
54 |
new file mode 100644 |
55 |
index 00000000000..327efb8b298 |
56 |
--- /dev/null |
57 |
+++ b/app-admin/salt/salt-2017.7.0.ebuild |
58 |
@@ -0,0 +1,138 @@ |
59 |
+# Copyright 1999-2017 Gentoo Foundation |
60 |
+# Distributed under the terms of the GNU General Public License v2 |
61 |
+ |
62 |
+EAPI=6 |
63 |
+PYTHON_COMPAT=( python2_7 ) |
64 |
+ |
65 |
+inherit eutils systemd distutils-r1 |
66 |
+ |
67 |
+DESCRIPTION="Salt is a remote execution and configuration manager" |
68 |
+HOMEPAGE="http://saltstack.org/" |
69 |
+ |
70 |
+if [[ ${PV} == 9999* ]]; then |
71 |
+ inherit git-r3 |
72 |
+ EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" |
73 |
+ EGIT_BRANCH="develop" |
74 |
+ SRC_URI="" |
75 |
+ KEYWORDS="" |
76 |
+else |
77 |
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
78 |
+ KEYWORDS="~x86 ~amd64" |
79 |
+fi |
80 |
+ |
81 |
+LICENSE="Apache-2.0" |
82 |
+SLOT="0" |
83 |
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" |
84 |
+IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" |
85 |
+ |
86 |
+RDEPEND="sys-apps/pciutils |
87 |
+ dev-python/jinja[${PYTHON_USEDEP}] |
88 |
+ >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] |
89 |
+ dev-python/pyyaml[${PYTHON_USEDEP}] |
90 |
+ dev-python/markupsafe[${PYTHON_USEDEP}] |
91 |
+ >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
92 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
93 |
+ >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] |
94 |
+ virtual/python-futures[${PYTHON_USEDEP}] |
95 |
+ libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
96 |
+ mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
97 |
+ ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
98 |
+ libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) |
99 |
+ openssl? ( |
100 |
+ dev-libs/openssl:*[-bindist] |
101 |
+ dev-python/pyopenssl[${PYTHON_USEDEP}] |
102 |
+ ) |
103 |
+ raet? ( |
104 |
+ >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] |
105 |
+ >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] |
106 |
+ >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] |
107 |
+ ) |
108 |
+ zeromq? ( |
109 |
+ >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] |
110 |
+ >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] |
111 |
+ ) |
112 |
+ cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
113 |
+ mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
114 |
+ portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) |
115 |
+ keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
116 |
+ mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) |
117 |
+ redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
118 |
+ selinux? ( sec-policy/selinux-salt ) |
119 |
+ timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) |
120 |
+ nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) |
121 |
+ neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) |
122 |
+ gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
123 |
+ profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
124 |
+ vim-syntax? ( app-vim/salt-vim )" |
125 |
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
126 |
+ test? ( |
127 |
+ dev-python/pytest-salt[${PYTHON_USEDEP}] |
128 |
+ dev-python/psutil[${PYTHON_USEDEP}] |
129 |
+ dev-python/pytest[${PYTHON_USEDEP}] |
130 |
+ dev-python/pip[${PYTHON_USEDEP}] |
131 |
+ dev-python/virtualenv[${PYTHON_USEDEP}] |
132 |
+ dev-python/mock[${PYTHON_USEDEP}] |
133 |
+ dev-python/timelib[${PYTHON_USEDEP}] |
134 |
+ >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
135 |
+ !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] ) |
136 |
+ >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
137 |
+ >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] |
138 |
+ >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] |
139 |
+ ${RDEPEND} |
140 |
+ )" |
141 |
+ |
142 |
+DOCS=( README.rst AUTHORS ) |
143 |
+ |
144 |
+REQUIRED_USE="|| ( raet zeromq )" |
145 |
+RESTRICT="x86? ( test )" |
146 |
+ |
147 |
+PATCHES=( |
148 |
+ "${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch" |
149 |
+) |
150 |
+ |
151 |
+python_prepare() { |
152 |
+ rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} |
153 |
+} |
154 |
+ |
155 |
+python_install_all() { |
156 |
+ local svc |
157 |
+ USE_SETUPTOOLS=1 distutils-r1_python_install_all |
158 |
+ |
159 |
+ for svc in minion master syndic api; do |
160 |
+ newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} |
161 |
+ newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
162 |
+ systemd_dounit "${FILESDIR}"/salt-${svc}.service |
163 |
+ done |
164 |
+ |
165 |
+ insinto /etc/${PN} |
166 |
+ doins -r conf/* |
167 |
+} |
168 |
+ |
169 |
+python_test() { |
170 |
+ local tempdir |
171 |
+ # testsuite likes lots of files |
172 |
+ ulimit -n 3072 || die |
173 |
+ |
174 |
+ # ${T} is too long a path for the tests to work |
175 |
+ tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" |
176 |
+ mkdir "${T}/$(basename "${tempdir}")" |
177 |
+ mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die |
178 |
+ |
179 |
+ ( |
180 |
+ cleanup() { |
181 |
+ rm -f "${tempdir}" |
182 |
+ rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die |
183 |
+ } |
184 |
+ |
185 |
+ trap cleanup EXIT |
186 |
+ |
187 |
+ addwrite "${tempdir}" |
188 |
+ ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" |
189 |
+ |
190 |
+ USE_SETUPTOOLS=1 SHELL="/bin/bash" \ |
191 |
+ TMPDIR="${tempdir}" \ |
192 |
+ ${EPYTHON} tests/runtests.py \ |
193 |
+ --unit-tests --no-report --verbose |
194 |
+ |
195 |
+ ) || die "testing failed" |
196 |
+} |