Gentoo Archives: gentoo-commits

From: Patrick McLean <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/salt/
Date: Tue, 03 Jul 2018 21:18:45
Message-Id: 1530652695.958ead6822297dc287e7e078686fc4b83d24f44d.chutzpah@gentoo
1 commit: 958ead6822297dc287e7e078686fc4b83d24f44d
2 Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 3 20:28:35 2018 +0000
4 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 3 21:18:15 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=958ead68
7
8 app-admin/salt: Remove 2018.3.0
9
10 Package-Manager: Portage-2.3.41, Repoman-2.3.9
11
12 app-admin/salt/Manifest | 1 -
13 app-admin/salt/salt-2018.3.0.ebuild | 158 ------------------------------------
14 2 files changed, 159 deletions(-)
15
16 diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
17 index 643d0900419..9d529d359fe 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-2018.3.0.tar.gz 13448567 BLAKE2B 9048f9e507ded238bfd54d0aabfefb56522b20ba2479c3bf5aefc47fff0b6ce516709ad6e9109441941a60596d4f06a43c1448a149225f3f87715327a190d313 SHA512 3d64a4d12d4ff7effe644b682b138d8f49fd00523e9cfe3e80bebff9c944a089fb41cbac92e63139633425f49c1eebeb99145290a0bdd1b4f306da86abe9b2e5
24 DIST salt-2018.3.2.tar.gz 12996445 BLAKE2B 8411fb0891e23ce8e35157662a0a45c0c5b13b62f3fd21cc4bbe5152f923a98b27cb5bee4fb8cb3e6ec5c9daed1afa27baf4b570b94f9f40eddc0891f72829e9 SHA512 142ebe13638d7e6dd0aecc9f0325002d30e115fe8688f5f74cbeb7ff21020327d65ded0dcd845e55362b97568b696887fa22243d66d5eadef65f97152d4775d3
25
26 diff --git a/app-admin/salt/salt-2018.3.0.ebuild b/app-admin/salt/salt-2018.3.0.ebuild
27 deleted file mode 100644
28 index a9d68684042..00000000000
29 --- a/app-admin/salt/salt-2018.3.0.ebuild
30 +++ /dev/null
31 @@ -1,158 +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/libnacl[${PYTHON_USEDEP}]
62 - >=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
63 - <dev-python/msgpack-0.5.5[${PYTHON_USEDEP}]
64 - dev-python/pyyaml[${PYTHON_USEDEP}]
65 - dev-python/markupsafe[${PYTHON_USEDEP}]
66 - >=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
67 - dev-python/setuptools[${PYTHON_USEDEP}]
68 - >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
69 - <www-servers/tornado-5.0[${PYTHON_USEDEP}]
70 - virtual/python-futures[${PYTHON_USEDEP}]
71 - libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
72 - mako? ( dev-python/mako[${PYTHON_USEDEP}] )
73 - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
74 - libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
75 - openssl? (
76 - dev-libs/openssl:*[-bindist]
77 - dev-python/pyopenssl[${PYTHON_USEDEP}]
78 - )
79 - raet? (
80 - >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
81 - >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
82 - >=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
83 - )
84 - zeromq? (
85 - >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
86 - || (
87 - dev-python/pycryptodome[${PYTHON_USEDEP}]
88 - >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
89 - )
90 - )
91 - cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
92 - mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
93 - portage? (
94 - || (
95 - sys-apps/portage[${PYTHON_USEDEP}]
96 - sys-apps/portage-mgorny[${PYTHON_USEDEP}]
97 - )
98 - )
99 - keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
100 - mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
101 - redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
102 - selinux? ( sec-policy/selinux-salt )
103 - timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
104 - nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
105 - neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
106 - gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
107 - profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
108 - vim-syntax? ( app-vim/salt-vim )"
109 -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
110 - test? (
111 - dev-python/pytest-salt[${PYTHON_USEDEP}]
112 - dev-python/psutil[${PYTHON_USEDEP}]
113 - dev-python/pytest[${PYTHON_USEDEP}]
114 - dev-python/pytest-catchlog[${PYTHON_USEDEP}]
115 - dev-python/pip[${PYTHON_USEDEP}]
116 - dev-python/virtualenv[${PYTHON_USEDEP}]
117 - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
118 - dev-python/timelib[${PYTHON_USEDEP}]
119 - >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
120 - !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
121 - >=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
122 - >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
123 - >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
124 - ${RDEPEND}
125 - )"
126 -
127 -DOCS=( README.rst AUTHORS )
128 -
129 -REQUIRED_USE="|| ( raet zeromq )"
130 -RESTRICT="x86? ( test )"
131 -
132 -PATCHES=(
133 - "${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch"
134 - "${FILESDIR}/${PN}-2017.7.3-tests.patch"
135 -)
136 -
137 -python_prepare() {
138 - # remove tests with external dependencies that may not be available
139 - rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
140 - rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
141 - rm tests/unit/states/test_boto_vpc.py || die
142 - rm tests/unit/modules/test_{kubernetes,vsphere}.py || die
143 -
144 - # allow the use of the renamed msgpack
145 - sed -i '/^msgpack/d' requirements/base.txt || die
146 -}
147 -
148 -python_install_all() {
149 - local svc
150 - USE_SETUPTOOLS=1 distutils-r1_python_install_all
151 -
152 - for svc in minion master syndic api; do
153 - newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
154 - newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
155 - systemd_dounit "${FILESDIR}"/salt-${svc}.service
156 - done
157 -
158 - insinto /etc/${PN}
159 - doins -r conf/*
160 -}
161 -
162 -python_test() {
163 - local tempdir
164 - # testsuite likes lots of files
165 - ulimit -n 3072 || die
166 -
167 - # ${T} is too long a path for the tests to work
168 - tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
169 - mkdir "${T}/$(basename "${tempdir}")"
170 - mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
171 -
172 - (
173 - cleanup() {
174 - rm -f "${tempdir}"
175 - rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
176 - }
177 -
178 - trap cleanup EXIT
179 -
180 - addwrite "${tempdir}"
181 - ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
182 -
183 - USE_SETUPTOOLS=1 SHELL="/bin/bash" \
184 - TMPDIR="${tempdir}" \
185 - ${EPYTHON} tests/runtests.py \
186 - --unit-tests --no-report --verbose
187 -
188 - ) || die "testing failed"
189 -}