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.14.1-r1.ebuild ChangeLog ganeti-2.14.1.ebuild
Date: Tue, 28 Jul 2015 22:03:09
Message-Id: 20150728220305.76CFDC1@oystercatcher.gentoo.org
1 chutzpah 15/07/28 22:03:05
2
3 Modified: ChangeLog
4 Added: ganeti-2.14.1-r1.ebuild
5 Removed: ganeti-2.14.1.ebuild
6 Log:
7 Revision bump, move some dependencies from test-deps to build-deps.
8
9 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF)
10
11 Revision Changes Path
12 1.107 app-emulation/ganeti/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/ChangeLog?rev=1.107&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/ChangeLog?rev=1.107&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/ChangeLog?r1=1.106&r2=1.107
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v
21 retrieving revision 1.106
22 retrieving revision 1.107
23 diff -u -r1.106 -r1.107
24 --- ChangeLog 22 Jul 2015 01:46:48 -0000 1.106
25 +++ ChangeLog 28 Jul 2015 22:03:05 -0000 1.107
26 @@ -1,6 +1,12 @@
27 # ChangeLog for app-emulation/ganeti
28 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.106 2015/07/22 01:46:48 chutzpah Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.107 2015/07/28 22:03:05 chutzpah Exp $
31 +
32 +*ganeti-2.14.1-r1 (28 Jul 2015)
33 +
34 + 28 Jul 2015; Patrick McLean <chutzpah@g.o> +ganeti-2.14.1-r1.ebuild,
35 + -ganeti-2.14.1.ebuild:
36 + Revision bump, move some dependencies from test-deps to build-deps.
37
38 *ganeti-2.14.1 (22 Jul 2015)
39
40
41
42
43 1.1 app-emulation/ganeti/ganeti-2.14.1-r1.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/ganeti-2.14.1-r1.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/ganeti-2.14.1-r1.ebuild?rev=1.1&content-type=text/plain
47
48 Index: ganeti-2.14.1-r1.ebuild
49 ===================================================================
50 # Copyright 1999-2015 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.14.1-r1.ebuild,v 1.1 2015/07/28 22:03:05 chutzpah Exp $
53
54 EAPI=5
55 PYTHON_COMPAT=(python2_7)
56 use test && PYTHON_REQ_USE="ipv6"
57
58 inherit eutils user autotools bash-completion-r1 python-single-r1 versionator
59
60 MY_PV="${PV/_rc/~rc}"
61 MY_PV="${MY_PV/_beta/~beta}"
62 MY_P="${PN}-${MY_PV}"
63 SERIES="$(get_version_component_range 1-2)"
64
65 if [[ ${PV} =~ [9]{4,} ]] ; then
66 EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
67 inherit git-2
68 KEYWORDS=""
69 GIT_DEPEND="dev-python/docutils
70 =dev-python/sphinx-1.2*[${PYTHON_USEDEP}]
71 media-libs/gd[fontconfig,jpeg,png,truetype]
72 media-gfx/graphviz
73 media-fonts/urw-fonts"
74 else
75 SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz"
76 KEYWORDS="~amd64 ~x86"
77 fi
78
79 DESCRIPTION="Ganeti is a virtual server management software tool"
80 HOMEPAGE="http://www.ganeti.org/"
81
82 LICENSE="GPL-2"
83 SLOT="0"
84 IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen"
85 REQUIRED_USE="|| ( kvm xen lxc ) ${PYTHON_REQUIRED_USE}"
86
87 USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
88 GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
89
90 DEPEND="
91 dev-libs/openssl:0
92 dev-python/paramiko[${PYTHON_USEDEP}]
93 dev-python/pyopenssl[${PYTHON_USEDEP}]
94 dev-python/pyparsing[${PYTHON_USEDEP}]
95 dev-python/pycurl[${PYTHON_USEDEP}]
96 dev-python/pyinotify[${PYTHON_USEDEP}]
97 dev-python/simplejson[${PYTHON_USEDEP}]
98 dev-python/ipaddr[${PYTHON_USEDEP}]
99 dev-python/bitarray[${PYTHON_USEDEP}]
100 net-analyzer/arping
101 net-analyzer/fping
102 net-misc/bridge-utils
103 net-misc/curl[ssl]
104 net-misc/openssh
105 net-misc/socat
106 sys-apps/iproute2
107 sys-fs/lvm2
108 >=sys-apps/baselayout-2.0
109 =dev-lang/ghc-7.6*:0=
110 dev-haskell/cabal:0=
111 dev-haskell/cabal-install:0=
112 >=dev-haskell/deepseq-1.3.0.0:0=
113 >=dev-haskell/mtl-2.1.1:0=
114 >=dev-haskell/old-time-1.1.0.0:0=
115 >=dev-haskell/random-1.0.1.1:0=
116 haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
117 >=dev-haskell/transformers-0.3.0.0:0=
118
119 >=dev-haskell/attoparsec-0.10.1.1:0=
120 <dev-haskell/attoparsec-0.13:0
121 >=dev-haskell/base64-bytestring-1.0.0.1:0=
122 <dev-haskell/base64-bytestring-1.1:0=
123 >=dev-haskell/crypto-4.2.4:0=
124 <dev-haskell/crypto-4.3:0=
125 >=dev-haskell/curl-1.3.7:0=
126 <dev-haskell/curl-1.4:0=
127 >=dev-haskell/hinotify-0.3.2:0=
128 <dev-haskell/hinotify-0.4:0=
129 >=dev-haskell/hslogger-1.1.4:0=
130 <dev-haskell/hslogger-1.3:0=
131 >=dev-haskell/json-0.5:0=
132 <dev-haskell/json-0.9:0=
133 >=dev-haskell/lens-3.10:0=
134 <dev-haskell/lens-4.8:0=
135 >=dev-haskell/lifted-base-0.2.0.3:0=
136 <dev-haskell/lifted-base-0.3:0=
137 >=dev-haskell/monad-control-0.3.1.3:0=
138 <dev-haskell/monad-control-1.1:0=
139 >=dev-haskell/network-2.3.0.13:0=
140 <dev-haskell/network-2.7:0=
141 >=dev-haskell/parallel-3.2.0.2:3=
142 <dev-haskell/parallel-3.3:3=
143 >=dev-haskell/temporary-1.1.2.3:0=
144 <dev-haskell/temporary-1.3:0=
145 >=dev-haskell/regex-pcre-0.94.2:0=
146 <dev-haskell/regex-pcre-0.95:0=
147 >=dev-haskell/transformers-base-0.4.1:0=
148 <dev-haskell/transformers-base-0.5:0=
149 >=dev-haskell/utf8-string-0.3.7:0=
150 <dev-haskell/utf8-string-0.4:0=
151 >=dev-haskell/zlib-0.5.3.3:0=
152 <dev-haskell/zlib-0.6:0=
153
154 >=dev-haskell/psqueue-1.1:0=
155 <dev-haskell/psqueue-1.2:0=
156 >=dev-haskell/snap-core-0.8.1:0=
157 <dev-haskell/snap-core-0.10:0=
158 >=dev-haskell/snap-server-0.8.1:0=
159 <dev-haskell/snap-server-0.10:0=
160
161 dev-haskell/vector:0=
162 <dev-haskell/semigroupoids-4.1:0=
163 <dev-haskell/contravariant-0.6
164 <dev-haskell/transformers-compat-0.4[three]
165 xen? ( >=app-emulation/xen-3.0 )
166 kvm? ( app-emulation/qemu )
167 lxc? ( app-emulation/lxc )
168 drbd? ( <sys-cluster/drbd-8.5 )
169 rbd? ( sys-cluster/ceph )
170 ipv6? ( net-misc/ndisc6 )
171 ${PYTHON_DEPS}
172 ${GIT_DEPEND}"
173 RDEPEND="${DEPEND}
174 !app-emulation/ganeti-htools"
175 DEPEND+="sys-devel/m4
176 =app-text/pandoc-1.12*
177 >=dev-haskell/test-framework-0.6:0=
178 <dev-haskell/test-framework-0.9:0=
179 >=dev-haskell/test-framework-hunit-0.2.7:0=
180 <dev-haskell/test-framework-hunit-0.4:0=
181 >=dev-haskell/test-framework-quickcheck2-0.2.12.1:0=
182 <dev-haskell/test-framework-quickcheck2-0.4:0=
183 test? (
184 dev-python/mock
185 dev-python/pyyaml
186 dev-haskell/haddock:0=
187 >=dev-haskell/hunit-1.2.4.2:0=
188 <dev-haskell/hunit-1.3:0=
189 >=dev-haskell/quickcheck-2.4.2:2=
190 <dev-haskell/quickcheck-2.8:2=
191 sys-apps/fakeroot
192 net-misc/socat
193 dev-util/shelltestrunner
194 )"
195
196 PATCHES=(
197 "${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
198 "${FILESDIR}/${PN}-2.11-add-pgrep.patch"
199 "${FILESDIR}/${PN}-2.13-daemon-util.patch"
200 "${FILESDIR}/${PN}-2.7-fix-tests.patch"
201 "${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
202 "${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
203 "${FILESDIR}/${PN}-2.10-rundir.patch"
204 "${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
205 "${FILESDIR}/${PN}-2.11-tests.patch"
206 "${FILESDIR}/${PN}-lockdir.patch"
207 "${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch"
208 "${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
209 "${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
210 "${FILESDIR}/${PN}-2.13-process_unittest.patch"
211 )
212
213 REQUIRED_USE="kvm? ( || ( amd64 x86 ) )"
214
215 S="${WORKDIR}/${MY_P}"
216
217 # apparently currently broken
218 QA_WX_LOAD="
219 usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
220 usr/lib*/${PN}/${SERIES}/usr/bin/htools
221 "
222
223 pkg_setup () {
224 local user
225 python-single-r1_pkg_setup
226
227 if use multiple-users; then
228 for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
229 enewgroup ${user}
230 enewuser ${user} -1 -1 -1 ${user}
231 done
232 fi
233 }
234
235 src_prepare() {
236 local testfile
237 epatch "${PATCHES[@]}"
238
239 # not sure why these tests are failing
240 # should remove this on next version bump if possible
241 for testfile in test/py/import-export_unittest.bash; do
242 printf '#!/bin/bash\ntrue\n' > "${testfile}"
243 done
244
245 # take the sledgehammer approach to bug #526270
246 grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
247
248 [[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
249 rm autotools/missing
250 eautoreconf
251 }
252
253 src_configure () {
254 # this is kind of a hack to work around the removal of the qemu-kvm wrapper
255 local kvm_arch
256
257 if use amd64; then
258 kvm_arch=x86_64
259 elif use x86; then
260 kvm_arch=i386
261 elif use kvm; then
262 die "Could not determine qemu system to use for kvm"
263 fi
264
265 econf --localstatedir=/var \
266 --sharedstatedir=/var \
267 --disable-symlinks \
268 --docdir=/usr/share/doc/${P} \
269 --with-ssh-initscript=/etc/init.d/sshd \
270 --with-export-dir=/var/lib/ganeti-storage/export \
271 --with-os-search-path=/usr/share/${PN}/os \
272 $(use_enable test haskell-tests) \
273 $(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \
274 $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
275 $(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \
276 $(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \
277 $(use_enable syslog) \
278 $(use_enable monitoring) \
279 $(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
280 $(usex haskell-daemons "--enable-confd=haskell" '' '' '')
281 }
282
283 src_install () {
284 emake V=1 DESTDIR="${D}" install || die "emake install failed"
285
286 newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
287 newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
288
289 if use kvm; then
290 newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
291 newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
292 fi
293
294 # ganeti installs it's own docs in a generic location
295 rm -rf "${D}"/{usr/share/doc/${PN},run}
296
297 sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion
298 newbashcomp doc/examples/bash_completion gnt-instance
299 bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
300 h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
301 gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
302
303 dodoc INSTALL UPGRADE NEWS README doc/*.rst
304 dohtml -r doc/html/* doc/css/*.css
305
306 docinto examples
307 dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
308
309 docinto examples/hooks
310 dodoc doc/examples/hooks/{ipsec,ethers}
311
312 insinto /etc/cron.d
313 newins doc/examples/ganeti.cron ${PN}
314
315 insinto /etc/logrotate.d
316 newins doc/examples/ganeti.logrotate ${PN}
317
318 # need to dodir rather than keepdir here (bug #552482)
319 dodir /var/lib/${PN}
320
321 keepdir /var/log/${PN}/
322 keepdir /usr/share/${PN}/${SERIES}/os/
323 keepdir /var/lib/ganeti-storage/{export,file,shared}/
324
325 dosym ${SERIES} "/usr/share/${PN}/default"
326 dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
327
328 python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
329 }
330
331 pkg_postinst() {
332 if use multiple-users; then
333 elog "You have enable multiple user support, the users for this must"
334 elog "be created. You can use the provided tool for this, which is"
335 elog "located at:"
336 elog " /usr/$(get_libdir)/${PN}/tools/users-setup"
337 fi
338 }
339
340 src_test () {
341 PATH="${S}/scripts:${S}/src:${PATH}" \
342 TMPDIR="/tmp" \
343 GANETI_MASTER="$(hostname -f)" \
344 emake check || die "emake check failed"
345 }
Report Message
Find on MARC Find on Google Groups