Gentoo Archives: gentoo-commits

From: "Patrick McLean (chutzpah)" <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/ganeti: ChangeLog ganeti-2.10.5-r3.ebuild ganeti-2.4.5-r1.ebuild ganeti-2.11.2-r3.ebuild ganeti-2.6.2.ebuild ganeti-2.11.2-r1.ebuild ganeti-1.2.9.ebuild ganeti-2.10.5-r2.ebuild ganeti-2.1.8.ebuild ganeti-2.11.2-r2.ebuild ganeti-2.5.2-r2.ebuild ganeti-2.0.6.ebuild ganeti-2.2.2.ebuild ganeti-2.3.1.ebuild
Date: Wed, 02 Jul 2014 23:57:29
Message-Id: 20140702235725.EBAD92004E@flycatcher.gentoo.org
1 chutzpah 14/07/02 23:57:25
2
3 Modified: ChangeLog ganeti-2.4.5-r1.ebuild
4 Added: ganeti-2.10.5-r3.ebuild ganeti-2.11.2-r3.ebuild
5 Removed: ganeti-2.6.2.ebuild ganeti-2.11.2-r1.ebuild
6 ganeti-1.2.9.ebuild ganeti-2.10.5-r2.ebuild
7 ganeti-2.1.8.ebuild ganeti-2.11.2-r2.ebuild
8 ganeti-2.5.2-r2.ebuild ganeti-2.0.6.ebuild
9 ganeti-2.2.2.ebuild ganeti-2.3.1.ebuild
10 Log:
11 Revision bump, make failure to start ganeti-kvmd not fatal since it fails if user shutdowns are disabled. Clean out older versions.
12
13 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF)
14
15 Revision Changes Path
16 1.92 app-emulation/ganeti/ChangeLog
17
18 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/ChangeLog?rev=1.92&view=markup
19 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/ChangeLog?rev=1.92&content-type=text/plain
20 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/ChangeLog?r1=1.91&r2=1.92
21
22 Index: ChangeLog
23 ===================================================================
24 RCS file: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v
25 retrieving revision 1.91
26 retrieving revision 1.92
27 diff -u -r1.91 -r1.92
28 --- ChangeLog 18 Jun 2014 18:50:58 -0000 1.91
29 +++ ChangeLog 2 Jul 2014 23:57:25 -0000 1.92
30 @@ -1,6 +1,17 @@
31 # ChangeLog for app-emulation/ganeti
32 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
33 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.91 2014/06/18 18:50:58 chutzpah Exp $
34 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.92 2014/07/02 23:57:25 chutzpah Exp $
35 +
36 +*ganeti-2.11.2-r3 (02 Jul 2014)
37 +*ganeti-2.10.5-r3 (02 Jul 2014)
38 +
39 + 02 Jul 2014; Patrick McLean <chutzpah@g.o> -ganeti-1.2.9.ebuild,
40 + -ganeti-2.0.6.ebuild, -ganeti-2.1.8.ebuild, -ganeti-2.2.2.ebuild,
41 + -ganeti-2.3.1.ebuild, -ganeti-2.5.2-r2.ebuild, -ganeti-2.6.2.ebuild,
42 + -ganeti-2.10.5-r2.ebuild, +ganeti-2.10.5-r3.ebuild, -ganeti-2.11.2-r1.ebuild,
43 + -ganeti-2.11.2-r2.ebuild, +ganeti-2.11.2-r3.ebuild, files/ganeti.initd-r3:
44 + Revision bump, make failure to start ganeti-kvmd not fatal since it fails if
45 + user shutdowns are disabled. Clean out older versions.
46
47 *ganeti-2.11.2-r2 (18 Jun 2014)
48
49
50
51
52 1.7 app-emulation/ganeti/ganeti-2.4.5-r1.ebuild
53
54 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/ganeti-2.4.5-r1.ebuild?rev=1.7&view=markup
55 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/ganeti-2.4.5-r1.ebuild?rev=1.7&content-type=text/plain
56 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/ganeti-2.4.5-r1.ebuild?r1=1.6&r2=1.7
57
58 Index: ganeti-2.4.5-r1.ebuild
59 ===================================================================
60 RCS file: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.4.5-r1.ebuild,v
61 retrieving revision 1.6
62 retrieving revision 1.7
63 diff -u -r1.6 -r1.7
64 --- ganeti-2.4.5-r1.ebuild 12 Sep 2013 22:29:37 -0000 1.6
65 +++ ganeti-2.4.5-r1.ebuild 2 Jul 2014 23:57:25 -0000 1.7
66 @@ -1,6 +1,6 @@
67 -# Copyright 1999-2013 Gentoo Foundation
68 +# Copyright 1999-2014 Gentoo Foundation
69 # Distributed under the terms of the GNU General Public License v2
70 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.4.5-r1.ebuild,v 1.6 2013/09/12 22:29:37 mgorny Exp $
71 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.4.5-r1.ebuild,v 1.7 2014/07/02 23:57:25 chutzpah Exp $
72
73 EAPI=4
74
75
76
77
78 1.1 app-emulation/ganeti/ganeti-2.10.5-r3.ebuild
79
80 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/ganeti-2.10.5-r3.ebuild?rev=1.1&view=markup
81 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/ganeti-2.10.5-r3.ebuild?rev=1.1&content-type=text/plain
82
83 Index: ganeti-2.10.5-r3.ebuild
84 ===================================================================
85 # Copyright 1999-2014 Gentoo Foundation
86 # Distributed under the terms of the GNU General Public License v2
87 # $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.10.5-r3.ebuild,v 1.1 2014/07/02 23:57:25 chutzpah Exp $
88
89 EAPI=5
90 PYTHON_COMPAT=(python2_{6,7})
91 use test && PYTHON_REQ_USE="ipv6"
92
93 inherit eutils confutils autotools bash-completion-r1 python-single-r1 versionator
94
95 MY_PV="${PV/_rc/~rc}"
96 #MY_PV="${PV/_beta/~beta}"
97 MY_P="${PN}-${MY_PV}"
98 SERIES="$(get_version_component_range 1-2)"
99
100 if [[ ${PV} == "9999" ]] ; then
101 EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
102 inherit git-2
103 KEYWORDS=""
104 # you will need to pull in the haskell overlay for pandoc
105 GIT_DEPEND="app-text/pandoc
106 dev-python/docutils
107 dev-python/sphinx
108 media-libs/gd[fontconfig,jpeg,png,truetype]
109 media-gfx/graphviz
110 media-fonts/urw-fonts"
111 else
112 SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${P}.tar.gz"
113 KEYWORDS="~amd64 ~x86"
114 fi
115
116 DESCRIPTION="Ganeti is a virtual server management software tool"
117 HOMEPAGE="http://code.google.com/p/ganeti/"
118
119 LICENSE="GPL-2"
120 SLOT="0"
121 IUSE="kvm xen lxc drbd htools syslog ipv6 haskell-daemons rbd test"
122 REQUIRED_USE="|| ( kvm xen lxc )"
123
124 S="${WORKDIR}/${MY_P}"
125
126 HASKELL_DEPS=">=dev-lang/ghc-6.12:0=
127 dev-haskell/json:0=
128 dev-haskell/curl:0=
129 dev-haskell/network:0=
130 dev-haskell/parallel
131 dev-haskell/hslogger:0=
132 dev-haskell/utf8-string:0=
133 dev-haskell/deepseq:0=
134 dev-haskell/attoparsec:0=
135 dev-haskell/crypto:0="
136
137 DEPEND="xen? ( >=app-emulation/xen-3.0 )
138 kvm? ( app-emulation/qemu )
139 lxc? ( app-emulation/lxc )
140 drbd? ( <sys-cluster/drbd-8.5 )
141 rbd? ( sys-cluster/ceph )
142 ipv6? ( net-misc/ndisc6 )
143 haskell-daemons? (
144 ${HASKELL_DEPS}
145 dev-haskell/text:0=
146 dev-haskell/hinotify:0=
147 dev-haskell/regex-pcre-builtin:0=
148 dev-haskell/vector:0=
149 )
150 dev-libs/openssl
151 dev-python/paramiko[${PYTHON_USEDEP}]
152 dev-python/pyopenssl[${PYTHON_USEDEP}]
153 dev-python/pyparsing[${PYTHON_USEDEP}]
154 dev-python/pycurl[${PYTHON_USEDEP}]
155 dev-python/pyinotify[${PYTHON_USEDEP}]
156 dev-python/simplejson[${PYTHON_USEDEP}]
157 dev-python/ipaddr[${PYTHON_USEDEP}]
158 dev-python/bitarray[${PYTHON_USEDEP}]
159 net-analyzer/arping
160 net-analyzer/fping
161 net-misc/bridge-utils
162 net-misc/curl[ssl]
163 net-misc/openssh
164 net-misc/socat
165 sys-apps/iproute2
166 sys-fs/lvm2
167 >=sys-apps/baselayout-2.0
168 ${PYTHON_DEPS}
169 ${GIT_DEPEND}"
170 RDEPEND="${DEPEND}
171 !app-emulation/ganeti-htools"
172 DEPEND+="${HASKELL_DEPS}
173 sys-devel/m4
174 test? (
175 dev-python/mock
176 dev-python/pyyaml
177 dev-haskell/test-framework:0=
178 dev-haskell/test-framework-hunit:0=
179 dev-haskell/test-framework-quickcheck2:0=
180 dev-haskell/temporary:0=
181 sys-apps/fakeroot
182 )"
183
184 PATCHES=(
185 "${FILESDIR}/${PN}-2.6-fix-args.patch"
186 "${FILESDIR}/${PN}-2.6-add-pgrep.patch"
187 "${FILESDIR}/${PN}-2.7-fix-tests.patch"
188 "${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
189 "${FILESDIR}/${PN}-2.9-regex-builtin.patch"
190 "${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
191 "${FILESDIR}/${PN}-2.10-rundir.patch"
192 "${FILESDIR}/${PN}-lockdir.patch"
193 )
194
195 pkg_setup () {
196 confutils_use_depend_all haskell-daemons htools
197 python-single-r1_pkg_setup
198 }
199
200 src_prepare() {
201 epatch "${PATCHES[@]}"
202 [[ ${PV} == "9999" ]] && ./autogen.sh
203 rm autotools/missing
204 eautoreconf
205 }
206
207 src_configure () {
208 econf --localstatedir=/var \
209 --sharedstatedir=/var \
210 --disable-symlinks \
211 --docdir=/usr/share/doc/${P} \
212 --with-ssh-initscript=/etc/init.d/sshd \
213 --with-export-dir=/var/lib/ganeti-storage/export \
214 --with-os-search-path=/usr/share/${PN}/os \
215 $(use_enable syslog) \
216 $(usex kvm '--with-kvm-path=' '' '/usr/bin/qemu-kvm' '') \
217 $(usex haskell-daemons "--enable-confd=haskell" '' '' '')
218 }
219
220 src_install () {
221 emake V=1 DESTDIR="${D}" install || die "emake install failed"
222
223 newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
224 newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
225
226 use kvm && newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
227 use kvm && newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
228 newbashcomp doc/examples/bash_completion ganeti
229 dodoc INSTALL UPGRADE NEWS README doc/*.rst
230 dohtml -r doc/html/*
231 rm -rf "${D}"/{usr/share/doc/${PN},run}
232
233 docinto examples
234 dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
235
236 docinto examples/hooks
237 dodoc doc/examples/hooks/{ipsec,ethers}
238
239 insinto /etc/cron.d
240 newins doc/examples/ganeti.cron ${PN}
241
242 insinto /etc/logrotate.d
243 newins doc/examples/ganeti.logrotate ${PN}
244
245 python_fix_shebang "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
246
247 keepdir /var/{lib,log}/${PN}/
248 keepdir /usr/share/${PN}/${SERIES}/os/
249 keepdir /var/lib/ganeti-storage/{export,file,shared}/
250
251 dosym ${SERIES} "/usr/share/${PN}/default"
252 dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
253
254 python_fix_shebang "${ED}"
255 }
256
257 src_test () {
258 emake check || die "emake check failed"
259 }
260
261
262
263 1.1 app-emulation/ganeti/ganeti-2.11.2-r3.ebuild
264
265 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/ganeti-2.11.2-r3.ebuild?rev=1.1&view=markup
266 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/ganeti-2.11.2-r3.ebuild?rev=1.1&content-type=text/plain
267
268 Index: ganeti-2.11.2-r3.ebuild
269 ===================================================================
270 # Copyright 1999-2014 Gentoo Foundation
271 # Distributed under the terms of the GNU General Public License v2
272 # $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.11.2-r3.ebuild,v 1.1 2014/07/02 23:57:25 chutzpah Exp $
273
274 EAPI=5
275 PYTHON_COMPAT=(python2_{6,7})
276 use test && PYTHON_REQ_USE="ipv6"
277
278 inherit eutils confutils autotools bash-completion-r1 python-single-r1 versionator pax-utils
279
280 MY_PV="${PV/_rc/~rc}"
281 #MY_PV="${PV/_beta/~beta}"
282 MY_P="${PN}-${MY_PV}"
283 SERIES="$(get_version_component_range 1-2)"
284
285 if [[ ${PV} == "9999" ]] ; then
286 EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
287 inherit git-2
288 KEYWORDS=""
289 # you will need to pull in the haskell overlay for pandoc
290 GIT_DEPEND="app-text/pandoc
291 dev-python/docutils
292 dev-python/sphinx
293 media-libs/gd[fontconfig,jpeg,png,truetype]
294 media-gfx/graphviz
295 media-fonts/urw-fonts"
296 else
297 SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${P}.tar.gz"
298 KEYWORDS="~amd64 ~x86"
299 fi
300
301 DESCRIPTION="Ganeti is a virtual server management software tool"
302 HOMEPAGE="http://code.google.com/p/ganeti/"
303
304 LICENSE="GPL-2"
305 SLOT="0"
306 IUSE="kvm xen lxc drbd htools syslog ipv6 haskell-daemons rbd test"
307 REQUIRED_USE="|| ( kvm xen lxc )"
308
309 S="${WORKDIR}/${MY_P}"
310
311 HASKELL_DEPS=">=dev-lang/ghc-6.12:0=
312 dev-haskell/json:0=
313 dev-haskell/curl:0=
314 dev-haskell/network:0=
315 dev-haskell/parallel
316 dev-haskell/hslogger:0=
317 dev-haskell/utf8-string:0=
318 dev-haskell/deepseq:0=
319 dev-haskell/attoparsec:0=
320 dev-haskell/crypto:0=
321 dev-haskell/vector:0=
322 dev-haskell/hinotify:0=
323 dev-haskell/regex-pcre-builtin:0=
324 dev-haskell/zlib:0=
325 dev-haskell/base64-bytestring:0="
326
327 DEPEND="xen? ( >=app-emulation/xen-3.0 )
328 kvm? ( app-emulation/qemu )
329 lxc? ( app-emulation/lxc )
330 drbd? ( <sys-cluster/drbd-8.5 )
331 rbd? ( sys-cluster/ceph )
332 ipv6? ( net-misc/ndisc6 )
333 haskell-daemons? (
334 ${HASKELL_DEPS}
335 dev-haskell/text:0=
336 )
337 dev-libs/openssl
338 dev-python/paramiko[${PYTHON_USEDEP}]
339 dev-python/pyopenssl[${PYTHON_USEDEP}]
340 dev-python/pyparsing[${PYTHON_USEDEP}]
341 dev-python/pycurl[${PYTHON_USEDEP}]
342 dev-python/pyinotify[${PYTHON_USEDEP}]
343 dev-python/simplejson[${PYTHON_USEDEP}]
344 dev-python/ipaddr[${PYTHON_USEDEP}]
345 dev-python/bitarray[${PYTHON_USEDEP}]
346 net-analyzer/arping
347 net-analyzer/fping
348 net-misc/bridge-utils
349 net-misc/curl[ssl]
350 net-misc/openssh
351 net-misc/socat
352 sys-apps/iproute2
353 sys-fs/lvm2
354 >=sys-apps/baselayout-2.0
355 ${PYTHON_DEPS}
356 ${GIT_DEPEND}"
357 RDEPEND="${DEPEND}
358 !app-emulation/ganeti-htools"
359 DEPEND+="${HASKELL_DEPS}
360 sys-devel/m4
361 test? (
362 dev-python/mock
363 dev-python/pyyaml
364 dev-haskell/test-framework:0=
365 dev-haskell/test-framework-hunit:0=
366 dev-haskell/test-framework-quickcheck2:0=
367 dev-haskell/temporary:0=
368 sys-apps/fakeroot
369 )"
370
371 PATCHES=(
372 "${FILESDIR}/${PN}-2.11-start-stop-daemon-args.patch"
373 "${FILESDIR}/${PN}-2.11-add-pgrep.patch"
374 "${FILESDIR}/${PN}-2.11-daemon-util.patch"
375 "${FILESDIR}/${PN}-2.7-fix-tests.patch"
376 "${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
377 "${FILESDIR}/${PN}-2.11-regex-builtin.patch"
378 "${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
379 "${FILESDIR}/${PN}-2.10-rundir.patch"
380 "${FILESDIR}/${PN}-2.11-qemu-enable-kvm.patch"
381 "${FILESDIR}/${PN}-2.11-tests.patch"
382 "${FILESDIR}/${PN}-lockdir.patch"
383 )
384
385 REQUIRED_USE="kvm? ( || ( amd64 x86 ) )"
386
387 pkg_setup () {
388 confutils_use_depend_all haskell-daemons htools
389 python-single-r1_pkg_setup
390 }
391
392 src_prepare() {
393 epatch "${PATCHES[@]}"
394
395 [[ ${PV} == "9999" ]] && ./autogen.sh
396 rm autotools/missing
397 eautoreconf
398 }
399
400 src_configure () {
401 # this is kind of a hack to work around the removal of the qemu-kvm wrapper
402 local kvm_arch
403
404 if use amd64; then
405 kvm_arch=x86_64
406 elif use x86; then
407 kvm_arch=i386
408 elif use kvm; then
409 die "Could not determine qemu system to use for kvm"
410 fi
411
412 econf --localstatedir=/var \
413 --sharedstatedir=/var \
414 --disable-symlinks \
415 --docdir=/usr/share/doc/${P} \
416 --with-ssh-initscript=/etc/init.d/sshd \
417 --with-export-dir=/var/lib/ganeti-storage/export \
418 --with-os-search-path=/usr/share/${PN}/os \
419 $(use_enable syslog) \
420 $(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
421 $(usex haskell-daemons "--enable-confd=haskell" '' '' '')
422 }
423
424 src_install () {
425 emake V=1 DESTDIR="${D}" install || die "emake install failed"
426
427 newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
428 newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
429
430 if use kvm; then
431 newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
432 newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
433 fi
434
435 # ganeti installs it's own docs in a generic location
436 rm -rf "${D}"/{usr/share/doc/${PN},run}
437
438 newbashcomp doc/examples/bash_completion ganeti
439
440 dodoc INSTALL UPGRADE NEWS README doc/*.rst
441 dohtml -r doc/html/* doc/css/*.css
442
443 docinto examples
444 dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
445
446 docinto examples/hooks
447 dodoc doc/examples/hooks/{ipsec,ethers}
448
449 insinto /etc/cron.d
450 newins doc/examples/ganeti.cron ${PN}
451
452 insinto /etc/logrotate.d
453 newins doc/examples/ganeti.logrotate ${PN}
454
455 keepdir /var/{lib,log}/${PN}/
456 keepdir /usr/share/${PN}/${SERIES}/os/
457 keepdir /var/lib/ganeti-storage/{export,file,shared}/
458
459 dosym ${SERIES} "/usr/share/${PN}/default"
460 dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
461
462 python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
463 }
464
465 src_test () {
466 emake check || die "emake check failed"
467 }