1 |
chutzpah 14/08/29 20:52:43 |
2 |
|
3 |
Modified: ChangeLog metadata.xml |
4 |
Added: ganeti-2.11.5.ebuild |
5 |
Log: |
6 |
Version bump. Add multiple-users USE flag that enables ganeti's multiuser support (contributed by Guido Serra). Add monitoring USE flag to enable ganeti's monitoring daemon. |
7 |
|
8 |
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF) |
9 |
|
10 |
Revision Changes Path |
11 |
1.93 app-emulation/ganeti/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/ChangeLog?rev=1.93&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/ChangeLog?rev=1.93&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/ChangeLog?r1=1.92&r2=1.93 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v |
20 |
retrieving revision 1.92 |
21 |
retrieving revision 1.93 |
22 |
diff -u -r1.92 -r1.93 |
23 |
--- ChangeLog 2 Jul 2014 23:57:25 -0000 1.92 |
24 |
+++ ChangeLog 29 Aug 2014 20:52:43 -0000 1.93 |
25 |
@@ -1,6 +1,17 @@ |
26 |
# ChangeLog for app-emulation/ganeti |
27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.92 2014/07/02 23:57:25 chutzpah Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.93 2014/08/29 20:52:43 chutzpah Exp $ |
30 |
+ |
31 |
+*ganeti-2.11.5 (29 Aug 2014) |
32 |
+ |
33 |
+ 29 Aug 2014; Patrick McLean <chutzpah@g.o> +ganeti-2.11.5.ebuild, |
34 |
+ +files/ganeti-2.11-daemon-util-tests.patch, |
35 |
+ +files/ganeti-2.11-dont-nest-libdir.patch, |
36 |
+ +files/ganeti-2.11-dont-print-man-help.patch, |
37 |
+ +files/ganeti-2.11-useradd.patch, metadata.xml: |
38 |
+ Version bump. Add multiple-users USE flag that enables ganeti's multiuser |
39 |
+ support (contributed by Guido Serra). Add monitoring USE flag to enable |
40 |
+ ganeti's monitoring daemon. |
41 |
|
42 |
*ganeti-2.11.2-r3 (02 Jul 2014) |
43 |
*ganeti-2.10.5-r3 (02 Jul 2014) |
44 |
|
45 |
|
46 |
|
47 |
1.11 app-emulation/ganeti/metadata.xml |
48 |
|
49 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/metadata.xml?rev=1.11&view=markup |
50 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/metadata.xml?rev=1.11&content-type=text/plain |
51 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/metadata.xml?r1=1.10&r2=1.11 |
52 |
|
53 |
Index: metadata.xml |
54 |
=================================================================== |
55 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/ganeti/metadata.xml,v |
56 |
retrieving revision 1.10 |
57 |
retrieving revision 1.11 |
58 |
diff -u -r1.10 -r1.11 |
59 |
--- metadata.xml 23 Dec 2013 15:58:42 -0000 1.10 |
60 |
+++ metadata.xml 29 Aug 2014 20:52:43 -0000 1.11 |
61 |
@@ -21,15 +21,17 @@ |
62 |
failures using commodity hardware. |
63 |
</longdescription> |
64 |
<use> |
65 |
- <flag name='kvm'>Enable KVM support</flag> |
66 |
- <flag name='xen'>Enable Xen support</flag> |
67 |
- <flag name='lxc'>Enable Linux Countainers support</flag> |
68 |
<flag name='drbd'>Enable DRBD support</flag> |
69 |
<flag name='filestorage'>Enable File Storage</flag> |
70 |
- <flag name='sharedstorage'>Enable Shared Storage support</flag> |
71 |
- <flag name='htools'>Enable htools support</flag> |
72 |
<flag name='haskell-daemons'>Build haskell daemons instead of python</flag> |
73 |
+ <flag name='htools'>Enable htools support</flag> |
74 |
+ <flag name='kvm'>Enable KVM support</flag> |
75 |
+ <flag name='lxc'>Enable Linux Countainers support</flag> |
76 |
+ <flag name='multiple-users'>Enable support for running VMs as different users.</flag> |
77 |
+ <flag name='monitoring'>Enable the ganeti monitoring daemon</flag> |
78 |
<flag name='rbd'>Enable rados block device support via sys-cluster/ceph</flag> |
79 |
+ <flag name='sharedstorage'>Enable Shared Storage support</flag> |
80 |
+ <flag name='xen'>Enable Xen support</flag> |
81 |
</use> |
82 |
</pkgmetadata> |
83 |
|
84 |
|
85 |
|
86 |
|
87 |
1.1 app-emulation/ganeti/ganeti-2.11.5.ebuild |
88 |
|
89 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/ganeti-2.11.5.ebuild?rev=1.1&view=markup |
90 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/ganeti-2.11.5.ebuild?rev=1.1&content-type=text/plain |
91 |
|
92 |
Index: ganeti-2.11.5.ebuild |
93 |
=================================================================== |
94 |
# Copyright 1999-2014 Gentoo Foundation |
95 |
# Distributed under the terms of the GNU General Public License v2 |
96 |
# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.11.5.ebuild,v 1.1 2014/08/29 20:52:43 chutzpah Exp $ |
97 |
|
98 |
EAPI=5 |
99 |
PYTHON_COMPAT=(python2_{6,7}) |
100 |
use test && PYTHON_REQ_USE="ipv6" |
101 |
|
102 |
inherit eutils confutils autotools bash-completion-r1 python-single-r1 versionator pax-utils |
103 |
|
104 |
MY_PV="${PV/_rc/~rc}" |
105 |
#MY_PV="${PV/_beta/~beta}" |
106 |
MY_P="${PN}-${MY_PV}" |
107 |
SERIES="$(get_version_component_range 1-2)" |
108 |
|
109 |
if [[ ${PV} == "9999" ]] ; then |
110 |
EGIT_REPO_URI="git://git.ganeti.org/ganeti.git" |
111 |
inherit git-2 |
112 |
KEYWORDS="" |
113 |
# you will need to pull in the haskell overlay for pandoc |
114 |
GIT_DEPEND="app-text/pandoc |
115 |
dev-python/docutils |
116 |
dev-python/sphinx |
117 |
media-libs/gd[fontconfig,jpeg,png,truetype] |
118 |
media-gfx/graphviz |
119 |
media-fonts/urw-fonts" |
120 |
else |
121 |
SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${P}.tar.gz" |
122 |
KEYWORDS="~amd64 ~x86" |
123 |
fi |
124 |
|
125 |
DESCRIPTION="Ganeti is a virtual server management software tool" |
126 |
HOMEPAGE="http://code.google.com/p/ganeti/" |
127 |
|
128 |
LICENSE="GPL-2" |
129 |
SLOT="0" |
130 |
IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen" |
131 |
REQUIRED_USE="|| ( kvm xen lxc )" |
132 |
|
133 |
USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}" |
134 |
GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}" |
135 |
|
136 |
S="${WORKDIR}/${MY_P}" |
137 |
|
138 |
HASKELL_DEPS=">=dev-lang/ghc-6.12:0= |
139 |
dev-haskell/json:0= |
140 |
dev-haskell/curl:0= |
141 |
dev-haskell/network:0= |
142 |
dev-haskell/parallel |
143 |
dev-haskell/hslogger:0= |
144 |
dev-haskell/utf8-string:0= |
145 |
dev-haskell/deepseq:0= |
146 |
dev-haskell/attoparsec:0= |
147 |
dev-haskell/crypto:0= |
148 |
dev-haskell/vector:0= |
149 |
dev-haskell/hinotify:0= |
150 |
dev-haskell/regex-pcre-builtin:0= |
151 |
dev-haskell/zlib:0= |
152 |
dev-haskell/base64-bytestring:0= |
153 |
monitoring? ( dev-haskell/snap-server:0= )" |
154 |
|
155 |
DEPEND="xen? ( >=app-emulation/xen-3.0 ) |
156 |
kvm? ( app-emulation/qemu ) |
157 |
lxc? ( app-emulation/lxc ) |
158 |
drbd? ( <sys-cluster/drbd-8.5 ) |
159 |
rbd? ( sys-cluster/ceph ) |
160 |
ipv6? ( net-misc/ndisc6 ) |
161 |
haskell-daemons? ( |
162 |
${HASKELL_DEPS} |
163 |
dev-haskell/text:0= |
164 |
) |
165 |
dev-libs/openssl |
166 |
dev-python/paramiko[${PYTHON_USEDEP}] |
167 |
dev-python/pyopenssl[${PYTHON_USEDEP}] |
168 |
dev-python/pyparsing[${PYTHON_USEDEP}] |
169 |
dev-python/pycurl[${PYTHON_USEDEP}] |
170 |
dev-python/pyinotify[${PYTHON_USEDEP}] |
171 |
dev-python/simplejson[${PYTHON_USEDEP}] |
172 |
dev-python/ipaddr[${PYTHON_USEDEP}] |
173 |
dev-python/bitarray[${PYTHON_USEDEP}] |
174 |
net-analyzer/arping |
175 |
net-analyzer/fping |
176 |
net-misc/bridge-utils |
177 |
net-misc/curl[ssl] |
178 |
net-misc/openssh |
179 |
net-misc/socat |
180 |
sys-apps/iproute2 |
181 |
sys-fs/lvm2 |
182 |
>=sys-apps/baselayout-2.0 |
183 |
${PYTHON_DEPS} |
184 |
${GIT_DEPEND}" |
185 |
RDEPEND="${DEPEND} |
186 |
!app-emulation/ganeti-htools" |
187 |
DEPEND+="${HASKELL_DEPS} |
188 |
sys-devel/m4 |
189 |
test? ( |
190 |
dev-python/mock |
191 |
dev-python/pyyaml |
192 |
dev-haskell/haddock:0= |
193 |
dev-haskell/test-framework:0= |
194 |
dev-haskell/test-framework-hunit:0= |
195 |
dev-haskell/test-framework-quickcheck2:0= |
196 |
dev-haskell/temporary:0= |
197 |
sys-apps/fakeroot |
198 |
)" |
199 |
|
200 |
PATCHES=( |
201 |
"${FILESDIR}/${PN}-2.11-start-stop-daemon-args.patch" |
202 |
"${FILESDIR}/${PN}-2.11-add-pgrep.patch" |
203 |
"${FILESDIR}/${PN}-2.11-daemon-util.patch" |
204 |
"${FILESDIR}/${PN}-2.7-fix-tests.patch" |
205 |
"${FILESDIR}/${PN}-2.9-disable-root-tests.patch" |
206 |
"${FILESDIR}/${PN}-2.11-regex-builtin.patch" |
207 |
"${FILESDIR}/${PN}-2.9-skip-cli-test.patch" |
208 |
"${FILESDIR}/${PN}-2.10-rundir.patch" |
209 |
"${FILESDIR}/${PN}-2.11-qemu-enable-kvm.patch" |
210 |
"${FILESDIR}/${PN}-2.11-tests.patch" |
211 |
"${FILESDIR}/${PN}-lockdir.patch" |
212 |
"${FILESDIR}/${PN}-2.11-useradd.patch" |
213 |
"${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch" |
214 |
"${FILESDIR}/${PN}-2.11-dont-print-man-help.patch" |
215 |
"${FILESDIR}/${PN}-2.11-daemon-util-tests.patch" |
216 |
) |
217 |
|
218 |
REQUIRED_USE="kvm? ( || ( amd64 x86 ) )" |
219 |
|
220 |
pkg_setup () { |
221 |
confutils_use_depend_all haskell-daemons htools |
222 |
python-single-r1_pkg_setup |
223 |
} |
224 |
|
225 |
src_prepare() { |
226 |
epatch "${PATCHES[@]}" |
227 |
|
228 |
[[ ${PV} == "9999" ]] && ./autogen.sh |
229 |
rm autotools/missing |
230 |
eautoreconf |
231 |
} |
232 |
|
233 |
src_configure () { |
234 |
# this is kind of a hack to work around the removal of the qemu-kvm wrapper |
235 |
local kvm_arch |
236 |
|
237 |
if use amd64; then |
238 |
kvm_arch=x86_64 |
239 |
elif use x86; then |
240 |
kvm_arch=i386 |
241 |
elif use kvm; then |
242 |
die "Could not determine qemu system to use for kvm" |
243 |
fi |
244 |
|
245 |
econf --localstatedir=/var \ |
246 |
--sharedstatedir=/var \ |
247 |
--disable-symlinks \ |
248 |
--docdir=/usr/share/doc/${P} \ |
249 |
--with-ssh-initscript=/etc/init.d/sshd \ |
250 |
--with-export-dir=/var/lib/ganeti-storage/export \ |
251 |
--with-os-search-path=/usr/share/${PN}/os \ |
252 |
$(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \ |
253 |
$(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \ |
254 |
$(use_enable syslog) \ |
255 |
$(use_enable monitoring) \ |
256 |
$(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \ |
257 |
$(usex haskell-daemons "--enable-confd=haskell" '' '' '') |
258 |
} |
259 |
|
260 |
src_install () { |
261 |
emake V=1 DESTDIR="${D}" install || die "emake install failed" |
262 |
|
263 |
newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN} |
264 |
newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN} |
265 |
|
266 |
if use kvm; then |
267 |
newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff |
268 |
newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff |
269 |
fi |
270 |
|
271 |
# ganeti installs it's own docs in a generic location |
272 |
rm -rf "${D}"/{usr/share/doc/${PN},run} |
273 |
|
274 |
newbashcomp doc/examples/bash_completion ganeti |
275 |
|
276 |
dodoc INSTALL UPGRADE NEWS README doc/*.rst |
277 |
dohtml -r doc/html/* doc/css/*.css |
278 |
|
279 |
docinto examples |
280 |
dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf |
281 |
|
282 |
docinto examples/hooks |
283 |
dodoc doc/examples/hooks/{ipsec,ethers} |
284 |
|
285 |
insinto /etc/cron.d |
286 |
newins doc/examples/ganeti.cron ${PN} |
287 |
|
288 |
insinto /etc/logrotate.d |
289 |
newins doc/examples/ganeti.logrotate ${PN} |
290 |
|
291 |
keepdir /var/{lib,log}/${PN}/ |
292 |
keepdir /usr/share/${PN}/${SERIES}/os/ |
293 |
keepdir /var/lib/ganeti-storage/{export,file,shared}/ |
294 |
|
295 |
dosym ${SERIES} "/usr/share/${PN}/default" |
296 |
dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default" |
297 |
|
298 |
python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES} |
299 |
} |
300 |
|
301 |
pkg_postinst() { |
302 |
if use multiple-users; then |
303 |
elog "You have enable multiple user support, the users for this must" |
304 |
elog "be created. You can use the provided tool for this, which is" |
305 |
elog "located at:" |
306 |
elog " /usr/$(get_libdir)/${PN}/tools/users-setup" |
307 |
fi |
308 |
} |
309 |
|
310 |
src_test () { |
311 |
emake check || die "emake check failed" |
312 |
} |