1 |
commit: 1efda04eb2505b98557e6bcd4fe27ff5312e60ff |
2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jul 3 20:39:24 2018 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 3 21:18:18 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1efda04e |
7 |
|
8 |
app-admin/salt: Remove 2017.7.5 |
9 |
|
10 |
Package-Manager: Portage-2.3.41, Repoman-2.3.9 |
11 |
|
12 |
app-admin/salt/Manifest | 1 - |
13 |
app-admin/salt/salt-2017.7.5.ebuild | 154 ------------------------------------ |
14 |
2 files changed, 155 deletions(-) |
15 |
|
16 |
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest |
17 |
index 47ae1b2933c..d2a7360c640 100644 |
18 |
--- a/app-admin/salt/Manifest |
19 |
+++ b/app-admin/salt/Manifest |
20 |
@@ -1,4 +1,3 @@ |
21 |
DIST salt-2016.11.9.tar.gz 10062996 BLAKE2B 5176d04d07a69de21c9c136c201d334614c5675fd78e306a0160fae829b633441cd859f4ba1a0822dfbb9ae716475c53f6eb058187d4acc8a5770dd4ceace577 SHA512 896fd27c111e926e246b51d00b69d41c8f4d25ec0c034c9ff3dc5414f5e93592fd637cdeaecf02b3b98a4e5a7ce478bfda86b15497961078374608d76516593d |
22 |
-DIST salt-2017.7.5.tar.gz 11043026 BLAKE2B 9cae4e6ca3b0bac0dc0b9b9a5ae01e0bfb8e8b899aa029b324ac10c8c84024bbc419ace068cd0d2bff84ec6ddf1d13faf68ce34c68c19892c700c38e81da8c7c SHA512 684ffde7d98c73349b386c94de3d9fc09631a78c5d74e37e6dfd90fbb0c94decc529f56b1eba1559ce9932b16083f88e6495ff6cdf071b32a23028e9db47cc3d |
23 |
DIST salt-2017.7.7.tar.gz 11131480 BLAKE2B ea01c8894433cf96697c830d58184bfefca52dcd1be9b1c398270acc229886eeb41edf83d1498fc500f23209fc4e56ba8471da88383bd4c1a9338262423477fb SHA512 01cba364e2dcb5021b2b3b738462645c84332bbf31c0fa82f017fc583a097dccde308fd86be54d2b429921f34c89a4a40b942385c3bc139eb11753d155664063 |
24 |
DIST salt-2018.3.2.tar.gz 12996445 BLAKE2B 8411fb0891e23ce8e35157662a0a45c0c5b13b62f3fd21cc4bbe5152f923a98b27cb5bee4fb8cb3e6ec5c9daed1afa27baf4b570b94f9f40eddc0891f72829e9 SHA512 142ebe13638d7e6dd0aecc9f0325002d30e115fe8688f5f74cbeb7ff21020327d65ded0dcd845e55362b97568b696887fa22243d66d5eadef65f97152d4775d3 |
25 |
|
26 |
diff --git a/app-admin/salt/salt-2017.7.5.ebuild b/app-admin/salt/salt-2017.7.5.ebuild |
27 |
deleted file mode 100644 |
28 |
index 90c568f5533..00000000000 |
29 |
--- a/app-admin/salt/salt-2017.7.5.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,154 +0,0 @@ |
32 |
-# Copyright 1999-2018 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/msgpack-0.5.5[${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 |
- <www-servers/tornado-5.0[${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 |
- || ( |
86 |
- dev-python/pycryptodome[${PYTHON_USEDEP}] |
87 |
- >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] |
88 |
- ) |
89 |
- ) |
90 |
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
91 |
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
92 |
- portage? ( |
93 |
- || ( |
94 |
- sys-apps/portage[${PYTHON_USEDEP}] |
95 |
- sys-apps/portage-mgorny[${PYTHON_USEDEP}] |
96 |
- ) |
97 |
- ) |
98 |
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
99 |
- mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) |
100 |
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
101 |
- selinux? ( sec-policy/selinux-salt ) |
102 |
- timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) |
103 |
- nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) |
104 |
- neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) |
105 |
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
106 |
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) |
107 |
- vim-syntax? ( app-vim/salt-vim )" |
108 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
109 |
- test? ( |
110 |
- dev-python/pytest-salt[${PYTHON_USEDEP}] |
111 |
- dev-python/psutil[${PYTHON_USEDEP}] |
112 |
- dev-python/pytest[${PYTHON_USEDEP}] |
113 |
- dev-python/pip[${PYTHON_USEDEP}] |
114 |
- dev-python/virtualenv[${PYTHON_USEDEP}] |
115 |
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] |
116 |
- dev-python/timelib[${PYTHON_USEDEP}] |
117 |
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
118 |
- !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] ) |
119 |
- >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
120 |
- >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] |
121 |
- >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] |
122 |
- ${RDEPEND} |
123 |
- )" |
124 |
- |
125 |
-DOCS=( README.rst AUTHORS ) |
126 |
- |
127 |
-REQUIRED_USE="|| ( raet zeromq )" |
128 |
-RESTRICT="x86? ( test )" |
129 |
- |
130 |
-PATCHES=( |
131 |
- "${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch" |
132 |
- "${FILESDIR}/${PN}-2017.7.3-tests.patch" |
133 |
-) |
134 |
- |
135 |
-python_prepare() { |
136 |
- rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die |
137 |
- rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die |
138 |
- rm tests/unit/states/test_boto_vpc.py || die |
139 |
- rm tests/unit/modules/test_kubernetes.py || die |
140 |
- # allow the use of the renamed msgpack |
141 |
- sed -i '/^msgpack/d' requirements/base.txt || die |
142 |
-} |
143 |
- |
144 |
-python_install_all() { |
145 |
- local svc |
146 |
- USE_SETUPTOOLS=1 distutils-r1_python_install_all |
147 |
- |
148 |
- for svc in minion master syndic api; do |
149 |
- newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} |
150 |
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
151 |
- systemd_dounit "${FILESDIR}"/salt-${svc}.service |
152 |
- done |
153 |
- |
154 |
- insinto /etc/${PN} |
155 |
- doins -r conf/* |
156 |
-} |
157 |
- |
158 |
-python_test() { |
159 |
- local tempdir |
160 |
- # testsuite likes lots of files |
161 |
- ulimit -n 3072 || die |
162 |
- |
163 |
- # ${T} is too long a path for the tests to work |
164 |
- tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" |
165 |
- mkdir "${T}/$(basename "${tempdir}")" |
166 |
- mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die |
167 |
- |
168 |
- ( |
169 |
- cleanup() { |
170 |
- rm -f "${tempdir}" |
171 |
- rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die |
172 |
- } |
173 |
- |
174 |
- trap cleanup EXIT |
175 |
- |
176 |
- addwrite "${tempdir}" |
177 |
- ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" |
178 |
- |
179 |
- USE_SETUPTOOLS=1 SHELL="/bin/bash" \ |
180 |
- TMPDIR="${tempdir}" \ |
181 |
- ${EPYTHON} tests/runtests.py \ |
182 |
- --unit-tests --no-report --verbose |
183 |
- |
184 |
- ) || die "testing failed" |
185 |
-} |