Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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