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