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: Wed, 02 Dec 2015 00:31:16
Message-Id: 1449016243.9faa2e03d55a3c309ddaeba19b3b5c64c486e575.chutzpah@gentoo
1 commit: 9faa2e03d55a3c309ddaeba19b3b5c64c486e575
2 Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 2 00:30:43 2015 +0000
4 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 2 00:30:43 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9faa2e03
7
8 app-admin/salt: clean up version 2015.8.2
9
10 Package-Manager: portage-2.2.26
11
12 app-admin/salt/Manifest | 1 -
13 app-admin/salt/salt-2015.8.2.ebuild | 134 ------------------------------------
14 2 files changed, 135 deletions(-)
15
16 diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
17 index fff36b4..ee40247 100644
18 --- a/app-admin/salt/Manifest
19 +++ b/app-admin/salt/Manifest
20 @@ -1,6 +1,5 @@
21 DIST salt-2015.5.6.tar.gz 5564414 SHA256 4fe478132ce84076b3e424cdd217443766d83ac40fa0ec0e914ca46111971c38 SHA512 6f091b2de8d5f949eb8df8d5173bc122b971a3966b3f4fa55209906dba83b744a72b24e40ee1b0b4dc0a51d740bc336e10798a310da3544e36d4d8585934ac11 WHIRLPOOL 2d25cfada4dab07e82dad6542ac8c290d55ca493fe90186af4b1f78b3684dcb7c9d95eab4a0fe22a0c82cb8b31e8176cc750ebab5304927bbbc7f2a2545ebc8b
22 DIST salt-2015.5.8.tar.gz 5741097 SHA256 07c3eb054ef214c17481fed1262a5e4fd3c429df3058b504eb2cfc36ce4ad2fc SHA512 969cfdfb82f40957d1fa923a4640596cd08529eb9159527365094a3ab0d3e5ad6ff023eea34ad3b1328102f5d03ec8bf7da0958c77dfaee058f5e361a3dc395a WHIRLPOOL bf6960fe18c5181253d428ae678ed3f2e8203cbfcf0d7105d19ac5c6ce1d3c7acdf131062cfca255839c95bfa8f692f6463c9b7d41ad62d80c7a738b758bad71
23 DIST salt-2015.8.1.tar.gz 6527650 SHA256 04133839b4632859ad696a40261d1d14b62902dbcaf7df2f9e5e926c89401c23 SHA512 d882e3a8e70cf19c64e14c35d4c69fa308b8502d01095ce3f8c383a0ee0b70dbefd4b8eda95205f2cba2fe237279e2a3425daf0d5bf66144fb97ca3be0ec162a WHIRLPOOL a1014b8b2b1f815e2f9981cf3c8696b151a4788afb5525021ad94a6d9da774870290ed94fa159b5e3d8f8c73a682417937a1c48b0431d009a21c1e89a32d61f0
24 -DIST salt-2015.8.2.tar.gz 6724537 SHA256 075ab604cff3acc222904d9299ab6a1f86715bd11b043fd931e1cfe386221d27 SHA512 386d3fa36e4e6aaec069148b16d70c601ac1a805044b28630a671a12a45d813a80e058bba45ee664cce3010ef094c5e48736a50b7ba19c7ea2eb0f828bbf0706 WHIRLPOOL b7ad1ddfdfff1e4c679203be831e96b17c4ded3f3aa1ffc705501ff6bf2ef0256a514db90132d64abe554cd643c5f9065cb0ee202034157d8c55947744de4f39
25 DIST salt-2015.8.3.tar.gz 6757678 SHA256 2e9a262789b018f3443513105c0c6ae98934c9bc105a04cf9e5c073ef706218a SHA512 18a2c63d5e54d09468189450557974e47f87d8b7dde52beaae678120da1da1e7aecfff18cf0fdfb63a11cd5f6bab102c229462f0afe5e3e858c0c467761c7121 WHIRLPOOL 5f1e1562904aecf97027688adbe9a2eb1b910065e52a2e20e7bad67fc4e91660e3e1e04612ee3b18d9632f3ff782837336cf1a5d85d771b67071422a3cea9861
26 DIST salt-vim-20141109.tar.gz 3783 SHA256 4989d111ad618ea3f5f7a7046a0ff6ce3ca6bc7f71fca90849f7c38947ab6d9a SHA512 d8d62ee827012e29586cf492f2881ee5870ed058828102f985e8b27300c115e01bb126f89decb15a19a8e206dc54c89856d4c31b3ff5320a36385cb5ed517a63 WHIRLPOOL 98026b2cdcb64665790475e3b20a7de294e5cefb390b414294756cad440bc040d9044ffd37a13f3c93af9be1a1bfd444710ff0df24895db624f49fddd16b5545
27
28 diff --git a/app-admin/salt/salt-2015.8.2.ebuild b/app-admin/salt/salt-2015.8.2.ebuild
29 deleted file mode 100644
30 index 64fd02a..0000000
31 --- a/app-admin/salt/salt-2015.8.2.ebuild
32 +++ /dev/null
33 @@ -1,134 +0,0 @@
34 -# Copyright 1999-2015 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -# $Id$
37 -
38 -EAPI=5
39 -PYTHON_COMPAT=(python2_7)
40 -
41 -inherit eutils systemd distutils-r1
42 -
43 -DESCRIPTION="Salt is a remote execution and configuration manager"
44 -HOMEPAGE="http://saltstack.org/"
45 -
46 -if [[ ${PV} == 9999* ]]; then
47 - inherit git-r3
48 - EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
49 - EGIT_BRANCH="develop"
50 - SRC_URI=""
51 - KEYWORDS=""
52 -else
53 - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
54 - KEYWORDS="~x86 ~amd64"
55 -fi
56 -
57 -LICENSE="Apache-2.0"
58 -SLOT="0"
59 -IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
60 -IUSE+=" openssl profile redis selinux test timelib raet +zeromq vim-syntax"
61 -
62 -RDEPEND="sys-apps/pciutils
63 - dev-python/jinja[${PYTHON_USEDEP}]
64 - >=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
65 - dev-python/pyyaml[${PYTHON_USEDEP}]
66 - dev-python/markupsafe[${PYTHON_USEDEP}]
67 - >=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
68 - dev-python/setuptools[${PYTHON_USEDEP}]
69 - >=www-servers/tornado-4.2.1[${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 - openssl? ( dev-python/pyopenssl[${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 - keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
92 - mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
93 - redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
94 - selinux? ( sec-policy/selinux-salt )
95 - timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
96 - nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
97 - neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
98 - gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
99 - profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
100 - vim-syntax? ( app-vim/salt-vim )"
101 -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
102 - test? (
103 - dev-python/pip[${PYTHON_USEDEP}]
104 - dev-python/virtualenv[${PYTHON_USEDEP}]
105 - dev-python/mock[${PYTHON_USEDEP}]
106 - dev-python/timelib[${PYTHON_USEDEP}]
107 - >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
108 - >=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
109 - >=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}]
110 - ${RDEPEND}
111 - )"
112 -
113 -DOCS=(README.rst AUTHORS)
114 -
115 -REQUIRED_USE="|| ( raet zeromq )"
116 -
117 -PATCHES=(
118 - "${FILESDIR}/${PN}-2015.8.0-remove-pydsl-includes-test.patch"
119 - "${FILESDIR}/${PN}-2015.8.0-remove-buggy-tests.patch"
120 - "${FILESDIR}/${PN}-2015.5.5-auth-tests.patch"
121 - "${FILESDIR}/${PN}-2015.5.5-cron-tests.patch"
122 - "${FILESDIR}/${PN}-2015.5.5-remove-buggy-tests.patch"
123 - "${FILESDIR}/${PN}-2015.8.2-tmpdir.patch"
124 -)
125 -
126 -python_prepare() {
127 - # this test fails because it trys to "pip install distribute"
128 - rm tests/unit/{modules,states}/zcbuildout_test.py \
129 - tests/unit/modules/{rh_ip,win_network,random_org}_test.py
130 -}
131 -
132 -python_install_all() {
133 - local svc
134 - USE_SETUPTOOLS=1 distutils-r1_python_install_all
135 -
136 - for svc in minion master syndic api; do
137 - newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
138 - newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
139 - systemd_dounit "${FILESDIR}"/salt-${svc}.service
140 - done
141 -
142 - insinto /etc/${PN}
143 - doins -r conf/*
144 -}
145 -
146 -python_test() {
147 - local tempdir
148 - # testsuite likes lots of files
149 - ulimit -n 3072
150 -
151 - # ${T} is too long a path for the tests to work
152 - tempdir="$(mktemp -dup /tmp salt-XXX)"
153 - mkdir "${T}/$(basename "${tempdir}")"
154 -
155 - (
156 - cleanup() { rm -f "${tempdir}"; }
157 - trap cleanup EXIT
158 -
159 - addwrite "${tempdir}"
160 - ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
161 -
162 - USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="${tempdir}" \
163 - ${EPYTHON} tests/runtests.py \
164 - --unit-tests --no-report --verbose
165 -
166 - ) || die "testing failed"
167 -}