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, 27 Feb 2018 00:52:49
Message-Id: 1519692757.309af559ed7f4c2de32538fd1cf7df79796b9bae.chutzpah@gentoo
1 commit: 309af559ed7f4c2de32538fd1cf7df79796b9bae
2 Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 27 00:52:37 2018 +0000
4 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 27 00:52:37 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=309af559
7
8 app-admin/salt: Remove old 2017.7.3
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 app-admin/salt/Manifest | 1 -
13 app-admin/salt/salt-2017.7.3.ebuild | 142 ------------------------------------
14 2 files changed, 143 deletions(-)
15
16 diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
17 index 279b0d39af7..5bd7982e91e 100644
18 --- a/app-admin/salt/Manifest
19 +++ b/app-admin/salt/Manifest
20 @@ -1,5 +1,4 @@
21 DIST salt-2016.11.8.tar.gz 10142142 BLAKE2B e6805dae84c0d2e39109c95f603fcb54e1b7d7ff6c27ce555379b69274b3a5d72a1e372081a62c18440deb0955c1ef24a41c5d855a5e622f2ffe51276bd87b25 SHA512 0adc544ca460d13d2adb11b04575bd079a3dad1be3468bea7d32d0b74416b78546e4c86c75551bba09786be8e9810a6e30232414c4f5851cbc9a0fb4b894e0de
22 DIST salt-2016.11.9.tar.gz 10062996 BLAKE2B 5176d04d07a69de21c9c136c201d334614c5675fd78e306a0160fae829b633441cd859f4ba1a0822dfbb9ae716475c53f6eb058187d4acc8a5770dd4ceace577 SHA512 896fd27c111e926e246b51d00b69d41c8f4d25ec0c034c9ff3dc5414f5e93592fd637cdeaecf02b3b98a4e5a7ce478bfda86b15497961078374608d76516593d
23 DIST salt-2017.7.2.tar.gz 11471191 BLAKE2B 0b7184eb4dcb29f2a9603117d1c6fb9c729093c1ff11e18370929ec3fdbfe7bf8c0914f17260c3f613842c23359205a4a84d3e0bcd67476705e50f805bcd7b69 SHA512 959cec404f0fa7c00f78427cba902b8b9c2c0d95016fc70925d8da6d0b97a0284fc034ac92a5c5c313763db4fdcbd1b0391318596b77fe8e0cd1c7e4b3fa928b
24 -DIST salt-2017.7.3.tar.gz 36461646 BLAKE2B 560038b8cd49dadec3f37e3864054f32d6d6544b0f48704e94a05b83f9d6277ce456ee36813a23844b93e338ca117ad0ee605dad49e77816810f1e7244b20b27 SHA512 0452ad6cf2a9bcecd0056f0a6f4871e36bf2abe8c207c93f79e1e9ace608b7ba2158e958a71121f230969ff0b32ffd26f048e369003f844eaf3f4f9dd4b4a19a
25 DIST salt-2017.7.4.tar.gz 11718327 BLAKE2B c197284ee56d039ee7942534af979f0606093ebdf40e0b11a55ca28a2f64c4b584b09b0901d5cb2c350f4ede52636e7927bbed48355d731472970eda5e32632f SHA512 79d7853c2614ed581e441babe6fbb73809816ec53aa47016b5066b771de449d4dcc999927d7e1c92c5ca68c816d27779e34e31ec1408d473a07120d62846de73
26
27 diff --git a/app-admin/salt/salt-2017.7.3.ebuild b/app-admin/salt/salt-2017.7.3.ebuild
28 deleted file mode 100644
29 index f31e0c09a66..00000000000
30 --- a/app-admin/salt/salt-2017.7.3.ebuild
31 +++ /dev/null
32 @@ -1,142 +0,0 @@
33 -# Copyright 1999-2018 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
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 portage 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 - libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
73 - openssl? (
74 - dev-libs/openssl:*[-bindist]
75 - dev-python/pyopenssl[${PYTHON_USEDEP}]
76 - )
77 - raet? (
78 - >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
79 - >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
80 - >=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
81 - )
82 - zeromq? (
83 - >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
84 - >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
85 - )
86 - cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
87 - mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
88 - portage? ( sys-apps/portage[${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/pytest-salt[${PYTHON_USEDEP}]
102 - dev-python/psutil[${PYTHON_USEDEP}]
103 - dev-python/pytest[${PYTHON_USEDEP}]
104 - dev-python/pip[${PYTHON_USEDEP}]
105 - dev-python/virtualenv[${PYTHON_USEDEP}]
106 - dev-python/mock[${PYTHON_USEDEP}]
107 - dev-python/timelib[${PYTHON_USEDEP}]
108 - >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
109 - !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
110 - >=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
111 - >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
112 - >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
113 - ${RDEPEND}
114 - )"
115 -
116 -DOCS=( README.rst AUTHORS )
117 -
118 -REQUIRED_USE="|| ( raet zeromq )"
119 -RESTRICT="x86? ( test )"
120 -
121 -PATCHES=(
122 - "${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch"
123 - "${FILESDIR}/${PN}-2017.7.3-tests.patch"
124 -)
125 -
126 -python_prepare() {
127 - rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
128 - rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
129 - rm tests/unit/states/test_boto_vpc.py || die
130 - rm tests/unit/modules/test_kubernetes.py || die
131 -}
132 -
133 -python_install_all() {
134 - local svc
135 - USE_SETUPTOOLS=1 distutils-r1_python_install_all
136 -
137 - for svc in minion master syndic api; do
138 - newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
139 - newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
140 - systemd_dounit "${FILESDIR}"/salt-${svc}.service
141 - done
142 -
143 - insinto /etc/${PN}
144 - doins -r conf/*
145 -}
146 -
147 -python_test() {
148 - local tempdir
149 - # testsuite likes lots of files
150 - ulimit -n 3072 || die
151 -
152 - # ${T} is too long a path for the tests to work
153 - tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
154 - mkdir "${T}/$(basename "${tempdir}")"
155 - mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
156 -
157 - (
158 - cleanup() {
159 - rm -f "${tempdir}"
160 - rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
161 - }
162 -
163 - trap cleanup EXIT
164 -
165 - addwrite "${tempdir}"
166 - ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
167 -
168 - USE_SETUPTOOLS=1 SHELL="/bin/bash" \
169 - TMPDIR="${tempdir}" \
170 - ${EPYTHON} tests/runtests.py \
171 - --unit-tests --no-report --verbose
172 -
173 - ) || die "testing failed"
174 -}