Gentoo Archives: gentoo-commits

From: Gilles Dartiguelongue <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/files/, app-emulation/cloud-init/
Date: Sat, 01 Dec 2018 17:10:22
Message-Id: 1543684199.a8cac99e095e98bb65382ff941a427eec178d5c8.eva@gentoo
1 commit: a8cac99e095e98bb65382ff941a427eec178d5c8
2 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 1 17:06:27 2018 +0000
4 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 1 17:09:59 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8cac99e
7
8 app-emulation/cloud-init: cleanup old revisions
9
10 Package-Manager: Portage-2.3.52, Repoman-2.3.12
11 Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org>
12
13 app-emulation/cloud-init/Manifest | 2 -
14 app-emulation/cloud-init/cloud-init-0.7.9.ebuild | 94 ----------------------
15 app-emulation/cloud-init/cloud-init-17.1.ebuild | 81 -------------------
16 app-emulation/cloud-init/cloud-init-18.4.ebuild | 84 -------------------
17 .../cloud-init/files/cloud-init-0.7.9-tests.patch | 13 ---
18 5 files changed, 274 deletions(-)
19
20 diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest
21 index 96b57fd0e5e..6a289ecfa8c 100644
22 --- a/app-emulation/cloud-init/Manifest
23 +++ b/app-emulation/cloud-init/Manifest
24 @@ -1,4 +1,2 @@
25 -DIST cloud-init-0.7.9.tar.gz 602188 BLAKE2B c2e2b8538488474cd4674b976f859164f0ab8ed585fc0b59c6e75f23a62fd035b8b76e0700c1e68893fc4a8346b3110ff2b25f13be92ff13eeac0f1ad2405641 SHA512 ee52909f634f51dcf9e1229a8f49faa8c562bf05b69fac108fcc80cb3217f4364a33cf696df015e4dcd7887c68cf6108729850648b4daee07b3d3247ca3cc5b1
26 -DIST cloud-init-17.1.tar.gz 780532 BLAKE2B 10809da2e81d594542d83b2416481c493474cac2e790da25363e631f6dae9edc1e2fd160708121486dd3a2ebd19cfc29d18978cbe7d82eb1aec907762bf7bf0b SHA512 988cae4291c8d6a5bce012b78d651c602c02ad38c3790e9ed9aa7c815ae84c98767718ab9b0d346ddbc9c83cb886d455590128af750183618c0bf0f0c5a79564
27 DIST cloud-init-17.2.tar.gz 810821 BLAKE2B df1a7c1ed1fc48a7801a53bd89839d963debca6abf7f892d61bf7ec9222ab33bf78221e65d79028e0445cac4c5fe1e0c1620d49aea26c036ee17933d9c1893f5 SHA512 ad1c7f6ca9762b70a1f06a6b538032a7de0c5371fd792260d5959df113f4f51509d184b2207ffa23b41f395c1903d551d66aaf2a2ad60af3594cf1f18d1e4a38
28 DIST cloud-init-18.4.tar.gz 965112 BLAKE2B 2879aafedea877e4e406a5e837d100ba65e40c62660621f606e7a189af7b1ec8d98ba2c02ae5d253a0b4587502d3a636dec5c2772c968a9037b47e62a05656b4 SHA512 730aca6406f652f55afc2dd50c49eb6708584e0a96715606bcba05cb7f40e47c256faff1f9748f04674a8f941ec9435801c9ed2ac79adec8a6ef167d6b195103
29
30 diff --git a/app-emulation/cloud-init/cloud-init-0.7.9.ebuild b/app-emulation/cloud-init/cloud-init-0.7.9.ebuild
31 deleted file mode 100644
32 index df1fcce2069..00000000000
33 --- a/app-emulation/cloud-init/cloud-init-0.7.9.ebuild
34 +++ /dev/null
35 @@ -1,94 +0,0 @@
36 -# Copyright 1999-2017 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=6
40 -PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
41 -
42 -inherit distutils-r1 eutils multilib systemd
43 -
44 -DESCRIPTION="cloud initialisation magic"
45 -HOMEPAGE="https://launchpad.net/cloud-init"
46 -SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
47 -
48 -LICENSE="GPL-3"
49 -SLOT="0"
50 -KEYWORDS="amd64 x86"
51 -IUSE="test"
52 -
53 -CDEPEND="
54 - dev-python/six[${PYTHON_USEDEP}]
55 - dev-python/configobj[${PYTHON_USEDEP}]
56 - dev-python/jinja[${PYTHON_USEDEP}]
57 - dev-python/jsonpatch[${PYTHON_USEDEP}]
58 - dev-python/oauthlib[${PYTHON_USEDEP}]
59 - dev-python/prettytable[${PYTHON_USEDEP}]
60 - dev-python/pyserial[${PYTHON_USEDEP}]
61 - dev-python/pyyaml[${PYTHON_USEDEP}]
62 - dev-python/requests[${PYTHON_USEDEP}]
63 - dev-python/cheetah[$(python_gen_usedep 'python2_7')]
64 -"
65 -DEPEND="
66 - dev-python/setuptools[${PYTHON_USEDEP}]
67 - test? (
68 - ${CDEPEND}
69 - >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
70 - dev-python/mock[${PYTHON_USEDEP}]
71 - dev-python/nose[${PYTHON_USEDEP}]
72 - dev-python/unittest2[${PYTHON_USEDEP}]
73 - dev-python/pep8[${PYTHON_USEDEP}]
74 - dev-python/flake8[${PYTHON_USEDEP}]
75 - dev-python/hacking[${PYTHON_USEDEP}]
76 - )
77 -"
78 -RDEPEND="
79 - ${CDEPEND}
80 - net-analyzer/macchanger
81 - sys-apps/iproute2
82 - sys-fs/growpart
83 - virtual/logger
84 -"
85 -
86 -PATCHES=( "${FILESDIR}/cloud-init-0.7.9-tests.patch" )
87 -
88 -python_prepare_all() {
89 - sed -i '/^argparse/d' requirements.txt || die
90 - sed -i '/^hacking/d' test-requirements.txt || die
91 - distutils-r1_python_prepare_all
92 -}
93 -
94 -python_test() {
95 - emake test
96 -}
97 -
98 -python_install() {
99 - distutils-r1_python_install "--init-system=sysvinit_openrc"
100 -}
101 -
102 -python_install_all() {
103 - keepdir /etc/cloud
104 -
105 - distutils-r1_python_install_all
106 -
107 - chmod +x "${D}"/etc/init.d/cloud-config
108 - chmod +x "${D}"/etc/init.d/cloud-final
109 - chmod +x "${D}"/etc/init.d/cloud-init
110 - chmod +x "${D}"/etc/init.d/cloud-init-local
111 -
112 - insinto /etc/cloud/templates
113 - doins "${FILESDIR}/hosts.gentoo.tmpl"
114 - insinto /etc/cloud
115 - doins "${FILESDIR}/cloud.cfg"
116 -
117 - systemd_dounit "${S}"/systemd/cloud-config.service
118 - systemd_dounit "${S}"/systemd/cloud-config.target
119 - systemd_dounit "${S}"/systemd/cloud-final.service
120 - systemd_dounit "${S}"/systemd/cloud-init-local.service
121 - systemd_dounit "${S}"/systemd/cloud-init.service
122 -}
123 -
124 -pkg_postinst() {
125 - elog "cloud-init-local needs to be run in the boot runlevel because it"
126 - elog "modifies services in the default runlevel. When a runlevel is started"
127 - elog "it is cached, so modifications that happen to the current runlevel"
128 - elog "while you are in it are not acted upon."
129 -}
130
131 diff --git a/app-emulation/cloud-init/cloud-init-17.1.ebuild b/app-emulation/cloud-init/cloud-init-17.1.ebuild
132 deleted file mode 100644
133 index 193f0cbe21f..00000000000
134 --- a/app-emulation/cloud-init/cloud-init-17.1.ebuild
135 +++ /dev/null
136 @@ -1,81 +0,0 @@
137 -# Copyright 1999-2017 Gentoo Foundation
138 -# Distributed under the terms of the GNU General Public License v2
139 -
140 -EAPI=6
141 -PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
142 -
143 -inherit distutils-r1 eutils multilib systemd
144 -
145 -DESCRIPTION="cloud initialisation magic"
146 -HOMEPAGE="https://launchpad.net/cloud-init"
147 -SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
148 -
149 -LICENSE="GPL-3"
150 -SLOT="0"
151 -KEYWORDS="~amd64 ~x86"
152 -IUSE="test"
153 -RESTRICT="test"
154 -
155 -# remove pretytable in 17.2
156 -CDEPEND="
157 - dev-python/jinja[${PYTHON_USEDEP}]
158 - dev-python/oauthlib[${PYTHON_USEDEP}]
159 - dev-python/pyserial[${PYTHON_USEDEP}]
160 - >=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
161 - >=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
162 - dev-python/pyyaml[${PYTHON_USEDEP}]
163 - dev-python/requests[${PYTHON_USEDEP}]
164 - dev-python/jsonpatch[${PYTHON_USEDEP}]
165 - dev-python/jsonschema[${PYTHON_USEDEP}]
166 - dev-python/six[${PYTHON_USEDEP}]
167 -"
168 -DEPEND="
169 - dev-python/setuptools[${PYTHON_USEDEP}]
170 - test? (
171 - ${CDEPEND}
172 - >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
173 - dev-python/mock[${PYTHON_USEDEP}]
174 - dev-python/nose[${PYTHON_USEDEP}]
175 - dev-python/unittest2[${PYTHON_USEDEP}]
176 - dev-python/coverage[${PYTHON_USEDEP}]
177 - dev-python/contextlib2[${PYTHON_USEDEP}]
178 - )
179 -"
180 -RDEPEND="
181 - ${CDEPEND}
182 - net-analyzer/macchanger
183 - sys-apps/iproute2
184 - sys-fs/growpart
185 - virtual/logger
186 -"
187 -
188 -PATCHES=( )
189 -
190 -python_test() {
191 - emake test
192 -}
193 -
194 -python_install() {
195 - distutils-r1_python_install "--init-system=sysvinit_openrc,systemd"
196 -}
197 -
198 -python_install_all() {
199 - keepdir /etc/cloud
200 -
201 - distutils-r1_python_install_all
202 -
203 - # installs as non-executable
204 - chmod +x "${D}"/etc/init.d/*
205 -
206 - insinto /etc/cloud/templates
207 - doins "${FILESDIR}/hosts.gentoo.tmpl"
208 - insinto /etc/cloud
209 - doins "${FILESDIR}/cloud.cfg"
210 -}
211 -
212 -pkg_postinst() {
213 - elog "cloud-init-local needs to be run in the boot runlevel because it"
214 - elog "modifies services in the default runlevel. When a runlevel is started"
215 - elog "it is cached, so modifications that happen to the current runlevel"
216 - elog "while you are in it are not acted upon."
217 -}
218
219 diff --git a/app-emulation/cloud-init/cloud-init-18.4.ebuild b/app-emulation/cloud-init/cloud-init-18.4.ebuild
220 deleted file mode 100644
221 index 331c102da1a..00000000000
222 --- a/app-emulation/cloud-init/cloud-init-18.4.ebuild
223 +++ /dev/null
224 @@ -1,84 +0,0 @@
225 -# Copyright 1999-2018 Gentoo Authors
226 -# Distributed under the terms of the GNU General Public License v2
227 -
228 -EAPI=6
229 -PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
230 -
231 -inherit distutils-r1
232 -
233 -DESCRIPTION="Cloud instance initialisation magic"
234 -HOMEPAGE="https://launchpad.net/cloud-init"
235 -SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
236 -
237 -LICENSE="GPL-3"
238 -SLOT="0"
239 -KEYWORDS="~amd64 ~x86"
240 -IUSE="test"
241 -
242 -# remove prettytable in 17.2
243 -CDEPEND="
244 - dev-python/jinja[${PYTHON_USEDEP}]
245 - dev-python/oauthlib[${PYTHON_USEDEP}]
246 - dev-python/pyserial[${PYTHON_USEDEP}]
247 - >=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
248 - dev-python/pyyaml[${PYTHON_USEDEP}]
249 - dev-python/requests[${PYTHON_USEDEP}]
250 - dev-python/jsonpatch[${PYTHON_USEDEP}]
251 - dev-python/jsonschema[${PYTHON_USEDEP}]
252 - dev-python/six[${PYTHON_USEDEP}]
253 -"
254 -DEPEND="
255 - dev-python/setuptools[${PYTHON_USEDEP}]
256 - test? (
257 - ${CDEPEND}
258 - >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
259 - dev-python/mock[${PYTHON_USEDEP}]
260 - dev-python/nose[${PYTHON_USEDEP}]
261 - dev-python/unittest2[${PYTHON_USEDEP}]
262 - dev-python/coverage[${PYTHON_USEDEP}]
263 - dev-python/contextlib2[${PYTHON_USEDEP}]
264 - )
265 -"
266 -RDEPEND="
267 - ${CDEPEND}
268 - net-analyzer/macchanger
269 - sys-apps/iproute2
270 - sys-fs/growpart
271 - virtual/logger
272 -"
273 -
274 -PATCHES=(
275 - "${FILESDIR}"/${P}-fix-packages-module.patch
276 - "${FILESDIR}"/${P}-gentoo-support-upstream-templates.patch
277 -)
278 -
279 -src_prepare() {
280 - # Fix location of documentation installation
281 - sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" setup.py || die
282 - distutils-r1_src_prepare
283 -}
284 -
285 -python_test() {
286 - # Do not use Makefile target as it does not setup environment correclty
287 - esetup.py nosetests -v --where cloudinit --where tests/unittests || die
288 -}
289 -
290 -python_install() {
291 - distutils-r1_python_install --init-system=sysvinit_openrc,systemd --distro gentoo
292 -}
293 -
294 -python_install_all() {
295 - keepdir /etc/cloud
296 -
297 - distutils-r1_python_install_all
298 -
299 - # installs as non-executable
300 - chmod +x "${D}"/etc/init.d/*
301 -}
302 -
303 -pkg_postinst() {
304 - elog "cloud-init-local needs to be run in the boot runlevel because it"
305 - elog "modifies services in the default runlevel. When a runlevel is started"
306 - elog "it is cached, so modifications that happen to the current runlevel"
307 - elog "while you are in it are not acted upon."
308 -}
309
310 diff --git a/app-emulation/cloud-init/files/cloud-init-0.7.9-tests.patch b/app-emulation/cloud-init/files/cloud-init-0.7.9-tests.patch
311 deleted file mode 100644
312 index b80a60a47b7..00000000000
313 --- a/app-emulation/cloud-init/files/cloud-init-0.7.9-tests.patch
314 +++ /dev/null
315 @@ -1,13 +0,0 @@
316 -diff --git a/setup.py b/setup.py
317 -index bbadd7b..1578a3d 100755
318 ---- a/setup.py
319 -+++ b/setup.py
320 -@@ -205,7 +207,7 @@ setuptools.setup(
321 - author='Scott Moser',
322 - author_email='scott.moser@×××××××××.com',
323 - url='http://launchpad.net/cloud-init/',
324 -- packages=setuptools.find_packages(exclude=['tests']),
325 -+ packages=setuptools.find_packages(exclude=['tests.*', 'tests']),
326 - scripts=['tools/cloud-init-per'],
327 - license='GPLv3',
328 - data_files=data_files,